* merged the debian/experimental changes back

  into the debian/sid branch
* merged from Christian Perrier:
  * mr.po: New Marathi translation  Closes: #416806
  * zh_CN.po: Updated by Eric Pareja  Closes: #416822
  * tl.po: Updated by Eric Pareja   Closes: #416638
  * gl.po: Updated by Jacobo Tarrio
  * da.po: Updated by Claus Hindsgaul
  * fr.po: Remove a non-breakable space for usability
  * ru.po: Updated Russian translation. Closes: #405476
  * *.po: Unfuzzy after upstream typo corrections
* buildlib/archtable:
  - added support for sh3/sh4 (closes: #424870)
  - added support for m32r (closes: #394096)
* buildlib/systemtable:
  - added support for lpia
* configure.in:
  - check systemtable for architecture mapping too

* Package that contains tall the new features
* Removed all #pragma interface/implementation
* Branch that contains tall the new features:
* translated package descriptions
* task install support
* automatic dependency removal (thanks to Daniel Burrows)
* merged support for the new dpkg "Breaks" field 
  (thanks to Ian Jackson)
* handle network failures more gracefully on "update"
* support for unattended-upgrades (via unattended-upgrades
  package)
* added apt-transport-https method
* merged "install-recommends" branch (ABI break): 
  - new "--install-recommends"
  - install new recommends on "upgrade" if --install-recommends is 
    given
  - new "--fix-policy" option to install all packages with unmet
    important dependencies (usefull with --install-recommends to
    see what not-installed recommends are on the system)
  - fix of recommended packages display (only show CandidateVersion
    fix or-group handling)
* merged "install-task" branch (use with "apt-get install taskname^")
* Applied patch from Daniel Schepler to make apt bin-NMU able.
  * eu.po: Updated
* fix apt-get dist-upgrade
* fix warning if no /var/lib/apt/extended_states is present
* don't download Translations for deb-src sources.list lines
* apt-pkg/tagfile.cc:
  - support not-mmapable files again
* added support for i18n of the package descriptions
* added support for aptitude like auto-install tracking (a HUGE
  HUGE thanks to Daniel Burrows who made this possible) 
* synced with the http://people.debian.org/~mvo/bzr/apt/debian-sid branch
* build from http://people.debian.org/~mvo/bzr/apt/debian-experimental
* apt-pkg/depcache.cc:
  - added Debug::pkgDepCache::AutoInstall (thanks to infinity)
* apt-pkg/acquire-item.cc:
  - fix missing chmod() in the new aquire code 
    (thanks to Bastian Blank, Closes: #367425)
* merged from 
  http://www.perrier.eu.org/debian/packages/d-i/level4/apt-main:
  * sk.po: Completed to 512t
  * eu.po: Completed to 512t
  * fr.po: Completed to 512t
  * sv.po: Completed to 512t
  * Update all PO and the POT. Gives 506t6f for formerly
    complete translations
* Fix a incorrect example in the man-page (closes: #282918)

3 files changed, 305 insertions, 1 deletions

diff --git a/methods/https.cc b/methods/https.cc
new file mode 100644
index 000000000..b758e4ab3
--- /dev/null
+++ b/methods/https.cc
@@ -0,0 +1,249 @@
+// -*- mode: cpp; mode: fold -*-
+// Description								/*{{{*/
+// $Id: http.cc,v 1.59 2004/05/08 19:42:35 mdz Exp $
+/* ######################################################################
+
+   HTTPS Aquire Method - This is the HTTPS aquire method for APT.
+   
+   It uses libcurl
+
+   ##################################################################### */
+									/*}}}*/
+// Include Files							/*{{{*/
+#include <apt-pkg/fileutl.h>
+#include <apt-pkg/acquire-method.h>
+#include <apt-pkg/error.h>
+#include <apt-pkg/hashes.h>
+
+#include <sys/stat.h>
+#include <sys/time.h>
+#include <utime.h>
+#include <unistd.h>
+#include <signal.h>
+#include <stdio.h>
+#include <errno.h>
+#include <string.h>
+#include <iostream>
+#include <apti18n.h>
+#include <sstream>
+
+#include "config.h"
+#include "https.h"
+
+									/*}}}*/
+using namespace std;
+
+size_t 
+HttpsMethod::write_data(void *buffer, size_t size, size_t nmemb, void *userp)
+{
+   HttpsMethod *me = (HttpsMethod *)userp;
+
+   if(me->File->Write(buffer, size*nmemb) != true)
+      return false;
+
+   return size*nmemb;
+}
+
+int 
+HttpsMethod::progress_callback(void *clientp, double dltotal, double dlnow, 
+			      double ultotal, double ulnow)
+{
+   HttpsMethod *me = (HttpsMethod *)clientp;
+   if(dltotal > 0 && me->Res.Size == 0) {
+      me->Res.Size = dltotal;
+      me->URIStart(me->Res);
+   }
+   return 0;
+}
+
+bool HttpsMethod::SetupProxy()
+{
+   URI ServerName = Queue->Uri;
+
+   // Determine the proxy setting
+   if (getenv("http_proxy") == 0)
+   {
+      string DefProxy = _config->Find("Acquire::http::Proxy");
+      string SpecificProxy = _config->Find("Acquire::http::Proxy::" + ServerName.Host);
+      if (SpecificProxy.empty() == false)
+      {
+	 if (SpecificProxy == "DIRECT")
+	    Proxy = "";
+	 else
+	    Proxy = SpecificProxy;
+      }   
+      else
+	 Proxy = DefProxy;
+   }
+   
+   // Parse no_proxy, a , separated list of domains
+   if (getenv("no_proxy") != 0)
+   {
+      if (CheckDomainList(ServerName.Host,getenv("no_proxy")) == true)
+	 Proxy = "";
+   }
+   
+   // Determine what host and port to use based on the proxy settings
+   int Port = 0;
+   string Host;   
+   if (Proxy.empty() == true || Proxy.Host.empty() == true)
+   {
+   }
+   else
+   {
+      if (Proxy.Port != 0)
+	 curl_easy_setopt(curl, CURLOPT_PROXYPORT, Proxy.Port);
+      curl_easy_setopt(curl, CURLOPT_PROXY, Proxy.Host.c_str());
+   }
+}
+
+
+// HttpsMethod::Fetch - Fetch an item					/*{{{*/
+// ---------------------------------------------------------------------
+/* This adds an item to the pipeline. We keep the pipeline at a fixed
+   depth. */
+bool HttpsMethod::Fetch(FetchItem *Itm)
+{
+   stringstream ss;
+   struct stat SBuf;
+   struct curl_slist *headers=NULL;  
+   char curl_errorstr[CURL_ERROR_SIZE];
+
+   // TODO:
+   //       - http::Timeout
+   //       - http::Pipeline-Depth
+   //       - error checking/reporting
+   //       - more debug options? (CURLOPT_DEBUGFUNCTION?)
+
+   SetupProxy();
+
+   // callbacks
+   curl_easy_setopt(curl, CURLOPT_URL, Itm->Uri.c_str());
+   curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, write_data);
+   curl_easy_setopt(curl, CURLOPT_WRITEDATA, this);
+   curl_easy_setopt(curl, CURLOPT_PROGRESSFUNCTION, progress_callback);
+   curl_easy_setopt(curl, CURLOPT_PROGRESSDATA, this);
+   curl_easy_setopt(curl, CURLOPT_NOPROGRESS, false);
+   curl_easy_setopt(curl, CURLOPT_FAILONERROR, true);
+
+   // FIXME: https: offer various options of verification
+   bool peer_verify = _config->FindB("Acquire::https::Verify-Peer", false);
+   curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, peer_verify);
+
+   // sslcert file
+   string pem = _config->Find("Acquire::https::SslCert","");
+   if(pem != "")
+      curl_easy_setopt(curl, CURLOPT_SSLCERT, pem.c_str());
+   
+   // CA-Dir
+   string certdir = _config->Find("Acquire::https::CaPath","");
+   if(certdir != "")
+      curl_easy_setopt(curl, CURLOPT_CAPATH, certdir.c_str());
+   
+   // Server-verify 
+   int verify = _config->FindI("Acquire::https::Verify-Host",2);
+   curl_easy_setopt(curl, CURLOPT_SSL_VERIFYHOST, verify);
+
+   // cache-control
+   if(_config->FindB("Acquire::http::No-Cache",false) == false)
+   {
+      // cache enabled
+      if (_config->FindB("Acquire::http::No-Store",false) == true)
+	 headers = curl_slist_append(headers,"Cache-Control: no-store");
+      ioprintf(ss, "Cache-Control: max-age=%u", _config->FindI("Acquire::http::Max-Age",0));
+      headers = curl_slist_append(headers, ss.str().c_str());
+   } else {
+      // cache disabled by user
+      headers = curl_slist_append(headers, "Cache-Control: no-cache");
+      headers = curl_slist_append(headers, "Pragma: no-cache");
+   }
+   curl_easy_setopt(curl, CURLOPT_HTTPHEADER, headers);
+
+   // set time values
+   curl_easy_setopt(curl, CURLOPT_TIMECONDITION, CURL_TIMECOND_IFMODSINCE);
+   curl_easy_setopt(curl, CURLOPT_TIMEVALUE, Itm->LastModified);
+
+   // speed limit
+   int dlLimit = _config->FindI("Acquire::http::Dl-Limit",0)*1024;
+   if (dlLimit > 0)
+      curl_easy_setopt(curl, CURLOPT_MAX_RECV_SPEED_LARGE, dlLimit);
+
+   // set header
+   curl_easy_setopt(curl, CURLOPT_USERAGENT,"Debian APT-CURL/1.0 ("VERSION")");
+
+   // debug
+   if(_config->FindB("Debug::Acquire::https", false))
+      curl_easy_setopt(curl, CURLOPT_VERBOSE, true);
+
+   // error handling
+   curl_easy_setopt(curl, CURLOPT_ERRORBUFFER, curl_errorstr);
+
+   // In this case we send an if-range query with a range header
+  if (stat(Itm->DestFile.c_str(),&SBuf) >= 0 && SBuf.st_size > 0)
+     curl_easy_setopt(curl, CURLOPT_RESUME_FROM, (long)SBuf.st_size);
+
+   // go for it - if the file exists, append on it
+   File = new FileFd(Itm->DestFile, FileFd::WriteAny);
+   File->Seek(File->Size());
+   
+   // keep apt updated
+   Res.Filename = Itm->DestFile;
+
+   // get it!
+   CURLcode success = curl_easy_perform(curl);
+
+
+   // cleanup
+   if(success != 0) {
+      _error->Error(curl_errorstr);
+      Fail();
+      return true;
+   }
+
+   if (Res.Size == 0)
+      Res.Size = File->Size();
+
+   // check the downloaded result
+   struct stat Buf;
+   if (stat(File->Name().c_str(),&Buf) == 0)
+   {
+      Res.Size = Buf.st_size;
+      Res.Filename = File->Name();
+      Res.LastModified = Buf.st_mtime;
+      Res.IMSHit = false;
+      if (Itm->LastModified != 0 && Buf.st_mtime >= Itm->LastModified)
+      {
+	 Res.IMSHit = true;
+	 Res.LastModified = Itm->LastModified;
+      }
+   }
+
+   // take hashes
+   Hashes Hash;
+   FileFd Fd(Res.Filename, FileFd::ReadOnly);
+   Hash.AddFD(Fd.Fd(), Fd.Size());
+   Res.TakeHashes(Hash);
+   
+   // keep apt updated
+   URIDone(Res);
+
+   // cleanup
+   File->Close();
+   Res.Size = 0;
+   delete File;
+   curl_slist_free_all(headers);
+
+   return true;
+};
+
+int main()
+{
+   setlocale(LC_ALL, "");
+
+   HttpsMethod Mth;
+   curl_global_init(CURL_GLOBAL_SSL) ;
+
+   return Mth.Run();
+}
+
+
diff --git a/methods/https.h b/methods/https.h
new file mode 100644
index 000000000..6620a10fc
--- /dev/null
+++ b/methods/https.h
@@ -0,0 +1,48 @@
+// -*- mode: cpp; mode: fold -*-
+// Description								/*{{{*/// $Id: http.h,v 1.12 2002/04/18 05:09:38 jgg Exp $
+// $Id: http.h,v 1.12 2002/04/18 05:09:38 jgg Exp $
+/* ######################################################################
+
+   HTTP Aquire Method - This is the HTTP aquire method for APT.
+
+   ##################################################################### */
+									/*}}}*/
+
+#ifndef APT_HTTP_H
+#define APT_HTTP_H
+
+#define MAXLEN 360
+
+#include <iostream>
+#include <curl/curl.h>
+
+using std::cout;
+using std::endl;
+
+class HttpsMethod;
+
+
+class HttpsMethod : public pkgAcqMethod
+{
+
+   virtual bool Fetch(FetchItem *);
+   static size_t write_data(void *buffer, size_t size, size_t nmemb, void *userp);
+   static int progress_callback(void *clientp, double dltotal, double dlnow, 
+				double ultotal, double ulnow);
+   bool SetupProxy();
+   CURL *curl;
+   FetchResult Res;
+
+   public:
+   FileFd *File;
+      
+   HttpsMethod() : pkgAcqMethod("1.2",Pipeline | SendConfig) 
+   {
+      File = 0;
+      curl = curl_easy_init();
+   };
+};
+
+URI Proxy;
+
+#endif
diff --git a/methods/makefile b/methods/makefile
index d0b5a28c0..f178cbbea 100644
--- a/methods/makefile
+++ b/methods/makefile
@@ -7,7 +7,7 @@ include ../buildlib/defaults.mak
 BIN := $(BIN)/methods
 
 # FIXME..
-LIB_APT_PKG_MAJOR = 3.11
+LIB_APT_PKG_MAJOR = 4.4
 APT_DOMAIN := libapt-pkg$(LIB_APT_PKG_MAJOR)
 
 # The file method
@@ -52,6 +52,13 @@ LIB_MAKES = apt-pkg/makefile
 SOURCE = http.cc rfc2553emu.cc connect.cc
 include $(PROGRAM_H)
 
+# The https method
+PROGRAM=https
+SLIBS = -lapt-pkg -lcurl
+LIB_MAKES = apt-pkg/makefile
+SOURCE = https.cc
+include $(PROGRAM_H)
+
 # The ftp method
 PROGRAM=ftp
 SLIBS = -lapt-pkg $(SOCKETLIBS)