summaryrefslogtreecommitdiff
path: root/net-libs
diff options
context:
space:
mode:
Diffstat (limited to 'net-libs')
-rw-r--r--net-libs/Manifest.gzbin34038 -> 34047 bytes
-rw-r--r--net-libs/libnfsidmap/Manifest2
-rw-r--r--net-libs/libnfsidmap/libnfsidmap-0.25-r1.ebuild2
-rw-r--r--net-libs/libssh/Manifest3
-rw-r--r--net-libs/libssh/files/libssh-0.7.5-add-macro-for-MAX.patch30
-rw-r--r--net-libs/libssh/files/libssh-0.7.5-fix-internal-algo-selection.patch156
-rw-r--r--net-libs/libssh/libssh-0.7.5-r2.ebuild102
-rw-r--r--net-libs/libupnp/Manifest2
-rw-r--r--net-libs/libupnp/metadata.xml4
-rw-r--r--net-libs/pjproject/Manifest2
-rw-r--r--net-libs/pjproject/pjproject-2.7.1.ebuild2
11 files changed, 296 insertions, 9 deletions
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index ca6429e87832..2ea60350b737 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
Binary files differ
diff --git a/net-libs/libnfsidmap/Manifest b/net-libs/libnfsidmap/Manifest
index 5b225ab3b479..4561b4e0a252 100644
--- a/net-libs/libnfsidmap/Manifest
+++ b/net-libs/libnfsidmap/Manifest
@@ -3,6 +3,6 @@ AUX libnfsidmap-0.21-headers.patch 438 BLAKE2B 0ef48276188f4142b2c85cb3cf326d37a
DIST libnfsidmap-0.24.tar.gz 328720 BLAKE2B 4b33a589b9d4b47530d2044a0912481dfda770de86f7aa90e80771f2df4b555857535a7f162a485b68c9b1d48be563d246e128fa3ca1e3c79d9bf0af69b8401d SHA512 1283a4af1bcf3c6f941ab294acc0b2b4bd9ca947f2d3c2e866717478ba2e7a2190a5467b71d7e9136c5c83de564c4892f9e3304323ae17e3988af2e40c43982b
DIST libnfsidmap-0.25.tar.gz 346587 BLAKE2B dbf31779371ba29737ed7a5901cf46f17e4a1b2ac444c2959d3ae76f41815e9a15a2ee892e417c5b7f97cf5f8396024071430fed028a8cd583aeed1a95e350df SHA512 8acf30790cdd19341c75cb8a4f7ee4dbc9f688c8514258046e55c8f4245df213709ccb7d5327a11b146b0e3b7266d3d4da018699c6be47fbedcc4cd384b54557
EBUILD libnfsidmap-0.24.ebuild 1072 BLAKE2B cbc056d0eaa632b3692b21d6062f5538ffda57035d2683c49808b4922f14da1e8673dd0301fe9452a70341046aa6d2a513d04947827f9b9d49a2313aa13e3687 SHA512 1de6d7598472c57587b95c46c0b2093438227efdc85800d340c85f32f05b2f4fe91b30c46c04fa735c8a222c47f2a0f0342624a296fad0f0abccdaaaf3d0432e
-EBUILD libnfsidmap-0.25-r1.ebuild 1231 BLAKE2B a57f9c6c56744ca97cd6f65674f6bc123716e9ec6133633908e08f57ce850d10b2b1ebc93fa5e1fb280e0228d6584664844c9e3efbf1dea1043b1a245b3c8548 SHA512 526e173b15404b68a9c09c5d4f41e017d73a5229de3276d214547b6e76a6d7036e7b0eb0a7889fbb828c6cdc1588e3f6410ccce1e7f63b219469f0b32dab1de9
+EBUILD libnfsidmap-0.25-r1.ebuild 1229 BLAKE2B 881c1dfb0d425d3d9058b3a5a90844b61ddfd6d38a3af364b88341f32e6c133f0210d3353b3d6e84fe9a66a2516af44b73f28cfa85c8bf0508c06b4590116d33 SHA512 90a4478ea2cd9d63118301cc6041855aae7f61bf87087458f25fa0c2542669668afdb263864b6fc0c493e96d2b9732825d7ba2146e4c82d30dd013e243a12d16
EBUILD libnfsidmap-0.25.ebuild 1041 BLAKE2B 7c070c248a742cc2accf30be188657705e28cebed9ae8cbc83b3871d40f642aabaeaa4a8dc0f5e4aed8d66a35ff77907eccbc426bb5fe6e507f155ddd9726233 SHA512 b4729a00a7552f9643cfeda532564ee206820c1ea59f54c938117c5b70eed67918fa96224693c277dff3c09cff7e4a2250af0f23e4d3338df77036c8549cf234
MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/net-libs/libnfsidmap/libnfsidmap-0.25-r1.ebuild b/net-libs/libnfsidmap/libnfsidmap-0.25-r1.ebuild
index 57fc3127c9b9..b9e744395d7d 100644
--- a/net-libs/libnfsidmap/libnfsidmap-0.25-r1.ebuild
+++ b/net-libs/libnfsidmap/libnfsidmap-0.25-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.citi.umich.edu/projects/nfsv4/linux/libnfsidmap/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh sparc ~x86"
IUSE="ldap static-libs"
DEPEND="ldap? ( net-nds/openldap )"
diff --git a/net-libs/libssh/Manifest b/net-libs/libssh/Manifest
index 47e5bb3d48ef..eb82c2f2d8e9 100644
--- a/net-libs/libssh/Manifest
+++ b/net-libs/libssh/Manifest
@@ -1,9 +1,12 @@
AUX libssh-0.5.0-tests.patch 446 BLAKE2B dab1ad97c37e43f25ca6acb3aef57542f4f0e3059618240da0f600ed0aa364dc9c0eee92dc1f6ac848b11da2f69fcbb4b75b0393727774b928202f7f3685853f SHA512 e751ac1c3749ecbd8ee2f960ad09e861763cbdb9bccc7c95ae27ca4768e8c9ae5ab55342151a2799f8f937e63a8729bff6f04cec166bb9830b99f8f690da4825
+AUX libssh-0.7.5-add-macro-for-MAX.patch 916 BLAKE2B bc24cd008159c9c20ff75dc17842921ac1aa920d359aede3bc933c54024790ad9869ae44f9a81392cb73f967b6af69848d5e1c6ee2ea17c81edb8cb798c89b8a SHA512 9a9fd719cdbe42f0b2520104af4bd31d24721cb356d40a70870d2f95166c16e2c58c4a9568958a051214fa813fcadc55477c6a743d65c301ee27a83fc8abc119
AUX libssh-0.7.5-fix-config-buffer-underflow.patch 742 BLAKE2B 5db1e2be05b45914bd832d1c3ecfa850ab2dfa88baba5566c41e8acf783a8dd0cf118851344dc8ddba39393532bede4d8a6134aa81d121da18bff9c1b4ffd27c SHA512 0e6ed4f39637b5bc3476225b1cbd28891e668609e681b4b55343c37d6a7f0c5be0f71ce684b6a83ab5e5f14cca3206d0752a17cab1138fdf274656ba36a764e5
AUX libssh-0.7.5-fix-config-parsing.patch 1076 BLAKE2B f710d58d36ec529c9390647b1a53506defe4a480463e899f8d7aeb8fe7d0d463b80f87ab6ec35fd89afadadb5f7698ac3e33a6f5693092494bfb1cf43886a9e6 SHA512 45d21c11ce242d6f2a86fe1fe96ed934a06d0dd54b9e2af6ad873bbec1b0db91cb884879205f42c1006740a4cfc1c16723180f447640e96e8373b39be8828aa5
+AUX libssh-0.7.5-fix-internal-algo-selection.patch 4711 BLAKE2B 04d61ee7ab3eba651342ac2b3dba52ef191271de37e741b2cb82da11c2f9cfb19d64a6befe9ebbab8d8525bd75c9213dee56c32023340db92e046827835df7ae SHA512 29bf9b43c8ee2f65c65040163fc9f250f35d5ca77ace5db2782eb8478dc14d9d16c0cf0e991025443a701d3d60124f83134a35e7cde6fae20932e3d2ff4b6732
DIST libssh-0.7.4.tar.xz 351892 BLAKE2B 5427faa04eac7b57f73909f113d933daf667f8311c30364bbf06d4f01121a58f5b560e0a1d9071655ce9b310fa3f3f801e11e880ca3eacde66efa0f49dc51b2b SHA512 94b8183e5c83e339303c1a160c92ccff6159471ac7d189ab66cf6d606d2e803fd616519f079aef1577c947d3a14e315332b05ea08e44d0ab550edbcb768dbea7
DIST libssh-0.7.5.tar.xz 351632 BLAKE2B b41cccb6215c5b7e66742171d91e1081d3c1bf44455b65a5992093d31b28db7a6375e815303e115e02b2458c734d9c61e4b1528ba905bf8a421ca2bbb7221ce6 SHA512 6c7f539899caaedf13d66fa2e0fac1a475ecdfe389131abcbdf908bdebc50a0b9e6b0d43e67e52aea85c32f6aa68e46ca2f50695992f82ded83489f445a8e775
EBUILD libssh-0.7.4.ebuild 2478 BLAKE2B 86cdd0d7445a37fbff25a82b79cd910645525a668e534abcf96a6e4ca9846d5d20fbe8c4891bd4878f0bfb315a283b3a970565963c59fe6a51d5d56d9382994a SHA512 1c7b902fd9dbd2e4826be08c9d326dd3bf858e8ebedfe489ddcef917c888f225742967b93cdf8d647bb42ff4e5938b463e3e7526afd76986b7561399ffb10079
EBUILD libssh-0.7.5-r1.ebuild 2584 BLAKE2B 21ee1d5dcb7013d613bc1573ee2a0fd0f56e762cb85e382cfae0e8571fb6bd83d2b9c474245855e70db063644d6e0cf26d33cb32dac543d9ed877f8564208166 SHA512 5d6f02c98c35d7477a230fd9e1612c53deb410bc095e874df73ae2b58f67698cb1e22d8a321c56b3ab55be2fb0a6d993f52e073f27b4aa35dae3f2429d9d5b15
+EBUILD libssh-0.7.5-r2.ebuild 2682 BLAKE2B 1eee63589d01385c1a19c352365beb42bfee67a455d5fa88abb36feafb5faaa5411f6c488f5e430be01801f7eadd140e759c8168336c5e07124596f9341738fb SHA512 3a10f683429c400e47a6215409c25b584e6c3f9b782d605dd50ddbee25c87c3d68afb93f5af5bfb523376c5a2e90bd1285eb6694ca63db8f541abb708d79dd07
EBUILD libssh-9999.ebuild 2128 BLAKE2B 394967b5e90dbeddbfa8f2fc9fcf17afc0f2c282bf25c5efc8a0e3786573dd9750bcdc63732610bc87e9b779c29014753acc95d239d6b9c3b67a412f908d09a9 SHA512 49e17db7bce80cc8b70ac3ba51f874007e0f09b8407a7e2af3cde79c5d2ec713aed317d258b4cefb7b753b790219c882931cc06154187683dacc83e2a5ab7cb5
MISC metadata.xml 648 BLAKE2B bd4e4be029fdb3ef1e5ce2e16b6f5b922bf43c32ff4ecd50a67db98f9f7669022caf96d965fc85065b5ea8ac65b5547bc3d62d1da6bebdbc5a9a877be5a23c18 SHA512 4e99644645a43ccf7c479c6808ecb2dfe9f9aba69518ab1e2a1289732b926d853ff5554c69fff71e4bb572d12af298ebe19ecb1086da2e8675153b5c42faf589
diff --git a/net-libs/libssh/files/libssh-0.7.5-add-macro-for-MAX.patch b/net-libs/libssh/files/libssh-0.7.5-add-macro-for-MAX.patch
new file mode 100644
index 000000000000..d9226d697000
--- /dev/null
+++ b/net-libs/libssh/files/libssh-0.7.5-add-macro-for-MAX.patch
@@ -0,0 +1,30 @@
+From 310d423d36ae7bb6dac5a2ae2fb7b57bda72dcb5 Mon Sep 17 00:00:00 2001
+From: Andreas Schneider <asn@cryptomilk.org>
+Date: Thu, 24 Aug 2017 17:27:08 +0200
+Subject: [PATCH 1/2] priv: Add macro for MAX
+
+Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
+(cherry picked from commit de35212789d11086621e176a11399de0d75ab3a6)
+Signed-off-by: Mihai Moldovan <ionic@ionic.de>
+---
+ include/libssh/priv.h | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/include/libssh/priv.h b/include/libssh/priv.h
+index 5a74915e..c3373c00 100644
+--- a/include/libssh/priv.h
++++ b/include/libssh/priv.h
+@@ -263,6 +263,10 @@ int match_hostname(const char *host, const char *pattern, unsigned int len);
+ #define MIN(a,b) ((a) < (b) ? (a) : (b))
+ #endif
+
++#ifndef MAX
++#define MAX(a,b) ((a) > (b) ? (a) : (b))
++#endif
++
+ /** Free memory space */
+ #define SAFE_FREE(x) do { if ((x) != NULL) {free(x); x=NULL;} } while(0)
+
+--
+2.15.1
+
diff --git a/net-libs/libssh/files/libssh-0.7.5-fix-internal-algo-selection.patch b/net-libs/libssh/files/libssh-0.7.5-fix-internal-algo-selection.patch
new file mode 100644
index 000000000000..931d63360a12
--- /dev/null
+++ b/net-libs/libssh/files/libssh-0.7.5-fix-internal-algo-selection.patch
@@ -0,0 +1,156 @@
+From 4893f9515da2696490e6bbe9aaf51f2ef9678b0f Mon Sep 17 00:00:00 2001
+From: Nikos Mavrogiannopoulos <nmav@redhat.com>
+Date: Thu, 24 Aug 2017 16:28:39 +0200
+Subject: [PATCH 2/2] ssh_options_set_algo: ensure we only set known algorithms
+ internally
+
+That way, we will not fail later on key exchange phase when something
+unknown is negotiated.
+
+Fixes T37
+
+Signed-off-by: Nikos Mavrogiannopoulos <nmav@redhat.com>
+Reviewed-by: Andreas Schneider <asn@samba.org>
+(cherry picked from commit 895055ab38e7716390019aae5e11771a88b99d26)
+Signed-off-by: Mihai Moldovan <ionic@ionic.de>
+---
+ include/libssh/kex.h | 1 +
+ src/kex.c | 75 ++++++++++++++++++++++++++++++++++++++++++++++++++++
+ src/options.c | 11 ++++----
+ 3 files changed, 81 insertions(+), 6 deletions(-)
+
+diff --git a/include/libssh/kex.h b/include/libssh/kex.h
+index 1a5b6d41..23594985 100644
+--- a/include/libssh/kex.h
++++ b/include/libssh/kex.h
+@@ -41,6 +41,7 @@ void ssh_list_kex(struct ssh_kex_struct *kex);
+ int set_client_kex(ssh_session session);
+ int ssh_kex_select_methods(ssh_session session);
+ int verify_existing_algo(int algo, const char *name);
++char *keep_known_algos(int algo, const char *list);
+ char **space_tokenize(const char *chain);
+ int ssh_get_kex1(ssh_session session);
+ char *ssh_find_matching(const char *in_d, const char *what_d);
+diff --git a/src/kex.c b/src/kex.c
+index 519d79ce..f0c9d067 100644
+--- a/src/kex.c
++++ b/src/kex.c
+@@ -281,6 +281,71 @@ char *ssh_find_matching(const char *available_d, const char *preferred_d){
+ return NULL;
+ }
+
++static char *ssh_find_all_matching(const char *available_d,
++ const char *preferred_d)
++{
++ char **tok_available, **tok_preferred;
++ int i_avail, i_pref;
++ char *ret;
++ unsigned max, len, pos = 0;
++
++ if ((available_d == NULL) || (preferred_d == NULL)) {
++ return NULL; /* don't deal with null args */
++ }
++
++ max = MAX(strlen(available_d), strlen(preferred_d));
++
++ ret = malloc(max+1);
++ if (ret == NULL) {
++ return NULL;
++ }
++ ret[0] = 0;
++
++ tok_available = tokenize(available_d);
++ if (tok_available == NULL) {
++ SAFE_FREE(ret);
++ return NULL;
++ }
++
++ tok_preferred = tokenize(preferred_d);
++ if (tok_preferred == NULL) {
++ SAFE_FREE(ret);
++ SAFE_FREE(tok_available[0]);
++ SAFE_FREE(tok_available);
++ return NULL;
++ }
++
++ for (i_pref = 0; tok_preferred[i_pref] ; ++i_pref) {
++ for (i_avail = 0; tok_available[i_avail]; ++i_avail) {
++ int cmp = strcmp(tok_available[i_avail],tok_preferred[i_pref]);
++ if (cmp == 0) {
++ /* match */
++ if (pos != 0) {
++ ret[pos] = ',';
++ pos++;
++ }
++
++ len = strlen(tok_available[i_avail]);
++ memcpy(&ret[pos], tok_available[i_avail], len);
++ pos += len;
++ ret[pos] = '\0';
++ }
++ }
++ }
++
++ if (ret[0] == '\0') {
++ SAFE_FREE(ret);
++ ret = NULL;
++ }
++
++ SAFE_FREE(tok_available[0]);
++ SAFE_FREE(tok_preferred[0]);
++ SAFE_FREE(tok_available);
++ SAFE_FREE(tok_preferred);
++
++ return ret;
++}
++
+ /**
+ * @internal
+ * @brief returns whether the first client key exchange algorithm or
+@@ -668,4 +733,14 @@ int verify_existing_algo(int algo, const char *name){
+ return 0;
+ }
+
++/* returns a copy of the provided list if everything is supported,
++ * otherwise a new list of the supported algorithms */
++char *keep_known_algos(int algo, const char *list)
++{
++ if ((algo > 9) || (algo < 0)) {
++ return NULL;
++ }
++
++ return ssh_find_all_matching(supported_methods[algo], list);
++}
+ /* vim: set ts=2 sw=2 et cindent: */
+diff --git a/src/options.c b/src/options.c
+index aed2dda5..34fe9cc7 100644
+--- a/src/options.c
++++ b/src/options.c
+@@ -164,7 +164,10 @@ int ssh_options_copy(ssh_session src, ssh_session *dest) {
+
+ int ssh_options_set_algo(ssh_session session, int algo,
+ const char *list) {
+- if (!verify_existing_algo(algo, list)) {
++ char *p = NULL;
++
++ p = keep_known_algos(algo, list);
++ if (p == NULL) {
+ ssh_set_error(session, SSH_REQUEST_DENIED,
+ "Setting method: no algorithm for method \"%s\" (%s)\n",
+ ssh_kex_get_description(algo), list);
+@@ -172,11 +175,7 @@ int ssh_options_set_algo(ssh_session session, int algo,
+ }
+
+ SAFE_FREE(session->opts.wanted_methods[algo]);
+- session->opts.wanted_methods[algo] = strdup(list);
+- if (session->opts.wanted_methods[algo] == NULL) {
+- ssh_set_error_oom(session);
+- return -1;
+- }
++ session->opts.wanted_methods[algo] = p;
+
+ return 0;
+ }
+--
+2.15.1
+
diff --git a/net-libs/libssh/libssh-0.7.5-r2.ebuild b/net-libs/libssh/libssh-0.7.5-r2.ebuild
new file mode 100644
index 000000000000..381d0dd66c08
--- /dev/null
+++ b/net-libs/libssh/libssh-0.7.5-r2.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_P="${PN}-${PV/_rc/rc}"
+inherit cmake-multilib
+
+DESCRIPTION="Access a working SSH implementation by means of a library"
+HOMEPAGE="https://www.libssh.org/"
+SRC_URI="https://red.libssh.org/attachments/download/218/${MY_P}.tar.xz -> ${P}.tar.xz"
+
+LICENSE="LGPL-2.1"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+SLOT="0/4" # subslot = soname major version
+IUSE="debug doc examples gcrypt gssapi libressl pcap server +sftp ssh1 static-libs test zlib"
+# Maintainer: check IUSE-defaults at DefineOptions.cmake
+
+RDEPEND="
+ !gcrypt? (
+ !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
+ libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
+ )
+ gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] )
+ gssapi? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
+ zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+ doc? ( app-doc/doxygen )
+ test? ( >=dev-util/cmocka-0.3.1[${MULTILIB_USEDEP}] )
+"
+
+DOCS=( AUTHORS README ChangeLog )
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.5.0-tests.patch
+ "${FILESDIR}"/${P}-fix-config-parsing.patch
+ "${FILESDIR}"/${P}-fix-config-buffer-underflow.patch
+ "${FILESDIR}"/${P}-add-macro-for-MAX.patch
+ "${FILESDIR}"/${P}-fix-internal-algo-selection.patch
+)
+
+src_prepare() {
+ cmake-utils_src_prepare
+
+ # just install the examples do not compile them
+ sed -i \
+ -e '/add_subdirectory(examples)/s/^/#DONOTWANT/' \
+ CMakeLists.txt || die
+
+ # keyfile torture test is currently broken
+ sed -i \
+ -e '/torture_keyfiles/d' \
+ tests/unittests/CMakeLists.txt || die
+}
+
+multilib_src_configure() {
+ local mycmakeargs=(
+ -DWITH_DEBUG_CALLTRACE="$(usex debug)"
+ -DWITH_DEBUG_CRYPTO="$(usex debug)"
+ -DWITH_GCRYPT="$(usex gcrypt)"
+ -DWITH_GSSAPI="$(usex gssapi)"
+ -DWITH_NACL=no
+ -DWITH_PCAP="$(usex pcap)"
+ -DWITH_SERVER="$(usex server)"
+ -DWITH_SFTP="$(usex sftp)"
+ -DWITH_SSH1="$(usex ssh1)"
+ -DWITH_STATIC_LIB="$(usex static-libs)"
+ -DWITH_STATIC_LIB="$(usex test)"
+ -DWITH_TESTING="$(usex test)"
+ -DWITH_ZLIB="$(usex zlib)"
+ )
+
+ cmake-utils_src_configure
+}
+
+multilib_src_compile() {
+ cmake-utils_src_compile
+ multilib_is_native_abi && use doc && cmake-utils_src_compile doc
+}
+
+multilib_src_install() {
+ cmake-utils_src_install
+
+ if multilib_is_native_abi && use doc ; then
+ docinto html
+ dodoc -r doc/html/.
+ fi
+
+ use static-libs || rm -f "${D}"/usr/$(get_libdir)/libssh{,_threads}.a
+}
+
+multilib_src_install_all() {
+ einstalldocs
+
+ if use examples; then
+ docinto examples
+ dodoc examples/*.{c,h,cpp}
+ fi
+}
diff --git a/net-libs/libupnp/Manifest b/net-libs/libupnp/Manifest
index 10cfd30744af..5c47dd57ec2f 100644
--- a/net-libs/libupnp/Manifest
+++ b/net-libs/libupnp/Manifest
@@ -8,4 +8,4 @@ EBUILD libupnp-1.6.21.ebuild 1055 BLAKE2B 5d99da65caf585e6e7905f8259f2e51afabcc5
EBUILD libupnp-1.6.24.ebuild 1063 BLAKE2B 5c2594a273294a9cdae93791ae6091b508200680dc0acc645e29908526ae5e257cadd5707a9e2714aaef536d350465063b41bd37d1bc40b8a4386994dfa727a3 SHA512 f0bdabea95e6d138c44747741c136a3baff104e33177495a49c5b2919413d987003cf4c35cdef3e28c932917db2378b6cc31c4ebe439dd5f5b7cc61a3605fda4
EBUILD libupnp-1.8.2.ebuild 1716 BLAKE2B a7a63be7eef83a56f8e6e1313d3d8368541d8282cb367834ebdf5854d46a38d723c23b8eabcbe568591af2adcd199a4170c08b6f0404f7e5c1349a1edf95a99c SHA512 2ea16eccfb1e22f4d4f306dd9b5301b2fbf5b913a4e9ac142b7a7412c83e3621f0ad22a74107886e8cef7d58e5353796c478dafad7ac666050f1ca9cf08e55bc
EBUILD libupnp-1.8.3-r1.ebuild 1773 BLAKE2B 27ae00ecd8c1d01663b071f658dfb42b8eb6bca42087d6774c6139c56095014bd6713fe460eb391bce9e61ce2136c608b368c012e3292f3dd3d28d3525db69bb SHA512 36dc05b2d47a2f8b587cc424dad8d443d3a351ef2ee7d993b16f849f0126008b18b6babebbebe0dacd413f17146932bc4a92bf88b2ba9a7dc84a75ee0c28a83d
-MISC metadata.xml 756 BLAKE2B a9bd20b0c7b50d43dd2f99b644645a7e33a0672c313ba85bb54971c95a197eb8041795f91aa9dd95c2936ac22c907b5043fab5176dc7b62a5e8d6f647ca308d0 SHA512 66975c44b2ee5589c63f31a0033bfe04897b651ffc7e71188e50ec653e003322647346ea873ac7387ef0b2f660e82bfe02ba01ef7d0d124b37b22fabe927b2e4
+MISC metadata.xml 630 BLAKE2B 9dd1d4fce0c63b8d558e2b377f603fa2070f14e82ffd1b2b4707b654aead28109ab08b38bfbbdb5b1fbce0e4a8053bfbabbe4c77f0a55406c6783cabcc8fddce SHA512 ec914b0598d40bd6c3947ed423d9252379b3e4997ee3632fe0212a19a49b7375cc0c2c1705fa51dd653105807b9b6bca3a1f672b7ab57a18810bad737f022739
diff --git a/net-libs/libupnp/metadata.xml b/net-libs/libupnp/metadata.xml
index 53c42dd90258..2c151ee1ce2b 100644
--- a/net-libs/libupnp/metadata.xml
+++ b/net-libs/libupnp/metadata.xml
@@ -5,10 +5,6 @@
<email>thev00d00@gentoo.org</email>
<name>Ian Whyman</name>
</maintainer>
- <maintainer type="person">
- <email>gurligebis@gentoo.org</email>
- <name>Bjarke Istrup Pedersen</name>
- </maintainer>
<upstream>
<remote-id type="sourceforge">pupnp</remote-id>
<remote-id type="github">mrjimenez/pupnp</remote-id>
diff --git a/net-libs/pjproject/Manifest b/net-libs/pjproject/Manifest
index 2ad78a88d1f5..434a95103b27 100644
--- a/net-libs/pjproject/Manifest
+++ b/net-libs/pjproject/Manifest
@@ -1,4 +1,4 @@
AUX pjproject-2.7.1-ssl-flipflop.patch 4345 BLAKE2B b52f5a2cb86abdae86e9cfe58fe63b187f615b39ea4991768d0937e8b6e353a8496f1ad24f3cbaff92a09847c1ec444b81f9e470f1e78325ea26ca04456579e7 SHA512 00e7b8b347f73929f52015e102286f0631699de4c0e3631c53df6b00130d5b6760492748454ae7315eb9df0b182019901c59b9ed15c8fdd578548f9039080050
DIST pjproject-2.7.1.tar.bz2 4880007 BLAKE2B 33fca89f07abc0b9662b1070c96b903c236a60149734755286dad3111411dbeef5779077a77d21112be6db2957cb7e18c5c833b3c5fd32c26be44d4550fb215e SHA512 cd15afee2a02659668ff228b2652d2bd179393e3b5031afae1c326354fb9676babc08eb689e466165536abc360684299b4fdb41dbb1148aed89afe1ce7e5d979
-EBUILD pjproject-2.7.1.ebuild 2612 BLAKE2B 54521f7df9bda11dd925820bf39c0136bf5850f89ddc9a2cab517fa86be2a3eb93c8bf0c277109ea6d6fd47fb5a11aedbd944178a481258996ab5e3eab329326 SHA512 c4842f91ecce45548929f2504829a68bb00d7eb2e45c4a1cddc80a8acea4ef215ae32f5c7a17540f4fbabe89b90b79b68d86dad6aa40071da74f561f2780bb44
+EBUILD pjproject-2.7.1.ebuild 2611 BLAKE2B 1042fd527c2c8196a53e28675cb37076cbf87a3e9cc09b7f754c686605c8c582eb3ac71aa1a6fbcbeb3df757394256fa49d823890b4d42faaa76ae4fde190613 SHA512 71b1b11d80809ec0a62634082653abee950ddeec7852fc9b24b3d7cfd55d6862f83884da4a6386ff53833feb08e12df23a29ceeb920fc0c6ee28a487fd3dcce1
MISC metadata.xml 1157 BLAKE2B 1b40ee1b635cb8cdafaf001ad458264c4e55344393fd76ac7263521069bd355e4febd7ef534b24bd3879a75e5229863d8b93b8d89019639c49bb7511e1044ca5 SHA512 1171e638d0320d07b0bf3d6a6d31a75722dd659b296d9f451cfe1d3cc12016ff5b1c94b690054bb3772462d7a8d70b47fcb8b5c760c8677a727743ecebb57dce
diff --git a/net-libs/pjproject/pjproject-2.7.1.ebuild b/net-libs/pjproject/pjproject-2.7.1.ebuild
index e4d25565824a..ce4a363c5017 100644
--- a/net-libs/pjproject/pjproject-2.7.1.ebuild
+++ b/net-libs/pjproject/pjproject-2.7.1.ebuild
@@ -8,7 +8,7 @@ inherit autotools flag-o-matic
DESCRIPTION="Open source SIP, Media, and NAT Traversal Library"
HOMEPAGE="http://www.pjsip.org/"
SRC_URI="http://www.pjsip.org/release/${PV}/${P}.tar.bz2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
LICENSE="GPL-2"
SLOT="0"