[Pkg-voip-commits] [resiprocate] 02/03: Remove various Debian patches

[Daniel Pocock]

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

pocock pushed a commit to branch master
in repository resiprocate.

commit 0a4cecf50198bfeb69358b4317f7ec9c8fb5455b
Author: Daniel Pocock <daniel at pocock.com.au>
Date:   Mon Aug 5 22:28:40 2013 +0200

    Remove various Debian patches
---
 .../0001-Fix-for-big-endian-build-issues.patch     |   40 --------------------
 .../0002-Fix-for-64-bit-IPv6-Tuple-issue.patch     |   34 -----------------
 debian/patches/series                              |    2 -
 debian/rules                                       |    6 +--
 4 files changed, 3 insertions(+), 79 deletions(-)

diff --git a/debian/patches/0001-Fix-for-big-endian-build-issues.patch b/debian/patches/0001-Fix-for-big-endian-build-issues.patch
deleted file mode 100644
index 06a2631..0000000
--- a/debian/patches/0001-Fix-for-big-endian-build-issues.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From: Daniel Pocock <daniel at pocock.com.au>
-Date: Thu, 18 Jul 2013 20:50:42 +0200
-Subject: Fix for big endian build issues
-
----
- rutil/Data.cxx |   14 ++++++++++++++
- 1 file changed, 14 insertions(+)
-
-diff --git a/rutil/Data.cxx b/rutil/Data.cxx
-index 753196a..14ec7e3 100644
---- a/rutil/Data.cxx
-+++ b/rutil/Data.cxx
-@@ -1967,6 +1967,19 @@ Data::rawCaseInsensitiveHash(const unsigned char* c, size_t size)
-    return ntohl((u_long)st);
- }
- 
-+#if (defined(__BYTE_ORDER__) && (__BYTE_ORDER__ == __ORDER_BIG_ENDIAN__))
-+
-+#if !defined (get16bits)
-+#define get16bits(d) ((((UInt32)(((const UInt8 *)(d))[0])) << 8)\
-+                       +(UInt32)(((const UInt8 *)(d))[1]) )
-+#endif
-+
-+#if !defined (get32bits)
-+#define get32bits(d) ((get16bits(d) << 16) + get16bits(d+2))
-+#endif
-+
-+#else
-+
- #undef get16bits
- #if (defined(__GNUC__) && defined(__i386__)) || defined(__WATCOMC__) \
-   || defined(_MSC_VER) || defined (__BORLANDC__) || defined (__TURBOC__)
-@@ -1987,6 +2000,7 @@ Data::rawCaseInsensitiveHash(const unsigned char* c, size_t size)
- #if !defined (get32bits)
- #define get32bits(d) ((get16bits(d+2) << 16) + get16bits(d))
- #endif
-+#endif
- 
- // This is intended to be a faster case-insensitive hash function that works
- // well when the buffer is a RFC 3261 token.
diff --git a/debian/patches/0002-Fix-for-64-bit-IPv6-Tuple-issue.patch b/debian/patches/0002-Fix-for-64-bit-IPv6-Tuple-issue.patch
deleted file mode 100644
index 67f4085..0000000
--- a/debian/patches/0002-Fix-for-64-bit-IPv6-Tuple-issue.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From: Daniel Pocock <daniel at pocock.com.au>
-Date: Fri, 19 Jul 2013 12:36:18 +0200
-Subject: Fix for 64 bit IPv6 Tuple issue
-
----
- resip/stack/Tuple.cxx |    8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/resip/stack/Tuple.cxx b/resip/stack/Tuple.cxx
-index 3a18532..2652596 100644
---- a/resip/stack/Tuple.cxx
-+++ b/resip/stack/Tuple.cxx
-@@ -769,8 +769,8 @@ Tuple::isEqualWithMask(const Tuple& compare, short mask, bool ignorePort, bool i
- 
-          if(ignorePort || addr1->sin6_port == addr2->sin6_port)
-          {
--            unsigned long mask6part;
--            unsigned long temp;
-+            UInt32 mask6part;
-+            UInt32 temp;
-             bool match=true;
-             for(int i = 3; i >= 0; i--)
-             {
-@@ -802,8 +802,8 @@ Tuple::isEqualWithMask(const Tuple& compare, short mask, bool ignorePort, bool i
-                if((*((unsigned long*)&addr1->sin6_addr.__u6_addr.__u6_addr32[i]) & htonl(mask6part)) != 
-                   (*((unsigned long*)&addr2->sin6_addr.__u6_addr.__u6_addr32[i]) & htonl(mask6part)))				  
- #else
--               if((*((unsigned long*)&addr1->sin6_addr.s6_addr16[i*2]) & htonl(mask6part)) != 
--                  (*((unsigned long*)&addr2->sin6_addr.s6_addr16[i*2]) & htonl(mask6part)))
-+               if((*((UInt32*)&addr1->sin6_addr.s6_addr16[i*2]) & htonl(mask6part)) != 
-+                  (*((UInt32*)&addr2->sin6_addr.s6_addr16[i*2]) & htonl(mask6part)))
- #endif
-                {
-                   match=false;
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 867fb36..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-0001-Fix-for-big-endian-build-issues.patch
-0002-Fix-for-64-bit-IPv6-Tuple-issue.patch
diff --git a/debian/rules b/debian/rules
index 1b3e69a..ea712c2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -47,9 +47,9 @@ override_dh_auto_configure:
 	#echo "all:" > apps/clicktocall/test/Makefile
 	#echo "install:" >> apps/clicktocall/test/Makefile
 	#echo "check:" >> apps/clicktocall/test/Makefile
-	echo "all:" > resip/recon/test/Makefile
-	echo "install:" >> resip/recon/test/Makefile
-	echo "check:" >> resip/recon/test/Makefile
+	#echo "all:" > resip/recon/test/Makefile
+	#echo "install:" >> resip/recon/test/Makefile
+	#echo "check:" >> resip/recon/test/Makefile
 # FIXME - make all of the above build properly on all platforms
 # recon tests fail, requires audio hardware (fixed upstream after 1.8.11)
 # MOHParkServer lib dependency (fixed upstream)

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