Merge pull request #75 from Mcklaren/patch-20

Version 2023.05.14
2025-04-05 16:54:03 +00:00 · 2023-05-15 00:51:07 +02:00 · 2023-05-15 00:51:07 +02:00 · 9854f3f6cc
commit 9854f3f6cc
parent 0f15163789 8d9124f93e
70 changed files with 38 additions and 29 deletions
--- a/archive/NerdTools-2023.05.14-x86_64-1.txz
+++ b/archive/NerdTools-2023.05.14-x86_64-1.txz
--- a/packages/6.11/gpgme-1.18.0-x86_64-1.txz
+++ b/packages/6.11/gpgme-1.18.0-x86_64-1.txz
--- a/packages/6.11/gpgme-1.20.0-x86_64-1.txz
+++ b/packages/6.11/gpgme-1.20.0-x86_64-1.txz
--- a/packages/6.11/irssi-1.4.3-x86_64-1.txz
+++ b/packages/6.11/irssi-1.4.3-x86_64-1.txz
--- a/packages/6.11/irssi-1.4.4-x86_64-1.txz
+++ b/packages/6.11/irssi-1.4.4-x86_64-1.txz
--- a/packages/6.11/nodejs-20.1.0-x86_64-1_SBo_UES.txz
+++ b/packages/6.11/nodejs-20.1.0-x86_64-1_SBo_UES.txz
--- a/packages/6.11/python3-3.9.16-x86_64-1_slack15.0.txz
+++ b/packages/6.11/python3-3.9.16-x86_64-1_slack15.0.txz
--- a/packages/6.11/ruby-3.2.1-x86_64-2.txz
+++ b/packages/6.11/ruby-3.2.1-x86_64-2.txz
--- a/packages/6.11/ruby-3.2.2-x86_64-1.txz
+++ b/packages/6.11/ruby-3.2.2-x86_64-1.txz
--- a/packages/6.11/vim-9.0.1493-x86_64-1.txz
+++ b/packages/6.11/vim-9.0.1493-x86_64-1.txz
--- a/packages/6.12/axel-2.17.11-x86_64-3_SBo.txz
+++ b/packages/6.12/axel-2.17.11-x86_64-3_SBo.txz
--- a/packages/6.12/bc-1.07.1-x86_64-5.txz
+++ b/packages/6.12/bc-1.07.1-x86_64-5.txz
--- a/packages/6.12/borgbackup-1.2.4-x86_64-1_SBo_UES.txz
+++ b/packages/6.12/borgbackup-1.2.4-x86_64-1_SBo_UES.txz
--- a/packages/6.12/btop-1.2.13-x86_64-1_SBo_UES.txz
+++ b/packages/6.12/btop-1.2.13-x86_64-1_SBo_UES.txz
--- a/packages/6.12/ddrescue-1.27-x86_64-1.txz
+++ b/packages/6.12/ddrescue-1.27-x86_64-1.txz
--- a/packages/6.12/exiftool-12.47-noarch-1_SBo.txz
+++ b/packages/6.12/exiftool-12.47-noarch-1_SBo.txz
--- a/packages/6.12/fdupes-1.51-x86_64-3_slack_nerdtools.txz
+++ b/packages/6.12/fdupes-1.51-x86_64-3_slack_nerdtools.txz
--- a/packages/6.12/fzf-0.20.0-x86_64-3_slonly_nerdtools.txz
+++ b/packages/6.12/fzf-0.20.0-x86_64-3_slonly_nerdtools.txz
--- a/packages/6.12/gpgme-1.18.0-x86_64-1.txz
+++ b/packages/6.12/gpgme-1.18.0-x86_64-1.txz
--- a/packages/6.12/iftop-1.0pre4-x86_64-4.txz
+++ b/packages/6.12/iftop-1.0pre4-x86_64-4.txz
--- a/packages/6.12/iotop-0.6-x86_64-2_SBo.txz
+++ b/packages/6.12/iotop-0.6-x86_64-2_SBo.txz
--- a/packages/6.12/ipmitool-1.8.18-x86_64-1_SBo.txz
+++ b/packages/6.12/ipmitool-1.8.18-x86_64-1_SBo.txz
--- a/packages/6.12/irssi-1.4.3-x86_64-1.txz
+++ b/packages/6.12/irssi-1.4.3-x86_64-1.txz
--- a/packages/6.12/jdupes-1.21.0-x86_64-1_SBo_nerdtools.txz
+++ b/packages/6.12/jdupes-1.21.0-x86_64-1_SBo_nerdtools.txz
--- a/packages/6.12/lftp-4.9.2-x86_64-3.txz
+++ b/packages/6.12/lftp-4.9.2-x86_64-3.txz
--- a/packages/6.12/libassuan-2.5.5-x86_64-1.txz
+++ b/packages/6.12/libassuan-2.5.5-x86_64-1.txz
--- a/packages/6.12/libffi-3.4.4-x86_64-1.txz
+++ b/packages/6.12/libffi-3.4.4-x86_64-1.txz
--- a/packages/6.12/libmediainfo-22.06-x86_64-1_SBo_nerdtools.txz
+++ b/packages/6.12/libmediainfo-22.06-x86_64-1_SBo_nerdtools.txz
--- a/packages/6.12/libsodium-1.0.18-x86_64-3_nerdtools.txz
+++ b/packages/6.12/libsodium-1.0.18-x86_64-3_nerdtools.txz
--- a/packages/6.12/libzen-0.4.39-x86_64-1_SBo_nerdtools.txz
+++ b/packages/6.12/libzen-0.4.39-x86_64-1_SBo_nerdtools.txz
--- a/packages/6.12/llfuse-1.4.2-x86_64-1_SBo.txz
+++ b/packages/6.12/llfuse-1.4.2-x86_64-1_SBo.txz
--- a/packages/6.12/lzlib-1.13-x86_64-1.txz
+++ b/packages/6.12/lzlib-1.13-x86_64-1.txz
--- a/packages/6.12/mediainfo-22.06-x86_64-1_SBo_nerdtools.txz
+++ b/packages/6.12/mediainfo-22.06-x86_64-1_SBo_nerdtools.txz
--- a/packages/6.12/mktorrent-1.1-x86_64-1_nerdtools.txz
+++ b/packages/6.12/mktorrent-1.1-x86_64-1_nerdtools.txz
--- a/packages/6.12/mlocate-0.26-x86_64-4.txz
+++ b/packages/6.12/mlocate-0.26-x86_64-4.txz
--- a/packages/6.12/msgpack-python-1.0.5-x86_64-1_SBo_UES.txz
+++ b/packages/6.12/msgpack-python-1.0.5-x86_64-1_SBo_UES.txz
--- a/packages/6.12/ncdu-1.17-x86_64-1gds_nerdtools.txz
+++ b/packages/6.12/ncdu-1.17-x86_64-1gds_nerdtools.txz
--- a/packages/6.12/neofetch-20211210-noarch-1_nerdtools.txz
+++ b/packages/6.12/neofetch-20211210-noarch-1_nerdtools.txz
--- a/packages/6.12/nload-0.7.4-x86_64-1_slack_nerdtools.txz
+++ b/packages/6.12/nload-0.7.4-x86_64-1_slack_nerdtools.txz
--- a/packages/6.12/p7zip-17.04-x86_64-1_SBo_nerdtools.txz
+++ b/packages/6.12/p7zip-17.04-x86_64-1_SBo_nerdtools.txz
--- a/packages/6.12/pigz-2.7-x86_64-1_SBo.txz
+++ b/packages/6.12/pigz-2.7-x86_64-1_SBo.txz
--- a/packages/6.12/powershell-7.2.7-x86_64-1_SBo.txz
+++ b/packages/6.12/powershell-7.2.7-x86_64-1_SBo.txz
--- a/packages/6.12/powertop-2.15-x86_64-1.txz
+++ b/packages/6.12/powertop-2.15-x86_64-1.txz
--- a/packages/6.12/python-packaging-21.3-x86_64-1.txz
+++ b/packages/6.12/python-packaging-21.3-x86_64-1.txz
--- a/packages/6.12/python-pip-22.2.2-x86_64-1.txz
+++ b/packages/6.12/python-pip-22.2.2-x86_64-1.txz
--- a/packages/6.12/python-setuptools-65.1.1-x86_64-1.txz
+++ b/packages/6.12/python-setuptools-65.1.1-x86_64-1.txz
--- a/packages/6.12/python2-2.7.18-x86_64-5.txz
+++ b/packages/6.12/python2-2.7.18-x86_64-5.txz
--- a/packages/6.12/rar-6.12-x86_64-1_SBo_nerdtools.txz
+++ b/packages/6.12/rar-6.12-x86_64-1_SBo_nerdtools.txz
--- a/packages/6.12/restic-0.15.1-x86_64-1_SBo_UES.txz
+++ b/packages/6.12/restic-0.15.1-x86_64-1_SBo_UES.txz
--- a/packages/6.12/rsnapshot-1.4.4-x86_64-1_SBo.txz
+++ b/packages/6.12/rsnapshot-1.4.4-x86_64-1_SBo.txz
--- a/packages/6.12/screen-4.9.0-x86_64-1_nerdtools.txz
+++ b/packages/6.12/screen-4.9.0-x86_64-1_nerdtools.txz
--- a/packages/6.12/sshfs-3.7.3-x86_64-1.txz
+++ b/packages/6.12/sshfs-3.7.3-x86_64-1.txz
--- a/packages/6.12/tcl-8.6.13-x86_64-1.txz
+++ b/packages/6.12/tcl-8.6.13-x86_64-1.txz
--- a/packages/6.12/tcllib-1.21-x86_64-1_SBo.txz
+++ b/packages/6.12/tcllib-1.21-x86_64-1_SBo.txz
--- a/packages/6.12/tmux-3.3a-x86_64-1.txz
+++ b/packages/6.12/tmux-3.3a-x86_64-1.txz
--- a/packages/6.12/unrar-6.12-x86_64-1_SBo_nerdtools.txz
+++ b/packages/6.12/unrar-6.12-x86_64-1_SBo_nerdtools.txz
--- a/packages/6.12/utf8proc-2.8.0-x86_64-1.txz
+++ b/packages/6.12/utf8proc-2.8.0-x86_64-1.txz
--- a/packages/6.12/wget2-2.0.1-x86_64-1.txz
+++ b/packages/6.12/wget2-2.0.1-x86_64-1.txz
--- a/packages/6.12/zsh-5.9-x86_64-1.txz
+++ b/packages/6.12/zsh-5.9-x86_64-1.txz
--- a/packages/packages-depends
+++ b/packages/packages-depends
@ -4,6 +4,7 @@
 	"iotop": "python2,libffi",
 	"irssi": "utf8proc",
 	"mediainfo": "libzen,libmediainfo",
