Skip site navigation (1)Skip section navigation (2)
Date:      25 Nov 2002 16:51:35 -0000
From:      Sergei Kolobov <sergei@kolobov.com>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/45722: [MAINTAINER] Update mail/anubis to 3.6.1
Message-ID:  <20021125165135.39132.qmail@outpost.globcon.net>

next in thread | raw e-mail | index | archive | help

>Number:         45722
>Category:       ports
>Synopsis:       [MAINTAINER] Update mail/anubis to 3.6.1
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Nov 25 09:00:05 PST 2002
>Closed-Date:
>Last-Modified:
>Originator:     Sergei Kolobov
>Release:        FreeBSD 4.7-STABLE i386
>Organization:
>Environment:
System: FreeBSD outpost.globcon.net 4.7-STABLE FreeBSD 4.7-STABLE #0: Mon Oct 14 02:23:23 MSD 2002     sgk@outpost.globcon.net:/data/FreeBSD/obj/data/FreeBSD/src/sys/OUTPOST  i386
>Description:
- Update to 3.6.1
- Add WITH_GNUTLS knob to use GnuTLS instead of OpenSSL as a TLS/SSL API
- Automatically detect and use PAM and TCP wrappers (were WITH_* knobs)

Note to committer: GnuTLS support requires two new ports:
- security/gnutls port (ports/45348 PR), which requires
- security/libtasn1 port (ports/45347 PR).
>How-To-Repeat:
>Fix:

--- anubis-3.6.1.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/mail/anubis/Makefile,v
retrieving revision 1.12
diff -u -r1.12 Makefile
--- Makefile	11 Nov 2002 08:27:46 -0000	1.12
+++ Makefile	25 Nov 2002 16:38:25 -0000
@@ -9,16 +9,16 @@
 #
 # Following compile-time options are available:
 #
-# WITHOUT_OPENSSL=yes	Disable the OpenSSL library support
+# WITH_GNUTLS=yes	Enable GnuTLS API instead of default OpenSSL API
+# WITHOUT_OPENSSL=yes	Disable the OpenSSL support; unless WITH_GNUTLS
+#			is specified, this will disables TLS/SSL suport
 # WITHOUT_GPGME=yes	Disable the GnuPG (GPGME library) support
 # WITH_PCRE=yes		Enable the PCRE library support
-# WITH_PAM=yes		Enable the Pluggable Authentication Modules support
-# WITH_TCP_WRAPPERS=yes Enable the libwrap (TCP wrappers) support
 #
 ###########################################################################
 
 PORTNAME=	anubis
-PORTVERSION=	3.6.0
+PORTVERSION=	3.6.1
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -29,14 +29,20 @@
 
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -lgnugetopt" \
 		MAKEINFO="makeinfo --no-split"
 
-# OpenSSL
-.if !defined(WITHOUT_OPENSSL)
+# Select TLS/SSL API: either OpenSSL (default), GnuTLS, or none
+.if defined(WITH_GNUTLS)
+USE_GNUTLS=		yes
+LIB_DEPENDS+=		gnutls:${PORTSDIR}/security/gnutls
+.elif !defined(WITHOUT_OPENSSL)
 USE_OPENSSL=		yes
 CONFIGURE_ARGS+=	--with-openssl
+.else
+CONFIGURE_ARGS+=	--without-gnutls
 .endif
 
 # GPGME
@@ -53,49 +59,45 @@
 .endif
 
 # PAM
-.if defined(WITH_PAM)
+.if exists(/usr/lib/libpam.so)
+USE_PAM=		yes
 CONFIGURE_ARGS+=	--with-pam
-PLIST_SUB+=	PAM=""
+PLIST_SUB+=		PAM=""
 .else
-PLIST_SUB+=	PAM="@comment "
+PLIST_SUB+=		PAM="@comment "
 .endif
 
 # TCP Wrappers
-.if defined(WITH_TCP_WRAPPERS)
+.if exists(/usr/include/tcpd.h)
+USE_TCP_WRAPPERS=	yes
 CONFIGURE_ARGS+=	--with-tcp-wrappers
 .endif
 
 MAN1=	anubis.1
 DOCS=	AUTHORS INSTALL NEWS README THANKS TODO
 
-pre-fetch:
+pre-configure:
 	@${ECHO_MSG} ""
