4 Commits

6 changed files with 157 additions and 8 deletions

BIN
zziplib-0.13.78.tar.gz (Stored with Git LFS)

Binary file not shown.

3
zziplib-0.13.79.tar.gz Normal file
View File

@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3a1076436ea372bfc161596710e0cb7e74660e0007c81742bdb902be2dea49df
size 1214404

View File

@@ -0,0 +1,53 @@
From 4c82735049c6a4e5c2e3b1cb02b7d0bdfbd3b546 Mon Sep 17 00:00:00 2001
From: Guido Draheim <guidod@gmx.de>
Date: Wed, 23 Apr 2025 00:09:17 +0200
Subject: [PATCH] move pc to share/pkgconfig #177
---
SDL/CMakeLists.txt | 2 +-
SDL/Makefile.am | 2 +-
SDL/Makefile.in | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/SDL/CMakeLists.txt b/SDL/CMakeLists.txt
index e46f7a4..e48226c 100644
--- a/SDL/CMakeLists.txt
+++ b/SDL/CMakeLists.txt
@@ -71,7 +71,7 @@ add_custom_command(OUTPUT SDL_rwops_zzip.pc
add_custom_target(pkgconfig-sdl ALL DEPENDS SDL_rwops_zzip.pc)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/SDL_rwops_zzip.pc
- DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig" )
+ DESTINATION "${CMAKE_INSTALL_DATADIR}/pkgconfig" )
endif(ZZIP_PKGCONFIG)
endif(SDL_FOUND)
diff --git a/SDL/Makefile.am b/SDL/Makefile.am
index c66d443..ef3992f 100644
--- a/SDL/Makefile.am
+++ b/SDL/Makefile.am
@@ -33,7 +33,7 @@ install-sdl : install-data # and not the binary
CLEANFILES = *.pc *.omf
# ----------------------------------------------------------------------
# we do not install a library, so this about equivalent to some SDL.pc
-pkgconfigdir=$(libdir)/pkgconfig
+pkgconfigdir=$(datarootdir)/pkgconfig
pkgconfig_HEADERS= SDL_rwops_zzip.pc
ERRNULL= 2>/dev/null
diff --git a/SDL/Makefile.in b/SDL/Makefile.in
index 1eff3ea..3c107a5 100644
--- a/SDL/Makefile.in
+++ b/SDL/Makefile.in
@@ -370,7 +370,7 @@ pkgconfig_libdir = @pkgconfig_libdir@
pkgconfig_libfile = @pkgconfig_libfile@
# ----------------------------------------------------------------------
# we do not install a library, so this about equivalent to some SDL.pc
-pkgconfigdir = $(libdir)/pkgconfig
+pkgconfigdir = $(datarootdir)/pkgconfig
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
--
2.49.0

View File

