[gentoo-commits] repo/gentoo:master commit in: net-libs/openslp/

2019-05-05 Thread Mikle Kolyada
commit: 2620c49b9e783760b518e66c8651814a2b152356
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Sun May  5 18:32:30 2019 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Sun May  5 18:41:19 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2620c49b

net-libs/openslp: Add ~riscv keyword

Signed-off-by: Mikle Kolyada  gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11

 net-libs/openslp/openslp-2.0.0-r5.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-libs/openslp/openslp-2.0.0-r5.ebuild 
b/net-libs/openslp/openslp-2.0.0-r5.ebuild
index 5871635b554..6178fcf4390 100644
--- a/net-libs/openslp/openslp-2.0.0-r5.ebuild
+++ b/net-libs/openslp/openslp-2.0.0-r5.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
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/openslp/${P}.tar.gz"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="libressl"
 RESTRICT="test"
 



[gentoo-commits] repo/gentoo:master commit in: net-libs/openslp/

2018-07-15 Thread Mart Raudsepp
commit: 10a6bfb20803c863456ae53e562e993d48b23619
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Sun Jul 15 10:46:11 2018 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Sun Jul 15 11:26:55 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10a6bfb2

net-libs/openslp-2.0.0-r5: arm64 stable

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 net-libs/openslp/openslp-2.0.0-r5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/openslp/openslp-2.0.0-r5.ebuild 
b/net-libs/openslp/openslp-2.0.0-r5.ebuild
index 1b765349b63..5871635b554 100644
--- a/net-libs/openslp/openslp-2.0.0-r5.ebuild
+++ b/net-libs/openslp/openslp-2.0.0-r5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/openslp/${P}.tar.gz"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="libressl"
 RESTRICT="test"
 



[gentoo-commits] repo/gentoo:master commit in: net-libs/openslp/

2018-06-12 Thread Mikle Kolyada
commit: be0cac643a2fa2607e3bd7a4921135b371dd6bea
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Tue Jun 12 15:37:11 2018 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Tue Jun 12 15:37:11 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be0cac64

net-libs/openslp: mark s390 stable

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 net-libs/openslp/openslp-2.0.0-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/openslp/openslp-2.0.0-r4.ebuild 
b/net-libs/openslp/openslp-2.0.0-r4.ebuild
index d8524e0c019..44b330d8ce9 100644
--- a/net-libs/openslp/openslp-2.0.0-r4.ebuild
+++ b/net-libs/openslp/openslp-2.0.0-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/openslp/${P}.tar.gz"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 
~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 
~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="libressl"
 RESTRICT="test"
 



[gentoo-commits] repo/gentoo:master commit in: net-libs/openslp/

2017-06-19 Thread Alexis Ballier
commit: 631c86dbba0d1bfc4382a13030b9fd4af5621b66
Author: Alexis Ballier  gentoo  org>
AuthorDate: Mon Jun 19 18:11:33 2017 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Mon Jun 19 18:12:29 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=631c86db

net-libs/openslp: keyword ~arm64

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 net-libs/openslp/openslp-2.0.0-r5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/openslp/openslp-2.0.0-r5.ebuild 
b/net-libs/openslp/openslp-2.0.0-r5.ebuild
index db368f045b1..f41d437d410 100644
--- a/net-libs/openslp/openslp-2.0.0-r5.ebuild
+++ b/net-libs/openslp/openslp-2.0.0-r5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/openslp/${P}.tar.gz"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="libressl"
 RESTRICT="test"
 



[gentoo-commits] repo/gentoo:master commit in: net-libs/openslp/

2017-06-09 Thread Andreas Hüttel
commit: 7163823dc4c71c35f4b1e800e76cf8b09834b217
Author: Andreas K. Hüttel  gentoo  org>
AuthorDate: Fri Jun  9 23:23:23 2017 +
Commit: Andreas Hüttel  gentoo  org>
CommitDate: Fri Jun  9 23:23:23 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7163823d

net-libs/openslp: Remove old

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 net-libs/openslp/openslp-2.0.0-r1.ebuild | 36 ---
 net-libs/openslp/openslp-2.0.0-r2.ebuild | 41 ---
 net-libs/openslp/openslp-2.0.0-r3.ebuild | 42 
 3 files changed, 119 deletions(-)

diff --git a/net-libs/openslp/openslp-2.0.0-r1.ebuild 
b/net-libs/openslp/openslp-2.0.0-r1.ebuild
deleted file mode 100644
index eb8e4ee2ecf..000
--- a/net-libs/openslp/openslp-2.0.0-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils autotools systemd
-
-DESCRIPTION="An open-source implementation of Service Location Protocol"
-HOMEPAGE="http://www.openslp.org/;
-SRC_URI="mirror://sourceforge/openslp/${P}.tar.gz"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="libressl"
-RESTRICT="test"
-
-DEPEND="
-   !libressl? ( dev-libs/openssl:0= )
-   libressl? ( dev-libs/libressl:0= )
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-   epatch "${FILESDIR}"/${PN}-2.0.0-cflags.patch
-   eautoreconf
-}
-
-src_install() {
-   make DESTDIR="${D}" install || die "make install failed"
-   dodoc AUTHORS FAQ ChangeLog NEWS README* THANKS
-   rm -rfv "${D}"/usr/doc
-   dohtml -r .
-   newinitd "${FILESDIR}"/slpd-init slpd
-   systemd_dounit "${FILESDIR}"/slpd.service
-}

