Browse Source

* apt-pkg/deb/debrecords.cc:

- return the correct SHA1Hash()
* methods/http.cc:
  - send VERSION of apt in the User-Agent string
debian/1.8.y
Michael Vogt 16 years ago
parent
commit
59b46c414d
  1. 2
      apt-pkg/deb/debrecords.cc
  2. 2
      configure.in
  3. 4
      debian/changelog
  4. 3
      methods/http.cc
  5. 48
      po/apt-all.pot

2
apt-pkg/deb/debrecords.cc

@ -61,7 +61,7 @@ string debRecordParser::MD5Hash()
/* */
string debRecordParser::SHA1Hash()
{
return Section.FindS("SHA1Sum");
return Section.FindS("SHA1");
}
/*}}}*/
// RecordParser::Maintainer - Return the maintainer email /*{{{*/

2
configure.in

@ -18,7 +18,7 @@ AC_CONFIG_AUX_DIR(buildlib)
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.3-0.1")
AC_DEFINE_UNQUOTED(VERSION,"0.6.46.5")
PACKAGE="apt"
AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
AC_SUBST(PACKAGE)

4
debian/changelog

@ -4,6 +4,10 @@ apt (0.6.46.5) UNRELEASED; urgency=low
- use clog for all debugging
- only increase the score of installed applications if they
are not obsolete
* methods/http.cc:
- send apt version in User-Agent
* apt-pkg/deb/debrecords.cc:
- fix SHA1Hash() return value
-- Michael Vogt <michael.vogt@ubuntu.com> Mon, 18 Dec 2006 19:39:05 +0100

3
methods/http.cc

@ -44,6 +44,7 @@
// Internet stuff
#include <netdb.h>
#include "config.h"
#include "connect.h"
#include "rfc2553emu.h"
#include "http.h"
@ -714,7 +715,7 @@ void HttpMethod::SendReq(FetchItem *Itm,CircleBuf &Out)
Req += string("Authorization: Basic ") +
Base64Encode(Uri.User + ":" + Uri.Password) + "\r\n";
Req += "User-Agent: Debian APT-HTTP/1.3\r\n\r\n";
Req += "User-Agent: Debian APT-HTTP/1.3 ("VERSION")\r\n\r\n";
if (Debug == true)
cerr << Req << endl;

48
po/apt-all.pot

@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2006-10-11 20:34+0200\n"
"POT-Creation-Date: 2006-12-19 11:37+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -1621,7 +1621,7 @@ msgstr ""
msgid "Unable to accept connection"
msgstr ""
#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr ""
@ -1752,76 +1752,76 @@ msgstr ""
msgid "Read error from %s process"
msgstr ""
#: methods/http.cc:376
#: methods/http.cc:377
msgid "Waiting for headers"
msgstr ""
#: methods/http.cc:522
#: methods/http.cc:523
#, c-format
msgid "Got a single header line over %u chars"
msgstr ""
#: methods/http.cc:530
#: methods/http.cc:531
msgid "Bad header line"
msgstr ""
#: methods/http.cc:549 methods/http.cc:556
#: methods/http.cc:550 methods/http.cc:557
msgid "The HTTP server sent an invalid reply header"
msgstr ""
#: methods/http.cc:585
#: methods/http.cc:586
msgid "The HTTP server sent an invalid Content-Length header"
msgstr ""
#: methods/http.cc:600
#: methods/http.cc:601
msgid "The HTTP server sent an invalid Content-Range header"
msgstr ""
#: methods/http.cc:602
#: methods/http.cc:603
msgid "This HTTP server has broken range support"
msgstr ""
#: methods/http.cc:626
#: methods/http.cc:627
msgid "Unknown date format"
msgstr ""
#: methods/http.cc:773
#: methods/http.cc:774
msgid "Select failed"
msgstr ""
#: methods/http.cc:778
#: methods/http.cc:779
msgid "Connection timed out"
msgstr ""
#: methods/http.cc:801
#: methods/http.cc:802
msgid "Error writing to output file"
msgstr ""
#: methods/http.cc:832
#: methods/http.cc:833
msgid "Error writing to file"
msgstr ""
#: methods/http.cc:860
#: methods/http.cc:861
msgid "Error writing to the file"
msgstr ""
#: methods/http.cc:874
#: methods/http.cc:875
msgid "Error reading from server. Remote end closed connection"
msgstr ""
#: methods/http.cc:876
#: methods/http.cc:877
msgid "Error reading from server"
msgstr ""
#: methods/http.cc:1107
#: methods/http.cc:1108
msgid "Bad header data"
msgstr ""
#: methods/http.cc:1124
#: methods/http.cc:1125
msgid "Connection failed"
msgstr ""
#: methods/http.cc:1215
#: methods/http.cc:1216
msgid "Internal error"
msgstr ""
@ -1894,12 +1894,12 @@ msgstr ""
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr ""
#: apt-pkg/contrib/progress.cc:154
#: apt-pkg/contrib/progress.cc:155
#, c-format
msgid "%c%s... Error!"
msgstr ""
#: apt-pkg/contrib/progress.cc:156
#: apt-pkg/contrib/progress.cc:157
#, c-format
msgid "%c%s... Done"
msgstr ""
@ -2191,13 +2191,13 @@ msgid ""
"The package %s needs to be reinstalled, but I can't find an archive for it."
msgstr ""
#: apt-pkg/algorithms.cc:1059
#: apt-pkg/algorithms.cc:1061
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
msgstr ""
#: apt-pkg/algorithms.cc:1061
#: apt-pkg/algorithms.cc:1063
msgid "Unable to correct problems, you have held broken packages."
msgstr ""

Loading…
Cancel
Save