--- plamo/00_base/old/openssl-20160315/PlamoBuild.openssl-1.0.1s 2016-03-15 08:55:17.000000000 +0900 +++ plamo/00_base/openssl/PlamoBuild.openssl-1.0.2g 2016-04-30 09:50:12.000000000 +0900 @@ -1,13 +1,12 @@ #!/bin/sh ###################################################################### -url="http://www.openssl.org/source/openssl-1.0.1s.tar.gz - https://github.com/plamolinux/Plamo-src/raw/master/plamo/00_base/openssl/openssl-1.0.1p-fix_parallel_build-1.patch - https://github.com/plamolinux/Plamo-src/raw/master/plamo/00_base/openssl/mkcabundle.pl" +url="http://www.openssl.org/source/openssl-1.0.2g.tar.gz + ftp://plamo.linet.gr.jp/pub/Plamo-src.new/plamo/00_base/openssl/mkcabundle.pl" pkgbase=openssl -vers=1.0.1s +vers=1.0.2g arch=`uname -m` -build=P2 +build=P1 src=$pkgbase-$vers OPT_CONFIG="" DOCS="ACKNOWLEDGMENTS CHANGES CHANGES.SSLeay CONTRIBUTING FAQ INSTALL @@ -190,16 +189,39 @@ fi if [ $opt_download -eq 1 ] ; then for i in $url ; do - if [ ! -f ${i##*/} ] ; then wget $i ; fi + if [ ! -f ${i##*/} ] ; then + wget $i ; j=${i%.*} + for sig in asc sig{,n} {sha{256,1},md5}{,sum} ; do + if wget --spider $i.$sig ; then wget $i.$sig ; break ; fi + if wget --spider $j.$sig ; then + case ${i##*.} in + gz) gunzip -c ${i##*/} > ${j##*/} ;; + bz2) bunzip2 -c ${i##*/} > ${j##*/} ;; + xz) unxz -c ${i##*/} > ${j##*/} ;; + esac + touch -r ${i##*/} ${j##*/} ; i=$j ; wget $i.$sig ; break + fi + done + if [ -f ${i##*/}.$sig ] ; then + case $sig in + asc|sig|sign) gpg2 --verify ${i##*/}.$sig ;; + sha256|sha1|md5) ${sig}sum -c ${i##*/}.$sig ;; + *) $sig -c ${i##*/}.$sig ;; + esac + if [ $? -ne 0 ] ; then echo "archive verify failed" ; exit ; fi + fi + fi done if [ ! -f ca-bundle.crt ] ; then + chmod +x mkcabundle.pl ./mkcabundle.pl > ca-bundle.crt fi for i in $url ; do case ${i##*.} in tar) tar xvpf ${i##*/} ;; - gz) tar xvpzf ${i##*/} ;; - bz2) tar xvpjf ${i##*/} ;; + gz|tgz) tar xvpzf ${i##*/} ;; + bz2|tbz) tar xvpjf ${i##*/} ;; + xz|txz) tar xvpJf ${i##*/} ;; esac done fi @@ -207,8 +229,6 @@ for i in `seq 0 $((${#B[@]} - 1))` ; do if [ -d ${B[$i]} ] ; then rm -rf ${B[$i]} ; fi ; cp -a ${S[$i]} ${B[$i]} done - cd $B - patch -Np1 -i $W/openssl-1.0.1p-fix_parallel_build-1.patch for i in `seq 0 $((${#B[@]} - 1))` ; do cd ${B[$i]} if [ -f Makefile ] ; then @@ -218,8 +238,8 @@ rm -rf config.cache config.log fi if [ -x configure ] ; then - ./configure --prefix=/usr --libdir='${exec_prefix}'/$libdir \ - --infodir='${prefix}'/share/info \ + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --libdir='${exec_prefix}'/$libdir --infodir='${prefix}'/share/info \ --mandir='${prefix}'/share/man ${OPT_CONFIG[$i]} fi done