From 911aae05b5d3ffd2543333e27cf06778381c7b3c Mon Sep 17 00:00:00 2001 From: Tobias Klauser Date: Sat, 23 May 2009 15:14:45 +0200 Subject: New upstream release 15.7a, fixing CVE-2009-0148 --- debian/changelog | 11 +++++ debian/control | 2 +- debian/patches/00list | 1 - .../patches/01-fix-resize-crash-inside-vim.dpatch | 55 ---------------------- debian/patches/04-fix-manpage-warning.dpatch | 4 +- 5 files changed, 14 insertions(+), 59 deletions(-) delete mode 100755 debian/patches/01-fix-resize-crash-inside-vim.dpatch (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 8b48616..be6f9eb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +cscope (15.7a-1) unstable; urgency=high + + * New upstream release. + - Security update for CVE-2009-0148 to fix multiple buffer overflows + (Closes: #528510). + - Drop 01-fix-resize-crash-inside-vim.dpatch, merged upstream. + * Correctly install xcscope.el via dh_installemacsen (Closes: #515164). + * Update to Standards-Version 3.8.1, no changes needed. + + -- Tobias Klauser Sun, 24 May 2009 12:13:47 +0200 + cscope (15.6-7) unstable; urgency=low * Fix lintian warnings. diff --git a/debian/control b/debian/control index 6b1e89e..721d833 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: devel Priority: optional Maintainer: Tobias Klauser Build-Depends: debhelper (>= 7), dpatch, autotools-dev, bison, flex, libncurses5-dev -Standards-Version: 3.8.0 +Standards-Version: 3.8.1 Homepage: http://cscope.sourceforge.net Vcs-Git: http://git.distanz.ch/scm/debian/pkg-cscope.git Vcs-Browser: http://git.distanz.ch/?p=debian/pkg-cscope.git diff --git a/debian/patches/00list b/debian/patches/00list index 06442ba..847de41 100644 --- a/debian/patches/00list +++ b/debian/patches/00list @@ -1,4 +1,3 @@ -01-fix-resize-crash-inside-vim 02-fix-xcscope-el-typo 03-fix-ocs-bashisms 04-fix-manpage-warning diff --git a/debian/patches/01-fix-resize-crash-inside-vim.dpatch b/debian/patches/01-fix-resize-crash-inside-vim.dpatch deleted file mode 100755 index e2fe9d2..0000000 --- a/debian/patches/01-fix-resize-crash-inside-vim.dpatch +++ /dev/null @@ -1,55 +0,0 @@ -#!/bin/sh /usr/share/dpatch/dpatch-run -## 01-fix-resize-crash-inside-vim.dpatch taken from upstream BTS -## -## DP: Fixes a crash on resize when used inside vim -## DP: (Closes: #374994) - -diff -urpN cscope-15.6.orig/src/main.c cscope-15.6/src/main.c ---- cscope-15.6.orig/src/main.c 2006-10-21 14:42:04.000000000 +0200 -+++ cscope-15.6/src/main.c 2006-10-21 14:44:50.000000000 +0200 -@@ -64,7 +64,7 @@ - #define DFLT_INCDIR "/usr/include" - #endif - --static char const rcsid[] = "$Id: main.c,v 1.41 2006/08/20 15:00:34 broeker Exp $"; -+static char const rcsid[] = "$Id: main.c,v 1.42 2006/10/10 11:42:17 nhorman Exp $"; - - /* note: these digraph character frequencies were calculated from possible - printable digraphs in the cross-reference for the C compiler */ -@@ -128,7 +128,8 @@ sigwinch_handler(int sig, siginfo_t *inf - (void) sig; - (void) info; - (void) unused; -- ungetch(KEY_RESIZE); -+ if(incurses == YES) -+ ungetch(KEY_RESIZE); - } - #endif - -@@ -153,12 +154,6 @@ main(int argc, char **argv) - 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 */ -@@ -403,6 +398,13 @@ cscope: Could not create private temp di - 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/debian/patches/04-fix-manpage-warning.dpatch b/debian/patches/04-fix-manpage-warning.dpatch index ae8a024..21e8fd1 100755 --- a/debian/patches/04-fix-manpage-warning.dpatch +++ b/debian/patches/04-fix-manpage-warning.dpatch @@ -5,11 +5,11 @@ ## DP: warning). diff --git a/doc/cscope.1 b/doc/cscope.1 -index 3a6a6e6..c41a59e 100644 +index 6a3a86b..194cf0c 100644 --- a/doc/cscope.1 +++ b/doc/cscope.1 @@ -1,4 +1,3 @@ -.PU - .TH CSCOPE "1" "August 2003" "The Santa Cruz Operation" + .TH CSCOPE "1" "January 2007" "The Santa Cruz Operation" .SH NAME cscope - interactively examine a C program -- cgit v1.2.3-54-g00ecf