Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package cvs for openSUSE:Factory checked in 
at 2022-04-30 00:44:08
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/cvs (Old)
 and      /work/SRC/openSUSE:Factory/.cvs.new.1538 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "cvs"

Sat Apr 30 00:44:08 2022 rev:35 rq:973541 version:1.12.13

Changes:
--------
--- /work/SRC/openSUSE:Factory/cvs/cvs.changes  2018-10-01 09:03:52.923972356 
+0200
+++ /work/SRC/openSUSE:Factory/.cvs.new.1538/cvs.changes        2022-04-30 
00:44:12.410882146 +0200
@@ -1,0 +2,5 @@
+Thu Apr 21 15:05:12 UTC 2022 - Dirk M??ller <dmuel...@suse.com>
+
+- add compile-with-Wformat-security.patch 
+
+-------------------------------------------------------------------

New:
----
  compile-with-Wformat-security.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ cvs.spec ++++++
--- /var/tmp/diff_new_pack.9VfKFD/_old  2022-04-30 00:44:13.266882888 +0200
+++ /var/tmp/diff_new_pack.9VfKFD/_new  2022-04-30 00:44:13.274882896 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package cvs
 #
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2022 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -12,7 +12,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
@@ -20,9 +20,9 @@
 Version:        1.12.13
 Release:        0
 Summary:        Concurrent Versions System
-License:        GPL-2.0
+License:        GPL-2.0-only
 Group:          Development/Tools/Version Control
-Url:            http://www.nongnu.org/cvs/
+URL:            https://www.nongnu.org/cvs/
 Source:         
http://ftp.gnu.org/non-gnu/%{name}/source/feature/%{version}/%{name}-%{version}.tar.bz2
 Source1:        http://www.does-not-exist.org/roessler/cvslock-0.2.tar.gz
 Source3:        cvs.sh
@@ -53,17 +53,18 @@
 Patch28:        cvs-gnulib.diff
 Patch29:        cvs-CVE-2012-0804.patch
 Patch30:        cvs-Bug-1053364-disallow-dash.patch
+Patch31:        compile-with-Wformat-security.patch
 BuildRequires:  automake
 BuildRequires:  gdbm-devel
 BuildRequires:  groff
 BuildRequires:  krb5-devel
 BuildRequires:  openssh
-Requires:       openssh
 BuildRequires:  zlib-devel
 Requires:       %{_bindir}/csh
 Requires:       /bin/mktemp
+Requires:       openssh
 Requires(post): %{install_info_prereq}
-Requires(preun): %{install_info_prereq}
+Requires(preun):%{install_info_prereq}
 
 %description
 CVS is a front-end to the rcs (Revision Control System) included in the
@@ -106,6 +107,7 @@
 %patch28
 %patch29
 %patch30 -p1
+%patch31 -p1
 
 %build
 autoreconf -fvi
@@ -117,9 +119,9 @@
 cd cvslock-*
 %configure
 cd -
-make %{?_smp_mflags}
+%make_build
 cd cvslock-*
-make %{?_smp_mflags}
+%make_build
 cd -
 
 %install
@@ -166,7 +168,6 @@
 %service_del_postun cvs.target cvs.socket
 
 %files
-%defattr(-,root,root)
 %dir %{_datadir}/%{name}
 %dir %{_datadir}/%{name}/contrib
 %config(noreplace) %{_sysconfdir}/profile.d/cvs.sh
@@ -200,9 +201,8 @@
 %{_mandir}/man8/*%{ext_man}
 
 %files doc
-%defattr(-,root,root)
 %dir %{_defaultdocdir}/%{name}
-%{_infodir}/*.info*
+%{_infodir}/*.info*%{?ext_info}
 %doc %{_datadir}/%{name}/contrib/intro.doc
 %doc %{_defaultdocdir}/%{name}/OpenSourceDevWithCVS_2E.pdf
 

++++++ compile-with-Wformat-security.patch ++++++
>From 52093add7b3f38156e632fa81fcf1c0b6ad4d549 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppi...@redhat.com>
Date: Tue, 3 Dec 2013 15:11:14 +0100
Subject: [PATCH] Pass compilation with -Wformat-security
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Petr P??sa?? <ppi...@redhat.com>
---
 diff/diff3.c |  2 +-
 src/main.c   |  2 +-
 src/subr.c   | 12 ++++--------
 3 files changed, 6 insertions(+), 10 deletions(-)

Index: cvs-1.12.13/diff/diff3.c
===================================================================
--- cvs-1.12.13.orig/diff/diff3.c
+++ cvs-1.12.13/diff/diff3.c
@@ -1503,7 +1503,7 @@ output_diff3 (diff, mapping, rev_mapping
              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);
Index: cvs-1.12.13/src/main.c
===================================================================
--- cvs-1.12.13.orig/src/main.c
+++ cvs-1.12.13/src/main.c
@@ -1459,7 +1459,7 @@ usage (register const char *const *cpp)
 {
     (void) fprintf (stderr, *cpp++, program_name, cvs_cmd_name);
     for (; *cpp; cpp++)
-       (void) fprintf (stderr, *cpp);
+       (void) fprintf (stderr, "%s", *cpp);
     exit (EXIT_FAILURE);
 }
 

Reply via email to