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 60C1E59CA5 for ; Sun, 13 Mar 2016 19:47:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 34EA921C025; Sun, 13 Mar 2016 19:47:08 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5197E21C01F for ; Sun, 13 Mar 2016 19:47:07 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D7F9A340A9C for ; Sun, 13 Mar 2016 19:47:05 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DD0D584B for ; Sun, 13 Mar 2016 19:47:02 +0000 (UTC) From: "Sven Vermeulen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sven Vermeulen" Message-ID: <1457898396.8dd629369776d44b56c7eb5f3c31753ab1f19548.swift@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/libsemanage/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-libs/libsemanage/Manifest sys-libs/libsemanage/libsemanage-2.5.ebuild sys-libs/libsemanage/libsemanage-9999.ebuild X-VCS-Directories: sys-libs/libsemanage/ X-VCS-Committer: swift X-VCS-Committer-Name: Sven Vermeulen X-VCS-Revision: 8dd629369776d44b56c7eb5f3c31753ab1f19548 X-VCS-Branch: master Date: Sun, 13 Mar 2016 19:47:02 +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: a5751ac5-6fe0-4709-851a-2c49680a60ef X-Archives-Hash: 33f4e4e863e4073b8493e700e806ba09 commit: 8dd629369776d44b56c7eb5f3c31753ab1f19548 Author: Sven Vermeulen gentoo org> AuthorDate: Sun Mar 13 18:35:34 2016 +0000 Commit: Sven Vermeulen gentoo org> CommitDate: Sun Mar 13 19:46:36 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8dd62936 sys-libs/libsemanage: Bump to 2.5 release Package-Manager: portage-2.2.26 sys-libs/libsemanage/Manifest | 1 + ...bsemanage-9999.ebuild => libsemanage-2.5.ebuild} | 21 +++++---------------- sys-libs/libsemanage/libsemanage-9999.ebuild | 6 +++--- 3 files changed, 9 insertions(+), 19 deletions(-) diff --git a/sys-libs/libsemanage/Manifest b/sys-libs/libsemanage/Manifest index f95583e..1f49a87 100644 --- a/sys-libs/libsemanage/Manifest +++ b/sys-libs/libsemanage/Manifest @@ -1,3 +1,4 @@ DIST libsemanage-2.2.tar.gz 138208 SHA256 11f60bfa0f1c6063cd9bd99ce0cb4acc9d6d9e9b8d7743d39e847bcd7803bd75 SHA512 09032b1b322fec7346164939ade118034812cb538ebc72121640d4ac5c89d2a66b59caa465027cfbebb590dee039a26d4345eafedf365d7f6ad0b5e90377d50f WHIRLPOOL 49170c5ee9ff57dcc4a15aa72386f37993f76436f0da25808c60dab2d03ba52932d0d4fa753c326900d83d2fae30f8bcf659251f17327783f2e2be3deb4842f4 DIST libsemanage-2.3.tar.gz 138231 SHA256 03e09e35e611c286e446bef92b6023ef2623815996f5a53394bb02e49a312e4b SHA512 defe3bbdbe51abdaa13a39f693c33446d8a1a8509ac1eb25c7770da2df6487bcb0ca31259d02b4531d4c81db5e221e94e95bec97f6a1a155e1de2f65e6f0da34 WHIRLPOOL 943d4d300aa8ad49c411b10b41c0c3e751c46dbcbbe129bdd1d2e975e231c58391d6ecdee6b27699fff9f6e6facf5b48fc8d57c2ff68692694c7de430750fac9 DIST libsemanage-2.4.tar.gz 151173 SHA256 1a4cace4ef16786531ec075c0e7b2f961e2fee5dc86c5f983a689058899a6484 SHA512 54f993253b22207b053daf4d34e72c65c72279866416089b6c0f047ef77bca3e307eac0ce6dfe40bd14e2e47e79841b358d5607501779f38d9b5f7c35f3b7729 WHIRLPOOL 7303c06515ed59b5756a87d08aff07671e51d26ce9fa452ca75643dd0ce4658571dc69d86434c943d691a4ab0d90cbdccdaa27e5aaec5fdf8057cf2d5d30631e +DIST libsemanage-2.5.tar.gz 152884 SHA256 46e2f36254369b6e91d1eea0460c262b139361b055a3a67d3ceea2d8ef72e006 SHA512 cf644b77d8a24f76c630ece582df1b49a0c5f48f1c9f79b1caee0df10372008954406974472a072360dbe6de5ebc19b1b21bb247084d75b7186f61b32f33b8ec WHIRLPOOL 397b7fd2e9b2c00dbc2f58bdc023501dcd7ecf1212fef9ad7993b4763a041068416ef06552c0abf0beef8c69f4704933feca36951866c43d867181332971f6be diff --git a/sys-libs/libsemanage/libsemanage-9999.ebuild b/sys-libs/libsemanage/libsemanage-2.5.ebuild similarity index 88% copy from sys-libs/libsemanage/libsemanage-9999.ebuild copy to sys-libs/libsemanage/libsemanage-2.5.ebuild index 687be20..4b838bf 100644 --- a/sys-libs/libsemanage/libsemanage-9999.ebuild +++ b/sys-libs/libsemanage/libsemanage-2.5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -8,26 +8,17 @@ PYTHON_COMPAT=( python2_7 python3_3 python3_4 ) inherit multilib python-r1 toolchain-funcs eutils multilib-minimal MY_P="${P//_/-}" -MY_RELEASEDATE="20150202" SEPOL_VER="${PV}" SELNX_VER="${PV}" DESCRIPTION="SELinux kernel and policy management 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/20150202/${MY_P}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" - S="${WORKDIR}/${MY_P}" -fi +SRC_URI="https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20160223/${MY_P}.tar.gz" LICENSE="GPL-2" SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" IUSE="python" RDEPEND=">=sys-libs/libsepol-${SEPOL_VER}[${MULTILIB_USEDEP}] @@ -48,6 +39,8 @@ DEPEND="${RDEPEND} # full SELinux userland repo RESTRICT="test" +S="${WORKDIR}/${MY_P}" + src_prepare() { echo "# Set this to true to save the linked policy." >> "${S}/src/semanage.conf" echo "# This is normally only useful for analysis" >> "${S}/src/semanage.conf" @@ -72,10 +65,6 @@ src_prepare() { echo "# decompression of modules in the module store." >> "${S}/src/semanage.conf" echo "bzip-small=true" >> "${S}/src/semanage.conf" - if [[ ${PV} != 9999 ]] ; then - # If wanted for live builds, please use /etc/portage/patches - epatch "${FILESDIR}/0001-libsemanage-do-not-copy-contexts-in-semanage_migrate.patch" - fi epatch "${FILESDIR}"/${PN}-2.4-build-paths.patch epatch_user diff --git a/sys-libs/libsemanage/libsemanage-9999.ebuild b/sys-libs/libsemanage/libsemanage-9999.ebuild index 687be20..ce10d31 100644 --- a/sys-libs/libsemanage/libsemanage-9999.ebuild +++ b/sys-libs/libsemanage/libsemanage-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_3 python3_4 ) inherit multilib python-r1 toolchain-funcs eutils multilib-minimal MY_P="${P//_/-}" -MY_RELEASEDATE="20150202" +MY_RELEASEDATE="20160223" SEPOL_VER="${PV}" SELNX_VER="${PV}" @@ -21,7 +21,7 @@ if [[ ${PV} == 9999 ]] ; then 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/20150202/${MY_P}.tar.gz" + 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