--- plamo/00_base/old/dhcp-20160407/PlamoBuild.dhcp-4.3.3 2016-04-07 15:53:35.000000000 +0900 +++ plamo/00_base/dhcp/PlamoBuild.dhcp-4.3.3 2016-06-06 06:43:26.000000000 +0900 @@ -5,9 +5,9 @@ pkgbase=dhcp vers=4.3.3 arch=`uname -m` -build=P3 +build=P4 src=$pkgbase-$vers -OPT_CONFIG="--sysconfdir=/etc" +OPT_CONFIG="" DOCS="LICENSE README RELNOTES" ###################################################################### @@ -185,13 +185,35 @@ 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 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 @@ -217,8 +239,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 @@ -276,10 +298,10 @@ install -d $P/install cat <<- "EOF" > $P/install/doinst.sh dhc_config() { + mv etc/$1.conf.example /tmp if [ -f etc/$1.conf ] ; then - rm etc/$1.conf.example + mv /tmp/$1.conf.example etc/$1.conf.dist else - mv etc/$1.conf.example /tmp mv /tmp/$1.conf.example etc/$1.conf fi }