delete useless patch
This commit is contained in:
parent
9e35ebebff
commit
f94f07abb1
@ -1,31 +0,0 @@
|
||||
diff -up ./_builddir/zzip/_config.h.orig ./_builddir/zzip/_config.h
|
||||
--- ./_builddir/zzip/_config.h.orig 2018-07-23 09:11:59.971840954 +0300
|
||||
+++ ./_builddir/zzip/_config.h 2018-07-23 09:12:07.438731527 +0300
|
||||
@@ -139,6 +139,11 @@
|
||||
/* whether the system defaults to 32bit off_t but can do 64bit when requested
|
||||
*/
|
||||
/* #undef LARGEFILE_SENSITIVE */
|
||||
+#if __WORDSIZE == 32
|
||||
+#ifndef ZZIP_LARGEFILE_SENSITIVE
|
||||
+#define ZZIP_LARGEFILE_SENSITIVE 1
|
||||
+#endif
|
||||
+#endif
|
||||
|
||||
/* Define to the sub-directory where libtool stores uninstalled libraries. */
|
||||
#ifndef ZZIP_LT_OBJDIR
|
||||
@@ -197,6 +202,15 @@
|
||||
/* The number of bytes in type short */
|
||||
/* #undef SIZEOF_SHORT */
|
||||
|
||||
+/* The number of bytes in type long */
|
||||
+#ifndef ZZIP_SIZEOF_LONG
|
||||
+#if __WORDSIZE == 32
|
||||
+#define ZZIP_SIZEOF_LONG 4
|
||||
+#elif __WORDSIZE == 64
|
||||
+#define ZZIP_SIZEOF_LONG 8
|
||||
+#endif
|
||||
+#endif
|
||||
+
|
||||
/* Define to 1 if you have the ANSI C header files. */
|
||||
#ifndef ZZIP_STDC_HEADERS
|
||||
#define ZZIP_STDC_HEADERS 1
|
||||
12
zziplib.spec
12
zziplib.spec
@ -4,13 +4,12 @@ sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' */libtool
|
||||
|
||||
Name: zziplib
|
||||
Version: 0.13.69
|
||||
Release: 3
|
||||
Release: 4
|
||||
Summary: Lightweight library for zip compression
|
||||
License: LGPLv2+ or MPLv1.1
|
||||
URL: http://zziplib.sourceforge.net
|
||||
Source0: https://github.com/gdraheim/zziplib/archive/v%{version}.tar.gz
|
||||
|
||||
Patch0: zziplib-0.13.69-multilib.patch
|
||||
Patch6000: CVE-2018-16548-1.patch
|
||||
Patch6001: CVE-2018-16548-2.patch
|
||||
Patch6002: CVE-2018-16548-3.patch
|
||||
@ -61,12 +60,6 @@ export PYTHON=%__python2
|
||||
%configure --disable-static --enable-sdl --enable-frame-pointer --enable-builddir=_builddir
|
||||
%disable_rpath
|
||||
|
||||
%ifnarch armv7hl
|
||||
cd _builddir
|
||||
%apply_patch %{PATCH0} -p2
|
||||
cd ..
|
||||
%endif
|
||||
|
||||
%make_build
|
||||
|
||||
%install
|
||||
@ -93,6 +86,9 @@ cd ..
|
||||
%{_mandir}/man3/*
|
||||
|
||||
%changelog
|
||||
* Thu Jan 9 2020 BruceGW <gyl93216@163.com> - 0.13.36-4
|
||||
- Delete useless patch
|
||||
|
||||
* Sat Dec 21 2019 openEuler Buildteam <buildteam@openeuler.org> - 0.13.36-3
|
||||
- Fix CVE-2018-16548 and CVE-2018-17828
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user