Attachment 910902 Details for Bug 1105990 – Patch for rawhide

[patch] Patch for rawhide

0001-Fix-FTBFS-with-automake-1.14-and-Werror-format-secur.patch (text/plain), 4.81 KB, created by Yaakov Selkowitz on 2014-06-20 21:25:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yaakov Selkowitz

Created: 2014-06-20 21:25:24 UTC

Size: 4.81 KB

patch

obsolete

>From 56b653a6ab95830444eec022f8343ec66cfc4928 Mon Sep 17 00:00:00 2001
>From: Yaakov Selkowitz <yselkowi@redhat.com>
>Date: Fri, 20 Jun 2014 16:24:51 -0500
>Subject: [PATCH] Fix FTBFS with automake-1.14 and -Werror=format-security
> (#1105990)
>
>---
> ax25-tools-0.0.10-format-security.patch | 57 +++++++++++++++++++++++++++++++++
> ax25-tools.spec                         | 18 +++++------
> 2 files changed, 65 insertions(+), 10 deletions(-)
> create mode 100644 ax25-tools-0.0.10-format-security.patch
>
>diff --git a/ax25-tools-0.0.10-format-security.patch b/ax25-tools-0.0.10-format-security.patch
>new file mode 100644
>index 0000000..1451a7a
>--- /dev/null
>+++ b/ax25-tools-0.0.10-format-security.patch
>@@ -0,0 +1,57 @@
>+--- a/6pack/m6pack.c
>++++ b/6pack/m6pack.c
>+@@ -112,7 +112,7 @@ static __u8 obuf[SIZE];	/* buffer for sixpack_tx() */
>+ 
>+ static int invalid_ports = 0;
>+ 
>+-static char *usage_string = "usage: m6pack [-l] [-s speed] [-x num_ptmx_devices] [-v] tyinterface pty ..\n";
>++static const char usage_string[] = "usage: m6pack [-l] [-s speed] [-x num_ptmx_devices] [-v] tyinterface pty ..\n";
>+ 
>+ static int dump_report = FALSE;
>+ static int logging = FALSE;
>+--- a/ax25/axparms.c
>++++ b/ax25/axparms.c
>+@@ -147,7 +147,7 @@ PROC_AX25_ROUTE_FILE);
>+ 			return 1;
>+ 		}
>+ 		while (fgets(routebuf,80,fp))
>+-			printf(routebuf);
>++			printf("%s", routebuf);
>+ 		puts("");
>+ 	}
>+ 
>+--- a/kiss/mkiss.c
>++++ b/kiss/mkiss.c
>+@@ -82,7 +82,7 @@ static int crc_errors		= 0;
>+ static int invalid_ports	= 0;
>+ static int return_polls		= 0;
>+ 
>+-static char *usage_string	= "usage: mkiss [-p interval] [-c] [-f] [-h] [-l] [-s speed] [-v] [-x <num_ptmx_devices>] ttyinterface pty ..\n";
>++static const char usage_string[]	= "usage: mkiss [-p interval] [-c] [-f] [-h] [-l] [-s speed] [-v] [-x <num_ptmx_devices>] ttyinterface pty ..\n";
>+ 
>+ static int dump_report		= FALSE;
>+ 
>+--- a/netrom/nrparms.c
>++++ b/netrom/nrparms.c
>+@@ -30,8 +30,8 @@
>+ #include <netax25/axconfig.h>
>+ #include <netax25/nrconfig.h>
>+ 
>+-char nodes_usage[]  = "usage: nrparms -nodes nodecall +|- ident quality count port neighbour [digicall...]\n";
>+-char routes_usage[] = "usage: nrparms -routes port nodecall [digicall...] +|- pathquality\n";
>++static const char nodes_usage[]  = "usage: nrparms -nodes nodecall +|- ident quality count port neighbour [digicall...]\n";
>++static const char routes_usage[] = "usage: nrparms -routes port nodecall [digicall...] +|- pathquality\n";
>+ 
>+ void nodes(int s, char *nodecall, char *op, char *ident, int quality, int count, char *port, char *neighbour, char *digis[])
>+ {
>+--- a/rose/rsparms.c
>++++ b/rose/rsparms.c
>+@@ -27,7 +27,7 @@
>+ 
>+ #include "../pathnames.h"
>+ 
>+-char nodes_usage[]  = "usage: rsparms -node add|del nodeaddr[/mask] port neighbour [digis...]\n       rsparms -node list\n";
>++static const char nodes_usage[]  = "usage: rsparms -node add|del nodeaddr[/mask] port neighbour [digis...]\n       rsparms -node list\n";
>+ 
>+ /* print the Rose neighbour whose number is supplied */
>+ void printnb(char *neigh)
>diff --git a/ax25-tools.spec b/ax25-tools.spec
>index efdde5c..27fa110 100755
>--- a/ax25-tools.spec
>+++ b/ax25-tools.spec
>@@ -1,6 +1,6 @@
> Name:		ax25-tools
> Version:	0.0.10
>-Release:	0.7.rc2%{?dist}
>+Release:	0.8.rc2%{?dist}
> Summary:	Tools used to configure an ax.25 enabled computer
> Group:		Applications/Communications
> License:	GPLv2+
>@@ -16,7 +16,7 @@ Source5:	xfsmmixer.desktop
> #Temporary Icon
> Source6:	%{name}.png
> 
>-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
>+Patch0:		ax25-tools-0.0.10-format-security.patch
> 
> BuildRequires:	automake
> BuildRequires:	libax25-devel
>@@ -98,14 +98,14 @@ ax25-tools-x
> 
> %prep
> %setup -qn %{name}
>+%patch0 -p1
> 
> %build
>-autoreconf
>+autoreconf -fiv
> %configure
> make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"
> 
> %install
>-rm -rf $RPM_BUILD_ROOT
> make install DESTDIR=$RPM_BUILD_ROOT
> 
> # no upstream .desktop or icon yet so we'll use a temporary one
>@@ -126,18 +126,13 @@ desktop-file-install	\
> #don't include these twice
> rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}/
> 
>-%clean
>-rm -rf $RPM_BUILD_ROOT
>-
> %files
>-%defattr(-,root,root,-)
> %doc AUTHORS ChangeLog COPYING README
> %doc yamdrv/README.yamdrv user_call/README.user_call tcpip/ttylinkd.README dmascc/README.dmascc
> %{_bindir}/*
> %{_sbindir}/*
> 
> %files x
>-%defattr(-,root,root,-)
> %doc AUTHORS ChangeLog COPYING
> %{_bindir}/*
> %{_sbindir}/*
>@@ -145,11 +140,14 @@ rm -rf $RPM_BUILD_ROOT
> %{_datadir}/applications/*.desktop
> 
> %files docs
>-%defattr(-,root,root,-)
> %doc AUTHORS ChangeLog COPYING
> %{_mandir}/man?/*
> 
> %changelog
>+* Fri Jun 20 2014 Yaakov Selkowitz <yselkowi@redhat.com> - 0.0.10-0.8.rc2
>+- Fix FTBFS with automake-1.14 and -Werror=format-security (#1105990)
>+- Cleanup spec
>+
> * Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.0.10-0.7.rc2
> - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
> 
>-- 
>1.9.3
>

Actions: View | Diff

Attachments on bug 1105990: 903564 | 903565 | 903566 | 910902