From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Thu, 9 Sep 2010 17:04:26 +0000 (+0200)
Subject: * ftparchive/writer.cc:
X-Git-Tag: 0.8.4~4
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/3fcc94e919bad291348d53b1fd37b21ddf789cfd?ds=inline;hp=-c

* ftparchive/writer.cc:
  - null the valid string instead of the date if Valid-Until is not set
* apt-pkg/acquire-item.cc:
  - use also unsigned Release files again (Closes: #596189)
---

3fcc94e919bad291348d53b1fd37b21ddf789cfd
diff --combined debian/changelog
index 4fdf13ccc,1780714b8..7b126b661
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,12 +1,17 @@@
  apt (0.8.4) UNRELEASED; urgency=low
  
++  [ Michael vogt ]
 +  * ftparchive/writer.cc:
 +    - write out {Files,Checksum-Sha1,Checksum-Sha256} only if
 +      available LP: #633967. Thanks to Colin Watson
 +
+   [ David Kalnischkies ]
+   * ftparchive/writer.cc:
+     - null the valid string instead of the date if Valid-Until is not set
+   * apt-pkg/acquire-item.cc:
+     - use also unsigned Release files again (Closes: #596189)
+ 
 - -- David Kalnischkies <kalnischkies@gmail.com>  Thu, 09 Sep 2010 18:21:51 +0200
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 09 Sep 2010 15:30:19 +0200
  
  apt (0.8.3) unstable; urgency=low
  
diff --combined ftparchive/writer.cc
index c280f5ed3,858e0d9df..d7d699ddc
--- a/ftparchive/writer.cc
+++ b/ftparchive/writer.cc
@@@ -708,21 -708,18 +708,21 @@@ bool SourcesWriter::DoPackage(string Fi
     // Add the dsc to the files hash list
     string const strippedName = flNotDir(FileName);
     std::ostringstream ostreamFiles;
 -   ostreamFiles << "\n " << string(MD5.Result()) << " " << St.st_size << " "
 -		<< strippedName << "\n " << Tags.FindS("Files");
 +   if (Tags.Exists("Files"))
 +      ostreamFiles << "\n " << string(MD5.Result()) << " " << St.st_size << " "
 +		   << strippedName << "\n " << Tags.FindS("Files");
     string const Files = ostreamFiles.str();
  
     std::ostringstream ostreamSha1;
 -   ostreamSha1 << "\n " << string(SHA1.Result()) << " " << St.st_size << " "
 -		<< strippedName << "\n " << Tags.FindS("Checksums-Sha1");
 +   if (Tags.Exists("Checksums-Sha1"))
 +      ostreamSha1 << "\n " << string(SHA1.Result()) << " " << St.st_size << " "
 +		   << strippedName << "\n " << Tags.FindS("Checksums-Sha1");
     string const ChecksumsSha1 = ostreamSha1.str();
  
     std::ostringstream ostreamSha256;
 -   ostreamSha256 << "\n " << string(SHA256.Result()) << " " << St.st_size << " "
 -		<< strippedName << "\n " << Tags.FindS("Checksums-Sha256");
 +   if (Tags.Exists("Checksums-Sha256"))
 +      ostreamSha256 << "\n " << string(SHA256.Result()) << " " << St.st_size << " "
 +		   << strippedName << "\n " << Tags.FindS("Checksums-Sha256");
     string const ChecksumsSha256 = ostreamSha256.str();
  
     // Strip the DirStrip prefix from the FileName and add the PathPrefix
@@@ -928,12 -925,12 +928,12 @@@ ReleaseWriter::ReleaseWriter(string con
     }
  
     time_t const validuntil = now + _config->FindI("APT::FTPArchive::Release::ValidTime", 0);
-    char validstr[128] = "";
+    char validstr[128];
     if (now == validuntil ||
         strftime(validstr, sizeof(validstr), "%a, %d %b %Y %H:%M:%S UTC",
                  gmtime(&validuntil)) == 0)
     {
-       datestr[0] = '\0';
+       validstr[0] = '\0';
     }
  
     map<string,string> Fields;