commit d39d9143422795e959d76f2c0711f4ae231f082c
Author: Jan Rękorajski <[email protected]>
Date: Sat Dec 7 14:46:43 2013 +0100
- fix format string errors
- fix build with texinf 5
- rel 32
cvs-nserver-info.patch | 12 ++++++++++++
cvs-nserver.spec | 4 +++-
format-security.patch | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 67 insertions(+), 1 deletion(-)
---
diff --git a/cvs-nserver.spec b/cvs-nserver.spec
index 7d983d5..eba3038 100644
--- a/cvs-nserver.spec
+++ b/cvs-nserver.spec
@@ -9,7 +9,7 @@ Summary(pl.UTF-8): Concurrent Versions System - nserver
Summary(tr.UTF-8): Sürüm denetim sistemi - nserver
Name: cvs-nserver
Version: 1.11.1.52
-Release: 31
+Release: 32
License: GPL
Group: Development/Version Control
Source0: http://dl.sourceforge.net/cvs-nserver/%{name}-%{version}.tar.gz
@@ -38,6 +38,7 @@ Patch18: %{name}-dblshutdown.patch
Patch19: %{name}-krb5.patch
Patch20: %{name}-cvspasswd-mode.patch
Patch21: %{name}-getline.patch
+Patch22: format-security.patch
URL: http://cvs-nserver.sourceforge.net/
BuildRequires: autoconf
BuildRequires: automake
@@ -202,6 +203,7 @@ Serwer CVS - pliki nservera.
%patch19 -p1
%patch20 -p1
%patch21 -p1
+%patch22 -p1
%build
%{__aclocal}
diff --git a/cvs-nserver-info.patch b/cvs-nserver-info.patch
index 30e09ec..5cbcd40 100644
--- a/cvs-nserver-info.patch
+++ b/cvs-nserver-info.patch
@@ -28,3 +28,15 @@
@end format
@end ifinfo
+@@ -87,9 +87,9 @@
+ @sp 4
+ @comment The title is printed in a large font.
+ @center @titlefont{Version Management}
+-@sp
++@sp 1
+ @center @titlefont{with}
+-@sp
++@sp 1
+ @center @titlefont{CVS}
+ @sp 2
+ @center for @sc{cvs} @value{CVSVN}
diff --git a/format-security.patch b/format-security.patch
new file mode 100644
index 0000000..7716c2d
--- /dev/null
+++ b/format-security.patch
@@ -0,0 +1,52 @@
+--- cvs-nserver-1.11.1.52/diff/diff3.c~ 2001-05-19 14:05:15.000000000
+0200
++++ cvs-nserver-1.11.1.52/diff/diff3.c 2013-12-07 14:42:15.691191794 +0100
+@@ -1502,7 +1502,7 @@
+ line = 0;
+ do
+ {
+- printf_output (line_prefix);
++ printf_output ("%s", line_prefix);
+ cp = D_RELNUM (ptr, realfile, line);
+ length = D_RELLEN (ptr, realfile, line);
+ write_output (cp, length);
+--- cvs-nserver-1.11.1.52/src/main.c~ 2013-12-07 14:07:08.000000000 +0100
++++ cvs-nserver-1.11.1.52/src/main.c 2013-12-07 14:43:33.117857900 +0100
+@@ -1290,6 +1290,6 @@
+ {
+ (void) fprintf (stderr, *cpp++, program_name, command_name);
+ for (; *cpp; cpp++)
+- (void) fprintf (stderr, *cpp);
++ (void) fprintf (stderr, "%s", *cpp);
+ error_exit ();
+ }
+--- cvs-nserver-1.11.1.52/src/subr.c~ 2013-12-07 14:07:08.000000000 +0100
++++ cvs-nserver-1.11.1.52/src/subr.c 2013-12-07 14:44:02.061191024 +0100
+@@ -46,7 +46,7 @@
+ char buf[80];
+ sprintf (buf, "out of memory; can not allocate %lu bytes",
+ (unsigned long) bytes);
+- error (1, 0, buf);
++ error (1, 0, "%s", buf);
+ }
+ return (cp);
+ }
+@@ -73,7 +73,7 @@
+ char buf[80];
+ sprintf (buf, "out of memory; can not reallocate %lu bytes",
+ (unsigned long) bytes);
+- error (1, 0, buf);
++ error (1, 0, "%s", buf);
+ }
+ return (cp);
+ }
+--- cvs-nserver-1.11.1.52/src/http_proxy-client.c~ 2001-11-06
01:45:02.000000000 +0100
++++ cvs-nserver-1.11.1.52/src/http_proxy-client.c 2013-12-07
14:42:54.281191516 +0100
+@@ -230,7 +230,7 @@
+ }
+ fclose(f);
+ if (errstr != NULL) {
+- error(0,errcode,errstr);
++ error(0,errcode,"%s",errstr);
+ return NCLI_FAILURE;
+ }
+ }
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/cvs-nserver.git/commitdiff/d39d9143422795e959d76f2c0711f4ae231f082c
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
