[merge] from unstable into stable

.QPKG-archives/NZBGet/packages.extract.source

@@ -0,0 +1,24 @@
+QPKG_NAME+=(NZBGet)
+QPKG_ARCH+=(all)
+QPKG_VERSION+=(<?version?>)
+QPKG_HASH+=(<?hash?>)
+QPKG_URL+=(<?cdn_sherpa_packages_url?>/<?qpkg_filename?>)
+QPKG_MIN_RAM_KB+=(none)
+QPKG_MIN_OS_VERSION+=(400)
+QPKG_MAX_OS_VERSION+=(none)
+QPKG_AUTHOR+=('OneCD (OneCDOnly on GitHub)')
+QPKG_AUTHOR_EMAIL+=("[email protected]")
+QPKG_APPL_AUTHOR+=("hugbug@GitHub")
+QPKG_APPL_AUTHOR_EMAIL+=(none)
+QPKG_APPL_VERSION+=(21.1)
+QPKG_DESC+=('lite-and-fast NZB download manager with a simple web UI')
+QPKG_NOTE+=(none)
+QPKG_ABBRVS+=('ng nzb nzbg nget nzbget')
+QPKG_CONFLICTS_WITH+=(none)
+QPKG_DEPENDS_ON+=(Entware)
+QPKG_REQUIRES_IPKS+=(nzbget)
+QPKG_CAN_BACKUP+=(true)
+QPKG_CAN_RESTART_TO_UPDATE+=(false)
+QPKG_CAN_CLEAN+=(false)
+QPKG_CAN_LOG_SERVICE_OPERATIONS+=(true)
+QPKG_TEST_FOR_ACTIVE+=(builtin)

QPKGs/nzbget/build/nzbget_24.0_arm-x19.qpkg.md5

@@ -0,0 +1 @@
+017f82261f8de97c9029143af721a575  nzbget_24.0_arm-x19.qpkg

QPKGs/nzbget/build/nzbget_24.0_arm-x31.qpkg.md5

@@ -0,0 +1 @@
+9fa914f0ebcab5befa9b444f3095b15c  nzbget_24.0_arm-x31.qpkg

QPKGs/nzbget/build/nzbget_24.0_arm-x41.qpkg.md5

@@ -0,0 +1 @@
+88c5be252ca0f4954cac530bb6063d59  nzbget_24.0_arm-x41.qpkg

QPKGs/nzbget/build/nzbget_24.0_arm_64.qpkg.md5

@@ -0,0 +1 @@
+2cf1d52b155745981cf8be464ee9e9e6  nzbget_24.0_arm_64.qpkg

QPKGs/nzbget/build/nzbget_24.0_x86.qpkg.md5

@@ -0,0 +1 @@
+c569409c5df4f7d672431e67f25d0244  nzbget_24.0_x86.qpkg

QPKGs/nzbget/build/nzbget_24.0_x86_64.qpkg.md5

@@ -0,0 +1 @@
+4257734e071212ee2bc7065fac256556  nzbget_24.0_x86_64.qpkg

QPKGs/pyLoad/build/pyLoad_240426_arm_64.qpkg.md5

@@ -1 +1 @@
-fd329f6febc17cfcf22f7cc513cb643a  build/pyLoad_240426_arm_64.qpkg
+aa4d989c6eb2da2d780c9e5927b937d4  build/pyLoad_240426_arm_64.qpkg

QPKGs/pyLoad/build/pyLoad_240426_x86.qpkg.md5

@@ -1 +1 @@
-e7cf9aeb053ac26bdaf50a5967d75266  build/pyLoad_240426_x86.qpkg
+a033c211c2f40c8dcd4ba6ba52e71243  build/pyLoad_240426_x86.qpkg

QPKGs/pyLoad/build/pyLoad_240426_x86_64.qpkg.md5

@@ -1 +1 @@
-772dc325159d9eeb9414d5bdabae9b2f  build/pyLoad_240426_x86_64.qpkg
+c1b63c5a8a86658eab02338b80df3f50  build/pyLoad_240426_x86_64.qpkg

QPKGs/pyLoad/shared/config/requirements.txt

@@ -27,3 +27,4 @@ pytz
 semver~=2.10
 setuptools
 werkzeug
+zstandard

QPKGs/sherpa/build/sherpa_240426.qpkg.md5

@@ -1 +1 @@
-d9e81c5d5a35d42050775f42dc41a83f  build/sherpa_240426.qpkg
+950cb43a2615a886c1dc92b5df9bd2a6  build/sherpa_240426.qpkg

