Skip to contentSkip to conversation

shadowsocks-libev: new package

PATCH New Min Xu 4 participants 6 messages Jun 4, 2018 – Jun 5, 2018

lore
Share & tools
lore

Min Xu

author
#0 lore raw

PATCH 1/1 shadowsocks-libev: new package

Shadowsocks-libev is a lightweight secured SOCKS5 proxy for embedded devices and low-end boxes.

https://github.com/shadowsocks/shadowsocks-libev

A patch for BSD-3-Clause licence for libipset is added. It's from libipset's git repo.

Signed-off-by Min Xu <[email protected]>
---
 package/Config.in                                  |  1 +
 .../0001-docs-add-BSD-3-Clause-licence.patch       | 52 ++++++++++++++++++++++
 package/shadowsocks-libev/Config.in                | 12 +++++
 package/shadowsocks-libev/shadowsocks-libev.hash   |  8 ++++
 package/shadowsocks-libev/shadowsocks-libev.mk     | 15 +++++++
 5 files changed, 88 insertions(+)
 create mode 100644 package/shadowsocks-libev/0001-docs-add-BSD-3-Clause-licence.patch
 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
package/Config.in +1 -0
index ecee493..9bfb2cf 100644
@@ -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"
package/shadowsocks-libev/0001-docs-add-BSD-3-Clause-licence.patch new file +52 -0

52 lines not on this page · raw message

package/shadowsocks-libev/Config.in new file +12 -0
new file mode 100644
index 0000000..7c3c037
@@ -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
package/shadowsocks-libev/shadowsocks-libev.hash new file +8 -0
new file mode 100644
index 0000000..e8be8a8
@@ -0,0 +1,8 @@
+# Locally computed
+sha256 5521cf623a07fd1e393528516a83acd2b66c5d4bb4535a52662806a6a060c606 shadowsocks-libev-3.2.0.tar.gz
+
+# License files, locally calculated
+sha256 736883f97d44dbec288bb82819f18f4f86d02ae3192f6a9abefa00db76bace41  COPYING
+sha256 c41a4bc2c4c43e4daa3051e77e31b2d5c8500498afaeac6d831d55a4bb8de3fb  libbloom/LICENSE
+sha256 4fa2ada54f8c0410ec243265378242ffe862386d5ac517f8dd30a1911d25ae93  libcork/COPYING
+sha256 4b3adc9ce620fa868f1dda328203dbccbd3e9f5fbafb49c581edc386a504ee1a  libipset/LICENSE.txt
package/shadowsocks-libev/shadowsocks-libev.mk new file +15 -0
new file mode 100644
index 0000000..ddb2880
@@ -0,0 +1,15 @@
+################################################################################
+#
+# shadowsocks-libev
+#
+################################################################################
+
+SHADOWSOCKS_LIBEV_VERSION = 3.2.0
+SHADOWSOCKS_LIBEV_SITE = https://github.com/shadowsocks/shadowsocks-libev/releases/download/v$(SHADOWSOCKS_LIBEV_VERSION)
+SHADOWSOCKS_LIBEV_LICENSE = GPL-3.0+, BSD-2-Clause(libbloom), BSD-3-Clause(libcork, libipset)
+SHADOWSOCKS_LIBEV_LICENSE_FILES = COPYING libbloom/LICENSE libcork/COPYING libipset/LICENSE.txt
+SHADOWSOCKS_LIBEV_DEPENDENCIES = host-pkgconf c-ares libev libsodium mbedtls pcre
+SHADOWSOCKS_LIBEV_INSTALL_STAGING = YES
+SHADOWSOCKS_LIBEV_CONF_OPTS = --disable-documentation --with-pcre=$(STAGING_DIR)/usr
+
+$(eval $(autotools-package))
Signature · 1 line
2.11.0
#1 lore raw

PATCH 1/1 shadowsocks-libev: new package

Hello,

Quoted 8 lines · Min Xu

