aboutsummaryrefslogtreecommitdiffstats
path: root/devel
diff options
context:
space:
mode:
authorbapt <bapt@FreeBSD.org>2015-04-24 04:08:47 +0800
committerbapt <bapt@FreeBSD.org>2015-04-24 04:08:47 +0800
commit5101e2305a1f39fa20e40298f6d7f308ae724117 (patch)
tree8ca68fbafd4b02d282433054d514677ed37df18f /devel
parent543fc5e96e8123265799ec8223b6c87b5a8c8ba5 (diff)
downloadfreebsd-ports-gnome-5101e2305a1f39fa20e40298f6d7f308ae724117.tar.gz
freebsd-ports-gnome-5101e2305a1f39fa20e40298f6d7f308ae724117.tar.zst
freebsd-ports-gnome-5101e2305a1f39fa20e40298f6d7f308ae724117.zip
Add a patch to fix a regression when parsing commented lines
Reported by: antoine Obtained from: upstream
Diffstat (limited to 'devel')
-rw-r--r--devel/pkgconf/Makefile1
-rw-r--r--devel/pkgconf/files/patch-fix-comment-lines21
2 files changed, 22 insertions, 0 deletions
diff --git a/devel/pkgconf/Makefile b/devel/pkgconf/Makefile
index d8762fb741c4..0014503b6958 100644
--- a/devel/pkgconf/Makefile
+++ b/devel/pkgconf/Makefile
@@ -2,6 +2,7 @@
PORTNAME= pkgconf
PORTVERSION= 0.9.9
+PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= http://rabbit.dereferenced.org/~nenolod/distfiles/ \
http://files.etoilebsd.net/pkgconf/
diff --git a/devel/pkgconf/files/patch-fix-comment-lines b/devel/pkgconf/files/patch-fix-comment-lines
new file mode 100644
index 000000000000..9ed542282d6b
--- /dev/null
+++ b/devel/pkgconf/files/patch-fix-comment-lines
@@ -0,0 +1,21 @@
+diff --git fileio.c fileio.c
+index 1ef1978..c10a6d6 100644
+--- fileio.c
++++ fileio.c
+@@ -36,9 +36,14 @@ pkg_fgetline(char *line, size_t size, FILE *stream)
+ }
+ else if (c == '#')
+ {
+- if (!quoted)
++ if (!quoted) {
++ /* Skip the rest of the line */
++ do {
++ c = getc(stream);
++ } while (c != '\n' && c != EOF);
++ *s++ = c;
+ break;
+-
++ }
+ quoted = false;
+ continue;
+ }