From ec79ead71462c0859135fe29e6ae3ce0d53c57ba Mon Sep 17 00:00:00 2001 From: Wichert Akkerman Date: Sun, 25 Feb 2001 19:16:17 +0000 Subject: [PATCH] debian/changelog: merged additions from v1.8 branch scripts/controllib.pl: + no need to have Origin in capit + consistently use &warn + fix -s to export all variables instead of just the first scripts/dpkg-genchanges.pl: do not complain about missing packages if doing a source-only build scripts/dpkg-buildpackage.sh: + correct filename for secret keyring in gpg test + fix -C + skip signing pause of building unsigned packages + improve srcmsg + test for invalid signinterface --- ChangeLog | 16 ++++++++++++ debian/changelog | 48 ++++++++++++++++++++++++++++++++++-- scripts/controllib.pl | 4 +-- scripts/dpkg-architecture.pl | 1 + scripts/dpkg-buildpackage.sh | 44 +++++++++++++++++++++++---------- scripts/dpkg-genchanges.pl | 2 +- scripts/dpkg-statoverride.8 | 8 +++--- 7 files changed, 101 insertions(+), 22 deletions(-) diff --git a/ChangeLog b/ChangeLog index 96ce1f06..180d367e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,19 @@ +Sun Feb 25 19:17:53 CET 2001 Wichert Akkerman + + * debian/changelog: merged additions from v1.8 branch + * scripts/controllib.pl: + + no need to have Origin in capit + + consistently use &warn + + fix -s to export all variables instead of just the first + * scripts/dpkg-genchanges.pl: do not complain about missing packages + if doing a source-only build + * scripts/dpkg-buildpackage.sh: + + correct filename for secret keyring in gpg test + + fix -C + + skip signing pause of building unsigned packages + + improve srcmsg + + test for invalid signinterface + Sun Feb 25 19:10:33 CET 2001 Wichert Akkerman * doc/fr/dpkg.8, doc-fr/install-info.8, doc-fr/update-alternatives.8, diff --git a/debian/changelog b/debian/changelog index f72aa1d9..c9a221c5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -23,14 +23,58 @@ dpkg (1.9.0) unstable; urgency=low * 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. + * Minor script changes, Closes: Bug#87485 + * Stop dpkg-genchanges from complaining about missing packages + when doing a source-only build. Closes: Bug#87571 + * Make dpkg-architecture -s export all variables instead of only + the first + * dpkg-buildpackage updates: Closes: Bug#87572 + + make -C work properly + + fix test for gpg secret keyring + + improve source messages + + skip signing pause when building unsigned packages + + test for invalid signinterface. Closes: Bug#87579 + * Fix wording in dpkg-statoverride manpage for --add. Closes: Bug#85080 -- Wichert Akkerman UNRELEASED +dpkg (1.8.3.1) unstable; urgency=low + + * Revert change to nfmalloc.c that was causing SIGBUS on sparc. + + -- Ben Collins Sat, 13 Jan 2001 08:52:11 -0500 + +dpkg (1.8.3) unstable; urgency=low + + * Do chown before chmod in dpkg-statoverride, Closes: Bug#81943 + * Fix recusion in dpkg-shlibdeps, Closes: Bug#81322 + * Really completely revert dpkg-source patches which broke backwards + compatibility + + -- Wichert Akkerman Fri, 12 Jan 2001 00:02:22 -0800 + +dpkg (1.8.2) unstable; urgency=low + + * Don't attempt to read from an input source when we only want 0 bytes. + Also handle buggy systems that return EAGAIN instead of EINTR. Closes: + #81881. + + -- Adam Heath Thu, 11 Jan 2001 00:43:50 -0600 + +dpkg (1.8.1.1) unstable; urgency=low + + * Apply patch from bug to fix badly generated diffs(in some + circumstances). Closes: #81152 + + -- Adam Heath Sat, 6 Jan 2001 16:07:33 -0600 + dpkg (1.8.1) unstable; urgency=low * Make --name a valid option. Closes: #31206, #51953. + * dpkg-deb -I works again + * Update Swedish translation - -- Wichert Akkerman UNRELEASED + -- Wichert Akkerman Thu, 4 Jan 2001 19:31:13 +0100 dpkg (1.8.0) unstable; urgency=low @@ -87,7 +131,7 @@ dpkg (1.8.0) unstable; urgency=low Closes: Bug#80237 * List descriptions for udebs in .changes - -- Wichert Akkerman UNRELEASED + -- Wichert Akkerman Mon, 25 Dec 2000 17:19:31 +0100 dpkg (1.7.2) unstable; urgency=low diff --git a/scripts/controllib.pl b/scripts/controllib.pl index 0a97ac79..bb88453a 100755 --- a/scripts/controllib.pl +++ b/scripts/controllib.pl @@ -14,7 +14,7 @@ $parsechangelog= 'dpkg-parsechangelog'; grep($capit{lc $_}=$_, qw(Pre-Depends Standards-Version Installed-Size - Build-Depends Build-Depends-Indep Origin + Build-Depends Build-Depends-Indep Build-Conflicts Build-Conflicts-Indep)); @@ -57,7 +57,7 @@ if (defined ($ENV{'LOGNAME'})) { @fowner = getpwnam ($getlogin); if (! @fowner) { die (sprintf ('unable to get login information for username "%s"', $getlogin)); } } else { - warn (sprintf ('no utmp entry available and LOGNAME not defined; using uid of process (%d)', $<)); + &warn (sprintf ('no utmp entry available and LOGNAME not defined; using uid of process (%d)', $<)); @fowner = getpwuid ($<); if (! @fowner) { die (sprintf ('unable to get login information for uid %d', $<)); } } diff --git a/scripts/dpkg-architecture.pl b/scripts/dpkg-architecture.pl index 33e6be35..039b8939 100755 --- a/scripts/dpkg-architecture.pl +++ b/scripts/dpkg-architecture.pl @@ -231,6 +231,7 @@ if ($action eq 'l') { print join("\n",@env)."\n"; } elsif ($action eq 's') { print "export ".join("\n",@env)."\n" if ($#env != 0); + print "export ".join("\nexport ",@env)."\n" if ($#enf != 0); } elsif ($action eq 'u') { print "unset DEB_BUILD_ARCH DEB_BUILD_GNU_CPU DEB_BUILD_GNU_SYSTEM DEB_BUILD_GNU_TYPE DEB_HOST_ARCH DEB_HOST_GNU_CPU DEB_HOST_GNU_SYSTEM DEB_HOST_GNU_TYPE\n"; } elsif ($action eq 'c') { diff --git a/scripts/dpkg-buildpackage.sh b/scripts/dpkg-buildpackage.sh index db90571b..cbd6149d 100755 --- a/scripts/dpkg-buildpackage.sh +++ b/scripts/dpkg-buildpackage.sh @@ -45,7 +45,7 @@ END rootcommand='' signcommand="" -if [ -e $GNUPGHOME/secring.pgp -o -e $HOME/.gnupg/secring.gpg ] && \ +if [ -e $GNUPGHOME/secring.gpg -o -e $HOME/.gnupg/secring.gpg ] && \ command -v gpg > /dev/null 2>&1; then signcommand=gpg elif command -v pgp > /dev/null 2>&1 ; then @@ -78,7 +78,7 @@ do -us) signsource=: ;; -uc) signchanges=: ;; -ap) usepause="true";; - -a*) opt_a=1; targetarch="$value" ;; + -a*) targetarch="$value" ;; -si) sourcestyle=-si ;; -sa) sourcestyle=-sa ;; -sd) sourcestyle=-sd ;; @@ -95,7 +95,7 @@ do -v*) since="$value" ;; -m*) maint="$value" ;; -e*) changedby="$value" ;; - -C*) descfile="$value" ;; + -C*) desc="$value" ;; *) echo >&2 "$progname: unknown option or argument $1" usageversion; exit 2 ;; esac @@ -112,6 +112,13 @@ if test -n "$forcesigninterface" ; then else signinterface=$signcommand fi + +if [ "$signinterface" != "gpg" -a "$signinterface" != "pgp" -a \ + "$signitnerface" != "debsign" ] ; \ + echo >&2 "$progname: invalid sign interface specified" + exit 1 +fi + if test "$signinterface" = "debsign"; then signsource=: fi @@ -141,7 +148,7 @@ else fi sversion=`echo "$version" | perl -pe 's/^\d+://'` pv="${package}_${sversion}" -pva="${package}_${sversion}${arch:+_${arch}}" +pva="${package}_${sversion}_${arch} signfile () { if test "$signinterface" = "gpg" ; then @@ -184,7 +191,7 @@ if [ x$sourceonly = x ]; then withecho debian/rules build $archlist withecho $rootcommand debian/rules $binarytarget $archlist fi -if [ "$usepause" = "true" ] && [ "x$binaryonly" = x -o "x$signchanges" != x ] ; then +if [ "$usepause" = "true" -a "signchanges" != ":" ] && [ "x$binaryonly" = x -o "x$signchanges" != x ] ; then echo Press the return key to start signing process read dummy_stuff fi @@ -203,16 +210,27 @@ fileomitted () { return $fir } -if fileomitted '\.dsc'; then - srcmsg='no source included in upload' -elif fileomitted '\.diff\.gz'; then - srcmsg='Debian-specific package; upload is full source' -elif fileomitted '\.orig\.tar\.gz'; then - srcmsg='diff-only upload (original source NOT included)' -elif fileomitted '\.deb'; then - srcmsg='source-only upload' + +if fileomitted '\.deb'; then + # source only upload + if fileomitted '\.diff\.gz'; then + srcmsg='source only upload: Debian-native package' + elif fileomitted '\.orig\.tar\.gz'; then + srcmsg='source only, diff-only upload (original source NOT included)' + else + srcmsg='source only upload (original source is included)' + fi else srcmsg='full upload (original source is included)' + if fileomitted '\.dsc'; then + srcmsg='binary only upload (no source included)' + elif fileomitted '\.diff\.gz'; then + srcmsg='full upload; Debian-native package (full source is included)' + elif fileomitted '\.orig\.tar\.gz'; then + srcmsg='binary and diff upload (original source NOT included)' + else + srcmsg='full upload (original source is included)' + fi fi $signchanges "$pva.changes" diff --git a/scripts/dpkg-genchanges.pl b/scripts/dpkg-genchanges.pl index 2ebd73ce..285e729e 100755 --- a/scripts/dpkg-genchanges.pl +++ b/scripts/dpkg-genchanges.pl @@ -167,7 +167,7 @@ for $_ (keys %fi) { else { &unknown('general section of control info file'); } } elsif (s/^C(\d+) //) { $i=$1; $p=$fi{"C$i Package"}; $a=$fi{"C$i Architecture"}; - if (!defined($p2f{$p})) { + if (!defined($p2f{$p}) && not $sourceonly) { if ($a eq 'any' || ($a eq 'all' && !$archspecific) || grep($_ eq $substvar{'Arch'}, split(/\s+/, $a))) { &warn("package $p in control file but not in files list"); diff --git a/scripts/dpkg-statoverride.8 b/scripts/dpkg-statoverride.8 index cc9b3bf4..12df5180 100644 --- a/scripts/dpkg-statoverride.8 +++ b/scripts/dpkg-statoverride.8 @@ -21,10 +21,10 @@ overrides. .SH OPTIONS .TP .I --add -Add an override for \fB\fR. The might does not need to exist at -this moment, the override will be stored and used later. Users and -groups can be specified by their name (for example \fBroot\fR or -\fBnobody\fR), or by their number by prepending the number with a +Add an override for \fB\fR. \fB\fR does not need to exist +when this command is used; the override will be stored and used later. +Users and groups can be specified by their name (for example \fBroot\fR +or \fBnobody\fR), or by their number by prepending the number with a `\fB#\fR' (for example \fB#0\fR or \fB#65534\fR). .TP .I --remove -- 2.39.5