[gentoo-dev] [PATCH v2 1/8] bash-completion-r1.eclass: Sanitize insopts

[gentoo-dev] [PATCH v2 1/8] bash-completion-r1.eclass: Sanitize insopts

[Michał Górny]

Sanitize insopts when calling doins, in order to avoid prior insopts
calls accidentally affecting do*/new* functions defined by the eclass.
---
 eclass/bash-completion-r1.eclass | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/eclass/bash-completion-r1.eclass b/eclass/bash-completion-r1.eclass
index eff5e68c437e..0a457676ee56 100644
--- a/eclass/bash-completion-r1.eclass
+++ b/eclass/bash-completion-r1.eclass
@@ -98,6 +98,7 @@ dobashcomp() {
 	debug-print-function ${FUNCNAME} "${@}"
 
 	(
+		insopts -m 0644
 		insinto "$(_bash-completion-r1_get_bashcompdir)"
 		doins "${@}"
 	)
@@ -112,6 +113,7 @@ newbashcomp() {
 	debug-print-function ${FUNCNAME} "${@}"
 
 	(
+		insopts -m 0644
 		insinto "$(_bash-completion-r1_get_bashcompdir)"
 		newins "${@}"
 	)
-- 
2.18.0.rc1

[gentoo-dev] [PATCH v2 2/8] desktop.eclass: Sanitize insopts

[Michał Górny]

Sanitize insopts when calling doins, in order to avoid prior insopts
calls accidentally affecting do*/new* functions defined by the eclass.
---
 eclass/desktop.eclass | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/eclass/desktop.eclass b/eclass/desktop.eclass
index d65b0d0bf074..91521b85a821 100644
--- a/eclass/desktop.eclass
+++ b/eclass/desktop.eclass
@@ -195,6 +195,7 @@ make_desktop_entry() {
 	(
 		# wrap the env here so that the 'insinto' call
 		# doesn't corrupt the env of the caller
+		insopts -m 0644
 		insinto /usr/share/applications
 		doins "${desktop}"
 	) || die "installing desktop file failed"
@@ -228,6 +229,7 @@ make_session_desktop() {
 	(
 	# wrap the env here so that the 'insinto' call
 	# doesn't corrupt the env of the caller
+	insopts -m 0644
 	insinto /usr/share/xsessions
 	doins "${desktop}"
 	)
@@ -243,6 +245,7 @@ domenu() {
 	# wrap the env here so that the 'insinto' call
 	# doesn't corrupt the env of the caller
 	local i j ret=0
+	insopts -m 0644
 	insinto /usr/share/applications
 	for i in "$@" ; do
 		if [[ -f ${i} ]] ; then
@@ -269,6 +272,7 @@ newmenu() {
 	(
 	# wrap the env here so that the 'insinto' call
 	# doesn't corrupt the env of the caller
+	insopts -m 0644
 	insinto /usr/share/applications
 	newins "$@"
 	)
@@ -282,6 +286,7 @@ _iconins() {
 	(
 	# wrap the env here so that the 'insinto' call
 	# doesn't corrupt the env of the caller
+	insopts -m 0644
 	local funcname=$1; shift
 	local size dir
 	local context=apps
-- 
2.18.0.rc1

[gentoo-dev] [PATCH v2 3/8] eutils.eclass: Sanitize exeopts

[Michał Górny]

Sanitize exeopts when calling newexe, in order to avoid prior insopts
calls accidentally affecting make_wrapper.
---
 eclass/eutils.eclass | 1 +
 1 file changed, 1 insertion(+)

diff --git a/eclass/eutils.eclass b/eclass/eutils.eclass
index 7840afbb77b9..81621df78e63 100644
--- a/eclass/eutils.eclass
+++ b/eclass/eutils.eclass
@@ -172,6 +172,7 @@ make_wrapper() {
 
 	if [[ -n ${path} ]] ; then
 		(
+		exeopts -m 0755
 		exeinto "${path}"
 		newexe "${tmpwrapper}" "${wrapper}"
 		) || die
-- 
2.18.0.rc1

[gentoo-dev] [PATCH v2 4/8] python-r1.eclass: Sanitize exeopts

[Michał Górny]

Sanitize exeopts when calling doexe, in order to avoid prior insopts
calls accidentally affecting do*/new* functions defined by the eclass.
---
 eclass/python-r1.eclass | 1 +
 1 file changed, 1 insertion(+)

diff --git a/eclass/python-r1.eclass b/eclass/python-r1.eclass
index 8a8adb449cc3..097a965272d8 100644
--- a/eclass/python-r1.eclass
+++ b/eclass/python-r1.eclass
@@ -810,6 +810,7 @@ python_replicate_script() {
 		python_export PYTHON_SCRIPTDIR
 
 		(
+			exeopts -m 0755
 			exeinto "${PYTHON_SCRIPTDIR#${EPREFIX}}"
 			doexe "${files[@]}"
 		)
-- 
2.18.0.rc1

[gentoo-dev] [PATCH v2 5/8] python-utils-r1.eclass: Sanitize insopts/exeopts

[Michał Górny]

Sanitize insopts/exeopts when calling doins/doexe, in order to avoid
prior insopts calls accidentally affecting do*/new* functions defined
by the eclass.
---
 eclass/python-utils-r1.eclass | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass
index 3a462e34614a..ab4db71422d2 100644
--- a/eclass/python-utils-r1.eclass
+++ b/eclass/python-utils-r1.eclass
@@ -789,6 +789,7 @@ python_newexe() {
 
 	(
 		dodir "${wrapd}"
+		exeopts -m 0755
 		exeinto "${d}"
 		newexe "${f}" "${newfn}" || return ${?}
 	)
@@ -920,6 +921,7 @@ python_domodule() {
 	fi
 
 	(
+		insopts -m 0644
 		insinto "${d}"
 		doins -r "${@}" || return ${?}
 	)
@@ -954,6 +956,7 @@ python_doheader() {
 	d=${PYTHON_INCLUDEDIR#${EPREFIX}}
 
 	(
+		insopts -m 0644
 		insinto "${d}"
 		doins -r "${@}" || return ${?}
 	)
-- 
2.18.0.rc1

[gentoo-dev] [PATCH v2 6/8] systemd.eclass: Sanitize insopts

[Michał Górny]

Sanitize insopts when calling doins, in order to avoid prior insopts
calls accidentally affecting do*/new* functions defined by the eclass.
---
 eclass/systemd.eclass | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/eclass/systemd.eclass b/eclass/systemd.eclass
index 6dda4353064a..72f4845efc45 100644
--- a/eclass/systemd.eclass
+++ b/eclass/systemd.eclass
@@ -151,6 +151,7 @@ systemd_dounit() {
 	debug-print-function ${FUNCNAME} "${@}"
 
 	(
+		insopts -m 0644
 		insinto "$(_systemd_get_systemunitdir)"
 		doins "${@}"
 	)
@@ -165,6 +166,7 @@ systemd_newunit() {
 	debug-print-function ${FUNCNAME} "${@}"
 
 	(
+		insopts -m 0644
 		insinto "$(_systemd_get_systemunitdir)"
 		newins "${@}"
 	)
@@ -179,6 +181,7 @@ systemd_douserunit() {
 	debug-print-function ${FUNCNAME} "${@}"
 
 	(
+		insopts -m 0644
 		insinto "$(_systemd_get_userunitdir)"
 		doins "${@}"
 	)
@@ -193,6 +196,7 @@ systemd_newuserunit() {
 	debug-print-function ${FUNCNAME} "${@}"
 
 	(
+		insopts -m 0644
 		insinto "$(_systemd_get_userunitdir)"
 		newins "${@}"
 	)
@@ -222,6 +226,7 @@ systemd_install_serviced() {
 	[[ ${service} == *.d ]] && die "Service must not have .d suffix"
 
 	(
+		insopts -m 0644
 		insinto /etc/systemd/system/"${service}".d
 		newins "${src}" 00gentoo.conf
 	)
@@ -241,6 +246,7 @@ systemd_dotmpfilesd() {
 	done
 
 	(
+		insopts -m 0644
 		insinto /usr/lib/tmpfiles.d/
 		doins "${@}"
 	)
@@ -258,6 +264,7 @@ systemd_newtmpfilesd() {
 		|| die 'tmpfiles.d files need to have .conf suffix.'
 
 	(
+		insopts -m 0644
 		insinto /usr/lib/tmpfiles.d/
 		newins "${@}"
 	)
@@ -320,6 +327,7 @@ systemd_enable_ntpunit() {
 	done
 
 	(
+		insopts -m 0644
 		insinto "$(_systemd_get_utildir)"/ntp-units.d
 		doins "${T}"/${ntpunit_name}.list
 	)
-- 
2.18.0.rc1

[gentoo-dev] [PATCH v2 7/8] tmpfiles.eclass: Sanitize insopts

[Michał Górny]

Sanitize insopts when calling doins, in order to avoid prior insopts
calls accidentally affecting do*/new* functions defined by the eclass.
---
 eclass/tmpfiles.eclass | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/eclass/tmpfiles.eclass b/eclass/tmpfiles.eclass
index 746225784128..2a6e7ce8866a 100644
--- a/eclass/tmpfiles.eclass
+++ b/eclass/tmpfiles.eclass
@@ -76,6 +76,7 @@ dotmpfiles() {
 	done
 
 	(
+		insopts -m 0644
 		insinto /usr/lib/tmpfiles.d
 		doins "$@"
 	)
@@ -93,6 +94,7 @@ newtmpfiles() {
 	fi
 
 	(
+		insopts -m 0644
 		insinto /usr/lib/tmpfiles.d
 		newins "$@"
 	)
-- 
2.18.0.rc1

[gentoo-dev] [PATCH v2 8/8] udev.eclass: Sanitize insopts

[Michał Górny]

Sanitize insopts when calling doins, in order to avoid prior insopts
calls accidentally affecting do*/new* functions defined by the eclass.
---
 eclass/udev.eclass | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/eclass/udev.eclass b/eclass/udev.eclass
index 5e5df0738805..b7c6461dd8ff 100644
--- a/eclass/udev.eclass
+++ b/eclass/udev.eclass
@@ -82,6 +82,7 @@ udev_dorules() {
 	debug-print-function ${FUNCNAME} "${@}"
 
 	(
+		insopts -m 0644
 		insinto "$(_udev_get_udevdir)"/rules.d
 		doins "${@}"
 	)
@@ -96,6 +97,7 @@ udev_newrules() {
 	debug-print-function ${FUNCNAME} "${@}"
 
 	(
+		insopts -m 0644
 		insinto "$(_udev_get_udevdir)"/rules.d
 		newins "${@}"
 	)
-- 
2.18.0.rc1