Attachment #158840 for bug #201617

View | Details | Raw Unified | Return to bug 201617
Collapse All | Expand All

Lines 11-17 Link Here

(-)devel/autoconf-archive/Makefile (-1 / +1 lines)
11	COMMENT= Set of useful GNU Autoconf macros	11	COMMENT= Set of useful GNU Autoconf macros
12		12
13	USES= makeinfo tar:xz	13	USES= makeinfo tar:xz
14	DISTDATE= 2014.10.15	14	DISTDATE= 2015.02.24
15	GNU_CONFIGURE= yes	15	GNU_CONFIGURE= yes
16	INFO= ${PORTNAME}	16	INFO= ${PORTNAME}
17		17

Lines 1-2 Link Here

(-)devel/autoconf-archive/distinfo (-2 / +2 lines)
1	SHA256 (autoconf-archive-2014.10.15.tar.xz) = fe1de6d191ecb643ddf977a7fc00a51898f68bb1df376de3a137c3855ccb1ea5	1	SHA256 (autoconf-archive-2015.02.24.tar.xz) = 69715bdd078f552ca85e498a94543e11cb8bcdf0359e659b84d84d19372b0dc5
2	SIZE (autoconf-archive-2014.10.15.tar.xz) = 558572	2	SIZE (autoconf-archive-2015.02.24.tar.xz) = 578536




From 8d9c8f162b6cc71ae217ddeef2cef522060bc85e Mon Sep 17 00:00:00 2001
From: Ting-Wei Lan <lantw@src.gnome.org>
Date: Tue, 21 Apr 2015 03:27:04 +0800
Subject: [PATCH] ax_compiler_flags: Prevent using bash substring expansion

Substring expansion such as ${flag:5} is not supported by POSIX, and
it can cause error for systems not using bash as their default shell.
---
 m4/ax_compiler_flags_cflags.m4   | 3 ++-
 m4/ax_compiler_flags_cxxflags.m4 | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/m4/ax_compiler_flags_cflags.m4 b/m4/ax_compiler_flags_cflags.m4
