remove --import

diff --git a/ChangeLog b/ChangeLog
index 10bae163f0ee63f6ce23cee669a59814235fa88a..d27dd18827099797dc9c972f1c2e910f9e8d58d8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Jan  8 15:46:13 PST 2001 Wichert Akkerman <wakkerma@debian.org>
+
+  * scripts/dpkg-statoverride.{pl,8}: remove --import option now that
+    suidmanager can convert everything
+
 Mon Jan  8 15:12:21 PST 2001 Wichert Akkerman <wakkerma@debian.org>
 
   * scripts/dpkg-source.pl: add vim swapfiles to the default ignore regexp

diff --git a/debian/changelog b/debian/changelog
index 13016a1e1f15f963c5b432bd4abecea0f745bcd4..34a208bb16f0c288381d14eb5aa849b694bd0ca5 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ dpkg (1.9.0) unstable; urgency=low
   * Update French translation, Closes: Bug#65284
   * Add French manpages, courtesy of Philippe Batailler
   * Ingore vim swapfiles in dpkg-soruce, Closes: Bug#81630
+  * remove --import option from dpkg-statoverride, Closes: Bug#81358
 
  -- Wichert Akkerman <wakkerma@debian.org>  UNRELEASED
 

diff --git a/scripts/dpkg-statoverride.8 b/scripts/dpkg-statoverride.8
index 8e9661339913d7333270393679089e0157f21e95..cc9b3bf4a2cb89ff0d29e3ec828c5f83d8851949 100644 (file)
--- a/scripts/dpkg-statoverride.8
+++ b/scripts/dpkg-statoverride.8
@@ -6,8 +6,6 @@ dpkg-statoverride -- override ownership and mode of files
 .br
 \fBdpkg-statoverride\fR [options] --remove \fI<file>\fR
 .br
-\fBdpkg-statoverride\fR [options] --import \fI<package>\fR \fI<file>\fR
-.br
 \fBdpkg-statoverride\fR [options] --list \fI[<glob-pattern>]\fR
 .SH DESCRIPTION
 `\fBstat overrides\fR' are a way to tell dpkg to use a different owner
@@ -32,13 +30,6 @@ groups can be specified by their name (for example \fBroot\fR or
 .I --remove <file>
 Remove an override for \fB<file>\fR.
 .TP
-.TP
-.I --import <package> <file>
-Import the override for file \fB<file>\fR as provided by package
-\fB<package>\fR from the suidmanager configuration. If the user
-has not made an override nothing is done and the default permissions
-are used. If an override is present it is removed from
-\fI/etc/suid.conf\fR and added to the statoverride database.
 .I --list [<glob-pattern>]
 List all overrides. If a glob pattern is specified restrict the output
 to overrides which match the glob.

diff --git a/scripts/dpkg-statoverride.pl b/scripts/dpkg-statoverride.pl
index 20cdad1429c9c6edd3a7ef1a107f44062771c768..68e4db68e7a120ca58ff48edbd643dbd45069807 100755 (executable)
--- a/scripts/dpkg-statoverride.pl
+++ b/scripts/dpkg-statoverride.pl
@@ -22,7 +22,6 @@ for copying conditions.  There is NO warranty.
 Usage:
 
   dpkg-statoverride [options] --add <owner> <group> <mode> <file>
-  dpkg-statoverride [options] --import <package> <file>
   dpkg-statoverride [options] --remove <file>
   dpkg-statoverride [options] --list [<glob-pattern>]
 
@@ -65,9 +64,6 @@ while (@ARGV) {
        } elsif (m/^--list$/) {
                &CheckModeConflict;
                $mode= 'list';
-       } elsif (m/^--import$/) {
-               &CheckModeConflict;
-               $mode= 'import';
        } else {
                &badusage("unknown option \`$_'");
        }
@@ -136,38 +132,6 @@ if ($mode eq "add") {
        delete $mode{$file};
        $dowrite=1;
        print STDERR "warning: --update is useless for --remove\n" if ($doupdate);
-} elsif ($mode eq "import") {
-       @ARGV==2 || &badusage("--import needs two arguments");
-       $pkg=$ARGV[0];
-       $file=$ARGV[1];
-       if (defined $owner{$file}) {
-               print STDERR "An override for \"$file\" already exists, ";
-               if ($doforce) {
-                       print STDERR "but --force specified so lets ignore it.\n";
-               } else {
-                       print STDERR "aborting\n";
-                       exit(3);
-               }
-       }
-       open(SUIDCONF,"/etc/suid.conf") || &quit("error opening /etc/suid.conf");
-       while (<SUIDCONF>) {
-               next if (m/^\w*#/);
-               chomp;
-               ($sm_pkg,$sm_file,$sm_user,$sm_group)=split;
-               next if ($sm_file ne $file);
-               next if ($sm_pkg eq $pkg);
-               $sm_user="#$sm_user" if ($sm_user =~ m/^\d*$/);
-               $sm_group="#$sm_group" if ($sm_group =~ m/^\d*$/);
-               $owner{$fm_file}=$sm_user;
-               $group{$fm_file}=$sm_group;
-               if ( -x "/usr/sbin/suidunregister") {
-                       @args = ("suidunregister", "$file");
-                       system(@args) == 0 || &quit("suidunregister failed");
-               }
-               $dowrite=1;
-               last;
-       }
-       close(SUIDCONF);
 } elsif ($mode eq "list") {
        my (@list,@ilist,$pattern,$file);