[arch-commits] Commit in libmikmod/repos (4 files)

[Allan McRae]

    Date: Wednesday, January 21, 2009 @ 06:26:59
  Author: allan
Revision: 24820

fix SVN conflict

Added:
  libmikmod/repos/extra-i686/libmikmod-CVE-2007-6720.patch
    (from rev 24819, libmikmod/trunk/libmikmod-CVE-2007-6720.patch)
  libmikmod/repos/extra-i686/libmikmod.install
    (from rev 24819, libmikmod/trunk/libmikmod.install)
Modified:
  libmikmod/repos/extra-i686/	(properties)
  libmikmod/repos/extra-i686/PKGBUILD

-------------------------------+
 PKGBUILD                      |   22 +++++++++++++++-------
 libmikmod-CVE-2007-6720.patch |   39 +++++++++++++++++++++++++++++++++++++++
 libmikmod.install             |   18 ++++++++++++++++++
 3 files changed, 72 insertions(+), 7 deletions(-)


Property changes on: libmikmod/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /libmikmod/trunk:1
   + /libmikmod/trunk:1-24819

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-01-21 11:22:36 UTC (rev 24819)
+++ extra-i686/PKGBUILD	2009-01-21 11:26:59 UTC (rev 24820)
@@ -1,22 +1,30 @@
 # $Id$
-# Maintainer: arjan <arjan at archlinux.org>
+# Maintainer: Allan McRae <allan at archlinux.org>
 # Contributor: Tom Newsom <Jeepster at gmx.co.uk>
+
 pkgname=libmikmod
 pkgver=3.1.12
-pkgrel=1
+pkgrel=2
 pkgdesc="A portable sound library"
 license=('GPL' 'LGPL')
 url="http://sourceforge.net/projects/mikmod/"
 arch=('i686' 'x86_64')
 depends=('glibc')
-source=(http://downloads.sourceforge.net/mikmod/${pkgname}-${pkgver}.tar.gz)
-md5sums=('9f3c740298260d5f88981fc0d51f6f16')
 options=('!libtool')
+install=$pkgname.install
+source=(http://downloads.sourceforge.net/mikmod/${pkgname}-${pkgver}.tar.gz
+        libmikmod-CVE-2007-6720.patch)
+md5sums=('9f3c740298260d5f88981fc0d51f6f16'
+         '0c1c21b3d04bfe0b917b60ad11b00e57')
 
 build() {
-  cd $startdir/src/$pkgname-$pkgver
-  missing_dir="`pwd`" ./configure --prefix=/usr
+  cd $srcdir/$pkgname-$pkgver
+  patch -Np1 -i $srcdir/libmikmod-CVE-2007-6720.patch
+  ./configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info
   make || return 1
-  make DESTDIR=$startdir/pkg install
+  make DESTDIR=$pkgdir install
+
+  rm $pkgdir/usr/share/info/dir
+  gzip -9 $pkgdir/usr/share/info/mikmod.info
 }
 

Copied: libmikmod/repos/extra-i686/libmikmod-CVE-2007-6720.patch (from rev 24819, libmikmod/trunk/libmikmod-CVE-2007-6720.patch)
===================================================================
--- extra-i686/libmikmod-CVE-2007-6720.patch	                        (rev 0)
+++ extra-i686/libmikmod-CVE-2007-6720.patch	2009-01-21 11:26:59 UTC (rev 24820)
@@ -0,0 +1,39 @@
+diff -Naur libmikmod-3.1.12-old/playercode/mplayer.c libmikmod-3.1.12/playercode/mplayer.c
+--- libmikmod-3.1.12-old/playercode/mplayer.c	2007-12-15 19:26:28.000000000 +1000
++++ libmikmod-3.1.12/playercode/mplayer.c	2009-01-21 18:53:59.000000000 +1000
+@@ -2318,7 +2318,7 @@
+ 	SAMPLE *s;
+ 
+ 	mod->totalchn=mod->realchn=0;
+-	for (channel=0;channel<md_sngchn;channel++) {
++	for (channel=0;channel<pf->numchn;channel++) {
+ 		aout=&mod->voice[channel];
+ 		i=aout->main.i;
+ 		s=aout->main.s;
+@@ -3086,7 +3086,7 @@
+ 		pf->patbrk=0;
+ 		pf->vbtick=pf->sngspd;
+ 
+-		for (t=0;t<md_sngchn;t++) {
++		for (t=0;t<pf->numchn;t++) {
+ 			Voice_Stop_internal(t);
+ 			pf->voice[t].main.i=NULL;
+ 			pf->voice[t].main.s=NULL;
+@@ -3111,7 +3111,7 @@
+ 		pf->patbrk=0;
+ 		pf->vbtick=pf->sngspd;
+ 
+-		for (t=0;t<md_sngchn;t++) {
++		for (t=0;t<pf->numchn;t++) {
+ 			Voice_Stop_internal(t);
+ 			pf->voice[t].main.i=NULL;
+ 			pf->voice[t].main.s=NULL;
+@@ -3138,7 +3138,7 @@
+ 		pf->sngpos=pos;
+ 		pf->vbtick=pf->sngspd;
+ 
+-		for (t=0;t<md_sngchn;t++) {
++		for (t=0;t<pf->numchn;t++) {
+ 			Voice_Stop_internal(t);
+ 			pf->voice[t].main.i=NULL;
+ 			pf->voice[t].main.s=NULL;

Copied: libmikmod/repos/extra-i686/libmikmod.install (from rev 24819, libmikmod/trunk/libmikmod.install)
===================================================================
--- extra-i686/libmikmod.install	                        (rev 0)
+++ extra-i686/libmikmod.install	2009-01-21 11:26:59 UTC (rev 24820)
@@ -0,0 +1,18 @@
+infodir=/usr/share/info
+filelist=(mikmod.info)
+
+post_install() {
+  for file in ${filelist[@]}; do
+    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
+  done
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  for file in ${filelist[@]}; do
+    install-info --delete $infodir/$file $infodir/dir 2> /dev/null
+  done
+}