[firehol] Removed the special characters from the IANA script.

[Jussi Lehtola]

commit a8189665a69b58887576d4c599503bfafece80ff
Author: Jussi Lehtola <jussilehtola at fedoraproject.org>
Date:   Tue Oct 2 23:21:18 2012 +0300

    Removed the special characters from the IANA script.

 firehol-1.273-getiana.patch |   22 +++++++++++-----------
 firehol.spec                |    5 ++++-
 2 files changed, 15 insertions(+), 12 deletions(-)
---
diff --git a/firehol-1.273-getiana.patch b/firehol-1.273-getiana.patch
index 244b2a6..7426d6e 100644
--- a/firehol-1.273-getiana.patch
+++ b/firehol-1.273-getiana.patch
@@ -1,6 +1,6 @@
-diff -up firehol-1.273/get-iana.sh.orig firehol-1.273/get-iana.sh
---- firehol-1.273/get-iana.sh.orig	2008-07-31 04:23:40.000000000 +0300
-+++ firehol-1.273/get-iana.sh	2012-10-02 19:05:33.415791583 +0300
+diff -up firehol-1.273/get-iana.sh.getiana firehol-1.273/get-iana.sh
+--- firehol-1.273/get-iana.sh.getiana	2008-07-31 04:23:40.000000000 +0300
++++ firehol-1.273/get-iana.sh	2012-10-02 23:19:14.515926448 +0300
 @@ -1,15 +1,18 @@
  #!/bin/bash
  
@@ -47,7 +47,7 @@ diff -up firehol-1.273/get-iana.sh.orig firehol-1.273/get-iana.sh
  #
 -# The supplied get-iana.sh uses 'aggregate-flim' if it finds it in the path.
 -# (aggregate-flim is the name of this program when installed on Gentoo)
-+# The supplied get-iana.sh uses ‘aggregate’ if it finds it in the path.
++# The supplied get-iana.sh uses 'aggregate' if it finds it in the path.
 +# (aggregate is the name of this program when installed on Gentoo)
  #
 -# Revision 1.5  2003/08/23 23:26:50  ktsaou
@@ -93,7 +93,7 @@ diff -up firehol-1.273/get-iana.sh.orig firehol-1.273/get-iana.sh
 +echo >&2
 +echo >&2
 +echo >&2 "WARNING"
-+echo >&2 "Please install ‘aggregate’ to shrink the list of IPs."
++echo >&2 "Please install 'aggregate' to shrink the list of IPs."
 +echo >&2
 +echo >&2
  fi
@@ -107,10 +107,10 @@ diff -up firehol-1.273/get-iana.sh.orig firehol-1.273/get-iana.sh
 -	egrep "^[0-9]+/[0-9]+.*${IANA_RESERVED}"	|\
 -	egrep -vi "${IANA_IGNORE}"			|\
 -	cut -d ' ' -f 1					|\
-+wget -O – –proxy=off "${IPV4_ADDRESS_SPACE_URL}"	|\
++wget -O - -proxy=off "${IPV4_ADDRESS_SPACE_URL}"	|\
 +egrep " *[0-9]+/[0-9]+.*${IANA_RESERVED}"	|\
 +egrep -vi "${IANA_IGNORE}"	 |\
-+sed -e ‘s:^ *\([0-9]*/[0-9]*\).*:\1:’	 |\
++sed -e 's:^ *\([0-9]*/[0-9]*\).*:\1:'	 |\
  (
 -	
 -	while IFS="/" read range net
@@ -143,9 +143,9 @@ diff -up firehol-1.273/get-iana.sh.orig firehol-1.273/get-iana.sh
 +continue
 +fi
 +
-+first=`echo $range | cut -d ‘-’ -f 1`
++first=`echo $range | cut -d '-' -f 1`
 +first=`expr $first + 0`
-+last=`echo $range | cut -d ‘-’ -f 2`
++last=`echo $range | cut -d '-' -f 2`
 +last=`expr $last + 0`
 +
 +x=$first
@@ -260,7 +260,7 @@ diff -up firehol-1.273/get-iana.sh.orig firehol-1.273/get-iana.sh
 +case "${x}" in
 +yes)	cp -f /etc/firehol/RESERVED_IPS /etc/firehol/RESERVED_IPS.old 2>/dev/null
 +cat "${tempfile}" >/etc/firehol/RESERVED_IPS || exit 1
-+echo >&2 "New RESERVED_IPS written to ‘/etc/firehol/RESERVED_IPS’."
++echo >&2 "New RESERVED_IPS written to '/etc/firehol/RESERVED_IPS'."
 +break
 +;;
 +
@@ -269,7 +269,7 @@ diff -up firehol-1.273/get-iana.sh.orig firehol-1.273/get-iana.sh
 +break
 +;;
 +
-+*)	echo >&2 "Cannot understand ‘${x}’."
++*)	echo >&2 "Cannot understand '${x}'."
 +;;
 +esac
  done
diff --git a/firehol.spec b/firehol.spec
index 5548683..9b12e1f 100644
--- a/firehol.spec
+++ b/firehol.spec
@@ -1,7 +1,7 @@
 Summary:	A powerful yet easy to use iptables frontend
 Name:		firehol
 Version:	1.273
-Release:	10%{?dist}
+Release:	10.1%{?dist}
 License:	GPLv2+
 Group:		Applications/Internet
 Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
@@ -107,6 +107,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Oct 02 2012 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.273-10.1
+- Removed the special characters from the IANA script.
+
 * Tue Oct 02 2012 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.273-10
 - Updated get-iana.sh script (BZ #861799).