Update to 2.0.0.

3 files changed, 12 insertions, 76 deletions

diff --git a/net/openslp/files/patch-Makefile.in b/net/openslp/files/patch-Makefile.in
deleted file mode 100644
index 5b7e81856ede..000000000000
--- a/net/openslp/files/patch-Makefile.in
+++ /dev/null
@@ -1,23 +0,0 @@
---- Makefile.in.orig	Wed Mar  2 13:00:22 2005
-+++ Makefile.in	Mon Jul  4 18:14:34 2005
-@@ -184,8 +184,7 @@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
- SUBDIRS = common libslpattr slpd libslp slptool test
--EXTRA_DIST = win32 doc etc README.W32 FAQ
--DOC_DIR = $(prefix)/doc/openslp-$(VERSION)
-+EXTRA_DIST = win32 etc README.W32 FAQ
- all: config.h
- 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
- 
-@@ -624,10 +623,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/openslp/files/patch-common_slp__socket.h b/net/openslp/files/patch-common_slp__socket.h
new file mode 100644
index 000000000000..42492c20babe
--- /dev/null
+++ b/net/openslp/files/patch-common_slp__socket.h
@@ -0,0 +1,12 @@
+--- common/slp_socket.h.orig	2015-09-20 22:43:10 UTC
++++ common/slp_socket.h
+@@ -103,7 +103,8 @@ const char * inet_ntop(int af, const voi
+ # include <net/if.h>
+ # include <net/if_arp.h>
+ # include <netdb.h>
+-#if defined(LINUX) || defined (DARWIN)
++# include <netinet/in.h>
++#if defined(LINUX) || defined (DARWIN) || defined (__FreeBSD__)
+ # include <ifaddrs.h>
+ #endif
+ 
diff --git a/net/openslp/files/patch-slp_net b/net/openslp/files/patch-slp_net
deleted file mode 100644
index 7adfbe899549..000000000000
--- a/net/openslp/files/patch-slp_net
+++ /dev/null
@@ -1,53 +0,0 @@
-This patch moves slp_net.c into libslp to avoid there being undefined
-symbols in the library (such as SLPNetGetThisHostname()). Makefile.am
-files should, probably, be patched instead...
-
-	-mi
-
---- common/Makefile.in	Wed Mar  2 13:00:23 2005
-+++ common/Makefile.in	Mon Jul 11 14:05:45 2005
-@@ -57,5 +57,5 @@
- 	slp_network.c slp_database.c slp_xmalloc.c slp_xcast.c \
- 	slp_iface.c slp_parse.c slp_pid.c slp_dhcp.c slp_v1message.c \
--	slp_utf8.c slp_auth.c slp_crypto.c slp_spi.c
-+	slp_utf8.c slp_auth.c slp_crypto.c slp_spi.c slp_net.c
- @ENABLE_SLPv1_TRUE@am__objects_1 = slp_v1message.lo slp_utf8.lo
- @ENABLE_SLPv2_SECURITY_TRUE@am__objects_2 = slp_auth.lo slp_crypto.lo \
-@@ -64,5 +64,5 @@
- 	slp_message.lo slp_property.lo slp_linkedlist.lo slp_xid.lo \
- 	slp_network.lo slp_database.lo slp_xmalloc.lo slp_xcast.lo \
--	slp_iface.lo slp_parse.lo slp_pid.lo slp_dhcp.lo \
-+	slp_iface.lo slp_parse.lo slp_pid.lo slp_dhcp.lo slp_net.lo \
- 	$(am__objects_1) $(am__objects_2)
- libcommonlibslp_la_OBJECTS = $(am_libcommonlibslp_la_OBJECTS)
-@@ -70,5 +70,5 @@
- am__libcommonslpd_la_SOURCES_DIST = slp_compare.c slp_buffer.c \
- 	slp_message.c slp_property.c slp_linkedlist.c slp_xid.c \
--	slp_database.c slp_xmalloc.c slp_parse.c slp_iface.c slp_net.c \
-+	slp_database.c slp_xmalloc.c slp_parse.c slp_iface.c \
- 	slp_pid.c slp_attr_y.y slp_attr_l.l slp_filter_y.y \
- 	slp_filter_l.l slp_predicate.c slp_dhcp.c slp_v1message.c \
-@@ -77,5 +77,5 @@
- 	slp_message.lo slp_property.lo slp_linkedlist.lo slp_xid.lo \
- 	slp_database.lo slp_xmalloc.lo slp_parse.lo slp_iface.lo \
--	slp_net.lo slp_pid.lo slp_attr_y.lo slp_attr_l.lo \
-+	slp_pid.lo slp_attr_y.lo slp_attr_l.lo \
- 	slp_filter_y.lo slp_filter_l.lo slp_predicate.lo slp_dhcp.lo \
- 	$(am__objects_1) $(am__objects_2)
---- slpd/Makefile.in	Wed Mar  2 13:00:24 2005
-+++ slpd/Makefile.in	Mon Jul 11 14:09:05 2005
-@@ -79,5 +79,5 @@
- slpd_OBJECTS = $(am_slpd_OBJECTS)
- slpd_DEPENDENCIES = ../common/libcommonslpd.la \
--	../libslpattr/libslpattr.la
-+	../libslpattr/libslpattr.la ../common/libcommonlibslp.la
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
-@@ -253,5 +253,6 @@
- #if you're building on Irix, exchange commented and uncommented lines
- #slpd_LDADD      =  ../common/libcommonslpd.a ../libslpattr/libslpattr.a
--slpd_LDADD = ../common/libcommonslpd.la ../libslpattr/libslpattr.la
-+slpd_LDADD = ../common/libcommonslpd.la ../libslpattr/libslpattr.la \
-+	../common/libcommonlibslp.la
- all: all-am
-