Merge pull request #14646 from lipnitsk/refresh

treewide: Run refresh on all packages

admin/backuppc/patches/001-debian-fixes.patch

@@ -1,6 +1,6 @@
---- a/bin/BackupPC_archive	2017-01-26 02:31:24.000000000 +0100
-+++ b/bin/BackupPC_archive	2018-04-05 21:11:14.428000000 +0200
-@@ -299,7 +299,7 @@
+--- a/bin/BackupPC_archive
++++ b/bin/BackupPC_archive
+@@ -299,7 +299,7 @@ sub ArchiveCleanup
      if ( $NeedPostCmd ) {
          UserCommandRun("ArchivePostUserCmd");
          if ( $? && $Conf{UserCmdCheckStatus} ) {
@@ -9,9 +9,9 @@
              $stat{xferOK} = 0;
          }
      }
---- a/bin/BackupPC_dump	2017-01-26 02:31:24.000000000 +0100
-+++ b/bin/BackupPC_dump	2018-04-05 21:12:23.640000000 +0200
-@@ -1067,7 +1067,7 @@
+--- a/bin/BackupPC_dump
++++ b/bin/BackupPC_dump
+@@ -1067,7 +1067,7 @@ sub catch_signal
  	    # Send ALRMs to BackupPC_tarExtract if we are using it
  	    #
  	    if ( $tarPid > 0 ) {
@@ -20,9 +20,9 @@
  	    }
  
  	    #
