[Pkg-voip-commits] r10573 - in /stun/trunk/debian: changelog compat control patches/00list patches/daemon_noverbose.dpatch patches/fix_non_i386.dpatch patches/fix_non_i386.patch patches/series patches/stun-0.96.dfsg-xor-mapped-address.patch rules source/ source/format watch
kilian at alioth.debian.org
kilian at alioth.debian.org
Thu Oct 16 20:36:25 UTC 2014
Author: kilian
Date: Thu Oct 16 20:36:25 2014
New Revision: 10573
URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=10573
Log:
* 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
Added:
stun/trunk/debian/patches/fix_non_i386.patch
stun/trunk/debian/patches/series
stun/trunk/debian/patches/stun-0.96.dfsg-xor-mapped-address.patch
stun/trunk/debian/source/
stun/trunk/debian/source/format
Removed:
stun/trunk/debian/patches/00list
stun/trunk/debian/patches/daemon_noverbose.dpatch
stun/trunk/debian/patches/fix_non_i386.dpatch
Modified:
stun/trunk/debian/changelog
stun/trunk/debian/compat
stun/trunk/debian/control
stun/trunk/debian/rules
stun/trunk/debian/watch
Modified: stun/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/stun/trunk/debian/changelog?rev=10573&op=diff
==============================================================================
--- stun/trunk/debian/changelog (original)
+++ stun/trunk/debian/changelog Thu Oct 16 20:36:25 2014
@@ -1,3 +1,15 @@
+stun (0.97~dfsg-1) UNRELEASED; 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
+
+ -- Kilian Krause <kilian at debian.org> Thu, 16 Oct 2014 22:35:56 +0200
+
stun (0.96.dfsg-6) unstable; urgency=low
[ Kilian Krause ]
Modified: stun/trunk/debian/compat
URL: http://svn.debian.org/wsvn/pkg-voip/stun/trunk/debian/compat?rev=10573&op=diff
==============================================================================
--- stun/trunk/debian/compat (original)
+++ stun/trunk/debian/compat Thu Oct 16 20:36:25 2014
@@ -1 +1 @@
-5
+9
Modified: stun/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/stun/trunk/debian/control?rev=10573&op=diff
==============================================================================
--- stun/trunk/debian/control (original)
+++ stun/trunk/debian/control Thu Oct 16 20:36:25 2014
@@ -3,7 +3,7 @@
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/
Added: stun/trunk/debian/patches/fix_non_i386.patch
URL: http://svn.debian.org/wsvn/pkg-voip/stun/trunk/debian/patches/fix_non_i386.patch?rev=10573&op=file
==============================================================================
--- stun/trunk/debian/patches/fix_non_i386.patch (added)
+++ stun/trunk/debian/patches/fix_non_i386.patch Thu Oct 16 20:36:25 2014
@@ -0,0 +1,24 @@
+## fix_non_i386.dpatch by Kilian Krause <kilian at debian.org>
+##
+## DP: Remove i386-only code analogous to twinkle
+diff -urNad stun-0.96~/stun.cxx stun-0.96/stun.cxx
+--- stun-0.96~/stun.cxx 2005-08-14 00:39:03.000000000 +0000
++++ stun-0.96/stun.cxx 2006-01-03 00:54:33.000000000 +0000
+@@ -669,16 +669,8 @@
+ tick = hightick;
+ tick <<= 32;
+ tick |= lowtick;
+-#elif defined(__GNUC__) && ( defined(__i686__) || defined(__i386__) )
+- asm("rdtsc" : "=A" (tick));
+-#elif defined (__SUNPRO_CC) || defined( __sparc__ )
+- tick = gethrtime();
+-#elif defined(__MACH__)
+- int fd=open("/dev/random",O_RDONLY);
+- read(fd,&tick,sizeof(tick));
+- closesocket(fd);
+ #else
+-# error Need some way to seed the random number generator
++ tick = time(NULL);
+ #endif
+ int seed = int(tick);
+ #ifdef WIN32
Added: stun/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/stun/trunk/debian/patches/series?rev=10573&op=file
==============================================================================
--- stun/trunk/debian/patches/series (added)
+++ stun/trunk/debian/patches/series Thu Oct 16 20:36:25 2014
@@ -0,0 +1 @@
+stun-0.96.dfsg-xor-mapped-address.patch
Added: stun/trunk/debian/patches/stun-0.96.dfsg-xor-mapped-address.patch
URL: http://svn.debian.org/wsvn/pkg-voip/stun/trunk/debian/patches/stun-0.96.dfsg-xor-mapped-address.patch?rev=10573&op=file
==============================================================================
--- stun/trunk/debian/patches/stun-0.96.dfsg-xor-mapped-address.patch (added)
+++ stun/trunk/debian/patches/stun-0.96.dfsg-xor-mapped-address.patch Thu Oct 16 20:36:25 2014
@@ -0,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@
+--- stun-0.96.dfsg/stun.h.orig 2014-10-10 14:04:06.450554203 +0200
++++ stun-0.96.dfsg/stun.h 2014-10-10 14:11:05.381612948 +0200
+@@ -44,7 +44,11 @@
+ 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
Modified: stun/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/stun/trunk/debian/rules?rev=10573&op=diff
==============================================================================
--- stun/trunk/debian/rules (original)
+++ stun/trunk/debian/rules Thu Oct 16 20:36:25 2014
@@ -1,80 +1,42 @@
#!/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
+override_dh_clean:
+ ([ ! -f rfc3489.txt ] || (echo This is not the DFSG source.;exit 1))
+ dh_clean
+
+##override_dh_auto_build:
+## #$(MAKE) tlsServer
+## dh_auto_build
-build: build-stamp
-build-stamp: patch-stamp
- dh_testdir
- ([ ! -f rfc3489.txt ] || (echo This is not the DFSG source.;exit 1))
+override_dh_install:
+ # we want to change the names too!
+ install -m 755 server $(CURDIR)/debian/stun/usr/sbin/stund
+ install -m 755 client $(CURDIR)/debian/stun/usr/bin/stun
+ #install -m 755 tlsServer $(CURDIR)/debian/stun/usr/sbin/
+ dh_install
- # 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
- #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
+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
+ @@echo Writing archive ../tarballs/$(FILENAME) ...
+ @@cd ../tarballs/stun-$(UPVERSION).tmp ; tar cfz ../$(FILENAME) *
+ @@echo Cleaning up...
+ @@$(RM) -rf ../tarballs/stun-$(UPVERSION).tmp/ ../tarballs/$(UPFILENAME)
Added: stun/trunk/debian/source/format
URL: http://svn.debian.org/wsvn/pkg-voip/stun/trunk/debian/source/format?rev=10573&op=file
==============================================================================
--- stun/trunk/debian/source/format (added)
+++ stun/trunk/debian/source/format Thu Oct 16 20:36:25 2014
@@ -0,0 +1 @@
+3.0 (quilt)
Modified: stun/trunk/debian/watch
URL: http://svn.debian.org/wsvn/pkg-voip/stun/trunk/debian/watch?rev=10573&op=diff
==============================================================================
--- stun/trunk/debian/watch (original)
+++ stun/trunk/debian/watch Thu Oct 16 20:36:25 2014
@@ -1,3 +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
More information about the Pkg-voip-commits
mailing list