[packages/sharutils] - updated to 4.13.1 - updated info,format-security patches - removed obsolete glibc2.16 patch

qboosh qboosh at pld-linux.org
Wed Jan 2 20:59:42 CET 2013


commit f65e8c836fb90e2b362635d5f43a062611836f65
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Wed Jan 2 20:59:36 2013 +0100

    - updated to 4.13.1
    - updated info,format-security patches
    - removed obsolete glibc2.16 patch

 format-security.patch     |  34 ++++++---
 sharutils-glibc2.16.patch |  88 -----------------------
 sharutils-info.patch      | 173 +++++++++++++++++-----------------------------
 sharutils.spec            |  12 ++--
 4 files changed, 96 insertions(+), 211 deletions(-)
---
diff --git a/sharutils.spec b/sharutils.spec
index 8d9e9bb..c01c030 100644
--- a/sharutils.spec
+++ b/sharutils.spec
@@ -8,20 +8,19 @@ Summary(ru.UTF-8):	Утилиты GNU shar для создания и распа
 Summary(tr.UTF-8):	Arşivleme ve kabuk araçları
 Summary(uk.UTF-8):	Утиліти GNU shar для створення та розпаковки shell-архівів
 Name:		sharutils
-Version:	4.11.1
-Release:	2
+Version:	4.13.1
+Release:	1
 License:	GPL v3+
 Group:		Applications
 Source0:	http://ftp.gnu.org/gnu/sharutils/%{name}-%{version}.tar.bz2
-# Source0-md5:	52dd02b6f5e0a148ba871234ae29bba2
+# Source0-md5:	6c6d2f5fefe32c6d7131922c5649075d
 Source1:	http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
 # Source1-md5:	336f405f69324d129a6ccd3b66f8eb6c
 Patch0:		%{name}-info.patch
-Patch1:		%{name}-glibc2.16.patch
-Patch2:		format-security.patch
+Patch1:		format-security.patch
 URL:		http://www.gnu.org/software/sharutils/
 BuildRequires:	autoconf >= 2.50
-BuildRequires:	automake >= 1:1.11
+BuildRequires:	automake >= 1:1.12
 BuildRequires:	gettext-devel >= 0.18.1
 BuildRequires:	texinfo
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -92,7 +91,6 @@ programlar üzerinden güvenli bir şekilde gönderilebilir.
 %setup -q -a1
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 %{__rm} po/stamp-po
 
diff --git a/format-security.patch b/format-security.patch
index d08b5a8..3408f5b 100644
--- a/format-security.patch
+++ b/format-security.patch
@@ -25,32 +25,50 @@
  
    {
      char *buf = malloc (pg_sz);
---- sharutils-4.11.1/src/shar.c~	2011-01-15 02:38:38.000000000 +0100
-+++ sharutils-4.11.1/src/shar.c	2012-12-13 13:50:22.712051502 +0100
-@@ -513,7 +513,7 @@
+--- sharutils-4.13.1/src/shar.c.orig	2013-01-02 19:33:45.538148598 +0100
++++ sharutils-4.13.1/src/shar.c	2013-01-02 19:54:54.374788820 +0100
+@@ -469,7 +469,7 @@
  
    if (stat (local_name, &struct_stat))
      {
 -      error (0, errno, local_name);
 +      error (0, errno, "%s", local_name);
-       return 1;
+       return SHAR_EXIT_FILE_NOT_FOUND;
      }
  
-@@ -522,7 +522,7 @@
+@@ -478,7 +478,7 @@
  
    if (directory = opendir (local_name), !directory)
      {
 -      error (0, errno, local_name);
 +      error (0, errno, "%s", local_name);
-       return 1;
+       return SHAR_EXIT_CANNOT_OPENDIR;
      }
  
-@@ -615,7 +615,7 @@
+@@ -571,7 +571,7 @@
  #else
    if (closedir (directory))
      {
 -      error (0, errno, local_name);
 +      error (0, errno, "%s", local_name);
-       return 1;
+       return SHAR_EXIT_CANNOT_OPENDIR;
      }
  #endif
+@@ -623,7 +623,7 @@
+ 
+     if (status != 0)
+       {
+-        error (0, errno, local_name_copy);
++        error (0, errno, "%s", local_name_copy);
+         status = SHAR_EXIT_FILE_NOT_FOUND;
+       }
+     else
+@@ -2189,7 +2189,7 @@
+               optionLoadLine (&sharOptions, arg);
+             }
+           else
+-            error (0, errno, arg);
++            error (0, errno, "%s", arg);
+           continue;
+         }
+ 
diff --git a/sharutils-glibc2.16.patch b/sharutils-glibc2.16.patch
deleted file mode 100644
index f3dbb45..0000000
--- a/sharutils-glibc2.16.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From 5de88fad8cc214f07082445c6bb7b83091d664e4 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar at redhat.com>
-Date: Thu, 2 Aug 2012 17:40:55 +0200
-Subject: [PATCH] Fix building with glibc-2.16.6
-
-Ported to sharutils-4.11.1 from gnulib commit:
-
-From 66712c23388e93e5c518ebc8515140fa0c807348 Mon Sep 17 00:00:00 2001
-From: Eric Blake <eblake at redhat.com>
-Date: Thu, 29 Mar 2012 13:30:41 -0600
-Subject: [PATCH] stdio: don't assume gets any more
-
-Gnulib intentionally does not have a gets module, and now that C11
-and glibc have dropped it, we should be more proactive about warning
-any user on a platform that still has a declaration of this dangerous
-interface.
----
- lib/stdio.in.h    | 12 +++++++-----
- m4/stdio_h.m4     |  4 ++--
- m4/warn-on-use.m4 |  4 ++--
- 3 files changed, 11 insertions(+), 9 deletions(-)
-
-diff --git a/lib/stdio.in.h b/lib/stdio.in.h
-index 57e93ba..6ab9c8b 100644
---- a/lib/stdio.in.h
-+++ b/lib/stdio.in.h
-@@ -176,10 +176,12 @@ _GL_WARN_ON_USE (fflush, "fflush is not always POSIX compliant - "
- #endif
- 
- /* It is very rare that the developer ever has full control of stdin,
--   so any use of gets warrants an unconditional warning.  Assume it is
--   always declared, since it is required by C89.  */
-+   so any use of gets warrants an unconditional warning; besides, C11
-+   removed it.  */
- #undef gets
-+#if HAVE_RAW_DECL_GETS
- _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
-+#endif
- 
- #if @GNULIB_FOPEN@
- # if @REPLACE_FOPEN@
-@@ -902,9 +904,9 @@ _GL_WARN_ON_USE (snprintf, "snprintf is unportable - "
- # endif
- #endif
- 
--/* Some people would argue that sprintf should be handled like gets
--   (for example, OpenBSD issues a link warning for both functions),
--   since both can cause security holes due to buffer overruns.
-+/* Some people would argue that all sprintf uses should be warned about
-+   (for example, OpenBSD issues a link warning for it),
-+   since it can cause security holes due to buffer overruns.
-    However, we believe that sprintf can be used safely, and is more
-    efficient than snprintf in those safe cases; and as proof of our
-    belief, we use sprintf in several gnulib modules.  So this header
-diff --git a/m4/stdio_h.m4 b/m4/stdio_h.m4
-index 7f3ae56..990c616 100644
---- a/m4/stdio_h.m4
-+++ b/m4/stdio_h.m4
-@@ -34,9 +34,9 @@ AC_DEFUN([gl_STDIO_H],
- 
-   dnl Check for declarations of anything we want to poison if the
-   dnl corresponding gnulib module is not in use, and which is not
--  dnl guaranteed by C89.
-+  dnl guaranteed by both C89 and C11.
-   gl_WARN_ON_USE_PREPARE([[#include <stdio.h>
--    ]], [dprintf fpurge fseeko ftello getdelim getline popen renameat
-+    ]], [dprintf fpurge fseeko ftello getdelim getline gets popen renameat
-     snprintf tmpfile vdprintf vsnprintf])
- ])
- 
-diff --git a/m4/warn-on-use.m4 b/m4/warn-on-use.m4
-index e0d0f27..4b07efb 100644
---- a/m4/warn-on-use.m4
-+++ b/m4/warn-on-use.m4
-@@ -18,8 +18,8 @@ dnl with or without modifications, as long as this notice is preserved.
- # some systems declare functions in the wrong header, then INCLUDES
- # should do likewise.
- #
--# If you assume C89, then it is generally safe to assume declarations
--# for functions declared in that standard (such as gets) without
-+# It is generally safe to assume declarations for functions declared
-+# in the intersection of C89 and C11 (such as printf) without
- # needing gl_WARN_ON_USE_PREPARE.
- AC_DEFUN([gl_WARN_ON_USE_PREPARE],
- [
--- 
-1.7.11.2
-
diff --git a/sharutils-info.patch b/sharutils-info.patch
index 0176435..9c5ecef 100644
--- a/sharutils-info.patch
+++ b/sharutils-info.patch
@@ -1,6 +1,6 @@
---- sharutils-4.11/doc/sharutils.texi.orig	2010-09-04 00:08:02.000000000 +0200
-+++ sharutils-4.11/doc/sharutils.texi	2011-02-08 16:31:35.412689713 +0100
-@@ -2,19 +2,15 @@
+--- sharutils-4.13.1/doc/sharutils.texi.orig	2013-01-02 19:22:04.381496546 +0100
++++ sharutils-4.13.1/doc/sharutils.texi	2013-01-02 19:26:47.921490636 +0100
+@@ -2,17 +2,13 @@
  @c %**start of header
  @setfilename sharutils.info
  @settitle GNU @code{shar} utilities
@@ -11,16 +11,12 @@
 - at end direntry
 - at dircategory Individual utilities
 - at direntry
--* mail-files: (sharutils)mail-files invocation. Send files to remote site.
--* mailshar: (sharutils)mailshar invocation.     Make and send a shell archive.
--* shar: (sharutils)shar invocation.             Make a shell archive.
--* unshar: (sharutils)unshar invocation.         Explode a shell archive.
--* uudecode: (sharutils)uudecode invocation.     Restore file from 7-bits.
--* uuencode: (sharutils)uuencode invocation.     Force binary file to 7-bits.
+-* shar: (sharutils)shar Invocation.             Make a shell archive.
+-* unshar: (sharutils)unshar Invocation.         Explode a shell archive.
+-* uudecode: (sharutils)uudecode Invocation.     Restore file from 7-bits.
+-* uuencode: (sharutils)uuencode Invocation.     Force binary file to 7-bits.
 -* doc-license: GNU Free Documentation License.  Documentation license.
 +* Shar utilities: (sharutils).		Shell archiver, uuencode/uudecode
-+* mail-files: (sharutils)mail-files.	Send files to remote site
-+* mailshar: (sharutils)mailshar.	Make and send a shell archive
 +* shar: (sharutils)shar.		Make a shell archive
 +* unshar: (sharutils)unshar.		Explode a shell archive
 +* uudecode: (sharutils)uudecode.	Restore file from 7-bits
@@ -28,124 +24,85 @@
  @end direntry
  
  @finalout
-@@ -84,8 +80,8 @@
+@@ -78,10 +74,10 @@
  
  The basic @code{shar} utilities
  
--* shar invocation::             Invoking the @code{shar} program
--* unshar invocation::           Invoking the @code{unshar} program
+-* shar Invocation::             Invoking the @code{shar} program
+-* unshar Invocation::           Invoking the @code{unshar} program
+-* uuencode Invocation::         Invoking the @code{uuencode} program
+-* uudecode Invocation::         Invoking the @code{uudecode} program
 +* shar::                        Invoking the @code{shar} program
 +* unshar::                      Invoking the @code{unshar} program
- * uuencode::                    Invoking the @code{uuencode} program
- * uudecode::                    Invoking the @code{uudecode} program
- * Miscellaneous::               Miscellaneous considerations
-@@ -142,23 +138,23 @@
++* uuencode::                    Invoking the @code{uuencode} program
++* uudecode::                    Invoking the @code{uudecode} program
+ 
+ @end detailmenu
+ @end menu
+@@ -122,19 +118,19 @@
  in manufacturing shars and in specifying shar @emph{smartness}.  For
  example, @code{shar} may compress files, uuencode binary files, split
  long files and construct multi-part mailings, ensure correct unsharing
--order, and provide simplistic checksums.  @xref{shar invocation}.
+-order, and provide simplistic checksums.  @xref{shar Invocation}.
 +order, and provide simplistic checksums.  @xref{shar}.
  
  GNU @code{unshar} scans a set of mail messages looking for the start
  of shell archives.  It will automatically strip off the mail headers
  and other introductory text.  The archive bodies are then unpacked by
  a copy of the shell.  @code{unshar} may also process files containing
--concatenated shell archives.  @xref{unshar invocation}.
+-concatenated shell archives.  @xref{unshar Invocation}.
 +concatenated shell archives.  @xref{unshar}.
  
  @menu
--* shar invocation::             Invoking the @code{shar} program
--* unshar invocation::           Invoking the @code{unshar} program
+-* shar Invocation::             Invoking the @code{shar} program
+-* unshar Invocation::           Invoking the @code{unshar} program
+-* uuencode Invocation::         Invoking the @code{uuencode} program
+-* uudecode Invocation::         Invoking the @code{uudecode} program
 +* shar::                        Invoking the @code{shar} program
 +* unshar::                      Invoking the @code{unshar} program
- * uuencode::                    Invoking the @code{uuencode} program
- * uudecode::                    Invoking the @code{uudecode} program
- * Miscellaneous::               Miscellaneous considerations
++* uuencode::                    Invoking the @code{uuencode} program
++* uudecode::                    Invoking the @code{uudecode} program
  @end menu
  
-- at node shar invocation, unshar invocation, Basic, Basic
-+ at node shar, unshar, Basic, Basic
- @section Invoking the @code{shar} program
+ @include invoke-shar.texi
+--- sharutils-4.13.1/doc/invoke-shar.texi.orig	2012-12-28 02:11:25.000000000 +0100
++++ sharutils-4.13.1/doc/invoke-shar.texi	2013-01-02 19:29:13.984820926 +0100
+@@ -1,4 +1,4 @@
+- at node shar Invocation
++ at node shar
+ @section Invoking shar
  @pindex shar
- 
-@@ -206,7 +202,7 @@
- * Kinds::                       Producing different kinds of shar
- @end menu
- 
-- at node Selecting, Splitting, shar invocation, shar invocation
-+ at node Selecting, Splitting, shar, shar
- @subsection Selecting files
- 
- @table @code
-@@ -241,7 +237,7 @@
- 
- @end table
- 
-- at node Splitting, Headers, Selecting, shar invocation
-+ at node Splitting, Headers, Selecting, shar
- @subsection Splitting output
- 
- @table @code
-@@ -271,7 +267,7 @@
- in the correct order.  If the recipient of the shell archives wants to
- put all of them in a single folder, she shall save them in the correct
- order for @code{unshar}, used with option @code{-e}, to unpack them
--all at once.  @xref{unshar invocation}.
-+all at once.  @xref{unshar}.
- 
- For people used to saving all the shell archives into a single mail
- folder, care must be taken to save them in the appropriate order.
-@@ -282,7 +278,7 @@
- 
- @end table
- 
-- at node Headers, Stocking, Splitting, shar invocation
-+ at node Headers, Stocking, Splitting, shar
- @subsection Controlling the shar headers
- 
- @table @code
-@@ -345,7 +341,7 @@
- 
- @end table
- 
-- at node Stocking, Transmission, Headers, shar invocation
-+ at node Stocking, Transmission, Headers, shar
- @subsection Selecting how files are stocked
- 
- @table @code
-@@ -434,7 +430,7 @@
- 
- @end table
- 
-- at node Transmission, Kinds, Stocking, shar invocation
-+ at node Transmission, Kinds, Stocking, shar
- @subsection Protecting against transmission errors
- 
- Transmission of shell archives is not always free of errors.  So one
-@@ -479,7 +475,7 @@
- 
- @end table
- 
-- at node Kinds,  , Transmission, shar invocation
-+ at node Kinds,  , Transmission, shar
- @subsection Producing different kinds of shars
- 
- @table @code
-@@ -570,7 +566,7 @@
- 
- @end table
- 
-- at node unshar invocation, uuencode, shar invocation, Basic
-+ at node unshar, uuencode, shar, Basic
- @section Invoking the @code{unshar} program
+ @cindex create a shell archive
+@@ -471,7 +471,7 @@
+ order.  If the recipient of the shell archives wants to put all of
+ them in a single email folder (file), they will have to be saved in
+ the correct order for @command{unshar} to unpack them all at once (using
+-one of the split archive options).  @xref{unshar Invocation}.
++one of the split archive options).  @xref{unshar}.
+ @subsubheading input-file-list option (-I).
+ @anchor{shar input-file-list}
+ @cindex shar-input-file-list
+--- sharutils-4.13.1/doc/invoke-unshar.texi.orig	2012-12-28 02:11:29.000000000 +0100
++++ sharutils-4.13.1/doc/invoke-unshar.texi	2013-01-02 19:29:30.118153923 +0100
+@@ -1,4 +1,4 @@
+- at node unshar Invocation
++ at node unshar
+ @section Invoking unshar
  @pindex unshar
- 
-@@ -636,7 +632,7 @@
- 
- @end table
- 
-- at node uuencode, uudecode, unshar invocation, Basic
-+ at node uuencode, uudecode, unshar, Basic
- @section Invoking the @code{uuencode} program
+ @cindex unpack a shar archive
+--- sharutils-4.13.1/doc/invoke-uudecode.texi.orig	2012-12-28 02:11:32.000000000 +0100
++++ sharutils-4.13.1/doc/invoke-uudecode.texi	2013-01-02 19:29:37.704820432 +0100
+@@ -1,4 +1,4 @@
+- at node uudecode Invocation
++ at node uudecode
+ @section Invoking uudecode
+ @pindex uudecode
+ @cindex decode an encoded file
+--- sharutils-4.13.1/doc/invoke-uuencode.texi.orig	2012-12-28 02:11:36.000000000 +0100
++++ sharutils-4.13.1/doc/invoke-uuencode.texi	2013-01-02 19:29:43.484820311 +0100
+@@ -1,4 +1,4 @@
+- at node uuencode Invocation
++ at node uuencode
+ @section Invoking uuencode
  @pindex uuencode
- This program converts a binary file into printable ASCII characters.
+ @cindex encode a file into email friendly text
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/sharutils.git/commitdiff/f65e8c836fb90e2b362635d5f43a062611836f65



More information about the pld-cvs-commit mailing list