From owner-svn-src-vendor@freebsd.org Thu Nov 19 22:02:35 2015 Return-Path: Delivered-To: svn-src-vendor@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 C2C97A3370B; Thu, 19 Nov 2015 22:02:35 +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 AEE7A1EBF; Thu, 19 Nov 2015 22:02:35 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from mail.xzibition.com (localhost [IPv6:::1]) by freefall.freebsd.org (Postfix) with ESMTP id A111213F3; Thu, 19 Nov 2015 22:02:35 +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 5F98017605; Thu, 19 Nov 2015 22:02:35 +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 zDfpA6OMCCq5; Thu, 19 Nov 2015 22:02:31 +0000 (UTC) Subject: Re: svn commit: r289720 - in vendor/NetBSD/bmake/dist: . mk unit-tests DKIM-Filter: OpenDKIM Filter v2.9.2 mail.xzibition.com BA59517600 To: "Simon J. Gerraty" , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org References: <201510212214.t9LMENGq030089@repo.freebsd.org> <56280EE6.9050909@FreeBSD.org> From: Bryan Drewery X-Enigmail-Draft-Status: N1110 Organization: FreeBSD Message-ID: <564E46F5.9080505@FreeBSD.org> Date: Thu, 19 Nov 2015 14:02:29 -0800 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.11; rv:38.0) Gecko/20100101 Thunderbird/38.3.0 MIME-Version: 1.0 In-Reply-To: <56280EE6.9050909@FreeBSD.org> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-BeenThere: svn-src-vendor@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the vendor work area tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 19 Nov 2015 22:02:36 -0000 -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA512 On 10/21/15 3:17 PM, Bryan Drewery wrote: > On 10/21/2015 3:14 PM, Simon J. Gerraty wrote: >> +2015-10-12 Simon J. Gerraty + + * var.c: >> the conditional expressions used with ':?' can be + expensive, if >> already discarding do not evaluate or expand + anything. +=20 >> +2015-10-10 Simon J. Gerraty + + * >> Makefile (MAKE_VERSION): 20151010 + Merge with NetBSD make, >> pick up + o Add Boolean wantit flag to Var_Subst and Var_Parse=20 >> + when FALSE we know we are discarding the result and can + >> skip operations like Cmd_Exec. >=20 > Thank you! >=20 > I haven't yet had a chance to try these but I do expect it to be=20 > beneficial for ports. >=20 By the way, I think the changes here to delay evaluating :? fixes or avoids an obscure bug I just ran into as well. > ~/git/freebsd # git diff > targets/pseudo/userland/misc/Makefile.depend diff --git > a/targets/pseudo/userland/misc/Makefile.depend > b/targets/pseudo/userland/misc/Makefile.depend index > 0c98392..7e88956 100644 --- > a/targets/pseudo/userland/misc/Makefile.depend +++ > b/targets/pseudo/userland/misc/Makefile.depend @@ -2,43 +2,49 @@ >=20 > # This file is not autogenerated - take care! >=20 > +.if !defined(MK_FORTH) +.include +.endif + DIRDEPS =3D > \ rescue/librescue \ rescue/rescue \ - sys/boot/ficl \=20 > etc/sendmail \ >=20 > +DIRDEPS.${MK_FORTH}+=3D \ + sys/boot/ficl \ + > sys/boot/forth \ This creates either DIRDEPS.yes or DIRDEPS.no. FreeBSD uses this pattern for SUBDIR now in the main build dirs (bin, sbin, usr.bin, usr.sbin). Adding DIRDEPS support seems trivial enough... > ~/git/freebsd # git diff share/mk/local.dirdeps.mk diff --git > a/share/mk/local.dirdeps.mk b/share/mk/local.dirdeps.mk index > ff4ee18..9b92273 100644 --- a/share/mk/local.dirdeps.mk +++ > b/share/mk/local.dirdeps.mk @@ -104,3 +104,8 @@ > CSU_DIR.${DEP_MACHINE_ARCH} ?=3D csu/${DEP_MACHINE_ARCH} CSU_DIR :=3D > ${CSU_DIR.${DEP_MACHINE_ARCH}} BOOT_MACHINE_DIR:=3D > ${BOOT_MACHINE_DIR.${DEP_MACHINE}} KERNEL_NAME:=3D > ${KERNEL_NAME.${DEP_MACHINE}} + +# Support DIRDEPS.${MK_OPTION}=20 > +.if !empty(DIRDEPS) +DIRDEPS:=3D ${DIRDEPS} ${DIRDEPS.yes} +.endif Now for the bug. Even though this works, it somehow leaves behind a cached value of a non-expanded version that the __depdirs:=3D line uses in dirdeps.mk (with a :?) when DIRDEPS.yes is empty (since MK_FORTH=3Dno here sets DIRDEPS.no instead): > ~/git/freebsd # MK_FORTH=3Dno make -f > targets/pseudo/userland/misc/Makefile.depend -V DIRDEPS make: > "/root/git/freebsd/share/mk/dirdeps.mk" line 495: warning: Missing > closing parenthesis for exists() make: Bad conditional expression > `exists(/root/git/freebsd/${DIRDEPS)' in > exists(/root/git/freebsd/${DIRDEPS)?/root/git/freebsd/${DIRDEPS.yes}: > >=20 rescue/librescue rescue/rescue etc/sendmail sys/boot/i386/boot0 sys/boot/i386/boot0sio sys/boot/i386/boot2 sys/boot/i386/btx/btx sys/boot/i386/btx/btxldr sys/boot/i386/btx/li > b sys/boot/i386/cdboot sys/boot/i386/gptboot > sys/boot/i386/gptzfsboot sys/boot/i386/kgzldr > sys/boot/i386/libfirewire sys/boot/i386/libi386 > sys/boot/i386/loader sys/boot/i386 /mbr sys/boot/i386/pmbr > sys/boot/i386/pxeldr sys/boot/i386/zfsboot > sys/boot/i386/zfsloader sys/boot/efi/libefi > sys/boot/userboot/ficl sys/boot/userboot/libstand sys/boot/use=20 > rboot/test sys/boot/userboot/userboot sys/boot/zfs Note the exists() has a space in it and missing } and is all messed up. The resulting DIRDEPS is proper though and lacks sys/boot/ficl and sys/boot/forth With MK_FORTH=3Dyes (note it does have sys/boot/ficl and sys/boot/forth fine) > ~/git/freebsd # MK_FORTH=3Dyes make -f > targets/pseudo/userland/misc/Makefile.depend -V DIRDEPS=20 > rescue/librescue rescue/rescue etc/sendmail sys/boot/i386/boot0 > sys/boot/i386/boot0sio sys/boot/i386/boot2 sys/boot/i386/btx/btx > sys/boot/i386/btx/btxldr sys/boot/i386/btx/li b > sys/boot/i386/cdboot sys/boot/i386/gptboot > sys/boot/i386/gptzfsboot sys/boot/i386/kgzldr > sys/boot/i386/libfirewire sys/boot/i386/libi386 > sys/boot/i386/loader sys/boot/i386 /mbr sys/boot/i386/pmbr > sys/boot/i386/pxeldr sys/boot/i386/zfsboot > sys/boot/i386/zfsloader sys/boot/efi/libefi > sys/boot/userboot/ficl sys/boot/userboot/libstand sys/boot/use=20 > rboot/test sys/boot/userboot/userboot sys/boot/zfs sys/boot/ficl > sys/boot/forth Now with a newer bmake which has no errors: > ~/git/freebsd # MK_FORTH=3Dno usr.bin/bmake/make -f > targets/pseudo/userland/misc/Makefile.depend -V DIRDEPS=20 > rescue/librescue rescue/rescue etc/sendmail sys/boot/i386/boot0 > sys/boot/i386/boot0sio sys/boot/i386/boot2 sys/boot/i386/btx/btx > sys/boot/i386/btx/btxldr sys/boot/i386/btx/li b > sys/boot/i386/cdboot sys/boot/i386/gptboot > sys/boot/i386/gptzfsboot sys/boot/i386/kgzldr > sys/boot/i386/libfirewire sys/boot/i386/libi386 > sys/boot/i386/loader sys/boot/i386 /mbr sys/boot/i386/pmbr > sys/boot/i386/pxeldr sys/boot/i386/zfsboot > sys/boot/i386/zfsloader sys/boot/efi/libefi sys/boot/zfs > ~/git/freebsd # MK_FORTH=3Dyes usr.bin/bmake/make -f > targets/pseudo/userland/misc/Makefile.depend -V DIRDEPS=20 > rescue/librescue rescue/rescue etc/sendmail sys/boot/i386/boot0 > sys/boot/i386/boot0sio sys/boot/i386/boot2 sys/boot/i386/btx/btx > sys/boot/i386/btx/btxldr sys/boot/i386/btx/li b > sys/boot/i386/cdboot sys/boot/i386/gptboot > sys/boot/i386/gptzfsboot sys/boot/i386/kgzldr > sys/boot/i386/libfirewire sys/boot/i386/libi386 > sys/boot/i386/loader sys/boot/i386 /mbr sys/boot/i386/pmbr > sys/boot/i386/pxeldr sys/boot/i386/zfsboot > sys/boot/i386/zfsloader sys/boot/efi/libefi sys/boot/zfs > sys/boot/ficl sys/boot/forth - --=20 Regards, Bryan Drewery -----BEGIN PGP SIGNATURE----- Comment: GPGTools - https://gpgtools.org iQEcBAEBCgAGBQJWTkb1AAoJEDXXcbtuRpfPIYoH/2Gbu7/dTUEXpIueJuD73ZYH PGMktZWsJzDUdQyKKQ+rGakBDmxDylEnXVo1G+RaCDlsLYzujacDE82JB86w005a H2edxlTCI1A9ZZ/BZAt8XgESLQOMyAM2xnRt1Hgl31zGVacjjpwkz8URVK5ut+cx JJkN34X5LOzX3PGawIkgTXks7ZS+9Y38GW26DJsOujS6rzGWFjm3t9A+vVVvuPt8 jXxD0i977xjuqyVpRD36UG901SOij2U0aTdx1tQ6o8R6CfT0PfKEC8RgsPs4vh5X dHYsdlnTJWntMNpaJyO+NB+1ClOr79lrBpVt+Iiatsx2Ys8aH6wOk/8sczkpZxg=3D =3Dz55G -----END PGP SIGNATURE----- From owner-svn-src-vendor@freebsd.org Thu Nov 19 22:04:31 2015 Return-Path: Delivered-To: svn-src-vendor@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 ED83DA337CC; Thu, 19 Nov 2015 22:04:31 +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 DA546108D; Thu, 19 Nov 2015 22:04:31 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from mail.xzibition.com (localhost [IPv6:::1]) by freefall.freebsd.org (Postfix) with ESMTP id D1C461568; Thu, 19 Nov 2015 22:04:31 +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 9A7D917626; Thu, 19 Nov 2015 22:04:31 +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 ncDHQpl0ZuQb; Thu, 19 Nov 2015 22:04:29 +0000 (UTC) Subject: Re: svn commit: r289720 - in vendor/NetBSD/bmake/dist: . mk unit-tests DKIM-Filter: OpenDKIM Filter v2.9.2 mail.xzibition.com E5BB21761D To: "Simon J. Gerraty" , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org References: <201510212214.t9LMENGq030089@repo.freebsd.org> <56280EE6.9050909@FreeBSD.org> <564E46F5.9080505@FreeBSD.org> From: Bryan Drewery Organization: FreeBSD Message-ID: <564E476C.7070107@FreeBSD.org> Date: Thu, 19 Nov 2015 14:04:28 -0800 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.11; rv:38.0) Gecko/20100101 Thunderbird/38.3.0 MIME-Version: 1.0 In-Reply-To: <564E46F5.9080505@FreeBSD.org> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-BeenThere: svn-src-vendor@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the vendor work area tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 19 Nov 2015 22:04:32 -0000 -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA512 On 11/19/15 2:02 PM, Bryan Drewery wrote: > On 10/21/15 3:17 PM, Bryan Drewery wrote: Thunderbird totally destroyed any reasonable formatting here. Hopefully it still makes sense. - -- Regards, Bryan Drewery -----BEGIN PGP SIGNATURE----- Comment: GPGTools - https://gpgtools.org iQEcBAEBCgAGBQJWTkdsAAoJEDXXcbtuRpfPzxEH/2J1LJEJYFk+oHDxdtpSK8ev zrtOz5Kq+ebQ1/rc6kk3Z5HmYPsctWVH5k0l9PqzEmAxu4xs2yoSJIxMMeuitKZv zk6zt87jtabL2NrWPnn3Jzls9H7wU0j4fACutZ5GrigLURAPCncaIYYGlNFxSnr3 R6ZlTAH0govP48haJ8iWCdJ9diaTCTMhwEydO8/HS8WysWBgWs9oXSFONBOOc2gC hUBh6LMNnqdr1cLyXTs7VUyy9q3O+9piniCxlALsTUlXJz5z54KTm/aHv5BX/P3G nS9McHH6lt0WhQpJAQugzDK4oyTpTMjXq2r542zfN0ps8LokRoyqgFZ/evz7u+w= =9Ii5 -----END PGP SIGNATURE----- From owner-svn-src-vendor@freebsd.org Thu Nov 19 22:20:55 2015 Return-Path: Delivered-To: svn-src-vendor@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 406F0A33BA9; Thu, 19 Nov 2015 22:20:55 +0000 (UTC) (envelope-from sjg@juniper.net) Received: from na01-bn1-obe.outbound.protection.outlook.com (mail-bn1on0145.outbound.protection.outlook.com [157.56.110.145]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (Client CN "mail.protection.outlook.com", Issuer "MSIT Machine Auth CA 2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 533241DAC; Thu, 19 Nov 2015 22:20:50 +0000 (UTC) (envelope-from sjg@juniper.net) Received: from BY1PR0501CA0019.namprd05.prod.outlook.com (10.162.139.29) by DM2PR0501MB1392.namprd05.prod.outlook.com (10.161.224.139) with Microsoft SMTP Server (TLS) id 15.1.325.17; Thu, 19 Nov 2015 22:20:43 +0000 Received: from BL2FFO11FD018.protection.gbl (2a01:111:f400:7c09::115) by BY1PR0501CA0019.outlook.office365.com (2a01:111:e400:4821::29) with Microsoft SMTP Server (TLS) id 15.1.331.20 via Frontend Transport; Thu, 19 Nov 2015 22:20:42 +0000 Authentication-Results: spf=softfail (sender IP is 66.129.239.17) smtp.mailfrom=juniper.net; FreeBSD.org; dkim=none (message not signed) header.d=none;FreeBSD.org; dmarc=none action=none header.from=juniper.net; Received-SPF: SoftFail (protection.outlook.com: domain of transitioning juniper.net discourages use of 66.129.239.17 as permitted sender) Received: from p-emfe01a-sac.jnpr.net (66.129.239.17) by BL2FFO11FD018.mail.protection.outlook.com (10.173.161.36) with Microsoft SMTP Server (TLS) id 15.1.331.11 via Frontend Transport; Thu, 19 Nov 2015 22:20:41 +0000 Received: from magenta.juniper.net (172.17.27.123) by p-emfe01a-sac.jnpr.net (172.24.192.21) with Microsoft SMTP Server (TLS) id 14.3.123.3; Thu, 19 Nov 2015 14:20:38 -0800 Received: from chaos.jnpr.net (chaos.jnpr.net [172.21.16.28]) by magenta.juniper.net (8.11.3/8.11.3) with ESMTP id tAJMKYD98404; Thu, 19 Nov 2015 14:20:36 -0800 (PST) (envelope-from sjg@juniper.net) Received: from chaos (localhost [IPv6:::1]) by chaos.jnpr.net (Postfix) with ESMTP id DCC0D580A9; Thu, 19 Nov 2015 14:20:33 -0800 (PST) To: Bryan Drewery CC: , , , Subject: Re: svn commit: r289720 - in vendor/NetBSD/bmake/dist: . mk unit-tests In-Reply-To: <564E476C.7070107@FreeBSD.org> References: <201510212214.t9LMENGq030089@repo.freebsd.org> <56280EE6.9050909@FreeBSD.org> <564E46F5.9080505@FreeBSD.org> <564E476C.7070107@FreeBSD.org> Comments: In-reply-to: Bryan Drewery message dated "Thu, 19 Nov 2015 14:04:28 -0800." From: "Simon J. Gerraty" X-Mailer: MH-E 8.6; nmh 1.6; GNU Emacs 24.5.1 MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-ID: <2992.1447971633.1@chaos> Date: Thu, 19 Nov 2015 14:20:33 -0800 Message-ID: <15252.1447971633@chaos> X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11FD018; 1:CsjABLO6HjLuwR7eISOT+dRVACoDC2DQ237y796LJDK7LYYAsxZq+0SI/bpp2eSyoL9p7sR9msB4+qluKeIvoPAzvRRd0nay4G+TIdHjonO3gZcpHWRn9cv4Ti3g0xj+jBBAoG3bqO9VetsM6YqM0GsXC0CfWBv2fc02rlaA2Dy+i2Nz0wmnMlDxtws20u8SkI1JV6/GJSSgKQWsv0U6+nvfhjqXVcGr0KOjpMQY/o5I3bz87p2S4xAr/uO/kmVP1ZcE2jMKdf2Llhdj6w6KZitW9JYaoZKB5XfPHwG1bqrX2jXOeG/f6W/tUOv5U6u1z9aEK4TmNk9aG45F9k1umIXCwikZDpGfQheftEU+L/Y= X-Forefront-Antispam-Report: CIP:66.129.239.17; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10019020)(6009001)(2980300002)(479174004)(199003)(24454002)(189002)(377454003)(97756001)(33716001)(50226001)(86362001)(107886002)(5001920100001)(5007970100001)(105596002)(23726002)(50986999)(5008740100001)(57986006)(117636001)(76506005)(87936001)(106466001)(76176999)(5001960100002)(586003)(6806005)(92566002)(50466002)(110136002)(450100001)(558084003)(19580395003)(93886004)(46406003)(77096005)(4001430100002)(69596002)(81156007)(2950100001)(97736004)(47776003)(19580405001)(189998001)(42262002)(62816006); DIR:OUT; SFP:1102; SCL:1; SRVR:DM2PR0501MB1392; H:p-emfe01a-sac.jnpr.net; FPR:; SPF:SoftFail; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; DM2PR0501MB1392; 2:2w4pLaudB46a/XHXNI+leGXJJvgZsXQfzF4mdFQNyBz2zqan5XoyuSixapaJbETNcc8Kf9a0Yfqwps+mIpEj0SNBhqsB3li4rLlrvDplQYhaFLprkbfyEhpIFUtnpLHIuxoIc9+9t+o7vgOOPIcD2jjD3l7VG79dT2UJgDbOy8I=; 3:7mhEJs527VrcdKV1cPdkWkM7z95SXVLKYer0oN+HBvO8rcfmhBRX3pU2KlKveqWCQRhASBjL8aue2PKCGtsbzu6BvcHtXD//PAKgoTd6tz9JxogyIQdO7zQqw51KmGZgFUALv73LoCBlN9dMcS3fHlb9zeYe0UW0P1guN0iI/WZ7f1DYCcqxiWMSMxoU2CGjdicZoDN7dsKSVSmAIyF64kl1HVw35bIRUlVy2c+hLsc=; 25:fS1DvA7PA9J6R5iTzCuuI7F9dk7TKE9bRl0Lx11CgVwMJusFnvlFXpe8PYZ657SaesOuIIPgVkRIY07G/nyFTownKc6HLftSra41Y61zrlLtbkr4XuLO9UMJdA1PB0T8jQbr8qs3ZAbnaI65sE/nmFYDH6uz1lA4wKCfyV/XM+vWJzBIRqI6UEMUkS4cCiUG6GZl9XVCp4lJRV86GquFr3Kb4xsjV8oIFsgl+BtalkFjETXizMqUHfOWJ6v0SyxbXZHP1d4SYinsOZFoq4rKgA== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:DM2PR0501MB1392; X-Microsoft-Exchange-Diagnostics: 1; DM2PR0501MB1392; 20:h24FPekltYMSNanQei8EaPn9yxVV9Qd58XBgR6LR4IheNDXN1v2VNCRw7L2FpdQY2St6CSUYgGlE5KqTRaNb+aE8N8UdBNzYBwK2WVDaLSOXnl6OBWPgnes057zZfdeYnoOgZm7bJioD1izWMh0lEsryZ1Sl8QOs/H9jHwT0hNvDnfZ8P2c3/MHSqnJ/af61IBBSKJyzKhI/VTdyz6fExWoo5cGVL2wKK2lw5NjCf11u+UbDwmZr18NTnXWTJgNKchb5oBVNsr/v1qONGOVJ01CjBJbgbXBByOS34T4pR2VjtjdbTCrksWS49LKBpvs8hNddPFHZeJM5m1oWm9wJSZNsK4YMtFXtDntHlBLruDL1EZ+SVpjOwQXZGcTFqQ6aud88m3xyi7+uT3VSFDOeKT6hykCLrrP6HamClpvU+X+/exiqLGP0VV07AqXwEmn7cycrmT2T97jogLT+hfc1/S944tYQfjE1JPlNMGc8UNOnevVF3YLj72dG1HXCeyJB; 4:H2Xa6gXhlPOZm0HxU+GvSwTCi1J42bjNtp0+hN0EEKBDrUc5UiyVVmtT9qBJ0n26U0QW7x33mAE1ZpeWdxHKeP0jj/3kblt2VpvV3dxLm4MCn1UmhFtt8KFh11UL72M4fODnZVBRJPk8KFa9fvTMq4+IfvpzU6gRV+FCb7VwLoGFZ6QjWflZSju7IZbdo2n7QSNnVBkH0JICQEIRnI4zQCSBL3hDKf43Wtmjbnl7qaVGfBTsHRzxf1ourbD2K2eoSBVSmEyfecT7JOPIHkoL85ZRtU/eFYeiOwCJt/X7/78KswBlsgtRZYW3YU2EebMlCVqSRBmxw9k93qyKOdvYRNdeohACxSsXVxWluXHcE7x5RU5gBcG7b3/hhFopkCi1 X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(8121501046)(520078)(5005006)(10201501046)(3002001); SRVR:DM2PR0501MB1392; BCL:0; PCL:0; RULEID:; SRVR:DM2PR0501MB1392; X-Forefront-PRVS: 07658B8EA3 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM2PR0501MB1392; 23:QYLhxu4dLOMzy4nyeBr5DFIOcfKVVoB0b9RXhph?= =?us-ascii?Q?qXyn3esh+lCxDdZ3AmkzHGpl3j6DtaYqsnWnsAoi5jIghDpA12aIcWwzgy3C?= =?us-ascii?Q?Z/T9UC35dGZnFHp8qxLB4nlqNZ7MJtUu7i4oGWdoANI/BFR7UbC+e6KHVy4u?= =?us-ascii?Q?BSgppXuW2J+gqw0n4e3zpEL4LO1H1hDxzD9WaWMEfVc63utKgEHmezb5BHLq?= =?us-ascii?Q?sZsQyceOCH9BAh0PlVhvsb+yns2uoQU9qW2okLg+bfIJg1O0pDEfG9O98SOi?= =?us-ascii?Q?JhJ+zP3z7UzGDq3jwrg5pzCGO3Jr+7bbBWsfd6rUh5nmXupnXi5y+RiK/JXf?= =?us-ascii?Q?MBmgoB68mGvYzPHNacw7GnjLsF3fYH3nTOf4rZPCFGV0djayOrJ/dpczt8wi?= =?us-ascii?Q?usOyVy50EtjPKcvnAJYHryc7CX95E5mHo2ZziBWj87JNTIdwgzxnY6ZHlRnR?= =?us-ascii?Q?X+DxN83zGiDEUQ5J3UtrgJKKChQbQwvrTvoH4vH0as16MPbbYbSVss0JaY/E?= =?us-ascii?Q?Z/lv78BuA9RP/1m2P6sLZDh8zPPA+On1mgyg9dyUOF7BHK2DM41Aoo2q5uQo?= =?us-ascii?Q?DYhQOjh1FadtgHs9QZV5/lG7SerPgyhFsx3OFAvrI/8IA/bMG4ii+BgFXnIO?= =?us-ascii?Q?YJBbHUJ8NmgXiajTuI/nhVyDlDEpRfBSl+ddWEUcatZFWzRWaspxTSSfHDab?= =?us-ascii?Q?rq9bGlR0ydfDf/WgWI8dNNhf6xr2E5QP0aAJzAg/8xtgS712bO4pOpFzpZNM?= =?us-ascii?Q?+zK0jNHWt+4rpAvdFeTzQSb+6RW6OFftCnfQiWXBZ7xiMwBhiVqQf+u3PCqO?= =?us-ascii?Q?7nRk+O/2/zHpfK1htGDaFS0tC5qYaYbxJ7Mf/O/nkDRiPzhRfKQw7fmChVMM?= =?us-ascii?Q?X0+zfgfuEqQZSDUn/+VbDV7vqcDBNuYBivmBbXIEVG/xTFhc84TwypLs4vee?= =?us-ascii?Q?QF/G/dyhkYe5e+gqOt8mTqESOyAF3a0bNGqDVfFJizE9+vbiuOnPIxxf10JI?= =?us-ascii?Q?rrjsasmnicYzgtrpuS8C1J/41CUZ1EVTvVuhcgEUtR3L1xwLYcNJGCvAeaKA?= =?us-ascii?Q?6GOqgNDbHcfrr+5aL34pDlXHZagnFRsVX/zJtZXYLL06RC/LlkezYE7UUzNv?= =?us-ascii?Q?LyfxURV1GgG+jElZqSq3oEkZwOfZHrlJFOKVq5DhUbuku6FOl4SmCyQuL+T4?= =?us-ascii?Q?vcPXdbii+jXMPkuEOmLyBiwV6pXX3rZuyadnIzuGNKnfxFJ0Rvjd0/oaC2A?= =?us-ascii?Q?=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; DM2PR0501MB1392; 5:rR0klJs9DASz1NNT3/U8hZ55O4tq27ZzN9F21/0ya5HtMiM51nhYyGlPKjeCREXbO+n7yp3lEnoStEmh+KRbrHfKuAIGZsLFR4VR+rykko1sTXh67Aci2u9i6FzAmWoLxHiA/L0qI0c3VvuCVY/ZUw==; 24:y4JZLQD0POBAiZ1VM36senAQmlU+WTXAUgYCHABMMiRLK2AdMsdbOj9B11uzzAMe/xI2/JJWdTglqbIj10I0XV+d2KGUo4iXSr1SZDdoXqQ=; 20:oW7xmKUirRvO+kHHk+8oCBdez889CtZUZ2RtZ/lM4jmutWo6lSr7BjENO+R1Vomr+Im59MtdjFsy8IVzs5vUpA== SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: juniper.net X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Nov 2015 22:20:41.4422 (UTC) X-MS-Exchange-CrossTenant-Id: bea78b3c-4cdb-4130-854a-1d193232e5f4 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=bea78b3c-4cdb-4130-854a-1d193232e5f4; Ip=[66.129.239.17]; Helo=[p-emfe01a-sac.jnpr.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM2PR0501MB1392 X-BeenThere: svn-src-vendor@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the vendor work area tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 19 Nov 2015 22:20:55 -0000 Bryan Drewery wrote: > On 11/19/15 2:02 PM, Bryan Drewery wrote: > > On 10/21/15 3:17 PM, Bryan Drewery wrote: > > Thunderbird totally destroyed any reasonable formatting here. > Hopefully it still makes sense. Yes. Should probably work out how to MFC latest bmake to stable/10 From owner-svn-src-vendor@freebsd.org Sat Nov 21 06:52:09 2015 Return-Path: Delivered-To: svn-src-vendor@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 70FDEA34DFF; Sat, 21 Nov 2015 06:52:09 +0000 (UTC) (envelope-from delphij@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 29E091E3E; Sat, 21 Nov 2015 06:52:09 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tAL6q8Is098479; Sat, 21 Nov 2015 06:52:08 GMT (envelope-from delphij@FreeBSD.org) Received: (from delphij@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tAL6q6Xb098465; Sat, 21 Nov 2015 06:52:06 GMT (envelope-from delphij@FreeBSD.org) Message-Id: <201511210652.tAL6q6Xb098465@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: delphij set sender to delphij@FreeBSD.org using -f From: Xin LI Date: Sat, 21 Nov 2015 06:52:06 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org Subject: svn commit: r291123 - in vendor/xz/dist: . src/common src/liblzma/api src/liblzma/api/lzma src/liblzma/common src/liblzma/lz src/liblzma/lzma src/xz X-SVN-Group: vendor MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-vendor@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the vendor work area tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 21 Nov 2015 06:52:09 -0000 Author: delphij Date: Sat Nov 21 06:52:06 2015 New Revision: 291123 URL: https://svnweb.freebsd.org/changeset/base/291123 Log: Vendor import of xz-5.2.2 (trimmed). Modified: vendor/xz/dist/ChangeLog vendor/xz/dist/THANKS vendor/xz/dist/src/common/tuklib_physmem.c vendor/xz/dist/src/liblzma/api/lzma.h vendor/xz/dist/src/liblzma/api/lzma/version.h vendor/xz/dist/src/liblzma/common/index.c vendor/xz/dist/src/liblzma/lz/lz_encoder.c vendor/xz/dist/src/liblzma/lzma/lzma_encoder.c vendor/xz/dist/src/xz/args.h vendor/xz/dist/src/xz/file_io.c vendor/xz/dist/src/xz/main.c vendor/xz/dist/src/xz/message.c vendor/xz/dist/src/xz/options.c vendor/xz/dist/src/xz/xz.1 Modified: vendor/xz/dist/ChangeLog ============================================================================== --- vendor/xz/dist/ChangeLog Sat Nov 21 06:03:46 2015 (r291122) +++ vendor/xz/dist/ChangeLog Sat Nov 21 06:52:06 2015 (r291123) @@ -1,3 +1,313 @@ +commit 9815cdf6987ef91a85493bfcfd1ce2aaf3b47a0a +Author: Lasse Collin +Date: 2015-09-29 13:59:35 +0300 + + Bump version and soname for 5.2.2. + + src/liblzma/Makefile.am | 2 +- + src/liblzma/api/lzma/version.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit cbe0cec8476bdd0416c7ca9bc83895c9bea1cf78 +Author: Lasse Collin +Date: 2015-09-29 13:57:28 +0300 + + Update NEWS for 5.2.2. + + NEWS | 18 ++++++++++++++++++ + 1 file changed, 18 insertions(+) + +commit 49427ce7eececdd18bbd35dab23c81910d083e1c +Author: Andre Noll +Date: 2015-05-28 15:50:00 +0200 + + Fix typo in German translation. + + As pointed out by Robert Pollak, there's a typo in the German + translation of the compression preset option (-0 ... -9) help text. + "The compressor" translates to "der Komprimierer", and the genitive + form is "des Komprimierers". The old word makes no sense at all. + + po/de.po | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 608d6f06c940e7f28c25de005e8b99bdff42d27c +Author: Hauke Henningsen +Date: 2015-08-17 04:59:54 +0200 + + Update German translation, mostly wrt orthography + + Provide an update of the German translation. + * A lot of compound words were previously written with spaces, while + German orthography is relatively clear in that the components + should not be separated. + * When referring to the actual process of (de)compression rather than the + concept, replace “(De-)Kompression” with “(De-)Komprimierung”. + Previously, both forms were used in this context and are now used in a + manner consistent with “Komprimierung” being more likely to refer to + a process. + * Consistently translate “standard input”/“output” + * Use “Zeichen” instead of false friend “Charakter” for “character” + * Insert commas around relative clauses (as required in German) + * Some other minor corrections + * Capitalize “ß” as “ẞ” + * Consistently start option descriptions in --help with capital letters + + Acked-By: Andre Noll + + * Update after msgmerge + + po/de.po | 383 ++++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 196 insertions(+), 187 deletions(-) + +commit c8988414e5b67b8ef2fe0ba7b1ccdd0ec73c60d3 +Author: Lasse Collin +Date: 2015-08-11 13:23:04 +0300 + + Build: Minor Cygwin cleanup. + + Some tests used "cygwin*" and some used "cygwin". I changed + them all to use "cygwin". Shouldn't affect anything in practice. + + configure.ac | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 85a6dfed53477906bfe9a7c0123dd412e391cb48 +Author: Lasse Collin +Date: 2015-08-11 13:21:52 +0300 + + Build: Support building of MSYS2 binaries. + + configure.ac | 16 +++++++++++----- + 1 file changed, 11 insertions(+), 5 deletions(-) + +commit 77f270be8432df2e4516a0c48814b6976d6618c5 +Author: Lasse Collin +Date: 2015-08-09 21:06:26 +0300 + + Windows: Define DLL_EXPORT when building liblzma.dll with MSVC. + + src/liblzma/common/common.h uses it to set __declspec(dllexport) + for the API symbols. + + Thanks to Adam Walling. + + windows/liblzma_dll.vcxproj | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +commit 8c975446c5903090a5a8493b5b96b71003056a88 +Author: Lasse Collin +Date: 2015-08-09 21:02:20 +0300 + + Windows: Omit unneeded header files from MSVC project files. + + windows/liblzma.vcxproj | 5 ----- + windows/liblzma_dll.vcxproj | 5 ----- + 2 files changed, 10 deletions(-) + +commit 119a00434954726ca58e4a578e6469f530fca30e +Author: Lasse Collin +Date: 2015-07-12 20:48:19 +0300 + + liblzma: A MSVC-specific hack isn't needed with MSVC 2013 and newer. + + src/liblzma/api/lzma.h | 18 +++++++++++++----- + 1 file changed, 13 insertions(+), 5 deletions(-) + +commit d4e7c557fcab353539c9481a8d95cb04bcb15c7c +Author: Lasse Collin +Date: 2015-06-19 20:38:55 +0300 + + Update THANKS. + + THANKS | 2 ++ + 1 file changed, 2 insertions(+) + +commit 98001740ca56c894a7bd32eb47e9857a8a7d878d +Author: Lasse Collin +Date: 2015-06-19 20:21:30 +0300 + + Windows: Update the docs. + + INSTALL | 29 ++++++---- + windows/INSTALL-MSVC.txt | 47 +++++++++++++++ + windows/INSTALL-MinGW.txt | 138 ++++++++++++++++++++++++++++++++++++++++++++ + windows/INSTALL-Windows.txt | 138 -------------------------------------------- + 4 files changed, 204 insertions(+), 148 deletions(-) + +commit 28195e4c877007cc760ecea1d17f740693d66873 +Author: Lasse Collin +Date: 2015-06-19 17:25:31 +0300 + + Windows: Add MSVC project files for building liblzma. + + Thanks to Adam Walling for creating these files. + + windows/liblzma.vcxproj | 359 ++++++++++++++++++++++++++++++++++++++++ + windows/liblzma_dll.vcxproj | 388 ++++++++++++++++++++++++++++++++++++++++++++ + windows/xz_win.sln | 48 ++++++ + 3 files changed, 795 insertions(+) + +commit 960440f3230dc628f6966d9f7614fc1b28baf44e +Author: Lasse Collin +Date: 2015-05-13 20:57:55 +0300 + + Tests: Fix a memory leak in test_bcj_exact_size. + + Thanks to Cristian Rodríguez. + + tests/test_bcj_exact_size.c | 1 + + 1 file changed, 1 insertion(+) + +commit 68cd35acafbdcdf4e8ea8b5bb843c736939d6f8b +Author: Lasse Collin +Date: 2015-05-12 18:08:24 +0300 + + Fix NEWS about threading in 5.2.0. + + Thanks to Andy Hochhaus. + + NEWS | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit ff96ed6d25786728356017a13baf8c14731b4f1e +Author: Lasse Collin +Date: 2015-05-11 21:26:16 +0300 + + xz: Document that threaded decompression hasn't been implemented yet. + + src/xz/xz.1 | 10 +++++++++- + 1 file changed, 9 insertions(+), 1 deletion(-) + +commit 00d37b64a64ea8597fd2422d5187afd761ab9531 +Author: Lasse Collin +Date: 2015-04-20 20:20:29 +0300 + + Update THANKS. + + THANKS | 1 + + 1 file changed, 1 insertion(+) + +commit db190a832c49ca3aed6d69cc992fa5583cae7b11 +Author: Lasse Collin +Date: 2015-04-20 19:59:18 +0300 + + Revert "xz: Use pipe2() if available." + + This reverts commit 7a11c4a8e5e15f13d5fa59233b3172e65428efdd. + It is a problem when libc has pipe2() but the kernel is too + old to have pipe2() and thus pipe2() fails. In xz it's pointless + to have a fallback for non-functioning pipe2(); it's better to + avoid pipe2() completely. + + Thanks to Michael Fox for the bug report. + + configure.ac | 4 ++-- + src/xz/file_io.c | 9 +-------- + 2 files changed, 3 insertions(+), 10 deletions(-) + +commit eccd8155e107c5ada03d13e7730675cdf1a44ddc +Author: Lasse Collin +Date: 2015-03-29 22:14:47 +0300 + + Update THANKS. + + THANKS | 1 + + 1 file changed, 1 insertion(+) + +commit 25263fd9e7a8a913395cb93d7c104cd48c2b4a00 +Author: Lasse Collin +Date: 2015-03-29 22:13:48 +0300 + + Fix the detection of installed RAM on QNX. + + The earlier version compiled but didn't actually work + since sysconf(_SC_PHYS_PAGES) always fails (or so I was told). + + Thanks to Ole André Vadla Ravnås for the patch and testing. + + m4/tuklib_physmem.m4 | 6 +++--- + src/common/tuklib_physmem.c | 14 +++++++++++++- + 2 files changed, 16 insertions(+), 4 deletions(-) + +commit 4c544d2410903d38402221cb783ed85585b6a007 +Author: Lasse Collin +Date: 2015-03-27 22:39:07 +0200 + + Fix CPU core count detection on QNX. + + It tried to use sysctl() on QNX but + - it broke the build because sysctl() needs -lsocket on QNX; + - sysctl() doesn't work for detecting the core count on QNX + even if it compiled. + + sysconf() works. An alternative would have been to use + QNX-specific SYSPAGE_ENTRY(num_cpu) from . + + Thanks to Ole André Vadla Ravnås. + + m4/tuklib_cpucores.m4 | 15 +++++++++++---- + 1 file changed, 11 insertions(+), 4 deletions(-) + +commit e0ea6737b03e83ccaff4514d00e31bb926f8f0f3 +Author: Lasse Collin +Date: 2015-03-07 22:05:57 +0200 + + xz: size_t/uint32_t cleanup in options.c. + + src/xz/options.c | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +commit 8bcca29a65335fd679c13814b70b35b68fa5daed +Author: Lasse Collin +Date: 2015-03-07 22:04:23 +0200 + + xz: Fix a comment and silence a warning in message.c. + + src/xz/message.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit f243f5f44c6b19a7c289a0ec73a03ee08364cb5b +Author: Lasse Collin +Date: 2015-03-07 22:01:00 +0200 + + liblzma: Silence more uint32_t vs. size_t warnings. + + src/liblzma/lz/lz_encoder.c | 2 +- + src/liblzma/lzma/lzma_encoder.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit 7f0a4c50f4a374c40acf4b86848f301ad1e82d34 +Author: Lasse Collin +Date: 2015-03-07 19:54:00 +0200 + + xz: Make arg_count an unsigned int to silence a warning. + + Actually the value of arg_count cannot exceed INT_MAX + but it's nicer as an unsigned int. + + src/xz/args.h | 2 +- + src/xz/main.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit f6ec46801588b1be29c07c9db98558b521304002 +Author: Lasse Collin +Date: 2015-03-07 19:33:17 +0200 + + liblzma: Fix a warning in index.c. + + src/liblzma/common/index.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit a24518971cc621315af142dd3bb7614fab04ad27 +Author: Lasse Collin +Date: 2015-02-26 20:46:14 +0200 + + Build: Fix a CR+LF problem when running autoreconf -fi on OS/2. + + build-aux/version.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + commit dec11497a71518423b5ff0e759100cf8aadf6c7b Author: Lasse Collin Date: 2015-02-26 16:53:44 +0200 Modified: vendor/xz/dist/THANKS ============================================================================== --- vendor/xz/dist/THANKS Sat Nov 21 06:03:46 2015 (r291122) +++ vendor/xz/dist/THANKS Sat Nov 21 06:52:06 2015 (r291123) @@ -21,6 +21,7 @@ has been important. :-) In alphabetical - Milo Casagrande - Marek Černocký - Tomer Chachamu + - Gabi Davar - Chris Donawa - Andrew Dudman - Markus Duft @@ -29,6 +30,7 @@ has been important. :-) In alphabetical - Gilles Espinasse - Denis Excoffier - Michael Felt + - Michael Fox - Mike Frysinger - Daniel Richard G. - Bill Glessner @@ -74,6 +76,7 @@ has been important. :-) In alphabetical - Mikko Pouru - Trần Ngọc Quân - Pavel Raiskup + - Ole André Vadla Ravnås - Robert Readman - Bernhard Reutner-Fischer - Eric S. Raymond @@ -95,6 +98,7 @@ has been important. :-) In alphabetical - Alexey Tourbin - Patrick J. Volkerding - Martin Väth + - Adam Walling - Christian Weisgerber - Bert Wesarg - Fredrik Wikstrom Modified: vendor/xz/dist/src/common/tuklib_physmem.c ============================================================================== --- vendor/xz/dist/src/common/tuklib_physmem.c Sat Nov 21 06:03:46 2015 (r291122) +++ vendor/xz/dist/src/common/tuklib_physmem.c Sat Nov 21 06:52:06 2015 (r291123) @@ -37,7 +37,10 @@ # define __USE_INLINE__ # include -// AIX +#elif defined(__QNX__) +# include +# include + #elif defined(TUKLIB_PHYSMEM_AIX) # include @@ -126,6 +129,15 @@ tuklib_physmem(void) #elif defined(AMIGA) || defined(__AROS__) ret = AvailMem(MEMF_TOTAL); +#elif defined(__QNX__) + const struct asinfo_entry *entries = SYSPAGE_ENTRY(asinfo); + size_t count = SYSPAGE_ENTRY_SIZE(asinfo) / sizeof(struct asinfo_entry); + const char *strings = SYSPAGE_ENTRY(strings)->data; + + for (size_t i = 0; i < count; ++i) + if (strcmp(strings + entries[i].name, "ram") == 0) + ret += entries[i].end - entries[i].start + 1; + #elif defined(TUKLIB_PHYSMEM_AIX) ret = _system_configuration.physmem; Modified: vendor/xz/dist/src/liblzma/api/lzma.h ============================================================================== --- vendor/xz/dist/src/liblzma/api/lzma.h Sat Nov 21 06:03:46 2015 (r291122) +++ vendor/xz/dist/src/liblzma/api/lzma.h Sat Nov 21 06:52:06 2015 (r291123) @@ -82,12 +82,20 @@ # if !defined(UINT32_C) || !defined(UINT64_C) \ || !defined(UINT32_MAX) || !defined(UINT64_MAX) /* - * MSVC has no C99 support, and thus it cannot be used to - * compile liblzma. The liblzma API has to still be usable - * from MSVC, so we need to define the required standard - * integer types here. + * MSVC versions older than 2013 have no C99 support, and + * thus they cannot be used to compile liblzma. Using an + * existing liblzma.dll with old MSVC can work though(*), + * but we need to define the required standard integer + * types here in a MSVC-specific way. + * + * (*) If you do this, the existing liblzma.dll probably uses + * a different runtime library than your MSVC-built + * application. Mixing runtimes is generally bad, but + * in this case it should work as long as you avoid + * the few rarely-needed liblzma functions that allocate + * memory and expect the caller to free it using free(). */ -# if defined(_WIN32) && defined(_MSC_VER) +# if defined(_WIN32) && defined(_MSC_VER) && _MSC_VER < 1800 typedef unsigned __int8 uint8_t; typedef unsigned __int32 uint32_t; typedef unsigned __int64 uint64_t; Modified: vendor/xz/dist/src/liblzma/api/lzma/version.h ============================================================================== --- vendor/xz/dist/src/liblzma/api/lzma/version.h Sat Nov 21 06:03:46 2015 (r291122) +++ vendor/xz/dist/src/liblzma/api/lzma/version.h Sat Nov 21 06:52:06 2015 (r291123) @@ -22,7 +22,7 @@ */ #define LZMA_VERSION_MAJOR 5 #define LZMA_VERSION_MINOR 2 -#define LZMA_VERSION_PATCH 1 +#define LZMA_VERSION_PATCH 2 #define LZMA_VERSION_STABILITY LZMA_VERSION_STABILITY_STABLE #ifndef LZMA_VERSION_COMMIT Modified: vendor/xz/dist/src/liblzma/common/index.c ============================================================================== --- vendor/xz/dist/src/liblzma/common/index.c Sat Nov 21 06:03:46 2015 (r291122) +++ vendor/xz/dist/src/liblzma/common/index.c Sat Nov 21 06:52:06 2015 (r291123) @@ -339,7 +339,7 @@ index_tree_locate(const index_tree *tree /// Allocate and initialize a new Stream using the given base offsets. static index_stream * index_stream_init(lzma_vli compressed_base, lzma_vli uncompressed_base, - lzma_vli stream_number, lzma_vli block_number_base, + uint32_t stream_number, lzma_vli block_number_base, const lzma_allocator *allocator) { index_stream *s = lzma_alloc(sizeof(index_stream), allocator); @@ -1008,6 +1008,8 @@ iter_set_info(lzma_index_iter *iter) iter->internal[ITER_GROUP].p = NULL; } + // NOTE: lzma_index_iter.stream.number is lzma_vli but we use uint32_t + // internally. iter->stream.number = stream->number; iter->stream.block_count = stream->record_count; iter->stream.compressed_offset = stream->node.compressed_base; Modified: vendor/xz/dist/src/liblzma/lz/lz_encoder.c ============================================================================== --- vendor/xz/dist/src/liblzma/lz/lz_encoder.c Sat Nov 21 06:03:46 2015 (r291122) +++ vendor/xz/dist/src/liblzma/lz/lz_encoder.c Sat Nov 21 06:52:06 2015 (r291123) @@ -139,7 +139,7 @@ fill_window(lzma_coder *coder, const lzm && coder->mf.read_pos < coder->mf.read_limit) { // Match finder may update coder->pending and expects it to // start from zero, so use a temporary variable. - const size_t pending = coder->mf.pending; + const uint32_t pending = coder->mf.pending; coder->mf.pending = 0; // Rewind read_pos so that the match finder can hash Modified: vendor/xz/dist/src/liblzma/lzma/lzma_encoder.c ============================================================================== --- vendor/xz/dist/src/liblzma/lzma/lzma_encoder.c Sat Nov 21 06:03:46 2015 (r291122) +++ vendor/xz/dist/src/liblzma/lzma/lzma_encoder.c Sat Nov 21 06:52:06 2015 (r291123) @@ -464,7 +464,7 @@ length_encoder_reset(lzma_length_encoder bittree_reset(lencoder->high, LEN_HIGH_BITS); if (!fast_mode) - for (size_t pos_state = 0; pos_state < num_pos_states; + for (uint32_t pos_state = 0; pos_state < num_pos_states; ++pos_state) length_update_prices(lencoder, pos_state); Modified: vendor/xz/dist/src/xz/args.h ============================================================================== --- vendor/xz/dist/src/xz/args.h Sat Nov 21 06:03:46 2015 (r291122) +++ vendor/xz/dist/src/xz/args.h Sat Nov 21 06:52:06 2015 (r291123) @@ -15,7 +15,7 @@ typedef struct { char **arg_names; /// Number of filenames from command line - size_t arg_count; + unsigned int arg_count; /// Name of the file from which to read filenames. This is NULL /// if --files or --files0 was not used. Modified: vendor/xz/dist/src/xz/file_io.c ============================================================================== --- vendor/xz/dist/src/xz/file_io.c Sat Nov 21 06:03:46 2015 (r291122) +++ vendor/xz/dist/src/xz/file_io.c Sat Nov 21 06:52:06 2015 (r291123) @@ -82,13 +82,7 @@ io_init(void) // we are root. warn_fchown = geteuid() == 0; - // Create a pipe for the self-pipe trick. If pipe2() is available, - // we can avoid the fcntl() calls. -# ifdef HAVE_PIPE2 - if (pipe2(user_abort_pipe, O_NONBLOCK)) - message_fatal(_("Error creating a pipe: %s"), - strerror(errno)); -# else + // Create a pipe for the self-pipe trick. if (pipe(user_abort_pipe)) message_fatal(_("Error creating a pipe: %s"), strerror(errno)); @@ -101,7 +95,6 @@ io_init(void) message_fatal(_("Error creating a pipe: %s"), strerror(errno)); } -# endif #endif #ifdef __DJGPP__ Modified: vendor/xz/dist/src/xz/main.c ============================================================================== --- vendor/xz/dist/src/xz/main.c Sat Nov 21 06:03:46 2015 (r291122) +++ vendor/xz/dist/src/xz/main.c Sat Nov 21 06:52:06 2015 (r291123) @@ -212,7 +212,7 @@ main(int argc, char **argv) // Process the files given on the command line. Note that if no names // were given, args_parse() gave us a fake "-" filename. - for (size_t i = 0; i < args.arg_count && !user_abort; ++i) { + for (unsigned i = 0; i < args.arg_count && !user_abort; ++i) { if (strcmp("-", args.arg_names[i]) == 0) { // Processing from stdin to stdout. Check that we // aren't writing compressed data to a terminal or Modified: vendor/xz/dist/src/xz/message.c ============================================================================== --- vendor/xz/dist/src/xz/message.c Sat Nov 21 06:03:46 2015 (r291122) +++ vendor/xz/dist/src/xz/message.c Sat Nov 21 06:52:06 2015 (r291123) @@ -381,7 +381,7 @@ progress_speed(uint64_t uncompressed_pos } -/// Make a string indicating elapsed or remaining time. The format is either +/// Make a string indicating elapsed time. The format is either /// M:SS or H:MM:SS depending on if the time is an hour or more. static const char * progress_time(uint64_t mseconds) @@ -389,7 +389,8 @@ progress_time(uint64_t mseconds) // 9999 hours = 416 days static char buf[sizeof("9999:59:59")]; - uint32_t seconds = mseconds / 1000; + // 32-bit variable is enough for elapsed time (136 years). + uint32_t seconds = (uint32_t)(mseconds / 1000); // Don't show anything if the time is zero or ridiculously big. if (seconds == 0 || seconds > ((9999 * 60) + 59) * 60 + 59) Modified: vendor/xz/dist/src/xz/options.c ============================================================================== --- vendor/xz/dist/src/xz/options.c Sat Nov 21 06:03:46 2015 (r291122) +++ vendor/xz/dist/src/xz/options.c Sat Nov 21 06:52:06 2015 (r291123) @@ -59,7 +59,7 @@ typedef struct { static void parse_options(const char *str, const option_map *opts, void (*set)(void *filter_options, - uint32_t key, uint64_t value, const char *valuestr), + unsigned key, uint64_t value, const char *valuestr), void *filter_options) { if (str == NULL || str[0] == '\0') @@ -87,7 +87,7 @@ parse_options(const char *str, const opt "pairs separated with commas"), str); // Look for the option name from the option map. - size_t i = 0; + unsigned i = 0; while (true) { if (opts[i].name == NULL) message_fatal(_("%s: Invalid option name"), @@ -103,7 +103,7 @@ parse_options(const char *str, const opt if (opts[i].map != NULL) { // value is a string which we should map // to an integer. - size_t j; + unsigned j; for (j = 0; opts[i].map[j].name != NULL; ++j) { if (strcmp(opts[i].map[j].name, value) == 0) break; @@ -149,7 +149,7 @@ enum { static void -set_delta(void *options, uint32_t key, uint64_t value, +set_delta(void *options, unsigned key, uint64_t value, const char *valuestr lzma_attribute((__unused__))) { lzma_options_delta *opt = options; @@ -193,7 +193,7 @@ enum { static void -set_bcj(void *options, uint32_t key, uint64_t value, +set_bcj(void *options, unsigned key, uint64_t value, const char *valuestr lzma_attribute((__unused__))) { lzma_options_bcj *opt = options; @@ -249,7 +249,7 @@ error_lzma_preset(const char *valuestr) static void -set_lzma(void *options, uint32_t key, uint64_t value, const char *valuestr) +set_lzma(void *options, unsigned key, uint64_t value, const char *valuestr) { lzma_options_lzma *opt = options; Modified: vendor/xz/dist/src/xz/xz.1 ============================================================================== --- vendor/xz/dist/src/xz/xz.1 Sat Nov 21 06:03:46 2015 (r291122) +++ vendor/xz/dist/src/xz/xz.1 Sat Nov 21 06:52:06 2015 (r291123) @@ -5,7 +5,7 @@ .\" This file has been put into the public domain. .\" You can do whatever you want with this file. .\" -.TH XZ 1 "2014-12-16" "Tukaani" "XZ Utils" +.TH XZ 1 "2015-05-11" "Tukaani" "XZ Utils" . .SH NAME xz, unxz, xzcat, lzma, unlzma, lzcat \- Compress or decompress .xz and .lzma files @@ -1055,6 +1055,14 @@ The default block size depends on the co can be overriden with the .BI \-\-block\-size= size option. +.IP "" +Threaded decompression hasn't been implemented yet. +It will only work on files that contain multiple blocks +with size information in block headers. +All files compressed in multi-threaded mode meet this condition, +but files compressed in single-threaded mode don't even if +.BI \-\-block\-size= size +is used. . .SS "Custom compressor filter chains" A custom filter chain allows specifying From owner-svn-src-vendor@freebsd.org Sat Nov 21 07:15:09 2015 Return-Path: Delivered-To: svn-src-vendor@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 20633A2A13A; Sat, 21 Nov 2015 07:15:09 +0000 (UTC) (envelope-from delphij@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 C49D5155F; Sat, 21 Nov 2015 07:15:08 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tAL7F75s006198; Sat, 21 Nov 2015 07:15:07 GMT (envelope-from delphij@FreeBSD.org) Received: (from delphij@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tAL7F7WW006197; Sat, 21 Nov 2015 07:15:07 GMT (envelope-from delphij@FreeBSD.org) Message-Id: <201511210715.tAL7F7WW006197@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: delphij set sender to delphij@FreeBSD.org using -f From: Xin LI Date: Sat, 21 Nov 2015 07:15:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org Subject: svn commit: r291124 - vendor/xz/5.2.2 X-SVN-Group: vendor MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-vendor@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the vendor work area tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 21 Nov 2015 07:15:09 -0000 Author: delphij Date: Sat Nov 21 07:15:07 2015 New Revision: 291124 URL: https://svnweb.freebsd.org/changeset/base/291124 Log: Tag xz 5.2.2. Added: vendor/xz/5.2.2/ - copied from r291123, vendor/xz/dist/