summaryrefslogtreecommitdiff
path: root/comms
diff options
context:
space:
mode:
Diffstat (limited to 'comms')
-rw-r--r--comms/asterisk18/Makefile7
-rw-r--r--comms/asterisk18/PLIST10
-rw-r--r--comms/asterisk18/distinfo38
-rw-r--r--comms/asterisk18/options.mk12
-rw-r--r--comms/asterisk18/patches/patch-aa62
-rw-r--r--comms/asterisk18/patches/patch-af10
-rw-r--r--comms/asterisk18/patches/patch-ao8
-rw-r--r--comms/asterisk18/patches/patch-aq163
-rw-r--r--comms/asterisk18/patches/patch-au8
-rw-r--r--comms/asterisk18/patches/patch-ay38
10 files changed, 241 insertions, 115 deletions
diff --git a/comms/asterisk18/Makefile b/comms/asterisk18/Makefile
index a9167bd065e..0777873bc63 100644
--- a/comms/asterisk18/Makefile
+++ b/comms/asterisk18/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.12 2011/08/07 02:40:32 jnemeth Exp $
+# $NetBSD: Makefile,v 1.13 2011/10/11 03:12:55 jnemeth Exp $
#
# NOTE: when updating this package, there are two places that sound
# tarballs need to be checked
-DISTNAME= asterisk-1.8.5.0
-PKGREVISION= 1
+DISTNAME= asterisk-1.8.7.0
DIST_SUBDIR= ${PKGNAME_NOREV}
DISTFILES= ${DEFAULT_DISTFILES}
EXTRACT_ONLY= ${DISTNAME}.tar.gz
@@ -197,7 +196,9 @@ post-install:
${INSTALL_DATA} ${WRKSRC}/UPGRADE-1.6.txt ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
${INSTALL_DATA} ${WRKSRC}/UPGRADE.txt ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
${INSTALL_DATA} ${WRKSRC}/Zaptel-to-DAHDI.txt ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
+ ${INSTALL_DATA} ${WRKSRC}/doc/AST.pdf ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
${INSTALL_DATA} ${WRKSRC}/doc/AST.txt ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
+ ${INSTALL_DATA} ${WRKSRC}/doc/IAX2-security.pdf ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
${INSTALL_DATA} ${WRKSRC}/doc/IAX2-security.txt ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
${INSTALL_DATA} ${WRKSRC}/doc/README.txt ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
${INSTALL_DATA} ${WRKSRC}/doc/api-1.6.2-changes.txt ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
diff --git a/comms/asterisk18/PLIST b/comms/asterisk18/PLIST
index 8834a3d72ed..b2fae38b0c6 100644
--- a/comms/asterisk18/PLIST
+++ b/comms/asterisk18/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2011/07/16 21:35:11 jnemeth Exp $
+@comment $NetBSD: PLIST,v 1.7 2011/10/11 03:12:55 jnemeth Exp $
include/asterisk.h
include/asterisk/_private.h
include/asterisk/abstract_jb.h
@@ -348,7 +348,7 @@ libdata/asterisk/phoneprov/000000000000.cfg
libdata/asterisk/phoneprov/polycom.xml
libdata/asterisk/phoneprov/polycom_line.xml
libdata/asterisk/phoneprov/snom-mac.xml
-libdata/asterisk/sounds/.asterisk-core-sounds-en-gsm-1.4.21
+libdata/asterisk/sounds/en/.asterisk-core-sounds-en-gsm-1.4.21
libdata/asterisk/sounds/en/1-for-am-2-for-pm.gsm
libdata/asterisk/sounds/en/1-yes-2-no.gsm
libdata/asterisk/sounds/en/CHANGES-asterisk-core-en-1.4.21
@@ -2122,12 +2122,14 @@ sbin/astgenkey
sbin/autosupport
sbin/rasterisk
sbin/safe_asterisk
+share/doc/asterisk/AST.pdf
share/doc/asterisk/AST.txt
share/doc/asterisk/BUGS
share/doc/asterisk/CHANGES
share/doc/asterisk/COPYING
share/doc/asterisk/CREDITS
share/doc/asterisk/ChangeLog
+share/doc/asterisk/IAX2-security.pdf
share/doc/asterisk/IAX2-security.txt
share/doc/asterisk/LICENSE
share/doc/asterisk/README
@@ -2239,10 +2241,6 @@ share/examples/asterisk/vpb.conf
share/examples/rc.d/asterisk
${PLIST.webvmail}share/httpd/htdocs/_asterisk/animlogo.gif
${PLIST.webvmail}share/httpd/htdocs/_asterisk/play.gif
-@pkgdir libdata/asterisk/sounds/ru
-@pkgdir libdata/asterisk/sounds/fr
-@pkgdir libdata/asterisk/sounds/es
-@pkgdir libdata/asterisk/sounds/en_AU
@pkgdir libdata/asterisk/keys
@pkgdir libdata/asterisk/firmware/iax
@pkgdir libdata/asterisk/documentation/thirdparty
diff --git a/comms/asterisk18/distinfo b/comms/asterisk18/distinfo
index 2aed9d99e23..48ae7b33fe3 100644
--- a/comms/asterisk18/distinfo
+++ b/comms/asterisk18/distinfo
@@ -1,36 +1,36 @@
-$NetBSD: distinfo,v 1.12 2011/07/16 21:35:11 jnemeth Exp $
+$NetBSD: distinfo,v 1.13 2011/10/11 03:12:55 jnemeth Exp $
-SHA1 (asterisk-1.8.5.0/asterisk-1.8.5.0.tar.gz) = 9e29581deea773c2537f5c01a43823211688412a
-RMD160 (asterisk-1.8.5.0/asterisk-1.8.5.0.tar.gz) = c841993f914bd150696b9163a1cc1d1828f45e4a
-Size (asterisk-1.8.5.0/asterisk-1.8.5.0.tar.gz) = 27417584 bytes
-SHA1 (asterisk-1.8.5.0/asterisk-extra-sounds-en-gsm-1.4.11.tar.gz) = 8692fa61423b4769dc8bfa78faf9ed5ef7a259b9
-RMD160 (asterisk-1.8.5.0/asterisk-extra-sounds-en-gsm-1.4.11.tar.gz) = 68170c769d739d6b5b35b00f999ad6bbf876f9f6
-Size (asterisk-1.8.5.0/asterisk-extra-sounds-en-gsm-1.4.11.tar.gz) = 3349898 bytes
-SHA1 (asterisk-1.8.5.0/extract-cfile.awk) = c4f08eee1ab83c041bde1ab91672a4a3c43c28b8
-RMD160 (asterisk-1.8.5.0/extract-cfile.awk) = cd59f8e5807732023d5aec95187e2d5572f400a4
-Size (asterisk-1.8.5.0/extract-cfile.awk) = 667 bytes
-SHA1 (asterisk-1.8.5.0/rfc3951.txt) = 1a6c769be750fb02456d60db2470909254496017
-RMD160 (asterisk-1.8.5.0/rfc3951.txt) = 15f7ec61653ec9953172f8f2150e7d8f6f620926
-Size (asterisk-1.8.5.0/rfc3951.txt) = 373442 bytes
-SHA1 (patch-aa) = bdaacb8b7b93886399b53cdda8a4ac7f827f50d5
-SHA1 (patch-af) = ebad62fcb31b600d30235cc5e93284c93b2c8af9
+SHA1 (asterisk-1.8.7.0/asterisk-1.8.7.0.tar.gz) = e28ad2f52a227acc7ec6d6952f3fd41baecd6292
+RMD160 (asterisk-1.8.7.0/asterisk-1.8.7.0.tar.gz) = 84b7e2f49e1dc78c32649cc0786e6fea1bd2c9b5
+Size (asterisk-1.8.7.0/asterisk-1.8.7.0.tar.gz) = 27828568 bytes
+SHA1 (asterisk-1.8.7.0/asterisk-extra-sounds-en-gsm-1.4.11.tar.gz) = 8692fa61423b4769dc8bfa78faf9ed5ef7a259b9
+RMD160 (asterisk-1.8.7.0/asterisk-extra-sounds-en-gsm-1.4.11.tar.gz) = 68170c769d739d6b5b35b00f999ad6bbf876f9f6
+Size (asterisk-1.8.7.0/asterisk-extra-sounds-en-gsm-1.4.11.tar.gz) = 3349898 bytes
+SHA1 (asterisk-1.8.7.0/extract-cfile.txt) = b22874814c83a53bcd1a8d96b5911304f304971e
+RMD160 (asterisk-1.8.7.0/extract-cfile.txt) = e7205fe7e95793f3ca6e384edeef1ad5713485e0
+Size (asterisk-1.8.7.0/extract-cfile.txt) = 643 bytes
+SHA1 (asterisk-1.8.7.0/rfc3951.txt) = 1a6c769be750fb02456d60db2470909254496017
+RMD160 (asterisk-1.8.7.0/rfc3951.txt) = 15f7ec61653ec9953172f8f2150e7d8f6f620926
+Size (asterisk-1.8.7.0/rfc3951.txt) = 373442 bytes
+SHA1 (patch-aa) = 496565e1e567c42ab6ba8f996c506f52cb9c8cfe
+SHA1 (patch-af) = 19786616bb606c38f769ec85f2e4d118573659ab
SHA1 (patch-ag) = c71c61350cefbbe53eefa99245ca7712753f22d5
SHA1 (patch-ai) = e92edab5c1ff323478f41d0b0783102ed527fe39
SHA1 (patch-ak) = adee75b7716a8794de1b8cb054af7a5a8f0e5ffd
SHA1 (patch-al) = b2a1134786d7c3b118ee8c47892f91dd2a4c783a
SHA1 (patch-am) = 5f9cbf47ec1cb66758492a5ed1bf843006eae9b7
SHA1 (patch-an) = 93a5df66fd6459fb76e9191dc3bf37b9ee5483b5
-SHA1 (patch-ao) = 0663a698469550b22bb97ee1b18980bc2bc67495
+SHA1 (patch-ao) = aa95464a8bd4a417f313541b465142d2e4c3ee47
SHA1 (patch-ap) = ed22f6483191f429389c0d3198d30c63b96d4df6
-SHA1 (patch-aq) = b5b448df41c3751dda6340006811cb35dd304d34
+SHA1 (patch-aq) = 85b400968bcd79a74ff5a87636dbf2c8be97e8d9
SHA1 (patch-ar) = da8e614e68e476ce32c66fed5ee9dcb8c5f9a060
SHA1 (patch-as) = b2e1aadf49f20506243ab40796f15aab12d95bad
SHA1 (patch-at) = df318d7b492121ff6f766b0e6ea73415293e96f0
-SHA1 (patch-au) = 3f69f8bcea685f13008430c0fcb91885b6b72c90
+SHA1 (patch-au) = 773398e719dca34640dcdc190857872da1ad7b4f
SHA1 (patch-av) = 3424013b5bf22624aa664e972e2b495ab3296cbe
SHA1 (patch-aw) = 0534acd67ea5da1eee8cf282035ebf4c559278ab
SHA1 (patch-ax) = 3b41e66a8c926e0afc4f73587e3557370e6c5f6e
-SHA1 (patch-ay) = 7c73c7664ea36b4c34cf38cde8a93c95b55a68aa
+SHA1 (patch-ay) = 99dd751ebaa3107abd4d5b0e0353f6b8c59a0122
SHA1 (patch-az) = 64365b12cb47ec0fba358e4326eda172f96068cf
SHA1 (patch-ba) = ffb20f4788f2f253e822fb48c68fec04c31b0619
SHA1 (patch-bb) = bf1a2bb2ba1eb2ba44a9b26fa9ae0468510a1575
diff --git a/comms/asterisk18/options.mk b/comms/asterisk18/options.mk
index f8396cf1180..dc497e03bfe 100644
--- a/comms/asterisk18/options.mk
+++ b/comms/asterisk18/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.5 2011/10/11 02:13:40 jnemeth Exp $
+# $NetBSD: options.mk,v 1.6 2011/10/11 03:12:55 jnemeth Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.asterisk
PKG_SUPPORTED_OPTIONS= zaptel x11 unixodbc ilbc webvmail ldap spandsp
@@ -44,9 +44,9 @@ CONFIGURE_ARGS+= --without-unixodbc
.if !empty(PKG_OPTIONS:Milbc)
DISTFILES+= rfc3951.txt
SITES.rfc3951.txt= http://www.ietf.org/rfc/
-DISTFILES+= extract-cfile.awk
-SITES.extract-cfile.awk= http://www.ilbcfreeware.org/documentation/
-USE_TOOLS+= awk
+DISTFILES+= extract-cfile.txt
+SITES.extract-cfile.txt= http://www.ilbcfreeware.org/documentation/
+USE_TOOLS+= awk tr
PLIST.ilbc= yes
.endif
@@ -76,8 +76,8 @@ post-configure:
post-extract:
.if !empty(PKG_OPTIONS:Milbc)
cp ${DISTDIR}/${DIST_SUBDIR}/rfc3951.txt ${WRKSRC}/codecs/ilbc
- cp ${DISTDIR}/${DIST_SUBDIR}/extract-cfile.awk ${WRKSRC}/codecs/ilbc
- cd ${WRKSRC}/codecs/ilbc && ${AWK} -f extract-cfile.awk < rfc3951.txt
+ cp ${DISTDIR}/${DIST_SUBDIR}/extract-cfile.txt ${WRKSRC}/codecs/ilbc
+ cd ${WRKSRC}/codecs/ilbc && ${TR} -d '\r' < extract-cfile.txt | ${AWK} -f - rfc3951.txt
.endif
.if !empty(PKG_OPTIONS:Mwebvmail)
diff --git a/comms/asterisk18/patches/patch-aa b/comms/asterisk18/patches/patch-aa
index 3c12223c6c6..8c2b0ce6513 100644
--- a/comms/asterisk18/patches/patch-aa
+++ b/comms/asterisk18/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.3 2011/07/16 21:35:11 jnemeth Exp $
+$NetBSD: patch-aa,v 1.4 2011/10/11 03:12:55 jnemeth Exp $
---- Makefile.orig 2011-06-16 15:58:22.000000000 +0000
+--- Makefile.orig 2011-08-25 19:00:55.000000000 +0000
+++ Makefile
@@ -126,7 +126,7 @@ DEBUG=-g3
@@ -36,10 +36,10 @@ $NetBSD: patch-aa,v 1.3 2011/07/16 21:35:11 jnemeth Exp $
-datafiles: _all doc/core-en_US.xml
+datafiles: 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
-@@ -517,7 +512,7 @@ OLDHEADERS=$(filter-out $(NEWHEADERS),$(
+@@ -517,7 +512,7 @@ OLDHEADERS=$(filter-out $(NEWHEADERS) $(
installdirs:
$(INSTALL) -d "$(DESTDIR)$(MODULES_DIR)"
$(INSTALL) -d "$(DESTDIR)$(ASTSBINDIR)"
@@ -48,31 +48,31 @@ $NetBSD: patch-aa,v 1.3 2011/07/16 21:35:11 jnemeth Exp $
$(INSTALL) -d "$(DESTDIR)$(ASTVARRUNDIR)"
$(INSTALL) -d "$(DESTDIR)$(ASTSPOOLDIR)"
$(INSTALL) -d "$(DESTDIR)$(ASTSPOOLDIR)/dictate"
-@@ -545,7 +540,7 @@ installdirs:
+@@ -546,7 +541,7 @@ installdirs:
$(INSTALL) -d "$(DESTDIR)$(AGI_DIR)"
$(INSTALL) -d "$(DESTDIR)$(ASTDBDIR)"
-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)/
-@@ -637,21 +632,21 @@ upgrade: bininstall
+ $(INSTALL) -m 755 main/asterisk "$(DESTDIR)$(ASTSBINDIR)/"
+ $(LN) -sf asterisk "$(DESTDIR)$(ASTSBINDIR)/rasterisk"
+ $(INSTALL) -m 755 contrib/scripts/astgenkey "$(DESTDIR)$(ASTSBINDIR)/"
+@@ -638,21 +633,21 @@ upgrade: bininstall
# XXX why *.adsi is installed first ?
adsi:
@echo Installing adsi config files...
-- $(INSTALL) -d $(DESTDIR)$(ASTETCDIR)
-+ $(INSTALL) -d $(DESTDIR)$(ASTEXAMPLEDIR)
+- $(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 \
+ 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` ; \
+- $(INSTALL) -m 644 "$$x" "$(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x`" ; \
++ $(INSTALL) -m 644 "$$x" "$(DESTDIR)$(ASTEXAMPLEDIR)/`$(BASENAME) $$x`" ; \
done
samples: adsi
@@ -80,32 +80,32 @@ $NetBSD: patch-aa,v 1.3 2011/07/16 21:35:11 jnemeth Exp $
@for x in configs/*.sample; do \
- dst="$(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample`" ; \
+ dst="$(DESTDIR)$(ASTEXAMPLEDIR)/`$(BASENAME) $$x .sample`" ; \
- if [ -f $${dst} ]; then \
+ if [ -f "$${dst}" ]; then \
if [ "$(OVERWRITE)" = "y" ]; then \
- if cmp -s $${dst} $$x ; then \
-@@ -679,9 +674,9 @@ samples: adsi
+ if cmp -s "$${dst}" "$$x" ; then \
+@@ -680,9 +675,9 @@ 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)$(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 ; \
+- "$(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)"
-@@ -707,7 +702,7 @@ samples: adsi
+ $(INSTALL) -d "$(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX"
+ build_tools/make_sample_voicemail "$(DESTDIR)/$(ASTDATADIR)" "$(DESTDIR)/$(ASTSPOOLDIR)"
+@@ -708,7 +703,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 )
+ @[ -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
+ $(INSTALL) -d "$(DESTDIR)$(HTTP_DOCSDIR)/_asterisk"
for x in images/*.gif; do \
$(INSTALL) -m 644 $$x "$(DESTDIR)$(HTTP_DOCSDIR)/_asterisk/"; \
-@@ -860,7 +855,7 @@ uninstall-all: _uninstall
+@@ -861,7 +856,7 @@ uninstall-all: _uninstall
rm -rf "$(DESTDIR)$(ASTVARLIBDIR)"
rm -rf "$(DESTDIR)$(ASTDATADIR)"
rm -rf "$(DESTDIR)$(ASTSPOOLDIR)"
@@ -114,7 +114,7 @@ $NetBSD: patch-aa,v 1.3 2011/07/16 21:35:11 jnemeth Exp $
rm -rf "$(DESTDIR)$(ASTLOGDIR)"
menuconfig: menuselect
-@@ -929,6 +924,7 @@ menuselect-tree: $(foreach dir,$(filter-
+@@ -930,6 +925,7 @@ menuselect-tree: $(foreach dir,$(filter-
@echo "</menu>" >> $@
.PHONY: menuselect
diff --git a/comms/asterisk18/patches/patch-af b/comms/asterisk18/patches/patch-af
index 9a1066c6df9..802ece121b7 100644
--- a/comms/asterisk18/patches/patch-af
+++ b/comms/asterisk18/patches/patch-af
@@ -1,8 +1,6 @@
-$NetBSD: patch-af,v 1.1.1.1 2010/12/15 03:22:45 jnemeth Exp $
+$NetBSD: patch-af,v 1.2 2011/10/11 03:12:55 jnemeth Exp $
-Index: utils/Makefile
-===================================================================
---- utils/Makefile.orig 2010-04-22 22:10:17.000000000 +0000
+--- utils/Makefile.orig 2011-08-17 19:21:36.000000000 +0000
+++ utils/Makefile
@@ -41,6 +41,10 @@ ifeq ($(OSARCH),SunOS)
UTILS:=$(filter-out muted,$(UTILS))
@@ -19,8 +17,8 @@ Index: utils/Makefile
install:
for x in $(UTILS); do \
if [ "$$x" != "none" ]; then \
-- $(INSTALL) -m 755 $$x $(DESTDIR)$(ASTSBINDIR)/$$x; \
-+ $(BSD_INSTALL_PROGRAM) -m 755 $$x $(DESTDIR)$(ASTSBINDIR)/$$x; \
+- $(INSTALL) -m 755 $$x "$(DESTDIR)$(ASTSBINDIR)/$$x"; \
++ $(BSD_INSTALL_PROGRAM) -m 755 $$x "$(DESTDIR)$(ASTSBINDIR)/$$x"; \
fi; \
done
diff --git a/comms/asterisk18/patches/patch-ao b/comms/asterisk18/patches/patch-ao
index 265e18c8240..a9cfe177bb2 100644
--- a/comms/asterisk18/patches/patch-ao
+++ b/comms/asterisk18/patches/patch-ao
@@ -1,8 +1,8 @@
-$NetBSD: patch-ao,v 1.1.1.1 2010/12/15 03:22:45 jnemeth Exp $
+$NetBSD: patch-ao,v 1.2 2011/10/11 03:12:55 jnemeth Exp $
---- build_tools/mkpkgconfig.orig 2007-08-22 11:54:30.000000000 -0700
+--- build_tools/mkpkgconfig.orig 2011-08-25 15:27:06.000000000 +0000
+++ build_tools/mkpkgconfig
-@@ -21,12 +25,15 @@ else
+@@ -21,12 +21,15 @@ else
fi
## Clean out CFLAGS for the spec file.
@@ -19,4 +19,4 @@ $NetBSD: patch-ao,v 1.1.1.1 2010/12/15 03:22:45 jnemeth Exp $
+ ${EXTREGEX} "s;${WRKSRC};${PREFIX};g"`
- cat <<EOF > $PPATH/asterisk.pc
+ cat <<EOF > "$PPATH/asterisk.pc"
diff --git a/comms/asterisk18/patches/patch-aq b/comms/asterisk18/patches/patch-aq
index 83ecfe077b9..ff59ac43576 100644
--- a/comms/asterisk18/patches/patch-aq
+++ b/comms/asterisk18/patches/patch-aq
@@ -1,13 +1,142 @@
-$NetBSD: patch-aq,v 1.5 2011/06/09 09:17:27 jnemeth Exp $
+$NetBSD: patch-aq,v 1.6 2011/10/11 03:12:55 jnemeth Exp $
---- configure.orig 2011-01-27 17:03:01.000000000 +0000
+--- configure.orig 2011-09-19 16:57:40.000000000 +0000
+++ configure
-@@ -16429,6 +16429,17 @@ fi
+@@ -22644,6 +22644,146 @@ fi
-+ac_fn_c_check_header_mongrel "$LINENO" "sys/atomic.h" "ac_cv_header_sys_atomic_h" "$ac_includes_default"
-+if test "x$ac_cv_header_sys_atomic_h" = x""yes; then :
++if test "${ac_cv_header_sys_atomic_h+set}" = set; then
++ { echo "$as_me:$LINENO: checking for sys/atomic.h" >&5
++echo $ECHO_N "checking for sys/atomic.h... $ECHO_C" >&6; }
++if test "${ac_cv_header_sys_atomic_h+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++fi
++{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_atomic_h" >&5
++echo "${ECHO_T}$ac_cv_header_sys_atomic_h" >&6; }
++else
++ # Is the header compilable?
++{ echo "$as_me:$LINENO: checking sys/atomic.h usability" >&5
++echo $ECHO_N "checking sys/atomic.h usability... $ECHO_C" >&6; }
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++$ac_includes_default
++#include <sys/atomic.h>
++_ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest.$ac_objext; then
++ ac_header_compiler=yes
++else
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ ac_header_compiler=no
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
++
++# Is the header present?
++{ echo "$as_me:$LINENO: checking sys/atomic.h presence" >&5
++echo $ECHO_N "checking sys/atomic.h presence... $ECHO_C" >&6; }
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++#include <sys/atomic.h>
++_ACEOF
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } >/dev/null && {
++ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ }; then
++ ac_header_preproc=yes
++else
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ ac_header_preproc=no
++fi
++
++rm -f conftest.err conftest.$ac_ext
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
++
++# So? What about this header?
++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
++ yes:no: )
++ { echo "$as_me:$LINENO: WARNING: sys/atomic.h: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: sys/atomic.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
++ { echo "$as_me:$LINENO: WARNING: sys/atomic.h: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: sys/atomic.h: proceeding with the compiler's result" >&2;}
++ ac_header_preproc=yes
++ ;;
++ no:yes:* )
++ { echo "$as_me:$LINENO: WARNING: sys/atomic.h: present but cannot be compiled" >&5
++echo "$as_me: WARNING: sys/atomic.h: present but cannot be compiled" >&2;}
++ { echo "$as_me:$LINENO: WARNING: sys/atomic.h: check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: sys/atomic.h: check for missing prerequisite headers?" >&2;}
++ { echo "$as_me:$LINENO: WARNING: sys/atomic.h: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: sys/atomic.h: see the Autoconf documentation" >&2;}
++ { echo "$as_me:$LINENO: WARNING: sys/atomic.h: section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: sys/atomic.h: section \"Present But Cannot Be Compiled\"" >&2;}
++ { echo "$as_me:$LINENO: WARNING: sys/atomic.h: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: sys/atomic.h: proceeding with the preprocessor's result" >&2;}
++ { echo "$as_me:$LINENO: WARNING: sys/atomic.h: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: sys/atomic.h: in the future, the compiler will take precedence" >&2;}
++ ( cat <<\_ASBOX
++## ------------------------------------------ ##
++## Report this to https://issues.asterisk.org ##
++## ------------------------------------------ ##
++_ASBOX
++ ) | sed "s/^/$as_me: WARNING: /" >&2
++ ;;
++esac
++{ echo "$as_me:$LINENO: checking for sys/atomic.h" >&5
++echo $ECHO_N "checking for sys/atomic.h... $ECHO_C" >&6; }
++if test "${ac_cv_header_sys_atomic_h+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ ac_cv_header_sys_atomic_h=$ac_header_preproc
++fi
++{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_atomic_h" >&5
++echo "${ECHO_T}$ac_cv_header_sys_atomic_h" >&6; }
++
++fi
++if test $ac_cv_header_sys_atomic_h = yes; then
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_SYS_ATOMIC_H 1
@@ -17,21 +146,21 @@ $NetBSD: patch-aq,v 1.5 2011/06/09 09:17:27 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]];'.
-@@ -17540,6 +17551,8 @@ $as_echo_n "checking if \"struct ifaddrs
-
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ { echo "$as_me:$LINENO: checking for int" >&5
+ echo $ECHO_N "checking for int... $ECHO_C" >&6; }
+ if test "${ac_cv_type_int+set}" = set; then
+@@ -27486,6 +27626,8 @@ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-+ #include <sys/types.h>
-+ #include <sys/socket.h>
- #include <ifaddrs.h>
++#include <sys/types.h>
++#include <sys/socket.h>
+ #include <ifaddrs.h>
int
main ()
-@@ -28885,9 +28898,8 @@ if test "x$ac_cv_file__sbin_launchd" = x
-
- $as_echo "#define HAVE_SBIN_LAUNCHD 1" >>confdefs.h
+@@ -53846,9 +53988,8 @@ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_SBIN_LAUNCHD 1
+ _ACEOF
+PBX_LAUNCHD=1
fi
diff --git a/comms/asterisk18/patches/patch-au b/comms/asterisk18/patches/patch-au
index 2826005fda8..7ef32187c3d 100644
--- a/comms/asterisk18/patches/patch-au
+++ b/comms/asterisk18/patches/patch-au
@@ -1,9 +1,9 @@
-$NetBSD: patch-au,v 1.2 2011/06/09 09:17:27 jnemeth Exp $
+$NetBSD: patch-au,v 1.3 2011/10/11 03:12:55 jnemeth Exp $
---- sounds/Makefile.orig 2010-12-29 19:28:36.000000000 +0000
+--- sounds/Makefile.orig 2011-09-19 16:57:40.000000000 +0000
+++ sounds/Makefile
-@@ -150,20 +150,6 @@ prefixcmd:
- @$(PREFIXCMD)
+@@ -119,20 +119,6 @@ endef # sound_format_lang_rule
+ all: $(CORE_SOUNDS) $(EXTRA_SOUNDS) $(MOH)
have_download:
- @if test "$(DOWNLOAD)" = ":" ; then \
diff --git a/comms/asterisk18/patches/patch-ay b/comms/asterisk18/patches/patch-ay
index bf892da4e4a..cc72e1d79cd 100644
--- a/comms/asterisk18/patches/patch-ay
+++ b/comms/asterisk18/patches/patch-ay
@@ -1,8 +1,8 @@
-$NetBSD: patch-ay,v 1.2 2011/07/16 21:35:11 jnemeth Exp $
+$NetBSD: patch-ay,v 1.3 2011/10/11 03:12:55 jnemeth Exp $
---- main/features.c.orig 2011-06-23 18:23:21.000000000 +0000
+--- main/features.c.orig 2011-08-16 16:31:36.000000000 +0000
+++ main/features.c
-@@ -1154,14 +1154,14 @@ static int park_call_full(struct ast_cha
+@@ -1454,14 +1454,14 @@ static int park_call_full(struct ast_cha
"Channel: %s\r\n"
"Parkinglot: %s\r\n"
"From: %s\r\n"
@@ -19,7 +19,7 @@ $NetBSD: patch-ay,v 1.2 2011/07/16 21:35:11 jnemeth Exp $
S_COR(pu->chan->caller.id.number.valid, pu->chan->caller.id.number.str, "<unknown>"),
S_COR(pu->chan->caller.id.name.valid, pu->chan->caller.id.name.str, "<unknown>"),
S_COR(pu->chan->connected.id.number.valid, pu->chan->connected.id.number.str, "<unknown>"),
-@@ -1627,7 +1627,7 @@ static int builtin_automonitor(struct as
+@@ -1908,7 +1908,7 @@ static int builtin_automonitor(struct as
len = strlen(touch_monitor) + 50;
args = alloca(len);
touch_filename = alloca(len);
@@ -28,7 +28,7 @@ $NetBSD: patch-ay,v 1.2 2011/07/16 21:35:11 jnemeth Exp $
snprintf(args, len, "%s,%s,m", S_OR(touch_format, "wav"), touch_filename);
} else {
caller_chan_id = ast_strdupa(S_COR(caller_chan->caller.id.number.valid,
-@@ -1637,7 +1637,7 @@ static int builtin_automonitor(struct as
+@@ -1918,7 +1918,7 @@ static int builtin_automonitor(struct as
len = strlen(caller_chan_id) + strlen(callee_chan_id) + 50;
args = alloca(len);
touch_filename = alloca(len);
@@ -37,7 +37,7 @@ $NetBSD: patch-ay,v 1.2 2011/07/16 21:35:11 jnemeth Exp $
snprintf(args, len, "%s,%s,m", S_OR(touch_format, "wav"), touch_filename);
}
-@@ -1743,7 +1743,7 @@ static int builtin_automixmonitor(struct
+@@ -2024,7 +2024,7 @@ static int builtin_automixmonitor(struct
len = strlen(touch_monitor) + 50;
args = alloca(len);
touch_filename = alloca(len);
@@ -46,7 +46,7 @@ $NetBSD: patch-ay,v 1.2 2011/07/16 21:35:11 jnemeth Exp $
snprintf(args, len, "%s.%s,b", touch_filename, (touch_format) ? touch_format : "wav");
} else {
caller_chan_id = ast_strdupa(S_COR(caller_chan->caller.id.number.valid,
-@@ -1753,7 +1753,7 @@ static int builtin_automixmonitor(struct
+@@ -2034,7 +2034,7 @@ static int builtin_automixmonitor(struct
len = strlen(caller_chan_id) + strlen(callee_chan_id) + 50;
args = alloca(len);
touch_filename = alloca(len);
@@ -55,20 +55,20 @@ $NetBSD: patch-ay,v 1.2 2011/07/16 21:35:11 jnemeth Exp $
snprintf(args, len, "%s.%s,b", touch_filename, S_OR(touch_format, "wav"));
}
-@@ -5552,10 +5552,10 @@ static char *handle_parkedcalls(struct a
+@@ -6752,10 +6752,10 @@ static char *handle_parkedcalls(struct a
AST_LIST_LOCK(&curlot->parkings);
AST_LIST_TRAVERSE(&curlot->parkings, cur, list) {
-- ast_cli(a->fd, "%-10.10s %25s (%-15s %-12s %-4d) %6lds\n"
-+ ast_cli(a->fd, "%-10.10s %25s (%-15s %-12s %-4d) %6jds\n"
- ,cur->parkingexten, cur->chan->name, cur->context, cur->exten
- ,cur->priority,
-- (long)(cur->start.tv_sec + (cur->parkingtime/1000) - time(NULL)) );
-+ (intmax_t)(cur->start.tv_sec + (cur->parkingtime/1000) - time(NULL)) );
- numparked++;
- numparked += lotparked;
+- ast_cli(a->fd, "%-10.10s %-25s (%-15s %-12s %4d) %6lds\n",
++ ast_cli(a->fd, "%-10.10s %-25s (%-15s %-12s %4d) %6jds\n",
+ cur->parkingexten, cur->chan->name, cur->context, cur->exten,
+ cur->priority,
+- (long) (cur->start.tv_sec + (cur->parkingtime / 1000) - time(NULL)));
++ (intmax_t) (cur->start.tv_sec + (cur->parkingtime / 1000) - time(NULL)));
+ ++lotparked;
}
-@@ -5607,7 +5607,7 @@ static int manager_parking_status(struct
+ AST_LIST_UNLOCK(&curlot->parkings);
+@@ -6811,7 +6811,7 @@ static int manager_parking_status(struct
"Exten: %d\r\n"
"Channel: %s\r\n"
"From: %s\r\n"
@@ -77,9 +77,9 @@ $NetBSD: patch-ay,v 1.2 2011/07/16 21:35:11 jnemeth Exp $
"CallerIDNum: %s\r\n"
"CallerIDName: %s\r\n"
"ConnectedLineNum: %s\r\n"
-@@ -5615,7 +5615,7 @@ static int manager_parking_status(struct
- "%s"
+@@ -6820,7 +6820,7 @@ static int manager_parking_status(struct
"\r\n",
+ curlot->name,
cur->parkingnum, cur->chan->name, cur->peername,
- (long) cur->start.tv_sec + (long) (cur->parkingtime / 1000) - (long) time(NULL),
+ (intmax_t) cur->start.tv_sec + (intmax_t) (cur->parkingtime / 1000) - (intmax_t) time(NULL),
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-30 10:22:50 +0000