Merge branch 'ublock-bump' into 'master'

Ublock bump

See merge request bgstack15/stackrpms!213

3 files changed, 21 insertions, 3 deletions

diff --git a/ublock-origin-combined/build-orig-tarball.sh b/ublock-origin-combined/build-orig-tarball.sh
index e804468..a3f3d61 100755
--- a/ublock-origin-combined/build-orig-tarball.sh
+++ b/ublock-origin-combined/build-orig-tarball.sh
@@ -59,7 +59,7 @@ show_xpi_for_latest_tag() {
    _url2="https://github.com$( echo "${_page1}" | grep -oE 'href=[^>]+\/tag\/[^>]+' | sort -n | tail -n1 | sed -r -e "s/^href=[\"']?//;" -e 's/"$//;' )"
    _page2="$( curl -s "${_url2}" )"
    #echo "${_page2}"
-   _asset="https://github.com$( echo "${_page2}" | sed -n '/Assets/,$p' ~/foo2 | grep -oE "href=.*\.xpi" | sed -r -e "s/^href=[\"']?//;" )"
+   _asset="https://github.com$( echo "${_page2}" | sed -n '/Assets/,$p' | grep -oE "href=.*\.xpi" | sed -r -e "s/^href=[\"']?//;" )"
    echo "${_asset}"
 }
 
@@ -71,7 +71,7 @@ show_xpi_for_latest_tag() {
 ## 1. learn latest version file
 #url_contents="$( curl -s "${frontpageurl}" )"
 #latest_file="$( echo "${url_contents}" | awk -F'[=>]' '/class="btn".*>Download</{print $4}' | sed -r -e 's/^"//g;' -e 's/"$//g;' | head -n1 )"
-latest_file="$( show_xpi_for_latest_tag "https://github.com/gorhill/uBlock-origin-for-firefox-legacy" )"
+latest_file="$( show_xpi_for_latest_tag "https://github.com/gorhill/uBlock-for-firefox-legacy" )"
 latest_version="$( basename "${latest_file}" | grep -oE '_[0-9\.]+' | sed -r -e 's/^_//;' -e 's/\.$//;' )"
 
 ## 2. dl it
diff --git a/ublock-origin-combined/debian/changelog b/ublock-origin-combined/debian/changelog
index 9067709..64b3e49 100644
--- a/ublock-origin-combined/debian/changelog
+++ b/ublock-origin-combined/debian/changelog
@@ -1,3 +1,15 @@
+ublock-origin-combined (1.16.4.28-1+devuan) obs; urgency=medium
+
+  * Update
+
+ -- B. Stack <bgstack15@gmail.com>  Mon, 01 Feb 2021 09:57:33 -0500
+
+ublock-origin-combined (1.16.4.27-1+devuan) obs; urgency=medium
+
+  * Update
+
+ -- B. Stack <bgstack15@gmail.com>  Tue, 05 Jan 2021 07:46:17 -0500
+
 ublock-origin-combined (1.16.4.26-1+devuan) obs; urgency=medium
 
   * Update
diff --git a/ublock-origin-combined/ublock-origin-combined.spec b/ublock-origin-combined/ublock-origin-combined.spec
index 8367d80..7360f92 100644
--- a/ublock-origin-combined/ublock-origin-combined.spec
+++ b/ublock-origin-combined/ublock-origin-combined.spec
@@ -7,7 +7,7 @@
 %global app_id \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\}
 
 Name:           ublock-origin-combined
-Version:        1.16.4.26
+Version:        1.16.4.28
 Release:        1
 Summary:        uBlock Origin installed to the system Mozilla-based extensions directories
 
@@ -68,6 +68,12 @@ rm -rf %{buildroot}
 # something gets weird because of the curly braces in the expanded variable, but using the ../* syntax changes the evaluated string so it does not have to try to use curly braces in the owned filepath.
 
 %changelog
+* Mon Feb 01 2021 B. Stack <bgstack15@gmail.com> - 1.16.4.28-1
+- Update
+
+* Tue Jan 05 2021 B. Stack <bgstack15@gmail.com> - 1.16.4.27-1
+- Update
+
 * Wed Nov 04 2020 B Stack <bgstack15@gmail.com> - 1.16.4.26-1
 - Update