update to 0.9

4 files changed, 29 insertions, 26 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ef0f8363ad09..2ef7fe8cb0fe 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = easydrcom-git
 	pkgdesc = 3rd Party Dr.COM Client for HITwh
-	pkgver = 08f4404
+	pkgver = 6bff7f0
 	pkgrel = 1
 	url = https://github.com/coverxit/EasyDrcom
 	arch = i686
@@ -15,8 +15,8 @@ pkgbase = easydrcom-git
 	source = EasyDrcom.conf
 	source = patch.txt
 	md5sums = SKIP
-	md5sums = ed15888b134b18d885d81567542042a4
-	md5sums = 1dba42fe14d02ec886d8023f835fe21e
+	md5sums = 55fe56035569fcd42ea9540da4b89b85
+	md5sums = 59ad24fded5faad50f6c0d6205a73f2c
 
 pkgname = easydrcom-git
 
diff --git a/EasyDrcom.conf b/EasyDrcom.conf
index 0eab3b60e1c6..a1f1d0944412 100644
--- a/EasyDrcom.conf
+++ b/EasyDrcom.conf
@@ -1,4 +1,4 @@
-;EasyDrcom 0.8配置文件

+;EasyDrcom 0.9配置文件

 [General]

 ;用户名(学号)

 UserName=

@@ -33,4 +33,4 @@ EAPTimeout=10000
 UDPTimeout=20000

 ;以下两项一般情况不需要修改

 HostName=EasyDrcom for HITwh

-KernelVersion=0.8_Ubuntu_14.04

+KernelVersion=0.9_Ubuntu_14.04

diff --git a/PKGBUILD b/PKGBUILD
index a3ec26730571..4f397deb221a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,7 +8,7 @@
 
 # Maintainer: Ning Humbert <galaxy0419@gmail.com>
 pkgname=easydrcom-git # '-bzr', '-git', '-hg' or '-svn'
-pkgver=08f4404
+pkgver=6bff7f0
 pkgrel=1
 pkgdesc="3rd Party Dr.COM Client for HITwh"
 arch=('i686' 'x86_64')
@@ -22,8 +22,8 @@ source=('git+https://github.com/coverxit/EasyDrcom.git'
         'EasyDrcom.conf'
 	'patch.txt')
 md5sums=('SKIP'
-         'ed15888b134b18d885d81567542042a4'
-	 '1dba42fe14d02ec886d8023f835fe21e')
+         '55fe56035569fcd42ea9540da4b89b85'
+	     '59ad24fded5faad50f6c0d6205a73f2c')
 
 # Please refer to the 'USING VCS SOURCES' section of the PKGBUILD man page for
 # a description of each element in the source array.
diff --git a/patch.txt b/patch.txt
index 3a6fe8044dd5..49fb07c5f0a3 100644
--- a/patch.txt
+++ b/patch.txt
@@ -1,20 +1,23 @@
-index cf40f31..5c9d110 100755
+index d01de89..a16479c 100755
 --- a/main.cpp
 +++ b/main.cpp
-@@ -345,14 +345,14 @@ int main(int argc, const char * argv[])
- {

-     int ret = 0;

-     bool background = false, redirect_to_null = false;

--    std::string config_path = "EasyDrcom.conf";

-+    std::string config_path = "/etc/EasyDrcom.conf";

-     auto clog_def = std::clog.rdbuf();

-     auto cout_def = std::cout.rdbuf();

-     auto cerr_def = std::cerr.rdbuf();

- #ifdef OPENWRT

-     std::string log_path = "/tmp/EasyDrcom.log";

- #else

--    std::string log_path = "EasyDrcom.log";

-+    std::string log_path = "/tmp/EasyDrcom.log";

- #endif

-     

-     for (int i = 1; i < argc; i++)

+@@ -345,15 +345,11 @@ int main(int argc, const char * argv[])
+ {
+     int ret = 0;
+     bool background = false, redirect_to_null = false;
+-    std::string config_path = "EasyDrcom.conf";
++    std::string config_path = "/etc/EasyDrcom.conf";
+     auto clog_def = std::clog.rdbuf();
+     auto cout_def = std::cout.rdbuf();
+     auto cerr_def = std::cerr.rdbuf();
+-#ifdef OPENWRT
+     std::string log_path = "/tmp/EasyDrcom.log";
+-#else
+-    std::string log_path = "EasyDrcom.log";
+-#endif
+     
+     for (int i = 1; i < argc; i++)
+     {
+-- 
+2.10.2
+