rpms/sipwitch/devel import.log, NONE, 1.1 sipwitch.patch, NONE, 1.1 sipwitch.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

[David Sugar]

Author: dyfet

Update of /cvs/pkgs/rpms/sipwitch/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11920/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log sipwitch.patch sipwitch.spec 
Log Message:
* Wed May 13 2009 - David Sugar <dyfet at gnutelephony.org> - 0.5.4-3
- Initial checkin of GNU SIP Witch into rawhide



--- NEW FILE import.log ---
sipwitch-0_5_4-3_fc10:HEAD:sipwitch-0.5.4-3.fc10.src.rpm:1242253659

sipwitch.patch:

--- NEW FILE sipwitch.patch ---
Index: server/sipwitch.init
===================================================================
--- server/sipwitch.init	(revision 886)
+++ server/sipwitch.init	(working copy)
@@ -12,7 +12,7 @@
 # sipwitch        This shell script takes care of starting and stopping
 #                 a sipwitch server running as a system service.
 #
-# chkconfig: 2345 95 15
+# chkconfig: - 95 15
 # description: GNU SIP Witch telephony service.
 
 DAEMON="/usr/sbin/sipw"
@@ -58,6 +58,15 @@
 if [ ! -z "$PRIORITY" ] ; then
	export PRIORITY ; fi
 
+if [ ! -z "$PRELOAD" ] ; then		
+	if [ -z "$LD_PRELOAD" ] ; then
+		LD_PRELOAD="$PRELOAD"
+	else
+		LD_PRELOAD="$LD_PRELOAD:$PRELOAD"
+	fi
+	export LD_PRELOAD
+fi
+
 case "$1" in
 start)
	if [ "$START" = "0" ] ; then
@@ -68,15 +77,6 @@
		fi
		exit 0
	fi
-
-	if [ ! -z "$PRELOAD" ] ; then		
-		if [ -z "$LD_PRELOAD" ] ; then
-			LD_PRELOAD="$PRELOAD"
-		else
-			LD_PRELOAD="$LD_PRELOAD:$PRELOAD"
-		fi
-		export LD_PRELOAD
-	fi
	
	if [ -p $FIFO ] ; then
		echo "already started"
@@ -86,6 +86,7 @@
	echo -n "Starting $DESC: "
	$DAEMON $OPTIONS
	echo "$NAME."
+	touch /var/lock/subsys/sipwitch
	;;
 stop)
	if [ ! -p $FIFO ] ; then
@@ -94,6 +95,17 @@
	echo -n "Stopping $DESC: "
	echo "down" >$FIFO
	echo "$NAME."
+	rm -f /var/lock/subsys/sipwitch
+	;;
+status)
+	sipwitch status
+	;;
+condrestart|try-restart)
+	if [ -p $FIFO ] ; then
+		echo "down" >$FIFO
+		sleep 3
+		$DAEMON $OPTIONS
+	fi
	;;
 reload)
	if [ ! -p $FIFO ] ; then
@@ -104,9 +116,11 @@
	;;
 restart|force-reload)
	echo -n "Restarting $DESC: "
-	start-stop-daemon --stop --quiet --exec $DAEMON
-	sleep 3
-	start-stop-daemon --start --quiet --exec $DAEMON -- $OPTIONS
+	if [ -p $FIFO ] ; then
+		echo "down" >$FIFO
+		sleep 3
+	fi
+	$DAEMON $OPTIONS
	echo "$NAME."
	;;
 *)
Index: swig/Makefile.am
===================================================================
--- swig/Makefile.in	(revision 886)
+++ swig/Makefile.in	(working copy)
@@ -413,9 +413,10 @@
 python-swig: swig-clean
 	swig -c++ -python @INCLUDE_FLAGS@ -I$(top_srcdir)/inc -o wrapper.cpp swig.i	
 	LDFLAGS="@LDFLAGS@ @UCOMMON_CLINK@" CFLAGS="@SIPWITCH_FLAGS@ -I$(abs_top_srcdir)/inc -I$(abs_top_srcdir)" python setup.py build_ext --inplace --swig-opts=-c++ -lucommon
-	$(mkinstalldirs) $(DESTDIR)`python -c 'import sys; path = sys.prefix + "/lib/python" + sys.version[:3] + "/site-packages" ; print path'`
-	$(STRIP) _sipwitch.so
-	$(INSTALL) sipwitch.py _sipwitch.so $(DESTDIR)`python -c 'import sys; path = sys.prefix + "/lib/python" + sys.version[:3] + "/site-packages" ; print path'`
+	$(mkinstalldirs) $(DESTDIR)`python -c 'from distutils.sysconfig import get_python_lib; print get_python_lib()'`
+	$(mkinstalldirs) $(DESTDIR)`python -c 'from distutils.sysconfig import get_python_lib; print get_python_lib(1)'`
+	$(INSTALL_DATA) sipwitch.py $(DESTDIR)`python -c 'from distutils.sysconfig import get_python_lib; print get_python_lib()'`
+	$(INSTALL) _sipwitch.so $(DESTDIR)`python -c 'from distutils.sysconfig import get_python_lib; print get_python_lib(1)'`
 
 php5-swig: swig-clean
 	swig -c++ -php5 @INCLUDE_FLAGS@ -I$(top_srcdir)/inc -o wrapper.cpp swig.i


