From 5ebd6f4218e7d8ae8a467720afeeb0ed971c332e Mon Sep 17 00:00:00 2001 From: CentOS Buildsys Date: Nov 08 2013 05:57:02 +0000 Subject: import iproute-3.10.0-6.el7.src.rpm --- diff --git a/.iproute.metadata b/.iproute.metadata new file mode 100644 index 0000000..384c662 --- /dev/null +++ b/.iproute.metadata @@ -0,0 +1 @@ +a3cf3bacdd2cb6eb4eb580a2e7aa20bf7ca0ae6b SOURCES/iproute2-3.10.0.tar.gz diff --git a/README.md b/README.md deleted file mode 100644 index 0e7897f..0000000 --- a/README.md +++ /dev/null @@ -1,5 +0,0 @@ -The master branch has no content - -Look at the c7 branch if you are working with CentOS-7, or the c4/c5/c6 branch for CentOS-4, 5 or 6 - -If you find this file in a distro specific branch, it means that no content has been checked in yet diff --git a/SOURCES/avpkt b/SOURCES/avpkt new file mode 100644 index 0000000..c362b94 --- /dev/null +++ b/SOURCES/avpkt @@ -0,0 +1 @@ +AVPKT=3000 diff --git a/SOURCES/cbq-0000.example b/SOURCES/cbq-0000.example new file mode 100644 index 0000000..5503374 --- /dev/null +++ b/SOURCES/cbq-0000.example @@ -0,0 +1,5 @@ +DEVICE=eth0,10Mbit,1Mbit +RATE=128Kbit +WEIGHT=10Kbit +PRIO=5 +RULE=192.168.1.0/24 diff --git a/SOURCES/iproute2-2.6.35-print-route.patch b/SOURCES/iproute2-2.6.35-print-route.patch new file mode 100644 index 0000000..04f3cf7 --- /dev/null +++ b/SOURCES/iproute2-2.6.35-print-route.patch @@ -0,0 +1,13 @@ +diff --git a/ip/iproute.c b/ip/iproute.c +index 711576e..86c7ab7 100644 +--- a/ip/iproute.c ++++ b/ip/iproute.c +@@ -160,7 +160,7 @@ int print_route(const struct sockaddr_nl *who, struct nlmsghdr *n, void *arg) + if (r->rtm_family == AF_INET6 && table != RT_TABLE_MAIN) + ip6_multiple_tables = 1; + +- if (filter.cloned == !(r->rtm_flags&RTM_F_CLONED)) ++ if (filter.cloned && !(r->rtm_flags&RTM_F_CLONED)) + return 0; + + if (r->rtm_family == AF_INET6 && !ip6_multiple_tables) { diff --git a/SOURCES/iproute2-2.6.39-create-peer-veth-without-a-name.patch b/SOURCES/iproute2-2.6.39-create-peer-veth-without-a-name.patch new file mode 100644 index 0000000..b0ae4da --- /dev/null +++ b/SOURCES/iproute2-2.6.39-create-peer-veth-without-a-name.patch @@ -0,0 +1,13 @@ +diff --git a/ip/link_veth.c b/ip/link_veth.c +index 3d19b01..eb0f41e 100644 +--- a/ip/link_veth.c ++++ b/ip/link_veth.c +@@ -27,7 +27,7 @@ static void usage(void) + static int veth_parse_opt(struct link_util *lu, int argc, char **argv, + struct nlmsghdr *hdr) + { +- char *name, *type, *link, *dev; ++ char *name = NULL, *type = NULL, *link = NULL, *dev = NULL; + int err, len; + struct rtattr * data; + int group; diff --git a/SOURCES/iproute2-2.6.39-lnstat-dump-to-stdout.patch b/SOURCES/iproute2-2.6.39-lnstat-dump-to-stdout.patch new file mode 100644 index 0000000..a5b7b62 --- /dev/null +++ b/SOURCES/iproute2-2.6.39-lnstat-dump-to-stdout.patch @@ -0,0 +1,13 @@ +diff --git a/misc/lnstat.c b/misc/lnstat.c +index 32ab6a4..431bfc7 100644 +--- a/misc/lnstat.c ++++ b/misc/lnstat.c +@@ -322,7 +322,7 @@ int main(int argc, char **argv) + int i; + struct table_hdr *header; + case MODE_DUMP: +- lnstat_dump(stderr, lnstat_files); ++ lnstat_dump(stdout, lnstat_files); + break; + case MODE_NORMAL: + diff --git a/SOURCES/iproute2-3.10.0-bridge-fdb-replace.patch b/SOURCES/iproute2-3.10.0-bridge-fdb-replace.patch new file mode 100644 index 0000000..0c7f4dd --- /dev/null +++ b/SOURCES/iproute2-3.10.0-bridge-fdb-replace.patch @@ -0,0 +1,22 @@ +diff --git a/bridge/fdb.c b/bridge/fdb.c +index 591fbbe..e2e53f1 100644 +--- a/bridge/fdb.c ++++ b/bridge/fdb.c +@@ -30,7 +30,7 @@ int filter_index; + + static void usage(void) + { +- fprintf(stderr, "Usage: bridge fdb { add | append | del } ADDR dev DEV {self|master} [ temp ]\n" ++ fprintf(stderr, "Usage: bridge fdb { add | append | del | replace } ADDR dev DEV {self|master} [ temp ]\n" + " [router] [ dst IPADDR] [ vlan VID ]\n" + " [ port PORT] [ vni VNI ] [via DEV]\n"); + fprintf(stderr, " bridge fdb {show} [ dev DEV ]\n"); +@@ -334,6 +334,8 @@ int do_fdb(int argc, char **argv) + return fdb_modify(RTM_NEWNEIGH, NLM_F_CREATE|NLM_F_EXCL, argc-1, argv+1); + if (matches(*argv, "append") == 0) + return fdb_modify(RTM_NEWNEIGH, NLM_F_CREATE|NLM_F_APPEND, argc-1, argv+1); ++ if (matches(*argv, "replace") == 0) ++ return fdb_modify(RTM_NEWNEIGH, NLM_F_CREATE|NLM_F_REPLACE, argc-1, argv+1); + if (matches(*argv, "delete") == 0) + return fdb_modify(RTM_DELNEIGH, 0, argc-1, argv+1); + if (matches(*argv, "show") == 0 || diff --git a/SOURCES/iproute2-3.10.0-document-vlan.patch b/SOURCES/iproute2-3.10.0-document-vlan.patch new file mode 100644 index 0000000..5b3522b --- /dev/null +++ b/SOURCES/iproute2-3.10.0-document-vlan.patch @@ -0,0 +1,89 @@ +From ab56f5d7a75d14a420b166b84e1d4afb980ea263 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Petr=20=C5=A0abata?= +Date: Fri, 8 Nov 2013 12:47:45 +0900 +Subject: [PATCH] iproute2: Document type vlan option in ip-link(8) +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This patch adds the VLAN Type support section to the ip-link +manual page. + +Signed-off-by: Petr Šabata +--- + man/man8/ip-link.8.in | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 59 insertions(+) + +diff --git a/man/man8/ip-link.8.in b/man/man8/ip-link.8.in +index 8b68c78..4eddbcd 100644 +--- a/man/man8/ip-link.8.in ++++ b/man/man8/ip-link.8.in +@@ -213,6 +213,65 @@ specifies the number of transmit queues for new device. + specifies the number of receive queues for new device. + + .TP ++VLAN Type Support ++For a link of type ++.I VLAN ++the following additional arguments are supported: ++ ++.BI "ip link add link " DEVICE ++.BI name " NAME " ++.BI type " vlan " ++.R " [ " ++.BI protocol " VLAN_PROTO " ++.R " ] " ++.BI id " VLANID " ++.R " [ " ++.BR reorder_hdr " { " on " | " off " } " ++.R " ] " ++.R " [ " ++.BR gvrp " { " on " | " off " } " ++.R " ] " ++.R " [ " ++.BR mvrp " { " on " | " off " } " ++.R " ] " ++.R " [ " ++.BR loose_binding " { " on " | " off " } " ++.R " ] " ++.R " [ " ++.BI ingress-qos-map " QOS-MAP " ++.R " ] " ++.R " [ " ++.BI egress-qos-map " QOS-MAP " ++.R " ] " ++ ++.in +8 ++.sp ++.BI protocol " VLAN_PROTO " ++- either 802.1Q or 802.1ad. ++ ++.BI id " VLANID " ++- specifies the VID. ++ ++.BR reorder_hdr " { " on " | " off " } " ++- specifies whether ethernet headers are reordered or not. ++ ++.BR gvrp " { " on " | " off " } " ++- specifies whether this VLAN should be registered using GARP VLAN Registration Protocol. ++ ++.BR mvrp " { " on " | " off " } " ++- specifies whether this VLAN should be registered using Multiple VLAN Registration Protocol. ++ ++.BR loose_binding " { " on " | " off " } " ++- specifies whether the VLAN device state is bound to the physical device state. ++ ++.BI ingress-qos-map " QOS-MAP " ++- defines a mapping between priority code points on incoming frames. The format is FROM:TO with multiple mappings separated by spaces. ++ ++.BI egress-qos-map " QOS-MAP " ++- the same as ingress-qos-map but for outgoing frames. ++.in -8 ++ ++.TP + VXLAN Type Support + For a link of type + .I VXLAN +-- +1.8.3.1 + diff --git a/SOURCES/iproute2-3.10.0-ipadress-fix-display-of-IPv6-peer-address.patch b/SOURCES/iproute2-3.10.0-ipadress-fix-display-of-IPv6-peer-address.patch new file mode 100644 index 0000000..f59e8b2 --- /dev/null +++ b/SOURCES/iproute2-3.10.0-ipadress-fix-display-of-IPv6-peer-address.patch @@ -0,0 +1,14 @@ +diff --git a/ip/ipaddress.c b/ip/ipaddress.c +index 5b9a438..2b3707a 100644 +--- a/ip/ipaddress.c ++++ b/ip/ipaddress.c +@@ -613,7 +613,8 @@ int print_addrinfo(const struct sockaddr_nl *who, struct nlmsghdr *n, + abuf, sizeof(abuf))); + + if (rta_tb[IFA_ADDRESS] == NULL || +- memcmp(RTA_DATA(rta_tb[IFA_ADDRESS]), RTA_DATA(rta_tb[IFA_LOCAL]), 4) == 0) { ++ memcmp(RTA_DATA(rta_tb[IFA_ADDRESS]), RTA_DATA(rta_tb[IFA_LOCAL]), ++ ifa->ifa_family == AF_INET ? 4 : 16) == 0) { + fprintf(fp, "/%d ", ifa->ifa_prefixlen); + } else { + fprintf(fp, " peer %s/%d ", diff --git a/SOURCES/iproute2-3.10.0-lnstat-interval.patch b/SOURCES/iproute2-3.10.0-lnstat-interval.patch new file mode 100644 index 0000000..656f1cc --- /dev/null +++ b/SOURCES/iproute2-3.10.0-lnstat-interval.patch @@ -0,0 +1,29 @@ +diff --git a/misc/lnstat.c b/misc/lnstat.c +index dca10ad..847e33f 100644 +--- a/misc/lnstat.c ++++ b/misc/lnstat.c +@@ -226,7 +226,7 @@ int main(int argc, char **argv) + MODE_NORMAL, + } mode = MODE_NORMAL; + +- unsigned long count = 1; ++ unsigned long count = 0; + static struct field_params fp; + int num_req_files = 0; + char *req_files[LNSTAT_MAX_FILES]; +@@ -336,13 +336,14 @@ int main(int argc, char **argv) + if (interval < 1 ) + interval=1; + +- for (i = 0; i < count; i++) { ++ for (i = 0; !count || i < count; ) { + if ((hdr > 1 && (! (i % 20))) || (hdr == 1 && i == 0)) + print_hdr(stdout, header); + lnstat_update(lnstat_files); + print_line(stdout, lnstat_files, &fp); + fflush(stdout); + sleep(interval); ++ if (count) ++i; + } + } + diff --git a/SOURCES/iproute2-3.10.0-xfrm-state-overflow.patch b/SOURCES/iproute2-3.10.0-xfrm-state-overflow.patch new file mode 100644 index 0000000..dfe448a --- /dev/null +++ b/SOURCES/iproute2-3.10.0-xfrm-state-overflow.patch @@ -0,0 +1,38 @@ +From 7887635f629c5a73be5e2db0a1a8a221e8b16077 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Petr=20=C5=A0abata?= +Date: Wed, 17 Jul 2013 15:29:54 +0200 +Subject: [PATCH] Avoid overflow segfault with FORTIFY_SOURCE +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Petr Šabata +--- + ip/xfrm_state.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/ip/xfrm_state.c b/ip/xfrm_state.c +index 389942c..160ab32 100644 +--- a/ip/xfrm_state.c ++++ b/ip/xfrm_state.c +@@ -157,12 +157,16 @@ static int xfrm_algo_parse(struct xfrm_algo *alg, enum xfrm_attr_type_t type, + buf[j] = val; + } + } else { ++ int i; + len = slen; + if (len > 0) { + if (len > max) + invarg("ALGO-KEYMAT value makes buffer overflow\n", key); + +- strncpy(buf, key, len); ++ for (i = 0 ; i < len && key[i] != '\0'; i++) ++ buf[i] = key[i]; ++ for ( ; i < len; i++) ++ buf[i] = '\0'; + } + } + +-- +1.8.3.1 + diff --git a/SOURCES/iproute2-3.11.0-iproute2-bridge-Close-file-with-bridge-monitor-file.patch b/SOURCES/iproute2-3.11.0-iproute2-bridge-Close-file-with-bridge-monitor-file.patch new file mode 100644 index 0000000..8d381a4 --- /dev/null +++ b/SOURCES/iproute2-3.11.0-iproute2-bridge-Close-file-with-bridge-monitor-file.patch @@ -0,0 +1,41 @@ +From 101847446e6a5e3ca370e65ebc462584934fce0e Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= +Date: Wed, 25 Sep 2013 09:45:45 +0200 +Subject: [PATCH] iproute2: bridge: Close file with bridge monitor file +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The `bridge monitor file FILENAME' reads dumped netlink messages from +a file. But it forgot to close the file after using it. This patch +fixes it. + +Signed-off-by: Petr Písař +--- + bridge/monitor.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/bridge/monitor.c b/bridge/monitor.c +index e96fcaf..76e7d47 100644 +--- a/bridge/monitor.c ++++ b/bridge/monitor.c +@@ -132,12 +132,15 @@ int do_monitor(int argc, char **argv) + + if (file) { + FILE *fp; ++ int err; + fp = fopen(file, "r"); + if (fp == NULL) { + perror("Cannot fopen"); + exit(-1); + } +- return rtnl_from_file(fp, accept_msg, stdout); ++ err = rtnl_from_file(fp, accept_msg, stdout); ++ fclose(fp); ++ return err; + } + + if (rtnl_open(&rth, groups) < 0) +-- +1.8.3.1 + diff --git a/SOURCES/iproute2-3.11.0-iproute2-bridge-document-mdb.patch b/SOURCES/iproute2-3.11.0-iproute2-bridge-document-mdb.patch new file mode 100644 index 0000000..0c827f5 --- /dev/null +++ b/SOURCES/iproute2-3.11.0-iproute2-bridge-document-mdb.patch @@ -0,0 +1,153 @@ +From 54e9c3a34d4ba8a0890f3bf21d708342329461b5 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= +Date: Thu, 19 Sep 2013 10:41:26 +0200 +Subject: [PATCH] iproute2: bridge: document mdb +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This augments bridge(8) manual page with `bridge mdb' and `bridge +monitor mdb' commands which have been added recently. + +Signed-off-by: Petr Písař +--- + man/man8/bridge.8 | 88 +++++++++++++++++++++++++++++++++++++++++++++++++++++-- + 1 file changed, 85 insertions(+), 3 deletions(-) + +diff --git a/man/man8/bridge.8 b/man/man8/bridge.8 +index 66678b5..9a34804 100644 +--- a/man/man8/bridge.8 ++++ b/man/man8/bridge.8 +@@ -13,7 +13,7 @@ bridge \- show / manipulate bridge addresses and devices + + .ti -8 + .IR OBJECT " := { " +-.BR link " | " fdb " | " vlan " | " monitor " }" ++.BR link " | " fdb " | " mdb " | " vlan " | " monitor " }" + .sp + + .ti -8 +@@ -65,6 +65,21 @@ bridge \- show / manipulate bridge addresses and devices + .IR DEV " ]" + + .ti -8 ++.BR "bridge mdb" " { " add " | " del " } " ++.B dev ++.IR DEV ++.B port ++.IR PORT ++.B grp ++.IR GROUP " [ " ++.BR permanent " | " temp " ]" ++ ++.ti -8 ++.BR "bridge mdb show " [ " ++.B dev ++.IR DEV " ]" ++ ++.ti -8 + .BR "bridge vlan" " { " add " | " del " } " + .B dev + .IR DEV +@@ -79,7 +94,7 @@ bridge \- show / manipulate bridge addresses and devices + .IR DEV " ]" + + .ti -8 +-.BR "bridge monitor" " [ " all " | " neigh " | " link " ]" ++.BR "bridge monitor" " [ " all " | " neigh " | " link " | " mdb " ]" + + .SH OPTIONS + +@@ -110,6 +125,10 @@ As a rule, the information is statistics or some time values. + - Forwarding Database entry. + + .TP ++.B mdb ++- Multicast group database entry. ++ ++.TP + .B vlan + - VLAN filter list. + +@@ -326,6 +345,69 @@ With the + option, the command becomes verbose. It prints out the last updated + and last used time for each entry. + ++.SH bridge mdb - multicast group database management ++ ++.B mdb ++objects contain known IP multicast group addresses on a link. ++ ++.P ++The corresponding commands display mdb entries, add new entries, ++and delete old ones. ++ ++.SS bridge mdb add - add a new multicast group database entry ++ ++This command creates a new mdb entry. ++ ++.TP ++.BI dev " DEV" ++the interface where this group address is associated. ++ ++.TP ++.BI port " PORT" ++the port whose link is known to have members of this multicast group. ++ ++.TP ++.BI grp " GROUP" ++the IP multicast group address whose members reside on the link connected to ++the port. ++ ++.B permanent ++- the mdb entry is permanent ++.sp ++ ++.B temp ++- the mdb entry is temporary (default) ++.sp ++ ++.in -8 ++.SS bridge mdb delete - delete a multicast group database entry ++This command removes an existing mdb entry. ++ ++.PP ++The arguments are the same as with ++.BR "bridge mdb add" . ++ ++.SS bridge mdb show - list multicast group database entries ++ ++This command displays the current multicast group membership table. The table ++is populated by IGMP and MLD snooping in the bridge driver automatically. It ++can be altered by ++.B bridge mdb add ++and ++.B bridge mdb del ++commands manually too. ++ ++.TP ++.BI dev " DEV" ++the interface only whose entries should be listed. Default is to list all ++bridge interfaces. ++ ++.PP ++With the ++.B -details ++option, the command becomes verbose. It prints out the ports known to have ++a connected router. ++ + .SH bridge vlan - VLAN filter list + + .B vlan +@@ -395,7 +477,7 @@ command is the first in the command line and then the object list follows: + .I OBJECT-LIST + is the list of object types that we want to monitor. + It may contain +-.BR link ", and " fdb "." ++.BR link ", " fdb ", and " mdb "." + If no + .B file + argument is given, +-- +1.8.3.1 + diff --git a/SOURCES/iproute2-3.11.0-tc-ok.patch b/SOURCES/iproute2-3.11.0-tc-ok.patch new file mode 100644 index 0000000..fb8a13c --- /dev/null +++ b/SOURCES/iproute2-3.11.0-tc-ok.patch @@ -0,0 +1,91 @@ +From 3c4b5a852d5bb9070c7fb4428aa50f2e3e1f6e1b Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= +Date: Thu, 19 Sep 2013 11:25:49 +0200 +Subject: [PATCH] Confirm success for each tc -batch command +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +If `tc -force -batch' is fed by a controlling program from a pipe, +it's not possible to recognize when a command has been processes +successfully. + +This patch adds an optional `-OK' option to the tc(8) tool, so `tc +-force -OK -batch' will print "OK\n" to standard output on each +successfully completed tc command. + +Signed-off-by: Petr Písař +--- + man/man8/tc.8 | 8 +++++++- + tc/tc.c | 8 +++++++- + 2 files changed, 14 insertions(+), 2 deletions(-) + +diff --git a/man/man8/tc.8 b/man/man8/tc.8 +index e0acfeb..583eae2 100644 +--- a/man/man8/tc.8 ++++ b/man/man8/tc.8 +@@ -49,7 +49,7 @@ DEV + DEV + + .P +-.B tc [ -force ] -b\fR[\fIatch\fR] \fB[ filename ] ++.B tc [ -force ] [ -OK ] -b\fR[\fIatch\fR] \fB[ filename ] + + .ti 8 + .IR FORMAT " := {" +@@ -440,6 +440,12 @@ First failure will cause termination of tc. + don't terminate tc on errors in batch mode. + If there were any errors during execution of the commands, the application return code will be non zero. + ++.TP ++.BR "\-OK" ++in batch mode, print ++.B OK ++and a new line on standard output after each successfully interpreted command. ++ + .SH HISTORY + .B tc + was written by Alexey N. Kuznetsov and added in Linux 2.2. +diff --git a/tc/tc.c b/tc/tc.c +index 9b50e74..b43bb47 100644 +--- a/tc/tc.c ++++ b/tc/tc.c +@@ -39,6 +39,7 @@ int batch_mode = 0; + int resolve_hosts = 0; + int use_iec = 0; + int force = 0; ++int ok = 0; + struct rtnl_handle rth; + + static void *BODY = NULL; /* cached handle dlopen(NULL) */ +@@ -183,7 +184,7 @@ noexist: + static void usage(void) + { + fprintf(stderr, "Usage: tc [ OPTIONS ] OBJECT { COMMAND | help }\n" +- " tc [-force] -batch filename\n" ++ " tc [-force] [-OK] -batch filename\n" + "where OBJECT := { qdisc | class | filter | action | monitor }\n" + " OPTIONS := { -s[tatistics] | -d[etails] | -r[aw] | -p[retty] | -b[atch] [filename] }\n"); + } +@@ -251,6 +252,9 @@ static int batch(const char *name) + ret = 1; + if (!force) + break; ++ } else if (ok) { ++ printf("OK\n"); ++ fflush(stdout); + } + } + if (line) +@@ -288,6 +292,8 @@ int main(int argc, char **argv) + return 0; + } else if (matches(argv[1], "-force") == 0) { + ++force; ++ } else if (matches(argv[1], "-OK") == 0) { ++ ++ok; + } else if (matches(argv[1], "-batch") == 0) { + argc--; argv++; + if (argc <= 1) +-- +1.8.3.1 + diff --git a/SOURCES/iproute2-3.4.0-kernel.patch b/SOURCES/iproute2-3.4.0-kernel.patch new file mode 100644 index 0000000..1e83729 --- /dev/null +++ b/SOURCES/iproute2-3.4.0-kernel.patch @@ -0,0 +1,12 @@ +diff --git a/Makefile b/Makefile +index c107955..1e15c72 100644 +--- a/Makefile ++++ b/Makefile +@@ -7,6 +7,7 @@ DATADIR=$(PREFIX)/share + DOCDIR=$(DATADIR)/doc/iproute2 + MANDIR=$(DATADIR)/man + ARPDDIR=/var/lib/arpd ++KERNEL_INCLUDE=/usr/include + + # Path to db_185.h include + DBM_INCLUDE:=$(ROOTDIR)/usr/include diff --git a/SOURCES/iproute2-3.8.0-optflags.patch b/SOURCES/iproute2-3.8.0-optflags.patch new file mode 100644 index 0000000..a7aebff --- /dev/null +++ b/SOURCES/iproute2-3.8.0-optflags.patch @@ -0,0 +1,13 @@ +diff --git a/Makefile b/Makefile +index 5edffc0..898b572 100644 +--- a/Makefile ++++ b/Makefile +@@ -34,7 +34,7 @@ CCOPTS = -O2 + WFLAGS := -Wall -Wstrict-prototypes -Werror -Wmissing-prototypes + WFLAGS += -Wmissing-declarations -Wold-style-definition + +-CFLAGS = $(WFLAGS) $(CCOPTS) -I../include $(DEFINES) ++CFLAGS = $(WFLAGS) $(CCOPTS) -I../include $(DEFINES) $(RPM_OPT_FLAGS) + YACCFLAGS = -d -t -v + + SUBDIRS=lib ip tc bridge misc netem genl man diff --git a/SOURCES/iproute2-3.8.0-unused-result.patch b/SOURCES/iproute2-3.8.0-unused-result.patch new file mode 100644 index 0000000..0527ceb --- /dev/null +++ b/SOURCES/iproute2-3.8.0-unused-result.patch @@ -0,0 +1,13 @@ +diff --git a/Makefile b/Makefile +index 898b572..70a6e14 100644 +--- a/Makefile ++++ b/Makefile +@@ -31,7 +31,7 @@ CC = gcc + HOSTCC = gcc + DEFINES += -D_GNU_SOURCE + CCOPTS = -O2 +-WFLAGS := -Wall -Wstrict-prototypes -Werror -Wmissing-prototypes ++WFLAGS := -Wall -Wstrict-prototypes -Wmissing-prototypes + WFLAGS += -Wmissing-declarations -Wold-style-definition + + CFLAGS = $(WFLAGS) $(CCOPTS) -I../include $(DEFINES) $(RPM_OPT_FLAGS) diff --git a/SOURCES/iproute2-3.9.0-IPPROTO_IP_for_SA.patch b/SOURCES/iproute2-3.9.0-IPPROTO_IP_for_SA.patch new file mode 100644 index 0000000..6c150ec --- /dev/null +++ b/SOURCES/iproute2-3.9.0-IPPROTO_IP_for_SA.patch @@ -0,0 +1,12 @@ +diff --git a/ip/ipxfrm.c b/ip/ipxfrm.c +index 0495ff4..b1d4c6e 100644 +--- a/ip/ipxfrm.c ++++ b/ip/ipxfrm.c +@@ -1275,6 +1275,7 @@ static int xfrm_selector_upspec_parse(struct xfrm_selector *sel, + case IPPROTO_UDP: + case IPPROTO_SCTP: + case IPPROTO_DCCP: ++ case IPPROTO_IP: /* to allow shared SA for different protocols */ + break; + default: + fprintf(stderr, "\"sport\" and \"dport\" are invalid with PROTO value \"%s\"\n", strxf_proto(sel->proto)); diff --git a/SOURCES/iproute2-example-cbq-service.patch b/SOURCES/iproute2-example-cbq-service.patch new file mode 100644 index 0000000..f8b4978 --- /dev/null +++ b/SOURCES/iproute2-example-cbq-service.patch @@ -0,0 +1,22 @@ +diff -up iproute2-20091106/examples/cbq.init-v0.7.3.fix iproute2-20091106/examples/cbq.init-v0.7.3 +--- iproute2-20091106/examples/cbq.init-v0.7.3.fix 2009-11-10 19:41:44.000000000 +0100 ++++ iproute2-20091106/examples/cbq.init-v0.7.3 2009-11-27 13:36:07.957310549 +0100 +@@ -579,14 +579,14 @@ cbq_show () { + ### Check configuration and load DEVICES, DEVFIELDS and CLASSLIST from $1 + cbq_init () { + ### Get a list of configured classes +- CLASSLIST=`find $1 \( -type f -or -type l \) -name 'cbq-*' \ +- -not -name '*~' -maxdepth 1 -printf "%f\n"| sort` ++ CLASSLIST=`find $1 -maxdepth 1 \( -type f -or -type l \) -name 'cbq-*' \ ++ -not -name '*~' -printf "%f\n"| sort` + [ -z "$CLASSLIST" ] && + cbq_failure "no configuration files found in $1!" + + ### Gather all DEVICE fields from $1/cbq-* +- DEVFIELDS=`find $1 \( -type f -or -type l \) -name 'cbq-*' \ +- -not -name '*~' -maxdepth 1| xargs sed -n 's/#.*//; \ ++ DEVFIELDS=`find $1 -maxdepth 1 \( -type f -or -type l \) -name 'cbq-*' \ ++ -not -name '*~' | xargs sed -n 's/#.*//; \ + s/[[:space:]]//g; /^DEVICE=[^,]*,[^,]*\(,[^,]*\)\?/ \ + { s/.*=//; p; }'| sort -u` + [ -z "$DEVFIELDS" ] && diff --git a/SOURCES/man-pages.patch b/SOURCES/man-pages.patch new file mode 100644 index 0000000..08b626d --- /dev/null +++ b/SOURCES/man-pages.patch @@ -0,0 +1,189 @@ +diff --git a/man/man8/cbq.8 b/man/man8/cbq.8 +new file mode 100644 +index 0000000..78940b6 +--- /dev/null ++++ b/man/man8/cbq.8 +@@ -0,0 +1 @@ ++.so man8/tc-cbq.8 +\ No newline at end of file +diff --git a/man/man8/genl.8 b/man/man8/genl.8 +new file mode 100644 +index 0000000..b3e8f98 +--- /dev/null ++++ b/man/man8/genl.8 +@@ -0,0 +1,36 @@ ++.TH GENL 8 ++.SH NAME ++genl \- generic netlink utility frontend ++.SH SYNOPSIS ++.B genl ++.RI [ options ] { ctrl } [ help ] ++.SH DESCRIPTION ++This manual page documents briefly the ++.B genl ++command. ++.PP ++\fBgenl\fP utility provides a simple frontend to the generic netlink library. ++.SH OPTIONS ++genl supports the following options. ++.TP ++.B \-h, \-help ++Show summary of options. ++.TP ++.B \-V, \-Version ++Show version of program. ++.TP ++.B \-s, \-stats, \-statistics ++Show object statistics. ++.TP ++.B \-d, \-details ++Show object details. ++.TP ++.B \-r, \-raw ++Dump raw output only. ++.SH SEE ALSO ++.BR ip (8) ++.br ++.SH AUTHOR ++genl was written by Jamal Hadi Salim . ++.PP ++This manual page was written by Petr Sabata . +diff --git a/man/man8/ifcfg.8 b/man/man8/ifcfg.8 +new file mode 100644 +index 0000000..a6b585e +--- /dev/null ++++ b/man/man8/ifcfg.8 +@@ -0,0 +1,57 @@ ++.TH IFCFG 8 "September 24 2009" "iproute2" "Linux" ++.SH NAME ++ifcfg \- simplistic script which replaces ifconfig IP managment ++.SH SYNOPSIS ++.ad l ++.in +8 ++.ti -8 ++.B ifcfg ++.RI "[ " DEVICE " [ " :ALIAS: " ] ] [ " command " ] " ADDRESS " [ " LENGTH " ] [ " PEER " ] " ++.sp ++ ++.SH DESCRIPTION ++This manual page documents briefly the ++.B ifcfg ++command. ++.PP ++This is a simplistic script replacing one option of ++.B ifconfig ++, namely, IP address management. It not only adds ++addresses, but also carries out Duplicate Address Detection RFC-DHCP, ++sends unsolicited ARP to update the caches of other hosts sharing ++the interface, adds some control routes and restarts Router Discovery ++when it is necessary. ++ ++I strongly recommend using it ++.RI instead ++of ++.RI ifconfig ++both on hosts and on routers. ++ ++.SH IFCONFIG - COMMAND SYNTAX ++ ++.SS ++.TP ++.B DEVICE ++- it may have alias, suffix, separated by colon. ++ ++.TP ++.B command ++- add, delete or stop. ++ ++.TP ++.B address ++- optionally followed by prefix length. ++ ++.TP ++.B peer ++- optional peer address for pointpoint interfaces. ++ ++.SH EXAMPLE ++.nf ifcfg eth0 193.233.7.90/24 ++.fi ++This function determines, whether this is router or host. ++It returns 0, if the host is apparently not router. ++ ++.SH SEE ALSO ++.BR ip-cref.dvi +diff --git a/man/man8/ifstat.8 b/man/man8/ifstat.8 +new file mode 100644 +index 0000000..042dd3e +--- /dev/null ++++ b/man/man8/ifstat.8 +@@ -0,0 +1,54 @@ ++.TH IFSTAST 8 ++.SH NAME ++ifstat \- handy utility to read net interface statistics ++.SH SYNOPSIS ++.B ifstat ++.RI [ options ] ++.RI [ interface ++.RI [ interface ++.RI [ ... ] ] ] ++.SH DESCRIPTION ++This manual page documents briefly the ++.B ifstat ++command. ++.PP ++\fBifstat\fP neatly prints out network interface statistics. ++The utility keeps records of the previous data displayed in history files and by default only shows difference between the last and the current call. Location of the history files defaults to /tmp/.ifstat.u$UID but may be overridden with the IFSTAT_HISTORY environment variable. ++.SH OPTIONS ++.TP ++.B \-h, \-\-help ++Show summary of options. ++.TP ++.B \-V, \-\-version ++Show version of program. ++.TP ++.B \-a, \-\-ignore ++Ignore the history file. ++.TP ++.B \-d, \-\-scan=SECS ++Sample statistics every SECS second. ++.TP ++.B \-e, \-\-errors ++Show errors. ++.TP ++.B \-n, \-\-nooutput ++Don't display any output. Update the history file only. ++.TP ++.B \-r, \-\-reset ++Reset history. ++.TP ++.B \-s, \-\-noupdate ++Don't update the history file. ++.TP ++.B \-t, \-\-interval=SECS ++Report average over the last SECS seconds. ++.TP ++.B \-z, \-\-zeros ++Show entries with zero activity. ++.SH SEE ALSO ++.BR ip (8) ++.br ++.SH AUTHOR ++ifstat was written by Alexey Kuznetsov . ++.PP ++This manual page was written by Petr Sabata . +diff --git a/man/man8/ss.8 b/man/man8/ss.8 +index e55dd0c..70ed85c 100644 +--- a/man/man8/ss.8 ++++ b/man/man8/ss.8 +@@ -116,7 +116,7 @@ Find all local processes connected to X server. + List all the tcp sockets in state FIN-WAIT-1 for our apache to network 193.233.7/24 and look at their timers. + .SH SEE ALSO + .BR ip (8), +-.BR /usr/share/doc/iproute-doc/ss.html " (package iproute�doc)" ++.BR /usr/share/doc/iproute-doc-_VERSION_/ss.ps " (package iproute-doc)" + .SH AUTHOR + .I ss + was written by Alexey Kuznetosv, . +-- +1.8.3.1 + diff --git a/SPECS/iproute.spec b/SPECS/iproute.spec new file mode 100644 index 0000000..0239130 --- /dev/null +++ b/SPECS/iproute.spec @@ -0,0 +1,773 @@ +%global cbq_version v0.7.3 +Summary: Advanced IP routing and network device configuration tools +Name: iproute +Version: 3.10.0 +Release: 6%{?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 +Source1: cbq-0000.example +Source2: avpkt +Patch0: man-pages.patch +Patch1: iproute2-3.4.0-kernel.patch +Patch2: iproute2-3.8.0-optflags.patch +Patch3: iproute2-3.9.0-IPPROTO_IP_for_SA.patch +Patch4: iproute2-example-cbq-service.patch +Patch5: iproute2-2.6.35-print-route.patch +Patch6: iproute2-2.6.39-create-peer-veth-without-a-name.patch +Patch7: iproute2-2.6.39-lnstat-dump-to-stdout.patch +Patch8: iproute2-3.8.0-unused-result.patch +Patch9: iproute2-3.10.0-xfrm-state-overflow.patch +# rhbz#977844 +Patch10: iproute2-3.11.0-tc-ok.patch +# rhbz#1009860 +Patch11: iproute2-3.11.0-iproute2-bridge-document-mdb.patch +# rhbz#1011818, in upstream after 3.11.0 +Patch12: iproute2-3.11.0-iproute2-bridge-Close-file-with-bridge-monitor-file.patch +# rhbz#1024426 +Patch13: iproute2-3.10.0-lnstat-interval.patch +# rhbz#1017228 +Patch14: iproute2-3.10.0-ipadress-fix-display-of-IPv6-peer-address.patch +# rhbz#1024697 +Patch15: iproute2-3.10.0-bridge-fdb-replace.patch +# rhbz#979326 +Patch16: iproute2-3.10.0-document-vlan.patch +License: GPLv2+ and Public Domain +BuildRequires: bison +BuildRequires: flex +BuildRequires: iptables-devel >= 1.4.5 +BuildRequires: libdb-devel +BuildRequires: libnl-devel +BuildRequires: linuxdoc-tools +BuildRequires: pkgconfig +BuildRequires: psutils +BuildRequires: tex(cm-super-t1.enc) +BuildRequires: tex(dvips) +BuildRequires: tex(ecrm1000.tfm) +BuildRequires: tex(latex) +%if 0%{?fedora} +BuildRequires: linux-atm-libs-devel +%endif +# For the UsrMove transition period +Conflicts: filesystem < 3 +Provides: /sbin/ip + +%description +The iproute package contains networking utilities (ip and rtmon, for example) +which are designed to use the advanced networking capabilities of the Linux +2.4.x and 2.6.x kernel. + +%package doc +Summary: ip and tc documentation with examples +Group: Applications/System +License: GPLv2+ + +%description doc +The iproute documentation contains howtos and examples of settings. + +%package devel +Summary: iproute development files +Group: Development/Libraries +License: GPLv2+ +Provides: iproute-static = %{version}-%{release} + +%description devel +The libnetlink static library. + +%prep +%setup -q -n %{name}2-%{version} +%patch0 -p1 +sed -i "s/_VERSION_/%{version}/" man/man8/ss.8 +%patch1 -p1 -b .kernel +%patch2 -p1 -b .opt_flags +%patch3 -p1 -b .ipproto +%patch4 -p1 -b .fix_cbq +%patch5 -p1 -b .print-route +%patch6 -p1 -b .peer-veth-without-name +%patch7 -p1 -b .lnstat-dump-to-stdout +%patch8 -p1 -b .unused-result +%patch9 -p1 -b .xfrm-state +%patch10 -p1 -b .ok +%patch11 -p1 -b .bridge_mdb_doc +%patch12 -p1 -b .bridge_monitor_close +%patch13 -p1 -b .lnstat-interval +%patch14 -p1 -b .ipadress-fix-display-of-IPv6-peer-address +%patch15 -p1 -b .bridge-fdb-replace +%patch16 -p1 -b .document-vlan +sed -i 's/^LIBDIR=/LIBDIR?=/' Makefile + +%build +export LIBDIR=/%{_libdir} +export IPT_LIB_DIR=/%{_lib}/xtables +./configure +make %{?_smp_mflags} +make -C doc + +%install +mkdir -p \ + %{buildroot}%{_includedir} \ + %{buildroot}%{_sbindir} \ + %{buildroot}%{_mandir}/man3 \ + %{buildroot}%{_mandir}/man7 \ + %{buildroot}%{_mandir}/man8 \ + %{buildroot}%{_libdir}/tc \ + %{buildroot}%{_sysconfdir}/iproute2 \ + %{buildroot}%{_sysconfdir}/sysconfig/cbq + +for binary in \ + bridge/bridge \ + examples/cbq.init-%{cbq_version} \ + genl/genl \ + ip/ifcfg \ + ip/ip \ + ip/routef \ + ip/routel \ + ip/rtmon \ + ip/rtpr \ + misc/arpd \ + misc/ifstat \ + misc/lnstat \ + misc/nstat \ + misc/rtacct \ + misc/ss \ + tc/tc + do install -m755 ${binary} %{buildroot}%{_sbindir} +done +mv %{buildroot}%{_sbindir}/cbq.init-%{cbq_version} %{buildroot}%{_sbindir}/cbq +cd %{buildroot}%{_sbindir} + ln -s lnstat ctstat + ln -s lnstat rtstat +cd - + +# Libs +install -m644 netem/*.dist %{buildroot}%{_libdir}/tc +%if 0%{?fedora} +install -m755 tc/q_atm.so %{buildroot}%{_libdir}/tc +%endif +install -m755 tc/m_xt.so %{buildroot}%{_libdir}/tc +cd %{buildroot}%{_libdir}/tc + ln -s m_xt.so m_ipt.so +cd - + +# libnetlink +install -m644 include/libnetlink.h %{buildroot}%{_includedir} +install -m644 lib/libnetlink.a %{buildroot}%{_libdir} + +# Manpages +iconv -f latin1 -t utf8 man/man8/ss.8 > man/man8/ss.8.utf8 && + mv man/man8/ss.8.utf8 man/man8/ss.8 +install -m644 man/man3/*.3 %{buildroot}%{_mandir}/man3 +install -m644 man/man7/*.7 %{buildroot}%{_mandir}/man7 +install -m644 man/man8/*.8 %{buildroot}%{_mandir}/man8 + +# Config files +install -m644 etc/iproute2/* %{buildroot}%{_sysconfdir}/iproute2 +for config in \ + %{SOURCE1} \ + %{SOURCE2} + do install -m644 ${config} %{buildroot}%{_sysconfdir}/sysconfig/cbq +done + +%files +%dir %{_sysconfdir}/iproute2 +%doc COPYING +%doc README README.decnet README.iproute2+tc README.distribution README.lnstat +%{_mandir}/man7/* +%{_mandir}/man8/* +%attr(644,root,root) %config(noreplace) %{_sysconfdir}/iproute2/* +%{_sbindir}/* +%dir %{_libdir}/tc/ +%{_libdir}/tc/* +%dir %{_sysconfdir}/sysconfig/cbq +%config(noreplace) %{_sysconfdir}/sysconfig/cbq/* + +%files doc +%doc COPYING +%doc doc/*.ps +%doc examples + +%files devel +%doc COPYING +%{_mandir}/man3/* +%{_libdir}/libnetlink.a +%{_includedir}/libnetlink.h + +%changelog +* Fri Nov 08 2013 Petr Šabata - 3.10.0-6 +- Fix lnstat -i (#1024426) +- Support IPv6 peer addresses (#1017228) +- Add the replace command to bridge fdb (#1024697) +- Document link type vlan (#979326) + +* Tue Oct 01 2013 Petr Pisar - 3.10.0-5 +- Close file with bridge monitor file (#1011818) + +* Tue Sep 24 2013 Petr Pisar - 3.10.0-4 +- Document tc -OK option (#977844) +- Document "bridge mdb" and "bridge monitor mdb" (#1009860) + +* Wed Sep 18 2013 Marcela Mašláňová - 3.10.0-3 +- Add '-OK' command line option to tc telling it to write an "OK\n" to stdout +- rhbz#977844 + +* Mon Aug 05 2013 Petr Šabata - 3.10.0-2.1 +- Add a skeleton manpages for genl and ifstat (#881180) + +* Wed Jul 17 2013 Petr Šabata - 3.10.0-2 +- Fix the XFRM patch + +* Wed Jul 17 2013 Petr Šabata - 3.10.0-1 +- 3.10.0 bump +- Drop the SHAREDIR patch and revert to upstream ways (#966445) +- Fix an XFRM regression with FORTIFY_SOURCE + +* Tue Apr 30 2013 Petr Šabata - 3.9.0-1 +- 3.9.0 bump + +* Thu Apr 25 2013 Petr Šabata - 3.8.0-4 +- ATM is available in Fedora only + +* Tue Mar 12 2013 Petr Šabata - 3.8.0-3 +- Mention the "up" argument in documentation and help outputs (#907468) + +* Mon Mar 04 2013 Petr Šabata - 3.8.0-2 +- Bump for 1.4.18 rebuild + +* Tue Feb 26 2013 Petr Šabata - 3.8.0-1 +- 3.8.0 bump + +* Fri Feb 08 2013 Petr Šabata - 3.7.0-2 +- Don't propogate mounts out of ip (#882047) + +* Wed Dec 12 2012 Petr Šabata - 3.7.0-1 +- 3.7.0 bump + +* Mon Nov 19 2012 Petr Šabata - 3.6.0-3 +- Include section 7 manpages (#876857) +- Fix ancient bogus dates in the changelog (correction based upon commits) +- Explicitly require some TeX fonts no longer present in the base distribution + +* Thu Oct 04 2012 Petr Šabata - 3.6.0-2 +- List all interfaces by default + +* Wed Oct 03 2012 Petr Šabata - 3.6.0-1 +- 3.6.0 bump + +* Thu Aug 30 2012 Petr Šabata - 3.5.1-2 +- Remove the explicit iptables dependency (#852840) + +* Tue Aug 14 2012 Petr Šabata - 3.5.1-1 +- 3.5.1 bugfix release bump +- Rename 'br' to 'bridge' + +* Mon Aug 06 2012 Petr Šabata - 3.5.0-2 +- Install the new bridge utility + +* Thu Aug 02 2012 Petr Šabata - 3.5.0-1 +- 3.5.0 bump +- Move to db5. + +* Thu Jul 19 2012 Fedora Release Engineering - 3.4.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Tue May 22 2012 Petr Šabata - 3.4.0-1 +- 3.4.0 bump +- Drop the print route patch (included upstream) + +* Mon Apr 30 2012 Petr Šabata - 3.3.0-2 +- Let's install rtmon too... (#814819) + +* Thu Mar 22 2012 Petr Šabata - 3.3.0-1 +- 3.3.0 bump +- Update source URL + +* Mon Feb 27 2012 Petr Šabata - 3.2.0-3 +- Address dangerous /tmp files security issue (CVE-2012-1088, #797881, #797878) + +* Fri Jan 27 2012 Petr Šabata - 3.2.0-2 +- Simplify the spec a bit thanks to the UsrMove feature + +* Fri Jan 06 2012 Petr Šabata - 3.2.0-1 +- 3.2.0 bump +- Removing a useless, now conflicting patch (initcwnd already decumented) + +* Thu Nov 24 2011 Petr Šabata - 3.1.0-1 +- 3.1.0 bump +- Point URL and Source to the new location on kernel.org +- Remove now obsolete defattr +- Dropping various patches now included upstream +- Dropping iproute2-2.6.25-segfault.patch; I fail to understand the reason for + this hack + +* Tue Nov 15 2011 Petr Šabata - 2.6.39-6 +- ss -ul should display UDP CLOSED sockets (#691100) + +* Thu Oct 06 2011 Petr Sabata - 2.6.39-5 +- Fix ss, lnstat and arpd usage and manpages + +* Wed Sep 07 2011 Petr Sabata - 2.6.39-4 +- lnstat should dump (-d) to stdout instead of stderr (#736332) + +* Tue Jul 26 2011 Petr Sabata - 2.6.39-3 +- Rebuild for xtables7 + +* Tue Jul 12 2011 Petr Sabata - 2.6.39-2 +- Rebuild for xtables6 + +* Thu Jun 30 2011 Petr Sabata - 2.6.39-1 +- 2.6.39 bump + +* Wed Apr 27 2011 Petr Sabata - 2.6.38.1-4 +- Link [cr]tstat to lnstat + +* Wed Apr 27 2011 Petr Sabata - 2.6.38.1-3 +- Install ctstat, rtstat and routef manpage symlinks +- Install m_xt & m_ipt tc modules +- Creating devel and virtual static subpackages with libnetlink + +* Thu Apr 21 2011 Petr Sabata - 2.6.38.1-2 +- General cleanup +- Use global instead of define +- Buildroot removal +- Correcting URL and Source links +- Install genl, ifstat, routef, routel and rtpr (rhbz#697319) + +* Fri Mar 18 2011 Petr Sabata - 2.6.38.1-1 +- 2.6.38.1 bump + +* Wed Mar 16 2011 Petr Sabata - 2.6.38-1 +- 2.6.38 bump + +* Wed Feb 09 2011 Fedora Release Engineering - 2.6.37-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Mon Jan 31 2011 Petr Sabata - 2.6.37-2 +- man-pages.patch update, ip(8) TYPE whitespace + +* Mon Jan 10 2011 Petr Sabata - 2.6.37-1 +- 2.6.37 upstream release +- ss(8) improvements patch removed (included upstream) + +* Wed Dec 08 2010 Petr Sabata - 2.6.35-10 +- fix a typo in ss(8) improvements patch, rhbz#661267 + +* Tue Nov 30 2010 Petr Sabata - 2.6.35-9 +- ss(8) improvements patch by jpopelka; should be included in 2.6.36 + +* Tue Nov 09 2010 Petr Sabata - 2.6.35-8 +- rhbz#641599, use the versioned path, man-pages.patch update, prep update + +* Tue Oct 12 2010 Petr Sabata - 2.6.35-7 +- Do not segfault if peer name is omitted when creating a peer veth link, rhbz#642322 + +* Mon Oct 11 2010 Petr Sabata - 2.6.35-6 +- Man-pages update, rhbz#641599 + +* Wed Sep 29 2010 jkeating - 2.6.35-5 +- Rebuilt for gcc bug 634757 + +* Tue Sep 21 2010 Petr Sabata - 2.6.35-4 +- Modified man-pages.patch to fix cbq manpage, rhbz#635877 + +* Tue Sep 21 2010 Petr Sabata - 2.6.35-3 +- Don't print routes with negative metric fix, rhbz#628739 + +* Wed Aug 18 2010 Petr Sabata - 2.6.35-2 +- 'ip route get' fix, iproute2-2.6.35-print-route.patch +- rhbz#622782 + +* Thu Aug 05 2010 Petr Sabata - 2.6.35-1 +- 2.6.35 version bump +- iproute2-tc-priority.patch removed (included in upstream now) + +* Thu Jul 08 2010 Petr Sabata - 2.6.34-5 +- Licensing guidelines compliance fix + +* Wed Jul 07 2010 Petr Sabata - 2.6.34-4 +- Requires: iptables >= 1.4.5, BuildRequires: iptables-devel >= 1.4.5 + +* Thu Jul 01 2010 Petr Sabata - 2.6.34-3 +- Build now runs ./configure to regenerate Makefile for ipt/xt detection + +* Mon Jun 21 2010 Petr Sabata - 2.6.34-2 +- iproute-tc-priority.patch, rhbz#586112 + +* Mon Jun 21 2010 Petr Sabata - 2.6.34-1 +- 2.6.34 version bump + +* Tue Apr 20 2010 Marcela Mašláňová - 2.6.33-2 +- 578729 6rd tunnel correctly 3979ef91de9ed17d21672aaaefd6c228485135a2 +- change BR texlive to tex according to guidelines + +* Thu Feb 25 2010 Marcela Mašláňová - 2.6.33-1 +- update + +* Tue Jan 26 2010 Marcela Mašláňová - 2.6.32-2 +- add macvlan aka VESA support d63a9b2b1e4e3eab0d0577d0a0f412d50be1e0a7 +- kernel headers 2.6.33 ab322673298bd0b8927cdd9d11f3d36af5941b93 + are needed for macvlan features and probably for other added later. +- fix number of release which contains 2.6.32 kernel headers and features + but it was released as 2.6.31 + +* Mon Jan 4 2010 Marcela Mašláňová - 2.6.31-1 +- update to 2.6.31 + +* Fri Nov 27 2009 Marcela Mašláňová - 2.6.29-5.1.20091106gita7a9ddbb +- 539232 patch cbq initscript + +* Fri Nov 27 2009 Marcela Mašláňová - 2.6.29-5.0.20091106gita7a9ddbb +- snapshot with kernel headers for 2.6.32 + +* Fri Oct 9 2009 Marcela Mašláňová - 2.6.29-5.0.20091009gitdaf49fd6 +- new official version isn't available but it's needed -> switch to git snapshots + +* Thu Sep 24 2009 Marcela Mašláňová - 2.6.29-5 +- create missing man pages + +* Fri Jul 24 2009 Fedora Release Engineering - 2.6.29-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Thu Apr 23 2009 Marcela Mašláňová - 2.6.29-3 +- new iptables (xtables) bring problems to tc, when ipt is used. + rhbz#497344 still broken. tc_modules.patch brings correct paths to + xtables, but that doesn't fix whole issue. +- 497355 ip should allow creation of an IPsec SA with 'proto any' + and specified sport and dport as selectors + +* Tue Apr 14 2009 Marcela Mašláňová - 2.6.29-2 +- c3651bf4763d7247e3edd4e20526a85de459041b ip6tunnel: Fix no default + display of ip4ip6 tunnels +- e48f73d6a5e90d2f883e15ccedf4f53d26bb6e74 missing arpd directory + +* Wed Mar 25 2009 Marcela Mašláňová - 2.6.29-1 +- update to 2.6.29 +- remove DDR patch which became part of sourc +- add patch with correct headers 1957a322c9932e1a1d2ca1fd37ce4b335ceb7113 + +* Wed Feb 25 2009 Fedora Release Engineering - 2.6.28-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Wed Feb 4 2009 Marcela Mašláňová - 2.6.28-2 +- 483484 install distribution files into /usr/share and also fixed + install paths in spec +- add the latest change from git which add DRR support + c86f34942a0ce9f8203c0c38f9fe9604f96be706 + +* Mon Jan 19 2009 Marcela Mašláňová - 2.6.28-1 +- previous two patches were included into 2.6.28 release. +- update + +* Mon Jan 12 2009 Marcela Mašláňová - 2.6.27-2 +- 475130 - Negative preferred lifetimes of IPv6 prefixes/addresses + displayed incorrectly +- 472878 - “ip maddr show” in IB interface causes a stack corruption +- both patches will be probably in iproute v2.6.28 + +* Thu Dec 4 2008 Marcela Maslanova - 2.6.27-1 +- aead support was included into upstream version +- patch for moving libs is now deprecated +- update to 2.6.27 + +* Tue Aug 12 2008 Marcela Maslanova - 2.6.26-1 +- update to 2.6.26 +- clean patches + +* Tue Jul 22 2008 Marcela Maslanova - 2.6.25-5 +- fix iproute2-2.6.25-segfault.patch + +* Thu Jul 10 2008 Tom "spot" Callaway - 2.6.25-4 +- rebuild for new db4-4.7 + +* Thu Jul 3 2008 Marcela Maslanova - 2.6.25-3 +- 449933 instead of failing strncpy use copying byte after byte + +* Wed May 14 2008 Marcela Maslanova - 2.6.25-2 +- allow replay setting, solve also 444724 + +* Mon Apr 21 2008 Marcela Maslanova - 2.6.25-1 +- update +- remove patch for backward compatibility +- add patch for AEAD compatibility + +* Thu Feb 21 2008 Marcela Maslanova - 2.6.23-4 +- add creating ps file again. Fix was done in texlive + +* Wed Feb 6 2008 Marcela Maslanova - 2.6.23-3 +- rebuild without tetex files. It isn't working in rawhide yet. Added + new source for ps files. +- #431179 backward compatibility for previous iproute versions + +* Mon Jan 21 2008 Marcela Maslanova - 2.6.23-2 +- rebuild with fix tetex and linuxdoc-tools -> manual pdf +- clean unnecessary patches +- add into spec *.so objects, new BR linux-atm-libs-devel + +* Wed Oct 31 2007 Marcela Maslanova - 2.6.23-1 +- new version from upstrem 2.3.23 + +* Tue Oct 23 2007 Marcela Maslanova - 2.6.22-5 +- move files from /usr/lib/tc to /usr/share/tc +- remove listing files twice + +* Fri Aug 31 2007 Marcela Maslanova - 2.6.22-3 +- package review #225903 + +* Mon Aug 27 2007 Jeremy Katz - 2.6.22-2 +- rebuild for new db4 + +* Wed Jul 11 2007 Radek Vokál - 2.6.22-1 +- upgrade to 2.6.22 + +* Mon Mar 19 2007 Radek Vokál - 2.6.20-2 +- fix broken tc-pfifo man page (#232891) + +* Thu Mar 15 2007 Radek Vokál - 2.6.20-1 +- upgrade to 2.6.20 + +* Fri Dec 15 2006 Radek Vokál - 2.6.19-1 +- upgrade to 2.6.19 + +* Mon Dec 11 2006 Radek Vokál - 2.6.18-5 +- fix snapshot version + +* Fri Dec 1 2006 Radek Vokál - 2.6.18-4 +- spec file cleanup +- one more rebuilt against db4 + +* Thu Nov 16 2006 Radek Vokál - 2.6.18-3 +- fix defective manpage for tc-pfifo (#215399) + +* Mon Nov 13 2006 Radek Vokál - 2.6.18-2 +- rebuilt against new db4 + +* Tue Oct 3 2006 Radek Vokal - 2.6.18-1 +- upgrade to upstream 2.6.18 +- initcwnd patch merged +- bug fix for xfrm monitor +- alignment fixes for cris +- documentation corrections + +* Mon Oct 2 2006 Radek Vokal - 2.6.16-7 +- fix ip.8 man page, add initcwnd option + +* Sun Oct 01 2006 Jesse Keating - 2.6.16-6 +- rebuilt for unwind info generation, broken in gcc-4.1.1-21 + +* Tue Sep 19 2006 Radek Vokal - 2.6.16-5 +- fix crash when resolving ip address + +* Mon Aug 21 2006 Radek Vokál - 2.6.16-4 +- add LOWER_UP and DORMANT flags (#202199) +- use dist tag + +* Wed Jul 12 2006 Jesse Keating - 2.6.16-3.1 +- rebuild + +* Mon Jun 26 2006 Radek Vokál - 2.6.16-3 +- improve handling of initcwnd value (#179719) + +* Sun May 28 2006 Radek Vokál - 2.6.16-2 +- fix BuildRequires: flex (#193403) + +* Sun Mar 26 2006 Radek Vokál - 2.6.16-1 +- upgrade to 2.6.16-060323 +- don't hardcode /usr/lib in tc (#186607) + +* Wed Feb 22 2006 Radek Vokál - 2.6.15-2 +- own /usr/lib/tc (#181953) +- obsoletes shapecfg (#182284) + +* Fri Feb 10 2006 Jesse Keating - 2.6.15-1.2 +- bump again for double-long bug on ppc(64) + +* Tue Feb 07 2006 Jesse Keating - 2.6.15-1.1 +- rebuilt for new gcc4.1 snapshot and glibc changes + +* Tue Jan 17 2006 Radek Vokal 2.6.15-1 +- upgrade to 2.6.15-060110 + +* Mon Dec 12 2005 Radek Vokal 2.6.14-11 +- rebuilt + +* Fri Dec 09 2005 Radek Vokal 2.6.14-10 +- remove backup of config files (#175302) + +* Fri Nov 11 2005 Radek Vokal 2.6.14-9 +- use tc manpages and cbq.init from source tarball (#172851) + +* Thu Nov 10 2005 Radek Vokal 2.6.14-8 +- new upstream source + +* Mon Oct 31 2005 Radek Vokal 2.6.14-7 +- add warning to ip tunnel add command (#128107) + +* Fri Oct 07 2005 Bill Nottingham 2.6.14-6 +- update from upstream (appears to fix #170111) + +* Fri Oct 07 2005 Radek Vokal 2.6.14-5 +- update from upstream +- fixed host_len size for memcpy (#168903) + +* Fri Sep 23 2005 Radek Vokal 2.6.14-4 +- add RPM_OPT_FLAGS + +* Mon Sep 19 2005 Radek Vokal 2.6.14-3 +- forget to apply the patch :( + +* Mon Sep 19 2005 Radek Vokal 2.6.14-2 +- make ip help work again (#168449) + +* Wed Sep 14 2005 Radek Vokal 2.6.14-1 +- upgrade to ss050901 for 2.6.14 kernel headers + +* Fri Aug 26 2005 Radek Vokal 2.6.13-3 +- added /sbin/cbq script and sample configuration files (#166301) + +* Fri Aug 19 2005 Radek Vokal 2.6.13-2 +- upgrade to iproute2-050816 + +* Thu Aug 11 2005 Radek Vokal 2.6.13-1 +- update to snapshot for 2.6.13+ kernel + +* Tue May 24 2005 Radek Vokal 2.6.11-2 +- removed useless initvar patch (#150798) +- new upstream source + +* Tue Mar 15 2005 Radek Vokal 2.6.11-1 +- update to iproute-2.6.11 + +* Fri Mar 04 2005 Radek Vokal 2.6.10-2 +- gcc4 rebuilt + +* Wed Feb 16 2005 Radek Vokal 2.6.10-1 +- update to iproute-2.6.10 + +* Thu Dec 23 2004 Radek Vokal 2.6.9-6 +- added arpd into sbin + +* Mon Nov 29 2004 Radek Vokal 2.6.9-5 +- debug info removed from makefile and from spec (#140891) + +* Tue Nov 16 2004 Radek Vokal 2.6.9-4 +- source file updated from snapshot version +- endian patch adding + +* Sat Sep 18 2004 Joshua Blanton 2.6.9-3 +- added installation of netem module for tc + +* Mon Sep 06 2004 Radek Vokal 2.6.9-2 +- fixed possible buffer owerflow, path by Steve Grubb + +* Wed Sep 01 2004 Radek Vokal 2.6.9-1 +- updated to iproute-2.6.9, spec file change, patches cleared + +* Tue Jun 15 2004 Elliot Lee +- rebuilt + +* Wed May 26 2004 Phil Knirsch 2.4.7-16 +- Took tons of manpages from debian, much more complete (#123952). + +* Thu May 06 2004 Phil Knirsch 2.4.7-15 +- rebuilt + +* Thu May 06 2004 Phil Knirsch 2.4.7-13.2 +- Built security errata version for FC1. + +* Wed Apr 21 2004 Phil Knirsch 2.4.7-14 +- Fixed -f option for ss (#118355). +- Small description fix (#110997). +- Added initialization of some vars (#74961). +- Added patch to initialize "default" rule as well (#60693). + +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Wed Nov 05 2003 Phil Knirsch 2.4.7-12 +- Security errata for netlink (CAN-2003-0856). + +* Thu Oct 23 2003 Phil Knirsch +- Updated to latest version. Used by other distros, so seems stable. ;-) +- Quite a few patches needed updating in that turn. +- Added ss (#107363) and several other new nifty tools. + +* Tue Jun 17 2003 Phil Knirsch +- rebuilt + +* Wed Jun 04 2003 Elliot Lee +- rebuilt + +* Wed Jan 22 2003 Tim Powers +- rebuilt + +* Thu Jan 16 2003 Phil Knirsch 2.4.7-7 +- Added htb3-tc patch from http://luxik.cdi.cz/~devik/qos/htb/ (#75486). + +* Fri Oct 11 2002 Bill Nottingham 2.4.7-6 +- remove flags patch at author's request + +* Fri Jun 21 2002 Tim Powers +- automated rebuild + +* Wed Jun 19 2002 Phil Knirsch 2.4.7-4 +- Don't forcibly strip binaries + +* Mon May 27 2002 Phil Knirsch 2.4.7-3 +- Fixed missing diffserv and atm support in config (#57278). +- Fixed inconsistent numeric base problem for command line (#65473). + +* Tue May 14 2002 Phil Knirsch 2.4.7-2 +- Added patch to fix crosscompiling by Adrian Linkins. + +* Fri Mar 15 2002 Phil Knirsch 2.4.7-1 +- Update to latest stable release 2.4.7-now-ss010824. +- Added simple man page for ip. + +* Wed Aug 8 2001 Bill Nottingham +- allow setting of allmulti & promisc flags (#48669) + +* Mon Jul 02 2001 Than Ngo +- fix build problem in beehive if kernel-sources is not installed + +* Fri May 25 2001 Helge Deller +- updated to iproute2-2.2.4-now-ss001007.tar.gz +- bzip2 source tar file +- "License" replaces "Copyright" +- added "BuildPrereq: tetex-latex tetex-dvips psutils" +- rebuilt for 7.2 + +* Tue May 1 2001 Bill Nottingham +- use the system headers - the included ones are broken +- ETH_P_ECHO went away + +* Sat Jan 6 2001 Jeff Johnson +- test for specific KERNEL_INCLUDE directories. + +* Thu Oct 12 2000 Than Ngo +- rebuild for 7.1 + +* Thu Oct 12 2000 Than Ngo +- add default configuration files for iproute (Bug #10549, #18887) + +* Tue Jul 25 2000 Jakub Jelinek +- fix include-glibc/ to cope with glibc 2.2 new resolver headers + +* Thu Jul 13 2000 Prospector +- automatic rebuild + +* Sun Jun 18 2000 Than Ngo +- rebuilt in the new build environment +- use RPM macros +- handle RPM_OPT_FLAGS + +* Sat Jun 03 2000 Than Ngo +- fix iproute to build with new glibc + +* Fri May 26 2000 Ngo Than +- update to 2.2.4-now-ss000305 +- add configuration files + +* Mon Sep 13 1999 Bill Nottingham +- strip binaries + +* Mon Aug 16 1999 Cristian Gafton +- first build