From d67965aa7ad1048efd21820545625805b559eb5a Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Thu, 27 Feb 2003 06:35:04 +0000 Subject: errno patch #16267 --- app-misc/glimpse/ChangeLog | 7 +- app-misc/glimpse/files/4.15-errno.patch | 133 ++++++++++++++++++++++++++ app-misc/glimpse/files/digest-glimpse-4.15 | 1 - app-misc/glimpse/files/digest-glimpse-4.15-r1 | 1 + app-misc/glimpse/glimpse-4.15-r1.ebuild | 26 +++++ app-misc/glimpse/glimpse-4.15.ebuild | 24 ----- 6 files changed, 166 insertions(+), 26 deletions(-) create mode 100644 app-misc/glimpse/files/4.15-errno.patch delete mode 100644 app-misc/glimpse/files/digest-glimpse-4.15 create mode 100644 app-misc/glimpse/files/digest-glimpse-4.15-r1 create mode 100644 app-misc/glimpse/glimpse-4.15-r1.ebuild delete mode 100644 app-misc/glimpse/glimpse-4.15.ebuild (limited to 'app-misc/glimpse') diff --git a/app-misc/glimpse/ChangeLog b/app-misc/glimpse/ChangeLog index eb0073d6ab02..7d0ca490a872 100644 --- a/app-misc/glimpse/ChangeLog +++ b/app-misc/glimpse/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-misc/glimpse # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/glimpse/ChangeLog,v 1.4 2003/02/22 22:42:45 dragon Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-misc/glimpse/ChangeLog,v 1.5 2003/02/27 06:35:04 vapier Exp $ + +*glimpse-4.15-r1 (26 Feb 2003) + + 26 Feb 2003; Mike Frysinger : + small patch to fix glibc errno issues (#16267). *glimpse-4.15 (9 Feb 2002) diff --git a/app-misc/glimpse/files/4.15-errno.patch b/app-misc/glimpse/files/4.15-errno.patch new file mode 100644 index 000000000000..0ca41fd989bb --- /dev/null +++ b/app-misc/glimpse/files/4.15-errno.patch @@ -0,0 +1,133 @@ +diff -uwr glimpse-4.15.orig/agrep/agrep.c glimpse-4.15/agrep/agrep.c +--- glimpse-4.15.orig/agrep/agrep.c 2003-02-25 22:29:06.000000000 +0200 ++++ glimpse-4.15/agrep/agrep.c 2003-02-25 22:27:54.000000000 +0200 +@@ -11,7 +11,6 @@ + #define PRINT(s) + + extern char **environ; +-extern int errno; + int pattern_index; /* index in argv where the pattern is */ + + int glimpse_isserver=0; /* so that there is no user interaction */ +diff -uwr glimpse-4.15.orig/agrep/checksg.c glimpse-4.15/agrep/checksg.c +--- glimpse-4.15.orig/agrep/checksg.c 2003-02-25 22:29:06.000000000 +0200 ++++ glimpse-4.15/agrep/checksg.c 2003-02-25 22:27:54.000000000 +0200 +@@ -1,8 +1,8 @@ + /* Copyright (c) 1994 Sun Wu, Udi Manber, Burra Gopal. All Rights Reserved. */ ++#include + #include "agrep.h" + #include "checkfile.h" + +-extern int errno; + extern CHAR Progname[MAXNAME]; + extern int SGREP, PAT_FILE, PAT_BUFFER, EXITONERROR, SIMPLEPATTERN, + CONSTANT, D, NOUPPER, JUMP, I, LINENUM, INVERSE, WORDBOUND, WHOLELINE, +diff -uwr glimpse-4.15.orig/agrep/compat.c glimpse-4.15/agrep/compat.c +--- glimpse-4.15.orig/agrep/compat.c 2003-02-25 22:29:06.000000000 +0200 ++++ glimpse-4.15/agrep/compat.c 2003-02-25 22:27:54.000000000 +0200 +@@ -1,5 +1,6 @@ + /* Copyright (c) 1994 Sun Wu, Udi Manber, Burra Gopal. All Rights Reserved. */ + /* test the conflicts between options */ ++#include + #include + #include "agrep.h" + +@@ -15,7 +16,6 @@ + extern char Progname[MAXNAME]; + extern int agrep_initialfd; + extern int EXITONERROR; +-extern int errno; + + int + compat() +diff -uwr glimpse-4.15.orig/agrep/maskgen.c glimpse-4.15/agrep/maskgen.c +--- glimpse-4.15.orig/agrep/maskgen.c 2003-02-25 22:29:06.000000000 +0200 ++++ glimpse-4.15/agrep/maskgen.c 2003-02-25 22:27:54.000000000 +0200 +@@ -1,4 +1,5 @@ + /* Copyright (c) 1994 Sun Wu, Udi Manber, Burra Gopal. All Rights Reserved. */ ++#include + #include "agrep.h" + + extern unsigned D_endpos, endposition, Init1, wildmask; +@@ -7,7 +8,6 @@ + extern unsigned char Progname[]; + extern int agrep_initialfd; + extern int EXITONERROR; +-extern int errno; + + int + maskgen(Pattern, D) +diff -uwr glimpse-4.15.orig/agrep/preprocess.c glimpse-4.15/agrep/preprocess.c +--- glimpse-4.15.orig/agrep/preprocess.c 2003-02-25 22:29:06.000000000 +0200 ++++ glimpse-4.15/agrep/preprocess.c 2003-02-25 22:27:54.000000000 +0200 +@@ -13,6 +13,7 @@ + /* upon return, Pattern contains the pattern to be processed by maskgen */ + /* D_pattern contains transformed D_pattern */ + ++#include + #include "agrep.h" + + extern int PAT_FILE, PAT_BUFFER; +@@ -25,7 +26,6 @@ + extern int table[WORD][WORD]; + extern int agrep_initialfd; + extern int EXITONERROR; +-extern int errno; + + extern int multifd; + extern char *multibuf; +diff -uwr glimpse-4.15.orig/get_index.c glimpse-4.15/get_index.c +--- glimpse-4.15.orig/get_index.c 2003-02-25 22:29:06.000000000 +0200 ++++ glimpse-4.15/get_index.c 2003-02-25 22:27:54.000000000 +0200 +@@ -1,4 +1,5 @@ + /* Copyright (c) 1994 Burra Gopal, Udi Manber. All Rights Reserved. */ ++#include + #include "glimpse.h" + #include "defs.h" + +@@ -14,7 +15,6 @@ + extern unsigned int *dest_index_set; + extern unsigned char *dest_index_buf; + extern int mask_int[32]; +-extern int errno; + extern int ByteLevelIndex; + extern int RecordLevelIndex; + extern int rdelim_len; +diff -uwr glimpse-4.15.orig/index/build_in.c glimpse-4.15/index/build_in.c +--- glimpse-4.15.orig/index/build_in.c 2003-02-25 22:29:06.000000000 +0200 ++++ glimpse-4.15/index/build_in.c 2003-02-25 22:27:54.000000000 +0200 +@@ -23,6 +23,7 @@ + this 12 19 \n is 9 17 12 18 19 \n an 7 12 \n example 16 \n + -----------------------------------------------------------------------*/ + ++#include + #include "glimpse.h" + + #define debugt +@@ -604,7 +605,6 @@ + int ret; + char s[MAX_LINE_LEN], es1[MAX_LINE_LEN], es2[MAX_LINE_LEN], es3[MAX_LINE_LEN]; + char s1[MAX_LINE_LEN]; +- extern int errno; + static int maxsortlinelen = 0; + int i; + +diff -uwr glimpse-4.15.orig/index/partition.c glimpse-4.15/index/partition.c +--- glimpse-4.15.orig/index/partition.c 2003-02-25 22:29:06.000000000 +0200 ++++ glimpse-4.15/index/partition.c 2003-02-25 22:27:54.000000000 +0200 +@@ -1,6 +1,7 @@ + /* Copyright (c) 1994 Sun Wu, Udi Manber, Burra Gopal. All Rights Reserved. */ + /* ./glimpse/index/partition.c */ + #include "glimpse.h" ++#include + #include + #include + +@@ -27,7 +28,6 @@ + int files_per_partition; + int files_in_partition; + int ATLEASTONEFILE = 0; +-extern int errno; + + char patbuf[MAX_PAT]; + extern unsigned char *src_index_buf; diff --git a/app-misc/glimpse/files/digest-glimpse-4.15 b/app-misc/glimpse/files/digest-glimpse-4.15 deleted file mode 100644 index 0f14f6cfb013..000000000000 --- a/app-misc/glimpse/files/digest-glimpse-4.15 +++ /dev/null @@ -1 +0,0 @@ -MD5 e5831b378a9b2fccbeb24707773537cf glimpse-4.15.tar.gz 425475 diff --git a/app-misc/glimpse/files/digest-glimpse-4.15-r1 b/app-misc/glimpse/files/digest-glimpse-4.15-r1 new file mode 100644 index 000000000000..0f14f6cfb013 --- /dev/null +++ b/app-misc/glimpse/files/digest-glimpse-4.15-r1 @@ -0,0 +1 @@ +MD5 e5831b378a9b2fccbeb24707773537cf glimpse-4.15.tar.gz 425475 diff --git a/app-misc/glimpse/glimpse-4.15-r1.ebuild b/app-misc/glimpse/glimpse-4.15-r1.ebuild new file mode 100644 index 000000000000..cfedb15ae500 --- /dev/null +++ b/app-misc/glimpse/glimpse-4.15-r1.ebuild @@ -0,0 +1,26 @@ +# Copyright 1999-2003 Gentoo Technologies, Inc. +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-misc/glimpse/glimpse-4.15-r1.ebuild,v 1.1 2003/02/27 06:35:04 vapier Exp $ + +inherit eutils + +DESCRIPTION="A index/query system to search a large set of files quickly" +SRC_URI="http://webglimpse.net/trial/${P}.tar.gz" +HOMEPAGE="http://webglimpse.net/" + +SLOT="0" +LICENSE="BSD" +KEYWORDS="x86 ~ppc ~mips" + +src_compile() { + epatch ${FILESDIR}/${PV}-errno.patch + make distclean || die + econf || die + make || die +} + +src_install() { + einstall || die + dodir /usr/share/man/man1 + mv ${D}/usr/share/man/*.1 ${D}/usr/share/man/man1/ +} diff --git a/app-misc/glimpse/glimpse-4.15.ebuild b/app-misc/glimpse/glimpse-4.15.ebuild deleted file mode 100644 index 44f77850bc76..000000000000 --- a/app-misc/glimpse/glimpse-4.15.ebuild +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 1999-2003 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/glimpse/glimpse-4.15.ebuild,v 1.10 2003/02/22 22:42:45 dragon Exp $ - -DESCRIPTION="A index/query system to search a large set of files quickly" -SRC_URI="http://webglimpse.net/trial/${P}.tar.gz" -HOMEPAGE="http://webglimpse.net/" - -SLOT="0" -LICENSE="BSD" -KEYWORDS="x86 ~ppc ~mips" - -src_compile() { - make distclean - econf - make || die -} - -src_install() { - einstall - - dodir /usr/share/man/man1 - mv ${D}/usr/share/man/*.1 ${D}/usr/share/man/man1/ -} -- cgit v1.2.3-65-gdbad