QPKGs/sherpa/build/sherpa_240427.qpkg.md5

@@ -0,0 +1 @@
+8f97e0a94dd0d08c9b09b805eca8d915  build/sherpa_240427.qpkg

QPKGs/sherpa/qpkg.cfg

@@ -1,5 +1,5 @@
 QPKG_NAME="sherpa"
-QPKG_VER="240426"
+QPKG_VER="240427"
 QPKG_AUTHOR="OneCD"
 QPKG_RC_NUM="500"
 QPKG_SERVICE_PROGRAM="sherpa-service.sh"

QPKGs/sherpa/shared/sherpa-loader.sh

@@ -24,7 +24,7 @@
 readonly USER_ARGS_RAW=$*
 Init()
 {
-export LOADER_SCRIPT_VER='240426'
+export LOADER_SCRIPT_VER='240427'
 export LOADER_SCRIPT_PPID=$PPID
 readonly QPKG_NAME=sherpa
 readonly CHARS_REGULAR_PROMPT='$ '

support/build-packages.sh

@@ -65,10 +65,10 @@ StripComments()
 
 	local a="$1"
 
-	a=$(/bin/sed -e '/^#[[:space:]].*/d;/#$/d;s/[[:space:]]#[[:space:]].*//' <<< "$a")		# remove comment lines and line comments.
-	a=$(/bin/sed -e 's/^[[:space:]]*//' <<< "$a")											# remove leading whitespace.
-	a=$(/bin/sed 's/[[:space:]]*$//' <<< "$a")												# remove trailing whitespace.
-	a=$(/bin/sed "/^$/d" <<< "$a")															# remove empty lines.
+	a=$(/bin/sed -e '/^#[[:space:]].*/d;/#$/d;s/[[:space:]]#[[:space:]].*//' <<< "$a")		# Remove comment lines and line comments.
+	a=$(/bin/sed -e 's/^[[:space:]]*//' <<< "$a")											# Remove leading whitespace.
+	a=$(/bin/sed 's/[[:space:]]*$//' <<< "$a")												# Remove trailing whitespace.
+	a=$(/bin/sed "/^$/d" <<< "$a")															# Remove empty lines.
 
 	echo "$a"
 
@@ -90,18 +90,18 @@ echo -n 'extracting highest QPKG version numbers ... '
 
 		IFS='_' read -r package_name version arch tailend <<< "${checksum_filename//.qpkg.md5/}"
 
-		if [[ $arch = std ]]; then     						# an exception for Entware.
+		if [[ $arch = std ]]; then     						# Exception for Entware.
 			arch=''
 			tailend=''
 		fi
 
 		[[ -n $tailend ]] && arch+=_$tailend
 
-		if [[ ${version##*.} = zip ]]; then					# an exception for QDK.
+		if [[ ${version##*.} = zip ]]; then					# Exception for QDK.
 			version=${version%.*}
 		fi
 
-		if [[ ${qpkg_filename: -9} = .zip.qpkg ]]; then		# another exception for QDK.
+		if [[ ${qpkg_filename: -9} = .zip.qpkg ]]; then		# Another exception for QDK.
 			qpkg_filename=${qpkg_filename%.*}
 		fi
 
@@ -168,21 +168,25 @@ buffer=$(<"$target_pathfile")
 
 echo -n 'updating QPKG fields ... '
 
-	buffer=$(sed "s|<?cdn_sherpa_packages_url?>|$cdn_sherpa_packages_url|" <<< "$buffer")
-	buffer=$(sed "s|<?cdn_qnap_dev_packages_url?>|$cdn_qnap_dev_packages_url|" <<< "$buffer")
-	buffer=$(sed "s|<?cdn_other_packages_url?>|$cdn_other_packages_url|" <<< "$buffer")
+	buffer=$(sed "s|<?cdn_nzbget_dev_packages_url?>|$cdn_nzbget_dev_packages_url|g" <<< "$buffer")
+	buffer=$(sed "s|<?cdn_other_packages_url?>|$cdn_other_packages_url|g" <<< "$buffer")
+	buffer=$(sed "s|<?cdn_qnap_dev_packages_url?>|$cdn_qnap_dev_packages_url|g" <<< "$buffer")
+	buffer=$(sed "s|<?cdn_sherpa_packages_url?>|$cdn_sherpa_packages_url|g" <<< "$buffer")
 
 	while read -r checksum_filename qpkg_filename package_name version arch hash; do
 		for property in version package_name qpkg_filename hash; do
-			buffer=$(sed "/QPKG_NAME+=($package_name)/,/^$/{/QPKG_ARCH+=($arch)/,/$property.*/s/<?$property?>/${!property}/}" <<< "$buffer")
-
-			if [[ $package_name = QDK && $property = version ]]; then
-				# run this a second time as there are 2 version placeholders in packages.source for QDK.
-				buffer=$(sed "/QPKG_NAME+=($package_name)/,/^$/{/QPKG_ARCH+=($arch)/,/$property.*/s/<?$property?>/${!property}/}" <<< "$buffer")
-			fi
-
-			# if arch = none then package is not to be installable. Write 'none' into all values.
-			buffer=$(sed "/QPKG_NAME+=($package_name)/,/^$/{/QPKG_ARCH+=(none)/,/$property.*/s/<?$property?>/none/}" <<< "$buffer")
+			buffer=$(sed "/QPKG_NAME+=(${package_name})/,/^$/{/QPKG_ARCH+=(${arch})/,/${property}.*/s/<?${property}?>/${!property}/}" <<< "$buffer")
+
+			case $package_name in
+				nzbget|QDK)
+					if [[ $property = version ]]; then
+						# Run this a second time as there are 2 version placeholders in 'packages.source' for nzbget and QDK.
+						buffer=$(sed "/QPKG_NAME+=($package_name)/,/^$/{/QPKG_ARCH+=($arch)/,/$property.*/s/<?$property?>/${!property}/}" <<< "$buffer")
+					fi
+			esac
+
+			# If arch = 'none' then package will not be installable, so write 'none' to all fields.
+			buffer=$(sed "/QPKG_NAME+=(${package_name})/,/^$/{/QPKG_ARCH+=(none)/,/${property}.*/s/<?${property}?>/none/}" <<< "$buffer")
 		done
 	done <<< "$(sort "$highest_package_versions_found_pathfile")"
 
@@ -202,7 +206,7 @@ fi
 Squeeze "$target_pathfile" "$target_pathfile"
 [[ -f $target_pathfile ]] && chmod 444 "$target_pathfile"
 
-# sort and add header line for easier viewing.
+# Sort and add header line for easier viewing.
 
 [[ -f $highest_package_versions_found_sorted_pathfile ]] && chmod 644 "$highest_package_versions_found_sorted_pathfile"
 printf '%-36s %-32s %-20s %-12s %-6s %s\n%s\n' '# checksum_filename' qpkg_filename package_name version arch hash "$(sort "$highest_package_versions_found_pathfile")" > "$highest_package_versions_found_sorted_pathfile"

support/highest_package_versions_found.tbl

@@ -26,6 +26,12 @@ Mylar3_240426_arm-x41.qpkg.md5       Mylar3_240426_arm-x41.qpkg       Mylar3
 Mylar3_240426_x86_64.qpkg.md5        Mylar3_240426_x86_64.qpkg        Mylar3               240426       i64    ddb088f93a38ff6e490af8177275aed8
 Mylar3_240426_x86.qpkg.md5           Mylar3_240426_x86.qpkg           Mylar3               240426       i86    a9c8fa0cd98fe00d543378307ec73f45
 NZBGet_240426.qpkg.md5               NZBGet_240426.qpkg               NZBGet               240426       all    ea1f0c48a0f37733e096c2834c8ad242
+nzbget_24.0_arm_64.qpkg.md5          nzbget_24.0_arm_64.qpkg          nzbget               24.0         a64    2cf1d52b155745981cf8be464ee9e9e6
+nzbget_24.0_arm-x19.qpkg.md5         nzbget_24.0_arm-x19.qpkg         nzbget               24.0         a19    017f82261f8de97c9029143af721a575
+nzbget_24.0_arm-x31.qpkg.md5         nzbget_24.0_arm-x31.qpkg         nzbget               24.0         a31    9fa914f0ebcab5befa9b444f3095b15c
+nzbget_24.0_arm-x41.qpkg.md5         nzbget_24.0_arm-x41.qpkg         nzbget               24.0         a41    88c5be252ca0f4954cac530bb6063d59
+nzbget_24.0_x86_64.qpkg.md5          nzbget_24.0_x86_64.qpkg          nzbget               24.0         i64    4257734e071212ee2bc7065fac256556
+nzbget_24.0_x86.qpkg.md5             nzbget_24.0_x86.qpkg             nzbget               24.0         i86    c569409c5df4f7d672431e67f25d0244
 NZBHydra2_240426_arm_64.qpkg.md5     NZBHydra2_240426_arm_64.qpkg     NZBHydra2            240426       a64    a6099a9cbf0517cad9dfbdd26214fa11
 NZBHydra2_240426_x86_64.qpkg.md5     NZBHydra2_240426_x86_64.qpkg     NZBHydra2            240426       i64    6abb6e55fd1b54fce10382ae127ea65e
 nzbToMedia_240205.qpkg.md5           nzbToMedia_240205.qpkg           nzbToMedia           240205       all    6a43a3e6a7b04762034a1ad7918addad
@@ -64,9 +70,9 @@ Par2turbo_1.1.0_arm_64.qpkg.md5      Par2turbo_1.1.0_arm_64.qpkg      Par2turbo
 Par2turbo_1.1.0_arm-x31.qpkg.md5     Par2turbo_1.1.0_arm-x31.qpkg     Par2turbo            1.1.0        a31    fafa50f9fe67d7798e2261ec8408cf1a
 Par2turbo_1.1.0_arm-x41.qpkg.md5     Par2turbo_1.1.0_arm-x41.qpkg     Par2turbo            1.1.0        a41    da1a48d4674453c5116870ad35c0b899
 Par2turbo_1.1.0_x86_64.qpkg.md5      Par2turbo_1.1.0_x86_64.qpkg      Par2turbo            1.1.0        i64    574f2d84284fe1c1f2e66d104e16ae8b
-pyLoad_240426_arm_64.qpkg.md5        pyLoad_240426_arm_64.qpkg        pyLoad               240426       a64    fd329f6febc17cfcf22f7cc513cb643a
-pyLoad_240426_x86_64.qpkg.md5        pyLoad_240426_x86_64.qpkg        pyLoad               240426       i64    772dc325159d9eeb9414d5bdabae9b2f
-pyLoad_240426_x86.qpkg.md5           pyLoad_240426_x86.qpkg           pyLoad               240426       i86    e7cf9aeb053ac26bdaf50a5967d75266
+pyLoad_240426_arm_64.qpkg.md5        pyLoad_240426_arm_64.qpkg        pyLoad               240426       a64    aa4d989c6eb2da2d780c9e5927b937d4
+pyLoad_240426_x86_64.qpkg.md5        pyLoad_240426_x86_64.qpkg        pyLoad               240426       i64    c1b63c5a8a86658eab02338b80df3f50
+pyLoad_240426_x86.qpkg.md5           pyLoad_240426_x86.qpkg           pyLoad               240426       i86    a033c211c2f40c8dcd4ba6ba52e71243
 QDK_2.3.13.zip.qpkg.md5              QDK_2.3.13.zip                   QDK                  2.3.13       all    0b003e703a29520e98a0aca41ed0e585
 RunLast_230224.qpkg.md5              RunLast_230224.qpkg              RunLast              230224       all    6cb5415fe56592ca1f4e8a4f2dcc5f17
 SABnzbd_240426_arm_64.qpkg.md5       SABnzbd_240426_arm_64.qpkg       SABnzbd              240426       a64    44f03373899a8c7c51e41d60d4f00ca4
@@ -77,7 +83,7 @@ SABnzbd_240426_x86_64.qpkg.md5       SABnzbd_240426_x86_64.qpkg       SABnzbd
 SABnzbd_240426_x86.qpkg.md5          SABnzbd_240426_x86.qpkg          SABnzbd              240426       i86    845d18b588e8eac34f917ef137fb4fd5
 sha3sum_230312_x86_64.qpkg.md5       sha3sum_230312_x86_64.qpkg       sha3sum              230312       i64    6ceba9116e0dbcbdb4e6112f0c02f8c0
 sha3sum_230312_x86.qpkg.md5          sha3sum_230312_x86.qpkg          sha3sum              230312       i86    fdba9d16b88a5b6e3b04483ca77706dd
-sherpa_240426.qpkg.md5               sherpa_240426.qpkg               sherpa               240426       all    d9e81c5d5a35d42050775f42dc41a83f
+sherpa_240427.qpkg.md5               sherpa_240427.qpkg               sherpa               240427       all    8f97e0a94dd0d08c9b09b805eca8d915
 SortMyQPKGs_240225.qpkg.md5          SortMyQPKGs_240225.qpkg          SortMyQPKGs          240225       all    44643edd1a10db13caa48a46f0a8d3c5
 Unrar_6.2.5_arm_64.qpkg.md5          Unrar_6.2.5_arm_64.qpkg          Unrar                6.2.5        a64    e2382b80908fc9549bbb00058968082a
 Unrar_6.2.5_arm-x41.qpkg.md5         Unrar_6.2.5_arm-x41.qpkg         Unrar                6.2.5        a41    ac1ff1149258db5e4c0b8165774eda37