1 diff -Nur apt-0.5.4cnc7.orig/tools/cached_md5.cc apt-0.5.4cnc7/tools/cached_md5.cc
2 --- apt-0.5.4cnc7.orig/tools/cached_md5.cc Sat Jul 27 01:16:34 2002
3 +++ apt-0.5.4cnc7/tools/cached_md5.cc Tue Dec 10 16:59:14 2002
6 extern const char *__progname;
8 +extern string cache_dir;
10 CachedMD5::CachedMD5(string DirName)
12 string fname = DirName;
13 for (string::iterator i = fname.begin(); i != fname.end(); ++i)
16 - CacheFileName = _config->FindDir("Dir::Cache", "/var/cache/apt") + '/' +
17 + CacheFileName = cache_dir + '/' +
18 __progname + '/' + fname + ".md5cache";
20 FILE *f = fopen(CacheFileName.c_str(), "r");
21 diff -Nur apt-0.5.4cnc7.orig/tools/genpkglist.cc apt-0.5.4cnc7/tools/genpkglist.cc
22 --- apt-0.5.4cnc7.orig/tools/genpkglist.cc Sat Jul 27 01:22:48 2002
23 +++ apt-0.5.4cnc7/tools/genpkglist.cc Tue Dec 10 17:04:04 2002
25 cerr << "options:" << endl;
26 cerr << " --index <file> file to write srpm index data to" << endl;
27 cerr << " --info <file> file to read update info from" << endl;
28 + cerr << " --cache-dir <dir> use named directory for md5 cache" << endl;
29 cerr << " --bloat do not strip the package file list. Needed for some" << endl;
30 cerr << " distributions that use non-automatically generated" << endl;
31 cerr << " file dependencies" << endl;
33 // end of new stuff from glibc
34 #endif /* !HAVE_SCANDIR */
38 int main(int argc, char ** argv)
42 bool fullFileList = false;
43 bool progressBar = false;
46 + if (getenv("TMPDIR"))
47 + cache_dir = getenv("TMPDIR");
52 for (i = 1; i < argc; i++) {
53 if (strcmp(argv[i], "--index") == 0) {
55 cout << "genpkglist: filename missing for option --index"<<endl;
58 + } else if (strcmp(argv[i], "--cache-dir") == 0) {
61 + cache_dir = argv[i];
63 + cout << "genpkglist: filename missing for option --cache-dir"<<endl;
66 } else if (strcmp(argv[i], "--info") == 0) {
69 diff -Nur apt-0.5.4cnc7.orig/tools/gensrclist.cc apt-0.5.4cnc7/tools/gensrclist.cc
70 --- apt-0.5.4cnc7.orig/tools/gensrclist.cc Sat Jul 27 01:22:48 2002
71 +++ apt-0.5.4cnc7/tools/gensrclist.cc Tue Dec 10 17:07:40 2002
76 - cerr << "usage: gensrclist [<options>] <dir> <suffix> <srpm index>" << endl;
77 + cerr << "usage: gensrclist [--cache-dir <dir>] [<options>] <dir> <suffix> <srpm index>" << endl;
78 cerr << "options:" << endl;
79 // cerr << " --mapi ???????????????????" << endl;
80 cerr << " --progress show a progress bar" << endl;
82 cerr << " are in the same directory level"<<endl;
85 +string cache_dir = "/var/cache/apt";
87 int main(int argc, char ** argv)
91 char *arg_dir, *arg_suffix, *arg_srpmindex;
95 + if (argv[1] && argv[2] && strcmp(argv[1], "--cache-dir") == 0) {
96 + cache_dir = argv[2];
101 for (i = 1; i < argc; i++) {
102 if (strcmp(argv[i], "--mapi") == 0) {