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>
2026-04-24 21:14:40 +01:00 · 2021-02-20 16:02:15 -08:00
parent d651082447
commit 5d8d4fbbcb
558 changed files with 1518 additions and 2977 deletions
--- a/lang/erlang/patches/010-openssl-deprecated.patch
+++ b/lang/erlang/patches/010-openssl-deprecated.patch
@@ -1,6 +1,6 @@
 --- a/lib/crypto/c_src/crypto_callback.c
 +++ b/lib/crypto/c_src/crypto_callback.c
-@@ -112,6 +112,7 @@ static ErlNifRWLock** lock_vec = NULL; /* Static locks used by openssl */
+@@ -112,6 +112,7 @@ static ErlNifRWLock** lock_vec = NULL; /
 
 #include <openssl/crypto.h>
 
@@ -8,7 +8,7 @@
 static INLINE void locking(int mode, ErlNifRWLock* lock)
 {
     switch (mode) {
-@@ -132,7 +133,6 @@ static INLINE void locking(int mode, ErlNifRWLock* lock)
+@@ -132,7 +133,6 @@ static INLINE void locking(int mode, Erl
     }
 }
 
@@ -18,7 +18,7 @@
     locking(mode, lock_vec[n]);
 --- a/lib/crypto/c_src/engine.c
 +++ b/lib/crypto/c_src/engine.c
-@@ -244,7 +244,7 @@ ERL_NIF_TERM engine_load_dynamic_nif(ErlNifEnv* env, int argc, const ERL_NIF_TER
+@@ -244,7 +244,7 @@ ERL_NIF_TERM engine_load_dynamic_nif(Erl
 #ifdef HAS_ENGINE_SUPPORT
     ASSERT(argc == 0);
 
@@ -41,7 +41,7 @@
 #ifdef HAVE_DYNAMIC_CRYPTO_LIB
 
 # if defined(DEBUG)
-@@ -77,7 +82,7 @@ ERL_NIF_TERM info_lib(ErlNifEnv *env, int argc, const ERL_NIF_TERM argv[])
+@@ -77,7 +82,7 @@ ERL_NIF_TERM info_lib(ErlNifEnv *env, in
     ASSERT(argc == 0);
 
     name_sz = strlen(libname);
--- a/lang/erlang/patches/020-erts-emulator-reorder-inclued-headers-paths.patch
+++ b/lang/erlang/patches/020-erts-emulator-reorder-inclued-headers-paths.patch
@@ -22,11 +22,9 @@ Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
 erts/emulator/Makefile.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

-diff --git a/erts/emulator/Makefile.in b/erts/emulator/Makefile.in
-index 7145824..d079487 100644
 --- a/erts/emulator/Makefile.in
 +++ b/erts/emulator/Makefile.in
-@@ -712,7 +712,7 @@
+@@ -751,7 +751,7 @@ endif
 # Usually the same as the default rule, but certain platforms (e.g. win32) mix
 # different compilers
 $(OBJDIR)/beam_emu.o: beam/beam_emu.c
@@ -35,7 +33,7 @@ index 7145824..d079487 100644
 
 $(OBJDIR)/beam_emu.S: beam/beam_emu.c
 	$(V_EMU_CC) -S -fverbose-asm $(subst -O2, $(GEN_OPT_FLGS), $(CFLAGS)) $(INCLUDES) -c $< -o $@
-@@ -765,7 +765,7 @@
+@@ -804,7 +804,7 @@ endif
 # General targets
 #
 $(OBJDIR)/%.o: beam/%.c
--- a/lang/lua-coxpcall/patches/config.patch
+++ b/lang/lua-coxpcall/patches/config.patch
@@ -1,4 +1,4 @@
--- lua-coxpcall-1.15.0_org/config	1970-01-01 08:00:00.000000000 +0800
-+++ lua-coxpcall-1.15.0/config	2014-06-04 16:51:55.487547258 +0800
+--- /dev/null
+++ b/config
@@ -0,0 +1 @@
 +LUA_DIR ?=$(DESTDIR)/usr/lib/lua
--- a/lang/lua-md5/patches/config.patch
+++ b/lang/lua-md5/patches/config.patch
@@ -1,5 +1,5 @@
--- a/config	2019-11-01 13:58:27.907691645 +0800
-+++ b/config	2019-11-01 14:00:52.126290663 +0800
+--- a/config
+++ b/config
@@ -1,16 +1,16 @@
 # Installation directories
 
--- a/lang/lua-md5/patches/makefile.patch
+++ b/lang/lua-md5/patches/makefile.patch
@@ -1,5 +1,5 @@
--- a/Makefile.orig	2014-06-04 17:16:40.083514808 +0800
-+++ b/Makefile	2014-06-04 17:17:27.111513780 +0800
+--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 # $Id: Makefile,v 1.7 2007/10/11 00:02:56 carregal Exp $
 
--- a/lang/lua-openssl/patches/0001-Revise-Makefile.patch
+++ b/lang/lua-openssl/patches/0001-Revise-Makefile.patch
@@ -1,5 +1,3 @@
-diff --git a/Makefile b/Makefile
-index 10c1142..2a94df4 100644
 --- a/Makefile
 +++ b/Makefile
@@ -1,121 +1,52 @@
@@ -10,8 +8,7 @@ index 10c1142..2a94df4 100644
 -CC		:= $(CROSS)$(CC)
 -AR		:= $(CROSS)$(AR)
 -LD		:= $(CROSS)$(LD)
-+PKGC ?= pkg-config
- 
+-
 -#OS auto detect
 -ifneq (,$(TARGET_SYS))
 -  SYS		:= $(TARGET_SYS)
@@ -62,14 +59,15 @@ index 10c1142..2a94df4 100644
 -  #MACOSX_DEPLOYMENT_TARGET="10.3"
 -  CC		:= MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} $(CC)
 -endif
-+LIB_OPTION	= -shared
-+LUAPKGC = lua
+PKGC ?= pkg-config
 
 -ifneq (, $(findstring mingw, $(SYS)))
 -  # Do mingw things
 -  CFLAGS	 = -DLUA_LIB -DLUA_BUILD_AS_DLL -DWIN32_LEAN_AND_MEAN
 -endif
-
+LIB_OPTION	= -shared
+LUAPKGC = lua
+ 
 -ifneq (, $(findstring cygwin, $(SYS)))
 -  # Do cygwin things
 -  CFLAGS	 = -fPIC
@@ -119,12 +117,12 @@ index 10c1142..2a94df4 100644
 
 all: $T.so
 -	@echo "Target system: "$(SYS)
-
-$T.so: lib$T.a
-	$(CC) -o $@ src/openssl.o -L. -l$T $(LDFLAGS)
 +	echo $(SYS)
 +	$(CC) $(LDFLAGS) $(LIB_OPTION) $(OBJS) -o $@
 
+-$T.so: lib$T.a
+-	$(CC) -o $@ src/openssl.o -L. -l$T $(LDFLAGS)
+-
 -lib$T.a: $(OBJS)
 -	$(AR) rcs $@ $?
 +$T.so: $(OBJS)
--- a/lang/lua-rings/patches/config.patch
+++ b/lang/lua-rings/patches/config.patch
@@ -1,5 +1,5 @@
--- lua-rings-1.3.0_org/config	2014-06-04 15:24:24.223662038 +0800
-+++ lua-rings-1.3.0/config	2014-06-04 16:16:15.183594040 +0800
+--- a/config
+++ b/config
@@ -1,15 +1,15 @@
 # Installation directories
 
@@ -19,7 +19,7 @@
 
 # Lua includes directory
 LUA_INC ?= $(PREFIX)/include
-@@ -24,6 +24,5 @@
+@@ -24,6 +24,5 @@ LIBNAME ?= $T.so.$V
 WARN ?= -O2 -Wall -fPIC -W -Waggregate-return -Wcast-align -Wmissing-prototypes -Wnested-externs -Wshadow -Wwrite-strings -Wpointer-arith -pedantic
 INCS ?= -I$(LUA_INC)
 CFLAGS ?= $(WARN) $(INCS)
--- a/lang/lua-rings/patches/makefile.patch
+++ b/lang/lua-rings/patches/makefile.patch
@@ -1,5 +1,5 @@
--- lua-rings-1.3.0_org/Makefile	2014-06-04 15:24:37.583661746 +0800
-+++ lua-rings-1.3.0/Makefile	2014-06-04 15:23:41.611662970 +0800
+--- a/Makefile
+++ b/Makefile
@@ -3,6 +3,8 @@
 T= rings
 CONFIG= ./config
--- a/lang/lua-rs232/patches/100-remove-build-timestamps.patch
+++ b/lang/lua-rs232/patches/100-remove-build-timestamps.patch
@@ -8,7 +8,7 @@
 #define MODULE_NAMESPACE "luars232"
 #define MODULE_VERSION "1.0.3"
 #define MODULE_BUILD "$Id: luars232.c 15 2011-02-23 09:02:20Z sp $"
-@@ -553,9 +552,6 @@
+@@ -553,9 +552,6 @@ RS232_LIB int luaopen_luars232(lua_State
 	lua_pushstring(L, MODULE_BUILD);
 	lua_setfield(L, -2, "_BUILD");
 
--- a/lang/lualanes/patches/100-musl-compat.patch
+++ b/lang/lualanes/patches/100-musl-compat.patch
@@ -1,6 +1,6 @@
 --- a/src/threading.h
 +++ b/src/threading.h
-@@ -110,7 +110,7 @@ enum e_status { PENDING, RUNNING, WAITING, DONE, ERROR_ST, CANCELLED };
+@@ -110,7 +110,7 @@ enum e_status { PENDING, RUNNING, WAITIN
   #endif // PLATFORM_WIN32
   #include <pthread.h>
 
--- a/lang/luaposix/patches/102-disable-compat-deprecated.patch
+++ b/lang/luaposix/patches/102-disable-compat-deprecated.patch
@@ -1,5 +1,3 @@
-diff --git a/lib/posix/init.lua b/lib/posix/init.lua
-index cf51bf3..e66af04 100644
 --- a/lib/posix/init.lua
 +++ b/lib/posix/init.lua
@@ -325,14 +325,6 @@ do
--- a/lang/luaposix/patches/900-disable-ldoc.patch
+++ b/lang/luaposix/patches/900-disable-ldoc.patch
@@ -1,5 +1,3 @@
-diff --git a/lukefile b/lukefile
-index 2d4bb2f..1e48540 100644
 --- a/lukefile
 +++ b/lukefile
@@ -29,8 +29,6 @@ incdirs  = {
--- a/lang/luarocks/patches/01_dont_modify_bin_shebang.diff
+++ b/lang/luarocks/patches/01_dont_modify_bin_shebang.diff
@@ -1,7 +1,6 @@
-diff -rupN luarocks/Makefile luarocks.new/Makefile
--- luarocks/Makefile	2015-02-19 13:24:07.027310956 +0200
-+++ luarocks.new/Makefile	2015-02-22 13:28:24.497353543 +0200
-@@ -104,7 +104,7 @@ build_bins: cleanup_bins
+--- a/Makefile
+++ b/Makefile
+@@ -89,7 +89,7 @@ build_bins: cleanup_bins
 	for f in $(BIN_FILES) ;\
 	do \
 	   sed "1d" src/bin/$$f > src/bin/$$f.bak ;\
@@ -10,4 +9,3 @@ diff -rupN luarocks/Makefile luarocks.new/Makefile
 	   echo "package.path = [[$(LUADIR)/?.lua;]]..package.path" | sed "s,//,/,g" >> src/bin/$$f ;\
 	   cat src/bin/$$f.bak >> src/bin/$$f ;\
 	   chmod +x src/bin/$$f ;\
-Binary files luarocks/src/bin/.luarocks.swp and luarocks.new/src/bin/.luarocks.swp differ
--- a/lang/luarocks/patches/02_allow_configure_uname_siteconfig_adjustment.patch
+++ b/lang/luarocks/patches/02_allow_configure_uname_siteconfig_adjustment.patch
@@ -1,7 +1,5 @@
-Index: luarocks-2.2.2/configure
-===================================================================
--- luarocks-2.2.2.orig/configure
-+++ luarocks-2.2.2/configure
+--- a/configure
+++ b/configure
@@ -388,18 +388,22 @@ then
 fi
 
--- a/lang/luasec/patches/100-fix-compilation.patch
+++ b/lang/luasec/patches/100-fix-compilation.patch
@@ -1,6 +1,6 @@
 --- a/src/Makefile
 +++ b/src/Makefile
-@@ -15,8 +15,8 @@ WARN=-Wall -pedantic
+@@ -16,8 +16,8 @@ WARN=-Wall -pedantic
 BSD_CFLAGS=-O2 -fPIC $(WARN) $(INCDIR) $(DEFS)
 BSD_LDFLAGS=-O -fPIC -shared $(LIBDIR)
 
@@ -11,7 +11,7 @@
 
 MAC_ENV=env MACOSX_DEPLOYMENT_TARGET='$(MACVER)'
 MAC_CFLAGS=-O2 -fno-common $(WARN) $(INCDIR) $(DEFS)
-@@ -33,10 +33,10 @@ LDFLAGS += $(MYLDFLAGS)
+@@ -34,10 +34,10 @@ LDFLAGS += $(MYLDFLAGS)
 all:
 
 install: $(CMOD) $(LMOD)
--- a/lang/luasocket/patches/0001-Add-interface-support.patch
+++ b/lang/luasocket/patches/0001-Add-interface-support.patch
@@ -13,9 +13,6 @@ Subject: [PATCH] Add interface resolving
 create mode 100644 src/if.c
 create mode 100644 src/if.h

-diff --git a/src/if.c b/src/if.c
-new file mode 100644
-index 0000000..db231aa
 --- /dev/null
 +++ b/src/if.c
@@ -0,0 +1,117 @@
@@ -136,9 +133,6 @@ index 0000000..db231aa
 +  if_freenameindex(oni);
 +  return 1;
 +}
-diff --git a/src/if.h b/src/if.h
-new file mode 100644
-index 0000000..dc7faf8
 --- /dev/null
 +++ b/src/if.h
@@ -0,0 +1,27 @@
@@ -169,8 +163,6 @@ index 0000000..dc7faf8
 +int if_open(lua_State *L);
 +
 +#endif /* IF_H */
-diff --git a/src/luasocket.c b/src/luasocket.c
-index e6ee747..85d41a6 100644
 --- a/src/luasocket.c
 +++ b/src/luasocket.c
@@ -21,6 +21,7 @@
@@ -189,11 +181,8 @@ index e6ee747..85d41a6 100644
     {NULL, NULL}
 };
 
-diff --git a/src/makefile b/src/makefile
-index 8d3521e..09d4882 100644
 --- a/src/makefile
 +++ b/src/makefile
-
@@ -303,6 +303,7 @@ SOCKET_OBJS= \
 	compat.$(O) \
 	options.$(O) \
@@ -210,8 +199,6 @@ index 8d3521e..09d4882 100644
 io.$(O): io.c io.h timeout.h
 luasocket.$(O): luasocket.c luasocket.h auxiliar.h except.h \
 	timeout.h buffer.h io.h inet.h socket.h usocket.h tcp.h \
-diff --git a/src/options.c b/src/options.c
-index 8ac2a14..1c73e6f 100644
 --- a/src/options.c
 +++ b/src/options.c
@@ -7,7 +7,10 @@
@@ -239,5 +226,3 @@ index 8ac2a14..1c73e6f 100644
         } else
           luaL_argerror(L, -1, "number 'interface' field expected");
     }
--
-1.8.4.rc3
--- a/lang/luasocket/patches/0301-Fix-mpc85xx-build.patch
+++ b/lang/luasocket/patches/0301-Fix-mpc85xx-build.patch
@@ -1,6 +1,6 @@
 --- a/src/makefile
 +++ b/src/makefile
-@@ -397,18 +398,18 @@ none:
+@@ -397,18 +397,18 @@ none:
 all: $(SOCKET_SO) $(MIME_SO)
 
 $(SOCKET_SO): $(SOCKET_OBJS)
--- a/lang/perl-authen-sasl-xs/patches/100-remove-devel-checklib-checks.patch
+++ b/lang/perl-authen-sasl-xs/patches/100-remove-devel-checklib-checks.patch
@@ -1,5 +1,5 @@
--- a/Makefile.PL	2009-09-22 16:22:09.000000000 -0600
-+++ b/Makefile.PL	2018-01-01 18:54:13.023366252 -0700
+--- a/Makefile.PL
+++ b/Makefile.PL
@@ -1,7 +1,6 @@
 # Do yourself a favour, and don't edit this file, see README for build instructions
 
@@ -8,7 +8,7 @@
 
 my @inc_search = qw(/opt/local/include /usr/local/include);
 my @lib_search = qw(/opt/local/lib64 /usr/local/lib64 /opt/local/lib /usr/local/lib);
-@@ -12,15 +12,7 @@ unless (exists $args{INC} or exists $arg
+@@ -13,28 +12,13 @@ unless (exists $args{INC} or exists $arg
 
   my @incpath = grep {-d} @inc_search;
   my @libpath = grep {-d} @lib_search;
@@ -25,7 +25,6 @@
 
   if ($have_sasl2) {
     $mmopt{DEFINE} = "-DSASL2" unless $use_sasl2;
-@@ -28,13 +27,6 @@ unless (exists $args{INC} or exists $arg
   }
   else {
     exit(0) if $use_sasl2;
@@ -39,7 +38,7 @@
   }
 
   $mmopt{INC}  = join " ", map {"-I$_"} @incpath;
-@@ -58,7 +50,6 @@ WriteMakefile(
+@@ -58,7 +42,6 @@ WriteMakefile(
           repository => 'http://github.com/gbarr/perl-authen-sasl-xs',
         },
         build_requires => {
--- a/lang/perl-device-usb/patches/100-fix_buildsystem.patch
+++ b/lang/perl-device-usb/patches/100-fix_buildsystem.patch
@@ -6,7 +6,7 @@ Last-Update: 2013-10-28

 --- a/Makefile.PL
 +++ b/Makefile.PL
-@@ -2,6 +2,11 @@
+@@ -2,6 +2,11 @@ use strict;
 use warnings;
 use Inline::MakeMaker;
 
--- a/lang/perl-device-usb/patches/110-just_assume_libusb_is_there.patch
+++ b/lang/perl-device-usb/patches/110-just_assume_libusb_is_there.patch
@@ -8,9 +8,9 @@ From: Ansgar Burchardt <ansgar@debian.org>
 Reviewed-by: gregor herrmann <gregoa@debian.org>
 Last-Update: 2013-10-28

--- libdevice-usb-perl.orig/Makefile.PL
-+++ libdevice-usb-perl/Makefile.PL
-@@ -21,7 +21,7 @@
+--- a/Makefile.PL
+++ b/Makefile.PL
+@@ -21,7 +21,7 @@ END
     }
 }
 
@@ -19,7 +19,7 @@ Last-Update: 2013-10-28
 {
     die <<"END";
 ERROR: Can't find usb.h header.
-@@ -36,7 +36,7 @@
+@@ -36,7 +36,7 @@ following environment variables:
 END
 }
 
--- a/lang/perl-device-usb/patches/140-avoid-libusb-name-conflicts.patch
+++ b/lang/perl-device-usb/patches/140-avoid-libusb-name-conflicts.patch
@@ -98,7 +98,7 @@
     }
 #if LIBUSB_HAS_GET_DRIVER_NP
     ret = usb_get_driver_np((usb_dev_handle *)dev, interface, name, namelen);
-@@ -735,11 +736,11 @@ int libusb_get_driver_np(void *dev, int interface, char *name, unsigned int name
+@@ -735,11 +736,11 @@ int libusb_get_driver_np(void *dev, int
 #endif
 }
 
@@ -112,7 +112,7 @@
     }
 #if LIBUSB_HAS_DETACH_KERNEL_DRIVER_NP
     return usb_detach_kernel_driver_np((usb_dev_handle *)dev, interface);
-@@ -748,25 +749,25 @@ int libusb_detach_kernel_driver_np(void *dev, int interface)
+@@ -748,25 +749,25 @@ int libusb_detach_kernel_driver_np(void
 #endif
 }
 
@@ -143,7 +143,7 @@
 {
     int i = 0;
     int retval = 0;
-@@ -775,7 +776,7 @@ void libusb_control_msg(void *dev, int requesttype, int request, int value, int
+@@ -775,7 +776,7 @@ void libusb_control_msg(void *dev, int r
 
     if(DeviceUSBDebugLevel())
     {
@@ -152,7 +152,7 @@
             requesttype, request, value, index, bytes, size, timeout
         );
         /* maybe need to add support for printing the bytes string. */
-@@ -808,54 +809,54 @@ void libusb_control_msg(void *dev, int requesttype, int request, int value, int
+@@ -808,54 +809,54 @@ void libusb_control_msg(void *dev, int r
     Inline_Stack_Done;
 }
 
--- a/lang/perl-file-rsyncp/patches/001-no-subdirs.patch
+++ b/lang/perl-file-rsyncp/patches/001-no-subdirs.patch
@@ -1,6 +1,6 @@
--- a/Makefile.PL	2010-07-25 22:50:02.000000000 +0200
-+++ b/Makefile.PL	2018-03-27 15:46:16.724000000 +0200
-@@ -8,7 +8,7 @@
+--- a/Makefile.PL
+++ b/Makefile.PL
+@@ -8,7 +8,7 @@ WriteMakefile(
                             Getopt::Long => 2.24,	# need OO interface
                          },
     'PMLIBDIRS'       => ['lib'],
--- a/lang/perl-www-curl/patches/101-skip-preprocessor-symbol.path
+++ b/lang/perl-www-curl/patches/101-skip-preprocessor-symbol.path
@@ -16,8 +16,6 @@ Signed-off-by: Petr Písař <ppisar@redhat.com>
 Makefile.PL | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-diff --git a/Makefile.PL b/Makefile.PL
-index f9170bb..ad2bd3d 100644
 --- a/Makefile.PL
 +++ b/Makefile.PL
@@ -127,7 +127,7 @@ if (!defined($curl_h)) {
@@ -29,6 +27,3 @@ index f9170bb..ad2bd3d 100644
           next;
        }
        my ($group) = $e =~ m/^([^_]+_)/;
-- 
-2.7.4
-
--- a/lang/perl-www-curl/patches/210-curl_7.66_compat.patch
+++ b/lang/perl-www-curl/patches/210-curl_7.66_compat.patch
@@ -1,6 +1,6 @@
 --- a/Curl.xs
 +++ b/Curl.xs
-@@ -70,7 +70,7 @@
+@@ -70,7 +70,7 @@ typedef struct {
 
 
 typedef struct {
@@ -9,7 +9,7 @@
     struct CURLM *curlm;
 #else
     struct void *curlm;
-@@ -234,7 +234,7 @@
+@@ -234,7 +234,7 @@ static perl_curl_multi * perl_curl_multi
 {
     perl_curl_multi *self;
     Newz(1, self, 1, perl_curl_multi);
@@ -18,7 +18,7 @@
     self->curlm=curl_multi_init();
 #else
     croak("curl version too old to support curl_multi_init()");
-@@ -245,7 +245,7 @@
+@@ -245,7 +245,7 @@ static perl_curl_multi * perl_curl_multi
 /* delete the multi */
 static void perl_curl_multi_delete(perl_curl_multi *self)
 {
@@ -27,7 +27,7 @@
     if (self->curlm) 
         curl_multi_cleanup(self->curlm);
     Safefree(self);
-@@ -1065,7 +1065,7 @@
+@@ -1065,7 +1065,7 @@ curl_multi_add_handle(curlm, curl)
     WWW::Curl::Multi curlm
     WWW::Curl::Easy curl
     CODE:
@@ -36,7 +36,7 @@
         curl_multi_add_handle(curlm->curlm, curl->curl);
 #endif
 
-@@ -1074,7 +1074,7 @@
+@@ -1074,7 +1074,7 @@ curl_multi_remove_handle(curlm, curl)
     WWW::Curl::Multi curlm
     WWW::Curl::Easy curl
     CODE:
@@ -45,7 +45,7 @@
         curl_multi_remove_handle(curlm->curlm, curl->curl);
 #endif
 
-@@ -1149,7 +1149,7 @@
+@@ -1149,7 +1149,7 @@ curl_multi_perform(self)
     PREINIT:
         int remaining;
     CODE:
--- a/lang/perl-www-curl/patches/220-curl_7.69_compat.patch
+++ b/lang/perl-www-curl/patches/220-curl_7.69_compat.patch
@@ -1,6 +1,6 @@
 --- a/Makefile.PL
 +++ b/Makefile.PL
-@@ -127,7 +127,7 @@
+@@ -127,7 +127,7 @@ if (!defined($curl_h)) {
     close H;
 
     for my $e (sort @syms) {
--- a/lang/php7-pecl-libevent/patches/010-libevent2.patch
+++ b/lang/php7-pecl-libevent/patches/010-libevent2.patch
@@ -1,7 +1,7 @@
 --- a/libevent.c
 +++ b/libevent.c
-@@ -42,10 +42,12 @@
- 	(rsrc = (rsrc_type) zend_fetch_resource(passed_id TSRMLS_CC, default_id, resource_type_name, NULL, 1, resource_type))
+@@ -37,10 +37,12 @@
+ # define LIBEVENT_SOCKETS_SUPPORT
 #endif
 
 -#ifdef PHP_WIN32
--- a/lang/php7/patches/0013-Add-support-for-use-of-the-system-timezone-database.patch
+++ b/lang/php7/patches/0013-Add-support-for-use-of-the-system-timezone-database.patch
@@ -40,8 +40,6 @@ r1: initial revision
 ext/date/lib/parse_tz.c | 535 +++++++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 545 insertions(+), 3 deletions(-)

-diff --git a/ext/date/config0.m4 b/ext/date/config0.m4
-index 20e4164..a612436 100644
 --- a/ext/date/config0.m4
 +++ b/ext/date/config0.m4
@@ -4,6 +4,19 @@ AC_CHECK_HEADERS([io.h])
@@ -64,8 +62,6 @@ index 20e4164..a612436 100644
 PHP_DATE_CFLAGS="-I@ext_builddir@/lib -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1 -DHAVE_TIMELIB_CONFIG_H=1"
 timelib_sources="lib/astro.c lib/dow.c lib/parse_date.c lib/parse_tz.c
                  lib/timelib.c lib/tm2unixtime.c lib/unixtime2tm.c lib/parse_iso_intervals.c lib/interval.c"
-diff --git a/ext/date/lib/parse_tz.c b/ext/date/lib/parse_tz.c
-index 020da31..9b39c6e 100644
 --- a/ext/date/lib/parse_tz.c
 +++ b/ext/date/lib/parse_tz.c
@@ -26,8 +26,21 @@
@@ -90,7 +86,7 @@ index 020da31..9b39c6e 100644
 
 #if (defined(__APPLE__) || defined(__APPLE_CC__)) && (defined(__BIG_ENDIAN__) || defined(__LITTLE_ENDIAN__))
 # if defined(__LITTLE_ENDIAN__)
-@@ -88,6 +101,11 @@ static int read_php_preamble(const unsigned char **tzf, timelib_tzinfo *tz)
+@@ -88,6 +101,11 @@ static int read_php_preamble(const unsig
 {
 	uint32_t version;
 
@@ -102,7 +98,7 @@ index 020da31..9b39c6e 100644
 	/* read ID */
 	version = (*tzf)[3] - '0';
 	*tzf += 4;
-@@ -412,7 +430,429 @@ void timelib_dump_tzinfo(timelib_tzinfo *tz)
+@@ -412,7 +430,429 @@ void timelib_dump_tzinfo(timelib_tzinfo
 	}
 }
 
@@ -533,7 +529,7 @@ index 020da31..9b39c6e 100644
 {
 	int left = 0, right = tzdb->index_size - 1;
 
-@@ -438,9 +878,48 @@ static int seek_to_tz_position(const unsigned char **tzf, char *timezone, const
+@@ -438,9 +878,48 @@ static int seek_to_tz_position(const uns
 	return 0;
 }
 
@@ -582,7 +578,7 @@ index 020da31..9b39c6e 100644
 }
 
 const timelib_tzdb_index_entry *timelib_timezone_identifiers_list(const timelib_tzdb *tzdb, int *count)
-@@ -452,7 +931,30 @@ const timelib_tzdb_index_entry *timelib_timezone_identifiers_list(const timelib_
+@@ -452,7 +931,30 @@ const timelib_tzdb_index_entry *timelib_
 int timelib_timezone_id_is_valid(char *timezone, const timelib_tzdb *tzdb)
 {
 	const unsigned char *tzf;
@@ -614,7 +610,7 @@ index 020da31..9b39c6e 100644
 }
 
 static int skip_64bit_preamble(const unsigned char **tzf, timelib_tzinfo *tz)
-@@ -494,12 +996,14 @@ static timelib_tzinfo* timelib_tzinfo_ctor(char *name)
+@@ -494,12 +996,14 @@ static timelib_tzinfo* timelib_tzinfo_ct
 timelib_tzinfo *timelib_parse_tzfile(char *timezone, const timelib_tzdb *tzdb, int *error_code)
 {
 	const unsigned char *tzf;
@@ -630,7 +626,7 @@ index 020da31..9b39c6e 100644
 		tmp = timelib_tzinfo_ctor(timezone);
 
 		version = read_preamble(&tzf, tmp, &type);
-@@ -534,11 +1038,36 @@ timelib_tzinfo *timelib_parse_tzfile(char *timezone, const timelib_tzdb *tzdb, i
+@@ -534,11 +1038,36 @@ timelib_tzinfo *timelib_parse_tzfile(cha
 		}
 		skip_posix_string(&tzf, tmp);
 
--- a/lang/php7/patches/0032-Use-system-timezone.patch
+++ b/lang/php7/patches/0032-Use-system-timezone.patch
@@ -13,11 +13,9 @@ To be used in tandem with use_embedded_timezonedb.patch and use_embedded_timezon
 ext/date/php_date.c | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

-diff --git a/ext/date/php_date.c b/ext/date/php_date.c
-index f049ae2..6a044ce 100644
 --- a/ext/date/php_date.c
 +++ b/ext/date/php_date.c
-@@ -1030,6 +1030,23 @@ static char* guess_timezone(const timelib_tzdb *tzdb)
+@@ -1032,6 +1032,23 @@ static char* guess_timezone(const timeli
 		DATEG(timezone_valid) = 1;
 		return DATEG(default_timezone);
 	}
--- a/lang/php7/patches/0041-Add-patch-to-remove-build-timestamps-from-generated-.patch
+++ b/lang/php7/patches/0041-Add-patch-to-remove-build-timestamps-from-generated-.patch
@@ -13,7 +13,7 @@ Subject: Add patch to remove build timestamps from generated binaries.

 --- a/ext/standard/info.c
 +++ b/ext/standard/info.c
-@@ -802,7 +802,6 @@ PHPAPI ZEND_COLD void php_print_info(int flag)
+@@ -802,7 +802,6 @@ PHPAPI ZEND_COLD void php_print_info(int
 		php_info_print_box_end();
 		php_info_print_table_start();
 		php_info_print_table_row(2, "System", ZSTR_VAL(php_uname));
@@ -47,7 +47,7 @@ Subject: Add patch to remove build timestamps from generated binaries.
   *aix*)
 --- a/sapi/cgi/cgi_main.c
 +++ b/sapi/cgi/cgi_main.c
-@@ -2392,9 +2392,9 @@ parent_loop_end:
+@@ -2400,9 +2400,9 @@ parent_loop_end:
 							SG(headers_sent) = 1;
 							SG(request_info).no_headers = 1;
 #if ZEND_DEBUG
@@ -61,7 +61,7 @@ Subject: Add patch to remove build timestamps from generated binaries.
 							fcgi_shutdown();
 --- a/sapi/cli/php_cli.c
 +++ b/sapi/cli/php_cli.c
-@@ -645,8 +645,8 @@ static int do_cli(int argc, char **argv) /* {{{ */
+@@ -648,8 +648,8 @@ static int do_cli(int argc, char **argv)
 				goto out;
 
 			case 'v': /* show php version & quit */
@@ -74,7 +74,7 @@ Subject: Add patch to remove build timestamps from generated binaries.
 #else
 --- a/sapi/fpm/fpm/fpm_main.c
 +++ b/sapi/fpm/fpm/fpm_main.c
-@@ -1722,9 +1722,9 @@ int main(int argc, char *argv[])
+@@ -1717,9 +1717,9 @@ int main(int argc, char *argv[])
 				SG(request_info).no_headers = 1;
 
 #if ZEND_DEBUG
@@ -88,7 +88,7 @@ Subject: Add patch to remove build timestamps from generated binaries.
 				fcgi_shutdown();
 --- a/sapi/phpdbg/phpdbg.c
 +++ b/sapi/phpdbg/phpdbg.c
-@@ -1695,10 +1695,8 @@ phpdbg_main:
+@@ -1697,10 +1697,8 @@ phpdbg_main:
 				phpdbg_do_help_cmd(exec);
 			} else if (show_version) {
 				phpdbg_out(
--- a/lang/php7/patches/0042-Remove-W3C-validation-icon-to-not-expose-the-reader-.patch
+++ b/lang/php7/patches/0042-Remove-W3C-validation-icon-to-not-expose-the-reader-.patch
@@ -7,8 +7,6 @@ Subject: Remove W3C validation icon to not expose the reader's IP address to
 sapi/fpm/status.html.in | 5 -----
 1 file changed, 5 deletions(-)

-diff --git a/sapi/fpm/status.html.in b/sapi/fpm/status.html.in
-index 86492d7..31c31ff 100644
 --- a/sapi/fpm/status.html.in
 +++ b/sapi/fpm/status.html.in
@@ -70,11 +70,6 @@
--- a/lang/php7/patches/0050-remove-build-timestamps.patch
+++ b/lang/php7/patches/0050-remove-build-timestamps.patch
@@ -1,6 +1,6 @@
 --- a/ext/opcache/ZendAccelerator.c
 +++ b/ext/opcache/ZendAccelerator.c
-@@ -2652,11 +2652,6 @@ static void accel_gen_system_id(void)
+@@ -2667,11 +2667,6 @@ static void accel_gen_system_id(void)
 	PHP_MD5Update(&context, PHP_VERSION, sizeof(PHP_VERSION)-1);
 	PHP_MD5Update(&context, ZEND_EXTENSION_BUILD_ID, sizeof(ZEND_EXTENSION_BUILD_ID)-1);
 	PHP_MD5Update(&context, ZEND_BIN_ID, sizeof(ZEND_BIN_ID)-1);
@@ -14,7 +14,7 @@
      */
 --- a/sapi/litespeed/lsapi_main.c
 +++ b/sapi/litespeed/lsapi_main.c
-@@ -1284,9 +1284,9 @@ static int cli_main( int argc, char * ar
+@@ -1288,9 +1288,9 @@ static int cli_main( int argc, char * ar
             case 'v':
                 if (php_request_startup() != FAILURE) {
 #if ZEND_DEBUG
--- a/lang/php7/patches/1001-ext-opcache-fix-detection-of-shm-mmap.patch
+++ b/lang/php7/patches/1001-ext-opcache-fix-detection-of-shm-mmap.patch
@@ -18,8 +18,6 @@ Signed-off-by: Michael Heimpold <mhei@heimpold.de>
 ext/opcache/config.m4 | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

-diff --git a/ext/opcache/config.m4 b/ext/opcache/config.m4
-index 6c40cafc1..63fa5bb55 100644
 --- a/ext/opcache/config.m4
 +++ b/ext/opcache/config.m4
@@ -89,7 +89,10 @@ int main() {
@@ -46,6 +44,3 @@ index 6c40cafc1..63fa5bb55 100644
   AC_MSG_RESULT([$msg])
 
   PHP_CHECK_FUNC_LIB(shm_open, rt)
-- 
-2.17.1
-
--- a/lang/php7/patches/1004-disable-phar-command.patch
+++ b/lang/php7/patches/1004-disable-phar-command.patch
@@ -1,6 +1,6 @@
--- a/ext/phar/config.m4	2016-08-17 21:50:58.000000000 +0200
-+++ b/ext/phar/config.m4	2016-09-20 22:21:28.494934775 +0200
-@@ -19,7 +19,7 @@
+--- a/ext/phar/config.m4
+++ b/ext/phar/config.m4
+@@ -19,7 +19,7 @@ if test "$PHP_PHAR" != "no"; then
   fi
   PHP_ADD_EXTENSION_DEP(phar, hash, true)
   PHP_ADD_EXTENSION_DEP(phar, spl, true)
@@ -9,9 +9,9 @@
 
   PHP_INSTALL_HEADERS([ext/phar], [php_phar.h])
 
--- a/configure.ac	2016-09-20 22:26:38.000000000 +0200
-+++ b/configure.ac	2016-09-20 22:42:30.380101556 +0200
-@@ -1430,13 +1430,13 @@
+--- a/configure.ac
+++ b/configure.ac
+@@ -1454,13 +1454,13 @@ CFLAGS="\$(CFLAGS_CLEAN) $standard_libto
 INLINE_CFLAGS="$INLINE_CFLAGS $standard_libtool_flag"
 CXXFLAGS="$CXXFLAGS $standard_libtool_flag \$(PROF_FLAGS)"
 
--- a/lang/php8/patches/0007-Add-support-for-use-of-the-system-timezone-database.patch
+++ b/lang/php8/patches/0007-Add-support-for-use-of-the-system-timezone-database.patch
@@ -41,8 +41,6 @@ r1: initial revision
 ext/date/lib/parse_tz.c | 535 +++++++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 545 insertions(+), 3 deletions(-)

-diff --git a/ext/date/config0.m4 b/ext/date/config0.m4
-index 20e4164..a612436 100644
 --- a/ext/date/config0.m4
 +++ b/ext/date/config0.m4
@@ -4,6 +4,19 @@ AC_CHECK_HEADERS([io.h])
@@ -65,8 +63,6 @@ index 20e4164..a612436 100644
 PHP_DATE_CFLAGS="-I@ext_builddir@/lib -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1 -DHAVE_TIMELIB_CONFIG_H=1"
 timelib_sources="lib/astro.c lib/dow.c lib/parse_date.c lib/parse_tz.c
                  lib/timelib.c lib/tm2unixtime.c lib/unixtime2tm.c lib/parse_iso_intervals.c lib/interval.c"
-diff --git a/ext/date/lib/parse_tz.c b/ext/date/lib/parse_tz.c
-index 233c55c..4b70178 100644
 --- a/ext/date/lib/parse_tz.c
 +++ b/ext/date/lib/parse_tz.c
@@ -26,8 +26,21 @@
@@ -91,7 +87,7 @@ index 233c55c..4b70178 100644
 
 #if (defined(__APPLE__) || defined(__APPLE_CC__)) && (defined(__BIG_ENDIAN__) || defined(__LITTLE_ENDIAN__))
 # if defined(__LITTLE_ENDIAN__)
-@@ -94,6 +107,11 @@ static int read_php_preamble(const unsigned char **tzf, timelib_tzinfo *tz)
+@@ -94,6 +107,11 @@ static int read_php_preamble(const unsig
 {
 	uint32_t version;
 
@@ -103,7 +99,7 @@ index 233c55c..4b70178 100644
 	/* read ID */
 	version = (*tzf)[3] - '0';
 	*tzf += 4;
-@@ -418,7 +436,429 @@ void timelib_dump_tzinfo(timelib_tzinfo *tz)
+@@ -418,7 +436,429 @@ void timelib_dump_tzinfo(timelib_tzinfo
 	}
 }
 
@@ -534,7 +530,7 @@ index 233c55c..4b70178 100644
 {
 	int left = 0, right = tzdb->index_size - 1;
 
-@@ -444,9 +884,48 @@ static int seek_to_tz_position(const unsigned char **tzf, const char *timezone,
+@@ -444,9 +884,48 @@ static int seek_to_tz_position(const uns
 	return 0;
 }
 
@@ -583,7 +579,7 @@ index 233c55c..4b70178 100644
 }
 
 const timelib_tzdb_index_entry *timelib_timezone_identifiers_list(const timelib_tzdb *tzdb, int *count)
-@@ -458,7 +937,30 @@ const timelib_tzdb_index_entry *timelib_timezone_identifiers_list(const timelib_
+@@ -458,7 +937,30 @@ const timelib_tzdb_index_entry *timelib_
 int timelib_timezone_id_is_valid(const char *timezone, const timelib_tzdb *tzdb)
 {
 	const unsigned char *tzf;
@@ -615,7 +611,7 @@ index 233c55c..4b70178 100644
 }
 
 static int skip_64bit_preamble(const unsigned char **tzf, timelib_tzinfo *tz)
-@@ -500,12 +1002,14 @@ static timelib_tzinfo* timelib_tzinfo_ctor(const char *name)
+@@ -500,12 +1002,14 @@ static timelib_tzinfo* timelib_tzinfo_ct
 timelib_tzinfo *timelib_parse_tzfile(const char *timezone, const timelib_tzdb *tzdb, int *error_code)
 {
 	const unsigned char *tzf;
@@ -631,7 +627,7 @@ index 233c55c..4b70178 100644
 		tmp = timelib_tzinfo_ctor(timezone);
 
 		version = read_preamble(&tzf, tmp, &type);
-@@ -540,11 +1044,36 @@ timelib_tzinfo *timelib_parse_tzfile(const char *timezone, const timelib_tzdb *t
+@@ -540,11 +1044,36 @@ timelib_tzinfo *timelib_parse_tzfile(con
 		}
 		skip_posix_string(&tzf, tmp);
 
--- a/lang/php8/patches/0022-Use-system-timezone.patch
+++ b/lang/php8/patches/0022-Use-system-timezone.patch
@@ -13,11 +13,9 @@ To be used in tandem with use_embedded_timezonedb.patch and use_embedded_timezon
 ext/date/php_date.c | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

-diff --git a/ext/date/php_date.c b/ext/date/php_date.c
-index 8c0f5a6..6b650ac 100644
 --- a/ext/date/php_date.c
 +++ b/ext/date/php_date.c
-@@ -538,6 +538,23 @@ static char* guess_timezone(const timelib_tzdb *tzdb)
+@@ -538,6 +538,23 @@ static char* guess_timezone(const timeli
 		DATEG(timezone_valid) = 1;
 		return DATEG(default_timezone);
 	}
--- a/lang/php8/patches/0025-php-5.4.9-fixheader.patch
+++ b/lang/php8/patches/0025-php-5.4.9-fixheader.patch
@@ -7,11 +7,9 @@ Make generated php_config.h constant across rebuilds.
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-diff --git a/configure.ac b/configure.ac
-index dcfe883..9b94618 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1280,7 +1280,7 @@ PHP_REMOVE_USR_LIB(LDFLAGS)
+@@ -1278,7 +1278,7 @@ PHP_REMOVE_USR_LIB(LDFLAGS)
 EXTRA_LDFLAGS="$EXTRA_LDFLAGS $PHP_LDFLAGS"
 EXTRA_LDFLAGS_PROGRAM="$EXTRA_LDFLAGS_PROGRAM $PHP_LDFLAGS"
 
--- a/lang/php8/patches/0030-Remove-W3C-validation-icon-to-not-expose-the-reader-.patch
+++ b/lang/php8/patches/0030-Remove-W3C-validation-icon-to-not-expose-the-reader-.patch
@@ -7,8 +7,6 @@ Subject: Remove W3C validation icon to not expose the reader's IP address to
 sapi/fpm/status.html.in | 5 -----
 1 file changed, 5 deletions(-)

-diff --git a/sapi/fpm/status.html.in b/sapi/fpm/status.html.in
-index d3b6d5e..f71d486 100644
 --- a/sapi/fpm/status.html.in
 +++ b/sapi/fpm/status.html.in
@@ -70,11 +70,6 @@
--- a/lang/php8/patches/0041-Add-patch-to-remove-build-timestamps-from-generated-.patch
+++ b/lang/php8/patches/0041-Add-patch-to-remove-build-timestamps-from-generated-.patch
@@ -6,7 +6,7 @@ Subject: Add patch to remove build timestamps from generated binaries.

 --- a/ext/standard/info.c
 +++ b/ext/standard/info.c
-@@ -791,7 +791,6 @@ PHPAPI ZEND_COLD void php_print_info(int flag)
+@@ -791,7 +791,6 @@ PHPAPI ZEND_COLD void php_print_info(int
 		php_info_print_box_end();
 		php_info_print_table_start();
 		php_info_print_table_row(2, "System", ZSTR_VAL(php_uname));
@@ -54,7 +54,7 @@ Subject: Add patch to remove build timestamps from generated binaries.
 							fcgi_shutdown();
 --- a/sapi/cli/php_cli.c
 +++ b/sapi/cli/php_cli.c
-@@ -633,8 +633,8 @@ static int do_cli(int argc, char **argv) /* {{{ */
+@@ -633,8 +633,8 @@ static int do_cli(int argc, char **argv)
 				goto out;
 
 			case 'v': /* show php version & quit */
@@ -67,7 +67,7 @@ Subject: Add patch to remove build timestamps from generated binaries.
 #else
 --- a/sapi/fpm/fpm/fpm_main.c
 +++ b/sapi/fpm/fpm/fpm_main.c
-@@ -1694,9 +1694,9 @@ int main(int argc, char *argv[])
+@@ -1691,9 +1691,9 @@ int main(int argc, char *argv[])
 				SG(request_info).no_headers = 1;
 
 #if ZEND_DEBUG
--- a/lang/php8/patches/1004-disable-phar-command.patch
+++ b/lang/php8/patches/1004-disable-phar-command.patch
@@ -11,7 +11,7 @@
 
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1417,13 +1417,13 @@ CFLAGS_CLEAN="$CFLAGS \$(PROF_FLAGS)"
+@@ -1423,13 +1423,13 @@ CFLAGS_CLEAN="$CFLAGS \$(PROF_FLAGS)"
 CFLAGS="\$(CFLAGS_CLEAN) $standard_libtool_flag"
 CXXFLAGS="$CXXFLAGS $standard_libtool_flag \$(PROF_FLAGS)"
 
--- a/lang/php8/patches/1010-Fix-opcache-jit-minilua-compiling.patch
+++ b/lang/php8/patches/1010-Fix-opcache-jit-minilua-compiling.patch
@@ -8,8 +8,6 @@ Signed-off-by: Michael Heimpold <mhei@heimpold.de>
 ext/opcache/jit/Makefile.frag | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-diff --git a/ext/opcache/jit/Makefile.frag b/ext/opcache/jit/Makefile.frag
-index d4f97de..7421897 100644
 --- a/ext/opcache/jit/Makefile.frag
 +++ b/ext/opcache/jit/Makefile.frag
@@ -1,6 +1,6 @@
@@ -20,6 +18,3 @@ index d4f97de..7421897 100644
 
 $(builddir)/jit/zend_jit_x86.c: $(srcdir)/jit/zend_jit_x86.dasc $(srcdir)/jit/dynasm/*.lua $(builddir)/minilua
 	$(builddir)/minilua $(srcdir)/jit/dynasm/dynasm.lua  $(DASM_FLAGS) -o $@ $(srcdir)/jit/zend_jit_x86.dasc
-- 
-2.17.1
-
--- a/lang/python/micropython/patches/000-Makefile-no-errors.patch
+++ b/lang/python/micropython/patches/000-Makefile-no-errors.patch
@@ -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)
--- a/lang/python/python-augeas/patches/001-backport-ffi-fix.patch
+++ b/lang/python/python-augeas/patches/001-backport-ffi-fix.patch
@@ -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"],
--- a/lang/python/python-cryptodome/patches/001-fix-libgmp-loading.patch
+++ b/lang/python/python-cryptodome/patches/001-fix-libgmp-loading.patch
@@ -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);
         """
 
--- a/lang/python/python-cryptodome/patches/002-omit-tests.patch
+++ b/lang/python/python-cryptodome/patches/002-omit-tests.patch
@@ -1,6 +1,6 @@
 --- a/setup.py
 +++ b/setup.py
-@@ -293,6 +293,9 @@ package_data = {
+@@ -301,6 +301,9 @@ package_data = {
     ],
 }
 
--- a/lang/python/python-cryptodomex/patches/001-fix-libgmp-loading.patch
+++ b/lang/python/python-cryptodomex/patches/001-fix-libgmp-loading.patch
@@ -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);
         """
 
--- a/lang/python/python-cryptodomex/patches/002-omit-tests.patch
+++ b/lang/python/python-cryptodomex/patches/002-omit-tests.patch
@@ -1,6 +1,6 @@
 --- a/setup.py
 +++ b/setup.py
-@@ -293,6 +293,9 @@ package_data = {
+@@ -301,6 +301,9 @@ package_data = {
     ],
 }
 
--- a/lang/python/python-intelhex/patches/001-Fix-Python-3.9-compatibility-issue-with-array-module.patch
+++ b/lang/python/python-intelhex/patches/001-Fix-Python-3.9-compatibility-issue-with-array-module.patch
@@ -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
-
--- a/lang/python/python-pynacl/patches/001-always-compile-scalar-mult-ed25519.patch
+++ b/lang/python/python-pynacl/patches/001-always-compile-scalar-mult-ed25519.patch
@@ -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 @@
--- a/lang/python/python3-libselinux/patches/010-setup-py-custom-cc.patch
+++ b/lang/python/python3-libselinux/patches/010-setup-py-custom-cc.patch
@@ -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
--- a/lang/python/python3-libselinux/patches/020-Make-use-of-variables-when-defining-libdir-and-inclu.patch
+++ b/lang/python/python3-libselinux/patches/020-Make-use-of-variables-when-defining-libdir-and-inclu.patch
@@ -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
-
--- a/lang/python/python3/patches/003-do-not-run-distutils-tests.patch
+++ b/lang/python/python3/patches/003-do-not-run-distutils-tests.patch
@@ -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
--- a/lang/python/python3/patches/004-do-not-write-bytes-codes.patch
+++ b/lang/python/python3/patches/004-do-not-write-bytes-codes.patch
@@ -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 */
--- a/lang/python/python3/patches/006-do-not-add-multiarch-paths-when-cross-compiling.patch
+++ b/lang/python/python3/patches/006-do-not-add-multiarch-paths-when-cross-compiling.patch
@@ -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()
--- a/lang/python/python3/patches/010-do-not-add-rt-lib-dirs-when-cross-compiling.patch
+++ b/lang/python/python3/patches/010-do-not-add-rt-lib-dirs-when-cross-compiling.patch
@@ -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).
--- a/lang/python/python3/patches/014-remove-platform-so-suffix.patch
+++ b/lang/python/python3/patches/014-remove-platform-so-suffix.patch
@@ -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)
--- a/lang/python/python3/patches/015-abort-on-failed-modules.patch
+++ b/lang/python/python3/patches/015-abort-on-failed-modules.patch
@@ -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()
--- a/lang/python/python3/patches/016-adjust-config-paths.patch
+++ b/lang/python/python3/patches/016-adjust-config-paths.patch
@@ -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)
--- a/lang/python/python3/patches/024-musl-find_library.patch
+++ b/lang/python/python3/patches/024-musl-find_library.patch
@@ -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))
 
--- a/lang/ruby/patches/100-musl.patch
+++ b/lang/ruby/patches/100-musl.patch
@@ -10,7 +10,7 @@
 
 --- a/configure.ac
 +++ b/configure.ac
-@@ -2344,7 +2344,10 @@ AS_CASE([$rb_cv_coroutine], [yes|''], [
+@@ -2347,7 +2347,10 @@ AS_CASE([$rb_cv_coroutine], [yes|''], [
             rb_cv_coroutine=copy
         ],
         [*], [