Revision | 4fb540bcd0dcbdd69e2d70db3d550c8ebdce04a3 (tree) |
---|---|
Time | 2017-09-04 09:21:02 |
Author | matsuand <matsuand@user...> |
Commiter | matsuand |
[BLFS] Updated openssl-1.1.0f, and modified.
@@ -3,7 +3,7 @@ | ||
3 | 3 | . ./_blfsset.sh |
4 | 4 | |
5 | 5 | APPNAME=openssl |
6 | -VER=1.0.2k | |
6 | +VER=1.1.0f | |
7 | 7 | TARGET=$APPNAME-$VER |
8 | 8 | TARGETBALL=$DLD/$TARGET.tar.gz |
9 | 9 | TARGETDIR=$TARGET |
@@ -16,12 +16,6 @@ echo $TARGET | ||
16 | 16 | . $WRK/_checkTarball.sh |
17 | 17 | . $WRK/_checkExit.sh "$1" || exit $? |
18 | 18 | |
19 | -#if [ ${OPTION_krb5} -eq "1" ]; then | |
20 | -# export WITHKRB5="--with-krb5-flavor=MIT " | |
21 | -#else | |
22 | -# export WITHKRB5="" | |
23 | -#fi | |
24 | - | |
25 | 19 | unset MAKEFLAGS |
26 | 20 | |
27 | 21 | cd $SRC |
@@ -32,40 +26,32 @@ TimeStart | ||
32 | 26 | |
33 | 27 | cd $TARGETDIR |
34 | 28 | |
35 | -#Patching | |
36 | -#patch -Np1 -i $DLD/openssl-$VER-fix_parallel_build-2.patch \ | |
37 | -# 1> $LOG/$TARGET.0_patch.log 2>&1 || exit 1 | |
38 | -#patch -Np1 -i $DLD/openssl-$VER-fix_pod_syntax-1.patch \ | |
39 | -# 1>> $LOG/$TARGET.0_patch.log 2>&1 || exit 1 | |
40 | - | |
41 | 29 | Configuring |
42 | -./config --prefix=/usr \ | |
43 | - --openssldir=/etc/ssl \ | |
44 | - --libdir=lib \ | |
45 | - shared \ | |
46 | - zlib-dynamic \ | |
30 | +./config --prefix=/usr \ | |
31 | + --openssldir=/etc/ssl \ | |
32 | + --libdir=lib \ | |
33 | + shared \ | |
34 | + zlib-dynamic \ | |
47 | 35 | $([ ${OPTION_krb5} -eq "1" ] && echo --with-krb5-flavor=MIT) \ |
48 | 36 | 1> $LOG/$TARGET.1_conf.log 2>&1 || exit 1 |
49 | 37 | |
38 | +#sed -i 's# libcrypto.a##;s# libssl.a##;/INSTALL_LIBS/s#libcrypto.a##' Makefile | |
39 | + | |
50 | 40 | Making |
51 | -make depend \ | |
41 | +make -j1 \ | |
52 | 42 | 1> $LOG/$TARGET.2_make.log 2>&1 || exit 1 |
53 | -make \ | |
54 | - 1>> $LOG/$TARGET.2_make.log 2>&1 || exit 1 | |
55 | - | |
56 | -sed -i 's# libcrypto.a##;s# libssl.a##' Makefile | |
57 | 43 | |
58 | 44 | Installing |
59 | 45 | porg -lp $TARGET "\ |
60 | -make MANDIR=/usr/share/man MANSUFFIX=ssl install" \ | |
46 | +make MANSUFFIX=ssl install" \ | |
61 | 47 | 1> $LOG/$TARGET.3_install.log 2>&1 || exit 1 |
62 | 48 | |
63 | 49 | porg -lp+ $TARGET "\ |
64 | -install -dv -m755 /usr/share/doc/openssl-$VER" \ | |
50 | +mv -v /usr/share/doc/openssl{,-1.1.0f}" \ | |
65 | 51 | 1>> $LOG/$TARGET.3_install.log 2>&1 || exit 1 |
66 | 52 | |
67 | 53 | porg -lp+ $TARGET "\ |
68 | -cp -vfr doc/* /usr/share/doc/openssl-$VER" \ | |
54 | +cp -vfr doc/* /usr/share/doc/openssl-1.1.0f" \ | |
69 | 55 | 1>> $LOG/$TARGET.3_install.log 2>&1 || exit 1 |
70 | 56 | |
71 | 57 | TimeEnd |