--- plamo/00_base/old/util_linux-21060427/PlamoBuild.util_linux-2.28 2016-04-27 07:35:14.000000000 +0900 +++ plamo/00_base/util_linux/PlamoBuild.util_linux-2.29 2016-11-21 17:39:19.000000000 +0900 @@ -1,17 +1,20 @@ #!/bin/sh ###################################################################### -url="http://www.kernel.org/pub/linux/utils/util-linux/v2.28/util-linux-2.28.tar.xz" +url="https://www.kernel.org/pub/linux/utils/util-linux/v2.29/util-linux-2.29.tar.xz" pkgbase=util_linux -vers=2.28 +vers=2.29 arch=`uname -m` build=P1 src=util-linux-$vers -OPT_CONFIG="--localstatedir=/var --disable-setpriv --disable-last - --disable-mesg --disable-chfn-chsh --disable-login --disable-nologin +patchfiles="" +OPT_CONFIG="--disable-setpriv --disable-last --disable-mesg + --disable-chfn-chsh --disable-login --disable-nologin --disable-sulogin --disable-su --enable-write --disable-pylibmount --without-user --without-python" DOCS="COPYING ABOUT-NLS ChangeLog README NEWS README.licensing AUTHORS" +template=20161020 +tmplurl=ftp://plamo.linet.gr.jp/pub/Plamo-src/admin ###################################################################### fscheck() { @@ -189,14 +192,22 @@ if [ $opt_download -eq 1 ] ; then for i in $url ; do if [ ! -f ${i##*/} ] ; then - wget $i - for sig in asc sig{,n} {md5,sha{1,256}}{,sum} ; do + 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 ;; - md5|sha1|sha256) ${sig}sum -c ${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 @@ -207,8 +218,8 @@ case ${i##*.} in tar) tar xvpf ${i##*/} ;; gz|tgz) tar xvpzf ${i##*/} ;; - bz2) tar xvpjf ${i##*/} ;; - xz) tar xvpJf ${i##*/} ;; + bz2|tbz) tar xvpjf ${i##*/} ;; + xz|txz) tar xvpJf ${i##*/} ;; esac done fi @@ -218,6 +229,17 @@ done for i in `seq 0 $((${#B[@]} - 1))` ; do cd ${B[$i]} + for j in ${patchfiles[$i]} ; do + case ${j##*.} in + gz) gunzip -c $W/$j | patch -Np1 -i - ;; + bz2) bunzip2 -c $W/j | patch -Np1 -i - ;; + xz) unxz -c $W/$j | patch -Np1 -i - ;; + *) patch -Np1 -i $W/$j ;; + esac + done + done + for i in `seq 0 $((${#B[@]} - 1))` ; do + cd ${B[$i]} if [ -f Makefile ] ; then make clean fi @@ -225,8 +247,8 @@ rm -rf config.cache config.log fi if [ -x configure ] ; then - ./configure --prefix=/usr --libdir=/$libdir \ - --infodir='${prefix}'/share/info \ + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --libdir=/$libdir --infodir='${prefix}'/share/info \ --mandir='${prefix}'/share/man ${OPT_CONFIG[$i]} fi done @@ -277,9 +299,23 @@ if [ $i -eq 0 ] ; then install $myname $docdir/$src touch -t `date '+%m%d0900'` $docdir/$src/$myname - gzip_one $docdir/$src/$myname + tmpl=${myname%%.*}-template-$template + if [ -f ../admin/$tmpl ] ; then + cp -p ../admin/$tmpl $docdir/$src + else + ( cd $docdir/$src + curl -Rs -o $tmpl $tmplurl/${tmpl/${myname%%.*}/PlamoBuild} ) + fi + spec=${myname%%.*}-spec + ( cd $docdir/$src ; diff -u $tmpl $myname > $spec ) + touch -t `date '+%m%d0900'` $docdir/$src/$spec + gzip $docdir/$src/{$myname,$spec} + rm $docdir/$src/$tmpl + mv $docdir/$src/{$myname,$spec}.gz $C + mv $C/{$myname,$spec}.gz $docdir/$src else ln $docdir/$src/$myname.gz $docdir/${src[$i]} + ln $docdir/$src/$spec.gz $docdir/${src[$i]} fi ( cd $docdir ; find ${src[$i]} -type d -exec touch -r $W/{} {} \; ) done @@ -288,9 +324,9 @@ chown -R root.root $docdir/$src/Documentation 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 $docdir/$src/{README.licensing,AUTHORS,$myname,$spec}.gz $C mv $C/{Documentation,{README,NEWS}.gz,getopt} $docdir/$src - mv $C/{README.licensing,AUTHORS,$myname}.gz $docdir/$src + mv $C/{README.licensing,AUTHORS,$myname,$spec}.gz $docdir/$src touch -r $S $docdir/$src convert tar cvpf $pkg.tar -C $P `cd $P ; find bin | tail -n+2`