[gentoo-commits] repo/gentoo:master commit in: app-misc/tmux/files/, app-misc/tmux/

["Justin Lecher" <jlec@gentoo.org>]

commit:     6d92bbe44d0a4f19290abcdd63d5a4c9b776ba96
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 10 10:47:31 2016 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sun Jan 10 10:47:40 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d92bbe4

app-misc/tmux: Drop versions vulnerable to 'Out of bounds heap read'

Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=564400

Package-Manager: portage-2.2.26
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>

 app-misc/tmux/Manifest                    |  2 -
 app-misc/tmux/files/tmux-1.9a-flags.patch | 28 ----------
 app-misc/tmux/metadata.xml                |  2 +-
 app-misc/tmux/tmux-1.9a-r2.ebuild         | 85 ------------------------------
 app-misc/tmux/tmux-2.0-r4.ebuild          | 87 -------------------------------
 5 files changed, 1 insertion(+), 203 deletions(-)

diff --git a/app-misc/tmux/Manifest b/app-misc/tmux/Manifest
index 30c394a..c34e47a 100644
--- a/app-misc/tmux/Manifest
+++ b/app-misc/tmux/Manifest
@@ -1,3 +1 @@
-DIST tmux-1.9a.tar.gz 447938 SHA256 c5e3b22b901cf109b20dab54a4a651f0471abd1f79f6039d79b250d21c2733f5 SHA512 842984638dc1f7364c03393187379598f35679d535d911d5df4016944d6032e61a1bf840d7d339c6e99b30c55581d470acca85ab6ee5799b8927d18c0e9a91df WHIRLPOOL eca5cd48a263e25d24b7e2865f76bb30267e20590e9b2a905637498d7992389b9c7e0253c992780b1a6458869204cffcf93f4dba09efdfeb2f803a0f95f6553e
-DIST tmux-2.0.tar.gz 455754 SHA256 795f4b4446b0ea968b9201c25e8c1ef8a6ade710ebca4657dd879c35916ad362 SHA512 8a4be40ceb9b371a91107173de08348c4379b103454fa397ee326506f78a5fda1034dc7148c090c687221eddb8a2fc0c3aeb85da57841df6bcd74fb5f4f5f53d WHIRLPOOL d5c9570aafed049b1404e9243e0339202bfa33e8ca2874f304cb9a7c764b7878db19f87aa5f6b9a9476038bc3702e5d11784c8ca83eb731e61763ecb08a39fec
 DIST tmux-2.1.tar.gz 462965 SHA256 31564e7bf4bcef2defb3cb34b9e596bd43a3937cad9e5438701a81a5a9af6176 SHA512 0faa0a60a84b777ca3cf572cf741d0e4f82a9f32d27dfeddfda41bad57830823a6d5f2323f27ba794b86e194d9f7db7028c94dc6a15bb4ac5a18508f890bdaa4 WHIRLPOOL 983024886bdb868bb69ccedc18e9fd62cc5a8f147d647ea43b6f20e297b9b3c45a061e542bcb590ab50cf5d3db43d22015c3a8f18bee33d9c76552bfe13424ed

diff --git a/app-misc/tmux/files/tmux-1.9a-flags.patch b/app-misc/tmux/files/tmux-1.9a-flags.patch
deleted file mode 100644
index 8bf21d8..0000000
--- a/app-misc/tmux/files/tmux-1.9a-flags.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- tmux-1.9a/Makefile.am
-+++ tmux-1.9a/Makefile.am
-@@ -27,23 +27,20 @@
- if IS_GCC
- CFLAGS += -std=gnu99
- if IS_DEBUG
--CFLAGS += -O0 -g
- CFLAGS += -Wno-long-long -Wall -W -Wnested-externs -Wformat=2
- CFLAGS += -Wmissing-prototypes -Wstrict-prototypes -Wmissing-declarations
- CFLAGS += -Wwrite-strings -Wshadow -Wpointer-arith -Wsign-compare
- CFLAGS += -Wundef -Wbad-function-cast -Winline -Wcast-align
- CFLAGS += -Wdeclaration-after-statement
- CPPFLAGS += -DDEBUG
--else
--CFLAGS += -O2
- endif
- if IS_GCC4
--CPPFLAGS += -iquote. -I/usr/local/include
-+CPPFLAGS += -iquote.
- if IS_DEBUG
- CFLAGS += -Wno-pointer-sign
- endif
- else
--CPPFLAGS += -I. -I- -I/usr/local/include
-+CPPFLAGS += -I. -I-
- endif
- endif
- 

diff --git a/app-misc/tmux/metadata.xml b/app-misc/tmux/metadata.xml
index 8813ec2..e9b1261 100644
--- a/app-misc/tmux/metadata.xml
+++ b/app-misc/tmux/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>shell-tools</herd>

