[Pkg-voip-commits] r8930 - in /asterisk/trunk/debian: changelog control patches/kfreebsd patches/no_uname patches/series rules

tzafrir at alioth.debian.org tzafrir at alioth.debian.org
Wed May 11 00:33:13 UTC 2011 

Author: tzafrir
Date: Wed May 11 00:33:03 2011
New Revision: 8930

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=8930
Log:
* Fixes for kFreeBSD (Closes: #624569):
  - Declare build-deps linux-any: libtonezone-dev, libvpb-dev,
    libbluetooth-dev, libopenh323-dev, libcap[2]-dev, libstrp0-dev.
  - Thus sub-packages asterisk-dahdi, asterisk-h323 and asterisk-mobile
    are linux-any.
  - And logic added to rules file not to copy their files on non-linux.
  - Patch kfreebsd: Fix building with kFreeBSD.
  - Patch no_uname: Fix building with kFreeBSD: an uglier patch.

Added:
    asterisk/trunk/debian/patches/kfreebsd
    asterisk/trunk/debian/patches/no_uname
Modified:
    asterisk/trunk/debian/changelog
    asterisk/trunk/debian/control
    asterisk/trunk/debian/patches/series
    asterisk/trunk/debian/rules

Modified: asterisk/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/changelog?rev=8930&op=diff
==============================================================================
--- asterisk/trunk/debian/changelog (original)
+++ asterisk/trunk/debian/changelog Wed May 11 00:33:03 2011
@@ -4,7 +4,15 @@
   * Remove unneeded dependency on voicemail modules - only leave Recommends
     (Closes: #624190).
   * Patch refix_bashism: bashism crept bact into the configure script
-    (Jilles Tjoelker). 
+    (Jilles Tjoelker).
+  * Fixes for kFreeBSD (Closes: #624569):
+    - Declare build-deps linux-any: libtonezone-dev, libvpb-dev,
+      libbluetooth-dev, libopenh323-dev, libcap[2]-dev, libstrp0-dev.
+    - Thus sub-packages asterisk-dahdi, asterisk-h323 and asterisk-mobile
+      are linux-any.
+    - And logic added to rules file not to copy their files on non-linux.
+    - Patch kfreebsd: Fix building with kFreeBSD.
+    - Patch no_uname: Fix building with kFreeBSD: an uglier patch.
 
  -- Tzafrir Cohen <tzafrir at debian.org>  Tue, 03 May 2011 17:23:47 +0300
 

Modified: asterisk/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/control?rev=8930&op=diff
==============================================================================
--- asterisk/trunk/debian/control (original)
+++ asterisk/trunk/debian/control Wed May 11 00:33:03 2011
@@ -8,15 +8,15 @@
  libreadline-dev | libreadline5-dev,
  libgsm1-dev,
  libssl-dev,
- libtonezone-dev (>= 1:2.0.0),
+ libtonezone-dev (>= 1:2.0.0) [linux-any],
  libasound2-dev,
  libpq-dev,
  unixodbc-dev,
  libmysqlclient-dev | libmysqlclient15-dev,
- libbluetooth-dev,
+ libbluetooth-dev [linux-any],
  libpri-dev (>= 1.4.7),
  libss7-dev,
- libvpb-dev,
+ libvpb-dev [linux-any],
  dahdi-source,
  autotools-dev,
  autoconf,
@@ -30,7 +30,7 @@
  libxml2-dev,
  gsfonts,
  libpopt-dev,
- libopenh323-dev (>= 1.17.4),
+ libopenh323-dev (>= 1.17.4) [linux-any],
  libiksemel-dev,
  libradiusclient-ng-dev,
  freetds-dev,
@@ -40,14 +40,14 @@
  libgmime-2.4-dev | libgmime2-dev,
  libjack-dev,
  liblua5.1-0-dev,
- libcap-dev (>= 1:2.16-4) | libcap2-dev,
+ libcap-dev (>= 1:2.16-4) [linux-any] | libcap2-dev [linux-any],
  libspandsp-dev,
- libopenr2-dev,
+ libopenr2-dev [linux-any],
  libresample1-dev,
  libopenais-dev,
  libneon27-gnutls-dev | libneon27-dev,
  libical-dev,
- libsrtp0-dev,
+ libsrtp0-dev [linux-any],
  zlib1g-dev
 Standards-Version: 3.9.2.0
 Homepage: http://www.asterisk.org/
@@ -97,7 +97,7 @@
  There is normally no need to explicitly install it.
 
 Package: asterisk-h323
-Architecture: any
+Architecture: any-linux
 Depends: asterisk, ${shlibs:Depends}, ${misc:Depends}
 Description: H.323 protocol support for the Asterisk PBX
  Asterisk is an Open Source PBX and telephony toolkit.
@@ -114,7 +114,7 @@
  package.
 
 Package: asterisk-dahdi
-Architecture: any
+Architecture: any-linux
 Depends: asterisk, ${shlibs:Depends}, ${misc:Depends}, dahdi
 Breaks: asterisk (<<1.8.0)
 Replaces: asterisk (<<1.8.0)
@@ -223,7 +223,7 @@
  package.
 
 Package: asterisk-mobile
-Architecture: any
+Architecture: linux-any
 Depends: asterisk, ${shlibs:Depends}, ${misc:Depends}
 Description: Bluetooth phone support for the Asterisk PBX
  Asterisk is an Open Source PBX and telephony toolkit.

Added: asterisk/trunk/debian/patches/kfreebsd
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/kfreebsd?rev=8930&op=file
==============================================================================
--- asterisk/trunk/debian/patches/kfreebsd (added)
+++ asterisk/trunk/debian/patches/kfreebsd Wed May 11 00:33:03 2011
@@ -1,0 +1,38 @@
+Author: Tzafrir Cohen <tzafrir at debian.org>
+Bug: https://issues.asterisk.org/view.php?id=17161
+
+Fix a few places where the GNU/kFreeBSD is misdetected.
+
+--- a/channels/chan_oss.c
++++ b/channels/chan_oss.c
+@@ -47,7 +47,7 @@
+ 
+ #ifdef __linux
+ #include <linux/soundcard.h>
+-#elif defined(__FreeBSD__) || defined(__CYGWIN__)
++#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__CYGWIN__)
+ #include <sys/soundcard.h>
+ #else
+ #include <soundcard.h>
+--- a/main/netsock.c
++++ b/main/netsock.c
+@@ -29,7 +29,7 @@
+ 
+ ASTERISK_FILE_VERSION(__FILE__, "$Revision: 298051 $")
+ 
+-#if defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__Darwin__)
++#if defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__Darwin__)
+ #include <net/if_dl.h>
+ #endif
+ 
+--- a/main/Makefile
++++ b/main/Makefile
+@@ -34,7 +34,7 @@
+ AST_LIBS += $(BKTR_LIB)
+ AST_LIBS += $(LIBXML2_LIB) 
+ 
+-ifneq ($(findstring $(OSARCH), linux-gnu uclinux linux-uclibc linux-gnueabi ),)
++ifneq ($(findstring $(OSARCH), linux-gnu uclinux linux-uclibc linux-gnueabi kfreebsd-gnu),)
+   ifneq ($(findstring LOADABLE_MODULES,$(MENUSELECT_CFLAGS)),)
+   AST_LIBS+=-ldl
+   endif

Added: asterisk/trunk/debian/patches/no_uname
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/no_uname?rev=8930&op=file
==============================================================================
--- asterisk/trunk/debian/patches/no_uname (added)
+++ asterisk/trunk/debian/patches/no_uname Wed May 11 00:33:03 2011
@@ -1,0 +1,21 @@
+Author: Tzafrir Cohen <tzafrir at debian.org>
+Bug: https://issues.asterisk.org/view.php?id=17161
+Forwarded-Upstream: no
+
+Remove the special case for BSD in the bootstrap script. This is a
+simple brute-force patch until I figure out why that specific version
+of autoconf is needed on BSD.
+
+--- a/bootstrap.sh
++++ b/bootstrap.sh
+@@ -17,10 +17,6 @@
+ 		MY_AC_VER=259
+ 		MY_AM_VER=19
+ 		;;
+-	*'BSD'*)
+-		MY_AC_VER=-2.62
+-		MY_AM_VER=-1.9
+-		;;
+ 	*'SunOS '*)
+ 		MY_AC_VER=
+ 		MY_AM_VER=-1.9

Modified: asterisk/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/series?rev=8930&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/series (original)
+++ asterisk/trunk/debian/patches/series Wed May 11 00:33:03 2011
@@ -22,3 +22,5 @@
 openssl10
 no_ssl2
 refix_bashism
+no_uname
+kfreebsd

Modified: asterisk/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/rules?rev=8930&op=diff
==============================================================================
--- asterisk/trunk/debian/rules (original)
+++ asterisk/trunk/debian/rules Wed May 11 00:33:03 2011
@@ -10,6 +10,9 @@
 else
   confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
 endif
+
+# We copy around a number of things in case we're linux:
+BUILD_OS=$(shell dpkg-architecture -qDEB_BUILD_ARCH_OS)
 
 export PROC := $(shell dpkg-architecture -qDEB_BUILD_GNU_CPU)
 
@@ -68,12 +71,13 @@
 		--prefix=/usr				\
 		--mandir=\$${prefix}/share/man		\
 		--infodir=\$${prefix}/share/info	\
-		--with-cap				\
 		--with-gsm				\
 		--with-imap=system			\
-		--with-pwlib=/usr/share/pwlib/include/	\
-		--with-h323=/usr/share/openh323/ 	\
 		${ENABLE_DEBUG}
+
+#		--with-cap \
+#		--with-pwlib=/usr/share/pwlib/include/ \
+#		--with-h323=/usr/share/openh323/ 
 
 build: build-arch build-indep
 
@@ -85,7 +89,9 @@
 		menuselect/menuselect --enable DONT_OPTIMIZE menuselect.makeopts ; \
 		menuselect/menuselect --enable DEBUG_THREADS menuselect.makeopts ; \
 	fi
+ifeq (linux,$(BUILD_OS))
 	$(FETCH_ENV) $(MAKE) $(BUILDFLAGS) h323-mak
+endif
 	$(FETCH_ENV) $(MAKE) $(BUILDFLAGS)
 	touch $@
 
@@ -118,9 +124,12 @@
 
 	dh_clean
 
-SUBPACKS_EXTRA = dahdi h323 \
+SUBPACKS_EXTRA = \
 		 voicemail voicemail-odbcstorage voicemail-imapstorage \
-		 ooh323 mysql mp3 mobile
+		 ooh323 mysql mp3
+ifeq (linux,$(BUILD_OS))
+SUBPACKS_EXTRA += dahdi h323 mobile
+endif
 SUBPACKS_EXTRA_DIRS = $(SUBPACKS_EXTRA:%=$(CURDIR)/debian/asterisk-%)
 SUBPACKS_EXTRA_DIRS_MOD = $(SUBPACKS_EXTRA_DIRS:%=%/usr/lib/asterisk/modules)

More information about the Pkg-voip-commits mailing list