From 8e3900d0d7efc11d538b944ed1d9e4e3d5286ff6 Mon Sep 17 00:00:00 2001
From: David Kalnischkies <kalnischkies@gmail.com>
Date: Sat, 18 Feb 2012 19:40:13 +0100
Subject: * apt-pkg/acquire-item.cc: - drop support for i18n/Index file
(introduced in 0.8.11) and use the Release file instead to get the
Translations (Closes: #649314) * ftparchive/writer.cc: - add
'Translation-*' to the default patterns
i18n/Index was never used outside debian - and even here it isn't used
consistently as only 'main' has such a file. As the Release file now
includes the Translation-* files we therefore drop support for i18n/Index.
A version supporting it was never part of a debian release and still
supporting it would mean that we get 99% of the time a 404 as response
to the request anyway and confuse archive maintainers who want to
provide all files APT tries to acquire.
---
ftparchive/writer.cc | 1 +
1 file changed, 1 insertion(+)
(limited to 'ftparchive')
diff --git a/ftparchive/writer.cc b/ftparchive/writer.cc
index 159772991..d02919969 100644
--- a/ftparchive/writer.cc
+++ b/ftparchive/writer.cc
@@ -941,6 +941,7 @@ ReleaseWriter::ReleaseWriter(string const &DB)
AddPattern("Packages.bz2");
AddPattern("Packages.lzma");
AddPattern("Packages.xz");
+ AddPattern("Translation-*");
AddPattern("Sources");
AddPattern("Sources.gz");
AddPattern("Sources.bz2");
--
cgit v1.2.3
From dcaa1185506986142bccd990a5dca4c6ec1228cf Mon Sep 17 00:00:00 2001
From: David Kalnischkies <kalnischkies@gmail.com>
Date: Sun, 4 Mar 2012 23:47:05 +0100
Subject: fix a bunch of cppcheck "(warning) Member variable '<#>' is not
initialized in the constructor." messages (no functional change)
---
ftparchive/cachedb.h | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
(limited to 'ftparchive')
diff --git a/ftparchive/cachedb.h b/ftparchive/cachedb.h
index 377c41607..b9ced9418 100644
--- a/ftparchive/cachedb.h
+++ b/ftparchive/cachedb.h
@@ -126,7 +126,8 @@ class CacheDB
Misses += S.Misses;
DeLinkBytes += S.DeLinkBytes;
};
- Stats() : Bytes(0), MD5Bytes(0), SHA1Bytes(0), SHA256Bytes(0), Packages(0), Misses(0), DeLinkBytes(0) {};
+ Stats() : Bytes(0), MD5Bytes(0), SHA1Bytes(0), SHA256Bytes(0),
+ SHA512Bytes(0),Packages(0), Misses(0), DeLinkBytes(0) {};
} Stats;
bool ReadyDB(std::string const &DB);
@@ -142,7 +143,7 @@ class CacheDB
bool Clean();
- CacheDB(std::string const &DB) : Dbp(0), Fd(NULL), DebFile(0) {ReadyDB(DB);};
+ CacheDB(std::string const &DB) : Dbp(0), Fd(NULL), DebFile(0) {TmpKey[0]='\0'; ReadyDB(DB);};
~CacheDB() {ReadyDB(std::string()); delete DebFile;};
};
--
cgit v1.2.3
From 9179f697ed4796a86f820b516f034fd679e48be4 Mon Sep 17 00:00:00 2001
From: David Kalnischkies <kalnischkies@gmail.com>
Date: Thu, 22 Mar 2012 00:16:11 +0100
Subject: the previously used VERSION didn't work everywhere so we are
switching to the more standard PACKAGE_VERSION and make it work in every file
---
ftparchive/apt-ftparchive.cc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'ftparchive')
diff --git a/ftparchive/apt-ftparchive.cc b/ftparchive/apt-ftparchive.cc
index f289eb00d..4efbecc8c 100644
--- a/ftparchive/apt-ftparchive.cc
+++ b/ftparchive/apt-ftparchive.cc
@@ -587,7 +587,7 @@ void LoadBinDir(vector<PackageMap> &PkgList,Configuration &Setup)
/* */
bool ShowHelp(CommandLine &CmdL)
{
- ioprintf(cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,VERSION,
+ ioprintf(cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,PACKAGE_VERSION,
COMMON_ARCH,__DATE__,__TIME__);
if (_config->FindB("version") == true)
return true;
--
cgit v1.2.3
From 53ec04bb0fd4c086e54e2a6779fa88ee53139628 Mon Sep 17 00:00:00 2001
From: David Kalnischkies <kalnischkies@gmail.com>
Date: Thu, 22 Mar 2012 00:51:44 +0100
Subject: * debian/apt-utils.install: - ship the ftparchive,
apt-extractemplates and apt-sortpkgs locales in the apt-utils package
instead of the apt package
---
ftparchive/makefile | 1 +
1 file changed, 1 insertion(+)
(limited to 'ftparchive')
diff --git a/ftparchive/makefile b/ftparchive/makefile
index 504ebf893..362c29198 100644
--- a/ftparchive/makefile
+++ b/ftparchive/makefile
@@ -7,6 +7,7 @@ include ../buildlib/defaults.mak
# The apt-ftparchive program
ifdef BDBLIB
+APT_DOMAIN:=apt-utils
PROGRAM=apt-ftparchive
SLIBS = -lapt-pkg -lapt-inst $(BDBLIB) $(INTLLIBS)
LIB_MAKES = apt-pkg/makefile apt-inst/makefile
--
cgit v1.2.3
From bacc49dfe278f16859b43d159e7042e9fc22d603 Mon Sep 17 00:00:00 2001
From: David Kalnischkies <kalnischkies@gmail.com>
Date: Thu, 5 Apr 2012 14:54:45 +0200
Subject: db2 isn't used for ages now, so complain about missing libdb instead
---
ftparchive/makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'ftparchive')
diff --git a/ftparchive/makefile b/ftparchive/makefile
index 362c29198..c53ecff72 100644
--- a/ftparchive/makefile
+++ b/ftparchive/makefile
@@ -16,6 +16,6 @@ SOURCE = apt-ftparchive.cc cachedb.cc writer.cc contents.cc override.cc \
include $(PROGRAM_H)
else
PROGRAM=apt-ftparchive
-MESSAGE="Must have db2 to build apt-ftparchive"
+MESSAGE="Must have libdb to build apt-ftparchive"
include $(FAIL_H)
endif # ifdef BDBLIB
--
cgit v1.2.3
From a00a9b44a1e0abf944d88c36ceaac8afdd207dcb Mon Sep 17 00:00:00 2001
From: David Kalnischkies <kalnischkies@gmail.com>
Date: Sat, 5 May 2012 15:37:31 +0200
Subject: ensure that apti18n.h is included last as advertised (Closes:
#671623)
---
ftparchive/cachedb.cc | 5 +++--
ftparchive/contents.cc | 4 +++-
ftparchive/override.cc | 3 ++-
3 files changed, 8 insertions(+), 4 deletions(-)
(limited to 'ftparchive')
diff --git a/ftparchive/cachedb.cc b/ftparchive/cachedb.cc
index a8b637a80..c2318bf53 100644
--- a/ftparchive/cachedb.cc
+++ b/ftparchive/cachedb.cc
@@ -19,11 +19,12 @@
#include <apt-pkg/strutl.h>
#include <apt-pkg/configuration.h>
#include <apt-pkg/fileutl.h>
-
+
#include <netinet/in.h> // htonl, etc
-#include <apti18n.h>
#include "cachedb.h"
+
+#include <apti18n.h>
/*}}}*/
// CacheDB::ReadyDB - Ready the DB2 /*{{{*/
diff --git a/ftparchive/contents.cc b/ftparchive/contents.cc
index bbc5a1e2b..015c790e0 100644
--- a/ftparchive/contents.cc
+++ b/ftparchive/contents.cc
@@ -38,13 +38,15 @@
#include <apt-pkg/debfile.h>
#include <apt-pkg/extracttar.h>
#include <apt-pkg/error.h>
+
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <malloc.h>
-#include <apti18n.h>
#include "contents.h"
+
+#include <apti18n.h>
/*}}}*/
// GenContents::~GenContents - Free allocated memory /*{{{*/
diff --git a/ftparchive/override.cc b/ftparchive/override.cc
index d363fd0fe..760c20120 100644
--- a/ftparchive/override.cc
+++ b/ftparchive/override.cc
@@ -12,13 +12,14 @@
// Include Files /*{{{*/
#include <config.h>
-#include <apti18n.h>
#include <apt-pkg/strutl.h>
#include <apt-pkg/error.h>
#include <stdio.h>
#include "override.h"
+
+#include <apti18n.h>
/*}}}*/
// Override::ReadOverride - Read the override file /*{{{*/
--
cgit v1.2.3
From 0baf849d81814fce59d86eecccbe624c8aaf0456 Mon Sep 17 00:00:00 2001
From: David Kalnischkies <kalnischkies@gmail.com>
Date: Mon, 21 May 2012 08:16:50 +0200
Subject: * ftparchive/writer.cc: - include Contents-* files in Release files
(Closes: #673647)
---
ftparchive/writer.cc | 1 +
1 file changed, 1 insertion(+)
(limited to 'ftparchive')
diff --git a/ftparchive/writer.cc b/ftparchive/writer.cc
index d02919969..6a24fb8aa 100644
--- a/ftparchive/writer.cc
+++ b/ftparchive/writer.cc
@@ -948,6 +948,7 @@ ReleaseWriter::ReleaseWriter(string const &DB)
AddPattern("Sources.lzma");
AddPattern("Sources.xz");
AddPattern("Release");
+ AddPattern("Contents-*");
AddPattern("Index");
AddPattern("md5sum.txt");
}
--
cgit v1.2.3