-.if defined(WITHOUT_OPENSSL)
-	@${ECHO_MSG} "Building Anubis without OpenSSL support"
+.if defined(USE_OPENSSL)
+	@${ECHO_MSG} "Using OpenSSL as TLS/SSL API"
+.elif defined(USE_GNUTLS)
+	@${ECHO_MSG} "Using GnuTLS as TLS/SSL API"
 .else
-	@${ECHO_MSG} "Building Anubis with OpenSSL support (default)"
-	@${ECHO_MSG} "-- You could define WITHOUT_OPENSSL to disable OpenSSL support"
+	@${ECHO_MSG} "Disabling TLS/SSL support"
 .endif
 .if defined(WITHOUT_GPGME)
-	@${ECHO_MSG} "Building Anubis without GnuPG (GPGME library) support"
-.else
-	@${ECHO_MSG} "Building Anubis with GnuPG (GPGME library) support (default)"
-	@${ECHO_MSG} "-- You could define WITHOUT_GPGME to disable GPGME support"
+	@${ECHO_MSG} "Disabling GnuPG (GPGME) support"
 .endif
 .if defined(WITH_PCRE)
-	@${ECHO_MSG} "Building Anubis with PCRE library support"
+	@${ECHO_MSG} "Enabling PCRE support"
 .else
-	@${ECHO_MSG} "You could define WITH_PCRE to build Anubis with PCRE support"
+	@${ECHO_MSG} "You could define WITH_PCRE to enable PCRE support"
 .endif
-.if defined(WITH_PAM)
-	@${ECHO_MSG} "Building Anubis with PAM library support"
-.else
-	@${ECHO_MSG} "You could define WITH_PAM to build Anubis with PAM support"
+.if defined(USE_PAM)
+	@${ECHO_MSG} "Enabling PAM support"
 .endif
-.if defined(WITH_TCP_WRAPPERS)
-	@${ECHO_MSG} "Building Anubis with TCP wrappers support"
-.else
-	@${ECHO_MSG} "You could define WITH_TCP_WRAPPERS to build Anubis with TCP wrappers support"
+.if defined(USE_TCP_WRAPPERS)
+	@${ECHO_MSG} "Enabling TCP wrappers support"
 .endif
 	@${ECHO_MSG} ""
 
@@ -108,10 +110,10 @@
 	@${RM} -f ${WRKSRC}/doc/anubis.info*
 
 post-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/anubis.sh ${PREFIX}/etc/rc.d
+	${INSTALL_SCRIPT} ${WRKSRC}/anubis.sh ${PREFIX}/etc/rc.d/anubis.sh.sample
 	@${MKDIR} ${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/examples/*rc ${EXAMPLESDIR}
-.if defined(WITH_PAM)
+.if defined(USE_PAM)
 	@${MKDIR} ${EXAMPLESDIR}/pam
 	${INSTALL_DATA} ${WRKSRC}/examples/pam/* ${EXAMPLESDIR}/pam
 .endif
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/mail/anubis/distinfo,v
retrieving revision 1.7
diff -u -r1.7 distinfo
--- distinfo	11 Nov 2002 08:27:46 -0000	1.7
+++ distinfo	25 Nov 2002 16:38:25 -0000
@@ -1 +1 @@
-MD5 (anubis-3.6.0.tar.gz) = 048382b1b52b1fb7a7762614fe75290b
+MD5 (anubis-3.6.1.tar.gz) = 55e83feb33951f185ca8df1381f99a10
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/mail/anubis/pkg-plist,v
retrieving revision 1.4
diff -u -r1.4 pkg-plist
--- pkg-plist	15 Oct 2002 15:08:35 -0000	1.4
+++ pkg-plist	25 Nov 2002 16:38:25 -0000
@@ -1,6 +1,6 @@
 @comment $FreeBSD: ports/mail/anubis/pkg-plist,v 1.4 2002/10/15 15:08:35 naddy Exp $
 sbin/anubis
-etc/rc.d/anubis.sh
+etc/rc.d/anubis.sh.sample
 @unexec install-info --delete %D/info/anubis.info %D/info/dir
 info/anubis.info
 @exec install-info %D/info/anubis.info %D/info/dir
@@ -20,3 +20,4 @@
 %%PAM%%@dirrm share/examples/anubis/pam
 @dirrm share/examples/anubis
 share/locale/fr/LC_MESSAGES/anubis.mo
+share/locale/tr/LC_MESSAGES/anubis.mo
--- anubis-3.6.1.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted:

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




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20021125165135.39132.qmail>