From owner-svn-ports-head@freebsd.org Thu Sep 6 15:32:55 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5818CFFE979; Thu, 6 Sep 2018 15:32:55 +0000 (UTC) (envelope-from madpilot@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 02D387C60C; Thu, 6 Sep 2018 15:32:55 +0000 (UTC) (envelope-from madpilot@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id F1DEE6FC4; Thu, 6 Sep 2018 15:32:54 +0000 (UTC) (envelope-from madpilot@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w86FWsT3044262; Thu, 6 Sep 2018 15:32:54 GMT (envelope-from madpilot@FreeBSD.org) Received: (from madpilot@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w86FWrCZ044256; Thu, 6 Sep 2018 15:32:53 GMT (envelope-from madpilot@FreeBSD.org) Message-Id: <201809061532.w86FWrCZ044256@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: madpilot set sender to madpilot@FreeBSD.org using -f From: Guido Falsi Date: Thu, 6 Sep 2018 15:32:53 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r479103 - in head/net: asterisk13 asterisk13/files asterisk15 asterisk15/files X-SVN-Group: ports-head X-SVN-Commit-Author: madpilot X-SVN-Commit-Paths: in head/net: asterisk13 asterisk13/files asterisk15 asterisk15/files X-SVN-Commit-Revision: 479103 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 Sep 2018 15:32:55 -0000 Author: madpilot Date: Thu Sep 6 15:32:53 2018 New Revision: 479103 URL: https://svnweb.freebsd.org/changeset/ports/479103 Log: - Update asterisk13 to 13.23.0 - Update asterisk15 to 15.6.0 Modified: head/net/asterisk13/Makefile head/net/asterisk13/distinfo head/net/asterisk13/files/patch-Makefile head/net/asterisk15/Makefile head/net/asterisk15/distinfo head/net/asterisk15/files/patch-Makefile Modified: head/net/asterisk13/Makefile ============================================================================== --- head/net/asterisk13/Makefile Thu Sep 6 15:25:09 2018 (r479102) +++ head/net/asterisk13/Makefile Thu Sep 6 15:32:53 2018 (r479103) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= asterisk -PORTVERSION= 13.22.0 +PORTVERSION= 13.23.0 CATEGORIES= net MASTER_SITES= https://downloads.asterisk.org/pub/telephony/%SUBDIR%/:DEFAULT,g729 MASTER_SITE_SUBDIR= asterisk/ \ Modified: head/net/asterisk13/distinfo ============================================================================== --- head/net/asterisk13/distinfo Thu Sep 6 15:25:09 2018 (r479102) +++ head/net/asterisk13/distinfo Thu Sep 6 15:32:53 2018 (r479103) @@ -1,6 +1,6 @@ -TIMESTAMP = 1531425953 -SHA256 (asterisk-13.22.0.tar.gz) = bd5922f19e37c4cfc368e007b15e440bd8c709b5ed53e55496a030429ed7759e -SIZE (asterisk-13.22.0.tar.gz) = 33036487 +TIMESTAMP = 1536226018 +SHA256 (asterisk-13.23.0.tar.gz) = d01e7336a72f9ea5df977dd3ee8af581f2b2a17a270d56f85defc15597667378 +SIZE (asterisk-13.23.0.tar.gz) = 33078545 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: head/net/asterisk13/files/patch-Makefile ============================================================================== --- head/net/asterisk13/files/patch-Makefile Thu Sep 6 15:25:09 2018 (r479102) +++ head/net/asterisk13/files/patch-Makefile Thu Sep 6 15:32:53 2018 (r479103) @@ -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: head/net/asterisk15/Makefile ============================================================================== --- head/net/asterisk15/Makefile Thu Sep 6 15:25:09 2018 (r479102) +++ head/net/asterisk15/Makefile Thu Sep 6 15:32:53 2018 (r479103) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= asterisk -PORTVERSION= 15.5.0 +PORTVERSION= 15.6.0 CATEGORIES= net MASTER_SITES= https://downloads.asterisk.org/pub/telephony/%SUBDIR%/:DEFAULT,g729 MASTER_SITE_SUBDIR= asterisk/ \ Modified: head/net/asterisk15/distinfo ============================================================================== --- head/net/asterisk15/distinfo Thu Sep 6 15:25:09 2018 (r479102) +++ head/net/asterisk15/distinfo Thu Sep 6 15:32:53 2018 (r479103) @@ -1,6 +1,6 @@ -TIMESTAMP = 1531432795 -SHA256 (asterisk-15.5.0.tar.gz) = 885c587292a3424fbdb454869d66e648edfd4bea06e36c106bc3bdc4a8d27086 -SIZE (asterisk-15.5.0.tar.gz) = 27659790 +TIMESTAMP = 1536226092 +SHA256 (asterisk-15.6.0.tar.gz) = 6620af9749524152a793ecc4ade4604064254cb46e642d50d280d56f6b7eed3e +SIZE (asterisk-15.6.0.tar.gz) = 27710751 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: head/net/asterisk15/files/patch-Makefile ============================================================================== --- head/net/asterisk15/files/patch-Makefile Thu Sep 6 15:25:09 2018 (r479102) +++ head/net/asterisk15/files/patch-Makefile Thu Sep 6 15:32:53 2018 (r479103) @@ -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 ; \