From 695eb1e119166357e81f84f54287a7ddd44e563a Mon Sep 17 00:00:00 2001
From: Eric Sandeen <sandeen@redhat.com>
Date: Feb 26 2018 15:59:32 +0000
Subject: Add BuildRequires: gcc


---

diff --git a/ncid.spec b/ncid.spec
index 5646481..908cd33 100644
--- a/ncid.spec
+++ b/ncid.spec
@@ -1,6 +1,6 @@
 Name:       ncid
 Version:    1.6
-Release:    6%{?dist}
+Release:    7%{?dist}
 Summary:    Network Caller ID server, client, and gateways
 
 Group:      Applications/Communications
@@ -9,12 +9,12 @@ License:    GPLv3+
 Url:        http://ncid.sourceforge.net
 Source0:    http://downloads.sourceforge.net/%{name}/%{name}-%{version}-src.tar.gz
 
+BuildRequires: gcc
 BuildRequires: libpcap-devel, perl-generators, perl-podlators
 %{?systemd_requires}
 BuildRequires: systemd
 
 
-
 %description
 NCID is Caller ID (CID) distributed over a network to a variety of
 devices and computers.  NCID includes a server, gateways, a client,
@@ -307,6 +307,9 @@ rm -fr $RPM_BUILD_DIR/%{name}
 %systemd_postun_with_restart ncid-speak.service
 
 %changelog
+* Mon Feb 26 2018 Eric Sandeen <sandeen@redhat.com> - 1.6-7
+- BuildRequires: gcc
+
 * Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.6-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
 