diff --git a/net-libs/openslp/openslp-2.0.0-r2.ebuild 
b/net-libs/openslp/openslp-2.0.0-r2.ebuild
deleted file mode 100644
index 7830969bc71..000
--- a/net-libs/openslp/openslp-2.0.0-r2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools systemd
-
-DESCRIPTION="An open-source implementation of Service Location Protocol"
-HOMEPAGE="http://www.openslp.org/;
-SRC_URI="mirror://sourceforge/openslp/${P}.tar.gz"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="libressl"
-RESTRICT="test"
-
-DEPEND="
-   !libressl? ( dev-libs/openssl:0= )
-   libressl? ( dev-libs/libressl:0= )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-2.0.0-cflags.patch
-   "${FILESDIR}"/${PN}-2.0.0-CVE-2016-4912.patch
-)
-
-src_prepare() {
-   default
-   eautoreconf
-}
-
-src_install() {
-   make DESTDIR="${D}" install || die "make install failed"
-   dodoc AUTHORS FAQ ChangeLog NEWS README* THANKS
-   rm -rfv "${D}"/usr/doc
-   dohtml -r .
-   newinitd "${FILESDIR}"/slpd-init slpd
-   systemd_dounit "${FILESDIR}"/slpd.service
-}

diff --git a/net-libs/openslp/openslp-2.0.0-r3.ebuild 
b/net-libs/openslp/openslp-2.0.0-r3.ebuild
deleted file mode 100644
index 961503ab726..000
--- a/net-libs/openslp/openslp-2.0.0-r3.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools systemd
-
-DESCRIPTION="An open-source implementation of Service Location Protocol"
-HOMEPAGE="http://www.openslp.org/;
-SRC_URI="mirror://sourceforge/openslp/${P}.tar.gz"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="libressl"
-RESTRICT="test"
-
-DEPEND="
-   !libressl? ( dev-libs/openssl:0= )
-   libressl? ( dev-libs/libressl:0= )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-2.0.0-cflags.patch
-   "${FILESDIR}"/${PN}-2.0.0-CVE-2016-4912.patch
-   "${FILESDIR}"/${PN}-2.0.0-CVE-2012-4428.patch
-)
-
-src_prepare() {
-   default
-   eautoreconf
-}
-
-src_install() {
-   make DESTDIR="${D}" install || die "make install failed"
-   dodoc AUTHORS FAQ ChangeLog NEWS README* THANKS
-   rm -rfv "${D}"/usr/doc
-   dohtml -r .
-   newinitd "${FILESDIR}"/slpd-init slpd
-   systemd_dounit "${FILESDIR}"/slpd.service
-}



[gentoo-commits] repo/gentoo:master commit in: net-libs/openslp/, net-libs/openslp/files/

2017-06-09 Thread Andreas Hüttel
commit: 7b3f685d9e0370f61574f8a810c79dfc13024bce
Author: Andreas K. Hüttel  gentoo  org>
AuthorDate: Fri Jun  9 23:22:19 2017 +
Commit: Andreas Hüttel  gentoo  org>
CommitDate: Fri Jun  9 23:22:44 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b3f685d

net-libs/openslp: Revision bump for bug 617278

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 .../openslp/files/openslp-2.0.0-namespace.patch| 773 +
 net-libs/openslp/openslp-2.0.0-r5.ebuild   |  44 ++
 2 files changed, 817 insertions(+)

diff --git a/net-libs/openslp/files/openslp-2.0.0-namespace.patch 
b/net-libs/openslp/files/openslp-2.0.0-namespace.patch
new file mode 100644
index 000..b5e81787740
--- /dev/null
+++ b/net-libs/openslp/files/openslp-2.0.0-namespace.patch
@@ -0,0 +1,773 @@
+# HG changeset patch
+# User John Calcote 
+# Date 1491588156 21600
+#  Fri Apr 07 12:02:36 2017 -0600
+# Node ID 51ed69107d096c5b9886954d89e0709975d5aa15
+# Parent  c1c294ce953e35f757020b01314cfc49556ccc0c
+BUG#149: cleanup libslp namespace; fix ctype function calls throughout.
+
+diff -ruN openslp-2.0.0.orig/common/slp_compare.c 
openslp-2.0.0/common/slp_compare.c
+--- openslp-2.0.0.orig/common/slp_compare.c2017-06-10 01:15:33.214875294 
+0200
 openslp-2.0.0/common/slp_compare.c 2017-06-10 01:16:39.072878034 +0200
