[cstream] cstream-3.0.0-1: Update to cstream-3.0.0

[Hans Ulrich Niedermann]

commit 62d0960e4d6af91edf3b40a50545d97b583a04de
Author: Hans Ulrich Niedermann <hun at n-dimensional.de>
Date:   Mon Sep 12 12:44:07 2011 +0200

    cstream-3.0.0-1: Update to cstream-3.0.0

 .gitignore                                         |    1 +
 cstream-2.7.6-Wextra.patch                         |   40 --------------------
 cstream-3.0.0-Wextra.patch                         |   19 +++++++++
 cstream-3.0.0-configure-fix.patch                  |   19 +++++++++
 ....patch => cstream-3.0.0-double-assignment.patch |    0
 cstream-3.0.0-meh.patch                            |   14 +++++++
 cstream.spec                                       |   11 ++++-
 sources                                            |    2 +-
 8 files changed, 63 insertions(+), 43 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f31714e..5786b93 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 cstream-2.7.6.tar.gz
+/cstream-3.0.0.tar.gz
diff --git a/cstream-3.0.0-Wextra.patch b/cstream-3.0.0-Wextra.patch
new file mode 100644
index 0000000..42d6d89
--- /dev/null
+++ b/cstream-3.0.0-Wextra.patch
@@ -0,0 +1,19 @@
+--- 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 <sys/soundcard.h>
++#include <sys/ioctl.h>
+ #define WANT_SOUND 1
+ #else
+ #ifdef HAVE_LINUX_SOUNDCARD_H
+@@ -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-3.0.0-configure-fix.patch b/cstream-3.0.0-configure-fix.patch
new file mode 100644
index 0000000..0a08d38
--- /dev/null
+++ b/cstream-3.0.0-configure-fix.patch
@@ -0,0 +1,19 @@
+--- cstream-3.0.0/configure	2011-06-05 13:51:55.000000000 +0200
++++ cstream-3.0.0/configure.fixed	2011-09-12 12:37:54.496467933 +0200
+@@ -1,16 +1,4 @@
+ #! /bin/sh
+-
+-if [ ! $CFLAGS ] ; then
+-    CFLAGS="-g -O"
+-fi
+-
+-#! /bin/sh
+-
+-if [ ! $CFLAGS ] ; then
+-    CFLAGS="-g -O"
+-fi
+-
+-#! /bin/sh
+ # Guess values for system-dependent variables and create Makefiles.
+ # Generated by GNU Autoconf 2.65.
+ #
diff --git a/cstream-2.7.6-double-assignment.patch b/cstream-3.0.0-double-assignment.patch
similarity index 100%
rename from cstream-2.7.6-double-assignment.patch
rename to cstream-3.0.0-double-assignment.patch
diff --git a/cstream-3.0.0-meh.patch b/cstream-3.0.0-meh.patch
new file mode 100644
index 0000000..1f01efe
--- /dev/null
+++ b/cstream-3.0.0-meh.patch
@@ -0,0 +1,14 @@
+--- cstream-3.0.0/cstream.c	2011-09-12 12:38:46.535528045 +0200
++++ cstream-3.0.0/cstream.c.fixed	2011-09-12 12:40:31.389644368 +0200
+@@ -278,7 +278,10 @@
+ static void
+ sighup(int signal)
+ {
+-  int meh = write(2, "SIGHUP\n", sizeof("SIGHUP\n") - 1);
++  ssize_t meh = write(2, "SIGHUP\n", sizeof("SIGHUP\n") - 1);
++  if (meh != sizeof("SIGHUP\n")) {
++    /* ignore write error */
++  }
+   n_sighups++;
+ }
+ 
diff --git a/cstream.spec b/cstream.spec
index cfe73f3..777776d 100644
--- a/cstream.spec
+++ b/cstream.spec
@@ -1,7 +1,7 @@
 Summary:   General-purpose stream-handling tool
 Name:      cstream
-Version:   2.7.6
-Release:   5%{?dist}
+Version:   3.0.0
+Release:   1%{?dist}
 
 Group:     Applications/System
 License:   MIT
@@ -9,6 +9,8 @@ URL:       http://www.cons.org/cracauer/cstream.html
 Source:    http://www.cons.org/cracauer/download/%{name}-%{version}.tar.gz
 Patch2:    %{name}-%{version}-Wextra.patch
 Patch3:    %{name}-%{version}-double-assignment.patch
+Patch4:    %{name}-%{version}-configure-fix.patch
+Patch5:    %{name}-%{version}-meh.patch
 
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -26,6 +28,8 @@ Data limits and throughput rate calculation will work for files > 4 GB.
 %setup -q
 %patch2 -p1 -b .Wextra
 %patch3 -p1 -b .double-assignment
+%patch4 -p1 -b .configure-fix
+%patch5 -p1 -b .meh
 
 
 %build
@@ -54,6 +58,9 @@ Data limits and throughput rate calculation will work for files > 4 GB.
 
 
 %changelog
+* Mon Sep 12 2011 Hans Ulrich Niedermann <hun at n-dimensional.de> - 3.0.0-1
+- Update to cstream-3.0.0 (IPv6 and small fixes)
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.7.6-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/sources b/sources
index 318cb7f..32824f3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8815126c63aa7034197effb1544a1ccc  cstream-2.7.6.tar.gz
+00e9d6932051bd744d61972c7a38c3d7  cstream-3.0.0.tar.gz