Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 11 Sep 2013 19:57:07 +0000 (UTC)
From:      Guido Falsi <madpilot@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r327009 - head/www/nostromo/files
Message-ID:  <201309111957.r8BJv7af097742@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: madpilot
Date: Wed Sep 11 19:57:07 2013
New Revision: 327009
URL: http://svnweb.freebsd.org/changeset/ports/327009

Log:
  - Modify clang patch to match upstream
  
  PR:		ports/181493
  Submitted by:   Adrian Steinmann <ast@NetBSD.org> (maintainer from
  		different email, as followup)

Added:
  head/www/nostromo/files/patch-src-nhttpd-main   (contents, props changed)
Modified:
  head/www/nostromo/files/patch-src-libmy-strb64d.c

Modified: head/www/nostromo/files/patch-src-libmy-strb64d.c
==============================================================================
--- head/www/nostromo/files/patch-src-libmy-strb64d.c	Wed Sep 11 19:47:43 2013	(r327008)
+++ head/www/nostromo/files/patch-src-libmy-strb64d.c	Wed Sep 11 19:57:07 2013	(r327009)
@@ -1,11 +1,19 @@
---- src/libmy/strb64d.c.orig	2005-06-04 10:30:04.000000000 +0200
-+++ src/libmy/strb64d.c	2013-08-23 19:17:25.700331962 +0200
-@@ -54,7 +54,7 @@
+--- src/libmy/strb64d.c.orig	2013-09-10 09:58:37.814139989 +0200
++++ src/libmy/strb64d.c	2013-09-10 10:00:47.489957357 +0200
+@@ -47,14 +47,14 @@
+ int
+ strb64d(char *dst, const char *src, const int dsize)
+ {
+-	int		ch, i, j = 0;
++	int		ch, i, j;
+ 	char		out[3];
+ 	unsigned char	in_a[4], in_b[4];
+ 
  	dst[0] = '\0';
  
  	while (1) {
 -		for (i = 0, j = j; i < 4; i++, j++) {
-+		for (i = 0; i < 4; i++, j++) {
++		for (i = 0, j = 0; i < 4; i++, j++) {
  			if (src[j] == '\0')
  				goto quit;
  			ch = src[j];

Added: head/www/nostromo/files/patch-src-nhttpd-main
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/nostromo/files/patch-src-nhttpd-main	Wed Sep 11 19:57:07 2013	(r327009)
@@ -0,0 +1,11 @@
+--- src/nhttpd/main.c.orig	2013-09-10 10:02:24.538148541 +0200
++++ src/nhttpd/main.c	2013-09-10 10:12:40.431140031 +0200
+@@ -686,7 +686,7 @@
+ 	 * clear all environment variables and save PATH
+ 	 */
+ 	strlcpy(http_path, getenv("PATH"), sizeof(http_path));
+-	memset(environ, 0, sizeof(environ));
++	*environ = NULL;
+ 
+ 	/*
+ 	 * get servers IP adress(es)



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201309111957.r8BJv7af097742>