diff --git a/arping-Fix-exit-code-on-w-option.patch b/arping-Fix-exit-code-on-w-option.patch deleted file mode 100644 index e94d30f9992b3171dbfb64f57f1af7ee1b85230f..0000000000000000000000000000000000000000 --- a/arping-Fix-exit-code-on-w-option.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 4c2dd9f020df2749bdff294756b04aafa99ad624 Mon Sep 17 00:00:00 2001 -From: eaglegai -Date: Fri, 18 Mar 2022 19:32:21 +0800 -Subject: [PATCH] arping: Fix exit code on -w option when count * interval > - timeout - -Signed-off-by: eaglegai ---- - arping.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/arping.c b/arping.c -index 20b0554b..fe79d2f8 100644 ---- a/arping.c -+++ b/arping.c -@@ -850,7 +850,7 @@ static int event_loop(struct run_state *ctl) - else if (ctl->dad && ctl->quit_on_reply) - /* Duplicate address detection mode return value */ - rc |= !(ctl->brd_sent != ctl->received); -- else if (ctl->timeout && !(ctl->count > 0)) -+ else if (ctl->timeout && (!(ctl->count > 0) || (ctl->interval > ctl->timeout / ctl->count))) - rc |= !(ctl->received > 0); - else - rc |= (ctl->sent != ctl->received); diff --git a/backport-clockdiff-Set-ppoll-timeout-minimum-to-1ms.patch b/backport-clockdiff-Set-ppoll-timeout-minimum-to-1ms.patch deleted file mode 100644 index 92cfb4673248a0ce16cec9eea56e792e05ab465e..0000000000000000000000000000000000000000 --- a/backport-clockdiff-Set-ppoll-timeout-minimum-to-1ms.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 471942dee341e5aae2a277ecd85c05e671752880 Mon Sep 17 00:00:00 2001 -From: caibingcheng -Date: Mon, 24 Apr 2023 20:45:28 +0800 -Subject: [PATCH] clockdiff: Set ppoll timeout minimum to 1ms - -Fixes: https://github.com/iputils/iputils/issues/326 -Closes: https://github.com/iputils/iputils/pull/459 -Reviewed-by: Petr Vorel -Reviewed-by: Noah Meyerhans -Signed-off-by: caibingcheng ---- - clockdiff.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/clockdiff.c b/clockdiff.c -index 5e639ab7..ccb5b5b3 100644 ---- a/clockdiff.c -+++ b/clockdiff.c -@@ -210,7 +210,7 @@ static int measure_inner_loop(struct run_state *ctl, struct measure_vars *mv) - struct pollfd p = { .fd = ctl->sock_raw, .events = POLLIN | POLLHUP }; - - { -- long tmo = ctl->rtt + ctl->rtt_sigma; -+ long tmo = MAX(ctl->rtt + ctl->rtt_sigma, 1); - - mv->tout.tv_sec = tmo / 1000; - mv->tout.tv_nsec = (tmo - (tmo / 1000) * 1000) * 1000000; diff --git a/backport-ping-fix-overflow-on-negative.patch b/backport-ping-fix-overflow-on-negative.patch deleted file mode 100644 index 15cfe133b7799972e76cc65fb606505ae07e9924..0000000000000000000000000000000000000000 --- a/backport-ping-fix-overflow-on-negative.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 2a63b94313352ed62f47adbc1a0d33bfea7ca188 Mon Sep 17 00:00:00 2001 -From: Petr Vorel -Date: Wed, 17 May 2023 00:57:24 +0200 -Subject: [PATCH] ping: Fix overflow on negative -i - -Restore back check for -i <= 0. - -Fixes: 918e824 ("ping: add support for sub-second timeouts") -Closes: https://github.com/iputils/iputils/issues/465 -Signed-off-by: Petr Vorel ---- - ping/ping.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/ping/ping.c b/ping/ping.c -index 8f442037..27c72cad 100644 ---- a/ping/ping.c -+++ b/ping/ping.c -@@ -436,7 +436,7 @@ main(int argc, char **argv) - double optval; - - optval = ping_strtod(optarg, _("bad timing interval")); -- if (isgreater(optval, (double)INT_MAX / 1000)) -+ if (islessequal(optval, 0) || isgreater(optval, (double)INT_MAX / 1000)) - error(2, 0, _("bad timing interval: %s"), optarg); - rts.interval = (int)(optval * 1000); - rts.opt_interval = 1; diff --git a/backport-tracepath-Merge-if-clauses.patch b/backport-tracepath-Merge-if-clauses.patch deleted file mode 100644 index ee28cb46fdbc3e58d3588795a57e6baa1c4d20dc..0000000000000000000000000000000000000000 --- a/backport-tracepath-Merge-if-clauses.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 608c62b3967882d31ff9edde97e38de0fcff154b Mon Sep 17 00:00:00 2001 -From: Petr Vorel -Date: Wed, 24 May 2023 10:40:23 +0200 -Subject: [PATCH 018/135] tracepath: Merge if clauses -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Merge if clauses, because the printed message is the same. -This should have been done in 3337034 ("Initial import of iputils"), -but 2ca0f7d made it even worse when remove else from else if -(clang-tidy was obviously wrong :)). - -Fixes: 2ca0f7d ("[clang-tidy] fix identical branches") -Reviewed-by: Marek Küthe -Signed-off-by: Petr Vorel -Reference: https://github.com/iputils/iputils/commit/608c62b3967882d31ff9edde97e38de0fcff154b ---- - tracepath.c | 6 ++---- - 1 file changed, 2 insertions(+), 4 deletions(-) - -diff --git a/tracepath.c b/tracepath.c -index ebb7f72..04d77b8 100644 ---- a/tracepath.c -+++ b/tracepath.c -@@ -321,10 +321,8 @@ static int recverr(struct run_state *const ctl) - e->ee_type == ICMPV6_TIME_EXCEED && - e->ee_code == ICMPV6_EXC_HOPLIMIT)) { - if (rethops >= 0) { -- if (sndhops >= 0 && rethops != sndhops) -- printf(_("asymm %2d "), rethops); -- -- if (sndhops < 0 && rethops != ctl->ttl) -+ if ((sndhops >= 0 && rethops != sndhops) || -+ (sndhops < 0 && rethops != ctl->ttl)) - printf(_("asymm %2d "), rethops); - } - printf("\n"); --- -2.33.0 - diff --git a/backport-tracepath-Restore-the-MTU-probing-behavior.patch b/backport-tracepath-Restore-the-MTU-probing-behavior.patch deleted file mode 100644 index 40c919e55e48ee805ced511b6772fd4e98b4b136..0000000000000000000000000000000000000000 --- a/backport-tracepath-Restore-the-MTU-probing-behavior.patch +++ /dev/null @@ -1,70 +0,0 @@ -From d2311b4517beebda22c76f82a120f7b1f765a79d Mon Sep 17 00:00:00 2001 -From: csalinezh -Date: Thu, 5 Jan 2023 22:38:31 +0200 -Subject: [PATCH] tracepath: restore the MTU probing behaviour since release - 20071127 - -Since 81d0f03 (tracepath: fix IP{V6,}_PMTUDISC_DO values), tracepath -shows the PMTU for a target only at the first hop but not the hop where -MTU is reduced, if that data has been cached in kernel FIB by previous -probing attempts. - -IP_PMTUDISC_PROBE instructs the kernel to set the Don't Fragment flag -while bypassing PMTU checks. Usage of IP_PMTUDISC_PROBE in tracepath was -introduced in 37bd60c and mentioned in the release note of 20071127 -(1d83610) as a feature. - -As previously identified in 81d0f03 (appeared in release 20190709), the -definition of these options became incorrect during a copy refactoring in -d3028f1 (in release 20100418). The value for IP_PMTUDISC_PROBE continued -to be used until 81d0f03 when the correct definition of IP_PMTUDISC_DO was -adopted, thus causing a regression. - -This commit resotres the previous behaviour by adopting IP_PMTUDISC_PROBE. - -Fixes: d3028f1, 81d0f03 -Signed-off-by: Charles Zhang ---- - iputils_common.h | 6 ++++++ - tracepath.c | 4 ++-- - 2 files changed, 8 insertions(+), 2 deletions(-) - -diff --git a/iputils_common.h b/iputils_common.h -index 67b495ef..49e790d8 100644 ---- a/iputils_common.h -+++ b/iputils_common.h -@@ -55,6 +55,12 @@ - #ifndef IPV6_PMTUDISC_DO - # define IPV6_PMTUDISC_DO 2 - #endif -+#ifndef IP_PMTUDISC_PROBE -+# define IP_PMTUDISC_PROBE 3 -+#endif -+#ifndef IPV6_PMTUDISC_PROBE -+# define IPV6_PMTUDISC_PROBE 3 -+#endif - - #ifdef HAVE_ERROR_H - # include -diff --git a/tracepath.c b/tracepath.c -index 4d2a9acf..ebb7f72f 100644 ---- a/tracepath.c -+++ b/tracepath.c -@@ -532,7 +532,7 @@ int main(int argc, char **argv) - if (ctl.mtu <= ctl.overhead) - goto pktlen_error; - -- on = IPV6_PMTUDISC_DO; -+ on = IPV6_PMTUDISC_PROBE; - if (setsockopt(ctl.socket_fd, SOL_IPV6, IPV6_MTU_DISCOVER, &on, sizeof(on)) && - (on = IPV6_PMTUDISC_DO, setsockopt(ctl.socket_fd, SOL_IPV6, - IPV6_MTU_DISCOVER, &on, sizeof(on)))) -@@ -557,7 +557,7 @@ int main(int argc, char **argv) - if (ctl.mtu <= ctl.overhead) - goto pktlen_error; - -- on = IP_PMTUDISC_DO; -+ on = IP_PMTUDISC_PROBE; - if (setsockopt(ctl.socket_fd, SOL_IP, IP_MTU_DISCOVER, &on, sizeof(on))) - error(1, errno, "IP_MTU_DISCOVER"); - on = 1; diff --git a/bsd.txt b/bsd.txt deleted file mode 100644 index b40b49c662e0e0a9566f80d07643fd45acb90aaa..0000000000000000000000000000000000000000 --- a/bsd.txt +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Copyright (c) 1989 The Regents of the University of California. - * All rights reserved. - * - * This code is derived from software contributed to Berkeley by - * Mike Muuss. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - diff --git a/gpl-2.0.txt b/gpl-2.0.txt deleted file mode 100644 index d159169d1050894d3ea3b98e1c965c4058208fe1..0000000000000000000000000000000000000000 --- a/gpl-2.0.txt +++ /dev/null @@ -1,339 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Lesser General Public License instead.) You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. - - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and -modification follow. - - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The "Program", below, -refers to any such program or work, and a "work based on the Program" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 1. You may copy and distribute verbatim copies of the Program's -source code as you receive it, in any medium, provided that you -conspicuously and appropriately publish on each copy an appropriate -copyright notice and disclaimer of warranty; keep intact all the -notices that refer to this License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. - -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a fee. - - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections - 1 and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. - - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program subject to -these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. - - 7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 9. The Free Software Foundation may publish revised and/or new versions -of the General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any -later version", you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation. If the Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the author -to ask for permission. For software which is copyrighted by the Free -Software Foundation, write to the Free Software Foundation; we sometimes -make exceptions for this. Our decision will be guided by the two goals -of preserving the free status of all derivatives of our free software and -of promoting the sharing and reuse of software generally. - - NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -REPAIR OR CORRECTION. - - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED -TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY -YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this -when it starts in an interactive mode: - - Gnomovision version 69, Copyright (C) year name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may -be called something other than `show w' and `show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the program, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - `Gnomovision' (which makes passes at compilers) written by James Hacker. - - , 1 April 1989 - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. diff --git a/iputils-20221126.tar.gz b/iputils-20221126.tar.gz deleted file mode 100644 index 92fc399edcf8ec72a991edb5fa1fdf3bcc10661f..0000000000000000000000000000000000000000 Binary files a/iputils-20221126.tar.gz and /dev/null differ diff --git a/iputils-20240905.tar.xz b/iputils-20240905.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..c223d87974ab41d51e36394f8fd4eaafd84a69fe Binary files /dev/null and b/iputils-20240905.tar.xz differ diff --git a/iputils.spec b/iputils.spec index 7c1c3a4fb7a4da00fda472a2babecbb6d39ab275..3715a6f39fc8eb987dd3250b8c5f2ad4695574a6 100644 --- a/iputils.spec +++ b/iputils.spec @@ -1,29 +1,24 @@ Name: iputils -Version: 20221126 -Release: 5 +Version: 20240905 +Release: 1 Summary: Network monitoring tools including ping -License: BSD and GPLv2+ +License: BSD-3-Clause AND GPL-2.0-or-later URL: https://github.com/iputils/iputils -Source0: https://github.com/iputils/iputils/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz +Source0: https://github.com/iputils/iputils/releases/download/%{version}/%{name}-%{version}.tar.xz Source1: ifenslave.tar.gz -Source2: bsd.txt -Source3: https://www.gnu.org/licenses/old-licenses/gpl-2.0.txt Patch0000: iputils-ifenslave.patch Patch0001: iputils-ifenslave-CWE-170.patch Patch0002: revert-process-interrupts-in-ping-_receive_error_msg.patch -Patch0010: arping-Fix-exit-code-on-w-option.patch - -Patch6000: backport-clockdiff-Set-ppoll-timeout-minimum-to-1ms.patch -Patch6001: backport-ping-fix-overflow-on-negative.patch -Patch6002: backport-tracepath-Restore-the-MTU-probing-behavior.patch -# reference https://github.com/iputils/iputils/commit/608c62b3967882d31ff9edde97e38de0fcff154b -Patch6003: backport-tracepath-Merge-if-clauses.patch - -BuildRequires: gcc meson libidn2-devel openssl-devel libcap-devel libxslt -BuildRequires: docbook5-style-xsl systemd iproute glibc-kernheaders gettext +BuildRequires: gcc +BuildRequires: meson >= 0.44 +BuildRequires: pkgconfig(libidn2) +BuildRequires: pkgconfig(systemd) +BuildRequires: libcap-devel +BuildRequires: gettext +BuildRequires: /usr/bin/xsltproc docbook5-style-xsl %{?systemd_ordering} Provides: /bin/ping /bin/ping6 /sbin/arping @@ -36,21 +31,18 @@ the target machine is alive and receiving network traffic. %package_help %prep -%setup -q -a 1 -n %{name}-%{version} -cp %{SOURCE2} %{SOURCE3} . - -%autopatch -p1 +%autosetup -a 1 -n %{name}-%{version} -p1 %build -export LDFLAGS="-Wl,-z,relro,-z,now" - -%meson -Db_pie=true +%meson %meson_build -%{__cc} -Wall -fpie $RPM_OPT_FLAGS $CFLAGS $RPM_LD_FLAGS $LDFLAGS ifenslave.c -o ifenslave +%{__cc} -Wall -fpie %{build_cflags} %{build_ldflags} ifenslave.c -o ifenslave %install %meson_install +%find_lang %{name} + mkdir -p ${RPM_BUILD_ROOT}%{_bindir} mkdir -p ${RPM_BUILD_ROOT}%{_sbindir} ln -sf ../bin/ping ${RPM_BUILD_ROOT}%{_sbindir}/ping @@ -58,24 +50,16 @@ ln -sf ../bin/ping ${RPM_BUILD_ROOT}%{_sbindir}/ping6 ln -sf ../bin/tracepath ${RPM_BUILD_ROOT}%{_sbindir}/tracepath ln -sf ../bin/tracepath ${RPM_BUILD_ROOT}%{_sbindir}/tracepath6 ln -sf ../bin/arping ${RPM_BUILD_ROOT}%{_sbindir}/arping -ln -sf ping.8.gz ${RPM_BUILD_ROOT}%{_mandir}/man8/ping6.8.gz -ln -sf tracepath.8.gz ${RPM_BUILD_ROOT}%{_mandir}/man8/tracepath6.8.gz +echo ".so man8/ping.8" > ${RPM_BUILD_ROOT}%{_mandir}/man8/ping6.8 +echo ".so man8/tracepath.8" > ${RPM_BUILD_ROOT}%{_mandir}/man8/tracepath6.8 install -cp ifenslave ${RPM_BUILD_ROOT}%{_sbindir}/ install -cp ifenslave.8 ${RPM_BUILD_ROOT}%{_mandir}/man8/ -%post - -%preun - -%postun - -%files -%defattr(-,root,root) -%license bsd.txt gpl-2.0.txt LICENSE +%files -f %{name}.lang +%license Documentation/LICENSE.BSD3 Documentation/LICENSE.GPL2 LICENSE %attr(0755,root,root) %caps(cap_net_raw=p) %{_bindir}/clockdiff %attr(0755,root,root) %caps(cap_net_raw=p) %{_bindir}/arping %attr(0755,root,root) %caps(cap_net_raw=p cap_net_admin=p) %{_bindir}/ping -%{_datadir}/locale/* %{_sbindir}/ifenslave %{_bindir}/tracepath %{_sbindir}/ping @@ -83,14 +67,15 @@ install -cp ifenslave.8 ${RPM_BUILD_ROOT}%{_mandir}/man8/ %{_sbindir}/tracepath %{_sbindir}/tracepath6 %{_sbindir}/arping -%{_bindir}/tracepath %files help -%defattr(-,root,root) %doc README.bonding -%{_mandir}/man8/*.8.gz +%{_mandir}/man8/*.8* %changelog +* Sat Sep 07 2024 Funda Wang - 20240905-1 +- update to 20240905 + * Thu May 16 2024 xiaozai - 20221126-5 - Type:NA - ID:NA