diff --git a/unzip-initialize-the-symlink-flag.patch b/unzip-initialize-the-symlink-flag.patch new file mode 100644 index 0000000..7c2f05e --- /dev/null +++ b/unzip-initialize-the-symlink-flag.patch @@ -0,0 +1,20 @@ +From: Andreas Schwab +Subject: Initialize the symlink flag +Bug-Debian: https://bugs.debian.org/717029 +X-Debian-version: 6.0-10 + +--- a/process.c ++++ b/process.c +@@ -1758,6 +1758,12 @@ + = (G.crec.general_purpose_bit_flag & (1 << 11)) == (1 << 11); + #endif + ++#ifdef SYMLINKS ++ /* Initialize the symlink flag, may be set by the platform-specific ++ mapattr function. */ ++ G.pInfo->symlink = 0; ++#endif ++ + return PK_COOL; + + } /* end function process_cdir_file_hdr() */ diff --git a/unzip-rcc.spec b/unzip-rcc.spec index d7c26f9..15b0241 100644 --- a/unzip-rcc.spec +++ b/unzip-rcc.spec @@ -1,7 +1,7 @@ # # spec file for package unzip-rcc # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -37,7 +37,7 @@ Release: 0 Summary: A program to unpack compressed files License: BSD-3-Clause Group: Productivity/Archiving/Compression -Url: http://www.info-zip.org/ +URL: http://www.info-zip.org/ Source: http://sourceforge.net/projects/infozip/files/UnZip%%206.x%%20%%28latest%%29/UnZip%%206.0/%{_name}%{fileversion}.tar.gz Source1: pre_checkin.sh Patch0: unzip.dif @@ -61,7 +61,7 @@ Patch20: Fix-CVE-2014-9636-unzip-buffer-overflow.patch Patch21: unzip60-total_disks_zero.patch Patch22: unzip60-cfactorstr_overflow.patch Requires(post): update-alternatives -Requires(postun): update-alternatives +Requires(postun):update-alternatives Recommends: %{_name}-doc BuildRoot: %{_tmppath}/%{name}-%{version}-build diff --git a/unzip.changes b/unzip.changes index 1c7b91e..de85f6a 100644 --- a/unzip.changes +++ b/unzip.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Sep 9 11:30:06 UTC 2021 - John Paul Adrian Glaubitz + +- Add patch to fix issue with some files being incorrectly + detected as symlinks (boo#1190273) + + unzip-initialize-the-symlink-flag.patch + ------------------------------------------------------------------- Fri May 22 09:27:01 UTC 2020 - Yunhe Guo diff --git a/unzip.spec b/unzip.spec index da5234e..52c95d1 100644 --- a/unzip.spec +++ b/unzip.spec @@ -1,7 +1,7 @@ # # spec file for package unzip # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -37,7 +37,7 @@ Release: 0 Summary: A program to unpack compressed files License: BSD-3-Clause Group: Productivity/Archiving/Compression -Url: http://www.info-zip.org/ +URL: http://www.info-zip.org/ Source: http://sourceforge.net/projects/infozip/files/UnZip%%206.x%%20%%28latest%%29/UnZip%%206.0/%{_name}%{fileversion}.tar.gz Source1: pre_checkin.sh Patch0: unzip.dif @@ -60,8 +60,9 @@ Patch19: CVE-2018-1000035.patch Patch20: Fix-CVE-2014-9636-unzip-buffer-overflow.patch Patch21: unzip60-total_disks_zero.patch Patch22: unzip60-cfactorstr_overflow.patch +Patch23: unzip-initialize-the-symlink-flag.patch Requires(post): update-alternatives -Requires(postun): update-alternatives +Requires(postun):update-alternatives Recommends: %{_name}-doc BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -107,6 +108,7 @@ functionality. This version can also extract encrypted archives. %patch20 -p1 %patch21 -p1 %patch22 -p1 +%patch23 -p1 %build export RPM_OPT_FLAGS="%{optflags} \