Attachment #194987 for bug #274497

View | Details | Raw Unified | Return to bug 274497
Collapse All | Expand All




			unset PORTAGE_QUIET
		fi

		# Make sure we disallow insecure RUNPATH/RPATHs
		# Don't want paths that point to the tree where the package was built
		# (older, broken libtools would do this).  Also check for null paths
		# because the loader will search $PWD when it finds null paths.

		)
		if [[ -n ${f}${x} ]] ; then
			vecho -ne '\a\n'
			eqawarn "QA Notice: The following files contain insecure RUNPATHs"
			eqawarn " Please file a bug about this at http://bugs.gentoo.org/"
			eqawarn " with the maintaining herd of the package."
			eqawarn "${f}${f:+${x:+\n}}${x}"

			fi
		fi

		# TEXTRELs are baaaaaaaad
		# Allow devs to mark things as ignorable ... e.g. things that are
		# binary-only and upstream isn't cooperating (nvidia-glx) ... we
		# allow ebuild authors to set QA_TEXTRELS_arch and QA_TEXTRELS ...

Lines 37-43 Link Here

(-)portage-2.2_rc33.orig/cnf/make.conf.amd64.diff (-1 / +1 lines)
37	+#	37	+#
38	+# CRITICAL WARNINGS: ****************************************************** #	38	+# CRITICAL WARNINGS: ****************************************************** #
39	+# K6 markings are deceptive. Avoid setting -march for them. See Bug #24379. #	39	+# K6 markings are deceptive. Avoid setting -march for them. See Bug #24379. #
40	+# Pentium-M CPU's should not enable sse2 until at least gcc-3.4. Bug 50616. #	40	+# Pentium-M CPUs should not enable sse2 until at least gcc-3.4. Bug 50616. #
41	+# GCC 3.3 doesnt support an amd64 specific -march setting, use 3.4. #	41	+# GCC 3.3 doesnt support an amd64 specific -march setting, use 3.4. #
42	+# ************************************************************************* #	42	+# ************************************************************************* #
43	#	43	#

Lines 37-43 Link Here

(-)portage-2.2_rc33.orig/cnf/make.conf.amd64-fbsd.diff (-1 / +1 lines)
37	+#	37	+#
38	+# CRITICAL WARNINGS: ****************************************************** #	38	+# CRITICAL WARNINGS: ****************************************************** #
39	+# K6 markings are deceptive. Avoid setting -march for them. See Bug #24379. #	39	+# K6 markings are deceptive. Avoid setting -march for them. See Bug #24379. #
40	+# Pentium-M CPU's should not enable sse2 until at least gcc-3.4. Bug 50616. #	40	+# Pentium-M CPUs should not enable sse2 until at least gcc-3.4. Bug 50616. #
41	+# GCC 3.3 doesnt support an amd64 specific -march setting, use 3.4. #	41	+# GCC 3.3 doesnt support an amd64 specific -march setting, use 3.4. #
42	+# ************************************************************************* #	42	+# ************************************************************************* #
43	#	43	#

Lines 73-79 Link Here

(-)portage-2.2_rc33.orig/cnf/make.conf.x86.diff (-1 / +1 lines)
73	+#	73	+#
74	+# CRITICAL WARNINGS: ****************************************************** #	74	+# CRITICAL WARNINGS: ****************************************************** #
75	+# K6 markings are deceptive. Avoid setting -march for them. See Bug #24379. #	75	+# K6 markings are deceptive. Avoid setting -march for them. See Bug #24379. #
76	+# Pentium-M CPU's should not enable sse2 until at least gcc-3.4. Bug 50616. #	76	+# Pentium-M CPUs should not enable sse2 until at least gcc-3.4. Bug 50616. #
77	+# ************************************************************************* #	77	+# ************************************************************************* #
78	+#	78	+#
79	+# NOTE: the -On optimization levels are set with the letter O, not -0 (zero).	79	+# NOTE: the -On optimization levels are set with the letter O, not -0 (zero).

