Package: release.debian.org Severity: normal User: [email protected] Usertags: unblock
Hi, I would like to move the elfutils version 0.153-2 to testing. Note that the version 0.152-1 is currently in testing, so this is a new upstream version. The version in testing has an RC bug (#684825). I could fix that instead if you want. But I got the feeling that you would be open to move 0.153-2 to testing. I would really prefer the 0.153-2 to move to testing. The debdiff between 0.153-1 and 0.153-2 is attached if that's useful at all. Kurt
diff -Nru elfutils-0.153/debian/changelog elfutils-0.153/debian/changelog --- elfutils-0.153/debian/changelog 2012-02-25 01:48:58.000000000 +0100 +++ elfutils-0.153/debian/changelog 2012-09-18 21:40:06.000000000 +0200 @@ -1,3 +1,15 @@ +elfutils (0.153-2) unstable; urgency=low + + * Make it actually build properly using build-arch. (Closes: #684528) + * Call rwlock_unlock() before rwlock_fini(). The lock was still held + causing problems on kfreebsd. (Closes: #662041) + * Don't exclude sh_type >= SHT_NUM from stripping, it's set to + SHT_MIPS_DWARF on mips. (Closes: #662041) + * readelf -w didn't show the content of debug sections on mips + because sh_type was set to SHT_MIPS_DWARF. + + -- Kurt Roeckx <[email protected]> Tue, 18 Sep 2012 21:12:08 +0200 + elfutils (0.153-1) unstable; urgency=low [ Jonathan Nieder <[email protected]> ] diff -Nru elfutils-0.153/debian/patches/alldts.patch elfutils-0.153/debian/patches/alldts.patch --- elfutils-0.153/debian/patches/alldts.patch 2012-02-24 21:21:41.000000000 +0100 +++ elfutils-0.153/debian/patches/alldts.patch 2012-09-18 21:53:21.000000000 +0200 @@ -1,5 +1,6 @@ From: Kurt Roeckx <[email protected]> Subject: Set up the test environment so that we actually test the new library +Applied-Upstream: commit:593f2af73d971bdc9dcc06622d529e7848c31f57 --- a/tests/run-alldts.sh.orig 2012-02-24 20:17:17.000000000 +0000 +++ a/tests/run-alldts.sh 2012-02-24 20:17:28.000000000 +0000 diff -Nru elfutils-0.153/debian/patches/elf_end_unlock.patch elfutils-0.153/debian/patches/elf_end_unlock.patch --- elfutils-0.153/debian/patches/elf_end_unlock.patch 1970-01-01 01:00:00.000000000 +0100 +++ elfutils-0.153/debian/patches/elf_end_unlock.patch 2012-09-18 21:55:20.000000000 +0200 @@ -0,0 +1,17 @@ +From: Kurt Roeckx <[email protected]> +Subject: Call rwlock_unlock() before rwlock_fini() +Applied-Upstream: commit:495501611820a9d5c462fda56045c146f7b922d7 +Bug-Debian: http://bugs.debian.org/662041 + +diff --git a/libelf/elf_end.c b/libelf/elf_end.c +index 5112eae..6392eaf 100644 +--- a/libelf/elf_end.c ++++ b/libelf/elf_end.c +@@ -241,6 +241,7 @@ elf_end (elf) + munmap (elf->map_address, elf->maximum_size); + } + ++ rwlock_unlock (elf->lock); + rwlock_fini (elf->lock); + + /* Finally the descriptor itself. */ diff -Nru elfutils-0.153/debian/patches/mips_readelf_w.patch elfutils-0.153/debian/patches/mips_readelf_w.patch --- elfutils-0.153/debian/patches/mips_readelf_w.patch 1970-01-01 01:00:00.000000000 +0100 +++ elfutils-0.153/debian/patches/mips_readelf_w.patch 2012-09-18 21:54:18.000000000 +0200 @@ -0,0 +1,22 @@ +From: Kurt Roeckx <[email protected]> +Subject: Make readelf -w output debug information on mips +Bug-Debian: http://bugs.debian.org/662041 +Forwarded: not-needed + +Upstreams wants a change where this is handled by a hook that needs +to be filled in by the backend for the arch. + +Index: elfutils-0.153/src/readelf.c +=================================================================== +--- elfutils-0.153.orig/src/readelf.c 2012-08-10 22:01:55.000000000 +0200 ++++ elfutils-0.153/src/readelf.c 2012-09-18 21:46:27.000000000 +0200 +@@ -7364,7 +7364,8 @@ + GElf_Shdr shdr_mem; + GElf_Shdr *shdr = gelf_getshdr (scn, &shdr_mem); + +- if (shdr != NULL && shdr->sh_type == SHT_PROGBITS) ++ if (shdr != NULL && ( ++ (shdr->sh_type == SHT_PROGBITS) || (shdr->sh_type == SHT_MIPS_DWARF))) + { + static const struct + { diff -Nru elfutils-0.153/debian/patches/series elfutils-0.153/debian/patches/series --- elfutils-0.153/debian/patches/series 2012-02-24 23:26:59.000000000 +0100 +++ elfutils-0.153/debian/patches/series 2012-09-18 21:42:18.000000000 +0200 @@ -8,3 +8,6 @@ elf_additions.diff alldts.patch scanf-format.patch +elf_end_unlock.patch +strip_sh_type.patch +mips_readelf_w.patch diff -Nru elfutils-0.153/debian/patches/strip_sh_type.patch elfutils-0.153/debian/patches/strip_sh_type.patch --- elfutils-0.153/debian/patches/strip_sh_type.patch 1970-01-01 01:00:00.000000000 +0100 +++ elfutils-0.153/debian/patches/strip_sh_type.patch 2012-09-18 21:41:54.000000000 +0200 @@ -0,0 +1,22 @@ +From: Roland McGrath <[email protected]> +Subject: Don't exclude sh_type >= SHT_NUM from stripping. +Origin: upstream, commit:8e8f0be57354d3fa094d0927930dbe1bc1ce8816 +Bug-Debian: http://bugs.debian.org/662041 + +Needed on mips because sh_type is set to SHT_MIPS_DWARF + +index 8b4c0d7..bda192c 100644 +--- a/libelf/elf-knowledge.h ++++ b/libelf/elf-knowledge.h +@@ -65,10 +65,7 @@ + || (strncmp (name, ".gnu.warning.", sizeof ".gnu.warning." - 1) != 0 \ + /* We remove .comment sections only if explicitly told to do so. */\ + && (remove_comment \ +- || strcmp (name, ".comment") != 0))) \ +- /* So far we do not remove any of the non-standard sections. \ +- XXX Maybe in future. */ \ +- && (shdr)->sh_type < SHT_NUM) ++ || strcmp (name, ".comment") != 0)))) + + + /* Test whether `sh_info' field in section header contains a section diff -Nru elfutils-0.153/debian/rules elfutils-0.153/debian/rules --- elfutils-0.153/debian/rules 2012-02-25 00:01:45.000000000 +0100 +++ elfutils-0.153/debian/rules 2012-09-18 21:13:45.000000000 +0200 @@ -87,12 +87,13 @@ rm debian/tmp/usr/include/elfutils/libebl.h # Build architecture-independent files here. -build-indep: build install -binary-indep: build-indep +build-indep: build +binary-indep: build-indep install # We have nothing to do. # Build architecture-dependent files here. -build-arch: build install +build-arch: build +binary-arch: build-arch install dh_testdir dh_testroot dh_installchangelogs ChangeLog @@ -113,7 +114,6 @@ dh_md5sums dh_builddeb -binary-arch: build-arch binary: binary-indep binary-arch maint-unpatch:
