mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-23 16:49:10 -07:00
app-arch/dpkg: remove unused patches
Signed-off-by: Michael Mair-Keimberger <mmk@levelnine.at> Part-of: https://github.com/gentoo/gentoo/pull/42268 Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
committed by
Sam James
parent
eca59aad63
commit
23d5bfec55
@@ -1,11 +0,0 @@
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -182,8 +182,6 @@
|
||||
# Checks for the build machinery.
|
||||
AC_DEFINE([LIBDPKG_VOLATILE_API], [1], [Acknowledge the volatility of the API.])
|
||||
DPKG_COMPILER_WARNINGS
|
||||
-DPKG_COMPILER_OPTIMIZATIONS
|
||||
-DPKG_LINKER_OPTIMIZATIONS
|
||||
DPKG_ARCHITECTURE
|
||||
AC_DEFINE([PACKAGE_RELEASE], [PACKAGE_VERSION " (" ARCHITECTURE ")"],
|
||||
[Define the project release information, version and architecture])
|
||||
@@ -1,32 +0,0 @@
|
||||
https://bugs.gentoo.org/876031
|
||||
https://git.yoctoproject.org/poky/tree/meta/recipes-devtools/dpkg/dpkg/arch_pm.patch
|
||||
|
||||
configure cannot determine the proper cpu, os, or
|
||||
architecture for mips64, and possibly other arch's
|
||||
because of faulty code added to Arch.pm in the latest
|
||||
release from upstream. We remove that code.
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Joe Slater <jslater@windriver.com>
|
||||
|
||||
---
|
||||
scripts/Dpkg/Arch.pm | 3 ---
|
||||
1 file changed, 3 deletions(-)
|
||||
|
||||
diff --git a/scripts/Dpkg/Arch.pm b/scripts/Dpkg/Arch.pm
|
||||
index 1720847b8..6345ce3b9 100644
|
||||
--- a/scripts/Dpkg/Arch.pm
|
||||
+++ b/scripts/Dpkg/Arch.pm
|
||||
@@ -323,9 +323,6 @@ sub _load_tupletable()
|
||||
(my $dt = $debtuple) =~ s/<cpu>/$_cpu/;
|
||||
(my $da = $debarch) =~ s/<cpu>/$_cpu/;
|
||||
|
||||
- next if exists $debarch_to_debtuple{$da}
|
||||
- or exists $debtuple_to_debarch{$dt};
|
||||
-
|
||||
$debarch_to_debtuple{$da} = $dt;
|
||||
$debtuple_to_debarch{$dt} = $da;
|
||||
}
|
||||
--
|
||||
2.11.0
|
||||
@@ -1,45 +0,0 @@
|
||||
From 5356621172d669d8f62e7e746a6c7a11345aec4e Mon Sep 17 00:00:00 2001
|
||||
From: Guillem Jover <guillem@debian.org>
|
||||
Date: Tue, 3 Jan 2023 23:29:05 +0100
|
||||
Subject: dpkg-deb: Fix buffer overflow on long directory names with old deb
|
||||
formats
|
||||
|
||||
The handling for deb 0.x formats that relocates files around once
|
||||
extracted was using a buffer with a hardcoded size, not taking into
|
||||
account the length of the directory which would overflow it.
|
||||
|
||||
Switch to use a dynamically allocated buffer to handle any destination
|
||||
directory length.
|
||||
|
||||
Reported-by: Georgy Yakovlev <gyakovlev@gentoo.org>
|
||||
---
|
||||
src/deb/extract.c | 7 ++++---
|
||||
1 file changed, 4 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/src/deb/extract.c b/src/deb/extract.c
|
||||
index a09853962..6466fa6f2 100644
|
||||
--- a/src/deb/extract.c
|
||||
+++ b/src/deb/extract.c
|
||||
@@ -53,15 +53,16 @@
|
||||
static void
|
||||
movecontrolfiles(const char *dir, const char *thing)
|
||||
{
|
||||
- char buf[200];
|
||||
+ char *cmd;
|
||||
pid_t pid;
|
||||
|
||||
- sprintf(buf, "mv %s/%s/* %s/ && rmdir %s/%s", dir, thing, dir, dir, thing);
|
||||
+ cmd = str_fmt("mv %s/%s/* %s/ && rmdir %s/%s", dir, thing, dir, dir, thing);
|
||||
pid = subproc_fork();
|
||||
if (pid == 0) {
|
||||
- command_shell(buf, _("shell command to move files"));
|
||||
+ command_shell(cmd, _("shell command to move files"));
|
||||
}
|
||||
subproc_reap(pid, _("shell command to move files"), 0);
|
||||
+ free(cmd);
|
||||
}
|
||||
|
||||
static void DPKG_ATTR_NORET
|
||||
--
|
||||
cgit v1.2.3
|
||||
|
||||
@@ -1,63 +0,0 @@
|
||||
https://git.dpkg.org/cgit/dpkg/dpkg.git/commit/?id=fc7bda93992086e01b62d08fa5ca2b70a69b62aa
|
||||
|
||||
From fc7bda93992086e01b62d08fa5ca2b70a69b62aa Mon Sep 17 00:00:00 2001
|
||||
From: Guillem Jover <guillem@debian.org>
|
||||
Date: Tue, 3 Dec 2024 02:40:48 +0100
|
||||
Subject: Dpkg::OpenPGP::Backend::Sequoia: Adapt to new CLI 0.40.0 API
|
||||
|
||||
As the API is not yet stable (but it is getting closer to be), we
|
||||
need to adapt it to the current version.
|
||||
---
|
||||
scripts/Dpkg/OpenPGP/Backend/Sequoia.pm | 11 ++++++-----
|
||||
2 files changed, 8 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/scripts/Dpkg/OpenPGP/Backend/Sequoia.pm b/scripts/Dpkg/OpenPGP/Backend/Sequoia.pm
|
||||
index 36801c9f5..82c64591c 100644
|
||||
--- a/scripts/Dpkg/OpenPGP/Backend/Sequoia.pm
|
||||
+++ b/scripts/Dpkg/OpenPGP/Backend/Sequoia.pm
|
||||
@@ -69,7 +69,7 @@ sub armor
|
||||
return OPENPGP_MISSING_CMD unless $self->{cmd};
|
||||
|
||||
# We ignore the $type, and let "sq" handle this automatically.
|
||||
- my $rc = $self->_sq_exec(qw(toolbox armor --output), $out, $in);
|
||||
+ my $rc = $self->_sq_exec(qw(packet armor --output), $out, $in);
|
||||
return OPENPGP_BAD_DATA if $rc;
|
||||
return OPENPGP_OK;
|
||||
}
|
||||
@@ -81,7 +81,7 @@ sub dearmor
|
||||
return OPENPGP_MISSING_CMD unless $self->{cmd};
|
||||
|
||||
# We ignore the $type, and let "sq" handle this automatically.
|
||||
- my $rc = $self->_sq_exec(qw(toolbox dearmor --output), $out, $in);
|
||||
+ my $rc = $self->_sq_exec(qw(packet dearmor --output), $out, $in);
|
||||
return OPENPGP_BAD_DATA if $rc;
|
||||
return OPENPGP_OK;
|
||||
}
|
||||
@@ -93,6 +93,7 @@ sub inline_verify
|
||||
return OPENPGP_MISSING_CMD unless $self->{cmd};
|
||||
|
||||
my @opts;
|
||||
+ push @opts, '--cleartext';
|
||||
push @opts, map { ('--signer-file', $_) } @certs;
|
||||
push @opts, '--output', $data if defined $data;
|
||||
|
||||
@@ -109,7 +110,7 @@ sub verify
|
||||
|
||||
my @opts;
|
||||
push @opts, map { ('--signer-file', $_) } @certs;
|
||||
- push @opts, '--detached', $sig;
|
||||
+ push @opts, '--signature-file', $sig;
|
||||
|
||||
my $rc = $self->_sq_exec(qw(verify), @opts, $data);
|
||||
return OPENPGP_NO_SIG if $rc;
|
||||
@@ -124,7 +125,7 @@ sub inline_sign
|
||||
return OPENPGP_NEEDS_KEYSTORE if $key->needs_keystore();
|
||||
|
||||
my @opts;
|
||||
- push @opts, '--cleartext-signature';
|
||||
+ push @opts, '--cleartext';
|
||||
push @opts, '--signer-file', $key->handle;
|
||||
push @opts, '--output', $inlinesigned;
|
||||
|
||||
--
|
||||
cgit v1.2.3
|
||||
Reference in New Issue
Block a user