Lines 43-49 Link Here

(-)portage-2.2_rc33.orig/cnf/make.conf.x86-fbsd.diff (-1 / +1 lines)
43	+#	43	+#
44	+# CRITICAL WARNINGS: ****************************************************** #	44	+# CRITICAL WARNINGS: ****************************************************** #
45	+# K6 markings are deceptive. Avoid setting -march for them. See Bug #24379. #	45	+# K6 markings are deceptive. Avoid setting -march for them. See Bug #24379. #
46	+# Pentium-M CPU's should not enable sse2 until at least gcc-3.4. Bug 50616. #	46	+# Pentium-M CPUs should not enable sse2 until at least gcc-3.4. Bug 50616. #
47	+# ************************************************************************* #	47	+# ************************************************************************* #
48	#	48	#
49	+# Decent examples:	49	+# Decent examples:

Lines 17-23 Link Here

(-)portage-2.2_rc33.orig/doc/qa.docbook (-1 / +1 lines)
17	<title>Scanelf: Insecure RUNPATHs</title>	17	<title>Scanelf: Insecure RUNPATHs</title>
18	<para>	18	<para>
19	<programlisting>	19	<programlisting>
20	QA Notice: The following files contain insecure RUNPATH's	20	QA Notice: The following files contain insecure RUNPATHs
21	</programlisting>	21	</programlisting>
22	</para>	22	</para>
23	<para>	23	<para>




the EAPI to which this package conforms.
.TP
\fBSRC_URI\fR = \fI"http://happy.com/little/${P}.tar.gz"\fR
Contains a list of URIs for the required source files.  It can contain
multiple URIs for a single source file.  The list is processed in order
if the file was not found on any of the \fIGENTOO_MIRRORS\fR.
Beginning with \fBEAPI 2\fR, the output file name of a given URI may be
customized with a "->" operator on the right hand side, followed by the

file name, should be separated by whitespace.
.TP
\fBHOMEPAGE\fR = \fI"http://happy.com/"\fR
Should contain a list of URIs for the sources main sites and other further
package dependent information.
.TP
\fBKEYWORDS\fR = \fI[\-~][x86,ppc,sparc,mips,alpha,arm,hppa]\fR

files in \fBSRC_URI\fR will not be downloaded from the \fBGENTOO_MIRRORS\fR.
.TP
.I primaryuri
fetch from URIs in \fBSRC_URI\fR before \fBGENTOO_MIRRORS\fR.
.TP
.I strip
final binaries/libraries will not be stripped of debug symbols.

Lines 388-394 Link Here

(-)portage-2.2_rc33.orig/man/make.conf.5 (-1 / +1 lines)
388	written to place the fetched file at \\${DISTDIR}/\\${FILE}.	388	written to place the fetched file at \\${DISTDIR}/\\${FILE}.
389	Also see \fBRESUMECOMMAND\fR.	389	Also see \fBRESUMECOMMAND\fR.
390	.TP	390	.TP
391	\fBGENTOO_MIRRORS\fR = \fI[URLs]\fR	391	\fBGENTOO_MIRRORS\fR = \fI[URIs]\fR
392	Insert your space\-seperated list of local mirrors here. These	392	Insert your space\-seperated list of local mirrors here. These
393	locations are used to download files before the ones listed in	393	locations are used to download files before the ones listed in
394	the \fIebuild scripts\fR. Merging 'mirrorselect' can help. Entries in this	394	the \fIebuild scripts\fR. Merging 'mirrorselect' can help. Entries in this

Lines 415-421 Link Here

