From d78cefd52447de7daafb02f7a73cdadc588b5e8a Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sat, 1 Dec 2012 15:09:51 -0500 Subject: [PATCH] gzip: upgraded package to upstream Upgraded app-arch/gzip to version 1.5 on amd64, arm, x86 BUG=chromium-os:33708 TEST=`cbuildbot chromiumos-sdk` worked TEST=`cbuildbot {amd64,arm,x86}-generic-full` worked Change-Id: I318c722b3ead40aa549535dbedf0756657bf4832 Reviewed-on: https://gerrit.chromium.org/gerrit/39046 Reviewed-by: Mike Frysinger Tested-by: Mike Frysinger Commit-Ready: Mike Frysinger --- .../portage-stable/app-arch/gzip/Manifest | 2 +- .../gzip/files/gzip-1.4-no-gets.patch | 22 +++++++++++++++++++ .../gzip/{gzip-1.4.ebuild => gzip-1.5.ebuild} | 19 ++++++++-------- .../md5-cache/app-arch/{gzip-1.4 => gzip-1.5} | 10 ++++----- 4 files changed, 37 insertions(+), 16 deletions(-) create mode 100644 sdk_container/src/third_party/portage-stable/app-arch/gzip/files/gzip-1.4-no-gets.patch rename sdk_container/src/third_party/portage-stable/app-arch/gzip/{gzip-1.4.ebuild => gzip-1.5.ebuild} (69%) rename sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-arch/{gzip-1.4 => gzip-1.5} (56%) diff --git a/sdk_container/src/third_party/portage-stable/app-arch/gzip/Manifest b/sdk_container/src/third_party/portage-stable/app-arch/gzip/Manifest index 033c8b3d90..7700daabfc 100644 --- a/sdk_container/src/third_party/portage-stable/app-arch/gzip/Manifest +++ b/sdk_container/src/third_party/portage-stable/app-arch/gzip/Manifest @@ -1 +1 @@ -DIST gzip-1.4.tar.gz 907411 RMD160 a74f782960387e3f05373acc258becb564eda82d SHA1 1d398dac6a7920a7de6e2685fe472a840eb2ce6e SHA256 d166cfd3da380da1bd535633e8890bfb5664f9e68870a611d1dc01a3e9f711ee +DIST gzip-1.5.tar.xz 720956 RMD160 bffba2488ac06b314072cb51f131e021970667c7 SHA1 473aaac6a48445221fd5b03fde52f0236c7486ab SHA256 9ac20a3841a1246a8bedd800ea1fb93ef76521535d89cb59397d267026b6a173 diff --git a/sdk_container/src/third_party/portage-stable/app-arch/gzip/files/gzip-1.4-no-gets.patch b/sdk_container/src/third_party/portage-stable/app-arch/gzip/files/gzip-1.4-no-gets.patch new file mode 100644 index 0000000000..6da6e64bb7 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-arch/gzip/files/gzip-1.4-no-gets.patch @@ -0,0 +1,22 @@ +hack until gzip pulls a newer gnulib version + +From 66712c23388e93e5c518ebc8515140fa0c807348 Mon Sep 17 00:00:00 2001 +From: Eric Blake +Date: Thu, 29 Mar 2012 13:30:41 -0600 +Subject: [PATCH] stdio: don't assume gets any more + +Gnulib intentionally does not have a gets module, and now that C11 +and glibc have dropped it, we should be more proactive about warning +any user on a platform that still has a declaration of this dangerous +interface. + +--- a/lib/stdio.in.h ++++ b/lib/stdio.in.h +@@ -125,7 +125,6 @@ + so any use of gets warrants an unconditional warning. Assume it is + always declared, since it is required by C89. */ + #undef gets +-_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead"); + + #if @GNULIB_FOPEN@ + # if @REPLACE_FOPEN@ diff --git a/sdk_container/src/third_party/portage-stable/app-arch/gzip/gzip-1.4.ebuild b/sdk_container/src/third_party/portage-stable/app-arch/gzip/gzip-1.5.ebuild similarity index 69% rename from sdk_container/src/third_party/portage-stable/app-arch/gzip/gzip-1.4.ebuild rename to sdk_container/src/third_party/portage-stable/app-arch/gzip/gzip-1.5.ebuild index e6661b8196..7f32499639 100644 --- a/sdk_container/src/third_party/portage-stable/app-arch/gzip/gzip-1.4.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-arch/gzip/gzip-1.5.ebuild @@ -1,18 +1,18 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-arch/gzip/gzip-1.4.ebuild,v 1.8 2011/04/03 11:15:56 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-arch/gzip/gzip-1.5.ebuild,v 1.8 2012/09/09 15:56:45 armin76 Exp $ -inherit eutils flag-o-matic +inherit eutils flag-o-matic unpacker DESCRIPTION="Standard GNU compressor" HOMEPAGE="http://www.gnu.org/software/gzip/" -SRC_URI="ftp://alpha.gnu.org/gnu/gzip/${P}.tar.gz - mirror://gnu/gzip/${P}.tar.gz - mirror://gentoo/${P}.tar.gz" +SRC_URI="mirror://gnu-alpha/gzip/${P}.tar.xz + mirror://gnu/gzip/${P}.tar.xz + mirror://gentoo/${P}.tar.xz" -LICENSE="GPL-2" +LICENSE="GPL-3" SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd" +KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" IUSE="nls pic static" RDEPEND="" @@ -20,11 +20,10 @@ DEPEND="${RDEPEND} nls? ( sys-devel/gettext )" src_unpack() { - unpack ${A} + unpacker cd "${S}" #epatch "${FILESDIR}"/${PN}-1.3.5-rsync.patch epatch "${FILESDIR}"/${PN}-1.3.8-install-symlinks.patch - epatch "${FILESDIR}"/${P}-assembler.patch #309079 } src_compile() { diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-arch/gzip-1.4 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-arch/gzip-1.5 similarity index 56% rename from sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-arch/gzip-1.4 rename to sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-arch/gzip-1.5 index 737eb41779..b4dd5ccae2 100644 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-arch/gzip-1.4 +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-arch/gzip-1.5 @@ -3,9 +3,9 @@ DEPEND=nls? ( sys-devel/gettext ) DESCRIPTION=Standard GNU compressor HOMEPAGE=http://www.gnu.org/software/gzip/ IUSE=nls pic static -KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd -LICENSE=GPL-2 +KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd +LICENSE=GPL-3 SLOT=0 -SRC_URI=ftp://alpha.gnu.org/gnu/gzip/gzip-1.4.tar.gz mirror://gnu/gzip/gzip-1.4.tar.gz mirror://gentoo/gzip-1.4.tar.gz -_eclasses_=eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 6526ac6fc9aedf391efb91fcd75ace68 user 9e552f935106ff0bc92af16da64b4b29 -_md5_=61a63417b952511ea8330b642bf392ad +SRC_URI=mirror://gnu-alpha/gzip/gzip-1.5.tar.xz mirror://gnu/gzip/gzip-1.5.tar.xz mirror://gentoo/gzip-1.5.tar.xz +_eclasses_=eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 6526ac6fc9aedf391efb91fcd75ace68 unpacker 3bad9303b54075673d368b65e22dfdc8 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=a6203e65eabde664ff8a2fe3e39922ff