Shadowsocks-libev is a lightweight secured SOCKS5 proxy for embedded devices and low-end boxes.

https://github.com/shadowsocks/shadowsocks-libev

A patch for BSD-3-Clause licence for libipset is added. It's from libipset's git repo.

Signed-off-by Min Xu <[email protected]>

Thanks for this new iteration!

Quoted 6 lines
 package/Config.in                                  |  1 +
 .../0001-docs-add-BSD-3-Clause-licence.patch       | 52 ++++++++++++++++++++++
 package/shadowsocks-libev/Config.in                | 12 +++++
 package/shadowsocks-libev/shadowsocks-libev.hash   |  8 ++++
 package/shadowsocks-libev/shadowsocks-libev.mk     | 15 +++++++
 5 files changed, 88 insertions(+)

Could you add an entry in the DEVELOPERS file for this new package, so that you can be notified when there are build issues ?

Quoted 6 lines
package/shadowsocks-libev/0001-docs-add-BSD-3-Clause-licence.patch new file +0 -0
new file mode 100644
index 0000000..64dda02

package/shadowsocks-libev/0001-docs-add-BSD-3-Clause-licence.patch line 8

Quoted 8 lines
package/shadowsocks-libev/0001-docs-add-BSD-3-Clause-licence.patch new file +8 -0
@@ -0,0 +1,52 @@
+From 0047295445c499e010706598c50f1bff8b0d632c Mon Sep 17 00:00:00 2001
+From: Min Xu <[email protected]>
+Date: Wed, 30 May 2018 13:16:12 -0700
+Subject: [PATCH] docs: add BSD-3-Clause licence
+
+add missing licence for shadowsocks-libev/libipset
+
+Signed-off-by: Min Xu <[email protected]>

I'm still not entirely convinced by a patch adding a license file. It would definitely be useful to convince upstream to add this license file, but I'm not sure we want to carry patches in Buildroot adding license files.

Peter, Arnout, Yann, any comment on this ?

package/shadowsocks-libev/0001-docs-add-BSD-3-Clause-licence.patch line 15

Quoted 7 lines
package/shadowsocks-libev/0001-docs-add-BSD-3-Clause-licence.patch new file +7 -0
+SHADOWSOCKS_LIBEV_VERSION = 3.2.0
+SHADOWSOCKS_LIBEV_SITE = https://github.com/shadowsocks/shadowsocks-libev/releases/download/v$(SHADOWSOCKS_LIBEV_VERSION)
+SHADOWSOCKS_LIBEV_LICENSE = GPL-3.0+, BSD-2-Clause(libbloom), BSD-3-Clause(libcork, libipset)
+SHADOWSOCKS_LIBEV_LICENSE_FILES = COPYING libbloom/LICENSE libcork/COPYING libipset/LICENSE.txt
+SHADOWSOCKS_LIBEV_DEPENDENCIES = host-pkgconf c-ares libev libsodium mbedtls pcre
+SHADOWSOCKS_LIBEV_INSTALL_STAGING = YES
+SHADOWSOCKS_LIBEV_CONF_OPTS = --disable-documentation --with-pcre=$(STAGING_DIR)/usr

--disable-documentation is already passed by the autotools-package infrastructure, so it isn't needed.

Besides those minor issues, the rest looks good to me. Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com
#2 lore raw

PATCH 1/1 shadowsocks-libev: new package

Min, Thomas, All,

On 2018-06-04 12:09 +0200, Thomas Petazzoni spake thusly:

Quoted 1 line · Min Xu

[--SNIP--]

Quoted 20 lines
Quoted 6 lines
package/shadowsocks-libev/0001-docs-add-BSD-3-Clause-licence.patch new file +0 -0
new file mode 100644
index 0000000..64dda02

package/shadowsocks-libev/0001-docs-add-BSD-3-Clause-licence.patch line 8

