14 files changed, 46 insertions, 45 deletions
diff --git a/libraries/Impacket/Impacket.info b/libraries/Impacket/Impacket.info
index f186d16da1..ebaf20c4b9 100644
--- a/libraries/Impacket/Impacket.info
+++ b/libraries/Impacket/Impacket.info
@@ -5,6 +5,6 @@ DOWNLOAD="https://pypi.io/packages/source/i/impacket/impacket-0.9.21.tar.gz"
 MD5SUM="c0a71706c09c7343905c9395076d7e31"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="pyasn1 pycrypto"
+REQUIRES="pyasn1 python2-pycrypto"
 MAINTAINER="Brenton Earl"
 EMAIL="brent@exitstatusone.com"
diff --git a/network/gajim/gajim.info b/network/gajim/gajim.info
index 1a8146f1d7..1230171f40 100644
--- a/network/gajim/gajim.info
+++ b/network/gajim/gajim.info
@@ -5,6 +5,6 @@ DOWNLOAD="https://gajim.org/downloads/0.x/0.16/gajim-0.16.9.tar.bz2"
 MD5SUM="87684533b7d6a9611fe28a9b7fca296d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="pyOpenSSL python-nbxmpp pycrypto"
+REQUIRES="pyOpenSSL python-nbxmpp python2-pycrypto"
 MAINTAINER="Ruben Schuller"
 EMAIL="sb@rbn.im"
diff --git a/python/dfvfs/dfvfs.info b/python/dfvfs/dfvfs.info
index 4d504a4d9b..dcdafb1172 100644
--- a/python/dfvfs/dfvfs.info
+++ b/python/dfvfs/dfvfs.info
@@ -5,6 +5,6 @@ DOWNLOAD="https://slackware.uk/sbosrcarch/by-md5/b/4/b40edc047cea330be013921d575
 MD5SUM="b40edc047cea330be013921d575f8caa"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="pycrypto dfdatetime dtfabric libbde libewf libfsapfs libfsntfs libfvde libfwnt libqcow libsigscan libsmdev libsmraw pytsk libvhdi libvmdk libvshadow libvslvm pysqlite backports.lzma"
+REQUIRES="python2-pycrypto dfdatetime dtfabric libbde libewf libfsapfs libfsntfs libfvde libfwnt libqcow libsigscan libsmdev libsmraw pytsk libvhdi libvmdk libvshadow libvslvm pysqlite backports.lzma"
 MAINTAINER="Barry J. Grundy"
 EMAIL="bgrundy<at>linuxleo.com"
diff --git a/python/pycrypto/slack-desc b/python/pycrypto/slack-desc
deleted file mode 100644
index 2e47fafedd..0000000000
--- a/python/pycrypto/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
-        |-----handy-ruler------------------------------------------------------|
-pycrypto: pycrypto (Python Cryptography Toolkit)
-pycrypto:
-pycrypto: This is a collection of both secure hash functions (such as MD5 and
-pycrypto: SHA), and various encryption algorithms (AES, DES, IDEA, RSA,
-pycrypto: ElGamal, etc.). The package is structured to make adding new
-pycrypto: modules easy.
-pycrypto:
-pycrypto: Homepage: http://www.pycrypto.org
-pycrypto:
-pycrypto:
-pycrypto:
diff --git a/python/pyjwt/pyjwt.info b/python/pyjwt/pyjwt.info
index 691e15431a..0e09a1b6cf 100644
--- a/python/pyjwt/pyjwt.info
+++ b/python/pyjwt/pyjwt.info
@@ -5,6 +5,6 @@ DOWNLOAD="https://github.com/jpadilla/pyjwt/archive/1.4.2/pyjwt-1.4.2.tar.gz"
 MD5SUM="f410b3940a01366312e121e034ef8eea"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="cryptography pycrypto ecdsa"
+REQUIRES="cryptography python2-pycrypto ecdsa"
 MAINTAINER="Andre Barboza"
 EMAIL="bmg.andre@gmail.com"
diff --git a/python/pysnmp/pysnmp.info b/python/pysnmp/pysnmp.info
index 399aff86f0..c389ab8175 100644
--- a/python/pysnmp/pysnmp.info
+++ b/python/pysnmp/pysnmp.info
@@ -5,6 +5,6 @@ DOWNLOAD="https://downloads.sourceforge.net/pysnmp/pysnmp-4.1.16d.tar.gz"
 MD5SUM="c8e015c3c1935294d2e235cee47768dc"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="pyasn1 pycrypto"
+REQUIRES="pyasn1 python2-pycrypto"
 MAINTAINER="Ilya Etingof"
 EMAIL="ilya@glas.net"
diff --git a/python/python2-keyczar/python2-keyczar.info b/python/python2-keyczar/python2-keyczar.info
index f055b83d63..5af26a05a6 100644
--- a/python/python2-keyczar/python2-keyczar.info
+++ b/python/python2-keyczar/python2-keyczar.info
@@ -5,6 +5,6 @@ DOWNLOAD="https://pypi.python.org/packages/c8/14/3ffb68671fef927fa5b60f21c43a04a
 MD5SUM="734334a6c5921e39003b68429eee77ae"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="pyasn1 pycrypto"
