diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2016-06-27 15:05:59 -0700 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2016-06-27 15:11:22 -0700 |
commit | 6869b19cce09eb397f7e46add3e4e37a7d4677b3 (patch) | |
tree | 79406458be8aaffd341528fba921630e500e7757 /dev-vcs/cvs/files | |
parent | dev-util/ltrace: restore basic alpha support (diff) | |
download | gentoo-6869b19cce09eb397f7e46add3e4e37a7d4677b3.tar.gz gentoo-6869b19cce09eb397f7e46add3e4e37a7d4677b3.tar.bz2 gentoo-6869b19cce09eb397f7e46add3e4e37a7d4677b3.zip |
dev-vcs/cvs: Drop broken cvs-12.13 per bug #124733.
Package-Manager: portage-2.2.28
Diffstat (limited to 'dev-vcs/cvs/files')
-rw-r--r-- | dev-vcs/cvs/files/cvs-1.12.13-openat.patch | 21 | ||||
-rw-r--r-- | dev-vcs/cvs/files/cvs-1.12.13-zlib.patch | 31 | ||||
-rw-r--r-- | dev-vcs/cvs/files/cvs-1.12.13.1-block-requests.patch | 101 | ||||
-rw-r--r-- | dev-vcs/cvs/files/cvs-1.12.13.1-fix-gnulib-SEGV-vasnprintf.patch | 42 | ||||
-rw-r--r-- | dev-vcs/cvs/files/cvs-1.12.13.1-gl-mempcpy.patch | 24 | ||||
-rw-r--r-- | dev-vcs/cvs/files/cvs-1.12.13.1-hash-nameclash.patch | 43 | ||||
-rw-r--r-- | dev-vcs/cvs/files/cvs-1.12.13.1-use-include_next.patch | 30 |
7 files changed, 0 insertions, 292 deletions
diff --git a/dev-vcs/cvs/files/cvs-1.12.13-openat.patch b/dev-vcs/cvs/files/cvs-1.12.13-openat.patch deleted file mode 100644 index 762924a8c1d5..000000000000 --- a/dev-vcs/cvs/files/cvs-1.12.13-openat.patch +++ /dev/null @@ -1,21 +0,0 @@ -Index: cvs-1.12.13/lib/openat.c -=================================================================== ---- cvs-1.12.13.orig/lib/openat.c -+++ cvs-1.12.13/lib/openat.c -@@ -55,9 +55,13 @@ rpl_openat (int fd, char const *filename - va_list arg; - va_start (arg, flags); - -- /* Assume that mode_t is passed compatibly with mode_t's type -- after argument promotion. */ -- mode = va_arg (arg, mode_t); -+ /* If mode_t is narrower than int, use the promoted type (int), -+ not mode_t. Use sizeof to guess whether mode_t is nerrower; -+ we don't know of any practical counterexamples. */ -+ if (sizeof (mode_t) < sizeof (int)) -+ mode = va_arg (arg, int); -+ else -+ mode = va_arg (arg, mode_t); - - va_end (arg); - } diff --git a/dev-vcs/cvs/files/cvs-1.12.13-zlib.patch b/dev-vcs/cvs/files/cvs-1.12.13-zlib.patch deleted file mode 100644 index a4b4b1e2afeb..000000000000 --- a/dev-vcs/cvs/files/cvs-1.12.13-zlib.patch +++ /dev/null @@ -1,31 +0,0 @@ -Index: src/zlib.c -=================================================================== -RCS file: /sources/cvs/ccvs/src/zlib.c,v -retrieving revision 1.31 -retrieving revision 1.32 -diff -u -r1.31 -r1.32 ---- src/zlib.c 3 Jun 2005 18:26:09 -0000 1.31 -+++ src/zlib.c 28 Oct 2005 14:10:59 -0000 1.32 -@@ -221,15 +221,14 @@ - point. */ - assert (bd->size == 0); - -- /* This will work well in the server, because this call will -- do an unblocked read and fetch all the available data. In -- the client, this will read a single byte from the stdio -- stream, which will cause us to call inflate once per byte. -- It would be more efficient if we could make a call which -- would fetch all the available bytes, and at least one byte. */ -- -+ /* On the server, this will do an unblocking read of as much data as is -+ * available. On the client, with a blocking input descriptor and the -+ * current fd_buffer implementation, this should read as much data as -+ * is currently available, and at least 1 byte (or EOF), from the -+ * underlying buffer. -+ */ - status = (*cb->buf->input) (cb->buf->closure, bd->text, -- need, BUFFER_DATA_SIZE, &nread); -+ need ? 1 : 0, BUFFER_DATA_SIZE, &nread); - - if (status == -2) - /* Don't try to recover from memory allcoation errors. */ diff --git a/dev-vcs/cvs/files/cvs-1.12.13.1-block-requests.patch b/dev-vcs/cvs/files/cvs-1.12.13.1-block-requests.patch deleted file mode 100644 index 216336f34941..000000000000 --- a/dev-vcs/cvs/files/cvs-1.12.13.1-block-requests.patch +++ /dev/null @@ -1,101 +0,0 @@ -Author: Robin H. Johnson <robbat2@gentoo.org> -Original-Date: 2006-08-09 -Forward-Port-Date: 2007-12-06 - -This patch allows a CVS server to deny usage of specific commands, based on -input in the environment. - -Just set the CVS_BLOCK_REQUESTS env var with all of the commands you want, -seperated by spaces. Eg: -CVS_BLOCK_REQUESTS="Gzip-stream gzip-file-contents" -would block ALL usage of compression. - -Please see the array 'struct request requests[]' in src/server.c for a full -list of commands. - -Please note that if you block any commands marked as RQ_ESSENTIAL, CVS clients -may fail! (This includes 'ci'!). - -See the companion cvs-custom.c for a wrapper that can enforce the environment variable for pserver setups. - -Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> - -diff -Nuar cvs-1.12.13.1.orig/src/server.c cvs-1.12.13.1/src/server.c ---- cvs-1.12.13.1.orig/src/server.c 2006-06-21 11:55:21.000000000 -0700 -+++ cvs-1.12.13.1/src/server.c 2007-12-06 16:25:38.109309990 -0800 -@@ -6244,6 +6244,49 @@ - /* - * This server request is not ignored by the secondary. - */ -+ -+/* Hack by Robin H. Johnson <robbat2@gentoo.org>. -+ * Allow the server ENV to specify what request types are to be ignored. -+ */ -+ -+static char blocked_requests[BUFSIZ] = " "; -+ -+static void build_blocked_requests() { -+ char *tmp = getenv("CVS_BLOCK_REQUESTS"); -+ -+ if (tmp != NULL && strlen(tmp) > 0) { -+ // move to our custom buffer -+ strncat(blocked_requests, tmp, sizeof(blocked_requests)-strlen(blocked_requests)); -+ //add a space on the end as well for searching -+ strncat(blocked_requests, " ", sizeof(blocked_requests)-strlen(blocked_requests)); -+ } -+ -+ // now blocked_requests contains the list of every request that we do not -+ // want to serve -+} -+ -+// returns 0 if we should serve this request -+// use as if(checker(FOO)) continue; -+static int serve_valid_requests_checker(char *reqname) { -+ char needle[BUFSIZ] = " "; -+ char *tmp; -+ -+ if(!blocked_requests || strlen(blocked_requests) < 2) -+ return 0; -+ -+ // we want to look for ' 'reqname' ' -+ snprintf(needle, sizeof(needle), " %s ", reqname); -+ -+ // now do the search -+ tmp = strstr(blocked_requests, needle); -+ -+ if (tmp != NULL) -+ return 1; -+ -+ return 0; -+ -+} -+ - static void - serve_valid_requests (char *arg) - { -@@ -6262,11 +6305,15 @@ - ) - return; - -+ build_blocked_requests(); -+ - buf_output0 (buf_to_net, "Valid-requests"); - for (rq = requests; rq->name != NULL; rq++) - { - if (rq->func != NULL) - { -+ if(serve_valid_requests_checker(rq->name)) -+ continue; - buf_append_char (buf_to_net, ' '); - buf_output0 (buf_to_net, rq->name); - } -@@ -6706,6 +6753,9 @@ - * "co". - */ - continue; -+ // Ignore commands that we are supposed to ignore. -+ if(serve_valid_requests_checker(rq->name)) -+ continue; - - if (!(rq->flags & RQ_ROOTLESS) - && current_parsed_root == NULL) diff --git a/dev-vcs/cvs/files/cvs-1.12.13.1-fix-gnulib-SEGV-vasnprintf.patch b/dev-vcs/cvs/files/cvs-1.12.13.1-fix-gnulib-SEGV-vasnprintf.patch deleted file mode 100644 index 1dbaa51ec4c9..000000000000 --- a/dev-vcs/cvs/files/cvs-1.12.13.1-fix-gnulib-SEGV-vasnprintf.patch +++ /dev/null @@ -1,42 +0,0 @@ -Attemt to use CVS leads to glibc crash: -$ cvs up - *** %n in writable segment detected *** - -Fixes: https://savannah.nongnu.org/bugs/?35432 -Upstream gnulib commit: - -From 913c09becd9df89dbd9b9f386e7f35c240d5efe8 Mon Sep 17 00:00:00 2001 -From: Bruno Haible <bruno@clisp.org> -Date: Thu, 18 Oct 2007 23:50:42 +0000 -Subject: Don't use %n on glibc >= 2.3 systems. - ---- -(limited to 'lib/vasnprintf.c') - -diff --git a/lib/vasnprintf.c b/lib/vasnprintf.c -index f563823..5d818aa 100644 ---- a/lib/vasnprintf.c -+++ b/lib/vasnprintf.c -@@ -3386,8 +3386,20 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, - *fbp = dp->conversion; - #if USE_SNPRINTF -+# if !(__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3)) - p[1] = '%'; - p[2] = 'n'; - p[3] = '\0'; -+# else -+ /* On glibc2 systems from glibc >= 2.3 - probably also older -+ ones - we know that snprintf's returns value conforms to -+ ISO C 99: the gl_SNPRINTF_DIRECTIVE_N test passes. -+ Therefore we can avoid using %n in this situation. -+ On glibc2 systems from 2004-10-18 or newer, the use of %n -+ in format strings in writable memory may crash the program -+ (if compiled with _FORTIFY_SOURCE=2), so we should avoid it -+ in this situation. */ -+ p[1] = '\0'; -+# endif - #else - p[1] = '\0'; - #endif --- -cgit v0.9.0.2 diff --git a/dev-vcs/cvs/files/cvs-1.12.13.1-gl-mempcpy.patch b/dev-vcs/cvs/files/cvs-1.12.13.1-gl-mempcpy.patch deleted file mode 100644 index 7ad7533b0a57..000000000000 --- a/dev-vcs/cvs/files/cvs-1.12.13.1-gl-mempcpy.patch +++ /dev/null @@ -1,24 +0,0 @@ -http://cvs.savannah.gnu.org/viewvc/cvs/ccvs/lib/mempcpy.c?r1=1.2&r2=1.3&pathrev=MAIN -fixed in cvs-HEAD after cvs-1.12.13a - ---- lib/mempcpy.c 2005/05/23 17:44:31 1.2 -+++ lib/mempcpy.c 2007/08/22 12:48:42 1.3 -@@ -1,5 +1,5 @@ - /* Copy memory area and return pointer after last written byte. -- Copyright (C) 2003 Free Software Foundation, Inc. -+ Copyright (C) 2003, 2007 Free Software Foundation, Inc. - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by -@@ -15,9 +15,9 @@ - along with this program; if not, write to the Free Software Foundation, - Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ - --/* Specification. */ --#include "mempcpy.h" -+#include <config.h> - -+/* Specification. */ - #include <string.h> - - /* Copy N bytes of SRC to DEST, return pointer to bytes after the diff --git a/dev-vcs/cvs/files/cvs-1.12.13.1-hash-nameclash.patch b/dev-vcs/cvs/files/cvs-1.12.13.1-hash-nameclash.patch deleted file mode 100644 index d9c3358faf46..000000000000 --- a/dev-vcs/cvs/files/cvs-1.12.13.1-hash-nameclash.patch +++ /dev/null @@ -1,43 +0,0 @@ -http://cvs.savannah.gnu.org/viewvc/cvs/ccvs/src/hash.h?r1=1.14.6.2&r2=1.14.6.3&pathrev=cvs1-11-x-branch -fixed in cvs-1.11.23, cvs-HEAD after cvs-1.12.13a - ---- src/hash.h.orig 2010-03-11 10:12:19 +0100 -+++ src/hash.h 2010-03-11 10:12:40 +0100 -@@ -32,27 +32,27 @@ - }; - typedef enum ntype Ntype; - --struct node -+struct hashnode - { - Ntype type; -- struct node *next; -- struct node *prev; -- struct node *hashnext; -- struct node *hashprev; -+ struct hashnode *next; -+ struct hashnode *prev; -+ struct hashnode *hashnext; -+ struct hashnode *hashprev; - char *key; - void *data; - size_t len; /* Length of DATA. */ -- void (*delproc) (struct node *); -+ void (*delproc) (struct hashnode *); - }; --typedef struct node Node; -+typedef struct hashnode Node; - --struct list -+struct hashlist - { - Node *list; - Node *hasharray[HASHSIZE]; -- struct list *next; -+ struct hashlist *next; - }; --typedef struct list List; -+typedef struct hashlist List; - - List *getlist (void); - Node *findnode (List *list, const char *key); diff --git a/dev-vcs/cvs/files/cvs-1.12.13.1-use-include_next.patch b/dev-vcs/cvs/files/cvs-1.12.13.1-use-include_next.patch deleted file mode 100644 index adaff55ebb16..000000000000 --- a/dev-vcs/cvs/files/cvs-1.12.13.1-use-include_next.patch +++ /dev/null @@ -1,30 +0,0 @@ -Fix build failure on gentoo's gcc: - -In file included from ./inttypes.h:34:0, - from ./stdint.h:65, - from /usr/include/netinet/in.h:23, - from /usr/include/netdb.h:27, - from getaddrinfo.h:30, - from canon-host.c:27: - /usr/include/inttypes.h:297:1: error: unknown type name 'intmax_t' - /usr/include/inttypes.h:297:26: error: unknown type name 'intmax_t' - /usr/include/inttypes.h:300:27: error: unknown type name 'intmax_t' - /usr/include/inttypes.h:300:45: error: unknown type name 'intmax_t' -diff --git a/lib/stdint_.h b/lib/stdint_.h -index adab4d7..3a8db19 100644 ---- a/lib/stdint_.h -+++ b/lib/stdint_.h -@@ -43,7 +43,12 @@ - Include it before <inttypes.h>, since any "#include <stdint.h>" - in <inttypes.h> would reinclude us, skipping our contents because - _GL_STDINT_H is defined. */ --# include @ABSOLUTE_STDINT_H@ -+# include "config.h" -+# if HAVE_INCLUDE_NEXT -+# include_next <stdint.h> -+# else -+# include @ABSOLUTE_STDINT_H@ -+# endif - #endif - - /* <sys/types.h> defines some of the stdint.h types as well, on glibc, |