Re: kern/172166: commit references a PR
The following reply was made to PR kern/172166; it has been noted by GNATS.
From: dfil...@freebsd.org (dfilter service)
To: bug-follo...@freebsd.org
Cc:
Subject: Re: kern/172166: commit references a PR
Date: Mon, 25 Mar 2013 14:30:42 + (UTC)
Author: melifaro
Date: Mon Mar 25 14:30:34 2013
New Revision: 248705
URL: http://svnweb.freebsd.org/changeset/base/248705
Log:
Unlock IPMI sc while performing requests via KCS and SMIC interfaces.
It is already done in SSIF interface code.
This reduces contention/spinning reported by many users.
PR: kern/172166
Submitted by:Eric van Gyzen
MFC after: 2 weeks
Modified:
head/sys/dev/ipmi/ipmi_kcs.c
head/sys/dev/ipmi/ipmi_smic.c
Modified: head/sys/dev/ipmi/ipmi_kcs.c
==
--- head/sys/dev/ipmi/ipmi_kcs.c Mon Mar 25 13:58:17 2013
(r248704)
+++ head/sys/dev/ipmi/ipmi_kcs.c Mon Mar 25 14:30:34 2013
(r248705)
@@ -456,6 +456,7 @@ kcs_loop(void *arg)
IPMI_LOCK(sc);
while ((req = ipmi_dequeue_request(sc)) != NULL) {
+ IPMI_UNLOCK(sc);
ok = 0;
for (i = 0; i < 3 && !ok; i++)
ok = kcs_polled_request(sc, req);
@@ -463,6 +464,7 @@ kcs_loop(void *arg)
req->ir_error = 0;
else
req->ir_error = EIO;
+ IPMI_LOCK(sc);
ipmi_complete_request(sc, req);
}
IPMI_UNLOCK(sc);
Modified: head/sys/dev/ipmi/ipmi_smic.c
==
--- head/sys/dev/ipmi/ipmi_smic.c Mon Mar 25 13:58:17 2013
(r248704)
+++ head/sys/dev/ipmi/ipmi_smic.c Mon Mar 25 14:30:34 2013
(r248705)
@@ -362,6 +362,7 @@ smic_loop(void *arg)
IPMI_LOCK(sc);
while ((req = ipmi_dequeue_request(sc)) != NULL) {
+ IPMI_UNLOCK(sc);
ok = 0;
for (i = 0; i < 3 && !ok; i++)
ok = smic_polled_request(sc, req);
@@ -369,6 +370,7 @@ smic_loop(void *arg)
req->ir_error = 0;
else
req->ir_error = EIO;
+ IPMI_LOCK(sc);
ipmi_complete_request(sc, req);
}
IPMI_UNLOCK(sc);
___
svn-src-...@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"
___
freebsd-bugs@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-bugs
To unsubscribe, send any mail to "freebsd-bugs-unsubscr...@freebsd.org"
Re: kern/177759: commit references a PR
The following reply was made to PR kern/177759; it has been noted by GNATS. From: dfil...@freebsd.org (dfilter service) To: bug-follo...@freebsd.org Cc: Subject: Re: kern/177759: commit references a PR Date: Sat, 13 Apr 2013 21:21:27 + (UTC) Author: dim Date: Sat Apr 13 21:21:13 2013 New Revision: 249449 URL: http://svnweb.freebsd.org/changeset/base/249449 Log: Fix undefined behaviour in several gpio_pin_setflags() routines (under sys/arm and sys/mips), squelching the clang 3.3 warnings about this. Noticed by: tinderbox and many irate spectators Submitted by:Luiz Otavio O Souza PR: kern/177759 MFC after: 3 days Modified: head/sys/arm/allwinner/a10_gpio.c head/sys/arm/broadcom/bcm2835/bcm2835_gpio.c head/sys/arm/freescale/imx/imx51_gpio.c head/sys/arm/xscale/ixp425/avila_gpio.c head/sys/arm/xscale/ixp425/cambria_gpio.c head/sys/mips/atheros/ar71xx_gpio.c head/sys/mips/cavium/octeon_gpio.c head/sys/mips/rt305x/rt305x_gpio.c Modified: head/sys/arm/allwinner/a10_gpio.c == --- head/sys/arm/allwinner/a10_gpio.c Sat Apr 13 21:17:43 2013 (r249448) +++ head/sys/arm/allwinner/a10_gpio.c Sat Apr 13 21:21:13 2013 (r249449) @@ -300,8 +300,8 @@ a10_gpio_pin_setflags(device_t dev, uint if (i >= sc->sc_gpio_npins) return (EINVAL); - /* Filter out unwanted flags. */ - if ((flags &= sc->sc_gpio_pins[i].gp_caps) != flags) + /* Check for unwanted flags. */ + if ((flags & sc->sc_gpio_pins[i].gp_caps) != flags) return (EINVAL); /* Can't mix input/output together. */ Modified: head/sys/arm/broadcom/bcm2835/bcm2835_gpio.c == --- head/sys/arm/broadcom/bcm2835/bcm2835_gpio.c Sat Apr 13 21:17:43 2013(r249448) +++ head/sys/arm/broadcom/bcm2835/bcm2835_gpio.c Sat Apr 13 21:21:13 2013(r249449) @@ -385,8 +385,8 @@ bcm_gpio_pin_setflags(device_t dev, uint if (bcm_gpio_pin_is_ro(sc, pin)) return (EINVAL); - /* Filter out unwanted flags. */ - if ((flags &= sc->sc_gpio_pins[i].gp_caps) != flags) + /* Check for unwanted flags. */ + if ((flags & sc->sc_gpio_pins[i].gp_caps) != flags) return (EINVAL); /* Can't mix input/output together. */ Modified: head/sys/arm/freescale/imx/imx51_gpio.c == --- head/sys/arm/freescale/imx/imx51_gpio.cSat Apr 13 21:17:43 2013 (r249448) +++ head/sys/arm/freescale/imx/imx51_gpio.cSat Apr 13 21:21:13 2013 (r249449) @@ -261,8 +261,8 @@ imx51_gpio_pin_setflags(device_t dev, ui if (i >= sc->gpio_npins) return (EINVAL); - /* Filter out unwanted flags */ - if ((flags &= sc->gpio_pins[i].gp_caps) != flags) + /* Check for unwanted flags. */ + if ((flags & sc->gpio_pins[i].gp_caps) != flags) return (EINVAL); /* Can't mix input/output together */ Modified: head/sys/arm/xscale/ixp425/avila_gpio.c == --- head/sys/arm/xscale/ixp425/avila_gpio.cSat Apr 13 21:17:43 2013 (r249448) +++ head/sys/arm/xscale/ixp425/avila_gpio.cSat Apr 13 21:21:13 2013 (r249449) @@ -220,8 +220,8 @@ avila_gpio_pin_setflags(device_t dev, ui if (pin >= IXP4XX_GPIO_PINS || !(sc->sc_valid & mask)) return (EINVAL); - /* Filter out unwanted flags */ - if ((flags &= sc->sc_pins[pin].gp_caps) != flags) + /* Check for unwanted flags. */ + if ((flags & sc->sc_pins[pin].gp_caps) != flags) return (EINVAL); /* Can't mix input/output together */ Modified: head/sys/arm/xscale/ixp425/cambria_gpio.c == --- head/sys/arm/xscale/ixp425/cambria_gpio.c Sat Apr 13 21:17:43 2013 (r249448) +++ head/sys/arm/xscale/ixp425/cambria_gpio.c Sat Apr 13 21:21:13 2013 (r249449) @@ -317,8 +317,8 @@ cambria_gpio_pin_setflags(device_t dev, if (pin >= GPIO_PINS) return (EINVAL); - /* Filter out unwanted flags */ - if ((flags &= sc->sc_pins[pin].gp_caps) != flags) + /* Check for unwanted flags. */ + if ((flags & sc->sc_pins[pin].gp_caps) != flags) return (EINVAL); /* Can't mix input/output together */ Modified: head/sys/mips/atheros/ar71xx_gpio.c == --- head/sys/mips/atheros/ar71xx_gpio.c
Re: kern/177496: commit references a PR
The following reply was made to PR kern/177496; it has been noted by GNATS. From: dfil...@freebsd.org (dfilter service) To: bug-follo...@freebsd.org Cc: Subject: Re: kern/177496: commit references a PR Date: Sun, 14 Apr 2013 02:26:24 + (UTC) Author: hiren Date: Sun Apr 14 02:26:12 2013 New Revision: 249460 URL: http://svnweb.freebsd.org/changeset/base/249460 Log: Improve/correct a comment. We now support a lot more cpu types. PR: kern/177496 Approved by: sbruno (mentor) Modified: head/sys/dev/hwpmc/hwpmc_core.c Modified: head/sys/dev/hwpmc/hwpmc_core.c == --- head/sys/dev/hwpmc/hwpmc_core.cSun Apr 14 01:22:39 2013 (r249459) +++ head/sys/dev/hwpmc/hwpmc_core.cSun Apr 14 02:26:12 2013 (r249460) @@ -25,7 +25,7 @@ */ /* - * Intel Core, Core 2 and Atom PMCs. + * Intel Core PMCs. */ #include ___ svn-src-...@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" ___ freebsd-bugs@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-bugs To unsubscribe, send any mail to "freebsd-bugs-unsubscr...@freebsd.org"
Re: kern/177164: commit references a PR
The following reply was made to PR kern/177164; it has been noted by GNATS.
From: dfil...@freebsd.org (dfilter service)
To: bug-follo...@freebsd.org
Cc:
Subject: Re: kern/177164: commit references a PR
Date: Sun, 14 Apr 2013 02:42:47 + (UTC)
Author: hiren
Date: Sun Apr 14 02:42:40 2013
New Revision: 249461
URL: http://svnweb.freebsd.org/changeset/base/249461
Log:
Fixing a clang warning indicating uninitialized variable usage.
PR: kern/177164
Approved by: sbruno (mentor)
Modified:
head/sys/dev/ips/ips.c
Modified: head/sys/dev/ips/ips.c
==
--- head/sys/dev/ips/ips.c Sun Apr 14 02:26:12 2013(r249460)
+++ head/sys/dev/ips/ips.c Sun Apr 14 02:42:40 2013(r249461)
@@ -578,7 +578,7 @@ static int ips_copperhead_queue_init(ips
{
int error;
bus_dma_tag_t dmatag;
- bus_dmamap_t dmamap;
+ bus_dmamap_t dmamap = NULL;
if (bus_dma_tag_create( /* parent*/ sc->adapter_dmatag,
/* alignemnt */ 1,
/* boundary */ 0,
___
svn-src-...@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"
___
freebsd-bugs@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-bugs
To unsubscribe, send any mail to "freebsd-bugs-unsubscr...@freebsd.org"
Re: kern/172963: commit references a PR
The following reply was made to PR kern/172963; it has been noted by GNATS.
From: dfil...@freebsd.org (dfilter service)
To: bug-follo...@freebsd.org
Cc:
Subject: Re: kern/172963: commit references a PR
Date: Sun, 14 Apr 2013 16:26:17 + (UTC)
Author: rwatson
Date: Sun Apr 14 16:25:37 2013
New Revision: 249478
URL: http://svnweb.freebsd.org/changeset/base/249478
Log:
FreeBSD 8.0 introduced inpcb reference counting, and FreeBSD 8.1 began using
that reference count to protect inpcb stability in udp_pcblist() and other
monitoring functions, preventing the inpcb from being garbage collected
across potentially sleeping copyout() operations despite the inpcb zone
becoming shrinkable.
However, this introduced a race condition in which inp->inp_socket() might
become NULL as a result of the socket being freed, but before the inpcb we
removed from the global list of connections, allowing it to be exposed to a
third thread invoking udp_input() or udp6_input() which would try to
indirect through inp_socket without testing it for NULL. This might occur
with particular regularity on systems that frequently run netstat, or which
use SNMP for connection monitoring.
Later FreeBSD releases use a different reference/destruction model, but
stable/8 remained affected in FreeBSD 8.2 and 8.3; the problem could be
spotted on very high-load UDP services, such as top-level name servers.
An Errata Note for 8.x branches under continuing support might be
appropriate. Regardless, this fix should be merged to releng/8.4 prior to
8.4-RELEASE.
PR: 172963
Submitted by:Vincent Miller
Submitted by:Julien Charbon
Submitted by:Marc De La Gueronniere
Modified:
stable/8/sys/netinet/udp_usrreq.c
stable/8/sys/netinet6/udp6_usrreq.c
Modified: stable/8/sys/netinet/udp_usrreq.c
==
--- stable/8/sys/netinet/udp_usrreq.c Sun Apr 14 16:20:25 2013
(r249477)
+++ stable/8/sys/netinet/udp_usrreq.c Sun Apr 14 16:25:37 2013
(r249478)
@@ -495,6 +495,15 @@ udp_input(struct mbuf *m, int off)
INP_RLOCK(inp);
/*
+ * Detached PCBs can linger in the list if someone
+ * holds a reference. (e.g. udp_pcblist)
+ */
+ if (inp->inp_socket == NULL) {
+ INP_RUNLOCK(inp);
+ continue;
+ }
+
+ /*
* Handle socket delivery policy for any-source
* and source-specific multicast. [RFC3678]
*/
@@ -620,6 +629,15 @@ udp_input(struct mbuf *m, int off)
*/
INP_RLOCK(inp);
INP_INFO_RUNLOCK(&V_udbinfo);
+
+ /*
+ * Detached PCBs can linger in the hash table if someone holds a
+ * reference. (e.g. udp_pcblist)
+ */
+ if (inp->inp_socket == NULL) {
+ INP_RUNLOCK(inp);
+ goto badunlocked;
+ }
if (inp->inp_ip_minttl && inp->inp_ip_minttl > ip->ip_ttl) {
INP_RUNLOCK(inp);
goto badunlocked;
Modified: stable/8/sys/netinet6/udp6_usrreq.c
==
--- stable/8/sys/netinet6/udp6_usrreq.cSun Apr 14 16:20:25 2013
(r249477)
+++ stable/8/sys/netinet6/udp6_usrreq.cSun Apr 14 16:25:37 2013
(r249478)
@@ -273,6 +273,13 @@ udp6_input(struct mbuf **mp, int *offp,
}
/*
+ * Detached PCBs can linger in the list if someone
+ * holds a reference. (e.g. udp_pcblist)
+ */
+ if (inp->inp_socket == NULL)
+ continue;
+
+ /*
* Handle socket delivery policy for any-source
* and source-specific multicast. [RFC3678]
*/
@@ -396,6 +403,15 @@ udp6_input(struct mbuf **mp, int *offp,
}
INP_RLOCK(inp);
INP_INFO_RUNLOCK(&V_udbinfo);
+
+ /*
+ * Detached PCBs can linger in the hash table if someone holds a
+ * reference. (e.g. udp_pcblist)
+ */
+ if (inp->inp_socket == NULL) {
+ INP_RUNLOCK(inp);
+ goto badunlocked;
+ }
up = intoudpcb(inp);
if (up->u_tun_func == NULL) {
udp6_append(inp, m, off, &fromsa);
___
svn-src-...@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, sen
Re: kern/177759: commit references a PR
The following reply was made to PR kern/177759; it has been noted by GNATS. From: dfil...@freebsd.org (dfilter service) To: bug-follo...@freebsd.org Cc: Subject: Re: kern/177759: commit references a PR Date: Tue, 16 Apr 2013 16:36:06 + (UTC) Author: dim Date: Tue Apr 16 16:35:48 2013 New Revision: 249550 URL: http://svnweb.freebsd.org/changeset/base/249550 Log: MFC r249449: Fix undefined behaviour in several gpio_pin_setflags() routines (under sys/arm and sys/mips), squelching the clang 3.3 warnings about this. Noticed by: tinderbox and many irate spectators Submitted by:Luiz Otavio O Souza PR: kern/177759 Modified: stable/9/sys/arm/xscale/ixp425/avila_gpio.c stable/9/sys/arm/xscale/ixp425/cambria_gpio.c stable/9/sys/mips/atheros/ar71xx_gpio.c stable/9/sys/mips/rt305x/rt305x_gpio.c Directory Properties: stable/9/sys/ (props changed) Modified: stable/9/sys/arm/xscale/ixp425/avila_gpio.c == --- stable/9/sys/arm/xscale/ixp425/avila_gpio.cTue Apr 16 16:09:27 2013(r249549) +++ stable/9/sys/arm/xscale/ixp425/avila_gpio.cTue Apr 16 16:35:48 2013(r249550) @@ -220,8 +220,8 @@ avila_gpio_pin_setflags(device_t dev, ui if (pin >= IXP4XX_GPIO_PINS || !(sc->sc_valid & mask)) return (EINVAL); - /* Filter out unwanted flags */ - if ((flags &= sc->sc_pins[pin].gp_caps) != flags) + /* Check for unwanted flags. */ + if ((flags & sc->sc_pins[pin].gp_caps) != flags) return (EINVAL); /* Can't mix input/output together */ Modified: stable/9/sys/arm/xscale/ixp425/cambria_gpio.c == --- stable/9/sys/arm/xscale/ixp425/cambria_gpio.c Tue Apr 16 16:09:27 2013(r249549) +++ stable/9/sys/arm/xscale/ixp425/cambria_gpio.c Tue Apr 16 16:35:48 2013(r249550) @@ -317,8 +317,8 @@ cambria_gpio_pin_setflags(device_t dev, if (pin >= GPIO_PINS) return (EINVAL); - /* Filter out unwanted flags */ - if ((flags &= sc->sc_pins[pin].gp_caps) != flags) + /* Check for unwanted flags. */ + if ((flags & sc->sc_pins[pin].gp_caps) != flags) return (EINVAL); /* Can't mix input/output together */ Modified: stable/9/sys/mips/atheros/ar71xx_gpio.c == --- stable/9/sys/mips/atheros/ar71xx_gpio.cTue Apr 16 16:09:27 2013 (r249549) +++ stable/9/sys/mips/atheros/ar71xx_gpio.cTue Apr 16 16:35:48 2013 (r249550) @@ -238,8 +238,8 @@ ar71xx_gpio_pin_setflags(device_t dev, u if (i >= sc->gpio_npins) return (EINVAL); - /* Filter out unwanted flags */ - if ((flags &= sc->gpio_pins[i].gp_caps) != flags) + /* Check for unwanted flags. */ + if ((flags & sc->gpio_pins[i].gp_caps) != flags) return (EINVAL); /* Can't mix input/output together */ Modified: stable/9/sys/mips/rt305x/rt305x_gpio.c == --- stable/9/sys/mips/rt305x/rt305x_gpio.c Tue Apr 16 16:09:27 2013 (r249549) +++ stable/9/sys/mips/rt305x/rt305x_gpio.c Tue Apr 16 16:35:48 2013 (r249550) @@ -242,8 +242,8 @@ rt305x_gpio_pin_setflags(device_t dev, u if (i >= sc->gpio_npins) return (EINVAL); - /* Filter out unwanted flags */ - if ((flags &= sc->gpio_pins[i].gp_caps) != flags) + /* Check for unwanted flags. */ + if ((flags & sc->gpio_pins[i].gp_caps) != flags) return (EINVAL); /* Can't mix input/output together */ ___ svn-src-...@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" ___ freebsd-bugs@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-bugs To unsubscribe, send any mail to "freebsd-bugs-unsubscr...@freebsd.org"
Re: kern/177759: commit references a PR
The following reply was made to PR kern/177759; it has been noted by GNATS. From: dfil...@freebsd.org (dfilter service) To: bug-follo...@freebsd.org Cc: Subject: Re: kern/177759: commit references a PR Date: Tue, 16 Apr 2013 17:50:40 + (UTC) Author: dim Date: Tue Apr 16 17:50:20 2013 New Revision: 249557 URL: http://svnweb.freebsd.org/changeset/base/249557 Log: MFC r249449: Fix undefined behaviour in several gpio_pin_setflags() routines (under sys/arm and sys/mips), squelching the clang 3.3 warnings about this. Noticed by: tinderbox and many irate spectators Submitted by:Luiz Otavio O Souza PR: kern/177759 Modified: stable/8/sys/mips/atheros/ar71xx_gpio.c Directory Properties: stable/8/sys/ (props changed) stable/8/sys/mips/ (props changed) Modified: stable/8/sys/mips/atheros/ar71xx_gpio.c == --- stable/8/sys/mips/atheros/ar71xx_gpio.cTue Apr 16 17:47:13 2013 (r249556) +++ stable/8/sys/mips/atheros/ar71xx_gpio.cTue Apr 16 17:50:20 2013 (r249557) @@ -225,8 +225,8 @@ ar71xx_gpio_pin_setflags(device_t dev, u if (i >= sc->gpio_npins) return (EINVAL); - /* Filter out unwanted flags */ - if ((flags &= sc->gpio_pins[i].gp_caps) != flags) + /* Check for unwanted flags. */ + if ((flags & sc->gpio_pins[i].gp_caps) != flags) return (EINVAL); /* Can't mix input/output together */ ___ svn-src-...@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" ___ freebsd-bugs@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-bugs To unsubscribe, send any mail to "freebsd-bugs-unsubscr...@freebsd.org"
Re: kern/173723: commit references a PR
The following reply was made to PR kern/173723; it has been noted by GNATS.
From: dfil...@freebsd.org (dfilter service)
To: bug-follo...@freebsd.org
Cc:
Subject: Re: kern/173723: commit references a PR
Date: Tue, 16 Apr 2013 19:19:29 + (UTC)
Author: trociny
Date: Tue Apr 16 19:19:14 2013
New Revision: 249558
URL: http://svnweb.freebsd.org/changeset/base/249558
Log:
Add a new set of notes to a process core dump to store procstat data.
The notes format is a header of sizeof(int), which stores the size of
the corresponding data structure to provide some versioning, and data
in the format as it is returned by a related sysctl call.
The userland tools (procstat(1)) will be taught to extract this data,
providing additional info for postmortem analysis.
PR: kern/173723
Suggested by:jhb
Discussed with: jhb, kib
Reviewed by: jhb (initial version), kib
MFC after: 1 month
Modified:
head/sys/kern/imgact_elf.c
head/sys/sys/elf_common.h
Modified: head/sys/kern/imgact_elf.c
==
--- head/sys/kern/imgact_elf.c Tue Apr 16 17:50:20 2013(r249557)
+++ head/sys/kern/imgact_elf.c Tue Apr 16 19:19:14 2013(r249558)
@@ -66,6 +66,7 @@ __FBSDID("$FreeBSD$");
#include
#include
#include
+#include
#include
@@ -1062,12 +1063,22 @@ static void __elfN(puthdr)(struct thread
static void __elfN(putnote)(struct note_info *, struct sbuf *);
static size_t register_note(struct note_info_list *, int, outfunc_t, void *);
static int sbuf_drain_core_output(void *, const char *, int);
+static int sbuf_drain_count(void *arg, const char *data, int len);
static void __elfN(note_fpregset)(void *, struct sbuf *, size_t *);
static void __elfN(note_prpsinfo)(void *, struct sbuf *, size_t *);
static void __elfN(note_prstatus)(void *, struct sbuf *, size_t *);
static void __elfN(note_threadmd)(void *, struct sbuf *, size_t *);
static void __elfN(note_thrmisc)(void *, struct sbuf *, size_t *);
+static void __elfN(note_procstat_auxv)(void *, struct sbuf *, size_t *);
+static void __elfN(note_procstat_proc)(void *, struct sbuf *, size_t *);
+static void __elfN(note_procstat_psstrings)(void *, struct sbuf *, size_t *);
+static void note_procstat_files(void *, struct sbuf *, size_t *);
+static void note_procstat_groups(void *, struct sbuf *, size_t *);
+static void note_procstat_osrel(void *, struct sbuf *, size_t *);
+static void note_procstat_rlimit(void *, struct sbuf *, size_t *);
+static void note_procstat_umask(void *, struct sbuf *, size_t *);
+static void note_procstat_vmmap(void *, struct sbuf *, size_t *);
#ifdef COMPRESS_USER_CORES
extern int compress_user_cores;
@@ -1113,9 +1124,21 @@ static int
sbuf_drain_core_output(void *arg, const char *data, int len)
{
struct sbuf_drain_core_params *p;
- int error;
+ int error, locked;
p = (struct sbuf_drain_core_params *)arg;
+
+ /*
+ * Some kern_proc out routines that print to this sbuf may
+ * call us with the process lock held. Draining with the
+ * non-sleepable lock held is unsafe. The lock is needed for
+ * those routines when dumping a live process. In our case we
+ * can safely release the lock before draining and acquire
+ * again after.
+ */
+ locked = PROC_LOCKED(p->td->td_proc);
+ if (locked)
+ PROC_UNLOCK(p->td->td_proc);
#ifdef COMPRESS_USER_CORES
if (p->gzfile != Z_NULL)
error = compress_core(p->gzfile, NULL, __DECONST(char *, data),
@@ -1126,12 +1149,27 @@ sbuf_drain_core_output(void *arg, const
__DECONST(void *, data), len, p->offset, UIO_SYSSPACE,
IO_UNIT | IO_DIRECT, p->active_cred, p->file_cred, NULL,
p->td);
+ if (locked)
+ PROC_LOCK(p->td->td_proc);
if (error != 0)
return (-error);
p->offset += len;
return (len);
}
+/*
+ * Drain into a counter.
+ */
+static int
+sbuf_drain_count(void *arg, const char *data __unused, int len)
+{
+ size_t *sizep;
+
+ sizep = (size_t *)arg;
+ *sizep += len;
+ return (len);
+}
+
int
__elfN(coredump)(struct thread *td, struct vnode *vp, off_t limit, int flags)
{
@@ -1436,6 +1474,25 @@ __elfN(prepare_notes)(struct thread *td,
thr = TAILQ_NEXT(thr, td_plist);
}
+ size += register_note(list, NT_PROCSTAT_PROC,
+ __elfN(note_procstat_proc), p);
+ size += register_note(list, NT_PROCSTAT_FILES,
+ note_procstat_files, p);
+ size += register_note(list, NT_PROCSTAT_VMMAP,
+ note_procstat_vmmap, p);
+ size += register_note(list, NT_PROCSTAT_GROUPS,
+ note_procstat_groups, p);
+
Re: kern/172963: commit references a PR
The following reply was made to PR kern/172963; it has been noted by GNATS.
From: dfil...@freebsd.org (dfilter service)
To: bug-follo...@freebsd.org
Cc:
Subject: Re: kern/172963: commit references a PR
Date: Fri, 19 Apr 2013 21:09:04 + (UTC)
Author: rwatson
Date: Fri Apr 19 21:08:56 2013
New Revision: 249660
URL: http://svnweb.freebsd.org/changeset/base/249660
Log:
Merge r249478 from stable/8 to releng/8.4:
FreeBSD 8.0 introduced inpcb reference counting, and FreeBSD 8.1 began
using
that reference count to protect inpcb stability in udp_pcblist() and other
monitoring functions, preventing the inpcb from being garbage collected
across potentially sleeping copyout() operations despite the inpcb zone
becoming shrinkable.
However, this introduced a race condition in which inp->inp_socket() might
become NULL as a result of the socket being freed, but before the inpcb we
removed from the global list of connections, allowing it to be exposed to a
third thread invoking udp_input() or udp6_input() which would try to
indirect through inp_socket without testing it for NULL. This might occur
with particular regularity on systems that frequently run netstat, or which
use SNMP for connection monitoring.
Later FreeBSD releases use a different reference/destruction model, but
stable/8 remained affected in FreeBSD 8.2 and 8.3; the problem could be
spotted on very high-load UDP services, such as top-level name servers.
An Errata Note for 8.x branches under continuing support might be
appropriate. Regardless, this fix should be merged to releng/8.4 prior to
8.4-RELEASE.
PR: 172963
Submitted by: Vincent Miller
Submitted by: Julien Charbon
Submitted by: Marc De La Gueronniere
Approved by:re (rodrigc)
Modified:
releng/8.4/sys/netinet/udp_usrreq.c
releng/8.4/sys/netinet6/udp6_usrreq.c
Directory Properties:
releng/8.4/sys/ (props changed)
releng/8.4/sys/netinet/ (props changed)
releng/8.4/sys/netinet6/ (props changed)
Modified: releng/8.4/sys/netinet/udp_usrreq.c
==
--- releng/8.4/sys/netinet/udp_usrreq.cFri Apr 19 21:08:21 2013
(r249659)
+++ releng/8.4/sys/netinet/udp_usrreq.cFri Apr 19 21:08:56 2013
(r249660)
@@ -495,6 +495,15 @@ udp_input(struct mbuf *m, int off)
INP_RLOCK(inp);
/*
+ * Detached PCBs can linger in the list if someone
+ * holds a reference. (e.g. udp_pcblist)
+ */
+ if (inp->inp_socket == NULL) {
+ INP_RUNLOCK(inp);
+ continue;
+ }
+
+ /*
* Handle socket delivery policy for any-source
* and source-specific multicast. [RFC3678]
*/
@@ -620,6 +629,15 @@ udp_input(struct mbuf *m, int off)
*/
INP_RLOCK(inp);
INP_INFO_RUNLOCK(&V_udbinfo);
+
+ /*
+ * Detached PCBs can linger in the hash table if someone holds a
+ * reference. (e.g. udp_pcblist)
+ */
+ if (inp->inp_socket == NULL) {
+ INP_RUNLOCK(inp);
+ goto badunlocked;
+ }
if (inp->inp_ip_minttl && inp->inp_ip_minttl > ip->ip_ttl) {
INP_RUNLOCK(inp);
goto badunlocked;
Modified: releng/8.4/sys/netinet6/udp6_usrreq.c
==
--- releng/8.4/sys/netinet6/udp6_usrreq.c Fri Apr 19 21:08:21 2013
(r249659)
+++ releng/8.4/sys/netinet6/udp6_usrreq.c Fri Apr 19 21:08:56 2013
(r249660)
@@ -273,6 +273,13 @@ udp6_input(struct mbuf **mp, int *offp,
}
/*
+ * Detached PCBs can linger in the list if someone
+ * holds a reference. (e.g. udp_pcblist)
+ */
+ if (inp->inp_socket == NULL)
+ continue;
+
+ /*
* Handle socket delivery policy for any-source
* and source-specific multicast. [RFC3678]
*/
@@ -396,6 +403,15 @@ udp6_input(struct mbuf **mp, int *offp,
}
INP_RLOCK(inp);
INP_INFO_RUNLOCK(&V_udbinfo);
+
+ /*
+ * Detached PCBs can linger in the hash table if someone holds a
+ * reference. (e.g. udp_pcblist)
+ */
+ if (inp->inp_socket == NULL) {
+ INP_RUNLOCK(inp);
+ goto badunlocked;
+ }
up = intoudp
Re: kern/175546: commit references a PR
The following reply was made to PR kern/175546; it has been noted by GNATS.
From: dfil...@freebsd.org (dfilter service)
To: bug-follo...@freebsd.org
Cc:
Subject: Re: kern/175546: commit references a PR
Date: Tue, 30 Apr 2013 05:08:30 + (UTC)
Author: pluknet
Date: Tue Apr 30 05:08:17 2013
New Revision: 250088
URL: http://svnweb.freebsd.org/changeset/base/250088
Log:
Pass a format string to kproc_create() [1] and thus fix the build with
-DBKTR_NEW_MSP34XX_DRIVER and -Wformat-security.
This also allows to eliminates a superfluous malloc/snprintf/free on
intermediate buffer.
PR: kern/175546
MFC after: 1 week
Modified:
head/sys/dev/bktr/msp34xx.c
Modified: head/sys/dev/bktr/msp34xx.c
==
--- head/sys/dev/bktr/msp34xx.cTue Apr 30 01:15:10 2013
(r250087)
+++ head/sys/dev/bktr/msp34xx.cTue Apr 30 05:08:17 2013
(r250088)
@@ -134,7 +134,6 @@ struct msp3400c {
/* thread */
struct proc *kthread;
- char*threaddesc;
int active,restart,rmmod;
@@ -1147,12 +1146,6 @@ int msp_attach(bktr_ptr_t bktr)
msp->bass = 32768;
msp->treble = 32768;
msp->input = -1;
- msp->threaddesc = malloc(15 * sizeof(char), M_DEVBUF, M_NOWAIT);
- if (msp->threaddesc == NULL) {
- free(msp, M_DEVBUF);
-return ENOMEM;
- }
- snprintf(msp->threaddesc, 14, "%s_msp34xx_thread", bktr->bktr_xname);
for (i = 0; i < DFP_COUNT; i++)
msp->dfp_regs[i] = -1;
@@ -1163,7 +1156,6 @@ int msp_attach(bktr_ptr_t bktr)
if (-1 != rev1)
rev2 = msp3400c_read(bktr, I2C_MSP3400C_DFP, 0x1f);
if ((-1 == rev1) || (0 == rev1 && 0 == rev2)) {
- free(msp->threaddesc, M_DEVBUF);
free(msp, M_DEVBUF);
bktr->msp3400c_info = NULL;
printf("%s: msp3400: error while reading chip version\n",
bktr_name(bktr));
@@ -1199,10 +1191,9 @@ int msp_attach(bktr_ptr_t bktr)
/* startup control thread */
err = kproc_create(msp->simple ? msp3410d_thread : msp3400c_thread,
bktr, &msp->kthread, (RFFDG | RFPROC), 0,
- msp->threaddesc);
+ "%s_msp34xx_thread", bktr->bktr_xname);
if (err) {
printf("%s: Error returned by kproc_create: %d",
bktr_name(bktr), err);
- free(msp->threaddesc, M_DEVBUF);
free(msp, M_DEVBUF);
bktr->msp3400c_info = NULL;
return ENXIO;
___
svn-src-...@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"
___
freebsd-bugs@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-bugs
To unsubscribe, send any mail to "freebsd-bugs-unsubscr...@freebsd.org"
Re: conf/174071: commit references a PR
The following reply was made to PR conf/174071; it has been noted by GNATS.
From: dfil...@freebsd.org (dfilter service)
To: bug-follo...@freebsd.org
Cc:
Subject: Re: conf/174071: commit references a PR
Date: Wed, 1 May 2013 09:56:16 + (UTC)
Author: benno
Date: Wed May 1 09:56:09 2013
New Revision: 250143
URL: http://svnweb.freebsd.org/changeset/base/250143
Log:
Optimize SUBDIR_OVERRIDE such that SUBDIR isn't automatically defined if
SUBDIR_OVERRIDE is defined.
PR: conf/174071
Submitted by:Garrett Cooper
Sponsored by:EMC / Isilon Storage Division
Modified:
head/Makefile.inc1
Modified: head/Makefile.inc1
==
--- head/Makefile.inc1 Wed May 1 09:20:13 2013(r250142)
+++ head/Makefile.inc1 Wed May 1 09:56:09 2013(r250143)
@@ -58,6 +58,9 @@
# use that new version. And the new (dynamically-linked) /bin/sh
# will expect to find appropriate libraries in /lib and /libexec.
#
+.if defined(SUBDIR_OVERRIDE)
+SUBDIR= ${SUBDIR_OVERRIDE}
+.else
SUBDIR= share/info lib libexec
SUBDIR+=bin
.if ${MK_GAMES} != "no"
@@ -96,9 +99,6 @@ SUBDIR+=etc
SUBDIR+= ${_DIR}
.endif
.endfor
-
-.if defined(SUBDIR_OVERRIDE)
-SUBDIR= ${SUBDIR_OVERRIDE}
.endif
.if defined(NOCLEAN)
___
svn-src-...@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"
___
freebsd-bugs@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-bugs
To unsubscribe, send any mail to "freebsd-bugs-unsubscr...@freebsd.org"
Re: kern/168077: commit references a PR
The following reply was made to PR kern/168077; it has been noted by GNATS.
From: dfil...@freebsd.org (dfilter service)
To: bug-follo...@freebsd.org
Cc:
Subject: Re: kern/168077: commit references a PR
Date: Sat, 4 May 2013 16:56:03 + (UTC)
Author: davide
Date: Sat May 4 16:55:48 2013
New Revision: 250243
URL: http://svnweb.freebsd.org/changeset/base/250243
Log:
If the kernel is compiled with VMIMAGE support, the first attempt of
mounting smbfs share will cause a panic. Fix setting setting/restoring
vnet context when needed.
PR: kern/168077
Submitted by:dteske
Modified:
head/sys/netsmb/smb_trantcp.c
Modified: head/sys/netsmb/smb_trantcp.c
==
--- head/sys/netsmb/smb_trantcp.c Sat May 4 16:41:14 2013
(r250242)
+++ head/sys/netsmb/smb_trantcp.c Sat May 4 16:55:48 2013
(r250243)
@@ -46,6 +46,7 @@ __FBSDID("$FreeBSD$");
#include
#include
+#include
#include
#include
@@ -79,13 +80,17 @@ static int
nb_setsockopt_int(struct socket *so, int level, int name, int val)
{
struct sockopt sopt;
+ int error;
bzero(&sopt, sizeof(sopt));
sopt.sopt_level = level;
sopt.sopt_name = name;
sopt.sopt_val = &val;
sopt.sopt_valsize = sizeof(val);
- return sosetopt(so, &sopt);
+ CURVNET_SET(so->so_vnet);
+ error = sosetopt(so, &sopt);
+ CURVNET_RESTORE();
+ return error;
}
static int
@@ -299,8 +304,10 @@ nbssn_recvhdr(struct nbpcb *nbp, int *le
auio.uio_offset = 0;
auio.uio_resid = sizeof(len);
auio.uio_td = td;
+ CURVNET_SET(so->so_vnet);
error = soreceive(so, (struct sockaddr **)NULL, &auio,
(struct mbuf **)NULL, (struct mbuf **)NULL, &flags);
+ CURVNET_RESTORE();
if (error)
return error;
if (auio.uio_resid > 0) {
@@ -384,8 +391,10 @@ nbssn_recv(struct nbpcb *nbp, struct mbu
*/
do {
rcvflg = MSG_WAITALL;
+ CURVNET_SET(so->so_vnet);
error = soreceive(so, (struct sockaddr **)NULL,
&auio, &tm, (struct mbuf **)NULL, &rcvflg);
+ CURVNET_RESTORE();
} while (error == EWOULDBLOCK || error == EINTR ||
error == ERESTART);
if (error)
___
svn-src-...@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"
___
freebsd-bugs@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-bugs
To unsubscribe, send any mail to "freebsd-bugs-unsubscr...@freebsd.org"
Re: kern/178477: commit references a PR
The following reply was made to PR kern/178477; it has been noted by GNATS.
From: dfil...@freebsd.org (dfilter service)
To: bug-follo...@freebsd.org
Cc:
Subject: Re: kern/178477: commit references a PR
Date: Fri, 10 May 2013 10:06:53 + (UTC)
Author: adrian
Date: Fri May 10 10:06:45 2013
New Revision: 250444
URL: http://svnweb.freebsd.org/changeset/base/250444
Log:
Make sure the holding descriptor and link pointer are both freed during
a non-loss reset.
When the drain functions are called, the holding descriptor and link pointers
are NULLed out.
But when the processq function is called during a non-loss reset, this
doesn't occur. So the next time a DMA occurs, it's chained to a descriptor
that no longer exists and the hardware gets angry.
Tested:
* AR5416, STA mode; use sysctl dev.ath.X.forcebstuck=1 to force a non-loss
reset.
TODO:
* Further AR9380 testing just to check that the behaviour for the EDMA
chips is sane.
PR: kern/178477
Modified:
head/sys/dev/ath/if_ath.c
head/sys/dev/ath/if_ath_tx_edma.c
Modified: head/sys/dev/ath/if_ath.c
==
--- head/sys/dev/ath/if_ath.c Fri May 10 09:58:32 2013(r250443)
+++ head/sys/dev/ath/if_ath.c Fri May 10 10:06:45 2013(r250444)
@@ -4668,9 +4668,21 @@ ath_legacy_tx_drain(struct ath_softc *sc
if (sc->sc_debug & ATH_DEBUG_RESET)
ath_tx_dump(sc, &sc->sc_txq[i]);
#endif/* ATH_DEBUG */
- if (reset_type == ATH_RESET_NOLOSS)
+ if (reset_type == ATH_RESET_NOLOSS) {
ath_tx_processq(sc, &sc->sc_txq[i], 0);
- else
+ ATH_TXQ_LOCK(&sc->sc_txq[i]);
+ /*
+ * Free the holding buffer; DMA is now
+ * stopped.
+ */
+ ath_txq_freeholdingbuf(sc, &sc->sc_txq[i]);
+ /*
+ * Reset the link pointer to NULL; there's
+ * no frames to chain DMA to.
+ */
+ sc->sc_txq[i].axq_link = NULL;
+ ATH_TXQ_UNLOCK(&sc->sc_txq[i]);
+ } else
ath_tx_draintxq(sc, &sc->sc_txq[i]);
}
}
Modified: head/sys/dev/ath/if_ath_tx_edma.c
==
--- head/sys/dev/ath/if_ath_tx_edma.c Fri May 10 09:58:32 2013
(r250443)
+++ head/sys/dev/ath/if_ath_tx_edma.c Fri May 10 10:06:45 2013
(r250444)
@@ -551,6 +551,22 @@ ath_edma_tx_drain(struct ath_softc *sc,
*/
if (reset_type == ATH_RESET_NOLOSS) {
ath_edma_tx_processq(sc, 0);
+ for (i = 0; i < HAL_NUM_TX_QUEUES; i++) {
+ if (ATH_TXQ_SETUP(sc, i)) {
+ ATH_TXQ_LOCK(&sc->sc_txq[i]);
+ /*
+ * Free the holding buffer; DMA is now
+ * stopped.
+ */
+ ath_txq_freeholdingbuf(sc, &sc->sc_txq[i]);
+ /*
+ * Reset the link pointer to NULL; there's
+ * no frames to chain DMA to.
+ */
+ sc->sc_txq[i].axq_link = NULL;
+ ATH_TXQ_UNLOCK(&sc->sc_txq[i]);
+ }
+ }
} else {
for (i = 0; i < HAL_NUM_TX_QUEUES; i++) {
if (ATH_TXQ_SETUP(sc, i))
___
svn-src-...@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"
___
freebsd-bugs@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-bugs
To unsubscribe, send any mail to "freebsd-bugs-unsubscr...@freebsd.org"
Re: conf/175397: commit references a PR
The following reply was made to PR conf/175397; it has been noted by GNATS. From: dfil...@freebsd.org (dfilter service) To: bug-follo...@freebsd.org Cc: Subject: Re: conf/175397: commit references a PR Date: Fri, 10 May 2013 13:57:57 + (UTC) Author: eadler Date: Fri May 10 13:57:44 2013 New Revision: 250453 URL: http://svnweb.freebsd.org/changeset/base/250453 Log: Bring /etc/protocols up to date. PR: conf/175397 Submitted by:ak Modified: head/etc/protocols Modified: head/etc/protocols == --- head/etc/protocols Fri May 10 13:09:44 2013(r250452) +++ head/etc/protocols Fri May 10 13:57:44 2013(r250453) @@ -92,6 +92,7 @@ vmtp 81 VMTP# Versatile Message Transp secure-vmtp 82 SECURE-VMTP # SECURE-VMTP vines 83 VINES # VINES ttp 84 TTP # TTP +#iptm 84 IPTM# Protocol Internet Protocol Traffic nsfnet-igp85 NSFNET-IGP # NSFNET-IGP dgp 86 DGP # Dissimilar Gateway Protocol tcf 87 TCF # TCF @@ -145,7 +146,13 @@ rsvp-e2e-ignore 134 RSVP-E2E-IGNORE # Ag mobility-header 135 Mobility-Header # Mobility Support in IPv6 udplite 136 UDPLite # The UDP-Lite Protocol mpls-in-ip137 MPLS-IN-IP # Encapsulating MPLS in IP +manet 138 MANET # MANET Protocols (RFC5498) +hip 139 HIP # Host Identity Protocol (RFC5201) +shim6 140 SHIM6 # Shim6 Protocol (RFC5533) +wesp 141 WESP# Wrapped Encapsulating Security Payload (RFC5840) +rohc 142 ROHC# Robust Header Compression (RFC5858) # 138-254 # Unassigned pfsync240 PFSYNC # PF Synchronization +# 253-254 # Use for experimentation and testing (RFC3692) # 255 # Reserved divert258 DIVERT # Divert pseudo-protocol [non IANA] ___ svn-src-...@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" ___ freebsd-bugs@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-bugs To unsubscribe, send any mail to "freebsd-bugs-unsubscr...@freebsd.org"
Re: kern/72585: commit references a PR
The following reply was made to PR kern/72585; it has been noted by GNATS. From: dfil...@freebsd.org (dfilter service) To: bug-follo...@freebsd.org Cc: Subject: Re: kern/72585: commit references a PR Date: Fri, 10 May 2013 16:30:46 + (UTC) Author: eadler Date: Fri May 10 16:30:39 2013 New Revision: 250459 URL: http://svnweb.freebsd.org/changeset/base/250459 Log: Add the letter 'q' to the font iso05-8x16.fnt PR: 72585 PR: 169797 Submitted by:Takefu Submitted by:Satoshi KImura Modified: head/share/syscons/fonts/iso05-8x16.fnt Modified: head/share/syscons/fonts/iso05-8x16.fnt == --- head/share/syscons/fonts/iso05-8x16.fntFri May 10 16:16:33 2013 (r250458) +++ head/share/syscons/fonts/iso05-8x16.fntFri May 10 16:30:39 2013 (r250459) @@ -40,7 +40,7 @@ M`'S&_L#`QGPX;&1@\&!@8&#P``` M`.!@8&QV9F9F9N88&``X&!@8&!@\!@8`#@8&!@8&!F9F M/.!@8&9L>'AL9N8X&!@8&!@8&!@\[/[6UM;6 MQ@```-QF9F9F9F8```!\QL;&QL9\W&9F -M9F9F?&!@\`#<=F9@8&#P +M9F9F?&!@\';,S,S,S'P,#!X```#<=F9@8&#P M?,9@.`S&?!`P,/PP,#`P-AP```#,S,S,S,QV M9F9F9F8\&,;&UM;6_FP```#&;#@X.&S& MQL;&QL;&?@8,^/[,&#!@QOX.&!@8http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org" ___ freebsd-bugs@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-bugs To unsubscribe, send any mail to "freebsd-bugs-unsubscr...@freebsd.org"
Re: misc/169797: commit references a PR
The following reply was made to PR misc/169797; it has been noted by GNATS. From: dfil...@freebsd.org (dfilter service) To: bug-follo...@freebsd.org Cc: Subject: Re: misc/169797: commit references a PR Date: Fri, 10 May 2013 16:30:47 + (UTC) Author: eadler Date: Fri May 10 16:30:39 2013 New Revision: 250459 URL: http://svnweb.freebsd.org/changeset/base/250459 Log: Add the letter 'q' to the font iso05-8x16.fnt PR: 72585 PR: 169797 Submitted by:Takefu Submitted by:Satoshi KImura Modified: head/share/syscons/fonts/iso05-8x16.fnt Modified: head/share/syscons/fonts/iso05-8x16.fnt == --- head/share/syscons/fonts/iso05-8x16.fntFri May 10 16:16:33 2013 (r250458) +++ head/share/syscons/fonts/iso05-8x16.fntFri May 10 16:30:39 2013 (r250459) @@ -40,7 +40,7 @@ M`'S&_L#`QGPX;&1@\&!@8&#P``` M`.!@8&QV9F9F9N88&``X&!@8&!@\!@8`#@8&!@8&!F9F M/.!@8&9L>'AL9N8X&!@8&!@8&!@\[/[6UM;6 MQ@```-QF9F9F9F8```!\QL;&QL9\W&9F -M9F9F?&!@\`#<=F9@8&#P +M9F9F?&!@\';,S,S,S'P,#!X```#<=F9@8&#P M?,9@.`S&?!`P,/PP,#`P-AP```#,S,S,S,QV M9F9F9F8\&,;&UM;6_FP```#&;#@X.&S& MQL;&QL;&?@8,^/[,&#!@QOX.&!@8http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org" ___ freebsd-bugs@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-bugs To unsubscribe, send any mail to "freebsd-bugs-unsubscr...@freebsd.org"
Re: misc/174625: commit references a PR
The following reply was made to PR misc/174625; it has been noted by GNATS. From: dfil...@freebsd.org (dfilter service) To: bug-follo...@freebsd.org Cc: Subject: Re: misc/174625: commit references a PR Date: Fri, 10 May 2013 16:41:46 + (UTC) Author: eadler Date: Fri May 10 16:41:26 2013 New Revision: 250460 URL: http://svnweb.freebsd.org/changeset/base/250460 Log: Fxi a bunch of typos. PR: misc/174625 Submitted by:Jeremy Chadwick Modified: head/share/examples/ppi/ppilcd.c head/share/misc/pci_vendors head/sys/cam/ctl/scsi_ctl.c head/sys/cam/scsi/scsi_da.c head/sys/cam/scsi/scsi_pt.c head/sys/dev/aic7xxx/aic7xxx.h head/sys/dev/cp/if_cp.c head/sys/dev/ctau/if_ct.c head/sys/dev/cx/csigma.c head/sys/dev/cx/if_cx.c head/sys/dev/hptmv/entry.c head/sys/dev/isci/scil/scif_sas_domain.c head/sys/dev/nsp/nsp.c head/sys/dev/sfxge/common/efx_mcdi.c head/sys/dev/sn/if_sn.c head/sys/dev/stg/tmc18c30.c head/sys/kern/uipc_usrreq.c head/sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.c head/sys/ofed/drivers/net/mlx4/eq.c head/usr.sbin/bluetooth/hccontrol/link_control.c head/usr.sbin/dumpcis/printcis.c Modified: head/share/examples/ppi/ppilcd.c == --- head/share/examples/ppi/ppilcd.c Fri May 10 16:30:39 2013 (r250459) +++ head/share/examples/ppi/ppilcd.c Fri May 10 16:41:26 2013 (r250460) @@ -269,7 +269,7 @@ do_char(struct lcd_driver *driver, char * one of the ground pins (eg. pin 25). * * Note that the pinning on some LCD modules has the odd and even pins - * arranged as though reversed; check carefully before conecting a module + * arranged as though reversed; check carefully before connecting a module * as it is possible to toast the HD44780 if the power is reversed. */ Modified: head/share/misc/pci_vendors == --- head/share/misc/pci_vendorsFri May 10 16:30:39 2013 (r250459) +++ head/share/misc/pci_vendorsFri May 10 16:41:26 2013 (r250460) @@ -11402,7 +11402,7 @@ 0040 QSC-200/300 0050 ESC-100D 0060 ESC-100M - 00f0 MPAC-100 Syncronous Serial Card (Zilog 85230) + 00f0 MPAC-100 Synchronous Serial Card (Zilog 85230) 0170 QSCLP-100 0180 DSCLP-100 0190 SSCLP-100 Modified: head/sys/cam/ctl/scsi_ctl.c == --- head/sys/cam/ctl/scsi_ctl.cFri May 10 16:30:39 2013 (r250459) +++ head/sys/cam/ctl/scsi_ctl.cFri May 10 16:41:26 2013 (r250460) @@ -2137,7 +2137,7 @@ ctlfe_dump_queue(struct ctlfe_lun_softc xpt_print(periph->path, "%d requests total waiting for CCBs\n", num_items); - xpt_print(periph->path, "%ju CCBs oustanding (%ju allocated, %ju " + xpt_print(periph->path, "%ju CCBs outstanding (%ju allocated, %ju " "freed)\n", (uintmax_t)(softc->ccbs_alloced - softc->ccbs_freed), (uintmax_t)softc->ccbs_alloced, (uintmax_t)softc->ccbs_freed); Modified: head/sys/cam/scsi/scsi_da.c == --- head/sys/cam/scsi/scsi_da.cFri May 10 16:30:39 2013 (r250459) +++ head/sys/cam/scsi/scsi_da.cFri May 10 16:41:26 2013 (r250460) @@ -2328,7 +2328,7 @@ skipstate: out: /* - * Block out any asyncronous callbacks + * Block out any asynchronous callbacks * while we touch the pending ccb list. */ LIST_INSERT_HEAD(&softc->pending_ccbs, @@ -2729,7 +2729,7 @@ dadone(struct cam_periph *periph, union } /* - * Block out any asyncronous callbacks + * Block out any asynchronous callbacks * while we touch the pending ccb list. */ LIST_REMOVE(&done_ccb->ccb_h, periph_links.le); Modified: head/sys/cam/scsi/scsi_pt.c == --- head/sys/cam/scsi/scsi_pt.cFri May 10 16:30:39 2013 (r250459) +++ head/sys/cam/scsi/scsi_pt.cFri May 10 16:41:26 2013 (r250460) @@ -455,7 +455,7 @@ ptstart(struct cam_periph *periph, union start_ccb->ccb_h.ccb_state = PT_CCB_BUFFER_IO_UA; /* - * Block out any asyncronous callbacks + * Block out any asynchronous callbacks * while we touch the pending ccb list. */ LIST_INSERT_HEAD(&softc->pending_
Re: bin/75258: commit references a PR
The following reply was made to PR bin/75258; it has been noted by GNATS.
From: dfil...@freebsd.org (dfilter service)
To: bug-follo...@freebsd.org
Cc:
Subject: Re: bin/75258: commit references a PR
Date: Fri, 10 May 2013 18:43:45 + (UTC)
Author: eadler
Date: Fri May 10 18:43:36 2013
New Revision: 250469
URL: http://svnweb.freebsd.org/changeset/base/250469
Log:
Make dd's signal handler async safe.
PR: bin/75258
Submitted by:"Oleg V. Nauman"
Arrival Date:Sun Dec 19 14:50:21 GMT 2004
Reviewed by: mjg, jhb
Reviewed by: jilles (earlier version)
MFC after: 1 week
Modified:
head/bin/dd/args.c
head/bin/dd/conv_tab.c
head/bin/dd/dd.c
head/bin/dd/extern.h
head/bin/dd/misc.c
head/bin/dd/position.c
Modified: head/bin/dd/args.c
==
--- head/bin/dd/args.c Fri May 10 18:41:14 2013(r250468)
+++ head/bin/dd/args.c Fri May 10 18:43:36 2013(r250469)
@@ -45,6 +45,7 @@ __FBSDID("$FreeBSD$");
#include
#include
#include
+#include
#include
#include
Modified: head/bin/dd/conv_tab.c
==
--- head/bin/dd/conv_tab.c Fri May 10 18:41:14 2013(r250468)
+++ head/bin/dd/conv_tab.c Fri May 10 18:43:36 2013(r250469)
@@ -41,6 +41,7 @@ __FBSDID("$FreeBSD$");
#include
+#include
#include
#include "dd.h"
Modified: head/bin/dd/dd.c
==
--- head/bin/dd/dd.c Fri May 10 18:41:14 2013(r250468)
+++ head/bin/dd/dd.c Fri May 10 18:43:36 2013(r250469)
@@ -81,6 +81,7 @@ size_t cbsz; /* conversion block
size
uintmax_t files_cnt = 1; /* # of files to copy */
const u_char *ctab; /* conversion table */
char fill_char; /* Character to fill with if defined */
+volatile sig_atomic_t need_summary;
int
main(int argc __unused, char *argv[])
@@ -89,7 +90,7 @@ main(int argc __unused, char *argv[])
jcl(argv);
setup();
- (void)signal(SIGINFO, summaryx);
+ (void)signal(SIGINFO, siginfo_handler);
(void)signal(SIGINT, terminate);
atexit(summary);
@@ -375,6 +376,9 @@ dd_in(void)
in.dbp += in.dbrcnt;
(*cfunc)();
+ if (need_summary) {
+ summary();
+ }
}
}
Modified: head/bin/dd/extern.h
==
--- head/bin/dd/extern.h Fri May 10 18:41:14 2013(r250468)
+++ head/bin/dd/extern.h Fri May 10 18:43:36 2013(r250469)
@@ -43,7 +43,7 @@ void jcl(char **);
void pos_in(void);
void pos_out(void);
void summary(void);
-void summaryx(int);
+void siginfo_handler(int);
void terminate(int);
void unblock(void);
void unblock_close(void);
@@ -61,3 +61,4 @@ extern const u_char e2a_32V[], e2a_POSIX
extern const u_char a2ibm_32V[], a2ibm_POSIX[];
extern u_char casetab[];
extern char fill_char;
+extern volatile sig_atomic_t need_summary;
Modified: head/bin/dd/misc.c
==
--- head/bin/dd/misc.c Fri May 10 18:41:14 2013(r250468)
+++ head/bin/dd/misc.c Fri May 10 18:43:36 2013(r250469)
@@ -44,6 +44,7 @@ __FBSDID("$FreeBSD$");
#include
#include
+#include
#include
#include
#include
@@ -57,41 +58,32 @@ summary(void)
{
struct timeval tv;
double secs;
- char buf[100];
(void)gettimeofday(&tv, NULL);
secs = tv.tv_sec + tv.tv_usec * 1e-6 - st.start;
if (secs < 1e-6)
secs = 1e-6;
- /* Use snprintf(3) so that we don't reenter stdio(3). */
- (void)snprintf(buf, sizeof(buf),
+ (void)fprintf(stderr,
"%ju+%ju records in\n%ju+%ju records out\n",
st.in_full, st.in_part, st.out_full, st.out_part);
- (void)write(STDERR_FILENO, buf, strlen(buf));
- if (st.swab) {
- (void)snprintf(buf, sizeof(buf), "%ju odd length swab %s\n",
+ if (st.swab)
+ (void)fprintf(stderr, "%ju odd length swab %s\n",
st.swab, (st.swab == 1) ? "block" : "blocks");
- (void)write(STDERR_FILENO, buf, strlen(buf));
- }
- if (st.trunc) {
- (void)snprintf(buf, sizeof(buf), "%ju truncated %s\n",
+ if (st.trunc)
+ (void)fprintf(stderr, "%ju truncated %s\n",
st.trunc, (st.trunc == 1) ? "block" : "blocks");
- (void)write(STDERR_FILENO, buf, strl
Re: bin/119483: commit references a PR
The following reply was made to PR bin/119483; it has been noted by GNATS.
From: dfil...@freebsd.org (dfilter service)
To: bug-follo...@freebsd.org
Cc:
Subject: Re: bin/119483: commit references a PR
Date: Sat, 11 May 2013 13:32:45 + (UTC)
Author: eadler
Date: Sat May 11 13:32:38 2013
New Revision: 250509
URL: http://svnweb.freebsd.org/changeset/base/250509
Log:
The M_VESA_MODE_MAX is latest valid mode - not the first invalid.
Permit its use in vidcontrol -i
PR: bin/119483
Submitted by:Dan Lukes
Arrival-Date:Wed Jan 09 10:30:01 UTC 2008
Reviewed by: ed
MFC after: 3 days
Modified:
head/usr.sbin/vidcontrol/vidcontrol.c
Modified: head/usr.sbin/vidcontrol/vidcontrol.c
==
--- head/usr.sbin/vidcontrol/vidcontrol.c Sat May 11 13:21:31 2013
(r250508)
+++ head/usr.sbin/vidcontrol/vidcontrol.c Sat May 11 13:32:38 2013
(r250509)
@@ -959,7 +959,7 @@ show_mode_info(void)
printf("---"
"---\n");
- for (mode = 0; mode < M_VESA_MODE_MAX; ++mode) {
+ for (mode = 0; mode <= M_VESA_MODE_MAX; ++mode) {
_info.vi_mode = mode;
if (ioctl(0, CONS_MODEINFO, &_info))
continue;
___
svn-src-...@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"
___
freebsd-bugs@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-bugs
To unsubscribe, send any mail to "freebsd-bugs-unsubscr...@freebsd.org"
Re: kern/178040: commit references a PR
The following reply was made to PR kern/178040; it has been noted by GNATS.
From: dfil...@freebsd.org (dfilter service)
To: bug-follo...@freebsd.org
Cc:
Subject: Re: kern/178040: commit references a PR
Date: Sat, 11 May 2013 23:13:57 + (UTC)
Author: eadler
Date: Sat May 11 23:13:49 2013
New Revision: 250532
URL: http://svnweb.freebsd.org/changeset/base/250532
Log:
Intel's 320-series and 510-series SSDs advertise 512-byte sectors
sizes for both logical and physical. Add ADA_Q_4K quirks
for both.
PR: kern/178040
Submitted by:Jeremy Chadwick
Modified:
head/sys/cam/ata/ata_da.c
Modified: head/sys/cam/ata/ata_da.c
==
--- head/sys/cam/ata/ata_da.c Sat May 11 22:32:43 2013(r250531)
+++ head/sys/cam/ata/ata_da.c Sat May 11 23:13:49 2013(r250532)
@@ -350,6 +350,14 @@ static struct ada_quirk_entry ada_quirk_
},
{
/*
+ * Intel 320 Series SSDs
+ * 4k optimised & trim only works in 4k requests + 4k aligned
+ */
+ { T_DIRECT, SIP_MEDIA_FIXED, "*", "INTEL SSDSA2CW*", "*" },
+ /*quirks*/ADA_Q_4K
+ },
+ {
+ /*
* Intel 330 Series SSDs
* 4k optimised & trim only works in 4k requests + 4k aligned
* Submitted by: Steven Hartland
@@ -360,6 +368,14 @@ static struct ada_quirk_entry ada_quirk_
},
{
/*
+ * Intel 510 Series SSDs
+ * 4k optimised & trim only works in 4k requests + 4k aligned
+ */
+ { T_DIRECT, SIP_MEDIA_FIXED, "*", "INTEL SSDSC2MH*", "*" },
+ /*quirks*/ADA_Q_4K
+ },
+ {
+ /*
* OCZ Deneva R Series SSDs
* 4k optimised & trim only works in 4k requests + 4k aligned
* Submitted by: Steven Hartland
___
svn-src-...@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"
___
freebsd-bugs@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-bugs
To unsubscribe, send any mail to "freebsd-bugs-unsubscr...@freebsd.org"
Re: conf/176098: commit references a PR
The following reply was made to PR conf/176098; it has been noted by GNATS.
From: dfil...@freebsd.org (dfilter service)
To: bug-follo...@freebsd.org
Cc:
Subject: Re: conf/176098: commit references a PR
Date: Sat, 11 May 2013 23:55:51 + (UTC)
Author: eadler
Date: Sat May 11 23:55:43 2013
New Revision: 250533
URL: http://svnweb.freebsd.org/changeset/base/250533
Log:
Unconditionally install 210.backup-aliases as many MTAs other than
sendmail support the use of /etc/aliases.
PR: conf/176098
Submitted by:ak
MFC after: 2 weeks
Modified:
head/etc/periodic/daily/Makefile
head/tools/build/mk/OptionalObsoleteFiles.inc
Modified: head/etc/periodic/daily/Makefile
==
--- head/etc/periodic/daily/Makefile Sat May 11 23:13:49 2013
(r250532)
+++ head/etc/periodic/daily/Makefile Sat May 11 23:55:43 2013
(r250533)
@@ -6,6 +6,7 @@ FILES= 100.clean-disks \
110.clean-tmps \
120.clean-preserve \
200.backup-passwd \
+ 210.backup-aliases \
330.news \
400.status-disks \
401.status-graid \
@@ -51,7 +52,6 @@ FILES+= 140.clean-rwho \
.if ${MK_SENDMAIL} != "no"
FILES+= 150.clean-hoststat \
- 210.backup-aliases \
440.status-mailq \
460.status-mail-rejects \
500.queuerun
Modified: head/tools/build/mk/OptionalObsoleteFiles.inc
==
--- head/tools/build/mk/OptionalObsoleteFiles.inc Sat May 11 23:13:49
2013(r250532)
+++ head/tools/build/mk/OptionalObsoleteFiles.inc Sat May 11 23:55:43
2013(r250533)
@@ -4017,7 +4017,6 @@ OLD_FILES+=usr/share/man/man8/rtquery.8.
.if ${MK_SENDMAIL} == no
OLD_FILES+=etc/periodic/daily/150.clean-hoststat
-OLD_FILES+=etc/periodic/daily/210.backup-aliases
OLD_FILES+=etc/periodic/daily/440.status-mailq
OLD_FILES+=etc/periodic/daily/460.status-mail-rejects
OLD_FILES+=etc/periodic/daily/500.queuerun
___
svn-src-...@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"
___
freebsd-bugs@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-bugs
To unsubscribe, send any mail to "freebsd-bugs-unsubscr...@freebsd.org"
Re: misc/169797: commit references a PR
The following reply was made to PR misc/169797; it has been noted by GNATS. From: dfil...@freebsd.org (dfilter service) To: bug-follo...@freebsd.org Cc: Subject: Re: misc/169797: commit references a PR Date: Sun, 12 May 2013 04:35:08 + (UTC) Author: eadler Date: Sun May 12 04:34:55 2013 New Revision: 250553 URL: http://svnweb.freebsd.org/changeset/base/250553 Log: Add the letter 'x' to the font iso05-8x16.fnt PR: 169797 Submitted by:Takefu MFC after: 3 days Modified: head/share/syscons/fonts/iso04-wide-8x16.fnt Modified: head/share/syscons/fonts/iso04-wide-8x16.fnt == --- head/share/syscons/fonts/iso04-wide-8x16.fnt Sun May 12 04:24:25 2013(r250552) +++ head/share/syscons/fonts/iso04-wide-8x16.fnt Sun May 12 04:34:55 2013(r250553) @@ -42,7 +42,7 @@ MS'@``.!@8&!F9FQX;&9FY@`X&!@8&!@8&!@ MP\/#``#<9F9F9F9F9@``?,;&QL;&QGP``-YC M8V-C8V-^8/![QL;&QL;&?@8/WG-C8&!@8/`` M`'S&P'`http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org" ___ freebsd-bugs@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-bugs To unsubscribe, send any mail to "freebsd-bugs-unsubscr...@freebsd.org"
Re: conf/178504: commit references a PR
The following reply was made to PR conf/178504; it has been noted by GNATS. From: dfil...@freebsd.org (dfilter service) To: bug-follo...@freebsd.org Cc: Subject: Re: conf/178504: commit references a PR Date: Sun, 12 May 2013 15:24:07 + (UTC) Author: eadler Date: Sun May 12 15:23:59 2013 New Revision: 250565 URL: http://svnweb.freebsd.org/changeset/base/250565 Log: Make newsyslog compress logs with xz instead of bzip2 to save space. PR: conf/178504 Submitted by:ak Reviewed by: smh Modified: head/etc/newsyslog.conf Modified: head/etc/newsyslog.conf == --- head/etc/newsyslog.confSun May 12 13:42:49 2013(r250564) +++ head/etc/newsyslog.confSun May 12 15:23:59 2013(r250565) @@ -17,23 +17,23 @@ # future, these defaults may change to more conservative ones. # # logfilename [owner:group]mode count size when flags [/pid_file] [sig_num] -/var/log/all.log 600 7 *@T00 J -/var/log/amd.log 644 7 100 * J -/var/log/auth.log 600 7 100 @0101T JC -/var/log/console.log 600 5 100 * J -/var/log/cron 600 3 100 * JC -/var/log/daily.log640 7 *@T00 JN -/var/log/debug.log600 7 100 * JC -/var/log/init.log 644 3 100 * J -/var/log/kerberos.log 600 7 100 * J -/var/log/lpd-errs 644 7 100 * JC -/var/log/maillog 640 7 *@T00 JC -/var/log/messages 644 5 100 @0101T JC -/var/log/monthly.log 640 12*$M1D0 JN -/var/log/pflog600 3 100 * JB /var/run/pflogd.pid -/var/log/ppp.log root:network640 3 100 * JC -/var/log/security 600 10100 * JC +/var/log/all.log 600 7 *@T00 X +/var/log/amd.log 644 7 100 * X +/var/log/auth.log 600 7 100 @0101T XC +/var/log/console.log 600 5 100 * X +/var/log/cron 600 3 100 * XC +/var/log/daily.log640 7 *@T00 XN +/var/log/debug.log600 7 100 * XC +/var/log/init.log 644 3 100 * X +/var/log/kerberos.log 600 7 100 * X +/var/log/lpd-errs 644 7 100 * XC +/var/log/maillog 640 7 *@T00 XC +/var/log/messages 644 5 100 @0101T XC +/var/log/monthly.log 640 12*$M1D0 XN +/var/log/pflog600 3 100 * XB /var/run/pflogd.pid +/var/log/ppp.log root:network640 3 100 * XC +/var/log/security 600 10100 * XC /var/log/sendmail.st 640 10*168 BN /var/log/utx.log 644 3 *@01T05 B -/var/log/weekly.log 640 5 *$W6D0 JN -/var/log/xferlog 600 7 100 * JC +/var/log/weekly.log 640 5 *$W6D0 XN +/var/log/xferlog 600 7 100 * XC ___ svn-src-...@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" ___ freebsd-bugs@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-bugs To unsubscribe, send any mail to "freebsd-bugs-unsubscr...@freebsd.org"
Re: kern/176054: commit references a PR
The following reply was made to PR kern/176054; it has been noted by GNATS. From: dfil...@freebsd.org (dfilter service) To: bug-follo...@freebsd.org Cc: Subject: Re: kern/176054: commit references a PR Date: Sun, 12 May 2013 16:43:42 + (UTC) Author: eadler Date: Sun May 12 16:43:26 2013 New Revision: 250576 URL: http://svnweb.freebsd.org/changeset/base/250576 Log: Fix several typos PR: kern/176054 Submitted by:Christoph Mallon MFC after: 3 days Modified: head/lib/libc/posix1e/acl_is_trivial_np.3 head/share/man/man7/c99.7 head/sys/dev/ata/ata-lowlevel.c head/sys/dev/uart/uart_core.c head/sys/dev/usb/serial/usb_serial.c head/sys/dev/usb/serial/usb_serial.h head/sys/fs/fdescfs/fdesc_vnops.c head/sys/mips/mips/stack_machdep.c head/sys/netgraph/bluetooth/hci/ng_hci_ulpi.c head/sys/ufs/ffs/ffs_balloc.c head/sys/x86/x86/local_apic.c Modified: head/lib/libc/posix1e/acl_is_trivial_np.3 == --- head/lib/libc/posix1e/acl_is_trivial_np.3 Sun May 12 16:29:09 2013 (r250575) +++ head/lib/libc/posix1e/acl_is_trivial_np.3 Sun May 12 16:43:26 2013 (r250576) @@ -52,7 +52,7 @@ will be set to 1, if the ACL .Fa aclp points to is trivial, or 0 if it's not. .Pp -ACL is trivial if it can be fully expressed as a file mode without loosing +ACL is trivial if it can be fully expressed as a file mode without losing any access rules. For POSIX.1e ACLs, ACL is trivial if it has the three required entries, one for owner, one for owning group, and one for other. Modified: head/share/man/man7/c99.7 == --- head/share/man/man7/c99.7 Sun May 12 16:29:09 2013(r250575) +++ head/share/man/man7/c99.7 Sun May 12 16:43:26 2013(r250576) @@ -70,7 +70,7 @@ The elements of this standard library is complicated tasks. In this case the provided system calls of the given operating system can be used. -To not loose the portability by using these system calls, the POSIX +To not lose the portability by using these system calls, the POSIX (Portable Operating System Interface) standard evolved. It describes what functions should be available to keep portability. Note, that POSIX is not a C standard, but an operating system standard Modified: head/sys/dev/ata/ata-lowlevel.c == --- head/sys/dev/ata/ata-lowlevel.cSun May 12 16:29:09 2013 (r250575) +++ head/sys/dev/ata/ata-lowlevel.cSun May 12 16:43:26 2013 (r250576) @@ -503,7 +503,7 @@ ata_generic_reset(device_t dev) mask, ostat0, ostat1); /* if nothing showed up there is no need to get any further */ -/* XXX SOS is that too strong?, we just might loose devices here */ +/* XXX SOS is that too strong?, we just might lose devices here */ ch->devices = 0; if (!mask) return; Modified: head/sys/dev/uart/uart_core.c == --- head/sys/dev/uart/uart_core.c Sun May 12 16:29:09 2013 (r250575) +++ head/sys/dev/uart/uart_core.c Sun May 12 16:43:26 2013 (r250576) @@ -137,7 +137,7 @@ uart_intr_break(void *arg) * much of the data we can, but otherwise flush the receiver FIFO to * create some breathing room. The net effect is that we avoid the * overrun condition to happen for the next X characters, where X is - * related to the FIFO size at the cost of loosing data right away. + * related to the FIFO size at the cost of losing data right away. * So, instead of having multiple overrun interrupts in close proximity * to each other and possibly pessimizing UART interrupt latency for * other UARTs in a multiport configuration, we create a longer segment @@ -192,7 +192,7 @@ uart_intr_rxready(void *arg) * Line or modem status change (OOB signalling). * We pass the signals to the software interrupt handler for further * processing. Note that we merge the delta bits, but set the state - * bits. This is to avoid loosing state transitions due to having more + * bits. This is to avoid losing state transitions due to having more * than 1 hardware interrupt between software interrupts. */ static __inline int Modified: head/sys/dev/usb/serial/usb_serial.c == --- head/sys/dev/usb/serial/usb_serial.c Sun May 12 16:29:09 2013 (r250575) +++ head/sys/dev/usb/serial/usb_serial.c Sun May 12 16:43:26 2013 (r250576) @@ -965,7 +965,7 @@ ucom_cfg_line_state(struct usb_proc_msg sc->sc_pls_set = 0; sc->sc_pls_clr = 0; - /* ensure that we don't loose any levels */ + /* ensure
Re: conf/178504: commit references a PR
The following reply was made to PR conf/178504; it has been noted by GNATS. From: dfil...@freebsd.org (dfilter service) To: bug-follo...@freebsd.org Cc: Subject: Re: conf/178504: commit references a PR Date: Sun, 12 May 2013 21:24:25 + (UTC) Author: eadler Date: Sun May 12 21:24:18 2013 New Revision: 250579 URL: http://svnweb.freebsd.org/changeset/base/250579 Log: Revert r250565 which causes issues for older CPUs PR: conf/178504 Requested by:many Modified: head/etc/newsyslog.conf Modified: head/etc/newsyslog.conf == --- head/etc/newsyslog.confSun May 12 20:44:28 2013(r250578) +++ head/etc/newsyslog.confSun May 12 21:24:18 2013(r250579) @@ -17,23 +17,23 @@ # future, these defaults may change to more conservative ones. # # logfilename [owner:group]mode count size when flags [/pid_file] [sig_num] -/var/log/all.log 600 7 *@T00 X -/var/log/amd.log 644 7 100 * X -/var/log/auth.log 600 7 100 @0101T XC -/var/log/console.log 600 5 100 * X -/var/log/cron 600 3 100 * XC -/var/log/daily.log640 7 *@T00 XN -/var/log/debug.log600 7 100 * XC -/var/log/init.log 644 3 100 * X -/var/log/kerberos.log 600 7 100 * X -/var/log/lpd-errs 644 7 100 * XC -/var/log/maillog 640 7 *@T00 XC -/var/log/messages 644 5 100 @0101T XC -/var/log/monthly.log 640 12*$M1D0 XN -/var/log/pflog600 3 100 * XB /var/run/pflogd.pid -/var/log/ppp.log root:network640 3 100 * XC -/var/log/security 600 10100 * XC +/var/log/all.log 600 7 *@T00 J +/var/log/amd.log 644 7 100 * J +/var/log/auth.log 600 7 100 @0101T JC +/var/log/console.log 600 5 100 * J +/var/log/cron 600 3 100 * JC +/var/log/daily.log640 7 *@T00 JN +/var/log/debug.log600 7 100 * JC +/var/log/init.log 644 3 100 * J +/var/log/kerberos.log 600 7 100 * J +/var/log/lpd-errs 644 7 100 * JC +/var/log/maillog 640 7 *@T00 JC +/var/log/messages 644 5 100 @0101T JC +/var/log/monthly.log 640 12*$M1D0 JN +/var/log/pflog600 3 100 * JB /var/run/pflogd.pid +/var/log/ppp.log root:network640 3 100 * JC +/var/log/security 600 10100 * JC /var/log/sendmail.st 640 10*168 BN /var/log/utx.log 644 3 *@01T05 B -/var/log/weekly.log 640 5 *$W6D0 XN -/var/log/xferlog 600 7 100 * XC +/var/log/weekly.log 640 5 *$W6D0 JN +/var/log/xferlog 600 7 100 * JC ___ svn-src-...@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" ___ freebsd-bugs@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-bugs To unsubscribe, send any mail to "freebsd-bugs-unsubscr...@freebsd.org"
Re: kern/72585: commit references a PR
The following reply was made to PR kern/72585; it has been noted by GNATS. From: dfil...@freebsd.org (dfilter service) To: bug-follo...@freebsd.org Cc: Subject: Re: kern/72585: commit references a PR Date: Thu, 16 May 2013 20:32:39 + (UTC) Author: eadler Date: Thu May 16 20:32:28 2013 New Revision: 250714 URL: http://svnweb.freebsd.org/changeset/base/250714 Log: MFC r250459: Add the letter 'q' to the font iso05-8x16.fnt PR: 72585 PR: 169797 Modified: stable/8/share/syscons/fonts/iso05-8x16.fnt Directory Properties: stable/8/share/ (props changed) stable/8/share/syscons/ (props changed) Modified: stable/8/share/syscons/fonts/iso05-8x16.fnt == --- stable/8/share/syscons/fonts/iso05-8x16.fntThu May 16 20:32:09 2013(r250713) +++ stable/8/share/syscons/fonts/iso05-8x16.fntThu May 16 20:32:28 2013(r250714) @@ -40,7 +40,7 @@ M`'S&_L#`QGPX;&1@\&!@8&#P``` M`.!@8&QV9F9F9N88&``X&!@8&!@\!@8`#@8&!@8&!F9F M/.!@8&9L>'AL9N8X&!@8&!@8&!@\[/[6UM;6 MQ@```-QF9F9F9F8```!\QL;&QL9\W&9F -M9F9F?&!@\`#<=F9@8&#P +M9F9F?&!@\';,S,S,S'P,#!X```#<=F9@8&#P M?,9@.`S&?!`P,/PP,#`P-AP```#,S,S,S,QV M9F9F9F8\&,;&UM;6_FP```#&;#@X.&S& MQL;&QL;&?@8,^/[,&#!@QOX.&!@8http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org" ___ freebsd-bugs@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-bugs To unsubscribe, send any mail to "freebsd-bugs-unsubscr...@freebsd.org"
Re: kern/72585: commit references a PR
The following reply was made to PR kern/72585; it has been noted by GNATS. From: dfil...@freebsd.org (dfilter service) To: bug-follo...@freebsd.org Cc: Subject: Re: kern/72585: commit references a PR Date: Thu, 16 May 2013 20:32:17 + (UTC) Author: eadler Date: Thu May 16 20:32:09 2013 New Revision: 250713 URL: http://svnweb.freebsd.org/changeset/base/250713 Log: MFC r250459: Add the letter 'q' to the font iso05-8x16.fnt PR: 72585 PR: 169797 Modified: stable/9/share/syscons/fonts/iso05-8x16.fnt Directory Properties: stable/9/share/ (props changed) stable/9/share/syscons/ (props changed) Modified: stable/9/share/syscons/fonts/iso05-8x16.fnt == --- stable/9/share/syscons/fonts/iso05-8x16.fntThu May 16 20:27:30 2013(r250712) +++ stable/9/share/syscons/fonts/iso05-8x16.fntThu May 16 20:32:09 2013(r250713) @@ -40,7 +40,7 @@ M`'S&_L#`QGPX;&1@\&!@8&#P``` M`.!@8&QV9F9F9N88&``X&!@8&!@\!@8`#@8&!@8&!F9F M/.!@8&9L>'AL9N8X&!@8&!@8&!@\[/[6UM;6 MQ@```-QF9F9F9F8```!\QL;&QL9\W&9F -M9F9F?&!@\`#<=F9@8&#P +M9F9F?&!@\';,S,S,S'P,#!X```#<=F9@8&#P M?,9@.`S&?!`P,/PP,#`P-AP```#,S,S,S,QV M9F9F9F8\&,;&UM;6_FP```#&;#@X.&S& MQL;&QL;&?@8,^/[,&#!@QOX.&!@8http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org" ___ freebsd-bugs@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-bugs To unsubscribe, send any mail to "freebsd-bugs-unsubscr...@freebsd.org"
Re: bin/119483: commit references a PR
The following reply was made to PR bin/119483; it has been noted by GNATS.
From: dfil...@freebsd.org (dfilter service)
To: bug-follo...@freebsd.org
Cc:
Subject: Re: bin/119483: commit references a PR
Date: Fri, 17 May 2013 00:41:09 + (UTC)
Author: eadler
Date: Fri May 17 00:40:48 2013
New Revision: 250730
URL: http://svnweb.freebsd.org/changeset/base/250730
Log:
MFC r250509:
The M_VESA_MODE_MAX is latest valid mode - not the first invalid.
Permit its use in vidcontrol -i
PR: bin/119483
Modified:
stable/8/usr.sbin/vidcontrol/vidcontrol.c
Modified: stable/8/usr.sbin/vidcontrol/vidcontrol.c
==
--- stable/8/usr.sbin/vidcontrol/vidcontrol.c Fri May 17 00:40:46 2013
(r250729)
+++ stable/8/usr.sbin/vidcontrol/vidcontrol.c Fri May 17 00:40:48 2013
(r250730)
@@ -961,7 +961,7 @@ show_mode_info(void)
printf("---"
"---\n");
- for (mode = 0; mode < M_VESA_MODE_MAX; ++mode) {
+ for (mode = 0; mode <= M_VESA_MODE_MAX; ++mode) {
_info.vi_mode = mode;
if (ioctl(0, CONS_MODEINFO, &_info))
continue;
___
svn-src-...@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"
___
freebsd-bugs@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-bugs
To unsubscribe, send any mail to "freebsd-bugs-unsubscr...@freebsd.org"
Re: bin/119483: commit references a PR
The following reply was made to PR bin/119483; it has been noted by GNATS.
From: dfil...@freebsd.org (dfilter service)
To: bug-follo...@freebsd.org
Cc:
Subject: Re: bin/119483: commit references a PR
Date: Fri, 17 May 2013 00:41:05 + (UTC)
Author: eadler
Date: Fri May 17 00:40:46 2013
New Revision: 250729
URL: http://svnweb.freebsd.org/changeset/base/250729
Log:
MFC r250509:
The M_VESA_MODE_MAX is latest valid mode - not the first invalid.
Permit its use in vidcontrol -i
PR: bin/119483
Modified:
stable/9/usr.sbin/vidcontrol/vidcontrol.c
Directory Properties:
stable/9/usr.sbin/vidcontrol/ (props changed)
Modified: stable/9/usr.sbin/vidcontrol/vidcontrol.c
==
--- stable/9/usr.sbin/vidcontrol/vidcontrol.c Fri May 17 00:26:56 2013
(r250728)
+++ stable/9/usr.sbin/vidcontrol/vidcontrol.c Fri May 17 00:40:46 2013
(r250729)
@@ -961,7 +961,7 @@ show_mode_info(void)
printf("---"
"---\n");
- for (mode = 0; mode < M_VESA_MODE_MAX; ++mode) {
+ for (mode = 0; mode <= M_VESA_MODE_MAX; ++mode) {
_info.vi_mode = mode;
if (ioctl(0, CONS_MODEINFO, &_info))
continue;
___
svn-src-...@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"
___
freebsd-bugs@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-bugs
To unsubscribe, send any mail to "freebsd-bugs-unsubscr...@freebsd.org"
Re: conf/178775: commit references a PR
The following reply was made to PR conf/178775; it has been noted by GNATS.
From: dfil...@freebsd.org (dfilter service)
To: bug-follo...@freebsd.org
Cc:
Subject: Re: conf/178775: commit references a PR
Date: Mon, 20 May 2013 21:16:51 + (UTC)
Author: brooks
Date: Mon May 20 21:16:38 2013
New Revision: 250832
URL: http://svnweb.freebsd.org/changeset/base/250832
Log:
Fix distributekernel in the non NO_ROOT case.
PR: conf/178775
Submitted by:Garrett Cooper
Modified:
head/Makefile.inc1
Modified: head/Makefile.inc1
==
--- head/Makefile.inc1 Mon May 20 20:47:40 2013(r250831)
+++ head/Makefile.inc1 Mon May 20 21:16:38 2013(r250832)
@@ -1032,8 +1032,10 @@ distributekernel distributekernel.debug:
${IMAKE_MTREE} PATH=${TMPPATH} ${MAKE} KERNEL=${INSTKERNNAME} \
DESTDIR=${INSTALL_DDIR:S://:/:g:C:/$::}/kernel \
${.TARGET:S/distributekernel/install/}
+.if defined(NO_ROOT)
sed -e 's|^./kernel|.|' ${DESTDIR}/${DISTDIR}/kernel.premeta > \
${DESTDIR}/${DISTDIR}/kernel.meta
+.endif
.for _kernel in ${BUILDKERNELS:S/${INSTALLKERNEL}//}
.if defined(NO_ROOT)
echo "#${MTREE_MAGIC}" > ${DESTDIR}/${DISTDIR}/kernel.${_kernel}.premeta
___
svn-src-...@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"
___
freebsd-bugs@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-bugs
To unsubscribe, send any mail to "freebsd-bugs-unsubscr...@freebsd.org"
Re: bin/132692: commit references a PR
The following reply was made to PR bin/132692; it has been noted by GNATS.
From: dfil...@freebsd.org (dfilter service)
To: bug-follo...@freebsd.org
Cc:
Subject: Re: bin/132692: commit references a PR
Date: Thu, 23 May 2013 20:52:43 + (UTC)
Author: ghelmer
Date: Thu May 23 20:52:30 2013
New Revision: 250942
URL: http://svnweb.freebsd.org/changeset/base/250942
Log:
Add support for netgroup, based on patch in the PR but made consistent
with existing style.
PR: bin/132692
Modified:
head/usr.bin/getent/getent.c
Modified: head/usr.bin/getent/getent.c
==
--- head/usr.bin/getent/getent.c Thu May 23 19:50:36 2013
(r250941)
+++ head/usr.bin/getent/getent.c Thu May 23 20:52:30 2013
(r250942)
@@ -61,6 +61,7 @@ static int parsenum(const char *, unsign
static intethers(int, char *[]);
static intgroup(int, char *[]);
static inthosts(int, char *[]);
+static intnetgroup(int, char *[]);
static intnetworks(int, char *[]);
static intpasswd(int, char *[]);
static intprotocols(int, char *[]);
@@ -89,6 +90,7 @@ static struct getentdb {
{ "rpc", rpc,},
{ "services", services, },
{ "shells", shells, },
+ { "netgroup", netgroup, },
{ "utmpx",utmpx, },
{ NULL, NULL, },
@@ -571,6 +573,47 @@ shells(int argc, char *argv[])
}
/*
+ * netgroup
+ */
+static int
+netgroup(int argc, char *argv[])
+{
+ char*host, *user, *domain;
+ int first;
+ int rv, i;
+
+ assert(argc > 1);
+ assert(argv != NULL);
+
+#define NETGROUPPRINT(s) (((s) != NULL) ? (s) : "")
+
+ rv = RV_OK;
+ if (argc == 2) {
+ fprintf(stderr, "Enumeration not supported on netgroup\n");
+ rv = RV_NOENUM;
+ } else {
+ for (i = 2; i < argc; i++) {
+ setnetgrent(argv[i]);
+ first = 1;
+ while (getnetgrent(&host, &user, &domain) != 0) {
+ if (first) {
+ first = 0;
+ (void)fputs(argv[i], stdout);
+ }
+ (void)printf(" (%s,%s,%s)",
+ NETGROUPPRINT(host),
+ NETGROUPPRINT(user),
+ NETGROUPPRINT(domain));
+ }
+ if (!first)
+ (void)putchar('\n');
+ endnetgrent();
+ }
+ }
+ return rv;
+}
+
+/*
* utmpx
*/
___
svn-src-...@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"
___
freebsd-bugs@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-bugs
To unsubscribe, send any mail to "freebsd-bugs-unsubscr...@freebsd.org"
Re: conf/176098: commit references a PR
The following reply was made to PR conf/176098; it has been noted by GNATS.
From: dfil...@freebsd.org (dfilter service)
To: bug-follo...@freebsd.org
Cc:
Subject: Re: conf/176098: commit references a PR
Date: Sat, 25 May 2013 15:18:17 + (UTC)
Author: eadler
Date: Sat May 25 15:17:58 2013
New Revision: 250983
URL: http://svnweb.freebsd.org/changeset/base/250983
Log:
MFC r250533:
Unconditionally install 210.backup-aliases as many MTAs other than
sendmail support the use of /etc/aliases.
PR: conf/176098
Modified:
stable/9/etc/periodic/daily/Makefile
stable/9/tools/build/mk/OptionalObsoleteFiles.inc
Directory Properties:
stable/9/etc/ (props changed)
stable/9/tools/build/ (props changed)
Modified: stable/9/etc/periodic/daily/Makefile
==
--- stable/9/etc/periodic/daily/Makefile Sat May 25 13:59:40 2013
(r250982)
+++ stable/9/etc/periodic/daily/Makefile Sat May 25 15:17:58 2013
(r250983)
@@ -6,6 +6,7 @@ FILES= 100.clean-disks \
110.clean-tmps \
120.clean-preserve \
200.backup-passwd \
+ 210.backup-aliases \
220.backup-pkgdb \
330.news \
400.status-disks \
@@ -51,7 +52,6 @@ FILES+= 140.clean-rwho \
.if ${MK_SENDMAIL} != "no"
FILES+= 150.clean-hoststat \
- 210.backup-aliases \
440.status-mailq \
460.status-mail-rejects \
500.queuerun
Modified: stable/9/tools/build/mk/OptionalObsoleteFiles.inc
==
--- stable/9/tools/build/mk/OptionalObsoleteFiles.inc Sat May 25 13:59:40
2013(r250982)
+++ stable/9/tools/build/mk/OptionalObsoleteFiles.inc Sat May 25 15:17:58
2013(r250983)
@@ -3415,7 +3415,6 @@ OLD_FILES+=usr/share/man/man8/rtquery.8.
.if ${MK_SENDMAIL} == no
OLD_FILES+=etc/periodic/daily/150.clean-hoststat
-OLD_FILES+=etc/periodic/daily/210.backup-aliases
OLD_FILES+=etc/periodic/daily/440.status-mailq
OLD_FILES+=etc/periodic/daily/460.status-mail-rejects
OLD_FILES+=etc/periodic/daily/500.queuerun
___
svn-src-...@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"
___
freebsd-bugs@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-bugs
To unsubscribe, send any mail to "freebsd-bugs-unsubscr...@freebsd.org"
Re: bin/178664: commit references a PR
The following reply was made to PR bin/178664; it has been noted by GNATS.
From: dfil...@freebsd.org (dfilter service)
To: bug-follo...@freebsd.org
Cc:
Subject: Re: bin/178664: commit references a PR
Date: Tue, 28 May 2013 22:07:48 + (UTC)
Author: jilles
Date: Tue May 28 22:07:31 2013
New Revision: 251078
URL: http://svnweb.freebsd.org/changeset/base/251078
Log:
sleep: Improve nanosleep() error handling:
* Work around kernel bugs that cause a spurious [EINTR] return if a
debugger (such as truss(1)) is attached.
* Write an error message if an error other than [EINTR] occurs.
PR: bin/178664
Modified:
head/bin/sleep/sleep.c
Modified: head/bin/sleep/sleep.c
==
--- head/bin/sleep/sleep.c Tue May 28 22:07:23 2013(r251077)
+++ head/bin/sleep/sleep.c Tue May 28 22:07:31 2013(r251078)
@@ -43,6 +43,7 @@ __FBSDID("$FreeBSD$");
#include
#include
+#include
#include
#include
#include
@@ -87,8 +88,8 @@ main(int argc, char *argv[])
warnx("about %d second(s) left out of the original %d",
(int)time_to_sleep.tv_sec, (int)original);
report_requested = 0;
- } else
- break;
+ } else if (errno != EINTR)
+ err(1, "nanosleep");
}
return (0);
}
___
svn-src-...@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"
___
freebsd-bugs@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-bugs
To unsubscribe, send any mail to "freebsd-bugs-unsubscr...@freebsd.org"
Re: bin/179122: commit references a PR
The following reply was made to PR bin/179122; it has been noted by GNATS.
From: dfil...@freebsd.org (dfilter service)
To: bug-follo...@freebsd.org
Cc:
Subject: Re: bin/179122: commit references a PR
Date: Sun, 2 Jun 2013 01:10:56 + (UTC)
Author: markj
Date: Sun Jun 2 01:10:49 2013
New Revision: 251240
URL: http://svnweb.freebsd.org/changeset/base/251240
Log:
We want to stat the archived log file rather than the logfile itself.
PR: bin/179122
Submitted by:Oliver Fromme
MFC after: 3 days
Modified:
head/usr.sbin/newsyslog/newsyslog.c
Modified: head/usr.sbin/newsyslog/newsyslog.c
==
--- head/usr.sbin/newsyslog/newsyslog.cSun Jun 2 01:07:38 2013
(r251239)
+++ head/usr.sbin/newsyslog/newsyslog.cSun Jun 2 01:10:49 2013
(r251240)
@@ -2326,7 +2326,7 @@ mtime_old_timelog(const char *file)
if (validate_old_timelog(dir_fd, dp, logfname, &tm) == 0)
continue;
- if (fstatat(dir_fd, logfname, &sb, AT_SYMLINK_NOFOLLOW) == -1) {
+ if (fstatat(dir_fd, dp->d_name, &sb, AT_SYMLINK_NOFOLLOW) ==
-1) {
warn("Cannot stat '%s'", file);
continue;
}
___
svn-src-...@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"
___
freebsd-bugs@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-bugs
To unsubscribe, send any mail to "freebsd-bugs-unsubscr...@freebsd.org"
Re: bin/113239: commit references a PR
The following reply was made to PR bin/113239; it has been noted by GNATS.
From: dfil...@freebsd.org (dfilter service)
To: bug-follo...@freebsd.org
Cc:
Subject: Re: bin/113239: commit references a PR
Date: Tue, 11 Jun 2013 18:43:54 + (UTC)
Author: ghelmer
Date: Tue Jun 11 18:43:27 2013
New Revision: 251625
URL: http://svnweb.freebsd.org/changeset/base/251625
Log:
Prevent races running the queue by serializing access to the
queue directory.
PR: bin/113239
Modified:
head/libexec/atrun/atrun.c
Modified: head/libexec/atrun/atrun.c
==
--- head/libexec/atrun/atrun.c Tue Jun 11 18:43:25 2013(r251624)
+++ head/libexec/atrun/atrun.c Tue Jun 11 18:43:27 2013(r251625)
@@ -31,6 +31,7 @@ static const char rcsid[] =
/* System Headers */
#include
+#include
#include
#include
#ifdef __FreeBSD__
@@ -521,6 +522,9 @@ main(int argc, char *argv[])
if ((spool = opendir(".")) == NULL)
perr("cannot read %s", ATJOB_DIR);
+if (flock(dirfd(spool), LOCK_EX) == -1)
+ perr("cannot lock %s", ATJOB_DIR);
+
now = time(NULL);
run_batch = 0;
batch_uid = (uid_t) -1;
___
svn-src-...@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"
___
freebsd-bugs@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-bugs
To unsubscribe, send any mail to "freebsd-bugs-unsubscr...@freebsd.org"
Re: bin/162211: commit references a PR
The following reply was made to PR bin/162211; it has been noted by GNATS.
From: dfil...@freebsd.org (dfilter service)
To: bug-follo...@freebsd.org
Cc:
Subject: Re: bin/162211: commit references a PR
Date: Wed, 12 Jun 2013 07:52:58 + (UTC)
Author: grog
Date: Wed Jun 12 07:52:49 2013
New Revision: 251647
URL: http://svnweb.freebsd.org/changeset/base/251647
Log:
Handle some expression regressions.
Explicitly use GNU cpp for preprocessing.
Remove explicit debugging code.
Change some variable names to be less confusing.
Improve some comments.
Improve indentation.
PR: 162211
168785
MFC after: 2 weeks
Modified:
head/usr.bin/calendar/calendar.h
head/usr.bin/calendar/dates.c
head/usr.bin/calendar/io.c
head/usr.bin/calendar/parsedata.c
head/usr.bin/calendar/pathnames.h
head/usr.bin/calendar/sunpos.c
Modified: head/usr.bin/calendar/calendar.h
==
--- head/usr.bin/calendar/calendar.h Wed Jun 12 07:07:06 2013
(r251646)
+++ head/usr.bin/calendar/calendar.h Wed Jun 12 07:52:49 2013
(r251647)
@@ -101,11 +101,11 @@ extern int EastLongitude;
* program wrong.
*/
-/*
+/*
* All the astronomical calculations are carried out for the meridian 120
* degrees east of Greenwich.
*/
-#define UTCOFFSET_CNY 8.0
+#define UTCOFFSET_CNY 8.0
extern intdebug; /* show parsing of the input */
extern intyear1, year2;
@@ -174,7 +174,7 @@ intj2g(int);
/* dates.c */
extern int cumdaytab[][14];
-extern int mondaytab[][14];
+extern int monthdaytab[][14];
extern int debug_remember;
void generatedates(struct tm *tp1, struct tm *tp2);
void dumpdates(void);
Modified: head/usr.bin/calendar/dates.c
==
--- head/usr.bin/calendar/dates.c Wed Jun 12 07:07:06 2013
(r251646)
+++ head/usr.bin/calendar/dates.c Wed Jun 12 07:52:49 2013
(r251647)
@@ -10,7 +10,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
*notice, this list of conditions and the following disclaimer in the
*documentation and/or other materials provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -22,7 +22,7 @@
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
- *
+ *
*/
#include
@@ -73,8 +73,8 @@ int cumdaytab[][14] = {
{0, -1, 30, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334, 365},
};
/* 1-based month, individual */
-static int *mondays;
-int mondaytab[][14] = {
+static int *monthdays;
+int monthdaytab[][14] = {
{0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31, 30},
{0, 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31, 30},
};
@@ -192,11 +192,11 @@ generatedates(struct tm *tp1, struct tm
* - Take all days from
* - Take the first days from m2
*/
- mondays = mondaytab[isleap(y1)];
- for (d = d1; d <= mondays[m1]; d++)
+ monthdays = monthdaytab[isleap(y1)];
+ for (d = d1; d <= monthdays[m1]; d++)
createdate(y1, m1, d);
for (m = m1 + 1; m < m2; m++)
- for (d = 1; d <= mondays[m]; d++)
+ for (d = 1; d <= monthdays[m]; d++)
createdate(y1, m, d);
for (d = 1; d <= d2; d++)
createdate(y1, m2, d);
@@ -210,21 +210,21 @@ generatedates(struct tm *tp1, struct tm
* - Take all days from y2-[1 .. m2>
* - Take the first days of y2-m2
*/
- mondays = mondaytab[isleap(y1)];
- for (d = d1; d <= mondays[m1]; d++)
+ monthdays = monthdaytab[isleap(y1)];
+ for (d = d1; d <= monthdays[m1]; d++)
createdate(y1, m1, d);
for (m = m1 + 1; m <= 12; m++)
- for (d = 1; d <= mondays[m]; d++)
+ for (d = 1; d <= monthdays[m]; d++)
createdate(y1, m, d);
for (y = y1 + 1; y < y2; y++) {
- mondays = mondaytab[isleap(y)];
+ monthdays = monthdaytab[isleap(y)];
for (m = 1; m <= 12; m++)
- for (d = 1; d <= mondays[m]; d++)
+ for (d = 1; d <= monthdays[m]; d++)
Re: conf/175751: commit references a PR
The following reply was made to PR conf/175751; it has been noted by GNATS.
From: dfil...@freebsd.org (dfilter service)
To: bug-follo...@freebsd.org
Cc:
Subject: Re: conf/175751: commit references a PR
Date: Fri, 21 Jun 2013 18:17:02 + (UTC)
Author: gonzo
Date: Fri Jun 21 18:16:54 2013
New Revision: 252064
URL: http://svnweb.freebsd.org/changeset/base/252064
Log:
Rename run(4) firmware file from runfw to run.fw. Previous name was the
same as top-level target name for "device runfw" kernel option and
caused cyclic dependancy that lead to kernel build breakage
Module change is not strictly required and done for name unification sake
PR: conf/175751
Submitted by:Issei
Modified:
head/sys/conf/files
head/sys/modules/runfw/Makefile
Modified: head/sys/conf/files
==
--- head/sys/conf/filesFri Jun 21 17:36:33 2013(r252063)
+++ head/sys/conf/filesFri Jun 21 18:16:54 2013(r252064)
@@ -2284,19 +2284,19 @@ dev/usb/net/uhso.c optional uhso
dev/usb/wlan/if_rum.c optional rum
dev/usb/wlan/if_run.c optional run
runfw.c optional runfw
\
- compile-with"${AWK} -f $S/tools/fw_stub.awk runfw:runfw -mrunfw
-c${.TARGET}" \
+ compile-with"${AWK} -f $S/tools/fw_stub.awk run.fw:runfw -mrunfw
-c${.TARGET}" \
no-implicit-rule before-depend local
\
clean "runfw.c"
runfw.fwo optional runfw
\
- dependency "runfw"
\
+ dependency "run.fw"
\
compile-with"${NORMAL_FWO}"
\
no-implicit-rule
\
clean "runfw.fwo"
-runfw optional runfw
\
+run.fwoptional runfw
\
dependency "$S/contrib/dev/run/rt2870.fw.uu"
\
compile-with"${NORMAL_FW}"
\
no-obj no-implicit-rule
\
- clean "runfw"
+ clean "run.fw"
dev/usb/wlan/if_uath.coptional uath
dev/usb/wlan/if_upgt.coptional upgt
dev/usb/wlan/if_ural.coptional ural
Modified: head/sys/modules/runfw/Makefile
==
--- head/sys/modules/runfw/MakefileFri Jun 21 17:36:33 2013
(r252063)
+++ head/sys/modules/runfw/MakefileFri Jun 21 18:16:54 2013
(r252064)
@@ -1,11 +1,11 @@
# $FreeBSD$
KMOD= runfw
-FIRMWS= runfw:runfw:1
+FIRMWS= run.fw:runfw:1
-CLEANFILES= runfw
+CLEANFILES= run.fw
-runfw: ${.CURDIR}/../../contrib/dev/run/rt2870.fw.uu
+run.fw: ${.CURDIR}/../../contrib/dev/run/rt2870.fw.uu
uudecode -p ${.CURDIR}/../../contrib/dev/run/rt2870.fw.uu > ${.TARGET}
.include
___
svn-src-...@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"
___
freebsd-bugs@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-bugs
To unsubscribe, send any mail to "freebsd-bugs-unsubscr...@freebsd.org"
Re: bin/178664: commit references a PR
The following reply was made to PR bin/178664; it has been noted by GNATS.
From: dfil...@freebsd.org (dfilter service)
To: bug-follo...@freebsd.org
Cc:
Subject: Re: bin/178664: commit references a PR
Date: Wed, 3 Jul 2013 21:12:09 + (UTC)
Author: jilles
Date: Wed Jul 3 21:11:56 2013
New Revision: 252606
URL: http://svnweb.freebsd.org/changeset/base/252606
Log:
MFC r251078,r251433: sleep: Improve nanosleep() error handling:
* Work around kernel bugs that cause a spurious [EINTR] return if a
debugger (such as truss(1)) is attached.
* Write an error message if an error other than [EINTR] occurs.
PR: bin/178664
Modified:
stable/9/bin/sleep/sleep.c
Directory Properties:
stable/9/bin/sleep/ (props changed)
Modified: stable/9/bin/sleep/sleep.c
==
--- stable/9/bin/sleep/sleep.c Wed Jul 3 21:07:02 2013(r252605)
+++ stable/9/bin/sleep/sleep.c Wed Jul 3 21:11:56 2013(r252606)
@@ -43,6 +43,7 @@ __FBSDID("$FreeBSD$");
#include
#include
+#include
#include
#include
#include
@@ -81,14 +82,20 @@ main(int argc, char *argv[])
time_to_sleep.tv_nsec = 1e9 * (d - time_to_sleep.tv_sec);
signal(SIGINFO, report_request);
+
+ /*
+ * Note: [EINTR] is supposed to happen only when a signal was handled
+ * but the kernel also returns it when a ptrace-based debugger
+ * attaches. This is a bug but it is hard to fix.
+ */
while (nanosleep(&time_to_sleep, &time_to_sleep) != 0) {
if (report_requested) {
/* Reporting does not bother with nanoseconds. */
warnx("about %d second(s) left out of the original %d",
(int)time_to_sleep.tv_sec, (int)original);
report_requested = 0;
- } else
- break;
+ } else if (errno != EINTR)
+ err(1, "nanosleep");
}
return (0);
}
___
svn-src-...@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"
___
freebsd-bugs@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-bugs
To unsubscribe, send any mail to "freebsd-bugs-unsubscr...@freebsd.org"
Re: kern/139271: commit references a PR
The following reply was made to PR kern/139271; it has been noted by GNATS.
From: dfil...@freebsd.org (dfilter service)
To: bug-follo...@freebsd.org
Cc:
Subject: Re: kern/139271: commit references a PR
Date: Fri, 12 Jul 2013 18:02:24 + (UTC)
Author: marius
Date: Fri Jul 12 18:02:10 2013
New Revision: 253278
URL: http://svnweb.freebsd.org/changeset/base/253278
Log:
MFC: r240981, r240990, r240992, r244695
Add 32-bit ABI compat shims. Those are necessary for i386 binary-only
tools like sysutils/hpacucli (HP P4xx RAID controller management
suite) working on amd64 systems.
PR: 139271
Submitted by:Kazumi MORINAGA, Eugene Grosbein
Approved by: re (kib)
Modified:
stable/9/sys/dev/pci/pci_user.c
Directory Properties:
stable/9/sys/ (props changed)
stable/9/sys/dev/ (props changed)
Modified: stable/9/sys/dev/pci/pci_user.c
==
--- stable/9/sys/dev/pci/pci_user.cFri Jul 12 17:37:05 2013
(r253277)
+++ stable/9/sys/dev/pci/pci_user.cFri Jul 12 18:02:10 2013
(r253278)
@@ -225,6 +225,51 @@ struct pci_io_old {
u_int32_t pi_data;/* data to write or result of read */
};
+#ifdef COMPAT_FREEBSD32
+struct pci_conf_old32 {
+ struct pcisel_old pc_sel; /* bus+slot+function */
+ uint8_t pc_hdr; /* PCI header type */
+ uint16_tpc_subvendor; /* card vendor ID */
+ uint16_tpc_subdevice; /* card device ID, assigned by
+ card vendor */
+ uint16_tpc_vendor; /* chip vendor ID */
+ uint16_tpc_device; /* chip device ID, assigned by
+ chip vendor */
+ uint8_t pc_class; /* chip PCI class */
+ uint8_t pc_subclass;/* chip PCI subclass */
+ uint8_t pc_progif; /* chip PCI programming interface */
+ uint8_t pc_revid; /* chip revision ID */
+ charpd_name[PCI_MAXNAMELEN + 1]; /* device name */
+ uint32_tpd_unit;/* device unit number (u_long) */
+};
+
+struct pci_match_conf_old32 {
+ struct pcisel_old pc_sel; /* bus+slot+function */
+ charpd_name[PCI_MAXNAMELEN + 1]; /* device name */
+ uint32_tpd_unit;/* Unit number (u_long) */
+ uint16_tpc_vendor; /* PCI Vendor ID */
+ uint16_tpc_device; /* PCI Device ID */
+ uint8_t pc_class; /* PCI class */
+ pci_getconf_flags_old flags;/* Matching expression */
+};
+
+struct pci_conf_io32 {
+ uint32_tpat_buf_len;/* pattern buffer length */
+ uint32_tnum_patterns; /* number of patterns */
+ uint32_tpatterns; /* pattern buffer
+ (struct pci_match_conf_old32 *) */
+ uint32_tmatch_buf_len; /* match buffer length */
+ uint32_tnum_matches;/* number of matches returned */
+ uint32_tmatches;/* match buffer
+ (struct pci_conf_old32 *) */
+ uint32_toffset; /* offset into device list */
+ uint32_tgeneration; /* device list generation */
+ pci_getconf_status status; /* request status */
+};
+
+#define PCIOCGETCONF_OLD32 _IOWR('p', 1, struct pci_conf_io32)
+#endif/* COMPAT_FREEBSD32 */
+
#define PCIOCGETCONF_OLD_IOWR('p', 1, struct pci_conf_io)
#define PCIOCREAD_OLD _IOWR('p', 2, struct pci_io_old)
#define PCIOCWRITE_OLD _IOWR('p', 3, struct pci_io_old)
@@ -295,7 +340,71 @@ pci_conf_match_old(struct pci_match_conf
return(1);
}
-#endif
+#ifdef COMPAT_FREEBSD32
+static int
+pci_conf_match_old32(struct pci_match_conf_old32 *matches, int num_matches,
+struct pci_conf *match_buf)
+{
+ int i;
+
+ if ((matches == NULL) || (match_buf == NULL) || (num_matches <= 0))
+ return(1);
+
+ for (i = 0; i < num_matches; i++) {
+ if (match_buf->pc_sel.pc_domain != 0)
+ continue;
+
+ /*
+ * I'm not sure why someone would do this...but...
+ */
+ if (matches[i].flags == PCI_GETCONF_NO_MATCH_OLD)
+ continue;
+
+ /*
+ * Look at each of the match flags. If it's set, do the
+ * comparison. If the comparison fails, we don't have a
+ * match, go on to the next item if there is one.
+ */
+ if (((matches[i].flags & PCI_GETCONF_MATCH_BUS_OLD) != 0) &&am
Re: misc/180605: commit references a PR
The following reply was made to PR misc/180605; it has been noted by GNATS.
From: dfil...@freebsd.org (dfilter service)
To: bug-follo...@freebsd.org
Cc:
Subject: Re: misc/180605: commit references a PR
Date: Wed, 17 Jul 2013 10:21:52 + (UTC)
Author: erwin
Date: Wed Jul 17 10:21:39 2013
New Revision: 323158
URL: http://svnweb.freebsd.org/changeset/ports/323158
Log:
Don't set PORTREVISION here, but inherit from master port.
PR: 180605
Submitted by:Alex Keda (maintainer)
Modified:
head/databases/php52-pdo_firebird/Makefile
head/net/php52-ldap/Makefile
Modified: head/databases/php52-pdo_firebird/Makefile
==
--- head/databases/php52-pdo_firebird/Makefile Wed Jul 17 09:36:13 2013
(r323157)
+++ head/databases/php52-pdo_firebird/Makefile Wed Jul 17 10:21:39 2013
(r323158)
@@ -5,7 +5,6 @@
# $FreeBSD$
#
-PORTREVISION= 1
CATEGORIES= databases
MASTERDIR=${.CURDIR}/../../lang/php52
Modified: head/net/php52-ldap/Makefile
==
--- head/net/php52-ldap/Makefile Wed Jul 17 09:36:13 2013
(r323157)
+++ head/net/php52-ldap/Makefile Wed Jul 17 10:21:39 2013
(r323158)
@@ -5,7 +5,6 @@
# $FreeBSD$
#
-PORTREVISION= 1
CATEGORIES= net
MASTERDIR=${.CURDIR}/../../lang/php52
___
svn-ports-...@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscr...@freebsd.org"
___
freebsd-bugs@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-bugs
To unsubscribe, send any mail to "freebsd-bugs-unsubscr...@freebsd.org"
Re: kern/174671: commit references a PR
The following reply was made to PR kern/174671; it has been noted by GNATS. From: dfil...@freebsd.org (dfilter service) To: bug-follo...@freebsd.org Cc: Subject: Re: kern/174671: commit references a PR Date: Thu, 1 Aug 2013 13:19:08 + (UTC) Author: marius Date: Thu Aug 1 13:18:47 2013 New Revision: 253860 URL: http://svnweb.freebsd.org/changeset/base/253860 Log: MFC: r249410 (partial) Remove ctl(4) from GENERIC. With ctl(4) being built as a module and automatically loaded by ctladm(8), this makes CTL work out of the box. Note that unlike the original r249410, this commit does not remove the kern.cam.ctl.disable tunable for POLA reasons. PR: 174671, 175694, 179112 Reviewed by: ken (original version) Sponsored by:FreeBSD Foundation (original version) Approved by: re (hrs) Modified: stable/9/sys/amd64/conf/GENERIC stable/9/sys/i386/conf/GENERIC stable/9/sys/i386/conf/PAE stable/9/sys/ia64/conf/GENERIC stable/9/sys/sparc64/conf/GENERIC Directory Properties: stable/9/sys/ (props changed) Modified: stable/9/sys/amd64/conf/GENERIC == --- stable/9/sys/amd64/conf/GENERICThu Aug 1 12:55:41 2013 (r253859) +++ stable/9/sys/amd64/conf/GENERICThu Aug 1 13:18:47 2013 (r253860) @@ -124,7 +124,7 @@ device sa # Sequential Access (tape et devicecd # CD devicepass# Passthrough device (direct ATA/SCSI access) deviceses # Enclosure Services (SES and SAF-TE) -devicectl # CAM Target Layer +#device ctl # CAM Target Layer # RAID controllers interfaced to the SCSI subsystem deviceamr # AMI MegaRAID Modified: stable/9/sys/i386/conf/GENERIC == --- stable/9/sys/i386/conf/GENERIC Thu Aug 1 12:55:41 2013 (r253859) +++ stable/9/sys/i386/conf/GENERIC Thu Aug 1 13:18:47 2013 (r253860) @@ -131,7 +131,7 @@ device sa # Sequential Access (tape et devicecd # CD devicepass# Passthrough device (direct ATA/SCSI access) deviceses # Enclosure Services (SES and SAF-TE) -devicectl # CAM Target Layer +#device ctl # CAM Target Layer # RAID controllers interfaced to the SCSI subsystem deviceamr # AMI MegaRAID Modified: stable/9/sys/i386/conf/PAE == --- stable/9/sys/i386/conf/PAE Thu Aug 1 12:55:41 2013(r253859) +++ stable/9/sys/i386/conf/PAE Thu Aug 1 13:18:47 2013(r253860) @@ -39,8 +39,6 @@ nodevice ncv nodevice nsp nodevice stg -nodevice ctl - nodevice asr nodevice dpt nodevice mly Modified: stable/9/sys/ia64/conf/GENERIC == --- stable/9/sys/ia64/conf/GENERIC Thu Aug 1 12:55:41 2013 (r253859) +++ stable/9/sys/ia64/conf/GENERIC Thu Aug 1 13:18:47 2013 (r253860) @@ -100,7 +100,7 @@ device da # Direct Access (ie disk) devicepass# Passthrough (direct ATA/SCSI access) devicesa # Sequential Access (ie tape) deviceses # Enclosure Services (SES and SAF-TE) -devicectl # CAM Target Layer +#device ctl # CAM Target Layer # RAID controllers deviceaac # Adaptec FSA RAID Modified: stable/9/sys/sparc64/conf/GENERIC == --- stable/9/sys/sparc64/conf/GENERIC Thu Aug 1 12:55:41 2013 (r253859) +++ stable/9/sys/sparc64/conf/GENERIC Thu Aug 1 13:18:47 2013 (r253860) @@ -107,7 +107,7 @@ device sa # Sequential Access (tape et devicecd # CD devicepass# Passthrough device (direct ATA/SCSI access) deviceses # SCSI Environmental Services (and SAF-TE) -devicectl # CAM Target Layer +#device ctl # CAM Target Layer # RAID controllers #device amr # AMI MegaRAID ___ svn-src-...@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebs
Re: kern/175694: commit references a PR
The following reply was made to PR kern/175694; it has been noted by GNATS. From: dfil...@freebsd.org (dfilter service) To: bug-follo...@freebsd.org Cc: Subject: Re: kern/175694: commit references a PR Date: Thu, 1 Aug 2013 13:19:08 + (UTC) Author: marius Date: Thu Aug 1 13:18:47 2013 New Revision: 253860 URL: http://svnweb.freebsd.org/changeset/base/253860 Log: MFC: r249410 (partial) Remove ctl(4) from GENERIC. With ctl(4) being built as a module and automatically loaded by ctladm(8), this makes CTL work out of the box. Note that unlike the original r249410, this commit does not remove the kern.cam.ctl.disable tunable for POLA reasons. PR: 174671, 175694, 179112 Reviewed by: ken (original version) Sponsored by:FreeBSD Foundation (original version) Approved by: re (hrs) Modified: stable/9/sys/amd64/conf/GENERIC stable/9/sys/i386/conf/GENERIC stable/9/sys/i386/conf/PAE stable/9/sys/ia64/conf/GENERIC stable/9/sys/sparc64/conf/GENERIC Directory Properties: stable/9/sys/ (props changed) Modified: stable/9/sys/amd64/conf/GENERIC == --- stable/9/sys/amd64/conf/GENERICThu Aug 1 12:55:41 2013 (r253859) +++ stable/9/sys/amd64/conf/GENERICThu Aug 1 13:18:47 2013 (r253860) @@ -124,7 +124,7 @@ device sa # Sequential Access (tape et devicecd # CD devicepass# Passthrough device (direct ATA/SCSI access) deviceses # Enclosure Services (SES and SAF-TE) -devicectl # CAM Target Layer +#device ctl # CAM Target Layer # RAID controllers interfaced to the SCSI subsystem deviceamr # AMI MegaRAID Modified: stable/9/sys/i386/conf/GENERIC == --- stable/9/sys/i386/conf/GENERIC Thu Aug 1 12:55:41 2013 (r253859) +++ stable/9/sys/i386/conf/GENERIC Thu Aug 1 13:18:47 2013 (r253860) @@ -131,7 +131,7 @@ device sa # Sequential Access (tape et devicecd # CD devicepass# Passthrough device (direct ATA/SCSI access) deviceses # Enclosure Services (SES and SAF-TE) -devicectl # CAM Target Layer +#device ctl # CAM Target Layer # RAID controllers interfaced to the SCSI subsystem deviceamr # AMI MegaRAID Modified: stable/9/sys/i386/conf/PAE == --- stable/9/sys/i386/conf/PAE Thu Aug 1 12:55:41 2013(r253859) +++ stable/9/sys/i386/conf/PAE Thu Aug 1 13:18:47 2013(r253860) @@ -39,8 +39,6 @@ nodevice ncv nodevice nsp nodevice stg -nodevice ctl - nodevice asr nodevice dpt nodevice mly Modified: stable/9/sys/ia64/conf/GENERIC == --- stable/9/sys/ia64/conf/GENERIC Thu Aug 1 12:55:41 2013 (r253859) +++ stable/9/sys/ia64/conf/GENERIC Thu Aug 1 13:18:47 2013 (r253860) @@ -100,7 +100,7 @@ device da # Direct Access (ie disk) devicepass# Passthrough (direct ATA/SCSI access) devicesa # Sequential Access (ie tape) deviceses # Enclosure Services (SES and SAF-TE) -devicectl # CAM Target Layer +#device ctl # CAM Target Layer # RAID controllers deviceaac # Adaptec FSA RAID Modified: stable/9/sys/sparc64/conf/GENERIC == --- stable/9/sys/sparc64/conf/GENERIC Thu Aug 1 12:55:41 2013 (r253859) +++ stable/9/sys/sparc64/conf/GENERIC Thu Aug 1 13:18:47 2013 (r253860) @@ -107,7 +107,7 @@ device sa # Sequential Access (tape et devicecd # CD devicepass# Passthrough device (direct ATA/SCSI access) deviceses # SCSI Environmental Services (and SAF-TE) -devicectl # CAM Target Layer +#device ctl # CAM Target Layer # RAID controllers #device amr # AMI MegaRAID ___ svn-src-...@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebs
Re: bin/172542: commit references a PR
The following reply was made to PR bin/172542; it has been noted by GNATS.
From: dfil...@freebsd.org (dfilter service)
To: bug-follo...@freebsd.org
Cc:
Subject: Re: bin/172542: commit references a PR
Date: Thu, 1 Aug 2013 18:07:06 + (UTC)
Author: marcel
Date: Thu Aug 1 18:06:58 2013
New Revision: 253862
URL: http://svnweb.freebsd.org/changeset/base/253862
Log:
Fix the build of the testmain target. This target compiles a Forth
interpreter that can be run on the system and as such cannot be
compiled against libbstand. On the one hand this means we need to
include the usual headers for system interfaces that we use and
on the the other hand we can only use standard system interfaces.
While here, define local variables only when needed to make this
WARNS=2 clean on amd64.
PR: 172542
Obtained from: peterj@
Pointed out by: Jan Beich
Modified:
head/sys/boot/ficl/loader.c
Modified: head/sys/boot/ficl/loader.c
==
--- head/sys/boot/ficl/loader.cThu Aug 1 16:04:48 2013
(r253861)
+++ head/sys/boot/ficl/loader.cThu Aug 1 18:06:58 2013
(r253862)
@@ -33,7 +33,13 @@
***/
#ifdef TESTMAIN
+#include
+#include
+#include
+#include
+#include
#include
+#include
#else
#include
#endif
@@ -135,9 +141,9 @@ void
ficlGetenv(FICL_VM *pVM)
{
#ifndef TESTMAIN
- char*name;
+ char*name, *value;
#endif
- char*namep, *value;
+ char*namep;
int names;
#if FICL_ROBUST > 1
@@ -243,9 +249,9 @@ void
ficlFindfile(FICL_VM *pVM)
{
#ifndef TESTMAIN
- char*name;
+ char*name, *type;
#endif
- char*type, *namep, *typep;
+ char*namep, *typep;
struct preloaded_file* fp;
int names, types;
@@ -511,6 +517,14 @@ static void pfread(FICL_VM *pVM)
*/
static void pfreaddir(FICL_VM *pVM)
{
+#ifdef TESTMAIN
+static union {
+ struct dirent dirent;
+ char buf[512];
+} u;
+off_t off;
+int len;
+#endif
struct dirent *d;
int fd;
@@ -519,7 +533,20 @@ static void pfreaddir(FICL_VM *pVM)
#endif
fd = stackPopINT(pVM->pStack);
+#if TESTMAIN
+/*
+ * The readdirfd() function is specific to the loader environment.
+ * We do the best we can to make freaddir work, but it's not at
+ * all guaranteed.
+ */
+off = lseek(fd, 0LL, SEEK_CUR);
+len = getdents(fd, u.buf, sizeof(u.buf));
+d = (len != -1) ? &u.dirent : NULL;
+if (d != NULL)
+ lseek(fd, off + d->d_reclen, SEEK_SET);
+#else
d = readdirfd(fd);
+#endif
if (d != NULL) {
stackPushPtr(pVM->pStack, d->d_name);
stackPushINT(pVM->pStack, strlen(d->d_name));
___
svn-src-...@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"
___
freebsd-bugs@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-bugs
To unsubscribe, send any mail to "freebsd-bugs-unsubscr...@freebsd.org"
Re: bin/127276: commit references a PR
The following reply was made to PR bin/127276; it has been noted by GNATS.
From: dfil...@freebsd.org (dfilter service)
To: bug-follo...@freebsd.org
Cc:
Subject: Re: bin/127276: commit references a PR
Date: Wed, 7 Aug 2013 00:28:30 + (UTC)
Author: markj
Date: Wed Aug 7 00:28:17 2013
New Revision: 254018
URL: http://svnweb.freebsd.org/changeset/base/254018
Log:
Pass variables prefixed with both LD_ and LD_32_ to the run-time linker.
This prevents unintentional execution of programs when running ldd(1) on
32-bit Linux binaries.
PR: 175339, 127276
Suggested by:kib, rstone
Reviewed by: kib
MFC after: 2 weeks
Modified:
head/usr.bin/ldd/ldd.c
Modified: head/usr.bin/ldd/ldd.c
==
--- head/usr.bin/ldd/ldd.c Wed Aug 7 00:20:30 2013(r254017)
+++ head/usr.bin/ldd/ldd.c Wed Aug 7 00:28:17 2013(r254018)
@@ -49,12 +49,6 @@ __FBSDID("$FreeBSD$");
#include "extern.h"
-#ifdef COMPAT_32BIT
-#define LD_ "LD_32_"
-#else
-#define LD_ "LD_"
-#endif
-
/*
* 32-bit ELF data structures can only be used if the system header[s] declare
* them. There is no official macro for determining whether they are
declared,
@@ -64,6 +58,16 @@ __FBSDID("$FreeBSD$");
#define ELF32_SUPPORTED
#endif
+#define LDD_SETENV(name, value, overwrite) do { \
+ setenv("LD_" name, value, overwrite); \
+ setenv("LD_32_" name, value, overwrite);\
+} while (0)
+
+#define LDD_UNSETENV(name) do { \
+ unsetenv("LD_" name); \
+ unsetenv("LD_32_" name);\
+} while (0)
+
static intis_executable(const char *fname, int fd, int *is_shlib,
int *type);
static void usage(void);
@@ -82,7 +86,7 @@ execldd32(char *file, char *fmt1, char *
char *argv[8];
int i, rval, status;
- unsetenv(LD_ "TRACE_LOADED_OBJECTS");
+ LDD_UNSETENV("TRACE_LOADED_OBJECTS");
rval = 0;
i = 0;
argv[i++] = strdup(_PATH_LDD32);
@@ -121,7 +125,7 @@ execldd32(char *file, char *fmt1, char *
}
while (i--)
free(argv[i]);
- setenv(LD_ "TRACE_LOADED_OBJECTS", "yes", 1);
+ LDD_SETENV("TRACE_LOADED_OBJECTS", "yes", 1);
return (rval);
}
#endif
@@ -210,15 +214,15 @@ main(int argc, char *argv[])
}
/* ld.so magic */
- setenv(LD_ "TRACE_LOADED_OBJECTS", "yes", 1);
+ LDD_SETENV("TRACE_LOADED_OBJECTS", "yes", 1);
if (fmt1 != NULL)
- setenv(LD_ "TRACE_LOADED_OBJECTS_FMT1", fmt1, 1);
+ LDD_SETENV("TRACE_LOADED_OBJECTS_FMT1", fmt1, 1);
if (fmt2 != NULL)
- setenv(LD_ "TRACE_LOADED_OBJECTS_FMT2", fmt2, 1);
+ LDD_SETENV("TRACE_LOADED_OBJECTS_FMT2", fmt2, 1);
- setenv(LD_ "TRACE_LOADED_OBJECTS_PROGNAME", *argv, 1);
+ LDD_SETENV("TRACE_LOADED_OBJECTS_PROGNAME", *argv, 1);
if (aflag)
- setenv(LD_ "TRACE_LOADED_OBJECTS_ALL", "1", 1);
+ LDD_SETENV("TRACE_LOADED_OBJECTS_ALL", "1", 1);
else if (fmt1 == NULL && fmt2 == NULL)
/* Default formats */
printf("%s:\n", *argv);
___
svn-src-...@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"
___
freebsd-bugs@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-bugs
To unsubscribe, send any mail to "freebsd-bugs-unsubscr...@freebsd.org"
Re: i386/2984: commit references a PR
The following reply was made to PR i386/2984; it has been noted by GNATS.
From: dfil...@freebsd.org (dfilter service)
To: bug-follo...@freebsd.org
Cc:
Subject: Re: i386/2984: commit references a PR
Date: Thu, 8 Aug 2013 22:26:11 + (UTC)
Author: delphij
Date: Thu Aug 8 22:26:03 2013
New Revision: 254106
URL: http://svnweb.freebsd.org/changeset/base/254106
Log:
Integrate OpenSSL commit 9fe4603b8245425a4c46986ed000fca054231253:
Author: David Woodhouse
Date: Tue Feb 12 14:55:32 2013 +
Check DTLS_BAD_VER for version number.
The version check for DTLS1_VERSION was redundant as
DTLS1_VERSION > TLS1_1_VERSION, however we do need to
check for DTLS1_BAD_VER for compatibility.
PR:2984
(cherry picked from commit d980abb22e22661e98e5cee33d760ab0c7584ecc)
Approved by: benl
Modified:
vendor-crypto/openssl/dist/ssl/s3_cbc.c
Modified: vendor-crypto/openssl/dist/ssl/s3_cbc.c
==
--- vendor-crypto/openssl/dist/ssl/s3_cbc.cThu Aug 8 22:09:46 2013
(r254105)
+++ vendor-crypto/openssl/dist/ssl/s3_cbc.cThu Aug 8 22:26:03 2013
(r254106)
@@ -148,7 +148,7 @@ int tls1_cbc_remove_padding(const SSL* s
unsigned padding_length, good, to_check, i;
const unsigned overhead = 1 /* padding length byte */ + mac_size;
/* Check if version requires explicit IV */
- if (s->version >= TLS1_1_VERSION || s->version == DTLS1_VERSION)
+ if (s->version >= TLS1_1_VERSION || s->version == DTLS1_BAD_VER)
{
/* These lengths are all public so we can test them in
* non-constant time.
___
svn-src-...@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"
___
freebsd-bugs@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-bugs
To unsubscribe, send any mail to "freebsd-bugs-unsubscr...@freebsd.org"
Re: bin/181435: commit references a PR
The following reply was made to PR bin/181435; it has been noted by GNATS.
From: dfil...@freebsd.org (dfilter service)
To: bug-follo...@freebsd.org
Cc:
Subject: Re: bin/181435: commit references a PR
Date: Sat, 24 Aug 2013 09:57:45 + (UTC)
Author: jilles
Date: Sat Aug 24 09:57:32 2013
New Revision: 254767
URL: http://svnweb.freebsd.org/changeset/base/254767
Log:
sh: Do not prematurely discard stopped jobs in a wait builtin.
If a job is specified to 'wait', wait for it to complete. Formerly, in
interactive mode, the job was deleted if it stopped.
If no jobs are specified in interactive mode, 'wait' still waits for all jobs
to complete or stop.
In non-interactive mode, WUNTRACED is not passed to wait3() so stopped jobs
are not detected.
PR: bin/181435
Modified:
head/bin/sh/jobs.c
Modified: head/bin/sh/jobs.c
==
--- head/bin/sh/jobs.c Sat Aug 24 09:42:14 2013(r254766)
+++ head/bin/sh/jobs.c Sat Aug 24 09:57:32 2013(r254767)
@@ -495,14 +495,10 @@ waitcmdloop(struct job *job)
in_waitcmd++;
do {
if (job != NULL) {
- if (job->state) {
+ if (job->state == JOBDONE) {
status = job->ps[job->nprocs - 1].status;
if (WIFEXITED(status))
retval = WEXITSTATUS(status);
-#if JOBS
- else if (WIFSTOPPED(status))
- retval = WSTOPSIG(status) + 128;
-#endif
else
retval = WTERMSIG(status) + 128;
if (! iflag || ! job->changed)
___
svn-src-...@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"
___
freebsd-bugs@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-bugs
To unsubscribe, send any mail to "freebsd-bugs-unsubscr...@freebsd.org"
Re: conf/179466: commit references a PR
The following reply was made to PR conf/179466; it has been noted by GNATS.
From: dfil...@freebsd.org (dfilter service)
To: bug-follo...@freebsd.org
Cc:
Subject: Re: conf/179466: commit references a PR
Date: Fri, 30 Aug 2013 01:32:56 + (UTC)
Author: bdrewery (ports committer)
Date: Fri Aug 30 01:32:47 2013
New Revision: 255048
URL: http://svnweb.freebsd.org/changeset/base/255048
Log:
- Fix LOCAL_MTREE so it properly handles multiple files and quotes
its value into submakes
PR: conf/179466
Submitted by:Garrett Cooper
Approved by: bapt
MFC after: 2 weeks
Sponsored by:EMC / Isilon Storage Division
Modified:
head/Makefile.inc1
Modified: head/Makefile.inc1
==
--- head/Makefile.inc1 Thu Aug 29 23:46:38 2013(r255047)
+++ head/Makefile.inc1 Fri Aug 30 01:32:47 2013(r255048)
@@ -265,7 +265,7 @@ WMAKEENV= ${CROSSENV} \
PATH=${TMPPATH}
# make hierarchy
-HMAKE=PATH=${TMPPATH} ${MAKE} LOCAL_MTREE=${LOCAL_MTREE}
+HMAKE=PATH=${TMPPATH} ${MAKE} LOCAL_MTREE=${LOCAL_MTREE:Q}
.if defined(NO_ROOT)
HMAKE+= PATH=${TMPPATH} METALOG=${METALOG} -DNO_ROOT
.endif
@@ -814,7 +814,7 @@ distributeworld installworld: installche
cd ${.CURDIR}/etc; ${CROSSENV} PATH=${TMPPATH} ${MAKE} \
METALOG=${METALOG} ${IMAKE_INSTALL} ${IMAKE_MTREE} \
DISTBASE=/base DESTDIR=${DESTDIR}/${DISTDIR}/base \
- LOCAL_MTREE=${LOCAL_MTREE} distrib-dirs
+ LOCAL_MTREE=${LOCAL_MTREE:Q} distrib-dirs
.endif
${_+_}cd ${.CURDIR}; ${IMAKE} re${.TARGET:S/world$//}; \
${IMAKEENV} rm -rf ${INSTALLTMP}
@@ -888,7 +888,7 @@ reinstall:
@echo ">>> Making hierarchy"
@echo "--"
${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 \
- LOCAL_MTREE=${LOCAL_MTREE} hierarchy
+ LOCAL_MTREE=${LOCAL_MTREE:Q} hierarchy
@echo
@echo "--"
@echo ">>> Installing everything"
___
svn-src-...@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"
___
freebsd-bugs@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-bugs
To unsubscribe, send any mail to "freebsd-bugs-unsubscr...@freebsd.org"
Re: kern/170834: commit references a PR
The following reply was made to PR kern/170834; it has been noted by GNATS.
From: dfil...@freebsd.org (dfilter service)
To: bug-follo...@freebsd.org
Cc:
Subject: Re: kern/170834: commit references a PR
Date: Mon, 2 Sep 2013 19:15:57 + (UTC)
Author: dumbbell
Date: Mon Sep 2 19:15:20 2013
New Revision: 255153
URL: http://svnweb.freebsd.org/changeset/base/255153
Log:
psm: Add support for middle and extended buttons on Synaptics touchpads
PR: kern/170834
Submitted by:Brandon Gooch
Tested by: Artyom Mirgorodskiy
MFC after: 1 month
Modified:
head/sys/dev/atkbdc/psm.c
head/sys/sys/mouse.h
Modified: head/sys/dev/atkbdc/psm.c
==
--- head/sys/dev/atkbdc/psm.c Mon Sep 2 18:25:18 2013(r255152)
+++ head/sys/dev/atkbdc/psm.c Mon Sep 2 19:15:20 2013(r255153)
@@ -2601,14 +2601,14 @@ proc_synaptics(struct psm_softc *sc, pac
static int guest_buttons;
int w, x0, y0;
- /* TouchPad PS/2 absolute mode message format
+ /* TouchPad PS/2 absolute mode message format with capFourButtons:
*
* Bits:7 6 5 4 3 2 1 0 (LSB)
*
* ipacket[0]: 1 0 W3 W2 0 W1 R L
* ipacket[1]: Yb Ya Y9 Y8 Xb Xa X9 X8
* ipacket[2]: Z7 Z6 Z5 Z4 Z3 Z2 Z1 Z0
- * ipacket[3]: 1 1 Yc Xc 0 W0 D U
+ * ipacket[3]: 1 1 Yc Xc 0 W0 D^R U^L
* ipacket[4]: X7 X6 X5 X4 X3 X2 X1 X0
* ipacket[5]: Y7 Y6 Y5 Y4 Y3 Y2 Y1 Y0
*
@@ -2622,6 +2622,21 @@ proc_synaptics(struct psm_softc *sc, pac
* Y: y position
* Z: pressure
*
+ * Without capFourButtons but with nExtendeButtons and/or capMiddle
+ *
+ * Bits:7 6 5 4 3 2 1 0 (LSB)
+ * --
+ * ipacket[3]: 1 1 Yc Xc 0 W0E^RM^L
+ * ipacket[4]: X7 X6 X5 X4 X3|b7 X2|b5 X1|b3 X0|b1
+ * ipacket[5]: Y7 Y6 Y5 Y4 Y3|b8 Y2|b6 Y1|b4 Y0|b2
+ *
+ * Legend:
+ * M: Middle physical mouse button
+ * E: Extended mouse buttons reported instead of low bits of X and Y
+ * b1-b8: Extended mouse buttons
+ *Only ((nExtendedButtons + 1) >> 1) bits are used in packet
+ *4 and 5, for reading X and Y value they should be zeroed.
+ *
* Absolute reportable limits:0 - 6143.
* Typical bezel limits: 1472 - 5472.
* Typical edge marings: 1632 - 5312.
@@ -2675,8 +2690,10 @@ proc_synaptics(struct psm_softc *sc, pac
w = 4;
}
- /* Handle packets from the guest device */
- /* XXX Documentation? */
+ /*
+ * Handle packets from the guest device. See:
+ * Synaptics PS/2 TouchPad Interfacing Guide, Section 5.1
+ */
if (w == 3 && sc->synhw.capPassthrough) {
*x = ((pb->ipacket[1] & 0x10) ?
pb->ipacket[4] - 256 : pb->ipacket[4]);
@@ -2704,36 +2721,49 @@ proc_synaptics(struct psm_softc *sc, pac
touchpad_buttons |= MOUSE_BUTTON3DOWN;
if (sc->synhw.capExtended && sc->synhw.capFourButtons) {
- if ((pb->ipacket[3] & 0x01) && (pb->ipacket[0] & 0x01) == 0)
+ if ((pb->ipacket[3] ^ pb->ipacket[0]) & 0x01)
touchpad_buttons |= MOUSE_BUTTON4DOWN;
- if ((pb->ipacket[3] & 0x02) && (pb->ipacket[0] & 0x02) == 0)
+ if ((pb->ipacket[3] ^ pb->ipacket[0]) & 0x02)
touchpad_buttons |= MOUSE_BUTTON5DOWN;
- }
-
- /*
- * In newer pads - bit 0x02 in the third byte of
- * the packet indicates that we have an extended
- * button press.
- */
- /* XXX Documentation? */
- if (pb->ipacket[3] & 0x02) {
- /*
- * if directional_scrolls is not 1, we treat any of
- * the scrolling directions as middle-click.
- */
- if (sc->syninfo.directional_scrolls) {
- if (pb->ipacket[4] & 0x01)
- touchpad_buttons |= MOUSE_BUTTON4DOWN;
- if (pb->ipacket[5] & 0x01)
- touchpad_buttons |= MOUSE_BUTTON5DOWN;
- if (pb->ipacket[4] & 0x02)
- touchpad_buttons |= MOUSE_BUTTON6DOWN;
- if (pb->ipacket[5] & 0x02)
- touchpad_buttons |= MOUSE_BUTTON7DOWN;
- } else {
-
Re: conf/179466: commit references a PR
The following reply was made to PR conf/179466; it has been noted by GNATS.
From: dfil...@freebsd.org (dfilter service)
To: bug-follo...@freebsd.org
Cc:
Subject: Re: conf/179466: commit references a PR
Date: Fri, 13 Sep 2013 11:57:59 + (UTC)
Author: bdrewery (ports committer)
Date: Fri Sep 13 11:57:52 2013
New Revision: 255514
URL: http://svnweb.freebsd.org/changeset/base/255514
Log:
MFC r255048:
- Fix LOCAL_MTREE so it properly handles multiple files and quotes
its value into submakes
PR: conf/179466
Submitted by:Garrett Cooper
Sponsored by:EMC / Isilon Storage Division
Modified:
stable/9/Makefile.inc1 (contents, props changed)
Directory Properties:
stable/9/ (props changed)
Modified: stable/9/Makefile.inc1
==
--- stable/9/Makefile.inc1 Fri Sep 13 11:25:42 2013(r255513)
+++ stable/9/Makefile.inc1 Fri Sep 13 11:57:52 2013(r255514)
@@ -270,7 +270,7 @@ WMAKEENV= ${CROSSENV} \
PATH=${TMPPATH}
# make hierarchy
-HMAKE=PATH=${TMPPATH} ${MAKE} LOCAL_MTREE=${LOCAL_MTREE}
+HMAKE=PATH=${TMPPATH} ${MAKE} LOCAL_MTREE=${LOCAL_MTREE:Q}
.if defined(NO_ROOT)
HMAKE+= PATH=${TMPPATH} METALOG=${METALOG} -DNO_ROOT
.endif
@@ -768,7 +768,7 @@ distributeworld installworld: installche
cd ${.CURDIR}/etc; ${CROSSENV} PATH=${TMPPATH} ${MAKE} \
METALOG=${METALOG} ${IMAKE_INSTALL} ${IMAKE_MTREE} \
DISTBASE=/base DESTDIR=${DESTDIR}/${DISTDIR}/base \
- LOCAL_MTREE=${LOCAL_MTREE} distrib-dirs
+ LOCAL_MTREE=${LOCAL_MTREE:Q} distrib-dirs
.endif
${_+_}cd ${.CURDIR}; ${IMAKE} re${.TARGET:S/world$//}; \
${IMAKEENV} rm -rf ${INSTALLTMP}
@@ -814,7 +814,7 @@ reinstall:
@echo ">>> Making hierarchy"
@echo "--"
${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 \
- LOCAL_MTREE=${LOCAL_MTREE} hierarchy
+ LOCAL_MTREE=${LOCAL_MTREE:Q} hierarchy
@echo
@echo "--"
@echo ">>> Installing everything"
___
svn-src-...@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"
___
freebsd-bugs@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-bugs
To unsubscribe, send any mail to "freebsd-bugs-unsubscr...@freebsd.org"
Re: kern/170834: commit references a PR
The following reply was made to PR kern/170834; it has been noted by GNATS.
From: dfil...@freebsd.org (dfilter service)
To: bug-follo...@freebsd.org
Cc:
Subject: Re: kern/170834: commit references a PR
Date: Tue, 17 Sep 2013 18:41:39 + (UTC)
Author: dumbbell
Date: Tue Sep 17 18:41:32 2013
New Revision: 255646
URL: http://svnweb.freebsd.org/changeset/base/255646
Log:
psm: Update "struct synapticshw" in psm(4) man page
This structure was updated in r255153 and r255154.
PR: kern/170834
Approved by: re (hrs)
Modified:
head/share/man/man4/psm.4
Modified: head/share/man/man4/psm.4
==
--- head/share/man/man4/psm.4 Tue Sep 17 17:56:53 2013(r255645)
+++ head/share/man/man4/psm.4 Tue Sep 17 18:41:32 2013(r255646)
@@ -460,7 +460,7 @@ typedef struct synapticshw {
int infoHardware; /* hardware model */
int infoNewAbs; /* supports the newabs format */
int capPen; /* can detect a pen */
-int infoSimpleC; /* supports simple commands */
+int infoSimplC; /* supports simple commands */
int infoGeometry; /* touchpad dimensions */
int capExtended; /* supports extended packets */
int capSleep; /* can be suspended/resumed */
@@ -468,6 +468,9 @@ typedef struct synapticshw {
int capMultiFinger; /* can detect multiple fingers */
int capPalmDetect;/* can detect a palm */
int capPassthrough; /* can passthrough guest packets */
+int capMiddle;/* has a physical middle button */
+int nExtendedButtons; /* has N additionnal buttons */
+int nExtendedQueries; /* supports N extended queries */
} synapticshw_t;
.Ed
.Pp
___
svn-src-...@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"
___
freebsd-bugs@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-bugs
To unsubscribe, send any mail to "freebsd-bugs-unsubscr...@freebsd.org"
Re: bin/178463: commit references a PR
The following reply was made to PR bin/178463; it has been noted by GNATS.
From: dfil...@freebsd.org (dfilter service)
To: bug-follo...@freebsd.org
Cc:
Subject: Re: bin/178463: commit references a PR
Date: Thu, 19 Sep 2013 20:18:00 + (UTC)
Author: db (ports committer)
Date: Thu Sep 19 20:17:50 2013
New Revision: 255715
URL: http://svnweb.freebsd.org/changeset/base/255715
Log:
- calendar uses cpp internally, this diff removes this usage and
substitutes a limited subset cpp processor internally.
PR: src/178463
Approved by: re (gjb)
Added:
head/usr.bin/calendar/calcpp.c (contents, props changed)
Modified:
head/usr.bin/calendar/Makefile (contents, props changed)
head/usr.bin/calendar/calendar.1 (contents, props changed)
head/usr.bin/calendar/calendar.h (contents, props changed)
head/usr.bin/calendar/io.c (contents, props changed)
head/usr.bin/calendar/pathnames.h (contents, props changed)
Modified: head/usr.bin/calendar/Makefile
==
--- head/usr.bin/calendar/Makefile Thu Sep 19 20:15:24 2013
(r255714)
+++ head/usr.bin/calendar/Makefile Thu Sep 19 20:17:50 2013
(r255715)
@@ -3,7 +3,7 @@
PROG= calendar
SRCS= calendar.c locale.c events.c dates.c parsedata.c io.c day.c \
- ostern.c paskha.c pom.c sunpos.c
+ ostern.c paskha.c pom.c sunpos.c calcpp.c
DPADD=${LIBM}
LDADD=-lm
INTER= de_AT.ISO_8859-15 de_DE.ISO8859-1 fr_FR.ISO8859-1 \
Added: head/usr.bin/calendar/calcpp.c
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/usr.bin/calendar/calcpp.c Thu Sep 19 20:17:50 2013
(r255715)
@@ -0,0 +1,229 @@
+/*-
+ * Copyright (c) 2013 Diane Bruce
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * $FreeBSD$
+ */
+
+/* calendar fake cpp does a very limited cpp version */
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+#include "pathnames.h"
+#include "calendar.h"
+
+#define MAXFPSTACK50
+static FILE *fpstack[MAXFPSTACK];
+static int curfpi;
+static void pushfp(FILE *fp);
+static FILE *popfp(void);
+static int tokenscpp(char *buf, char *string);
+
+#define T_INVALID -1
+#define T_INCLUDE 0
+#define T_DEFINE 1
+#define T_IFNDEF 2
+#define T_ENDIF 3
+
+#define MAXSYMS 100
+static char *symtable[MAXSYMS];
+static void addsym(const char *name);
+static int findsym(const char *name);
+
+FILE *
+fincludegets(char *buf, int size, FILE *fp)
+{
+ char name[MAXPATHLEN];
+ FILE *nfp=NULL;
+ char *p;
+ int ch;
+
+ if (fp == NULL)
+ return(NULL);
+
+ if (fgets(buf, size, fp) == NULL) {
+ *buf = '\0';
+ fclose(fp);
+ fp = popfp();
+ return (fp);
+ }
+ if ((p = strchr(buf, '\n')) != NULL)
+ *p = '\0';
+ else {
+ /* Flush this line */
+ while ((ch = fgetc(fp)) != '\n' && ch != EOF);
+ if (ch == EOF) {
+ *buf = '\0';
+ fclose(fp);
+ fp = popfp();
+ return(fp);
+ }
+ }
+ switch (tokenscpp(buf, name)) {
+ case T_IN
Re: misc/160646: commit references a PR
The following reply was made to PR misc/160646; it has been noted by GNATS.
From: dfil...@freebsd.org (dfilter service)
To: bug-follo...@freebsd.org
Cc:
Subject: Re: misc/160646: commit references a PR
Date: Sat, 21 Sep 2013 22:36:16 + (UTC)
Author: ian
Date: Sat Sep 21 22:36:07 2013
New Revision: 255775
URL: http://svnweb.freebsd.org/changeset/base/255775
Log:
Create a separate script to generate osreldate.h rather than sourcing
newvers.sh into a temporary subshell with inline make rules.
Using a separate script fixes a variety of problems, including establishing
the correct dependencies in the makefiles. It also eliminates a problem
with the way newvers.sh uses `realpath $0`, because $0 expands differently
within a script sourced into a rule in a makefile depending on the version
of make and of /bin/sh being used. The latter can cause build breakage in a
cross-build environment, and can also make it difficult to compile 10.0 on
older pre-10.0 systems.
PR: 160646 174422
Submitted by:Garrett Cooper
Approved by: re (gjb)
MFC after: 2 weeks
Added:
head/include/mk-osreldate.sh (contents, props changed)
Modified:
head/include/Makefile
Modified: head/include/Makefile
==
--- head/include/Makefile Sat Sep 21 22:24:10 2013(r255774)
+++ head/include/Makefile Sat Sep 21 22:36:07 2013(r255775)
@@ -104,19 +104,16 @@ SHARED?= copies
INCS+=osreldate.h
-osreldate.h: ${.CURDIR}/../sys/conf/newvers.sh ${.CURDIR}/../sys/sys/param.h \
-${.CURDIR}/Makefile
- @${ECHO} creating osreldate.h from newvers.sh
- @MAKE=${MAKE}; \
- PARAMFILE=${.CURDIR}/../sys/sys/param.h; \
- . ${.CURDIR}/../sys/conf/newvers.sh; \
- echo "$$COPYRIGHT" > osreldate.h; \
- echo "#ifdef _KERNEL" >> osreldate.h; \
- echo "#error \" cannot be used in the kernel, use
\"" >> osreldate.h; \
- echo "#else" >> osreldate.h; \
- echo "#undef __FreeBSD_version" >> osreldate.h; \
- echo "#define __FreeBSD_version $$RELDATE" >> osreldate.h; \
- echo "#endif" >> osreldate.h
+NEWVERS_SH= ${.CURDIR}/../sys/conf/newvers.sh
+PARAM_H= ${.CURDIR}/../sys/sys/param.h
+MK_OSRELDATE_SH= ${.CURDIR}/mk-osreldate.sh
+
+osreldate.h vers.c: ${NEWVERS_SH} ${PARAM_H} ${MK_OSRELDATE_SH}
+ env ECHO="${ECHO}" \
+ MAKE="${MAKE}" \
+ NEWVERS_SH=${NEWVERS_SH} \
+ PARAM_H=${PARAM_H} \
+ ${MK_OSRELDATE_SH}
.for i in ${LHDRS}
INCSLINKS+= sys/$i ${INCLUDEDIR}/$i
Added: head/include/mk-osreldate.sh
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/include/mk-osreldate.sh Sat Sep 21 22:36:07 2013
(r255775)
@@ -0,0 +1,49 @@
+#!/bin/sh -
+# Copyright (c) 2013 Garrett Cooper
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#notice, this list of conditions and the following disclaimer in the
+#documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+#
+# $FreeBSD$
+
+set -e
+
+CURDIR=$(pwd)
+ECHO=${ECHO:=echo}
+
+tmpfile=$(mktemp osreldate.)
+trap "rm -f $tmpfile" EXIT
+
+${ECHO} creating osreldate.h from newvers.sh
+
+export PARAMFILE="${PARAM_H:=$CURDIR/../sys/sys/param.h}"
+. "${NEWVERS_SH:=$CURDIR/../sys/conf/newvers.sh}"
+cat > $tmpfile < cannot be used in the kernel, use "
+#else
+#undef __FreeBSD_version
+#define __FreeBSD_version $RELD
Re: conf/174422: commit references a PR
The following reply was made to PR conf/174422; it has been noted by GNATS.
From: dfil...@freebsd.org (dfilter service)
To: bug-follo...@freebsd.org
Cc:
Subject: Re: conf/174422: commit references a PR
Date: Sat, 21 Sep 2013 22:36:16 + (UTC)
Author: ian
Date: Sat Sep 21 22:36:07 2013
New Revision: 255775
URL: http://svnweb.freebsd.org/changeset/base/255775
Log:
Create a separate script to generate osreldate.h rather than sourcing
newvers.sh into a temporary subshell with inline make rules.
Using a separate script fixes a variety of problems, including establishing
the correct dependencies in the makefiles. It also eliminates a problem
with the way newvers.sh uses `realpath $0`, because $0 expands differently
within a script sourced into a rule in a makefile depending on the version
of make and of /bin/sh being used. The latter can cause build breakage in a
cross-build environment, and can also make it difficult to compile 10.0 on
older pre-10.0 systems.
PR: 160646 174422
Submitted by:Garrett Cooper
Approved by: re (gjb)
MFC after: 2 weeks
Added:
head/include/mk-osreldate.sh (contents, props changed)
Modified:
head/include/Makefile
Modified: head/include/Makefile
==
--- head/include/Makefile Sat Sep 21 22:24:10 2013(r255774)
+++ head/include/Makefile Sat Sep 21 22:36:07 2013(r255775)
@@ -104,19 +104,16 @@ SHARED?= copies
INCS+=osreldate.h
-osreldate.h: ${.CURDIR}/../sys/conf/newvers.sh ${.CURDIR}/../sys/sys/param.h \
-${.CURDIR}/Makefile
- @${ECHO} creating osreldate.h from newvers.sh
- @MAKE=${MAKE}; \
- PARAMFILE=${.CURDIR}/../sys/sys/param.h; \
- . ${.CURDIR}/../sys/conf/newvers.sh; \
- echo "$$COPYRIGHT" > osreldate.h; \
- echo "#ifdef _KERNEL" >> osreldate.h; \
- echo "#error \" cannot be used in the kernel, use
\"" >> osreldate.h; \
- echo "#else" >> osreldate.h; \
- echo "#undef __FreeBSD_version" >> osreldate.h; \
- echo "#define __FreeBSD_version $$RELDATE" >> osreldate.h; \
- echo "#endif" >> osreldate.h
+NEWVERS_SH= ${.CURDIR}/../sys/conf/newvers.sh
+PARAM_H= ${.CURDIR}/../sys/sys/param.h
+MK_OSRELDATE_SH= ${.CURDIR}/mk-osreldate.sh
+
+osreldate.h vers.c: ${NEWVERS_SH} ${PARAM_H} ${MK_OSRELDATE_SH}
+ env ECHO="${ECHO}" \
+ MAKE="${MAKE}" \
+ NEWVERS_SH=${NEWVERS_SH} \
+ PARAM_H=${PARAM_H} \
+ ${MK_OSRELDATE_SH}
.for i in ${LHDRS}
INCSLINKS+= sys/$i ${INCLUDEDIR}/$i
Added: head/include/mk-osreldate.sh
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/include/mk-osreldate.sh Sat Sep 21 22:36:07 2013
(r255775)
@@ -0,0 +1,49 @@
+#!/bin/sh -
+# Copyright (c) 2013 Garrett Cooper
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#notice, this list of conditions and the following disclaimer in the
+#documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+#
+# $FreeBSD$
+
+set -e
+
+CURDIR=$(pwd)
+ECHO=${ECHO:=echo}
+
+tmpfile=$(mktemp osreldate.)
+trap "rm -f $tmpfile" EXIT
+
+${ECHO} creating osreldate.h from newvers.sh
+
+export PARAMFILE="${PARAM_H:=$CURDIR/../sys/sys/param.h}"
+. "${NEWVERS_SH:=$CURDIR/../sys/conf/newvers.sh}"
+cat > $tmpfile < cannot be used in the kernel, use "
+#else
+#undef __FreeBSD_version
+#define __FreeBSD_version $RELD
Re: kern/178997: commit references a PR
The following reply was made to PR kern/178997; it has been noted by GNATS.
From: dfil...@freebsd.org (dfilter service)
To: bug-follo...@freebsd.org
Cc:
Subject: Re: kern/178997: commit references a PR
Date: Sun, 22 Sep 2013 19:23:56 + (UTC)
Author: kib
Date: Sun Sep 22 19:23:48 2013
New Revision: 255797
URL: http://svnweb.freebsd.org/changeset/base/255797
Log:
Increase the chance of the buffer write from the bufdaemon helper
context to succeed. If the locked vnode which owns the buffer to be
written is shared locked, try the non-blocking upgrade of the lock to
exclusive.
PR: kern/178997
Reported and tested by: Klaus Weber
Sponsored by:The FreeBSD Foundation
MFC after: 1 week
Approved by: re (marius)
Modified:
head/sys/kern/vfs_bio.c
Modified: head/sys/kern/vfs_bio.c
==
--- head/sys/kern/vfs_bio.cSun Sep 22 19:15:24 2013(r255796)
+++ head/sys/kern/vfs_bio.cSun Sep 22 19:23:48 2013(r255797)
@@ -2624,6 +2624,8 @@ flushbufqueues(struct vnode *lvp, int ta
int hasdeps;
int flushed;
int queue;
+ int error;
+ bool unlock;
flushed = 0;
queue = QUEUE_DIRTY;
@@ -2699,7 +2701,16 @@ flushbufqueues(struct vnode *lvp, int ta
BUF_UNLOCK(bp);
continue;
}
- if (vn_lock(vp, LK_EXCLUSIVE | LK_NOWAIT | LK_CANRECURSE) == 0)
{
+ if (lvp == NULL) {
+ unlock = true;
+ error = vn_lock(vp, LK_EXCLUSIVE | LK_NOWAIT);
+ } else {
+ ASSERT_VOP_LOCKED(vp, "getbuf");
+ unlock = false;
+ error = VOP_ISLOCKED(vp) == LK_EXCLUSIVE ? 0 :
+ vn_lock(vp, LK_UPGRADE | LK_NOWAIT);
+ }
+ if (error == 0) {
mtx_unlock(&bqdirty);
CTR3(KTR_BUF, "flushbufqueue(%p) vp %p flags %X",
bp, bp->b_vp, bp->b_flags);
@@ -2711,7 +2722,8 @@ flushbufqueues(struct vnode *lvp, int ta
notbufdflushes++;
}
vn_finished_write(mp);
- VOP_UNLOCK(vp, 0);
+ if (unlock)
+ VOP_UNLOCK(vp, 0);
flushwithdeps += hasdeps;
flushed++;
___
svn-src-...@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"
___
freebsd-bugs@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-bugs
To unsubscribe, send any mail to "freebsd-bugs-unsubscr...@freebsd.org"
Re: kern/182161: commit references a PR
The following reply was made to PR kern/182161; it has been noted by GNATS. From: dfil...@freebsd.org (dfilter service) To: bug-follo...@freebsd.org Cc: Subject: Re: kern/182161: commit references a PR Date: Tue, 24 Sep 2013 12:24:55 + (UTC) Author: kib Date: Tue Sep 24 12:24:48 2013 New Revision: 255844 URL: http://svnweb.freebsd.org/changeset/base/255844 Log: Ensure that the ERESTART return from the syscall reloads the registers, to make the restarted syscall instruction pass the correct arguments. PR: kern/182161 Reported by: Russ Cox Sponsored by:The FreeBSD Foundation MFC after: 3 days Approved by: re (marius) Modified: head/sys/amd64/amd64/vm_machdep.c Modified: head/sys/amd64/amd64/vm_machdep.c == --- head/sys/amd64/amd64/vm_machdep.c Tue Sep 24 11:49:04 2013 (r255843) +++ head/sys/amd64/amd64/vm_machdep.c Tue Sep 24 12:24:48 2013 (r255844) @@ -400,9 +400,13 @@ cpu_set_syscall_retval(struct thread *td * for the next iteration. * %r10 restore is only required for freebsd/amd64 processes, * but shall be innocent for any ia32 ABI. + * + * Require full context restore to get the arguments + * in the registers reloaded at return to usermode. */ td->td_frame->tf_rip -= td->td_frame->tf_err; td->td_frame->tf_r10 = td->td_frame->tf_rcx; + set_pcb_flags(td->td_pcb, PCB_FULL_IRET); break; case EJUSTRETURN: ___ svn-src-...@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" ___ freebsd-bugs@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-bugs To unsubscribe, send any mail to "freebsd-bugs-unsubscr...@freebsd.org"
Re: kern/182161: commit references a PR
The following reply was made to PR kern/182161; it has been noted by GNATS. From: dfil...@freebsd.org (dfilter service) To: bug-follo...@freebsd.org Cc: Subject: Re: kern/182161: commit references a PR Date: Fri, 27 Sep 2013 06:57:06 + (UTC) Author: kib Date: Fri Sep 27 06:56:58 2013 New Revision: 255905 URL: http://svnweb.freebsd.org/changeset/base/255905 Log: MFC r255844: Ensure that the ERESTART return from the syscall reloads the registers, to make the restarted syscall instruction pass the correct arguments. PR: kern/182161 Modified: stable/9/sys/amd64/amd64/vm_machdep.c Directory Properties: stable/9/sys/ (props changed) Modified: stable/9/sys/amd64/amd64/vm_machdep.c == --- stable/9/sys/amd64/amd64/vm_machdep.c Thu Sep 26 22:47:02 2013 (r255904) +++ stable/9/sys/amd64/amd64/vm_machdep.c Fri Sep 27 06:56:58 2013 (r255905) @@ -400,9 +400,13 @@ cpu_set_syscall_retval(struct thread *td * for the next iteration. * %r10 restore is only required for freebsd/amd64 processes, * but shall be innocent for any ia32 ABI. + * + * Require full context restore to get the arguments + * in the registers reloaded at return to usermode. */ td->td_frame->tf_rip -= td->td_frame->tf_err; td->td_frame->tf_r10 = td->td_frame->tf_rcx; + set_pcb_flags(td->td_pcb, PCB_FULL_IRET); break; case EJUSTRETURN: ___ svn-src-...@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" ___ freebsd-bugs@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-bugs To unsubscribe, send any mail to "freebsd-bugs-unsubscr...@freebsd.org"
Re: kern/182161: commit references a PR
The following reply was made to PR kern/182161; it has been noted by GNATS. From: dfil...@freebsd.org (dfilter service) To: bug-follo...@freebsd.org Cc: Subject: Re: kern/182161: commit references a PR Date: Fri, 27 Sep 2013 07:02:56 + (UTC) Author: kib Date: Fri Sep 27 07:02:48 2013 New Revision: 255906 URL: http://svnweb.freebsd.org/changeset/base/255906 Log: MFC r255844: Ensure that the ERESTART return from the syscall reloads the registers, to make the restarted syscall instruction pass the correct arguments. PR: kern/182161 Modified: stable/8/sys/amd64/amd64/vm_machdep.c Directory Properties: stable/8/sys/ (props changed) stable/8/sys/amd64/ (props changed) Modified: stable/8/sys/amd64/amd64/vm_machdep.c == --- stable/8/sys/amd64/amd64/vm_machdep.c Fri Sep 27 06:56:58 2013 (r255905) +++ stable/8/sys/amd64/amd64/vm_machdep.c Fri Sep 27 07:02:48 2013 (r255906) @@ -395,9 +395,13 @@ cpu_set_syscall_retval(struct thread *td * for the next iteration. * %r10 restore is only required for freebsd/amd64 processes, * but shall be innocent for any ia32 ABI. + * + * Require full context restore to get the arguments + * in the registers reloaded at return to usermode. */ td->td_frame->tf_rip -= td->td_frame->tf_err; td->td_frame->tf_r10 = td->td_frame->tf_rcx; + set_pcb_flags(td->td_pcb, PCB_FULL_IRET); break; case EJUSTRETURN: ___ svn-src-...@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" ___ freebsd-bugs@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-bugs To unsubscribe, send any mail to "freebsd-bugs-unsubscr...@freebsd.org"
Re: conf/182269: commit references a PR
The following reply was made to PR conf/182269; it has been noted by GNATS. From: dfil...@freebsd.org (dfilter service) To: bug-follo...@freebsd.org Cc: Subject: Re: conf/182269: commit references a PR Date: Fri, 27 Sep 2013 17:42:42 + (UTC) Author: sjg Date: Fri Sep 27 17:42:23 2013 New Revision: 255916 URL: http://svnweb.freebsd.org/changeset/base/255916 Log: Fix Fx syntax. PR: 182269 Approved by: re@ Modified: head/contrib/bmake/make.1 Modified: head/contrib/bmake/make.1 == --- head/contrib/bmake/make.1 Fri Sep 27 16:02:40 2013(r255915) +++ head/contrib/bmake/make.1 Fri Sep 27 17:42:23 2013(r255916) @@ -730,7 +730,7 @@ even if the target is not tagged with The default is .Ql Pa yes for backwards compatability with -.Fx 9 +.Fx 9.0 and earlier. .It Va .MAKE.DEPENDFILE Names the makefile (default ___ svn-src-...@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" ___ freebsd-bugs@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-bugs To unsubscribe, send any mail to "freebsd-bugs-unsubscr...@freebsd.org"
Re: conf/174422: commit references a PR
The following reply was made to PR conf/174422; it has been noted by GNATS.
From: dfil...@freebsd.org (dfilter service)
To: bug-follo...@freebsd.org
Cc:
Subject: Re: conf/174422: commit references a PR
Date: Sat, 28 Sep 2013 16:39:54 + (UTC)
Author: ian
Date: Sat Sep 28 16:39:46 2013
New Revision: 255930
URL: http://svnweb.freebsd.org/changeset/base/255930
Log:
Allow the path to the system source directory to be passed in to
newvers.sh. Pass it in from include/Makefile. If it isn't passed in,
fall back to the old logic of using dirname $0.
Using dirname $0 does not yield the path to the script if it was
sourced in from another script in another directory; you end up with
the parent script's path. That was causing newvers.sh to look one
level below the FreeBSD src/ directory when building osreldate.h and it
may find something like a git or svn repo there that has nothing to do
with FreeBSD.
PR: 174422
Approved by: re ()
MFC after: 2 weeks
Modified:
head/include/Makefile
head/sys/conf/newvers.sh
Modified: head/include/Makefile
==
--- head/include/Makefile Sat Sep 28 16:25:20 2013(r255929)
+++ head/include/Makefile Sat Sep 28 16:39:46 2013(r255930)
@@ -104,8 +104,9 @@ SHARED?= copies
INCS+=osreldate.h
-NEWVERS_SH= ${.CURDIR}/../sys/conf/newvers.sh
-PARAM_H= ${.CURDIR}/../sys/sys/param.h
+SYSDIR= ${.CURDIR}/../sys
+NEWVERS_SH= ${SYSDIR}/conf/newvers.sh
+PARAM_H= ${SYSDIR}/sys/param.h
MK_OSRELDATE_SH= ${.CURDIR}/mk-osreldate.sh
osreldate.h vers.c: ${NEWVERS_SH} ${PARAM_H} ${MK_OSRELDATE_SH}
@@ -113,6 +114,7 @@ osreldate.h vers.c: ${NEWVERS_SH} ${PARA
MAKE="${MAKE}" \
NEWVERS_SH=${NEWVERS_SH} \
PARAM_H=${PARAM_H} \
+ SYSDIR=${SYSDIR} \
sh ${MK_OSRELDATE_SH}
.for i in ${LHDRS}
Modified: head/sys/conf/newvers.sh
==
--- head/sys/conf/newvers.sh Sat Sep 28 16:25:20 2013(r255929)
+++ head/sys/conf/newvers.sh Sat Sep 28 16:39:46 2013(r255930)
@@ -38,7 +38,10 @@ if [ "X${BRANCH_OVERRIDE}" != "X" ]; the
fi
RELEASE="${REVISION}-${BRANCH}"
VERSION="${TYPE} ${RELEASE}"
-SYSDIR=$(dirname $0)/..
+
+if [ "X${SYSDIR}" = "X" ]; then
+SYSDIR=$(dirname $0)/..
+fi
if [ "X${PARAMFILE}" != "X" ]; then
RELDATE=$(awk '/__FreeBSD_version.*propagated to newvers/ {print $3}' \
___
svn-src-...@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"
___
freebsd-bugs@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-bugs
To unsubscribe, send any mail to "freebsd-bugs-unsubscr...@freebsd.org"
Re: kern/178997: commit references a PR
The following reply was made to PR kern/178997; it has been noted by GNATS.
From: dfil...@freebsd.org (dfilter service)
To: bug-follo...@freebsd.org
Cc:
Subject: Re: kern/178997: commit references a PR
Date: Sun, 29 Sep 2013 18:05:10 + (UTC)
Author: kib
Date: Sun Sep 29 18:04:57 2013
New Revision: 255941
URL: http://svnweb.freebsd.org/changeset/base/255941
Log:
Reimplement r255797 using LK_TRYUPGRADE.
The r255797 was:
Increase the chance of the buffer write from the bufdaemon helper
context to succeed. If the locked vnode which owns the buffer to be
written is shared locked, try the non-blocking upgrade of the lock to
exclusive.
PR: kern/178997
Reported and tested by: Klaus Weber
Sponsored by:The FreeBSD Foundation
MFC after: 1 week
Approved by: re (glebius)
Modified:
head/sys/kern/vfs_bio.c
Modified: head/sys/kern/vfs_bio.c
==
--- head/sys/kern/vfs_bio.cSun Sep 29 18:02:23 2013(r255940)
+++ head/sys/kern/vfs_bio.cSun Sep 29 18:04:57 2013(r255941)
@@ -2624,6 +2624,8 @@ flushbufqueues(struct vnode *lvp, int ta
int hasdeps;
int flushed;
int queue;
+ int error;
+ bool unlock;
flushed = 0;
queue = QUEUE_DIRTY;
@@ -2699,7 +2701,16 @@ flushbufqueues(struct vnode *lvp, int ta
BUF_UNLOCK(bp);
continue;
}
- if (vn_lock(vp, LK_EXCLUSIVE | LK_NOWAIT | LK_CANRECURSE) == 0)
{
+ if (lvp == NULL) {
+ unlock = true;
+ error = vn_lock(vp, LK_EXCLUSIVE | LK_NOWAIT);
+ } else {
+ ASSERT_VOP_LOCKED(vp, "getbuf");
+ unlock = false;
+ error = VOP_ISLOCKED(vp) == LK_EXCLUSIVE ? 0 :
+ vn_lock(vp, LK_TRYUPGRADE);
+ }
+ if (error == 0) {
mtx_unlock(&bqdirty);
CTR3(KTR_BUF, "flushbufqueue(%p) vp %p flags %X",
bp, bp->b_vp, bp->b_flags);
@@ -2711,7 +2722,8 @@ flushbufqueues(struct vnode *lvp, int ta
notbufdflushes++;
}
vn_finished_write(mp);
- VOP_UNLOCK(vp, 0);
+ if (unlock)
+ VOP_UNLOCK(vp, 0);
flushwithdeps += hasdeps;
flushed++;
___
svn-src-...@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"
___
freebsd-bugs@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-bugs
To unsubscribe, send any mail to "freebsd-bugs-unsubscr...@freebsd.org"
Re: bin/182545: commit references a PR
The following reply was made to PR bin/182545; it has been noted by GNATS.
From: dfil...@freebsd.org (dfilter service)
To: bug-follo...@freebsd.org
Cc:
Subject: Re: bin/182545: commit references a PR
Date: Wed, 2 Oct 2013 21:47:33 + (UTC)
Author: roberto
Date: Wed Oct 2 21:47:25 2013
New Revision: 256009
URL: http://svnweb.freebsd.org/changeset/base/256009
Log:
Meinberg clocks support was inadvertently removed during the last vendor
import. Add it back.
PR: bin/182545
Submitted by:Joerg Pulz
Approved by: re (delphij)
MFC after: 1 week
Modified:
head/usr.sbin/ntp/config.h
head/usr.sbin/ntp/libparse/Makefile
Modified: head/usr.sbin/ntp/config.h
==
--- head/usr.sbin/ntp/config.h Wed Oct 2 20:44:36 2013(r256008)
+++ head/usr.sbin/ntp/config.h Wed Oct 2 21:47:25 2013(r256009)
@@ -84,7 +84,7 @@
#define CLOCK_LOCAL 1
/* Meinberg clocks */
-/* #undef CLOCK_MEINBERG */
+#define CLOCK_MEINBERG 1
/* Magnavox MX4200 GPS receiver */
/* #undef CLOCK_MX4200 */
Modified: head/usr.sbin/ntp/libparse/Makefile
==
--- head/usr.sbin/ntp/libparse/MakefileWed Oct 2 20:44:36 2013
(r256008)
+++ head/usr.sbin/ntp/libparse/MakefileWed Oct 2 21:47:25 2013
(r256009)
@@ -9,7 +9,7 @@ SRCS= clk_computime.c clk_dcf7000.c clk_
clk_rawdcf.cclk_rcc8000.c clk_schmid.cclk_trimtaip.c \
clk_trimtsip.c clk_varitext.c clk_wharton.c data_mbg.c \
info_trimble.c parse.c parse_conf.ctrim_info.c \
- binio.c gpstolfp.c
+ binio.c gpstolfp.c ieee754io.c mfp_mul.c
CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include -I${.CURDIR}/../
___
svn-src-...@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"
___
freebsd-bugs@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-bugs
To unsubscribe, send any mail to "freebsd-bugs-unsubscr...@freebsd.org"
Re: misc/180918: commit references a PR
The following reply was made to PR misc/180918; it has been noted by GNATS.
From: dfil...@freebsd.org (dfilter service)
To: bug-follo...@freebsd.org
Cc:
Subject: Re: misc/180918: commit references a PR
Date: Mon, 7 Oct 2013 12:57:36 + (UTC)
Author: pluknet
Date: Mon Oct 7 12:57:27 2013
New Revision: 256109
URL: http://svnweb.freebsd.org/changeset/base/256109
Log:
MFC r237560,254319 (by uqs): Fix 'make depend'.
PR: misc/180918
Submitted by:Eugene Grosbein
Modified:
stable/9/sys/modules/dtrace/sdt/Makefile
stable/9/sys/modules/rdma/krping/Makefile
stable/9/sys/modules/toecore/Makefile
Directory Properties:
stable/9/sys/ (props changed)
stable/9/sys/modules/ (props changed)
Modified: stable/9/sys/modules/dtrace/sdt/Makefile
==
--- stable/9/sys/modules/dtrace/sdt/Makefile Mon Oct 7 12:07:40 2013
(r256108)
+++ stable/9/sys/modules/dtrace/sdt/Makefile Mon Oct 7 12:57:27 2013
(r256109)
@@ -4,7 +4,7 @@
KMOD= sdt
SRCS= sdt.c
-SRCS+=vnode_if.h
+SRCS+=vnode_if.h opt_kdtrace.h
CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris \
-I${.CURDIR}/../../../cddl/contrib/opensolaris/uts/common \
Modified: stable/9/sys/modules/rdma/krping/Makefile
==
--- stable/9/sys/modules/rdma/krping/Makefile Mon Oct 7 12:07:40 2013
(r256108)
+++ stable/9/sys/modules/rdma/krping/Makefile Mon Oct 7 12:57:27 2013
(r256109)
@@ -5,8 +5,8 @@ RDMA= ${.CURDIR}/../../../contrib/rdma/k
KMOD= krping
SRCS= krping.c krping_dev.c getopt.c
-SRCS+= bus_if.h device_if.h opt_sched.h pci_if.h pcib_if.h
-SRCS+= vnode_if.h
-CFLAGS+= -I${.CURDIR}/../../../ofed/include
+SRCS+= bus_if.h device_if.h pci_if.h pcib_if.h vnode_if.h
+SRCS+= opt_sched.h opt_inet.h opt_inet6.h
+CFLAGS+= -I${.CURDIR}/../../../ofed/include
.include
Modified: stable/9/sys/modules/toecore/Makefile
==
--- stable/9/sys/modules/toecore/Makefile Mon Oct 7 12:07:40 2013
(r256108)
+++ stable/9/sys/modules/toecore/Makefile Mon Oct 7 12:57:27 2013
(r256109)
@@ -4,6 +4,6 @@
KMOD= toecore
SRCS= toecore.c
-SRCS+=opt_ofed.h
+SRCS+=opt_ofed.h opt_inet.h opt_inet6.h
.include
___
svn-src-...@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"
___
freebsd-bugs@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-bugs
To unsubscribe, send any mail to "freebsd-bugs-unsubscr...@freebsd.org"
Re: misc/160646: commit references a PR
The following reply was made to PR misc/160646; it has been noted by GNATS.
From: dfil...@freebsd.org (dfilter service)
To: bug-follo...@freebsd.org
Cc:
Subject: Re: misc/160646: commit references a PR
Date: Sat, 12 Oct 2013 17:31:29 + (UTC)
Author: ian
Date: Sat Oct 12 17:31:21 2013
New Revision: 256386
URL: http://svnweb.freebsd.org/changeset/base/256386
Log:
MFC r255775 r255796 r255807 r255930 r255929 r255957:
Create a separate script to generate osreldate.h rather than sourcing
newvers.sh into a temporary subshell with inline make rules.
Fixes PR 160646.
Allow the path to the system source directory to be passed in to
newvers.sh. Pass it in from include/Makefile. If it isn't passed in,
fall back to the old logic of using dirname $0. Fixes PR 174422.
PR: 160646 174422
Added:
stable/9/include/mk-osreldate.sh
- copied, changed from r255775, head/include/mk-osreldate.sh
Modified:
stable/9/include/Makefile
stable/9/sys/conf/newvers.sh
Directory Properties:
stable/9/include/ (props changed)
stable/9/sys/ (props changed)
stable/9/sys/conf/ (props changed)
Modified: stable/9/include/Makefile
==
--- stable/9/include/Makefile Sat Oct 12 17:27:59 2013(r256385)
+++ stable/9/include/Makefile Sat Oct 12 17:31:21 2013(r256386)
@@ -99,19 +99,18 @@ SHARED?= copies
INCS+=osreldate.h
-osreldate.h: ${.CURDIR}/../sys/conf/newvers.sh ${.CURDIR}/../sys/sys/param.h \
-${.CURDIR}/Makefile
- @${ECHO} creating osreldate.h from newvers.sh
- @MAKE=${MAKE}; \
- PARAMFILE=${.CURDIR}/../sys/sys/param.h; \
- . ${.CURDIR}/../sys/conf/newvers.sh; \
- echo "$$COPYRIGHT" > osreldate.h; \
- echo "#ifdef _KERNEL" >> osreldate.h; \
- echo "#error \" cannot be used in the kernel, use
\"" >> osreldate.h; \
- echo "#else" >> osreldate.h; \
- echo "#undef __FreeBSD_version" >> osreldate.h; \
- echo "#define __FreeBSD_version $$RELDATE" >> osreldate.h; \
- echo "#endif" >> osreldate.h
+SYSDIR= ${.CURDIR}/../sys
+NEWVERS_SH= ${SYSDIR}/conf/newvers.sh
+PARAM_H= ${SYSDIR}/sys/param.h
+MK_OSRELDATE_SH= ${.CURDIR}/mk-osreldate.sh
+
+osreldate.h vers.c: ${NEWVERS_SH} ${PARAM_H} ${MK_OSRELDATE_SH}
+ env ECHO="${ECHO}" \
+ MAKE="${MAKE}" \
+ NEWVERS_SH=${NEWVERS_SH} \
+ PARAM_H=${PARAM_H} \
+ SYSDIR=${SYSDIR} \
+ sh ${MK_OSRELDATE_SH}
.for i in ${LHDRS}
INCSLINKS+= sys/$i ${INCLUDEDIR}/$i
Copied and modified: stable/9/include/mk-osreldate.sh (from r255775,
head/include/mk-osreldate.sh)
==
--- head/include/mk-osreldate.sh Sat Sep 21 22:36:07 2013
(r255775, copy source)
+++ stable/9/include/mk-osreldate.sh Sat Oct 12 17:31:21 2013
(r256386)
@@ -36,7 +36,9 @@ trap "rm -f $tmpfile" EXIT
${ECHO} creating osreldate.h from newvers.sh
export PARAMFILE="${PARAM_H:=$CURDIR/../sys/sys/param.h}"
-. "${NEWVERS_SH:=$CURDIR/../sys/conf/newvers.sh}"
+set +e
+. "${NEWVERS_SH:=$CURDIR/../sys/conf/newvers.sh}" || exit 1
+set -e
cat > $tmpfile <http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
___
freebsd-bugs@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-bugs
To unsubscribe, send any mail to "freebsd-bugs-unsubscr...@freebsd.org"
Re: conf/174422: commit references a PR
The following reply was made to PR conf/174422; it has been noted by GNATS.
From: dfil...@freebsd.org (dfilter service)
To: bug-follo...@freebsd.org
Cc:
Subject: Re: conf/174422: commit references a PR
Date: Sat, 12 Oct 2013 17:31:29 + (UTC)
Author: ian
Date: Sat Oct 12 17:31:21 2013
New Revision: 256386
URL: http://svnweb.freebsd.org/changeset/base/256386
Log:
MFC r255775 r255796 r255807 r255930 r255929 r255957:
Create a separate script to generate osreldate.h rather than sourcing
newvers.sh into a temporary subshell with inline make rules.
Fixes PR 160646.
Allow the path to the system source directory to be passed in to
newvers.sh. Pass it in from include/Makefile. If it isn't passed in,
fall back to the old logic of using dirname $0. Fixes PR 174422.
PR: 160646 174422
Added:
stable/9/include/mk-osreldate.sh
- copied, changed from r255775, head/include/mk-osreldate.sh
Modified:
stable/9/include/Makefile
stable/9/sys/conf/newvers.sh
Directory Properties:
stable/9/include/ (props changed)
stable/9/sys/ (props changed)
stable/9/sys/conf/ (props changed)
Modified: stable/9/include/Makefile
==
--- stable/9/include/Makefile Sat Oct 12 17:27:59 2013(r256385)
+++ stable/9/include/Makefile Sat Oct 12 17:31:21 2013(r256386)
@@ -99,19 +99,18 @@ SHARED?= copies
INCS+=osreldate.h
-osreldate.h: ${.CURDIR}/../sys/conf/newvers.sh ${.CURDIR}/../sys/sys/param.h \
-${.CURDIR}/Makefile
- @${ECHO} creating osreldate.h from newvers.sh
- @MAKE=${MAKE}; \
- PARAMFILE=${.CURDIR}/../sys/sys/param.h; \
- . ${.CURDIR}/../sys/conf/newvers.sh; \
- echo "$$COPYRIGHT" > osreldate.h; \
- echo "#ifdef _KERNEL" >> osreldate.h; \
- echo "#error \" cannot be used in the kernel, use
\"" >> osreldate.h; \
- echo "#else" >> osreldate.h; \
- echo "#undef __FreeBSD_version" >> osreldate.h; \
- echo "#define __FreeBSD_version $$RELDATE" >> osreldate.h; \
- echo "#endif" >> osreldate.h
+SYSDIR= ${.CURDIR}/../sys
+NEWVERS_SH= ${SYSDIR}/conf/newvers.sh
+PARAM_H= ${SYSDIR}/sys/param.h
+MK_OSRELDATE_SH= ${.CURDIR}/mk-osreldate.sh
+
+osreldate.h vers.c: ${NEWVERS_SH} ${PARAM_H} ${MK_OSRELDATE_SH}
+ env ECHO="${ECHO}" \
+ MAKE="${MAKE}" \
+ NEWVERS_SH=${NEWVERS_SH} \
+ PARAM_H=${PARAM_H} \
+ SYSDIR=${SYSDIR} \
+ sh ${MK_OSRELDATE_SH}
.for i in ${LHDRS}
INCSLINKS+= sys/$i ${INCLUDEDIR}/$i
Copied and modified: stable/9/include/mk-osreldate.sh (from r255775,
head/include/mk-osreldate.sh)
==
--- head/include/mk-osreldate.sh Sat Sep 21 22:36:07 2013
(r255775, copy source)
+++ stable/9/include/mk-osreldate.sh Sat Oct 12 17:31:21 2013
(r256386)
@@ -36,7 +36,9 @@ trap "rm -f $tmpfile" EXIT
${ECHO} creating osreldate.h from newvers.sh
export PARAMFILE="${PARAM_H:=$CURDIR/../sys/sys/param.h}"
-. "${NEWVERS_SH:=$CURDIR/../sys/conf/newvers.sh}"
+set +e
+. "${NEWVERS_SH:=$CURDIR/../sys/conf/newvers.sh}" || exit 1
+set -e
cat > $tmpfile <http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
___
freebsd-bugs@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-bugs
To unsubscribe, send any mail to "freebsd-bugs-unsubscr...@freebsd.org"
Re: conf/167133: commit references a PR
The following reply was made to PR conf/167133; it has been noted by GNATS. From: dfil...@freebsd.org (dfilter service) To: bug-follo...@freebsd.org Cc: Subject: Re: conf/167133: commit references a PR Date: Thu, 24 Oct 2013 21:58:27 + (UTC) Author: zont Date: Thu Oct 24 21:58:14 2013 New Revision: 257077 URL: http://svnweb.freebsd.org/changeset/base/257077 Log: Cleanup empty directories PR: conf/167133 Modified: head/ObsoleteFiles.inc head/etc/mtree/BSD.usr.dist Modified: head/ObsoleteFiles.inc == --- head/ObsoleteFiles.inc Thu Oct 24 21:54:24 2013(r257076) +++ head/ObsoleteFiles.inc Thu Oct 24 21:58:14 2013(r257077) @@ -38,6 +38,8 @@ # xargs -n1 | sort | uniq -d; # done +# 20131023: remove never used iscsi directory +OLD_DIRS+=usr/share/examples/iscsi # 20131014: libbsdyml becomes private OLD_FILES+=usr/lib/libbsdyml.a OLD_FILES+=usr/lib/libbsdyml.so @@ -2491,6 +2493,7 @@ OLD_FILES+=usr/sbin/zfs OLD_FILES+=usr/sbin/zpool # 20070423: rc.bluetooth (examples) removed OLD_FILES+=usr/share/examples/netgraph/bluetooth/rc.bluetooth +OLD_DIRS+=usr/share/examples/netgraph/bluetooth # 20070421: worm.4 removed OLD_FILES+=usr/share/man/man4/worm.4.gz # 20070417: trunk(4) renamed to lagg(4) Modified: head/etc/mtree/BSD.usr.dist == --- head/etc/mtree/BSD.usr.distThu Oct 24 21:54:24 2013 (r257076) +++ head/etc/mtree/BSD.usr.distThu Oct 24 21:58:14 2013 (r257077) @@ -325,8 +325,6 @@ .. ipfw .. -iscsi -.. jails .. kld @@ -360,8 +358,6 @@ mdoc .. netgraph -bluetooth -.. .. pc-sysinstall .. ___ svn-src-...@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" ___ freebsd-bugs@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-bugs To unsubscribe, send any mail to "freebsd-bugs-unsubscr...@freebsd.org"
Re: bin/182442: commit references a PR
The following reply was made to PR bin/182442; it has been noted by GNATS.
From: dfil...@freebsd.org (dfilter service)
To: bug-follo...@freebsd.org
Cc:
Subject: Re: bin/182442: commit references a PR
Date: Fri, 25 Oct 2013 09:09:07 + (UTC)
Author: smh
Date: Fri Oct 25 09:09:00 2013
New Revision: 257109
URL: http://svnweb.freebsd.org/changeset/base/257109
Log:
Add clang-CC and CC to list of hints allowing clang to identify its operating
mode as c++ instead of defaulting to c for the binary names CC and clang-CC.
This fixes builds that use cmake, which automatically sets CXX to
/usr/bin/CC by default.
PR: bin/182442
Reviewed by: dwhite, wca
MFC after: 2 days
Modified:
head/contrib/llvm/tools/clang/tools/driver/driver.cpp
Modified: head/contrib/llvm/tools/clang/tools/driver/driver.cpp
==
--- head/contrib/llvm/tools/clang/tools/driver/driver.cpp Fri Oct 25
08:41:36 2013(r257108)
+++ head/contrib/llvm/tools/clang/tools/driver/driver.cpp Fri Oct 25
09:09:00 2013(r257109)
@@ -284,11 +284,13 @@ static void ParseProgName(SmallVectorImp
} suffixes [] = {
{ "clang", false, false },
{ "clang++", true, false },
+{ "clang-CC", true, false },
{ "clang-c++", true, false },
{ "clang-cc", false, false },
{ "clang-cpp", false, true },
{ "clang-g++", true, false },
{ "clang-gcc", false, false },
+{ "CC", true, false },
{ "cc", false, false },
{ "cpp", false, true },
{ "++", true, false },
___
svn-src-...@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"
___
freebsd-bugs@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-bugs
To unsubscribe, send any mail to "freebsd-bugs-unsubscr...@freebsd.org"
Re: misc/183430: commit references a PR
The following reply was made to PR misc/183430; it has been noted by GNATS.
From: dfil...@freebsd.org (dfilter service)
To: bug-follo...@freebsd.org
Cc:
Subject: Re: misc/183430: commit references a PR
Date: Tue, 29 Oct 2013 04:03:08 + (UTC)
Author: adrian
Date: Tue Oct 29 04:03:00 2013
New Revision: 257301
URL: http://svnweb.freebsd.org/changeset/base/257301
Log:
Fix the PLCP lookup code in iwn(4) to base the 11n decision on whether
the rate is 11n, rather than whether the channel is 11n.
This correctly allows the PLCP lookup code to return the legacy rates
even on an 11n channel.
PR: kern/183430
Modified:
head/sys/dev/iwn/if_iwn.c
Modified: head/sys/dev/iwn/if_iwn.c
==
--- head/sys/dev/iwn/if_iwn.c Tue Oct 29 03:52:05 2013(r257300)
+++ head/sys/dev/iwn/if_iwn.c Tue Oct 29 04:03:00 2013(r257301)
@@ -2210,7 +2210,7 @@ iwn_rate_to_plcp(struct iwn_softc *sc, s
* If it's an MCS rate, let's set the plcp correctly
* and set the relevant flags based on the node config.
*/
- if (IEEE80211_IS_CHAN_HT(ni->ni_chan)) {
+ if (rate & IEEE80211_RATE_MCS) {
/*
* Set the initial PLCP value to be between 0->31 for
* MCS 0 -> MCS 31, then set the "I'm an MCS rate!"
___
svn-src-...@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"
___
freebsd-bugs@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-bugs
To unsubscribe, send any mail to "freebsd-bugs-unsubscr...@freebsd.org"
Re: bin/182442: commit references a PR
The following reply was made to PR bin/182442; it has been noted by GNATS.
From: dfil...@freebsd.org (dfilter service)
To: bug-follo...@freebsd.org
Cc:
Subject: Re: bin/182442: commit references a PR
Date: Tue, 29 Oct 2013 11:36:39 + (UTC)
Author: smh
Date: Tue Oct 29 11:36:31 2013
New Revision: 257327
URL: http://svnweb.freebsd.org/changeset/base/257327
Log:
MFC r257109:
Add clang-CC and CC to list of hints allowing clang to identify its operating
mode as c++ instead of defaulting to c for the binary names CC and clang-CC.
This fixes builds that use cmake which automatically sets CXX to
/usr/bin/CC by default.
PR: bin/182442
Approved by: re (glebius)
Modified:
stable/10/contrib/llvm/tools/clang/tools/driver/driver.cpp
Directory Properties:
stable/10/contrib/llvm/tools/clang/ (props changed)
Modified: stable/10/contrib/llvm/tools/clang/tools/driver/driver.cpp
==
--- stable/10/contrib/llvm/tools/clang/tools/driver/driver.cpp Tue Oct 29
11:28:11 2013(r257326)
+++ stable/10/contrib/llvm/tools/clang/tools/driver/driver.cpp Tue Oct 29
11:36:31 2013(r257327)
@@ -284,11 +284,13 @@ static void ParseProgName(SmallVectorImp
} suffixes [] = {
{ "clang", false, false },
{ "clang++", true, false },
+{ "clang-CC", true, false },
{ "clang-c++", true, false },
{ "clang-cc", false, false },
{ "clang-cpp", false, true },
{ "clang-g++", true, false },
{ "clang-gcc", false, false },
+{ "CC", true, false },
{ "cc", false, false },
{ "cpp", false, true },
{ "++", true, false },
___
svn-src-...@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"
___
freebsd-bugs@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-bugs
To unsubscribe, send any mail to "freebsd-bugs-unsubscr...@freebsd.org"
Re: bin/183480: commit references a PR
The following reply was made to PR bin/183480; it has been noted by GNATS.
From: dfil...@freebsd.org (dfilter service)
To: bug-follo...@freebsd.org
Cc:
Subject: Re: bin/183480: commit references a PR
Date: Thu, 31 Oct 2013 08:22:36 + (UTC)
Author: kib
Date: Thu Oct 31 08:22:29 2013
New Revision: 257426
URL: http://svnweb.freebsd.org/changeset/base/257426
Log:
The limit for the swap space is spelled 'swapsize', at least since
tcsh 6.17.00 import.
Submitted by:Stefan Neudorf
PR: bin/183480
MFC after: 1 week
Modified:
head/usr.bin/limits/limits.c
Modified: head/usr.bin/limits/limits.c
==
--- head/usr.bin/limits/limits.c Thu Oct 31 06:36:41 2013
(r257425)
+++ head/usr.bin/limits/limits.c Thu Oct 31 08:22:29 2013
(r257426)
@@ -125,7 +125,7 @@ static struct {
{ "limit%s sbsize %s", ";\n", 1},
{ "limit%s vmemoryuse %s", ";\n", 1024 },
{ "limit%s pseudoterminals %s", ";\n", 1},
-{ "limit%s swapuse %s", ";\n", 1024 },
+{ "limit%s swapsize %s",";\n", 1024 },
{ "limit%s kqueues %s", ";\n", 1},
}
},
@@ -160,7 +160,7 @@ static struct {
{ "limit%s sbsize %s", ";\n", 1},
{ "limit%s vmemoryuse %s", ";\n", 1024 },
{ "limit%s pseudoterminals %s", ";\n", 1},
-{ "limit%s swapuse %s", ";\n", 1024 },
+{ "limit%s swapsize %s",";\n", 1024 },
{ "limit%s kqueues %s", ";\n", 1},
}
},
___
svn-src-...@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"
___
freebsd-bugs@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-bugs
To unsubscribe, send any mail to "freebsd-bugs-unsubscr...@freebsd.org"
Re: bin/183480: commit references a PR
The following reply was made to PR bin/183480; it has been noted by GNATS.
From: dfil...@freebsd.org (dfilter service)
To: bug-follo...@freebsd.org
Cc:
Subject: Re: bin/183480: commit references a PR
Date: Thu, 31 Oct 2013 08:58:39 + (UTC)
Author: kib
Date: Thu Oct 31 08:58:32 2013
New Revision: 257427
URL: http://svnweb.freebsd.org/changeset/base/257427
Log:
The limit for the swap space is spelled 'swapsize', at least since
tcsh 6.17.00 import.
Submitted by:Stefan Neudorf
PR: bin/183480
MFC after: 1 week
Modified:
head/usr.bin/limits/limits.c
Modified: head/usr.bin/limits/limits.c
==
--- head/usr.bin/limits/limits.c Thu Oct 31 08:22:29 2013
(r257426)
+++ head/usr.bin/limits/limits.c Thu Oct 31 08:58:32 2013
(r257427)
@@ -248,7 +248,7 @@ static struct {
* to be modified accordingly!
*/
-#define RCS_STRING "tfdscmlunbvpw"
+#define RCS_STRING "tfdscmlunbvpwk"
static rlim_t resource_num(int which, int ch, const char *str);
static void usage(void);
@@ -287,7 +287,7 @@ main(int argc, char *argv[])
pid = -1;
optarg = NULL;
-while ((ch = getopt(argc, argv,
":EeC:U:BSHP:ab:c:d:f:l:m:n:s:t:u:v:p:w:")) != -1) {
+while ((ch = getopt(argc, argv,
":EeC:U:BSHP:ab:c:d:f:l:m:n:s:t:u:v:p:w:k:")) != -1) {
switch(ch) {
case 'a':
doall = 1;
@@ -544,7 +544,7 @@ usage(void)
{
(void)fprintf(stderr,
"usage: limits [-C class|-P pid|-U user] [-eaSHBE] "
- "[-bcdflmnstuvpw [val]] [[name=val ...] cmd]\n");
+ "[-bcdflmnstuvpwk [val]] [[name=val ...] cmd]\n");
exit(EXIT_FAILURE);
}
___
svn-src-...@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"
___
freebsd-bugs@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-bugs
To unsubscribe, send any mail to "freebsd-bugs-unsubscr...@freebsd.org"
Re: bin/183494: commit references a PR
The following reply was made to PR bin/183494; it has been noted by GNATS.
From: dfil...@freebsd.org (dfilter service)
To: bug-follo...@freebsd.org
Cc:
Subject: Re: bin/183494: commit references a PR
Date: Thu, 31 Oct 2013 09:03:50 + (UTC)
Author: kib
Date: Thu Oct 31 09:03:42 2013
New Revision: 257428
URL: http://svnweb.freebsd.org/changeset/base/257428
Log:
Fix long line and record proper commit message for r257427:
Add the '-k' option for getopt() call and usage.
Submitted by:Stefan Neudorf
PR: bin/183494
MFC after: 1 week
Modified:
head/usr.bin/limits/limits.c
Modified: head/usr.bin/limits/limits.c
==
--- head/usr.bin/limits/limits.c Thu Oct 31 08:58:32 2013
(r257427)
+++ head/usr.bin/limits/limits.c Thu Oct 31 09:03:42 2013
(r257428)
@@ -287,7 +287,8 @@ main(int argc, char *argv[])
pid = -1;
optarg = NULL;
-while ((ch = getopt(argc, argv,
":EeC:U:BSHP:ab:c:d:f:l:m:n:s:t:u:v:p:w:k:")) != -1) {
+while ((ch = getopt(argc, argv,
+ ":EeC:U:BSHP:ab:c:d:f:l:m:n:s:t:u:v:p:w:k:")) != -1) {
switch(ch) {
case 'a':
doall = 1;
___
svn-src-...@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"
___
freebsd-bugs@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-bugs
To unsubscribe, send any mail to "freebsd-bugs-unsubscr...@freebsd.org"
Re: bin/183484: commit references a PR
The following reply was made to PR bin/183484; it has been noted by GNATS.
From: dfil...@freebsd.org (dfilter service)
To: bug-follo...@freebsd.org
Cc:
Subject: Re: bin/183484: commit references a PR
Date: Thu, 31 Oct 2013 09:29:45 + (UTC)
Author: kib
Date: Thu Oct 31 09:29:37 2013
New Revision: 257430
URL: http://svnweb.freebsd.org/changeset/base/257430
Log:
Remove the dependency on procfs. Use sysctl KERN_PROC_PATHNAME and
KERN_PROC_PID to obtain the parent process pathname and command, used
to determine the calling shell.
Submitted by:Stefan Neudorf
PR: bin/183484
MFC after: 1 week
Modified:
head/usr.bin/limits/limits.c
Modified: head/usr.bin/limits/limits.c
==
--- head/usr.bin/limits/limits.c Thu Oct 31 09:20:30 2013
(r257429)
+++ head/usr.bin/limits/limits.c Thu Oct 31 09:29:37 2013
(r257430)
@@ -30,6 +30,7 @@ __FBSDID("$FreeBSD$");
#include
#include
#include
+#include
#include
#include
#include
@@ -705,27 +706,32 @@ getshelltype(void)
pid_t ppid = getppid();
if (ppid != 1) {
- FILE * fp;
+ struct kinfo_proc kp;
struct stat st;
- char procdir[MAXPATHLEN], buf[128];
- int l = sprintf(procdir, "/proc/%ld/", (long)ppid);
+ char path[MAXPATHLEN];
char * shell = getenv("SHELL");
+ int mib[4];
+ size_t len;
+
+ mib[0] = CTL_KERN;
+ mib[1] = KERN_PROC;
+ mib[3] = ppid;
if (shell != NULL && stat(shell, &st) != -1) {
struct stat st1;
- strcpy(procdir+l, "file");
- /* $SHELL is actual shell? */
- if (stat(procdir, &st1) != -1 && memcmp(&st, &st1, sizeof st) == 0)
- return getshellbyname(shell);
- }
- strcpy(procdir+l, "status");
- if (stat(procdir, &st) == 0 && (fp = fopen(procdir, "r")) != NULL) {
- char * p = fgets(buf, sizeof buf, fp)==NULL ? NULL : strtok(buf, "
\t");
- fclose(fp);
- if (p != NULL)
- return getshellbyname(p);
+ mib[2] = KERN_PROC_PATHNAME;
+ len = sizeof(path);
+ if (sysctl(mib, 4, path, &len, NULL, 0) != -1) {
+ /* $SHELL is actual shell? */
+ if (stat(path, &st1) != -1 && memcmp(&st, &st1, sizeof st) == 0)
+ return getshellbyname(shell);
+ }
}
+ mib[2] = KERN_PROC_PID;
+ len = sizeof(kp);
+ if (sysctl(mib, 4, &kp, &len, NULL, 0) != -1)
+ return getshellbyname(kp.ki_comm);
}
return SH_SH;
}
___
svn-src-...@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"
___
freebsd-bugs@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-bugs
To unsubscribe, send any mail to "freebsd-bugs-unsubscr...@freebsd.org"
Re: misc/183488: commit references a PR
The following reply was made to PR misc/183488; it has been noted by GNATS.
From: dfil...@freebsd.org (dfilter service)
To: bug-follo...@freebsd.org
Cc:
Subject: Re: misc/183488: commit references a PR
Date: Wed, 6 Nov 2013 15:49:39 + (UTC)
Author: gjb
Date: Wed Nov 6 15:49:31 2013
New Revision: 257749
URL: http://svnweb.freebsd.org/changeset/base/257749
Log:
Switch to using pkg(8) for the doc install in bsdinstall(8).
This also bootstraps the system with pkg(8) for future use.
PR: 183488
Submitted by:Joe Ennis
MFC after: 3 days
Sponsored by:The FreeBSD Foundation
Modified:
head/usr.sbin/bsdinstall/scripts/docsinstall
Modified: head/usr.sbin/bsdinstall/scripts/docsinstall
==
--- head/usr.sbin/bsdinstall/scripts/docsinstall Wed Nov 6 15:32:37
2013(r257748)
+++ head/usr.sbin/bsdinstall/scripts/docsinstall Wed Nov 6 15:49:31
2013(r257749)
@@ -59,7 +59,7 @@ NB: This requires a working, configured
test $? -eq 0 || exit 0
exec 3>&-
-# Let pkg_add be able to use name servers
+# Let pkg(8) be able to use name servers
cp ${BSDINSTALL_TMPETC}/resolv.conf ${BSDINSTALL_CHROOT}/etc
error() {
@@ -74,6 +74,13 @@ echo "FreeBSD Installer"
echo ""
echo
+echo "Please wait while the repository metadata is fetched."
+echo "This may take a few moments."
+
+env ASSUME_ALWAYS_YES=1 pkg -c ${BSDINSTALL_CHROOT} install pkg \
+ || error pkg
+
for i in $DOCS; do
-pkg_add -C ${BSDINSTALL_CHROOT} -r ${i}-freebsd-doc || error
$i-freebsd-doc
+env ASSUME_ALWAYS_YES=1 pkg -c ${BSDINSTALL_CHROOT} install
${i}-freebsd-doc \
+ || error $i-freebsd-doc
done
___
svn-src-...@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"
___
freebsd-bugs@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-bugs
To unsubscribe, send any mail to "freebsd-bugs-unsubscr...@freebsd.org"
Re: kern/167018: commit references a PR
The following reply was made to PR kern/167018; it has been noted by GNATS.
From: dfil...@freebsd.org (dfilter service)
To: bug-follo...@freebsd.org
Cc:
Subject: Re: kern/167018: commit references a PR
Date: Wed, 6 Nov 2013 23:29:37 + (UTC)
Author: sbruno
Date: Wed Nov 6 23:29:25 2013
New Revision: 257769
URL: http://svnweb.freebsd.org/changeset/base/257769
Log:
Fix powerd/states on AMD cpus. Resolves issues with system reporting:
hwpstate0: set freq failed, err 6
Tested on FX-8150 and others.
PR: 167018
Submitted by:avg
MFC after: 2 weeks
Modified:
head/sys/x86/cpufreq/hwpstate.c
Modified: head/sys/x86/cpufreq/hwpstate.c
==
--- head/sys/x86/cpufreq/hwpstate.cWed Nov 6 22:36:36 2013
(r257768)
+++ head/sys/x86/cpufreq/hwpstate.cWed Nov 6 23:29:25 2013
(r257769)
@@ -184,16 +184,21 @@ hwpstate_goto_pstate(device_t dev, int p
id, PCPU_GET(cpuid));
/* Go To Px-state */
wrmsr(MSR_AMD_10H_11H_CONTROL, id);
+ }
+ CPU_FOREACH(i) {
+ /* Bind to each cpu. */
+ thread_lock(curthread);
+ sched_bind(curthread, i);
+ thread_unlock(curthread);
/* wait loop (100*100 usec is enough ?) */
for(j = 0; j < 100; j++){
+ /* get the result. not assure msr=id */
msr = rdmsr(MSR_AMD_10H_11H_STATUS);
if(msr == id){
break;
}
DELAY(100);
}
- /* get the result. not assure msr=id */
- msr = rdmsr(MSR_AMD_10H_11H_STATUS);
HWPSTATE_DEBUG(dev, "result P%d-state on cpu%d\n",
(int)msr, PCPU_GET(cpuid));
if (msr != id) {
___
svn-src-...@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"
___
freebsd-bugs@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-bugs
To unsubscribe, send any mail to "freebsd-bugs-unsubscr...@freebsd.org"
Re: kern/182217: commit references a PR
The following reply was made to PR kern/182217; it has been noted by GNATS.
From: dfil...@freebsd.org (dfilter service)
To: bug-follo...@freebsd.org
Cc:
Subject: Re: kern/182217: commit references a PR
Date: Sat, 9 Nov 2013 08:28:02 + (UTC)
Author: eadler
Date: Sat Nov 9 08:27:55 2013
New Revision: 257883
URL: http://svnweb.freebsd.org/changeset/base/257883
Log:
Add support for SIIG x1 pci-e single parallel port card (JJ-E01211-S1)
PR: kern/182217
Submitted by:Craig Leres
MFC After: 1 week
Modified:
head/sys/dev/ppc/ppc_pci.c
Modified: head/sys/dev/ppc/ppc_pci.c
==
--- head/sys/dev/ppc/ppc_pci.c Sat Nov 9 08:11:24 2013(r257882)
+++ head/sys/dev/ppc/ppc_pci.c Sat Nov 9 08:27:55 2013(r257883)
@@ -88,6 +88,7 @@ static struct pci_id pci_ids[] = {
{ 0x80001407, "Lava Computers 2SP-PCI parallel port", 0x10 },
{ 0x84031415, "Oxford Semiconductor OX12PCI840 Parallel port", 0x10 },
{ 0x95131415, "Oxford Semiconductor OX16PCI954 Parallel port", 0x10 },
+ { 0xc1101415, "Oxford Semiconductor OXPCIe952 Parallel port", 0x10 },
{ 0x98059710, "NetMos NM9805 1284 Printer port", 0x10 },
{ 0x98659710, "MosChip MCS9865 1284 Printer port", 0x10 },
{ 0x99019710, "MosChip MCS9901 PCIe to Peripheral Controller", 0x10 },
___
svn-src-...@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"
___
freebsd-bugs@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-bugs
To unsubscribe, send any mail to "freebsd-bugs-unsubscr...@freebsd.org"
Re: kern/176054: commit references a PR
The following reply was made to PR kern/176054; it has been noted by GNATS.
From: dfil...@freebsd.org (dfilter service)
To: bug-follo...@freebsd.org
Cc:
Subject: Re: kern/176054: commit references a PR
Date: Sat, 16 Nov 2013 10:48:08 + (UTC)
Author: mav
Date: Sat Nov 16 10:47:58 2013
New Revision: 258218
URL: http://svnweb.freebsd.org/changeset/base/258218
Log:
MFC r250576 (by eadler):
Fix several typos
PR: kern/176054
Modified:
stable/9/sys/dev/ata/ata-lowlevel.c
stable/9/sys/dev/uart/uart_core.c
stable/9/sys/dev/usb/serial/usb_serial.c
stable/9/sys/dev/usb/serial/usb_serial.h
stable/9/sys/fs/fdescfs/fdesc_vnops.c
stable/9/sys/mips/mips/stack_machdep.c
stable/9/sys/netgraph/bluetooth/hci/ng_hci_ulpi.c
stable/9/sys/ufs/ffs/ffs_balloc.c
stable/9/sys/x86/x86/local_apic.c
Directory Properties:
stable/9/sys/ (props changed)
stable/9/sys/dev/ (props changed)
stable/9/sys/fs/ (props changed)
Modified: stable/9/sys/dev/ata/ata-lowlevel.c
==
--- stable/9/sys/dev/ata/ata-lowlevel.cSat Nov 16 10:44:17 2013
(r258217)
+++ stable/9/sys/dev/ata/ata-lowlevel.cSat Nov 16 10:47:58 2013
(r258218)
@@ -505,7 +505,7 @@ ata_generic_reset(device_t dev)
mask, ostat0, ostat1);
/* if nothing showed up there is no need to get any further */
-/* XXX SOS is that too strong?, we just might loose devices here */
+/* XXX SOS is that too strong?, we just might lose devices here */
ch->devices = 0;
if (!mask)
return;
Modified: stable/9/sys/dev/uart/uart_core.c
==
--- stable/9/sys/dev/uart/uart_core.c Sat Nov 16 10:44:17 2013
(r258217)
+++ stable/9/sys/dev/uart/uart_core.c Sat Nov 16 10:47:58 2013
(r258218)
@@ -131,7 +131,7 @@ uart_intr_break(void *arg)
* much of the data we can, but otherwise flush the receiver FIFO to
* create some breathing room. The net effect is that we avoid the
* overrun condition to happen for the next X characters, where X is
- * related to the FIFO size at the cost of loosing data right away.
+ * related to the FIFO size at the cost of losing data right away.
* So, instead of having multiple overrun interrupts in close proximity
* to each other and possibly pessimizing UART interrupt latency for
* other UARTs in a multiport configuration, we create a longer segment
@@ -186,7 +186,7 @@ uart_intr_rxready(void *arg)
* Line or modem status change (OOB signalling).
* We pass the signals to the software interrupt handler for further
* processing. Note that we merge the delta bits, but set the state
- * bits. This is to avoid loosing state transitions due to having more
+ * bits. This is to avoid losing state transitions due to having more
* than 1 hardware interrupt between software interrupts.
*/
static __inline int
Modified: stable/9/sys/dev/usb/serial/usb_serial.c
==
--- stable/9/sys/dev/usb/serial/usb_serial.c Sat Nov 16 10:44:17 2013
(r258217)
+++ stable/9/sys/dev/usb/serial/usb_serial.c Sat Nov 16 10:47:58 2013
(r258218)
@@ -965,7 +965,7 @@ ucom_cfg_line_state(struct usb_proc_msg
sc->sc_pls_set = 0;
sc->sc_pls_clr = 0;
- /* ensure that we don't loose any levels */
+ /* ensure that we don't lose any levels */
if (notch_bits & UCOM_LS_DTR)
sc->sc_callback->ucom_cfg_set_dtr(sc,
(prev_value & UCOM_LS_DTR) ? 1 : 0);
Modified: stable/9/sys/dev/usb/serial/usb_serial.h
==
--- stable/9/sys/dev/usb/serial/usb_serial.h Sat Nov 16 10:44:17 2013
(r258217)
+++ stable/9/sys/dev/usb/serial/usb_serial.h Sat Nov 16 10:47:58 2013
(r258218)
@@ -146,7 +146,7 @@ struct ucom_super_softc {
struct ucom_softc {
/*
- * NOTE: To avoid loosing level change information we use two
+ * NOTE: To avoid losing level change information we use two
* tasks instead of one for all commands.
*
* Level changes are transitions like:
Modified: stable/9/sys/fs/fdescfs/fdesc_vnops.c
==
--- stable/9/sys/fs/fdescfs/fdesc_vnops.c Sat Nov 16 10:44:17 2013
(r258217)
+++ stable/9/sys/fs/fdescfs/fdesc_vnops.c Sat Nov 16 10:47:58 2013
(r258218)
@@ -333,7 +333,7 @@ fdesc_lookup(ap)
* and the root vnode lock will be obtained afterwards (in case
* we're looking up the fd of the root vnode), which will be the
* opposite lock order.
Re: conf/183398: commit references a PR
The following reply was made to PR conf/183398; it has been noted by GNATS. From: dfil...@freebsd.org (dfilter service) To: bug-follo...@freebsd.org Cc: Subject: Re: conf/183398: commit references a PR Date: Tue, 3 Dec 2013 03:57:30 + (UTC) Author: eadler Date: Tue Dec 3 03:57:22 2013 New Revision: 258862 URL: http://svnweb.freebsd.org/changeset/base/258862 Log: Add the Short Message Peer-to-Peer protocol PR: conf/183398 Submitted by:olgeni Modified: head/etc/services Modified: head/etc/services == --- head/etc/services Tue Dec 3 03:40:47 2013(r258861) +++ head/etc/services Tue Dec 3 03:57:22 2013(r258862) @@ -2192,6 +2192,8 @@ ospf6d 2606/tcp #OSPF6d vty dict 2628/tcp #RFC 2229 dict 2628/udp #RFC 2229 listen2766/tcp #System V listener port +smpp 2775/tcp #SMPP +smpp 2775/udp #SMPP www-dev 2784/tcp #world wide web - development www-dev 2784/udp #world wide web - development m2ua 2904/sctp #M2UA ___ svn-src-...@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" ___ freebsd-bugs@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-bugs To unsubscribe, send any mail to "freebsd-bugs-unsubscr...@freebsd.org"
Re: kern/167018: commit references a PR
The following reply was made to PR kern/167018; it has been noted by GNATS.
From: dfil...@freebsd.org (dfilter service)
To: bug-follo...@freebsd.org
Cc:
Subject: Re: kern/167018: commit references a PR
Date: Thu, 5 Dec 2013 17:57:58 + (UTC)
Author: sbruno
Date: Thu Dec 5 17:57:51 2013
New Revision: 258994
URL: http://svnweb.freebsd.org/changeset/base/258994
Log:
MFC r257769 to stable/10
Fix powerd/states on AMD cpus. Resolves issues with system reporting:
hwpstate0: set freq failed, err 6
Tested on FX-8150 and others.
PR: kern/167018
Submitted by:avg@
Approved by: re (gjb)
Modified:
stable/10/sys/x86/cpufreq/hwpstate.c
Directory Properties:
stable/10/sys/ (props changed)
Modified: stable/10/sys/x86/cpufreq/hwpstate.c
==
--- stable/10/sys/x86/cpufreq/hwpstate.c Thu Dec 5 17:50:18 2013
(r258993)
+++ stable/10/sys/x86/cpufreq/hwpstate.c Thu Dec 5 17:57:51 2013
(r258994)
@@ -184,16 +184,21 @@ hwpstate_goto_pstate(device_t dev, int p
id, PCPU_GET(cpuid));
/* Go To Px-state */
wrmsr(MSR_AMD_10H_11H_CONTROL, id);
+ }
+ CPU_FOREACH(i) {
+ /* Bind to each cpu. */
+ thread_lock(curthread);
+ sched_bind(curthread, i);
+ thread_unlock(curthread);
/* wait loop (100*100 usec is enough ?) */
for(j = 0; j < 100; j++){
+ /* get the result. not assure msr=id */
msr = rdmsr(MSR_AMD_10H_11H_STATUS);
if(msr == id){
break;
}
DELAY(100);
}
- /* get the result. not assure msr=id */
- msr = rdmsr(MSR_AMD_10H_11H_STATUS);
HWPSTATE_DEBUG(dev, "result P%d-state on cpu%d\n",
(int)msr, PCPU_GET(cpuid));
if (msr != id) {
___
svn-src-...@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"
___
freebsd-bugs@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-bugs
To unsubscribe, send any mail to "freebsd-bugs-unsubscr...@freebsd.org"
Re: bin/182442: commit references a PR
The following reply was made to PR bin/182442; it has been noted by GNATS.
From: dfil...@freebsd.org (dfilter service)
To: bug-follo...@freebsd.org
Cc:
Subject: Re: bin/182442: commit references a PR
Date: Thu, 5 Dec 2013 21:52:00 + (UTC)
Author: dim
Date: Thu Dec 5 21:51:53 2013
New Revision: 259012
URL: http://svnweb.freebsd.org/changeset/base/259012
Log:
MFC r257109:
Add clang-CC and CC to list of hints allowing clang to identify its operating
mode as c++ instead of defaulting to c for the binary names CC and clang-CC.
This fixes builds that use cmake, which automatically sets CXX to
/usr/bin/CC by default.
PR: bin/182442
Reviewed by: dwhite, wca
Modified:
stable/9/contrib/llvm/tools/clang/tools/driver/driver.cpp
Directory Properties:
stable/9/contrib/llvm/ (props changed)
stable/9/contrib/llvm/tools/clang/ (props changed)
Modified: stable/9/contrib/llvm/tools/clang/tools/driver/driver.cpp
==
--- stable/9/contrib/llvm/tools/clang/tools/driver/driver.cpp Thu Dec 5
21:49:41 2013(r259011)
+++ stable/9/contrib/llvm/tools/clang/tools/driver/driver.cpp Thu Dec 5
21:51:53 2013(r259012)
@@ -284,11 +284,13 @@ static void ParseProgName(SmallVectorImp
} suffixes [] = {
{ "clang", false, false },
{ "clang++", true, false },
+{ "clang-CC", true, false },
{ "clang-c++", true, false },
{ "clang-cc", false, false },
{ "clang-cpp", false, true },
{ "clang-g++", true, false },
{ "clang-gcc", false, false },
+{ "CC", true, false },
{ "cc", false, false },
{ "cpp", false, true },
{ "++", true, false },
___
svn-src-...@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"
___
freebsd-bugs@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-bugs
To unsubscribe, send any mail to "freebsd-bugs-unsubscr...@freebsd.org"
Re: bin/182463: commit references a PR
The following reply was made to PR bin/182463; it has been noted by GNATS.
From: dfil...@freebsd.org (dfilter service)
To: bug-follo...@freebsd.org
Cc:
Subject: Re: bin/182463: commit references a PR
Date: Sun, 8 Dec 2013 00:08:11 + (UTC)
Author: peter
Date: Sun Dec 8 00:08:03 2013
New Revision: 259088
URL: http://svnweb.freebsd.org/changeset/base/259088
Log:
Vendor import nvi-2.1.2-c80f493b038 a multikey mapping fix
PR: bin/182463
Modified:
head/contrib/nvi/cl/cl_term.c
head/contrib/nvi/common/key.c
head/contrib/nvi/common/key.h
Directory Properties:
head/contrib/nvi/ (props changed)
Modified: head/contrib/nvi/cl/cl_term.c
==
--- head/contrib/nvi/cl/cl_term.c Sun Dec 8 00:05:31 2013
(r259087)
+++ head/contrib/nvi/cl/cl_term.c Sun Dec 8 00:08:03 2013
(r259088)
@@ -10,7 +10,7 @@
#include "config.h"
#ifndef lint
-static const char sccsid[] = "$Id: cl_term.c,v 10.33 2012/04/21 23:51:46 zy
Exp $";
+static const char sccsid[] = "$Id: cl_term.c,v 10.34 2013/12/07 16:21:14
wjenkner Exp $";
#endif /* not lint */
#include
@@ -187,14 +187,18 @@ cl_term_init(SCR *sp)
int
cl_term_end(GS *gp)
{
- SEQ *qp, *nqp;
+ SEQ *qp, *nqp, *pre_qp = NULL;
/* Delete screen specific mappings. */
SLIST_FOREACH_SAFE(qp, gp->seqq, q, nqp)
if (F_ISSET(qp, SEQ_SCREEN)) {
- SLIST_REMOVE_HEAD(gp->seqq, q);
+ if (qp == SLIST_FIRST(gp->seqq))
+ SLIST_REMOVE_HEAD(gp->seqq, q);
+ else
+ SLIST_REMOVE_AFTER(pre_qp, q);
(void)seq_free(qp);
- }
+ } else
+ pre_qp = qp;
return (0);
}
Modified: head/contrib/nvi/common/key.c
==
--- head/contrib/nvi/common/key.c Sun Dec 8 00:05:31 2013
(r259087)
+++ head/contrib/nvi/common/key.c Sun Dec 8 00:08:03 2013
(r259088)
@@ -10,7 +10,7 @@
#include "config.h"
#ifndef lint
-static const char sccsid[] = "$Id: key.c,v 10.53 2013/03/11 01:20:53 yamt Exp
$";
+static const char sccsid[] = "$Id: key.c,v 10.54 2013/11/13 12:15:27 zy Exp
$";
#endif /* not lint */
#include
@@ -272,7 +272,7 @@ v_key_name(
* The code prints non-printable wide characters in 4 or 5 digits
* Unicode escape sequences, so only supports plane 0 to 15.
*/
- if (ISPRINT(ach))
+ if (CAN_PRINT(sp, ach))
goto done;
nopr: if (iscntrl(ch) && (ch < 0x20 || ch == 0x7f)) {
sp->cname[0] = '^';
Modified: head/contrib/nvi/common/key.h
==
--- head/contrib/nvi/common/key.h Sun Dec 8 00:05:31 2013
(r259087)
+++ head/contrib/nvi/common/key.h Sun Dec 8 00:08:03 2013
(r259088)
@@ -6,7 +6,7 @@
*
* See the LICENSE file for redistribution information.
*
- *$Id: key.h,v 10.55 2012/10/07 01:31:17 zy Exp $
+ *$Id: key.h,v 10.56 2013/11/13 12:15:27 zy Exp $
*/
#include "multibyte.h"
@@ -23,8 +23,9 @@
#define INPUT2INT5(sp,cw,n,nlen,w,wlen)
\
sp->conv.input2int(sp, n, nlen, &(cw), &wlen, &w)
#define CONST
+#define INTISWIDE(c)(wctob(c) == EOF)
#define CHAR_WIDTH(sp, ch) wcwidth(ch)
-#define INTISWIDE(c) (wctob(c) == EOF)
+#define CAN_PRINT(sp, ch) (CHAR_WIDTH(sp, ch) > 0)
#else
#define FILE2INT5(sp,buf,n,nlen,w,wlen) \
(w = n, wlen = nlen, 0)
@@ -36,9 +37,10 @@
(n = w, nlen = wlen, 0)
#define INPUT2INT5(sp,buf,n,nlen,w,wlen) \
(w = n, wlen = nlen, 0)
-#define CONST const
-#define INTISWIDE(c) 0
+#define CONST const
+#define INTISWIDE(c)0
#define CHAR_WIDTH(sp, ch) 1
+#define CAN_PRINT(sp, ch) isprint(ch)
#endif
#define FILE2INT(sp,n,nlen,w,wlen)\
FILE2INT5(sp,sp->cw,n,nlen,w,wlen)
___
svn-src-...@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"
___
freebsd-bugs@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-bugs
To unsubscribe, send any mail to "freebsd-bugs-unsubscr...@freebsd.org"
Re: kern/167204: commit references a PR
The following reply was made to PR kern/167204; it has been noted by GNATS.
From: dfil...@freebsd.org (dfilter service)
To: bug-follo...@freebsd.org
Cc:
Subject: Re: kern/167204: commit references a PR
Date: Wed, 18 Dec 2013 18:25:34 + (UTC)
Author: melifaro
Date: Wed Dec 18 18:25:27 2013
New Revision: 259562
URL: http://svnweb.freebsd.org/changeset/base/259562
Log:
Switch netstat -rn to use standard API for retrieving list of routes
instead of peeking inside in-kernel radix via kget.
This permits us to change kernel structures without breaking userland.
Additionally, this change provide more reliable and faster output.
`Refs` and `Use` fields available in IPv4 by default (and via -W
for other families) were removed. `Refs` is radix-specific thing
which is not informative for users. `Use` field value is handy sometimes,
but a) current API does not support it and b) I'm not sure we will
support per-rte pcpu counters in near future.
Old method of retrieving data is still supported (either by defining
NewTree=0 or running netstat with -A). However, Refs/Use fields are
hidden.
Sponsored by:Yandex LLC
MFC after: 4 weeks
PR: kern/167204
Modified:
head/usr.bin/netstat/route.c
Modified: head/usr.bin/netstat/route.c
==
--- head/usr.bin/netstat/route.c Wed Dec 18 17:03:43 2013
(r259561)
+++ head/usr.bin/netstat/route.c Wed Dec 18 18:25:27 2013
(r259562)
@@ -58,6 +58,7 @@ __FBSDID("$FreeBSD$");
#include
#include
+#include
#include
#include
#include
@@ -113,13 +114,20 @@ typedef union {
static sa_u pt_u;
+struct ifmap_entry {
+ char ifname[IFNAMSIZ];
+};
+
+static struct ifmap_entry *ifmap;
+static int ifmap_size;
+
int do_rtent = 0;
structrtentry rtentry;
structradix_node rnode;
structradix_mask rmask;
structradix_node_head **rt_tables;
-int NewTree = 0;
+int NewTree = 1;
structtimespec uptime;
@@ -129,7 +137,7 @@ static void size_cols_tree(struct radix_
static void size_cols_rtentry(struct rtentry *rt);
static void p_tree(struct radix_node *);
static void p_rtnode(void);
-static void ntreestuff(void);
+static void ntreestuff(int fibnum, int af);
static void np_rtentry(struct rt_msghdr *);
static void p_sockaddr(struct sockaddr *, struct sockaddr *, int, int);
static const char *fmt_sockaddr(struct sockaddr *sa, struct sockaddr *mask,
@@ -175,7 +183,7 @@ routepr(u_long rtree, int fibnum)
printf("\n");
if (Aflag == 0 && NewTree)
- ntreestuff();
+ ntreestuff(fibnum, af);
else {
if (rtree == 0) {
printf("rt_tables: symbol not in namelist\n");
@@ -288,7 +296,7 @@ static int wid_if;
static int wid_expire;
static void
-size_cols(int ef __unused, struct radix_node *rn)
+size_cols(int ef, struct radix_node *rn)
{
wid_dst = WID_DST_DEFAULT(ef);
wid_gw = WID_GW_DEFAULT(ef);
@@ -299,7 +307,7 @@ size_cols(int ef __unused, struct radix_
wid_if = WID_IF_DEFAULT(ef);
wid_expire = 6;
- if (Wflag)
+ if (Wflag && rn != NULL)
size_cols_tree(rn);
}
@@ -397,27 +405,14 @@ pr_rthdr(int af1)
if (Aflag)
printf("%-8.8s ","Address");
- if (af1 == AF_INET || Wflag) {
- if (Wflag) {
- printf("%-*.*s %-*.*s %-*.*s %*.*s %*.*s %*.*s %*.*s
%*s\n",
- wid_dst,wid_dst,"Destination",
- wid_gw, wid_gw, "Gateway",
- wid_flags, wid_flags, "Flags",
- wid_refs, wid_refs, "Refs",
- wid_use,wid_use,"Use",
- wid_mtu,wid_mtu,"Mtu",
- wid_if, wid_if, "Netif",
- wid_expire, "Expire");
- } else {
- printf("%-*.*s %-*.*s %-*.*s %*.*s %*.*s %*.*s %*s\n",
- wid_dst,wid_dst,"Destination",
- wid_gw, wid_gw, "Gateway",
- wid_flags, wid_flags, "Flags",
- wid_refs, wid_refs, "Refs",
- wid_use,wid_use,"Use",
- wid_if, wid_if,
Re: kern/167204: commit references a PR
The following reply was made to PR kern/167204; it has been noted by GNATS.
From: dfil...@freebsd.org (dfilter service)
To: bug-follo...@freebsd.org
Cc:
Subject: Re: kern/167204: commit references a PR
Date: Fri, 20 Dec 2013 00:17:36 + (UTC)
Author: melifaro
Date: Fri Dec 20 00:17:26 2013
New Revision: 259638
URL: http://svnweb.freebsd.org/changeset/base/259638
Log:
Use more fine-grained kvm(3) symbol lookup: routing code retrieves only
necessary symbols needed per subsystem. Main kvm(3) init is now delayed
as much as possbile. This finally fixes performance issues reported in
kern/167204.
Some non-working code (ng_socket.ko symbol addresses calculation) removed.
Some global variables eliminated.
PR: kern/167204
MFC after: 4 weeks
Modified:
head/usr.bin/netstat/if.c
head/usr.bin/netstat/main.c
head/usr.bin/netstat/mroute.c
head/usr.bin/netstat/mroute6.c
head/usr.bin/netstat/netgraph.c
head/usr.bin/netstat/netstat.h
head/usr.bin/netstat/route.c
Modified: head/usr.bin/netstat/if.c
==
--- head/usr.bin/netstat/if.c Fri Dec 20 00:09:14 2013(r259637)
+++ head/usr.bin/netstat/if.c Fri Dec 20 00:17:26 2013(r259638)
@@ -223,7 +223,7 @@ next_ifma(struct ifmaddrs *ifma, const c
* Print a description of the network interfaces.
*/
void
-intpr(int interval, void (*pfunc)(char *))
+intpr(int interval, void (*pfunc)(char *), int af)
{
struct ifaddrs *ifap, *ifa;
struct ifmaddrs *ifmap, *ifma;
Modified: head/usr.bin/netstat/main.c
==
--- head/usr.bin/netstat/main.cFri Dec 20 00:09:14 2013
(r259637)
+++ head/usr.bin/netstat/main.cFri Dec 20 00:17:26 2013
(r259638)
@@ -319,7 +319,6 @@ intgflag; /* show group (multicast) ro
int hflag; /* show counters in human readable format */
int iflag; /* show interfaces */
int Lflag; /* show size of listen queues */
-int Mflag; /* read statistics from core */
int mflag; /* show memory stats */
int noutputs = 0; /* how much outputs before we exit */
int numeric_addr; /* show addresses numerically */
@@ -425,7 +424,6 @@ main(int argc, char *argv[])
Lflag = 1;
break;
case 'M':
- Mflag = 1;
memf = optarg;
break;
case 'm':
@@ -554,40 +552,40 @@ main(int argc, char *argv[])
* used for the queries, which is slower.
*/
#endif
- kread(0, NULL, 0);
if (iflag && !sflag) {
- intpr(interval, NULL);
+ intpr(interval, NULL, af);
exit(0);
}
if (rflag) {
if (sflag)
- rt_stats(nl[N_RTSTAT].n_value, nl[N_RTTRASH].n_value);
+ rt_stats();
else
- routepr(nl[N_RTREE].n_value, fib);
+ routepr(fib, af);
exit(0);
}
+
if (gflag) {
if (sflag) {
if (af == AF_INET || af == AF_UNSPEC)
- mrt_stats(nl[N_MRTSTAT].n_value);
+ mrt_stats();
#ifdef INET6
if (af == AF_INET6 || af == AF_UNSPEC)
- mrt6_stats(nl[N_MRT6STAT].n_value);
+ mrt6_stats();
#endif
} else {
if (af == AF_INET || af == AF_UNSPEC)
- mroutepr(nl[N_MFCHASHTBL].n_value,
- nl[N_MFCTABLESIZE].n_value,
- nl[N_VIFTABLE].n_value);
+ mroutepr();
#ifdef INET6
if (af == AF_INET6 || af == AF_UNSPEC)
- mroute6pr(nl[N_MF6CTABLE].n_value,
-nl[N_MIF6TABLE].n_value);
+ mroute6pr();
#endif
}
exit(0);
}
+ /* Load all necessary kvm symbols */
+ kresolve_list(nl);
+
if (tp) {
printproto(tp, tp->pr_name);
exit(0);
@@ -640,7 +638,7 @@ printproto(struct protox *tp, const char
if (sflag) {
if (iflag) {
if (tp->pr_istats)
- intpr(interval, tp->pr_istats);
+ intpr(interval, tp->pr_istats, af);
else if (pflag)
printf("%s: no per-interface stats routine\n",
Re: conf/175751: commit references a PR
The following reply was made to PR conf/175751; it has been noted by GNATS.
From: dfil...@freebsd.org (dfilter service)
To: bug-follo...@freebsd.org
Cc:
Subject: Re: conf/175751: commit references a PR
Date: Tue, 31 Dec 2013 16:01:26 + (UTC)
Author: kevlo
Date: Tue Dec 31 16:01:17 2013
New Revision: 260134
URL: http://svnweb.freebsd.org/changeset/base/260134
Log:
MFC r252064:
Rename run(4) firmware file from runfw to run.fw. Previous name was the
same as top-level target name for "device runfw" kernel option and
caused cyclic dependancy that lead to kernel build breakage
Module change is not strictly required and done for name unification sake
PR: conf/175751
Submitted by:Issei
Modified:
stable/9/sys/conf/files
Directory Properties:
stable/9/sys/conf/ (props changed)
Modified: stable/9/sys/conf/files
==
--- stable/9/sys/conf/filesTue Dec 31 15:45:12 2013(r260133)
+++ stable/9/sys/conf/filesTue Dec 31 16:01:17 2013(r260134)
@@ -2033,19 +2033,19 @@ dev/usb/net/uhso.c optional uhso
dev/usb/wlan/if_rum.c optional rum
dev/usb/wlan/if_run.c optional run
runfw.c optional runfw
\
- compile-with"${AWK} -f $S/tools/fw_stub.awk runfw:runfw -mrunfw
-c${.TARGET}" \
+ compile-with"${AWK} -f $S/tools/fw_stub.awk run.fw:runfw -mrunfw
-c${.TARGET}" \
no-implicit-rule before-depend local
\
clean "runfw.c"
runfw.fwo optional runfw
\
- dependency "runfw"
\
+ dependency "run.fw"
\
compile-with"${NORMAL_FWO}"
\
no-implicit-rule
\
clean "runfw.fwo"
-runfw optional runfw
\
+run.fwoptional runfw
\
dependency "$S/contrib/dev/run/rt2870.fw.uu"
\
compile-with"${NORMAL_FW}"
\
no-obj no-implicit-rule
\
- clean "runfw"
+ clean "run.fw"
dev/usb/wlan/if_uath.coptional uath
dev/usb/wlan/if_upgt.coptional upgt
dev/usb/wlan/if_ural.coptional ural
___
svn-src-...@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"
___
freebsd-bugs@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-bugs
To unsubscribe, send any mail to "freebsd-bugs-unsubscr...@freebsd.org"
Re: misc/185441: commit references a PR
The following reply was made to PR misc/185441; it has been noted by GNATS.
From: dfil...@freebsd.org (dfilter service)
To: bug-follo...@freebsd.org
Cc:
Subject: Re: misc/185441: commit references a PR
Date: Fri, 3 Jan 2014 13:51:57 + (UTC)
Author: decke
Date: Fri Jan 3 13:51:50 2014
New Revision: 338539
URL: http://svnweb.freebsd.org/changeset/ports/338539
Log:
- Relax RESTRICTED setting to only avoid that people
accidentally commit patches to this port. Redistribution
in _UNMODIFIED_ form as binary and source is allowed.
PR: misc/185441
Submitted by:myself
Approved by: Colin Percival (maintainer)
Modified:
head/sysutils/tarsnap/Makefile
Modified: head/sysutils/tarsnap/Makefile
==
--- head/sysutils/tarsnap/Makefile Fri Jan 3 13:37:21 2014
(r338538)
+++ head/sysutils/tarsnap/Makefile Fri Jan 3 13:51:50 2014
(r338539)
@@ -3,6 +3,7 @@
PORTNAME= tarsnap
PORTVERSION= 1.0.35
+PORTREVISION= 1
CATEGORIES= sysutils
MASTER_SITES= http://www.tarsnap.com/download-http/
DISTNAME= ${PORTNAME}-autoconf-${PORTVERSION}
@@ -11,8 +12,6 @@ EXTRACT_SUFX=.tgz
MAINTAINER= cperc...@tarsnap.com
COMMENT= Online encrypted backup service (client)
-RESTRICTED= license restricts redistribution of source and binaries
-
GNU_CONFIGURE=yes
USES= gmake
@@ -27,10 +26,18 @@ SSE2_CONFIGURE_ENABLE= sse2
SSE2_CFLAGS= -msse2
NO_STAGE= yes
+
+.include
+
+# safety check to ensure that we don't violate the license
+.if exists(${PATCHDIR})
+RESTRICTED= license only allows redistribution and use of unmodified
source and binaries
+.endif
+
post-install:
@if [ ! -f ${PREFIX}/etc/tarsnap.conf ]; then \
${CP} -p ${PREFIX}/etc/tarsnap.conf.sample
${PREFIX}/etc/tarsnap.conf ; \
fi
@${CAT} ${PKGDIR}/pkg-message
-.include
+.include
___
svn-ports-...@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscr...@freebsd.org"
___
freebsd-bugs@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-bugs
To unsubscribe, send any mail to "freebsd-bugs-unsubscr...@freebsd.org"
Re: ports/185441: commit references a PR
The following reply was made to PR ports/185441; it has been noted by GNATS.
From: dfil...@freebsd.org (dfilter service)
To: bug-follo...@freebsd.org
Cc:
Subject: Re: ports/185441: commit references a PR
Date: Sat, 4 Jan 2014 21:30:22 + (UTC)
Author: decke
Date: Sat Jan 4 21:30:15 2014
New Revision: 338679
URL: http://svnweb.freebsd.org/changeset/ports/338679
Log:
MFH: r338539
- Relax RESTRICTED setting to only avoid that people
accidentally commit patches to this port. Redistribution
in _UNMODIFIED_ form as binary and source is allowed.
PR: misc/185441
Submitted by:myself
Approved by: Colin Percival (maintainer)
With hat:portmgr
Modified:
branches/2014Q1/sysutils/tarsnap/Makefile
Directory Properties:
branches/2014Q1/ (props changed)
Modified: branches/2014Q1/sysutils/tarsnap/Makefile
==
--- branches/2014Q1/sysutils/tarsnap/Makefile Sat Jan 4 21:28:19 2014
(r338678)
+++ branches/2014Q1/sysutils/tarsnap/Makefile Sat Jan 4 21:30:15 2014
(r338679)
@@ -3,6 +3,7 @@
PORTNAME= tarsnap
PORTVERSION= 1.0.35
+PORTREVISION= 1
CATEGORIES= sysutils
MASTER_SITES= http://www.tarsnap.com/download-http/
DISTNAME= ${PORTNAME}-autoconf-${PORTVERSION}
@@ -11,8 +12,6 @@ EXTRACT_SUFX=.tgz
MAINTAINER= cperc...@tarsnap.com
COMMENT= Online encrypted backup service (client)
-RESTRICTED= license restricts redistribution of source and binaries
-
GNU_CONFIGURE=yes
USES= gmake
@@ -27,10 +26,18 @@ SSE2_CONFIGURE_ENABLE= sse2
SSE2_CFLAGS= -msse2
NO_STAGE= yes
+
+.include
+
+# safety check to ensure that we don't violate the license
+.if exists(${PATCHDIR})
+RESTRICTED= license only allows redistribution and use of unmodified
source and binaries
+.endif
+
post-install:
@if [ ! -f ${PREFIX}/etc/tarsnap.conf ]; then \
${CP} -p ${PREFIX}/etc/tarsnap.conf.sample
${PREFIX}/etc/tarsnap.conf ; \
fi
@${CAT} ${PKGDIR}/pkg-message
-.include
+.include
___
svn-ports-...@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscr...@freebsd.org"
___
freebsd-bugs@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-bugs
To unsubscribe, send any mail to "freebsd-bugs-unsubscr...@freebsd.org"
Re: kern/181975: commit references a PR
The following reply was made to PR kern/181975; it has been noted by GNATS. From: dfil...@freebsd.org (dfilter service) To: bug-follo...@freebsd.org Cc: Subject: Re: kern/181975: commit references a PR Date: Sun, 5 Jan 2014 20:44:18 + (UTC) Author: ian Date: Sun Jan 5 20:44:10 2014 New Revision: 260333 URL: http://svnweb.freebsd.org/changeset/base/260333 Log: Enable the cesa security/crypto device by providing the required property in the dts source, and adding the right devices to the kernel config. Also generally bring the kernel config into line with what we have for other Marvell/Kirkwood systems (add lots of useful devices and options). One particularly notable addition amongst the kernel config changes is USB_HOST_ALIGN=32, which may help eliminate data corruption on USB drives. PR: kern/181975 arm/162159 Modified: head/sys/arm/conf/DOCKSTAR head/sys/boot/fdt/dts/dockstar.dts Modified: head/sys/arm/conf/DOCKSTAR == --- head/sys/arm/conf/DOCKSTAR Sun Jan 5 20:33:44 2014(r260332) +++ head/sys/arm/conf/DOCKSTAR Sun Jan 5 20:44:10 2014(r260333) @@ -3,73 +3,165 @@ # # $FreeBSD$ # +# http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html +# +# The handbook is also available locally in /usr/share/doc/handbook +# if you've installed the doc distribution, otherwise always see the +# FreeBSD World Wide Web server (http://www.FreeBSD.org/) for the +# latest information. +# +# An exhaustive list of options and more detailed explanations of the +# device lines is also present in the ../../conf/NOTES and NOTES files. +# If you are in doubt as to the purpose or necessity of a line, check first +# in NOTES. +# +# $FreeBSD$ +# ident DOCKSTAR + include "../mv/kirkwood/std.db88f6xxx" -options SOC_MV_KIRKWOOD +makeoptions FDT_DTS_FILE=dockstar.dts + makeoptions MODULES_OVERRIDE="" -#makeoptions DEBUG=-g#Build kernel with gdb(1) debug symbols -makeoptions WERROR="-Werror" +options SOC_MV_KIRKWOOD options SCHED_4BSD #4BSD scheduler options INET#InterNETworking options INET6 #IPv6 communications protocols +options SOFTUPDATES +options CD9660 #ISO 9660 filesystem options FFS #Berkeley Fast Filesystem -options NFSCL #New Network Filesystem Client -options NFSLOCKD#Network Lock Manager -options NFS_ROOT#NFS usable as /, requires NFSCL -options BOOTP -options BOOTP_NFSROOT -options BOOTP_NFSV3 -options BOOTP_COMPAT -options BOOTP_WIRED_TO=mge0 - -# Root fs on USB device -#optionsROOTDEVNAME=\"ufs:/dev/da0a\" - +options MSDOSFS #MS DOS File System (FAT, FAT32) +options NULLFS #NULL filesystem +options TMPFS #Efficient memory filesystem options SYSVSHM #SYSV-style shared memory options SYSVMSG #SYSV-style message queues options SYSVSEM #SYSV-style semaphores options _KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions -options MUTEX_NOINLINE -options RWLOCK_NOINLINE -options NO_FFS_SNAPSHOT -options NO_SWAPPING +options GEOM_ELI# Disk encryption. +options GEOM_LABEL # Providers labelization. +options GEOM_PART_GPT # GPT partitioning -# Debugging -options ALT_BREAK_TO_DEBUGGER -options DDB -options KDB +# Flattened Device Tree +devicefdt +options FDT +options FDT_DTB_STATIC + +# Misc pseudo devices +devicebpf #Required for DHCP +devicefaith #IPv6-to-IPv4 relaying (translation) +devicefirmware#firmware(9) required for USB wlan +devicegif #IPv6 and IPv4 tunneling +deviceloop#Network loopback +devicemd #Memory/malloc disk +devicepty #BSD-style compatibility pseudo ttys +devicerandom #Entropy device +devicetun #Packet tunnel. +deviceether #Required for all ethernet devices +devicevlan#802.1Q VLAN support +devicewlan#802.11 WLAN support -# Pseudo devices -devicemd -devicerandom -deviceloo
Re: kern/182557: commit references a PR
The following reply was made to PR kern/182557; it has been noted by GNATS. From: dfil...@freebsd.org (dfilter service) To: bug-follo...@freebsd.org Cc: Subject: Re: kern/182557: commit references a PR Date: Mon, 6 Jan 2014 19:05:12 + (UTC) Author: glebius Date: Mon Jan 6 19:05:04 2014 New Revision: 260377 URL: http://svnweb.freebsd.org/changeset/base/260377 Log: When pf_get_translation() fails, it should leave *sn pointer pristine, otherwise we will panic in pf_test_rule(). PR: 182557 Modified: head/sys/netpfil/pf/pf_lb.c Modified: head/sys/netpfil/pf/pf_lb.c == --- head/sys/netpfil/pf/pf_lb.cMon Jan 6 17:23:22 2014 (r260376) +++ head/sys/netpfil/pf/pf_lb.cMon Jan 6 19:05:04 2014 (r260377) @@ -686,6 +686,7 @@ notrans: uma_zfree(V_pf_state_key_z, *nkp); uma_zfree(V_pf_state_key_z, *skp); *skp = *nkp = NULL; + *sn = NULL; return (NULL); } ___ svn-src-...@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" ___ freebsd-bugs@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-bugs To unsubscribe, send any mail to "freebsd-bugs-unsubscr...@freebsd.org"
Re: kern/185043: commit references a PR
The following reply was made to PR kern/185043; it has been noted by GNATS.
From: dfil...@freebsd.org (dfilter service)
To: bug-follo...@freebsd.org
Cc:
Subject: Re: kern/185043: commit references a PR
Date: Thu, 16 Jan 2014 22:15:01 + (UTC)
Author: gnn
Date: Thu Jan 16 22:14:54 2014
New Revision: 260796
URL: http://svnweb.freebsd.org/changeset/base/260796
Log:
Fix various places where we don't properly release a lock
PR: 185043
Submitted by:Michael Bentkofsky
MFC after: 2 weeks
Modified:
head/sys/netinet/in_mcast.c
Modified: head/sys/netinet/in_mcast.c
==
--- head/sys/netinet/in_mcast.cThu Jan 16 21:56:05 2014
(r260795)
+++ head/sys/netinet/in_mcast.cThu Jan 16 22:14:54 2014
(r260796)
@@ -1496,7 +1496,7 @@ inp_block_unblock_source(struct inpcb *i
error = inm_merge(inm, imf);
if (error) {
CTR1(KTR_IGMPV3, "%s: failed to merge inm state", __func__);
- goto out_imf_rollback;
+ goto out_in_multi_locked;
}
CTR1(KTR_IGMPV3, "%s: doing igmp downcall", __func__);
@@ -1504,6 +1504,8 @@ inp_block_unblock_source(struct inpcb *i
if (error)
CTR1(KTR_IGMPV3, "%s: failed igmp downcall", __func__);
+out_in_multi_locked:
+
IN_MULTI_UNLOCK();
out_imf_rollback:
@@ -2172,8 +2174,12 @@ inp_join_group(struct inpcb *inp, struct
if (is_new) {
error = in_joingroup_locked(ifp, &gsa->sin.sin_addr, imf,
&inm);
- if (error)
+ if (error) {
+CTR1(KTR_IGMPV3, "%s: in_joingroup_locked failed",
+__func__);
+IN_MULTI_UNLOCK();
goto out_imo_free;
+}
imo->imo_membership[idx] = inm;
} else {
CTR1(KTR_IGMPV3, "%s: merge inm state", __func__);
@@ -2181,20 +2187,21 @@ inp_join_group(struct inpcb *inp, struct
if (error) {
CTR1(KTR_IGMPV3, "%s: failed to merge inm state",
__func__);
- goto out_imf_rollback;
+ goto out_in_multi_locked;
}
CTR1(KTR_IGMPV3, "%s: doing igmp downcall", __func__);
error = igmp_change_state(inm);
if (error) {
CTR1(KTR_IGMPV3, "%s: failed igmp downcall",
__func__);
- goto out_imf_rollback;
+ goto out_in_multi_locked;
}
}
+out_in_multi_locked:
+
IN_MULTI_UNLOCK();
-out_imf_rollback:
INP_WLOCK_ASSERT(inp);
if (error) {
imf_rollback(imf);
@@ -2398,7 +2405,7 @@ inp_leave_group(struct inpcb *inp, struc
if (error) {
CTR1(KTR_IGMPV3, "%s: failed to merge inm state",
__func__);
- goto out_imf_rollback;
+ goto out_in_multi_locked;
}
CTR1(KTR_IGMPV3, "%s: doing igmp downcall", __func__);
@@ -2409,9 +2416,10 @@ inp_leave_group(struct inpcb *inp, struc
}
}
+out_in_multi_locked:
+
IN_MULTI_UNLOCK();
-out_imf_rollback:
if (error)
imf_rollback(imf);
else
@@ -2645,7 +2653,7 @@ inp_set_source_filters(struct inpcb *inp
error = inm_merge(inm, imf);
if (error) {
CTR1(KTR_IGMPV3, "%s: failed to merge inm state", __func__);
- goto out_imf_rollback;
+ goto out_in_multi_locked;
}
CTR1(KTR_IGMPV3, "%s: doing igmp downcall", __func__);
@@ -2653,6 +2661,8 @@ inp_set_source_filters(struct inpcb *inp
if (error)
CTR1(KTR_IGMPV3, "%s: failed igmp downcall", __func__);
+out_in_multi_locked:
+
IN_MULTI_UNLOCK();
out_imf_rollback:
___
svn-src-...@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"
___
freebsd-bugs@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-bugs
To unsubscribe, send any mail to "freebsd-bugs-unsubscr...@freebsd.org"
Re: bin/161526: commit references a PR
The following reply was made to PR bin/161526; it has been noted by GNATS.
From: dfil...@freebsd.org (dfilter service)
To: bug-follo...@freebsd.org
Cc:
Subject: Re: bin/161526: commit references a PR
Date: Fri, 17 Jan 2014 21:45:32 + (UTC)
Author: trociny
Date: Fri Jan 17 21:45:25 2014
New Revision: 260833
URL: http://svnweb.freebsd.org/changeset/base/260833
Log:
Bring back r226403, the fix for bin/161526, which was (accidentally?)
reverted in r238896.
PR: bin/161526
Reported by: Karli.Sjoberg slu.se
MFC after: 3 days
Modified:
head/usr.bin/script/script.c
Modified: head/usr.bin/script/script.c
==
--- head/usr.bin/script/script.c Fri Jan 17 21:37:55 2014
(r260832)
+++ head/usr.bin/script/script.c Fri Jan 17 21:45:25 2014
(r260833)
@@ -238,12 +238,15 @@ main(int argc, char *argv[])
FD_SET(master, &rfd);
if (readstdin)
FD_SET(STDIN_FILENO, &rfd);
- if ((!readstdin && ttyflg) || flushtime > 0) {
- tv.tv_sec = !readstdin && ttyflg ? 1 :
- flushtime - (tvec - start);
+ if (!readstdin && ttyflg) {
+ tv.tv_sec = 1;
tv.tv_usec = 0;
tvp = &tv;
readstdin = 1;
+ } else if (flushtime > 0) {
+ tv.tv_sec = flushtime - (tvec - start);
+ tv.tv_usec = 0;
+ tvp = &tv;
} else {
tvp = NULL;
}
___
svn-src-...@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"
___
freebsd-bugs@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-bugs
To unsubscribe, send any mail to "freebsd-bugs-unsubscr...@freebsd.org"
Re: bin/161526: commit references a PR
The following reply was made to PR bin/161526; it has been noted by GNATS.
From: dfil...@freebsd.org (dfilter service)
To: bug-follo...@freebsd.org
Cc:
Subject: Re: bin/161526: commit references a PR
Date: Mon, 20 Jan 2014 20:33:53 + (UTC)
Author: trociny
Date: Mon Jan 20 20:33:40 2014
New Revision: 260924
URL: http://svnweb.freebsd.org/changeset/base/260924
Log:
MFC r260833:
Bring back r226403, the fix for bin/161526, which was (accidentally?)
reverted in r238896.
PR: bin/161526
Reported by: Karli.Sjoberg slu.se
Modified:
stable/10/usr.bin/script/script.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/usr.bin/script/script.c
==
--- stable/10/usr.bin/script/script.c Mon Jan 20 20:28:04 2014
(r260923)
+++ stable/10/usr.bin/script/script.c Mon Jan 20 20:33:40 2014
(r260924)
@@ -235,12 +235,15 @@ main(int argc, char *argv[])
FD_SET(master, &rfd);
if (readstdin)
FD_SET(STDIN_FILENO, &rfd);
- if ((!readstdin && ttyflg) || flushtime > 0) {
- tv.tv_sec = !readstdin && ttyflg ? 1 :
- flushtime - (tvec - start);
+ if (!readstdin && ttyflg) {
+ tv.tv_sec = 1;
tv.tv_usec = 0;
tvp = &tv;
readstdin = 1;
+ } else if (flushtime > 0) {
+ tv.tv_sec = flushtime - (tvec - start);
+ tv.tv_usec = 0;
+ tvp = &tv;
} else {
tvp = NULL;
}
___
svn-src-...@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"
___
freebsd-bugs@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-bugs
To unsubscribe, send any mail to "freebsd-bugs-unsubscr...@freebsd.org"
Re: bin/161526: commit references a PR
The following reply was made to PR bin/161526; it has been noted by GNATS.
From: dfil...@freebsd.org (dfilter service)
To: bug-follo...@freebsd.org
Cc:
Subject: Re: bin/161526: commit references a PR
Date: Mon, 20 Jan 2014 20:34:38 + (UTC)
Author: trociny
Date: Mon Jan 20 20:34:31 2014
New Revision: 260925
URL: http://svnweb.freebsd.org/changeset/base/260925
Log:
MFC r260833:
Bring back r226403, the fix for bin/161526, which was (accidentally?)
reverted in r238896.
PR: bin/161526
Reported by: Karli.Sjoberg slu.se
Modified:
stable/9/usr.bin/script/script.c
Directory Properties:
stable/9/usr.bin/script/ (props changed)
Modified: stable/9/usr.bin/script/script.c
==
--- stable/9/usr.bin/script/script.c Mon Jan 20 20:33:40 2014
(r260924)
+++ stable/9/usr.bin/script/script.c Mon Jan 20 20:34:31 2014
(r260925)
@@ -235,12 +235,15 @@ main(int argc, char *argv[])
FD_SET(master, &rfd);
if (readstdin)
FD_SET(STDIN_FILENO, &rfd);
- if ((!readstdin && ttyflg) || flushtime > 0) {
- tv.tv_sec = !readstdin && ttyflg ? 1 :
- flushtime - (tvec - start);
+ if (!readstdin && ttyflg) {
+ tv.tv_sec = 1;
tv.tv_usec = 0;
tvp = &tv;
readstdin = 1;
+ } else if (flushtime > 0) {
+ tv.tv_sec = flushtime - (tvec - start);
+ tv.tv_usec = 0;
+ tvp = &tv;
} else {
tvp = NULL;
}
___
svn-src-...@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"
___
freebsd-bugs@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-bugs
To unsubscribe, send any mail to "freebsd-bugs-unsubscr...@freebsd.org"
Re: kern/182557: commit references a PR
The following reply was made to PR kern/182557; it has been noted by GNATS. From: dfil...@freebsd.org (dfilter service) To: bug-follo...@freebsd.org Cc: Subject: Re: kern/182557: commit references a PR Date: Wed, 22 Jan 2014 10:45:24 + (UTC) Author: glebius Date: Wed Jan 22 10:45:16 2014 New Revision: 261023 URL: http://svnweb.freebsd.org/changeset/base/261023 Log: Merge r260377: fix panic on pf_get_translation() failure. PR: 182557 Modified: stable/10/sys/netpfil/pf/pf_lb.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/netpfil/pf/pf_lb.c == --- stable/10/sys/netpfil/pf/pf_lb.c Wed Jan 22 10:38:01 2014 (r261022) +++ stable/10/sys/netpfil/pf/pf_lb.c Wed Jan 22 10:45:16 2014 (r261023) @@ -663,6 +663,7 @@ notrans: uma_zfree(V_pf_state_key_z, *nkp); uma_zfree(V_pf_state_key_z, *skp); *skp = *nkp = NULL; + *sn = NULL; return (NULL); } ___ svn-src-...@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" ___ freebsd-bugs@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-bugs To unsubscribe, send any mail to "freebsd-bugs-unsubscr...@freebsd.org"
Re: kern/185813: commit references a PR
The following reply was made to PR kern/185813; it has been noted by GNATS.
From: dfil...@freebsd.org (dfilter service)
To: bug-follo...@freebsd.org
Cc:
Subject: Re: kern/185813: commit references a PR
Date: Thu, 23 Jan 2014 17:26:41 + (UTC)
Author: asomers
Date: Thu Jan 23 17:26:28 2014
New Revision: 261081
URL: http://svnweb.freebsd.org/changeset/base/261081
Log:
Replace the old unix_seqpacket and unix_seqpacket_exercise tests, which
were a little broken and not automatable, with unix_seqpacket_test.
It's coverage is a superset of the old tests and it uses ATF. It
includes test cases for bugs kern/185813 and kern/185812.
PR: kern/185812
PR: kern/185813
Sponsored by:Spectra Logic
MFC after: 2 weeks
Added:
head/tests/sys/
head/tests/sys/Makefile (contents, props changed)
head/tests/sys/kern/
head/tests/sys/kern/Makefile (contents, props changed)
head/tests/sys/kern/unix_seqpacket_test.c (contents, props changed)
Deleted:
head/tools/regression/sockets/unix_seqpacket/
head/tools/regression/sockets/unix_seqpacket_exercise/
Modified:
head/Makefile.inc1
head/etc/mtree/BSD.tests.dist
Modified: head/Makefile.inc1
==
--- head/Makefile.inc1 Thu Jan 23 17:24:26 2014(r261080)
+++ head/Makefile.inc1 Thu Jan 23 17:26:28 2014(r261081)
@@ -417,7 +417,7 @@ LIB32WMAKEFLAGS+= \
-DNO_LINT
LIB32WMAKE= ${LIB32WMAKEENV} ${MAKE} ${LIB32WMAKEFLAGS} \
- -DWITHOUT_MAN -DWITHOUT_INFO -DWITHOUT_HTML
+ -DWITHOUT_MAN -DWITHOUT_INFO -DWITHOUT_HTML -DNO_TESTS
LIB32IMAKE= ${LIB32WMAKE:NINSTALL=*:NDESTDIR=*:N_LDSCRIPTROOT=*} -DNO_INCS \
${IMAKE_INSTALL}
.endif
Modified: head/etc/mtree/BSD.tests.dist
==
--- head/etc/mtree/BSD.tests.dist Thu Jan 23 17:24:26 2014
(r261080)
+++ head/etc/mtree/BSD.tests.dist Thu Jan 23 17:26:28 2014
(r261081)
@@ -78,6 +78,10 @@
..
..
..
+sys
+kern
+..
+..
usr.bin
atf
atf-sh
Added: head/tests/sys/Makefile
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/tests/sys/MakefileThu Jan 23 17:26:28 2014(r261081)
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+.include
+
+TESTSDIR= ${TESTSBASE}/sys
+
+KYUAFILE= yes
+
+CLEANFILES+= Kyuafile
+Kyuafile: ${.CURDIR}/../Kyuafile
+ cp -f ${.CURDIR}/../Kyuafile .
+
+.include
Added: head/tests/sys/kern/Makefile
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/tests/sys/kern/Makefile Thu Jan 23 17:26:28 2014
(r261081)
@@ -0,0 +1,10 @@
+# $FreeBSD$
+
+TESTSDIR= ${TESTSBASE}/sys/kern
+
+ATF_TESTS_C= unix_seqpacket_test
+TEST_METADATA.unix_seqpacket_test+= timeout="15"
+
+LDADD+= -lpthread
+
+.include
Added: head/tests/sys/kern/unix_seqpacket_test.c
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/tests/sys/kern/unix_seqpacket_test.c Thu Jan 23 17:26:28 2014
(r261081)
@@ -0,0 +1,1117 @@
+/*-
+ * Copyright (c) 2014 Spectra Logic Corporation. All rights reserved.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIB
Re: kern/185812: commit references a PR
The following reply was made to PR kern/185812; it has been noted by GNATS.
From: dfil...@freebsd.org (dfilter service)
To: bug-follo...@freebsd.org
Cc:
Subject: Re: kern/185812: commit references a PR
Date: Thu, 23 Jan 2014 17:26:41 + (UTC)
Author: asomers
Date: Thu Jan 23 17:26:28 2014
New Revision: 261081
URL: http://svnweb.freebsd.org/changeset/base/261081
Log:
Replace the old unix_seqpacket and unix_seqpacket_exercise tests, which
were a little broken and not automatable, with unix_seqpacket_test.
It's coverage is a superset of the old tests and it uses ATF. It
includes test cases for bugs kern/185813 and kern/185812.
PR: kern/185812
PR: kern/185813
Sponsored by:Spectra Logic
MFC after: 2 weeks
Added:
head/tests/sys/
head/tests/sys/Makefile (contents, props changed)
head/tests/sys/kern/
head/tests/sys/kern/Makefile (contents, props changed)
head/tests/sys/kern/unix_seqpacket_test.c (contents, props changed)
Deleted:
head/tools/regression/sockets/unix_seqpacket/
head/tools/regression/sockets/unix_seqpacket_exercise/
Modified:
head/Makefile.inc1
head/etc/mtree/BSD.tests.dist
Modified: head/Makefile.inc1
==
--- head/Makefile.inc1 Thu Jan 23 17:24:26 2014(r261080)
+++ head/Makefile.inc1 Thu Jan 23 17:26:28 2014(r261081)
@@ -417,7 +417,7 @@ LIB32WMAKEFLAGS+= \
-DNO_LINT
LIB32WMAKE= ${LIB32WMAKEENV} ${MAKE} ${LIB32WMAKEFLAGS} \
- -DWITHOUT_MAN -DWITHOUT_INFO -DWITHOUT_HTML
+ -DWITHOUT_MAN -DWITHOUT_INFO -DWITHOUT_HTML -DNO_TESTS
LIB32IMAKE= ${LIB32WMAKE:NINSTALL=*:NDESTDIR=*:N_LDSCRIPTROOT=*} -DNO_INCS \
${IMAKE_INSTALL}
.endif
Modified: head/etc/mtree/BSD.tests.dist
==
--- head/etc/mtree/BSD.tests.dist Thu Jan 23 17:24:26 2014
(r261080)
+++ head/etc/mtree/BSD.tests.dist Thu Jan 23 17:26:28 2014
(r261081)
@@ -78,6 +78,10 @@
..
..
..
+sys
+kern
+..
+..
usr.bin
atf
atf-sh
Added: head/tests/sys/Makefile
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/tests/sys/MakefileThu Jan 23 17:26:28 2014(r261081)
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+.include
+
+TESTSDIR= ${TESTSBASE}/sys
+
+KYUAFILE= yes
+
+CLEANFILES+= Kyuafile
+Kyuafile: ${.CURDIR}/../Kyuafile
+ cp -f ${.CURDIR}/../Kyuafile .
+
+.include
Added: head/tests/sys/kern/Makefile
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/tests/sys/kern/Makefile Thu Jan 23 17:26:28 2014
(r261081)
@@ -0,0 +1,10 @@
+# $FreeBSD$
+
+TESTSDIR= ${TESTSBASE}/sys/kern
+
+ATF_TESTS_C= unix_seqpacket_test
+TEST_METADATA.unix_seqpacket_test+= timeout="15"
+
+LDADD+= -lpthread
+
+.include
Added: head/tests/sys/kern/unix_seqpacket_test.c
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/tests/sys/kern/unix_seqpacket_test.c Thu Jan 23 17:26:28 2014
(r261081)
@@ -0,0 +1,1117 @@
+/*-
+ * Copyright (c) 2014 Spectra Logic Corporation. All rights reserved.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIB
Re: misc/183495: commit references a PR
The following reply was made to PR misc/183495; it has been noted by GNATS.
From: dfil...@freebsd.org (dfilter service)
To: bug-follo...@freebsd.org
Cc:
Subject: Re: misc/183495: commit references a PR
Date: Sun, 26 Jan 2014 22:49:33 + (UTC)
Author: jilles
Date: Sun Jan 26 22:49:24 2014
New Revision: 261193
URL: http://svnweb.freebsd.org/changeset/base/261193
Log:
login: Clean up PAM and audit, then exit, on SIGHUP and SIGTERM.
This avoids leaving stale entries in utmpx after the connection is closed on
an open login session. It also allows a clean way (SIGTERM) to forcibly
terminate a user's terminal session.
This does not affect the situation for "hung" processes after the connection
is closed. The foreground process group receives SIGHUP and the tty becomes
inaccessible.
Also replace all use of the obsolete signal() function with sigaction() (not
only the part where it is actually required: SIGHUP and SIGTERM must mask
the other as well when caught).
PR: misc/183495
Reviewed by: ed
Modified:
head/usr.bin/login/login.c
Modified: head/usr.bin/login/login.c
==
--- head/usr.bin/login/login.c Sun Jan 26 21:19:33 2014(r261192)
+++ head/usr.bin/login/login.c Sun Jan 26 22:49:24 2014(r261193)
@@ -83,6 +83,7 @@ __FBSDID("$FreeBSD$");
static int auth_pam(void);
static voidbail(int, int);
+static voidbail_internal(int, int, int);
static int export(const char *);
static voidexport_pam_environment(void);
static int motd(const char *);
@@ -94,6 +95,7 @@ static void refused(const char *, cons
static const char *stypeof(char *);
static voidsigint(int);
static voidtimedout(int);
+static voidbail_sig(int);
static voidusage(void);
#define TTYGRPNAME "tty" /* group to own
ttys */
@@ -172,13 +174,18 @@ main(int argc, char *argv[])
login_cap_t *lc = NULL;
login_cap_t *lc_user = NULL;
pid_t pid;
+ sigset_t mask, omask;
+ struct sigaction sa;
#ifdef USE_BSM_AUDIT
char auditsuccess = 1;
#endif
- (void)signal(SIGQUIT, SIG_IGN);
- (void)signal(SIGINT, SIG_IGN);
- (void)signal(SIGHUP, SIG_IGN);
+ sa.sa_flags = SA_RESTART;
+ (void)sigfillset(&sa.sa_mask);
+ sa.sa_handler = SIG_IGN;
+ (void)sigaction(SIGQUIT, &sa, NULL);
+ (void)sigaction(SIGINT, &sa, NULL);
+ (void)sigaction(SIGHUP, &sa, NULL);
if (setjmp(timeout_buf)) {
if (failures)
badlogin(username);
@@ -186,7 +193,8 @@ main(int argc, char *argv[])
timeout);
bail(NO_SLEEP_EXIT, 0);
}
- (void)signal(SIGALRM, timedout);
+ sa.sa_handler = timedout;
+ (void)sigaction(SIGALRM, &sa, NULL);
(void)alarm(timeout);
(void)setpriority(PRIO_PROCESS, 0, 0);
@@ -370,7 +378,14 @@ main(int argc, char *argv[])
/* committed to login -- turn off timeout */
(void)alarm((u_int)0);
- (void)signal(SIGHUP, SIG_DFL);
+
+ (void)sigemptyset(&mask);
+ (void)sigaddset(&mask, SIGHUP);
+ (void)sigaddset(&mask, SIGTERM);
+ (void)sigprocmask(SIG_BLOCK, &mask, &omask);
+ sa.sa_handler = bail_sig;
+ (void)sigaction(SIGHUP, &sa, NULL);
+ (void)sigaction(SIGTERM, &sa, NULL);
endpwent();
@@ -550,10 +565,17 @@ main(int argc, char *argv[])
/*
* Parent: wait for child to finish, then clean up
* session.
+ *
+ * If we get SIGHUP or SIGTERM, clean up the session
+ * and exit right away. This will make the terminal
+ * inaccessible and send SIGHUP to the foreground
+ * process group.
*/
int status;
setproctitle("-%s [pam]", getprogname());
+ (void)sigprocmask(SIG_SETMASK, &omask, NULL);
waitpid(pid, &status, 0);
+ (void)sigprocmask(SIG_BLOCK, &mask, NULL);
bail(NO_SLEEP_EXIT, 0);
}
@@ -627,10 +649,15 @@ main(int argc, char *argv[])
login_close(lc_user);
login_close(lc);
- (void)signal(SIGALRM, SIG_DFL);
- (void)signal(SIGQUIT, SIG_DFL);
- (void)signal(SIGINT, SIG_DFL);
- (void)signal(SIGTSTP, SIG_IGN);
+ sa.sa_handler = SIG_DFL;
+ (void)sigaction(SIGALRM, &sa, NULL);
+ (void)sigaction(SIGQUIT, &sa, NULL);
+ (void)sigaction(SIGINT, &sa, NULL);
+ (void)sigaction(SIGTERM, &sa, NULL);
+ (void)
Re: kern/176597: commit references a PR
The following reply was made to PR kern/176597; it has been noted by GNATS.
From: dfil...@freebsd.org (dfilter service)
To: bug-follo...@freebsd.org
Cc:
Subject: Re: kern/176597: commit references a PR
Date: Tue, 4 Feb 2014 20:52:41 + (UTC)
Author: ed
Date: Tue Feb 4 20:52:33 2014
New Revision: 261495
URL: http://svnweb.freebsd.org/changeset/base/261495
Log:
Use right buffer to print to.
PR: kern/176597
Submitted by:Christoph Mallon
MFC after: 2 weeks
Modified:
head/sys/dev/watchdog/watchdog.c
Modified: head/sys/dev/watchdog/watchdog.c
==
--- head/sys/dev/watchdog/watchdog.c Tue Feb 4 18:54:33 2014
(r261494)
+++ head/sys/dev/watchdog/watchdog.c Tue Feb 4 20:52:33 2014
(r261495)
@@ -226,7 +226,7 @@ wd_timeout_cb(void *arg)
#ifdef DDB
if ((wd_pretimeout_act & WD_SOFT_DDB)) {
char kdb_why[80];
- snprintf(kdb_why, sizeof(buf), "watchdog %s timeout", type);
+ snprintf(kdb_why, sizeof(kdb_why), "watchdog %s timeout", type);
kdb_backtrace();
kdb_enter(KDB_WHY_WATCHDOG, kdb_why);
}
___
svn-src-...@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"
___
freebsd-bugs@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-bugs
To unsubscribe, send any mail to "freebsd-bugs-unsubscr...@freebsd.org"
Re: misc/186412: commit references a PR
The following reply was made to PR misc/186412; it has been noted by GNATS.
From: dfil...@freebsd.org (dfilter service)
To: bug-follo...@freebsd.org
Cc:
Subject: Re: misc/186412: commit references a PR
Date: Wed, 5 Feb 2014 18:16:25 + (UTC)
Author: antoine
Date: Wed Feb 5 18:16:18 2014
New Revision: 261521
URL: http://svnweb.freebsd.org/changeset/base/261521
Log:
Add files to remove WITHOUT_NIS
PR: 186412
Modified:
head/tools/build/mk/OptionalObsoleteFiles.inc
Modified: head/tools/build/mk/OptionalObsoleteFiles.inc
==
--- head/tools/build/mk/OptionalObsoleteFiles.inc Wed Feb 5 18:13:27
2014(r261520)
+++ head/tools/build/mk/OptionalObsoleteFiles.inc Wed Feb 5 18:16:18
2014(r261521)
@@ -3321,9 +3321,60 @@ OLD_FILES+=usr/bin/nc
OLD_FILES+=usr/share/man/man1/nc.1.gz
.endif
-#.if ${MK_NIS} == no
-# to be filled in
-#.endif
+.if ${MK_NIS} == no
+OLD_FILES+=usr/bin/ypcat
+OLD_FILES+=usr/bin/ypchfn
+OLD_FILES+=usr/bin/ypchpass
+OLD_FILES+=usr/bin/ypchsh
+OLD_FILES+=usr/bin/ypmatch
+OLD_FILES+=usr/bin/yppasswd
+OLD_FILES+=usr/bin/ypwhich
+OLD_FILES+=usr/include/ypclnt.h
+OLD_FILES+=usr/lib/libypclnt.a
+OLD_FILES+=usr/lib/libypclnt.so
+OLD_LIBS+=usr/lib/libypclnt.so.4
+OLD_FILES+=usr/lib/libypclnt_p.a
+.if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64"
+OLD_FILES+=usr/lib32/libypclnt.a
+OLD_FILES+=usr/lib32/libypclnt.so
+OLD_LIBS+=usr/lib32/libypclnt.so.4
+OLD_FILES+=usr/lib32/libypclnt_p.a
+.endif
+OLD_FILES+=usr/libexec/mknetid
+OLD_FILES+=usr/libexec/yppwupdate
+OLD_FILES+=usr/libexec/ypxfr
+OLD_FILES+=usr/sbin/rpc.yppasswdd
+OLD_FILES+=usr/sbin/rpc.ypupdated
+OLD_FILES+=usr/sbin/rpc.ypxfrd
+OLD_FILES+=usr/sbin/yp_mkdb
+OLD_FILES+=usr/sbin/ypbind
+OLD_FILES+=usr/sbin/ypinit
+OLD_FILES+=usr/sbin/yppoll
+OLD_FILES+=usr/sbin/yppush
+OLD_FILES+=usr/sbin/ypserv
+OLD_FILES+=usr/sbin/ypset
+OLD_FILES+=usr/share/man/man1/ypcat.1.gz
+OLD_FILES+=usr/share/man/man1/ypchfn.1.gz
+OLD_FILES+=usr/share/man/man1/ypchpass.1.gz
+OLD_FILES+=usr/share/man/man1/ypchsh.1.gz
+OLD_FILES+=usr/share/man/man1/ypmatch.1.gz
+OLD_FILES+=usr/share/man/man1/yppasswd.1.gz
+OLD_FILES+=usr/share/man/man1/ypwhich.1.gz
+OLD_FILES+=usr/share/man/man5/netid.5.gz
+OLD_FILES+=usr/share/man/man8/mknetid.8.gz
+OLD_FILES+=usr/share/man/man8/rpc.yppasswdd.8.gz
+OLD_FILES+=usr/share/man/man8/rpc.ypxfrd.8.gz
+OLD_FILES+=usr/share/man/man8/yp_mkdb.8.gz
+OLD_FILES+=usr/share/man/man8/ypbind.8.gz
+OLD_FILES+=usr/share/man/man8/ypinit.8.gz
+OLD_FILES+=usr/share/man/man8/yppoll.8.gz
+OLD_FILES+=usr/share/man/man8/yppush.8.gz
+OLD_FILES+=usr/share/man/man8/ypserv.8.gz
+OLD_FILES+=usr/share/man/man8/ypset.8.gz
+OLD_FILES+=usr/share/man/man8/ypxfr.8.gz
+OLD_FILES+=var/yp/Makefile
+OLD_FILES+=var/yp/Makefile.dist
+.endif
#.if ${MK_NLS} == no
# to be filled in
___
svn-src-...@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"
___
freebsd-bugs@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-bugs
To unsubscribe, send any mail to "freebsd-bugs-unsubscr...@freebsd.org"
Re: misc/179536: commit references a PR
The following reply was made to PR misc/179536; it has been noted by GNATS. From: dfil...@freebsd.org (dfilter service) To: bug-follo...@freebsd.org Cc: Subject: Re: misc/179536: commit references a PR Date: Thu, 6 Feb 2014 07:59:14 + (UTC) Author: brueffer Date: Thu Feb 6 07:59:05 2014 New Revision: 261540 URL: http://svnweb.freebsd.org/changeset/base/261540 Log: MFC: r233049 by rmh Remove gratuitous DEBUG_FLAGS="-g" setting (this is already the default option with GENERIC kernels). PR: 179536 Submitted by:Alexey Markov Modified: stable/8/sys/modules/mps/Makefile Directory Properties: stable/8/sys/ (props changed) stable/8/sys/modules/ (props changed) Modified: stable/8/sys/modules/mps/Makefile == --- stable/8/sys/modules/mps/Makefile Thu Feb 6 07:55:50 2014 (r261539) +++ stable/8/sys/modules/mps/Makefile Thu Feb 6 07:59:05 2014 (r261540) @@ -9,6 +9,5 @@ SRCS+= opt_cam.h opt_compat.h SRCS+=device_if.h bus_if.h pci_if.h #CFLAGS += -DMPS_DEBUG -DEBUG_FLAGS += -g .include ___ svn-src-...@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" ___ freebsd-bugs@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-bugs To unsubscribe, send any mail to "freebsd-bugs-unsubscr...@freebsd.org"
Re: misc/179536: commit references a PR
The following reply was made to PR misc/179536; it has been noted by GNATS. From: dfil...@freebsd.org (dfilter service) To: bug-follo...@freebsd.org Cc: Subject: Re: misc/179536: commit references a PR Date: Thu, 6 Feb 2014 07:55:59 + (UTC) Author: brueffer Date: Thu Feb 6 07:55:50 2014 New Revision: 261539 URL: http://svnweb.freebsd.org/changeset/base/261539 Log: MFC: r233049 by rmh Remove gratuitous DEBUG_FLAGS="-g" setting (this is already the default option with GENERIC kernels). PR: 179536 Submitted by:Alexey Markov Modified: stable/9/sys/modules/mps/Makefile Directory Properties: stable/9/sys/ (props changed) stable/9/sys/modules/ (props changed) Modified: stable/9/sys/modules/mps/Makefile == --- stable/9/sys/modules/mps/Makefile Thu Feb 6 03:54:58 2014 (r261538) +++ stable/9/sys/modules/mps/Makefile Thu Feb 6 07:55:50 2014 (r261539) @@ -9,7 +9,6 @@ SRCS+= opt_cam.h opt_compat.h SRCS+=device_if.h bus_if.h pci_if.h #CFLAGS += -DMPS_DEBUG -DEBUG_FLAGS += -g .include ___ svn-src-...@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" ___ freebsd-bugs@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-bugs To unsubscribe, send any mail to "freebsd-bugs-unsubscr...@freebsd.org"
Re: misc/186822: commit references a PR
The following reply was made to PR misc/186822; it has been noted by GNATS.
From: dfil...@freebsd.org (dfilter service)
To: bug-follo...@freebsd.org
Cc:
Subject: Re: misc/186822: commit references a PR
Date: Mon, 17 Feb 2014 14:33:22 + (UTC)
Author: feld
Date: Mon Feb 17 14:33:15 2014
New Revision: 344756
URL: http://svnweb.freebsd.org/changeset/ports/344756
QAT: https://qat.redports.org/buildarchive/r344756/
Log:
NO_PACKAGE is not necessary; we can support packages this large
STAGE support
PR: ports/186822
Modified:
head/games/urbanterror-data/Makefile
Modified: head/games/urbanterror-data/Makefile
==
--- head/games/urbanterror-data/Makefile Mon Feb 17 14:17:54 2014
(r344755)
+++ head/games/urbanterror-data/Makefile Mon Feb 17 14:33:15 2014
(r344756)
@@ -16,7 +16,6 @@ MAINTAINER= kamik...@bsdforen.de
COMMENT= Standalone realism based mod originally for Quake III Arena
NO_BUILD= yes
-NO_PACKAGE= Package will be 1GB; set FORCE_PACKAGE if you really want it
DATADIR= ${PREFIX}/share/quake3
DOCSDIR= ${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
@@ -26,22 +25,20 @@ URT_REV= ${PORTVERSION:C/([0-9]+\.[0-9]+
PLIST_SUB+= VER=${URT_VER}
-NO_STAGE= yes
-
OPTIONS_DEFINE= DOCS
.include
do-install:
- ${MKDIR} ${DATADIR}/q3ut4
+ ${MKDIR} ${STAGEDIR}${DATADIR}/q3ut4
${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${DISTDIR}/${DISTFILES} \
- ${EXTRACT_AFTER_ARGS} -C ${DATADIR} --strip-components 1 \
+ ${EXTRACT_AFTER_ARGS} -C ${STAGEDIR}${DATADIR}
--strip-components 1 \
UrbanTerror${URT_VER}/q3ut4
.if ${PORT_OPTIONS:MDOCS}
- ${MKDIR} ${DOCSDIR}
- ${MV} ${DATADIR}/q3ut4/readme${URT_VER}.txt ${DOCSDIR}
+ ${MKDIR} ${STAGEDIR}${DOCSDIR}
+ ${MV} ${STAGEDIR}${DATADIR}/q3ut4/readme${URT_VER}.txt
${STAGEDIR}${DOCSDIR}
.else
- ${RM} ${DATADIR}/q3ut4/readme${URT_VER}.txt
+ ${RM} ${STAGEDIR}${DATADIR}/q3ut4/readme${URT_VER}.txt
.endif
.include
___
svn-ports-...@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscr...@freebsd.org"
___
freebsd-bugs@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-bugs
To unsubscribe, send any mail to "freebsd-bugs-unsubscr...@freebsd.org"
