From nobody@FreeBSD.org  Tue Nov  6 20:27:50 2007
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8608716A418
	for <freebsd-gnats-submit@FreeBSD.org>; Tue,  6 Nov 2007 20:27:50 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21])
	by mx1.freebsd.org (Postfix) with ESMTP id 7402013C4B3
	for <freebsd-gnats-submit@FreeBSD.org>; Tue,  6 Nov 2007 20:27:50 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.14.1/8.14.1) with ESMTP id lA6KRZuf096238
	for <freebsd-gnats-submit@FreeBSD.org>; Tue, 6 Nov 2007 20:27:35 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.14.1/8.14.1/Submit) id lA6KRZ3x096237;
	Tue, 6 Nov 2007 20:27:35 GMT
	(envelope-from nobody)
Message-Id: <200711062027.lA6KRZ3x096237@www.freebsd.org>
Date: Tue, 6 Nov 2007 20:27:35 GMT
From: "Philip M. Gollucci" <pgollucci@p6m7g8.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: misc/zaptel: [PATCH]: unbreak 8.0-current
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         117879
>Category:       ports
>Synopsis:       misc/zaptel: [PATCH]: unbreak 8.0-current
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    sobomax
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Nov 06 20:30:03 UTC 2007
>Closed-Date:    Mon Mar 31 13:46:59 UTC 2008
>Last-Modified:  Mon Mar 31 13:50:01 UTC 2008
>Originator:     Philip M. Gollucci
>Release:        FreeBSD 8.0-CURRENT
>Organization:
Riderway Inc.
>Environment:
FreeBSD home.p6m7g8.net 8.0-CURRENT FreeBSD 8.0-CURRENT #0: Sun Nov 4 01:36:52 EDT 2007 pgollucci@home.p6m7g8.net:/usr/obj/usr/src/sys/HOME i386
>Description:
cvs rlog -r1.12 src/sys/sys/kthread.h
----------------------------
revision 1.12
date: 2007/10/26 17:03:22;  author: julian;  state: Exp;  lines: +1 -1
kthread_exit needs no stinkin argument.

Prototype changed.

While I'm here, fix __this__ particular patch file name since its already there.

files/patch-zaptel::zaptel.c-> files/patch-zaptel__zaptel.c 
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

