Merge branch 'mbx'

Author: bpo

.gitignore

@@ -0,0 +1,8 @@
+src/*.o
+src/s3
+debian/compat
+debian/files
+debian/apt-transport-s3
+debian/apt-transport-s3.substvars
+debian/apt-transport-s3.debhelper.log
+*~

README README.md

@@ -1,32 +1,34 @@
-apt-s3
-------
-additional "s3" protocol for apt so you can host your giant apt repository in s3 on the cheap!
+# apt-s3
 
-Author: Kyle Shank
+Additional "s3" protocol for apt so you can host your giant apt repository in s3 on the cheap!
 
 We use this for pressflip.com to deploy and distribute all of our software.  apt is a great packaging system and s3 is a great place to backup/store static files.  apt-s3 is especially useful and fast if you are hosting your servers within EC2.
 
-THIS NEEDS MORE DOCUMENTATION OBVIOUSLY
+Original Author: Kyle Shank
+Contributors: Cliff Moon (@cliffmoon on GH), Jens Braeuer (@jbraeuer)
+Documenter: Susan Potter (@mbbx6spp on GH)
 
-TODO
-----
-* Makefile
-* Package up binaries
-* Include uploader script to get repository into s3 bucket
-* Explain this a little more
+## Building
 
-This has to be compiled with the source version of apt.
+Before building this project on Ubuntu (tested on 11.10) you will need to install the following packages:
 
-You can get the source here:
+    [sudo] apt-get install libapt-pkg-dev libcurl4-openssl-dev
 
-    bzr branch http://bzr.debian.org/apt/debian-sid apt-debian-sid
+To build this project you simply run `make`. It will produce a binary named `s3` under the `src/` dir.
+
+## Installing
 
 Once compiled, the resulting s3 binary must be placed in /usr/lib/apt/methods/ along with the other protocol binaries.
 
 Finally, this is how you add it to the /etc/apt/sources.list file if you want your credentials in the url:
 
-deb s3://AWS_ACCESS_ID:[AWS_SECRET_KEY_IN_BRACKETS]@s3.amazonaws.com/BUCKETNAME prod main
+    deb s3://AWS_ACCESS_ID:[AWS_SECRET_KEY_IN_BRACKETS]@s3.amazonaws.com/BUCKETNAME prod main
+
+otherwise leave off the credentials and it will draw them from the environment variables `AWS_ACCESS_KEY_ID` and `AWS_SECRET_KEY_ID`.
 
-otherwise leave off the credentials and it will draw them from the environment variables AWS_ACCESS_KEY_ID and AWS_SECRET_KEY_ID.
+Simply upload all of your .deb packages and Packages.gz file into the s3 bucket you chose with the file key mapping that matches the file system layout.
 
-Simply upload all of your .deb packages and Packages.gz file into the s3 bucket you chose with the file key mapping that matches the file system layout.
+## TODO
+
+* Package up binaries
+* Include uploader script to get repository into s3 bucket

debian/changelog

@@ -1,3 +1,9 @@
+apt-transport-s3 (1.1ubuntu1) oneiric; urgency=low
+
+  * Make apt-transport-s3 work, when locale is non-english.
+
+ -- Jens Braeuer <[email protected]>  Mon, 31 Jan 2012 21:01:25 +0100
+
 apt-transport-s3 (1.0ubuntu1) lucid; urgency=low
 
   * Working around stupid amazon s3 behaviour with filenames

src/Makefile

@@ -2,13 +2,13 @@
 default: s3
 
 clean:
-	rm *.o s3
+	rm -f *.o s3
 
 s3: s3_main.o s3.o connect.o
-	 g++ -lapt-pkg -lapt-inst -lssl -lcrypto -o s3 s3.o s3_main.o connect.o
+	 g++ -o s3 s3.o s3_main.o connect.o -lapt-pkg -lapt-inst -lssl -lcrypto
 
 %.o: %.cc
 	 gcc  -I /usr/include -I./ -g -c $<
 
 install: s3
-	cp s3 /usr/lib/apt/methods/
+	cp s3 /usr/lib/apt/methods/

src/s3.cc

@@ -756,37 +756,51 @@ void HttpMethod::SendReq(FetchItem *Itm,CircleBuf &Out)
       Req += string("Proxy-Authorization: Basic ") + 
           Base64Encode(Proxy.User + ":" + Proxy.Password) + "\r\n";
 
-	/* S3 Specific */
-	time_t rawtime;
-	struct tm * timeinfo;
-	char buffer [80];
-
-	time( &rawtime);
-	timeinfo = gmtime( &rawtime);
-
-	strftime(buffer, 80, "%a, %d %b %Y %H:%M:%S +0000", timeinfo);
-	string dateString((const char*)buffer);
-	Req += "Date: " + dateString + "\r\n";
-
-	string extractedPassword;
-        if (Uri.Password.empty() && NULL == getenv("AWS_SECRET_ACCESS_KEY")) {
-          cerr << "E: No AWS_SECRET_ACCESS_KEY set" << endl;
-          exit(1);
-	} else if(Uri.Password.empty()) {
-          extractedPassword = getenv("AWS_SECRET_ACCESS_KEY");
-        } else {
-  	  if(Uri.Password.at(0) == '['){
-  	     extractedPassword = Uri.Password.substr(1,Uri.Password.size()-2);
-  	  }else{
-  	     extractedPassword = Uri.Password;
-  	  }
-	}
-
-	char headertext[SLEN], signature[SLEN];
-	sprintf(headertext,"GET\n\n\n%s\n%s", dateString.c_str(), normalized_path.c_str());
-	doEncrypt(headertext, signature, extractedPassword.c_str());
-
-	string signatureString(signature);
+   /* S3 Specific */
+   time_t rawtime = 0;
+   struct tm * timeinfo = NULL;
+   char buffer [80] = { 0 };
+   char* wday = NULL;
+
+   time( &rawtime);
+   timeinfo = gmtime( &rawtime);
+
+   // strftime does not seem to honour set_locale(LC_ALL, "") or
+   // set_locale(LC_TIME, ""). So convert day of week by hand.
+   switch (timeinfo->tm_wday) {
+   case 0: wday = (char*)"Sun"; break;
+   case 1: wday = (char*)"Mon"; break;
+   case 2: wday = (char*)"Tue"; break;
+   case 3: wday = (char*)"Wed"; break;
+   case 4: wday = (char*)"Thu"; break;
+   case 5: wday = (char*)"Fri"; break;
+   case 6: wday = (char*)"Sat"; break;
+   }
+
+   strcat(buffer, wday);
+   strftime(buffer+3, 80, ", %d %b %Y %T %z", timeinfo);
+   string dateString((const char*)buffer);
+   Req += "Date: " + dateString + "\r\n";
+
+   string extractedPassword;
+   if (Uri.Password.empty() && NULL == getenv("AWS_SECRET_ACCESS_KEY")) {
+     cerr << "E: No AWS_SECRET_ACCESS_KEY set" << endl;
+     exit(1);
+   } else if(Uri.Password.empty()) {
+     extractedPassword = getenv("AWS_SECRET_ACCESS_KEY");
+   } else {
+     if(Uri.Password.at(0) == '['){
+       extractedPassword = Uri.Password.substr(1,Uri.Password.size()-2);
+     }else{
+       extractedPassword = Uri.Password;
+     }
+   }
+
+   char headertext[SLEN], signature[SLEN];
+   sprintf(headertext,"GET\n\n\n%s\n%s", dateString.c_str(), normalized_path.c_str());
+   doEncrypt(headertext, signature, extractedPassword.c_str());
+
+   string signatureString(signature);
   string user;
   if (Uri.User.empty() && NULL == getenv("AWS_ACCESS_KEY_ID")) {
     cerr << "E: No AWS_ACCESS_KEY_ID set" << endl;

src/s3.h

@@ -27,6 +27,8 @@
 #ifndef APT_HTTP_H
 #define APT_HTTP_H
 
+#include <apt-pkg/hashes.h>
+
 #define MAXLEN 360