new dpkg packages up for testing
Hi,
I've assembled a new dpkg package based on the last revision in Debian
(1.10.20) and a couple of patches from the BTS.
This is the changelog:
dpkg (1.10.20.0.1) unreleased; urgency=low
* Applied patch from Santiago Vila to make dpkg-shlibdeps.pl work
on hurd-i386. Closes: #103024, #145714
* Applied patch from Marcu Brinkmann to suppress warning from
dpkg-architecture about unknown gcc type. Closes: #216695, #236331
* Applied patch from Neal Walfield to avoid start-stop-daemon from
segfaulting. Closes: #133640
-- Michael Banck <mbanck@debian.org> Sat, 17 Apr 2004 17:18:31 +0200
(Ugh, sorry Marcus for the typo, I'll try to fix that)
The second one is only annoying, the first is essential for building
packages on hurd-i386 and the last one is a real PITA with services
started (or rather, being restarted, as the first start seemed to work
fine for me mostly) from /etc/init.d/. Neal's patch for this last issue
seems to be fine, I was able to finally configure ssh and
inetutils-{inetd,syslogd}, which also failed with a segfault before.
I've also built the package on GNU/Linux and do not seem to have any
regressions here.
This is patch I used for dpkg-shlibdeps, can perhaps somebody confirm
whether it's the right one?
diff -Naur dpkg-1.10.20/scripts/dpkg-shlibdeps.pl dpkg-1.10.20.0.1/scripts/dpkg-shlibdeps.pl
--- dpkg-1.10.20/scripts/dpkg-shlibdeps.pl 2003-09-14 01:43:49.000000000 +0200
+++ dpkg-1.10.20.0.1/scripts/dpkg-shlibdeps.pl 2004-04-17 17:11:30.000000000 +0200
@@ -118,15 +118,21 @@
chomp;
if (m,^\s*NEEDED\s+,) {
if (m,^\s*NEEDED\s+((\S+)\.so\.(\S+))$,) {
- push(@libname,$2); push(@libsoname,$3);
- push(@libf,$execf[$i]);
+ push(@libname,$2); push(@libname,$2); push(@libname,$2);
+ push(@libsoname,$3); push(@libsoname,$3); push(@libsoname,$3);
+ push(@libf,$execf[$i]); push(@libf,$execf[$i]); push(@libf,$execf[$i]);
&warn("could not find path for $1") unless defined($so2path{$1});
push(@libfiles,$so2path{$1});
+ push(@libfiles,'/usr'.$so2path{$1});
+ push(@libfiles,'/usr/X11R6/lib'.$so2path{$1});
} elsif (m,^\s*NEEDED\s+((\S+)-(\S+)\.so)$,) {
- push(@libname,$2); push(@libsoname,$3);
- push(@libf,$execf[$i]);
+ push(@libname,$2); push(@libname,$2); push(@libname,$2);
+ push(@libsoname,$3); push(@libsoname,$3); push(@libsoname,$3);
+ push(@libf,$execf[$i]); push(@libf,$execf[$i]); push(@libf,$execf[$i]);
&warn("could not find path for $1") unless defined($so2path{$1});
push(@libfiles,$so2path{$1});
+ push(@libfiles,'/usr'.$so2path{$1});
+ push(@libfiles,'/usr/X11R6/lib'.$so2path{$1});
} else {
m,^\s*NEEDED\s+(\S+)$,;
&warn("format of $1 not recognized");
@@ -146,7 +152,7 @@
if ( -f "$dir/$_/DEBIAN/shlibs" ) {
push(@curshlibs, "$dir/$_/DEBIAN/shlibs");
next;
- } elsif ( $_ !~ /^\./ && -d "$dir/$_" && ! -l "$dir/$_" ) {
+ } elsif ( $_ !~ /^\./ && -d "$dir/$_" ) {
&searchdir("$dir/$_");
}
The dpkg and dpkg-dev packages are up at
http://people.debian.org/~mbanck/hurd/dpkg_1.10.20.0.1_hurd-i386.deb
http://people.debian.org/~mbanck/hurd/dpkg-dev_1.10.20.0.1_all.deb
could you please test them?
I'll upload them to ftp.gnuab.org if I get a bit of positive feedback
(or lack of it, in which case I'll probably upload them by the end of
the week). When they are more widely tested, I plan trying to push the
patches to the dpkg maintainers. With the recent addition of a new
member to the dpkg team and a couple of recent uploads, we might get
them in finally.
cheers,
Michael
--
Michael Banck
Debian Developer
mbanck@debian.org
http://www.advogato.org/person/mbanck/diary.html
Reply to: