Author: rathann Update of /cvs/free/rpms/xvidcore/F-13 In directory se02.es.rpmfusion.net:/tmp/cvs-serv507 Modified Files: xvidcore-noexec-stack.patch xvidcore.spec Log Message: * Mon Jan 10 2011 Dominik Mierzejewski <rpm at greysector.net> - 1.2.2-2 - fix noexec stack issue on i686 (bug #1560) - drop non-standard CFLAGS addition xvidcore-noexec-stack.patch: build/generic/configure | 2 +- build/generic/configure.in | 2 +- src/bitstream/x86_asm/cbp_mmx.asm | 6 +----- src/bitstream/x86_asm/cbp_sse2.asm | 6 +----- src/dct/x86_asm/fdct_mmx_ffmpeg.asm | 5 +---- src/dct/x86_asm/fdct_mmx_skal.asm | 5 +---- src/dct/x86_asm/fdct_sse2_skal.asm | 5 +---- src/dct/x86_asm/idct_3dne.asm | 6 +----- src/dct/x86_asm/idct_mmx.asm | 6 +----- src/dct/x86_asm/idct_sse2_dmitry.asm | 6 +----- src/image/x86_asm/colorspace_rgb_mmx.asm | 6 +----- src/image/x86_asm/colorspace_yuv_mmx.asm | 5 +---- src/image/x86_asm/colorspace_yuyv_mmx.asm | 5 +---- src/image/x86_asm/deintl_sse.asm | 5 +---- src/image/x86_asm/gmc_mmx.asm | 5 +---- src/image/x86_asm/interpolate8x8_3dn.asm | 6 +----- src/image/x86_asm/interpolate8x8_3dne.asm | 6 +----- src/image/x86_asm/interpolate8x8_mmx.asm | 6 +----- src/image/x86_asm/interpolate8x8_xmm.asm | 6 +----- src/image/x86_asm/postprocessing_mmx.asm | 5 +---- src/image/x86_asm/postprocessing_sse2.asm | 5 +---- src/image/x86_asm/qpel_mmx.asm | 5 +---- src/image/x86_asm/reduced_mmx.asm | 6 +----- src/motion/x86_asm/sad_3dn.asm | 6 +----- src/motion/x86_asm/sad_3dne.asm | 6 +----- src/motion/x86_asm/sad_mmx.asm | 6 +----- src/motion/x86_asm/sad_sse2.asm | 6 +----- src/motion/x86_asm/sad_xmm.asm | 6 +----- src/nasm.inc | 9 +++++++++ src/plugins/x86_asm/plugin_ssim-a.asm | 4 +--- src/quant/x86_asm/quantize_h263_3dne.asm | 5 +---- src/quant/x86_asm/quantize_h263_mmx.asm | 6 +----- src/quant/x86_asm/quantize_mpeg_mmx.asm | 6 +----- src/quant/x86_asm/quantize_mpeg_xmm.asm | 6 +----- src/utils/x86_asm/cpuid.asm | 5 +---- src/utils/x86_asm/interlacing_mmx.asm | 6 +----- src/utils/x86_asm/mem_transfer_3dne.asm | 6 +----- src/utils/x86_asm/mem_transfer_mmx.asm | 6 +----- 38 files changed, 46 insertions(+), 163 deletions(-) Index: xvidcore-noexec-stack.patch =================================================================== RCS file: /cvs/free/rpms/xvidcore/F-13/xvidcore-noexec-stack.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xvidcore-noexec-stack.patch 12 Dec 2010 02:34:36 -0000 1.1 +++ xvidcore-noexec-stack.patch 10 Jan 2011 20:18:37 -0000 1.2 @@ -1,3 +1,27 @@ +diff -up xvidcore/build/generic/configure.in.noexec xvidcore/build/generic/configure.in +--- xvidcore/build/generic/configure.in.noexec 2010-12-31 11:53:22.000000000 +0100 ++++ xvidcore/build/generic/configure.in 2011-01-10 20:13:36.000000000 +0100 +@@ -271,7 +271,7 @@ case "$target_os" in + AC_MSG_RESULT([ok]) + STATIC_LIB="libxvidcore.\$(STATIC_EXTENSION)" + SHARED_LIB="libxvidcore.\$(SHARED_EXTENSION).\$(API_MAJOR).\$(API_MINOR)" +- SPECIFIC_LDFLAGS="-Wl,-soname,libxvidcore.\$(SHARED_EXTENSION).\$(API_MAJOR) -shared -Wl,--version-script=libxvidcore.ld -lc -lm" ++ SPECIFIC_LDFLAGS="-Wl,-soname,libxvidcore.\$(SHARED_EXTENSION).\$(API_MAJOR) -shared -Wl,--version-script=libxvidcore.ld,-z,noexecstack -lc -lm" + SPECIFIC_CFLAGS="-fPIC" + ;; + *bsd*|irix*) +diff -up xvidcore/build/generic/configure.noexec xvidcore/build/generic/configure +--- xvidcore/build/generic/configure.noexec 2010-12-31 11:53:22.000000000 +0100 ++++ xvidcore/build/generic/configure 2011-01-10 20:13:49.000000000 +0100 +@@ -3851,7 +3851,7 @@ case "$target_os" in + echo "${ECHO_T}ok" >&6 + STATIC_LIB="libxvidcore.\$(STATIC_EXTENSION)" + SHARED_LIB="libxvidcore.\$(SHARED_EXTENSION).\$(API_MAJOR).\$(API_MINOR)" +- SPECIFIC_LDFLAGS="-Wl,-soname,libxvidcore.\$(SHARED_EXTENSION).\$(API_MAJOR) -shared -Wl,--version-script=libxvidcore.ld -lc -lm" ++ SPECIFIC_LDFLAGS="-Wl,-soname,libxvidcore.\$(SHARED_EXTENSION).\$(API_MAJOR) -shared -Wl,--version-script=libxvidcore.ld,-z,noexecstack -lc -lm" + SPECIFIC_CFLAGS="-fPIC" + ;; + *bsd*|irix*) diff -up xvidcore/src/bitstream/x86_asm/cbp_mmx.asm.noexec-stack xvidcore/src/bitstream/x86_asm/cbp_mmx.asm --- xvidcore/src/bitstream/x86_asm/cbp_mmx.asm.noexec-stack 2009-05-28 10:42:37.000000000 +0200 +++ xvidcore/src/bitstream/x86_asm/cbp_mmx.asm 2010-12-12 03:21:50.000000000 +0100 Index: xvidcore.spec =================================================================== RCS file: /cvs/free/rpms/xvidcore/F-13/xvidcore.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- xvidcore.spec 12 Dec 2010 02:34:36 -0000 1.6 +++ xvidcore.spec 10 Jan 2011 20:18:37 -0000 1.7 @@ -1,6 +1,6 @@ Name: xvidcore Version: 1.2.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: MPEG-4 Simple and Advanced Simple Profile codec Group: System Environment/Libraries @@ -44,7 +44,6 @@ %build cd build/generic -export CFLAGS="$RPM_OPT_FLAGS -ffast-math" %configure make %{?_smp_mflags} cd - @@ -83,6 +82,10 @@ %changelog +* Mon Jan 10 2011 Dominik Mierzejewski <rpm at greysector.net> - 1.2.2-2 +- fix noexec stack issue on i686 (bug #1560) +- drop non-standard CFLAGS addition + * Sat Dec 11 2010 Dominik Mierzejewski <rpm at greysector.net> - 1.2.2-1 - 1.2.2 - rebase noexec-stack patch