On Sat, Jun 01, 2013 at 02:27:12PM +0600, Alexandr Shadchin wrote: > Hi, > > This update package xmp to the latest release 4.0.6. > For work need libxmp (port attached). > > Tested on amd64. > > Comments ? OK ? >
Ping. > -- > Alexandr Shadchin > > Index: Makefile > =================================================================== > RCS file: /cvs/ports/audio/xmp/Makefile,v > retrieving revision 1.52 > diff -u -p -r1.52 Makefile > --- Makefile 23 Apr 2013 13:10:46 -0000 1.52 > +++ Makefile 1 Jun 2013 08:24:36 -0000 > @@ -1,14 +1,8 @@ > # $OpenBSD: Makefile,v 1.52 2013/04/23 13:10:46 jasper Exp $ > > -SHARED_ONLY= Yes > +COMMENT= extended module player > > -COMMENT-main= extended module player > -COMMENT-xmms= extended module player plugin for XMMS > - > -DISTNAME= xmp-3.5.0 > -PKGNAME-main= ${DISTNAME} > -REVISION-main= 1 > -PKGNAME-xmms= xmms-${DISTNAME} > +DISTNAME= xmp-4.0.6 > CATEGORIES= audio > > HOMEPAGE= http://xmp.sourceforge.net/ > @@ -18,37 +12,29 @@ PERMIT_PACKAGE_CDROM= Yes > > MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xmp/} > > -MULTI_PACKAGES= -main -xmms > - > -MODULES= devel/gettext > +WANTLIB += c sndio xmp > > USE_GMAKE= Yes > USE_GROFF= Yes > > NO_TEST= Yes > > -LIB_DEPENDS-main= # empty > -RUN_DEPENDS-main= # empty > -WANTLIB-main= c m sndio > - > -LIB_DEPENDS-xmms= audio/xmms > -WANTLIB-xmms= X11 Xext Xi gdk glib gmodule gtk m xmms > ${MODGETTEXT_WANTLIB} > +LIB_DEPENDS= audio/libxmp > > CONFIGURE_STYLE= gnu > -MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC}/scripts > +MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC}/build-aux > CONFIGURE_ARGS+= --disable-alsa \ > - --disable-arts \ > - --disable-audacious-plugin \ > - --disable-esd \ > --disable-oss \ > - --disable-pulseaudio \ > - --enable-xmms-plugin > + --disable-pulseaudio > CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ > LDFLAGS="-L${LOCALBASE}/lib" > > +# disable sun audio detection > +CONFIGURE_ENV+= ac_cv_header_sys_audioio_h=no > + > MAKE_FLAGS+= V=1 > > FAKE_FLAGS= DESTDIR=${WRKINST} \ > - SYSCONFDIR=${PREFIX}/share/examples/xmp > + SYSCONFDIR=${PREFIX}/share/examples > > .include <bsd.port.mk> > Index: distinfo > =================================================================== > RCS file: /cvs/ports/audio/xmp/distinfo,v > retrieving revision 1.9 > diff -u -p -r1.9 distinfo > --- distinfo 22 Mar 2012 13:32:55 -0000 1.9 > +++ distinfo 1 Jun 2013 08:24:36 -0000 > @@ -1,5 +1,2 @@ > -MD5 (xmp-3.5.0.tar.gz) = R+VObfqIzjc3AFTUo+qVXw== > -RMD160 (xmp-3.5.0.tar.gz) = 7VG2stEEPGI4uh3wWru/WgMrS9M= > -SHA1 (xmp-3.5.0.tar.gz) = Bwe1hqRFtMOqtQ6xprn+tDGiCYM= > -SHA256 (xmp-3.5.0.tar.gz) = 4cfH+aWdp5AfKZ4bk7T/tK0Xcxy7jwnfXC1eqy7346M= > -SIZE (xmp-3.5.0.tar.gz) = 887671 > +SHA256 (xmp-4.0.6.tar.gz) = WJIkkCaAeKvkn+tHpEehF66Sn9dwCWkhi/qUsEiRA4E= > +SIZE (xmp-4.0.6.tar.gz) = 208541 > Index: patches/patch-configure > =================================================================== > RCS file: patches/patch-configure > diff -N patches/patch-configure > --- patches/patch-configure 22 Mar 2012 13:32:55 -0000 1.5 > +++ /dev/null 1 Jan 1970 00:00:00 -0000 > @@ -1,31 +0,0 @@ > -$OpenBSD: patch-configure,v 1.5 2012/03/22 13:32:55 dcoppa Exp $ > - > -Disable obsolete audio(4) driver > - > ---- configure.orig Thu Mar 22 13:06:27 2012 > -+++ configure Thu Mar 22 13:06:38 2012 > -@@ -5198,7 +5198,7 @@ done > - fi > - ;; > - openbsd*) > -- for ac_header in sndio.h sys/audio.h sys/audioio.h > -+ for ac_header in sndio.h > - do : > - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` > - ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" > "$ac_includes_default" > -@@ -5215,15 +5215,6 @@ done > - DRIVERS="${DRIVERS} sndio.o" > - LIBS="${LIBS} -lsndio" > - $as_echo "#define DRIVER_SNDIO 1" >>confdefs.h > -- > -- fi > -- if test "${ac_cv_header_sys_audio_h}" = "yes"; then > -- DRIVERS="${DRIVERS} openbsd.o" > -- $as_echo "#define DRIVER_OPENBSD 1" >>confdefs.h > -- > -- elif test "${ac_cv_header_sys_audioio_h}" = "yes"; then > -- DRIVERS="${DRIVERS} openbsd.o" > -- $as_echo "#define DRIVER_OPENBSD 1" >>confdefs.h > - > - fi > - ;; > Index: patches/patch-src_Makefile_in > =================================================================== > RCS file: patches/patch-src_Makefile_in > diff -N patches/patch-src_Makefile_in > --- /dev/null 1 Jan 1970 00:00:00 -0000 > +++ patches/patch-src_Makefile_in 1 Jun 2013 08:24:36 -0000 > @@ -0,0 +1,12 @@ > +$OpenBSD$ > +--- src/Makefile.in.orig Mon May 13 15:33:24 2013 > ++++ src/Makefile.in Mon May 13 15:35:36 2013 > +@@ -314,7 +314,7 @@ xmp_LDADD = ${libxmp_LIBS} $(am__append_3) $(am__appen > + $(am__append_21) $(am__append_23) > + xmp_LDFLAGS = ${XMP_DARWIN_LDFLAGS} > + man_MANS = xmp.1 > +-pkgsysconfdir = ${sysconfdir}/${PACKAGE_NAME} > ++pkgsysconfdir = ${SYSCONFDIR}/${PACKAGE_NAME} > + pkgsysconf_DATA = modules.conf xmp.conf > + > + # unused sources > Index: patches/patch-src_loaders_masi_load_c > =================================================================== > RCS file: patches/patch-src_loaders_masi_load_c > diff -N patches/patch-src_loaders_masi_load_c > --- patches/patch-src_loaders_masi_load_c 23 Apr 2013 13:10:46 -0000 > 1.1 > +++ /dev/null 1 Jan 1970 00:00:00 -0000 > @@ -1,19 +0,0 @@ > -$OpenBSD: patch-src_loaders_masi_load_c,v 1.1 2013/04/23 13:10:46 jasper Exp > $ > - > -CVE-2013-1980, libxmp MASI Parsing Buffer Overflow Vulnerability > - > - > ---- src/loaders/masi_load.c.orig Tue Apr 23 15:06:29 2013 > -+++ src/loaders/masi_load.c Tue Apr 23 15:06:49 2013 > -@@ -144,9 +144,9 @@ static void get_dsmp(struct xmp_context *ctx, int size > - i = cur_ins; > - m->xxi[i] = calloc(sizeof(struct xxm_instrument), 1); > - > -- fread(&m->xxih[i].name, 1, 34, f); > -+ fread(&m->xxih[i].name, 1, 31, f); > - str_adj((char *)m->xxih[i].name); > -- fseek(f, 5, SEEK_CUR); > -+ fseek(f, 8, SEEK_CUR); > - read8(f); /* insno */ > - read8(f); > - m->xxs[i].len = read32l(f); > Index: pkg/DESCR > =================================================================== > RCS file: pkg/DESCR > diff -N pkg/DESCR > --- /dev/null 1 Jan 1970 00:00:00 -0000 > +++ pkg/DESCR 1 Jun 2013 08:24:36 -0000 > @@ -0,0 +1,2 @@ > +xmp is a multi-format module player for UNIX. It supports more > +than 40 module formats, such as Soundtracker, Impulse Tracker, etc. > Index: pkg/DESCR-main > =================================================================== > RCS file: pkg/DESCR-main > diff -N pkg/DESCR-main > --- pkg/DESCR-main 20 Nov 2006 19:15:09 -0000 1.1 > +++ /dev/null 1 Jan 1970 00:00:00 -0000 > @@ -1,2 +0,0 @@ > -xmp is a multi-format module player for UNIX. It supports more > -than 40 module formats, such as Soundtracker, Impulse Tracker, etc. > Index: pkg/DESCR-xmms > =================================================================== > RCS file: pkg/DESCR-xmms > diff -N pkg/DESCR-xmms > --- pkg/DESCR-xmms 15 Dec 2003 21:42:13 -0000 1.2 > +++ /dev/null 1 Jan 1970 00:00:00 -0000 > @@ -1,4 +0,0 @@ > -xmp is a multi-format module player for UNIX. It supports more > -than 40 module formats, such as Soundtracker, Impulse Tracker, etc. > - > -This is an XMMS input plugin based on xmp. > Index: pkg/PLIST > =================================================================== > RCS file: pkg/PLIST > diff -N pkg/PLIST > --- /dev/null 1 Jan 1970 00:00:00 -0000 > +++ pkg/PLIST 1 Jun 2013 08:24:36 -0000 > @@ -0,0 +1,14 @@ > +@comment $OpenBSD$ > +@conflict xmp-bmp-* > +@pkgpath audio/xmp,-bmp > +@pkgpath audio/xmp,-main > +@pkgpath audio/xmp,-xmms > +@pkgpath audio/xmp,no_xmms > +@bin bin/xmp > +@man man/man1/xmp.1 > +share/examples/xmp/ > +@sample ${SYSCONFDIR}/xmp/ > +share/examples/xmp/modules.conf > +@sample ${SYSCONFDIR}/xmp/modules.conf > +share/examples/xmp/xmp.conf > +@sample ${SYSCONFDIR}/xmp/xmp.conf > Index: pkg/PLIST-main > =================================================================== > RCS file: pkg/PLIST-main > diff -N pkg/PLIST-main > --- pkg/PLIST-main 1 Apr 2013 17:16:32 -0000 1.4 > +++ /dev/null 1 Jan 1970 00:00:00 -0000 > @@ -1,13 +0,0 @@ > -@comment $OpenBSD: PLIST-main,v 1.4 2013/04/01 17:16:32 rpe Exp $ > -@conflict xmp-bmp-* > -@pkgpath audio/xmp,-bmp > -@pkgpath audio/xmp,no_xmms > -@pkgpath audio/xmp > -@bin bin/xmp > -@man man/man1/xmp.1 > -share/examples/xmp/ > -@sample ${SYSCONFDIR}/xmp/ > -share/examples/xmp/modules.conf > -@sample ${SYSCONFDIR}/xmp/modules.conf > -share/examples/xmp/xmp.conf > -@sample ${SYSCONFDIR}/xmp/xmp.conf > Index: pkg/PLIST-xmms > =================================================================== > RCS file: pkg/PLIST-xmms > diff -N pkg/PLIST-xmms > --- pkg/PLIST-xmms 23 Aug 2010 18:13:58 -0000 1.3 > +++ /dev/null 1 Jan 1970 00:00:00 -0000 > @@ -1,4 +0,0 @@ > -@comment $OpenBSD: PLIST-xmms,v 1.3 2010/08/23 18:13:58 jasper Exp $ > -lib/xmms/ > -lib/xmms/Input/ > -lib/xmms/Input/xmp-xmms.so -- Alexandr Shadchin