diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /net-libs/openslp/files | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'net-libs/openslp/files')
-rw-r--r-- | net-libs/openslp/files/openslp-1.2.1-cflags.patch | 11 | ||||
-rw-r--r-- | net-libs/openslp/files/openslp-1.2.1-fbsd.patch | 12 | ||||
-rw-r--r-- | net-libs/openslp/files/openslp-1.2.1-fixoverflow.patch | 11 | ||||
-rw-r--r-- | net-libs/openslp/files/openslp-2.0.0-cflags.patch | 25 | ||||
-rw-r--r-- | net-libs/openslp/files/openslp-compile_fix.patch | 14 | ||||
-rw-r--r-- | net-libs/openslp/files/openslp-no_install_doc.patch | 21 | ||||
-rw-r--r-- | net-libs/openslp/files/openslp-opt.patch | 25 | ||||
-rw-r--r-- | net-libs/openslp/files/slpd-init | 89 | ||||
-rw-r--r-- | net-libs/openslp/files/slpd.service | 10 |
9 files changed, 218 insertions, 0 deletions
diff --git a/net-libs/openslp/files/openslp-1.2.1-cflags.patch b/net-libs/openslp/files/openslp-1.2.1-cflags.patch new file mode 100644 index 000000000000..a9a1d2634e7f --- /dev/null +++ b/net-libs/openslp/files/openslp-1.2.1-cflags.patch @@ -0,0 +1,11 @@ +diff -ruN openslp-1.2.1.orig/configure.in openslp-1.2.1/configure.in +--- openslp-1.2.1.orig/configure.in 2005-02-15 21:06:02.000000000 +0100 ++++ openslp-1.2.1/configure.in 2012-01-24 23:49:13.000000000 +0100 +@@ -153,7 +153,6 @@ + OPTFLAGS="-O" + fi + fi +-CFLAGS="$CFLAGS $OPTFLAGS" + + dnl *********************************************************************** + dnl Checks for header files. diff --git a/net-libs/openslp/files/openslp-1.2.1-fbsd.patch b/net-libs/openslp/files/openslp-1.2.1-fbsd.patch new file mode 100644 index 000000000000..dac041516f23 --- /dev/null +++ b/net-libs/openslp/files/openslp-1.2.1-fbsd.patch @@ -0,0 +1,12 @@ +Index: openslp-1.2.1/common/Makefile.am +=================================================================== +--- openslp-1.2.1.orig/common/Makefile.am ++++ openslp-1.2.1/common/Makefile.am +@@ -24,6 +24,7 @@ libcommonlibslp_la_SOURCES = \ + slp_parse.c \ + slp_pid.c \ + slp_dhcp.c \ ++ slp_net.c \ + $(slp_v1message_SRCS) \ + $(slp_security_SRCS) + diff --git a/net-libs/openslp/files/openslp-1.2.1-fixoverflow.patch b/net-libs/openslp/files/openslp-1.2.1-fixoverflow.patch new file mode 100644 index 000000000000..c02d8407fb3b --- /dev/null +++ b/net-libs/openslp/files/openslp-1.2.1-fixoverflow.patch @@ -0,0 +1,11 @@ +--- a/openslp-1.2.1/slpd/slpd_socket.c 2010-09-11 16:31:47.325871093 -0500 ++++ b/openslp-1.2.1/slpd/slpd_socket.c 2010-09-11 16:31:55.706851189 -0500 +@@ -183,7 +183,7 @@ + memcpy(&mreq.imr_multiaddr, maddr, sizeof(struct in_addr)); + + /* drop for the specified interface */ +- memcpy(&mreq.imr_interface,addr,sizeof(addr)); ++ memcpy(&mreq.imr_interface,addr,sizeof(struct in_addr)); + + return setsockopt(sockfd, IPPROTO_IP, IP_DROP_MEMBERSHIP, (char*)&mreq,sizeof(mreq)); + } diff --git a/net-libs/openslp/files/openslp-2.0.0-cflags.patch b/net-libs/openslp/files/openslp-2.0.0-cflags.patch new file mode 100644 index 000000000000..b77261ee1f6d --- /dev/null +++ b/net-libs/openslp/files/openslp-2.0.0-cflags.patch @@ -0,0 +1,25 @@ +diff -ruN openslp-2.0.0.orig/configure.ac openslp-2.0.0/configure.ac +--- openslp-2.0.0.orig/configure.ac 2013-06-08 06:58:54.000000000 +0200 ++++ openslp-2.0.0/configure.ac 2013-07-12 22:17:15.000000000 +0200 +@@ -240,7 +240,6 @@ + OPTFLAGS="-O" + fi + fi +-CFLAGS="$CFLAGS $OPTFLAGS" + + # + # Configuration and output +diff -ruN openslp-2.0.0.orig/etc/Makefile.am openslp-2.0.0/etc/Makefile.am +--- openslp-2.0.0.orig/etc/Makefile.am 2012-11-28 18:07:04.000000000 +0100 ++++ openslp-2.0.0/etc/Makefile.am 2013-07-12 22:28:20.000000000 +0200 +@@ -3,8 +3,8 @@ + dist_sysconf_DATA = slp.conf slp.reg slp.spi + + #make sure the slpd log directory is there +-install-data-hook: +- mkdir -p $(localstatedir)/log ++#install-data-hook: ++# mkdir -p $(localstatedir)/log + + ##install-data-local: + ## mkdir -p $(DESTDIR)$(sysconfdir) diff --git a/net-libs/openslp/files/openslp-compile_fix.patch b/net-libs/openslp/files/openslp-compile_fix.patch new file mode 100644 index 000000000000..22bb3d6e2b7c --- /dev/null +++ b/net-libs/openslp/files/openslp-compile_fix.patch @@ -0,0 +1,14 @@ +--- openslp-1.3.0/common/slp_spi.c~ 2004-03-04 03:38:49.000000000 +0100 ++++ openslp-1.3.0/common/slp_spi.c 2004-03-04 03:38:49.000000000 +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 new file mode 100644 index 000000000000..9f7e3d2ee562 --- /dev/null +++ b/net-libs/openslp/files/openslp-no_install_doc.patch @@ -0,0 +1,21 @@ +--- openslp-1.3.0/Makefile.am~ 2004-03-04 03:56:37.000000000 +0100 ++++ openslp-1.3.0/Makefile.am 2004-03-04 03:56:37.000000000 +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 new file mode 100644 index 000000000000..0fe9af3c947d --- /dev/null +++ b/net-libs/openslp/files/openslp-opt.patch @@ -0,0 +1,25 @@ +--- openslp-1.0.11/configure.in.orig 2003-03-11 05:20:05.000000000 +0100 ++++ openslp-1.0.11/configure.in 2003-04-18 00:34:27.000000000 +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 \ diff --git a/net-libs/openslp/files/slpd-init b/net-libs/openslp/files/slpd-init new file mode 100644 index 000000000000..d4c759974f07 --- /dev/null +++ b/net-libs/openslp/files/slpd-init @@ -0,0 +1,89 @@ +#!/sbin/runscript +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +depend() { + need net +} + +# +# Does nothing if a route exists that supports multicast traffic. +# If no routes supporting multicast traffic exists, the function +# tries to add one. A 0 is returned on success and a 1 on failure. +# One parameter must be passed in. This variable determins verbosity. +# If parameter is non-zero debugging will appear. +# +multicast_route_set() { + PING_OPTIONS_1='-c1 -w1' + PING_OPTIONS_2='-c1 -i1' + MULTICAST_ADDRESS='239.255.255.253' + TMP_FILE=/tmp/route.check + PING_ERROR_NO_ROUTE='unreachable' + + MSG_FAILED_TO_FIND='Failed to Detect Multicast Route' + MSG_SUCCESS_ON_FIND='Multicast Route Enabled' + MSG_ADDING_ROUTE='Attempting to Add Multicast Route ...' + MSG_FAILED_TO_ADD=' FAILED - Route NOT Added.' + MSG_SUCCES_ON_ADD=' SUCCESS - Route Added.' + + CMD_GET_INTERFACE="netstat -i | awk 'BEGIN{}(NR>2)&&(!/^lo*/){print \$1;exit}'" + CMD_ADD_ROUTE="route add -net 224.0.0.0 netmask 240.0.0.0" + + ping $PING_OPTIONS_1 $MULTICAST_ADDRESS 2> $TMP_FILE 1> /dev/null + if [ $? = 2 ]; then + ping $PING_OPTIONS_2 $MULTICAST_ADDRESS 2> $TMP_FILE 1> /dev/null + fi + + grep $PING_ERROR_NO_ROUTE $TMP_FILE > /dev/null 2>&1 + err_unreachable_found=$? + + #If errors, add route. Otherwise, do nothing + if [ -s $TMP_FILE ] && [ $err_unreachable_found = 0 ]; then + + if [ $1 != 0 ]; then + echo $MSG_FAILED_TO_FIND + echo $MSG_ADDING_ROUTE + fi + + $CMD_ADD_ROUTE `eval $CMD_GET_INTERFACE` > /dev/null 2>&1 + retval=$? + if [ $1 != 0 ]; then + + if [ $retval = 0 ]; then + echo $MSG_SUCCES_ON_ADD + else + echo $MSG_FAILED_TO_ADD + fi + fi + else + if [ $1 != 0 ]; then + echo -n $MSG_SUCCESS_ON_FIND + fi + retval=0 + fi + + rm -f $TMP_FILE # Clean up + return $retval +} + +checkconfig() { + multicast_route_set 0 + if [ $? -ne 0 ]; then + eerror "No route available for multicast traffic!" + return 1 + fi +} + +start() { + checkconfig || return 1 + ebegin "Starting slpd" + start-stop-daemon --start --quiet --exec /usr/sbin/slpd --pidfile /var/run/slpd.pid + eend $? +} + +stop() { + ebegin "Stopping slpd" + start-stop-daemon --stop --quiet --pidfile /var/run/slpd.pid + eend $? +} diff --git a/net-libs/openslp/files/slpd.service b/net-libs/openslp/files/slpd.service new file mode 100644 index 000000000000..ab5c02f3b773 --- /dev/null +++ b/net-libs/openslp/files/slpd.service @@ -0,0 +1,10 @@ +[Unit] +Description=Service Location Protocol +After=network-online.target + +[Service] +ExecStart=/usr/sbin/slpd -l /var/log/slpd.log -d +ExecReload=/bin/kill -HUP $MAINPID + +[Install] +WantedBy=network.target |