From 69f9831d12a6b35faa9e2854a940d4ace8ff1619 Mon Sep 17 00:00:00 2001 From: "Jeffrey C. Ollie" Date: Wed, 25 Oct 2006 13:42:50 +0000 Subject: [PATCH 01/55] - Compile sethdlc and package related bits. - Remove some readmes that aren't applicable to library/userland --- menuselect.makeopts | 2 +- zaptel.spec | 13 ++++++++++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/menuselect.makeopts b/menuselect.makeopts index 9fae4af..09c80cc 100644 --- a/menuselect.makeopts +++ b/menuselect.makeopts @@ -1,2 +1,2 @@ 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_UTILS= diff --git a/zaptel.spec b/zaptel.spec index 4b8ef7d..6b811f8 100644 --- a/zaptel.spec +++ b/zaptel.spec @@ -1,7 +1,7 @@ Summary: Tools and libraries for using/configuring/monitoring Zapata telephony interfaces Name: zaptel Version: 1.4.0 -Release: 3%{?dist}.beta2 +Release: 4%{?dist}.beta2 License: GPL Group: Applications/System URL: http://www.digium.com/ @@ -92,6 +92,7 @@ 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 @@ -136,10 +137,9 @@ 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 @@ -150,7 +150,10 @@ fi %config(noreplace) %{_sysconfdir}/modprobe.d/zaptel %config(noreplace) %{_sysconfdir}/udev/rules.d/zaptel.rules +%{_sysconfdir}/sysconfig/network-scripts/ifup-hdlc /sbin/ztcfg +/sbin/sethdlc +/sbin/sethdlc-new %{_initrddir}/zaptel %{_mandir}/man8/ztcfg.8* @@ -185,6 +188,10 @@ fi %{_libdir}/libtonezone.so %changelog +* 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 From b60c4f4a79515d1cbeeab430c62c1c6700cd7270 Mon Sep 17 00:00:00 2001 From: "Jeffrey C. Ollie" Date: Wed, 25 Oct 2006 14:39:41 +0000 Subject: [PATCH 02/55] - Compile sethdlc and package related bits. - Remove some readmes that aren't applicable to library/userland --- menuselect.makeopts | 2 +- zaptel.spec | 13 ++++++++++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/menuselect.makeopts b/menuselect.makeopts index 9fae4af..09c80cc 100644 --- a/menuselect.makeopts +++ b/menuselect.makeopts @@ -1,2 +1,2 @@ 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_UTILS= diff --git a/zaptel.spec b/zaptel.spec index 4b8ef7d..6b811f8 100644 --- a/zaptel.spec +++ b/zaptel.spec @@ -1,7 +1,7 @@ Summary: Tools and libraries for using/configuring/monitoring Zapata telephony interfaces Name: zaptel Version: 1.4.0 -Release: 3%{?dist}.beta2 +Release: 4%{?dist}.beta2 License: GPL Group: Applications/System URL: http://www.digium.com/ @@ -92,6 +92,7 @@ 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 @@ -136,10 +137,9 @@ 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 @@ -150,7 +150,10 @@ fi %config(noreplace) %{_sysconfdir}/modprobe.d/zaptel %config(noreplace) %{_sysconfdir}/udev/rules.d/zaptel.rules +%{_sysconfdir}/sysconfig/network-scripts/ifup-hdlc /sbin/ztcfg +/sbin/sethdlc +/sbin/sethdlc-new %{_initrddir}/zaptel %{_mandir}/man8/ztcfg.8* @@ -185,6 +188,10 @@ fi %{_libdir}/libtonezone.so %changelog +* 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 From f178865e069cd959a53b0d836440ffc4f4087d84 Mon Sep 17 00:00:00 2001 From: "Jeffrey C. Ollie" Date: Sat, 16 Dec 2006 04:17:42 +0000 Subject: [PATCH 03/55] Update to 1.4.0-beta3 --- zaptel-1.4.0-beta1-makefile.patch | 11 ----------- zaptel.spec | 14 ++++++++------ 2 files changed, 8 insertions(+), 17 deletions(-) delete mode 100644 zaptel-1.4.0-beta1-makefile.patch 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 6b811f8..24997e3 100644 --- a/zaptel.spec +++ b/zaptel.spec @@ -1,13 +1,12 @@ Summary: Tools and libraries for using/configuring/monitoring Zapata telephony interfaces Name: zaptel Version: 1.4.0 -Release: 4%{?dist}.beta2 +Release: 5.beta3%{?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://ftp.digium.com/pub/telephony/zaptel/releases/zaptel-%{version}-beta3.tar.gz Patch0: zaptel-1.4.0-beta1-udevzaptelowner.patch -Patch1: zaptel-1.4.0-beta1-makefile.patch Source1: menuselect.makedeps Source2: menuselect.makeopts @@ -54,10 +53,9 @@ Requires: zaptel-lib = %{version}-%{release} Development files for Zapata telephony interfaces. %prep -%setup0 -q -n zaptel-%{version}-beta2 +%setup0 -q -n zaptel-%{version}-beta3 %patch0 -p0 -%patch1 -p0 cp %{S:1} . cp %{S:2} . @@ -188,7 +186,11 @@ fi %{_libdir}/libtonezone.so %changelog -* Wed Oct 25 2006 Jeffrey C. Ollie - 1.4.0-4.beta2 +* 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 From 3b8fe3621ce80f6b7d1be8ced2a3fdee09341ff9 Mon Sep 17 00:00:00 2001 From: "Jeffrey C. Ollie" Date: Sat, 16 Dec 2006 04:20:43 +0000 Subject: [PATCH 04/55] (Annoyed Grunt) Don't forget to upload new sources. --- .cvsignore | 2 +- sources | 2 +- zaptel.spec | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 5de9c4b..08db8c6 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -zaptel-1.4.0-beta2.tar.gz +zaptel-1.4.0-beta3.tar.gz diff --git a/sources b/sources index 7d7adbe..078e4cd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4fe09984245f3507d8050bad740e873a zaptel-1.4.0-beta2.tar.gz +13cdf35e3b8024dba7fa2ef5364970d7 zaptel-1.4.0-beta3.tar.gz diff --git a/zaptel.spec b/zaptel.spec index 24997e3..3abeead 100644 --- a/zaptel.spec +++ b/zaptel.spec @@ -1,7 +1,7 @@ Summary: Tools and libraries for using/configuring/monitoring Zapata telephony interfaces Name: zaptel Version: 1.4.0 -Release: 5.beta3%{?dist} +Release: 6.beta3%{?dist} License: GPL Group: Applications/System URL: http://www.digium.com/ From 1a13b54c963bc15375b4223b9f6b14d286967f07 Mon Sep 17 00:00:00 2001 From: "Jeffrey C. Ollie" Date: Sat, 16 Dec 2006 04:39:49 +0000 Subject: [PATCH 05/55] Update to 1.4.0-beta3 --- .cvsignore | 2 +- sources | 2 +- zaptel.spec | 14 ++++++++------ 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/.cvsignore b/.cvsignore index 5de9c4b..08db8c6 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -zaptel-1.4.0-beta2.tar.gz +zaptel-1.4.0-beta3.tar.gz diff --git a/sources b/sources index 7d7adbe..078e4cd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4fe09984245f3507d8050bad740e873a zaptel-1.4.0-beta2.tar.gz +13cdf35e3b8024dba7fa2ef5364970d7 zaptel-1.4.0-beta3.tar.gz diff --git a/zaptel.spec b/zaptel.spec index 6b811f8..3abeead 100644 --- a/zaptel.spec +++ b/zaptel.spec @@ -1,13 +1,12 @@ Summary: Tools and libraries for using/configuring/monitoring Zapata telephony interfaces Name: zaptel Version: 1.4.0 -Release: 4%{?dist}.beta2 +Release: 6.beta3%{?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://ftp.digium.com/pub/telephony/zaptel/releases/zaptel-%{version}-beta3.tar.gz Patch0: zaptel-1.4.0-beta1-udevzaptelowner.patch -Patch1: zaptel-1.4.0-beta1-makefile.patch Source1: menuselect.makedeps Source2: menuselect.makeopts @@ -54,10 +53,9 @@ Requires: zaptel-lib = %{version}-%{release} Development files for Zapata telephony interfaces. %prep -%setup0 -q -n zaptel-%{version}-beta2 +%setup0 -q -n zaptel-%{version}-beta3 %patch0 -p0 -%patch1 -p0 cp %{S:1} . cp %{S:2} . @@ -188,7 +186,11 @@ fi %{_libdir}/libtonezone.so %changelog -* Wed Oct 25 2006 Jeffrey C. Ollie - 1.4.0-4.beta2 +* 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 From 0d403002dec0ea705fdce15454ffb5afed137c58 Mon Sep 17 00:00:00 2001 From: "Jeffrey C. Ollie" Date: Sun, 24 Dec 2006 03:41:20 +0000 Subject: [PATCH 06/55] Update to 1.4.0 final --- .cvsignore | 2 +- sources | 2 +- zaptel.spec | 9 ++++++--- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.cvsignore b/.cvsignore index 08db8c6..dbe62be 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -zaptel-1.4.0-beta3.tar.gz +zaptel-1.4.0.tar.gz diff --git a/sources b/sources index 078e4cd..acc45cc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -13cdf35e3b8024dba7fa2ef5364970d7 zaptel-1.4.0-beta3.tar.gz +27b43dfa3f1629f063a20779300f68c8 zaptel-1.4.0.tar.gz diff --git a/zaptel.spec b/zaptel.spec index 3abeead..db6d828 100644 --- a/zaptel.spec +++ b/zaptel.spec @@ -1,11 +1,11 @@ Summary: Tools and libraries for using/configuring/monitoring Zapata telephony interfaces Name: zaptel Version: 1.4.0 -Release: 6.beta3%{?dist} +Release: 7%{?dist} License: GPL Group: Applications/System URL: http://www.digium.com/ -Source0: http://ftp.digium.com/pub/telephony/zaptel/releases/zaptel-%{version}-beta3.tar.gz +Source0: http://ftp.digium.com/pub/telephony/zaptel/releases/zaptel-%{version}.tar.gz Patch0: zaptel-1.4.0-beta1-udevzaptelowner.patch Source1: menuselect.makedeps @@ -53,7 +53,7 @@ Requires: zaptel-lib = %{version}-%{release} Development files for Zapata telephony interfaces. %prep -%setup0 -q -n zaptel-%{version}-beta3 +%setup0 -q %patch0 -p0 @@ -186,6 +186,9 @@ fi %{_libdir}/libtonezone.so %changelog +* 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 From e9e4aec58c3051ee19ce437e1ae28df057bbdecd Mon Sep 17 00:00:00 2001 From: "Jeffrey C. Ollie" Date: Sun, 24 Dec 2006 03:45:12 +0000 Subject: [PATCH 07/55] Update to 1.4.0 final --- .cvsignore | 2 +- sources | 2 +- zaptel.spec | 9 ++++++--- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.cvsignore b/.cvsignore index 08db8c6..dbe62be 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -zaptel-1.4.0-beta3.tar.gz +zaptel-1.4.0.tar.gz diff --git a/sources b/sources index 078e4cd..acc45cc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -13cdf35e3b8024dba7fa2ef5364970d7 zaptel-1.4.0-beta3.tar.gz +27b43dfa3f1629f063a20779300f68c8 zaptel-1.4.0.tar.gz diff --git a/zaptel.spec b/zaptel.spec index 3abeead..db6d828 100644 --- a/zaptel.spec +++ b/zaptel.spec @@ -1,11 +1,11 @@ Summary: Tools and libraries for using/configuring/monitoring Zapata telephony interfaces Name: zaptel Version: 1.4.0 -Release: 6.beta3%{?dist} +Release: 7%{?dist} License: GPL Group: Applications/System URL: http://www.digium.com/ -Source0: http://ftp.digium.com/pub/telephony/zaptel/releases/zaptel-%{version}-beta3.tar.gz +Source0: http://ftp.digium.com/pub/telephony/zaptel/releases/zaptel-%{version}.tar.gz Patch0: zaptel-1.4.0-beta1-udevzaptelowner.patch Source1: menuselect.makedeps @@ -53,7 +53,7 @@ Requires: zaptel-lib = %{version}-%{release} Development files for Zapata telephony interfaces. %prep -%setup0 -q -n zaptel-%{version}-beta3 +%setup0 -q %patch0 -p0 @@ -186,6 +186,9 @@ fi %{_libdir}/libtonezone.so %changelog +* 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 From 74b19ea5229d3f25fcb002a38034ae06f81ec055 Mon Sep 17 00:00:00 2001 From: "Jeffrey C. Ollie" Date: Sun, 24 Dec 2006 04:41:20 +0000 Subject: [PATCH 08/55] (Annoyed Grunt!) --- zaptel.spec | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/zaptel.spec b/zaptel.spec index db6d828..f8b4de0 100644 --- a/zaptel.spec +++ b/zaptel.spec @@ -1,7 +1,7 @@ Summary: Tools and libraries for using/configuring/monitoring Zapata telephony interfaces Name: zaptel Version: 1.4.0 -Release: 7%{?dist} +Release: 9%{?dist} License: GPL Group: Applications/System URL: http://www.digium.com/ @@ -112,6 +112,12 @@ cp doc/zttest.8 %{buildroot}%{_mandir}/man8 rm -f %{buildroot}%{_libdir}/libtonezone.a +%if %{fedora} <= 5 +rm -f %{buildroot}%{_sysconfdir}/sysconfig/network-scripts/ifup-hdlc +rm -f %{buildroot}/sbin/sethdlc +rm -f %{buildroot}/sbin/sethdlc-new +%endif + %clean rm -rf %{buildroot} @@ -135,7 +141,9 @@ fi %defattr(-,root,root,-) %doc ChangeLog +%if %{fedora} > 5 %doc ifcfg-hdlc0 +%endif %doc LICENSE %doc README %doc README.fxotune @@ -148,10 +156,14 @@ fi %config(noreplace) %{_sysconfdir}/modprobe.d/zaptel %config(noreplace) %{_sysconfdir}/udev/rules.d/zaptel.rules +%if %{fedora} > 5 %{_sysconfdir}/sysconfig/network-scripts/ifup-hdlc +%endif /sbin/ztcfg +%if %{fedora} > 5 /sbin/sethdlc /sbin/sethdlc-new +%endif %{_initrddir}/zaptel %{_mandir}/man8/ztcfg.8* @@ -186,6 +198,12 @@ fi %{_libdir}/libtonezone.so %changelog +* 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 From 7a40279001f78f4fa1fe57ad6660a2214faca1a6 Mon Sep 17 00:00:00 2001 From: "Jeffrey C. Ollie" Date: Sun, 24 Dec 2006 04:42:43 +0000 Subject: [PATCH 09/55] (Annoyed Grunt!) --- zaptel.spec | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/zaptel.spec b/zaptel.spec index db6d828..f8b4de0 100644 --- a/zaptel.spec +++ b/zaptel.spec @@ -1,7 +1,7 @@ Summary: Tools and libraries for using/configuring/monitoring Zapata telephony interfaces Name: zaptel Version: 1.4.0 -Release: 7%{?dist} +Release: 9%{?dist} License: GPL Group: Applications/System URL: http://www.digium.com/ @@ -112,6 +112,12 @@ cp doc/zttest.8 %{buildroot}%{_mandir}/man8 rm -f %{buildroot}%{_libdir}/libtonezone.a +%if %{fedora} <= 5 +rm -f %{buildroot}%{_sysconfdir}/sysconfig/network-scripts/ifup-hdlc +rm -f %{buildroot}/sbin/sethdlc +rm -f %{buildroot}/sbin/sethdlc-new +%endif + %clean rm -rf %{buildroot} @@ -135,7 +141,9 @@ fi %defattr(-,root,root,-) %doc ChangeLog +%if %{fedora} > 5 %doc ifcfg-hdlc0 +%endif %doc LICENSE %doc README %doc README.fxotune @@ -148,10 +156,14 @@ fi %config(noreplace) %{_sysconfdir}/modprobe.d/zaptel %config(noreplace) %{_sysconfdir}/udev/rules.d/zaptel.rules +%if %{fedora} > 5 %{_sysconfdir}/sysconfig/network-scripts/ifup-hdlc +%endif /sbin/ztcfg +%if %{fedora} > 5 /sbin/sethdlc /sbin/sethdlc-new +%endif %{_initrddir}/zaptel %{_mandir}/man8/ztcfg.8* @@ -186,6 +198,12 @@ fi %{_libdir}/libtonezone.so %changelog +* 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 From d1ea2d9d63dc8fe61d55604f187a9b19bf2f4557 Mon Sep 17 00:00:00 2001 From: "Jeffrey C. Ollie" Date: Fri, 23 Mar 2007 05:04:54 +0000 Subject: [PATCH 10/55] Update to 1.4.1 --- .cvsignore | 2 +- menuselect.makedeps | 6 ++++++ menuselect.makeopts | 3 ++- sources | 2 +- zaptel.spec | 7 +++++-- 5 files changed, 15 insertions(+), 5 deletions(-) diff --git a/.cvsignore b/.cvsignore index dbe62be..dcb95ea 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -zaptel-1.4.0.tar.gz +zaptel-1.4.1.tar.gz 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 09c80cc..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_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 acc45cc..a7759b0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -27b43dfa3f1629f063a20779300f68c8 zaptel-1.4.0.tar.gz +4e429375161c1d4ec07950e18526ced2 zaptel-1.4.1.tar.gz diff --git a/zaptel.spec b/zaptel.spec index f8b4de0..776d378 100644 --- a/zaptel.spec +++ b/zaptel.spec @@ -1,7 +1,7 @@ Summary: Tools and libraries for using/configuring/monitoring Zapata telephony interfaces Name: zaptel -Version: 1.4.0 -Release: 9%{?dist} +Version: 1.4.1 +Release: 1%{?dist} License: GPL Group: Applications/System URL: http://www.digium.com/ @@ -198,6 +198,9 @@ fi %{_libdir}/libtonezone.so %changelog +* 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!) From f0c8bcd072482675bddeee1709d7356046cb86c3 Mon Sep 17 00:00:00 2001 From: "Jeffrey C. Ollie" Date: Fri, 23 Mar 2007 05:07:33 +0000 Subject: [PATCH 11/55] Update to 1.4.1 --- .cvsignore | 2 +- menuselect.makedeps | 6 ++++++ menuselect.makeopts | 3 ++- sources | 2 +- zaptel.spec | 7 +++++-- 5 files changed, 15 insertions(+), 5 deletions(-) diff --git a/.cvsignore b/.cvsignore index dbe62be..dcb95ea 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -zaptel-1.4.0.tar.gz +zaptel-1.4.1.tar.gz 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 09c80cc..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_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 acc45cc..a7759b0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -27b43dfa3f1629f063a20779300f68c8 zaptel-1.4.0.tar.gz +4e429375161c1d4ec07950e18526ced2 zaptel-1.4.1.tar.gz diff --git a/zaptel.spec b/zaptel.spec index f8b4de0..776d378 100644 --- a/zaptel.spec +++ b/zaptel.spec @@ -1,7 +1,7 @@ Summary: Tools and libraries for using/configuring/monitoring Zapata telephony interfaces Name: zaptel -Version: 1.4.0 -Release: 9%{?dist} +Version: 1.4.1 +Release: 1%{?dist} License: GPL Group: Applications/System URL: http://www.digium.com/ @@ -198,6 +198,9 @@ fi %{_libdir}/libtonezone.so %changelog +* 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!) From df3215f09b70c956b8afbcb444574335d5990282 Mon Sep 17 00:00:00 2001 From: "Jeffrey C. Ollie" Date: Fri, 23 Mar 2007 05:22:35 +0000 Subject: [PATCH 12/55] See if we can build without kernel sources --- zaptel.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/zaptel.spec b/zaptel.spec index 776d378..9a59e37 100644 --- a/zaptel.spec +++ b/zaptel.spec @@ -1,7 +1,7 @@ Summary: Tools and libraries for using/configuring/monitoring Zapata telephony interfaces Name: zaptel Version: 1.4.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: Applications/System URL: http://www.digium.com/ @@ -81,7 +81,7 @@ popd %configure -make %{?_smp_mflags} +make %{?_smp_mflags} programs %install rm -rf %{buildroot} @@ -198,6 +198,9 @@ fi %{_libdir}/libtonezone.so %changelog +* 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 From b63047d49259669cf341ea1ca5d34accd4916a4f Mon Sep 17 00:00:00 2001 From: "Jeffrey C. Ollie" Date: Sat, 24 Mar 2007 04:21:41 +0000 Subject: [PATCH 13/55] Really, really make this build with out the kernel source... --- zaptel-1.4.1-makefile.patch | 29 +++++++++++++++++++++++++++++ zaptel.spec | 7 ++++++- 2 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 zaptel-1.4.1-makefile.patch diff --git a/zaptel-1.4.1-makefile.patch b/zaptel-1.4.1-makefile.patch new file mode 100644 index 0000000..5d98a9c --- /dev/null +++ b/zaptel-1.4.1-makefile.patch @@ -0,0 +1,29 @@ +Index: Makefile +=================================================================== +--- Makefile (revision 2341) ++++ Makefile (working copy) +@@ -386,10 +386,7 @@ + $(UTILSO): %.o: %.c + $(CC) $(CFLAGS) -o $@ -c $< + +-install: all devices install-modules install-libs install-include install-xpp +-ifeq ($(HOTPLUG_FIRMWARE),yes) +- $(MAKE) -C firmware hotplug-install +-endif ++install: devices install-libs install-include install-xpp + if [ -f ztcfg ]; then \ + $(INSTALL) -D -m 755 ztcfg $(INSTALL_PREFIX)/sbin/ztcfg; \ + fi +@@ -403,12 +400,8 @@ + fi + $(INSTALL) -m 644 doc/ztcfg.8 $(INSTALL_PREFIX)/usr/share/man/man8 + $(INSTALL) -m 644 doc/zttool.8 $(INSTALL_PREFIX)/usr/share/man/man8 +- [ `id -u` = 0 ] && /sbin/depmod -a $(KVERS) || : + [ -f $(CONFIG_FILE) ] || $(INSTALL) -D -m 644 zaptel.conf.sample $(CONFIG_FILE) + build_tools/genmodconf $(BUILDVER) "$(ROOT_PREFIX)" "$(filter-out zaptel ztdummy xpp zttranscode ztdynamic,$(BUILD_MODULES)) $(MODULE_ALIASES)" +- @if [ -d /etc/modutils ]; then \ +- /sbin/update-modules ; \ +- fi + + install-libs: $(LTZ_SO) $(LTZ_A) + $(INSTALL) -D -m 755 $(LTZ_A) $(LIB_DIR)/$(LTZ_A) diff --git a/zaptel.spec b/zaptel.spec index 9a59e37..2e291ee 100644 --- a/zaptel.spec +++ b/zaptel.spec @@ -1,12 +1,13 @@ Summary: Tools and libraries for using/configuring/monitoring Zapata telephony interfaces Name: zaptel Version: 1.4.1 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: Applications/System URL: http://www.digium.com/ Source0: http://ftp.digium.com/pub/telephony/zaptel/releases/zaptel-%{version}.tar.gz Patch0: zaptel-1.4.0-beta1-udevzaptelowner.patch +Patch1: zaptel-1.4.1-makefile.patch Source1: menuselect.makedeps Source2: menuselect.makeopts @@ -56,6 +57,7 @@ Development files for Zapata telephony interfaces. %setup0 -q %patch0 -p0 +%patch1 -p0 cp %{S:1} . cp %{S:2} . @@ -198,6 +200,9 @@ fi %{_libdir}/libtonezone.so %changelog +* 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. From 344a6c5c2c459b51321a5e17ebcb2d5aca3a7df3 Mon Sep 17 00:00:00 2001 From: "Jeffrey C. Ollie" Date: Sat, 24 Mar 2007 04:23:32 +0000 Subject: [PATCH 14/55] Really, really make this build with out the kernel source... --- zaptel-1.4.0-beta1-makefile.patch | 11 ----------- zaptel-1.4.1-makefile.patch | 29 +++++++++++++++++++++++++++++ zaptel.spec | 12 ++++++++++-- 3 files changed, 39 insertions(+), 13 deletions(-) delete mode 100644 zaptel-1.4.0-beta1-makefile.patch create mode 100644 zaptel-1.4.1-makefile.patch 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-1.4.1-makefile.patch b/zaptel-1.4.1-makefile.patch new file mode 100644 index 0000000..5d98a9c --- /dev/null +++ b/zaptel-1.4.1-makefile.patch @@ -0,0 +1,29 @@ +Index: Makefile +=================================================================== +--- Makefile (revision 2341) ++++ Makefile (working copy) +@@ -386,10 +386,7 @@ + $(UTILSO): %.o: %.c + $(CC) $(CFLAGS) -o $@ -c $< + +-install: all devices install-modules install-libs install-include install-xpp +-ifeq ($(HOTPLUG_FIRMWARE),yes) +- $(MAKE) -C firmware hotplug-install +-endif ++install: devices install-libs install-include install-xpp + if [ -f ztcfg ]; then \ + $(INSTALL) -D -m 755 ztcfg $(INSTALL_PREFIX)/sbin/ztcfg; \ + fi +@@ -403,12 +400,8 @@ + fi + $(INSTALL) -m 644 doc/ztcfg.8 $(INSTALL_PREFIX)/usr/share/man/man8 + $(INSTALL) -m 644 doc/zttool.8 $(INSTALL_PREFIX)/usr/share/man/man8 +- [ `id -u` = 0 ] && /sbin/depmod -a $(KVERS) || : + [ -f $(CONFIG_FILE) ] || $(INSTALL) -D -m 644 zaptel.conf.sample $(CONFIG_FILE) + build_tools/genmodconf $(BUILDVER) "$(ROOT_PREFIX)" "$(filter-out zaptel ztdummy xpp zttranscode ztdynamic,$(BUILD_MODULES)) $(MODULE_ALIASES)" +- @if [ -d /etc/modutils ]; then \ +- /sbin/update-modules ; \ +- fi + + install-libs: $(LTZ_SO) $(LTZ_A) + $(INSTALL) -D -m 755 $(LTZ_A) $(LIB_DIR)/$(LTZ_A) diff --git a/zaptel.spec b/zaptel.spec index 776d378..2e291ee 100644 --- a/zaptel.spec +++ b/zaptel.spec @@ -1,12 +1,13 @@ Summary: Tools and libraries for using/configuring/monitoring Zapata telephony interfaces Name: zaptel Version: 1.4.1 -Release: 1%{?dist} +Release: 3%{?dist} License: GPL Group: Applications/System URL: http://www.digium.com/ Source0: http://ftp.digium.com/pub/telephony/zaptel/releases/zaptel-%{version}.tar.gz Patch0: zaptel-1.4.0-beta1-udevzaptelowner.patch +Patch1: zaptel-1.4.1-makefile.patch Source1: menuselect.makedeps Source2: menuselect.makeopts @@ -56,6 +57,7 @@ Development files for Zapata telephony interfaces. %setup0 -q %patch0 -p0 +%patch1 -p0 cp %{S:1} . cp %{S:2} . @@ -81,7 +83,7 @@ popd %configure -make %{?_smp_mflags} +make %{?_smp_mflags} programs %install rm -rf %{buildroot} @@ -198,6 +200,12 @@ fi %{_libdir}/libtonezone.so %changelog +* 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 From 9a38cf646eb2e7de7cf02cb2f69d9af08fd41c7b Mon Sep 17 00:00:00 2001 From: "Jeffrey C. Ollie" Date: Mon, 26 Mar 2007 12:53:21 +0000 Subject: [PATCH 15/55] Own /usr/include/zaptel, fixes #233970 --- zaptel.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/zaptel.spec b/zaptel.spec index 2e291ee..1f2b41b 100644 --- a/zaptel.spec +++ b/zaptel.spec @@ -1,7 +1,7 @@ Summary: Tools and libraries for using/configuring/monitoring Zapata telephony interfaces Name: zaptel Version: 1.4.1 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL Group: Applications/System URL: http://www.digium.com/ @@ -195,11 +195,15 @@ fi %files devel %defattr(-,root,root,-) %doc LICENSE +%dir %{_includedir}/zaptel %{_includedir}/zaptel/tonezone.h %{_includedir}/zaptel/zaptel.h %{_libdir}/libtonezone.so %changelog +* 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... From 525ebf17f7951782c339653fb023853523da4c62 Mon Sep 17 00:00:00 2001 From: "Jeffrey C. Ollie" Date: Mon, 26 Mar 2007 12:55:18 +0000 Subject: [PATCH 16/55] Own /usr/include/zaptel, fixes #233970 --- zaptel.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/zaptel.spec b/zaptel.spec index 2e291ee..1f2b41b 100644 --- a/zaptel.spec +++ b/zaptel.spec @@ -1,7 +1,7 @@ Summary: Tools and libraries for using/configuring/monitoring Zapata telephony interfaces Name: zaptel Version: 1.4.1 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL Group: Applications/System URL: http://www.digium.com/ @@ -195,11 +195,15 @@ fi %files devel %defattr(-,root,root,-) %doc LICENSE +%dir %{_includedir}/zaptel %{_includedir}/zaptel/tonezone.h %{_includedir}/zaptel/zaptel.h %{_libdir}/libtonezone.so %changelog +* 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... From 791d6993ac3dd3d90f372f5f86973c7085e1195b Mon Sep 17 00:00:00 2001 From: "Jeffrey C. Ollie" Date: Wed, 25 Apr 2007 20:00:51 +0000 Subject: [PATCH 17/55] Update to 1.4.2.1 --- .cvsignore | 2 +- sources | 2 +- zaptel.spec | 7 +++++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index dcb95ea..f49d974 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -zaptel-1.4.1.tar.gz +zaptel-1.4.2.1.tar.gz diff --git a/sources b/sources index a7759b0..50670be 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4e429375161c1d4ec07950e18526ced2 zaptel-1.4.1.tar.gz +42ce771a840ec239abfd945923a98b56 zaptel-1.4.2.1.tar.gz diff --git a/zaptel.spec b/zaptel.spec index 1f2b41b..4fe74cb 100644 --- a/zaptel.spec +++ b/zaptel.spec @@ -1,7 +1,7 @@ Summary: Tools and libraries for using/configuring/monitoring Zapata telephony interfaces Name: zaptel -Version: 1.4.1 -Release: 4%{?dist} +Version: 1.4.2.1 +Release: 1%{?dist} License: GPL Group: Applications/System URL: http://www.digium.com/ @@ -201,6 +201,9 @@ fi %{_libdir}/libtonezone.so %changelog +* 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. From 0d7acaa95f1d7a9eb3c64376064a6d770785770e Mon Sep 17 00:00:00 2001 From: "Jeffrey C. Ollie" Date: Wed, 25 Apr 2007 20:02:57 +0000 Subject: [PATCH 18/55] Update to 1.4.2.1 --- .cvsignore | 2 +- sources | 2 +- zaptel.spec | 7 +++++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index dcb95ea..f49d974 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -zaptel-1.4.1.tar.gz +zaptel-1.4.2.1.tar.gz diff --git a/sources b/sources index a7759b0..50670be 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4e429375161c1d4ec07950e18526ced2 zaptel-1.4.1.tar.gz +42ce771a840ec239abfd945923a98b56 zaptel-1.4.2.1.tar.gz diff --git a/zaptel.spec b/zaptel.spec index 1f2b41b..4fe74cb 100644 --- a/zaptel.spec +++ b/zaptel.spec @@ -1,7 +1,7 @@ Summary: Tools and libraries for using/configuring/monitoring Zapata telephony interfaces Name: zaptel -Version: 1.4.1 -Release: 4%{?dist} +Version: 1.4.2.1 +Release: 1%{?dist} License: GPL Group: Applications/System URL: http://www.digium.com/ @@ -201,6 +201,9 @@ fi %{_libdir}/libtonezone.so %changelog +* 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. From 97cb29063cfda1aba4ec230ed89126b0a563da5b Mon Sep 17 00:00:00 2001 From: "Jeffrey C. Ollie" Date: Sat, 3 Nov 2007 05:21:57 +0000 Subject: [PATCH 19/55] Update to 1.4.6 --- .cvsignore | 2 +- 0001-Fixed-potential-buffer-overflow.patch | 44 ++++++++++++++++++++++ sources | 2 +- zaptel-1.4.1-makefile.patch | 29 -------------- zaptel.spec | 40 +++++--------------- 5 files changed, 56 insertions(+), 61 deletions(-) create mode 100644 0001-Fixed-potential-buffer-overflow.patch delete mode 100644 zaptel-1.4.1-makefile.patch diff --git a/.cvsignore b/.cvsignore index f49d974..2c56ac1 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -zaptel-1.4.2.1.tar.gz +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/sources b/sources index 50670be..a5ce608 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -42ce771a840ec239abfd945923a98b56 zaptel-1.4.2.1.tar.gz +f0cf2e89028235c3dc447810e5089dbb zaptel-1.4.6.tar.gz diff --git a/zaptel-1.4.1-makefile.patch b/zaptel-1.4.1-makefile.patch deleted file mode 100644 index 5d98a9c..0000000 --- a/zaptel-1.4.1-makefile.patch +++ /dev/null @@ -1,29 +0,0 @@ -Index: Makefile -=================================================================== ---- Makefile (revision 2341) -+++ Makefile (working copy) -@@ -386,10 +386,7 @@ - $(UTILSO): %.o: %.c - $(CC) $(CFLAGS) -o $@ -c $< - --install: all devices install-modules install-libs install-include install-xpp --ifeq ($(HOTPLUG_FIRMWARE),yes) -- $(MAKE) -C firmware hotplug-install --endif -+install: devices install-libs install-include install-xpp - if [ -f ztcfg ]; then \ - $(INSTALL) -D -m 755 ztcfg $(INSTALL_PREFIX)/sbin/ztcfg; \ - fi -@@ -403,12 +400,8 @@ - fi - $(INSTALL) -m 644 doc/ztcfg.8 $(INSTALL_PREFIX)/usr/share/man/man8 - $(INSTALL) -m 644 doc/zttool.8 $(INSTALL_PREFIX)/usr/share/man/man8 -- [ `id -u` = 0 ] && /sbin/depmod -a $(KVERS) || : - [ -f $(CONFIG_FILE) ] || $(INSTALL) -D -m 644 zaptel.conf.sample $(CONFIG_FILE) - build_tools/genmodconf $(BUILDVER) "$(ROOT_PREFIX)" "$(filter-out zaptel ztdummy xpp zttranscode ztdynamic,$(BUILD_MODULES)) $(MODULE_ALIASES)" -- @if [ -d /etc/modutils ]; then \ -- /sbin/update-modules ; \ -- fi - - install-libs: $(LTZ_SO) $(LTZ_A) - $(INSTALL) -D -m 755 $(LTZ_A) $(LIB_DIR)/$(LTZ_A) diff --git a/zaptel.spec b/zaptel.spec index 4fe74cb..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.2.1 +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}.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.1-makefile.patch - +Patch1: 0001-Fixed-potential-buffer-overflow.patch Source1: menuselect.makedeps Source2: menuselect.makeopts Source3: zaptel.init @@ -57,7 +56,7 @@ Development files for Zapata telephony interfaces. %setup0 -q %patch0 -p0 -%patch1 -p0 +%patch1 -p1 cp %{S:1} . cp %{S:2} . @@ -90,36 +89,21 @@ 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 -%if %{fedora} <= 5 -rm -f %{buildroot}%{_sysconfdir}/sysconfig/network-scripts/ifup-hdlc -rm -f %{buildroot}/sbin/sethdlc -rm -f %{buildroot}/sbin/sethdlc-new -%endif - %clean rm -rf %{buildroot} @@ -143,29 +127,20 @@ fi %defattr(-,root,root,-) %doc ChangeLog -%if %{fedora} > 5 %doc ifcfg-hdlc0 -%endif %doc LICENSE %doc README %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 -%if %{fedora} > 5 %{_sysconfdir}/sysconfig/network-scripts/ifup-hdlc -%endif /sbin/ztcfg -%if %{fedora} > 5 -/sbin/sethdlc /sbin/sethdlc-new -%endif %{_initrddir}/zaptel %{_mandir}/man8/ztcfg.8* @@ -187,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* @@ -201,6 +177,10 @@ fi %{_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 From 9ad4e4448596daad740687adcf0aba0e2e763321 Mon Sep 17 00:00:00 2001 From: "Jeffrey C. Ollie" Date: Sat, 3 Nov 2007 05:31:25 +0000 Subject: [PATCH 20/55] Update to 1.4.6 --- .cvsignore | 2 +- 0001-Fixed-potential-buffer-overflow.patch | 44 ++++++++++++++++++++++ sources | 2 +- zaptel-1.4.1-makefile.patch | 29 -------------- zaptel.spec | 40 +++++--------------- 5 files changed, 56 insertions(+), 61 deletions(-) create mode 100644 0001-Fixed-potential-buffer-overflow.patch delete mode 100644 zaptel-1.4.1-makefile.patch diff --git a/.cvsignore b/.cvsignore index f49d974..2c56ac1 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -zaptel-1.4.2.1.tar.gz +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/sources b/sources index 50670be..a5ce608 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -42ce771a840ec239abfd945923a98b56 zaptel-1.4.2.1.tar.gz +f0cf2e89028235c3dc447810e5089dbb zaptel-1.4.6.tar.gz diff --git a/zaptel-1.4.1-makefile.patch b/zaptel-1.4.1-makefile.patch deleted file mode 100644 index 5d98a9c..0000000 --- a/zaptel-1.4.1-makefile.patch +++ /dev/null @@ -1,29 +0,0 @@ -Index: Makefile -=================================================================== ---- Makefile (revision 2341) -+++ Makefile (working copy) -@@ -386,10 +386,7 @@ - $(UTILSO): %.o: %.c - $(CC) $(CFLAGS) -o $@ -c $< - --install: all devices install-modules install-libs install-include install-xpp --ifeq ($(HOTPLUG_FIRMWARE),yes) -- $(MAKE) -C firmware hotplug-install --endif -+install: devices install-libs install-include install-xpp - if [ -f ztcfg ]; then \ - $(INSTALL) -D -m 755 ztcfg $(INSTALL_PREFIX)/sbin/ztcfg; \ - fi -@@ -403,12 +400,8 @@ - fi - $(INSTALL) -m 644 doc/ztcfg.8 $(INSTALL_PREFIX)/usr/share/man/man8 - $(INSTALL) -m 644 doc/zttool.8 $(INSTALL_PREFIX)/usr/share/man/man8 -- [ `id -u` = 0 ] && /sbin/depmod -a $(KVERS) || : - [ -f $(CONFIG_FILE) ] || $(INSTALL) -D -m 644 zaptel.conf.sample $(CONFIG_FILE) - build_tools/genmodconf $(BUILDVER) "$(ROOT_PREFIX)" "$(filter-out zaptel ztdummy xpp zttranscode ztdynamic,$(BUILD_MODULES)) $(MODULE_ALIASES)" -- @if [ -d /etc/modutils ]; then \ -- /sbin/update-modules ; \ -- fi - - install-libs: $(LTZ_SO) $(LTZ_A) - $(INSTALL) -D -m 755 $(LTZ_A) $(LIB_DIR)/$(LTZ_A) diff --git a/zaptel.spec b/zaptel.spec index 4fe74cb..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.2.1 +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}.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.1-makefile.patch - +Patch1: 0001-Fixed-potential-buffer-overflow.patch Source1: menuselect.makedeps Source2: menuselect.makeopts Source3: zaptel.init @@ -57,7 +56,7 @@ Development files for Zapata telephony interfaces. %setup0 -q %patch0 -p0 -%patch1 -p0 +%patch1 -p1 cp %{S:1} . cp %{S:2} . @@ -90,36 +89,21 @@ 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 -%if %{fedora} <= 5 -rm -f %{buildroot}%{_sysconfdir}/sysconfig/network-scripts/ifup-hdlc -rm -f %{buildroot}/sbin/sethdlc -rm -f %{buildroot}/sbin/sethdlc-new -%endif - %clean rm -rf %{buildroot} @@ -143,29 +127,20 @@ fi %defattr(-,root,root,-) %doc ChangeLog -%if %{fedora} > 5 %doc ifcfg-hdlc0 -%endif %doc LICENSE %doc README %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 -%if %{fedora} > 5 %{_sysconfdir}/sysconfig/network-scripts/ifup-hdlc -%endif /sbin/ztcfg -%if %{fedora} > 5 -/sbin/sethdlc /sbin/sethdlc-new -%endif %{_initrddir}/zaptel %{_mandir}/man8/ztcfg.8* @@ -187,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* @@ -201,6 +177,10 @@ fi %{_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 From ebfd7b65f48be740334dffbf52aada61ccd47d0a Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Sun, 4 Nov 2007 18:57:45 +0000 Subject: [PATCH 21/55] Initialize branch EL-5 for zaptel --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..42f697a --- /dev/null +++ b/branch @@ -0,0 +1 @@ +EL-5 From fd202553b402b4084bf7b9966084e57117ede18f Mon Sep 17 00:00:00 2001 From: "Jeffrey C. Ollie" Date: Thu, 20 Dec 2007 14:57:48 +0000 Subject: [PATCH 22/55] Update to 1.4.7.1 --- .cvsignore | 2 +- sources | 2 +- zaptel.spec | 8 +++++--- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.cvsignore b/.cvsignore index 2c56ac1..d84191a 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -zaptel-1.4.6.tar.gz +zaptel-1.4.7.1.tar.gz diff --git a/sources b/sources index a5ce608..09b266c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f0cf2e89028235c3dc447810e5089dbb zaptel-1.4.6.tar.gz +9d03a81a60f6c8a14617dcc81eb5efad zaptel-1.4.7.1.tar.gz diff --git a/zaptel.spec b/zaptel.spec index 55e1b41..4df05f9 100644 --- a/zaptel.spec +++ b/zaptel.spec @@ -1,13 +1,12 @@ Summary: Tools and libraries for using/configuring/monitoring Zapata telephony interfaces Name: zaptel -Version: 1.4.6 +Version: 1.4.7.1 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 @@ -56,7 +55,6 @@ Development files for Zapata telephony interfaces. %setup0 -q %patch0 -p0 -%patch1 -p1 cp %{S:1} . cp %{S:2} . @@ -177,6 +175,10 @@ fi %{_libdir}/libtonezone.so %changelog +* Thu Dec 20 2007 Jeffrey C. Ollie - 1.4.7.1-1 +- Update to 1.4.7.1 +- Drop upstreamed patch. + * Fri Nov 1 2007 Jeffrey C. Ollie - 1.4.6-1 - Update to 1.4.6 - Apply patch to fix AST-2007-024 From b096eff35d7ed2c04944bace068185e49d54c6a1 Mon Sep 17 00:00:00 2001 From: "Jeffrey C. Ollie" Date: Thu, 20 Dec 2007 15:23:46 +0000 Subject: [PATCH 23/55] Add udev BR --- zaptel.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/zaptel.spec b/zaptel.spec index 4df05f9..33f0fdd 100644 --- a/zaptel.spec +++ b/zaptel.spec @@ -14,6 +14,7 @@ Source3: zaptel.init BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n) BuildRequires: newt-devel +BuildRequires: udev Requires(pre): fedora-usermgmt From 8f119c59c41fa4bd4d3e3edfcba6bd8fb0fc0a63 Mon Sep 17 00:00:00 2001 From: "Jeffrey C. Ollie" Date: Thu, 20 Dec 2007 16:12:55 +0000 Subject: [PATCH 24/55] Remove unneeded patch. --- 0001-Fixed-potential-buffer-overflow.patch | 44 ---------------------- 1 file changed, 44 deletions(-) delete mode 100644 0001-Fixed-potential-buffer-overflow.patch diff --git a/0001-Fixed-potential-buffer-overflow.patch b/0001-Fixed-potential-buffer-overflow.patch deleted file mode 100644 index dd38f91..0000000 --- a/0001-Fixed-potential-buffer-overflow.patch +++ /dev/null @@ -1,44 +0,0 @@ -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 - From 689c2c49db0e2b81646988ec596270a553409b77 Mon Sep 17 00:00:00 2001 From: "Jeffrey C. Ollie" Date: Thu, 20 Dec 2007 18:19:28 +0000 Subject: [PATCH 25/55] Update to 1.4.7.1 --- .cvsignore | 2 +- 0001-Fixed-potential-buffer-overflow.patch | 44 ---------------------- sources | 2 +- zaptel.spec | 9 +++-- 4 files changed, 8 insertions(+), 49 deletions(-) delete mode 100644 0001-Fixed-potential-buffer-overflow.patch diff --git a/.cvsignore b/.cvsignore index 2c56ac1..d84191a 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -zaptel-1.4.6.tar.gz +zaptel-1.4.7.1.tar.gz diff --git a/0001-Fixed-potential-buffer-overflow.patch b/0001-Fixed-potential-buffer-overflow.patch deleted file mode 100644 index dd38f91..0000000 --- a/0001-Fixed-potential-buffer-overflow.patch +++ /dev/null @@ -1,44 +0,0 @@ -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/sources b/sources index a5ce608..09b266c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f0cf2e89028235c3dc447810e5089dbb zaptel-1.4.6.tar.gz +9d03a81a60f6c8a14617dcc81eb5efad zaptel-1.4.7.1.tar.gz diff --git a/zaptel.spec b/zaptel.spec index 55e1b41..33f0fdd 100644 --- a/zaptel.spec +++ b/zaptel.spec @@ -1,13 +1,12 @@ Summary: Tools and libraries for using/configuring/monitoring Zapata telephony interfaces Name: zaptel -Version: 1.4.6 +Version: 1.4.7.1 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 @@ -15,6 +14,7 @@ Source3: zaptel.init BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n) BuildRequires: newt-devel +BuildRequires: udev Requires(pre): fedora-usermgmt @@ -56,7 +56,6 @@ Development files for Zapata telephony interfaces. %setup0 -q %patch0 -p0 -%patch1 -p1 cp %{S:1} . cp %{S:2} . @@ -177,6 +176,10 @@ fi %{_libdir}/libtonezone.so %changelog +* Thu Dec 20 2007 Jeffrey C. Ollie - 1.4.7.1-1 +- Update to 1.4.7.1 +- Drop upstreamed patch. + * Fri Nov 1 2007 Jeffrey C. Ollie - 1.4.6-1 - Update to 1.4.6 - Apply patch to fix AST-2007-024 From efc7719f5de8e19cfe3e0a8c6e8b6bfb6cb7f930 Mon Sep 17 00:00:00 2001 From: "Jeffrey C. Ollie" Date: Tue, 15 Jan 2008 14:29:54 +0000 Subject: [PATCH 26/55] Update to 1.4.8 --- .cvsignore | 2 +- sources | 2 +- zaptel-1.4.0-beta1-udevzaptelowner.patch | 21 --------------------- zaptel-1.4.8-udevzaptelowner.patch | 11 +++++++++++ zaptel.spec | 7 +++++-- 5 files changed, 18 insertions(+), 25 deletions(-) delete mode 100644 zaptel-1.4.0-beta1-udevzaptelowner.patch create mode 100644 zaptel-1.4.8-udevzaptelowner.patch diff --git a/.cvsignore b/.cvsignore index d84191a..af0fcdf 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -zaptel-1.4.7.1.tar.gz +zaptel-1.4.8.tar.gz diff --git a/sources b/sources index 09b266c..e3c52d1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9d03a81a60f6c8a14617dcc81eb5efad zaptel-1.4.7.1.tar.gz +f57e1ba86a3dd4ef141ca3831e11c076 zaptel-1.4.8.tar.gz diff --git a/zaptel-1.4.0-beta1-udevzaptelowner.patch b/zaptel-1.4.0-beta1-udevzaptelowner.patch deleted file mode 100644 index e6c80de..0000000 --- a/zaptel-1.4.0-beta1-udevzaptelowner.patch +++ /dev/null @@ -1,21 +0,0 @@ -Index: build_tools/genudevrules -=================================================================== ---- build_tools/genudevrules (revision 1503) -+++ build_tools/genudevrules (working copy) -@@ -22,10 +22,10 @@ - - cat < - 1.4.8-1 +- Update to 1.4.8 + * Thu Dec 20 2007 Jeffrey C. Ollie - 1.4.7.1-1 - Update to 1.4.7.1 - Drop upstreamed patch. From 9a207a83ac6758824074f52ae6ed0ae9299c5db5 Mon Sep 17 00:00:00 2001 From: "Jeffrey C. Ollie" Date: Tue, 15 Jan 2008 14:34:58 +0000 Subject: [PATCH 27/55] Update to 1.4.8 --- .cvsignore | 2 +- sources | 2 +- zaptel-1.4.0-beta1-udevzaptelowner.patch | 21 --------------------- zaptel.spec | 7 +++++-- 4 files changed, 7 insertions(+), 25 deletions(-) delete mode 100644 zaptel-1.4.0-beta1-udevzaptelowner.patch diff --git a/.cvsignore b/.cvsignore index d84191a..af0fcdf 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -zaptel-1.4.7.1.tar.gz +zaptel-1.4.8.tar.gz diff --git a/sources b/sources index 09b266c..e3c52d1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9d03a81a60f6c8a14617dcc81eb5efad zaptel-1.4.7.1.tar.gz +f57e1ba86a3dd4ef141ca3831e11c076 zaptel-1.4.8.tar.gz diff --git a/zaptel-1.4.0-beta1-udevzaptelowner.patch b/zaptel-1.4.0-beta1-udevzaptelowner.patch deleted file mode 100644 index e6c80de..0000000 --- a/zaptel-1.4.0-beta1-udevzaptelowner.patch +++ /dev/null @@ -1,21 +0,0 @@ -Index: build_tools/genudevrules -=================================================================== ---- build_tools/genudevrules (revision 1503) -+++ build_tools/genudevrules (working copy) -@@ -22,10 +22,10 @@ - - cat < - 1.4.8-1 +- Update to 1.4.8 + * Thu Dec 20 2007 Jeffrey C. Ollie - 1.4.7.1-1 - Update to 1.4.7.1 - Drop upstreamed patch. From abf20b15e9bb4913e0cbd77113e7b3b41b4726cd Mon Sep 17 00:00:00 2001 From: "Jeffrey C. Ollie" Date: Tue, 15 Jan 2008 14:37:35 +0000 Subject: [PATCH 28/55] Fix patch. --- zaptel.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zaptel.spec b/zaptel.spec index 1febafe..bd7a720 100644 --- a/zaptel.spec +++ b/zaptel.spec @@ -55,7 +55,7 @@ Development files for Zapata telephony interfaces. %prep %setup0 -q -%patch0 -p0 +%patch0 -p1 cp %{S:1} . cp %{S:2} . From 24b4a10e609e4a59eba946b3d12064d93c9e2851 Mon Sep 17 00:00:00 2001 From: "Jeffrey C. Ollie" Date: Tue, 15 Jan 2008 14:39:51 +0000 Subject: [PATCH 29/55] Fix patch. --- zaptel-1.4.8-udevzaptelowner.patch | 11 +++++++++++ zaptel.spec | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 zaptel-1.4.8-udevzaptelowner.patch diff --git a/zaptel-1.4.8-udevzaptelowner.patch b/zaptel-1.4.8-udevzaptelowner.patch new file mode 100644 index 0000000..f75e047 --- /dev/null +++ b/zaptel-1.4.8-udevzaptelowner.patch @@ -0,0 +1,11 @@ +diff --git a/build_tools/genudevrules b/build_tools/genudevrules +index 8e8d556..5323b17 100755 +--- a/build_tools/genudevrules ++++ b/build_tools/genudevrules +@@ -31,5 +31,5 @@ KERNEL${match}"zappseudo", NAME="zap/pseudo" + KERNEL${match}"zap[0-9]*", NAME="zap/%n" + + # zaptel devices with ownership/permissions for running as non-root +-SUBSYSTEM=="zaptel", OWNER="asterisk", GROUP="asterisk", MODE="0660" ++SUBSYSTEM=="zaptel", OWNER="zaptel", GROUP="zaptel", MODE="0660" + EOF diff --git a/zaptel.spec b/zaptel.spec index 1febafe..bd7a720 100644 --- a/zaptel.spec +++ b/zaptel.spec @@ -55,7 +55,7 @@ Development files for Zapata telephony interfaces. %prep %setup0 -q -%patch0 -p0 +%patch0 -p1 cp %{S:1} . cp %{S:2} . From 62bb0c2f4ebdb3e1f989781fb252421e657a9292 Mon Sep 17 00:00:00 2001 From: "Jeffrey C. Ollie" Date: Tue, 15 Jan 2008 14:46:12 +0000 Subject: [PATCH 30/55] Package new files. --- zaptel.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/zaptel.spec b/zaptel.spec index bd7a720..096a4fc 100644 --- a/zaptel.spec +++ b/zaptel.spec @@ -156,12 +156,14 @@ fi %{_sbindir}/fxstest %{_sbindir}/ztdiag %{_sbindir}/ztmonitor +%{_sbindir}/ztscan %{_sbindir}/ztspeed %{_sbindir}/zttest %{_sbindir}/zttool %{_mandir}/man8/fxotune.8* %{_mandir}/man8/fxstest.8* +%{_mandir}/man8/ztdiag.8* %{_mandir}/man8/ztmonitor.8* %{_mandir}/man8/ztspeed.8* %{_mandir}/man8/zttest.8* From ec5cad19f799a2ac54d61d5417815c3a4376bb8f Mon Sep 17 00:00:00 2001 From: "Jeffrey C. Ollie" Date: Tue, 15 Jan 2008 16:12:28 +0000 Subject: [PATCH 31/55] Move ztscan to proper location --- zaptel.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zaptel.spec b/zaptel.spec index 096a4fc..cfc3a0a 100644 --- a/zaptel.spec +++ b/zaptel.spec @@ -96,7 +96,7 @@ mkdir -p %{buildroot}%{_mandir}/man8 make install-programs install-udev config DESTDIR=%{buildroot} -for f in fxotune fxstest ztdiag ztmonitor ztspeed zttest zttool +for f in fxotune fxstest ztdiag ztmonitor ztscan ztspeed zttest zttool do mv %{buildroot}/sbin/$f %{buildroot}%{_sbindir}/$f done From 5a2e7eb0b56685a57a436edd1183a41398dd3d61 Mon Sep 17 00:00:00 2001 From: "Jeffrey C. Ollie" Date: Tue, 15 Jan 2008 16:45:51 +0000 Subject: [PATCH 32/55] Really get this working --- zaptel.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/zaptel.spec b/zaptel.spec index bd7a720..cfc3a0a 100644 --- a/zaptel.spec +++ b/zaptel.spec @@ -96,7 +96,7 @@ mkdir -p %{buildroot}%{_mandir}/man8 make install-programs install-udev config DESTDIR=%{buildroot} -for f in fxotune fxstest ztdiag ztmonitor ztspeed zttest zttool +for f in fxotune fxstest ztdiag ztmonitor ztscan ztspeed zttest zttool do mv %{buildroot}/sbin/$f %{buildroot}%{_sbindir}/$f done @@ -156,12 +156,14 @@ fi %{_sbindir}/fxstest %{_sbindir}/ztdiag %{_sbindir}/ztmonitor +%{_sbindir}/ztscan %{_sbindir}/ztspeed %{_sbindir}/zttest %{_sbindir}/zttool %{_mandir}/man8/fxotune.8* %{_mandir}/man8/fxstest.8* +%{_mandir}/man8/ztdiag.8* %{_mandir}/man8/ztmonitor.8* %{_mandir}/man8/ztspeed.8* %{_mandir}/man8/zttest.8* From b68076030d5ad9b77f6a042b109c3afb8938cd94 Mon Sep 17 00:00:00 2001 From: "Jeffrey C. Ollie" Date: Mon, 11 Feb 2008 16:53:16 +0000 Subject: [PATCH 33/55] Rebuild for GCC 4.3 --- zaptel.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zaptel.spec b/zaptel.spec index cfc3a0a..44d4f74 100644 --- a/zaptel.spec +++ b/zaptel.spec @@ -1,7 +1,7 @@ Summary: Tools and libraries for using/configuring/monitoring Zapata telephony interfaces Name: zaptel Version: 1.4.8 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: Applications/System URL: http://www.digium.com/ @@ -178,6 +178,9 @@ fi %{_libdir}/libtonezone.so %changelog +* Mon Feb 11 2008 Jeffrey C. Ollie - 1.4.8-2 +- Rebuild for GCC 4.3 + * Mon Jan 14 2008 Jeffrey C. Ollie - 1.4.8-1 - Update to 1.4.8 From e9794eccf2de609d43a6723fd2c6f71100feeee7 Mon Sep 17 00:00:00 2001 From: "Jeffrey C. Ollie" Date: Thu, 21 Feb 2008 13:46:21 +0000 Subject: [PATCH 34/55] Update to 1.4.9. --- .cvsignore | 2 +- sources | 2 +- zaptel.spec | 7 +++++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index af0fcdf..93a9cb0 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -zaptel-1.4.8.tar.gz +zaptel-1.4.9.tar.gz diff --git a/sources b/sources index e3c52d1..b55b6f5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f57e1ba86a3dd4ef141ca3831e11c076 zaptel-1.4.8.tar.gz +f08b8291eb0bccbec8e546c9fb43fd2e zaptel-1.4.9.tar.gz diff --git a/zaptel.spec b/zaptel.spec index 44d4f74..67a4230 100644 --- a/zaptel.spec +++ b/zaptel.spec @@ -1,7 +1,7 @@ Summary: Tools and libraries for using/configuring/monitoring Zapata telephony interfaces Name: zaptel -Version: 1.4.8 -Release: 2%{?dist} +Version: 1.4.9 +Release: 1%{?dist} License: GPL Group: Applications/System URL: http://www.digium.com/ @@ -178,6 +178,9 @@ fi %{_libdir}/libtonezone.so %changelog +* Thu Feb 21 2008 Jeffrey C. Ollie - 1.4.9-1 +- Update to 1.4.9. + * Mon Feb 11 2008 Jeffrey C. Ollie - 1.4.8-2 - Rebuild for GCC 4.3 From 21b0eb18a620e524122e0796e2f7faed18973029 Mon Sep 17 00:00:00 2001 From: "Jeffrey C. Ollie" Date: Thu, 21 Feb 2008 15:24:47 +0000 Subject: [PATCH 35/55] Update to 1.4.9. --- .cvsignore | 2 +- sources | 2 +- zaptel.spec | 8 +++++++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index af0fcdf..93a9cb0 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -zaptel-1.4.8.tar.gz +zaptel-1.4.9.tar.gz diff --git a/sources b/sources index e3c52d1..b55b6f5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f57e1ba86a3dd4ef141ca3831e11c076 zaptel-1.4.8.tar.gz +f08b8291eb0bccbec8e546c9fb43fd2e zaptel-1.4.9.tar.gz diff --git a/zaptel.spec b/zaptel.spec index cfc3a0a..67a4230 100644 --- a/zaptel.spec +++ b/zaptel.spec @@ -1,6 +1,6 @@ Summary: Tools and libraries for using/configuring/monitoring Zapata telephony interfaces Name: zaptel -Version: 1.4.8 +Version: 1.4.9 Release: 1%{?dist} License: GPL Group: Applications/System @@ -178,6 +178,12 @@ fi %{_libdir}/libtonezone.so %changelog +* Thu Feb 21 2008 Jeffrey C. Ollie - 1.4.9-1 +- Update to 1.4.9. + +* Mon Feb 11 2008 Jeffrey C. Ollie - 1.4.8-2 +- Rebuild for GCC 4.3 + * Mon Jan 14 2008 Jeffrey C. Ollie - 1.4.8-1 - Update to 1.4.8 From 72fb901f6c6be07fe2ac7eb8e64f7559944f4c8a Mon Sep 17 00:00:00 2001 From: "Jeffrey C. Ollie" Date: Wed, 9 Apr 2008 05:38:04 +0000 Subject: [PATCH 36/55] - Update to 1.4.10 --- .cvsignore | 2 +- sources | 2 +- zaptel-1.4.10-udevzaptelowner.patch | 23 +++++++++++++++++++++++ zaptel-1.4.8-udevzaptelowner.patch | 11 ----------- zaptel.spec | 7 +++++-- 5 files changed, 30 insertions(+), 15 deletions(-) create mode 100644 zaptel-1.4.10-udevzaptelowner.patch delete mode 100644 zaptel-1.4.8-udevzaptelowner.patch diff --git a/.cvsignore b/.cvsignore index 93a9cb0..b5384d5 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -zaptel-1.4.9.tar.gz +zaptel-1.4.10.tar.gz diff --git a/sources b/sources index b55b6f5..8338c13 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f08b8291eb0bccbec8e546c9fb43fd2e zaptel-1.4.9.tar.gz +2acfc39f4089a28961e1c489bbf82db6 zaptel-1.4.10.tar.gz diff --git a/zaptel-1.4.10-udevzaptelowner.patch b/zaptel-1.4.10-udevzaptelowner.patch new file mode 100644 index 0000000..8006739 --- /dev/null +++ b/zaptel-1.4.10-udevzaptelowner.patch @@ -0,0 +1,23 @@ +From 32a671bbf9ae1103626d539b4fce7d649d39e11f Mon Sep 17 00:00:00 2001 +From: Jeffrey C. Ollie +Date: Tue, 15 Jan 2008 08:01:31 -0600 +Subject: [PATCH] Apply udevzaptelowner patch from rpm package. + +--- + build_tools/genudevrules | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/build_tools/genudevrules b/build_tools/genudevrules +index 17e1f90..fa6987b 100755 +--- a/build_tools/genudevrules ++++ b/build_tools/genudevrules +@@ -31,5 +31,5 @@ KERNEL${match}"zappseudo", NAME="zap/pseudo" + KERNEL${match}"zap[0-9]*", NAME="zap/%n" + + # zaptel devices with ownership/permissions for running as non-root +-SUBSYSTEM${match}"zaptel", OWNER="asterisk", GROUP="asterisk", MODE="0660" ++SUBSYSTEM${match}"zaptel", OWNER="zaptel", GROUP="zaptel", MODE="0660" + EOF +-- +1.5.4.3 + diff --git a/zaptel-1.4.8-udevzaptelowner.patch b/zaptel-1.4.8-udevzaptelowner.patch deleted file mode 100644 index f75e047..0000000 --- a/zaptel-1.4.8-udevzaptelowner.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff --git a/build_tools/genudevrules b/build_tools/genudevrules -index 8e8d556..5323b17 100755 ---- a/build_tools/genudevrules -+++ b/build_tools/genudevrules -@@ -31,5 +31,5 @@ KERNEL${match}"zappseudo", NAME="zap/pseudo" - KERNEL${match}"zap[0-9]*", NAME="zap/%n" - - # zaptel devices with ownership/permissions for running as non-root --SUBSYSTEM=="zaptel", OWNER="asterisk", GROUP="asterisk", MODE="0660" -+SUBSYSTEM=="zaptel", OWNER="zaptel", GROUP="zaptel", MODE="0660" - EOF diff --git a/zaptel.spec b/zaptel.spec index 67a4230..67dbd14 100644 --- a/zaptel.spec +++ b/zaptel.spec @@ -1,12 +1,12 @@ Summary: Tools and libraries for using/configuring/monitoring Zapata telephony interfaces Name: zaptel -Version: 1.4.9 +Version: 1.4.10 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.8-udevzaptelowner.patch +Patch0: zaptel-1.4.10-udevzaptelowner.patch Source1: menuselect.makedeps Source2: menuselect.makeopts Source3: zaptel.init @@ -178,6 +178,9 @@ fi %{_libdir}/libtonezone.so %changelog +* Wed Apr 9 2008 Jeffrey C. Ollie - 1.4.10-1 +- Update to 1.4.10 + * Thu Feb 21 2008 Jeffrey C. Ollie - 1.4.9-1 - Update to 1.4.9. From 4aa22cc278987e98a5ab29961247ffeb4aeb0f02 Mon Sep 17 00:00:00 2001 From: "Jeffrey C. Ollie" Date: Wed, 9 Apr 2008 05:44:21 +0000 Subject: [PATCH 37/55] Add missing file. --- zaptel.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/zaptel.spec b/zaptel.spec index 67dbd14..824c749 100644 --- a/zaptel.spec +++ b/zaptel.spec @@ -165,6 +165,7 @@ fi %{_mandir}/man8/fxstest.8* %{_mandir}/man8/ztdiag.8* %{_mandir}/man8/ztmonitor.8* +%{_mandir}/man8/ztscan.8* %{_mandir}/man8/ztspeed.8* %{_mandir}/man8/zttest.8* %{_mandir}/man8/zttool.8* From c861e2533cf8c14ae5445bfbd1bc7eac12568191 Mon Sep 17 00:00:00 2001 From: "Jeffrey C. Ollie" Date: Wed, 9 Apr 2008 11:44:21 +0000 Subject: [PATCH 38/55] Fix udev rule generation. --- zaptel.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/zaptel.spec b/zaptel.spec index 824c749..84534bc 100644 --- a/zaptel.spec +++ b/zaptel.spec @@ -94,7 +94,9 @@ 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} +make install-programs install-udev config DESTDIR=%{buildroot} DYNFS=yes UDEVRULES=yes + +#build_tools/genudevrules > %{buildroot}%{_sysconfdir}/udev/rules.d/zaptel.rules for f in fxotune fxstest ztdiag ztmonitor ztscan ztspeed zttest zttool do From 2dee42498df9c95b3fa4ae9e2d61e3d4e3a51fc4 Mon Sep 17 00:00:00 2001 From: "Jeffrey C. Ollie" Date: Wed, 9 Apr 2008 12:01:34 +0000 Subject: [PATCH 39/55] Fix udev rule generation. --- zaptel.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zaptel.spec b/zaptel.spec index 84534bc..eb8d826 100644 --- a/zaptel.spec +++ b/zaptel.spec @@ -94,9 +94,9 @@ 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} DYNFS=yes UDEVRULES=yes +make install-programs config DESTDIR=%{buildroot} -#build_tools/genudevrules > %{buildroot}%{_sysconfdir}/udev/rules.d/zaptel.rules +build_tools/genudevrules > %{buildroot}%{_sysconfdir}/udev/rules.d/zaptel.rules for f in fxotune fxstest ztdiag ztmonitor ztscan ztspeed zttest zttool do From 799c9f6ff8ee1fb4209e764d85f438f6ba48efdd Mon Sep 17 00:00:00 2001 From: "Jeffrey C. Ollie" Date: Fri, 9 May 2008 13:18:04 +0000 Subject: [PATCH 40/55] - Update to 1.4.10.1 --- .cvsignore | 2 +- sources | 2 +- zaptel.spec | 5 ++++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index b5384d5..a91e0b2 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -zaptel-1.4.10.tar.gz +zaptel-1.4.10.1.tar.gz diff --git a/sources b/sources index 8338c13..e66276d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2acfc39f4089a28961e1c489bbf82db6 zaptel-1.4.10.tar.gz +120fdcbfeab8cce9918baf4c4225e974 zaptel-1.4.10.1.tar.gz diff --git a/zaptel.spec b/zaptel.spec index eb8d826..619c1be 100644 --- a/zaptel.spec +++ b/zaptel.spec @@ -1,6 +1,6 @@ Summary: Tools and libraries for using/configuring/monitoring Zapata telephony interfaces Name: zaptel -Version: 1.4.10 +Version: 1.4.10.1 Release: 1%{?dist} License: GPL Group: Applications/System @@ -181,6 +181,9 @@ fi %{_libdir}/libtonezone.so %changelog +* Thu May 8 2008 Jeffrey C. Ollie - 1.4.10.1-1 +- Update to 1.4.10.1 + * Wed Apr 9 2008 Jeffrey C. Ollie - 1.4.10-1 - Update to 1.4.10 From d625533a02229083626533fcba16e04516276f51 Mon Sep 17 00:00:00 2001 From: "Jeffrey C. Ollie" Date: Fri, 9 May 2008 14:57:48 +0000 Subject: [PATCH 41/55] - Update to 1.4.10.1 --- .cvsignore | 2 +- sources | 2 +- zaptel-1.4.10-udevzaptelowner.patch | 23 +++++++++++++++++++++++ zaptel-1.4.8-udevzaptelowner.patch | 11 ----------- zaptel.spec | 15 ++++++++++++--- 5 files changed, 37 insertions(+), 16 deletions(-) create mode 100644 zaptel-1.4.10-udevzaptelowner.patch delete mode 100644 zaptel-1.4.8-udevzaptelowner.patch diff --git a/.cvsignore b/.cvsignore index 93a9cb0..a91e0b2 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -zaptel-1.4.9.tar.gz +zaptel-1.4.10.1.tar.gz diff --git a/sources b/sources index b55b6f5..e66276d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f08b8291eb0bccbec8e546c9fb43fd2e zaptel-1.4.9.tar.gz +120fdcbfeab8cce9918baf4c4225e974 zaptel-1.4.10.1.tar.gz diff --git a/zaptel-1.4.10-udevzaptelowner.patch b/zaptel-1.4.10-udevzaptelowner.patch new file mode 100644 index 0000000..8006739 --- /dev/null +++ b/zaptel-1.4.10-udevzaptelowner.patch @@ -0,0 +1,23 @@ +From 32a671bbf9ae1103626d539b4fce7d649d39e11f Mon Sep 17 00:00:00 2001 +From: Jeffrey C. Ollie +Date: Tue, 15 Jan 2008 08:01:31 -0600 +Subject: [PATCH] Apply udevzaptelowner patch from rpm package. + +--- + build_tools/genudevrules | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/build_tools/genudevrules b/build_tools/genudevrules +index 17e1f90..fa6987b 100755 +--- a/build_tools/genudevrules ++++ b/build_tools/genudevrules +@@ -31,5 +31,5 @@ KERNEL${match}"zappseudo", NAME="zap/pseudo" + KERNEL${match}"zap[0-9]*", NAME="zap/%n" + + # zaptel devices with ownership/permissions for running as non-root +-SUBSYSTEM${match}"zaptel", OWNER="asterisk", GROUP="asterisk", MODE="0660" ++SUBSYSTEM${match}"zaptel", OWNER="zaptel", GROUP="zaptel", MODE="0660" + EOF +-- +1.5.4.3 + diff --git a/zaptel-1.4.8-udevzaptelowner.patch b/zaptel-1.4.8-udevzaptelowner.patch deleted file mode 100644 index f75e047..0000000 --- a/zaptel-1.4.8-udevzaptelowner.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff --git a/build_tools/genudevrules b/build_tools/genudevrules -index 8e8d556..5323b17 100755 ---- a/build_tools/genudevrules -+++ b/build_tools/genudevrules -@@ -31,5 +31,5 @@ KERNEL${match}"zappseudo", NAME="zap/pseudo" - KERNEL${match}"zap[0-9]*", NAME="zap/%n" - - # zaptel devices with ownership/permissions for running as non-root --SUBSYSTEM=="zaptel", OWNER="asterisk", GROUP="asterisk", MODE="0660" -+SUBSYSTEM=="zaptel", OWNER="zaptel", GROUP="zaptel", MODE="0660" - EOF diff --git a/zaptel.spec b/zaptel.spec index 67a4230..619c1be 100644 --- a/zaptel.spec +++ b/zaptel.spec @@ -1,12 +1,12 @@ Summary: Tools and libraries for using/configuring/monitoring Zapata telephony interfaces Name: zaptel -Version: 1.4.9 +Version: 1.4.10.1 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.8-udevzaptelowner.patch +Patch0: zaptel-1.4.10-udevzaptelowner.patch Source1: menuselect.makedeps Source2: menuselect.makeopts Source3: zaptel.init @@ -94,7 +94,9 @@ 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} +make install-programs config DESTDIR=%{buildroot} + +build_tools/genudevrules > %{buildroot}%{_sysconfdir}/udev/rules.d/zaptel.rules for f in fxotune fxstest ztdiag ztmonitor ztscan ztspeed zttest zttool do @@ -165,6 +167,7 @@ fi %{_mandir}/man8/fxstest.8* %{_mandir}/man8/ztdiag.8* %{_mandir}/man8/ztmonitor.8* +%{_mandir}/man8/ztscan.8* %{_mandir}/man8/ztspeed.8* %{_mandir}/man8/zttest.8* %{_mandir}/man8/zttool.8* @@ -178,6 +181,12 @@ fi %{_libdir}/libtonezone.so %changelog +* Thu May 8 2008 Jeffrey C. Ollie - 1.4.10.1-1 +- Update to 1.4.10.1 + +* Wed Apr 9 2008 Jeffrey C. Ollie - 1.4.10-1 +- Update to 1.4.10 + * Thu Feb 21 2008 Jeffrey C. Ollie - 1.4.9-1 - Update to 1.4.9. From 4bfc38675d83aa36e4b9870e68f197ebb6b1fbeb Mon Sep 17 00:00:00 2001 From: "Jeffrey C. Ollie" Date: Thu, 29 May 2008 04:14:29 +0000 Subject: [PATCH 42/55] - Update to 1.4.11 --- .cvsignore | 2 +- sources | 2 +- zaptel.spec | 5 ++++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index a91e0b2..3dbd816 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -zaptel-1.4.10.1.tar.gz +zaptel-1.4.11.tar.gz diff --git a/sources b/sources index e66276d..240c7e4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -120fdcbfeab8cce9918baf4c4225e974 zaptel-1.4.10.1.tar.gz +894d548d180fddf360de1c0426a68bac zaptel-1.4.11.tar.gz diff --git a/zaptel.spec b/zaptel.spec index 619c1be..eb6788f 100644 --- a/zaptel.spec +++ b/zaptel.spec @@ -1,6 +1,6 @@ Summary: Tools and libraries for using/configuring/monitoring Zapata telephony interfaces Name: zaptel -Version: 1.4.10.1 +Version: 1.4.11 Release: 1%{?dist} License: GPL Group: Applications/System @@ -181,6 +181,9 @@ fi %{_libdir}/libtonezone.so %changelog +* Wed May 28 2008 Jeffrey C. Ollie - 1.4.11-1 +- Update to 1.4.11 + * Thu May 8 2008 Jeffrey C. Ollie - 1.4.10.1-1 - Update to 1.4.10.1 From 3058569ab32fd32b4e884363faceb1e5c9b14a92 Mon Sep 17 00:00:00 2001 From: "Jeffrey C. Ollie" Date: Thu, 29 May 2008 05:08:54 +0000 Subject: [PATCH 43/55] - Update to 1.4.11 --- .cvsignore | 2 +- sources | 2 +- zaptel.spec | 5 ++++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index a91e0b2..3dbd816 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -zaptel-1.4.10.1.tar.gz +zaptel-1.4.11.tar.gz diff --git a/sources b/sources index e66276d..240c7e4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -120fdcbfeab8cce9918baf4c4225e974 zaptel-1.4.10.1.tar.gz +894d548d180fddf360de1c0426a68bac zaptel-1.4.11.tar.gz diff --git a/zaptel.spec b/zaptel.spec index 619c1be..eb6788f 100644 --- a/zaptel.spec +++ b/zaptel.spec @@ -1,6 +1,6 @@ Summary: Tools and libraries for using/configuring/monitoring Zapata telephony interfaces Name: zaptel -Version: 1.4.10.1 +Version: 1.4.11 Release: 1%{?dist} License: GPL Group: Applications/System @@ -181,6 +181,9 @@ fi %{_libdir}/libtonezone.so %changelog +* Wed May 28 2008 Jeffrey C. Ollie - 1.4.11-1 +- Update to 1.4.11 + * Thu May 8 2008 Jeffrey C. Ollie - 1.4.10.1-1 - Update to 1.4.10.1 From 4ddf5b8308f4230b8b756a7e6907b46c5ecdb416 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jason=20=E3=83=86=E3=82=A3=E3=83=93=E3=83=84?= Date: Mon, 11 Aug 2008 23:48:12 +0000 Subject: [PATCH 44/55] - Fix license tag. --- zaptel.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/zaptel.spec b/zaptel.spec index eb6788f..85e2d2a 100644 --- a/zaptel.spec +++ b/zaptel.spec @@ -1,8 +1,8 @@ Summary: Tools and libraries for using/configuring/monitoring Zapata telephony interfaces Name: zaptel Version: 1.4.11 -Release: 1%{?dist} -License: GPL +Release: 2%{?dist} +License: GPLv2+ Group: Applications/System URL: http://www.digium.com/ Source0: http://downloads.digium.com/pub/telephony/zaptel/releases/zaptel-%{version}.tar.gz @@ -181,6 +181,9 @@ fi %{_libdir}/libtonezone.so %changelog +* Mon Aug 11 2008 Jason L Tibbitts III - 1.4.11-2 +- Fix license tag. + * Wed May 28 2008 Jeffrey C. Ollie - 1.4.11-1 - Update to 1.4.11 From f7ca89ad523bf748d97638bda2a0c50cd8ddc41b Mon Sep 17 00:00:00 2001 From: "Jeffrey C. Ollie" Date: Thu, 4 Sep 2008 13:10:42 +0000 Subject: [PATCH 45/55] - Update to 1.4.12 --- zaptel.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/zaptel.spec b/zaptel.spec index 85e2d2a..068a1b2 100644 --- a/zaptel.spec +++ b/zaptel.spec @@ -1,7 +1,7 @@ Summary: Tools and libraries for using/configuring/monitoring Zapata telephony interfaces Name: zaptel -Version: 1.4.11 -Release: 2%{?dist} +Version: 1.4.12 +Release: 1%{?dist} License: GPLv2+ Group: Applications/System URL: http://www.digium.com/ @@ -181,6 +181,9 @@ fi %{_libdir}/libtonezone.so %changelog +* Thu Sep 4 2008 Jeffrey C. Ollie - 1.4.12-1 +- Update to 1.4.12 + * Mon Aug 11 2008 Jason L Tibbitts III - 1.4.11-2 - Fix license tag. From 247202476e2c1bc6a7f28176f5aceb5ed90d4003 Mon Sep 17 00:00:00 2001 From: "Jeffrey C. Ollie" Date: Thu, 4 Sep 2008 13:41:54 +0000 Subject: [PATCH 46/55] Upload sources --- .cvsignore | 2 +- sources | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.cvsignore b/.cvsignore index 3dbd816..234411c 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -zaptel-1.4.11.tar.gz +zaptel-1.4.12.tar.gz diff --git a/sources b/sources index 240c7e4..94ad5c5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -894d548d180fddf360de1c0426a68bac zaptel-1.4.11.tar.gz +95789a0960c82da6aaf63cf9736af066 zaptel-1.4.12.tar.gz From 56aadbad6bd479b5de5197cb86bbc552ba987ad5 Mon Sep 17 00:00:00 2001 From: "Jeffrey C. Ollie" Date: Wed, 10 Sep 2008 02:33:29 +0000 Subject: [PATCH 47/55] - Update to 1.4.12.1 --- .cvsignore | 2 +- sources | 2 +- zaptel.spec | 5 ++++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 234411c..875667f 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -zaptel-1.4.12.tar.gz +zaptel-1.4.12.1.tar.gz diff --git a/sources b/sources index 94ad5c5..63f038e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -95789a0960c82da6aaf63cf9736af066 zaptel-1.4.12.tar.gz +71e83a020b020fa60905edecf70e95a3 zaptel-1.4.12.1.tar.gz diff --git a/zaptel.spec b/zaptel.spec index 068a1b2..ac2e2d4 100644 --- a/zaptel.spec +++ b/zaptel.spec @@ -1,6 +1,6 @@ Summary: Tools and libraries for using/configuring/monitoring Zapata telephony interfaces Name: zaptel -Version: 1.4.12 +Version: 1.4.12.1 Release: 1%{?dist} License: GPLv2+ Group: Applications/System @@ -181,6 +181,9 @@ fi %{_libdir}/libtonezone.so %changelog +* Tue Sep 9 2008 Jeffrey C. Ollie - 1.4.12.1-1 +- Update to 1.4.12.1 + * Thu Sep 4 2008 Jeffrey C. Ollie - 1.4.12-1 - Update to 1.4.12 From 9284ac3d9e76f50eed39e39284f1910347e434c1 Mon Sep 17 00:00:00 2001 From: "Jeffrey C. Ollie" Date: Wed, 8 Oct 2008 20:45:43 +0000 Subject: [PATCH 48/55] - Update to 1.4.12.1 --- .cvsignore | 2 +- sources | 2 +- zaptel.spec | 13 +++++++++++-- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 3dbd816..875667f 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -zaptel-1.4.11.tar.gz +zaptel-1.4.12.1.tar.gz diff --git a/sources b/sources index 240c7e4..63f038e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -894d548d180fddf360de1c0426a68bac zaptel-1.4.11.tar.gz +71e83a020b020fa60905edecf70e95a3 zaptel-1.4.12.1.tar.gz diff --git a/zaptel.spec b/zaptel.spec index eb6788f..ac2e2d4 100644 --- a/zaptel.spec +++ b/zaptel.spec @@ -1,8 +1,8 @@ Summary: Tools and libraries for using/configuring/monitoring Zapata telephony interfaces Name: zaptel -Version: 1.4.11 +Version: 1.4.12.1 Release: 1%{?dist} -License: GPL +License: GPLv2+ Group: Applications/System URL: http://www.digium.com/ Source0: http://downloads.digium.com/pub/telephony/zaptel/releases/zaptel-%{version}.tar.gz @@ -181,6 +181,15 @@ fi %{_libdir}/libtonezone.so %changelog +* Tue Sep 9 2008 Jeffrey C. Ollie - 1.4.12.1-1 +- Update to 1.4.12.1 + +* Thu Sep 4 2008 Jeffrey C. Ollie - 1.4.12-1 +- Update to 1.4.12 + +* Mon Aug 11 2008 Jason L Tibbitts III - 1.4.11-2 +- Fix license tag. + * Wed May 28 2008 Jeffrey C. Ollie - 1.4.11-1 - Update to 1.4.11 From 1c2aa0c5dbd86c6138670f2d2aab766e79dbc841 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 25 Feb 2009 18:32:22 +0000 Subject: [PATCH 49/55] - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild --- zaptel.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zaptel.spec b/zaptel.spec index ac2e2d4..097d95a 100644 --- a/zaptel.spec +++ b/zaptel.spec @@ -1,7 +1,7 @@ Summary: Tools and libraries for using/configuring/monitoring Zapata telephony interfaces Name: zaptel Version: 1.4.12.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: Applications/System URL: http://www.digium.com/ @@ -181,6 +181,9 @@ fi %{_libdir}/libtonezone.so %changelog +* Wed Feb 25 2009 Fedora Release Engineering - 1.4.12.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Tue Sep 9 2008 Jeffrey C. Ollie - 1.4.12.1-1 - Update to 1.4.12.1 From 961f0b9b3e8627310478a198cc3e6d48365b61d3 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Mon, 27 Jul 2009 08:59:16 +0000 Subject: [PATCH 50/55] - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild --- zaptel.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zaptel.spec b/zaptel.spec index 097d95a..a555895 100644 --- a/zaptel.spec +++ b/zaptel.spec @@ -1,7 +1,7 @@ Summary: Tools and libraries for using/configuring/monitoring Zapata telephony interfaces Name: zaptel Version: 1.4.12.1 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ Group: Applications/System URL: http://www.digium.com/ @@ -181,6 +181,9 @@ fi %{_libdir}/libtonezone.so %changelog +* Mon Jul 27 2009 Fedora Release Engineering - 1.4.12.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Wed Feb 25 2009 Fedora Release Engineering - 1.4.12.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From 0c44e2351c969c4f4f0755cba672004900656069 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 22:39:17 +0000 Subject: [PATCH 51/55] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index aa555e0..279b920 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: zaptel -# $Id$ +# $Id: Makefile,v 1.1 2006/10/16 11:52:12 jcollie Exp $ 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 +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 6a7d3bedff876bb54b1a01165c347b96eb897b44 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:08:49 +0000 Subject: [PATCH 52/55] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index aa555e0..279b920 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: zaptel -# $Id$ +# $Id: Makefile,v 1.1 2006/10/16 11:52:12 jcollie Exp $ 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 +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 88905e1e57b65a7b27c70f99e2ef82d0b9edaabc Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Mon, 10 May 2010 17:37:28 +0000 Subject: [PATCH 53/55] replaced by dahdi-tools long long ago --- Makefile | 21 -- dead.package | 1 + menuselect.makedeps | 7 - menuselect.makeopts | 3 - sources | 1 - zaptel-1.4.10-udevzaptelowner.patch | 23 --- zaptel.init | 63 ------ zaptel.spec | 308 ---------------------------- 8 files changed, 1 insertion(+), 426 deletions(-) delete mode 100644 Makefile create mode 100644 dead.package delete mode 100644 menuselect.makedeps delete mode 100644 menuselect.makeopts delete mode 100644 sources delete mode 100644 zaptel-1.4.10-udevzaptelowner.patch delete mode 100644 zaptel.init delete mode 100644 zaptel.spec diff --git a/Makefile b/Makefile deleted file mode 100644 index 279b920..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: zaptel -# $Id: Makefile,v 1.1 2006/10/16 11:52:12 jcollie Exp $ -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 $$d/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/dead.package b/dead.package new file mode 100644 index 0000000..ce73424 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +replaced my dahdi-tools diff --git a/menuselect.makedeps b/menuselect.makedeps deleted file mode 100644 index be2db24..0000000 --- a/menuselect.makedeps +++ /dev/null @@ -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 diff --git a/menuselect.makeopts b/menuselect.makeopts deleted file mode 100644 index 71b4f89..0000000 --- a/menuselect.makeopts +++ /dev/null @@ -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= diff --git a/sources b/sources deleted file mode 100644 index 63f038e..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -71e83a020b020fa60905edecf70e95a3 zaptel-1.4.12.1.tar.gz diff --git a/zaptel-1.4.10-udevzaptelowner.patch b/zaptel-1.4.10-udevzaptelowner.patch deleted file mode 100644 index 8006739..0000000 --- a/zaptel-1.4.10-udevzaptelowner.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 32a671bbf9ae1103626d539b4fce7d649d39e11f Mon Sep 17 00:00:00 2001 -From: Jeffrey C. Ollie -Date: Tue, 15 Jan 2008 08:01:31 -0600 -Subject: [PATCH] Apply udevzaptelowner patch from rpm package. - ---- - build_tools/genudevrules | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/build_tools/genudevrules b/build_tools/genudevrules -index 17e1f90..fa6987b 100755 ---- a/build_tools/genudevrules -+++ b/build_tools/genudevrules -@@ -31,5 +31,5 @@ KERNEL${match}"zappseudo", NAME="zap/pseudo" - KERNEL${match}"zap[0-9]*", NAME="zap/%n" - - # zaptel devices with ownership/permissions for running as non-root --SUBSYSTEM${match}"zaptel", OWNER="asterisk", GROUP="asterisk", MODE="0660" -+SUBSYSTEM${match}"zaptel", OWNER="zaptel", GROUP="zaptel", MODE="0660" - EOF --- -1.5.4.3 - diff --git a/zaptel.init b/zaptel.init deleted file mode 100644 index 59255a8..0000000 --- a/zaptel.init +++ /dev/null @@ -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 - diff --git a/zaptel.spec b/zaptel.spec deleted file mode 100644 index a555895..0000000 --- a/zaptel.spec +++ /dev/null @@ -1,308 +0,0 @@ -Summary: Tools and libraries for using/configuring/monitoring Zapata telephony interfaces -Name: zaptel -Version: 1.4.12.1 -Release: 3%{?dist} -License: GPLv2+ -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.10-udevzaptelowner.patch -Source1: menuselect.makedeps -Source2: menuselect.makeopts -Source3: zaptel.init - -BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n) - -BuildRequires: newt-devel -BuildRequires: udev - -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 -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 config DESTDIR=%{buildroot} - -build_tools/genudevrules > %{buildroot}%{_sysconfdir}/udev/rules.d/zaptel.rules - -for f in fxotune fxstest ztdiag ztmonitor ztscan 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}/ztscan -%{_sbindir}/ztspeed -%{_sbindir}/zttest -%{_sbindir}/zttool - -%{_mandir}/man8/fxotune.8* -%{_mandir}/man8/fxstest.8* -%{_mandir}/man8/ztdiag.8* -%{_mandir}/man8/ztmonitor.8* -%{_mandir}/man8/ztscan.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 -* Mon Jul 27 2009 Fedora Release Engineering - 1.4.12.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Wed Feb 25 2009 Fedora Release Engineering - 1.4.12.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Tue Sep 9 2008 Jeffrey C. Ollie - 1.4.12.1-1 -- Update to 1.4.12.1 - -* Thu Sep 4 2008 Jeffrey C. Ollie - 1.4.12-1 -- Update to 1.4.12 - -* Mon Aug 11 2008 Jason L Tibbitts III - 1.4.11-2 -- Fix license tag. - -* Wed May 28 2008 Jeffrey C. Ollie - 1.4.11-1 -- Update to 1.4.11 - -* Thu May 8 2008 Jeffrey C. Ollie - 1.4.10.1-1 -- Update to 1.4.10.1 - -* Wed Apr 9 2008 Jeffrey C. Ollie - 1.4.10-1 -- Update to 1.4.10 - -* Thu Feb 21 2008 Jeffrey C. Ollie - 1.4.9-1 -- Update to 1.4.9. - -* Mon Feb 11 2008 Jeffrey C. Ollie - 1.4.8-2 -- Rebuild for GCC 4.3 - -* Mon Jan 14 2008 Jeffrey C. Ollie - 1.4.8-1 -- Update to 1.4.8 - -* Thu Dec 20 2007 Jeffrey C. Ollie - 1.4.7.1-1 -- Update to 1.4.7.1 -- Drop upstreamed patch. - -* 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 - -* Sun Oct 15 2006 Jeffrey C. Ollie - 1.4.0-2.beta1 -- Don't package firmware until license can be figured out. - -* Fri Oct 13 2006 Jeffrey C. Ollie - 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 - 1.4.0-0.beta1 -- Update to 1.4.0-beta1 - -* Fri Jun 9 2006 Jeffrey C. Ollie - 1.2.6-3 -- Bump release and rebuild. - -* Thu Apr 27 2006 Jeffrey C. Ollie - 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 - 1.2.5-1 -- Update to 1.2.5 - -* Wed Feb 15 2006 Jeffrey C. Ollie - 1.2.4-1 -- Update to 1.2.4 - -* Tue Jan 31 2006 Jeffrey C. Ollie - 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 - 1.2.3-1 -- Update to 1.2.3. - -* Mon Jan 23 2006 Jeffrey C. Ollie - 1.2.2-3 -- provide zaptel-kmod-common - -* Wed Jan 18 2006 Jeffrey C. Ollie - 1.2.2-2 -- Bump release number. - -* Wed Jan 18 2006 Jeffrey C. Ollie - 1.2.2-1 -- Update to 1.2.2. - -* Fri Jan 13 2006 Jeffrey C. Ollie - 1.2.1-2 -- Devel subpackage needs to require main package. - -* Wed Jan 11 2006 Jeffrey C. Ollie - 1.2.1-1 -- Initial version for Fedora Extras From 10701217c8419085871a7ff804935816fadacabb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 16:27:48 +0000 Subject: [PATCH 54/55] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 279b920..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: zaptel -# $Id: Makefile,v 1.1 2006/10/16 11:52:12 jcollie Exp $ -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 $$d/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/branch b/branch deleted file mode 100644 index 42f697a..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -EL-5 From 682c330857bc0c378effbbefb8ccd0aaa3bf0df2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 16:27:49 +0000 Subject: [PATCH 55/55] dist-git conversion --- .cvsignore => .gitignore | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .cvsignore => .gitignore (100%) diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore