From f9c20fb3b15bba13c526fde4e7dd8ebdf81a5a8a Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Tue, 27 Feb 2018 19:31:55 +0000
Subject: app-admin/vasile : revision bump

---
 .../vasile/files/vasile-use-hardened-profile.patch | 44 ++++++++++++++++++++++
 app-admin/vasile/vasile-1.1801-r2.ebuild           | 37 ------------------
 app-admin/vasile/vasile-1.1801-r3.ebuild           | 39 +++++++++++++++++++
 3 files changed, 83 insertions(+), 37 deletions(-)
 create mode 100644 app-admin/vasile/files/vasile-use-hardened-profile.patch
 delete mode 100644 app-admin/vasile/vasile-1.1801-r2.ebuild
 create mode 100644 app-admin/vasile/vasile-1.1801-r3.ebuild

(limited to 'app-admin')

diff --git a/app-admin/vasile/files/vasile-use-hardened-profile.patch b/app-admin/vasile/files/vasile-use-hardened-profile.patch
new file mode 100644
index 00000000..e755ed94
--- /dev/null
+++ b/app-admin/vasile/files/vasile-use-hardened-profile.patch
@@ -0,0 +1,44 @@
+diff --git a/src/backend/f_modeswitch.sh b/src/backend/f_modeswitch.sh
+index 323afba..4f6c271 100644
+--- a/src/backend/f_modeswitch.sh
++++ b/src/backend/f_modeswitch.sh
+@@ -101,7 +101,7 @@ injectportfulltree () {
+ setbinmodecfg () {
+ 	ln -sf "$jailportcfgsource" "$jailportcfgtarget"
+ 	ln -sf "$jailportcfgtarget"/make.conf.amd64-binmode "$jailportcfgtarget"/make.conf
+-	eselect profile set redcore:default/linux/amd64/13.0
++	eselect profile set default/linux/amd64/17.0/hardened
+ 	env-update
+ 	. /etc/profile
+ }
+@@ -115,7 +115,7 @@ binmode () {
+ setmixedmodecfg () {
+ 	ln -sf "$jailportcfgsource" "$jailportcfgtarget"
+ 	ln -sf "$jailportcfgtarget"/make.conf.amd64-mixedmode "$jailportcfgtarget"/make.conf
+-	eselect profile set redcore:default/linux/amd64/13.0
++	eselect profile set default/linux/amd64/17.0/hardened
+ 	env-update
+ 	. /etc/profile
+ }
+@@ -129,7 +129,7 @@ mixedmode () {
+ setsrcmodecfg () {
+ 	ln -sf "$jailportcfgsource" "$jailportcfgtarget"
+ 	ln -sf "$jailportcfgtarget"/make.conf.amd64-srcmode "$jailportcfgtarget"/make.conf
+-	eselect profile set redcore:default/linux/amd64/13.0
++	eselect profile set default/linux/amd64/17.0/hardened
+ 	env-update
+ 	. /etc/profile
+ }
+diff --git a/src/backend/v_jail.sh b/src/backend/v_jail.sh
+index 7752a0a..83fcdaf 100644
+--- a/src/backend/v_jail.sh
++++ b/src/backend/v_jail.sh
+@@ -4,7 +4,7 @@ export local distupstream="gentoo"
+ export local distname="redcore"
+ export local disttarget="desktop"
+ export local distver="1"
+-export local kernver="$(readlink /usr/src/linux)"
++export local kernver="$(readlink /usr/src/linux|sed -e "s/\linux-//g" -e "s/\///g")"
+ 
+ export local jailx64=""$distname"_"$distver"_core_x64.squashfs"
+ export local jailx64sum=""$jailx64".md5sum"
diff --git a/app-admin/vasile/vasile-1.1801-r2.ebuild b/app-admin/vasile/vasile-1.1801-r2.ebuild
deleted file mode 100644
index c3d868d1..00000000
--- a/app-admin/vasile/vasile-1.1801-r2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 2016-2017 Redcore Linux Project
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils
-
-DESCRIPTION="Versatile Advanced Script for ISO and Latest Enchantments"
-HOMEPAGE="https://redcorelinux.org"
-SRC_URI="https://github.com/redcorelinux/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE=""
-
-DEPEND="sys-apps/gentoo-functions"
-RDEPEND="${DEPEND}
-	dev-libs/libisoburn
-	sys-boot/grub:2
-	sys-kernel/dkms
-	sys-fs/mtools
-	sys-fs/squashfs-tools"
-
-src_install() {
-	default
-	dosym ../../usr/bin/"${PN}".sh usr/bin/"${PN}"
-	dodir var/cache/packages
-	dodir var/cache/distfiles
-}
-
-pkg_postinst() {
-	chown portage:portage /var/cache/distfiles
-	chmod 775 /var/cache/distfiles
-
-	# auto switch to Redcore Linux profile
-	"${ROOT}"/usr/bin/eselect profile set "redcore:default/linux/amd64/13.0"
-}
diff --git a/app-admin/vasile/vasile-1.1801-r3.ebuild b/app-admin/vasile/vasile-1.1801-r3.ebuild
new file mode 100644
index 00000000..d81b927d
--- /dev/null
+++ b/app-admin/vasile/vasile-1.1801-r3.ebuild
@@ -0,0 +1,39 @@
+# Copyright 2016-2017 Redcore Linux Project
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils
+
+DESCRIPTION="Versatile Advanced Script for ISO and Latest Enchantments"
+HOMEPAGE="https://redcorelinux.org"
+SRC_URI="https://github.com/redcorelinux/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64"
+IUSE=""
+
+DEPEND="sys-apps/gentoo-functions"
+RDEPEND="${DEPEND}
+	dev-libs/libisoburn
+	sys-boot/grub:2
+	sys-kernel/dkms
+	sys-fs/mtools
+	sys-fs/squashfs-tools"
+
+src_prepare() {
+	default
+	eapply "${FILESDIR}"/"${PN}"-use-hardened-profile.patch
+}
+
+src_install() {
+	default
+	dosym ../../usr/bin/"${PN}".sh usr/bin/"${PN}"
+	dodir var/cache/packages
+	dodir var/cache/distfiles
+}
+
+pkg_postinst() {
+	chown portage:portage /var/cache/distfiles
+	chmod 775 /var/cache/distfiles
+}
-- 
cgit v1.2.3