From 76dfef0cec9170000357d2f354e412daf48941fc Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 30 Dec 2017 01:11:30 +0000 Subject: gentoo resync : 30.12.2017 --- net-misc/Manifest.gz | Bin 61666 -> 61668 bytes net-misc/openssh/Manifest | 2 - .../files/openssh-7.5_p1-hpn-x509-10.1-glue.patch | 63 ------- .../files/openssh-7.5p1-x509-libressl.patch | 202 --------------------- net-misc/whois/Manifest | 4 +- net-misc/whois/whois-5.2.18.ebuild | 63 ------- net-misc/whois/whois-5.2.20.ebuild | 63 +++++++ 7 files changed, 65 insertions(+), 332 deletions(-) delete mode 100644 net-misc/openssh/files/openssh-7.5_p1-hpn-x509-10.1-glue.patch delete mode 100644 net-misc/openssh/files/openssh-7.5p1-x509-libressl.patch delete mode 100644 net-misc/whois/whois-5.2.18.ebuild create mode 100644 net-misc/whois/whois-5.2.20.ebuild (limited to 'net-misc') diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz index 3f55b7ed0c4d..c3d724e29e39 100644 Binary files a/net-misc/Manifest.gz and b/net-misc/Manifest.gz differ diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest index 8d5813562c73..02384eca3b27 100644 --- a/net-misc/openssh/Manifest +++ b/net-misc/openssh/Manifest @@ -3,10 +3,8 @@ AUX openssh-7.3-mips-seccomp-n32.patch 634 BLAKE2B 12e931e6c2364d4cdd3f0d9ef8cf7 AUX openssh-7.5_p1-CVE-2017-15906.patch 1180 BLAKE2B 37fca347fc1fa969f410d514a76b3d7133914aa14c7ef577e6eb0b2f96b936313b20635c6cc23b5e91e3643e26c899e992b82769a5df6568d058eb4f7a43fab8 SHA512 dfba25e9962e4398688d5e6f9311de44931ea5292d7d50c69d8056838ceb41ce099c44f849c204f7b421515c3aa40bde6e9b98b80b9e99aa113c222841daecd4 AUX openssh-7.5_p1-GSSAPI-dns.patch 11137 BLAKE2B a54ed4d6f81632ae03523b7b61f750402d178d3213ec310bc0e57c0705ed67607a89a786d429599395722eaf40b2fb591c5b8de87ffc4f1dd7f6713b543c31c2 SHA512 f84e1d3fdda7a534d9351884caaefc136be7599e735200f0393db0acad03a57abe6585f9402018b50e3454e6842c3281d630120d479ff819f591c4693252dd0e AUX openssh-7.5_p1-cross-cache.patch 1220 BLAKE2B 7176b86024b072ff601421143f8567e4e47de3d89b1d865bc92405da75bf7c64fa50b9f746d9c494dbf64bc09e04afc1960f673e68ea1d072a5381027afea63d SHA512 03cf3b5556fcf43c7053d1550c8aa35189759a0a2274a67427b28176ba7938b8d0019992de25fb614dc556c5f45a67649bb5d2d82889ac2c37edd986fc632550 -AUX openssh-7.5_p1-hpn-x509-10.1-glue.patch 2741 BLAKE2B 832a176c8c696981a4668a9c63786d09b6adf89bc82c2a3019d77f8550504c62c86e9ed2aae51d7a4b3054d7d368f79f8af6ac0c234736827872b9ce1ceb04d7 SHA512 940dd448f6768bb3e94987eb86b6002d17d918310ad5c1f38f1b3fd9df263439e0fecb9c8f09c05649bfd03cb507c31ef9320522e946850e954ffdd44fdd4b73 AUX openssh-7.5_p1-hpn-x509-10.2-glue.patch 2847 BLAKE2B 8a6151ab121871e4f2d93ace0e07dce1106c6841031cacfb197e00cc76fc1d0cf153aae52757dcf98a5fb89971125493d0572bd4964d0e59cb3f391fd1256aef SHA512 bc23fdf5995ae38ff166f12f64082f79a2135ca28f2240e89bee42b1e3ba39ce94467ece9ddea99173f1829b09b069dbf56a0bce7dfd1ae5f63c12f73b5ffba7 AUX openssh-7.5_p1-x32-typo.patch 772 BLAKE2B 3f27d669ee76e191f2f6f7c7d86b1d9cb7297cecf17b2d88d86ef498c9ca35231adb0edc9fb811698ec86fd65527cc3fe9f2ce514836aebe5dc27bca2a3a55dc SHA512 20d19301873d4b8e908527f462f40c2f4a513d0bb89d4c7b885f9fc7eb5d483eea544eb108d87ff6aaa3d988d360c2029910c18f7125c96e8367485553f59a5e -AUX openssh-7.5p1-x509-libressl.patch 7027 BLAKE2B 28c51fb88259f7fce097e72dbbafb9623935cb8aaa5d9cf13432051971bf78e792c81c6b4ec7c3a90a6dc287dbfd95e13d682f100e2a0d8f13613ec87d728509 SHA512 0b5fcb58ee55de7ce61bf2bcad23e4a5cdc941d81121bbf8f0dadf5e1e158c055f45a2ef1aebe8fcb1856a33e079282f4c9f21d9da6892808d7e3c172dca3365 AUX openssh-7.6_p1-hpn-x509-11.0-glue.patch 2182 BLAKE2B 02953663257816c71734fc8bf9f9b4619860d75cd49e7758d8895d8368acda7fb8117322747af61cac6a8b57f24a5080397af4307f9f681b0cf25caa75cc9cff SHA512 387222fe9b46f0f2df3cb9f6125995c46f7428955784175c718e902a36e90994f5bcecfbbe160d28fc810e4e43e6f070937c39546f0df36ebb9b47bda3c3e032 AUX openssh-7.6_p1-warnings.patch 324 BLAKE2B d9fb6e710f797b687b285f70b7c7b32abaa34bd57aeb32558f5d9978df5b5eb5ba5dc1ac8c46ed430619318fa3cfd3475a9c24e3f594ad05d081decd0e4c2f36 SHA512 08a9caf1cbb4dbde2828f14075b41762dad24a8a88882cc61cb133783caa1200f63f052824409b0334c832365c0d934f44b2eeac947228ff52be24a09548cd22 AUX openssh-7.6_p1-x509-11.0-libressl.patch 570 BLAKE2B 0b22cca997909743ec3247a80a9efffda7e85235274df98fd8aebf549a1a7cddb3906dd4cc678bf4176f634c5e4b123a00af9d0690672e9bee06e848800eb1ff SHA512 795d3e99d81cbd76533196b6a73a9c9a6db800f9de1f6c7860b56058d0a319c6633ab09b8a149ed6d840b3c9a43162ce299e2a16e334a66802260fbdc35b2b17 diff --git a/net-misc/openssh/files/openssh-7.5_p1-hpn-x509-10.1-glue.patch b/net-misc/openssh/files/openssh-7.5_p1-hpn-x509-10.1-glue.patch deleted file mode 100644 index e55a8b14c573..000000000000 --- a/net-misc/openssh/files/openssh-7.5_p1-hpn-x509-10.1-glue.patch +++ /dev/null @@ -1,63 +0,0 @@ -diff -ur a/0003-Add-support-for-the-multi-threaded-AES-CTR-cipher.patch b/0003-Add-support-for-the-multi-threaded-AES-CTR-cipher.patch ---- a/0003-Add-support-for-the-multi-threaded-AES-CTR-cipher.patch 2017-03-27 13:31:01.816551100 -0700 -+++ b/0003-Add-support-for-the-multi-threaded-AES-CTR-cipher.patch 2017-03-27 13:51:03.894805846 -0700 -@@ -40,7 +40,7 @@ - @@ -44,7 +44,7 @@ CC=@CC@ - LD=@LD@ - CFLAGS=@CFLAGS@ -- CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ $(PATHS) @DEFS@ -+ CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ @LDAP_CPPFLAGS@ $(PATHS) @DEFS@ - -LIBS=@LIBS@ - +LIBS=@LIBS@ -lpthread - K5LIBS=@K5LIBS@ -@@ -1023,6 +1023,3 @@ - do_authenticated(authctxt); - - /* The connection has been terminated. */ ---- --2.12.0 -- -diff -ur a/0004-support-dynamically-sized-receive-buffers.patch b/0004-support-dynamically-sized-receive-buffers.patch ---- a/0004-support-dynamically-sized-receive-buffers.patch 2017-03-27 13:31:01.816551100 -0700 -+++ b/0004-support-dynamically-sized-receive-buffers.patch 2017-03-27 13:49:44.513498976 -0700 -@@ -926,9 +926,9 @@ - @@ -526,10 +553,10 @@ send_client_banner(int connection_out, int minor1) - /* Send our own protocol version identification. */ - if (compat20) { -- xasprintf(&client_version_string, "SSH-%d.%d-%.100s\r\n", --- PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION); --+ PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE); -+ xasprintf(&client_version_string, "SSH-%d.%d-%.100s PKIX[%s]\r\n", -+- PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION, PACKAGE_VERSION); -++ PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE, PACKAGE_VERSION); - } else { - xasprintf(&client_version_string, "SSH-%d.%d-%.100s\n", - - PROTOCOL_MAJOR_1, minor1, SSH_VERSION); -@@ -943,11 +943,11 @@ - @@ -367,7 +367,7 @@ sshd_exchange_identification(struct ssh *ssh, int sock_in, int sock_out) - char remote_version[256]; /* Must be at least as big as buf. */ - -- xasprintf(&server_version_string, "SSH-%d.%d-%.100s%s%s\r\n", --- PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION, --+ PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE, -+ xasprintf(&server_version_string, "SSH-%d.%d-%.100s%s%s%s%s", -+- major, minor, SSH_VERSION, comment, -++ major, minor, SSH_RELEASE, comment, - *options.version_addendum == '\0' ? "" : " ", -- options.version_addendum); -+ options.version_addendum, newline); - - @@ -1020,6 +1020,8 @@ server_listen(void) - int ret, listen_sock, on = 1; -@@ -1008,10 +1008,6 @@ - @@ -3,4 +3,5 @@ - #define SSH_VERSION "OpenSSH_7.5" - -- #define SSH_PORTABLE "p1" ---#define SSH_RELEASE SSH_VERSION SSH_PORTABLE -+-#define SSH_RELEASE PACKAGE_STRING ", " SSH_VERSION "p1" - +#define SSH_HPN "-hpn14v12" - +#define SSH_RELEASE SSH_VERSION SSH_PORTABLE SSH_HPN ---- --2.12.0 -- diff --git a/net-misc/openssh/files/openssh-7.5p1-x509-libressl.patch b/net-misc/openssh/files/openssh-7.5p1-x509-libressl.patch deleted file mode 100644 index b4f36a513180..000000000000 --- a/net-misc/openssh/files/openssh-7.5p1-x509-libressl.patch +++ /dev/null @@ -1,202 +0,0 @@ -diff -urN openssh-7.5p1.orig/a_utf8.c openssh-7.5p1/a_utf8.c ---- openssh-7.5p1.orig/a_utf8.c 1970-01-01 00:00:00.000000000 +0000 -+++ openssh-7.5p1/a_utf8.c 2017-03-30 17:38:25.179532110 +0000 -@@ -0,0 +1,186 @@ -+/* -+ * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved. -+ * -+ * Licensed under the OpenSSL license (the "License"). You may not use -+ * this file except in compliance with the License. You can obtain a copy -+ * in the file LICENSE in the source distribution or at -+ * https://www.openssl.org/source/license.html -+ */ -+ -+#include -+ -+/* UTF8 utilities */ -+ -+/*- -+ * This parses a UTF8 string one character at a time. It is passed a pointer -+ * to the string and the length of the string. It sets 'value' to the value of -+ * the current character. It returns the number of characters read or a -+ * negative error code: -+ * -1 = string too short -+ * -2 = illegal character -+ * -3 = subsequent characters not of the form 10xxxxxx -+ * -4 = character encoded incorrectly (not minimal length). -+ */ -+ -+int UTF8_getc(const unsigned char *str, int len, unsigned long *val) -+{ -+ const unsigned char *p; -+ unsigned long value; -+ int ret; -+ if (len <= 0) -+ return 0; -+ p = str; -+ -+ /* Check syntax and work out the encoded value (if correct) */ -+ if ((*p & 0x80) == 0) { -+ value = *p++ & 0x7f; -+ ret = 1; -+ } else if ((*p & 0xe0) == 0xc0) { -+ if (len < 2) -+ return -1; -+ if ((p[1] & 0xc0) != 0x80) -+ return -3; -+ value = (*p++ & 0x1f) << 6; -+ value |= *p++ & 0x3f; -+ if (value < 0x80) -+ return -4; -+ ret = 2; -+ } else if ((*p & 0xf0) == 0xe0) { -+ if (len < 3) -+ return -1; -+ if (((p[1] & 0xc0) != 0x80) -+ || ((p[2] & 0xc0) != 0x80)) -+ return -3; -+ value = (*p++ & 0xf) << 12; -+ value |= (*p++ & 0x3f) << 6; -+ value |= *p++ & 0x3f; -+ if (value < 0x800) -+ return -4; -+ ret = 3; -+ } else if ((*p & 0xf8) == 0xf0) { -+ if (len < 4) -+ return -1; -+ if (((p[1] & 0xc0) != 0x80) -+ || ((p[2] & 0xc0) != 0x80) -+ || ((p[3] & 0xc0) != 0x80)) -+ return -3; -+ value = ((unsigned long)(*p++ & 0x7)) << 18; -+ value |= (*p++ & 0x3f) << 12; -+ value |= (*p++ & 0x3f) << 6; -+ value |= *p++ & 0x3f; -+ if (value < 0x10000) -+ return -4; -+ ret = 4; -+ } else if ((*p & 0xfc) == 0xf8) { -+ if (len < 5) -+ return -1; -+ if (((p[1] & 0xc0) != 0x80) -+ || ((p[2] & 0xc0) != 0x80) -+ || ((p[3] & 0xc0) != 0x80) -+ || ((p[4] & 0xc0) != 0x80)) -+ return -3; -+ value = ((unsigned long)(*p++ & 0x3)) << 24; -+ value |= ((unsigned long)(*p++ & 0x3f)) << 18; -+ value |= ((unsigned long)(*p++ & 0x3f)) << 12; -+ value |= (*p++ & 0x3f) << 6; -+ value |= *p++ & 0x3f; -+ if (value < 0x200000) -+ return -4; -+ ret = 5; -+ } else if ((*p & 0xfe) == 0xfc) { -+ if (len < 6) -+ return -1; -+ if (((p[1] & 0xc0) != 0x80) -+ || ((p[2] & 0xc0) != 0x80) -+ || ((p[3] & 0xc0) != 0x80) -+ || ((p[4] & 0xc0) != 0x80) -+ || ((p[5] & 0xc0) != 0x80)) -+ return -3; -+ value = ((unsigned long)(*p++ & 0x1)) << 30; -+ value |= ((unsigned long)(*p++ & 0x3f)) << 24; -+ value |= ((unsigned long)(*p++ & 0x3f)) << 18; -+ value |= ((unsigned long)(*p++ & 0x3f)) << 12; -+ value |= (*p++ & 0x3f) << 6; -+ value |= *p++ & 0x3f; -+ if (value < 0x4000000) -+ return -4; -+ ret = 6; -+ } else -+ return -2; -+ *val = value; -+ return ret; -+} -+ -+/* -+ * This takes a character 'value' and writes the UTF8 encoded value in 'str' -+ * where 'str' is a buffer containing 'len' characters. Returns the number of -+ * characters written or -1 if 'len' is too small. 'str' can be set to NULL -+ * in which case it just returns the number of characters. It will need at -+ * most 6 characters. -+ */ -+ -+int UTF8_putc(unsigned char *str, int len, unsigned long value) -+{ -+ if (!str) -+ len = 6; /* Maximum we will need */ -+ else if (len <= 0) -+ return -1; -+ if (value < 0x80) { -+ if (str) -+ *str = (unsigned char)value; -+ return 1; -+ } -+ if (value < 0x800) { -+ if (len < 2) -+ return -1; -+ if (str) { -+ *str++ = (unsigned char)(((value >> 6) & 0x1f) | 0xc0); -+ *str = (unsigned char)((value & 0x3f) | 0x80); -+ } -+ return 2; -+ } -+ if (value < 0x10000) { -+ if (len < 3) -+ return -1; -+ if (str) { -+ *str++ = (unsigned char)(((value >> 12) & 0xf) | 0xe0); -+ *str++ = (unsigned char)(((value >> 6) & 0x3f) | 0x80); -+ *str = (unsigned char)((value & 0x3f) | 0x80); -+ } -+ return 3; -+ } -+ if (value < 0x200000) { -+ if (len < 4) -+ return -1; -+ if (str) { -+ *str++ = (unsigned char)(((value >> 18) & 0x7) | 0xf0); -+ *str++ = (unsigned char)(((value >> 12) & 0x3f) | 0x80); -+ *str++ = (unsigned char)(((value >> 6) & 0x3f) | 0x80); -+ *str = (unsigned char)((value & 0x3f) | 0x80); -+ } -+ return 4; -+ } -+ if (value < 0x4000000) { -+ if (len < 5) -+ return -1; -+ if (str) { -+ *str++ = (unsigned char)(((value >> 24) & 0x3) | 0xf8); -+ *str++ = (unsigned char)(((value >> 18) & 0x3f) | 0x80); -+ *str++ = (unsigned char)(((value >> 12) & 0x3f) | 0x80); -+ *str++ = (unsigned char)(((value >> 6) & 0x3f) | 0x80); -+ *str = (unsigned char)((value & 0x3f) | 0x80); -+ } -+ return 5; -+ } -+ if (len < 6) -+ return -1; -+ if (str) { -+ *str++ = (unsigned char)(((value >> 30) & 0x1) | 0xfc); -+ *str++ = (unsigned char)(((value >> 24) & 0x3f) | 0x80); -+ *str++ = (unsigned char)(((value >> 18) & 0x3f) | 0x80); -+ *str++ = (unsigned char)(((value >> 12) & 0x3f) | 0x80); -+ *str++ = (unsigned char)(((value >> 6) & 0x3f) | 0x80); -+ *str = (unsigned char)((value & 0x3f) | 0x80); -+ } -+ return 6; -+} -diff -urN openssh-7.5p1.orig/Makefile.in openssh-7.5p1/Makefile.in ---- openssh-7.5p1.orig/Makefile.in 2017-03-30 17:33:30.983830629 +0000 -+++ openssh-7.5p1/Makefile.in 2017-03-30 17:39:28.392905858 +0000 -@@ -74,7 +74,7 @@ - @OCSP_ON@OCSP_OBJS=ssh-ocsp.o - @OCSP_OFF@OCSP_OBJS= - --SSHX509_OBJS=ssh-x509.o ssh-xkalg.o x509_nm_cmp.o key-eng.o -+SSHX509_OBJS=ssh-x509.o ssh-xkalg.o x509_nm_cmp.o key-eng.o a_utf8.o - X509STORE_OBJS=x509store.o $(LDAP_OBJS) - - TARGETS=ssh$(EXEEXT) sshd$(EXEEXT) ssh-add$(EXEEXT) ssh-keygen$(EXEEXT) ssh-keyscan${EXEEXT} ssh-keysign${EXEEXT} ssh-pkcs11-helper$(EXEEXT) ssh-agent$(EXEEXT) scp$(EXEEXT) sftp-server$(EXEEXT) sftp$(EXEEXT) diff --git a/net-misc/whois/Manifest b/net-misc/whois/Manifest index 6233e0a3117b..e2d15e3c4d9f 100644 --- a/net-misc/whois/Manifest +++ b/net-misc/whois/Manifest @@ -1,8 +1,8 @@ AUX whois-4.7.2-config-file.patch 202 BLAKE2B b5c421655f40c22fcb9c9ac3194821e6e4100657bd11013ed220cea3c81c77e3c7e50432361c8e08274b59d96ff04ca22d8f500436fbefef981d587e26ef75a7 SHA512 932ce9dd51b29750a88da3082bdb1f3fd994e1d859fbdef45fadd3c833ee24d12acb6530989db60f4df3df9481d34cc5cabbdad4bf5150389a06ef7c832daf65 DIST whois_5.2.12.tar.xz 80428 BLAKE2B 53aa08d4e45ab417585aaaff03beb588a01e88c35d508f96e0738e6934659df6ab78c21d5794d86ce90c775fe5a32242710e8cf93b9f46c52dc32597ad113f40 SHA512 df40e2e7cbd11d00984f865e122ad4ece882a6a45e2f75ad5ea24ce937b7e9452b01fd886f43bae55fd065a6556cfc4577e7126151b5fd43fa806c4b0c886ced -DIST whois_5.2.18.tar.xz 82368 BLAKE2B 41596c6100436cb766af3cd84ceb817a958b8f6b9aa58f4174a758c9d90e9813443135998c04b418c68912aba9c0758ecedcd940533989279c4f2c39c767c66c SHA512 dcbfbab0da3b9b5876c7c51bc411ac371a5c33012bf1286a3e6ccfb59fb4fba89eab1c4b812766d2f101a93ca3424ef636214c05add59549b9809621dfb03d73 DIST whois_5.2.19.tar.xz 82476 BLAKE2B 20fb18c0d7244293f5ead1bb11431227f5897f8db57ce4347790e4f9e4689c1dd8a43a9be95533df2496f4da515163053e3f9110f5470eb3faa1cf9a6f21bd4c SHA512 93e6df6bda18fe1dd9b8ca017271a46c6e2b721820260b11c5427258f6c0010cb573cc619def5af44a56b5740423b46ad7b383da7743cc35517f4526a720389f +DIST whois_5.2.20.tar.xz 82336 BLAKE2B b10d7e22f41bfb68cdd1264016bbfeeb93436a5c46b0ddcfc79834d0446ea8c21cd8ff95bc440bbe4fda0d5b08a16c50fe9504c98c3de3cf4ce18892203518e1 SHA512 3308d9f5562babe007e46b7764718f13c1e7cd8ef7f501161353e4b1b81efacec9742ec25dec3b1cc80940898c785c1920a1aa68af10081f952ebde320075808 EBUILD whois-5.2.12.ebuild 1494 BLAKE2B b84e9fa6367d3f977423ff590d54d094f2d2cf218937f410619646f574b7810029a7b587a8d8600baed31cf050f19f67e5cb56f189175f516dad5af1cf9dce52 SHA512 ca9371338ccbba81f3a60a611e82b6702c4a43166d57c02cb029d1303fc2cee92cf2173f9381d888a48785191dd05719f66d3eb687bf90e4d987377d092700ff -EBUILD whois-5.2.18.ebuild 1514 BLAKE2B 282a50e1d78da86da2411b946eed93c5d4119fc1fa8e1df4d562f75e276192c4efb9abc3f47778906dc9e163e7c812ae185c66b20208cbc40f7a277637877c45 SHA512 1c8d4b22ce6b4d96e11e0c96d06adf246466ecd730fc535ce4b69a53d00d4be28f987957b54b4ce652e17c3e9feba639434d0feb14b015bd10f0b81290389dec EBUILD whois-5.2.19.ebuild 1514 BLAKE2B 282a50e1d78da86da2411b946eed93c5d4119fc1fa8e1df4d562f75e276192c4efb9abc3f47778906dc9e163e7c812ae185c66b20208cbc40f7a277637877c45 SHA512 1c8d4b22ce6b4d96e11e0c96d06adf246466ecd730fc535ce4b69a53d00d4be28f987957b54b4ce652e17c3e9feba639434d0feb14b015bd10f0b81290389dec +EBUILD whois-5.2.20.ebuild 1514 BLAKE2B 282a50e1d78da86da2411b946eed93c5d4119fc1fa8e1df4d562f75e276192c4efb9abc3f47778906dc9e163e7c812ae185c66b20208cbc40f7a277637877c45 SHA512 1c8d4b22ce6b4d96e11e0c96d06adf246466ecd730fc535ce4b69a53d00d4be28f987957b54b4ce652e17c3e9feba639434d0feb14b015bd10f0b81290389dec MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555 diff --git a/net-misc/whois/whois-5.2.18.ebuild b/net-misc/whois/whois-5.2.18.ebuild deleted file mode 100644 index b9d8673f4dc0..000000000000 --- a/net-misc/whois/whois-5.2.18.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit toolchain-funcs - -MY_P=${P/-/_} -DESCRIPTION="improved Whois Client" -HOMEPAGE="https://www.linux.it/~md/software/" -SRC_URI="mirror://debian/pool/main/w/whois/${MY_P}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux" -IUSE="iconv idn nls" -RESTRICT="test" #59327 - -RDEPEND="iconv? ( virtual/libiconv ) - idn? ( net-dns/libidn ) - nls? ( virtual/libintl )" -DEPEND="${RDEPEND} - app-arch/xz-utils - >=dev-lang/perl-5 - nls? ( sys-devel/gettext )" - -PATCHES=( - "${FILESDIR}"/${PN}-4.7.2-config-file.patch -) - -src_prepare() { - default - if use nls ; then - sed -i -e 's:#\(.*pos\):\1:' Makefile || die - else - sed -i -e '/ENABLE_NLS/s:define:undef:' config.h || die - - # don't generate po files when nls is disabled (bug #419889) - sed -i -e '/^all:/s/ pos//' \ - -e '/^install:/s/ install-pos//' Makefile || die - fi -} - -src_configure() { :;} # expected no-op - -src_compile() { - unset HAVE_ICONV HAVE_LIBIDN - use iconv && export HAVE_ICONV=1 - use idn && export HAVE_LIBIDN=1 - tc-export CC - emake CFLAGS="${CFLAGS} ${CPPFLAGS}" -} - -src_install() { - emake BASEDIR="${ED}" prefix=/usr install - insinto /etc - doins whois.conf - dodoc README debian/changelog - - if [[ ${USERLAND} != "GNU" ]]; then - mv "${ED}"/usr/share/man/man1/{whois,mdwhois}.1 || die - mv "${ED}"/usr/bin/{whois,mdwhois} || die - fi -} diff --git a/net-misc/whois/whois-5.2.20.ebuild b/net-misc/whois/whois-5.2.20.ebuild new file mode 100644 index 000000000000..b9d8673f4dc0 --- /dev/null +++ b/net-misc/whois/whois-5.2.20.ebuild @@ -0,0 +1,63 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +inherit toolchain-funcs + +MY_P=${P/-/_} +DESCRIPTION="improved Whois Client" +HOMEPAGE="https://www.linux.it/~md/software/" +SRC_URI="mirror://debian/pool/main/w/whois/${MY_P}.tar.xz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux" +IUSE="iconv idn nls" +RESTRICT="test" #59327 + +RDEPEND="iconv? ( virtual/libiconv ) + idn? ( net-dns/libidn ) + nls? ( virtual/libintl )" +DEPEND="${RDEPEND} + app-arch/xz-utils + >=dev-lang/perl-5 + nls? ( sys-devel/gettext )" + +PATCHES=( + "${FILESDIR}"/${PN}-4.7.2-config-file.patch +) + +src_prepare() { + default + if use nls ; then + sed -i -e 's:#\(.*pos\):\1:' Makefile || die + else + sed -i -e '/ENABLE_NLS/s:define:undef:' config.h || die + + # don't generate po files when nls is disabled (bug #419889) + sed -i -e '/^all:/s/ pos//' \ + -e '/^install:/s/ install-pos//' Makefile || die + fi +} + +src_configure() { :;} # expected no-op + +src_compile() { + unset HAVE_ICONV HAVE_LIBIDN + use iconv && export HAVE_ICONV=1 + use idn && export HAVE_LIBIDN=1 + tc-export CC + emake CFLAGS="${CFLAGS} ${CPPFLAGS}" +} + +src_install() { + emake BASEDIR="${ED}" prefix=/usr install + insinto /etc + doins whois.conf + dodoc README debian/changelog + + if [[ ${USERLAND} != "GNU" ]]; then + mv "${ED}"/usr/share/man/man1/{whois,mdwhois}.1 || die + mv "${ED}"/usr/bin/{whois,mdwhois} || die + fi +} -- cgit v1.2.3