From 71cfe887a317e0ca1ba1291eb8dbb8c3c87ab950 Mon Sep 17 00:00:00 2001 From: Harald Hope Date: Sun, 17 Sep 2023 17:42:36 -0700 Subject: [PATCH] Updated for change to codeberg.org from github, updated readme, added a short term patch version so the master inxi has the right urls in it. --- README.txt | 65 +++++++++++++++++++++++++++++++++++++------------- inxi | 18 +++++++------- inxi.1 | 12 +++++----- inxi.changelog | 22 +++++++++++++++++ 4 files changed, 85 insertions(+), 32 deletions(-) diff --git a/README.txt b/README.txt index ec2c9db..9f93b0d 100644 --- a/README.txt +++ b/README.txt @@ -8,6 +8,37 @@ issue reports. The code in pre 2.9 versions literally no longer exists in inxi 3. Bugs from earlier versions cannot usually be solved in the new version since the pre 2.9 and the 2.9 and later versions are completely different internally. +-------------------------------------------------------------------------------- +CODEBERG SOURCE REPO +-------------------------------------------------------------------------------- + +Packagers: Make sure to change your package URLs and repos to use codeberg.org. + +For inxi, after version 3.3.30 is released (probably in later September, 2023, +it's unlikely any further updates will be mirrored to github because I plan on +redoing the structure of the inxi repo fundamentally, probably into separate +repos for each unrelated branch like inxi-docs, inxi-perl (aka pinxi), and so +on. + +-------------------------------------------------------------------------------- + +Please file issue reports or feature requests at: + +https://codeberg.org/smxi/inxi + +The Codeberg repos will be mirrored to Github until the inxi repo refactor is +done, after that, no updates to github repos will be made. Some time after that, +the code will be removed. + +Please take the time to read this helpful article from the Software Freedom +Conservancy: + +https://sfconservancy.org/GiveUpGitHub/ + +Any use of this project's code by GitHub Copilot, past or present, is done +without my permission. I do not consent to GitHub's use of this project's code +in Copilot. + -------------------------------------------------------------------------------- DONATE -------------------------------------------------------------------------------- @@ -68,7 +99,7 @@ See BSD/UNIX below for qualifications re BSDs, and OSX in particular. SOURCE VERSION CONTROL -------------------------------------------------------------------------------- -https://github.com/smxi/inxi +https://codeberg.org/smxi/inxi MAIN BRANCH: master DEVELOPMENT BRANCHES: inxi-perl, one, two @@ -103,18 +134,18 @@ This is the only supported branch, and the current latest commit/version is the only supported 'release'. There are no 'releases' of inxi beyond the current commit/version in master. All past versions are not supported. -git clone https://github.com/smxi/inxi --branch master --single-branch +git clone https://codeberg.org/smxi/inxi --branch master --single-branch OR direct fast and easy install: -wget -O inxi https://github.com/smxi/inxi/raw/master/inxi +wget -O inxi https://codeberg.org/smxi/inxi/raw/master/inxi -OR easy to remember shortcut (which redirects to github): +OR easy to remember shortcut (which redirects to codeberg.org): wget -O inxi https://smxi.org/inxi wget -O inxi smxi.org/inxi -NOTE: Just because github calls tagged commits 'Releases' does not mean they are +NOTE: Just because codeberg.org calls tagged commits 'Releases' does not mean they are releases! I can't change the words on the tag page. They are tagged commits, period. A tag is a pointer to a commit, and has no further meaning. @@ -141,13 +172,13 @@ DEVELOPMENT BRANCH All active development is now done on the inxi-perl branch (pinxi): -git clone https://github.com/smxi/inxi --branch inxi-perl --single-branch +git clone https://codeberg.org/smxi/inxi --branch inxi-perl --single-branch OR direct fast and easy install: -wget -O pinxi https://github.com/smxi/inxi/raw/inxi-perl/pinxi +wget -O pinxi https://codeberg.org/smxi/inxi/raw/inxi-perl/pinxi -OR easy to remember shortcut (which redirects to github): +OR easy to remember shortcut (which redirects to codeberg.org): wget -O pinxi https://smxi.org/pinxi wget -O pinxi smxi.org/pinxi @@ -170,9 +201,9 @@ inxi-legacy repo, as binxi in the /inxi-legacy directory: Direct fast and easy install: -wget -O binxi https://github.com/smxi/inxi-legacy/raw/master/inxi-legacy/binxi +wget -O binxi https://codeberg.org/smxi/inxi-legacy/raw/master/binxi -OR easy to remember shortcut (which redirects to github): +OR easy to remember shortcut (which redirects to codeberg.org): wget -O binxi https://smxi.org/binxi @@ -198,9 +229,9 @@ DOCUMENTATION https://smxi.org/docs/inxi.htm (smxi.org/docs/ is easier to remember, and is one click away from inxi.htm). The -one page wiki on github is only a pointer to the real resources. +one page wiki on codeberg.org is only a pointer to the real resources. -https://github.com/smxi/inxi/tree/inxi-perl/docs +https://codeberg.org/smxi/inxi/tree/inxi-perl/docs Contains specific Perl inxi documentation, of interest mostly to developers. Includes internal inxi tools, values, configuration items. Also has useful @@ -216,11 +247,11 @@ NOTE: Check the inxi version number on each doc page to see which version will support the options listed. The man and options page also link to a legacy version, pre 2.9. -https://github.com/smxi/inxi/wiki +https://codeberg.org/smxi/inxi/wiki This is simply a page with links to actual inxi resources, which can be useful -for developers and people with technical questions. No attempt will be made -to reproduce those external resources here on github. You'll find stuff like +for developers and people with technical questions. No attempt will be made to +reproduce those external resources here on codeberg.org. You'll find stuff like how to export to json/xml there, and basic core philosophies, etc. -------------------------------------------------------------------------------- @@ -230,13 +261,13 @@ IRC You can go to: irc.oftc.net or irc.libera.chat channel #smxi but be prepared to wait around for a while to get a response. Generally it's -better to use github issues. +better to use codeberg.org issues. -------------------------------------------------------------------------------- ISSUES -------------------------------------------------------------------------------- -https://github.com/smxi/inxi/issues +https://codeberg.org/smxi/inxi/issues No issues accepted for non current inxi versions. See below for more on that. Unfortunately as of 2.9, no support or issues can be accepted for older inxi's because inxi 2.9 (Perl) and newer is a full rewrite, and legacy inxi is not diff --git a/inxi b/inxi index c10364e..5325d40 100755 --- a/inxi +++ b/inxi @@ -50,8 +50,8 @@ use POSIX qw(ceil uname strftime ttyname); ## INXI INFO ## my $self_name='inxi'; my $self_version='3.3.29'; -my $self_date='2023-08-15'; -my $self_patch='00'; +my $self_date='2023-09-17'; +my $self_patch='01'; ## END INXI INFO ## my ($b_pledge,@pledges); @@ -4541,15 +4541,15 @@ sub get_defaults { my ($type) = @_; my %defaults = ( 'ftp-upload' => 'ftp.smxi.org/incoming', - 'inxi-branch-1' => 'https://github.com/smxi/inxi/raw/one/', - 'inxi-branch-2' => 'https://github.com/smxi/inxi/raw/two/', + 'inxi-branch-1' => 'https://codeberg.org/smxi/inxi/raw/one/', + 'inxi-branch-2' => 'https://codeberg.org/smxi/inxi/raw/two/', 'inxi-dev' => 'https://smxi.org/in/', - 'inxi-main' => 'https://github.com/smxi/inxi/raw/master/', - 'inxi-pinxi' => 'https://github.com/smxi/inxi/raw/inxi-perl/', + 'inxi-main' => 'https://codeberg.org/smxi/inxi/raw/master/', + 'inxi-pinxi' => 'https://codeberg.org/smxi/inxi/raw/inxi-perl/', 'inxi-man' => "https://smxi.org/in/$self_name.1", - 'inxi-man-gh' => "https://github.com/smxi/inxi/raw/master/$self_name.1", + 'inxi-man-gh' => "https://codeberg.org/smxi/inxi/raw/master/$self_name.1", 'pinxi-man' => "https://smxi.org/in/$self_name.1", - 'pinxi-man-gh' => "https://github.com/smxi/inxi/raw/inxi-perl/$self_name.1", + 'pinxi-man-gh' => "https://codeberg.org/smxi/inxi/raw/inxi-perl/$self_name.1", ); if (exists $defaults{$type}){ return $defaults{$type}; @@ -6305,7 +6305,7 @@ sub show_version { } push(@$rows, [ 0, '', '', '' ], - [ 0, '', '', "Website:^https://github.com/smxi/inxi^or^https://smxi.org/" ], + [ 0, '', '', "Website:^https://codeberg.org/smxi/inxi^or^https://smxi.org/" ], [ 0, '', '', "IRC:^irc.oftc.net channel:^#smxi" ], [ 0, '', '', "Forums:^https://techpatterns.com/forums/forum-33.html" ], [ 0, '', '', '' ], diff --git a/inxi.1 b/inxi.1 index 7927b67..e89b5d7 100644 --- a/inxi.1 +++ b/inxi.1 @@ -15,7 +15,7 @@ .\" with this program; if not, write to the Free Software Foundation, Inc., .\" 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. .\" -.TH INXI 1 "2023\-08\-15" "inxi" "inxi manual" +.TH INXI 1 "2023\-09\-17" "inxi" "inxi manual" .SH NAME inxi \- Command line system information script for console and IRC @@ -2704,7 +2704,7 @@ color codes in the output, use the \fB\-c [color ID]\fR flag. The sign you need to use this is extra numbers before the key/value pairs of the output of your program. These are IRC, not TTY, color codes. Please post a -github issue if you find you need to use \fB\-\-tty\fR (including the full +codeberg.org issue if you find you need to use \fB\-\-tty\fR (including the full \fB\-Ixxx\fR line) so we can figure out how to add your program to the list of whitelisted programs. @@ -2753,8 +2753,8 @@ Accepts one or more comma separated dbg specific debugging numbers. and fetch. Shows more downloader action information. Shows some more information for Perl downloader. -\fB1\-xx\fR \- See github \fBinxi\-perl/docs/inxi\-values.txt\fR for specific -specialized debugging options. There are a lot. +\fB1\-xx\fR \- See codeberg.org \fBinxi\-perl/docs/inxi\-values.txt\fR for +specific specialized debugging options. There are a lot. .TP .B \-\-debug [1\-3]\fR @@ -3071,7 +3071,7 @@ data inxi uses to parse out its report. .TP .B Issue Report File an issue report: -.I https://github.com/smxi/inxi/issues +.I https://codeberg.org/smxi/inxi/issues .TP .B Forums Post on inxi forums: @@ -3081,7 +3081,7 @@ Post on inxi forums: You can also visit \fRchannel:\fI #smxi\fR to post issues on either network. .SH HOMEPAGE -.I https://github.com/smxi/inxi +.I https://codeberg.org/smxi/inxi \fR \- Home of the source code, and tech docs (\fIinxi\-perl/docs\fR). diff --git a/inxi.changelog b/inxi.changelog index 685da62..525fa0f 100644 --- a/inxi.changelog +++ b/inxi.changelog @@ -1,3 +1,25 @@ +================================================================================ +Version: 3.3.29 +Patch: 01 +Date: 2023-09-17 +-------------------------------------------------------------------------------- +RELEASE NOTES: +-------------------------------------------------------------------------------- + +Packagers: Please update your build tools to build from: + +https://codeberg.org/smxi/inxi + +repos. Codeberg will mirror to github until after 3.3.30 is released, after that +there will be more fundamental repo changes, but nothing that should impact inxi +packagers. But no attempt will be made to mirror those changes to github when +they are made because it takes too much work. + +This is a transitional patch version, the only change is altering the self +updater URLs to codeberg.org from github.com. Mainly so that the master branch +will give the correct URLs until 3.3.30 is released, which will be in a few +weeks. + ================================================================================ Version: 3.3.29 Patch: 00