package/readline: add host variant
PATCH 1/2 package/readline: add host variant
Needed by SoftEther VPN.
host-readline will also be needed by host-pcre, which in turn will be needed by the yet-to-be-released leafnode2 package.
--- package/readline/readline.mk | 2 ++ 1 file changed, 2 insertions(+)
package/readline/readline.mk +2 -0
@@ -8,6 +8,7 @@ READLINE_VERSION = 6.3 READLINE_SITE = $(BR2_GNU_MIRROR)/readline READLINE_INSTALL_STAGING = YES READLINE_DEPENDENCIES = ncurses +HOST_READLINE_DEPENDENCIES = host-ncurses READLINE_CONF_ENV = bash_cv_func_sigsetjmp=yes \ bash_cv_wcwidth_broken=no READLINE_LICENSE = GPLv3+
@@ -20,3 +21,4 @@ endef READLINE_POST_INSTALL_TARGET_HOOKS += READLINE_PURGE_EXAMPLES $(eval $(autotools-package)) +$(eval $(host-autotools-package))
Signature · 1 line
1.7.10.4
PATCH 2/2 package/softether: New package
Package description was copied from
https://launchpad.net/~dajhorn/+archive/ubuntu/softether/
--- package/Config.in | 1 + package/softether/Config.in | 28 + package/softether/softether-0001-debian.patch | 2381 ++++++++++++++++++++ .../softether/softether-0002-cross-compile.patch | 30 + package/softether/softether-0003-iconv.patch | 27 + package/softether/softether.mk | 36 + 6 files changed, 2503 insertions(+) create mode 100644 package/softether/Config.in create mode 100644 package/softether/softether-0001-debian.patch create mode 100644 package/softether/softether-0002-cross-compile.patch create mode 100644 package/softether/softether-0003-iconv.patch create mode 100644 package/softether/softether.mk
package/Config.in +1 -0
@@ -1069,6 +1069,7 @@ endif source "package/smcroute/Config.in" source "package/socat/Config.in" source "package/socketcand/Config.in" + source "package/softether/Config.in" source "package/spawn-fcgi/Config.in" source "package/spice/Config.in" source "package/spice-protocol/Config.in"
package/softether/Config.in new file +28 -0
@@ -0,0 +1,28 @@ +config BR2_PACKAGE_SOFTETHER + bool "softether" + select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE + select BR2_PACKAGE_OPENSSL + select BR2_PACKAGE_READLINE + depends on BR2_LARGEFILE + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_USE_MMU # fork() + depends on BR2_USE_WCHAR + help + The SoftEther Server is a fully integrated implementation of the SSTP, + L2TP, L2TPv3, OpenVPN, and IPSec virtual private networking protocols + on Linux and several other platforms. It is generally compatible with + other implementations by Apple, Cisco, Juniper, Microsoft, et al. + + Convenient Layer-2 and Layer-3 bridging capabilities can connect + several branch offices into a single broadcast or routing domain, even + behind a NAT or without a static IPv4 address. + + In addition to supporting most VPN protocols, the SoftEther Client can + penetrate hardened firewalls and captured gateways through HTTPS, DNS, + and ICMP exfiltration. + + http://www.softether.org + +comment "softether needs a toolchain w/ largefile, wchar, threads" + depends on BR2_USE_MMU + depends on !(BR2_LARGEFILE && BR2_USE_WCHAR && BR2_TOOLCHAIN_HAS_THREADS)
package/softether/softether-0001-debian.patch new file +2381 -0
2,381 lines not on this page · raw message
package/softether/softether-0002-cross-compile.patch new file +30 -0
@@ -0,0 +1,30 @@ +Host version of hamcorebuilder is needed during cross-compile + +Signed-off-by: Bernd Kuhls <[email protected]> + +diff -uNr SoftEtherVPN-16b713b98da8dba29f0f845d5a8c36d6f7c34824.org/src/bin/hamcore/Makefile.am SoftEtherVPN-16b713b98da8dba29f0f845d5a8c36d6f7c34824/src/bin/hamcore/Makefile.am +--- SoftEtherVPN-16b713b98da8dba29f0f845d5a8c36d6f7c34824.org/src/bin/hamcore/Makefile.am 2014-09-27 12:56:53.108725793 +0200 ++++ SoftEtherVPN-16b713b98da8dba29f0f845d5a8c36d6f7c34824/src/bin/hamcore/Makefile.am 2014-09-27 12:57:50.280009025 +0200 +@@ -26,8 +26,8 @@ + + noinst_PROGRAMS = hamcore.se2 + +-hamcore.se2$(EXEEXT): $(HAMCOREBUILDER) +- $(HAMCOREBUILDER) $(top_srcdir)/src/bin/hamcore $@ ++hamcore.se2$(EXEEXT): ++ hamcorebuilder $(top_srcdir)/src/bin/hamcore $@ + + install-exec-local: hamcore.se2$(EXEEXT) + $(INSTALL_DATA) -D hamcore.se2$(EXEEXT) $(DESTDIR)$(localstatedir)/lib/softether/hamcore.se2 +diff -uNr SoftEtherVPN-16b713b98da8dba29f0f845d5a8c36d6f7c34824.org/src/Makefile.am SoftEtherVPN-16b713b98da8dba29f0f845d5a8c36d6f7c34824/src/Makefile.am +--- SoftEtherVPN-16b713b98da8dba29f0f845d5a8c36d6f7c34824.org/src/Makefile.am 2014-09-27 12:56:53.136726809 +0200 ++++ SoftEtherVPN-16b713b98da8dba29f0f845d5a8c36d6f7c34824/src/Makefile.am 2014-09-27 12:58:12.959723109 +0200 +@@ -20,7 +20,7 @@ + SUBDIRS = Mayaqua Cedar + + # This is a nodist helper. +-SUBDIRS += hamcorebuilder ++# SUBDIRS += hamcorebuilder + + # These are shared components. + SUBDIRS += libsoftether bin/hamcore
package/softether/softether-0003-iconv.patch new file +27 -0
@@ -0,0 +1,27 @@ +Fix linking with libiconv + +Inspired by https://github.com/el1n/OpenWRT-package-softether/blob/4cb1cd9073a76edf34c512e587069626e02e2404/patches/120-fix-iconv-headers-common.patch + +Signed-off-by: Bernd Kuhls <[email protected]> + +--- a/src/Mayaqua/Mayaqua.h 2014-07-11 20:00:27.000000000 +0200 ++++ b/src/Mayaqua/Mayaqua.h 2014-09-27 15:30:09.633111125 +0200 +@@ -282,17 +282,7 @@ + #include <ifaddrs.h> + #endif // MAYAQUA_SUPPORTS_GETIFADDRS + +-#ifdef UNIX_LINUX +-typedef void *iconv_t; +-iconv_t iconv_open (__const char *__tocode, __const char *__fromcode); +-size_t iconv (iconv_t __cd, char **__restrict __inbuf, +- size_t *__restrict __inbytesleft, +- char **__restrict __outbuf, +- size_t *__restrict __outbytesleft); +-int iconv_close (iconv_t __cd); +-#else // UNIX_LINUX +-#include <iconv.h> +-#endif // UNIX_LINUX ++#include <iconv.h> + + +
package/softether/softether.mk new file +36 -0
@@ -0,0 +1,36 @@ +################################################################################ +# +# softether +# +################################################################################ + +SOFTETHER_VERSION = 16b713b98da8dba29f0f845d5a8c36d6f7c34824 +SOFTETHER_SITE = $(call github,SoftEtherVPN,SoftEtherVPN,$(SOFTETHER_VERSION)) +SOFTETHER_LICENSE = GPLv2 +SOFTETHER_LICENSE_FILES = LICENSE +SOFTETHER_DEPENDENCIES = host-softether openssl readline +SOFTETHER_AUTORECONF = YES +ifeq ($(BR2_ENABLE_LOCALE),) +SOFTETHER_DEPENDENCIES += libiconv +SOFTETHER_CONF_ENV = LIBS="-liconv" +endif +SOFTETHER_CONF_OPT = --with-openssl="$(STAGING_DIR)/usr" \ + --with-zlib="$(STAGING_DIR)/usr" + +# host-libiconv does not exist, therefore we need this extra line +HOST_SOFTETHER_DEPENDENCIES = host-pkgconf host-openssl host-readline + +# target build creates the file hamcore.se2 which needs the host variant of +# hamcorebuilder, for details see http://www.vpnusers.com/viewtopic.php?p=5426 +define HOST_SOFTETHER_BUILD_CMDS + $(MAKE) -C $(@D)/src/Mayaqua + $(MAKE) -C $(@D)/src/Cedar + $(MAKE) -C $(@D)/src/hamcorebuilder +endef + +define HOST_SOFTETHER_INSTALL_CMDS + $(INSTALL) -m 0755 $(@D)/src/hamcorebuilder/hamcorebuilder $(HOST_DIR)/usr/bin +endef + +$(eval $(autotools-package)) +$(eval $(host-autotools-package))
Signature · 1 line
1.7.10.4
PATCH 2/2 package/softether: New package
Bernd Kuhls <[email protected]> wrote in news:1411835956-23735-2-git-send-email-bernd.kuhls at t-online.de:
Quoted 1 line
package/softether/softether-0001-debian.patch | 2381
++++++++++++++++++++
Quoted 1 line
package/softether/softether-0003-iconv.patch | 27 +
Hi,
please note that due to the fact that the sourcecode of softether contains DOS line endings these two patch files also contain them. Due to the use of "git send-email" these line endings seem to get lost.
Quoted below are all lines containing DOS line endings, if you know a better way to distribute my patch please let me know.
Regards, Bernd
$ grep -IUrn $'\r' package/softether/ | cut -d ":" -f 1-2
package/softether/softether-0001-debian.patch:1554 package/softether/softether-0001-debian.patch:1555 package/softether/softether-0001-debian.patch:1556 package/softether/softether-0001-debian.patch:1558 package/softether/softether-0001-debian.patch:1559 package/softether/softether-0001-debian.patch:1560 package/softether/softether-0001-debian.patch:1565 package/softether/softether-0001-debian.patch:1566 package/softether/softether-0001-debian.patch:1567 package/softether/softether-0001-debian.patch:1568 package/softether/softether-0001-debian.patch:1569 package/softether/softether-0001-debian.patch:1570 package/softether/softether-0001-debian.patch:1571 package/softether/softether-0001-debian.patch:1572 package/softether/softether-0001-debian.patch:1577 package/softether/softether-0001-debian.patch:1578 package/softether/softether-0001-debian.patch:1579 package/softether/softether-0001-debian.patch:1580 package/softether/softether-0001-debian.patch:1581 package/softether/softether-0001-debian.patch:1582 package/softether/softether-0001-debian.patch:1583 package/softether/softether-0001-debian.patch:1584 package/softether/softether-0001-debian.patch:1586 package/softether/softether-0001-debian.patch:1587 package/softether/softether-0001-debian.patch:1588 package/softether/softether-0001-debian.patch:1589 package/softether/softether-0001-debian.patch:1590 package/softether/softether-0001-debian.patch:1591 package/softether/softether-0001-debian.patch:1592 package/softether/softether-0001-debian.patch:1593 package/softether/softether-0001-debian.patch:1594 package/softether/softether-0001-debian.patch:1595 package/softether/softether-0001-debian.patch:1596 package/softether/softether-0001-debian.patch:1601 package/softether/softether-0001-debian.patch:1602 package/softether/softether-0001-debian.patch:1603 package/softether/softether-0001-debian.patch:1604 package/softether/softether-0001-debian.patch:1605 package/softether/softether-0001-debian.patch:1606 package/softether/softether-0001-debian.patch:1607 package/softether/softether-0001-debian.patch:1608 package/softether/softether-0001-debian.patch:1699 package/softether/softether-0001-debian.patch:1700 package/softether/softether-0001-debian.patch:1701 package/softether/softether-0001-debian.patch:1702 package/softether/softether-0001-debian.patch:1703 package/softether/softether-0001-debian.patch:1704 package/softether/softether-0001-debian.patch:1705 package/softether/softether-0001-debian.patch:1706 package/softether/softether-0001-debian.patch:1707 package/softether/softether-0001-debian.patch:1708 package/softether/softether-0001-debian.patch:1709 package/softether/softether-0001-debian.patch:1710 package/softether/softether-0001-debian.patch:1711 package/softether/softether-0001-debian.patch:1713 package/softether/softether-0001-debian.patch:1714 package/softether/softether-0001-debian.patch:1715 package/softether/softether-0001-debian.patch:1716 package/softether/softether-0001-debian.patch:1717 package/softether/softether-0001-debian.patch:1718 package/softether/softether-0001-debian.patch:1719 package/softether/softether-0001-debian.patch:1720 package/softether/softether-0001-debian.patch:1722 package/softether/softether-0001-debian.patch:1723 package/softether/softether-0001-debian.patch:1724 package/softether/softether-0001-debian.patch:1725 package/softether/softether-0001-debian.patch:1726 package/softether/softether-0001-debian.patch:1727 package/softether/softether-0001-debian.patch:1728 package/softether/softether-0001-debian.patch:1729 package/softether/softether-0001-debian.patch:1730 package/softether/softether-0001-debian.patch:1731 package/softether/softether-0001-debian.patch:1732 package/softether/softether-0001-debian.patch:1737 package/softether/softether-0001-debian.patch:1738 package/softether/softether-0001-debian.patch:1739 package/softether/softether-0001-debian.patch:1740 package/softether/softether-0001-debian.patch:1741 package/softether/softether-0001-debian.patch:1742 package/softether/softether-0001-debian.patch:1743 package/softether/softether-0001-debian.patch:1744 package/softether/softether-0001-debian.patch:1746 package/softether/softether-0001-debian.patch:1747 package/softether/softether-0001-debian.patch:1748 package/softether/softether-0001-debian.patch:1749 package/softether/softether-0001-debian.patch:1750 package/softether/softether-0001-debian.patch:1751 package/softether/softether-0001-debian.patch:1752 package/softether/softether-0001-debian.patch:1753 package/softether/softether-0001-debian.patch:1865 package/softether/softether-0001-debian.patch:1866 package/softether/softether-0001-debian.patch:1867 package/softether/softether-0001-debian.patch:1868 package/softether/softether-0001-debian.patch:1869 package/softether/softether-0001-debian.patch:1870 package/softether/softether-0001-debian.patch:1871 package/softether/softether-0001-debian.patch:1872 package/softether/softether-0001-debian.patch:1877 package/softether/softether-0001-debian.patch:1878 package/softether/softether-0001-debian.patch:1879 package/softether/softether-0001-debian.patch:1880 package/softether/softether-0001-debian.patch:1881 package/softether/softether-0001-debian.patch:1882 package/softether/softether-0001-debian.patch:1883 package/softether/softether-0001-debian.patch:1884 package/softether/softether-0001-debian.patch:1885 package/softether/softether-0001-debian.patch:1886 package/softether/softether-0001-debian.patch:1887 package/softether/softether-0001-debian.patch:1888 package/softether/softether-0001-debian.patch:1889 package/softether/softether-0001-debian.patch:1890 package/softether/softether-0001-debian.patch:1892 package/softether/softether-0001-debian.patch:1893 package/softether/softether-0001-debian.patch:1894 package/softether/softether-0001-debian.patch:1895 package/softether/softether-0001-debian.patch:1896 package/softether/softether-0001-debian.patch:1897 package/softether/softether-0001-debian.patch:1898 package/softether/softether-0001-debian.patch:1899 package/softether/softether-0001-debian.patch:1901 package/softether/softether-0001-debian.patch:1902 package/softether/softether-0001-debian.patch:1903 package/softether/softether-0001-debian.patch:1904 package/softether/softether-0001-debian.patch:1905 package/softether/softether-0001-debian.patch:1906 package/softether/softether-0001-debian.patch:1907 package/softether/softether-0001-debian.patch:1908 package/softether/softether-0001-debian.patch:1910 package/softether/softether-0001-debian.patch:1911 package/softether/softether-0001-debian.patch:1912 package/softether/softether-0001-debian.patch:1913 package/softether/softether-0001-debian.patch:1914 package/softether/softether-0001-debian.patch:1915 package/softether/softether-0001-debian.patch:1916 package/softether/softether-0001-debian.patch:1917 package/softether/softether-0001-debian.patch:1918 package/softether/softether-0001-debian.patch:1919 package/softether/softether-0001-debian.patch:1920 package/softether/softether-0001-debian.patch:1921 package/softether/softether-0001-debian.patch:1922 package/softether/softether-0001-debian.patch:1923 package/softether/softether-0001-debian.patch:1924 package/softether/softether-0001-debian.patch:1925 package/softether/softether-0001-debian.patch:1926 package/softether/softether-0001-debian.patch:1927 package/softether/softether-0001-debian.patch:1928 package/softether/softether-0001-debian.patch:1929 package/softether/softether-0001-debian.patch:1930 package/softether/softether-0001-debian.patch:1931 package/softether/softether-0001-debian.patch:1932 package/softether/softether-0001-debian.patch:1933 package/softether/softether-0001-debian.patch:1934 package/softether/softether-0001-debian.patch:1935 package/softether/softether-0001-debian.patch:1936 package/softether/softether-0001-debian.patch:1937 package/softether/softether-0001-debian.patch:1938 package/softether/softether-0001-debian.patch:1939 package/softether/softether-0001-debian.patch:1940 package/softether/softether-0001-debian.patch:1941 package/softether/softether-0001-debian.patch:1942 package/softether/softether-0001-debian.patch:1944 package/softether/softether-0001-debian.patch:1945 package/softether/softether-0001-debian.patch:1946 package/softether/softether-0001-debian.patch:1947 package/softether/softether-0001-debian.patch:1948 package/softether/softether-0001-debian.patch:1949 package/softether/softether-0001-debian.patch:1950 package/softether/softether-0001-debian.patch:1951 package/softether/softether-0001-debian.patch:1956 package/softether/softether-0001-debian.patch:1957 package/softether/softether-0001-debian.patch:1958 package/softether/softether-0001-debian.patch:1959 package/softether/softether-0001-debian.patch:1960 package/softether/softether-0001-debian.patch:1961 package/softether/softether-0001-debian.patch:1962 package/softether/softether-0001-debian.patch:1963 package/softether/softether-0001-debian.patch:2015 package/softether/softether-0001-debian.patch:2016 package/softether/softether-0001-debian.patch:2017 package/softether/softether-0001-debian.patch:2018 package/softether/softether-0001-debian.patch:2019 package/softether/softether-0001-debian.patch:2020 package/softether/softether-0001-debian.patch:2021 package/softether/softether-0001-debian.patch:2022 package/softether/softether-0001-debian.patch:2023 package/softether/softether-0001-debian.patch:2024 package/softether/softether-0001-debian.patch:2025 package/softether/softether-0001-debian.patch:2030 package/softether/softether-0001-debian.patch:2031 package/softether/softether-0001-debian.patch:2032 package/softether/softether-0001-debian.patch:2033 package/softether/softether-0001-debian.patch:2034 package/softether/softether-0001-debian.patch:2035 package/softether/softether-0001-debian.patch:2036 package/softether/softether-0001-debian.patch:2037 package/softether/softether-0001-debian.patch:2039 package/softether/softether-0001-debian.patch:2040 package/softether/softether-0001-debian.patch:2041 package/softether/softether-0001-debian.patch:2042 package/softether/softether-0001-debian.patch:2043 package/softether/softether-0001-debian.patch:2044 package/softether/softether-0001-debian.patch:2045 package/softether/softether-0001-debian.patch:2046 package/softether/softether-0001-debian.patch:2047 package/softether/softether-0001-debian.patch:2048 package/softether/softether-0001-debian.patch:2049 package/softether/softether-0001-debian.patch:2054 package/softether/softether-0001-debian.patch:2055 package/softether/softether-0001-debian.patch:2056 package/softether/softether-0001-debian.patch:2057 package/softether/softether-0001-debian.patch:2058 package/softether/softether-0001-debian.patch:2059 package/softether/softether-0001-debian.patch:2060 package/softether/softether-0001-debian.patch:2061 package/softether/softether-0001-debian.patch:2063 package/softether/softether-0001-debian.patch:2064 package/softether/softether-0001-debian.patch:2065 package/softether/softether-0001-debian.patch:2066 package/softether/softether-0001-debian.patch:2067 package/softether/softether-0001-debian.patch:2068 package/softether/softether-0001-debian.patch:2069 package/softether/softether-0001-debian.patch:2070 package/softether/softether-0001-debian.patch:2071 package/softether/softether-0001-debian.patch:2072 package/softether/softether-0001-debian.patch:2073 package/softether/softether-0001-debian.patch:2078 package/softether/softether-0001-debian.patch:2079 package/softether/softether-0001-debian.patch:2080 package/softether/softether-0001-debian.patch:2081 package/softether/softether-0001-debian.patch:2082 package/softether/softether-0001-debian.patch:2083 package/softether/softether-0001-debian.patch:2084 package/softether/softether-0001-debian.patch:2085 package/softether/softether-0001-debian.patch:2087 package/softether/softether-0001-debian.patch:2088 package/softether/softether-0001-debian.patch:2089 package/softether/softether-0001-debian.patch:2090 package/softether/softether-0001-debian.patch:2091 package/softether/softether-0001-debian.patch:2092 package/softether/softether-0001-debian.patch:2093 package/softether/softether-0001-debian.patch:2094 package/softether/softether-0001-debian.patch:2096 package/softether/softether-0001-debian.patch:2097 package/softether/softether-0001-debian.patch:2098 package/softether/softether-0001-debian.patch:2099 package/softether/softether-0001-debian.patch:2100 package/softether/softether-0001-debian.patch:2101 package/softether/softether-0001-debian.patch:2102 package/softether/softether-0001-debian.patch:2103 package/softether/softether-0003-iconv.patch:10 package/softether/softether-0003-iconv.patch:11 package/softether/softether-0003-iconv.patch:12 package/softether/softether-0003-iconv.patch:13 package/softether/softether-0003-iconv.patch:14 package/softether/softether-0003-iconv.patch:15 package/softether/softether-0003-iconv.patch:16 package/softether/softether-0003-iconv.patch:17 package/softether/softether-0003-iconv.patch:18 package/softether/softether-0003-iconv.patch:19 package/softether/softether-0003-iconv.patch:20 package/softether/softether-0003-iconv.patch:21 package/softether/softether-0003-iconv.patch:22 package/softether/softether-0003-iconv.patch:23 package/softether/softether-0003-iconv.patch:25 package/softether/softether-0003-iconv.patch:26 package/softether/softether-0003-iconv.patch:27
Thomas Petazzoni
AppliedPATCH 1/2 package/readline: add host variant
In reply to Bernd KuhlsDear Bernd Kuhls,
Quoted 6 lines · Bernd Kuhls
Needed by SoftEther VPN.
host-readline will also be needed by host-pcre, which in turn will be needed by the yet-to-be-released leafnode2 package.
Signed-off-by Bernd Kuhls <[email protected]>
Applied, thanks!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com