mirror of
https://github.com/asterisk/asterisk.git
synced 2025-10-29 23:39:35 +00:00
Compare commits
22 Commits
certified/
...
1.8.6.0-rc
| Author | SHA1 | Date | |
|---|---|---|---|
|
cacfd68fe1 | ||
|
2242645d5b | ||
|
|
bd01374760 | ||
|
|
23d9459488 | ||
|
|
008f630643 | ||
|
|
e2fffe8bd3 | ||
|
|
c07032da5a | ||
|
|
297798fb2d | ||
|
|
01099f06c8 | ||
|
|
af477dedda | ||
|
|
90c1e457d3 | ||
|
|
7e870a556a | ||
|
|
c46b070b3f | ||
|
|
7fec4bd0a7 | ||
|
|
0b831bd7a3 | ||
|
|
dcead470d5 | ||
|
|
1819228cf9 | ||
|
|
d1d0b0a152 | ||
|
|
d2cd89a4a6 | ||
|
|
e00cacadbd | ||
|
|
783a728281 | ||
|
|
492f0139f2 |
3
.lastclean
Normal file
3
.lastclean
Normal file
@@ -0,0 +1,3 @@
|
||||
39
|
||||
|
||||
|
||||
167
Makefile
167
Makefile
@@ -155,8 +155,8 @@ LINKER_SYMBOL_PREFIX=
|
||||
GLOBAL_MAKEOPTS=$(wildcard /etc/asterisk.makeopts)
|
||||
USER_MAKEOPTS=$(wildcard ~/.asterisk.makeopts)
|
||||
|
||||
MOD_SUBDIR_CFLAGS=-I$(ASTTOPDIR)/include
|
||||
OTHER_SUBDIR_CFLAGS=-I$(ASTTOPDIR)/include
|
||||
MOD_SUBDIR_CFLAGS="-I$(ASTTOPDIR)/include"
|
||||
OTHER_SUBDIR_CFLAGS="-I$(ASTTOPDIR)/include"
|
||||
|
||||
# Create OPTIONS variable, but probably we can assign directly to ASTCFLAGS
|
||||
OPTIONS=
|
||||
@@ -453,17 +453,17 @@ distclean: $(SUBDIRS_DIST_CLEAN) _clean
|
||||
rm -f build_tools/menuselect-deps
|
||||
|
||||
datafiles: _all doc/core-en_US.xml
|
||||
CFLAGS="$(_ASTCFLAGS) $(ASTCFLAGS)" build_tools/mkpkgconfig $(DESTDIR)$(libdir)/pkgconfig;
|
||||
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
|
||||
# improved a lot. I'll put it here for now.
|
||||
|
||||
for x in static-http/*; do \
|
||||
$(INSTALL) -m 644 $$x $(DESTDIR)$(ASTDATADIR)/static-http ; \
|
||||
$(INSTALL) -m 644 $$x "$(DESTDIR)$(ASTDATADIR)/static-http" ; \
|
||||
done
|
||||
$(INSTALL) -m 644 doc/core-en_US.xml $(DESTDIR)$(ASTDATADIR)/static-http;
|
||||
$(INSTALL) -m 644 doc/core-en_US.xml "$(DESTDIR)$(ASTDATADIR)/static-http";
|
||||
for x in images/*.jpg; do \
|
||||
$(INSTALL) -m 644 $$x $(DESTDIR)$(ASTDATADIR)/images ; \
|
||||
$(INSTALL) -m 644 $$x "$(DESTDIR)$(ASTDATADIR)/images" ; \
|
||||
done
|
||||
$(MAKE) -C sounds install
|
||||
|
||||
@@ -512,7 +512,7 @@ update:
|
||||
fi
|
||||
|
||||
NEWHEADERS=$(notdir $(wildcard include/asterisk/*.h))
|
||||
OLDHEADERS=$(filter-out $(NEWHEADERS),$(notdir $(wildcard $(DESTDIR)$(ASTHEADERDIR)/*.h)))
|
||||
OLDHEADERS=$(filter-out $(NEWHEADERS) $(notdir $(DESTDIR)$(ASTHEADERDIR)),$(notdir $(wildcard $(DESTDIR)$(ASTHEADERDIR)/*.h)))
|
||||
|
||||
installdirs:
|
||||
$(INSTALL) -d "$(DESTDIR)$(MODULES_DIR)"
|
||||
@@ -541,42 +541,43 @@ installdirs:
|
||||
$(INSTALL) -d "$(DESTDIR)$(ASTDATADIR)/keys"
|
||||
$(INSTALL) -d "$(DESTDIR)$(ASTDATADIR)/phoneprov"
|
||||
$(INSTALL) -d "$(DESTDIR)$(ASTDATADIR)/static-http"
|
||||
$(INSTALL) -d "$(DESTDIR)$(ASTDATADIR)/sounds"
|
||||
$(INSTALL) -d "$(DESTDIR)$(ASTMANDIR)/man8"
|
||||
$(INSTALL) -d "$(DESTDIR)$(AGI_DIR)"
|
||||
$(INSTALL) -d "$(DESTDIR)$(ASTDBDIR)"
|
||||
|
||||
bininstall: _all installdirs $(SUBDIRS_INSTALL)
|
||||
$(INSTALL) -m 755 main/asterisk $(DESTDIR)$(ASTSBINDIR)/
|
||||
$(LN) -sf asterisk $(DESTDIR)$(ASTSBINDIR)/rasterisk
|
||||
$(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 \
|
||||
$(INSTALL) -m 755 main/asterisk "$(DESTDIR)$(ASTSBINDIR)/"
|
||||
$(LN) -sf asterisk "$(DESTDIR)$(ASTSBINDIR)/rasterisk"
|
||||
$(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 \
|
||||
cat contrib/scripts/safe_asterisk | sed 's|__ASTERISK_SBIN_DIR__|$(ASTSBINDIR)|;s|__ASTERISK_VARRUN_DIR__|$(ASTVARRUNDIR)|;' > contrib/scripts/safe.tmp ; \
|
||||
$(INSTALL) -m 755 contrib/scripts/safe.tmp $(DESTDIR)$(ASTSBINDIR)/safe_asterisk ; \
|
||||
$(INSTALL) -m 755 contrib/scripts/safe.tmp "$(DESTDIR)$(ASTSBINDIR)/safe_asterisk" ; \
|
||||
rm -f contrib/scripts/safe.tmp ; \
|
||||
fi
|
||||
$(INSTALL) -m 644 include/asterisk.h $(DESTDIR)$(includedir)
|
||||
$(INSTALL) -m 644 include/asterisk/*.h $(DESTDIR)$(ASTHEADERDIR)
|
||||
$(INSTALL) -m 644 include/asterisk/doxygen/*.h $(DESTDIR)$(ASTHEADERDIR)/doxygen
|
||||
$(INSTALL) -m 644 include/asterisk.h "$(DESTDIR)$(includedir)"
|
||||
$(INSTALL) -m 644 include/asterisk/*.h "$(DESTDIR)$(ASTHEADERDIR)"
|
||||
$(INSTALL) -m 644 include/asterisk/doxygen/*.h "$(DESTDIR)$(ASTHEADERDIR)/doxygen"
|
||||
if [ -n "$(OLDHEADERS)" ]; then \
|
||||
rm -f $(addprefix $(DESTDIR)$(ASTHEADERDIR)/,$(OLDHEADERS)) ;\
|
||||
for h in $(OLDHEADERS); do rm -f "$(DESTDIR)$(ASTHEADERDIR)/$$h"; done \
|
||||
fi
|
||||
|
||||
$(INSTALL) -m 644 doc/core-*.xml $(DESTDIR)$(ASTDATADIR)/documentation
|
||||
$(INSTALL) -m 644 doc/appdocsxml.dtd $(DESTDIR)$(ASTDATADIR)/documentation
|
||||
$(INSTALL) -m 644 doc/asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8
|
||||
$(INSTALL) -m 644 contrib/scripts/astgenkey.8 $(DESTDIR)$(ASTMANDIR)/man8
|
||||
$(INSTALL) -m 644 contrib/scripts/autosupport.8 $(DESTDIR)$(ASTMANDIR)/man8
|
||||
$(INSTALL) -m 644 contrib/scripts/safe_asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8
|
||||
$(INSTALL) -m 644 doc/core-*.xml "$(DESTDIR)$(ASTDATADIR)/documentation"
|
||||
$(INSTALL) -m 644 doc/appdocsxml.dtd "$(DESTDIR)$(ASTDATADIR)/documentation"
|
||||
$(INSTALL) -m 644 doc/asterisk.8 "$(DESTDIR)$(ASTMANDIR)/man8"
|
||||
$(INSTALL) -m 644 contrib/scripts/astgenkey.8 "$(DESTDIR)$(ASTMANDIR)/man8"
|
||||
$(INSTALL) -m 644 contrib/scripts/autosupport.8 "$(DESTDIR)$(ASTMANDIR)/man8"
|
||||
$(INSTALL) -m 644 contrib/scripts/safe_asterisk.8 "$(DESTDIR)$(ASTMANDIR)/man8"
|
||||
if [ -f contrib/firmware/iax/iaxy.bin ] ; then \
|
||||
$(INSTALL) -m 644 contrib/firmware/iax/iaxy.bin $(DESTDIR)$(ASTDATADIR)/firmware/iax/iaxy.bin; \
|
||||
$(INSTALL) -m 644 contrib/firmware/iax/iaxy.bin "$(DESTDIR)$(ASTDATADIR)/firmware/iax/iaxy.bin"; \
|
||||
fi
|
||||
|
||||
$(SUBDIRS_INSTALL):
|
||||
+@DESTDIR="$(DESTDIR)" ASTSBINDIR="$(ASTSBINDIR)" $(SUBMAKE) -C $(@:-install=) install
|
||||
|
||||
NEWMODS:=$(foreach d,$(MOD_SUBDIRS),$(notdir $(wildcard $(d)/*.so)))
|
||||
OLDMODS=$(filter-out $(NEWMODS),$(notdir $(wildcard $(DESTDIR)$(MODULES_DIR)/*.so)))
|
||||
OLDMODS=$(filter-out $(NEWMODS) $(notdir $(DESTDIR)$(MODULES_DIR)),$(notdir $(wildcard $(DESTDIR)$(MODULES_DIR)/*.so)))
|
||||
|
||||
oldmodcheck:
|
||||
@if [ -n "$(OLDMODS)" ]; then \
|
||||
@@ -605,7 +606,7 @@ endif
|
||||
|
||||
install: badshell bininstall datafiles
|
||||
@if [ -x /usr/sbin/asterisk-post-install ]; then \
|
||||
/usr/sbin/asterisk-post-install $(DESTDIR) . ; \
|
||||
/usr/sbin/asterisk-post-install "$(DESTDIR)" . ; \
|
||||
fi
|
||||
@echo " +---- Asterisk Installation Complete -------+"
|
||||
@echo " + +"
|
||||
@@ -637,35 +638,35 @@ upgrade: bininstall
|
||||
# XXX why *.adsi is installed first ?
|
||||
adsi:
|
||||
@echo Installing adsi config files...
|
||||
$(INSTALL) -d $(DESTDIR)$(ASTETCDIR)
|
||||
$(INSTALL) -d "$(DESTDIR)$(ASTETCDIR)"
|
||||
@for x in configs/*.adsi; do \
|
||||
dst="$(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x`" ; \
|
||||
if [ -f $${dst} ] ; then \
|
||||
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)$(ASTETCDIR)/`$(BASENAME) $$x`" ; \
|
||||
done
|
||||
|
||||
samples: adsi
|
||||
@echo Installing other config files...
|
||||
@for x in configs/*.sample; do \
|
||||
dst="$(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample`" ; \
|
||||
if [ -f $${dst} ]; then \
|
||||
if [ -f "$${dst}" ]; then \
|
||||
if [ "$(OVERWRITE)" = "y" ]; then \
|
||||
if cmp -s $${dst} $$x ; then \
|
||||
if cmp -s "$${dst}" "$$x" ; then \
|
||||
echo "Config file $$x is unchanged"; \
|
||||
continue; \
|
||||
fi ; \
|
||||
mv -f $${dst} $${dst}.old ; \
|
||||
mv -f "$${dst}" "$${dst}.old" ; \
|
||||
else \
|
||||
echo "Skipping config file $$x"; \
|
||||
continue; \
|
||||
fi ;\
|
||||
fi ; \
|
||||
echo "Installing file $$x"; \
|
||||
$(INSTALL) -m 644 $$x $${dst} ;\
|
||||
$(INSTALL) -m 644 "$$x" "$${dst}" ;\
|
||||
done
|
||||
if [ "$(OVERWRITE)" = "y" ]; then \
|
||||
echo "Updating asterisk.conf" ; \
|
||||
@@ -679,38 +680,38 @@ samples: adsi
|
||||
-e 's|^astspooldir.*$$|astspooldir => $(ASTSPOOLDIR)|' \
|
||||
-e 's|^astrundir.*$$|astrundir => $(ASTVARRUNDIR)|' \
|
||||
-e 's|^astlogdir.*$$|astlogdir => $(ASTLOGDIR)|' \
|
||||
$(DESTDIR)$(ASTCONFPATH) > $(DESTDIR)$(ASTCONFPATH).tmp ; \
|
||||
$(INSTALL) -m 644 $(DESTDIR)$(ASTCONFPATH).tmp $(DESTDIR)$(ASTCONFPATH) ; \
|
||||
rm -f $(DESTDIR)$(ASTCONFPATH).tmp ; \
|
||||
"$(DESTDIR)$(ASTCONFPATH)" > "$(DESTDIR)$(ASTCONFPATH).tmp" ; \
|
||||
$(INSTALL) -m 644 "$(DESTDIR)$(ASTCONFPATH).tmp" "$(DESTDIR)$(ASTCONFPATH)" ; \
|
||||
rm -f "$(DESTDIR)$(ASTCONFPATH).tmp" ; \
|
||||
fi ; \
|
||||
$(INSTALL) -d $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX
|
||||
build_tools/make_sample_voicemail $(DESTDIR)/$(ASTDATADIR) $(DESTDIR)/$(ASTSPOOLDIR)
|
||||
$(INSTALL) -d "$(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX"
|
||||
build_tools/make_sample_voicemail "$(DESTDIR)/$(ASTDATADIR)" "$(DESTDIR)/$(ASTSPOOLDIR)"
|
||||
|
||||
@for x in phoneprov/*; do \
|
||||
dst="$(DESTDIR)$(ASTDATADIR)/$$x" ; \
|
||||
if [ -f $${dst} ]; then \
|
||||
if [ -f "$${dst}" ]; then \
|
||||
if [ "$(OVERWRITE)" = "y" ]; then \
|
||||
if cmp -s $${dst} $$x ; then \
|
||||
if cmp -s "$${dst}" "$$x" ; then \
|
||||
echo "Config file $$x is unchanged"; \
|
||||
continue; \
|
||||
fi ; \
|
||||
mv -f $${dst} $${dst}.old ; \
|
||||
mv -f "$${dst}" "$${dst}.old" ; \
|
||||
else \
|
||||
echo "Skipping config file $$x"; \
|
||||
continue; \
|
||||
fi ;\
|
||||
fi ; \
|
||||
echo "Installing file $$x"; \
|
||||
$(INSTALL) -m 644 $$x $${dst} ;\
|
||||
$(INSTALL) -m 644 "$$x" "$${dst}" ;\
|
||||
done
|
||||
|
||||
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) -d $(DESTDIR)$(HTTP_DOCSDIR)/_asterisk
|
||||
@[ -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) -d "$(DESTDIR)$(HTTP_DOCSDIR)/_asterisk"
|
||||
for x in images/*.gif; do \
|
||||
$(INSTALL) -m 644 $$x $(DESTDIR)$(HTTP_DOCSDIR)/_asterisk/; \
|
||||
$(INSTALL) -m 644 $$x "$(DESTDIR)$(HTTP_DOCSDIR)/_asterisk/"; \
|
||||
done
|
||||
@echo " +--------- Asterisk Web Voicemail ----------+"
|
||||
@echo " + +"
|
||||
@@ -735,75 +736,75 @@ progdocs:
|
||||
echo "PROJECT_NUMBER=$(ASTERISKVERSION)") | doxygen -
|
||||
|
||||
install-logrotate:
|
||||
if [ ! -d $(ASTETCDIR)/../logrotate.d ]; then \
|
||||
$(INSTALL) -d $(ASTETCDIR)/../logrotate.d ; \
|
||||
if [ ! -d "$(DESTDIR)$(ASTETCDIR)/../logrotate.d" ]; then \
|
||||
$(INSTALL) -d "$(DESTDIR)$(ASTETCDIR)/../logrotate.d" ; \
|
||||
fi
|
||||
sed 's#__LOGDIR__#$(ASTLOGDIR)#g' < contrib/scripts/asterisk.logrotate | sed 's#__SBINDIR__#$(ASTSBINDIR)#g' > contrib/scripts/asterisk.logrotate.tmp
|
||||
$(INSTALL) -m 0644 contrib/scripts/asterisk.logrotate.tmp $(ASTETCDIR)/../logrotate.d/asterisk
|
||||
$(INSTALL) -m 0644 contrib/scripts/asterisk.logrotate.tmp "$(DESTDIR)$(ASTETCDIR)/../logrotate.d/asterisk"
|
||||
rm -f contrib/scripts/asterisk.logrotate.tmp
|
||||
|
||||
config:
|
||||
@if [ "${OSARCH}" = "linux-gnu" ]; then \
|
||||
if [ -f /etc/redhat-release -o -f /etc/fedora-release ]; then \
|
||||
cat contrib/init.d/rc.redhat.asterisk | sed 's|__ASTERISK_ETC_DIR__|$(ASTETCDIR)|;s|__ASTERISK_SBIN_DIR__|$(ASTSBINDIR)|;s|__ASTERISK_VARRUN_DIR__|$(ASTVARRUNDIR)|;' > contrib/init.d/rc.asterisk.tmp ; \
|
||||
$(INSTALL) -m 755 contrib/init.d/rc.asterisk.tmp $(DESTDIR)/etc/rc.d/init.d/asterisk ; \
|
||||
$(INSTALL) -m 755 contrib/init.d/rc.asterisk.tmp "$(DESTDIR)/etc/rc.d/init.d/asterisk" ; \
|
||||
rm -f contrib/init.d/rc.asterisk.tmp ; \
|
||||
if [ ! -f $(DESTDIR)/etc/sysconfig/asterisk ] ; then \
|
||||
$(INSTALL) -m 644 contrib/init.d/etc_default_asterisk $(DESTDIR)/etc/sysconfig/asterisk ; \
|
||||
if [ ! -f "$(DESTDIR)/etc/sysconfig/asterisk" ] ; then \
|
||||
$(INSTALL) -m 644 contrib/init.d/etc_default_asterisk "$(DESTDIR)/etc/sysconfig/asterisk" ; \
|
||||
fi ; \
|
||||
if [ -z "$(DESTDIR)" ] ; then \
|
||||
/sbin/chkconfig --add asterisk ; \
|
||||
fi ; \
|
||||
elif [ -f /etc/debian_version ] ; then \
|
||||
cat contrib/init.d/rc.debian.asterisk | sed 's|__ASTERISK_ETC_DIR__|$(ASTETCDIR)|;s|__ASTERISK_SBIN_DIR__|$(ASTSBINDIR)|;s|__ASTERISK_VARRUN_DIR__|$(ASTVARRUNDIR)|;' > contrib/init.d/rc.asterisk.tmp ; \
|
||||
$(INSTALL) -m 755 contrib/init.d/rc.asterisk.tmp $(DESTDIR)/etc/init.d/asterisk ; \
|
||||
$(INSTALL) -m 755 contrib/init.d/rc.asterisk.tmp "$(DESTDIR)/etc/init.d/asterisk" ; \
|
||||
rm -f contrib/init.d/rc.asterisk.tmp ; \
|
||||
if [ ! -f $(DESTDIR)/etc/default/asterisk ] ; then \
|
||||
$(INSTALL) -m 644 contrib/init.d/etc_default_asterisk $(DESTDIR)/etc/default/asterisk ; \
|
||||
if [ ! -f "$(DESTDIR)/etc/default/asterisk" ] ; then \
|
||||
$(INSTALL) -m 644 contrib/init.d/etc_default_asterisk "$(DESTDIR)/etc/default/asterisk" ; \
|
||||
fi ; \
|
||||
if [ -z "$(DESTDIR)" ] ; then \
|
||||
/usr/sbin/update-rc.d asterisk defaults 50 91 ; \
|
||||
fi ; \
|
||||
elif [ -f /etc/gentoo-release ] ; then \
|
||||
cat contrib/init.d/rc.gentoo.asterisk | sed 's|__ASTERISK_ETC_DIR__|$(ASTETCDIR)|;s|__ASTERISK_SBIN_DIR__|$(ASTSBINDIR)|;s|__ASTERISK_VARRUN_DIR__|$(ASTVARRUNDIR)|;' > contrib/init.d/rc.asterisk.tmp ; \
|
||||
$(INSTALL) -m 755 contrib/init.d/rc.asterisk.tmp $(DESTDIR)/etc/init.d/asterisk ; \
|
||||
$(INSTALL) -m 755 contrib/init.d/rc.asterisk.tmp "$(DESTDIR)/etc/init.d/asterisk" ; \
|
||||
rm -f contrib/init.d/rc.asterisk.tmp ; \
|
||||
if [ -z "$(DESTDIR)" ] ; then \
|
||||
/sbin/rc-update add asterisk default ; \
|
||||
fi ; \
|
||||
elif [ -f /etc/mandrake-release -o -f /etc/mandriva-release ] ; then \
|
||||
cat contrib/init.d/rc.mandriva.asterisk | sed 's|__ASTERISK_ETC_DIR__|$(ASTETCDIR)|;s|__ASTERISK_SBIN_DIR__|$(ASTSBINDIR)|;s|__ASTERISK_VARRUN_DIR__|$(ASTVARRUNDIR)|;' > contrib/init.d/rc.asterisk.tmp ; \
|
||||
$(INSTALL) -m 755 contrib/init.d/rc.asterisk.tmp $(DESTDIR)/etc/rc.d/init.d/asterisk ; \
|
||||
$(INSTALL) -m 755 contrib/init.d/rc.asterisk.tmp "$(DESTDIR)/etc/rc.d/init.d/asterisk" ; \
|
||||
rm -f contrib/init.d/rc.asterisk.tmp ; \
|
||||
if [ ! -f /etc/sysconfig/asterisk ] ; then \
|
||||
$(INSTALL) -m 644 contrib/init.d/etc_default_asterisk $(DESTDIR)/etc/sysconfig/asterisk ; \
|
||||
$(INSTALL) -m 644 contrib/init.d/etc_default_asterisk "$(DESTDIR)/etc/sysconfig/asterisk" ; \
|
||||
fi ; \
|
||||
if [ -z "$(DESTDIR)" ] ; then \
|
||||
/sbin/chkconfig --add asterisk ; \
|
||||
fi ; \
|
||||
elif [ -f /etc/SuSE-release -o -f /etc/novell-release ] ; then \
|
||||
cat contrib/init.d/rc.suse.asterisk | sed 's|__ASTERISK_ETC_DIR__|$(ASTETCDIR)|;s|__ASTERISK_SBIN_DIR__|$(ASTSBINDIR)|;s|__ASTERISK_VARRUN_DIR__|$(ASTVARRUNDIR)|;' > contrib/init.d/rc.asterisk.tmp ; \
|
||||
$(INSTALL) -m 755 contrib/init.d/rc.asterisk.tmp $(DESTDIR)/etc/init.d/asterisk ;\
|
||||
$(INSTALL) -m 755 contrib/init.d/rc.asterisk.tmp "$(DESTDIR)/etc/init.d/asterisk" ;\
|
||||
rm -f contrib/init.d/rc.asterisk.tmp ; \
|
||||
if [ ! -f /etc/sysconfig/asterisk ] ; then \
|
||||
$(INSTALL) -m 644 contrib/init.d/etc_default_asterisk $(DESTDIR)/etc/sysconfig/asterisk ; \
|
||||
$(INSTALL) -m 644 contrib/init.d/etc_default_asterisk "$(DESTDIR)/etc/sysconfig/asterisk" ; \
|
||||
fi ; \
|
||||
if [ -z "$(DESTDIR)" ] ; then \
|
||||
/sbin/chkconfig --add asterisk ; \
|
||||
fi ; \
|
||||
elif [ -f /etc/arch-release -o -f /etc/arch-release ] ; then \
|
||||
cat contrib/init.d/rc.archlinux.asterisk | sed 's|__ASTERISK_ETC_DIR__|$(ASTETCDIR)|;s|__ASTERISK_SBIN_DIR__|$(ASTSBINDIR)|;s|__ASTERISK_VARRUN_DIR__|$(ASTVARRUNDIR)|;' > contrib/init.d/rc.asterisk.tmp ; \
|
||||
$(INSTALL) -m 755 contrib/init.d/rc.asterisk.tmp $(DESTDIR)/etc/rc.d/asterisk ; \
|
||||
$(INSTALL) -m 755 contrib/init.d/rc.asterisk.tmp "$(DESTDIR)/etc/rc.d/asterisk" ; \
|
||||
rm -f contrib/init.d/rc.asterisk.tmp ; \
|
||||
elif [ -d $(DESTDIR)/Library/LaunchDaemons ]; then \
|
||||
if [ ! -f $(DESTDIR)/Library/LaunchDaemons/org.asterisk.asterisk.plist ]; then \
|
||||
elif [ -d "$(DESTDIR)/Library/LaunchDaemons" ]; then \
|
||||
if [ ! -f "$(DESTDIR)/Library/LaunchDaemons/org.asterisk.asterisk.plist" ]; then \
|
||||
sed 's|__ASTERISK_SBIN_DIR__|$(ASTSBINDIR)|;' < contrib/init.d/org.asterisk.asterisk.plist > asterisk.plist ; \
|
||||
$(INSTALL) -m 644 asterisk.plist $(DESTDIR)/Library/LaunchDaemons/org.asterisk.asterisk.plist; \
|
||||
$(INSTALL) -m 644 asterisk.plist "$(DESTDIR)/Library/LaunchDaemons/org.asterisk.asterisk.plist"; \
|
||||
rm -f asterisk.plist; \
|
||||
fi; \
|
||||
if [ ! -f $(DESTDIR)/Library/LaunchDaemons/org.asterisk.muted.plist ]; then \
|
||||
if [ ! -f "$(DESTDIR)/Library/LaunchDaemons/org.asterisk.muted.plist" ]; then \
|
||||
sed 's|__ASTERISK_SBIN_DIR__|$(ASTSBINDIR)|;' < contrib/init.d/org.asterisk.muted.plist > muted.plist ; \
|
||||
$(INSTALL) -m 644 muted.plist $(DESTDIR)/Library/LaunchDaemons/org.asterisk.muted.plist; \
|
||||
$(INSTALL) -m 644 muted.plist "$(DESTDIR)/Library/LaunchDaemons/org.asterisk.muted.plist"; \
|
||||
rm -f muted.plist; \
|
||||
fi; \
|
||||
elif [ -f /etc/slackware-version ]; then \
|
||||
@@ -829,16 +830,16 @@ $(SUBDIRS_UNINSTALL):
|
||||
+@$(SUBMAKE) -C $(@:-uninstall=) uninstall
|
||||
|
||||
_uninstall: $(SUBDIRS_UNINSTALL)
|
||||
rm -f $(DESTDIR)$(MODULES_DIR)/*
|
||||
rm -f $(DESTDIR)$(ASTSBINDIR)/*asterisk*
|
||||
rm -f $(DESTDIR)$(ASTSBINDIR)/astgenkey
|
||||
rm -f $(DESTDIR)$(ASTSBINDIR)/autosupport
|
||||
rm -rf $(DESTDIR)$(ASTHEADERDIR)
|
||||
rm -rf $(DESTDIR)$(ASTDATADIR)/firmware
|
||||
rm -f $(DESTDIR)$(ASTMANDIR)/man8/asterisk.8
|
||||
rm -f $(DESTDIR)$(ASTMANDIR)/man8/astgenkey.8
|
||||
rm -f $(DESTDIR)$(ASTMANDIR)/man8/autosupport.8
|
||||
rm -f $(DESTDIR)$(ASTMANDIR)/man8/safe_asterisk.8
|
||||
rm -f "$(DESTDIR)$(MODULES_DIR)/"*
|
||||
rm -f "$(DESTDIR)$(ASTSBINDIR)/"*asterisk*
|
||||
rm -f "$(DESTDIR)$(ASTSBINDIR)/astgenkey"
|
||||
rm -f "$(DESTDIR)$(ASTSBINDIR)/autosupport"
|
||||
rm -rf "$(DESTDIR)$(ASTHEADERDIR)"
|
||||
rm -rf "$(DESTDIR)$(ASTDATADIR)/firmware"
|
||||
rm -f "$(DESTDIR)$(ASTMANDIR)/man8/asterisk.8"
|
||||
rm -f "$(DESTDIR)$(ASTMANDIR)/man8/astgenkey.8"
|
||||
rm -f "$(DESTDIR)$(ASTMANDIR)/man8/autosupport.8"
|
||||
rm -f "$(DESTDIR)$(ASTMANDIR)/man8/safe_asterisk.8"
|
||||
$(MAKE) -C sounds uninstall
|
||||
|
||||
uninstall: _uninstall
|
||||
@@ -856,12 +857,12 @@ uninstall: _uninstall
|
||||
@echo " +-------------------------------------------+"
|
||||
|
||||
uninstall-all: _uninstall
|
||||
rm -rf $(DESTDIR)$(ASTLIBDIR)
|
||||
rm -rf $(DESTDIR)$(ASTVARLIBDIR)
|
||||
rm -rf $(DESTDIR)$(ASTDATADIR)
|
||||
rm -rf $(DESTDIR)$(ASTSPOOLDIR)
|
||||
rm -rf $(DESTDIR)$(ASTETCDIR)
|
||||
rm -rf $(DESTDIR)$(ASTLOGDIR)
|
||||
rm -rf "$(DESTDIR)$(ASTLIBDIR)"
|
||||
rm -rf "$(DESTDIR)$(ASTVARLIBDIR)"
|
||||
rm -rf "$(DESTDIR)$(ASTDATADIR)"
|
||||
rm -rf "$(DESTDIR)$(ASTSPOOLDIR)"
|
||||
rm -rf "$(DESTDIR)$(ASTETCDIR)"
|
||||
rm -rf "$(DESTDIR)$(ASTLOGDIR)"
|
||||
|
||||
menuconfig: menuselect
|
||||
|
||||
|
||||
@@ -122,7 +122,7 @@ clean::
|
||||
|
||||
install:: all
|
||||
@echo "Installing modules from `basename $(CURDIR)`..."
|
||||
@for x in $(LOADABLE_MODS:%=%.so); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done
|
||||
@for x in $(LOADABLE_MODS:%=%.so); do $(INSTALL) -m 755 $$x "$(DESTDIR)$(MODULES_DIR)" ; done
|
||||
|
||||
uninstall::
|
||||
|
||||
|
||||
@@ -40,11 +40,11 @@ eagi-test: eagi-test.o strcompat.o
|
||||
eagi-sphinx-test: eagi-sphinx-test.o
|
||||
|
||||
install: all
|
||||
$(INSTALL) -d $(DESTDIR)$(AGI_DIR)
|
||||
for x in $(AGIS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(AGI_DIR) ; done
|
||||
$(INSTALL) -d "$(DESTDIR)$(AGI_DIR)"
|
||||
for x in $(AGIS); do $(INSTALL) -m 755 $$x "$(DESTDIR)$(AGI_DIR)" ; done
|
||||
|
||||
uninstall:
|
||||
for x in $(AGIS); do rm -f $(DESTDIR)$(AGI_DIR)/$$x ; done
|
||||
for x in $(AGIS); do rm -f "$(DESTDIR)$(AGI_DIR)/$$x" ; done
|
||||
|
||||
clean:
|
||||
rm -f *.so *.o look eagi-test eagi-sphinx-test
|
||||
|
||||
65
asterisk-1.8.6.0-rc3-summary.html
Normal file
65
asterisk-1.8.6.0-rc3-summary.html
Normal file
@@ -0,0 +1,65 @@
|
||||
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
|
||||
<html xmlns="http://www.w3.org/1999/xhtml">
|
||||
<head><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /><title>Release Summary - asterisk-1.8.6.0-rc3</title></head>
|
||||
<body>
|
||||
<h1 align="center"><a name="top">Release Summary</a></h1>
|
||||
<h3 align="center">asterisk-1.8.6.0-rc3</h3>
|
||||
<h3 align="center">Date: 2011-08-25</h3>
|
||||
<h3 align="center"><asteriskteam@digium.com></h3>
|
||||
<hr/>
|
||||
<h2 align="center">Table of Contents</h2>
|
||||
<ol>
|
||||
<li><a href="#summary">Summary</a></li>
|
||||
<li><a href="#contributors">Contributors</a></li>
|
||||
<li><a href="#commits">Other Changes</a></li>
|
||||
<li><a href="#diffstat">Diffstat</a></li>
|
||||
</ol>
|
||||
<hr/>
|
||||
<a name="summary"><h2 align="center">Summary</h2></a>
|
||||
<center><a href="#top">[Back to Top]</a></center><br/><p>This release includes only bug fixes. The changes included were made only to address problems that have been identified in this release series. Users should be able to safely upgrade to this version if this release series is already in use. Users considering upgrading from a previous release series are strongly encouraged to review the UPGRADE.txt document as well as the CHANGES document for information about upgrading to this release series.</p>
|
||||
<p>The data in this summary reflects changes that have been made since the previous release, asterisk-1.8.6.0-rc2.</p>
|
||||
<hr/>
|
||||
<a name="contributors"><h2 align="center">Contributors</h2></a>
|
||||
<center><a href="#top">[Back to Top]</a></center><br/><p>This table lists the people who have submitted code, those that have tested patches, as well as those that reported issues on the issue tracker that were resolved in this release. For coders, the number is how many of their patches (of any size) were committed into this release. For testers, the number is the number of times their name was listed as assisting with testing a patch. Finally, for reporters, the number is the number of issues that they reported that were closed by commits that went into this release.</p>
|
||||
<table width="100%" border="0">
|
||||
<tr>
|
||||
<td width="33%"><h3>Coders</h3></td>
|
||||
<td width="33%"><h3>Testers</h3></td>
|
||||
<td width="33%"><h3>Reporters</h3></td>
|
||||
</tr>
|
||||
<tr valign="top">
|
||||
<td>
|
||||
3 qwell<br/>
|
||||
</td>
|
||||
<td>
|
||||
</td>
|
||||
<td>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
<hr/>
|
||||
<a name="commits"><h2 align="center">Commits Not Associated with an Issue</h2></a>
|
||||
<center><a href="#top">[Back to Top]</a></center><br/><p>This is a list of all changes that went into this release that did not directly close an issue from the issue tracker. The commits may have been marked as being related to an issue. If that is the case, the issue numbers are listed here, as well.</p>
|
||||
<table width="100%" border="1">
|
||||
<tr><td><b>Revision</b></td><td><b>Author</b></td><td><b>Summary</b></td><td><b>Issues Referenced</b></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/branches/1.8?view=revision&revision=333272">333272</a></td><td>qwell</td><td>Create tag for Asterisk 1.8.6.0-rc3.</td>
|
||||
<td></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/branches/1.8?view=revision&revision=333273">333273</a></td><td>qwell</td><td>Update ChangeLog, .version, merge r333201,333267.</td>
|
||||
<td></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/branches/1.8?view=revision&revision=333274">333274</a></td><td>qwell</td><td>Remove old release summaries.</td>
|
||||
<td></td></tr></table>
|
||||
<hr/>
|
||||
<a name="diffstat"><h2 align="center">Diffstat Results</h2></a>
|
||||
<center><a href="#top">[Back to Top]</a></center><br/><p>This is a summary of the changes to the source code that went into this release that was generated using the diffstat utility.</p>
|
||||
<pre>
|
||||
.version | 2
|
||||
ChangeLog | 16 +++++
|
||||
Makefile | 27 +++------
|
||||
asterisk-1.8.6.0-rc2-summary.html | 69 -----------------------
|
||||
asterisk-1.8.6.0-rc2-summary.txt | 101 ---------------------------------
|
||||
build_tools/mkpkgconfig | 6 +-
|
||||
configure | 73 ------------------------
|
||||
makeopts.in | 31 ----------
|
||||
sounds/Makefile | 114 ++++++++++++++------------------------
|
||||
9 files changed, 74 insertions(+), 365 deletions(-)
|
||||
</pre><br/>
|
||||
<hr/>
|
||||
</body>
|
||||
</html>
|
||||
96
asterisk-1.8.6.0-rc3-summary.txt
Normal file
96
asterisk-1.8.6.0-rc3-summary.txt
Normal file
@@ -0,0 +1,96 @@
|
||||
Release Summary
|
||||
|
||||
asterisk-1.8.6.0-rc3
|
||||
|
||||
Date: 2011-08-25
|
||||
|
||||
<asteriskteam@digium.com>
|
||||
|
||||
----------------------------------------------------------------------
|
||||
|
||||
Table of Contents
|
||||
|
||||
1. Summary
|
||||
2. Contributors
|
||||
3. Other Changes
|
||||
4. Diffstat
|
||||
|
||||
----------------------------------------------------------------------
|
||||
|
||||
Summary
|
||||
|
||||
[Back to Top]
|
||||
|
||||
This release includes only bug fixes. The changes included were made only
|
||||
to address problems that have been identified in this release series.
|
||||
Users should be able to safely upgrade to this version if this release
|
||||
series is already in use. Users considering upgrading from a previous
|
||||
release series are strongly encouraged to review the UPGRADE.txt document
|
||||
as well as the CHANGES document for information about upgrading to this
|
||||
release series.
|
||||
|
||||
The data in this summary reflects changes that have been made since the
|
||||
previous release, asterisk-1.8.6.0-rc2.
|
||||
|
||||
----------------------------------------------------------------------
|
||||
|
||||
Contributors
|
||||
|
||||
[Back to Top]
|
||||
|
||||
This table lists the people who have submitted code, those that have
|
||||
tested patches, as well as those that reported issues on the issue tracker
|
||||
that were resolved in this release. For coders, the number is how many of
|
||||
their patches (of any size) were committed into this release. For testers,
|
||||
the number is the number of times their name was listed as assisting with
|
||||
testing a patch. Finally, for reporters, the number is the number of
|
||||
issues that they reported that were closed by commits that went into this
|
||||
release.
|
||||
|
||||
Coders Testers Reporters
|
||||
3 qwell
|
||||
|
||||
----------------------------------------------------------------------
|
||||
|
||||
Commits Not Associated with an Issue
|
||||
|
||||
[Back to Top]
|
||||
|
||||
This is a list of all changes that went into this release that did not
|
||||
directly close an issue from the issue tracker. The commits may have been
|
||||
marked as being related to an issue. If that is the case, the issue
|
||||
numbers are listed here, as well.
|
||||
|
||||
+------------------------------------------------------------------------+
|
||||
| Revision | Author | Summary | Issues Referenced |
|
||||
|----------+--------+--------------------------------+-------------------|
|
||||
| 333272 | qwell | Create tag for Asterisk | |
|
||||
| | | 1.8.6.0-rc3. | |
|
||||
|----------+--------+--------------------------------+-------------------|
|
||||
| 333273 | qwell | Update ChangeLog, .version, | |
|
||||
| | | merge r333201,333267. | |
|
||||
|----------+--------+--------------------------------+-------------------|
|
||||
| 333274 | qwell | Remove old release summaries. | |
|
||||
+------------------------------------------------------------------------+
|
||||
|
||||
----------------------------------------------------------------------
|
||||
|
||||
Diffstat Results
|
||||
|
||||
[Back to Top]
|
||||
|
||||
This is a summary of the changes to the source code that went into this
|
||||
release that was generated using the diffstat utility.
|
||||
|
||||
.version | 2
|
||||
ChangeLog | 16 +++++
|
||||
Makefile | 27 +++------
|
||||
asterisk-1.8.6.0-rc2-summary.html | 69 -----------------------
|
||||
asterisk-1.8.6.0-rc2-summary.txt | 101 ---------------------------------
|
||||
build_tools/mkpkgconfig | 6 +-
|
||||
configure | 73 ------------------------
|
||||
makeopts.in | 31 ----------
|
||||
sounds/Makefile | 114 ++++++++++++++------------------------
|
||||
9 files changed, 74 insertions(+), 365 deletions(-)
|
||||
|
||||
----------------------------------------------------------------------
|
||||
@@ -1,5 +1,5 @@
|
||||
#!/bin/sh
|
||||
PPATH=$1
|
||||
PPATH="$1"
|
||||
## Make sure we were called from Makefile
|
||||
|
||||
if [ "x$ASTERISKVERSIONNUM" = "x" ]; then
|
||||
@@ -9,7 +9,7 @@ fi
|
||||
|
||||
## Create a pkgconfig spec file for 3rd party modules (pkg-config asterisk --cflags)
|
||||
|
||||
if [ ! -d $PPATH ]; then
|
||||
if [ ! -d "$PPATH" ]; then
|
||||
exit
|
||||
fi
|
||||
|
||||
@@ -29,7 +29,7 @@ LOCAL_CFLAGS=`echo $CFLAGS | ${EXTREGEX} 's/\s*-pipe\s*//g' | ${EXTREGEX} 's/-[W
|
||||
${EXTREGEX} 's/-DAST(ETCDIR|LIBDIR|VARLIBDIR|VARRUNDIR|SPOOLDIR|LOGDIR|CONFPATH|MODDIR|AGIDIR)=\S* //g'`
|
||||
|
||||
|
||||
cat <<EOF > $PPATH/asterisk.pc
|
||||
cat <<EOF > "$PPATH/asterisk.pc"
|
||||
install_prefix=$INSTALL_PREFIX
|
||||
version_number=$ASTERISKVERSIONNUM
|
||||
etcdir=$ASTETCDIR
|
||||
|
||||
2
configure
vendored
2
configure
vendored
@@ -1,5 +1,5 @@
|
||||
#! /bin/sh
|
||||
# From configure.ac Revision: 320573 .
|
||||
# From configure.ac Revision: 332928 .
|
||||
# Guess values for system-dependent variables and create Makefiles.
|
||||
# Generated by GNU Autoconf 2.67 for asterisk trunk.
|
||||
#
|
||||
|
||||
@@ -42,29 +42,38 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
|
||||
static int shell_helper(struct ast_channel *chan, const char *cmd, char *data,
|
||||
char *buf, size_t len)
|
||||
{
|
||||
int res = 0;
|
||||
|
||||
if (ast_strlen_zero(data)) {
|
||||
ast_log(LOG_WARNING, "Missing Argument! Example: Set(foo=${SHELL(echo \"bar\")})\n");
|
||||
return -1;
|
||||
}
|
||||
|
||||
if (chan)
|
||||
if (chan) {
|
||||
ast_autoservice_start(chan);
|
||||
}
|
||||
|
||||
if (len >= 1) {
|
||||
FILE *ptr;
|
||||
char plbuff[4096];
|
||||
|
||||
ptr = popen(data, "r");
|
||||
while (fgets(plbuff, sizeof(plbuff), ptr)) {
|
||||
strncat(buf, plbuff, len - strlen(buf) - 1);
|
||||
if (ptr) {
|
||||
while (fgets(plbuff, sizeof(plbuff), ptr)) {
|
||||
strncat(buf, plbuff, len - strlen(buf) - 1);
|
||||
}
|
||||
pclose(ptr);
|
||||
} else {
|
||||
ast_log(LOG_WARNING, "Failed to execute shell command '%s'\n", data);
|
||||
res = -1;
|
||||
}
|
||||
pclose(ptr);
|
||||
}
|
||||
|
||||
if (chan)
|
||||
if (chan) {
|
||||
ast_autoservice_stop(chan);
|
||||
}
|
||||
|
||||
return 0;
|
||||
return res;
|
||||
}
|
||||
|
||||
/*** DOCUMENTATION
|
||||
|
||||
@@ -85,7 +85,7 @@ char *ast_sockaddr_stringify_fmt(const struct ast_sockaddr *sa, int format)
|
||||
sa_tmp = sa;
|
||||
}
|
||||
|
||||
if ((e = getnameinfo((struct sockaddr *)&sa_tmp->ss, sa->len,
|
||||
if ((e = getnameinfo((struct sockaddr *)&sa_tmp->ss, sa_tmp->len,
|
||||
format & AST_SOCKADDR_STR_ADDR ? host : NULL,
|
||||
format & AST_SOCKADDR_STR_ADDR ? sizeof(host) : 0,
|
||||
format & AST_SOCKADDR_STR_PORT ? port : 0,
|
||||
|
||||
110
sounds/Makefile
110
sounds/Makefile
@@ -38,7 +38,7 @@ MCS:=$(subst -SLN16,-sln16,$(MCS))
|
||||
MCS:=$(subst -SIREN7,-siren7,$(MCS))
|
||||
MCS:=$(subst -SIREN14,-siren14,$(MCS))
|
||||
CORE_SOUNDS:=$(MCS:CORE-SOUNDS-%=asterisk-core-sounds-%-$(CORE_SOUNDS_VERSION).tar.gz)
|
||||
CORE_SOUND_TAGS:=$(MCS:CORE-SOUNDS-%=$(SOUNDS_DIR)/.asterisk-core-sounds-%-$(CORE_SOUNDS_VERSION))
|
||||
CORE_SOUND_TAGS:=$(MCS:CORE-SOUNDS-%=.asterisk-core-sounds-%-$(CORE_SOUNDS_VERSION))
|
||||
MES:=$(subst -EN-,-en-,$(MENUSELECT_EXTRA_SOUNDS))
|
||||
MES:=$(subst -FR-,-fr-,$(MES))
|
||||
MES:=$(subst -ES-,-es-,$(MES))
|
||||
@@ -52,7 +52,7 @@ MES:=$(subst -SLN16,-sln16,$(MES))
|
||||
MES:=$(subst -SIREN7,-siren7,$(MES))
|
||||
MES:=$(subst -SIREN14,-siren14,$(MES))
|
||||
EXTRA_SOUNDS:=$(MES:EXTRA-SOUNDS-%=asterisk-extra-sounds-%-$(EXTRA_SOUNDS_VERSION).tar.gz)
|
||||
EXTRA_SOUND_TAGS:=$(MES:EXTRA-SOUNDS-%=$(SOUNDS_DIR)/.asterisk-extra-sounds-%-$(EXTRA_SOUNDS_VERSION))
|
||||
EXTRA_SOUND_TAGS:=$(MES:EXTRA-SOUNDS-%=.asterisk-extra-sounds-%-$(EXTRA_SOUNDS_VERSION))
|
||||
MM:=$(subst -OPSOUND-,-opsound-,$(MENUSELECT_MOH))
|
||||
MM:=$(subst -WAV,-wav,$(MM))
|
||||
MM:=$(subst -ULAW,-ulaw,$(MM))
|
||||
@@ -64,76 +64,59 @@ MM:=$(subst -SLN16,-sln16,$(MM))
|
||||
MM:=$(subst -SIREN7,-siren7,$(MM))
|
||||
MM:=$(subst -SIREN14,-siren14,$(MM))
|
||||
MOH:=$(MM:MOH-%=asterisk-moh-%-$(MOH_VERSION).tar.gz)
|
||||
MOH_TAGS:=$(MM:MOH-%=$(MOH_DIR)/.asterisk-moh-%-$(MOH_VERSION))
|
||||
MOH_TAGS:=$(MM:MOH-%=.asterisk-moh-%-$(MOH_VERSION))
|
||||
# If "fetch" is used, --continue is not a valid option.
|
||||
ifneq ($(findstring wget,$(DOWNLOAD)),)
|
||||
DOWNLOAD+=--continue $(WGET_EXTRA_ARGS)
|
||||
endif
|
||||
|
||||
ifneq ($(SOUNDS_CACHE_DIR),)
|
||||
|
||||
define sound_format_lang_rule
|
||||
$(1)/.asterisk-$(2)$(if $(3),-$(3),)-%: have_download
|
||||
$(CMD_PREFIX)PACKAGE=$$(subst $(1)/.asterisk,asterisk,$$@).tar.gz; \
|
||||
if test ! -f $$(SOUNDS_CACHE_DIR)/$$$${PACKAGE}; then \
|
||||
(cd $$(SOUNDS_CACHE_DIR); $$(DOWNLOAD) $$(SOUNDS_URL)/$$$${PACKAGE}); \
|
||||
fi; \
|
||||
if test ! -f $$(SOUNDS_CACHE_DIR)/$$$${PACKAGE}.sha1; then \
|
||||
(cd $$(SOUNDS_CACHE_DIR); $$(DOWNLOAD) $$(SOUNDS_URL)/$$$${PACKAGE}.sha1); \
|
||||
fi; \
|
||||
$(LN) -sf $$(SOUNDS_CACHE_DIR)/$$$${PACKAGE} .; \
|
||||
$(LN) -sf $$(SOUNDS_CACHE_DIR)/$$$${PACKAGE}.sha1 .; \
|
||||
$$(SHA1SUM) -c --status $$$${PACKAGE}.sha1 || \
|
||||
( \
|
||||
rm -f $$(SOUNDS_CACHE_DIR)/$$$${PACKAGE} $$(SOUNDS_CACHE_DIR)/$$$${PACKAGE}.sha1 $$$${PACKAGE} $$$${PACKAGE}.sha1; \
|
||||
echo "Bad checksum: $$$${PACKAGE}" 1>&2; \
|
||||
exit 1; \
|
||||
) || exit 1; \
|
||||
rm -f $$(subst -$(4),,$$@)-*; \
|
||||
(cd $(1)$(if $(3),/$(3),); cat $$(CURDIR)/$$$${PACKAGE} | gzip -d | tar xof -) && touch $$@
|
||||
endef
|
||||
.PHONY: .asterisk-$(2)$(if $(3),-$(3),)-%
|
||||
|
||||
define sound_download_rule
|
||||
asterisk-$(1)-%.tar.gz: have_download
|
||||
.asterisk-$(2)$(if $(3),-$(3),)-%: asterisk-$(2)$(if $(3),-$(3),)-%.tar.gz
|
||||
$(CMD_PREFIX) \
|
||||
if test ! -f $$(SOUNDS_CACHE_DIR)/$$@; then \
|
||||
(cd $$(SOUNDS_CACHE_DIR); $$(DOWNLOAD) $$(SOUNDS_URL)/$$@); \
|
||||
fi; \
|
||||
if test ! -f $$(SOUNDS_CACHE_DIR)/$$@.sha1; then \
|
||||
(cd $$(SOUNDS_CACHE_DIR); $$(DOWNLOAD) $$(SOUNDS_URL)/$$@.sha1); \
|
||||
fi; \
|
||||
$(LN) -sf $$(SOUNDS_CACHE_DIR)/$$@ .; \
|
||||
$(LN) -sf $$(SOUNDS_CACHE_DIR)/$$@.sha1 .; \
|
||||
$$(SHA1SUM) -c --status $$@.sha1 || \
|
||||
if test ! -f "$(1)$(if $(3),/$(3),)/$$@"; then \
|
||||
PACKAGE=$$(subst .asterisk,asterisk,$$@).tar.gz; \
|
||||
( \
|
||||
rm -f $$(SOUNDS_CACHE_DIR)/$$@ $$(SOUNDS_CACHE_DIR)/$$@.sha1 $$@ $$@.sha1; \
|
||||
echo "Bad checksum: $$@" 1>&2; \
|
||||
exit 1; \
|
||||
) || exit 1
|
||||
endef
|
||||
mkdir -p "$(1)$(if $(3),/$(3),)"; \
|
||||
cd "$(1)$(if $(3),/$(3),)"; \
|
||||
rm -f $$(subst -$(4),,$$@)-*; \
|
||||
cat $$(CURDIR)/$$$${PACKAGE} | gzip -d | tar xof - \
|
||||
) && touch "$(1)$(if $(3),/$(3),)/$$@"; \
|
||||
fi
|
||||
|
||||
asterisk-$(2)$(if $(3),-$(3),)-%.tar.gz: have_download
|
||||
ifneq ($(SOUNDS_CACHE_DIR),)
|
||||
$(CMD_PREFIX) \
|
||||
if test ! -f "$(1)$(if $(3),/$(3),)/.$$(subst .tar.gz,,$$@)"; then \
|
||||
if test ! -d "$$(SOUNDS_CACHE_DIR)/"; then \
|
||||
mkdir -p "$$(SOUNDS_CACHE_DIR)/"; \
|
||||
fi; \
|
||||
if test ! -f "$$(SOUNDS_CACHE_DIR)/$$@"; then \
|
||||
(cd "$$(SOUNDS_CACHE_DIR)"; $$(DOWNLOAD) $$(SOUNDS_URL)/$$@); \
|
||||
fi; \
|
||||
if test ! -f "$$(SOUNDS_CACHE_DIR)/$$@.sha1"; then \
|
||||
(cd "$$(SOUNDS_CACHE_DIR)"; $$(DOWNLOAD) $$(SOUNDS_URL)/$$@.sha1); \
|
||||
fi; \
|
||||
$$(LN) -sf "$$(SOUNDS_CACHE_DIR)/$$@" .; \
|
||||
$$(LN) -sf "$$(SOUNDS_CACHE_DIR)/$$@.sha1" .; \
|
||||
$$(SHA1SUM) -c --status $$@.sha1 || \
|
||||
( \
|
||||
rm -f "$$(SOUNDS_CACHE_DIR)/$$@" "$$(SOUNDS_CACHE_DIR)/$$@.sha1" $$@ $$@.sha1; \
|
||||
echo "Bad checksum: $$@" 1>&2; \
|
||||
exit 1; \
|
||||
) || exit 1; \
|
||||
fi
|
||||
else
|
||||
|
||||
define sound_format_lang_rule
|
||||
$(1)/.asterisk-$(2)$(if $(3),-$(3),)-%: have_download
|
||||
$(CMD_PREFIX)PACKAGE=$$(subst $(1)/.asterisk,asterisk,$$@).tar.gz; \
|
||||
if test ! -f $$$${PACKAGE}; then \
|
||||
$$(DOWNLOAD) $$(SOUNDS_URL)/$$$${PACKAGE} || exit 1; \
|
||||
fi; \
|
||||
rm -f $$(subst -$(4),,$$@)-*; \
|
||||
(cd $(1)$(if $(3),/$(3),); cat $$(CURDIR)/$$$${PACKAGE} | gzip -d | tar xof -) && touch $$@
|
||||
endef
|
||||
|
||||
define sound_download_rule
|
||||
asterisk-$(1)-%.tar.gz: have_download
|
||||
$(CMD_PREFIX)if test ! -f $$@ && test ! -f $$(SOUNDS_DIR)/.$$(subst .tar.gz,,$$@); then \
|
||||
$(CMD_PREFIX) \
|
||||
if test ! -f $$@ && test ! -f "$(1)$(if $(3),/$(3),)/.$$(subst .tar.gz,,$$@)"; then \
|
||||
$$(DOWNLOAD) $$(SOUNDS_URL)/$$@; \
|
||||
fi
|
||||
endef
|
||||
|
||||
endif
|
||||
endef # sound_format_lang_rule
|
||||
|
||||
all: $(SOUNDS_CACHE_DIR) $(CORE_SOUNDS) $(EXTRA_SOUNDS) $(MOH)
|
||||
all: $(CORE_SOUNDS) $(EXTRA_SOUNDS) $(MOH)
|
||||
|
||||
have_download:
|
||||
@if test "$(DOWNLOAD)" = ":" ; then \
|
||||
@@ -169,23 +152,14 @@ $(eval $(call sound_format_lang_rule,$(SOUNDS_DIR),extra-sounds,fr,$(EXTRA_SOUND
|
||||
|
||||
$(eval $(call sound_format_lang_rule,$(MOH_DIR),moh,,$(MOH_VERSION)))
|
||||
|
||||
$(eval $(call sound_download_rule,core-sounds))
|
||||
|
||||
$(eval $(call sound_download_rule,extra-sounds))
|
||||
|
||||
$(eval $(call sound_download_rule,moh))
|
||||
|
||||
dist-clean:
|
||||
rm -f *.tar.gz
|
||||
|
||||
$(SOUNDS_DIR)/en $(MOH_DIR) $(SOUNDS_DIR)/en_AU $(SOUNDS_DIR)/es $(SOUNDS_DIR)/fr $(SOUNDS_DIR)/ru $(SOUNDS_CACHE_DIR):
|
||||
mkdir -p $@
|
||||
|
||||
install: $(SOUNDS_CACHE_DIR) $(SOUNDS_DIR)/en $(SOUNDS_DIR)/en_AU $(SOUNDS_DIR)/es $(SOUNDS_DIR)/fr $(MOH_DIR) $(CORE_SOUND_TAGS) $(EXTRA_SOUND_TAGS) $(MOH_TAGS)
|
||||
install: $(CORE_SOUND_TAGS) $(EXTRA_SOUND_TAGS) $(MOH_TAGS)
|
||||
|
||||
uninstall:
|
||||
rm -rf $(SOUNDS_DIR)
|
||||
rm -rf $(MOH_DIR)
|
||||
rm -rf "$(SOUNDS_DIR)"
|
||||
rm -rf "$(MOH_DIR)"
|
||||
|
||||
core_sounds_version:
|
||||
@echo $(CORE_SOUNDS_VERSION)
|
||||
|
||||
@@ -75,12 +75,12 @@ all: $(UTILS)
|
||||
install:
|
||||
for x in $(UTILS); do \
|
||||
if [ "$$x" != "none" ]; then \
|
||||
$(INSTALL) -m 755 $$x $(DESTDIR)$(ASTSBINDIR)/$$x; \
|
||||
$(INSTALL) -m 755 $$x "$(DESTDIR)$(ASTSBINDIR)/$$x"; \
|
||||
fi; \
|
||||
done
|
||||
|
||||
uninstall:
|
||||
for x in $(ALL_UTILS); do rm -f $(DESTDIR)$(ASTSBINDIR)/$$x; done
|
||||
for x in $(ALL_UTILS); do rm -f "$(DESTDIR)$(ASTSBINDIR)/$$x"; done
|
||||
|
||||
clean:
|
||||
rm -f *.o $(ALL_UTILS) check_expr
|
||||
|
||||
Reference in New Issue
Block a user