[Pkg-voip-commits] [rtpproxy] 03/04: Imported Debian patch 1.2.1-2.1

Victor Seva Lopez maniac-guest at moszumanska.debian.org
Sun Aug 16 06:11:06 UTC 2015


This is an automated email from the git hooks/post-receive script.

maniac-guest pushed a commit to branch master
in repository rtpproxy.

commit bc39c0e15449d2b60dfbaa358d3efb4497d87a83
Author: gregor herrmann <gregoa at debian.org>
Date:   Mon Jan 12 19:24:48 2015 +0100

    Imported Debian patch 1.2.1-2.1
---
 debian/backports/etch              |   0
 debian/changelog                   |  30 ++++
 debian/compat                      |   2 +-
 debian/control                     |  11 +-
 debian/docs                        |   1 +
 debian/manpage.xml                 | 337 -------------------------------------
 debian/patches/series              |   1 +
 debian/patches/syslog_format.patch |  16 ++
 debian/rtpproxy.init               |   4 +-
 debian/rtpproxy.install            |   2 -
 debian/rtpproxy.lintian-overrides  |   2 +
 debian/rtpproxy.manpages           |   1 -
 debian/rtpproxy.postinst           |   4 +-
 debian/rules                       | 108 +-----------
 debian/source/format               |   1 +
 rtpp_syslog_async.c                |   2 +-
 16 files changed, 66 insertions(+), 456 deletions(-)

