jskarvad pushed to ax25-tools (f21). "Fixed netrom nrattach (..more)"

[notifications at fedoraproject.org]

>From 2599ba3abca015f4e2cbe57d8f4f2861c1148f8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= <jskarvad at redhat.com>
Date: Tue, 7 Apr 2015 10:24:23 +0200
Subject: Fixed netrom nrattach

  Resolves: rhbz#981833
- Fixed format string build error

diff --git a/ax25-tools-0.0.10-build-fix.patch b/ax25-tools-0.0.10-build-fix.patch
new file mode 100644
index 0000000..1992a61
--- /dev/null
+++ b/ax25-tools-0.0.10-build-fix.patch
@@ -0,0 +1,61 @@
+diff --git a/tcpip/rip98d.c b/tcpip/rip98d.c
+index e40f21b..a672451 100644
+--- a/tcpip/rip98d.c
++++ b/tcpip/rip98d.c
+@@ -32,9 +32,9 @@ struct dest_struct dest_list[50];
+ 
+ int dest_count = 0;
+ 
+-int debug      = FALSE;
+-int restrict   = FALSE;
+-int logging    = FALSE;
++int debug         = FALSE;
++int rip_restrict  = FALSE;
++int logging       = FALSE;
+ 
+ struct route_struct *first_route = NULL;
+ 
+@@ -203,7 +203,7 @@ static int read_routes(void)
+ 			continue;
+ 		}
+ 
+-		if (restrict) {
++		if (rip_restrict) {
+ 			if (inet_netof(address) != 44) {
+ 				if (debug && logging)
+ 					syslog(LOG_DEBUG, "rejecting route to %s/%ld - not ampr.org\n", inet_ntoa(address), netmask);
+@@ -286,7 +286,7 @@ int main(int argc, char **argv)
+ 				logging = TRUE;
+ 				break;
+ 			case 'r':
+-				restrict = TRUE;
++				rip_restrict = TRUE;
+ 				break; 
+ 			case 't':
+ 				interval = atoi(optarg) * 60;
+diff --git a/tcpip/rip98d.h b/tcpip/rip98d.h
+index fb00a7d..a3edadb 100644
+--- a/tcpip/rip98d.h
++++ b/tcpip/rip98d.h
+@@ -44,7 +44,7 @@ extern struct dest_struct dest_list[];
+ extern int dest_count;
+ 
+ extern int debug;
+-extern int restrict;
++extern int rip_restrict;
+ extern int logging;
+ 
+ /* In rip98d.c */
+diff --git a/tcpip/rip98r.c b/tcpip/rip98r.c
+index 25cb546..c495fc0 100644
+--- a/tcpip/rip98r.c
++++ b/tcpip/rip98r.c
+@@ -127,7 +127,7 @@ void receive_routes(int s)
+ 			continue;
+ 		}
+ 
+-		if (restrict) {
++		if (rip_restrict) {
+ 			if (network != 44) {
+ 				if (debug && logging)
+ 					syslog(LOG_DEBUG, "    route to %s/%d metric %d - rejected\n", inet_ntoa(addr), bits, metric);
diff --git a/ax25-tools-0.0.10-nrattach-fix.patch b/ax25-tools-0.0.10-nrattach-fix.patch
new file mode 100644
index 0000000..9a6efea
--- /dev/null
+++ b/ax25-tools-0.0.10-nrattach-fix.patch
@@ -0,0 +1,15 @@
+diff --git a/netrom/nrattach.c b/netrom/nrattach.c
+index bd6cb58..c3a9e63 100644
+--- a/netrom/nrattach.c
++++ b/netrom/nrattach.c
+@@ -247,10 +247,8 @@ int main(int argc, char *argv[])
+ 		return 1;
+ 	}
+ 	
+-#ifdef	notdef
+ 	if (!startiface(dev, hp))
+ 		return 1;		
+-#endif
+ 
+ 	printf("NET/ROM port %s bound to device %s\n", argv[optind], dev);
+ 		
diff --git a/ax25-tools.spec b/ax25-tools.spec
old mode 100755
new mode 100644
index 3613572..3be2632
--- a/ax25-tools.spec
+++ b/ax25-tools.spec
@@ -1,6 +1,6 @@
 Name:		ax25-tools
 Version:	0.0.10
-Release:	0.10.rc2%{?dist}
+Release:	0.11.rc2%{?dist}
 Summary:	Tools used to configure an ax.25 enabled computer
 Group:		Applications/Communications
 License:	GPLv2+
@@ -17,6 +17,8 @@ Source5:	xfsmmixer.desktop
 Source6:	%{name}.png
 
 Patch0:		ax25-tools-0.0.10-format-security.patch
+Patch1:		ax25-tools-0.0.10-nrattach-fix.patch
+Patch2:		ax25-tools-0.0.10-build-fix.patch
 
 BuildRequires:	automake
 BuildRequires:	libax25-devel
@@ -99,6 +101,8 @@ ax25-tools-x
 %prep
 %setup -qn %{name}
 %patch0 -p1
+%patch1 -p1 -b .nrattach-fix
+%patch2 -p1 -b .build-fix
 
 %build
 autoreconf -fiv
@@ -144,6 +148,11 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}/
 %{_mandir}/man?/*
 
 %changelog
+* Tue Apr  7 2015 Jaroslav Škarvada <jskarvad at redhat.com> - 0.0.10-0.11.rc2
+- Fixed netrom nrattach
+  Resolves: rhbz#981833
+- Fixed format string build error
+
 * Thu Feb 19 2015 Rex Dieter <rdieter at fedoraproject.org> 0.0.10-0.10.rc2
 - rebuild (fltk)
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/ax25-tools.git/commit/?h=f21&id=2599ba3abca015f4e2cbe57d8f4f2861c1148f8e