Date: Mon, 24 Sep 2018 07:02:16 +0000 (UTC) From: Guido Falsi <madpilot@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r480550 - in branches/2018Q3/net: asterisk13 asterisk13/files asterisk15 asterisk15/files Message-ID: <201809240702.w8O72Ghi097082@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: madpilot Date: Mon Sep 24 07:02:16 2018 New Revision: 480550 URL: https://svnweb.freebsd.org/changeset/ports/480550 Log: MFH: r474540 r479103 r480266 - Update asterisk13 to 13.22.0 - Update asterisk15 to 15.5.0 - Update asterisk13 to 13.23.0 - Update asterisk15 to 15.6.0 - Update asterisk13 to 13.23.1 - Update asterisk15 to 15.6.1 Security: 77f67b46-bd75-11e8-81b6-001999f8d30b Approved by: ports-secteam (miwi) Modified: branches/2018Q3/net/asterisk13/Makefile branches/2018Q3/net/asterisk13/distinfo branches/2018Q3/net/asterisk13/files/patch-Makefile branches/2018Q3/net/asterisk15/Makefile branches/2018Q3/net/asterisk15/distinfo branches/2018Q3/net/asterisk15/files/patch-Makefile Directory Properties: branches/2018Q3/ (props changed) Modified: branches/2018Q3/net/asterisk13/Makefile ============================================================================== --- branches/2018Q3/net/asterisk13/Makefile Mon Sep 24 06:59:56 2018 (r480549) +++ branches/2018Q3/net/asterisk13/Makefile Mon Sep 24 07:02:16 2018 (r480550) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= asterisk -PORTVERSION= 13.21.1 +PORTVERSION= 13.23.1 CATEGORIES= net MASTER_SITES= https://downloads.asterisk.org/pub/telephony/%SUBDIR%/:DEFAULT,g729 MASTER_SITE_SUBDIR= asterisk/ \ Modified: branches/2018Q3/net/asterisk13/distinfo ============================================================================== --- branches/2018Q3/net/asterisk13/distinfo Mon Sep 24 06:59:56 2018 (r480549) +++ branches/2018Q3/net/asterisk13/distinfo Mon Sep 24 07:02:16 2018 (r480550) @@ -1,6 +1,6 @@ -TIMESTAMP = 1528757881 -SHA256 (asterisk-13.21.1.tar.gz) = 013f61155bb53c14c8244d8d4779df931fa4a139895d7a420db99c5f339024df -SIZE (asterisk-13.21.1.tar.gz) = 32980220 +TIMESTAMP = 1537517931 +SHA256 (asterisk-13.23.1.tar.gz) = c772acbfdddb9250bfe07f7e20a7efb6a79a6c123832727429486c78d44fc78c +SIZE (asterisk-13.23.1.tar.gz) = 33064056 SHA256 (asterisk-core-sounds-en-g729-1.5.tar.gz) = 8b28a59cfa53b59c76e0a191704f0708e3d83acffab8c5e6f25dfc599f0123f9 SIZE (asterisk-core-sounds-en-g729-1.5.tar.gz) = 1551123 SHA256 (asterisk-moh-opsound-g729-2.03.tar.gz) = 0147ca9a97f0c550227aacb7793499057c4d2c64e021c95f93722f27d5549585 Modified: branches/2018Q3/net/asterisk13/files/patch-Makefile ============================================================================== --- branches/2018Q3/net/asterisk13/files/patch-Makefile Mon Sep 24 06:59:56 2018 (r480549) +++ branches/2018Q3/net/asterisk13/files/patch-Makefile Mon Sep 24 07:02:16 2018 (r480550) @@ -1,6 +1,6 @@ ---- Makefile.orig 2017-10-13 17:46:56 UTC +--- Makefile.orig 2018-08-28 19:07:13 UTC +++ Makefile -@@ -138,7 +138,7 @@ ASTTOPDIR:=$(subst $(space),\$(space),$(CURDIR)) +@@ -141,7 +141,7 @@ ASTTOPDIR:=$(subst $(space),\$(space),$(CURDIR)) OVERWRITE=y # Include debug and macro symbols in the executables (-g) and profiling info (-pg) @@ -9,7 +9,7 @@ # Asterisk.conf is located in ASTETCDIR or by using the -C flag # when starting Asterisk -@@ -162,7 +162,7 @@ LINKER_SYMBOL_PREFIX= +@@ -165,7 +165,7 @@ LINKER_SYMBOL_PREFIX= #_ASTCFLAGS+=-DOLD_DSP_ROUTINES # Default install directory for DAHDI hooks. @@ -18,7 +18,7 @@ # This Makefile previously contained a note about the ability to use .asterisk.makeopts # from your home directory or /etc/asterisk.makeopts to set defaults for menuselect. -@@ -219,7 +219,7 @@ endif +@@ -226,7 +226,7 @@ endif ifeq ($(OSARCH),FreeBSD) # -V is understood by BSD Make, not by GNU make. @@ -27,7 +27,7 @@ _ASTCFLAGS+=$(shell if test $(BSDVERSION) -lt 500016 ; then echo "-D_THREAD_SAFE"; fi) endif -@@ -445,8 +445,12 @@ datafiles: _all doc/core-en_US.xml +@@ -466,8 +466,12 @@ endif $(INSTALL) -m 644 $$n "$(DESTDIR)$(ASTDATADIR)/static-http/docs" ; \ done \ fi @@ -41,7 +41,7 @@ done $(MAKE) -C sounds install find rest-api -name "*.json" | while read x; do \ -@@ -541,7 +545,7 @@ INSTALLDIRS="$(ASTLIBDIR)" "$(ASTMODDIR)" "$(ASTSBINDI +@@ -566,7 +570,7 @@ INSTALLDIRS="$(ASTLIBDIR)" "$(ASTMODDIR)" "$(ASTSBINDI "$(ASTDATADIR)/firmware/iax" "$(ASTDATADIR)/images" "$(ASTDATADIR)/keys" \ "$(ASTDATADIR)/phoneprov" "$(ASTDATADIR)/rest-api" "$(ASTDATADIR)/static-http" \ "$(ASTDATADIR)/sounds" "$(ASTDATADIR)/moh" "$(ASTMANDIR)/man8" "$(AGI_DIR)" "$(ASTDBDIR)" \ @@ -50,7 +50,7 @@ installdirs: @for i in $(INSTALLDIRS); do \ -@@ -578,10 +582,10 @@ bininstall: _all installdirs $(SUBDIRS_INSTALL) main-b +@@ -605,10 +609,10 @@ endif if [ -f contrib/firmware/iax/iaxy.bin ] ; then \ $(INSTALL) -m 644 contrib/firmware/iax/iaxy.bin "$(DESTDIR)$(ASTDATADIR)/firmware/iax/iaxy.bin"; \ fi @@ -65,7 +65,7 @@ $(SUBDIRS_INSTALL): +@DESTDIR="$(DESTDIR)" ASTSBINDIR="$(ASTSBINDIR)" ASTDATADIR="$(ASTDATADIR)" $(SUBMAKE) -C $(@:-install=) install -@@ -689,7 +693,7 @@ ifneq ($(filter ~%,$(DESTDIR)),) +@@ -723,7 +727,7 @@ ifneq ($(filter ~%,$(DESTDIR)),) @exit 1 endif @@ -74,10 +74,10 @@ @if [ -x /usr/sbin/asterisk-post-install ]; then \ /usr/sbin/asterisk-post-install "$(DESTDIR)" . ; \ fi -@@ -734,23 +738,10 @@ upgrade: bininstall +@@ -768,23 +772,10 @@ upgrade: bininstall # (2) the extension to strip off define INSTALL_CONFIGS - @for x in configs/$(1)/*$(2); do \ + @for x in $(1)/*$(2); do \ - dst="$(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x $(2)`"; \ - if [ -f "$${dst}" ]; then \ - if [ "$(OVERWRITE)" = "y" ]; then \ @@ -93,14 +93,14 @@ - fi ; \ echo "Installing file $$x"; \ - $(INSTALL) -m 644 "$$x" "$${dst}" ;\ -+ $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample`.sample ; \ ++ $(INSTALL) -m 644 "$$x" "$(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample`.sample" ; \ done ; \ - if [ "$(OVERWRITE)" = "y" ]; then \ + if true; then \ echo "Updating asterisk.conf" ; \ sed -e 's|^astetcdir.*$$|astetcdir => $(ASTETCDIR)|' \ -e 's|^astmoddir.*$$|astmoddir => $(ASTMODDIR)|' \ -@@ -763,8 +754,8 @@ define INSTALL_CONFIGS +@@ -797,8 +788,8 @@ define INSTALL_CONFIGS -e 's|^astrundir.*$$|astrundir => $(ASTVARRUNDIR)|' \ -e 's|^astlogdir.*$$|astlogdir => $(ASTLOGDIR)|' \ -e 's|^astsbindir.*$$|astsbindir => $(ASTSBINDIR)|' \ @@ -111,7 +111,7 @@ rm -f "$(DESTDIR)$(ASTCONFPATH).tmp" ; \ fi endef -@@ -780,7 +771,7 @@ adsi: +@@ -822,7 +813,7 @@ adsi: else \ echo "Installing $$x" ; \ fi ; \ Modified: branches/2018Q3/net/asterisk15/Makefile ============================================================================== --- branches/2018Q3/net/asterisk15/Makefile Mon Sep 24 06:59:56 2018 (r480549) +++ branches/2018Q3/net/asterisk15/Makefile Mon Sep 24 07:02:16 2018 (r480550) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= asterisk -PORTVERSION= 15.4.1 +PORTVERSION= 15.6.1 CATEGORIES= net MASTER_SITES= https://downloads.asterisk.org/pub/telephony/%SUBDIR%/:DEFAULT,g729 MASTER_SITE_SUBDIR= asterisk/ \ Modified: branches/2018Q3/net/asterisk15/distinfo ============================================================================== --- branches/2018Q3/net/asterisk15/distinfo Mon Sep 24 06:59:56 2018 (r480549) +++ branches/2018Q3/net/asterisk15/distinfo Mon Sep 24 07:02:16 2018 (r480550) @@ -1,6 +1,6 @@ -TIMESTAMP = 1528757950 -SHA256 (asterisk-15.4.1.tar.gz) = 33c940f275590934aa5c97d4399beaf6927b1cc00ab342c2996c53a8f7298ead -SIZE (asterisk-15.4.1.tar.gz) = 27587819 +TIMESTAMP = 1537517995 +SHA256 (asterisk-15.6.1.tar.gz) = 9cb86585fb4efcd86423fa7586e55d9d3c74fda43a2e0b1b9c9eb3742df73155 +SIZE (asterisk-15.6.1.tar.gz) = 27692982 SHA256 (asterisk-core-sounds-en-g729-1.5.tar.gz) = 8b28a59cfa53b59c76e0a191704f0708e3d83acffab8c5e6f25dfc599f0123f9 SIZE (asterisk-core-sounds-en-g729-1.5.tar.gz) = 1551123 SHA256 (asterisk-moh-opsound-g729-2.03.tar.gz) = 0147ca9a97f0c550227aacb7793499057c4d2c64e021c95f93722f27d5549585 Modified: branches/2018Q3/net/asterisk15/files/patch-Makefile ============================================================================== --- branches/2018Q3/net/asterisk15/files/patch-Makefile Mon Sep 24 06:59:56 2018 (r480549) +++ branches/2018Q3/net/asterisk15/files/patch-Makefile Mon Sep 24 07:02:16 2018 (r480550) @@ -1,6 +1,6 @@ ---- Makefile.orig 2017-12-20 20:39:39 UTC +--- Makefile.orig 2018-08-28 19:19:14 UTC +++ Makefile -@@ -138,7 +138,7 @@ ASTTOPDIR:=$(subst $(space),\$(space),$(CURDIR)) +@@ -141,7 +141,7 @@ ASTTOPDIR:=$(subst $(space),\$(space),$(CURDIR)) OVERWRITE=y # Include debug and macro symbols in the executables (-g) and profiling info (-pg) @@ -9,7 +9,7 @@ # Asterisk.conf is located in ASTETCDIR or by using the -C flag # when starting Asterisk -@@ -162,7 +162,7 @@ LINKER_SYMBOL_PREFIX= +@@ -165,7 +165,7 @@ LINKER_SYMBOL_PREFIX= #_ASTCFLAGS+=-DOLD_DSP_ROUTINES # Default install directory for DAHDI hooks. @@ -18,7 +18,7 @@ # If the file .asterisk.makeopts is present in your home directory, you can # include all of your favorite menuselect options so that every time you download -@@ -220,7 +220,7 @@ endif +@@ -225,7 +225,7 @@ endif ifeq ($(OSARCH),FreeBSD) # -V is understood by BSD Make, not by GNU make. @@ -27,7 +27,7 @@ _ASTCFLAGS+=$(shell if test $(BSDVERSION) -lt 500016 ; then echo "-D_THREAD_SAFE"; fi) endif -@@ -456,8 +456,12 @@ endif +@@ -465,8 +465,12 @@ endif $(INSTALL) -m 644 $$n "$(DESTDIR)$(ASTDATADIR)/static-http/docs" ; \ done \ fi @@ -41,7 +41,7 @@ done $(MAKE) -C sounds install find rest-api -name "*.json" | while read x; do \ -@@ -552,7 +556,7 @@ INSTALLDIRS="$(ASTLIBDIR)" "$(ASTMODDIR)" "$(ASTSBINDI +@@ -565,7 +569,7 @@ INSTALLDIRS="$(ASTLIBDIR)" "$(ASTMODDIR)" "$(ASTSBINDI "$(ASTDATADIR)/firmware/iax" "$(ASTDATADIR)/images" "$(ASTDATADIR)/keys" \ "$(ASTDATADIR)/phoneprov" "$(ASTDATADIR)/rest-api" "$(ASTDATADIR)/static-http" \ "$(ASTDATADIR)/sounds" "$(ASTDATADIR)/moh" "$(ASTMANDIR)/man8" "$(AGI_DIR)" "$(ASTDBDIR)" \ @@ -50,7 +50,7 @@ installdirs: @for i in $(INSTALLDIRS); do \ -@@ -591,10 +595,10 @@ endif +@@ -604,10 +608,10 @@ endif if [ -f contrib/firmware/iax/iaxy.bin ] ; then \ $(INSTALL) -m 644 contrib/firmware/iax/iaxy.bin "$(DESTDIR)$(ASTDATADIR)/firmware/iax/iaxy.bin"; \ fi @@ -65,7 +65,7 @@ $(SUBDIRS_INSTALL): +@DESTDIR="$(DESTDIR)" ASTSBINDIR="$(ASTSBINDIR)" ASTDATADIR="$(ASTDATADIR)" $(SUBMAKE) -C $(@:-install=) install -@@ -702,7 +706,7 @@ ifneq ($(filter ~%,$(DESTDIR)),) +@@ -722,7 +726,7 @@ ifneq ($(filter ~%,$(DESTDIR)),) @exit 1 endif @@ -74,10 +74,10 @@ @if [ -x /usr/sbin/asterisk-post-install ]; then \ /usr/sbin/asterisk-post-install "$(DESTDIR)" . ; \ fi -@@ -747,23 +751,10 @@ upgrade: bininstall +@@ -767,23 +771,10 @@ upgrade: bininstall # (2) the extension to strip off define INSTALL_CONFIGS - @for x in configs/$(1)/*$(2); do \ + @for x in $(1)/*$(2); do \ - dst="$(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x $(2)`"; \ - if [ -f "$${dst}" ]; then \ - if [ "$(OVERWRITE)" = "y" ]; then \ @@ -93,14 +93,14 @@ - fi ; \ echo "Installing file $$x"; \ - $(INSTALL) -m 644 "$$x" "$${dst}" ;\ -+ $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample`.sample ; \ ++ $(INSTALL) -m 644 "$$x" "$(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample`.sample" ; \ done ; \ - if [ "$(OVERWRITE)" = "y" ]; then \ + if true; then \ echo "Updating asterisk.conf" ; \ sed -e 's|^astetcdir.*$$|astetcdir => $(ASTETCDIR)|' \ -e 's|^astmoddir.*$$|astmoddir => $(ASTMODDIR)|' \ -@@ -776,8 +767,8 @@ define INSTALL_CONFIGS +@@ -796,8 +787,8 @@ define INSTALL_CONFIGS -e 's|^astrundir.*$$|astrundir => $(ASTVARRUNDIR)|' \ -e 's|^astlogdir.*$$|astlogdir => $(ASTLOGDIR)|' \ -e 's|^astsbindir.*$$|astsbindir => $(ASTSBINDIR)|' \ @@ -111,7 +111,7 @@ rm -f "$(DESTDIR)$(ASTCONFPATH).tmp" ; \ fi endef -@@ -793,7 +784,7 @@ adsi: +@@ -821,7 +812,7 @@ adsi: else \ echo "Installing $$x" ; \ fi ; \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201809240702.w8O72Ghi097082>