summaryrefslogtreecommitdiff
path: root/comms
diff options
context:
space:
mode:
Diffstat (limited to 'comms')
-rw-r--r--comms/asterisk/Makefile5
-rw-r--r--comms/asterisk/distinfo22
-rw-r--r--comms/asterisk/patches/patch-Makefile40
-rw-r--r--comms/asterisk/patches/patch-configure22
-rw-r--r--comms/asterisk/patches/patch-res_pjproject_aconfigure17
-rw-r--r--comms/asterisk/patches/patch-res_pjproject_aconfigure.ac20
6 files changed, 35 insertions, 91 deletions
diff --git a/comms/asterisk/Makefile b/comms/asterisk/Makefile
index 16e97a32886..ab71405aec6 100644
--- a/comms/asterisk/Makefile
+++ b/comms/asterisk/Makefile
@@ -1,13 +1,12 @@
-# $NetBSD: Makefile,v 1.87 2013/05/12 18:14:21 jnemeth Exp $
+# $NetBSD: Makefile,v 1.88 2013/05/18 03:40:17 jnemeth Exp $
#
# NOTE: when updating this package, there are two places that sound
# tarballs need to be checked
-DISTNAME= asterisk-11.3.0
+DISTNAME= asterisk-11.4.0
DIST_SUBDIR= ${PKGNAME_NOREV}
DISTFILES= ${DEFAULT_DISTFILES}
EXTRACT_ONLY= ${DISTNAME}.tar.gz
-PKGREVISION= 2
CATEGORIES= comms net audio
MASTER_SITES= http://downloads.asterisk.org/pub/telephony/asterisk/ \
http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/ \
diff --git a/comms/asterisk/distinfo b/comms/asterisk/distinfo
index 98779f6580a..babe48391c0 100644
--- a/comms/asterisk/distinfo
+++ b/comms/asterisk/distinfo
@@ -1,19 +1,19 @@
-$NetBSD: distinfo,v 1.55 2013/05/05 01:32:34 jnemeth Exp $
+$NetBSD: distinfo,v 1.56 2013/05/18 03:40:17 jnemeth Exp $
-SHA1 (asterisk-11.3.0/asterisk-11.3.0.tar.gz) = 75b822fd57c45a150b2c0d33e7746ebf6497e59d
-RMD160 (asterisk-11.3.0/asterisk-11.3.0.tar.gz) = b9376f8413f53713e83d0fc6d760cf196201ec9e
-Size (asterisk-11.3.0/asterisk-11.3.0.tar.gz) = 30629838 bytes
-SHA1 (asterisk-11.3.0/asterisk-extra-sounds-en-gsm-1.4.13.tar.gz) = 3aac6cf4a07cb2644b7b5369c618b07561619f9f
-RMD160 (asterisk-11.3.0/asterisk-extra-sounds-en-gsm-1.4.13.tar.gz) = 5dc9696c54d2233cf74835fe7ccd2c1791f20041
-Size (asterisk-11.3.0/asterisk-extra-sounds-en-gsm-1.4.13.tar.gz) = 4407925 bytes
-SHA1 (patch-Makefile) = cc52fad87c4007103e2b5b75acfd82935c112150
+SHA1 (asterisk-11.4.0/asterisk-11.4.0.tar.gz) = 8ec0d10834c87a2bff58f23d961c67f16a26d01a
+RMD160 (asterisk-11.4.0/asterisk-11.4.0.tar.gz) = 00f44e59e3c4258b52594787b30da6a81c662aa8
+Size (asterisk-11.4.0/asterisk-11.4.0.tar.gz) = 30651949 bytes
+SHA1 (asterisk-11.4.0/asterisk-extra-sounds-en-gsm-1.4.13.tar.gz) = 3aac6cf4a07cb2644b7b5369c618b07561619f9f
+RMD160 (asterisk-11.4.0/asterisk-extra-sounds-en-gsm-1.4.13.tar.gz) = 5dc9696c54d2233cf74835fe7ccd2c1791f20041
+Size (asterisk-11.4.0/asterisk-extra-sounds-en-gsm-1.4.13.tar.gz) = 4407925 bytes
+SHA1 (patch-Makefile) = ed581d46026e8e89ed8be374c7085efca19911d2
SHA1 (patch-apps_app__dial.c) = 0f78d2571af88384a2d472ece08bf4b06f9ad211
SHA1 (patch-apps_app__followme.c) = a54e08d0dd0b6ff12281d4b7b8447707c1cbe20a
SHA1 (patch-apps_app__queue.c) = 5bdb602a709060a1ffca688830930f1ca6bc5841
SHA1 (patch-apps_app__sms.c) = d89b27a9df04d4da98d562241c07d25d182baefc
SHA1 (patch-build__tools_mkpkgconfig) = 2bd3c0e24bc6d721cc234feb19b64a57106fcbe4
SHA1 (patch-channels_chan__oss.c) = fccfa6fca010294ed2d3ab87fc31f436d67f49fa
-SHA1 (patch-configure) = 494ff2f430be98522d65ede142819cd2dfebfef0
+SHA1 (patch-configure) = 55be28610dd62a4c4c5b3e41e3ff932eb0aa3d10
SHA1 (patch-configure.ac) = fa39e67fe998d0fe7dfb5fb3988f2be712b3b29f
SHA1 (patch-contrib_scripts_autosupport) = c6c1d917dd0544c4f54ae760f68cbcd1f35030f4
SHA1 (patch-contrib_scripts_vmail.cgi) = 650b9bbf3e322d1ad351932cfe6f747baa8f35e4
@@ -30,8 +30,8 @@ SHA1 (patch-main_netsock.c) = 015796266b9806425180c9bb05a1907116ef086d
SHA1 (patch-main_sched.c) = 73759369470b575e73ca78f9cff096ebb477c9b1
SHA1 (patch-main_utils.c) = e509c0ea81624b7404a535a3e8be563ce58039f6
SHA1 (patch-pbx_pbx__dundi.c) = 2823c48d64d2b96abb5cf627045d17282629521b
-SHA1 (patch-res_pjproject_aconfigure) = 1c26dc274c9ec1d6bec337e78e8d185d6cd89e51
-SHA1 (patch-res_pjproject_aconfigure.ac) = 97637740d14624a6b462593b0ec9f2c17a1f8081
+SHA1 (patch-res_pjproject_aconfigure) = 0095894c5daac2dec6a9ec745c0ecb8d46c0b73a
+SHA1 (patch-res_pjproject_aconfigure.ac) = cbabe4a5f1888e180c93404324ddb96728dc20b9
SHA1 (patch-res_pjproject_build.symbian_makedef.sh) = 37781fe307564ad827e9be67f507f84230ebf299
SHA1 (patch-sounds_Makefile) = 792c2e25e1c8334fe8c9038b8b630376a5894c31
SHA1 (patch-tests_test__locale.c) = e8419bed77d4787356adf8bc81893bea2adb48f4
diff --git a/comms/asterisk/patches/patch-Makefile b/comms/asterisk/patches/patch-Makefile
index 50a562c0152..70e5ce4802e 100644
--- a/comms/asterisk/patches/patch-Makefile
+++ b/comms/asterisk/patches/patch-Makefile
@@ -1,8 +1,8 @@
-$NetBSD: patch-Makefile,v 1.1 2012/12/11 08:22:48 jnemeth Exp $
+$NetBSD: patch-Makefile,v 1.2 2013/05/18 03:40:17 jnemeth Exp $
---- Makefile.orig 2012-09-18 15:47:01.000000000 +0000
+--- Makefile.orig 2013-02-04 19:50:52.000000000 +0000
+++ Makefile
-@@ -135,7 +135,7 @@ DEBUG=-g3
+@@ -130,7 +130,7 @@ DEBUG=-g3
# Asterisk.conf is located in ASTETCDIR or by using the -C flag
# when starting Asterisk
@@ -11,7 +11,7 @@ $NetBSD: patch-Makefile,v 1.1 2012/12/11 08:22:48 jnemeth Exp $
AGI_DIR=$(ASTDATADIR)/agi-bin
# If you use Apache, you may determine by a grep 'DocumentRoot' of your httpd.conf file
-@@ -202,10 +202,6 @@ ifeq ($(AST_DEVMODE),yes)
+@@ -197,10 +197,6 @@ ifeq ($(AST_DEVMODE),yes)
ADDL_TARGETS+=validate-docs
endif
@@ -22,7 +22,7 @@ $NetBSD: patch-Makefile,v 1.1 2012/12/11 08:22:48 jnemeth Exp $
ifeq ($(OSARCH),FreeBSD)
# -V is understood by BSD Make, not by GNU make.
BSDVERSION=$(shell make -V OSVERSION -f /usr/share/mk/bsd.port.subdir.mk)
-@@ -439,7 +435,6 @@ dist-clean: distclean
+@@ -427,7 +423,6 @@ dist-clean: distclean
distclean: $(SUBDIRS_DIST_CLEAN) _clean
@$(MAKE) -C menuselect dist-clean
@@ -30,16 +30,7 @@ $NetBSD: patch-Makefile,v 1.1 2012/12/11 08:22:48 jnemeth Exp $
rm -f menuselect.makeopts makeopts menuselect-tree menuselect.makedeps
rm -f makeopts.embed_rules
rm -f config.log config.status config.cache
-@@ -449,7 +444,7 @@ distclean: $(SUBDIRS_DIST_CLEAN) _clean
- rm -rf doc/api
- rm -f build_tools/menuselect-deps
-
--datafiles: _cleantest_all doc/core-en_US.xml
-+datafiles: doc/core-en_US.xml
- CFLAGS="$(_ASTCFLAGS) $(ASTCFLAGS)" build_tools/mkpkgconfig "$(DESTDIR)$(libdir)/pkgconfig";
- # Should static HTTP be installed during make samples or even with its own target ala
- # webvoicemail? There are portions here that *could* be customized but might also be
-@@ -537,7 +532,7 @@ update:
+@@ -525,7 +520,7 @@ update:
NEWHEADERS=$(notdir $(wildcard include/asterisk/*.h))
OLDHEADERS=$(filter-out $(NEWHEADERS) $(notdir $(DESTDIR)$(ASTHEADERDIR)),$(notdir $(wildcard $(DESTDIR)$(ASTHEADERDIR)/*.h)))
@@ -48,16 +39,7 @@ $NetBSD: patch-Makefile,v 1.1 2012/12/11 08:22:48 jnemeth Exp $
"$(ASTSPOOLDIR)" "$(ASTSPOOLDIR)/dictate" "$(ASTSPOOLDIR)/meetme" \
"$(ASTSPOOLDIR)/monitor" "$(ASTSPOOLDIR)/system" "$(ASTSPOOLDIR)/tmp" \
"$(ASTSPOOLDIR)/voicemail" "$(ASTHEADERDIR)" "$(ASTHEADERDIR)/doxygen" \
-@@ -558,7 +553,7 @@ installdirs:
- main-bininstall:
- +@DESTDIR="$(DESTDIR)" ASTSBINDIR="$(ASTSBINDIR)" ASTLIBDIR="$(ASTLIBDIR)" $(SUBMAKE) -C main bininstall
-
--bininstall: _cleantest_all installdirs $(SUBDIRS_INSTALL) main-bininstall
-+bininstall: installdirs $(SUBDIRS_INSTALL) main-bininstall
- $(INSTALL) -m 755 contrib/scripts/astgenkey "$(DESTDIR)$(ASTSBINDIR)/"
- $(INSTALL) -m 755 contrib/scripts/autosupport "$(DESTDIR)$(ASTSBINDIR)/"
- if [ ! -f "$(DESTDIR)$(ASTSBINDIR)/safe_asterisk" -a ! -f /sbin/launchd ]; then \
-@@ -648,21 +643,21 @@ upgrade: bininstall
+@@ -636,21 +631,21 @@ upgrade: bininstall
# XXX why *.adsi is installed first ?
adsi:
@echo Installing adsi config files...
@@ -83,7 +65,7 @@ $NetBSD: patch-Makefile,v 1.1 2012/12/11 08:22:48 jnemeth Exp $
if [ -f "$${dst}" ]; then \
if [ "$(OVERWRITE)" = "y" ]; then \
if cmp -s "$${dst}" "$$x" ; then \
-@@ -691,9 +686,9 @@ samples: adsi
+@@ -679,9 +674,9 @@ samples: adsi
-e 's|^astrundir.*$$|astrundir => $(ASTVARRUNDIR)|' \
-e 's|^astlogdir.*$$|astlogdir => $(ASTLOGDIR)|' \
-e 's|^astsbindir.*$$|astsbindir => $(ASTSBINDIR)|' \
@@ -96,7 +78,7 @@ $NetBSD: patch-Makefile,v 1.1 2012/12/11 08:22:48 jnemeth Exp $
fi ; \
$(INSTALL) -d "$(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX"
build_tools/make_sample_voicemail "$(DESTDIR)/$(ASTDATADIR)" "$(DESTDIR)/$(ASTSPOOLDIR)"
-@@ -719,7 +714,7 @@ samples: adsi
+@@ -707,7 +702,7 @@ samples: adsi
webvmail:
@[ -d "$(DESTDIR)$(HTTP_DOCSDIR)/" ] || ( printf "http docs directory not found.\nUpdate assignment of variable HTTP_DOCSDIR in Makefile!\n" && exit 1 )
@[ -d "$(DESTDIR)$(HTTP_CGIDIR)" ] || ( printf "cgi-bin directory not found.\nUpdate assignment of variable HTTP_CGIDIR in Makefile!\n" && exit 1 )
@@ -105,7 +87,7 @@ $NetBSD: patch-Makefile,v 1.1 2012/12/11 08:22:48 jnemeth Exp $
$(INSTALL) -d "$(DESTDIR)$(HTTP_DOCSDIR)/_asterisk"
for x in images/*.gif; do \
$(INSTALL) -m 644 $$x "$(DESTDIR)$(HTTP_DOCSDIR)/_asterisk/"; \
-@@ -875,7 +870,7 @@ uninstall-all: _uninstall
+@@ -863,7 +858,7 @@ uninstall-all: _uninstall
rm -rf "$(DESTDIR)$(ASTVARLIBDIR)"
rm -rf "$(DESTDIR)$(ASTDATADIR)"
rm -rf "$(DESTDIR)$(ASTSPOOLDIR)"
@@ -114,7 +96,7 @@ $NetBSD: patch-Makefile,v 1.1 2012/12/11 08:22:48 jnemeth Exp $
rm -rf "$(DESTDIR)$(ASTLOGDIR)"
menuconfig: menuselect
-@@ -946,6 +941,7 @@ menuselect-tree: $(foreach dir,$(filter-
+@@ -934,6 +929,7 @@ menuselect-tree: $(foreach dir,$(filter-
@echo "</menu>" >> $@
.PHONY: menuselect
diff --git a/comms/asterisk/patches/patch-configure b/comms/asterisk/patches/patch-configure
index 5bc29fc3893..1e276f32baf 100644
--- a/comms/asterisk/patches/patch-configure
+++ b/comms/asterisk/patches/patch-configure
@@ -1,8 +1,8 @@
-$NetBSD: patch-configure,v 1.2 2013/05/05 01:32:35 jnemeth Exp $
+$NetBSD: patch-configure,v 1.3 2013/05/18 03:40:17 jnemeth Exp $
---- configure.orig 2013-01-30 17:46:52.000000000 +0000
+--- configure.orig 2013-02-27 12:22:30.000000000 +0000
+++ configure
-@@ -16165,16 +16165,16 @@ if $(${CC} -march=native -S -o /dev/null
+@@ -16195,16 +16195,16 @@ if $(${CC} -march=native -S -o /dev/null
if test "${CONFIG_CFLAGS}" = ""; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
@@ -22,7 +22,7 @@ $NetBSD: patch-configure,v 1.2 2013/05/05 01:32:35 jnemeth Exp $
fi
-@@ -16699,6 +16699,148 @@ fi
+@@ -16729,6 +16729,148 @@ fi
@@ -171,7 +171,7 @@ $NetBSD: patch-configure,v 1.2 2013/05/05 01:32:35 jnemeth Exp $
# The cast to long int works around a bug in the HP C Compiler
# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-@@ -17840,6 +17982,8 @@ $as_echo_n "checking if \"struct ifaddrs
+@@ -17871,6 +18013,8 @@ $as_echo_n "checking if \"struct ifaddrs
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -180,15 +180,3 @@ $NetBSD: patch-configure,v 1.2 2013/05/05 01:32:35 jnemeth Exp $
#include <ifaddrs.h>
int
main ()
-@@ -29471,10 +29615,10 @@ if test "x$ac_cv_file__sbin_launchd" = x
-
- $as_echo "#define HAVE_SBIN_LAUNCHD 1" >>confdefs.h
-
--fi
-
- PBX_LAUNCHD=1
- fi
-+fi
-
-
-
diff --git a/comms/asterisk/patches/patch-res_pjproject_aconfigure b/comms/asterisk/patches/patch-res_pjproject_aconfigure
index a2305202476..70dc4d49c8c 100644
--- a/comms/asterisk/patches/patch-res_pjproject_aconfigure
+++ b/comms/asterisk/patches/patch-res_pjproject_aconfigure
@@ -1,19 +1,8 @@
-$NetBSD: patch-res_pjproject_aconfigure,v 1.1 2012/12/11 08:22:49 jnemeth Exp $
+$NetBSD: patch-res_pjproject_aconfigure,v 1.2 2013/05/18 03:40:17 jnemeth Exp $
---- res/pjproject/aconfigure.orig 2012-07-01 17:28:57.000000000 +0000
+--- res/pjproject/aconfigure.orig 2013-02-04 19:50:52.000000000 +0000
+++ res/pjproject/aconfigure
-@@ -3468,10 +3468,6 @@ ac_link='$CC -o conftest$ac_exeext $CFLA
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
--if test -z "$CROSS_COMPILE"; then
-- CROSS_COMPILE=`echo ${CC} | sed 's/gcc//'`
--fi
--
- if test "$AR" = ""; then AR="${CROSS_COMPILE}ar rv"; fi
-
- if test "$LD" = ""; then LD="$CC"; fi
-@@ -6152,7 +6148,7 @@ $as_echo_n "checking ffmpeg packages...
+@@ -6341,7 +6341,7 @@ $as_echo_n "checking ffmpeg packages...
av_pkg="$av_pkg libavcore"
fi
diff --git a/comms/asterisk/patches/patch-res_pjproject_aconfigure.ac b/comms/asterisk/patches/patch-res_pjproject_aconfigure.ac
index f47242746cd..f3a442dd703 100644
--- a/comms/asterisk/patches/patch-res_pjproject_aconfigure.ac
+++ b/comms/asterisk/patches/patch-res_pjproject_aconfigure.ac
@@ -1,22 +1,8 @@
-$NetBSD: patch-res_pjproject_aconfigure.ac,v 1.1 2012/12/11 08:22:49 jnemeth Exp $
+$NetBSD: patch-res_pjproject_aconfigure.ac,v 1.2 2013/05/18 03:40:17 jnemeth Exp $
---- res/pjproject/aconfigure.ac.orig 2012-07-01 17:28:57.000000000 +0000
+--- res/pjproject/aconfigure.ac.orig 2013-02-04 19:50:52.000000000 +0000
+++ res/pjproject/aconfigure.ac
-@@ -41,13 +41,6 @@ AC_PROG_CC
- AC_PROG_CXX
- AC_LANG_C
-
--dnl #
--dnl # Setup CROSS_COMPILE variable
--dnl #
--if test -z "$CROSS_COMPILE"; then
-- CROSS_COMPILE=`echo ${CC} | sed 's/gcc//'`
--fi
--
- if test "$AR" = ""; then AR="${CROSS_COMPILE}ar rv"; fi
- AC_SUBST(AR)
- if test "$LD" = ""; then LD="$CC"; fi
-@@ -913,7 +906,7 @@ AC_ARG_ENABLE(ffmpeg,
+@@ -907,7 +907,7 @@ AC_ARG_ENABLE(ffmpeg,
av_pkg="$av_pkg libavcore"
fi
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-07 20:39:48 +0000