Fix crash on window resizes, bug 243754.

Package-Manager: portage-2.2_rc12/cvs/Linux 2.6.26-gentoo-r1 i686

4 files changed, 115 insertions, 5 deletions

diff --git a/dev-util/cscope/ChangeLog b/dev-util/cscope/ChangeLog
index becaab0cd62b..244b270340d4 100644
--- a/dev-util/cscope/ChangeLog
+++ b/dev-util/cscope/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-util/cscope
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cscope/ChangeLog,v 1.101 2008/09/20 21:00:13 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cscope/ChangeLog,v 1.102 2008/10/24 19:20:43 ulm Exp $
+
+*cscope-15.6-r3 (24 Oct 2008)
+
+  24 Oct 2008; Ulrich Mueller <ulm@gentoo.org>
+  +files/cscope-15.6-sigwinch.patch, +cscope-15.6-r3.ebuild:
+  Fix crash on window resizes, bug 243754. Thanks to Michael Hordijk
+  <hoffbrinkle@hotmail.com>.
 
   20 Sep 2008; Ulrich Mueller <ulm@gentoo.org> -files/50xcscope-gentoo.el,
   -cscope-15.6-r1.ebuild:
diff --git a/dev-util/cscope/Manifest b/dev-util/cscope/Manifest
index 3a8055aa2557..4a03f9833522 100644
--- a/dev-util/cscope/Manifest
+++ b/dev-util/cscope/Manifest
@@ -2,15 +2,17 @@
 Hash: SHA1
 
 AUX 50cscope-gentoo.el 1479 RMD160 bcb0f315b4eea044e6360cb003405ef595064227 SHA1 fc5951c1084e7417e3eb0cf642803ca0122cfab9 SHA256 33790fe4a8961cd90209f8f42583626fcd8a7db3fd849c91c2bd4fe2e824ad6f
+AUX cscope-15.6-sigwinch.patch 1063 RMD160 4c1659bc131bff9704a17b6a8cb013e9adf03de4 SHA1 a8a26fc1932608159bfb5203d512b3fa01abbebb SHA256 77b42bc1d1e09c0f748031a69de1eb7062ae379cd618b679f5e0b6c3d7bd170e
 AUX cscope-158831-warning_webscope.patch 756 RMD160 aaf17fd08a02d4cad574d3e08368303ff7fb61a2 SHA1 eedca40470488cd4e63d117454856f8c1f6e6e31 SHA256 1bc88825a36646370abec03197e5373f06ea34e7e5576d1926ce2d0afc2f0c37
 DIST cscope-15.6.tar.gz 391223 RMD160 b93238d3c91782d032e028abcfde3c2a7491a9c9 SHA1 f5f73dca1f223cf6905c09a7f0e8eb993fa5fd93 SHA256 6d6461ef402a1d6e42e1cd40e7524c4ed19e79eacef1d83ba4ed680f7bcac5ca
 EBUILD cscope-15.6-r2.ebuild 1773 RMD160 eaea7305535e82113f7a5197380da41fe2c06519 SHA1 2764ca27f06c2b26cbd212a0310d68c0a6a1fd12 SHA256 24ea30e536511eba2f014a6231820e129000791e88f5dc11e726d7ca7202eee8
-MISC ChangeLog 13626 RMD160 18538050b8bed7e43d9d8eafbcb699bc6812e954 SHA1 6845c4bc40653d00f37ac8b51de25c23e53197ce SHA256 72dc4c5ccc14cfbb97e414d0b64116e6448ba4ce0249c8c1a805627d21868249
+EBUILD cscope-15.6-r3.ebuild 1809 RMD160 5607b247e24586ed47d922f8f20472bfc6842df0 SHA1 552f703d1332b7e8bb24109cc657c3d48a79f82b SHA256 aa9742ca7536d7f50bf8ce7eb55630c59ef30e9142971266708d01eac0d9a65a
+MISC ChangeLog 13864 RMD160 2c6c0f1ca8aaa751ca9e1d6cb13ea0b5c4d9a02b SHA1 8071cee6274ba6319f4e1b5c4db6a800e85df5b0 SHA256 bf82322bd35e0cfa760f059ff324bd9f1d0bac692e4ff5b566ec7f9f790d2aca
 MISC metadata.xml 790 RMD160 7889067edaf88f6188a74c114c39160fcf827f71 SHA1 379cdedd442db840c7d9ea38c13cdb917ece90eb SHA256 c357e749a49ff673990a6cfdda92bd8589d6b5d2d8a4f45e8976d7bd7eb384d8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.9 (GNU/Linux)
 
-iEYEARECAAYFAkjVZGcACgkQOeoy/oIi7uwC2QCfceqA7Dljk1kGDrSzGfG1OGMJ
-+fEAn2rgf4RfJJTdL9u8E+51d5MOouJc
-=kul3
+iEYEARECAAYFAkkCIBYACgkQOeoy/oIi7uyHXwCcC+k/SV4XmkXb+5Ot1+fYe3bm
+BOIAn1/Xvj2mMX4pmV1n5jCD6XUraAsh
+=qJTs
 -----END PGP SIGNATURE-----
diff --git a/dev-util/cscope/cscope-15.6-r3.ebuild b/dev-util/cscope/cscope-15.6-r3.ebuild
new file mode 100644
index 000000000000..000e8a2c16f8
--- /dev/null
+++ b/dev-util/cscope/cscope-15.6-r3.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2008 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.1 2008/10/24 19:20:43 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="as-is 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/files/cscope-15.6-sigwinch.patch b/dev-util/cscope/files/cscope-15.6-sigwinch.patch
new file mode 100644
index 000000000000..c861db7d4ad9
--- /dev/null
+++ b/dev-util/cscope/files/cscope-15.6-sigwinch.patch
@@ -0,0 +1,30 @@
+--- 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();