diff options
| -rw-r--r-- | net/openslp/Makefile | 5 | ||||
| -rw-r--r-- | net/openslp/distinfo | 4 | ||||
| -rw-r--r-- | net/openslp/files/patch-Makefile.in | 23 | ||||
| -rw-r--r-- | net/openslp/files/patch-common_slp__socket.h | 12 | ||||
| -rw-r--r-- | net/openslp/files/patch-slp_net | 53 | ||||
| -rw-r--r-- | net/openslp/pkg-plist | 125 |
6 files changed, 83 insertions, 139 deletions
diff --git a/net/openslp/Makefile b/net/openslp/Makefile index 4e86d296a64d..92924226b06f 100644 --- a/net/openslp/Makefile +++ b/net/openslp/Makefile @@ -2,10 +2,9 @@ # $FreeBSD$ PORTNAME= openslp -PORTVERSION= 1.2.1 -PORTREVISION= 5 +PORTVERSION= 2.0.0 CATEGORIES= net -MASTER_SITES= SF/${PORTNAME}/OpenSLP/${PORTVERSION} +MASTER_SITES= SF/${PORTNAME}/${PORTVERSION}/${PORTVERSION}%20Release MAINTAINER= marcus@FreeBSD.org COMMENT= Open-source implementation of the Service Location Protocol diff --git a/net/openslp/distinfo b/net/openslp/distinfo index 5e8e4f8bdecc..75b1ed370ce1 100644 --- a/net/openslp/distinfo +++ b/net/openslp/distinfo @@ -1,2 +1,2 @@ -SHA256 (openslp-1.2.1.tar.gz) = 08c7ec1e76fdd66461b3784d52047f594405f31ba2791ab0c1ec7c97639f5fbd -SIZE (openslp-1.2.1.tar.gz) = 886195 +SHA256 (openslp-2.0.0.tar.gz) = 924337a2a8e5be043ebaea2a78365c7427ac6e9cee24610a0780808b2ba7579b +SIZE (openslp-2.0.0.tar.gz) = 5424646 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 - diff --git a/net/openslp/pkg-plist b/net/openslp/pkg-plist index 562a2782e365..a9e3d59f7e27 100644 --- a/net/openslp/pkg-plist +++ b/net/openslp/pkg-plist @@ -6,62 +6,71 @@ include/slp.h lib/libslp.a lib/libslp.so lib/libslp.so.1 -lib/libslp.so.1.0.1 +lib/libslp.so.1.0.0 sbin/slpd -%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc1766.txt -%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc2165.txt -%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc2254.txt -%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc2396.txt -%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc2608.txt -%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc2609.txt -%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc2610.txt -%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc2614.txt -%%PORTDOCS%%%%DOCSDIR%%/rfc/srvreg-integrity.txt -%%PORTDOCS%%%%DOCSDIR%%/rfc/threat_analysis_min_security.html -%%PORTDOCS%%%%DOCSDIR%%/html/ProgrammersGuide/Callbacks.html -%%PORTDOCS%%%%DOCSDIR%%/html/ProgrammersGuide/Divergence.html -%%PORTDOCS%%%%DOCSDIR%%/html/ProgrammersGuide/Examples.html -%%PORTDOCS%%%%DOCSDIR%%/html/ProgrammersGuide/SLPAttrCallback.html -%%PORTDOCS%%%%DOCSDIR%%/html/ProgrammersGuide/SLPClose.html -%%PORTDOCS%%%%DOCSDIR%%/html/ProgrammersGuide/SLPDelAttrs.html -%%PORTDOCS%%%%DOCSDIR%%/html/ProgrammersGuide/SLPDereg.html -%%PORTDOCS%%%%DOCSDIR%%/html/ProgrammersGuide/SLPError.html -%%PORTDOCS%%%%DOCSDIR%%/html/ProgrammersGuide/SLPEscape.html -%%PORTDOCS%%%%DOCSDIR%%/html/ProgrammersGuide/SLPFindAttrs.html -%%PORTDOCS%%%%DOCSDIR%%/html/ProgrammersGuide/SLPFindScopes.html -%%PORTDOCS%%%%DOCSDIR%%/html/ProgrammersGuide/SLPFindSrvTypes.html -%%PORTDOCS%%%%DOCSDIR%%/html/ProgrammersGuide/SLPFindSrvs.html -%%PORTDOCS%%%%DOCSDIR%%/html/ProgrammersGuide/SLPFree.html -%%PORTDOCS%%%%DOCSDIR%%/html/ProgrammersGuide/SLPGetProperty.html -%%PORTDOCS%%%%DOCSDIR%%/html/ProgrammersGuide/SLPGetRefreshInterval.html -%%PORTDOCS%%%%DOCSDIR%%/html/ProgrammersGuide/SLPOpen.html -%%PORTDOCS%%%%DOCSDIR%%/html/ProgrammersGuide/SLPReg.html -%%PORTDOCS%%%%DOCSDIR%%/html/ProgrammersGuide/SLPParseSrvURL.html -%%PORTDOCS%%%%DOCSDIR%%/html/ProgrammersGuide/SLPRegReport.html -%%PORTDOCS%%%%DOCSDIR%%/html/ProgrammersGuide/SLPSetProperty.html -%%PORTDOCS%%%%DOCSDIR%%/html/ProgrammersGuide/SLPSrvTypeCallback.html -%%PORTDOCS%%%%DOCSDIR%%/html/ProgrammersGuide/SLPSrvURLCallback.html -%%PORTDOCS%%%%DOCSDIR%%/html/ProgrammersGuide/SLPTypes.html -%%PORTDOCS%%%%DOCSDIR%%/html/ProgrammersGuide/SLPUnescape.html -%%PORTDOCS%%%%DOCSDIR%%/html/ProgrammersGuide/Security.html -%%PORTDOCS%%%%DOCSDIR%%/html/ProgrammersGuide/Syntax.html -%%PORTDOCS%%%%DOCSDIR%%/html/ProgrammersGuide/index.html -%%PORTDOCS%%%%DOCSDIR%%/html/ProgrammersGuide/openslp_security_whitepaper.html -%%PORTDOCS%%%%DOCSDIR%%/html/ProgrammersGuide/smalllogo.jpg -%%PORTDOCS%%%%DOCSDIR%%/html/IntroductionToSLP/AgentInit.jpg -%%PORTDOCS%%%%DOCSDIR%%/html/IntroductionToSLP/ServiceReg.jpg -%%PORTDOCS%%%%DOCSDIR%%/html/IntroductionToSLP/ServiceRqst.jpg -%%PORTDOCS%%%%DOCSDIR%%/html/IntroductionToSLP/index.html -%%PORTDOCS%%%%DOCSDIR%%/html/UsersGuide/CommandLine.html -%%PORTDOCS%%%%DOCSDIR%%/html/UsersGuide/FileLocations.html -%%PORTDOCS%%%%DOCSDIR%%/html/UsersGuide/Installation.html -%%PORTDOCS%%%%DOCSDIR%%/html/UsersGuide/Optimization.html -%%PORTDOCS%%%%DOCSDIR%%/html/UsersGuide/Security.html -%%PORTDOCS%%%%DOCSDIR%%/html/UsersGuide/SlpConf.html -%%PORTDOCS%%%%DOCSDIR%%/html/UsersGuide/SlpReg.html -%%PORTDOCS%%%%DOCSDIR%%/html/UsersGuide/UserFAQ.html -%%PORTDOCS%%%%DOCSDIR%%/html/UsersGuide/WhenToRunSlpd.html -%%PORTDOCS%%%%DOCSDIR%%/html/UsersGuide/WhoShouldRead.html -%%PORTDOCS%%%%DOCSDIR%%/html/UsersGuide/index.html -%%PORTDOCS%%%%DOCSDIR%%/html/UsersGuide/smalllogo.jpg -%%PORTDOCS%%%%DOCSDIR%%/html/faq.html +%%PORTDOCS%%%%DOCSDIR%%/Makefile +%%PORTDOCS%%%%DOCSDIR%%/Makefile.am +%%PORTDOCS%%%%DOCSDIR%%/Makefile.in +%%PORTDOCS%%%%DOCSDIR%%/README +%%PORTDOCS%%%%DOCSDIR%%/doc/html/IntroductionToSLP/index.html +%%PORTDOCS%%%%DOCSDIR%%/doc/html/ProgrammersGuide/Callbacks.html +%%PORTDOCS%%%%DOCSDIR%%/doc/html/ProgrammersGuide/Divergence.html +%%PORTDOCS%%%%DOCSDIR%%/doc/html/ProgrammersGuide/SLPAttrCallback.html +%%PORTDOCS%%%%DOCSDIR%%/doc/html/ProgrammersGuide/SLPClose.html +%%PORTDOCS%%%%DOCSDIR%%/doc/html/ProgrammersGuide/SLPDelAttrs.html +%%PORTDOCS%%%%DOCSDIR%%/doc/html/ProgrammersGuide/SLPDereg.html +%%PORTDOCS%%%%DOCSDIR%%/doc/html/ProgrammersGuide/SLPError.html +%%PORTDOCS%%%%DOCSDIR%%/doc/html/ProgrammersGuide/SLPEscape.html +%%PORTDOCS%%%%DOCSDIR%%/doc/html/ProgrammersGuide/SLPFindAttrs.html +%%PORTDOCS%%%%DOCSDIR%%/doc/html/ProgrammersGuide/SLPFindScopes.html +%%PORTDOCS%%%%DOCSDIR%%/doc/html/ProgrammersGuide/SLPFindSrvTypes.html +%%PORTDOCS%%%%DOCSDIR%%/doc/html/ProgrammersGuide/SLPFindSrvs.html +%%PORTDOCS%%%%DOCSDIR%%/doc/html/ProgrammersGuide/SLPFree.html +%%PORTDOCS%%%%DOCSDIR%%/doc/html/ProgrammersGuide/SLPGetProperty.html +%%PORTDOCS%%%%DOCSDIR%%/doc/html/ProgrammersGuide/SLPGetRefreshInterval.html +%%PORTDOCS%%%%DOCSDIR%%/doc/html/ProgrammersGuide/SLPOpen.html +%%PORTDOCS%%%%DOCSDIR%%/doc/html/ProgrammersGuide/SLPParseSrvURL.html +%%PORTDOCS%%%%DOCSDIR%%/doc/html/ProgrammersGuide/SLPReg.html +%%PORTDOCS%%%%DOCSDIR%%/doc/html/ProgrammersGuide/SLPRegReport.html +%%PORTDOCS%%%%DOCSDIR%%/doc/html/ProgrammersGuide/SLPSetProperty.html +%%PORTDOCS%%%%DOCSDIR%%/doc/html/ProgrammersGuide/SLPSrvTypeCallback.html +%%PORTDOCS%%%%DOCSDIR%%/doc/html/ProgrammersGuide/SLPSrvURLCallback.html +%%PORTDOCS%%%%DOCSDIR%%/doc/html/ProgrammersGuide/SLPTypes.html +%%PORTDOCS%%%%DOCSDIR%%/doc/html/ProgrammersGuide/SLPUnescape.html +%%PORTDOCS%%%%DOCSDIR%%/doc/html/ProgrammersGuide/Security.html +%%PORTDOCS%%%%DOCSDIR%%/doc/html/ProgrammersGuide/Syntax.html +%%PORTDOCS%%%%DOCSDIR%%/doc/html/ProgrammersGuide/index.html +%%PORTDOCS%%%%DOCSDIR%%/doc/html/UsersGuide/CommandLine.html +%%PORTDOCS%%%%DOCSDIR%%/doc/html/UsersGuide/FileLocations.html +%%PORTDOCS%%%%DOCSDIR%%/doc/html/UsersGuide/Installation.html +%%PORTDOCS%%%%DOCSDIR%%/doc/html/UsersGuide/Optimization.html +%%PORTDOCS%%%%DOCSDIR%%/doc/html/UsersGuide/Security.html +%%PORTDOCS%%%%DOCSDIR%%/doc/html/UsersGuide/SlpConf.html +%%PORTDOCS%%%%DOCSDIR%%/doc/html/UsersGuide/SlpReg.html +%%PORTDOCS%%%%DOCSDIR%%/doc/html/UsersGuide/WhenToRunSlpd.html +%%PORTDOCS%%%%DOCSDIR%%/doc/html/UsersGuide/WhoShouldRead.html +%%PORTDOCS%%%%DOCSDIR%%/doc/html/UsersGuide/index.html +%%PORTDOCS%%%%DOCSDIR%%/doc/html/faq.html +%%PORTDOCS%%%%DOCSDIR%%/doc/rfc/rfc1766.txt +%%PORTDOCS%%%%DOCSDIR%%/doc/rfc/rfc2165.txt +%%PORTDOCS%%%%DOCSDIR%%/doc/rfc/rfc2254.txt +%%PORTDOCS%%%%DOCSDIR%%/doc/rfc/rfc2396.txt +%%PORTDOCS%%%%DOCSDIR%%/doc/rfc/rfc2608.txt +%%PORTDOCS%%%%DOCSDIR%%/doc/rfc/rfc2609.txt +%%PORTDOCS%%%%DOCSDIR%%/doc/rfc/rfc2610.txt +%%PORTDOCS%%%%DOCSDIR%%/doc/rfc/rfc2614.txt +%%PORTDOCS%%%%DOCSDIR%%/doc/rfc/rfc2926.txt +%%PORTDOCS%%%%DOCSDIR%%/doc/rfc/rfc3059.txt +%%PORTDOCS%%%%DOCSDIR%%/doc/rfc/rfc3082.txt +%%PORTDOCS%%%%DOCSDIR%%/doc/rfc/rfc3111.txt +%%PORTDOCS%%%%DOCSDIR%%/doc/rfc/rfc3224.txt +%%PORTDOCS%%%%DOCSDIR%%/doc/rfc/rfc3421.txt +%%PORTDOCS%%%%DOCSDIR%%/doc/rfc/rfc3528.txt +%%PORTDOCS%%%%DOCSDIR%%/doc/security/openslp_security_whitepaper.html +%%PORTDOCS%%%%DOCSDIR%%/doc/security/srvreg-integrity.html +%%PORTDOCS%%%%DOCSDIR%%/doc/security/threat_analysis_min_security.html +%%PORTDOCS%%%%DOCSDIR%%/doxyfile +%%PORTDOCS%%%%DOCSDIR%%/doxyfile.in +%%PORTDOCS%%%%DOCSDIR%%/main.html +%%PORTDOCS%%%%DOCSDIR%%/openslp.dxy +%%PORTDOCS%%%%DOCSDIR%%/openslp_logo_web_color_150px.jpg |