Use the perl POSIX module instead of the enoent helper binary

diff --git a/ChangeLog b/ChangeLog
index 5be8f7efb93e44894bf491290eaf2b6463cf042c..059d4203eca6c9e112fcfcb2c74694ece09713c6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2008-01-16  Guillem Jover  <guillem@debian.org>
+
+       * scripts/dpkg-divert.pl: Use :errno_h from POSIX.
+       ($enoent): Remove variable.
+       (ENOENT): Remove function.
+       * scripts/update-alternatives.pl: Likewise.
+       * utils/Makefile.am (pkglib_PROGRAMS): Remove variable.
+       (enoent_SOURCES): Likewise.
+       * utils/enoent.c: Remove file.
+
 2008-01-16  Guillem Jover  <guillem@debian.org>
 
        * dpkg-deb/build.c (do_build): Use NULL instead of 0.

diff --git a/debian/changelog b/debian/changelog
index 5778f49f692e4bcb2cbb470994b79dfcda8c99af..a8992a7e0fef827c572853a94d58e81677660c55 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ dpkg (1.14.16) UNRELEASED; urgency=low
     Closes: #402901
   * Do not warn about unrecognized Homepage field in binary package stanzas
     in dpkg-genchanges and dpkg-source. Closes: #460309
+  * Do not use the enoent helper binary, and use perl POSIX module instead.
 
   [ Frank Lichtenheld ]
   * Make the -L option of dpkg-parsechangelog actually work (it's

diff --git a/debian/dpkg.install b/debian/dpkg.install
index 38e06f7fea3a4c4b55b26c5615d0f6944a54e3a4..2f546183e768e182daebe5132631796257cad68a 100644 (file)
--- a/debian/dpkg.install
+++ b/debian/dpkg.install
@@ -7,7 +7,6 @@ usr/bin/dpkg
 usr/bin/dpkg-deb
 usr/bin/dpkg-query
 usr/bin/dpkg-split
-usr/lib/dpkg/enoent
 usr/lib/dpkg/mksplit
 usr/sbin
 usr/share/dpkg

diff --git a/scripts/dpkg-divert.pl b/scripts/dpkg-divert.pl
index 6eeb81886e674763d948d35b9ba3ea3ed089fdad..8c13cb8d25b3e519ff98b277a5ff34e472fa6a75 100755 (executable)
--- a/scripts/dpkg-divert.pl
+++ b/scripts/dpkg-divert.pl
@@ -3,14 +3,12 @@
 use strict;
 use warnings;
 
+use POSIX qw(:errno_h);
 use Dpkg;
 use Dpkg::Gettext;
 
 textdomain("dpkg");
 
-my $enoent = `$dpkglibdir/enoent` || die sprintf(_g("Cannot get ENOENT value from %s: %s"), "$dpkglibdir/enoent", $!);
-sub ENOENT { $enoent; }
-
 sub version {
     printf _g("Debian %s version %s.\n"), $progname, $version;
 

diff --git a/scripts/update-alternatives.pl b/scripts/update-alternatives.pl
index a7c85b4408d39e376a736aa600a044e71b8c1798..07d12b91e7d8cb086540c5a12d2cbdc9886bd6a4 100755 (executable)
--- a/scripts/update-alternatives.pl
+++ b/scripts/update-alternatives.pl
@@ -3,6 +3,7 @@
 use strict;
 use warnings;
 
+use POSIX qw(:errno_h);
 use Dpkg;
 use Dpkg::Gettext;
 
@@ -53,9 +54,6 @@ my @slavelinks;       # List of slavelinks (indexed by slave-index)
 my %slavepath;        # Map from (@version-index,slavename) to slave-path
 my %slavelinkcount;
 
-my $enoent = `$dpkglibdir/enoent` || die sprintf(_g("Cannot get ENOENT value from %s: %s"), "$dpkglibdir/enoent", $!);
-sub ENOENT { $enoent; }
-
 sub version {
     printf _g("Debian %s version %s.\n"), $progname, $version;
 

diff --git a/utils/Makefile.am b/utils/Makefile.am
index 9cfd988dddcaed34277fdc2d6777c8acb9706fa3..e78f3ddaa9bd10ef12f25a76877111117fdab263 100644 (file)
--- a/utils/Makefile.am
+++ b/utils/Makefile.am
@@ -16,8 +16,3 @@ if WITH_START_STOP_DAEMON
   start_stop_daemon_LDADD = ../getopt/libopt.a $(SSD_LIBS)
 endif
 
-
-pkglib_PROGRAMS = enoent
-
-enoent_SOURCES = \
-       enoent.c

diff --git a/utils/enoent.c b/utils/enoent.c
deleted file mode 100644 (file)
index 9d764e4..0000000
--- a/utils/enoent.c
+++ /dev/null
@@ -1,12 +0,0 @@
-/* This program ensures that dpkg-divert and update-alternatives don't depend on POSIX.pm
- * being available and usable. This is probably a good thing since the perl packages have
- * known deficiencies to ensure that during upgrades. */
-
-#include <stdio.h>
-#include <errno.h>
-
-int main(int argc, char** argv) {
-       printf("%d", ENOENT);
-       return 0;
-}
-