From d82977346f4dfe0084ef74037fef2e38a3e130c6 Mon Sep 17 00:00:00 2001 From: Michał Górny Date: Sun, 24 Mar 2019 18:09:34 +0100 Subject: sys-fs/squashfs-tools: Also remove newly-added vulnerable ebuilds MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes: d4600db3d6bf1b83fe97517caec6c8f57d150db7 Signed-off-by: Michał Górny --- .../files/squashfs-tools-3.2-makedev.patch | 20 ----------- .../files/squashfs-tools-3.4-makedev.patch | 20 ----------- .../squashfs-tools/squashfs-tools-3.2_p2-r1.ebuild | 42 ---------------------- sys-fs/squashfs-tools/squashfs-tools-3.4-r1.ebuild | 42 ---------------------- 4 files changed, 124 deletions(-) delete mode 100644 sys-fs/squashfs-tools/files/squashfs-tools-3.2-makedev.patch delete mode 100644 sys-fs/squashfs-tools/files/squashfs-tools-3.4-makedev.patch delete mode 100644 sys-fs/squashfs-tools/squashfs-tools-3.2_p2-r1.ebuild delete mode 100644 sys-fs/squashfs-tools/squashfs-tools-3.4-r1.ebuild (limited to 'sys-fs') diff --git a/sys-fs/squashfs-tools/files/squashfs-tools-3.2-makedev.patch b/sys-fs/squashfs-tools/files/squashfs-tools-3.2-makedev.patch deleted file mode 100644 index c55d905dae18..000000000000 --- a/sys-fs/squashfs-tools/files/squashfs-tools-3.2-makedev.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/unsquashfs.c -+++ b/unsquashfs.c -@@ -34,6 +34,7 @@ - #include - #include - #include -+#include /* makedev */ - - #ifndef linux - #define __BYTE_ORDER BYTE_ORDER ---- a/mksquashfs.c -+++ b/mksquashfs.c -@@ -44,6 +44,7 @@ - #include - #include - #include -+#include /* makedev */ - - #ifndef linux - #define __BYTE_ORDER BYTE_ORDER diff --git a/sys-fs/squashfs-tools/files/squashfs-tools-3.4-makedev.patch b/sys-fs/squashfs-tools/files/squashfs-tools-3.4-makedev.patch deleted file mode 100644 index da9d6bed456f..000000000000 --- a/sys-fs/squashfs-tools/files/squashfs-tools-3.4-makedev.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/mksquashfs.c -+++ b/mksquashfs.c -@@ -47,6 +47,7 @@ - #include - #include - #include -+#include /* makedev */ - - #ifndef linux - #define __BYTE_ORDER BYTE_ORDER ---- a/unsquashfs.c -+++ b/unsquashfs.c -@@ -47,6 +47,7 @@ - #include - #include - #include -+#include /* makedev */ - - #ifndef linux - #define __BYTE_ORDER BYTE_ORDER diff --git a/sys-fs/squashfs-tools/squashfs-tools-3.2_p2-r1.ebuild b/sys-fs/squashfs-tools/squashfs-tools-3.2_p2-r1.ebuild deleted file mode 100644 index 969a1b0ad8d3..000000000000 --- a/sys-fs/squashfs-tools/squashfs-tools-3.2_p2-r1.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit toolchain-funcs - -MY_PV=${PV/_p/-r} -DESCRIPTION="Tool for creating compressed filesystem type squashfs" -HOMEPAGE="http://squashfs.sourceforge.net/" -SRC_URI="mirror://sourceforge/squashfs/squashfs${MY_PV}.tar.gz" - -LICENSE="GPL-2" -SLOT="3.0" # squashfs filesystem version -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" - -RDEPEND="sys-libs/zlib" -DEPEND="${RDEPEND}" -S=${WORKDIR}/squashfs${MY_PV}/squashfs-tools -PATCHES=( - "${FILESDIR}"/${PN}-3.2-makedev.patch -) - -src_prepare() { - default - sed -i \ - -e 's:-O2:$(CFLAGS):' \ - -e '/-lz/s:$: $(LDFLAGS):' \ - Makefile || die - - echo "struct dir_info; `grep '^int dir_scan2' mksquashfs.c`;" >> global.h -} - -src_compile() { - emake CC="$(tc-getCC)" -} - -src_install() { - newbin mksquashfs mksquashfs-${SLOT} - newbin unsquashfs unsquashfs-${SLOT} - cd .. - dodoc README ACKNOWLEDGEMENTS CHANGES PERFORMANCE.README README-3.2 -} diff --git a/sys-fs/squashfs-tools/squashfs-tools-3.4-r1.ebuild b/sys-fs/squashfs-tools/squashfs-tools-3.4-r1.ebuild deleted file mode 100644 index 4b252ea04382..000000000000 --- a/sys-fs/squashfs-tools/squashfs-tools-3.4-r1.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit toolchain-funcs - -MY_PV=${PV/_p/-r} -DESCRIPTION="Tool for creating compressed filesystem type squashfs" -HOMEPAGE="http://squashfs.sourceforge.net/" -SRC_URI="mirror://sourceforge/squashfs/squashfs${MY_PV}.tar.gz" - -LICENSE="GPL-2" -SLOT="3.1" # squashfs filesystem version -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" - -RDEPEND="sys-libs/zlib" -DEPEND="${RDEPEND}" -PATCHES=( - "${FILESDIR}"/${PN}-3.4-makedev.patch -) -S=${WORKDIR}/squashfs${MY_PV}/squashfs-tools - -src_prepare() { - default - sed -i \ - -e 's:-O2:$(CFLAGS):' \ - -e '/-lz/s:$: $(LDFLAGS):' \ - Makefile || die - - sed -i -e 's:get_nprocs():sysconf(_SC_NPROCESSORS_ONLN):' *.c -} - -src_compile() { - emake CC="$(tc-getCC)" -} - -src_install() { - newbin mksquashfs mksquashfs-${SLOT} - newbin unsquashfs unsquashfs-${SLOT} - cd .. - dodoc README ACKNOWLEDGEMENTS CHANGES PERFORMANCE.README README -} -- cgit v1.2.3-18-g5258