From e70e937cb108601e3e525bc879c63c22f30954b1 Mon Sep 17 00:00:00 2001 From: Automerge Script Date: Tue, 3 Apr 2007 23:52:51 +0000 Subject: [PATCH] automerge commit git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@60062 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- channels/chan_sip.c | 2 +- mkpkgconfig | 18 ++++++++++++------ 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 0f98c402ad..f87d9f9794 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -5486,7 +5486,7 @@ static int transmit_notify_with_sipfrag(struct sip_pvt *p, int cseq) add_header(&req, "Subscription-state", "terminated;reason=noresource"); add_header(&req, "Content-Type", "message/sipfrag;version=2.0"); - strcpy(tmp, "SIP/2.0 200 OK"); + strcpy(tmp, "SIP/2.0 200 OK\r\n"); add_header_contentLength(&req, strlen(tmp)); add_line(&req, tmp); diff --git a/mkpkgconfig b/mkpkgconfig index 0ae2a24bf9..81927d76a2 100755 --- a/mkpkgconfig +++ b/mkpkgconfig @@ -13,14 +13,20 @@ if [ ! -d $PPATH ]; then exit fi -## Clean out CFLAGS for the spec file. +#Solaris (and some others) don't have sed -r. perl -p is equivalent +if [[ `echo "xxx" | sed -r 's/x/y/g' 2>/dev/null | grep -c "yyy"` != 0 ]]; then + EXTREGEX="sed -r -e" +else + EXTREGEX="perl -pe" +fi -LOCAL_CFLAGS=`echo $CFLAGS | sed -e 's/\s*-pipe\s*//g' | sed -e 's/-[Wmp]\S*\s*//g' | \ - sed -r -e 's/-I(include|\.\.\/include) //g' | \ - sed -e 's/-DINSTALL_PREFIX=\S* //g' | \ - sed -r -e 's/-DASTERISK_VERSION=\S* //g' | \ - sed -r -e 's/-DAST(ETCDIR|LIBDIR|VARLIBDIR|VARRUNDIR|SPOOLDIR|LOGDIR|CONFPATH|MODDIR|AGIDIR)=\S* //g'` +## Clean out CFLAGS for the spec file. +LOCAL_CFLAGS=`echo $CFLAGS | ${EXTREGEX} 's/\s*-pipe\s*//g' | ${EXTREGEX} 's/-[Wmp]\S*\s*//g' | \ + ${EXTREGEX} 's/-I(include|\.\.\/include) //g' | \ + ${EXTREGEX} 's/-DINSTALL_PREFIX=\S* //g' | \ + ${EXTREGEX} 's/-DASTERISK_VERSION=\S* //g' | \ + ${EXTREGEX} 's/-DAST(ETCDIR|LIBDIR|VARLIBDIR|VARRUNDIR|SPOOLDIR|LOGDIR|CONFPATH|MODDIR|AGIDIR)=\S* //g'` cat < $PPATH/asterisk.pc install_prefix=$INSTALL_PREFIX -- 2.47.2