treewide: Run refresh on all packages

The crude loop I wrote to come up with this changeset:

  find -L package/feeds/packages/ -name patches | \
  sed 's/patches$/refresh/' | sort | xargs make

Signed-off-by: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
This commit is contained in:
Ilya Lipnitskiy
2021-02-20 16:02:15 -08:00
parent d651082447
commit 5d8d4fbbcb
558 changed files with 1518 additions and 2977 deletions

View File

@@ -1,5 +1,3 @@
diff --git a/ports/unix/Makefile b/ports/unix/Makefile
index cbdd3f3..0ab157d 100644
--- a/ports/unix/Makefile
+++ b/ports/unix/Makefile
@@ -21,7 +21,7 @@ INC += -I$(TOP)

View File

@@ -24,11 +24,9 @@ Closes https://github.com/hercules-team/python-augeas/issues/48.
setup.py | 1 +
3 files changed, 24 insertions(+), 6 deletions(-)
diff --git a/augeas/__init__.py b/augeas/__init__.py
index 0fc0d96..4af0200 100644
--- a/augeas/__init__.py
+++ b/augeas/__init__.py
@@ -32,7 +32,7 @@
@@ -32,7 +32,7 @@ format and the transformation into a tre
from sys import version_info as _pyver
@@ -37,8 +35,6 @@ index 0fc0d96..4af0200 100644
__author__ = "Nathaniel McCallum <nathaniel@natemccallum.com>"
__credits__ = """Jeff Schroeder <jeffschroeder@computer.org>
diff --git a/augeas/ffi.py b/augeas/ffi.py
index fdd8d1c..98b3175 100644
--- a/augeas/ffi.py
+++ b/augeas/ffi.py
@@ -1,9 +1,28 @@
@@ -73,7 +69,7 @@ index fdd8d1c..98b3175 100644
ffi.cdef("""
typedef struct augeas augeas;
@@ -59,7 +78,5 @@
@@ -44,7 +63,5 @@ const char *aug_error_details(augeas *au
void free(void *);
""")
@@ -81,11 +77,9 @@ index fdd8d1c..98b3175 100644
-
if __name__ == "__main__":
ffi.compile(verbose=True)
diff --git a/setup.py b/setup.py
index 65026c1..6c4265e 100755
--- a/setup.py
+++ b/setup.py
@@ -22,6 +22,7 @@
@@ -22,6 +22,7 @@ setup(name=name,
setup_requires=["cffi>=1.0.0"],
cffi_modules=["augeas/ffi.py:ffi"],
install_requires=["cffi>=1.0.0"],

View File

@@ -1,6 +1,6 @@
--- a/lib/Crypto/Math/_IntegerGMP.py
+++ b/lib/Crypto/Math/_IntegerGMP.py
@@ -92,7 +92,7 @@ gmp_defs = """typedef unsigned long UNIX_ULONG;
@@ -92,7 +92,7 @@ gmp_defs = """typedef unsigned long UNIX
int __gmpz_divisible_ui_p (const mpz_t n, UNIX_ULONG d);
"""

View File

@@ -1,6 +1,6 @@
--- a/setup.py
+++ b/setup.py
@@ -293,6 +293,9 @@ package_data = {
@@ -301,6 +301,9 @@ package_data = {
],
}

View File

@@ -1,6 +1,6 @@
--- a/lib/Cryptodome/Math/_IntegerGMP.py
+++ b/lib/Cryptodome/Math/_IntegerGMP.py
@@ -92,7 +92,7 @@ gmp_defs = """typedef unsigned long UNIX_ULONG;
@@ -92,7 +92,7 @@ gmp_defs = """typedef unsigned long UNIX
int __gmpz_divisible_ui_p (const mpz_t n, UNIX_ULONG d);
"""

View File

@@ -1,6 +1,6 @@
--- a/setup.py
+++ b/setup.py
@@ -293,6 +293,9 @@ package_data = {
@@ -301,6 +301,9 @@ package_data = {
],
}

View File

@@ -7,8 +7,6 @@ Subject: [PATCH] Fix Python 3.9 compatibility issue with 'array' module
intelhex/compat.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/intelhex/compat.py b/intelhex/compat.py
index 194cd5d..2a6bee6 100644
--- a/intelhex/compat.py
+++ b/intelhex/compat.py
@@ -57,7 +57,8 @@ if sys.version_info[0] >= 3:
@@ -21,6 +19,3 @@ index 194cd5d..2a6bee6 100644
IntTypes = (int,)
StrType = str
--
2.28.0

View File

@@ -1,5 +1,3 @@
diff --git a/src/bindings/minimal/crypto_scalarmult.h b/src/bindings/minimal/crypto_scalarmult.h
index 06ca1ef..9bc3d8e 100644
--- a/src/bindings/minimal/crypto_scalarmult.h
+++ b/src/bindings/minimal/crypto_scalarmult.h
@@ -13,7 +13,7 @@

View File

@@ -1,7 +1,6 @@
diff -u --recursive libselinux-3.1-vanilla/src/Makefile libselinux-3.1/src/Makefile
--- libselinux-3.1-vanilla/src/Makefile 2020-07-10 11:17:15.000000000 -0400
+++ libselinux-3.1/src/Makefile 2020-07-12 14:33:56.337229240 -0400
@@ -131,7 +131,7 @@
--- a/src/Makefile
+++ b/src/Makefile
@@ -131,7 +131,7 @@ SWIGRUBY = swig -Wall -ruby -o $(SWIGRUB
all: $(LIBA) $(LIBSO) $(LIBPC)
pywrap: all selinuxswig_python_exception.i

View File

@@ -7,8 +7,6 @@ Signed-off-by: W. Michael Petullo <mike@flyn.org>
src/libselinux.pc.in | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/libselinux.pc.in b/src/libselinux.pc.in
index 7c66b1fa..d9d58125 100644
--- a/src/libselinux.pc.in
+++ b/src/libselinux.pc.in
@@ -1,7 +1,7 @@
@@ -21,6 +19,3 @@ index 7c66b1fa..d9d58125 100644
Name: libselinux
Description: SELinux utility library
--
2.26.2

View File

@@ -1,6 +1,6 @@
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -1524,6 +1524,7 @@ libinstall: build_all $(srcdir)/Modules/
@@ -1525,6 +1525,7 @@ libinstall: build_all $(srcdir)/Modules/
$(INSTALL_DATA) `cat pybuilddir.txt`/_sysconfigdata_$(ABIFLAGS)_$(MACHDEP)_$(MULTIARCH).py \
$(DESTDIR)$(LIBDEST); \
$(INSTALL_DATA) $(srcdir)/LICENSE $(DESTDIR)$(LIBDEST)/LICENSE.txt
@@ -8,7 +8,7 @@
if test -d $(DESTDIR)$(LIBDEST)/distutils/tests; then \
$(INSTALL_DATA) $(srcdir)/Modules/xxmodule.c \
$(DESTDIR)$(LIBDEST)/distutils/tests ; \
@@ -1559,6 +1560,7 @@ libinstall: build_all $(srcdir)/Modules/
@@ -1560,6 +1561,7 @@ libinstall: build_all $(srcdir)/Modules/
$(PYTHON_FOR_BUILD) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/Grammar.txt
-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
$(PYTHON_FOR_BUILD) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/PatternGrammar.txt

View File

@@ -1,6 +1,6 @@
--- a/Python/initconfig.c
+++ b/Python/initconfig.c
@@ -157,7 +157,7 @@ int Py_NoSiteFlag = 0; /* Suppress 'impo
@@ -158,7 +158,7 @@ int Py_NoSiteFlag = 0; /* Suppress 'impo
int Py_BytesWarningFlag = 0; /* Warn on str(bytes) and str(buffer) */
int Py_FrozenFlag = 0; /* Needed by getpath.c */
int Py_IgnoreEnvironmentFlag = 0; /* e.g. PYTHONPATH, PYTHONHOME */

View File

@@ -1,6 +1,6 @@
--- a/setup.py
+++ b/setup.py
@@ -749,7 +749,8 @@ class PyBuildExt(build_ext):
@@ -734,7 +734,8 @@ class PyBuildExt(build_ext):
# only change this for cross builds for 3.3, issues on Mageia
if CROSS_COMPILING:
self.add_cross_compiling_paths()

View File

@@ -1,6 +1,6 @@
--- a/setup.py
+++ b/setup.py
@@ -726,8 +726,9 @@ class PyBuildExt(build_ext):
@@ -711,8 +711,9 @@ class PyBuildExt(build_ext):
# directly since an inconsistently reproducible issue comes up where
# the environment variable is not set even though the value were passed
# into configure and stored in the Makefile (issue found on OS X 10.3).

View File

@@ -1,6 +1,6 @@
--- a/configure
+++ b/configure
@@ -15308,7 +15308,7 @@ $as_echo_n "checking ABIFLAGS... " >&6;
@@ -15366,7 +15366,7 @@ $as_echo_n "checking ABIFLAGS... " >&6;
$as_echo "$ABIFLAGS" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking SOABI" >&5
$as_echo_n "checking SOABI... " >&6; }
@@ -11,7 +11,7 @@
--- a/configure.ac
+++ b/configure.ac
@@ -4749,7 +4749,7 @@ AC_SUBST(SOABI)
@@ -4770,7 +4770,7 @@ AC_SUBST(SOABI)
AC_MSG_CHECKING(ABIFLAGS)
AC_MSG_RESULT($ABIFLAGS)
AC_MSG_CHECKING(SOABI)

View File

@@ -1,6 +1,6 @@
--- a/setup.py
+++ b/setup.py
@@ -536,6 +536,7 @@ class PyBuildExt(build_ext):
@@ -521,6 +521,7 @@ class PyBuildExt(build_ext):
print("Failed to build these modules:")
print_three_column(failed)
print()

View File

@@ -20,7 +20,7 @@
abi=sys.abiflags,
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -1533,7 +1533,7 @@ libinstall: build_all $(srcdir)/Modules/
@@ -1534,7 +1534,7 @@ libinstall: build_all $(srcdir)/Modules/
esac; \
done; \
done
@@ -29,7 +29,7 @@
$(DESTDIR)$(LIBDEST); \
$(INSTALL_DATA) $(srcdir)/LICENSE $(DESTDIR)$(LIBDEST)/LICENSE.txt
ifeq (@COMPILE_ALL_TESTS@,yes)
@@ -1691,7 +1691,7 @@ sharedinstall: sharedmods
@@ -1692,7 +1692,7 @@ sharedinstall: sharedmods
--install-scripts=$(BINDIR) \
--install-platlib=$(DESTSHARED) \
--root=$(DESTDIR)/
@@ -49,7 +49,7 @@
fi
elif test "$cross_compiling" = maybe; then
as_fn_error $? "Cross compiling required --host=HOST-TUPLE and --build=ARCH" "$LINENO" 5
@@ -15383,7 +15383,7 @@ fi
@@ -15441,7 +15441,7 @@ fi
@@ -69,7 +69,7 @@
fi
elif test "$cross_compiling" = maybe; then
AC_MSG_ERROR([Cross compiling required --host=HOST-TUPLE and --build=ARCH])
@@ -4812,7 +4812,7 @@ fi],
@@ -4833,7 +4833,7 @@ fi],
dnl define LIBPL after ABIFLAGS and LDVERSION is defined.
AC_SUBST(PY_ENABLE_SHARED)

View File

@@ -12,9 +12,9 @@ https://git.alpinelinux.org/aports/tree/main/python2/musl-find_library.patch
+ from glob import glob
+ musl_ldso = glob('/lib/ld-musl-*.so.1')
def _findLib_gcc(name):
# Run GCC's linker with the -t (aka --trace) option and examine the
@@ -252,6 +254,57 @@ elif os.name == "posix":
def _is_elf(filename):
"Return True if the given file is an ELF file"
@@ -265,6 +267,57 @@ elif os.name == "posix":
def find_library(name, is64 = False):
return _get_soname(_findLib_crle(name, is64) or _findLib_gcc(name))