rpms/nc/devel nc-gcc_signess.patch,NONE,1.1 nc.spec,1.22,1.23

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Wed Jan 25 10:12:02 UTC 2006


Author: rvokal

Update of /cvs/dist/rpms/nc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27307

Modified Files:
	nc.spec 
Added Files:
	nc-gcc_signess.patch 
Log Message:
- warnings cleaned-up, compile with -Werror

nc-gcc_signess.patch:
 socks.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

--- NEW FILE nc-gcc_signess.patch ---
--- nc/socks.c.gcc	2005-11-18 11:24:04.000000000 +0100
+++ nc/socks.c	2006-01-25 11:04:12.000000000 +0100
@@ -238,17 +238,17 @@
 
 		/* Try to be sane about numeric IPv6 addresses */
 		if (strchr(host, ':') != NULL) {
-			r = snprintf(buf, sizeof(buf),
+			r = snprintf((char*)buf, sizeof(buf),
 			    "CONNECT [%s]:%d HTTP/1.0\r\n\r\n",
 			    host, ntohs(serverport));
 		} else {
-			r = snprintf(buf, sizeof(buf),
+			r = snprintf((char*)buf, sizeof(buf),
 			    "CONNECT %s:%d HTTP/1.0\r\n\r\n",
 			    host, ntohs(serverport));
 		}
 		if (r == -1 || (size_t)r >= sizeof(buf))
 			errx(1, "hostname too long");
-		r = strlen(buf);
+		r = strlen((char*)buf);
 
 		cnt = atomicio(vwrite, proxyfd, buf, r);
 		if (cnt != r)
@@ -256,8 +256,8 @@
 
 		/* Read reply */
 		for (r = 0; r < HTTP_MAXHDRS; r++) {
-			proxy_read_line(proxyfd, buf, sizeof(buf));
-			if (r == 0 && strncmp(buf, "HTTP/1.0 200 ", 12) != 0)
+			proxy_read_line(proxyfd, (char*)buf, sizeof(buf));
+			if (r == 0 && strncmp((char*)buf, "HTTP/1.0 200 ", 12) != 0)
 				errx(1, "Proxy error: \"%s\"", buf);
 			/* Discard headers until we hit an empty line */
 			if (*buf == '\0')


Index: nc.spec
===================================================================
RCS file: /cvs/dist/rpms/nc/devel/nc.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- nc.spec	9 Dec 2005 22:42:18 -0000	1.22
+++ nc.spec	25 Jan 2006 10:11:59 -0000	1.23
@@ -1,12 +1,13 @@
 Summary: Reads and writes data across network connections using TCP or UDP.
 Name: nc
 Version: 1.84
-Release: 2.1
+Release: 3
 URL:	 http://www.openbsd.org/cgi-bin/cvsweb/src/usr.bin/nc/
 Source0: nc-%{version}.tar.bz2
 Patch0: nc-1.84-glib.patch
 Patch1: nc-1.78-pollhup.patch
 Patch2: nc-1.82-reuseaddr.patch
+Patch3: nc-gcc_signess.patch
 License: GPL
 Group: Applications/Internet
 BuildRoot: %{_tmppath}/%{name}-root
@@ -31,9 +32,10 @@
 %patch0 -p1 -b .glib
 %patch1 -p1 -b .pollhup
 %patch2 -p1 -b .reuseaddr
+%patch3 -p1 -b .gcc
 
 %build
-gcc $RPM_OPT_FLAGS `pkg-config --cflags --libs glib-2.0` netcat.c atomicio.c socks.c -o nc
+gcc $RPM_OPT_FLAGS -Werror `pkg-config --cflags --libs glib-2.0` netcat.c atomicio.c socks.c -o nc
 
 %install
 rm -rf ${RPM_BUILD_ROOT}
@@ -52,6 +54,9 @@
 %doc README scripts
 
 %changelog
+* Wed Jan 25 2006 Radek Vokal <rvokal at redhat.com> 1.84-3
+- warnings cleaned-up, compile with -Werror
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 




More information about the fedora-cvs-commits mailing list