index 86896c1..5bebe25 100644
--- m4/ax_compiler_flags_cflags.m4
+++ m4/ax_compiler_flags_cflags.m4
@@ -28,6 +28,7 @@
 #serial 9
 
 AC_DEFUN([AX_COMPILER_FLAGS_CFLAGS],[
+    AC_REQUIRE([AC_PROG_SED])
     AX_REQUIRE_DEFINED([AX_APPEND_COMPILE_FLAGS])
     AX_REQUIRE_DEFINED([AX_APPEND_FLAG])
     AX_REQUIRE_DEFINED([AX_CHECK_COMPILE_FLAG])
@@ -119,7 +120,7 @@ AC_DEFUN([AX_COMPILER_FLAGS_CFLAGS],[
         AS_CASE([$flag],
                 [-Wno-*=*],[],
                 [-Wno-*],[
-                    AX_APPEND_COMPILE_FLAGS([-Wno-error=${flag:5}],
+                    AX_APPEND_COMPILE_FLAGS([-Wno-error=$(AS_ECHO([$flag]) | $SED 's/^-Wno-//')],
                                             ax_warn_cflags_variable,
                                             [$ax_compiler_flags_test])
                 ])
diff --git a/m4/ax_compiler_flags_cxxflags.m4 b/m4/ax_compiler_flags_cxxflags.m4
index dd3b583..112cb76 100644
--- m4/ax_compiler_flags_cxxflags.m4
+++ m4/ax_compiler_flags_cxxflags.m4
@@ -29,6 +29,7 @@
 #serial 5
 
 AC_DEFUN([AX_COMPILER_FLAGS_CXXFLAGS],[
+    AC_REQUIRE([AC_PROG_SED])
     AX_REQUIRE_DEFINED([AX_APPEND_COMPILE_FLAGS])
     AX_REQUIRE_DEFINED([AX_APPEND_FLAG])
     AX_REQUIRE_DEFINED([AX_CHECK_COMPILE_FLAG])
@@ -115,7 +116,7 @@ AC_DEFUN([AX_COMPILER_FLAGS_CXXFLAGS],[
         AS_CASE([$flag],
                 [-Wno-*=*],[],
                 [-Wno-*],[
-                    AX_APPEND_COMPILE_FLAGS([-Wno-error=${flag:5}],
+                    AX_APPEND_COMPILE_FLAGS([-Wno-error=$(AS_ECHO([$flag]) | $SED 's/^-Wno-//')],
                                             ax_warn_cxxflags_variable,
                                             [$ax_compiler_flags_test])
                 ])




%%MACRODIR%%/ax_check_gl.m4
%%MACRODIR%%/ax_check_glu.m4
%%MACRODIR%%/ax_check_glut.m4
%%MACRODIR%%/ax_check_glx.m4
%%MACRODIR%%/ax_check_gnu_make.m4
%%MACRODIR%%/ax_check_icu.m4
%%MACRODIR%%/ax_check_java_home.m4

%%MACRODIR%%/ax_check_typedef.m4
%%MACRODIR%%/ax_check_uname_syscall.m4
%%MACRODIR%%/ax_check_user.m4
%%MACRODIR%%/ax_check_vscript.m4
%%MACRODIR%%/ax_check_zlib.m4
%%MACRODIR%%/ax_code_coverage.m4
%%MACRODIR%%/ax_compare_version.m4
%%MACRODIR%%/ax_compile_check_sizeof.m4
%%MACRODIR%%/ax_compiler_flags.m4
%%MACRODIR%%/ax_compiler_flags_cflags.m4
%%MACRODIR%%/ax_compiler_flags_cxxflags.m4
%%MACRODIR%%/ax_compiler_flags_gir.m4
%%MACRODIR%%/ax_compiler_flags_ldflags.m4
%%MACRODIR%%/ax_compiler_vendor.m4
%%MACRODIR%%/ax_compiler_version.m4
%%MACRODIR%%/ax_compute_relative_paths.m4
%%MACRODIR%%/ax_compute_standard_relative_paths.m4
%%MACRODIR%%/ax_cond_with_level.m4

%%MACRODIR%%/ax_cxx_dynamic_cast.m4
%%MACRODIR%%/ax_cxx_enum_computations.m4
%%MACRODIR%%/ax_cxx_enum_computations_with_cast.m4
%%MACRODIR%%/ax_cxx_erase_iterator_type.m4
%%MACRODIR%%/ax_cxx_exceptions.m4
%%MACRODIR%%/ax_cxx_explicit.m4
%%MACRODIR%%/ax_cxx_explicit_instantiations.m4

%%MACRODIR%%/ax_gcc_warn_unused_result.m4
%%MACRODIR%%/ax_gcc_x86_avx_xgetbv.m4
%%MACRODIR%%/ax_gcc_x86_cpuid.m4
%%MACRODIR%%/ax_generate_changelog.m4
%%MACRODIR%%/ax_have_adns.m4
%%MACRODIR%%/ax_have_epoll.m4
%%MACRODIR%%/ax_have_opengl.m4

%%MACRODIR%%/ax_have_select.m4
%%MACRODIR%%/ax_include_strcasecmp.m4
%%MACRODIR%%/ax_install_files.m4
%%MACRODIR%%/ax_is_release.m4
%%MACRODIR%%/ax_java_check_class.m4
%%MACRODIR%%/ax_java_options.m4
%%MACRODIR%%/ax_jni_include_dir.m4

%%MACRODIR%%/ax_perl_ext_flags.m4
%%MACRODIR%%/ax_perl_module_version.m4
%%MACRODIR%%/ax_pgsql_priv_root.m4
%%MACRODIR%%/ax_pkg_check_modules.m4
%%MACRODIR%%/ax_pkg_mico.m4
%%MACRODIR%%/ax_pkg_swig.m4
%%MACRODIR%%/ax_prefix_config_h.m4

%%MACRODIR%%/ax_prog_fig2dev.m4
%%MACRODIR%%/ax_prog_flex.m4
%%MACRODIR%%/ax_prog_guile_version.m4
%%MACRODIR%%/ax_prog_haxe_version.m4
%%MACRODIR%%/ax_prog_hla.m4
%%MACRODIR%%/ax_prog_hla_opt.m4
%%MACRODIR%%/ax_prog_httpd.m4

%%MACRODIR%%/ax_try_run_java.m4
%%MACRODIR%%/ax_type_socklen_t.m4
%%MACRODIR%%/ax_upload.m4
%%MACRODIR%%/ax_valgrind_check.m4
%%MACRODIR%%/ax_var_timezone_externals.m4
%%MACRODIR%%/ax_very_nice.m4
%%MACRODIR%%/ax_warning_default_aclocaldir.m4

%%MACRODIR%%/ax_xsdcxx.m4
%%MACRODIR%%/ax_xtra_classpath.m4
%%MACRODIR%%/ax_zoneinfo.m4
%%DATADIR%%/AUTHORS
%%DATADIR%%/COPYING
%%DATADIR%%/COPYING.EXCEPTION
%%DATADIR%%/README

Return to bug 201617

Lines 137-142 Link Here

(-)devel/autoconf-archive/pkg-plist (-4 / +18 lines)
137	%%MACRODIR%%/ax_check_gl.m4	137	%%MACRODIR%%/ax_check_gl.m4
138	%%MACRODIR%%/ax_check_glu.m4	138	%%MACRODIR%%/ax_check_glu.m4
139	%%MACRODIR%%/ax_check_glut.m4	139	%%MACRODIR%%/ax_check_glut.m4
		140	%%MACRODIR%%/ax_check_glx.m4
140	%%MACRODIR%%/ax_check_gnu_make.m4	141	%%MACRODIR%%/ax_check_gnu_make.m4
141	%%MACRODIR%%/ax_check_icu.m4	142	%%MACRODIR%%/ax_check_icu.m4
142	%%MACRODIR%%/ax_check_java_home.m4	143	%%MACRODIR%%/ax_check_java_home.m4
Lines 167-177 Link Here
167	%%MACRODIR%%/ax_check_typedef.m4	168	%%MACRODIR%%/ax_check_typedef.m4
168	%%MACRODIR%%/ax_check_uname_syscall.m4	169	%%MACRODIR%%/ax_check_uname_syscall.m4
169	%%MACRODIR%%/ax_check_user.m4	170	%%MACRODIR%%/ax_check_user.m4
		171	%%MACRODIR%%/ax_check_vscript.m4
170	%%MACRODIR%%/ax_check_zlib.m4	172	%%MACRODIR%%/ax_check_zlib.m4
171	%%MACRODIR%%/ax_code_coverage.m4	173	%%MACRODIR%%/ax_code_coverage.m4
172	%%MACRODIR%%/ax_compare_version.m4	174	%%MACRODIR%%/ax_compare_version.m4
173	%%MACRODIR%%/ax_compile_check_sizeof.m4	175	%%MACRODIR%%/ax_compile_check_sizeof.m4
		176	%%MACRODIR%%/ax_compiler_flags.m4
		177	%%MACRODIR%%/ax_compiler_flags_cflags.m4
		178	%%MACRODIR%%/ax_compiler_flags_cxxflags.m4
		179	%%MACRODIR%%/ax_compiler_flags_gir.m4
		180	%%MACRODIR%%/ax_compiler_flags_ldflags.m4
174	%%MACRODIR%%/ax_compiler_vendor.m4	181	%%MACRODIR%%/ax_compiler_vendor.m4
		182	%%MACRODIR%%/ax_compiler_version.m4
175	%%MACRODIR%%/ax_compute_relative_paths.m4	183	%%MACRODIR%%/ax_compute_relative_paths.m4
176	%%MACRODIR%%/ax_compute_standard_relative_paths.m4	184	%%MACRODIR%%/ax_compute_standard_relative_paths.m4
177	%%MACRODIR%%/ax_cond_with_level.m4	185	%%MACRODIR%%/ax_cond_with_level.m4
Lines 199-204 Link Here
199	%%MACRODIR%%/ax_cxx_dynamic_cast.m4	207	%%MACRODIR%%/ax_cxx_dynamic_cast.m4
200	%%MACRODIR%%/ax_cxx_enum_computations.m4	208	%%MACRODIR%%/ax_cxx_enum_computations.m4
201	%%MACRODIR%%/ax_cxx_enum_computations_with_cast.m4	209	%%MACRODIR%%/ax_cxx_enum_computations_with_cast.m4
		210	%%MACRODIR%%/ax_cxx_erase_iterator_type.m4
202	%%MACRODIR%%/ax_cxx_exceptions.m4	211	%%MACRODIR%%/ax_cxx_exceptions.m4
203	%%MACRODIR%%/ax_cxx_explicit.m4	212	%%MACRODIR%%/ax_cxx_explicit.m4
204	%%MACRODIR%%/ax_cxx_explicit_instantiations.m4	213	%%MACRODIR%%/ax_cxx_explicit_instantiations.m4
Lines 326-331 Link Here
326	%%MACRODIR%%/ax_gcc_warn_unused_result.m4	335	%%MACRODIR%%/ax_gcc_warn_unused_result.m4
327	%%MACRODIR%%/ax_gcc_x86_avx_xgetbv.m4	336	%%MACRODIR%%/ax_gcc_x86_avx_xgetbv.m4
328	%%MACRODIR%%/ax_gcc_x86_cpuid.m4	337	%%MACRODIR%%/ax_gcc_x86_cpuid.m4
		338	%%MACRODIR%%/ax_generate_changelog.m4
329	%%MACRODIR%%/ax_have_adns.m4	339	%%MACRODIR%%/ax_have_adns.m4
330	%%MACRODIR%%/ax_have_epoll.m4	340	%%MACRODIR%%/ax_have_epoll.m4
331	%%MACRODIR%%/ax_have_opengl.m4	341	%%MACRODIR%%/ax_have_opengl.m4
Lines 334-339 Link Here
334	%%MACRODIR%%/ax_have_select.m4	344	%%MACRODIR%%/ax_have_select.m4
335	%%MACRODIR%%/ax_include_strcasecmp.m4	345	%%MACRODIR%%/ax_include_strcasecmp.m4
336	%%MACRODIR%%/ax_install_files.m4	346	%%MACRODIR%%/ax_install_files.m4
		347	%%MACRODIR%%/ax_is_release.m4
337	%%MACRODIR%%/ax_java_check_class.m4	348	%%MACRODIR%%/ax_java_check_class.m4
338	%%MACRODIR%%/ax_java_options.m4	349	%%MACRODIR%%/ax_java_options.m4
339	%%MACRODIR%%/ax_jni_include_dir.m4	350	%%MACRODIR%%/ax_jni_include_dir.m4
Lines 394-399 Link Here
394	%%MACRODIR%%/ax_perl_ext_flags.m4	405	%%MACRODIR%%/ax_perl_ext_flags.m4
395	%%MACRODIR%%/ax_perl_module_version.m4	406	%%MACRODIR%%/ax_perl_module_version.m4
396	%%MACRODIR%%/ax_pgsql_priv_root.m4	407	%%MACRODIR%%/ax_pgsql_priv_root.m4
		408	%%MACRODIR%%/ax_pkg_check_modules.m4
397	%%MACRODIR%%/ax_pkg_mico.m4	409	%%MACRODIR%%/ax_pkg_mico.m4
398	%%MACRODIR%%/ax_pkg_swig.m4	410	%%MACRODIR%%/ax_pkg_swig.m4
399	%%MACRODIR%%/ax_prefix_config_h.m4	411	%%MACRODIR%%/ax_prefix_config_h.m4
Lines 416-421 Link Here
416	%%MACRODIR%%/ax_prog_fig2dev.m4	428	%%MACRODIR%%/ax_prog_fig2dev.m4
417	%%MACRODIR%%/ax_prog_flex.m4	429	%%MACRODIR%%/ax_prog_flex.m4
418	%%MACRODIR%%/ax_prog_guile_version.m4	430	%%MACRODIR%%/ax_prog_guile_version.m4
		431	%%MACRODIR%%/ax_prog_haxe_version.m4
419	%%MACRODIR%%/ax_prog_hla.m4	432	%%MACRODIR%%/ax_prog_hla.m4
420	%%MACRODIR%%/ax_prog_hla_opt.m4	433	%%MACRODIR%%/ax_prog_hla_opt.m4
421	%%MACRODIR%%/ax_prog_httpd.m4	434	%%MACRODIR%%/ax_prog_httpd.m4
Lines 510-515 Link Here
510	%%MACRODIR%%/ax_try_run_java.m4	523	%%MACRODIR%%/ax_try_run_java.m4
511	%%MACRODIR%%/ax_type_socklen_t.m4	524	%%MACRODIR%%/ax_type_socklen_t.m4
512	%%MACRODIR%%/ax_upload.m4	525	%%MACRODIR%%/ax_upload.m4
		526	%%MACRODIR%%/ax_valgrind_check.m4
513	%%MACRODIR%%/ax_var_timezone_externals.m4	527	%%MACRODIR%%/ax_var_timezone_externals.m4
514	%%MACRODIR%%/ax_very_nice.m4	528	%%MACRODIR%%/ax_very_nice.m4
515	%%MACRODIR%%/ax_warning_default_aclocaldir.m4	529	%%MACRODIR%%/ax_warning_default_aclocaldir.m4
Lines 526-532 Link Here
526	%%MACRODIR%%/ax_xsdcxx.m4	540	%%MACRODIR%%/ax_xsdcxx.m4
527	%%MACRODIR%%/ax_xtra_classpath.m4	541	%%MACRODIR%%/ax_xtra_classpath.m4
528	%%MACRODIR%%/ax_zoneinfo.m4	542	%%MACRODIR%%/ax_zoneinfo.m4
529	share/autoconf-archive/AUTHORS	543	%%DATADIR%%/AUTHORS
530	share/autoconf-archive/COPYING	544	%%DATADIR%%/COPYING
531	share/autoconf-archive/COPYING.EXCEPTION	545	%%DATADIR%%/COPYING.EXCEPTION
532	share/autoconf-archive/README	546	%%DATADIR%%/README

Line 0 Link Here

(-)devel/autoconf-archive/files/patch-8d9c8f1 (+54 lines)
	1	From 8d9c8f162b6cc71ae217ddeef2cef522060bc85e Mon Sep 17 00:00:00 2001
	2	From: Ting-Wei Lan <lantw@src.gnome.org>
	3	Date: Tue, 21 Apr 2015 03:27:04 +0800
	4	Subject: [PATCH] ax_compiler_flags: Prevent using bash substring expansion
	5
	6	Substring expansion such as ${flag:5} is not supported by POSIX, and
	7	it can cause error for systems not using bash as their default shell.
	8	---
	9	m4/ax_compiler_flags_cflags.m4 \| 3 ++-
	10	m4/ax_compiler_flags_cxxflags.m4 \| 3 ++-
	11	2 files changed, 4 insertions(+), 2 deletions(-)
	12
	13	diff --git a/m4/ax_compiler_flags_cflags.m4 b/m4/ax_compiler_flags_cflags.m4
	14	index 86896c1..5bebe25 100644
	15	--- m4/ax_compiler_flags_cflags.m4
	16	+++ m4/ax_compiler_flags_cflags.m4
	17	@@ -28,6 +28,7 @@
	18	#serial 9
	19
	20	AC_DEFUN([AX_COMPILER_FLAGS_CFLAGS],[
	21	+ AC_REQUIRE([AC_PROG_SED])
	22	AX_REQUIRE_DEFINED([AX_APPEND_COMPILE_FLAGS])
	23	AX_REQUIRE_DEFINED([AX_APPEND_FLAG])
	24	AX_REQUIRE_DEFINED([AX_CHECK_COMPILE_FLAG])
	25	@@ -119,7 +120,7 @@ AC_DEFUN([AX_COMPILER_FLAGS_CFLAGS],[
	26	AS_CASE([$flag],
	27	[-Wno-=],[],
	28	[-Wno-*],[
	29	- AX_APPEND_COMPILE_FLAGS([-Wno-error=${flag:5}],
	30	+ AX_APPEND_COMPILE_FLAGS([-Wno-error=$(AS_ECHO([$flag]) \| $SED 's/^-Wno-//')],
	31	ax_warn_cflags_variable,
	32	[$ax_compiler_flags_test])
	33	])
	34	diff --git a/m4/ax_compiler_flags_cxxflags.m4 b/m4/ax_compiler_flags_cxxflags.m4
	35	index dd3b583..112cb76 100644
	36	--- m4/ax_compiler_flags_cxxflags.m4
	37	+++ m4/ax_compiler_flags_cxxflags.m4
	38	@@ -29,6 +29,7 @@
	39	#serial 5
	40
	41	AC_DEFUN([AX_COMPILER_FLAGS_CXXFLAGS],[
	42	+ AC_REQUIRE([AC_PROG_SED])
	43	AX_REQUIRE_DEFINED([AX_APPEND_COMPILE_FLAGS])
	44	AX_REQUIRE_DEFINED([AX_APPEND_FLAG])
	45	AX_REQUIRE_DEFINED([AX_CHECK_COMPILE_FLAG])
	46	@@ -115,7 +116,7 @@ AC_DEFUN([AX_COMPILER_FLAGS_CXXFLAGS],[
	47	AS_CASE([$flag],
	48	[-Wno-=],[],
	49	[-Wno-*],[
	50	- AX_APPEND_COMPILE_FLAGS([-Wno-error=${flag:5}],
	51	+ AX_APPEND_COMPILE_FLAGS([-Wno-error=$(AS_ECHO([$flag]) \| $SED 's/^-Wno-//')],
	52	ax_warn_cxxflags_variable,
	53	[$ax_compiler_flags_test])
	54	])