diff --git a/.cvsignore b/.cvsignore deleted file mode 100644 index 5de9c4b..0000000 --- a/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -zaptel-1.4.0-beta2.tar.gz diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..2c56ac1 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +zaptel-1.4.6.tar.gz diff --git a/0001-Fixed-potential-buffer-overflow.patch b/0001-Fixed-potential-buffer-overflow.patch new file mode 100644 index 0000000..dd38f91 --- /dev/null +++ b/0001-Fixed-potential-buffer-overflow.patch @@ -0,0 +1,44 @@ +From 4c9b832d29f81a2f90b2bd8a29f5be90fd599495 Mon Sep 17 00:00:00 2001 +From: mmichelson +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 + diff --git a/Makefile b/Makefile deleted file mode 100644 index aa555e0..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: zaptel -# $Id$ -NAME := zaptel -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/menuselect.makedeps b/menuselect.makedeps index ca660bc..be2db24 100644 --- a/menuselect.makedeps +++ b/menuselect.makedeps @@ -1 +1,7 @@ +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 diff --git a/menuselect.makeopts b/menuselect.makeopts index 9fae4af..71b4f89 100644 --- a/menuselect.makeopts +++ b/menuselect.makeopts @@ -1,2 +1,3 @@ -MENUSELECT_MODULES=pciradio tor2 torisa wcfxo wct1xxp wct4xxp wctdm wctdm24xxp wcte11xp wcusb xpp_usb zaptel ztd-eth ztd-loc ztdummy ztdynamic zttranscode -MENUSELECT_UTILS=sethdlc-new +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= diff --git a/sources b/sources index 7d7adbe..a5ce608 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4fe09984245f3507d8050bad740e873a zaptel-1.4.0-beta2.tar.gz +f0cf2e89028235c3dc447810e5089dbb zaptel-1.4.6.tar.gz diff --git a/zaptel-1.4.0-beta1-makefile.patch b/zaptel-1.4.0-beta1-makefile.patch deleted file mode 100644 index 1b1ac1e..0000000 --- a/zaptel-1.4.0-beta1-makefile.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.orig 2006-10-11 20:26:26.000000000 -0500 -+++ Makefile 2006-10-11 20:26:41.000000000 -0500 -@@ -409,7 +409,7 @@ - $(LIB_DIR)/$(LTZ_SO).$(LTZ_SO_MAJOR_VER) - $(LN) -sf $(LTZ_SO).$(LTZ_SO_MAJOR_VER).$(LTZ_SO_MINOR_VER) \ - $(LIB_DIR)/$(LTZ_SO) -- if [ -z "$(INSTALL_PREFIX)" && -x /usr/sbin/sestatus ] && (/usr/sbin/sestatus | grep "SELinux status:" | grep -q "enabled") ; then restorecon -v $(LIB_DIR)/$(LTZ_SO); fi -+ if [ -z "$(INSTALL_PREFIX)" -a -x /usr/sbin/sestatus ] && ( /usr/sbin/sestatus | grep "SELinux status:" | grep -q "enabled" ) ; then restorecon -v $(LIB_DIR)/$(LTZ_SO); fi - - install-include: - $(INSTALL) -D -m 644 zaptel.h $(INSTALL_PREFIX)/usr/include/zaptel/zaptel.h diff --git a/zaptel.spec b/zaptel.spec index 4b8ef7d..55e1b41 100644 --- a/zaptel.spec +++ b/zaptel.spec @@ -1,14 +1,13 @@ Summary: Tools and libraries for using/configuring/monitoring Zapata telephony interfaces Name: zaptel -Version: 1.4.0 -Release: 3%{?dist}.beta2 +Version: 1.4.6 +Release: 1%{?dist} License: GPL Group: Applications/System URL: http://www.digium.com/ -Source0: http://ftp.digium.com/pub/telephony/zaptel/releases/zaptel-%{version}-beta2.tar.gz +Source0: http://downloads.digium.com/pub/telephony/zaptel/releases/zaptel-%{version}.tar.gz Patch0: zaptel-1.4.0-beta1-udevzaptelowner.patch -Patch1: zaptel-1.4.0-beta1-makefile.patch - +Patch1: 0001-Fixed-potential-buffer-overflow.patch Source1: menuselect.makedeps Source2: menuselect.makeopts Source3: zaptel.init @@ -54,10 +53,10 @@ Requires: zaptel-lib = %{version}-%{release} Development files for Zapata telephony interfaces. %prep -%setup0 -q -n zaptel-%{version}-beta2 +%setup0 -q %patch0 -p0 -%patch1 -p0 +%patch1 -p1 cp %{S:1} . cp %{S:2} . @@ -83,34 +82,26 @@ popd %configure -make %{?_smp_mflags} +make %{?_smp_mflags} programs %install rm -rf %{buildroot} mkdir -p %{buildroot}%{_initrddir} mkdir -p %{buildroot}%{_sbindir} -mkdir -p %{buildroot}%{_sysconfdir}/modprobe.d 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 -#mkdir -p %{buildroot}/lib/firmware -make install DYNFS=yes DESTDIR=%{buildroot} ROOT_PREFIX=%{buildroot} LIB_DIR=%{buildroot}%{_libdir} -make config DESTDIR=%{buildroot} ROOT_PREFIX=%{buildroot} LIB_DIR=%{buildroot}%{_libdir} -make install-programs DESTDIR=%{buildroot} ROOT_PREFIX=%{buildroot} LIB_DIR=%{buildroot}%{_libdir} +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 -cp doc/fxotune.8 %{buildroot}%{_mandir}/man8 -cp doc/ztmonitor.8 %{buildroot}%{_mandir}/man8 -cp doc/ztspeed.8 %{buildroot}%{_mandir}/man8 -cp doc/zttest.8 %{buildroot}%{_mandir}/man8 - rm -f %{buildroot}%{_libdir}/libtonezone.a %clean @@ -136,21 +127,20 @@ fi %defattr(-,root,root,-) %doc ChangeLog +%doc ifcfg-hdlc0 %doc LICENSE %doc README -%doc README.Astribank -%doc README.b410p %doc README.fxotune %doc README.fxsusb -%doc README.Linux26 %doc zaptel.conf.sample %config(noreplace) %{_sysconfdir}/zaptel.conf %config(noreplace) %{_sysconfdir}/sysconfig/zaptel -%config(noreplace) %{_sysconfdir}/modprobe.d/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* @@ -172,6 +162,7 @@ fi %{_sbindir}/zttool %{_mandir}/man8/fxotune.8* +%{_mandir}/man8/fxstest.8* %{_mandir}/man8/ztmonitor.8* %{_mandir}/man8/ztspeed.8* %{_mandir}/man8/zttest.8* @@ -180,11 +171,48 @@ fi %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 - 1.4.6-1 +- Update to 1.4.6 +- Apply patch to fix AST-2007-024 + +* Wed Apr 25 2007 Jeffrey C. Ollie - 1.4.2.1-1 +- Update to 1.4.2.1 + +* Mon Mar 26 2007 Jeffrey C. Ollie - 1.4.1-4 +- Own /usr/include/zaptel, fixes #233970. + +* Fri Mar 23 2007 Jeffrey C. Ollie - 1.4.1-3 +- Really, really make it work without the kernel sources... + +* Fri Mar 23 2007 Jeffrey C. Ollie - 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 - 1.4.1-1 +- Update to 1.4.1 + +* Sat Dec 23 2006 Jeffrey C. Ollie - 1.4.0-9 +- (Annoyed Grunt!) + +* Sat Dec 23 2006 Jeffrey C. Ollie - 1.4.0-8 +- Don't package hdlc bits on FC <= 5 + +* Sat Dec 23 2006 Jeffrey C. Ollie - 1.4.0-7 +- Update to 1.4.0 final + +* Fri Dec 15 2006 Jeffrey C. Ollie - 1.4.0-5.beta3 +- Update to 1.4.0-beta3 +- Drop unnecessary patch + +* Wed Oct 25 2006 Jeffrey C. Ollie - 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 - 1.4.0-3.beta2 - Update to 1.4.0-beta2