add apt-key support for armored GPG key files (*.asc)

[apt.git] / methods / cdrom.cc

diff --git a/methods/cdrom.cc b/methods/cdrom.cc
index c8ec322ee9b6b716c9a34b9f43d006334791bbb1..87a58e94887a7f008ce6e0dc439321f6f5780bd6 100644 (file)
--- a/methods/cdrom.cc
+++ b/methods/cdrom.cc
@@ -8,17 +8,21 @@
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/

-#include <apt-pkg/acquire-method.h>
+#include <config.h>
+

 #include <apt-pkg/cdrom.h>
 #include <apt-pkg/cdromutl.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/cdrom.h>
 #include <apt-pkg/cdromutl.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/fileutl.h>

+#include <apt-pkg/strutl.h>

 #include <apt-pkg/hashes.h>
 
 #include <apt-pkg/hashes.h>
 

+#include "aptmethod.h"
+
+#include <string>
+#include <vector>

 #include <sys/stat.h>
 #include <sys/stat.h>

-#include <unistd.h>
-#include <dlfcn.h>

 
 #include <iostream>
 #include <apti18n.h>
 
 #include <iostream>
 #include <apti18n.h>


@@ -26,7 +30,7 @@
 
 using namespace std;
 
 
 using namespace std;
 

-class CDROMMethod : public pkgAcqMethod
+class CDROMMethod : public aptMethod

 {
    bool DatabaseLoaded;
    bool Debug;
 {
    bool DatabaseLoaded;
    bool Debug;


@@ -38,10 +42,10 @@ class CDROMMethod : public pkgAcqMethod
    pkgUdevCdromDevices UdevCdroms;
  
    bool IsCorrectCD(URI want, string MountPath, string& NewID);
    pkgUdevCdromDevices UdevCdroms;
  
    bool IsCorrectCD(URI want, string MountPath, string& NewID);

-   bool AutoDetectAndMount(URI, string &NewID);
-   virtual bool Fetch(FetchItem *Itm);
+   bool AutoDetectAndMount(const URI, string &NewID);
+   virtual bool Fetch(FetchItem *Itm) APT_OVERRIDE;

    string GetID(string Name);
    string GetID(string Name);

-   virtual void Exit();
+   virtual void Exit() APT_OVERRIDE;

       
    public:
    
       
    public:
    


@@ -51,14 +55,15 @@ class CDROMMethod : public pkgAcqMethod
 // CDROMMethod::CDROMethod - Constructor                               /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 // CDROMMethod::CDROMethod - Constructor                               /*{{{*/
 // ---------------------------------------------------------------------
 /* */

-CDROMMethod::CDROMMethod() : pkgAcqMethod("1.0",SingleInstance | LocalOnly |
+CDROMMethod::CDROMMethod() : aptMethod("cdrom", "1.0",SingleInstance | LocalOnly |

                                          SendConfig | NeedsCleanup |
                                          SendConfig | NeedsCleanup |

-                                         Removable), 
-                                          DatabaseLoaded(false), 
+                                         Removable),
+                                          DatabaseLoaded(false),
+                                         Debug(false),

                                           MountedByApt(false)
 {
    UdevCdroms.Dlopen();
                                           MountedByApt(false)
 {
    UdevCdroms.Dlopen();

-};
+}

                                                                        /*}}}*/
 // CDROMMethod::Exit - Unmount the disc if necessary                   /*{{{*/
 // ---------------------------------------------------------------------
                                                                        /*}}}*/
 // CDROMMethod::Exit - Unmount the disc if necessary                   /*{{{*/
 // ---------------------------------------------------------------------


@@ -92,7 +97,7 @@ string CDROMMethod::GetID(string Name)
 // CDROMMethod::AutoDetectAndMount                                      /*{{{*/
 // ---------------------------------------------------------------------
 /* Modifies class varaiable CDROM to the mountpoint */
 // CDROMMethod::AutoDetectAndMount                                      /*{{{*/
 // ---------------------------------------------------------------------
 /* Modifies class varaiable CDROM to the mountpoint */

-bool CDROMMethod::AutoDetectAndMount(URI Get, string &NewID)
+bool CDROMMethod::AutoDetectAndMount(const URI Get, string &NewID)

 {
    vector<struct CdromDevice> v = UdevCdroms.Scan();
 
 {
    vector<struct CdromDevice> v = UdevCdroms.Scan();
 


@@ -116,9 +121,9 @@ bool CDROMMethod::AutoDetectAndMount(URI Get, string &NewID)
       return false;
 
    // check if we have the mount point
       return false;
 
    // check if we have the mount point

-   const char* AptMountPoint = "/media/apt";
+   string AptMountPoint = _config->FindDir("Dir::Media::MountPath");

    if (!FileExists(AptMountPoint))
    if (!FileExists(AptMountPoint))

-      mkdir(AptMountPoint, 0750);
+      mkdir(AptMountPoint.c_str(), 0750);

 
    // now try mounting
    for (unsigned int i=0; i < v.size(); i++)
 
    // now try mounting
    for (unsigned int i=0; i < v.size(); i++)


@@ -172,7 +177,7 @@ bool CDROMMethod::Fetch(FetchItem *Itm)
 
    URI Get = Itm->Uri;
    string File = Get.Path;
 
    URI Get = Itm->Uri;
    string File = Get.Path;

-   Debug = _config->FindB("Debug::Acquire::cdrom", false);
+   Debug = DebugEnabled();

 
    if (Debug)
       clog << "CDROMMethod::Fetch " << Itm->Uri << endl;
 
    if (Debug)
       clog << "CDROMMethod::Fetch " << Itm->Uri << endl;


@@ -219,8 +224,8 @@ bool CDROMMethod::Fetch(FetchItem *Itm)
       return true;
    }
 
       return true;
    }
 

-   bool AutoDetect = _config->FindB("Acquire::cdrom::AutoDetect", true);
-   CDROM = _config->FindDir("Acquire::cdrom::mount","/cdrom/");
+   bool const AutoDetect = ConfigFindB("AutoDetect", true);
+   CDROM = _config->FindDir("Acquire::cdrom::mount");

    if (Debug)
       clog << "Looking for CDROM at " << CDROM << endl;
 
    if (Debug)
       clog << "Looking for CDROM at " << CDROM << endl;
 


@@ -256,15 +261,16 @@ bool CDROMMethod::Fetch(FetchItem *Itm)
    struct stat Buf;
    if (stat(Res.Filename.c_str(),&Buf) != 0)
       return _error->Error(_("File not found"));
    struct stat Buf;
    if (stat(Res.Filename.c_str(),&Buf) != 0)
       return _error->Error(_("File not found"));

-   
+
+   URIStart(Res);

    if (NewID.empty() == false)
       CurrentID = NewID;
    Res.LastModified = Buf.st_mtime;
    Res.Size = Buf.st_size;
 
    if (NewID.empty() == false)
       CurrentID = NewID;
    Res.LastModified = Buf.st_mtime;
    Res.Size = Buf.st_size;
 

-   Hashes Hash;
+   Hashes Hash(Itm->ExpectedHashes);

    FileFd Fd(Res.Filename, FileFd::ReadOnly);
    FileFd Fd(Res.Filename, FileFd::ReadOnly);

-   Hash.AddFD(Fd.Fd(), Fd.Size());
+   Hash.AddFD(Fd);

    Res.TakeHashes(Hash);
 
    URIDone(Res);
    Res.TakeHashes(Hash);
 
    URIDone(Res);


@@ -274,8 +280,6 @@ bool CDROMMethod::Fetch(FetchItem *Itm)
 
 int main()
 {
 
 int main()
 {

-   setlocale(LC_ALL, "");
-
-   CDROMMethod Mth;
-   return Mth.Run();
+   _config->CndSet("Binary::cdrom::Debug::NoDropPrivs", true);
+   return CDROMMethod().Run();

 }
 }