[Pkg-voip-commits] [stun] 03/03: Imported Debian patch 0.97~dfsg-2
Victor Seva Lopez
maniac-guest at moszumanska.debian.org
Fri Aug 14 12:55:01 UTC 2015
This is an automated email from the git hooks/post-receive script.
maniac-guest pushed a commit to branch master
in repository stun.
commit 6208ae85bc6ba659175005342850339ccf259cd7
Merge: 1b1d830 e31f153
Author: Kilian Krause <kilian at debian.org>
Date: Mon Dec 22 01:22:05 2014 +0100
Imported Debian patch 0.97~dfsg-2
client.cxx | 4 +-
debian/changelog | 28 ++++++
debian/compat | 2 +-
debian/control | 27 ++++-
debian/patches/00list | 2 -
debian/patches/daemon_noverbose.dpatch | 20 ----
debian/patches/fix_non_i386.dpatch | 27 -----
debian/patches/series | 2 +
.../stun-0.96.dfsg-xor-mapped-address.patch | 21 ++++
debian/patches/timeout_increase.patch | 12 +++
debian/rules | 112 +++++++--------------
debian/source/format | 1 +
debian/stun-client.dirs | 1 +
debian/stun-client.manpages | 1 +
debian/{dirs => stun-server.dirs} | 1 -
debian/{stun.manpages => stun-server.manpages} | 1 -
debian/{stun.prerm => stun-server.prerm} | 0
debian/{stun.default => stun-server.stun.default} | 0
debian/{init.d => stun-server.stun.init} | 73 +++++++-------
debian/watch | 4 +-
license.txt | 16 +++
readme.txt | 23 +++++
server.cxx | 2 +-
stun.cxx | 2 +-
stun.h | 2 +-
25 files changed, 209 insertions(+), 175 deletions(-)
diff --cc debian/changelog
index 6841f9f,0000000..f6a9b36
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,56 -1,0 +1,84 @@@
++stun (0.97~dfsg-2) unstable; urgency=medium
++
++ * Fix init script PID file location and make variable handling somewhat more
++ robust
++
++ -- Kilian Krause <kilian at debian.org> Mon, 22 Dec 2014 01:22:05 +0100
++
++stun (0.97~dfsg-1) unstable; urgency=medium
++
++ * New upstream version
++ * stun-0.96.dfsg-xor-mapped-address: Fix stun.h following newer RFC 3489
++ update. Thanks to Dr. Sebastian Kiesel!
++ * Bump compat level to 9 and use new 3.0 quilt format rather than dpatch
++ * debian/rules: Update to dh-style and introduce get-orig-source target
++ * debian/patches/daemon_noverbose.patch: Removed. Incorporated upstream.
++ * debian/patches/fix_non_i386.patch: Disable - seems fixed upstream
++ * Fix purge issue when no IPs are configured (Closes: #663682)
++ * Pull apart server and client (Closes: #676933)
++ * Increase timeout from 1 ms to 1s in stun.cxx (Closes: #645671)
++ * Ignore error in stop, i.e. daemon already shut down (Closes: #645948)
++ * Update get-orig-source to remove all .svn and rfc*
++ * Add Description to init script
++ * Update init.d script to provide itself and depend on remote_fs
++ * Source /lib/lsb/init-functions in init script
++ * Update Vcs-Svn and Vcs-Browser URI in debian/control
++
++ -- Kilian Krause <kilian at debian.org> Sun, 21 Dec 2014 23:45:36 +0100
++
+stun (0.96.dfsg-6) unstable; urgency=low
+
+ [ Kilian Krause ]
+ * Add Homepage field as added in dpkg-dev 1.14.6. (Closes: #620342, #615190)
+ * Fixed debian/watch file.
+ * Add status option to init file (Closes: #493970)
+
+ [ Patrick Matthäi ]
+ * Fixed spelling error in debian/changelog: s/standart/standard/.
+ Thanks lintian.
+
+ -- Kilian Krause <kilian at debian.org> Tue, 24 May 2011 13:49:32 +0200
+
+stun (0.96.dfsg-5) unstable; urgency=low
+
+ * added manpage for stun and stund (Closes: #425827)
+ * update init.d to complain with LSB
+ * Bumped Debian policy standard to 3.7.2
+ + compat set to 5
+ + debhelper version raised
+ + de-ignoring output from make distclean
+ * Homepage added to debian/control
+ * Added myself to Uploaders field
+ * #DEBHELPER# token set to debian/stun.prerm
+
+ -- Rene Mayorga <rmayorga at debian.org.sv> Sat, 6 Jan 2007 22:57:01 +0100
+
+stun (0.96.dfsg-4) unstable; urgency=low
+
+ * Fix startup again. (Closes: #388037)
+
+ -- Kilian Krause <kilian at debian.org> Sat, 6 Jan 2007 22:53:52 +0100
+
+stun (0.96.dfsg-3) unstable; urgency=high
+
+ * Fix installation and don't try to forcibly start daemon
+ (Closes: #388037, #397074)
+
+ -- Kilian Krause <kilian at debian.org> Wed, 3 Jan 2007 20:44:06 +0100
+
+stun (0.96.dfsg-2) unstable; urgency=low
+
+ [ Mark Purcell ]
+ * Add debian/README.Debian (Closes: Bug#369570)
+
+ [ Kilian Krause ]
+ * Use correct user to start/stop daemon. (Closes: #384113)
+
+ -- Kilian Krause <kilian at debian.org> Sun, 22 Oct 2006 14:48:48 +0200
+
+stun (0.96.dfsg-1) unstable; urgency=low
+
+ * Initial Release.
+
+ -- Kilian Krause <kilian at debian.org> Mon, 2 Jan 2006 23:51:48 +0100
+
diff --cc debian/compat
index 7ed6ff8,0000000..ec63514
mode 100644,000000..100644
--- a/debian/compat
+++ b/debian/compat
@@@ -1,1 -1,0 +1,1 @@@
- 5
++9
diff --cc debian/control
index 4489136,0000000..5dcbc51
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,20 -1,0 +1,37 @@@
+Source: stun
+Section: net
+Priority: optional
+Maintainer: Debian VoIP Team <pkg-voip-maintainers at lists.alioth.debian.org>
+Uploaders: Kilian Krause <kilian at debian.org>, Jose Carlos Garcia Sogo <jsogo at debian.org>, Mark Purcell <msp at debian.org>, Santiago Garcia Mantinan <manty at debian.org>, Rene Mayorga <rmayorga at debian.org.sv>
- Build-Depends: debhelper (>= 5), dpatch
++Build-Depends: debhelper (>= 9)
+Standards-Version: 3.7.2
+Homepage: http://sourceforge.net/projects/stun/
- Vcs-Svn: svn://svn.debian.org/pkg-voip/stun/trunk/
- Vcs-Browser: http://svn.debian.org/wsvn/pkg-voip/stun/?op=log
++Vcs-Svn: svn://anonscm.debian.org/pkg-voip/stun/trunk/
++Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-voip/stun/trunk/
+
- Package: stun
++Package: stun-server
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
- Description: Server daemon and test client for STUN
++Recommends: stun-client
++Provides: stun
++Description: Server daemon for STUN
+ The STUN protocol (Simple Traversal of UDP through NATs) is described in the
+ IETF RFC 3489, available at http://www.ietf.org/rfc/rfc3489.txt. It's used to
+ help clients behind NAT to tunnel incoming calls through. This server is the
+ counterpart to help the client identify the NAT and have it open the proper
+ ports for it.
++ .
++ This package installs only the server part
++
++Package: stun-client
++Architecture: any
++Depends: ${shlibs:Depends}, ${misc:Depends}
++Suggests: stun-server
++Description: Test client for STUN
++ The STUN protocol (Simple Traversal of UDP through NATs) is described in the
++ IETF RFC 3489, available at http://www.ietf.org/rfc/rfc3489.txt. It's used to
++ help clients behind NAT to tunnel incoming calls through. This server is the
++ counterpart to help the client identify the NAT and have it open the proper
++ ports for it.
++ .
++ This package installs only the client.
diff --cc debian/patches/series
index 0000000,0000000..012f6e6
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,2 @@@
++stun-0.96.dfsg-xor-mapped-address.patch
++timeout_increase.patch
diff --cc debian/patches/stun-0.96.dfsg-xor-mapped-address.patch
index 0000000,0000000..c2bb588
new file mode 100644
--- /dev/null
+++ b/debian/patches/stun-0.96.dfsg-xor-mapped-address.patch
@@@ -1,0 -1,0 +1,21 @@@
++#! /bin/sh /usr/share/dpatch/dpatch-run
++## stun-0.96.dfsg-xor-mapped-address.dpatch by Dr. Sebastian Kiesel <kiesel at rus.uni-stuttgart.de>
++##
++## All lines beginning with `## DP:' are a description of the patch.
++## DP: Fix return code according to newer RFC3489 update
++ at DPATCH@
++--- a/stun.h
+++++ b/stun.h
++@@ -44,7 +44,11 @@ const UInt16 MessageIntegrity = 0x0008;
++ const UInt16 ErrorCode = 0x0009;
++ const UInt16 UnknownAttribute = 0x000A;
++ const UInt16 ReflectedFrom = 0x000B;
++-const UInt16 XorMappedAddress = 0x8020;
+++// attribute XOR-MAPPED-ADDRESS:
+++// RFC 3489 : not defined
+++// draft-ietf-behave-rfc3489bis-02 : 0x8020
+++// draft-ietf-behave-rfc3489bis-03 ff. and RFC 5389 : 0x0020
+++const UInt16 XorMappedAddress = 0x0020;
++ const UInt16 XorOnly = 0x0021;
++ const UInt16 ServerName = 0x8022;
++ const UInt16 SecondaryAddress = 0x8050; // Non standard extention
diff --cc debian/patches/timeout_increase.patch
index 0000000,0000000..29dfd8c
new file mode 100644
--- /dev/null
+++ b/debian/patches/timeout_increase.patch
@@@ -1,0 -1,0 +1,12 @@@
++# increase timeout as recommended per #645671
++--- a/stun.cxx
+++++ b/stun.cxx
++@@ -1405,7 +1405,7 @@ stunServerProcess(StunServerInfo& info,
++
++ struct timeval tv;
++ tv.tv_sec = 0;
++- tv.tv_usec = 1000;
+++ tv.tv_usec = 1000000; // Debian: only run every second (#645671)
++
++ int e = select( maxFd, &fdSet, NULL,NULL, &tv );
++ if (e < 0)
diff --cc debian/rules
index bd40e9d,0000000..1690400
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,80 -1,0 +1,46 @@@
+#!/usr/bin/make -f
- # -*- makefile -*-
- # Sample debian/rules that uses debhelper.
- # This file was originally written by Joey Hess and Craig Small.
- # As a special exception, when this file is copied by dh-make into a
- # dh-make output file, you may use that output file without restriction.
- # This special exception was added by Craig Small in version 0.37 of dh-make.
+
- # Uncomment this to turn on verbose mode.
- #export DH_VERBOSE=1
++DEBVERSION := $(shell head -n 1 debian/changelog \
++ | sed -e 's/^[^(]*(\([^)]*\)).*/\1/')
++UPVERSION := $(shell echo $(DEBVERSION) | sed 's/~dfsg-.//')
+
- CFLAGS = -Wall -g
++FILENAME := stun_$(UPVERSION)~dfsg.orig.tar.gz
++UPFILENAME := stun_$(UPVERSION).orig.tar.gz
++URL := https://qa.debian.org/watch/sf.php/stun/stund-$(UPVERSION).tgz
+
- ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -O0
- else
- CFLAGS += -O2
- endif
++%:
++ dh $@ --parallel
+
- include /usr/share/dpatch/dpatch.make
-
- build: build-stamp
- build-stamp: patch-stamp
- dh_testdir
++override_dh_clean:
+ ([ ! -f rfc3489.txt ] || (echo This is not the DFSG source.;exit 1))
-
- # Add here commands to compile the package.
- $(MAKE)
- #$(MAKE) tlsServer
-
- touch build-stamp
-
- clean: clean-unpatched unpatch
- clean-unpatched:
- dh_testdir
- dh_testroot
- rm -f build-stamp configure-stamp
- [ ! -f Makefile ] || $(MAKE) clean
-
- dh_clean
-
- install: build
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
-
- # Add here commands to install the package into debian/stun.
- #$(MAKE) install DESTDIR=$(CURDIR)/debian/stun
- install -m 755 server $(CURDIR)/debian/stun/usr/sbin/stund
++ dh_clean
++
++##override_dh_auto_build:
++## #$(MAKE) tlsServer
++## dh_auto_build
++
++override_dh_install:
++ # we want to change the names too!
++ install -m 755 server $(CURDIR)/debian/stun-server/usr/sbin/stund
++ install -m 755 client $(CURDIR)/debian/stun-client/usr/bin/stun
+ #install -m 755 tlsServer $(CURDIR)/debian/stun/usr/sbin/
- install -m 755 client $(CURDIR)/debian/stun/usr/bin/stun
- install -m 644 debian/stun.default $(CURDIR)/debian/stun/etc/default/stun
-
-
- # Build architecture-independent files here.
- binary-indep: build install
- # We have nothing to do by default.
-
- # Build architecture-dependent files here.
- binary-arch: build install
- dh_testdir
- dh_testroot
- dh_installchangelogs
- dh_installdocs
- dh_installexamples
- dh_installinit
- dh_installman
- # dh_link
- dh_strip
- dh_compress
- dh_fixperms
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
- binary: binary-indep binary-arch
- .PHONY: build clean binary-indep binary-arch binary install
++ dh_install
++
++override_dh_installinit:
++ dh_installinit --name=stun
++
++get-orig-source:
++ @@dh_testdir
++ @@[ -d ../tarballs/. ]||mkdir -p ../tarballs
++ @@#this is for stable versions
++ @@echo Downloading $(UPFILENAME) from $(URL) ...
++ @@wget -nv -T10 -t3 -O ../tarballs/$(UPFILENAME) $(URL)
++ @@echo 'Repacking as DFSG-free (removing RFC)...'
++ @@mkdir -p ../tarballs/stun-$(UPVERSION).tmp/
++ @@cd ../tarballs/stun-$(UPVERSION).tmp ; tar xfz ../$(UPFILENAME)
++ @@find ../tarballs/stun-$(UPVERSION).tmp/ -iname 'rfc*.txt' -delete
++ @@find ../tarballs/stun-$(UPVERSION).tmp/ -depth -type d -name .svn |xargs --no-run-if-empty rm -rf
++ @@echo Writing archive ../tarballs/$(FILENAME) ...
++ @@cd ../tarballs/stun-$(UPVERSION).tmp ; tar cfz ../$(FILENAME) *
++ @@echo Cleaning up...
++ @@$(RM) -rf ../tarballs/stun-$(UPVERSION).tmp/ ../tarballs/$(UPFILENAME)
diff --cc debian/source/format
index 0000000,0000000..163aaf8
new file mode 100644
--- /dev/null
+++ b/debian/source/format
@@@ -1,0 -1,0 +1,1 @@@
++3.0 (quilt)
diff --cc debian/stun-client.dirs
index 0000000,0000000..e772481
new file mode 100644
--- /dev/null
+++ b/debian/stun-client.dirs
@@@ -1,0 -1,0 +1,1 @@@
++usr/bin
diff --cc debian/stun-client.manpages
index 0000000,0000000..4ba78a6
new file mode 100644
--- /dev/null
+++ b/debian/stun-client.manpages
@@@ -1,0 -1,0 +1,1 @@@
++debian/manpages/stun.1
diff --cc debian/stun-server.dirs
index 1867465,0000000..dd43beb
mode 100644,000000..100644
--- a/debian/stun-server.dirs
+++ b/debian/stun-server.dirs
@@@ -1,3 -1,0 +1,2 @@@
+etc/default
- usr/bin
+usr/sbin
diff --cc debian/stun-server.manpages
index f0a9eee,0000000..b2c48cf
mode 100644,000000..100644
--- a/debian/stun-server.manpages
+++ b/debian/stun-server.manpages
@@@ -1,2 -1,0 +1,1 @@@
- debian/manpages/stun.1
+debian/manpages/stund.8
diff --cc debian/stun-server.prerm
index 10b4400,0000000..10b4400
mode 100644,000000..100644
--- a/debian/stun-server.prerm
+++ b/debian/stun-server.prerm
diff --cc debian/stun-server.stun.default
index c346c4b,0000000..c346c4b
mode 100644,000000..100644
--- a/debian/stun-server.stun.default
+++ b/debian/stun-server.stun.default
diff --cc debian/stun-server.stun.init
index 16536e4,0000000..18d67a2
mode 100644,000000..100644
--- a/debian/stun-server.stun.init
+++ b/debian/stun-server.stun.init
@@@ -1,129 -1,0 +1,126 @@@
+#! /bin/sh
+### BEGIN INIT INFO
- # Provides: stund
- # Required-Start: $network
- # Required-Stop: $network
++# Provides: stun
++# Required-Start: $network $remote_fs
++# Required-Stop: $network $remote_fs
+# Default-Start: 2 3 4 5
+# Default-Stop: 0 1 6
- # Short-Description: STUN server helps cliens to identify their NAT detection
++# Short-Description: STUN server to help clients with their NAT
++# Description: STUN server to help clients identify and overcome limitations of their NAT
+### END INIT INFO
+#
- #
+# Please read /usr/share/doc/stun/README.Debian
- #
- #
- # skeleton example file to build /etc/init.d/ scripts.
- # This file should be used to construct scripts for /etc/init.d.
- #
- # Written by Miquel van Smoorenburg <miquels at cistron.nl>.
- # Modified for Debian
- # by Ian Murdock <imurdock at gnu.ai.mit.edu>.
- #
- # Version: @(#)skeleton 1.9 26-Feb-2001 miquels at cistron.nl
- #
+
+PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
+DAEMON=/usr/sbin/stund
+NAME=stun
+DESC=stun
+START_DAEMON=false
- PIDFILE=/var/run/$NAME.pid
++PIDFILE=/var/run/${NAME}.pid
+
+test -x $DAEMON || exit 0
+
++. /lib/lsb/init-functions
++
+# Include stun defaults if available
+if [ -f /etc/default/stun ] ; then
+ . /etc/default/stun
+fi
+if [ "$START_DAEMON" != "true" ] ; then
+ exit 0
+fi
- if [ -z $PRIMARY_IP ];then
- echo "No primary IP given. Exiting."
- exit 1
- fi
- if [ -z $SECONDARY_IP ];then
- echo "No secondary IP given. Exiting."
- exit 1
- fi
- if [ -z $PRIMARY_PORT ];then
++if [ -z "$PRIMARY_PORT" ];then
+ echo "No primary port given. Using default."
+ PRIMARY_PORT=3478
+fi
- if [ -z $SECONDARY_PORT ];then
++if [ -z "$SECONDARY_PORT" ];then
+ echo "No secondary port given. Using default."
+ SECONDARY_PORT=3479
+fi
- if [ -z $DAEMON_USER ];then
++if [ -z "$DAEMON_USER" ];then
+ DAEMON_USER=nobody
+fi
+
- DAEMON_OPTS="$DAEMON_OPTS -h $PRIMARY_IP -a $SECONDARY_IP -p $PRIMARY_PORT -o $SECONDARY_PORT"
++DAEMON_OPTS="-h $PRIMARY_IP -a $SECONDARY_IP -p $PRIMARY_PORT -o $SECONDARY_PORT $DAEMON_OPTS"
+
+set -e
+
+case "$1" in
+ start)
++ if [ -z "$PRIMARY_IP" ];then
++ echo "No primary IP given. Exiting."
++ exit 1
++ fi
++ if [ -z "$SECONDARY_IP" ];then
++ echo "No secondary IP given. Exiting."
++ exit 1
++ fi
+ echo -n "Starting $DESC: "
+ start-stop-daemon --start --quiet --background --make-pidfile \
- --pidfile $PIDFILE \
- --chuid $DAEMON_USER --exec $DAEMON -- $DAEMON_OPTS
++ --pidfile "$PIDFILE" \
++ --chuid "$DAEMON_USER" --exec "$DAEMON" -- $DAEMON_OPTS
+ echo "$NAME."
+ ;;
+ stop)
+ echo -n "Stopping $DESC: "
- start-stop-daemon --stop --quiet --pidfile $PIDFILE \
- --chuid $DAEMON_USER --exec $DAEMON
++ start-stop-daemon --stop --quiet --pidfile "$PIDFILE" \
++ --oknodo --chuid "$DAEMON_USER" --exec "$DAEMON"
+ echo "$NAME."
+ ;;
+ #reload)
+ #
+ # If the daemon can reload its config files on the fly
+ # for example by sending it SIGHUP, do it here.
+ #
+ # If the daemon responds to changes in its config file
+ # directly anyway, make this a do-nothing entry.
+ #
+ # echo "Reloading $DESC configuration files."
+ # start-stop-daemon --stop --signal 1 --quiet --pidfile \
+ # $PIDFILE --exec $DAEMON
+ #;;
+ restart|force-reload)
++ if [ -z "$PRIMARY_IP" ];then
++ echo "No primary IP given. Exiting."
++ exit 1
++ fi
++ if [ -z "$SECONDARY_IP" ];then
++ echo "No secondary IP given. Exiting."
++ exit 1
++ fi
+ #
+ # If the "reload" option is implemented, move the "force-reload"
+ # option to the "reload" entry above. If not, "force-reload" is
+ # just the same as "restart".
+ #
+ echo -n "Restarting $DESC: "
- start-stop-daemon --stop --quiet --pidfile \
- $PIDFILE --exec $DAEMON
++ $0 stop
+ sleep 1
- start-stop-daemon --start --quiet --pidfile \
- $PIDFILE --exec $DAEMON -- $DAEMON_OPTS
++ $0 start
+ echo "$NAME."
+ ;;
+ status)
+ echo -n "Status of $DESC: "
+
+ if [ ! -r "$PIDFILE" ]; then
+ echo "$NAME is not running."
+ exit 3
+ fi
+
+ if read pid < "$PIDFILE" && ps -p "$pid" > /dev/null 2>&1; then
+ echo "$NAME is running."
+ exit 0
+ else
+ echo "$NAME is not running but $PIDFILE exists."
+ exit 1
+ fi
+ ;;
+ *)
- N=/etc/init.d/$NAME
++ N="/etc/init.d/$NAME"
+ # echo "Usage: $N {start|stop|restart|status|reload|force-reload}" >&2
+ echo "Usage: $N {start|stop|restart|status|force-reload}" >&2
+ exit 1
+ ;;
+esac
+
+exit 0
diff --cc debian/watch
index 74d3ec2,0000000..802e9ff
mode 100644,000000..100644
--- a/debian/watch
+++ b/debian/watch
@@@ -1,3 -1,0 +1,3 @@@
+version=3
- opts=dversionmangle=s/\.dfsg// \
- http://sf.net/stun/stund_([\d\.]+)_...\d\d\.tgz
++opts=dversionmangle=s/~dfsg// \
++ http://sf.net/stun/stund[_-]([\d\.]+)\.tgz
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/stun.git
More information about the Pkg-voip-commits
mailing list