From e2cb8442cb67e86312f8dfd4bb1a7b335b0e5a6f Mon Sep 17 00:00:00 2001 From: Wichert Akkerman Date: Fri, 23 Feb 2001 10:15:23 +0000 Subject: [PATCH] scripts/dpkg-divert.pl: fix typo in usage message main/help.c: mangle argv[0] in do_script to always be the full path include/dpkg-db.h: include string.h so things compile on ia64 scripts/dpkg-architecture.pl: add ia64 --- ChangeLog | 7 +++++++ debian/changelog | 3 +++ include/dpkg-db.h | 1 + main/help.c | 1 + scripts/dpkg-architecture.pl | 1 + scripts/dpkg-divert.pl | 2 +- scripts/dpkg-source.pl | 2 +- 7 files changed, 15 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 67c199e2..36454462 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Fri Feb 23 10:22:02 CET 2001 Wichert Akkerman + + * scripts/dpkg-divert.pl: fix typo in usage message + * main/help.c: mangle argv[0] in do_script to always be the full path + * include/dpkg-db.h: include string.h so things compile on ia64 + * scripts/dpkg-architecture.pl: add ia64 + Thu Feb 15 11:24:46 EST 2001 Ben Collins * utils/Makefile.in: Do not use libopt.a, since libdpkg.a not includes those diff --git a/debian/changelog b/debian/changelog index 1b541ef3..3812892e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -19,6 +19,9 @@ dpkg (1.9.0) unstable; urgency=low Closes: Bug#82797 * Fix manpage for dpkg-gencontrol. Fies: Bug#84625 * Use POSIX glob instead of regexp in debian/rules. Closes: Bug#84582 + * fix typo in usage message for dpkg-divert, Closes: Bug#85977 + * Use full path for argv[0] when calling scripts. Closes: Bug#68783 + * Add ia64 support to dpkg-architecture. -- Wichert Akkerman UNRELEASED diff --git a/include/dpkg-db.h b/include/dpkg-db.h index f9342048..8ac50578 100644 --- a/include/dpkg-db.h +++ b/include/dpkg-db.h @@ -24,6 +24,7 @@ #include #include +#include struct versionrevision { unsigned long epoch; diff --git a/main/help.c b/main/help.c index 452456b9..858012bc 100644 --- a/main/help.c +++ b/main/help.c @@ -260,6 +260,7 @@ static int do_script(const char *pkg, const char *scriptname, const char *script c1= m_fork(); if (!c1) { scriptexec= preexecscript(scriptpath,arglist); + arglist[0]=scriptexec; execv(scriptexec,arglist); ohshite(desc,name); } diff --git a/scripts/dpkg-architecture.pl b/scripts/dpkg-architecture.pl index 61c9655c..33e6be35 100755 --- a/scripts/dpkg-architecture.pl +++ b/scripts/dpkg-architecture.pl @@ -61,6 +61,7 @@ require 'controllib.pl'; 'hppa', 'hppa-linux', 'hurd-i386', 'i386-gnu', 's390', 's390-linux', + 'ia64', 'ia64-linux', 'openbsd-i386', 'i386-openbsd' 'freebsd-i386', 'i386-freebsd'); diff --git a/scripts/dpkg-divert.pl b/scripts/dpkg-divert.pl index 03c591c9..8093a3da 100755 --- a/scripts/dpkg-divert.pl +++ b/scripts/dpkg-divert.pl @@ -25,7 +25,7 @@ Usage: dpkg-divert [options] [--add] - add a diversion dpkg-divert [options] --remove - remove the diversion dpkg-divert [options] --list [] - show file diversions - dpkg-divert [options] --truname - return the diverted file + dpkg-divert [options] --truename - return the diverted file Options: --package name of the package whose copy of diff --git a/scripts/dpkg-source.pl b/scripts/dpkg-source.pl index 4ca6c953..0f1e2e27 100755 --- a/scripts/dpkg-source.pl +++ b/scripts/dpkg-source.pl @@ -936,8 +936,8 @@ sub extracttar { defined($c2= fork) || &syserr("fork for tar -xkf -"); if (!$c2) { open(STDIN,"<&GZIP") || &syserr("reopen gzip for tar -xkf -"); - chdir("$dirchdir") || &syserr("cannot chdir to \`$dirchdir' for tar extract"); &cpiostderr; + chdir("$dirchdir") || &syserr("cannot chdir to \`$dirchdir' for tar extract"); exec('tar','-xkf','-'); &syserr("exec tar -xkf -"); } close(GZIP); -- 2.39.5