diff --git a/ncid/gateway/yac2ncid.sh b/ncid/gateway/yac2ncid.sh
deleted file mode 100644
index adf8ee1..0000000
--- a/ncid/gateway/yac2ncid.sh
+++ /dev/null
@@ -1,288 +0,0 @@
-#!/bin/bash
-##
-## YAC2NCID - YAC to NCID gateway service
-##
-## NOTE: This script requires netcat binary (nc) to operate
-##       The bash location in the first line must match the if test below
-##
-## Copyright (c) 2007, 2008
-## by Michael Lasevich(hichhiker)
-## Version: 1.0 (6/14/2007)
-## Version: 1.0a (6/26/2007)
-##
-## Version: 1.0.[123] (5/29/2008) by John L. Chmielewski
-## Copyright (c) 2010-2016
-## Last changed on Oct 12, 2016 by jlc
-##
-## Call Format Example: @CALLBush George W.~(212) 555-9384\0
-## Message Example:     Meet me for dinner at 8.\0
-##
-VERSION="(NCID) XxXxX"
-VERBOSE=
-
-ME="$(basename $0)"
-ME="${ME%.sh}"
-MYDIR="$(cd $(dirname $0) && pwd -P)"
-COMMAND="HELLO: CMD: no_log"
-IDENT="HELLO: IDENT: gateway yac2ncid $VERSION"
-
-##
-## usage() - display usage
-##
-
-usage(){
-    echo "Usage: yac2ncid [-v][-p <PIDFILE>]"
-    echo "       yac2ncid [-V]"
-}
-
-while getopts ":p:vV" opt ; do
-    case $opt in
-    p)
-      PIDFILE=$OPTARG
-      ;;
-    v)
-      VERBOSE="yes"
-      ;;
-    V)
-      echo $VERSION
-      exit 0
-      ;;
-    \?)
-      echo "Unknown option: -$OPTARG" >&2
-      usage
-      exit 0
-      ;;
-    esac
-done
-
-## Workaround for broken trap on TiVo
-## checking if date is 199?: broken bash
-## could also test for TiVo: /tvbin/tivoapp
-if /bin/bash --version | grep 199 > /dev/null
-then
-    # must use bash with broken trap
-	PIDFILE=/dev/null
-else
-    # trap should be OK
-    PIDFILE=${PIDFILE:-/var/run/yac2ncid.pid}
-
-    dienice(){
-        if test -f ${PIDFILE}
-        then
-            local line pid
-            echo >> ${PIDFILE}
-            read line < "${PIDFILE}"
-            for pid in $line ; do
-                [ -z "${pid//[0-9]/}" -a -d "/proc/$pid" ] &&
-                [ $pid != $$ ] &&
-                kill $pid
-            done
-		    rm -f ${PIDFILE}
-        fi
-        exit
-    }
-
-	trap dienice INT HUP QUIT TERM EXIT
-fi
-
-set -e
-
-CONFFILE=""
-
-ConfigDir=/usr/local/etc/ncid
-
-YACPORT=10629
-NCIDSERVER=localhost:3333
-LINE="YAC"
-NETCAT=
-
-NETCAT_SEND_OPTS=""
-NETCAT_LISTEN_OPTS="-p"
-
-NETCAT_BUSYBOX_SEND_OPTS=""
-NETCAT_BUSYBOX_LISTEN_OPTS="-p"
-
-NETCAT_HOBBIT_SEND_OPTS="-w1"
-NETCAT_HOBBIT_LISTEN_OPTS="-p"
-
-NETCAT_JACKSON_SEND_OPTS="-w1"
-NETCAT_JACKSON_LISTEN_OPTS=""
-
-NETCAT_BSD_SEND_OPTS="-w1"
-NETCAT_BSD_LISTEN_OPTS=""
-
-NETCAT_CUSTOM_SEND_OPTS="-w1"
-NETCAT_CUSTOM_LISTEN_OPTS="-p"
-
-NCIDHOST="localhost"
-NCIDPORT="3333"
-
-##
-## isblank(string) - returns true if string is blank
-##
-
-isblank(){
-	test "z${*}" == "z"
-}
-
-
-##
-## msg(string) - sends message
-##
-
-msg(){
-	isblank $VERBOSE ||\
-		echo ${ME}: $*
-	true
-}
-
-
-
-##
-## findfile(file, path) - find "file" in "path"
-##
-findfile(){
-	local filename="${1}"
-	local path="${2}"
-	local O_IFS="${IFS}"
-	local N_IFS=":"
-	local fullfile=""
-
-	IFS="${N_IFS}"
-	for location in ${path:-.}
-	do
-		IFS="${O_IFS}"
-		local fullfile="${location}/${filename}"
-		test -f "${fullfile}" &&\
-			echo ${fullfile} &&\
-			break
-		IFS="${N_IFS}"
-	done
-	IFS="${O_IFS}"
-}
-
-## Process a message
-procMSG(){
-	local nciddate=$(date +"%m%d%H%M")
-	local ncidname=""
-	local ncidnnumber=""
-
-	local NCIDMSG="${*}"	
-
-	if ! isblank $(echo "${*}" | grep '^@CALL')
-	then
-		ncidname=$(echo ${NCIDMSG} | cut -c6- | cut -d'~' -f1);
-		ncidnumber=$(echo ${NCIDMSG} | cut -s -d'~' -f2-);
-		NCIDMSG="$(printf 'CALL: ###DATE%s...LINE%s...NMBR%s...NAME%s+++' "${nciddate:-01010000}" "${LINE:--}" "${ncidnumber:-unlisted}" "${ncidname:-noname}")"
-    elif ! isblank "${*}"
-    then
-        NCIDMSG="MSG: ${NCIDMSG}"
-	fi	
-  	echo -e "${IDENT}\n${COMMAND}\n${NCIDMSG}" | send2ncid
-}
-
-
-
-## send stdin to ncidd server
-send2ncid(){
-	${NETCAT:-nc} ${NETCAT_SEND_OPTS} ${NCIDHOST:-localhost} ${NCIDPORT:-3333} >/dev/null
-}
-
-
-## Check command line options
-
-isblank $VERBOSE ||\
-	msg Enabling verbose mode due to command line option;\
-    msg Version ${VERSION}
-
-
-CONFFILE="$(findfile ${ME%.sh}.conf "${MYDIR}:${MYDIR}/../etc:${ConfigDir}:~:/etc")"
-
-isblank ${CONFFILE} &&\
-    msg ${ME%.sh}.conf not found ||\
-    {
-	    msg Using ${CONFFILE}
-        source ${CONFFILE}
-    }
-
-
-## Parse NCIDSERVER
-NCIDHOST="$(echo ${NCIDSERVER:-localhost} | cut -d: -f1)"
-NCIDPORT="$(echo ${NCIDSERVER:-localhost} | cut -s -d: -f2)"
-msg Using NCID host: ${NCIDHOST}
-msg Using NCID port: ${NCIDPORT}
-msg Using YAC port: ${YACPORT}
-
-
-## Make sure netcat is available
-isblank ${NETCAT} &&\
-	NETCAT=$(which nc 2>/dev/null || echo nc)
-
-! test -x ${NETCAT:=nc}  &&\
-	echo Unable to find netcat binary \(${NETCAT}\) &&\
-	exit -1
-
-if isblank ${NETCAT_TYPE}
-then
-	msg Auto-detecting the netcat type
-	if test "z$(${NETCAT:-nc} -h 2>&1  | head -1 |  cut -d' ' -f1)" == 'z[v1.10]'
-	then
-		msg Detected \*Hobbit\* version of netcat 
-		NETCAT_TYPE="HOBBIT"
-	elif ! isblank "$(${NETCAT:-nc} -h 2>&1 | grep BusyBox)"
-	then	
-		msg Detected BusyBox version of netcat 
-		NETCAT_TYPE="BUSYBOX"
-	elif ! isblank "$(${NETCAT:-nc} -h 2>&1 | egrep '[destination] [port]')"
-	then
-		msg Detected \"Eric Jackson\" version of netcat
-		NETCAT_TYPE="JACKSON"
-	elif ! isblank "$(${NETCAT:-nc} -h 2>&1 | grep '46DEdhklnrStUuvz')"
-	then
-		msg Detected \"BSD\" version of netcat
-		NETCAT_TYPE="BSD"
-	else
-		msg Unknown version of netcat, using CUSTOM values
-		NETCAT_TYPE="CUSTOM"
-	fi
-fi
-
-
-case "${NETCAT_TYPE:-CUSTOM}" in
-	"BUSYBOX"|"busybox")
-		msg Using BusyBox settings...
-		NETCAT_SEND_OPTS="${NETCAT_BUSYBOX_SEND_OPTS}"	
-		NETCAT_LISTEN_OPTS="${NETCAT_BUSYBOX_LISTEN_OPTS}"	
-		;;
-	"HOBBIT"|"hobbit")
-		msg Using Hobbit settings...
-		NETCAT_SEND_OPTS="${NETCAT_HOBBIT_SEND_OPTS}"	
-		NETCAT_LISTEN_OPTS="${NETCAT_HOBBIT_LISTEN_OPTS}"	
-		;;
-	"JACKSON"|"jackson")
-		msg Using Jackson settings...
-		NETCAT_SEND_OPTS="${NETCAT_JACKSON_SEND_OPTS}"	
-		NETCAT_LISTEN_OPTS="${NETCAT_JACKSON_LISTEN_OPTS}"	
-		;;
-	"BSD"|"BSD")
-		msg Using BSD settings...
-		NETCAT_SEND_OPTS="${NETCAT_BSD_SEND_OPTS}"	
-		NETCAT_LISTEN_OPTS="${NETCAT_BSD_LISTEN_OPTS}"	
-		;;
-	*)
-		msg Using custom settings...
-		NETCAT_SEND_OPTS="${NETCAT_CUSTOM_SEND_OPTS}"	
-		NETCAT_LISTEN_OPTS="${NETCAT_CUSTOM_LISTEN_OPTS}"	
-		;;
-	
-esac
-
-msg Listening for new connections
-## Main loop
-while true
-do
-	MSG=$(bash -c "echo \"\$\$ \">>${PIDFILE:-/tmp/ncpid} && exec ${NETCAT:-nc} -l ${NETCAT_LISTEN_OPTS} $YACPORT")
-	test "z" != "z${MSG}" &&\
-		msg Got a message &&\
-		procMSG "$MSG" &
-done