From owner-freebsd-ports@FreeBSD.ORG Thu Sep 11 06:48:25 2014 Return-Path: Delivered-To: freebsd-ports@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A89744DE for ; Thu, 11 Sep 2014 06:48:25 +0000 (UTC) Received: from mail-ig0-x230.google.com (mail-ig0-x230.google.com [IPv6:2607:f8b0:4001:c05::230]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 775A07A2 for ; Thu, 11 Sep 2014 06:48:25 +0000 (UTC) Received: by mail-ig0-f176.google.com with SMTP id hn15so450573igb.3 for ; Wed, 10 Sep 2014 23:48:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type:content-transfer-encoding; bh=kselGOmGEattJc6CmwyQOm+TFtW3XsvJEBpF5PzFi80=; b=uGOe5zSdofxYP5FZrMTRqWhl64ff3fBFooCUhvj020B/0RC0Yu4eUcTXPHvpnRLjzV USX0/W4Xdg2thi9wNdg83e7bBzKtA5p/sWp/5mvMi6/U0L7aS+TKozCgHgfgKJQYnq++ lDg66+JJ49sxwgIr9RHEcpz/cYICpTZALpOkOfePOmshbOaoFMl+0ZfV3vysTA9r6E// AWslUNfEKQEXhY0XgP4mfAwt4WzKcd8ZTLP/p1pOG3KFjw6RzE9PrjNcuQxyZIJGQNlC sWsIhRKoh5uypS2X2p2OU7rejYoNy3eWNVT+FeZAuKvr5I4f2uxOXA9pfwkRgZLxCu2i KK8Q== MIME-Version: 1.0 X-Received: by 10.42.207.68 with SMTP id fx4mr157284icb.67.1410418104904; Wed, 10 Sep 2014 23:48:24 -0700 (PDT) Received: by 10.50.122.42 with HTTP; Wed, 10 Sep 2014 23:48:24 -0700 (PDT) In-Reply-To: <86y4trdau6.fsf@nine.des.no> References: <44lhpsd1ed.fsf@lowell-desk.lan> <86y4trdau6.fsf@nine.des.no> Date: Thu, 11 Sep 2014 01:48:24 -0500 Message-ID: Subject: Re: www/mod_dnssd broken for apache24 From: Scot Hetzel To: =?ISO-8859-1?Q?Dag=2DErling_Sm=F8rgrav?= Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Cc: Lowell Gilbert , FreeBSD Ports X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 Sep 2014 06:48:25 -0000 On Wed, Sep 10, 2014 at 5:33 AM, Dag-Erling Sm=F8rgrav wrote: > Lowell Gilbert writes: >> --- src/mod_dnssd.c~ 2009-01-27 21:24:00.000000000 -0500 >> +++ src/mod_dnssd.c 2014-09-09 15:23:08.000000000 -0400 >> @@ -576,7 +576,7 @@ >> >> ap_assert(d); >> >> - unixd_setup_child(); >> + ap_unixd_setup_child(); >> >> if (pipe(sigterm_pipe_fds) < 0) { >> ap_log_error(APLOG_MARK, APLOG_ERR, 0, r.main_server, "pipe() f= ailed: %s", strerror(errno)); > > I thought there was an #ifdef for that... but apparently I only fixed > it in mod_fastcgi, not mod_dnssd. Something like > > #if MODULE_MAGIC_NUMBER_MAJOR >=3D 20090130 > #define unixd_setup_child ap_unixd_setup_child > #endif > >> The other problem is that the port rewrites the httpd.conf file (to >> include the module), and the path is now wrong in the era of staging. >> I have a feeling that the "right" solution is to avoid writing into >> /usr/local directly, but that would be considerably less convenient. > > The port does no such thing. This is handled by the ports framework > which adds the following to the manifest during 'make package': > Actually, the port does write to the httpd.conf file during staging. The problem is in src/Makefile.in on line 21: + $(APXS) $(APXS_STAGE) -i -a mod_dnssd.la it is the -a that is telling APXS to write to the httpd.conf file located in SYSCONFDIR. Since the SYSCONFDIR is in PREFIX, the httpd.conf file gets rewritten. If you remove the -a from this line, then it shouldn't overwrite the entry that already exists in the httpd.conf with one point to the STAGEDIR. --=20 DISCLAIMER: No electrons were maimed while sending this message. Only slightly bruised.