[reflector]: upgrade to 2019.3

2 files changed, 39 insertions, 40 deletions

diff --git a/libre/reflector/PKGBUILD b/libre/reflector/PKGBUILD
index 7a2f57027..6a60982bd 100644
--- a/libre/reflector/PKGBUILD
+++ b/libre/reflector/PKGBUILD
@@ -1,9 +1,10 @@
-#Maintainer (Arch): Xyne <ac xunilhcra enyx, backwards>
-#Maintainer (Hyperbola): André Silva <emulatorman@parabola.nu>
+# Maintainer (Arch): Xyne <ac xunilhcra enyx, backwards>
+# Maintainer (Hyperbola): André Silva <emulatorman@parabola.nu>
 # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
+
 pkgname=reflector
-pkgver=2018
-pkgrel=2.parabola1
+pkgver=2019.3
+pkgrel=1.parabola1
 pkgdesc='A Python 3 module and script to retrieve and filter the latest Pacman mirror list (Parabola rebranded)'
 arch=(any)
 license=(GPL)
@@ -13,14 +14,14 @@ conflicts=(${pkgname}-parabola)
 depends=(python3)
 optdepends=('rsync: rate rsync mirrors')
 source=(
-  https://xyne.archlinux.ca/projects/reflector/src/reflector-2018.tar.xz
-  https://xyne.archlinux.ca/projects/reflector/src/reflector-2018.tar.xz.sig
+  https://xyne.archlinux.ca/projects/reflector/src/reflector-${pkgver}.tar.xz
+  https://xyne.archlinux.ca/projects/reflector/src/reflector-${pkgver}.tar.xz.sig
   rebranding.patch
 )
 sha512sums=(
-  35d6d300af0a5fcde0a221b969693597618a41c12deb02f35e1123340b4168fe34d1f4d7c02fa46a3a6ff6327aaed6ccb952c8e320aeff6578839c8a2f90cdd4
-  a4afc02df892382c17b7fb5000c4dd9bdc7e7c5ee2380fa85fbf08ac01cd8280f026c3a53cad4681766d9f54a1e2ba108e86524f82bffef74bcfe8b128c45d62
-  242fe3ae1850d2beab775fff96b173dfd5ed71178d6b3324592a179e4658209b0f0cf0bc25faba6ff31a3b379877723c2117feb9570bad6adb5339f621932ec5
+  96eab1b0f937b8014db0721608ef72979c6f973088bbbf0b16d794f5e0de996478528a0c7f42597dc71408723bed1995c703deae5d04d6b92f1debe960f398da
+  SKIP
+  c38c90c428b9761e84d4cbc1cf6a679772264ae5a8aafc4cc961fa5fd1f63ef0628a9621944f2b51ff54d8092dea5cdfdb4d1d07b6c39c4ca57f0f50a942b923
 )
 validpgpkeys=('EC3CBE7F607D11E663149E811D1F0DC78F173680')
 
@@ -37,6 +38,3 @@ package ()
   python3 setup.py install --prefix=/usr --root="$pkgdir" --optimize=1
   install -Dm755 "$srcdir/$pkgname-$pkgver/$pkgname" "$pkgdir/usr/bin/$pkgname"
 }
-
-
-# vim: set ts=2 sw=2 et:
diff --git a/libre/reflector/rebranding.patch b/libre/reflector/rebranding.patch
index 3b6adaad2..7cade23f5 100644
--- a/libre/reflector/rebranding.patch
+++ b/libre/reflector/rebranding.patch
@@ -1,16 +1,26 @@
-diff -Nur reflector-2014.11.orig/Reflector.py reflector-2014.11/Reflector.py
---- reflector-2014.11.orig/Reflector.py	2014-11-01 14:22:45.000000000 -0200
-+++ reflector-2014.11/Reflector.py	2014-11-03 12:54:07.656310663 -0200
-@@ -64,7 +64,7 @@
+diff --git a/Reflector.py b/Reflector.py
+index 1f22f18..64d6453 100644
+--- a/Reflector.py
++++ b/Reflector.py
+@@ -42,7 +42,7 @@ import urllib.request
  
