From: obsy <obsy@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Mon, 4 Oct 2010 17:47:40 +0000 (+0000)
Subject: [packages] transmission: update to 2.10b1, add new option, lower default message... 
X-Git-Url: http://207.154.207.93/?a=commitdiff_plain;h=6cc6343158700cd21e215c24b41fb71908158631;p=packages.git

[packages] transmission: update to 2.10b1, add new option, lower default message level

git-svn-id: svn://svn.openwrt.org/openwrt/packages@23225 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/net/transmission/Makefile b/net/transmission/Makefile
index bdb99009d..5baab6973 100644
--- a/net/transmission/Makefile
+++ b/net/transmission/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=transmission
-PKG_VERSION:=2.04
-PKG_RELEASE:=2
+PKG_VERSION:=2.10b1
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://mirrors.m0k.org/transmission/files
-PKG_MD5SUM:=84fe15eb7e000fdc369def513299358b
+PKG_MD5SUM:=6bf66d6b2690071459761eb6487d2a77
 
 PKG_FIXUP:=libtool
 PKG_INSTALL:=1
@@ -98,7 +98,11 @@ endef
 
 define Package/transmission-cli/install
 	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/transmissioncli $(1)/usr/bin/
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/transmission-cli \
+			$(PKG_INSTALL_DIR)/usr/bin/transmission-create \
+			$(PKG_INSTALL_DIR)/usr/bin/transmission-edit \
+			$(PKG_INSTALL_DIR)/usr/bin/transmission-show \
+			$(1)/usr/bin/
 endef
 
 define Package/transmission-remote/install
diff --git a/net/transmission/files/transmission.config b/net/transmission/files/transmission.config
index d2e77c91a..46d845b3c 100644
--- a/net/transmission/files/transmission.config
+++ b/net/transmission/files/transmission.config
@@ -1,5 +1,5 @@
 config transmission
-	option enable 0
+	option enabled 0
 	option config_dir '/tmp/transmission'
 	option alt_speed_down 50
 	option alt_speed_enabled false
@@ -11,14 +11,17 @@ config transmission
 	option bind_address_ipv4 '0.0.0.0'
 	option bind_address_ipv6 '::'
 	option blocklist_enabled false
+	option cache_size_mb 2
 	option dht_enabled true
 	option download_dir '/tmp/transmission/done'
 	option encryption 1
+	option idle_seeding_limit 30
+	option idle_seeding_limit_enabled false
 	option incomplete_dir '/tmp/transmission/incomplete'
 	option incomplete_dir_enabled false
 	option lazy_bitfield_enabled true
 	option lpd_enabled false
-	option message_level 2
+	option message_level 1
 	option open_file_limit 32
 	option peer_limit_global 240
 	option peer_limit_per_torrent 60
diff --git a/net/transmission/files/transmission.init b/net/transmission/files/transmission.init
index b7c7cc6d7..be816c459 100644
--- a/net/transmission/files/transmission.init
+++ b/net/transmission/files/transmission.init
@@ -37,21 +37,23 @@ append_params_quotes() {
 start_service() {
 	local s="$1"
 	local enable=0
+	local enabled=0
 	local run_as_usr='root'
 
 	# disabled?
-	config_get_bool enable "$s" enable 0
-	[ "$enable" == 0 ] && return 0
+	config_get_bool enable "$s" enable 0 # compatibility with prev version
+	config_get_bool enabled "$s" enabled 0
+	[ "$enabled" == 0 -a "$enable" == 0 ] && return 0
 	config_get config_dir "$s" config_dir '/tmp/transmission'
 	mkdir -p "$config_dir"
-	config_get run_as_usr "$s" run_daemon_as_user 'root' 
+	config_get run_as_usr "$s" run_daemon_as_user 'root'
 
 	echo "{" > $config_dir/settings.json
 
 	append_params "$s" \
 		alt_speed_down alt_speed_enabled alt_speed_time_begin alt_speed_time_day \
-		alt_speed_time_enabled alt_speed_time_end alt_speed_up \
-		blocklist_enabled dht_enabled encryption \
+		alt_speed_time_enabled alt_speed_time_end alt_speed_up blocklist_enabled \
+		cache_size_mb dht_enabled encryption idle_seeding_limit idle_seeding_limit_enabled \
 		incomplete_dir_enabled lazy_bitfield_enabled lpd_enabled message_level \
 		open_file_limit peer_limit_global peer_limit_per_torrent peer_port \
 		peer_port_random_high peer_port_random_low peer_port_random_on_start \