* removed the URL-Reamp hack (we have pdiff support in the main archive now), removed...

diff --git a/apt-pkg/acquire.cc b/apt-pkg/acquire.cc
index 47655af80f80229bdcd565d26ac73fb87b2cd62a..62209e65b2140907cc3af428b7482037a62b44e3 100644 (file)
--- a/apt-pkg/acquire.cc
+++ b/apt-pkg/acquire.cc
@@ -267,10 +267,6 @@ pkgAcquire::MethodConfig *pkgAcquire::GetConfig(string Access)
    if (Work.Start() == false)
       return 0;
    
    if (Work.Start() == false)
       return 0;
    

-   /* if a method uses DownloadLimit, we switch to SingleInstance mode */
-   if(_config->FindI("Acquire::"+Access+"::DlLimit",0) > 0)
-      Conf->SingleInstance = true;
-   

    return Conf;
 }
                                                                        /*}}}*/
    return Conf;
 }
                                                                        /*}}}*/

diff --git a/apt-pkg/deb/debindexfile.cc b/apt-pkg/deb/debindexfile.cc
index b3b77dad71e1021e62e5774191984e9ea5f203a5..ff8bce85d1f036c260c53af050f061df22bb3188 100644 (file)
--- a/apt-pkg/deb/debindexfile.cc
+++ b/apt-pkg/deb/debindexfile.cc
@@ -158,17 +158,6 @@ debPackagesIndex::debPackagesIndex(string URI,string Dist,string Section,bool Tr
 {
 }
                                                                        /*}}}*/
 {
 }
                                                                        /*}}}*/

-
-string debPackagesIndex::ArchiveURI(string File) const
-{
-   // FIXME: EVIL! Remove as soon as pdiff support is offical
-   string remap = _config->Find("APT::URL-Remap::"+URI,"");
-   if(!remap.empty())
-      return remap+File;
-
-   return URI + File;
-}
-

 // PackagesIndex::ArchiveInfo - Short version of the archive url       /*{{{*/
 // ---------------------------------------------------------------------
 /* This is a shorter version that is designed to be < 60 chars or so */
 // PackagesIndex::ArchiveInfo - Short version of the archive url       /*{{{*/
 // ---------------------------------------------------------------------
 /* This is a shorter version that is designed to be < 60 chars or so */

diff --git a/apt-pkg/deb/debindexfile.h b/apt-pkg/deb/debindexfile.h
index 48a345adfb175487441caf077dda4317f36244f9..a1b9583a44bb19070da01ef9cd3ed7a3475c2262 100644 (file)
--- a/apt-pkg/deb/debindexfile.h
+++ b/apt-pkg/deb/debindexfile.h
@@ -59,7 +59,7 @@ class debPackagesIndex : public pkgIndexFile
 
    // Stuff for accessing files on remote items
    virtual string ArchiveInfo(pkgCache::VerIterator Ver) const;
 
    // Stuff for accessing files on remote items
    virtual string ArchiveInfo(pkgCache::VerIterator Ver) const;

-   virtual string ArchiveURI(string File) const;
+   virtual string ArchiveURI(string File) const {return URI + File;};

    
    // Interface for acquire
    virtual string Describe(bool Short) const;   
    
    // Interface for acquire
    virtual string Describe(bool Short) const;   

diff --git a/debian/rules b/debian/rules
index 40f5add37fc76fece1c17a555a9e39afbecb0fc6..cd026b4a4ad34e439930a5b157b45537d5c86beb 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -36,7 +36,7 @@ endif
 # Default rule
 build:
 
 # Default rule
 build:
 

-DEB_BUILD_PROG:=debuild --preserve-envvar PATH --preserve-envvar CCACHE_DIR -us -uc $(DEBUILD_DPKG_BUILDPACKAGE_OPTS)
+DEB_BUILD_PROG:=debuild --preserve-envvar PATH --preserve-envvar CCACHE_DIR -us -uc $(DEB_BUILD_PROG_OPTS)

 APT_DEBVER=$(shell dpkg-parsechangelog |sed -n -e '/^Version:/s/^Version: //p')
 APT_CONFVER=$(shell sed -n -e 's/^AC_DEFINE_UNQUOTED(VERSION,"\(.*\)")/\1/p' configure.in)
 APT_CVSTAG=$(shell echo "$(APT_DEBVER)" | sed -e 's/^/v/' -e 's/\./_/g')
 APT_DEBVER=$(shell dpkg-parsechangelog |sed -n -e '/^Version:/s/^Version: //p')
 APT_CONFVER=$(shell sed -n -e 's/^AC_DEFINE_UNQUOTED(VERSION,"\(.*\)")/\1/p' configure.in)
 APT_CVSTAG=$(shell echo "$(APT_DEBVER)" | sed -e 's/^/v/' -e 's/\./_/g')

diff --git a/methods/http.cc b/methods/http.cc
index 2ec1fe63164a84e75f64d36c7e1f748d531f272c..e2337a9ba3459d1110a15e98a5f5c4591fa1c8fc 100644 (file)
--- a/methods/http.cc
+++ b/methods/http.cc
@@ -59,11 +59,6 @@ unsigned long TimeOut = 120;
 bool Debug = false;
 
 
 bool Debug = false;
 
 

-unsigned long CircleBuf::BwReadLimit=0;
-unsigned long CircleBuf::BwTickReadData=0;
-struct timeval CircleBuf::BwReadTick={0,0};
-const unsigned int CircleBuf::BW_HZ=10;
-  

 // CircleBuf::CircleBuf - Circular input buffer                                /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 // CircleBuf::CircleBuf - Circular input buffer                                /*{{{*/
 // ---------------------------------------------------------------------
 /* */


@@ -71,8 +66,6 @@ CircleBuf::CircleBuf(unsigned long Size) : Size(Size), Hash(0)
 {
    Buf = new unsigned char[Size];
    Reset();
 {
    Buf = new unsigned char[Size];
    Reset();

-
-   CircleBuf::BwReadLimit = _config->FindI("Acquire::http::DlLimit",0)*1024;

 }
                                                                        /*}}}*/
 // CircleBuf::Reset - Reset to the default state                       /*{{{*/
 }
                                                                        /*}}}*/
 // CircleBuf::Reset - Reset to the default state                       /*{{{*/


@@ -98,45 +91,16 @@ void CircleBuf::Reset()
    is non-blocking.. */
 bool CircleBuf::Read(int Fd)
 {
    is non-blocking.. */
 bool CircleBuf::Read(int Fd)
 {

-   unsigned long BwReadMax;
-

    while (1)
    {
       // Woops, buffer is full
       if (InP - OutP == Size)
         return true;
 
    while (1)
    {
       // Woops, buffer is full
       if (InP - OutP == Size)
         return true;
 

-      // what's left to read in this tick
-      BwReadMax = CircleBuf::BwReadLimit/BW_HZ;
-
-      if(CircleBuf::BwReadLimit) {
-        struct timeval now;
-        gettimeofday(&now,0);
-
-        unsigned long d = (now.tv_sec-CircleBuf::BwReadTick.tv_sec)*1000000 +
-           now.tv_usec-CircleBuf::BwReadTick.tv_usec;
-        if(d > 1000000/BW_HZ) {
-           CircleBuf::BwReadTick = now;
-           CircleBuf::BwTickReadData = 0;
-        } 
-        
-        if(CircleBuf::BwTickReadData >= BwReadMax) {
-           usleep(1000000/BW_HZ);
-           return true;
-        }
-      }
-

       // Write the buffer segment
       int Res;
       // Write the buffer segment
       int Res;

-      if(CircleBuf::BwReadLimit) {
-        Res = read(Fd,Buf + (InP%Size), 
-                   BwReadMax > LeftRead() ? LeftRead() : BwReadMax);
-      } else
-        Res = read(Fd,Buf + (InP%Size),LeftRead());
+      Res = read(Fd,Buf + (InP%Size),LeftRead());

       
       

-      if(Res > 0 && BwReadLimit > 0) 
-        CircleBuf::BwTickReadData += Res;
-    

       if (Res == 0)
         return false;
       if (Res < 0)
       if (Res == 0)
         return false;
       if (Res < 0)

diff --git a/methods/http.h b/methods/http.h
index 541e2952cb5fdf540f31129e99ad7e499fc074ef..c5a4d0e86a1f9967ed2f573eb9bb508b95646dd4 100644 (file)
--- a/methods/http.h
+++ b/methods/http.h
@@ -31,11 +31,6 @@ class CircleBuf
    unsigned long MaxGet;
    struct timeval Start;
    
    unsigned long MaxGet;
    struct timeval Start;
    

-   static unsigned long BwReadLimit;
-   static unsigned long BwTickReadData;
-   static struct timeval BwReadTick;
-   static const unsigned int BW_HZ;
-

    unsigned long LeftRead()
    {
       unsigned long Sz = Size - (InP - OutP);
    unsigned long LeftRead()
    {
       unsigned long Sz = Size - (InP - OutP);