From nobody@FreeBSD.org  Thu Aug  6 15:16:05 2009
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 3DEC4106566B
	for <freebsd-gnats-submit@FreeBSD.org>; Thu,  6 Aug 2009 15:16:05 +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 138E98FC08
	for <freebsd-gnats-submit@FreeBSD.org>; Thu,  6 Aug 2009 15:16:05 +0000 (UTC)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.14.3/8.14.3) with ESMTP id n76FG4gn011329
	for <freebsd-gnats-submit@FreeBSD.org>; Thu, 6 Aug 2009 15:16:04 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.14.3/8.14.3/Submit) id n76FG4Dc011328;
	Thu, 6 Aug 2009 15:16:04 GMT
	(envelope-from nobody)
Message-Id: <200908061516.n76FG4Dc011328@www.freebsd.org>
Date: Thu, 6 Aug 2009 15:16:04 GMT
From: bf <bf1783@gmail.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [PATCH] unbreak world WITHOUT_NETGRAPH
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         137487
>Category:       conf
>Synopsis:       [patch] [build] unbreak world WITHOUT_NETGRAPH
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    antoine
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Thu Aug 06 15:20:01 UTC 2009
>Closed-Date:    Sat Jan 30 16:00:15 UTC 2010
>Last-Modified:  Sat Jan 30 16:00:15 UTC 2010
>Originator:     bf
>Release:        8-BETA2 amd64
>Organization:
-
>Environment:
>Description:
WITHOUT_NETGRAPH=yes breaks the buildworld target when PPP_NO_NETGRAPH is not also defined:

..
mkdep -f .depend -a    -DNOINET6 -DNOATM /usr/src/usr.sbin/ppp/acf.c /usr/src/usr.sbin/ppp/arp.c /usr/src/usr.sbin/ppp/async.c /usr/src/usr.sbin/ppp/auth.c /usr/src/usr.sbin/ppp/bundle.c /usr/src/usr.sbin/ppp/cbcp.c /usr/src/usr.sbin/ppp/ccp.c /usr/src/usr.sbin/ppp/chap.c /usr/src/usr.sbin/ppp/chat.c /usr/src/usr.sbin/ppp/command.c /usr/src/usr.sbin/ppp/datalink.c /usr/src/usr.sbin/ppp/deflate.c /usr/src/usr.sbin/ppp/defs.c /usr/src/usr.sbin/ppp/exec.c /usr/src/usr.sbin/ppp/filter.c /usr/src/usr.sbin/ppp/fsm.c /usr/src/usr.sbin/ppp/hdlc.c /usr/src/usr.sbin/ppp/iface.c /usr/src/usr.sbin/ppp/ip.c /usr/src/usr.sbin/ppp/ipcp.c /usr/src/usr.sbin/ppp/ipv6cp.c /usr/src/usr.sbin/ppp/iplist.c /usr/src/usr.sbin/ppp/lcp.c /usr/src/usr.sbin/ppp/link.c /usr/src/usr.sbin/ppp/log.c /usr/src/usr.sbin/ppp/lqr.c /usr/src/usr.sbin/ppp/main.c /usr/src/usr.sbin/ppp/mbuf.c /usr/src/usr.sbin/ppp/mp.c /usr/src/usr.sbin/ppp/ncp.c /usr/src/usr.sbin/ppp/ncpaddr.c /usr/src/usr.sbin/ppp/pap.c /usr/src/us
 r.sbin/ppp/physical.c /usr/src/usr.sbin/ppp/pred.c /usr/src/usr.sbin/ppp/probe.c /usr/src/usr.sbin/ppp/prompt.c /usr/src/usr.sbin/ppp/proto.c /usr/src/usr.sbin/ppp/route.c /usr/src/usr.sbin/ppp/server.c /usr/src/usr.sbin/ppp/sig.c /usr/src/usr.sbin/ppp/slcompress.c /usr/src/usr.sbin/ppp/sync.c /usr/src/usr.sbin/ppp/systems.c /usr/src/usr.sbin/ppp/tcp.c /usr/src/usr.sbin/ppp/tcpmss.c /usr/src/usr.sbin/ppp/throughput.c /usr/src/usr.sbin/ppp/timer.c /usr/src/usr.sbin/ppp/tty.c /usr/src/usr.sbin/ppp/tun.c /usr/src/usr.sbin/ppp/udp.c /usr/src/usr.sbin/ppp/vjcomp.c /usr/src/usr.sbin/ppp/nat_cmd.c /usr/src/usr.sbin/ppp/id.c /usr/src/usr.sbin/ppp/chap_ms.c /usr/src/usr.sbin/ppp/mppe.c /usr/src/usr.sbin/ppp/radius.c /usr/src/usr.sbin/ppp/ether.c