--- NEW FILE sipwitch.spec ---
# Copyright (c) 2008, 2009 David Sugar, Tycho Softworks.
# This file is free software; as a special exception the author gives
# unlimited permission to copy and/or distribute it, with or without
# modifications, as long as this notice is preserved.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.

%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}

Name: sipwitch
Summary: SIP telephony server for secure phone systems
Version: 0.5.4
Release: 3%{?dist}
License: GPLv3+
URL: http://www.gnu.org/software/sipwitch
Group: Applications/Communications
Source: http://www.gnutelephony.org/dist/tarballs/sipwitch-%{version}.tar.gz
Patch: sipwitch.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildRequires: ucommon-devel >= 2.0.0
BuildRequires: libeXosip2-devel >= 3.0.0
BuildRequires: swig >= 1.3.30
BuildRequires: python-devel
BuildRequires: php-devel >= 5.0.0
BuildRequires: avahi-devel
BuildRequires: libgcrypt-devel
Requires(post): chkconfig
Requires(preun): chkconfig
Requires(preun): initscripts
Requires(postun): initscripts

%package devel
Requires: ucommon-devel >= 2.0.0
Requires: %{name} = %{version}-%{release}
Group: Development/Libraries
Summary: Headers for building sipwitch plugins

%package snmp
Requires: net-snmp
Group: Applications/Internet
Summary: Standard MIB for GNU Telephony

%package plugin-zeroconf
Requires: %{name} = %{version}-%{release}
Summary: Zeroconf plugin for sipwitch

%package python-swig
Requires: python
Requires: %{name} = %{version}-%{release}
Summary: Python package to control sipwitch server

%package php-swig
Requires: php
Requires: %{name} = %{version}-%{release}
Summary: PHP package to control sipwitch server

%package plugin-scripting
Requires: %{name} = %{version}-%{release}
Summary: Scripting plugin for sipwitch

%package plugin-forward
Requires: %{name} = %{version}-%{release}
Summary: Forward registration and routing plugin

%package plugin-rtpproxy
Requires: %{name} = %{version}-%{release}
Summary: Generic rtp proxy plugin for sipwitch

%package plugin-subscriber
Requires: %{name} = %{version}-%{release}
Summary: Subscriber gateway plugin for sipwitch

%description
GNU SIP Witch is a pure SIP-based office telephone call server that supports
generic phone system features like call forwarding, hunt groups and call
distribution, call coverage and ring groups, holding, and call transfer, as
well as offering SIP specific capabilities such as presence and messaging. It
supports secure telephone extensions for making calls over the Internet, and
intercept/decrypt-free peer-to-peer audio and video extensions. It is not a 
SIP proxy, a multi-protocol telephone server, or an IP-PBX, and does not try 
to emulate Asterisk, FreeSWITCH, or Yate. 

%description devel
Header files for building plugins that interface with sipwitch. This might be 
used for externally creating sipwitch modules, though normally modules are 
found or added to the core distribution directly.  This may also be for 
developing external application services which need to communicate with a 
running sipwitch daemon instance.

%description snmp
This is the standard GNU Telephony MIB.  It can be used to monitor sipwitch
servers from a snmp management station when we add snmp support.

%description plugin-zeroconf
This plugin activates zeroconf network services for sipwitch and publishes
sipwitch as a sip server.

%description python-swig
This module allows one to interact with and control a locally running 
instance of the GNU SIP Witch daemon using python.  This can be used to
create sipwitch admininstration scripts or python web services that
interact with the locally running instance of sipwitch.

%description php-swig
This extension allows one to interact with and control a locally running 
instance of the GNU SIP Witch daemon using php.  This can be used to
create sipwitch admininstration scripts or php web services that
interact with the locally running instance of sipwitch.

%description plugin-scripting
This plugin enables shell scripting in connection with specific sipwitch 
events.

%description plugin-forward
This plugin enables forwarding of registration requests and destination routes
for unknown numbers so that one can create a "secure" peer to peer media
domain managed by sipwitch and still access an "insecure" b2bua based ip-pbx.

%description plugin-rtpproxy
Generic assignment of RTP proxy for packet forwarding when local and
remote caller is not directly routable.  This can include briding when
both source and destination are offsite or on different subnets.  This
will enable calls between local users and remote users when either or
both parties are behind NAT.  It is assumed a block of rtp ports (and 
the sip port) will be "port forwarded" to sipwitch.  All proxying is 
transparent and hence directly usable for secure calling with ZRTP.

%description plugin-subscriber
This module is meant to eventually offer generic support for premise 
routers when used by providers to offer sip/voip service to a subscriber.
It offers rtp proxying and routing based on the assumption that all calls
will be handed off to an external voip provider and automatic rtp
proxy bridging between a subscribers local subnet and an isp.  In theory
this would be deployed in an isp supplied premise router to enable a 
local user to subscribe a series of local softphone/sip devices with a 
remote voip service provider.

