The package rpms/zziplib.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/zziplib.git/commit/?id=cbbc63a862....
Change:
+%ifnarch i686 armv7hl
Thanks.
Full change:
============
commit 4b3897c89c7bc3f6fcf84833dc4a4a41af16d437
Merge: 859b969 0192e3f
Author: Alexander Bokovoy <abokovoy(a)redhat.com>
Date: Wed Nov 28 12:47:01 2018 +0200
Merge branch 'f28' of
ssh://pkgs.fedoraproject.org/rpms/zziplib into f29
commit 859b969a38dd96fd445fba7dd32bcc4bcd516e7e
Author: Alexander Bokovoy <abokovoy(a)redhat.com>
Date: Mon Jul 23 09:36:12 2018 +0300
BuildRequires: python2-rpm-macros for %__python2
diff --git a/zziplib.spec b/zziplib.spec
index 3490e07..3ad012d 100644
--- a/zziplib.spec
+++ b/zziplib.spec
@@ -10,6 +10,7 @@ Patch0: zziplib-0.13.69-multilib.patch
BuildRequires: gcc
BuildRequires: perl-interpreter
BuildRequires: python2
+BuildRequires: python2-rpm-macros
BuildRequires: zip
BuildRequires: xmlto
BuildRequires: zlib-devel
commit 5127c312bef48e277a0660ffaf757bcfdcb3c53b
Author: Alexander Bokovoy <abokovoy(a)redhat.com>
Date: Mon Jul 23 09:27:35 2018 +0300
use explicit Python 2
diff --git a/zziplib.spec b/zziplib.spec
index ccb4a52..3490e07 100644
--- a/zziplib.spec
+++ b/zziplib.spec
@@ -64,6 +64,7 @@ find . -name '*.py' | xargs sed -i 's@#! /usr/bin/python@#!
%__python2@g;s@#! /u
%build
export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
+export PYTHON=%__python2
%configure \
--disable-static \
--enable-sdl \
commit 2a386021d94df83b314c145cb5fb6c5967b1d3ab
Author: Alexander Bokovoy <abokovoy(a)redhat.com>
Date: Mon Jul 23 09:18:42 2018 +0300
Rebase multilib patch
diff --git a/zziplib-0.13.67-multilib.patch b/zziplib-0.13.67-multilib.patch
deleted file mode 100644
index 169520b..0000000
--- a/zziplib-0.13.67-multilib.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -up ./x86_64-redhat-linux-gnu/zzip/_config.h.orig
./x86_64-redhat-linux-gnu/zzip/_config.h
---- ./x86_64-redhat-linux-gnu/zzip/_config.h.orig 2018-02-01 22:13:36.593910695 +0200
-+++ ./x86_64-redhat-linux-gnu/zzip/_config.h 2018-02-01 22:15:40.341476130 +0200
-@@ -133,7 +133,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 in which libtool stores uninstalled libraries.
- */
-@@ -183,8 +187,12 @@
-
- /* 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
-
- /* The number of bytes in type short */
- #ifndef ZZIP_SIZEOF_SHORT
-@@ -219,7 +227,11 @@
- #endif
-
- /* Number of bits in a file offset, on hosts where this is settable. */
--/* #undef _FILE_OFFSET_BITS */
-+#if __WORDSIZE == 32
-+#ifndef ZZIP__FILE_OFFSET_BITS
-+#define ZZIP__FILE_OFFSET_BITS 64
-+#endif
-+#endif
-
- /* Define for large files, on AIX-style hosts. */
- /* #undef _LARGE_FILES */
diff --git a/zziplib-0.13.69-multilib.patch b/zziplib-0.13.69-multilib.patch
new file mode 100644
index 0000000..24cf64b
--- /dev/null
+++ b/zziplib-0.13.69-multilib.patch
@@ -0,0 +1,31 @@
+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
diff --git a/zziplib.spec b/zziplib.spec
index 6abfea7..ccb4a52 100644
--- a/zziplib.spec
+++ b/zziplib.spec
@@ -6,7 +6,7 @@ License: LGPLv2+ or MPLv1.1
Group: Applications/Archiving
URL:
http://zziplib.sourceforge.net/
Source:
https://github.com/gdraheim/zziplib/archive/v%{version}.tar.gz
-Patch0: zziplib-0.13.67-multilib.patch
+Patch0: zziplib-0.13.69-multilib.patch
BuildRequires: gcc
BuildRequires: perl-interpreter
BuildRequires: python2
commit 088381c91202c7f59b045a527bad150dc2ce8fdc
Author: Alexander Bokovoy <abokovoy(a)redhat.com>
Date: Mon Jul 23 08:49:26 2018 +0300
0.13.69 release
diff --git a/.gitignore b/.gitignore
index d01db63..a810290 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ zziplib-0.13.49.tar.bz2
/zziplib-0.13.62.tar.bz2
/v0.13.67.tar.gz
/v0.13.68.tar.gz
+/v0.13.69.tar.gz
diff --git a/sources b/sources
index b483c7c..4a02881 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-SHA512 (v0.13.67.tar.gz) =
a34b801a18a2051aa3898a572508ffd327521b69878413af679b10f6a68b37e770651884ae611bf9c01ce14013c6a1e06adeadd3ef6219d4b9278f1b9e7a6459
-SHA512 (v0.13.68.tar.gz) =
e8a9976242acc04064ec239b9b929228370a946e5bd37092adcc1bda14605710a3850d39795d1937b609d1ab9a9a1998152f8c88b2dccc387ac6ec774d9cfce9
+SHA512 (v0.13.69.tar.gz) =
ade026289737f43ca92a8746818d87dd7618d473dbce159546ce9071c9e4cbe164a6b1c9efff16efb7aa0327b2ec6b34f3256c6bda19cd6e325703fffc810ef0
diff --git a/zziplib.spec b/zziplib.spec
index d461d6b..6abfea7 100644
--- a/zziplib.spec
+++ b/zziplib.spec
@@ -1,7 +1,7 @@
Summary: Lightweight library to easily extract data from zip files
Name: zziplib
-Version: 0.13.68
-Release: 3%{?dist}
+Version: 0.13.69
+Release: 1%{?dist}
License: LGPLv2+ or MPLv1.1
Group: Applications/Archiving
URL:
http://zziplib.sourceforge.net/
@@ -59,6 +59,8 @@ zziplib library.
%prep
%setup -q
+# Force py2 for the build
+find . -name '*.py' | xargs sed -i 's@#! /usr/bin/python@#! %__python2@g;s@#!
/usr/bin/env python@#! %__python2@g'
%build
export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
@@ -105,6 +107,12 @@ make install DESTDIR=%{buildroot}
%{_mandir}/man3/*
%changelog
+* Mon Jul 23 2018 Alexander Bokovoy <abokovoy(a)redhat.com> - 0.13.69-1
+- Update to 0.13.69 release
+- Fixes: #1598246 (CVE-2018-6541)
+- Fixes: #1554673 (CVE-2018-7727)
+- Use versioned python executables everywhere
+
* Sat Jul 14 2018 Fedora Release Engineering <releng(a)fedoraproject.org> -
0.13.68-3
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
commit 50d3eb122a23e11cba7376f1351d0d4eca1b6014
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Sat Jul 14 09:54:27 2018 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/zziplib.spec b/zziplib.spec
index 4e58bd8..d461d6b 100644
--- a/zziplib.spec
+++ b/zziplib.spec
@@ -1,7 +1,7 @@
Summary: Lightweight library to easily extract data from zip files
Name: zziplib
Version: 0.13.68
-Release: 2%{?dist}
+Release: 3%{?dist}
License: LGPLv2+ or MPLv1.1
Group: Applications/Archiving
URL:
http://zziplib.sourceforge.net/
@@ -105,6 +105,9 @@ make install DESTDIR=%{buildroot}
%{_mandir}/man3/*
%changelog
+* Sat Jul 14 2018 Fedora Release Engineering <releng(a)fedoraproject.org> -
0.13.68-3
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
* Sun Mar 18 2018 Iryna Shcherbina <ishcherb(a)redhat.com> - 0.13.68-2
- Update Python 2 dependency declarations to new packaging standards
(See
https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3)
commit 02e349f198dcdfa99e39b93e2ce9a6a82f36c0c3
Author: Igor Gnatenko <ignatenko(a)redhat.com>
Date: Mon Jul 9 19:06:54 2018 +0200
add BuildRequires: gcc
Reference:
https://fedoraproject.org/wiki/Changes/Remove_GCC_from_BuildRoot
diff --git a/zziplib.spec b/zziplib.spec
index c791372..4e58bd8 100644
--- a/zziplib.spec
+++ b/zziplib.spec
@@ -7,6 +7,7 @@ Group: Applications/Archiving
URL:
http://zziplib.sourceforge.net/
Source:
https://github.com/gdraheim/zziplib/archive/v%{version}.tar.gz
Patch0: zziplib-0.13.67-multilib.patch
+BuildRequires: gcc
BuildRequires: perl-interpreter
BuildRequires: python2
BuildRequires: zip
commit 722d7637919ae8b240cb019c6f3ed9b983965236
Author: Iryna Shcherbina <shcherbina.iryna(a)gmail.com>
Date: Sun Mar 18 13:53:31 2018 +0100
Update Python 2 dependency declarations to new packaging standards
diff --git a/zziplib.spec b/zziplib.spec
index dab3b42..c791372 100644
--- a/zziplib.spec
+++ b/zziplib.spec
@@ -1,14 +1,14 @@
Summary: Lightweight library to easily extract data from zip files
Name: zziplib
Version: 0.13.68
-Release: 1%{?dist}
+Release: 2%{?dist}
License: LGPLv2+ or MPLv1.1
Group: Applications/Archiving
URL:
http://zziplib.sourceforge.net/
Source:
https://github.com/gdraheim/zziplib/archive/v%{version}.tar.gz
Patch0: zziplib-0.13.67-multilib.patch
BuildRequires: perl-interpreter
-BuildRequires: python
+BuildRequires: python2
BuildRequires: zip
BuildRequires: xmlto
BuildRequires: zlib-devel
@@ -104,6 +104,10 @@ make install DESTDIR=%{buildroot}
%{_mandir}/man3/*
%changelog
+* Sun Mar 18 2018 Iryna Shcherbina <ishcherb(a)redhat.com> - 0.13.68-2
+- Update Python 2 dependency declarations to new packaging standards
+ (See
https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3)
+
* Wed Feb 14 2018 Alexander Bokovoy <abokovoy(a)redhat.com> - 0.13.68-1
- 0.13.68
- Fixes: #1543942 (CVE-2018-6484)
commit e0dbc893b1516430962d1213611b71beea5e10e1
Author: Alexander Bokovoy <abokovoy(a)redhat.com>
Date: Wed Feb 14 18:36:14 2018 +0200
Update to 0.13.68
Fixes #1543942
diff --git a/.gitignore b/.gitignore
index e06560b..d01db63 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ zziplib-0.13.49.tar.bz2
/zziplib-0.13.60.tar.bz2
/zziplib-0.13.62.tar.bz2
/v0.13.67.tar.gz
+/v0.13.68.tar.gz
diff --git a/sources b/sources
index 0f2de80..b483c7c 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
SHA512 (v0.13.67.tar.gz) =
a34b801a18a2051aa3898a572508ffd327521b69878413af679b10f6a68b37e770651884ae611bf9c01ce14013c6a1e06adeadd3ef6219d4b9278f1b9e7a6459
+SHA512 (v0.13.68.tar.gz) =
e8a9976242acc04064ec239b9b929228370a946e5bd37092adcc1bda14605710a3850d39795d1937b609d1ab9a9a1998152f8c88b2dccc387ac6ec774d9cfce9
diff --git a/zziplib-0.13.67-CVE-2018-6381.patch b/zziplib-0.13.67-CVE-2018-6381.patch
deleted file mode 100644
index d614558..0000000
--- a/zziplib-0.13.67-CVE-2018-6381.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From a803559fa9194be895422ba3684cf6309b6bb598 Mon Sep 17 00:00:00 2001
-From: Guido Draheim <guidod(a)gmx.de>
-Date: Thu, 1 Feb 2018 12:27:49 +0100
-Subject: [PATCH] merge CVE-2018-6381.patch from @jmoellers #12
-
----
- zzip/memdisk.c | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/zzip/memdisk.c b/zzip/memdisk.c
-index cab883b..a85dab0 100644
---- a/zzip/memdisk.c
-+++ b/zzip/memdisk.c
-@@ -210,6 +210,14 @@ zzip_mem_entry_new(ZZIP_DISK * disk, ZZIP_DISK_ENTRY * entry)
- item->zz_diskstart = zzip_disk_entry_get_diskstart(entry);
- item->zz_filetype = zzip_disk_entry_get_filetype(entry);
-
-+ /*
-+ * If the file is uncompressed, zz_csize and zz_usize should be the same
-+ * If they are not, we cannot guarantee that either is correct, so ...
-+ */
-+ if (item->zz_compr == ZZIP_IS_STORED && item->zz_csize !=
item->zz_usize)
-+ {
-+ goto error;
-+ }
- /* zz_comment and zz_name are empty strings if not present on disk */
- if (! item->zz_comment || ! item->zz_name)
- {
diff --git a/zziplib.spec b/zziplib.spec
index 73b34f1..dab3b42 100644
--- a/zziplib.spec
+++ b/zziplib.spec
@@ -1,13 +1,12 @@
Summary: Lightweight library to easily extract data from zip files
Name: zziplib
-Version: 0.13.67
-Release: 2%{?dist}
+Version: 0.13.68
+Release: 1%{?dist}
License: LGPLv2+ or MPLv1.1
Group: Applications/Archiving
URL:
http://zziplib.sourceforge.net/
Source:
https://github.com/gdraheim/zziplib/archive/v%{version}.tar.gz
-Patch0: zziplib-0.13.67-CVE-2018-6381.patch
-Patch1: zziplib-0.13.67-multilib.patch
+Patch0: zziplib-0.13.67-multilib.patch
BuildRequires: perl-interpreter
BuildRequires: python
BuildRequires: zip
@@ -59,7 +58,6 @@ zziplib library.
%prep
%setup -q
-%patch0 -p1
%build
export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
@@ -75,7 +73,7 @@ sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g'
*/libtool
# These platforms have a correct _config.h already
%ifnarch i686 armv7hl
cd _builddir
-%apply_patch %{PATCH1} -p2
+%apply_patch %{PATCH0} -p2
cd ..
%endif
@@ -106,6 +104,10 @@ make install DESTDIR=%{buildroot}
%{_mandir}/man3/*
%changelog
+* Wed Feb 14 2018 Alexander Bokovoy <abokovoy(a)redhat.com> - 0.13.68-1
+- 0.13.68
+- Fixes: #1543942 (CVE-2018-6484)
+
* Fri Feb 09 2018 Fedora Release Engineering <releng(a)fedoraproject.org> -
0.13.67-2
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
commit 1ef47efaab46626099b0291d585dad9bcb27e1ee
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Fri Feb 9 22:33:56 2018 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/zziplib.spec b/zziplib.spec
index e0bdcb6..73b34f1 100644
--- a/zziplib.spec
+++ b/zziplib.spec
@@ -1,7 +1,7 @@
Summary: Lightweight library to easily extract data from zip files
Name: zziplib
Version: 0.13.67
-Release: 1%{?dist}
+Release: 2%{?dist}
License: LGPLv2+ or MPLv1.1
Group: Applications/Archiving
URL:
http://zziplib.sourceforge.net/
@@ -106,6 +106,9 @@ make install DESTDIR=%{buildroot}
%{_mandir}/man3/*
%changelog
+* Fri Feb 09 2018 Fedora Release Engineering <releng(a)fedoraproject.org> -
0.13.67-2
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
* Thu Feb 01 2018 Alexander Bokovoy <abokovoy(a)redhat.com> - 0.13.67-1
- Update release
- CVE-2018-6381
commit cbbc63a862a7ba2a965c76824ab81c7ff1ae8a67
Author: Alexander Bokovoy <abokovoy(a)redhat.com>
Date: Thu Feb 1 23:46:11 2018 +0200
Only use patched _config.h on non i686 and armv7hl
diff --git a/zziplib.spec b/zziplib.spec
index cac827c..e0bdcb6 100644
--- a/zziplib.spec
+++ b/zziplib.spec
@@ -71,9 +71,13 @@ export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
# Remove rpath on 64bit archs
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g'
*/libtool
sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' */libtool
+# Only patch generated _config.h on non-i686 and armv7hl
+# These platforms have a correct _config.h already
+%ifnarch i686 armv7hl
cd _builddir
%apply_patch %{PATCH1} -p2
cd ..
+%endif
%{__make} %{?_smp_mflags}
commit 31bda2e23635ff140b85383401c325af4ecb9749
Author: Alexander Bokovoy <abokovoy(a)redhat.com>
Date: Thu Feb 1 23:14:35 2018 +0200
Use predictable builddir
diff --git a/zziplib.spec b/zziplib.spec
index 49f773f..cac827c 100644
--- a/zziplib.spec
+++ b/zziplib.spec
@@ -66,11 +66,12 @@ export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
%configure \
--disable-static \
--enable-sdl \
- --enable-frame-pointer
+ --enable-frame-pointer \
+ --enable-builddir=_builddir
# Remove rpath on 64bit archs
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g'
*/libtool
sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' */libtool
-cd %{_host}
+cd _builddir
%apply_patch %{PATCH1} -p2
cd ..
commit e3db5caf0deb1bb1fe0297bf4be411f1ff97cfb9
Author: Alexander Bokovoy <abokovoy(a)redhat.com>
Date: Thu Feb 1 23:04:31 2018 +0200
Fix CVE 2018-6381
diff --git a/.gitignore b/.gitignore
index 575c8ca..e06560b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ zziplib-0.13.49.tar.bz2
/zziplib-0.13.59.tar.bz2
/zziplib-0.13.60.tar.bz2
/zziplib-0.13.62.tar.bz2
+/v0.13.67.tar.gz
diff --git a/sources b/sources
index 77b7c33..0f2de80 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5fe874946390f939ee8f4abe9624b96c zziplib-0.13.62.tar.bz2
+SHA512 (v0.13.67.tar.gz) =
a34b801a18a2051aa3898a572508ffd327521b69878413af679b10f6a68b37e770651884ae611bf9c01ce14013c6a1e06adeadd3ef6219d4b9278f1b9e7a6459
diff --git a/zziplib-0.13.59-multilib.patch b/zziplib-0.13.59-multilib.patch
deleted file mode 100644
index f4b7a98..0000000
--- a/zziplib-0.13.59-multilib.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -Naupr zziplib-0.13.59.orig/zzip/_config.h zziplib-0.13.59/zzip/_config.h
---- zziplib-0.13.59.orig/zzip/_config.h 2010-02-14 22:29:34.000000000 +0100
-+++ zziplib-0.13.59/zzip/_config.h 2010-12-04 16:22:19.809534085 +0100
-@@ -133,7 +133,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 in which libtool stores uninstalled libraries.
- */
-@@ -178,8 +181,12 @@
-
- /* 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
-
- /* The number of bytes in type short */
- #ifndef ZZIP_SIZEOF_SHORT
-@@ -209,7 +216,11 @@
- #endif
-
- /* Number of bits in a file offset, on hosts where this is settable. */
--/* #undef _FILE_OFFSET_BITS */
-+#if __WORDSIZE == 32
-+#ifndef ZZIP__FILE_OFFSET_BITS
-+#define ZZIP__FILE_OFFSET_BITS 64
-+#endif
-+#endif
-
- /* Define for large files, on AIX-style hosts. */
- /* #undef _LARGE_FILES */
diff --git a/zziplib-0.13.67-CVE-2018-6381.patch b/zziplib-0.13.67-CVE-2018-6381.patch
new file mode 100644
index 0000000..d614558
--- /dev/null
+++ b/zziplib-0.13.67-CVE-2018-6381.patch
@@ -0,0 +1,28 @@
+From a803559fa9194be895422ba3684cf6309b6bb598 Mon Sep 17 00:00:00 2001
+From: Guido Draheim <guidod(a)gmx.de>
+Date: Thu, 1 Feb 2018 12:27:49 +0100
+Subject: [PATCH] merge CVE-2018-6381.patch from @jmoellers #12
+
+---
+ zzip/memdisk.c | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/zzip/memdisk.c b/zzip/memdisk.c
+index cab883b..a85dab0 100644
+--- a/zzip/memdisk.c
++++ b/zzip/memdisk.c
+@@ -210,6 +210,14 @@ zzip_mem_entry_new(ZZIP_DISK * disk, ZZIP_DISK_ENTRY * entry)
+ item->zz_diskstart = zzip_disk_entry_get_diskstart(entry);
+ item->zz_filetype = zzip_disk_entry_get_filetype(entry);
+
++ /*
++ * If the file is uncompressed, zz_csize and zz_usize should be the same
++ * If they are not, we cannot guarantee that either is correct, so ...
++ */
++ if (item->zz_compr == ZZIP_IS_STORED && item->zz_csize !=
item->zz_usize)
++ {
++ goto error;
++ }
+ /* zz_comment and zz_name are empty strings if not present on disk */
+ if (! item->zz_comment || ! item->zz_name)
+ {
diff --git a/zziplib-0.13.67-multilib.patch b/zziplib-0.13.67-multilib.patch
new file mode 100644
index 0000000..169520b
--- /dev/null
+++ b/zziplib-0.13.67-multilib.patch
@@ -0,0 +1,42 @@
+diff -up ./x86_64-redhat-linux-gnu/zzip/_config.h.orig
./x86_64-redhat-linux-gnu/zzip/_config.h
+--- ./x86_64-redhat-linux-gnu/zzip/_config.h.orig 2018-02-01 22:13:36.593910695 +0200
++++ ./x86_64-redhat-linux-gnu/zzip/_config.h 2018-02-01 22:15:40.341476130 +0200
+@@ -133,7 +133,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 in which libtool stores uninstalled libraries.
+ */
+@@ -183,8 +187,12 @@
+
+ /* 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
+
+ /* The number of bytes in type short */
+ #ifndef ZZIP_SIZEOF_SHORT
+@@ -219,7 +227,11 @@
+ #endif
+
+ /* Number of bits in a file offset, on hosts where this is settable. */
+-/* #undef _FILE_OFFSET_BITS */
++#if __WORDSIZE == 32
++#ifndef ZZIP__FILE_OFFSET_BITS
++#define ZZIP__FILE_OFFSET_BITS 64
++#endif
++#endif
+
+ /* Define for large files, on AIX-style hosts. */
+ /* #undef _LARGE_FILES */
diff --git a/zziplib.spec b/zziplib.spec
index 5bb0f7b..49f773f 100644
--- a/zziplib.spec
+++ b/zziplib.spec
@@ -6,7 +6,8 @@ License: LGPLv2+ or MPLv1.1
Group: Applications/Archiving
URL:
http://zziplib.sourceforge.net/
Source:
https://github.com/gdraheim/zziplib/archive/v%{version}.tar.gz
-Patch0: zziplib-0.13.59-multilib.patch
+Patch0: zziplib-0.13.67-CVE-2018-6381.patch
+Patch1: zziplib-0.13.67-multilib.patch
BuildRequires: perl-interpreter
BuildRequires: python
BuildRequires: zip
@@ -59,8 +60,6 @@ zziplib library.
%prep
%setup -q
%patch0 -p1
-# Save the common patched _config.h file to overwrite the generated one
-cp -a zzip/_config.h _config.h
%build
export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
@@ -71,13 +70,15 @@ export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
# Remove rpath on 64bit archs
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g'
*/libtool
sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' */libtool
+cd %{_host}
+%apply_patch %{PATCH1} -p2
+cd ..
+
%{__make} %{?_smp_mflags}
+
%install
make install DESTDIR=%{buildroot}
-# Overwrite the platform specific _config.h with our own modified common one
-rm -f %{buildroot}%{_includedir}/zzip/_config.h
-install -p -m 0644 _config.h %{buildroot}%{_includedir}/zzip/_config.h
%post -p /sbin/ldconfig
commit b7bf077404d4b843b8dddcb50da26f3879e64ad7
Author: Alexander Bokovoy <abokovoy(a)redhat.com>
Date: Thu Feb 1 22:05:39 2018 +0200
Update to 0.13.67
diff --git a/zziplib.spec b/zziplib.spec
index 12fb2ab..5bb0f7b 100644
--- a/zziplib.spec
+++ b/zziplib.spec
@@ -1,11 +1,11 @@
Summary: Lightweight library to easily extract data from zip files
Name: zziplib
-Version: 0.13.62
-Release: 10%{?dist}
+Version: 0.13.67
+Release: 1%{?dist}
License: LGPLv2+ or MPLv1.1
Group: Applications/Archiving
URL:
http://zziplib.sourceforge.net/
-Source:
http://dl.sf.net/zziplib/zziplib-%{version}.tar.bz2
+Source:
https://github.com/gdraheim/zziplib/archive/v%{version}.tar.gz
Patch0: zziplib-0.13.59-multilib.patch
BuildRequires: perl-interpreter
BuildRequires: python
@@ -100,6 +100,10 @@ install -p -m 0644 _config.h
%{buildroot}%{_includedir}/zzip/_config.h
%{_mandir}/man3/*
%changelog
+* Thu Feb 01 2018 Alexander Bokovoy <abokovoy(a)redhat.com> - 0.13.67-1
+- Update release
+- CVE-2018-6381
+
* Thu Aug 03 2017 Fedora Release Engineering <releng(a)fedoraproject.org> -
0.13.62-10
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
commit c6a974e94fa6bcf1643c31538e2ed5c793d6a254
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Thu Aug 3 11:14:44 2017 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
diff --git a/zziplib.spec b/zziplib.spec
index 6653e39..12fb2ab 100644
--- a/zziplib.spec
+++ b/zziplib.spec
@@ -1,7 +1,7 @@
Summary: Lightweight library to easily extract data from zip files
Name: zziplib
Version: 0.13.62
-Release: 9%{?dist}
+Release: 10%{?dist}
License: LGPLv2+ or MPLv1.1
Group: Applications/Archiving
URL:
http://zziplib.sourceforge.net/
@@ -100,6 +100,9 @@ install -p -m 0644 _config.h
%{buildroot}%{_includedir}/zzip/_config.h
%{_mandir}/man3/*
%changelog
+* Thu Aug 03 2017 Fedora Release Engineering <releng(a)fedoraproject.org> -
0.13.62-10
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
* Thu Jul 27 2017 Fedora Release Engineering <releng(a)fedoraproject.org> -
0.13.62-9
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
commit 4aff3f39a440a0e61fbd3b7bde60cbd0208a0cda
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Thu Jul 27 22:47:23 2017 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
diff --git a/zziplib.spec b/zziplib.spec
index e5c545a..6653e39 100644
--- a/zziplib.spec
+++ b/zziplib.spec
@@ -1,7 +1,7 @@
Summary: Lightweight library to easily extract data from zip files
Name: zziplib
Version: 0.13.62
-Release: 8%{?dist}
+Release: 9%{?dist}
License: LGPLv2+ or MPLv1.1
Group: Applications/Archiving
URL:
http://zziplib.sourceforge.net/
@@ -100,6 +100,9 @@ install -p -m 0644 _config.h
%{buildroot}%{_includedir}/zzip/_config.h
%{_mandir}/man3/*
%changelog
+* Thu Jul 27 2017 Fedora Release Engineering <releng(a)fedoraproject.org> -
0.13.62-9
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
* Sat Feb 11 2017 Fedora Release Engineering <releng(a)fedoraproject.org> -
0.13.62-8
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
commit 0eb12287eb9e73b32b48515ea8f7c2db6570439e
Author: Petr Psa <ppisar(a)redhat.com>
Date: Wed Jul 12 14:18:19 2017 +0200
perl dependency renamed to perl-interpreter
<
https://fedoraproject.org/wiki/Changes/perl_Package_to_Install_Core_Modul...
diff --git a/zziplib.spec b/zziplib.spec
index c974292..e5c545a 100644
--- a/zziplib.spec
+++ b/zziplib.spec
@@ -7,7 +7,7 @@ Group: Applications/Archiving
URL:
http://zziplib.sourceforge.net/
Source:
http://dl.sf.net/zziplib/zziplib-%{version}.tar.bz2
Patch0: zziplib-0.13.59-multilib.patch
-BuildRequires: perl
+BuildRequires: perl-interpreter
BuildRequires: python
BuildRequires: zip
BuildRequires: xmlto
commit 81d5d5c64eab25d8a9e927f286df1f11f43175b2
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Sat Feb 11 18:28:01 2017 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
diff --git a/zziplib.spec b/zziplib.spec
index e3c825c..c974292 100644
--- a/zziplib.spec
+++ b/zziplib.spec
@@ -1,7 +1,7 @@
Summary: Lightweight library to easily extract data from zip files
Name: zziplib
Version: 0.13.62
-Release: 7%{?dist}
+Release: 8%{?dist}
License: LGPLv2+ or MPLv1.1
Group: Applications/Archiving
URL:
http://zziplib.sourceforge.net/
@@ -100,6 +100,9 @@ install -p -m 0644 _config.h
%{buildroot}%{_includedir}/zzip/_config.h
%{_mandir}/man3/*
%changelog
+* Sat Feb 11 2017 Fedora Release Engineering <releng(a)fedoraproject.org> -
0.13.62-8
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
* Fri Feb 05 2016 Fedora Release Engineering <releng(a)fedoraproject.org> -
0.13.62-7
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
commit 9dc376125aa802edccfdab920b0bf66271b2454a
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Fri Feb 5 04:09:52 2016 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
diff --git a/zziplib.spec b/zziplib.spec
index 779cbf8..e3c825c 100644
--- a/zziplib.spec
+++ b/zziplib.spec
@@ -1,7 +1,7 @@
Summary: Lightweight library to easily extract data from zip files
Name: zziplib
Version: 0.13.62
-Release: 6%{?dist}
+Release: 7%{?dist}
License: LGPLv2+ or MPLv1.1
Group: Applications/Archiving
URL:
http://zziplib.sourceforge.net/
@@ -100,6 +100,9 @@ install -p -m 0644 _config.h
%{buildroot}%{_includedir}/zzip/_config.h
%{_mandir}/man3/*
%changelog
+* Fri Feb 05 2016 Fedora Release Engineering <releng(a)fedoraproject.org> -
0.13.62-7
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
* Fri Jun 19 2015 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
0.13.62-6
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
commit f0faa2be7ae5e1da9ac49e47dc0791e6d8d2de6f
Author: Dennis Gilmore <dennis(a)ausil.us>
Date: Fri Jun 19 04:51:42 2015 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
diff --git a/zziplib.spec b/zziplib.spec
index 987ef29..779cbf8 100644
--- a/zziplib.spec
+++ b/zziplib.spec
@@ -1,7 +1,7 @@
Summary: Lightweight library to easily extract data from zip files
Name: zziplib
Version: 0.13.62
-Release: 5%{?dist}
+Release: 6%{?dist}
License: LGPLv2+ or MPLv1.1
Group: Applications/Archiving
URL:
http://zziplib.sourceforge.net/
@@ -100,6 +100,9 @@ install -p -m 0644 _config.h
%{buildroot}%{_includedir}/zzip/_config.h
%{_mandir}/man3/*
%changelog
+* Fri Jun 19 2015 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
0.13.62-6
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
* Mon Aug 18 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
0.13.62-5
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
commit 5c9209aa366eb06bd9e48feffe0be4b5f4e4fc9f
Author: Peter Robinson <pbrobinson(a)fedoraproject.org>
Date: Mon Aug 18 11:51:57 2014 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
diff --git a/zziplib.spec b/zziplib.spec
index 4960992..987ef29 100644
--- a/zziplib.spec
+++ b/zziplib.spec
@@ -1,7 +1,7 @@
Summary: Lightweight library to easily extract data from zip files
Name: zziplib
Version: 0.13.62
-Release: 4%{?dist}
+Release: 5%{?dist}
License: LGPLv2+ or MPLv1.1
Group: Applications/Archiving
URL:
http://zziplib.sourceforge.net/
@@ -100,6 +100,9 @@ install -p -m 0644 _config.h
%{buildroot}%{_includedir}/zzip/_config.h
%{_mandir}/man3/*
%changelog
+* Mon Aug 18 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
0.13.62-5
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
0.13.62-4
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
commit c419a1426ed11df4531e19db52ef90dbca44fff9
Author: Dennis Gilmore <dennis(a)ausil.us>
Date: Sat Jun 7 13:21:51 2014 -0500
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
diff --git a/zziplib.spec b/zziplib.spec
index d7f18bb..4960992 100644
--- a/zziplib.spec
+++ b/zziplib.spec
@@ -1,7 +1,7 @@
Summary: Lightweight library to easily extract data from zip files
Name: zziplib
Version: 0.13.62
-Release: 3%{?dist}
+Release: 4%{?dist}
License: LGPLv2+ or MPLv1.1
Group: Applications/Archiving
URL:
http://zziplib.sourceforge.net/
@@ -100,6 +100,9 @@ install -p -m 0644 _config.h
%{buildroot}%{_includedir}/zzip/_config.h
%{_mandir}/man3/*
%changelog
+* Sat Jun 07 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
0.13.62-4
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
* Sun Aug 04 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
0.13.62-3
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
commit fcc34763374320bd384ce9f678c4dd7c73684ae0
Author: Dennis Gilmore <dennis(a)ausil.us>
Date: Sun Aug 4 05:03:25 2013 -0500
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
diff --git a/zziplib.spec b/zziplib.spec
index 34b5d39..d7f18bb 100644
--- a/zziplib.spec
+++ b/zziplib.spec
@@ -1,7 +1,7 @@
Summary: Lightweight library to easily extract data from zip files
Name: zziplib
Version: 0.13.62
-Release: 2%{?dist}
+Release: 3%{?dist}
License: LGPLv2+ or MPLv1.1
Group: Applications/Archiving
URL:
http://zziplib.sourceforge.net/
@@ -100,6 +100,9 @@ install -p -m 0644 _config.h
%{buildroot}%{_includedir}/zzip/_config.h
%{_mandir}/man3/*
%changelog
+* Sun Aug 04 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
0.13.62-3
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
* Wed Jan 30 2013 Jindrich Novy <jnovy(a)redhat.com> 0.13.62-2
- rebuild with -fno-strict-aliasing
commit 0622c7741b6295d7a583f3fd10ee990e238bc9c7
Author: Jindrich Novy <jnovy(a)redhat.com>
Date: Wed Jan 30 19:58:05 2013 +0100
Rebuild with -fno-strict-aliasing
diff --git a/zziplib.spec b/zziplib.spec
index 1d59bca..34b5d39 100644
--- a/zziplib.spec
+++ b/zziplib.spec
@@ -1,7 +1,7 @@
Summary: Lightweight library to easily extract data from zip files
Name: zziplib
Version: 0.13.62
-Release: 1%{?dist}
+Release: 2%{?dist}
License: LGPLv2+ or MPLv1.1
Group: Applications/Archiving
URL:
http://zziplib.sourceforge.net/
@@ -63,6 +63,7 @@ zziplib library.
cp -a zzip/_config.h _config.h
%build
+export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
%configure \
--disable-static \
--enable-sdl \
@@ -99,6 +100,9 @@ install -p -m 0644 _config.h %{buildroot}%{_includedir}/zzip/_config.h
%{_mandir}/man3/*
%changelog
+* Wed Jan 30 2013 Jindrich Novy <jnovy(a)redhat.com> 0.13.62-2
+- rebuild with -fno-strict-aliasing
+
* Wed Oct 10 2012 Matthias Saou <matthias(a)saou.eu> 0.13.62-1
- Update to 0.13.62.
- Remove no longer needed -Wl patch.
commit b2d9041c9d95ba4813ef429bf390df2c395d7c8e
Author: Matthias Saou <matthias(a)saou.eu>
Date: Wed Oct 10 16:59:45 2012 +0200
Update to 0.13.62
diff --git a/.gitignore b/.gitignore
index 8cb8655..575c8ca 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
zziplib-0.13.49.tar.bz2
/zziplib-0.13.59.tar.bz2
/zziplib-0.13.60.tar.bz2
+/zziplib-0.13.62.tar.bz2
diff --git a/sources b/sources
index b8a6481..77b7c33 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-54a6aa53262483a4d54f7c59f0a7258b zziplib-0.13.60.tar.bz2
+5fe874946390f939ee8f4abe9624b96c zziplib-0.13.62.tar.bz2
diff --git a/zziplib-0.13.60-proper-export-dynamic.patch
b/zziplib-0.13.60-proper-export-dynamic.patch
deleted file mode 100644
index 411cd34..0000000
--- a/zziplib-0.13.60-proper-export-dynamic.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up zziplib-0.13.60/configure.fix zziplib-0.13.60/configure
---- zziplib-0.13.60/configure.fix 2012-03-08 13:35:53.989071114 -0500
-+++ zziplib-0.13.60/configure 2012-03-08 13:36:10.900929640 -0500
-@@ -13713,7 +13713,7 @@ fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking link options" >&5
- $as_echo_n "checking link options... " >&6; }
- ZZIPLIB_LDFLAGS=""
--test ".$can_build_shared" != ".no" &&
ZZIPLIB_LDFLAGS="--export-dynamic"
-+test ".$can_build_shared" != ".no" &&
ZZIPLIB_LDFLAGS="-Wl,--export-dynamic"
- RESOLVES=" # "
- case "$host_os" in mingw*)
- ZZIPLIB_LDFLAGS="-no-undefined -export-all-symbols -mconsole"
diff --git a/zziplib.spec b/zziplib.spec
index 91421d6..1d59bca 100644
--- a/zziplib.spec
+++ b/zziplib.spec
@@ -1,13 +1,12 @@
Summary: Lightweight library to easily extract data from zip files
Name: zziplib
-Version: 0.13.60
-Release: 2%{?dist}
+Version: 0.13.62
+Release: 1%{?dist}
License: LGPLv2+ or MPLv1.1
Group: Applications/Archiving
URL:
http://zziplib.sourceforge.net/
Source:
http://dl.sf.net/zziplib/zziplib-%{version}.tar.bz2
Patch0: zziplib-0.13.59-multilib.patch
-Patch1: zziplib-0.13.60-proper-export-dynamic.patch
BuildRequires: perl
BuildRequires: python
BuildRequires: zip
@@ -60,9 +59,8 @@ zziplib library.
%prep
%setup -q
%patch0 -p1
-%patch1 -p1 -b .fix
# Save the common patched _config.h file to overwrite the generated one
-%{__cp} -a zzip/_config.h _config.h
+cp -a zzip/_config.h _config.h
%build
%configure \
@@ -101,6 +99,10 @@ install -p -m 0644 _config.h
%{buildroot}%{_includedir}/zzip/_config.h
%{_mandir}/man3/*
%changelog
+* Wed Oct 10 2012 Matthias Saou <matthias(a)saou.eu> 0.13.62-1
+- Update to 0.13.62.
+- Remove no longer needed -Wl patch.
+
* Sun Jul 22 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
0.13.60-2
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
commit e3fa403feb243a99843219534005eef747a63f53
Author: Dennis Gilmore <dennis(a)ausil.us>
Date: Sun Jul 22 03:41:58 2012 -0500
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
diff --git a/zziplib.spec b/zziplib.spec
index 4fe1e10..91421d6 100644
--- a/zziplib.spec
+++ b/zziplib.spec
@@ -1,7 +1,7 @@
Summary: Lightweight library to easily extract data from zip files
Name: zziplib
Version: 0.13.60
-Release: 1%{?dist}
+Release: 2%{?dist}
License: LGPLv2+ or MPLv1.1
Group: Applications/Archiving
URL:
http://zziplib.sourceforge.net/
@@ -101,6 +101,9 @@ install -p -m 0644 _config.h
%{buildroot}%{_includedir}/zzip/_config.h
%{_mandir}/man3/*
%changelog
+* Sun Jul 22 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
0.13.60-2
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
* Thu Mar 8 2012 Tom Callaway <spot(a)fedoraproject.org> - 0.13.60-1
- update to 0.13.60
commit 444eea13abcdd857724720473473a5f84be96625
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Thu Mar 8 13:48:00 2012 -0500
0.13.60, fix export-dynamic usage
diff --git a/.gitignore b/.gitignore
index 20fbc01..8cb8655 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
zziplib-0.13.49.tar.bz2
/zziplib-0.13.59.tar.bz2
+/zziplib-0.13.60.tar.bz2
diff --git a/sources b/sources
index f04c36c..b8a6481 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-14b5a6fc229afe9916d48358479568d3 zziplib-0.13.59.tar.bz2
+54a6aa53262483a4d54f7c59f0a7258b zziplib-0.13.60.tar.bz2
diff --git a/zziplib-0.13.60-proper-export-dynamic.patch
b/zziplib-0.13.60-proper-export-dynamic.patch
new file mode 100644
index 0000000..411cd34
--- /dev/null
+++ b/zziplib-0.13.60-proper-export-dynamic.patch
@@ -0,0 +1,12 @@
+diff -up zziplib-0.13.60/configure.fix zziplib-0.13.60/configure
+--- zziplib-0.13.60/configure.fix 2012-03-08 13:35:53.989071114 -0500
++++ zziplib-0.13.60/configure 2012-03-08 13:36:10.900929640 -0500
+@@ -13713,7 +13713,7 @@ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking link options" >&5
+ $as_echo_n "checking link options... " >&6; }
+ ZZIPLIB_LDFLAGS=""
+-test ".$can_build_shared" != ".no" &&
ZZIPLIB_LDFLAGS="--export-dynamic"
++test ".$can_build_shared" != ".no" &&
ZZIPLIB_LDFLAGS="-Wl,--export-dynamic"
+ RESOLVES=" # "
+ case "$host_os" in mingw*)
+ ZZIPLIB_LDFLAGS="-no-undefined -export-all-symbols -mconsole"
diff --git a/zziplib.spec b/zziplib.spec
index 3c344a6..4fe1e10 100644
--- a/zziplib.spec
+++ b/zziplib.spec
@@ -1,13 +1,13 @@
Summary: Lightweight library to easily extract data from zip files
Name: zziplib
-Version: 0.13.59
-Release: 4%{?dist}
+Version: 0.13.60
+Release: 1%{?dist}
License: LGPLv2+ or MPLv1.1
Group: Applications/Archiving
URL:
http://zziplib.sourceforge.net/
Source:
http://dl.sf.net/zziplib/zziplib-%{version}.tar.bz2
Patch0: zziplib-0.13.59-multilib.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+Patch1: zziplib-0.13.60-proper-export-dynamic.patch
BuildRequires: perl
BuildRequires: python
BuildRequires: zip
@@ -25,11 +25,10 @@ can bundle files into a single zip archive and access them. The
implementation
is based only on the (free) subset of compression with the zlib algorithm
which is actually used by the zip/unzip tools.
-
%package utils
Summary: Utilities for the zziplib library
Group: Applications/Archiving
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}%{?_isa} = %{version}-%{release}
%description utils
The zziplib library is intentionally lightweight, it offers the ability to
@@ -40,11 +39,10 @@ which is actually used by the zip/unzip tools.
This packages contains all the utilities that come with the zziplib library.
-
%package devel
Summary: Development files for the zziplib library
Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}%{?_isa} = %{version}-%{release}
Requires: pkgconfig
Requires: zlib-devel
Requires: SDL-devel
@@ -59,14 +57,13 @@ which is actually used by the zip/unzip tools.
This package contains files required to build applications that will use the
zziplib library.
-
%prep
%setup -q
%patch0 -p1
+%patch1 -p1 -b .fix
# Save the common patched _config.h file to overwrite the generated one
%{__cp} -a zzip/_config.h _config.h
-
%build
%configure \
--disable-static \
@@ -77,35 +74,24 @@ sed -i
's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g'
*/libtoo
sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' */libtool
%{__make} %{?_smp_mflags}
-
%install
-%{__rm} -rf %{buildroot}
-%{__make} install DESTDIR=%{buildroot}
+make install DESTDIR=%{buildroot}
# Overwrite the platform specific _config.h with our own modified common one
-%{__rm} -f %{buildroot}%{_includedir}/zzip/_config.h
-%{__install} -p -m 0644 _config.h %{buildroot}%{_includedir}/zzip/_config.h
-
-
-%clean
-%{__rm} -rf %{buildroot}
-
+rm -f %{buildroot}%{_includedir}/zzip/_config.h
+install -p -m 0644 _config.h %{buildroot}%{_includedir}/zzip/_config.h
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
-
%files
-%defattr(-,root,root,-)
%doc docs/COPYING* ChangeLog README TODO
%{_libdir}/*.so.*
%files utils
-%defattr(-,root,root,-)
%{_bindir}/*
%files devel
-%defattr(-,root,root,-)
%doc docs/README.SDL docs/*.htm
%{_includedir}/*
%exclude %{_libdir}/*.la
@@ -114,8 +100,10 @@ sed -i
's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' */libtool
%{_datadir}/aclocal/*.m4
%{_mandir}/man3/*
-
%changelog
+* Thu Mar 8 2012 Tom Callaway <spot(a)fedoraproject.org> - 0.13.60-1
+- update to 0.13.60
+
* Sat Jan 14 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
0.13.59-4
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
commit 668fba7833dab648b5c00d81c9a32e82ebce0c5e
Author: Dennis Gilmore <dennis(a)ausil.us>
Date: Sat Jan 14 03:45:49 2012 -0600
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
diff --git a/zziplib.spec b/zziplib.spec
index 3c1c9b9..3c344a6 100644
--- a/zziplib.spec
+++ b/zziplib.spec
@@ -1,7 +1,7 @@
Summary: Lightweight library to easily extract data from zip files
Name: zziplib
Version: 0.13.59
-Release: 3%{?dist}
+Release: 4%{?dist}
License: LGPLv2+ or MPLv1.1
Group: Applications/Archiving
URL:
http://zziplib.sourceforge.net/
@@ -116,6 +116,9 @@ sed -i
's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' */libtool
%changelog
+* Sat Jan 14 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
0.13.59-4
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
0.13.59-3
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
commit 642a1306d2daac589852240ce32d2ab47f789083
Author: Dennis Gilmore <dennis(a)ausil.us>
Date: Tue Feb 8 03:21:34 2011 -0600
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
diff --git a/zziplib.spec b/zziplib.spec
index 01e7aed..3c1c9b9 100644
--- a/zziplib.spec
+++ b/zziplib.spec
@@ -1,7 +1,7 @@
Summary: Lightweight library to easily extract data from zip files
Name: zziplib
Version: 0.13.59
-Release: 2%{?dist}
+Release: 3%{?dist}
License: LGPLv2+ or MPLv1.1
Group: Applications/Archiving
URL:
http://zziplib.sourceforge.net/
@@ -116,6 +116,9 @@ sed -i
's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' */libtool
%changelog
+* Tue Feb 08 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
0.13.59-3
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
* Thu Dec 9 2010 Hans de Goede <hdegoede(a)redhat.com> 0.13.59-2
- Fix broken zzip/_config.h which causes apps using zziplib to fail to compile
commit c6bdc4829e07b5d373aca912287cb8dc1cfe3407
Author: Hans de Goede <hdegoede(a)redhat.com>
Date: Thu Dec 9 19:50:27 2010 +0100
- Fix broken zzip/_config.h which causes apps using zziplib to fail to compile
diff --git a/zziplib-0.13.59-multilib.patch b/zziplib-0.13.59-multilib.patch
index 0d9ee6f..f4b7a98 100644
--- a/zziplib-0.13.59-multilib.patch
+++ b/zziplib-0.13.59-multilib.patch
@@ -1,7 +1,7 @@
diff -Naupr zziplib-0.13.59.orig/zzip/_config.h zziplib-0.13.59/zzip/_config.h
--- zziplib-0.13.59.orig/zzip/_config.h 2010-02-14 22:29:34.000000000 +0100
+++ zziplib-0.13.59/zzip/_config.h 2010-12-04 16:22:19.809534085 +0100
-@@ -133,7 +133,10 @@
+@@ -133,7 +133,11 @@
/* whether the system defaults to 32bit off_t but can do 64bit when requested
*/
@@ -10,6 +10,7 @@ diff -Naupr zziplib-0.13.59.orig/zzip/_config.h
zziplib-0.13.59/zzip/_config.h
+#ifndef ZZIP_LARGEFILE_SENSITIVE
+#define ZZIP_LARGEFILE_SENSITIVE 1
+#endif
++#endif
/* Define to the sub-directory in which libtool stores uninstalled libraries.
*/
diff --git a/zziplib.spec b/zziplib.spec
index f77bb1c..01e7aed 100644
--- a/zziplib.spec
+++ b/zziplib.spec
@@ -1,7 +1,7 @@
Summary: Lightweight library to easily extract data from zip files
Name: zziplib
Version: 0.13.59
-Release: 1%{?dist}
+Release: 2%{?dist}
License: LGPLv2+ or MPLv1.1
Group: Applications/Archiving
URL:
http://zziplib.sourceforge.net/
@@ -116,6 +116,9 @@ sed -i
's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' */libtool
%changelog
+* Thu Dec 9 2010 Hans de Goede <hdegoede(a)redhat.com> 0.13.59-2
+- Fix broken zzip/_config.h which causes apps using zziplib to fail to compile
+
* Sat Dec 4 2010 Matthias Saou <
http://freshrpms.net/> 0.13.59-1
- Update to 0.13.59.
- Remove no longer needed 'open' patch.
commit 1c50ad0b0bbe5e964ad5294bd3b2b2981e994474
Author: Matthias Saou <matthias(a)rpmforge.net>
Date: Sat Dec 4 16:41:22 2010 +0100
Update to 0.13.59.
diff --git a/.gitignore b/.gitignore
index 1df7658..20fbc01 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
zziplib-0.13.49.tar.bz2
+/zziplib-0.13.59.tar.bz2
diff --git a/sources b/sources
index 642f378..f04c36c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5f7b88ebb2bcd7e8044328482d079661 zziplib-0.13.49.tar.bz2
+14b5a6fc229afe9916d48358479568d3 zziplib-0.13.59.tar.bz2
diff --git a/zziplib-0.13.49-multilib.patch b/zziplib-0.13.49-multilib.patch
deleted file mode 100644
index 7020c66..0000000
--- a/zziplib-0.13.49-multilib.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff -Naupr zziplib-0.13.49.orig/zzip/_config.h zziplib-0.13.49/zzip/_config.h
---- zziplib-0.13.49.orig/zzip/_config.h 2007-03-18 12:59:51.000000000 +0100
-+++ zziplib-0.13.49/zzip/_config.h 2008-12-22 10:02:32.351372027 +0100
-@@ -130,9 +130,11 @@
-
- /* whether the system defaults to 32bit off_t but can do 64bit when requested
- */
-+#if __WORDSIZE == 32
- #ifndef ZZIP_LARGEFILE_SENSITIVE
- #define ZZIP_LARGEFILE_SENSITIVE 1
- #endif
-+#endif
-
- /* Name of package */
- #ifndef ZZIP_PACKAGE
-@@ -171,7 +173,11 @@
-
- /* 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
-
- /* The number of bytes in type short */
-@@ -194,9 +200,11 @@
- /* #undef WORDS_BIGENDIAN */
-
- /* Number of bits in a file offset, on hosts where this is settable. */
-+#if __WORDSIZE == 32
- #ifndef ZZIP__FILE_OFFSET_BITS
- #define ZZIP__FILE_OFFSET_BITS 64
- #endif
-+#endif
-
- /* Define for large files, on AIX-style hosts. */
- /* #undef _LARGE_FILES */
diff --git a/zziplib-0.13.49-open.patch b/zziplib-0.13.49-open.patch
deleted file mode 100644
index f17379f..0000000
--- a/zziplib-0.13.49-open.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff -Naupr zziplib-0.13.49.orig/zzip/file.c zziplib-0.13.49/zzip/file.c
---- zziplib-0.13.49.orig/zzip/file.c 2007-03-18 16:20:12.000000000 +0100
-+++ zziplib-0.13.49/zzip/file.c 2007-08-23 11:17:34.000000000 +0200
-@@ -713,7 +713,7 @@ zzip_open_shared_io (ZZIP_FILE* stream,
- {
- zzip_plugin_io_t os = (o_modes & ZZIP_ALLOWREAL)
- ? zzip_get_default_io () : io;
-- int fd = os->fd.open(filename, o_flags); /* io->fd.open */
-+ int fd = (os->fd.open)(filename, o_flags); /* io->fd.open */
- if (fd != -1)
- {
- ZZIP_FILE* fp = calloc (1, sizeof(ZZIP_FILE));
-diff -Naupr zziplib-0.13.49.orig/zzip/write.c zziplib-0.13.49/zzip/write.c
---- zziplib-0.13.49.orig/zzip/write.c 2007-03-18 16:22:11.000000000 +0100
-+++ zziplib-0.13.49/zzip/write.c 2007-08-23 11:17:46.000000000 +0200
-@@ -163,7 +163,7 @@ zzip_dir_creat_ext_io(zzip_char_t* name,
- if (! (exx_len = strlen (*exx)) || exx_len >= MAX_EXT_LEN) break;
- memcpy (dir->realname+name_len, exx, exx_len); /* append! */
- }____;
-- fd = io->fd.open (dir->realname, O_CREAT|O_TRUNC|O_WRONLY, o_mode);
-+ fd = (io->fd.open)(dir->realname, O_CREAT|O_TRUNC|O_WRONLY, o_mode);
- dir->realname[name_len] = '\0'; /* keep ummodified */
- if (fd != -1) { dir->fd = fd; return dir; }
- error:
-diff -Naupr zziplib-0.13.49.orig/zzip/zip.c zziplib-0.13.49/zzip/zip.c
---- zziplib-0.13.49.orig/zzip/zip.c 2007-03-18 16:27:49.000000000 +0100
-+++ zziplib-0.13.49/zzip/zip.c 2007-08-23 11:17:22.000000000 +0200
-@@ -688,7 +688,7 @@ __zzip_try_open(zzip_char_t* filename, i
- for ( ; *ext ; ++ext)
- {
- strcpy (file+len, *ext);
-- fd = io->fd.open(file, filemode);
-+ fd = (io->fd.open)(file, filemode);
- if (fd != -1) return fd;
- }
- return -1;
-@@ -718,7 +718,7 @@ zzip_dir_open_ext_io(zzip_char_t* filena
- if (! io) io = zzip_get_default_io();
- if (! ext) ext = zzip_get_default_ext();
-
-- fd = io->fd.open(filename, O_RDONLY|O_BINARY);
-+ fd = (io->fd.open)(filename, O_RDONLY|O_BINARY);
- if (fd != -1) {
- return zzip_dir_fdopen_ext_io(fd, e, ext, io);
- } else
diff --git a/zziplib-0.13.59-multilib.patch b/zziplib-0.13.59-multilib.patch
new file mode 100644
index 0000000..0d9ee6f
--- /dev/null
+++ b/zziplib-0.13.59-multilib.patch
@@ -0,0 +1,41 @@
+diff -Naupr zziplib-0.13.59.orig/zzip/_config.h zziplib-0.13.59/zzip/_config.h
+--- zziplib-0.13.59.orig/zzip/_config.h 2010-02-14 22:29:34.000000000 +0100
++++ zziplib-0.13.59/zzip/_config.h 2010-12-04 16:22:19.809534085 +0100
+@@ -133,7 +133,10 @@
+
+ /* 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
+
+ /* Define to the sub-directory in which libtool stores uninstalled libraries.
+ */
+@@ -178,8 +181,12 @@
+
+ /* 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
+
+ /* The number of bytes in type short */
+ #ifndef ZZIP_SIZEOF_SHORT
+@@ -209,7 +216,11 @@
+ #endif
+
+ /* Number of bits in a file offset, on hosts where this is settable. */
+-/* #undef _FILE_OFFSET_BITS */
++#if __WORDSIZE == 32
++#ifndef ZZIP__FILE_OFFSET_BITS
++#define ZZIP__FILE_OFFSET_BITS 64
++#endif
++#endif
+
+ /* Define for large files, on AIX-style hosts. */
+ /* #undef _LARGE_FILES */
diff --git a/zziplib.spec b/zziplib.spec
index 7c63008..f77bb1c 100644
--- a/zziplib.spec
+++ b/zziplib.spec
@@ -1,16 +1,22 @@
Summary: Lightweight library to easily extract data from zip files
Name: zziplib
-Version: 0.13.49
-Release: 8%{?dist}
+Version: 0.13.59
+Release: 1%{?dist}
License: LGPLv2+ or MPLv1.1
Group: Applications/Archiving
URL:
http://zziplib.sourceforge.net/
Source:
http://dl.sf.net/zziplib/zziplib-%{version}.tar.bz2
-Patch0: zziplib-0.13.49-open.patch
-Patch1: zziplib-0.13.49-multilib.patch
+Patch0: zziplib-0.13.59-multilib.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: zlib-devel, zip, python, SDL-devel, xmlto, pkgconfig
-BuildRequires: autoconf, automake
+BuildRequires: perl
+BuildRequires: python
+BuildRequires: zip
+BuildRequires: xmlto
+BuildRequires: zlib-devel
+BuildRequires: SDL-devel
+BuildRequires: pkgconfig
+#BuildRequires: autoconf
+#BuildRequires: automake
%description
The zziplib library is intentionally lightweight, it offers the ability to
@@ -38,7 +44,10 @@ This packages contains all the utilities that come with the zziplib
library.
%package devel
Summary: Development files for the zziplib library
Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}, pkgconfig, zlib-devel, SDL-devel
+Requires: %{name} = %{version}-%{release}
+Requires: pkgconfig
+Requires: zlib-devel
+Requires: SDL-devel
%description devel
The zziplib library is intentionally lightweight, it offers the ability to
@@ -54,7 +63,6 @@ zziplib library.
%prep
%setup -q
%patch0 -p1
-%patch1 -p1
# Save the common patched _config.h file to overwrite the generated one
%{__cp} -a zzip/_config.h _config.h
@@ -67,8 +75,7 @@ zziplib library.
# Remove rpath on 64bit archs
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g'
*/libtool
sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' */libtool
-# Disable _smp_mflags because docs fail to build (as of 0.13.49)
-%{__make}
+%{__make} %{?_smp_mflags}
%install
@@ -105,11 +112,16 @@ sed -i
's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' */libtool
%{_libdir}/*.so
%{_libdir}/pkgconfig/*.pc
%{_datadir}/aclocal/*.m4
-%{_datadir}/zziplib/
%{_mandir}/man3/*
%changelog
+* Sat Dec 4 2010 Matthias Saou <
http://freshrpms.net/> 0.13.59-1
+- Update to 0.13.59.
+- Remove no longer needed 'open' patch.
+- Rebase the multilib patch, still required.
+- Re-enable _smp_mflags, build works again with it apparently.
+
* Mon Jul 27 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
0.13.49-8
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
commit 368ff59d6c34cfbf4e106e7fe42a9b14a27f93b5
Author: Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org>
Date: Thu Jul 29 16:33:58 2010 +0000
dist-git conversion
diff --git a/.cvsignore b/.cvsignore
deleted file mode 100644
index 1df7658..0000000
--- a/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-zziplib-0.13.49.tar.bz2
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..1df7658
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+zziplib-0.13.49.tar.bz2
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 35b9002..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: zziplib
-# $Id: Makefile,v 1.2 2004/11/24 05:11:45 gafton Exp $
-NAME := zziplib
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f
$$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo
"$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo
"common/Makefile.common" ; } || { echo "ERROR: I can't figure out how
to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)
commit e15e092c511bf014648b7cb6117de0dd4b729b1b
Author: Bill Nottingham <notting(a)fedoraproject.org>
Date: Wed Nov 25 22:39:21 2009 +0000
Fix typo that causes a failure to update the common directory. (releng
#2781)
diff --git a/Makefile b/Makefile
index 7d6607f..35b9002 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,10 @@
# Makefile for source rpm: zziplib
-# $Id: Makefile,v 1.1 2004/11/09 02:51:47 cvsextras Exp $
+# $Id: Makefile,v 1.2 2004/11/24 05:11:45 gafton Exp $
NAME := zziplib
SPECFILE = $(firstword $(wildcard *.spec))
define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f
$$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo
"$$d/Makefile.common" ; break ; fi ; done
+for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f
$$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo
"$$d/Makefile.common" ; break ; fi ; done
endef
MAKEFILE_COMMON := $(shell $(find-makefile-common))
commit 64775cd453bd685cad2a94883ae0ac45a4b32371
Author: Jesse Keating <jkeating(a)fedoraproject.org>
Date: Mon Jul 27 09:05:49 2009 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
diff --git a/zziplib.spec b/zziplib.spec
index 873db87..7c63008 100644
--- a/zziplib.spec
+++ b/zziplib.spec
@@ -1,7 +1,7 @@
Summary: Lightweight library to easily extract data from zip files
Name: zziplib
Version: 0.13.49
-Release: 7%{?dist}
+Release: 8%{?dist}
License: LGPLv2+ or MPLv1.1
Group: Applications/Archiving
URL:
http://zziplib.sourceforge.net/
@@ -110,6 +110,9 @@ sed -i
's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' */libtool
%changelog
+* Mon Jul 27 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
0.13.49-8
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
* Wed Feb 25 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
0.13.49-7
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
commit c8677ff466570a093f82b7c1ada93df70e8db58f
Author: Jesse Keating <jkeating(a)fedoraproject.org>
Date: Wed Feb 25 18:48:39 2009 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
diff --git a/zziplib.spec b/zziplib.spec
index 05bf0ac..873db87 100644
--- a/zziplib.spec
+++ b/zziplib.spec
@@ -1,7 +1,7 @@
Summary: Lightweight library to easily extract data from zip files
Name: zziplib
Version: 0.13.49
-Release: 6%{?dist}
+Release: 7%{?dist}
License: LGPLv2+ or MPLv1.1
Group: Applications/Archiving
URL:
http://zziplib.sourceforge.net/
@@ -110,6 +110,9 @@ sed -i
's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' */libtool
%changelog
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
0.13.49-7
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
* Mon Dec 22 2008 Matthias Saou <
http://freshrpms.net/> 0.13.49-6
- Patch _config.h to make it identical for 32bit and 64bit archs (#343521).
commit 139b51df96527520cea9cb8c887b69366dca6fdb
Author: Matthias Saou <thias(a)fedoraproject.org>
Date: Mon Dec 22 09:24:20 2008 +0000
Patch _config.h to make it identical for 32bit and 64bit archs (#343521).
diff --git a/zziplib-0.13.49-multilib.patch b/zziplib-0.13.49-multilib.patch
new file mode 100644
index 0000000..7020c66
--- /dev/null
+++ b/zziplib-0.13.49-multilib.patch
@@ -0,0 +1,39 @@
+diff -Naupr zziplib-0.13.49.orig/zzip/_config.h zziplib-0.13.49/zzip/_config.h
+--- zziplib-0.13.49.orig/zzip/_config.h 2007-03-18 12:59:51.000000000 +0100
++++ zziplib-0.13.49/zzip/_config.h 2008-12-22 10:02:32.351372027 +0100
+@@ -130,9 +130,11 @@
+
+ /* whether the system defaults to 32bit off_t but can do 64bit when requested
+ */
++#if __WORDSIZE == 32
+ #ifndef ZZIP_LARGEFILE_SENSITIVE
+ #define ZZIP_LARGEFILE_SENSITIVE 1
+ #endif
++#endif
+
+ /* Name of package */
+ #ifndef ZZIP_PACKAGE
+@@ -171,7 +173,11 @@
+
+ /* 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
+
+ /* The number of bytes in type short */
+@@ -194,9 +200,11 @@
+ /* #undef WORDS_BIGENDIAN */
+
+ /* Number of bits in a file offset, on hosts where this is settable. */
++#if __WORDSIZE == 32
+ #ifndef ZZIP__FILE_OFFSET_BITS
+ #define ZZIP__FILE_OFFSET_BITS 64
+ #endif
++#endif
+
+ /* Define for large files, on AIX-style hosts. */
+ /* #undef _LARGE_FILES */
diff --git a/zziplib.spec b/zziplib.spec
index 024b276..05bf0ac 100644
--- a/zziplib.spec
+++ b/zziplib.spec
@@ -1,12 +1,13 @@
Summary: Lightweight library to easily extract data from zip files
Name: zziplib
Version: 0.13.49
-Release: 5%{?dist}
+Release: 6%{?dist}
License: LGPLv2+ or MPLv1.1
Group: Applications/Archiving
URL:
http://zziplib.sourceforge.net/
Source:
http://dl.sf.net/zziplib/zziplib-%{version}.tar.bz2
Patch0: zziplib-0.13.49-open.patch
+Patch1: zziplib-0.13.49-multilib.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildRequires: zlib-devel, zip, python, SDL-devel, xmlto, pkgconfig
BuildRequires: autoconf, automake
@@ -53,6 +54,9 @@ zziplib library.
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
+# Save the common patched _config.h file to overwrite the generated one
+%{__cp} -a zzip/_config.h _config.h
%build
@@ -70,6 +74,9 @@ sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g'
*/libtool
%install
%{__rm} -rf %{buildroot}
%{__make} install DESTDIR=%{buildroot}
+# Overwrite the platform specific _config.h with our own modified common one
+%{__rm} -f %{buildroot}%{_includedir}/zzip/_config.h
+%{__install} -p -m 0644 _config.h %{buildroot}%{_includedir}/zzip/_config.h
%clean
@@ -103,7 +110,10 @@ sed -i
's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' */libtool
%changelog
-* Tue Feb 19 2008 Fedora Release Engineering <rel-eng(a)fedoraproject.org> -
0.13.49-5
+* Mon Dec 22 2008 Matthias Saou <
http://freshrpms.net/> 0.13.49-6
+- Patch _config.h to make it identical for 32bit and 64bit archs (#343521).
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng(a)fedoraproject.org>
- Autorebuild for GCC 4.3
* Wed Aug 8 2007 Matthias Saou <
http://freshrpms.net/> 0.13.49-4
commit a7f0e96c6397280ac390965c2bec3053dc253706
Author: Jesse Keating <jkeating(a)fedoraproject.org>
Date: Wed Feb 20 04:55:51 2008 +0000
- Autorebuild for GCC 4.3
diff --git a/zziplib.spec b/zziplib.spec
index d5e57f4..024b276 100644
--- a/zziplib.spec
+++ b/zziplib.spec
@@ -1,7 +1,7 @@
Summary: Lightweight library to easily extract data from zip files
Name: zziplib
Version: 0.13.49
-Release: 4%{?dist}
+Release: 5%{?dist}
License: LGPLv2+ or MPLv1.1
Group: Applications/Archiving
URL:
http://zziplib.sourceforge.net/
@@ -103,6 +103,9 @@ sed -i
's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' */libtool
%changelog
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng(a)fedoraproject.org> -
0.13.49-5
+- Autorebuild for GCC 4.3
+
* Wed Aug 8 2007 Matthias Saou <
http://freshrpms.net/> 0.13.49-4
- Include patch to fix fd.open calls with recent glibc.
- Disable _smp_mflags since the docs fail to build.
commit 76602ace11de53d464077d0f35b4a449eba2dc8a
Author: Matthias Saou <thias(a)fedoraproject.org>
Date: Thu Aug 23 09:35:35 2007 +0000
Include patch to fix fd.open calls with recent glibc.
diff --git a/zziplib-0.13.49-open.patch b/zziplib-0.13.49-open.patch
new file mode 100644
index 0000000..f17379f
--- /dev/null
+++ b/zziplib-0.13.49-open.patch
@@ -0,0 +1,45 @@
+diff -Naupr zziplib-0.13.49.orig/zzip/file.c zziplib-0.13.49/zzip/file.c
+--- zziplib-0.13.49.orig/zzip/file.c 2007-03-18 16:20:12.000000000 +0100
++++ zziplib-0.13.49/zzip/file.c 2007-08-23 11:17:34.000000000 +0200
+@@ -713,7 +713,7 @@ zzip_open_shared_io (ZZIP_FILE* stream,
+ {
+ zzip_plugin_io_t os = (o_modes & ZZIP_ALLOWREAL)
+ ? zzip_get_default_io () : io;
+- int fd = os->fd.open(filename, o_flags); /* io->fd.open */
++ int fd = (os->fd.open)(filename, o_flags); /* io->fd.open */
+ if (fd != -1)
+ {
+ ZZIP_FILE* fp = calloc (1, sizeof(ZZIP_FILE));
+diff -Naupr zziplib-0.13.49.orig/zzip/write.c zziplib-0.13.49/zzip/write.c
+--- zziplib-0.13.49.orig/zzip/write.c 2007-03-18 16:22:11.000000000 +0100
++++ zziplib-0.13.49/zzip/write.c 2007-08-23 11:17:46.000000000 +0200
+@@ -163,7 +163,7 @@ zzip_dir_creat_ext_io(zzip_char_t* name,
+ if (! (exx_len = strlen (*exx)) || exx_len >= MAX_EXT_LEN) break;
+ memcpy (dir->realname+name_len, exx, exx_len); /* append! */
+ }____;
+- fd = io->fd.open (dir->realname, O_CREAT|O_TRUNC|O_WRONLY, o_mode);
++ fd = (io->fd.open)(dir->realname, O_CREAT|O_TRUNC|O_WRONLY, o_mode);
+ dir->realname[name_len] = '\0'; /* keep ummodified */
+ if (fd != -1) { dir->fd = fd; return dir; }
+ error:
+diff -Naupr zziplib-0.13.49.orig/zzip/zip.c zziplib-0.13.49/zzip/zip.c
+--- zziplib-0.13.49.orig/zzip/zip.c 2007-03-18 16:27:49.000000000 +0100
++++ zziplib-0.13.49/zzip/zip.c 2007-08-23 11:17:22.000000000 +0200
+@@ -688,7 +688,7 @@ __zzip_try_open(zzip_char_t* filename, i
+ for ( ; *ext ; ++ext)
+ {
+ strcpy (file+len, *ext);
+- fd = io->fd.open(file, filemode);
++ fd = (io->fd.open)(file, filemode);
+ if (fd != -1) return fd;
+ }
+ return -1;
+@@ -718,7 +718,7 @@ zzip_dir_open_ext_io(zzip_char_t* filena
+ if (! io) io = zzip_get_default_io();
+ if (! ext) ext = zzip_get_default_ext();
+
+- fd = io->fd.open(filename, O_RDONLY|O_BINARY);
++ fd = (io->fd.open)(filename, O_RDONLY|O_BINARY);
+ if (fd != -1) {
+ return zzip_dir_fdopen_ext_io(fd, e, ext, io);
+ } else
diff --git a/zziplib.spec b/zziplib.spec
index c574cf5..d5e57f4 100644
--- a/zziplib.spec
+++ b/zziplib.spec
@@ -1,13 +1,15 @@
Summary: Lightweight library to easily extract data from zip files
Name: zziplib
Version: 0.13.49
-Release: 3%{?dist}
-License: LGPLv2+ or MPL
+Release: 4%{?dist}
+License: LGPLv2+ or MPLv1.1
Group: Applications/Archiving
URL:
http://zziplib.sourceforge.net/
Source:
http://dl.sf.net/zziplib/zziplib-%{version}.tar.bz2
+Patch0: zziplib-0.13.49-open.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: zlib-devel, zip, python, SDL-devel, xmlto, pkgconfig, automake
+BuildRequires: zlib-devel, zip, python, SDL-devel, xmlto, pkgconfig
+BuildRequires: autoconf, automake
%description
The zziplib library is intentionally lightweight, it offers the ability to
@@ -50,6 +52,7 @@ zziplib library.
%prep
%setup -q
+%patch0 -p1
%build
@@ -60,7 +63,8 @@ zziplib library.
# Remove rpath on 64bit archs
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g'
*/libtool
sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' */libtool
-%{__make} %{?_smp_mflags}
+# Disable _smp_mflags because docs fail to build (as of 0.13.49)
+%{__make}
%install
@@ -99,6 +103,10 @@ sed -i
's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' */libtool
%changelog
+* Wed Aug 8 2007 Matthias Saou <
http://freshrpms.net/> 0.13.49-4
+- Include patch to fix fd.open calls with recent glibc.
+- Disable _smp_mflags since the docs fail to build.
+
* Fri Aug 3 2007 Matthias Saou <
http://freshrpms.net/> 0.13.49-3
- Update License field.
commit 1e9919416921b504a96a054495427bc3dcc3d41d
Author: Matthias Saou <thias(a)fedoraproject.org>
Date: Fri Aug 3 15:53:39 2007 +0000
Update License field.
diff --git a/zziplib.spec b/zziplib.spec
index 71bfd1d..c574cf5 100644
--- a/zziplib.spec
+++ b/zziplib.spec
@@ -1,8 +1,8 @@
Summary: Lightweight library to easily extract data from zip files
Name: zziplib
Version: 0.13.49
-Release: 2%{?dist}
-License: LGPL/MPL
+Release: 3%{?dist}
+License: LGPLv2+ or MPL
Group: Applications/Archiving
URL:
http://zziplib.sourceforge.net/
Source:
http://dl.sf.net/zziplib/zziplib-%{version}.tar.bz2
@@ -99,6 +99,9 @@ sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g'
*/libtool
%changelog
+* Fri Aug 3 2007 Matthias Saou <
http://freshrpms.net/> 0.13.49-3
+- Update License field.
+
* Tue Jun 19 2007 Matthias Saou <
http://freshrpms.net/> 0.13.49-2
- Disable static lib build instead of excluding it later.
- Remove rpath on 64bit archs.
commit 4f39fc9e0cdfa134b544e3770123a16ad46ab537
Author: Matthias Saou <thias(a)fedoraproject.org>
Date: Tue Jun 19 18:19:28 2007 +0000
Minor cleanups.
diff --git a/zziplib.spec b/zziplib.spec
index 48883f2..71bfd1d 100644
--- a/zziplib.spec
+++ b/zziplib.spec
@@ -1,7 +1,7 @@
Summary: Lightweight library to easily extract data from zip files
Name: zziplib
Version: 0.13.49
-Release: 1%{?dist}
+Release: 2%{?dist}
License: LGPL/MPL
Group: Applications/Archiving
URL:
http://zziplib.sourceforge.net/
@@ -54,14 +54,18 @@ zziplib library.
%build
%configure \
+ --disable-static \
--enable-sdl \
--enable-frame-pointer
+# Remove rpath on 64bit archs
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g'
*/libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' */libtool
%{__make} %{?_smp_mflags}
%install
%{__rm} -rf %{buildroot}
-%makeinstall
+%{__make} install DESTDIR=%{buildroot}
%clean
@@ -86,7 +90,6 @@ zziplib library.
%defattr(-,root,root,-)
%doc docs/README.SDL docs/*.htm
%{_includedir}/*
-%exclude %{_libdir}/*.a
%exclude %{_libdir}/*.la
%{_libdir}/*.so
%{_libdir}/pkgconfig/*.pc
@@ -96,6 +99,11 @@ zziplib library.
%changelog
+* Tue Jun 19 2007 Matthias Saou <
http://freshrpms.net/> 0.13.49-2
+- Disable static lib build instead of excluding it later.
+- Remove rpath on 64bit archs.
+- Switch to using DESTDIR install method.
+
* Mon Mar 26 2007 Matthias Saou <
http://freshrpms.net/> 0.13.49-1
- Update to 0.13.49 to fix CVE-2007-1614 (rhbz #233700).
- Include new man3 pages to the devel sub-package.
commit b41823589036bb66098a9d644dceca4120e8f8e0
Author: Matthias Saou <thias(a)fedoraproject.org>
Date: Mon Mar 26 11:16:43 2007 +0000
Update to 0.13.49 to fix CVE-2007-1614 (rhbz #233700).
diff --git a/.cvsignore b/.cvsignore
index 4be2427..1df7658 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-zziplib-0.13.47.tar.bz2
+zziplib-0.13.49.tar.bz2
diff --git a/sources b/sources
index 68f3029..642f378 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ac3bc8da2db2aa6e7751243c1dade296 zziplib-0.13.47.tar.bz2
+5f7b88ebb2bcd7e8044328482d079661 zziplib-0.13.49.tar.bz2
diff --git a/zziplib.spec b/zziplib.spec
index cb9881d..48883f2 100644
--- a/zziplib.spec
+++ b/zziplib.spec
@@ -1,6 +1,6 @@
Summary: Lightweight library to easily extract data from zip files
Name: zziplib
-Version: 0.13.47
+Version: 0.13.49
Release: 1%{?dist}
License: LGPL/MPL
Group: Applications/Archiving
@@ -49,7 +49,7 @@ zziplib library.
%prep
-%setup
+%setup -q
%build
@@ -74,16 +74,16 @@ zziplib library.
%files
-%defattr(-, root, root, 0755)
+%defattr(-,root,root,-)
%doc docs/COPYING* ChangeLog README TODO
%{_libdir}/*.so.*
%files utils
-%defattr(-, root, root, 0755)
+%defattr(-,root,root,-)
%{_bindir}/*
%files devel
-%defattr(-, root, root, 0755)
+%defattr(-,root,root,-)
%doc docs/README.SDL docs/*.htm
%{_includedir}/*
%exclude %{_libdir}/*.a
@@ -92,9 +92,14 @@ zziplib library.
%{_libdir}/pkgconfig/*.pc
%{_datadir}/aclocal/*.m4
%{_datadir}/zziplib/
+%{_mandir}/man3/*
%changelog
+* Mon Mar 26 2007 Matthias Saou <
http://freshrpms.net/> 0.13.49-1
+- Update to 0.13.49 to fix CVE-2007-1614 (rhbz #233700).
+- Include new man3 pages to the devel sub-package.
+
* Mon Aug 28 2006 Matthias Saou <
http://freshrpms.net/> 0.13.47-1
- Update to 0.13.47.
- FC6 rebuild.
commit 52d2e9bc05ba665deab3d5e58dfbfa32ca94608a
Author: Matthias Saou <thias(a)fedoraproject.org>
Date: Mon Aug 28 16:35:25 2006 +0000
Update to 0.13.47.
diff --git a/.cvsignore b/.cvsignore
index b39066d..4be2427 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-zziplib-0.13.45.tar.bz2
+zziplib-0.13.47.tar.bz2
diff --git a/needs.rebuild b/needs.rebuild
deleted file mode 100644
index 815fd29..0000000
--- a/needs.rebuild
+++ /dev/null
@@ -1 +0,0 @@
-http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild
diff --git a/sources b/sources
index c5022c0..68f3029 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-687e6e487795680dd1e8ea9c1670e0ab zziplib-0.13.45.tar.bz2
+ac3bc8da2db2aa6e7751243c1dade296 zziplib-0.13.47.tar.bz2
diff --git a/zziplib.spec b/zziplib.spec
index 9e6826b..cb9881d 100644
--- a/zziplib.spec
+++ b/zziplib.spec
@@ -1,7 +1,7 @@
Summary: Lightweight library to easily extract data from zip files
Name: zziplib
-Version: 0.13.45
-Release: 3%{?dist}
+Version: 0.13.47
+Release: 1%{?dist}
License: LGPL/MPL
Group: Applications/Archiving
URL:
http://zziplib.sourceforge.net/
@@ -95,8 +95,11 @@ zziplib library.
%changelog
-* Mon Jul 24 2006 Matthias Saou <
http://freshrpms.net/> 0.13.45-3
+* Mon Aug 28 2006 Matthias Saou <
http://freshrpms.net/> 0.13.47-1
+- Update to 0.13.47.
- FC6 rebuild.
+
+* Mon Jul 24 2006 Matthias Saou <
http://freshrpms.net/> 0.13.45-3
- Split off -utils sub-package (#199467). Could have been plain "zzip"?
- Have sub-packages require exact release too.
- Build require automake to make the aclocal-1.9 check happy.
commit b41263ddc3b90428599a93dcbc751f085b57018a
Author: Ville Skytt <scop(a)fedoraproject.org>
Date: Sun Aug 27 21:19:16 2006 +0000
http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild
diff --git a/needs.rebuild b/needs.rebuild
new file mode 100644
index 0000000..815fd29
--- /dev/null
+++ b/needs.rebuild
@@ -0,0 +1 @@
+http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild
commit fa8fe4c49a0c65bc95d238bb550a3f5f58e459bc
Author: Matthias Saou <thias(a)fedoraproject.org>
Date: Mon Jul 24 14:52:57 2006 +0000
Split off -utils sub-package (#199467), and a few other minor changes.
diff --git a/zziplib.spec b/zziplib.spec
index 94d0111..9e6826b 100644
--- a/zziplib.spec
+++ b/zziplib.spec
@@ -1,32 +1,47 @@
Summary: Lightweight library to easily extract data from zip files
Name: zziplib
Version: 0.13.45
-Release: 2%{?dist}
+Release: 3%{?dist}
License: LGPL/MPL
Group: Applications/Archiving
URL:
http://zziplib.sourceforge.net/
Source:
http://dl.sf.net/zziplib/zziplib-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: zlib-devel, zip, python, SDL-devel, xmlto, pkgconfig
+BuildRequires: zlib-devel, zip, python, SDL-devel, xmlto, pkgconfig, automake
%description
The zziplib library is intentionally lightweight, it offers the ability to
easily extract data from files archived in a single zip file. Applications
can bundle files into a single zip archive and access them. The implementation
-is based only on the (free) subset of compression with the zlib algorithm
+is based only on the (free) subset of compression with the zlib algorithm
which is actually used by the zip/unzip tools.
+%package utils
+Summary: Utilities for the zziplib library
+Group: Applications/Archiving
+Requires: %{name} = %{version}-%{release}
+
+%description utils
+The zziplib library is intentionally lightweight, it offers the ability to
+easily extract data from files archived in a single zip file. Applications
+can bundle files into a single zip archive and access them. The implementation
+is based only on the (free) subset of compression with the zlib algorithm
+which is actually used by the zip/unzip tools.
+
+This packages contains all the utilities that come with the zziplib library.
+
+
%package devel
Summary: Development files for the zziplib library
Group: Development/Libraries
-Requires: %{name} = %{version}, pkgconfig, zlib-devel, SDL-devel
+Requires: %{name} = %{version}-%{release}, pkgconfig, zlib-devel, SDL-devel
%description devel
The zziplib library is intentionally lightweight, it offers the ability to
easily extract data from files archived in a single zip file. Applications
can bundle files into a single zip archive and access them. The implementation
-is based only on the (free) subset of compression with the zlib algorithm
+is based only on the (free) subset of compression with the zlib algorithm
which is actually used by the zip/unzip tools.
This package contains files required to build applications that will use the
@@ -38,7 +53,9 @@ zziplib library.
%build
-%configure --enable-sdl
+%configure \
+ --enable-sdl \
+ --enable-frame-pointer
%{__make} %{?_smp_mflags}
@@ -59,9 +76,12 @@ zziplib library.
%files
%defattr(-, root, root, 0755)
%doc docs/COPYING* ChangeLog README TODO
-%{_bindir}/*
%{_libdir}/*.so.*
+%files utils
+%defattr(-, root, root, 0755)
+%{_bindir}/*
+
%files devel
%defattr(-, root, root, 0755)
%doc docs/README.SDL docs/*.htm
@@ -75,6 +95,13 @@ zziplib library.
%changelog
+* Mon Jul 24 2006 Matthias Saou <
http://freshrpms.net/> 0.13.45-3
+- FC6 rebuild.
+- Split off -utils sub-package (#199467). Could have been plain "zzip"?
+- Have sub-packages require exact release too.
+- Build require automake to make the aclocal-1.9 check happy.
+- Use --enable-frame-pointer otherwise -g gets removed from the CFLAGS.
+
* Mon Mar 6 2006 Matthias Saou <
http://freshrpms.net/> 0.13.45-2
- FC5 rebuild.
commit de8b00211e4f5e1884289bce1eaf15d18f39da8d
Author: Matthias Saou <thias(a)fedoraproject.org>
Date: Mon Mar 6 14:58:32 2006 +0000
FC5 rebuild.
diff --git a/zziplib.spec b/zziplib.spec
index a823140..94d0111 100644
--- a/zziplib.spec
+++ b/zziplib.spec
@@ -1,7 +1,7 @@
Summary: Lightweight library to easily extract data from zip files
Name: zziplib
Version: 0.13.45
-Release: 1%{?dist}
+Release: 2%{?dist}
License: LGPL/MPL
Group: Applications/Archiving
URL:
http://zziplib.sourceforge.net/
@@ -75,6 +75,9 @@ zziplib library.
%changelog
+* Mon Mar 6 2006 Matthias Saou <
http://freshrpms.net/> 0.13.45-2
+- FC5 rebuild.
+
* Thu Feb 9 2006 Matthias Saou <
http://freshrpms.net/> 0.13.45-1
- Update to 0.13.45.
- Exclude static library.
commit 18f74b106a2a4ee61f1b04a97b326dc96c92c441
Author: Matthias Saou <thias(a)fedoraproject.org>
Date: Thu Feb 9 19:27:48 2006 +0000
Update to 0.13.45.
diff --git a/.cvsignore b/.cvsignore
index 9aeafa4..b39066d 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-zziplib-0.13.38.tar.bz2
+zziplib-0.13.45.tar.bz2
diff --git a/sources b/sources
index e208836..c5022c0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3eccd9b39c057eb49652e90914abfdf5 zziplib-0.13.38.tar.bz2
+687e6e487795680dd1e8ea9c1670e0ab zziplib-0.13.45.tar.bz2
diff --git a/zziplib.spec b/zziplib.spec
index 0157b1d..a823140 100644
--- a/zziplib.spec
+++ b/zziplib.spec
@@ -1,9 +1,7 @@
-# $Id: zziplib.spec,v 1.4 2005/05/22 23:13:07 katzj Exp $
-
Summary: Lightweight library to easily extract data from zip files
Name: zziplib
-Version: 0.13.38
-Release: 2
+Version: 0.13.45
+Release: 1%{?dist}
License: LGPL/MPL
Group: Applications/Archiving
URL:
http://zziplib.sourceforge.net/
@@ -53,11 +51,9 @@ zziplib library.
%{__rm} -rf %{buildroot}
-%post
-/sbin/ldconfig
+%post -p /sbin/ldconfig
-%postun
-/sbin/ldconfig
+%postun -p /sbin/ldconfig
%files
@@ -70,7 +66,7 @@ zziplib library.
%defattr(-, root, root, 0755)
%doc docs/README.SDL docs/*.htm
%{_includedir}/*
-%{_libdir}/*.a
+%exclude %{_libdir}/*.a
%exclude %{_libdir}/*.la
%{_libdir}/*.so
%{_libdir}/pkgconfig/*.pc
@@ -79,6 +75,10 @@ zziplib library.
%changelog
+* Thu Feb 9 2006 Matthias Saou <
http://freshrpms.net/> 0.13.45-1
+- Update to 0.13.45.
+- Exclude static library.
+
* Sun May 22 2005 Jeremy Katz <katzj(a)redhat.com> - 0.13.38-2
- rebuild on all arches
commit 78aa953d32cf0247292befeb6c7d61783abf6ecb
Author: Jeremy Katz <katzj(a)fedoraproject.org>
Date: Sun May 22 23:13:07 2005 +0000
- rebuild on all arches
diff --git a/zziplib.spec b/zziplib.spec
index 2fbd449..0157b1d 100644
--- a/zziplib.spec
+++ b/zziplib.spec
@@ -1,9 +1,9 @@
-# $Id: zziplib.spec,v 1.3 2005/04/05 09:04:05 thias Exp $
+# $Id: zziplib.spec,v 1.4 2005/05/22 23:13:07 katzj Exp $
Summary: Lightweight library to easily extract data from zip files
Name: zziplib
Version: 0.13.38
-Release: 1
+Release: 2
License: LGPL/MPL
Group: Applications/Archiving
URL:
http://zziplib.sourceforge.net/
@@ -79,6 +79,9 @@ zziplib library.
%changelog
+* Sun May 22 2005 Jeremy Katz <katzj(a)redhat.com> - 0.13.38-2
+- rebuild on all arches
+
* Tue Apr 5 2005 Matthias Saou <
http://freshrpms.net/> 0.13.38-1
- Update to 0.13.38, fixes gcc4 compile issues (Adrian Reber).
commit 6bc9d4e616cbe53e7224df60a93c6882c2e9ea5c
Author: Matthias Saou <thias(a)fedoraproject.org>
Date: Tue Apr 5 09:04:05 2005 +0000
Update to 0.13.38.
diff --git a/.cvsignore b/.cvsignore
index 171c5a4..9aeafa4 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-zziplib-0.13.36.tar.bz2
+zziplib-0.13.38.tar.bz2
diff --git a/sources b/sources
index 0e32db4..e208836 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-263f642825b8a9d56f7bfc26404e965d zziplib-0.13.36.tar.bz2
+3eccd9b39c057eb49652e90914abfdf5 zziplib-0.13.38.tar.bz2
diff --git a/zziplib.spec b/zziplib.spec
index efcbe1d..2fbd449 100644
--- a/zziplib.spec
+++ b/zziplib.spec
@@ -1,9 +1,9 @@
-# $Id: zziplib.spec,v 1.2 2004/11/16 18:50:29 thias Exp $
+# $Id: zziplib.spec,v 1.3 2005/04/05 09:04:05 thias Exp $
Summary: Lightweight library to easily extract data from zip files
Name: zziplib
-Version: 0.13.36
-Release: 2
+Version: 0.13.38
+Release: 1
License: LGPL/MPL
Group: Applications/Archiving
URL:
http://zziplib.sourceforge.net/
@@ -79,6 +79,9 @@ zziplib library.
%changelog
+* Tue Apr 5 2005 Matthias Saou <
http://freshrpms.net/> 0.13.38-1
+- Update to 0.13.38, fixes gcc4 compile issues (Adrian Reber).
+
* Tue Nov 16 2004 Matthias Saou <
http://freshrpms.net/> 0.13.36-2
- Bump release to provide Extras upgrade path.
commit 5e001b31daad70fb8053595c391d56ca6d4eac9a
Author: gafton <gafton(a)fedoraproject.org>
Date: Wed Nov 24 05:11:45 2004 +0000
Fix braindead typo from the original import
diff --git a/Makefile b/Makefile
index 4f41f26..7d6607f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
# Makefile for source rpm: zziplib
-# $Id$
+# $Id: Makefile,v 1.1 2004/11/09 02:51:47 cvsextras Exp $
NAME := zziplib
SPECFILE = $(firstword $(wildcard *.spec))
@@ -12,7 +12,7 @@ MAKEFILE_COMMON := $(shell $(find-makefile-common))
ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
-test -f CVS/Rootx && { cvs -Q -d $$(cat CVS/Root) checkout common && echo
"common/Makefile.common" ; } || { echo "ERROR: I can't figure out how
to checkout the 'common' module." ; exit -1 ; } >&2
+test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo
"common/Makefile.common" ; } || { echo "ERROR: I can't figure out how
to checkout the 'common' module." ; exit -1 ; } >&2
endef
MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
commit 98d0e7c9137c0ebb4b55ccec16b09aa69ecd509d
Author: Matthias Saou <thias(a)fedoraproject.org>
Date: Tue Nov 16 18:50:29 2004 +0000
Actually add %changelog entry and remove that unneeded "Authority:".
diff --git a/zziplib.spec b/zziplib.spec
index 3537163..efcbe1d 100644
--- a/zziplib.spec
+++ b/zziplib.spec
@@ -1,10 +1,9 @@
-# $Id: zziplib.spec,v 1.1 2004/11/09 02:51:49 cvsextras Exp $
-# Authority: matthias
+# $Id: zziplib.spec,v 1.2 2004/11/16 18:50:29 thias Exp $
Summary: Lightweight library to easily extract data from zip files
Name: zziplib
Version: 0.13.36
-Release: 1.1.fc2.fr
+Release: 2
License: LGPL/MPL
Group: Applications/Archiving
URL:
http://zziplib.sourceforge.net/
@@ -80,6 +79,9 @@ zziplib library.
%changelog
+* Tue Nov 16 2004 Matthias Saou <
http://freshrpms.net/> 0.13.36-2
+- Bump release to provide Extras upgrade path.
+
* Tue Jun 8 2004 Matthias Saou <
http://freshrpms.net/> 0.13.36-1
- Initial RPM release.
commit 704d1771cdcc278a1716b2e3c62c9714601e6d12
Author: cvsextras <cvsextras(a)fedoraproject.org>
Date: Tue Nov 9 02:51:49 2004 +0000
auto-import changelog data from zziplib-0.13.36-1.1.fc2.fr.src.rpm
//freshrpms.net/> 0.13.36-1
- Initial RPM release.
diff --git a/.cvsignore b/.cvsignore
index e69de29..171c5a4 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -0,0 +1 @@
+zziplib-0.13.36.tar.bz2
diff --git a/sources b/sources
index e69de29..0e32db4 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+263f642825b8a9d56f7bfc26404e965d zziplib-0.13.36.tar.bz2
diff --git a/zziplib.spec b/zziplib.spec
new file mode 100644
index 0000000..3537163
--- /dev/null
+++ b/zziplib.spec
@@ -0,0 +1,85 @@
+# $Id: zziplib.spec,v 1.1 2004/11/09 02:51:49 cvsextras Exp $
+# Authority: matthias
+
+Summary: Lightweight library to easily extract data from zip files
+Name: zziplib
+Version: 0.13.36
+Release: 1.1.fc2.fr
+License: LGPL/MPL
+Group: Applications/Archiving
+URL:
http://zziplib.sourceforge.net/
+Source:
http://dl.sf.net/zziplib/zziplib-%{version}.tar.bz2
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+BuildRequires: zlib-devel, zip, python, SDL-devel, xmlto, pkgconfig
+
+%description
+The zziplib library is intentionally lightweight, it offers the ability to
+easily extract data from files archived in a single zip file. Applications
+can bundle files into a single zip archive and access them. The implementation
+is based only on the (free) subset of compression with the zlib algorithm
+which is actually used by the zip/unzip tools.
+
+
+%package devel
+Summary: Development files for the zziplib library
+Group: Development/Libraries
+Requires: %{name} = %{version}, pkgconfig, zlib-devel, SDL-devel
+
+%description devel
+The zziplib library is intentionally lightweight, it offers the ability to
+easily extract data from files archived in a single zip file. Applications
+can bundle files into a single zip archive and access them. The implementation
+is based only on the (free) subset of compression with the zlib algorithm
+which is actually used by the zip/unzip tools.
+
+This package contains files required to build applications that will use the
+zziplib library.
+
+
+%prep
+%setup
+
+
+%build
+%configure --enable-sdl
+%{__make} %{?_smp_mflags}
+
+
+%install
+%{__rm} -rf %{buildroot}
+%makeinstall
+
+
+%clean
+%{__rm} -rf %{buildroot}
+
+
+%post
+/sbin/ldconfig
+
+%postun
+/sbin/ldconfig
+
+
+%files
+%defattr(-, root, root, 0755)
+%doc docs/COPYING* ChangeLog README TODO
+%{_bindir}/*
+%{_libdir}/*.so.*
+
+%files devel
+%defattr(-, root, root, 0755)
+%doc docs/README.SDL docs/*.htm
+%{_includedir}/*
+%{_libdir}/*.a
+%exclude %{_libdir}/*.la
+%{_libdir}/*.so
+%{_libdir}/pkgconfig/*.pc
+%{_datadir}/aclocal/*.m4
+%{_datadir}/zziplib/
+
+
+%changelog
+* Tue Jun 8 2004 Matthias Saou <
http://freshrpms.net/> 0.13.36-1
+- Initial RPM release.
+