dist-git conversion

#2781)

.gitignore

@@ -1 +1 @@
-zaptel-1.4.6.tar.gz
+zaptel-1.4.12.1.tar.gz

0001-Fixed-potential-buffer-overflow.patch

@@ -1,44 +0,0 @@
-From 4c9b832d29f81a2f90b2bd8a29f5be90fd599495 Mon Sep 17 00:00:00 2001
-From: mmichelson <mmichelson@f558416c-6c06-0410-9f27-dde2687782d0>
-Date: Wed, 31 Oct 2007 21:08:15 +0000
-Subject: [PATCH] Fixed potential buffer overflow.
-
-See AST-2007-024 for more details
-
-
-
-git-svn-id: http://svn.digium.com/svn/zaptel/branches/1.2@3205 f558416c-6c06-0410-9f27-dde2687782d0
----
- sethdlc-new.c |    2 +-
- sethdlc.c     |    2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/sethdlc-new.c b/sethdlc-new.c
-index 4a4a7bb..1765c32 100644
---- a/sethdlc-new.c
-+++ b/sethdlc-new.c
-@@ -673,7 +673,7 @@ int main(int arg_c, char *arg_v[])
- 	if (sock < 0)
- 		error("Unable to create socket: %s\n", strerror(errno));
-   
--	strcpy(req.ifr_name, argv[1]); /* Device name */
-+	strncpy(req.ifr_name, argv[1], sizeof(req.ifr_name) - 1); /* Device name */
- 
- 	if (argc == 2)
- 		show_port();
-diff --git a/sethdlc.c b/sethdlc.c
-index 3514b2e..afbcb20 100644
---- a/sethdlc.c
-+++ b/sethdlc.c
-@@ -293,7 +293,7 @@ int main(int argc, char *argv[])
- 	if (sock<0)
- 		error("Unable to create socket: %s\n", strerror(errno));
-   
--	strcpy(req.ifr_name, argv[1]); /* Device name */
-+	strncpy(req.ifr_name, argv[1], sizeof(req.ifr_name) - 1); /* Device name */
- 
- 	if (argc == 2) {
- 		show_port(sock);
--- 
-1.5.3.3
-

dead.package

@@ -0,0 +1 @@
+replaced my dahdi-tools

menuselect.makedeps

@@ -1,7 +0,0 @@
-MENUSELECT_DEPENDS_wctc4xxp=ZTTRANSCODE 
-MENUSELECT_DEPENDS_ztd-eth=ZTDYNAMIC 
-MENUSELECT_DEPENDS_ztd-loc=ZTDYNAMIC 
-MENUSELECT_DEPENDS_zttool=LIBNEWT 
-MENUSELECT_DEPENDS_FIRMWARE-OCT6114-064=WCT4XXP 
-MENUSELECT_DEPENDS_FIRMWARE-OCT6114-128=WCT4XXP 
-MENUSELECT_DEPENDS_FIRMWARE-TC400M=WCTC4XXP 

menuselect.makeopts

@@ -1,3 +0,0 @@
-MENUSELECT_MODULES=pciradio tor2 torisa wcfxo wct1xxp wct4xxp wctc4xxp wctdm wctdm24xxp wcte11xp wcte12xp wcusb xpp zaptel ztd-eth ztd-loc ztdummy ztdynamic zttranscode 
-MENUSELECT_UTILS=
-MENUSELECT_FIRMWARE=

sources

@@ -1 +0,0 @@
-f0cf2e89028235c3dc447810e5089dbb  zaptel-1.4.6.tar.gz

zaptel-1.4.0-beta1-udevzaptelowner.patch

@@ -1,21 +0,0 @@
-Index: build_tools/genudevrules
-===================================================================
---- build_tools/genudevrules	(revision 1503)
-+++ build_tools/genudevrules	(working copy)
-@@ -22,10 +22,10 @@
- 
- cat <<EOF
- # zaptel devices with ownership/permissions for running as non-root
--KERNEL${match}"zapctl", NAME="zap/ctl", OWNER="asterisk", GROUP="asterisk", MODE="0660"
--KERNEL${match}"zaptranscode", NAME="zap/transcode", OWNER="asterisk", GROUP="asterisk", MODE="0660"
--KERNEL${match}"zaptimer", NAME="zap/timer", OWNER="asterisk", GROUP="asterisk", MODE="0660"
--KERNEL${match}"zapchannel", NAME="zap/channel", OWNER="asterisk", GROUP="asterisk", MODE="0660"
--KERNEL${match}"zappseudo", NAME="zap/pseudo", OWNER="asterisk", GROUP="asterisk", MODE="0660"
--KERNEL${match}"zap[0-9]*", NAME="zap/%n", OWNER="asterisk", GROUP="asterisk", MODE="0660"
-+KERNEL${match}"zapctl", NAME="zap/ctl", OWNER="zaptel", GROUP="zaptel", MODE="0660"
-+KERNEL${match}"zaptranscode", NAME="zap/transcode", OWNER="zaptel", GROUP="zaptel", MODE="0660"
-+KERNEL${match}"zaptimer", NAME="zap/timer", OWNER="zaptel", GROUP="zaptel", MODE="0660"
-+KERNEL${match}"zapchannel", NAME="zap/channel", OWNER="zaptel", GROUP="zaptel", MODE="0660"
-+KERNEL${match}"zappseudo", NAME="zap/pseudo", OWNER="zaptel", GROUP="zaptel", MODE="0660"
-+KERNEL${match}"zap[0-9]*", NAME="zap/%n", OWNER="zaptel", GROUP="zaptel", MODE="0660"
- EOF

zaptel.init

@@ -1,63 +0,0 @@
-#!/bin/sh
-#
-# zaptel        This shell script takes care of loading and unloading \
-#               Zapata Telephony interfaces
-# chkconfig: - 9 92
-# description: The zapata telephony drivers allow you to use your linux \
-# computer to accept incoming data and voice interfaces
-#
-# config: /etc/sysconfig/zaptel
-
-initdir=/etc/rc.d/init.d
-
-# Source function library.
-. $initdir/functions || exit 0
-
-# Source zaptel configuration.
-[ -f /etc/sysconfig/zaptel ] && . /etc/sysconfig/zaptel
-
-# Check that telephony is up.
-[ "${TELEPHONY}" = "yes" ] || exit 0
-
-[ -f /sbin/ztcfg ] || exit 0
-
-[ -f /etc/zaptel.conf ] || exit 0
-
-RETVAL=0
-
-# See how we were called.
-case "$1" in
-    start)
-	if [ ! -e /proc/zaptel/1 ]; then
-		echo "No functioning zap hardware found in /proc/zaptel, loading ztdummy"
-		action "Loading ztdummy:" modprobe ztdummy
-	fi
-	action "Running ztcfg: " /sbin/ztcfg
-	RETVAL=$?
-
-        [ $RETVAL -eq 0 ] && touch /var/lock/subsys/zaptel
-        ;;
-  stop)
-	RETVAL=0
-
-        [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/zaptel
-        ;;
-  restart)
-	$0 stop
-	$0 start
-	;;
-  reload)
-	action "Reloading ztcfg: " /sbin/ztcfg
-	RETVAL=$?
-	;;
-  status)
-	echo "Status option unimplemented."
-	RETVAL=$?
-	;;
-  *)
-        echo "Usage: zaptel {start|stop|status|restart|reload}"
-        exit 1
-esac
-
-exit $RETVAL
-

