rpms/zaptel/F-7 0001-Fixed-potential-buffer-overflow.patch, NONE, 1.1 .cvsignore, 1.7, 1.8 sources, 1.7, 1.8 zaptel.spec, 1.12, 1.13
Jeffrey C. Ollie (jcollie)
fedora-extras-commits at redhat.com
Sat Nov 3 04:50:33 UTC 2007
Author: jcollie
Update of /cvs/pkgs/rpms/zaptel/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18071
Modified Files:
.cvsignore sources zaptel.spec
Added Files:
0001-Fixed-potential-buffer-overflow.patch
Log Message:
Update to 1.4.6
0001-Fixed-potential-buffer-overflow.patch:
--- NEW FILE 0001-Fixed-potential-buffer-overflow.patch ---
>From 4c9b832d29f81a2f90b2bd8a29f5be90fd599495 Mon Sep 17 00:00:00 2001
From: mmichelson <mmichelson at f558416c-6c06-0410-9f27-dde2687782d0>
Date: Wed, 31 Oct 2007 21:08:15 +0000
Subject: [PATCH] Fixed potential buffer overflow.
See AST-2007-024 for more details
git-svn-id: http://svn.digium.com/svn/zaptel/branches/1.2@3205 f558416c-6c06-0410-9f27-dde2687782d0
---
sethdlc-new.c | 2 +-
sethdlc.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/sethdlc-new.c b/sethdlc-new.c
index 4a4a7bb..1765c32 100644
--- a/sethdlc-new.c
+++ b/sethdlc-new.c
@@ -673,7 +673,7 @@ int main(int arg_c, char *arg_v[])
if (sock < 0)
error("Unable to create socket: %s\n", strerror(errno));
- strcpy(req.ifr_name, argv[1]); /* Device name */
+ strncpy(req.ifr_name, argv[1], sizeof(req.ifr_name) - 1); /* Device name */
if (argc == 2)
show_port();
diff --git a/sethdlc.c b/sethdlc.c
index 3514b2e..afbcb20 100644
--- a/sethdlc.c
+++ b/sethdlc.c
@@ -293,7 +293,7 @@ int main(int argc, char *argv[])
if (sock<0)
error("Unable to create socket: %s\n", strerror(errno));
- strcpy(req.ifr_name, argv[1]); /* Device name */
+ strncpy(req.ifr_name, argv[1], sizeof(req.ifr_name) - 1); /* Device name */
if (argc == 2) {
show_port(sock);
--
1.5.3.3
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/zaptel/F-7/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore 25 Apr 2007 20:00:51 -0000 1.7
+++ .cvsignore 3 Nov 2007 04:49:57 -0000 1.8
@@ -1 +1 @@
-zaptel-1.4.2.1.tar.gz
+zaptel-1.4.6.tar.gz
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/zaptel/F-7/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources 25 Apr 2007 20:00:51 -0000 1.7
+++ sources 3 Nov 2007 04:49:57 -0000 1.8
@@ -1 +1 @@
-42ce771a840ec239abfd945923a98b56 zaptel-1.4.2.1.tar.gz
+f0cf2e89028235c3dc447810e5089dbb zaptel-1.4.6.tar.gz
Index: zaptel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zaptel/F-7/zaptel.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- zaptel.spec 25 Apr 2007 20:00:51 -0000 1.12
+++ zaptel.spec 3 Nov 2007 04:49:57 -0000 1.13
@@ -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 @@
%setup0 -q
%patch0 -p0
-%patch1 -p0
+%patch1 -p1
cp %{S:1} .
cp %{S:2} .
@@ -90,36 +89,21 @@
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 @@
%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 @@
%{_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 @@
%{_libdir}/libtonezone.so
%changelog
+* Fri Nov 1 2007 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.4.6-1
+- Update to 1.4.6
+- Apply patch to fix AST-2007-024
+
* Wed Apr 25 2007 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.4.2.1-1
- Update to 1.4.2.1
More information about the fedora-extras-commits
mailing list