[Pkg-voip-commits] r3511 - in yate/trunk/debian: . patches
Mark Purcell
msp at alioth.debian.org
Wed May 2 20:06:58 UTC 2007
Author: msp
Date: 2007-05-02 20:06:57 +0000 (Wed, 02 May 2007)
New Revision: 3511
Added:
yate/trunk/debian/patches/zaptel-header.dpatch
Removed:
yate/trunk/debian/patches/amd64.dpatch
yate/trunk/debian/patches/gcc4.dpatch
yate/trunk/debian/patches/noapidocs.dpatch
yate/trunk/debian/patches/zapchan.dpatch
Modified:
yate/trunk/debian/changelog
yate/trunk/debian/patches/00list
Log:
* Cleanup debian/patches and add zaptel-headers.dpatch
Modified: yate/trunk/debian/changelog
===================================================================
--- yate/trunk/debian/changelog 2007-05-02 19:55:43 UTC (rev 3510)
+++ yate/trunk/debian/changelog 2007-05-02 20:06:57 UTC (rev 3511)
@@ -1,7 +1,5 @@
-yate (1.2.0-1.dfsg-1) UNRELEASED; urgency=high
+yate (1.2.0-1.dfsg-1) unstable; urgency=high
- * NOT RELEASED YET
-
[ Mikael Magnusson ]
* New upstream release
* MD5 patch applied by upstream.
@@ -13,8 +11,9 @@
* Urgency high as this addresess DoS vulnerability
- CVE-2007-1693 [Fwd: Radware Security Advisory - Yate 1.1.0 Denial of
Service Vulnerability] (Closes: #421994)
+ * Cleanup debian/patches and add zaptel-headers.dpatch
- -- Mark Purcell <msp at debian.org> Wed, 02 May 2007 20:48:51 +0100
+ -- Mark Purcell <msp at debian.org> Wed, 02 May 2007 21:06:13 +0100
yate (1.1.0-1.dfsg-1) unstable; urgency=low
Modified: yate/trunk/debian/patches/00list
===================================================================
--- yate/trunk/debian/patches/00list 2007-05-02 19:55:43 UTC (rev 3510)
+++ yate/trunk/debian/patches/00list 2007-05-02 20:06:57 UTC (rev 3511)
@@ -1,6 +1,2 @@
-#gcc4
-#amd64
-#noapidocs
-#zapchan
configure_ilbc
-zaptel
+zaptel-header
Deleted: yate/trunk/debian/patches/amd64.dpatch
===================================================================
--- yate/trunk/debian/patches/amd64.dpatch 2007-05-02 19:55:43 UTC (rev 3510)
+++ yate/trunk/debian/patches/amd64.dpatch 2007-05-02 20:06:57 UTC (rev 3511)
@@ -1,18 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## amd64.dpatch by Kilian Krause <kilian at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: fix building with gcc4 on amd64
-
- at DPATCH@
---- yate/modules/extmodule.cpp 2005-04-23 17:00:06.000000000 +0000
-+++ yate-0.8.7+cvs20050604/modules/extmodule.cpp 2005-09-06 22:03:39.000000000 +0000
-@@ -318,7 +318,7 @@
- : m_msg(msg), m_ret(false)
- {
- // the address of this object should be unique
-- m_id << (unsigned int)this << "." << (unsigned int)random();
-+ m_id << (unsigned int)(unsigned long)this << "." << (unsigned int)random();
- }
-
- bool MsgHolder::decode(const char *s)
Deleted: yate/trunk/debian/patches/gcc4.dpatch
===================================================================
--- yate/trunk/debian/patches/gcc4.dpatch 2007-05-02 19:55:43 UTC (rev 3510)
+++ yate/trunk/debian/patches/gcc4.dpatch 2007-05-02 20:06:57 UTC (rev 3511)
@@ -1,125 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## gcc4.dpatch by Kilian Krause <kilian at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: fix building with gcc4
-
- at DPATCH@
-diff -urN --exclude=debian yate/contrib/qt/qtclientform.cpp yate.patched/contrib/qt/qtclientform.cpp
---- yate/contrib/qt/qtclientform.cpp 2005-01-22 02:20:42.000000000 +0000
-+++ yate.patched/contrib/qt/qtclientform.cpp 2005-09-06 19:06:38.000000000 +0000
-@@ -50,7 +50,8 @@
- correctDigit = new QPushButton (this);
- correctDigit->setGeometry (90, 90, 30, 20);
- correctDigit->setText ("<=");
-- QKeySequence seqCorrectDigit (UNICODE_ACCEL + '-');//Key_Backspace
-+ QCString temp(UNICODE_ACCEL);
-+ QKeySequence seqCorrectDigit (temp + '-');//Key_Backspace
- correctDigit->setAccel (seqCorrectDigit);
- connect (correctDigit, SIGNAL(clicked()), numberDisplay, SLOT(removeLastDigit()));
- correctDigit->setFocusPolicy (NoFocus);
-@@ -58,7 +59,7 @@
- rejectCall = new QPushButton (this);
- rejectCall->setGeometry (67, 120, 53, 20);
- rejectCall->setText ("Reject");
-- QKeySequence seqRejectCall (UNICODE_ACCEL + '/');
-+ QKeySequence seqRejectCall (temp + '/');
- rejectCall->setAccel (seqRejectCall);
- rejectCall->setFocusPolicy (NoFocus);
- connect (rejectCall, SIGNAL (clicked()),
-@@ -76,7 +77,7 @@
- quitButton = new QPushButton (this);
- quitButton->setGeometry (10, 90, 53, 20);
- quitButton->setText ("Quit");
-- QKeySequence seqQuitButton (UNICODE_ACCEL + 'q');
-+ QKeySequence seqQuitButton (temp + 'q');
- quitButton->setAccel (seqQuitButton);
- quitButton->setFocusPolicy (NoFocus);
- connect (quitButton, SIGNAL (clicked()),
-@@ -102,7 +103,7 @@
- addToAddressBookButton = new QPushButton (this);
- addToAddressBookButton->setGeometry (215, 50, 75, 25);
- addToAddressBookButton->setText ("Add");
-- QKeySequence seqAddButton (UNICODE_ACCEL + 'a');
-+ QKeySequence seqAddButton (temp + 'a');
- addToAddressBookButton->setAccel (seqAddButton);
- addToAddressBookButton->setFocusPolicy (NoFocus);
- connect (addToAddressBookButton, SIGNAL (clicked()),
-diff -urN --exclude=debian yate/contrib/qt/yatedialbutton.cpp yate.patched/contrib/qt/yatedialbutton.cpp
---- yate/contrib/qt/yatedialbutton.cpp 2005-01-10 02:32:57.000000000 +0000
-+++ yate.patched/contrib/qt/yatedialbutton.cpp 2005-09-06 19:06:38.000000000 +0000
-@@ -39,12 +39,13 @@
- connect (this, SIGNAL(clicked()), this, SLOT(clickedAction()));
-
- QKeySequence *seq = NULL;
-+ QCString temp(UNICODE_ACCEL);
- if (value >= '0' && value <='9')
-- seq = new QKeySequence (UNICODE_ACCEL + value);
-+ seq = new QKeySequence (temp + value);
- if (value == '*')
-- seq = new QKeySequence (UNICODE_ACCEL + '*');
-+ seq = new QKeySequence (temp + '*');
- if (value == '#')
-- seq = new QKeySequence (UNICODE_ACCEL + '.'); /* change it with '#', but it's nicer if you use the numeric keypad */
-+ seq = new QKeySequence (temp + '.'); /* change it with '#', but it's nicer if you use the numeric keypad */
- if (seq)
- setAccel (*seq);
- setFocusPolicy (NoFocus);
-diff -urN --exclude=debian yate/modules/ortpchan.cpp yate.patched/modules/ortpchan.cpp
---- yate/modules/ortpchan.cpp 2005-02-03 22:49:16.000000000 +0000
-+++ yate.patched/modules/ortpchan.cpp 2005-09-06 18:56:32.000000000 +0000
-@@ -68,6 +68,8 @@
- };
-
- static Configuration s_cfg;
-+class YateRTPAudioSource;
-+class YateRTPAudioConsumer;
-
- class YateRTPWrapper : public RefObject
- {
-diff -urN --exclude=debian yate/modules/zapchan.cpp yate.patched/modules/zapchan.cpp
---- yate/modules/zapchan.cpp 2005-03-28 14:27:37.000000000 +0000
-+++ yate.patched/modules/zapchan.cpp 2005-09-06 19:06:38.000000000 +0000
-@@ -612,7 +612,7 @@
- Debug(DebugAll,"PriSpan::PriSpan(%p,%d,%d,%d) [%p]",_pri,span,chans,fd,this);
- if (overlapDial > 0)
- m_overlapped = overlapDial;
-- ZapChan **ch = new ZapChan* [chans];
-+ ZapChan **ch = new ZapChan*[chans];
- for (int i = 1; i <= chans; i++)
- ch[i-1] = (i == dchan) ? 0 : new ZapChan(this,i,s_buflen);
- m_chans = ch;
-diff -urN --exclude=debian yate/telengine.h yate.patched/telengine.h
---- yate/telengine.h 2005-04-22 20:05:42.000000000 +0000
-+++ yate.patched/telengine.h 2005-09-06 18:46:11.000000000 +0000
-@@ -1942,6 +1942,7 @@
- class Runnable
- {
- public:
-+ virtual ~Runnable() {}
- /**
- * This method is called in another thread to do the actual job.
- * When it returns the job or thread terminates.
-diff -urN --exclude=debian yate/telephony.h yate.patched/telephony.h
---- yate/telephony.h 2005-02-06 20:13:20.000000000 +0000
-+++ yate.patched/telephony.h 2005-09-06 18:47:10.000000000 +0000
-@@ -34,6 +34,11 @@
- */
- namespace TelEngine {
-
-+class DataSource;
-+class DataTranslator;
-+class ThreadedSourcePrivate;
-+class TranslatorFactory;
-+
- /**
- * A structure to hold information about a data format.
- */
-@@ -118,6 +123,7 @@
- FormatRepository& operator=(const FormatRepository&);
- virtual void dummy() const = 0;
- public:
-+ virtual ~FormatRepository() {}
- /**
- * Retrieve a format by name and type
- * @param name Standard name of the format to find
Deleted: yate/trunk/debian/patches/noapidocs.dpatch
===================================================================
--- yate/trunk/debian/patches/noapidocs.dpatch 2007-05-02 19:55:43 UTC (rev 3510)
+++ yate/trunk/debian/patches/noapidocs.dpatch 2007-05-02 20:06:57 UTC (rev 3511)
@@ -1,29 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## noapidocs.dpatch by Kilian Krause <kilian at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: right now we don't want apidocs while kdoc is broken *sigh*
-
- at DPATCH@
---- yate-0.8.7+cvs20050604/Makefile.old 2005-09-06 19:15:40.000000000 +0000
-+++ yate-0.8.7+cvs20050604/Makefile.in 2005-09-06 19:16:06.000000000 +0000
-@@ -126,7 +126,7 @@
- @echo '#define CFG_PATH "$(DESTDIR)$(confdir)"' >> $@
-
- .PHONY: install install-root
--install install-root: all apidocs
-+install install-root: all
- @mkdir -p "$(DESTDIR)$(libdir)/" && \
- for i in $(SLIBS) ; do \
- if [ -h "$$i" ]; then \
-@@ -158,8 +158,8 @@
- for i in $(DOCS) ; do \
- install -m 0644 @srcdir@/$$i "$(DESTDIR)$(docdir)/" ; \
- done ;
-- install -m 0644 @srcdir@/docs/*.html "$(DESTDIR)$(docdir)/" && \
-- install -m 0644 @srcdir@/docs/api/*.html "$(DESTDIR)$(docdir)/api/"
-+ #install -m 0644 @srcdir@/docs/*.html "$(DESTDIR)$(docdir)/" && \
-+ #install -m 0644 @srcdir@/docs/api/*.html "$(DESTDIR)$(docdir)/api/"
-
- .PHONY: uninstall uninstall-root
- uninstall uninstall-root:
Deleted: yate/trunk/debian/patches/zapchan.dpatch
===================================================================
--- yate/trunk/debian/patches/zapchan.dpatch 2007-05-02 19:55:43 UTC (rev 3510)
+++ yate/trunk/debian/patches/zapchan.dpatch 2007-05-02 20:06:57 UTC (rev 3511)
@@ -1,25 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## zapchan.dpatch by <john at localhost.localdomain>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad yate-0.8.7+cvs20050604~/modules/zapchan.cpp yate-0.8.7+cvs20050604/modules/zapchan.cpp
---- yate-0.8.7+cvs20050604~/modules/zapchan.cpp 2005-03-28 08:27:37.000000000 -0600
-+++ yate-0.8.7+cvs20050604/modules/zapchan.cpp 2005-12-13 16:32:47.000000000 -0600
-@@ -201,12 +201,12 @@
-
- #endif
-
--static void pri_err_cb(char *s)
-+static void pri_err_cb(pri* unused, char *s)
- {
- Debug("PRI",DebugWarn,"%s",s);
- }
-
--static void pri_msg_cb(char *s)
-+static void pri_msg_cb(pri* unused, char *s)
- {
- Debug("PRI",DebugInfo,"%s",s);
- }
Added: yate/trunk/debian/patches/zaptel-header.dpatch
===================================================================
--- yate/trunk/debian/patches/zaptel-header.dpatch 2007-05-02 19:55:43 UTC (rev 3510)
+++ yate/trunk/debian/patches/zaptel-header.dpatch 2007-05-02 20:06:57 UTC (rev 3511)
@@ -0,0 +1,44 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## zaptel-header.dpatch by <rodrigo at nul-unu.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Debian's zaptel-source package places zaptel.h in
+## DP: /usr/include/zaptel, instead of /usr/include/linux
+
+ at DPATCH@
+diff -urNad yate-1.1.0-1.dfsg~/configure yate-1.1.0-1.dfsg/configure
+--- yate-1.1.0-1.dfsg~/configure 2007-04-22 01:34:11.000000000 -0500
++++ yate-1.1.0-1.dfsg/configure 2007-04-22 01:38:01.669933500 -0500
+@@ -5544,7 +5544,7 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+
+-#include <linux/zaptel.h>
++#include <zaptel/zaptel.h>
+
+ int
+ main ()
+diff -urNad yate-1.1.0-1.dfsg~/configure.in yate-1.1.0-1.dfsg/configure.in
+--- yate-1.1.0-1.dfsg~/configure.in 2007-04-22 01:34:11.000000000 -0500
++++ yate-1.1.0-1.dfsg/configure.in 2007-04-22 01:38:01.669933500 -0500
+@@ -294,7 +294,7 @@
+ HAVE_ZAP=no
+ AC_MSG_CHECKING([for Zaptel linux headers])
+ AC_TRY_COMPILE([
+-#include <linux/zaptel.h>
++#include <zaptel/zaptel.h>
+ ],[],
+ HAVE_ZAP="yes"
+ )
+diff -urNad yate-1.1.0-1.dfsg~/modules/zapchan.cpp yate-1.1.0-1.dfsg/modules/zapchan.cpp
+--- yate-1.1.0-1.dfsg~/modules/zapchan.cpp 2007-04-22 01:34:11.000000000 -0500
++++ yate-1.1.0-1.dfsg/modules/zapchan.cpp 2007-04-22 01:38:01.669933500 -0500
+@@ -29,7 +29,7 @@
+ #else
+
+ extern "C" {
+-#include <linux/zaptel.h>
++#include <zaptel/zaptel.h>
+ };
+
+ #include <stdio.h>
More information about the Pkg-voip-commits
mailing list