diff options
| -rw-r--r-- | apt-pkg/acquire-method.h | 1 | ||||
| -rw-r--r-- | apt-pkg/acquire-worker.h | 5 | ||||
| -rw-r--r-- | apt-pkg/contrib/macros.h | 2 | ||||
| -rw-r--r-- | apt-pkg/deb/dpkgpm.cc | 23 | ||||
| -rw-r--r-- | debian/changelog | 16 | ||||
| -rw-r--r-- | debian/control | 2 | ||||
| -rw-r--r-- | debian/libapt-pkg4.15.install.in (renamed from debian/libapt-pkg4.14.install.in) | 0 | ||||
| -rw-r--r-- | debian/libapt-pkg4.15.symbols (renamed from debian/libapt-pkg4.14.symbols) | 0 | ||||
| -rw-r--r-- | doc/examples/configure-index | 4 |
9 files changed, 47 insertions, 6 deletions
diff --git a/apt-pkg/acquire-method.h b/apt-pkg/acquire-method.h index 48bd95672..399454892 100644 --- a/apt-pkg/acquire-method.h +++ b/apt-pkg/acquire-method.h @@ -44,6 +44,7 @@ class pkgAcqMethod std::string Uri; std::string DestFile; + int DestFileFd; time_t LastModified; bool IndexFile; bool FailIgnore; diff --git a/apt-pkg/acquire-worker.h b/apt-pkg/acquire-worker.h index 67aee4b59..db8889c8e 100644 --- a/apt-pkg/acquire-worker.h +++ b/apt-pkg/acquire-worker.h @@ -101,6 +101,11 @@ class pkgAcquire::Worker : public WeakPointable */ int OutFd; + /** \brief The socket to send SCM_RIGHTS message through + */ + int PrivSepSocketFd; + int PrivSepSocketFdChild; + /** \brief Set to \b true if the worker is in a state in which it * might generate data or command responses. * diff --git a/apt-pkg/contrib/macros.h b/apt-pkg/contrib/macros.h index a0573398d..3a5e37c63 100644 --- a/apt-pkg/contrib/macros.h +++ b/apt-pkg/contrib/macros.h @@ -138,7 +138,7 @@ // Non-ABI-Breaks should only increase RELEASE number. // See also buildlib/libversion.mak #define APT_PKG_MAJOR 4 -#define APT_PKG_MINOR 14 +#define APT_PKG_MINOR 15 #define APT_PKG_RELEASE 0 #endif diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc index 95fae9a28..0cded32e1 100644 --- a/apt-pkg/deb/dpkgpm.cc +++ b/apt-pkg/deb/dpkgpm.cc @@ -55,6 +55,18 @@ using namespace std; +APT_PURE static unsigned int +EnvironmentSize() +{ + unsigned int size = 0; + char **envp = environ; + + while (*envp != NULL) + size += strlen (*envp++) + 1; + + return size; +} + class pkgDPkgPMPrivate { public: @@ -1230,8 +1242,15 @@ bool pkgDPkgPM::Go(APT::Progress::PackageManager *progress) fd_set rfds; struct timespec tv; - unsigned int const MaxArgs = _config->FindI("Dpkg::MaxArgs",8*1024); - unsigned int const MaxArgBytes = _config->FindI("Dpkg::MaxArgBytes",32*1024); + // FIXME: do we really need this limit when we have MaxArgBytes? + unsigned int const MaxArgs = _config->FindI("Dpkg::MaxArgs",32*1024); + + // try to figure out the max environment size + int OSArgMax = sysconf(_SC_ARG_MAX); + if(OSArgMax < 0) + OSArgMax = 32*1024; + OSArgMax -= EnvironmentSize() - 2*1024; + unsigned int const MaxArgBytes = _config->FindI("Dpkg::MaxArgBytes", OSArgMax); bool const NoTriggers = _config->FindB("DPkg::NoTriggers", false); if (RunScripts("DPkg::Pre-Invoke") == false) diff --git a/debian/changelog b/debian/changelog index 2b3d739b4..a196ed5e7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -213,6 +213,22 @@ apt (1.1~exp1) experimental; urgency=low -- Michael Vogt <mvo@debian.org> Thu, 19 Jun 2014 12:01:48 +0200 +apt (1.0.9.3) unstable; urgency=medium + + [ josch ] + * implement the updated build profile spec + + [ Michael Vogt ] + * methods/rsh.cc: replace strcat with std::string (Closes: #76442) + + [ Guillem Jover ] + * Update Status field values handling + + [ David Kalnischkies ] + * don't cleanup cdrom files in apt-get update (Closes: 765458) + + -- Michael Vogt <mvo@debian.org> Wed, 15 Oct 2014 19:49:38 +0200 + apt (1.0.9.2) unstable; urgency=medium [ Michael Vogt ] diff --git a/debian/control b/debian/control index 0ff611dcd..8c3eea3f1 100644 --- a/debian/control +++ b/debian/control @@ -38,7 +38,7 @@ Description: commandline package manager * apt-config as an interface to the configuration settings * apt-key as an interface to manage authentication keys -Package: libapt-pkg4.14 +Package: libapt-pkg4.15 Architecture: any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} diff --git a/debian/libapt-pkg4.14.install.in b/debian/libapt-pkg4.15.install.in index 56bed39d3..56bed39d3 100644 --- a/debian/libapt-pkg4.14.install.in +++ b/debian/libapt-pkg4.15.install.in diff --git a/debian/libapt-pkg4.14.symbols b/debian/libapt-pkg4.15.symbols index e2efc57f6..e2efc57f6 100644 --- a/debian/libapt-pkg4.14.symbols +++ b/debian/libapt-pkg4.15.symbols diff --git a/doc/examples/configure-index b/doc/examples/configure-index index 2925733d7..ef1ae056d 100644 --- a/doc/examples/configure-index +++ b/doc/examples/configure-index @@ -414,8 +414,8 @@ DPkg FlushSTDIN "true"; // Control the size of the command line passed to dpkg. - MaxBytes 1024; - MaxArgs 350; + MaxArgBytes 32768; + MaxArgs 8192; // controls if apt will apport on the first dpkg error or if it // tries to install as many packages as possible |