diff --git a/.cvsignore b/.cvsignore index 15355a8..f31714e 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1 @@ -cstream-2.7.5.tar.gz -cstream-2.7.5-Wextra.patch +cstream-2.7.6.tar.gz diff --git a/cstream-2.7.4-Wextra.patch b/cstream-2.7.4-Wextra.patch deleted file mode 100644 index 7daa31c..0000000 --- a/cstream-2.7.4-Wextra.patch +++ /dev/null @@ -1,40 +0,0 @@ ---- cstream-2.7.4-orig/cstream.c 2007-09-18 21:47:49.000000000 +0200 -+++ cstream-2.7.4-Wextra/cstream.c 2008-02-08 19:10:07.000000000 +0100 -@@ -97,6 +97,7 @@ - #else - #ifdef HAVE_SYS_SOUNDCARD_H - #include -+#include - #define WANT_SOUND 1 - #else - #ifdef HAVE_LINUX_SOUNDCARD_H -@@ -266,7 +267,10 @@ static void sigreport(int signal) - - static void sighup(int signal) - { -- write(2, "SIGHUP\n", sizeof("SIGHUP\n")-1); -+ ssize_t s = write(STDERR_FILENO, "SIGHUP\n", sizeof("SIGHUP\n")-1); -+ if (s != sizeof("SIGHUP\n")) { -+ /* ignore write error */ -+ } - n_sighups++; - } - -@@ -390,7 +394,7 @@ static int open_tcp(const struct options - const char *spec; - int newfd; - struct sockaddr_in serv_addr; -- int *size; -+ socklen_t *size; - - if (mode == O_WRONLY) { - spec = o->o; -@@ -520,7 +524,7 @@ static int open_tcp(const struct options - } *it, funcs[3] = { - {getsockname, "getsockname", "Local binding"}, - {getpeername, "getpeername", "Remote binding"}, -- {NULL} -+ {NULL, NULL, NULL} - }; - union { - struct sockaddr sa; diff --git a/cstream-2.7.6-Wextra.patch b/cstream-2.7.6-Wextra.patch new file mode 100644 index 0000000..cfe1cbc --- /dev/null +++ b/cstream-2.7.6-Wextra.patch @@ -0,0 +1,40 @@ +--- cstream-2.7.6/cstream.c 2008-12-19 22:38:37.000000000 +0100 ++++ cstream-2.7.6-Wextra/cstream.c 2008-12-20 11:21:12.000000000 +0100 +@@ -97,6 +97,7 @@ + #else + #ifdef HAVE_SYS_SOUNDCARD_H + #include ++#include + #define WANT_SOUND 1 + #else + #ifdef HAVE_LINUX_SOUNDCARD_H +@@ -271,7 +272,10 @@ + + static void sighup(int signal) + { +- write(2, "SIGHUP\n", sizeof("SIGHUP\n")-1); ++ ssize_t s = write(STDERR_FILENO, "SIGHUP\n", sizeof("SIGHUP\n")-1); ++ if (s != sizeof("SIGHUP\n")) { ++ /* ignore write error */ ++ } + n_sighups++; + } + +@@ -395,7 +399,7 @@ + const char *spec; + int newfd; + struct sockaddr_in serv_addr; +- int *size; ++ socklen_t *size; + + if (mode == O_WRONLY) { + spec = o->o; +@@ -525,7 +529,7 @@ + } *it, funcs[3] = { + {getsockname, "getsockname", "Local binding"}, + {getpeername, "getpeername", "Remote binding"}, +- {NULL} ++ {NULL, NULL, NULL} + }; + union { + struct sockaddr sa; diff --git a/cstream.spec b/cstream.spec index 8bed52f..2517e5c 100644 --- a/cstream.spec +++ b/cstream.spec @@ -1,6 +1,6 @@ Summary: General-purpose stream-handling tool Name: cstream -Version: 2.7.5 +Version: 2.7.6 Release: 1%{?dist} Group: Applications/System @@ -52,6 +52,9 @@ Data limits and throughput rate calculation will work for files > 4 GB. %changelog +* Sat Dec 20 2008 Hans Ulrich Niedermann - 2.7.6-1 +- Update to upstream's 2.7.6 release. + * Sat Feb 09 2008 Hans Ulrich Niedermann - 2.7.5-1 - Update to upstream's 2.7.5 release. diff --git a/sources b/sources index 28f5d5c..318cb7f 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -1aa292f0a05ebc3b512820d3241e5a42 cstream-2.7.5.tar.gz -06c7f6f6e027f51599370d2e673d0f2e cstream-2.7.5-Wextra.patch +8815126c63aa7034197effb1544a1ccc cstream-2.7.6.tar.gz