From 1c79d9fc0f6333c38d59b6a8351b2164b4ef1e32 Mon Sep 17 00:00:00 2001
From: Petr Šabata <contyk@redhat.com>
Date: Mar 15 2013 09:33:17 +0000
Subject: Mention the "up" argument in documentation and help outputs (#907468)


---

diff --git a/iproute.spec b/iproute.spec
index 1367f37..ad39aa9 100644
--- a/iproute.spec
+++ b/iproute.spec
@@ -2,7 +2,7 @@
 Summary:            Advanced IP routing and network device configuration tools
 Name:               iproute
 Version:            3.8.0
-Release:            2%{?dist}
+Release:            3%{?dist}
 Group:              Applications/System
 URL:                http://kernel.org/pub/linux/utils/net/%{name}2/
 Source0:            http://kernel.org/pub/linux/utils/net/%{name}2/%{name}2-%{version}.tar.gz
@@ -18,6 +18,7 @@ Patch6:             iproute2-2.6.35-print-route.patch
 Patch7:             iproute2-2.6.39-create-peer-veth-without-a-name.patch
 Patch8:             iproute2-2.6.39-lnstat-dump-to-stdout.patch
 Patch9:             iproute2-3.8.0-unused-result.patch
+Patch10:            iproute2-3.8.0-up.patch
 License:            GPLv2+ and Public Domain
 BuildRequires:      tex(latex) tex(dvips) tex(ecrm1000.tfm) tex(cm-super-t1.enc) linuxdoc-tools
 BuildRequires:      flex linux-atm-libs-devel psutils libdb-devel bison
@@ -63,6 +64,7 @@ sed -i "s/_VERSION_/%{version}/" man/man8/ss.8
 %patch7 -p1 -b .peer-veth-without-name
 %patch8 -p1 -b .lnstat-dump-to-stdout
 %patch9 -p1 -b .unused-result
+%patch10 -p1 -b .up
 
 %build
 export LIBDIR=/%{_libdir}
@@ -172,6 +174,9 @@ done
 %{_includedir}/libnetlink.h
 
 %changelog
+* Tue Mar 12 2013 Petr Šabata <contyk@redhat.com> - 3.8.0-3
+- Mention the "up" argument in documentation and help outputs (#907468)
+
 * Mon Mar 04 2013 Petr Šabata <contyk@redhat.com> - 3.8.0-2
 - Bump for 1.4.18 rebuild
 
diff --git a/iproute2-3.8.0-up.patch b/iproute2-3.8.0-up.patch
new file mode 100644
index 0000000..a1b86c5
--- /dev/null
+++ b/iproute2-3.8.0-up.patch
@@ -0,0 +1,41 @@
+diff --git a/ip/ipaddress.c b/ip/ipaddress.c
+index cff503f..54c394b 100644
+--- a/ip/ipaddress.c
++++ b/ip/ipaddress.c
+@@ -71,7 +71,7 @@ static void usage(void)
+ 	fprintf(stderr, "                                                      [ CONFFLAG-LIST ]\n");
+ 	fprintf(stderr, "       ip addr del IFADDR dev STRING\n");
+ 	fprintf(stderr, "       ip addr {show|save|flush} [ dev STRING ] [ scope SCOPE-ID ]\n");
+-	fprintf(stderr, "                            [ to PREFIX ] [ FLAG-LIST ] [ label PATTERN ]\n");
++	fprintf(stderr, "                            [ to PREFIX ] [ FLAG-LIST ] [ label PATTERN ] [up]\n");
+ 	fprintf(stderr, "       ip addr {showdump|restore}\n");
+ 	fprintf(stderr, "IFADDR := PREFIX | ADDR peer PREFIX\n");
+ 	fprintf(stderr, "          [ broadcast ADDR ] [ anycast ADDR ]\n");
+diff --git a/ip/iplink.c b/ip/iplink.c
+index ad33611..5c7b43c 100644
+--- a/ip/iplink.c
++++ b/ip/iplink.c
+@@ -79,7 +79,7 @@ void iplink_usage(void)
+ 	fprintf(stderr, "				   [ spoofchk { on | off} ] ] \n");
+ 	fprintf(stderr, "			  [ master DEVICE ]\n");
+ 	fprintf(stderr, "			  [ nomaster ]\n");
+-	fprintf(stderr, "       ip link show [ DEVICE | group GROUP ]\n");
++	fprintf(stderr, "       ip link show [ DEVICE | group GROUP ] [up]\n");
+ 
+ 	if (iplink_have_newlink()) {
+ 		fprintf(stderr, "\n");
+diff --git a/man/man8/ip-address.8.in b/man/man8/ip-address.8.in
+index 63bf9cb..b9c996d 100644
+--- a/man/man8/ip-address.8.in
++++ b/man/man8/ip-address.8.in
+@@ -163,6 +163,10 @@ only list addresses with labels matching the
+ is a usual shell style pattern.
+ 
+ .TP
++.B up
++only display running interfaces.
++
++.TP
+ .BR dynamic " and " permanent
+ (IPv6 only) only list addresses installed due to stateless
+ address configuration or only list permanent (not dynamic)