Date: Mon, 29 Jun 2009 18:09:35 GMT From: Mikolaj Golub <to.my.trociny@gmail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/136164: devel/libpdel does not build on 8-current Message-ID: <200906291809.n5TI9Z4m021613@www.freebsd.org> Resent-Message-ID: <200906291810.n5TIA4m9069743@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 136164 >Category: ports >Synopsis: devel/libpdel does not build on 8-current >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Mon Jun 29 18:10:04 UTC 2009 >Closed-Date: >Last-Modified: >Originator: Mikolaj Golub >Release: >Organization: >Environment: FreeBSD fbsd.zhuzha.ua1 8.0-CURRENT FreeBSD 8.0-CURRENT #0 r193993M: Thu Jun 11 17:01:46 EEST 2009 root@zhuzha.ua1:/home/golub/freebsd/build/obj/home/golub/freebsd/src/sys/GENERIC i386 >Description: Building devel/libpdel on 8-current returns error: cc -O2 -pipe -fno-strict-aliasing -I/usr/ports/devel/libpdel/work/libpdel-0.5.3 -I/usr/local/include -DTYPED_MEM_UNDEFINE_ORIGINALS -O2 -Wall -Wcast-align -Wchar-subscripts -Wcomment -Wformat -Wimplicit -Wmissing-declarations -Wmissing-prototypes -Wnested-externs -Wno-long-long -Wparentheses -Wpointer-arith -Wreturn-type -Wswitch -Wtrigraphs -Wuninitialized -Wunused -Wwrite-strings -g -std=gnu99 -fstack-protector -c /usr/ports/devel/libpdel/work/libpdel-0.5.3/ppp/ppp_l2tp_ctrl.c /usr/ports/devel/libpdel/work/libpdel-0.5.3/ppp/ppp_l2tp_ctrl.c:203: error: 'NG_HOOKLEN' undeclared here (not in a function) /usr/ports/devel/libpdel/work/libpdel-0.5.3/ppp/ppp_l2tp_ctrl.c: In function 'ppp_l2tp_ctrl_event': /usr/ports/devel/libpdel/work/libpdel-0.5.3/ppp/ppp_l2tp_ctrl.c:1863: error: 'NG_PATHLEN' undeclared (first use in this function) /usr/ports/devel/libpdel/work/libpdel-0.5.3/ppp/ppp_l2tp_ctrl.c:1863: error: (Each undeclared identifier is reported only once /usr/ports/devel/libpdel/work/libpdel-0.5.3/ppp/ppp_l2tp_ctrl.c:1863: error: for each function it appears in.) /usr/ports/devel/libpdel/work/libpdel-0.5.3/ppp/ppp_l2tp_ctrl.c:1863: warning: unused variable 'raddr' *** Error code 1 Stop in /usr/ports/devel/libpdel/work/libpdel-0.5.3. *** Error code 1 Stop in /usr/ports/devel/libpdel. The problem was introduced by this commit to HEAD: Tue Jun 9 07:07:20 2009 UTC (2 weeks, 6 days ago) by imp Branches: MAIN CVS tags: HEAD Diff to: previous 1.30: preferred, colored Changes since revision 1.30: +0 -9 lines SVN rev 193812 on 2009-06-09 07:07:20Z by imp World now builds without these defines, so eliminate them. Approved by: julian@ >How-To-Repeat: >Fix: Place the attached patch to devel/libpdel/files. It works for 6/7/8-current. URL from pkg-plist (http://www.dellroad.org/pdel/) is not accessible so I can't check if there is new version with the fix or commit the patch there if there is not. Patch attached with submission follows: --- ppp/ppp_l2tp_ctrl.c.orig 2009-06-29 16:47:00.000000000 +0300 +++ ppp/ppp_l2tp_ctrl.c 2009-06-29 16:54:53.000000000 +0300 @@ -200,7 +200,7 @@ u_int16_t peer_id; /* peer session id */ struct ppp_log *log; /* log */ ng_ID_t node_id; /* tee node id */ - char hook[NG_HOOKLEN + 1]; /* session hook name */ + char hook[NG_HOOKSIZ]; /* session hook name */ void *link_cookie; /* opaque link cookie */ u_int16_t result; /* close result code */ u_int16_t error; /* close error code */ @@ -608,7 +608,7 @@ /* Done */ *nodep = ctrl->node_id; - strlcpy(hook, NG_L2TP_HOOK_LOWER, NG_HOOKLEN + 1); + strlcpy(hook, NG_L2TP_HOOK_LOWER, NG_HOOKSIZ); return (ctrl); fail: @@ -1860,7 +1860,7 @@ struct ng_mesg msg; } buf; struct ng_mesg *const msg = &buf.msg; - char raddr[NG_PATHLEN + 1]; + char raddr[NG_PATHSIZ]; int len; /* Read netgraph control message */ --- ppp/ppp_l2tp_ctrl.h.orig 2009-06-29 17:01:17.000000000 +0300 +++ ppp/ppp_l2tp_ctrl.h 2009-06-29 17:02:05.000000000 +0300 @@ -201,7 +201,7 @@ * peer_id Unique identifier for peer (used for tie-breakers) * initiate Whether to send a SCCRQ or just wait for one * nodep Pointer to netgraph node ID variable - * hook Buffer for hook on L2TP netgraph node (size >= NG_HOOKLEN + 1) + * hook Buffer for hook on L2TP netgraph node (size >= NG_HOOKSIZ) * avps List of AVP's to include in the associated * Start-Control-Connection-Request or * Start-Control-Connection-Reply control message. --- ppp/ppp_l2tp_server.c.orig 2009-06-29 16:58:07.000000000 +0300 +++ ppp/ppp_l2tp_server.c 2009-06-29 17:00:52.000000000 +0300 @@ -103,7 +103,7 @@ struct ppp_channel *chan; /* pointer to channel */ struct ppp_auth_config auth; /* auth config */ char node[32]; /* node path */ - char hook[NG_HOOKLEN + 1]; /* node hook */ + char hook[NG_HOOKSIZ]; /* node hook */ char logname[32]; /* peer logname */ struct in_addr ip; /* peer ip address */ u_int16_t port; /* peer port */ @@ -536,7 +536,7 @@ struct sockaddr_in sin; const size_t bufsize = 8192; u_int16_t *buf = NULL; - char hook[NG_HOOKLEN + 1]; + char hook[NG_HOOKSIZ]; socklen_t sin_len; char namebuf[64]; ng_ID_t node_id; --- ppp/ppp_node.c.orig 2009-06-29 17:02:43.000000000 +0300 +++ ppp/ppp_node.c 2009-06-29 17:03:21.000000000 +0300 @@ -431,7 +431,7 @@ ppp_node_send_msg(struct ppp_node *node, const char *relpath, u_int32_t cookie, u_int32_t cmd, const void *payload, size_t plen) { - char path[NG_PATHLEN + 1]; + char path[NG_PATHSIZ]; if (relpath == NULL) strlcpy(path, NODE_HOOK, sizeof(path)); @@ -494,7 +494,7 @@ { struct ppp_node *const node = arg; const size_t max_msglen = 4096; - char raddr[NG_PATHLEN + 1]; + char raddr[NG_PATHSIZ]; struct ppp_node_recvmsg *rm; struct ng_mesg *msg; int found = 0; >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200906291809.n5TI9Z4m021613>