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: 13-Oct-2006 22:56:31
Branch: HEAD Handle: 2006101321563000
Modified files:
openpkg-src/asterisk asterisk.patch asterisk.spec
Log:
port to Sun Solaris
Summary:
Revision Changes Path
1.19 +158 -39 openpkg-src/asterisk/asterisk.patch
1.22 +4 -2 openpkg-src/asterisk/asterisk.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/asterisk/asterisk.patch
============================================================================
$ cvs diff -u -r1.18 -r1.19 asterisk.patch
--- openpkg-src/asterisk/asterisk.patch 17 Sep 2006 18:03:33 -0000
1.18
+++ openpkg-src/asterisk/asterisk.patch 13 Oct 2006 20:56:30 -0000
1.19
@@ -1,6 +1,6 @@
Index: Makefile
--- Makefile.orig 2006-09-06 22:09:10 +0200
-+++ Makefile 2006-09-17 19:59:40 +0200
++++ Makefile 2006-10-13 22:45:33 +0200
@@ -47,14 +47,14 @@
#K6OPT = -DK6OPT
@@ -67,15 +67,20 @@
ASTCFLAGS=
-@@ -219,7 +203,6 @@
+@@ -218,21 +202,29 @@
+ ID=id
ifeq ($(OSARCH),SunOS)
- GREP=/usr/xpg4/bin/grep
+- GREP=/usr/xpg4/bin/grep
- M4=/usr/local/bin/m4
- ID=/usr/xpg4/bin/id
- LN=/usr/xpg4/bin/ln
- INSTALL=ginstall
-@@ -227,12 +210,21 @@
+- ID=/usr/xpg4/bin/id
+- LN=/usr/xpg4/bin/ln
+- INSTALL=ginstall
++ GREP=$(shell if [ -f /usr/xpg4/bin/grep ]; then echo /usr/xpg4/bin/grep;
else echo grep; fi)
++ ID=$(shell if [ -f /usr/xpg4/bin/id ]; then echo /usr/xpg4/bin/grep; else
echo id; fi)
++ LN=$(shell if [ -f /usr/xpg4/bin/ln ]; then echo /usr/xpg4/bin/grep; else
echo ln; fi)
++ INSTALL=$(INSTALL_PREFIX)/lib/openpkg/shtool install -c
+ endif
INCLUDE+=-Iinclude -I../include
ASTCFLAGS+=-pipe -Wall -Wstrict-prototypes -Wmissing-prototypes
-Wmissing-declarations $(DEBUG) $(INCLUDE) -D_REENTRANT -D_GNU_SOURCE
#-DMAKE_VALGRIND_HAPPY
@@ -152,9 +157,41 @@
SUBDIRS=res channels pbx apps codecs formats agi cdr funcs utils stdtime
OBJS=io.o sched.o logger.o frame.o loader.o config.o channel.o \
+@@ -702,31 +674,6 @@
+ fi
+
+ install: all datafiles bininstall install-subdirs
+- @if [ -x /usr/sbin/asterisk-post-install ]; then \
+- /usr/sbin/asterisk-post-install $(DESTDIR) . ; \
+- fi
+- @echo " +---- Asterisk Installation Complete -------+"
+- @echo " + +"
+- @echo " + YOU MUST READ THE SECURITY DOCUMENT +"
+- @echo " + +"
+- @echo " + Asterisk has successfully been installed. +"
+- @echo " + If you would like to install the sample +"
+- @echo " + configuration files (overwriting any +"
+- @echo " + existing config files), run: +"
+- @echo " + +"
+- @echo " + $(MAKE) samples +"
+- @echo " + +"
+- @echo " +----------------- or ---------------------+"
+- @echo " + +"
+- @echo " + You can go ahead and install the asterisk +"
+- @echo " + program documentation now or later run: +"
+- @echo " + +"
+- @echo " + $(MAKE) progdocs +"
+- @echo " + +"
+- @echo " + **Note** This requires that you have +"
+- @echo " + doxygen installed on your local system +"
+- @echo " +-------------------------------------------+"
+- @$(MAKE) -s oldmodcheck
+
+ upgrade: all bininstall
+
Index: agi/Makefile
--- agi/Makefile.orig 2006-03-28 22:22:05 +0200
-+++ agi/Makefile 2006-09-17 19:59:20 +0200
++++ agi/Makefile 2006-10-13 22:45:33 +0200
@@ -20,9 +20,7 @@
LIBS=-lsocket -lnsl ../strcompat.o
endif
@@ -168,7 +205,7 @@
Index: app_conference/Makefile
--- app_conference/Makefile.orig 2005-10-27 19:53:35 +0200
-+++ app_conference/Makefile 2006-09-17 19:59:20 +0200
++++ app_conference/Makefile 2006-10-13 22:45:33 +0200
@@ -20,10 +20,10 @@
INSTALL_PREFIX := /opt/horizon
INSTALL_MODULES_DIR := $(INSTALL_PREFIX)/lib/asterisk/modules
@@ -210,7 +247,17 @@
# adding -msse -mfpmath=sse has little effect.
-@@ -77,8 +78,9 @@
+@@ -72,13 +73,19 @@
+ CFLAGS += -DAPP_CONFERENCE_DEBUG
+ endif
+
++OSARCH=$(shell uname -s)
++ifeq ($(OSARCH),SunOS)
++ CFLAGS+=-DSOLARIS -I$(ASTERISK_INCLUDE_DIR)/solaris-compat
++endif
++
+ #
+ # additional flag values for silence detection
#
ifeq ($(SILDET), 2)
@@ -222,7 +269,7 @@
endif
ifeq ($(SILDET), 1)
-@@ -102,14 +104,13 @@
+@@ -102,14 +109,13 @@
rm -f *.so *.o $(OBJS)
app_conference.so : $(OBJS)
@@ -240,7 +287,7 @@
# cp conf.conf /etc/asterisk/
Index: app_conference/app_conference.h
--- app_conference/app_conference.h.orig 2005-12-16 23:31:58 +0100
-+++ app_conference/app_conference.h 2006-09-17 19:59:20 +0200
++++ app_conference/app_conference.h 2006-10-13 22:45:33 +0200
@@ -33,6 +33,7 @@
#include <asterisk/channel.h>
#include <asterisk/file.h>
@@ -264,7 +311,7 @@
//
Index: app_conference/conference.c
--- app_conference/conference.c.orig 2005-10-27 19:53:35 +0200
-+++ app_conference/conference.c 2006-09-17 19:59:20 +0200
++++ app_conference/conference.c 2006-10-13 22:45:33 +0200
@@ -568,7 +568,6 @@
conf->memberlist = NULL ;
@@ -293,7 +340,7 @@
Index: apps/Makefile
--- apps/Makefile.orig 2006-04-30 15:38:22 +0200
-+++ apps/Makefile 2006-09-17 19:59:20 +0200
++++ apps/Makefile 2006-10-13 22:45:33 +0200
@@ -54,16 +54,11 @@
APPS+=app_osplookup.so
endif
@@ -317,7 +364,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-17 19:59:20 +0200
++++ asterisk-addons-1.2.4/Makefile 2006-10-13 22:45:33 +0200
@@ -27,17 +27,9 @@
#
# MySQL stuff... Autoconf anyone??
@@ -339,9 +386,66 @@
OSARCH=$(shell uname -s)
+Index: asterisk-sounds-1.2.1/Makefile
+--- asterisk-sounds-1.2.1/Makefile.orig 2005-12-02 00:20:51 +0100
++++ asterisk-sounds-1.2.1/Makefile 2006-10-13 22:45:55 +0200
+@@ -66,7 +66,7 @@
+ mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/ha
+ for x in sounds/letters/*.gsm; do \
+ if grep -q "^%`basename $$x`%" sounds-extra.txt; then \
+- install -m 644 $$x
$(DESTDIR)$(ASTVARLIBDIR)/sounds/letters ; \
++ $(INSTALL) -m 644 $$x
$(DESTDIR)$(ASTVARLIBDIR)/sounds/letters ; \
+ else \
+ echo "No description for $$x"; \
+ exit 1; \
+@@ -74,7 +74,7 @@
+ done
+ for x in sounds/phonetic/*.gsm; do \
+ if grep -q "^%`basename $$x`%" sounds-extra.txt; then \
+- install -m 644 $$x
$(DESTDIR)$(ASTVARLIBDIR)/sounds/phonetic ; \
++ $(INSTALL) -m 644 $$x
$(DESTDIR)$(ASTVARLIBDIR)/sounds/phonetic ; \
+ else \
+ echo "No description for $$x"; \
+ exit 1; \
+@@ -82,7 +82,7 @@
+ done
+ for x in sounds/silence/*.gsm; do \
+ if grep -q "^%`basename $$x`%" sounds-extra.txt; then \
+- install -m 644 $$x
$(DESTDIR)$(ASTVARLIBDIR)/sounds/silence ; \
++ $(INSTALL) -m 644 $$x
$(DESTDIR)$(ASTVARLIBDIR)/sounds/silence ; \
+ else \
+ echo "No description for $$x"; \
+ exit 1; \
+@@ -90,7 +90,7 @@
+ done
+ for x in sounds/wx/*.gsm; do \
+ if grep -q "^%`basename $$x`%" sounds-extra.txt; then \
+- install -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/wx
; \
++ $(INSTALL) -m 644 $$x
$(DESTDIR)$(ASTVARLIBDIR)/sounds/wx ; \
+ else \
+ echo "No description for $$x"; \
+ exit 1; \
+@@ -98,7 +98,7 @@
+ done
+ for x in sounds/ha/*.gsm; do \
+ if grep -q "^%`basename $$x`%" sounds-extra.txt; then \
+- install -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/ha
; \
++ $(INSTALL) -m 644 $$x
$(DESTDIR)$(ASTVARLIBDIR)/sounds/ha ; \
+ else \
+ echo "No description for $$x"; \
+ exit 1; \
+@@ -106,7 +106,7 @@
+ done
+ for x in sounds/*.gsm; do \
+ if grep -q "^%`basename $$x`%" sounds-extra.txt; then \
+- install -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds ; \
++ $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds
; \
+ else \
+ echo "No description for $$x"; \
+ exit 1; \
Index: asterisk.c
--- asterisk.c.orig 2006-08-22 00:34:26 +0200
-+++ asterisk.c 2006-09-17 19:59:20 +0200
++++ asterisk.c 2006-10-13 22:45:33 +0200
@@ -1902,9 +1902,9 @@
} else if (!strcasecmp(v->name, "astspooldir")) {
ast_copy_string(ast_config_AST_SPOOL_DIR, v->value,
sizeof(ast_config_AST_SPOOL_DIR));
@@ -353,9 +457,24 @@
snprintf(ast_config_AST_KEY_DIR,
sizeof(ast_config_AST_KEY_DIR), "%s/keys", v->value);
} else if (!strcasecmp(v->name, "astlogdir")) {
ast_copy_string(ast_config_AST_LOG_DIR, v->value,
sizeof(ast_config_AST_LOG_DIR));
+Index: build_tools/make_build_h
+--- build_tools/make_build_h.orig 2006-03-03 18:13:37 +0100
++++ build_tools/make_build_h 2006-10-13 22:45:33 +0200
+@@ -4,7 +4,11 @@
+ MACHINE=`uname -m`
+ OS=`uname -s`
+ if [ `uname -s` = "SunOS" ]; then
++ if [ -f /usr/xpg4/bin/id ]; then
+ USER=`/usr/xpg4/bin/id -un`
++ else
++ USER=`/usr/bin/id -un`
++ fi
+ else
+ USER=`id -un`
+ fi
Index: build_tools/make_defaults_h
--- build_tools/make_defaults_h.orig 2005-06-20 19:26:08 +0200
-+++ build_tools/make_defaults_h 2006-09-17 19:59:20 +0200
++++ build_tools/make_defaults_h 2006-10-13 22:45:33 +0200
@@ -14,7 +14,7 @@
#define AST_LOG_DIR "${INSTALL_PATH}${ASTLOGDIR}"
#define AST_AGI_DIR "${INSTALL_PATH}${AGI_DIR}"
@@ -367,7 +486,7 @@
#define AST_CONFIG_FILE "${INSTALL_PATH}${ASTCONFPATH}"
Index: cdr/Makefile
--- cdr/Makefile.orig 2006-04-30 16:27:56 +0200
-+++ cdr/Makefile 2006-09-17 19:59:20 +0200
++++ cdr/Makefile 2006-10-13 22:45:33 +0200
@@ -20,10 +20,8 @@
CFLAGS+=-fPIC
endif
@@ -383,7 +502,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-17 19:59:20 +0200
++++ channels/Makefile 2006-10-13 22:45:33 +0200
@@ -21,9 +21,7 @@
#CHANNEL_LIBS+=chan_modem.so chan_modem_aopen.so chan_modem_bestdata.so
endif
@@ -397,7 +516,7 @@
PTLIB=-lpt_OpenBSD_x86_r
Index: channels/chan_h323.c
--- channels/chan_h323.c.orig 2006-08-30 20:59:44 +0200
-+++ channels/chan_h323.c 2006-09-17 19:59:20 +0200
++++ channels/chan_h323.c 2006-10-13 22:45:33 +0200
@@ -31,6 +31,7 @@
* \ingroup channel_drivers
*/
@@ -408,7 +527,7 @@
#include <sys/param.h>
Index: channels/chan_iax2.c
--- channels/chan_iax2.c.orig 2006-09-06 17:55:20 +0200
-+++ channels/chan_iax2.c 2006-09-17 19:59:20 +0200
++++ channels/chan_iax2.c 2006-10-13 22:45:33 +0200
@@ -2606,7 +2606,7 @@
struct ast_variable *var;
struct ast_variable *tmp;
@@ -433,7 +552,7 @@
} else if (!strcasecmp(tmp->name, "port")) {
Index: channels/chan_sip.c
--- channels/chan_sip.c.orig 2006-09-09 14:14:03 +0200
-+++ channels/chan_sip.c 2006-09-17 19:59:20 +0200
++++ channels/chan_sip.c 2006-10-13 22:45:33 +0200
@@ -12250,7 +12250,7 @@
int obproxyfound=0;
int found=0;
@@ -458,7 +577,7 @@
} else if (realtime && !strcasecmp(v->name, "name"))
Index: channels/chan_skinny.c
--- channels/chan_skinny.c.orig 2006-08-30 20:59:44 +0200
-+++ channels/chan_skinny.c 2006-09-17 19:59:20 +0200
++++ channels/chan_skinny.c 2006-10-13 22:45:33 +0200
@@ -99,7 +99,7 @@
#define htolel(x) (x)
#define htoles(x) (x)
@@ -470,7 +589,7 @@
(((x) & 0x00ff) << 8))
Index: codecs/Makefile
--- codecs/Makefile.orig 2005-11-29 19:24:39 +0100
-+++ codecs/Makefile 2006-09-17 19:59:20 +0200
++++ codecs/Makefile 2006-10-13 22:45:33 +0200
@@ -28,45 +28,16 @@
LIBG723B=g723.1b/libg723b.a
endif
@@ -523,7 +642,7 @@
codec_adpcm.so codec_ulaw.so codec_alaw.so codec_a_mu.so \
Index: codecs/gsm/src/short_term.c
--- codecs/gsm/src/short_term.c.orig 2005-11-29 19:24:39 +0100
-+++ codecs/gsm/src/short_term.c 2006-09-17 19:59:20 +0200
++++ codecs/gsm/src/short_term.c 2006-10-13 22:45:33 +0200
@@ -373,7 +373,6 @@
word * LARpp_j_1 = S->LARpp[ S->j ^= 1 ];
@@ -534,7 +653,7 @@
# define FILTER (* (S->fast \
Index: codecs/lpc10/analys.c
--- codecs/lpc10/analys.c.orig 2005-11-29 19:24:39 +0100
-+++ codecs/lpc10/analys.c 2006-09-17 19:59:20 +0200
++++ codecs/lpc10/analys.c 2006-10-13 22:45:33 +0200
@@ -32,7 +32,7 @@
#include "f2c.h"
@@ -546,7 +665,7 @@
/*:ref: preemp_ 14 5 6 6 4 6 6 */
Index: dns.c
--- dns.c.orig 2005-11-29 19:24:39 +0100
-+++ dns.c 2006-09-17 19:59:20 +0200
++++ dns.c 2006-10-13 22:45:33 +0200
@@ -194,9 +194,7 @@
int res, ret = -1;
@@ -559,7 +678,7 @@
#else
Index: formats/Makefile
--- formats/Makefile.orig 2005-11-29 19:24:39 +0100
-+++ formats/Makefile 2006-09-17 19:59:20 +0200
++++ formats/Makefile 2006-10-13 22:45:33 +0200
@@ -29,9 +29,7 @@
FORMAT_LIBS+=format_ogg_vorbis.so
endif
@@ -573,7 +692,7 @@
Index: formats/msgsm.h
--- formats/msgsm.h.orig 2005-11-29 19:24:39 +0100
-+++ formats/msgsm.h 2006-09-17 19:59:20 +0200
++++ formats/msgsm.h 2006-10-13 22:45:33 +0200
@@ -562,6 +562,7 @@
xmc[46] = sr & 0x7; sr >>= 3;
xmc[47] = sr & 0x7; sr >>= 3;
@@ -584,7 +703,7 @@
xmc[50] = sr & 0x7; sr >>= 3;
Index: frame.c
--- frame.c.orig 2006-07-31 06:06:16 +0200
-+++ frame.c 2006-09-17 19:59:20 +0200
++++ frame.c 2006-10-13 22:45:33 +0200
@@ -1055,7 +1055,7 @@
{
switch(buf & TYPE_MASK) {
@@ -596,7 +715,7 @@
return 4;
Index: funcs/Makefile
--- funcs/Makefile.orig 2005-11-29 19:24:39 +0100
-+++ funcs/Makefile 2006-09-17 19:59:20 +0200
++++ funcs/Makefile 2006-10-13 22:45:33 +0200
@@ -40,9 +40,7 @@
CFLAGS+=-fPIC
endif
@@ -610,7 +729,7 @@
Index: funcs/func_strings.c
--- funcs/func_strings.c.orig 2006-03-21 18:45:56 +0100
-+++ funcs/func_strings.c 2006-09-17 19:59:20 +0200
++++ funcs/func_strings.c 2006-10-13 22:45:33 +0200
@@ -169,7 +169,7 @@
epochi = tv.tv_sec;
}
@@ -622,7 +741,7 @@
format = "%c";
Index: pbx/Makefile
--- pbx/Makefile.orig 2005-11-29 19:24:39 +0100
-+++ pbx/Makefile 2006-09-17 19:59:20 +0200
++++ pbx/Makefile 2006-10-13 22:45:33 +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
@@ -636,7 +755,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-17 19:59:20 +0200
++++ res/Makefile 2006-10-13 22:45:33 +0200
@@ -36,10 +36,8 @@
endif
endif
@@ -652,7 +771,7 @@
CYGSOLINK=-Wl,[EMAIL PROTECTED] -Wl,--export-all-symbols
Index: res/res_features.c
--- res/res_features.c.orig 2006-08-02 01:07:06 +0200
-+++ res/res_features.c 2006-09-17 19:59:20 +0200
++++ res/res_features.c 2006-10-13 22:45:33 +0200
@@ -505,13 +505,13 @@
if (touch_monitor) {
len = strlen(touch_monitor) + 50;
@@ -671,7 +790,7 @@
for( x = 0; x < strlen(args); x++)
Index: rtp.c
--- rtp.c.orig 2006-09-01 19:35:06 +0200
-+++ rtp.c 2006-09-17 19:59:20 +0200
++++ rtp.c 2006-10-13 22:45:33 +0200
@@ -962,8 +962,10 @@
rtp->us.sin_port = htons(x);
rtp->us.sin_addr = addr;
@@ -686,7 +805,7 @@
(!rtp->rtcp || !bind(rtp->rtcp->s, (struct sockaddr
*)&rtp->rtcp->us, sizeof(rtp->rtcp->us))))
Index: say.c
--- say.c.orig 2005-11-29 19:24:39 +0100
-+++ say.c 2006-09-17 19:59:20 +0200
++++ say.c 2006-10-13 22:45:33 +0200
@@ -3133,7 +3133,7 @@
time_t beg_today;
@@ -878,7 +997,7 @@
beg_today = now.tv_sec - (tmnow.tm_hour * 3600)
- (tmnow.tm_min * 60) - (tmnow.tm_sec);
Index: utils.c
--- utils.c.orig 2006-07-12 15:54:10 +0200
-+++ utils.c 2006-09-17 19:59:20 +0200
++++ utils.c 2006-10-13 22:45:33 +0200
@@ -63,6 +63,8 @@
/* duh? ERANGE value copied from web... */
#define ERANGE 34
@@ -890,7 +1009,7 @@
Index: utils/Makefile
--- utils/Makefile.orig 2005-11-29 19:24:39 +0100
-+++ utils/Makefile 2006-09-17 19:59:20 +0200
++++ utils/Makefile 2006-10-13 22:45:33 +0200
@@ -16,17 +16,15 @@
#
CFLAGS+=-DNO_AST_MM
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/asterisk/asterisk.spec
============================================================================
$ cvs diff -u -r1.21 -r1.22 asterisk.spec
--- openpkg-src/asterisk/asterisk.spec 13 Oct 2006 17:26:53 -0000
1.21
+++ openpkg-src/asterisk/asterisk.spec 13 Oct 2006 20:56:30 -0000
1.22
@@ -170,7 +170,8 @@
( cd asterisk-sounds-%{V_asterisk_sounds}
%{l_make} %{l_mflags} install \
DESTDIR=$RPM_BUILD_ROOT \
- ASTVARLIBDIR=%{l_prefix}/share/asterisk
+ ASTVARLIBDIR=%{l_prefix}/share/asterisk \
+ INSTALL="%{l_shtool} install -c"
) || exit $?
%{l_shtool} install -c -m 644 %{l_value -s -a} \
sounds/*.mp3 $RPM_BUILD_ROOT%{l_prefix}/share/asterisk/mohmp3/
@@ -178,7 +179,8 @@
# install addon modules
( cd app_conference
%{l_make} %{l_mflags} install \
- INSTALL_PREFIX=$RPM_BUILD_ROOT%{l_prefix}
+ INSTALL_PREFIX=$RPM_BUILD_ROOT%{l_prefix} \
+ INSTALL="%{l_shtool} install -c"
) || exit $?
# install Perl API
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