Quoted 8 lines
package/shadowsocks-libev/0001-docs-add-BSD-3-Clause-licence.patch new file +8 -0
@@ -0,0 +1,52 @@
+From 0047295445c499e010706598c50f1bff8b0d632c Mon Sep 17 00:00:00 2001
+From: Min Xu <[email protected]>
+Date: Wed, 30 May 2018 13:16:12 -0700
+Subject: [PATCH] docs: add BSD-3-Clause licence
+
+add missing licence for shadowsocks-libev/libipset
+
+Signed-off-by: Min Xu <[email protected]>

I'm still not entirely convinced by a patch adding a license file. It would definitely be useful to convince upstream to add this license file, but I'm not sure we want to carry patches in Buildroot adding license files.

Quoted 1 line

Peter, Arnout, Yann, any comment on this ?

I agree with Thomas here: do not add a license file ourselves (unless we backport an upstream commit, in which case the patch should say so).

If the package does not have a license file, then just include a source file, preferrably a prominent one like main.c or whatever.

And above all, better no information that bad information. So, don;t add the license file.

Regards,
Yann E. MORIN.

Quoted 18 lines

package/shadowsocks-libev/0001-docs-add-BSD-3-Clause-licence.patch line 15

Quoted 7 lines
package/shadowsocks-libev/0001-docs-add-BSD-3-Clause-licence.patch new file +7 -0
+SHADOWSOCKS_LIBEV_VERSION = 3.2.0
+SHADOWSOCKS_LIBEV_SITE = https://github.com/shadowsocks/shadowsocks-libev/releases/download/v$(SHADOWSOCKS_LIBEV_VERSION)
+SHADOWSOCKS_LIBEV_LICENSE = GPL-3.0+, BSD-2-Clause(libbloom), BSD-3-Clause(libcork, libipset)
+SHADOWSOCKS_LIBEV_LICENSE_FILES = COPYING libbloom/LICENSE libcork/COPYING libipset/LICENSE.txt
+SHADOWSOCKS_LIBEV_DEPENDENCIES = host-pkgconf c-ares libev libsodium mbedtls pcre
+SHADOWSOCKS_LIBEV_INSTALL_STAGING = YES
+SHADOWSOCKS_LIBEV_CONF_OPTS = --disable-documentation --with-pcre=$(STAGING_DIR)/usr

--disable-documentation is already passed by the autotools-package infrastructure, so it isn't needed.

Besides those minor issues, the rest looks good to me. Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
#3 lore raw

PATCH 1/1 shadowsocks-libev: new package

Quoted 25 lines · Yann E. MORIN

Min, Thomas, All,

On 2018-06-04 12:09 +0200, Thomas Petazzoni spake thusly:

Quoted 1 line · Min Xu

[--SNIP--]

Quoted 20 lines
Quoted 6 lines
package/shadowsocks-libev/0001-docs-add-BSD-3-Clause-licence.patch new file +0 -0
new file mode 100644
index 0000000..64dda02

package/shadowsocks-libev/0001-docs-add-BSD-3-Clause-licence.patch line 8

Quoted 8 lines
package/shadowsocks-libev/0001-docs-add-BSD-3-Clause-licence.patch new file +8 -0
@@ -0,0 +1,52 @@
+From 0047295445c499e010706598c50f1bff8b0d632c Mon Sep 17 00:00:00 2001
+From: Min Xu <[email protected]>
+Date: Wed, 30 May 2018 13:16:12 -0700
+Subject: [PATCH] docs: add BSD-3-Clause licence
+
+add missing licence for shadowsocks-libev/libipset
+
+Signed-off-by: Min Xu <[email protected]>

I'm still not entirely convinced by a patch adding a license file. It would definitely be useful to convince upstream to add this license file, but I'm not sure we want to carry patches in Buildroot adding license files.

Quoted 4 lines
Quoted 1 line

Peter, Arnout, Yann, any comment on this ?