(-)portage-2.2_rc33.orig/man/portage.5 (-2 / +2 lines)
415	Contains variables customizing colors. See \fBcolor.map\fR(5).	415	Contains variables customizing colors. See \fBcolor.map\fR(5).
416	.TP	416	.TP
417	.BR mirrors	417	.BR mirrors
418	Whenever portage encounters a mirror:// style URL it will look up the actual	418	Whenever portage encounters a mirror:// style URI it will look up the actual
419	hosts here. If the mirror set is not found here, it will check the global	419	hosts here. If the mirror set is not found here, it will check the global
420	mirrors file at /usr/portage/profiles/thirdpartymirrors. You may also set a	420	mirrors file at /usr/portage/profiles/thirdpartymirrors. You may also set a
421	special mirror type called "local". This list of mirrors will be checked	421	special mirror type called "local". This list of mirrors will be checked
Lines 719-725 Link Here
719	hyphen.	719	hyphen.
720	.TP	720	.TP
721	.BR thirdpartymirrors	721	.BR thirdpartymirrors
722	Controls the mapping of mirror:// style URLs to actual lists of	722	Controls the mapping of mirror:// style URIs to actual lists of
723	mirrors. Keeps us from overloading a single server.	723	mirrors. Keeps us from overloading a single server.
724		724
725	.I Format:	725	.I Format:

Lines 390-396 Link Here

(-)portage-2.2_rc33.orig/pym/portage/dbapi/porttree.py (-1 / +1 lines)
390	def getRepositories(self):	390	def getRepositories(self):
391	"""	391	"""
392	This function is required for GLEP 42 compliance; it will return a list of	392	This function is required for GLEP 42 compliance; it will return a list of
393	repository ID's	393	repository IDs
394	TreeMap = {id: path}	394	TreeMap = {id: path}
395	"""	395	"""
396	return [k for k in self.treemap if k]	396	return [k for k in self.treemap if k]





	parts = baseurl.split("://",1)
	if len(parts) != 2:
		raise ValueError("Provided URI does not " + \
			"contain protocol identifier. '%s'" % baseurl)
	protocol,url_parts = parts
	del parts


def dir_get_list(baseurl,conn=None):
	"""(baseurl[,connection]) -- Takes a base url to connect to and read from.
	URI should be in the form <proto>://<site>[:port]<path>
	Connection is used for persistent connection instances."""

	if not conn:


def file_get_metadata(baseurl,conn=None, chunk_size=3000):
	"""(baseurl[,connection]) -- Takes a base url to connect to and read from.
	URI should be in the form <proto>://<site>[:port]<path>
	Connection is used for persistent connection instances."""

	if not conn:


def file_get(baseurl,dest,conn=None,fcmd=None):
	"""(baseurl,dest,fcmd=) -- Takes a base url to connect to and read from.
	URI should be in the form <proto>://[user[:pass]@]<site>[:port]<path>"""

	if not fcmd:
		return file_get_lib(baseurl,dest,conn)


def file_get_lib(baseurl,dest,conn=None):
	"""(baseurl[,connection]) -- Takes a base url to connect to and read from.
	URI should be in the form <proto>://<site>[:port]<path>
	Connection is used for persistent connection instances."""

	if not conn:

Lines 5789-5795 Link Here

(-)portage-2.2_rc33.orig/pym/portage/__init__.py (-1 / +1 lines)
5789	@type dbkey: Dict or String	5789	@type dbkey: Dict or String
5790	@param use_cache: Enables the cache	5790	@param use_cache: Enables the cache
5791	@type use_cache: Boolean	5791	@type use_cache: Boolean
5792	@param fetchall: Used to wrap fetch(), fetches all URI's (even ones invalid due to USE conditionals)	5792	@param fetchall: Used to wrap fetch(), fetches all URIs (even ones invalid due to USE conditionals)
5793	@type fetchall: Boolean	5793	@type fetchall: Boolean
5794	@param tree: Which tree to use ('vartree','porttree','bintree', etc..), defaults to 'porttree'	5794	@param tree: Which tree to use ('vartree','porttree','bintree', etc..), defaults to 'porttree'
5795	@type tree: String	5795	@type tree: String

Return to bug 274497

Lines 68-74 Link Here

