From olivleh1@dill.salatschuessel.net  Thu Feb 20 13:53:14 2003
Return-Path: <olivleh1@dill.salatschuessel.net>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id AF94B37B401
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 20 Feb 2003 13:53:14 -0800 (PST)
Received: from mail.netbeat.de (mail.netbeat.de [62.208.140.19])
	by mx1.FreeBSD.org (Postfix) with SMTP id 973E743FA3
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 20 Feb 2003 13:53:09 -0800 (PST)
	(envelope-from olivleh1@dill.salatschuessel.net)
Received: (qmail 29463 invoked from network); 20 Feb 2003 22:12:07 -0000
Received: from p5084b227.dip.t-dialin.net (HELO dill.salatschuessel.net) (80.132.178.39)
  by mail.netbeat.de with SMTP; 20 Feb 2003 22:12:07 -0000
Received: (qmail 23938 invoked by uid 0); 20 Feb 2003 21:52:40 -0000
Message-Id: <20030220215240.23937.qmail@dill.salatschuessel.net>
Date: 20 Feb 2003 21:52:40 -0000
From: Oliver Lehmann <lehmann@ans-netz.de>
Reply-To: Oliver Lehmann <lehmann@ans-netz.de>
To: FreeBSD-gnats-submit@freebsd.org
Cc: Oliver Lehmann <lehmann@ans-netz.de>
Subject: update-port: net/net-snmp4
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         48504
>Category:       ports
>Synopsis:       update-port: net/net-snmp4
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Feb 20 14:00:27 PST 2003
>Closed-Date:    Fri Feb 21 09:22:17 PST 2003
>Last-Modified:  Fri Feb 21 09:22:17 PST 2003
>Originator:     Oliver Lehmann
>Release:        FreeBSD 4.7-STABLE alpha
>Organization:
>Environment:
System: FreeBSD dill.salatschuessel.net 4.7-STABLE FreeBSD 4.7-STABLE #0: Sat Nov 23 21:30:45 CET 2002 olivleh1@dill.salatschuessel.net:/usr/obj/alpha/usr/src/sys/DILL alpha


>Description:
	- update to 4.2.6
	- fix build on FreeBSD 5 systems

>How-To-Repeat:
>Fix:


--- net-snmp4.patch begins here ---
diff -ruN net-snmp4.old/Makefile /usr/ports/net/net-snmp4/Makefile
--- net-snmp4.old/Makefile	Thu Feb 20 21:46:21 2003
+++ /usr/ports/net/net-snmp4/Makefile	Thu Feb 20 22:26:48 2003
@@ -2,12 +2,12 @@
 # Date created:				26 June 1996
 # Whom:					gpalmer
 #
-# $FreeBSD: ports/net/net-snmp4/Makefile,v 1.76 2003/02/20 18:51:00 knu Exp $
+# $FreeBSD: ports/net/net-snmp4/Makefile,v 1.75 2003/02/18 11:28:57 kuriyama Exp $
 #
 
 PORTNAME=	ucd-snmp
-PORTVERSION=	4.2.5
-PORTREVISION=	2
+PORTVERSION=	4.2.6
+PORTREVISION=	0
 CATEGORIES=	net ipv6
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		ftp://ucd-snmp.ucdavis.edu/ \
@@ -67,12 +67,36 @@
 .if ${OSVERSION} >= 400014
 CONFIGURE_ARGS+= --enable-ipv6
 .endif
+
+.if defined(WITHOUT_SSL)
+CONFIGURE_ARGS+= --without-openssl
+.else
+.if defined(WITH_PORTSSL) || ${OSVERSION} >= 500100
 .if ${OSVERSION} >= 500100
-IGNORE=		Broken with latest OpenSSL suite
+LIB_DEPENDS+=	crypto.4:${PORTSDIR}/security/openssl
+.else
+LIB_DEPENDS+=	crypto.3:${PORTSDIR}/security/openssl
+.endif
+CONFIGURE_ARGS+= --with-openssl=${LOCALBASE}
+CFLAGS+=	-DOPENSSL_DES_LIBDES_COMPATIBILITY
+.else
+CONFIGURE_ARGS+= --with-openssl=/usr
+.endif
 .endif
 
 SHLIB_VERSION=	4
 PLIST_SUB+=	shlib=${SHLIB_VERSION}
+
+pre-everything::
+	@${ECHO} ""
+	@${ECHO} "You may use the following build options:"
+	@${ECHO} ""
+	@${ECHO} "	WITH_PORTSSL=yes  Use the OpenSSL Version delivered by the ports."
+	@${ECHO} "	                  With FreeBSD 5, net-snmp4 requires automaticly"
+	@${ECHO} "	                  the OpenSSL ports-version. In the 5 case, you"
+	@${ECHO} "	                  don't need to define WITH_PORTSSL (default)."
+	@${ECHO} "	WITHOUT_SSL=yes   Disable the OpenSSL support."
+	@${ECHO} ""
 
 post-patch:
 	@${REINPLACE_CMD} -e "s|%%LOCALBASE%%|${LOCALBASE}|g" \
diff -ruN net-snmp4.old/distinfo /usr/ports/net/net-snmp4/distinfo
--- net-snmp4.old/distinfo	Thu Feb 20 21:46:21 2003
+++ /usr/ports/net/net-snmp4/distinfo	Thu Feb 20 22:21:39 2003
@@ -1 +1 @@
-MD5 (ucd-snmp-4.2.5.tar.gz) = 615e0b1e760cbb8c63b5392fe2d04b14
+MD5 (ucd-snmp-4.2.6.tar.gz) = cf3f24e6a69a4f52c14affe0064116b1
--- net-snmp4.patch ends here ---


>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: leeym 
State-Changed-When: Fri Feb 21 09:22:15 PST 2003 
State-Changed-Why:  
Committed, thanks. 

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