From thomas@cuivre.fr.eu.org  Mon Jan 21 14:15:01 2002
Return-Path: <thomas@cuivre.fr.eu.org>
Received: from melchior.cuivre.fr.eu.org (melchior.enst.fr [137.194.161.6])
	by hub.freebsd.org (Postfix) with ESMTP id B38AB37B417
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 21 Jan 2002 14:14:59 -0800 (PST)
Received: from melusine.cuivre.fr.eu.org (melusine.enst.fr [137.194.160.34])
	by melchior.cuivre.fr.eu.org (Postfix) with ESMTP id 7E63D82AF
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 21 Jan 2002 23:14:55 +0100 (CET)
Received: by melusine.cuivre.fr.eu.org (Postfix, from userid 1000)
	id 1858976; Mon, 21 Jan 2002 23:14:51 +0100 (CET)
Message-Id: <20020121221451.1858976@melusine.cuivre.fr.eu.org>
Date: Mon, 21 Jan 2002 23:14:51 +0100 (CET)
From: Thomas Quinot <thomas@cuivre.fr.eu.org>
Reply-To: Thomas Quinot <thomas@cuivre.fr.eu.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: net/proxy-suite: new upstream release
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         34136
>Category:       ports
>Synopsis:       net/proxy-suite: new upstream release
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Jan 21 14:20:00 PST 2002
>Closed-Date:    Mon Jan 21 22:03:06 PST 2002
>Last-Modified:  Mon Jan 21 22:03:19 PST 2002
>Originator:     Thomas Quinot
>Release:        FreeBSD 4.5-RC i386
>Organization:
>Environment:
System: FreeBSD melusine.cuivre.fr.eu.org 4.5-RC FreeBSD 4.5-RC #7: Tue Jan 15 22:29:15 CET 2002 thomas@melusine.cuivre.fr.eu.org:/usr/obj/usr/src/sys/MELUSINE i386


	
>Description:
	SuSE has released proxy-suite version 1.8.
>How-To-Repeat:
	
>Fix:
	Please apply the following patch.

	Thanks,
	Thomas.
	
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/net/proxy-suite/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- Makefile	19 Oct 2001 15:51:59 -0000	1.3
+++ Makefile	21 Jan 2002 22:12:18 -0000
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	proxy-suite
-PORTVERSION=	1.7
-PORTREVISION=	1
+PORTVERSION=	1.8
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.suse.com/pub/projects/proxy-suite/src/ \
 		ftp://ftp.crc.ca/pub/systems/linux/suse/projects/proxy-suite/src/ \
@@ -23,10 +22,16 @@
 # basic configure args
 #
 CONFIGURE_ARGS=	--prefix=${PREFIX} --with-libwrap=/usr/lib --with-regex \
-		--sysconfdir=${PREFIX}/etc/proxy-suite \
 		--localstatedir=/var/run \
-		--enable-warnings --enable-so-linger --enable-rfc1579 \
+		--enable-warnings --enable-so-linger \
 		--disable-proc-mods
+
+#
+# OPTIONAL: RFC1579 support -- not complete yet.
+#
+.if defined(WITH_RFC1579)
+CONFIGURE_ARGS+= --enable-rfc1579
+.endif
 
 #
 # OPTIONAL: include ldap-support - currently ldap.2 needs minor fixes...
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/net/proxy-suite/distinfo,v
retrieving revision 1.1
diff -u -r1.1 distinfo
--- distinfo	7 Apr 2001 05:54:49 -0000	1.1
+++ distinfo	21 Jan 2002 22:12:18 -0000
@@ -1 +1 @@
-MD5 (proxy-suite-1.7.tar.gz) = de879e5d0c6398fde9970db3c5877fad
+MD5 (proxy-suite-1.8.tar.gz) = 6411481720439022a3a2a0f30ec6a86b
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/net/proxy-suite/pkg-plist,v
retrieving revision 1.2
diff -u -r1.2 pkg-plist
--- pkg-plist	19 Oct 2001 15:52:00 -0000	1.2
+++ pkg-plist	21 Jan 2002 22:12:20 -0000
@@ -1,3 +1,2 @@
 sbin/ftp-proxy
-etc/proxy-suite/ftp-proxy.conf.sample
 @dirrm etc/proxy-suite
diff -u files/patch-cf /dev/null
--- files/patch-cf	Fri Oct 19 17:52:02 2001
+++ /dev/null	Mon Jan 21 23:12:30 2002
@@ -1,11 +0,0 @@
---- ftp-proxy/Makefile.in
-+++ ftp-proxy/Makefile.in	Tue Jun 26 01:12:06 2001
-@@ -55,7 +55,7 @@
- PROC_FTP=	@PROC_FTP@
- 
- CONF_SRC=	ftp-proxy.conf.sample
--CONF_DST=	$(ETC_DIR)/ftp-proxy.conf
-+CONF_DST=	$(ETC_DIR)/ftp-proxy.conf.sample
- 
- FTP_MAN5=	ftp-proxy.conf.5
- FTP_MAN8=	ftp-proxy.8
diff -u files/patch-etcdir /dev/null
--- files/patch-etcdir	Thu May 17 21:50:39 2001
+++ /dev/null	Mon Jan 21 23:12:30 2002
@@ -1,26 +0,0 @@
-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)
diff -u files/patch-includes /dev/null
--- files/patch-includes	Sat Apr  7 07:54:50 2001
+++ /dev/null	Mon Jan 21 23:12:30 2002
@@ -1,13 +0,0 @@
---- common/com-socket.c.orig	Fri Feb 11 15:20:33 2000
-+++ common/com-socket.c	Fri Feb 11 15:20:52 2000
-@@ -71,8 +71,9 @@
- #include <sys/ioctl.h>
- 
- #include <netdb.h>
--#include <netinet/ip.h>
- #include <netinet/in.h>
-+#include <netinet/in_systm.h>
-+#include <netinet/ip.h>
- #include <sys/socket.h>
- #include <arpa/inet.h>
- 
>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: pat 
State-Changed-When: Mon Jan 21 22:03:06 PST 2002 
State-Changed-Why:  
Committed, Thanks! 

http://www.FreeBSD.org/cgi/query-pr.cgi?pr=34136 
>Unformatted:
