summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2018-02-27 19:31:55 +0000
committerV3n3RiX <venerix@redcorelinux.org>2018-03-09 17:04:42 +0000
commit3708ab22d62efeff05f268641dae3e54f2504888 (patch)
tree78e03b98631f6401ab76307df45aa8f9a3e9d0d2
parent44baf1502edf9acc0e91c39081167033d032db00 (diff)
app-admin/vasile : revision bump
app-admin/vasile : revision bump
-rw-r--r--app-admin/vasile/files/vasile-use-hardened-profile.patch44
-rw-r--r--app-admin/vasile/vasile-1.1801-r3.ebuild (renamed from app-admin/vasile/vasile-1.1801-r2.ebuild)8
2 files changed, 49 insertions, 3 deletions
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-r3.ebuild
index c3d868d1..d81b927d 100644
--- a/app-admin/vasile/vasile-1.1801-r2.ebuild
+++ b/app-admin/vasile/vasile-1.1801-r3.ebuild
@@ -21,6 +21,11 @@ RDEPEND="${DEPEND}
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}"
@@ -31,7 +36,4 @@ src_install() {
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"
}