Bug#294877: Patch

[Sam Morris]

This is a multi-part message in MIME format.
--------------050406010903070205090609
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit

I have written a patch for this problem. The error happens because Totem 
doesn't take into account device paths with '..' in their name; this 
happens on my system because I have:

/dev/cdroms/cdrom1 -> ../ide/host0/bus1/target1/lun0/cd

So Totem gets the device path "/dev/../ide/host0/bus1/target1/lun0/cd", 
which != "/dev/ide/host0/bus1/target1/lun0/cd" in the check on 
totem-disc.c:197.

To correct this I altered totem_disc_resolve_link to canonicalise the 
path it returns. I have also fixed a bug in debian/rules that prevented 
the CFLAGS set in the Makefile from being passed to configure, and hence 
the build process.

Regards,

-- 
Sam Morris
http://robots.org.uk/

PGP key id 5EA01078
Fingerprint 3412 EA18 1277 354B 991B  C869 B219 7FDB 5EA0 1078

--------------050406010903070205090609
Content-Type: text/plain;
 name="totem-realpath.dpatch"
Content-Transfer-Encoding: base64
Content-Disposition: inline;
 filename="totem-realpath.dpatch"

IyEgL2Jpbi9zaCAvdXNyL3NoYXJlL2RwYXRjaC9kcGF0Y2gtcnVuCiMjIHRvdGVtLXJlYWxw
YXRoLmRwYXRjaCBieSBTYW0gTW9ycmlzIDxzYW1Acm9ib3RzLm9yZy51az4KIyMKIyMgRFA6
IEZpeGVzIHRvdGVtJ3MgaGFuZGxpbmcgb2YgJy4uJyBhbmQgJy4nIGNvbXBvbmVudHMgaW4g
ZGV2aWNlIG5hbWVzLgoKQERQQVRDSEAKZGlmZiAtdXJOYWQgdG90ZW0tMC4xMDAvZGViaWFu
L3J1bGVzIC90bXAvZHBlcC50TVFZbUgvdG90ZW0tMC4xMDAvZGViaWFuL3J1bGVzCi0tLSB0
b3RlbS0wLjEwMC9kZWJpYW4vcnVsZXMJMjAwNS0wMi0xMiAxODowMTowMy4wMDAwMDAwMDAg
KzAwMDAKKysrIC90bXAvZHBlcC50TVFZbUgvdG90ZW0tMC4xMDAvZGViaWFuL3J1bGVzCTIw
MDUtMDItMTIgMTg6MTM6MDkuMDAwMDAwMDAwICswMDAwCkBAIC0zNSw3ICszNSw3IEBACiAJ
ICAkKE1BS0UpIGRpc3RjbGVhbjsgXAogCSAgcm0gLWYgYnVpbGQtZ3N0cmVhbWVyLXN0YW1w
OyBcCiAJZmkKLQkuL2NvbmZpZ3VyZSAtLXByZWZpeD0vdXNyIC0tc3lzY29uZmRpcj0vZXRj
IC0tbWFuZGlyPVwkJHtwcmVmaXh9L3NoYXJlL21hbiAtLWxpYmV4ZWNkaXI9XCQke3ByZWZp
eH0vbGliL3RvdGVtCisJLi9jb25maWd1cmUgLS1wcmVmaXg9L3VzciAtLXN5c2NvbmZkaXI9
L2V0YyAtLW1hbmRpcj1cJCR7cHJlZml4fS9zaGFyZS9tYW4gLS1saWJleGVjZGlyPVwkJHtw
cmVmaXh9L2xpYi90b3RlbSBDRkxBR1M9IiQoQ0ZMQUdTKSIKIAkkKE1BS0UpCiAJdG91Y2gg
YnVpbGQteGluZS1zdGFtcAogCmRpZmYgLXVyTmFkIHRvdGVtLTAuMTAwL3NyYy90b3RlbS1k
aXNjLmMgL3RtcC9kcGVwLnRNUVltSC90b3RlbS0wLjEwMC9zcmMvdG90ZW0tZGlzYy5jCi0t
LSB0b3RlbS0wLjEwMC9zcmMvdG90ZW0tZGlzYy5jCTIwMDUtMDEtMDIgMjM6MTg6MzkuMDAw
MDAwMDAwICswMDAwCisrKyAvdG1wL2RwZXAudE1RWW1IL3RvdGVtLTAuMTAwL3NyYy90b3Rl
bS1kaXNjLmMJMjAwNS0wMi0xMiAxODoxMzowOS4wMDAwMDAwMDAgKzAwMDAKQEAgLTY1LDE3
ICs2NSwyMCBAQAogc3RhdGljIGNoYXIgKgogdG90ZW1fZGlzY19yZXNvbHZlX2xpbmsgKGNv
bnN0IGNoYXIgKmRldiwgY29uc3QgY2hhciAqYnVmKQogewotICBjaGFyICpwYXJlbnQsICpu
ZXc7CisgIGNoYXIgKnBhcmVudCwgKm5ldywgKnJlc3VsdDsKIAogICAvKiBpcyBpdCBhbiBh
YnNvbHV0ZSBwYXRoPyAqLwotICBpZiAoZ19wYXRoX2lzX2Fic29sdXRlIChidWYpICE9IEZB
TFNFKQotICAgIHJldHVybiBnX3N0cmR1cCAoYnVmKTsKLQotICBwYXJlbnQgPSBnX3BhdGhf
Z2V0X2Rpcm5hbWUgKGRldik7Ci0gIG5ldyA9IGdfYnVpbGRfZmlsZW5hbWUgKHBhcmVudCwg
YnVmLCBOVUxMKTsKLSAgZ19mcmVlIChwYXJlbnQpOworICBpZiAoZ19wYXRoX2lzX2Fic29s
dXRlIChidWYpICE9IEZBTFNFKSB7CisgICAgcmVzdWx0ID0gcmVhbHBhdGggKGJ1ZiwgTlVM
TCk7CisgIH0gZWxzZSB7CisgICAgcGFyZW50ID0gZ19wYXRoX2dldF9kaXJuYW1lIChkZXYp
OworICAgIG5ldyA9IGdfYnVpbGRfZmlsZW5hbWUgKHBhcmVudCwgYnVmLCBOVUxMKTsKKyAg
ICByZXN1bHQgPSByZWFscGF0aCAobmV3LCBOVUxMKTsKKyAgICBnX2ZyZWUgKG5ldyk7Cisg
ICAgZ19mcmVlIChwYXJlbnQpOworICB9CiAKLSAgcmV0dXJuIG5ldzsKKyAgcmV0dXJuIHJl
c3VsdDsKIH0KIAogLyoK
--------------050406010903070205090609--