- updated for 0.5.4cnc7

Changed files:
    apt-filed.patch -> 1.2
    apt-md5-cache-dir-option.patch -> 1.3

diff --git a/apt-filed.patch b/apt-filed.patch
index cd5aecb480a46fd5c5b6f6990d0d833fa55dab5f..af6ccc5ee0fd1685c511b32532e0ef8faaab12cc 100644 (file)
--- a/apt-filed.patch
+++ b/apt-filed.patch
@@ -1,42 +1,42 @@
-diff -ur apt-0.3.19cnc52.old/cmdline/apt-get.cc apt-0.3.19cnc52/cmdline/apt-get.cc
---- apt-0.3.19cnc52.old/cmdline/apt-get.cc     Wed Aug  1 23:57:05 2001
-+++ apt-0.3.19cnc52/cmdline/apt-get.cc Fri Oct 18 11:01:34 2002
-@@ -1404,7 +1404,7 @@
-        c1out << endl;
-        c1out << _("Since you only requested a single operation it is extremely likely that") << endl;
-        c1out << _("the package is simply not installable and a bug report against") << endl;
--       c1out << _("that package should be filed.") << endl;
-+       c1out << _("that package should be filled.") << endl;
+diff -Nur apt-0.5.4cnc7.orig/cmdline/apt-get.cc apt-0.5.4cnc7/cmdline/apt-get.cc
+--- apt-0.5.4cnc7.orig/cmdline/apt-get.cc      Thu Aug  8 22:07:33 2002
++++ apt-0.5.4cnc7/cmdline/apt-get.cc   Tue Dec 10 17:10:42 2002
+@@ -1515,7 +1515,7 @@
+        c1out << 
+         _("Since you only requested a single operation it is extremely likely that\n"
+           "the package is simply not installable and a bug report against\n" 
+-          "that package should be filed.") << endl;
++          "that package should be filled.") << endl;
        }
  
        c1out << _("The following information may help to resolve the situation:") << endl;
-diff -ur apt-0.3.19cnc52.old/po/apt.pot apt-0.3.19cnc52/po/apt.pot
---- apt-0.3.19cnc52.old/po/apt.pot     Thu Jan 11 03:03:27 2001
-+++ apt-0.3.19cnc52/po/apt.pot Fri Oct 18 11:01:36 2002
-@@ -436,7 +436,7 @@
+diff -Nur apt-0.5.4cnc7.orig/po/apt.pot apt-0.5.4cnc7/po/apt.pot
+--- apt-0.5.4cnc7.orig/po/apt.pot      Thu Sep  5 00:54:05 2002
++++ apt-0.5.4cnc7/po/apt.pot   Tue Dec 10 17:10:55 2002
+@@ -1350,7 +1350,7 @@
+ msgid ""
+ "Since you only requested a single operation it is extremely likely that\n"
+ "the package is simply not installable and a bug report against\n"
+-"that package should be filed."
++"that package should be filled."
  msgstr ""
  
- #: cmdline/apt-get.cc:1383
--msgid "that package should be filed."
-+msgid "that package should be filled."
+ #: cmdline/apt-get.cc:1515
+diff -Nur apt-0.5.4cnc7.orig/po/de_DE.po apt-0.5.4cnc7/po/de_DE.po
+--- apt-0.5.4cnc7.orig/po/de_DE.po     Thu Sep  5 00:54:05 2002
++++ apt-0.5.4cnc7/po/de_DE.po  Tue Dec 10 17:11:17 2002
+@@ -1378,7 +1378,7 @@
+ msgid ""
+ "Since you only requested a single operation it is extremely likely that\n"
+ "the package is simply not installable and a bug report against\n"
+-"that package should be filed."
++"that package should be filled."
  msgstr ""
  
