From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 3481E138CDF for ; Tue, 9 Jun 2015 15:38:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CA1FDE0833; Tue, 9 Jun 2015 15:38:27 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4DACFE0833 for ; Tue, 9 Jun 2015 15:38:27 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 66F2B3409AA for ; Tue, 9 Jun 2015 15:38:26 +0000 (UTC) Received: by oystercatcher.gentoo.org (Postfix, from userid 617) id 2B696A30; Tue, 9 Jun 2015 15:38:25 +0000 (UTC) From: "Sven Vermeulen (swift)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, swift@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in sys-apps/policycoreutils: policycoreutils-9999.ebuild ChangeLog X-VCS-Repository: gentoo-x86 X-VCS-Files: policycoreutils-9999.ebuild ChangeLog X-VCS-Directories: sys-apps/policycoreutils X-VCS-Committer: swift X-VCS-Committer-Name: Sven Vermeulen Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Message-Id: <20150609153825.2B696A30@oystercatcher.gentoo.org> Date: Tue, 9 Jun 2015 15:38:25 +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: 66da8d7d-7835-42f7-90b1-f3e3f89c90bc X-Archives-Hash: 6634dd11b1f448d28734c39249e4f02b swift 15/06/09 15:38:25 Modified: ChangeLog Added: policycoreutils-9999.ebuild Log: Adding policycoreutils-9999 to better support upstream integrations (Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 0x2EDD52403B68AF47) Revision Changes Path 1.154 sys-apps/policycoreutils/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/policycoreutils/ChangeLog?rev=1.154&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/policycoreutils/ChangeLog?rev=1.154&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/policycoreutils/ChangeLog?r1=1.153&r2=1.154 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/ChangeLog,v retrieving revision 1.153 retrieving revision 1.154 diff -u -r1.153 -r1.154 --- ChangeLog 10 May 2015 09:08:19 -0000 1.153 +++ ChangeLog 9 Jun 2015 15:38:25 -0000 1.154 @@ -1,6 +1,11 @@ # ChangeLog for sys-apps/policycoreutils # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/ChangeLog,v 1.153 2015/05/10 09:08:19 perfinion Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/ChangeLog,v 1.154 2015/06/09 15:38:25 swift Exp $ + +*policycoreutils-9999 (09 Jun 2015) + + 09 Jun 2015; Sven Vermeulen +policycoreutils-9999.ebuild: + Adding policycoreutils-9999 to better support upstream integrations 10 May 2015; Jason Zaman policycoreutils-2.4.ebuild: stabilize selinux 2.4 userland 1.1 sys-apps/policycoreutils/policycoreutils-9999.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/policycoreutils/policycoreutils-9999.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/policycoreutils/policycoreutils-9999.ebuild?rev=1.1&content-type=text/plain Index: policycoreutils-9999.ebuild =================================================================== # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/policycoreutils-9999.ebuild,v 1.1 2015/06/09 15:38:25 swift Exp $ EAPI="5" PYTHON_COMPAT=( python2_7 ) PYTHON_REQ_USE="xml" inherit multilib python-r1 toolchain-funcs eutils MY_P="${P//_/-}" MY_RELEASEDATE="20150202" EXTRAS_VER="1.33" SEMNG_VER="${PV}" SELNX_VER="${PV}" SEPOL_VER="${PV}" IUSE="audit pam dbus" DESCRIPTION="SELinux core utilities" HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki" if [[ ${PV} == 9999 ]] ; then inherit git-r3 EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git" SRC_URI="mirror://gentoo/policycoreutils-extra-${EXTRAS_VER}.tar.bz2" S="${WORKDIR}/${MY_P}/${PN}" S1="${WORKDIR}/${MY_P}/${PN}" S2="${WORKDIR}/policycoreutils-extra" else SRC_URI="https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20150202/${MY_P}.tar.gz mirror://gentoo/policycoreutils-extra-${EXTRAS_VER}.tar.bz2" KEYWORDS="~amd64 ~x86" S="${WORKDIR}/${MY_P}" S1="${WORKDIR}/${MY_P}" S2="${WORKDIR}/policycoreutils-extra" fi LICENSE="GPL-2" SLOT="0" DEPEND=">=sys-libs/libselinux-${SELNX_VER}[python] >=sys-libs/glibc-2.4 >=sys-libs/libcap-1.10-r10 >=sys-libs/libsemanage-${SEMNG_VER}[python] sys-libs/libcap-ng >=sys-libs/libsepol-${SEPOL_VER} sys-devel/gettext dev-python/ipy[${PYTHON_USEDEP}] dbus? ( sys-apps/dbus dev-libs/dbus-glib ) audit? ( >=sys-process/audit-1.5.1 ) pam? ( sys-libs/pam ) ${PYTHON_DEPS}" ### libcgroup -> seunshare ### dbus -> restorecond # pax-utils for scanelf used by rlpkg RDEPEND="${DEPEND} dev-python/sepolgen app-misc/pax-utils" src_unpack() { # Override default one because we need the SRC_URI ones even in case of 9999 ebuilds if [[ ${PV} == 9999 ]] ; then git-r3_src_unpack fi if [ -n ${A} ] ; then S="${S2}" unpack ${A}; fi } src_prepare() { S="${S1}" cd "${S}" || die "Failed to switch to ${S}" if [[ ${PV} != 9999 ]] ; then # If needed for live ebuilds please use /etc/portage/patches epatch "${FILESDIR}/0010-remove-sesandbox-support.patch" epatch "${FILESDIR}/0020-disable-autodetection-of-pam-and-audit.patch" epatch "${FILESDIR}/0030-make-inotify-check-use-flag-triggered.patch" epatch "${FILESDIR}/0040-reverse-access-check-in-run_init.patch" epatch "${FILESDIR}/0070-remove-symlink-attempt-fails-with-gentoo-sandbox-approach.patch" epatch "${FILESDIR}/0110-build-mcstrans-bug-472912.patch" epatch "${FILESDIR}/0120-build-failure-for-mcscolor-for-CONTEXT__CONTAINS.patch" fi # rlpkg is more useful than fixfiles sed -i -e '/^all/s/fixfiles//' "${S}/scripts/Makefile" \ || die "fixfiles sed 1 failed" sed -i -e '/fixfiles/d' "${S}/scripts/Makefile" \ || die "fixfiles sed 2 failed" epatch_user python_copy_sources # Our extra code is outside the regular directory, so set it to the extra # directory. We really should optimize this as it is ugly, but the extra # code is needed for Gentoo at the same time that policycoreutils is present # (so we cannot use an additional package for now). S="${S2}" python_copy_sources } src_compile() { building() { emake -C "${BUILD_DIR}" \ AUDIT_LOG_PRIVS="y" \ AUDITH="$(usex audit)" \ PAMH="$(usex pam)" \ INOTIFYH="$(usex dbus)" \ SESANDBOX="n" \ CC="$(tc-getCC)" \ PYLIBVER="${EPYTHON}" \ LIBDIR="\$(PREFIX)/$(get_libdir)" } S="${S1}" # Regular policycoreutils python_foreach_impl building S="${S2}" # Extra set python_foreach_impl building } src_install() { # Python scripts are present in many places. There are no extension modules. installation-policycoreutils() { einfo "Installing policycoreutils" emake -C "${BUILD_DIR}" DESTDIR="${D}" \ AUDITH="$(usex audit)" \ PAMH="$(usex pam)" \ INOTIFYH="$(usex dbus)" \ SESANDBOX="n" \ AUDIT_LOG_PRIV="y" \ PYLIBVER="${EPYTHON}" \ LIBDIR="\$(PREFIX)/$(get_libdir)" \ install python_optimize } installation-extras() { einfo "Installing policycoreutils-extra" emake -C "${BUILD_DIR}" DESTDIR="${D}" INOTIFYH="$(usex dbus)" SHLIBDIR="${D}$(get_libdir)/rc" install python_optimize } S="${S1}" # policycoreutils python_foreach_impl installation-policycoreutils S="${S2}" # extras python_foreach_impl installation-extras S="${S1}" # back for later # remove redhat-style init script rm -fR "${D}/etc/rc.d" # compatibility symlinks dosym /sbin/setfiles /usr/sbin/setfiles dosym /$(get_libdir)/rc/runscript_selinux.so /$(get_libdir)/rcscripts/runscript_selinux.so # location for policy definitions dodir /var/lib/selinux keepdir /var/lib/selinux # Set version-specific scripts for pyscript in audit2allow sepolgen-ifgen sepolicy chcat; do python_replicate_script "${ED}/usr/bin/${pyscript}" done for pyscript in semanage rlpkg; do python_replicate_script "${ED}/usr/sbin/${pyscript}" done dodir /usr/share/doc/${PF}/mcstrans/examples cp -dR "${S1}"/mcstrans/share/examples/* "${D}/usr/share/doc/${PF}/mcstrans/examples" } pkg_postinst() { # The selinux_gentoo init script is no longer needed with recent OpenRC elog "The selinux_gentoo init script will be removed in future versions since it is not needed with OpenRC 0.13." }