From owner-freebsd-ports Mon Mar 26 22:20: 8 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 6DD7C37B719 for ; Mon, 26 Mar 2001 22:20:02 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.11.1/8.11.1) id f2R6K2h34097; Mon, 26 Mar 2001 22:20:02 -0800 (PST) (envelope-from gnats) Received: from lorax.ubergeeks.com (lorax.ubergeeks.com [209.145.65.55]) by hub.freebsd.org (Postfix) with ESMTP id 53EB537B71A for ; Mon, 26 Mar 2001 22:19:52 -0800 (PST) (envelope-from adrian@ubergeeks.com) Received: (from adrian@localhost) by lorax.ubergeeks.com (8.11.3/8.11.3) id f2R6RON15203; Tue, 27 Mar 2001 01:27:24 -0500 (EST) (envelope-from adrian) Message-Id: <200103270627.f2R6RON15203@lorax.ubergeeks.com> Date: Tue, 27 Mar 2001 01:27:24 -0500 (EST) From: adrian@ubergeeks.com Reply-To: adrian@ubergeeks.com To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.113 Subject: ports/26139: patches to enable ssl in pine4 port Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org >Number: 26139 >Category: ports >Synopsis: cclient/pine4 can do SSL if enabled >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Mon Mar 26 22:20:02 PST 2001 >Closed-Date: >Last-Modified: >Originator: Adrian Filipi-Martin >Release: FreeBSD 4.3-RC i386 >Organization: Ubergeeks Consulting >Environment: System: FreeBSD lorax.ubergeeks.com 4.3-RC FreeBSD 4.3-RC #1: Mon Mar 26 16:05:11 EST 2001 root@lorax.ubergeeks.com:/usr/src/sys/compile/LORAX i386 >Description: The pine4-ssl port is marked as broken, and the current versions of cclient and pine4 are "SSL ready". cclient can handle IMAPS, POP3S and SMTPS "out of the box" if enabled. Enabling SSL support in cclient allows pine4 to be built with SSL support. >How-To-Repeat: Build non-SSL cclient/pine4 and use an SSL enabled IMAP or POP3 server, or try to build pine4-ssl. >Fix: Apply the patches in the attached sharfile in /usr/ports/mail. N.B. This adds one patch file each to cclient/files and pine4/files. The Makefile.diff needs to be applied manually in each port directory. The patch-ca file could be combined with one of the other patches for pine4 (patch-ax, IRRC). # This is a shell archive. Save it in a file, remove anything before # this line, and then unpack it by entering "sh file". Note, it may # create directories; files and directories will be owned by you and # have default permissions. # # This archive contains: # # cclient/Makefile.diff # cclient/files/patch-ba # pine4/Makefile.diff # pine4/files/patch-ca # echo x - cclient/Makefile.diff sed 's/^X//' >cclient/Makefile.diff << 'END-of-cclient/Makefile.diff' X--- Makefile.orig Fri Mar 23 10:57:14 2001 X+++ Makefile Tue Mar 27 00:12:06 2001 X@@ -24,6 +24,8 @@ X SHLIBMAJ= 8 X SHLIBNAME= lib${SHLIBBASE}.so.${SHLIBMAJ} X MAKE_ENV= SHLIBNAME=${SHLIBNAME} SHLIBBASE=${SHLIBBASE} X+MAKE_ARGS+= SPECIALAUTHENTICATORS=ssl SSLDIR=/etc/ssl X+MAKE_ARGS+= SSLINCLUDE=/usr/include/openssl SSLLIB=/usr/lib X PLIST_SUB= SHLIBNAME=${SHLIBNAME} SHLIBBASE=${SHLIBBASE} X X PREFIX_FIX_FILES= Makefile src/osdep/unix/Makefile \ END-of-cclient/Makefile.diff echo x - cclient/files/patch-ba sed 's/^X//' >cclient/files/patch-ba << 'END-of-cclient/files/patch-ba' X--- src/osdep/unix/Makefile.ssl.orig Mon Mar 26 23:55:28 2001 X+++ src/osdep/unix/Makefile.ssl Mon Mar 26 23:55:58 2001 X@@ -20,21 +20,21 @@ X X # Extended flags needed for additional authenticators. You may need to modify. X X-SSLDIR=/usr/local/ssl X-SSLCERTS=$(SSLDIR)/certs X-SSLINCLUDE=$(SSLDIR)/include X-SSLLIB=$(SSLDIR)/lib X+SSLDIR?=/usr/local/ssl X+SSLCERTS?=$(SSLDIR)/certs X+SSLINCLUDE?=$(SSLDIR)/include X+SSLLIB?=$(SSLDIR)/lib X X-SSLCRYPTO=-lcrypto X+SSLCRYPTO?=-lcrypto X X # Older versions of MIT Kerberos also have a libcrypto. If so, you may need X # to use this instead X-#SSLCRYPTO=$(SSLLIB)/libcrypto.a X+#SSLCRYPTO?=$(SSLLIB)/libcrypto.a X X # RSA Security Inc. released the RSA public key encryption algorithm into X # the public domain on September 6, 2000. There is no longer any need to X # use RSAREF. X-SSLRSA= # -lRSAglue -lrsaref X+SSLRSA?= # -lRSAglue -lrsaref X X SSLCFLAGS= -I$(SSLINCLUDE) -I$(SSLINCLUDE)/openssl\ X -DSSL_CERT_DIRECTORY=\"$(SSLCERTS)\" END-of-cclient/files/patch-ba echo x - pine4/Makefile.diff sed 's/^X//' >pine4/Makefile.diff << 'END-of-pine4/Makefile.diff' X--- Makefile.orig Tue Mar 27 00:04:09 2001 X+++ Makefile Tue Mar 27 00:10:03 2001 X@@ -60,7 +60,7 @@ X .endif X X do-build: X- @(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ./build bsf) X+ @(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ./build bsf EXTRAAUTHENTICATORS=ssl) X X do-install: X ${INSTALL_PROGRAM} ${WRKSRC}/bin/pico ${PREFIX}/bin/pico END-of-pine4/Makefile.diff echo x - pine4/files/patch-ca sed 's/^X//' >pine4/files/patch-ca << 'END-of-pine4/files/patch-ca' X--- pine/makefile.bsf.orig Tue Mar 27 00:57:34 2001 X+++ pine/makefile.bsf Tue Mar 27 00:57:57 2001 X@@ -61,7 +61,7 @@ X LDAPOFILES= addrbook.o adrbkcmd.o args.o bldaddr.o init.o \ X mailview.o other.o pine.o strings.o takeaddr.o X X-STDLIBS= -ltermlib -lpam -L$(PREFIX)/lib -lc-client4 X+STDLIBS= -ltermlib -lpam -L$(PREFIX)/lib -lc-client4 -lssl -lcrypto X LOCLIBS= $(PICODIR)/libpico.a X LIBS= $(EXTRALIBES) $(LOCLIBS) $(LDAPLIBS) $(STDLIBS) X END-of-pine4/files/patch-ca exit >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message