@@ -0,0 +1,57 @@
From 59c0d0c48389219455950298c4e33aa23d659e3a Mon Sep 17 00:00:00 2001
From: vlefebvre <valentin.lefebvre@suse.com>
Date: Tue, 22 Apr 2025 07:45:30 +0000
Subject: [PATCH] move zzipwrap's .pc from $libdir to $datadir
* zzip's .pc files has been moved from $libdir/pkgconfig to
$datadir/pkgconfig. Do the same for zzipwrap.
Signed-off-by: vlefebvre <valentin.lefebvre@suse.com>
---
zzipwrap/CMakeLists.txt | 2 +-
zzipwrap/Makefile.am | 2 +-
zzipwrap/Makefile.in | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/zzipwrap/CMakeLists.txt b/zzipwrap/CMakeLists.txt
index a9f1088..cff1732 100644
--- a/zzipwrap/CMakeLists.txt
+++ b/zzipwrap/CMakeLists.txt
@@ -84,7 +84,7 @@ set(outdir ${CMAKE_CURRENT_BINARY_DIR})
if(ZZIP_PKGCONFIG)
install(FILES ${outdir}/zzipwrap.pc
- DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig" )
+ DESTINATION "${CMAKE_INSTALL_DATADIR}/pkgconfig" )
endif()
install(FILES ${libzzipwrap_HDRS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/zzip )
diff --git a/zzipwrap/Makefile.am b/zzipwrap/Makefile.am
index 2c5b471..6f83125 100644
--- a/zzipwrap/Makefile.am
+++ b/zzipwrap/Makefile.am
@@ -35,7 +35,7 @@ zzipwrap_LDFLAGS = @ZZIPLIB_LDFLAGS@
zzipwrap_LDADD = libzzipwrap.la @RESOLVES@ ../zzip/libzzip.la -lz
# ----------------------------------------------------------------------
-pkgconfigdir=$(libdir)/pkgconfig
+pkgconfigdir=$(datarootdir)/pkgconfig
pkgconfig_HEADERS= zzipwrap.pc
zzipwrap.pc : Makefile
diff --git a/zzipwrap/Makefile.in b/zzipwrap/Makefile.in
index 95f869f..8823f73 100644
--- a/zzipwrap/Makefile.in
+++ b/zzipwrap/Makefile.in
@@ -381,7 +381,7 @@ pkgconfig_libdir = @pkgconfig_libdir@
pkgconfig_libfile = @pkgconfig_libfile@
# ----------------------------------------------------------------------
-pkgconfigdir = $(libdir)/pkgconfig
+pkgconfigdir = $(datarootdir)/pkgconfig
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
--
2.49.0

View File

@@ -1,3 +1,38 @@
-------------------------------------------------------------------
Wed Apr 23 09:18:04 UTC 2025 - Valentin Lefebvre <valentin.lefebvre@suse.com>
- Release to 0.13.79:
* fixed #174 #175 #176 on buffer-overflow in mmapped.c
* create afl testbuild to have clean debug environment
* validate #164 #166 as being fixed in 0.13.78 alreaedy
* add same 0xFFFu overrun check for #175 into zip.c
* fix asan missing dir_close in zziptest.c
* bump cmake_minimum to 3.10 to make cmake 4 happy #173
* combine testbuilds.py and zziptest.py into make test_X
* seperate make zziptestdownloads to have option for those files
* and otherwise just skip tests that need a downloaded file
* not only check files to be the same am/cm but also ABI lib-symbols
* automake tests for every ubuntu version (including 32 and 64on32)
* testcases for largefile builds as well - and 32bit builds
* make tests that use automakes `*.pc` - with corrected cmake install
* make an error on largefile-mismatch in 3264 builds
* start a zzip32.h to get all the 3264 definitions declared
* need zzip_plugin_off_t() to detected largefile problems
* switch to BSD exitcodes when not using ZIP_xx exitcodes
* introduce ZZIP_PLUGIN_TYPE_32BIT for forced 32bit variants
* need -DLARGEFILE=ON to force 64bit builds
* `make missing32` shows the 32on64 symbols
* cut out CMakeScripts/TestLargefileSensitive.cmake
* move *.pc from $libdir/pkgconfig to $datadir/pkgconfig
- Move other pc files from $libdir to $datadir
[+ zziplib-move-zzipwrap-pc-from-libdir-to-datadir.patch]
[+ zziplib-move-pc-to-share-pkgconfig.patch]
-------------------------------------------------------------------
Fri Mar 21 21:57:39 UTC 2025 - Shawn Dunn <sfalken@opensuse.org>
- Add -DCMAKE_POLICY_VERSION_MINIMUM=3.5 to clear FTBFS with cmake4
-------------------------------------------------------------------
Wed Mar 19 07:56:16 UTC 2025 - Dr. Werner Fink <werner@suse.de>
@@ -8,7 +43,7 @@ Wed Mar 19 07:56:16 UTC 2025 - Dr. Werner Fink <werner@suse.de>
-------------------------------------------------------------------
Mon Mar 17 09:16:06 UTC 2025 - Dr. Werner Fink <werner@suse.de>
- Support large file access on 32bit architectures as well (boo#1239672)
- Support large file access on 32bit architectures as well (boo#1239672)
-------------------------------------------------------------------
Thu Aug 8 13:58:23 UTC 2024 - Valentin Lefebvre <valentin.lefebvre@suse.com>

View File

@@ -18,7 +18,7 @@
%define lname libzzip-0-13
Name: zziplib
Version: 0.13.78
Version: 0.13.79
Release: 0
Summary: ZIP Compression Library
License: LGPL-2.1-or-later
@@ -26,7 +26,11 @@ Group: Development/Libraries/C and C++
URL: http://zziplib.sourceforge.net
Source0: https://github.com/gdraheim/zziplib/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
Source2: baselibs.conf
BuildRequires: cmake
# PATCHES-FIX-UPSTREAM: Move pkgconfig file from libdir to datadir
Patch0: zziplib-move-zzipwrap-pc-from-libdir-to-datadir.patch
Patch1: zziplib-move-pc-to-share-pkgconfig.patch
BuildRequires: cmake >= 3.5
BuildRequires: pkgconfig
BuildRequires: xmlto
BuildRequires: zip
@@ -64,7 +68,7 @@ sed -i -e 's:docs ::g' Makefile.am
%build
# Workaround for boo#1225959
%global optflags %{optflags} -fpermissive %(getconf LFS_CFLAGS) -DPIC
%cmake -DZZIP_TESTCVE=OFF -DZZIP_LARGEFILE_SENSITIVE=ON -DZZIP_LARGEFILE_RENAME=ON -DPIC=ON
%cmake -DZZIP_TESTCVE=OFF -DZZIP_LARGEFILE_SENSITIVE=ON -DZZIP_LARGEFILE_RENAME=ON -DPIC=ON -DCMAKE_POLICY_VERSION_MINIMUM=3.5
%cmake_build
%install
@@ -88,7 +92,7 @@ rm -rf %{buildroot}%{_libdir}/cmake
%{_bindir}/unzip-mem
%{_libdir}/libzzip*.so
%{_includedir}/*
%{_libdir}/pkgconfig/*.pc
%{_datadir}/pkgconfig/*.pc
%{_datadir}/aclocal/*.m4
%{_mandir}/man3/__zzip_*.3%{?ext_man}
%{_mandir}/man3/zzip_*.3%{?ext_man}