From 1bb2648cde916ac27d3dd75d7b64a4ddc89787b7 Mon Sep 17 00:00:00 2001 From: root Date: Sun, 10 Feb 2013 01:12:52 -0800 Subject: Sun Feb 10 01:12:35 PST 2013 --- extra/cvsps/call-cvs-q-option.patch | 34 ------- extra/cvsps/cvsps-2.2b1-bufferoverflow.patch | 65 ------------- extra/cvsps/cvsps-2.2b1-dynamic-logbuf.patch | 133 --------------------------- extra/cvsps/cvsps-2.2b1-man.patch | 29 ------ extra/cvsps/cvsps-buffer-overflow.patch | 66 ------------- extra/cvsps/seperate-CPPFLAGS.patch | 29 ------ extra/cvsps/use-INADDR_NONE-define.patch | 28 ------ extra/cvsps/use-__linux__-define.patch | 36 -------- extra/cvsps/use-offsetof-macro.patch | 32 ------- 9 files changed, 452 deletions(-) delete mode 100644 extra/cvsps/call-cvs-q-option.patch delete mode 100644 extra/cvsps/cvsps-2.2b1-bufferoverflow.patch delete mode 100644 extra/cvsps/cvsps-2.2b1-dynamic-logbuf.patch delete mode 100644 extra/cvsps/cvsps-2.2b1-man.patch delete mode 100644 extra/cvsps/cvsps-buffer-overflow.patch delete mode 100644 extra/cvsps/seperate-CPPFLAGS.patch delete mode 100644 extra/cvsps/use-INADDR_NONE-define.patch delete mode 100644 extra/cvsps/use-__linux__-define.patch delete mode 100644 extra/cvsps/use-offsetof-macro.patch (limited to 'extra/cvsps') diff --git a/extra/cvsps/call-cvs-q-option.patch b/extra/cvsps/call-cvs-q-option.patch deleted file mode 100644 index a754b7c60..000000000 --- a/extra/cvsps/call-cvs-q-option.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 49d7a3e44b54f18b0e2762d8dbb087ad4c2f0276 Mon Sep 17 00:00:00 2001 -From: Yann Dirson -Date: Thu, 15 Jun 2006 09:48:08 +0200 -Subject: [PATCH] Call cvs with -q flag when fetching the log - -This gets rid of the neverending output polution cvs sends to stderr, -which is mostly useless and has a strong potential to hide real problem -reports ---- - cvsps.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/cvsps.c b/cvsps.c -index d94dfe0..be700ba 100644 ---- a/cvsps.c -+++ b/cvsps.c -@@ -301,12 +301,12 @@ static void load_from_cvs() - * which is necessary to fill in the pre_rev stuff for a - * PatchSetMember - */ -- snprintf(cmd, BUFSIZ, "cvs %s %s %s -d '%s<;%s' %s", compress_arg, norc, ltype, date_str, date_str, use_rep_buff); -+ snprintf(cmd, BUFSIZ, "cvs %s %s -q %s -d '%s<;%s' %s", compress_arg, norc, ltype, date_str, date_str, use_rep_buff); - } - else - { - date_str[0] = 0; -- snprintf(cmd, BUFSIZ, "cvs %s %s %s %s", compress_arg, norc, ltype, use_rep_buff); -+ snprintf(cmd, BUFSIZ, "cvs %s %s -q %s %s", compress_arg, norc, ltype, use_rep_buff); - } - - debug(DEBUG_STATUS, "******* USING CMD %s", cmd); --- -1.6.5.GIT - diff --git a/extra/cvsps/cvsps-2.2b1-bufferoverflow.patch b/extra/cvsps/cvsps-2.2b1-bufferoverflow.patch deleted file mode 100644 index 2a82cd4e0..000000000 --- a/extra/cvsps/cvsps-2.2b1-bufferoverflow.patch +++ /dev/null @@ -1,65 +0,0 @@ ---- cvsps-2.2b1/cvsps.c 2010-09-07 18:13:42.760727491 +0200 -+++ cvsps-2.2b1_/cvsps.c 2010-09-07 18:05:11.083729441 +0200 -@@ -1065,17 +1065,16 @@ static CvsFile * parse_file(const char * - { - CvsFile * retval; - char fn[PATH_MAX]; -- int len = strlen(buff + 10); -+ size_t len = strlen(buff + 10); - char * p; - - /* once a single file has been parsed ok we set this */ - static int path_ok; -- -+ - /* chop the ",v" string and the "LF" */ - len -= 3; - memcpy(fn, buff + 10, len); - fn[len] = 0; -- - if (strncmp(fn, strip_path, strip_path_len) != 0) - { - /* if the very first file fails the strip path, -@@ -1096,10 +1095,10 @@ static CvsFile * parse_file(const char * - - while ((p = strstr(p, repository_path))) - lastp = p++; -- -+ - if (lastp) - { -- int len = strlen(repository_path); -+ size_t len = strlen(repository_path); - memcpy(strip_path, fn, lastp - fn + len + 1); - strip_path_len = lastp - fn + len + 1; - strip_path[strip_path_len] = 0; -@@ -1114,16 +1113,26 @@ static CvsFile * parse_file(const char * - * - * For now just ignore such files - */ -- debug(DEBUG_APPMSG1, "WARNING: file %s doesn't match strip_path %s. ignoring", -+ debug(DEBUG_APPMSG1, "WARNING: file %s doesn't match strip_path %s. ignoring", - fn, strip_path); - return NULL; - } - - ok: -- path_ok = 1; -- -+ /* -+ fix for rhbz#576076 -+ ./cvsps --norc -q --cvs-direct -u -A --root :pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot NSS -+ */ -+ if(len <= strip_path_len) -+ { -+ debug(DEBUG_APPMSG1, "WARNING: file %s doesn't match strip_path %s. ignoring", -+ fn, strip_path); -+ return NULL; -+ } - /* remove from beginning the 'strip_path' string */ - len -= strip_path_len; -+ path_ok = 1; -+ - memmove(fn, fn + strip_path_len, len); - fn[len] = 0; - diff --git a/extra/cvsps/cvsps-2.2b1-dynamic-logbuf.patch b/extra/cvsps/cvsps-2.2b1-dynamic-logbuf.patch deleted file mode 100644 index 03e4e7672..000000000 --- a/extra/cvsps/cvsps-2.2b1-dynamic-logbuf.patch +++ /dev/null @@ -1,133 +0,0 @@ -# From: http://ydirson.free.fr/soft/git/cvsps.git - -commit 76a9c2aaa0d2957de0bc8f0c0b994abfd1645a50 -Author: David D. Kilzer -Date: Mon Jun 20 01:04:34 2005 +0200 - - Dynamically allocate the log buffer to prevent warning messages - - On anoncvs.opensource.apple.com (Apple's anonymous CVS server for - WebKit), some very long log entries were included in CVS. I got tired - of cvsps-2.1 truncating them, so I made the 'logbuff' buffer be - dynamically allocated. - -diff --git i/cache.c w/cache.c -index 4c51cf7..01a8ed3 100644 ---- i/cache.c -+++ w/cache.c -@@ -108,10 +108,19 @@ time_t read_cache() - int tag_flags = 0; - char branchbuff[LOG_STR_MAX] = ""; - int branch_add = 0; -- char logbuff[LOG_STR_MAX] = ""; -+ int logbufflen = LOG_STR_MAX + 1; -+ char * logbuff = malloc(logbufflen); - time_t cache_date = -1; - int read_version; - -+ if (logbuff == NULL) -+ { -+ debug(DEBUG_SYSERROR, "could not malloc %d bytes for logbuff in read_cache", logbufflen); -+ exit(1); -+ } -+ -+ logbuff[0] = 0; -+ - if (!(fp = cache_open("r"))) - goto out; - -@@ -299,8 +308,19 @@ time_t read_cache() - else - { - /* Make sure we have enough in the buffer */ -- if (strlen(logbuff)+strlen(buff)= LOG_STR_MAX) -+ { -+ logbufflen += (len >= LOG_STR_MAX ? (len+1) : LOG_STR_MAX); -+ char * newlogbuff = realloc(logbuff, logbufflen); -+ if (newlogbuff == NULL) -+ { -+ debug(DEBUG_SYSERROR, "could not realloc %d bytes for logbuff in read_cache", logbufflen); -+ exit(1); -+ } -+ logbuff = newlogbuff; -+ } -+ strcat(logbuff, buff); - } - break; - case CACHE_NEED_PS_MEMBERS: -@@ -332,6 +352,7 @@ time_t read_cache() - out_close: - fclose(fp); - out: -+ free(logbuff); - return cache_date; - } - -diff --git i/cvsps.c w/cvsps.c -index f0e7d29..db28d7c 100644 ---- i/cvsps.c -+++ w/cvsps.c -@@ -269,7 +269,8 @@ static void load_from_cvs() - PatchSetMember * psm = NULL; - char datebuff[26]; - char authbuff[AUTH_STR_MAX]; -- char logbuff[LOG_STR_MAX + 1]; -+ int logbufflen = LOG_STR_MAX + 1; -+ char * logbuff = malloc(logbufflen); - int loglen = 0; - int have_log = 0; - char cmd[BUFSIZ]; -@@ -277,6 +278,12 @@ static void load_from_cvs() - char use_rep_buff[PATH_MAX]; - char * ltype; - -+ if (logbuff == NULL) -+ { -+ debug(DEBUG_SYSERROR, "could not malloc %d bytes for logbuff in load_from_cvs", logbufflen); -+ exit(1); -+ } -+ - if (!no_rlog && !test_log_file && cvs_check_cap(CAP_HAVE_RLOG)) - { - ltype = "rlog"; -@@ -484,25 +491,22 @@ static void load_from_cvs() - */ - if (have_log || !is_revision_metadata(buff)) - { -- /* if the log buffer is full, that's it. -- * -- * Also, read lines (fgets) always have \n in them -- * (unless truncation happens) -- * which we count on. So if truncation happens, -- * be careful to put a \n on. -- * -- * Buffer has LOG_STR_MAX + 1 for room for \0 if -- * necessary -- */ -- if (loglen < LOG_STR_MAX) -+ /* If the log buffer is full, try to reallocate more. */ -+ if (loglen < logbufflen) - { - int len = strlen(buff); - -- if (len >= LOG_STR_MAX - loglen) -+ if (len >= logbufflen - loglen) - { -- debug(DEBUG_APPMSG1, "WARNING: maximum log length exceeded, truncating log"); -- len = LOG_STR_MAX - loglen; -- buff[len - 1] = '\n'; -+ debug(DEBUG_STATUS, "reallocating logbufflen to %d bytes for file %s", logbufflen, file->filename); -+ logbufflen += (len >= LOG_STR_MAX ? (len+1) : LOG_STR_MAX); -+ char * newlogbuff = realloc(logbuff, logbufflen); -+ if (newlogbuff == NULL) -+ { -+ debug(DEBUG_SYSERROR, "could not realloc %d bytes for logbuff in load_from_cvs", logbufflen); -+ exit(1); -+ } -+ logbuff = newlogbuff; - } - - debug(DEBUG_STATUS, "appending %s to log", buff); diff --git a/extra/cvsps/cvsps-2.2b1-man.patch b/extra/cvsps/cvsps-2.2b1-man.patch deleted file mode 100644 index 3e6816fd5..000000000 --- a/extra/cvsps/cvsps-2.2b1-man.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff -up cvsps-2.2b1/cvsps.1~ cvsps-2.2b1/cvsps.1 ---- cvsps-2.2b1/cvsps.1~ 2008-04-02 04:18:44.000000000 +0300 -+++ cvsps-2.2b1/cvsps.1 2010-05-18 21:10:39.000000000 +0300 -@@ -11,7 +11,7 @@ to a collection of files, and all commit - single 'cvs commit' command). This information is valuable to seeing the - big picture of the evolution of a cvs project. While cvs tracks revision - information, it is often difficult to see what changes were committed --'atomically' to the repository. -+\'atomically' to the repository. - .SH OPTIONS - .TP - .B \-h -@@ -83,7 +83,7 @@ some hacks which are not generally appli - disable the use of rlog internally. Note: rlog is - required for stable PatchSet numbering. Use with care. - .TP --.B \-\-diffs\-opts