From 62d2f34ecc99dbdb5765505fdf981aced00ff06a Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Fri, 18 May 2007 11:55:42 +0000 Subject: [PATCH 01/11] Initialize branch F-7 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..c48525c --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-7 From fef8b1cc91d2f5f0cb37d9a6d4e174a19efe8d23 Mon Sep 17 00:00:00 2001 From: "Jeffrey C. Ollie" Date: Sat, 3 Nov 2007 04:49:57 +0000 Subject: [PATCH 02/11] Update to 1.4.6 --- .cvsignore | 2 +- 0001-Fixed-potential-buffer-overflow.patch | 44 ++++++++++++++++++++++ sources | 2 +- zaptel.spec | 40 +++++--------------- 4 files changed, 56 insertions(+), 32 deletions(-) create mode 100644 0001-Fixed-potential-buffer-overflow.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.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 2667f2af27c00f846b23f0ec8b92f51c8bef4f13 Mon Sep 17 00:00:00 2001 From: "Jeffrey C. Ollie" Date: Sat, 3 Nov 2007 05:07:20 +0000 Subject: [PATCH 03/11] Remove unneeded patch. --- zaptel-1.4.1-makefile.patch | 29 ----------------------------- 1 file changed, 29 deletions(-) delete mode 100644 zaptel-1.4.1-makefile.patch 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) From 51af743894129a29ad1541a3580a6578dc471b08 Mon Sep 17 00:00:00 2001 From: "Jeffrey C. Ollie" Date: Thu, 20 Dec 2007 16:52:36 +0000 Subject: [PATCH 04/11] 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 d10d47500ad6b9f1210beb9264138b2065450de7 Mon Sep 17 00:00:00 2001 From: "Jeffrey C. Ollie" Date: Tue, 15 Jan 2008 14:42:57 +0000 Subject: [PATCH 05/11] 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 | 9 ++++++--- 5 files changed, 19 insertions(+), 26 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 6226e84a1eebc3be796899349f1f1365f2e67b42 Mon Sep 17 00:00:00 2001 From: "Jeffrey C. Ollie" Date: Tue, 15 Jan 2008 16:49:04 +0000 Subject: [PATCH 06/11] 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 fabe2cbb7d187cc69d62863e5f6e9965e245f169 Mon Sep 17 00:00:00 2001 From: "Jeffrey C. Ollie" Date: Thu, 21 Feb 2008 14:05:27 +0000 Subject: [PATCH 07/11] 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 0984ab64ea9269cb95411f6de7a34a3b53daa491 Mon Sep 17 00:00:00 2001 From: "Jeffrey C. Ollie" Date: Fri, 9 May 2008 14:48:25 +0000 Subject: [PATCH 08/11] - 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 43af190f167c286aed3b45d12f8eb3bfaf2164fe Mon Sep 17 00:00:00 2001 From: "Jeffrey C. Ollie" Date: Thu, 29 May 2008 04:44:33 +0000 Subject: [PATCH 09/11] - 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 d262e4b7d90cb27a879a1a2fae393c53e018ca16 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:08:49 +0000 Subject: [PATCH 10/11] 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 e9d9807c75e22bd8ba2ad24f6f9793d0d5bfafa6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 16:27:41 +0000 Subject: [PATCH 11/11] 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 c48525c..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-7