/usr/src/usr.sbin/ppp/tty.c:46:22: error: netgraph.h: No such file or directory
/usr/src/usr.sbin/ppp/id.c:36:22: error: netgraph.h: No such file or directory
/usr/src/usr.sbin/ppp/ether.c:35:22: error: netgraph.h: No such file or directory
mkdep: compile failed
*** Error code 1

Stop in /usr/src/usr.sbin/ppp.
*** Error code 1

Stop in /usr/src/usr.sbin.
*** Error code 1

Stop in /usr/src.
*** Error code 1

Stop in /usr/src.
*** Error code 1

Stop in /usr/src.
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

--- src/usr.sbin/ppp/Makefile.orig	2009-08-06 10:26:26.000000000 -0400
+++ src/usr.sbin/ppp/Makefile	2009-08-06 07:31:01.000000000 -0400
@@ -28,6 +28,9 @@
 .if ${MK_PAM_SUPPORT} == "no"
 PPP_NO_PAM=
 .endif
+.if ${MK_NETGRAPH} == "no"
+PPP_NO_NETGRAPH=
+.endif
 
 .if defined(PPP_NO_SUID)
 BINMODE=550


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-bugs->antoine 
Responsible-Changed-By: antoine 
Responsible-Changed-When: Sat Jan 9 23:44:51 UTC 2010 
Responsible-Changed-Why:  
Take. 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: conf/137487: commit references a PR
Date: Sat, 16 Jan 2010 12:20:40 +0000 (UTC)

 Author: antoine
 Date: Sat Jan 16 12:20:26 2010
 New Revision: 202440
 URL: http://svn.freebsd.org/changeset/base/202440
 
 Log:
   Unbreak world WITHOUT_NETGRAPH.
   
   PR:		137487
   Submitted by:	bf (previous version)
   No objections:	net@
   MFC after:	2 weeks
 
 Modified:
   head/share/mk/bsd.own.mk
   head/usr.sbin/ppp/Makefile
 
 Modified: head/share/mk/bsd.own.mk
 ==============================================================================
 --- head/share/mk/bsd.own.mk	Sat Jan 16 12:18:44 2010	(r202439)
 +++ head/share/mk/bsd.own.mk	Sat Jan 16 12:20:26 2010	(r202440)
 @@ -468,6 +468,11 @@ MK_MAILWRAPPER:= no
  MK_SENDMAIL:=	no
  .endif
  
 +.if ${MK_NETGRAPH} == "no"
 +MK_ATM:=	no
 +MK_BLUETOOTH:=	no
 +.endif
 +
  .if ${MK_OPENSSL} == "no"
  MK_OPENSSH:=	no
  MK_KERBEROS:=	no
 
 Modified: head/usr.sbin/ppp/Makefile
 ==============================================================================
 --- head/usr.sbin/ppp/Makefile	Sat Jan 16 12:18:44 2010	(r202439)
 +++ head/usr.sbin/ppp/Makefile	Sat Jan 16 12:20:26 2010	(r202440)
 @@ -25,6 +25,9 @@ PPP_NO_SUID=
  .if ${MK_ATM} == "no"
  PPP_NO_ATM=
  .endif
 +.if ${MK_NETGRAPH} == "no"
 +PPP_NO_NETGRAPH=
 +.endif
  .if ${MK_PAM_SUPPORT} == "no"
  PPP_NO_PAM=
  .endif
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: open->patched 
State-Changed-By: antoine 
State-Changed-When: Sat Jan 16 12:31:24 UTC 2010 
State-Changed-Why:  
patched in head 

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

