From 9177b153c29241cff967f9c7d64119cb40ad3b52 Mon Sep 17 00:00:00 2001 From: Warren Togami Date: Wed, 22 Jul 2009 02:52:13 +0000 Subject: [PATCH] stun sha1 patch from upstream to make it work at all --- libnice-0.0.8-sha1.patch | 22 ++++++++++++++++++++++ libnice.spec | 7 ++++++- 2 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 libnice-0.0.8-sha1.patch diff --git a/libnice-0.0.8-sha1.patch b/libnice-0.0.8-sha1.patch new file mode 100644 index 0000000..f2b6b41 --- /dev/null +++ b/libnice-0.0.8-sha1.patch @@ -0,0 +1,22 @@ +http://bugs.archlinux.org/task/15189 + +X-Git-Url: http://git.collabora.co.uk/?p=user%2Fkakaroto%2Flibnice.git;a=blobdiff_plain;f=stun%2Fsha1.c;h=d0e75d5047766c11fd5c37166e29d9a73e6e0d61;hp=94b2b4b096114d20ee0e12c3a688a10769eb678e;hb=e571e13fb03d217d27c1164379760f9d0c13d3ca;hpb=52f330873715fea4198c1450bd9bf3ff6bdd2f6d + +diff --git a/stun/sha1.c b/stun/sha1.c +index 94b2b4b..d0e75d5 100644 +--- a/stun/sha1.c ++++ b/stun/sha1.c +@@ -143,11 +143,11 @@ static void SHA1Transform(uint32_t state[5], const unsigned char buffer[64]) + { + uint32_t a, b, c, d, e; + typedef union { +- unsigned char c[64]; ++ uint8_t c[64]; + uint32_t l[16]; + } CHAR64LONG16; + CHAR64LONG16* block; +- uint32_t workspace[16]; ++ uint8_t workspace[64]; + block = (CHAR64LONG16 *) workspace; + memcpy(block, buffer, 64); + diff --git a/libnice.spec b/libnice.spec index fdf310c..2e98003 100644 --- a/libnice.spec +++ b/libnice.spec @@ -1,12 +1,13 @@ Name: libnice Version: 0.0.8 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GLib ICE implementation Group: System Environment/Libraries License: LGPLv2 and MPLv1.1 URL: http://nice.freedesktop.org/wiki/ Source0: http://nice.freedesktop.org/releases/%{name}-%{version}.tar.gz +Patch0: libnice-0.0.8-sha1.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: glib2-devel @@ -39,6 +40,7 @@ developing applications that use %{name}. %prep %setup -q +%patch0 -p1 %build @@ -82,6 +84,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Jul 21 2009 Warren Togami - 0.0.8-2 +- stun sha1 patch from upstream to make it work at all + * Sun Jun 21 2009 Brian Pepple - 0.0.8-1 - Update to 0.0.8.