From 96df23c96dad288efccfcb67254688cb00bcd907 Mon Sep 17 00:00:00 2001
From: fatbob313 <martin@fatbob.nu>
Date: Wed, 24 Mar 2010 20:04:30 +0000
Subject: [PATCH] Update to version 0.2.3

---
 CHANGELOG                 | 38 ++++++++++++++++++++++++++++++++++++++
 README                    | 13 +++++++++++++
 openwrt/Makefile.openssl  |  2 +-
 openwrt/Makefile.polarssl |  2 +-
 src/Makefile              | 10 +++++-----
 src/version.h             |  2 +-
 6 files changed, 59 insertions(+), 8 deletions(-)
 create mode 100644 CHANGELOG

diff --git a/CHANGELOG b/CHANGELOG
new file mode 100644
index 0000000..39ba7bb
--- /dev/null
+++ b/CHANGELOG
@@ -0,0 +1,38 @@
+0.2.3:
+Fix byte order confusion which made uMurmur not work on big endian
+platforms.
+
+0.2.2:
+Fix server crash when user adding an Access Token while connected to the
+server.
+Fix server crash when dragging the self user from a temporary channel and
+dropping it back into the very same temporary channel.
+
+0.2.1:
+Just a version string update (accidentally was left at "0.2.0-beta2" in
+release 0.2.0).
+
+
+0.2.0:
+Lots of changes. Highlights:
+
+Uses Mumble protocol 1.2.x, meaning that clients 1.2.x are supported.
+Support for PolarSSL as an alternative to OpenSSL.
+Whisper target to channels, channel trees and linked channels.
+Temporary channels can be created by users.
+Channel links can be configured in the configuration file.
+Channels can be configured non-enterable in configuration file.
+Positional audio is stripped if users are not in the same plugin context
+(playing the same game).
+
+0.1.3:
+Fix TCP-mode memory leak.
+Add command-line switch to enable realtime priority
+
+0.1.2:
+Increase max string size
+Force a close when inactivity timer triggers
+Correct log levels
+
+0.1.1:
+Initial release
diff --git a/README b/README
index f5a0226..b042573 100644
--- a/README
+++ b/README
@@ -5,6 +5,19 @@ http://code.google.com/p/umurmur/
 Contains protobuf-c library code which is Copyright 2008, Dave Benson.
 See http://code.google.com/p/protobuf-c/
 
+uMurmur is available as a precompiled package for some distributions. Check
+your package repository if you are running OpenWRT or Freetz.
+
+There are makefiles in the openwrt subdirectory suitable for buildning with
+the OpenWRT SDK. Move the Makefile of choice to the base directory, e.g.:
+
+# mv openwrt/Makefile.polarssl Makefile
+
+and then put the whole umurmur-X.X.X directory in the SDK's 'packages'
+directory.
+
+
+Instructions for building from source:
 1. Requirements
 o OpenSSL or PolarSSL library
 o libConfig
diff --git a/openwrt/Makefile.openssl b/openwrt/Makefile.openssl
index 9e27eaf..e182eed 100644
--- a/openwrt/Makefile.openssl
+++ b/openwrt/Makefile.openssl
@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=umurmur-openssl
-PKG_VERSION:=0.2.2
+PKG_VERSION:=0.2.3
 PKG_RELEASE:=1
 
 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
diff --git a/openwrt/Makefile.polarssl b/openwrt/Makefile.polarssl
index 37582d5..8186f7a 100644
--- a/openwrt/Makefile.polarssl
+++ b/openwrt/Makefile.polarssl
@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=umurmur-polarssl
-PKG_VERSION:=0.2.2
+PKG_VERSION:=0.2.3
 PKG_RELEASE:=1
 
 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
diff --git a/src/Makefile b/src/Makefile
index 39db9ef..fc82e2a 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -9,16 +9,16 @@ OBJS:=$(patsubst %.c, %.o, $(SRCS))
 #EXTRA_LDFLAGS:=$(LDFLAGS) -L/data/export/proj/openssl/lib/ -lcrypto -lssl
 
 # Debug
-# CFLAGS:=$(CFLAGS) -DDEBUG -g
+CFLAGS:=$(CFLAGS) -DDEBUG -g
 # ********** Debug stuff END ************
 
 
 # Build support and link to PolarSSL
 # If PolarSSL is in a nonstandard place.
-# POLARSSL_LIB:=../../../../polarssl/polarssl-0.12.1/library/libpolarssl.a
-# SSL_LIB:=$(POLARSSL_LIB) # If statically linking
-# POLARSSL_INCLUDE:=../../../../polarssl/polarssl-0.12.1/include
-# EXTRA_CFLAGS:=-DUSE_POLARSSL -I$(POLARSSL_INCLUDE)
+POLARSSL_LIB:=../../../polarssl/polarssl-0.12.1/library/libpolarssl.a
+SSL_LIB:=$(POLARSSL_LIB) # If statically linking
+POLARSSL_INCLUDE:=../../../polarssl/polarssl-0.12.1/include
+EXTRA_CFLAGS:=-DUSE_POLARSSL -I$(POLARSSL_INCLUDE)
 # EXTRA_LDLAGS:=-lpolarssl
 
 
diff --git a/src/version.h b/src/version.h
index b498945..47773e1 100644
--- a/src/version.h
+++ b/src/version.h
@@ -1,7 +1,7 @@
 #ifndef VERSION_H_989876
 #define VERSION_H_989876
 
-#define UMURMUR_VERSION "0.2.2"
+#define UMURMUR_VERSION "0.2.3"
 
 #endif
 
-- 
2.30.2