From patchwork Tue Jun 20 15:01:20 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Smalley X-Patchwork-Id: 9799711 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 01E53600F6 for ; Tue, 20 Jun 2017 15:00:27 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D17EE26256 for ; Tue, 20 Jun 2017 15:00:14 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C620F284CF; Tue, 20 Jun 2017 15:00:14 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from emsm-gh1-uea11.nsa.gov (smtp.nsa.gov [8.44.101.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id F353726256 for ; Tue, 20 Jun 2017 15:00:10 +0000 (UTC) X-IronPort-AV: E=Sophos;i="5.39,364,1493683200"; d="scan'208";a="6882970" IronPort-PHdr: =?us-ascii?q?9a23=3AC8ySgxG44DsDaOTAT0rJ3Z1GYnF86YWxBRYc798d?= =?us-ascii?q?s5kLTJ79p8+8bnLW6fgltlLVR4KTs6sC0LuJ9fCwEjJfqb+681k6OKRWUBEEjc?= =?us-ascii?q?hE1ycBO+WiTXPBEfjxciYhF95DXlI2t1uyMExSBdqsLwaK+i764jEdAAjwOhRo?= =?us-ascii?q?LerpBIHSk9631+ev8JHPfglEnjSwbLdwIRmsrgjctcYajIpgJ60s1hbHv3xEdv?= =?us-ascii?q?hMy2h1P1yThRH85smx/J5n7Stdvu8q+tBDX6vnYak2VKRUAzs6PW874s3rrgTD?= =?us-ascii?q?QhCU5nQASGUWkwFHDBbD4RrnQ5r+qCr6tu562CmHIc37SK0/VDq+46t3ThLjlS?= =?us-ascii?q?kINyQ98GrKlMJ+iqxVqw+lqxBm3YLYfISZOfxjda3fYNwaX3JMUMZPWSJcDI2y?= =?us-ascii?q?bIwBD/IDMOpFoYTyuUAOoACiCQWwHu7j1iVFimPq0aA8zu8vERvG3AslH98WrX?= =?us-ascii?q?rUsMv6NL8SUe+ryqnD0CjNb/ZM1jf57IjHbBAgquyLULJrbMXR0lIiFx/Fj1qM?= =?us-ascii?q?qYzlOCmZ1uIWs2eB9eZgWuWvi3A+pgx3vzOhxd8sh5HUio8axV3I7yV0zJsvKd?= =?us-ascii?q?GmR0N3f8SoHIZWuiqHLYV5WNkiTHttuCsiz70GvoO0czYSxZQ8wh7fd+SHc4+V?= =?us-ascii?q?4hL/TOqRISl3hHZieL+nmxa961KgyuzhVsmvylpKsipEncXMtnAKzRDT7NSISu?= =?us-ascii?q?Bh8Uu73DaP1gTT5vlFIUAyi6XbN4YszqM/m5ccq0jOHjL6lF/ogKKZaEko4PWk?= =?us-ascii?q?5/ziYrr8p5+cM4F0ihv5MqQrgsG/Gvo3MgwPX2id5OS926Tv8lb+QLVXiP05jr?= =?us-ascii?q?fWsIvBKMQHpq+2Hw9V0oE55xa5FDepys4UnXYALFJbYB6HlZTmO0nSIPDkCvey?= =?us-ascii?q?m1askDBtx//cIr3hAo/CLn7YnbfjerZ97UtcxxAozdBD+Z1UEKoBLOj0Wk/ru9?= =?us-ascii?q?zSFgU5PBCsw+b7FNV90ZsTWWCNAqCDLKzSskSI5uUpI+mNeo8Yozj9K/w45//h?= =?us-ascii?q?lnA5hFkdfbW03ZcNb3C4BPtmKV2DYXXwmtcBDXsKvg0mQezyllKNSiBcZ3CzX6?= =?us-ascii?q?Ig4TE2E4OmApndSY+zmrCB2z27HpJObGBcFl+MCWvod5mDW/oUdS2SJclhkjoZ?= =?us-ascii?q?Wre/T48h1AqjuxXkxLp9KerY4CoYtYjs1NJt/e3ciQky9SBoD8Say2yCUn10kX?= =?us-ascii?q?kSRzItwK9/pkl9xUuZ3qhjn/xUD9pT6O1VUg0iL57T0/R6C8zuWgLGZtqJSVCm?= =?us-ascii?q?Qsm4DjE1UN0xxsEBY1pnG9SilR3D2DKqDKETl7yOHpM086bc0GP2J8dy0XrG07?= =?us-ascii?q?Mhj1Y+SMtVKWKmnrJ/9xTUB4PRk0SYlqGqdaIH0S7I8GeP1GuOvEdCXA52S6rF?= =?us-ascii?q?R3MfZkrIrdvn/E/CSaGhCag/OAtb1cGCMrdKasHujVheX/jsI9PSY2awm2erGR?= =?us-ascii?q?aI3amAbJH0dGoBxindE1YLkwQS/XaAKAg/CTysrH7eDTx0CFLveFng8Odkp3On?= =?us-ascii?q?VU80yAeKY1dm17qv9R4fneacRO8L3rIYpCchrC15E0il393MEdqAphFhcb5EYd?= =?us-ascii?q?wn+ldH1HnZtxR5PpO6M69tmEQScwNtv0Phzx93EJlPkdA2rHM2ywp/MayZ0FJF?= =?us-ascii?q?dzOdw5/wIKbaKmfs8x+ybK7WwEvR0M6M+qcI6vQ3tUnsvB2zGkol6XVn3MFf02?= =?us-ascii?q?GA6ZXSEAoSTZXxX1459xhgvb7aZDUy54LP1XB3NKm0qj7C18syBOor0RasZdBf?= =?us-ascii?q?MLmLFAXqCc0VG9CuKPA2m1iudh8EP/pd9K0zP8O7bPaG27SkPOVnnDK7l2hH55?= =?us-ascii?q?p90k2U/SpmVuHIx4oFw+2f3gafTTjzkU2hssHploBefjwdBHawyS3+CI5WfK1y?= =?us-ascii?q?cp4BCX2yLM2v2tV+m5ntVmZE+1G5A1MJxtSpeQaSblz6xgBQzlgYoX25liu+0z?= =?us-ascii?q?x0kismorCZ3CPQ3+TobAAHNXJTRGl+kVfsJpC5j8oHU0e1dAUpmx6l5Engy6hd?= =?us-ascii?q?uqt/M3HZQV1UcCjuM2FiTqywu6KZY85B8pMotj5XUPinbFCBTL79pBUb0yb5EG?= =?us-ascii?q?tY3jw7cS+luonhlRxglG2dNGpzrGbeecxoyxbQ/tjcReJP0TocXyl1kifXCUam?= =?us-ascii?q?P9ay4NWUko3PsuekV2KuTpdTazXkzZuctCun4m1nGQG/kO2uld3mCwc61TT22M?= =?us-ascii?q?VtVSXNsBnzeJLr17igPeJhYEZoGEf269BmFYFmjoswmJYQ1GAEhpWU4XUHjWDz?= =?us-ascii?q?Mc9B1a3ibHoNQjgLw9HO7Qjh2U1jKGiGx5j+VnmHxcthfda6aHsM2i0h98BKFL?= =?us-ascii?q?uU7LtckCtxo1q4th7RbeFmnjgDzfsu6Xgag/wGuQc21SWdGrESHU9ZPSPwjBSE?= =?us-ascii?q?9da+o7tLZGy3a7i/yFJ+ncy9DLGFugxcQnH5epMmHSBu9MVwLFXM0XPo54H/Zd?= =?us-ascii?q?nfcckTugeTkxfagOhfMIgxmeYShSp7JWL9umUoy/Yhghxz2ZG2ppKIJ39286K+?= =?us-ascii?q?Bh5YKjr1Z8UI9zHokapemMGW0Jy1EpVnBDoLQIPiTei0HzIKqfTnKwGOHSU/qn?= =?us-ascii?q?iFH7rfBhSS6ER4oHLJCJCrMW+YJGUDwdVlXhmdK1RVgBoIUzUigp45CgeqydT5?= =?us-ascii?q?cEhj+zAR4kD3qgNWxeJuKxnwTH3fqRy1ajcvVpefNgFW4htZ50fSLMye9P58ED?= =?us-ascii?q?9W/p2mtgyNJXKUax5ODW4XRkyOH0rjMaW25dnc7+iYAfKzL+XIYbqTsuFeSfGI?= =?us-ascii?q?yo+v0od8+TaDKNmPNGF4D/InwkpDQWx5G8PBljUXUSMXiibNYtWHqxe95i12rt?= =?us-ascii?q?mz8PrxVwLp/4ePDKFSMdp38RCsnaiDL/KQhDp+KTtA1ZMNxXvIx6YE0V4XjCFu?= =?us-ascii?q?eTetHqoctS7RTKLQnapXAAABZyN1KsRI87o23hNRNs7DltP1yrl4g+Y7C1hfU1?= =?us-ascii?q?zhhsapZckRLmGzKlzIGUGLNK6cKj3T2cH3ZqG8RqNMg+VIrRGwviybE0D7NDSZ?= =?us-ascii?q?izbpTwyvMf1LjCyDJhxSoo+8fgxoCWf5SNLmbR26PcRtgjIqxL04nHTKNXQTMT?= =?us-ascii?q?JkaUNCsqWQ7T9EgvV4A2FB4GBlIveZlCaC9ebYLIoWsfxwAilvje1V/HE6x6FS?= =?us-ascii?q?7CFeS/x/gDHSocJ2o1G6jumPzSJqUBxUqjlRnIKLpV5vOavY9plaQnbE4BwN7W?= =?us-ascii?q?SWCxsQodtqFtzvtLpUytTVk6LzMjhC+crO/cQAH8jUNN6HMH05PBX0Az7bEhEK?= =?us-ascii?q?TTGxNW7FmUxQi+qS+WeWrpgnsJjjgoACSrtGVFwzDPwaEF1pHMAFIJd0XjIklq?= =?us-ascii?q?SXjMgW6nqitBPRXtlVvojbVvKOBvXiMDCZjbhAZxsM37z4Np8eOZfl1Ex4bVl2?= =?us-ascii?q?hoPKG1DfXdpVuC1uchc0oFlR8Hh5VmA8wEPlagyq4H8VDvO7gwA5hRB/Yes38j?= =?us-ascii?q?fg+VA3JkDFpCEoikk+hc3lgSyNcD72NKq/R45WBDDqt0cvKZ77RB51YhO0nUxh?= =?us-ascii?q?LjjERrZRgKBndWFkkgPcvoFPGfFER61efBAQ3e2XZ+kv0VlEtiWnwkpH6fHfCZ?= =?us-ascii?q?tllQolb5isoGla2wJkctE1JrfdK7ZOzlhVmq2BpDSo1vwrzA8YOUkN7HuYeDQU?= =?us-ascii?q?t0wQKrkmOy2o8/Rq6QOcgTRDfHMBV/ktovJx6kMyIeKAzznj075CMEyxMfKQL7?= =?us-ascii?q?+BsWjaicGIWk8w1l8Pl0Rd57h5z9wjfFSOWEA10LSRFw8EOtHDKQFPcsVS83bT?= =?us-ascii?q?fT6UserTwZN5JYO9Gf70TeWWrqYbnlqkHBo1H4QL9skOA4Oj0F/ZLcj6N74I0g?= =?us-ascii?q?8i5B7xJFWCAvVJYwyEnysao8GlzZ93wYlcKisbAWpjLSW9/qzXqRMygPqfQNc2?= =?us-ascii?q?ZW8XXo8DNnIsRsK6nS9Yv3NbATm41OIZ1RKO7zjmpiTfFDP8dcZsZO+IZRNwD9?= =?us-ascii?q?G74S4//LayiV7W9JXeOm77OM9+td/I7OMVu4yIC+hITbVntUfThZVYTWSwU2HT?= =?us-ascii?q?Cd61O4Twa440YNPpFnm6V1u/izQpT8vsJ9utMLaHgRvpRYdVt4mb2iovNcmjGT?= =?us-ascii?q?ECAx1wvf0M5LpgZQ0fZJo2eR3otx4+NqOlJgeYztWuTn2iKTtRV/lQ0f+2Z7pJ?= =?us-ascii?q?wCowduW60mcvTokmz+mr9k4AXI0KjhDbxfake4leUSjyF2dAdAXOpSs2jXNuOv?= =?us-ascii?q?w0wugh3BPCqUMcPCyTdOx1dGxEuMkxBVyIIXpsDGo4W0SRjYvE4g+i2bAS4ytd?= =?us-ascii?q?kMhV0e1DrHjxoIXfbCiqWKO1tZXfqzAgYsQ+o61tLYzjJdOLu4nanjzeUJbfrB?= =?us-ascii?q?WKUCu6FvpcndhQJjhXTeJTlmEkI8MGv5NN6UQsVsskIbxAFrUsrKiwaTV4FS4S?= =?us-ascii?q?0TMZV4SY0TMZnOi83aDXmQ2Nf5Q8LhMEqo5CjcEHUy92eC8eo7WjV4rOnW+eVm?= =?us-ascii?q?cLOBsT7RhL5A8YjI9weOHl75bITJ9Lzz5WuOp6XDLWGJdy61b1TXqbjkT/SPWk?= =?us-ascii?q?j+OmxxlSzO723tkdRhF/FVBXx/xKmUswNLF3N64Qs5bWvT+Kb0z1oHngx/ehJF?= =?us-ascii?q?lVzc3UdkP3DJDZtWXiTiIc+WcYRYhVyHHQDZ4SiRZ2aL43pFVQJ4CrYlz+6CY+?= =?us-ascii?q?x4RuBLa1Ttyrx0w/onYYWSiqF9tBC+dpsFLTWT1lbJCrqInrO5pIWG9Q/YeRq1?= =?us-ascii?q?FHn0VxKyS504ZTK9lR4j4QWzhCuTucsMGuR81D2M92Cp4MLc18u3rmGaNLJoae?= =?us-ascii?q?rGMstrzo0H/Z9Cg2sE2myzWrB6+4U+VZ8nUGGgUuI2SRsFMvDuUr8mfW/FDAqV?= =?us-ascii?q?V0/+BcBriUk0p+vCx9HpdVBjZS1HClKVtzQGNBs+VAJ6Tfa9ZcTOUqZR+zJxw+?= =?us-ascii?q?EuYr0FaT/UFpm3f1eS9yuxBb+yDcXgk0STIajq3rmTIAtsGtISUaRI5QbTU9cy?= =?us-ascii?q?fFLBqWmTxQvBZacExqR4wVAtNe9L0B24tb4NbCQ162KS4ZRBxiKh440f1HmE5D?= =?us-ascii?q?qkqYYzrSDQ61evvUrxJ4Y9+RrNa3I/T94ghHkJnrsOci96UMX3emgxGiQcjCr4?= =?us-ascii?q?/gsd2HrkmOdKDmPOCnfHDOUiPMgg6qhbc4EZbF4jLfMAxFJJlm0XAke4TuCXbX?= =?us-ascii?q?PRRaIKIWP1FUVa5mZtlaoO1WesFpdb0V9q9qAxKIWgngGJezrPVcKFbcWyjeJT?= =?us-ascii?q?2b8uOjuYLT8aDdSe/4a8yW2XnIXqJ3MY1m6TTgH7fq1pFe9VTo1vhx8UN1VEbJ?= =?us-ascii?q?PzqHrNv/OgMB/NOieVf6vp01ATPWB499kGL2xkFcbcUYXjGq/Y8DyJNe9XbwU/?= =?us-ascii?q?533Vb1sO1O7blr840376puyceuKqfYMe5avlN/AhiIGgVq8Y0gAHRlR29PfOAe?= =?us-ascii?q?NezcfbkdjcDyseD4DbIX6ByS++xdd9THO1vNms6lCjGTURZEhhsOqSYGLguA0P?= =?us-ascii?q?6Ig6p0Rtyhpej9xE0t/0S+IQQcw71244eL5LaIpPTLYBTL1bgLRLLmRsXtobQw?= =?us-ascii?q?o0mS/+ErlKYSemxpZA2qCOodWdQHxmfn1qAqyTgjE93YErLl5f5DU245njP8lJ?= =?us-ascii?q?B8BVoWHOgUEaCM/YREkWcyg/bZOcEOcqBehmaPEgapEr0Yxn6t5SuXOm5ljQzQ?= =?us-ascii?q?3BzrXWO89ln2rTR/QSfWydfsjFZVXKGtBUhORyqpJVN4sDSXMQrnqdr3uKA17E?= =?us-ascii?q?UoPWzhr9+CiXWuN6hWH8LlItyQOy40pEgYjJcpXNygxZgbGcahINcW6Hx+aP/e?= =?us-ascii?q?5niqky9HpqdLnYve4seb+vXNB3aglLGaq6+QxD9E1ng4oEs/5c66OvHJ/d2KTO?= =?us-ascii?q?yi13wNQCdnpwvBQxm1p6Ter1ATP0yLzEjLl5IRM9Fc3Hk3zEfm6/Y/QNM98wVe?= =?us-ascii?q?DIXAZ+gYqTD1JjT03U6VY8grWSmGzztXAlX1HEF8GKgn3WL9vNnElXnO9FI1QY?= =?us-ascii?q?lwbVbohQRtD4U/K0Ii9kQYwjYZHQgKcxCbA6miBV75IoscSUgDdROH0aCheqgt?= =?us-ascii?q?w0182Lyv6/HIbeFnHKoCLOhdgRSBnFdFAZIaq6seT6xge1VF7q7YuhDiC5T7X/?= =?us-ascii?q?jhjXcwN/y1QsVB/MAcqXQj4hiwRwCh6ZdF4LYXkpaIebBYYZLUpsBz819n5SIT?= =?us-ascii?q?dixKmBV/jhK4XvoGq+//+dXbq4Sn6vqwW6kxXekX8AI0B2tmhZvqnF8juc3X1/?= =?us-ascii?q?tbSoDNkov/8RtNInCQt4bY0hl8NfIOJJi2fLZk7HgIOy8eKG8QMtWMdvk8+Sht?= =?us-ascii?q?MC/J6FBYBcMMf9wYNtLXmQ9Ikk3pRK1T9s3DF1+AEYhza9wn72r5yTAy65s8Uf?= =?us-ascii?q?/s6CSoKpDb7lFNOe5DjSp3mdLavucV3ebdCCgZ4HmecRh1wTmOy5qTBPbq++WD?= =?us-ascii?q?1tXUW0kBHi4sXIdXPCCC9hC/RuqpiJXpVRuZ6tPpgJ0gcEKfXHqxk7oev6lREO?= =?us-ascii?q?5AhST73iREGYDunf2Vqces5HFRtlJZDIZ59QfFF7lHPpVnJRT4kdGmRkdmCSvl?= =?us-ascii?q?Zs7UahoutfGSxucN/+VxKUv+apUGIhIf0b7672RaThd2Qr7solmZRf4RZMdhSP?= =?us-ascii?q?7coXBa94RgK7MIPFiao5DqtSlHqFQ3AA8vdb8xoSdXdk3Qkw1PW6f7oqQMig0C?= =?us-ascii?q?Xt5loUVMA36/OHoi5zrbUqRYlKaRB+AO8jWIV6AATkpmPCV/QxOzxZVvdKCknf?= =?us-ascii?q?9CsmxcmCNyvuIm0zt8RBuzoSfsvb4C2So8+LGkszUMoX5FTuKekyfOE1lM0PQK?= =?us-ascii?q?jaMBC3n/6F28YX8DbJDx4LlmPsng64gh42olbhUnYiIGXP6sCyfugKOUGoaPqs?= =?us-ascii?q?5ThAaRuMXSar++NSkSNqonxhLlXHV91hXekwtp8GsMWTWs9tgkJJ+yOcw93Cqn?= =?us-ascii?q?BXDbdEoQ4qNOqMbxt0AETOU4aVNl22hi3NKIRisTS8zTAWo1iBYraXlcepJZ9R?= =?us-ascii?q?AaD7UogiqPvqRe8QEUZDDUE4q79YnUmcfFwmI9TdBsxmLXuqKJnJUq32N5m9ls?= =?us-ascii?q?9C6BpGwSd/DEU89rGnXz1IdfyOzmZ/WqtuAHSZdmx6q6Xf8HM8mj5XG214twVk?= =?us-ascii?q?+i3LQeEEKzMPUfybfDTyelVWqYVPyXc2iNmjY0KVLy5Ri0IV00dshKq1UxMu3c?= =?us-ascii?q?iZ5AjwfhS697Rj2MpV/Hy2wuKeYadwM1uIekfAwHV+wRaPKfJegpxv0xFl0MY2?= =?us-ascii?q?XPHSRoF++8qUStk5RjO3V8/UX6Zvzg/Rv4P9uUBhkJCpXarpp2+fymWmKBJ2Fv?= =?us-ascii?q?wwBoMElz7effGEw7tvVAfJaJgdjQm9N73PYLd/hzNS09u8YTlZx45IiV0ceKdB?= =?us-ascii?q?TRwYjoJdHRvPeUGfrfz14lemtCSLoWfRv155kmPt4+Q7DSE6NZvQ4dBacmXpMs?= =?us-ascii?q?LGLx9KBoLANpbAHdfrO0gtPlpuiTfJtbu2fW7k4sLCfboxADzfi0QhJgYpCyg3?= =?us-ascii?q?X9OoswRi5Ar9JxFhtmBpVAFN0aowqhHZGUhLmxi8Wt9ENip+8Kra3wB+jO1NS4?= =?us-ascii?q?2YVxQpdb6VWPPDbQH6lrnl9lg/+zgvja1JnxDtnuedQeVOh0WmTFcKPJHp2jKj?= =?us-ascii?q?KSPcLxY1VG/KCY0LJ4VBWReS/4U62Jui24NPVr/187xZJgfOXJ1zEt7K/U2MH0?= =?us-ascii?q?Z25FoiestmOJNJRF4FzNH+zeUApeSeCZ/2Z9Aa0XcYz0+f8LMdM43Nec4whz7D?= =?us-ascii?q?JF0MaePaihr0nM1Vx/dZLaKkvpxik4VZMNIBSlPksmmXXZpWjFAXRAMsikLtFg?= =?us-ascii?q?gNSPARzu4El+gnogZnNHGmr0RdeRPnUb282+ZA2W7g5LCcgMn/Kvc04iqqKyUf?= =?us-ascii?q?VoOolCmeiyu7UIi81mKzvORMdEOyHdN6F2Pj5LAeXUpVgofwQIs74rVYcpfZKO?= =?us-ascii?q?Ol8IMF+cySPuygvPyU/0d9mr1KaTOiYW825HwqnD0TdWogm2p/eZjtfkULDDY5?= =?us-ascii?q?H8ROTSPzY9VjGGWTQyFl6k+Uyqu/oBoPWVIGQSr0sKYi2MEg4Tp6Furd/WDmPJ?= =?us-ascii?q?n+1sYoEK17imXHXrRSl5krciLjpavkCLBfwYHE/ZaGGyrnBbvVmZOvJU/X/jJ4?= =?us-ascii?q?adz65RVv1eVpBAadWFUtDYfrZYPD5umTIHbrXvN+bApqo0hwqbBVASFLPFoRjE?= =?us-ascii?q?FEM=3D?= X-IPAS-Result: =?us-ascii?q?A2ErBgANN0lZ/wHyM5BcGwEBAQMBAQEJAQEBFgEBAQMBAQE?= =?us-ascii?q?JAQEBgwIrYnsSjneTGgGVcygHgXOGbFcBAQEBAQEBAQIBAmgogjMkgStbQwJ2A?= =?us-ascii?q?wMJAhcxCAMBbAWIBk+BRQ2uPyUCi2WWLR8FkEGOIIczjCINizKGWgKVDViBCic?= =?us-ascii?q?JAh8IIQ+FEoJiWolZAQEB?= Received: from unknown (HELO tarius.tycho.ncsc.mil) ([144.51.242.1]) by emsm-gh1-uea11.nsa.gov with ESMTP; 20 Jun 2017 14:59:07 +0000 Received: from prometheus.infosec.tycho.ncsc.mil (prometheus [192.168.25.40]) by tarius.tycho.ncsc.mil (8.14.4/8.14.4) with ESMTP id v5KEvSw9026881; Tue, 20 Jun 2017 10:57:57 -0400 Received: from tarius.tycho.ncsc.mil (tarius.infosec.tycho.ncsc.mil [144.51.242.1]) by prometheus.infosec.tycho.ncsc.mil (8.15.2/8.15.2) with ESMTP id v5KEvLSw168953 for ; Tue, 20 Jun 2017 10:57:21 -0400 Received: from moss-pluto.infosec.tycho.ncsc.mil (moss-pluto [192.168.25.131]) by tarius.tycho.ncsc.mil (8.14.4/8.14.4) with ESMTP id v5KEvEAd026873; Tue, 20 Jun 2017 10:57:14 -0400 From: Stephen Smalley To: selinux@tycho.nsa.gov Subject: [PATCH] Fix BINDIR/SBINDIR/... variables in Makefiles Date: Tue, 20 Jun 2017 11:01:20 -0400 Message-Id: <20170620150120.22292-1-sds@tycho.nsa.gov> X-Mailer: git-send-email 2.9.4 X-BeenThere: selinux@tycho.nsa.gov X-Mailman-Version: 2.1.20 Precedence: list List-Id: "Security-Enhanced Linux \(SELinux\) mailing list" List-Post: List-Help: Cc: Stephen Smalley Errors-To: selinux-bounces@tycho.nsa.gov Sender: "Selinux" X-Virus-Scanned: ClamAV using ClamSMTP As reported by Nicolas Iooss, there are still some inconsistencies in the definitions and usage of Makefile variables related to bin and sbin directories. Since we need to still support non-usrmerge systems, we cannot completely synchronize them, but we can eliminate unnecessary differences, remove unused variables, and drop the USRSBINDIR variables. Before: $ find . -name Makefile -exec cat {} + |grep '^[A-Z_]*BINDIR' |sort -u BINDIR=$(PREFIX)/bin BINDIR ?= $(PREFIX)/bin BINDIR ?= $(PREFIX)/sbin SBINDIR ?= $(DESTDIR)/sbin SBINDIR ?= $(PREFIX)/sbin USRSBINDIR ?= $(PREFIX)/sbin After: $ find . -name Makefile -exec cat {} + | grep '^[A-Z_]*BINDIR' | sort -u BINDIR ?= $(PREFIX)/bin SBINDIR ?= $(DESTDIR)/sbin SBINDIR ?= $(PREFIX)/sbin This does not change the actual install location of any file. It does drop the legacy symlink from /usr/sbin/load_policy to /sbin/load_policy; packagers can create that separately if needed (load_policy was moved in 2009). Reported-by: Nicolas Iooss Signed-off-by: Stephen Smalley --- checkpolicy/test/Makefile | 2 +- libselinux/utils/Makefile | 6 +++--- mcstrans/utils/Makefile | 6 +++--- policycoreutils/hll/pp/Makefile | 1 - policycoreutils/load_policy/Makefile | 3 --- policycoreutils/scripts/Makefile | 4 +--- python/chcat/Makefile | 2 -- python/sepolicy/Makefile | 1 - 8 files changed, 8 insertions(+), 17 deletions(-) diff --git a/checkpolicy/test/Makefile b/checkpolicy/test/Makefile index 0a31c5e..59fa446 100644 --- a/checkpolicy/test/Makefile +++ b/checkpolicy/test/Makefile @@ -2,7 +2,7 @@ # Makefile for building the dispol program # PREFIX ?= $(DESTDIR)/usr -BINDIR=$(PREFIX)/bin +BINDIR ?= $(PREFIX)/bin LIBDIR ?= $(PREFIX)/lib INCLUDEDIR ?= $(PREFIX)/include LIBSEPOLA ?= $(LIBDIR)/libsepol.a diff --git a/libselinux/utils/Makefile b/libselinux/utils/Makefile index 474ee95..843b0e7 100644 --- a/libselinux/utils/Makefile +++ b/libselinux/utils/Makefile @@ -1,7 +1,7 @@ # Installation directories. PREFIX ?= $(DESTDIR)/usr LIBDIR ?= $(PREFIX)/lib -USRSBINDIR ?= $(PREFIX)/sbin +SBINDIR ?= $(PREFIX)/sbin INCLUDEDIR ?= $(PREFIX)/include OS ?= $(shell uname) @@ -63,8 +63,8 @@ sefcontext_compile: sefcontext_compile.o ../src/regex.o all: $(TARGETS) install: all - -mkdir -p $(USRSBINDIR) - install -m 755 $(TARGETS) $(USRSBINDIR) + -mkdir -p $(SBINDIR) + install -m 755 $(TARGETS) $(SBINDIR) clean: rm -f $(TARGETS) *.o *~ diff --git a/mcstrans/utils/Makefile b/mcstrans/utils/Makefile index 7e59641..83ac343 100644 --- a/mcstrans/utils/Makefile +++ b/mcstrans/utils/Makefile @@ -1,7 +1,7 @@ # Installation directories. PREFIX ?= $(DESTDIR)/usr LIBDIR ?= $(PREFIX)/lib -BINDIR ?= $(PREFIX)/sbin +SBINDIR ?= $(PREFIX)/sbin LIBSEPOLA ?= $(LIBDIR)/libsepol.a CFLAGS ?= -Wall @@ -15,8 +15,8 @@ all: $(TARGETS) $(TARGETS): ../src/mcstrans.o ../src/mls_level.o $(LIBSEPOLA) install: all - -mkdir -p $(BINDIR) - install -m 755 $(TARGETS) $(BINDIR) + -mkdir -p $(SBINDIR) + install -m 755 $(TARGETS) $(SBINDIR) test: ./mlstrans-test-runner.py ../test/*.test diff --git a/policycoreutils/hll/pp/Makefile b/policycoreutils/hll/pp/Makefile index 813c9c6..9dc2dc5 100644 --- a/policycoreutils/hll/pp/Makefile +++ b/policycoreutils/hll/pp/Makefile @@ -1,7 +1,6 @@ # Installation directories. PREFIX ?= $(DESTDIR)/usr INCLUDEDIR ?= $(PREFIX)/include -SBINDIR ?= $(PREFIX)/sbin MANDIR = $(PREFIX)/share/man LIBDIR ?= $(PREFIX)/lib LIBEXECDIR ?= $(PREFIX)/libexec diff --git a/policycoreutils/load_policy/Makefile b/policycoreutils/load_policy/Makefile index 256d95a..0db030b 100644 --- a/policycoreutils/load_policy/Makefile +++ b/policycoreutils/load_policy/Makefile @@ -1,7 +1,6 @@ # Installation directories. PREFIX ?= $(DESTDIR)/usr SBINDIR ?= $(DESTDIR)/sbin -USRSBINDIR ?= $(PREFIX)/sbin MANDIR ?= $(PREFIX)/share/man LOCALEDIR ?= /usr/share/locale @@ -18,8 +17,6 @@ install: all install -m 755 $(TARGETS) $(SBINDIR) test -d $(MANDIR)/man8 || install -m 755 -d $(MANDIR)/man8 install -m 644 load_policy.8 $(MANDIR)/man8/ - -mkdir -p $(USRSBINDIR) - -ln -sf $(SBINDIR)/load_policy $(USRSBINDIR)/load_policy clean: -rm -f $(TARGETS) *.o diff --git a/policycoreutils/scripts/Makefile b/policycoreutils/scripts/Makefile index 969e5c0..d9e86ff 100644 --- a/policycoreutils/scripts/Makefile +++ b/policycoreutils/scripts/Makefile @@ -1,7 +1,5 @@ # Installation directories. PREFIX ?= $(DESTDIR)/usr -BINDIR ?= $(PREFIX)/bin -USRSBINDIR ?= $(PREFIX)/sbin SBINDIR ?= $(DESTDIR)/sbin MANDIR ?= $(PREFIX)/share/man LOCALEDIR ?= $(PREFIX)/share/locale @@ -10,7 +8,7 @@ LOCALEDIR ?= $(PREFIX)/share/locale all: fixfiles install: all - -mkdir -p $(BINDIR) + -mkdir -p $(SBINDIR) install -m 755 fixfiles $(SBINDIR) -mkdir -p $(MANDIR)/man8 install -m 644 fixfiles.8 $(MANDIR)/man8/ diff --git a/python/chcat/Makefile b/python/chcat/Makefile index 0a52e8f..0fd12d6 100644 --- a/python/chcat/Makefile +++ b/python/chcat/Makefile @@ -1,8 +1,6 @@ # Installation directories. PREFIX ?= $(DESTDIR)/usr BINDIR ?= $(PREFIX)/bin -USRSBINDIR ?= $(PREFIX)/sbin -SBINDIR ?= $(DESTDIR)/sbin MANDIR ?= $(PREFIX)/share/man LOCALEDIR ?= $(PREFIX)/share/locale diff --git a/python/sepolicy/Makefile b/python/sepolicy/Makefile index 647c540..0d2bec2 100644 --- a/python/sepolicy/Makefile +++ b/python/sepolicy/Makefile @@ -5,7 +5,6 @@ PREFIX ?= $(DESTDIR)/usr SYSCONFDIR ?= $(DESTDIR)/etc/sysconfig LIBDIR ?= $(PREFIX)/lib BINDIR ?= $(PREFIX)/bin -SBINDIR ?= $(PREFIX)/sbin DATADIR ?= $(PREFIX)/share MANDIR ?= $(PREFIX)/share/man LOCALEDIR ?= /usr/share/locale