* [Buildroot] [PATCH 1/3] package/tinc: needs libdl for OpenSSL support
@ 2016-05-22 12:26 Bernd Kuhls
2016-05-22 12:26 ` [Buildroot] [PATCH 2/3] package/tinc: optionally include linux/if_tun.h to fix musl build Bernd Kuhls
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Bernd Kuhls @ 2016-05-22 12:26 UTC (permalink / raw)
To: buildroot
Fixes
http://autobuild.buildroot.net/results/d5b/d5b2f905d8da79cebda1408ffceac6d4c99f9e7b/
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
package/tinc/Config.in | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/package/tinc/Config.in b/package/tinc/Config.in
index 5390ff3..1d8e2c4 100644
--- a/package/tinc/Config.in
+++ b/package/tinc/Config.in
@@ -3,6 +3,7 @@ config BR2_PACKAGE_TINC
select BR2_PACKAGE_LZO
select BR2_PACKAGE_OPENSSL
select BR2_PACKAGE_ZLIB
+ depends on !BR2_STATIC_LIBS # tinc requires libdl for OpenSSL
depends on BR2_USE_MMU # fork()
help
tinc is a Virtual Private Network (VPN) daemon that uses
@@ -10,3 +11,6 @@ config BR2_PACKAGE_TINC
between hosts on the Internet.
http://www.tinc-vpn.org/
+
+comment "tinc needs a toolchain w/ dynamic library"
+ depends on BR2_STATIC_LIBS
--
2.8.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* [Buildroot] [PATCH 2/3] package/tinc: optionally include linux/if_tun.h to fix musl build
2016-05-22 12:26 [Buildroot] [PATCH 1/3] package/tinc: needs libdl for OpenSSL support Bernd Kuhls
@ 2016-05-22 12:26 ` Bernd Kuhls
2016-05-25 21:56 ` Thomas Petazzoni
2016-05-22 12:26 ` [Buildroot] [PATCH 3/3] package/tinc: bump version to 1.0.28 Bernd Kuhls
2016-05-25 21:49 ` [Buildroot] [PATCH 1/3] package/tinc: needs libdl for OpenSSL support Thomas Petazzoni
2 siblings, 1 reply; 6+ messages in thread
From: Bernd Kuhls @ 2016-05-22 12:26 UTC (permalink / raw)
To: buildroot
Fixes
http://autobuild.buildroot.net/results/5b1/5b1d0c8c1bd75f7e228c313cb21b1638301568ae/
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
package/tinc/0001-musl.patch | 32 ++++++++++++++++++++++++++++++++
1 file changed, 32 insertions(+)
create mode 100644 package/tinc/0001-musl.patch
diff --git a/package/tinc/0001-musl.patch b/package/tinc/0001-musl.patch
new file mode 100644
index 0000000..654c705
--- /dev/null
+++ b/package/tinc/0001-musl.patch
@@ -0,0 +1,32 @@
+From: Jo-Philipp Wich <jow@openwrt.org>
+Date: Thu, 18 Jun 2015 21:58:31 +0000 (+0200)
+Subject: fix musl compatibility
+X-Git-Tag: release-1.0.26~9
+X-Git-Url: http://www.tinc-vpn.org/git/browse?p=tinc;a=commitdiff_plain;h=a04fd9d0c9babca461cee186677db8f607677c6a;hp=bb616245b7883ab30291cd8d46672ed2ae733166
+
+fix musl compatibility
+
+Let configure include sys/if_tun.h when testing for netinet/if_ether.h
+to detect the Kernel/libc header conflict on musl.
+
+After this patch, configure will correctly detect netinet/if_ether.h as
+unusable and the subsequent compilation will not attempt to use it.
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+(downloaded upstream commit included in tinc 1.0.25:
+ http://www.tinc-vpn.org/git/browse?p=tinc;a=commitdiff;h=a04fd9d0c9babca461cee186677db8f607677c6a)
+---
+
+diff --git a/src/have.h b/src/have.h
+index e83f98f..69d5100 100644
+--- a/src/have.h
++++ b/src/have.h
+@@ -207,4 +207,8 @@
+ #include <resolv.h>
+ #endif
+
++#ifdef HAVE_LINUX_IF_TUN_H
++#include <linux/if_tun.h>
++#endif
++
+ #endif /* __TINC_SYSTEM_H__ */
--
2.8.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 3/3] package/tinc: bump version to 1.0.28
2016-05-22 12:26 [Buildroot] [PATCH 1/3] package/tinc: needs libdl for OpenSSL support Bernd Kuhls
2016-05-22 12:26 ` [Buildroot] [PATCH 2/3] package/tinc: optionally include linux/if_tun.h to fix musl build Bernd Kuhls
@ 2016-05-22 12:26 ` Bernd Kuhls
2016-06-01 21:39 ` Thomas Petazzoni
2016-05-25 21:49 ` [Buildroot] [PATCH 1/3] package/tinc: needs libdl for OpenSSL support Thomas Petazzoni
2 siblings, 1 reply; 6+ messages in thread
From: Bernd Kuhls @ 2016-05-22 12:26 UTC (permalink / raw)
To: buildroot
This patch can be applied after the release of buildroot 2016.05.
Removed 0001-musl.patch, applied upstream.
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
package/tinc/0001-musl.patch | 32 --------------------------------
package/tinc/tinc.hash | 2 +-
package/tinc/tinc.mk | 2 +-
3 files changed, 2 insertions(+), 34 deletions(-)
delete mode 100644 package/tinc/0001-musl.patch
diff --git a/package/tinc/0001-musl.patch b/package/tinc/0001-musl.patch
deleted file mode 100644
index 654c705..0000000
--- a/package/tinc/0001-musl.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From: Jo-Philipp Wich <jow@openwrt.org>
-Date: Thu, 18 Jun 2015 21:58:31 +0000 (+0200)
-Subject: fix musl compatibility
-X-Git-Tag: release-1.0.26~9
-X-Git-Url: http://www.tinc-vpn.org/git/browse?p=tinc;a=commitdiff_plain;h=a04fd9d0c9babca461cee186677db8f607677c6a;hp=bb616245b7883ab30291cd8d46672ed2ae733166
-
-fix musl compatibility
-
-Let configure include sys/if_tun.h when testing for netinet/if_ether.h
-to detect the Kernel/libc header conflict on musl.
-
-After this patch, configure will correctly detect netinet/if_ether.h as
-unusable and the subsequent compilation will not attempt to use it.
-
-Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
-(downloaded upstream commit included in tinc 1.0.25:
- http://www.tinc-vpn.org/git/browse?p=tinc;a=commitdiff;h=a04fd9d0c9babca461cee186677db8f607677c6a)
----
-
-diff --git a/src/have.h b/src/have.h
-index e83f98f..69d5100 100644
---- a/src/have.h
-+++ b/src/have.h
-@@ -207,4 +207,8 @@
- #include <resolv.h>
- #endif
-
-+#ifdef HAVE_LINUX_IF_TUN_H
-+#include <linux/if_tun.h>
-+#endif
-+
- #endif /* __TINC_SYSTEM_H__ */
diff --git a/package/tinc/tinc.hash b/package/tinc/tinc.hash
index 721b6bd..0cccbbf 100644
--- a/package/tinc/tinc.hash
+++ b/package/tinc/tinc.hash
@@ -1,2 +1,2 @@
# Locally calculated after checking pgp signature
-sha256 498e58f9f39e3922030a63cf62baf4b46a40fbda8d90b23ec0f084f4a9f9b687 tinc-1.0.24.tar.gz
+sha256 0b502699360f09ce2128a39cf02abca07bfc699fc02ce829b3a90cf5e1e8b344 tinc-1.0.28.tar.gz
diff --git a/package/tinc/tinc.mk b/package/tinc/tinc.mk
index f7edd79..cb0785b 100644
--- a/package/tinc/tinc.mk
+++ b/package/tinc/tinc.mk
@@ -4,7 +4,7 @@
#
################################################################################
-TINC_VERSION = 1.0.24
+TINC_VERSION = 1.0.28
TINC_SITE = http://www.tinc-vpn.org/packages
TINC_DEPENDENCIES = lzo openssl zlib
TINC_LICENSE = GPLv2+ with OpenSSL exception
--
2.8.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 3/3] package/tinc: bump version to 1.0.28
2016-05-22 12:26 ` [Buildroot] [PATCH 3/3] package/tinc: bump version to 1.0.28 Bernd Kuhls
@ 2016-06-01 21:39 ` Thomas Petazzoni
0 siblings, 0 replies; 6+ messages in thread
From: Thomas Petazzoni @ 2016-06-01 21:39 UTC (permalink / raw)
To: buildroot
Hello,
On Sun, 22 May 2016 14:26:31 +0200, Bernd Kuhls wrote:
> This patch can be applied after the release of buildroot 2016.05.
>
> Removed 0001-musl.patch, applied upstream.
>
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
> ---
> package/tinc/0001-musl.patch | 32 --------------------------------
> package/tinc/tinc.hash | 2 +-
> package/tinc/tinc.mk | 2 +-
> 3 files changed, 2 insertions(+), 34 deletions(-)
> delete mode 100644 package/tinc/0001-musl.patch
Applied to master, thanks.
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 1/3] package/tinc: needs libdl for OpenSSL support
2016-05-22 12:26 [Buildroot] [PATCH 1/3] package/tinc: needs libdl for OpenSSL support Bernd Kuhls
2016-05-22 12:26 ` [Buildroot] [PATCH 2/3] package/tinc: optionally include linux/if_tun.h to fix musl build Bernd Kuhls
2016-05-22 12:26 ` [Buildroot] [PATCH 3/3] package/tinc: bump version to 1.0.28 Bernd Kuhls
@ 2016-05-25 21:49 ` Thomas Petazzoni
2 siblings, 0 replies; 6+ messages in thread
From: Thomas Petazzoni @ 2016-05-25 21:49 UTC (permalink / raw)
To: buildroot
Hello,
On Sun, 22 May 2016 14:26:29 +0200, Bernd Kuhls wrote:
> Fixes
> http://autobuild.buildroot.net/results/d5b/d5b2f905d8da79cebda1408ffceac6d4c99f9e7b/
>
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
> ---
> package/tinc/Config.in | 4 ++++
> 1 file changed, 4 insertions(+)
It is somewhat weird that they decide that OpenSSL needs dlopen, while
it doesn't seem like it use it. But well, that's what tinc's configure
script has decided, so I've applied to master. Thanks!
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2016-06-01 21:39 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-05-22 12:26 [Buildroot] [PATCH 1/3] package/tinc: needs libdl for OpenSSL support Bernd Kuhls
2016-05-22 12:26 ` [Buildroot] [PATCH 2/3] package/tinc: optionally include linux/if_tun.h to fix musl build Bernd Kuhls
2016-05-25 21:56 ` Thomas Petazzoni
2016-05-22 12:26 ` [Buildroot] [PATCH 3/3] package/tinc: bump version to 1.0.28 Bernd Kuhls
2016-06-01 21:39 ` Thomas Petazzoni
2016-05-25 21:49 ` [Buildroot] [PATCH 1/3] package/tinc: needs libdl for OpenSSL support Thomas Petazzoni
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox