diff options
| author | Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com> | 2021-02-20 16:02:15 -0800 |
|---|---|---|
| committer | Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com> | 2021-02-20 16:02:15 -0800 |
| commit | 5d8d4fbbcb5c5de9370711c19bb3510210989a98 (patch) | |
| tree | d0754921833f413b7eb93fb6bb1b1c8a22fb0498 /admin | |
| parent | d651082447b4392399a40ea1ae11d0bce4bfe83a (diff) | |
treewide: Run refresh on all packages
The crude loop I wrote to come up with this changeset:
find -L package/feeds/packages/ -name patches | \
sed 's/patches$/refresh/' | sort | xargs make
Signed-off-by: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
Diffstat (limited to 'admin')
18 files changed, 101 insertions, 170 deletions
diff --git a/admin/backuppc/patches/001-debian-fixes.patch b/admin/backuppc/patches/001-debian-fixes.patch index 370175572..cd7de5766 100644 --- a/admin/backuppc/patches/001-debian-fixes.patch +++ b/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 diff --git a/admin/gkrellmd/patches/100-conf.patch b/admin/gkrellmd/patches/100-conf.patch index c4b9ea20e..8716a31a9 100644 --- a/admin/gkrellmd/patches/100-conf.patch +++ b/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 diff --git a/admin/ipmitool/patches/0001-ID-461-OpenSSL-1.1-compatibility-error-storage-size-.patch b/admin/ipmitool/patches/0001-ID-461-OpenSSL-1.1-compatibility-error-storage-size-.patch index 30948775e..582e17d43 100644 --- a/admin/ipmitool/patches/0001-ID-461-OpenSSL-1.1-compatibility-error-storage-size-.patch +++ b/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 - diff --git a/admin/ipmitool/patches/0002-ID-461-Make-compiler-happier-about-changes-related-t.patch b/admin/ipmitool/patches/0002-ID-461-Make-compiler-happier-about-changes-related-t.patch index cd4f73073..9690d879b 100644 --- a/admin/ipmitool/patches/0002-ID-461-Make-compiler-happier-about-changes-related-t.patch +++ b/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 - diff --git a/admin/ipmitool/patches/0003-ID-480-ipmitool-coredumps-in-EVP_CIPHER_CTX_init.patch b/admin/ipmitool/patches/0003-ID-480-ipmitool-coredumps-in-EVP_CIPHER_CTX_init.patch index 91aed82fb..db388e4ef 100644 --- a/admin/ipmitool/patches/0003-ID-480-ipmitool-coredumps-in-EVP_CIPHER_CTX_init.patch +++ b/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 - diff --git a/admin/ipmitool/patches/0004-ID-480-Call-EVP_CIPHER_CTX_free-instead-of-EVP_CIPHE.patch b/admin/ipmitool/patches/0004-ID-480-Call-EVP_CIPHER_CTX_free-instead-of-EVP_CIPHE.patch index 65a40b023..c081cc53a 100644 --- a/admin/ipmitool/patches/0004-ID-480-Call-EVP_CIPHER_CTX_free-instead-of-EVP_CIPHE.patch +++ b/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 - diff --git a/admin/ipmitool/patches/0005-ipmitool-Fix-compile-with-deprecated-APIs-disabled.patch b/admin/ipmitool/patches/0005-ipmitool-Fix-compile-with-deprecated-APIs-disabled.patch index 7f2923fd8..308079189 100644 --- a/admin/ipmitool/patches/0005-ipmitool-Fix-compile-with-deprecated-APIs-disabled.patch +++ b/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 - diff --git a/admin/ipmitool/patches/0006-CVE-2020-5208-fru-Fix-buffer-overflow-vulnerabilities.patch b/admin/ipmitool/patches/0006-CVE-2020-5208-fru-Fix-buffer-overflow-vulnerabilities.patch index 48fe5eeb7..17341c98f 100644 --- a/admin/ipmitool/patches/0006-CVE-2020-5208-fru-Fix-buffer-overflow-vulnerabilities.patch +++ b/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 - diff --git a/admin/ipmitool/patches/0007-CVE-2020-5208-fru-Fix-buffer-overflow-in-ipmi_spd_print_fru.patch b/admin/ipmitool/patches/0007-CVE-2020-5208-fru-Fix-buffer-overflow-in-ipmi_spd_print_fru.patch index d694c9252..2656dfccc 100644 --- a/admin/ipmitool/patches/0007-CVE-2020-5208-fru-Fix-buffer-overflow-in-ipmi_spd_print_fru.patch +++ b/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 - diff --git a/admin/ipmitool/patches/0008-CVE-2020-5208-session-Fix-buffer-overflow-in-ipmi_get_session_info.patch b/admin/ipmitool/patches/0008-CVE-2020-5208-session-Fix-buffer-overflow-in-ipmi_get_session_info.patch index 6d8cc1549..00ecd4272 100644 --- a/admin/ipmitool/patches/0008-CVE-2020-5208-session-Fix-buffer-overflow-in-ipmi_get_session_info.patch +++ b/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 - diff --git a/admin/ipmitool/patches/0009-CVE-2020-5208-channel-Fix-buffer-overflow.patch b/admin/ipmitool/patches/0009-CVE-2020-5208-channel-Fix-buffer-overflow.patch index dd29993b1..e4ea7734f 100644 --- a/admin/ipmitool/patches/0009-CVE-2020-5208-channel-Fix-buffer-overflow.patch +++ b/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 - diff --git a/admin/ipmitool/patches/0010-CVE-2020-5208-lanp-Fix-buffer-overflows-in-get_lan_param_select.patch b/admin/ipmitool/patches/0010-CVE-2020-5208-lanp-Fix-buffer-overflows-in-get_lan_param_select.patch index e7a797077..cf33f9d9d 100644 --- a/admin/ipmitool/patches/0010-CVE-2020-5208-lanp-Fix-buffer-overflows-in-get_lan_param_select.patch +++ b/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 - diff --git a/admin/ipmitool/patches/0011-CVE-2020-5208-fru-sdr-Fix-id_string-buffer-overflows.patch b/admin/ipmitool/patches/0011-CVE-2020-5208-fru-sdr-Fix-id_string-buffer-overflows.patch index 6cc5b7aad..2fd34d186 100644 --- a/admin/ipmitool/patches/0011-CVE-2020-5208-fru-sdr-Fix-id_string-buffer-overflows.patch +++ b/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 - diff --git a/admin/ipmitool/patches/0012-gcc10.patch b/admin/ipmitool/patches/0012-gcc10.patch index e52cb82db..1fba0b79b 100644 --- a/admin/ipmitool/patches/0012-gcc10.patch +++ b/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; diff --git a/admin/netatop/patches/010-daemon-makefile-ldflags.patch b/admin/netatop/patches/010-daemon-makefile-ldflags.patch index 8601da878..5a9adc506 100644 --- a/admin/netatop/patches/010-daemon-makefile-ldflags.patch +++ b/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) diff --git a/admin/schroot/patches/01-openwrt.patch b/admin/schroot/patches/01-openwrt.patch index 9b26b4722..bba637651 100644 --- a/admin/schroot/patches/01-openwrt.patch +++ b/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 diff --git a/admin/sudo/patches/010-cross-compile-fixes.patch b/admin/sudo/patches/010-cross-compile-fixes.patch index 92eceba39..1176727b7 100644 --- a/admin/sudo/patches/010-cross-compile-fixes.patch +++ b/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 diff --git a/admin/sudo/patches/020-no-owner-change.patch b/admin/sudo/patches/020-no-owner-change.patch index ec145488c..374f6b4b8 100644 --- a/admin/sudo/patches/020-no-owner-change.patch +++ b/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 |