notmuch release 0.31.2-5 for unstable (sid) [dgit]

[dgit distro=debian no-split --quilt=linear]
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEEkiyHYXwaY0SiY6fqA0U5G1WqFSEFAl/WCisACgkQA0U5G1Wq
 FSHg5A//dKLbRIGCZiwGfBqyVd0B46+R+mrI2Tg5/i71gx8BhIhIMMc5u+SfIW1i
 izFszD5ygRXwgsqGgYy2dRBWDbA/2sxbmnyETPlDjT/H/xjXWetSh4mKTAo9WsnQ
 9yFisRFjD+YeDXBZRht0cvt170IuY335mSyJRCPNjc9pVE6hnZX5FLjWQOQjekog
 oKbP+WZcA26dnJWiFLmrogXwL2nUS19KLspNGqqYjycyrgGiAM0adlymJT0B+vSM
 zt6bXAFdwc2M6Luy79n9faEF03Z3DILkIuB8UcOOSuKwpQHS3eC7kQTaquqKUkf7
 lk98WT1GnQrw7V3djV6mvmwzH2eC8ytnOWDfllbsYe6BgbkJirROZEPEkEaApkY6
 EXrSxHmdsPrvyEKGg/+rKsN7pO4wxtFAGTd3Ltu3XQ7jcnqw2oP+X6rf2Z1rSAEt
 qSQ5gaod3yW5ycD+b+/BNGusWHaF4VzLmx+7ACtVq4pJffUAyfkFog9zeHHjUNgd
 1agIwJ+Kdkn3+R0sk4eBDX80AVf3542Fwq/5idFyYuVC3G+yvP6L9Q0Ewl+MZ88R
 Rc60pIRvKDGZyjF9K//xJECbrf2NNZkvPBgHlZ//6deRuOInDk+V2OQdxFUneVli
 BHj4S1G51Tt7zo6vpV+O4W70H9RC4I7UbOCi++6l4Ny7L9bEGtY=
 =5Rz/
 -----END PGP SIGNATURE-----

Merge tag 'debian/0.31.2-5'

notmuch release 0.31.2-5 for unstable (sid) [dgit]

[dgit distro=debian no-split --quilt=linear]
This commit is contained in:
David Bremner 2020-12-13 08:37:47 -04:00
commit ced341e82e
3 changed files with 23 additions and 2 deletions

6
debian/changelog vendored
View file

@ -1,3 +1,9 @@
notmuch (0.31.2-5) unstable; urgency=medium
* Use readelf instead of nm in T360, hopefully build in ppc64
-- David Bremner <bremner@debian.org> Sun, 13 Dec 2020 08:24:23 -0400
notmuch (0.31.2-4) unstable; urgency=medium
* Move prerequisite to file targets from phony ones. Thanks to

View file

@ -14,3 +14,17 @@ atomic patches.
endif
sphinx-html: $(DOCBUILDDIR)/.html.stamp
--- notmuch-0.31.2.orig/test/T360-symbol-hiding.sh
+++ notmuch-0.31.2/test/T360-symbol-hiding.sh
@@ -26,8 +26,9 @@ test_begin_subtest 'checking output'
test_expect_equal "$result" "$output"
test_begin_subtest 'comparing existing to exported symbols'
-nm -P $NOTMUCH_BUILDDIR/lib/libnotmuch.so | awk '$2 == "T" && $1 ~ "^notmuch" {print $1}' | sort | uniq > ACTUAL
-sed -n 's/^\(notmuch_[a-zA-Z0-9_]*\)[[:blank:]]*(.*/\1/p' $NOTMUCH_SRCDIR/lib/notmuch.h | sort | uniq > EXPORTED
+readelf -Ws $NOTMUCH_BUILDDIR/lib/libnotmuch.so | \
+ awk '$4 == "FUNC" && $5 == "GLOBAL" && $7 != "UND" {print $8}' | sort -u > ACTUAL
+sed -n 's/^\(notmuch_[a-zA-Z0-9_]*\)[[:blank:]]*(.*/\1/p' $NOTMUCH_SRCDIR/lib/notmuch.h | sort -u > EXPORTED
test_expect_equal_file EXPORTED ACTUAL
test_done

View file

@ -26,8 +26,9 @@ test_begin_subtest 'checking output'
test_expect_equal "$result" "$output"
test_begin_subtest 'comparing existing to exported symbols'
nm -P $NOTMUCH_BUILDDIR/lib/libnotmuch.so | awk '$2 == "T" && $1 ~ "^notmuch" {print $1}' | sort | uniq > ACTUAL
sed -n 's/^\(notmuch_[a-zA-Z0-9_]*\)[[:blank:]]*(.*/\1/p' $NOTMUCH_SRCDIR/lib/notmuch.h | sort | uniq > EXPORTED
readelf -Ws $NOTMUCH_BUILDDIR/lib/libnotmuch.so | \
awk '$4 == "FUNC" && $5 == "GLOBAL" && $7 != "UND" {print $8}' | sort -u > ACTUAL
sed -n 's/^\(notmuch_[a-zA-Z0-9_]*\)[[:blank:]]*(.*/\1/p' $NOTMUCH_SRCDIR/lib/notmuch.h | sort -u > EXPORTED
test_expect_equal_file EXPORTED ACTUAL
test_done