- class MirrorStatus(object):
-   # JSON URI
--  URL = 'https://www.archlinux.org/mirrors/status/json/'
-+  URL = 'https://www.parabola.nu/mirrors/status/json/'
-   # Mirror URL format. Accepts server base URL, repository, and architecture.
-   MIRROR_URL_FORMAT = '{0}{1}/os/{2}'
-   MIRRORLIST_ENTRY_FORMAT = "Server = " + MIRROR_URL_FORMAT + "\n"
-@@ -93,8 +93,18 @@
+ NAME = 'Reflector'
+ 
+-URL = 'https://www.archlinux.org/mirrors/status/json/'
++URL = 'https://www.parabola.nu/mirrors/status/json/'
+ 
+ DISPLAY_TIME_FORMAT = '%Y-%m-%d %H:%M:%S UTC'
+ PARSE_TIME_FORMAT = '%Y-%m-%dT%H:%M:%SZ'
+@@ -436,7 +436,7 @@ def format_mirrorlist(mirror_status, mtime, include_country=False, command=None)
+ 
+   width = 80
+   colw = 11
+-  header = '# Arch Linux mirrorlist generated by Reflector #'.center(width, '#')
++  header = '# Parabola GNU/Linux-libre mirrorlist generated by Reflector #'.center(width, '#')
+   border = '#' * len(header)
+   mirrorlist = ''
+   mirrorlist = '{}\n{}\n{}\n'.format(border, header, border) + \
+@@ -496,8 +496,18 @@ class MirrorStatus():
      'extra',
      'gnome-unstable',
      'kde-unstable',
@@ -30,16 +40,7 @@ diff -Nur reflector-2014.11.orig/Reflector.py reflector-2014.11/Reflector.py
      'staging',
      'testing'
    )
-@@ -452,7 +462,7 @@
- 
-     width = 80
-     colw = 11
--    header = '# Arch Linux mirrorlist generated by Reflector #'.center(width, '#')
-+    header = '# Parabola GNU/Linux-libre mirrorlist generated by Reflector #'.center(width, '#')
-     border = '#' * len(header)
-     mirrorlist = '{}\n{}\n{}\n'.format(border, header, border) + \
-       '\n' + \
-@@ -541,7 +551,7 @@
+@@ -655,7 +665,7 @@ def add_arguments(parser):
    '''
    Add reflector arguments to the argument parser.
    '''
@@ -47,17 +48,17 @@ diff -Nur reflector-2014.11.orig/Reflector.py reflector-2014.11/Reflector.py
 +  parser = argparse.ArgumentParser(description='retrieve and filter a list of the latest Parabola GNU/Linux-libre mirrors')
  
    parser.add_argument(
-     '--connection-timeout', type=int, metavar='n', default=5,
-@@ -560,7 +570,7 @@
+     '--connection-timeout', type=int, metavar='n', default=DEFAULT_CONNECTION_TIMEOUT,
+@@ -674,7 +684,7 @@ def add_arguments(parser):
  
    parser.add_argument(
-     '--cache-timeout', type=int, metavar='n', default=300,
--    help='The cache timeout in seconds for the data retrieved from the Arch Linux Mirror Status API. The default is 300 (5 minutes).'
-+    help='The cache timeout in seconds for the data retrieved from the Parabola GNU/Linux-libre Mirror Status API. The default is 300 (5 minutes).'
+     '--cache-timeout', type=int, metavar='n', default=DEFAULT_CACHE_TIMEOUT,
+-    help='The cache timeout in seconds for the data retrieved from the Arch Linux Mirror Status API. The default is %(default)s.'
++    help='The cache timeout in seconds for the data retrieved from the Parabola GNU/Linux-libre Mirror Status API. The default is %(default)s.'
    )
  
    parser.add_argument(
-@@ -645,7 +655,7 @@
+@@ -784,7 +794,7 @@ def parse_args(args=None):
    Parse command-line arguments.
    '''
    parser = argparse.ArgumentParser(