--- plamo/00_base/old/util_linux-20160404/PlamoBuild.util_linux-2.27 2016-04-04 14:06:11.054028811 +0900 +++ plamo/00_base/util_linux/PlamoBuild.util_linux-2.28 2016-04-27 07:35:14.000000000 +0900 @@ -1,11 +1,11 @@ #!/bin/sh ###################################################################### -url="http://www.kernel.org/pub/linux/utils/util-linux/v2.27/util-linux-2.27.tar.xz" +url="http://www.kernel.org/pub/linux/utils/util-linux/v2.28/util-linux-2.28.tar.xz" pkgbase=util_linux -vers=2.27 +vers=2.28 arch=`uname -m` -build=P3 +build=P1 src=util-linux-$vers OPT_CONFIG="--localstatedir=/var --disable-setpriv --disable-last --disable-mesg --disable-chfn-chsh --disable-login --disable-nologin @@ -188,12 +188,25 @@ 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 + for sig in asc sig{,n} {md5,sha{1,256}}{,sum} ; do + if wget --spider $i.$sig ; then wget $i.$sig ; break ; fi + done + if [ -f ${i##*/}.$sig ] ; then + case $sig in + asc|sig|sign) gpg2 --verify ${i##*/}.$sig ;; + md5|sha1|sha256) ${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##*/} ;; + gz|tgz) tar xvpzf ${i##*/} ;; bz2) tar xvpjf ${i##*/} ;; xz) tar xvpJf ${i##*/} ;; esac @@ -203,18 +216,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 - cp -p Makefile.in{,.orig} - cat <<- "EOF" | patch Makefile.in - 4668c4668 - < @BUILD_FDISK_TRUE@ $(am__append_337) $(am__append_339) - --- - > @BUILD_FDISK_TRUE@ $(am__append_337) $(am__append_339) $(am__append_357) - 4685c4685 - < @BUILD_SFDISK_TRUE@ $(am__append_344) $(am__append_346) - --- - > @BUILD_SFDISK_TRUE@ $(am__append_344) $(am__append_346) $(am__append_357) - EOF for i in `seq 0 $((${#B[@]} - 1))` ; do cd ${B[$i]} if [ -f Makefile ] ; then @@ -224,7 +225,7 @@ rm -rf config.cache config.log fi if [ -x configure ] ; then - ./configure --prefix=/usr --libdir=/usr/$libdir \ + ./configure --prefix=/usr --libdir=/$libdir \ --infodir='${prefix}'/share/info \ --mandir='${prefix}'/share/man ${OPT_CONFIG[$i]} fi @@ -251,7 +252,7 @@ for i in `seq 0 $((${#B[@]} - 1))` ; do cd ${B[$i]} if [ -f Makefile ] ; then - make install DESTDIR=$P + make -i install DESTDIR=$P fi done mv $P/usr/bin/logger $P/bin @@ -285,19 +286,29 @@ cp -a $S/Documentation $docdir/$src chmod -R g-w $docdir/$src/Documentation chown -R root.root $docdir/$src/Documentation - mv $docdir/$src/{Documentation,{README,NEWS,README.licensing}.gz} $C - mv $docdir/$src/{AUTHORS,$myname}.gz $C - mv $C/{Documentation,{README,NEWS,README.licensing}.gz} $docdir/$src - mv $C/{AUTHORS,$myname}.gz $docdir/$src + mv $docdir/util-linux/getopt $docdir/$src + mv $docdir/$src/{Documentation,{README,NEWS}.gz,getopt} $C + mv $docdir/$src/{README.licensing,AUTHORS,$myname}.gz $C + mv $C/{Documentation,{README,NEWS}.gz,getopt} $docdir/$src + mv $C/{README.licensing,AUTHORS,$myname}.gz $docdir/$src touch -r $S $docdir/$src convert - tar cvpf $pkg.tar -C $P `cd $P ; find usr/bin | tail -n+2` - tar rvpf $pkg.tar -C $P `cd $P ; find usr/sbin | tail -n+2` - tar rvpf $pkg.tar -C $P `cd $P ; find bin | tail -n+2` + tar cvpf $pkg.tar -C $P `cd $P ; find bin | tail -n+2` tar rvpf $pkg.tar -C $P `cd $P ; find sbin | tail -n+2` - tar rvpf $pkg.tar -C $P `cd $P ; find usr/$libdir | tail -n+2` + tar rvpf $pkg.tar -C $P `cd $P ; find usr/bin | tail -n+2` + tar rvpf $pkg.tar -C $P `cd $P ; find usr/sbin | tail -n+2` + tar rvpf $pkg.tar -C $P `cd $P ; find $libdir | tail -n+2` + tar rvpf $pkg.tar -C $P \ + `cd $P ; find usr/$libdir ! -name pkgconfig | tail -n+2` + tar rvpf $pkg.tar -C $P `cd $P ; find usr/include -maxdepth 1 | tail -n+2` tar rvpf $pkg.tar -C $P `cd $P ; find usr/share/locale -name "*.mo"` + tar rvpf $pkg.tar -C $P \ + `cd $P ; find usr/share/bash-completion/completions | tail -n+2` tar rvpf $pkg.tar -C $P var/lib/hwclock + tar rvpf $pkg.tar -C $P `cd $P ; find usr/share/man/man1 | tail -n+2` + tar rvpf $pkg.tar -C $P `cd $P ; find usr/share/man/man3 | tail -n+2` + tar rvpf $pkg.tar -C $P `cd $P ; find usr/share/man/man5 | tail -n+2` + tar rvpf $pkg.tar -C $P `cd $P ; find usr/share/man/man8 | tail -n+2` tar rvpf $pkg.tar -C $P usr/share/doc/$src tar rvpf $pkg.tar -C $P install/doinst.sh touch -t `date '+%m%d0900'` $pkg.tar ; xz $pkg.tar ; touch $pkg.tar.xz