svn commit: r384606 - in head/devel/pkgconf: . files

[Baptiste Daroussin]

Author: bapt
Date: Thu Apr 23 20:08:47 2015
New Revision: 384606
URL: https://svnweb.freebsd.org/changeset/ports/384606

Log:
  Add a patch to fix a regression when parsing commented lines
  
  Reported by:	antoine
  Obtained from:	upstream

Added:
  head/devel/pkgconf/files/
  head/devel/pkgconf/files/patch-fix-comment-lines   (contents, props changed)
Modified:
  head/devel/pkgconf/Makefile

Modified: head/devel/pkgconf/Makefile
==============================================================================
--- head/devel/pkgconf/Makefile	Thu Apr 23 19:53:11 2015	(r384605)
+++ head/devel/pkgconf/Makefile	Thu Apr 23 20:08:47 2015	(r384606)
@@ -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/

Added: head/devel/pkgconf/files/patch-fix-comment-lines
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/pkgconf/files/patch-fix-comment-lines	Thu Apr 23 20:08:47 2015	(r384606)
@@ -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;
+ 		}