diff --git a/package/jsda/ngrokc/Makefile b/package/jsda/ngrokc/Makefile index 2612fb7ea2..eb5d217735 100644 --- a/package/jsda/ngrokc/Makefile +++ b/package/jsda/ngrokc/Makefile @@ -1,59 +1,35 @@ -# -# Copyright (C) 2015-2016 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v3. -# - include $(TOPDIR)/rules.mk PKG_NAME:=ngrokc -PKG_VERSION:=4.18 -PKG_RELEASE:=20190217 +PKG_VERSION:=b3e3877 +PKG_RELEASE:=1 +PKG_REV:=b3e38775aa8c89236c8ca2dcb07260285d9c15ee + +PKG_SOURCE_PROTO:=git +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) +PKG_SOURCE_URL:=https://github.com/dosgo/ngrok-c.git +PKG_SOURCE_VERSION:=$(PKG_REV) include $(INCLUDE_DIR)/package.mk -define Package/$(PKG_NAME) +define Package/ngrokc SECTION:=net CATEGORY:=Network SUBMENU:=Web Servers/Proxies - TITLE:=Secure tunnels to localhost. + TITLE:=Secure tunnels to localhost(C++ port) + URL:=https://github.com/dosgo/ngrok-c DEPENDS:=+libc +libpthread +libopenssl +libstdcpp - URL:=https://github.com/dosgo/ngrok-c.git -endef - -define Package/$(PKG_NAME)/description -Secure tunnels to localhost. endef define Build/Prepare + $(call Build/Prepare/Default,) + $(CP) $(PKG_BUILD_DIR)/Makefile.openssl $(PKG_BUILD_DIR)/Makefile endef -define Build/Configure +define Package/ngrokc/install + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/ngrokc $(1)/usr/bin endef -define Build/Compile -endef - -define Package/$(PKG_NAME)/install - $(INSTALL_DIR) $(1)/usr/bin/ -ifeq ($(ARCH),mipsel) - $(INSTALL_BIN) ./files/7620n/ngrokc $(1)/usr/bin/ -endif -ifeq ($(ARCH),mips) - $(INSTALL_BIN) ./files/ar71xx/ngrokc $(1)/usr/bin/ -endif -ifeq ($(ARCH),i386) - $(INSTALL_BIN) ./files/x86/ngrokc $(1)/usr/bin/ -endif -ifeq ($(ARCH),x86_64) - $(INSTALL_BIN) ./files/x86_64/ngrokc $(1)/usr/bin/ -endif -ifeq ($(ARCH),arm) - $(INSTALL_BIN) ./files/arm/ngrokc $(1)/usr/bin/ -endif -ifeq ($(ARCH),aarch64) - $(INSTALL_BIN) ./files/armv7/ngrokc $(1)/usr/bin/ -endif -endef - -$(eval $(call BuildPackage,$(PKG_NAME))) +$(eval $(call BuildPackage,ngrokc)) diff --git a/package/jsda/ngrokc/files/x86/ngrokc b/package/jsda/ngrokc/files/x86/ngrokc deleted file mode 100644 index e776feb42c..0000000000 Binary files a/package/jsda/ngrokc/files/x86/ngrokc and /dev/null differ diff --git a/package/jsda/ngrokc/files/x86_64/ngrokc b/package/jsda/ngrokc/files/x86_64/ngrokc deleted file mode 100644 index 9abdefc5a3..0000000000 Binary files a/package/jsda/ngrokc/files/x86_64/ngrokc and /dev/null differ diff --git a/package/zxlhhyccc/phicommk3-screenctrl/Makefile b/package/zxlhhyccc/phicommk3-screenctrl/Makefile deleted file mode 100644 index d6adb7672b..0000000000 --- a/package/zxlhhyccc/phicommk3-screenctrl/Makefile +++ /dev/null @@ -1,61 +0,0 @@ -include $(TOPDIR)/rules.mk - -PKG_NAME:=phicommk3-screenctrl -PKG_VERSION:=1.0 -PKG_RELEASE:=2 - -PKG_SOURCE_PROTO:=git -PKG_SOURCE_URL:=https://github.com/zxlhhyccc/k3screenctrl-6.git -PKG_SOURCE_VERSION:=6bbb319f74567f58122ec14227c0147be5da4cc0 -PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_SOURCE_VERSION) -PKG_SOURCE:=$(PKG_SOURCE_SUBDIR).tar.xz -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_SOURCE_SUBDIR) - -PKG_MAINTAINER:=Hamster Tian - -include $(INCLUDE_DIR)/package.mk - -TARGET_CFLAGS+= -D_GNU_SOURCE - -define Package/$(PKG_NAME) - SECTION:=utils - CATEGORY:=Utilities - DEPENDS:=@TARGET_bcm53xx_DEVICE_phicomm-k3 +@BUSYBOX_CONFIG_ARPING +@KERNEL_DEVMEM +bash - TITLE:=LCD screen controller on PHICOMM K3 - URL:=https://github.com/zxlhhyccc/PHICOMM-K3 -endef - -define Package/$(PKG_NAME)/description - K3 Screen Controller (k3screenctrl) is a program utilizing -the LCD screen on PHICOMM K3 to display some stats. -endef - -define Package/$(PKG_NAME)/postinst -#!/bin/sh -if [ -z "$${IPKG_INSTROOT}" ]; then - if [ -f /etc/uci-defaults/k3screenctrl ]; then - ( . /etc/uci-defaults/k3screenctrl ) && \ - rm -f /etc/uci-defaults/k3screenctrl - fi - rm -rf /tmp/luci-indexcache /tmp/luci-modulecache -fi -exit 0 -endef - -define Package/$(PKG_NAME)/install - $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_DIR) $(1)/lib/k3screenctrl - $(INSTALL_DIR) $(1)/lib/k3screenctrl/oui - $(INSTALL_DIR) $(1)/etc/config - $(INSTALL_DIR) $(1)/etc/init.d - $(INSTALL_DIR) $(1)/etc/uci-defaults - $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/k3screenctrl $(1)/usr/bin/ - $(INSTALL_BIN) $(PKG_BUILD_DIR)/lib/k3screenctrl/*.sh $(1)/lib/k3screenctrl/ - $(INSTALL_BIN) $(PKG_BUILD_DIR)/lib/k3screenctrl/oui/update_oui.sh $(1)/lib/k3screenctrl/oui/ - $(INSTALL_DATA) $(PKG_BUILD_DIR)/lib/k3screenctrl/oui/oui.txt $(1)/lib/k3screenctrl/oui/ - $(INSTALL_DATA) ./files/k3screenctrl.config $(1)/etc/config/k3screenctrl - $(INSTALL_BIN) ./files/k3screenctrl.init $(1)/etc/init.d/k3screenctrl - $(INSTALL_BIN) ./files/k3screenctrl.uci $(1)/etc/uci-defaults/k3screenctrl -endef - -$(eval $(call BuildPackage,$(PKG_NAME))) diff --git a/package/zxlhhyccc/phicommk3-screenctrl/files/k3screenctrl.config b/package/zxlhhyccc/phicommk3-screenctrl/files/k3screenctrl.config deleted file mode 100644 index aed7ad72d1..0000000000 --- a/package/zxlhhyccc/phicommk3-screenctrl/files/k3screenctrl.config +++ /dev/null @@ -1,11 +0,0 @@ -config general - option screen_time '10' - option refresh_time '5' - option pawd_hide '1' - option disp_cputemp '1' - option psk_hide '1' - option cputemp '1' - option city_checkip '1' - option update_time '3600' - - diff --git a/package/zxlhhyccc/phicommk3-screenctrl/files/k3screenctrl.init b/package/zxlhhyccc/phicommk3-screenctrl/files/k3screenctrl.init deleted file mode 100644 index f4300ffc1e..0000000000 --- a/package/zxlhhyccc/phicommk3-screenctrl/files/k3screenctrl.init +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh /etc/rc.common - -START=99 -STOP=99 - -SCRIPTS_BASE=/lib/k3screenctrl/ -TEMP_DIR=/tmp/k3screenctrl - -start() { - [ -z "$(grep "/lib/k3screenctrl/oui/update_oui.sh" /etc/crontabs/root)" ] && echo "0 6 * * * /lib/k3screenctrl/oui/update_oui.sh" >> /etc/crontabs/root - mkdir -p $TEMP_DIR - mkdir -p $TEMP_DIR/device_speed - m=$(uci get k3screenctrl.@general[0].screen_time) && [ $m -lt 10 ] && m=10 - d=$(uci get k3screenctrl.@general[0].refresh_time) && [ $d -lt 2 ] && d=2 - /usr/bin/k3screenctrl -m $m -d $d & -} - -stop() { - killall k3screenctrl -} diff --git a/package/zxlhhyccc/phicommk3-screenctrl/files/k3screenctrl.uci b/package/zxlhhyccc/phicommk3-screenctrl/files/k3screenctrl.uci deleted file mode 100755 index 73da7aadcc..0000000000 --- a/package/zxlhhyccc/phicommk3-screenctrl/files/k3screenctrl.uci +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -uci -q batch <<-EOF >/dev/null - delete ucitrack.@k3screenctrl[-1] - add ucitrack k3screenctrl - set ucitrack.@k3screenctrl[-1].init=k3screenctrl - commit ucitrack -EOF -exit 0 diff --git a/package/zxlhhyccc/phicommk3-screenctrl/k3screenctrl.config b/package/zxlhhyccc/phicommk3-screenctrl/k3screenctrl.config deleted file mode 100644 index 2a88ab3601..0000000000 --- a/package/zxlhhyccc/phicommk3-screenctrl/k3screenctrl.config +++ /dev/null @@ -1,6 +0,0 @@ - -config general 'general' - option screen_time '10' - option refresh_time '2' - option psk_hide '0' - option cputemp '0' diff --git a/package/zxlhhyccc/phicommk3-screenctrl/k3screenctrl.init b/package/zxlhhyccc/phicommk3-screenctrl/k3screenctrl.init deleted file mode 100644 index 70a92a6998..0000000000 --- a/package/zxlhhyccc/phicommk3-screenctrl/k3screenctrl.init +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh /etc/rc.common - -START=99 -STOP=99 - -SCRIPTS_BASE=/lib/k3screenctrl/ - -start() { - [ -z "$(grep "/lib/k3screenctrl/oui/update_oui.sh" /etc/crontabs/root)" ] && echo "0 6 * * * /lib/k3screenctrl/oui/update_oui.sh" >> /etc/crontabs/root - /usr/bin/k3screenctrl & -} - -stop() { - killall k3screenctrl -} diff --git a/package/zxlhhyccc/phicommk3-screenctrl/k3screenctrl.uci b/package/zxlhhyccc/phicommk3-screenctrl/k3screenctrl.uci deleted file mode 100755 index 73da7aadcc..0000000000 --- a/package/zxlhhyccc/phicommk3-screenctrl/k3screenctrl.uci +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -uci -q batch <<-EOF >/dev/null - delete ucitrack.@k3screenctrl[-1] - add ucitrack k3screenctrl - set ucitrack.@k3screenctrl[-1].init=k3screenctrl - commit ucitrack -EOF -exit 0