From 6bc2e4d7c5906e46a8f275a876ead6ec41aca5bb Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 10 Feb 2019 15:40:27 +0000 Subject: gentoo resync : 10.02.2019 --- net-vpn/Manifest.gz | Bin 4543 -> 4545 bytes net-vpn/i2p/Manifest | 3 + net-vpn/i2p/files/0.9.38-add-cp-to-tests | 45 +++++++++ net-vpn/i2p/i2p-0.9.38.ebuild | 161 +++++++++++++++++++++++++++++++ net-vpn/pptpd/Manifest | 2 +- net-vpn/pptpd/metadata.xml | 4 +- 6 files changed, 212 insertions(+), 3 deletions(-) create mode 100644 net-vpn/i2p/files/0.9.38-add-cp-to-tests create mode 100644 net-vpn/i2p/i2p-0.9.38.ebuild (limited to 'net-vpn') diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz index cf93e51600a4..58c87f34859f 100644 Binary files a/net-vpn/Manifest.gz and b/net-vpn/Manifest.gz differ diff --git a/net-vpn/i2p/Manifest b/net-vpn/i2p/Manifest index e2718c93b995..cc285abbeb4b 100644 --- a/net-vpn/i2p/Manifest +++ b/net-vpn/i2p/Manifest @@ -1,8 +1,11 @@ AUX 0.9.37-add-cp-to-tests 1880 BLAKE2B bd5da44d351acbea0583a7e26ead5c898739c87fc33b949772b8fdb9415c3277913cf0e97fadf6c379e8b4cfb4d723ea7e121b6c36ed72d4cec96b8d4bbd1fbd SHA512 3afcb97ad455777d9ad1f158d9a6f0de42694dd92841dc588a4308f666a6a4810cfa3be5a1f00a730e7f15f8573e9f7a5107885561f4e7a847da017904ee37a1 +AUX 0.9.38-add-cp-to-tests 2908 BLAKE2B ab78902afe450bd4f6c5741900cf4e88c5760726b95cae4b74092104a84a05073e227d382080db6af09a96a1034d8e20ec1b4a9c9a6fa6894e7df37e9d887399 SHA512 f2725aea99a37820048cbd8af4f17fd7b3702eba5c2d2d9816bb20a531c9c643e94dd8c88a8b4cd40240ba0fbf20dd85dcb30a7f84f7bcd97dfea5420e8724ac AUX i2p.init 489 BLAKE2B f7c484713fa043f1db991e95d58f0d184c0d49062e807671f6aca2c7489ad52e072e2d0f5b6c5b666cbda77764e90da6506b7fd0f7a5b2fb34bbfc0b3c96da53 SHA512 3b9b2bce4359f0ba32f690f7922ed95ccaa133b1cff2e5a1d6bfc91a380757f79f03e8a4966259d19ec888e6db468825e6a9d0d1acdba9d38c81a86b99c4229a AUX i2p.service 253 BLAKE2B 2647a1920083fedf88b351b084d3a4d177393065da3dc7aecbeb09e1afc3373116f972c40db4500f76fe1a983ac24503d9a95ee08917ff7625946e4928449512 SHA512 59639b4f78637e5b03ed67b7e08d21bc873c844b474df3ed9101b34934a4c22aef46db1b66cbdc9aad2438ee84f130230c368a78b5bb1017843f016bba6c30e5 DIST i2psource_0.9.36.tar.bz2 29856168 BLAKE2B 0f10101b874bf6fc8415f10b08282947962a6fb8c3eaefde67d3f250d65a159551c24038625aa6712e88b368ccae38d136314025ac19fcb9dd9145251283b357 SHA512 e9023cae1c7dbdd92c9c4823497dfa8497cee3683de1232deddbdc548ba08edefe218bd81e00e952d8a95037c32de8359daaf43c2d5f25c75aba65554d2d47b4 DIST i2psource_0.9.37.tar.bz2 30277506 BLAKE2B 2c0fe601b3a8967c23f00bd29aef197389039efbf1a3fc0847f819dea44f98e38b9b53b749763dccca740a50d467d5d079b0e4aad707347cc7c7a576fcc44407 SHA512 ce0d320810faaebe2926d988a40f4df968583edbc488b995a32cfd806550a8cf75d2c2397bfd9f3fd443cb462567cc2cdbf08d1de59b6806888724254faebf09 +DIST i2psource_0.9.38.tar.bz2 30702106 BLAKE2B c0fd4ea21643edff06853825b9b09dbd648176b6a2318c6bb3846b7c198cac88f89525df0868affbc337e31ec3459f08235cd8a52d38b8551d235c9ef2ca4a4c SHA512 148cd1504dbf0a86367b6dc120a27b2d0d936857eb8cf524e86982d6499c5a831a40aacb3ed67570ad2c323be6545e9a66c12dfc4be2377b80f4d7152e04452d EBUILD i2p-0.9.36.ebuild 4184 BLAKE2B 58fcad81d8247848e26af7881178618720778af04d513d972e4e894eeb37509cef7c09840bc075fe81b6de77ba33609d1bea73675cbc1ef2fd5cfa3dd3e82864 SHA512 46e4e100d34e65d11383a0e731788866e9c77137050c95c02869ebf4ae1db098bcaa9f1c31adc549ff3c6b02b667d257ea560fa62e90ea2214efac7e715ef1bf EBUILD i2p-0.9.37.ebuild 5212 BLAKE2B d7851583229df8021448749324ffe3927ca843ac59fc97ced69adeafed513a9c75be89346ff8f8353c0df02f963e06788e2653e2a3853aebea7604653ed33b08 SHA512 e6aaa547eb6039804b8af5c17fa35e532f303d54bfbcd5d3c25ba17b53cc390b1f7e87e257ea55e2311d2bc4cc2985a77401db44a7a4a3ea47cd6e64386c0341 +EBUILD i2p-0.9.38.ebuild 4618 BLAKE2B 35befafb709b7d61ea4e0c9ec69ef5412703ac659e298ac2568a6995109f1a0741695deafa34ec828f1fb2ccc90c27dbb9ae4e3e85b10a2ae44c00a7c4398fbd SHA512 2c7fe6101d65197b72ff1516802431731ccf0c83169e93de85e5458bfd668ff6353080c6ab2cb18945198ebca358769a1856cf4489e0e72bff70a21f2a59cdd2 MISC metadata.xml 904 BLAKE2B cc55ce0d1f0cd042997b30a12405ad9e4f0e7e63926c8bc5409dae47d2f0aa37fd141ce8dd436abeb0b417b04484b7bc0155b075899c8127d424301b1af2913b SHA512 195b17fe2bedf530b32ef031b92044d9adf7c1e43d7ba067301bb02d716c9a9836c105663083aad79353afc9938cca1359dc57409adae809e12c8e2f260240c2 diff --git a/net-vpn/i2p/files/0.9.38-add-cp-to-tests b/net-vpn/i2p/files/0.9.38-add-cp-to-tests new file mode 100644 index 000000000000..ddf2f7d5fcae --- /dev/null +++ b/net-vpn/i2p/files/0.9.38-add-cp-to-tests @@ -0,0 +1,45 @@ +diff -Naur a/apps/ministreaming/java/build.xml b/apps/ministreaming/java/build.xml +--- a/apps/ministreaming/java/build.xml 2019-01-30 13:31:14.958832623 +0100 ++++ b/apps/ministreaming/java/build.xml 2019-01-30 13:39:00.050869739 +0100 +@@ -173,7 +173,7 @@ + + + +- ++ + + + +diff -Naur a/apps/streaming/java/build.xml b/apps/streaming/java/build.xml +--- a/apps/streaming/java/build.xml 2019-01-30 13:31:14.953832622 +0100 ++++ b/apps/streaming/java/build.xml 2019-01-30 13:38:56.683869470 +0100 +@@ -49,7 +49,7 @@ + + + +- ++ + + + +diff -Naur a/router/java/build.xml b/router/java/build.xml +--- a/router/java/build.xml 2019-01-30 13:31:22.905833257 +0100 ++++ b/router/java/build.xml 2019-01-30 13:39:04.133870065 +0100 +@@ -130,7 +130,7 @@ + + + +- ++ + + + +@@ -148,7 +148,7 @@ + + + +- ++ + + + diff --git a/net-vpn/i2p/i2p-0.9.38.ebuild b/net-vpn/i2p/i2p-0.9.38.ebuild new file mode 100644 index 000000000000..396878e979b4 --- /dev/null +++ b/net-vpn/i2p/i2p-0.9.38.ebuild @@ -0,0 +1,161 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" + +inherit java-pkg-2 java-ant-2 systemd user + +DESCRIPTION="A privacy-centric, anonymous network" +HOMEPAGE="https://geti2p.net" +SRC_URI="https://download.i2p2.de/releases/${PV}/i2psource_${PV}.tar.bz2" + +LICENSE="Apache-2.0 Artistic BSD CC-BY-2.5 CC-BY-3.0 CC-BY-SA-3.0 EPL-1.0 GPL-2 GPL-3 LGPL-2.1 LGPL-3 MIT public-domain WTFPL-2" +SLOT="0" + +# Until the deps reach other arches +KEYWORDS="~amd64 ~x86" +IUSE='nls test' + +# dev-java/ant-core is automatically added due to java-ant-2.eclass +CP_DEPEND='dev-java/bcprov:1.50 + dev-java/jrobin:0 + dev-java/slf4j-api:0 + dev-java/tomcat-jstl-impl:0 + dev-java/tomcat-jstl-spec:0 + dev-java/java-service-wrapper:0 + dev-java/commons-logging:0 + dev-java/slf4j-simple:0 + java-virtuals/servlet-api:3.1 +' + +DEPEND="${CP_DEPEND} + dev-java/eclipse-ecj:* + nls? ( >=sys-devel/gettext-0.19 ) + virtual/jdk:1.8 + test? ( + dev-java/ant-junit4:0 + dev-java/hamcrest-core:1.3 + dev-java/hamcrest-library:1.3 + dev-java/junit:4 + ) +" + +RDEPEND="${CP_DEPEND} + virtual/jre:1.8 + net-libs/nativebiginteger:0 +" + +EANT_BUILD_TARGET="pkg" +# no scala as depending on antlib.xml not installed by dev-lang/scala +EANT_TEST_TARGET='junit.test' +JAVA_ANT_ENCODING="UTF-8" + +PATCHES=( + "${FILESDIR}/${PV}-add-cp-to-tests" +) + +pkg_setup() { + java-pkg-2_pkg_setup + + enewgroup i2p + enewuser i2p -1 -1 "${EPREFIX}/var/lib/i2p" i2p +} + +src_prepare() { + # as early as possible to allow generic patches to be applied + default + + java-ant_rewrite-classpath + + java-pkg-2_src_prepare + + # We're on GNU/Linux, we don't need .exe files + echo "noExe=true" > override.properties || die + if ! use nls; then + echo "require.gettext=false" >> override.properties || die + fi + + # avoid auto starting browser + sed -i 's|clientApp.4.startOnLoad=true|clientApp.4.startOnLoad=false|' \ + 'installer/resources/clients.config' || die + + # generate wrapper classpath, keeping the default to be replaced later + i2p_cp='' # global forced by java-pkg_gen-cp + java-pkg_gen-cp i2p_cp + local lib cp i=2 + for lib in ${i2p_cp//,/ } + do + cp+="wrapper.java.classpath.$((i++))=$(java-pkg_getjars ${lib})\n" + done + + # add generated cp and hardcode system VM + sed -e "s|\(wrapper\.java\.classpath\.1=.*\)|\1\n${cp}|" \ + -e "s|\(wrapper\.java\.command\)=.*|\1=/etc/java-config-2/current-system-vm/bin/java|" \ + -e "s|\(wrapper\.java\.library\.path\.1\)=.*|\1=/usr/lib/java-service-wrapper|" \ + -e "s|\(wrapper\.java\.library\.path\.2\)=.*|\0\nwrapper.java.library.path.3=/usr/$(get_libdir)|" \ + -i 'installer/resources/wrapper.config' || die + + # replace paths as the installer would + sed -e "s|[\$%]INSTALL_PATH|${EPREFIX}/usr/share/i2p|" \ + -e "s|%SYSTEM_java_io_tmpdir|${EPREFIX}/var/lib/i2p/.i2p|" \ + -e "s|%USER_HOME|${EPREFIX}/var/lib/i2p|" \ + -i 'installer/resources/'{eepget,runplain.sh,wrapper.config} || die + + if use test; then + # no *streaming as requiring >dev-java/mockito-1.9.5 + sed -e '/junit\.test.*streaming/d' \ + -i build.xml || + die 'unable to remove ministreaming tests' + fi +} + +src_test() { + # store built version of jars, overwritten by testing + mv "${S}/pkg-temp/lib/"{i2p,router}.jar "${T}" || + die 'unable to save jars before tests' + + # generate test classpath + local cp + cp="$(java-pkg_getjars --build-only junit-4,hamcrest-core-1.3,hamcrest-library-1.3)" + EANT_TEST_EXTRA_ARGS="-Djavac.classpath=${cp}" java-pkg-2_src_test + + # redo work undone by testing + mv "${T}/"{i2p,router}.jar "${S}/pkg-temp/lib/" || + die 'unable to restore jars after tests' +} + +src_install() { + # cd into pkg-temp. + cd "${S}/pkg-temp" || die + + # we remove system installed jar and install the others + rm lib/{jrobin,wrapper,jbigi,commons-logging,javax.servlet}.jar || \ + die 'unable to remove locally built jar already found in system' + java-pkg_dojar lib/*.jar + + # create own launcher + java-pkg_dolauncher eepget --main net.i2p.util.EepGet --jar i2p.jar + + # Install main files and basic documentation + insinto '/usr/share/i2p' + doins blocklist.txt hosts.txt *.config + dodoc history.txt INSTALL-headless.txt LICENSE.txt + doman man/* + + # Install other directories + doins -r certificates docs eepsite geoip scripts + java-pkg_dowar webapps/*.war + + # Install daemon files + newinitd "${FILESDIR}/i2p.init" i2p + systemd_dounit "${FILESDIR}/i2p.service" + + # setup user + keepdir '/var/lib/i2p/.i2p' + fowners i2p:i2p '/var/lib/i2p/.i2p' +} + +pkg_postinst() { + elog "Custom configuration belongs in ${EPREFIX}/var/lib/i2p/.i2p to avoid being overwritten." + elog 'I2P can be configured through the web interface at http://localhost:7657/console' +} diff --git a/net-vpn/pptpd/Manifest b/net-vpn/pptpd/Manifest index e41d1f4ce45c..4606eb4a3dfa 100644 --- a/net-vpn/pptpd/Manifest +++ b/net-vpn/pptpd/Manifest @@ -5,4 +5,4 @@ AUX pptpd-confd 131 BLAKE2B b1cf43035bb96859e3f69ad2ba8d161fd5e7c98370f407767a74 AUX pptpd-init-r2 325 BLAKE2B 492d4a17910fd45475337376570e23b2193f0b5471e82a575465eb139a9cf0f9296388962e3dc2584784a4be6aac17edf4da67410ca422498a2f3c39c9baba43 SHA512 5eb0839310b6897aeb5ef067f3bbccc3f302f9d5375fea9c2cf405a6e823560a776a96fa0189b4c9adf1744651a35a41d4fcafc3f9e1ebf5ddeb5d88bece9678 DIST pptpd-1.4.0.tar.gz 252167 BLAKE2B c7fa9397c0a1b7c1ae5f22f9d7f85ba1bb60966984506f7b7c7b4f5dce69efa717f41e8d9a717e4c6f482d2d3e4052611709e0b825a2fcc63fabf19a53a550f0 SHA512 cfb4caef3025c0721e7fabf8b7bf595739f2d3048555b30616cdadc37e70ba9e1c50561c25091dd617b5448da2816aeaf83aea0fc2ef6b0dd5e3fe35d9591484 EBUILD pptpd-1.4.0-r2.ebuild 1920 BLAKE2B d4931b2e8e623ee4218af5f64abd6ecdc9f5d83096212ae49f38be67a6716117a6407421799c0a188fe415d677bb98d600ba249936a64404bf633492b7f71f50 SHA512 803829744f54b0d4f16866414c2196d02e064d15f2060e1ba61f9fccf86bb777b0fa9b5fd662975960cf8a95b9c94913db7acf35bfa3168350db0a13541358ba -MISC metadata.xml 469 BLAKE2B 81a9a224568517f6b052b8796deb2b126617de6af612c04f10c6cdf310c690019097d73244b84ef9b36ffa0c195fe5a9327b9d3a4fe58386c62ef97ee7f1573c SHA512 c4a5aa89a09126dd523bb230a29c8aec9816f734903da555ac8193a82e359d09a9237d1a82f0355a63daea56f7239919b61706c9d7e333bdba5f6e69cc007a04 +MISC metadata.xml 468 BLAKE2B e988e5026cb8d530a6930e69359587600af78e252ac37a2a7088d43f92c2241c8e3e67a33d79c5213747cf88d1264045ec4c7783a2929a732571b89c9c40f97e SHA512 bc1558cbea7a1a7157bb339f1285e141607182f21c53fa5f7da35a9ce43c12d508650f9f75058a2e1514ae67f3fe60ee77d8e99463b18e4bd108d3e8c9b6d4d5 diff --git a/net-vpn/pptpd/metadata.xml b/net-vpn/pptpd/metadata.xml index 32a22c503fb9..8f69579af46a 100644 --- a/net-vpn/pptpd/metadata.xml +++ b/net-vpn/pptpd/metadata.xml @@ -6,8 +6,8 @@ Sergey Popov - Log all GRE accepted packages when in debug - mode (required if you want upstream support) + Log all GRE accepted packets when in + debug mode (required if you want upstream support) poptop -- cgit v1.2.3