+@@ -83,9 +83,10 @@
+  *
+  * @internal
+  */
+-int strncasecmp(const char * s1, const char * s2, size_t len)
++int slp_strncasecmp(const char * s1, const char * s2, size_t len)
+ {
+-   while (*s1 && (*s1 == *s2 || tolower(*s1) == tolower(*s2)))
++   while (*s1 && (*s1 == *s2
++ || tolower((unsigned char)*s1) == tolower((unsigned char)*s2)))
+{
+   len--;
+   if (len == 0)
+@@ -93,7 +94,7 @@
+   s1++;
+   s2++;
+}
+-   return len? (int)(*(unsigned char *)s1 - (int)*(unsigned char *)s2): 0;
++   return len? (unsigned char)*s1 - (unsigned char)*s2: 0;
+ }
+ # endif
+ 
+@@ -113,11 +114,12 @@
+  *
+  * @internal
+  */
+-int strcasecmp(const char * s1, const char * s2)
++int slp_strcasecmp(const char * s1, const char * s2)
+ {
+-   while (*s1 && (*s1 == *s2 || tolower(*s1) == tolower(*s2)))
++   while (*s1 && (*s1 == *s2 
++ || tolower((unsigned char)*s1) == tolower((unsigned char)*s2)))
+   s1++, s2++;
+-   return (int)(*(unsigned char *)s1 - (int)*(unsigned char *)s2);
++   return (unsigned char)*s1 - (unsigned char)*s2;
+ }
+ # endif
+ #endif
+@@ -202,13 +204,13 @@
+char * p = str, * ep = str + len;
+while (p < ep)
+{
+-  if (isspace(*p))
++  if (isspace((unsigned char)*p))
+   {
+- char * ws2p = ++p;/* Point ws2p to the second ws char. */
+- while (p < ep && isspace(*p)) /* Scan till we hit a non-ws char. */
++ char * ws2p = ++p;   /* Point ws2p to the 
second ws char. */
++ while (p < ep && isspace((unsigned char)*p)) /* Scan till we hit a 
non-ws char. */
+ p++;
+- len -= p - ws2p;  /* Reduce the length by extra ws. */
+- memmove(ws2p, p, ep - p); /* Overwrite the extra white space. */
++ len -= p - ws2p; /* Reduce the length by 
extra ws. */
++ memmove(ws2p, p, ep - p);/* Overwrite the extra 
white space. */
+   }
+   p++;
+}
+@@ -276,9 +278,9 @@
+char *upd = dststr;
+while (len > 0 && *srcstr)
+{
+-  if (isspace(*srcstr))
++  if (isspace((unsigned char)*srcstr))
+   {
+- while (isspace(*srcstr) && len > 0)
++ while (isspace((unsigned char)*srcstr) && len > 0)
+  {
+ ++srcstr, --len;
+  }
+@@ -311,7 +313,7 @@
+   }
+   else
+   {
+- *upd++ = (char)tolower(*srcstr++);
++ *upd++ = (char)tolower((unsigned char)*srcstr++);
+  --len;
+   }
+}
+@@ -340,15 +342,15 @@
+char * cpy1, * cpy2;
+ 
+/* Remove leading white space. */
+-   while (str1len && isspace(*str1))
++   while (str1len && isspace((unsigned char)*str1))
+   str1++, str1len--;
+-   while (str2len && isspace(*str2))
++   while (str2len && isspace((unsigned char)*str2))
+   str2++, str2len--;
+ 
+/* Remove trailing white space. */
+-   while (str1len && isspace(str1[str1len - 1]))
++   while (str1len && isspace((unsigned char)str1[str1len - 1]))
+   str1len--;
+-   while (str2len && isspace(str2[str2len - 1]))
++   while (str2len && isspace((unsigned char)str2[str2len - 1]))
+   str2len--;
+ 
+/*A quick check for empty strings before we start xmemduping and xfreeing*/
+diff -ruN openslp-2.0.0.orig/common/slp_compare.h 
openslp-2.0.0/common/slp_compare.h
+--- openslp-2.0.0.orig/common/slp_compare.h2012-11-28 18:07:04.0 
+0100
 openslp-2.0.0/common/slp_compare.h 2017-06-10 01:16:39.072878034 +0200
+@@ -52,10 +52,12 @@
+ 
+ #ifndef _WIN32
+ # ifndef HAVE_STRNCASECMP
+-int 

[gentoo-commits] repo/gentoo:master commit in: net-libs/openslp/

2017-06-04 Thread Sergei Trofimovich
commit: 4812f7da2f4b3f0517223d7a1f416f99e7336f71
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sun Jun  4 20:17:08 2017 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sun Jun  4 20:17:08 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4812f7da

net-libs/openslp: ia64 stable, bug #595542

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 net-libs/openslp/openslp-2.0.0-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/openslp/openslp-2.0.0-r4.ebuild 
b/net-libs/openslp/openslp-2.0.0-r4.ebuild
index 70f0d7b692d..c35ff61807d 100644
--- a/net-libs/openslp/openslp-2.0.0-r4.ebuild
+++ b/net-libs/openslp/openslp-2.0.0-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/openslp/${P}.tar.gz"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 
~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 
~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="libressl"
 RESTRICT="test"
 



