From owner-freebsd-ports Tue Jan 29 14:31:19 2002 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 F297037B41B for ; Tue, 29 Jan 2002 14:30:02 -0800 (PST) Received: (from gnats@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g0TMU2b01896; Tue, 29 Jan 2002 14:30:02 -0800 (PST) (envelope-from gnats) Received: from yoda.bmi.net (yoda.bmi.net [204.57.191.163]) by hub.freebsd.org (Postfix) with ESMTP id 0541137B41A; Tue, 29 Jan 2002 14:26:44 -0800 (PST) Received: from johncoop.MSHOME (drumheller-router.bmi.net [206.63.201.3] (may be forged)) by yoda.bmi.net (Pro-8.9.3/Pro-8.9.3) with ESMTP id OAA04286; Tue, 29 Jan 2002 14:22:00 -0800 Received: by johncoop.MSHOME (Postfix, from userid 1001) id 706D615503; Tue, 29 Jan 2002 14:23:18 -0800 (PST) Message-Id: <20020129222318.706D615503@johncoop.MSHOME> Date: Tue, 29 Jan 2002 14:23:18 -0800 (PST) From: John Merryweather Cooper Reply-To: John Merryweather Cooper To: FreeBSD-gnats-submit@freebsd.org Cc: tobez@freebsd.org X-Send-Pr-Version: 3.113 Subject: ports/34425: [MAINTAINER UPDATE] Update libesmtp to 0.8.10 Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org >Number: 34425 >Category: ports >Synopsis: [MAINTAINER UPDATE] Update libesmtp to 0.8.10 >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: Tue Jan 29 14:30:02 PST 2002 >Closed-Date: >Last-Modified: >Originator: John Merryweather Cooper >Release: FreeBSD 4.5-RC i386 >Organization: >Environment: System: FreeBSD johncoop.MSHOME 4.5-RC FreeBSD 4.5-RC #53: Sat Jan 26 17:47:54 PST 2002 jmcoopr@johncoop.MSHOME:/usr/obj/usr/src/sys/JOHNCOOP i386 >Description: With this release, libESMTP allows direct connection to M$ Exchange servers. The libtool dependency is back. :( But I've come up with a better way to handle it. Also, some files/patches got left out of the distfile--and these have been incorporated. >How-To-Repeat: N/A >Fix: Summary of changed files: # 'libesmtp.new/Makefile' | 0 # 'libesmtp.new/distinfo' | 0 # 'libesmtp.new/files/patch-ltmain.sh' | 0 # 'libesmtp.new/files/patch-ntlm::Makefile.am' | 0 # 'libesmtp.new/files/patch-ntlm::Makefile.in' | 0 # 'libesmtp.new/files/patch-ntlm::ntlm.h' | 0 # 'libesmtp.new/files/patch-ntlm::ntlmstruct.c' | 0 # 'libesmtp.new/pkg-plist' | 0 # ./Makefile | 12 +++!!! # ./distinfo | 3 ! # ./files/patch-ltmain.sh | 28 ++++++++++++++ # ./files/patch-ntlm::Makefile.am | 9 ++++ # ./files/patch-ntlm::Makefile.in | 11 +++++ # ./files/patch-ntlm::ntlm.h | 51 ++++++++++++++++++++++++++ # ./files/patch-ntlm::ntlmstruct.c | 14 +++++++ # ./pkg-plist | 2 + # 16 files changed, 121 insertions(+), 9 modifications(!) The patch itself: # This is a patch for libesmtp to update it to libesmtp.new # # To apply this patch: # STEP 1: Chdir to the source directory. # STEP 2: Run the 'applypatch' program with this patch file as input. # # If you do not have 'applypatch', it is part of the 'makepatch' package # that you can fetch from the Comprehensive Perl Archive Network: # http://www.perl.com/CPAN/authors/Johan_Vromans/makepatch-x.y.tar.gz # In the above URL, 'x' should be 2 or higher. # # To apply this patch without the use of 'applypatch': # STEP 1: Chdir to the source directory. # If you have a decent Bourne-type shell: # STEP 2: Run the shell with this file as input. # If you don't have such a shell, you may need to manually create/delete # the files as shown below. # STEP 3: Run the 'patch' program with this file as input. # # These are the commands needed to create/delete files/directories: # rm -f 'files/patch-config.h.in' touch 'files/patch-ltmain.sh' chmod 0644 'files/patch-ltmain.sh' touch 'files/patch-ntlm::Makefile.am' chmod 0644 'files/patch-ntlm::Makefile.am' touch 'files/patch-ntlm::Makefile.in' chmod 0644 'files/patch-ntlm::Makefile.in' touch 'files/patch-ntlm::ntlm.h' chmod 0644 'files/patch-ntlm::ntlm.h' touch 'files/patch-ntlm::ntlmstruct.c' chmod 0644 'files/patch-ntlm::ntlmstruct.c' # # This command terminates the shell and need not be executed manually. exit # #### End of Preamble #### #### Patch data follows #### diff -u 'libesmtp/Makefile' 'libesmtp.new/Makefile' Index: ./Makefile --- ./Makefile Tue Jan 22 18:40:44 2002 +++ ./Makefile Tue Jan 29 13:35:15 2002 @@ -2,10 +2,10 @@ # Date created: Sun Feb 21 2001 # Whom: tobez@tobez.org # -# $FreeBSD: ports/mail/libesmtp/Makefile,v 1.14 2002/01/22 16:43:24 tobez Exp $ +# $FreeBSD$ PORTNAME= libesmtp -PORTVERSION= 0.8.9 +PORTVERSION= 0.8.10 CATEGORIES= mail MASTER_SITES= http://www.stafford.uklinux.net/libesmtp/ \ http://www.tobez.org/download/port-mirrors/mail/libesmtp/ \ @@ -16,7 +16,7 @@ USE_BZIP2= yes USE_GMAKE= yes USE_OPENSSL= yes -GNU_CONFIGURE= yes +USE_LIBTOOL= yes INSTALLS_SHLIB= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ PTHREAD_LIBS="${PTHREAD_LIBS}" \ @@ -25,6 +25,12 @@ # require-all-recipients (implied by enable-all) is required for Balsa-1.3.x CONFIGURE_ARGS= --enable-all + +pre-configure: + @${CP} ${LOCALBASE}/share/libtool/ltconfig ${WRKSRC} + +post-configure: + @cd ${WRKSRC} && ./ltconfig ./ltmain.sh post-install: .ifndef(NOPORTDOCS) diff -u 'libesmtp/distinfo' 'libesmtp.new/distinfo' Index: ./distinfo --- ./distinfo Tue Jan 22 18:40:44 2002 +++ ./distinfo Tue Jan 29 12:50:38 2002 @@ -1 +1,2 @@ -MD5 (libesmtp-0.8.9.tar.bz2) = 546e765b3809f2704e50a9cc03301657 +MD5 (libesmtp-0.8.10.tar.bz2) = 08509a092df683a2b8dfaa7a7cde530f +MD5 (ntlmfix.tar.bz2) = 9cd054b852038722d3a9fc0f2792d741 diff -u /dev/null 'libesmtp.new/files/patch-ltmain.sh' Index: ./files/patch-ltmain.sh --- ./files/patch-ltmain.sh Wed Dec 31 16:00:00 1969 +++ ./files/patch-ltmain.sh Tue Jan 29 13:39:22 2002 @@ -0,0 +1,28 @@ + +$FreeBSD: ports/devel/libglade/files/patch-ltmain.sh,v 1.4 2001/12/20 06:18:58 sobomax Exp $ + +--- ltmain.sh 2001/08/27 09:51:26 1.1 ++++ ltmain.sh 2001/08/27 09:51:42 +@@ -2408,6 +2408,9 @@ + *-*-netbsd*) + # Don't link with libc until the a.out ld.so is fixed. + ;; ++ *-*-freebsd*) ++ # FreeBSD doesn't need this... ++ ;; + *) + # Add libc to deplibs on all other systems if necessary. + if test "$build_libtool_need_lc" = "yes"; then +@@ -4175,10 +4178,12 @@ + fi + + # Install the pseudo-library for information purposes. ++ if /usr/bin/false; then + name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` + instname="$dir/$name"i + $show "$install_prog $instname $destdir/$name" + $run eval "$install_prog $instname $destdir/$name" || exit $? ++ fi + + # Maybe install the static library, too. + test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" diff -u /dev/null 'libesmtp.new/files/patch-ntlm::Makefile.am' Index: ./files/patch-ntlm::Makefile.am --- ./files/patch-ntlm::Makefile.am Wed Dec 31 16:00:00 1969 +++ ./files/patch-ntlm::Makefile.am Tue Jan 29 12:57:38 2002 @@ -0,0 +1,9 @@ +--- ntlm/Makefile.am.orig Wed Jan 16 12:38:31 2002 ++++ ntlm/Makefile.am Tue Jan 29 12:56:21 2002 +@@ -7,5 +7,5 @@ + + lib_LTLIBRARIES = sasl-ntlm.la + +-sasl_ntlm_la_SOURCES = client-ntlm.c ntlmdes.c ntlmstruct.c ++sasl_ntlm_la_SOURCES = client-ntlm.c ntlmdes.c ntlmstruct.c ntlm.h + sasl_ntlm_la_LDFLAGS = -module -avoid-version @NTLM_LIBS@ diff -u /dev/null 'libesmtp.new/files/patch-ntlm::Makefile.in' Index: ./files/patch-ntlm::Makefile.in --- ./files/patch-ntlm::Makefile.in Wed Dec 31 16:00:00 1969 +++ ./files/patch-ntlm::Makefile.in Tue Jan 29 12:57:58 2002 @@ -0,0 +1,11 @@ +--- ntlm/Makefile.in.orig Tue Jan 29 02:42:23 2002 ++++ ntlm/Makefile.in Tue Jan 29 12:56:21 2002 +@@ -107,7 +107,7 @@ + + lib_LTLIBRARIES = sasl-ntlm.la + +-sasl_ntlm_la_SOURCES = client-ntlm.c ntlmdes.c ntlmstruct.c ++sasl_ntlm_la_SOURCES = client-ntlm.c ntlmdes.c ntlmstruct.c ntlm.h + sasl_ntlm_la_LDFLAGS = -module -avoid-version @NTLM_LIBS@ + subdir = ntlm + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs diff -u /dev/null 'libesmtp.new/files/patch-ntlm::ntlm.h' Index: ./files/patch-ntlm::ntlm.h --- ./files/patch-ntlm::ntlm.h Wed Dec 31 16:00:00 1969 +++ ./files/patch-ntlm::ntlm.h Tue Jan 29 12:59:51 2002 @@ -0,0 +1,51 @@ +--- /dev/null Tue Jan 29 12:50:45 2002 ++++ ntlm/ntlm.h Tue Jan 29 12:58:33 2002 +@@ -0,0 +1,48 @@ ++#ifndef _ntlm_h ++#define _ntlm_h ++/* ++ * Authentication module for the Micr$oft NTLM mechanism. ++ * ++ * This file is part of libESMTP, a library for submission of RFC 2822 ++ * formatted electronic mail messages using the SMTP protocol described ++ * in RFC 2821. ++ * ++ * Copyright (C) 2002 Brian Stafford ++ * ++ * This library is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public ++ * License as published by the Free Software Foundation; either ++ * version 2.1 of the License, or (at your option) any later version. ++ * ++ * This library is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public ++ * License along with this library; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ */ ++ ++char *lm_uccpy (char *dst, size_t dstlen, const char *src); ++unsigned char *nt_unicode (const char *string, size_t len); ++ ++void lm_hash_password (unsigned char *hash, const char *pass); ++void nt_hash_password (unsigned char *hash, const char *pass); ++ ++void ntlm_responses (unsigned char *lm_resp, unsigned char *nt_resp, ++ const unsigned char *challenge, const char *secret); ++ ++size_t ntlm_build_type_1 (char *buf, size_t buflen, ++ const char *domain, const char *workstation); ++size_t ntlm_build_type_2 (char *buf, size_t buflen, ++ const unsigned char *nonce, const char *domain); ++size_t ntlm_build_type_3 (char *buf, size_t buflen, ++ const unsigned char *lm_resp, ++ const unsigned char *nt_resp, ++ const char *domain, const char *user, ++ const char *workstation); ++size_t ntlm_parse_type_2 (const char *buf, size_t buflen, ++ unsigned char *nonce, char **domain); ++ ++#endif diff -u /dev/null 'libesmtp.new/files/patch-ntlm::ntlmstruct.c' Index: ./files/patch-ntlm::ntlmstruct.c --- ./files/patch-ntlm::ntlmstruct.c Wed Dec 31 16:00:00 1969 +++ ./files/patch-ntlm::ntlmstruct.c Tue Jan 29 13:07:08 2002 @@ -0,0 +1,14 @@ +--- ntlm/ntlmstruct.c.orig Tue Jan 29 13:05:13 2002 ++++ ntlm/ntlmstruct.c Tue Jan 29 13:06:02 2002 +@@ -25,7 +25,11 @@ + #include + #endif + ++#ifdef __FreeBSD__ ++#include ++#else + #include ++#endif + #include + #include + #include diff -u 'libesmtp/pkg-plist' 'libesmtp.new/pkg-plist' Index: ./pkg-plist --- ./pkg-plist Wed Aug 15 13:02:33 2001 +++ ./pkg-plist Tue Jan 29 13:13:41 2002 @@ -6,6 +6,8 @@ lib/esmtp-plugins/sasl-cram-md5.so lib/esmtp-plugins/sasl-login.a lib/esmtp-plugins/sasl-login.so +lib/esmtp-plugins/sasl-ntlm.a +lib/esmtp-plugins/sasl-ntlm.so lib/esmtp-plugins/sasl-plain.a lib/esmtp-plugins/sasl-plain.so lib/libesmtp.a #### End of Patch data #### #### ApplyPatch data follows #### # Data version : 1.0 # Date generated : Tue Jan 29 14:21:16 2002 # Generated by : makepatch 2.00 # Recurse directories : Yes # r 'files/patch-config.h.in' 261 0 # p 'Makefile' 1117 1012340115 0100644 # p 'distinfo' 64 1012337438 0100644 # c 'files/patch-ltmain.sh' 0 1012340362 0100644 # c 'files/patch-ntlm::Makefile.am' 0 1012337858 0100644 # c 'files/patch-ntlm::Makefile.in' 0 1012337878 0100644 # c 'files/patch-ntlm::ntlm.h' 0 1012337991 0100644 # c 'files/patch-ntlm::ntlmstruct.c' 0 1012338428 0100644 # p 'pkg-plist' 716 1012338821 0100644 #### End of ApplyPatch data #### #### End of Patch kit [created: Tue Jan 29 14:21:16 2002] #### #### Checksum: 256 9307 12135 #### >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message