[maemo-commits] [maemo-commits] r14744 - in projects/haf/trunk/apt: . debian methods

[From: subversion at stage.maemo.org]

Author: marivoll
Date: 2007-11-08 14:18:11 +0200 (Thu, 08 Nov 2007)
New Revision: 14744

Modified:
   projects/haf/trunk/apt/configure
   projects/haf/trunk/apt/configure.in
   projects/haf/trunk/apt/debian/changelog
   projects/haf/trunk/apt/methods/http.cc
Log:
apt (0.6.46.4.osso8) unstable; urgency=low

  * Provide a 'cookie' in the http method to communicate the hardware
    platform in the HTTP requests.

 -- Marius Vollmer <marius.vollmer at nokia.com>  Wed, 31 Oct 2007 18:16:11 +0200


Modified: projects/haf/trunk/apt/configure
===================================================================
--- projects/haf/trunk/apt/configure	2007-11-08 12:16:52 UTC (rev 14743)
+++ projects/haf/trunk/apt/configure	2007-11-08 12:18:11 UTC (rev 14744)
@@ -1347,7 +1347,7 @@
 
 
 cat >>confdefs.h <<_ACEOF
-#define VERSION "0.6.46.4.osso7"
+#define VERSION "0.6.46.4.osso8"
 _ACEOF
 
 PACKAGE="apt"

Modified: projects/haf/trunk/apt/configure.in
===================================================================
--- projects/haf/trunk/apt/configure.in	2007-11-08 12:16:52 UTC (rev 14743)
+++ projects/haf/trunk/apt/configure.in	2007-11-08 12:18:11 UTC (rev 14744)
@@ -18,7 +18,7 @@
 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.6.46.4.osso7")
+AC_DEFINE_UNQUOTED(VERSION,"0.6.46.4.osso8")
 PACKAGE="apt"
 AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
 AC_SUBST(PACKAGE)

Modified: projects/haf/trunk/apt/debian/changelog
===================================================================
--- projects/haf/trunk/apt/debian/changelog	2007-11-08 12:16:52 UTC (rev 14743)
+++ projects/haf/trunk/apt/debian/changelog	2007-11-08 12:18:11 UTC (rev 14744)
@@ -1,3 +1,10 @@
+apt (0.6.46.4.osso8) unstable; urgency=low
+
+  * Provide a 'cookie' in the http method to communicate the hardware
+    platform in the HTTP requests.
+
+ -- Marius Vollmer <marius.vollmer at nokia.com>  Wed, 31 Oct 2007 18:16:11 +0200
+
 apt (0.6.46.4.osso7) unstable; urgency=low
 
   * Updated ignoretimeconflict.patch to also ignore time conflicts during

Modified: projects/haf/trunk/apt/methods/http.cc
===================================================================
--- projects/haf/trunk/apt/methods/http.cc	2007-11-08 12:16:52 UTC (rev 14743)
+++ projects/haf/trunk/apt/methods/http.cc	2007-11-08 12:18:11 UTC (rev 14744)
@@ -712,6 +712,21 @@
    if (Uri.User.empty() == false || Uri.Password.empty() == false)
       Req += string("Authorization: Basic ") + 
           Base64Encode(Uri.User + ":" + Uri.Password) + "\r\n";
+   else
+     {
+       const char *product_hardware = getenv ("OSSO_PRODUCT_HARDWARE");
+       if (product_hardware)
+	 {
+	   /* This is a cookie that identifies Internet Tablets to the
+	      server.  We use the Authorization header since that is
+	      easier to handle on the server side.
+	   */
+	   string user = string ("NOKIA-OSSO-") + string (product_hardware);
+	   Req += (string("Authorization: Basic ") + 
+		   Base64Encode(user + ":" + "JOSHUA")
+		   + "\r\n");
+	 }
+     }
    
    Req += "User-Agent: Debian APT-HTTP/1.3\r\n\r\n";