diff options
| author | Sam Bingner <sam@bingner.com> | 2018-12-26 15:34:06 -1000 |
|---|---|---|
| committer | Sam Bingner <sam@bingner.com> | 2018-12-26 15:35:01 -1000 |
| commit | 9d801c75cdf8e48a8013257c684c7702806dde6c (patch) | |
| tree | b9321de82a963b64f8e88081737cd182ea059e29 | |
| parent | 59c3e0b998fd69532159d8dc416109cf50651482 (diff) | |
| parent | f05c3233c311d40bb9f2ef65888aa7ce574a334b (diff) | |
Merge bingner.com:apt1.4.8+iPhone-1
| -rw-r--r-- | apt-pkg/acquire.cc | 1 | ||||
| -rw-r--r-- | apt-pkg/contrib/fileutl.cc | 2 | ||||
| -rw-r--r-- | apt-pkg/deb/debmetaindex.cc | 3 | ||||
| -rw-r--r-- | methods/gpgv.cc | 2 | ||||
| -rw-r--r-- | methods/http.cc | 2 |
5 files changed, 3 insertions, 7 deletions
diff --git a/apt-pkg/acquire.cc b/apt-pkg/acquire.cc index 3f7f2bbf0..8df7a3239 100644 --- a/apt-pkg/acquire.cc +++ b/apt-pkg/acquire.cc @@ -609,7 +609,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/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc index a90cd647a..e4038c39c 100644 --- a/apt-pkg/contrib/fileutl.cc +++ b/apt-pkg/contrib/fileutl.cc @@ -2949,7 +2949,7 @@ static std::string APT_NONNULL(1) GetTempDirEnv(char const * const env) /*{{{*/ stat(tmpdir, &st) != 0 || (st.st_mode & S_IFDIR) == 0) // exists and is directory tmpdir = "/tmp"; else if (geteuid() != 0 && // root can do everything anyway - faccessat(AT_FDCWD, tmpdir, R_OK | W_OK | X_OK, AT_EACCESS) != 0) // current user has rwx access to directory + access(tmpdir, R_OK | W_OK | X_OK) != 0) // current user has rwx access to directory tmpdir = "/tmp"; return string(tmpdir); diff --git a/apt-pkg/deb/debmetaindex.cc b/apt-pkg/deb/debmetaindex.cc index 7d2eb313b..f25906fba 100644 --- a/apt-pkg/deb/debmetaindex.cc +++ b/apt-pkg/deb/debmetaindex.cc @@ -461,9 +461,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 51c268d02..83135c220 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 72e813cb9..9549b23ac 100644 --- a/methods/http.cc +++ b/methods/http.cc @@ -599,7 +599,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); } |