- #: cmdline/apt-get.cc:1386
-diff -ur apt-0.3.19cnc52.old/po/cat-id-tbl.c apt-0.3.19cnc52/po/cat-id-tbl.c
---- apt-0.3.19cnc52.old/po/cat-id-tbl.c        Thu Jan 11 03:03:27 2001
-+++ apt-0.3.19cnc52/po/cat-id-tbl.c    Fri Oct 18 11:01:33 2002
-@@ -116,7 +116,7 @@
-   {"or been moved out of Incoming.", 100},
-   {"Since you only requested a single operation it is extremely likely that", 101},
-   {"the package is simply not installable and a bug report against", 102},
--  {"that package should be filed.", 103},
-+  {"that package should be filled.", 103},
-   {"The following information may help to resolve the situation:", 104},
-   {"Sorry, broken packages", 105},
-   {"The following extra packages will be installed:", 106},
-diff -ur apt-0.3.19cnc52.old/po/es_ES.po apt-0.3.19cnc52/po/es_ES.po
---- apt-0.3.19cnc52.old/po/es_ES.po    Tue Jan 16 20:28:52 2001
-+++ apt-0.3.19cnc52/po/es_ES.po        Fri Oct 18 11:01:35 2002
+ #: cmdline/apt-get.cc:1515
+diff -Nur apt-0.5.4cnc7.orig/po/es_ES.po apt-0.5.4cnc7/po/es_ES.po
+--- apt-0.5.4cnc7.orig/po/es_ES.po     Tue Jul 23 19:54:53 2002
++++ apt-0.5.4cnc7/po/es_ES.po  Tue Dec 10 17:11:29 2002
 @@ -435,7 +435,7 @@
  msgstr "el paquete simplemente no se pueda instalar y se deba informar"
  
@@ -46,9 +46,9 @@ diff -ur apt-0.3.19cnc52.old/po/es_ES.po apt-0.3.19cnc52/po/es_ES.po
  msgstr "de un error acerca de este paquete."
  
  #: cmdline/apt-get.cc:1386
-diff -ur apt-0.3.19cnc52.old/po/it_IT.po apt-0.3.19cnc52/po/it_IT.po
---- apt-0.3.19cnc52.old/po/it_IT.po    Thu Mar 22 13:01:47 2001
-+++ apt-0.3.19cnc52/po/it_IT.po        Fri Oct 18 11:01:33 2002
+diff -Nur apt-0.5.4cnc7.orig/po/it_IT.po apt-0.5.4cnc7/po/it_IT.po
+--- apt-0.5.4cnc7.orig/po/it_IT.po     Tue Jul 23 19:54:53 2002
++++ apt-0.5.4cnc7/po/it_IT.po  Tue Dec 10 17:11:34 2002
 @@ -435,7 +435,7 @@
  msgstr "il pacchetto sia semplicemente non installabile e"
  
@@ -58,15 +58,27 @@ diff -ur apt-0.3.19cnc52.old/po/it_IT.po apt-0.3.19cnc52/po/it_IT.po
  msgstr "che debba essere inviato un bug report per il pacchetto."
  
  #: cmdline/apt-get.cc:1386
-diff -ur apt-0.3.19cnc52.old/po/pt_BR.po apt-0.3.19cnc52/po/pt_BR.po
---- apt-0.3.19cnc52.old/po/pt_BR.po    Thu Jul 12 23:47:33 2001
-+++ apt-0.3.19cnc52/po/pt_BR.po        Fri Oct 18 11:01:35 2002
-@@ -448,7 +448,7 @@
+diff -Nur apt-0.5.4cnc7.orig/po/pt_BR.po apt-0.5.4cnc7/po/pt_BR.po
+--- apt-0.5.4cnc7.orig/po/pt_BR.po     Tue Jul 23 19:54:53 2002
++++ apt-0.5.4cnc7/po/pt_BR.po  Tue Dec 10 17:11:40 2002
+@@ -1037,7 +1037,7 @@
  msgstr "o pacote simplesmente não esteja instalado e um relatório de bug"
  
- #: cmdline/apt-get.cc:1383
+ #: cmdline/apt-get.cc:1424
 -msgid "that package should be filed."
 +msgid "that package should be filled."
  msgstr "deste pacote deve ser preenchido."
  
