rpms/coreutils/devel coreutils-autoconf.patch, NONE, 1.1 coreutils-newhashes.patch, NONE, 1.1 .cvsignore, 1.9, 1.10 coreutils.spec, 1.122, 1.123 sources, 1.10, 1.11 coreutils-5.96-newhashes.patch, 1.1, NONE coreutils-5.96.pl.po, 1.1, NONE coreutils-tee.patch, 1.1, NONE coreutils-tempname.patch, 1.1, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Sun Jun 25 23:15:02 UTC 2006
- Previous message (by thread): rpms/ipv6calc/devel .cvsignore, 1.7, 1.8 ipv6calc.spec, 1.18, 1.19 sources, 1.7, 1.8
- Next message (by thread): rpms/anthy/devel .cvsignore, 1.18, 1.19 anthy.spec, 1.29, 1.30 sources, 1.18, 1.19
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: twaugh
Update of /cvs/dist/rpms/coreutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23942
Modified Files:
.cvsignore coreutils.spec sources
Added Files:
coreutils-autoconf.patch coreutils-newhashes.patch
Removed Files:
coreutils-5.96-newhashes.patch coreutils-5.96.pl.po
coreutils-tee.patch coreutils-tempname.patch
Log Message:
* Sun Jun 25 2006 Tim Waugh <twaugh at redhat.com> 5.97-1
- 5.97. No longer need tempname or tee patches, or pl translation.
coreutils-autoconf.patch:
jm-macros.m4 | 2 +-
1 files changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE coreutils-autoconf.patch ---
--- coreutils-5.97/m4/jm-macros.m4.autoconf 2006-06-25 23:57:47.000000000 +0100
+++ coreutils-5.97/m4/jm-macros.m4 2006-06-25 23:57:53.000000000 +0100
@@ -22,7 +22,7 @@
AC_DEFUN([gl_MACROS],
[
- AC_PREREQ(2.59d)
+ AC_PREREQ(2.59)
GNU_PACKAGE="GNU $PACKAGE"
AC_DEFINE_UNQUOTED(GNU_PACKAGE, "$GNU_PACKAGE",
coreutils-newhashes.patch:
AUTHORS | 9
README | 6
aclocal.m4 | 2
configure.ac | 8
lib/Makefile.am | 1
lib/base64.c | 416 ++++++++++++++++++++++++++++++++++++
lib/base64.h | 45 +++
lib/md5.c | 189 ++++++++--------
lib/md5.h | 52 +---
lib/sha1.c | 77 +++---
lib/sha1.h | 22 -
lib/sha256.c | 548 ++++++++++++++++++++++++++++++++++++++++++++++++
lib/sha256.h | 88 +++++++
lib/sha512.c | 559 +++++++++++++++++++++++++++++++++++++++++++++++++
lib/sha512.h | 90 +++++++
m4/prereq.m4 | 2
m4/sha256.m4 | 15 +
m4/sha512.m4 | 15 +
man/Makefile.am | 10
man/base64.x | 4
man/sha224sum.x | 4
man/sha256sum.x | 4
man/sha384sum.x | 4
man/sha512sum.x | 4
src/Makefile.am | 20 +
src/base64.c | 308 ++++++++++++++++++++++++++
src/md5sum.c | 137 ++++++++----
tests/misc/Makefile.am | 5
tests/misc/base64 | 81 +++++++
tests/misc/sha224sum | 45 +++
tests/misc/sha256sum | 51 ++++
tests/misc/sha384sum | 51 ++++
tests/misc/sha512sum | 51 ++++
33 files changed, 2691 insertions(+), 232 deletions(-)
--- NEW FILE coreutils-newhashes.patch ---
--- coreutils-5.97/configure.ac.newhashes 2006-05-23 21:38:46.000000000 +0100
+++ coreutils-5.97/configure.ac 2006-06-25 23:50:01.000000000 +0100
@@ -305,3 +305,11 @@
tests/wc/Makefile
)
AC_OUTPUT
+
+# This is a _HACK_, tests are added via. patch so they don't have +x perms.
+# we hand hack them in here...
+chmod +x $srcdir/tests/misc/base64
+chmod +x $srcdir/tests/misc/sha224sum
+chmod +x $srcdir/tests/misc/sha256sum
+chmod +x $srcdir/tests/misc/sha384sum
+chmod +x $srcdir/tests/misc/sha512sum
--- coreutils-5.97/README.newhashes 2005-09-28 19:34:26.000000000 +0100
+++ coreutils-5.97/README 2006-06-25 23:50:01.000000000 +0100
@@ -7,11 +7,13 @@
The programs that can be built with this package are:
- [ basename cat chgrp chmod chown chroot cksum comm cp csplit cut date dd
+ [ base64
+ basename cat chgrp chmod chown chroot cksum comm cp csplit cut date dd
df dir dircolors dirname du echo env expand expr factor false fmt fold
ginstall groups head hostid hostname id join kill link ln logname ls
md5sum mkdir mkfifo mknod mv nice nl nohup od paste pathchk pinky pr
- printenv printf ptx pwd readlink rm rmdir seq sha1sum shred sleep sort
+ printenv printf ptx pwd readlink rm rmdir seq sha1sum sha224sum
+ sha256sum sha384sum sha512sum shred sleep sort
split stat stty su sum sync tac tail tee test touch tr true tsort tty
uname unexpand uniq unlink uptime users vdir wc who whoami yes
--- coreutils-5.97/src/Makefile.am.newhashes 2005-07-18 08:52:18.000000000 +0100
+++ coreutils-5.97/src/Makefile.am 2006-06-25 23:50:01.000000000 +0100
@@ -24,10 +24,12 @@
ginstall link ln dir vdir ls mkdir \
mkfifo mknod mv nohup readlink rm rmdir shred stat sync touch unlink \
cat cksum comm csplit cut expand fmt fold head join md5sum \
- nl od paste pr ptx sha1sum sort split sum tac tail tr tsort unexpand uniq wc \
+ nl od paste pr ptx sha1sum sha224sum sha256sum sha384sum sha512sum \
+ sort split sum tac tail tr tsort unexpand uniq wc \
basename date dirname echo env expr factor false \
hostname id kill logname pathchk printenv printf pwd seq sleep tee \
test true tty whoami yes \
+ base64 \
$(OPTIONAL_BIN_PROGS) $(DF_PROG)
noinst_PROGRAMS = setuidgid
@@ -37,7 +39,7 @@
chown-core.h fs.h \
wheel.h wheel-size.h
EXTRA_DIST = dcgen dircolors.hin tac-pipe.c \
- groups.sh wheel-gen.pl extract-magic
+ groups.sh wheel-gen.pl extract-magic # rand-isaac.c
CLEANFILES = $(SCRIPTS) su
AM_CPPFLAGS = -I.. -I$(srcdir) -I$(top_srcdir)/lib -I../lib
@@ -169,8 +171,18 @@
mv_SOURCES = mv.c copy.c cp-hash.c remove.c
rm_SOURCES = rm.c remove.c
-md5sum_SOURCES = md5sum.c md5.c
-sha1sum_SOURCES = md5sum.c sha1sum.c
+md5sum_SOURCES = md5sum.c
+md5sum_CPPFLAGS = -DHASH_ALGO_MD5=1 $(AM_CPPFLAGS)
+sha1sum_SOURCES = md5sum.c
+sha1sum_CPPFLAGS = -DHASH_ALGO_SHA1=1 $(AM_CPPFLAGS)
+sha224sum_SOURCES = md5sum.c
+sha224sum_CPPFLAGS = -DHASH_ALGO_SHA224=1 $(AM_CPPFLAGS)
+sha256sum_SOURCES = md5sum.c
+sha256sum_CPPFLAGS = -DHASH_ALGO_SHA256=1 $(AM_CPPFLAGS)
+sha384sum_SOURCES = md5sum.c
+sha384sum_CPPFLAGS = -DHASH_ALGO_SHA384=1 $(AM_CPPFLAGS)
+sha512sum_SOURCES = md5sum.c
+sha512sum_CPPFLAGS = -DHASH_ALGO_SHA512=1 $(AM_CPPFLAGS)
editpl = sed -e 's,@''PERL''@,$(PERL),g'
--- coreutils-5.97/src/md5sum.c.newhashes 2005-10-27 17:22:14.000000000 +0100
+++ coreutils-5.97/src/md5sum.c 2006-06-25 23:50:01.000000000 +0100
@@ -1,4 +1,4 @@
-/* Compute MD5 or SHA1 checksum of files or strings
+/* Compute MD5, SHA1, SHA224, SHA256, SHA384 or SHA512 checksum of files or strings
Copyright (C) 1995-2005 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
@@ -24,34 +24,85 @@
#include "system.h"
-#include "md5.h"
-#include "sha1.h"
-#include "checksum.h"
+#if HASH_ALGO_MD5
+# include "md5.h"
+#endif
+#if HASH_ALGO_SHA1
+# include "sha1.h"
+#endif
+#if HASH_ALGO_SHA256 || HASH_ALGO_SHA224
+# include "sha256.h"
+#endif
+#if HASH_ALGO_SHA512 || HASH_ALGO_SHA384
+# include "sha512.h"
+#endif
#include "getline.h"
#include "error.h"
#include "quote.h"
#include "stdio--.h"
/* The official name of this program (e.g., no `g' prefix). */
-#define PROGRAM_NAME (algorithm == ALG_MD5 ? "md5sum" : "sha1sum")
+#if HASH_ALGO_MD5
+# define PROGRAM_NAME "md5sum"
+# define DIGEST_TYPE_STRING "MD5"
+# define DIGEST_STREAM md5_stream
+# define DIGEST_BUFFER md5_buffer
+# define DIGEST_BITS 128
+# define DIGEST_REFERENCE "RFC 1321"
+# define DIGEST_ALIGN 4
+#elif HASH_ALGO_SHA1
+# define PROGRAM_NAME "sha1sum"
+# define DIGEST_TYPE_STRING "SHA1"
+# define DIGEST_STREAM sha1_stream
+# define DIGEST_BUFFER sha1_buffer
+# define DIGEST_BITS 160
+# define DIGEST_REFERENCE "FIPS-180-1"
+# define DIGEST_ALIGN 4
+#elif HASH_ALGO_SHA256
+# define PROGRAM_NAME "sha256sum"
+# define DIGEST_TYPE_STRING "SHA256"
+# define DIGEST_STREAM sha256_stream
+# define DIGEST_BUFFER sha256_buffer
+# define DIGEST_BITS 256
+# define DIGEST_REFERENCE "FIPS-180-2"
+# define DIGEST_ALIGN 4
+#elif HASH_ALGO_SHA224
+# define PROGRAM_NAME "sha224sum"
+# define DIGEST_TYPE_STRING "SHA224"
+# define DIGEST_STREAM sha224_stream
+# define DIGEST_BUFFER sha224_buffer
+# define DIGEST_BITS 224
+# define DIGEST_REFERENCE "RFC 3874"
+# define DIGEST_ALIGN 4
+#elif HASH_ALGO_SHA512
+# define PROGRAM_NAME "sha512sum"
+# define DIGEST_TYPE_STRING "SHA512"
+# define DIGEST_STREAM sha512_stream
+# define DIGEST_BUFFER sha512_buffer
+# define DIGEST_BITS 512
+# define DIGEST_REFERENCE "FIPS-180-2"
+# define DIGEST_ALIGN 8
+#elif HASH_ALGO_SHA384
+# define PROGRAM_NAME "sha384sum"
+# define DIGEST_TYPE_STRING "SHA384"
+# define DIGEST_STREAM sha384_stream
+# define DIGEST_BUFFER sha384_buffer
+# define DIGEST_BITS 384
+# define DIGEST_REFERENCE "FIPS-180-2"
+# define DIGEST_ALIGN 8
+#else
+# error "Can't decide which hash algorithm to compile."
+#endif
-#define AUTHORS "Ulrich Drepper", "Scott Miller"
+#define DIGEST_HEX_BYTES (DIGEST_BITS / 4)
+#define DIGEST_BIN_BYTES (DIGEST_BITS / 8)
-
-#define DIGEST_TYPE_STRING(Alg) ((Alg) == ALG_MD5 ? "MD5" : "SHA1")
-#define DIGEST_STREAM(Alg) ((Alg) == ALG_MD5 ? md5_stream : sha1_stream)
-
-#define DIGEST_BITS(Alg) ((Alg) == ALG_MD5 ? 128 : 160)
-#define DIGEST_HEX_BYTES(Alg) (DIGEST_BITS (Alg) / 4)
-#define DIGEST_BIN_BYTES(Alg) (DIGEST_BITS (Alg) / 8)
-
-#define MAX_DIGEST_BIN_BYTES MAX (DIGEST_BIN_BYTES (ALG_MD5), \
- DIGEST_BIN_BYTES (ALG_SHA1))
+#define AUTHORS "Ulrich Drepper", "Scott Miller", "David Madore"
/* The minimum length of a valid digest line. This length does
not include any newline character at the end of a line. */
-#define MIN_DIGEST_LINE_LENGTH(Alg) \
- (DIGEST_HEX_BYTES (Alg) /* length of hexadecimal message digest */ \
+#define MIN_DIGEST_LINE_LENGTH \
+ (DIGEST_HEX_BYTES /* length of hexadecimal message digest */ \
+ 2 /* blank and binary indicator */ \
+ 1 /* minimum filename length */ )
@@ -72,9 +123,6 @@
improperly formatted checksum line. */
static bool warn = false;
-/* Declared and set via one of the wrapper .c files. */
-/* int algorithm = ALG_UNSPECIFIED; */
-
/* The name this program was run with. */
char *program_name;
[...3209 lines suppressed...]
- little endian byte order we perhaps have to change the byte order
- before the computation. To reduce the work for the next steps
- we store the swapped words in the array CORRECT_WORDS. */
+ the next context is computed. Because the algorithms processing
+ unit is a 32-bit word and it is determined to work on words in
+ little endian byte order we perhaps have to change the byte order
+ before the computation. To reduce the work for the next steps
+ we store the swapped words in the array CORRECT_WORDS. */
#define OP(a, b, c, d, s, T) \
do \
@@ -339,40 +340,40 @@
while (0)
/* It is unfortunate that C does not provide an operator for
- cyclic rotation. Hope the C compiler is smart enough. */
+ cyclic rotation. Hope the C compiler is smart enough. */
#define CYCLIC(w, s) (w = (w << s) | (w >> (32 - s)))
/* Before we start, one word to the strange constants.
- They are defined in RFC 1321 as
+ They are defined in RFC 1321 as
- T[i] = (int) (4294967296.0 * fabs (sin (i))), i=1..64
+ T[i] = (int) (4294967296.0 * fabs (sin (i))), i=1..64
- Here is an equivalent invocation using Perl:
+ Here is an equivalent invocation using Perl:
- perl -e 'foreach(1..64){printf "0x%08x\n", int (4294967296 * abs (sin $_))}'
+ perl -e 'foreach(1..64){printf "0x%08x\n", int (4294967296 * abs (sin $_))}'
*/
/* Round 1. */
- OP (A, B, C, D, 7, 0xd76aa478);
+ OP (A, B, C, D, 7, 0xd76aa478);
OP (D, A, B, C, 12, 0xe8c7b756);
OP (C, D, A, B, 17, 0x242070db);
OP (B, C, D, A, 22, 0xc1bdceee);
- OP (A, B, C, D, 7, 0xf57c0faf);
+ OP (A, B, C, D, 7, 0xf57c0faf);
OP (D, A, B, C, 12, 0x4787c62a);
OP (C, D, A, B, 17, 0xa8304613);
OP (B, C, D, A, 22, 0xfd469501);
- OP (A, B, C, D, 7, 0x698098d8);
+ OP (A, B, C, D, 7, 0x698098d8);
OP (D, A, B, C, 12, 0x8b44f7af);
OP (C, D, A, B, 17, 0xffff5bb1);
OP (B, C, D, A, 22, 0x895cd7be);
- OP (A, B, C, D, 7, 0x6b901122);
+ OP (A, B, C, D, 7, 0x6b901122);
OP (D, A, B, C, 12, 0xfd987193);
OP (C, D, A, B, 17, 0xa679438e);
OP (B, C, D, A, 22, 0x49b40821);
/* For the second to fourth round we have the possibly swapped words
- in CORRECT_WORDS. Redefine the macro to take an additional first
- argument specifying the function to use. */
+ in CORRECT_WORDS. Redefine the macro to take an additional first
+ argument specifying the function to use. */
#undef OP
#define OP(f, a, b, c, d, k, s, T) \
do \
@@ -384,58 +385,58 @@
while (0)
/* Round 2. */
- OP (FG, A, B, C, D, 1, 5, 0xf61e2562);
- OP (FG, D, A, B, C, 6, 9, 0xc040b340);
+ OP (FG, A, B, C, D, 1, 5, 0xf61e2562);
+ OP (FG, D, A, B, C, 6, 9, 0xc040b340);
OP (FG, C, D, A, B, 11, 14, 0x265e5a51);
- OP (FG, B, C, D, A, 0, 20, 0xe9b6c7aa);
- OP (FG, A, B, C, D, 5, 5, 0xd62f105d);
- OP (FG, D, A, B, C, 10, 9, 0x02441453);
+ OP (FG, B, C, D, A, 0, 20, 0xe9b6c7aa);
+ OP (FG, A, B, C, D, 5, 5, 0xd62f105d);
+ OP (FG, D, A, B, C, 10, 9, 0x02441453);
OP (FG, C, D, A, B, 15, 14, 0xd8a1e681);
- OP (FG, B, C, D, A, 4, 20, 0xe7d3fbc8);
- OP (FG, A, B, C, D, 9, 5, 0x21e1cde6);
- OP (FG, D, A, B, C, 14, 9, 0xc33707d6);
- OP (FG, C, D, A, B, 3, 14, 0xf4d50d87);
- OP (FG, B, C, D, A, 8, 20, 0x455a14ed);
- OP (FG, A, B, C, D, 13, 5, 0xa9e3e905);
- OP (FG, D, A, B, C, 2, 9, 0xfcefa3f8);
- OP (FG, C, D, A, B, 7, 14, 0x676f02d9);
+ OP (FG, B, C, D, A, 4, 20, 0xe7d3fbc8);
+ OP (FG, A, B, C, D, 9, 5, 0x21e1cde6);
+ OP (FG, D, A, B, C, 14, 9, 0xc33707d6);
+ OP (FG, C, D, A, B, 3, 14, 0xf4d50d87);
+ OP (FG, B, C, D, A, 8, 20, 0x455a14ed);
+ OP (FG, A, B, C, D, 13, 5, 0xa9e3e905);
+ OP (FG, D, A, B, C, 2, 9, 0xfcefa3f8);
+ OP (FG, C, D, A, B, 7, 14, 0x676f02d9);
OP (FG, B, C, D, A, 12, 20, 0x8d2a4c8a);
/* Round 3. */
- OP (FH, A, B, C, D, 5, 4, 0xfffa3942);
- OP (FH, D, A, B, C, 8, 11, 0x8771f681);
+ OP (FH, A, B, C, D, 5, 4, 0xfffa3942);
+ OP (FH, D, A, B, C, 8, 11, 0x8771f681);
OP (FH, C, D, A, B, 11, 16, 0x6d9d6122);
OP (FH, B, C, D, A, 14, 23, 0xfde5380c);
- OP (FH, A, B, C, D, 1, 4, 0xa4beea44);
- OP (FH, D, A, B, C, 4, 11, 0x4bdecfa9);
- OP (FH, C, D, A, B, 7, 16, 0xf6bb4b60);
+ OP (FH, A, B, C, D, 1, 4, 0xa4beea44);
+ OP (FH, D, A, B, C, 4, 11, 0x4bdecfa9);
+ OP (FH, C, D, A, B, 7, 16, 0xf6bb4b60);
OP (FH, B, C, D, A, 10, 23, 0xbebfbc70);
- OP (FH, A, B, C, D, 13, 4, 0x289b7ec6);
- OP (FH, D, A, B, C, 0, 11, 0xeaa127fa);
- OP (FH, C, D, A, B, 3, 16, 0xd4ef3085);
- OP (FH, B, C, D, A, 6, 23, 0x04881d05);
- OP (FH, A, B, C, D, 9, 4, 0xd9d4d039);
+ OP (FH, A, B, C, D, 13, 4, 0x289b7ec6);
+ OP (FH, D, A, B, C, 0, 11, 0xeaa127fa);
+ OP (FH, C, D, A, B, 3, 16, 0xd4ef3085);
+ OP (FH, B, C, D, A, 6, 23, 0x04881d05);
+ OP (FH, A, B, C, D, 9, 4, 0xd9d4d039);
OP (FH, D, A, B, C, 12, 11, 0xe6db99e5);
OP (FH, C, D, A, B, 15, 16, 0x1fa27cf8);
- OP (FH, B, C, D, A, 2, 23, 0xc4ac5665);
+ OP (FH, B, C, D, A, 2, 23, 0xc4ac5665);
/* Round 4. */
- OP (FI, A, B, C, D, 0, 6, 0xf4292244);
- OP (FI, D, A, B, C, 7, 10, 0x432aff97);
+ OP (FI, A, B, C, D, 0, 6, 0xf4292244);
+ OP (FI, D, A, B, C, 7, 10, 0x432aff97);
OP (FI, C, D, A, B, 14, 15, 0xab9423a7);
- OP (FI, B, C, D, A, 5, 21, 0xfc93a039);
- OP (FI, A, B, C, D, 12, 6, 0x655b59c3);
- OP (FI, D, A, B, C, 3, 10, 0x8f0ccc92);
+ OP (FI, B, C, D, A, 5, 21, 0xfc93a039);
+ OP (FI, A, B, C, D, 12, 6, 0x655b59c3);
+ OP (FI, D, A, B, C, 3, 10, 0x8f0ccc92);
OP (FI, C, D, A, B, 10, 15, 0xffeff47d);
- OP (FI, B, C, D, A, 1, 21, 0x85845dd1);
- OP (FI, A, B, C, D, 8, 6, 0x6fa87e4f);
+ OP (FI, B, C, D, A, 1, 21, 0x85845dd1);
+ OP (FI, A, B, C, D, 8, 6, 0x6fa87e4f);
OP (FI, D, A, B, C, 15, 10, 0xfe2ce6e0);
- OP (FI, C, D, A, B, 6, 15, 0xa3014314);
+ OP (FI, C, D, A, B, 6, 15, 0xa3014314);
OP (FI, B, C, D, A, 13, 21, 0x4e0811a1);
- OP (FI, A, B, C, D, 4, 6, 0xf7537e82);
+ OP (FI, A, B, C, D, 4, 6, 0xf7537e82);
OP (FI, D, A, B, C, 11, 10, 0xbd3af235);
- OP (FI, C, D, A, B, 2, 15, 0x2ad7d2bb);
- OP (FI, B, C, D, A, 9, 21, 0xeb86d391);
+ OP (FI, C, D, A, B, 2, 15, 0x2ad7d2bb);
+ OP (FI, B, C, D, A, 9, 21, 0xeb86d391);
/* Add the starting values of the context. */
A += A_save;
--- coreutils-5.97/AUTHORS.newhashes 2004-11-03 23:10:50.000000000 +0000
+++ coreutils-5.97/AUTHORS 2006-06-25 23:50:01.000000000 +0100
@@ -1,6 +1,7 @@
Here are the names of the programs in this package,
each followed by the name(s) of its author(s).
+base64: Simon Josefsson
basename: FIXME unknown
cat: Torbjorn Granlund, Richard M. Stallman
chgrp: David MacKenzie, Jim Meyering
@@ -39,7 +40,7 @@
ln: Mike Parker, David MacKenzie
logname: FIXME: unknown
ls: Richard Stallman, David MacKenzie
-md5sum: Ulrich Drepper, Scott Miller
+md5sum: Ulrich Drepper, Scott Miller, David Madore
mkdir: David MacKenzie
mkfifo: David MacKenzie
mknod: David MacKenzie
@@ -60,7 +61,11 @@
rm: Paul Rubin, David MacKenzie, Richard Stallman, Jim Meyering
rmdir: David MacKenzie
seq: Ulrich Drepper
-sha1sum: Ulrich Drepper, Scott Miller
+sha1sum: Ulrich Drepper, Scott Miller, David Madore
+sha224sum: Ulrich Drepper, Scott Miller, David Madore
+sha256sum: Ulrich Drepper, Scott Miller, David Madore
+sha384sum: Ulrich Drepper, Scott Miller, David Madore
+sha512sum: Ulrich Drepper, Scott Miller, David Madore
shred: Colin Plumb
sleep: Jim Meyering, Paul Eggert
sort: Mike Haertel, Paul Eggert
--- coreutils-5.97/aclocal.m4.newhashes 2006-06-10 10:02:48.000000000 +0100
+++ coreutils-5.97/aclocal.m4 2006-06-25 23:50:01.000000000 +0100
@@ -1055,6 +1055,8 @@
m4_include([m4/setenv.m4])
m4_include([m4/settime.m4])
m4_include([m4/sha1.m4])
+m4_include([m4/sha256.m4])
+m4_include([m4/sha512.m4])
m4_include([m4/sig2str.m4])
m4_include([m4/signed.m4])
m4_include([m4/socklen.m4])
Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/coreutils/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore 22 May 2006 14:06:48 -0000 1.9
+++ .cvsignore 25 Jun 2006 23:15:00 -0000 1.10
@@ -4,3 +4,4 @@
coreutils-5.94.tar.bz2
coreutils-5.95.tar.bz2
coreutils-5.96.tar.bz2
+coreutils-5.97.tar.bz2
Index: coreutils.spec
===================================================================
RCS file: /cvs/dist/rpms/coreutils/devel/coreutils.spec,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -r1.122 -r1.123
--- coreutils.spec 25 Jun 2006 17:45:57 -0000 1.122
+++ coreutils.spec 25 Jun 2006 23:15:00 -0000 1.123
@@ -1,7 +1,7 @@
Summary: The GNU core utilities: a set of tools commonly used in shell scripts
Name: coreutils
-Version: 5.96
-Release: 4
+Version: 5.97
+Release: 1
License: GPL
Group: System Environment/Base
Url: http://www.gnu.org/software/coreutils/
@@ -10,7 +10,6 @@
Requires: libselinux >= 1.25.6-1
Source0: ftp://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.bz2
-Source1: coreutils-5.96.pl.po
Source101: DIR_COLORS
Source102: DIR_COLORS.xterm
Source105: colorls.sh
@@ -19,8 +18,7 @@
Source201: runuser.pamd
# From upstream
-Patch1: coreutils-tempname.patch
-Patch2: coreutils-5.96-newhashes.patch
+Patch10: coreutils-newhashes.patch
# Our patches
Patch100: coreutils-chgrp.patch
@@ -45,7 +43,7 @@
Patch908: coreutils-getgrouplist.patch
Patch912: coreutils-overflow.patch
Patch913: coreutils-afs.patch
-Patch914: coreutils-tee.patch
+Patch914: coreutils-autoconf.patch
#SELINUX Patch
Patch950: coreutils-selinux.patch
@@ -74,12 +72,9 @@
%prep
%setup -q
-rm po/pl.*
-cp %{SOURCE1} po/pl.po
# From upstream
-%patch1 -p1 -b .tempname
-%patch2 -p1 -b .newhashes
+%patch10 -p1 -b .newhashes
# Our patches
%patch100 -p1 -b .chgrp
@@ -102,7 +97,7 @@
%patch908 -p1 -b .getgrouplist
%patch912 -p1 -b .overflow
%patch913 -p1 -b .afs
-%patch914 -p1 -b .tee
+%patch914 -p1 -b .autoconf
#SELinux
%patch950 -p1 -b .selinux
@@ -275,6 +270,9 @@
/sbin/runuser
%changelog
+* Sun Jun 25 2006 Tim Waugh <twaugh at redhat.com> 5.97-1
+- 5.97. No longer need tempname or tee patches, or pl translation.
+
* Sun Jun 25 2006 Tim Waugh <twaugh at redhat.com> 5.96-4
- Include new hashes (bug #196369). Patch from upstream.
- Build at -O1 on s390 for the moment (bug #196369).
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/coreutils/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources 7 Jun 2006 12:50:31 -0000 1.10
+++ sources 25 Jun 2006 23:15:00 -0000 1.11
@@ -1 +1 @@
-bf55d069d82128fd754a090ce8b5acff coreutils-5.96.tar.bz2
+1537379b6264a1def443713988a78020 coreutils-5.97.tar.bz2
--- coreutils-5.96-newhashes.patch DELETED ---
--- coreutils-5.96.pl.po DELETED ---
--- coreutils-tee.patch DELETED ---
--- coreutils-tempname.patch DELETED ---
- Previous message (by thread): rpms/ipv6calc/devel .cvsignore, 1.7, 1.8 ipv6calc.spec, 1.18, 1.19 sources, 1.7, 1.8
- Next message (by thread): rpms/anthy/devel .cvsignore, 1.18, 1.19 anthy.spec, 1.29, 1.30 sources, 1.18, 1.19
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-cvs-commits
mailing list