zaptel.spec

@@ -1,267 +0,0 @@
-Summary: Tools and libraries for using/configuring/monitoring Zapata telephony interfaces
-Name: zaptel
-Version: 1.4.6
-Release: 1%{?dist}
-License: GPL
-Group: Applications/System
-URL: http://www.digium.com/
-Source0: http://downloads.digium.com/pub/telephony/zaptel/releases/zaptel-%{version}.tar.gz
-Patch0:  zaptel-1.4.0-beta1-udevzaptelowner.patch
-Patch1:  0001-Fixed-potential-buffer-overflow.patch
-Source1: menuselect.makedeps
-Source2: menuselect.makeopts
-Source3: zaptel.init
-
-BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
-
-BuildRequires: newt-devel
-
-Requires(pre): fedora-usermgmt
-
-Requires(preun): /sbin/service
-Requires(preun): /sbin/chkconfig
-
-Requires(post): /sbin/chkconfig
-
-Requires(postun): fedora-usermgmt
-
-%description
-Tools and libraries for using/configuring/monitoring Zapata telephony
-interfaces.
-
-%package lib
-Summary:Library for using Zapata telephony interfaces
-Group: Development/Libraries
-
-%description lib
-Library for using Zapata telephony interfaces.
-
-%package utils
-Summary: Tools for monitoring and testing Zapata telephony interfaces
-Group: Development/Libraries
-Requires: zaptel-lib = %{version}-%{release}
-
-%description utils
-Tools for monitoring and testing Zapata telephony interfaces.
-
-%package devel
-Summary: Development files for Zapata telephony interfaces
-Group: Development/Libraries
-Requires: zaptel-lib = %{version}-%{release}
-
-%description devel
-Development files for Zapata telephony interfaces.
-
-%prep
-%setup0 -q
-
-%patch0 -p0
-%patch1 -p1
-
-cp %{S:1} .
-cp %{S:2} .
-cp %{S:3} .
-
-# convert some files to UTF-8
-pushd doc
-for f in zttool.8 ztcfg.8 ztmonitor.8
-do
-  iconv -f iso8859-1 -t utf-8 $f -o $f.tmp
-  mv $f.tmp $f
-done
-popd
-
-%build
-pushd menuselect/mxml
-%configure
-popd
-
-pushd menuselect
-%configure
-popd
-
-%configure
-
-make %{?_smp_mflags} programs
-
-%install
-rm -rf %{buildroot}
-
-mkdir -p %{buildroot}%{_initrddir}
-mkdir -p %{buildroot}%{_sbindir}
-mkdir -p %{buildroot}%{_sysconfdir}/sysconfig
-mkdir -p %{buildroot}%{_sysconfdir}/sysconfig/network-scripts
-mkdir -p %{buildroot}%{_sysconfdir}/udev/rules.d
-mkdir -p %{buildroot}%{_sysconfdir}/udev/permissions.d
-mkdir -p %{buildroot}%{_mandir}/man8
-
-make install-programs install-udev config DESTDIR=%{buildroot}
-
-for f in fxotune fxstest ztdiag ztmonitor ztspeed zttest zttool
-do
-  mv %{buildroot}/sbin/$f %{buildroot}%{_sbindir}/$f
-done
-
-rm -f %{buildroot}%{_libdir}/libtonezone.a
-
-%clean
-rm -rf %{buildroot}
-
-%post 
-/usr/sbin/fedora-groupadd 29 -r zaptel &>/dev/null || :
-/usr/sbin/fedora-useradd  29 -r -s /sbin/nologin -d / -M          \
-                               -c 'Zapata Telephony' -g zaptel zaptel &>/dev/null || :
-/sbin/chkconfig --add zaptel
-
-%preun
-if [ $1 -eq 0 ]; then
-    /sbin/service zaptel stop >/dev/null 2>&1
-    /sbin/chkconfig --del zaptel
-fi
-
-%post lib -p /sbin/ldconfig
-
-%postun lib -p /sbin/ldconfig
-
-%files
-%defattr(-,root,root,-)
-
-%doc ChangeLog
-%doc ifcfg-hdlc0
-%doc LICENSE
-%doc README
-%doc README.fxotune
-%doc README.fxsusb
-%doc zaptel.conf.sample
-
-%config(noreplace) %{_sysconfdir}/zaptel.conf
-%config(noreplace) %{_sysconfdir}/sysconfig/zaptel
-%config(noreplace) %{_sysconfdir}/udev/rules.d/zaptel.rules
-
-%{_sysconfdir}/sysconfig/network-scripts/ifup-hdlc
-/sbin/ztcfg
-/sbin/sethdlc-new
-
-%{_initrddir}/zaptel
-%{_mandir}/man8/ztcfg.8*
-
-%files lib
-%defattr(-,root,root,-)
-%{_libdir}/libtonezone.so.1
-%{_libdir}/libtonezone.so.1.0
-
-%files utils
-%defattr(-,root,root,-)
-
-%{_sbindir}/fxotune
-%{_sbindir}/fxstest
-%{_sbindir}/ztdiag
-%{_sbindir}/ztmonitor
-%{_sbindir}/ztspeed
-%{_sbindir}/zttest
-%{_sbindir}/zttool
-
-%{_mandir}/man8/fxotune.8*
-%{_mandir}/man8/fxstest.8*
-%{_mandir}/man8/ztmonitor.8*
-%{_mandir}/man8/ztspeed.8*
-%{_mandir}/man8/zttest.8*
-%{_mandir}/man8/zttool.8*
-
-%files devel
-%defattr(-,root,root,-)
-%doc LICENSE
-%dir %{_includedir}/zaptel
-%{_includedir}/zaptel/tonezone.h
-%{_includedir}/zaptel/zaptel.h
-%{_libdir}/libtonezone.so
-
-%changelog
-* Fri Nov  1 2007 Jeffrey C. Ollie <jeff@ocjtech.us> - 1.4.6-1
-- Update to 1.4.6
-- Apply patch to fix AST-2007-024
-
-* Wed Apr 25 2007 Jeffrey C. Ollie <jeff@ocjtech.us> - 1.4.2.1-1
-- Update to 1.4.2.1
-
-* Mon Mar 26 2007 Jeffrey C. Ollie <jeff@ocjtech.us> - 1.4.1-4
-- Own /usr/include/zaptel, fixes #233970.
-
-* Fri Mar 23 2007 Jeffrey C. Ollie <jeff@ocjtech.us> - 1.4.1-3
-- Really, really make it work without the kernel sources...
-
-* Fri Mar 23 2007 Jeffrey C. Ollie <jeff@ocjtech.us> - 1.4.1-2
-- Let's see if we can get this to build without the kernel sources present.
-
-* Fri Mar 23 2007 Jeffrey C. Ollie <jeff@ocjtech.us> - 1.4.1-1
-- Update to 1.4.1
-
-* Sat Dec 23 2006 Jeffrey C. Ollie <jeff@ocjtech.us> - 1.4.0-9
-- (Annoyed Grunt!)
-
-* Sat Dec 23 2006 Jeffrey C. Ollie <jeff@ocjtech.us> - 1.4.0-8
-- Don't package hdlc bits on FC <= 5
-
-* Sat Dec 23 2006 Jeffrey C. Ollie <jeff@ocjtech.us> - 1.4.0-7
-- Update to 1.4.0 final
-
-* Fri Dec 15 2006 Jeffrey C. Ollie <jeff@ocjtech.us> - 1.4.0-5.beta3
-- Update to 1.4.0-beta3
-- Drop unnecessary patch
-
-* Wed Oct 25 2006 Jeffrey C. Ollie <jeff@ocjtech.us> - 1.4.0-4.beta2
-- Compile sethdlc and package related bits.
-- Remove some readmes that aren't applicable to library/userland
-
-* Wed Oct 18 2006 Jeffrey C. Ollie <jeff@ocjtech.us> - 1.4.0-3.beta2
-- Update to 1.4.0-beta2
-
-* Sun Oct 15 2006 Jeffrey C. Ollie <jeff@ocjtech.us> - 1.4.0-2.beta1
-- Don't package firmware until license can be figured out.
-
-* Fri Oct 13 2006 Jeffrey C. Ollie <jeff@ocjtech.us> - 1.4.0-1.beta1
-- Remove "Provides: zaptel-kmod-common"
-- Don't load modules in initscript (except for possibly ztdummy) - leave that up to udev/hotplug.
-- Drop ifup-hdlc - it requires sethdlc which isn't available.
-- Move utilities to %%{_sbindir} rather than /sbin.
-- Split libtonezone off into a separate lib package.
-- Use 'zaptel' user/group to own device files.
-- Add patch to fix minor makefile bug.
-
-* Wed Oct 11 2006 Jeffrey C. Ollie <jeff@ocjtech.us> - 1.4.0-0.beta1
-- Update to 1.4.0-beta1
-
-* Fri Jun  9 2006 Jeffrey C. Ollie <jeff@ocjtech.us> - 1.2.6-3
-- Bump release and rebuild.
-
-* Thu Apr 27 2006 Jeffrey C. Ollie <jeff@ocjtech.us> - 1.2.5-2
-- Changed ownership of device nodes to "root" in udev rules file.
-- Don't build sethdlc.
-
-* Mon Mar 27 2006 Jeffrey C. Ollie <jeff@ocjtech.us> - 1.2.5-1
-- Update to 1.2.5
-
-* Wed Feb 15 2006 Jeffrey C. Ollie <jeff@ocjtech.us> - 1.2.4-1
-- Update to 1.2.4
-
-* Tue Jan 31 2006 Jeffrey C. Ollie <jeff@ocjtech.us> - 1.2.3-1
-- Preserve timestamps when we install.
-- Use custom init.d file that does all the fancy RH stuff.
-
-* Mon Jan 30 2006 Jeffrey C. Ollie <jeff@ocjtech.us> - 1.2.3-1
-- Update to 1.2.3.
-
-* Mon Jan 23 2006 Jeffrey C. Ollie <jeff@ocjtech.us> - 1.2.2-3
-- provide zaptel-kmod-common
-
-* Wed Jan 18 2006 Jeffrey C. Ollie <jeff@ocjtech.us> - 1.2.2-2
-- Bump release number.
-
-* Wed Jan 18 2006 Jeffrey C. Ollie <jeff@ocjtech.us> - 1.2.2-1
-- Update to 1.2.2.
-
-* Fri Jan 13 2006 Jeffrey C. Ollie <jeff@ocjtech.us> - 1.2.1-2
-- Devel subpackage needs to require main package.
-
-* Wed Jan 11 2006 Jeffrey C. Ollie <jeff@ocjtech.us> - 1.2.1-1
-- Initial version for Fedora Extras