[MDEV-31438] update mariadb_repo_setup version check Created: 2023-06-08  Updated: 2023-06-09  Resolved: 2023-06-09

Status: Closed
Project: MariaDB Server
Component/s: Repositories
Fix Version/s: N/A

Type: Task Priority: Major
Reporter: Hartmut Holzgraefe Assignee: Daniel Bartholomew
Resolution: Fixed Votes: 0
Labels: None

Attachments: File mariadb_repo_setup.patch    

 Description   
  • we now have 11.1 in addition to 11.0
  • 10.3, 10.7 and 10.9 have reached end-of-life
  • 100.x.y, 1000.x.y, 10000.x.y, ... were wrongly accepted as valid, as were 111.x.y, 1111.x.y, ...

diff -u old/mariadb_repo_setup new/mariadb_repo_setup
--- old/mariadb_repo_setup	2023-02-22 21:24:20.000000000 +0000
+++ new/mariadb_repo_setup	2023-06-08 22:11:52.315832545 +0000
@@ -205,9 +205,9 @@
 verify_mariadb_server_version() {
   # version regex
   if (($skip_eol_check)); then
-    rx='^(mariadb-){0,1}(10+\.[0-9]|10+\.1[0-1]|10+\.[0-9]+\.[1-9]{0,1}[0-9]{1}|10+\.1[0-1]+\.[1-9]{1}[0-9]{0,1}|11+\.0|11+\.0+\.[1-9]{1}[0-9]{0,1})$'
+    rx='^(mariadb-){0,1}(10\.[0-9]|10\.1[0-1]|10\.[0-9]\.[1-9]{0,1}[0-9]{1}|10\.1[0-1]\.[1-9]{1}[0-9]{0,1}|11\.[0-1]|11\.[0-1]\.[1-9]{1}[0-9]{0,1})$'
   else
-    rx='^(mariadb-){0,1}(10+\.[3-9]|10+\.1[0-1]|10+\.[3-9]+\.[1-9]{0,1}[0-9]{1}|10+\.1[0-1]+\.[1-9]{1}[0-9]{0,1}|11+\.0|11+\.0+\.[1-9]{1}[0-9]{0,1})$'
+    rx='^(mariadb-){0,1}(10\.[4569]|10\.1[0-1]|10\.[4569]\.[1-9]{0,1}[0-9]{1}|10\.1[0-1]\.[1-9]{1}[0-9]{0,1}|11\.[0-1]|11\.[0-1]\.[1-9]{1}[0-9]{0,1})$'
   fi
   if [[ $@ =~ $rx ]] ; then
     case $os_type in



 Comments   
Comment by Daniel Bartholomew [ 2023-06-09 ]

Thanks. I should have the script updated later today.

Comment by Daniel Bartholomew [ 2023-06-09 ]

Updated script is now live.

Generated at Thu Feb 08 10:23:52 UTC 2024 using Jira 8.20.16#820016-sha1:9d11dbea5f4be3d4cc21f03a88dd11d8c8687422.