I agree with Thomas here: do not add a license file ourselves (unless we backport an upstream commit, in which case the patch should say so).

This is actually the situation here. However, since the license file is
identical to the existing one in the libcork directory, it's not so important IMO.

Regards,
Arnout

Quoted 29 lines

If the package does not have a license file, then just include a source file, preferrably a prominent one like main.c or whatever.

And above all, better no information that bad information. So, don;t add the license file.

Regards,
Yann E. MORIN.

Quoted 18 lines

package/shadowsocks-libev/0001-docs-add-BSD-3-Clause-licence.patch line 15

Quoted 7 lines
package/shadowsocks-libev/0001-docs-add-BSD-3-Clause-licence.patch new file +7 -0
+SHADOWSOCKS_LIBEV_VERSION = 3.2.0
+SHADOWSOCKS_LIBEV_SITE = https://github.com/shadowsocks/shadowsocks-libev/releases/download/v$(SHADOWSOCKS_LIBEV_VERSION)
+SHADOWSOCKS_LIBEV_LICENSE = GPL-3.0+, BSD-2-Clause(libbloom), BSD-3-Clause(libcork, libipset)
+SHADOWSOCKS_LIBEV_LICENSE_FILES = COPYING libbloom/LICENSE libcork/COPYING libipset/LICENSE.txt
+SHADOWSOCKS_LIBEV_DEPENDENCIES = host-pkgconf c-ares libev libsodium mbedtls pcre
+SHADOWSOCKS_LIBEV_INSTALL_STAGING = YES
+SHADOWSOCKS_LIBEV_CONF_OPTS = --disable-documentation --with-pcre=$(STAGING_DIR)/usr

--disable-documentation is already passed by the autotools-package infrastructure, so it isn't needed.

Besides those minor issues, the rest looks good to me. Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com
Signature · 6 lines
Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF
author
#4 lore raw

PATCH 1/1 shadowsocks-libev: new package

Thank you so much for your help. I'm very exciting today that my first contribution finally being accepted. And I realize there're still a lot of things to learn.

Thank you.
MinXu

Quoted 86 lines · Arnout Vandecappelle
Quoted 6 lines · Yann E. MORIN

Min, Thomas, All,

On 2018-06-04 12:09 +0200, Thomas Petazzoni spake thusly:

Quoted 1 line · Min Xu

[--SNIP--]

Quoted 1 line
Quoted 1 line

diff --git

a/package/shadowsocks-libev/0001-docs-add-BSD-3-Clause-licence.patch b/package/shadowsocks-libev/0001-docs-add-BSD-3-Clause-licence.patch

Quoted 4 lines
Quoted 4 lines
Quoted 4 lines

new file mode 100644
index 0000000..64dda02
--- /dev/null
+++

b/package/shadowsocks-libev/0001-docs-add-BSD-3-Clause-licence.patch

Quoted 15 lines
Quoted 15 lines

package/shadowsocks-libev/0001-docs-add-BSD-3-Clause-licence.patch line 8

Quoted 9 lines
package/shadowsocks-libev/0001-docs-add-BSD-3-Clause-licence.patch new file +8 -0
@@ -0,0 +1,52 @@
+From 0047295445c499e010706598c50f1bff8b0d632c Mon Sep 17 00:00:00 2001
+From: Min Xu <[email protected]>
+Date: Wed, 30 May 2018 13:16:12 -0700
+Subject: [PATCH] docs: add BSD-3-Clause licence
+
+add missing licence for shadowsocks-libev/libipset
+
+Signed-off-by: Min Xu <[email protected]>

I'm still not entirely convinced by a patch adding a license file. It would definitely be useful to convince upstream to add this license file, but I'm not sure we want to carry patches in Buildroot adding license files.

Quoted 4 lines
Quoted 1 line

Peter, Arnout, Yann, any comment on this ?

I agree with Thomas here: do not add a license file ourselves (unless we backport an upstream commit, in which case the patch should say so).