diff --git a/app-misc/tmux/tmux-1.9a-r2.ebuild b/app-misc/tmux/tmux-1.9a-r2.ebuild
deleted file mode 100644
index 7fd1b54..0000000
--- a/app-misc/tmux/tmux-1.9a-r2.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-AUTOTOOLS_AUTORECONF=true
-
-inherit autotools-utils bash-completion-r1 flag-o-matic
-
-DESCRIPTION="Terminal multiplexer"
-HOMEPAGE="http://tmux.github.io/"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="debug selinux vim-syntax"
-
-COMMON_DEPEND="
-	=dev-libs/libevent-2.0*
-	sys-libs/ncurses"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig"
-RDEPEND="${COMMON_DEPEND}
-	selinux? ( sec-policy/selinux-screen )
-	vim-syntax? ( || (
-		app-editors/vim
-		app-editors/gvim ) )"
-
-DOCS=( CHANGES FAQ README TODO )
-
-PATCHES=( "${FILESDIR}"/${P}-flags.patch )
-
-pkg_setup() {
-	if has_version "<app-misc/tmux-1.9a"; then
-		echo
-		ewarn "Some configuration options changed in this release."
-		ewarn "Please read the CHANGES file in /usr/share/doc/${PF}/"
-		ewarn
-		ewarn "WARNING: After updating to ${P} you will _not_ be able to connect to any"
-		ewarn "older, running tmux server instances. You'll have to use an existing client to"
-		ewarn "end your old sessions or kill the old server instances. Otherwise you'll have"
-		ewarn "to temporarily downgrade to access them."
-		echo
-	fi
-}
-
-src_prepare() {
-	# bug 438558
-	# 1.7 segfaults when entering copy mode if compiled with -Os
-	replace-flags -Os -O2
-
-	# regenerate aclocal.m4 to support earlier automake versions
-	rm aclocal.m4 || die
-
-	# remove generated files
-	rm -r compat/.{dirstamp,deps} || die
-
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		--sysconfdir="${EPREFIX}"/etc
-		$(use_enable debug)
-	)
-	autotools-utils_src_configure
-}
-
-src_install() {
-	autotools-utils_src_install
-
-	newbashcomp examples/bash_completion_tmux.sh ${PN}
-
-	docinto examples
-	dodoc examples/*.conf
-
-	if use vim-syntax; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins examples/tmux.vim
-
-		insinto /usr/share/vim/vimfiles/ftdetect
-		doins "${FILESDIR}"/tmux.vim
-	fi
-}

diff --git a/app-misc/tmux/tmux-2.0-r4.ebuild b/app-misc/tmux/tmux-2.0-r4.ebuild
deleted file mode 100644
index 8696d53..0000000
--- a/app-misc/tmux/tmux-2.0-r4.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-AUTOTOOLS_AUTORECONF=true
-
-inherit autotools-utils bash-completion-r1 flag-o-matic
-
-DESCRIPTION="Terminal multiplexer"
-HOMEPAGE="http://tmux.github.io/"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="debug selinux vim-syntax"
-
-CDEPEND="
-	|| ( =dev-libs/libevent-2.0*
-		 >=dev-libs/libevent-2.1.5-r4 )
-	!sys-apps/utempter
-	sys-libs/ncurses"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-screen )
-	vim-syntax? ( || (
-		app-editors/vim
-		app-editors/gvim ) )"
-
-DOCS=( CHANGES FAQ README TODO )
-
-PATCHES=( "${FILESDIR}"/${P}-flags.patch )
-
-pkg_setup() {
-	if has_version "<app-misc/tmux-1.9a"; then
-		echo
-		ewarn "Some configuration options changed in this release."
-		ewarn "Please read the CHANGES file in /usr/share/doc/${PF}/"
-		ewarn
-		ewarn "WARNING: After updating to ${P} you will _not_ be able to connect to any"
-		ewarn "older, running tmux server instances. You'll have to use an existing client to"
-		ewarn "end your old sessions or kill the old server instances. Otherwise you'll have"
-		ewarn "to temporarily downgrade to access them."
-		echo
-	fi
-}
-
-src_prepare() {
-	# bug 438558
-	# 1.7 segfaults when entering copy mode if compiled with -Os
-	replace-flags -Os -O2
-
-	# regenerate aclocal.m4 to support earlier automake versions
-	rm aclocal.m4 || die
-
-	# remove generated files
-	rm -r compat/.{dirstamp,deps} || die
-
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		--sysconfdir="${EPREFIX}"/etc
-		$(use_enable debug)
-	)
-	autotools-utils_src_configure
-}
-
-src_install() {
-	autotools-utils_src_install
-
-	newbashcomp examples/bash_completion_tmux.sh ${PN}
-
-	docinto examples
-	dodoc examples/*.conf
-
-	if use vim-syntax; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins examples/tmux.vim
-
-		insinto /usr/share/vim/vimfiles/ftdetect
-		doins "${FILESDIR}"/tmux.vim
-	fi
-}