From owner-svn-src-stable-9@freebsd.org Sun Feb 28 10:27:36 2016 Return-Path: Delivered-To: svn-src-stable-9@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A3397AB6189; Sun, 28 Feb 2016 10:27:36 +0000 (UTC) (envelope-from slw@zxy.spb.ru) Received: from zxy.spb.ru (zxy.spb.ru [195.70.199.98]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6756DB67; Sun, 28 Feb 2016 10:27:36 +0000 (UTC) (envelope-from slw@zxy.spb.ru) Received: from slw by zxy.spb.ru with local (Exim 4.86 (FreeBSD)) (envelope-from ) id 1aZyZU-000Ed9-Ta; Sun, 28 Feb 2016 13:27:28 +0300 Date: Sun, 28 Feb 2016 13:27:28 +0300 From: Slawa Olhovchenkov To: Bryan Drewery Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: Re: svn commit: r296146 - stable/9/sys/dev/filemon Message-ID: <20160228102728.GA94639@zxy.spb.ru> References: <201602272057.u1RKvYfF035338@repo.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <201602272057.u1RKvYfF035338@repo.freebsd.org> User-Agent: Mutt/1.5.24 (2015-08-30) X-SA-Exim-Connect-IP: X-SA-Exim-Mail-From: slw@zxy.spb.ru X-SA-Exim-Scanned: No (on zxy.spb.ru); SAEximRunCond expanded to false X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 28 Feb 2016 10:27:36 -0000 On Sat, Feb 27, 2016 at 08:57:34PM +0000, Bryan Drewery wrote: > Author: bdrewery > Date: Sat Feb 27 20:57:34 2016 > New Revision: 296146 > URL: https://svnweb.freebsd.org/changeset/base/296146 > > Log: > MFC r242088: > > Desupport pre-FreeBSD 7.1. > > Modified: > stable/9/sys/dev/filemon/filemon.c > Directory Properties: > stable/9/sys/ (props changed) > stable/9/sys/dev/ (props changed) > -#if __FreeBSD_version < 701000 Not specialy to this commit, just for information: what purpose to have in src tree, already divided to branches, pieces of code under #if? Of couse, question not about external maintained code. From owner-svn-src-stable-9@freebsd.org Sun Feb 28 12:29:44 2016 Return-Path: Delivered-To: svn-src-stable-9@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id DE8DEAA708F; Sun, 28 Feb 2016 12:29:44 +0000 (UTC) (envelope-from brooks@spindle.one-eyed-alien.net) Received: from spindle.one-eyed-alien.net (spindle.one-eyed-alien.net [199.48.129.229]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id BD9001B82; Sun, 28 Feb 2016 12:29:44 +0000 (UTC) (envelope-from brooks@spindle.one-eyed-alien.net) Received: by spindle.one-eyed-alien.net (Postfix, from userid 3001) id BB8845A9F0E; Sun, 28 Feb 2016 12:20:09 +0000 (UTC) Date: Sun, 28 Feb 2016 12:20:09 +0000 From: Brooks Davis To: Slawa Olhovchenkov Cc: Bryan Drewery , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: Re: svn commit: r296146 - stable/9/sys/dev/filemon Message-ID: <20160228122008.GA27425@spindle.one-eyed-alien.net> References: <201602272057.u1RKvYfF035338@repo.freebsd.org> <20160228102728.GA94639@zxy.spb.ru> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="YZ5djTAD1cGYuMQK" Content-Disposition: inline In-Reply-To: <20160228102728.GA94639@zxy.spb.ru> User-Agent: Mutt/1.5.24 (2015-08-30) X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 28 Feb 2016 12:29:45 -0000 --YZ5djTAD1cGYuMQK Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sun, Feb 28, 2016 at 01:27:28PM +0300, Slawa Olhovchenkov wrote: > On Sat, Feb 27, 2016 at 08:57:34PM +0000, Bryan Drewery wrote: >=20 > > Author: bdrewery > > Date: Sat Feb 27 20:57:34 2016 > > New Revision: 296146 > > URL: https://svnweb.freebsd.org/changeset/base/296146 > >=20 > > Log: > > MFC r242088: > > =20 > > Desupport pre-FreeBSD 7.1. > >=20 > > Modified: > > stable/9/sys/dev/filemon/filemon.c > > Directory Properties: > > stable/9/sys/ (props changed) > > stable/9/sys/dev/ (props changed) > > -#if __FreeBSD_version < 701000 >=20 > Not specialy to this commit, just for information: what purpose to > have in src tree, already divided to branches, pieces of code under > #if? >=20 > Of couse, question not about external maintained code. Filemon started as externally maintained code and initially it was a bit ambiguous which direction changes would flow. Sometimes it's also useful to allow code in HEAD to just work when copied to stable so people can see if their problem is fixed without having to merge too much. In general though, we should remove code like this in things maintained entirely in tree. -- Brooks --YZ5djTAD1cGYuMQK Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQEcBAEBAgAGBQJW0uX3AAoJEKzQXbSebgfAlNIIAKCcVI5XPitD/GJoiddzvm2A Kcg7SH0KBA6TkUwMxGqeaW+zzgSgsPqXD1AmNhvpaSexG9Ue5VqsOJoxakajEvAt j5ZE7ypUAq6neNb4gXoNHEmyIH/1fKLsC87QFhkCP49AAi+gga9ywcD0g9df9N+m m9ZOpAJwLRe/NBI1AnKMeNylvCL9jp9u1Cgi7oXOc2SjquemkR90X+KszhH5E/j+ LFRsPdMdoFZ7pg7stQ8QYNHY1rGZ+LsNZb342kK77UgsNYyevi/SEgGdwfVD5zN5 6iuoW1zXrUGppRkey9Z0OPVaEgPVxQimjtQi83ESMYlmA/IFQBx0TO3Gg01+I40= =mXzP -----END PGP SIGNATURE----- --YZ5djTAD1cGYuMQK-- From owner-svn-src-stable-9@freebsd.org Sun Feb 28 12:37:26 2016 Return-Path: Delivered-To: svn-src-stable-9@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B36AAAA7432; Sun, 28 Feb 2016 12:37:26 +0000 (UTC) (envelope-from slw@zxy.spb.ru) Received: from zxy.spb.ru (zxy.spb.ru [195.70.199.98]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 76EA2A9; Sun, 28 Feb 2016 12:37:26 +0000 (UTC) (envelope-from slw@zxy.spb.ru) Received: from slw by zxy.spb.ru with local (Exim 4.86 (FreeBSD)) (envelope-from ) id 1aa0bE-000HNB-62; Sun, 28 Feb 2016 15:37:24 +0300 Date: Sun, 28 Feb 2016 15:37:24 +0300 From: Slawa Olhovchenkov To: Brooks Davis Cc: Bryan Drewery , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: Re: svn commit: r296146 - stable/9/sys/dev/filemon Message-ID: <20160228123724.GC11654@zxy.spb.ru> References: <201602272057.u1RKvYfF035338@repo.freebsd.org> <20160228102728.GA94639@zxy.spb.ru> <20160228122008.GA27425@spindle.one-eyed-alien.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20160228122008.GA27425@spindle.one-eyed-alien.net> User-Agent: Mutt/1.5.24 (2015-08-30) X-SA-Exim-Connect-IP: X-SA-Exim-Mail-From: slw@zxy.spb.ru X-SA-Exim-Scanned: No (on zxy.spb.ru); SAEximRunCond expanded to false X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 28 Feb 2016 12:37:26 -0000 On Sun, Feb 28, 2016 at 12:20:09PM +0000, Brooks Davis wrote: > On Sun, Feb 28, 2016 at 01:27:28PM +0300, Slawa Olhovchenkov wrote: > > On Sat, Feb 27, 2016 at 08:57:34PM +0000, Bryan Drewery wrote: > > > > > Author: bdrewery > > > Date: Sat Feb 27 20:57:34 2016 > > > New Revision: 296146 > > > URL: https://svnweb.freebsd.org/changeset/base/296146 > > > > > > Log: > > > MFC r242088: > > > > > > Desupport pre-FreeBSD 7.1. > > > > > > Modified: > > > stable/9/sys/dev/filemon/filemon.c > > > Directory Properties: > > > stable/9/sys/ (props changed) > > > stable/9/sys/dev/ (props changed) > > > -#if __FreeBSD_version < 701000 > > > > Not specialy to this commit, just for information: what purpose to > > have in src tree, already divided to branches, pieces of code under > > #if? > > > > Of couse, question not about external maintained code. > > Filemon started as externally maintained code and initially it was > a bit ambiguous which direction changes would flow. I.e. historical behaviour. > Sometimes it's also useful to allow code in HEAD to just work when > copied to stable so people can see if their problem is fixed without > having to merge too much. Please, check me: in mostly cases this is equivalent of MFC in one commit (and have same complexity as MFC) but w/o actualy MFC. > In general though, we should remove code like > this in things maintained entirely in tree. Thanks! From owner-svn-src-stable-9@freebsd.org Mon Feb 29 16:44:56 2016 Return-Path: Delivered-To: svn-src-stable-9@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 31786AB7279; Mon, 29 Feb 2016 16:44:56 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) by mx1.freebsd.org (Postfix) with ESMTP id 1556511AF; Mon, 29 Feb 2016 16:44:56 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from mail.xzibition.com (localhost [IPv6:::1]) by freefall.freebsd.org (Postfix) with ESMTP id 0BFC41DDF; Mon, 29 Feb 2016 16:44:56 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from mail.xzibition.com (localhost [172.31.3.2]) by mail.xzibition.com (Postfix) with ESMTP id 8763F1C5E7; Mon, 29 Feb 2016 16:44:55 +0000 (UTC) X-Virus-Scanned: amavisd-new at mail.xzibition.com Received: from mail.xzibition.com ([172.31.3.2]) by mail.xzibition.com (mail.xzibition.com [172.31.3.2]) (amavisd-new, port 10026) with LMTP id egVCx0Xuu0ZQ; Mon, 29 Feb 2016 16:44:51 +0000 (UTC) Subject: Re: svn commit: r296146 - stable/9/sys/dev/filemon DKIM-Filter: OpenDKIM Filter v2.9.2 mail.xzibition.com 84A0F1C5E1 To: Slawa Olhovchenkov , Brooks Davis References: <201602272057.u1RKvYfF035338@repo.freebsd.org> <20160228102728.GA94639@zxy.spb.ru> <20160228122008.GA27425@spindle.one-eyed-alien.net> <20160228123724.GC11654@zxy.spb.ru> Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org From: Bryan Drewery Organization: FreeBSD Message-ID: <56D47581.60802@FreeBSD.org> Date: Mon, 29 Feb 2016 08:44:49 -0800 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.11; rv:38.0) Gecko/20100101 Thunderbird/38.6.0 MIME-Version: 1.0 In-Reply-To: <20160228123724.GC11654@zxy.spb.ru> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: quoted-printable X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 29 Feb 2016 16:44:56 -0000 On 2/28/16 4:37 AM, Slawa Olhovchenkov wrote: > On Sun, Feb 28, 2016 at 12:20:09PM +0000, Brooks Davis wrote: >=20 >> On Sun, Feb 28, 2016 at 01:27:28PM +0300, Slawa Olhovchenkov wrote: >>> On Sat, Feb 27, 2016 at 08:57:34PM +0000, Bryan Drewery wrote: >>> >>>> Author: bdrewery >>>> Date: Sat Feb 27 20:57:34 2016 >>>> New Revision: 296146 >>>> URL: https://svnweb.freebsd.org/changeset/base/296146 >>>> >>>> Log: >>>> MFC r242088: >>>> =20 >>>> Desupport pre-FreeBSD 7.1. >>>> >>>> Modified: >>>> stable/9/sys/dev/filemon/filemon.c >>>> Directory Properties: >>>> stable/9/sys/ (props changed) >>>> stable/9/sys/dev/ (props changed) >>>> -#if __FreeBSD_version < 701000 >>> >>> Not specialy to this commit, just for information: what purpose to >>> have in src tree, already divided to branches, pieces of code under >>> #if? >>> >>> Of couse, question not about external maintained code. >> >> Filemon started as externally maintained code and initially it was >> a bit ambiguous which direction changes would flow. >=20 > I.e. historical behaviour. >=20 >> Sometimes it's also useful to allow code in HEAD to just work when >> copied to stable so people can see if their problem is fixed without >> having to merge too much. >=20 > Please, check me: in mostly cases this is equivalent of MFC in one > commit (and have same complexity as MFC) but w/o actualy MFC. Yes. For example, in the MFC of some filemon changes to stable/10 and stable/9 I had to make this change directly in the MFC that I was not expecting and did not get audited well in SVN: > diff --git a/sys/dev/filemon/filemon_wrapper.c b/sys/dev/filemon/filemo= n_wrapper.c > index a20ece5..d08aa6f 100644 > --- a/sys/dev/filemon/filemon_wrapper.c > +++ b/sys/dev/filemon/filemon_wrapper.c > @@ -424,7 +424,7 @@ filemon_event_process_exit(void *arg __unused, stru= ct proc *p) >=20 > if ((filemon =3D filemon_pid_check(p)) !=3D NULL) { > len =3D snprintf(filemon->msgbufr, sizeof(filemon->msgb= ufr), > - "X %d %d %d\n", p->p_pid, p->p_xexit, p->p_xsig); > + "X %d %d\n", p->p_pid, W_EXITCODE(p->p_xstat, 0)); >=20 > filemon_output(filemon, filemon->msgbufr, len); It is possible to add both versions in head such that the MFC is safe and easy, but it pollutes head and I think it generally should not be don= e. >=20 >> In general though, we should remove code like >> this in things maintained entirely in tree. >=20 > Thanks! >=20 --=20 Regards, Bryan Drewery From owner-svn-src-stable-9@freebsd.org Mon Feb 29 18:55:28 2016 Return-Path: Delivered-To: svn-src-stable-9@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C7DACAB8942; Mon, 29 Feb 2016 18:55:28 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 7A118137A; Mon, 29 Feb 2016 18:55:28 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u1TItRW8054780; Mon, 29 Feb 2016 18:55:27 GMT (envelope-from rene@FreeBSD.org) Received: (from rene@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u1TItRLT054777; Mon, 29 Feb 2016 18:55:27 GMT (envelope-from rene@FreeBSD.org) Message-Id: <201602291855.u1TItRLT054777@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rene set sender to rene@FreeBSD.org using -f From: Rene Ladan Date: Mon, 29 Feb 2016 18:55:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r296219 - in stable/9: . sys/compat/linux sys/sys X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 29 Feb 2016 18:55:28 -0000 Author: rene (doc,ports committer) Date: Mon Feb 29 18:55:27 2016 New Revision: 296219 URL: https://svnweb.freebsd.org/changeset/base/296219 Log: MFC r271982: Bump the default version of the Linux emulation layer to 2.6.18 to support the CentOS 6 ports out of the box. MFC r271990: Add a note to UPDATING Approved by: dchagin Differential Revision: https://reviews.freebsd.org/D5418 Modified: stable/9/UPDATING (contents, props changed) stable/9/sys/compat/linux/linux_mib.c stable/9/sys/sys/param.h Directory Properties: stable/9/sys/ (props changed) Modified: stable/9/UPDATING ============================================================================== --- stable/9/UPDATING Mon Feb 29 18:35:16 2016 (r296218) +++ stable/9/UPDATING Mon Feb 29 18:55:27 2016 (r296219) @@ -30,6 +30,14 @@ Items affecting the ports and packages s sendmail default for client connections has been raised to 1024 bits. +20140922: + At svn r271982, The default linux compat kernel ABI has been adjusted + to 2.6.18 in support of the linux-c6 compat ports infrastructure + update. If you wish to continue using the linux-f10 compat ports, + add compat.linux.osrelease=2.6.16 to your local sysctl.conf. Users are + encouraged to update their linux-compat packages to linux-c6 during + their next update cycle. + 20140717: It is no longer necessary to include the dwarf version in your DEBUG options in your kernel config file. The bug that required it to be Modified: stable/9/sys/compat/linux/linux_mib.c ============================================================================== --- stable/9/sys/compat/linux/linux_mib.c Mon Feb 29 18:35:16 2016 (r296218) +++ stable/9/sys/compat/linux/linux_mib.c Mon Feb 29 18:55:27 2016 (r296219) @@ -129,9 +129,9 @@ struct linux_prison { static struct linux_prison lprison0 = { .pr_osname = "Linux", - .pr_osrelease = "2.6.16", + .pr_osrelease = "2.6.18", .pr_oss_version = 0x030600, - .pr_osrel = 2006016 + .pr_osrel = 2006018 }; static unsigned linux_osd_jail_slot; Modified: stable/9/sys/sys/param.h ============================================================================== --- stable/9/sys/sys/param.h Mon Feb 29 18:35:16 2016 (r296218) +++ stable/9/sys/sys/param.h Mon Feb 29 18:55:27 2016 (r296219) @@ -58,7 +58,7 @@ * in the range 5 to 9. */ #undef __FreeBSD_version -#define __FreeBSD_version 903508 /* Master, propagated to newvers */ +#define __FreeBSD_version 903509 /* Master, propagated to newvers */ /* * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD, From owner-svn-src-stable-9@freebsd.org Mon Feb 29 18:58:27 2016 Return-Path: Delivered-To: svn-src-stable-9@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id EC302AB8AC3; Mon, 29 Feb 2016 18:58:27 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id BC9EA176C; Mon, 29 Feb 2016 18:58:27 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u1TIwQSQ054907; Mon, 29 Feb 2016 18:58:26 GMT (envelope-from rene@FreeBSD.org) Received: (from rene@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u1TIwQ7I054906; Mon, 29 Feb 2016 18:58:26 GMT (envelope-from rene@FreeBSD.org) Message-Id: <201602291858.u1TIwQ7I054906@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rene set sender to rene@FreeBSD.org using -f From: Rene Ladan Date: Mon, 29 Feb 2016 18:58:26 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r296220 - stable/9 X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 29 Feb 2016 18:58:28 -0000 Author: rene (doc,ports committer) Date: Mon Feb 29 18:58:26 2016 New Revision: 296220 URL: https://svnweb.freebsd.org/changeset/base/296220 Log: UPDATING: move the note about the Linux kernel version bump to the top and adjust the date and SVN revision number. Modified: stable/9/UPDATING Modified: stable/9/UPDATING ============================================================================== --- stable/9/UPDATING Mon Feb 29 18:55:27 2016 (r296219) +++ stable/9/UPDATING Mon Feb 29 18:58:26 2016 (r296220) @@ -11,6 +11,14 @@ handbook: Items affecting the ports and packages system can be found in /usr/ports/UPDATING. Please read that file before running portupgrade. +20160229: + At svn r296219, the default linux compat kernel ABI has been adjusted + to 2.6.18 in support of the linux-c6 compat ports infrastructure + update. If you wish to continue using the linux-f10 compat ports, + add compat.linux.osrelease=2.6.16 to your local sysctl.conf. Users are + encouraged to update their linux-compat packages to linux-c6 during + their next update cycle. + 20151026: NTP has been upgraded to 4.2.8p4. The configuration file syntax has been changed, thus mergemaster @@ -30,14 +38,6 @@ Items affecting the ports and packages s sendmail default for client connections has been raised to 1024 bits. -20140922: - At svn r271982, The default linux compat kernel ABI has been adjusted - to 2.6.18 in support of the linux-c6 compat ports infrastructure - update. If you wish to continue using the linux-f10 compat ports, - add compat.linux.osrelease=2.6.16 to your local sysctl.conf. Users are - encouraged to update their linux-compat packages to linux-c6 during - their next update cycle. - 20140717: It is no longer necessary to include the dwarf version in your DEBUG options in your kernel config file. The bug that required it to be From owner-svn-src-stable-9@freebsd.org Wed Mar 2 13:54:45 2016 Return-Path: Delivered-To: svn-src-stable-9@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 75B78ABFC35; Wed, 2 Mar 2016 13:54:45 +0000 (UTC) (envelope-from ae@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 46F2415FE; Wed, 2 Mar 2016 13:54:45 +0000 (UTC) (envelope-from ae@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u22Dsigx024167; Wed, 2 Mar 2016 13:54:44 GMT (envelope-from ae@FreeBSD.org) Received: (from ae@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u22Dsi30024165; Wed, 2 Mar 2016 13:54:44 GMT (envelope-from ae@FreeBSD.org) Message-Id: <201603021354.u22Dsi30024165@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ae set sender to ae@FreeBSD.org using -f From: "Andrey V. Elsukov" Date: Wed, 2 Mar 2016 13:54:44 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r296312 - in stable/9: sbin/ipfw sys/netpfil/ipfw X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Mar 2016 13:54:45 -0000 Author: ae Date: Wed Mar 2 13:54:43 2016 New Revision: 296312 URL: https://svnweb.freebsd.org/changeset/base/296312 Log: MFC r295969: Fix bug in filling and handling ipfw's O_DSCP opcode. Due to integer overflow CS4 token was handled as BE. PR: 207459 Modified: stable/9/sbin/ipfw/ipfw2.c stable/9/sys/netpfil/ipfw/ip_fw2.c Directory Properties: stable/9/sbin/ipfw/ (props changed) stable/9/sys/ (props changed) stable/9/sys/netpfil/ (props changed) Modified: stable/9/sbin/ipfw/ipfw2.c ============================================================================== --- stable/9/sbin/ipfw/ipfw2.c Wed Mar 2 13:38:21 2016 (r296311) +++ stable/9/sbin/ipfw/ipfw2.c Wed Mar 2 13:54:43 2016 (r296312) @@ -779,7 +779,7 @@ fill_dscp(ipfw_insn *cmd, char *av, int errx(EX_DATAERR, "Invalid DSCP value"); } - if (code > 32) + if (code >= 32) *high |= 1 << (code - 32); else *low |= 1 << code; Modified: stable/9/sys/netpfil/ipfw/ip_fw2.c ============================================================================== --- stable/9/sys/netpfil/ipfw/ip_fw2.c Wed Mar 2 13:38:21 2016 (r296311) +++ stable/9/sys/netpfil/ipfw/ip_fw2.c Wed Mar 2 13:54:43 2016 (r296312) @@ -1679,7 +1679,7 @@ do { \ break; /* DSCP bitmask is stored as low_u32 high_u32 */ - if (x > 32) + if (x >= 32) match = *(p + 1) & (1 << (x - 32)); else match = *p & (1 << x);