e3ee72fead
The Asterisk Development Team has announced the release of Asterisk 10.9.0.
The release of Asterisk 10.9.0 resolves several issues reported by the
community and would have not been possible without your participation.
Thank you!
The following is a sample of the issues resolved in this release:
* --- Fix channel reference leak in ChanSpy.
* --- dsp.c: Fix multiple issues when no-interdigit delay is present,
and fast DTMF 50ms/50ms
* --- Fix bug where final queue member would not be removed from
memory.
* --- Fix memory leak when CEL is successfully written to PostgreSQL
database
* --- Fix DUNDi message routing bug when neighboring peer is
unreachable
For a full list of changes in this release, please see the ChangeLog:
http://downloads.asterisk.org/pub/telephony/asterisk/ChangeLog-10.9.0
Thank you for your continued support of Asterisk!
124 lines
5.3 KiB
Text
124 lines
5.3 KiB
Text
$NetBSD: patch-Makefile,v 1.4 2012/10/09 01:36:32 jnemeth Exp $
|
|
|
|
--- Makefile.orig 2012-09-11 17:14:06.000000000 +0000
|
|
+++ Makefile
|
|
@@ -127,7 +127,7 @@ DEBUG=-g3
|
|
|
|
# Asterisk.conf is located in ASTETCDIR or by using the -C flag
|
|
# when starting Asterisk
|
|
-ASTCONFPATH=$(ASTETCDIR)/asterisk.conf
|
|
+ASTCONFPATH=$(ASTEXAMPLEDIR)/asterisk.conf
|
|
MODULES_DIR=$(ASTLIBDIR)/modules
|
|
AGI_DIR=$(ASTDATADIR)/agi-bin
|
|
|
|
@@ -186,10 +186,6 @@ ifeq ($(AST_DEVMODE),yes)
|
|
ADDL_TARGETS+=validate-docs
|
|
endif
|
|
|
|
-ifneq ($(findstring BSD,$(OSARCH)),)
|
|
- _ASTCFLAGS+=-isystem /usr/local/include
|
|
-endif
|
|
-
|
|
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)
|
|
@@ -399,7 +395,6 @@ dist-clean: distclean
|
|
|
|
distclean: $(SUBDIRS_DIST_CLEAN) _clean
|
|
@$(MAKE) -C menuselect dist-clean
|
|
- @$(MAKE) -C sounds dist-clean
|
|
rm -f menuselect.makeopts makeopts menuselect-tree menuselect.makedeps
|
|
rm -f makeopts.embed_rules
|
|
rm -f config.log config.status config.cache
|
|
@@ -409,7 +404,7 @@ distclean: $(SUBDIRS_DIST_CLEAN) _clean
|
|
rm -rf doc/api
|
|
rm -f build_tools/menuselect-deps
|
|
|
|
-datafiles: _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
|
|
@@ -476,7 +471,7 @@ update:
|
|
|
|
NEWHEADERS=$(notdir $(wildcard include/asterisk/*.h))
|
|
OLDHEADERS=$(filter-out $(NEWHEADERS) $(notdir $(DESTDIR)$(ASTHEADERDIR)),$(notdir $(wildcard $(DESTDIR)$(ASTHEADERDIR)/*.h)))
|
|
-INSTALLDIRS="$(ASTLIBDIR)" "$(MODULES_DIR)" "$(ASTSBINDIR)" "$(ASTETCDIR)" "$(ASTVARRUNDIR)" \
|
|
+INSTALLDIRS="$(ASTLIBDIR)" "$(MODULES_DIR)" "$(ASTSBINDIR)" "$(ASTEXAMPLEDIR)" "$(ASTVARRUNDIR)" \
|
|
"$(ASTSPOOLDIR)" "$(ASTSPOOLDIR)/dictate" "$(ASTSPOOLDIR)/meetme" \
|
|
"$(ASTSPOOLDIR)/monitor" "$(ASTSPOOLDIR)/system" "$(ASTSPOOLDIR)/tmp" \
|
|
"$(ASTSPOOLDIR)/voicemail" "$(ASTHEADERDIR)" "$(ASTHEADERDIR)/doxygen" \
|
|
@@ -494,7 +489,7 @@ installdirs:
|
|
fi; \
|
|
done
|
|
|
|
-bininstall: _all installdirs $(SUBDIRS_INSTALL)
|
|
+bininstall: installdirs $(SUBDIRS_INSTALL)
|
|
$(INSTALL) -m 755 main/asterisk "$(DESTDIR)$(ASTSBINDIR)/"
|
|
$(LN) -sf asterisk "$(DESTDIR)$(ASTSBINDIR)/rasterisk"
|
|
$(INSTALL) -m 755 contrib/scripts/astgenkey "$(DESTDIR)$(ASTSBINDIR)/"
|
|
@@ -586,21 +581,21 @@ upgrade: bininstall
|
|
# XXX why *.adsi is installed first ?
|
|
adsi:
|
|
@echo Installing adsi config files...
|
|
- $(INSTALL) -d "$(DESTDIR)$(ASTETCDIR)"
|
|
+ $(INSTALL) -d "$(DESTDIR)$(ASTEXAMPLEDIR)"
|
|
@for x in configs/*.adsi; do \
|
|
- dst="$(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x`" ; \
|
|
+ dst="$(DESTDIR)$(ASTEXAMPLEDIR)/`$(BASENAME) $$x`" ; \
|
|
if [ -f "$${dst}" ] ; then \
|
|
echo "Overwriting $$x" ; \
|
|
else \
|
|
echo "Installing $$x" ; \
|
|
fi ; \
|
|
- $(INSTALL) -m 644 "$$x" "$(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x`" ; \
|
|
+ $(INSTALL) -m 644 "$$x" "$(DESTDIR)$(ASTEXAMPLEDIR)/`$(BASENAME) $$x`" ; \
|
|
done
|
|
|
|
samples: adsi
|
|
@echo Installing other config files...
|
|
@for x in configs/*.sample; do \
|
|
- dst="$(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample`" ; \
|
|
+ dst="$(DESTDIR)$(ASTEXAMPLEDIR)/`$(BASENAME) $$x .sample`" ; \
|
|
if [ -f "$${dst}" ]; then \
|
|
if [ "$(OVERWRITE)" = "y" ]; then \
|
|
if cmp -s "$${dst}" "$$x" ; then \
|
|
@@ -629,9 +624,9 @@ samples: adsi
|
|
-e 's|^astrundir.*$$|astrundir => $(ASTVARRUNDIR)|' \
|
|
-e 's|^astlogdir.*$$|astlogdir => $(ASTLOGDIR)|' \
|
|
-e 's|^astsbindir.*$$|astsbindir => $(ASTSBINDIR)|' \
|
|
- "$(DESTDIR)$(ASTCONFPATH)" > "$(DESTDIR)$(ASTCONFPATH).tmp" ; \
|
|
- $(INSTALL) -m 644 "$(DESTDIR)$(ASTCONFPATH).tmp" "$(DESTDIR)$(ASTCONFPATH)" ; \
|
|
- rm -f "$(DESTDIR)$(ASTCONFPATH).tmp" ; \
|
|
+ "$(DESTDIR)$(ASTEXAMPLEDIR)/asterisk.conf" > "$(DESTDIR)$(ASTEXAMPLEDIR)/asterisk.conf.tmp" ; \
|
|
+ $(INSTALL) -m 644 "$(DESTDIR)$(ASTEXAMPLEDIR)/asterisk.conf.tmp" "$(DESTDIR)$(ASTEXAMPLEDIR)/asterisk.conf" ; \
|
|
+ rm -f "$(DESTDIR)$(ASTEXAMPLEDIR)/asterisk.conf.tmp" ; \
|
|
fi ; \
|
|
$(INSTALL) -d "$(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX"
|
|
build_tools/make_sample_voicemail "$(DESTDIR)/$(ASTDATADIR)" "$(DESTDIR)/$(ASTSPOOLDIR)"
|
|
@@ -657,7 +652,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 )
|
|
- $(INSTALL) -m 4755 contrib/scripts/vmail.cgi "$(DESTDIR)$(HTTP_CGIDIR)/vmail.cgi"
|
|
+ $(INSTALL) contrib/scripts/vmail.cgi "$(DESTDIR)$(HTTP_CGIDIR)/vmail"
|
|
$(INSTALL) -d "$(DESTDIR)$(HTTP_DOCSDIR)/_asterisk"
|
|
for x in images/*.gif; do \
|
|
$(INSTALL) -m 644 $$x "$(DESTDIR)$(HTTP_DOCSDIR)/_asterisk/"; \
|
|
@@ -811,7 +806,7 @@ uninstall-all: _uninstall
|
|
rm -rf "$(DESTDIR)$(ASTVARLIBDIR)"
|
|
rm -rf "$(DESTDIR)$(ASTDATADIR)"
|
|
rm -rf "$(DESTDIR)$(ASTSPOOLDIR)"
|
|
- rm -rf "$(DESTDIR)$(ASTETCDIR)"
|
|
+ rm -rf "$(DESTDIR)$(ASTEXAMPLEDIR)"
|
|
rm -rf "$(DESTDIR)$(ASTLOGDIR)"
|
|
|
|
menuconfig: menuselect
|
|
@@ -880,6 +875,7 @@ menuselect-tree: $(foreach dir,$(filter-
|
|
@echo "</menu>" >> $@
|
|
|
|
.PHONY: menuselect
|
|
+.PHONY: menuselect.makeopts
|
|
.PHONY: main
|
|
.PHONY: sounds
|
|
.PHONY: clean
|