From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Nov 7 06:20:01 2007 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A4BA416A468 for ; Wed, 7 Nov 2007 06:20:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 7ACEE13C48E for ; Wed, 7 Nov 2007 06:20:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.1/8.14.1) with ESMTP id lA76K1AW094595 for ; Wed, 7 Nov 2007 06:20:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.1/8.14.1/Submit) id lA76K1lV094594; Wed, 7 Nov 2007 06:20:01 GMT (envelope-from gnats) Resent-Date: Wed, 7 Nov 2007 06:20:01 GMT Resent-Message-Id: <200711070620.lA76K1lV094594@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, "Anish Mistry" Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CAFA816A419 for ; Wed, 7 Nov 2007 06:16:44 +0000 (UTC) (envelope-from amistry@am-productions.biz) Received: from flpi185.prodigy.net (flpi185.sbcis.sbc.com [207.115.20.187]) by mx1.freebsd.org (Postfix) with ESMTP id B945813C48E for ; Wed, 7 Nov 2007 06:16:44 +0000 (UTC) (envelope-from amistry@am-productions.biz) Received: from bigguy.am-productions.biz (adsl-68-252-59-152.dsl.wotnoh.ameritech.net [68.252.59.152]) by flpi185.prodigy.net (8.13.8 out.dk.spool/8.13.8) with ESMTP id lA765wkS009300 for ; Tue, 6 Nov 2007 22:05:59 -0800 Message-Id: <1194415799.11440@bigguy.am-productions.biz> Date: Wed, 7 Nov 2007 01:09:59 -0500 From: "Anish Mistry" To: "FreeBSD gnats submit" X-Send-Pr-Version: gtk-send-pr 0.4.8 Cc: Subject: ports/117885: Update net/iaxmodem to 0.3.2 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 07 Nov 2007 06:20:01 -0000 >Number: 117885 >Category: ports >Synopsis: Update net/iaxmodem to 0.3.2 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Wed Nov 07 06:20:00 UTC 2007 >Closed-Date: >Last-Modified: >Originator: Anish Mistry >Release: FreeBSD 7.0-BETA2 i386 >Organization: AM Productions >Environment: System: FreeBSD 7.0-BETA2 #9: Mon Nov 5 14:20:27 EST 2007 amistry@bigguy.am-productions.biz:/usr/home/amistry/storage/temp/usr/home/amistry/windows-share/build/src/sys/BIGGUY >Description: Update to 0.3.2. Add strndup code. Remove the Makefile.in and configure. I've only compiled tested this update. I'm not going to have access to my fax gateway until this weekend. Sending this now incase someone is interested in testing. >How-To-Repeat: >Fix: --- iaxmodem-0.3.2.patch begins here --- diff -ruN iaxmodem.orig/Makefile iaxmodem/Makefile --- iaxmodem.orig/Makefile 2007-11-06 23:50:27.000000000 -0500 +++ iaxmodem/Makefile 2007-11-07 00:44:48.000000000 -0500 @@ -6,7 +6,7 @@ # PORTNAME= iaxmodem -PORTVERSION= 0.1.14 +PORTVERSION= 0.3.2 CATEGORIES= net comms MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -29,8 +29,6 @@ post-patch: @${REINPLACE_CMD} -e "s|/usr/local/etc|${PREFIX}/etc|g" ${WRKSRC}/iaxmodem.1 @${REINPLACE_CMD} -e "s|/etc/iaxmodem|${PREFIX}/etc/iaxmodem|g" ${WRKSRC}/iaxmodem.c - @${CP} ${FILESDIR}/configure ${FILESDIR}/Makefile.in ${WRKSRC}/ - @${CHMOD} a+x ${WRKSRC}/configure do-install: ${INSTALL_PROGRAM} ${WRKSRC}/iaxmodem ${PREFIX}/sbin/ && \ diff -ruN iaxmodem.orig/distinfo iaxmodem/distinfo --- iaxmodem.orig/distinfo 2007-11-06 23:50:27.000000000 -0500 +++ iaxmodem/distinfo 2007-11-06 23:51:22.000000000 -0500 @@ -1,3 +1,3 @@ -MD5 (iaxmodem-0.1.14.tar.gz) = 00cf7a266da5633fa67b3706944fca30 -SHA256 (iaxmodem-0.1.14.tar.gz) = f1dbce6f2fbab8e53ef84c160f06f891463a8d8dfc0f5155c6e697663179e0f8 -SIZE (iaxmodem-0.1.14.tar.gz) = 2058627 +MD5 (iaxmodem-0.3.2.tar.gz) = ab4ecc268e521585d1d1e9fcca912e4d +SHA256 (iaxmodem-0.3.2.tar.gz) = 4aa48291f38bb400285c6e236a8caf868b25e1e65df4f600d36ea493c8f35e9e +SIZE (iaxmodem-0.3.2.tar.gz) = 2229564 diff -ruN iaxmodem.orig/files/Makefile.in iaxmodem/files/Makefile.in --- iaxmodem.orig/files/Makefile.in 2007-11-06 23:50:27.000000000 -0500 +++ iaxmodem/files/Makefile.in 1969-12-31 19:00:00.000000000 -0500 @@ -1,32 +0,0 @@ -MODEMVER= iaxmodem-0.1.14 -DSPVER= @DSPVER@ -IAXVER= @IAXVER@ - -CFLAGS:= -DMODEMVER=\"${MODEMVER}\" -DDSPVER=\"${DSPVER}\" -DIAXVER=\"${IAXVER}\" \ - -Wall -g -DSTATICLIBS -D_GNU_SOURCE \ - -std=c99 -Ilib/libiax2/src -Ilib/spandsp/src \ - ${CFLAGS} -OUR_CFLAGS= -Wall -g -DSTATICLIBS -D_GNU_SOURCE \ - -std=c99 -Ilib/libiax2/src -Ilib/spandsp/src -OBJS= iaxmodem.o lib/spandsp/src/.libs/libspandsp.a lib/libiax2/src/.libs/libiax.a -LDFLAGS+= -lm -lutil -ltiff - -all: iaxmodem - -iaxmodem: build-libiax build-libspandsp iaxmodem.o - ${CC} ${CFLAGS} ${OBJS} -o iaxmodem ${LDFLAGS} - -iaxmodem.o: iaxmodem.c - ${CC} ${CFLAGS} -c iaxmodem.c - -build-libiax: - cd lib/libiax2 && ${MAKE} - -build-libspandsp: - cd lib/spandsp && ${MAKE} - -clean: - rm -f *.o && \ - cd lib/libiax2 && ${MAKE} clean && \ - cd ../../lib/spandsp && ${MAKE} clean - diff -ruN iaxmodem.orig/files/configure iaxmodem/files/configure --- iaxmodem.orig/files/configure 2007-11-06 23:50:27.000000000 -0500 +++ iaxmodem/files/configure 1969-12-31 19:00:00.000000000 -0500 @@ -1,30 +0,0 @@ -#!/bin/sh -cd lib/libiax2 && \ -./configure CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" --disable-shared && \ -cd ../../lib/spandsp && \ -./configure CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" --disable-shared && \ -cd ../.. - -if [ $? != 0 ]; then - exit 1 -fi - -STEP1=`grep @VERSION@ lib/spandsp/config.status | sed 's/;.*//g'` -DSPVER=`echo "@VERSION@" | sed ${STEP1}` -if [ -n "${DSPVER}" ]; then - DSPVER="spandsp-${DSPVER}-snapshot-20060707+" -fi -STEP1=`grep @VERSION@ lib/libiax2/config.status | sed 's/;.*//g'` -IAXVER=`echo "@VERSION@" | sed ${STEP1}` -if [ -n "${IAXVER}" ]; then - IAXVER="libiax2-${IAXVER}-CVS-20060222+" -fi - -cat Makefile.in | sed -e "s/@DSPVER@/${DSPVER}/g" | \ - sed -e "s/@IAXVER@/${IAXVER}/g" > Makefile - -echo ${IAXVER} -echo ${DSPVER} - -exit $? - diff -ruN iaxmodem.orig/files/patch-iaxmodem.c iaxmodem/files/patch-iaxmodem.c --- iaxmodem.orig/files/patch-iaxmodem.c 2007-11-06 23:50:27.000000000 -0500 +++ iaxmodem/files/patch-iaxmodem.c 2007-11-07 00:43:09.000000000 -0500 @@ -1,29 +1,51 @@ ---- iaxmodem.c.orig Mon Jul 31 15:29:29 2006 -+++ iaxmodem.c Fri Aug 11 20:23:50 2006 -@@ -17,12 +17,14 @@ - */ - #include +--- iaxmodem.c.orig 2007-10-06 12:22:04.000000000 -0400 ++++ iaxmodem.c 2007-11-06 23:54:40.000000000 -0500 +@@ -21,17 +21,18 @@ #include + #include + -#ifndef __OpenBSD__ +#if !defined(__OpenBSD__) && !defined(__FreeBSD__) - #include + # ifndef USE_UNIX98_PTY + # include + # endif /* !USE_UNIX98_PTY */ #else - #include ++#include +#if !defined(__FreeBSD__) - #include + # include #endif +#endif + + +-#include +- #include #include #include -@@ -44,6 +46,10 @@ +@@ -53,6 +54,26 @@ #include #include + +#ifdef __FreeBSD__ +#include ++char* strndup(const char* string, size_t n) ++{ ++ char* copy_string = 0; ++ ++ if(0 == string || 0 == n) ++ return 0; ++ ++ copy_string = (char*) malloc(n + 1); ++ if(0 == copy_string) ++ return 0; ++ ++ memcpy(copy_string, string, n); ++ *(copy_string + n) = '\0'; ++ ++ return copy_string; ++} +#endif #include - #include + #ifndef O_LARGEFILE diff -ruN iaxmodem.orig/files/patch-lib_spandsp_src_spandsp_t4.h iaxmodem/files/patch-lib_spandsp_src_spandsp_t4.h --- iaxmodem.orig/files/patch-lib_spandsp_src_spandsp_t4.h 2007-11-06 23:50:27.000000000 -0500 +++ iaxmodem/files/patch-lib_spandsp_src_spandsp_t4.h 2007-11-06 23:59:03.000000000 -0500 @@ -1,11 +1,11 @@ ---- lib/spandsp/src/spandsp/t4.h.orig Mon Jun 12 15:54:34 2006 -+++ lib/spandsp/src/spandsp/t4.h Thu Jun 15 14:17:20 2006 -@@ -28,6 +28,8 @@ +--- lib/spandsp/src/spandsp/t4.h.orig 2007-10-05 20:00:19.000000000 -0400 ++++ lib/spandsp/src/spandsp/t4.h 2007-11-06 23:57:56.000000000 -0500 +@@ -27,6 +27,8 @@ /*! \file */ +#include + - #if !defined(_T4_H_) - #define _T4_H_ + #if !defined(_SPANDSP_T4_H_) + #define _SPANDSP_T4_H_ --- iaxmodem-0.3.2.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: