From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 00BA31396D9 for ; Mon, 13 Nov 2017 21:26:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 28FE5E1084; Mon, 13 Nov 2017 21:26:37 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id EC2B0E1084 for ; Mon, 13 Nov 2017 21:26:36 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9273333BE19 for ; Mon, 13 Nov 2017 21:26:35 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 557DE98C1 for ; Mon, 13 Nov 2017 21:26:34 +0000 (UTC) From: "Aric Belsito" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Aric Belsito" Message-ID: <1510608345.fb962988444456ac3314cf252513e16818286a57.lluixhi@gentoo> Subject: [gentoo-commits] proj/musl:master commit in: sys-libs/libsepol/, sys-libs/libsepol/files/ X-VCS-Repository: proj/musl X-VCS-Files: sys-libs/libsepol/Manifest sys-libs/libsepol/files/libsepol-2.7-cdefs.patch sys-libs/libsepol/libsepol-2.7_rc1.ebuild X-VCS-Directories: sys-libs/libsepol/ sys-libs/libsepol/files/ X-VCS-Committer: lluixhi X-VCS-Committer-Name: Aric Belsito X-VCS-Revision: fb962988444456ac3314cf252513e16818286a57 X-VCS-Branch: master Date: Mon, 13 Nov 2017 21:26:34 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 7d320f1d-7fb5-4455-a2c3-52aa037c918d X-Archives-Hash: 3159700a4d2cf5b1164613d05a434a64 commit: fb962988444456ac3314cf252513e16818286a57 Author: Aric Belsito gmail com> AuthorDate: Mon Nov 13 21:25:45 2017 +0000 Commit: Aric Belsito gmail com> CommitDate: Mon Nov 13 21:25:45 2017 +0000 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=fb962988 sys-libs/libsepol: cleanup libsepol-2.7 builds fine. sys-libs/libsepol/Manifest | 1 - sys-libs/libsepol/files/libsepol-2.7-cdefs.patch | 102 ----------------------- sys-libs/libsepol/libsepol-2.7_rc1.ebuild | 50 ----------- 3 files changed, 153 deletions(-) diff --git a/sys-libs/libsepol/Manifest b/sys-libs/libsepol/Manifest index d6370f2..052ac19 100644 --- a/sys-libs/libsepol/Manifest +++ b/sys-libs/libsepol/Manifest @@ -1,2 +1 @@ DIST libsepol-2.6.tar.gz 442549 SHA256 d856d6506054f52abeaa3543ea2f2344595a3dc05d0d873ed7f724f7a16b1874 SHA512 17d007857634e3d581fcc9bafcbb75674a06e382bb258c2c6b3656c141d71493699c42b78c8e1917c628476aeb8ead73bb86e8ccf43d7ce59aa0b7884bea132a WHIRLPOOL c02b9dc9dcf13ce3f200293695565dec4a220f7a6b29c76121ba5a4f8c05fb347a034763f417927ed7b1952a4989a7738c9327dc47cd976410db695fd6e662ae -DIST libsepol-2.7-rc1.tar.gz 471201 SHA256 a00523b53c6f96e5a811a0315b02db0f290b19c8f8376369216aaa08377dcbc6 SHA512 040107fdd03f36c5f8a02220f930c16256e93891d2e934f2b45ee29938809d72192efb5c59a900c2802f73cfd9670ff7758083544376ee5c58a992651e8ea12d WHIRLPOOL d75e046a5f7298503b837c65147ca970e243ea23d07c96f67090758fed4a058dfcfa98d711f25f7bec3fd65238faa78a16132e23efdd3df6aabcfe49a7a29f9e diff --git a/sys-libs/libsepol/files/libsepol-2.7-cdefs.patch b/sys-libs/libsepol/files/libsepol-2.7-cdefs.patch deleted file mode 100644 index 7f312d2..0000000 --- a/sys-libs/libsepol/files/libsepol-2.7-cdefs.patch +++ /dev/null @@ -1,102 +0,0 @@ -diff -Naur libsepol-2.7-rc1.orig/include/sepol/ibendport_record.h libsepol-2.7-rc1/include/sepol/ibendport_record.h ---- libsepol-2.7-rc1.orig/include/sepol/ibendport_record.h 2017-06-13 10:21:05.311417509 -0700 -+++ libsepol-2.7-rc1/include/sepol/ibendport_record.h 2017-06-13 10:21:43.258706824 -0700 -@@ -4,9 +4,10 @@ - #include - #include - #include --#include - --__BEGIN_DECLS -+#ifdef __cplusplus -+extern "C" { -+#endif - - struct sepol_ibendport; - struct sepol_ibendport_key; -@@ -64,5 +65,7 @@ - - extern void sepol_ibendport_free(sepol_ibendport_t *ibendport); - --__END_DECLS -+#ifdef __cplusplus -+} -+#endif - #endif -diff -Naur libsepol-2.7-rc1.orig/include/sepol/ibendports.h libsepol-2.7-rc1/include/sepol/ibendports.h ---- libsepol-2.7-rc1.orig/include/sepol/ibendports.h 2017-06-13 10:21:05.311417509 -0700 -+++ libsepol-2.7-rc1/include/sepol/ibendports.h 2017-06-13 10:22:08.981902844 -0700 -@@ -4,9 +4,10 @@ - #include - #include - #include --#include - --__BEGIN_DECLS -+#ifdef __cplusplus -+extern "C" { -+#endif - - /* Return the number of ibendports */ - extern int sepol_ibendport_count(sepol_handle_t *handle, -@@ -41,5 +42,7 @@ - int (*fn)(const sepol_ibendport_t *ibendport, - void *fn_arg), void *arg); - --__END_DECLS -+#ifdef __cplusplus -+} -+#endif - #endif -diff -Naur libsepol-2.7-rc1.orig/include/sepol/ibpkey_record.h libsepol-2.7-rc1/include/sepol/ibpkey_record.h ---- libsepol-2.7-rc1.orig/include/sepol/ibpkey_record.h 2017-06-13 10:21:05.311417509 -0700 -+++ libsepol-2.7-rc1/include/sepol/ibpkey_record.h 2017-06-13 10:22:35.060090318 -0700 -@@ -5,11 +5,12 @@ - #include - #include - #include --#include - - #define INET6_ADDRLEN 16 - --__BEGIN_DECLS -+#ifdef __cplusplus -+extern "C" { -+#endif - - struct sepol_ibpkey; - struct sepol_ibpkey_key; -@@ -71,5 +72,7 @@ - - extern void sepol_ibpkey_free(sepol_ibpkey_t *ibpkey); - --__END_DECLS -+#ifdef __cplusplus -+} -+#endif - #endif -diff -Naur libsepol-2.7-rc1.orig/include/sepol/ibpkeys.h libsepol-2.7-rc1/include/sepol/ibpkeys.h ---- libsepol-2.7-rc1.orig/include/sepol/ibpkeys.h 2017-06-13 10:21:05.311417509 -0700 -+++ libsepol-2.7-rc1/include/sepol/ibpkeys.h 2017-06-13 10:22:58.990257871 -0700 -@@ -4,9 +4,10 @@ - #include - #include - #include --#include - --__BEGIN_DECLS -+#ifdef __cplusplus -+extern "C" { -+#endif - - /* Return the number of ibpkeys */ - extern int sepol_ibpkey_count(sepol_handle_t *handle, -@@ -40,5 +41,7 @@ - int (*fn)(const sepol_ibpkey_t *ibpkey, - void *fn_arg), void *arg); - --__END_DECLS -+#ifdef __cplusplus -+} -+#endif - #endif diff --git a/sys-libs/libsepol/libsepol-2.7_rc1.ebuild b/sys-libs/libsepol/libsepol-2.7_rc1.ebuild deleted file mode 100644 index c296999..0000000 --- a/sys-libs/libsepol/libsepol-2.7_rc1.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -inherit multilib toolchain-funcs multilib-minimal - -MY_P="${P//_/-}" -MY_RELEASEDATE="20170609" - -DESCRIPTION="SELinux binary policy representation library" -HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki" - -if [[ ${PV} == 9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git" - S="${WORKDIR}/${MY_P}/${PN}" -else - SRC_URI="https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/${MY_RELEASEDATE}/${MY_P}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" - S="${WORKDIR}/${MY_P}" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="" - -DEPEND="" -RDEPEND="" - -PATCHES=( "${FILESDIR}"/${PN}-2.7-cdefs.patch ) - -# tests are not meant to be run outside of the full SELinux userland repo -RESTRICT="test" - -src_prepare() { - default - multilib_copy_sources -} - -multilib_src_compile() { - tc-export RANLIB; - LIBDIR="\$(PREFIX)/$(get_libdir)" SHLIBDIR="\$(DESTDIR)/$(get_libdir)" \ - emake AR="$(tc-getAR)" CC="$(tc-getCC)" -} - -multilib_src_install() { - LIBDIR="\$(PREFIX)/$(get_libdir)" SHLIBDIR="\$(DESTDIR)/$(get_libdir)" \ - emake DESTDIR="${D}" install -}