From 6a80bae130fd208a256a2c71db56757a2332f562 Mon Sep 17 00:00:00 2001 From: Jeremy Katz Date: Mon, 23 Oct 2006 19:47:28 +0000 Subject: [PATCH 01/12] Initialize branch FC-6 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..d5b6362 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +FC-6 From af38169c2d245ccc51417d6d41f9aa774b36b774 Mon Sep 17 00:00:00 2001 From: "Jeffrey C. Ollie" Date: Wed, 25 Oct 2006 14:39:41 +0000 Subject: [PATCH 02/12] - 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 a1a250b2cdbffcd26085a32d10b90150ec4b1ba2 Mon Sep 17 00:00:00 2001 From: "Jeffrey C. Ollie" Date: Sat, 16 Dec 2006 04:39:49 +0000 Subject: [PATCH 03/12] 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 1dbb9e4968c6a63c714abd2de94d43c45757746d Mon Sep 17 00:00:00 2001 From: "Jeffrey C. Ollie" Date: Sun, 24 Dec 2006 03:45:12 +0000 Subject: [PATCH 04/12] 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 d49f6b61624892349f1583cfe8d121a21209b846 Mon Sep 17 00:00:00 2001 From: "Jeffrey C. Ollie" Date: Sun, 24 Dec 2006 04:41:20 +0000 Subject: [PATCH 05/12] (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 7c7daf571bb7948421b46d1965914de570d1188c Mon Sep 17 00:00:00 2001 From: "Jeffrey C. Ollie" Date: Fri, 23 Mar 2007 05:07:33 +0000 Subject: [PATCH 06/12] 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 46318c2ab431b2845f718659fa5a5ed463ccd90c Mon Sep 17 00:00:00 2001 From: "Jeffrey C. Ollie" Date: Sat, 24 Mar 2007 04:23:32 +0000 Subject: [PATCH 07/12] 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 de00829b394b6677cceb4a2d3ee3864d6b253eda Mon Sep 17 00:00:00 2001 From: "Jeffrey C. Ollie" Date: Mon, 26 Mar 2007 12:55:18 +0000 Subject: [PATCH 08/12] 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 639f094cfcd35bd1f9d7e832be65ca5cd0fe51fd Mon Sep 17 00:00:00 2001 From: "Jeffrey C. Ollie" Date: Wed, 25 Apr 2007 20:02:57 +0000 Subject: [PATCH 09/12] 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 f89d2aad3a8f8e961024939fe82eaf96500cc582 Mon Sep 17 00:00:00 2001 From: "Jeffrey C. Ollie" Date: Sat, 3 Nov 2007 05:31:25 +0000 Subject: [PATCH 10/12] 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 727b565ecf8ad0a930f5e0875d8f2e35440847ea Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:08:49 +0000 Subject: [PATCH 11/12] 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 0c498952cacf1293d3c75299cc499b6510f40490 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 16:27:54 +0000 Subject: [PATCH 12/12] 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 d5b6362..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -FC-6