# HG changeset patch
# User Volker Grabsch <vog@notjusthosting.com>
# Date 1290979796 -3600
# Node ID e9bac6eb9d85ea1152ddb578c5e6b5e886db01aa
# Parent  a28d4559075ce71fc67843c9f82126c659171cc5# Parent  3c46ed3352e35e1168c167e05b1b62c7e2391596
merge

diff -r a28d4559075c -r e9bac6eb9d85 src/freetds-1-fastforward.patch
--- a/src/freetds-1-fastforward.patch	Sun Nov 28 22:28:35 2010 +0100
+++ b/src/freetds-1-fastforward.patch	Sun Nov 28 22:29:56 2010 +0100
@@ -160229,3 +160229,53 @@
  }
  
  /** @} */
+
+commit 26ceeae89c1d12096b162b69413585dc0dc7fd41
+Author: freddy77 <freddy77>
+Date:   Sun Nov 28 14:15:45 2010 +0000
+
+    remove a warning
+
+diff --git a/ChangeLog b/ChangeLog
+index 89f4d38..8e6216f 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -1,3 +1,6 @@
++Sun Nov 28 15:15:25 CET 2010    Frediano Ziglio <freddy77_A_gmail_D_com>
++	* src/tds/ptw32_MCS_lock.c: remove a warning
++
+ Fri Nov 26 20:46:45 CET 2010    Frediano Ziglio <freddy77_A_gmail_D_com>
+ 	* include/tds.h src/tds/encodings.pl src/tds/iconv.c:
+ 	- use numeric constant for canonic charsets
+@@ -3034,4 +3037,4 @@ Wed Jan  9 19:54:43 EST 2008	JK Lowden <jklowden@freetds.org>
+ 	* ChangeLog-0.82 added because of release
+ 	
+ $FreeTDS$
+-$Id: ChangeLog,v 1.3164 2010/11/26 19:46:55 freddy77 Exp $
++$Id: ChangeLog,v 1.3165 2010/11/28 14:15:45 freddy77 Exp $
+diff --git a/src/tds/ptw32_MCS_lock.c b/src/tds/ptw32_MCS_lock.c
+index cdf6eda..23fb75c 100644
+--- a/src/tds/ptw32_MCS_lock.c
++++ b/src/tds/ptw32_MCS_lock.c
+@@ -186,18 +186,18 @@ ptw32_mcs_lock_release(ptw32_mcs_local_node_t * node)
+ 	ptw32_mcs_lock_t *lock = node->lock;
+ 
+ 	ptw32_mcs_local_node_t *next = (ptw32_mcs_local_node_t *)
+-		InterlockedCompareExchangePointer(&node->next, 0, 0);	/* MBR fence */
++		InterlockedCompareExchangePointer((void * volatile*) &node->next, 0, 0);	/* MBR fence */
+ 
+ 	if (0 == next) {
+ 		/* no known successor */
+-		if (node == (ptw32_mcs_local_node_t *) InterlockedCompareExchangePointer(lock, 0, node)) {
++		if (node == (ptw32_mcs_local_node_t *) InterlockedCompareExchangePointer((void * volatile*) lock, 0, node)) {
+ 			/* no successor, lock is free now */
+ 			return;
+ 		}
+ 
+ 		/* wait for successor */
+ 		ptw32_mcs_flag_wait(&node->nextFlag);
+-		next = (ptw32_mcs_local_node_t *) InterlockedCompareExchangePointer(&node->next, 0, 0);	/* MBR fence */
++		next = (ptw32_mcs_local_node_t *) InterlockedCompareExchangePointer((void * volatile*) &node->next, 0, 0);	/* MBR fence */
+ 	}
+ 
+ 	/* pass the lock */
diff -r a28d4559075c -r e9bac6eb9d85 src/gnutls.mk
--- a/src/gnutls.mk	Sun Nov 28 22:28:35 2010 +0100
+++ b/src/gnutls.mk	Sun Nov 28 22:29:56 2010 +0100
@@ -4,8 +4,8 @@
 # GnuTLS
 PKG             := gnutls
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 2.10.2
-$(PKG)_CHECKSUM := 2704b7b86fc5e3444afcf20feb7bc9ff117d4816
+$(PKG)_VERSION  := 2.10.3
+$(PKG)_CHECKSUM := b17b23d462ecf829f3b9aff3248d25d4979ebe4f
 $(PKG)_SUBDIR   := gnutls-$($(PKG)_VERSION)
 $(PKG)_FILE     := gnutls-$($(PKG)_VERSION).tar.bz2
 $(PKG)_WEBSITE  := http://www.gnu.org/software/gnutls/