media-video/mplayer: Rev bump to add patch for CVE-2016-4352 (bug #581952) #4951
Conversation
gentoo-repo-qa-bot
added
the
assigned
|
Pull Request assignment Areas affected: ebuilds media-video/mplayer: @gentoo/video |
|
please update -9999 too for the ebuild fixes |
| VIDEO_CARDS="s3virge mga tdfx" | ||
| for x in ${VIDEO_CARDS}; do | ||
| IUSE+=" video_cards_${x}" | ||
| done |
| KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" | ||
| PATCHES=( "${FILESDIR}"/${PN}-1.3-CVE-2016-4352.patch ) | ||
| else | ||
| KEYWORDS="~alpha ~arm ~hppa ~ia64" |
There was a problem hiding this comment.
every ebuild should contain only 1 KEYWORDS line, as ekeyword will then randomly add crap to the wrong conidtional block and unnecessary churn. And yes, it's fine to have KEYWORDS undefined (for -9999 ebuilds).
| src_unpack() { | ||
| if [[ ${PV} = *9999* ]]; then | ||
| subversion_src_unpack | ||
| cd "${WORKDIR}" |
| if [[ ${PV} = *9999* ]]; then | ||
| subversion_src_unpack | ||
| cd "${WORKDIR}" | ||
| rm -rf "${WORKDIR}/${P}/ffmpeg/" |
| fi | ||
|
|
||
| if [[ ${PV} = *9999* ]] || [[ "${PV%_rc*}" = "${PV}" ]]; then | ||
| cd "${S}" |
| fi | ||
|
|
||
| if use truetype; then | ||
| cat >> "${ED}/etc/mplayer/mplayer.conf" << _EOF_ |
|
|
||
| # bug 256203 | ||
| if use rar; then | ||
| cat >> "${ED}/etc/mplayer/mplayer.conf" << _EOF_ |
| } | ||
|
|
||
| pkg_preinst() { | ||
| [[ -d ${EROOT}/usr/share/mplayer/Skin/default ]] && \ |
There was a problem hiding this comment.
${EROOT%/} to avoid double-slashing
|
|
||
| pkg_preinst() { | ||
| [[ -d ${EROOT}/usr/share/mplayer/Skin/default ]] && \ | ||
| rm -rf "${EROOT}/usr/share/mplayer/Skin/default" |
There was a problem hiding this comment.
turn this into a proper if conditional and add || die to rm -rf
|
|
||
| [ -L "${EROOT}/usr/share/mplayer/subfont.ttf" -a \ | ||
| ! -e "${EROOT}/usr/share/mplayer/subfont.ttf" ] && \ | ||
| rm -f "${EROOT}/usr/share/mplayer/subfont.ttf" |
|
@SoapGentoo file a PR for those changes, that's not the point of this one, and it's already annoying it is mixing a sec fix and minor bikeshed |
|
@aballier since when is bumping to EAPI 6 necessary for a sec fix? But anyhow... |
|
yes, it is already annoying it is mixing the 2, no need to add more |
…1952) Package-Manager: Portage-2.3.5, Repoman-2.3.2
|
I updated the PR: I am now pushing just a small rev bump based on previous mplayer-1.3.0.ebuild with just the patch as addition. |
|
merged, thx note that you didn't need to put the patch in the else branch, live & release ebuilds get out of sync for that kind of things and that's ok |
Ebuild changes: