rpms/net-tools/F-12 net-tools-1.60-arp_man.patch, 1.1, 1.2 net-tools-1.60-metric-tunnel-man.patch, 1.1, 1.2 net-tools.spec, 1.104, 1.105 netplug-1.2.9-execshield.patch, 1.3, 1.4

[Jiří Popelka]

Author: jpopelka

Update of /cvs/pkgs/rpms/net-tools/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16376

Modified Files:
	net-tools-1.60-arp_man.patch 
	net-tools-1.60-metric-tunnel-man.patch net-tools.spec 
	netplug-1.2.9-execshield.patch 
Log Message:
* Fri Nov 13 2009  Jiri Popelka <jpopelka at redhat.com> - 1.60-99
- fixed german man page for arp (#537342)
- moved /etc/netplug/netplugd.conf to /etc/netplug.d (#231047, comment #5)
- added -fno-strict-aliasing to the compiler flags to satisfy rpmdiff


net-tools-1.60-arp_man.patch:
 de_DE/arp.8 |    8 +++-----
 en_US/arp.8 |    4 ++--
 2 files changed, 5 insertions(+), 7 deletions(-)

Index: net-tools-1.60-arp_man.patch
===================================================================
RCS file: /cvs/pkgs/rpms/net-tools/F-12/net-tools-1.60-arp_man.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- net-tools-1.60-arp_man.patch	2 May 2006 12:49:04 -0000	1.1
+++ net-tools-1.60-arp_man.patch	13 Nov 2009 16:41:53 -0000	1.2
@@ -11,3 +11,21 @@
  .BR "pub" , " temp" " and" " netmask"
  flags can be used.
  .LP
+diff -up net-tools-1.60/man/de_DE/arp.8.arp_man net-tools-1.60/man/de_DE/arp.8
+--- net-tools-1.60/man/de_DE/arp.8.arp_man	2009-11-13 09:01:59.000000000 +0100
++++ net-tools-1.60/man/de_DE/arp.8	2009-11-13 09:04:33.000000000 +0100
+@@ -120,11 +120,9 @@ Flagge) kann
+ .B Netmaske
+ f\(:ur ARP-Eintr\(:age f\(:ur ganze Subnetze angegeben werde.  Von dieser
+ Praxis wird abgeraten.  Sie wird von \(:alteren Kerneln unterst\(:utzt, da
+-sie gelegentlich n\(:utzlich ist.  Wird die
+-If the
+-.B temp
+-Flagge nicht angegeben, so werden die erzeugten Eintr\(:age nicht dauerhaft
+-in den ARP-Cache eingetragen.
++sie gelegentlich n\(:utzlich ist.
++Der Eintrag wird permanent im ARP-Cache gespeichert,
++wenn das \fBtemp\fR-Flag nicht angegeben wird.
+ .br
+ .B ANMERKUNG:
+ Ab der Kernelversion 2.2.0 ist es nicht mehr m\(:oglich ARP-Eintr\(:age f\(:ur

net-tools-1.60-metric-tunnel-man.patch:
 de_DE/ifconfig.8 |    2 +-
 en_US/ifconfig.8 |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

Index: net-tools-1.60-metric-tunnel-man.patch
===================================================================
RCS file: /cvs/pkgs/rpms/net-tools/F-12/net-tools-1.60-metric-tunnel-man.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- net-tools-1.60-metric-tunnel-man.patch	29 Sep 2008 08:48:35 -0000	1.1
+++ net-tools-1.60-metric-tunnel-man.patch	13 Nov 2009 16:41:53 -0000	1.2
@@ -1,3 +1,15 @@
+diff -up net-tools-1.60/man/de_DE/ifconfig.8.metric-tunnel-man net-tools-1.60/man/de_DE/ifconfig.8
+--- net-tools-1.60/man/de_DE/ifconfig.8.metric-tunnel-man	2009-11-13 11:05:18.000000000 +0100
++++ net-tools-1.60/man/de_DE/ifconfig.8	2009-11-13 13:20:40.000000000 +0100
+@@ -98,7 +98,7 @@ F\(:ugt der Schnittstelle eine IPv6-Adre
+ .B "del addr/prefixlen"
+ Entfernt eine IPv6-Adresse von der Schnittstelle.
+ .TP
+-.B "tunnel aa.bb.cc.dd"
++.B "tunnel ::aa.bb.cc.dd"
+ Erzeugt ein neues SIT (IPv6-in-IPv4) Ger\(:at, das Pakete zum angegebenen
+ Ziel tunnelt.
+ .TP
 diff -up net-tools-1.60/man/en_US/ifconfig.8.metric-tunnel-man net-tools-1.60/man/en_US/ifconfig.8
 --- net-tools-1.60/man/en_US/ifconfig.8.metric-tunnel-man	2008-09-18 09:20:49.000000000 +0200
 +++ net-tools-1.60/man/en_US/ifconfig.8	2008-09-18 09:26:41.000000000 +0200


Index: net-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/net-tools/F-12/net-tools.spec,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -p -r1.104 -r1.105
--- net-tools.spec	10 Nov 2009 14:47:02 -0000	1.104
+++ net-tools.spec	13 Nov 2009 16:41:53 -0000	1.105
@@ -3,7 +3,7 @@
 Summary: Basic networking tools
 Name: net-tools
 Version: 1.60
-Release: 98%{?dist}
+Release: 99%{?dist}
 License: GPL+
 Group: System Environment/Base
 URL: http://net-tools.berlios.de/
@@ -242,6 +242,10 @@ iconv -f iso-8859-1 -t utf-8 -o route.tm
 iconv -f iso-8859-1 -t utf-8 -o slattach.tmp man/de_DE/slattach.8 && mv slattach.tmp man/de_DE/slattach.8
 
 %build
+
+# code needs a lot of work before strict aliasing is safe
+export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
+
 export CFLAGS="$RPM_OPT_FLAGS $CFLAGS"
 
 make
@@ -312,13 +316,17 @@ exit 0
 %lang(de)	%{_mandir}/de/man[158]/*
 %lang(fr)	%{_mandir}/fr/man[158]/*
 %lang(pt)	%{_mandir}/pt/man[158]/*
-%dir	%{_sysconfdir}/netplug
-%config(noreplace) %{_sysconfdir}/netplug/netplugd.conf
+%config(noreplace) %{_sysconfdir}/netplug.d/netplugd.conf
 %config(noreplace) %{_sysconfdir}/ethers
 %{_sysconfdir}/netplug.d
 %{_initddir}/netplugd
 
 %changelog
+* Fri Nov 13 2009  Jiri Popelka <jpopelka at redhat.com> - 1.60-99
+- fixed german man page for arp (#537342)
+- moved /etc/netplug/netplugd.conf to /etc/netplug.d (#231047, comment #5)
+- added -fno-strict-aliasing to the compiler flags to satisfy rpmdiff
+
 * Tue Nov 10 2009  Jiri Popelka <jpopelka at redhat.com> - 1.60-98
 - fix init script to be LSB-compliant (#522888)
 

netplug-1.2.9-execshield.patch:
 Makefile  |    6 +++---
 if_info.c |   27 +++++++++++++--------------
 main.c    |   58 +++++++++++++++++++++++++++++-----------------------------
 netplug.h |    2 +-
 4 files changed, 46 insertions(+), 47 deletions(-)

Index: netplug-1.2.9-execshield.patch
===================================================================
RCS file: /cvs/pkgs/rpms/net-tools/F-12/netplug-1.2.9-execshield.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- netplug-1.2.9-execshield.patch	28 Feb 2005 12:51:19 -0000	1.3
+++ netplug-1.2.9-execshield.patch	13 Nov 2009 16:41:53 -0000	1.4
@@ -65,7 +65,15 @@
  void ifsm_flagchange(struct if_info *info, unsigned int newflags);
 --- net-tools-1.60/netplug-1.2.9/Makefile.execshield	2005-02-28 14:43:05.000000000 +0100
 +++ net-tools-1.60/netplug-1.2.9/Makefile	2005-02-28 14:47:42.123760800 +0100
-@@ -9,8 +9,8 @@
+@@ -2,15 +2,15 @@ version := $(shell awk '/define version/
+ 
+ prefix ?=
+ bindir ?= $(prefix)/sbin
+-etcdir ?= $(prefix)/etc/netplug
++etcdir ?= $(prefix)/etc/netplug.d
+ initdir ?= $(prefix)/etc/rc.d/init.d
+ scriptdir ?= $(prefix)/etc/netplug.d
+ mandir ?= $(prefix)/usr/share/man
  
  install_opts :=