From johnmary@adelphia.net  Wed Jul  7 09:14:43 2004
Return-Path: <johnmary@adelphia.net>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 23A5216A4DA
	for <FreeBSD-gnats-submit@freebsd.org>; Wed,  7 Jul 2004 09:14:43 +0000 (GMT)
Received: from mta10.adelphia.net (mta10.adelphia.net [68.168.78.202])
	by mx1.FreeBSD.org (Postfix) with ESMTP id C6A1E43D31
	for <FreeBSD-gnats-submit@freebsd.org>; Wed,  7 Jul 2004 09:14:40 +0000 (GMT)
	(envelope-from johnmary@adelphia.net)
Received: from 68-169-191-150.losaca.adelphia.net ([68.169.191.150])
          by mta10.adelphia.net
          (InterMail vM.6.01.03.02 201-2131-111-104-20040324) with ESMTP
          id <20040707091440.TLPH12887.mta10.adelphia.net@68-169-191-150.losaca.adelphia.net>
          for <FreeBSD-gnats-submit@freebsd.org>;
          Wed, 7 Jul 2004 05:14:40 -0400
Message-Id: <1089191680.0@68-169-191-150.losaca.adelphia.net>
Date: Wed, 7 Jul 2004 02:14:40 -0700
From: "John Merryweather Cooper" <johnmary@adelphia.net>
To: "FreeBSD gnats submit" <FreeBSD-gnats-submit@freebsd.org>
Subject: [MAINTAINER-UPDATE] Update mail/libesmtp to 1.0.3r1
X-Send-Pr-Version: gtk-send-pr 0.3.3 
X-GNATS-Notify:

>Number:         68761
>Category:       ports
>Synopsis:       [MAINTAINER-UPDATE] Update mail/libesmtp to 1.0.3r1
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pav
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Jul 07 09:20:23 GMT 2004
>Closed-Date:    Thu Jul 08 21:32:03 GMT 2004
>Last-Modified:  Thu Jul 08 21:32:03 GMT 2004
>Originator:     John Merryweather Cooper
>Release:        FreeBSD 5.2-CURRENT i386
>Organization:
>Environment:


System: FreeBSD 5.2-CURRENT #1: Wed Jun 30 13:09:09 PDT 2004
    root@borgdemon.losaca.adelphia.net:/usr/obj/usr/src/sys/ATHLON



>Description:


Update to version 1.0.3r1.

