[Pkg-voip-commits] r909 - in zaptel/trunk/debian: . patches
Mark Purcell
msp at costa.debian.org
Tue Nov 1 20:13:45 UTC 2005
Author: msp
Date: 2005-11-01 20:13:44 +0000 (Tue, 01 Nov 2005)
New Revision: 909
Modified:
zaptel/trunk/debian/changelog
zaptel/trunk/debian/patches/Makefile_man.dpatch
zaptel/trunk/debian/patches/Makefile_targets.dpatch
zaptel/trunk/debian/patches/fxotune_tmpfile.dpatch
Log:
* Update fxotune_tmpfile.dpatch
Modified: zaptel/trunk/debian/changelog
===================================================================
--- zaptel/trunk/debian/changelog 2005-11-01 20:02:36 UTC (rev 908)
+++ zaptel/trunk/debian/changelog 2005-11-01 20:13:44 UTC (rev 909)
@@ -3,8 +3,9 @@
* New upstream release
* Update Makefile_targets.dpatch
* Update Makefile_man
+ * Update fxotune_tmpfile.dpatch
- -- Mark Purcell <msp at debian.org> Tue, 1 Nov 2005 20:02:19 +0000
+ -- Mark Purcell <msp at debian.org> Tue, 1 Nov 2005 20:13:26 +0000
zaptel (1:1.2.0-0beta1-1) experimental; urgency=low
Modified: zaptel/trunk/debian/patches/Makefile_man.dpatch
===================================================================
--- zaptel/trunk/debian/patches/Makefile_man.dpatch 2005-11-01 20:02:36 UTC (rev 908)
+++ zaptel/trunk/debian/patches/Makefile_man.dpatch 2005-11-01 20:13:44 UTC (rev 909)
@@ -6,8 +6,8 @@
@DPATCH@
diff -urNad zaptel-1.2.0-beta2~/Makefile zaptel-1.2.0-beta2/Makefile
---- zaptel-1.2.0-beta2~/Makefile 2005-11-01 19:59:45.000000000 +0000
-+++ zaptel-1.2.0-beta2/Makefile 2005-11-01 20:01:45.000000000 +0000
+--- zaptel-1.2.0-beta2~/Makefile 2005-11-01 20:12:14.000000000 +0000
++++ zaptel-1.2.0-beta2/Makefile 2005-11-01 20:12:14.000000000 +0000
@@ -144,6 +144,13 @@
all: modules manpages $(LIBTONEZONE_SO)
@@ -22,54 +22,3 @@
programs: $(BINS)
modules: $(BUILDVER)
-diff -urNad zaptel-1.2.0-beta2~/Makefile.rej zaptel-1.2.0-beta2/Makefile.rej
---- zaptel-1.2.0-beta2~/Makefile.rej 2005-11-01 19:59:45.000000000 +0000
-+++ zaptel-1.2.0-beta2/Makefile.rej 2005-11-01 19:59:45.000000000 +0000
-@@ -1,21 +1,33 @@
- ***************
--*** 129,135 ****
-- #PRIMARY=wcfxo
-- PWD:=$(shell pwd)
-+*** 297,316 ****
-
--- all: $(BUILDVER) $(LIBTONEZONE_SO) manpages
-+ manpages: doc/ztcfg.8.gz doc/ztmonitor.8.gz doc/zttool.8.gz
-
-- linux24: $(MODULESO) $(BINS)
-+- doc/ztcfg.8.gz: doc/ztcfg.sgml
-+- rm -f doc/ztcfg.8.gz
-+- docbook2man -o doc doc/ztcfg.sgml
-+- gzip doc/ztcfg.8
-+-
-+- doc/zttool.8.gz: doc/zttool.sgml
-+- rm -f doc/zttool.8.gz
-+- docbook2man -o doc doc/zttool.sgml
-+- gzip doc/zttool.8
-+-
-+- doc/ztmonitor.8.gz: doc/ztmonitor.sgml
-+- rm -f doc/ztmonitor.8.gz
-+- docbook2man -o doc doc/ztmonitor.sgml
-+- gzip doc/ztmonitor.8
-
----- 139,149 ----
-- #PRIMARY=wcfxo
-- PWD:=$(shell pwd)
-+ install: all devices
-+ install -D -m 755 ztcfg $(INSTALL_PREFIX)/sbin/ztcfg
-+--- 297,306 ----
-
--+ all: modules $(LIBTONEZONE_SO) manpages
--+
--+ programs: $(BINS)
--+
--+ modules: $(BUILDVER)
-+ manpages: doc/ztcfg.8.gz doc/ztmonitor.8.gz doc/zttool.8.gz
-
-- linux24: $(MODULESO) $(BINS)
-++ doc/%.8.gz: doc/%.sgml
-++ rm -f $@
-++ docbook2man -o doc $<
-++ gzip doc/$*.8
-
-+ install: all devices
-+ install -D -m 755 ztcfg $(INSTALL_PREFIX)/sbin/ztcfg
Modified: zaptel/trunk/debian/patches/Makefile_targets.dpatch
===================================================================
--- zaptel/trunk/debian/patches/Makefile_targets.dpatch 2005-11-01 20:02:36 UTC (rev 908)
+++ zaptel/trunk/debian/patches/Makefile_targets.dpatch 2005-11-01 20:13:44 UTC (rev 909)
@@ -7,8 +7,8 @@
@DPATCH@
diff -urNad zaptel-1.2.0-beta2~/Makefile zaptel-1.2.0-beta2/Makefile
---- zaptel-1.2.0-beta2~/Makefile 2005-11-01 19:52:00.000000000 +0000
-+++ zaptel-1.2.0-beta2/Makefile 2005-11-01 19:53:45.000000000 +0000
+--- zaptel-1.2.0-beta2~/Makefile 2005-11-01 20:12:06.000000000 +0000
++++ zaptel-1.2.0-beta2/Makefile 2005-11-01 20:12:06.000000000 +0000
@@ -118,6 +118,16 @@
endif
MODULESO:=$(MODULES:%=%.o)
@@ -60,28 +60,3 @@
clean:
rm -f torisatool makefw tor2fw.h radfw.h
rm -f ${BINS}
-diff -urNad zaptel-1.2.0-beta2~/Makefile.rej zaptel-1.2.0-beta2/Makefile.rej
---- zaptel-1.2.0-beta2~/Makefile.rej 1970-01-01 01:00:00.000000000 +0100
-+++ zaptel-1.2.0-beta2/Makefile.rej 2005-11-01 19:52:00.000000000 +0000
-@@ -0,0 +1,21 @@
-+***************
-+*** 129,135 ****
-+ #PRIMARY=wcfxo
-+ PWD:=$(shell pwd)
-+
-+- all: $(BUILDVER) $(LIBTONEZONE_SO) manpages
-+
-+ linux24: $(MODULESO) $(BINS)
-+
-+--- 139,149 ----
-+ #PRIMARY=wcfxo
-+ PWD:=$(shell pwd)
-+
-++ all: modules $(LIBTONEZONE_SO) manpages
-++
-++ programs: $(BINS)
-++
-++ modules: $(BUILDVER)
-+
-+ linux24: $(MODULESO) $(BINS)
-+
Modified: zaptel/trunk/debian/patches/fxotune_tmpfile.dpatch
===================================================================
--- zaptel/trunk/debian/patches/fxotune_tmpfile.dpatch 2005-11-01 20:02:36 UTC (rev 908)
+++ zaptel/trunk/debian/patches/fxotune_tmpfile.dpatch 2005-11-01 20:13:44 UTC (rev 909)
@@ -5,19 +5,19 @@
## DP: Fixes insecure temporary file handling in fxotune (in detect mode, -i)
@DPATCH@
-diff -urNad zaptel-1.2.0-0beta1/fxotune.c /tmp/dpep.sF8yv8/zaptel-1.2.0-0beta1/fxotune.c
---- zaptel-1.2.0-0beta1/fxotune.c 2005-09-10 20:34:45.299697146 +0300
-+++ /tmp/dpep.sF8yv8/zaptel-1.2.0-0beta1/fxotune.c 2005-09-10 20:35:06.309170971 +0300
-@@ -303,9 +303,10 @@
- float acim_results[16];
+diff -urNad zaptel-1.2.0-beta2~/fxotune.c zaptel-1.2.0-beta2/fxotune.c
+--- zaptel-1.2.0-beta2~/fxotune.c 2005-10-05 22:05:49.000000000 +0100
++++ zaptel-1.2.0-beta2/fxotune.c 2005-11-01 20:08:56.000000000 +0000
+@@ -133,9 +133,10 @@
-- outfile = fopen("/tmp/fxotune.vals", "w");
-+ outfile = tmpfile();
- if (!outfile) {
-- fprintf(stdout, "Cannot create /tmp/txotune.vals\n");
-+ fprintf(stdout, "Cannot create temporary file: %d (%s)\n",
-+ errno, strerror(errno));
- return -1;
+ if (debug) {
+- outfile = fopen("fxotune.vals", "w");
++ outfile = tmpfile();
+ if (!outfile) {
+- fprintf(stdout, "Cannot create fxotune.vals\n");
++ fprintf(stdout, "Cannot create temporary file: %d (%s)\n",
++ errno, strerror(errno));
+ return -1;
+ }
}
-
More information about the Pkg-voip-commits
mailing list