Message ID | 20180529065539.7263-1-xuminready@gmail.com |
---|---|
State | Superseded |
Headers | show |
Series | shadowsocks-libev: new package | expand |
Hi Min, On 29-05-18 08:55, Min Xu wrote: > Signed-off-by: Min Xu <xuminready@gmail.com> > --- Please add a patch changelog below the --- line, and also add the version in the subject using the -v3 option to git format-patch. See [1]. [snip] > diff --git a/package/shadowsocks-libev/shadowsocks-libev.hash b/package/shadowsocks-libev/shadowsocks-libev.hash > new file mode 100644 > index 0000000..07f10f4 > --- /dev/null > +++ b/package/shadowsocks-libev/shadowsocks-libev.hash > @@ -0,0 +1,2 @@ > +# Locally computed > +sha256 58fb438d2cfe33cfa6ac8c50e587e2138c50e59a4b943f88d22883bf2e192a96 shadowsocks-libev-3.1.3.tar.gz As I mentioned in my first review: please also include hashes for the license files. Oh, and don't forget to run a 'make shadowsocks-libev-legal-info' to check that they're correct. > +################################################################################ > +# > +# shadowsocks-libev > +# > +################################################################################ > + > +SHADOWSOCKS_LIBEV_VERSION = 3.1.3 > +SHADOWSOCKS_LIBEV_SITE = https://github.com/shadowsocks/shadowsocks-libev/releases/download/v$(SHADOWSOCKS_LIBEV_VERSION) > +SHADOWSOCKS_LIBEV_LICENSE = GPL-3.0+, MIT(c-ares), BSD-2-Clause or GPL-2.0+(libev), ISC(libsodium), Apache-2.0(mbedtls), BSD-3-Clause(pcre) Although there are bundled versions of all these packages in the tarball, we don't use them, so you don't need to mention their licenses here. Just the ones where we do use the bundled libraries: libbloom, libcork, libipset. > +SHADOWSOCKS_LIBEV_LICENSE_FILES = COPYING c-ares/COPYING libev/COPYING libsodium/COPYING mbedtls/COPYING pcre/COPYING Same here. > +SHADOWSOCKS_LIBEV_DEPENDENCIES = host-pkgconf c-ares libev libsodium mbedtls pcre > +SHADOWSOCKS_LIBEV_INSTALL_STAGING = YES > +SHADOWSOCKS_LIBEV_CONF_ENV = PCRECONFIG=$(STAGING_DIR)/usr/bin/pcre-config > +SHADOWSOCKS_LIBEV_CONF_OPTS = --disable-documentation --with-pcre=$(STAGING_DIR)/usr/bin/ Didn't mention it in my first review: is it really needed to specify both --with-pcre=... *and* PCRECONFIG? Normally the --with-pcre is $(STAGING_DIR)/usr, cfr. e.g. clamav. Sometimes it is $(STAGING_DIR)/usr/bin/pcre-config, cfr. apache. But $(STAGING_DIR)/usr/bin is unlikely to be correct. Regards, Arnout [1] https://buildroot.org/downloads/manual/manual.html#_patch_revision_changelog > + > +$(eval $(autotools-package)) >
diff --git a/package/Config.in b/package/Config.in index ecee493..9bfb2cf 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1846,6 +1846,7 @@ endif source "package/samba4/Config.in" source "package/sconeserver/Config.in" source "package/ser2net/Config.in" + source "package/shadowsocks-libev/Config.in" source "package/shairport-sync/Config.in" source "package/shellinabox/Config.in" source "package/smcroute/Config.in" diff --git a/package/shadowsocks-libev/Config.in b/package/shadowsocks-libev/Config.in new file mode 100644 index 0000000..7c3c037 --- /dev/null +++ b/package/shadowsocks-libev/Config.in @@ -0,0 +1,12 @@ +config BR2_PACKAGE_SHADOWSOCKS_LIBEV + bool "shadowsocks-libev" + select BR2_PACKAGE_C_ARES + select BR2_PACKAGE_LIBEV + select BR2_PACKAGE_LIBSODIUM + select BR2_PACKAGE_MBEDTLS + select BR2_PACKAGE_PCRE + help + Shadowsocks-libev is a lightweight secured SOCKS5 proxy for + embedded devices and low-end boxes. + + https://github.com/shadowsocks/shadowsocks-libev diff --git a/package/shadowsocks-libev/shadowsocks-libev.hash b/package/shadowsocks-libev/shadowsocks-libev.hash new file mode 100644 index 0000000..07f10f4 --- /dev/null +++ b/package/shadowsocks-libev/shadowsocks-libev.hash @@ -0,0 +1,2 @@ +# Locally computed +sha256 58fb438d2cfe33cfa6ac8c50e587e2138c50e59a4b943f88d22883bf2e192a96 shadowsocks-libev-3.1.3.tar.gz diff --git a/package/shadowsocks-libev/shadowsocks-libev.mk b/package/shadowsocks-libev/shadowsocks-libev.mk new file mode 100644 index 0000000..b711754 --- /dev/null +++ b/package/shadowsocks-libev/shadowsocks-libev.mk @@ -0,0 +1,16 @@ +################################################################################ +# +# shadowsocks-libev +# +################################################################################ + +SHADOWSOCKS_LIBEV_VERSION = 3.1.3 +SHADOWSOCKS_LIBEV_SITE = https://github.com/shadowsocks/shadowsocks-libev/releases/download/v$(SHADOWSOCKS_LIBEV_VERSION) +SHADOWSOCKS_LIBEV_LICENSE = GPL-3.0+, MIT(c-ares), BSD-2-Clause or GPL-2.0+(libev), ISC(libsodium), Apache-2.0(mbedtls), BSD-3-Clause(pcre) +SHADOWSOCKS_LIBEV_LICENSE_FILES = COPYING c-ares/COPYING libev/COPYING libsodium/COPYING mbedtls/COPYING pcre/COPYING +SHADOWSOCKS_LIBEV_DEPENDENCIES = host-pkgconf c-ares libev libsodium mbedtls pcre +SHADOWSOCKS_LIBEV_INSTALL_STAGING = YES +SHADOWSOCKS_LIBEV_CONF_ENV = PCRECONFIG=$(STAGING_DIR)/usr/bin/pcre-config +SHADOWSOCKS_LIBEV_CONF_OPTS = --disable-documentation --with-pcre=$(STAGING_DIR)/usr/bin/ + +$(eval $(autotools-package))
Signed-off-by: Min Xu <xuminready@gmail.com> --- package/Config.in | 1 + package/shadowsocks-libev/Config.in | 12 ++++++++++++ package/shadowsocks-libev/shadowsocks-libev.hash | 2 ++ package/shadowsocks-libev/shadowsocks-libev.mk | 16 ++++++++++++++++ 4 files changed, 31 insertions(+) create mode 100644 package/shadowsocks-libev/Config.in create mode 100644 package/shadowsocks-libev/shadowsocks-libev.hash create mode 100644 package/shadowsocks-libev/shadowsocks-libev.mk