- #: cmdline/apt-get.cc:1386
+ #: cmdline/apt-get.cc:1427
+diff -Nur apt-0.5.4cnc7.orig/po/ru.po apt-0.5.4cnc7/po/ru.po
+--- apt-0.5.4cnc7.orig/po/ru.po        Tue Jul 23 19:54:53 2002
++++ apt-0.5.4cnc7/po/ru.po     Tue Dec 10 17:11:44 2002
+@@ -1040,7 +1040,7 @@
+ msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÕÓÔÁÎÏ×ÉÔØ É ÔÒÅÂÕÅÔÓÑ ÏÔÐÒÁ×ÉÔØ ÓÏÏÂÝÅÎÉÅ Ï ÏÛÉÂËÅ"
+ 
+ #: cmdline/apt-get.cc:1413
+-msgid "that package should be filed."
++msgid "that package should be filled."
+ msgstr "Ó ÜÔÉÍ ÐÁËÅÔÏÍ ÒÁÚÒÁÂÏÔÞÉËÁÍ."
+ 
+ #: cmdline/apt-get.cc:1416

diff --git a/apt-md5-cache-dir-option.patch b/apt-md5-cache-dir-option.patch
index a7f799bb376ccff1216c9d17814f8b8f50102e69..7b559c717b6e32a0c0b9d383366a15995f5d346a 100644 (file)
--- a/apt-md5-cache-dir-option.patch
+++ b/apt-md5-cache-dir-option.patch
@@ -1,92 +1,103 @@
-diff -ur apt-0.3.19cnc52/tools/genpkglist.cc apt-0.3.19cnc52-/tools/genpkglist.cc
---- apt-0.3.19cnc52/tools/genpkglist.cc        Thu Jul 12 23:47:33 2001
-+++ apt-0.3.19cnc52-/tools/genpkglist.cc       Wed Apr 24 15:50:01 2002
-@@ -139,6 +139,7 @@
-    ~CachedMD5();
- };
+diff -Nur apt-0.5.4cnc7.orig/tools/cached_md5.cc apt-0.5.4cnc7/tools/cached_md5.cc
+--- apt-0.5.4cnc7.orig/tools/cached_md5.cc     Sat Jul 27 01:16:34 2002
++++ apt-0.5.4cnc7/tools/cached_md5.cc  Tue Dec 10 16:59:14 2002
+@@ -25,13 +25,15 @@
  
-+string cache_dir;
+ extern const char *__progname;
  
++extern string cache_dir;
++
  CachedMD5::CachedMD5(string DirName)
  {
-@@ -153,7 +154,7 @@
-         if (buf[i]=='/')
-          buf[i]='_';
+    string fname = DirName;
+    for (string::iterator i = fname.begin(); i != fname.end(); ++i)
+       if ('/' == *i)
+        *i = '_';
+-   CacheFileName = _config->FindDir("Dir::Cache", "/var/cache/apt") + '/' +
++   CacheFileName = cache_dir + '/' +
+                  __progname + '/' + fname + ".md5cache";
  
--    string cachedir = _config->FindDir("Dir::Cache") + "/genpkglist";
-+    string cachedir = cache_dir + "/genpkglist";
-     filename = strdup(string(cachedir+string(buf)).c_str());
- 
-     f = fopen(filename, "r");
-@@ -501,6 +502,7 @@
+    FILE *f = fopen(CacheFileName.c_str(), "r");
+diff -Nur apt-0.5.4cnc7.orig/tools/genpkglist.cc apt-0.5.4cnc7/tools/genpkglist.cc
+--- apt-0.5.4cnc7.orig/tools/genpkglist.cc     Sat Jul 27 01:22:48 2002
++++ apt-0.5.4cnc7/tools/genpkglist.cc  Tue Dec 10 17:04:04 2002
+@@ -340,6 +340,7 @@
     cerr << "options:" << endl;
     cerr << " --index <file>  file to write srpm index data to" << endl;
     cerr << " --info <file>   file to read update info from" << endl;
 +   cerr << " --cache-dir <dir>   use named directory for md5 cache" << endl;
-    cerr << " --bloat         do not strip the package file list. Needed for some\ndistributions that use non-automatically generated file dependencies" << endl;
- }
+    cerr << " --bloat         do not strip the package file list. Needed for some" << endl;
+    cerr << "                 distributions that use non-automatically generated" << endl;
+    cerr << "                 file dependencies" << endl;
+@@ -431,6 +432,7 @@
+ // end of new stuff from glibc
+ #endif /* !HAVE_SCANDIR */
  
