system/slackroll: Updated for version v47.

Signed-off-by: Andrew Clemons <andrew.clemons@gmail.com>

3 files changed, 6 insertions, 57 deletions

diff --git a/system/slackroll/1a33e8930bf7587f4c280185efaf636ee0b6a46c.patch b/system/slackroll/1a33e8930bf7587f4c280185efaf636ee0b6a46c.patch
deleted file mode 100644
index dfd7e8ece6abd..0000000000000
--- a/system/slackroll/1a33e8930bf7587f4c280185efaf636ee0b6a46c.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 1a33e8930bf7587f4c280185efaf636ee0b6a46c Mon Sep 17 00:00:00 2001
-From: Andrew Clemons <andrew.clemons@gmail.com>
-Date: Tue, 18 Jul 2017 08:14:51 +1200
-Subject: [PATCH] Add support for slackwarearm
-
----
- slackroll | 15 ++++++++++++---
- 1 file changed, 12 insertions(+), 3 deletions(-)
-
-diff --git a/slackroll b/slackroll
-index 21b6ad2..ad7eeb1 100755
---- a/slackroll
-+++ b/slackroll
-@@ -67,7 +67,7 @@ slackroll_filelist_pkg_str = 2
- slackroll_source_indicator = '/source/'
- slackroll_pasture_indicator = '/pasture/'
- slackroll_patch_indicator = '/patches/'
--slackroll_main_indicator = re.compile(r'/slackware(?:64)?/')
-+slackroll_main_indicator = re.compile(r'/slackware(?:64|arm)?/')
- slackroll_extra_indicator = '/extra/'
- slackroll_prioritized_pkgs = ['glibc-solibs', 'sed', 'pkgtools']
- slackroll_kernel_pkg_indicator = 'kernel'
-@@ -113,8 +113,9 @@ slackroll_transient_states = [slackroll_state_new, slackroll_state_outdated, sla
- slackroll_all_states = [x for x in xrange(len(slackroll_state_strings))]
- 
- slackroll_socket_timeout = 120
--slackroll_mirror_version_re = re.compile(r'/slackware(64|)-([^/]+)/')
- slackroll_default_primary_site_url = 'http://ftp.slackware.com/pub/slackware/slackware%s-%s/'
-+slackroll_arm_primary_site_url = 'http://ftp.arm.slackware.com/slackwarearm/slackware%s-%s/'
-+slackroll_mirror_version_re = re.compile(r'/slackware(64|arm|)-([^/]+)/')
- 
- slackroll_locale_envvars = ['LANG', 'LC_CTYPE', 'LC_NUMERIC', 'LC_TIME', 'LC_COLLATE', 'LC_MONETARY', 'LC_MESSAGES', 'LC_ALL', 'LC_PAPER', 'LC_NAME', 'LC_ADDRESS', 'LC_TELEPHONE', 'LC_MEASUREMENT', 'LC_IDENTIFICATION']
- slackroll_locale_mainvar = 'LANG'
-@@ -605,7 +606,15 @@ def get_mirror(): # From the 'mirror' file
- def get_primary_mirror(): # From the 'pmirror' file or default value
-     if is_readable_file(slackroll_primary_mirror_filename):
-         return get_mirror_from_file(slackroll_primary_mirror_filename)
--    return slackroll_default_primary_site_url % get_mirror_version_components(get_mirror())
-+
-+    arch, version = get_mirror_version_components(get_mirror())
-+
-+    return get_default_primary_mirror(arch, version)
-+
-+def get_default_primary_mirror(arch, version):
-+    if arch == 'arm':
-+        return slackroll_arm_primary_site_url % (arch, version)
-+    return slackroll_default_primary_site_url % (arch, version)
- 
- def set_mirror(mirror): # Writes the mirror name to the 'mirror' file
-     if not mirror.endswith('/'):
diff --git a/system/slackroll/slackroll.SlackBuild b/system/slackroll/slackroll.SlackBuild
index 2abafbd47559c..00eb55e704a06 100644
--- a/system/slackroll/slackroll.SlackBuild
+++ b/system/slackroll/slackroll.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for slackroll
 
-# Copyright 2011-2016 Andrew Clemons, Wellington New Zealand
+# Copyright 2011-2018 Andrew Clemons, Wellington New Zealand
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,9 +23,9 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=slackroll
-VERSION=${VERSION:-v46}
+VERSION=${VERSION:-v47}
 SRCVER=${VERSION#v}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 ARCH=noarch
@@ -43,7 +43,6 @@ cd $TMP
 rm -rf $PRGNAM-$SRCVER
 tar xvf $CWD/$PRGNAM-$SRCVER.tar.gz
 cd $PRGNAM-$SRCVER
-patch -p1 < $CWD/1a33e8930bf7587f4c280185efaf636ee0b6a46c.patch
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
diff --git a/system/slackroll/slackroll.info b/system/slackroll/slackroll.info
index b23245fea3022..2c42bd33d3da1 100644
--- a/system/slackroll/slackroll.info
+++ b/system/slackroll/slackroll.info
@@ -1,8 +1,8 @@
 PRGNAM="slackroll"
-VERSION="v46"
+VERSION="v47"
 HOMEPAGE="http://rg3.github.io/slackroll/"
-DOWNLOAD="https://github.com/rg3/slackroll/archive/v46/slackroll-46.tar.gz"
-MD5SUM="acc39d5ba5936e885664c4ba048495e7"
+DOWNLOAD="https://github.com/rg3/slackroll/archive/v47/slackroll-47.tar.gz"
+MD5SUM="2900d63d391a9e32f6e744eb2207a7b7"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""