diff -urN dpkg-1.10.10/archtable dpkg-1.10.10.new/archtable --- dpkg-1.10.10/archtable 2003-04-15 16:34:28.000000000 +0000 +++ dpkg-1.10.10.new/archtable 2003-06-24 14:46:01.000000000 +0000 @@ -58,3 +58,5 @@ s390x-linux-gnu s390x s390x s390x-ibm-linux-gnu s390x s390x s390x-unknown-linux-gnu s390x s390x +amd64-linux-gnu amd64 amd64 +x86_64-linux-gnu amd64 amd64 diff -urN dpkg-1.10.10/debian/changelog dpkg-1.10.10.new/debian/changelog --- dpkg-1.10.10/debian/changelog 2003-04-26 20:11:53.000000000 +0000 +++ dpkg-1.10.10.new/debian/changelog 2003-06-24 14:46:01.000000000 +0000 @@ -1,3 +1,9 @@ +dpkg (1.10.10.0lib641) unstable; urgency=low + + * lib64 support added. + + -- Gerhard Tonn Thu, 9 Jun 2003 15:10:24 +0200 + dpkg (1.10.10) unstable; urgency=low * Update archtable for hurd. Closes: #187509. diff -urN dpkg-1.10.10/debian/rules dpkg-1.10.10.new/debian/rules --- dpkg-1.10.10/debian/rules 2003-04-26 20:10:12.000000000 +0000 +++ dpkg-1.10.10.new/debian/rules 2003-06-24 14:47:06.000000000 +0000 @@ -196,7 +196,7 @@ set -e ; for i in dpkg-name dpkg-source dpkg-genchanges dpkg-gencontrol \ dpkg-shlibdeps dpkg-buildpackage dpkg-distaddfile 822-date \ dpkg-scanpackages dpkg-scansources dpkg-architecture \ - dpkg-parsechangelog dpkg-checkbuilddeps ; do \ + dpkg-parsechangelog dpkg-checkbuilddeps dpkg-libinfo ; do \ mv $(INSTALL_TMP)/usr/bin/$$i $(TMP_DPKG_DEV)/usr/bin/ ; \ done set -e ; for i in "" de fr ja sv ; do \ @@ -204,7 +204,7 @@ for m in dpkg-name.1 dpkg-source.1 822-date.1 dpkg-architecture.1 \ dpkg-buildpackage.1 dpkg-distaddfile.1 dpkg-genchanges.1 \ dpkg-gencontrol.1 dpkg-parsechangelog.1 dpkg-shlibdeps.1 \ - dpkg-checkbuilddeps.1 ; do \ + dpkg-checkbuilddeps.1 dpkg-libinfo.1 ; do \ if [ -e $(INSTALL_TMP)/usr/share/man/$$i/man1/$$m ] ; then \ mv $(INSTALL_TMP)/usr/share/man/$$i/man1/$$m $(TMP_DPKG_DEV)/usr/share/man/$$i/man1/$$m ; \ fi ; \ diff -urN dpkg-1.10.10/scripts/Makefile.in dpkg-1.10.10.new/scripts/Makefile.in --- dpkg-1.10.10/scripts/Makefile.in 2002-05-20 04:40:27.000000000 +0000 +++ dpkg-1.10.10.new/scripts/Makefile.in 2003-06-24 14:46:01.000000000 +0000 @@ -9,7 +9,8 @@ dpkg-gencontrol dpkg-shlibdeps dpkg-buildpackage \ dpkg-parsechangelog dpkg-distaddfile 822-date \ dpkg-scanpackages dpkg-scansources \ - dpkg-architecture dpkg-checkbuilddeps + dpkg-architecture dpkg-checkbuilddeps \ + dpkg-libinfo SBIN_SCRIPTS = update-alternatives install-info \ dpkg-divert dpkg-statoverride cleanup-info diff -urN dpkg-1.10.10/scripts/controllib.pl dpkg-1.10.10.new/scripts/controllib.pl --- dpkg-1.10.10/scripts/controllib.pl 2002-05-25 02:46:50.000000000 +0000 +++ dpkg-1.10.10.new/scripts/controllib.pl 2003-06-24 14:46:01.000000000 +0000 @@ -144,11 +144,25 @@ open(CDATA,"< $controlfile") || &error("cannot read control file $controlfile: $!"); $indices= &parsecdata('C',1,"control file $controlfile"); $indices >= 2 || &error("control file must have at least one binary package part"); + $lib64_arch=`dpkg-libinfo -qDEB_LIB64_ARCH`; for ($i=1;$i<$indices;$i++) { defined($fi{"C$i Package"}) || &error("per-package paragraph $i in control info file is ". "missing Package line"); + if (defined($fi{"C$i Package.64"}) && $lib64_arch == 1) { + if (defined($fi{"C$i Substvarname"})) { + $substvar{$fi{"C$i Substvarname"}} = $fi{"C$i Package.64"}; + } else { + $substvar{$fi{"C$i Package"}} = $fi{"C$i Package.64"}; + } + } else { + if (defined($fi{"C$i Substvarname"})) { + $substvar{$fi{"C$i Substvarname"}} = $fi{"C$i Package"}; + } else { + $substvar{$fi{"C$i Package"}} = $fi{"C$i Package"}; + } + } } } @@ -182,7 +196,10 @@ # many=1: many paragraphs like in source control file # many=-1: single paragraph of control data optionally signed local ($index,$cf,$paraborder); + local ($pkg,$pkg64,$vold,$lib64_arch); $index=''; $cf=''; $paraborder=1; + $pkg=0; $pkg64=0; + $lib64_arch=`dpkg-libinfo -qDEB_LIB64_ARCH`; while () { s/\s*\n$//; next if (m/^$/ and $paraborder); @@ -191,7 +208,8 @@ $cf=$1; $v=$2; $cf= &capit($cf); $fi{"$source$index $cf"}= $v; - if (lc $cf eq 'package') { $p2i{"$source $v"}= $index; } + if (lc $cf eq 'package.64' && $lib64_arch == 1) { if ($pkg == 1) { $vold = $fi{"$source$index Package"}; delete $p2i{"$source $vold"}; } $p2i{"$source $v"}= $index; $pkg64 = 1;} + elsif (lc $cf eq 'package' && $pkg64 == 0) { $p2i{"$source $v"}= $index; $pkg = 1;} } elsif (m/^\s+\S/) { length($cf) || &syntax("continued value line not in field"); $fi{"$source$index $cf"}.= "\n$_"; @@ -201,6 +219,7 @@ $many= -2; } elsif (m/^$/) { $paraborder = 1; + $pkg=0; $pkg64=0; if ($many>0) { $index++; $cf=''; } elsif ($many == -2) { diff -urN dpkg-1.10.10/scripts/dpkg-architecture.pl dpkg-1.10.10.new/scripts/dpkg-architecture.pl --- dpkg-1.10.10/scripts/dpkg-architecture.pl 2003-04-15 16:34:28.000000000 +0000 +++ dpkg-1.10.10.new/scripts/dpkg-architecture.pl 2003-06-24 14:46:01.000000000 +0000 @@ -40,7 +40,7 @@ # 1.0.7 -q should not imply -f, because this prevents setting # make variables with non-standard names correctly. -$version="1.0.0"; +$version="1.10.10"; $0 = `basename $0`; chomp $0; $dpkglibdir="/usr/lib/dpkg"; @@ -69,7 +69,8 @@ 'freebsd-i386', 'i386-freebsd', 'netbsd-i386', 'i386-netbsdelf-gnu', 'darwin-powerpc', 'powerpc-darwin', - 'darwin-i386', 'i386-darwin'); + 'darwin-i386', 'i386-darwin', + 'amd64', 'x86_64-linux'); sub usageversion { print STDERR @@ -134,9 +135,13 @@ &warn("Couldn't determine gcc system type, falling back to default (native compilation)"); $gcc = ''; } else { - $gcc =~ s!^.*gcc-lib/([^/]*)/(?:egcs-)?\d+(?:[.\da-z]*)/libgcc.*$!$1!s; - if (defined $1 and $1 ne '') { - $gcc = $1; + if ($gcc =~ m!^.*gcc-lib/([^/]*)/(?:egcs-)?\d+(?:[.\da-z]*)/(64/)?libgcc.*$!) { + # special hack for a biarch i386/x86_64 compiler + if (defined $1 and $1 eq 'i386-linux' and defined $2 and $2 eq '64/' ) { + $gcc = 'x86_64-linux'; + } elsif (defined $1 and $1 ne '') { + $gcc = $1; + } } else { &warn("Couldn't determine gcc system type, falling back to default (native compilation)"); $gcc = ''; diff -urN dpkg-1.10.10/scripts/dpkg-genchanges.pl dpkg-1.10.10.new/scripts/dpkg-genchanges.pl --- dpkg-1.10.10/scripts/dpkg-genchanges.pl 2002-07-02 07:47:47.000000000 +0000 +++ dpkg-1.10.10.new/scripts/dpkg-genchanges.pl 2003-06-24 14:46:01.000000000 +0000 @@ -156,6 +156,8 @@ close(FL); } +$lib64_arch=`dpkg-libinfo -qDEB_LIB64_ARCH`; + for $_ (keys %fi) { $v= $fi{$_}; if (s/^C //) { @@ -166,7 +168,10 @@ elsif (m/|^X[BS]+-|^Standards-Version$/i) { } else { &unknown('general section of control info file'); } } elsif (s/^C(\d+) //) { - $i=$1; $p=$fi{"C$i Package"}; $a=$fi{"C$i Architecture"}; + $i=$1; + if (defined($fi{"C$i Package.64"}) && $lib64_arch==1) { $p=$fi{"C$i Package.64"}; } + else { $p=$fi{"C$i Package"}; } + $a=$fi{"C$i Architecture"}; if (!defined($p2f{$p}) && not $sourceonly) { if ($a eq 'any' || ($a eq 'all' && !$archspecific) || grep($_ eq $substvar{'Arch'}, split(/\s+/, $a))) { @@ -200,7 +205,7 @@ $v = ''; } push(@archvalues,$v) unless !$v || $archadded{$v}++; - } elsif (m/^(Package|Essential|Pre-Depends|Depends|Provides)$/ || + } elsif (m/^(Package|Package.64|Substvarname|Essential|Pre-Depends|Depends|Provides)$/ || m/^(Recommends|Suggests|Enhances|Optional|Conflicts|Replaces)$/ || m/^X[CS]+-/i) { } else { diff -urN dpkg-1.10.10/scripts/dpkg-gencontrol.pl dpkg-1.10.10.new/scripts/dpkg-gencontrol.pl --- dpkg-1.10.10/scripts/dpkg-gencontrol.pl 2002-05-25 03:04:04.000000000 +0000 +++ dpkg-1.10.10.new/scripts/dpkg-gencontrol.pl 2003-06-24 14:46:01.000000000 +0000 @@ -46,7 +46,7 @@ } $i=100;grep($fieldimps{$_}=$i--, - qw(Package Version Section Priority Architecture Essential + qw(Package Package.64 Substvarname Version Section Priority Architecture Essential Pre-Depends Depends Recommends Suggests Enhances Optional Conflicts Replaces Provides Installed-Size Origin Maintainer Bugs Source Description Build-Depends Build-Depends-Indep @@ -96,6 +96,8 @@ } } +$lib64_arch=`dpkg-libinfo -qDEB_LIB64_ARCH`; + &findarch; &parsechangelog; &parsecontrolfile; @@ -124,9 +126,13 @@ else { &unknown('general section of control info file'); } } elsif (s/^C$myindex //) { #print STDERR "P key >$_< value >$v<\n"; - if (m/^(Package|Description|Essential|Pre-Depends|Depends)$/ || + if (m/^(Description|Essential|Pre-Depends|Depends)$/ || m/^(Recommends|Suggests|Enhances|Optional|Conflicts|Provides|Replaces)$/) { $f{$_}= $v; + } elsif (m/^Package$/) { + if (defined($fi{"C$myindex Package.64"}) && $lib64_arch==1) { $f{$_}= $fi{"C$myindex Package.64"}; } + else { $f{$_}= $v; } + } elsif (m/^Package.64$|^Substvarname$/) { } elsif (m/^Section$|^Priority$/) { $spvalue{$_}= $v; } elsif (m/^Architecture$/) { diff -urN dpkg-1.10.10/scripts/dpkg-libinfo.pl dpkg-1.10.10.new/scripts/dpkg-libinfo.pl --- dpkg-1.10.10/scripts/dpkg-libinfo.pl 1970-01-01 00:00:00.000000000 +0000 +++ dpkg-1.10.10.new/scripts/dpkg-libinfo.pl 2003-06-24 14:46:20.000000000 +0000 @@ -0,0 +1,147 @@ +#! /usr/bin/perl +# +# dpkg-libinfo +# +# Copyright 2003 Gerhard Tonn +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +# History +# 0.0.1 Initial release. + +$version="0.0.1"; +$0 = `basename $0`; chomp $0; + +$dpkglibdir="/usr/lib/dpkg"; +push(@INC,$dpkglibdir); +require 'controllib.pl'; + +%archtable=('i386', 'i386-linux', + 'sparc', 'sparc-linux', + 'sparc64', 'sparc64-linux', + 'alpha', 'alpha-linux', + 'm68k', 'm68k-linux', + 'arm', 'arm-linux', + 'powerpc', 'powerpc-linux', + 'mips', 'mips-linux', + 'mipsel', 'mipsel-linux', + 'sh3', 'sh3-linux', + 'sh4', 'sh4-linux', + 'sh3eb', 'sh3eb-linux', + 'sh4eb', 'sh4eb-linux', + 'hppa', 'hppa-linux', + 'hurd-i386', 'i386-gnu', + 's390', 's390-linux', + 's390x', 's390x-linux', + 'ia64', 'ia64-linux', + 'openbsd-i386', 'i386-openbsd', + 'freebsd-i386', 'i386-freebsd', + 'netbsd-i386', 'i386-netbsdelf-gnu', + 'darwin-powerpc', 'powerpc-darwin', + 'darwin-i386', 'i386-darwin', + 'amd64', 'x86_64-linux'); + +sub usageversion { + print STDERR +"Debian $0 $version. Copyright (C) 2003 Gerhard Tonn. +This is free software; see the GNU General Public Licence version 2 +or later for copying conditions. There is NO warranty. + +Usage: + $0 [