summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--apt-pkg/contrib/configuration.cc5
-rw-r--r--apt-pkg/contrib/strutl.h1
-rw-r--r--apt-pkg/depcache.cc3
-rw-r--r--apt-pkg/depcache.h1
-rw-r--r--apt-pkg/pkgcachegen.h2
-rw-r--r--debian/changelog9
-rw-r--r--debian/control2
7 files changed, 17 insertions, 6 deletions
diff --git a/apt-pkg/contrib/configuration.cc b/apt-pkg/contrib/configuration.cc
index c60ad3b0a..7914bd07b 100644
--- a/apt-pkg/contrib/configuration.cc
+++ b/apt-pkg/contrib/configuration.cc
@@ -422,6 +422,7 @@ bool Configuration::ExistsAny(const char *Name) const
string key = Name;
if (key.size() > 2 && key.end()[-2] == '/')
+ {
if (key.find_first_of("fdbi",key.size()-1) < key.size())
{
key.resize(key.size() - 2);
@@ -432,7 +433,7 @@ bool Configuration::ExistsAny(const char *Name) const
{
_error->Warning(_("Unrecognized type abbreviation: '%c'"), key.end()[-3]);
}
-
+ }
return Exists(Name);
}
/*}}}*/
@@ -506,7 +507,7 @@ bool ReadConfigFile(Configuration &Conf,const string &FName,bool AsSectional,
CurLine++;
// This should be made to work instead, but this is better than looping
if (F.fail() && !F.eof())
- return _error->Error(_("Line %d too long (max %d)"), CurLine, sizeof(Buffer));
+ return _error->Error(_("Line %d too long (max %lu)"), CurLine, sizeof(Buffer));
_strtabexpand(Buffer,sizeof(Buffer));
_strstrip(Buffer);
diff --git a/apt-pkg/contrib/strutl.h b/apt-pkg/contrib/strutl.h
index ae1244ecd..53146ced7 100644
--- a/apt-pkg/contrib/strutl.h
+++ b/apt-pkg/contrib/strutl.h
@@ -20,6 +20,7 @@
#include <stdlib.h>
#include <string>
+#include <cstring>
#include <vector>
#include <iostream>
#include <time.h>
diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc
index fe981ea76..50a75843f 100644
--- a/apt-pkg/depcache.cc
+++ b/apt-pkg/depcache.cc
@@ -216,7 +216,6 @@ bool pkgDepCache::writeStateFile(OpProgress *prog, bool InstalledOnly)
pkgCache::PkgIterator pkg=Cache->FindPkg(pkgname);
if(pkg.end() || pkg.VersionList().end())
continue;
- bool oldAuto = section.FindI("Auto-Installed");
bool newAuto = (PkgState[pkg->ID].Flags & Flag::Auto);
if(_config->FindB("Debug::pkgAutoRemove",false))
std::clog << "Update exisiting AutoInstall info: "
@@ -1150,7 +1149,7 @@ bool pkgDepCache::Policy::IsImportantDep(DepIterator Dep)
string s = _config->Find("APT::Install-Recommends-Section","");
if(s.size() > 0)
{
- const char *sec = Dep.TargetPkg().Section();
+ const char *sec = Dep.ParentVer().Section();
if (sec && strcmp(sec, s.c_str()) == 0)
return true;
}
diff --git a/apt-pkg/depcache.h b/apt-pkg/depcache.h
index 84fed7f37..7adf6fe7f 100644
--- a/apt-pkg/depcache.h
+++ b/apt-pkg/depcache.h
@@ -45,6 +45,7 @@
#include <regex.h>
#include <vector>
+#include <memory>
class pkgDepCache : protected pkgCache::Namespace
{
diff --git a/apt-pkg/pkgcachegen.h b/apt-pkg/pkgcachegen.h
index a47b097b3..b6715294a 100644
--- a/apt-pkg/pkgcachegen.h
+++ b/apt-pkg/pkgcachegen.h
@@ -51,7 +51,7 @@ class pkgCacheGenerator
// Flag file dependencies
bool FoundFileDeps;
- bool NewPackage(pkgCache::PkgIterator &Pkg,const string &Pkg);
+ bool NewPackage(pkgCache::PkgIterator &Pkg,const string &PkgName);
bool NewFileVer(pkgCache::VerIterator &Ver,ListParser &List);
bool NewFileDesc(pkgCache::DescIterator &Desc,ListParser &List);
unsigned long NewVersion(pkgCache::VerIterator &Ver,const string &VerStr,unsigned long Next);
diff --git a/debian/changelog b/debian/changelog
index 41609bd74..ea8113e95 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+apt (0.7.3) unstable; urgency=low
+
+ * fixed compile errors with g++ 7.3 (thanks to
+ Daniel Burrows, closes: #429378)
+ * fix FTFBFS by changing build-depends to
+ libcurl4-gnutls-dev (closes: #428363)
+
+ --
+
apt (0.7.2) unstable; urgency=low
* merged the debian/experimental changes back
diff --git a/debian/control b/debian/control
index 5686926d4..760c0176f 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: important
Maintainer: APT Development Team <deity@lists.debian.org>
Uploaders: Jason Gunthorpe <jgg@debian.org>, Adam Heath <doogie@debian.org>, Matt Zimmerman <mdz@debian.org>, Michael Vogt <mvo@debian.org>
Standards-Version: 3.7.2.2
-Build-Depends: debhelper (>= 5.0), libdb4.4-dev, gettext (>= 0.12), libcurl3-gnutls-dev (>= 7.15.5)
+Build-Depends: debhelper (>= 5.0), libdb4.4-dev, gettext (>= 0.12), libcurl4-gnutls-dev (>= 7.15.5)
Build-Depends-Indep: debiandoc-sgml, docbook-utils (>= 0.6.12-1)
XS-Vcs-Bzr: http://bzr.debian.org/apt/debian-sid/