From: Martin Johansson <martin@fatbob.nu>
Date: Wed, 13 Apr 2011 19:13:35 +0000 (+0200)
Subject: Delete outdated makefiles. Update default OpenWRT configuration file.
X-Git-Url: http://git.code-monkey.de/?p=umurmur.git;a=commitdiff_plain;h=0a2648fb438c9c6712f19c36cbd5815ea133326c

Delete outdated makefiles. Update default OpenWRT configuration file.
---

diff --git a/openwrt/Makefile.openssl b/openwrt/Makefile.openssl
deleted file mode 100644
index 5b6fb1d..0000000
--- a/openwrt/Makefile.openssl
+++ /dev/null
@@ -1,55 +0,0 @@
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=umurmur-openssl
-PKG_VERSION:=0.2.6
-PKG_RELEASE:=1
-
-PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
-
-include $(INCLUDE_DIR)/package.mk
-
-
-define Package/umurmur-openssl
-	SECTION:=net
-	CATEGORY:=Network
-	TITLE:=uMurmur
-	DEPENDS:=+libopenssl +libconfig
-	URL:=http://code.google.com/p/umurmur
-	MAINTAINER:=Martin Johansson <martin@fatbob.nu>
-endef
-
-define Package/umurmur-openssl/description
-	Minimalistic Mumble server daemon.
-	Uses OpenSSL library for SSL and crypto.
-endef
-
-TARGET_CFLAGS := \
-        -DWRT_TARGET \
-        $(TARGET_CFLAGS)
-TARGET_LDFLAGS := \
-        -lcrypto -lssl \
-	$(TARGET_LDFLAGS)
-
-define Build/Prepare
-	mkdir -p $(PKG_BUILD_DIR)
-	$(CP) ./src/* $(PKG_BUILD_DIR)/
-endef
-
-define Build/CompileTarget
-	CFLAGS="$(TARGET_CFLAGS)" LDFLAGS="$(TARGET_LDFLAGS)"\
-	$(MAKE) -C $(PKG_BUILD_DIR)/umurmur.$(1)/umurmur \
-		all
-endef
-
-define Package/umurmur-openssl/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/umurmurd $(1)/usr/bin/
-	$(INSTALL_DIR) $(1)/etc
-	$(INSTALL_CONF) ./openwrt/files/umurmur.conf $(1)/etc/
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./openwrt/files/umurmur.init $(1)/etc/init.d/umurmur
-	$(INSTALL_DIR) $(1)/etc/umurmur
-endef
-
-$(eval $(call BuildPackage,umurmur-openssl))
-
diff --git a/openwrt/Makefile.polarssl b/openwrt/Makefile.polarssl
deleted file mode 100644
index 8d641af..0000000
--- a/openwrt/Makefile.polarssl
+++ /dev/null
@@ -1,56 +0,0 @@
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=umurmur-polarssl
-PKG_VERSION:=0.2.6
-PKG_RELEASE:=1
-
-PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
-
-include $(INCLUDE_DIR)/package.mk
-
-
-define Package/umurmur-polarssl
-	SECTION:=net
-	CATEGORY:=Network
-	TITLE:=uMurmur
-	DEPENDS:=+libpolarssl +libconfig
-	URL:=http://code.google.com/p/umurmur
-	MAINTAINER:=Martin Johansson <martin@fatbob.nu>
-endef
-
-define Package/umurmur-polarssl/description
-	Minimalistic Mumble server daemon.
-	Uses the PolarSSL library for SSL and crypto.
-endef
-
-TARGET_CFLAGS := \
-        -DWRT_TARGET \
-	-DUSE_POLARSSL \
-        $(TARGET_CFLAGS)
-TARGET_LDFLAGS := \
-        -lpolarssl \
-	$(TARGET_LDFLAGS)
-
-define Build/Prepare
-	mkdir -p $(PKG_BUILD_DIR)
-	$(CP) ./src/* $(PKG_BUILD_DIR)/
-endef
-
-define Build/CompileTarget
-	CFLAGS="$(TARGET_CFLAGS)" LDFLAGS="$(TARGET_LDFLAGS)"\
-	$(MAKE) -C $(PKG_BUILD_DIR)/umurmur.$(1)/umurmur \
-		all
-endef
-
-define Package/umurmur-polarssl/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/umurmurd $(1)/usr/bin/
-	$(INSTALL_DIR) $(1)/etc
-	$(INSTALL_CONF) ./openwrt/files/umurmur.conf $(1)/etc/
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./openwrt/files/umurmur.init $(1)/etc/init.d/umurmur
-	$(INSTALL_DIR) $(1)/etc/umurmur
-endef
-
-$(eval $(call BuildPackage,umurmur-polarssl))
-
diff --git a/openwrt/files/umurmur.conf b/openwrt/files/umurmur.conf
index 826746b..fad2b80 100644
--- a/openwrt/files/umurmur.conf
+++ b/openwrt/files/umurmur.conf
@@ -5,12 +5,14 @@ private_key = "/etc/umurmur/key.key";
 password = "";
 max_users = 10;
 
-# Username and groupname for privilege dropping
+# username and groupname for privilege dropping.
+# Will attempt to switch user if set. 
 # username = "";
+# If groupname not set the user's default login group will be used
 # groupname = "";
 
-# bindaddr = "192.168.1.1";
 # bindport = 64738;
+# bindaddr = "192.168.1.1";
 
 # Root channel must always be defined first.
 # If a channel has a parent, the parent must be defined before the child channel(s).