+	"python3": "python-pip,python-setuptools",
 	"tmux": "ncurses-terminfo",
 	"vim": "libsodium",
 	"wget2": "gpgme,lzlib,libassuan"
--- a/packages/pkgs/gpgme-1.18.0-x86_64-1.txz
+++ b/packages/pkgs/gpgme-1.18.0-x86_64-1.txz
--- a/packages/pkgs/gpgme-1.20.0-x86_64-1.txz
+++ b/packages/pkgs/gpgme-1.20.0-x86_64-1.txz
--- a/packages/pkgs/irssi-1.4.3-x86_64-1.txz
+++ b/packages/pkgs/irssi-1.4.3-x86_64-1.txz
--- a/packages/pkgs/irssi-1.4.4-x86_64-1.txz
+++ b/packages/pkgs/irssi-1.4.4-x86_64-1.txz
--- a/packages/pkgs/nodejs-20.1.0-x86_64-1_SBo_UES.txz
+++ b/packages/pkgs/nodejs-20.1.0-x86_64-1_SBo_UES.txz
--- a/packages/pkgs/python3-3.9.16-x86_64-1_slack15.0.txz
+++ b/packages/pkgs/python3-3.9.16-x86_64-1_slack15.0.txz
--- a/packages/pkgs/ruby-3.2.2-x86_64-1.txz
+++ b/packages/pkgs/ruby-3.2.2-x86_64-1.txz
--- a/packages/pkgs/vim-9.0.1418-x86_64-1.txz
+++ b/packages/pkgs/vim-9.0.1418-x86_64-1.txz
--- a/packages/pkgs/vim-9.0.1493-x86_64-1.txz
+++ b/packages/pkgs/vim-9.0.1493-x86_64-1.txz
--- a/plugin/NerdTools.plg
+++ b/plugin/NerdTools.plg
@ -3,8 +3,8 @@
 <!DOCTYPE PLUGIN [
 <!ENTITY name      "NerdTools">
 <!ENTITY author    "UnRAIDES">
-<!ENTITY version   "2023.05.07">
-<!ENTITY md5       "ad9092c4776721583702e501e0735649">
+<!ENTITY version   "2023.05.14">
+<!ENTITY md5       "8b1f335455a38d3bb98e2cb8f488f2db">
 <!ENTITY launch    "Settings/&name;">
 <!ENTITY github    "UnRAIDES/unRAID-&name;">
 <!ENTITY pluginURL "https://raw.githubusercontent.com/&github;/main/plugin/&name;.plg">
@ -15,9 +15,17 @@

 <PLUGIN name="&name;" author="&author;" version="&version;" launch="&launch;" pluginURL="&pluginURL;" min="6.11">

-<CHANGES>
+  <CHANGES>
 ##&name;
-###2023.05.05
+###2023.05.14
+- Update: gpgme-1.20.0
+- Update: irssi-1.4.4
+- Update: ruby-3.2.2
+- Update: vim-9.0.1493
+- Added: Nodejs-20.1.0
+- Fixed: rollback python3-3.9.16 to release 1 that fix SSL problem (Issues #74)
+- Enhanced: Add python-pip and python-setuptools as dependency of python3
+###2023.05.07
 - Enhanced: add dependencies column
 - Enhanced: rearrange multiple columns
 - Enhanced: delete DOWNLOADED column
@ -119,12 +127,12 @@
 - Cleaned code and deleted packages unused that are include on UnRAID 6.11
 - New system for install packages

-</CHANGES>
+  </CHANGES>

-<!-- The 'pre-install' script. -->
-<FILE Run="/usr/bin/php">
-<INLINE>
-<![CDATA[
+  <!-- The 'pre-install' script. -->
+  <FILE Run="/usr/bin/php">
+    <INLINE>
+      <![CDATA[
 <?
  $version = parse_ini_file("/etc/unraid-version");
  
@ -140,23 +148,23 @@
 	
 ?>
 ]]>
-</INLINE>
-</FILE>
+    </INLINE>
+  </FILE>

-<FILE Run="/bin/bash">
-<INLINE>
+  <FILE Run="/bin/bash">
+    <INLINE>
 # Remove old 'source' files
 rm -f $(ls /boot/config/plugins/&name;/&name;*.txz 2>/dev/null &#124; grep -v '&version;')
-</INLINE>
-</FILE>
+    </INLINE>
+  </FILE>



-<!--
+  <!--
 The 'install' script.
 -->
-<FILE Run="/bin/bash" Method="install">
-<INLINE>
+  <FILE Run="/bin/bash" Method="install">
+    <INLINE>

 echo ""
 echo "-----------------------------------------------------------"
@ -167,20 +175,20 @@ echo " based on NerdPack"
 echo " Version: &version;"
 echo "-----------------------------------------------------------"
 echo ""
-</INLINE>
-</FILE>
+    </INLINE>
+  </FILE>


-<FILE Name="/boot/config/plugins/&name;/&name;-&version;-x86_64-1.txz" Run="upgradepkg --install-new --reinstall">
-<URL>https://raw.githubusercontent.com/UnRAIDES/unRAID-&name;/main/archive/&name;-&version;-x86_64-1.txz</URL>
-<MD5>&md5;</MD5>
-</FILE>
+  <FILE Name="/boot/config/plugins/&name;/&name;-&version;-x86_64-1.txz" Run="upgradepkg --install-new --reinstall">
+    <URL>https://raw.githubusercontent.com/UnRAIDES/unRAID-&name;/main/archive/&name;-&version;-x86_64-1.txz</URL>
+    <MD5>&md5;</MD5>
+  </FILE>

-<!--
+  <!--
 The 'remove' script.
 -->
-<FILE Run="/bin/bash" Method="remove">
-<INLINE>
+  <FILE Run="/bin/bash" Method="remove">
+    <INLINE>

 removepkg &plgPATH;/&plgNAME;.txz
 rm -rf &emhttp;
@ -198,7 +206,7 @@ echo " based on NerdPack"
 echo " Version: &version;"
 echo "-----------------------------------------------------------"
 echo ""
-</INLINE>
-</FILE>
+    </INLINE>
+  </FILE>

 </PLUGIN>