From bf07c68a909eb93f8005c87b2af90b6cccc5d334 Mon Sep 17 00:00:00 2001 From: Daniil Baturin Date: Fri, 30 Jul 2021 22:19:09 +0700 Subject: Initial commit --- LICENSE | 339 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ README.md | 2 + 2 files changed, 341 insertions(+) create mode 100644 LICENSE create mode 100644 README.md diff --git a/LICENSE b/LICENSE new file mode 100644 index 000000000..d159169d1 --- /dev/null +++ b/LICENSE @@ -0,0 +1,339 @@ + 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/README.md b/README.md new file mode 100644 index 000000000..38a76e41c --- /dev/null +++ b/README.md @@ -0,0 +1,2 @@ +# vyos-user-utils +Meta-package for user utilities not required by the VyOS itself -- cgit v1.2.3 From 721b295a2fddb3227a9cbe7444ca39bfe52879b1 Mon Sep 17 00:00:00 2001 From: Daniil Baturin Date: Fri, 30 Jul 2021 10:42:26 -0500 Subject: Initial import. --- .gitignore | 4 ++++ Jenkinsfile | 23 +++++++++++++++++++++++ debian/changelog | 5 +++++ debian/compat | 1 + debian/control | 12 ++++++++++++ debian/copyright | 35 +++++++++++++++++++++++++++++++++++ debian/rules | 4 ++++ 7 files changed, 84 insertions(+) create mode 100644 .gitignore create mode 100644 Jenkinsfile create mode 100644 debian/changelog create mode 100644 debian/compat create mode 100644 debian/control create mode 100644 debian/copyright create mode 100755 debian/rules diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..2016a9dd4 --- /dev/null +++ b/.gitignore @@ -0,0 +1,4 @@ +debian/files +debian/*.debhelper.log +debian/*.substvars +debian/vyos-user-utils diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 000000000..21a6829c0 --- /dev/null +++ b/Jenkinsfile @@ -0,0 +1,23 @@ +// Copyright (C) 2020-2021 VyOS maintainers and contributors +// +// This program is free software; you can redistribute it and/or modify +// in order to easy exprort images built to "external" world +// it under the terms of the GNU General Public License version 2 or later as +// published by the Free Software Foundation. +// +// 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, see . +@NonCPS + +// Using a version specifier library, use 'current' branch. The underscore (_) +// is not a typo! You need this underscore if the line immediately after the +// @Library annotation is not an import statement! +@Library('vyos-build@current')_ + +// Start package build using library function from https://github.com/vyos/vyos-build +buildPackage(null, null, null, true) diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 000000000..86874cf54 --- /dev/null +++ b/debian/changelog @@ -0,0 +1,5 @@ +vyos-user-utils (1.4.0+vyos1+current) unstable; urgency=medium + + * Initial version. + + -- Daniil Baturin Fri, 30 Jul 2021 10:31:40 -0500 diff --git a/debian/compat b/debian/compat new file mode 100644 index 000000000..ec635144f --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +9 diff --git a/debian/control b/debian/control new file mode 100644 index 000000000..61a7825b7 --- /dev/null +++ b/debian/control @@ -0,0 +1,12 @@ +Source: vyos-user-utils +Section: contrib/net +Priority: extra +Maintainer: VyOS Package Maintainers +Build-Depends: debhelper (>= 5) +Standards-Version: 3.9.1 + +Package: vyos-user-utils +Architecture: all +Depends: sipcalc +Description: VyOS metapackage + Installs everything required for VyOS to work diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 000000000..73744cbee --- /dev/null +++ b/debian/copyright @@ -0,0 +1,35 @@ +This package was debianized by Daniil Baturin on +Fri, 30 Jul 2021 10:31:40 -0500 + +It's original content from the GIT repository + +Upstream Author: + + + +Copyright: + + Copyright (C) 2021 VyOS maintainers and contributors + All Rights Reserved. + +License: + +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, 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. + +A copy of the GNU General Public License is available as +`/usr/share/common-licenses/GPL' in the Debian GNU/Linux distribution +or on the World Wide Web at `http://www.gnu.org/copyleft/gpl.html'. +You can also obtain it by writing to the Free Software Foundation, +Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, +MA 02110-1301, USA. + +The Debian packaging is (C) 2021, Daniil Baturin and +is licensed under the GPL, see above. diff --git a/debian/rules b/debian/rules new file mode 100755 index 000000000..2d33f6ac8 --- /dev/null +++ b/debian/rules @@ -0,0 +1,4 @@ +#!/usr/bin/make -f + +%: + dh $@ -- cgit v1.2.3 From 7c3ed0705ee886e395ace861c331220eff922074 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Sun, 1 Aug 2021 16:36:50 +0200 Subject: Jenkins: remove ARM build Package uses architecture "all" thus we do not need an extra ARM64 build --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 21a6829c0..ce5fcfbbb 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -20,4 +20,4 @@ @Library('vyos-build@current')_ // Start package build using library function from https://github.com/vyos/vyos-build -buildPackage(null, null, null, true) +buildPackage() -- cgit v1.2.3 From 8df3f2edb78a0925d005977ad13565cb00270f59 Mon Sep 17 00:00:00 2001 From: Daniil Baturin Date: Fri, 6 Aug 2021 16:26:21 -0500 Subject: Fix package description. --- debian/control | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/control b/debian/control index 61a7825b7..7a291600f 100644 --- a/debian/control +++ b/debian/control @@ -8,5 +8,5 @@ Standards-Version: 3.9.1 Package: vyos-user-utils Architecture: all Depends: sipcalc -Description: VyOS metapackage - Installs everything required for VyOS to work +Description: VyOS user utilities metapackage + Installs utilities that are provided for the users but no used by VyOS scripts. -- cgit v1.2.3 From 6e9a0a87ed9c1f173b0f63f14ba8984eb9b4ecb9 Mon Sep 17 00:00:00 2001 From: Daniil Baturin Date: Fri, 6 Aug 2021 16:49:59 -0500 Subject: Import dependencies from the former vyos-utils package list. --- debian/control | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 7a291600f..a9b3e79b4 100644 --- a/debian/control +++ b/debian/control @@ -7,6 +7,30 @@ Standards-Version: 3.9.1 Package: vyos-user-utils Architecture: all -Depends: sipcalc +Depends: + sipcalc, + ipcalc, + nmap, + dnsutils, + whois, + netcat-openbsd, + socat, + nano, + screen, + minicom, + iftop, + lsof, + openssh-client, + haveged, + htop, + atop, + iotop, + irqtop, + aptitude, + localepurge, + bgpq3, + libnss-myhostname, + ssl-cert, + ndisc6 Description: VyOS user utilities metapackage Installs utilities that are provided for the users but no used by VyOS scripts. -- cgit v1.2.3 From 95db6327c4a7b94eb4634fac715a7be50a41bdf2 Mon Sep 17 00:00:00 2001 From: Daniil Baturin Date: Sun, 19 Sep 2021 18:33:44 +0700 Subject: Include haproxy in the image --- debian/control | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/control b/debian/control index a9b3e79b4..e0a134ecf 100644 --- a/debian/control +++ b/debian/control @@ -31,6 +31,7 @@ Depends: bgpq3, libnss-myhostname, ssl-cert, - ndisc6 + ndisc6, + haproxy Description: VyOS user utilities metapackage Installs utilities that are provided for the users but no used by VyOS scripts. -- cgit v1.2.3 From 0651ab8f1cf2b1e5b1ea6ce59e50d2f632c35227 Mon Sep 17 00:00:00 2001 From: Daniil Baturin Date: Sun, 19 Sep 2021 19:43:08 +0700 Subject: Add dnsdist to the image --- debian/control | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/control b/debian/control index e0a134ecf..33fd9a0ae 100644 --- a/debian/control +++ b/debian/control @@ -32,6 +32,7 @@ Depends: libnss-myhostname, ssl-cert, ndisc6, - haproxy + haproxy, + dnsdist Description: VyOS user utilities metapackage Installs utilities that are provided for the users but no used by VyOS scripts. -- cgit v1.2.3 From 0c39db324863302fdb555bc10641181bb0a5167c Mon Sep 17 00:00:00 2001 From: Viacheslav Date: Tue, 28 Dec 2021 17:10:36 +0000 Subject: user-pkgs: T4023: Add user pkg grepcidr and sorting the pkgs --- debian/control | 39 ++++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/debian/control b/debian/control index 33fd9a0ae..5047bc9c0 100644 --- a/debian/control +++ b/debian/control @@ -8,31 +8,32 @@ Standards-Version: 3.9.1 Package: vyos-user-utils Architecture: all Depends: - sipcalc, - ipcalc, - nmap, + aptitude, + atop, + bgpq3, + dnsdist, dnsutils, - whois, - netcat-openbsd, - socat, - nano, - screen, - minicom, - iftop, - lsof, - openssh-client, + grepcidr, + haproxy, haveged, htop, - atop, + iftop, iotop, + ipcalc, irqtop, - aptitude, - localepurge, - bgpq3, libnss-myhostname, - ssl-cert, + localepurge, + lsof, + minicom, + nano, ndisc6, - haproxy, - dnsdist + netcat-openbsd, + nmap, + openssh-client, + screen, + sipcalc, + socat, + ssl-cert, + whois Description: VyOS user utilities metapackage Installs utilities that are provided for the users but no used by VyOS scripts. -- cgit v1.2.3 From d0e0e06aca43908db19379463ae431e1d40e01b0 Mon Sep 17 00:00:00 2001 From: Daniil Baturin Date: Mon, 16 May 2022 03:33:44 -0400 Subject: T4426: add arpwatch to the image --- debian/control | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/control b/debian/control index 5047bc9c0..0deded804 100644 --- a/debian/control +++ b/debian/control @@ -9,6 +9,7 @@ Package: vyos-user-utils Architecture: all Depends: aptitude, + arpwatch, atop, bgpq3, dnsdist, -- cgit v1.2.3 From b760f2e4cb33ded9212a4e9b8bbae165d60a04cc Mon Sep 17 00:00:00 2001 From: Viacheslav Hletenko Date: Sat, 26 Nov 2022 12:41:07 +0000 Subject: T4841: Add fancontrol user-utils package Add user-util "fancontrol" package --- debian/control | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/control b/debian/control index 0deded804..f6967d8f6 100644 --- a/debian/control +++ b/debian/control @@ -14,6 +14,7 @@ Depends: bgpq3, dnsdist, dnsutils, + fancontrol, grepcidr, haproxy, haveged, -- cgit v1.2.3 From be285897bad5bac9ff397f1b5bfbe5c44795c65e Mon Sep 17 00:00:00 2001 From: Devin Buhl Date: Thu, 23 Feb 2023 08:08:55 -0500 Subject: T5028: Add package exfatprogs --- debian/control | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/control b/debian/control index f6967d8f6..f56875db7 100644 --- a/debian/control +++ b/debian/control @@ -14,6 +14,7 @@ Depends: bgpq3, dnsdist, dnsutils, + exfatprogs, fancontrol, grepcidr, haproxy, -- cgit v1.2.3 From b184e949e246f1ac8e93e8f82d00efd965f39763 Mon Sep 17 00:00:00 2001 From: Devin Buhl Date: Thu, 23 Feb 2023 18:25:57 -0500 Subject: T5028: Add exfat-fuse package --- debian/control | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/control b/debian/control index f56875db7..0b8e4f7b9 100644 --- a/debian/control +++ b/debian/control @@ -14,6 +14,7 @@ Depends: bgpq3, dnsdist, dnsutils, + exfat-fuse, exfatprogs, fancontrol, grepcidr, -- cgit v1.2.3 From eb272121fce945381304ff8f233d3b054eda6f46 Mon Sep 17 00:00:00 2001 From: Viacheslav Hletenko Date: Wed, 4 Oct 2023 08:46:42 +0000 Subject: T5632: Add user-util jq to parse JSON files from sh Add useful tool "jq" to parse JSON files from sh scripts. echo '{"system": "VyOS", "rate": 100}' | jq '.system' "VyOS" --- debian/control | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/control b/debian/control index 0b8e4f7b9..83f14a7aa 100644 --- a/debian/control +++ b/debian/control @@ -25,6 +25,7 @@ Depends: iotop, ipcalc, irqtop, + jq, libnss-myhostname, localepurge, lsof, -- cgit v1.2.3 From 108f18ce1b5ca63e9cb20def13f5bb1a3eb920d4 Mon Sep 17 00:00:00 2001 From: Viacheslav Hletenko Date: Wed, 4 Oct 2023 09:17:19 +0000 Subject: T5222: Remove haproxy from user-utils as it added to vyos-1x Remove haproxy from user-utils as it was added to vyos-1x debian/control --- debian/control | 1 - 1 file changed, 1 deletion(-) diff --git a/debian/control b/debian/control index 0b8e4f7b9..71eb11a1c 100644 --- a/debian/control +++ b/debian/control @@ -18,7 +18,6 @@ Depends: exfatprogs, fancontrol, grepcidr, - haproxy, haveged, htop, iftop, -- cgit v1.2.3 From 6b4b111ecc732c02beed7ebf875090eae54cb94d Mon Sep 17 00:00:00 2001 From: Viacheslav Hletenko Date: Thu, 25 Jan 2024 11:47:07 +0000 Subject: T5984: Add user util numactl NUMA scheduling and memory placement tool --- debian/control | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/control b/debian/control index b98c524c5..b359ee6b9 100644 --- a/debian/control +++ b/debian/control @@ -33,6 +33,7 @@ Depends: ndisc6, netcat-openbsd, nmap, + numactl, openssh-client, screen, sipcalc, -- cgit v1.2.3 From 57ed5caa22f85764af44bc08767be8b73d7f64bb Mon Sep 17 00:00:00 2001 From: Viacheslav Hletenko Date: Sat, 14 Sep 2024 12:42:08 +0300 Subject: T6674: Action add trigger workflow to rebuild package --- .github/workflows/trigger-rebuild-repo-package.yml | 32 ++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 .github/workflows/trigger-rebuild-repo-package.yml diff --git a/.github/workflows/trigger-rebuild-repo-package.yml b/.github/workflows/trigger-rebuild-repo-package.yml new file mode 100644 index 000000000..37ec83274 --- /dev/null +++ b/.github/workflows/trigger-rebuild-repo-package.yml @@ -0,0 +1,32 @@ +name: Trigger to build a deb package from repo + +on: + pull_request_target: + types: + - closed + branches: + - current + workflow_dispatch: + +jobs: + get_repo_name: + runs-on: ubuntu-latest + outputs: + PACKAGE_NAME: ${{ steps.package_name.outputs.PACKAGE_NAME }} + steps: + - name: Set variables + id: package_name + run: | + echo "PACKAGE_NAME=$(basename ${{ github.repository }})" >> $GITHUB_OUTPUT + + trigger-build: + needs: get_repo_name + uses: vyos/.github/.github/workflows/trigger-rebuild-repo-package.yml@current + with: + branch: ${{ github.ref_name }} + package_name: ${{ needs.get_repo_name.outputs.PACKAGE_NAME }} + secrets: + REMOTE_OWNER: ${{ secrets.REMOTE_OWNER }} + REMOTE_REUSE_REPO: ${{ secrets.REMOTE_REUSE_REPO }} + GPG_KEY_ID: ${{ secrets.GPG_KEY_ID }} + PAT: ${{ secrets.PAT }} -- cgit v1.2.3 From 4efa84fe8fe085fb46b7bf1ec44fbaf02bcc097e Mon Sep 17 00:00:00 2001 From: Viacheslav Hletenko Date: Fri, 4 Oct 2024 08:35:40 +0000 Subject: T6763: Delete Jenkins file --- Jenkinsfile | 23 ----------------------- 1 file changed, 23 deletions(-) delete mode 100644 Jenkinsfile diff --git a/Jenkinsfile b/Jenkinsfile deleted file mode 100644 index ce5fcfbbb..000000000 --- a/Jenkinsfile +++ /dev/null @@ -1,23 +0,0 @@ -// Copyright (C) 2020-2021 VyOS maintainers and contributors -// -// This program is free software; you can redistribute it and/or modify -// in order to easy exprort images built to "external" world -// it under the terms of the GNU General Public License version 2 or later as -// published by the Free Software Foundation. -// -// 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, see . -@NonCPS - -// Using a version specifier library, use 'current' branch. The underscore (_) -// is not a typo! You need this underscore if the line immediately after the -// @Library annotation is not an import statement! -@Library('vyos-build@current')_ - -// Start package build using library function from https://github.com/vyos/vyos-build -buildPackage() -- cgit v1.2.3 From b212d0576593a05fb333d832bd648653bc32a149 Mon Sep 17 00:00:00 2001 From: Nicolas Vollmar Date: Wed, 23 Oct 2024 12:56:38 +0200 Subject: T6804: Add ipmitool to user utils --- debian/control | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/control b/debian/control index b359ee6b9..268480814 100644 --- a/debian/control +++ b/debian/control @@ -23,6 +23,7 @@ Depends: iftop, iotop, ipcalc, + ipmitool, irqtop, jq, libnss-myhostname, -- cgit v1.2.3 From b3aba4b1953551fee2513d806b20eed1310f5e9c Mon Sep 17 00:00:00 2001 From: kumvijaya Date: Tue, 8 Apr 2025 12:31:56 +0530 Subject: T7330: mirror workflows added --- .github/PULL_REQUEST_TEMPLATE.md | 35 +++++++++++++++++++++++ .github/workflows/cleanup-mirror-pr-branch.yml | 16 +++++++++++ .github/workflows/mirror-pr-and-sync.yml | 21 ++++++++++++++ .github/workflows/trigger-pr-mirror-repo-sync.yml | 13 +++++++++ 4 files changed, 85 insertions(+) create mode 100644 .github/PULL_REQUEST_TEMPLATE.md create mode 100644 .github/workflows/cleanup-mirror-pr-branch.yml create mode 100644 .github/workflows/mirror-pr-and-sync.yml create mode 100644 .github/workflows/trigger-pr-mirror-repo-sync.yml diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md new file mode 100644 index 000000000..e686e1875 --- /dev/null +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -0,0 +1,35 @@ + + + +## Change summary + + +## Types of changes + +- [ ] Bug fix (non-breaking change which fixes an issue) +- [ ] New feature (non-breaking change which adds functionality) +- [ ] Code style update (formatting, renaming) +- [ ] Refactoring (no functional changes) +- [ ] Migration from an old Vyatta component to vyos-1x, please link to related PR inside obsoleted component +- [ ] Other (please describe): + +## Related Task(s) + + + +## Related PR(s) + + +## Checklist: + + + +- [ ] I have read the [**CONTRIBUTING**](https://github.com/vyos/vyos-1x/blob/current/CONTRIBUTING.md) document +- [ ] I have linked this PR to one or more Phabricator Task(s) +- [ ] My commit headlines contain a valid Task id +- [ ] My change requires a change to the documentation +- [ ] I have updated the documentation accordingly diff --git a/.github/workflows/cleanup-mirror-pr-branch.yml b/.github/workflows/cleanup-mirror-pr-branch.yml new file mode 100644 index 000000000..a62e44b24 --- /dev/null +++ b/.github/workflows/cleanup-mirror-pr-branch.yml @@ -0,0 +1,16 @@ +name: Cleanup pr mirror branch + +on: + pull_request: + types: [closed] + branches: + - current + +permissions: + contents: write + +jobs: + call-delete-branch: + if: github.repository_owner != 'vyos' + uses: vyos/.github/.github/workflows/cleanup-mirror-pr-branch.yml@current + secrets: inherit diff --git a/.github/workflows/mirror-pr-and-sync.yml b/.github/workflows/mirror-pr-and-sync.yml new file mode 100644 index 000000000..120e116d4 --- /dev/null +++ b/.github/workflows/mirror-pr-and-sync.yml @@ -0,0 +1,21 @@ +name: Create Mirror PR and Repo Sync +on: + workflow_dispatch: + inputs: + sync_branch: + description: 'branch to sync' + required: true + type: string + +permissions: + pull-requests: write + contents: write + +jobs: + call-mirror-pr-and-sync: + if: github.repository_owner != 'vyos' + uses: VyOS-Networks/vyos-reusable-workflows/.github/workflows/mirror-pr-and-sync.yml@main + with: + sync_branch: ${{ inputs.sync_branch }} + secrets: + PAT: ${{ secrets.PAT }} diff --git a/.github/workflows/trigger-pr-mirror-repo-sync.yml b/.github/workflows/trigger-pr-mirror-repo-sync.yml new file mode 100644 index 000000000..f74895987 --- /dev/null +++ b/.github/workflows/trigger-pr-mirror-repo-sync.yml @@ -0,0 +1,13 @@ +name: Trigger Mirror PR and Repo Sync +on: + pull_request_target: + types: + - closed + branches: + - current + +jobs: + call-trigger-mirror-pr-repo-sync: + if: github.repository_owner == 'vyos' && github.event.pull_request.merged == true + uses: vyos/.github/.github/workflows/trigger-pr-mirror-repo-sync.yml@current + secrets: inherit -- cgit v1.2.3 From f16722b734597dac4558af4ef8565ee7f113dd6e Mon Sep 17 00:00:00 2001 From: Daniil Baturin Date: Fri, 18 Apr 2025 15:01:41 +0100 Subject: T7373: remove irqtop to avoid the overhead of having a Ruby runtims (30+ MB) in the image for a single, rarely-used program --- debian/control | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/debian/control b/debian/control index 268480814..e17a1e207 100644 --- a/debian/control +++ b/debian/control @@ -24,7 +24,6 @@ Depends: iotop, ipcalc, ipmitool, - irqtop, jq, libnss-myhostname, localepurge, @@ -42,4 +41,4 @@ Depends: ssl-cert, whois Description: VyOS user utilities metapackage - Installs utilities that are provided for the users but no used by VyOS scripts. + Installs utilities that are provided for the users but not used by VyOS scripts. -- cgit v1.2.3 From e38b83b50a68e54bbe9ff5dc180b76632bd2b50e Mon Sep 17 00:00:00 2001 From: kumvijaya Date: Sun, 20 Apr 2025 17:28:23 +0530 Subject: T7334: pr mirror trigger workflow added with label creation permission for default github token --- .github/workflows/trigger-pr-mirror-repo-sync.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/trigger-pr-mirror-repo-sync.yml b/.github/workflows/trigger-pr-mirror-repo-sync.yml index f74895987..7b4a241f8 100644 --- a/.github/workflows/trigger-pr-mirror-repo-sync.yml +++ b/.github/workflows/trigger-pr-mirror-repo-sync.yml @@ -5,6 +5,11 @@ on: - closed branches: - current + +permissions: + pull-requests: write + contents: write + issues: write jobs: call-trigger-mirror-pr-repo-sync: -- cgit v1.2.3 From 288587d3b61975d900449d710c37731e1d4df216 Mon Sep 17 00:00:00 2001 From: lemeshovich <17667824+lemeshovich@users.noreply.github.com> Date: Fri, 4 Jul 2025 15:43:13 +0300 Subject: T7579: added workflow for CLA --- .github/workflows/cla-check.yml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 .github/workflows/cla-check.yml diff --git a/.github/workflows/cla-check.yml b/.github/workflows/cla-check.yml new file mode 100644 index 000000000..3c1aeee67 --- /dev/null +++ b/.github/workflows/cla-check.yml @@ -0,0 +1,19 @@ +name: "CLA Check" + +permissions: + actions: write + contents: read + pull-requests: write + statuses: write + +on: + pull_request: + types: [opened, synchronize, closed] + issue_comment: + types: [created] + +jobs: + call-cla-assistant: + uses: vyos/vyos-cla-signatures/.github/workflows/cla-reusable.yml@current + secrets: + CLA_PAT: ${{ secrets.CLA_PAT }} -- cgit v1.2.3 From 378c9d8620306d7454bc7fbb85905caf753ead9c Mon Sep 17 00:00:00 2001 From: Yevhen Bondarenko Date: Mon, 14 Jul 2025 12:49:40 +0200 Subject: T7579: fix of the run trigger for CLA --- .github/workflows/cla-check.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/cla-check.yml b/.github/workflows/cla-check.yml index 3c1aeee67..625ff78f8 100644 --- a/.github/workflows/cla-check.yml +++ b/.github/workflows/cla-check.yml @@ -7,7 +7,7 @@ permissions: statuses: write on: - pull_request: + pull_request_target: types: [opened, synchronize, closed] issue_comment: types: [created] @@ -15,5 +15,4 @@ on: jobs: call-cla-assistant: uses: vyos/vyos-cla-signatures/.github/workflows/cla-reusable.yml@current - secrets: - CLA_PAT: ${{ secrets.CLA_PAT }} + secrets: inherit \ No newline at end of file -- cgit v1.2.3 From 5c4e4bf81446b142f709d681c9044b911db966c4 Mon Sep 17 00:00:00 2001 From: kumvijaya Date: Sun, 27 Jul 2025 21:40:31 +0530 Subject: T7644: mirror workflow refactoring rollout --- .github/workflows/cleanup-mirror-pr-branch.yml | 16 ----------- .github/workflows/mirror-pr-and-sync.yml | 21 -------------- .github/workflows/pr-mirror-repo-sync.yml | 35 +++++++++++++++++++++++ .github/workflows/trigger-pr-mirror-repo-sync.yml | 18 ------------ 4 files changed, 35 insertions(+), 55 deletions(-) delete mode 100644 .github/workflows/cleanup-mirror-pr-branch.yml delete mode 100644 .github/workflows/mirror-pr-and-sync.yml create mode 100644 .github/workflows/pr-mirror-repo-sync.yml delete mode 100644 .github/workflows/trigger-pr-mirror-repo-sync.yml diff --git a/.github/workflows/cleanup-mirror-pr-branch.yml b/.github/workflows/cleanup-mirror-pr-branch.yml deleted file mode 100644 index a62e44b24..000000000 --- a/.github/workflows/cleanup-mirror-pr-branch.yml +++ /dev/null @@ -1,16 +0,0 @@ -name: Cleanup pr mirror branch - -on: - pull_request: - types: [closed] - branches: - - current - -permissions: - contents: write - -jobs: - call-delete-branch: - if: github.repository_owner != 'vyos' - uses: vyos/.github/.github/workflows/cleanup-mirror-pr-branch.yml@current - secrets: inherit diff --git a/.github/workflows/mirror-pr-and-sync.yml b/.github/workflows/mirror-pr-and-sync.yml deleted file mode 100644 index 120e116d4..000000000 --- a/.github/workflows/mirror-pr-and-sync.yml +++ /dev/null @@ -1,21 +0,0 @@ -name: Create Mirror PR and Repo Sync -on: - workflow_dispatch: - inputs: - sync_branch: - description: 'branch to sync' - required: true - type: string - -permissions: - pull-requests: write - contents: write - -jobs: - call-mirror-pr-and-sync: - if: github.repository_owner != 'vyos' - uses: VyOS-Networks/vyos-reusable-workflows/.github/workflows/mirror-pr-and-sync.yml@main - with: - sync_branch: ${{ inputs.sync_branch }} - secrets: - PAT: ${{ secrets.PAT }} diff --git a/.github/workflows/pr-mirror-repo-sync.yml b/.github/workflows/pr-mirror-repo-sync.yml new file mode 100644 index 000000000..88fb563c7 --- /dev/null +++ b/.github/workflows/pr-mirror-repo-sync.yml @@ -0,0 +1,35 @@ +name: PR Mirror and Repo Sync + +on: + pull_request_target: + types: [closed] + branches: [current] + workflow_dispatch: + inputs: + sync_branch: + description: 'Branch to mirror' + required: true + default: 'current' + type: choice + options: + - current + +permissions: + pull-requests: write + contents: write + issues: write + +jobs: + call-pr-mirror-repo-sync: + if: | + github.repository_owner == 'vyos' && + ( + github.event_name == 'workflow_dispatch' || + (github.event_name == 'pull_request_target' && github.event.pull_request.merged == true) + ) + uses: vyos/.github/.github/workflows/pr-mirror-repo-sync.yml@current + with: + sync_branch: ${{ github.event.inputs.sync_branch || 'current' }} + secrets: + PAT: ${{ secrets.PAT }} + REMOTE_OWNER: ${{ secrets.REMOTE_OWNER }} diff --git a/.github/workflows/trigger-pr-mirror-repo-sync.yml b/.github/workflows/trigger-pr-mirror-repo-sync.yml deleted file mode 100644 index 7b4a241f8..000000000 --- a/.github/workflows/trigger-pr-mirror-repo-sync.yml +++ /dev/null @@ -1,18 +0,0 @@ -name: Trigger Mirror PR and Repo Sync -on: - pull_request_target: - types: - - closed - branches: - - current - -permissions: - pull-requests: write - contents: write - issues: write - -jobs: - call-trigger-mirror-pr-repo-sync: - if: github.repository_owner == 'vyos' && github.event.pull_request.merged == true - uses: vyos/.github/.github/workflows/trigger-pr-mirror-repo-sync.yml@current - secrets: inherit -- cgit v1.2.3