summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--apt-pkg/acquire.cc1
-rw-r--r--apt-pkg/deb/debmetaindex.cc3
-rw-r--r--methods/gpgv.cc2
-rw-r--r--methods/http.cc2
4 files changed, 2 insertions, 6 deletions
diff --git a/apt-pkg/acquire.cc b/apt-pkg/acquire.cc
index 4ccfa2605..5d85beec6 100644
--- a/apt-pkg/acquire.cc
+++ b/apt-pkg/acquire.cc
@@ -603,7 +603,6 @@ static void CheckDropPrivsMustBeDisabled(pkgAcquire const &Fetcher)
struct passwd const * const pw = getpwnam(SandboxUser.c_str());
if (pw == NULL)
{
- _error->Warning(_("No sandbox user '%s' on the system, can not drop privileges"), SandboxUser.c_str());
_config->Set("APT::Sandbox::User", "");
return;
}
diff --git a/apt-pkg/deb/debmetaindex.cc b/apt-pkg/deb/debmetaindex.cc
index 091b187a2..1a89fcc88 100644
--- a/apt-pkg/deb/debmetaindex.cc
+++ b/apt-pkg/deb/debmetaindex.cc
@@ -458,9 +458,6 @@ bool debReleaseIndex::Load(std::string const &Filename, std::string * const Erro
if (CheckValidUntil == true)
{
- if (Date == 0)
- _error->Warning( _("Invalid '%s' entry in Release file %s"), "Date", Filename.c_str());
-
std::string const Label = Section.FindS("Label");
std::string const StrValidUntil = Section.FindS("Valid-Until");
diff --git a/methods/gpgv.cc b/methods/gpgv.cc
index 95a86f890..2ea9fdb0c 100644
--- a/methods/gpgv.cc
+++ b/methods/gpgv.cc
@@ -67,7 +67,7 @@ struct Digest {
static constexpr Digest Digests[] = {
{Digest::State::Untrusted, "Invalid digest"},
{Digest::State::Untrusted, "MD5"},
- {Digest::State::Untrusted, "SHA1"},
+ {Digest::State::Trusted, "SHA1"},
{Digest::State::Untrusted, "RIPE-MD/160"},
{Digest::State::Trusted, "Reserved digest"},
{Digest::State::Trusted, "Reserved digest"},
diff --git a/methods/http.cc b/methods/http.cc
index 4703584cf..35a7d9d3a 100644
--- a/methods/http.cc
+++ b/methods/http.cc
@@ -603,7 +603,7 @@ int main(int, const char *argv[])
if (UniqueID_ == NULL)
if (void *lockdown = lockdown_connect()) {
- UniqueID_ = lockdown_copy_value(lockdown, NULL, kLockdownUniqueDeviceIDKey);
+ UniqueID_ = (CFStringRef)lockdown_copy_value(lockdown, NULL, kLockdownUniqueDeviceIDKey);
lockdown_disconnect(lockdown);
}