From d2511355af9099ac37e24ff0e2195b4144e65fc4559a932d31a80efb89818bc0 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Wed, 6 Aug 2008 23:28:26 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libesmtp?expand=0&rev=3 --- libesmtp-1.0.4-multiple-cc.patch | 67 ++++++++++++++++++++++++++++++++ libesmtp-lwres_includedir.patch | 13 ------- libesmtp.changes | 13 +++++-- libesmtp.spec | 63 ++++++++++++++++++------------ 4 files changed, 115 insertions(+), 41 deletions(-) create mode 100644 libesmtp-1.0.4-multiple-cc.patch delete mode 100644 libesmtp-lwres_includedir.patch diff --git a/libesmtp-1.0.4-multiple-cc.patch b/libesmtp-1.0.4-multiple-cc.patch new file mode 100644 index 0000000..7330bd4 --- /dev/null +++ b/libesmtp-1.0.4-multiple-cc.patch @@ -0,0 +1,67 @@ +From: Bernhard Walle +Subject: [PATCH] Allow multiple Cc and Bcc header calls + +This patch modifies the library so that smtp_set_header() can be called +multiple times. One header will be generated with a comma-separated list +of values. + +That's the behaviour as described in the API documentation at +http://www.stafford.uklinux.net/libesmtp/api.html. + + +Signed-off-by: Bernhard Walle + +--- + headers.c | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +--- a/headers.c ++++ b/headers.c +@@ -273,7 +273,7 @@ set_from (struct rfc2822_header *header, + return 1; + } + +-/* Print header-name ": " mailbox "\r\n" ++/* Print header-name ": " mailbox "\r\n" + or header-name ": \"" phrase "\" <" mailbox ">\r\n" */ + static void + print_from (smtp_message_t message, struct rfc2822_header *header) +@@ -340,7 +340,7 @@ set_sender (struct rfc2822_header *heade + + /* TODO: do nothing if the mailbox is NULL. Check this doesn't fool + the protocol engine into thinking it has seen end of file. */ +-/* Print header-name ": " mailbox "\r\n" ++/* Print header-name ": " mailbox "\r\n" + or header-name ": \"" phrase "\" <" mailbox ">\r\n" + */ + static void +@@ -414,7 +414,7 @@ set_cc (struct rfc2822_header *header, v + return 1; + } + +-/* Print header-name ": " mailbox "\r\n" ++/* Print header-name ": " mailbox "\r\n" + or header-name ": \"" phrase "\" <" mailbox ">\r\n" + ad nauseum. */ + static void +@@ -508,9 +508,9 @@ static const struct header_actions heade + set_sender, print_sender, destroy_mbox_list, }, + { "To", OPTIONAL, + set_to, print_to, destroy_mbox_list, }, +- { "Cc", OPTIONAL, ++ { "Cc", OPTIONAL | LISTVALUE, + set_cc, print_cc, destroy_mbox_list, }, +- { "Bcc", OPTIONAL, ++ { "Bcc", OPTIONAL | LISTVALUE, + set_cc, print_cc, destroy_mbox_list, }, + { "Reply-To", OPTIONAL, + set_cc, print_cc, destroy_mbox_list, }, +@@ -760,7 +760,7 @@ missing_header (smtp_message_t message, + + if (print == NULL) + print = print_string; +- ++ + cat_reset (&message->hdr_buffer, 0); + (*print) (message, message->current_header); + return cat_buffer (&message->hdr_buffer, len); diff --git a/libesmtp-lwres_includedir.patch b/libesmtp-lwres_includedir.patch deleted file mode 100644 index 253dacd..0000000 --- a/libesmtp-lwres_includedir.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- configure.in -+++ configure.in -@@ -187,8 +187,8 @@ - have_getaddrinfo=no - if test x$with_lwres != xno ; then - if test "$with_lwres" != yes ; then -- CPPFLAGS="-I${with_lwres}/include $CPPFLAGS" -- LDFLAGS="-L${with_lwres}/lib $LDFLAGS" -+ CPPFLAGS="-I${with_lwres} $CPPFLAGS" -+ LDFLAGS="-L${with_lwres} $LDFLAGS" - fi - AC_CHECK_HEADERS(lwres/netdb.h, , - [AC_MSG_ERROR([cannot find ])]) diff --git a/libesmtp.changes b/libesmtp.changes index a8d61a0..f353a51 100644 --- a/libesmtp.changes +++ b/libesmtp.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Aug 06 13:52:23 CEST 2008 - bwalle@suse.de + +- allow multiple calls of smtp_set_header() for Cc and Bcc headers +- disable lwres because we don't want to have a daemon (the lwresd) + running just for address resolution + ------------------------------------------------------------------- Tue Sep 4 16:41:52 CEST 2007 - mrueckert@suse.de @@ -7,7 +14,7 @@ Tue Sep 4 16:41:52 CEST 2007 - mrueckert@suse.de ------------------------------------------------------------------- Tue Sep 4 09:37:02 CEST 2007 - crrodriguez@suse.de -- fix #307257 missing requires of the libesmtp-devel package +- fix #307257 missing requires of the libesmtp-devel package ------------------------------------------------------------------- Wed Jan 25 21:32:18 CET 2006 - mls@suse.de @@ -24,7 +31,7 @@ Tue Jan 17 14:27:06 CET 2006 - lmichnovic@suse.cz ------------------------------------------------------------------- Wed Nov 2 21:47:32 CET 2005 - dmueller@suse.de -- don't build as root +- don't build as root ------------------------------------------------------------------- Mon Sep 26 22:05:45 CEST 2005 - mls@suse.de @@ -50,5 +57,5 @@ Thu Feb 19 14:53:54 CET 2004 - sbrabec@suse.cz ------------------------------------------------------------------- Wed Jul 30 08:36:09 CEST 2003 - hhetter@suse.de -- initial SuSE package +- initial SuSE package diff --git a/libesmtp.spec b/libesmtp.spec index 892972f..73b7e89 100644 --- a/libesmtp.spec +++ b/libesmtp.spec @@ -1,28 +1,36 @@ # # spec file for package libesmtp (Version 1.0.4) # -# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. +# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild + Name: libesmtp -BuildRequires: bind-devel openssl-devel +BuildRequires: openssl-devel Url: http://www.stafford.uklinux.net/libesmtp/ -License: GPL v2 or later; LGPL v2 or later +License: GPL v2 or later; LGPL v2.1 or later Group: Development/Libraries/C and C++ Summary: A Library for Posting Electronic Mail Version: 1.0.4 -Release: 97 +Release: 157 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: %{name}-%{version}.tar.bz2 Patch0: libesmtp-removedecls.diff -Patch1: libesmtp-lwres_includedir.patch -Patch2: libesmtp-1.0.4-bloat.patch +Patch1: libesmtp-1.0.4-bloat.patch +Patch2: libesmtp-1.0.4-multiple-cc.patch %description libESMTP is a library to manage posting (or submission of) electronic @@ -38,6 +46,7 @@ Authors: Brian Stafford %package devel +License: GPL v2 or later; LGPL v2.1 or later Summary: A Library for Posting Electronic Mail Group: Development/Libraries/C and C++ Requires: libesmtp = %{version} @@ -55,24 +64,23 @@ Authors: -------- Brian Stafford -%prep +%prep %setup -q %patch0 -%patch1 -%patch2 +%patch1 +%patch2 -p1 %build autoreconf -fi %configure --disable-static --with-pic \ - --with-lwres=/usr/include/bind/ \ --enable-ntlm \ - --enable-etrn + --enable-etrn %{__make} %{?jobs:-j%jobs} %install make DESTDIR=%{buildroot} install #uses dlsym not ltdl ..useless files -rm -rf %{buildroot}%{_libdir}/esmtp-plugins/*a +rm -rf %{buildroot}%{_libdir}/esmtp-plugins/*a rm -rf %{buildroot}%{_libdir}/*a %clean @@ -84,7 +92,7 @@ rm -rf %{buildroot} %files %defattr(-,root,root) -%doc README AUTHORS ChangeLog COPYING +%doc README AUTHORS ChangeLog COPYING %dir %{_libdir}/esmtp-plugins %{_libdir}/esmtp-plugins/*so* %{_libdir}/libesmtp.*so.* @@ -94,28 +102,33 @@ rm -rf %{buildroot} %{_bindir}/libesmtp-config %{_includedir}/*.h %{_libdir}/libesmtp.*so + %changelog -* Tue Sep 04 2007 - mrueckert@suse.de +* Wed Aug 06 2008 bwalle@suse.de +- allow multiple calls of smtp_set_header() for Cc and Bcc headers +- disable lwres because we don't want to have a daemon (the lwresd) + running just for address resolution +* Tue Sep 04 2007 mrueckert@suse.de - remove postfix from the buildrequires - do not package generic INSTALL file -* Tue Sep 04 2007 - crrodriguez@suse.de +* Tue Sep 04 2007 crrodriguez@suse.de - fix #307257 missing requires of the libesmtp-devel package -* Wed Jan 25 2006 - mls@suse.de +* Wed Jan 25 2006 mls@suse.de - converted neededforbuild to BuildRequires -* Tue Jan 17 2006 - lmichnovic@suse.cz +* Tue Jan 17 2006 lmichnovic@suse.cz - Updated to version 1.0.4 - enabled support for lwres: lwres_includedir.patch; bind-devel added into NFB - enabled support for ntlm, etrn -* Wed Nov 02 2005 - dmueller@suse.de +* Wed Nov 02 2005 dmueller@suse.de - don't build as root -* Mon Sep 26 2005 - mls@suse.de +* Tue Sep 27 2005 mls@suse.de - move .so symlink into devel package - make devel package require base package -* Sun May 08 2005 - mmj@suse.de +* Sun May 08 2005 mmj@suse.de - Don't declare things we have for sure on linux -* Fri Mar 26 2004 - mmj@suse.de +* Fri Mar 26 2004 mmj@suse.de - Add postfix to # neededforbuild -* Thu Feb 19 2004 - sbrabec@suse.cz +* Thu Feb 19 2004 sbrabec@suse.cz - Updated to version 1.0.2. -* Wed Jul 30 2003 - hhetter@suse.de +* Wed Jul 30 2003 hhetter@suse.de - initial SuSE package