32298 2016-07-22 11:48:21 +0300 Conky не работает вместе с apcupsd 2018-11-23 18:06:24 +0300 1 1 4 Development Sisyphus conky unstable all Linux CLOSED FIXED P3 normal --- 1 varalt ulysses ulysses qa-sisyphus oldest_to_newest 157728 0 6771 varalt 2016-07-22 11:48:21 +0300 Created attachment 6771 Патч для Conky Не работает отображение данных из apcupsd в Conky(вместо данных выводится N/A). Причём Gapcmon информацию из apcupsd полностью и правильно отображает, а вот Conky - нет! Это связано с со старым багом в Conky и для него уже был разработан патч(его прикладываю). Просьба пропатчить Conky и выложить пропатченную версию в P7 и в P8. 175805 1 vseleznv 2018-11-14 20:43:33 +0300 Проверьте тестовое задание #216477. 176017 2 repository-robot 2018-11-23 18:06:24 +0300 conky-1.9.0-alt2 -> sisyphus: Wed Nov 14 2018 Vladimir D. Seleznev <vseleznv@altlinux> 1.9.0-alt2 - fixed apcupsd support (ALT#32298) 6771 2016-07-22 11:48:21 +0300 2016-07-22 11:48:21 +0300 Патч для Conky apcupsd.patch text/plain 2869 varalt RGVzY3JpcHRpb246IEZpeCBicm9rZW4gYXBjdXBzZCBzdXBwb3J0IGluIENvbmt5IDEuOC4xCiBS ZXZlcnQgYXBjdXBzZC1yZWxhdGVkIGNvZGUgdG8gQ29ua3kgMS44LjAgaW4gb3JkZXIgdG8gZml4 IGJyb2tlbiBhcGN1cHNkCiBzdXBwb3J0LiBUaGlzIGlzIGEgd29ya2Fyb3VuZCB1bnRpbCB1cHN0 cmVhbSBwcm9wZXJseSBhZGRyZXNzZXMgdGhpcyBpc3N1ZS4KRnJvbTogQnJpYW4gRGVyciA8YmRl cnJseUBnbWFpbC5jb20+CkZvcndhcmRlZDogaHR0cDovL3NvdXJjZWZvcmdlLm5ldC9zdXBwb3J0 L3RyYWNrZXIucGhwP2FpZD0zMDgzODU5CkJ1Zy1VYnVudHU6IGh0dHBzOi8vYnVncy5sYXVuY2hw YWQubmV0L2J1Z3MvODk3NDk1Ckxhc3QtVXBkYXRlOiAyMDExLTEyLTAyCgotLS0gYS9zcmMvYXBj dXBzZC5jCisrKyBiL3NyYy9hcGN1cHNkLmMKQEAgLTE1NCw3ICsxNTQsNyBAQAogLy8KIC8vIENv bmt5IHVwZGF0ZSBmdW5jdGlvbiBmb3IgYXBjdXBzZCBkYXRhCiAvLwotaW50IHVwZGF0ZV9hcGN1 cHNkKHZvaWQpIHsKK3ZvaWQgdXBkYXRlX2FwY3Vwc2Qodm9pZCkgewogCiAJaW50IGk7CiAJQVBD VVBTRF9TIGFwYzsKQEAgLTE2NCw0MSArMTY0LDQ0IEBACiAJCW1lbWNweShhcGMuaXRlbXNbaV0s ICJOL0EiLCA0KTsgLy8gaW5jbHVkaW5nIFwwCiAKIAlkbyB7Ci0JCXN0cnVjdCBhZGRyaW5mbyBo aW50czsKLQkJc3RydWN0IGFkZHJpbmZvICphaSwgKnJwOwotCQlpbnQgcmVzOworCQlzdHJ1Y3Qg aG9zdGVudCogaGUgPSAwOworCQlzdHJ1Y3Qgc29ja2FkZHJfaW4gYWRkcjsKIAkJc2hvcnQgc3og PSAwOwotCQljaGFyIHBvcnRidWZbOF07CisjaWZkZWYgSEFWRV9HRVRIT1NUQllOQU1FX1IKKwkJ c3RydWN0IGhvc3RlbnQgaGVfbWVtOworCQlpbnQgaGVfZXJybm87CisJCWNoYXIgaG9zdGJ1ZmZb MjA0OF07CisjZW5kaWYKIAkJLy8KIAkJLy8gY29ubmVjdCB0byBhcGN1cHNkIGRhZW1vbgogCQkv LwotCQltZW1zZXQoJmhpbnRzLCAwLCBzaXplb2Yoc3RydWN0IGFkZHJpbmZvKSk7Ci0JCWhpbnRz LmFpX2ZhbWlseSA9IEFGX1VOU1BFQzsKLQkJaGludHMuYWlfc29ja3R5cGUgPSBTT0NLX1NUUkVB TTsKLQkJaGludHMuYWlfZmxhZ3MgPSAwOwotCQloaW50cy5haV9wcm90b2NvbCA9IDA7Ci0JCXNu cHJpbnRmKHBvcnRidWYsIDgsICIlZCIsIGluZm8uYXBjdXBzZC5wb3J0KTsKLQkJcmVzID0gZ2V0 YWRkcmluZm8oaW5mby5hcGN1cHNkLmhvc3QsIHBvcnRidWYsICZoaW50cywgJmFpKTsKLQkJaWYg KHJlcyAhPSAwKSB7Ci0JCQlOT1JNX0VSUigiQVBDVVBTRCBnZXRhZGRyaW5mbzogJXMiLCBnYWlf c3RyZXJyb3IocmVzKSk7CisJCXNvY2sgPSBzb2NrZXQoQUZfSU5FVCwgU09DS19TVFJFQU0sIDAp OworCQlpZiAoc29jayA8IDApIHsKKwkJCXBlcnJvcigic29ja2V0Iik7CiAJCQlicmVhazsKIAkJ fQotCQlmb3IgKHJwID0gYWk7IHJwICE9IE5VTEw7IHJwID0gcnAtPmFpX25leHQpIHsKLQkJCXNv Y2sgPSBzb2NrZXQocnAtPmFpX2ZhbWlseSwgcnAtPmFpX3NvY2t0eXBlLCBycC0+YWlfcHJvdG9j b2wpOwotCQkJaWYgKHNvY2sgPT0gLTEpIHsKLQkJCQljb250aW51ZTsKLQkJCX0KLQkJCWlmIChj b25uZWN0KHNvY2ssIHJwLT5haV9hZGRyLCBycC0+YWlfYWRkcmxlbikgIT0gLTEpIHsKLQkJCQli cmVhazsKLQkJCX0KLQkJCWNsb3NlKHNvY2spOworI2lmZGVmIEhBVkVfR0VUSE9TVEJZTkFNRV9S CisJCWlmIChnZXRob3N0YnluYW1lX3IoaW5mby5hcGN1cHNkLmhvc3QsICZoZV9tZW0sIGhvc3Ri dWZmLCBzaXplb2YoaG9zdGJ1ZmYpLCAmaGUsICZoZV9lcnJubykgfHwgIWhlICkgeworCQkJTk9S TV9FUlIoIkFQQ1VQU0QgZ2V0aG9zdGJ5bmFtZV9yOiAlcyIsIGhzdHJlcnJvcihoX2Vycm5vKSk7 CisJCQlicmVhazsKKwkJfQorI2Vsc2UgLyogSEFWRV9HRVRIT1NUQllOQU1FX1IgKi8KKwkJaGUg PSBnZXRob3N0YnluYW1lKGluZm8uYXBjdXBzZC5ob3N0KTsKKwkJaWYgKCFoZSkgeworCQkJaGVy cm9yKCJnZXRob3N0YnluYW1lIik7CisJCQlicmVhazsKIAkJfQotCQlmcmVlYWRkcmluZm8oYWkp OwotCQlpZiAocnAgPT0gTlVMTCkgeworI2VuZGlmIC8qIEhBVkVfR0VUSE9TVEJZTkFNRV9SICov CisJCQorCQltZW1zZXQoJmFkZHIsIDAsIHNpemVvZihhZGRyKSk7CisJCWFkZHIuc2luX2ZhbWls eSA9IEFGX0lORVQ7CisJCWFkZHIuc2luX3BvcnQgPSBpbmZvLmFwY3Vwc2QucG9ydDsKKwkJbWVt Y3B5KCZhZGRyLnNpbl9hZGRyLCBoZS0+aF9hZGRyLCBoZS0+aF9sZW5ndGgpOworCQlpZiAoY29u bmVjdChzb2NrLCAoc3RydWN0IHNvY2thZGRyKikmYWRkciwgc2l6ZW9mKHN0cnVjdCBzb2NrYWRk cikpIDwgMCkgewogCQkJLy8gbm8gZXJyb3IgcmVwb3J0aW5nLCB0aGUgZGFlbW9uIGlzIHByb2Jh Ymx5IG5vdCBydW5uaW5nCiAJCQlicmVhazsKIAkJfQotCisJCiAJCS8vCiAJCS8vIHNlbmQgc3Rh dHVzIHJlcXVlc3QgLSAic3RhdHVzIiAtIDZCCiAJCS8vCkBAIC0yMjIsNSArMjI1LDUgQEAKIAkv LyAiYXRvbWljYWxseSIgY29weSB0aGUgZGF0YSBpbnRvIHdvcmtpbmcgc2V0CiAJLy8KIAltZW1j cHkoaW5mby5hcGN1cHNkLml0ZW1zLCBhcGMuaXRlbXMsIHNpemVvZihpbmZvLmFwY3Vwc2QuaXRl bXMpKTsKLQlyZXR1cm4gMDsKKwlyZXR1cm47CiB9Ci0tLSBhL3NyYy9hcGN1cHNkLmgKKysrIGIv c3JjL2FwY3Vwc2QuaApAQCAtNDksNiArNDksNiBAQAogfSBBUENVUFNEX1MsICpQQVBDVVBTRF9T OwogCiAvKiBTZXJ2aWNlIHJvdXRpbmUgZm9yIHRoZSBjb25reSBtYWluIHRocmVhZCAqLwotaW50 IHVwZGF0ZV9hcGN1cHNkKHZvaWQpOwordm9pZCB1cGRhdGVfYXBjdXBzZCh2b2lkKTsKIAogI2Vu ZGlmIC8qQVBDVVBTRF9IXyovCg==