%prep
%setup -q
%patch 
sed -i.rpath -e \
  '/sys_lib_dlsearch_path_spec/s|/usr/lib |/usr/lib /usr/lib64 /lib /lib64 |' \
  configure

%build
# Temporary hack until resolved upstream
export STRIP=/bin/true

%configure --with-pkg-config --disable-static
%{__make} %{?_smp_mflags} 

%install
%{__rm} -rf %{buildroot}
%{__make} DESTDIR=%{buildroot} INSTALL="install -p" install
%{__make} DESTDIR=%{buildroot} INSTALL="install -p" swig-python
%{__make} DESTDIR=%{buildroot} INSTALL="install -p" swig-php5
%{__rm} -f %{buildroot}/%{_libdir}/*.la
%{__rm} -f %{buildroot}/%{_libdir}/sipwitch/*.la

# Temporary hack, next upstream release has configure --with-initrddir=...
%{__mkdir_p} %{buildroot}%{_initrddir}
%{__mv} -f %{buildroot}%{_sysconfdir}/init.d/* %{buildroot}%{_initrddir}
rmdir %{buildroot}%{_sysconfdir}/init.d/

%clean
%{__rm} -rf %{buildroot}

%files 
%defattr(-,root,root,-)
%doc README COPYING NEWS FEATURES SUPPORT TODO NOTES AUTHORS MODULES ChangeLog
%{_mandir}/man8/*.8*
%{_sbindir}/*
%{_bindir}/*
%{_libdir}/*.so.*
%dir %{_libdir}/sipwitch
%config(noreplace) %{_sysconfdir}/logrotate.d/sipwitch
%attr(0755,root,root) %{_initrddir}/sipwitch
%attr(0755,root,root) %{_sysconfdir}/cron.hourly/sipwitch
%attr(0770,root,root) %dir %{_sysconfdir}/sipwitch.d
%attr(0660,root,root) %config(noreplace) %{_sysconfdir}/sipwitch.conf
%attr(0660,root,root) %config(noreplace) %{_sysconfdir}/sysconfig/sipwitch
%attr(0660,root,root) %config(noreplace) %{_sysconfdir}/sipwitch.d/*.xml

%files snmp
%defattr(-,root,root,-)
%{_datadir}/snmp/mibs/GNUTelephony-MIB.txt

%files plugin-zeroconf
%defattr(-,root,root,-)
%{_libdir}/sipwitch/zeroconf.so

%files python-swig
%defattr(-,root,root,-)
%{python_sitelib}/sipwitch.py*
%{python_sitearch}/_sipwitch.so

%files php-swig
%defattr(-,root,root,-)
%{php_extdir}/sipwitch.so

%files plugin-forward
%defattr(-,root,root,-)
%{_libdir}/sipwitch/forward.so

%files plugin-scripting
%defattr(-,root,root,-)
%{_libdir}/sipwitch/scripting.so

%files plugin-rtpproxy
%defattr(-,root,root,-)
%{_libdir}/sipwitch/rtpproxy.so

%files plugin-subscriber
%defattr(-,root,root,-)
%{_libdir}/sipwitch/subscriber.so

%files devel
%defattr(-,root,root,-)
%{_libdir}/*.so
%{_includedir}/sipwitch/
%{_libdir}/pkgconfig/*.pc

%post
/sbin/ldconfig
/sbin/chkconfig --add sipwitch

%preun
if [ $1 = 0 ] ; then
    /sbin/service sipwitch stop >/dev/null 2>&1
    /sbin/chkconfig --del sipwitch
fi

%postun 
if [ "$1" -ge "1" ] ; then
    /sbin/service sipwitch condrestart >/dev/null 2>&1 || :
fi
/sbin/ldconfig

%changelog
* Sun May 10 2009 - David Sugar <dyfet at gnutelephony.org> - 0.5.4-3
- new generic init script layout as a patch until next upstream release.

* Fri May 08 2009 - David Sugar <dyfet at gnutelephony.org> - 0.5.4-2
- some fixups until upstream is changed, and new init scriptlets.

* Wed May 06 2009 - David Sugar <dyfet at gnutelephony.org> - 0.5.4-1
- temporary patch file added until upstream catches up, other cleanup.

* Sat May 02 2009 - David Sugar <dyfet at gnutelephony.org> - 0.5.4-0
- spec file updated for redhat/fedora submission.

* Fri Jul 25 2008 - David Sugar <dyfet at gnutelephony.org> - 0.2.0-0
- spec file updated for plugins and new library naming.

* Mon Jul 21 2008 - David Sugar <dyfet at gnutelephony.org> - 0.1.0-0
- initial spec file distribution.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sipwitch/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	13 May 2009 05:09:21 -0000	1.1
+++ .cvsignore	13 May 2009 22:28:59 -0000	1.2
@@ -0,0 +1 @@
+sipwitch-0.5.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sipwitch/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	13 May 2009 05:09:21 -0000	1.1
+++ sources	13 May 2009 22:28:59 -0000	1.2
@@ -0,0 +1 @@
+c724278f9af108bdda6960babc89b94c  sipwitch-0.5.4.tar.gz