Don't require that SYSDIR for ocs exists, and change its default location

to /var/lib/cs; bug 269305. Remove old versions wrt security bug 263023.
(Portage version: 2.2_rc31/cvs/Linux i686)

7 files changed, 42 insertions, 190 deletions

diff --git a/dev-util/cscope/ChangeLog b/dev-util/cscope/ChangeLog
index c7972d6fd834..b8e0ceb92d0e 100644
--- a/dev-util/cscope/ChangeLog
+++ b/dev-util/cscope/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for dev-util/cscope
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cscope/ChangeLog,v 1.117 2009/05/06 15:22:25 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cscope/ChangeLog,v 1.118 2009/05/11 20:56:59 ulm Exp $
+
+*cscope-15.7a-r1 (11 May 2009)
+
+  11 May 2009; Ulrich Mueller <ulm@gentoo.org> -cscope-15.6-r2.ebuild,
+  -cscope-15.6-r3.ebuild, -files/cscope-15.6-sigwinch.patch,
+  -cscope-15.7.ebuild, +cscope-15.7a-r1.ebuild,
+  +files/cscope-15.7a-ocs-sysdir.patch,
+  -files/cscope-158831-warning_webscope.patch:
+  Don't require that SYSDIR for ocs exists, and change its default location
+  to /var/lib/cs; bug 269305. Remove old versions wrt security bug 263023.
 
   06 May 2009; Raúl Porcel <armin76@gentoo.org> cscope-15.7a.ebuild:
   arm/ia64/m68k/s390/sh stable wrt #263023
