diff --git a/.gitignore b/.gitignore index 256a812..ce00081 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ sharutils-4.9.tar.bz2 /sharutils-4.13.4.tar.xz /sharutils-4.13.5.tar.xz /sharutils-4.14.tar.xz +/sharutils-4.14.2.tar.xz diff --git a/sharutils-4.14-Pass-compilation-with-Werror-format-security.patch b/sharutils-4.14-Pass-compilation-with-Werror-format-security.patch deleted file mode 100644 index 588b7f9..0000000 --- a/sharutils-4.14-Pass-compilation-with-Werror-format-security.patch +++ /dev/null @@ -1,30 +0,0 @@ -From ec0820718ccb224bafcddd82a281953b73a9e0b6 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= -Date: Wed, 4 Dec 2013 14:35:44 +0100 -Subject: [PATCH] Pass compilation with -Werror=format-security -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - - - -Signed-off-by: Petr Písař ---- - src/shar-opts.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/shar-opts.h b/src/shar-opts.h -index 2eed57c..70c2792 100644 ---- a/src/shar-opts.h -+++ b/src/shar-opts.h -@@ -373,6 +373,7 @@ extern tOptions sharOptions; - # include - # endif - -+static inline char* aoGetsText(char const* pz) __attribute__ ((format_arg(1))); - static inline char* aoGetsText(char const* pz) { - if (pz == NULL) return NULL; - return (char*)gettext(pz); --- -1.8.3.1 - diff --git a/sharutils-4.14.2-Pass-compilation-with-Werror-format-security.patch b/sharutils-4.14.2-Pass-compilation-with-Werror-format-security.patch new file mode 100644 index 0000000..10460af --- /dev/null +++ b/sharutils-4.14.2-Pass-compilation-with-Werror-format-security.patch @@ -0,0 +1,87 @@ +From 851a240296ad2ec2a5f67e84d284d3bf7882745e Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= +Date: Mon, 15 Dec 2014 11:20:32 +0100 +Subject: [PATCH] Pass compilation with -Werror=format-security +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + + + +Signed-off-by: Petr Písař +--- + libopts/genshell.h | 2 +- + src/shar-opts.h | 2 +- + src/unshar-opts.h | 2 +- + src/uudecode-opts.h | 2 +- + src/uuencode-opts.h | 2 +- + 5 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/libopts/genshell.h b/libopts/genshell.h +index 1c18735..0a69bc2 100644 +--- a/libopts/genshell.h ++++ b/libopts/genshell.h +@@ -168,7 +168,7 @@ extern tOptions genshelloptOptions; + # endif + + # ifndef ATTRIBUTE_FORMAT_ARG +-# define ATTRIBUTE_FORMAT_ARG(_a) ++# define ATTRIBUTE_FORMAT_ARG(_a) __attribute__ ((format_arg(_a))) + # endif + + static inline char* aoGetsText(char const* pz) ATTRIBUTE_FORMAT_ARG(1); +diff --git a/src/shar-opts.h b/src/shar-opts.h +index 64f2f12..a32b69d 100644 +--- a/src/shar-opts.h ++++ b/src/shar-opts.h +@@ -374,7 +374,7 @@ extern tOptions sharOptions; + # endif + + # ifndef ATTRIBUTE_FORMAT_ARG +-# define ATTRIBUTE_FORMAT_ARG(_a) ++# define ATTRIBUTE_FORMAT_ARG(_a) __attribute__ ((format_arg(_a))) + # endif + + static inline char* aoGetsText(char const* pz) ATTRIBUTE_FORMAT_ARG(1); +diff --git a/src/unshar-opts.h b/src/unshar-opts.h +index ae697af..19e8be7 100644 +--- a/src/unshar-opts.h ++++ b/src/unshar-opts.h +@@ -211,7 +211,7 @@ extern tOptions unsharOptions; + # endif + + # ifndef ATTRIBUTE_FORMAT_ARG +-# define ATTRIBUTE_FORMAT_ARG(_a) ++# define ATTRIBUTE_FORMAT_ARG(_a) __attribute__ ((format_arg(_a))) + # endif + + static inline char* aoGetsText(char const* pz) ATTRIBUTE_FORMAT_ARG(1); +diff --git a/src/uudecode-opts.h b/src/uudecode-opts.h +index d457488..fd11a20 100644 +--- a/src/uudecode-opts.h ++++ b/src/uudecode-opts.h +@@ -189,7 +189,7 @@ extern tOptions uudecodeOptions; + # endif + + # ifndef ATTRIBUTE_FORMAT_ARG +-# define ATTRIBUTE_FORMAT_ARG(_a) ++# define ATTRIBUTE_FORMAT_ARG(_a) __attribute__ ((format_arg(_a))) + # endif + + static inline char* aoGetsText(char const* pz) ATTRIBUTE_FORMAT_ARG(1); +diff --git a/src/uuencode-opts.h b/src/uuencode-opts.h +index 7c7ed78..41352ea 100644 +--- a/src/uuencode-opts.h ++++ b/src/uuencode-opts.h +@@ -185,7 +185,7 @@ extern tOptions uuencodeOptions; + # endif + + # ifndef ATTRIBUTE_FORMAT_ARG +-# define ATTRIBUTE_FORMAT_ARG(_a) ++# define ATTRIBUTE_FORMAT_ARG(_a) __attribute__ ((format_arg(_a))) + # endif + + static inline char* aoGetsText(char const* pz) ATTRIBUTE_FORMAT_ARG(1); +-- +1.9.3 + diff --git a/sharutils.spec b/sharutils.spec index 83b08c8..e745347 100644 --- a/sharutils.spec +++ b/sharutils.spec @@ -1,18 +1,19 @@ Summary: The GNU shar utilities for packaging and unpackaging shell archives Name: sharutils -Version: 4.14 -Release: 4%{?dist} +Version: 4.14.2 +Release: 1%{?dist} # The main code: GPLv3+ -# lib (gnulib): LGPLv3+ -# lib/sys_socket.in.h: LGPLv2+ +# lib (gnulib): GPLv3+ # lib/md5.c: Public Domain # libopts: LGPLv3+ or BSD +# libopts/genshell.h LGPLv2+ # doc/sharutils.texi: GFDL -License: GPLv3+ and LGPLv3+ and (LGPLv3+ or BSD) and LGPLv2+ and Public Domain and GFDL +License: GPLv3+ and (LGPLv3+ or BSD) and LGPLv2+ and Public Domain and GFDL Group: Applications/Archiving -Source: ftp://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.xz +# The su-4.14.2 is an upstream mistake which will be fixed in the future +Source: ftp://ftp.gnu.org/gnu/%{name}/su-4.14.2/%{name}-%{version}.tar.xz # Pass compilation with -Werror=format-security, bug #1037323 -Patch0: %{name}-4.14-Pass-compilation-with-Werror-format-security.patch +Patch0: %{name}-4.14.2-Pass-compilation-with-Werror-format-security.patch URL: http://www.gnu.org/software/%{name}/ BuildRequires: gettext Requires(post): info @@ -71,6 +72,12 @@ fi %{_mandir}/man5/* %changelog +* Mon Dec 15 2014 Petr Pisar - 4.14.2-1 +- 4.14.2 bump +- License changed from (GPLv3+ and LGPLv3+ and (LGPLv3+ or BSD) and LGPLv2+ + and Public Domain and GFDL) to (GPLv3+ and (LGPLv3+ or BSD) and LGPLv2+ + and Public Domain and GFDL) + * Mon Aug 18 2014 Fedora Release Engineering - 4.14-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild diff --git a/sources b/sources index 916bf2b..fb5ff03 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -77ede22951bdb67279c6e78e79a04784 sharutils-4.14.tar.xz +c8bc90cb0ab0bb3932fe596b79952c1a sharutils-4.14.2.tar.xz