From 1db00cc6e94b90c08090bb5b8c406622946c4ae5 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 31 Jan 2019 16:00:27 +0000 Subject: gentoo resync 31.01.2019 --- net-irc/Manifest.gz | Bin 9159 -> 9168 bytes net-irc/epic5/Manifest | 3 + net-irc/epic5/epic5-2.0.1.ebuild | 71 ++++++++ net-irc/epic5/files/epic5-2.0.1-openssl-1.1.patch | 77 +++++++++ net-irc/iroffer-dinoex/Manifest | 7 +- .../files/iroffer-dinoex-3.31-config.patch | 167 +++++++++++++++++++ net-irc/iroffer-dinoex/iroffer-dinoex-3.29.ebuild | 119 -------------- .../iroffer-dinoex/iroffer-dinoex-3.30-r1.ebuild | 4 +- net-irc/iroffer-dinoex/iroffer-dinoex-3.31.ebuild | 121 ++++++++++++++ net-irc/znc/Manifest | 5 +- net-irc/znc/znc-1.7.2.ebuild | 182 +++++++++++++++++++++ net-irc/znc/znc-9999.ebuild | 14 +- 12 files changed, 638 insertions(+), 132 deletions(-) create mode 100644 net-irc/epic5/epic5-2.0.1.ebuild create mode 100644 net-irc/epic5/files/epic5-2.0.1-openssl-1.1.patch create mode 100644 net-irc/iroffer-dinoex/files/iroffer-dinoex-3.31-config.patch delete mode 100644 net-irc/iroffer-dinoex/iroffer-dinoex-3.29.ebuild create mode 100644 net-irc/iroffer-dinoex/iroffer-dinoex-3.31.ebuild create mode 100644 net-irc/znc/znc-1.7.2.ebuild (limited to 'net-irc') diff --git a/net-irc/Manifest.gz b/net-irc/Manifest.gz index cd28c984fd9a..f6aef9b46ef0 100644 Binary files a/net-irc/Manifest.gz and b/net-irc/Manifest.gz differ diff --git a/net-irc/epic5/Manifest b/net-irc/epic5/Manifest index 131c2807fe6f..22bff18fcacc 100644 --- a/net-irc/epic5/Manifest +++ b/net-irc/epic5/Manifest @@ -5,6 +5,9 @@ AUX epic5-1.1.10-without-localdir.patch 1780 BLAKE2B 97b29e5c3efd4f9048db52f501a AUX epic5-1.1.10-xlocale.patch 350 BLAKE2B 4c2fe87d2bd42bee7cea05ab3426403836bb43a8136ee49f62ffdce3efc40690300a024b46f502a820cc1945577641afe25fab154f2c5393556caedaad360a04 SHA512 bb04eb98d4ce1c4f1b02d7572ad6722e6ad90ab68b4d22319a2285888c039cbc51e837193f78a93fb59c2c2caceb8fcb11d1e6125a4bc4432eddc98ee9c3ba55 AUX epic5-1.1.2-libarchive-automagic.patch 1707 BLAKE2B 94eb0be15058b7ce86fe6500337477729ab2b4ab792d8c100c941c1fd9ff8ff96982616c539ae41bda111b08c1792478e4f47e2ec44e6e84d800e5b5d3ee7fd9 SHA512 6f438cc70982538e09d9a0eef7e2c42c331aa73c279157d4bd44b48c6aea26b08b9433927a51fef025acf22bfeec330c4c99946538eae5dca50360963e5f828c AUX epic5-1.1.2-perl-automagic-as-needed.patch 3123 BLAKE2B b104b7ab792010e0113e8f4ef378a53dac2f64182e7045866e3d57176427a735ded0b3a3b7975fab892dfa77692589e7324c927206dfb7a636d7f9ad69950f90 SHA512 bd58fa5b49b0b9c900612d1183d696e6683113420f79702df0706a3bd3885bc6215a178a11ca9dff8c9337314cf72488b85217d731b162dea95f4c8e22d50a6c +AUX epic5-2.0.1-openssl-1.1.patch 2817 BLAKE2B f3ed4fa602b174f41700fdf5fcddb8a20626637fb5e416b82fd1e1216a846987a3afcf3fffd73317a6e2090e49b0fe3b1777ee4e870f597ca981be078c4e3c0e SHA512 af1f822f1660bc7528beef26b991a69896d0e94005aacd412256a5f8789024bfba6eec169d2115c626a70c0e89cc6625999c7b939390742aef932f1020e4fdad DIST epic5-1.1.10.tar.bz2 851439 BLAKE2B 13cf0f78ed2009595479fac8173b2936cf74382ec22964e00de2d84fd89c6cee661e4ea9e3d8ba44ec715ac7e861f4639b3459d3ac2d67c74cc49ad4aeebf127 SHA512 d0215570962253a0d5c60dacec86db1094575b0765db039247cf16b5957ba721576618ff73588610ba528782f4460fd4bbe5a1869e60e2c10d832d41ea3c6048 +DIST epic5-2.0.1.tar.xz 808612 BLAKE2B 48bc1305f955f524e26b5a2122f061b0251b874ad102e3a95c65b15646f7d5c95f661bdbac3e6ea118ce5d5b5e3ca58a94cfce288ee32c7483ea6dc1b6d24950 SHA512 29721cb097946fae3d64f71be4047f8348f7821ccdea870b4c756098f07adee90f03decb2f37fc5fa5c7c9d1aac5a16f4944adc9c9bc66097ceb609c69da2e25 EBUILD epic5-1.1.10-r2.ebuild 1849 BLAKE2B e8567259e61a5e33fb1930296900cad6ac23c82f1b099fec405cd5b3295ad72663547da7553ecad9996a1846ccb337c41068d3b609fa324fbf6a8f138531a751 SHA512 86703fe7e6f5eada432846b7cacde9a300a5f7ca008a2708e0a531e6797ac1a330987bd0484e133e0608858f97776f983c1b2a7e7a646f0c203e207186d51cae +EBUILD epic5-2.0.1.ebuild 1564 BLAKE2B 0b0306d8f7f9276367844d986cedf578b25c882d606de7b697c90e19ac83d233bfe9aafafb9eded723a08a0e96d95296c77d51a1414aab1c45a04fea1dbf0f7b SHA512 e9809cd9a8a189b3166beca5511c3acfdd2e59ee1fdefbb50973120a62f714682e71a13be45bbfe1b92e1d57ed83a8b53e6efafa85939ccbdcc57741a2b4dbab MISC metadata.xml 447 BLAKE2B f5ff4e910d6fd13784c843496888c28eac53df6973350b2839f581f07740f4a8cf03ea71d53e5ed11d5531d6512abb9a4727843094870c7ce5fae5dd90ccf38f SHA512 a3f99db42705f69febe961e85d76a3c4686918e253fc1c979941daa135ae65d920ad5127a4ea6ad9a8628df405ef937731168eb47b7a69fb92131d4ce703947a diff --git a/net-irc/epic5/epic5-2.0.1.ebuild b/net-irc/epic5/epic5-2.0.1.ebuild new file mode 100644 index 000000000000..e5ebd880946e --- /dev/null +++ b/net-irc/epic5/epic5-2.0.1.ebuild @@ -0,0 +1,71 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +USE_RUBY="ruby23 ruby24" + +inherit autotools ruby-single toolchain-funcs + +DESCRIPTION="Epic5 IRC Client" +SRC_URI="ftp://ftp.epicsol.org/pub/epic/EPIC5-PRODUCTION/${P}.tar.xz" +HOMEPAGE="http://epicsol.org/" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" + +# Fails to build without ipv6 +IUSE="archive perl tcl ruby socks5 valgrind" #ipv6 + +RDEPEND=" + >=dev-libs/openssl-0.9.8e-r3:0= + >=sys-libs/ncurses-5.6-r2:0= + virtual/libiconv + archive? ( app-arch/libarchive ) + perl? ( >=dev-lang/perl-5.8.8-r2:= ) + tcl? ( dev-lang/tcl:0= ) + socks5? ( net-proxy/dante ) + ruby? ( ${RUBY_DEPS} ) +" +DEPEND="${RDEPEND} + valgrind? ( dev-util/valgrind ) +" + +S="${WORKDIR}/${P}" + +PATCHES=( + # From Debian + "${FILESDIR}/${P}-openssl-1.1.patch" +) + +src_configure() { + # Because of our REQUIRED_USE constraints above, we know that + # ruby_get_use_implementations will only ever return one ruby + # implementation. + econf \ + --libexecdir="${EPREFIX}"/usr/lib/misc \ + --with-ipv6 \ + $(use_with archive libarchive) \ + $(use_with perl) \ + $(use_with ruby) \ + $(use_with socks5) \ + $(use_with tcl tcl "${EPREFIX}"/usr/$(get_libdir)/tclConfig.sh) \ + $(use_with valgrind valgrind) +} + +src_compile() { + # parallel build failure + emake -j1 +} + +src_install () { + default + + dodoc BUG_FORM COPYRIGHT EPIC4-USERS-README README KNOWNBUGS VOTES + + cd "${S}"/doc || die + docinto doc + dodoc \ + *.txt colors EPIC* IRCII_VERSIONS missing \ + nicknames outputhelp README.SSL SILLINESS TS4 +} diff --git a/net-irc/epic5/files/epic5-2.0.1-openssl-1.1.patch b/net-irc/epic5/files/epic5-2.0.1-openssl-1.1.patch new file mode 100644 index 000000000000..254035e6d385 --- /dev/null +++ b/net-irc/epic5/files/epic5-2.0.1-openssl-1.1.patch @@ -0,0 +1,77 @@ +Index: epic5-2.0/source/crypto.c +=================================================================== +--- epic5-2.0.orig/source/crypto.c ++++ epic5-2.0/source/crypto.c +@@ -282,9 +282,9 @@ static char * decipher_evp (const unsign + unsigned char *iv = NULL; + unsigned long errcode; + int outlen2; +- EVP_CIPHER_CTX a; +- EVP_CIPHER_CTX_init(&a); +- EVP_CIPHER_CTX_set_padding(&a, 0); ++ EVP_CIPHER_CTX *a = EVP_CIPHER_CTX_new(); ++ EVP_CIPHER_CTX_init(a); ++ EVP_CIPHER_CTX_set_padding(a, 0); + + if (ivsize > 0) + iv = new_malloc(ivsize); +@@ -292,18 +292,19 @@ static char * decipher_evp (const unsign + if (ivsize > 0) + memcpy(iv, ciphertext, ivsize); + +- EVP_DecryptInit_ex(&a, type, NULL, NULL, iv); +- EVP_CIPHER_CTX_set_key_length(&a, passwdlen); +- EVP_CIPHER_CTX_set_padding(&a, 0); +- EVP_DecryptInit_ex(&a, NULL, NULL, passwd, NULL); ++ EVP_DecryptInit_ex(a, type, NULL, NULL, iv); ++ EVP_CIPHER_CTX_set_key_length(a, passwdlen); ++ EVP_CIPHER_CTX_set_padding(a, 0); ++ EVP_DecryptInit_ex(a, NULL, NULL, passwd, NULL); + +- if (EVP_DecryptUpdate(&a, outbuf, outlen, ciphertext, cipherlen) != 1) ++ if (EVP_DecryptUpdate(a, outbuf, outlen, ciphertext, cipherlen) != 1) + yell("EVP_DecryptUpdate died."); +- if (EVP_DecryptFinal_ex(&a, outbuf + (*outlen), &outlen2) != 1) ++ if (EVP_DecryptFinal_ex(a, outbuf + (*outlen), &outlen2) != 1) + yell("EVP_DecryptFinal_Ex died."); + *outlen += outlen2; + +- EVP_CIPHER_CTX_cleanup(&a); ++ EVP_CIPHER_CTX_cleanup(a); ++ EVP_CIPHER_CTX_free(a); + + ERR_load_crypto_strings(); + while ((errcode = ERR_get_error())) +@@ -454,9 +455,9 @@ static char * cipher_evp (const unsigned + unsigned long errcode; + u_32int_t randomval; + int iv_count; +- EVP_CIPHER_CTX a; +- EVP_CIPHER_CTX_init(&a); +- EVP_CIPHER_CTX_set_padding(&a, 0); ++ EVP_CIPHER_CTX *a = EVP_CIPHER_CTX_new(); ++ EVP_CIPHER_CTX_init(a); ++ EVP_CIPHER_CTX_set_padding(a, 0); + + if (ivsize < 0) + ivsize = 0; /* Shenanigans! */ +@@ -480,12 +481,13 @@ static char * cipher_evp (const unsigned + if (iv) + memcpy(outbuf, iv, ivsize); + +- EVP_EncryptInit_ex(&a, type, NULL, NULL, iv); +- EVP_CIPHER_CTX_set_key_length(&a, passwdlen); +- EVP_EncryptInit_ex(&a, NULL, NULL, passwd, NULL); +- EVP_EncryptUpdate(&a, outbuf + ivsize, &outlen, plaintext, plaintextlen); +- EVP_EncryptFinal_ex(&a, outbuf + ivsize + outlen, &extralen); +- EVP_CIPHER_CTX_cleanup(&a); ++ EVP_EncryptInit_ex(a, type, NULL, NULL, iv); ++ EVP_CIPHER_CTX_set_key_length(a, passwdlen); ++ EVP_EncryptInit_ex(a, NULL, NULL, passwd, NULL); ++ EVP_EncryptUpdate(a, outbuf + ivsize, &outlen, plaintext, plaintextlen); ++ EVP_EncryptFinal_ex(a, outbuf + ivsize + outlen, &extralen); ++ EVP_CIPHER_CTX_cleanup(a); ++ EVP_CIPHER_CTX_free(a); + outlen += extralen; + + ERR_load_crypto_strings(); diff --git a/net-irc/iroffer-dinoex/Manifest b/net-irc/iroffer-dinoex/Manifest index 60987e87e5c1..7c12bd8f173a 100644 --- a/net-irc/iroffer-dinoex/Manifest +++ b/net-irc/iroffer-dinoex/Manifest @@ -1,10 +1,11 @@ AUX iroffer-dinoex-3.29-config.patch 7014 BLAKE2B 69a79b55922735e51622f8df9cd2a9c3601362ba0f54d9ba4e6b28c134a9d23e0186c3dca99aa2be055ad958be56681f370b92d43763e3a2aba10629be8d3f35 SHA512 dfb8930341ba93dfec9d29fa5ddb1d457d055e27c74d2dbfba197a17b16685810bf63dceeb19dc6182f8d8086825741cb5e87f952837265084acea0266e0f2e8 +AUX iroffer-dinoex-3.31-config.patch 8156 BLAKE2B cf247efbcc6f5d8742af3b236615c9ffe33c6f5d51e8fd42c7809c917af7fe4bdd13ae45a4bf46e43db1e304d952e24267640194375679df192392c350902b2c SHA512 26df67f9c64e15cc2762f214a20a05e1458c6b7d1ebb5fc92e17eb77f2bf005fdbadb4412d634f6f89fd1994020f3a7d0877745995900c59e8aed18d525b2a82 AUX iroffer-dinoex-Werror.patch 502 BLAKE2B d93cb7c5643357f2ffc208f2a169aa0cbf652f9295664e5bae780dba3cd3b3f30780dc53568ec13aea0d733a5a58b4deaee08ef5d91ce1362caa18e33c063c11 SHA512 dc0c88d85943421f5c8998b0080b41585f4ca2513bd554709110d2bef31d7b6f59fc558124974b1255ca97c1edd86bb656c495cabac0fb5c9115cb52033aa7eb AUX iroffer-dinoex.conf 378 BLAKE2B 802cb152669d41a081d3400bad38da39fc73f083dc0ea5528861cb15581a2f62341fe1085c247b04f70e82943226895d8677013ae0900b6f50129702552468e2 SHA512 6dee05c4fdc5d8e62c9ac76406a7e85f1e944bb2b1f82237422f01002c6adceaf4f05073c3e378e3f61000652814292639640e1dcc2a0dbcd2bd68a76687d634 AUX iroffer-dinoex.init 1130 BLAKE2B ccd6615cd7c5c61532ccad49f5b69d5d6049d01af958b76a1c2e4f0588939d59b24fec040a6f74f961fb1f7d2b8c4a4adf5898fcb2137f741bfb9c27c1d7cfc7 SHA512 5fdae78dac704cfc8594fff417e0d223069d2a3f33536043550aef4f7143a3cdb69e6ae102d21cd14b97e3ccf61c6d1c11fbb3a87c3e1a1096fa40e36a1c772a AUX iroffer-dinoex.logrotate 173 BLAKE2B 855d14769a53f81135a2de494b90eeadbe487a9f9f29d45fe948b88b9798baf81a5832e8a89cc477826c6c51d7dde0459ab3d97249eb91d434f5b4c0686c0720 SHA512 6eb9a7f1949720a7d1544b90a22a190ad868b77d3ed604c5ec3acdc62e5711353d84a8e10dbfa332c4ceab13fedc3fa06d1679ce95d4612443a055f04f310015 -DIST iroffer-dinoex-3.29.tar.gz 537027 BLAKE2B f6dddd60b5e4e837cfb56c450ee32249607375a386f9215a9a4eb34e7696c066b6c817ae956c044bbc208f69a73967df5aee9835b2a94ca70a849045ff11f37d SHA512 bac4feaa0db11de3faed0beb7302cb090d3a6629a6c299bd1b4ee136bce7290f1a9fa998aab909f1fafe54f5577bed90f487d4b2592521a87d5d9ae7512eecb0 DIST iroffer-dinoex-3.30.tar.gz 541131 BLAKE2B ea61113dffcd14b162153aa03c55a203d8ccd99e8f81de53a9ab8543bd91e948509281f753a8f332445eec102b6bd2b51972ff8bedb8b574b55b9325f6969269 SHA512 e45dc3dd901cbb73a9d59cd5a672834c7b6527864eb3385121856af562680a0f91e8846e8690fc60a6349dc4c4fc1cf190d3ac01813c6c045ef18147d61b7d4d -EBUILD iroffer-dinoex-3.29.ebuild 2646 BLAKE2B b3db2502ebb186836894b1c8bf2083792623c0f6d2009241e432bb33ac0fc3716e684e44dcd4a7c9012989576d9667a14e4ef3631142a65a79af6bd5d602d76f SHA512 d47ffa947ae63147ce8939ce99f63114f9593b32f23d3a34d0ba3567bee14bb3d2ebcd14ae608fc0c841cc88d38abe7c2e57a06a54da0fbb3befd38af32b859e -EBUILD iroffer-dinoex-3.30-r1.ebuild 2652 BLAKE2B 9db4a9b6d065944b9c31270ce08978a55d5c81ffab32af174d68ed30bb1b7adbb544050ea5293443f3e325a7f98a98240f0fe1e6e6e7f3643272cb9cf5c99070 SHA512 034712d52f4a3c2cb0e1772e72de392d95cebfbe9071f5d77cde1c1119573db13d663c4c9f495b474194014b0460d36574de46f1e8ae1636b87dd48b5fe82794 +DIST iroffer-dinoex-3.31.tar.gz 527712 BLAKE2B 8e57058af9aad9537d29a15140ab59c921d2549eb9e7a2ce9145fc1c27a4307bea882927012b04fc9f0737a8853d927c79cc0f3156dfa311072c59589fe0221f SHA512 677aa03a33b99d8062db077bba47fb18b2e9279243691981bbd09cb2859fcb4792e1383225b9698edb23370ce0f60667a09480644d31171e9a8234d80052dd80 +EBUILD iroffer-dinoex-3.30-r1.ebuild 2647 BLAKE2B ae818ddc5a50a966f11f2f2dc3c7739c51b55d29696a233218244fcaaa4d3ada55df7e749533e822906a6bf16f4260372498dad0164ddf002ce10b8542d0e79a SHA512 d2c1d4e8f8722370ab39d7cb1f6bbbdadd814d77749286a0bba319a964fded40bd30c40f2ed8358e0efd869b486e25209fb69262920755f0981c8efbda650deb +EBUILD iroffer-dinoex-3.31.ebuild 2643 BLAKE2B ced2cc3022631d6778be5475c462977d3ee4a33656a1c35bb9c48d00f00cadcb80d48ac80a94a84b8374640719d0656e61d46849345e8f55376365d2d6e426fd SHA512 89f845c2b5c476c31b95cb31deae000df859db33f7c3bec598b89f831eb3439560f7bf7dfc4744f5c7c9a40e986544ef1722347205a414578cbc3470938d1128 MISC metadata.xml 795 BLAKE2B a6290795083bbd2c847fce5f5fb16c0cdc65f459642dec45f0be9f364a3c2d61579fb96ad0c5ee72c255a02d5ab2f32257ec669cbdaa7304d83830fcfcd083b4 SHA512 9e0690f67c3039e88a122fc149049bbb604958d3f5a4d07fe80b67845a7e8005f79901ade56ab4e55ffab885d3fefb1aac16419b4c56c206479f9e97edf062b3 diff --git a/net-irc/iroffer-dinoex/files/iroffer-dinoex-3.31-config.patch b/net-irc/iroffer-dinoex/files/iroffer-dinoex-3.31-config.patch new file mode 100644 index 000000000000..d2000ddfdce7 --- /dev/null +++ b/net-irc/iroffer-dinoex/files/iroffer-dinoex-3.31-config.patch @@ -0,0 +1,167 @@ +From 789499722508f641c7a1b6ce8857832fd9ae2c08 Mon Sep 17 00:00:00 2001 +From: Mikle Kolyada +Date: Fri, 25 Jan 2019 11:47:45 +0300 +Subject: [PATCH] fix config files paths + +--- + beispiel.config | 12 ++++++------ + exemple.config | 12 ++++++------ + sample.config | 12 ++++++------ + 3 files changed, 18 insertions(+), 18 deletions(-) + +diff --git a/beispiel.config b/beispiel.config +index 90f76e8..a7f4d06 100644 +--- a/beispiel.config ++++ b/beispiel.config +@@ -15,19 +15,19 @@ + ############################################################################## + ### - pid file - ### + ### Schreibt die Prozess-ID beim Start in diese Datei ### +-pidfile mybot.pid ++pidfile /var/run/iroffer-dinoex/iroffer-dinoex.pid + + ############################################################################## + ### - log file - ### + ### logfile gibt die Logdatei für den Bot an. ### +-logfile mybot.log ++logfile /var/log/iroffer-dinoex/mybot.log + + ############################################################################## + ### - log rotate - ### + ### logrotate gibt den Zeitraum vor, nach dem die Logdatei gewechselt ### + ### wird, mögliche Werte "none" (nie), "monthly" (monatlich), ### + ### "weekly" (wöchentlich), "daily" (täglich) und 1-24 (stündlich). ### +-logrotate weekly ++logrotate none + + ############################################################################## + ### - expire logfiles - ### +@@ -41,14 +41,14 @@ logrotate weekly + ### Ist logstats aktiviert so schreit der Bot statistische Informationen ### + ### in die Logdatei und meldet diese auch an einen eventuell aktiven ### + ### DCC-Chat. Mögliche Werte yes (ja) und no (nein). ### +-logstats yes ++logstats no + + ############################################################################## + ### - state file - ### + ### Diese Datei dient als allgemeines Datenlager für die bereitgestellten ### + ### Dateien und die dazugehörigen statistische Daten. Hier werden auch die ### + ### Beschreibungen der Pakete gespeichert. ### +-statefile mybot.state ++statefile /var/lib/iroffer-dinoex/mybot.state + + ############################################################################## + ### - old state file - ### +@@ -74,7 +74,7 @@ statefile mybot.state + ### als Packliste auf einer Webseite zu dienen, oder für andere Zwecke. ### + ### Wenn xdcclistfileraw gesetzt ist, werden die IRC-Farbcode auch mit ### + ### ausgegeben. ### +-xdcclistfile mybot.txt ++xdcclistfile /var/lib/iroffer-dinoex/mybot.txt + #xdcclistfileraw + + ############################################################################## +diff --git a/exemple.config b/exemple.config +index 566ffe3..8c4130e 100644 +--- a/exemple.config ++++ b/exemple.config +@@ -15,18 +15,18 @@ + ############################################################################## + ### - pid file - ### + ### Écrit l'identifiant du processus dans ce fichier au lancement. ### +-pidfile monbot.pid ++pidfile /var/run/iroffer-dinoex/iroffer-dinoex.pid + + ############################################################################## + ### - log file - ### + ### Écrit le journal du robot dans ce fichier. ### +-logfile monbot.log ++logfile /var/log/iroffer-dinoex/mybot.log + + ############################################################################## + ### - log rotate - ### + ### Archivage du journal jamais (« none »), quotidien (« daily »), ### + ### hebdomadaire (« weekly ») ou mensuelle (« monthly »). ### +-logrotate weekly ++logrotate none + + ############################################################################## + ### - expire logfiles - ### +@@ -39,12 +39,12 @@ logrotate weekly + ### - log stats - ### + ### Écrit les statistiques du robot. Elles peuvent être envoyées ### + ### par DCC CHAT s'il est actif. ### +-logstats yes ++logstats no + + ############################################################################## + ### - state file - ### + ### Fichier temporaire de stockage des informations d'état d'Iroffer. ### +-statefile monbot.state ++statefile /var/lib/iroffer-dinoex/mybot.state + + ############################################################################## + ### - old state file - ### +@@ -71,7 +71,7 @@ statefile monbot.state + ### « xdcclistfile » et Iroffer écrira la liste XDCC dès que nécessaire. ### + ### Si « xdcclistfileraw » est défini, le fichier sera écrit avec les ### + ### caractères spéciaux IRC (couleur, format, etc.) ### +-xdcclistfile monbot.txt ++xdcclistfile /var/lib/iroffer-dinoex/mybot.txt + #xdcclistfileraw + + ############################################################################## +diff --git a/sample.config b/sample.config +index 5870e37..82fea84 100644 +--- a/sample.config ++++ b/sample.config +@@ -15,18 +15,18 @@ + ############################################################################## + ### - pid file - ### + ### Writes the process id to this file on startup ### +-pidfile mybot.pid ++pidfile /var/run/iroffer-dinoex/iroffer-dinoex.pid + + ############################################################################## + ### - log file - ### + ### Writes logging information to this file. ### +-logfile mybot.log ++logfile /var/log/iroffer-dinoex/mybot.log + + ############################################################################## + ### - log rotate - ### + ### After the time given here a logfile will be rotated. ### + ### logrotate can be set to none, 1 - 24 hours, daily, weekly or monthly ### +-logrotate weekly ++logrotate none + + ############################################################################## + ### - expire logfiles - ### +@@ -39,12 +39,12 @@ logrotate weekly + ### - log stats - ### + ### Setting logstats will log statistical information and this will also ### + ### send this stats to a dcc chat if one is active. ### +-logstats yes ++logstats no + + ############################################################################## + ### - state file - ### + ### temporary storage for iroffer state information across restarts ### +-statefile mybot.state ++statefile /var/lib/iroffer-dinoex/mybot.state + + ############################################################################## + ### - old state file - ### +@@ -71,7 +71,7 @@ statefile mybot.state + ### needed. ### + ### If xdcclistfileraw is set the file will be written with the IRC ### + ### control characters included (color, formatting, etc..). ### +-xdcclistfile mybot.txt ++xdcclistfile /var/lib/iroffer-dinoex/mybot.txt + #xdcclistfileraw + + ############################################################################## +-- +2.19.2 + diff --git a/net-irc/iroffer-dinoex/iroffer-dinoex-3.29.ebuild b/net-irc/iroffer-dinoex/iroffer-dinoex-3.29.ebuild deleted file mode 100644 index e07c9359c4a9..000000000000 --- a/net-irc/iroffer-dinoex/iroffer-dinoex-3.29.ebuild +++ /dev/null @@ -1,119 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PLOCALES="de en fr it" -PLOCALE_BACKUP="en" - -inherit eutils l10n toolchain-funcs user - -DESCRIPTION="IRC fileserver using DCC" -HOMEPAGE="http://iroffer.dinoex.net/" -SRC_URI="http://iroffer.dinoex.net/${P}.tar.gz - http://iroffer.dinoex.net/HISTORY/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="+admin +blowfish +chroot curl debug geoip gnutls +http kqueue +memsave ruby ssl +telnet upnp" - -REQUIRED_USE=" - admin? ( http ) - gnutls? ( ssl ) -" - -RDEPEND="chroot? ( dev-libs/nss ) - curl? ( - net-misc/curl[ssl?] - gnutls? ( net-misc/curl[curl_ssl_gnutls] ) - !gnutls? ( ssl? ( net-misc/curl[curl_ssl_openssl] ) ) - ) - geoip? ( dev-libs/geoip ) - gnutls? ( net-libs/gnutls ) - ruby? ( dev-lang/ruby ) - ssl? ( !gnutls? ( dev-libs/openssl ) )" - -DEPEND="${RDEPEND}" - -pkg_setup() { - enewgroup iroffer - enewuser iroffer -1 -1 -1 iroffer -} - -src_prepare() { - epatch "${FILESDIR}/${P}-config.patch"\ - "${FILESDIR}/${PN}-Werror.patch" - epatch_user - l10n_find_plocales_changes "" 'help-admin-' '.txt' -} - -do_configure() { - echo ./Configure $* - ./Configure $* || die "configure phase failed" -} - -src_configure() { - do_configure \ - PREFIX="${EPREFIX}/usr"\ - $(usex debug '-profiling' '' '' '')\ - $(usex debug '-debug' '' '' '')\ - $(usex geoip '-geoip' '' '' '')\ - $(usex chroot '' '-no-chroot' '' '')\ - $(usex curl '-curl' '' '' '' )\ - $(usex gnutls '-tls' '' '' '' '')\ - $(usex upnp '-upnp' '' '' '')\ - $(usex ruby '-ruby' '' '' '')\ - $(usex kqueue '-kqueue' '' '' '')\ - $(usex blowfish '' '-no-blowfish' '' '')\ - $(usex ssl '' '-no-openssl' '' '')\ - $(usex http '' '-no-http' '' '')\ - $(usex admin '' '-no-admin' '' '')\ - $(usex telnet '' '-no-telnet' '' '')\ - $(usex memsave '' '-no-memsave' '' '') -} - -src_compile() { - # TODO: default compile targets always include chrooted target, which is not good - emake CC="$(tc-getCC)" $(l10n_get_locales) -} - -myloc() { - emake DESTDIR="${D}" install-${1} - - dodoc help-admin-${1}.txt - use http && dohtml doc/INSTALL-linux-${1}.html - - insinto /etc/${PN} - case ${1} in - "de") - doins beispiel.config;; - "fr") - doins exemple.config;; - *) - doins sample.config;; - esac -} - -src_install() { - l10n_for_each_locale_do myloc - - dodoc README* THANKS TODO - doman iroffer.1 xdcc.7 - - newinitd "${FILESDIR}/${PN}.init" ${PN} - newconfd "${FILESDIR}/${PN}.conf" ${PN} - - insinto /etc/logrotate.d - newins "${FILESDIR}/${PN}.logrotate" ${PN} - - if use ruby; then - insinto /usr/share/${PN} - doins ruby-sample.rb - fi - - if use http; then - insinto /usr/share/${PN}/htdocs - doins htdocs/* - fi -} diff --git a/net-irc/iroffer-dinoex/iroffer-dinoex-3.30-r1.ebuild b/net-irc/iroffer-dinoex/iroffer-dinoex-3.30-r1.ebuild index d6533d41c96c..b5ef681e3827 100644 --- a/net-irc/iroffer-dinoex/iroffer-dinoex-3.30-r1.ebuild +++ b/net-irc/iroffer-dinoex/iroffer-dinoex-3.30-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -15,7 +15,7 @@ SRC_URI="http://iroffer.dinoex.net/${P}.tar.gz LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="+admin +blowfish +chroot curl debug geoip gnutls +http kqueue +memsave ruby ssl +telnet upnp" REQUIRED_USE=" diff --git a/net-irc/iroffer-dinoex/iroffer-dinoex-3.31.ebuild b/net-irc/iroffer-dinoex/iroffer-dinoex-3.31.ebuild new file mode 100644 index 000000000000..b26d946201e1 --- /dev/null +++ b/net-irc/iroffer-dinoex/iroffer-dinoex-3.31.ebuild @@ -0,0 +1,121 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PLOCALES="de en fr it" +PLOCALE_BACKUP="en" + +inherit l10n toolchain-funcs user + +DESCRIPTION="IRC fileserver using DCC" +HOMEPAGE="http://iroffer.dinoex.net/" +SRC_URI="http://iroffer.dinoex.net/${P}.tar.gz + http://iroffer.dinoex.net/HISTORY/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="+admin +blowfish +chroot curl debug geoip gnutls +http kqueue +memsave ruby ssl +telnet upnp" + +REQUIRED_USE=" + admin? ( http ) + gnutls? ( ssl ) +" + +RDEPEND="chroot? ( dev-libs/nss ) + curl? ( + net-misc/curl[ssl?] + gnutls? ( net-misc/curl[curl_ssl_gnutls] ) + !gnutls? ( ssl? ( net-misc/curl[curl_ssl_openssl] ) ) + ) + geoip? ( dev-libs/geoip ) + gnutls? ( net-libs/gnutls ) + ruby? ( dev-lang/ruby:* ) + ssl? ( !gnutls? ( dev-libs/openssl:0= ) )" + +DEPEND="${RDEPEND}" + +pkg_setup() { + enewgroup iroffer + enewuser iroffer -1 -1 -1 iroffer +} + +src_prepare() { + eapply "${FILESDIR}/${P}-config.patch" + eapply "${FILESDIR}/${PN}-Werror.patch" + + eapply_user + + l10n_find_plocales_changes "" 'help-admin-' '.txt' +} + +do_configure() { + echo ./Configure $* + ./Configure $* || die "configure phase failed" +} + +src_configure() { + do_configure \ + PREFIX="${EPREFIX}/usr"\ + $(usex debug '-profiling' '' '' '')\ + $(usex debug '-debug' '' '' '')\ + $(usex geoip '-geoip' '' '' '')\ + $(usex chroot '' '-no-chroot' '' '')\ + $(usex curl '-curl' '' '' '' )\ + $(usex gnutls '-tls' '' '' '' '')\ + $(usex upnp '-upnp' '' '' '')\ + $(usex ruby '-ruby' '' '' '')\ + $(usex kqueue '-kqueue' '' '' '')\ + $(usex blowfish '' '-no-blowfish' '' '')\ + $(usex ssl '' '-no-openssl' '' '')\ + $(usex http '' '-no-http' '' '')\ + $(usex admin '' '-no-admin' '' '')\ + $(usex telnet '' '-no-telnet' '' '')\ + $(usex memsave '' '-no-memsave' '' '') +} + +src_compile() { + # TODO: default compile targets always include chrooted target, which is not good + emake CC="$(tc-getCC)" $(l10n_get_locales) +} + +myloc() { + emake DESTDIR="${D}" install-${1} + + dodoc help-admin-${1}.txt + use http && dodoc doc/INSTALL-linux-${1}.html + + insinto /etc/${PN} + case ${1} in + "de") + doins beispiel.config;; + "fr") + doins exemple.config;; + *) + doins sample.config;; + esac +} + +src_install() { + l10n_for_each_locale_do myloc + + dodoc README* THANKS TODO + doman iroffer.1 xdcc.7 + + newinitd "${FILESDIR}/${PN}.init" ${PN} + newconfd "${FILESDIR}/${PN}.conf" ${PN} + + insinto /etc/logrotate.d + newins "${FILESDIR}/${PN}.logrotate" ${PN} + + if use ruby; then + insinto /usr/share/${PN} + doins ruby-sample.rb + fi + + if use http; then + insinto /usr/share/${PN}/htdocs + doins htdocs/* + fi +} diff --git a/net-irc/znc/Manifest b/net-irc/znc/Manifest index 1b428a6e26ff..aa8d30ced2b5 100644 --- a/net-irc/znc/Manifest +++ b/net-irc/znc/Manifest @@ -2,8 +2,11 @@ AUX README.gentoo-r1 530 BLAKE2B 5feab666142884c67c3c1a51322bb614bbdbaa453a4b6a4 AUX znc-1.7.1-inttest-dir.patch 2205 BLAKE2B f322f6884170c71ba537897d38c5ca2787937afdd2ac1fe0b0b4ab55ad7d453029bf4a8c748c5787fc4ed3b46e2b33c925cb962ec868f7a5c07356697a3039e2 SHA512 b74d136985546114604252be74e55e8f5e0740b678bdd224ea63cc3587d17d861c81c69b4bdea0aabc23e64097dda0097e97fbd80110c2c2a919b33d912d2dea AUX znc.confd-r1 720 BLAKE2B 4857a8bcd36ed1008a558ac7b067d6fad53b5d39c0df9130ca28d4ac3db3924a3a1200682c19c7e6f7869f22338b492f73bf6ccbc2b723d117c9eebc10a89838 SHA512 3ab102f64ea0572350c8595fd3739874da591c43a3dbc3a740c72c53bd7418fded721d478d1fb92de0c0d18131313ba6679e842a135dfe239ea3f42821d8e468 AUX znc.initd-r2 952 BLAKE2B 81346bf0a1581543683eb5c125b29474c0bc01b8aee11c036a134c5a01042059564f2982aaec65715ac0a2c87b64fcd9746464148a81daeee549f4228d6ff55f SHA512 c3d676796aaa485dcaebee0fba58a8f86560cd192e0e2ccf06f58346c1368f58aa5be1c1e5160f8105e3dc5c684d3d1f82eff6a4d7b87c07f11450b72288727f +DIST gtest-1.8.1.tar.gz 992298 BLAKE2B 40ef3417fe424205c0617f07207347ce671ac87605f8ac9b8a333b0b06e3fbef9f556041ee324c18f957f3258ab9fe06704f31cdd038355fb7890180eb77ced1 SHA512 e6283c667558e1fd6e49fa96e52af0e415a3c8037afe1d28b7ff1ec4c2ef8f49beb70a9327b7fc77eb4052a58c4ccad8b5260ec90e4bceeac7a46ff59c4369d7 DIST gtest-ba96d0b1161f540656efdaed035b3c062b60e006.tar.gz 987370 BLAKE2B fcedfe559c4c93166962900117dc492da3cbb99165c30766c39131c20e3b41f057a31a8cb631beaca829c1e9966e90cbc37469ba56a5fc15a2bea86cbe401a63 SHA512 ce78098f973b45f4a177db387c42a56d5ea34407a2af278760b850c326e8450760a58991d62a5408f5df79f89fefd10fee71745b7e8669b2a6f74fa63a259600 DIST znc-1.7.1.tar.gz 2041669 BLAKE2B 57ead136e28b0fc4a875802ef89ef004213789e68d19ceeab15c6fac6fe51ea51618764c484ea618fc6359d9c15cc7ffcf5529642d730b9217a4f127e92d9ae6 SHA512 907068fb0828091026d440145b70ca76109302f13c18d94f772660192434287f209a06a52da1dd39726b9a38735b3cea9afbd062eb6def4cd428bb73c562a902 +DIST znc-1.7.2.tar.gz 2083306 BLAKE2B 907581df536d9bab15964f6fcecbbf660403c39368b984ab1d2957bd43c4a90ca0694844b41786dab5495a4f4dccd675eaa54189782d47683e013d1faf9cc368 SHA512 fcc67bf676e066db64d62584ff8ecfd63280b3237e88dcbe18ab0b78a9b5f4dc202b589876b6fc14c6092ca5509937bc170a54fba44df2aeb1645cca02afe577 EBUILD znc-1.7.1.ebuild 5210 BLAKE2B 39e1bfeff0b6b062a85ce1f362a6cdc1a30434f8ff4d3e6f0ffb9c9e7c079834a76dea87f2ec955be4a2c2e5c32752ed42f1d7dbf597d498ffca43b3e92dafed SHA512 2bdbcfc173bf15f77619c07ec13f0e5af8a4a368c01f620ec830a52ae6e97ded36a986c251925911d8f232f978c7a5b7cfd2792cca5b390f53bea3f18d4c3ef1 -EBUILD znc-9999.ebuild 5211 BLAKE2B 4e17086ad59007af436fbbfafb225c9708c66bf47eed8936d43c63feee16d6597f99fe5286fce7e1efd347b9a55fe5ecc932756322813646dfc36cabf7e98c07 SHA512 761110da439be96c483c0b7253e83b12fcbe1574b8d8e226879cead14c54e11200c9fafb6d9234756751c3c2ba27bc974840d80d981e456260a657fb325872e5 +EBUILD znc-1.7.2.ebuild 5136 BLAKE2B 5f7dd319c877ff4f8d229853feae6302d57eab8e86f15c9d0e00a24353ad1c412ec8e522219bcd7d8f963b40c0997fdf22afd2b033a5492e89d163484ad1f620 SHA512 049ae60449caf17f7f1447aba7138efee8cf70b9cc34a5b328f35f1a273d7c1ba753fb2eedfa29deeea1e584063ecf5fa0a613f9f2de6068948ee70f48c51afc +EBUILD znc-9999.ebuild 5136 BLAKE2B 5f7dd319c877ff4f8d229853feae6302d57eab8e86f15c9d0e00a24353ad1c412ec8e522219bcd7d8f963b40c0997fdf22afd2b033a5492e89d163484ad1f620 SHA512 049ae60449caf17f7f1447aba7138efee8cf70b9cc34a5b328f35f1a273d7c1ba753fb2eedfa29deeea1e584063ecf5fa0a613f9f2de6068948ee70f48c51afc MISC metadata.xml 507 BLAKE2B c8926f6668f57c84f5715156a424b18f7cb01f0ea9ac6a499550f731a00c7de035ec270f89297bda07ac3115292deffdcd0f3a339484c9de5d8bd7170be00de6 SHA512 d69af8535c2e409e6b6e65bfd279d74bd89ce01e911e0d21b4079bd13328e47f3b959ef82531b833c702955225e01db6915f4fb3f94d048a05ce2107b61bf1a6 diff --git a/net-irc/znc/znc-1.7.2.ebuild b/net-irc/znc/znc-1.7.2.ebuild new file mode 100644 index 000000000000..b8d5eb3df8fe --- /dev/null +++ b/net-irc/znc/znc-1.7.2.ebuild @@ -0,0 +1,182 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{4,5,6,7} ) + +inherit cmake-utils python-single-r1 readme.gentoo-r1 systemd user + +GTEST_VER="1.8.1" +GTEST_URL="https://github.com/google/googletest/archive/${GTEST_VER}.tar.gz -> gtest-${GTEST_VER}.tar.gz" +DESCRIPTION="An advanced IRC Bouncer" + +if [[ ${PV} == *9999* ]]; then + inherit git-r3 + EGIT_REPO_URI=${EGIT_REPO_URI:-"https://github.com/znc/znc.git"} + SRC_URI="" +else + MY_PV=${PV/_/-} + MY_P=${PN}-${MY_PV} + SRC_URI=" + https://znc.in/releases/archive/${MY_P}.tar.gz + test? ( ${GTEST_URL} ) + " + KEYWORDS="~amd64 ~arm ~x86" + S=${WORKDIR}/${MY_P} +fi + +HOMEPAGE="https://znc.in" +LICENSE="Apache-2.0" +SLOT="0" +IUSE="+ipv6 +icu libressl nls perl python +ssl sasl tcl test +zlib" + +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} icu )" + +RDEPEND=" + icu? ( dev-libs/icu:= ) + nls? ( dev-libs/boost:=[nls] ) + perl? ( >=dev-lang/perl-5.10:= ) + python? ( ${PYTHON_DEPS} ) + sasl? ( >=dev-libs/cyrus-sasl-2 ) + ssl? ( + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:0= ) + ) + tcl? ( dev-lang/tcl:0= ) + zlib? ( sys-libs/zlib:0= ) +" +DEPEND=" + ${RDEPEND} + virtual/pkgconfig + nls? ( sys-devel/gettext ) + perl? ( >=dev-lang/swig-3.0.0 ) + python? ( >=dev-lang/swig-3.0.0 ) + test? ( dev-qt/qtnetwork:5 ) +" + +PATCHES=( "${FILESDIR}"/${PN}-1.7.1-inttest-dir.patch ) + +pkg_setup() { + if use python; then + python-single-r1_pkg_setup + fi + + enewgroup ${PN} + enewuser ${PN} -1 -1 /var/lib/${PN} ${PN} + # The home directory was previously set to /dev/null + # This caused a bug with the systemd unit + # https://bugs.gentoo.org/521916 + esethome ${PN} /var/lib/${PN} +} + +src_prepare() { + # Let SWIG rebuild modperl/modpython to make user patching easier. + if [[ ${PV} != *9999* ]]; then + rm modules/modperl/generated.tar.gz || die + rm modules/modpython/generated.tar.gz || die + fi + + sed -i -e "s|DZNC_BIN_DIR:path=|DZNC_BIN_DIR:path=${T}/inttest|" \ + test/CMakeLists.txt || die + + cmake-utils_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DWANT_SYSTEMD=yes # Causes -DSYSTEMD_DIR to be used. + -DSYSTEMD_DIR="$(systemd_get_systemunitdir)" + -DWANT_ICU="$(usex icu)" + -DWANT_IPV6="$(usex ipv6)" + -DWANT_I18N="$(usex nls)" + -DWANT_PERL="$(usex perl)" + -DWANT_PYTHON="$(usex python)" + -DWANT_CYRUS="$(usex sasl)" + -DWANT_OPENSSL="$(usex ssl)" + -DWANT_TCL="$(usex tcl)" + -DWANT_ZLIB="$(usex zlib)" + ) + + if [[ ${PV} != *9999* ]] && use test; then + export GTEST_ROOT="${WORKDIR}/googletest-release-${GTEST_VER}/googletest" + export GMOCK_ROOT="${WORKDIR}/googletest-release-${GTEST_VER}/googlemock" + fi + + cmake-utils_src_configure +} + +src_test() { + cmake-utils_src_make unittest + if has network-sandbox ${FEATURES}; then + DESTDIR="${T}/inttest" cmake-utils_src_make install + local filter='-' + if ! use perl; then + filter="${filter}:ZNCTest.Modperl*" + fi + if ! use python; then + filter="${filter}:ZNCTest.Modpython*" + fi + # CMAKE_PREFIX_PATH and CXXFLAGS are needed for znc-buildmod + # invocations from inside the test + GTEST_FILTER="${filter}" ZNC_UNUSUAL_ROOT="${T}/inttest" \ + CMAKE_PREFIX_PATH="${T}/inttest/usr/share/znc/cmake" \ + CXXFLAGS="${CXXFLAGS} -isystem ${T}/inttest/usr/include" \ + cmake-utils_src_make inttest + else + # TODO: don't require sandbox after + # https://github.com/znc/znc/pull/1363 is implemented + ewarn "FEATURES=-network-sandbox; skipping integration tests which" + ewarn "temporary open local ports." + fi +} + +src_install() { + cmake-utils_src_install + + dodoc NOTICE + newinitd "${FILESDIR}"/znc.initd-r2 znc + newconfd "${FILESDIR}"/znc.confd-r1 znc + + DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r1") || die + DISABLE_AUTOFORMATTING=1 + readme.gentoo_create_doc +} + +pkg_postinst() { + if [[ -z "${REPLACING_VERSIONS}" ]]; then + # This is a new installation + readme.gentoo_print_elog + fi + + if [[ -d "${EROOT%/}"/etc/znc ]]; then + ewarn "${EROOT%/}/etc/znc exists on your system." + ewarn "Due to the nature of the contents of that folder," + ewarn "we have changed the default configuration to use" + ewarn " ${EROOT%/}/var/lib/znc" + ewarn "please move ${EROOT%/}/etc/znc to ${EROOT%/}/var/lib/znc" + ewarn "or adjust your service configuration." + fi +} + +pkg_config() { + if [[ -e "${EROOT%/}/var/lib/znc" ]]; then + ewarn "${EROOT%/}/var/lib/znc already exists, aborting to avoid damaging" + ewarn "any existing configuration. If you are sure you want" + ewarn "to generate a new configuration, remove the folder" + ewarn "and try again." + else + einfo "Press enter to interactively create a new configuration file for znc." + einfo "To abort, press Control-C" + read + mkdir -p "${EROOT%/}/var/lib/znc" || die + chown -R ${PN}:${PN} "${EROOT%/}/var/lib/znc" || + die "Setting permissions failed" + start-stop-daemon --start --user ${PN}:${PN} --env ZNC_NO_LAUNCH_AFTER_MAKECONF=1 \ + "${EROOT%/}"/usr/bin/znc -- --makeconf --datadir "${EROOT%/}/var/lib/znc" || + die "Config failed" + einfo + einfo "You can now start the znc service using the init system of your choice." + einfo "Don't forget to enable it if you want to use znc at boot." + fi +} diff --git a/net-irc/znc/znc-9999.ebuild b/net-irc/znc/znc-9999.ebuild index e59849a6e29b..b8d5eb3df8fe 100644 --- a/net-irc/znc/znc-9999.ebuild +++ b/net-irc/znc/znc-9999.ebuild @@ -1,13 +1,13 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -PYTHON_COMPAT=( python3_{4,5,6} ) +PYTHON_COMPAT=( python3_{4,5,6,7} ) inherit cmake-utils python-single-r1 readme.gentoo-r1 systemd user -GTEST_VER="ba96d0b1161f540656efdaed035b3c062b60e006" # 1.8.0 is too old, but newer version not released yet +GTEST_VER="1.8.1" GTEST_URL="https://github.com/google/googletest/archive/${GTEST_VER}.tar.gz -> gtest-${GTEST_VER}.tar.gz" DESCRIPTION="An advanced IRC Bouncer" @@ -99,8 +99,8 @@ src_configure() { ) if [[ ${PV} != *9999* ]] && use test; then - export GTEST_ROOT="${WORKDIR}/googletest-${GTEST_VER}/googletest" - export GMOCK_ROOT="${WORKDIR}/googletest-${GTEST_VER}/googlemock" + export GTEST_ROOT="${WORKDIR}/googletest-release-${GTEST_VER}/googletest" + export GMOCK_ROOT="${WORKDIR}/googletest-release-${GTEST_VER}/googlemock" fi cmake-utils_src_configure @@ -109,7 +109,7 @@ src_configure() { src_test() { cmake-utils_src_make unittest if has network-sandbox ${FEATURES}; then - cmake-utils_src_make install DESTDIR="${T}/inttest" + DESTDIR="${T}/inttest" cmake-utils_src_make install local filter='-' if ! use perl; then filter="${filter}:ZNCTest.Modperl*" -- cgit v1.2.3