Date: Monday, September 12, 2011 @ 02:25:33 Author: eric Revision: 137877
upgpkg: ogle 0.9.2-13 Rebuild against latest toolchain, Clean up PKGBUILD, Remove vulnerable debug scripts Added: ogle/trunk/ogle-vuln-scripts-makefile.patch Modified: ogle/trunk/PKGBUILD ----------------------------------+ PKGBUILD | 45 ++++++++++++++++++++----------------- ogle-vuln-scripts-makefile.patch | 36 +++++++++++++++++++++++++++++ 2 files changed, 61 insertions(+), 20 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2011-09-12 05:31:30 UTC (rev 137876) +++ PKGBUILD 2011-09-12 06:25:33 UTC (rev 137877) @@ -1,39 +1,44 @@ # $Id$ -# Maintainer: Eric Belanger <[email protected]> -# Contributor: Sarah Hay <[email protected]> +# Maintainer: Eric Bélanger <[email protected]> pkgname=ogle pkgver=0.9.2 -pkgrel=12 +pkgrel=13 pkgdesc="A simple DVD player for Linux" arch=('i686' 'x86_64') url="http://www.dtek.chalmers.se/groups/dvd/"; license=('GPL') -depends=('libxml2' 'libdvdread' 'libjpeg' 'libmad' 'libxinerama' 'libxv' - 'alsa-lib' 'a52dec' 'libsm' 'libxxf86vm') +depends=('sh' 'libxml2' 'libdvdread' 'libjpeg' 'libmad' 'libxinerama' 'libxv' + 'alsa-lib' 'a52dec' 'libxxf86vm') options=('!libtool') -source=(http://www.dtek.chalmers.se/groups/dvd/dist/${pkgname}-${pkgver}.tar.gz - xvideofix.patch - gcc34alsafix.patch - gcc4.patch - dvdread-4.1.3.patch) +# http://www.dtek.chalmers.se/groups/dvd/dist/${pkgname}-${pkgver}.tar.gz +source=(ftp://ftp.archlinux.org/other/ogle/${pkgname}-${pkgver}.tar.gz \ + xvideofix.patch gcc34alsafix.patch gcc4.patch dvdread-4.1.3.patch \ + ogle-vuln-scripts-makefile.patch) md5sums=('a76a9892bdb807a4bcf859d15a91f0f9' '57f1cf36eed82c56f24e9c0fc25ce2b3' '4ebc822b252fade6b53c5ceb5be45bf5' 'd08cff87c5ec41a7eebc0d2384835688' - '597906c64ff7f5185de8430fdae3107d') + '597906c64ff7f5185de8430fdae3107d' + 'd052b01f293c61d399fdd0ac2abb1cf4') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np0 -i "${srcdir}/dvdread-4.1.3.patch" || return 1 - patch -Np1 -i ../xvideofix.patch || return 1 - patch -Np1 -i ../gcc34alsafix.patch || return 1 - patch -Np1 -i ../gcc4.patch || return 1 + patch -p0 -i "${srcdir}/dvdread-4.1.3.patch" + patch -p1 -i "${srcdir}/xvideofix.patch" + patch -p1 -i "${srcdir}/gcc34alsafix.patch" + patch -p1 -i "${srcdir}/gcc4.patch" + patch -p0 -i "${srcdir}/ogle-vuln-scripts-makefile.patch" + # fix alsa detection - stolen from their cvs - sed -i 's|^.*MINOR\=\=5.*$|#if SND_LIB_MAJOR==0 && SND_LIB_MINOR<6|' configure || return 1 - sed -i 's|__diga_end:|\0;|' libogleao/alsa_audio.c || return 1 - ./configure --prefix=/usr --sysconfdir=/etc --mandir=/usr/share/man --with-x || return 1 - make || return 1 + sed -i 's|^.*MINOR\=\=5.*$|#if SND_LIB_MAJOR==0 && SND_LIB_MINOR<6|' configure + sed -i 's|__diga_end:|\0;|' libogleao/alsa_audio.c + ./configure --prefix=/usr --sysconfdir=/etc --mandir=/usr/share/man --with-x + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" export LIBRARY_PATH="${pkgdir}/usr/lib/ogle" - make DESTDIR="${pkgdir}" install || return 1 + make DESTDIR="${pkgdir}" install } Added: ogle-vuln-scripts-makefile.patch =================================================================== --- ogle-vuln-scripts-makefile.patch (rev 0) +++ ogle-vuln-scripts-makefile.patch 2011-09-12 06:25:33 UTC (rev 137877) @@ -0,0 +1,36 @@ +This patch inhibits the installation of debug scripts vulnerable to a symlink +attack, see bug 245921 for reference. + +--- scripts/Makefile.in.orig 2009-04-04 18:13:33.000000000 +0200 ++++ scripts/Makefile.in 2009-04-04 18:15:46.000000000 +0200 +@@ -133,10 +133,10 @@ + subdir = scripts + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_CLEAN_FILES = ogle +-SCRIPTS = $(bin_SCRIPTS) $(dist_pkglib_SCRIPTS) ++SCRIPTS = $(bin_SCRIPTS) + + DIST_SOURCES = +-DIST_COMMON = $(dist_pkglib_SCRIPTS) Makefile.am Makefile.in ogle.in ++DIST_COMMON = Makefile.am Makefile.in ogle.in + all: all-am + + .SUFFIXES: +@@ -279,7 +279,7 @@ + + install-data-am: + +-install-exec-am: install-binSCRIPTS install-dist_pkglibSCRIPTS ++install-exec-am: install-binSCRIPTS + + install-info: install-info-am + +@@ -295,7 +295,7 @@ + + mostlyclean-am: mostlyclean-generic mostlyclean-libtool + +-uninstall-am: uninstall-binSCRIPTS uninstall-dist_pkglibSCRIPTS \ ++uninstall-am: uninstall-binSCRIPTS \ + uninstall-info-am + + .PHONY: all all-am check check-am clean clean-generic clean-libtool \
