1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-24 00:45:52 +00:00

Update to 12.17.6.

Changes in this release: numerous bugfixes.

Reviewed by and with:	Dan Nelson <dnelson@allantgroup.com>
This commit is contained in:
Christian Weisgerber 2004-10-16 01:59:03 +00:00
parent 0c1b8e27fe
commit 42e3953cf0
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=119557
4 changed files with 22 additions and 41 deletions

View File

@ -6,8 +6,7 @@
#
PORTNAME= sox
PORTVERSION= 12.17.4
PORTREVISION= 2
PORTVERSION= 12.17.6
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= sox
@ -20,6 +19,7 @@ CONFLICTS= play-*
MAN1= sox.1 play.1 soxexam.1
MLINKS= play.1 rec.1 sox.1 soxmix.1
GNU_CONFIGURE= yes
MAKE_ENV= PLAY_SUPPORT=1
.include <bsd.port.pre.mk>
@ -31,13 +31,14 @@ WITH_LAME= YES
WITH_MAD= YES
.endif
.if exists(${LOCALBASE}/lib/libvorbis.so.2)
.if exists(${LOCALBASE}/lib/libvorbis.so.3)
WITH_VORBIS= YES
.endif
.if defined(WITH_VORBIS) || defined(WITH_LAME) || defined(WITH_MAD)
CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
CFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ENV+= CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
.endif
.if defined(WITH_VORBIS)

View File

@ -1,2 +1,2 @@
MD5 (sox-12.17.4.tar.gz) = 39bdb64e06a8c456057e87eff7d0b339
SIZE (sox-12.17.4.tar.gz) = 417497
MD5 (sox-12.17.6.tar.gz) = ea368e7baf6618a2116f3ed6c111bd4a
SIZE (sox-12.17.6.tar.gz) = 444125

View File

@ -1,11 +1,15 @@
--- Makefile.in~ Sat Feb 8 08:39:19 2003
+++ Makefile.in Thu Mar 27 22:24:53 2003
@@ -28,7 +28,7 @@
GSM_LIB_1 = -lgsm
GSM_SUPPORT = @GSM_SUPPORT@
-CFLAGS = @CFLAGS@ -I$(srcdir) -I$(builddir)
+CFLAGS = @CFLAGS@ @CPPFLAGS@ -I$(srcdir) -I$(builddir)
LDFLAGS = -L. -L./gsm @LDFLAGS@
LIBS = -lst $(GSM_LIB_$(GSM_SUPPORT)) @LIBS@
$FreeBSD$
--- Makefile.in.orig
+++ Makefile.in
@@ -27,6 +27,9 @@
nroff -man $(srcdir)/soxexam.1 | col -b > soxexam.txt
nroff -man $(srcdir)/libst.3 | col -b > libst.txt
+PLAY_INSTALL_0 =
+PLAY_INSTALL_1 = install-play
+
install: $(PLAY_INSTALL_$(PLAY_SUPPORT))
cd src && $(MAKE) $@
$(srcdir)/mkinstalldirs $(mandir)/man1

View File

@ -1,24 +0,0 @@
--- wav.c.old 2002-12-31 04:19:22.000000000 +0100
+++ wav.c 2004-07-18 19:25:46.000000000 +0200
@@ -917,6 +917,10 @@
} else if(strncmp(magic,"ICRD",4) == 0){
st_readdw(ft,&len);
len = (len + 1) & ~1;
+ if (len > 254) {
+ fprintf(stderr, "Possible buffer overflow hack attack (ICRD)!\n");
+ exit(109);
+ }
st_reads(ft,text,len);
if (strlen(ft->comment) + strlen(text) < 254)
{
@@ -926,6 +930,10 @@
} else if(strncmp(magic,"ISFT",4) == 0){
st_readdw(ft,&len);
len = (len + 1) & ~1;
+ if (len > 254) {
+ fprintf(stderr, "Possible buffer overflow hack attack (ISFT)!\n");
+ exit(110);
+ }
st_reads(ft,text,len);
if (strlen(ft->comment) + strlen(text) < 254)
{