From owner-svn-ports-all@freebsd.org Sat Jul 30 00:49:18 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E1D62BA71E1; Sat, 30 Jul 2016 00:49:18 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 98C671192; Sat, 30 Jul 2016 00:49:18 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u6U0nHGh053088; Sat, 30 Jul 2016 00:49:17 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u6U0nH94053086; Sat, 30 Jul 2016 00:49:17 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201607300049.u6U0nH94053086@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Sat, 30 Jul 2016 00:49:17 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r419292 - head/www/caudium14/files 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.22 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 30 Jul 2016 00:49:19 -0000 Author: bapt Date: Sat Jul 30 00:49:17 2016 New Revision: 419292 URL: https://svnweb.freebsd.org/changeset/ports/419292 Log: Prevent collision with getline(3) Added: head/www/caudium14/files/patch-src_tools_htpasswd.c (contents, props changed) head/www/caudium14/files/patch-src_tools_htpasswd.h (contents, props changed) Added: head/www/caudium14/files/patch-src_tools_htpasswd.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/caudium14/files/patch-src_tools_htpasswd.c Sat Jul 30 00:49:17 2016 (r419292) @@ -0,0 +1,20 @@ +--- src/tools/htpasswd.c.orig 2011-09-15 05:13:13 UTC ++++ src/tools/htpasswd.c +@@ -53,7 +53,7 @@ void getword(char *word, char *line, cha + ; + } + +-int getline(char *s, int n, FILE *f) { ++int get_line(char *s, int n, FILE *f) { + register int i=0; + + while(1) { +@@ -165,7 +165,7 @@ int main(int argc, char *argv[]) { + strcpy(user,argv[2]); + + found = 0; +- while(!(getline(line,MAX_STRING_LEN,f))) { ++ while(!(get_line(line,MAX_STRING_LEN,f))) { + if(found || (line[0] == '#') || (!line[0])) { + putline(tfp,line); + continue; Added: head/www/caudium14/files/patch-src_tools_htpasswd.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/caudium14/files/patch-src_tools_htpasswd.h Sat Jul 30 00:49:17 2016 (r419292) @@ -0,0 +1,11 @@ +--- src/tools/htpasswd.h.orig 2011-09-15 05:13:13 UTC ++++ src/tools/htpasswd.h +@@ -2,7 +2,7 @@ + #define HTPASSWD_H + char *strd(char *s); + void getword(char *word, char *line, char stop); +-int getline(char *s, int n, FILE *f); ++int get_line(char *s, int n, FILE *f); + void putline(FILE *f,char *l); + void to64(register char *s, register long v, register int n); + void add_password(char *user, FILE *f);