From ffd4c2fa34d4df7e8cae07ba814c9ea7af10a54e Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Tue, 29 Mar 2005 06:55:26 +0000 Subject: Make sure that the libsmpeg.so has a non-executable gnu stack marking. (Portage version: 2.0.51.19) --- media-libs/smpeg/ChangeLog | 11 ++++- media-libs/smpeg/files/digest-smpeg-0.4.4-r4 | 1 - media-libs/smpeg/files/digest-smpeg-0.4.4-r5 | 1 + media-libs/smpeg/files/smpeg-0.4.4-gnu-stack.patch | 28 +++++++++++ media-libs/smpeg/smpeg-0.4.4-r4.ebuild | 54 ---------------------- media-libs/smpeg/smpeg-0.4.4-r5.ebuild | 53 +++++++++++++++++++++ 6 files changed, 91 insertions(+), 57 deletions(-) delete mode 100644 media-libs/smpeg/files/digest-smpeg-0.4.4-r4 create mode 100644 media-libs/smpeg/files/digest-smpeg-0.4.4-r5 create mode 100644 media-libs/smpeg/files/smpeg-0.4.4-gnu-stack.patch delete mode 100644 media-libs/smpeg/smpeg-0.4.4-r4.ebuild create mode 100644 media-libs/smpeg/smpeg-0.4.4-r5.ebuild (limited to 'media-libs') diff --git a/media-libs/smpeg/ChangeLog b/media-libs/smpeg/ChangeLog index 01e06a7593bb..125627670e36 100644 --- a/media-libs/smpeg/ChangeLog +++ b/media-libs/smpeg/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for media-libs/smpeg -# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/smpeg/ChangeLog,v 1.19 2004/08/12 00:19:45 mr_bones_ Exp $ +# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-libs/smpeg/ChangeLog,v 1.20 2005/03/29 06:55:26 vapier Exp $ + +*smpeg-0.4.4-r5 (29 Mar 2005) + + 29 Mar 2005; Mike Frysinger + +files/smpeg-0.4.4-gnu-stack.patch, -smpeg-0.4.4-r4.ebuild, + +smpeg-0.4.4-r5.ebuild: + Make sure that the libsmpeg.so has a non-executable gnu stack marking. 11 Aug 2004; Michael Sterrett smpeg-0.4.4-r4.ebuild: gnuconfig_update in src_unpack diff --git a/media-libs/smpeg/files/digest-smpeg-0.4.4-r4 b/media-libs/smpeg/files/digest-smpeg-0.4.4-r4 deleted file mode 100644 index 9aa5597db6c8..000000000000 --- a/media-libs/smpeg/files/digest-smpeg-0.4.4-r4 +++ /dev/null @@ -1 +0,0 @@ -MD5 59c76ac704088ef5539210190c4e1fe3 smpeg-0.4.4.tar.gz 315054 diff --git a/media-libs/smpeg/files/digest-smpeg-0.4.4-r5 b/media-libs/smpeg/files/digest-smpeg-0.4.4-r5 new file mode 100644 index 000000000000..9aa5597db6c8 --- /dev/null +++ b/media-libs/smpeg/files/digest-smpeg-0.4.4-r5 @@ -0,0 +1 @@ +MD5 59c76ac704088ef5539210190c4e1fe3 smpeg-0.4.4.tar.gz 315054 diff --git a/media-libs/smpeg/files/smpeg-0.4.4-gnu-stack.patch b/media-libs/smpeg/files/smpeg-0.4.4-gnu-stack.patch new file mode 100644 index 000000000000..a48b6280694b --- /dev/null +++ b/media-libs/smpeg/files/smpeg-0.4.4-gnu-stack.patch @@ -0,0 +1,28 @@ +Make sure that the asm files don't incorrectly trigger an executable +stack marking in the final shared library. That's bad, mmmkay. + +before: +$ readelf -l /usr/lib/libsmpeg.so | grep -A 1 GNU_STACK + GNU_STACK 0x0000000000000000 0x0000000000000000 0x0000000000000000 + 0x0000000000000000 0x0000000000000000 RWE 8 +after: +$ readelf -l /usr/lib/libsmpeg.so | grep -A 1 GNU_STACK + GNU_STACK 0x0000000000000000 0x0000000000000000 0x0000000000000000 + 0x0000000000000000 0x0000000000000000 RW 8 + +--- smpeg-0.4.4/video/mmxflags_asm.S ++++ smpeg-0.4.4/video/mmxflags_asm.S +@@ -57,3 +57,5 @@ + .size cpu_flags,.Lfe1-cpu_flags + + #endif /* i386 && USE_MMX */ ++ ++.section .note.GNU-stack,"",@progbits +--- smpeg-0.4.4/video/mmxidct_asm.S ++++ smpeg-0.4.4/video/mmxidct_asm.S +@@ -673,3 +673,5 @@ + + + #endif /* i386 && USE_MMX */ ++ ++.section .note.GNU-stack,"",@progbits diff --git a/media-libs/smpeg/smpeg-0.4.4-r4.ebuild b/media-libs/smpeg/smpeg-0.4.4-r4.ebuild deleted file mode 100644 index 40e4c6ecf8b5..000000000000 --- a/media-libs/smpeg/smpeg-0.4.4-r4.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/smpeg/smpeg-0.4.4-r4.ebuild,v 1.18 2004/08/12 00:19:45 mr_bones_ Exp $ - -inherit eutils gcc gnuconfig - -DESCRIPTION="SDL MPEG Player Library" -HOMEPAGE="http://www.lokigames.com/development/smpeg.php3" -SRC_URI="ftp://ftp.lokigames.com/pub/open-source/smpeg/${P}.tar.gz" - -LICENSE="LGPL-2" -SLOT="0" -KEYWORDS="x86 ppc sparc ~mips alpha hppa amd64 ppc64" -IUSE="X gtk opengl debug" - -DEPEND=">=media-libs/libsdl-1.2.0 - opengl? ( virtual/opengl virtual/glu ) - gtk? ( =x11-libs/gtk+-1.2* ) - X? ( virtual/x11 )" - -src_unpack() { - unpack ${A} - cd ${S} - sed -i \ - -e 's:-mcpu=ev4 -Wa,-mall::' \ - -e 's:-march=486::' \ - -e 's:-march=pentium -mcpu=pentiumpro::' \ - configure \ - || die "sed configure failed" - # GCC 3.1 fix from bug #5558 (cardoe 08/03/02) - sed -i \ - -e '/^libsmpeg_la_LIBADD =/s:$: -lsupc++:' Makefile.in \ - || die "sed Makefile.in failed" - gnuconfig_update -} - -src_compile() { - # --enable-mmx causes test apps to crash on startup #470 - # $(use_enable mmx) \ - econf \ - $(use_enable debug) \ - $(use_enable debug assertions) \ - $(use_enable gtk gtk-player) \ - $(use_with X x) \ - $(use_enable opengl opengl-player) \ - || die "econf failed" - - emake || die "emake failed" -} - -src_install() { - make DESTDIR="${D}" install || die "make install failed" - dodoc CHANGES README* TODO -} diff --git a/media-libs/smpeg/smpeg-0.4.4-r5.ebuild b/media-libs/smpeg/smpeg-0.4.4-r5.ebuild new file mode 100644 index 000000000000..26247b198724 --- /dev/null +++ b/media-libs/smpeg/smpeg-0.4.4-r5.ebuild @@ -0,0 +1,53 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-libs/smpeg/smpeg-0.4.4-r5.ebuild,v 1.1 2005/03/29 06:55:26 vapier Exp $ + +inherit eutils toolchain-funcs + +DESCRIPTION="SDL MPEG Player Library" +HOMEPAGE="http://www.lokigames.com/development/smpeg.php3" +SRC_URI="ftp://ftp.lokigames.com/pub/open-source/smpeg/${P}.tar.gz" + +LICENSE="LGPL-2" +SLOT="0" +KEYWORDS="alpha amd64 hppa ~mips ppc ppc64 sparc x86" +IUSE="X gtk opengl debug" + +DEPEND=">=media-libs/libsdl-1.2.0 + opengl? ( virtual/opengl virtual/glu ) + gtk? ( =x11-libs/gtk+-1.2* ) + X? ( virtual/x11 )" + +src_unpack() { + unpack ${A} + cd "${S}" + epatch "${FILESDIR}"/${P}-gnu-stack.patch + sed -i \ + -e 's:-mcpu=ev4 -Wa,-mall::' \ + -e 's:-march=486::' \ + -e 's:-march=pentium -mcpu=pentiumpro::' \ + configure || die "sed configure failed" + # GCC 3.1 fix from bug #5558 (cardoe 08/03/02) + sed -i \ + -e '/^libsmpeg_la_LIBADD =/s:$: -lsupc++:' Makefile.in \ + || die "sed Makefile.in failed" +} + +src_compile() { + # --enable-mmx causes test apps to crash on startup #470 + # $(use_enable mmx) \ + econf \ + $(use_enable debug) \ + $(use_enable debug assertions) \ + $(use_enable gtk gtk-player) \ + $(use_with X x) \ + $(use_enable opengl opengl-player) \ + || die "econf failed" + + emake || die "emake failed" +} + +src_install() { + make DESTDIR="${D}" install || die "make install failed" + dodoc CHANGES README* TODO +} -- cgit v1.2.3-65-gdbad