Merge Mainline Source

This commit is contained in:
CN_SZTL 2020-02-20 03:01:01 +08:00
parent 90069b1672
commit 047907df9d
No known key found for this signature in database
GPG Key ID: 6850B6345C862176
3 changed files with 25 additions and 28 deletions

View File

@ -8,13 +8,13 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=tcping
PKG_NAME:=tcping-simple
PKG_VERSION:=1.3.5
PKG_RELEASE:=1
PKG_SOURCE_URL:=https://raw.githubusercontent.com/MushrooM93/tcping/master/
PKG_SOURCE_URL:=https://raw.githubusercontent.com/MushrooM93/tcping/b9ee61a5c1d05f228aa70027331556f0c27dd4c2/
PKG_SOURCE:=tcping.c
PKG_HASH:=skip
PKG_HASH:=3459b9f15621920dc632b5871da96c62c8a77ad15ee7bfdba4adee29f4eed089
PKG_BUILD_DIR:=$(BUILD_DIR)/tcping-$(PKG_VERSION)
PKG_LICENSE:=GPLv3
@ -52,7 +52,7 @@ endef
define Package/$(PKG_NAME)/install
$(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) $(PKG_BUILD_DIR)/tcping $(1)/usr/bin
$(INSTALL_BIN) $(PKG_BUILD_DIR)/tcping-simple $(1)/usr/bin
endef
$(eval $(call BuildPackage,$(PKG_NAME)))

View File

@ -1,13 +1,13 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=dns2socks
PKG_VERSION:=2.0
PKG_RELEASE:=20150628
PKG_VERSION:=2.1
PKG_RELEASE:=20200218
PKG_SOURCE:=SourceCode.zip
PKG_SOURCE_SUBDIR:=DNS2SOCKS
PKG_SOURCE_URL:=@SF/dns2socks
PKG_MD5SUM:=6a6d5462113929cb8ba3511a884211cf
PKG_MD5SUM:=ec82de936ad004cc940502cd2a1bff5b
PKG_MAINTAINER:=ghostmaker
PKG_LICENSE:=BSD-3-Clause
@ -63,4 +63,4 @@ endef
#$(shell $(RM) $(DL_DIR)/$(PKG_SOURCE))
$(eval $(call BuildPackage,dns2socks))
$(eval $(call BuildPackage,dns2socks))

View File

@ -1,42 +1,39 @@
#
# Copyright (C) 2014 OpenWrt-dist
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
#
include $(TOPDIR)/rules.mk
PKG_NAME:=tcping
PKG_VERSION:=0.1
PKG_RELEASE:=2
PKG_VERSION:=0.2
PKG_RELEASE=1
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://github.com/jlyo/tcping.git
PKG_SOURCE_URL:=https://github.com/coolsnowwolf/tcping
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
PKG_SOURCE_VERSION:=79ef6f85d7147d33d0835fac060618ab136503c8
PKG_SOURCE_VERSION:=d890cc1bd8e3951390ceeff1ccb092a5d802850c
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)/$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
PKG_MAINTAINER:=coolsnowwolf <coolsnowwolf@gmail.com>
include $(INCLUDE_DIR)/package.mk
define Package/tcping
SECTION:=net
CATEGORY:=Network
TITLE:=tcping measures the latency of a tcp-connection
URL:=https://github.com/jlyo/tcping
SECTION:=net
CATEGORY:=Network
DEPENDS:=+libnet-1.2.x
TITLE:=Ping look-alike that uses TCP SYN packets to get around firewalls and ICMP blackholes
endef
define Package/tcping/description
Ping look-alike that uses TCP SYN packets to get around firewalls and ICMP blackholes
endef
define Package/tcping/conffiles
define Build/Compile
$(MAKE) -C $(PKG_BUILD_DIR) \
$(TARGET_CONFIGURE_OPTS) \
CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/lib/libnet-1.2.x/include -L$(STAGING_DIR)/usr/lib/libnet-1.2.x/lib" \
INSTALL_PROG=":"
endef
define Package/tcping/install
$(INSTALL_DIR) $(1)/usr/sbin
$(INSTALL_BIN) $(PKG_BUILD_DIR)/tcping $(1)/usr/sbin
$(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) $(PKG_BUILD_DIR)/tcpping $(1)/usr/bin/tcping
endef
$(eval $(call BuildPackage,tcping))