91977 2005-05-08 23:35 0000 new version of eject 2005-05-20 22:58:44 0000 1 1 1 Unclassified Gentoo Linux Applications unspecified All Linux RESOLVED FIXED P2 enhancement --- 91928 1 npmccallum@gentoo.org base-system@gentoo.org gentopia@gentoo.org npmccallum@gentoo.org 2005-05-08 23:35:52 0000 New version of eject including a bunch of patches from ubuntu, including: - a new version of the finddev patch (adds documentation) - pumount support (for Utopia; blocks #91928) - several fixes for remote situations - check malloc return value for NULL Reproducible: Always Steps to Reproduce: npmccallum@gentoo.org 2005-05-08 23:37:28 0000 Created an attachment (id=58442) make sure fd's are closed correctly npmccallum@gentoo.org 2005-05-08 23:38:04 0000 Created an attachment (id=58443) make sure DEFAULTDEVICE starts with "/dev/" npmccallum@gentoo.org 2005-05-08 23:38:34 0000 Created an attachment (id=58444) new version of finddev (includes documentation) npmccallum@gentoo.org 2005-05-08 23:38:57 0000 Created an attachment (id=58445) make sure we can read fstab npmccallum@gentoo.org 2005-05-08 23:39:29 0000 Created an attachment (id=58446) check the return value of malloc for NULL npmccallum@gentoo.org 2005-05-08 23:39:58 0000 Created an attachment (id=58447) adds a don't unmount option npmccallum@gentoo.org 2005-05-08 23:40:27 0000 Created an attachment (id=58448) adds pumount support (project utopia) npmccallum@gentoo.org 2005-05-08 23:40:57 0000 Created an attachment (id=58449) make sure we have a proper regex npmccallum@gentoo.org 2005-05-08 23:41:42 0000 Created an attachment (id=58450) new ebuild jakub@gentoo.org 2005-05-08 23:55:25 0000 Would you like to have a look at Bug 62612 as well? :-) npmccallum@gentoo.org 2005-05-09 00:08:18 0000 sure, you can assign it to me if you like, but I'd like to put it in a revision on its own to get more testing. All the patches I've put here are fairly well tested. vapier@gentoo.org 2005-05-09 00:17:44 0000 fedora has a patch or two not included here ... jakub@gentoo.org 2005-05-09 00:51:47 0000 Comment #11: As you wish, assigned #62612 to you. If you jakub@gentoo.org 2005-05-09 00:51:47 0000 Comment #11: As you wish, assigned #62612 to you. If you´d like to maintain this ebuild, then you could add yourself to metadata.xml. vapier@gentoo.org 2005-05-20 20:30:55 0000 some notes ... - the close patch is pretty stupid/pointless - the malloc check is incomplete ... it's not the only malloc in eject.c - the regcomp check is incomplete ... it's not the only regcomp in eject.c - what's the point of the pumount patch ? added all but the pumount patch to eject-2.0.13-r2 after cleaning many of them up npmccallum@gentoo.org 2005-05-20 20:38:22 0000 pmount (and pumount) are policy wrappers around mount for removeable devices that aren't in fstab. Desktop programs use eject (ie. gnome-vfs). Lets say in this case you plug in a usb zip drive. gnome-vfs uses pmount to mount it, then the user wants to eject it. The user chooses eject in nautilus, which (through gnome-vfs) calls eject. When eject tries to umount the device, it will fail, so eject will be broken. The pumount tries at runtime to run pumount before umount. Nothing breaks if pumount isn't installed or fails (we don't check the exit status). vapier@gentoo.org 2005-05-20 22:58:44 0000 added to 2.0.13-r2 58442 2005-05-08 23:37 0000 make sure fd's are closed correctly eject-2.0.13-closefd.patch text/plain ZGlmZiAtTnJ1IC4uL2VqZWN0LTIuMC4xMy5vbGQvZWplY3QuYyAuL2VqZWN0LmMKLS0tIC4uL2Vq ZWN0LTIuMC4xMy5vbGQvZWplY3QuYwkyMDAyLTEyLTA5IDE3OjI4OjA4LjAwMDAwMDAwMCAtMDUw MAorKysgLi9lamVjdC5jCTIwMDUtMDUtMDkgMDE6MDI6MDAuMDAwMDAwMDAwIC0wNDAwCkBAIC02 OSw2ICs2OSwxNiBAQAogI2luY2x1ZGUgPHNjc2kvc2cuaD4KICNpbmNsdWRlIDxzY3NpL3Njc2lf aW9jdGwuaD4KIAorI2RlZmluZSBDTE9TRShmZCkgaWYgKGNsb3NlKGZkKT09LTEpIHsgXAorICAg IHBlcnJvcihwcm9ncmFtTmFtZSk7IFwKKyAgICBleGl0KDEpOyBcCit9CisKKyNkZWZpbmUgRkNM T1NFKGZkKSBpZiAoZmNsb3NlKGZkKT09LTEpIHsgXAorICAgIHBlcnJvcihwcm9ncmFtTmFtZSk7 IFwKKyAgICBleGl0KDEpOyBcCit9CisKIC8qIEdsb2JhbCBWYXJpYWJsZXMgKi8KIGNvbnN0IGNo YXIgKnZlcnNpb24gPSBWRVJTSU9OOyAvKiBwcm9ncmFtIHZlcnNpb24gKi8KIGludCBhX29wdGlv biA9IDA7IC8qIGNvbW1hbmQgZmxhZ3MgYW5kIGFyZ3VtZW50cyAqLwpAQCAtNjI3LDcgKzYzNyw3 IEBACiAJCQlHZXRNYWpvck1pbm9yKHMxLCAmbXRhYm1haiwgJm10YWJtaW4pOwogCQkJaWYgKCgo c3RyY21wKHMxLCBuYW1lKSA9PSAwKSB8fCAoc3RyY21wKHMyLCBuYW1lKSA9PSAwKSkgfHwKIAkJ CQkoKG1haiAhPSAtMSkgJiYgKG1haiA9PSBtdGFibWFqKSAmJiAobWluID09IG10YWJtaW4pKSkg ewotCQkJCWZjbG9zZShmcCk7CisJCQkJRkNMT1NFKGZwKTsKIAkJCQkqZGV2aWNlTmFtZSA9IHN0 cmR1cChzMSk7CiAJCQkJKm1vdW50TmFtZSA9IHN0cmR1cChzMik7CiAJCQkJcmV0dXJuIDE7CkBA IC02MzYsNyArNjQ2LDcgQEAKIAl9CiAJKmRldmljZU5hbWUgPSAwOwogCSptb3VudE5hbWUgPSAw OwotCWZjbG9zZShmcCk7CisJRkNMT1NFKGZwKTsKIAlyZXR1cm4gMDsKIH0KIApAQCAtNjYzLDEz ICs2NzMsMTMgQEAKIAl3aGlsZSAoZmdldHMobGluZSwgc2l6ZW9mKGxpbmUpLCBmcCkgIT0gMCkg ewogCQlyYyA9IHNzY2FuZihsaW5lLCAiJTEwMjNzICUxMDIzcyIsIHMxLCBzMik7CiAJCWlmIChy YyA+PSAyICYmIHMxWzBdICE9ICcjJyAmJiBzdHJjbXAoczIsIG5hbWUpID09IDApIHsKLQkJCWZj bG9zZShmcCk7CisJCQlGQ0xPU0UoZnApOwogCQkJKmRldmljZU5hbWUgPSBzdHJkdXAoczEpOwog CQkJKm1vdW50TmFtZSA9IHN0cmR1cChzMik7CiAJCQlyZXR1cm4gMTsKIAkJfQogCX0KLQlmY2xv c2UoZnApOworCUZDTE9TRShmcCk7CiAJcmV0dXJuIDA7CiB9CiAKQEAgLTcwOCw3ICs3MTgsNyBA QAogCQkJfQogCQl9CiAJfQotCWZjbG9zZShmcCk7CisJRkNMT1NFKGZwKTsKIH0KIAogCkBAIC0x MDE4LDcgKzEwMjgsNyBAQAogCX0KIAogCS8qIGNsZWFudXAgKi8KLQljbG9zZShmZCk7CisJQ0xP U0UoZmQpOwogCWZyZWUoZGV2aWNlKTsKIAlmcmVlKGRldmljZU5hbWUpOwogCWZyZWUoZnVsbE5h bWUpOwo= 58443 2005-05-08 23:38 0000 make sure DEFAULTDEVICE starts with "/dev/" eject-2.0.13-defaultdevice-fix.patch text/plain LS0tIGVqZWN0LTIuMC4xM2RlYi5vcmlnL3ZvbG5hbWUuYworKysgZWplY3QtMi4wLjEzZGViL3Zv bG5hbWUuYwpAQCAtMjIsNyArMjIsNyBAQAogICoKICAqIFlvdSBzaG91bGQgaGF2ZSByZWNlaXZl ZCBhIGNvcHkgb2YgdGhlIEdOVSBHZW5lcmFsIFB1YmxpYyBMaWNlbnNlCiAgKiBhbG9uZyB3aXRo IHRoaXMgcHJvZ3JhbTsgaWYgbm90LCB3cml0ZSB0byB0aGUgRnJlZSBTb2Z0d2FyZQotICogRm91 bmRhdGlvbiwgSW5jLiwgNjc1IE1hc3MgQXZlLCBDYW1icmlkZ2UsIE1BIDAyMTM5LCBVU0EuCisg KiBGb3VuZGF0aW9uLCBJbmMuLCA1OSBUZW1wbGUgUGxhY2UsIFN1aXRlIDMzMCwgQm9zdG9uLCBN QSAwMjExMS0xMzA3IFVTQQogICoKICAqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKgogICoKQEAgLTM5LDYgKzM5LDcgQEAK ICNpbmNsdWRlIDxzeXMvdHlwZXMuaD4KICNpbmNsdWRlIDxzeXMvc3RhdC5oPgogI2luY2x1ZGUg PGZjbnRsLmg+CisjaW5jbHVkZSA8c3RkbGliLmg+CiAKIGludCBtYWluKGludCBhcmdjLCBjaGFy ICphcmd2W10pCiB7CkBAIC01Miw3ICs1Myw3IEBACiAgIGlmIChhcmdjID09IDIpIHsKICAgICBk ZXZpY2UgPSBhcmd2WzFdOwogICB9IGVsc2UgaWYgKGFyZ2MgPT0gMSkgewotICAgIGRldmljZSA9 IERFRkFVTFRERVZJQ0U7CisgICAgZGV2aWNlID0gIi9kZXYvIiBERUZBVUxUREVWSUNFOwogICB9 IGVsc2UgewogICAgIGZwcmludGYoc3RkZXJyLCBfKCJ1c2FnZTogdm9sbmFtZSBbPGRldmljZS1m aWxlPl1cbiIpKTsKICAgICBleGl0KDEpOwo= 58444 2005-05-08 23:38 0000 new version of finddev (includes documentation) eject-2.0.13-finddev2.patch text/plain ZGlmZiAtTnJ1IC4uL2VqZWN0LTIuMC4xMy5vbGQvZWplY3QuMSAuL2VqZWN0LjEKLS0tIC4uL2Vq ZWN0LTIuMC4xMy5vbGQvZWplY3QuMQkyMDAxLTA1LTIyIDExOjUxOjA5LjAwMDAwMDAwMCAtMDQw MAorKysgLi9lamVjdC4xCTIwMDUtMDUtMDkgMDA6MzM6NTkuMDAwMDAwMDAwIC0wNDAwCkBAIC0z NCw4ICszNCw4IEBACiAKIFRoZSBkZXZpY2UgY29ycmVzcG9uZGluZyB0byA8bmFtZT4gaXMgZWpl Y3RlZC4gVGhlIG5hbWUgY2FuIGJlIGEKIGRldmljZSBmaWxlIG9yIG1vdW50IHBvaW50LCBlaXRo ZXIgYSBmdWxsIHBhdGggb3Igd2l0aCB0aGUgbGVhZGluZwotIi9kZXYiIG9yICIvbW50IiBvbWl0 dGVkLiBJZiBubyBuYW1lIGlzIHNwZWNpZmllZCwgdGhlIGRlZmF1bHQgbmFtZQotImNkcm9tIiBp cyB1c2VkLgorIi9kZXYiLCAiL21lZGlhIiBvciAiL21udCIgb21pdHRlZC4gSWYgbm8gbmFtZSBp cyBzcGVjaWZpZWQsIHRoZSAKK2RlZmF1bHQgbmFtZSAiY2Ryb20iIGlzIHVzZWQuCiAKIFRoZXJl IGFyZSBmb3VyIGRpZmZlcmVudCBtZXRob2RzIG9mIGVqZWN0aW5nLCBkZXBlbmRpbmcgb24gd2hl dGhlciB0aGUKIGRldmljZSBpcyBhIENELVJPTSwgU0NTSSBkZXZpY2UsIHJlbW92YWJsZSBmbG9w cHksIG9yIHRhcGUuIEJ5IGRlZmF1bHQKQEAgLTI1NywxMSArMjU3LDExIEBACiB0aGUgbmFtZSBl bmRzIGluIGEgdHJhaWxpbmcgc2xhc2gsIGl0IGlzIHJlbW92ZWQgKHRoaXMgaXMgdG8gc3VwcG9y dAogZmlsZW5hbWVzIGdlbmVyYXRlZCB1c2luZyBzaGVsbCBmaWxlIG5hbWUgY29tcGxldGlvbiku IElmIHRoZSBuYW1lCiBzdGFydHMgd2l0aCAnLicgb3IgJy8nLCBpdCB0cmllcyB0byBvcGVuIGl0 IGFzIGEgZGV2aWNlIGZpbGUgb3IgbW91bnQKLXBvaW50LiBJZiB0aGF0IGZhaWxzLCBpdCB0cmll cyBwcmVwZW5kaW5nICcvZGV2LycsICcvbW50LycsICcvZGV2L2Nkcm9tcycsCi1cJicvZGV2L3Jk c2svJywgJy9kZXYvZHNrLycsIGFuZCBmaW5hbGx5ICcuLycgdG8gdGhlIG5hbWUsIHVudGlsIGEK LWRldmljZSBmaWxlIG9yIG1vdW50IHBvaW50IGlzIGZvdW5kIHRoYXQgY2FuIGJlIG9wZW5lZC4g VGhlIHByb2dyYW0KLWNoZWNrcyAvZXRjL210YWIgZm9yIG1vdW50ZWQgZGV2aWNlcy4gSWYgdGhh dCBmYWlscywgaXQgYWxzbyBjaGVja3MKLS9ldGMvZnN0YWIgZm9yIG1vdW50IHBvaW50cyBvZiBj dXJyZW50bHkgdW5tb3VudGVkIGRldmljZXMuCitwb2ludC4gSWYgdGhhdCBmYWlscywgaXQgdHJp ZXMgcHJlcGVuZGluZyAnL2Rldi8nLCAnL21lZGlhLycsICcvbW50LycsIAorJy9kZXYvY2Ryb21z JywgJy9kZXYvcmRzay8nLCAnL2Rldi9kc2svJywgYW5kIGZpbmFsbHkgJy4vJyB0byB0aGUgbmFt ZSwgCit1bnRpbCBhIGRldmljZSBmaWxlIG9yIG1vdW50IHBvaW50IGlzIGZvdW5kIHRoYXQgY2Fu IGJlIG9wZW5lZC4gVGhlIAorcHJvZ3JhbSBjaGVja3MgL2V0Yy9tdGFiIGZvciBtb3VudGVkIGRl dmljZXMuIElmIHRoYXQgZmFpbHMsIGl0IGFsc28gCitjaGVja3MgL2V0Yy9mc3RhYiBmb3IgbW91 bnQgcG9pbnRzIG9mIGN1cnJlbnRseSB1bm1vdW50ZWQgZGV2aWNlcy4KIAogQ3JlYXRpbmcgc3lt Ym9saWMgbGlua3Mgc3VjaCBhcyAvZGV2L2Nkcm9tIG9yIC9kZXYvemlwIGlzIHJlY29tbWVuZGVk CiBzbyB0aGF0CmRpZmYgLU5ydSAuLi9lamVjdC0yLjAuMTMub2xkL2VqZWN0LmMgLi9lamVjdC5j Ci0tLSAuLi9lamVjdC0yLjAuMTMub2xkL2VqZWN0LmMJMjAwMi0xMi0wOSAxNzoyODowOC4wMDAw MDAwMDAgLTA1MDAKKysrIC4vZWplY3QuYwkyMDA1LTA1LTA5IDAwOjQwOjMzLjAwMDAwMDAwMCAt MDQwMApAQCAtMjk0LDYgKzI5NCw3IEBACiAgKgogICogZm9vIChpZiBmb28gc3RhcnRzIHdpdGgg Jy4nIG9yICcvJykKICAqIC9kZXYvZm9vCisgKiAvbWVkaWEvZm9vCiAgKiAvbW50L2ZvbwogICog L2Rldi9jZHJvbXMvZm9vCiAgKiAvZGV2L2Nkcm9tcy9mb28wCkBAIC0zMjEsNiArMzIyLDExIEBA CiAJaWYgKEZpbGVFeGlzdHMoYnVmKSkKIAkJcmV0dXJuIGJ1ZjsKIAorCXN0cmNweShidWYsICIv bWVkaWEvIik7CisJc3RyY2F0KGJ1ZiwgbmFtZSk7CisJaWYgKEZpbGVFeGlzdHMoYnVmKSkKKwkJ cmV0dXJuIGJ1ZjsKKwogCXN0cmNweShidWYsICIvbW50LyIpOwogCXN0cmNhdChidWYsIG5hbWUp OwogCWlmIChGaWxlRXhpc3RzKGJ1ZikpCg== 58445 2005-05-08 23:38 0000 make sure we can read fstab eject-2.0.13-fstabreadfix.patch text/plain ZGlmZiAtTnJ1IC4uL2VqZWN0LTIuMC4xMy5vbGQvZWplY3QuYyAuL2VqZWN0LmMKLS0tIC4uL2Vq ZWN0LTIuMC4xMy5vbGQvZWplY3QuYwkyMDAyLTEyLTA5IDE3OjI4OjA4LjAwMDAwMDAwMCAtMDUw MAorKysgLi9lamVjdC5jCTIwMDUtMDUtMDkgMDE6NDY6MjkuMDAwMDAwMDAwIC0wNDAwCkBAIC02 NTYsOCArNjU2LDEzIEBACiAKIAlmcCA9IGZvcGVuKCIvZXRjL2ZzdGFiIiwgInIiKTsKIAlpZiAo ZnAgPT0gTlVMTCkgewotCQlmcHJpbnRmKHN0ZGVyciwgXygiJXM6IHVuYWJsZSB0byBvcGVuIC9l dGMvZnN0YWI6ICVzXG4iKSwgcHJvZ3JhbU5hbWUsIHN0cmVycm9yKGVycm5vKSk7Ci0JCWV4aXQo MSk7CisJCS8qCisJCSAqIC9ldGMvZnN0YWIgbWF5IGJlIHVucmVhZGFibGUgaW4gc29tZSBzaXR1 YXRpb25zIGR1ZSB0byBwYXNzd29yZHMgaW4gdGhlCisJCSAqIGZpbGUuCisJCSAqLworCQlpZiAo dl9vcHRpb24pCisJCQlwcmludGYoIF8oIiVzOiB1bmFibGUgdG8gb3BlbiAvZXRjL2ZzdGFiOiAl c1xuIiksIHByb2dyYW1OYW1lLCBzdHJlcnJvcihlcnJubykpOworCQlyZXR1cm4gLTE7CiAJfQog CiAJd2hpbGUgKGZnZXRzKGxpbmUsIHNpemVvZihsaW5lKSwgZnApICE9IDApIHsKQEAgLTg5MCw3 ICs4OTUsOCBAQAogCS8qIGlmIG5vdCBjdXJyZW50bHkgbW91bnRlZCwgc2VlIGlmIGl0IGlzIGEg cG9zc2libGUgbW91bnQgcG9pbnQgKi8KIAlpZiAoIW1vdW50ZWQpIHsKIAkJbW91bnRhYmxlID0g TW91bnRhYmxlRGV2aWNlKGZ1bGxOYW1lLCAmbW91bnROYW1lLCAmZGV2aWNlTmFtZSk7Ci0JCWlm ICh2X29wdGlvbikgeworCQkvKiBpZiByZXR1cm4gdmFsdWUgLTEgdGhlbiBmc3RhYiBjb3VsZCBu b3QgYmUgcmVhZCAqLworCQlpZiAodl9vcHRpb24gJiYgKG1vdW50YWJsZSA+PSAwKSkgewogCQkJ aWYgKG1vdW50YWJsZSkKIAkJCQlwcmludGYoXygiJXM6IGAlcycgY2FuIGJlIG1vdW50ZWQgYXQg YCVzJ1xuIiksIHByb2dyYW1OYW1lLCBkZXZpY2VOYW1lLCBtb3VudE5hbWUpOwogCQkJZWxzZQo= 58446 2005-05-08 23:39 0000 check the return value of malloc for NULL eject-2.0.13-mallocfix.patch text/plain ZGlmZiAtTnJ1IC4uL2VqZWN0LTIuMC4xMy5vbGQvZWplY3QuYyAuL2VqZWN0LmMKLS0tIC4uL2Vq ZWN0LTIuMC4xMy5vbGQvZWplY3QuYwkyMDAyLTEyLTA5IDE3OjI4OjA4LjAwMDAwMDAwMCAtMDUw MAorKysgLi9lamVjdC5jCTIwMDUtMDUtMDkgMDE6MjA6MTguMDAwMDAwMDAwIC0wNDAwCkBAIC0z MDksNiArMzA5LDEwIEBACiAJY2hhciAqYnVmOwogCiAJYnVmID0gKGNoYXIgKikgbWFsbG9jKHN0 cmxlbihuYW1lKSsxNCk7IC8qIHRvIGFsbG93IGZvciAiL2Rldi9jZHJvbXMvICsgIjAiICsgbnVs bCAqLworCWlmIChidWY9PU5VTEwpIHsKKwkJZnByaW50ZihzdGRlcnIsIF8oIiVzOiBjb3VsZCBu b3QgYWxsb2NhdGUgbWVtb3J5XG4iKSwgcHJvZ3JhbU5hbWUpOworCQlleGl0KDEpOworCX0KIAog CWlmICgobmFtZVswXSA9PSAnLicpIHx8IChuYW1lWzBdID09ICcvJykpIHsKIAkJc3RyY3B5KGJ1 ZiwgbmFtZSk7Cg== 58447 2005-05-08 23:39 0000 adds a don't unmount option eject-2.0.13-no_unmount.patch text/plain ZGlmZiAtTnJ1IC4uL2VqZWN0LTIuMC4xMy5vbGQvZWplY3QuMSAuL2VqZWN0LjEKLS0tIC4uL2Vq ZWN0LTIuMC4xMy5vbGQvZWplY3QuMQkyMDAxLTA1LTIyIDExOjUxOjA5LjAwMDAwMDAwMCAtMDQw MAorKysgLi9lamVjdC4xCTIwMDUtMDUtMDkgMDA6NDY6MTMuMDAwMDAwMDAwIC0wNDAwCkBAIC0x MjMsNiArMTIzLDEzIEBACiBhbHNvIHBhc3NlcyB0aGUgLW4gb3B0aW9uIHRvIHVtb3VudCgxKS4K IAogLlRQIDAuNWkKKy5CIFwtbQorVGhpcyBvcHRpb24gYWxsb3dzIGVqZWN0IHRvIHdvcmsgd2l0 aCBkZXZpY2UgZHJpdmVycyB3aGljaCBhdXRvbWF0aWNhbGx5Cittb3VudCByZW1vdmFibGUgbWVk aWEgYW5kIHRoZXJlZm9yZSBtdXN0IGJlIGFsd2F5cyBtb3VudCgpZWQuCitUaGUgb3B0aW9uIHRl bGxzIGVqZWN0IHRvIG5vdCB0cnkgdG8gdW5tb3VudCB0aGUgZ2l2ZW4gZGV2aWNlLAorZXZlbiBp ZiBpdCBpcyBtb3VudGVkIGFjY29yZGluZyB0byAvZXRjL210YWIgb3IgL3Byb2MvbW91bnRzLgor CisuVFAgMC41aQogLkIgLVYKIFRoaXMgb3B0aW9uIGNhdXNlcwogLkIgZWplY3QKZGlmZiAtTnJ1 IC4uL2VqZWN0LTIuMC4xMy5vbGQvZWplY3QuYyAuL2VqZWN0LmMKLS0tIC4uL2VqZWN0LTIuMC4x My5vbGQvZWplY3QuYwkyMDAyLTEyLTA5IDE3OjI4OjA4LjAwMDAwMDAwMCAtMDUwMAorKysgLi9l amVjdC5jCTIwMDUtMDUtMDkgMDA6NTI6MDYuMDAwMDAwMDAwIC0wNDAwCkBAIC04NCw2ICs4NCw3 IEBACiBpbnQgdl9vcHRpb24gPSAwOwogaW50IHhfb3B0aW9uID0gMDsKIGludCBwX29wdGlvbiA9 IDA7CitpbnQgbV9vcHRpb24gPSAwOwogaW50IGFfYXJnID0gMDsKIGludCBjX2FyZyA9IDA7CiBp bnQgeF9hcmcgPSAwOwpAQCAtMTI4LDcgKzEyOSw5IEBACiAiICAtc1x0LS0gZWplY3QgU0NTSSBk ZXZpY2VcbiIKICIgIC1mXHQtLSBlamVjdCBmbG9wcHlcbiIKICIgIC1xXHQtLSBlamVjdCB0YXBl XG4iCi0iICAtcFx0LS0gdXNlIC9wcm9jL21vdW50cyBpbnN0ZWFkIG9mIC9ldGMvbXRhYlxuIikK KyIgIC1wXHQtLSB1c2UgL3Byb2MvbW91bnRzIGluc3RlYWQgb2YgL2V0Yy9tdGFiXG4iCisiICAt bVx0LS0gZG8gbm90IHVubW91bnQgZGV2aWNlIGV2ZW4gaWYgaXQgaXMgbW91bnRlZFxuIgorKQog LCB2ZXJzaW9uKTsKICNpZmRlZiBHRVRPUFRMT05HCiAJZnByaW50ZihzdGRlcnIsXygKQEAgLTEz Nyw3ICsxNDAsNyBAQAogIiAgLWEgLS1hdXRvICAgLWMgLS1jaGFuZ2Vyc2xvdCAgLXQgLS10cmF5 Y2xvc2UgIC14IC0tY2RzcGVlZFxuIgogIiAgLXIgLS1jZHJvbSAgLXMgLS1zY3NpCSAtZiAtLWZs b3BweVxuIgogIiAgLXEgLS10YXBlICAgLW4gLS1ub29wCSAtViAtLXZlcnNpb25cbiIKLSIgIC1w IC0tcHJvY1xuIikpOworIiAgLXAgLS1wcm9jICAgLW0gLS1uby11bm1vdW50XG4iKSk7CiAjZW5k aWYgLyogR0VUT1BUTE9ORyAqLwogCWZwcmludGYoc3RkZXJyLF8oCiAiUGFyYW1ldGVyIDxuYW1l PiBjYW4gYmUgYSBkZXZpY2UgZmlsZSBvciBhIG1vdW50IHBvaW50LlxuIgpAQCAtMTUxLDcgKzE1 NCw3IEBACiAvKiBIYW5kbGUgY29tbWFuZCBsaW5lIG9wdGlvbnMuICovCiBzdGF0aWMgdm9pZCBw YXJzZV9hcmdzKGludCBhcmdjLCBjaGFyICoqYXJndiwgY2hhciAqKmRldmljZSkKIHsKLQljb25z dCBjaGFyICpmbGFncyA9ICJhOmM6eDpkZmhucXJzdHZWcCI7CisJY29uc3QgY2hhciAqZmxhZ3Mg PSAiYTpjOng6ZGZobnFyc3R2VnBtIjsKICNpZmRlZiBHRVRPUFRMT05HCiAJc3RhdGljIHN0cnVj dCBvcHRpb24gbG9uZ19vcHRpb25zW10gPQogCXsKQEAgLTE2OSw2ICsxNzIsNyBAQAogCQl7InRh cGUiLAlub19hcmd1bWVudCwJICAgTlVMTCwgJ3EnfSwKIAkJeyJ2ZXJzaW9uIiwJbm9fYXJndW1l bnQsCSAgIE5VTEwsICdWJ30sCiAJCXsicHJvYyIsCW5vX2FyZ3VtZW50LAkgICBOVUxMLCAncCd9 LAorCQl7Im5vLXVubW91bnQiLAlub19hcmd1bWVudCwJICAgTlVMTCwgJ20nfSwKIAkJezAsIDAs IDAsIDB9CiAJfTsKIAlpbnQgb3B0aW9uX2luZGV4OwpAQCAtMjMxLDYgKzIzNSw5IEBACiAJCQkg IHVzYWdlKCk7CiAJCQkgIGV4aXQoMCk7CiAJCQkgIGJyZWFrOworCQkgIGNhc2UgJ20nOgorCQkJ ICBtX29wdGlvbiA9IDE7CisJCQkgIGJyZWFrOwogCQkgIGNhc2UgJ24nOgogCQkJICBuX29wdGlv biA9IDE7CiAJCQkgIGJyZWFrOwpAQCAtOTMzLDcgKzk0MCw3IEBACiAJaWYgKCFjX29wdGlvbikg SGFuZGxlWE9wdGlvbihkZXZpY2VOYW1lKTsKIAogCS8qIHVubW91bnQgZGV2aWNlIGlmIG1vdW50 ZWQgKi8KLQlpZiAobW91bnRlZCkgeworCWlmICgobV9vcHRpb24gIT0gMSkgJiYgbW91bnRlZCkg ewogCQlpZiAodl9vcHRpb24pCiAJCQlwcmludGYoXygiJXM6IHVubW91bnRpbmcgYCVzJ1xuIiks IHByb2dyYW1OYW1lLCBkZXZpY2VOYW1lKTsKIAkJVW5tb3VudChkZXZpY2VOYW1lKTsKQEAgLTk0 Miw3ICs5NDksNyBAQAogCS8qIGlmIGl0IGlzIGEgbXVsdGlwYXJ0aXRpb24gZGV2aWNlLCB1bm1v dW50IGFueSBvdGhlciBwYXJ0aXRpb25zIG9uCiAJICAgdGhlIGRldmljZSAqLwogCXBhdHRlcm4g PSBNdWx0aXBsZVBhcnRpdGlvbnMoZGV2aWNlTmFtZSk7Ci0JaWYgKHBhdHRlcm4gIT0gMCkKKwlp ZiAoKG1fb3B0aW9uICE9IDEpICYmIChwYXR0ZXJuICE9IDApKQogCQlVbm1vdW50RGV2aWNlcyhw YXR0ZXJuKTsKIAogCS8qIGhhbmRsZSAtYyBvcHRpb24gKi8K 58448 2005-05-08 23:40 0000 adds pumount support (project utopia) eject-2.0.13-pumount.patch text/plain ZGlmZiAtTnJ1IC4uL2VqZWN0LTIuMC4xMy5vbGQvZWplY3QuYyAuL2VqZWN0LmMKLS0tIC4uL2Vq ZWN0LTIuMC4xMy5vbGQvZWplY3QuYwkyMDAyLTEyLTA5IDE3OjI4OjA4LjAwMDAwMDAwMCAtMDUw MAorKysgLi9lamVjdC5jCTIwMDUtMDUtMDkgMDE6MzM6MDUuMDAwMDAwMDAwIC0wNDAwCkBAIC01 NDAsMTEgKzU0MCwxNCBAQAogCXN3aXRjaCAoZm9yaygpKSB7CiAJICBjYXNlIDA6IC8qIGNoaWxk ICovCiAJCSAgc2V0ZXVpZChnZXR1aWQoKSk7IC8qIHJlZHVjZSBsaWtlbHlob29kIG9mIHNlY3Vy aXR5IGhvbGVzIHdoZW4gcnVubmluZyBzZXR1aWQgKi8KLQkJICBpZihwX29wdGlvbikKLQkJCSAg ZXhlY2woIi9iaW4vdW1vdW50IiwgIi9iaW4vdW1vdW50IiwgZnVsbE5hbWUsICItbiIsIE5VTEwp OwotCQkgIGVsc2UKLQkJCSAgZXhlY2woIi9iaW4vdW1vdW50IiwgIi9iaW4vdW1vdW50IiwgZnVs bE5hbWUsIE5VTEwpOwotCQkgIGZwcmludGYoc3RkZXJyLCBfKCIlczogdW5hYmxlIHRvIGV4ZWMg L2Jpbi91bW91bnQgb2YgYCVzJzogJXNcbiIpLAorCQkgIGlmKHBfb3B0aW9uKSB7CisJCQkgIGV4 ZWNscCgicHVtb3VudCIsICJwdW1vdW50IiwgZnVsbE5hbWUsICItbiIsIE5VTEwpOworCQkJICBl eGVjbHAoInVtb3VudCIsICJ1bW91bnQiLCBmdWxsTmFtZSwgIi1uIiwgTlVMTCk7CisJCSAgfSBl bHNlIHsKKwkJCSAgZXhlY2xwKCJwdW1vdW50IiwgInB1bW91bnQiLCBmdWxsTmFtZSwgTlVMTCk7 CisJCQkgIGV4ZWNscCgidW1vdW50IiwgInVtb3VudCIsIGZ1bGxOYW1lLCBOVUxMKTsKKwkJICB9 CisJCSAgZnByaW50ZihzdGRlcnIsIF8oIiVzOiB1bmFibGUgdG8gZXhlYyB1bW91bnQgb2YgYCVz JzogJXNcbiIpLAogCQkJCSAgcHJvZ3JhbU5hbWUsIGZ1bGxOYW1lLCBzdHJlcnJvcihlcnJubykp OwogCQkgIGV4aXQoMSk7CiAJCSAgYnJlYWs7Cg== 58449 2005-05-08 23:40 0000 make sure we have a proper regex eject-2.0.13-regexfix.patch text/plain ZGlmZiAtTnJ1IC4uL2VqZWN0LTIuMC4xMy5vbGQvZWplY3QuYyAuL2VqZWN0LmMKLS0tIC4uL2Vq ZWN0LTIuMC4xMy5vbGQvZWplY3QuYwkyMDAyLTEyLTA5IDE3OjI4OjA4LjAwMDAwMDAwMCAtMDUw MAorKysgLi9lamVjdC5jCTIwMDUtMDUtMDkgMDE6Mzg6MjkuMDAwMDAwMDAwIC0wNDAwCkBAIC02 ODcsNyArNjg3LDExIEBACiAJY2hhciBsaW5lWzEwMjRdOwogCWludCBzdGF0dXM7CiAKLQlyZWdj b21wKCZwcmVnLCBwYXR0ZXJuLCBSRUdfRVhURU5ERUQpOworCWlmIChyZWdjb21wKCZwcmVnLCBw YXR0ZXJuLCBSRUdfRVhURU5ERUQpIT0wKSB7CisJCXBlcnJvcihwcm9ncmFtTmFtZSk7CisJCWV4 aXQoMSk7CisJfQorCiAKIAlmcCA9IGZvcGVuKChwX29wdGlvbiA/ICIvcHJvYy9tb3VudHMiIDog Ii9ldGMvbXRhYiIpLCAiciIpOwogCWlmIChmcCA9PSBOVUxMKQo= 58450 2005-05-08 23:41 0000 new ebuild eject-2.0.13-r2.ebuild text/plain IyBDb3B5cmlnaHQgMTk5OS0yMDA1IEdlbnRvbyBGb3VuZGF0aW9uCiMgRGlzdHJpYnV0ZWQgdW5k ZXIgdGhlIHRlcm1zIG9mIHRoZSBHTlUgR2VuZXJhbCBQdWJsaWMgTGljZW5zZSB2MgojICRIZWFk ZXI6IC92YXIvY3Zzcm9vdC9nZW50b28teDg2L3N5cy1hcHBzL2VqZWN0L2VqZWN0LTIuMC4xMy1y MS5lYnVpbGQsdiAxLjEgMjAwNS8wMi8xMyAwNToxMjoyMSB2YXBpZXIgRXhwICQKCmluaGVyaXQg ZXV0aWxzCgpERVNDUklQVElPTj0iQSBjb21tYW5kIHRvIGVqZWN0IGEgZGlzYyBmcm9tIHRoZSBD RC1ST00gZHJpdmUiCkhPTUVQQUdFPSJodHRwOi8vZWplY3Quc291cmNlZm9yZ2UubmV0LyIKU1JD X1VSST0iaHR0cDovL3d3dy5pYmlibGlvLm9yZy9wdWIvTGludXgvdXRpbHMvZGlzay1tYW5hZ2Vt ZW50LyR7UH0udGFyLmd6CglodHRwOi8vd3d3LnBvYm94LmNvbS9+dHJhbnRlci8ke1B9LnRhci5n eiIKCkxJQ0VOU0U9IkdQTC0yIgpTTE9UPSIwIgpLRVlXT1JEUz0ifng4NiIKSVVTRT0ibmxzIgoK UkRFUEVORD0idmlydHVhbC9saWJjIgpERVBFTkQ9IiR7UkRFUEVORH0KCT49c3lzLWFwcHMvc2Vk LTQiCgpzcmNfdW5wYWNrKCkgewoJdW5wYWNrICR7QX0KCWNkICIke1N9IgoJZXBhdGNoICIke0ZJ TEVTRElSfSIvJHtQfS1rZXJuZWwyNS1zdXBwb3J0LnBhdGNoCgllcGF0Y2ggIiR7RklMRVNESVJ9 Ii8ke1B9LWF1dG9jbG9zZS5wYXRjaAoJZXBhdGNoICIke0ZJTEVTRElSfSIvJHtQfS1oZWFkZXIu cGF0Y2gKCWVwYXRjaCAiJHtGSUxFU0RJUn0iLyR7UH0tdXNlLW1vdW50cG9pbnRzLnBhdGNoCgll cGF0Y2ggIiR7RklMRVNESVJ9Ii8ke1B9LWNsb3NlZmQucGF0Y2gKCWVwYXRjaCAiJHtGSUxFU0RJ Un0iLyR7UH0tZGVmYXVsdGRldmljZS1maXgucGF0Y2gKCWVwYXRjaCAiJHtGSUxFU0RJUn0iLyR7 UH0tZmluZGRldjIucGF0Y2gKCWVwYXRjaCAiJHtGSUxFU0RJUn0iLyR7UH0tZnN0YWJyZWFkZml4 LnBhdGNoCgllcGF0Y2ggIiR7RklMRVNESVJ9Ii8ke1B9LW1hbGxvY2ZpeC5wYXRjaAoJZXBhdGNo ICIke0ZJTEVTRElSfSIvJHtQfS1ub191bm1vdW50LnBhdGNoCgllcGF0Y2ggIiR7RklMRVNESVJ9 Ii8ke1B9LXB1bW91bnQucGF0Y2gKCWVwYXRjaCAiJHtGSUxFU0RJUn0iLyR7UH0tcmVnZXhmaXgu cGF0Y2gKCglpZiAhIHVzZSBubHMgOyB0aGVuCgkJc2VkIC1pICJzOlNVQkRJUlMgPSBwbzo6IiBN YWtlZmlsZS5pbiB8fCBkaWUgInNlZCBubHMgZmFpbGVkIgoJZmkKfQoKc3JjX2luc3RhbGwoKSB7 CgltYWtlIERFU1RESVI9IiR7RH0iIGluc3RhbGwgfHwgZGllICJtYWtlIGluc3RhbGwgZmFpbGVk IgoJZG9kb2MgQ2hhbmdlTG9nIFJFQURNRSBQT1JUSU5HIFRPRE8gQVVUSE9SUyBORVdTIFBST0JM RU1TCn0K