diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2020-04-12 03:41:30 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2020-04-12 03:41:30 +0100 |
| commit | 623ee73d661e5ed8475cb264511f683407d87365 (patch) | |
| tree | 993eb27c93ec7a2d2d19550300d888fc1fed9e69 /net-proxy/pingtunnel | |
| parent | ceeeb463cc1eef97fd62eaee8bf2196ba04bc384 (diff) | |
gentoo Easter resync : 12.04.2020
Diffstat (limited to 'net-proxy/pingtunnel')
| -rw-r--r-- | net-proxy/pingtunnel/Manifest | 5 | ||||
| -rw-r--r-- | net-proxy/pingtunnel/files/pingtunnel-0.72-musl.patch | 10 | ||||
| -rw-r--r-- | net-proxy/pingtunnel/files/pingtunnel-0.72_makefile.patch | 4 | ||||
| -rw-r--r-- | net-proxy/pingtunnel/pingtunnel-0.72.ebuild | 31 |
4 files changed, 30 insertions, 20 deletions
diff --git a/net-proxy/pingtunnel/Manifest b/net-proxy/pingtunnel/Manifest index 628dd0945b90..7b3b580fd2e0 100644 --- a/net-proxy/pingtunnel/Manifest +++ b/net-proxy/pingtunnel/Manifest @@ -1,4 +1,5 @@ -AUX pingtunnel-0.72_makefile.patch 1587 BLAKE2B f1941e175920004648d76a4db848aee5339498f845d9577190525096911cb337a4f6dd1a3197ad108a388bbd20cf14c10799ed89374fe14230165bfa74a28af7 SHA512 901258ec0f299441ab65bc38240f735fd46a5faf6c33d8011bc3dd88c40bf85ec267cdf6a7e90bdb8abc7f688fb6332d9571c4949321fa8dfa4403d175f3eb32 +AUX pingtunnel-0.72-musl.patch 191 BLAKE2B aa5bf67d3f4addabacf495d8c72039f3c012b8a2b1dc6088da92d178e892fefb2454e2fc7ea91cd85c7d6a35de07f3570a2de6753cf41d20fe3384ccf7a5dba1 SHA512 cb8eae3f77d4a8f4759119aab210045094b4b3f09b08d5b0ed22e0e5667144b2d933542e693a5164f9028c6ce58aa175664596d54c86f0e14d0136459beddcb5 +AUX pingtunnel-0.72_makefile.patch 1591 BLAKE2B 32d9a40264ce124d7b9946a9f83b6fe32ecc0c4203402e94e5c151fc132351c3cbdc7261ebdd24c9fb1939a7f773c1bcf83586dd66004d1c41c6eb141b2700d8 SHA512 5265aa2dbca662ecca54492d3cacc2ebd01b4d9d1cc9326bc7321395f26abb7dda9878f052baa33ac609cf74d0bba1299d8cef9aad37731443f291489edc6876 DIST PingTunnel-0.72.tar.gz 64188 BLAKE2B 414a7e528f66c72f878eef73a48fa0d6e7ceeae51ea2d8ff33f4a4fae61a9427f669d29e9b06f502ded96d87a3fa6680236bca7f9ce90a9a14f94583bffa0716 SHA512 943fc571ca95bb6af59f2a74458470865a89a502145bb1e5cf9b86159d61d897418d10d100691337f299892af7aba65964624462068a77ef1645890a4abf5d17 -EBUILD pingtunnel-0.72.ebuild 694 BLAKE2B f07f1d528eed77af7883f56ae6ad0654376e0ffcb2c47ef8ea65f60eebbff17106ab33400e2a7ba3e25e5f49205e2f4582c42172dd9e924eb2b47fee86af5e19 SHA512 8e4aa1740068df050fad5b7e2a44b108adeba22e25e4f23b8264f56481a48003b9f1f295baa52abff695eb01b95a9bfb8a7b9262f93edcb6be5ae40dad0bf34a +EBUILD pingtunnel-0.72.ebuild 673 BLAKE2B 6ba490c2d2df44d3753e33f663f803e984f6a2d8f2d8a53d848bb184d9d38ad5e6b5428a6364d8d315ddc107cb302f93df8ff4a76dba8628e0a6ff7ca1af0947 SHA512 3b47407afde27f870aa41adda0eb1080152b5818fc57750969ce37f2b88a2c84ec4b5fe48bb8710bd2a5d2042b6d24fef805ecb9d9983085a56e7beb9bf7e86a MISC metadata.xml 436 BLAKE2B 0d1d2604b16e91db8564f8568b49f2f103dd39746452a8d13ade27eeeb1dbc947ed98d349a72d89c41be2de2b6d321dc53603088df7d980643ac2b9ec3837519 SHA512 013ade7657982958b210224c87210ff270c2b045973b93482d1e3758ab2539b1c7cba9b8d4414cc0d86fa53f6edd6158cd28b5f60b2acb2c00d3fc0dea29a049 diff --git a/net-proxy/pingtunnel/files/pingtunnel-0.72-musl.patch b/net-proxy/pingtunnel/files/pingtunnel-0.72-musl.patch new file mode 100644 index 000000000000..cf421365917d --- /dev/null +++ b/net-proxy/pingtunnel/files/pingtunnel-0.72-musl.patch @@ -0,0 +1,10 @@ +--- a/ptunnel.h ++++ b/ptunnel.h +@@ -45,7 +45,6 @@ + + // Includes + #ifndef WIN32 +- #include <sys/unistd.h> + #include <sys/types.h> + #include <sys/socket.h> + #include <netinet/in.h> diff --git a/net-proxy/pingtunnel/files/pingtunnel-0.72_makefile.patch b/net-proxy/pingtunnel/files/pingtunnel-0.72_makefile.patch index 9dce0992cbda..27576bfd434f 100644 --- a/net-proxy/pingtunnel/files/pingtunnel-0.72_makefile.patch +++ b/net-proxy/pingtunnel/files/pingtunnel-0.72_makefile.patch @@ -1,5 +1,5 @@ ---- Makefile
-+++ Makefile
+--- a/Makefile
++++ b/Makefile
@@ -2,11 +2,26 @@
# (c) 2004-2009 Daniel Stoedle, daniels@cs.uit.no
# ptunnel.exe target added by Mike Miller, mike@mikeage.net
diff --git a/net-proxy/pingtunnel/pingtunnel-0.72.ebuild b/net-proxy/pingtunnel/pingtunnel-0.72.ebuild index 9f41ef3c3154..a9c9139962cd 100644 --- a/net-proxy/pingtunnel/pingtunnel-0.72.ebuild +++ b/net-proxy/pingtunnel/pingtunnel-0.72.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 -inherit eutils toolchain-funcs +inherit toolchain-funcs DESCRIPTION="Tunnel TCP over ICMP" HOMEPAGE="https://www.cs.uit.no/~daniels/PingTunnel" @@ -11,27 +11,26 @@ SRC_URI="https://www.cs.uit.no/~daniels/PingTunnel/PingTunnel-${PV}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64 ~arm ~ppc ~sh ~x86" -IUSE="doc selinux" +KEYWORDS="~amd64 ~arm ~ppc ~x86" +IUSE="selinux" -DEPEND=" +RDEPEND=" net-libs/libpcap - selinux? ( sys-libs/libselinux ) -" -RDEPEND="${DEPEND}" + selinux? ( sys-libs/libselinux )" +DEPEND="${RDEPEND}" S="${WORKDIR}"/PingTunnel -src_prepare() { - epatch "${FILESDIR}"/${P}_makefile.patch -} +PATCHES=( + "${FILESDIR}"/${P}_makefile.patch + "${FILESDIR}"/${P}-musl.patch +) +HTML_DOCS=( web/. ) -src_compile() { +src_configure() { tc-export CC - emake $(usex selinux "SELINUX=1" "SELINUX=0") } -src_install() { - default - use doc && dohtml web/* +src_compile() { + emake SELINUX=$(usex selinux 1 0) } |