Index: asterisk/Makefile =================================================================== RCS file: /usr/cvsroot/asterisk/Makefile,v retrieving revision 1.78 diff -u -r1.78 Makefile --- asterisk/Makefile 4 Mar 2004 22:09:48 -0000 1.78 +++ asterisk/Makefile 11 Mar 2004 13:25:19 -0000 @@ -23,6 +23,10 @@ else ifeq (${OSARCH},FreeBSD) PROC=$(shell uname -m) +else +ifeq (${OSARCH},OpenBSD) +PROC=$(shell uname -m) +endif endif endif # Pentium Pro Optimize @@ -175,9 +179,14 @@ ASTLINK=-Wl,-dynamic SOLINK=-dynamic -bundle -undefined suppress -force_flat_namespace else +ifeq (${OSARCH},OpenBSD) +ASTLINK=-Wl +SOLINK=-shared -Xlinker -x +else ASTLINK=-Wl,-E SOLINK=-shared -Xlinker -x endif +endif CC=gcc INSTALL=install Index: asterisk/aesopt.h =================================================================== RCS file: /usr/cvsroot/asterisk/aesopt.h,v retrieving revision 1.3 diff -u -r1.3 aesopt.h --- asterisk/aesopt.h 2 Mar 2004 22:53:08 -0000 1.3 +++ asterisk/aesopt.h 11 Mar 2004 13:25:20 -0000 @@ -148,7 +148,10 @@ /* PLATFORM SPECIFIC INCLUDES */ -#if defined( __FreeBSD__ ) || defined( __OpenBSD__ ) +#if defined( __OpenBSD__ ) +# include +# include +#elif defined( __FreeBSD__ ) # include # include #elif defined( BSD ) && ( BSD >= 199103 ) Index: asterisk/md5.c =================================================================== RCS file: /usr/cvsroot/asterisk/md5.c,v retrieving revision 1.3 diff -u -r1.3 md5.c --- asterisk/md5.c 7 Mar 2004 04:36:52 -0000 1.3 +++ asterisk/md5.c 11 Mar 2004 13:25:20 -0000 @@ -1,6 +1,12 @@ /* MD5 checksum routines used for authentication. Not covered by GPL, but in the public domain as per the copyright below */ + +#ifdef __OpenBSD__ +#include +#include +#else #include +#endif # if __BYTE_ORDER == __BIG_ENDIAN || BYTE_ORDER == BIG_ENDIAN # define HIGHFIRST 1 # endif Index: asterisk/channels/Makefile =================================================================== RCS file: /usr/cvsroot/asterisk/channels/Makefile,v retrieving revision 1.38 diff -u -r1.38 Makefile --- asterisk/channels/Makefile 9 Mar 2004 20:10:23 -0000 1.38 +++ asterisk/channels/Makefile 11 Mar 2004 13:25:20 -0000 @@ -70,6 +70,20 @@ PWLIBDIR=$(HOME)/pwlib endif +ifeq (${OSARCH},OpenBSD) +PTLIB=pt_OpenBSD_x86_r +H323LIB=h323_OpenBSD_x86_r +else +PTLIB=pt_linux_x86_r +H323LIB=h323_linux_x86_r +endif + +ifeq (${OSARCH},OpenBSD) +CHANH323LIB=-L/usr/local/lib +else +CHANH323LIB=-ldl +endif + #CFLAGS+=$(shell [ -f $(ZAPDIR)/libzap.a ] && echo "-I$(ZAPDIR)") all: depend $(CHANNEL_LIBS) @@ -147,7 +161,7 @@ $(CXX) $(SOLINK) -o $@ $< -lvpb -lpthread -lm -ldl chan_h323.so: chan_h323.o h323/libchanh323.a - $(CC) $(SOLINK) -o $@ $< h323/libchanh323.a -L$(PWLIBDIR)/lib -lpt_linux_x86_r -L$(OPENH323DIR)/lib -lh323_linux_x86_r -L/usr/lib -lpthread -ldl -lcrypto -lssl -lexpat + $(CC) $(SOLINK) -o $@ $< h323/libchanh323.a -L$(PWLIBDIR)/lib -l$(PTLIB) -L$(OPENH323DIR)/lib -l$(H323LIB) -L/usr/lib $(CHANH323LIB) -lpthread -lcrypto -lssl -lexpat #chan_modem.so : chan_modem.o Index: asterisk/channels/chan_h323.c =================================================================== RCS file: /usr/cvsroot/asterisk/channels/chan_h323.c,v retrieving revision 1.33 diff -u -r1.33 chan_h323.c --- asterisk/channels/chan_h323.c 4 Mar 2004 02:07:32 -0000 1.33 +++ asterisk/channels/chan_h323.c 11 Mar 2004 13:25:21 -0000 @@ -26,7 +26,11 @@ * Version Info: $Id: chan_h323.c,v 1.33 2004/03/04 02:07:32 jeremy Exp $ */ - +#ifdef __OpenBSD__ +#ifndef IPTOS_MINCOST +#define IPTOS_MINCOST 0x02 +#endif +#endif #include #include #include @@ -54,6 +58,9 @@ #include #include #include +#ifdef __OpenBSD__ +#include +#endif #include Index: asterisk/channels/h323/Makefile =================================================================== RCS file: /usr/cvsroot/asterisk/channels/h323/Makefile,v retrieving revision 1.11 diff -u -r1.11 Makefile --- asterisk/channels/h323/Makefile 11 Jan 2004 02:22:32 -0000 1.11 +++ asterisk/channels/h323/Makefile 11 Mar 2004 13:25:21 -0000 @@ -1,4 +1,5 @@ # include the Makefile of OpenH323 +OSARCH=$(shell uname -s) ifndef OPENH323DIR OPENH323DIR=$(HOME)/openh323 @@ -28,7 +29,12 @@ # CFLAGS += -DNDEBUG -DDO_CRASH -DDEBUG_THREADS CFLAGS += -pipe -Wall -fPIC -Wmissing-prototypes -Wmissing-declarations -CFLAGS += -DP_LINUX -D_REENTRANT -D_GNU_SOURCE +ifeq (${OSARCH},OpenBSD) +CFLAGS += -DP_OPENBSD=200311 +else +CFLAGS += -DP_LINUX +endif +CFLAGS += -D_REENTRANT -D_GNU_SOURCE CFLAGS += -DP_HAS_SEMAPHORES -DP_SSL -DP_PTHREADS CFLAGS += -DPHAS_TEMPLATES -DPTRACING -DP_USE_PRAGMA CFLAGS += -I../../include Index: asterisk/include/asterisk/frame.h =================================================================== RCS file: /usr/cvsroot/asterisk/include/asterisk/frame.h,v retrieving revision 1.29 diff -u -r1.29 frame.h --- asterisk/include/asterisk/frame.h 2 Mar 2004 22:55:05 -0000 1.29 +++ asterisk/include/asterisk/frame.h 11 Mar 2004 13:25:21 -0000 @@ -29,6 +29,9 @@ #ifdef __linux__ #include #elif defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__APPLE__) +#if defined(__OpenBSD__) +#include +#endif #include #define __BYTE_ORDER BYTE_ORDER #define __LITTLE_ENDIAN LITTLE_ENDIAN