This version incorporates a memrchr() for FreeBSD (which doesn't have one).

Everything seems to work fine with devel/libtool15.  As a result, static helper libraries and .la files are back.


>How-To-Repeat:


N/A


>Fix:


--- update-libesmtp-1.0.3r1 begins here ---
# WARNING:  Not tested on -STABLE (tested on -CURRENT).
# memrchr() is now provided obviating one of the patches.
# 
# 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 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-smtp-tls.c'
#
# This command terminates the shell and need not be executed manually.
exit
#
#### End of Preamble ####

#### Patch data follows ####
diff -u '/usr/ports/mail/libesmtp/Makefile' '/usr/ports/local/libesmtp/Makefile'
Index: ./Makefile
--- ./Makefile	Tue Jun 29 19:01:32 2004
+++ ./Makefile	Wed Jul  7 01:38:09 2004
@@ -2,11 +2,10 @@
 # Date created:         Sun Feb 21 2001
 # Whom:                 tobez@tobez.org
 #
-# $FreeBSD: ports/mail/libesmtp/Makefile,v 1.27 2004/03/14 06:16:53 ade Exp $
+# $FreeBSD$
 
 PORTNAME=	libesmtp
-PORTVERSION=	1.0.2
-PORTREVISION=	2
+PORTVERSION=	1.0.3r1
 PORTEPOCH=	1
 CATEGORIES=	mail
 MASTER_SITES=	http://www.stafford.uklinux.net/libesmtp/ \
@@ -19,7 +18,7 @@
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_OPENSSL=	yes
-USE_LIBTOOL_VER=13
+USE_LIBTOOL_VER=15
 USE_PERL5_BUILD=yes
 INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff -u '/usr/ports/mail/libesmtp/distinfo' '/usr/ports/local/libesmtp/distinfo'
Index: ./distinfo
--- ./distinfo	Tue Jun 29 19:01:32 2004
+++ ./distinfo	Wed Jul  7 01:38:29 2004
@@ -1,2 +1,2 @@
-MD5 (libesmtp-1.0.2.tar.bz2) = 0c79a7a297c122a83fbab865d5d403c7
-SIZE (libesmtp-1.0.2.tar.bz2) = 268776
+MD5 (libesmtp-1.0.3r1.tar.bz2) = c07aa79293aa36298626fe5e68d6bfba
+SIZE (libesmtp-1.0.3r1.tar.bz2) = 269527
diff -u '/usr/ports/mail/libesmtp/pkg-plist' '/usr/ports/local/libesmtp/pkg-plist'
Index: ./pkg-plist
--- ./pkg-plist	Tue Jun 29 19:01:32 2004
+++ ./pkg-plist	Wed Jul  7 02:04:38 2004
@@ -2,11 +2,20 @@
 include/auth-client.h
 include/auth-plugin.h
 include/libesmtp.h
+lib/esmtp-plugins/sasl-cram-md5.a
+lib/esmtp-plugins/sasl-cram-md5.la
 lib/esmtp-plugins/sasl-cram-md5.so
+lib/esmtp-plugins/sasl-login.a
+lib/esmtp-plugins/sasl-login.la
 lib/esmtp-plugins/sasl-login.so
+lib/esmtp-plugins/sasl-ntlm.a
+lib/esmtp-plugins/sasl-ntlm.la
 lib/esmtp-plugins/sasl-ntlm.so
+lib/esmtp-plugins/sasl-plain.a
+lib/esmtp-plugins/sasl-plain.la
 lib/esmtp-plugins/sasl-plain.so
 lib/libesmtp.a
+lib/libesmtp.la
 lib/libesmtp.so
 lib/libesmtp.so.6
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
#### End of Patch data ####

#### ApplyPatch data follows ####
# Data version        : 1.0
# Date generated      : Wed Jul  7 02:08:23 2004
# Generated by        : makepatch 2.00
# Recurse directories : Yes
# r 'files/patch-smtp-tls.c' 569 0
# p 'Makefile' 1277 1089189489 0100644
# p 'distinfo' 103 1089189509 0100644
# p 'pkg-plist' 605 1089191078 0100644
#### End of ApplyPatch data ####

#### End of Patch kit [created: Wed Jul  7 02:08:23 2004] ####
#### Checksum: 105 3470 11223 ####
--- update-libesmtp-1.0.3r1 ends here ---



>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->feedback 
State-Changed-By: pav 
State-Changed-When: Thu Jul 8 18:55:41 GMT 2004 
State-Changed-Why:  
Hmm, does not build either on -STABLE nor -CURRENT (same error): 

memrchr.lo(.text+0x0): In function `memrchr': 
: multiple definition of `memrchr' 
smtp-tls.lo(.text+0x7e0): first defined here 
/usr/bin/ld: Warning: size of symbol `memrchr' changed from 52 in smtp-tls.lo to 49 in memrchr.lo 
gmake[2]: *** [libesmtp.la] Error 1 
gmake[2]: Leaving directory `/tmp/a/ports/mail/libesmtp/work/libesmtp-1.0.3r1' 
gmake[1]: *** [all-recursive] Error 1 
gmake[1]: Leaving directory `/tmp/a/ports/mail/libesmtp/work/libesmtp-1.0.3r1' 
gmake: *** [all] Error 2 
*** Error code 2 

http://hood.oook.cz/tb/errors/5-CURRENT-FreeBSD/libesmtp-1.0.3,1.log 
http://hood.oook.cz/tb/errors/4-STABLE-FreeBSD/libesmtp-1.0.3,1.log 


Responsible-Changed-From-To: freebsd-ports-bugs->pav 
Responsible-Changed-By: pav 
Responsible-Changed-When: Thu Jul 8 18:55:41 GMT 2004 
Responsible-Changed-Why:  
Handle. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=68761 
State-Changed-From-To: feedback->closed 
State-Changed-By: pav 
State-Changed-When: Thu Jul 8 21:31:52 GMT 2004 
State-Changed-Why:  
Committed, thanks! 

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