+REQUIRES="pyasn1 python2-pycrypto"
 MAINTAINER="Larry Hajali"
 EMAIL="larryhaja[at]gmail[dot]com"
diff --git a/python/python2-oauth2client/python2-oauth2client.info b/python/python2-oauth2client/python2-oauth2client.info
index fb961dd4db..a27321c308 100644
--- a/python/python2-oauth2client/python2-oauth2client.info
+++ b/python/python2-oauth2client/python2-oauth2client.info
@@ -5,6 +5,6 @@ DOWNLOAD="https://github.com/google/oauth2client/archive/v4.0.0.tar.gz"
 MD5SUM="c3270b853d66227960b9e04131faf604"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="pycrypto"
+REQUIRES="python2-pycrypto"
 MAINTAINER="Marcel Saegebarth"
 EMAIL="marc@mos6581.de"
diff --git a/python/pycrypto/README b/python/python2-pycrypto/README
index ed20575779..ed20575779 100644
--- a/python/pycrypto/README
+++ b/python/python2-pycrypto/README
diff --git a/python/pycrypto/pycrypto.SlackBuild b/python/python2-pycrypto/python2-pycrypto.SlackBuild
index 763f84009a..bb9bc9099c 100644
--- a/python/pycrypto/pycrypto.SlackBuild
+++ b/python/python2-pycrypto/python2-pycrypto.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for pycrypto
 
-# Copyright 2008-2012 Heinz Wiesinger, Amsterdam, The Netherlands
+# Copyright 2008-2021 Heinz Wiesinger, Amsterdam, The Netherlands
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -11,20 +11,21 @@
 # 1. Redistributions of this script must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
 #
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 cd $(dirname $0) ; CWD=$(pwd)
 
-PRGNAM=pycrypto
+SRCNAM=pycrypto
+PRGNAM=python2-$SRCNAM
 VERSION=${VERSION:-2.6.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -55,9 +56,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
+rm -rf $SRCNAM-$VERSION
+tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
+cd $SRCNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -65,7 +66,7 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-python setup.py install --root=$PKG
+python2 setup.py install --root=$PKG
 
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
diff --git a/python/pycrypto/pycrypto.info b/python/python2-pycrypto/python2-pycrypto.info
index afc1b7237f..d5c34050d4 100644
--- a/python/pycrypto/pycrypto.info
+++ b/python/python2-pycrypto/python2-pycrypto.info
@@ -1,4 +1,4 @@
-PRGNAM="pycrypto"
+PRGNAM="python2-pycrypto"
 VERSION="2.6.1"
 HOMEPAGE="https://www.dlitz.net/software/pycrypto/"
 DOWNLOAD="https://pypi.python.org/packages/source/p/pycrypto/pycrypto-2.6.1.tar.gz"
diff --git a/python/python2-pycrypto/slack-desc b/python/python2-pycrypto/slack-desc
new file mode 100644
index 0000000000..80616e6b0c
--- /dev/null
+++ b/python/python2-pycrypto/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+                |-----handy-ruler------------------------------------------------------|
+python2-pycrypto: python2-pycrypto (Python Cryptography Toolkit)
+python2-pycrypto:
+python2-pycrypto: This is a collection of both secure hash functions (such as MD5 and
+python2-pycrypto: SHA), and various encryption algorithms (AES, DES, IDEA, RSA,
+python2-pycrypto: ElGamal, etc.). The package is structured to make adding new
+python2-pycrypto: modules easy.
+python2-pycrypto:
+python2-pycrypto: Homepage: http://www.pycrypto.org
+python2-pycrypto:
+python2-pycrypto:
+python2-pycrypto:
diff --git a/system/salt/salt.info b/system/salt/salt.info
index 4825743896..806eef81dc 100644
--- a/system/salt/salt.info
+++ b/system/salt/salt.info
@@ -5,6 +5,6 @@ DOWNLOAD="https://files.pythonhosted.org/packages/source/s/salt/salt-2018.3.3.ta
 MD5SUM="13ba421e4bea1f33617b30b1116a9d32"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="msgpack-python PyYAML Jinja2 MarkupSafe singledispatch tornado zeromq pyzmq pycrypto"
+REQUIRES="msgpack-python PyYAML Jinja2 MarkupSafe singledispatch tornado zeromq pyzmq python2-pycrypto"
 MAINTAINER="David Spencer"
 EMAIL="baildon.research@googlemail.com"
diff --git a/system/volatility/volatility.info b/system/volatility/volatility.info
index 6a43b3c3c7..ef514f3855 100644
--- a/system/volatility/volatility.info
+++ b/system/volatility/volatility.info
@@ -5,6 +5,6 @@ DOWNLOAD="https://github.com/volatilityfoundation/volatility/archive/2.6.1/volat
 MD5SUM="53319b202ac6fb6c3a5422bdf0a9f7a0"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="distorm pycrypto yara-python"
+REQUIRES="distorm python2-pycrypto yara-python"
 MAINTAINER="Barry J. Grundy"
 EMAIL="bgrundy AT linuxleo.com"