diff --git a/dev-util/cscope/cscope-15.6-r2.ebuild b/dev-util/cscope/cscope-15.6-r2.ebuild
deleted file mode 100644
index d5bb3dd4f982..000000000000
--- a/dev-util/cscope/cscope-15.6-r2.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cscope/cscope-15.6-r2.ebuild,v 1.7 2009/03/01 09:41:40 ulm Exp $
-
-inherit elisp-common eutils
-
-DESCRIPTION="Interactively examine a C program"
-HOMEPAGE="http://cscope.sourceforge.net/"
-SRC_URI="mirror://sourceforge/cscope/${P}.tar.gz"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
-IUSE="emacs"
-
-RDEPEND=">=sys-libs/ncurses-5.2"
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	sys-devel/bison
-	>=sys-devel/autoconf-2.60
-	emacs? ( virtual/emacs )"
-
-SITEFILE="50${PN}-gentoo.el"
-
-src_unpack() {
-	unpack ${A}
-
-	# warn users of insecure web frontend, see bug #158831
-	cd "${S}"
-	epatch "${FILESDIR}/${PN}-158831-warning_webscope.patch"
-}
-
-src_compile() {
-	STRIP="no"
-
-	econf || die "econf failed"
-	make clean || die "make clean failed"
-	emake || die "emake failed"
-
-	if use emacs ; then
-		cd "${S}"/contrib/xcscope || die
-		elisp-compile *.el || die "elisp-compile failed"
-	fi
-}
-
-src_install() {
-	einstall || die "einstall failed"
-	dodoc AUTHORS ChangeLog NEWS README* TODO || die "dodoc failed"
-
-	if use emacs ; then
-		cd "${S}"/contrib/xcscope || die
-		elisp-install ${PN} *.el *.elc || die "elisp-install failed"
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}" \
-			|| die "elisp-site-file-install failed"
-		dobin cscope-indexer || die "dobin failed"
-	fi
-
-	cd "${S}"/contrib/webcscope || die
-	docinto webcscope
-	dodoc INSTALL TODO cgi-lib.pl cscope hilite.c || die "dodoc failed"
-	insinto /usr/share/doc/${PF}/webcscope/icons; doins icons/*.gif
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-util/cscope/cscope-15.6-r3.ebuild b/dev-util/cscope/cscope-15.6-r3.ebuild
deleted file mode 100644
index c9afe43f5442..000000000000
--- a/dev-util/cscope/cscope-15.6-r3.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cscope/cscope-15.6-r3.ebuild,v 1.2 2009/03/01 09:41:40 ulm Exp $
-
-inherit elisp-common eutils
-
-DESCRIPTION="Interactively examine a C program"
-HOMEPAGE="http://cscope.sourceforge.net/"
-SRC_URI="mirror://sourceforge/cscope/${P}.tar.gz"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
-IUSE="emacs"
-
-RDEPEND=">=sys-libs/ncurses-5.2"
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	sys-devel/bison
-	>=sys-devel/autoconf-2.60
-	emacs? ( virtual/emacs )"
-
-SITEFILE="50${PN}-gentoo.el"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# warn users of insecure web frontend, see bug #158831
-	epatch "${FILESDIR}/${PN}-158831-warning_webscope.patch"
-	# fix crash on window resizes, bug 243754 (patch from upstream cvs)
-	epatch "${FILESDIR}/${P}-sigwinch.patch"
-}
-
-src_compile() {
-	STRIP="no"
-
-	econf || die "econf failed"
-	make clean || die "make clean failed"
-	emake || die "emake failed"
-
-	if use emacs ; then
-		cd "${S}"/contrib/xcscope || die
-		elisp-compile *.el || die
-	fi
-}
-
-src_install() {
-	einstall || die "einstall failed"
-	dodoc AUTHORS ChangeLog NEWS README* TODO || die "dodoc failed"
-
-	if use emacs ; then
-		cd "${S}"/contrib/xcscope || die
-		elisp-install ${PN} *.el *.elc || die
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
-		dobin cscope-indexer || die "dobin failed"
-	fi
-
-	cd "${S}"/contrib/webcscope || die
-	docinto webcscope
-	dodoc INSTALL TODO cgi-lib.pl cscope hilite.c || die "dodoc failed"
-	insinto /usr/share/doc/${PF}/webcscope/icons; doins icons/*.gif
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-util/cscope/cscope-15.7.ebuild b/dev-util/cscope/cscope-15.7a-r1.ebuild
index 5b1ed3856fca..3bd381dae53c 100644
--- a/dev-util/cscope/cscope-15.7.ebuild
+++ b/dev-util/cscope/cscope-15.7a-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cscope/cscope-15.7.ebuild,v 1.7 2009/04/14 16:38:47 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cscope/cscope-15.7a-r1.ebuild,v 1.1 2009/05/11 20:56:59 ulm Exp $
 
 inherit elisp-common eutils
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/cscope/${P}.tar.bz2"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
 IUSE="emacs"
 
 RDEPEND=">=sys-libs/ncurses-5.2"
@@ -22,6 +22,12 @@ DEPEND="${RDEPEND}
 
 SITEFILE="50${PN}-gentoo.el"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-ocs-sysdir.patch" #269305
+}
+
 src_compile() {
 	STRIP="no"
 
diff --git a/dev-util/cscope/files/cscope-15.6-sigwinch.patch b/dev-util/cscope/files/cscope-15.6-sigwinch.patch
deleted file mode 100644
index c861db7d4ad9..000000000000
--- a/dev-util/cscope/files/cscope-15.6-sigwinch.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- cscope-15.6-orig/src/main.c	2006/10/10 11:42:17	1.42
-+++ cscope-15.6/src/main.c	2006/10/23 12:37:36	1.43
-@@ -154,12 +154,7 @@
-     yyout = stdout;
-     /* save the command name for messages */
-     argv0 = argv[0];
--#if defined(KEY_RESIZE) && !defined(__DJGPP__)
--    winch_action.sa_sigaction = sigwinch_handler;
--    sigemptyset(&winch_action.sa_mask);
--    winch_action.sa_flags = SA_SIGINFO;
--    sigaction(SIGWINCH,&winch_action,NULL);
--#endif
-+
-     /* set the options */
-     while (--argc > 0 && (*++argv)[0] == '-') {
- 	/* HBB 20030814: add GNU-style --help and --version options */
-@@ -404,6 +399,13 @@
- 	signal(SIGINT, SIG_IGN);	/* ignore interrupts */
- 	signal(SIGPIPE, SIG_IGN);/* | command can cause pipe signal */
- 
-+#if defined(KEY_RESIZE) && !defined(__DJGPP__)
-+	winch_action.sa_sigaction = sigwinch_handler;
-+	sigemptyset(&winch_action.sa_mask);
-+	winch_action.sa_flags = SA_SIGINFO;
-+	sigaction(SIGWINCH,&winch_action,NULL);
-+#endif
-+
- 	/* initialize the curses display package */
- 	initscr();	/* initialize the screen */
- 	entercurses();
diff --git a/dev-util/cscope/files/cscope-15.7a-ocs-sysdir.patch b/dev-util/cscope/files/cscope-15.7a-ocs-sysdir.patch
new file mode 100644
index 000000000000..6b4c17fe9145
--- /dev/null
+++ b/dev-util/cscope/files/cscope-15.7a-ocs-sysdir.patch
@@ -0,0 +1,23 @@
+http://bugs.gentoo.org/269305
+
+--- cscope-15.7a-orig/contrib/ocs	2004-06-21 20:13:22.000000000 +0200
++++ cscope-15.7a/contrib/ocs	2009-05-11 22:33:51.000000000 +0200
+@@ -75,17 +75,10 @@
+ 
+ #set the default value for SYSDIR 
+ if [ -z "${SYSDIR}" ]; then
+-   SYSDIR=/usr/local/lib/cs
++   SYSDIR=/var/lib/cs
+    echo setting default sysdir
+ fi
+ 
+-#check that SYSDIR exists
+-if [ ! -d ${SYSDIR} ]; then
+-   echo -n $SYSDIR does not exist. 
+-   echo Please create the directory and set SYSDIR appropriately
+-   exit 
+-fi
+-
+ # Check that cscope is in PATH
+ type cscope 1>/dev/null 2>&1
+ 
diff --git a/dev-util/cscope/files/cscope-158831-warning_webscope.patch b/dev-util/cscope/files/cscope-158831-warning_webscope.patch
deleted file mode 100644
index bcb7827e19e8..000000000000
--- a/dev-util/cscope/files/cscope-158831-warning_webscope.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- cscope-15.6/contrib/webcscope/cscope.orig	2007-01-06 17:56:32.000000000 -0500
-+++ cscope-15.6/contrib/webcscope/cscope	2007-01-06 17:57:41.000000000 -0500
-@@ -1,4 +1,4 @@
--#!/bin/perl
-+#!/usr/bin/perl
- 
- # $Id: cscope-158831-warning_webscope.patch,v 1.3 2007/01/06 23:09:49 seemant Exp $
- #
-@@ -375,6 +375,7 @@
- 	print &HtmlTop ("Web-CScope");
- 
- 	print <<ENDOFTEXTA;
-+<p style="color:red">Be aware that this web front-end is insecure and allows ALL apache readable files to be viewed -- including your configuration!</p>
- Select an operation below and enter a symbol, function or text to search in
- the database.  The active version is $version.  Input is case-sensitive,
- so if your search returns no results, check the case and the symbol name.<hr>