automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@60062 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 0f98c402adf55b47277466cafad410ed124fd92f..f87d9f979459bb87271f46c91453bf78a26a3f92 100644 (file)
--- 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 0ae2a24bf9851511878754d35390697caef1bc17..81927d76a29cd1f8e4d79214a2bca812f8eaab40 100755 (executable)
--- 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 <<EOF > $PPATH/asterisk.pc
 install_prefix=$INSTALL_PREFIX