Skip to content

Commit

Permalink
Merge Official Source
Browse files Browse the repository at this point in the history
Signed-off-by: Tianling Shen <[email protected]>
  • Loading branch information
1715173329 committed Oct 28, 2023
2 parents b2ca038 + 235df4a commit 89d341e
Show file tree
Hide file tree
Showing 9 changed files with 104 additions and 41 deletions.
38 changes: 38 additions & 0 deletions libs/nghttp3/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
include $(TOPDIR)/rules.mk

PKG_NAME:=nghttp3
PKG_VERSION:=1.0.0
PKG_RELEASE:=1

PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://github.com/ngtcp2/nghttp3/releases/download/v$(PKG_VERSION)/
PKG_HASH:=2e5b5a39415b9a0d160bbcb90b37bef7d8aee44ae504e8c0ddcb31aa92435988

PKG_LICENSE:=MIT
PKG_LICENSE_FILES:=COPYING
PKG_MAINTAINER:=Stan Grishin <[email protected]>

CMAKE_INSTALL:=1

include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/cmake.mk

define Package/libnghttp3
SECTION:=libs
CATEGORY:=Libraries
TITLE:=HTTP/3 library written in C
URL:=https://nghttp2.org/nghttp3
endef

define Package/libnghttp3/description
nghttp3 is a thin HTTP/3 layer over an underlying QUIC stack.
endef

CMAKE_OPTIONS += -DENABLE_LIB_ONLY=ON

define Package/libnghttp3/install
$(INSTALL_DIR) $(1)/usr/lib
$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libnghttp3.so* $(1)/usr/lib
endef

$(eval $(call BuildPackage,libnghttp3))
39 changes: 39 additions & 0 deletions libs/ngtcp2/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
include $(TOPDIR)/rules.mk

PKG_NAME:=ngtcp2
PKG_VERSION:=1.0.0
PKG_RELEASE:=1

PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://github.com/ngtcp2/ngtcp2/releases/download/v$(PKG_VERSION)/
PKG_HASH:=a40b18af654baaebee3431af9bb4e347f40080bf1189d658ad53f8e66bf39da3

PKG_LICENSE:=MIT
PKG_LICENSE_FILES:=COPYING
PKG_MAINTAINER:=Stan Grishin <[email protected]>

CMAKE_INSTALL:=1

include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/cmake.mk

define Package/libngtcp2
SECTION:=libs
CATEGORY:=Libraries
TITLE:=Implementation of QUIC protocol
URL:=https://nghttp2.org/ngtcp2
DEPENDS:=+libnghttp3 +libopenssl
endef

define Package/libngtcp2/description
ngtcp2 project is an effort to implement QUIC protocol which is now being discussed in IETF QUICWG for its standardization.
endef

CMAKE_OPTIONS += -DENABLE_LIB_ONLY=ON

define Package/libngtcp2/install
$(INSTALL_DIR) $(1)/usr/lib
$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libngtcp2*.so* $(1)/usr/lib
endef

$(eval $(call BuildPackage,libngtcp2))
10 changes: 10 additions & 0 deletions net/curl/Config.in
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,16 @@ config LIBCURL_NGHTTP2
bool "HTTP2 protocol"
default y

config LIBCURL_NGHTTP3
bool "HTTP/3 protocol"
depends on LIBCURL_OPENSSL
default n

config LIBCURL_NGTCP2
bool "QUIC protocol"
depends on LIBCURL_OPENSSL
default n

comment "Miscellaneous"

config LIBCURL_PROXY
Expand Down
8 changes: 6 additions & 2 deletions net/curl/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ include $(INCLUDE_DIR)/nls.mk

PKG_NAME:=curl
PKG_VERSION:=8.4.0
PKG_RELEASE:=1
PKG_RELEASE:=2

PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=https://github.com/curl/curl/releases/download/curl-$(subst .,_,$(PKG_VERSION))/ \
Expand Down Expand Up @@ -58,6 +58,8 @@ PKG_CONFIG_DEPENDS:= \
CONFIG_LIBCURL_TELNET \
CONFIG_LIBCURL_TFTP \
CONFIG_LIBCURL_NGHTTP2 \
CONFIG_LIBCURL_NGHTTP3 \
CONFIG_LIBCURL_NGTCP2 \
\
CONFIG_LIBCURL_COOKIES \
CONFIG_LIBCURL_CRYPTO_AUTH \
Expand Down Expand Up @@ -95,7 +97,7 @@ define Package/libcurl
CATEGORY:=Libraries
DEPENDS:= +LIBCURL_WOLFSSL:libwolfssl +LIBCURL_OPENSSL:libopenssl +LIBCURL_GNUTLS:libgnutls +LIBCURL_MBEDTLS:libmbedtls
DEPENDS += +LIBCURL_ZLIB:zlib +LIBCURL_ZSTD:libzstd +LIBCURL_THREADED_RESOLVER:libpthread +LIBCURL_LDAP:libopenldap
DEPENDS += +LIBCURL_LIBIDN2:libidn2 +LIBCURL_SSH2:libssh2 +LIBCURL_NGHTTP2:libnghttp2 +ca-bundle
DEPENDS += +LIBCURL_LIBIDN2:libidn2 +LIBCURL_SSH2:libssh2 +LIBCURL_NGHTTP2:libnghttp2 +LIBCURL_NGHTTP3:libnghttp3 +LIBCURL_NGTCP2:libngtcp2 +ca-bundle
TITLE:=A client-side URL transfer library
MENU:=1
ABI_VERSION:=4
Expand Down Expand Up @@ -135,6 +137,8 @@ CONFIGURE_ARGS += \
$(if $(CONFIG_LIBCURL_ZLIB),--with-zlib="$(STAGING_DIR)/usr",--without-zlib) \
$(if $(CONFIG_LIBCURL_ZSTD),--with-zstd="$(STAGING_DIR)/usr",--without-zstd) \
$(if $(CONFIG_LIBCURL_NGHTTP2),--with-nghttp2="$(STAGING_DIR)/usr",--without-nghttp2) \
$(if $(CONFIG_LIBCURL_NGHTTP3),--with-nghttp3="$(STAGING_DIR)/usr",--without-nghttp3) \
$(if $(CONFIG_LIBCURL_NGTCP2),--with-ngtcp2="$(STAGING_DIR)/usr",--without-ngtcp2) \
\
$(call autoconf_bool,CONFIG_LIBCURL_DICT,dict) \
$(call autoconf_bool,CONFIG_LIBCURL_FILE,file) \
Expand Down
8 changes: 4 additions & 4 deletions net/https-dns-proxy/Makefile
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
include $(TOPDIR)/rules.mk

PKG_NAME:=https-dns-proxy
PKG_VERSION:=2023-05-25
PKG_RELEASE:=8
PKG_VERSION:=2023-10-25
PKG_RELEASE:=1

PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://github.com/aarond10/https_dns_proxy/
PKG_SOURCE_DATE:=$(PKG_VERSION)
PKG_SOURCE_VERSION:=d03e11572562f008f68df217a7378628f1bb7b79
PKG_MIRROR_HASH:=5af3683c48bc9e493ca2761a6f7ee756431692a695d6008f61b8b92431036dca
PKG_SOURCE_VERSION:=977341a4e35a37ee454e97e82caf4276b1b4961a
PKG_MIRROR_HASH:=8622846f1038ac05436a48d9b36a07c516cbb6504ce68e7ee8c5529788fac39b
PKG_MAINTAINER:=Stan Grishin <[email protected]>
PKG_LICENSE:=MIT
PKG_LICENSE_FILES:=LICENSE
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
endif()

