diff --git a/libytnef-1.5.tar.bz b/libytnef-1.5.tar.bz deleted file mode 100644 index 6bbe1d0..0000000 Binary files a/libytnef-1.5.tar.bz and /dev/null differ diff --git a/libytnef-bufferoverflow.patch b/libytnef-bufferoverflow.patch deleted file mode 100644 index 4498729..0000000 --- a/libytnef-bufferoverflow.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 492f2ea1326d7825943f48aff31ed0ddc89fd2b7 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= -Date: Wed, 4 Jul 2012 17:04:44 +0200 -Subject: [PATCH] Fix off-by-one error when copying RTF header - -The RTF header (RTF_PREBUF) string is copied to temporary buffer. The -terminating '\0' is never accessed, so it's not needed and cannot be -written after the allocated buffer. - - - ---- - ytnef.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/ytnef.c b/ytnef.c -index 482ecdc..970c048 100644 ---- a/ytnef.c -+++ b/ytnef.c -@@ -1328,7 +1328,7 @@ unsigned char *DecompressRTF(variableLength *p, int *size) { - - 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; --- -1.7.7.6 diff --git a/libytnef.spec b/libytnef.spec index b333f23..3f7d86d 100644 --- a/libytnef.spec +++ b/libytnef.spec @@ -1,36 +1,41 @@ -Name: libytnef -Version: 1.5 +Name: ytnef +Version: 2.0 Release: 1 Summary: TNEF Stream Parser Library - -Group: System Environment/Libraries -License: GPL+ -URL: http://ytnef.sf.net -Source0: http://dl.sf.net/ytnef/libytnef-1.5.tar.bz -# fixes potential bufferoverflow -# rhbz#831322 -Patch0: libytnef-bufferoverflow.patch +License: GPLv2+ +URL: https://github.com/Yeraze/ytnef +Source0: https://github.com/Yeraze/ytnef/archive/v%{version}/%{name}-%{version}.tar.gz +Patch0: ytnef-pkgconfig.patch +BuildRequires: make autoconf automake libtool perl-generators +Requires: libytnef = %{version}-%{release} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description +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. + +%package -n libytnef +Summary: TNEF Stream Reader Library + +%description -n libytnef TNEF Stream Parser Library, used by "ytnef" to decode TNEF (winmail.dat) streams generated by Microsoft Outlook. +%package -n libytnef-devel +Summary: Development files for libytnef +Requires: libytnef = %{version}-%{release} -%package devel -Summary: Development files for %{name} -Group: Development/Libraries -Requires: %{name} = %{version}-%{release} - -%description devel -The %{name}-devel package contains libraries and header files for -developing applications that use %{name}. +%description -n libytnef-devel +The libytnef-devel package contains libraries and header files for +developing applications that use libytnef. %prep %setup -q -%patch0 -p1 -b.bufferoverflow +./autogen.sh +%patch0 -p1 %build %configure --disable-static @@ -39,7 +44,7 @@ make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT includedir=%{_includedir}/%{name} +make install DESTDIR=$RPM_BUILD_ROOT includedir=%{_includedir}/libytnef find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' @@ -51,18 +56,25 @@ rm -rf $RPM_BUILD_ROOT %postun -p /sbin/ldconfig - %files +%license COPYING +%{_bindir}/* + +%files -n libytnef %defattr(-,root,root,-) %doc ChangeLog COPYING %{_libdir}/*.so.* -%files devel +%files -n libytnef-devel %defattr(-,root,root,-) -%{_includedir}/%{name}/ +%{_includedir}/libytnef/ %{_libdir}/*.so +%{_libdir}/pkgconfig/libytnef.pc %changelog -* Wen Sep 22 2021 douyan - 1.5.1-1 -- Init package for openEuler \ No newline at end of file +* Thu Jul 21 2022 duyiwei - 2.0-1 +- upgrade to v2.0 + +* Wed Sep 22 2021 douyan - 1.5.1-1 +- Init package for openEuler diff --git a/ytnef-2.0.tar.gz b/ytnef-2.0.tar.gz new file mode 100644 index 0000000..011103d Binary files /dev/null and b/ytnef-2.0.tar.gz differ diff --git a/ytnef-pkgconfig.patch b/ytnef-pkgconfig.patch new file mode 100644 index 0000000..92d13a2 --- /dev/null +++ b/ytnef-pkgconfig.patch @@ -0,0 +1,9 @@ +diff -up ytnef-1.9.2/lib/libytnef.pc.in.orig ytnef-1.9.2/lib/libytnef.pc.in +--- ytnef-1.9.2/lib/libytnef.pc.in.orig 2017-03-28 10:50:58.496400854 +0200 ++++ ytnef-1.9.2/lib/libytnef.pc.in 2017-03-28 10:51:20.576558722 +0200 +@@ -8,4 +8,4 @@ Description: Yerase's TNEF Stream Reader + URL: https://github.com/Yeraze/ytnef + Version: @VERSION@ + Libs: -L${libdir} -lytnef +-Cflags: -I${includedir} ++Cflags: -I${includedir}/libytnef