b/libs/musl/patches/0003-fix-failure-of-glob-to-match-broken-symlinks-under-s.patch
deleted file mode 100644
index 6e5ad21..0000000
---
a/libs/musl/patches/0003-fix-failure-of-glob-to-match-broken-symlinks-under-s.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From 270466ce65707b0c5138e1b5966a01189ed6a655 Mon Sep 17 00:00:00 2001
-From: Rich Felker <dalias AT aerifal.cx>
-Date: Thu, 11 Jul 2019 16:55:17 -0400
-Subject: [PATCH 3/6] fix failure of glob to match broken symlinks under some
- conditions
-
-when the pattern ended with one or more literal path components, or
-when the GLOB_MARK flag was passed to request that glob flag directory
-results and the type obtained by readdir was unknown or inconclusive
-(symlink), the stat function was called to evaluate existence and/or
-determine type. however, stat fails with ENOENT for broken symlinks,
-and this caused the match to be omitted from the results.
-
-instead, use stat only for the unknown/inconclusive cases with
-GLOB_MARK, and otherwise, or if stat fails, use lstat existence still
-needs to be determined. this minimizes the number of costly syscalls,
-performing both only in the case where GLOB_MARK is in use and there
-is a final literal path component which is a broken symlink.
-
-based on/simplified from patch by James Y Knight.
-
-Signed-off-by: Ismael Luceno <ismael AT iodev.co.uk>
----
- src/regex/glob.c | 17 ++++++++++++-----
- 1 file changed, 12 insertions(+), 5 deletions(-)
-
-diff --git a/src/regex/glob.c b/src/regex/glob.c
-index 58248675c203..9de080ed9ccd 100644
---- a/src/regex/glob.c
-+++ b/src/regex/glob.c
-@@ -92,16 +92,23 @@ static int do_glob(char *buf, size_t pos, int type, char
*pat, int flags, int (*
- if (!*pat) {
- /* If we consumed any components above, or if GLOB_MARK is
- * requested and we don't yet know if the match is a dir,
-- * we must call stat to confirm the file exists and/or
-- * determine its type. */
-+ * we must confirm the file exists and/or determine its type.
-+ *
-+ * If marking dirs, symlink type is inconclusive; we need the
-+ * type for the symlink target, and therefore must try stat
-+ * first unless type is known not to be a symlink. Otherwise,
-+ * or if that fails, use lstat for determining existence to
-+ * avoid false negatives in the case of broken symlinks. */
- struct stat st;
-- if ((flags & GLOB_MARK) && type==DT_LNK) type = 0;
-- if (!type && stat(buf, &st)) {
-+ if ((flags & GLOB_MARK) && (!type||type==DT_LNK) &&
!stat(buf, &st)) {
-+ if (S_ISDIR(st.st_mode)) type = DT_DIR;
-+ else type = DT_REG;
-+ }
-+ if (!type && lstat(buf, &st)) {
- if (errno!=ENOENT && (errfunc(buf, errno) || (flags &
GLOB_ERR)))
- return GLOB_ABORTED;
- return 0;
- }
-- if (!type && S_ISDIR(st.st_mode)) type = DT_DIR;
- if (append(tail, buf, pos, (flags & GLOB_MARK) &&
type==DT_DIR))
- return GLOB_NOSPACE;
- return 0;
---
-2.22.0
-
diff --git a/net/ifupdown/HISTORY b/net/ifupdown/HISTORY
index ffdac5b..a6f4c90 100644
--- a/net/ifupdown/HISTORY
+++ b/net/ifupdown/HISTORY
@@ -1,3 +1,6 @@
+2020-01-29 Ismael Luceno <ismael AT sourcemage.org>
+ * PRE_BUILD, fix-musl.patch: Fixed build against musl
+
2019-12-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 0.8.35
* PRE_BUILD, 0002-sbin-ip.patch: remove obsolete patch
diff --git a/net/ifupdown/PRE_BUILD b/net/ifupdown/PRE_BUILD
index 28af64d..b2a659f 100755
--- a/net/ifupdown/PRE_BUILD
+++ b/net/ifupdown/PRE_BUILD
@@ -1,6 +1,8 @@
default_pre_build &&
cd ${SOURCE_DIRECTORY} &&
diff --git a/python-pypi/pyopenssl/HISTORY b/python-pypi/pyopenssl/HISTORY
index 132f08d..f64cc88 100644
--- a/python-pypi/pyopenssl/HISTORY
+++ b/python-pypi/pyopenssl/HISTORY
@@ -1,3 +1,6 @@
+2020-01-29 Ismael Luceno <ismael AT sourcemage.org>
+ * PRE_BUILD, libressl.patch: removed, no longer needed
+
2020-01-04 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 19.1.0
* DEPENDS: depend on six
diff --git a/python-pypi/pyopenssl/PRE_BUILD b/python-pypi/pyopenssl/PRE_BUILD
deleted file mode 100755
index 66d995c..0000000
--- a/python-pypi/pyopenssl/PRE_BUILD
+++ /dev/null
@@ -1,7 +0,0 @@
-default_pre_build &&
-cd "$SOURCE_DIRECTORY" &&
-
-# the patch drops EGD support for LibreSSL, so make it optional
-if [[ $(get_spell_provider $SPELL SSL) == "libressl" ]]; then
- patch -p0 < "$SPELL_DIRECTORY/libressl.patch"
-fi
diff --git a/python-pypi/pyopenssl/libressl.patch
b/python-pypi/pyopenssl/libressl.patch
deleted file mode 100644
index f244daf..0000000
--- a/python-pypi/pyopenssl/libressl.patch
+++ /dev/null
@@ -1,94 +0,0 @@
---- doc/api/rand.rst.orig
-+++ doc/api/rand.rst
-@@ -31,13 +31,6 @@
- This is a wrapper for the C function :py:func:`RAND_cleanup`.
-
-
--.. py:function:: egd(path[, bytes])
--
-- Query the `Entropy Gathering Daemon
<http://www.lothar.com/tech/crypto/>`_ on
-- socket *path* for *bytes* bytes of random data and uses :py:func:`add`
to
-- seed the PRNG. The default value of *bytes* is 255.
--
--
- .. py:function:: load_file(path[, bytes])
-
- Read *bytes* bytes (or all of it, if *bytes* is negative) of data from
the
---- OpenSSL/rand.py.orig
-+++ OpenSSL/rand.py
-@@ -93,29 +93,6 @@
-
-
-
--def egd(path, bytes=_unspecified):
-- """
-- Query an entropy gathering daemon (EGD) for random data and add it to
the
-- PRNG. I haven't found any problems when the socket is missing, the
function
-- just returns 0.
--
-- :param path: The path to the EGD socket
-- :param bytes: (optional) The number of bytes to read, default is 255
-- :returns: The number of bytes read (NB: a value of 0 isn't necessarily
an
-- error, check rand.status())
-- """
-- if not isinstance(path, _builtin_bytes):
-- raise TypeError("path must be a byte string")
--
-- if bytes is _unspecified:
-- bytes = 255
-- elif not isinstance(bytes, int):
-- raise TypeError("bytes must be an integer")
--
-- return _lib.RAND_egd_bytes(path, bytes)
--
--
--
- def cleanup():
- """
- Erase the memory used by the PRNG.
---- OpenSSL/test/test_rand.py.orig
-+++ OpenSSL/test/test_rand.py
-@@ -103,43 +103,6 @@
- self.assertTrue(rand.status() in (1, 2))
-
-
-- def test_egd_wrong_args(self):
-- """
-- :py:obj:`OpenSSL.rand.egd` raises :py:obj:`TypeError` when called
with the wrong
-- number of arguments or with arguments not of type :py:obj:`str` and
:py:obj:`int`.
-- """
-- self.assertRaises(TypeError, rand.egd)
-- self.assertRaises(TypeError, rand.egd, None)
-- self.assertRaises(TypeError, rand.egd, "foo", None)
-- self.assertRaises(TypeError, rand.egd, None, 3)
-- self.assertRaises(TypeError, rand.egd, "foo", 3, None)
--
--
-- def test_egd_missing(self):
-- """
-- :py:obj:`OpenSSL.rand.egd` returns :py:obj:`0` or :py:obj:`-1` if
the
-- EGD socket passed to it does not exist.
-- """
-- result = rand.egd(self.mktemp())
-- expected = (-1, 0)
-- self.assertTrue(
-- result in expected,
-- "%r not in %r" % (result, expected))
--
--
-- def test_egd_missing_and_bytes(self):
-- """
-- :py:obj:`OpenSSL.rand.egd` returns :py:obj:`0` or :py:obj:`-1` if
the
-- EGD socket passed to it does not exist even if a size argument is
-- explicitly passed.
-- """
-- result = rand.egd(self.mktemp(), 1024)
-- expected = (-1, 0)
-- self.assertTrue(
-- result in expected,
-- "%r not in %r" % (result, expected))
--
--
- def test_cleanup_wrong_args(self):
- """
- :py:obj:`OpenSSL.rand.cleanup` raises :py:obj:`TypeError` when
called with any
[SM-Commit] GIT changes to master grimoire by Ismael Luceno (61b615ced50209c679f8c0a84e329fa054ca4fc1),
Ismael Luceno, 01/29/2020