[packages/vncsnapshot] - fix fprintf format - pass CC,CXX

adamg adamg at pld-linux.org
Fri Dec 7 12:03:51 CET 2012


commit fbc936c50a15b77f678dc3f1d839b275473e7204
Author: Adam Gołębiowski <adamg at pld-linux.org>
Date:   Fri Dec 7 12:03:37 2012 +0100

    - fix fprintf format
    - pass CC,CXX

 vncsnapshot-fprintf.patch | 86 +++++++++++++++++++++++++++++++++++++++++++++++
 vncsnapshot.spec          |  4 +++
 2 files changed, 90 insertions(+)
---
diff --git a/vncsnapshot.spec b/vncsnapshot.spec
index 3e8c5a7..7b1a569 100644
--- a/vncsnapshot.spec
+++ b/vncsnapshot.spec
@@ -7,6 +7,7 @@ License:	GPL
 Group:		X11/Applications/Networking
 Source0:	http://dl.sourceforge.net/vncsnapshot/%{name}-%{version}-src.tar.bz2
 # Source0-md5:	6abf3c0c5bbfde70d51fa09edfb717da
+Patch0:		%{name}-fprintf.patch
 URL:		http://vncsnapshot.sourceforge.net/
 BuildRequires:	libjpeg-devel
 BuildRequires:	libstdc++-devel
@@ -23,9 +24,12 @@ Zachowuje obraz ekranu serwera VNC w pliku JPEG.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %{__make} \
+	CC="%{__cc}" \
+	CXX="%{__cxx}" \
 	CDEBUGFLAGS="%{rpmcflags}"
 
 %install
diff --git a/vncsnapshot-fprintf.patch b/vncsnapshot-fprintf.patch
new file mode 100644
index 0000000..a046bce
--- /dev/null
+++ b/vncsnapshot-fprintf.patch
@@ -0,0 +1,86 @@
+--- vncsnapshot-1.2a/sockets.cxx.orig	2012-12-07 11:53:31.580255149 +0100
++++ vncsnapshot-1.2a/sockets.cxx	2012-12-07 11:55:16.484353354 +0100
+@@ -192,13 +192,13 @@
+ 
+   sock = socket(AF_INET, SOCK_STREAM, 0);
+   if (sock < 0) {
+-    fprintf(stderr,programName);
++    fprintf(stderr,"%s",programName);
+     perror(": ConnectToTcpAddr: socket");
+     return -1;
+   }
+ 
+   if (connect(sock, (struct sockaddr *)&addr, sizeof(addr)) < 0) {
+-    fprintf(stderr,programName);
++    fprintf(stderr,"%s",programName);
+     perror(": ConnectToTcpAddr: connect");
+     close(sock);
+     return -1;
+@@ -206,7 +206,7 @@
+ 
+   if (setsockopt(sock, IPPROTO_TCP, TCP_NODELAY,
+ 		 (char *)&one, sizeof(one)) < 0) {
+-    fprintf(stderr,programName);
++    fprintf(stderr,"%s",programName);
+     perror(": ConnectToTcpAddr: setsockopt");
+     close(sock);
+     return -1;
+@@ -233,7 +233,7 @@
+ 
+   sock = socket(AF_INET, SOCK_STREAM, 0);
+   if (sock < 0) {
+-    fprintf(stderr,programName);
++    fprintf(stderr,"%s",programName);
+     perror(": FindFreeTcpPort: socket");
+     return 0;
+   }
+@@ -268,28 +268,28 @@
+ 
+   sock = socket(AF_INET, SOCK_STREAM, 0);
+   if (sock < 0) {
+-    fprintf(stderr,programName);
++    fprintf(stderr,"%s",programName);
+     perror(": ListenAtTcpPort: socket");
+     return -1;
+   }
+ 
+   if (setsockopt(sock, SOL_SOCKET, SO_REUSEADDR,
+ 		 (const char *)&one, sizeof(one)) < 0) {
+-    fprintf(stderr,programName);
++    fprintf(stderr,"%s",programName);
+     perror(": ListenAtTcpPort: setsockopt");
+     close(sock);
+     return -1;
+   }
+ 
+   if (bind(sock, (struct sockaddr *)&addr, sizeof(addr)) < 0) {
+-    fprintf(stderr,programName);
++    fprintf(stderr,"%s",programName);
+     perror(": ListenAtTcpPort: bind");
+     close(sock);
+     return -1;
+   }
+ 
+   if (listen(sock, 5) < 0) {
+-    fprintf(stderr,programName);
++    fprintf(stderr,"%s",programName);
+     perror(": ListenAtTcpPort: listen");
+     close(sock);
+     return -1;
+@@ -312,14 +312,14 @@
+ 
+   sock = accept(listenSock, (struct sockaddr *) &addr, &addrlen);
+   if (sock < 0) {
+-    fprintf(stderr,programName);
++    fprintf(stderr,"%s",programName);
+     perror(": AcceptTcpConnection: accept");
+     return -1;
+   }
+ 
+   if (setsockopt(sock, IPPROTO_TCP, TCP_NODELAY,
+ 		 (char *)&one, sizeof(one)) < 0) {
+-    fprintf(stderr,programName);
++    fprintf(stderr,"%s",programName);
+     perror(": AcceptTcpConnection: setsockopt");
+     close(sock);
+     return -1;
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/vncsnapshot.git/commitdiff/fbc936c50a15b77f678dc3f1d839b275473e7204



More information about the pld-cvs-commit mailing list