[gentoo-commits] repo/gentoo:master commit in: net-libs/openslp/

2017-05-13 Thread Michael Weber
commit: 210542213c6b44adec7375796d2dcafd3a3d23dc
Author: Michael Weber  gentoo  org>
AuthorDate: Sat May 13 19:57:01 2017 +
Commit: Michael Weber  gentoo  org>
CommitDate: Sat May 13 19:57:01 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21054221

net-libs/openslp: ppc ppc6 stable (bug 595542).

Package-Manager: Portage-2.3.5, Repoman-2.3.2
RepoMan-Options: --include-arches="ppc ppc64"

 net-libs/openslp/openslp-2.0.0-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/openslp/openslp-2.0.0-r4.ebuild 
b/net-libs/openslp/openslp-2.0.0-r4.ebuild
index 92d19d9548a..70f0d7b692d 100644
--- a/net-libs/openslp/openslp-2.0.0-r4.ebuild
+++ b/net-libs/openslp/openslp-2.0.0-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/openslp/${P}.tar.gz"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc 
x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 
~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="libressl"
 RESTRICT="test"
 



[gentoo-commits] repo/gentoo:master commit in: net-libs/openslp/

2017-05-12 Thread Agostino Sarubbo
commit: a906d777e230618d630917dcfcc97efb9cb152c1
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Fri May 12 14:54:17 2017 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Fri May 12 14:55:04 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a906d777

net-libs/openslp: sparc stable wrt bug #595542

Package-Manager: Portage-2.3.5, Repoman-2.3.1
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 net-libs/openslp/openslp-2.0.0-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/openslp/openslp-2.0.0-r4.ebuild 
b/net-libs/openslp/openslp-2.0.0-r4.ebuild
index 39cf844dcf1..7d2440f5ae1 100644
--- a/net-libs/openslp/openslp-2.0.0-r4.ebuild
+++ b/net-libs/openslp/openslp-2.0.0-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/openslp/${P}.tar.gz"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc 
x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc 
x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="libressl"
 RESTRICT="test"
 



[gentoo-commits] repo/gentoo:master commit in: net-libs/openslp/

2017-05-04 Thread Markus Meier
commit: 62815e9cc454d58d778a56534ce46f824d5cd93b
Author: Markus Meier  gentoo  org>
AuthorDate: Thu May  4 19:56:35 2017 +
Commit: Markus Meier  gentoo  org>
CommitDate: Thu May  4 19:56:35 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62815e9c

net-libs/openslp: arm stable, bug #595542

Package-Manager: Portage-2.3.5, Repoman-2.3.1
RepoMan-Options: --include-arches="arm"

 net-libs/openslp/openslp-2.0.0-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/openslp/openslp-2.0.0-r4.ebuild 
b/net-libs/openslp/openslp-2.0.0-r4.ebuild
index 3e8dfe03502..39cf844dcf1 100644
--- a/net-libs/openslp/openslp-2.0.0-r4.ebuild
+++ b/net-libs/openslp/openslp-2.0.0-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/openslp/${P}.tar.gz"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc 
x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="libressl"
 RESTRICT="test"
 



[gentoo-commits] repo/gentoo:master commit in: net-libs/openslp/

2017-05-04 Thread Agostino Sarubbo
commit: c60f8ccc356557ed72e68d3e50a128d67b44da44
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Thu May  4 15:54:12 2017 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Thu May  4 15:54:12 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c60f8ccc

net-libs/openslp: x86 stable wrt bug #595542

Package-Manager: Portage-2.3.5, Repoman-2.3.1
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 net-libs/openslp/openslp-2.0.0-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/openslp/openslp-2.0.0-r4.ebuild 
b/net-libs/openslp/openslp-2.0.0-r4.ebuild
index 77f95cf3f08..3e8dfe03502 100644
--- a/net-libs/openslp/openslp-2.0.0-r4.ebuild
+++ b/net-libs/openslp/openslp-2.0.0-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/openslp/${P}.tar.gz"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="libressl"
 RESTRICT="test"
 



[gentoo-commits] repo/gentoo:master commit in: net-libs/openslp/

2017-05-04 Thread Jeroen Roovers
commit: fda613602b6ff34569fd9a994628f2a33c9a4fe1
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Thu May  4 07:10:39 2017 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Thu May  4 07:10:39 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fda61360

