summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--apt-inst/filelist.h2
-rw-r--r--apt-pkg/acquire.cc2
-rw-r--r--apt-pkg/contrib/error.cc4
-rw-r--r--apt-pkg/contrib/fileutl.cc2
-rw-r--r--apt-pkg/contrib/hashes.h1
-rw-r--r--apt-pkg/contrib/md5.cc1
-rw-r--r--apt-pkg/contrib/md5.h1
-rw-r--r--apt-pkg/contrib/mmap.cc2
-rw-r--r--apt-pkg/contrib/progress.cc1
-rw-r--r--apt-pkg/contrib/sha1.h1
-rw-r--r--apt-pkg/contrib/sha256.h1
-rw-r--r--apt-pkg/deb/dpkgpm.cc4
-rw-r--r--apt-pkg/indexfile.cc1
-rw-r--r--apt-pkg/pkgsystem.cc1
-rw-r--r--configure.in2
-rw-r--r--debian/changelog12
-rw-r--r--ftparchive/writer.cc1
-rw-r--r--test/fake-status2
-rwxr-xr-xtest/pre-upload-check.py7
19 files changed, 40 insertions, 8 deletions
diff --git a/apt-inst/filelist.h b/apt-inst/filelist.h
index 86766254f..c74a310e4 100644
--- a/apt-inst/filelist.h
+++ b/apt-inst/filelist.h
@@ -29,7 +29,7 @@
#define PKGLIB_FILELIST_H
-
+#include <cstring>
#include <apt-pkg/mmap.h>
class pkgFLCache
diff --git a/apt-pkg/acquire.cc b/apt-pkg/acquire.cc
index cbd67055d..6840ae120 100644
--- a/apt-pkg/acquire.cc
+++ b/apt-pkg/acquire.cc
@@ -619,7 +619,7 @@ bool pkgAcquire::Queue::Startup()
added other source retry to have cycle maintain a pipeline depth
on its own. */
if (Cnf->Pipeline == true)
- MaxPipeDepth = 10;
+ MaxPipeDepth = 1000;
else
MaxPipeDepth = 1;
}
diff --git a/apt-pkg/contrib/error.cc b/apt-pkg/contrib/error.cc
index 8c2d6cb19..db8c53c36 100644
--- a/apt-pkg/contrib/error.cc
+++ b/apt-pkg/contrib/error.cc
@@ -19,10 +19,12 @@
#include <iostream>
#include <errno.h>
#include <stdio.h>
-#include <string>
#include <stdarg.h>
#include <unistd.h>
+#include <string>
+#include <cstring>
+
#include "config.h"
/*}}}*/
diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc
index d19a92e62..9e13b4f60 100644
--- a/apt-pkg/contrib/fileutl.cc
+++ b/apt-pkg/contrib/fileutl.cc
@@ -22,6 +22,8 @@
#include <apti18n.h>
#include <cstdlib>
+#include <cstring>
+
#include <iostream>
#include <unistd.h>
#include <fcntl.h>
diff --git a/apt-pkg/contrib/hashes.h b/apt-pkg/contrib/hashes.h
index 93e7b25d9..264f7fe90 100644
--- a/apt-pkg/contrib/hashes.h
+++ b/apt-pkg/contrib/hashes.h
@@ -20,6 +20,7 @@
#include <algorithm>
#include <vector>
+#include <cstring>
using std::min;
using std::vector;
diff --git a/apt-pkg/contrib/md5.cc b/apt-pkg/contrib/md5.cc
index 44242371a..a095f8f0f 100644
--- a/apt-pkg/contrib/md5.cc
+++ b/apt-pkg/contrib/md5.cc
@@ -44,6 +44,7 @@
#include <inttypes.h>
#include <config.h>
#include <system.h>
+
/*}}}*/
// byteSwap - Swap bytes in a buffer /*{{{*/
diff --git a/apt-pkg/contrib/md5.h b/apt-pkg/contrib/md5.h
index 247b3fab9..96c8975b4 100644
--- a/apt-pkg/contrib/md5.h
+++ b/apt-pkg/contrib/md5.h
@@ -25,6 +25,7 @@
#include <string>
+#include <cstring>
#include <algorithm>
#include <stdint.h>
diff --git a/apt-pkg/contrib/mmap.cc b/apt-pkg/contrib/mmap.cc
index 88e71e8e3..7f814c2d2 100644
--- a/apt-pkg/contrib/mmap.cc
+++ b/apt-pkg/contrib/mmap.cc
@@ -31,6 +31,8 @@
#include <sys/stat.h>
#include <unistd.h>
#include <fcntl.h>
+
+#include <cstring>
/*}}}*/
// MMap::MMap - Constructor /*{{{*/
diff --git a/apt-pkg/contrib/progress.cc b/apt-pkg/contrib/progress.cc
index 6ce6e950a..cffdddc4f 100644
--- a/apt-pkg/contrib/progress.cc
+++ b/apt-pkg/contrib/progress.cc
@@ -16,6 +16,7 @@
#include <iostream>
#include <stdio.h>
+#include <cstring>
/*}}}*/
using namespace std;
diff --git a/apt-pkg/contrib/sha1.h b/apt-pkg/contrib/sha1.h
index 010ef802e..8ddd889f1 100644
--- a/apt-pkg/contrib/sha1.h
+++ b/apt-pkg/contrib/sha1.h
@@ -15,6 +15,7 @@
#define APTPKG_SHA1_H
#include <string>
+#include <cstring>
#include <algorithm>
using std::string;
diff --git a/apt-pkg/contrib/sha256.h b/apt-pkg/contrib/sha256.h
index c490bfa4d..1951f053b 100644
--- a/apt-pkg/contrib/sha256.h
+++ b/apt-pkg/contrib/sha256.h
@@ -15,6 +15,7 @@
#define APTPKG_SHA256_H
#include <string>
+#include <cstring>
#include <algorithm>
using std::string;
diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc
index 8b4e6701a..7e1933f06 100644
--- a/apt-pkg/deb/dpkgpm.cc
+++ b/apt-pkg/deb/dpkgpm.cc
@@ -844,7 +844,7 @@ bool pkgDPkgPM::Go(int OutStatusFd)
tv.tv_sec = 1;
tv.tv_usec = 0;
select_ret = select(max(master, _dpkgin)+1, &rfds, NULL, NULL, &tv);
- if (select_ret == 0)
+ if (select_ret == 0)
continue;
else if (select_ret < 0 && errno == EINTR)
continue;
@@ -853,7 +853,7 @@ bool pkgDPkgPM::Go(int OutStatusFd)
perror("select() returned error");
continue;
}
-
+
if(master >= 0 && FD_ISSET(master, &rfds))
DoTerminalPty(master);
if(master >= 0 && FD_ISSET(0, &rfds))
diff --git a/apt-pkg/indexfile.cc b/apt-pkg/indexfile.cc
index ca11fc111..cf238eb4a 100644
--- a/apt-pkg/indexfile.cc
+++ b/apt-pkg/indexfile.cc
@@ -13,6 +13,7 @@
#include <apt-pkg/error.h>
#include <clocale>
+#include <cstring>
/*}}}*/
// Global list of Item supported
diff --git a/apt-pkg/pkgsystem.cc b/apt-pkg/pkgsystem.cc
index eee19e35c..6dd2d3ee4 100644
--- a/apt-pkg/pkgsystem.cc
+++ b/apt-pkg/pkgsystem.cc
@@ -13,6 +13,7 @@
#include <apt-pkg/pkgsystem.h>
#include <apt-pkg/policy.h>
#include <cassert>
+#include <cstring>
/*}}}*/
pkgSystem *_system = 0;
diff --git a/configure.in b/configure.in
index 736706c0c..355129dea 100644
--- a/configure.in
+++ b/configure.in
@@ -18,7 +18,7 @@ AC_CONFIG_AUX_DIR(buildlib)
AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in)
dnl -- SET THIS TO THE RELEASE VERSION --
-AC_DEFINE_UNQUOTED(VERSION,"0.7.6ubuntu8")
+AC_DEFINE_UNQUOTED(VERSION,"0.7.6ubuntu9")
PACKAGE="apt"
AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
AC_SUBST(PACKAGE)
diff --git a/debian/changelog b/debian/changelog
index e34dc385b..d60a61d27 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,10 @@ apt (0.7.6ubuntu9) gutsy; urgency=low
* apt-pkg/deb/dpkgpm.cc:
- fix progress reporting precent calculation (LP: #137798)
+ * apt-pkg/acquire.cc:
+ - increase MaxPipeDepth for the internal worker<->method
+ communication to 1000 for the debtorrent backend
+ * make apt build with g++ 4.3
-- Michael Vogt <michael.vogt@ubuntu.com> Mon, 10 Sep 2007 14:57:53 +0200
@@ -67,6 +71,7 @@ apt (0.7.6ubuntu2) gutsy; urgency=low
apt (0.7.6ubuntu1) gutsy; urgency=low
+ [ Michael Vogt ]
* apt-inst/contrib/extracttar.cc:
- fix fd leak for zero size files (thanks to Bill Broadley for
reporting this bug)
@@ -90,6 +95,13 @@ apt (0.7.6ubuntu1) gutsy; urgency=low
- increase default mmap size
* tests/local-repo:
- added local repository testcase
+ * apt-pkg/acquire.cc:
+ - increase MaxPipeDepth for the internal worker<->method
+ communication to 1000 for the debtorrent backend
+ * make apt build with g++ 4.3
+
+ [ Ian Jackson ]
+ * dpkg-triggers: Deal properly with new package states.
-- Michael Vogt <michael.vogt@ubuntu.com> Thu, 02 Aug 2007 11:55:54 +0200
diff --git a/ftparchive/writer.cc b/ftparchive/writer.cc
index 59107e02b..9d248ab86 100644
--- a/ftparchive/writer.cc
+++ b/ftparchive/writer.cc
@@ -28,6 +28,7 @@
#include <ftw.h>
#include <fnmatch.h>
#include <iostream>
+#include <memory>
#include "cachedb.h"
#include "apt-ftparchive.h"
diff --git a/test/fake-status b/test/fake-status
index e1f5c1f36..9e6366d5b 100644
--- a/test/fake-status
+++ b/test/fake-status
@@ -4,7 +4,7 @@ Priority: optional
Section: libs
Installed-Size: 1376
Maintainer: Ubuntu Desktop Team <ubuntu-desktop@lists.ubuntu.com>
-Architecture: amd64
+Architecture: all
Source: glib2.0
Version: 2.13.7-1ubuntu1
Description: The GLib library of C routines
diff --git a/test/pre-upload-check.py b/test/pre-upload-check.py
index 8131d891e..2199c598a 100755
--- a/test/pre-upload-check.py
+++ b/test/pre-upload-check.py
@@ -15,7 +15,12 @@ apt_args = [] # ["-o","Debug::pkgAcquire::Auth=true"]
class testAuthentication(unittest.TestCase):
-
+ """
+ test if the authentication is working, the repository
+ of the test-data can be found here:
+ bzr get http://people.ubuntu.com/~mvo/bzr/apt/apt-auth-test-suit/
+ """
+
# some class wide data
apt = "apt-get"
pkg = "libglib2.0-data"
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-02 15:42:51 +0000