diff --git a/debian/backports/etch b/debian/backports/etch
old mode 100644
new mode 100755
diff --git a/debian/changelog b/debian/changelog
index c2c24cc..25147e2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,33 @@
+rtpproxy (1.2.1-2.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix "Daemon does not start as init script points to wrong executable
+    path":
+    Since 1.2.1-2, the rtppproxy binary gets installed into /usr/bin instead
+    of /usr/sbin (due to packaging changes, particularly the removal of
+    debian/rtpproxy.install).
+    Adjust the path in debian/rtpproxy.init.
+    Thanks to Raphael Michel for the bug report.
+    (Closes: #774584)
+
+ -- gregor herrmann <gregoa at debian.org>  Mon, 12 Jan 2015 19:24:48 +0100
+
+rtpproxy (1.2.1-2) unstable; urgency=medium
+
+  * Ack NMU - thanks ~gregoa  
+  * Add syslog_format.patch
+  * Switch to dh, debian/compact -> 9
+  * source/format -> "3.0 (quilt)"
+  * rtpproxy.init add ". /lib/lsb/init-functions"
+  * Fix "old version of manpage" dropped debian/manpage.xml (Closes: #609204)
+  * Fix "depending on automake1.10" dropped versioned depends (Closes: #724431)
+  * lintian-overrides: false positive
+    rtpproxy: maintainer-script-should-not-use-adduser-system-without-home
+  * Update Vcs: headers
+  * Standards-Version: 3.9.5 - no further changes
+
+ -- Mark Purcell <msp at debian.org>  Sun, 16 Feb 2014 15:03:05 +1100
+
 rtpproxy (1.2.1-1.1) unstable; urgency=low
 
   * Non-maintainer upload.
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+9
diff --git a/debian/control b/debian/control
index 98f2267..bdb3220 100644
--- a/debian/control
+++ b/debian/control
@@ -2,13 +2,12 @@ Source: rtpproxy
 Section: net
 Priority: optional
 Maintainer: Debian VoIP Team <pkg-voip-maintainers at lists.alioth.debian.org>
-Uploaders: Mark Purcell <msp at debian.org>, Kilian Krause <kilian at debian.org>, Marcus Better <marcus at better.se>
-Build-Depends: hardening-wrapper, debhelper (>= 5), autotools-dev, autoconf, automake1.10, xsltproc, docbook-xsl, docbook-xml
-Build-Conflicts: autoconf2.13, automake1.4
-Standards-Version: 3.8.0
+Uploaders: Mark Purcell <msp at debian.org>, Kilian Krause <kilian at debian.org>
+Build-Depends: hardening-wrapper, debhelper (>= 9), autotools-dev, autoconf, automake, xsltproc, docbook-xsl, docbook-xml
+Standards-Version: 3.9.5
 Homepage: http://www.rtpproxy.org
-Vcs-Svn: svn://svn.debian.org/pkg-voip/rtpproxy/trunk/
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-voip/rtpproxy/
+Vcs-Svn: svn://anonscm.debian.org/pkg-voip/rtpproxy/trunk/
+Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-voip/rtpproxy/
 
 Package: rtpproxy
 Architecture: any
diff --git a/debian/docs b/debian/docs
index e845566..7233706 100644
--- a/debian/docs
+++ b/debian/docs
@@ -1 +1,2 @@
 README
+README.remote
diff --git a/debian/manpage.xml b/debian/manpage.xml
deleted file mode 100644
index 326d15c..0000000
--- a/debian/manpage.xml
+++ /dev/null
@@ -1,337 +0,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-  <!ENTITY dhfirstname "<firstname>Maxim</firstname>">
-  <!ENTITY dhsurname   "<surname>Sobolev</surname>">
-  <!-- Please adjust the date whenever revising the manpage. -->
-  <!ENTITY dhdate      "<date>Feb 20, 2006</date>">
-  <!-- SECTION should be 1-8, maybe w/ subsection other parameters are
-       allowed: see man(7), man(1). -->
-  <!ENTITY dhsection   "<manvolnum>8</manvolnum>">
-  <!ENTITY dhemail     "<email>sobomax at PBXpress.com</email>">
-  <!ENTITY dhusername  "janakj">
-  <!ENTITY dhucpackage "<refentrytitle>rtpproxy</refentrytitle>">
-  <!ENTITY dhpackage   "rtpproxy">
-
-  <!ENTITY debian      "<productname>Debian</productname>">
-  <!ENTITY gnu         "<acronym>GNU</acronym>">
-  <!ENTITY gpl         "&gnu; <acronym>GPL</acronym>">
-]>
-
-<refentry>
-    <refentryinfo>
-	<address>
-	    &dhemail;
-	</address>
-	<author>
-	    &dhfirstname;
-	    &dhsurname;
-	</author>
-	<copyright>
-	    <year>2006</year>
-	    <holder>&dhusername;</holder>
-	</copyright>
-	&dhdate;
-    </refentryinfo>
-    <refmeta>
-	&dhucpackage;
-	
-	&dhsection;
-    </refmeta>
-    <refnamediv>
-	<refname>&dhpackage;</refname>
-	<refpurpose>RTP (Real-time Transport Protocol) Proxy Server</refpurpose>
-    </refnamediv>
-    <refsynopsisdiv>
-	<cmdsynopsis>
-	    <command>&dhpackage;</command>
-	    
-	    <arg choice="opt"><option>-?</option></arg>
-	    <arg choice="opt"><option>-2</option></arg>
-	    <arg choice="opt"><option>-f</option></arg>
-	    <arg choice="opt"><option>-v</option></arg>
-	    <arg choice="opt"><option>-R</option></arg>
-	    <arg choice="opt"><option>-l</option> <replaceable>addr1<optional>/addr2</optional></replaceable></arg>
-	    <arg choice="opt"><option>-6</option> <replaceable>addr1<optional>/addr2</optional></replaceable></arg>
-	    <arg choice="opt"><option>-s</option> <replaceable>ctrl_socket</replaceable></arg>
-	    <arg choice="opt"><option>-t</option> <replaceable>tos</replaceable></arg>
-	    <arg choice="opt"><option>-p</option> <replaceable>pidfile</replaceable></arg>
-	    <arg choice="opt"><option>-T</option> <replaceable>max_ttl</replaceable></arg>
-	    <arg choice="opt">
-		<option>-r</option> <replaceable>rdir</replaceable>
-		<arg choice="opt"><option>-S</option> <replaceable>sdir</replaceable></arg>
-	    </arg>
-	</cmdsynopsis>
-    </refsynopsisdiv>
-    <refsect1>
-	<title>DESCRIPTION</title>
-	<para>
-	    <command>&dhpackage;</command> is a symmetric RTP proxy designed to
-	    be used in conjunction with the SIP Express Router (SER) or any
-	    other SIP proxy capable of rewriting SDP bodies in SIP messages
-	    that it processes.
-	</para>
-	<para>
-	    The main purpose of rtpproxy is to make the communication between
-	    SIP user agents behind NAT(s) (Network Address Translator)
-	    possible. Several cases exists when direct end-to-end communication
-	    is not possible and RTP streams have to be relayed through another
-	    host. Rtpproxy can be used to setup such a relaying host.
-	</para>
-	<para>
-	    When two listen interfaces have been specified using the command
-	    line parameters described below then rtpproxy will enter so called
-	    bridging mode. In briding mode rtpproxy forwards RTP packets
-	    received on one interface to the other interface and vice
-	    versa. This mode can be used to forward RTP packets between
-	    networks without direct network level connectivy (provided that the
-	    host running rtpproxy has one interface in both of them). One
-	    particular application of bridging mode is IPv4/IPv6 traversal of
-	    RTP packets.
-	</para>
-	<para>
-	    When instructured by SER rtpproxy can also record the entire RTP
-	    session in a file on a local harddisk or play a pre-recorded file
-	    to the user agent (so called Music-on-Hold).
-	</para>
-    </refsect1>
-    <refsect1>
-	<title>OPTIONS</title>
-	<variablelist>
-	    <varlistentry>
-		<term><option>-?</option></term>
-		<listitem>
-		    <para>Show summary of options.</para>
-		</listitem>
-	    </varlistentry>
-	    <varlistentry>
-		<term><option>-2</option></term>
-		<listitem>
-		    <para>
-			Send every RTP packet twice in sessions that use
-			low-bitrate codecs. Only packets that are smaller than
-			128 bytes will be sent twice. This option can improve
-			audio quality on lossy links.
-		    </para>
-		</listitem>
-	    </varlistentry>
-	    <varlistentry>
-		<term><option>-f</option></term>
-		<listitem>
-		    <para>
-			Rtpproxy will stay in foreground mode if this option is
-			set.
-		    </para>
-		</listitem>
-	    </varlistentry>
-	    <varlistentry>
-		<term><option>-v</option></term>
-		<listitem>
-		    <para>Show version of program.</para>
-		</listitem>
-	    </varlistentry>
-	    <varlistentry>
-		<term><option>-l</option> <replaceable>addr1<optional>/addr2</optional></replaceable></term>
-		<listitem>
-		    <para>
-			IPv4 listen IP address(es). You can specify either
-			one or two addresses. If two addresses have been
-			specified then rtpproxy will work in bridging mode.
-		    </para>
-		</listitem>
-	    </varlistentry>
-	    <varlistentry>
-		<term><option>-6</option> <replaceable>addr1<optional>/addr2</optional></replaceable></term>
-		<listitem>
-		    <para>
-			IPv6 listen IP address(es). You can specify either one
-			or two addresses. If two addresses have been specified
-			then rtpproxy will work in bridging mode.
-		    </para>
-		</listitem>
-	    </varlistentry>
-	    <varlistentry>
-		<term><option>-s</option> <replaceable>ctrl_socket</replaceable></term>
-		<listitem>
-		    <para>
-			This parameter configures rtpproxy control socket. The
-			control socket is used by nathelper module of SER to 
-			create/modify/delete RTP sessions to be relayed. 
-			Format of <replaceable>ctrl_socket</replaceable> is 
-			<type>:<socket>. Following types are
-			supported:
-			<itemizedlist>
-			    <listitem>
-				<para>
-				    <emphasis>udp:</emphasis> Create UDP
-				    control socket. In this mode RTPProxy will
-				    listen on UDP for control messages from
-				    SER/nathelper.
-				</para>
-				<para>
-				    Example: -s udp:127.0.0.1:9000
-				</para>
-				<para>
-				    IP address can be '*' in which case
-				    rtpproxy will listen on all local
-				    interfaces. If omitted port 22222 is used.
-				</para>
-				<note>
-				    <para>
-					RTPProxy control protocol has no
-					built-in security mechanisms. Make sure
-					that you protect the listening IP and
-					port properly when using RTPProxy with
-					UDP control socket.
-				    </para>
-				</note>
-			    </listitem>
-			    <listitem>
-				<para>
-				    <emphasis>udp6:</emphasis> Create IPv6 UDP
-				    control socket. In this mode RTPProxy will
-				    listen on UDP/IPv6 for control messages
-				    from SER/nathelper.
-				</para>
-				<para>
-				    Example: -s udp6:::1:9000
-				</para>
-			    </listitem>
-			    <listitem>
-				<para>
-				    <emphasis>unix:</emphasis> Create UNIX
-				    domain socket for control interface. In
-				    this mode SER/nathelper and RTPProxy must
-				    be running on the same host. This is the
-				    default setting for both SER/nathelper and
-				    rtpproxy.
-				</para>
-				<para>Example: -s unix:/var/run/rtpproxy.sock</para>
-				<para>Default value is <filename>/var/run/rtpproxy.sock</filename>.</para>
-			    </listitem>
-			</itemizedlist>
-		    </para>
-		</listitem>
-	    </varlistentry>
-	    <varlistentry>
-		<term><option>-t</option> <replaceable>tos</replaceable></term>
-		<listitem>
-		    <para>
-			Set this ToS (Type of Service) in outgoing
-			packets. Default value is 0xB8.
-		    </para>
-		</listitem>
-	    </varlistentry>
-	    <varlistentry>
-		<term><option>-r</option> <replaceable>rec_dir</replaceable></term>
-		<listitem>
-		    <para>Directory where recorded RTP sessions will be stored.</para>
-		</listitem>
-	    </varlistentry>
-	    <varlistentry>
-		<term><option>-S</option> <replaceable>spool_dir</replaceable></term>
-		<listitem>
-		    <para>
-			Spool directory for RTP sessions being recorded. The
-			file will be moved to directory configured in
-			<option>-r</option> option after the session finishes.
-		    </para>
-		</listitem>
-	    </varlistentry>
-	    <varlistentry>
-		<term><option>-R</option></term>
-		<listitem>
-		    <para>
-			Do not record RTCP when recording an RTP session. This
-			option is disabled (rtpproxy will record RTCP) by default.
-		    </para>
-		</listitem>
-	    </varlistentry>
-	    <varlistentry>
-		<term><option>-p</option> <replaceable>pid_file</replaceable></term>
-		<listitem>
-		    <para>
-			This parameter configures the name of the file where
-			PID of running rtpproxy will be stored. Default is
-			<filename>/var/run/rtpproxy.pid</filename>.
-		    </para>
-		</listitem>
-	    </varlistentry>
-	    <varlistentry>
-		<term><option>-T</option> <replaceable>max_ttl</replaceable></term>
-		<listitem>
-		    <para>
-			Limit the maximum TTL (Time To Live) of outgoing IP packets to
-			the value of <replaceable>max_ttl</replaceable>.
-		    </para>
-		</listitem>
-	    </varlistentry>
-	</variablelist>
-    </refsect1>
-
-    <refsect1>
-	<title>HowItWorks</title>
-	<para>
-	    When SER receives an INVITE request, it extracts Call-ID from it
-	    and communicates it to rtpproxy via Unix domain socket or
-	    UDP. Rtproxy looks for an existing session with such Call-ID. If
-	    the session exists it returns UDP port for that session, if not,
-	    then it creates a new session, binds to a first empty UDP port from
-	    the range specified at the compile time and returns number of that
-	    port to a SER. After receiving reply from the proxy, SER replaces
-	    media ip:port in the SDP to point to the proxy and forwards request
-	    as usually.
-	</para>
-	<para>
-	    When SER receives a non-negative SIP reply with SDP it again extracts
-	    Call-ID from it and communicates it to the proxy. In this case the proxy
-	    does not allocate a new session if it doesn't exist, but simply performs a
-	    lookup among existing sessions and returns either a port number if the
-	    session is found, or error code indicating that there is no session with
-	    such id. After receiving positive reply from the proxy, SER replaces media
-	    ip:port in the SIP reply to point to the proxy and forwards reply as
-	    usually.
-	</para>
-	<para>
-	    After the session has been created, the proxy listens on the port
-	    it has allocated for that session and waits for receiving at least
-	    one UDP packet from each of two parties participating in the
-	    call. Once such packet is received, the proxy fills one of two
-	    ip:port structures associated with each call with source ip:port of
-	    that packet. When both structures are filled in, the proxy starts
-	    relaying UDP packets between parties.
-	</para>
-	<para>
-	    The proxy tracks idle time for each of existing sessions (i.e. the time
-	    within which there were no packets relayed), and automatically cleans
-	    up a sessions whose idle times exceed the value specified at compile
-	    time (60 seconds by default).
-	</para>
-    </refsect1>
-    <refsect1>
-	<title>FILES</title>
-	<para>
-	    <filename>/usr/sbin/rtpproxy</filename>
-	</para>
-    </refsect1>
-    <refsect1>
-	<title>LICENSE</title>
-	<para>
-	    This program is licensed under the BSD license. See
-	    <filename>COPYING</filename> file in the rtpproxy sources for details.
-	</para>
-    </refsect1>
-
-    <refsect1>
-	<title>AVAILABILITY</title>
-	<para>
-	    The latest version of this program can be found at 
-	    <ulink url="http://ftp.iptel.org/pub/rtpproxy">http://ftp.iptel.org/pub/rtpproxy</ulink>.
-	</para>
-    </refsect1>
-
-    <refsect1>
-	<title>SEEALSO</title>
-	<para>ser(8).</para>
-    </refsect1>
-</refentry>
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..987191a
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+syslog_format.patch
diff --git a/debian/patches/syslog_format.patch b/debian/patches/syslog_format.patch
new file mode 100644
index 0000000..f580fa2
--- /dev/null
+++ b/debian/patches/syslog_format.patch
@@ -0,0 +1,16 @@
+Description: add format argument in rtpp_syslog_async.c
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=614476
+
+Index: rtpproxy-1.2.1/rtpp_syslog_async.c
+===================================================================
+--- rtpproxy-1.2.1.orig/rtpp_syslog_async.c	2009-10-06 21:12:41.000000000 +1100
++++ rtpproxy-1.2.1/rtpp_syslog_async.c	2014-02-16 13:55:34.267703849 +1100
+@@ -85,7 +85,7 @@
+         /* main work here */
+         switch (wi->item_type) {
+             case SYSLOG_ITEM_ASYNC_WRITE:
+-                syslog(wi->priority, wi->data);
++                syslog(wi->priority, "%s", wi->data);
+                 break;
+ 
+             case SYSLOG_ITEM_ASYNC_EXIT:
diff --git a/debian/rtpproxy.init b/debian/rtpproxy.init
index be1f5b8..1f8996d 100644
--- a/debian/rtpproxy.init
+++ b/debian/rtpproxy.init
@@ -12,7 +12,7 @@
 PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
 NAME=rtpproxy
 DESC="RTP relay"
-DAEMON=/usr/sbin/$NAME
+DAEMON=/usr/bin/$NAME
 USER=$NAME
 GROUP=$USER
 PIDFILE="/var/run/$NAME/$NAME.pid"
@@ -22,6 +22,8 @@ CONTROL_SOCK="unix:$PIDFILE_DIR/$NAME.sock"
 test -x $DAEMON || exit 0
 umask 002
 
+. /lib/lsb/init-functions
+
 # Include defaults if available
 if [ -f /etc/default/$NAME ] ; then
 	. /etc/default/$NAME
diff --git a/debian/rtpproxy.install b/debian/rtpproxy.install
deleted file mode 100644
index 0f0a570..0000000
--- a/debian/rtpproxy.install
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/tmp/usr/bin/rtpproxy usr/sbin
-
diff --git a/debian/rtpproxy.lintian-overrides b/debian/rtpproxy.lintian-overrides
new file mode 100644
index 0000000..8a624e4
--- /dev/null
+++ b/debian/rtpproxy.lintian-overrides
@@ -0,0 +1,2 @@
+# false positive
+rtpproxy: maintainer-script-should-not-use-adduser-system-without-home
diff --git a/debian/rtpproxy.manpages b/debian/rtpproxy.manpages
deleted file mode 100644
index 4ebcb27..0000000
--- a/debian/rtpproxy.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/rtpproxy.8
diff --git a/debian/rtpproxy.postinst b/debian/rtpproxy.postinst
index f6baff0..281cb35 100644
--- a/debian/rtpproxy.postinst
+++ b/debian/rtpproxy.postinst
@@ -1,4 +1,6 @@
-#!/bin/sh -e
+#!/bin/sh 
+
+set -e
 
 case "$1" in
     configure)
diff --git a/debian/rules b/debian/rules
index e55a941..5fb559e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,110 +1,6 @@
 #!/usr/bin/make -f
 
-export DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-export DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
-ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
-	CONFFLAGS += --build $(DEB_HOST_GNU_TYPE)
-else
-	CONFFLAGS += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
-endif
-
-CFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
 export DEB_BUILD_HARDENING=1
 
-PKGNAME := rtpproxy
-DEBVERSION:=$(shell head -n 1 debian/changelog \
-                    | sed -e 's/^[^(]*(\([^)]*\)).*/\1/')
-UPVERSION:=$(shell echo $(DEBVERSION) | sed -e 's/^.*://' -e 's/-[0-9.]*$$//' -e 's/.dfsg$$//')
-UPVER_REAL:=$(shell echo $(UPVERSION) | sed -e 's/~beta/.beta/')
-
-FILENAME := $(PKGNAME)_$(UPVERSION).orig.tar.gz
-URL := http://b2bua.org/chrome/site/rtpproxy-$(UPVER_REAL).tar.gz
-
-MANPAGE := debian/$(PKGNAME).8
-
-configure:
-	autoreconf --force --install
-
-configure-stamp: $(QUILT_STAMPFN) configure
-	dh_testdir
-	rm -f config.sub config.guess
-	ln -sf /usr/share/misc/config.sub .
-	ln -sf /usr/share/misc/config.guess .
-	rm -f config.cache
-	./configure CFLAGS="$(CFLAGS)" --prefix=/usr --sysconfdir=/etc
-	touch configure-stamp
-
-$(MANPAGE): debian/manpage.xml
-	xsltproc -nonet -o $@ /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl $<
-
-build: build-stamp
-build-stamp: configure-stamp $(MANPAGE)
-	dh_testdir
-	$(MAKE)
-	touch build-stamp
-
-clean: 
-	dh_testdir
-	dh_testroot
-	-rm -f build-stamp configure-stamp
-	-rm -f debian/rtpproxy.8 
-	[ ! -f Makefile ] || $(MAKE) distclean
-	-rm -f Makefile.in aclocal.m4 config.sub config.guess config.h.in \
-		configure depcomp install-sh ltmain.sh missing mkinstalldirs
-	dh_clean
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k 
-	dh_installdirs
-	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
-
-binary-indep: build install
-
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs
-	dh_installdocs
-	dh_install
-	dh_installinit
-	dh_installman
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-print-version:
-	@@echo "Debian version:          $(DEBVERSION)"
-	@@echo "Upstream version:        $(UPVERSION)"
-
-get-orig-source:
-	@@dh_testdir
-	@@[ -d ../tarballs/. ]||mkdir -p ../tarballs
-	@@echo Downloading $(FILENAME) from $(URL) ...
-	@@wget -nv -T10 -t3 -O ../tarballs/$(FILENAME) $(URL)
-	@@echo Repacking without upstream debian/...
-	@@mkdir -p ../tarballs/rtpproxy-$(UPVERSION).tmp/
-	@@cd ../tarballs/rtpproxy-$(UPVERSION).tmp ; \
-	   tar xfz ../$(FILENAME)
-	@@rm -fR  ../tarballs/rtpproxy-$(UPVERSION).tmp/rtpproxy-$(UPVER_REAL)/debian
-	@@cd ../tarballs/rtpproxy-$(UPVERSION).tmp ; \
-	   tar cfz ../$(FILENAME) *
-	@@echo Cleaning up...
-	@@rm -rf ../tarballs/rtpproxy-$(UPVERSION).tmp/
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install print-version get-orig-source
+%:
+	dh $@
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/rtpp_syslog_async.c b/rtpp_syslog_async.c
index bddea64..c6b3a4e 100644
--- a/rtpp_syslog_async.c
+++ b/rtpp_syslog_async.c
@@ -85,7 +85,7 @@ syslog_queue_run(void)
         /* main work here */
         switch (wi->item_type) {
             case SYSLOG_ITEM_ASYNC_WRITE:
-                syslog(wi->priority, "%s", wi->data);
+                syslog(wi->priority, wi->data);
                 break;
 
             case SYSLOG_ITEM_ASYNC_EXIT:

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/rtpproxy.git



More information about the Pkg-voip-commits mailing list