Commit graph

82 commits

Author SHA1 Message Date
Vladimír Čunát 89023c38fc
Recover the complicated situation after my bad merge
I made a mistake merge.  Reverting it in c778945806 undid the state
on master, but now I realize it crippled the git merge mechanism.
As the merge contained a mix of commits from `master..staging-next`
and other commits from `staging-next..staging`, it got the
`staging-next` branch into a state that was difficult to recover.

I reconstructed the "desired" state of staging-next tree by:
 - checking out the last commit of the problematic range: 4effe769e2
 - `git rebase -i --preserve-merges a8a018ddc0` - dropping the mistaken
   merge commit and its revert from that range (while keeping
   reapplication from 4effe769e2)
 - merging the last unaffected staging-next commit (803ca85c20)
 - fortunately no other commits have been pushed to staging-next yet
 - applying a diff on staging-next to get it into that state
2020-10-26 09:01:04 +01:00
Vladimír Čunát c778945806
Revert "Merge #101508: libraw: 0.20.0 -> 0.20.2"
I'm sorry; I didn't notice it contained staging commits.

This reverts commit 17f5305b6c, reversing
changes made to a8a018ddc0.
2020-10-25 09:41:51 +01:00
Michael Weiss 01ec8c0999
iproute: 5.8.0 -> 5.9.0 (#100761)
File changes (additions/removals):
None
2020-10-18 13:31:27 +02:00
freezeboy d0edb00019
iproute_mptcp: fix preConfigure (#97747) 2020-09-12 19:14:15 +02:00
Michael Weiss 83c541088e
iproute: 5.7.0 -> 5.8.0 (#94965)
"The former date based internal versioning (snapshot) is replaced by the
regular version numbering which corresponds to the kernel version." [0]

File changes (additions/removals):
+share/man/man8/ip-mptcp.8.gz
+share/man/man8/tc-gate.8.gz

[0]: https://marc.info/?l=linux-netdev&m=159681449423365
2020-08-10 13:50:06 +02:00
Michael Weiss ac0716aa61 iproute: 5.6.0 -> 5.7.0
"As usual lots of small fixes, across many utilities. Several qdisc now
have more parameters available. Devlink get most of the fixes." [0]

File changes (additions/removals):
+share/bash-completion/completions/devlink
+share/man/man8/devlink-dpipe.8.gz
+share/man/man8/tc-ct.8.gz

[0]: https://marc.info/?l=linux-netdev&m=159115579900638
2020-06-04 18:13:07 +02:00
Jan Tojnar b4a6714571
Merge branch 'staging-next' into staging 2020-04-13 18:54:59 +02:00
Michael Reilly 84cf00f980
treewide: Per RFC45, remove all unquoted URLs 2020-04-10 17:54:53 +01:00
Michael Weiss b7bf29993b
Merge pull request #82298 from Ralith/netem
iproute: include netem tools
2020-04-08 19:05:59 +02:00
Michael Weiss 94f2a76718
iproute: Build the netem tools
They will be installed now and we can provide $HOSTCC for
cross-compilation.

New files:
+lib/tc/experimental.dist
+lib/tc/normal.dist
+lib/tc/pareto.dist
+lib/tc/paretonormal.dist

Note: The distributions are generated in a reproducible way.

Co-Authored-By: Benjamin Saunders <ben.e.saunders@gmail.com>
2020-04-06 14:00:06 +02:00
Michael Weiss aa46e1ae34
iproute: Simplify and improve the expression 2020-04-06 13:56:48 +02:00
Michael Weiss 41d6bfe0ca
iproute: 5.5.0 -> 5.6.0
"Not a lot of changes in this release, most are related to fixing output
formatting and documentation." [0]

File changes (additions/removals):
+share/man/man8/tc-ets.8.gz
+share/man/man8/tc-fq_pie.8.gz

nix path-info -S:
5.5.0 51509616
5.6.0 51528680

[0]: https://marc.info/?l=linux-netdev&m=158585608413591
2020-04-02 23:30:07 +02:00
Markus Kowalewski ae91282545
iproute: add libmnl to build rdma utility 2020-02-25 23:28:46 +01:00
Michael Weiss f77edab9c7 iproute: 5.4.0 -> 5.5.0
"Most of the fixes have been related to single (and json) formatting.
Thank you to Aya, Jakub, Jiri, and Ron for the work to get devlink
improved." [0]

File changes (additions/removals):
None

nix path-info -S:
5.4.0 46705272
5.5.0 46726136

[0]: https://marc.info/?l=linux-netdev&m=158013364425477
2020-01-29 08:56:39 +01:00
Michael Weiss cfb975495c
iproute: 5.3.0 -> 5.4.0
"Not a lot of changes in this release, most are related to fixing output
formatting and documentation." [0]

File changes (additions/removals):
+share/man/man8/devlink-trap.8.gz

nix path-info -S:
5.3.0 46078816
5.4.0 46095296

[0]: https://www.spinics.net/lists/netdev/msg615781.html
2019-11-26 14:31:47 +01:00
Robin Gloster aad72d5c95
iproute: 5.2.0 -> 5.3.0 2019-10-03 21:09:00 +02:00
Robin Gloster 4e60b0efae
treewide: update globin's maintained drvs 2019-08-20 19:36:05 +02:00
Michael Weiss 05ad8cf209
iproute: 5.1.0 -> 5.2.0
"Not a lot of big new features in this release. Just the usual array of
small fixes across the board." [0]

File changes:
None

nix path-info -S:
5.1.0 46637048
5.2.0 46627312

[0]: https://www.spinics.net/lists/netdev/msg584562.html
2019-07-08 23:26:34 +02:00
Matthieu Coudron e775f2ddd2 iproute_mptcp: init at 0.95
allows to disable MPTCP on specific interfaces.
2019-06-27 12:00:18 +09:00
Michael Weiss 9aca862326
iproute: 5.0.0 -> 5.1.0
"Most of the new features for this release are in the devlink and rdma utilities.
And most of the bug fixes are in fixing the output format glitches
that resulted from converting most of the tools to have JSON
output." [0]

File changes:
+share/man/man8/devlink-health.8.gz

nix path-info -S:
5.0.0 46661416
5.1.0 46677880

[0]: https://www.spinics.net/lists/netdev/msg569915.html
2019-05-13 21:05:44 +02:00
Will Dietz 29fde98ed3 iproute2: 4.20.0 -> 5.0.0 2019-03-22 14:09:58 -05:00
Vladimír Čunát 5effa4e0f9
Merge branch 'master' into staging-next
Comments on conflicts:
- llvm: d6f401e1 vs. 469ecc70 - docs for 6 and 7 say the default is
  to build all targets, so we should be fine
- some pypi hashes: they were equivalent, just base16 vs. base32
2019-02-01 09:22:29 +01:00
Jörg Thalheim b5c1deca8a
treewide: remove wkennington as maintainer
He prefers to contribute to his own nixpkgs fork triton.
Since he is still marked as maintainer in many packages
this leaves the wrong impression he still maintains those.
2019-01-26 10:05:32 +00:00
Michael Weiss ca91a80084
iproute: 4.19.0 -> 4.20.0
"Update to iproute2 utility to support new features in Linux 4.20.
This release is mostly small fixes but there are several changes
related to ip neigh support for offloaded entries." [0]

File changes:
+share/man/man8/tc-taprio.8.gz

nix path-info -S:
4.19.0 42681224
4.20.0 42714224

[0]: https://www.spinics.net/lists/netdev/msg543288.html
2019-01-07 22:45:14 +01:00
qolii a5bdd719f2 iproute: 4.18 -> 4.19 2018-10-26 17:02:41 -07:00
Matthieu Coudron d8b7ffc7ef iproute: add $dev output (#46558)
to provide the user API include/ that was previously dropped.
2018-09-12 14:55:03 +02:00
volth 0fa04d646d alternative for iproute module (#41801) 2018-09-01 20:28:23 +02:00
R. RyanTM 573f52451a iproute: 4.17.0 -> 4.18.0 (#45218)
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/iproute2/versions.
2018-08-21 14:47:48 +02:00
Matthieu Coudron 82f338b837 iproute: allow to load ebpf programs (#44598)
...via passing libelf as a buildinput.
2018-08-07 23:01:07 +02:00
volth 52f53c69ce pkgs/*: remove unreferenced function arguments 2018-07-21 02:48:04 +00:00
R. RyanTM 1fa83ff8bc iproute: 4.16.0 -> 4.17.0
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/iproute2/versions.

These checks were done:

- built on NixOS
- Warning: no invocation of /nix/store/fzsnlnw6b604as63f8pc7z5hbp9m6ypp-iproute2-4.17.0/bin/arpd had a zero exit code or showed the expected version
- /nix/store/fzsnlnw6b604as63f8pc7z5hbp9m6ypp-iproute2-4.17.0/bin/bridge passed the binary check.
- /nix/store/fzsnlnw6b604as63f8pc7z5hbp9m6ypp-iproute2-4.17.0/bin/ctstat passed the binary check.
- /nix/store/fzsnlnw6b604as63f8pc7z5hbp9m6ypp-iproute2-4.17.0/bin/genl passed the binary check.
- Warning: no invocation of /nix/store/fzsnlnw6b604as63f8pc7z5hbp9m6ypp-iproute2-4.17.0/bin/ifcfg had a zero exit code or showed the expected version
- /nix/store/fzsnlnw6b604as63f8pc7z5hbp9m6ypp-iproute2-4.17.0/bin/ifstat passed the binary check.
- /nix/store/fzsnlnw6b604as63f8pc7z5hbp9m6ypp-iproute2-4.17.0/bin/ip passed the binary check.
- /nix/store/fzsnlnw6b604as63f8pc7z5hbp9m6ypp-iproute2-4.17.0/bin/lnstat passed the binary check.
- /nix/store/fzsnlnw6b604as63f8pc7z5hbp9m6ypp-iproute2-4.17.0/bin/nstat passed the binary check.
- /nix/store/fzsnlnw6b604as63f8pc7z5hbp9m6ypp-iproute2-4.17.0/bin/routef passed the binary check.
- /nix/store/fzsnlnw6b604as63f8pc7z5hbp9m6ypp-iproute2-4.17.0/bin/routel passed the binary check.
- /nix/store/fzsnlnw6b604as63f8pc7z5hbp9m6ypp-iproute2-4.17.0/bin/rtacct passed the binary check.
- /nix/store/fzsnlnw6b604as63f8pc7z5hbp9m6ypp-iproute2-4.17.0/bin/rtmon passed the binary check.
- /nix/store/fzsnlnw6b604as63f8pc7z5hbp9m6ypp-iproute2-4.17.0/bin/rtpr passed the binary check.
- /nix/store/fzsnlnw6b604as63f8pc7z5hbp9m6ypp-iproute2-4.17.0/bin/rtstat passed the binary check.
- /nix/store/fzsnlnw6b604as63f8pc7z5hbp9m6ypp-iproute2-4.17.0/bin/ss passed the binary check.
- /nix/store/fzsnlnw6b604as63f8pc7z5hbp9m6ypp-iproute2-4.17.0/bin/tc passed the binary check.
- 15 of 17 passed binary check by having a zero exit code.
- 0 of 17 passed binary check by having the new version present in output.
- found 4.17.0 with grep in /nix/store/fzsnlnw6b604as63f8pc7z5hbp9m6ypp-iproute2-4.17.0
- directory tree listing: https://gist.github.com/034a57ce83d6f871566054eab222cf18
- du listing: https://gist.github.com/19da8b14a2528b5fc8dca94a8f14216e
2018-06-14 05:44:46 -07:00
Matthieu Coudron 1e0975f4c0 iproute2: module to create rt_table file & co
When doing source routing/multihoming, it's practical to give names to routing
tables. The absence of the rt_table file in /etc make this impossible.
This patch recreates these files on rebuild so that they can be modified
by the user see NixOS#38638.

iproute2 is modified to look into config.networking.iproute2.confDir instead of
/etc/iproute2.
2018-05-15 21:55:04 +09:00
R. RyanTM e1f79fdea8 iproute: 4.15.0 -> 4.16.0
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/iproute2/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/m3b8yhqabqfzamhgnrxy1nffy7dmf4zy-iproute2-4.16.0/bin/ctstat -h’ got 0 exit code
- ran ‘/nix/store/m3b8yhqabqfzamhgnrxy1nffy7dmf4zy-iproute2-4.16.0/bin/ctstat --help’ got 0 exit code
- ran ‘/nix/store/m3b8yhqabqfzamhgnrxy1nffy7dmf4zy-iproute2-4.16.0/bin/ifstat help’ got 0 exit code
- ran ‘/nix/store/m3b8yhqabqfzamhgnrxy1nffy7dmf4zy-iproute2-4.16.0/bin/lnstat -h’ got 0 exit code
- ran ‘/nix/store/m3b8yhqabqfzamhgnrxy1nffy7dmf4zy-iproute2-4.16.0/bin/lnstat --help’ got 0 exit code
- ran ‘/nix/store/m3b8yhqabqfzamhgnrxy1nffy7dmf4zy-iproute2-4.16.0/bin/nstat help’ got 0 exit code
- ran ‘/nix/store/m3b8yhqabqfzamhgnrxy1nffy7dmf4zy-iproute2-4.16.0/bin/routef -h’ got 0 exit code
- ran ‘/nix/store/m3b8yhqabqfzamhgnrxy1nffy7dmf4zy-iproute2-4.16.0/bin/routef --help’ got 0 exit code
- ran ‘/nix/store/m3b8yhqabqfzamhgnrxy1nffy7dmf4zy-iproute2-4.16.0/bin/routef help’ got 0 exit code
- ran ‘/nix/store/m3b8yhqabqfzamhgnrxy1nffy7dmf4zy-iproute2-4.16.0/bin/routel --help’ got 0 exit code
- ran ‘/nix/store/m3b8yhqabqfzamhgnrxy1nffy7dmf4zy-iproute2-4.16.0/bin/routel help’ got 0 exit code
- ran ‘/nix/store/m3b8yhqabqfzamhgnrxy1nffy7dmf4zy-iproute2-4.16.0/bin/rtpr -h’ got 0 exit code
- ran ‘/nix/store/m3b8yhqabqfzamhgnrxy1nffy7dmf4zy-iproute2-4.16.0/bin/rtpr --help’ got 0 exit code
- ran ‘/nix/store/m3b8yhqabqfzamhgnrxy1nffy7dmf4zy-iproute2-4.16.0/bin/rtpr help’ got 0 exit code
- ran ‘/nix/store/m3b8yhqabqfzamhgnrxy1nffy7dmf4zy-iproute2-4.16.0/bin/rtstat -h’ got 0 exit code
- ran ‘/nix/store/m3b8yhqabqfzamhgnrxy1nffy7dmf4zy-iproute2-4.16.0/bin/rtstat --help’ got 0 exit code
- ran ‘/nix/store/m3b8yhqabqfzamhgnrxy1nffy7dmf4zy-iproute2-4.16.0/bin/ss -h’ got 0 exit code
- ran ‘/nix/store/m3b8yhqabqfzamhgnrxy1nffy7dmf4zy-iproute2-4.16.0/bin/ss --help’ got 0 exit code
- ran ‘/nix/store/m3b8yhqabqfzamhgnrxy1nffy7dmf4zy-iproute2-4.16.0/bin/tc -h’ got 0 exit code
- ran ‘/nix/store/m3b8yhqabqfzamhgnrxy1nffy7dmf4zy-iproute2-4.16.0/bin/tc help’ got 0 exit code
- found 4.16.0 with grep in /nix/store/m3b8yhqabqfzamhgnrxy1nffy7dmf4zy-iproute2-4.16.0
- directory tree listing: https://gist.github.com/3cbeb932502256cc3c7505200003d620
2018-04-07 08:54:55 -07:00
Will Dietz b0c4138a3b iproute: patchshebangs to work on 'hostPlatform' (not build) 2018-02-13 13:55:43 -06:00
Will Dietz e120c42ccf iproute: don't use host BASH for scripts, fix for cross
Doesn't eliminate glibc dep, somehow
a dependency on host's "db" leaks,
but it's a start.

Also don't attempt to build unused 'netem' tools,
avoiding need to use HOSTCC.
2018-02-13 09:44:27 -06:00
Tuomas Tynkkynen d8571b5795 iproute: 4.14.1 -> 4.15.0 2018-02-04 02:47:21 +02:00
Tuomas Tynkkynen dfd2e6ff74 iproute: 4.13.0 -> 4.14.1 2017-11-19 19:14:22 +02:00
Franz Pletz 37521cfd54
iproute: 4.12.0 -> 4.13.0 2017-10-02 20:24:35 +02:00
Robin Gloster 08b09fdc5c
fanctl, fan module: remove
This has been broken nearly all the time due to the patches needed to
iproute2 not being compatible with the newer versions we have been
shipping. As long as Ubuntu does not manage to upstream these changes
so they are maintained with iproute2 and we don't have a maintainer
updating these patches to new iproute2 versions it is not feasible to
have this available.
2017-09-23 17:55:33 +02:00
Tuomas Tynkkynen 638adf2d90 iproute: 4.11.0 -> 4.12.0 2017-07-18 13:41:06 +03:00
Franz Pletz 03d1e8a14e
iproute: 4.9.0 -> 4.11.0 2017-06-20 03:56:43 +02:00
Robin Gloster a6ebca448e
iproute: update fan patches 2017-01-19 17:28:22 +01:00
Franz Pletz 08d1f28818
Revert "iproute: remove broken fan patch"
This reverts commit 0d5a5307be because it
breaks evaluation. See #21561.
2017-01-04 22:30:55 +01:00
Jörg Thalheim 0d5a5307be
iproute: remove broken fan patch 2017-01-01 05:17:53 +01:00
Robin Gloster 3fcdbedbef
iproute: 4.8.0 -> 4.9.0 2016-12-29 02:52:55 +01:00
Franz Pletz 1cbb04e72e
iproute: 4.7.0 -> 4.8.0 2016-12-29 02:52:55 +01:00
Alexander Ried d666196a44
iproute2: fix bash completion
apparently bash expects only files in its completion folder and not
subfolders.
2016-09-27 18:20:07 +02:00
Alexander Ried 7615d6385a iproute2: 4.5.0 -> 4.7.0 (#18435)
iproute now packages a bash-completion file which it installs to
$BASH_COMPDIR.

* fanpatch: adjust for new version

- The patch did not apply because the code around the additions changed.
- The patch uses functions that got changed [1] & [2], I adjusted the
  patch to use the safe version. Probably not needed but better safe
  than sorry.
[1] format_host: http://git.kernel.org/cgit/linux/kernel/git/shemminger/iproute2.git/commit/?id=a418e451643e77fe36861e53359587ba8aa41873
[2] rt_addr_n2a: http://git.kernel.org/cgit/linux/kernel/git/shemminger/iproute2.git/commit/?id=7faf1588a755edb9c9cabbe1d3211265e9826d28
2016-09-25 15:07:03 +02:00
Alexander Ried aae11b1781 iproute2: 4.3.0 -> 4.5.0 (#15193) 2016-05-06 03:09:47 +02:00
Charles Strahan ad7b1e24c2 fan-networking: updated patches from Ubuntu
This pulls in updated Fan Networking patches from Ubuntu.
(https://wiki.ubuntu.com/FanNetworking)

closes #14328
2016-04-10 16:07:03 -04:00