From: Jakub Bogusz <qboosh@pld-linux.org>
Date: Mon, 7 Feb 2022 16:15:22 +0000 (+0100)
Subject: - updated to 1.1.0 (fixes CVE-2019-19977; now uses meson and depends on openssl 1... 
X-Git-Tag: auto/th/libesmtp-1.1.0-1
X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=6d4f6665efbbd028a1b886a33a9a5887fe7053d8;p=packages%2Flibesmtp.git

- updated to 1.1.0 (fixes CVE-2019-19977; now uses meson and depends on openssl 1.1.0+)
- added soname patch from Debian
---

diff --git a/libesmtp-soname.patch b/libesmtp-soname.patch
new file mode 100644
index 0000000..3eb65f0
--- /dev/null
+++ b/libesmtp-soname.patch
@@ -0,0 +1,21 @@
+From: "Jeremy T. Bouse" <jbouse@debian.org>
+Date: Mon, 7 Jun 2021 20:28:24 -0400
+Subject: Update libESMTP SONAME version on build
+
+---
+ meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index 72e23c3..e2b8a44 100644
+--- a/meson.build
++++ b/meson.build
+@@ -208,7 +208,7 @@ vflag = '-Wl,--version-script,@0@/@1@'.format(meson.current_source_dir(), mapfil
+ 
+ lib = library('esmtp', sources,
+ 	      link_args : vflag, link_depends : mapfile,
+-	      soversion : libesmtp_so_version,
++	      version : libesmtp_so_version,
+ 	      dependencies : deps,
+ 	      install : true)
+ 
diff --git a/libesmtp.spec b/libesmtp.spec
index 3f24a43..5a9efaa 100644
--- a/libesmtp.spec
+++ b/libesmtp.spec
@@ -1,20 +1,20 @@
 Summary:	SMTP client library
 Summary(pl.UTF-8):	Biblioteka kliencka SMTP
 Name:		libesmtp
-Version:	1.0.6
-Release:	3
+Version:	1.1.0
+Release:	1
 License:	LGPL v2.1+
 Group:		Libraries
-#Source0Download: http://brianstafford.info/libesmtp/download.html
-Source0:	http://brianstafford.info/libesmtp/%{name}-%{version}.tar.bz2
-# Source0-md5:	bf3915e627fd8f35524a8fdfeed979c8
-URL:		http://brianstafford.info/libesmtp/
-BuildRequires:	automake
-BuildRequires:	openssl-devel >= 0.9.7c
+#Source0Download: https://github.com/libesmtp/libESMTP/releases
+Source0:	https://github.com/libesmtp/libESMTP/archive/v%{version}/libESMTP-%{version}.tar.gz
+# Source0-md5:	1c89f9af9f56b74ec4dce3fc59a7236f
+Patch0:		%{name}-soname.patch
+URL:		https://libesmtp.github.io/
+BuildRequires:	meson
+BuildRequires:	ninja >= 1.5
+BuildRequires:	openssl-devel >= 1.1.0
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%undefine	__cxx
-
 %description
 LibESMTP is a library to manage posting (or submission of) electronic
 mail using SMTP to a preconfigured Mail Transport Agent (MTA) such as
@@ -33,7 +33,7 @@ Summary:	Development resources for libesmtp
 Summary(pl.UTF-8):	Pliki dla programistów używających libesmtp
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
-Requires:	openssl-devel >= 0.9.7c
+Requires:	openssl-devel >= 1.1.0
 
 %description devel
 Development resources for libesmtp.
@@ -54,25 +54,21 @@ Static libesmtp libraries.
 Statyczne biblioteki libesmtp.
 
 %prep
-%setup -q
+%setup -q -n libESMTP-%{version}
+%patch0 -p1
 
 %build
-cp -f /usr/share/automake/config.sub  .
-%configure \
-	%{?debug:--enable-debug}%{!?debug:--disable-debug} \
-	--enable-etrn \
-	--enable-ntlm \
-	--enable-pthreads \
-	--with-auth-plugin-dir=%{_libdir}/esmtp-plugins
-%{__make}
+%meson build
+
+%ninja_build -C build
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__make} install \
-	DESTDIR=$RPM_BUILD_ROOT
+%ninja_install -C build
 
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/esmtp-plugins/*.{a,la}
+# plugin interface, not installed by meson
+cp -p auth-plugin.h $RPM_BUILD_ROOT%{_includedir}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -82,20 +78,22 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog NEWS Notes README
+%doc README.md docs/{ChangeLog.md,NEWS.md,authors.md,bugreport.md,changes-since-v1.0.6.md}
 %attr(755,root,root) %{_libdir}/libesmtp.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libesmtp.so.6
-%dir %{_libdir}/esmtp-plugins
-%attr(755,root,root) %{_libdir}/esmtp-plugins/sasl-*.so
+%dir %{_libdir}/esmtp-plugins-6.2.0
+%attr(755,root,root) %{_libdir}/esmtp-plugins-6.2.0/sasl-crammd5.so
+%attr(755,root,root) %{_libdir}/esmtp-plugins-6.2.0/sasl-login.so
+%attr(755,root,root) %{_libdir}/esmtp-plugins-6.2.0/sasl-ntlm.so
+%attr(755,root,root) %{_libdir}/esmtp-plugins-6.2.0/sasl-plain.so
 
 %files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/libesmtp-config
 %attr(755,root,root) %{_libdir}/libesmtp.so
-%{_libdir}/libesmtp.la
 %{_includedir}/auth-client.h
 %{_includedir}/auth-plugin.h
 %{_includedir}/libesmtp.h
+%{_pkgconfigdir}/libesmtp-1.0.pc
 
 %files static
 %defattr(644,root,root,755)