(-)portage-2.2_rc33.orig/bin/misc-functions.sh (-3 / +3 lines)
68	unset PORTAGE_QUIET	68	unset PORTAGE_QUIET
69	fi	69	fi
70		70
71	# Make sure we disallow insecure RUNPATH/RPATH's	71	# Make sure we disallow insecure RUNPATH/RPATHs
72	# Don't want paths that point to the tree where the package was built	72	# Don't want paths that point to the tree where the package was built
73	# (older, broken libtools would do this). Also check for null paths	73	# (older, broken libtools would do this). Also check for null paths
74	# because the loader will search $PWD when it finds null paths.	74	# because the loader will search $PWD when it finds null paths.
Lines 80-86 Link Here
80	)	80	)
81	if [[ -n ${f}${x} ]] ; then	81	if [[ -n ${f}${x} ]] ; then
82	vecho -ne '\a\n'	82	vecho -ne '\a\n'
83	eqawarn "QA Notice: The following files contain insecure RUNPATH's"	83	eqawarn "QA Notice: The following files contain insecure RUNPATHs"
84	eqawarn " Please file a bug about this at http://bugs.gentoo.org/"	84	eqawarn " Please file a bug about this at http://bugs.gentoo.org/"
85	eqawarn " with the maintaining herd of the package."	85	eqawarn " with the maintaining herd of the package."
86	eqawarn "${f}${f:+${x:+\n}}${x}"	86	eqawarn "${f}${f:+${x:+\n}}${x}"
Lines 93-99 Link Here
93	fi	93	fi
94	fi	94	fi
95		95
96	# TEXTREL's are baaaaaaaad	96	# TEXTRELs are baaaaaaaad
97	# Allow devs to mark things as ignorable ... e.g. things that are	97	# Allow devs to mark things as ignorable ... e.g. things that are
98	# binary-only and upstream isn't cooperating (nvidia-glx) ... we	98	# binary-only and upstream isn't cooperating (nvidia-glx) ... we
99	# allow ebuild authors to set QA_TEXTRELS_arch and QA_TEXTRELS ...	99	# allow ebuild authors to set QA_TEXTRELS_arch and QA_TEXTRELS ...

Lines 140-147 Link Here

(-)portage-2.2_rc33.orig/man/ebuild.5 (-4 / +4 lines)
140	the EAPI to which this package conforms.	140	the EAPI to which this package conforms.
141	.TP	141	.TP
142	\fBSRC_URI\fR = \fI"http://happy.com/little/${P}.tar.gz"\fR	142	\fBSRC_URI\fR = \fI"http://happy.com/little/${P}.tar.gz"\fR
143	Contains a list of URI's for the required source files. It can contain	143	Contains a list of URIs for the required source files. It can contain
144	multiple URI's for a single source file. The list is processed in order	144	multiple URIs for a single source file. The list is processed in order
145	if the file was not found on any of the \fIGENTOO_MIRRORS\fR.	145	if the file was not found on any of the \fIGENTOO_MIRRORS\fR.
146	Beginning with \fBEAPI 2\fR, the output file name of a given URI may be	146	Beginning with \fBEAPI 2\fR, the output file name of a given URI may be
147	customized with a "->" operator on the right hand side, followed by the	147	customized with a "->" operator on the right hand side, followed by the
Lines 149-155 Link Here
149	file name, should be separated by whitespace.	149	file name, should be separated by whitespace.
150	.TP	150	.TP
151	\fBHOMEPAGE\fR = \fI"http://happy.com/"\fR	151	\fBHOMEPAGE\fR = \fI"http://happy.com/"\fR
152	Should contain a list of URL's for the sources main sites and other further	152	Should contain a list of URIs for the sources main sites and other further
153	package dependent information.	153	package dependent information.
154	.TP	154	.TP
155	\fBKEYWORDS\fR = \fI[\-~][x86,ppc,sparc,mips,alpha,arm,hppa]\fR	155	\fBKEYWORDS\fR = \fI[\-~][x86,ppc,sparc,mips,alpha,arm,hppa]\fR
Lines 421-427 Link Here
421	files in \fBSRC_URI\fR will not be downloaded from the \fBGENTOO_MIRRORS\fR.	421	files in \fBSRC_URI\fR will not be downloaded from the \fBGENTOO_MIRRORS\fR.
422	.TP	422	.TP
423	.I primaryuri	423	.I primaryuri
424	fetch from URL's in \fBSRC_URI\fR before \fBGENTOO_MIRRORS\fR.	424	fetch from URIs in \fBSRC_URI\fR before \fBGENTOO_MIRRORS\fR.
425	.TP	425	.TP
426	.I strip	426	.I strip
427	final binaries/libraries will not be stripped of debug symbols.	427	final binaries/libraries will not be stripped of debug symbols.