net-libs/openslp: Stable for HPPA (bug #595542).

Package-Manager: Portage-2.3.5, Repoman-2.3.2
RepoMan-Options: --ignore-arches

 net-libs/openslp/openslp-2.0.0-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/openslp/openslp-2.0.0-r4.ebuild 
b/net-libs/openslp/openslp-2.0.0-r4.ebuild
index 7ffcf664fe9..77f95cf3f08 100644
--- a/net-libs/openslp/openslp-2.0.0-r4.ebuild
+++ b/net-libs/openslp/openslp-2.0.0-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/openslp/${P}.tar.gz"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="libressl"
 RESTRICT="test"
 



[gentoo-commits] repo/gentoo:master commit in: net-libs/openslp/

2017-05-01 Thread Agostino Sarubbo
commit: 267218b9a3cb81b756df63384e42d11559245c41
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Mon May  1 13:36:28 2017 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Mon May  1 13:36:28 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=267218b9

net-libs/openslp: amd64 stable wrt bug #595542

Package-Manager: Portage-2.3.3, Repoman-2.3.1
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 net-libs/openslp/openslp-2.0.0-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/openslp/openslp-2.0.0-r4.ebuild 
b/net-libs/openslp/openslp-2.0.0-r4.ebuild
index afc65f77f0b..7ffcf664fe9 100644
--- a/net-libs/openslp/openslp-2.0.0-r4.ebuild
+++ b/net-libs/openslp/openslp-2.0.0-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/openslp/${P}.tar.gz"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="libressl"
 RESTRICT="test"
 



[gentoo-commits] repo/gentoo:master commit in: net-libs/openslp/, net-libs/openslp/files/

2017-02-19 Thread Andreas Hüttel
commit: d9daa618c8a85908978180048f86c08c7a4dc85d
Author: Andreas K. Hüttel  gentoo  org>
AuthorDate: Sun Feb 19 16:48:34 2017 +
Commit: Andreas Hüttel  gentoo  org>
CommitDate: Sun Feb 19 16:48:54 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9daa618

net-libs/openslp: Add patch for CVE-2016-7567, bug 595542

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 .../files/openslp-2.0.0-CVE-2016-7567.patch| 94 ++
 net-libs/openslp/openslp-2.0.0-r4.ebuild   | 44 ++
 2 files changed, 138 insertions(+)

diff --git a/net-libs/openslp/files/openslp-2.0.0-CVE-2016-7567.patch 
b/net-libs/openslp/files/openslp-2.0.0-CVE-2016-7567.patch
new file mode 100644
index 00..2d54fa04bf
--- /dev/null
+++ b/net-libs/openslp/files/openslp-2.0.0-CVE-2016-7567.patch
@@ -0,0 +1,94 @@
+See
+http://www.openwall.com/lists/oss-security/2016/09/27/4
+https://bugs.gentoo.org/show_bug.cgi?id=595542
+
+diff -r 598821da69f2 -r 34fb3aa5e6b4 openslp/common/slp_compare.c
+--- a/common/slp_compare.c Sat Jun 08 15:14:45 2013 -0600
 b/common/slp_compare.c Mon Nov 30 20:50:12 2015 -0700
+@@ -194,7 +194,8 @@
+  * @return The new (shorter) length of @p str.
+  *
+  * @note This routine assumes that leading and trailing white space have
+- *already been removed from @p str.
++ *already been removed from @p str. It also assumes that @p str may
++ *not be null-terminated.
+  */
+ static int SLPFoldWhiteSpace(size_t len, char * str)
+ {
+@@ -203,11 +204,11 @@
+{
+   if (isspace(*p))
+   {
+- char * ws2p = ++p; /* Point ws2p to the second ws char. */
+- while (isspace(*p))/* Scan till we hit a non-ws char. */
++ char * ws2p = ++p;/* Point ws2p to the second ws char. */
++ while (p < ep && isspace(*p)) /* Scan till we hit a non-ws char. */
+ p++;
+- len -= p - ws2p;   /* Reduce the length by extra ws. */
+- memmove(ws2p, p, ep - p);  /* Overwrite the extra white space. */
++ len -= p - ws2p;  /* Reduce the length by extra ws. */
++ memmove(ws2p, p, ep - p); /* Overwrite the extra white space. */
+   }
+   p++;
+}
+@@ -821,6 +822,50 @@
+ 
+ #ifdef SLP_COMPARE_TEST
+ 
++/* Test boundary conditions of SLPFoldWhiteSpace. */
++static int test_SLPFoldWhiteSpace(void)
++{
++   static char test_str0[] = "";
++   static char test_str1[] = "Blah";
++   static char test_str3[] = "Blah  blah";
++   static char test_str4[] = "Blah   blah";
++   static char test_str5[] = "Blah blah  blah";
++   static char test_str8[] = " Blah blah";
++   static char test_str9[] = "  Blah blah";
++   static char test_strC[] = "Blah blah  ";
++   static char test_strD[] = "Blah blah  ";
++
++   static char * test_strs[] =
++   {
++  test_str0, test_str0, test_str0, test_str1, test_strC,
++  test_str3, test_str4, test_str5, test_strC, test_strC,
++  test_str8, test_str9, test_strC, test_strD,
++   };
++
++   static int test_lens[] =
++   {
++  0, 1, 2, 4, 9, 10, 11, 15, 10, 11, 10, 11, 11, 11,
++   };
++
++   static int test_fins[] =
++   {
++  0, 1, 1, 4, 9, 9, 9, 14, 10, 10, 10, 10, 10, 10,
++   };
++
++#define MAX_BUFSZ 32
++
++   int i;
++   for (i = 0; i < sizeof(test_strs) / sizeof(*test_strs); ++i)
++   {
++  char test_buf[MAX_BUFSZ];
++  memmove(test_buf, test_strs[i], test_lens[i]);
++  int len = SLPFoldWhiteSpace(test_lens[i], test_buf);
++  if (len != test_fins[i])
++ return -1;
++   }
++   return 0;
++}
++
+ /*  Test main for the slp_compare.c module 
+  *
+  * Compile with:
+@@ -840,6 +885,9 @@
+ 
+int count;
+ 
++   if (test_SLPFoldWhiteSpace() != 0)
++  return -1;
++
+/* *** SLPContainsStringList ***
+ */
+count = SLPContainsStringList(sizeof lst1 - 1, lst1, sizeof str1 - 1, 
str1);

diff --git a/net-libs/openslp/openslp-2.0.0-r4.ebuild 
b/net-libs/openslp/openslp-2.0.0-r4.ebuild
new file mode 100644
index 00..bda06a24f8
--- /dev/null
+++ b/net-libs/openslp/openslp-2.0.0-r4.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit autotools systemd
+
+DESCRIPTION="An open-source implementation of Service Location Protocol"
+HOMEPAGE="http://www.openslp.org/;
+SRC_URI="mirror://sourceforge/openslp/${P}.tar.gz"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="libressl"
+RESTRICT="test"
+
+DEPEND="
+   !libressl? ( dev-libs/openssl:0= )
+   libressl? ( dev-libs/libressl:0= )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-2.0.0-cflags.patch
+   "${FILESDIR}"/${PN}-2.0.0-CVE-2016-4912.patch
+   

[gentoo-commits] repo/gentoo:master commit in: net-libs/openslp/, net-libs/openslp/files/

2017-02-18 Thread Andreas Hüttel
commit: a5ebb986de32e702fece9392cc511a6e2d31f08a
Author: Andreas K. Hüttel  gentoo  org>
AuthorDate: Sat Feb 18 13:01:53 2017 +
Commit: Andreas Hüttel  gentoo  org>
CommitDate: Sat Feb 18 13:01:53 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5ebb986

net-libs/openslp: EAPI bump, add Fedora patch for CVE 2016-4912

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 .../files/openslp-2.0.0-CVE-2016-4912.patch| 15 
 net-libs/openslp/openslp-2.0.0-r2.ebuild   | 42 ++
 2 files changed, 57 insertions(+)

diff --git a/net-libs/openslp/files/openslp-2.0.0-CVE-2016-4912.patch 
b/net-libs/openslp/files/openslp-2.0.0-CVE-2016-4912.patch
new file mode 100644
index 00..d8a0eca0d3
--- /dev/null
+++ b/net-libs/openslp/files/openslp-2.0.0-CVE-2016-4912.patch
@@ -0,0 +1,15 @@
+Source: 
https://src.fedoraproject.org/cgit/rpms/openslp.git/plain/openslp-2.0.0-null-pointer-deref.patch
+See also https://bugs.gentoo.org/show_bug.cgi?id=583396
+
+diff -up openslp-2.0.0/common/slp_xmalloc.c.orig 
openslp-2.0.0/common/slp_xmalloc.c
+--- openslp-2.0.0/common/slp_xmalloc.c.orig2012-12-07 01:52:08.0 
+0100
 openslp-2.0.0/common/slp_xmalloc.c 2016-05-23 12:58:57.953532979 +0200
+@@ -203,6 +203,8 @@ void * _xrealloc(const char * file, int
+   if (x->size != size)
+   {
+  newptr = _xmalloc(file, line, size);
++ if (newptr == 0)
++return 0;
+  memcpy(newptr, ptr, x->size);
+  _xfree(file, line, x);
+   }

diff --git a/net-libs/openslp/openslp-2.0.0-r2.ebuild 
b/net-libs/openslp/openslp-2.0.0-r2.ebuild
new file mode 100644
index 00..43d36bd99b
--- /dev/null
+++ b/net-libs/openslp/openslp-2.0.0-r2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit autotools systemd
+
+DESCRIPTION="An open-source implementation of Service Location Protocol"
+HOMEPAGE="http://www.openslp.org/;
+SRC_URI="mirror://sourceforge/openslp/${P}.tar.gz"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="libressl"
+RESTRICT="test"
+
+DEPEND="
+   !libressl? ( dev-libs/openssl:0= )
+   libressl? ( dev-libs/libressl:0= )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-2.0.0-cflags.patch
+   "${FILESDIR}"/${PN}-2.0.0-CVE-2016-4912.patch
+)
+
+src_prepare() {
+   default
+   eautoreconf
+}
+
+src_install() {
+   make DESTDIR="${D}" install || die "make install failed"
+   dodoc AUTHORS FAQ ChangeLog NEWS README* THANKS
+   rm -rfv "${D}"/usr/doc
+   dohtml -r .
+   newinitd "${FILESDIR}"/slpd-init slpd
+   systemd_dounit "${FILESDIR}"/slpd.service
+}



[gentoo-commits] repo/gentoo:master commit in: net-libs/openslp/

2017-02-17 Thread Andreas Hüttel
commit: b9e7b353f2d86075f771bbf4675be525eb084595
Author: Andreas K. Hüttel  gentoo  org>
AuthorDate: Fri Feb 17 21:59:30 2017 +
Commit: Andreas Hüttel  gentoo  org>
CommitDate: Fri Feb 17 21:59:30 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9e7b353

net-libs/openslp: Remove old

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 net-libs/openslp/openslp-2.0.0.ebuild | 34 --
 1 file changed, 34 deletions(-)

diff --git a/net-libs/openslp/openslp-2.0.0.ebuild 
b/net-libs/openslp/openslp-2.0.0.ebuild
deleted file mode 100644
index e7b3ed9ea0..00
--- a/net-libs/openslp/openslp-2.0.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils autotools systemd
-
-DESCRIPTION="An open-source implementation of Service Location Protocol"
-HOMEPAGE="http://www.openslp.org/;
-SRC_URI="mirror://sourceforge/openslp/${P}.tar.gz"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS=""
-IUSE=""
-RESTRICT="test"
-
-DEPEND="dev-libs/openssl"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-   epatch "${FILESDIR}"/${PN}-2.0.0-cflags.patch
-   eautoreconf
-}
-
-src_install() {
-   make DESTDIR="${D}" install || die "make install failed"
-   dodoc AUTHORS FAQ ChangeLog NEWS README* THANKS
-   rm -rfv "${D}"/usr/doc
-   dohtml -r .
-   newinitd "${FILESDIR}"/slpd-init slpd
-   systemd_dounit "${FILESDIR}"/slpd.service
-}



[gentoo-commits] repo/gentoo:master commit in: net-libs/openslp/

2017-02-17 Thread Andreas Hüttel
commit: 8276150e635a0cf0643c6d79601aacd16ee1fa9e
Author: Andreas K. Hüttel  gentoo  org>
AuthorDate: Fri Feb 17 21:58:18 2017 +
Commit: Andreas Hüttel  gentoo  org>
CommitDate: Fri Feb 17 21:58:46 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8276150e

net-libs/openslp: Restore keywords. Let's see how much explodes...

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 net-libs/openslp/openslp-2.0.0-r1.ebuild | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/net-libs/openslp/openslp-2.0.0-r1.ebuild 
b/net-libs/openslp/openslp-2.0.0-r1.ebuild
index e4f8d64cd7..2d44cf58f6 100644
--- a/net-libs/openslp/openslp-2.0.0-r1.ebuild
+++ b/net-libs/openslp/openslp-2.0.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -12,13 +12,13 @@ SRC_URI="mirror://sourceforge/openslp/${P}.tar.gz"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="libressl"
 RESTRICT="test"
 
 DEPEND="
-   !libressl? ( dev-libs/openssl:0 )
-   libressl? ( dev-libs/libressl )
+   !libressl? ( dev-libs/openssl:0= )
+   libressl? ( dev-libs/libressl:0= )
 "
 RDEPEND="${DEPEND}"
 



[gentoo-commits] repo/gentoo:master commit in: net-libs/openslp/files/

2017-01-26 Thread David Seifert
commit: 9856a8b69a3f6c84c4d43137632b1b401b959d1b
Author: Michael Mair-Keimberger (asterix)  gmail 
 com>
AuthorDate: Mon Jan 23 18:01:35 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Thu Jan 26 22:36:16 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9856a8b6

net-libs/openslp: remove unused patches

Closes: https://github.com/gentoo/gentoo/pull/3608

 net-libs/openslp/files/openslp-compile_fix.patch   | 14 
 .../openslp/files/openslp-no_install_doc.patch | 21 --
 net-libs/openslp/files/openslp-opt.patch   | 25 --
 3 files changed, 60 deletions(-)

diff --git a/net-libs/openslp/files/openslp-compile_fix.patch 
b/net-libs/openslp/files/openslp-compile_fix.patch
deleted file mode 100644
index 22bb3d6..
--- a/net-libs/openslp/files/openslp-compile_fix.patch
+++ /dev/null
@@ -1,14 +0,0 @@
 openslp-1.3.0/common/slp_spi.c~2004-03-04 03:38:49.0 +0100
-+++ openslp-1.3.0/common/slp_spi.c 2004-03-04 03:38:49.0 +0100
-@@ -267,9 +267,9 @@
- fp = fopen(spifile,"r");
- if(fp)
- {
--result = xmalloc(sizeof(structSLPSpiHandle));
-+result = xmalloc(sizeof(struct _SLPSpiHandle));
- if(result == 0) return 0;
--memset(result, 0, sizeof(structSLPSpiHandle));
-+memset(result, 0, sizeof(struct _SLPSpiHandle));
- 
- result->spifile = xstrdup(spifile);
- result->cacheprivate = cacheprivate;

diff --git a/net-libs/openslp/files/openslp-no_install_doc.patch 
b/net-libs/openslp/files/openslp-no_install_doc.patch
deleted file mode 100644
index 9f7e3d2..
--- a/net-libs/openslp/files/openslp-no_install_doc.patch
+++ /dev/null
@@ -1,21 +0,0 @@
 openslp-1.3.0/Makefile.am~ 2004-03-04 03:56:37.0 +0100
-+++ openslp-1.3.0/Makefile.am  2004-03-04 03:56:37.0 +0100
-@@ -5,7 +5,6 @@
- 
- SUBDIRS   = common libslpattr slpd libslp slptool test
- EXTRA_DIST = win32 doc etc README.W32 FAQ
--DOC_DIR = $(prefix)/doc/openslp-$(VERSION)
- 
- install-data-local:
-   mkdir -p $(DESTDIR)$(sysconfdir)
-@@ -22,10 +21,6 @@
-   if [ -f $$file ]; then true;\
-   else cp -f $(srcdir)/etc/slp.spi $(DESTDIR)$(sysconfdir);\
-   fi
--  rm -rf $(DESTDIR)$(DOC_DIR)
--  mkdir -p $(DESTDIR)$(DOC_DIR)
--  cp -r $(srcdir)/doc/* $(DESTDIR)$(DOC_DIR)
--# rm -rf `find $(DESTDIR)$(DOC_DIR) -name CVS`
- 
- dist-hook:
- # rm -rf `find $(distdir)/doc -name CVS`

diff --git a/net-libs/openslp/files/openslp-opt.patch 
b/net-libs/openslp/files/openslp-opt.patch
deleted file mode 100644
index 0fe9af3..
--- a/net-libs/openslp/files/openslp-opt.patch
+++ /dev/null
@@ -1,25 +0,0 @@
 openslp-1.0.11/configure.in.orig   2003-03-11 05:20:05.0 +0100
-+++ openslp-1.0.11/configure.in2003-04-18 00:34:27.0 +0200
-@@ -120,9 +120,6 @@
- if test X"$debug" = X"yes"; then
-CFLAGS="$CFLAGS -Werror"
- fi
--if test X"$debug" = X"no"; then 
--   OPTFLAGS="-O3"
--fi
- 
- elif $CC -V 2>&1 | grep "WorkShop Compilers"; then
- dnl Allow C++ style comments
-@@ -161,9 +158,9 @@
- dnl ***
- dnl Checks for libraries.
- dnl ***
--AC_CHECK_LIB(resolv, inet_aton)
--AC_CHECK_LIB(socket, main)
--AC_CHECK_LIB(nsl, gethostbyname)
-+AC_SEARCH_LIBS(inet_aton, resolv)
-+AC_SEARCH_LIBS(socket, socket)
-+AC_SEARCH_LIBS(gethostbyname, nsl)
- AC_CHECK_LIB(m, main)
- AC_CHECK_FUNCS(ceil log10 strncasecmp strcasecmp )
- AC_OUTPUT(Makefile common/Makefile libslpattr/Makefile libslp/Makefile \



[gentoo-commits] repo/gentoo:master commit in: net-libs/openslp/

2015-10-05 Thread Julian Ospald
commit: f0915e35abdc413f740957a423413c607d1ee431
Author: Julian Ospald  gentoo  org>
AuthorDate: Mon Oct  5 14:17:28 2015 +
Commit: Julian Ospald  gentoo  org>
CommitDate: Mon Oct  5 14:28:25 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0915e35

net-libs/openslp: add libressl support

 net-libs/openslp/openslp-2.0.0-r1.ebuild | 37 
 1 file changed, 37 insertions(+)

diff --git a/net-libs/openslp/openslp-2.0.0-r1.ebuild 
b/net-libs/openslp/openslp-2.0.0-r1.ebuild
new file mode 100644
index 000..e4f8d64
--- /dev/null
+++ b/net-libs/openslp/openslp-2.0.0-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils autotools systemd
+
+DESCRIPTION="An open-source implementation of Service Location Protocol"
+HOMEPAGE="http://www.openslp.org/;
+SRC_URI="mirror://sourceforge/openslp/${P}.tar.gz"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE="libressl"
+RESTRICT="test"
+
+DEPEND="
+   !libressl? ( dev-libs/openssl:0 )
+   libressl? ( dev-libs/libressl )
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+   epatch "${FILESDIR}"/${PN}-2.0.0-cflags.patch
+   eautoreconf
+}
+
+src_install() {
+   make DESTDIR="${D}" install || die "make install failed"
+   dodoc AUTHORS FAQ ChangeLog NEWS README* THANKS
+   rm -rfv "${D}"/usr/doc
+   dohtml -r .
+   newinitd "${FILESDIR}"/slpd-init slpd
+   systemd_dounit "${FILESDIR}"/slpd.service
+}