From 596ef45803c04d8f5b7beeeabea8996993559e32 Mon Sep 17 00:00:00 2001 From: Brent Cook Date: Sat, 12 Jul 2014 03:36:32 -0600 Subject: source library version from a common place, speed man builds grab library version from VERSION file build manpages only on changes ok beck@ --- .gitignore | 1 + VERSION | 1 + configure.ac | 99 -------------------------------------------------------- configure.ac.tpl | 99 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ update.sh | 41 +++++++++++------------ 5 files changed, 120 insertions(+), 121 deletions(-) create mode 100644 VERSION delete mode 100644 configure.ac create mode 100644 configure.ac.tpl diff --git a/.gitignore b/.gitignore index 0c77d70..e99ad46 100644 --- a/.gitignore +++ b/.gitignore @@ -71,6 +71,7 @@ INSTALL /config.status /config.sub /configure +/configure.ac /depcomp /config.h /config.h.in diff --git a/VERSION b/VERSION new file mode 100644 index 0000000..227cea2 --- /dev/null +++ b/VERSION @@ -0,0 +1 @@ +2.0.0 diff --git a/configure.ac b/configure.ac deleted file mode 100644 index a0ddc84..0000000 --- a/configure.ac +++ /dev/null @@ -1,99 +0,0 @@ -AC_INIT([libressl], [2.0.0]) -AC_CANONICAL_TARGET -AM_INIT_AUTOMAKE([subdir-objects]) -AC_CONFIG_MACRO_DIR([m4]) - -m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) - -AC_SUBST([USER_CFLAGS], "-O2 $CFLAGS") -CFLAGS="$CFLAGS -Wall -std=c99 -g -Wno-pointer-sign" - -case $target_os in - *darwin*) - TARGET_OS=darwin; - LDFLAGS="$LDFLAGS -Qunused-arguments" - ;; - *linux*) - TARGET_OS=linux; - CFLAGS="$CFLAGS -D_BSD_SOURCE -D_POSIX_SOURCE -D_GNU_SOURCE" - AC_SUBST([PLATFORM_LDADD], ['-lrt']) - ;; - *solaris*) - TARGET_OS=solaris; - CFLAGS="$CFLAGS -D__EXTENSIONS__ -D_XOPEN_SOURCE=600 -DBSD_COMP" - AC_SUBST([PLATFORM_LDADD], ['-lnsl -lsocket']) - ;; - *openbsd*) - AC_DEFINE([HAVE_ATTRIBUTE__BOUNDED__], [1], [OpenBSD gcc has bounded]) - ;; - *) ;; -esac - -AM_CONDITIONAL(TARGET_DARWIN, test x$TARGET_OS = xdarwin) -AM_CONDITIONAL(TARGET_LINUX, test x$TARGET_OS = xlinux) -AM_CONDITIONAL(TARGET_SOLARIS, test x$TARGET_OS = xsolaris) - -AC_PROG_CC -AC_PROG_LIBTOOL -AC_PROG_CC_STDC -AM_PROG_CC_C_O - -AC_CHECK_FUNC(strlcpy,[AC_SEARCH_LIBS(strlcpy,, [NO_STRLCPY=], - [NO_STRLCPY=yes])], [NO_STRLCPY=yes]) -AC_SUBST(NO_STRLCPY) -AM_CONDITIONAL(NO_STRLCPY, test "x$NO_STRLCPY" = "xyes") - -AC_CHECK_FUNC(strlcat,[AC_SEARCH_LIBS(strlcat,, [NO_STRLCAT=], - [NO_STRLCAT=yes])], [NO_STRLCAT=yes]) -AC_SUBST(NO_STRLCAT) -AM_CONDITIONAL(NO_STRLCAT, test "x$NO_STRLCAT" = "xyes") - -AC_CHECK_FUNC(reallocarray,[AC_SEARCH_LIBS(reallocarray,, [NO_REALLOCARRAY=], - [NO_REALLOCARRAY=yes])], [NO_REALLOCARRAY=yes]) -AC_SUBST(NO_REALLOCARRAY) -AM_CONDITIONAL(NO_REALLOCARRAY, test "x$NO_REALLOCARRAY" = "xyes") - -AC_CHECK_FUNC(timingsafe_bcmp,[AC_SEARCH_LIBS(timingsafe_bcmp,, [NO_TIMINGSAFE_BCMP=], - [NO_TIMINGSAFE_BCMP=yes])], [NO_TIMINGSAFE_BCMP=yes]) -AC_SUBST(NO_TIMINGSAFE_BCMP) -AM_CONDITIONAL(NO_TIMINGSAFE_BCMP, test "x$NO_TIMINGSAFE_BCMP" = "xyes") - -AC_CHECK_FUNC(timingsafe_memcmp,[AC_SEARCH_LIBS(timingsafe_memcmp,, [NO_TIMINGSAFE_MEMCMP=], - [NO_TIMINGSAFE_MEMCMP=yes])], [NO_TIMINGSAFE_MEMCMP=yes]) -AC_SUBST(NO_TIMINGSAFE_MEMCMP) -AM_CONDITIONAL(NO_TIMINGSAFE_MEMCMP, test "x$NO_TIMINGSAFE_MEMCMP" = "xyes") - -AC_CHECK_FUNC(arc4random_buf,[AC_SEARCH_LIBS(write,, [NO_ARC4RANDOM_BUF=], - [NO_ARC4RANDOM_BUF=yes])], [NO_ARC4RANDOM_BUF=yes]) -AC_SUBST(NO_ARC4RANDOM_BUF) -AM_CONDITIONAL(NO_ARC4RANDOM_BUF, test "x$NO_ARC4RANDOM_BUF" = "xyes") - -# overrides for arc4random_buf implementations with known issues -AM_CONDITIONAL(NO_ARC4RANDOM_BUF, - test x$TARGET_OS = xdarwin \ - -o x$TARGET_OS = xsolaris \ - -o x$NO_ARC4RANDOM_BUF = xyes) - -AC_CHECK_FUNC(getentropy,[AC_SEARCH_LIBS(write,, [NO_GETENTROPY=], - [NO_GETENTROPY=yes])], [NO_GETENTROPY=yes]) -AC_SUBST(NO_GETENTROPY) -AM_CONDITIONAL(NO_GETENTROPY, test "x$NO_GETENTROPY" = "xyes") - -AC_CHECK_FUNC(issetugid,[AC_SEARCH_LIBS(write,, [NO_ISSETUGID=], - [NO_ISSETUGID=yes])], [NO_ISSETUGID=yes]) -AC_SUBST(NO_ISSETUGID) -AM_CONDITIONAL(NO_ISSETUGID, test "x$NO_ISSETUGID" = "xyes") - -AC_CHECK_FUNC(strtonum,[AC_SEARCH_LIBS(write,, [NO_STRTONUM=], - [NO_STRTONUM=yes])], [NO_STRTONUM=yes]) -AC_SUBST(NO_STRTONUM) -AM_CONDITIONAL(NO_STRTONUM, test "x$NO_STRTONUM" = "xyes") - -AC_CHECK_FUNC(getauxval, AC_DEFINE(HAVE_GETAUXVAL)) - -AC_CHECK_FUNC(funopen, AC_DEFINE(HAVE_FUNOPEN)) - -LT_INIT - -AC_OUTPUT(Makefile include/Makefile include/openssl/Makefile ssl/Makefile - crypto/Makefile tests/Makefile apps/Makefile man/Makefile) diff --git a/configure.ac.tpl b/configure.ac.tpl new file mode 100644 index 0000000..55f5690 --- /dev/null +++ b/configure.ac.tpl @@ -0,0 +1,99 @@ +AC_INIT([libressl], [VERSION]) +AC_CANONICAL_TARGET +AM_INIT_AUTOMAKE([subdir-objects]) +AC_CONFIG_MACRO_DIR([m4]) + +m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) + +AC_SUBST([USER_CFLAGS], "-O2 $CFLAGS") +CFLAGS="$CFLAGS -Wall -std=c99 -g -Wno-pointer-sign" + +case $target_os in + *darwin*) + TARGET_OS=darwin; + LDFLAGS="$LDFLAGS -Qunused-arguments" + ;; + *linux*) + TARGET_OS=linux; + CFLAGS="$CFLAGS -D_BSD_SOURCE -D_POSIX_SOURCE -D_GNU_SOURCE" + AC_SUBST([PLATFORM_LDADD], ['-lrt']) + ;; + *solaris*) + TARGET_OS=solaris; + CFLAGS="$CFLAGS -D__EXTENSIONS__ -D_XOPEN_SOURCE=600 -DBSD_COMP" + AC_SUBST([PLATFORM_LDADD], ['-lnsl -lsocket']) + ;; + *openbsd*) + AC_DEFINE([HAVE_ATTRIBUTE__BOUNDED__], [1], [OpenBSD gcc has bounded]) + ;; + *) ;; +esac + +AM_CONDITIONAL(TARGET_DARWIN, test x$TARGET_OS = xdarwin) +AM_CONDITIONAL(TARGET_LINUX, test x$TARGET_OS = xlinux) +AM_CONDITIONAL(TARGET_SOLARIS, test x$TARGET_OS = xsolaris) + +AC_PROG_CC +AC_PROG_LIBTOOL +AC_PROG_CC_STDC +AM_PROG_CC_C_O + +AC_CHECK_FUNC(strlcpy,[AC_SEARCH_LIBS(strlcpy,, [NO_STRLCPY=], + [NO_STRLCPY=yes])], [NO_STRLCPY=yes]) +AC_SUBST(NO_STRLCPY) +AM_CONDITIONAL(NO_STRLCPY, test "x$NO_STRLCPY" = "xyes") + +AC_CHECK_FUNC(strlcat,[AC_SEARCH_LIBS(strlcat,, [NO_STRLCAT=], + [NO_STRLCAT=yes])], [NO_STRLCAT=yes]) +AC_SUBST(NO_STRLCAT) +AM_CONDITIONAL(NO_STRLCAT, test "x$NO_STRLCAT" = "xyes") + +AC_CHECK_FUNC(reallocarray,[AC_SEARCH_LIBS(reallocarray,, [NO_REALLOCARRAY=], + [NO_REALLOCARRAY=yes])], [NO_REALLOCARRAY=yes]) +AC_SUBST(NO_REALLOCARRAY) +AM_CONDITIONAL(NO_REALLOCARRAY, test "x$NO_REALLOCARRAY" = "xyes") + +AC_CHECK_FUNC(timingsafe_bcmp,[AC_SEARCH_LIBS(timingsafe_bcmp,, [NO_TIMINGSAFE_BCMP=], + [NO_TIMINGSAFE_BCMP=yes])], [NO_TIMINGSAFE_BCMP=yes]) +AC_SUBST(NO_TIMINGSAFE_BCMP) +AM_CONDITIONAL(NO_TIMINGSAFE_BCMP, test "x$NO_TIMINGSAFE_BCMP" = "xyes") + +AC_CHECK_FUNC(timingsafe_memcmp,[AC_SEARCH_LIBS(timingsafe_memcmp,, [NO_TIMINGSAFE_MEMCMP=], + [NO_TIMINGSAFE_MEMCMP=yes])], [NO_TIMINGSAFE_MEMCMP=yes]) +AC_SUBST(NO_TIMINGSAFE_MEMCMP) +AM_CONDITIONAL(NO_TIMINGSAFE_MEMCMP, test "x$NO_TIMINGSAFE_MEMCMP" = "xyes") + +AC_CHECK_FUNC(arc4random_buf,[AC_SEARCH_LIBS(write,, [NO_ARC4RANDOM_BUF=], + [NO_ARC4RANDOM_BUF=yes])], [NO_ARC4RANDOM_BUF=yes]) +AC_SUBST(NO_ARC4RANDOM_BUF) +AM_CONDITIONAL(NO_ARC4RANDOM_BUF, test "x$NO_ARC4RANDOM_BUF" = "xyes") + +# overrides for arc4random_buf implementations with known issues +AM_CONDITIONAL(NO_ARC4RANDOM_BUF, + test x$TARGET_OS = xdarwin \ + -o x$TARGET_OS = xsolaris \ + -o x$NO_ARC4RANDOM_BUF = xyes) + +AC_CHECK_FUNC(getentropy,[AC_SEARCH_LIBS(write,, [NO_GETENTROPY=], + [NO_GETENTROPY=yes])], [NO_GETENTROPY=yes]) +AC_SUBST(NO_GETENTROPY) +AM_CONDITIONAL(NO_GETENTROPY, test "x$NO_GETENTROPY" = "xyes") + +AC_CHECK_FUNC(issetugid,[AC_SEARCH_LIBS(write,, [NO_ISSETUGID=], + [NO_ISSETUGID=yes])], [NO_ISSETUGID=yes]) +AC_SUBST(NO_ISSETUGID) +AM_CONDITIONAL(NO_ISSETUGID, test "x$NO_ISSETUGID" = "xyes") + +AC_CHECK_FUNC(strtonum,[AC_SEARCH_LIBS(write,, [NO_STRTONUM=], + [NO_STRTONUM=yes])], [NO_STRTONUM=yes]) +AC_SUBST(NO_STRTONUM) +AM_CONDITIONAL(NO_STRTONUM, test "x$NO_STRTONUM" = "xyes") + +AC_CHECK_FUNC(getauxval, AC_DEFINE(HAVE_GETAUXVAL)) + +AC_CHECK_FUNC(funopen, AC_DEFINE(HAVE_FUNOPEN)) + +LT_INIT + +AC_OUTPUT(Makefile include/Makefile include/openssl/Makefile ssl/Makefile + crypto/Makefile tests/Makefile apps/Makefile man/Makefile) diff --git a/update.sh b/update.sh index bb19623..f2ae0f7 100755 --- a/update.sh +++ b/update.sh @@ -22,6 +22,8 @@ libcrypto_src=openbsd/src/lib/libcrypto openssl_cmd_src=openbsd/src/usr.sbin/openssl libcrypto_regress=openbsd/src/regress/lib/libcrypto +libressl_version=`cat VERSION` + source $libssl_src/ssl/shlib_version libssl_version=$major:$minor:0 echo libssl version $libssl_version @@ -30,7 +32,7 @@ source $libcrypto_src/crypto/shlib_version libcrypto_version=$major:$minor:0 echo libcrypto version $libcrypto_version -crypto_subdirs= +sed -e "s/VERSION/${libressl_version}/" configure.ac.tpl > configure.ac copy_src() { mkdir -p $1 @@ -392,30 +394,25 @@ apps_excludes=( (cd man cp Makefile.am.tpl Makefile.am - for i in `ls -1 ../$libssl_src/src/doc/crypto/*.pod | sort`; do - BASE=`echo $i|sed -e "s/\.pod//"` - NAME=`basename "$BASE"` - echo processing $NAME - pod2man --official --release=LibreSSL --center=LibreSSL --section=3 --name=$NAME < $BASE.pod > $NAME.3 - echo "dist_man_MANS += $NAME.3" >> Makefile.am - done - for i in `ls -1 ../$libssl_src/src/doc/ssl/*.pod | sort`; do - BASE=`echo $i|sed -e "s/\.pod//"` - NAME=`basename "$BASE"` - echo processing $NAME - pod2man --official --release=LibreSSL --center=LibreSSL --section=3 --name=$NAME < $BASE.pod > $NAME.3 - echo "dist_man_MANS += $NAME.3" >> Makefile.am - done - for i in `ls -1 ../$libssl_src/src/doc/apps/*.pod | sort`; do - BASE=`echo $i|sed -e "s/\.pod//"` - NAME=`basename "$BASE"` - echo processing $NAME - pod2man --official --release=LibreSSL --center=LibreSSL --section=1 --name=$NAME < $BASE.pod > $NAME.1 - echo "dist_man_MANS += $NAME.1" >> Makefile.am + for i in crypto,3 ssl,3 apps,1; do + IFS=","; set $i; unset IFS + for i in `ls -1 ../$libssl_src/src/doc/$1/*.pod | sort`; do + BASE=`echo $i|sed -e "s/\.pod//"` + NAME=`basename "$BASE"` + # reformat file if new + if [ ! -f $NAME.3 -o $BASE.pod -nt $NAME.3 -o ../VERSION -nt $NAME.3 ]; then + echo processing $NAME + pod2man --official --release="LibreSSL $VERSION" --center=LibreSSL \ + --section=3 $POD2MAN --name=$NAME < $BASE.pod > $NAME.3 + fi + echo "dist_man_MANS += $NAME.$2" >> Makefile.am + done done + + cp ../$openssl_cmd_src/openssl.1 . echo "dist_man_MANS += openssl.1" >> Makefile.am + echo "install-data-hook:" >> Makefile.am - cp ../$openssl_cmd_src/openssl.1 . source ./links for i in $MLINKS; do IFS=","; set $i; unset IFS -- cgit v1.2.3-55-g6feb