--- plamo/00_base/old/kbd-20160321/PlamoBuild.kbd-1.15.5 2016-03-21 18:25:25.000000000 +0900 +++ plamo/00_base/kbd/PlamoBuild.kbd-1.15.5 2016-11-24 09:12:52.000000000 +0900 @@ -1,17 +1,21 @@ #!/bin/sh ###################################################################### -url="ftp://ftp.altlinux.org/pub/people/legion/kbd/kbd-1.15.5.tar.gz - ftp://plamo.linet.gr.jp/pub/Plamo-src.new/plamo/00_base/kbd/kbd-1.15-backspace-1.patch.gz - ftp://plamo.linet.gr.jp/pub/Plamo-src.new/plamo/00_base/kbd/kbd-1.15-plamo-compat.patch.gz - ftp://plamo.linet.gr.jp/pub/Plamo-src.new/plamo/00_base/kbd/kbd-1.15.5-revert_loadkeys_analize.patch.gz" +url="https://www.kernel.org/pub/linux/utils/kbd/kbd-1.15.5.tar.xz + ftp://plamo.linet.gr.jp/pub/Plamo-src/plamo/00_base/kbd/kbd-1.15-backspace-1.patch.gz + ftp://plamo.linet.gr.jp/pub/Plamo-src/plamo/00_base/kbd/kbd-1.15-plamo-compat.patch.gz + ftp://plamo.linet.gr.jp/pub/Plamo-src/plamo/00_base/kbd/kbd-1.15.5-revert_loadkeys_analize.patch.gz" pkgbase=kbd vers=1.15.5 arch=`uname -m` -build=P3 +build=P4 src=$pkgbase-$vers +patchfiles="`echo kbd-1.15-{backspace-1,plamo-compat}.patch.gz` + kbd-1.15.5-revert_loadkeys_analize.patch.gz" OPT_CONFIG="" DOCS="INSTALL ChangeLog NEWS AUTHORS CREDITS COPYING ABOUT-NLS README" +template=20161020 +tmplurl=ftp://plamo.linet.gr.jp/pub/Plamo-src/admin ###################################################################### fscheck() { @@ -188,13 +192,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 @@ -202,10 +228,17 @@ 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 - gunzip -c $W/kbd-1.15-backspace-1.patch.gz | patch -Np1 -i - - gunzip -c $W/kbd-1.15-plamo-compat.patch.gz | patch -Np1 -i - - gunzip -c $W/kbd-1.15.5-revert_loadkeys_analize.patch.gz | patch -Np1 -i - + 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 @@ -215,8 +248,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 @@ -266,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 @@ -279,7 +326,7 @@ tar rvpf $pkg.tar -C $P `cd $P ; find usr/bin | tail -n+2` tar rvpf $pkg.tar -C $P usr/share/console{fonts,trans} tar rvpf $pkg.tar -C $P usr/share/{uni,key}maps - tar rvpf $pkg.tar -C $P `cd $P ; find usr/share/locale -name kbd.mo` + 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/man/man1 | 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`