Lines 83-89 Link Here

(-)portage-2.2_rc33.orig/pym/portage/getbinpkg.py (-5 / +5 lines)
83		83
84	parts = baseurl.split("://",1)	84	parts = baseurl.split("://",1)
85	if len(parts) != 2:	85	if len(parts) != 2:
86	raise ValueError("Provided URL does not " + \	86	raise ValueError("Provided URI does not " + \
87	"contain protocol identifier. '%s'" % baseurl)	87	"contain protocol identifier. '%s'" % baseurl)
88	protocol,url_parts = parts	88	protocol,url_parts = parts
89	del parts	89	del parts
Lines 291-297 Link Here
291		291
292	def dir_get_list(baseurl,conn=None):	292	def dir_get_list(baseurl,conn=None):
293	"""(baseurl[,connection]) -- Takes a base url to connect to and read from.	293	"""(baseurl[,connection]) -- Takes a base url to connect to and read from.
294	URL should be in the for <proto>://<site>[:port]<path>	294	URI should be in the form <proto>://<site>[:port]<path>
295	Connection is used for persistent connection instances."""	295	Connection is used for persistent connection instances."""
296		296
297	if not conn:	297	if not conn:
Lines 339-345 Link Here
339		339
340	def file_get_metadata(baseurl,conn=None, chunk_size=3000):	340	def file_get_metadata(baseurl,conn=None, chunk_size=3000):
341	"""(baseurl[,connection]) -- Takes a base url to connect to and read from.	341	"""(baseurl[,connection]) -- Takes a base url to connect to and read from.
342	URL should be in the for <proto>://<site>[:port]<path>	342	URI should be in the form <proto>://<site>[:port]<path>
343	Connection is used for persistent connection instances."""	343	Connection is used for persistent connection instances."""
344		344
345	if not conn:	345	if not conn:
Lines 390-396 Link Here
390		390
391	def file_get(baseurl,dest,conn=None,fcmd=None):	391	def file_get(baseurl,dest,conn=None,fcmd=None):
392	"""(baseurl,dest,fcmd=) -- Takes a base url to connect to and read from.	392	"""(baseurl,dest,fcmd=) -- Takes a base url to connect to and read from.
393	URL should be in the for <proto>://[user[:pass]@]<site>[:port]<path>"""	393	URI should be in the form <proto>://[user[:pass]@]<site>[:port]<path>"""
394		394
395	if not fcmd:	395	if not fcmd:
396	return file_get_lib(baseurl,dest,conn)	396	return file_get_lib(baseurl,dest,conn)
Lines 418-424 Link Here
418		418
419	def file_get_lib(baseurl,dest,conn=None):	419	def file_get_lib(baseurl,dest,conn=None):
420	"""(baseurl[,connection]) -- Takes a base url to connect to and read from.	420	"""(baseurl[,connection]) -- Takes a base url to connect to and read from.
421	URL should be in the for <proto>://<site>[:port]<path>	421	URI should be in the form <proto>://<site>[:port]<path>
422	Connection is used for persistent connection instances."""	422	Connection is used for persistent connection instances."""
423		423
424	if not conn:	424	if not conn: