4.13.3 bump

This commit is contained in:
Petr Písař 2013-01-08 09:18:18 +01:00
parent 51e7ca94b9
commit e3c867970d
4 changed files with 8 additions and 45 deletions

1
.gitignore vendored
View File

@ -3,3 +3,4 @@ sharutils-4.9.tar.bz2
/sharutils-4.11.tar.bz2
/sharutils-4.11.1.tar.bz2
/sharutils-4.13.1.tar.bz2
/sharutils-4.13.3.tar.xz

View File

@ -1,38 +0,0 @@
From 069fbf819d748f6e433dca3e8eb3eb72b354cda0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
Date: Thu, 3 Jan 2013 17:20:55 +0100
Subject: [PATCH] [sharutils] Fix swapping on big-endian machines
4.13.1 release replaced SWAP() macro with function. However there were
two bugs. First the function always retuned 0 because it ignored
input argument. Second it indexed input array off-by-one. As
result, shar-1 test failed on S390 or PPC.
This patch fixes it.
---
lib/md5.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/lib/md5.c b/lib/md5.c
index 076f6ef..6dea827 100644
--- a/lib/md5.c
+++ b/lib/md5.c
@@ -54,10 +54,11 @@ SWAP(md5_uint32 n)
md5_uint32 uiv;
} v, res;
- res.cv[0] = v.cv[sizeof(md5_uint32) - 0];
- res.cv[1] = v.cv[sizeof(md5_uint32) - 1];
- res.cv[2] = v.cv[sizeof(md5_uint32) - 2];
- res.cv[3] = v.cv[sizeof(md5_uint32) - 3];
+ v.uiv = n;
+ res.cv[0] = v.cv[sizeof(md5_uint32) - 1];
+ res.cv[1] = v.cv[sizeof(md5_uint32) - 2];
+ res.cv[2] = v.cv[sizeof(md5_uint32) - 3];
+ res.cv[3] = v.cv[sizeof(md5_uint32) - 4];
return res.uiv;
}
--
1.7.11.7

View File

@ -1,12 +1,10 @@
Summary: The GNU shar utilities for packaging and unpackaging shell archives
Name: sharutils
Version: 4.13.1
Release: 2%{?dist}
Version: 4.13.3
Release: 1%{?dist}
License: GPLv3+ and LGPLv2+ and Public Domain
Group: Applications/Archiving
Source: ftp://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.bz2
# Regression in 4.13.1, reporterd to <bug-gnu-utils@gnu.org>
Patch0: sharutils-4.13.1-Fix-swapping-on-big-endian-machines.patch
Source: ftp://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.xz
URL: http://www.gnu.org/software/%{name}/
BuildRequires: gettext
Requires(post): info
@ -28,7 +26,6 @@ shar files.
%prep
%setup -q
%patch0 -p1 -b .bigendian
# convert TODO, THANKS to UTF-8
for i in TODO THANKS; do
@ -68,6 +65,9 @@ fi
%{_mandir}/man5/*
%changelog
* Mon Jan 07 2013 Petr Pisar <ppisar@redhat.com> - 4.13.3-1
- 4.13.3 bump
* Thu Jan 03 2013 Petr Pisar <ppisar@redhat.com> - 4.13.1-2
- Fix MD5 checksum generation on big-endian machines

View File

@ -1 +1 @@
6c6d2f5fefe32c6d7131922c5649075d sharutils-4.13.1.tar.bz2
ac996dbe2dfc74647b500506af56779b sharutils-4.13.3.tar.xz