Re: [ptxdist] [PATCH] eXOSIP2: add eXosip2 library

[Michael Olbrich <m.olbrich@pengutronix.de>]

On Wed, Apr 04, 2012 at 10:04:17AM +0200, Juergen Beisert wrote:
> Signed-off-by: Juergen Beisert <jbe@pengutronix.de>
> 
> diff --git a/patches/libexosip2_3.6.0.orig/fix_minisize_build.diff b/patches/libexosip2_3.6.0.orig/fix_minisize_build.diff
> new file mode 100644
> index 0000000..47a8986
> --- /dev/null
> +++ b/patches/libexosip2_3.6.0.orig/fix_minisize_build.diff
> @@ -0,0 +1,30 @@
> +From: Juergen Beisert <jbe@pengutronix.de>
> +Subject: Fix minisize build
> +
> +Signed-off-by: Juergen Beisert <jbe@pengutronix.de>
> +---
> + src/udp.c |    4 ++++
> + 1 file changed, 4 insertions(+)
> +
> +Index: libeXosip2-3.6.0/src/udp.c
> +===================================================================
> +--- libeXosip2-3.6.0.orig/src/udp.c
> ++++ libeXosip2-3.6.0/src/udp.c
> +@@ -2097,6 +2097,8 @@ void eXosip_release_terminated_registrat
> + 	return;
> + }
> + 
> ++#ifndef MINISIZE
> ++
> + void eXosip_release_terminated_publications(void)
> + {
> + 	eXosip_pub_t *jpub;
> +@@ -2126,6 +2128,8 @@ void eXosip_release_terminated_publicati
> + 
> + }
> + 
> ++#endif
> ++
> + #ifndef MINISIZE
> + 
> + static int
> diff --git a/patches/libexosip2_3.6.0.orig/fix_prototype_warning.diff b/patches/libexosip2_3.6.0.orig/fix_prototype_warning.diff
> new file mode 100644
> index 0000000..d69f80e
> --- /dev/null
> +++ b/patches/libexosip2_3.6.0.orig/fix_prototype_warning.diff
> @@ -0,0 +1,21 @@
> +From: Juergen Beisert <jbe@pengutronix.de>
> +Subject: Fix the warning about a missing prototype
> +
> +Signed-off-by: Juergen Beisert <jbe@pengutronix.de>
> +---
> + src/eXosip.c |    2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +
> +Index: libeXosip2-3.6.0/src/eXosip.c
> +===================================================================
> +--- libeXosip2-3.6.0.orig/src/eXosip.c
> ++++ libeXosip2-3.6.0/src/eXosip.c
> +@@ -1504,7 +1504,7 @@ int eXosip_update_top_via(osip_message_t
> + }
> + 
> + /* vivox: mark all registrations as needing refreshing */
> +-void eXosip_mark_all_registrations_expired()
> ++void eXosip_mark_all_registrations_expired(void)
> + {
> + 	eXosip_reg_t *jr;
> + 	int wakeup = 0;
> diff --git a/patches/libexosip2_3.6.0.orig/fix_strcasestr_warning.diff b/patches/libexosip2_3.6.0.orig/fix_strcasestr_warning.diff
> new file mode 100644
> index 0000000..4403fad
> --- /dev/null
> +++ b/patches/libexosip2_3.6.0.orig/fix_strcasestr_warning.diff
> @@ -0,0 +1,21 @@
> +From: Juergen Beisert <jbe@pengutronix.de>
> +Subject: Fix the warning about the usage of 'strcasestr'
> +
> +Signed-off-by: Juergen Beisert <jbe@pengutronix.de>
> +---
> + src/eXtl_tcp.c |    2 ++
> + 1 file changed, 2 insertions(+)
> +
> +Index: libeXosip2-3.6.0/src/eXtl_tcp.c
> +===================================================================
> +--- libeXosip2-3.6.0.orig/src/eXtl_tcp.c
> ++++ libeXosip2-3.6.0/src/eXtl_tcp.c
> +@@ -17,6 +17,8 @@
> +   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
> + */
> + 
> ++#define _GNU_SOURCE
> ++#include <string.h>
> + 
> + #ifdef ENABLE_MPATROL
> + #include <mpatrol.h>
> diff --git a/patches/libexosip2_3.6.0.orig/series b/patches/libexosip2_3.6.0.orig/series
> new file mode 100644
> index 0000000..ef7babc
> --- /dev/null
> +++ b/patches/libexosip2_3.6.0.orig/series
> @@ -0,0 +1,3 @@
> +fix_strcasestr_warning.diff
> +fix_prototype_warning.diff
> +fix_minisize_build.diff
> diff --git a/rules/libeXosip2.in b/rules/libeXosip2.in
> new file mode 100644
> index 0000000..8db8840
> --- /dev/null
> +++ b/rules/libeXosip2.in
> @@ -0,0 +1,29 @@
> +## SECTION=system_libraries
> +
> +menuconfig LIBEXOSIP2
> +	tristate
> +	select LIBOSIP2
> +	select LIBC_NSL
> +	select LIBC_RESOLV
> +	select LIBC_RT
> +	prompt "libexosip2                    "
> +	help
> +	  eXosip is a library that extends the capability of the oSIP
> +	  library. It aims to implement a simple high layer API to control the
> +	  SIP for sessions establishements and common extensions
> +
> +if LIBEXOSIP2
> +
> +config LIBEXOSIP2_DEBUG
> +	bool
> +	prompt "enable debug"
> +	help
> +	  Make the library larger and more noisy.
> +
> +config LIBEXOSIP2_TRACE
> +	bool
> +	prompt "enable log trace"
> +	help
> +	  Enable trace in the logfile.
> +
> +endif
> diff --git a/rules/libeXosip2.make b/rules/libeXosip2.make
> new file mode 100644
> index 0000000..5c81f7a
> --- /dev/null
> +++ b/rules/libeXosip2.make
> @@ -0,0 +1,75 @@
> +# -*-makefile-*-
> +#
> +# Copyright (C) 2011 by Juergen Beisert <jbe@pengutronix.de>
> +#
> +# See CREDITS for details about who has contributed to this project.
> +#
> +# For further information about the PTXdist project and license conditions
> +# see the README file.
> +#
> +
> +#
> +# We provide this package
> +#
> +PACKAGES-$(PTXCONF_LIBEXOSIP2) += libexosip2
> +
> +#
> +# Paths and names
> +#
> +LIBEXOSIP2_VERSION	:= 3.6.0
> +LIBEXOSIP2_MD5		:= 6fef4c110f1305048a8b307f440933d9
> +LIBEXOSIP2		:= libexosip2_$(LIBEXOSIP2_VERSION).orig
> +LIBEXOSIP2_SUFFIX	:= tar.gz
> +LIBEXOSIP2_URL		:= http://libexosip2.sourcearchive.com/downloads/3.6.0-1/$(LIBEXOSIP2).$(LIBEXOSIP2_SUFFIX)

I think http://download.savannah.gnu.org/releases/exosip/ is the real
upstream here.

> +LIBEXOSIP2_SOURCE	:= $(SRCDIR)/$(LIBEXOSIP2).$(LIBEXOSIP2_SUFFIX)
> +LIBEXOSIP2_DIR		:= $(BUILDDIR)/libeXosip2-$(LIBEXOSIP2_VERSION)
> +LIBEXOSIP2_LICENSE	:= GPLv2/ISC
> +
> +# ----------------------------------------------------------------------------
> +# Prepare
> +# ----------------------------------------------------------------------------
> +
> +#
> +# autoconf
> +#
> +LIBEXOSIP2_CONF_TOOL	:= autoconf
> +LIBEXOSIP2_CONF_OPT	:= \
> + 	$(CROSS_AUTOCONF_USR) \
> +	--enable-shared \
> +	--disable-static \
> +	--disable-tools \
> +	--$(call ptx/endis, PTXCONF_LIBEXOSIP2_DEBUG)-debug \
> +	--$(call ptx/endis, PTXCONF_LIBEXOSIP2_TRACE)-trace \
> +	--disable-mpatrol \
> +	--disable-gprof \
> +	--enable-pthread \
> +	--enable-semaphore \
> +	--disable-sysv \
> +	--enable-mt \
> +	--disable-openssl \
> +	--disable-srvrec
> +
> +# '--enable-minisize' clobbers the library in many ways. Some at compile time,
> +# some at run-time due to missing symbols. What a mess.
> +LIBEXOSIP2_CONF_OPT += --disable-minisize
> +
> +# ----------------------------------------------------------------------------
> +# Target-Install
> +# ----------------------------------------------------------------------------
> +
> +$(STATEDIR)/libexosip2.targetinstall:
> +	@$(call targetinfo)
> +
> +	@$(call install_init, libexosip2)
> +	@$(call install_fixup, libexosip2,PRIORITY,optional)
> +	@$(call install_fixup, libexosip2,SECTION,base)
> +	@$(call install_fixup, libexosip2,AUTHOR,"Juergen Beisert <jbe@pengutronix.de>")
> +	@$(call install_fixup, libexosip2,DESCRIPTION,missing)
> +
> +	@$(call install_lib, libexosip2, 0, 0, 0644, libeXosip2)
> +
> +	@$(call install_finish, libexosip2)
> +
> +	@$(call touch)
> +
> +# vim: syntax=make
> 
> -- 
> Pengutronix e.K.                              | Juergen Beisert             |
> Linux Solutions for Science and Industry      | http://www.pengutronix.de/  |
> 
> -- 
> ptxdist mailing list
> ptxdist@pengutronix.de
> 

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

-- 
ptxdist mailing list
ptxdist@pengutronix.de