From 431a6483803e14622adf612717c22de04dfaa690 Mon Sep 17 00:00:00 2001 From: Christian Faulhammer Date: Sat, 6 Jan 2007 21:16:35 +0000 Subject: [PATCH] clean-up a bit Package-Manager: portage-2.1.1-r2 --- dev-util/cscope/Manifest | 47 ++--------- dev-util/cscope/cscope-15.5-r6.ebuild | 77 ------------------- .../15.5-noclobber-tempfile-rexotec.patch | 31 -------- .../files/cscope-15.5-can-2004-0996.patch | 38 --------- .../cscope/files/cscope-15.5-gcc295.patch | 22 ------ .../cscope/files/cscope-15.5-memset.patch | 13 ---- .../cscope/files/cscope-15.5-prog-info.patch | 16 ---- .../cscope/files/cscope-15.5-tempfile.patch | 77 ------------------- dev-util/cscope/files/digest-cscope-15.5-r6 | 6 -- 9 files changed, 7 insertions(+), 320 deletions(-) delete mode 100644 dev-util/cscope/cscope-15.5-r6.ebuild delete mode 100644 dev-util/cscope/files/15.5-noclobber-tempfile-rexotec.patch delete mode 100644 dev-util/cscope/files/cscope-15.5-can-2004-0996.patch delete mode 100644 dev-util/cscope/files/cscope-15.5-gcc295.patch delete mode 100644 dev-util/cscope/files/cscope-15.5-memset.patch delete mode 100644 dev-util/cscope/files/cscope-15.5-prog-info.patch delete mode 100644 dev-util/cscope/files/cscope-15.5-tempfile.patch delete mode 100644 dev-util/cscope/files/digest-cscope-15.5-r6 diff --git a/dev-util/cscope/Manifest b/dev-util/cscope/Manifest index 186056d6250d..6be926cbb2ab 100644 --- a/dev-util/cscope/Manifest +++ b/dev-util/cscope/Manifest @@ -1,46 +1,16 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -AUX 15.5-noclobber-tempfile-rexotec.patch 1055 RMD160 7ed807c7946ca134cbaee89bb3eb4c03e5c0bbf9 SHA1 924c7f877eb572c6c844e03cfd88cc23b247d979 SHA256 c5cd253327e131825c6d6620a5683a4e1ab0a2f6b41906fe8009ab0e5dfef522 -MD5 22e8d669b78f301c45e9075e2793dfd3 files/15.5-noclobber-tempfile-rexotec.patch 1055 -RMD160 7ed807c7946ca134cbaee89bb3eb4c03e5c0bbf9 files/15.5-noclobber-tempfile-rexotec.patch 1055 -SHA256 c5cd253327e131825c6d6620a5683a4e1ab0a2f6b41906fe8009ab0e5dfef522 files/15.5-noclobber-tempfile-rexotec.patch 1055 AUX 50xcscope-gentoo.el 95 RMD160 427fc486b902b6fb57e6524c747a51403993f02f SHA1 c051e28d49967d6f590c9098f3aa99b1fa8508cd SHA256 65f0256a47f6df2d724ab665906965348295ddb14b8f8f153335933c60de5c7e MD5 28ddc553966bf7045758be324600f5c8 files/50xcscope-gentoo.el 95 RMD160 427fc486b902b6fb57e6524c747a51403993f02f files/50xcscope-gentoo.el 95 SHA256 65f0256a47f6df2d724ab665906965348295ddb14b8f8f153335933c60de5c7e files/50xcscope-gentoo.el 95 -AUX cscope-15.5-can-2004-0996.patch 1125 RMD160 94afc9bd897710f8ea00c7a947df826e09c1db9c SHA1 80492300c5decabb228b89931ce59114264eee52 SHA256 827984ff55ccb2fec0f3641027485e3161587d15f4ea7078a29fd6769d662cca -MD5 c8aeadd309e54712241dec1b77072cbb files/cscope-15.5-can-2004-0996.patch 1125 -RMD160 94afc9bd897710f8ea00c7a947df826e09c1db9c files/cscope-15.5-can-2004-0996.patch 1125 -SHA256 827984ff55ccb2fec0f3641027485e3161587d15f4ea7078a29fd6769d662cca files/cscope-15.5-can-2004-0996.patch 1125 -AUX cscope-15.5-gcc295.patch 685 RMD160 2bc68fd0c6c436b86c92550d8dcd71fbfabe8ef1 SHA1 5deb6f34d1a7339dd8aec53b4d314d3bf93f9b55 SHA256 0e77a0d037a81c5d4fe035bc4021a3bf2f06770e827f9fb0985156579dd3cc2b -MD5 38db4f8e35aac0bbea3287c6deb5f644 files/cscope-15.5-gcc295.patch 685 -RMD160 2bc68fd0c6c436b86c92550d8dcd71fbfabe8ef1 files/cscope-15.5-gcc295.patch 685 -SHA256 0e77a0d037a81c5d4fe035bc4021a3bf2f06770e827f9fb0985156579dd3cc2b files/cscope-15.5-gcc295.patch 685 -AUX cscope-15.5-memset.patch 410 RMD160 6bbecad930ecb1a5652229a0e2c39aac88b25ac8 SHA1 60bb710110d10e2c0c8c484a11aff2f07ff07db5 SHA256 3cf28093f03554a758991f656d64e19f04f0de5442d2dee46b6c4bd15df8cf47 -MD5 cb92cc645956e1c1c2dd4bbee987f477 files/cscope-15.5-memset.patch 410 -RMD160 6bbecad930ecb1a5652229a0e2c39aac88b25ac8 files/cscope-15.5-memset.patch 410 -SHA256 3cf28093f03554a758991f656d64e19f04f0de5442d2dee46b6c4bd15df8cf47 files/cscope-15.5-memset.patch 410 -AUX cscope-15.5-prog-info.patch 638 RMD160 7ef9aa309f8196b2f1ff85533c43e2b3550b3cda SHA1 86ba64912c4e3f2e4e268c75e0211b9463e65c88 SHA256 6e3d6afc3259e9af29ed8b383a808b768e77395685d6a20932485996c5197822 -MD5 9df689ed914642c87166dd98eafb5017 files/cscope-15.5-prog-info.patch 638 -RMD160 7ef9aa309f8196b2f1ff85533c43e2b3550b3cda files/cscope-15.5-prog-info.patch 638 -SHA256 6e3d6afc3259e9af29ed8b383a808b768e77395685d6a20932485996c5197822 files/cscope-15.5-prog-info.patch 638 -AUX cscope-15.5-tempfile.patch 2817 RMD160 36ec0d8b8883a90a08733f7a60054bfe750ca2f4 SHA1 2de4f082328453375426499e00d0b8d2938302c4 SHA256 9653cdbb47d7fe2450f53e4661d8e6756082c84091e8d5b7c3ebbb8a71eb7c5e -MD5 6b8c74fb664bfaada3d95003f6c1134a files/cscope-15.5-tempfile.patch 2817 -RMD160 36ec0d8b8883a90a08733f7a60054bfe750ca2f4 files/cscope-15.5-tempfile.patch 2817 -SHA256 9653cdbb47d7fe2450f53e4661d8e6756082c84091e8d5b7c3ebbb8a71eb7c5e files/cscope-15.5-tempfile.patch 2817 AUX cscope-158831-warning_webscope.patch 688 RMD160 7108af388d55f9ac48117b854d946b4df98bd263 SHA1 8a7f2de595263dea06c470e90dc0508079fa09dd SHA256 1b603d7ba88b6cf31b3ba27e78bc48cc51bd5d0e04fce6c2832390d862ccc177 MD5 3a7fec9109069a5175722a21caf8da09 files/cscope-158831-warning_webscope.patch 688 RMD160 7108af388d55f9ac48117b854d946b4df98bd263 files/cscope-158831-warning_webscope.patch 688 SHA256 1b603d7ba88b6cf31b3ba27e78bc48cc51bd5d0e04fce6c2832390d862ccc177 files/cscope-158831-warning_webscope.patch 688 -DIST cscope-15.5-debian-security.patch.gz 5765 RMD160 2e7f7c768c51927a036e4aa8f8903c4511c9e025 SHA1 d921c0cbad4e50be8499feb6a4ec20999b318765 SHA256 17d3aa74fb9af5b085fa13eab2b96b3ed9cdeeebbe181144a72535da3c615352 DIST cscope-15.5.20060927.tar.gz 274045 RMD160 13125578fe9e532220335de1b3d00d775f40447a SHA1 369c25c6112705dc522b2bab370ac8bd606cd01c SHA256 f8799f0a1f943837a5b0cbe07e6c7e2b2a017109508ae1b492e8eb470459f45a -DIST cscope-15.5.tar.gz 243793 RMD160 30623f07043abc90d76b384c407abe5813a8a716 SHA1 2e8e66735254328399dc50757b270bcc3e9002d3 SHA256 be49cda0a9d33add89cabe0dfcef436a2863a7b0b833767875e0b7a6e8b4c4d1 DIST cscope-15.6.tar.gz 391223 RMD160 b93238d3c91782d032e028abcfde3c2a7491a9c9 SHA1 f5f73dca1f223cf6905c09a7f0e8eb993fa5fd93 SHA256 6d6461ef402a1d6e42e1cd40e7524c4ed19e79eacef1d83ba4ed680f7bcac5ca -EBUILD cscope-15.5-r6.ebuild 1952 RMD160 0b4aa74f3fd4efb380cdc92606e2aebc2b46bd1f SHA1 ef3e65fa16f55cc4d48809303419a967ac26d41b SHA256 752789025bd21ff3d52401a0d49bd98f62cc973dc9c14252bad47be8f54f7781 -MD5 59cd106cb50ab03d46056a6259691829 cscope-15.5-r6.ebuild 1952 -RMD160 0b4aa74f3fd4efb380cdc92606e2aebc2b46bd1f cscope-15.5-r6.ebuild 1952 -SHA256 752789025bd21ff3d52401a0d49bd98f62cc973dc9c14252bad47be8f54f7781 cscope-15.5-r6.ebuild 1952 EBUILD cscope-15.5.20060927-r1.ebuild 1469 RMD160 bebccc64bc601164d44b7ed6b80cc6411dcdec4b SHA1 6eb83a0887b78570a58cc79b653eb60e42c153a4 SHA256 ff8fe9810734dd2b0af9707864345b2e666ba05c5f25f2ec3071decf52014d78 MD5 275be9a14d63545a33764fb78ceb77b2 cscope-15.5.20060927-r1.ebuild 1469 RMD160 bebccc64bc601164d44b7ed6b80cc6411dcdec4b cscope-15.5.20060927-r1.ebuild 1469 @@ -57,17 +27,14 @@ EBUILD cscope-15.6.ebuild 1320 RMD160 3d1d04ba4c7e2aaff15811a67178e1583a3b38af S MD5 9453b05bae0570b785a88aef123328df cscope-15.6.ebuild 1320 RMD160 3d1d04ba4c7e2aaff15811a67178e1583a3b38af cscope-15.6.ebuild 1320 SHA256 8c42f1f732fe9961189d94cd8bfa184f904e9c836e8d5115e51d574ca5910461 cscope-15.6.ebuild 1320 -MISC ChangeLog 10874 RMD160 93bb8149c4b0f4adf76f92ca1a6f9b11106ac44c SHA1 44f0b365b682c47fe86553f5391e8735a292651e SHA256 44333b8b87702ea9fa56522e1886c9fac6fdb2144d1025f3cf78f78e900b53ec -MD5 45027757b745ce6374f302c0470fd6e2 ChangeLog 10874 -RMD160 93bb8149c4b0f4adf76f92ca1a6f9b11106ac44c ChangeLog 10874 -SHA256 44333b8b87702ea9fa56522e1886c9fac6fdb2144d1025f3cf78f78e900b53ec ChangeLog 10874 +MISC ChangeLog 11202 RMD160 0fa902018ed7d813167305aa7a60100f05009fee SHA1 46f9f02f11d1d587b4400c3b086a02ad887c106a SHA256 9fb1878445dd514f7e54a3d06c632e9645f6d0952a9839dd49d55edb0f88e43f +MD5 5819efbc1fa9221d296c32633a4878d9 ChangeLog 11202 +RMD160 0fa902018ed7d813167305aa7a60100f05009fee ChangeLog 11202 +SHA256 9fb1878445dd514f7e54a3d06c632e9645f6d0952a9839dd49d55edb0f88e43f ChangeLog 11202 MISC metadata.xml 790 RMD160 7889067edaf88f6188a74c114c39160fcf827f71 SHA1 379cdedd442db840c7d9ea38c13cdb917ece90eb SHA256 c357e749a49ff673990a6cfdda92bd8589d6b5d2d8a4f45e8976d7bd7eb384d8 MD5 79094d1585cb050b3855fbfe440f22b9 metadata.xml 790 RMD160 7889067edaf88f6188a74c114c39160fcf827f71 metadata.xml 790 SHA256 c357e749a49ff673990a6cfdda92bd8589d6b5d2d8a4f45e8976d7bd7eb384d8 metadata.xml 790 -MD5 ed73f2f3f9982334c32eefaac88d8867 files/digest-cscope-15.5-r6 518 -RMD160 8e3313f05cc7a34eba2e5d401381a1e2dc0d9185 files/digest-cscope-15.5-r6 518 -SHA256 7aaa4a4acecf8647abf81bc67baacafc6765ae9d3fbde3f4925736099868e9fa files/digest-cscope-15.5-r6 518 MD5 de15b55130641b69af1665c6e48273d5 files/digest-cscope-15.5.20060927 262 RMD160 156789045220358068629b6d2209940506ce95d3 files/digest-cscope-15.5.20060927 262 SHA256 87cd5cc6a7db39bc562324acdafd63b1de08727cdcdfdef4536690689cd12e25 files/digest-cscope-15.5.20060927 262 @@ -83,7 +50,7 @@ SHA256 5dd44a7fae431e139f023aedb5fd9742666c433ddf5a9b006cb1b461ff1c1ecd files/di -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.6 (GNU/Linux) -iD8DBQFFoA7BNQqtfCuFneMRAnZ2AJ9s7MPqsdr3oTmVJyQQdcYh27jN8gCeMTmq -VcuijCiiWiMiBq8BebyDbFE= -=21/y +iD8DBQFFoBGfNQqtfCuFneMRAt5oAJ0bf/9xw1lBJRRALFr34ZPDX81uHACeL0Wr +qxjDqz5jvtRMM8Rnpy1OsBs= +=wyhl -----END PGP SIGNATURE----- diff --git a/dev-util/cscope/cscope-15.5-r6.ebuild b/dev-util/cscope/cscope-15.5-r6.ebuild deleted file mode 100644 index 567009a5db5c..000000000000 --- a/dev-util/cscope/cscope-15.5-r6.ebuild +++ /dev/null @@ -1,77 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/cscope/cscope-15.5-r6.ebuild,v 1.12 2007/01/05 07:51:05 flameeyes Exp $ - -inherit elisp-common eutils - -DESCRIPTION="Interactively examine a C program" -HOMEPAGE="http://cscope.sourceforge.net/" -SRC_URI="mirror://sourceforge/cscope/${P}.tar.gz - mirror://gentoo/${P}-debian-security.patch.gz" - -LICENSE="as-is" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd" -IUSE="emacs" - -RDEPEND=">=sys-libs/ncurses-5.2" -DEPEND="${RDEPEND} - sys-devel/flex - sys-devel/bison - emacs? ( virtual/emacs )" - -SITEFILE=50xcscope-gentoo.el - -src_unpack() { - unpack ${A} - - # ~30 buffer overflows fix: Gentoo Bug #133829, patch developed by - # the Debian Security Team (thanks to those guys), CVE-2004-2541, - # Moritz Muehlenhoff. The Debian patch also includes the tempfile - # fix (previously ${PN}-${PV}-tempfile.patch) - epatch ${P}-debian-security.patch - - cd ${S} - - # build progress patch (bug 94150) - epatch ${FILESDIR}/${PN}-${PV}-prog-info.patch - - # BSD memset test (Bug #129128) - epatch ${FILESDIR}/${P}-memset.patch -} - -src_compile() { - # This fix is no longer needed as of cscope-15.5 which now should - # work with bison directly. (04 Feb 2004 agriffis) - #sed -i -e "s:={:{:" src/egrep.y - - econf || die - make clean || die - emake || die - - if use emacs ; then - cd ${S}/contrib/xcscope || die - elisp-compile *.el || die - fi -} - -src_install() { - einstall || die - dodoc NEWS AUTHORS TODO ChangeLog INSTALL README* || die - - if use emacs ; then - cd ${S}/contrib/xcscope || die - elisp-install xcscope *.el *.elc || die - elisp-site-file-install ${FILESDIR}/${SITEFILE} xcscope || die - dobin cscope-indexer || die - fi - cp -r ${S}/contrib/webcscope ${D}/usr/share/doc/${PF}/ || die -} - -pkg_postinst() { - use emacs && elisp-site-regen -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/dev-util/cscope/files/15.5-noclobber-tempfile-rexotec.patch b/dev-util/cscope/files/15.5-noclobber-tempfile-rexotec.patch deleted file mode 100644 index 38bd9ec3cd89..000000000000 --- a/dev-util/cscope/files/15.5-noclobber-tempfile-rexotec.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff -Naurp src/build.c src/build.c ---- src/build.c 2003-03-05 11:43:59.000000000 +0100 -+++ src/build.c 2004-11-17 15:01:01.000000000 +0100 -@@ -333,7 +333,7 @@ build(void) - (void) fprintf(stderr, "cscope: cannot open file %s\n", reffile); - myexit(1); - } -- if (invertedindex == YES && (postings = myfopen(temp1, "wb")) == NULL) { -+ if (invertedindex == YES && (postings = myfopen(temp1, "w+xb")) == NULL) { - cannotwrite(temp1); - cannotindex(); - } -diff -Naurp src_old/display.c src/display.c ---- src/display.c 2003-09-04 17:54:02.000000000 +0200 -+++ src/display.c 2004-11-17 15:01:01.000000000 +0100 -@@ -754,13 +754,13 @@ BOOL - writerefsfound(void) - { - if (refsfound == NULL) { -- if ((refsfound = myfopen(temp1, "wb")) == NULL) { -+ if ((refsfound = myfopen(temp1, "w+xb")) == NULL) { - cannotopen(temp1); - return(NO); - } - } else { - (void) fclose(refsfound); -- if ( (refsfound = myfopen(temp1, "wb")) == NULL) { -+ if ( (refsfound = myfopen(temp1, "w+xb")) == NULL) { - postmsg("Cannot reopen temporary file"); - return(NO); - } diff --git a/dev-util/cscope/files/cscope-15.5-can-2004-0996.patch b/dev-util/cscope/files/cscope-15.5-can-2004-0996.patch deleted file mode 100644 index 4084b13f7d9d..000000000000 --- a/dev-util/cscope/files/cscope-15.5-can-2004-0996.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- cscope-15.3.orig/src/main.c -+++ cscope-15.3/src/main.c -@@ -336,9 +336,32 @@ - } - - /* create the temporary file names */ -- pid = getpid(); -- (void) sprintf(temp1, "%s/cscope%d.1", tmpdir, pid); -- (void) sprintf(temp2, "%s/cscope%d.2", tmpdir, pid); -+ do { -+ char *tempfile = tempnam(tmpdir, "cscope1"); -+ if (!tempfile) { -+ fprintf (stderr, "Can't create tempfile\n"); -+ exit(1); -+ } -+ if (strlen(tempfile) >= sizeof(temp1)) { -+ fprintf (stderr, "TMPDIR path is too long\n"); -+ exit(1); -+ } -+ strncpy (temp1, tempfile, sizeof (temp1)); -+ free (tempfile); -+ } while (open (temp1, O_CREAT|O_EXCL|O_WRONLY, S_IREAD|S_IWRITE) < 0); -+ do { -+ char *tempfile = tempnam(tmpdir, "cscope2"); -+ if (!tempfile) { -+ fprintf (stderr, "Can't create tempfile\n"); -+ exit(1); -+ } -+ if (strlen(tempfile) >= sizeof(temp2)) { -+ fprintf (stderr, "TMPDIR path is too long\n"); -+ exit(1); -+ } -+ strncpy (temp2, tempfile, sizeof (temp2)); -+ free (tempfile); -+ } while (open (temp2, O_CREAT|O_EXCL|O_WRONLY, S_IREAD|S_IWRITE) < 0); - - /* if running in the foreground */ - if (signal(SIGINT, SIG_IGN) != SIG_IGN) { diff --git a/dev-util/cscope/files/cscope-15.5-gcc295.patch b/dev-util/cscope/files/cscope-15.5-gcc295.patch deleted file mode 100644 index 464a675339b0..000000000000 --- a/dev-util/cscope/files/cscope-15.5-gcc295.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- 1/cscope-15.5/src/main.c 2005-02-03 23:38:39 +0200 -+++ 2/cscope-15.5/src/main.c 2005-02-03 23:39:26 +0200 -@@ -128,6 +128,8 @@ - char path[PATHLEN + 1]; /* file path */ - FILE *oldrefs; /* old cross-reference file */ - char *s; -+ char template[] = "cscope.XXXXXX"; -+ char *ret; - int c, i; - pid_t pid; - struct stat stat_buf; -@@ -313,10 +315,8 @@ - lineflag = mygetenv("CSCOPE_LINEFLAG", LINEFLAG); - lineflagafterfile = getenv("CSCOPE_LINEFLAG_AFTER_FILE")?1:0; - -- char template[] = "cscope.XXXXXX"; - snprintf(tmpdir, sizeof(tmpdir), "%s/%s", mygetenv("TMPDIR", TMPDIR), template); - tmpdir[sizeof(tmpdir)-1] = '\0'; -- char *ret; - ret = mkdtemp(tmpdir); - if (ret == NULL) - { diff --git a/dev-util/cscope/files/cscope-15.5-memset.patch b/dev-util/cscope/files/cscope-15.5-memset.patch deleted file mode 100644 index 881e6e667dc3..000000000000 --- a/dev-util/cscope/files/cscope-15.5-memset.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: cscope-15.5/src/egrep.y -=================================================================== ---- cscope-15.5.orig/src/egrep.y -+++ cscope-15.5/src/egrep.y -@@ -605,7 +605,7 @@ done: (void) fclose(fptr); - - /* FIXME HBB: should export this to a separate file and use - * AC_REPLACE_FUNCS() */ --#if BSD -+#ifndef HAVE_MEMSET - /*LINTLIBRARY*/ - /* - * Set an array of n chars starting at sp to the character c. diff --git a/dev-util/cscope/files/cscope-15.5-prog-info.patch b/dev-util/cscope/files/cscope-15.5-prog-info.patch deleted file mode 100644 index ef43f0124560..000000000000 --- a/dev-util/cscope/files/cscope-15.5-prog-info.patch +++ /dev/null @@ -1,16 +0,0 @@ -Index: src/build.c -=================================================================== -RCS file: /cvsroot/cscope/cscope/src/build.c,v -retrieving revision 1.7 -diff -u -r1.7 build.c ---- src/build.c 30 Apr 2004 15:31:42 -0000 1.7 -+++ src/build.c 1 Feb 2005 15:57:59 -0000 -@@ -365,7 +365,7 @@ - for (fileindex = firstfile; fileindex < lastfile; ++fileindex) { - - /* display the progress about every three seconds */ -- if (interactive == YES && fileindex % 10 == 0) { -+ if ((interactive == YES || verbosemode == YES) && fileindex % 10 == 0) { - progress("Building symbol database", - (long)fileindex, (long)lastfile); - } diff --git a/dev-util/cscope/files/cscope-15.5-tempfile.patch b/dev-util/cscope/files/cscope-15.5-tempfile.patch deleted file mode 100644 index e6fed46c0c26..000000000000 --- a/dev-util/cscope/files/cscope-15.5-tempfile.patch +++ /dev/null @@ -1,77 +0,0 @@ -diff -Naur ./cscope-15.5/src/global.h ./cscope-15.5/src/global.h ---- ./cscope-15.5/src/global.h 2003-09-04 17:54:03.000000000 +0200 -+++ ./cscope-15.5/src/global.h 2004-11-19 13:19:18.000000000 +0100 -@@ -241,7 +241,7 @@ - extern long totalterms; /* total inverted index terms */ - extern BOOL trun_syms; /* truncate symbols to 8 characters */ - extern char tempstring[8192]; /* global dummy string buffer */ --extern char *tmpdir; /* temporary directory */ -+extern char tmpdir[2048]; /* temporary directory */ - - /* command.c global data */ - extern BOOL caseless; /* ignore letter case when searching */ -diff -Naur ./cscope-15.5/src/main.c ./cscope-15.5/src/main.c ---- ./cscope-15.5/src/main.c 2003-08-14 16:36:18.000000000 +0200 -+++ ./cscope-15.5/src/main.c 2004-11-19 13:31:26.000000000 +0100 -@@ -105,7 +105,7 @@ - BOOL trun_syms; /* truncate symbols to 8 characters */ - char tempstring[8192]; /* use this as a buffer, instead of 'yytext', - * which had better be left alone */ --char *tmpdir; /* temporary directory */ -+char tmpdir[2048]; /* temporary directory */ - - static BOOL onesearch; /* one search only in line mode */ - static char *reflines; /* symbol reference lines file */ -@@ -312,8 +312,18 @@ - shell = mygetenv("SHELL", SHELL); - lineflag = mygetenv("CSCOPE_LINEFLAG", LINEFLAG); - lineflagafterfile = getenv("CSCOPE_LINEFLAG_AFTER_FILE")?1:0; -- tmpdir = mygetenv("TMPDIR", TMPDIR); - -+ char template[] = "cscope.XXXXXX"; -+ snprintf(tmpdir, sizeof(tmpdir), "%s/%s", mygetenv("TMPDIR", TMPDIR), template); -+ tmpdir[sizeof(tmpdir)-1] = '\0'; -+ char *ret; -+ ret = mkdtemp(tmpdir); -+ if (ret == NULL) -+ { -+ fprintf (stderr, "cscope: Temporary directory %s cannot be created.\n", tmpdir); -+ myexit(1); -+ } -+ - /* XXX remove if/when clearerr() in dir.c does the right thing. */ - if (namefile && strcmp(namefile, "-") == 0 && !buildonly) - { -@@ -331,8 +341,10 @@ - - /* create the temporary file names */ - pid = getpid(); -- (void) sprintf(temp1, "%s/cscope%d.1", tmpdir, pid); -- (void) sprintf(temp2, "%s/cscope%d.2", tmpdir, pid); -+ (void) snprintf(temp1, sizeof(temp1), "%s/cscope%d.1", tmpdir, pid); -+ temp1[sizeof(temp1)-1] = '\0'; -+ (void) snprintf(temp2, sizeof(temp1), "%s/cscope%d.2", tmpdir, pid); -+ temp2[sizeof(temp2)-1] = '\0'; - - /* if running in the foreground */ - if (signal(SIGINT, SIG_IGN) != SIG_IGN) { -@@ -825,6 +837,7 @@ - void - myexit(int sig) - { -+ int retval; - /* HBB 20010313; close file before unlinking it. Unix may not care - * about that, but DOS absolutely needs it */ - if (refsfound != NULL) -@@ -834,6 +847,10 @@ - if (temp1[0] != '\0') { - (void) unlink(temp1); - (void) unlink(temp2); -+ if (retval = rmdir(tmpdir) != 0) -+ { -+ fprintf(stderr, "error deleting %s\n", tmpdir); -+ } - } - /* restore the terminal to its original mode */ - if (incurses == YES) { - diff --git a/dev-util/cscope/files/digest-cscope-15.5-r6 b/dev-util/cscope/files/digest-cscope-15.5-r6 deleted file mode 100644 index 304161d3cc3b..000000000000 --- a/dev-util/cscope/files/digest-cscope-15.5-r6 +++ /dev/null @@ -1,6 +0,0 @@ -MD5 14f257516d824c439e60b43b89b3d6e9 cscope-15.5-debian-security.patch.gz 5765 -RMD160 2e7f7c768c51927a036e4aa8f8903c4511c9e025 cscope-15.5-debian-security.patch.gz 5765 -SHA256 17d3aa74fb9af5b085fa13eab2b96b3ed9cdeeebbe181144a72535da3c615352 cscope-15.5-debian-security.patch.gz 5765 -MD5 beb6032a301bb11524aec74bfb5e4840 cscope-15.5.tar.gz 243793 -RMD160 30623f07043abc90d76b384c407abe5813a8a716 cscope-15.5.tar.gz 243793 -SHA256 be49cda0a9d33add89cabe0dfcef436a2863a7b0b833767875e0b7a6e8b4c4d1 cscope-15.5.tar.gz 243793 -- 2.26.2