-@@ -607,6 +609,11 @@
++string cache_dir;
+ 
+ int main(int argc, char ** argv) 
+ {
+@@ -449,7 +451,12 @@
     int i;
     bool fullFileList = false;
-    
+    bool progressBar = false;
+-   
++ 
 +   if (getenv("TMPDIR"))
-+      cache_dir = getenv("TMPDIR");
++      cache_dir = getenv("TMPDIR");
 +   else
-+      cache_dir = "/tmp";
-+      
++      cache_dir = "/tmp";
++
     putenv("LC_ALL=");
     for (i = 1; i < argc; i++) {
        if (strcmp(argv[i], "--index") == 0) {
-@@ -617,6 +624,14 @@
+@@ -460,6 +467,14 @@
            cout << "genpkglist: filename missing for option --index"<<endl;
            exit(1);
         }
 +      } else if (strcmp(argv[i], "--cache-dir") == 0) {
 +       i++;
 +       if (i < argc) {
-+          cache_dir = argv[i];
++            cache_dir = argv[i];
 +       } else {
-+          cout << "genpkglist: filename missing for option --cache-dir"<<endl;
++            cout << "genpkglist: filename missing for option --cache-dir"<<endl;
 +          exit(1);
 +       }
        } else if (strcmp(argv[i], "--info") == 0) {
         i++;
         if (i < argc) {
-diff -ur apt-0.3.19cnc52/tools/gensrclist.cc apt-0.3.19cnc52-/tools/gensrclist.cc
---- apt-0.3.19cnc52/tools/gensrclist.cc        Thu Jul 12 23:47:33 2001
-+++ apt-0.3.19cnc52-/tools/gensrclist.cc       Wed Apr 24 15:52:57 2002
-@@ -90,6 +90,7 @@
-    ~CachedMD5();
- };
+diff -Nur apt-0.5.4cnc7.orig/tools/gensrclist.cc apt-0.5.4cnc7/tools/gensrclist.cc
+--- apt-0.5.4cnc7.orig/tools/gensrclist.cc     Sat Jul 27 01:22:48 2002
++++ apt-0.5.4cnc7/tools/gensrclist.cc  Tue Dec 10 17:07:40 2002
+@@ -116,7 +116,7 @@
  
-+string cache_dir = "/var/cache/apt/gensrclist/";
+ void usage()
+ {
+-   cerr << "usage: gensrclist [<options>] <dir> <suffix> <srpm index>" << endl;
++   cerr << "usage: gensrclist [--cache-dir <dir>] [<options>] <dir> <suffix> <srpm index>" << endl;
+    cerr << "options:" << endl;
+ //   cerr << " --mapi         ???????????????????" << endl;
+    cerr << " --progress     show a progress bar" << endl;
+@@ -124,6 +124,8 @@
+    cerr << "                are in the same directory level"<<endl;
+ }
  
- CachedMD5::CachedMD5(string DirName)
++string cache_dir = "/var/cache/apt"
++
+ int main(int argc, char ** argv) 
  {
-@@ -103,7 +104,7 @@
-     for (i = 0; buf[i]; i++)
-         if (buf[i]=='/')
-          buf[i]='_';
--    filename = strdup(string("/var/cache/apt/gensrclist/"+string(buf)).c_str());
-+    filename = strdup(string(cache_dir + "/" + string(buf)).c_str());
+    char buf[300];
+@@ -143,6 +145,13 @@
+    char *arg_dir, *arg_suffix, *arg_srpmindex;
  
-     f = fopen(filename, "r");
-     if (!f) {
-@@ -243,8 +244,15 @@
-    bool mapi;
-    
     putenv("LC_ALL=");
 +
 +   if (argv[1] && argv[2] && strcmp(argv[1], "--cache-dir") == 0) {
-+      cache_dir = argv[2];
-+      argv += 2;
-+      argc -= 2;
++       cache_dir = argv[2];
++       argv += 2;
++       argc -= 2;
 +   }
-+   
-    if (argc < 4 || argc > 5) {
--      cerr << "usage: gensrclist <dir> <suffix> <srpm index>" << endl;
-+      cerr << "usage: gensrclist [--cache-dir <dir>] <dir> <suffix> <srpm index>" << endl;
-       exit(1);
-    }
-    
++
+    for (i = 1; i < argc; i++) {
+       if (strcmp(argv[i], "--mapi") == 0) {
+        mapi = true;