* [gentoo-commits] repo/gentoo:master commit in: app-arch/pbzip2/, app-arch/pbzip2/files/
@ 2015-09-15 7:22 Lars Wendler
0 siblings, 0 replies; 2+ messages in thread
From: Lars Wendler @ 2015-09-15 7:22 UTC (permalink / raw
To: gentoo-commits
commit: d09e72efa85f9ff951fd3689f89e9e5f2e9a6a21
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 15 07:21:16 2015 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue Sep 15 07:21:56 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d09e72ef
app-arch/pbzip2: Removed old.
Package-Manager: portage-2.2.20.1
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
app-arch/pbzip2/Manifest | 3 --
app-arch/pbzip2/files/pbzip2-1.1.9-makefile.patch | 29 ---------------
app-arch/pbzip2/pbzip2-1.1.10.ebuild | 43 -----------------------
app-arch/pbzip2/pbzip2-1.1.11.ebuild | 43 -----------------------
app-arch/pbzip2/pbzip2-1.1.9.ebuild | 43 -----------------------
5 files changed, 161 deletions(-)
diff --git a/app-arch/pbzip2/Manifest b/app-arch/pbzip2/Manifest
index 3ef9138..972009f 100644
--- a/app-arch/pbzip2/Manifest
+++ b/app-arch/pbzip2/Manifest
@@ -1,5 +1,2 @@
-DIST pbzip2-1.1.10.tar.gz 46585 SHA256 9d489191edd010e4c8f7bc86de88268cdc3da5a9f7904b257fda56941615a0c2 SHA512 7601370c8d212124bccd3387ae1155c4a1e753d0ff93f6274bf1ae90e4d661fc73c890fc15c46d86f4a6b2487e788b29664e0f6571365dc1777f0aa3ced477df WHIRLPOOL 2c6d3aae7f5e371ab4f0b06dbbd797d3b3c8df93c24cdd35f2af7fbb25051cbaa6310df57cbf8d057f696067975a91807cffe413d23859683119b24f2758a976
-DIST pbzip2-1.1.11.tar.gz 47723 SHA256 b4861389bd99c73d304a03b0dc0731a8a26905da8e94ca4cef873b96e1ab0e7f SHA512 542bb52fc9a39cc7d0245d569984afcff967dc0affaf4c5abd4ae7ab03a480df84321f0366b76989cbf438e022e8d38e5120561cefea67079b1038e5c8f096f3 WHIRLPOOL 37894164110a56c8e0f480ea9175c476ab562d48a55d993b3e3828fd3b0d1dfb96ff67c3d5376fbe7cf855c2a955bbeb9266c0d514f135b09770717a5a618a16
DIST pbzip2-1.1.12.tar.gz 47826 SHA256 573bb358a5a7d3bf5f42f881af324cedf960c786e8d66dd03d448ddd8a0166ee SHA512 bb68e87867295b89ee6fb76a8b72834daebf0ca6c16b2f10bce67fe7386716a728acd28bf46a9732087202ca0cc774f02c741b0b58801184bb7550f6fd119cd6 WHIRLPOOL e7e9cd45b51aaf227e5bcb6e8df37b2fc05b2e3b8b666fcf213e05dc21d6df7392918e97d95379d25231832a9cfae938fdf5590ae7a7d3e6ad1968a9b2c25393
DIST pbzip2-1.1.8.tar.gz 54429 SHA256 d2da7e65d2a2ba5426d6d9bcd15d86cc5f90038efabd5dbc1ef9bded21371f53 SHA512 a3314d1f465e6016bf79ca8bd734fc1485515e9688319ee5a6a837058599546848018f28e2e2cef2afde68ee8f3c26d16e4e6da4c74c75d1cb12068f1d1e1a83 WHIRLPOOL bd24e6102db6425978c5ac8e762b37f4df4bcdcc84f44e06e6b4c652b1f9e3128382af1558a1ebc9f68dba3a89be08d42bf92577eab73b3d748f6ff941b415bf
-DIST pbzip2-1.1.9.tar.gz 47477 SHA256 bd421be03e6e24a24a121ba2355bfd11571356a25ee64fcfa76330750ec5f9c4 SHA512 0c08230858e14d8880cd0ae96f8d9484dbf7e6739c5c3374376ebe25fa331f4b1bc6df0330dd735bef686263d41cc993b032c09da0d7ee1957637b7a61618f21 WHIRLPOOL fdd174690cadcdab07848ba03daeb006306ea5588a1bef6f9d18d6bffe102350621269f256495228a337772101b2157a2d57f46e8d877fe6953f8f1d10b88ce2
diff --git a/app-arch/pbzip2/files/pbzip2-1.1.9-makefile.patch b/app-arch/pbzip2/files/pbzip2-1.1.9-makefile.patch
deleted file mode 100644
index 39d35a3..0000000
--- a/app-arch/pbzip2/files/pbzip2-1.1.9-makefile.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- pbzip2-1.1.9/Makefile
-+++ pbzip2-1.1.9/Makefile
-@@ -3,7 +3,7 @@
-
-
- # Compiler to use
--CXX = g++
-+#CXX = g++
-
-
- # Thread-related flags
-@@ -17,7 +17,7 @@
-
-
- # Optimization flags
--CXXFLAGS = -O2
-+#CXXFLAGS = -O2
-
- #CXXFLAGS += -g -Wall
- #CXXFLAGS += -ansi
-@@ -50,7 +50,7 @@
-
-
- # Linker flags
--LDFLAGS =
-+#LDFLAGS =
-
-
- # External libraries
diff --git a/app-arch/pbzip2/pbzip2-1.1.10.ebuild b/app-arch/pbzip2/pbzip2-1.1.10.ebuild
deleted file mode 100644
index c51e029..0000000
--- a/app-arch/pbzip2/pbzip2-1.1.10.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit flag-o-matic eutils
-
-DESCRIPTION="Parallel bzip2 (de)compressor using libbz2"
-HOMEPAGE="http://compression.ca/pbzip2/ https://launchpad.net/pbzip2"
-SRC_URI="https://launchpad.net/pbzip2/${PV:0:3}/${PV}/+download/${P}.tar.gz"
-
-LICENSE="BZIP2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="static symlink"
-
-LIB_DEPEND="app-arch/bzip2[static-libs(+)]"
-RDEPEND="
- !static? ( ${LIB_DEPEND//\[static-libs(+)]} )
- symlink? ( !app-arch/lbzip2[symlink] )"
-DEPEND="${RDEPEND}
- static? ( ${LIB_DEPEND} )"
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-makefile.patch
- tc-export CXX
- use static && append-ldflags -static
-}
-
-src_install() {
- dobin pbzip2
- dodoc AUTHORS ChangeLog README
- doman pbzip2.1
- dosym pbzip2 /usr/bin/pbunzip2
-
- if use symlink ; then
- local s
- for s in bzip2 bunzip2 bzcat ; do
- dosym pbzip2 /usr/bin/${s}
- done
- fi
-}
diff --git a/app-arch/pbzip2/pbzip2-1.1.11.ebuild b/app-arch/pbzip2/pbzip2-1.1.11.ebuild
deleted file mode 100644
index a595877..0000000
--- a/app-arch/pbzip2/pbzip2-1.1.11.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit flag-o-matic eutils
-
-DESCRIPTION="Parallel bzip2 (de)compressor using libbz2"
-HOMEPAGE="http://compression.ca/pbzip2/ https://launchpad.net/pbzip2"
-SRC_URI="https://launchpad.net/pbzip2/${PV:0:3}/${PV}/+download/${P}.tar.gz"
-
-LICENSE="BZIP2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="static symlink"
-
-LIB_DEPEND="app-arch/bzip2[static-libs(+)]"
-RDEPEND="
- !static? ( ${LIB_DEPEND//\[static-libs(+)]} )
- symlink? ( !app-arch/lbzip2[symlink] )"
-DEPEND="${RDEPEND}
- static? ( ${LIB_DEPEND} )"
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-1.1.10-makefile.patch
- tc-export CXX
- use static && append-ldflags -static
-}
-
-src_install() {
- dobin pbzip2
- dodoc AUTHORS ChangeLog README
- doman pbzip2.1
- dosym pbzip2 /usr/bin/pbunzip2
-
- if use symlink ; then
- local s
- for s in bzip2 bunzip2 bzcat ; do
- dosym pbzip2 /usr/bin/${s}
- done
- fi
-}
diff --git a/app-arch/pbzip2/pbzip2-1.1.9.ebuild b/app-arch/pbzip2/pbzip2-1.1.9.ebuild
deleted file mode 100644
index 860023a..0000000
--- a/app-arch/pbzip2/pbzip2-1.1.9.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit flag-o-matic eutils
-
-DESCRIPTION="Parallel bzip2 (de)compressor using libbz2"
-HOMEPAGE="http://compression.ca/pbzip2/"
-SRC_URI="https://launchpad.net/pbzip2/${PV:0:3}/${PV}/+download/${P}.tar.gz"
-
-LICENSE="BZIP2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="static symlink"
-
-LIB_DEPEND="app-arch/bzip2[static-libs(+)]"
-RDEPEND="
- !static? ( ${LIB_DEPEND//\[static-libs(+)]} )
- symlink? ( !app-arch/lbzip2[symlink] )"
-DEPEND="${RDEPEND}
- static? ( ${LIB_DEPEND} )"
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-makefile.patch
- tc-export CXX
- use static && append-ldflags -static
-}
-
-src_install() {
- dobin pbzip2
- dodoc AUTHORS ChangeLog README
- doman pbzip2.1
- dosym pbzip2 /usr/bin/pbunzip2
-
- if use symlink ; then
- local s
- for s in bzip2 bunzip2 bzcat ; do
- dosym pbzip2 /usr/bin/${s}
- done
- fi
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-arch/pbzip2/, app-arch/pbzip2/files/
@ 2015-12-14 10:22 Lars Wendler
0 siblings, 0 replies; 2+ messages in thread
From: Lars Wendler @ 2015-12-14 10:22 UTC (permalink / raw
To: gentoo-commits
commit: a00cf04f5b8d1c2b284c21cf3670b0d1a1a9ac51
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 14 10:20:56 2015 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Mon Dec 14 10:20:56 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a00cf04f
app-arch/pbzip2: Revbump to fix possible data corruption (#567952).
Package-Manager: portage-2.2.26
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
.../files/pbzip2-1.1.12-data_truncation_fix.patch | 142 +++++++++++++++++++++
app-arch/pbzip2/pbzip2-1.1.12-r1.ebuild | 44 +++++++
2 files changed, 186 insertions(+)
diff --git a/app-arch/pbzip2/files/pbzip2-1.1.12-data_truncation_fix.patch b/app-arch/pbzip2/files/pbzip2-1.1.12-data_truncation_fix.patch
new file mode 100644
index 0000000..0ce62e7
--- /dev/null
+++ b/app-arch/pbzip2/files/pbzip2-1.1.12-data_truncation_fix.patch
@@ -0,0 +1,142 @@
+https://bugs.launchpad.net/pbzip2/+bug/1524909
+https://bugs.gentoo.org/567952
+
+
+=== modified file 'pbzip2.cpp'
+--- pbzip2.cpp 2014-12-21 10:20:27 +0000
++++ pbzip2.cpp 2015-12-11 00:14:31 +0000
+@@ -2083,6 +2083,17 @@
+ return 0;
+ }
+
++void close_streams(FILE *stream, FILE *zStream)
++{
++ if (stream != NULL)
++ fflush(stream);
++
++ if (zStream != NULL && zStream != stdin)
++ fclose(zStream);
++ if (stream != NULL && stream != stdout)
++ fclose(stream);
++}
++
+ /*
+ *********************************************************
+ */
+@@ -2125,9 +2136,7 @@
+ // check file stream for errors
+ if (ferror(zStream))
+ {
+- if (zStream != stdin)
+- fclose(zStream);
+-
++ close_streams(stream, zStream);
+ handle_error(EF_EXIT, -1,
+ "pbzip2: *ERROR: Problem with input stream of file [%s]! Aborting...\n", InFilename);
+ return -1;
+@@ -2155,9 +2164,7 @@
+ // check file stream for errors
+ if (ferror(stream))
+ {
+- if (stream != stdout)
+- fclose(stream);
+-
++ close_streams(stream, zStream);
+ handle_error(EF_EXIT, -1,
+ "pbzip2: *ERROR: Problem with output stream of file [%s]! Aborting...\n", InFilename);
+ return -1;
+@@ -2169,10 +2176,7 @@
+ if (syncGetTerminateFlag() != 0)
+ {
+ fprintf (stderr, "directdecompress: terminating1 - terminateFlag set\n");
+- if (zStream != stdin)
+- fclose(zStream);
+- if (stream != stdout)
+- fclose(stream);
++ close_streams(stream, zStream);
+ return -1;
+ }
+
+@@ -2180,11 +2184,8 @@
+ if (bzf == NULL || bzerr != BZ_OK)
+ {
+ ret = testBZ2ErrorHandling(bzerr, bzf, streamNo);
+- if (zStream != stdin)
+- fclose(zStream);
+- if (stream != stdout)
+- fclose(stream);
+-
++ close_streams(stream, zStream);
++
+ if (ret != 0)
+ {
+ syncSetTerminateFlag(1);
+@@ -2200,10 +2201,7 @@
+ if (syncGetTerminateFlag() != 0)
+ {
+ fprintf (stderr, "directdecompress: terminating2 - terminateFlag set\n");
+- if (zStream != stdin)
+- fclose(zStream);
+- if (stream != stdout)
+- fclose(stream);
++ close_streams(stream, zStream);
+ return -1;
+ }
+
+@@ -2225,11 +2223,8 @@
+ if (ferror(zStream))
+ {
+ ret = testBZ2ErrorHandling(bzerr, bzf, streamNo);
+- if (zStream != stdin)
+- fclose(zStream);
+- if (stream != stdout)
+- fclose(stream);
+-
++ close_streams(stream, zStream);
++
+ if (ret != 0)
+ {
+ syncSetTerminateFlag(1);
+@@ -2242,11 +2237,8 @@
+ if (ferror(stream))
+ {
+ ret = testBZ2ErrorHandling(bzerr, bzf, streamNo);
+- if (zStream != stdin)
+- fclose(zStream);
+- if (stream != stdout)
+- fclose(stream);
+-
++ close_streams(stream, zStream);
++
+ if (ret != 0)
+ {
+ syncSetTerminateFlag(1);
+@@ -2263,11 +2255,8 @@
+ if (ferror(stream))
+ {
+ ret = testBZ2ErrorHandling(bzerr, bzf, streamNo);
+- if (zStream != stdin)
+- fclose(zStream);
+- if (stream != stdout)
+- fclose(stream);
+-
++ close_streams(stream, zStream);
++
+ if (ret != 0)
+ {
+ syncSetTerminateFlag(1);
+@@ -2278,11 +2267,8 @@
+ if (bzerr != BZ_STREAM_END)
+ {
+ ret = testBZ2ErrorHandling(bzerr, bzf, streamNo);
+- if (zStream != stdin)
+- fclose(zStream);
+- if (stream != stdout)
+- fclose(stream);
+-
++ close_streams(stream, zStream);
++
+ if (ret != 0)
+ {
+ syncSetTerminateFlag(1);
+
diff --git a/app-arch/pbzip2/pbzip2-1.1.12-r1.ebuild b/app-arch/pbzip2/pbzip2-1.1.12-r1.ebuild
new file mode 100644
index 0000000..a878d8d
--- /dev/null
+++ b/app-arch/pbzip2/pbzip2-1.1.12-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit flag-o-matic eutils
+
+DESCRIPTION="Parallel bzip2 (de)compressor using libbz2"
+HOMEPAGE="http://compression.ca/pbzip2/ https://launchpad.net/pbzip2"
+SRC_URI="https://launchpad.net/pbzip2/${PV:0:3}/${PV}/+download/${P}.tar.gz"
+
+LICENSE="BZIP2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="static symlink"
+
+LIB_DEPEND="app-arch/bzip2[static-libs(+)]"
+RDEPEND="
+ !static? ( ${LIB_DEPEND//\[static-libs(+)]} )
+ symlink? ( !app-arch/lbzip2[symlink] )"
+DEPEND="${RDEPEND}
+ static? ( ${LIB_DEPEND} )"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-1.1.10-makefile.patch \
+ "${FILESDIR}"/${P}-data_truncation_fix.patch
+ tc-export CXX
+ use static && append-ldflags -static
+}
+
+src_install() {
+ dobin pbzip2
+ dodoc AUTHORS ChangeLog README
+ doman pbzip2.1
+ dosym pbzip2 /usr/bin/pbunzip2
+
+ if use symlink ; then
+ local s
+ for s in bzip2 bunzip2 bzcat ; do
+ dosym pbzip2 /usr/bin/${s}
+ done
+ fi
+}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-12-14 10:22 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-09-15 7:22 [gentoo-commits] repo/gentoo:master commit in: app-arch/pbzip2/, app-arch/pbzip2/files/ Lars Wendler
-- strict thread matches above, loose matches on Subject: below --
2015-12-14 10:22 Lars Wendler
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox