From 237a92cb2f187ed2f4e9a9b6004b7dfed5269b73744db8d5bd6531b53fcd2db6 Mon Sep 17 00:00:00 2001
From: OBS User unknown <null@suse.de>
Date: Wed, 9 May 2007 13:14:51 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/openSUSE:Factory/iptables?expand=0&rev=4

---
 iptables-1.3.7-newlines.diff | 58 ++++++++++++++++++++++++++++++++++++
 iptables.changes             |  5 ++++
 iptables.spec                | 24 ++++++++-------
 3 files changed, 77 insertions(+), 10 deletions(-)
 create mode 100644 iptables-1.3.7-newlines.diff

diff --git a/iptables-1.3.7-newlines.diff b/iptables-1.3.7-newlines.diff
new file mode 100644
index 0000000..75e11b4
--- /dev/null
+++ b/iptables-1.3.7-newlines.diff
@@ -0,0 +1,58 @@
+--- ip6tables-restore.c
++++ ip6tables-restore.c
+@@ -156,13 +156,13 @@
+ 	if (optind == argc - 1) {
+ 		in = fopen(argv[optind], "r");
+ 		if (!in) {
+-			fprintf(stderr, "Can't open %s: %s", argv[optind],
++			fprintf(stderr, "Can't open %s: %s\n", argv[optind],
+ 				strerror(errno));
+ 			exit(1);
+ 		}
+ 	}
+ 	else if (optind < argc) {
+-		fprintf(stderr, "Unknown arguments found on commandline");
++		fprintf(stderr, "Unknown arguments found on commandline\n");
+ 		exit(1);
+ 	}
+ 	else in = stdin;
+--- ip6tables-save.c
++++ ip6tables-save.c
+@@ -351,7 +351,7 @@
+ 	}
+ 
+ 	if (optind < argc) {
+-		fprintf(stderr, "Unknown arguments found on commandline");
++		fprintf(stderr, "Unknown arguments found on commandline\n");
+ 		exit(1);
+ 	}
+ 
+--- iptables-restore.c
++++ iptables-restore.c
+@@ -159,13 +159,13 @@
+ 	if (optind == argc - 1) {
+ 		in = fopen(argv[optind], "r");
+ 		if (!in) {
+-			fprintf(stderr, "Can't open %s: %s", argv[optind],
++			fprintf(stderr, "Can't open %s: %s\n", argv[optind],
+ 				strerror(errno));
+ 			exit(1);
+ 		}
+ 	}
+ 	else if (optind < argc) {
+-		fprintf(stderr, "Unknown arguments found on commandline");
++		fprintf(stderr, "Unknown arguments found on commandline\n");
+ 		exit(1);
+ 	}
+ 	else in = stdin;
+--- iptables-save.c
++++ iptables-save.c
+@@ -368,7 +368,7 @@
+ 	}
+ 
+ 	if (optind < argc) {
+-		fprintf(stderr, "Unknown arguments found on commandline");
++		fprintf(stderr, "Unknown arguments found on commandline\n");
+ 		exit(1);
+ 	}
+ 
diff --git a/iptables.changes b/iptables.changes
index 6ce26f0..376eb43 100644
--- a/iptables.changes
+++ b/iptables.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed May  9 13:39:08 CEST 2007 - prusnak@suse.cz
+
+- added newlines to error messages (newlines.diff) [#271847]
+
 -------------------------------------------------------------------
 Tue Mar 13 14:08:25 CET 2007 - prusnak@suse.cz
 
diff --git a/iptables.spec b/iptables.spec
index fcd5fe3..991b038 100644
--- a/iptables.spec
+++ b/iptables.spec
@@ -16,15 +16,16 @@ License:        GNU General Public License (GPL)
 Group:          Productivity/Networking/Security
 Autoreqprov:    on
 Version:        1.3.7
-Release:        10
+Release:        21
 Summary:        IP Packet Filter Administration
 Source0:        %{name}-%{version}.tar.bz2
 Source1:        %{name}-%{version}-debian-docs.tar.bz2
-Patch2:         %{name}-%{version}-makefile.diff
-Patch20:        %{name}-%{version}-batch.diff
-Patch21:        %{name}-%{version}-strict-aliasing-fix.diff
-Patch22:        %{name}-%{version}-shlibs.diff
-Patch23:        %{name}-%{version}-extensions.diff
+Patch0:         %{name}-%{version}-makefile.diff
+Patch1:         %{name}-%{version}-batch.diff
+Patch2:         %{name}-%{version}-strict-aliasing-fix.diff
+Patch3:         %{name}-%{version}-shlibs.diff
+Patch4:         %{name}-%{version}-extensions.diff
+Patch5:         %{name}-%{version}-newlines.diff
 URL:            http://www.iptables.org
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
@@ -56,11 +57,12 @@ Authors:
 
 %prep
 %setup -q -a 1
+%patch0
+%patch1
 %patch2
-%patch20
-%patch21
-%patch22
-%patch23
+%patch3
+%patch4
+%patch5
 chmod +x extensions/.CLUSTERIP-test
 
 %build
@@ -103,6 +105,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_prefix}/include/*
 
 %changelog
+* Wed May 09 2007 - prusnak@suse.cz
+- added newlines to error messages (newlines.diff) [#271847]
 * Tue Mar 13 2007 - prusnak@suse.cz
 - added initial setting of KERNEL_DIR variable in %%install section of spec file
 * Tue Jan 09 2007 - prusnak@suse.cz