This is actually the situation here. However, since the license file is
identical to the existing one in the libcork directory, it's not so important IMO.

Regards,
Arnout

Quoted 4 lines

If the package does not have a license file, then just include a source file, preferrably a prominent one like main.c or whatever.

Quoted 8 lines

And above all, better no information that bad information. So, don;t add the license file.

Regards,
Yann E. MORIN.

Quoted 2 lines

Review line 10

Quoted 2 lines
(quoted diff) +2 -0
+SHADOWSOCKS_LIBEV_VERSION = 3.2.0
+SHADOWSOCKS_LIBEV_SITE =

https://github.com/shadowsocks/shadowsocks-libev/releases/download/v$(SHADOWSOCKS_LIBEV_VERSION)

Quoted 1 line
Quoted 1 line

Review line 11

Quoted 1 line
(quoted diff) +1 -0
+SHADOWSOCKS_LIBEV_LICENSE = GPL-3.0+, BSD-2-Clause(libbloom),

BSD-3-Clause(libcork, libipset)

Quoted 1 line
Quoted 1 line

Review line 12

Quoted 1 line
(quoted diff) +1 -0
+SHADOWSOCKS_LIBEV_LICENSE_FILES = COPYING libbloom/LICENSE

libcork/COPYING libipset/LICENSE.txt

Quoted 1 line
Quoted 1 line

Review line 13

Quoted 1 line
(quoted diff) +1 -0
+SHADOWSOCKS_LIBEV_DEPENDENCIES = host-pkgconf c-ares libev libsodium

mbedtls pcre

Quoted 2 lines
Quoted 2 lines

Review line 15

Quoted 2 lines
(quoted diff) +2 -0
+SHADOWSOCKS_LIBEV_INSTALL_STAGING = YES
+SHADOWSOCKS_LIBEV_CONF_OPTS = --disable-documentation

--with-pcre=$(STAGING_DIR)/usr

Quoted 4 lines
Quoted 4 lines

--disable-documentation is already passed by the autotools-package infrastructure, so it isn't needed.

Quoted 8 lines
Quoted 7 lines

Besides those minor issues, the rest looks good to me. Thanks!

Thomas
--
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons) Embedded Linux and Kernel engineering
https://bootlin.com

--

Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF
Signature · 6 lines
*Best Regards*

*XuMin's Ready?*
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20180604/4cd0b52b/attachment.html>
#5 lore raw

PATCH 1/1 shadowsocks-libev: new package

In reply to Min Xu

Hello,

Quoted 8 lines · Min Xu

Shadowsocks-libev is a lightweight secured SOCKS5 proxy for embedded devices and low-end boxes.

https://github.com/shadowsocks/shadowsocks-libev

A patch for BSD-3-Clause licence for libipset is added. It's from libipset's git repo.

Signed-off-by Min Xu <[email protected]>
Quoted 11 lines
---
 package/Config.in                                  |  1 +
 .../0001-docs-add-BSD-3-Clause-licence.patch       | 52 ++++++++++++++++++++++
 package/shadowsocks-libev/Config.in                | 12 +++++
 package/shadowsocks-libev/shadowsocks-libev.hash   |  8 ++++
 package/shadowsocks-libev/shadowsocks-libev.mk     | 15 +++++++
 5 files changed, 88 insertions(+)
 create mode 100644 package/shadowsocks-libev/0001-docs-add-BSD-3-Clause-licence.patch
 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

I've applied to master, after doing the following changes:

[Thomas:
- drop patch adding license file for libipset
- drop --disable-documentation, it's passed by autotools-package
- add entry in DEVELOPERS file
- pass --disable-ssp because the SSP check uses AC_COMPILE_IFELSE() so with some toolchains, it think SSP support is available, while it's not. And anyway we want SSP to be controlled by Buildroot global options, not on a per-package basis.
- add depends on BR2_USE_MMU, because the code uses fork().]

Thanks for this contribution!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com