From owner-svn-ports-all@FreeBSD.ORG  Mon Jan  6 23:34:30 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id BA62B833;
 Mon,  6 Jan 2014 23:34:30 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id A6C3616C1;
 Mon,  6 Jan 2014 23:34:30 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s06NYUJe000730;
 Mon, 6 Jan 2014 23:34:30 GMT (envelope-from bapt@svn.freebsd.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s06NYULC000728;
 Mon, 6 Jan 2014 23:34:30 GMT (envelope-from bapt@svn.freebsd.org)
Message-Id: <201401062334.s06NYULC000728@svn.freebsd.org>
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Mon, 6 Jan 2014 23:34:30 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r338956 - in head/Mk: . Scripts
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 06 Jan 2014 23:34:30 -0000

Author: bapt
Date: Mon Jan  6 23:34:29 2014
New Revision: 338956
URL: http://svnweb.freebsd.org/changeset/ports/338956

Log:
  pkgng expect all non ascii code and '%' to be urlencoded in the comment
  
  Reported by:	antoine
  Tested by:	antoine

Added:
  head/Mk/Scripts/pkgencode.awk   (contents, props changed)
Modified:
  head/Mk/bsd.pkgng.mk

Added: head/Mk/Scripts/pkgencode.awk
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/Mk/Scripts/pkgencode.awk	Mon Jan  6 23:34:29 2014	(r338956)
@@ -0,0 +1,23 @@
+# $FreeBSD$
+
+BEGIN {
+	for (i = 0; i <= 255; i++)
+		ord[sprintf("%c", i)] = i
+	for (i = 0; i < 128; i++) {
+		if (i != 37)
+			ascii = sprintf("%s%c", ascii, i)
+	}
+}
+function encode(str, c, len, res) {
+	len = length(str)
+	res = ""
+	for (i = 1; i <= len; i++) {
+		c = substr(str, i, 1);
+		if (index(ascii, c) != 0)
+			res = res c
+		else
+			res = res "%" sprintf("%02X", ord[c])
+	}
+	return res
+}
+{ print encode($0); }

Modified: head/Mk/bsd.pkgng.mk
==============================================================================
--- head/Mk/bsd.pkgng.mk	Mon Jan  6 23:28:42 2014	(r338955)
+++ head/Mk/bsd.pkgng.mk	Mon Jan  6 23:34:29 2014	(r338956)
@@ -41,7 +41,7 @@ create-manifest:
 	@${ECHO_CMD} "version: ${PKGVERSION}" >> ${MANIFESTF}
 	@${ECHO_CMD} "origin: ${PKGORIGIN}" >> ${MANIFESTF}
 	@${ECHO_CMD} "comment: |" >> ${MANIFESTF}
-	@${ECHO_CMD} "  "${COMMENT:Q} >> ${MANIFESTF}
+	@${ECHO_CMD} "  "${COMMENT:Q} | ${AWK} -f ${SCRIPTSDIR}/pkgencode.awk >> ${MANIFESTF}
 	@${ECHO_CMD} "maintainer: ${MAINTAINER}" >> ${MANIFESTF}
 	@${ECHO_CMD} "prefix: ${PREFIX}" >> ${MANIFESTF}
 #.if defined(NO_ARCH)