Bug#179661: marked as done (Support for hyphenated GNU OS values)
Your message dated Mon, 28 Apr 2003 10:43:34 -0400
with message-id <E19A9qw-0001MT-00@auric.debian.org>
and subject line Bug#179661: fixed in dpkg 1.10.10
has caused the attached Bug report to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what I am
talking about this indicates a serious mail system misconfiguration
somewhere. Please contact me immediately.)
Debian bug tracking system administrator
(administrator, Debian Bugs database)
--------------------------------------
Received: (at submit) by bugs.debian.org; 3 Feb 2003 21:09:11 +0000
>From lucifer@lightbearer.com Mon Feb 03 15:09:09 2003
Return-path: <lucifer@lightbearer.com>
Received: from 34.mufa.clsp.snfccafj.dsl.att.net (dogma.lightbearer.com) [12.99.69.34] (qmailr)
by master.debian.org with smtp (Exim 3.12 1 (Debian))
id 18fnq0-0002U0-00; Mon, 03 Feb 2003 15:09:08 -0600
Received: (qmail 31012 invoked by uid 1000); 3 Feb 2003 21:09:06 -0000
Date: Mon, 3 Feb 2003 14:09:06 -0700
From: Joel Baker <fenton@debian.org>
To: submit@bugs.debian.org
Subject: Support for hyphenated GNU OS values
Message-ID: <20030203210906.GA30809@lightbearer.com>
Mime-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha1;
protocol="application/pgp-signature"; boundary="9zSXsLTf0vkW971A"
Content-Disposition: inline
User-Agent: Mutt/1.3.28i
Delivered-To: submit@bugs.debian.org
X-Spam-Status: No, hits=-6.4 required=5.0
tests=PGP_SIGNATURE_2,SPAM_PHRASE_00_01,USER_AGENT,
USER_AGENT_MUTT
version=2.41
X-Spam-Level:
--9zSXsLTf0vkW971A
Content-Type: multipart/mixed; boundary="oyUTqETQ0mS9luUI"
Content-Disposition: inline
--oyUTqETQ0mS9luUI
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
Package: dpkg
Version: 1.10.9
Severity: wishlist
Tags: patch
Two new GNU OS values relevant to the Debian project have hyphens in their
OS fields (netbsdelf-gnu and freebsd-gnu). When handling one of these
systems, dpkg-architecture returns invalid values for some fields (in
particular, GNU_SYSTEM entries), and can cause them to be mistaken for Hurd
systems (since the parsing returns the part beyond the last hyphen in the
GNU_TYPE variable, resulting in a bare 'gnu' in both cases).
I have attached patches to dpkg-architecture.pl that change how the string
handling is done, and should cope with any hyphenated value for upstream
GNU OS names.
--=20
Joel Baker <fenton@debian.org>
--oyUTqETQ0mS9luUI
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename=003_gnu_triple_4
Content-Transfer-Encoding: quoted-printable
diff -ur dpkg-1.10.9.orig/scripts/dpkg-architecture.pl dpkg-1.10.9/scripts/=
dpkg-architecture.pl
--- dpkg-1.10.9.orig/scripts/dpkg-architecture.pl 2003-02-03 04:02:35.00000=
0000 +0000
+++ dpkg-1.10.9/scripts/dpkg-architecture.pl 2003-02-03 04:01:44.000000000 =
+0000
@@ -124,10 +124,9 @@
}
chomp $deb_build_arch;
$deb_build_gnu_type =3D $archtable{$deb_build_arch};
-$deb_build_gnu_cpu =3D $deb_build_gnu_type;
-$deb_build_gnu_system =3D $deb_build_gnu_type;
-$deb_build_gnu_cpu =3D~ s/-.*$//;
-$deb_build_gnu_system =3D~ s/^.*-//;
+@deb_build_gnu_triple =3D split(/-/, $deb_build_gnu_type, 2);
+$deb_build_gnu_cpu =3D $deb_build_gnu_triple[0];
+$deb_build_gnu_system =3D $deb_build_gnu_triple[1];
=20
# Default host: Current gcc.
$gcc =3D `\${CC:-gcc} --print-libgcc-file-name`;
@@ -154,8 +153,9 @@
$gcc=3D$archtable{$list[0]};
$deb_host_arch =3D $list[0];
$deb_host_gnu_type =3D $gcc;
- ($deb_host_gnu_system =3D $gcc) =3D~ s/^.*-//;
- ($deb_host_gnu_cpu =3D $gcc ) =3D~ s/-.*$//;
+ @deb_host_gnu_triple =3D split(/-/, $deb_host_gnu_type, 2);
+ $deb_host_gnu_cpu =3D $deb_host_gnu_triple[0];
+ $deb_host_gnu_system =3D $deb_host_gnu_triple[1];
}
}
if (!defined($deb_host_arch)) {
@@ -214,9 +214,10 @@
=20
$deb_host_arch =3D $req_host_arch if $req_host_arch ne '';
if ($req_host_gnu_type ne '') {
- $deb_host_gnu_cpu =3D $deb_host_gnu_system =3D $deb_host_gnu_type =3D =
$req_host_gnu_type;
- $deb_host_gnu_cpu =3D~ s/-.*$//;
- $deb_host_gnu_system =3D~ s/^.*-//;
+ $deb_host_gnu_type =3D $req_host_gnu_type;
+ @deb_host_gnu_triple =3D split(/-/, $deb_host_gnu_type, 2);
+ $deb_host_gnu_cpu =3D $deb_host_gnu_triple[0];
+ $deb_host_gnu_system =3D $deb_host_gnu_triple[1];
}
=20
#$gcc =3D `\${CC:-gcc} --print-libgcc-file-name`;
--oyUTqETQ0mS9luUI--
--9zSXsLTf0vkW971A
Content-Type: application/pgp-signature
Content-Disposition: inline
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.0.6 (GNU/Linux)
Comment: For info see http://www.gnupg.org
iD8DBQE+PtpylZCPwGNtWe4RAlUlAJ972nDCWvTAMPCI5WpMdL8KVZJRYgCbBmrJ
w9OPar0JgnstwvJ/dFXkXZM=
=M8B8
-----END PGP SIGNATURE-----
--9zSXsLTf0vkW971A--
---------------------------------------
Received: (at 179661-close) by bugs.debian.org; 28 Apr 2003 14:53:18 +0000
>From troup@auric.debian.org Mon Apr 28 09:53:18 2003
Return-path: <troup@auric.debian.org>
Received: from auric.debian.org [206.246.226.45] (mail)
by master.debian.org with esmtp (Exim 3.12 1 (Debian))
id 19AA0L-0008SX-00; Mon, 28 Apr 2003 09:53:18 -0500
Received: from troup by auric.debian.org with local (Exim 3.35 1 (Debian))
id 19A9qw-0001MT-00; Mon, 28 Apr 2003 10:43:34 -0400
From: Adam Heath <doogie@debian.org>
To: 179661-close@bugs.debian.org
X-Katie: lisa $Revision: 1.23 $
Subject: Bug#179661: fixed in dpkg 1.10.10
Message-Id: <E19A9qw-0001MT-00@auric.debian.org>
Sender: James Troup <troup@auric.debian.org>
Date: Mon, 28 Apr 2003 10:43:34 -0400
Delivered-To: 179661-close@bugs.debian.org
We believe that the bug you reported is fixed in the latest version of
dpkg, which is due to be installed in the Debian FTP archive:
dpkg-dev_1.10.10_all.deb
to pool/main/d/dpkg/dpkg-dev_1.10.10_all.deb
dpkg-doc_1.10.10_all.deb
to pool/main/d/dpkg/dpkg-doc_1.10.10_all.deb
dpkg_1.10.10.dsc
to pool/main/d/dpkg/dpkg_1.10.10.dsc
dpkg_1.10.10.tar.gz
to pool/main/d/dpkg/dpkg_1.10.10.tar.gz
dpkg_1.10.10_i386.deb
to pool/main/d/dpkg/dpkg_1.10.10_i386.deb
dselect_1.10.10_i386.deb
to pool/main/d/dpkg/dselect_1.10.10_i386.deb
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to 179661@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Adam Heath <doogie@debian.org> (supplier of updated dpkg package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmaster@debian.org)
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Format: 1.7
Date: Sat, 26 Apr 2003 15:10:24 -0500
Source: dpkg
Binary: dpkg-doc dpkg dselect dpkg-dev dpkg-static
Architecture: source i386 all
Version: 1.10.10
Distribution: unstable
Urgency: low
Maintainer: Dpkg Development <debian-dpkg@lists.debian.org>
Changed-By: Adam Heath <doogie@debian.org>
Description:
dpkg - Package maintenance system for Debian
dpkg-dev - Package building tools for Debian
dpkg-doc - Dpkg Internals Documentation
dselect - a user tool to manage Debian packages
Closes: 170698 179656 179658 179659 179661 184239 187509 187534
Changes:
dpkg (1.10.10) unstable; urgency=low
.
* Update archtable for hurd. Closes: #187509.
* Make the dpkg-iasearch conflicts versioned. Closes: #170698.
* Surround sed call with '' in Makefile.in. Closes: #187534.
* Strip trailing / from the file args in dpkg-statoverride. Closes:
#184239.
* Modified to use autotools-dev. Closes: #179656.
* Add netbsd support. Closes: #179658, #179659.
* Support hypenated values in dpkg-architeture. Closes: #179661
* No longer managed the /usr/doc symlinks.
Files:
5be7b5f34f5c46eee78e8950477ed532 733 base required dpkg_1.10.10.dsc
e5cdb9e0f4de30fa9d5a8a0f97d23b0f 1547158 base required dpkg_1.10.10.tar.gz
ee24db271e96179da0e2c41eb25b0633 1140278 base required dpkg_1.10.10_i386.deb
b72f5511d6a5a5aed2eb3c5a71993ab6 92644 base required dselect_1.10.10_i386.deb
beacb09e4748bf16a6eefdf010c0e5a5 1129707 byhand - dpkg-1.10.10_i386.nondebbin.tar.gz
2fc3b8cbfbfab59eb3ba4ae6aea51e43 1594596 byhand - dpkg-1.10.10_i386-static.nondebbin.tar.gz
948c0acb3bb02c5cc6294502d4f96e54 111578 utils standard dpkg-dev_1.10.10_all.deb
83dddfc3a9e3daaaecaf4769d2033fbd 10618 doc optional dpkg-doc_1.10.10_all.deb
e5cdb9e0f4de30fa9d5a8a0f97d23b0f 1547158 byhand - dpkg-1.10.10.tar.gz
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.1 (GNU/Linux)
iD8DBQE+qusZiix9wovUpIkRAkKkAJsGpyUSb6dXG26gpNXDhT+dMDXKoACfRGUK
ljdd7HJYE/JSiPi3sEeQRDw=
=NMrR
-----END PGP SIGNATURE-----
Reply to: