Theodore Tso wrote:
> On Wed, Jul 29, 2009 at 09:11:30PM +0200, Michael Biebl wrote:
>> Theodore Tso wrote:
>>
>>> Scott, LaMont, could you subscribe to this bug, and handle it, please?
>>> As Michael pointed out in a subsequent e-mail to this bug, it's a
>>> failure in the shlibs file.  The libblkid 1.x packages do not provide
>>> any symbols with the @UUID_1.0 symbol version, and so the shlibs file
>>> needs to be adjusted to point this out.
>> Why is the shlibs.local file needed at all? If the symbols files are updated
>> properly, that should be sufficient to generate correct dependencies.
> 
> Agreed.  At least for e2fsprogs, the shlibs.local file predated my
> adding the symbols file, and I never got around to deleting the
> shlibs.local file.
> 
>> I already talked to Scott and LaMont briefly about this.  Imho the
>> symbols files should not be updated/generated automatically, but
>> manually, so you can actually track ABI breakages much more
>> easily. Also, the debian revision should be stripped away (unless a
>> symbol was added by a Debian revision specific patch), to make
>> e.g. backports easier.
> 
> Yes, I agree.
> 
> I'll make the change in e2fsprogs for libraries that are still
> shipping as part of e2fsprogs, but it's up to Scott and LaMont to make
> changes to the util-linux package in experimental.
> 
> Thank you for noticing this problem before it was moved to unstable
> and/or testing!!

I've prepared a patch for 2.16-2 which does the following:

1/ Removes the outdated debian/shlibs.local file
2/ Removes the auto-update of symbols files from debian/rules
3/ Removes symbols from from the debian/libuuid1.symbols files which were never
part of the public ABI, like uuid_pack/uuid_unpack and were falsely copied over
from e2fsprogs.
4/ Strips the Debian revision in the symbols files (for the already given 
reasons).

With these changes, proper shlib dependencies are generated.

I'll leave it open to LaMont to tighten the dependency of libblkid-dev on 
uuid-dev.

It is urgent, that a fixed util-linux package is uploaded to unstable very soon,
as a lot of packages are blocked by this.

I've CCed aurel32, because he plans to NMU util-linux, if we don't get any
response from LaMont.

Cheers,
Michael

-- 
Why is it that all of the instruments seeking intelligent life in the
universe are pointed away from Earth?
diff --git a/debian/libblkid1.symbols b/debian/libblkid1.symbols
index b0854dc..ec2f9bf 100644
--- a/debian/libblkid1.symbols
+++ b/debian/libblkid1.symbols
@@ -1,47 +1,47 @@
 libblkid.so.1 libblkid1 #MINVER#
- blkid_...@blkid_1.0 2.16-1
- blkid_2...@blkid_2.15 2.16-1
- blkid_dev_devn...@blkid_1.0 2.16-1
- blkid_dev_has_...@blkid_1.0 2.16-1
- blkid_dev_iterate_be...@blkid_1.0 2.16-1
- blkid_dev_iterate_...@blkid_1.0 2.16-1
- blkid_dev_n...@blkid_1.0 2.16-1
- blkid_dev_set_sea...@blkid_1.0 2.16-1
- blkid_devno_to_devn...@blkid_1.0 2.16-1
- blkid_do_pr...@blkid_2.15 2.16-1
- blkid_do_safepr...@blkid_2.15 2.16-1
- blkid_encode_str...@blkid_2.15 2.16-1
- blkid_evaluate_...@blkid_2.15 2.16-1
- blkid_find_dev_with_...@blkid_1.0 2.16-1
- blkid_free_pr...@blkid_2.15 2.16-1
- blkid_gc_ca...@blkid_1.0 2.16-1
- blkid_get_ca...@blkid_1.0 2.16-1
- blkid_get_...@blkid_1.0 2.16-1
- blkid_get_dev_s...@blkid_1.0 2.16-1
- blkid_get_devn...@blkid_1.0 2.16-1
- blkid_get_library_vers...@blkid_1.0 2.16-1
- blkid_get_tag_va...@blkid_1.0 2.16-1
- blkid_known_fst...@blkid_1.0 2.16-1
- blkid_new_pr...@blkid_2.15 2.16-1
- blkid_parse_tag_str...@blkid_1.0 2.16-1
- blkid_parse_version_str...@blkid_1.0 2.16-1
- blkid_probe_...@blkid_1.0 2.16-1
- blkid_probe_all_...@blkid_1.0 2.16-1
- blkid_probe_filter_ty...@blkid_2.15 2.16-1
- blkid_probe_filter_us...@blkid_2.15 2.16-1
- blkid_probe_get_va...@blkid_2.15 2.16-1
- blkid_probe_has_va...@blkid_2.15 2.16-1
- blkid_probe_invert_fil...@blkid_2.15 2.16-1
- blkid_probe_lookup_va...@blkid_2.15 2.16-1
- blkid_probe_numof_val...@blkid_2.15 2.16-1
- blkid_probe_reset_fil...@blkid_2.15 2.16-1
- blkid_probe_set_dev...@blkid_2.15 2.16-1
- blkid_probe_set_requ...@blkid_2.15 2.16-1
- blkid_put_ca...@blkid_1.0 2.16-1
- blkid_reset_pr...@blkid_2.15 2.16-1
- blkid_safe_str...@blkid_2.15 2.16-1
- blkid_send_uev...@blkid_2.15 2.16-1
- blkid_tag_iterate_be...@blkid_1.0 2.16-1
- blkid_tag_iterate_...@blkid_1.0 2.16-1
- blkid_tag_n...@blkid_1.0 2.16-1
- blkid_ver...@blkid_1.0 2.16-1
+ blkid_...@blkid_1.0 2.16
+ blkid_2...@blkid_2.15 2.16
+ blkid_dev_devn...@blkid_1.0 2.16
+ blkid_dev_has_...@blkid_1.0 2.16
+ blkid_dev_iterate_be...@blkid_1.0 2.16
+ blkid_dev_iterate_...@blkid_1.0 2.16
+ blkid_dev_n...@blkid_1.0 2.16
+ blkid_dev_set_sea...@blkid_1.0 2.16
+ blkid_devno_to_devn...@blkid_1.0 2.16
+ blkid_do_pr...@blkid_2.15 2.16
+ blkid_do_safepr...@blkid_2.15 2.16
+ blkid_encode_str...@blkid_2.15 2.16
+ blkid_evaluate_...@blkid_2.15 2.16
+ blkid_find_dev_with_...@blkid_1.0 2.16
+ blkid_free_pr...@blkid_2.15 2.16
+ blkid_gc_ca...@blkid_1.0 2.16
+ blkid_get_ca...@blkid_1.0 2.16
+ blkid_get_...@blkid_1.0 2.16
+ blkid_get_dev_s...@blkid_1.0 2.16
+ blkid_get_devn...@blkid_1.0 2.16
+ blkid_get_library_vers...@blkid_1.0 2.16
+ blkid_get_tag_va...@blkid_1.0 2.16
+ blkid_known_fst...@blkid_1.0 2.16
+ blkid_new_pr...@blkid_2.15 2.16
+ blkid_parse_tag_str...@blkid_1.0 2.16
+ blkid_parse_version_str...@blkid_1.0 2.16
+ blkid_probe_...@blkid_1.0 2.16
+ blkid_probe_all_...@blkid_1.0 2.16
+ blkid_probe_filter_ty...@blkid_2.15 2.16
+ blkid_probe_filter_us...@blkid_2.15 2.16
+ blkid_probe_get_va...@blkid_2.15 2.16
+ blkid_probe_has_va...@blkid_2.15 2.16
+ blkid_probe_invert_fil...@blkid_2.15 2.16
+ blkid_probe_lookup_va...@blkid_2.15 2.16
+ blkid_probe_numof_val...@blkid_2.15 2.16
+ blkid_probe_reset_fil...@blkid_2.15 2.16
+ blkid_probe_set_dev...@blkid_2.15 2.16
+ blkid_probe_set_requ...@blkid_2.15 2.16
+ blkid_put_ca...@blkid_1.0 2.16
+ blkid_reset_pr...@blkid_2.15 2.16
+ blkid_safe_str...@blkid_2.15 2.16
+ blkid_send_uev...@blkid_2.15 2.16
+ blkid_tag_iterate_be...@blkid_1.0 2.16
+ blkid_tag_iterate_...@blkid_1.0 2.16
+ blkid_tag_n...@blkid_1.0 2.16
+ blkid_ver...@blkid_1.0 2.16
diff --git a/debian/libuuid1.symbols b/debian/libuuid1.symbols
index 03f8a61..eeb9479 100644
--- a/debian/libuuid1.symbols
+++ b/debian/libuuid1.symbols
@@ -1,20 +1,18 @@
 libuuid.so.1 libuuid1 #MINVER#
