From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1RQOyh-00064y-G2 for garchives@archives.gentoo.org; Tue, 15 Nov 2011 19:47:31 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DC08421C0C8; Tue, 15 Nov 2011 19:47:23 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 0225421C0C8 for ; Tue, 15 Nov 2011 19:47:22 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1C2CF1B4029 for ; Tue, 15 Nov 2011 19:47:22 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 8966B80042 for ; Tue, 15 Nov 2011 19:47:21 +0000 (UTC) From: "Anthony G. Basile" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Anthony G. Basile" Message-ID: <576128f60cd8613384cd4b76759b9b687523346a.blueness@gentoo> Subject: [gentoo-commits] proj/elfix:elfix-0.3.x commit in: /, tests/gnustack/, autom4te.cache/, tests/, tests/pxtpax/ X-VCS-Repository: proj/elfix X-VCS-Files: ChangeLog autom4te.cache/output.0 autom4te.cache/output.1 autom4te.cache/requests autom4te.cache/traces.0 autom4te.cache/traces.1 configure configure.ac tests/Makefile.in tests/gnustack/Makefile.in tests/pxtpax/Makefile.in X-VCS-Directories: / tests/gnustack/ autom4te.cache/ tests/ tests/pxtpax/ X-VCS-Committer: blueness X-VCS-Committer-Name: Anthony G. Basile X-VCS-Revision: 576128f60cd8613384cd4b76759b9b687523346a Date: Tue, 15 Nov 2011 19:47:21 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 8875efaf-c0fe-4350-b8c3-43d8e775da39 X-Archives-Hash: 602377c30ed37f6ad6d83f7b365f5d9b commit: 576128f60cd8613384cd4b76759b9b687523346a Author: Anthony G. Basile gentoo org> AuthorDate: Tue Nov 15 19:47:13 2011 +0000 Commit: Anthony G. Basile gentoo org> CommitDate: Tue Nov 15 19:47:13 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/elfix.git;a=3D= commit;h=3D576128f6 Prepare release 0.3.2 --- ChangeLog | 3 +- autom4te.cache/output.0 | 24 ++-- autom4te.cache/output.1 | 24 ++-- autom4te.cache/requests | 38 +++--- autom4te.cache/traces.0 | 18 +- autom4te.cache/traces.1 | 68 +++++---- configure | 24 ++-- configure.ac | 2 +- tests/Makefile.in | 310 ++++++++++++++++++++++++--------= ------ tests/{ =3D> gnustack}/Makefile.in | 10 +- tests/{ =3D> pxtpax}/Makefile.in | 48 ++---- 11 files changed, 324 insertions(+), 245 deletions(-) diff --git a/ChangeLog b/ChangeLog index f8cc7b9..4356ad5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,4 @@ +2011-11-15 Anthony G. Basile =20 * tests/pxtpax: compare pax flags on binary and process * fix-gnustack and paxctl-ng: fix exit code on success @@ -5,7 +6,7 @@ * paxctl-ng: if a file fails to open O_RDWR then don't do PT_PAX markings but continue with XT_PAX =20 -2011-10-23 +2011-10-23 Anthony G. Basile =20 * Release 0.3.0 * add XT_PAX read/write in paxct-ng.c and paxmodule.c diff --git a/autom4te.cache/output.0 b/autom4te.cache/output.0 index f8c8e58..183ffc6 100644 --- a/autom4te.cache/output.0 +++ b/autom4te.cache/output.0 @@ -1,6 +1,6 @@ @%:@! /bin/sh @%:@ Guess values for system-dependent variables and create Makefiles. -@%:@ Generated by GNU Autoconf 2.68 for elfix 0.3.1. +@%:@ Generated by GNU Autoconf 2.68 for elfix 0.3.2. @%:@ @%:@ Report bugs to . @%:@=20 @@ -560,8 +560,8 @@ MAKEFLAGS=3D # Identity of this package. PACKAGE_NAME=3D'elfix' PACKAGE_TARNAME=3D'elfix' -PACKAGE_VERSION=3D'0.3.1' -PACKAGE_STRING=3D'elfix 0.3.1' +PACKAGE_VERSION=3D'0.3.2' +PACKAGE_STRING=3D'elfix 0.3.2' PACKAGE_BUGREPORT=3D'http://bugs.gentoo.org/' PACKAGE_URL=3D'' =20 @@ -1247,7 +1247,7 @@ if test "$ac_init_help" =3D "long"; then # Omit some internal or obsolete options to make the list less imposin= g. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures elfix 0.3.1 to adapt to many kinds of systems. +\`configure' configures elfix 0.3.2 to adapt to many kinds of systems. =20 Usage: $0 [OPTION]... [VAR=3DVALUE]... =20 @@ -1313,7 +1313,7 @@ fi =20 if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of elfix 0.3.1:";; + short | recursive ) echo "Configuration of elfix 0.3.2:";; esac cat <<\_ACEOF =20 @@ -1401,7 +1401,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -elfix configure 0.3.1 +elfix configure 0.3.2 generated by GNU Autoconf 2.68 =20 Copyright (C) 2010 Free Software Foundation, Inc. @@ -1877,7 +1877,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. =20 -It was created by elfix $as_me 0.3.1, which was +It was created by elfix $as_me 0.3.2, which was generated by GNU Autoconf 2.68. Invocation command line was =20 $ $0 $@ @@ -2698,7 +2698,7 @@ fi =20 # Define the identity of the package. PACKAGE=3D'elfix' - VERSION=3D'0.3.1' + VERSION=3D'0.3.2' =20 =20 cat >>confdefs.h <<_ACEOF @@ -4581,7 +4581,7 @@ esac fi =20 =20 -ac_config_files=3D"$ac_config_files Makefile src/Makefile scripts/Makefi= le doc/Makefile tests/Makefile" +ac_config_files=3D"$ac_config_files Makefile src/Makefile scripts/Makefi= le doc/Makefile tests/Makefile tests/gnustack/Makefile tests/pxtpax/Makef= ile" =20 =20 cat >confcache <<\_ACEOF @@ -5122,7 +5122,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=3D1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=3D" -This file was extended by elfix $as_me 0.3.1, which was +This file was extended by elfix $as_me 0.3.2, which was generated by GNU Autoconf 2.68. Invocation command line was =20 CONFIG_FILES =3D $CONFIG_FILES @@ -5188,7 +5188,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=3D1 ac_cs_config=3D"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\= $]/\\\\&/g'`" ac_cs_version=3D"\\ -elfix config.status 0.3.1 +elfix config.status 0.3.2 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" =20 @@ -5324,6 +5324,8 @@ do "scripts/Makefile") CONFIG_FILES=3D"$CONFIG_FILES scripts/Makefile" = ;; "doc/Makefile") CONFIG_FILES=3D"$CONFIG_FILES doc/Makefile" ;; "tests/Makefile") CONFIG_FILES=3D"$CONFIG_FILES tests/Makefile" ;; + "tests/gnustack/Makefile") CONFIG_FILES=3D"$CONFIG_FILES tests/gnust= ack/Makefile" ;; + "tests/pxtpax/Makefile") CONFIG_FILES=3D"$CONFIG_FILES tests/pxtpax/= Makefile" ;; =20 *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5= ;; esac diff --git a/autom4te.cache/output.1 b/autom4te.cache/output.1 index f8c8e58..183ffc6 100644 --- a/autom4te.cache/output.1 +++ b/autom4te.cache/output.1 @@ -1,6 +1,6 @@ @%:@! /bin/sh @%:@ Guess values for system-dependent variables and create Makefiles. -@%:@ Generated by GNU Autoconf 2.68 for elfix 0.3.1. +@%:@ Generated by GNU Autoconf 2.68 for elfix 0.3.2. @%:@ @%:@ Report bugs to . @%:@=20 @@ -560,8 +560,8 @@ MAKEFLAGS=3D # Identity of this package. PACKAGE_NAME=3D'elfix' PACKAGE_TARNAME=3D'elfix' -PACKAGE_VERSION=3D'0.3.1' -PACKAGE_STRING=3D'elfix 0.3.1' +PACKAGE_VERSION=3D'0.3.2' +PACKAGE_STRING=3D'elfix 0.3.2' PACKAGE_BUGREPORT=3D'http://bugs.gentoo.org/' PACKAGE_URL=3D'' =20 @@ -1247,7 +1247,7 @@ if test "$ac_init_help" =3D "long"; then # Omit some internal or obsolete options to make the list less imposin= g. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures elfix 0.3.1 to adapt to many kinds of systems. +\`configure' configures elfix 0.3.2 to adapt to many kinds of systems. =20 Usage: $0 [OPTION]... [VAR=3DVALUE]... =20 @@ -1313,7 +1313,7 @@ fi =20 if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of elfix 0.3.1:";; + short | recursive ) echo "Configuration of elfix 0.3.2:";; esac cat <<\_ACEOF =20 @@ -1401,7 +1401,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -elfix configure 0.3.1 +elfix configure 0.3.2 generated by GNU Autoconf 2.68 =20 Copyright (C) 2010 Free Software Foundation, Inc. @@ -1877,7 +1877,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. =20 -It was created by elfix $as_me 0.3.1, which was +It was created by elfix $as_me 0.3.2, which was generated by GNU Autoconf 2.68. Invocation command line was =20 $ $0 $@ @@ -2698,7 +2698,7 @@ fi =20 # Define the identity of the package. PACKAGE=3D'elfix' - VERSION=3D'0.3.1' + VERSION=3D'0.3.2' =20 =20 cat >>confdefs.h <<_ACEOF @@ -4581,7 +4581,7 @@ esac fi =20 =20 -ac_config_files=3D"$ac_config_files Makefile src/Makefile scripts/Makefi= le doc/Makefile tests/Makefile" +ac_config_files=3D"$ac_config_files Makefile src/Makefile scripts/Makefi= le doc/Makefile tests/Makefile tests/gnustack/Makefile tests/pxtpax/Makef= ile" =20 =20 cat >confcache <<\_ACEOF @@ -5122,7 +5122,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=3D1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=3D" -This file was extended by elfix $as_me 0.3.1, which was +This file was extended by elfix $as_me 0.3.2, which was generated by GNU Autoconf 2.68. Invocation command line was =20 CONFIG_FILES =3D $CONFIG_FILES @@ -5188,7 +5188,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=3D1 ac_cs_config=3D"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\= $]/\\\\&/g'`" ac_cs_version=3D"\\ -elfix config.status 0.3.1 +elfix config.status 0.3.2 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" =20 @@ -5324,6 +5324,8 @@ do "scripts/Makefile") CONFIG_FILES=3D"$CONFIG_FILES scripts/Makefile" = ;; "doc/Makefile") CONFIG_FILES=3D"$CONFIG_FILES doc/Makefile" ;; "tests/Makefile") CONFIG_FILES=3D"$CONFIG_FILES tests/Makefile" ;; + "tests/gnustack/Makefile") CONFIG_FILES=3D"$CONFIG_FILES tests/gnust= ack/Makefile" ;; + "tests/pxtpax/Makefile") CONFIG_FILES=3D"$CONFIG_FILES tests/pxtpax/= Makefile" ;; =20 *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5= ;; esac diff --git a/autom4te.cache/requests b/autom4te.cache/requests index 9162197..4be421f 100644 --- a/autom4te.cache/requests +++ b/autom4te.cache/requests @@ -64,8 +64,8 @@ 'AM_SET_LEADING_DOT' =3D> 1, 'AM_SET_DEPDIR' =3D> 1, '_AM_DEPENDENCIES' =3D> 1, - 'AM_PROG_INSTALL_SH' =3D> 1, 'm4_include' =3D> 1, + 'AM_PROG_INSTALL_SH' =3D> 1, '_AC_AM_CONFIG_HEADER_HOOK' =3D> 1, 'AU_DEFUN' =3D> 1, 'AM_MAKE_INCLUDE' =3D> 1 @@ -83,55 +83,55 @@ 'configure.ac' ], { - '_LT_AC_TAGCONFIG' =3D> 1, 'AM_PROG_F77_C_O' =3D> 1, - 'AC_INIT' =3D> 1, + '_LT_AC_TAGCONFIG' =3D> 1, 'm4_pattern_forbid' =3D> 1, - '_AM_COND_IF' =3D> 1, + 'AC_INIT' =3D> 1, 'AC_CANONICAL_TARGET' =3D> 1, - 'AC_SUBST' =3D> 1, + '_AM_COND_IF' =3D> 1, 'AC_CONFIG_LIBOBJ_DIR' =3D> 1, - 'AC_FC_SRCEXT' =3D> 1, + 'AC_SUBST' =3D> 1, 'AC_CANONICAL_HOST' =3D> 1, + 'AC_FC_SRCEXT' =3D> 1, 'AC_PROG_LIBTOOL' =3D> 1, 'AM_INIT_AUTOMAKE' =3D> 1, - 'AM_PATH_GUILE' =3D> 1, 'AC_CONFIG_SUBDIRS' =3D> 1, + 'AM_PATH_GUILE' =3D> 1, 'AM_AUTOMAKE_VERSION' =3D> 1, 'LT_CONFIG_LTDL_DIR' =3D> 1, - 'AC_REQUIRE_AUX_FILE' =3D> 1, 'AC_CONFIG_LINKS' =3D> 1, - 'm4_sinclude' =3D> 1, + 'AC_REQUIRE_AUX_FILE' =3D> 1, 'LT_SUPPORTED_TAG' =3D> 1, + 'm4_sinclude' =3D> 1, 'AM_MAINTAINER_MODE' =3D> 1, 'AM_NLS' =3D> 1, 'AM_GNU_GETTEXT_INTL_SUBDIR' =3D> 1, - 'AM_MAKEFILE_INCLUDE' =3D> 1, '_m4_warn' =3D> 1, + 'AM_MAKEFILE_INCLUDE' =3D> 1, 'AM_PROG_CXX_C_O' =3D> 1, - '_AM_COND_ENDIF' =3D> 1, '_AM_MAKEFILE_INCLUDE' =3D> 1, + '_AM_COND_ENDIF' =3D> 1, 'AM_ENABLE_MULTILIB' =3D> 1, 'AM_SILENT_RULES' =3D> 1, 'AM_PROG_MOC' =3D> 1, 'AC_CONFIG_FILES' =3D> 1, - 'include' =3D> 1, 'LT_INIT' =3D> 1, - 'AM_PROG_AR' =3D> 1, + 'include' =3D> 1, 'AM_GNU_GETTEXT' =3D> 1, + 'AM_PROG_AR' =3D> 1, 'AC_LIBSOURCE' =3D> 1, - 'AM_PROG_FC_C_O' =3D> 1, 'AC_CANONICAL_BUILD' =3D> 1, + 'AM_PROG_FC_C_O' =3D> 1, 'AC_FC_FREEFORM' =3D> 1, 'AH_OUTPUT' =3D> 1, - '_AM_SUBST_NOTMAKE' =3D> 1, 'AC_CONFIG_AUX_DIR' =3D> 1, - 'sinclude' =3D> 1, - 'AM_PROG_CC_C_O' =3D> 1, + '_AM_SUBST_NOTMAKE' =3D> 1, 'm4_pattern_allow' =3D> 1, - 'AM_XGETTEXT_OPTION' =3D> 1, - 'AC_CANONICAL_SYSTEM' =3D> 1, + 'AM_PROG_CC_C_O' =3D> 1, + 'sinclude' =3D> 1, 'AM_CONDITIONAL' =3D> 1, + 'AC_CANONICAL_SYSTEM' =3D> 1, + 'AM_XGETTEXT_OPTION' =3D> 1, 'AC_CONFIG_HEADERS' =3D> 1, 'AC_DEFINE_TRACE_LITERAL' =3D> 1, 'AM_POT_TOOLS' =3D> 1, diff --git a/autom4te.cache/traces.0 b/autom4te.cache/traces.0 index 469b21f..9909fcf 100644 --- a/autom4te.cache/traces.0 +++ b/autom4te.cache/traces.0 @@ -761,12 +761,12 @@ m4trace:configure.ac:46: -1- m4_pattern_allow([^_UI= NT8_T$]) m4trace:configure.ac:46: -1- m4_pattern_allow([^uint8_t$]) m4trace:configure.ac:47: -1- m4_pattern_allow([^uint16_t$]) m4trace:configure.ac:50: -1- m4_pattern_allow([^LIB@&t@OBJS$]) -m4trace:configure.ac:58: -1- m4_pattern_allow([^LIB@&t@OBJS$]) -m4trace:configure.ac:58: -1- m4_pattern_allow([^LTLIBOBJS$]) -m4trace:configure.ac:58: -1- AM_CONDITIONAL([am__EXEEXT], [test -n "$EXE= EXT"]) -m4trace:configure.ac:58: -1- m4_pattern_allow([^am__EXEEXT_TRUE$]) -m4trace:configure.ac:58: -1- m4_pattern_allow([^am__EXEEXT_FALSE$]) -m4trace:configure.ac:58: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_TRUE]) -m4trace:configure.ac:58: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_FALSE]) -m4trace:configure.ac:58: -1- _AC_AM_CONFIG_HEADER_HOOK(["$ac_file"]) -m4trace:configure.ac:58: -1- _AM_OUTPUT_DEPENDENCY_COMMANDS +m4trace:configure.ac:62: -1- m4_pattern_allow([^LIB@&t@OBJS$]) +m4trace:configure.ac:62: -1- m4_pattern_allow([^LTLIBOBJS$]) +m4trace:configure.ac:62: -1- AM_CONDITIONAL([am__EXEEXT], [test -n "$EXE= EXT"]) +m4trace:configure.ac:62: -1- m4_pattern_allow([^am__EXEEXT_TRUE$]) +m4trace:configure.ac:62: -1- m4_pattern_allow([^am__EXEEXT_FALSE$]) +m4trace:configure.ac:62: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_TRUE]) +m4trace:configure.ac:62: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_FALSE]) +m4trace:configure.ac:62: -1- _AC_AM_CONFIG_HEADER_HOOK(["$ac_file"]) +m4trace:configure.ac:62: -1- _AM_OUTPUT_DEPENDENCY_COMMANDS diff --git a/autom4te.cache/traces.1 b/autom4te.cache/traces.1 index ff9cecc..e70c6c8 100644 --- a/autom4te.cache/traces.1 +++ b/autom4te.cache/traces.1 @@ -1,4 +1,4 @@ -m4trace:configure.ac:5: -1- AC_INIT([elfix], [0.3.1], [http://bugs.gento= o.org/]) +m4trace:configure.ac:5: -1- AC_INIT([elfix], [0.3.2], [http://bugs.gento= o.org/]) m4trace:configure.ac:5: -1- m4_pattern_forbid([^_?A[CHUM]_]) m4trace:configure.ac:5: -1- m4_pattern_forbid([_AC_]) m4trace:configure.ac:5: -1- m4_pattern_forbid([^LIBOBJS$], [do not use L= IBOBJS directly, use AC_LIBOBJ (see section `AC_LIBOBJ vs LIBOBJS']) @@ -430,34 +430,38 @@ m4trace:configure.ac:50: -1- AC_SUBST([LIB@&t@OBJS]= , ["$LIB@&t@OBJS error.$ac_ob m4trace:configure.ac:50: -1- AC_SUBST_TRACE([LIB@&t@OBJS]) m4trace:configure.ac:50: -1- m4_pattern_allow([^LIB@&t@OBJS$]) m4trace:configure.ac:50: -1- AC_LIBSOURCE([error.c]) -m4trace:configure.ac:52: -1- AC_CONFIG_FILES([Makefile - src/Makefile - scripts/Makefile - doc/Makefile - tests/Makefile]) -m4trace:configure.ac:58: -1- AC_SUBST([LIB@&t@OBJS], [$ac_libobjs]) -m4trace:configure.ac:58: -1- AC_SUBST_TRACE([LIB@&t@OBJS]) -m4trace:configure.ac:58: -1- m4_pattern_allow([^LIB@&t@OBJS$]) -m4trace:configure.ac:58: -1- AC_SUBST([LTLIBOBJS], [$ac_ltlibobjs]) -m4trace:configure.ac:58: -1- AC_SUBST_TRACE([LTLIBOBJS]) -m4trace:configure.ac:58: -1- m4_pattern_allow([^LTLIBOBJS$]) -m4trace:configure.ac:58: -1- AM_CONDITIONAL([am__EXEEXT], [test -n "$EXE= EXT"]) -m4trace:configure.ac:58: -1- AC_SUBST([am__EXEEXT_TRUE]) -m4trace:configure.ac:58: -1- AC_SUBST_TRACE([am__EXEEXT_TRUE]) -m4trace:configure.ac:58: -1- m4_pattern_allow([^am__EXEEXT_TRUE$]) -m4trace:configure.ac:58: -1- AC_SUBST([am__EXEEXT_FALSE]) -m4trace:configure.ac:58: -1- AC_SUBST_TRACE([am__EXEEXT_FALSE]) -m4trace:configure.ac:58: -1- m4_pattern_allow([^am__EXEEXT_FALSE$]) -m4trace:configure.ac:58: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_TRUE]) -m4trace:configure.ac:58: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_FALSE]) -m4trace:configure.ac:58: -1- AC_SUBST_TRACE([top_builddir]) -m4trace:configure.ac:58: -1- AC_SUBST_TRACE([top_build_prefix]) -m4trace:configure.ac:58: -1- AC_SUBST_TRACE([srcdir]) -m4trace:configure.ac:58: -1- AC_SUBST_TRACE([abs_srcdir]) -m4trace:configure.ac:58: -1- AC_SUBST_TRACE([top_srcdir]) -m4trace:configure.ac:58: -1- AC_SUBST_TRACE([abs_top_srcdir]) -m4trace:configure.ac:58: -1- AC_SUBST_TRACE([builddir]) -m4trace:configure.ac:58: -1- AC_SUBST_TRACE([abs_builddir]) -m4trace:configure.ac:58: -1- AC_SUBST_TRACE([abs_top_builddir]) -m4trace:configure.ac:58: -1- AC_SUBST_TRACE([INSTALL]) -m4trace:configure.ac:58: -1- AC_SUBST_TRACE([MKDIR_P]) +m4trace:configure.ac:52: -1- AC_CONFIG_FILES([ + Makefile + src/Makefile + scripts/Makefile + doc/Makefile + tests/Makefile + tests/gnustack/Makefile + tests/pxtpax/Makefile +]) +m4trace:configure.ac:62: -1- AC_SUBST([LIB@&t@OBJS], [$ac_libobjs]) +m4trace:configure.ac:62: -1- AC_SUBST_TRACE([LIB@&t@OBJS]) +m4trace:configure.ac:62: -1- m4_pattern_allow([^LIB@&t@OBJS$]) +m4trace:configure.ac:62: -1- AC_SUBST([LTLIBOBJS], [$ac_ltlibobjs]) +m4trace:configure.ac:62: -1- AC_SUBST_TRACE([LTLIBOBJS]) +m4trace:configure.ac:62: -1- m4_pattern_allow([^LTLIBOBJS$]) +m4trace:configure.ac:62: -1- AM_CONDITIONAL([am__EXEEXT], [test -n "$EXE= EXT"]) +m4trace:configure.ac:62: -1- AC_SUBST([am__EXEEXT_TRUE]) +m4trace:configure.ac:62: -1- AC_SUBST_TRACE([am__EXEEXT_TRUE]) +m4trace:configure.ac:62: -1- m4_pattern_allow([^am__EXEEXT_TRUE$]) +m4trace:configure.ac:62: -1- AC_SUBST([am__EXEEXT_FALSE]) +m4trace:configure.ac:62: -1- AC_SUBST_TRACE([am__EXEEXT_FALSE]) +m4trace:configure.ac:62: -1- m4_pattern_allow([^am__EXEEXT_FALSE$]) +m4trace:configure.ac:62: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_TRUE]) +m4trace:configure.ac:62: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_FALSE]) +m4trace:configure.ac:62: -1- AC_SUBST_TRACE([top_builddir]) +m4trace:configure.ac:62: -1- AC_SUBST_TRACE([top_build_prefix]) +m4trace:configure.ac:62: -1- AC_SUBST_TRACE([srcdir]) +m4trace:configure.ac:62: -1- AC_SUBST_TRACE([abs_srcdir]) +m4trace:configure.ac:62: -1- AC_SUBST_TRACE([top_srcdir]) +m4trace:configure.ac:62: -1- AC_SUBST_TRACE([abs_top_srcdir]) +m4trace:configure.ac:62: -1- AC_SUBST_TRACE([builddir]) +m4trace:configure.ac:62: -1- AC_SUBST_TRACE([abs_builddir]) +m4trace:configure.ac:62: -1- AC_SUBST_TRACE([abs_top_builddir]) +m4trace:configure.ac:62: -1- AC_SUBST_TRACE([INSTALL]) +m4trace:configure.ac:62: -1- AC_SUBST_TRACE([MKDIR_P]) diff --git a/configure b/configure index 1b8c818..a9cc48b 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for elfix 0.3.1. +# Generated by GNU Autoconf 2.68 for elfix 0.3.2. # # Report bugs to . # @@ -560,8 +560,8 @@ MAKEFLAGS=3D # Identity of this package. PACKAGE_NAME=3D'elfix' PACKAGE_TARNAME=3D'elfix' -PACKAGE_VERSION=3D'0.3.1' -PACKAGE_STRING=3D'elfix 0.3.1' +PACKAGE_VERSION=3D'0.3.2' +PACKAGE_STRING=3D'elfix 0.3.2' PACKAGE_BUGREPORT=3D'http://bugs.gentoo.org/' PACKAGE_URL=3D'' =20 @@ -1247,7 +1247,7 @@ if test "$ac_init_help" =3D "long"; then # Omit some internal or obsolete options to make the list less imposin= g. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures elfix 0.3.1 to adapt to many kinds of systems. +\`configure' configures elfix 0.3.2 to adapt to many kinds of systems. =20 Usage: $0 [OPTION]... [VAR=3DVALUE]... =20 @@ -1313,7 +1313,7 @@ fi =20 if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of elfix 0.3.1:";; + short | recursive ) echo "Configuration of elfix 0.3.2:";; esac cat <<\_ACEOF =20 @@ -1401,7 +1401,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -elfix configure 0.3.1 +elfix configure 0.3.2 generated by GNU Autoconf 2.68 =20 Copyright (C) 2010 Free Software Foundation, Inc. @@ -1877,7 +1877,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. =20 -It was created by elfix $as_me 0.3.1, which was +It was created by elfix $as_me 0.3.2, which was generated by GNU Autoconf 2.68. Invocation command line was =20 $ $0 $@ @@ -2698,7 +2698,7 @@ fi =20 # Define the identity of the package. PACKAGE=3D'elfix' - VERSION=3D'0.3.1' + VERSION=3D'0.3.2' =20 =20 cat >>confdefs.h <<_ACEOF @@ -4581,7 +4581,7 @@ esac fi =20 =20 -ac_config_files=3D"$ac_config_files Makefile src/Makefile scripts/Makefi= le doc/Makefile tests/Makefile" +ac_config_files=3D"$ac_config_files Makefile src/Makefile scripts/Makefi= le doc/Makefile tests/Makefile tests/gnustack/Makefile tests/pxtpax/Makef= ile" =20 =20 cat >confcache <<\_ACEOF @@ -5122,7 +5122,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=3D1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=3D" -This file was extended by elfix $as_me 0.3.1, which was +This file was extended by elfix $as_me 0.3.2, which was generated by GNU Autoconf 2.68. Invocation command line was =20 CONFIG_FILES =3D $CONFIG_FILES @@ -5188,7 +5188,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=3D1 ac_cs_config=3D"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\= $]/\\\\&/g'`" ac_cs_version=3D"\\ -elfix config.status 0.3.1 +elfix config.status 0.3.2 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" =20 @@ -5324,6 +5324,8 @@ do "scripts/Makefile") CONFIG_FILES=3D"$CONFIG_FILES scripts/Makefile" = ;; "doc/Makefile") CONFIG_FILES=3D"$CONFIG_FILES doc/Makefile" ;; "tests/Makefile") CONFIG_FILES=3D"$CONFIG_FILES tests/Makefile" ;; + "tests/gnustack/Makefile") CONFIG_FILES=3D"$CONFIG_FILES tests/gnust= ack/Makefile" ;; + "tests/pxtpax/Makefile") CONFIG_FILES=3D"$CONFIG_FILES tests/pxtpax/= Makefile" ;; =20 *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5= ;; esac diff --git a/configure.ac b/configure.ac index 9ccd9a0..98cb716 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. =20 AC_PREREQ([2.65]) -AC_INIT([elfix], [0.3.1], [http://bugs.gentoo.org/]) +AC_INIT([elfix], [0.3.2], [http://bugs.gentoo.org/]) AC_CONFIG_SRCDIR([src/fix-gnustack.c]) AC_CONFIG_HEADERS([config.h]) AM_INIT_AUTOMAKE([1.11 foreign]) diff --git a/tests/Makefile.in b/tests/Makefile.in index f44395d..00fb601 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -14,7 +14,6 @@ # PARTICULAR PURPOSE. =20 @SET_MAKE@ - VPATH =3D @srcdir@ pkgdatadir =3D $(datadir)/@PACKAGE@ pkgincludedir =3D $(includedir)/@PACKAGE@ @@ -32,7 +31,6 @@ POST_INSTALL =3D : NORMAL_UNINSTALL =3D : PRE_UNINSTALL =3D : POST_UNINSTALL =3D : -noinst_PROGRAMS =3D bad-gnustack$(EXEEXT) subdir =3D tests DIST_COMMON =3D $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 =3D $(top_srcdir)/aclocal.m4 @@ -43,22 +41,49 @@ mkinstalldirs =3D $(install_sh) -d CONFIG_HEADER =3D $(top_builddir)/config.h CONFIG_CLEAN_FILES =3D CONFIG_CLEAN_VPATH_FILES =3D -PROGRAMS =3D $(noinst_PROGRAMS) -am_bad_gnustack_OBJECTS =3D bad-gnustack.$(OBJEXT) -bad_gnustack_OBJECTS =3D $(am_bad_gnustack_OBJECTS) -DEFAULT_INCLUDES =3D -I.@am__isrc@ -I$(top_builddir) -depcomp =3D $(SHELL) $(top_srcdir)/depcomp -am__depfiles_maybe =3D depfiles -am__mv =3D mv -f -COMPILE =3D $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS)= \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -CCLD =3D $(CC) -LINK =3D $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -SOURCES =3D $(bad_gnustack_SOURCES) -DIST_SOURCES =3D $(bad_gnustack_SOURCES) +SOURCES =3D +DIST_SOURCES =3D +RECURSIVE_TARGETS =3D all-recursive check-recursive dvi-recursive \ + html-recursive info-recursive install-data-recursive \ + install-dvi-recursive install-exec-recursive \ + install-html-recursive install-info-recursive \ + install-pdf-recursive install-ps-recursive install-recursive \ + installcheck-recursive installdirs-recursive pdf-recursive \ + ps-recursive uninstall-recursive +RECURSIVE_CLEAN_TARGETS =3D mostlyclean-recursive clean-recursive \ + distclean-recursive maintainer-clean-recursive +AM_RECURSIVE_TARGETS =3D $(RECURSIVE_TARGETS:-recursive=3D) \ + $(RECURSIVE_CLEAN_TARGETS:-recursive=3D) tags TAGS ctags CTAGS \ + distdir ETAGS =3D etags CTAGS =3D ctags +DIST_SUBDIRS =3D $(SUBDIRS) DISTFILES =3D $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +am__relativize =3D \ + dir0=3D`pwd`; \ + sed_first=3D's,^\([^/]*\)/.*$$,\1,'; \ + sed_rest=3D's,^[^/]*/*,,'; \ + sed_last=3D's,^.*/\([^/]*\)$$,\1,'; \ + sed_butlast=3D's,/*[^/]*$$,,'; \ + while test -n "$$dir1"; do \ + first=3D`echo "$$dir1" | sed -e "$$sed_first"`; \ + if test "$$first" !=3D "."; then \ + if test "$$first" =3D ".."; then \ + dir2=3D`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ + dir0=3D`echo "$$dir0" | sed -e "$$sed_butlast"`; \ + else \ + first2=3D`echo "$$dir2" | sed -e "$$sed_first"`; \ + if test "$$first2" =3D "$$first"; then \ + dir2=3D`echo "$$dir2" | sed -e "$$sed_rest"`; \ + else \ + dir2=3D"../$$dir2"; \ + fi; \ + dir0=3D"$$dir0"/"$$first"; \ + fi; \ + fi; \ + dir1=3D`echo "$$dir1" | sed -e "$$sed_rest"`; \ + done; \ + reldir=3D"$$dir2" ACLOCAL =3D @ACLOCAL@ AMTAR =3D @AMTAR@ AUTOCONF =3D @AUTOCONF@ @@ -146,18 +171,10 @@ target_alias =3D @target_alias@ top_build_prefix =3D @top_build_prefix@ top_builddir =3D @top_builddir@ top_srcdir =3D @top_srcdir@ -bad_gnustack_SOURCES =3D bad-gnustack.c -bad_gnustack_DEPENDENCIES =3D bad-asm.o -bad_gnustack_LDADD =3D bad-asm.o -EXTRA_DIST =3D bad64.asm bad32.asm -ARCH =3D $(shell uname -m | sed -e 's/i./x/') -check_SCRIPTS =3D test.sh -TEST =3D $(check_SCRIPTS) -CLEANFILES =3D bad-asm.o test.sh -all: all-am +SUBDIRS =3D gnustack pxtpax +all: all-recursive =20 .SUFFIXES: -.SUFFIXES: .c .o .obj $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -189,33 +206,75 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): =20 -clean-noinstPROGRAMS: - -test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS) -bad-gnustack$(EXEEXT): $(bad_gnustack_OBJECTS) $(bad_gnustack_DEPENDENCI= ES)=20 - @rm -f bad-gnustack$(EXEEXT) - $(LINK) $(bad_gnustack_OBJECTS) $(bad_gnustack_LDADD) $(LIBS) - -mostlyclean-compile: - -rm -f *.$(OBJEXT) - -distclean-compile: - -rm -f *.tab.c - -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bad-gnustack.Po@am__quo= te@ - -.c.o: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -= o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source=3D'$<' object=3D'$@' libtool=3D= no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=3D$(DEPDIR) $(CCDEPMODE) $(depc= omp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< - -.c.obj: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -= o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source=3D'$<' object=3D'$@' libtool=3D= no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=3D$(DEPDIR) $(CCDEPMODE) $(depc= omp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +# This directory's subdirectories are mostly independent; you can cd +# into them and run `make' without going through this Makefile. +# To change the values of `make' variables: instead of editing Makefiles= , +# (1) if the variable is set in `config.status', edit `config.status' +# (which will cause the Makefiles to be regenerated when you run `ma= ke'); +# (2) otherwise, pass the desired values on the `make' command line. +$(RECURSIVE_TARGETS): + @fail=3D failcom=3D'exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=3D* | --[!k]*);; \ + *k*) failcom=3D'fail=3Dyes';; \ + esac; \ + done; \ + dot_seen=3Dno; \ + target=3D`echo $@ | sed s/-recursive//`; \ + list=3D'$(SUBDIRS)'; for subdir in $$list; do \ + echo "Making $$target in $$subdir"; \ + if test "$$subdir" =3D "."; then \ + dot_seen=3Dyes; \ + local_target=3D"$$target-am"; \ + else \ + local_target=3D"$$target"; \ + fi; \ + ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || eval $$failcom; \ + done; \ + if test "$$dot_seen" =3D "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + +$(RECURSIVE_CLEAN_TARGETS): + @fail=3D failcom=3D'exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=3D* | --[!k]*);; \ + *k*) failcom=3D'fail=3Dyes';; \ + esac; \ + done; \ + dot_seen=3Dno; \ + case "$@" in \ + distclean-* | maintainer-clean-*) list=3D'$(DIST_SUBDIRS)' ;; \ + *) list=3D'$(SUBDIRS)' ;; \ + esac; \ + rev=3D''; for subdir in $$list; do \ + if test "$$subdir" =3D "."; then :; else \ + rev=3D"$$subdir $$rev"; \ + fi; \ + done; \ + rev=3D"$$rev ."; \ + target=3D`echo $@ | sed s/-recursive//`; \ + for subdir in $$rev; do \ + echo "Making $$target in $$subdir"; \ + if test "$$subdir" =3D "."; then \ + local_target=3D"$$target-am"; \ + else \ + local_target=3D"$$target"; \ + fi; \ + ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || eval $$failcom; \ + done && test -z "$$fail" +tags-recursive: + list=3D'$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" =3D . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAG= S) tags); \ + done +ctags-recursive: + list=3D'$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" =3D . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAG= S) ctags); \ + done =20 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list=3D'$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -227,10 +286,23 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) mkid -fID $$unique tags: TAGS =20 -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ +TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) set x; \ here=3D`pwd`; \ + if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ + include_option=3D--etags-include; \ + empty_fix=3D.; \ + else \ + include_option=3D--include; \ + empty_fix=3D; \ + fi; \ + list=3D'$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" =3D .; then :; else \ + test ! -f $$subdir/TAGS || \ + set "$$@" "$$include_option=3D$$here/$$subdir/TAGS"; \ + fi; \ + done; \ list=3D'$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=3D`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ @@ -249,7 +321,7 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ fi; \ fi ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ +CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) list=3D'$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=3D`for i in $$list; do \ @@ -299,20 +371,48 @@ distdir: $(DISTFILES) || exit 1; \ fi; \ done + @list=3D'$(DIST_SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" =3D .; then :; else \ + test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ + fi; \ + done + @list=3D'$(DIST_SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" =3D .; then :; else \ + dir1=3D$$subdir; dir2=3D"$(distdir)/$$subdir"; \ + $(am__relativize); \ + new_distdir=3D$$reldir; \ + dir1=3D$$subdir; dir2=3D"$(top_distdir)"; \ + $(am__relativize); \ + new_top_distdir=3D$$reldir; \ + echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=3D"$$new= _top_distdir" distdir=3D"$$new_distdir" \\"; \ + echo " am__remove_distdir=3D: am__skip_length_check=3D: am__ski= p_mode_fix=3D: distdir)"; \ + ($(am__cd) $$subdir && \ + $(MAKE) $(AM_MAKEFLAGS) \ + top_distdir=3D"$$new_top_distdir" \ + distdir=3D"$$new_distdir" \ + am__remove_distdir=3D: \ + am__skip_length_check=3D: \ + am__skip_mode_fix=3D: \ + distdir) \ + || exit 1; \ + fi; \ + done check-am: all-am - $(MAKE) $(AM_MAKEFLAGS) $(check_SCRIPTS) -check: check-am -all-am: Makefile $(PROGRAMS) -installdirs: -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am +check: check-recursive +all-am: Makefile +installdirs: installdirs-recursive +installdirs-am: +install: install-recursive +install-exec: install-exec-recursive +install-data: install-data-recursive +uninstall: uninstall-recursive =20 install-am: all-am @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am =20 -installcheck: installcheck-am +installcheck: installcheck-recursive install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" \ install_sh_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=3D= -s \ @@ -321,7 +421,6 @@ install-strip: mostlyclean-generic: =20 clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) =20 distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) @@ -330,105 +429,88 @@ distclean-generic: maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." -clean: clean-am +clean: clean-recursive =20 -clean-am: clean-generic clean-noinstPROGRAMS mostlyclean-am +clean-am: clean-generic mostlyclean-am =20 -distclean: distclean-am - -rm -rf ./$(DEPDIR) +distclean: distclean-recursive -rm -f Makefile -distclean-am: clean-am distclean-compile distclean-generic \ - distclean-tags +distclean-am: clean-am distclean-generic distclean-tags =20 -dvi: dvi-am +dvi: dvi-recursive =20 dvi-am: =20 -html: html-am +html: html-recursive =20 html-am: =20 -info: info-am +info: info-recursive =20 info-am: =20 install-data-am: =20 -install-dvi: install-dvi-am +install-dvi: install-dvi-recursive =20 install-dvi-am: =20 install-exec-am: =20 -install-html: install-html-am +install-html: install-html-recursive =20 install-html-am: =20 -install-info: install-info-am +install-info: install-info-recursive =20 install-info-am: =20 install-man: =20 -install-pdf: install-pdf-am +install-pdf: install-pdf-recursive =20 install-pdf-am: =20 -install-ps: install-ps-am +install-ps: install-ps-recursive =20 install-ps-am: =20 installcheck-am: =20 -maintainer-clean: maintainer-clean-am - -rm -rf ./$(DEPDIR) +maintainer-clean: maintainer-clean-recursive -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic =20 -mostlyclean: mostlyclean-am +mostlyclean: mostlyclean-recursive =20 -mostlyclean-am: mostlyclean-compile mostlyclean-generic +mostlyclean-am: mostlyclean-generic =20 -pdf: pdf-am +pdf: pdf-recursive =20 pdf-am: =20 -ps: ps-am +ps: ps-recursive =20 ps-am: =20 uninstall-am: =20 -.MAKE: check-am install-am install-strip - -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-noinstPROGRAMS ctags distclean distclean-compile \ - distclean-generic distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \ - uninstall-am - - -bad-asm.o: bad64.asm bad32.asm - [[ "$(ARCH)" =3D=3D "x86" ]] && yasm -f elf -m x86 bad32.asm && mv bad3= 2.o bad-asm.o || true - [[ "$(ARCH)" =3D=3D "x86_64" ]] && yasm -f elf -m amd64 bad64.asm && mv= bad64.o bad-asm.o || true - -test.sh: - @echo "=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D" - @echo - @echo "Fixing Bad GNU_STACK Elf" - @../src/fix-gnustack -f bad-gnustack - @echo - @echo "Fixed Bad GNU_STACK Elf" - @../src/fix-gnustack bad-gnustack - @echo - @echo "=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D" +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ + install-am install-strip tags-recursive + +.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ + all all-am check check-am clean clean-generic ctags \ + ctags-recursive distclean distclean-generic distclean-tags \ + distdir dvi dvi-am html html-am info info-am install \ + install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + installdirs-am maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic pdf pdf-am ps ps-am tags \ + tags-recursive uninstall uninstall-am + =20 # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/tests/Makefile.in b/tests/gnustack/Makefile.in similarity index 98% copy from tests/Makefile.in copy to tests/gnustack/Makefile.in index f44395d..954ccb1 100644 --- a/tests/Makefile.in +++ b/tests/gnustack/Makefile.in @@ -33,7 +33,7 @@ NORMAL_UNINSTALL =3D : PRE_UNINSTALL =3D : POST_UNINSTALL =3D : noinst_PROGRAMS =3D bad-gnustack$(EXEEXT) -subdir =3D tests +subdir =3D tests/gnustack DIST_COMMON =3D $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 =3D $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps =3D $(top_srcdir)/configure.ac @@ -167,9 +167,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__= configure_deps) exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tests/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tests/gnustack/Makefil= e'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --foreign tests/Makefile + $(AUTOMAKE) --foreign tests/gnustack/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -423,10 +423,10 @@ test.sh: @echo "=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D" @echo @echo "Fixing Bad GNU_STACK Elf" - @../src/fix-gnustack -f bad-gnustack + @../../src/fix-gnustack -f bad-gnustack @echo @echo "Fixed Bad GNU_STACK Elf" - @../src/fix-gnustack bad-gnustack + @../../src/fix-gnustack bad-gnustack @echo @echo "=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D" =20 diff --git a/tests/Makefile.in b/tests/pxtpax/Makefile.in similarity index 89% copy from tests/Makefile.in copy to tests/pxtpax/Makefile.in index f44395d..0b0d61e 100644 --- a/tests/Makefile.in +++ b/tests/pxtpax/Makefile.in @@ -32,8 +32,8 @@ POST_INSTALL =3D : NORMAL_UNINSTALL =3D : PRE_UNINSTALL =3D : POST_UNINSTALL =3D : -noinst_PROGRAMS =3D bad-gnustack$(EXEEXT) -subdir =3D tests +noinst_PROGRAMS =3D daemon$(EXEEXT) +subdir =3D tests/pxtpax DIST_COMMON =3D $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 =3D $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps =3D $(top_srcdir)/configure.ac @@ -44,8 +44,9 @@ CONFIG_HEADER =3D $(top_builddir)/config.h CONFIG_CLEAN_FILES =3D CONFIG_CLEAN_VPATH_FILES =3D PROGRAMS =3D $(noinst_PROGRAMS) -am_bad_gnustack_OBJECTS =3D bad-gnustack.$(OBJEXT) -bad_gnustack_OBJECTS =3D $(am_bad_gnustack_OBJECTS) +am_daemon_OBJECTS =3D daemon.$(OBJEXT) +daemon_OBJECTS =3D $(am_daemon_OBJECTS) +daemon_LDADD =3D $(LDADD) DEFAULT_INCLUDES =3D -I.@am__isrc@ -I$(top_builddir) depcomp =3D $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe =3D depfiles @@ -54,8 +55,8 @@ COMPILE =3D $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDE= S) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) CCLD =3D $(CC) LINK =3D $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -SOURCES =3D $(bad_gnustack_SOURCES) -DIST_SOURCES =3D $(bad_gnustack_SOURCES) +SOURCES =3D $(daemon_SOURCES) +DIST_SOURCES =3D $(daemon_SOURCES) ETAGS =3D etags CTAGS =3D ctags DISTFILES =3D $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -146,14 +147,11 @@ target_alias =3D @target_alias@ top_build_prefix =3D @top_build_prefix@ top_builddir =3D @top_builddir@ top_srcdir =3D @top_srcdir@ -bad_gnustack_SOURCES =3D bad-gnustack.c -bad_gnustack_DEPENDENCIES =3D bad-asm.o -bad_gnustack_LDADD =3D bad-asm.o -EXTRA_DIST =3D bad64.asm bad32.asm -ARCH =3D $(shell uname -m | sed -e 's/i./x/') +daemon_SOURCES =3D daemon.c +EXTRA_DIST =3D init.sh dotest.sh check_SCRIPTS =3D test.sh TEST =3D $(check_SCRIPTS) -CLEANFILES =3D bad-asm.o test.sh +CLEANFILES =3D daemon.pid all: all-am =20 .SUFFIXES: @@ -167,9 +165,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__= configure_deps) exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tests/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tests/pxtpax/Makefile'= ; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --foreign tests/Makefile + $(AUTOMAKE) --foreign tests/pxtpax/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -191,9 +189,9 @@ $(am__aclocal_m4_deps): =20 clean-noinstPROGRAMS: -test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS) -bad-gnustack$(EXEEXT): $(bad_gnustack_OBJECTS) $(bad_gnustack_DEPENDENCI= ES)=20 - @rm -f bad-gnustack$(EXEEXT) - $(LINK) $(bad_gnustack_OBJECTS) $(bad_gnustack_LDADD) $(LIBS) +daemon$(EXEEXT): $(daemon_OBJECTS) $(daemon_DEPENDENCIES)=20 + @rm -f daemon$(EXEEXT) + $(LINK) $(daemon_OBJECTS) $(daemon_LDADD) $(LIBS) =20 mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -201,7 +199,7 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c =20 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bad-gnustack.Po@am__quo= te@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/daemon.Po@am__quote@ =20 .c.o: @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -= o $@ $< @@ -415,20 +413,8 @@ uninstall-am: uninstall-am =20 =20 -bad-asm.o: bad64.asm bad32.asm - [[ "$(ARCH)" =3D=3D "x86" ]] && yasm -f elf -m x86 bad32.asm && mv bad3= 2.o bad-asm.o || true - [[ "$(ARCH)" =3D=3D "x86_64" ]] && yasm -f elf -m amd64 bad64.asm && mv= bad64.o bad-asm.o || true - test.sh: - @echo "=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D" - @echo - @echo "Fixing Bad GNU_STACK Elf" - @../src/fix-gnustack -f bad-gnustack - @echo - @echo "Fixed Bad GNU_STACK Elf" - @../src/fix-gnustack bad-gnustack - @echo - @echo "=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D" + ./dotest.sh =20 # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded.