OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 05-Sep-2006 22:26:47
Branch: HEAD Handle: 2006090521264700
Modified files:
openpkg-src/asterisk asterisk.patch
Log:
regen patch (to be sorted); fix building under slightly older FreeBSD
6
Summary:
Revision Changes Path
1.4 +70 -67 openpkg-src/asterisk/asterisk.patch
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/asterisk/asterisk.patch
============================================================================
$ cvs diff -u -r1.3 -r1.4 asterisk.patch
--- openpkg-src/asterisk/asterisk.patch 5 Sep 2006 13:08:37 -0000
1.3
+++ openpkg-src/asterisk/asterisk.patch 5 Sep 2006 20:26:47 -0000
1.4
@@ -1,6 +1,6 @@
Index: Makefile
--- Makefile.orig 2006-06-29 21:23:18 +0200
-+++ Makefile 2006-09-05 09:10:38 +0200
++++ Makefile 2006-09-05 22:20:22 +0200
@@ -110,35 +110,19 @@
# Don't use together with -DBUSYDETECT_TONEONLY
BUSYDETECT+= #-DBUSYDETECT_COMPARE_TONE_AND_SILENCE
@@ -112,7 +112,7 @@
endif
Index: agi/Makefile
--- agi/Makefile.orig 2006-03-28 22:22:05 +0200
-+++ agi/Makefile 2006-09-05 09:10:38 +0200
++++ agi/Makefile 2006-09-05 22:20:22 +0200
@@ -20,9 +20,7 @@
LIBS=-lsocket -lnsl ../strcompat.o
endif
@@ -126,7 +126,7 @@
Index: app_conference/Makefile
--- app_conference/Makefile.orig 2005-10-27 19:53:35 +0200
-+++ app_conference/Makefile 2006-09-05 09:10:38 +0200
++++ app_conference/Makefile 2006-09-05 22:20:22 +0200
@@ -20,10 +20,10 @@
INSTALL_PREFIX := /opt/horizon
INSTALL_MODULES_DIR := $(INSTALL_PREFIX)/lib/asterisk/modules
@@ -185,7 +185,7 @@
# cp conf.conf /etc/asterisk/
Index: app_conference/conference.c
--- app_conference/conference.c.orig 2005-10-27 19:53:35 +0200
-+++ app_conference/conference.c 2006-09-05 09:10:38 +0200
++++ app_conference/conference.c 2006-09-05 22:20:22 +0200
@@ -618,7 +618,7 @@
// acquire conference mutexes
ast_mutex_lock( &conf->lock ) ;
@@ -197,7 +197,7 @@
pthread_detach( conf->conference_thread ) ;
Index: apps/Makefile
--- apps/Makefile.orig 2006-04-30 15:38:22 +0200
-+++ apps/Makefile 2006-09-05 09:35:21 +0200
++++ apps/Makefile 2006-09-05 22:20:22 +0200
@@ -54,16 +54,11 @@
APPS+=app_osplookup.so
endif
@@ -221,7 +221,7 @@
CYGSOLINK=-Wl,[EMAIL PROTECTED] -Wl,--export-all-symbols
Index: asterisk-addons-1.2.4/Makefile
--- asterisk-addons-1.2.4/Makefile.orig 2005-12-02 00:14:28 +0100
-+++ asterisk-addons-1.2.4/Makefile 2006-09-05 09:10:38 +0200
++++ asterisk-addons-1.2.4/Makefile 2006-09-05 22:20:22 +0200
@@ -27,17 +27,9 @@
#
# MySQL stuff... Autoconf anyone??
@@ -245,7 +245,7 @@
Index: cdr/Makefile
--- cdr/Makefile.orig 2006-04-30 16:27:56 +0200
-+++ cdr/Makefile 2006-09-05 09:10:38 +0200
++++ cdr/Makefile 2006-09-05 22:20:22 +0200
@@ -20,10 +20,8 @@
CFLAGS+=-fPIC
endif
@@ -261,7 +261,7 @@
#This works for even old (2.96) versions of gcc and provides a small boost
either way.
Index: channels/Makefile
--- channels/Makefile.orig 2006-08-17 23:57:19 +0200
-+++ channels/Makefile 2006-09-05 09:10:38 +0200
++++ channels/Makefile 2006-09-05 22:20:22 +0200
@@ -21,9 +21,7 @@
#CHANNEL_LIBS+=chan_modem.so chan_modem_aopen.so chan_modem_bestdata.so
endif
@@ -273,9 +273,32 @@
ifeq (${OSARCH},OpenBSD)
PTLIB=-lpt_OpenBSD_x86_r
+Index: channels/chan_h323.c
+--- channels/chan_h323.c.orig 2006-08-05 07:08:50 +0200
++++ channels/chan_h323.c 2006-09-05 22:20:22 +0200
+@@ -31,6 +31,7 @@
+ * \ingroup channel_drivers
+ */
+
++#include <sys/types.h>
+ #include <sys/socket.h>
+ #include <sys/signal.h>
+ #include <sys/param.h>
+Index: channels/chan_skinny.c
+--- channels/chan_skinny.c.orig 2006-08-05 07:08:50 +0200
++++ channels/chan_skinny.c 2006-09-05 22:20:22 +0200
+@@ -99,7 +99,7 @@
+ #define htolel(x) (x)
+ #define htoles(x) (x)
+ #else
+-#if defined(SOLARIS) || defined(__Darwin__) || defined(__NetBSD__)
++#if defined(SOLARIS) || defined(__Darwin__) || defined(__NetBSD__) ||
defined(__FreeBSD__)
+ #define __bswap_16(x) \
+ ((((x) & 0xff00) >> 8) | \
+ (((x) & 0x00ff) << 8))
Index: codecs/Makefile
--- codecs/Makefile.orig 2005-11-29 19:24:39 +0100
-+++ codecs/Makefile 2006-09-05 09:10:38 +0200
++++ codecs/Makefile 2006-09-05 22:20:22 +0200
@@ -28,45 +28,16 @@
LIBG723B=g723.1b/libg723b.a
endif
@@ -328,7 +351,7 @@
codec_adpcm.so codec_ulaw.so codec_alaw.so codec_a_mu.so \
Index: formats/Makefile
--- formats/Makefile.orig 2005-11-29 19:24:39 +0100
-+++ formats/Makefile 2006-09-05 09:10:38 +0200
++++ formats/Makefile 2006-09-05 22:20:22 +0200
@@ -29,9 +29,7 @@
FORMAT_LIBS+=format_ogg_vorbis.so
endif
@@ -340,9 +363,21 @@
GSMLIB=../codecs/gsm/lib/libgsm.a
+Index: frame.c
+--- frame.c.orig 2006-07-31 06:06:16 +0200
++++ frame.c 2006-09-05 22:20:22 +0200
+@@ -1055,7 +1055,7 @@
+ {
+ switch(buf & TYPE_MASK) {
+ case TYPE_DONTSEND:
+- return 0;
++ return 2;
+ break;
+ case TYPE_SILENCE:
+ return 4;
Index: funcs/Makefile
--- funcs/Makefile.orig 2005-11-29 19:24:39 +0100
-+++ funcs/Makefile 2006-09-05 09:10:38 +0200
++++ funcs/Makefile 2006-09-05 22:20:22 +0200
@@ -40,9 +40,7 @@
CFLAGS+=-fPIC
endif
@@ -356,7 +391,7 @@
Index: pbx/Makefile
--- pbx/Makefile.orig 2005-11-29 19:24:39 +0100
-+++ pbx/Makefile 2006-09-05 09:10:38 +0200
++++ pbx/Makefile 2006-09-05 22:20:22 +0200
@@ -14,9 +14,7 @@
PBX_LIBS=pbx_config.so pbx_spool.so pbx_dundi.so pbx_loopback.so
pbx_realtime.so \
pbx_ael.so
@@ -370,7 +405,7 @@
#PBX_LIBS+=$(shell $(CROSS_COMPILE_BIN)gtk-config --cflags >/dev/null
2>/dev/null && echo "pbx_gtkconsole.so")
Index: res/Makefile
--- res/Makefile.orig 2005-11-29 19:24:39 +0100
-+++ res/Makefile 2006-09-05 09:10:38 +0200
++++ res/Makefile 2006-09-05 22:20:22 +0200
@@ -36,10 +36,8 @@
endif
endif
@@ -384,21 +419,39 @@
ifeq (${OSARCH},CYGWIN)
CYGSOLINK=-Wl,[EMAIL PROTECTED] -Wl,--export-all-symbols
+Index: rtp.c
+--- rtp.c.orig 2006-07-13 20:44:17 +0200
++++ rtp.c 2006-09-05 22:20:22 +0200
+@@ -962,8 +962,10 @@
+ rtp->us.sin_port = htons(x);
+ rtp->us.sin_addr = addr;
+ /* If there's rtcp, initialize it as well. */
+- if (rtp->rtcp)
++ if (rtp->rtcp) {
+ rtp->rtcp->us.sin_port = htons(x + 1);
++ rtp->rtcp->us.sin_addr = addr;
++ }
+ /* Try to bind it/them. */
+ if (!(first = bind(rtp->s, (struct sockaddr *)&rtp->us,
sizeof(rtp->us))) &&
+ (!rtp->rtcp || !bind(rtp->rtcp->s, (struct sockaddr
*)&rtp->rtcp->us, sizeof(rtp->rtcp->us))))
Index: utils.c
--- utils.c.orig 2006-07-12 15:54:10 +0200
-+++ utils.c 2006-09-05 09:10:38 +0200
-@@ -58,7 +58,7 @@
++++ utils.c 2006-09-05 22:22:20 +0200
+@@ -58,7 +58,10 @@
static char base64[64];
static char b2a[256];
-#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined( __NetBSD__ )
|| defined(__APPLE__) || defined(__CYGWIN__)
-+#if defined(__OpenBSD__) || defined( __NetBSD__ ) || defined(__APPLE__) ||
defined(__CYGWIN__)
++#if defined(__FreeBSD__)
++#include <osreldate.h>
++#endif
++#if (defined(__FreeBSD__) && __FreeBSD_version < 601104) ||
defined(__OpenBSD__) || defined( __NetBSD__ ) || defined(__APPLE__) ||
defined(__CYGWIN__)
/* duh? ERANGE value copied from web... */
#define ERANGE 34
Index: utils/Makefile
--- utils/Makefile.orig 2005-11-29 19:24:39 +0100
-+++ utils/Makefile 2006-09-05 09:10:38 +0200
++++ utils/Makefile 2006-09-05 22:20:22 +0200
@@ -16,9 +16,7 @@
#
CFLAGS+=-DNO_AST_MM
@@ -410,53 +463,3 @@
TARGET=stereorize streamplayer
-Index: channels/chan_h323.c
---- channels/chan_h323.c.orig 2006-08-05 07:08:50 +0200
-+++ channels/chan_h323.c 2006-09-05 09:43:50 +0200
-@@ -31,6 +31,7 @@
- * \ingroup channel_drivers
- */
-
-+#include <sys/types.h>
- #include <sys/socket.h>
- #include <sys/signal.h>
- #include <sys/param.h>
-Index: channels/chan_skinny.c
---- channels/chan_skinny.c.orig 2006-08-05 07:08:50 +0200
-+++ channels/chan_skinny.c 2006-09-05 09:43:50 +0200
-@@ -99,7 +99,7 @@
- #define htolel(x) (x)
- #define htoles(x) (x)
- #else
--#if defined(SOLARIS) || defined(__Darwin__) || defined(__NetBSD__)
-+#if defined(SOLARIS) || defined(__Darwin__) || defined(__NetBSD__) ||
defined(__FreeBSD__)
- #define __bswap_16(x) \
- ((((x) & 0xff00) >> 8) | \
- (((x) & 0x00ff) << 8))
-Index: frame.c
---- frame.c.orig 2006-07-31 06:06:16 +0200
-+++ frame.c 2006-09-05 09:43:50 +0200
-@@ -1055,7 +1055,7 @@
- {
- switch(buf & TYPE_MASK) {
- case TYPE_DONTSEND:
-- return 0;
-+ return 2;
- break;
- case TYPE_SILENCE:
- return 4;
-Index: rtp.c
---- rtp.c.orig 2006-07-13 20:44:17 +0200
-+++ rtp.c 2006-09-05 09:43:50 +0200
-@@ -962,8 +962,10 @@
- rtp->us.sin_port = htons(x);
- rtp->us.sin_addr = addr;
- /* If there's rtcp, initialize it as well. */
-- if (rtp->rtcp)
-+ if (rtp->rtcp) {
- rtp->rtcp->us.sin_port = htons(x + 1);
-+ rtp->rtcp->us.sin_addr = addr;
-+ }
- /* Try to bind it/them. */
- if (!(first = bind(rtp->s, (struct sockaddr *)&rtp->us,
sizeof(rtp->us))) &&
- (!rtp->rtcp || !bind(rtp->rtcp->s, (struct sockaddr
*)&rtp->rtcp->us, sizeof(rtp->rtcp->us))))
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
