diff options
Diffstat (limited to 'package/sipsak')
| -rw-r--r-- | package/sipsak/Config.in | 12 | ||||
| -rw-r--r-- | package/sipsak/Makefile | 8 | ||||
| -rw-r--r-- | package/sipsak/patches/patch-acinclude_m4 | 12 | ||||
| -rw-r--r-- | package/sipsak/patches/patch-configure | 10 |
4 files changed, 9 insertions, 33 deletions
diff --git a/package/sipsak/Config.in b/package/sipsak/Config.in deleted file mode 100644 index abf0667fd..000000000 --- a/package/sipsak/Config.in +++ /dev/null @@ -1,12 +0,0 @@ -config ADK_PACKAGE_SIPSAK - prompt "sipsak............................ SIP (Session Initiation Protocol) stress and diagnostics utility" - tristate - default n - select ADK_PACKAGE_LIBOPENSSL - help - A SIP (Session Initiation Protocol) stress and diagnostics utility - - http://www.sipsak.org/ - - Depends: openssl - diff --git a/package/sipsak/Makefile b/package/sipsak/Makefile index 089cb6afe..0e6b9d292 100644 --- a/package/sipsak/Makefile +++ b/package/sipsak/Makefile @@ -5,11 +5,12 @@ include ${TOPDIR}/rules.mk PKG_NAME:= sipsak PKG_VERSION:= 0.9.6 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= c4eb8e282902e75f4f040f09ea9d99d5 -PKG_DESCR:= a SIP (Session Initiation Protocol) stress and diagnostics utility +PKG_DESCR:= a SIP stress and diagnostics utility PKG_SECTION:= net PKG_DEPENDS:= libopenssl +PKG_BUILDDEP+= openssl PKG_URL:= http://sipsak.org PKG_SITES:= http://download.berlios.de/sipsak/ \ http://ftp.iptel.org/pub/sipsak/ @@ -18,10 +19,7 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,SIPSAK,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -CONFIGURE_STYLE:= autoconf gnu CONFIGURE_ARGS+= --disable-gnutls -BUILD_STYLE:= auto -INSTALL_STYLE:= auto post-install: ${INSTALL_DIR} ${IDIR_SIPSAK}/usr/bin diff --git a/package/sipsak/patches/patch-acinclude_m4 b/package/sipsak/patches/patch-acinclude_m4 deleted file mode 100644 index fb642f9a4..000000000 --- a/package/sipsak/patches/patch-acinclude_m4 +++ /dev/null @@ -1,12 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- sipsak-0.9.6.orig/acinclude.m4 2006-01-28 22:11:34.000000000 +0100 -+++ sipsak-0.9.6/acinclude.m4 2009-05-31 16:36:57.000000000 +0200 -@@ -363,7 +363,7 @@ AC_DEFUN([SIPSAK_GCC_STACK_PROTECT_CC],[ - AC_MSG_CHECKING([whether ${CC} accepts -fstack-protector]) - ssp_old_cflags="$CFLAGS" - CFLAGS="$CFLAGS -fstack-protector" -- AC_TRY_COMPILE(,,, ssp_cc=no) -+ AC_TRY_LINK(,,, ssp_cc=no) - echo $ssp_cc - if test "X$ssp_cc" = "Xno"; then - CFLAGS="$ssp_old_cflags" diff --git a/package/sipsak/patches/patch-configure b/package/sipsak/patches/patch-configure index 40399b86b..877251f30 100644 --- a/package/sipsak/patches/patch-configure +++ b/package/sipsak/patches/patch-configure @@ -1,6 +1,5 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ --- sipsak-0.9.6.orig/configure 2006-01-28 22:11:34.000000000 +0100 -+++ sipsak-0.9.6/configure 2009-05-31 16:35:17.000000000 +0200 ++++ sipsak-0.9.6/configure 2009-11-23 20:57:18.000000000 +0100 @@ -1,27 +1,56 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. @@ -3223,7 +3222,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type -@@ -2902,8 +3347,8 @@ fi +@@ -2902,10 +3347,10 @@ fi ssp_cc=yes if test "X$CC" != "X"; then @@ -3232,8 +3231,11 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ + { echo "$as_me:$LINENO: checking whether ${CC} accepts -fstack-protector" >&5 +echo $ECHO_N "checking whether ${CC} accepts -fstack-protector... $ECHO_C" >&6; } ssp_old_cflags="$CFLAGS" - CFLAGS="$CFLAGS -fstack-protector" +- CFLAGS="$CFLAGS -fstack-protector" ++ CFLAGS="$CFLAGS" cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF @@ -2922,35 +3367,31 @@ main () } _ACEOF |