Переглянути джерело

* 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
* 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
* dpkg-triggers: Deal properly with new package states.

Michael Vogt 19 роки тому
батько
коміт
e43312cf4e

+ 1 - 1
apt-inst/filelist.h

@@ -29,7 +29,7 @@
 #define PKGLIB_FILELIST_H
 
 
-
+#include <cstring>
 #include <apt-pkg/mmap.h>
 
 class pkgFLCache

+ 1 - 1
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;
    }

+ 3 - 1
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"
    									/*}}}*/
 

+ 2 - 0
apt-pkg/contrib/fileutl.cc

@@ -22,6 +22,8 @@
 #include <apti18n.h>
 
 #include <cstdlib>
+#include <cstring>
+
 #include <iostream>
 #include <unistd.h>
 #include <fcntl.h>

+ 1 - 0
apt-pkg/contrib/hashes.h

@@ -20,6 +20,7 @@
 
 #include <algorithm>
 #include <vector>
+#include <cstring>
 
 using std::min;
 using std::vector;

+ 1 - 0
apt-pkg/contrib/md5.cc

@@ -44,6 +44,7 @@
 #include <inttypes.h>
 #include <config.h>
 #include <system.h>
+
 									/*}}}*/
 
 // byteSwap - Swap bytes in a buffer					/*{{{*/

+ 1 - 0
apt-pkg/contrib/md5.h

@@ -25,6 +25,7 @@
 
 
 #include <string>
+#include <cstring>
 #include <algorithm>
 #include <stdint.h>
 

+ 2 - 0
apt-pkg/contrib/mmap.cc

@@ -31,6 +31,8 @@
 #include <sys/stat.h>
 #include <unistd.h>
 #include <fcntl.h>
+
+#include <cstring>
    									/*}}}*/
 
 // MMap::MMap - Constructor						/*{{{*/

+ 1 - 0
apt-pkg/contrib/progress.cc

@@ -16,6 +16,7 @@
 
 #include <iostream>
 #include <stdio.h>
+#include <cstring>
 									/*}}}*/
 
 using namespace std;

+ 1 - 0
apt-pkg/contrib/sha1.h

@@ -15,6 +15,7 @@
 #define APTPKG_SHA1_H
 
 #include <string>
+#include <cstring>
 #include <algorithm>
 
 using std::string;

+ 1 - 0
apt-pkg/contrib/sha256.h

@@ -15,6 +15,7 @@
 #define APTPKG_SHA256_H
 
 #include <string>
+#include <cstring>
 #include <algorithm>
 
 using std::string;

+ 2 - 2
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))

+ 1 - 0
apt-pkg/indexfile.cc

@@ -13,6 +13,7 @@
 #include <apt-pkg/error.h>
 
 #include <clocale>
+#include <cstring>
 									/*}}}*/
 
 // Global list of Item supported

+ 1 - 0
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;

+ 1 - 1
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)

+ 12 - 0
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
 

+ 1 - 0
ftparchive/writer.cc

@@ -28,6 +28,7 @@
 #include <ftw.h>
 #include <fnmatch.h>
 #include <iostream>
+#include <memory>
     
 #include "cachedb.h"
 #include "apt-ftparchive.h"

+ 1 - 1
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

+ 6 - 1
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"