From f0d5f0b686f9333cf38c45faef60695ab76d9705 Mon Sep 17 00:00:00 2001 From: Rambaldi Date: Fri, 19 Dec 2008 17:20:25 +0000 Subject: net-misc/asterisk-res_js: source not longer available so removed svn path=/trunk/; revision=760 --- net-misc/asterisk-res_js/ChangeLog | 34 ----- net-misc/asterisk-res_js/Manifest | 32 ----- .../asterisk-res_js-20050617.ebuild | 69 ---------- .../asterisk-res_js-20060120.ebuild | 65 --------- .../files/res_js-20050617-astconfig.diff | 93 ------------- .../files/res_js-20050617-asterisk10.diff | 146 -------------------- .../files/res_js-20060120-gentoo.diff | 149 --------------------- 7 files changed, 588 deletions(-) delete mode 100644 net-misc/asterisk-res_js/ChangeLog delete mode 100644 net-misc/asterisk-res_js/Manifest delete mode 100644 net-misc/asterisk-res_js/asterisk-res_js-20050617.ebuild delete mode 100644 net-misc/asterisk-res_js/asterisk-res_js-20060120.ebuild delete mode 100644 net-misc/asterisk-res_js/files/res_js-20050617-astconfig.diff delete mode 100644 net-misc/asterisk-res_js/files/res_js-20050617-asterisk10.diff delete mode 100644 net-misc/asterisk-res_js/files/res_js-20060120-gentoo.diff (limited to 'net-misc') diff --git a/net-misc/asterisk-res_js/ChangeLog b/net-misc/asterisk-res_js/ChangeLog deleted file mode 100644 index bd73a5a..0000000 --- a/net-misc/asterisk-res_js/ChangeLog +++ /dev/null @@ -1,34 +0,0 @@ -2006-04-15 22:39 stkn - - * [r235] Manifest, asterisk-res_js-20060120.ebuild, - files/res_js-20060120-gentoo.diff: - Fix res_js-20060120 for asterisk-1.2.x. - -2006-03-06 02:31 stkn - - * [r177] Manifest, asterisk-res_js-20050617.ebuild, - asterisk-res_js-20060120.ebuild: - res_js: fix depdends and add some blockers - -2006-03-06 02:29 stkn - - * [r176] Manifest, asterisk-res_js-20050617.ebuild: - res_js-20050617 does not work with asterisk-1.2.x - -2006-03-06 02:01 stkn - - * [r175] Manifest, asterisk-res_js-20060120.ebuild: - Cleanup res_js-20060120 ebuild and make it depend on - >=asterisk-1.2.0 - -2006-03-06 01:01 stkn - - * [r171] ., Manifest, asterisk-res_js-20050617.ebuild, - asterisk-res_js-20060120.ebuild, files, - files/digest-asterisk-res_js-20050617, - files/digest-asterisk-res_js-20060120, - files/res_js-20050617-astconfig.diff, - files/res_js-20050617-asterisk10.diff, - files/res_js-20060120-gentoo.diff: - Add res_js (20050617, 20060120) - diff --git a/net-misc/asterisk-res_js/Manifest b/net-misc/asterisk-res_js/Manifest deleted file mode 100644 index 11e0a5d..0000000 --- a/net-misc/asterisk-res_js/Manifest +++ /dev/null @@ -1,32 +0,0 @@ -AUX res_js-20050617-astconfig.diff 3874 RMD160 82aed24d66452235168b692a0311bc9d472028c7 SHA1 c70fb8b95a7360fc1da098d54ee4a2bbd5babc7e SHA256 12b6200d46e2c6046c309820a023a674318c2638bb933e4b443c4fcc9904ad3e -MD5 1b2edc223562227db9ae51f17976c811 files/res_js-20050617-astconfig.diff 3874 -RMD160 82aed24d66452235168b692a0311bc9d472028c7 files/res_js-20050617-astconfig.diff 3874 -SHA256 12b6200d46e2c6046c309820a023a674318c2638bb933e4b443c4fcc9904ad3e files/res_js-20050617-astconfig.diff 3874 -AUX res_js-20050617-asterisk10.diff 3919 RMD160 03c077eddc028c32f64d4a2ce7ae08a4c698db76 SHA1 c35d9f6e6184b1f16e760cc8f409058a3bf706a7 SHA256 dc8ad832e4fe8638335bb9133357699a772568eb8807ea40b5ba90fd3739642d -MD5 b244a211b7cd9cfc94cdd2973534b20f files/res_js-20050617-asterisk10.diff 3919 -RMD160 03c077eddc028c32f64d4a2ce7ae08a4c698db76 files/res_js-20050617-asterisk10.diff 3919 -SHA256 dc8ad832e4fe8638335bb9133357699a772568eb8807ea40b5ba90fd3739642d files/res_js-20050617-asterisk10.diff 3919 -AUX res_js-20060120-gentoo.diff 5219 RMD160 2024e44519247e6dfeaa73768105e16393390e68 SHA1 6c59d41905c036019cebc8491671a1087ff19e5d SHA256 6db323d50930f97c1235362c4e81d3b852b6af05ae31b1c3004355a28da46b49 -MD5 1a9be2f2505ac912d26889e40b18eef3 files/res_js-20060120-gentoo.diff 5219 -RMD160 2024e44519247e6dfeaa73768105e16393390e68 files/res_js-20060120-gentoo.diff 5219 -SHA256 6db323d50930f97c1235362c4e81d3b852b6af05ae31b1c3004355a28da46b49 files/res_js-20060120-gentoo.diff 5219 -DIST asterisk-res_js-20050617.tgz 19037 -DIST asterisk-res_js-20060120.tgz 19037 RMD160 64a7b5e51eeac02b5b4b2cbaded4737a490ed666 SHA256 207a96914ea36fbba8bb68d0e60b726835250b874d9f0d8090c27b4525100116 -EBUILD asterisk-res_js-20050617.ebuild 1495 RMD160 d1dd2ee7e35ea4ec23486186483cca208b84718c SHA1 949ad77d5d5a652d2d9bafc91d4f492a53909015 SHA256 1a19f0593022b1768142977c6313a8a9af75704e2f8b9aa126d248c38119723f -MD5 4bb02b0a3ffd9a794e077dfd411630fd asterisk-res_js-20050617.ebuild 1495 -RMD160 d1dd2ee7e35ea4ec23486186483cca208b84718c asterisk-res_js-20050617.ebuild 1495 -SHA256 1a19f0593022b1768142977c6313a8a9af75704e2f8b9aa126d248c38119723f asterisk-res_js-20050617.ebuild 1495 -EBUILD asterisk-res_js-20060120.ebuild 1410 RMD160 7b084ab0b27abf2787c2926f9594946d5716f621 SHA1 8c20226d1d9c82f08aa20dd5545bb9acb1fbca4e SHA256 96e0230051d188b6b3318a377c1977fbfb1a6ff56b900785984c703fc44ae648 -MD5 7049523e05583653ef86481c0fd06347 asterisk-res_js-20060120.ebuild 1410 -RMD160 7b084ab0b27abf2787c2926f9594946d5716f621 asterisk-res_js-20060120.ebuild 1410 -SHA256 96e0230051d188b6b3318a377c1977fbfb1a6ff56b900785984c703fc44ae648 asterisk-res_js-20060120.ebuild 1410 -MISC ChangeLog 968 RMD160 ead574fcc8e0ea8ca2d7d7883e7aecedcfac7f76 SHA1 28f963ebc7e4438025111c6f8a36da775cf4bac1 SHA256 5b7ab84f0c309e2cce95a42434c13c09220b802057d787528cf011f966105063 -MD5 bfb8a81018aba2882234e120025b0e37 ChangeLog 968 -RMD160 ead574fcc8e0ea8ca2d7d7883e7aecedcfac7f76 ChangeLog 968 -SHA256 5b7ab84f0c309e2cce95a42434c13c09220b802057d787528cf011f966105063 ChangeLog 968 -MD5 564b629bc47b7e2bbf36e4aff6a46c76 files/digest-asterisk-res_js-20050617 72 -RMD160 09721b6c47bf6798533d7fa05a1b9cb71068438c files/digest-asterisk-res_js-20050617 72 -SHA256 0078082f11be5033766bcd193ef2c6466414fd12fcf0db267b550ee95bc4f069 files/digest-asterisk-res_js-20050617 72 -MD5 505adfda4ae248f01f5c545ac8e34d46 files/digest-asterisk-res_js-20060120 262 -RMD160 60162f9247416159902439b4a1e0628c6981b6d5 files/digest-asterisk-res_js-20060120 262 -SHA256 2825d7e4d6841d3c77388591517977aaffe2d2ca804c05bbaea135ce8bd66e55 files/digest-asterisk-res_js-20060120 262 diff --git a/net-misc/asterisk-res_js/asterisk-res_js-20050617.ebuild b/net-misc/asterisk-res_js/asterisk-res_js-20050617.ebuild deleted file mode 100644 index 2906c48..0000000 --- a/net-misc/asterisk-res_js/asterisk-res_js-20050617.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -inherit eutils - -MY_PN="res_js" - -DESCRIPTION="Asterisk ... JavaScript" -HOMEPAGE="http://www.pbxfreeware.org/" -SRC_URI="mirror://gentoo/asterisk-res_js-${PV}.tgz" - -IUSE="curl" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~x86" - -RDEPEND=">=dev-lang/spidermonkey-1.5-r1 - =net-misc/asterisk-1.2.0" - -DEPEND="${RDEPEND}" - -S=${WORKDIR}/${MY_PN} - -pkg_setup() { - einfo "Running pre-flight check..." - if ! built_with_use "dev-libs/spidermonkey" threadsafe; then - eerror "${PF} requires a version of dev-libs/spidermonkey" - eerror "that has been built with the \"threadsafe\" use-flag enabled" - eerror "Please remerge spidermonkey!" - die "Required conditions not met" - fi -} - -src_unpack() { - unpack ${A} - - cd ${S} - # use asterisk-config... - epatch ${FILESDIR}/${MY_PN}-${PV}-astconfig.diff - - # patch for 1.0 - has_version "=net-misc/asterisk-1.0*" && \ - epatch ${FILESDIR}/${MY_PN}-${PV}-asterisk10.diff -} - -src_compile() { - emake -j1 \ - || die "emake failed" -} - -src_install() { - make DESTDIR=${D} install || die - - dodoc README LICENSE test.js js.conf - - #fix permissions - if [[ -n "$(egetent group asterisk)" ]]; then - chown -R root:asterisk ${D}etc/asterisk - chmod -R u=rwX,g=rX,o= ${D}etc/asterisk - fi - if [[ -n "$(egetent passwd asterisk)" ]]; then - chown -R asterisk:asterisk ${D}var/lib/asterisk - chmod -R u=rwX,g=rX,o= ${D}var/lib/asterisk - fi -} - diff --git a/net-misc/asterisk-res_js/asterisk-res_js-20060120.ebuild b/net-misc/asterisk-res_js/asterisk-res_js-20060120.ebuild deleted file mode 100644 index 07c23df..0000000 --- a/net-misc/asterisk-res_js/asterisk-res_js-20060120.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -inherit eutils - -MY_PN="res_js" - -DESCRIPTION="Asterisk ... JavaScript" -HOMEPAGE="http://www.pbxfreeware.org/" -SRC_URI="http://www.netdomination.org/pub/asterisk/${P}.tgz - mirror://gentoo/${P}.tgz" - -IUSE="curl" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~x86" - -RDEPEND=">=dev-lang/spidermonkey-1.5-r1 - >=net-misc/asterisk-1.2.0 - !=net-misc/asterisk-1.0*" - -DEPEND="${RDEPEND}" - -S=${WORKDIR}/${MY_PN} - -pkg_setup() { - einfo "Running pre-flight check..." - if ! built_with_use "dev-libs/spidermonkey" threadsafe; then - eerror "${PF} requires a version of dev-libs/spidermonkey" - eerror "that has been built with the \"threadsafe\" use-flag enabled" - eerror "Please remerge spidermonkey!" - die "Required conditions not met" - fi -} - -src_unpack() { - unpack ${A} - - cd ${S} - # use asterisk-config... - epatch ${FILESDIR}/${MY_PN}-20060120-gentoo.diff -} - -src_compile() { - emake -j1 || die "make failed" -} - -src_install() { - make DESTDIR=${D} install || die - - dodoc README LICENSE test.js js.conf - - #fix permissions - if [[ -n "$(egetent group asterisk)" ]]; then - chown -R root:asterisk ${D}etc/asterisk - chmod -R u=rwX,g=rX,o= ${D}etc/asterisk - fi - if [[ -n "$(egetent passwd asterisk)" ]]; then - chown -R asterisk:asterisk ${D}var/lib/asterisk - chmod -R u=rwX,g=rX,o= ${D}var/lib/asterisk - fi -} - diff --git a/net-misc/asterisk-res_js/files/res_js-20050617-astconfig.diff b/net-misc/asterisk-res_js/files/res_js-20050617-astconfig.diff deleted file mode 100644 index b323bba..0000000 --- a/net-misc/asterisk-res_js/files/res_js-20050617-astconfig.diff +++ /dev/null @@ -1,93 +0,0 @@ ---- res_js/Makefile.orig 2005-06-30 01:18:36.000000000 +0200 -+++ res_js/Makefile 2005-06-30 01:47:56.000000000 +0200 -@@ -1,65 +1,38 @@ --JSCFLAGS=-I./mozilla/js/src -Wall -Wno-format -g -DXP_UNIX -DSVR4 -DSYSV -D_BSD_SOURCE -DPOSIX_SOURCE -DHAVE_LOCALTIME_R -DX86_LINUX -DDEBUG -DDEBUG_root -DJS_THREADSAFE -I./mozilla/js/src -I./mozilla/js/src/Linux_All_DBG.OBJ -Wall -Wno-format -g -DXP_UNIX -DSVR4 -DSYSV -D_BSD_SOURCE -DPOSIX_SOURCE -DHAVE_LOCALTIME_R -DX86_LINUX -DDEBUG -DDEBUG_root -DJS_THREADSAFE -I./mozilla/nsprpub/dist/include/nspr -ILinux_All_DBG.OBJ --JSLDFLAGS=-DXP_UNIX -DSVR4 -DSYSV -D_BSD_SOURCE -DPOSIX_SOURCE -DHAVE_LOCALTIME_R -DX86_LINUX -DDEBUG -DDEBUG_root -DJS_THREADSAFE -I./mozilla/nsprpub/dist/include/nspr -Wall -Wno-format -g -DXP_UNIX -DSVR4 -DSYSV -D_BSD_SOURCE -DPOSIX_SOURCE -DHAVE_LOCALTIME_R -DX86_LINUX -DDEBUG -DDEBUG_root -DJS_THREADSAFE -I./mozilla/nsprpub/dist/include/nspr --JSEXTOBJ= ./mozilla/js/src/Linux_All_DBG.OBJ/libjs.a ./mozilla/nsprpub/dist/lib/libnspr4.a --MOZCVS=cvs-mirror.mozilla.org --#MOZCVS=cvs-www.mozilla.org -+CC=gcc -+AST_CFG=/usr/bin/asterisk-config - -+ASTETCDIR=$(shell $(AST_CFG) --sysconfdir) -+ASTVARLIBDIR=$(shell $(AST_CFG) --varlibdir) -+ASTMODULESDIR=$(shell $(AST_CFG) --modulesdir) -+ -+CFLAGS+=-fPIC -DXP_UNIX -I/usr/include/nspr -I/usr/include/js -+JSEXTOBJ=/usr/lib/libjs.a /usr/lib/nspr/libnspr4.a - - CURLLIBS=$(shell curl-config --libs) - ifneq (${CURLLIBS},) -- JSCFLAGS += -DHAVE_CURL $(shell curl-config --cflags) -+ CFLAGS += -DHAVE_CURL $(shell curl-config --cflags) - JSEXTOBJ += $(CURLLIBS) - endif - -- --all: mozilla-dir nspr jsconfig js res_js.so -- --mozilla/nsprpub/dist/lib/libnspr4.a: -- cd mozilla/nsprpub && ./configure && make -- --mozilla/js/src/config/Linux_All.mk: -- mkdir -p mozilla/js/src/config -- cp -drp jsconfig mozilla/js/src/config/CVS -- cd mozilla/js/src/config && cvs update -- --mozilla/js/src/Linux_All_DBG.OBJ/libjs.a: -- cd mozilla/js/src && JS_THREADSAFE=1 OTHER_LIBS="-L../../../mozilla/nsprpub/dist/lib" INCLUDES="-I../../../mozilla/nsprpub/dist/include/nspr" make -f Makefile.ref Linux_All_DBG.OBJ/libjs.a -- --mozilla: -- cvs -d :pserver:anonymous@$(MOZCVS):/cvsroot co -D2005-02-15 mozilla/nsprpub mozilla/js/src -- --mozilla-dir: mozilla -- --jsconfig: mozilla/js/src/config/Linux_All.mk -- --js: mozilla/js/src/Linux_All_DBG.OBJ/libjs.a -- --nspr: mozilla/nsprpub/dist/lib/libnspr4.a -+all: res_js.so - - res_js.so: res_js.c -- ./astxs -append=CFLAGS:"$(JSCFLAGS)" -append=LDFLAGS:"$(JSLDFLAGS)" -append=EXTOBJ:"$(JSEXTOBJ)" res_js.c -- -- --/var/lib/asterisk/js/test.js: -- mkdir -p /var/lib/asterisk/js -- test -f /var/lib/asterisk/js/test.js || cp test.js /var/lib/asterisk/js -- test -f /etc/asterisk/js.conf || cp js.conf /etc/asterisk -+ $(CC) $(shell $(AST_CFG) --cflags) $(CFLAGS) -c -o res_js.o res_js.c -+ $(CC) $(shell $(AST_CFG) --solink) -o res_js.so res_js.o $(LIBS) $(JSEXTOBJ) - --test_js: /var/lib/asterisk/js/test.js -- --install: all test_js -- ./astxs -install res_js.so -- --autoload: all test_js -- ./astxs -install -autoload res_js.so -+install: -+ if [ ! -d $(DESTDIR)$(ASTETCDIR) ]; then \ -+ mkdir -p -m755 $(DESTDIR)$(ASTETCDIR); \ -+ fi; \ -+ cp js.conf $(DESTDIR)$(ASTETCDIR); \ -+ if [ ! -d $(DESTDIR)$(ASTMODULESDIR) ]; then \ -+ mkdir -p -m755 $(DESTDIR)$(ASTMODULESDIR); \ -+ fi; \ -+ cp res_js.so $(DESTDIR)$(ASTMODULESDIR); \ -+ if [ ! -d $(DESTDIR)$(ASTVARLIBDIR)/js ]; then \ -+ mkdir -p -m755 $(DESTDIR)$(ASTVARLIBDIR)/js; \ -+ fi; \ -+ cp test.js $(DESTDIR)$(ASTVARLIBDIR)/js - - clean: - rm -f *.o *.so *~ -- --megaclean: clean -- test -f mozilla && cd mozilla/js/src && make -f Makefile.ref clean || true -- rm -fr mozilla/js/src/Linux_All_DBG.OBJ -- test -f mozilla && cd mozilla/nsprpub && make distclean || true -- --distclean: megaclean -- rm -fr mozilla $(shell find . -name \*~) $(shell find . -name .\*~) $(shell find . -name \#\*) $(shell find . -name .\#\*) diff --git a/net-misc/asterisk-res_js/files/res_js-20050617-asterisk10.diff b/net-misc/asterisk-res_js/files/res_js-20050617-asterisk10.diff deleted file mode 100644 index 770f668..0000000 --- a/net-misc/asterisk-res_js/files/res_js-20050617-asterisk10.diff +++ /dev/null @@ -1,146 +0,0 @@ ---- res_js/res_js.c.orig 2005-06-20 18:09:43.000000000 +0200 -+++ res_js/res_js.c 2005-07-13 04:50:42.000000000 +0200 -@@ -23,6 +23,8 @@ - #include - #include - #include -+#include -+#include - #include - #include - #include -@@ -53,9 +55,8 @@ - #define EXITCODE_RUNTIME_ERROR 3 - #define EXITCODE_FILE_NOT_FOUND 4 - --#include "asterisk.h" - --ASTERISK_FILE_VERSION(__FILE__, "$Revision: 1.21 $") -+//ASTERISK_FILE_VERSION(__FILE__, "$Revision: 1.21 $") - - size_t gStackChunkSize = 8192; - -@@ -147,7 +148,7 @@ - memset(global_var_list, 0, MAX_LIST * MAX_LIST); - memset(global_func_list, 0, MAX_LIST * MAX_LIST); - -- if ((cfg = ast_config_load(global_config_file))) { -+ if ((cfg = ast_load(global_config_file))) { - for (v = ast_variable_browse(cfg, "general"); v ; v = v->next) { - if (!strcmp(v->name, "global_dir")) { - strncpy(global_dir, v->value, sizeof(global_dir)); -@@ -168,7 +169,7 @@ - strncpy(global_func_list[k++], v->value, MAX_LIST); - - } -- ast_config_destroy(cfg); -+ ast_destroy(cfg); - } else { - ast_log(LOG_WARNING, "Cannot open %s\n", global_config_file); - return -1; -@@ -484,7 +485,7 @@ - } - - -- -+#if 0 - static JSBool - chan_execfunc(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) - { -@@ -543,6 +544,7 @@ - ast_log(LOG_ERROR, "Invalid Arguements.\n"); - return JS_FALSE; - } -+#endif - - static JSBool - chan_hangup(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) -@@ -648,7 +650,9 @@ - {"StreamFile", chan_streamfile, 1}, - {"RecordFile", chan_recordfile, 1}, - {"Exec", chan_exec, 2}, -+#if 0 - {"ExecFunc", chan_execfunc, 2}, -+#endif - {"Hangup", chan_hangup, 0}, - {"Answer", chan_answer, 0}, - {"GetDigits", chan_getdigits, 2}, -@@ -679,6 +683,7 @@ - struct jchan *jc = JS_GetPrivate(cx, obj); - int param = 0; - JSBool res = JS_TRUE; -+ char * cidtmp = NULL; - - char *name = JS_GetStringBytes(JS_ValueToString(cx, id)); - /* numbers are our props anything else is a method */ -@@ -715,17 +720,18 @@ - *vp = INT_TO_JSVAL ( jc->priority ); - } - break; -- - case CHAN_CALLERID_NUM: -- if (!jc->cid_num) { -- jc->cid_num = jc->chan->cid.cid_num; -+ case CHAN_CALLERID_NAME: -+ if (!jc->cid_num && !jc->cid_name) { -+ cidtmp = JS_GetStringBytes(JS_NewStringCopyZ(cx, jc->chan->callerid)); -+ ast_callerid_parse(cidtmp, &jc->cid_name, &jc->cid_num); -+ } -+ -+ if (jc->cid_num && param == CHAN_CALLERID_NUM) { - *vp = STRING_TO_JSVAL ( JS_NewStringCopyZ(cx, jc->cid_num ) ); - } -- break; - -- case CHAN_CALLERID_NAME: -- if (!jc->cid_name) { -- jc->cid_name = jc->chan->cid.cid_name; -+ if (jc->cid_name && param == CHAN_CALLERID_NAME) { - *vp = STRING_TO_JSVAL ( JS_NewStringCopyZ(cx, jc->cid_name ) ); - } - break; -@@ -1265,28 +1271,6 @@ - return res; - } - --static char *function_js_read(struct ast_channel *chan, char *cmd, char *data, char *buf, size_t len) --{ -- char *ret; -- -- if (data && js_exec(chan, data) > -1 && (ret = pbx_builtin_getvar_helper(chan, "JSFUNC"))) { -- ast_copy_string(buf, ret, len); -- return buf; -- } -- return NULL; --} -- --static struct ast_custom_function js_function = { -- .name = "JS", -- .desc = "Executes JavaScript Code", -- .syntax = "JS()", -- .synopsis = "Executes a JavaScript function.", -- .desc = "If the script sets the channel variable JSFUNC\n" -- "that val will be returned to the dialplan." -- "", -- .read = function_js_read --}; -- - int reload(void) { - return process_config(); - } -@@ -1297,7 +1281,6 @@ - if (rt) - JS_DestroyRuntime(rt); - JS_ShutDown(); -- ast_custom_function_unregister(&js_function); - return ast_unregister_application(app); - } - -@@ -1314,7 +1297,6 @@ - return -1; - - process_config(); -- ast_custom_function_register(&js_function); - return ast_register_application(app, js_exec, synopsis, tdesc); - } - diff --git a/net-misc/asterisk-res_js/files/res_js-20060120-gentoo.diff b/net-misc/asterisk-res_js/files/res_js-20060120-gentoo.diff deleted file mode 100644 index 2bab455..0000000 --- a/net-misc/asterisk-res_js/files/res_js-20060120-gentoo.diff +++ /dev/null @@ -1,149 +0,0 @@ ---- res_js/res_js.c.orig 2006-03-05 23:57:01.000000000 +0100 -+++ res_js/res_js.c 2006-03-05 23:58:17.000000000 +0100 -@@ -11,6 +11,13 @@ - * the GNU General Public License - */ - -+#include -+#include -+#include -+#include -+#include -+#include -+#include - - #include - #include -@@ -23,14 +30,7 @@ - #include - #include - #include --#include --#include --#include - #include "jsstddef.h" --#include --#include --#include --#include - #include "jstypes.h" - #include "jsarena.h" - #include "jsutil.h" -@@ -47,13 +47,10 @@ - #include "jsparse.h" - #include "jsscope.h" - #include "jsscript.h" --#include --#include --#include - #define EXITCODE_RUNTIME_ERROR 3 - #define EXITCODE_FILE_NOT_FOUND 4 - --#include "asterisk.h" -+#include - - ASTERISK_FILE_VERSION(__FILE__, "$Revision: 1.21 $") - ---- res_js/Makefile.orig 2005-06-30 01:18:36.000000000 +0200 -+++ res_js/Makefile 2005-06-30 01:47:56.000000000 +0200 -@@ -1,65 +1,38 @@ --JSCFLAGS=-I./mozilla/js/src -Wall -Wno-format -g -DXP_UNIX -DSVR4 -DSYSV -D_BSD_SOURCE -DPOSIX_SOURCE -DHAVE_LOCALTIME_R -DX86_LINUX -DDEBUG -DDEBUG_root -DJS_THREADSAFE -I./mozilla/js/src -I./mozilla/js/src/Linux_All_DBG.OBJ -Wall -Wno-format -g -DXP_UNIX -DSVR4 -DSYSV -D_BSD_SOURCE -DPOSIX_SOURCE -DHAVE_LOCALTIME_R -DX86_LINUX -DDEBUG -DDEBUG_root -DJS_THREADSAFE -I./mozilla/nsprpub/dist/include/nspr -ILinux_All_DBG.OBJ --JSLDFLAGS=-DXP_UNIX -DSVR4 -DSYSV -D_BSD_SOURCE -DPOSIX_SOURCE -DHAVE_LOCALTIME_R -DX86_LINUX -DDEBUG -DDEBUG_root -DJS_THREADSAFE -I./mozilla/nsprpub/dist/include/nspr -Wall -Wno-format -g -DXP_UNIX -DSVR4 -DSYSV -D_BSD_SOURCE -DPOSIX_SOURCE -DHAVE_LOCALTIME_R -DX86_LINUX -DDEBUG -DDEBUG_root -DJS_THREADSAFE -I./mozilla/nsprpub/dist/include/nspr --JSEXTOBJ= ./mozilla/js/src/Linux_All_DBG.OBJ/libjs.a ./mozilla/nsprpub/dist/lib/libnspr4.a --MOZCVS=cvs-mirror.mozilla.org --#MOZCVS=cvs-www.mozilla.org -+CC=gcc -+AST_CFG=/usr/bin/asterisk-config - -+ASTETCDIR=$(shell $(AST_CFG) --sysconfdir) -+ASTVARLIBDIR=$(shell $(AST_CFG) --varlibdir) -+ASTMODULESDIR=$(shell $(AST_CFG) --modulesdir) -+ -+CFLAGS+=-fPIC -DXP_UNIX -I/usr/include/nspr -I/usr/include/js -+JSEXTOBJ=/usr/lib/libjs.a /usr/lib/nspr/libnspr4.a - - CURLLIBS=$(shell curl-config --libs) - ifneq (${CURLLIBS},) -- JSCFLAGS += -DHAVE_CURL $(shell curl-config --cflags) -+ CFLAGS += -DHAVE_CURL $(shell curl-config --cflags) - JSEXTOBJ += $(CURLLIBS) - endif - -- --all: mozilla-dir nspr jsconfig js res_js.so -- --mozilla/nsprpub/dist/lib/libnspr4.a: -- cd mozilla/nsprpub && ./configure && make -- --mozilla/js/src/config/Linux_All.mk: -- mkdir -p mozilla/js/src/config -- cp -drp jsconfig mozilla/js/src/config/CVS -- cd mozilla/js/src/config && cvs update -- --mozilla/js/src/Linux_All_DBG.OBJ/libjs.a: -- cd mozilla/js/src && JS_THREADSAFE=1 OTHER_LIBS="-L../../../mozilla/nsprpub/dist/lib" INCLUDES="-I../../../mozilla/nsprpub/dist/include/nspr" make -f Makefile.ref Linux_All_DBG.OBJ/libjs.a -- --mozilla: -- cvs -d :pserver:anonymous@$(MOZCVS):/cvsroot co -D2005-02-15 mozilla/nsprpub mozilla/js/src -- --mozilla-dir: mozilla -- --jsconfig: mozilla/js/src/config/Linux_All.mk -- --js: mozilla/js/src/Linux_All_DBG.OBJ/libjs.a -- --nspr: mozilla/nsprpub/dist/lib/libnspr4.a -+all: res_js.so - - res_js.so: res_js.c -- ./astxs -append=CFLAGS:"$(JSCFLAGS)" -append=LDFLAGS:"$(JSLDFLAGS)" -append=EXTOBJ:"$(JSEXTOBJ)" res_js.c -- -- --/var/lib/asterisk/js/test.js: -- mkdir -p /var/lib/asterisk/js -- test -f /var/lib/asterisk/js/test.js || cp test.js /var/lib/asterisk/js -- test -f /etc/asterisk/js.conf || cp js.conf /etc/asterisk -+ $(CC) $(shell $(AST_CFG) --cflags) $(CFLAGS) -c -o res_js.o res_js.c -+ $(CC) $(shell $(AST_CFG) --solink) -o res_js.so res_js.o $(LIBS) $(JSEXTOBJ) - --test_js: /var/lib/asterisk/js/test.js -- --install: all test_js -- ./astxs -install res_js.so -- --autoload: all test_js -- ./astxs -install -autoload res_js.so -+install: -+ if [ ! -d $(DESTDIR)$(ASTETCDIR) ]; then \ -+ mkdir -p -m755 $(DESTDIR)$(ASTETCDIR); \ -+ fi; \ -+ cp js.conf $(DESTDIR)$(ASTETCDIR); \ -+ if [ ! -d $(DESTDIR)$(ASTMODULESDIR) ]; then \ -+ mkdir -p -m755 $(DESTDIR)$(ASTMODULESDIR); \ -+ fi; \ -+ cp res_js.so $(DESTDIR)$(ASTMODULESDIR); \ -+ if [ ! -d $(DESTDIR)$(ASTVARLIBDIR)/js ]; then \ -+ mkdir -p -m755 $(DESTDIR)$(ASTVARLIBDIR)/js; \ -+ fi; \ -+ cp test.js $(DESTDIR)$(ASTVARLIBDIR)/js - - clean: - rm -f *.o *.so *~ -- --megaclean: clean -- test -f mozilla && cd mozilla/js/src && make -f Makefile.ref clean || true -- rm -fr mozilla/js/src/Linux_All_DBG.OBJ -- test -f mozilla && cd mozilla/nsprpub && make distclean || true -- --distclean: megaclean -- rm -fr mozilla $(shell find . -name \*~) $(shell find . -name .\*~) $(shell find . -name \#\*) $(shell find . -name .\#\*) ---- res_js/res_js.c.orig 2006-04-15 22:01:50.000000000 +0000 -+++ res_js/res_js.c 2006-04-15 22:02:19.000000000 +0000 -@@ -65,7 +65,6 @@ - JSBool gQuitting = JS_FALSE; - FILE *gErrFile = NULL; - FILE *gOutFile = NULL; --extern JSClass global_class; - - static - JSClass global_class = { -- cgit v1.2.3-65-gdbad