From: "b. f." <bf1783@googlemail.com>
To: antoine@freebsd.org
Cc: bug-followup@FreeBSD.org
Subject: Re: conf/137487: [patch] [build] unbreak world WITHOUT_NETGRAPH
Date: Sat, 16 Jan 2010 09:43:56 -0500

 --0016e6d5665f663b58047d4926fa
 Content-Type: text/plain; charset=ISO-8859-1
 
 On 1/16/10, antoine@freebsd.org <antoine@freebsd.org> wrote:
 > Synopsis: [patch] [build] unbreak world WITHOUT_NETGRAPH
 >
 > State-Changed-From-To: open->patched
 > State-Changed-By: antoine
 > State-Changed-When: Sat Jan 16 12:31:24 UTC 2010
 > State-Changed-Why:
 > patched in head
 >
 > http://www.freebsd.org/cgi/query-pr.cgi?pr=137487
 >
 
 Thanks. I wonder if, as in the case of WITHOUT_PF and
 WITHOUT_IPFILTER, it makes much sense to build netgraph-related kernel
 modules without netgraph support in the userland? I would suggest also
 considering the change in the attached patch, which I forgot to put in
 the PR.
 
 Regards,
                 b.
 
 --0016e6d5665f663b58047d4926fa
 Content-Type: text/plain; charset=US-ASCII; name="usr_src_sys_modules_Makefile_diff.txt"
 Content-Disposition: attachment; 
 	filename="usr_src_sys_modules_Makefile_diff.txt"
 Content-Transfer-Encoding: base64
 X-Attachment-Id: file0
 
 SW5kZXg6IHN5cy9tb2R1bGVzL01ha2VmaWxlCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09
 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIHN5cy9tb2R1bGVzL01h
 a2VmaWxlCShyZXZpc2lvbiAyMDI0NDIpCisrKyBzeXMvbW9kdWxlcy9NYWtlZmlsZQkod29ya2lu
 ZyBjb3B5KQpAQCAtMTkyLDcgKzE5Miw3IEBACiAJJHtfbmNwfSBcCiAJJHtfbmN2fSBcCiAJJHtf
 bmRpc30gXAotCW5ldGdyYXBoIFwKKwkke19uZXRncmFwaH0gXAogCSR7X25mZX0gXAogCW5mc2Ns
 IFwKIAluZnNjbGllbnQgXApAQCAtMzI3LDYgKzMyNywxMCBAQAogX2lwZmlsdGVyPQlpcGZpbHRl
 cgogLmVuZGlmCiAKKy5pZiAke01LX05FVEdSQVBIfSAhPSAibm8iIHx8IGRlZmluZWQoQUxMX01P
 RFVMRVMpCitfbmV0Z3JhcGg9CW5ldGdyYXBoCisuZW5kaWYKKwogLmlmICR7TUtfUEZ9ICE9ICJu
 byIgfHwgZGVmaW5lZChBTExfTU9EVUxFUykKIF9wZj0JCXBmCiBfcGZsb2c9CQlwZmxvZwo=
 --0016e6d5665f663b58047d4926fa--

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: conf/137487: commit references a PR
Date: Sat, 30 Jan 2010 15:40:20 +0000 (UTC)

 Author: antoine
 Date: Sat Jan 30 15:40:00 2010
 New Revision: 203196
 URL: http://svn.freebsd.org/changeset/base/203196
 
 Log:
   MFC r202440 to stable/8:
     Unbreak world WITHOUT_NETGRAPH.
   
     PR:		137487
     Submitted by:	bf (previous version)
     No objections:	net@
 
 Modified:
   stable/8/share/mk/bsd.own.mk
   stable/8/usr.sbin/ppp/Makefile
 Directory Properties:
   stable/8/share/mk/   (props changed)
   stable/8/usr.sbin/ppp/   (props changed)
 
 Modified: stable/8/share/mk/bsd.own.mk
 ==============================================================================
 --- stable/8/share/mk/bsd.own.mk	Sat Jan 30 15:28:14 2010	(r203195)
 +++ stable/8/share/mk/bsd.own.mk	Sat Jan 30 15:40:00 2010	(r203196)
 @@ -468,6 +468,11 @@ MK_MAILWRAPPER:= no
  MK_SENDMAIL:=	no
  .endif
  
 +.if ${MK_NETGRAPH} == "no"
 +MK_ATM:=	no
 +MK_BLUETOOTH:=	no
 +.endif
 +
  .if ${MK_OPENSSL} == "no"
  MK_OPENSSH:=	no
  MK_KERBEROS:=	no
 
 Modified: stable/8/usr.sbin/ppp/Makefile
 ==============================================================================
 --- stable/8/usr.sbin/ppp/Makefile	Sat Jan 30 15:28:14 2010	(r203195)
 +++ stable/8/usr.sbin/ppp/Makefile	Sat Jan 30 15:40:00 2010	(r203196)
 @@ -25,6 +25,9 @@ PPP_NO_SUID=
  .if ${MK_ATM} == "no"
  PPP_NO_ATM=
  .endif
 +.if ${MK_NETGRAPH} == "no"
 +PPP_NO_NETGRAPH=
 +.endif
  .if ${MK_PAM_SUPPORT} == "no"
  PPP_NO_PAM=
  .endif
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: patched->closed 
State-Changed-By: antoine 
State-Changed-When: Sat Jan 30 15:59:43 UTC 2010 
State-Changed-Why:  
Thanks for the report, this is fixed in head and stable/8. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=137487 
>Unformatted:
