Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev

4 files changed, 140 insertions, 0 deletions

diff --git a/recipes/siproxd/files/no-docs.patch b/recipes/siproxd/files/no-docs.patch
new file mode 100644
index 0000000000..499a5bb56b
--- /dev/null
+++ b/recipes/siproxd/files/no-docs.patch
@@ -0,0 +1,38 @@
+Taken from siproxd snapshot
+
+--- siproxd-0.7.1/configure.in	2008-02-02 20:13:31.000000000 +0300
++++ siproxd-0.7.2/configure.in	2009-03-01 18:41:27.000000000 +0300
+@@ -135,6 +141,33 @@
+ 
+ 
+ dnl **********************************************
++dnl * Building doc
++dnl **********************************************
++
++dnl
++dnl --enable-doc
++dnl
++
++   build_docs="yes";
++   AC_MSG_CHECKING(build documentation)
++   AC_ARG_ENABLE(doc,
++      [  --disable-doc               build pdf/html doc (default=enabled)],
++      if test "x$enableval" = "xno"; then
++         build_docs="no";
++      fi
++      AC_MSG_RESULT($build_docs), AC_MSG_RESULT($build_docs))
++   if test "x$build_docs" = "xyes"; then
++      AC_CHECK_PROG(docbook2pdf,docbook2pdf,yes,)
++      AM_CONDITIONAL(have_docbook2pdf,test "$docbook2pdf" = "yes")
++      AC_CHECK_PROG(docbook2html,docbook2html,yes,)
++      AM_CONDITIONAL(have_docbook2html,test "$docbook2html" = "yes")
++   else
++      AM_CONDITIONAL(have_docbook2pdf,false)
++      AM_CONDITIONAL(have_docbook2html,false)
++   fi
++
++
++dnl **********************************************
+ dnl * Selection of static build variants
+ dnl **********************************************
+ 
diff --git a/recipes/siproxd/files/siproxd.init b/recipes/siproxd/files/siproxd.init
new file mode 100644
index 0000000000..4a40f18bcc
--- /dev/null
+++ b/recipes/siproxd/files/siproxd.init
@@ -0,0 +1,59 @@
+#!/bin/bash
+#
+#	/etc/rc.d/init.d/siproxd
+#
+# Starts the siproxd daemon
+#
+# description: Listen and dispatch SIP messages
+# processname: siproxd
+
+
+DAEMON=/usr/sbin/siproxd
+NAME=siproxd
+
+test -x $DAEMON || exit 0
+
+start() {
+	echo -n $"Starting sip proxy: "
+	start-stop-daemon --start --quiet --pidfile /var/run/$NAME.pid \
+		--exec $DAEMON -- $DAEMON_OPTS || true
+	echo "$NAME."
+}
+
+stop() {
+	echo -n $"Stopping sip proxy: "
+	start-stop-daemon --stop --quiet --pidfile /var/run/$NAME.pid \
+		--exec $DAEMON || true
+	echo "$NAME."
+}
+
+
+restart() {
+	stop
+	start
+}	
+
+reload() {
+	trap "" SIGHUP
+	killall -HUP siproxd
+}	
+
+case "$1" in
+start)
+	start
+	;;
+stop)
+	stop
+	;;
+reload)
+	reload
+	;;
+restart)
+	restart
+	;;
+*)
+	echo $"Usage: $0 {start|stop|restart|reload}"
+	exit 1
+esac
+
+exit 0
diff --git a/recipes/siproxd/siproxd.inc b/recipes/siproxd/siproxd.inc
new file mode 100644
index 0000000000..1e7f3aea7b
--- /dev/null
+++ b/recipes/siproxd/siproxd.inc
@@ -0,0 +1,40 @@
+DESCRIPTION = "SIP proxy/masquerading daemon"
+SECTION = "net"
+DEPENDS = "libosip2"
+LICENSE = "GPL"
+
+SRC_URI = " \
+	${SOURCEFORGE_MIRROR}/siproxd/siproxd-${PV}.tar.gz \
+	file://siproxd.init \
+	"
+
+inherit autotools update-rc.d
+
+INITSCRIPT_NAME = "siproxd"
+
+EXTRA_OECONF = "--disable-doc"
+
+do_configure() {
+	gnu-configize
+	aclocal
+	libtoolize --copy --force
+	automake --add-missing
+	autoreconf
+	oe_runconf
+}
+
+do_install_append() {
+	cp ${D}/${sysconfdir}/siproxd.conf.example ${D}/${sysconfdir}/siproxd.conf
+	sed -ri "s,^#?(pid_file)\ *=\ *.*$,\1 = /var/run/siproxd.pid," ${D}/${sysconfdir}/siproxd.conf
+	sed -ri "s,^#?(plugindir)\ *=\ *.*$,\1 = ${libdir}/siproxd/," ${D}/${sysconfdir}/siproxd.conf
+	install -d ${D}/${sysconfdir}/init.d
+	install -m 755 ${WORKDIR}/siproxd.init ${D}/${sysconfdir}/init.d/siproxd
+}
+
+CONFFILES_${PN} = " \
+	${sysconfdir}/siproxd.conf \
+	${sysconfdir}/siproxd_passwd.cfg \
+	"
+
+FILES_${PN} = "${sysconfdir} ${sbindir} ${libdir}/siproxd/*.so.*"
+FILES_${PN}-dev += "${libdir}/siproxd/*.so ${libdir}/siproxd/*.a ${libdir}/siproxd/*.la"
diff --git a/recipes/siproxd/siproxd_0.7.1.bb b/recipes/siproxd/siproxd_0.7.1.bb
new file mode 100644
index 0000000000..66c36d1740
--- /dev/null
+++ b/recipes/siproxd/siproxd_0.7.1.bb
@@ -0,0 +1,3 @@
+require siproxd.inc
+
+SRC_URI += "file://no-docs.patch;patch=1"