33118 2017-02-15 23:40:42 +0300 [PATCH] исправление работы --without docs 2017-03-24 01:09:30 +0300 1 1 4 Development Sisyphus samba-DC unstable all Linux CLOSED FIXED P3 minor --- 1 mike sin cas iv qa-sisyphus oldest_to_newest 161909 0 6975 mike 2017-02-15 23:40:42 +0300 Created attachment 6975 работающий --without doc Прилагаемый патч дополняет функциональность и исправляет сборку --without doc, заодно меняет ручку docs на более общепринятую в сизифе doc; проверено на e2k. Вероятно, есть смысл сделать нечто аналогичное со спеком пакета samba. 162072 1 mike 2017-02-21 22:46:08 +0300 Патч неполный, понадобился ещё такой кусочек: diff --git a/samba4.spec b/samba4.spec index ea95472..b23295e 100644 --- a/samba4.spec +++ b/samba4.spec @@ -403,7 +403,8 @@ Group: System/Servers BuildArch: noarch Provides: task-samba-ad-dc = %version-%release Provides: task-ad-dc = %version-%release -Requires: samba-DC python-module-samba-DC samba-DC-common samba-DC-winbind-clients samba-DC-winbind samba-DC-client samba-DC-doc krb5-kinit +Requires: samba-DC python-module-samba-DC samba-DC-common samba-DC-winbind-clients samba-DC-winbind samba-DC-client krb5-kinit +%{?_with_doc:Requires: samba-DC-doc} Conflicts: samba python-module-samba samba-common samba-winbind-clients samba-winbind samba-client samba-doc %description -n task-samba-dc (иначе task-samba-dc не устанавливается при сборке --without doc) 162718 2 repository-robot 2017-03-24 01:09:30 +0300 samba-DC-4.6.1-alt1.S1 -> sisyphus: * Thu Mar 23 2017 Evgeny Sinelnikov <sin@altlinux> 4.6.1-alt1.S1 - Update to spring security release - Fixed build --without docs (closes: 33118) - Security fixes: + CVE-2017-2619 Symlink race allows access outside share definition 6975 2017-02-15 23:40:42 +0300 2017-02-15 23:40:42 +0300 работающий --without doc 0001-4.5.5-alt1.1-ubt.patch text/plain 7239 mike RnJvbSA4YTU1YTU1MGFjMzliMThlZmU4YTA1ZDFlODQ1MWQ1N2JjYTE5OGJkIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBNaWNoYWVsIFNoaWdvcmluIDxtaWtlQGFsdGxpbnV4Lm9yZz4K RGF0ZTogV2VkLCAxNSBGZWIgMjAxNyAyMzozNzo0MyArMDMwMApTdWJqZWN0OiBbUEFUQ0hdIDQu NS41LWFsdDEuMSV1YnQKCi0gQk9PVFNUUkFQOiByZW5hbWVkIGRvY3Mga25vYiB0byBkb2MsIG1h ZGUgaXQgd29yayBvbiBCUnMgYW5kICVmaWxlcwotLS0KIHNhbWJhNC5zcGVjIHwgNTMgKysrKysr KysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0KIDEgZmlsZSBj aGFuZ2VkLCA0MyBpbnNlcnRpb25zKCspLCAxMCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9z YW1iYTQuc3BlYyBiL3NhbWJhNC5zcGVjCmluZGV4IDE5YjBmZWMuLmVhOTU0NzIgMTAwNjQ0Ci0t LSBhL3NhbWJhNC5zcGVjCisrKyBiL3NhbWJhNC5zcGVjCkBAIC0yMCw3ICsyMCw3IEBACiAlZGVm X3dpdGhvdXQgbGlic21iY2xpZW50CiAlZGVmX3dpdGggbGlid2JjbGllbnQKICVkZWZfd2l0aG91 dCBsaWJuZXRhcGkKLSVkZWZfd2l0aCBkb2NzCislZGVmX3dpdGggZG9jCiAKICVkZWZfd2l0aCBk YwogJWRlZl93aXRob3V0IG50dmZzCkBAIC00Niw3ICs0Niw3IEBACiAKIE5hbWU6ICAgIHNhbWJh LURDCiBWZXJzaW9uOiA0LjUuNQotUmVsZWFzZTogYWx0MSV1YnQKK1JlbGVhc2U6IGFsdDEuMSV1 YnQKIAogR3JvdXA6ICAgU3lzdGVtL1NlcnZlcnMKIFN1bW1hcnk6IFNhbWJhIEFjdGl2ZSBEaXJl Y3RvcnkgRG9tYWluIENvbnRyb2xsZXIKQEAgLTExNyw3ICsxMTcsNyBAQCBCdWlsZENvbmZsaWN0 czogc2V0cHJvY3RpdGxlLWRldmVsCiBCdWlsZFJlcXVpcmVzOiBsaWJpbmlwYXJzZXItZGV2ZWwK IEJ1aWxkUmVxdWlyZXM6IGxpYmN1cHMtZGV2ZWwKIEJ1aWxkUmVxdWlyZXM6IGdhd2sgbGliZ3Rr KzItZGV2ZWwgbGliY2FwLWRldmVsIGxpYnV1aWQtZGV2ZWwKLUJ1aWxkUmVxdWlyZXM6IGlua3Nj YXBlIGxpYnhzbHQgeHNsdHByb2MgbmV0cGJtIGRibGF0ZXggaHRtbDJ0ZXh0IGRvY2Jvb2stc3R5 bGUteHNsCislez9fd2l0aF9kb2M6QnVpbGRSZXF1aXJlczogaW5rc2NhcGUgbGlieHNsdCB4c2x0 cHJvYyBuZXRwYm0gZGJsYXRleCBodG1sMnRleHQgZG9jYm9vay1zdHlsZS14c2x9CiAlez9fd2l0 aG91dF90YWxsb2M6QnVpbGRSZXF1aXJlczogbGlidGFsbG9jLWRldmVsID49IDIuMS44IGxpYnB5 dGFsbG9jLWRldmVsfQogJXs/X3dpdGhvdXRfdGV2ZW50OkJ1aWxkUmVxdWlyZXM6IGxpYnRldmVu dC1kZXZlbCA+PSAwLjkuMjkgcHl0aG9uLW1vZHVsZS10ZXZlbnR9CiAlez9fd2l0aG91dF90ZGI6 QnVpbGRSZXF1aXJlczogbGlidGRiLWRldmVsID49IDEuMy4xMCAgcHl0aG9uLW1vZHVsZS10ZGJ9 CkBAIC0zODQsNyArMzg0LDcgQEAgdGVtcG9yYXJ5IGRhdGEgaXQgaXMgdmVyeSBlYXN5IHRvIGNv bnZlcnQgdGhhdCBhcHBsaWNhdGlvbiB0byBiZSBjbHVzdGVyIGF3YXJlCiBhbmQgdXNlIENUREIg aW5zdGVhZC4KICVlbmRpZgogCi0laWZfd2l0aCBkb2NzCislaWZfd2l0aCBkb2MKICVwYWNrYWdl IGRvYwogU3VtbWFyeTogRG9jdW1lbnRhdGlvbiBmb3IgdGhlIFNhbWJhIHN1aXRlCiBHcm91cDog RG9jdW1lbnRhdGlvbgpAQCAtNTQwLDcgKzU0MCw3IEBAIGxpYnNhbWJhX3V0aWwgcHJpdmF0ZSBo ZWFkZXJzLgogWyAtbiAiJE5QUk9DUyIgXSB8fCBOUFJPQ1M9JV9fbnByb2NzOyBleHBvcnQgSk9C Uz0kTlBST0NTCiAlbWFrZV9idWlsZCBOUFJPQ1M9JV9fbnByb2NzCiAKLSVpZl93aXRoIGRvY3MK KyVpZl93aXRoIGRvYwogcHVzaGQgZG9jcy14bWwKIGV4cG9ydCBYTUxfQ0FUQUxPR19GSUxFUz0i ZmlsZTovLy9ldGMveG1sL2NhdGFsb2cgZmlsZTovLyQocHdkKS9idWlsZC9jYXRhbG9nLnhtbCIK ICVhdXRvcmVjb25mCkBAIC02NjEsNyArNjYxLDcgQEAgcm0gLXJmICVidWlsZHJvb3QlcHl0aG9u X3NpdGVsaWJkaXIvc2FtYmEve3Rlc3RzLGV4dGVybmFsL3N1YnVuaXQsZXh0ZXJuYWwvdGVzdHQK IFsgIiVfbGliZGlyIiAhPSAiJV9zYW1iYV9saWJkaXIiIF0gJiYgbXYgJWJ1aWxkcm9vdHslX3Nh bWJhX2xpYmRpci9wa2djb25maWcsJV9saWJkaXJ9CiAKICMgSW5zdGFsbCBkb2N1bWVudGF0aW9u Ci0laWZfd2l0aCBkb2NzCislaWZfd2l0aCBkb2MKIG1rZGlyIC1wICVidWlsZHJvb3QlX2RlZmF1 bHRkb2NkaXIvJXJuYW1lLwogY3AgLWEgZG9jcy14bWwvb3V0cHV0L2h0bWxkb2NzICVidWlsZHJv b3QlX2RlZmF1bHRkb2NkaXIvJXJuYW1lLwogJWVuZGlmCkBAIC03MzQsMTEgKzczNCwxMyBAQCBU REJfTk9fRlNZTkM9MSAlbWFrZV9idWlsZCB0ZXN0CiAlYXR0cigxNzc3LHJvb3Qscm9vdCkgJWRp ciAvdmFyL3Nwb29sL3NhbWJhCiAlX3N5c2NvbmZkaXIvb3BlbmxkYXAvc2NoZW1hL3NhbWJhLnNj aGVtYQogJV9zeXNjb25mZGlyL3BhbS5kL3NhbWJhCislaWZfd2l0aCBkb2MKICVfbWFuMWRpci9z bWJzdGF0dXMuMSoKICVfbWFuOGRpci9ldmVudGxvZ2FkbS44KgogJV9tYW44ZGlyL3NtYmQuOCoK ICVfbWFuOGRpci9ubWJkLjgqCiAlX21hbjhkaXIvdmZzXyouOCoKKyVlbmRpZgogCiAlaWZfd2l0 aCBkYwogJWF0dHIoNzU1LHJvb3Qscm9vdCkgJV9pbml0ZGlyL3NhbWJhCkBAIC03NTEsMTMgKzc1 MywxOCBAQCBUREJfTk9fRlNZTkM9MSAlbWFrZV9idWlsZCB0ZXN0CiAlX3NiaW5kaXIvc2FtYmFf dXBncmFkZWRucwogJWRpciAvdmFyL2xpYi9zYW1iYS9zeXN2b2wKICVfZGF0YWRpci9zYW1iYS9z ZXR1cAorJWlmX3dpdGggZG9jCiAlX21hbjhkaXIvc2FtYmEuOCoKICVfbWFuOGRpci9zYW1iYS10 b29sLjgqCislZW5kaWYgI2RvYwogJWVsc2UKICVkb2MgUkVBRE1FLmRjCislaWZfd2l0aCBkb2MK ICVleGNsdWRlICVfbWFuOGRpci9zYW1iYS44KgogJWV4Y2x1ZGUgJV9tYW44ZGlyL3NhbWJhLXRv b2wuOCoKLSVlbmRpZgorJWVuZGlmICNkb2MKKyVlbmRpZiAjZGMKKyVpZl93aXRoIGRvYwogJWlm X3dpdGggbGliY2VwaGZzCiAlZXhjbHVkZSAlX3NhbWJhX21vZF9saWJkaXIvdmZzL2NlcGguc28K ICVleGNsdWRlICVfbWFuOGRpci92ZnNfY2VwaC44KgpAQCAtNzY2LDYgKzc3Myw3IEBAIFREQl9O T19GU1lOQz0xICVtYWtlX2J1aWxkIHRlc3QKICVleGNsdWRlICVfc2FtYmFfbW9kX2xpYmRpci92 ZnMvZ2x1c3RlcmZzLnNvCiAlZXhjbHVkZSAlX21hbjhkaXIvdmZzX2dsdXN0ZXJmcy44KgogJWVu ZGlmCislZW5kaWYgI2RvYwogCiAlZmlsZXMgY2xpZW50CiAlX2JpbmRpci9jaWZzZGQKQEAgLTc5 Miw2ICs4MDAsNyBAQCBUREJfTk9fRlNZTkM9MSAlbWFrZV9idWlsZCB0ZXN0CiAlX2JpbmRpci9z bWJ0cmVlCiAlX2xpYmV4ZWNkaXIvc2FtYmEvc21ic3Bvb2xfa3JiNV93cmFwcGVyCiAle2N1cHNf c2VydmVyYmlufS9iYWNrZW5kL3NtYgorJWlmX3dpdGggZG9jCiAlX21hbjFkaXIvZGJ3cmFwX3Rv b2wuMSoKICVfbWFuMWRpci9ubWJsb29rdXAuMSoKICVfbWFuMWRpci9vTHNjaGVtYTJsZGlmLjEq CkBAIC04MTYsMjggKzgyNSwzMyBAQCBUREJfTk9fRlNZTkM9MSAlbWFrZV9idWlsZCB0ZXN0CiAl X21hbjhkaXIvc21ic3Bvb2xfa3JiNV93cmFwcGVyLjgqCiAjX21hbjhkaXIvc21idGEtdXRpbC44 KgogJV9tYW44ZGlyL2NpZnNkZC44KgorJWVuZGlmCiAKICVpZl93aXRoIG50ZGIKICVfYmluZGly L250ZGJiYWNrdXAKICVfYmluZGlyL250ZGJkdW1wCiAlX2JpbmRpci9udGRicmVzdG9yZQogJV9i aW5kaXIvbnRkYnRvb2wKKyVpZl93aXRoIGRvYwogJV9tYW4zZGlyL250ZGIuMyoKICVfbWFuOGRp ci9udGRiYmFja3VwLjgqCiAlX21hbjhkaXIvbnRkYmR1bXAuOCoKICVfbWFuOGRpci9udGRicmVz dG9yZS44KgogJV9tYW44ZGlyL250ZGJ0b29sLjgqCi0lZW5kaWYKKyVlbmRpZiAjZG9jCislZW5k aWYgI250ZGIKICVpZl93aXRoIHRkYgogJV9iaW5kaXIvdGRiYmFja3VwCiAlX2JpbmRpci90ZGJk dW1wCiAlX2JpbmRpci90ZGJyZXN0b3JlCiAlX2JpbmRpci90ZGJ0b29sCislaWZfd2l0aCBkb2MK ICVfbWFuOGRpci90ZGJiYWNrdXAuOCoKICVfbWFuOGRpci90ZGJkdW1wLjgqCiAlX21hbjhkaXIv dGRicmVzdG9yZS44KgogJV9tYW44ZGlyL3RkYnRvb2wuOCoKLSVlbmRpZgorJWVuZGlmICNkb2MK KyVlbmRpZiAjdGRiCiAKICVpZl93aXRoIGxkYgogJV9iaW5kaXIvbGRiYWRkCkBAIC04NDYsMTIg Kzg2MCwxNCBAQCBUREJfTk9fRlNZTkM9MSAlbWFrZV9idWlsZCB0ZXN0CiAlX2JpbmRpci9sZGJt b2RpZnkKICVfYmluZGlyL2xkYnJlbmFtZQogJV9iaW5kaXIvbGRic2VhcmNoCislaWZfd2l0aCBk b2MKICVfbWFuMWRpci9sZGJhZGQuMSoKICVfbWFuMWRpci9sZGJkZWwuMSoKICVfbWFuMWRpci9s ZGJlZGl0LjEqCiAlX21hbjFkaXIvbGRibW9kaWZ5LjEqCiAlX21hbjFkaXIvbGRicmVuYW1lLjEq CiAlX21hbjFkaXIvbGRic2VhcmNoLjEqCislZW5kaWYKICVfc2FtYmFfbW9kX2xpYmRpci9saWJs ZGItY21kbGluZS5zbwogJWVuZGlmCiAKQEAgLTg3Myw2ICs4ODksNyBAQCBUREJfTk9fRlNZTkM9 MSAlbWFrZV9idWlsZCB0ZXN0CiAlY29uZmlnKG5vcmVwbGFjZSkgJV9zeXNjb25mZGlyL3NhbWJh L3NtYi5jb25mCiAlY29uZmlnKG5vcmVwbGFjZSkgJV9zeXNjb25mZGlyL3NhbWJhL2xtaG9zdHMK ICVjb25maWcobm9yZXBsYWNlKSAlX3N5c2NvbmZkaXIvc3lzY29uZmlnL3NhbWJhCislaWZfd2l0 aCBkb2MKICVfbWFuMWRpci9wcm9maWxlcy4xKgogJV9tYW4xZGlyL3NtYmNvbnRyb2wuMSoKICVf bWFuMWRpci90ZXN0cGFybS4xKgpAQCAtODgyLDYgKzg5OSw3IEBAIFREQl9OT19GU1lOQz0xICVt YWtlX2J1aWxkIHRlc3QKICVfbWFuN2Rpci9zYW1iYS43KgogJV9tYW44ZGlyL25ldC44KgogJV9t YW44ZGlyL3BkYmVkaXQuOCoKKyVlbmRpZgogCiAjIGNvbW1vbiBsaWJyYXJpZXMKICVfc2FtYmFf bW9kX2xpYmRpci9saWJwb3B0LXNhbWJhMy1zYW1iYTQuc28KQEAgLTExNDksMTQgKzExNjcsMTYg QEAgVERCX05PX0ZTWU5DPTEgJW1ha2VfYnVpbGQgdGVzdAogCiAlZmlsZXMgcGlkbAogJWF0dHIo NzU1LHJvb3Qscm9vdCkgJV9iaW5kaXIvcGlkbAorJWlmX3dpdGggZG9jCiAlX21hbjFkaXIvcGlk bC4xLioKICVfbWFuM2Rpci9QYXJzZTo6UGlkbDo6KgorJWVuZGlmCiAlcGVybF92ZW5kb3JfcHJp dmxpYi8qCiAKICVmaWxlcyAtbiBweXRob24tbW9kdWxlLSVuYW1lCiAlcHl0aG9uX3NpdGVsaWJk aXIvKgogCi0laWZfd2l0aCBkb2NzCislaWZfd2l0aCBkb2MKICVmaWxlcyBkb2MKICVkb2MgJV9k ZWZhdWx0ZG9jZGlyLyVybmFtZS9odG1sZG9jcwogJWVuZGlmCkBAIC0xMTczLDEyICsxMTkzLDE0 IEBAIFREQl9OT19GU1lOQz0xICVtYWtlX2J1aWxkIHRlc3QKICVlbHNlCiAlX3NhbWJhX21vZF9s aWJkaXIvbGliZHNkYi1tb2R1bGUtc2FtYmE0LnNvCiAlZW5kaWYKKyVpZl93aXRoIGRvYwogJV9t YW4xZGlyL2dlbnRlc3QuMSoKICVfbWFuMWRpci9sb2NrdGVzdC4xKgogJV9tYW4xZGlyL21hc2t0 ZXN0LjEqCiAlX21hbjFkaXIvbmRyZHVtcC4xKgogJV9tYW4xZGlyL3NtYnRvcnR1cmUuMSoKICVf bWFuMWRpci92ZnN0ZXN0LjEqCislZW5kaWYKIAogJWlmX3dpdGggdGVzdHN1aXRlCiAjIGZpbGVz IHRvIGlnbm9yZSBpbiB0ZXN0c3VpdGUgbW9kZQpAQCAtMTE5OCw4ICsxMjIwLDEwIEBAIFREQl9O T19GU1lOQz0xICVtYWtlX2J1aWxkIHRlc3QKICVfdW5pdGRpci93aW5iaW5kLnNlcnZpY2UKICVh dHRyKDc1NSxyb290LHJvb3QpICVfaW5pdHJkZGlyL3dpbmJpbmQKICVfc3lzY29uZmRpci9OZXR3 b3JrTWFuYWdlci9kaXNwYXRjaGVyLmQvMzAtd2luYmluZAorJWlmX3dpdGggZG9jCiAlX21hbjhk aXIvd2luYmluZGQuOCoKICVfbWFuOGRpci9pZG1hcF8qLjgqCislZW5kaWYKIAogJWZpbGVzIHdp bmJpbmQtY2xpZW50cwogJV9iaW5kaXIvbnRsbV9hdXRoCkBAIC0xMjEwLDE0ICsxMjM0LDE4IEBA IFREQl9OT19GU1lOQz0xICVtYWtlX2J1aWxkIHRlc3QKIC8lX2xpYi9saWJuc3Nfd2lucy5zby4q CiAvJV9saWIvc2VjdXJpdHkvcGFtX3dpbmJpbmQuc28KICVjb25maWcobm9yZXBsYWNlKSAlX3N5 c2NvbmZkaXIvc2VjdXJpdHkvcGFtX3dpbmJpbmQuY29uZgorJWlmX3dpdGggZG9jCiAlX21hbjFk aXIvbnRsbV9hdXRoLjEuKgogJV9tYW4xZGlyL3diaW5mby4xKgogJV9tYW41ZGlyL3BhbV93aW5i aW5kLmNvbmYuNSoKICVfbWFuOGRpci9wYW1fd2luYmluZC44KgorJWVuZGlmCiAKICVmaWxlcyB3 aW5iaW5kLWtyYjUtbG9jYXRvcgogJV9saWJkaXIva3JiNS9wbHVnaW5zL2xpYmtyYjUvd2luYmlu ZF9rcmI1X2xvY2F0b3Iuc28KKyVpZl93aXRoIGRvYwogJV9tYW43ZGlyL3dpbmJpbmRfa3JiNV9s b2NhdG9yLjcqCislZW5kaWYgI2RvYwogJWVuZGlmCiAKICVpZl93aXRoIGNsdXN0ZXJpbmdfc3Vw cG9ydApAQCAtMTI2MCw2ICsxMjg4LDcgQEAgVERCX05PX0ZTWU5DPTEgJW1ha2VfYnVpbGQgdGVz dAogJV9saWJleGVjZGlyL2N0ZGIvY3RkYl9yZWNvdmVyeV9oZWxwZXIKICVfbGliZXhlY2Rpci9j dGRiL3Ntbm90aWZ5CiAKKyVpZl93aXRoIGRvYwogJV9tYW4xZGlyL2N0ZGIuMSoKICVfbWFuMWRp ci9jdGRiZC4xKgogJV9tYW4xZGlyL29ubm9kZS4xKgpAQCAtMTI3MSw2ICsxMzAwLDcgQEAgVERC X05PX0ZTWU5DPTEgJW1ha2VfYnVpbGQgdGVzdAogJV9tYW43ZGlyL2N0ZGIuNyoKICVfbWFuN2Rp ci9jdGRiLXR1bmFibGVzLjcqCiAlX21hbjdkaXIvY3RkYi1zdGF0aXN0aWNzLjcqCislZW5kaWYK IAogJWZpbGVzIGN0ZGItdGVzdHMKICVfbGliZXhlY2Rpci9jdGRiL3Rlc3RzCkBAIC0xMjg1LDYg KzEzMTUsOSBAQCBUREJfTk9fRlNZTkM9MSAlbWFrZV9idWlsZCB0ZXN0CiAlX2luY2x1ZGVkaXIv c2FtYmEtNC4wL3ByaXZhdGUKIAogJWNoYW5nZWxvZworKiBXZWQgRmViIDE1IDIwMTcgTWljaGFl bCBTaGlnb3JpbiA8bWlrZUBhbHRsaW51eC5vcmc+IDQuNS41LWFsdDEuMSV1YnQKKy0gQk9PVFNU UkFQOiByZW5hbWVkIGRvY3Mga25vYiB0byBkb2MsIG1hZGUgaXQgd29yayBvbiBCUnMgYW5kICUl ZmlsZXMKKwogKiBXZWQgRmViIDAxIDIwMTcgRXZnZW55IFNpbmVsbmlrb3YgPHNpbkBhbHRsaW51 eC5ydT4gNC41LjUtYWx0MSV1YnQKIC0gVXBkYXRlIHRvIHdpbnRlciByZWxlYXNlCiAtIEZpeCBQ QU0gd2luYmluZCBwcm9ibGVtIHdpdGggYWNjZXNzIHVzZXIgdG8ga2V5dGFiCi0tIAoyLjcuNAoK