perfinion 14/12/04 10:50:14 Modified: ChangeLog libselinux-2.4_rc6.ebuild Added: libselinux-2.3-r2.ebuild Log: Call python_optimize, bug 531638 (Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key 0x7EF137EC935B0EAF)
Revision Changes Path 1.135 sys-libs/libselinux/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/libselinux/ChangeLog?rev=1.135&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/libselinux/ChangeLog?rev=1.135&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/libselinux/ChangeLog?r1=1.134&r2=1.135 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-libs/libselinux/ChangeLog,v retrieving revision 1.134 retrieving revision 1.135 diff -u -r1.134 -r1.135 --- ChangeLog 14 Nov 2014 19:17:27 -0000 1.134 +++ ChangeLog 4 Dec 2014 10:50:14 -0000 1.135 @@ -1,6 +1,12 @@ # ChangeLog for sys-libs/libselinux # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/libselinux/ChangeLog,v 1.134 2014/11/14 19:17:27 swift Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/libselinux/ChangeLog,v 1.135 2014/12/04 10:50:14 perfinion Exp $ + +*libselinux-2.3-r2 (04 Dec 2014) + + 04 Dec 2014; Jason Zaman <[email protected]> +libselinux-2.3-r2.ebuild, + libselinux-2.4_rc6.ebuild: + Call python_optimize, bug 531638 *libselinux-2.4_rc6 (14 Nov 2014) 1.2 sys-libs/libselinux/libselinux-2.4_rc6.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/libselinux/libselinux-2.4_rc6.ebuild?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/libselinux/libselinux-2.4_rc6.ebuild?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/libselinux/libselinux-2.4_rc6.ebuild?r1=1.1&r2=1.2 Index: libselinux-2.4_rc6.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-libs/libselinux/libselinux-2.4_rc6.ebuild,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- libselinux-2.4_rc6.ebuild 14 Nov 2014 19:17:27 -0000 1.1 +++ libselinux-2.4_rc6.ebuild 4 Dec 2014 10:50:14 -0000 1.2 @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/libselinux/libselinux-2.4_rc6.ebuild,v 1.1 2014/11/14 19:17:27 swift Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/libselinux/libselinux-2.4_rc6.ebuild,v 1.2 2014/12/04 10:50:14 perfinion Exp $ EAPI="5" PYTHON_COMPAT=( python2_7 python3_2 python3_3 python3_4 ) @@ -102,6 +102,7 @@ if multilib_is_native_abi && use python; then installation() { LIBDIR="\$(PREFIX)/$(get_libdir)" emake DESTDIR="${D}" install-pywrap + python_optimize # bug 531638 } python_foreach_impl installation fi 1.1 sys-libs/libselinux/libselinux-2.3-r2.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/libselinux/libselinux-2.3-r2.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/libselinux/libselinux-2.3-r2.ebuild?rev=1.1&content-type=text/plain Index: libselinux-2.3-r2.ebuild =================================================================== # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/sys-libs/libselinux/libselinux-2.3-r2.ebuild,v 1.1 2014/12/04 10:50:14 perfinion Exp $ EAPI="5" PYTHON_COMPAT=( python2_7 python3_2 python3_3 python3_4 ) USE_RUBY="ruby19 ruby20" PATCHBUNDLE="4" # No, I am not calling ruby-ng inherit multilib python-r1 toolchain-funcs eutils multilib-minimal MY_P="${P//_/-}" SEPOL_VER="2.3" DESCRIPTION="SELinux userland library" HOMEPAGE="http://userspace.selinuxproject.org"; SRC_URI="https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20140506/${MY_P}.tar.gz http://dev.gentoo.org/~swift/patches/${PN}/patchbundle-${PN}-${PATCHBUNDLE}.tar.gz"; LICENSE="public-domain" SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="python ruby static-libs ruby_targets_ruby19 ruby_targets_ruby20" RDEPEND=">=sys-libs/libsepol-${SEPOL_VER}[${MULTILIB_USEDEP}] >=dev-libs/libpcre-8.33-r1[static-libs?,${MULTILIB_USEDEP}] python? ( ${PYTHON_DEPS} ) ruby? ( ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) )" DEPEND="${RDEPEND} virtual/pkgconfig python? ( >=dev-lang/swig-2.0.9 )" S="${WORKDIR}/${MY_P}" src_prepare() { EPATCH_MULTI_MSG="Applying libselinux patches ... " \ EPATCH_SUFFIX="patch" \ EPATCH_SOURCE="${WORKDIR}/gentoo-patches" \ EPATCH_FORCE="yes" \ epatch epatch_user multilib_copy_sources } multilib_src_compile() { tc-export PKG_CONFIG RANLIB local PCRE_CFLAGS=$(${PKG_CONFIG} libpcre --cflags) local PCRE_LIBS=$(${PKG_CONFIG} libpcre --libs) export PCRE_{CFLAGS,LIBS} emake \ AR="$(tc-getAR)" \ CC="$(tc-getCC)" \ LIBDIR="\$(PREFIX)/$(get_libdir)" \ SHLIBDIR="\$(DESTDIR)/$(get_libdir)" \ LDFLAGS="-fPIC ${LDFLAGS} -pthread" \ all if multilib_is_native_abi && use python; then building() { python_export PYTHON_INCLUDEDIR PYTHON_LIBPATH emake \ CC="$(tc-getCC)" \ PYINC="-I${PYTHON_INCLUDEDIR}" \ PYTHONLIBDIR="${PYTHON_LIBPATH}" \ PYPREFIX="${EPYTHON##*/}" \ LDFLAGS="-fPIC ${LDFLAGS} -lpthread" \ pywrap } python_foreach_impl building fi if multilib_is_native_abi && use ruby; then building() { einfo "Calling rubywrap for ${1}" # Clean up .lo file to force rebuild test -f src/selinuxswig_ruby_wrap.lo && rm src/selinuxswig_ruby_wrap.lo emake \ CC="$(tc-getCC)" \ RUBY=${1} \ RUBYINSTALL=$(${1} -e 'print RbConfig::CONFIG["vendorarchdir"]') \ LDFLAGS="-fPIC ${LDFLAGS} -lpthread" \ rubywrap } for RUBYTARGET in ${USE_RUBY}; do use ruby_targets_${RUBYTARGET} || continue building ${RUBYTARGET} done fi } multilib_src_install() { LIBDIR="\$(PREFIX)/$(get_libdir)" SHLIBDIR="\$(DESTDIR)/$(get_libdir)" \ emake DESTDIR="${D}" install if multilib_is_native_abi && use python; then installation() { LIBDIR="\$(PREFIX)/$(get_libdir)" emake DESTDIR="${D}" install-pywrap python_optimize # bug 531638 } python_foreach_impl installation fi if multilib_is_native_abi && use ruby; then installation() { einfo "Calling install-rubywrap for ${1}" # Forcing (re)build here as otherwise the resulting SO file is used for all ruby versions rm src/selinuxswig_ruby_wrap.lo LIBDIR="\$(PREFIX)/$(get_libdir)" emake DESTDIR="${D}" \ RUBY=${1} \ RUBYINSTALL="${D}/$(${1} -e 'print RbConfig::CONFIG["vendorarchdir"]')" \ install-rubywrap } for RUBYTARGET in ${USE_RUBY}; do use ruby_targets_${RUBYTARGET} || continue installation ${RUBYTARGET} done fi use static-libs || rm "${D}"/usr/lib*/*.a } pkg_postinst() { # Fix bug 473502 for POLTYPE in ${POLICY_TYPES}; do mkdir -p /etc/selinux/${POLTYPE}/contexts/files touch /etc/selinux/${POLTYPE}/contexts/files/file_contexts.local # Fix bug 516608 for EXPRFILE in file_contexts file_contexts.homedirs file_contexts.local ; do sefcontext_compile /etc/selinux/${POLTYPE}/contexts/files/${EXPRFILE}; done done }
