Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] update-check: fix update pattern for literal dot
@ 2021-05-19 15:42 sgn
  2021-05-23  5:11 ` [PR PATCH] [Merged]: " sgn
  0 siblings, 1 reply; 2+ messages in thread
From: sgn @ 2021-05-19 15:42 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1612 bytes --]

There is a new pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages update-check-trim
https://github.com/void-linux/void-packages/pull/30995

update-check: fix update pattern for literal dot
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/30995.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update-check-trim-30995.patch --]
[-- Type: text/x-diff, Size: 5270 bytes --]

From b371db0885c85e342674707d8d2b3a9b6d98db7c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 19 May 2021 20:49:45 +0700
Subject: [PATCH 1/2] update-check: fix update pattern for literal dot

The dot (.) inside [] matches literal dot. I don't know how it's
working, however the update-check for some packages is broken (i.e.
anthy-unicode).

Let's remove the backslash.
---
 common/xbps-src/shutils/update_check.sh | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/common/xbps-src/shutils/update_check.sh b/common/xbps-src/shutils/update_check.sh
index 2ef29e78f299..fcfbf31759d6 100644
--- a/common/xbps-src/shutils/update_check.sh
+++ b/common/xbps-src/shutils/update_check.sh
@@ -121,15 +121,15 @@ update_check() {
             *github.com*)
                 pkgurlname="$(printf %s "$url" | cut -d/ -f4,5)"
                 url="https://github.com/$pkgurlname/tags"
-                rx='/archive/refs/tags/(v?|\Q'"$pkgname"'\E-)?\K[\d\.]+(?=\.tar\.gz")';;
+                rx='/archive/refs/tags/(v?|\Q'"$pkgname"'\E-)?\K[\d.]+(?=\.tar\.gz")';;
             *//gitlab.*)
                 pkgurlname="$(printf %s "$url" | cut -d/ -f1-5)"
                 url="$pkgurlname/tags"
-                rx='/archive/[^/]+/\Q'"$pkgname"'\E-v?\K[\d\.]+(?=\.tar\.gz")';;
+                rx='/archive/[^/]+/\Q'"$pkgname"'\E-v?\K[\d.]+(?=\.tar\.gz")';;
             *bitbucket.org*)
                 pkgurlname="$(printf %s "$url" | cut -d/ -f4,5)"
                 url="https://bitbucket.org/$pkgurlname/downloads"
-                rx='/(get|downloads)/(v?|\Q'"$pkgname"'\E-)?\K[\d\.]+(?=\.tar)';;
+                rx='/(get|downloads)/(v?|\Q'"$pkgname"'\E-)?\K[\d.]+(?=\.tar)';;
             *ftp.gnome.org*|*download.gnome.org*)
                 : ${pattern="\Q$pkgname\E-\K(0|[13]\.[0-9]*[02468]|[4-9][0-9]+)\.[0-9.]*[0-9](?=)"}
                 url="https://download.gnome.org/sources/$pkgname/cache.json";;
@@ -139,22 +139,22 @@ update_check() {
                 rx='\b\Q'"${pkgname#R-cran-}"'\E_\K\d+(\.\d+)*(-\d+)?(?=\.tar)';;
             *rubygems.org*)
                 url="https://rubygems.org/gems/${pkgname#ruby-}"
-                rx='href="/gems/'${pkgname#ruby-}'/versions/\K[\d\.]*(?=")' ;;
+                rx='href="/gems/'${pkgname#ruby-}'/versions/\K[\d.]*(?=")' ;;
             *crates.io*)
                 url="https://crates.io/api/v1/crates/${pkgname#rust-}"
                 rx='/crates/'${pkgname#rust-}'/\K[0-9.]*(?=/download)' ;;
             *codeberg.org*)
                 pkgurlname="$(printf %s "$url" | cut -d/ -f4,5)"
                 url="https://codeberg.org/$pkgurlname/releases"
-                rx='/archive/\K[\d\.]+(?=\.tar\.gz)' ;;
+                rx='/archive/\K[\d.]+(?=\.tar\.gz)' ;;
             *hg.sr.ht*)
                 pkgurlname="$(printf %s "$url" | cut -d/ -f4,5)"
                 url="https://hg.sr.ht/$pkgurlname/tags"
-                rx='/archive/(v?|\Q'"$pkgname"'\E-)?\K[\d\.]+(?=\.tar\.gz")';;
+                rx='/archive/(v?|\Q'"$pkgname"'\E-)?\K[\d.]+(?=\.tar\.gz")';;
             *git.sr.ht*)
                 pkgurlname="$(printf %s "$url" | cut -d/ -f4,5)"
                 url="https://git.sr.ht/$pkgurlname/refs"
-                rx='/archive/(v?|\Q'"$pkgname"'\E-)?\K[\d\.]+(?=\.tar\.gz")';;
+                rx='/archive/(v?|\Q'"$pkgname"'\E-)?\K[\d.]+(?=\.tar\.gz")';;
             esac
         fi
 

From 4f11d6af1e9b98d8b71f0386f344b20b75b69703 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 19 May 2021 20:57:09 +0700
Subject: [PATCH 2/2] cmake: faster update-check

---
 srcpkgs/cmake-bootstrap/update | 3 +--
 srcpkgs/cmake-gui/update       | 3 +--
 srcpkgs/cmake/update           | 3 ++-
 3 files changed, 4 insertions(+), 5 deletions(-)
 mode change 100644 => 120000 srcpkgs/cmake-bootstrap/update
 mode change 100644 => 120000 srcpkgs/cmake-gui/update

diff --git a/srcpkgs/cmake-bootstrap/update b/srcpkgs/cmake-bootstrap/update
deleted file mode 100644
index 92f85b5350ba..000000000000
--- a/srcpkgs/cmake-bootstrap/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site='https://cmake.org/download/'
-pkgname=cmake
diff --git a/srcpkgs/cmake-bootstrap/update b/srcpkgs/cmake-bootstrap/update
new file mode 120000
index 000000000000..c7f49c6a2d18
--- /dev/null
+++ b/srcpkgs/cmake-bootstrap/update
@@ -0,0 +1 @@
+../cmake/update
\ No newline at end of file
diff --git a/srcpkgs/cmake-gui/update b/srcpkgs/cmake-gui/update
deleted file mode 100644
index 122447decb3e..000000000000
--- a/srcpkgs/cmake-gui/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site='https://cmake.org/download/'
-pkgname='cmake'
diff --git a/srcpkgs/cmake-gui/update b/srcpkgs/cmake-gui/update
new file mode 120000
index 000000000000..c7f49c6a2d18
--- /dev/null
+++ b/srcpkgs/cmake-gui/update
@@ -0,0 +1 @@
+../cmake/update
\ No newline at end of file
diff --git a/srcpkgs/cmake/update b/srcpkgs/cmake/update
index 4671bfbb1858..fa692de2a9c9 100644
--- a/srcpkgs/cmake/update
+++ b/srcpkgs/cmake/update
@@ -1 +1,2 @@
-site='https://cmake.org/download/'
+site='https://cmake.org/files/LatestRelease/cmake-latest-files-v1.json'
+pkgname=cmake

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PR PATCH] [Merged]: update-check: fix update pattern for literal dot
  2021-05-19 15:42 [PR PATCH] update-check: fix update pattern for literal dot sgn
@ 2021-05-23  5:11 ` sgn
  0 siblings, 0 replies; 2+ messages in thread
From: sgn @ 2021-05-23  5:11 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1459 bytes --]

There's a merged pull request on the void-packages repository

update-check: fix update pattern for literal dot
https://github.com/void-linux/void-packages/pull/30995

Description:
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2021-05-23  5:11 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-05-19 15:42 [PR PATCH] update-check: fix update pattern for literal dot sgn
2021-05-23  5:11 ` [PR PATCH] [Merged]: " sgn

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).