update package name

.jenkins.sh

@@ -33,6 +33,6 @@ run_test tests/test.py tests/twitter.com
 
 gcov src/*.c
 cd src && gcovr -r . --html  --html-details  -o index.html
-gcovr -r . | grep TOTAL | rev | cut -d' ' -f 1 | rev  > /tmp/chinadns-c-coverage
+gcovr -r . | grep TOTAL | rev | cut -d' ' -f 1 | rev  > /tmp/chinadns-coverage
 
 exit $result

LICENSE

@@ -1,4 +1,4 @@
-ChinaDNS-C
+ChinaDNS
 
 Copyright (c) 2015 clowwindy
 

README.md

@@ -1,5 +1,5 @@
-ChinaDNS-C
-==========
+ChinaDNS
+========
 
 [![Build Status]][Travis CI]
 [![Coverage Status]][Coverage]
@@ -28,12 +28,12 @@ Install
       cd into [SDK] root, then
 
             pushd package
-            git clone https://github.com/clowwindy/ChinaDNS-C.git
+            git clone https://github.com/clowwindy/ChinaDNS.git
             popd
             make menuconfig # select Network/ChinaDNS
             # Optional
             make -j
-            make V=99 package/ChinaDNS-C/openwrt/compile
+            make V=99 package/ChinaDNS/openwrt/compile
 
 * Tomoto
 
@@ -43,8 +43,8 @@ Install
       `~/WRT54GL-US_v4.30.11_11/tools/` to `/opt`, then
 
             export PATH=/opt/brcm/hndtools-mipsel-uclibc/bin/:/opt/brcm/hndtools-mipsel-linux/bin/:$PATH
-            git clone https://github.com/clowwindy/ChinaDNS-C.git
-            cd ChinaDNS-C
+            git clone https://github.com/clowwindy/ChinaDNS.git
+            cd ChinaDNS
             ./autogen.sh && ./configure --host=mipsel-linux --enable-static && make
 
 * Windows
@@ -61,7 +61,7 @@ Usage
 
 * OpenWRT
 
-        opkg install ChinaDNS-C_1.x.x_ar71xx.ipk
+        opkg install ChinaDNS_1.x.x_ar71xx.ipk
         /etc/init.d/chinadns start
 
     (Optional) We strongly recommend you to set ChinaDNS as a upstream DNS
@@ -101,7 +101,7 @@ Test if it works correctly:
     ;; WHEN: Thu Jan  1 02:37:16 2015
     ;; MSG SIZE  rcvd: 112
 
-Currently ChinaDNS-C only supports UDP. Builtin OpenWRT init script works with
+Currently ChinaDNS only supports UDP. Builtin OpenWRT init script works with
 dnsmasq, which handles TCP. If you use it directly without dnsmasq, you need to
 add a redirect rule for TCP:
 
@@ -145,16 +145,16 @@ Please visit [Issue Tracker]
 Mailing list: http://groups.google.com/group/shadowsocks
 
 
-[Build Status]:         https://travis-ci.org/clowwindy/ChinaDNS-C.svg?branch=master
+[Build Status]:         https://travis-ci.org/clowwindy/ChinaDNS.svg?branch=master
 [ChinaDNS]:             https://github.com/clowwindy/ChinaDNS
-[Coverage Status]:      http://192.81.132.184/result/chinadns-c
-[Coverage]:             http://192.81.132.184/job/ChinaDNS-C/ws/src/index.html
+[Coverage Status]:      http://192.81.132.184/result/chinadns
+[Coverage]:             http://192.81.132.184/job/ChinaDNS/ws/src/index.html
 [Download]:             https://sourceforge.net/projects/chinadns/files/dist/
-[Issue Tracker]:        https://github.com/clowwindy/ChinaDNS-C/issues?state=open
+[Issue Tracker]:        https://github.com/clowwindy/ChinaDNS/issues?state=open
 [Download precompiled]: https://sourceforge.net/projects/chinadns/files/dist/
-[Download a release]:   https://github.com/clowwindy/ChinaDNS-C/releases
+[Download a release]:   https://github.com/clowwindy/ChinaDNS/releases
 [SDK]:                  http://wiki.openwrt.org/doc/howto/obtain.firmware.sdk
 [ShadowVPN]:            https://github.com/clowwindy/ShadowVPN
 [Tomato toolchain]:     http://downloads.linksysbycisco.com/downloads/WRT54GL_v4.30.11_11_US.tgz
-[Travis CI]:            https://travis-ci.org/clowwindy/ChinaDNS-C
+[Travis CI]:            https://travis-ci.org/clowwindy/ChinaDNS
 [weird things]:         http://en.wikipedia.org/wiki/Great_Firewall_of_China#Blocking_methods

configure.ac

@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.67])
-AC_INIT([ChinaDNS-C], [1.2.1], [clowwindy42@gmail.com])
+AC_INIT([ChinaDNS], [1.2.2], [clowwindy42@gmail.com])
 AC_CONFIG_SRCDIR([src/chinadns.c])
 AC_CONFIG_HEADERS([config.h])
 

openwrt/Makefile

@@ -1,14 +1,14 @@
 include $(TOPDIR)/rules.mk
 
-PKG_NAME:=ChinaDNS-C
+PKG_NAME:=ChinaDNS
 PKG_VERSION:=1.2.1
 PKG_RELEASE=$(PKG_SOURCE_VERSION)
 
-PKG_SOURCE_URL:=https://github.com/clowwindy/ChinaDNS-C/releases/download/$(PKG_VERSION)
-PKG_SOURCE:=chinadns-c-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=https://github.com/clowwindy/ChinaDNS/releases/download/$(PKG_VERSION)
+PKG_SOURCE:=chinadns-$(PKG_VERSION).tar.gz
 PKG_MAINTAINER:=clowwindy <clowwindy42@gmail.com>
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/chinadns-c-$(PKG_VERSION)
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/chinadns-$(PKG_VERSION)
 
 PKG_INSTALL:=1
 PKG_FIXUP:=autoreconf
@@ -17,27 +17,27 @@ PKG_BUILD_PARALLEL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
-define Package/ChinaDNS-C/Default
+define Package/ChinaDNS/Default
   SECTION:=net
   CATEGORY:=Network
-  TITLE:=ChinaDNS-C
-	URL:=https://github.com/clowwindy/ChinaDNS-C
+  TITLE:=ChinaDNS
+	URL:=https://github.com/clowwindy/ChinaDNS
 endef
 
-define Package/ChinaDNS-C
-  $(call Package/ChinaDNS-C/Default)
+define Package/ChinaDNS
+  $(call Package/ChinaDNS/Default)
 endef
 
-define Package/ChinaDNS-C/description
+define Package/ChinaDNS/description
 A DNS forwarder that ignores incorrect(you knew it) responses.
 endef
 
-define Package/ChinaDNS-C/conffiles
+define Package/ChinaDNS/conffiles
 /etc/chinadns_iplist.txt
 /etc/chinadns_chnroute.txt
 endef
 
-define Package/ChinaDNS-C/install
+define Package/ChinaDNS/install
 	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_CONF) $(PKG_BUILD_DIR)/iplist.txt $(1)/etc/chinadns_iplist.txt
 	$(INSTALL_CONF) $(PKG_BUILD_DIR)/chnroute.txt $(1)/etc/chinadns_chnroute.txt
@@ -46,4 +46,4 @@ define Package/ChinaDNS-C/install
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/chinadns $(1)/usr/bin
 endef
 
-$(eval $(call BuildPackage,ChinaDNS-C))
+$(eval $(call BuildPackage,ChinaDNS))

packaging/build_all.sh

@@ -3,28 +3,28 @@
 VERSION=$1
 
 pushd OpenWrt-SDK-ar71xx-for-linux-x86_64-gcc-4.8-linaro_uClibc-0.9.33.2 && \
-pushd package/ChinaDNS-C && \
+pushd package/ChinaDNS && \
 git fetch origin && \
 git merge origin/dev --ff-only && \
 popd && \
 make V=s && \
-rsync --progress -e ssh bin/ar71xx/packages/ChinaDNS-C_$1_ar71xx.ipk frs.sourceforge.net:/home/frs/project/chinadns/dist/ && \
+rsync --progress -e ssh bin/ar71xx/packages/ChinaDNS_$1_ar71xx.ipk frs.sourceforge.net:/home/frs/project/chinadns/dist/ && \
 popd && \
 
 pushd OpenWrt-SDK-brcm47xx-for-linux-x86_64-gcc-4.8-linaro_uClibc-0.9.33.2 && \
 make V=s && \
-rsync --progress -e ssh bin/brcm47xx/packages/base/ChinaDNS-C_$1_brcm47xx.ipk frs.sourceforge.net:/home/frs/project/chinadns/dist/ && \
+rsync --progress -e ssh bin/brcm47xx/packages/base/ChinaDNS_$1_brcm47xx.ipk frs.sourceforge.net:/home/frs/project/chinadns/dist/ && \
 popd && \
 
 pushd OpenWrt-SDK-brcm63xx-for-linux-x86_64-gcc-4.8-linaro_uClibc-0.9.33.2 && \
 make V=s && \
-rsync --progress -e ssh bin/brcm63xx/packages/base/ChinaDNS-C_$1_brcm63xx.ipk frs.sourceforge.net:/home/frs/project/chinadns/dist/ && \
+rsync --progress -e ssh bin/brcm63xx/packages/base/ChinaDNS_$1_brcm63xx.ipk frs.sourceforge.net:/home/frs/project/chinadns/dist/ && \
 popd && \
 
 
 pushd OpenWrt-SDK-ramips-for-linux-x86_64-gcc-4.8-linaro_uClibc-0.9.33.2 && \
 make V=s && \
-rsync --progress -e ssh bin/ramips/packages/base/ChinaDNS-C_$1_ramips_24kec.ipk frs.sourceforge.net:/home/frs/project/chinadns/dist/ && \
+rsync --progress -e ssh bin/ramips/packages/base/ChinaDNS_$1_ramips_24kec.ipk frs.sourceforge.net:/home/frs/project/chinadns/dist/ && \
 popd
 
 

packaging/release.sh

@@ -8,9 +8,9 @@ fi
 VERSION=$1
 
 API_JSON=$(printf '{"tag_name": "%s","target_commitish": "master","name": "%s","body": "","draft": false,"prerelease": false}' $VERSION $VERSION)
-ID=`curl -v --data "$API_JSON" https://api.github.com/repos/clowwindy/ChinaDNS-C/releases?access_token=$GITHUB_TOKEN | python -c 'import json,sys;print json.load(sys.stdin)["id"]'`
+ID=`curl -v --data "$API_JSON" https://api.github.com/repos/clowwindy/ChinaDNS/releases?access_token=$GITHUB_TOKEN | python -c 'import json,sys;print json.load(sys.stdin)["id"]'`
 
 curl -v -H "Content-Type: application/x-tar" \
   -H "Authorization: token $GITHUB_TOKEN" \
-  --data-binary "@chinadns-c-$VERSION.tar.gz" \
-  https://uploads.github.com/repos/clowwindy/ChinaDNS-C/releases/$ID/assets?name=chinadns-c-$VERSION.tar.gz
+  --data-binary "@chinadns-$VERSION.tar.gz" \
+  https://uploads.github.com/repos/clowwindy/ChinaDNS/releases/$ID/assets?name=chinadns-$VERSION.tar.gz

src/chinadns.c

@@ -137,7 +137,7 @@ static const char *help_message =
   "                        114.114.114.114,208.67.222.222:443,8.8.8.8\n"
   "  -v                    verbose logging\n"
   "\n"
-  "Online help: <https://github.com/clowwindy/ChinaDNS-C>\n";
+  "Online help: <https://github.com/clowwindy/ChinaDNS>\n";
 
 #define __LOG(o, t, v, s...) do {                                   \
   time_t now;                                                       \