-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra --pedantic -Wno-strict-aliasing -Wno-variadic-macros")
-set(CMAKE_C_FLAGS_DEBUG "-g -DDEBUG")
-set(CMAKE_C_FLAGS_DEBUG "-gdwarf-4 -DDEBUG")
-set(CMAKE_C_FLAGS_RELEASE "-O2")
+#set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra --pedantic -Wno-strict-aliasing -Wno-variadic-macros")
+#set(CMAKE_C_FLAGS_DEBUG "-g -DDEBUG")
+#set(CMAKE_C_FLAGS_DEBUG "-gdwarf-4 -DDEBUG")
+#set(CMAKE_C_FLAGS_RELEASE "-O2")

if ((CMAKE_C_COMPILER_ID MATCHES GNU AND CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 9) OR
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
--- a/src/options.c
+++ b/src/options.c
@@ -22,7 +22,7 @@ const char * options_sw_version() {
@@ -24,7 +24,7 @@ const char * options_sw_version(void) {
#ifdef SW_VERSION
return SW_VERSION;
#else
- return "2023.01.01-atLeast"; // update date sometimes, like 1-2 times a year
+ return "2023-05-25-1"; // update date sometimes, like 1-2 times a year
- return "2023.10.10-atLeast"; // update date sometimes, like 1-2 times a year
+ return "2023-10-25-1"; // update date sometimes, like 1-2 times a year
#endif
}

11 changes: 0 additions & 11 deletions net/https-dns-proxy/patches/030-src-logging.c-fix-crash.patch

This file was deleted.

21 changes: 2 additions & 19 deletions net/snowflake/Makefile
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
include $(TOPDIR)/rules.mk

PKG_NAME:=snowflake
PKG_VERSION:=2.6.1
PKG_VERSION:=2.7.0
PKG_RELEASE:=1

PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL=https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake.git
PKG_SOURCE_VERSION:=v$(PKG_VERSION)
PKG_MIRROR_HASH:=c6a7ef515bae874c42220ab52dd597c08df4569e7d97f700e5c80c8946e205bd
PKG_MIRROR_HASH:=3156dbeffaea82761372c7e64322cf9c24a05894c54ccb0d80eaed61b54e08c6

PKG_LICENSE:=BSD-3-Clause
PKG_LICENSE_FILES:=LICENSE
Expand Down Expand Up @@ -41,11 +41,6 @@ $(call Package/snowflake/Default)
TITLE+= Client
endef

define Package/snowflake-distinctcounter
$(call Package/snowflake/Default)
TITLE+= Distinct Counter
endef

define Package/snowflake-probetest
$(call Package/snowflake/Default)
TITLE+= Probe test
Expand Down Expand Up @@ -81,12 +76,6 @@ $(call Package/snowflake/description/Default)
This package contains the Snowflake client which provides the bridge to TOR.
endef

define Package/snowflake-distinctcounter/description
$(call Package/snowflake/description/Default)

This package provides the Snowflake distinct counter service.
endef

define Package/snowflake-probetest/description
$(call Package/snowflake/description/Default)

Expand Down Expand Up @@ -115,11 +104,6 @@ define Package/snowflake-client/install
$(INSTALL_BIN) $(GO_PKG_BUILD_BIN_DIR)/client $(1)/usr/bin/snowflake-client
endef

define Package/snowflake-distinctcounter/install
$(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) $(GO_PKG_BUILD_BIN_DIR)/distinctcounter $(1)/usr/bin/snowflake-distinctcounter
endef

define Package/snowflake-probetest/install
$(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) $(GO_PKG_BUILD_BIN_DIR)/probetest $(1)/usr/bin/snowflake-probetest
Expand All @@ -138,7 +122,6 @@ endef

$(eval $(call BuildPackage,snowflake-broker))
$(eval $(call BuildPackage,snowflake-client))
$(eval $(call BuildPackage,snowflake-distinctcounter))
$(eval $(call BuildPackage,snowflake-probetest))
$(eval $(call BuildPackage,snowflake-proxy))
$(eval $(call BuildPackage,snowflake-server))

0 comments on commit 89d341e

Please sign in to comment.