add debsig-verify support

diff --git a/ChangeLog b/ChangeLog
index 12dd8cac567cbb3d043650bedafeb8fd5bfb89c0..2fa5fe4d24a08ff16e859707c0560dc0808aafd6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Mar  9 21:23:03 CET 2001 Wichert Akkerman <wakkerma@debian.org>
+
+  * include/dpkg.h.in: add DEBSIGVERIFY
+  * main/main.h, main/main.c: add bad-verify override
+
 Fri Mar  9 19:30:22 CET 2001 Wichert Akkerman <wakkerma@debian.org>
 
   * scripts/controllib.pl: change outputclose to deal with comma-related

diff --git a/debian/changelog b/debian/changelog
index 951a6a254acd18ef2c964ea7399a0d9482dac8fd..eda0f5f627d1d2c1fc8195a626ed8162c3a4ba6e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -54,6 +54,7 @@ dpkg (1.9.0) unstable; urgency=low
   * Fix formatting error in dpkg-source.1. Closes: Bug#82723
   * Change dpkg-gencontrol to fix comma-related syntax errors after
     processing substvars
+  * Very package signatures if debsig-verify is installed
 
  -- Wichert Akkerman <wakkerma@debian.org>  UNRELEASED
 

diff --git a/include/dpkg.h.in b/include/dpkg.h.in
index e447833cc6273a77579fc8d8a8e12ff2396272c9..417f0d3d795249ac070e02c44f963912f11ef0ac 100644 (file)
--- a/include/dpkg.h.in
+++ b/include/dpkg.h.in
@@ -115,23 +115,24 @@
 
 #define ARCHIVE_FILENAME_PATTERN "*.deb"
 
-#define BACKEND      "dpkg-deb"
-#define SPLITTER     "dpkg-split"
-#define MD5SUM       "md5sum"
-#define DSELECT      "dselect"
-#define DPKG         "dpkg"
+#define BACKEND                "dpkg-deb"
+#define SPLITTER       "dpkg-split"
+#define MD5SUM         "md5sum"
+#define DSELECT                "dselect"
+#define DPKG           "dpkg"
+#define DEBSIGVERIFY   "/usr/bin/debsig-verify"
 
-#define TAR          "tar"
-#define GZIP         "gzip"
-#define RM           "rm"
-#define FIND         "find"
-#define SHELL        "sh"
+#define TAR            "tar"
+#define GZIP           "gzip"
+#define RM             "rm"
+#define FIND           "find"
+#define SHELL          "sh"
 
-#define SHELLENVIR   "SHELL"
+#define SHELLENVIR     "SHELL"
 
 #define FIND_EXPRSTARTCHARS "-(),!"
 
-#define TARBLKSZ     512
+#define TARBLKSZ       512
 
 /* Take care of NLS matters.  */
 

diff --git a/main/main.c b/main/main.c
index 475b7bb7ba76c93890e34988d1cb9e016c3477ff..f14f78c2408181936615b81fafe5adde3a84be66 100644 (file)
--- a/main/main.c
+++ b/main/main.c
@@ -136,6 +136,7 @@ int fc_removeessential=0, fc_conflicts=0, fc_depends=0, fc_dependsversion=0;
 int fc_autoselect=1, fc_badpath=0, fc_overwritediverted=0, fc_architecture=0;
 int fc_nonroot=0, fc_overwritedir=0, fc_conff_new=0, fc_conff_miss=0;
 int fc_conff_old=0, fc_conff_def=0;
+int fc_badverify = 0;
 
 int errabort = 50;
 const char *admindir= ADMINDIR;
@@ -165,6 +166,7 @@ static const struct forceinfo {
   { "overwrite-diverted",  &fc_overwritediverted        },
   { "overwrite-dir",       &fc_overwritedir             },
   { "architecture",        &fc_architecture             },
+  { "bad-verify",          &fc_badverify                },
   {  0                                                  }
 };
 
@@ -296,6 +298,7 @@ void setforce(const struct cmdinfo *cip, const char *value) {
   not-root               Try to (de)install things even when not root\n\
   overwrite              Overwrite a file from one package with another\n\
   overwrite-diverted     Overwrite a diverted file with an undiverted version\n\
+  bad-verify             Install a package even if it fails authenticity check\n\
   depends-version [!]    Turn dependency version problems into warnings\n\
   depends [!]            Turn all dependency problems into warnings\n\
   confnew [!]            Always use the new config files, don't prompt\n\

diff --git a/main/main.h b/main/main.h
index 5e954ca516e3ad7ef9ef5cbf8215fd1651af07e0..33010c04de6faf3fe0670ddbedfcde5ef5631088 100644 (file)
--- a/main/main.h
+++ b/main/main.h
@@ -86,6 +86,7 @@ extern int fc_removeessential, fc_conflicts, fc_depends, fc_dependsversion;
 extern int fc_autoselect, fc_badpath, fc_overwritediverted, fc_architecture;
 extern int fc_nonroot, fc_overwritedir, fc_conff_new, fc_conff_miss;
 extern int fc_conff_old, fc_conff_def;
+extern int fc_badverify;
 
 extern int errabort;
 extern const char *admindir;