From owner-freebsd-ports  Tue May  1 16:20: 7 2001
Delivered-To: freebsd-ports@hub.freebsd.org
Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21])
	by hub.freebsd.org (Postfix) with ESMTP id 5ADF337B424
	for <freebsd-ports@hub.freebsd.org>; Tue,  1 May 2001 16:20:02 -0700 (PDT)
	(envelope-from gnats@FreeBSD.org)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.11.1/8.11.1) id f41NK2107943;
	Tue, 1 May 2001 16:20:02 -0700 (PDT)
	(envelope-from gnats)
Received: from melusine.cuivre.fr.eu.org (ppp60-net1-idf3-bas1.isdnet.net [195.154.52.60])
	by hub.freebsd.org (Postfix) with ESMTP id 4C12837B422
	for <FreeBSD-gnats-submit@freebsd.org>; Tue,  1 May 2001 16:15:10 -0700 (PDT)
	(envelope-from thomas@cuivre.fr.eu.org)
Received: by melusine.cuivre.fr.eu.org (Postfix, from userid 1000)
	id 7978D24D02; Wed,  2 May 2001 01:15:08 +0200 (CEST)
Message-Id: <20010501231508.7978D24D02@melusine.cuivre.fr.eu.org>
Date: Wed,  2 May 2001 01:15:08 +0200 (CEST)
From: thomas@cuivre.fr.eu.org
Reply-To: thomas@cuivre.fr.eu.org
To: FreeBSD-gnats-submit@freebsd.org
X-Send-Pr-Version: 3.113
Subject: ports/27018: Fix the compiled-in default configuration file path.
Sender: owner-freebsd-ports@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.org


>Number:         27018
>Category:       ports
>Synopsis:       Fix the compiled-in default configuration file path.
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Tue May 01 16:20:01 PDT 2001
>Closed-Date:
>Last-Modified:
>Originator:     Thomas Quinot
>Release:        FreeBSD 4.3-STABLE i386
>Organization:
>Environment:
System: FreeBSD melusine.cuivre.fr.eu.org 4.3-STABLE FreeBSD 4.3-STABLE #2: Tue May 1 20:28:53 CEST 2001 thomas@melusine.cuivre.fr.eu.org:/usr/obj/usr/src/sys/MELUSINE i386


	
>Description:
	The compiled-in path used by the port was inconsistent with
	the documentation, and with the location where the example
	config file was installed.
>How-To-Repeat:
	
>Fix:
	The following patch against the ports tree adds a new patch
	to the port that corrects the problem.

	This patch will also be submitted to the upstream maintainers.

--- /dev/null	Wed May  2 01:12:01 2001
+++ net/proxy-suite/files/patch-etcdir	Wed May  2 01:11:32 2001
@@ -0,0 +1,26 @@
+diff -ur work/proxy-suite-1.7/ftp-proxy/Makefile.in new/proxy-suite-1.7/ftp-proxy/Makefile.in
+--- work/proxy-suite-1.7/ftp-proxy/Makefile.in	Fri Oct 22 11:29:01 1999
++++ ftp-proxy/Makefile.in	Wed May  2 01:07:28 2001
+@@ -44,7 +44,7 @@
+ INSTALL=	@INSTALL@
+ 
+ CC=		@CC@
+-CFLAGS=		@CFLAGS@
++CFLAGS=		@CFLAGS@ -DETC_PATH=\"$(ETC_DIR)/\"
+ LDFLAGS=	@LDFLAGS@
+ 
+ LIBS=		@LIB_WRAP@ @LIB_LDAP@ @LIB_REGEX@ @LIBS@
+diff -ur work/proxy-suite-1.7/ftp-proxy/ftp-main.c new/proxy-suite-1.7/ftp-proxy/ftp-main.c
+--- work/proxy-suite-1.7/ftp-proxy/ftp-main.c	Fri Oct 22 11:29:01 1999
++++ ftp-proxy/ftp-main.c	Wed May  2 01:03:58 2001
+@@ -75,7 +75,9 @@
+ 
+ #define SELECT_TIMEOUT		60	/* Wake up regularly	*/
+ 
+-#define ETC_PATH		"/etc/proxy-suite/"
++#if !defined (ETC_PATH)
++#  define ETC_PATH		"/etc/proxy-suite/"
++#endif
+ #define DEFAULT_CONFIG		ETC_PATH "ftp-proxy.conf"
+ 
+ #if defined(COMPILE_DEBUG)
>Release-Note:
>Audit-Trail:
>Unformatted:

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message