cvs diff: files/patch-zaptel::zaptel.c was removed, no comparison available
cvs diff: files/patch-zaptel__zaptel.c is a new entry, no comparison available
--- /dev/null	2007-11-06 15:22:00.000000000 -0500
+++ files/patch-zaptel__zaptel.c	2007-11-06 15:19:08.000000000 -0500
@@ -0,0 +1,20 @@
+--- ./zaptel/zaptel.c.orig	2007-11-06 15:19:02.000000000 -0500
++++ ./zaptel/zaptel.c	2007-11-06 15:17:34.000000000 -0500
+@@ -254,7 +254,7 @@
+         while (1) {
+                 if (kthread_must_exit) {
+                         wakeup(cookie);
+-                        kthread_exit(0);
++                        kthread_exit();
+                 }
+ 
+                 ZAP_LOCK(toselwakeup_lock);
+@@ -396,7 +396,7 @@
+ 
+ int schluffen(void *q)
+ {
+-	int rc = tsleep(q, PZERO | PCATCH, "schluffen", 0);
++	int rc = tsleep(q, PZERO | PCATCH, "schluffen", 10);
+ 	switch(rc)
+ 	{
+ 		case EINTR:


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->sobomax 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Tue Nov 6 20:30:09 UTC 2007 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=117879 

From: "Philip M. Gollucci" <pgollucci@riderway.com>
To: bug-followup@FreeBSD.org,  pgollucci@p6m7g8.com
Cc:  
Subject: Re: ports/117879: misc/zaptel: [PATCH]: unbreak 8.0-current
Date: Wed, 7 Nov 2007 16:18:21 -0500

 This isn't quite right, I need to conditionalize this:
 
 grep kthread_exit */sys/sys/kthread.h
 src-RELENG_5/sys/sys/kthread.h:void    kthread_exit(int) __dead2;
 src-RELENG_6/sys/sys/kthread.h:void    kthread_exit(int) __dead2;
 src-RELENG_7/sys/sys/kthread.h:void    kthread_exit(int) __dead2;
 src-HEAD/sys/sys/kthread.h    :void    kthread_exit(void) __dead2;
 
 
 
 -- 
 ------------------------------------------------------------------------
 Philip M. Gollucci (philip@ridecharge.com)
 o:703.549.2050x206
 Senior System Admin - Riderway, Inc.
 http://riderway.com / http://ridecharge.com
 1024D/EC88A0BF 0DE5 C55C 6BF3 B235 2DAB  B89E 1324 9B4F EC88 A0BF
 
 Work like you don't need the money,
 love like you'll never get hurt,
 and dance like nobody's watching.
 

From: "Philip M. Gollucci" <pgollucci@riderway.com>
To: bug-followup@FreeBSD.org,  pgollucci@p6m7g8.com
Cc:  
Subject: Re: ports/117879: misc/zaptel: [PATCH]: unbreak 8.0-current
Date: Wed, 7 Nov 2007 16:48:27 -0500

 --------------070701070609050909050704
 Content-Type: text/plain; charset="ISO-8859-1"
 Content-Transfer-Encoding: 7bit
 
 Here is the correct one:
 
 Note, no files added or deleted this time.
 
 http://www.freebsd.org/doc/en_US.ISO8859-1/books/porters-handbook/freebsd-versions.html
 >>8.0-CURRENT after renaming kthread_create() and friends to
 >>kproc_create() etc.
 
 
 
 -- 
 ------------------------------------------------------------------------
 Philip M. Gollucci (philip@ridecharge.com)
 o:703.549.2050x206
 Senior System Admin - Riderway, Inc.
 http://riderway.com / http://ridecharge.com
 1024D/EC88A0BF 0DE5 C55C 6BF3 B235 2DAB  B89E 1324 9B4F EC88 A0BF
 
 Work like you don't need the money,
 love like you'll never get hurt,
 and dance like nobody's watching.
 
 
 --------------070701070609050909050704
 Content-Type: text/plain; name="misc_zaptel.diff.txt"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: inline; filename="misc_zaptel.diff.txt"
 
 Index: Makefile
 ===================================================================
 RCS file: /home/ncvs/ports/misc/zaptel/Makefile,v
 retrieving revision 1.31
 diff -u -r1.31 Makefile
 --- Makefile	23 Jul 2007 21:24:52 -0000	1.31
 +++ Makefile	7 Nov 2007 21:46:03 -0000
 @@ -45,6 +45,10 @@
  	@${REINPLACE_CMD} -e "s|<getopt.h>|<unistd.h>|g" \
  		${WRKSRC}/test/ztmonitor.c ${WRKSRC}/test/zttool.c \
  		${WRKSRC}/ztcfg/ztcfg.c
 +.if ${OSVERSION} >= 800002
 +	@${REINPLACE_CMD} -e "s|kthread_exit(0)|kthread_exit()|g" \
 +	  	${WRKSRC}/zaptel/zaptel.c
 +.endif
  
  pre-su-install:
  	@${MKDIR} ${PREFIX}/lib/zaptel
 
 --------------070701070609050909050704--
State-Changed-From-To: open->closed 
State-Changed-By: pav 
State-Changed-When: Mon Mar 31 13:36:15 UTC 2008 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=117879 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/117879: commit references a PR
Date: Mon, 31 Mar 2008 13:46:57 +0000 (UTC)

 pav         2008-03-31 13:46:47 UTC
 
   FreeBSD ports repository
 
   Modified files:
     misc/zaptel/files    patch-zaptel::zaptel.c 
   Log:
   - Fix build on 8-CURRENT
   
   PR:             ports/117879, ports/118061
   Submitted by:   Philip M. Gollucci <pgollucci@p6m7g8.com>, erwin
   Approved by:    maintainer timeout (sobomax; 4 months)
   
   Revision  Changes    Path
   1.5       +28 -4     ports/misc/zaptel/files/patch-zaptel::zaptel.c
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
