diff --git a/.gitignore b/.gitignore index 2c56ac1..875667f 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -zaptel-1.4.6.tar.gz +zaptel-1.4.12.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/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 a5ce608..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -f0cf2e89028235c3dc447810e5089dbb zaptel-1.4.6.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 </dev/null || : -/usr/sbin/fedora-useradd 29 -r -s /sbin/nologin -d / -M \ - -c 'Zapata Telephony' -g zaptel zaptel &>/dev/null || : -/sbin/chkconfig --add zaptel - -%preun -if [ $1 -eq 0 ]; then - /sbin/service zaptel stop >/dev/null 2>&1 - /sbin/chkconfig --del zaptel -fi - -%post lib -p /sbin/ldconfig - -%postun lib -p /sbin/ldconfig - -%files -%defattr(-,root,root,-) - -%doc ChangeLog -%doc ifcfg-hdlc0 -%doc LICENSE -%doc README -%doc README.fxotune -%doc README.fxsusb -%doc zaptel.conf.sample - -%config(noreplace) %{_sysconfdir}/zaptel.conf -%config(noreplace) %{_sysconfdir}/sysconfig/zaptel -%config(noreplace) %{_sysconfdir}/udev/rules.d/zaptel.rules - -%{_sysconfdir}/sysconfig/network-scripts/ifup-hdlc -/sbin/ztcfg -/sbin/sethdlc-new - -%{_initrddir}/zaptel -%{_mandir}/man8/ztcfg.8* - -%files lib -%defattr(-,root,root,-) -%{_libdir}/libtonezone.so.1 -%{_libdir}/libtonezone.so.1.0 - -%files utils -%defattr(-,root,root,-) - -%{_sbindir}/fxotune -%{_sbindir}/fxstest -%{_sbindir}/ztdiag -%{_sbindir}/ztmonitor -%{_sbindir}/ztspeed -%{_sbindir}/zttest -%{_sbindir}/zttool - -%{_mandir}/man8/fxotune.8* -%{_mandir}/man8/fxstest.8* -%{_mandir}/man8/ztmonitor.8* -%{_mandir}/man8/ztspeed.8* -%{_mandir}/man8/zttest.8* -%{_mandir}/man8/zttool.8* - -%files devel -%defattr(-,root,root,-) -%doc LICENSE -%dir %{_includedir}/zaptel -%{_includedir}/zaptel/tonezone.h -%{_includedir}/zaptel/zaptel.h -%{_libdir}/libtonezone.so - -%changelog -* Fri Nov 1 2007 Jeffrey C. Ollie - 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