[packages/libytnef] - updated URLs, updated to 1.9.3 (now combined libytnef+ytnef, over 10 CVEs fixed) - added ytnef pac
qboosh
qboosh at pld-linux.org
Thu May 16 16:33:57 CEST 2019
commit 173b4b06d274c3cfb88e37bfb8fb9c46df00226d
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Thu May 16 16:34:28 2019 +0200
- updated URLs, updated to 1.9.3 (now combined libytnef+ytnef, over 10 CVEs fixed)
- added ytnef package with epoch 1 (separate ytnef ended at version 2.6 in PLD, 2.7 upstream)
- removed obsolete segv patch
libytnef-segv.patch | 11 ----------
libytnef.spec | 58 ++++++++++++++++++++++++++++++++++++++++-------------
2 files changed, 44 insertions(+), 25 deletions(-)
---
diff --git a/libytnef.spec b/libytnef.spec
index aefca15..27e1fc7 100644
--- a/libytnef.spec
+++ b/libytnef.spec
@@ -1,18 +1,17 @@
-# note: development continued on https://github.com/Yeraze/ytnef
Summary: C library for decoding application/ms-tnef e-mail attachments
Summary(pl.UTF-8): Biblioteka C do dekodowania załączników e-maili typu application/ms-tnef
Name: libytnef
-Version: 1.5
-Release: 4
+Version: 1.9.3
+Release: 1
License: GPL v2+
Group: Libraries
-Source0: http://downloads.sourceforge.net/ytnef/%{name}-%{version}.tar.gz
-# Source0-md5: 6c44b955f33cf714c75a7bbe895cc352
-Patch0: %{name}-segv.patch
-URL: http://ytnef.sourceforge.net/
-BuildRequires: autoconf >= 2.50
-BuildRequires: automake
-BuildRequires: libtool
+#Source0Download: https://github.com/Yeraze/ytnef/releases
+Source0: https://github.com/Yeraze/ytnef/archive/v%{version}/ytnef-%{version}.tar.gz
+# Source0-md5: 60b7c26daa19a1246d077560b6862150
+URL: https://github.com/Yeraze/ytnef
+BuildRequires: autoconf >= 2.63
+BuildRequires: automake >= 1:1.9
+BuildRequires: libtool >= 2:2.2
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -48,9 +47,30 @@ Static libytnef library.
%description static -l pl.UTF-8
Statyczna biblioteka libytnef.
+%package -n ytnef
+Summary: Yerase's TNEF Stream Reader
+Summary(pl.UTF-8): Czytnik strumieni TNET autorstwa Yerase
+# it's a continuation of separate subproject (ytnef.spec) ended at version 2.7
+Epoch: 1
+Group: Applications/File
+Requires: %{name} = %{version}-%{release}
+
+%description -n ytnef
+Yerase's TNEF Stream Reader. Can take a TNEF Stream (winmail.dat)
+sent from Microsoft Outlook (or similar products) and extract the
+attachments, including construction of Contact Cards & Calendar
+entries.
+
+%description -n ytnef -l pl.UTF-8
+Czytnik strumieni TNET autorstwa Yerase - potrafi przyjąć strumień
+TNEF (winmail.dat) wysłany w programu Microsoft Outlook (lub
+podobnego) i wydobyć załączniki, w tym tworzenie kart kontaktowych
+oraz wpisów kalendarza.
+
+# NOTE: don't place any subpackages after -n ytnef because of EPOCH setting
+
%prep
-%setup -q
-%patch0 -p1
+%setup -q -n ytnef-%{version}
%build
%{__libtoolize}
@@ -58,7 +78,8 @@ Statyczna biblioteka libytnef.
%{__autoconf}
%{__autoheader}
%{__automake}
-%configure
+%configure \
+ --disable-silent-rules
%{__make}
%install
@@ -67,6 +88,9 @@ rm -rf $RPM_BUILD_ROOT
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
+# obsoleted by pkg-config
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libytnef.la
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -82,14 +106,20 @@ rm -rf $RPM_BUILD_ROOT
%files devel
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libytnef.so
-%{_libdir}/libytnef.la
%{_includedir}/mapi.h
%{_includedir}/mapidefs.h
%{_includedir}/mapitags.h
%{_includedir}/tnef-errors.h
%{_includedir}/tnef-types.h
%{_includedir}/ytnef.h
+%{_pkgconfigdir}/libytnef.pc
%files static
%defattr(644,root,root,755)
%{_libdir}/libytnef.a
+
+%files -n ytnef
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/ytnef
+%attr(755,root,root) %{_bindir}/ytnefprint
+%attr(755,root,root) %{_bindir}/ytnefprocess
diff --git a/libytnef-segv.patch b/libytnef-segv.patch
deleted file mode 100644
index cdde2b8..0000000
--- a/libytnef-segv.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- libytnef-1.5/ytnef.c.orig 2004-08-26 19:09:05.000000000 +0200
-+++ libytnef-1.5/ytnef.c 2014-12-28 13:22:11.710584874 +0100
-@@ -1328,7 +1328,7 @@
-
- comp_Prebuf.size = strlen(RTF_PREBUF);
- comp_Prebuf.data = calloc(comp_Prebuf.size, 1);
-- strcpy(comp_Prebuf.data, RTF_PREBUF);
-+ memcpy(comp_Prebuf.data, RTF_PREBUF, comp_Prebuf.size);
-
- src = p->data;
- in = 0;
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/libytnef.git/commitdiff/173b4b06d274c3cfb88e37bfb8fb9c46df00226d
More information about the pld-cvs-commit
mailing list