From owner-svn-ports-head@freebsd.org Fri May 1 17:14:46 2020 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 2FE022DAA9A; Fri, 1 May 2020 17:14:46 +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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49DJlV0XMjz3Lcn; Fri, 1 May 2020 17:14:46 +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 0D2D8B9C2; Fri, 1 May 2020 17:14:46 +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 041HEjD8039922; Fri, 1 May 2020 17:14:45 GMT (envelope-from madpilot@FreeBSD.org) Received: (from madpilot@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 041HEjFq039919; Fri, 1 May 2020 17:14:45 GMT (envelope-from madpilot@FreeBSD.org) Message-Id: <202005011714.041HEjFq039919@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: madpilot set sender to madpilot@FreeBSD.org using -f From: Guido Falsi Date: Fri, 1 May 2020 17:14:45 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r533567 - in head/net/asterisk13: . files X-SVN-Group: ports-head X-SVN-Commit-Author: madpilot X-SVN-Commit-Paths: in head/net/asterisk13: . files X-SVN-Commit-Revision: 533567 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.29 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: Fri, 01 May 2020 17:14:46 -0000 Author: madpilot Date: Fri May 1 17:14:45 2020 New Revision: 533567 URL: https://svnweb.freebsd.org/changeset/ports/533567 Log: - Remove bashisms from configure script which can cause wrong options being passed to bundled pjproject configure script - Prevent pjproject build from trying to touch, calculate checksum and download the pjproject distribution file itself. This can cause build failures in poudriere Reported by: cmt Tested by: cmt Modified: head/net/asterisk13/Makefile head/net/asterisk13/files/patch-configure head/net/asterisk13/files/patch-third-party_pjproject_Makefile Modified: head/net/asterisk13/Makefile ============================================================================== --- head/net/asterisk13/Makefile Fri May 1 17:14:21 2020 (r533566) +++ head/net/asterisk13/Makefile Fri May 1 17:14:45 2020 (r533567) @@ -2,6 +2,7 @@ PORTNAME= asterisk PORTVERSION= 13.33.0 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= https://downloads.asterisk.org/pub/telephony/%SUBDIR%/:DEFAULT,g729 \ http://www.pjsip.org/release/${PJSIP_VERSION}/:PJSIP Modified: head/net/asterisk13/files/patch-configure ============================================================================== --- head/net/asterisk13/files/patch-configure Fri May 1 17:14:21 2020 (r533566) +++ head/net/asterisk13/files/patch-configure Fri May 1 17:14:45 2020 (r533567) @@ -1,16 +1,47 @@ ---- configure.orig 2018-04-19 18:29:01 UTC +--- configure.orig 2020-04-30 14:04:41 UTC +++ configure -@@ -4640,8 +4640,6 @@ case "${host_os}" in +@@ -4667,8 +4667,6 @@ case "${host_os}" in ;; - freebsd*) + dragonfly*|freebsd*) ac_default_prefix=/usr/local - CPPFLAGS=-I/usr/local/include - LDFLAGS=-L/usr/local/lib ;; openbsd*) ac_default_prefix=/usr/local -@@ -20421,6 +20419,8 @@ $as_echo_n "checking for getifaddrs() support... " >&6 +@@ -9207,25 +9205,25 @@ $as_echo "configuring" >&6; } + this_host=$(./config.sub $(./config.guess)) + if test "$build" != "$this_host" ; then +- PJPROJECT_CONFIGURE_OPTS+=" --build=$build_alias" ++ PJPROJECT_CONFIGURE_OPTS="${PJPROJECT_CONFIGURE_OPTS} --build=$build_alias" + fi + if test "$host" != "$this_host" ; then +- PJPROJECT_CONFIGURE_OPTS+=" --host=$host_alias" ++ PJPROJECT_CONFIGURE_OPTS="${PJPROJECT_CONFIGURE_OPTS} --host=$host_alias" + fi + # This was a copy of the autoconf generated code from the root ./configure. + # Hopefully, when you read this, the code is still the same. + if test "${with_ssl+set}" = set; then : + case $with_ssl in + n|no) +- PJPROJECT_CONFIGURE_OPTS+=" --disable-ssl" ++ PJPROJECT_CONFIGURE_OPTS="${PJPROJECT_CONFIGURE_OPTS} --disable-ssl" + ;; + y|ye|yes) + # Not to mention SSL is the default in PJProject and means "autodetect". + # In Asterisk, "./configure --with-ssl" means "must be present". +- PJPROJECT_CONFIGURE_OPTS+="" ++ #PJPROJECT_CONFIGURE_OPTS+="" + ;; + *) +- PJPROJECT_CONFIGURE_OPTS+=" --with-ssl=${with_ssl}" ++ PJPROJECT_CONFIGURE_OPTS+="${PJPROJECT_CONFIGURE_OPTS} --with-ssl=${with_ssl}" + ;; + esac + fi +@@ -20566,6 +20564,8 @@ $as_echo_n "checking for getifaddrs() support... " >&6 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ + #include @@ -18,7 +49,7 @@ #include int main () -@@ -28701,6 +28701,8 @@ fi +@@ -29281,6 +29281,8 @@ fi for ver in 5.3 5.2 5.1; do @@ -27,7 +58,7 @@ if test "x${PBX_LUA}" != "x1" -a "${USE_LUA}" != "no"; then pbxlibdir="" # if --with-LUA=DIR has been specified, use it. -@@ -28716,12 +28718,12 @@ if test "x${PBX_LUA}" != "x1" -a "${USE_LUA}" != "no"; +@@ -29296,12 +29298,12 @@ if test "x${PBX_LUA}" != "x1" -a "${USE_LUA}" != "no"; CFLAGS="${CFLAGS} " as_ac_Lib=`$as_echo "ac_cv_lib_lua${ver}''_luaL_newstate" | $as_tr_sh` { $as_echo "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua${ver}" >&5 @@ -42,7 +73,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -@@ -28763,7 +28765,7 @@ fi +@@ -29343,7 +29345,7 @@ fi # now check for the header. if test "${AST_LUA_FOUND}" = "yes"; then @@ -51,7 +82,7 @@ # if --with-LUA=DIR has been specified, use it. if test "x${LUA_DIR}" != "x"; then LUA_INCLUDE="-I${LUA_DIR}/include" -@@ -28774,7 +28776,7 @@ fi +@@ -29354,7 +29356,7 @@ fi ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${LUA_INCLUDE}" as_ac_Header=`$as_echo "ac_cv_header_lua${ver}/lua.h" | $as_tr_sh` @@ -60,7 +91,7 @@ if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : LUA_HEADER_FOUND=1 else -@@ -28801,9 +28803,9 @@ fi +@@ -29381,9 +29383,9 @@ fi if test "x${PBX_LUA}" = "x1" ; then if test x"${LUA_DIR}" = x; then Modified: head/net/asterisk13/files/patch-third-party_pjproject_Makefile ============================================================================== --- head/net/asterisk13/files/patch-third-party_pjproject_Makefile Fri May 1 17:14:21 2020 (r533566) +++ head/net/asterisk13/files/patch-third-party_pjproject_Makefile Fri May 1 17:14:45 2020 (r533567) @@ -1,6 +1,23 @@ ---- third-party/pjproject/Makefile.orig 2020-03-12 14:37:03 UTC +--- third-party/pjproject/Makefile.orig 2020-04-30 14:04:41 UTC +++ third-party/pjproject/Makefile -@@ -157,7 +157,7 @@ $(PJSIP_LIB_FILES): $(PJLIB_UTIL_LIB_FILES) +@@ -90,14 +90,10 @@ _all: $(TARGETS) + + .DELETE_ON_ERROR: + +-$(DOWNLOAD_DIR)/$(TARBALL_FILE): ../versions.mak +- $(CMD_PREFIX) ($(TARBALL_EXISTS) && $(TARBALL_VERIFY) && touch $@) || (rm -rf $@ ;\ +- $(TARBALL_DOWNLOAD)) || (rm -rf $@ ;\ +- $(SHELL_ECHO_PREFIX) Retrying download ; $(TARBALL_DOWNLOAD)) ++$(DOWNLOAD_DIR)/$(TARBALL_FILE): ++ @true + + source/.unpacked: $(DOWNLOAD_DIR)/$(TARBALL_FILE) +- $(CMD_PREFIX) $(TARBALL_VERIFY) || (rm -rf $@ ;\ +- $(SHELL_ECHO_PREFIX) Retrying download ; $(TARBALL_DOWNLOAD)) + $(ECHO_PREFIX) Unpacking $< + -@rm -rf source pjproject-*/ >/dev/null 2>&1 + $(CMD_PREFIX) $(TAR) -xjf $< +@@ -157,7 +153,7 @@ $(PJSIP_LIB_FILES): $(PJLIB_UTIL_LIB_FILES) pjproject.symbols: $(ALL_LIB_FILES) $(ECHO_PREFIX) Generating symbols