- uuid_...@uuid_1.0 2.16-1
- uuid__generate_ran...@uuid_1.0 2.16-1
- uuid__generate_t...@uuid_1.0 2.16-1
- uuid_cl...@uuid_1.0 2.16-1
- uuid_comp...@uuid_1.0 2.16-1
- uuid_c...@uuid_1.0 2.16-1
- uuid_gener...@uuid_1.0 2.16-1
- uuid_generate_ran...@uuid_1.0 2.16-1
- uuid_generate_t...@uuid_1.0 2.16-1
- uuid_is_n...@uuid_1.0 2.16-1
- uuid_p...@uuid_1.0 2.16-1
- uuid_pa...@uuid_1.0 2.16-1
- uuid_t...@uuid_1.0 2.16-1
- uuid_t...@uuid_1.0 2.16-1
- uuid_unp...@uuid_1.0 2.16-1
- uuid_unpa...@uuid_1.0 2.16-1
- uuid_unparse_lo...@uuid_1.0 2.16-1
- uuid_unparse_up...@uuid_1.0 2.16-1
- uuid_vari...@uuid_1.0 2.16-1
+ uuid_...@uuid_1.0 2.16
+ uuid__generate_ran...@uuid_1.0 2.16
+ uuid__generate_t...@uuid_1.0 2.16
+ uuid_cl...@uuid_1.0 2.16
+ uuid_comp...@uuid_1.0 2.16
+ uuid_c...@uuid_1.0 2.16
+ uuid_gener...@uuid_1.0 2.16
+ uuid_generate_ran...@uuid_1.0 2.16
+ uuid_generate_t...@uuid_1.0 2.16
+ uuid_is_n...@uuid_1.0 2.16
+ uuid_pa...@uuid_1.0 2.16
+ uuid_t...@uuid_1.0 2.16
+ uuid_t...@uuid_1.0 2.16
+ uuid_unpa...@uuid_1.0 2.16
+ uuid_unparse_lo...@uuid_1.0 2.16
+ uuid_unparse_up...@uuid_1.0 2.16
+ uuid_vari...@uuid_1.0 2.16
diff --git a/debian/rules b/debian/rules
index 05808bd..7ddd12f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -124,15 +124,6 @@ endif
 	install -m 644 debian/libuuid.copyright debian/libuuid1/usr/share/doc/libuuid1/copyright
 	install -m 644 debian/libuuid.copyright debian/uuid-dev/usr/share/doc/uuid-dev/copyright
 	install -m 644 debian/libuuid.copyright debian/uuid-runtime/usr/share/doc/uuid-runtime/copyright
-	# dpkg symbol handling
-	for lib in libblkid1 libuuid1; \
-	do \
-		echo "Generating symbols for $$lib..."; \
-		dpkg-gensymbols -p$$lib -Pdebian/$$lib > debian/$$lib.tmp-patch; \
-		cat debian/$$lib.tmp-patch; \
-		patch debian/$$lib.symbols < debian/$$lib.tmp-patch; \
-		rm debian/$$lib.tmp-patch; \
-	done
 	#
 	cd debian; if [ -f util-linux/sbin/fdisk ]; then \
 	    ln util-linux/sbin/*fdisk fdisk-udeb/usr/sbin/; \
diff --git a/debian/shlibs.local b/debian/shlibs.local
deleted file mode 100644
index fdebb4f..0000000
--- a/debian/shlibs.local
+++ /dev/null
@@ -1,4 +0,0 @@
-libblkid 1 libblkid1 (>=1.37-1)
-udeb: libblkid 1 libblkid1-udeb
-libuuid 1 libuuid1 (> 1.40.3-1)
-udeb: libuuid 1 libuuid1-udeb

Attachment: signature.asc
Description: OpenPGP digital signature

Reply via email to