* [Buildroot] [PATCH] shadowsocks-libev: new package
@ 2018-06-04 7:16 Min Xu
2018-06-04 10:09 ` Thomas Petazzoni
2018-06-04 20:34 ` Thomas Petazzoni
0 siblings, 2 replies; 8+ messages in thread
From: Min Xu @ 2018-06-04 7:16 UTC (permalink / raw)
To: buildroot
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 <xuminready@gmail.com>
---
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
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/0001-docs-add-BSD-3-Clause-licence.patch b/package/shadowsocks-libev/0001-docs-add-BSD-3-Clause-licence.patch
new file mode 100644
index 0000000..64dda02
--- /dev/null
+++ b/package/shadowsocks-libev/0001-docs-add-BSD-3-Clause-licence.patch
@@ -0,0 +1,52 @@
+From 0047295445c499e010706598c50f1bff8b0d632c Mon Sep 17 00:00:00 2001
+From: Min Xu <xuminready@gmail.com>
+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 <xuminready@gmail.com>
+---
+ libipset/LICENSE.txt | 30 ++++++++++++++++++++++++++++++
+ 1 file changed, 30 insertions(+)
+ create mode 100644 libipset/LICENSE.txt
+
+diff --git a/libipset/LICENSE.txt b/libipset/LICENSE.txt
+new file mode 100644
+index 0000000..cff38df
+--- /dev/null
++++ b/libipset/LICENSE.txt
+@@ -0,0 +1,30 @@
++Copyright ? 2009-2013, RedJack, LLC.
++All rights reserved.
++
++Redistribution and use in source and binary forms, with or without
++modification, are permitted provided that the following conditions are
++met:
++
++ ? Redistributions of source code must retain the above copyright
++ notice, this list of conditions and the following disclaimer.
++
++ ? Redistributions in binary form must reproduce the above copyright
++ notice, this list of conditions and the following disclaimer in
++ the documentation and/or other materials provided with the
++ distribution.
++
++ ? Neither the name of RedJack Software, LLC nor the names of its
++ contributors may be used to endorse or promote products derived
++ from this software without specific prior written permission.
++
++THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
++"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
++LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
++A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
++HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
++SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
++LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
++DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
++THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
++(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
++OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+--
+2.11.0
+
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..e8be8a8
--- /dev/null
+++ b/package/shadowsocks-libev/shadowsocks-libev.hash
@@ -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
diff --git a/package/shadowsocks-libev/shadowsocks-libev.mk b/package/shadowsocks-libev/shadowsocks-libev.mk
new file mode 100644
index 0000000..ddb2880
--- /dev/null
+++ b/package/shadowsocks-libev/shadowsocks-libev.mk
@@ -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))
--
2.11.0
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [Buildroot] [PATCH] shadowsocks-libev: new package
2018-06-04 7:16 [Buildroot] [PATCH] shadowsocks-libev: new package Min Xu
@ 2018-06-04 10:09 ` Thomas Petazzoni
2018-06-04 16:00 ` Yann E. MORIN
2018-06-04 20:34 ` Thomas Petazzoni
1 sibling, 1 reply; 8+ messages in thread
From: Thomas Petazzoni @ 2018-06-04 10:09 UTC (permalink / raw)
To: buildroot
Hello,
On Mon, 4 Jun 2018 00:16:26 -0700, Min Xu wrote:
> 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 <xuminready@gmail.com>
Thanks for this new iteration!
> 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 ?
> 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
> new file mode 100644
> index 0000000..64dda02
> --- /dev/null
> +++ b/package/shadowsocks-libev/0001-docs-add-BSD-3-Clause-licence.patch
> @@ -0,0 +1,52 @@
> +From 0047295445c499e010706598c50f1bff8b0d632c Mon Sep 17 00:00:00 2001
> +From: Min Xu <xuminready@gmail.com>
> +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 <xuminready@gmail.com>
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 ?
> +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
--
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 8+ messages in thread
* [Buildroot] [PATCH] shadowsocks-libev: new package
2018-06-04 10:09 ` Thomas Petazzoni
@ 2018-06-04 16:00 ` Yann E. MORIN
2018-06-04 22:07 ` Arnout Vandecappelle
0 siblings, 1 reply; 8+ messages in thread
From: Yann E. MORIN @ 2018-06-04 16:00 UTC (permalink / raw)
To: buildroot
Min, Thomas, All,
On 2018-06-04 12:09 +0200, Thomas Petazzoni spake thusly:
> On Mon, 4 Jun 2018 00:16:26 -0700, Min Xu wrote:
[--SNIP--]
> > 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
> > new file mode 100644
> > index 0000000..64dda02
> > --- /dev/null
> > +++ b/package/shadowsocks-libev/0001-docs-add-BSD-3-Clause-licence.patch
> > @@ -0,0 +1,52 @@
> > +From 0047295445c499e010706598c50f1bff8b0d632c Mon Sep 17 00:00:00 2001
> > +From: Min Xu <xuminready@gmail.com>
> > +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 <xuminready@gmail.com>
>
> 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 ?
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.
> > +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
> --
> Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
> Embedded Linux and Kernel engineering
> https://bootlin.com
--
.-----------------.--------------------.------------------.--------------------.
| 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. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 8+ messages in thread
* [Buildroot] [PATCH] shadowsocks-libev: new package
2018-06-04 7:16 [Buildroot] [PATCH] shadowsocks-libev: new package Min Xu
2018-06-04 10:09 ` Thomas Petazzoni
@ 2018-06-04 20:34 ` Thomas Petazzoni
1 sibling, 0 replies; 8+ messages in thread
From: Thomas Petazzoni @ 2018-06-04 20:34 UTC (permalink / raw)
To: buildroot
Hello,
On Mon, 4 Jun 2018 00:16:26 -0700, Min Xu wrote:
> 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 <xuminready@gmail.com>
> ---
> 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
--
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 8+ messages in thread
* [Buildroot] [PATCH] shadowsocks-libev: new package
2018-06-04 16:00 ` Yann E. MORIN
@ 2018-06-04 22:07 ` Arnout Vandecappelle
2018-06-05 6:50 ` xu min
0 siblings, 1 reply; 8+ messages in thread
From: Arnout Vandecappelle @ 2018-06-04 22:07 UTC (permalink / raw)
To: buildroot
On 04-06-18 18:00, Yann E. MORIN wrote:
> Min, Thomas, All,
>
> On 2018-06-04 12:09 +0200, Thomas Petazzoni spake thusly:
>> On Mon, 4 Jun 2018 00:16:26 -0700, Min Xu wrote:
> [--SNIP--]
>>> 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
>>> new file mode 100644
>>> index 0000000..64dda02
>>> --- /dev/null
>>> +++ b/package/shadowsocks-libev/0001-docs-add-BSD-3-Clause-licence.patch
>>> @@ -0,0 +1,52 @@
>>> +From 0047295445c499e010706598c50f1bff8b0d632c Mon Sep 17 00:00:00 2001
>>> +From: Min Xu <xuminready@gmail.com>
>>> +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 <xuminready@gmail.com>
>>
>> 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 ?
>
> 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
>
> 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.
>
>>> +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
>> --
>> 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
^ permalink raw reply [flat|nested] 8+ messages in thread
* [Buildroot] [PATCH] shadowsocks-libev: new package
2018-06-04 22:07 ` Arnout Vandecappelle
@ 2018-06-05 6:50 ` xu min
0 siblings, 0 replies; 8+ messages in thread
From: xu min @ 2018-06-05 6:50 UTC (permalink / raw)
To: buildroot
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
On Mon, Jun 4, 2018 at 3:07 PM Arnout Vandecappelle <arnout@mind.be> wrote:
>
>
> On 04-06-18 18:00, Yann E. MORIN wrote:
> > Min, Thomas, All,
> >
> > On 2018-06-04 12:09 +0200, Thomas Petazzoni spake thusly:
> >> On Mon, 4 Jun 2018 00:16:26 -0700, Min Xu wrote:
> > [--SNIP--]
> >>> 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
> >>> new file mode 100644
> >>> index 0000000..64dda02
> >>> --- /dev/null
> >>> +++
> b/package/shadowsocks-libev/0001-docs-add-BSD-3-Clause-licence.patch
> >>> @@ -0,0 +1,52 @@
> >>> +From 0047295445c499e010706598c50f1bff8b0d632c Mon Sep 17 00:00:00 2001
> >>> +From: Min Xu <xuminready@gmail.com>
> >>> +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 <xuminready@gmail.com>
> >>
> >> 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 ?
> >
> > 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
>
> >
> > 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.
> >
> >>> +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
> >> --
> >> 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
>
--
*Best Regards*
*XuMin's Ready?*
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20180604/4cd0b52b/attachment.html>
^ permalink raw reply [flat|nested] 8+ messages in thread
* [Buildroot] [PATCH] shadowsocks-libev: new package
2018-05-29 6:55 Min Xu
@ 2018-05-30 20:52 ` Arnout Vandecappelle
0 siblings, 0 replies; 8+ messages in thread
From: Arnout Vandecappelle @ 2018-05-30 20:52 UTC (permalink / raw)
To: buildroot
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))
>
--
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
^ permalink raw reply [flat|nested] 8+ messages in thread
* [Buildroot] [PATCH] shadowsocks-libev: new package
@ 2018-05-29 6:55 Min Xu
2018-05-30 20:52 ` Arnout Vandecappelle
0 siblings, 1 reply; 8+ messages in thread
From: Min Xu @ 2018-05-29 6:55 UTC (permalink / raw)
To: buildroot
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
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))
--
2.11.0
^ permalink raw reply related [flat|nested] 8+ messages in thread
end of thread, other threads:[~2018-06-05 6:50 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-06-04 7:16 [Buildroot] [PATCH] shadowsocks-libev: new package Min Xu
2018-06-04 10:09 ` Thomas Petazzoni
2018-06-04 16:00 ` Yann E. MORIN
2018-06-04 22:07 ` Arnout Vandecappelle
2018-06-05 6:50 ` xu min
2018-06-04 20:34 ` Thomas Petazzoni
-- strict thread matches above, loose matches on Subject: below --
2018-05-29 6:55 Min Xu
2018-05-30 20:52 ` Arnout Vandecappelle
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.