Date: Mon, 9 Aug 2004 10:56:31 +0200 (CEST) From: Patrick MARIE <mycroft@virgaria.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/70200: net/yaph patch: fix build under -current Message-ID: <200408090856.i798uVUP052741@amethyst.in.virgaria.org> Resent-Message-ID: <200408090900.i7990ip6087661@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 70200
>Category: ports
>Synopsis: net/yaph patch: fix build under -current
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Mon Aug 09 09:00:44 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator: Patrick MARIE
>Release: FreeBSD 5.2-CURRENT i386
>Organization:
epplug.org
>Environment:
System: FreeBSD amethyst.in.virgaria.org 5.2-CURRENT FreeBSD 5.2-CURRENT #2: Fri Jul 23 18:38:35 CEST 2004 root@amethyst.in.virgaria.org:/usr/obj/usr/src/sys/amethyst i386
>Description:
Fix build under current.
Reported by: pointyhat build error logs
>How-To-Repeat:
cd /usr/ports/net/yaph
patch -p0 /path/to/yaph-init.c.patch
>Fix:
--- yaph-init.c.patch begins here ---
--- /usr/ports/net/yaph/files/patch-yaph::init.c Fri Oct 10 07:35:54 2003
+++ ./files/patch-yaph::init.c Mon Aug 9 10:41:56 2004
@@ -1,11 +1,30 @@
---- yaph/init.c.orig Sat Jun 14 14:52:31 2003
-+++ yaph/init.c Sat Jun 14 14:52:41 2003
-@@ -127,7 +127,7 @@
+--- yaph/init.c.orig Sun Feb 9 07:33:04 2003
++++ yaph/init.c Mon Aug 9 10:41:24 2004
+@@ -105,6 +105,7 @@
+ globals->content_data=malloc(1024*8);
+ if(!globals->content_data)
+ exit_error(errno);
++bzero(globals->content_data, 1024 * 8);
+ globals->content_request=malloc(1024*8);
+ if(!globals->content_request)
+ exit_error(errno);
+@@ -127,8 +128,9 @@
FILE *cnf=NULL;
char buff[1024];
if(!(cnf=fopen("./yaph.conf","rb")))
- if(!(cnf=fopen("/etc/yaph.conf","rb")))
-+ if(!(cnf=fopen(PREFIX "/etc/yaph.conf","rb")))
- goto no_file;
+- goto no_file;
++ cnf=fopen(PREFIX "/etc/yaph.conf","rb");
++
++ if(cnf != NULL)
while(fgets(buff,sizeof(buff),cnf))
{
+ if(buff[strspn(buff," ")]!='#')
+@@ -200,7 +202,6 @@
+ }
+ }
+ }
+- no_file:
+ }
+
+ // ------ open files
--- yaph-init.c.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200408090856.i798uVUP052741>