pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
sfeed: Update wip/sfeed to 0.9.6
Module Name: pkgsrc-wip
Committed By: Leonardo Taccari <leot%NetBSD.org@localhost>
Pushed By: leot
Date: Sat Sep 8 15:03:58 2018 +0200
Changeset: 9448f4359e20e949038986a9d5053aba9c51609b
Modified Files:
sfeed/Makefile
sfeed/distinfo
Removed Files:
sfeed/patches/patch-sfeed.c
sfeed/patches/patch-sfeed__opml__import.c
sfeed/patches/patch-sfeed__web.c
sfeed/patches/patch-sfeed__xmlenc.c
sfeed/patches/patch-util.c
Log Message:
sfeed: Update wip/sfeed to 0.9.6
pkgsrc changes:
- Remove all patches, they were imported upstream
Changes:
- Misc bug fixes and improvements
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=9448f4359e20e949038986a9d5053aba9c51609b
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
sfeed/Makefile | 2 +-
sfeed/distinfo | 13 +--
sfeed/patches/patch-sfeed.c | 154 ------------------------------
sfeed/patches/patch-sfeed__opml__import.c | 15 ---
sfeed/patches/patch-sfeed__web.c | 15 ---
sfeed/patches/patch-sfeed__xmlenc.c | 15 ---
sfeed/patches/patch-util.c | 24 -----
7 files changed, 5 insertions(+), 233 deletions(-)
diffs:
diff --git a/sfeed/Makefile b/sfeed/Makefile
index ed04669525..87711ccf5f 100644
--- a/sfeed/Makefile
+++ b/sfeed/Makefile
@@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.2 2018/02/28 16:32:56 leot Exp $
-DISTNAME= sfeed-0.9.5
+DISTNAME= sfeed-0.9.6
CATEGORIES= news
MASTER_SITES= http://codemadness.org/releases/sfeed/
diff --git a/sfeed/distinfo b/sfeed/distinfo
index 662f47ffc2..7fefd30f50 100644
--- a/sfeed/distinfo
+++ b/sfeed/distinfo
@@ -1,11 +1,6 @@
$NetBSD: distinfo,v 1.1 2018/02/26 16:52:21 leot Exp $
-SHA1 (sfeed-0.9.5.tar.gz) = 6de7b76ec357c7f6d5289e88a842924cb95e7846
-RMD160 (sfeed-0.9.5.tar.gz) = 349e363785877c0a0a9879038746085de797dbf7
-SHA512 (sfeed-0.9.5.tar.gz) = f9c667632fb86395588a7917bb92c48e82768021c54595db8cd5e8bbaf043def2678f54f77cbbb7c8d673eff04d5f99d00d1c244b1089d7b77f4e23e8fa3e079
-Size (sfeed-0.9.5.tar.gz) = 37374 bytes
-SHA1 (patch-sfeed.c) = 7239a85c8c8a1fd207d2a8386d691c09b3b8cc4f
-SHA1 (patch-sfeed__opml__import.c) = f4870e075cf2675cfa6a104ecd594e7b373537e2
-SHA1 (patch-sfeed__web.c) = 361c9b985e8610bedf35176147c3b8c9511233ce
-SHA1 (patch-sfeed__xmlenc.c) = 2476f0f4ff215a60da57cfd7eec5c1b6af1e7c55
-SHA1 (patch-util.c) = e5e4992e1ab2646108c92830e7737b5c784c5afd
+SHA1 (sfeed-0.9.6.tar.gz) = aa74e014c241e5b9fe7bce62831c3d59f9a3b84f
+RMD160 (sfeed-0.9.6.tar.gz) = 3185e0878bd36197c120aca72fa721b0b77ca780
+SHA512 (sfeed-0.9.6.tar.gz) = aac260529cb9dab129d1ce2165e2b9917f12f9600b197f3e92465ba23e49c3c2bdcfa0c9e54f064546d5d94482ce655e882f34bd563b5ee49208e384228004e9
+Size (sfeed-0.9.6.tar.gz) = 37436 bytes
diff --git a/sfeed/patches/patch-sfeed.c b/sfeed/patches/patch-sfeed.c
deleted file mode 100644
index 2fa975094f..0000000000
--- a/sfeed/patches/patch-sfeed.c
+++ /dev/null
@@ -1,154 +0,0 @@
-$NetBSD$
-
-Avoid possible UBs in ctype(3) functions.
-
---- sfeed.c.orig 2018-09-07 16:16:51.071550475 +0000
-+++ sfeed.c
-@@ -247,10 +247,10 @@ string_print_encoded(String *s)
- return;
-
- /* skip leading whitespace */
-- for (p = s->data; *p && isspace((int)*p); p++)
-+ for (p = s->data; *p && isspace((unsigned char)*p); p++)
- ;
- /* seek location of trailing whitespace */
-- for (e = s->data + s->len; e > p && isspace((int)*(e - 1)); e--)
-+ for (e = s->data + s->len; e > p && isspace((unsigned char)*(e - 1)); e--)
- ;
-
- for (; *p && p != e; p++) {
-@@ -260,7 +260,7 @@ string_print_encoded(String *s)
- case '\t': fputs("\\t", stdout); break;
- default:
- /* ignore control chars */
-- if (!iscntrl((int)*p))
-+ if (!iscntrl((unsigned char)*p))
- putchar(*p);
- break;
- }
-@@ -278,16 +278,16 @@ string_print_trimmed(String *s)
- return;
-
- /* skip leading whitespace */
-- for (p = s->data; *p && isspace((int)*p); p++)
-+ for (p = s->data; *p && isspace((unsigned char)*p); p++)
- ;
- /* seek location of trailing whitespace */
-- for (e = s->data + s->len; e > p && isspace((int)*(e - 1)); e--)
-+ for (e = s->data + s->len; e > p && isspace((unsigned char)*(e - 1)); e--)
- ;
-
- for (; *p && p != e; p++) {
-- if (isspace((int)*p))
-+ if (isspace((unsigned char)*p))
- putchar(' '); /* any whitespace to space */
-- else if (!iscntrl((int)*p))
-+ else if (!iscntrl((unsigned char)*p))
- /* ignore other control chars */
- putchar((int)*p);
- }
-@@ -376,20 +376,20 @@ gettzoffset(const char *s)
- int tzhour = 0, tzmin = 0;
- size_t i, namelen;
-
-- for (; *s && isspace((int)*s); s++)
-+ for (; *s && isspace((unsigned char)*s); s++)
- ;
- switch (s[0]) {
- case '-': /* offset */
- case '+':
-- for (i = 0, p = s + 1; i < 2 && *p && isdigit(*p); i++, p++)
-+ for (i = 0, p = s + 1; i < 2 && *p && isdigit((unsigned char)*p); i++, p++)
- tzhour = (tzhour * 10) + (*p - '0');
-- if (*p && !isdigit(*p))
-+ if (*p && !isdigit((unsigned char)*p))
- p++;
-- for (i = 0; i < 2 && *p && isdigit(*p); i++, p++)
-+ for (i = 0; i < 2 && *p && isdigit((unsigned char)*p); i++, p++)
- tzmin = (tzmin * 10) + (*p - '0');
- return ((tzhour * 3600) + (tzmin * 60)) * (s[0] == '-' ? -1 : 1);
- default: /* timezone name */
-- for (i = 0; *s && isalpha((int)s[i]); i++)
-+ for (i = 0; *s && isalpha((unsigned char)s[i]); i++)
- ;
- namelen = i; /* end of name */
- /* optimization: these are always non-matching */
-@@ -429,49 +429,49 @@ parsetime(const char *s, time_t *tp)
- int va[6] = { 0 }, i, j, v, vi;
- size_t m;
-
-- for (; *s && isspace((int)*s); s++)
-+ for (; *s && isspace((unsigned char)*s); s++)
- ;
-- if (!isdigit((int)*s) && !isalpha((int)*s))
-+ if (!isdigit((unsigned char)*s) && !isalpha((unsigned char)*s))
- return -1;
-
-- if (isdigit((int)*s)) {
-+ if (isdigit((unsigned char)*s)) {
- /* format "%Y-%m-%d %H:%M:%S" or "%Y-%m-%dT%H:%M:%S" */
- vi = 0;
- time:
- for (; *s && vi < 6; vi++) {
-- for (i = 0, v = 0; *s && i < 4 && isdigit((int)*s); s++, i++)
-+ for (i = 0, v = 0; *s && i < 4 && isdigit((unsigned char)*s); s++, i++)
- v = (v * 10) + (*s - '0');
- va[vi] = v;
- if ((vi < 2 && *s == '-') ||
-- (vi == 2 && (*s == 'T' || isspace((int)*s))) ||
-+ (vi == 2 && (*s == 'T' || isspace((unsigned char)*s))) ||
- (vi > 2 && *s == ':'))
- s++;
- }
- /* TODO: only if seconds are parsed (vi == 5)? */
- /* skip milliseconds for: %Y-%m-%dT%H:%M:%S.000Z */
- if (*s == '.') {
-- for (s++; *s && isdigit((int)*s); s++)
-+ for (s++; *s && isdigit((unsigned char)*s); s++)
- ;
- }
- end = s;
-- } else if (isalpha((int)*s)) {
-+ } else if (isalpha((unsigned char)*s)) {
- /* format: "%a, %d %b %Y %H:%M:%S" */
- /* parse "%a, %d %b %Y " part, then use time parsing as above */
-- for (; *s && isalpha((int)*s); s++)
-+ for (; *s && isalpha((unsigned char)*s); s++)
- ;
-- for (; *s && isspace((int)*s); s++)
-+ for (; *s && isspace((unsigned char)*s); s++)
- ;
- if (*s != ',')
- return -1;
-- for (s++; *s && isspace((int)*s); s++)
-+ for (s++; *s && isspace((unsigned char)*s); s++)
- ;
-- for (v = 0, i = 0; *s && i < 4 && isdigit((int)*s); s++, i++)
-+ for (v = 0, i = 0; *s && i < 4 && isdigit((unsigned char)*s); s++, i++)
- v = (v * 10) + (*s - '0');
- va[2] = v; /* day */
-- for (; *s && isspace((int)*s); s++)
-+ for (; *s && isspace((unsigned char)*s); s++)
- ;
- /* end of word month */
-- for (j = 0; *s && isalpha((int)s[j]); j++)
-+ for (j = 0; *s && isalpha((unsigned char)s[j]); j++)
- ;
- /* check month name */
- if (j < 3 || j > 9)
-@@ -487,12 +487,12 @@ time:
- }
- if (m >= 12)
- return -1; /* no month found */
-- for (; *s && isspace((int)*s); s++)
-+ for (; *s && isspace((unsigned char)*s); s++)
- ;
-- for (v = 0, i = 0; *s && i < 4 && isdigit((int)*s); s++, i++)
-+ for (v = 0, i = 0; *s && i < 4 && isdigit((unsigned char)*s); s++, i++)
- v = (v * 10) + (*s - '0');
- va[0] = v; /* year */
-- for (; *s && isspace((int)*s); s++)
-+ for (; *s && isspace((unsigned char)*s); s++)
- ;
- /* parse regular time, see above */
- vi = 3;
diff --git a/sfeed/patches/patch-sfeed__opml__import.c b/sfeed/patches/patch-sfeed__opml__import.c
deleted file mode 100644
index 4bd76b9e30..0000000000
--- a/sfeed/patches/patch-sfeed__opml__import.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-Avoid possible UBs in ctype(3) functions.
-
---- sfeed_opml_import.c.orig 2018-08-26 13:03:06.000000000 +0000
-+++ sfeed_opml_import.c
-@@ -18,7 +18,7 @@ static void
- printsafe(const char *s)
- {
- for (; *s; s++) {
-- if (iscntrl((int)*s))
-+ if (iscntrl((unsigned char)*s))
- continue;
- else if (*s == '\\')
- fputs("\\\\", stdout);
diff --git a/sfeed/patches/patch-sfeed__web.c b/sfeed/patches/patch-sfeed__web.c
deleted file mode 100644
index 26262b5b76..0000000000
--- a/sfeed/patches/patch-sfeed__web.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-Avoid possible UBs in ctype(3) functions.
-
---- sfeed_web.c.orig 2018-08-26 13:03:06.000000000 +0000
-+++ sfeed_web.c
-@@ -22,7 +22,7 @@ static void
- printfeedtype(const char *s, FILE *fp)
- {
- for (; *s; s++)
-- if (!isspace((int)*s))
-+ if (!isspace((unsigned char)*s))
- fputc(*s, fp);
- }
-
diff --git a/sfeed/patches/patch-sfeed__xmlenc.c b/sfeed/patches/patch-sfeed__xmlenc.c
deleted file mode 100644
index 95f2c0804c..0000000000
--- a/sfeed/patches/patch-sfeed__xmlenc.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-Avoid possible UBs in ctype(3) functions.
-
---- sfeed_xmlenc.c.orig 2018-08-26 13:03:06.000000000 +0000
-+++ sfeed_xmlenc.c
-@@ -37,7 +37,7 @@ xmlattr(XMLParser *p, const char *tag, s
- if (*value) {
- /* output lowercase */
- for (; *value; value++)
-- putc(tolower((int)*value), stdout);
-+ putc(tolower((unsigned char)*value), stdout);
- putchar('\n');
- }
- exit(0);
diff --git a/sfeed/patches/patch-util.c b/sfeed/patches/patch-util.c
deleted file mode 100644
index 2ac4a4f42a..0000000000
--- a/sfeed/patches/patch-util.c
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD$
-
-Avoid possible UBs in ctype(3) functions.
-
---- util.c.orig 2018-08-26 13:03:06.000000000 +0000
-+++ util.c
-@@ -31,7 +31,7 @@ parseuri(const char *s, struct uri *u, i
- p += 2; /* skip "//" */
- } else {
- /* protocol part */
-- for (p = s; *p && (isalpha((int)*p) || isdigit((int)*p) ||
-+ for (p = s; *p && (isalpha((unsigned char)*p) || isdigit((unsigned char)*p) ||
- *p == '+' || *p == '-' || *p == '.'); p++)
- ;
- if (!strncmp(p, "://", 3)) {
-@@ -101,7 +101,7 @@ encodeuri(char *buf, size_t bufsiz, cons
- for (i = 0, b = 0; s[i]; i++) {
- if ((int)s[i] == ' ' ||
- (unsigned char)s[i] > 127 ||
-- iscntrl((int)s[i])) {
-+ iscntrl((unsigned char)s[i])) {
- if (b + 3 >= bufsiz)
- return -1;
- buf[b++] = '%';
Home |
Main Index |
Thread Index |
Old Index