---- a/configure.pl	2017-01-26 02:31:24.000000000 +0100
-+++ b/configure.pl	2018-04-05 21:39:24.668000000 +0200
-@@ -333,7 +333,10 @@
+--- a/configure.pl
++++ b/configure.pl
+@@ -333,7 +333,10 @@ while ( 1 ) {
                                   $Conf{BackupPCUser} || "backuppc",
                                   "backuppc-user");
      if ( $opts{"set-perms"} ) {
@@ -34,7 +34,7 @@
          last if ( $name ne "" );
          print <<EOF;
  
-@@ -800,6 +803,7 @@
+@@ -800,6 +803,7 @@ $Conf{ParPath} = '' if ( $Conf{ParPath}
  #
  # Figure out sensible arguments for the ping command
  #
@@ -42,9 +42,9 @@
  if ( defined($Conf{PingArgs}) ) {
      $Conf{PingCmd} = '$pingPath ' . $Conf{PingArgs};
  } elsif ( !defined($Conf{PingCmd}) ) {
---- a/lib/BackupPC/CGI/View.pm	2017-01-26 02:31:24.000000000 +0100
-+++ b/lib/BackupPC/CGI/View.pm	2018-04-05 21:46:22.664000000 +0200
-@@ -46,7 +46,7 @@
+--- a/lib/BackupPC/CGI/View.pm
++++ b/lib/BackupPC/CGI/View.pm
+@@ -46,7 +46,7 @@ sub action
      my $compress = 0;
      my $fh;
      my $host = $In{host};
@@ -53,7 +53,7 @@
      my $type = $In{type};
      my $linkHosts = 0;
      my($file, $comment);
-@@ -136,6 +136,10 @@
+@@ -136,6 +136,10 @@ sub action
  		    }
  		    $s =~ s/[\n\r]+//g;
  		    if ( $s =~ /smb: \\>/
@@ -64,9 +64,9 @@
  			    || $s =~ /^\s*(\d+) \(\s*\d+\.\d kb\/s\) (.*)$/
  			    || $s =~ /^tar: dumped \d+ files/
  			    || $s =~ /^\s*added interface/i
---- a/lib/BackupPC/Lib.pm	2017-01-26 02:31:24.000000000 +0100
-+++ b/lib/BackupPC/Lib.pm	2018-04-05 21:48:38.048000000 +0200
-@@ -512,7 +512,8 @@
+--- a/lib/BackupPC/Lib.pm
++++ b/lib/BackupPC/Lib.pm
+@@ -512,7 +512,8 @@ sub dirRead
      }
      if ( $IODirentOk ) {
          @entries = sort({ $a->{inode} <=> $b->{inode} } readdirent($fh));
@@ -76,9 +76,9 @@
      } else {
          @entries = map { { name => $_} } readdir($fh);
      }
---- a/lib/BackupPC/Xfer/Smb.pm	2017-01-26 02:31:24.000000000 +0100
-+++ b/lib/BackupPC/Xfer/Smb.pm	2018-04-05 21:57:16.616000000 +0200
-@@ -219,7 +219,7 @@
+--- a/lib/BackupPC/Xfer/Smb.pm
++++ b/lib/BackupPC/Xfer/Smb.pm
+@@ -219,7 +219,7 @@ sub readOutput
          #
          # MAKSYM 14082016: The next regex will never match on Samba-4.3, as
          # smbclient doesn't produce output required; keeping it for older Sambas
@@ -87,7 +87,7 @@
              my $sambaFileSize = $1;
              my $pcFileName    = $2;
              (my $fileName = $pcFileName) =~ s/\\/\//g;
-@@ -281,6 +281,9 @@
+@@ -281,6 +281,9 @@ sub readOutput
          } elsif ( /smb: \\>/
                  || /^\s*tar:\d+/ # MAKSYM 14082016: ignoring 2 more Samba-4.3 specific lines
                  || /^\s*WARNING:/i

admin/gkrellmd/patches/100-conf.patch

@@ -1,7 +1,5 @@
-Index: gkrellm-2.3.10/server/gkrellmd.conf
-===================================================================
---- gkrellm-2.3.10.orig/server/gkrellmd.conf	2008-03-09 10:19:26.000000000 +0100
-+++ gkrellm-2.3.10/server/gkrellmd.conf	2008-03-09 10:19:26.000000000 +0100
+--- a/server/gkrellmd.conf
++++ b/server/gkrellmd.conf
 @@ -4,7 +4,7 @@
  # the client update frequency.  Values may be from 1 to 10 and should be
  # smaller values to reduce network traffic.
@@ -31,5 +29,5 @@ Index: gkrellm-2.3.10/server/gkrellmd.conf
 -#detach
 +detach
  
- # Time interval between checks for various monitors.  If nfs-interval
- # is <= 0 then gkrellmd will not read data for nfs file system types.
+ # Enable writing logging message to the system syslog file
+ # NOTE: On windows this enables logging to the windows event log

admin/ipmitool/patches/0001-ID-461-OpenSSL-1.1-compatibility-error-storage-size-.patch

@@ -11,11 +11,9 @@ Fixes: ID:461
  src/plugins/lanplus/lanplus_crypt_impl.c | 28 ++++++++++++++--------------
  1 file changed, 14 insertions(+), 14 deletions(-)
 
-diff --git a/src/plugins/lanplus/lanplus_crypt_impl.c b/src/plugins/lanplus/lanplus_crypt_impl.c
-index d5fac37..3c0df23 100644
 --- a/src/plugins/lanplus/lanplus_crypt_impl.c
 +++ b/src/plugins/lanplus/lanplus_crypt_impl.c
-@@ -164,10 +164,10 @@ lanplus_encrypt_aes_cbc_128(const uint8_t * iv,
+@@ -164,10 +164,10 @@ lanplus_encrypt_aes_cbc_128(const uint8_
  							uint8_t       * output,
  							uint32_t        * bytes_written)
  {
@@ -30,7 +28,7 @@ index d5fac37..3c0df23 100644
  	
  
  	*bytes_written = 0;
-@@ -191,7 +191,7 @@ lanplus_encrypt_aes_cbc_128(const uint8_t * iv,
+@@ -191,7 +191,7 @@ lanplus_encrypt_aes_cbc_128(const uint8_
  	assert((input_length % IPMI_CRYPT_AES_CBC_128_BLOCK_SIZE) == 0);
  
  
@@ -39,7 +37,7 @@ index d5fac37..3c0df23 100644
  	{
  		/* Error */
  		*bytes_written = 0;
-@@ -201,7 +201,7 @@ lanplus_encrypt_aes_cbc_128(const uint8_t * iv,
+@@ -201,7 +201,7 @@ lanplus_encrypt_aes_cbc_128(const uint8_
  	{
  		uint32_t tmplen;
  
@@ -48,7 +46,7 @@ index d5fac37..3c0df23 100644
  		{
  			*bytes_written = 0;
  			return; /* Error */
-@@ -210,7 +210,7 @@ lanplus_encrypt_aes_cbc_128(const uint8_t * iv,
+@@ -210,7 +210,7 @@ lanplus_encrypt_aes_cbc_128(const uint8_
  		{
  			/* Success */
  			*bytes_written += tmplen;
@@ -57,7 +55,7 @@ index d5fac37..3c0df23 100644
  		}
  	}
  }
-@@ -239,10 +239,10 @@ lanplus_decrypt_aes_cbc_128(const uint8_t * iv,
+@@ -239,10 +239,10 @@ lanplus_decrypt_aes_cbc_128(const uint8_
  							uint8_t       * output,
  							uint32_t        * bytes_written)
  {
@@ -72,7 +70,7 @@ index d5fac37..3c0df23 100644
  
  
  	if (verbose >= 5)
-@@ -266,7 +266,7 @@ lanplus_decrypt_aes_cbc_128(const uint8_t * iv,
+@@ -266,7 +266,7 @@ lanplus_decrypt_aes_cbc_128(const uint8_
  	assert((input_length % IPMI_CRYPT_AES_CBC_128_BLOCK_SIZE) == 0);
  
  
@@ -81,7 +79,7 @@ index d5fac37..3c0df23 100644
  	{
  		/* Error */
  		lprintf(LOG_DEBUG, "ERROR: decrypt update failed");
-@@ -277,7 +277,7 @@ lanplus_decrypt_aes_cbc_128(const uint8_t * iv,
+@@ -277,7 +277,7 @@ lanplus_decrypt_aes_cbc_128(const uint8_
  	{
  		uint32_t tmplen;
  
@@ -90,7 +88,7 @@ index d5fac37..3c0df23 100644
  		{
  			char buffer[1000];
  			ERR_error_string(ERR_get_error(), buffer);
-@@ -290,7 +290,7 @@ lanplus_decrypt_aes_cbc_128(const uint8_t * iv,
+@@ -290,7 +290,7 @@ lanplus_decrypt_aes_cbc_128(const uint8_
  		{
  			/* Success */
  			*bytes_written += tmplen;
@@ -99,6 +97,3 @@ index d5fac37..3c0df23 100644
  		}
  	}
  
--- 
-2.16.1
-

admin/ipmitool/patches/0002-ID-461-Make-compiler-happier-about-changes-related-t.patch

@@ -9,11 +9,9 @@ Complaint was that ctx isn't initialized.
  src/plugins/lanplus/lanplus_crypt_impl.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
-diff --git a/src/plugins/lanplus/lanplus_crypt_impl.c b/src/plugins/lanplus/lanplus_crypt_impl.c
-index 3c0df23..d12d0e3 100644
 --- a/src/plugins/lanplus/lanplus_crypt_impl.c
 +++ b/src/plugins/lanplus/lanplus_crypt_impl.c
-@@ -164,7 +164,7 @@ lanplus_encrypt_aes_cbc_128(const uint8_t * iv,
+@@ -164,7 +164,7 @@ lanplus_encrypt_aes_cbc_128(const uint8_
  							uint8_t       * output,
  							uint32_t        * bytes_written)
  {
@@ -22,7 +20,7 @@ index 3c0df23..d12d0e3 100644
  	EVP_CIPHER_CTX_init(ctx);
  	EVP_EncryptInit_ex(ctx, EVP_aes_128_cbc(), NULL, key, iv);
  	EVP_CIPHER_CTX_set_padding(ctx, 0);
-@@ -239,7 +239,7 @@ lanplus_decrypt_aes_cbc_128(const uint8_t * iv,
+@@ -239,7 +239,7 @@ lanplus_decrypt_aes_cbc_128(const uint8_
  							uint8_t       * output,
  							uint32_t        * bytes_written)
  {
@@ -31,6 +29,3 @@ index 3c0df23..d12d0e3 100644
  	EVP_CIPHER_CTX_init(ctx);
  	EVP_DecryptInit_ex(ctx, EVP_aes_128_cbc(), NULL, key, iv);
  	EVP_CIPHER_CTX_set_padding(ctx, 0);
--- 
-2.16.1
-

admin/ipmitool/patches/0003-ID-480-ipmitool-coredumps-in-EVP_CIPHER_CTX_init.patch

@@ -11,11 +11,9 @@ deprecated, and by checking return value of call to former function.
  src/plugins/lanplus/lanplus_crypt_impl.c | 14 ++++++++++----
  1 file changed, 10 insertions(+), 4 deletions(-)
 
-diff --git a/src/plugins/lanplus/lanplus_crypt_impl.c b/src/plugins/lanplus/lanplus_crypt_impl.c
-index d12d0e3..0e330c1 100644
 --- a/src/plugins/lanplus/lanplus_crypt_impl.c
 +++ b/src/plugins/lanplus/lanplus_crypt_impl.c
-@@ -165,10 +165,13 @@ lanplus_encrypt_aes_cbc_128(const uint8_t * iv,
+@@ -165,10 +165,13 @@ lanplus_encrypt_aes_cbc_128(const uint8_
  							uint32_t        * bytes_written)
  {
  	EVP_CIPHER_CTX *ctx = NULL;
@@ -31,7 +29,7 @@ index d12d0e3..0e330c1 100644
  
  	*bytes_written = 0;
  
-@@ -240,11 +243,14 @@ lanplus_decrypt_aes_cbc_128(const uint8_t * iv,
+@@ -240,11 +243,14 @@ lanplus_decrypt_aes_cbc_128(const uint8_
  							uint32_t        * bytes_written)
  {
  	EVP_CIPHER_CTX *ctx = NULL;
@@ -48,6 +46,3 @@ index d12d0e3..0e330c1 100644
  	if (verbose >= 5)
  	{
  		printbuf(iv,  16, "decrypting with this IV");
--- 
-2.16.1
-

admin/ipmitool/patches/0004-ID-480-Call-EVP_CIPHER_CTX_free-instead-of-EVP_CIPHE.patch

@@ -10,11 +10,9 @@ leak.
  src/plugins/lanplus/lanplus_crypt_impl.c | 44 +++++++++++++++++---------------
  1 file changed, 23 insertions(+), 21 deletions(-)
 
-diff --git a/src/plugins/lanplus/lanplus_crypt_impl.c b/src/plugins/lanplus/lanplus_crypt_impl.c
-index 0e330c1..9652a5e 100644
 --- a/src/plugins/lanplus/lanplus_crypt_impl.c
 +++ b/src/plugins/lanplus/lanplus_crypt_impl.c
-@@ -165,13 +165,6 @@ lanplus_encrypt_aes_cbc_128(const uint8_t * iv,
+@@ -165,13 +165,6 @@ lanplus_encrypt_aes_cbc_128(const uint8_
  							uint32_t        * bytes_written)
  {
  	EVP_CIPHER_CTX *ctx = NULL;
@@ -28,7 +26,7 @@ index 0e330c1..9652a5e 100644
  
  	*bytes_written = 0;
  
-@@ -185,6 +178,14 @@ lanplus_encrypt_aes_cbc_128(const uint8_t * iv,
+@@ -185,6 +178,14 @@ lanplus_encrypt_aes_cbc_128(const uint8_
  		printbuf(input, input_length, "encrypting this data");
  	}
  
@@ -43,7 +41,7 @@ index 0e330c1..9652a5e 100644
  
  	/*
  	 * The default implementation adds a whole block of padding if the input
-@@ -198,7 +199,6 @@ lanplus_encrypt_aes_cbc_128(const uint8_t * iv,
+@@ -198,7 +199,6 @@ lanplus_encrypt_aes_cbc_128(const uint8_
  	{
  		/* Error */
  		*bytes_written = 0;
@@ -51,7 +49,7 @@ index 0e330c1..9652a5e 100644
  	}
  	else
  	{
-@@ -206,16 +206,17 @@ lanplus_encrypt_aes_cbc_128(const uint8_t * iv,
+@@ -206,16 +206,17 @@ lanplus_encrypt_aes_cbc_128(const uint8_
  
  		if(!EVP_EncryptFinal_ex(ctx, output + *bytes_written, (int *)&tmplen))
  		{
@@ -71,7 +69,7 @@ index 0e330c1..9652a5e 100644
  }
  
  
-@@ -243,13 +244,6 @@ lanplus_decrypt_aes_cbc_128(const uint8_t * iv,
+@@ -243,13 +244,6 @@ lanplus_decrypt_aes_cbc_128(const uint8_
  							uint32_t        * bytes_written)
  {
  	EVP_CIPHER_CTX *ctx = NULL;
@@ -85,7 +83,7 @@ index 0e330c1..9652a5e 100644
  
  	if (verbose >= 5)
  	{
-@@ -258,12 +252,20 @@ lanplus_decrypt_aes_cbc_128(const uint8_t * iv,
+@@ -258,12 +252,20 @@ lanplus_decrypt_aes_cbc_128(const uint8_
  		printbuf(input, input_length, "decrypting this data");
  	}
  
@@ -107,7 +105,7 @@ index 0e330c1..9652a5e 100644
  	/*
  	 * The default implementation adds a whole block of padding if the input
  	 * data is perfectly aligned.  We would like to keep that from happening.
-@@ -277,7 +279,6 @@ lanplus_decrypt_aes_cbc_128(const uint8_t * iv,
+@@ -277,7 +279,6 @@ lanplus_decrypt_aes_cbc_128(const uint8_
  		/* Error */
  		lprintf(LOG_DEBUG, "ERROR: decrypt update failed");
  		*bytes_written = 0;
@@ -115,7 +113,7 @@ index 0e330c1..9652a5e 100644
  	}
  	else
  	{
-@@ -285,20 +286,21 @@ lanplus_decrypt_aes_cbc_128(const uint8_t * iv,
+@@ -285,20 +286,21 @@ lanplus_decrypt_aes_cbc_128(const uint8_
  
  		if (!EVP_DecryptFinal_ex(ctx, output + *bytes_written, (int *)&tmplen))
  		{
@@ -139,6 +137,3 @@ index 0e330c1..9652a5e 100644
  
  	if (verbose >= 5)
  	{
--- 
-2.16.1
-

admin/ipmitool/patches/0005-ipmitool-Fix-compile-with-deprecated-APIs-disabled.patch

@@ -14,11 +14,9 @@ Signed-off-by: Rosen Penev <rosenp@gmail.com>
  src/plugins/lanplus/lanplus_crypt_impl.c | 8 ++++++++
  1 file changed, 8 insertions(+)
 
-diff --git a/src/plugins/lanplus/lanplus_crypt_impl.c b/src/plugins/lanplus/lanplus_crypt_impl.c
-index 9652a5e..e94401e 100644
 --- a/src/plugins/lanplus/lanplus_crypt_impl.c
 +++ b/src/plugins/lanplus/lanplus_crypt_impl.c
-@@ -183,7 +183,11 @@ lanplus_encrypt_aes_cbc_128(const uint8_t * iv,
+@@ -183,7 +183,11 @@ lanplus_encrypt_aes_cbc_128(const uint8_
  		lprintf(LOG_DEBUG, "ERROR: EVP_CIPHER_CTX_new() failed");
  		return;
  	}
@@ -30,7 +28,7 @@ index 9652a5e..e94401e 100644
  	EVP_EncryptInit_ex(ctx, EVP_aes_128_cbc(), NULL, key, iv);
  	EVP_CIPHER_CTX_set_padding(ctx, 0);
  
-@@ -262,7 +266,11 @@ lanplus_decrypt_aes_cbc_128(const uint8_t * iv,
+@@ -262,7 +266,11 @@ lanplus_decrypt_aes_cbc_128(const uint8_
  		lprintf(LOG_DEBUG, "ERROR: EVP_CIPHER_CTX_new() failed");
  		return;
  	}
@@ -42,6 +40,3 @@ index 9652a5e..e94401e 100644
  	EVP_DecryptInit_ex(ctx, EVP_aes_128_cbc(), NULL, key, iv);
  	EVP_CIPHER_CTX_set_padding(ctx, 0);
  
--- 
-2.7.4
-

admin/ipmitool/patches/0006-CVE-2020-5208-fru-Fix-buffer-overflow-vulnerabilities.patch

@@ -17,8 +17,6 @@ The same issue affects the `read_fru_area` function.
  lib/ipmi_fru.c | 33 +++++++++++++++++++++++++++++++--
  1 file changed, 31 insertions(+), 2 deletions(-)
 
-diff --git a/lib/ipmi_fru.c b/lib/ipmi_fru.c
-index cf00effc82a2..af99aa99444c 100644
 --- a/lib/ipmi_fru.c
 +++ b/lib/ipmi_fru.c
 @@ -615,7 +615,10 @@ int
@@ -33,7 +31,7 @@ index cf00effc82a2..af99aa99444c 100644
  	struct ipmi_rs * rsp;
  	struct ipmi_rq req;
  	uint8_t msg_data[4];
-@@ -628,10 +631,12 @@ read_fru_area(struct ipmi_intf * intf, struct fru_info *fru, uint8_t id,
+@@ -628,10 +631,12 @@ read_fru_area(struct ipmi_intf * intf, s
  
  	finish = offset + length;
  	if (finish > fru->size) {
@@ -46,7 +44,7 @@ index cf00effc82a2..af99aa99444c 100644
  	}
  
  	memset(&req, 0, sizeof(req));
-@@ -667,6 +672,7 @@ read_fru_area(struct ipmi_intf * intf, struct fru_info *fru, uint8_t id,
+@@ -667,6 +672,7 @@ read_fru_area(struct ipmi_intf * intf, s
  		}
  	}
  
@@ -54,7 +52,7 @@ index cf00effc82a2..af99aa99444c 100644
  	do {
  		tmp = fru->access ? off >> 1 : off;
  		msg_data[0] = id;
-@@ -707,9 +713,18 @@ read_fru_area(struct ipmi_intf * intf, struct fru_info *fru, uint8_t id,
+@@ -707,9 +713,18 @@ read_fru_area(struct ipmi_intf * intf, s
  		}
  
  		tmp = fru->access ? rsp->data[0] << 1 : rsp->data[0];
@@ -73,7 +71,7 @@ index cf00effc82a2..af99aa99444c 100644
  		/* sometimes the size returned in the Info command
  		* is too large.  return 0 so higher level function
  		* still attempts to parse what was returned */
-@@ -742,7 +757,9 @@ read_fru_area_section(struct ipmi_intf * intf, struct fru_info *fru, uint8_t id,
+@@ -742,7 +757,9 @@ read_fru_area_section(struct ipmi_intf *
  			uint32_t offset, uint32_t length, uint8_t *frubuf)
  {
  	static uint32_t fru_data_rqst_size = 20;
@@ -84,7 +82,7 @@ index cf00effc82a2..af99aa99444c 100644
  	struct ipmi_rs * rsp;
  	struct ipmi_rq req;
  	uint8_t msg_data[4];
-@@ -755,10 +772,12 @@ read_fru_area_section(struct ipmi_intf * intf, struct fru_info *fru, uint8_t id,
+@@ -755,10 +772,12 @@ read_fru_area_section(struct ipmi_intf *
  
  	finish = offset + length;
  	if (finish > fru->size) {
@@ -97,7 +95,7 @@ index cf00effc82a2..af99aa99444c 100644
  	}
  
  	memset(&req, 0, sizeof(req));
-@@ -773,6 +792,8 @@ read_fru_area_section(struct ipmi_intf * intf, struct fru_info *fru, uint8_t id,
+@@ -773,6 +792,8 @@ read_fru_area_section(struct ipmi_intf *
  	if (fru->access && fru_data_rqst_size > 16)
  #endif
  		fru_data_rqst_size = 16;
@@ -106,7 +104,7 @@ index cf00effc82a2..af99aa99444c 100644
  	do {
  		tmp = fru->access ? off >> 1 : off;
  		msg_data[0] = id;
-@@ -804,8 +825,16 @@ read_fru_area_section(struct ipmi_intf * intf, struct fru_info *fru, uint8_t id,
+@@ -804,8 +825,16 @@ read_fru_area_section(struct ipmi_intf *
  		}
  
  		tmp = fru->access ? rsp->data[0] << 1 : rsp->data[0];
@@ -123,6 +121,3 @@ index cf00effc82a2..af99aa99444c 100644
  
  		/* sometimes the size returned in the Info command
  		* is too large.  return 0 so higher level function
--- 
-2.27.0
-

admin/ipmitool/patches/0007-CVE-2020-5208-fru-Fix-buffer-overflow-in-ipmi_spd_print_fru.patch

@@ -16,11 +16,9 @@ copy into the buffer.
  lib/dimm_spd.c | 9 ++++++++-
  1 file changed, 8 insertions(+), 1 deletion(-)
 
-diff --git a/lib/dimm_spd.c b/lib/dimm_spd.c
-index 41e30dbb4bda..68f3b4fa1eff 100644
 --- a/lib/dimm_spd.c
 +++ b/lib/dimm_spd.c
-@@ -1621,7 +1621,7 @@ ipmi_spd_print_fru(struct ipmi_intf * intf, uint8_t id)
+@@ -1621,7 +1621,7 @@ ipmi_spd_print_fru(struct ipmi_intf * in
  	struct ipmi_rq req;
  	struct fru_info fru;
  	uint8_t *spd_data, msg_data[4];
@@ -29,7 +27,7 @@ index 41e30dbb4bda..68f3b4fa1eff 100644
  
  	msg_data[0] = id;
  
-@@ -1697,6 +1697,13 @@ ipmi_spd_print_fru(struct ipmi_intf * intf, uint8_t id)
+@@ -1697,6 +1697,13 @@ ipmi_spd_print_fru(struct ipmi_intf * in
  		}
  
  		len = rsp->data[0];
@@ -43,6 +41,3 @@ index 41e30dbb4bda..68f3b4fa1eff 100644
  		memcpy(&spd_data[offset], rsp->data + 1, len);
  		offset += len;
  	} while (offset < fru.size);
--- 
-2.27.0
-

admin/ipmitool/patches/0008-CVE-2020-5208-session-Fix-buffer-overflow-in-ipmi_get_session_info.patch

@@ -13,11 +13,9 @@ overflow.
  lib/ipmi_session.c | 12 ++++++++----
  1 file changed, 8 insertions(+), 4 deletions(-)
 
-diff --git a/lib/ipmi_session.c b/lib/ipmi_session.c
-index 141f0f4ec8dd..b9af1fd75d40 100644
 --- a/lib/ipmi_session.c
 +++ b/lib/ipmi_session.c
-@@ -309,8 +309,10 @@ ipmi_get_session_info(struct ipmi_intf         * intf,
+@@ -309,8 +309,10 @@ ipmi_get_session_info(struct ipmi_intf
  		}
  		else
  		{
@@ -30,7 +28,7 @@ index 141f0f4ec8dd..b9af1fd75d40 100644
  		}
  		break;
  		
-@@ -341,8 +343,10 @@ ipmi_get_session_info(struct ipmi_intf         * intf,
+@@ -341,8 +343,10 @@ ipmi_get_session_info(struct ipmi_intf
  				break;
  			}
  
@@ -43,6 +41,3 @@ index 141f0f4ec8dd..b9af1fd75d40 100644
  			
  		} while (i <= session_info.session_slot_count);
  		break;
--- 
-2.27.0
-

admin/ipmitool/patches/0009-CVE-2020-5208-channel-Fix-buffer-overflow.patch

@@ -16,11 +16,9 @@ on the final copy.
  lib/ipmi_channel.c | 5 ++++-
  1 file changed, 4 insertions(+), 1 deletion(-)
 
-diff --git a/lib/ipmi_channel.c b/lib/ipmi_channel.c
-index fab2e5483d12..8cd7c59a4273 100644
 --- a/lib/ipmi_channel.c
 +++ b/lib/ipmi_channel.c
-@@ -413,7 +413,10 @@ ipmi_get_channel_cipher_suites(struct ipmi_intf *intf, const char *payload_type,
+@@ -413,7 +413,10 @@ ipmi_get_channel_cipher_suites(struct ip
  			lprintf(LOG_ERR, "Unable to Get Channel Cipher Suites");
  			return -1;
  		}
@@ -32,6 +30,3 @@ index fab2e5483d12..8cd7c59a4273 100644
  			lprintf(LOG_ERR, "Get Channel Cipher Suites failed: %s",
  					val2str(rsp->ccode, completion_code_vals));
  			return -1;
--- 
-2.27.0
-

admin/ipmitool/patches/0010-CVE-2020-5208-lanp-Fix-buffer-overflows-in-get_lan_param_select.patch

@@ -16,11 +16,9 @@ stack buffer overflow can occur.
  lib/ipmi_lanp.c | 14 +++++++-------
  1 file changed, 7 insertions(+), 7 deletions(-)
 
-diff --git a/lib/ipmi_lanp.c b/lib/ipmi_lanp.c
-index 65d881bc5890..022c7f1605ed 100644
 --- a/lib/ipmi_lanp.c
 +++ b/lib/ipmi_lanp.c
-@@ -1809,7 +1809,7 @@ ipmi_lan_alert_set(struct ipmi_intf * intf, uint8_t chan, uint8_t alert,
+@@ -1809,7 +1809,7 @@ ipmi_lan_alert_set(struct ipmi_intf * in
  		if (p == NULL) {
  			return (-1);
  		}
@@ -29,7 +27,7 @@ index 65d881bc5890..022c7f1605ed 100644
  		/* set new ipaddr */
  		memcpy(data+3, temp, 4);
  		printf("Setting LAN Alert %d IP Address to %d.%d.%d.%d\n", alert,
-@@ -1824,7 +1824,7 @@ ipmi_lan_alert_set(struct ipmi_intf * intf, uint8_t chan, uint8_t alert,
+@@ -1824,7 +1824,7 @@ ipmi_lan_alert_set(struct ipmi_intf * in
  		if (p == NULL) {
  			return (-1);
  		}
@@ -38,7 +36,7 @@ index 65d881bc5890..022c7f1605ed 100644
  		/* set new macaddr */
  		memcpy(data+7, temp, 6);
  		printf("Setting LAN Alert %d MAC Address to "
-@@ -1838,7 +1838,7 @@ ipmi_lan_alert_set(struct ipmi_intf * intf, uint8_t chan, uint8_t alert,
+@@ -1838,7 +1838,7 @@ ipmi_lan_alert_set(struct ipmi_intf * in
  		if (p == NULL) {
  			return (-1);
  		}
@@ -47,7 +45,7 @@ index 65d881bc5890..022c7f1605ed 100644
  
  		if (strncasecmp(argv[1], "def", 3) == 0 ||
  		    strncasecmp(argv[1], "default", 7) == 0) {
-@@ -1864,7 +1864,7 @@ ipmi_lan_alert_set(struct ipmi_intf * intf, uint8_t chan, uint8_t alert,
+@@ -1864,7 +1864,7 @@ ipmi_lan_alert_set(struct ipmi_intf * in
  		if (p == NULL) {
  			return (-1);
  		}
@@ -56,7 +54,7 @@ index 65d881bc5890..022c7f1605ed 100644
  
  		if (strncasecmp(argv[1], "on", 2) == 0 ||
  		    strncasecmp(argv[1], "yes", 3) == 0) {
-@@ -1889,7 +1889,7 @@ ipmi_lan_alert_set(struct ipmi_intf * intf, uint8_t chan, uint8_t alert,
+@@ -1889,7 +1889,7 @@ ipmi_lan_alert_set(struct ipmi_intf * in
  		if (p == NULL) {
  			return (-1);
  		}
@@ -65,7 +63,7 @@ index 65d881bc5890..022c7f1605ed 100644
  
  		if (strncasecmp(argv[1], "pet", 3) == 0) {
  			printf("Setting LAN Alert %d destination to PET Trap\n", alert);
-@@ -1917,7 +1917,7 @@ ipmi_lan_alert_set(struct ipmi_intf * intf, uint8_t chan, uint8_t alert,
+@@ -1917,7 +1917,7 @@ ipmi_lan_alert_set(struct ipmi_intf * in
  		if (p == NULL) {
  			return (-1);
  		}
@@ -74,7 +72,7 @@ index 65d881bc5890..022c7f1605ed 100644
  
  		if (str2uchar(argv[1], &data[2]) != 0) {
  			lprintf(LOG_ERR, "Invalid time: %s", argv[1]);
-@@ -1933,7 +1933,7 @@ ipmi_lan_alert_set(struct ipmi_intf * intf, uint8_t chan, uint8_t alert,
+@@ -1933,7 +1933,7 @@ ipmi_lan_alert_set(struct ipmi_intf * in
  		if (p == NULL) {
  			return (-1);
  		}
@@ -83,6 +81,3 @@ index 65d881bc5890..022c7f1605ed 100644
  
  		if (str2uchar(argv[1], &data[3]) != 0) {
  			lprintf(LOG_ERR, "Invalid retry: %s", argv[1]);
--- 
-2.27.0
-

admin/ipmitool/patches/0011-CVE-2020-5208-fru-sdr-Fix-id_string-buffer-overflows.patch

@@ -23,11 +23,9 @@ into fixed buffer of size `17` bytes from this calculated length.
  lib/ipmi_sdr.c | 40 ++++++++++++++++++++++++----------------
  2 files changed, 25 insertions(+), 17 deletions(-)
 
-diff --git a/lib/ipmi_fru.c b/lib/ipmi_fru.c
-index af99aa99444c..98bc9840955a 100644
 --- a/lib/ipmi_fru.c
 +++ b/lib/ipmi_fru.c
-@@ -3062,7 +3062,7 @@ ipmi_fru_print(struct ipmi_intf * intf, struct sdr_record_fru_locator * fru)
+@@ -3062,7 +3062,7 @@ ipmi_fru_print(struct ipmi_intf * intf,
  		return 0;
  
  	memset(desc, 0, sizeof(desc));
@@ -36,11 +34,9 @@ index af99aa99444c..98bc9840955a 100644
  	desc[fru->id_code & 0x01f] = 0;
  	printf("FRU Device Description : %s (ID %d)\n", desc, fru->device_id);
  
-diff --git a/lib/ipmi_sdr.c b/lib/ipmi_sdr.c
-index 2a9cbe3087af..62aac08a9002 100644
 --- a/lib/ipmi_sdr.c
 +++ b/lib/ipmi_sdr.c
-@@ -2084,7 +2084,7 @@ ipmi_sdr_print_sensor_eventonly(struct ipmi_intf *intf,
+@@ -2084,7 +2084,7 @@ ipmi_sdr_print_sensor_eventonly(struct i
  		return -1;
  
  	memset(desc, 0, sizeof (desc));
@@ -49,7 +45,7 @@ index 2a9cbe3087af..62aac08a9002 100644
  
  	if (verbose) {
  		printf("Sensor ID              : %s (0x%x)\n",
-@@ -2135,7 +2135,7 @@ ipmi_sdr_print_sensor_mc_locator(struct ipmi_intf *intf,
+@@ -2135,7 +2135,7 @@ ipmi_sdr_print_sensor_mc_locator(struct
  		return -1;
  
  	memset(desc, 0, sizeof (desc));
@@ -58,7 +54,7 @@ index 2a9cbe3087af..62aac08a9002 100644
  
  	if (verbose == 0) {
  		if (csv_output)
-@@ -2228,7 +2228,7 @@ ipmi_sdr_print_sensor_generic_locator(struct ipmi_intf *intf,
+@@ -2228,7 +2228,7 @@ ipmi_sdr_print_sensor_generic_locator(st
  	char desc[17];
  
  	memset(desc, 0, sizeof (desc));
@@ -67,7 +63,7 @@ index 2a9cbe3087af..62aac08a9002 100644
  
  	if (!verbose) {
  		if (csv_output)
-@@ -2285,7 +2285,7 @@ ipmi_sdr_print_sensor_fru_locator(struct ipmi_intf *intf,
+@@ -2285,7 +2285,7 @@ ipmi_sdr_print_sensor_fru_locator(struct
  	char desc[17];
  
  	memset(desc, 0, sizeof (desc));
@@ -76,7 +72,7 @@ index 2a9cbe3087af..62aac08a9002 100644
  
  	if (!verbose) {
  		if (csv_output)
-@@ -2489,35 +2489,43 @@ ipmi_sdr_print_name_from_rawentry(struct ipmi_intf *intf, uint16_t id,
+@@ -2489,35 +2489,43 @@ ipmi_sdr_print_name_from_rawentry(struct
  
     int rc =0;
     char desc[17];
@@ -132,6 +128,3 @@ index 2a9cbe3087af..62aac08a9002 100644
     return rc;
  }
  
--- 
-2.27.0
-

admin/ipmitool/patches/0012-gcc10.patch

@@ -9,8 +9,6 @@ Signed-off-by: Vaclav Dolezal <vdolezal@redhat.com>
  lib/ipmi_hpmfwupg.c              | 2 ++
  2 files changed, 3 insertions(+), 1 deletion(-)
 
-diff --git a/include/ipmitool/ipmi_hpmfwupg.h b/include/ipmitool/ipmi_hpmfwupg.h
-index de65292b..07f597be 100644
 --- a/include/ipmitool/ipmi_hpmfwupg.h
 +++ b/include/ipmitool/ipmi_hpmfwupg.h
 @@ -800,7 +800,7 @@ typedef struct _VERSIONINFO {
@@ -22,11 +20,9 @@ index de65292b..07f597be 100644
  
  #define TARGET_VER (0x01)
  #define ROLLBACK_VER (0x02)
-diff --git a/lib/ipmi_hpmfwupg.c b/lib/ipmi_hpmfwupg.c
-index 4aa8cecd..d63d2c15 100644
 --- a/lib/ipmi_hpmfwupg.c
 +++ b/lib/ipmi_hpmfwupg.c
-@@ -58,6 +58,8 @@
+@@ -58,6 +58,8 @@ ipmi_intf_get_max_request_data_size(stru
  
  extern int verbose;
  

admin/netatop/patches/010-daemon-makefile-ldflags.patch

@@ -1,5 +1,3 @@
-diff --git a/daemon/Makefile b/daemon/Makefile
-index e028e95..1233855 100644
 --- a/daemon/Makefile
 +++ b/daemon/Makefile
 @@ -6,7 +6,7 @@ THISDIR  = $(shell pwd)

admin/schroot/patches/01-openwrt.patch

@@ -1,5 +1,5 @@
---- ./configure.ac-orig	2019-12-09 12:56:45.217308628 +0100
-+++ ./configure.ac	2019-12-09 12:57:18.667492923 +0100
+--- a/configure.ac
++++ b/configure.ac
 @@ -284,22 +284,8 @@ if test -z "$DOXYGEN"; then
    HAVE_DOXYGEN="no"
  fi
@@ -91,8 +91,8 @@
  
  AC_MSG_CHECKING([for boost::iostreams in -lboost_iostreams])
  saved_LIBS="${LIBS}"
---- ./bin/schroot-base/schroot-base-run.h-orig	2019-12-09 04:23:51.881428446 +0100
-+++ ./bin/schroot-base/schroot-base-run.h	2019-12-09 04:24:14.934887089 +0100
+--- a/bin/schroot-base/schroot-base-run.h
++++ b/bin/schroot-base/schroot-base-run.h
 @@ -61,8 +61,8 @@ namespace schroot_base
          std::cout.imbue(std::locale());
          std::cerr.imbue(std::locale());
@@ -104,8 +104,8 @@
  
          typename options_type::ptr opts(new options_type);
          main_type kit(opts);
---- ./sbuild/sbuild-feature.h-orig	2019-12-09 04:23:51.881428446 +0100
-+++ ./sbuild/sbuild-feature.h	2019-12-09 04:24:14.934887089 +0100
+--- a/sbuild/sbuild-feature.h
++++ b/sbuild/sbuild-feature.h
 @@ -24,6 +24,7 @@
  #include <string>
  
@@ -114,8 +114,8 @@
  
  namespace sbuild
  {
---- ./etc/setup.d/20copyfiles-orig	2018-11-03 14:26:12.000000000 +0100
-+++ ./etc/setup.d/20copyfiles	2019-12-09 13:56:45.277145648 +0100
+--- a/etc/setup.d/20copyfiles
++++ b/etc/setup.d/20copyfiles
 @@ -39,9 +39,9 @@ copy_file()
          if [ -e "$2" ]; then
  
@@ -128,8 +128,8 @@
  
              if [ "$da" = "$db" ]; then
                  COPY="false"
---- ./etc/setup.d/20nssdatabases-orig	2018-11-03 14:26:12.000000000 +0100
-+++ ./etc/setup.d/20nssdatabases	2019-12-09 13:57:34.397419039 +0100
+--- a/etc/setup.d/20nssdatabases
++++ b/etc/setup.d/20nssdatabases
 @@ -29,7 +29,7 @@ set -e
  dup_nss()
  {
@@ -151,47 +151,44 @@
  
                  # If the database inside and outside the chroot is the
                  # same, it's very likely that dup_nss would blank the
-diff -X /home/jmarcet/.rsync-filter -pru ./etc/profile-templates/all/all/nssdatabases ./etc/profile-templates/all/all/nssdatabases
---- ./etc/profile-templates/all/all/nssdatabases	2018-11-03 14:26:12.000000000 +0100
-+++ ./etc/profile-templates/all/all/nssdatabases	2019-12-09 14:03:12.799297723 +0100
-@@ -4,4 +4,4 @@
+--- a/etc/profile-templates/all/all/nssdatabases
++++ b/etc/profile-templates/all/all/nssdatabases
+@@ -3,5 +3,5 @@
+ # <database name>
  passwd
  shadow
 -group
 -gshadow
 +#group
 +#gshadow
-diff -X /home/jmarcet/.rsync-filter -pru ./etc/profile-templates/buildd/all/nssdatabases ./etc/profile-templates/buildd/all/nssdatabases
---- ./etc/profile-templates/buildd/all/nssdatabases	2018-11-03 14:26:12.000000000 +0100
-+++ ./etc/profile-templates/buildd/all/nssdatabases	2019-12-09 14:03:12.802631074 +0100
-@@ -4,4 +4,4 @@
+--- a/etc/profile-templates/buildd/all/nssdatabases
++++ b/etc/profile-templates/buildd/all/nssdatabases
+@@ -3,5 +3,5 @@
+ # <database name>
  passwd
  shadow
 -group
 -gshadow
 +#group
 +#gshadow
-diff -X /home/jmarcet/.rsync-filter -pru ./etc/profile-templates/default/all/nssdatabases ./etc/profile-templates/default/all/nssdatabases
---- ./etc/profile-templates/default/all/nssdatabases	2018-11-03 14:26:12.000000000 +0100
-+++ ./etc/profile-templates/default/all/nssdatabases	2019-12-09 14:03:12.809297778 +0100
+--- a/etc/profile-templates/default/all/nssdatabases
++++ b/etc/profile-templates/default/all/nssdatabases
 @@ -1,4 +1,4 @@
  services
  protocols
 -networks
 +#networks
  hosts
-diff -X /home/jmarcet/.rsync-filter -pru ./etc/profile-templates/desktop/all/nssdatabases ./etc/profile-templates/desktop/all/nssdatabases
---- ./etc/profile-templates/desktop/all/nssdatabases	2018-11-03 14:26:12.000000000 +0100
-+++ ./etc/profile-templates/desktop/all/nssdatabases	2019-12-09 14:03:12.812631129 +0100
+--- a/etc/profile-templates/desktop/all/nssdatabases
++++ b/etc/profile-templates/desktop/all/nssdatabases
 @@ -1,4 +1,4 @@
  services
  protocols
 -networks
 +#networks
  hosts
-diff -X /home/jmarcet/.rsync-filter -pru ./etc/profile-templates/default/linux/fstab ./etc/profile-templates/default/linux/fstab
---- ./etc/profile-templates/default/linux/fstab	2018-11-03 14:26:12.000000000 +0100
-+++ ./etc/profile-templates/default/linux/fstab	2019-12-09 14:18:46.970887080 +0100
+--- a/etc/profile-templates/default/linux/fstab
++++ b/etc/profile-templates/default/linux/fstab
 @@ -7,7 +7,7 @@
  # to run additional services in the chroot.  However, note that this
  # may potentially cause undesirable behaviour on upgrades, such as
@@ -203,9 +200,8 @@ diff -X /home/jmarcet/.rsync-filter -pru ./etc/profile-templates/default/linux/f
 -#/run/shm       /run/shm        none    rw,bind         0       0
 +/tmp/shm       /dev/shm        none    rw,bind         0       0
 +/tmp/shm       /run/shm        none    rw,bind         0       0
-diff -X /home/jmarcet/.rsync-filter -pru ./etc/profile-templates/desktop/linux/fstab ./etc/profile-templates/desktop/linux/fstab
---- ./etc/profile-templates/desktop/linux/fstab	2018-11-03 14:26:12.000000000 +0100
-+++ ./etc/profile-templates/desktop/linux/fstab	2019-12-09 14:22:14.148555674 +0100
+--- a/etc/profile-templates/desktop/linux/fstab
++++ b/etc/profile-templates/desktop/linux/fstab
 @@ -12,7 +12,7 @@
  # to run additional services in the chroot.  However, note that this
  # may potentially cause undesirable behaviour on upgrades, such as

admin/sudo/patches/010-cross-compile-fixes.patch

@@ -1,6 +1,6 @@
 --- a/lib/util/Makefile.in
 +++ b/lib/util/Makefile.in
-@@ -200,10 +200,10 @@ libsudo_util.la: $(LTOBJS) @LT_LDDEP@
+@@ -207,10 +207,10 @@ libsudo_util.la: $(LTOBJS) @LT_LDDEP@
  	esac
  
  siglist.c: mksiglist

admin/sudo/patches/020-no-owner-change.patch

@@ -1,6 +1,6 @@
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -64,7 +64,7 @@ SHELL = @SHELL@
+@@ -73,7 +73,7 @@ SHELL = @SHELL@
  SED = @SED@
  
  INSTALL = $(SHELL) $(top_srcdir)/install-sh -c

devel/gcc/patches/002-dont-choke-when-building-32bit-on-64bit.patch

@@ -1,6 +1,6 @@
 --- a/gcc/real.h
 +++ b/gcc/real.h
-@@ -75,9 +75,10 @@
+@@ -70,9 +70,10 @@ struct GTY(()) real_value {
     + (REAL_VALUE_TYPE_SIZE%HOST_BITS_PER_WIDE_INT ? 1 : 0)) /* round up */
  
  /* Verify the guess.  */

devel/gcc/patches/020-disable-check-for-sys-sdt-h.patch

@@ -1,12 +1,10 @@
 @@ -0,0 +1,45 @@
-diff --git a/gcc/configure b/gcc/configure
-index 3793681..bcda752 100755
 --- a/gcc/configure
 +++ b/gcc/configure
-@@ -26876,19 +26876,6 @@ $as_echo "#define TARGET_LIBC_PROVIDES_SSP 1" >>confdefs.h
-
+@@ -29036,19 +29036,6 @@ $as_echo "#define ENABLE_DEFAULT_SSP 1"
  fi
-
+ 
+ 
 -# Test for <sys/sdt.h> on the target.
 -
 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking sys/sdt.h in the target C library" >&5
@@ -20,17 +18,15 @@ index 3793681..bcda752 100755
 -fi
 -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_sys_sdt_h" >&5
 -$as_echo "$have_sys_sdt_h" >&6; }
-
+ 
  # Check if TFmode long double should be used by default or not.
  # Some glibc targets used DFmode long double, but with glibc 2.4
-diff --git a/gcc/configure.ac b/gcc/configure.ac
-index 3ee1d67..e321218 100644
 --- a/gcc/configure.ac
 +++ b/gcc/configure.ac
-@@ -4796,16 +4796,6 @@ if test x$gcc_cv_libc_provides_ssp = xyes; then
- 	    [Define if your target C library provides stack protector support])
+@@ -5787,16 +5787,6 @@ if test x$enable_default_ssp = xyes ; th
  fi
-
+ AC_SUBST([enable_default_ssp])
+ 
 -# Test for <sys/sdt.h> on the target.
 -GCC_TARGET_TEMPLATE([HAVE_SYS_SDT_H])
 -AC_MSG_CHECKING(sys/sdt.h in the target C library)
@@ -41,6 +37,6 @@ index 3ee1d67..e321218 100644
 -            [Define if your target C library provides sys/sdt.h])
 -fi
 -AC_MSG_RESULT($have_sys_sdt_h)
-
+ 
  # Check if TFmode long double should be used by default or not.
  # Some glibc targets used DFmode long double, but with glibc 2.4

devel/gcc/patches/260-musl-add-unwind-fix.patch

@@ -19,7 +19,7 @@ git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@222328 138bc75d-0d04-0410-961f-8
 
 --- a/libgcc/unwind-dw2-fde-dip.c
 +++ b/libgcc/unwind-dw2-fde-dip.c
-@@ -59,6 +59,12 @@
+@@ -65,6 +65,12 @@
  
  #if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) \
      && defined(TARGET_DL_ITERATE_PHDR) \

devel/gcc/patches/931-libffi-fix-MIPS-softfloat-build-issue.patch

@@ -12,8 +12,6 @@ Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
  libffi/src/mips/o32.S | 17 +++++++++++++++++
  2 files changed, 34 insertions(+)
 
-diff --git a/libffi/src/mips/n32.S b/libffi/src/mips/n32.S
-index c6985d30a6f..8f25994773c 100644
 --- a/libffi/src/mips/n32.S
 +++ b/libffi/src/mips/n32.S
 @@ -107,6 +107,16 @@ loadregs:
@@ -89,8 +87,6 @@ index c6985d30a6f..8f25994773c 100644
  	
  cls_retstruct_small2:	
  	REG_L	v0, V0_OFF2($sp)
-diff --git a/libffi/src/mips/o32.S b/libffi/src/mips/o32.S
-index eb279813a76..1aff4b14814 100644
 --- a/libffi/src/mips/o32.S
 +++ b/libffi/src/mips/o32.S
 @@ -82,13 +82,16 @@ sixteen:
@@ -170,6 +166,3 @@ index eb279813a76..1aff4b14814 100644
  1:	
  	REG_L	$3, V1_OFF2($fp)
  	REG_L	$2, V0_OFF2($fp)
--- 
-2.16.3
-

devel/gcc/patches/960-gotools-fix-compilation-when-making-cross-compiler.patch

@@ -25,8 +25,6 @@ at gcc pass3
  gotools/Makefile.in | 4 +++-
  2 files changed, 6 insertions(+), 2 deletions(-)
 
-diff --git a/gotools/Makefile.am b/gotools/Makefile.am
-index 5f3940a278b..9c22f5df103 100644
 --- a/gotools/Makefile.am
 +++ b/gotools/Makefile.am
 @@ -26,6 +26,7 @@ PWD_COMMAND = $${PWDCMD-pwd}
@@ -47,11 +45,9 @@ index 5f3940a278b..9c22f5df103 100644
  GOLINK = $(GOCOMPILER) $(GOCFLAGS) $(AM_GOCFLAGS) $(LDFLAGS) $(AM_LDFLAGS) -o $@
  
  cmdsrcdir = $(srcdir)/../libgo/go/cmd
-diff --git a/gotools/Makefile.in b/gotools/Makefile.in
-index 4386576b011..0bdd9290e01 100644
 --- a/gotools/Makefile.in
 +++ b/gotools/Makefile.in
-@@ -252,13 +252,15 @@ mkinstalldirs = $(SHELL) $(toplevel_srcdir)/mkinstalldirs
+@@ -252,13 +252,15 @@ mkinstalldirs = $(SHELL) $(toplevel_srcd
  PWD_COMMAND = $${PWDCMD-pwd}
  STAMP = echo timestamp >
  libgodir = ../$(target_noncanonical)/libgo
@@ -68,6 +64,3 @@ index 4386576b011..0bdd9290e01 100644
  GOLINK = $(GOCOMPILER) $(GOCFLAGS) $(AM_GOCFLAGS) $(LDFLAGS) $(AM_LDFLAGS) -o $@
  cmdsrcdir = $(srcdir)/../libgo/go/cmd
  go_cmd_go_files = \
--- 
-2.16.3
-

devel/gcc/patches/970-replace-memcpy-memset.patch

@@ -1,7 +1,6 @@
-diff --recursive -u gcc-7.4.0-vanilla/libitm/beginend.cc gcc-7.4.0/libitm/beginend.cc
---- gcc-7.4.0-vanilla/libitm/beginend.cc	2017-01-01 07:07:43.905435000 -0500
-+++ gcc-7.4.0/libitm/beginend.cc	2019-11-09 00:31:10.093128945 -0500
-@@ -431,7 +431,7 @@
+--- a/libitm/beginend.cc
++++ b/libitm/beginend.cc
+@@ -431,7 +431,7 @@ GTM::gtm_transaction_cp::save(gtm_thread
    // Save everything that we might have to restore on restarts or aborts.
    jb = tx->jb;
    undolog_size = tx->undolog.size();
@@ -10,7 +9,7 @@ diff --recursive -u gcc-7.4.0-vanilla/libitm/beginend.cc gcc-7.4.0/libitm/begine
    user_actions_size = tx->user_actions.size();
    id = tx->id;
    prop = tx->prop;
-@@ -449,7 +449,7 @@
+@@ -449,7 +449,7 @@ GTM::gtm_transaction_cp::commit(gtm_thre
    // commits of nested transactions. Allocation actions must be committed
    // before committing the snapshot.
    tx->jb = jb;
@@ -19,7 +18,7 @@ diff --recursive -u gcc-7.4.0-vanilla/libitm/beginend.cc gcc-7.4.0/libitm/begine
    tx->id = id;
    tx->prop = prop;
  }
-@@ -485,7 +485,7 @@
+@@ -485,7 +485,7 @@ GTM::gtm_thread::rollback (gtm_transacti
        prop = cp->prop;
        if (cp->disp != abi_disp())
  	set_abi_disp(cp->disp);
@@ -28,10 +27,9 @@ diff --recursive -u gcc-7.4.0-vanilla/libitm/beginend.cc gcc-7.4.0/libitm/begine
        nesting = cp->nesting;
      }
    else
-diff --recursive -u gcc-7.4.0-vanilla/libitm/method-ml.cc gcc-7.4.0/libitm/method-ml.cc
---- gcc-7.4.0-vanilla/libitm/method-ml.cc	2017-01-01 07:07:43.905435000 -0500
-+++ gcc-7.4.0/libitm/method-ml.cc	2019-11-09 01:12:58.674388557 -0500
-@@ -138,7 +138,9 @@
+--- a/libitm/method-ml.cc
++++ b/libitm/method-ml.cc
+@@ -138,7 +138,9 @@ struct ml_mg : public method_group
      // This store is only executed while holding the serial lock, so relaxed
      // memory order is sufficient here.  Same holds for the memset.
      time.store(0, memory_order_relaxed);

devel/lpc21isp/patches/100-fix-reproducible-builds.patch

@@ -1,8 +1,6 @@
-Index: lpc21isp_197/lpc21isp.c
-===================================================================
---- lpc21isp_197.orig/lpc21isp.c	2017-12-03 06:01:05.854070061 +0100
-+++ lpc21isp_197/lpc21isp.c	2017-12-03 06:01:23.326431659 +0100
-@@ -1549,7 +1549,7 @@
+--- a/lpc21isp.c
++++ b/lpc21isp.c
+@@ -1549,7 +1549,7 @@ static void ReadArguments(ISP_ENVIRONMEN
          DebugPrintf(2, "\n"
                         "Portable command line ISP\n"
                         "for NXP LPC family and Analog Devices ADUC 70xx\n"

devel/lpc21isp/patches/110-bzero.patch

@@ -1,6 +1,6 @@
 --- a/lpc21isp.c
 +++ b/lpc21isp.c
-@@ -533,7 +533,7 @@ static void OpenSerialPort(ISP_ENVIRONMENT *IspEnvironment)
+@@ -533,7 +533,7 @@ static void OpenSerialPort(ISP_ENVIRONME
  
      tcgetattr(IspEnvironment->fdCom, &IspEnvironment->oldtio); /* save current port settings */
  

devel/lpc21isp/patches/120-nanosleep.patch

@@ -1,6 +1,6 @@
 --- a/lpc21isp.c
 +++ b/lpc21isp.c
-@@ -1130,7 +1130,8 @@ void ClearSerialPortBuffers(ISP_ENVIRONMENT *IspEnvironment)
+@@ -1130,7 +1130,8 @@ void ClearSerialPortBuffers(ISP_ENVIRONM
  */
  void Sleep(unsigned long MilliSeconds)
  {

devel/patch/patches/010-CVE-2018-6951.patch

@@ -10,11 +10,9 @@ for renames and copies (fix the existing check).
  src/pch.c | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
-diff --git a/src/pch.c b/src/pch.c
-index ff9ed2c..bc6278c 100644
 --- a/src/pch.c
 +++ b/src/pch.c
-@@ -974,7 +974,8 @@ intuit_diff_type (bool need_header, mode_t *p_file_type)
+@@ -974,7 +974,8 @@ intuit_diff_type (bool need_header, mode
      if ((pch_rename () || pch_copy ())
  	&& ! inname
  	&& ! ((i == OLD || i == NEW) &&
@@ -24,6 +22,3 @@ index ff9ed2c..bc6278c 100644
  	      name_is_valid (p_name[! reverse])))
        {
  	say ("Cannot %s file without two valid file names\n", pch_rename () ? "rename" : "copy");
--- 
-2.19.1
-

devel/patch/patches/020-CVE-2018-1000156.patch

@@ -16,8 +16,6 @@ instead of rejecting them and carrying on.
  3 files changed, 108 insertions(+), 23 deletions(-)
  create mode 100644 tests/ed-style
 
-diff --git a/src/pch.c b/src/pch.c
-index bc6278c..4fd5a05 100644
 --- a/src/pch.c
 +++ b/src/pch.c
 @@ -33,6 +33,7 @@
@@ -28,7 +26,7 @@ index bc6278c..4fd5a05 100644
  
  #define INITHUNKMAX 125			/* initial dynamic allocation size */
  
-@@ -2389,22 +2390,28 @@ do_ed_script (char const *inname, char const *outname,
+@@ -2389,22 +2390,28 @@ do_ed_script (char const *inname, char c
      static char const editor_program[] = EDITOR_PROGRAM;
  
      file_offset beginning_of_this_line;
@@ -71,7 +69,7 @@ index bc6278c..4fd5a05 100644
      for (;;) {
  	char ed_command_letter;
  	beginning_of_this_line = file_tell (pfp);
-@@ -2415,14 +2422,14 @@ do_ed_script (char const *inname, char const *outname,
+@@ -2415,14 +2422,14 @@ do_ed_script (char const *inname, char c
  	}
  	ed_command_letter = get_ed_command_letter (buf);
  	if (ed_command_letter) {
@@ -90,7 +88,7 @@ index bc6278c..4fd5a05 100644
  			    write_fatal ();
  		    if (chars_read == 2  &&  strEQ (buf, ".\n"))
  			break;
-@@ -2435,13 +2442,49 @@ do_ed_script (char const *inname, char const *outname,
+@@ -2435,13 +2442,49 @@ do_ed_script (char const *inname, char c
  	    break;
  	}
      }
@@ -145,8 +143,6 @@ index bc6278c..4fd5a05 100644
  
      if (ofp)
        {
-diff --git a/tests/Makefile.am b/tests/Makefile.am
-index 6b6df63..16f8693 100644
 --- a/tests/Makefile.am
 +++ b/tests/Makefile.am
 @@ -32,6 +32,7 @@ TESTS = \
@@ -157,9 +153,6 @@ index 6b6df63..16f8693 100644
  	empty-files \
  	false-match \
  	fifo \
-diff --git a/tests/ed-style b/tests/ed-style
-new file mode 100644
-index 0000000..d8c0689
 --- /dev/null
 +++ b/tests/ed-style
 @@ -0,0 +1,41 @@
@@ -204,6 +197,3 @@ index 0000000..d8c0689
 +check 'cat foo' <<EOF
 +foo
 +EOF
--- 
-2.19.1
-

devel/patch/patches/030-CVE-2018-6952.patch

@@ -12,8 +12,6 @@ Fixes: https://savannah.gnu.org/bugs/index.php?53133
  src/pch.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/src/pch.c b/src/pch.c
-index 4fd5a05..b0dd14d 100644
 --- a/src/pch.c
 +++ b/src/pch.c
 @@ -2115,7 +2115,7 @@ pch_swap (void)
@@ -25,6 +23,3 @@ index 4fd5a05..b0dd14d 100644
  	else
  	    n = -i;
  	p_efake += n;
--- 
-2.19.1
-

devel/patch/patches/050-CVE-2019-13636.patch

@@ -14,8 +14,6 @@ with O_CREAT | O_EXCL to avoid following symlinks in that case as well.
  src/util.c | 14 +++++++++++---
  2 files changed, 21 insertions(+), 5 deletions(-)
 
-diff --git a/src/inp.c b/src/inp.c
-index 32d0919..22d7473 100644
 --- a/src/inp.c
 +++ b/src/inp.c
 @@ -238,8 +238,13 @@ plan_a (char const *filename)
@@ -52,11 +50,9 @@ index 32d0919..22d7473 100644
        || ! (ifp = fdopen (ifd, binary_transput ? "rb" : "r")))
      pfatal ("Can't open file %s", quotearg (filename));
    if (TMPINNAME_needs_removal)
-diff --git a/src/util.c b/src/util.c
-index 1cc08ba..fb38307 100644
 --- a/src/util.c
 +++ b/src/util.c
-@@ -388,7 +388,7 @@ create_backup (char const *to, const struct stat *to_st, bool leave_original)
+@@ -388,7 +388,7 @@ create_backup (char const *to, const str
  
  	  try_makedirs_errno = ENOENT;
  	  safe_unlink (bakname);
@@ -65,7 +61,7 @@ index 1cc08ba..fb38307 100644
  	    {
  	      if (errno != try_makedirs_errno)
  		pfatal ("Can't create file %s", quotearg (bakname));
-@@ -579,10 +579,13 @@ create_file (char const *file, int open_flags, mode_t mode,
+@@ -579,10 +579,13 @@ create_file (char const *file, int open_
  static void
  copy_to_fd (const char *from, int tofd)
  {
@@ -80,7 +76,7 @@ index 1cc08ba..fb38307 100644
      pfatal ("Can't reopen file %s", quotearg (from));
    while ((i = read (fromfd, buf, bufsize)) != 0)
      {
-@@ -625,6 +628,8 @@ copy_file (char const *from, char const *to, struct stat *tost,
+@@ -625,6 +628,8 @@ copy_file (char const *from, char const
    else
      {
        assert (S_ISREG (mode));
@@ -89,7 +85,7 @@ index 1cc08ba..fb38307 100644
        tofd = create_file (to, O_WRONLY | O_BINARY | to_flags, mode,
  			  to_dir_known_to_exist);
        copy_to_fd (from, tofd);
-@@ -640,9 +645,12 @@ copy_file (char const *from, char const *to, struct stat *tost,
+@@ -640,9 +645,12 @@ copy_file (char const *from, char const
  void
  append_to_file (char const *from, char const *to)
  {
@@ -103,6 +99,3 @@ index 1cc08ba..fb38307 100644
      pfatal ("Can't reopen file %s", quotearg (to));
    copy_to_fd (from, tofd);
    if (close (tofd) != 0)
--- 
-cgit v1.0-41-gc330
-

devel/patch/patches/060-CVE-2018-20969-CVE-2019-13638.patch

@@ -9,11 +9,9 @@ command to avoid quoting vulnerabilities.
  src/pch.c | 6 ++----
  1 file changed, 2 insertions(+), 4 deletions(-)
 
-diff --git a/src/pch.c b/src/pch.c
-index 4fd5a05..16e001a 100644
 --- a/src/pch.c
 +++ b/src/pch.c
-@@ -2459,9 +2459,6 @@ do_ed_script (char const *inname, char const *outname,
+@@ -2459,9 +2459,6 @@ do_ed_script (char const *inname, char c
  	    *outname_needs_removal = true;
  	    copy_file (inname, outname, 0, exclusive, instat.st_mode, true);
  	  }
@@ -23,7 +21,7 @@ index 4fd5a05..16e001a 100644
  	fflush (stdout);
  
  	pid = fork();
-@@ -2470,7 +2467,8 @@ do_ed_script (char const *inname, char const *outname,
+@@ -2470,7 +2467,8 @@ do_ed_script (char const *inname, char c
  	else if (pid == 0)
  	  {
  	    dup2 (tmpfd, 0);
@@ -33,6 +31,3 @@ index 4fd5a05..16e001a 100644
  	    _exit (2);
  	  }
  	else
--- 
-cgit v1.0-41-gc330
-

ipv6/tayga/patches/003-RFC8215.patch

@@ -1,7 +1,6 @@
-diff -Naur tayga-0.9.2.orig/addrmap.c tayga-0.9.2/addrmap.c
---- tayga-0.9.2.orig/addrmap.c	2011-05-25 15:11:30.000000000 +0100
-+++ tayga-0.9.2/addrmap.c	2020-07-04 16:24:23.397081572 +0100
-@@ -44,7 +44,9 @@
+--- a/addrmap.c
++++ b/addrmap.c
+@@ -44,7 +44,9 @@ int validate_ip4_addr(const struct in_ad
  int validate_ip6_addr(const struct in6_addr *a)
  {
  	/* Well-known prefix for NAT64 */

kernel/antfs/patches/0001-file.c-Patch-for-Linux-v5.8.patch

@@ -1,8 +1,6 @@
-diff --git a/file.c b/file.c
-index 105e41c..98d5204 100644
 --- a/file.c
 +++ b/file.c
-@@ -625,6 +625,9 @@ static int antfs_readpages(struct file *file, struct address_space *mapping,
+@@ -625,6 +625,9 @@ static int antfs_readpages(struct file *
  		unsigned page_idx = nr_pages;
  		pgoff_t page_idx_to_init;
  		bool do_init_page = false;
@@ -12,7 +10,7 @@ index 105e41c..98d5204 100644
  
  		if (page_offs & (buffer_len - 1)) {
  			/* If initialized size is not on buffer boundary, walk
-@@ -660,8 +663,13 @@ static int antfs_readpages(struct file *file, struct address_space *mapping,
+@@ -660,8 +663,13 @@ static int antfs_readpages(struct file *
  			}
  		}
  
@@ -26,8 +24,6 @@ index 105e41c..98d5204 100644
  		if (!err && do_init_page) {
  			/* Initialize stuff past initialized_size with zero. */
  			page = grab_cache_page(mapping, page_idx_to_init);
-diff --git a/libntfs-3g/misc.c b/libntfs-3g/misc.c
-index b3ec53a..c5a94de 100644
 --- a/libntfs-3g/misc.c
 +++ b/libntfs-3g/misc.c
 @@ -38,7 +38,11 @@ void *ntfs_malloc(size_t size)
@@ -42,6 +38,3 @@ index b3ec53a..c5a94de 100644
  }
  
  /**
--- 
-2.30.0
-

kernel/macremapper/patches/02-mrm_ctlfile.c-compatibility-with-linux-5.6.patch

@@ -8,8 +8,6 @@ Signed-off-by: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
  kernelmod/mrm_ctlfile.c | 13 ++++++++++++-
  1 file changed, 12 insertions(+), 1 deletion(-)
 
-diff --git a/kernelmod/mrm_ctlfile.c b/kernelmod/mrm_ctlfile.c
-index 85a8bf9..ca8e7d8 100644
 --- a/kernelmod/mrm_ctlfile.c
 +++ b/kernelmod/mrm_ctlfile.c
 @@ -13,6 +13,7 @@
@@ -20,7 +18,7 @@ index 85a8bf9..ca8e7d8 100644
  #include <linux/proc_fs.h>
  #include <linux/uaccess.h>
  #include <linux/mutex.h>
-@@ -80,13 +81,14 @@ mrm_handle_read(struct file *f, char __user *buf, size_t size, loff_t *off) {
+@@ -80,13 +81,14 @@ mrm_handle_read(struct file *f, char __u
  }
  
  static long
@@ -51,7 +49,7 @@ index 85a8bf9..ca8e7d8 100644
  static const struct file_operations _fops = {
    owner:           THIS_MODULE,
    open:            &mrm_handle_open,
-@@ -166,6 +176,7 @@ static const struct file_operations _fops = {
+@@ -166,6 +176,7 @@ static const struct file_operations _fop
    read:            &mrm_handle_read,
    unlocked_ioctl:  (void*)&mrm_handle_ioctl,
  };
@@ -59,6 +57,3 @@ index 85a8bf9..ca8e7d8 100644
  
  int mrm_init_ctlfile( void ) {
    struct proc_dir_entry *pde;
--- 
-2.30.0
-

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);

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

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

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
  

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 $
  

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)

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)

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

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");
  

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>
  

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

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  = {

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

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
  

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)

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

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)

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 => {

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;
  

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
  }
  

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;
  }
  

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'],

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
-

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:

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) {

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

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);
  

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);
  	}

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(

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 @@

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

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
-

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)"
  

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);
  

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);
  	}

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"
  

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 @@

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

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)"
  

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
-

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)

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"],

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);
          """
  

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 = {
      ],
  }
  

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);
          """
  

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 = {
      ],
  }
  

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
-

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 @@

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

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
-

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

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 */

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()

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).

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)

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()

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)

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))
  

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
          ],
          [*], [

libs/apr-util/patches/002-fix-gdbm-error-handling.patch

@@ -1,7 +1,7 @@
 # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=889170
 # needs to be submitted upstream
---- apr-util.orig/dbm/apr_dbm_gdbm.c
-+++ apr-util/dbm/apr_dbm_gdbm.c
+--- a/dbm/apr_dbm_gdbm.c
++++ b/dbm/apr_dbm_gdbm.c
 @@ -36,13 +36,22 @@
  static apr_status_t g2s(int gerr)
  {

libs/avahi/patches/010-pkgconfig.patch

@@ -24,8 +24,6 @@ Signed-off-by: Rosen Penev <rosenp@gmail.com>
  avahi-ui.pc.in               | 4 ++--
  14 files changed, 26 insertions(+), 26 deletions(-)
 
-diff --git a/avahi-client.pc.in b/avahi-client.pc.in
-index 65ee8d84..1e1bd249 100644
 --- a/avahi-client.pc.in
 +++ b/avahi-client.pc.in
 @@ -1,6 +1,6 @@
@@ -37,8 +35,6 @@ index 65ee8d84..1e1bd249 100644
  includedir=${prefix}/include
  
  Name: avahi-client
-diff --git a/avahi-compat-howl.pc.in b/avahi-compat-howl.pc.in
-index b3cd02a7..1bb42c6b 100644
 --- a/avahi-compat-howl.pc.in
 +++ b/avahi-compat-howl.pc.in
 @@ -1,6 +1,6 @@
@@ -50,8 +46,6 @@ index b3cd02a7..1bb42c6b 100644
  includedir=${prefix}/include/avahi-compat-howl/
  
  Name: avahi-compat-howl
-diff --git a/avahi-compat-libdns_sd.pc.in b/avahi-compat-libdns_sd.pc.in
-index d6196325..d4778a17 100644
 --- a/avahi-compat-libdns_sd.pc.in
 +++ b/avahi-compat-libdns_sd.pc.in
 @@ -1,6 +1,6 @@
@@ -63,8 +57,6 @@ index d6196325..d4778a17 100644
  includedir=${prefix}/include/avahi-compat-libdns_sd/
  
  Name: avahi-compat-libdns_sd
-diff --git a/avahi-core.pc.in b/avahi-core.pc.in
-index 52491b41..73412d45 100644
 --- a/avahi-core.pc.in
 +++ b/avahi-core.pc.in
 @@ -1,6 +1,6 @@
@@ -76,8 +68,6 @@ index 52491b41..73412d45 100644
  includedir=${prefix}/include
  
  Name: avahi-core
-diff --git a/avahi-glib.pc.in b/avahi-glib.pc.in
-index f163e899..3d0ff9fc 100644
 --- a/avahi-glib.pc.in
 +++ b/avahi-glib.pc.in
 @@ -1,6 +1,6 @@
@@ -89,8 +79,6 @@ index f163e899..3d0ff9fc 100644
  includedir=${prefix}/include
  
  Name: avahi-glib
-diff --git a/avahi-gobject.pc.in b/avahi-gobject.pc.in
-index bf382003..88146744 100644
 --- a/avahi-gobject.pc.in
 +++ b/avahi-gobject.pc.in
 @@ -1,6 +1,6 @@
@@ -102,8 +90,6 @@ index bf382003..88146744 100644
  includedir=${prefix}/include
  
  Name: avahi-gobject
-diff --git a/avahi-libevent.pc.in b/avahi-libevent.pc.in
-index a1dca01b..59b35e8e 100644
 --- a/avahi-libevent.pc.in
 +++ b/avahi-libevent.pc.in
 @@ -1,6 +1,6 @@
@@ -115,8 +101,6 @@ index a1dca01b..59b35e8e 100644
  includedir=${prefix}/include
  
  Name: avahi-libevent
-diff --git a/avahi-qt3.pc.in b/avahi-qt3.pc.in
-index c18f0809..d4fb4b88 100644
 --- a/avahi-qt3.pc.in
 +++ b/avahi-qt3.pc.in
 @@ -1,6 +1,6 @@
@@ -128,8 +112,6 @@ index c18f0809..d4fb4b88 100644
  includedir=${prefix}/include
  
  Name: avahi-qt3
-diff --git a/avahi-qt4.pc.in b/avahi-qt4.pc.in
-index f62f7171..aefc135a 100644
 --- a/avahi-qt4.pc.in
 +++ b/avahi-qt4.pc.in
 @@ -1,6 +1,6 @@
@@ -141,8 +123,6 @@ index f62f7171..aefc135a 100644
  includedir=${prefix}/include
  
  Name: avahi-qt4
-diff --git a/avahi-qt5.pc.in b/avahi-qt5.pc.in
-index 71548baf..fffe192a 100644
 --- a/avahi-qt5.pc.in
 +++ b/avahi-qt5.pc.in
 @@ -1,6 +1,6 @@
@@ -154,8 +134,6 @@ index 71548baf..fffe192a 100644
  includedir=${prefix}/include
  
  Name: avahi-qt5
-diff --git a/avahi-sharp.pc.in b/avahi-sharp.pc.in
-index 3cc78b60..4d4c15df 100644
 --- a/avahi-sharp.pc.in
 +++ b/avahi-sharp.pc.in
 @@ -1,6 +1,6 @@
@@ -166,8 +144,6 @@ index 3cc78b60..4d4c15df 100644
  
  Name: avahi-sharp
  Description: Mono bindings for the Avahi mDNS/DNS-SD stack
-diff --git a/avahi-ui-gtk3.pc.in b/avahi-ui-gtk3.pc.in
-index 27c4322d..56159481 100644
 --- a/avahi-ui-gtk3.pc.in
 +++ b/avahi-ui-gtk3.pc.in
 @@ -1,6 +1,6 @@
@@ -179,8 +155,6 @@ index 27c4322d..56159481 100644
  includedir=${prefix}/include
  
  Name: avahi-ui
-diff --git a/avahi-ui-sharp.pc.in b/avahi-ui-sharp.pc.in
-index cdc35e0d..d448b241 100644
 --- a/avahi-ui-sharp.pc.in
 +++ b/avahi-ui-sharp.pc.in
 @@ -1,6 +1,6 @@
@@ -191,8 +165,6 @@ index cdc35e0d..d448b241 100644
  
  Name: avahi-ui-sharp
  Description: Mono bindings for the Avahi mDNS/DNS-SD stack
-diff --git a/avahi-ui.pc.in b/avahi-ui.pc.in
-index 9edeea96..0dab729a 100644
 --- a/avahi-ui.pc.in
 +++ b/avahi-ui.pc.in
 @@ -1,6 +1,6 @@

libs/avahi/patches/100-p2p-no-iff_multicast-required.patch

@@ -6,11 +6,9 @@ Date:   Thu Sep 17 00:27:55 2020 +0000
     
     Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com>
 
-diff --git a/avahi-core/iface-linux.c b/avahi-core/iface-linux.c
-index e116c7b..75089c4 100644
 --- a/avahi-core/iface-linux.c
 +++ b/avahi-core/iface-linux.c
-@@ -105,8 +105,8 @@ static void netlink_callback(AvahiNetlink *nl, struct nlmsghdr *n, void* userdat
+@@ -105,8 +105,8 @@ static void netlink_callback(AvahiNetlin
              (ifinfomsg->ifi_flags & IFF_UP) &&
              (!m->server->config.use_iff_running || (ifinfomsg->ifi_flags & IFF_RUNNING)) &&
              ((ifinfomsg->ifi_flags & IFF_LOOPBACK) ||
@@ -21,11 +19,9 @@ index e116c7b..75089c4 100644
  
          /* Handle interface attributes */
          l = NLMSG_PAYLOAD(n, sizeof(struct ifinfomsg));
-diff --git a/avahi-core/iface-pfroute.c b/avahi-core/iface-pfroute.c
-index 45fd970..4eafce0 100644
 --- a/avahi-core/iface-pfroute.c
 +++ b/avahi-core/iface-pfroute.c
-@@ -81,8 +81,8 @@ static void rtm_info(struct rt_msghdr *rtm, AvahiInterfaceMonitor *m)
+@@ -81,8 +81,8 @@ static void rtm_info(struct rt_msghdr *r
      (ifm->ifm_flags & IFF_UP) &&
      (!m->server->config.use_iff_running || (ifm->ifm_flags & IFF_RUNNING)) &&
      ((ifm->ifm_flags & IFF_LOOPBACK) ||
@@ -36,7 +32,7 @@ index 45fd970..4eafce0 100644
  
    avahi_free(hw->name);
    hw->name = avahi_strndup(sdl->sdl_data, sdl->sdl_nlen);
-@@ -428,8 +428,8 @@ static void if_add_interface(struct lifreq *lifreq, AvahiInterfaceMonitor *m, in
+@@ -428,8 +428,8 @@ static void if_add_interface(struct lifr
              (flags & IFF_UP) &&
              (!m->server->config.use_iff_running || (flags & IFF_RUNNING)) &&
              ((flags & IFF_LOOPBACK) ||

libs/flac/patches/010-utime.patch

@@ -22,8 +22,6 @@ This fixes flac_utime to work in such a situation.
  src/share/grabbag/file.c         |  9 +++++++--
  3 files changed, 23 insertions(+), 5 deletions(-)
 
-diff --git a/include/share/compat.h b/include/share/compat.h
-index f3041655..a063c083 100644
 --- a/include/share/compat.h
 +++ b/include/share/compat.h
 @@ -112,9 +112,13 @@
@@ -57,11 +55,9 @@ index f3041655..a063c083 100644
  #endif
  
  #ifdef _WIN32
-diff --git a/src/libFLAC/metadata_iterators.c b/src/libFLAC/metadata_iterators.c
-index 352a6c7a..d5255eb9 100644
 --- a/src/libFLAC/metadata_iterators.c
 +++ b/src/libFLAC/metadata_iterators.c
-@@ -3422,13 +3422,18 @@ FLAC__bool get_file_stats_(const char *filename, struct flac_stat_s *stats)
+@@ -3422,13 +3422,18 @@ FLAC__bool get_file_stats_(const char *f
  
  void set_file_stats_(const char *filename, struct flac_stat_s *stats)
  {
@@ -82,8 +78,6 @@ index 352a6c7a..d5255eb9 100644
  	(void)flac_chmod(filename, stats->st_mode);
  	(void)flac_utime(filename, &srctime);
  #if !defined _MSC_VER && !defined __BORLANDC__ && !defined __MINGW32__
-diff --git a/src/share/grabbag/file.c b/src/share/grabbag/file.c
-index 2c67bebf..edd835a6 100644
 --- a/src/share/grabbag/file.c
 +++ b/src/share/grabbag/file.c
 @@ -27,7 +27,6 @@
@@ -113,6 +107,3 @@ index 2c67bebf..edd835a6 100644
  		(void)flac_chmod(destpath, srcstat.st_mode);
  		(void)flac_utime(destpath, &srctime);
  	}
--- 
-2.17.1
-

libs/getdns/patches/020-openssl-no-dynamic.patch

@@ -1,6 +1,6 @@
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -334,6 +334,9 @@ check_include_file(openssl/err.h HAVE_OPENSSL_ERR_H)
+@@ -334,6 +334,9 @@ check_include_file(openssl/err.h HAVE_OP
  check_include_file(openssl/rand.h HAVE_OPENSSL_RAND_H)
  check_include_file(openssl/conf.h HAVE_OPENSSL_CONF_H)
  check_include_file(openssl/engine.h HAVE_OPENSSL_ENGINE_H)

libs/getdns/patches/getdns-1.6.0-fix-crosscompile.patch

@@ -1,6 +1,6 @@
---- a/CMakeLists.txt	2020-07-01 00:06:07.784792469 +0100
-+++ b/CMakeLists.txt	2020-07-01 00:07:09.232511018 +0100
-@@ -520,7 +520,7 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -523,7 +523,7 @@ set(STRPTIME_TEST_SOURCE "\n
    res = strptime(\"20070207111842\", \"%Y%m%d%H%M%S\", &tm);\n
    if (!res) return 1; return 0; }")