--- plamo/00_base/old/kernel-20160124/PlamoBuild.kernel-4.1.15_plamoRPi2 2016-01-24 09:29:53.000000000 +0900 +++ plamo/00_base/kernel/PlamoBuild.kernel-4.1.15_plamoRPi2 2016-02-04 17:54:58.000000000 +0900 @@ -9,12 +9,11 @@ ftp://plamo.linet.gr.jp/pub/Plamo-test/kernelsrc_patches/mcp/4.1-morse_code_panics.patch ftp://plamo.linet.gr.jp/pub/Plamo-test/kernelsrc_patches/toi/tuxonice-for-linux-4.1.6-2015-08-22.patch.bz2 ftp://plamo.linet.gr.jp/pub/Plamo-test/kernelsrc_patches/ovlfs/overlayfs-allow_unprivileged_mounts.patch - ftp://plamo.linet.gr.jp/pub/Plamo-test/kernelsrc_patches/config-4.1.15-plamoRPi2 - https://github.com/raspberry/firmware.git" + ftp://plamo.linet.gr.jp/pub/Plamo-test/kernelsrc_patches/config-4.1.15-plamoRPi2" pkgbase=kernel vers=4.1.15_plamoRPi2 arch=`uname -m` -build=P1 +build=P2 src=linux OPT_CONFIG="" DOCS="" @@ -208,7 +207,6 @@ git) ( cd `basename ${i##*/} .git` case `basename ${i##*/} .git` in linux) git checkout origin/rpi-4.1.y ; git reset --hard d51c7d8 ;; - firmware) git checkout origin/master ; git reset --hard 1ed8eca ;; aufs4-*) git checkout origin/aufs4.1 ; git reset --hard 2b569cf ;; esac ) ;; esac @@ -234,13 +232,16 @@ bunzip2 -c $W/tuxonice-for-linux-4.1.6-2015-08-22.patch.bz2 | patch -Np1 -i - patch -Np1 -i $W/overlayfs-allow_unprivileged_mounts.patch cp -p $W/config-4.1.15-plamoRPi2 .config - cp -p $W/firmware/extra/Module7.symvers Module.symvers cp -p arch/arm/boot/install.sh{,.orig} sed -i '/INSTALLKERNEL/s@^@#@g' arch/arm/boot/install.sh cat <<- "EOF" | patch arch/arm/boot/install.sh 40a41,42 > cp .config $4/config-$1 > + 54c56 + < cat $2 > $4/$base-$1 + --- + > scripts/mkknlimg $2 $4/kernel7.img-$1 EOF for i in `seq 0 $((${#B[@]} - 1))` ; do cd ${B[$i]} @@ -279,17 +280,20 @@ cd ${B[$i]} if [ -f Makefile ] ; then install -d $P/boot - make install INSTALL_PATH=$P/boot + make zinstall INSTALL_PATH=$P/boot make modules_install INSTALL_MOD_PATH=$P fi done krel=${vers//_/-} - ln -s config-$krel $P/boot/config - ln -s vmlinuz-$krel $P/boot/vmlinuz - ln -s System.map-$krel $P/boot/System.map - rm $P/lib/modules/$krel/{source,build} - ln -s /usr/src/linux $P/lib/modules/$krel/source - ln -s /usr/src/linux $P/lib/modules/$krel/build + cp -p $P/boot/config{-$krel,} + cp -p $P/boot/kernel7.img{-$krel,} + cp -p $P/boot/System.map{-$krel,} + install -d $P/boot/overlays + install -m 644 $B/arch/arm/boot/dts/overlays/README $P/boot/overlays + install -m 644 $B/arch/arm/boot/dts/overlays/*.dtb $P/boot/overlays + install -m 644 $B/arch/arm/boot/dts/*.dtb $P/boot + ln -sf /usr/src/linux $P/lib/modules/$krel/source + ln -sf /usr/src/linux $P/lib/modules/$krel/build touch $W/i.et cd $W find $P ! -type l -newer i.st ! -newer i.et \ @@ -315,10 +319,9 @@ done touch -t `date '+%m%d0900'` $docdir/$src convert - prune_symlink $P/boot prune_symlink $P/lib/modules/$krel touch -t `date '+%m%d0900'` $P/lib/modules/$krel - tar cvpf $pkg.tar -C $P `cd $P ; find boot | tail -n+2` + tar cvpf $pkg.tar -C $P `cd $P ; find boot -maxdepth 1 | tail -n+2` tar rvpf $pkg.tar -C $P lib/modules/$krel tar rvpf $pkg.tar -C $P lib/firmware tar rvpf $pkg.tar -C $P usr/share/doc/$src --- plamo/00_base/old/grub-20160103/PlamoBuild.grub-2.02~beta2 2016-01-03 09:19:21.000000000 +0900 +++ plamo/00_base/grub/PlamoBuild.grub-2.02~beta2 2016-01-31 19:55:06.000000000 +0900 @@ -7,7 +7,7 @@ pkgbase=grub vers=2.02~beta2 arch=`uname -m` -build=P9 +build=P10 src=$pkgbase-$vers OPT_CONFIG="--sysconfdir=/etc --disable-grub-mount --disable-werror --with-platform=efi" @@ -252,6 +252,7 @@ done install -d $P/sbin install $W/plamo_grubconfig/sbin/grubconfig{,_mbr,_efi} $P/sbin + install $W/plamo_grubconfig/sbin/grub_partuuid.sh $P/sbin install -d $P/etc/default cat <<- "EOF" > $P/etc/default/grub # Default menu entry --- plamo/00_base/old/openssh-20160114/PlamoBuild.openssh-7.1p1 2016-01-14 20:51:15.000000000 +0900 +++ plamo/00_base/openssh/PlamoBuild.openssh-7.1p2 2016-01-26 12:29:51.000000000 +0900 @@ -1,9 +1,9 @@ #!/bin/sh ###################################################################### -url="http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-7.1p1.tar.gz" +url="http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-7.1p2.tar.gz" pkgbase=openssh -vers=7.1p1 +vers=7.1p2 arch=`uname -m` build=P2 src=$pkgbase-$vers @@ -11,9 +11,8 @@ --with-privsep-user=sshd --with-privsep-path=/var/lib/sshd --with-md5-passwords" DOCS="CREDITS INSTALL LICENCE OVERVIEW PROTOCOL PROTOCOL.agent - PROTOCOL.certkeys PROTOCOL.chacha20poly1305 PROTOCOL.key - PROTOCOL.krl PROTOCOL.mux README README.dns README.platform - README.privsep README.tun TODO ChangeLog" + `echo PROTOCOL.{certkeys,chacha20poly1305,key,krl,mux}` + README `echo README.{dns,platform,privsep,tun}` TODO ChangeLog" ###################################################################### fscheck() { --- plamo/00_base/old/openssh-20160126/PlamoBuild.openssh-7.1p2 2016-01-26 12:29:51.000000000 +0900 +++ plamo/00_base/openssh/PlamoBuild.openssh-7.2p1 2016-03-14 18:20:09.000000000 +0900 @@ -1,9 +1,9 @@ #!/bin/sh ###################################################################### -url="http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-7.1p2.tar.gz" +url="http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-7.2p1.tar.gz" pkgbase=openssh -vers=7.1p2 +vers=7.2p1 arch=`uname -m` build=P2 src=$pkgbase-$vers @@ -250,6 +250,8 @@ make install DESTDIR=$P fi done + ln -s ssh $P/usr/bin/slogin + ln -s ssh.1 $mandir/man1/slogin.1 chgrp sys $P/var/lib/sshd mv $P/etc/ssh/ssh_config{,.new} ; mv $P/etc/ssh/sshd_config{,.new} mv $P/etc/ssh/{ssh{,d}_config.new,moduli} $C --- plamo/00_base/old/grub-20160131/PlamoBuild.grub-2.02~beta2 2016-01-31 19:55:06.000000000 +0900 +++ plamo/00_base/grub/PlamoBuild.grub-2.02~beta2 2016-03-14 17:15:16.000000000 +0900 @@ -7,7 +7,7 @@ pkgbase=grub vers=2.02~beta2 arch=`uname -m` -build=P10 +build=P12 src=$pkgbase-$vers OPT_CONFIG="--sysconfdir=/etc --disable-grub-mount --disable-werror --with-platform=efi" --- plamo/00_base/old/hdsetup-20160113/PlamoBuild.hdsetup-6.0 2016-01-13 22:20:16.000000000 +0900 +++ plamo/00_base/hdsetup/PlamoBuild.hdsetup-6.1 2016-03-15 08:27:01.000000000 +0900 @@ -5,9 +5,9 @@ http://plamo.linet.gr.jp/~tamuki/src/busybox-1.24.1-config http://invisible-mirror.net/archives/dialog/dialog-1.1-20110302.tgz http://ftp.gnu.org/gnu/coreutils/coreutils-8.23.tar.xz - http://plamo.linet.gr.jp/~tamuki/src/hdsetup-6.0-plamoscripts.tar.gz" + http://plamo.linet.gr.jp/~tamuki/src/hdsetup-plamoscripts.tar.gz" pkgbase=hdsetup -vers=6.0 +vers=6.1 arch=`uname -m` build=P2 src[0]=busybox-1.24.1 @@ -275,7 +275,7 @@ mv $P/bin $P/sbin/installer cp -r $W/sbin $P install -d $P/usr/lib/setup - touch $P/usr/lib/setup/Plamo-6.0 + touch $P/usr/lib/setup/Plamo-$vers touch $W/i.et cd $W find $P ! -type l -newer i.st ! -newer i.et \ --- plamo/00_base/old/lilo-20151222/PlamoBuild.lilo-24.1 2015-12-22 20:53:46.000000000 +0900 +++ plamo/00_base/lilo/PlamoBuild.lilo-24.2 2016-03-14 17:34:46.000000000 +0900 @@ -1,19 +1,20 @@ #!/bin/sh ###################################################################### -url="http://lilo.alioth.debian.org/ftp/sources/lilo-24.1.tar.gz - http://plamo.linet.gr.jp/~tamuki/src/lilo-24.1-x86_64.patch.gz +url="http://lilo.alioth.debian.org/ftp/sources/lilo-24.2.tar.gz ftp://ftp.internat.freebsd.org/pub/FreeBSD/distfiles/Dev86src-0.16.18.tar.gz http://plamo.linet.gr.jp/~tamuki/src/dev86-0.16.17-x86_64.patch.gz http://plamo.linet.gr.jp/~tamuki/src/dev86-0.16.17-copt.patch.gz http://plamo.linet.gr.jp/~tamuki/src/plamo_liloconfig.tar.gz" pkgbase=lilo -vers=24.1 +vers=24.2 arch=`uname -m` build=P2 src=$pkgbase-$vers OPT_CONFIG="" -DOCS="readme/* CHANGELOG_old TODO README COPYING CHANGELOG NEWS TOOLS" +DOCS="`echo readme/README.{bitmaps,common.problems,disk,nokeyboard}` + `echo readme/{README.{pseudo,volumeID,raid1},INCOMPAT,README}` + NEWS CHANGELOG TODO README COPYING CHANGELOG_old TOOLS" ###################################################################### fscheck() { @@ -205,7 +206,6 @@ if [ -d ${B[$i]} ] ; then rm -rf ${B[$i]} ; fi ; cp -a ${S[$i]} ${B[$i]} done cd $B - gunzip -c $W/lilo-24.1-x86_64.patch.gz | patch -Np1 -i - cp -p checkit checkit.orig sed 's@^gcc @LANG=C gcc @g' checkit.orig > checkit cp -p diagnose/Makefile diagnose/Makefile.orig @@ -301,10 +301,10 @@ touch -r $S/sample $docdir/$src/sample cp -a $S/doc $docdir/$src chown -R root.root $docdir/$src/{sample,doc} - mv $docdir/$src/{doc,readme,sample,{CHANGELOG_old,TODO,README}.gz} $C - mv $docdir/$src/{COPYING,CHANGELOG,NEWS,TOOLS,$myname}.gz $C - mv $C/{doc,readme,sample,{CHANGELOG_old,TODO,README}.gz} $docdir/$src - mv $C/{COPYING,CHANGELOG,NEWS,TOOLS,$myname}.gz $docdir/$src + mv $docdir/$src/{readme,sample,{NEWS,CHANGELOG,TODO,README}.gz} $C + mv $docdir/$src/{{COPYING,CHANGELOG_old,TOOLS}.gz,doc,$myname.gz} $C + mv $C/{readme,sample,{NEWS,CHANGELOG,TODO,README}.gz} $docdir/$src + mv $C/{{COPYING,CHANGELOG_old,TOOLS}.gz,doc,$myname.gz} $docdir/$src touch -r $S $docdir/$src convert tar cvpf $pkg.tar -C $P `cd $P ; find sbin | tail -n+2` --- plamo/00_base/old/shadow-20151222/PlamoBuild.shadow-git_20130908 2015-12-22 12:51:24.000000000 +0900 +++ plamo/00_base/shadow/PlamoBuild.shadow-git_20130908 2016-01-25 12:43:14.000000000 +0900 @@ -2,11 +2,11 @@ ###################################################################### url="https://github.com/shadow-maint/shadow.git - http://plamo.linet.gr.jp/~tamuki/src/shadow-adduser-20141229" + http://plamo.linet.gr.jp/~tamuki/src/shadow-adduser-20160122" pkgbase=shadow vers=git_20130908 arch=`uname -m` -build=P4 +build=P5 src=$pkgbase OPT_CONFIG="--sysconfdir=/etc --enable-man --without-selinux --with-libcrack" @@ -368,7 +368,7 @@ make install DESTDIR=$P fi done - install $W/shadow-adduser-20141229 $P/usr/sbin/adduser + install $W/shadow-adduser-20160122 $P/usr/sbin/adduser install -d $mandir/ja_JP.eucJP/man{1,5,8} for i in `cd $mandir/ja ; find . -type f` ; do nkf -We $mandir/ja/$i > $mandir/ja_JP.eucJP/$i --- plamo/00_base/old/sysvinit-20151222/PlamoBuild.sysvinit-2.88dsf 2015-12-22 18:27:02.000000000 +0900 +++ plamo/00_base/sysvinit/PlamoBuild.sysvinit-2.88dsf 2016-03-14 19:15:52.000000000 +0900 @@ -2,11 +2,11 @@ ###################################################################### url="http://download.savannah.gnu.org/releases/sysvinit/sysvinit-2.88dsf.tar.bz2 - ftp://plamo.linet.gr.jp/pub/Plamo-test/for-5.0/plamo-rc-scripts/plamo-rc-scripts-20151013.tgz" + ftp://plamo.linet.gr.jp/pub/Plamo-test/for-5.0/plamo-rc-scripts/plamo-rc-scripts-20160208.tgz" pkgbase=sysvinit vers=2.88dsf arch=`uname -m` -build=P15 +build=P16 src=$pkgbase-$vers OPT_CONFIG="" DOCS="doc/bootlogd.README doc/Install doc/Changelog doc/Propaganda @@ -245,17 +245,22 @@ #!/bin/sh root="`cat /proc/cmdline | sed -n 's@.*\=\([^ ]*\).*@\1@p'`" - if [ -n "`echo $root | grep "/dev/"`" ] ; then - # root=/dev/sdb1 (grub) - root_part=`echo $root | sed 's@/dev/@@'` + if grep -q "^PARTUUID=" <<< $root ; then + # root=PARTUUID= + root_part=`blkid | tr -d '"' | grep $root | cut -d: -f1 | sed 's@/dev/@@'` else - # root=821 (lilo) - maj=$((`printf "%d" 0x$root` / 256)) ; min=$((`printf "%d" 0x$root` % 256)) - root_part=`cat /proc/partitions | sed -n "/ $maj *$min /s@.* \([^ ]*\)@\1@p"` + if grep -q "^/dev/" <<< $root ; then + # root=/dev/sda1 (grub) + root_part=${root#/dev/} + else + # root=801 (lilo) + maj=$((`printf "%d" 0x$root` / 256)) + min=$((`printf "%d" 0x$root` % 256)) + root_part=`cat /proc/partitions \ + | sed -n "/ $maj *$min /s@.* \([^ ]*\)@\1@p"` + fi fi - ( cd /dev ; rm -rf root ) - ( cd /dev ; ln -sf $root_part root ) - exit 0 + ln -sf $root_part /dev/root EOF chmod 755 $P/sbin/link_rootdev.sh touch $W/i.et --- plamo/00_base/old/timezone-20160117/PlamoBuild.timezone-2012e 2016-01-17 10:46:09.000000000 +0900 +++ plamo/00_base/timezone/PlamoBuild.timezone-2015g 2016-01-26 13:27:41.000000000 +0900 @@ -1,16 +1,16 @@ #!/bin/sh ###################################################################### -url="http://www.iana.org/time-zones/repository/releases/tzcode2012e.tar.gz - http://www.iana.org/time-zones/repository/releases/tzdata2012e.tar.gz +url="http://www.iana.org/time-zones/repository/releases/tzcode2015g.tar.gz + http://www.iana.org/time-zones/repository/releases/tzdata2015g.tar.gz http://plamo.linet.gr.jp/~tamuki/src/plamo_timeconfig.tar.gz" pkgbase=timezone -vers=2012e +vers=2015g arch=`uname -m` build=P2 src=$pkgbase-$vers OPT_CONFIG="" -DOCS="README Theory" +DOCS="CONTRIBUTING NEWS README Theory tz-art.htm tz-link.htm" ###################################################################### fscheck() { @@ -196,9 +196,9 @@ bz2) tar xvpjf ${i##*/} ;; esac done - mkdir timezone-2012e - tar xvpzf tzcode2012e.tar.gz -C timezone-2012e - tar xvpzf tzdata2012e.tar.gz -C timezone-2012e + mkdir timezone-2015g + tar xvpzf tzcode2015g.tar.gz -C timezone-2015g + tar xvpzf tzdata2015g.tar.gz -C timezone-2015g tar xvpzf plamo_timeconfig.tar.gz fi if [ $opt_config -eq 1 ] ; then @@ -273,6 +273,7 @@ fi ( cd $docdir ; find ${src[$i]} -type d -exec touch -r $W/{} {} \; ) done + touch -t `date '+%m%d0900'` $docdir/$src convert tar cvpf $pkg.tar -C $P `cd $P ; find usr/sbin | tail -n+2` tar rvpf $pkg.tar -C $P `cd $P ; find usr/$libdir | tail -n+2` --- plamo/00_base/old/extipl-20151231/PlamoBuild.extipl-5.04 2015-12-31 16:31:10.000000000 +0900 +++ plamo/00_base/extipl/PlamoBuild.extipl-5.04 2016-03-20 21:41:47.000000000 +0900 @@ -2,7 +2,7 @@ ###################################################################### url="http://jaist.dl.sourceforge.jp/extipl/2166/extipl-5.04.tar.gz - http://plamo.linet.gr.jp/~tamuki/src/extipl-5.04-syscall.patch.gz + ftp://plamo.linet.gr.jp/pub/Plamo-src.new/plamo/00_base/extipl/extipl-5.04-syscall.patch.gz http://jaist.dl.sourceforge.net/sourceforge/nasm/nasm-0.98.38.tar.bz2" pkgbase=extipl vers=5.04 --- plamo/00_base/old/netkit_combo-20151222/PlamoBuild.netkit_combo-0.17 2015-12-22 11:56:17.000000000 +0900 +++ plamo/00_base/netkit_combo/PlamoBuild.netkit_combo-0.17 2016-03-23 07:42:38.000000000 +0900 @@ -2,26 +2,26 @@ ###################################################################### url="ftp://ftp.linux.org.uk/pub/linux/Networking/netkit/netkit-combo-0.17.tar.gz - http://plamo.linet.gr.jp/~tamuki/src/biff+comsat-0.17.diff.gz - http://plamo.linet.gr.jp/~tamuki/src/biff+comsat.offset.diff.gz - http://plamo.linet.gr.jp/~tamuki/src/biff+comsat.badutmp.diff.gz - http://plamo.linet.gr.jp/~tamuki/src/bsd-finger_0.17-13.diff.gz - http://plamo.linet.gr.jp/~tamuki/src/linux-ftpd_0.17-29.diff.gz - http://plamo.linet.gr.jp/~tamuki/src/netkit-bootparamd_0.17-9.diff.gz - http://plamo.linet.gr.jp/~tamuki/src/netkit-ftp_0.17-19.diff.gz - http://plamo.linet.gr.jp/~tamuki/src/netkit-ntalk_0.17-14.diff.gz - http://plamo.linet.gr.jp/~tamuki/src/routed.18.candidate.final.patch.gz - http://plamo.linet.gr.jp/~tamuki/src/netkit-routed-0.17.diff.gz - http://plamo.linet.gr.jp/~tamuki/src/netkit-rsh_0.17-14.diff.gz - http://plamo.linet.gr.jp/~tamuki/src/netkit-rusers_0.17-7.1.diff.gz - http://plamo.linet.gr.jp/~tamuki/src/netkit-rwall_0.17-6.2.diff.gz - http://plamo.linet.gr.jp/~tamuki/src/netkit-rwho_0.17-12.diff.gz - http://plamo.linet.gr.jp/~tamuki/src/netkit-telnet_0.17-36.diff.gz - http://plamo.linet.gr.jp/~tamuki/src/netkit-tftp_0.17-17.diff.gz - http://plamo.linet.gr.jp/~tamuki/src/netkit-timed-0.17.diff.gz - http://plamo.linet.gr.jp/~tamuki/src/netwrite-0.17.diff.gz - http://plamo.linet.gr.jp/~tamuki/src/netkit-combo-0.17-diffs.patch.gz - http://plamo.linet.gr.jp/~tamuki/src/netkit-combo-0.17-tirpc.patch.gz" + ftp://plamo.linet.gr.jp/pub/Plamo-src.new/plamo/00_base/netkit_combo/biff+comsat-0.17.diff.gz + ftp://plamo.linet.gr.jp/pub/Plamo-src.new/plamo/00_base/netkit_combo/biff+comsat.offset.diff.gz + ftp://plamo.linet.gr.jp/pub/Plamo-src.new/plamo/00_base/netkit_combo/biff+comsat.badutmp.diff.gz + ftp://plamo.linet.gr.jp/pub/Plamo-src.new/plamo/00_base/netkit_combo/bsd-finger_0.17-13.diff.gz + ftp://plamo.linet.gr.jp/pub/Plamo-src.new/plamo/00_base/netkit_combo/linux-ftpd_0.17-29.diff.gz + ftp://plamo.linet.gr.jp/pub/Plamo-src.new/plamo/00_base/netkit_combo/netkit-bootparamd_0.17-9.diff.gz + ftp://plamo.linet.gr.jp/pub/Plamo-src.new/plamo/00_base/netkit_combo/netkit-ftp_0.17-19.diff.gz + ftp://plamo.linet.gr.jp/pub/Plamo-src.new/plamo/00_base/netkit_combo/netkit-ntalk_0.17-14.diff.gz + ftp://plamo.linet.gr.jp/pub/Plamo-src.new/plamo/00_base/netkit_combo/routed.18.candidate.final.patch.gz + ftp://plamo.linet.gr.jp/pub/Plamo-src.new/plamo/00_base/netkit_combo/netkit-routed-0.17.diff.gz + ftp://plamo.linet.gr.jp/pub/Plamo-src.new/plamo/00_base/netkit_combo/netkit-rsh_0.17-14.diff.gz + ftp://plamo.linet.gr.jp/pub/Plamo-src.new/plamo/00_base/netkit_combo/netkit-rusers_0.17-7.1.diff.gz + ftp://plamo.linet.gr.jp/pub/Plamo-src.new/plamo/00_base/netkit_combo/netkit-rwall_0.17-6.2.diff.gz + ftp://plamo.linet.gr.jp/pub/Plamo-src.new/plamo/00_base/netkit_combo/netkit-rwho_0.17-12.diff.gz + ftp://plamo.linet.gr.jp/pub/Plamo-src.new/plamo/00_base/netkit_combo/netkit-telnet_0.17-36.diff.gz + ftp://plamo.linet.gr.jp/pub/Plamo-src.new/plamo/00_base/netkit_combo/netkit-tftp_0.17-17.diff.gz + ftp://plamo.linet.gr.jp/pub/Plamo-src.new/plamo/00_base/netkit_combo/netkit-timed-0.17.diff.gz + ftp://plamo.linet.gr.jp/pub/Plamo-src.new/plamo/00_base/netkit_combo/netwrite-0.17.diff.gz + ftp://plamo.linet.gr.jp/pub/Plamo-src.new/plamo/00_base/netkit_combo/netkit-combo-0.17-diffs.patch.gz + ftp://plamo.linet.gr.jp/pub/Plamo-src.new/plamo/00_base/netkit_combo/netkit-combo-0.17-tirpc.patch.gz" pkgbase=netkit_combo vers=0.17 arch=`uname -m` --- plamo/00_base/old/ncurses-20160114/PlamoBuild.ncurses-5.7 2016-01-14 08:31:54.000000000 +0900 +++ plamo/00_base/ncurses/PlamoBuild.ncurses-5.7 2016-03-24 11:50:31.000000000 +0900 @@ -6,7 +6,7 @@ pkgbase=ncurses vers=5.7 arch=`uname -m` -build=P4 +build=P5 src=$pkgbase-$vers OPT_CONFIG="--with-shared --without-debug --enable-widec --with-manpage-format=normal" @@ -204,8 +204,10 @@ done cd $B patch -Np1 -i $W/ncurses-5.7-branch_update-21.patch - cp -p misc/run_tic.in{,.orig} - sed -i 's@\@lib64@g' misc/run_tic.in + if [ $arch == x86_64 ] ; then + cp -p misc/run_tic.in{,.orig} + sed -i 's@\@lib64@g' misc/run_tic.in + fi for i in `seq 0 $((${#B[@]} - 1))` ; do cd ${B[$i]} if [ -f Makefile ] ; then --- plamo/00_base/old/bash-20151225/PlamoBuild.bash-4.2.53 2015-12-25 20:30:44.000000000 +0900 +++ plamo/00_base/bash/PlamoBuild.bash-4.2.53 2016-04-02 17:02:57.000000000 +0900 @@ -5,7 +5,7 @@ pkgbase=bash vers=4.2.53 arch=`uname -m` -build=P2 +build=P3 src[0]=$pkgbase-$vers src[1]=${src[0]} OPT_CONFIG[0]="--bindir=/bin --without-bash-malloc --with-installed-readline" @@ -278,6 +278,7 @@ tar rvpf $pkg.tar -C $P `cd $P ; find usr/share/info | tail -n+2` tar rvpf $pkg.tar -C $P `cd $P ; find usr/share/man/man1 | 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 mv $pkg.tar.xz $pkg.txz read -p "Do you want to keep work files? [y/N] " ans --- plamo/00_base/old/groff-20160101/PlamoBuild.groff-1.18.1.1 2016-01-01 14:14:33.000000000 +0900 +++ plamo/00_base/groff/PlamoBuild.groff-1.18.1.1 2016-03-20 22:37:30.000000000 +0900 @@ -3,8 +3,8 @@ ###################################################################### url="http://ftp.gnu.org/gnu/groff/old/groff-1.18.1.1.tar.gz https://launchpad.net/ubuntu/+archive/primary/+files/groff_1.18.1.1-20.diff.gz - http://plamo.linet.gr.jp/~tamuki/src/groff-1.18.1.1-fix-minus-char.patch.gz - http://plamo.linet.gr.jp/~tamuki/src/groff-1.18.1.1-polyfill_fix.patch.gz" + ftp://plamo.linet.gr.jp/pub/Plamo-src.new/plamo/00_base/groff/groff-1.18.1.1-fix-minus-char.patch.gz + ftp://plamo.linet.gr.jp/pub/Plamo-src.new/plamo/00_base/groff/groff-1.18.1.1-polyfill_fix.patch.gz" pkgbase=groff vers=1.18.1.1 arch=`uname -m` --- plamo/00_base/old/hdsetup-20160315/PlamoBuild.hdsetup-6.1 2016-03-15 08:27:01.000000000 +0900 +++ plamo/00_base/hdsetup/PlamoBuild.hdsetup-6.1 2016-03-20 22:53:19.000000000 +0900 @@ -2,10 +2,10 @@ ###################################################################### url="https://www.busybox.net/downloads/busybox-1.24.1.tar.bz2 - http://plamo.linet.gr.jp/~tamuki/src/busybox-1.24.1-config + ftp://plamo.linet.gr.jp/pub/Plamo-src.new/plamo/00_base/hdsetup/busybox-1.24.1-config http://invisible-mirror.net/archives/dialog/dialog-1.1-20110302.tgz http://ftp.gnu.org/gnu/coreutils/coreutils-8.23.tar.xz - http://plamo.linet.gr.jp/~tamuki/src/hdsetup-plamoscripts.tar.gz" + ftp://plamo.linet.gr.jp/pub/Plamo-src.new/plamo/00_base/hdsetup/hdsetup-plamoscripts.tar.gz" pkgbase=hdsetup vers=6.1 arch=`uname -m` --- plamo/00_base/old/file-20151228/PlamoBuild.file-5.22 2015-12-28 16:05:57.000000000 +0900 +++ plamo/00_base/file/PlamoBuild.file-5.22 2016-04-02 18:30:26.000000000 +0900 @@ -5,7 +5,7 @@ pkgbase=file vers=5.22 arch=`uname -m` -build=P2 +build=P3 src=$pkgbase-$vers OPT_CONFIG="" DOCS="AUTHORS COPYING ChangeLog INSTALL NEWS README TODO MAINT" @@ -264,6 +264,7 @@ tar cvpf $pkg.tar -C $P `cd $P ; find usr/bin | tail -n+2` tar rvpf $pkg.tar -C $P `cd $P ; find usr/share/man/man1 | 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 mv $pkg.tar.xz $pkg.txz read -p "Do you want to keep work files? [y/N] " ans --- plamo/00_base/old/dhcp-20151228/PlamoBuild.dhcp-4.2.7 2015-12-28 02:33:19.000000000 +0900 +++ plamo/00_base/dhcp/PlamoBuild.dhcp-4.3.3 2016-01-25 13:06:29.000000000 +0900 @@ -1,11 +1,9 @@ #!/bin/sh ###################################################################### -url="http://ftp.isc.org/isc/dhcp/4.2.7/dhcp-4.2.7.tar.gz - http://plamo.linet.gr.jp/~tamuki/src/dhcp-udp_checksum_offloading.patch - http://plamo.linet.gr.jp/~tamuki/src/dhcp-ffff-checksum.patch" +url="http://ftp.isc.org/isc/dhcp/4.3.3/dhcp-4.3.3.tar.gz" pkgbase=dhcp -vers=4.2.7 +vers=4.3.3 arch=`uname -m` build=P2 src=$pkgbase-$vers @@ -202,8 +200,6 @@ if [ -d ${B[$i]} ] ; then rm -rf ${B[$i]} ; fi ; cp -a ${S[$i]} ${B[$i]} done cd $B - patch -Np1 -i $W/dhcp-udp_checksum_offloading.patch - patch -Np1 -i $W/dhcp-ffff-checksum.patch cp -p client/scripts/linux{,.orig} cat <<- "EOF" > client/scripts/linux 24a25,26 --- plamo/00_base/old/file-20160402/PlamoBuild.file-5.22 2016-04-02 18:30:26.000000000 +0900 +++ plamo/00_base/file/PlamoBuild.file-5.22 2016-04-07 07:39:50.000000000 +0900 @@ -5,7 +5,7 @@ pkgbase=file vers=5.22 arch=`uname -m` -build=P3 +build=P4 src=$pkgbase-$vers OPT_CONFIG="" DOCS="AUTHORS COPYING ChangeLog INSTALL NEWS README TODO MAINT" @@ -262,7 +262,13 @@ done 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/$libdir | tail -n+2` + tar rvpf $pkg.tar -C $P `cd $P ; find usr/include | tail -n+2` + tar rvpf $pkg.tar -C $P `cd $P ; find usr/misc | tail -n+2` 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/man4 | 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 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 --- plamo/00_base/old/dump-20151224/PlamoBuild.dump-0.4b44 2015-12-24 20:45:35.000000000 +0900 +++ plamo/00_base/dump/PlamoBuild.dump-0.4b44 2016-03-20 21:34:01.000000000 +0900 @@ -2,8 +2,8 @@ ###################################################################### url="http://jaist.dl.sourceforge.net/sourceforge/dump/dump-0.4b44.tar.gz - http://plamo.linet.gr.jp/~tamuki/src/dump-0.4b41-destdir.patch.gz - http://plamo.linet.gr.jp/~tamuki/src/dump-0.4b44-com_err.patch.gz" + ftp://plamo.linet.gr.jp/pub/Plamo-src.new/plamo/00_base/dump/dump-0.4b41-destdir.patch.gz + ftp://plamo.linet.gr.jp/pub/Plamo-src.new/plamo/00_base/dump/dump-0.4b44-com_err.patch.gz" pkgbase=dump vers=0.4b44 arch=`uname -m` --- plamo/00_base/old/less-20151222/PlamoBuild.less-382 2015-12-22 18:45:52.000000000 +0900 +++ plamo/00_base/less/PlamoBuild.less-382 2016-03-21 18:38:07.000000000 +0900 @@ -8,7 +8,7 @@ ftp://ftp.jp.freebsd.org/pub/FreeBSD/ports/distfiles/less-382-iso260-261.patch.gz ftp://ftp.jp.freebsd.org/pub/FreeBSD/ports/distfiles/less-382-iso261-262.patch.gz ftp://ftp.jp.freebsd.org/pub/FreeBSD/ports/distfiles/less-382-iso262.ext03.patch.gz - http://plamo.linet.gr.jp/~tamuki/src/less-382-def_priority.patch.gz" + ftp://plamo.linet.gr.jp/pub/Plamo-src.new/plamo/00_base/less/less-382-def_priority.patch.gz" pkgbase=less vers=382 arch=`uname -m` --- plamo/00_base/old/netkit_combo-20160323/PlamoBuild.netkit_combo-0.17 2016-03-23 07:42:38.000000000 +0900 +++ plamo/00_base/netkit_combo/PlamoBuild.netkit_combo-0.17 2016-03-30 13:45:36.000000000 +0900 @@ -25,7 +25,7 @@ pkgbase=netkit_combo vers=0.17 arch=`uname -m` -build=P7 +build=P8 src=netkit-combo-$vers OPT_CONFIG="" DOCS="README @@ -267,6 +267,10 @@ gunzip -c $W/netkit-tftp_0.17-17.diff.gz | patch -Np1 -i - cd $B/netkit-telnet gunzip -c $W/netkit-telnet_0.17-36.diff.gz | patch -Np1 -i - + if [ $arch == x86_64 ] ; then + cp -p telnetd/Makefile{,.orig} + sed 's@/lib@/lib64@g' telnetd/Makefile.orig > telnetd/Makefile + fi cd $B/netkit-timed gunzip -c $W/netkit-timed-0.17.diff.gz | patch -Np1 -i - cd $B/netwrite --- plamo/00_base/old/nvi-20151229/PlamoBuild.nvi-1.79 2015-12-29 20:25:44.000000000 +0900 +++ plamo/00_base/nvi/PlamoBuild.nvi-1.79 2016-03-26 22:31:27.703769823 +0900 @@ -3,8 +3,8 @@ ###################################################################### url="http://pkgs.fedoraproject.org/repo/pkgs/nvi-m17n/nvi-1.79.tar.gz/765e2153f5fc4f21793f2edc2647305a/nvi-1.79.tar.gz http://pkgs.fedoraproject.org/repo/pkgs/nvi-m17n/nvi-1.79.m17n-20040401.diff.gz/851650ced51697b3b08400fa75621c97/nvi-1.79.m17n-20040401.diff.gz - http://plamo.linet.gr.jp/~tamuki/src/nvi-1.79-64bit_breakage.patch.gz - http://plamo.linet.gr.jp/~tamuki/src/nvi-1.79-DESTDIR.patch.gz" + ftp://plamo.linet.gr.jp/pub/Plamo-src.new/plamo/00_base/nvi/nvi-1.79-64bit_breakage.patch.gz + ftp://plamo.linet.gr.jp/pub/Plamo-src.new/plamo/00_base/nvi/nvi-1.79-DESTDIR.patch.gz" pkgbase=nvi vers=1.79 arch=`uname -m` @@ -210,10 +210,11 @@ if [ -d ${B[$i]} ] ; then rm -rf ${B[$i]} ; fi ; cp -a ${S[$i]} ${B[$i]} done cd $B + chmod -R u+w . gunzip -c $W/nvi-1.79.m17n-20040401.diff.gz | patch -Np0 -i - gunzip -c $W/nvi-1.79-64bit_breakage.patch.gz | patch -Np1 -i - gunzip -c $W/nvi-1.79-DESTDIR.patch.gz | patch -Np1 -i - - cp -p build/configure{,.orig} ; chmod 755 build/configure + cp -p build/configure{,.orig} sed '/^LDFLAGS=/s@$LDFLAGS@${LDFLAGS-"-lncurses"}@g' build/configure.orig \ > build/configure for i in `seq 0 $((${#B[@]} - 1))` ; do @@ -255,6 +256,52 @@ make install DESTDIR=$P fi done + install -d $P/usr/libexec + mv $P/usr/bin/{vi,ex,view} $P/usr/libexec + cat <<- "EOF" > $P/usr/bin/vi + #!/bin/sh + + optend=0 ; optarg=0 ; nargv=() + for arg in "$@" ; do + file=0 + if [ $optend -eq 1 ] ; then + file=1 + elif [ $optarg -eq 1 ] ; then + optarg=0 + elif [ "${arg:0:1}" == "-" ] ; then + if [ "$arg" == "--" ] ; then + optend=1 + elif [ `expr length "$(expr "$arg" : ".*\([ctw].*\)")"` -eq 1 ] ; then + optarg=1 + fi + elif [ "${arg:0:1}" != "+" ] ; then + file=1 + fi + if [ $file -eq 1 ] ; then + if [ -f "$arg" ] ; then + if [ `nkf -g "$arg"` == UTF-8 ] ; then + temp=`mktemp /tmp/vi.XXXXXX` + nkf -e "$arg" > $temp + touch -r "$arg" $temp + arg=$temp + fi + fi + fi + nargv=("${nargv[@]}" "$arg") + done + /usr/libexec/${0##*/} "${nargv[@]}" + i=0 + for arg in "$@" ; do + if [ "$arg" != "${nargv[$i]}" ] ; then + [ ${nargv[$i]} -nt "$arg" ] && nkf -w ${nargv[$i]} > "$arg" + rm ${nargv[$i]} + fi + let ++i + done + EOF + chmod 755 $P/usr/bin/vi + ln $P/usr/bin/{vi,ex} + ln $P/usr/bin/{vi,view} touch $W/i.et cd $W find $P ! -type l -newer i.st ! -newer i.et \ @@ -289,6 +336,7 @@ 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/libexec | tail -n+2` tar rvpf $pkg.tar -C $P usr/share/vi tar rvpf $pkg.tar -C $P `cd $P ; find usr/share/man/cat1 | tail -n+2` tar rvpf $pkg.tar -C $P `cd $P ; find usr/share/man/man1 | tail -n+2` --- plamo/00_base/old/tcsh-20160116/PlamoBuild.tcsh-6.17.00 2016-01-16 16:04:07.000000000 +0900 +++ plamo/00_base/tcsh/PlamoBuild.tcsh-6.19.00 2016-01-26 13:00:32.000000000 +0900 @@ -1,9 +1,9 @@ #!/bin/sh ###################################################################### -url="http://ftp.osuosl.org/pub/blfs/conglomeration/tcsh/tcsh-6.17.00.tar.gz" +url="http://ftp.osuosl.org/pub/blfs/conglomeration/tcsh/tcsh-6.19.00.tar.gz" pkgbase=tcsh -vers=6.17.00 +vers=6.19.00 arch=`uname -m` build=P2 src=$pkgbase-$vers @@ -220,7 +220,6 @@ cd ${B[$i]} if [ -f Makefile ] ; then make - make catalogs fi done fi @@ -244,33 +243,6 @@ install -d $P/bin mv $P/usr/bin/tcsh $P/bin ln -s /bin/tcsh $P/usr/bin - localedir=$P/usr/share/locale - install -d $localedir/C/LC_MESSAGES - install -m 644 tcsh.C.cat $localedir/C/LC_MESSAGES/tcsh.mo - install -d $localedir/et/LC_MESSAGES - install -m 644 tcsh.et.cat $localedir/et/LC_MESSAGES/tcsh.mo - install -d $localedir/fi/LC_MESSAGES - install -m 644 tcsh.finnish.cat $localedir/fi/LC_MESSAGES/tcsh.mo - install -d $localedir/fr/LC_MESSAGES - install -m 644 tcsh.french.cat $localedir/fr/LC_MESSAGES/tcsh.mo - install -d $localedir/de/LC_MESSAGES - install -m 644 tcsh.german.cat $localedir/de/LC_MESSAGES/tcsh.mo - install -d $localedir/gr/LC_MESSAGES - install -m 644 tcsh.greek.cat $localedir/gr/LC_MESSAGES/tcsh.mo - install -d $localedir/it/LC_MESSAGES - install -m 644 tcsh.italian.cat $localedir/it/LC_MESSAGES/tcsh.mo - install -d $localedir/ja/LC_MESSAGES - install -m 644 tcsh.ja.cat $localedir/ja/LC_MESSAGES/tcsh.mo - install -d $localedir/ja/LC_MESSAGES - install -m 644 tcsh.ja.cat $localedir/ja/LC_MESSAGES/tcsh.mo - install -d $localedir/pl/LC_MESSAGES - install -m 644 tcsh.pl.cat $localedir/pl/LC_MESSAGES/tcsh.mo - install -d $localedir/ru/LC_MESSAGES - install -m 644 tcsh.russian.cat $localedir/ru/LC_MESSAGES/tcsh.mo - install -d $localedir/es/LC_MESSAGES - install -m 644 tcsh.spanish.cat $localedir/es/LC_MESSAGES/tcsh.mo - install -d $localedir/ru_UA.koi8u/LC_MESSAGES - install -m 644 tcsh.ukrainian.cat $localedir/ru_UA.koi8u/LC_MESSAGES/tcsh.mo install -d $mandir/man3 install -m 644 glob.3 $mandir/man3 touch $W/i.et @@ -298,7 +270,7 @@ convert tar cvpf $pkg.tar -C $P `cd $P ; find bin | 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/share/locale -name "*.mo"` + tar rvpf $pkg.tar -C $P `cd $P ; find usr/share/locale -name "*.cat"` 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 usr/share/doc/$src --- plamo/00_base/old/hdsetup-20160320/PlamoBuild.hdsetup-6.1 2016-03-20 22:53:19.000000000 +0900 +++ plamo/00_base/hdsetup/PlamoBuild.hdsetup-6.1 2016-04-08 19:20:57.000000000 +0900 @@ -3,15 +3,15 @@ ###################################################################### url="https://www.busybox.net/downloads/busybox-1.24.1.tar.bz2 ftp://plamo.linet.gr.jp/pub/Plamo-src.new/plamo/00_base/hdsetup/busybox-1.24.1-config - http://invisible-mirror.net/archives/dialog/dialog-1.1-20110302.tgz + ftp://invisible-island.net/dialog/dialog-1.3-20160209.tgz http://ftp.gnu.org/gnu/coreutils/coreutils-8.23.tar.xz ftp://plamo.linet.gr.jp/pub/Plamo-src.new/plamo/00_base/hdsetup/hdsetup-plamoscripts.tar.gz" pkgbase=hdsetup vers=6.1 arch=`uname -m` -build=P2 +build=P3 src[0]=busybox-1.24.1 -src[1]=dialog-1.1-20110302 +src[1]=dialog-1.3-20160209 src[2]=coreutils-8.23 OPT_CONFIG[0]="" OPT_CONFIG[1]="--bindir=/bin --enable-nls --with-ncursesw --enable-widec" --- plamo/00_base/old/hdsetup-20160408/PlamoBuild.hdsetup-6.1 2016-04-08 19:20:57.000000000 +0900 +++ plamo/00_base/hdsetup/PlamoBuild.hdsetup-6.1 2016-04-15 19:48:17.000000000 +0900 @@ -5,14 +5,25 @@ ftp://plamo.linet.gr.jp/pub/Plamo-src.new/plamo/00_base/hdsetup/busybox-1.24.1-config ftp://invisible-island.net/dialog/dialog-1.3-20160209.tgz http://ftp.gnu.org/gnu/coreutils/coreutils-8.23.tar.xz + http://ftp.gnu.org/gnu/gzip/gzip-1.6.tar.gz + http://www.bzip.org/1.0.6/bzip2-1.0.6.tar.gz + http://tukaani.org/xz/xz-5.2.2.tar.xz + http://ftp.gnu.org/gnu/tar/tar-1.26.tar.gz + ftp://plamo.linet.gr.jp/pub/Plamo-src.new/plamo/00_base/tar/tar-1.23-tartime.patch.gz + ftp://plamo.linet.gr.jp/pub/Plamo-src.new/plamo/00_base/tar/tar-1.23-txz.patch.gz + ftp://plamo.linet.gr.jp/pub/Plamo-src.new/plamo/00_base/tar/tar-1.26-no-gets.patch.gz ftp://plamo.linet.gr.jp/pub/Plamo-src.new/plamo/00_base/hdsetup/hdsetup-plamoscripts.tar.gz" pkgbase=hdsetup vers=6.1 arch=`uname -m` -build=P3 +build=P4 src[0]=busybox-1.24.1 src[1]=dialog-1.3-20160209 src[2]=coreutils-8.23 +src[3]=gzip-1.6 +src[4]=bzip2-1.0.6 +src[5]=xz-5.2.2 +src[6]=tar-1.26 OPT_CONFIG[0]="" OPT_CONFIG[1]="--bindir=/bin --enable-nls --with-ncursesw --enable-widec" OPT_CONFIG[2]="--bindir=/bin --enable-no-install-program=install,chroot" @@ -27,9 +38,18 @@ OPT_CONFIG[2]+=",sync,tac,tail,tee,test,timeout,touch,tr,true,truncate,tsort" OPT_CONFIG[2]+=",tty,uname,unexpand,uniq,unlink,vdir,wc,whoami,yes --without-gmp" +OPT_CONFIG[3]="--bindir=/bin" +OPT_CONFIG[4]="" +OPT_CONFIG[5]="--bindir=/bin --disable-xzdec --disable-lzmadec + --disable-lzmainfo --disable-lzma-links --disable-scripts" +OPT_CONFIG[6]="--bindir=/bin" DOCS[0]="TODO LICENSE README AUTHORS INSTALL TODO_unicode" DOCS[1]="" DOCS[2]="" +DOCS[3]="" +DOCS[4]="" +DOCS[5]="" +DOCS[6]="" ###################################################################### fscheck() { @@ -224,6 +244,10 @@ done cd ${B[0]} cp -p $W/busybox-1.24.1-config .config + cd ${B[6]} + gunzip -c $W/tar-1.23-tartime.patch.gz | patch -Np1 -i - + gunzip -c $W/tar-1.23-txz.patch.gz | patch -Np1 -i - + gunzip -c $W/tar-1.26-no-gets.patch.gz | patch -Np1 -i - for i in `seq 0 $((${#B[@]} - 1))` ; do cd ${B[$i]} if [ -f [Mm]akefile ] ; then @@ -246,7 +270,9 @@ case $i in 0) make ;; 1) make LIBS="-lncursesw -lm -ldl -static" ;; - 2) make LIBS="-ldl -static" ;; + 4) make LDFLAGS="-ldl -static" ;; + 5) make LIBS="-ldl -all-static" ;; + *) make LIBS="-ldl -static" ;; esac fi done @@ -266,11 +292,15 @@ if [ -f [Mm]akefile ] ; then case $i in 0) make install CONFIG_PREFIX=$P ;; + 3) make install DESTDIR=$P bin_SCRIPTS=zcat ;; + 4) make install PREFIX=$P ;; *) make install DESTDIR=$P ;; esac fi done - rm $P/bin/{\[\[,ash,cttyhack,{e,f}grep,hush,install,test,unxz} + ln -f $P/bin/xz{,cat} + rm $P/bin/{\[\[,ash,cttyhack,{e,f}grep,hush,test,install,bunzip2} + rm $P/bin/{bz{ip2recover,{,e,f}grep,more,less,diff,cmp},unxz} install -d $P/sbin mv $P/bin $P/sbin/installer cp -r $W/sbin $P @@ -301,6 +331,12 @@ ( cd $docdir ; find ${src[$i]} -type d -exec touch -r $W/{} {} \; ) done cp -a $S/docs $docdir/$src + for i in busybox.pod BusyBox.txt busybox.{1,net} BusyBox.html ; do + cp -a $B/docs/$i $docdir/$src/docs + touch -t `date '+%m%d0900'` $docdir/$src/docs/$i + done + touch -t `date '+%m%d0900'` $docdir/$src/docs/busybox.net/BusyBox.html + touch -r $S/docs $docdir/$src/docs chown -R root.root $docdir/$src/docs mv $docdir/$src/{docs,{TODO,LICENSE,README,AUTHORS,INSTALL}.gz} $C mv $docdir/$src/{TODO_unicode,$myname}.gz $C --- plamo/00_base/old/hdsetup-20160415/PlamoBuild.hdsetup-6.1 2016-04-15 19:48:17.000000000 +0900 +++ plamo/00_base/hdsetup/PlamoBuild.hdsetup-6.1 2016-04-19 14:50:16.000000000 +0900 @@ -16,7 +16,7 @@ pkgbase=hdsetup vers=6.1 arch=`uname -m` -build=P4 +build=P5 src[0]=busybox-1.24.1 src[1]=dialog-1.3-20160209 src[2]=coreutils-8.23 @@ -31,8 +31,8 @@ OPT_CONFIG[2]+=",basename,cat,chcon,chgrp,chmod,chown,cksum,comm,cp,csplit" OPT_CONFIG[2]+=",cut,date,dd,dir,dircolors,dirname,du,echo,env,expand,expr" OPT_CONFIG[2]+=",factor,false,fmt,fold,groups,head,id,join,kill,link,ln" -OPT_CONFIG[2]+=",logname,ls,md5sum,mkdir,mkfifo,mknod,mktemp,mv,nl,nproc" -OPT_CONFIG[2]+=",nohup,numfmt,od,pathchk,pr,printenv,printf,ptx,pwd,readlink" +OPT_CONFIG[2]+=",logname,md5sum,mkdir,mkfifo,mknod,mktemp,mv,nl,nproc,nohup" +OPT_CONFIG[2]+=",numfmt,od,pathchk,pr,printenv,printf,ptx,pwd,readlink" OPT_CONFIG[2]+=",realpath,rm,rmdir,runcon,seq,sha1sum,sha224sum,sha256sum" OPT_CONFIG[2]+=",sha384sum,sha512sum,shred,shuf,sleep,sort,split,stat,sum" OPT_CONFIG[2]+=",sync,tac,tail,tee,test,timeout,touch,tr,true,truncate,tsort" --- plamo/00_base/old/util_linux-20160120/PlamoBuild.util_linux-2.27 2016-01-20 00:37:02.000000000 +0900 +++ plamo/00_base/util_linux/PlamoBuild.util_linux-2.27 2016-04-04 14:06:11.054028811 +0900 @@ -5,7 +5,7 @@ pkgbase=util_linux vers=2.27 arch=`uname -m` -build=P2 +build=P3 src=util-linux-$vers OPT_CONFIG="--localstatedir=/var --disable-setpriv --disable-last --disable-mesg --disable-chfn-chsh --disable-login --disable-nologin @@ -224,7 +224,7 @@ rm -rf config.cache config.log fi if [ -x configure ] ; then - ./configure --prefix=/usr --libdir='${exec_prefix}'/$libdir \ + ./configure --prefix=/usr --libdir=/usr/$libdir \ --infodir='${prefix}'/share/info \ --mandir='${prefix}'/share/man ${OPT_CONFIG[$i]} fi --- plamo/00_base/old/ncurses-20160324/PlamoBuild.ncurses-5.7 2016-03-24 11:50:31.000000000 +0900 +++ plamo/00_base/ncurses/PlamoBuild.ncurses-6.0 2016-04-03 20:06:48.000000000 +0900 @@ -1,16 +1,16 @@ #!/bin/sh ###################################################################### -url="http://ftp.gnu.org/gnu/ncurses/ncurses-5.7.tar.gz - http://ftp.clfs.org/pub/clfs/conglomeration/ncurses/ncurses-5.7-branch_update-21.patch" +url="http://ftp.gnu.org/gnu/ncurses/ncurses-6.0.tar.gz" pkgbase=ncurses -vers=5.7 +vers=6.0 arch=`uname -m` -build=P5 +build=P3 src=$pkgbase-$vers OPT_CONFIG="--with-shared --without-debug --enable-widec --with-manpage-format=normal" -DOCS="ANNOUNCE AUTHORS INSTALL NEWS README README.emx TO-DO" +DOCS="README.MinGW README README.emx NEWS ANNOUNCE COPYING INSTALL + TO-DO AUTHORS" ###################################################################### fscheck() { @@ -203,7 +203,6 @@ if [ -d ${B[$i]} ] ; then rm -rf ${B[$i]} ; fi ; cp -a ${S[$i]} ${B[$i]} done cd $B - patch -Np1 -i $W/ncurses-5.7-branch_update-21.patch if [ $arch == x86_64 ] ; then cp -p misc/run_tic.in{,.orig} sed -i 's@\@lib64@g' misc/run_tic.in @@ -217,7 +216,7 @@ rm -rf config.cache config.log fi if [ -x configure ] ; then - ./configure --prefix=/usr --libdir='${exec_prefix}'/$libdir \ + ./configure --prefix=/usr --libdir=/$libdir \ --infodir='${prefix}'/share/info \ --mandir='${prefix}'/share/man ${OPT_CONFIG[$i]} fi @@ -247,11 +246,17 @@ make install DESTDIR=$P fi done - ln -s ncursesw5-config $P/usr/bin/ncurses5-config - ln -s libncursesw.so.5.7 $P/usr/$libdir/libncurses.so.5 - ln -s libncurses.so.5 $P/usr/$libdir/libncurses.so - ln -s libncursesw.so.5.7 $P/usr/$libdir/libcurses.so.5 - ln -s libcurses.so.5 $P/usr/$libdir/libcurses.so + ln -s ncursesw6-config $P/usr/bin/ncurses6-config + ln -s libncursesw.so.$vers $P/$libdir/libncurses.so.6 + ln -s libncurses.so.6 $P/$libdir/libncurses.so + ln -s libncursesw.so.$vers $P/$libdir/libcurses.so.6 + ln -s libcurses.so.6 $P/$libdir/libcurses.so + ln -s libncursesw.so.$vers $P/$libdir/libncursesw.so.5 + ln -s libpanelw.so.$vers $P/$libdir/libpanelw.so.5 + ln -s libmenuw.so.$vers $P/$libdir/libmenuw.so.5 + ln -s libformw.so.$vers $P/$libdir/libformw.so.5 + install -d $P/usr/$libdir + ln -s /usr/share/terminfo $P/usr/$libdir touch $W/i.et cd $W find $P ! -type l -newer i.st ! -newer i.et \ @@ -276,6 +281,7 @@ done convert tar cvpf $pkg.tar -C $P `cd $P ; find usr/bin | 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 | tail -n+2` tar rvpf $pkg.tar -C $P `cd $P ; find usr/include | tail -n+2` tar rvpf $pkg.tar -C $P usr/share/{tabset,terminfo} --- plamo/00_base/old/hdsetup-20160419/PlamoBuild.hdsetup-6.1 2016-04-19 14:50:16.000000000 +0900 +++ plamo/00_base/hdsetup/PlamoBuild.hdsetup-6.1 2016-04-25 01:24:08.000000000 +0900 @@ -4,7 +4,7 @@ url="https://www.busybox.net/downloads/busybox-1.24.1.tar.bz2 ftp://plamo.linet.gr.jp/pub/Plamo-src.new/plamo/00_base/hdsetup/busybox-1.24.1-config ftp://invisible-island.net/dialog/dialog-1.3-20160209.tgz - http://ftp.gnu.org/gnu/coreutils/coreutils-8.23.tar.xz + http://ftp.gnu.org/gnu/coreutils/coreutils-8.25.tar.xz http://ftp.gnu.org/gnu/gzip/gzip-1.6.tar.gz http://www.bzip.org/1.0.6/bzip2-1.0.6.tar.gz http://tukaani.org/xz/xz-5.2.2.tar.xz @@ -16,10 +16,10 @@ pkgbase=hdsetup vers=6.1 arch=`uname -m` -build=P5 +build=P6 src[0]=busybox-1.24.1 src[1]=dialog-1.3-20160209 -src[2]=coreutils-8.23 +src[2]=coreutils-8.25 src[3]=gzip-1.6 src[4]=bzip2-1.0.6 src[5]=xz-5.2.2 @@ -28,9 +28,9 @@ OPT_CONFIG[1]="--bindir=/bin --enable-nls --with-ncursesw --enable-widec" OPT_CONFIG[2]="--bindir=/bin --enable-no-install-program=install,chroot" OPT_CONFIG[2]+=",hostid,nice,who,users,pinky,uptime,stty,df,stdbuf,[,base64" -OPT_CONFIG[2]+=",basename,cat,chcon,chgrp,chmod,chown,cksum,comm,cp,csplit" -OPT_CONFIG[2]+=",cut,date,dd,dir,dircolors,dirname,du,echo,env,expand,expr" -OPT_CONFIG[2]+=",factor,false,fmt,fold,groups,head,id,join,kill,link,ln" +OPT_CONFIG[2]+=",base32,basename,cat,chcon,chgrp,chmod,chown,cksum,comm,cp" +OPT_CONFIG[2]+=",csplit,cut,date,dd,dir,dircolors,dirname,du,echo,env,expand" +OPT_CONFIG[2]+=",expr,factor,false,fmt,fold,groups,head,id,join,kill,link,ln" OPT_CONFIG[2]+=",logname,md5sum,mkdir,mkfifo,mknod,mktemp,mv,nl,nproc,nohup" OPT_CONFIG[2]+=",numfmt,od,pathchk,pr,printenv,printf,ptx,pwd,readlink" OPT_CONFIG[2]+=",realpath,rm,rmdir,runcon,seq,sha1sum,sha224sum,sha256sum" @@ -226,13 +226,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##*/} ;; - tgz) tar xvpzf ${i##*/} ;; + gz|tgz) tar xvpzf ${i##*/} ;; bz2) tar xvpjf ${i##*/} ;; xz) tar xvpJf ${i##*/} ;; esac --- plamo/00_base/old/openssl-20160115/PlamoBuild.openssl-1.0.1q 2016-01-15 09:54:27.000000000 +0900 +++ plamo/00_base/openssl/PlamoBuild.openssl-1.0.1s 2016-03-15 08:55:17.000000000 +0900 @@ -1,13 +1,13 @@ #!/bin/sh ###################################################################### -url="http://www.openssl.org/source/openssl-1.0.1q.tar.gz +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" pkgbase=openssl -vers=1.0.1q +vers=1.0.1s arch=`uname -m` -build=P3 +build=P2 src=$pkgbase-$vers OPT_CONFIG="" DOCS="ACKNOWLEDGMENTS CHANGES CHANGES.SSLeay CONTRIBUTING FAQ INSTALL @@ -193,7 +193,7 @@ if [ ! -f ${i##*/} ] ; then wget $i ; fi done if [ ! -f ca-bundle.crt ] ; then - ./mkcabundle.pl > ca-bundle.crt + ./mkcabundle.pl > ca-bundle.crt fi for i in $url ; do case ${i##*.} in @@ -229,12 +229,13 @@ armv7l) sys=armv4 ;; esac ./Configure linux-$sys --prefix=/usr --openssldir=/etc/ssl \ - zlib-dynamic shared + shared zlib-dynamic enable-ssl2 fi if [ $opt_build -eq 1 ] ; then for i in `seq 0 $((${#B[@]} - 1))` ; do cd ${B[$i]} if [ -f Makefile ] ; then + make depend make fi done --- plamo/00_base/old/dhcp-20160125/PlamoBuild.dhcp-4.3.3 2016-01-25 13:06:29.000000000 +0900 +++ plamo/00_base/dhcp/PlamoBuild.dhcp-4.3.3 2016-04-07 15:53:35.000000000 +0900 @@ -5,7 +5,7 @@ pkgbase=dhcp vers=4.3.3 arch=`uname -m` -build=P2 +build=P3 src=$pkgbase-$vers OPT_CONFIG="--sysconfdir=/etc" DOCS="LICENSE README RELNOTES" @@ -201,7 +201,7 @@ done cd $B cp -p client/scripts/linux{,.orig} - cat <<- "EOF" > client/scripts/linux + cat <<- "EOF" | patch client/scripts/linux 24a25,26 > PATH=/sbin/:$PATH > --- plamo/00_base/old/glibc-20160110/PlamoBuild.glibc-2.20 2016-01-10 07:44:27.000000000 +0900 +++ plamo/00_base/glibc/PlamoBuild.glibc-2.20 2016-03-14 16:38:54.000000000 +0900 @@ -6,11 +6,15 @@ http://ftp.su.se/pub/mirrors/lunar-linux.org/lunar/patches/glibc-2.20-do_ftell_wide-memleak.patch http://ftp.su.se/pub/mirrors/lunar-linux.org/lunar/patches/glibc-2.20-getifaddrs_internal-segfault.patch http://ftp.su.se/pub/mirrors/lunar-linux.org/lunar/patches/glibc-2.20-linux-3.16-additions.patch - http://slackware.cs.utah.edu/pub/slackware/slackware-current/source/l/glibc/glibc-c-utf8-locale.patch.gz" + http://slackware.cs.utah.edu/pub/slackware/slackware-current/source/l/glibc/glibc-c-utf8-locale.patch.gz + https://github.com/plamolinux/Plamo-src/raw/master/plamo/00_base/glibc/CVE-2015-7547.patch + https://github.com/plamolinux/Plamo-src/raw/master/plamo/00_base/glibc/CVE-2015-8776.patch + https://github.com/plamolinux/Plamo-src/raw/master/plamo/00_base/glibc/CVE-2015-8778.patch + https://github.com/plamolinux/Plamo-src/raw/master/plamo/00_base/glibc/CVE-2015-8779.patch" pkgbase=glibc vers=2.20 arch=`uname -m` -build=P2 +build=P3 src=$pkgbase-$vers OPT_CONFIG="--enable-kernel=2.6.32 --enable-obsolete-rpc" DOCS="BUGS CONFORMANCE COPYING* ChangeLog* INSTALL LICENSES NEWS @@ -213,7 +217,11 @@ patch -Np1 -i $W/glibc-2.20-do_ftell_wide-memleak.patch patch -Np1 -i $W/glibc-2.20-getifaddrs_internal-segfault.patch patch -Np1 -i $W/glibc-2.20-linux-3.16-additions.patch - patch -Np1 -i $W/glibc-c-utf8-locale.patch.gz + gunzip -c $W/glibc-c-utf8-locale.patch.gz | patch -Np1 -i - + patch -Np1 -i $W/CVE-2015-7547.patch + patch -Np1 -i $W/CVE-2015-8776.patch + patch -Np1 -i $W/CVE-2015-8778.patch + patch -Np1 -i $W/CVE-2015-8779.patch cp -p localedata/Makefile{,.orig} cat <<- "EOF" | patch localedata/Makefile 235a236 --- plamo/00_base/old/kmod-20160115/PlamoBuild.kmod-13 2016-01-15 17:31:05.000000000 +0900 +++ plamo/00_base/kmod/PlamoBuild.kmod-22 2016-01-25 18:19:43.000000000 +0900 @@ -1,14 +1,14 @@ #!/bin/sh ###################################################################### -url="https://www.kernel.org/pub/linux/utils/kernel/kmod/kmod-13.tar.bz2" +url="https://www.kernel.org/pub/linux/utils/kernel/kmod/kmod-22.tar.xz" pkgbase=kmod -vers=13 +vers=22 arch=`uname -m` -build=P4 +build=P3 src=$pkgbase-$vers -OPT_CONFIG="--bindir=/bin --sysconfdir=/etc --disable-shared" -DOCS="README COPYING NEWS TODO" +OPT_CONFIG="--bindir=/bin --sysconfdir=/etc" +DOCS="NEWS COPYING TODO README" ###################################################################### fscheck() { @@ -192,6 +192,7 @@ tar) tar xvpf ${i##*/} ;; gz) tar xvpzf ${i##*/} ;; bz2) tar xvpjf ${i##*/} ;; + xz) tar xvpJf ${i##*/} ;; esac done fi @@ -239,20 +240,18 @@ fi done install -d $P/sbin - for i in insmod modprobe {rm,dep}mod ; do + for i in {dep,ins,rm}mod mod{probe,info} ; do ln -s /bin/kmod $P/sbin/$i done install -d $P/usr/bin - for i in lsmod modinfo ; do - ln -s /bin/kmod $P/usr/bin/$i - done + ln -s /bin/kmod $P/usr/bin/lsmod touch $W/i.et cd $W find $P ! -type l -newer i.st ! -newer i.et \ -exec touch -t `date '+%m%d0900'` {} \; compress install -d $P/etc/modprobe.d - cat <<- "EOF" > $P/etc/modprobe.d/plamo-default.conf + cat <<- "EOF" > $P/etc/modprobe.d/plamo-default.conf.new # sample modprobe.conf entries # # alias 定義をしておけば modprobe eth0 で必要なモジュールをロード可能 @@ -271,7 +270,7 @@ install usblp /bin/true EOF - touch -t `date '+%m%d0900'` $P/etc/modprobe.d{,/plamo-default.conf} + touch -t `date '+%m%d0900'` $P/etc/modprobe.d{,/plamo-default.conf.new} for i in `seq 0 $((${#DOCS[@]} - 1))` ; do for j in ${DOCS[$i]} ; do for k in ${S[$i]}/$j ; do @@ -290,12 +289,24 @@ ( cd $docdir ; find ${src[$i]} -type d -exec touch -r $W/{} {} \; ) done convert + cat <<- "EOF" >> $P/install/doinst.sh + + if [ -f etc/modprobe.d/plamo-default.conf ] ; then + rm etc/modprobe.d/plamo-default.conf.new + else + mv etc/modprobe.d/plamo-default.conf.new /tmp + mv /tmp/plamo-default.conf.new etc/modprobe.d/plamo-default.conf + fi + EOF + touch -t `date '+%m%d0900'` $P/install/doinst.sh 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/bin | 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 | tail -n+2` + tar rvpf $pkg.tar -C $P \ + `cd $P ; find usr/share/bash-completion/completions | tail -n+2` tar rvpf $pkg.tar -C $P etc/modprobe.d 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` --- plamo/00_base/old/openssh-20160314/PlamoBuild.openssh-7.2p1 2016-03-14 18:20:09.000000000 +0900 +++ plamo/00_base/openssh/PlamoBuild.openssh-7.2p2 2016-03-17 19:06:05.000000000 +0900 @@ -1,9 +1,9 @@ #!/bin/sh ###################################################################### -url="http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-7.2p1.tar.gz" +url="http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-7.2p2.tar.gz" pkgbase=openssh -vers=7.2p1 +vers=7.2p2 arch=`uname -m` build=P2 src=$pkgbase-$vers --- plamo/00_base/old/tcp_wrappers-20160121/PlamoBuild.tcp_wrappers-7.6.q 2016-01-21 20:23:46.000000000 +0900 +++ plamo/00_base/tcp_wrappers/PlamoBuild.tcp_wrappers-7.6.q 2016-04-03 08:59:16.000000000 +0900 @@ -6,7 +6,7 @@ pkgbase=tcp_wrappers vers=7.6.q arch=`uname -m` -build=P3 +build=P4 src=tcp_wrappers_7.6 OPT_CONFIG="" DOCS="README BLURB DISCLAIMER CHANGES README.IRIX README.NIS" @@ -316,7 +316,7 @@ done convert install -d $P/install - cat <<- "EOF" > $P/install/doinst.sh + cat <<- "EOF" >> $P/install/doinst.sh hosts_config() { if [ -f etc/hosts.$1 ] ; then rm etc/hosts.$1.dist --- plamo/00_base/old/timezone-20160126/PlamoBuild.timezone-2015g 2016-01-26 13:27:41.000000000 +0900 +++ plamo/00_base/timezone/PlamoBuild.timezone-2015g 2016-03-23 17:56:42.000000000 +0900 @@ -3,7 +3,7 @@ ###################################################################### url="http://www.iana.org/time-zones/repository/releases/tzcode2015g.tar.gz http://www.iana.org/time-zones/repository/releases/tzdata2015g.tar.gz - http://plamo.linet.gr.jp/~tamuki/src/plamo_timeconfig.tar.gz" + ftp://plamo.linet.gr.jp/pub/Plamo-src.new/plamo/00_base/timezone/plamo_timeconfig.tar.gz" pkgbase=timezone vers=2015g arch=`uname -m` --- plamo/00_base/old/grub-20160314/PlamoBuild.grub-2.02~beta2 2016-03-14 17:15:16.000000000 +0900 +++ plamo/00_base/grub/PlamoBuild.grub-2.02~beta2 2016-03-20 22:40:55.000000000 +0900 @@ -3,7 +3,7 @@ ###################################################################### url="http://http.debian.net/debian/pool/main/g/grub2/grub2_2.02~beta2.orig.tar.xz http://http.debian.net/debian/pool/main/g/grub2/grub2_2.02~beta2-32.debian.tar.xz - http://plamo.linet.gr.jp/~tamuki/src/plamo_grubconfig.tar.gz" + ftp://plamo.linet.gr.jp/pub/Plamo-src.new/plamo/00_base/grub/plamo_grubconfig.tar.gz" pkgbase=grub vers=2.02~beta2 arch=`uname -m` --- plamo/00_base/old/coreutils-20160105/PlamoBuild.coreutils-8.23 2016-01-05 21:08:59.000000000 +0900 +++ plamo/00_base/coreutils/PlamoBuild.coreutils-8.25 2016-04-25 01:21:52.000000000 +0900 @@ -1,17 +1,17 @@ #!/bin/sh ###################################################################### -url="http://ftp.gnu.org/gnu/coreutils/coreutils-8.23.tar.xz" +url="http://ftp.gnu.org/gnu/coreutils/coreutils-8.25.tar.xz" pkgbase=coreutils -vers=8.23 +vers=8.25 arch=`uname -m` -build=P3 +build=P2 src=$pkgbase-$vers OPT_CONFIG="--enable-install-program=arch --enable-no-install-program=uptime,kill --without-gmp" -DOCS="ChangeLog-2005 COPYING INSTALL ABOUT-NLS ChangeLog-2007 NEWS - README ChangeLog-2006 ChangeLog-2008 THANKS-to-translators - ChangeLog AUTHORS TODO THANKS" +DOCS="COPYING TODO INSTALL THANKS ChangeLog-2006 ChangeLog-2008 NEWS + ChangeLog ChangeLog-2007 README ChangeLog-2005 AUTHORS ABOUT-NLS + THANKS-to-translators" ###################################################################### fscheck() { @@ -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 @@ -208,6 +221,9 @@ sed 's@EXTRA_LOCALE_CATEGORIES@#&@g' po/Makevars.orig > po/Makevars cp -p src/copy.c{,.orig} sed 's@FASTREAD@NONE@g' src/copy.c.orig > src/copy.c + if [ `id -u` -eq 0 ] ; then + export FORCE_UNSAFE_CONFIGURE=1 + fi for i in `seq 0 $((${#B[@]} - 1))` ; do cd ${B[$i]} if [ -f Makefile ] ; then --- plamo/00_base/old/findutils-20151228/PlamoBuild.findutils-4.4.2 2015-12-28 16:20:45.000000000 +0900 +++ plamo/00_base/findutils/PlamoBuild.findutils-4.6.0 2016-01-25 17:08:38.000000000 +0900 @@ -1,15 +1,15 @@ #!/bin/sh ###################################################################### -url="http://ftp.gnu.org/pub/gnu/findutils/findutils-4.4.2.tar.gz" +url="http://ftp.gnu.org/pub/gnu/findutils/findutils-4.6.0.tar.gz" pkgbase=findutils -vers=4.4.2 +vers=4.6.0 arch=`uname -m` -build=P5 +build=P2 src=$pkgbase-$vers OPT_CONFIG="--localstatedir=/var" -DOCS="README ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL NEWS THANKS - TODO tool-versions.txt README-hacking" +DOCS="ABOUT-NLS README AUTHORS README-hacking NEWS THANKS INSTALL COPYING + ChangeLog tool-versions.txt ChangeLog-2013 README-alpha TODO" ###################################################################### fscheck() { --- plamo/00_base/old/nvi-20160326/PlamoBuild.nvi-1.79 2016-03-26 22:31:27.703769823 +0900 +++ plamo/00_base/nvi/PlamoBuild.nvi-1.79 2016-04-09 21:07:22.000000000 +0900 @@ -8,7 +8,7 @@ pkgbase=nvi vers=1.79 arch=`uname -m` -build=P6 +build=P7 src=$pkgbase-$vers OPT_CONFIG="--enable-multibyte=euc-jp" DOCS="LAYOUT README FAQ --- plamo/00_base/old/openssh-20160317/PlamoBuild.openssh-7.2p2 2016-03-17 19:06:05.000000000 +0900 +++ plamo/00_base/openssh/PlamoBuild.openssh-7.2p2 2016-06-15 21:03:13.000000000 +0900 @@ -1,15 +1,16 @@ #!/bin/sh ###################################################################### -url="http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-7.2p2.tar.gz" +url="http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-7.2p2.tar.gz + ftp://plamo.linet.gr.jp/pub/Plamo-src.new/plamo/00_base/openssh/CVE-2015-8325.patch" pkgbase=openssh vers=7.2p2 arch=`uname -m` -build=P2 +build=P4 src=$pkgbase-$vers -OPT_CONFIG="--sysconfdir=/etc/ssh --localstatedir=/var --with-pam - --with-privsep-user=sshd --with-privsep-path=/var/lib/sshd - --with-md5-passwords" +patchfiles="CVE-2015-8325.patch" +OPT_CONFIG="--sysconfdir=/etc/ssh --with-pam --with-privsep-user=sshd + --with-privsep-path=/var/lib/sshd --with-md5-passwords" DOCS="CREDITS INSTALL LICENCE OVERVIEW PROTOCOL PROTOCOL.agent `echo PROTOCOL.{certkeys,chacha20poly1305,key,krl,mux}` README `echo README.{dns,platform,privsep,tun}` TODO ChangeLog" @@ -189,13 +190,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 @@ -203,6 +226,10 @@ 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 + for i in `seq 0 $((${#B[@]} - 1))` ; do + cd ${B[$i]} + for j in ${patchfiles[$i]} ; do patch -Np1 -i $W/$j ; done + done cd $B cp -p sshd_config{,.orig} sed -i -e 's@^#\(UsePAM\) no$@\1 yes@g' \ @@ -220,8 +247,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 @@ -286,11 +313,11 @@ cat <<- "EOF" >> $P/install/doinst.sh ssh_config() { + mv etc/ssh/${1}_config.new /tmp if [ -f etc/ssh/${1}_config ] ; then - rm etc/${1}_config.new + mv /tmp/${1}_config.new etc/ssh/${1}_config.dist else - mv etc/${1}_config.new /tmp - mv /tmp/${1}_config.new etc/${1}_config + mv /tmp/${1}_config.new etc/ssh/${1}_config fi } --- 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 --- plamo/00_base/old/groff-20160320/PlamoBuild.groff-1.18.1.1 2016-03-20 22:37:30.000000000 +0900 +++ plamo/00_base/groff/PlamoBuild.groff-1.18.1.1 2016-04-05 13:51:39.000000000 +0900 @@ -8,7 +8,7 @@ pkgbase=groff vers=1.18.1.1 arch=`uname -m` -build=P3 +build=P4 src=$pkgbase-$vers OPT_CONFIG="--enable-multibyte" DOCS="BUG-REPORT COPYING ChangeLog FDL INSTALL* MANIFEST MORE.STUFF @@ -247,6 +247,8 @@ make install prefix=$P/usr fi done + ln -s tbl $P/usr/bin/gtbl + ln -s eqn $P/usr/bin/geqn gdocdir=$docdir/groff/1.18.1 dt=`LANG=C date '+%a %b %e 09:00:00 %Y'` sed -i "s/\(CreationDate:\).*$/\1 $dt/g" $gdocdir/{examples/,}*.ps --- plamo/00_base/old/openssh-20160615/PlamoBuild.openssh-7.2p2 2016-06-15 21:03:13.000000000 +0900 +++ plamo/00_base/openssh/PlamoBuild.openssh-7.2p2 2016-07-10 11:56:23.000000000 +0900 @@ -6,7 +6,7 @@ pkgbase=openssh vers=7.2p2 arch=`uname -m` -build=P4 +build=P5 src=$pkgbase-$vers patchfiles="CVE-2015-8325.patch" OPT_CONFIG="--sysconfdir=/etc/ssh --with-pam --with-privsep-user=sshd @@ -228,7 +228,14 @@ done for i in `seq 0 $((${#B[@]} - 1))` ; do cd ${B[$i]} - for j in ${patchfiles[$i]} ; do patch -Np1 -i $W/$j ; done + 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 cd $B cp -p sshd_config{,.orig} @@ -292,6 +299,7 @@ find $P ! -type l -newer i.st ! -newer i.et \ -exec touch -t `date '+%m%d0900'` {} \; compress + strip_bindir $P/usr/libexec for i in `seq 0 $((${#DOCS[@]} - 1))` ; do for j in ${DOCS[$i]} ; do for k in ${S[$i]}/$j ; do --- plamo/00_base/old/findutils-20160125/PlamoBuild.findutils-4.6.0 2016-01-25 17:08:38.000000000 +0900 +++ plamo/00_base/findutils/PlamoBuild.findutils-4.6.0 2016-07-10 11:04:09.000000000 +0900 @@ -1,12 +1,13 @@ #!/bin/sh ###################################################################### -url="http://ftp.gnu.org/pub/gnu/findutils/findutils-4.6.0.tar.gz" +url="http://ftp.gnu.org/gnu/findutils/findutils-4.6.0.tar.gz" pkgbase=findutils vers=4.6.0 arch=`uname -m` -build=P2 +build=P3 src=$pkgbase-$vers +patchfiles="" OPT_CONFIG="--localstatedir=/var" DOCS="ABOUT-NLS README AUTHORS README-hacking NEWS THANKS INSTALL COPYING ChangeLog tool-versions.txt ChangeLog-2013 README-alpha TODO" @@ -186,13 +187,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,6 +225,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 @@ -209,8 +243,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 @@ -244,6 +278,7 @@ find $P ! -type l -newer i.st ! -newer i.et \ -exec touch -t `date '+%m%d0900'` {} \; compress + strip_bindir $P/usr/libexec for i in `seq 0 $((${#DOCS[@]} - 1))` ; do for j in ${DOCS[$i]} ; do for k in ${S[$i]}/$j ; do --- plamo/00_base/old/readline-20160116/PlamoBuild.readline-6.2.4 2016-01-16 01:45:35.000000000 +0900 +++ plamo/00_base/readline/PlamoBuild.readline-6.3.8 2016-04-03 13:32:45.000000000 +0900 @@ -1,17 +1,21 @@ #!/bin/sh ###################################################################### -url="http://ftp.gnu.org/gnu/readline/readline-6.2.tar.gz - http://ftp.gnu.org/gnu/readline/readline-6.2-patches/readline62-001 - http://ftp.gnu.org/gnu/readline/readline-6.2-patches/readline62-002 - http://ftp.gnu.org/gnu/readline/readline-6.2-patches/readline62-003 - http://ftp.gnu.org/gnu/readline/readline-6.2-patches/readline62-004" +url="http://ftp.gnu.org/gnu/readline/readline-6.3.tar.gz + http://ftp.gnu.org/gnu/readline/readline-6.3-patches/readline63-001 + http://ftp.gnu.org/gnu/readline/readline-6.3-patches/readline63-002 + http://ftp.gnu.org/gnu/readline/readline-6.3-patches/readline63-003 + http://ftp.gnu.org/gnu/readline/readline-6.3-patches/readline63-004 + http://ftp.gnu.org/gnu/readline/readline-6.3-patches/readline63-005 + http://ftp.gnu.org/gnu/readline/readline-6.3-patches/readline63-006 + http://ftp.gnu.org/gnu/readline/readline-6.3-patches/readline63-007 + http://ftp.gnu.org/gnu/readline/readline-6.3-patches/readline63-008" pkgbase=readline -vers=6.2 +vers=6.3 arch=`uname -m` build=P2 src=$pkgbase-$vers -OPT_CONFIG="" +OPT_CONFIG="--with-curses" DOCS="COPYING README MANIFEST INSTALL CHANGELOG CHANGES NEWS USAGE" ###################################################################### @@ -204,10 +208,14 @@ if [ -d ${B[$i]} ] ; then rm -rf ${B[$i]} ; fi ; cp -a ${S[$i]} ${B[$i]} done cd $B - patch -Np0 -i $W/readline62-001 - patch -Np0 -i $W/readline62-002 - patch -Np0 -i $W/readline62-003 - patch -Np0 -i $W/readline62-004 + patch -Np0 -i $W/readline63-001 + patch -Np0 -i $W/readline63-002 + patch -Np0 -i $W/readline63-003 + patch -Np0 -i $W/readline63-004 + patch -Np0 -i $W/readline63-005 + patch -Np0 -i $W/readline63-006 + patch -Np0 -i $W/readline63-007 + patch -Np0 -i $W/readline63-008 for i in `seq 0 $((${#B[@]} - 1))` ; do cd ${B[$i]} if [ -f Makefile ] ; then @@ -227,7 +235,7 @@ for i in `seq 0 $((${#B[@]} - 1))` ; do cd ${B[$i]} if [ -f Makefile ] ; then - make + make SHLIB_LIBS=-lncursesw fi done fi --- plamo/00_base/old/sysvinit-20160314/PlamoBuild.sysvinit-2.88dsf 2016-03-14 19:15:52.000000000 +0900 +++ plamo/00_base/sysvinit/PlamoBuild.sysvinit-2.88dsf 2016-03-23 17:48:11.000000000 +0900 @@ -2,7 +2,7 @@ ###################################################################### url="http://download.savannah.gnu.org/releases/sysvinit/sysvinit-2.88dsf.tar.bz2 - ftp://plamo.linet.gr.jp/pub/Plamo-test/for-5.0/plamo-rc-scripts/plamo-rc-scripts-20160208.tgz" + ftp://plamo.linet.gr.jp/pub/Plamo-src.new/plamo/00_base/sysvinit/plamo-rc-scripts-20160208.tgz" pkgbase=sysvinit vers=2.88dsf arch=`uname -m` --- plamo/00_base/old/hdsetup-20160425/PlamoBuild.hdsetup-6.1 2016-04-25 01:24:08.000000000 +0900 +++ plamo/00_base/hdsetup/PlamoBuild.hdsetup-6.1 2016-04-30 09:35:53.000000000 +0900 @@ -16,7 +16,7 @@ pkgbase=hdsetup vers=6.1 arch=`uname -m` -build=P6 +build=P7 src[0]=busybox-1.24.1 src[1]=dialog-1.3-20160209 src[2]=coreutils-8.25 @@ -227,14 +227,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 @@ -245,8 +253,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 @@ -269,8 +277,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 --- plamo/00_base/old/timezone-20160323/PlamoBuild.timezone-2015g 2016-03-23 17:56:42.000000000 +0900 +++ plamo/00_base/timezone/PlamoBuild.timezone-2015g 2016-06-09 08:15:41.000000000 +0900 @@ -7,7 +7,7 @@ pkgbase=timezone vers=2015g arch=`uname -m` -build=P2 +build=P3 src=$pkgbase-$vers OPT_CONFIG="" DOCS="CONTRIBUTING NEWS README Theory tz-art.htm tz-link.htm" @@ -187,13 +187,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 false && for i in $url ; do case ${i##*.} in tar) tar xvpf ${i##*/} ;; - gz) tar xvpzf e ${i##*/} ;; - bz2) tar xvpjf ${i##*/} ;; + gz|tgz) tar xvpzf ${i##*/} ;; + bz2|tbz) tar xvpjf ${i##*/} ;; + xz|txz) tar xvpJf ${i##*/} ;; esac done mkdir timezone-2015g @@ -214,8 +236,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 @@ -275,6 +297,7 @@ done touch -t `date '+%m%d0900'` $docdir/$src convert + prune_symlink $P/usr/share tar cvpf $pkg.tar -C $P `cd $P ; find usr/sbin | tail -n+2` tar rvpf $pkg.tar -C $P `cd $P ; find usr/$libdir | tail -n+2` tar rvpf $pkg.tar -C $P usr/share/zoneinfo{,-posix,-leaps} @@ -283,6 +306,7 @@ 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 mv $pkg.tar.xz $pkg.txz read -p "Do you want to keep work files? [y/N] " ans --- plamo/00_base/old/openssl-20160430/PlamoBuild.openssl-1.0.2g 2016-04-30 09:50:12.000000000 +0900 +++ plamo/00_base/openssl/PlamoBuild.openssl-1.0.2h 2016-07-10 12:22:47.000000000 +0900 @@ -1,13 +1,14 @@ #!/bin/sh ###################################################################### -url="http://www.openssl.org/source/openssl-1.0.2g.tar.gz +url="http://www.openssl.org/source/openssl-1.0.2h.tar.gz ftp://plamo.linet.gr.jp/pub/Plamo-src.new/plamo/00_base/openssl/mkcabundle.pl" pkgbase=openssl -vers=1.0.2g +vers=1.0.2h arch=`uname -m` -build=P1 +build=P2 src=$pkgbase-$vers +patchfiles="" OPT_CONFIG="" DOCS="ACKNOWLEDGMENTS CHANGES CHANGES.SSLeay CONTRIBUTING FAQ INSTALL INSTALL.DJGPP INSTALL.MacOS INSTALL.NW INSTALL.OS2 INSTALL.VMS @@ -231,6 +232,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 --- plamo/00_base/old/gawk-20151228/PlamoBuild.gawk-4.1.3 2015-12-28 17:06:12.000000000 +0900 +++ plamo/00_base/gawk/PlamoBuild.gawk-4.1.3 2016-07-10 11:19:26.000000000 +0900 @@ -5,8 +5,9 @@ pkgbase=gawk vers=4.1.3 arch=`uname -m` -build=P2 +build=P3 src=$pkgbase-$vers +patchfiles="" OPT_CONFIG="" DOCS="NEWS POSIX.STD COPYING README AUTHORS INSTALL `echo README_d/README.{VMS,mpfr,os2,bootstrap,gcc-3,zos,macosx}` @@ -189,14 +190,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##*/} ;; - xz) tar xvpJf ${i##*/} ;; + gz|tgz) tar xvpzf ${i##*/} ;; + bz2|tbz) tar xvpjf ${i##*/} ;; + xz|txz) tar xvpJf ${i##*/} ;; esac done fi @@ -206,6 +228,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 @@ -213,8 +246,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 @@ -248,8 +281,9 @@ find $P ! -type l -newer i.st ! -newer i.et \ -exec touch -t `date '+%m%d0900'` {} \; compress + strip_bindir $P/usr/libexec/awk strip_libdir $P/usr/$libdir/gawk - touch -t `date '+%m%d0900'` $P/usr/$libdir/gawk + touch -t `date '+%m%d0900'` $P/usr/libexec/awk $P/usr/$libdir/gawk for i in `seq 0 $((${#DOCS[@]} - 1))` ; do for j in ${DOCS[$i]} ; do for k in ${S[$i]}/$j ; do --- plamo/00_base/old/hdsetup-20160430/PlamoBuild.hdsetup-6.1 2016-04-30 09:35:53.000000000 +0900 +++ plamo/00_base/hdsetup/PlamoBuild.hdsetup-6.1 2016-09-11 12:29:12.000000000 +0900 @@ -16,7 +16,7 @@ pkgbase=hdsetup vers=6.1 arch=`uname -m` -build=P7 +build=P8 src[0]=busybox-1.24.1 src[1]=dialog-1.3-20160209 src[2]=coreutils-8.25 @@ -24,6 +24,13 @@ src[4]=bzip2-1.0.6 src[5]=xz-5.2.2 src[6]=tar-1.26 +patchfiles[0]="" +patchfiles[1]="" +patchfiles[2]="" +patchfiles[3]="" +patchfiles[4]="" +patchfiles[5]="" +patchfiles[6]="`echo tar-{1.23-{tartime,txz},1.26-no-gets}.patch.gz`" OPT_CONFIG[0]="" OPT_CONFIG[1]="--bindir=/bin --enable-nls --with-ncursesw --enable-widec" OPT_CONFIG[2]="--bindir=/bin --enable-no-install-program=install,chroot" @@ -262,12 +269,19 @@ 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 + 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 cd ${B[0]} cp -p $W/busybox-1.24.1-config .config - cd ${B[6]} - gunzip -c $W/tar-1.23-tartime.patch.gz | patch -Np1 -i - - gunzip -c $W/tar-1.23-txz.patch.gz | patch -Np1 -i - - gunzip -c $W/tar-1.26-no-gets.patch.gz | patch -Np1 -i - for i in `seq 0 $((${#B[@]} - 1))` ; do cd ${B[$i]} if [ -f [Mm]akefile ] ; then --- plamo/00_base/old/hdsetup-20160911/PlamoBuild.hdsetup-6.1 2016-09-11 12:29:12.000000000 +0900 +++ plamo/00_base/hdsetup/PlamoBuild.hdsetup-6.1 2016-11-11 06:25:05.000000000 +0900 @@ -16,7 +16,7 @@ pkgbase=hdsetup vers=6.1 arch=`uname -m` -build=P8 +build=P9 src[0]=busybox-1.24.1 src[1]=dialog-1.3-20160209 src[2]=coreutils-8.25 @@ -50,13 +50,9 @@ OPT_CONFIG[5]="--bindir=/bin --disable-xzdec --disable-lzmadec --disable-lzmainfo --disable-lzma-links --disable-scripts" OPT_CONFIG[6]="--bindir=/bin" -DOCS[0]="TODO LICENSE README AUTHORS INSTALL TODO_unicode" -DOCS[1]="" -DOCS[2]="" -DOCS[3]="" -DOCS[4]="" -DOCS[5]="" -DOCS[6]="" +DOCS="TODO LICENSE README AUTHORS INSTALL TODO_unicode" +template=20161020 +tmplurl=ftp://plamo.linet.gr.jp/pub/Plamo-src/admin ###################################################################### fscheck() { @@ -358,9 +354,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 --- plamo/00_base/old/dialog-20160113/PlamoBuild.dialog-1.1 2016-01-13 22:18:40.000000000 +0900 +++ plamo/00_base/dialog/PlamoBuild.dialog-1.3_20160209 2016-04-06 19:28:31.000000000 +0900 @@ -1,14 +1,15 @@ #!/bin/sh ###################################################################### -url="http://invisible-mirror.net/archives/dialog/dialog-1.1-20110302.tgz" +url="ftp://invisible-island.net/dialog/dialog-1.3-20160209.tgz" pkgbase=dialog -vers=1.1_20110302 +vers=1.3_20160209 arch=`uname -m` build=P2 -src=$pkgbase-1.1-20110302 -OPT_CONFIG="--bindir=/bin --enable-nls --with-ncursesw --enable-widec" -DOCS="README COPYING CHANGES" +src=$pkgbase-1.3-20160209 +OPT_CONFIG="--bindir=/bin --enable-nls --with-shared --with-ncursesw + --enable-widec" +DOCS="CHANGES README COPYING" ###################################################################### fscheck() { @@ -209,7 +210,7 @@ rm -rf config.cache config.log fi if [ -x configure ] ; then - ./configure --prefix=/usr --libdir='${exec_prefix}'/$libdir \ + ./configure --prefix=/usr --libdir=/$libdir \ --infodir='${prefix}'/share/info \ --mandir='${prefix}'/share/man ${OPT_CONFIG[$i]} fi @@ -263,9 +264,11 @@ done convert tar cvpf $pkg.tar -C $P `cd $P ; find bin | 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/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 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 mv $pkg.tar.xz $pkg.txz read -p "Do you want to keep work files? [y/N] " ans --- 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 --- plamo/00_base/old/btrfs_progs-20160116/PlamoBuild.btrfs_progs-v3.19.1 2016-01-16 16:09:58.000000000 +0900 +++ plamo/00_base/btrfs_progs/PlamoBuild.btrfs_progs-v4.3.1 2016-01-25 15:45:11.000000000 +0900 @@ -1,14 +1,14 @@ #!/bin/sh ###################################################################### -url="https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v3.19.1.tar.gz" +url="https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v4.3.1.tar.gz" pkgbase=btrfs_progs -vers=v3.19.1 +vers=v4.3.1 arch=`uname -m` build=P2 src=btrfs-progs-$vers OPT_CONFIG="--bindir=/sbin" -DOCS="COPYING INSTALL" +DOCS="COPYING INSTALL README.md" ###################################################################### fscheck() { --- plamo/00_base/old/tar-20151218/PlamoBuild.tar-1.26 2015-12-18 13:00:55.000000000 +0900 +++ plamo/00_base/tar/PlamoBuild.tar-1.26 2016-04-08 19:38:20.000000000 +0900 @@ -2,9 +2,9 @@ ###################################################################### url="http://ftp.gnu.org/gnu/tar/tar-1.26.tar.gz - http://plamo.linet.gr.jp/~tamuki/src/tar-1.23-tartime.patch.gz - http://plamo.linet.gr.jp/~tamuki/src/tar-1.23-txz.patch.gz - http://plamo.linet.gr.jp/~tamuki/src/tar-1.26-no-gets.patch.gz" + ftp://plamo.linet.gr.jp/pub/Plamo-src.new/plamo/00_base/tar/tar-1.23-tartime.patch.gz + ftp://plamo.linet.gr.jp/pub/Plamo-src.new/plamo/00_base/tar/tar-1.23-txz.patch.gz + ftp://plamo.linet.gr.jp/pub/Plamo-src.new/plamo/00_base/tar/tar-1.26-no-gets.patch.gz" pkgbase=tar vers=1.26 arch=`uname -m` --- plamo/00_base/old/kbd-20151222/PlamoBuild.kbd-1.15.5 2015-12-22 18:41:32.000000000 +0900 +++ plamo/00_base/kbd/PlamoBuild.kbd-1.15.5 2016-03-21 18:25:25.000000000 +0900 @@ -2,9 +2,9 @@ ###################################################################### url="ftp://ftp.altlinux.org/pub/people/legion/kbd/kbd-1.15.5.tar.gz - http://plamo.linet.gr.jp/~tamuki/src/kbd-1.15-backspace-1.patch.gz - http://plamo.linet.gr.jp/~tamuki/src/kbd-1.15-plamo-compat.patch.gz - http://plamo.linet.gr.jp/~tamuki/src/kbd-1.15.5-revert_loadkeys_analize.patch.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" pkgbase=kbd vers=1.15.5 arch=`uname -m` --- plamo/00_base/old/e2fsprogs-20160115/PlamoBuild.e2fsprogs-1.42.12 2016-01-15 17:30:02.000000000 +0900 +++ plamo/00_base/e2fsprogs/PlamoBuild.e2fsprogs-1.43.3 2016-11-20 20:50:53.000000000 +0900 @@ -1,16 +1,19 @@ #!/bin/sh ###################################################################### -url="http://jaist.dl.sourceforge.net/sourceforge/e2fsprogs/e2fsprogs-1.42.12.tar.gz" +url="http://downloads.sourceforge.net/e2fsprogs/e2fsprogs-1.43.3.tar.gz" pkgbase=e2fsprogs -vers=1.42.12 +vers=1.43.3 arch=`uname -m` -build=P2 +build=P1 src=$pkgbase-$vers +patchfiles="" OPT_CONFIG="--enable-elf-shlibs --disable-libuuid --disable-libblkid - --disable-fsck --disable-uuidd --with-root-prefix=\"\"" -DOCS="RELEASE-NOTES SHLIBS SUBMITTING-PATCHES INSTALL INSTALL.elfbin - README COPYING ABOUT-NLS" + --disable-fsck --disable-uuidd --with-root-prefix=" +DOCS="INSTALL.elfbin RELEASE-NOTES README NOTICE ABOUT-NLS INSTALL + SUBMITTING-PATCHES" +template=20161020 +tmplurl=ftp://plamo.linet.gr.jp/pub/Plamo-src/admin ###################################################################### fscheck() { @@ -187,13 +190,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 @@ -201,12 +226,23 @@ 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 + 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 cd $B if [ $arch == x86_64 ] ; then - cp -p configure configure.orig + cp -p configure{,.orig} sed '/^ root_libdir=/s@$libdir@/lib64@g' configure.orig > configure fi - cp -p misc/mke2fs.conf.in misc/mke2fs.conf.in.orig + cp -p misc/mke2fs.conf.in{,.orig} sed 's@,dir_index@@g' misc/mke2fs.conf.in.orig > misc/mke2fs.conf.in for i in `seq 0 $((${#B[@]} - 1))` ; do cd ${B[$i]} @@ -217,8 +253,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 @@ -264,9 +300,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 @@ -278,7 +328,7 @@ 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 e2fsprogs.mo` + tar rvpf $pkg.tar -C $P `cd $P ; find usr/share/locale -name *.mo` tar rvpf $pkg.tar -C $P usr/share/et usr/share/ss tar rvpf $pkg.tar -C $P etc/mke2fs.conf tar rvpf $pkg.tar -C $P usr/share/info/libext2fs.info.gz --- plamo/00_base/old/ncurses-20160403/PlamoBuild.ncurses-6.0 2016-04-03 20:06:48.000000000 +0900 +++ plamo/00_base/ncurses/PlamoBuild.ncurses-6.0 2016-04-28 23:01:54.000000000 +0900 @@ -1,14 +1,15 @@ #!/bin/sh ###################################################################### -url="http://ftp.gnu.org/gnu/ncurses/ncurses-6.0.tar.gz" +url="http://ftp.gnu.org/gnu/ncurses/ncurses-6.0.tar.gz + ftp://plamo.linet.gr.jp/pub/Plamo-src.new/plamo/00_base/ncurses/ncurses-6.0-Charable.patch.gz" pkgbase=ncurses vers=6.0 arch=`uname -m` -build=P3 +build=P4 src=$pkgbase-$vers OPT_CONFIG="--with-shared --without-debug --enable-widec - --with-manpage-format=normal" + --with-manpage-format=normal --disable-ext-colors" DOCS="README.MinGW README README.emx NEWS ANNOUNCE COPYING INSTALL TO-DO AUTHORS" ###################################################################### @@ -188,13 +189,27 @@ 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 done fi @@ -203,6 +218,7 @@ if [ -d ${B[$i]} ] ; then rm -rf ${B[$i]} ; fi ; cp -a ${S[$i]} ${B[$i]} done cd $B + gunzip -c $W/ncurses-6.0-Charable.patch.gz | patch -Np1 -i - if [ $arch == x86_64 ] ; then cp -p misc/run_tic.in{,.orig} sed -i 's@\@lib64@g' misc/run_tic.in --- plamo/00_base/old/glibc-20160314/PlamoBuild.glibc-2.20 2016-03-14 16:38:54.000000000 +0900 +++ plamo/00_base/glibc/PlamoBuild.glibc-2.20 2016-06-07 07:52:10.000000000 +0900 @@ -7,14 +7,14 @@ http://ftp.su.se/pub/mirrors/lunar-linux.org/lunar/patches/glibc-2.20-getifaddrs_internal-segfault.patch http://ftp.su.se/pub/mirrors/lunar-linux.org/lunar/patches/glibc-2.20-linux-3.16-additions.patch http://slackware.cs.utah.edu/pub/slackware/slackware-current/source/l/glibc/glibc-c-utf8-locale.patch.gz - https://github.com/plamolinux/Plamo-src/raw/master/plamo/00_base/glibc/CVE-2015-7547.patch - https://github.com/plamolinux/Plamo-src/raw/master/plamo/00_base/glibc/CVE-2015-8776.patch - https://github.com/plamolinux/Plamo-src/raw/master/plamo/00_base/glibc/CVE-2015-8778.patch - https://github.com/plamolinux/Plamo-src/raw/master/plamo/00_base/glibc/CVE-2015-8779.patch" + ftp://plamo.linet.gr.jp/pub/Plamo-src.new/plamo/00_base/glibc/CVE-2015-7547.patch + ftp://plamo.linet.gr.jp/pub/Plamo-src.new/plamo/00_base/glibc/CVE-2015-8776.patch + ftp://plamo.linet.gr.jp/pub/Plamo-src.new/plamo/00_base/glibc/CVE-2015-8778.patch + ftp://plamo.linet.gr.jp/pub/Plamo-src.new/plamo/00_base/glibc/CVE-2015-8779.patch" pkgbase=glibc vers=2.20 arch=`uname -m` -build=P3 +build=P4 src=$pkgbase-$vers OPT_CONFIG="--enable-kernel=2.6.32 --enable-obsolete-rpc" DOCS="BUGS CONFORMANCE COPYING* ChangeLog* INSTALL LICENSES NEWS @@ -196,14 +196,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##*/} ;; - xz) tar xvpJf ${i##*/} ;; + gz|tgz) tar xvpzf ${i##*/} ;; + bz2|tbz) tar xvpjf ${i##*/} ;; + xz|txz) tar xvpJf ${i##*/} ;; esac done fi @@ -252,8 +273,8 @@ EOF esac if [ -x ${S2[$i]}/configure ] ; then - ${S2[$i]}/configure --prefix=/usr --libdir='${exec_prefix}'/$libdir \ - --infodir='${prefix}'/share/info \ + ${S2[$i]}/configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --libdir='${exec_prefix}'/$libdir --infodir='${prefix}'/share/info \ --mandir='${prefix}'/share/man ${OPT_CONFIG[$i]} \ --libexecdir=/usr/$libdir/glibc \ --build=$arch-pc-linux --target=$arch-pc-linux @@ -367,10 +388,10 @@ EOF cat <<- "EOF" >> $P/install/doinst.sh glibc_config() { + mv /etc/$1.conf.new /tmp if [ -f /etc/$1.conf ] ; then - rm /etc/$1.conf.new + mv /tmp/$1.conf.new /etc/$1.conf.dist else - mv /etc/$1.conf.new /tmp mv /tmp/$1.conf.new /etc/$1.conf fi } --- plamo/00_base/old/openssh-20160710/PlamoBuild.openssh-7.2p2 2016-07-10 11:56:23.000000000 +0900 +++ plamo/00_base/openssh/PlamoBuild.openssh-7.3p1 2016-08-02 20:10:01.000000000 +0900 @@ -1,14 +1,13 @@ #!/bin/sh ###################################################################### -url="http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-7.2p2.tar.gz - ftp://plamo.linet.gr.jp/pub/Plamo-src.new/plamo/00_base/openssh/CVE-2015-8325.patch" +url="http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-7.3p1.tar.gz" pkgbase=openssh -vers=7.2p2 +vers=7.3p1 arch=`uname -m` -build=P5 +build=P2 src=$pkgbase-$vers -patchfiles="CVE-2015-8325.patch" +patchfiles="" OPT_CONFIG="--sysconfdir=/etc/ssh --with-pam --with-privsep-user=sshd --with-privsep-path=/var/lib/sshd --with-md5-passwords" DOCS="CREDITS INSTALL LICENCE OVERVIEW PROTOCOL PROTOCOL.agent --- plamo/00_base/old/nkf-20151225/PlamoBuild.nkf-2.1.2 2015-12-25 06:19:54.000000000 +0900 +++ plamo/00_base/nkf/PlamoBuild.nkf-2.1.2 2016-03-24 11:52:09.000000000 +0900 @@ -5,7 +5,7 @@ pkgbase=nkf vers=2.1.2 arch=`uname -m` -build=P3 +build=P4 src=$pkgbase-$vers OPT_CONFIG="" DOCS="INSTALL INSTALL.j" @@ -289,7 +289,7 @@ done convert tar cvpf $pkg.tar -C $P `cd $P ; find usr/bin | tail -n+2` - tar rvpf $pkg.tar -C $P usr/lib/perl5/{auto/NKF,NKF.pm} + tar rvpf $pkg.tar -C $P usr/$libdir/perl5/{auto/NKF,NKF.pm} 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/ja_JP.eucJP/man1 | tail -n+2` --- plamo/00_base/old/hdsetup-20161111/PlamoBuild.hdsetup-6.1 2016-11-11 06:25:05.000000000 +0900 +++ plamo/00_base/hdsetup/PlamoBuild.hdsetup-6.1 2016-11-24 09:04:24.000000000 +0900 @@ -1,26 +1,26 @@ #!/bin/sh ###################################################################### -url="https://www.busybox.net/downloads/busybox-1.24.1.tar.bz2 - ftp://plamo.linet.gr.jp/pub/Plamo-src.new/plamo/00_base/hdsetup/busybox-1.24.1-config - ftp://invisible-island.net/dialog/dialog-1.3-20160209.tgz +url="https://www.busybox.net/downloads/busybox-1.25.1.tar.bz2 + ftp://plamo.linet.gr.jp/pub/Plamo-src/plamo/00_base/hdsetup/busybox-1.25.1-config + ftp://invisible-island.net/dialog/dialog-1.3-20160828.tgz http://ftp.gnu.org/gnu/coreutils/coreutils-8.25.tar.xz - http://ftp.gnu.org/gnu/gzip/gzip-1.6.tar.gz + http://ftp.gnu.org/gnu/gzip/gzip-1.8.tar.gz http://www.bzip.org/1.0.6/bzip2-1.0.6.tar.gz http://tukaani.org/xz/xz-5.2.2.tar.xz - http://ftp.gnu.org/gnu/tar/tar-1.26.tar.gz - ftp://plamo.linet.gr.jp/pub/Plamo-src.new/plamo/00_base/tar/tar-1.23-tartime.patch.gz - ftp://plamo.linet.gr.jp/pub/Plamo-src.new/plamo/00_base/tar/tar-1.23-txz.patch.gz - ftp://plamo.linet.gr.jp/pub/Plamo-src.new/plamo/00_base/tar/tar-1.26-no-gets.patch.gz - ftp://plamo.linet.gr.jp/pub/Plamo-src.new/plamo/00_base/hdsetup/hdsetup-plamoscripts.tar.gz" + http://ftp.gnu.org/gnu/tar/tar-1.26.tar.xz + ftp://plamo.linet.gr.jp/pub/Plamo-src/plamo/00_base/tar/tar-1.23-tartime.patch.gz + ftp://plamo.linet.gr.jp/pub/Plamo-src/plamo/00_base/tar/tar-1.23-txz.patch.gz + ftp://plamo.linet.gr.jp/pub/Plamo-src/plamo/00_base/tar/tar-1.26-no-gets.patch.gz + ftp://plamo.linet.gr.jp/pub/Plamo-src/plamo/00_base/hdsetup/hdsetup-plamoscripts.tar.gz" pkgbase=hdsetup vers=6.1 arch=`uname -m` -build=P9 -src[0]=busybox-1.24.1 -src[1]=dialog-1.3-20160209 +build=P10 +src[0]=busybox-1.25.1 +src[1]=dialog-1.3-20160828 src[2]=coreutils-8.25 -src[3]=gzip-1.6 +src[3]=gzip-1.8 src[4]=bzip2-1.0.6 src[5]=xz-5.2.2 src[6]=tar-1.26 @@ -30,14 +30,14 @@ patchfiles[3]="" patchfiles[4]="" patchfiles[5]="" -patchfiles[6]="`echo tar-{1.23-{tartime,txz},1.26-no-gets}.patch.gz`" +patchfiles[6]="`echo tar-1.2{3-{tartime,txz},6-no-gets}.patch.gz`" OPT_CONFIG[0]="" OPT_CONFIG[1]="--bindir=/bin --enable-nls --with-ncursesw --enable-widec" -OPT_CONFIG[2]="--bindir=/bin --enable-no-install-program=install,chroot" -OPT_CONFIG[2]+=",hostid,nice,who,users,pinky,uptime,stty,df,stdbuf,[,base64" -OPT_CONFIG[2]+=",base32,basename,cat,chcon,chgrp,chmod,chown,cksum,comm,cp" -OPT_CONFIG[2]+=",csplit,cut,date,dd,dir,dircolors,dirname,du,echo,env,expand" -OPT_CONFIG[2]+=",expr,factor,false,fmt,fold,groups,head,id,join,kill,link,ln" +OPT_CONFIG[2]="--bindir=/bin --enable-no-install-program=chroot,hostid,nice" +OPT_CONFIG[2]+=",who,users,pinky,uptime,stty,df,stdbuf,[,base64,base32" +OPT_CONFIG[2]+=",basename,cat,chcon,chgrp,chmod,chown,cksum,comm,cp,csplit" +OPT_CONFIG[2]+=",cut,date,dd,dir,dircolors,dirname,du,echo,env,expand,expr" +OPT_CONFIG[2]+=",factor,false,fmt,fold,groups,head,id,join,kill,link,ln" OPT_CONFIG[2]+=",logname,md5sum,mkdir,mkfifo,mknod,mktemp,mv,nl,nproc,nohup" OPT_CONFIG[2]+=",numfmt,od,pathchk,pr,printenv,printf,ptx,pwd,readlink" OPT_CONFIG[2]+=",realpath,rm,rmdir,runcon,seq,sha1sum,sha224sum,sha256sum" @@ -50,7 +50,7 @@ OPT_CONFIG[5]="--bindir=/bin --disable-xzdec --disable-lzmadec --disable-lzmainfo --disable-lzma-links --disable-scripts" OPT_CONFIG[6]="--bindir=/bin" -DOCS="TODO LICENSE README AUTHORS INSTALL TODO_unicode" +DOCS="LICENSE INSTALL TODO AUTHORS README TODO_unicode" template=20161020 tmplurl=ftp://plamo.linet.gr.jp/pub/Plamo-src/admin ###################################################################### @@ -277,7 +277,7 @@ done done cd ${B[0]} - cp -p $W/busybox-1.24.1-config .config + cp -p $W/busybox-1.25.1-config .config for i in `seq 0 $((${#B[@]} - 1))` ; do cd ${B[$i]} if [ -f [Mm]akefile ] ; then @@ -382,10 +382,10 @@ touch -t `date '+%m%d0900'` $docdir/$src/docs/busybox.net/BusyBox.html touch -r $S/docs $docdir/$src/docs chown -R root.root $docdir/$src/docs - mv $docdir/$src/{docs,{TODO,LICENSE,README,AUTHORS,INSTALL}.gz} $C - mv $docdir/$src/{TODO_unicode,$myname}.gz $C - mv $C/{docs,{TODO,LICENSE,README,AUTHORS,INSTALL}.gz} $docdir/$src - mv $C/{TODO_unicode,$myname}.gz $docdir/$src + mv $docdir/$src/{docs,{INSTALL,TODO,AUTHORS,README}.gz} $C + mv $docdir/$src/{TODO_unicode,$myname,$spec}.gz $C + mv $C/{docs,{INSTALL,TODO,AUTHORS,README}.gz} $docdir/$src + mv $C/{TODO_unicode,$myname,$spec}.gz $docdir/$src touch -r $S $docdir/$src convert tar cvpf $pkg.tar -C $P `cd $P ; find sbin -maxdepth 1 | tail -n+2` --- plamo/00_base/old/lsb_release-20160113/PlamoBuild.lsb_release-1.4 2016-01-13 12:45:21.000000000 +0900 +++ plamo/00_base/lsb_release/PlamoBuild.lsb_release-1.4 2016-03-14 17:42:03.000000000 +0900 @@ -5,7 +5,7 @@ pkgbase=lsb_release vers=1.4 arch=noarch -build=P5 +build=P6 src=lsb-release-$vers OPT_CONFIG="" DOCS="ChangeLog INSTALL README lsb-release.template lsb_release.examples" @@ -245,7 +245,7 @@ done install -d $P/etc cat <<- "EOF" > $P/etc/plamo-release - Plamo Linux release 6.0 + Plamo Linux release 6.1 EOF touch $W/i.et cd $W --- plamo/00_base/old/shadow-20160125/PlamoBuild.shadow-git_20130908 2016-01-25 12:43:14.000000000 +0900 +++ plamo/00_base/shadow/PlamoBuild.shadow-git_20130908 2016-03-23 16:42:56.000000000 +0900 @@ -2,7 +2,7 @@ ###################################################################### url="https://github.com/shadow-maint/shadow.git - http://plamo.linet.gr.jp/~tamuki/src/shadow-adduser-20160122" + ftp://plamo.linet.gr.jp/pub/Plamo-src.new/plamo/00_base/shadow/shadow-adduser-20160122" pkgbase=shadow vers=git_20130908 arch=`uname -m` --- plamo/00_base/old/openssl-20160710/PlamoBuild.openssl-1.0.2h 2016-07-10 12:22:47.000000000 +0900 +++ plamo/00_base/openssl/PlamoBuild.openssl-1.0.2j 2016-11-08 13:00:42.000000000 +0900 @@ -1,10 +1,10 @@ #!/bin/sh ###################################################################### -url="http://www.openssl.org/source/openssl-1.0.2h.tar.gz - ftp://plamo.linet.gr.jp/pub/Plamo-src.new/plamo/00_base/openssl/mkcabundle.pl" +url="http://www.openssl.org/source/openssl-1.0.2j.tar.gz + ftp://plamo.linet.gr.jp/pub/Plamo-src/plamo/00_base/openssl/mkcabundle.pl" pkgbase=openssl -vers=1.0.2h +vers=1.0.2j arch=`uname -m` build=P2 src=$pkgbase-$vers @@ -14,6 +14,8 @@ INSTALL.DJGPP INSTALL.MacOS INSTALL.NW INSTALL.OS2 INSTALL.VMS INSTALL.W32 INSTALL.W64 INSTALL.WCE LICENSE NEWS PROBLEMS README README.ASN1 README.ENGINE" +template=20161020 +tmplurl=ftp://plamo.linet.gr.jp/pub/Plamo-src/admin ###################################################################### fscheck() { @@ -310,9 +312,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 --- plamo/00_base/old/ncurses-20160428/PlamoBuild.ncurses-6.0 2016-04-28 23:01:54.000000000 +0900 +++ plamo/00_base/ncurses/PlamoBuild.ncurses-6.0 2016-12-08 12:47:34.000000000 +0900 @@ -2,16 +2,19 @@ ###################################################################### url="http://ftp.gnu.org/gnu/ncurses/ncurses-6.0.tar.gz - ftp://plamo.linet.gr.jp/pub/Plamo-src.new/plamo/00_base/ncurses/ncurses-6.0-Charable.patch.gz" + ftp://plamo.linet.gr.jp/pub/Plamo-src/plamo/00_base/ncurses/ncurses-6.0-Charable.patch.gz" pkgbase=ncurses vers=6.0 arch=`uname -m` -build=P4 +build=P5 src=$pkgbase-$vers +patchfiles="ncurses-6.0-Charable.patch.gz" OPT_CONFIG="--with-shared --without-debug --enable-widec --with-manpage-format=normal --disable-ext-colors" DOCS="README.MinGW README README.emx NEWS ANNOUNCE COPYING INSTALL TO-DO AUTHORS" +template=20161020 +tmplurl=ftp://plamo.linet.gr.jp/pub/Plamo-src/admin ###################################################################### fscheck() { @@ -190,14 +193,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 @@ -208,8 +219,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 @@ -217,8 +228,18 @@ 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 + 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 cd $B - gunzip -c $W/ncurses-6.0-Charable.patch.gz | patch -Np1 -i - if [ $arch == x86_64 ] ; then cp -p misc/run_tic.in{,.orig} sed -i 's@\@lib64@g' misc/run_tic.in @@ -232,8 +253,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 @@ -289,9 +310,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 --- plamo/00_base/old/bash-20160402/PlamoBuild.bash-4.2.53 2016-04-02 17:02:57.000000000 +0900 +++ plamo/00_base/bash/PlamoBuild.bash-4.3.30 2016-04-03 09:46:50.000000000 +0900 @@ -1,17 +1,17 @@ #!/bin/sh ###################################################################### -url="http://ftp.gnu.org/gnu/bash/bash-4.2.53.tar.gz" +url="http://ftp.gnu.org/gnu/bash/bash-4.3.30.tar.gz" pkgbase=bash -vers=4.2.53 +vers=4.3.30 arch=`uname -m` -build=P3 +build=P2 src[0]=$pkgbase-$vers src[1]=${src[0]} OPT_CONFIG[0]="--bindir=/bin --without-bash-malloc --with-installed-readline" OPT_CONFIG[1]="${OPT_CONFIG[0]} --enable-static-link" -DOCS[0]="ABOUT-NLS ChangeLog CHANGES COMPAT COPYING INSTALL NEWS NOTES - POSIX README RBASH AUTHORS Y2K" +DOCS[0]="ABOUT-NLS AUTHORS ChangeLog CHANGES COMPAT COPYING INSTALL + NEWS NOTES POSIX RBASH README Y2K" DOCS[1]="" ###################################################################### --- plamo/00_base/old/btrfs_progs-20160125/PlamoBuild.btrfs_progs-v4.3.1 2016-01-25 15:45:11.000000000 +0900 +++ plamo/00_base/btrfs_progs/PlamoBuild.btrfs_progs-v4.8.3 2016-11-21 00:25:25.000000000 +0900 @@ -1,14 +1,17 @@ #!/bin/sh ###################################################################### -url="https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v4.3.1.tar.gz" +url="https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v4.8.3.tar.gz" pkgbase=btrfs_progs -vers=v4.3.1 +vers=v4.8.3 arch=`uname -m` -build=P2 +build=P1 src=btrfs-progs-$vers +patchfiles="" OPT_CONFIG="--bindir=/sbin" -DOCS="COPYING INSTALL README.md" +DOCS="CHANGES COPYING INSTALL README.md" +template=20161020 +tmplurl=ftp://plamo.linet.gr.jp/pub/Plamo-src/admin ###################################################################### fscheck() { @@ -185,13 +188,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 @@ -201,6 +226,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 @@ -208,8 +244,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 @@ -254,9 +290,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 --- plamo/00_base/old/bzip2-20151226/PlamoBuild.bzip2-1.0.6 2015-12-26 13:19:56.000000000 +0900 +++ plamo/00_base/bzip2/PlamoBuild.bzip2-1.0.6 2016-03-20 21:14:04.000000000 +0900 @@ -204,8 +204,6 @@ cp -p Makefile{,.orig} sed -i -e 's@\@$(LIBDIR)@g' -e 's@\@share/&@g' \ -e '/ln/s@$(PREFIX)/bin/@@' Makefile - cp -p Makefile-libbz2_so{,.orig} - sed -i 's@ -shared@ $(CFLAGS)&@g' Makefile-libbz2_so for i in `seq 0 $((${#B[@]} - 1))` ; do cd ${B[$i]} if [ -f Makefile ] ; then --- plamo/00_base/old/coreutils-20160425/PlamoBuild.coreutils-8.25 2016-04-25 01:21:52.000000000 +0900 +++ plamo/00_base/coreutils/PlamoBuild.coreutils-8.25 2016-07-10 10:52:28.000000000 +0900 @@ -5,8 +5,9 @@ pkgbase=coreutils vers=8.25 arch=`uname -m` -build=P2 +build=P3 src=$pkgbase-$vers +patchfiles="" OPT_CONFIG="--enable-install-program=arch --enable-no-install-program=uptime,kill --without-gmp" DOCS="COPYING TODO INSTALL THANKS ChangeLog-2006 ChangeLog-2008 NEWS @@ -189,14 +190,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 +216,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 @@ -216,6 +225,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 + 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 cd $B cp -p po/Makevars{,.orig} sed 's@EXTRA_LOCALE_CATEGORIES@#&@g' po/Makevars.orig > po/Makevars @@ -233,8 +253,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 @@ -275,6 +295,8 @@ find $P ! -type l -newer i.st ! -newer i.et \ -exec touch -t `date '+%m%d0900'` {} \; compress + strip_libdir $P/usr/libexec/coreutils + touch -t `date '+%m%d0900'` $P/usr/libexec/coreutils for i in `seq 0 $((${#DOCS[@]} - 1))` ; do for j in ${DOCS[$i]} ; do for k in ${S[$i]}/$j ; do --- plamo/00_base/old/cracklib-20160105/PlamoBuild.cracklib-2.8.18 2016-01-05 23:45:57.000000000 +0900 +++ plamo/00_base/cracklib/PlamoBuild.cracklib-2.8.18 2016-03-20 21:22:29.000000000 +0900 @@ -3,7 +3,7 @@ ###################################################################### url="http://downloads.sourceforge.net/cracklib/cracklib-2.8.18.tar.gz http://downloads.sourceforge.net/cracklib/cracklib-words-20080507.gz - http://plamo.linet.gr.jp/~tamuki/src/cracklib-2.8.15-heimdal-1.patch" + ftp://plamo.linet.gr.jp/pub/Plamo-src.new/plamo/00_base/cracklib/cracklib-2.8.15-heimdal-1.patch" pkgbase=cracklib vers=2.8.18 arch=`uname -m` --- 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 } --- plamo/00_base/old/dialog-20160406/PlamoBuild.dialog-1.3_20160209 2016-04-06 19:28:31.000000000 +0900 +++ plamo/00_base/dialog/PlamoBuild.dialog-1.3_20160828 2016-11-20 12:36:09.000000000 +0900 @@ -1,15 +1,18 @@ #!/bin/sh ###################################################################### -url="ftp://invisible-island.net/dialog/dialog-1.3-20160209.tgz" +url="ftp://invisible-island.net/dialog/dialog-1.3-20160828.tgz" pkgbase=dialog -vers=1.3_20160209 +vers=1.3_20160828 arch=`uname -m` -build=P2 -src=$pkgbase-1.3-20160209 +build=P1 +src=$pkgbase-1.3-20160828 +patchfiles="" OPT_CONFIG="--bindir=/bin --enable-nls --with-shared --with-ncursesw --enable-widec" DOCS="CHANGES README COPYING" +template=20161020 +tmplurl=ftp://plamo.linet.gr.jp/pub/Plamo-src/admin ###################################################################### fscheck() { @@ -186,14 +189,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##*/} ;; - tgz) 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 @@ -203,6 +227,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 @@ -210,8 +245,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 @@ -256,9 +291,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 --- plamo/00_base/old/dosfstools-20151229/PlamoBuild.dosfstools-3.0.26 2015-12-29 20:34:59.000000000 +0900 +++ plamo/00_base/dosfstools/PlamoBuild.dosfstools-3.0.26 2016-12-04 12:56:09.000000000 +0900 @@ -1,17 +1,20 @@ #!/bin/sh ###################################################################### -url="http://pkgs.fedoraproject.org/lookaside/pkgs/dosfstools/dosfstools-3.0.26.tar.xz/45012f5f56f2aae3afcd62120b9e5a08/dosfstools-3.0.26.tar.xz" +url="http://mirror.opencompute.org/onie/dosfstools-3.0.26.tar.xz" pkgbase=dosfstools vers=3.0.26 arch=`uname -m` -build=P2 +build=P3 src=$pkgbase-$vers +patchfiles="" OPT_CONFIG="" DOCS="`echo doc/{TODO.dosfstools-2.x,README.dosfsck,ChangeLog.dosfstools-2.x}` `echo doc/{ChangeLog.mkdosfs,ChangeLog.dosfsck,README.mkdosfs}` `echo doc/{ANNOUNCE.mkdosfs,README.dosfstools-2.x}` COPYING VERSION ChangeLog" +template=20161020 +tmplurl=ftp://plamo.linet.gr.jp/pub/Plamo-src/admin ###################################################################### fscheck() { @@ -188,14 +191,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##*/} ;; - xz) tar xvpJf ${i##*/} ;; + gz|tgz) tar xvpzf ${i##*/} ;; + bz2|tbz) tar xvpjf ${i##*/} ;; + xz|txz) tar xvpJf ${i##*/} ;; esac done fi @@ -205,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 @@ -212,8 +247,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 @@ -247,6 +282,7 @@ find $P ! -type l -newer i.st ! -newer i.et \ -exec touch -t `date '+%m%d0900'` {} \; compress + gzip_dir $mandir/de/man8 for i in `seq 0 $((${#DOCS[@]} - 1))` ; do for j in ${DOCS[$i]} ; do for k in ${S[$i]}/$j ; do @@ -258,9 +294,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 --- plamo/00_base/old/dump-20160320/PlamoBuild.dump-0.4b44 2016-03-20 21:34:01.000000000 +0900 +++ plamo/00_base/dump/PlamoBuild.dump-0.4b44 2016-04-09 21:37:03.000000000 +0900 @@ -7,7 +7,7 @@ pkgbase=dump vers=0.4b44 arch=`uname -m` -build=P2 +build=P3 src=$pkgbase-$vers OPT_CONFIG="--disable-transselinux" DOCS="COPYRIGHT TODO KNOWNBUGS REPORTING-BUGS README THANKS CHANGES @@ -205,8 +205,6 @@ cd $B gunzip -c $W/dump-0.4b41-destdir.patch.gz | patch -Np1 -i - gunzip -c $W/dump-0.4b44-com_err.patch.gz | patch -Np1 -i - - cp -p dump/Makefile.in{,.orig} - sed -i '/^LIBS=/s@$@ -lpthread@' dump/Makefile.in for i in `seq 0 $((${#B[@]} - 1))` ; do cd ${B[$i]} if [ -f Makefile ] ; then --- plamo/00_base/old/e2fsprogs-20161120/PlamoBuild.e2fsprogs-1.43.3 2016-11-20 20:50:53.000000000 +0900 +++ plamo/00_base/e2fsprogs/PlamoBuild.e2fsprogs-1.43.3 2016-12-06 05:39:01.000000000 +0900 @@ -5,11 +5,12 @@ pkgbase=e2fsprogs vers=1.43.3 arch=`uname -m` -build=P1 +build=P2 src=$pkgbase-$vers patchfiles="" OPT_CONFIG="--enable-elf-shlibs --disable-libuuid --disable-libblkid - --disable-fsck --disable-uuidd --with-root-prefix=" + --disable-fsck --disable-e2initrd-helper --disable-uuidd + --with-root-prefix=" DOCS="INSTALL.elfbin RELEASE-NOTES README NOTICE ABOUT-NLS INSTALL SUBMITTING-PATCHES" template=20161020 @@ -240,10 +241,10 @@ cd $B if [ $arch == x86_64 ] ; then cp -p configure{,.orig} - sed '/^ root_libdir=/s@$libdir@/lib64@g' configure.orig > configure + sed -i '/^ root_libdir=/s@$libdir@/lib64@g' configure fi cp -p misc/mke2fs.conf.in{,.orig} - sed 's@,dir_index@@g' misc/mke2fs.conf.in.orig > misc/mke2fs.conf.in + sed -i 's@,dir_index@@g' misc/mke2fs.conf.in for i in `seq 0 $((${#B[@]} - 1))` ; do cd ${B[$i]} if [ -f Makefile ] ; then --- plamo/00_base/old/eject-20151228/PlamoBuild.eject-2.1.5 2015-12-28 16:00:08.000000000 +0900 +++ plamo/00_base/eject/PlamoBuild.eject-2.1.5 2016-08-23 13:14:54.000000000 +0900 @@ -1,14 +1,16 @@ #!/bin/sh ###################################################################### -url="http://pkgs.fedoraproject.org/repo/pkgs/eject/eject-2.1.5.tar.gz/b96a6d4263122f1711db12701d79f738/eject-2.1.5.tar.gz" +url="http://ftp.caixamagica.pt/anvil/pool/main/e/eject/eject_2.1.5+deb1+cvs20081104.orig.tar.gz + http://ftp.caixamagica.pt/anvil/pool/main/e/eject/eject_2.1.5+deb1+cvs20081104-8.diff.gz" pkgbase=eject vers=2.1.5 arch=`uname -m` -build=P2 -src=$pkgbase +build=P3 +src=$pkgbase-$vers+deb1+cvs20081104 +patchfiles="eject_2.1.5+deb1+cvs20081104-8.diff.gz" OPT_CONFIG="" -DOCS="NEWS TODO README PROBLEMS AUTHORS INSTALL PORTING ChangeLog COPYING" +DOCS="TODO NEWS PORTING COPYING INSTALL README AUTHORS PROBLEMS ChangeLog" ###################################################################### fscheck() { @@ -185,13 +187,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 @@ -201,6 +225,19 @@ 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 + cd $B + ./bootstrap + for i in `seq 0 $((${#B[@]} - 1))` ; do + cd ${B[$i]} if [ -f Makefile ] ; then make clean fi @@ -208,8 +245,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 @@ -262,7 +299,7 @@ done 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/share/locale -name "*.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 usr/share/doc/$src touch -t `date '+%m%d0900'` $pkg.tar ; xz $pkg.tar ; touch $pkg.tar.xz --- plamo/00_base/old/extipl-20160320/PlamoBuild.extipl-5.04 2016-03-20 21:41:47.000000000 +0900 +++ plamo/00_base/extipl/PlamoBuild.extipl-5.04 2016-03-29 13:21:20.000000000 +0900 @@ -3,11 +3,12 @@ ###################################################################### url="http://jaist.dl.sourceforge.jp/extipl/2166/extipl-5.04.tar.gz ftp://plamo.linet.gr.jp/pub/Plamo-src.new/plamo/00_base/extipl/extipl-5.04-syscall.patch.gz + ftp://plamo.linet.gr.jp/pub/Plamo-src.new/plamo/00_base/extipl/extipl-5.04-x86_64.patch.gz http://jaist.dl.sourceforge.net/sourceforge/nasm/nasm-0.98.38.tar.bz2" pkgbase=extipl vers=5.04 arch=`uname -m` -build=P3 +build=P4 src=$pkgbase-$vers OPT_CONFIG="" DOCS="`echo doc/{English,Japanese}/{extipl,scorpius,techical}.txt` @@ -203,7 +204,11 @@ if [ -d ${B[$i]} ] ; then rm -rf ${B[$i]} ; fi ; cp -a ${S[$i]} ${B[$i]} done cd $B - gunzip -c $W/extipl-5.04-syscall.patch.gz | patch -Np1 -i - + if [ $arch != x86_64 ] ; then + gunzip -c $W/extipl-5.04-syscall.patch.gz | patch -Np1 -i - + else + gunzip -c $W/extipl-5.04-x86_64.patch.gz | patch -Np1 -i - + fi mkdir -p $W/nasm/{bin,man/man1} cd $W/nasm-0.98.38 ./configure --prefix=$W/nasm --- plamo/00_base/old/file-20160407~/PlamoBuild.file-5.22 2016-04-07 07:39:50.000000000 +0900 +++ plamo/00_base/file/PlamoBuild.file-5.22 2016-04-07 16:06:48.000000000 +0900 @@ -5,7 +5,7 @@ pkgbase=file vers=5.22 arch=`uname -m` -build=P4 +build=P5 src=$pkgbase-$vers OPT_CONFIG="" DOCS="AUTHORS COPYING ChangeLog INSTALL NEWS README TODO MAINT" @@ -264,7 +264,7 @@ tar cvpf $pkg.tar -C $P `cd $P ; find usr/bin | 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/include | tail -n+2` - tar rvpf $pkg.tar -C $P `cd $P ; find usr/misc | tail -n+2` + tar rvpf $pkg.tar -C $P `cd $P ; find usr/share/misc | tail -n+2` 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/man4 | tail -n+2` --- plamo/00_base/old/findutils-20160710/PlamoBuild.findutils-4.6.0 2016-07-10 11:04:09.000000000 +0900 +++ plamo/00_base/findutils/PlamoBuild.findutils-4.6.0 2016-08-24 14:34:06.000000000 +0900 @@ -5,10 +5,10 @@ pkgbase=findutils vers=4.6.0 arch=`uname -m` -build=P3 +build=P4 src=$pkgbase-$vers patchfiles="" -OPT_CONFIG="--localstatedir=/var" +OPT_CONFIG="" DOCS="ABOUT-NLS README AUTHORS README-hacking NEWS THANKS INSTALL COPYING ChangeLog tool-versions.txt ChangeLog-2013 README-alpha TODO" ###################################################################### @@ -273,12 +273,13 @@ make install DESTDIR=$P fi done + rm -rf $P/usr/{bin/{locate,updatedb},libexec} + rm -rf $mandir/{man1/{locate,updatedb}.1,man5} touch $W/i.et cd $W find $P ! -type l -newer i.st ! -newer i.et \ -exec touch -t `date '+%m%d0900'` {} \; compress - strip_bindir $P/usr/libexec for i in `seq 0 $((${#DOCS[@]} - 1))` ; do for j in ${DOCS[$i]} ; do for k in ${S[$i]}/$j ; do @@ -298,11 +299,9 @@ done 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/libexec | 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/locale -name *.mo` tar rvpf $pkg.tar -C $P `cd $P ; find usr/share/info | tail -n+2` 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 usr/share/doc/$src touch -t `date '+%m%d0900'` $pkg.tar ; xz $pkg.tar ; touch $pkg.tar.xz mv $pkg.tar.xz $pkg.txz --- plamo/00_base/old/gawk-20160710/PlamoBuild.gawk-4.1.3 2016-07-10 11:19:26.000000000 +0900 +++ plamo/00_base/gawk/PlamoBuild.gawk-4.1.4 2016-11-09 23:31:23.000000000 +0900 @@ -1,19 +1,21 @@ #!/bin/sh ###################################################################### -url="http://ftp.gnu.org/gnu/gawk/gawk-4.1.3.tar.xz" +url="http://ftp.gnu.org/gnu/gawk/gawk-4.1.4.tar.xz" pkgbase=gawk -vers=4.1.3 +vers=4.1.4 arch=`uname -m` -build=P3 +build=P1 src=$pkgbase-$vers patchfiles="" -OPT_CONFIG="" -DOCS="NEWS POSIX.STD COPYING README AUTHORS INSTALL - `echo README_d/README.{VMS,mpfr,os2,bootstrap,gcc-3,zos,macosx}` - `echo README_d/{ChangeLog,README.{multibyte,hacking,tests}}` - `echo README_d/{ChangeLog.0,README.{solaris,pc}}` - ChangeLog ABOUT-NLS NEWS.0" +OPT_CONFIG="--without-mpfr" +DOCS="POSIX.STD NEWS `echo README_d/{README.zos,ChangeLog{,.0}}` + `echo README_d/README.{hacking,VMS,os2,multibyte,pc,zLinux,tests}` + `echo README_d/README.{solaris,bootstrap,macosx,gcc-3,mpfr}` + ChangeLog ChangeLog.0 ABOUT-NLS README NEWS.0 COPYING INSTALL + AUTHORS" +template=20161020 +tmplurl=ftp://plamo.linet.gr.jp/pub/Plamo-src/admin ###################################################################### fscheck() { @@ -295,9 +297,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 --- plamo/00_base/old/glibc-20160607/PlamoBuild.glibc-2.20 2016-06-07 07:52:10.000000000 +0900 +++ plamo/00_base/glibc/PlamoBuild.glibc-2.20 2016-12-09 19:27:29.000000000 +0900 @@ -7,18 +7,24 @@ http://ftp.su.se/pub/mirrors/lunar-linux.org/lunar/patches/glibc-2.20-getifaddrs_internal-segfault.patch http://ftp.su.se/pub/mirrors/lunar-linux.org/lunar/patches/glibc-2.20-linux-3.16-additions.patch http://slackware.cs.utah.edu/pub/slackware/slackware-current/source/l/glibc/glibc-c-utf8-locale.patch.gz - ftp://plamo.linet.gr.jp/pub/Plamo-src.new/plamo/00_base/glibc/CVE-2015-7547.patch - ftp://plamo.linet.gr.jp/pub/Plamo-src.new/plamo/00_base/glibc/CVE-2015-8776.patch - ftp://plamo.linet.gr.jp/pub/Plamo-src.new/plamo/00_base/glibc/CVE-2015-8778.patch - ftp://plamo.linet.gr.jp/pub/Plamo-src.new/plamo/00_base/glibc/CVE-2015-8779.patch" + ftp://plamo.linet.gr.jp/pub/Plamo-src/plamo/00_base/glibc/CVE-2015-7547.patch + ftp://plamo.linet.gr.jp/pub/Plamo-src/plamo/00_base/glibc/CVE-2015-8776.patch + ftp://plamo.linet.gr.jp/pub/Plamo-src/plamo/00_base/glibc/CVE-2015-8778.patch + ftp://plamo.linet.gr.jp/pub/Plamo-src/plamo/00_base/glibc/CVE-2015-8779.patch" pkgbase=glibc vers=2.20 arch=`uname -m` -build=P4 +build=P5 src=$pkgbase-$vers +patchfiles="glibc-2.19-fhs-1.patch glibc-2.20-do_ftell_wide-memleak.patch + glibc-2.20-getifaddrs_internal-segfault.patch + glibc-2.20-linux-3.16-additions.patch glibc-c-utf8-locale.patch.gz + `echo CVE-2015-{7547,877{6,8,9}}.patch`" OPT_CONFIG="--enable-kernel=2.6.32 --enable-obsolete-rpc" DOCS="BUGS CONFORMANCE COPYING* ChangeLog* INSTALL LICENSES NEWS PROJECTS README" +template=20161020 +tmplurl=ftp://plamo.linet.gr.jp/pub/Plamo-src/admin ###################################################################### fscheck() { @@ -233,16 +239,17 @@ if [ -d ${S2[$i]} ] ; then rm -rf ${S2[$i]} ; fi ; cp -a ${S[$i]} ${S2[$i]} if [ -d ${B[$i]} ] ; then rm -rf ${B[$i]} ; fi ; mkdir ${B[$i]} done - cd $S2 - patch -Np1 -i $W/glibc-2.19-fhs-1.patch - patch -Np1 -i $W/glibc-2.20-do_ftell_wide-memleak.patch - patch -Np1 -i $W/glibc-2.20-getifaddrs_internal-segfault.patch - patch -Np1 -i $W/glibc-2.20-linux-3.16-additions.patch - gunzip -c $W/glibc-c-utf8-locale.patch.gz | patch -Np1 -i - - patch -Np1 -i $W/CVE-2015-7547.patch - patch -Np1 -i $W/CVE-2015-8776.patch - patch -Np1 -i $W/CVE-2015-8778.patch - patch -Np1 -i $W/CVE-2015-8779.patch + for i in `seq 0 $((${#B[@]} - 1))` ; do + cd ${S2[$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 cp -p localedata/Makefile{,.orig} cat <<- "EOF" | patch localedata/Makefile 235a236 @@ -374,9 +381,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 --- plamo/00_base/old/groff-20160405/PlamoBuild.groff-1.18.1.1 2016-04-05 13:51:39.000000000 +0900 +++ plamo/00_base/groff/PlamoBuild.groff-1.18.1.1 2016-07-30 04:51:27.000000000 +0900 @@ -8,8 +8,9 @@ pkgbase=groff vers=1.18.1.1 arch=`uname -m` -build=P4 +build=P5 src=$pkgbase-$vers +patchfiles="" OPT_CONFIG="--enable-multibyte" DOCS="BUG-REPORT COPYING ChangeLog FDL INSTALL* MANIFEST MORE.STUFF NEWS PROBLEMS PROJECTS README* REVISION TODO VERSION" @@ -189,13 +190,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 @@ -203,6 +226,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 + 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 cd $B gunzip -c $W/groff_1.18.1.1-20.diff.gz | patch -Np1 -i - gunzip -c $W/groff-1.18.1.1-fix-minus-char.patch.gz | patch -Np1 -i - @@ -216,8 +250,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 @@ -298,6 +332,7 @@ 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/man7 | 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 mv $pkg.tar.xz $pkg.txz read -p "Do you want to keep work files? [y/N] " ans --- plamo/00_base/old/grub-20160320/PlamoBuild.grub-2.02~beta2 2016-03-20 22:40:55.000000000 +0900 +++ plamo/00_base/grub/PlamoBuild.grub-2.02~beta2 2016-06-21 22:41:23.000000000 +0900 @@ -7,12 +7,16 @@ pkgbase=grub vers=2.02~beta2 arch=`uname -m` -build=P12 -src=$pkgbase-$vers -OPT_CONFIG="--sysconfdir=/etc --disable-grub-mount --disable-werror - --with-platform=efi" -DOCS="BUGS TODO THANKS COPYING ABOUT-NLS ChangeLog AUTHORS README +build=P13 +src[0]=$pkgbase-$vers +src[1]=${src[0]} +patchfiles[0]="" +patchfiles[1]="" +OPT_CONFIG[0]="--disable-grub-mount --disable-werror" +OPT_CONFIG[1]="${OPT_CONFIG[0]} --with-platform=efi" +DOCS[0]="BUGS TODO THANKS COPYING ABOUT-NLS ChangeLog AUTHORS README NEWS INSTALL" +DOCS[1]="" ###################################################################### fscheck() { @@ -189,14 +193,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##*/} ;; - xz) tar xvpJf ${i##*/} ;; + gz|tgz) tar xvpzf ${i##*/} ;; + bz2|tbz) tar xvpjf ${i##*/} ;; + xz|txz) tar xvpJf ${i##*/} ;; esac done fi @@ -204,13 +229,26 @@ 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 - for i in `cat $W/debian/patches/series` ; do - if [ $i != dpkg_version_comparison.patch ] ; then - patch -Np1 -i $W/debian/patches/$i - fi + 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]} + for j in `cat $W/debian/patches/series` ; do + if [ $j != dpkg_version_comparison.patch ] ; then + patch -Np1 -i $W/debian/patches/$j + fi + done + ./autogen.sh done - ./autogen.sh for i in `seq 0 $((${#B[@]} - 1))` ; do cd ${B[$i]} if [ -f Makefile ] ; then @@ -220,8 +258,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 @@ -292,7 +330,7 @@ touch -t `date '+%m%d0900'` $docdir/$src/$myname gzip_one $docdir/$src/$myname else - ln $docdir/$src/$myname.gz $docdir/${src[$i]} + false && ln $docdir/$src/$myname.gz $docdir/${src[$i]} fi ( cd $docdir ; find ${src[$i]} -type d -exec touch -r $W/{} {} \; ) done --- plamo/00_base/old/gzip-20160105/PlamoBuild.gzip-1.6 2016-01-05 21:07:54.000000000 +0900 +++ plamo/00_base/gzip/PlamoBuild.gzip-1.8 2016-11-20 13:16:18.000000000 +0900 @@ -1,15 +1,18 @@ #!/bin/sh ###################################################################### -url="http://ftp.gnu.org/gnu/gzip/gzip-1.6.tar.gz" +url="http://ftp.gnu.org/gnu/gzip/gzip-1.8.tar.gz" pkgbase=gzip -vers=1.6 +vers=1.8 arch=`uname -m` -build=P2 +build=P1 src=$pkgbase-$vers +patchfiles="" OPT_CONFIG="--bindir=/bin" -DOCS="INSTALL NEWS README AUTHORS COPYING THANKS TODO ChangeLog-2007 - README-release ChangeLog" +DOCS="NEWS INSTALL COPYING README AUTHORS ChangeLog algorithm.doc + README-release ChangeLog-2007 TODO THANKS" +template=20161020 +tmplurl=ftp://plamo.linet.gr.jp/pub/Plamo-src/admin ###################################################################### fscheck() { @@ -186,13 +189,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,6 +227,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 @@ -209,8 +245,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 @@ -257,9 +293,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 --- plamo/00_base/old/hdsetup-20161124/PlamoBuild.hdsetup-6.1 2016-11-24 09:04:24.000000000 +0900 +++ plamo/00_base/hdsetup/PlamoBuild.hdsetup-6.2 2017-02-20 15:05:53.000000000 +0900 @@ -14,9 +14,9 @@ ftp://plamo.linet.gr.jp/pub/Plamo-src/plamo/00_base/tar/tar-1.26-no-gets.patch.gz ftp://plamo.linet.gr.jp/pub/Plamo-src/plamo/00_base/hdsetup/hdsetup-plamoscripts.tar.gz" pkgbase=hdsetup -vers=6.1 +vers=6.2 arch=`uname -m` -build=P10 +build=P1 src[0]=busybox-1.25.1 src[1]=dialog-1.3-20160828 src[2]=coreutils-8.25 @@ -51,7 +51,7 @@ --disable-lzmainfo --disable-lzma-links --disable-scripts" OPT_CONFIG[6]="--bindir=/bin" DOCS="LICENSE INSTALL TODO AUTHORS README TODO_unicode" -template=20161020 +template=20170204 tmplurl=ftp://plamo.linet.gr.jp/pub/Plamo-src/admin ###################################################################### @@ -270,7 +270,7 @@ 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 - ;; + bz2) bunzip2 -c $W/$j | patch -Np1 -i - ;; xz) unxz -c $W/$j | patch -Np1 -i - ;; *) patch -Np1 -i $W/$j ;; esac --- plamo/00_base/old/iputils-20160107/PlamoBuild.iputils-s20101006 2016-01-07 08:53:27.000000000 +0900 +++ plamo/00_base/iputils/PlamoBuild.iputils-s20101006 2016-03-21 18:20:06.000000000 +0900 @@ -2,9 +2,9 @@ ###################################################################### url="http://www.skbuff.net/iputils/iputils-s20101006.tar.bz2 - http://plamo.linet.gr.jp/~tamuki/src/iputils-s20101006-fixes-1.patch.gz - http://plamo.linet.gr.jp/~tamuki/src/iputils-s20100418-doc-1.patch.gz - http://plamo.linet.gr.jp/~tamuki/src/iputils-s20101006-Makefile.patch.gz" + ftp://plamo.linet.gr.jp/pub/Plamo-src.new/plamo/00_base/iputils/iputils-s20101006-fixes-1.patch.gz + ftp://plamo.linet.gr.jp/pub/Plamo-src.new/plamo/00_base/iputils/iputils-s20100418-doc-1.patch.gz + ftp://plamo.linet.gr.jp/pub/Plamo-src.new/plamo/00_base/iputils/iputils-s20101006-Makefile.patch.gz" pkgbase=iputils vers=s20101006 arch=`uname -m` --- 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` --- plamo/00_base/old/kmod-20160125/PlamoBuild.kmod-22 2016-01-25 18:19:43.000000000 +0900 +++ plamo/00_base/kmod/PlamoBuild.kmod-22 2016-06-06 08:18:11.000000000 +0900 @@ -5,9 +5,9 @@ pkgbase=kmod vers=22 arch=`uname -m` -build=P3 +build=P4 src=$pkgbase-$vers -OPT_CONFIG="--bindir=/bin --sysconfdir=/etc" +OPT_CONFIG="--bindir=/bin" DOCS="NEWS COPYING TODO README" ###################################################################### @@ -185,14 +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##*/} ;; - xz) tar xvpJf ${i##*/} ;; + gz|tgz) tar xvpzf ${i##*/} ;; + bz2|tbz) tar xvpjf ${i##*/} ;; + xz|txz) tar xvpJf ${i##*/} ;; esac done fi @@ -209,8 +230,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 @@ -291,10 +312,10 @@ convert cat <<- "EOF" >> $P/install/doinst.sh + mv etc/modprobe.d/plamo-default.conf.new /tmp if [ -f etc/modprobe.d/plamo-default.conf ] ; then - rm etc/modprobe.d/plamo-default.conf.new + mv /tmp/plamo-default.conf.new etc/modprobe.d/plamo-default.conf.dist else - mv etc/modprobe.d/plamo-default.conf.new /tmp mv /tmp/plamo-default.conf.new etc/modprobe.d/plamo-default.conf fi EOF --- plamo/00_base/old/less-20160321/PlamoBuild.less-382 2016-03-21 18:38:07.000000000 +0900 +++ plamo/00_base/less/PlamoBuild.less-382 2016-04-09 20:52:10.000000000 +0900 @@ -12,7 +12,7 @@ pkgbase=less vers=382 arch=`uname -m` -build=P3 +build=P4 src=$pkgbase-$vers OPT_CONFIG="" DOCS="COPYING INSTALL LICENSE NEWS README" --- plamo/00_base/old/libgcc-20160112/PlamoBuild.libgcc-4.8.4 2016-01-12 07:56:45.000000000 +0900 +++ plamo/00_base/libgcc/PlamoBuild.libgcc-4.8.5 2016-01-28 13:05:06.000000000 +0900 @@ -1,20 +1,20 @@ #!/bin/sh ###################################################################### -url="http://ftp.gnu.org/gnu/gcc/gcc-4.8.4/gcc-4.8.4.tar.bz2 +url="http://ftp.gnu.org/gnu/gcc/gcc-4.8.5/gcc-4.8.5.tar.bz2 https://patchwork.ozlabs.org/patch/342434/mbox" pkgbase=libgcc -vers=4.8.4 +vers=4.8.5 arch=`uname -m` -build=P3 +build=P2 src=gcc-$vers OPT_CONFIG="--disable-werror --disable-multilib --enable-install-libiberty --enable-__cxa_atexit --enable-threads=posix --enable-shared --enable-languages=c,c++,fortran,go --enable-gnu-unique-object --enable-linker-build-id --enable-plugin --with-system-zlib --with-linker-hash-style=gnu --enable-clocale=gnu --disable-libstdcxx-pch" -DOCS="COPYING.LIB MAINTAINERS ABOUT-NLS README COPYING3.LIB COPYING - COPYING.RUNTIME NEWS COPYING3 ChangeLog" +DOCS="COPYING ChangeLog ABOUT-NLS NEWS COPYING3.LIB ChangeLog.tree-ssa + COPYING3 COPYING.RUNTIME README COPYING.LIB MAINTAINERS" ###################################################################### fscheck() { --- plamo/00_base/old/libtirpc-20160105/PlamoBuild.libtirpc-0.2.3 2016-01-05 23:34:04.000000000 +0900 +++ plamo/00_base/libtirpc/PlamoBuild.libtirpc-0.2.3 2016-08-26 13:45:34.000000000 +0900 @@ -7,9 +7,10 @@ pkgbase=libtirpc vers=0.2.3 arch=`uname -m` -build=P3 +build=P4 src=$pkgbase-$vers -OPT_CONFIG="--sysconfdir=/etc" +patchfiles="" +OPT_CONFIG="" DOCS="VERSION TODO THANKS README NEWS INSTALL ChangeLog COPYING AUTHORS" ###################################################################### @@ -191,14 +192,34 @@ if [ ${i##*/} == 1 ] ; then [ ! -f $alt ] && wget $i -O $alt elif [ ! -f ${i##*/} ] ; then - wget $i + 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 @@ -206,6 +227,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 + 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 cd $B patch -Np1 -i $W/libtirpc-0.2.3-remove_nis-1.patch patch -Np1 -i $W/0001-Switch-to-use-standard-GSSAPI-by-default.patch @@ -219,8 +251,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 @@ -249,6 +281,10 @@ make install DESTDIR=$P fi done + install -d $P/$libdir + cp -p $P/usr/$libdir/libtirpc.so.1.0.10 $P/$libdir + ln -sf /$libdir/libtirpc.so.1.0.10 $P/usr/$libdir/libtirpc.so.1 + ln -sf /$libdir/libtirpc.so.1.0.10 $P/usr/$libdir/libtirpc.so touch $P/etc/netconfig chown root.root $P/etc/netconfig touch $W/i.et @@ -274,7 +310,9 @@ ( cd $docdir ; find ${src[$i]} -type d -exec touch -r $W/{} {} \; ) done convert - tar cvpf $pkg.tar -C $P \ + rm $P/usr/$libdir/libtirpc.so.1.0.10 + tar cvpf $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 usr/include/tirpc tar rvpf $pkg.tar -C $P etc/netconfig --- plamo/00_base/old/lilo-20160314/PlamoBuild.lilo-24.2 2016-03-14 17:34:46.000000000 +0900 +++ plamo/00_base/lilo/PlamoBuild.lilo-24.2 2016-03-23 07:18:35.000000000 +0900 @@ -3,9 +3,9 @@ ###################################################################### url="http://lilo.alioth.debian.org/ftp/sources/lilo-24.2.tar.gz ftp://ftp.internat.freebsd.org/pub/FreeBSD/distfiles/Dev86src-0.16.18.tar.gz - http://plamo.linet.gr.jp/~tamuki/src/dev86-0.16.17-x86_64.patch.gz - http://plamo.linet.gr.jp/~tamuki/src/dev86-0.16.17-copt.patch.gz - http://plamo.linet.gr.jp/~tamuki/src/plamo_liloconfig.tar.gz" + ftp://plamo.linet.gr.jp/pub/Plamo-src.new/plamo/00_base/lilo/dev86-0.16.17-x86_64.patch.gz + ftp://plamo.linet.gr.jp/pub/Plamo-src.new/plamo/00_base/lilo/dev86-0.16.17-copt.patch.gz + ftp://plamo.linet.gr.jp/pub/Plamo-src.new/plamo/00_base/lilo/plamo_liloconfig.tar.gz" pkgbase=lilo vers=24.2 arch=`uname -m` --- plamo/00_base/old/linux_firmware-20160113/PlamoBuild.linux_firmware-git_20141217 2016-01-13 08:59:46.000000000 +0900 +++ plamo/00_base/linux_firmware/PlamoBuild.linux_firmware-git_20160112 2016-01-26 12:06:22.000000000 +0900 @@ -3,22 +3,26 @@ ###################################################################### url="https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git" pkgbase=linux_firmware -vers=git_20141217 +vers=git_20160112 arch=noarch build=P2 src=linux-firmware OPT_CONFIG="" DOCS="GPL-3 `echo LICENCE.{Abilis,IntcSST2,Marvell,OLPC}` LICENSE.radeon `echo LICENCE.{agere,atheros_firmware,broadcom_bcm43xx,ca0132}` - `echo LICENCE.{chelsio_firmware,cw1200}` README - `echo LICENCE.{ene_firmware,fw_sst_0f28,go7007,i2400m,ibt_firmware}` - `echo LICENCE.{it913x,iwlwifi_firmware,qat_dh895xcc_firmware,mwl8335}` - LICENCE.myri10ge_firmware WHENCE `echo LICENCE.{qla2xxx,r8a779x_usb3}` + `echo LICENCE.{chelsio_firmware,cw1200}` README LICENCE.ene_firmware + `echo LICENCE.{fw_sst_0f28,go7007,i2400m,ibt_firmware,it913x}` + `echo LICENCE.{iwlwifi_firmware,adsp_sst}` WHENCE LICENCE.mwl8335 + `echo LICENCE.{myri10ge_firmware,phanfw,qla2xxx,r8a779x_usb3}` `echo LICENCE.{ralink-firmware.txt,ralink_a_mediatek_company_firmware}` `echo LICENCE.{rtlwifi_firmware.txt,siano,tda7706-firmware.txt}` `echo LICENCE.{ti-connectivity,ueagle-atm4-firmware,via_vt6656,wl1251}` `echo LICENCE.{xc4000,xc5000,xc5000c}` `echo LICENSE.{amd-ucode,dib0700}` - TDA7706_OM_v2.5.1_boot.txt TDA7706_OM_v3.0.2_boot.txt" + `echo TDA7706_OM_{v2.5.1,v3.0.2}_boot.txt` `echo LICENCE.{cavium,e100}` + `echo LICENCE.{kaweth,moxa,nvidia,open-ath9k-htc-firmware,qat_firmware}` + `echo LICENCE.{qla1280,ti-keystone}` + `echo LICENSE.{QualcommAtheros_{ar3k,ath10k},amdgpu,atmel,hfi1_firmware}` + LICENSE.i915" ###################################################################### fscheck() { @@ -207,7 +211,7 @@ gz) tar xvpzf ${i##*/} ;; bz2) tar xvpjf ${i##*/} ;; git) ( cd `basename ${i##*/} .git` - git checkout origin/master ; git reset --hard d547ba7 + git checkout origin/master ; git reset --hard 40e9ae8 git set-file-times ) ;; esac done --- plamo/00_base/old/linux_pam-20151225/PlamoBuild.linux_pam-1.1.8 2015-12-25 10:59:46.000000000 +0900 +++ plamo/00_base/linux_pam/PlamoBuild.linux_pam-1.1.8 2016-11-21 18:30:32.000000000 +0900 @@ -2,16 +2,19 @@ ###################################################################### url="https://fedorahosted.org/releases/l/i/linux-pam/Linux-PAM-1.1.8.tar.bz2 - https://raw.githubusercontent.com/willysr/csb/master/pam/pam-1.1.8-cve-2013-7041.patch - https://raw.githubusercontent.com/willysr/csb/master/pam/pam-1.1.8-cve-2014-2583.patch" + ftp://plamo.linet.gr.jp/pub/Plamo-src/plamo/00_base/linux_pam/pam-1.1.8-cve-2013-7041.patch + ftp://plamo.linet.gr.jp/pub/Plamo-src/plamo/00_base/linux_pam/pam-1.1.8-cve-2014-2583.patch" pkgbase=linux_pam vers=1.1.8 arch=`uname -m` -build=P2 +build=P3 src=Linux-PAM-$vers -OPT_CONFIG="--enable-shared --enable-read-both-confs --disable-nis" +patchfiles="`echo pam-1.1.8-cve-{2013-7041,2014-2583}.patch`" +OPT_CONFIG="--enable-static --enable-read-both-confs --disable-nis" DOCS="NEWS ABOUT-NLS Copyright README COPYING AUTHORS CHANGELOG ChangeLog INSTALL ChangeLog-CVS" +template=20161020 +tmplurl=ftp://plamo.linet.gr.jp/pub/Plamo-src/admin ###################################################################### fscheck() { @@ -188,13 +191,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,9 +227,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 - patch -Np1 -i $W/pam-1.1.8-cve-2013-7041.patch - patch -Np1 -i $W/pam-1.1.8-cve-2014-2583.patch + 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 @@ -214,8 +247,8 @@ rm -rf config.cache config.log fi if [ -x configure ] ; then - ./configure --prefix=/usr --libdir=/usr/$libdir \ - --infodir='${prefix}'/share/info \ + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --libdir=/usr/$libdir --infodir='${prefix}'/share/info \ --mandir='${prefix}'/share/man ${OPT_CONFIG[$i]} \ --sbindir=/$libdir/security --enable-securedir=/$libdir/security fi @@ -332,17 +365,33 @@ 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 mv $docdir/Linux-PAM $docdir/$src/doc mv $docdir/$src/{doc,{ABOUT-NLS,Copyright,README,COPYING,AUTHORS}.gz} $C - mv $docdir/$src/{CHANGELOG,ChangeLog,INSTALL,ChangeLog-CVS,$myname}.gz $C + mv $docdir/$src/{CHANGELOG,ChangeLog,INSTALL,ChangeLog-CVS}.gz $C + mv $docdir/$src/{$myname,$spec}.gz $C mv $C/{doc,{ABOUT-NLS,Copyright,README,COPYING,AUTHORS}.gz} $docdir/$src - mv $C/{CHANGELOG,ChangeLog,INSTALL,ChangeLog-CVS,$myname}.gz $docdir/$src + mv $C/{CHANGELOG,ChangeLog,INSTALL,ChangeLog-CVS}.gz $docdir/$src + mv $C/{$myname,$spec}.gz $docdir/$src touch -r $S $docdir/$src convert prune_symlink $P/etc/pam.d --- plamo/00_base/old/logrotate-20160116/PlamoBuild.logrotate-3.8.1 2016-01-16 07:32:10.000000000 +0900 +++ plamo/00_base/logrotate/PlamoBuild.logrotate-3.8.1 2016-06-06 08:26:47.000000000 +0900 @@ -5,7 +5,7 @@ pkgbase=logrotate vers=3.8.1 arch=`uname -m` -build=P3 +build=P4 src=$pkgbase-$vers OPT_CONFIG="" DOCS="README.HPUX README.Solaris CHANGES COPYING" @@ -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 @@ -208,8 +230,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 @@ -309,10 +331,10 @@ convert install -d $P/install cat <<- "EOF" > $P/install/doinst.sh + mv etc/logrotate.conf.new /tmp if [ -f etc/logrotate.conf ] ; then - rm etc/logrotate.conf.new + mv /tmp/logrotate.conf.new etc/logrotate.conf.dist else - mv etc/logrotate.conf.new /tmp mv /tmp/logrotate.conf.new etc/logrotate.conf fi EOF --- plamo/00_base/old/lsb_release-20160314/PlamoBuild.lsb_release-1.4 2016-03-14 17:42:03.000000000 +0900 +++ plamo/00_base/lsb_release/PlamoBuild.lsb_release-1.4 2017-02-20 19:21:26.000000000 +0900 @@ -5,10 +5,13 @@ pkgbase=lsb_release vers=1.4 arch=noarch -build=P6 +build=P7 src=lsb-release-$vers +patchfiles="" OPT_CONFIG="" DOCS="ChangeLog INSTALL README lsb-release.template lsb_release.examples" +template=20170204 +tmplurl=ftp://plamo.linet.gr.jp/pub/Plamo-src/admin ###################################################################### fscheck() { @@ -185,13 +188,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 @@ -199,6 +224,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 + 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 cd $B cp -p Makefile{,.orig} sed -i -e '/^prefix=/s@/local@@g' -e '/^mandir=/s@/man@/share/man@g' \ @@ -213,8 +249,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 @@ -245,7 +281,7 @@ done install -d $P/etc cat <<- "EOF" > $P/etc/plamo-release - Plamo Linux release 6.1 + Plamo Linux release 6.2 EOF touch $W/i.et cd $W @@ -263,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 --- plamo/00_base/old/lvm2-20151223/PlamoBuild.lvm2-2.02.90 2015-12-23 09:50:40.000000000 +0900 +++ plamo/00_base/lvm2/PlamoBuild.lvm2-2.02.90 2016-12-03 15:49:01.000000000 +0900 @@ -5,13 +5,16 @@ pkgbase=lvm2 vers=2.02.90 arch=`uname -m` -build=P3 +build=P4 src=LVM2.$vers +patchfiles="" OPT_CONFIG="--exec-prefix= --enable-static_link --enable-applib --enable-cmdlib --enable-pkgconfig --enable-dmeventd --with-thin=internal" DOCS="COPYING.LIB COPYING INSTALL VERSION_DM README VERSION WHATS_NEW WHATS_NEW_DM" +template=20161020 +tmplurl=ftp://plamo.linet.gr.jp/pub/Plamo-src/admin ###################################################################### fscheck() { @@ -188,14 +191,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##*/} ;; - tgz) 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 @@ -203,6 +227,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 + 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 cd $B cp -p daemons/dmeventd/Makefile.in{,.orig} sed -i 's@$(ELDFLAGS) @@' daemons/dmeventd/Makefile.in @@ -215,8 +250,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]} \ --with-usrlibdir=/usr/$libdir fi @@ -249,6 +284,7 @@ touch $P/usr/$libdir/*.a touch $P/usr/$libdir/pkgconfig/*.pc touch $P/etc/lvm/lvm.conf + touch $mandir/man[58]/* touch $W/i.et cd $W find $P ! -type l -newer i.st ! -newer i.et \ @@ -267,9 +303,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 --- plamo/00_base/old/netkit_combo-20160330/PlamoBuild.netkit_combo-0.17 2016-03-30 13:45:36.000000000 +0900 +++ plamo/00_base/netkit_combo/PlamoBuild.netkit_combo-0.17 2016-04-09 20:56:43.000000000 +0900 @@ -25,7 +25,7 @@ pkgbase=netkit_combo vers=0.17 arch=`uname -m` -build=P8 +build=P9 src=netkit-combo-$vers OPT_CONFIG="" DOCS="README --- plamo/00_base/old/nkf-20160324/PlamoBuild.nkf-2.1.2 2016-03-24 11:52:09.000000000 +0900 +++ plamo/00_base/nkf/PlamoBuild.nkf-2.1.2 2016-03-24 12:26:46.000000000 +0900 @@ -267,8 +267,10 @@ find $P ! -type l -newer i.st ! -newer i.et \ -exec touch -t `date '+%m%d0900'` {} \; compress - strip_libdir $P/usr/$libdir/perl5/auto/NKF - touch -t `date '+%m%d0900'` $P/usr/$libdir/perl5/auto/NKF + strip_libdir \ + $P/usr/$libdir/perl5/site_perl/*/$arch-linux-thread-multi/auto/NKF + touch -t `date '+%m%d0900'` \ + $P/usr/$libdir/perl5/site_perl/*/$arch-linux-thread-multi/auto/NKF gzip_dir $mandir/ja_JP.eucJP/man1 for i in `seq 0 $((${#DOCS[@]} - 1))` ; do for j in ${DOCS[$i]} ; do @@ -289,7 +291,8 @@ done convert tar cvpf $pkg.tar -C $P `cd $P ; find usr/bin | tail -n+2` - tar rvpf $pkg.tar -C $P usr/$libdir/perl5/{auto/NKF,NKF.pm} + tar rvpf $pkg.tar -C $P \ + usr/$libdir/perl5/site_perl/5.14.2/$arch-linux-thread-multi/{auto/NKF,NKF.pm} 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/ja_JP.eucJP/man1 | tail -n+2` --- plamo/00_base/old/nvi-20160409/PlamoBuild.nvi-1.79 2016-04-09 21:07:22.000000000 +0900 +++ plamo/00_base/nvi/PlamoBuild.nvi-1.79 2016-07-10 11:39:09.000000000 +0900 @@ -8,8 +8,9 @@ pkgbase=nvi vers=1.79 arch=`uname -m` -build=P7 +build=P8 src=$pkgbase-$vers +patchfiles="" OPT_CONFIG="--enable-multibyte=euc-jp" DOCS="LAYOUT README FAQ `echo docs/USD.doc/{edit/edittut,vi.ref/vi.ref}.ps` @@ -195,13 +196,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 @@ -209,6 +232,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 + 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 cd $B chmod -R u+w . gunzip -c $W/nvi-1.79.m17n-20040401.diff.gz | patch -Np0 -i - @@ -226,8 +260,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 @@ -307,6 +341,7 @@ find $P ! -type l -newer i.st ! -newer i.et \ -exec touch -t `date '+%m%d0900'` {} \; compress + strip_bindir $P/usr/libexec gzip_dir $mandir/cat1 for i in `seq 0 $((${#DOCS[@]} - 1))` ; do for j in ${DOCS[$i]} ; do --- plamo/00_base/old/openssh-20160802/PlamoBuild.openssh-7.3p1 2016-08-02 20:10:01.000000000 +0900 +++ plamo/00_base/openssh/PlamoBuild.openssh-7.4p1 2017-01-16 19:36:28.000000000 +0900 @@ -1,9 +1,9 @@ #!/bin/sh ###################################################################### -url="http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-7.3p1.tar.gz" +url="http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-7.4p1.tar.gz" pkgbase=openssh -vers=7.3p1 +vers=7.4p1 arch=`uname -m` build=P2 src=$pkgbase-$vers @@ -13,6 +13,8 @@ DOCS="CREDITS INSTALL LICENCE OVERVIEW PROTOCOL PROTOCOL.agent `echo PROTOCOL.{certkeys,chacha20poly1305,key,krl,mux}` README `echo README.{dns,platform,privsep,tun}` TODO ChangeLog" +template=20161020 +tmplurl=ftp://plamo.linet.gr.jp/pub/Plamo-src/admin ###################################################################### fscheck() { @@ -310,9 +312,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 --- plamo/00_base/old/openssl-20161108/PlamoBuild.openssl-1.0.2j 2016-11-08 13:00:42.000000000 +0900 +++ plamo/00_base/openssl/PlamoBuild.openssl-1.0.2k 2017-03-01 08:00:25.000000000 +0900 @@ -1,20 +1,19 @@ #!/bin/sh ###################################################################### -url="http://www.openssl.org/source/openssl-1.0.2j.tar.gz +url="http://www.openssl.org/source/openssl-1.0.2k.tar.gz ftp://plamo.linet.gr.jp/pub/Plamo-src/plamo/00_base/openssl/mkcabundle.pl" pkgbase=openssl -vers=1.0.2j +vers=1.0.2k arch=`uname -m` build=P2 src=$pkgbase-$vers patchfiles="" OPT_CONFIG="" DOCS="ACKNOWLEDGMENTS CHANGES CHANGES.SSLeay CONTRIBUTING FAQ INSTALL - INSTALL.DJGPP INSTALL.MacOS INSTALL.NW INSTALL.OS2 INSTALL.VMS - INSTALL.W32 INSTALL.W64 INSTALL.WCE LICENSE NEWS PROBLEMS README - README.ASN1 README.ENGINE" -template=20161020 + `echo INSTALL.{DJGPP,MacOS,NW,OS2,VMS,W32,W64,WCE}` LICENSE NEWS + PROBLEMS README README.ASN1 README.ENGINE" +template=20170204 tmplurl=ftp://plamo.linet.gr.jp/pub/Plamo-src/admin ###################################################################### @@ -237,7 +236,7 @@ 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 - ;; + bz2) bunzip2 -c $W/$j | patch -Np1 -i - ;; xz) unxz -c $W/$j | patch -Np1 -i - ;; *) patch -Np1 -i $W/$j ;; esac --- plamo/00_base/old/mlocate-20160113/PlamoBuild.mlocate-0.24 2016-01-13 22:53:23.000000000 +0900 +++ plamo/00_base/mlocate/PlamoBuild.mlocate-0.24 2017-04-24 20:04:59.000000000 +0900 @@ -1,216 +1,46 @@ #!/bin/sh ###################################################################### -url="https://fedorahosted.org/releases/m/l/mlocate/mlocate-0.24.tar.xz" +url="http://downloads.sourceforge.net/kongoni/mlocate-0.24.tar.xz" +verify= +digest= +commitid= pkgbase=mlocate vers=0.24 arch=`uname -m` -build=P2 +build=P3 src=$pkgbase-$vers -OPT_CONFIG="--localstatedir=/var" +patchfiles="" +OPT_CONFIG="" DOCS="README ChangeLog NEWS INSTALL AUTHORS ABOUT-NLS COPYING" +template=20170415 +tmplurl=ftp://plamo.linet.gr.jp/pub/Plamo-src/admin ###################################################################### -fscheck() { - PANGRAM="The quick brown fox jumps over the lazy dog." - echo -n "Checking for the filesystem ... " - mkdir pangram ; ( cd pangram ; touch $PANGRAM ) - mv pangram pangram~ ; mkdir pangram ; touch -r pangram~ pangram - tar cpf pangram.tar pangram ; rmdir pangram ; mv pangram~ pangram - for i in $PANGRAM ; do tar rpf pangram.tar pangram/$i ; done - touch -t `date '+%m%d0900'` pangram.tar ; gzip pangram.tar - touch pangram.tar.gz ; mv pangram.tar.gz pangram1.tgz - tar cpf pangram.tar pangram - touch -t `date '+%m%d0900'` pangram.tar ; gzip pangram.tar - touch pangram.tar.gz ; mv pangram.tar.gz pangram2.tgz - if cmp -s pangram1.tgz pangram2.tgz ; then - echo "OK" - rm -rf pangram pangram1.tgz pangram2.tgz - else - echo "NG" - cat <<- "EOF" - Hmm, packaging may not be done properly on this filesystem. - Would you please try again on a default filesystem, thanks! - - Happy packaging!! - - Quitting... - EOF - exit - fi -} - -install2() { - install -d ${2%/*} ; install -m 644 $1 $2 -} - -strip_bindir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - shopt -s nullglob - cd $1 - for i in * ; do - echo "$i" - if [ -h $i ] ; then continue ; fi - if [ -n "`file $i | grep "not stripped"`" ] ; then - echo "stripping -p $i" - strip -p $i - fi - done - ) fi -} - -strip_libdir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - shopt -s nullglob - cd $1 - for i in *.so *.so.* *.a ; do - echo "$i" - if [ -h $i ] ; then continue ; fi - if [ -n "`nm -a $i | grep " a "`" ] ; then - if [ $i != ${i%.a} ] ; then - echo -n "ranlib and " - touch -r $i $i.mt ; ranlib $i ; touch -r $i.mt $i ; rm $i.mt - fi - echo "stripping -gp $i" - strip -gp $i - fi - done - ) fi -} - -gzip_dir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - cd $1 - files=`ls -f --indicator-style=none | sed '/^\.\{1,2\}$/d'` - for i in $files ; do - echo "$i" - if [ ! -f $i -a ! -h $i -o $i != ${i%.gz} ] ; then continue ; fi - lnks=`ls -l $i | awk '{print $2}'` - if [ $lnks -gt 1 ] ; then - inum=`ls -i $i | awk '{print $1}'` - for j in `find . -maxdepth 1 -inum $inum` ; do - if [ ${j#./} == $i ] ; then - gzip -f $i - else - rm -f ${j#./} ; ln $i.gz ${j#./}.gz - fi - done - elif [ -h $i ] ; then - target=`readlink $i` ; rm -f $i ; ln -s $target.gz $i.gz - else - gzip $i - fi - done - for i in $files ; do mv ${i%.gz}.gz $C ; done - for i in $files ; do mv $C/${i%.gz}.gz . ; done - ) fi -} - -gzip_one() { - gzip $1 ; mv $1.gz $C ; mv $C/${1##*/}.gz ${1%/*} -} - -compress() { - for i in {$P,$P/usr}/{sbin,bin} ; do strip_bindir $i ; done - for i in {$P,$P/usr}/$libdir ; do strip_libdir $i ; done - if [ -f $infodir/dir ] ; then rm -f $infodir/dir ; fi - gzip_dir $infodir - for i in `seq 9` n ; do gzip_dir $mandir/man$i ; done -} - -prune_symlink() { - echo "pruning symlink in $1" - if [ -d $1 ] ; then ( - cd $P - rm -f /tmp/iNsT-a.$$ ; touch /tmp/iNsT-a.$$ - for i in `find ${1#$P/} -type l` ; do - target=`readlink $i` - echo "$i -> $target" - echo $i$'\n'$target >> /tmp/iNsT-a.$$ - done - COUNT=1 - LINE=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - while [ -n "$LINE" ] ; do - LINKGOESIN=`dirname $LINE` - LINKNAMEIS=`basename $LINE` - COUNT=$(($COUNT + 1)) - LINKPOINTSTO=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - if [ ! -d install ] ; then mkdir install ; fi - cat <<- EOF >> install/doinst.sh - ( cd $LINKGOESIN ; rm -rf $LINKNAMEIS ) - ( cd $LINKGOESIN ; ln -sf $LINKPOINTSTO $LINKNAMEIS ) - EOF - rm -rf $LINE ; touch -t `date '+%m%d0900'` install/doinst.sh $LINE - COUNT=$(($COUNT + 1)) - LINE=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - done - rm -f /tmp/iNsT-a.$$ - ) fi -} - -convert() { - for i in {$P,$P/usr}/{sbin,bin} ; do prune_symlink $i ; done - for i in {$P,$P/usr}/$libdir ; do prune_symlink $i ; done - prune_symlink $infodir - for i in `seq 9` n ; do prune_symlink $mandir/man$i ; done -} - -fscheck -W=`pwd` -for i in `seq 0 $((${#src[@]} - 1))` ; do - S[$i]=$W/${src[$i]} ; B[$i]=$W/build`test ${#src[@]} -eq 1 || echo $i` -done -P=$W/work ; C=$W/pivot -infodir=$P/usr/share/info -mandir=$P/usr/share/man -docdir=$P/usr/share/doc -myname=`basename $0` -pkg=$pkgbase-$vers-$arch-$build -case $arch in x86_64) libdir=lib64 ;; *) libdir=lib ;; esac -if [ $# -eq 0 ] ; then - opt_download=1 ; opt_config=1 ; opt_build=1 ; opt_package=1 +if [ -f functions ] ; then + source ./functions +elif [ ! -f /usr/share/plamo/functions ] ; then + wget ftp://plamo.linet.gr.jp/pub/Plamo-src/admin/functions + source ./functions else - opt_download=0 ; opt_config=0 ; opt_build=0 ; opt_package=0 - for i in $@ ; do - case $i in - download) opt_download=1 ;; - config) opt_config=1 ;; - build) opt_build=1 ;; - package) opt_package=1 ;; - esac - done + source /usr/share/plamo/functions fi + +fscheck +prepare "$@" if [ $opt_download -eq 1 ] ; then - for i in $url ; do - if [ ! -f ${i##*/} ] ; then wget $i ; fi - done - for i in $url ; do - case ${i##*.} in - tar) tar xvpf ${i##*/} ;; - gz) tar xvpzf ${i##*/} ;; - bz2) tar xvpjf ${i##*/} ;; - xz) tar xvpJf ${i##*/} ;; - esac - done + download_sources fi if [ $opt_config -eq 1 ] ; then 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 + apply_patches for i in `seq 0 $((${#B[@]} - 1))` ; do cd ${B[$i]} - if [ -f Makefile ] ; then - make clean - fi - if [ -f config.log ] ; then - 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 @@ -224,12 +54,7 @@ done fi if [ $opt_package -eq 1 ] ; then - if [ `id -u` -ne 0 ] ; then - read -p "Do you want to package as root? [y/N] " ans - if [ "x$ans" == "xY" -o "x$ans" == "xy" ] ; then - cd $W ; /bin/su -c "$0 package" ; exit - fi - fi + root_priv if [ -d $P ] ; then rm -rf $P ; fi ; mkdir -p $P if [ -d $C ] ; then rm -rf $C ; fi ; mkdir -p $C touch $W/i.st ; sleep 1 @@ -258,24 +83,8 @@ find $P ! -type l -newer i.st ! -newer i.et \ -exec touch -t `date '+%m%d0900'` {} \; compress - for i in `seq 0 $((${#DOCS[@]} - 1))` ; do - for j in ${DOCS[$i]} ; do - for k in ${S[$i]}/$j ; do - install2 $k $docdir/${src[$i]}/${k#${S[$i]}/} - touch -r $k $docdir/${src[$i]}/${k#${S[$i]}/} - gzip_one $docdir/${src[$i]}/${k#${S[$i]}/} - done - done - if [ $i -eq 0 ] ; then - install $myname $docdir/$src - touch -t `date '+%m%d0900'` $docdir/$src/$myname - gzip_one $docdir/$src/$myname - else - ln $docdir/$src/$myname.gz $docdir/${src[$i]} - fi - ( cd $docdir ; find ${src[$i]} -type d -exec touch -r $W/{} {} \; ) - done - convert + setup_docdir + convert_links tar cvpf $pkg.tar -C $P `cd $P ; find usr/bin | tail -n+2` tar rvpf $pkg.tar -C $P `cd $P ; find usr/share/locale -name "*.mo"` tar rvpf $pkg.tar -C $P var/mlocate @@ -287,6 +96,5 @@ tar rvpf $pkg.tar -C $P usr/share/doc/$src touch -t `date '+%m%d0900'` $pkg.tar ; xz $pkg.tar ; touch $pkg.tar.xz mv $pkg.tar.xz $pkg.txz - read -p "Do you want to keep work files? [y/N] " ans - if [ "x$ans" != "xY" -a "x$ans" != "xy" ] ; then rm -rf $P $C i.[se]t ; fi + cleanup fi --- plamo/00_base/old/pciutils-20160115/PlamoBuild.pciutils-3.1.8 2016-01-15 17:27:48.000000000 +0900 +++ plamo/00_base/pciutils/PlamoBuild.pciutils-3.1.8 2016-04-02 18:33:35.000000000 +0900 @@ -6,7 +6,7 @@ pkgbase=pciutils vers=3.1.8 arch=`uname -m` -build=P3 +build=P4 src=$pkgbase-$vers OPT_CONFIG="" DOCS="TODO README ChangeLog README.Windows COPYING" @@ -277,6 +277,7 @@ tar rvpf $pkg.tar -C $P `cd $P ; find usr/share/man/man7 | 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 mv $pkg.tar.xz $pkg.txz read -p "Do you want to keep work files? [y/N] " ans --- plamo/00_base/old/procinfo_ng-20160115/PlamoBuild.procinfo_ng-2.0.304 2016-01-15 15:40:01.000000000 +0900 +++ plamo/00_base/procinfo_ng/PlamoBuild.procinfo_ng-2.0.304 2016-04-09 21:10:53.000000000 +0900 @@ -5,7 +5,7 @@ pkgbase=procinfo_ng vers=2.0.304 arch=`uname -m` -build=P2 +build=P3 src=procinfo-ng-$vers OPT_CONFIG="" DOCS="GPL-2.txt LICENSE.txt LGPL-2.1.txt" --- plamo/00_base/old/procps_ng-20160115/PlamoBuild.procps_ng-3.3.7 2016-01-15 17:25:11.000000000 +0900 +++ plamo/00_base/procps_ng/PlamoBuild.procps_ng-3.3.11 2016-04-08 15:09:37.000000000 +0900 @@ -1,16 +1,15 @@ #!/bin/sh ###################################################################### -url="http://downloads.sourceforge.net/procps-ng/procps-ng-3.3.7.tar.xz" +url="http://downloads.sourceforge.net/procps-ng/procps-ng-3.3.11.tar.xz" pkgbase=procps_ng -vers=3.3.7 +vers=3.3.11 arch=`uname -m` build=P2 src=procps-ng-$vers OPT_CONFIG="--exec-prefix= --disable-kill --enable-skill" -DOCS="README NEWS `echo Documentation/{CodingStyle,FAQ,BUGS,TODO}` - AUTHORS COPYING ChangeLog top/README.top ABOUT-NLS INSTALL - COPYING.LIB" +DOCS="AUTHORS NEWS COPYING ABOUT-NLS ChangeLog COPYING.LIB + `echo Documentation/{CodingStyle.md,FAQ,TODO,bugs.md}`" ###################################################################### fscheck() { @@ -264,13 +263,14 @@ ( cd $docdir ; find ${src[$i]} -type d -exec touch -r $W/{} {} \; ) done convert - tar cvpf $pkg.tar -C $P `cd $P ; find usr/bin | 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 ! -name pkgconfig | tail -n+2` tar rvpf $pkg.tar -C $P usr/include/proc + 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/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 --- plamo/00_base/old/readline-20160403/PlamoBuild.readline-6.3.8 2016-04-03 13:32:45.000000000 +0900 +++ plamo/00_base/readline/PlamoBuild.readline-6.3.8 2016-08-27 18:10:21.000000000 +0900 @@ -13,8 +13,9 @@ pkgbase=readline vers=6.3 arch=`uname -m` -build=P2 +build=P3 src=$pkgbase-$vers +patchfiles="" OPT_CONFIG="--with-curses" DOCS="COPYING README MANIFEST INSTALL CHANGELOG CHANGES NEWS USAGE" ###################################################################### @@ -193,13 +194,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 @@ -207,6 +230,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 + 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 cd $B patch -Np0 -i $W/readline63-001 patch -Np0 -i $W/readline63-002 @@ -225,8 +259,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 @@ -257,6 +291,7 @@ done install -d $P/usr/$libdir rm $P/$libdir/lib{history,readline}.so + touch $P/$libdir/lib{history,readline}.so ln -s /$libdir/libhistory.so.6 $P/usr/$libdir/libhistory.so ln -s /$libdir/libreadline.so.6 $P/usr/$libdir/libreadline.so touch $W/i.et @@ -282,6 +317,7 @@ ( cd $docdir ; find ${src[$i]} -type d -exec touch -r $W/{} {} \; ) done convert + rm $P/$libdir/lib{history,readline}.so tar cvpf $pkg.tar -C $P `cd $P ; find $libdir | tail -n+2` tar rvpf $pkg.tar -C $P `cd $P ; find usr/$libdir | tail -n+2` tar rvpf $pkg.tar -C $P usr/include/readline --- plamo/00_base/old/sed-20160116/PlamoBuild.sed-4.2.1 2016-01-16 08:11:04.000000000 +0900 +++ plamo/00_base/sed/PlamoBuild.sed-4.2.2 2016-03-17 15:20:12.000000000 +0900 @@ -1,16 +1,15 @@ #!/bin/sh ###################################################################### -url="http://ftp.gnu.org/gnu/sed/sed-4.2.1.tar.gz - http://sources.debian.net/data/main/s/sed/4.2.1-7/debian/patches/debian-changes-4.2.1-7" +url="http://ftp.gnu.org/gnu/sed/sed-4.2.2.tar.gz" pkgbase=sed -vers=4.2.1 +vers=4.2.2 arch=`uname -m` -build=P4 +build=P2 src=$pkgbase-$vers OPT_CONFIG="--bindir=/bin" -DOCS="COPYING.DOC INSTALL README README-alpha README.boot THANKS - AUTHORS COPYING ChangeLog ABOUT-NLS BUGS NEWS" +DOCS="COPYING.DOC INSTALL README README-alpha THANKS AUTHORS COPYING + ChangeLog ABOUT-NLS BUGS NEWS" ###################################################################### fscheck() { @@ -201,8 +200,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/debian-changes-4.2.1-7 for i in `seq 0 $((${#B[@]} - 1))` ; do cd ${B[$i]} if [ -f Makefile ] ; then --- plamo/00_base/old/shadow-20160323/PlamoBuild.shadow-git_20130908 2016-03-23 16:42:56.000000000 +0900 +++ plamo/00_base/shadow/PlamoBuild.shadow-git_20130908 2017-02-27 13:11:05.000000000 +0900 @@ -2,15 +2,18 @@ ###################################################################### url="https://github.com/shadow-maint/shadow.git - ftp://plamo.linet.gr.jp/pub/Plamo-src.new/plamo/00_base/shadow/shadow-adduser-20160122" + ftp://plamo.linet.gr.jp/pub/Plamo-src/plamo/00_base/shadow/CVE-2017-2616.patch.gz + ftp://plamo.linet.gr.jp/pub/Plamo-src/plamo/00_base/shadow/shadow-adduser-20160122" pkgbase=shadow vers=git_20130908 arch=`uname -m` -build=P5 +build=P6 src=$pkgbase -OPT_CONFIG="--sysconfdir=/etc --enable-man --without-selinux - --with-libcrack" +patchfiles="CVE-2017-2616.patch.gz" +OPT_CONFIG="--enable-man --without-selinux --with-libcrack" DOCS="COPYING ChangeLog NEWS README TODO" +template=20170204 +tmplurl=ftp://plamo.linet.gr.jp/pub/Plamo-src/admin ###################################################################### fscheck() { @@ -190,14 +193,38 @@ case ${i##*.} in git) if [ ! -d `basename ${i##*/} .git` ] ; then git clone $i ; else ( cd `basename ${i##*/} .git` ; git pull origin master ) ; fi ;; - *) 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 + ;; esac 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##*/} ;; git) ( cd `basename ${i##*/} .git` git checkout origin/master ; git reset --hard 578947e git set-file-times ) ;; @@ -208,6 +235,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 + 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 cd $B cp -p etc/pam.d/chfn etc/pam.d/chfn.orig cat <<- "EOF" | patch etc/pam.d/chfn @@ -338,8 +376,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 @@ -396,9 +434,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 --- plamo/00_base/old/sudo-20160116/PlamoBuild.sudo-1.8.15 2016-01-16 11:11:57.000000000 +0900 +++ plamo/00_base/sudo/PlamoBuild.sudo-1.8.15 2016-06-07 14:15:45.000000000 +0900 @@ -5,7 +5,7 @@ pkgbase=sudo vers=1.8.15 arch=`uname -m` -build=P2 +build=P3 src=$pkgbase-$vers OPT_CONFIG="--with-pam --without-sendmail --with-env-editor --with-all-insults --with-hal-insults --with-secure-path" @@ -188,13 +188,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 @@ -211,8 +233,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 @@ -281,10 +303,11 @@ convert touch -t `date '+%m%d0900'` $P/usr/libexec/sudo cat <<- "EOF" >> $P/install/doinst.sh + + mv etc/sudoers.new /tmp if [ -f etc/sudoers ] ; then - rm etc/sudoers.new + mv /tmp/sudoers.new etc/sudoers.dist else - mv etc/sudoers.new /tmp mv /tmp/sudoers.new etc/sudoers fi EOF --- plamo/00_base/old/sysfsutils-20160116/PlamoBuild.sysfsutils-2.1.0 2016-01-16 16:05:05.000000000 +0900 +++ plamo/00_base/sysfsutils/PlamoBuild.sysfsutils-2.1.0 2016-08-27 20:08:51.000000000 +0900 @@ -1,12 +1,14 @@ #!/bin/sh ###################################################################### -url="http://downloads.sourceforge.net/linux-diag/sysfsutils-2.1.0.tar.gz" +url="http://downloads.sourceforge.net/linux-diag/sysfsutils-2.1.0.tar.gz + ftp://plamo.linet.gr.jp/pub/Plamo-src.new/plamo/00_base/sysfsutils/sysfs_get_link.patch" pkgbase=sysfsutils vers=2.1.0 arch=`uname -m` -build=P3 +build=P4 src=$pkgbase-$vers +patchfiles="sysfs_get_link.patch" OPT_CONFIG="" DOCS="TODO NEWS INSTALL README COPYING CREDITS AUTHORS docs/libsysfs.txt ChangeLog" @@ -186,13 +188,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,6 +226,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 @@ -209,8 +244,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 --- plamo/00_base/old/syslinux-20160119/PlamoBuild.syslinux-6.03 2016-01-19 20:02:32.000000000 +0900 +++ plamo/00_base/syslinux/PlamoBuild.syslinux-6.03 2016-03-23 20:36:22.000000000 +0900 @@ -2,6 +2,9 @@ ###################################################################### url="https://www.kernel.org/pub/linux/utils/boot/syslinux/syslinux-6.03.tar.xz + http://git.yoctoproject.org/cgit.cgi/poky/plain/meta/recipes-devtools/syslinux/syslinux/syslinux-fix-parallel-building-issue.patch + http://git.yoctoproject.org/cgit.cgi/poky/plain/meta/recipes-devtools/syslinux/syslinux/syslinux-libupload-depend-lib.patch + http://git.yoctoproject.org/cgit.cgi/poky/plain/meta/recipes-devtools/syslinux/syslinux/syslinux-remove-clean-script.patch http://www.nasm.us/pub/nasm/releasebuilds/2.11.08/nasm-2.11.08.tar.xz" pkgbase=syslinux vers=6.03 @@ -205,6 +208,14 @@ ./configure --prefix=$W/nasm make install PATH="$W/nasm/bin:$PATH" + cd $B + patch -Np1 -i $W/syslinux-fix-parallel-building-issue.patch + patch -Np1 -i $W/syslinux-libupload-depend-lib.patch + patch -Np1 -i $W/syslinux-remove-clean-script.patch + if [ $arch == i686 ] ; then + cp -p Makefile{,.orig} + sed -i '/^all_firmware/s@ efi64@@' Makefile + fi for i in `seq 0 $((${#B[@]} - 1))` ; do cd ${B[$i]} if [ -f Makefile ] ; then --- plamo/00_base/old/sysvinit-20160323/PlamoBuild.sysvinit-2.88dsf 2016-03-23 17:48:11.000000000 +0900 +++ plamo/00_base/sysvinit/PlamoBuild.sysvinit-2.88dsf 2016-09-08 21:00:03.000000000 +0900 @@ -2,12 +2,13 @@ ###################################################################### url="http://download.savannah.gnu.org/releases/sysvinit/sysvinit-2.88dsf.tar.bz2 - ftp://plamo.linet.gr.jp/pub/Plamo-src.new/plamo/00_base/sysvinit/plamo-rc-scripts-20160208.tgz" + ftp://plamo.linet.gr.jp/pub/Plamo-src.new/plamo/00_base/sysvinit/plamo-rc-scripts-20160908.tgz" pkgbase=sysvinit vers=2.88dsf arch=`uname -m` -build=P16 +build=P18 src=$pkgbase-$vers +patchfiles="" OPT_CONFIG="" DOCS="doc/bootlogd.README doc/Install doc/Changelog doc/Propaganda COPYING COPYRIGHT Makefile README" @@ -187,14 +188,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##*/} ;; - tgz) 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 @@ -204,6 +226,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 @@ -211,8 +244,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 --- plamo/00_base/old/tar-20160408/PlamoBuild.tar-1.26 2016-04-08 19:38:20.000000000 +0900 +++ plamo/00_base/tar/PlamoBuild.tar-1.26 2016-11-24 09:05:00.000000000 +0900 @@ -1,18 +1,21 @@ #!/bin/sh ###################################################################### -url="http://ftp.gnu.org/gnu/tar/tar-1.26.tar.gz - ftp://plamo.linet.gr.jp/pub/Plamo-src.new/plamo/00_base/tar/tar-1.23-tartime.patch.gz - ftp://plamo.linet.gr.jp/pub/Plamo-src.new/plamo/00_base/tar/tar-1.23-txz.patch.gz - ftp://plamo.linet.gr.jp/pub/Plamo-src.new/plamo/00_base/tar/tar-1.26-no-gets.patch.gz" +url="http://ftp.gnu.org/gnu/tar/tar-1.26.tar.xz + ftp://plamo.linet.gr.jp/pub/Plamo-src/plamo/00_base/tar/tar-1.23-tartime.patch.gz + ftp://plamo.linet.gr.jp/pub/Plamo-src/plamo/00_base/tar/tar-1.23-txz.patch.gz + ftp://plamo.linet.gr.jp/pub/Plamo-src/plamo/00_base/tar/tar-1.26-no-gets.patch.gz" pkgbase=tar vers=1.26 arch=`uname -m` -build=P2 +build=P3 src=$pkgbase-$vers +patchfiles="`echo tar-1.2{3-{tartime,txz},6-no-gets}.patch.gz`" OPT_CONFIG="" DOCS="NEWS TODO README THANKS ChangeLog.1 AUTHORS INSTALL ABOUT-NLS ChangeLog COPYING" +template=20161020 +tmplurl=ftp://plamo.linet.gr.jp/pub/Plamo-src/admin ###################################################################### fscheck() { @@ -189,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 @@ -203,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/tar-1.23-tartime.patch.gz | patch -Np1 -i - - gunzip -c $W/tar-1.23-txz.patch.gz | patch -Np1 -i - - gunzip -c $W/tar-1.26-no-gets.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 @@ -216,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 @@ -263,16 +295,30 @@ 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 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/libexec | tail -n+2` - tar rvpf $pkg.tar -C $P `cd $P ; find usr/share/locale -name tar.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/info | tail -n+2` tar rvpf $pkg.tar -C $P usr/share/doc/$src touch -t `date '+%m%d0900'` $pkg.tar ; xz $pkg.tar ; touch $pkg.tar.xz --- plamo/00_base/old/tcp_wrappers-20160403/PlamoBuild.tcp_wrappers-7.6.q 2016-04-03 08:59:16.000000000 +0900 +++ plamo/00_base/tcp_wrappers/PlamoBuild.tcp_wrappers-7.6.q 2016-06-07 14:34:48.000000000 +0900 @@ -6,7 +6,7 @@ pkgbase=tcp_wrappers vers=7.6.q arch=`uname -m` -build=P4 +build=P5 src=tcp_wrappers_7.6 OPT_CONFIG="" DOCS="README BLURB DISCLAIMER CHANGES README.IRIX README.NIS" @@ -186,13 +186,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 @@ -214,8 +236,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 @@ -264,7 +286,7 @@ install -m 644 $i.8 $mandir/man8 done install -d $P/etc - cat <<- "EOF" > $P/etc/hosts.allow.dist + cat <<- "EOF" > $P/etc/hosts.allow.new # # hosts.allow This file describes the names of the hosts which are # allowed to use the local INET services, as decided by @@ -278,7 +300,7 @@ ALL : LOCAL # End of hosts.allow. EOF - cat <<- "EOF" > $P/etc/hosts.deny.dist + cat <<- "EOF" > $P/etc/hosts.deny.new # # hosts.deny This file describes the names of the hosts which are # *not* allowed to use the local INET services, as decided @@ -315,14 +337,14 @@ ( cd $docdir ; find ${src[$i]} -type d -exec touch -r $W/{} {} \; ) done convert - install -d $P/install cat <<- "EOF" >> $P/install/doinst.sh + hosts_config() { + mv etc/hosts.$1.new /tmp if [ -f etc/hosts.$1 ] ; then - rm etc/hosts.$1.dist + mv /tmp/hosts.$1.new etc/hosts.$1.dist else - mv etc/hosts.$1.dist /tmp - mv /tmp/hosts.$1.dist etc/hosts.$1 + mv /tmp/hosts.$1.new etc/hosts.$1 fi } --- plamo/00_base/old/tcsh-20160126/PlamoBuild.tcsh-6.19.00 2016-01-26 13:00:32.000000000 +0900 +++ plamo/00_base/tcsh/PlamoBuild.tcsh-6.19.00 2016-04-09 21:13:31.000000000 +0900 @@ -5,7 +5,7 @@ pkgbase=tcsh vers=6.19.00 arch=`uname -m` -build=P2 +build=P3 src=$pkgbase-$vers OPT_CONFIG="" DOCS="BUGS Copyright FAQ Fixes NewThings Ported README README.imake --- plamo/00_base/old/timezone-20160609/PlamoBuild.timezone-2015g 2016-06-09 08:15:41.000000000 +0900 +++ plamo/00_base/timezone/PlamoBuild.timezone-2016f 2016-09-10 23:56:28.000000000 +0900 @@ -1,16 +1,18 @@ #!/bin/sh ###################################################################### -url="http://www.iana.org/time-zones/repository/releases/tzcode2015g.tar.gz - http://www.iana.org/time-zones/repository/releases/tzdata2015g.tar.gz +url="http://www.iana.org/time-zones/repository/releases/tzcode2016f.tar.gz + http://www.iana.org/time-zones/repository/releases/tzdata2016f.tar.gz ftp://plamo.linet.gr.jp/pub/Plamo-src.new/plamo/00_base/timezone/plamo_timeconfig.tar.gz" pkgbase=timezone -vers=2015g +vers=2016f arch=`uname -m` -build=P3 +build=P1 src=$pkgbase-$vers +patchfiles="" OPT_CONFIG="" -DOCS="CONTRIBUTING NEWS README Theory tz-art.htm tz-link.htm" +DOCS="CONTRIBUTING LICENSE NEWS README Theory tz-art.htm + tz-how-to.html tz-link.htm" ###################################################################### fscheck() { @@ -218,9 +220,9 @@ xz|txz) tar xvpJf ${i##*/} ;; esac done - mkdir timezone-2015g - tar xvpzf tzcode2015g.tar.gz -C timezone-2015g - tar xvpzf tzdata2015g.tar.gz -C timezone-2015g + mkdir timezone-2016f + tar xvpzf tzcode2016f.tar.gz -C timezone-2016f + tar xvpzf tzdata2016f.tar.gz -C timezone-2016f tar xvpzf plamo_timeconfig.tar.gz fi if [ $opt_config -eq 1 ] ; then @@ -229,6 +231,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 @@ -269,6 +282,7 @@ done install -d $P/usr/sbin install $W/plamo_timeconfig/usr/sbin/timeconfig $P/usr/sbin + mv $P/usr/share/zoneinfo{,.new} install -d $P/var/log/setup for i in {,e}setup.timeconfig ; do install $W/plamo_timeconfig/var/log/setup/$i $P/var/log/setup @@ -298,9 +312,22 @@ touch -t `date '+%m%d0900'` $docdir/$src convert prune_symlink $P/usr/share + cat <<- "EOF" >> $P/install/doinst.sh + + if [ -h usr/share/zoneinfo/localtime ] ; then + ln -sf `readlink usr/share/zoneinfo/localtime` \ + usr/share/zoneinfo.new/localtime + fi + mkdir usr/share/zoneinfo.tmp + mv usr/share/zoneinfo.new usr/share/zoneinfo.tmp + rm -rf usr/share/zoneinfo + mv usr/share/zoneinfo.tmp/zoneinfo.new usr/share/zoneinfo + rmdir usr/share/zoneinfo.tmp + EOF + touch -t `date '+%m%d0900'` $P/install/doinst.sh tar cvpf $pkg.tar -C $P `cd $P ; find usr/sbin | tail -n+2` tar rvpf $pkg.tar -C $P `cd $P ; find usr/$libdir | tail -n+2` - tar rvpf $pkg.tar -C $P usr/share/zoneinfo{,-posix,-leaps} + tar rvpf $pkg.tar -C $P usr/share/zoneinfo{.new,-posix,-leaps} tar rvpf $pkg.tar -C $P var/log/setup 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` --- plamo/00_base/old/udev-20160119/PlamoBuild.udev-175 2016-01-19 08:49:58.000000000 +0900 +++ plamo/00_base/udev/PlamoBuild.udev-175 2016-11-20 17:07:07.000000000 +0900 @@ -1,16 +1,19 @@ #!/bin/sh ###################################################################### -url="http://ftp.kernel.org/pub/linux/utils/kernel/hotplug/udev-175.tar.bz2" +url="https://www.kernel.org/pub/linux/utils/kernel/hotplug/udev-175.tar.xz" pkgbase=udev vers=175 arch=`uname -m` -build=P2 +build=P3 src=$pkgbase-$vers -OPT_CONFIG="--libexecdir=/lib/udev --sysconfdir=/etc +patchfiles="" +OPT_CONFIG="--libexecdir=/lib/udev --enable-static --disable-introspection --enable-rule_generator" DOCS="README extras/keymap/README.keymap.txt INSTALL ChangeLog NEWS TODO COPYING" +template=20161020 +tmplurl=ftp://plamo.linet.gr.jp/pub/Plamo-src/admin ###################################################################### fscheck() { @@ -187,13 +190,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 @@ -203,6 +228,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 @@ -210,8 +246,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]} \ --with-rootlibdir=/$libdir fi @@ -264,9 +300,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 --- 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` --- plamo/00_base/old/xz-20160105/PlamoBuild.xz-5.0.3 2016-01-05 23:30:07.000000000 +0900 +++ plamo/00_base/xz/PlamoBuild.xz-5.2.2 2016-01-26 13:46:29.000000000 +0900 @@ -1,16 +1,16 @@ #!/bin/sh ###################################################################### -url="http://tukaani.org/xz/xz-5.0.3.tar.xz" +url="http://tukaani.org/xz/xz-5.2.2.tar.xz" pkgbase=xz -vers=5.0.3 +vers=5.2.2 arch=`uname -m` -build=P5 +build=P2 src=$pkgbase-$vers OPT_CONFIG="" DOCS="PACKAGERS INSTALL.generic COPYING.LGPLv2.1 COPYING.GPLv3 INSTALL - ChangeLog ABOUT-NLS TODO THANKS NEWS COPYING.GPLv2 COPYING AUTHORS - README" + ChangeLog ABOUT-NLS TODO THANKS README NEWS COPYING.GPLv2 COPYING + AUTHORS" ###################################################################### fscheck() { @@ -265,10 +265,11 @@ fi ( cd $docdir ; find ${src[$i]} -type d -exec touch -r $W/{} {} \; ) done - mv $docdir/xz/{{faq,history,{xz,lzma}-file-format}.txt,examples} $docdir/$src - mv $docdir/$src/{{faq,history,{xz,lzma}-file-format}.txt,examples} $C + mv $docdir/xz/{{faq,history,{xz,lzma}-file-format}.txt,examples*} \ + $docdir/$src + mv $docdir/$src/{{faq,history,{xz,lzma}-file-format}.txt,examples*} $C mv $docdir/$src/$myname.gz $C - mv $C/{{faq,history,{xz,lzma}-file-format}.txt,examples} $docdir/$src + mv $C/{{faq,history,{xz,lzma}-file-format}.txt,examples*} $docdir/$src mv $C/$myname.gz $docdir/$src touch -r $S $docdir/$src convert --- plamo/00_base/old/sysvinit-20160908/PlamoBuild.sysvinit-2.88dsf 2016-09-08 21:00:03.000000000 +0900 +++ plamo/00_base/sysvinit/PlamoBuild.sysvinit-2.88dsf 2017-05-02 11:05:13.000000000 +0900 @@ -2,247 +2,44 @@ ###################################################################### url="http://download.savannah.gnu.org/releases/sysvinit/sysvinit-2.88dsf.tar.bz2 - ftp://plamo.linet.gr.jp/pub/Plamo-src.new/plamo/00_base/sysvinit/plamo-rc-scripts-20160908.tgz" + ftp://plamo.linet.gr.jp/pub/Plamo-src/plamo/00_base/sysvinit/plamo-rc-scripts-20160908.tgz" +verify= +digest= +commitid= pkgbase=sysvinit vers=2.88dsf arch=`uname -m` -build=P18 +build=P19 src=$pkgbase-$vers patchfiles="" OPT_CONFIG="" -DOCS="doc/bootlogd.README doc/Install doc/Changelog doc/Propaganda +DOCS="`echo doc/{bootlogd.README,Install,Changelog,Propaganda}` COPYING COPYRIGHT Makefile README" +template=20170415 +tmplurl=ftp://plamo.linet.gr.jp/pub/Plamo-src/admin ###################################################################### -fscheck() { - PANGRAM="The quick brown fox jumps over the lazy dog." - echo -n "Checking for the filesystem ... " - mkdir pangram ; ( cd pangram ; touch $PANGRAM ) - mv pangram pangram~ ; mkdir pangram ; touch -r pangram~ pangram - tar cpf pangram.tar pangram ; rmdir pangram ; mv pangram~ pangram - for i in $PANGRAM ; do tar rpf pangram.tar pangram/$i ; done - touch -t `date '+%m%d0900'` pangram.tar ; gzip pangram.tar - touch pangram.tar.gz ; mv pangram.tar.gz pangram1.tgz - tar cpf pangram.tar pangram - touch -t `date '+%m%d0900'` pangram.tar ; gzip pangram.tar - touch pangram.tar.gz ; mv pangram.tar.gz pangram2.tgz - if cmp -s pangram1.tgz pangram2.tgz ; then - echo "OK" - rm -rf pangram pangram1.tgz pangram2.tgz - else - echo "NG" - cat <<- "EOF" - Hmm, packaging may not be done properly on this filesystem. - Would you please try again on a default filesystem, thanks! - - Happy packaging!! - - Quitting... - EOF - exit - fi -} - -install2() { - install -d ${2%/*} ; install -m 644 $1 $2 -} - -strip_bindir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - shopt -s nullglob - cd $1 - for i in * ; do - echo "$i" - if [ -h $i ] ; then continue ; fi - if [ -n "`file $i | grep "not stripped"`" ] ; then - echo "stripping -p $i" - strip -p $i - fi - done - ) fi -} - -strip_libdir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - shopt -s nullglob - cd $1 - for i in *.so *.so.* *.a ; do - echo "$i" - if [ -h $i ] ; then continue ; fi - if [ -n "`nm -a $i | grep " a "`" ] ; then - if [ $i != ${i%.a} ] ; then - echo -n "ranlib and " - touch -r $i $i.mt ; ranlib $i ; touch -r $i.mt $i ; rm $i.mt - fi - echo "stripping -gp $i" - strip -gp $i - fi - done - ) fi -} - -gzip_dir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - cd $1 - files=`ls -f --indicator-style=none | sed '/^\.\{1,2\}$/d'` - for i in $files ; do - echo "$i" - if [ ! -f $i -a ! -h $i -o $i != ${i%.gz} ] ; then continue ; fi - lnks=`ls -l $i | awk '{print $2}'` - if [ $lnks -gt 1 ] ; then - inum=`ls -i $i | awk '{print $1}'` - for j in `find . -maxdepth 1 -inum $inum` ; do - if [ ${j#./} == $i ] ; then - gzip -f $i - else - rm -f ${j#./} ; ln $i.gz ${j#./}.gz - fi - done - elif [ -h $i ] ; then - target=`readlink $i` ; rm -f $i ; ln -s $target.gz $i.gz - else - gzip $i - fi - done - for i in $files ; do mv ${i%.gz}.gz $C ; done - for i in $files ; do mv $C/${i%.gz}.gz . ; done - ) fi -} - -gzip_one() { - gzip $1 ; mv $1.gz $C ; mv $C/${1##*/}.gz ${1%/*} -} - -compress() { - for i in {$P,$P/usr}/{sbin,bin} ; do strip_bindir $i ; done - for i in {$P,$P/usr}/$libdir ; do strip_libdir $i ; done - if [ -f $infodir/dir ] ; then rm -f $infodir/dir ; fi - gzip_dir $infodir - for i in `seq 9` n ; do gzip_dir $mandir/man$i ; done -} - -prune_symlink() { - echo "pruning symlink in $1" - if [ -d $1 ] ; then ( - cd $P - rm -f /tmp/iNsT-a.$$ ; touch /tmp/iNsT-a.$$ - for i in `find ${1#$P/} -type l` ; do - target=`readlink $i` - echo "$i -> $target" - echo $i$'\n'$target >> /tmp/iNsT-a.$$ - done - COUNT=1 - LINE=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - while [ -n "$LINE" ] ; do - LINKGOESIN=`dirname $LINE` - LINKNAMEIS=`basename $LINE` - COUNT=$(($COUNT + 1)) - LINKPOINTSTO=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - if [ ! -d install ] ; then mkdir install ; fi - cat <<- EOF >> install/doinst.sh - ( cd $LINKGOESIN ; rm -rf $LINKNAMEIS ) - ( cd $LINKGOESIN ; ln -sf $LINKPOINTSTO $LINKNAMEIS ) - EOF - rm -rf $LINE ; touch -t `date '+%m%d0900'` install/doinst.sh $LINE - COUNT=$(($COUNT + 1)) - LINE=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - done - rm -f /tmp/iNsT-a.$$ - ) fi -} - -convert() { - for i in {$P,$P/usr}/{sbin,bin} ; do prune_symlink $i ; done - for i in {$P,$P/usr}/$libdir ; do prune_symlink $i ; done - prune_symlink $infodir - for i in `seq 9` n ; do prune_symlink $mandir/man$i ; done -} - -fscheck -W=`pwd` -for i in `seq 0 $((${#src[@]} - 1))` ; do - S[$i]=$W/${src[$i]} ; B[$i]=$W/build`test ${#src[@]} -eq 1 || echo $i` -done -P=$W/work ; C=$W/pivot -infodir=$P/usr/share/info -mandir=$P/usr/share/man -docdir=$P/usr/share/doc -myname=`basename $0` -pkg=$pkgbase-$vers-$arch-$build -case $arch in x86_64) libdir=lib64 ;; *) libdir=lib ;; esac -if [ $# -eq 0 ] ; then - opt_download=1 ; opt_config=1 ; opt_build=1 ; opt_package=1 +if [ -f functions ] ; then + source ./functions +elif [ ! -f /usr/share/plamo/functions ] ; then + wget ftp://plamo.linet.gr.jp/pub/Plamo-src/admin/functions + source ./functions else - opt_download=0 ; opt_config=0 ; opt_build=0 ; opt_package=0 - for i in $@ ; do - case $i in - download) opt_download=1 ;; - config) opt_config=1 ;; - build) opt_build=1 ;; - package) opt_package=1 ;; - esac - done + source /usr/share/plamo/functions fi + +fscheck +prepare "$@" if [ $opt_download -eq 1 ] ; then - for i in $url ; do - 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|tgz) tar xvpzf ${i##*/} ;; - bz2|tbz) tar xvpjf ${i##*/} ;; - xz|txz) tar xvpJf ${i##*/} ;; - esac - done + download_sources fi if [ $opt_config -eq 1 ] ; then 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 + apply_patches 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 - if [ -f config.log ] ; then - rm -rf config.cache config.log - fi if [ -x configure ] ; then ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --libdir='${exec_prefix}'/$libdir --infodir='${prefix}'/share/info \ @@ -259,12 +56,7 @@ done fi if [ $opt_package -eq 1 ] ; then - if [ `id -u` -ne 0 ] ; then - read -p "Do you want to package as root? [y/N] " ans - if [ "x$ans" == "xY" -o "x$ans" == "xy" ] ; then - cd $W ; /bin/su -c "$0 package" ; exit - fi - fi + root_priv if [ -d $P ] ; then rm -rf $P ; fi ; mkdir -p $P if [ -d $C ] ; then rm -rf $C ; fi ; mkdir -p $C touch $W/i.st ; sleep 1 @@ -303,29 +95,13 @@ compress cp -a etc $P chown -R root.root $P/etc - for i in `seq 0 $((${#DOCS[@]} - 1))` ; do - for j in ${DOCS[$i]} ; do - for k in ${S[$i]}/$j ; do - install2 $k $docdir/${src[$i]}/${k#${S[$i]}/} - touch -r $k $docdir/${src[$i]}/${k#${S[$i]}/} - gzip_one $docdir/${src[$i]}/${k#${S[$i]}/} - done - done - if [ $i -eq 0 ] ; then - install $myname $docdir/$src - touch -t `date '+%m%d0900'` $docdir/$src/$myname - gzip_one $docdir/$src/$myname - else - ln $docdir/$src/$myname.gz $docdir/${src[$i]} - fi - ( cd $docdir ; find ${src[$i]} -type d -exec touch -r $W/{} {} \; ) - done - convert + setup_docdir + convert_links prune_symlink $P/etc/rc.d touch -r etc/rc.d $P/etc/rc.d cat <<- EOF >> $P/install/doinst.sh #%% begin initialize $src - EOF + EOF cat <<- "EOF" >> $P/install/doinst.sh vers=`ls /usr/lib/setup/Plamo* | tail -n1 | cut -d"/" -f5` echo "%s %r ($vers) %v" > /etc/motd.in @@ -344,6 +120,5 @@ tar rvpf $pkg.tar -C $P install/doinst.sh touch -t `date '+%m%d0900'` $pkg.tar ; xz $pkg.tar ; touch $pkg.tar.xz mv $pkg.tar.xz $pkg.txz - read -p "Do you want to keep work files? [y/N] " ans - if [ "x$ans" != "xY" -a "x$ans" != "xy" ] ; then rm -rf $P $C i.[se]t ; fi + cleanup fi --- plamo/00_base/old/less-20160409/PlamoBuild.less-382 2016-04-09 20:52:10.000000000 +0900 +++ plamo/00_base/less/PlamoBuild.less-382 2017-04-07 16:07:12.000000000 +0900 @@ -8,204 +8,40 @@ ftp://ftp.jp.freebsd.org/pub/FreeBSD/ports/distfiles/less-382-iso260-261.patch.gz ftp://ftp.jp.freebsd.org/pub/FreeBSD/ports/distfiles/less-382-iso261-262.patch.gz ftp://ftp.jp.freebsd.org/pub/FreeBSD/ports/distfiles/less-382-iso262.ext03.patch.gz - ftp://plamo.linet.gr.jp/pub/Plamo-src.new/plamo/00_base/less/less-382-def_priority.patch.gz" + ftp://plamo.linet.gr.jp/pub/Plamo-src/plamo/00_base/less/less-382-def_priority.patch.gz" +verify= +commitid= pkgbase=less vers=382 arch=`uname -m` -build=P4 +build=P5 src=$pkgbase-$vers +patchfiles="" OPT_CONFIG="" DOCS="COPYING INSTALL LICENSE NEWS README" +template=20170323 +tmplurl=ftp://plamo.linet.gr.jp/pub/Plamo-src/admin ###################################################################### -fscheck() { - PANGRAM="The quick brown fox jumps over the lazy dog." - echo -n "Checking for the filesystem ... " - mkdir pangram ; ( cd pangram ; touch $PANGRAM ) - mv pangram pangram~ ; mkdir pangram ; touch -r pangram~ pangram - tar cpf pangram.tar pangram ; rmdir pangram ; mv pangram~ pangram - for i in $PANGRAM ; do tar rpf pangram.tar pangram/$i ; done - touch -t `date '+%m%d0900'` pangram.tar ; gzip pangram.tar - touch pangram.tar.gz ; mv pangram.tar.gz pangram1.tgz - tar cpf pangram.tar pangram - touch -t `date '+%m%d0900'` pangram.tar ; gzip pangram.tar - touch pangram.tar.gz ; mv pangram.tar.gz pangram2.tgz - if cmp -s pangram1.tgz pangram2.tgz ; then - echo "OK" - rm -rf pangram pangram1.tgz pangram2.tgz - else - echo "NG" - cat <<- "EOF" - Hmm, packaging may not be done properly on this filesystem. - Would you please try again on a default filesystem, thanks! - - Happy packaging!! - - Quitting... - EOF - exit - fi -} - -install2() { - install -d ${2%/*} ; install -m 644 $1 $2 -} - -strip_bindir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - shopt -s nullglob - cd $1 - for i in * ; do - echo "$i" - if [ -h $i ] ; then continue ; fi - if [ -n "`file $i | grep "not stripped"`" ] ; then - echo "stripping -p $i" - strip -p $i - fi - done - ) fi -} - -strip_libdir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - shopt -s nullglob - cd $1 - for i in *.so *.so.* *.a ; do - echo "$i" - if [ -h $i ] ; then continue ; fi - if [ -n "`nm -a $i | grep " a "`" ] ; then - if [ $i != ${i%.a} ] ; then - echo -n "ranlib and " - touch -r $i $i.mt ; ranlib $i ; touch -r $i.mt $i ; rm $i.mt - fi - echo "stripping -gp $i" - strip -gp $i - fi - done - ) fi -} - -gzip_dir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - cd $1 - files=`ls -f --indicator-style=none | sed '/^\.\{1,2\}$/d'` - for i in $files ; do - echo "$i" - if [ ! -f $i -a ! -h $i -o $i != ${i%.gz} ] ; then continue ; fi - lnks=`ls -l $i | awk '{print $2}'` - if [ $lnks -gt 1 ] ; then - inum=`ls -i $i | awk '{print $1}'` - for j in `find . -maxdepth 1 -inum $inum` ; do - if [ ${j#./} == $i ] ; then - gzip -f $i - else - rm -f ${j#./} ; ln $i.gz ${j#./}.gz - fi - done - elif [ -h $i ] ; then - target=`readlink $i` ; rm -f $i ; ln -s $target.gz $i.gz - else - gzip $i - fi - done - for i in $files ; do mv ${i%.gz}.gz $C ; done - for i in $files ; do mv $C/${i%.gz}.gz . ; done - ) fi -} - -gzip_one() { - gzip $1 ; mv $1.gz $C ; mv $C/${1##*/}.gz ${1%/*} -} - -compress() { - for i in {$P,$P/usr}/{sbin,bin} ; do strip_bindir $i ; done - for i in {$P,$P/usr}/$libdir ; do strip_libdir $i ; done - if [ -f $infodir/dir ] ; then rm -f $infodir/dir ; fi - gzip_dir $infodir - for i in `seq 9` n ; do gzip_dir $mandir/man$i ; done -} - -prune_symlink() { - echo "pruning symlink in $1" - if [ -d $1 ] ; then ( - cd $P - rm -f /tmp/iNsT-a.$$ ; touch /tmp/iNsT-a.$$ - for i in `find ${1#$P/} -type l` ; do - target=`readlink $i` - echo "$i -> $target" - echo $i$'\n'$target >> /tmp/iNsT-a.$$ - done - COUNT=1 - LINE=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - while [ -n "$LINE" ] ; do - LINKGOESIN=`dirname $LINE` - LINKNAMEIS=`basename $LINE` - COUNT=$(($COUNT + 1)) - LINKPOINTSTO=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - if [ ! -d install ] ; then mkdir install ; fi - cat <<- EOF >> install/doinst.sh - ( cd $LINKGOESIN ; rm -rf $LINKNAMEIS ) - ( cd $LINKGOESIN ; ln -sf $LINKPOINTSTO $LINKNAMEIS ) - EOF - rm -rf $LINE ; touch -t `date '+%m%d0900'` install/doinst.sh $LINE - COUNT=$(($COUNT + 1)) - LINE=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - done - rm -f /tmp/iNsT-a.$$ - ) fi -} - -convert() { - for i in {$P,$P/usr}/{sbin,bin} ; do prune_symlink $i ; done - for i in {$P,$P/usr}/$libdir ; do prune_symlink $i ; done - prune_symlink $infodir - for i in `seq 9` n ; do prune_symlink $mandir/man$i ; done -} - -fscheck -W=`pwd` -for i in `seq 0 $((${#src[@]} - 1))` ; do - S[$i]=$W/${src[$i]} ; B[$i]=$W/build`test ${#src[@]} -eq 1 || echo $i` -done -P=$W/work ; C=$W/pivot -infodir=$P/usr/share/info -mandir=$P/usr/share/man -docdir=$P/usr/share/doc -myname=`basename $0` -pkg=$pkgbase-$vers-$arch-$build -case $arch in x86_64) libdir=lib64 ;; *) libdir=lib ;; esac -if [ $# -eq 0 ] ; then - opt_download=1 ; opt_config=1 ; opt_build=1 ; opt_package=1 +if [ -f functions ] ; then + source ./functions +elif [ ! -f /usr/share/plamo/functions ] ; then + wget ftp://plamo.linet.gr.jp/pub/Plamo-src/admin/functions + source ./functions else - opt_download=0 ; opt_config=0 ; opt_build=0 ; opt_package=0 - for i in $@ ; do - case $i in - download) opt_download=1 ;; - config) opt_config=1 ;; - build) opt_build=1 ;; - package) opt_package=1 ;; - esac - done + source /usr/share/plamo/functions fi + +fscheck +prepare "$@" if [ $opt_download -eq 1 ] ; then - for i in $url ; do - if [ ! -f ${i##*/} ] ; then wget $i ; fi - done - for i in $url ; do - case ${i##*.} in - tar) tar xvpf ${i##*/} ;; - gz) tar xvpzf ${i##*/} ;; - bz2) tar xvpjf ${i##*/} ;; - esac - done + download_sources fi if [ $opt_config -eq 1 ] ; then 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 + apply_patches cd $B gunzip -c $W/less-382-iso258.patch.gz | patch -Np1 -fT -i - gunzip -c $W/less-382-iso258-259.patch.gz | patch -Np1 -i - @@ -221,15 +57,9 @@ -e '/\/mkinstalldirs/s@\${mandir@$(DESTDIR)&@g' Makefile.in for i in `seq 0 $((${#B[@]} - 1))` ; do cd ${B[$i]} - if [ -f Makefile ] ; then - make clean - fi - if [ -f config.log ] ; then - 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 @@ -243,12 +73,7 @@ done fi if [ $opt_package -eq 1 ] ; then - if [ `id -u` -ne 0 ] ; then - read -p "Do you want to package as root? [y/N] " ans - if [ "x$ans" == "xY" -o "x$ans" == "xy" ] ; then - cd $W ; /bin/su -c "$0 package" ; exit - fi - fi + root_priv if [ -d $P ] ; then rm -rf $P ; fi ; mkdir -p $P if [ -d $C ] ; then rm -rf $C ; fi ; mkdir -p $C touch $W/i.st ; sleep 1 @@ -321,23 +146,7 @@ find $P ! -type l -newer i.st ! -newer i.et \ -exec touch -t `date '+%m%d0900'` {} \; compress - for i in `seq 0 $((${#DOCS[@]} - 1))` ; do - for j in ${DOCS[$i]} ; do - for k in ${S[$i]}/$j ; do - install2 $k $docdir/${src[$i]}/${k#${S[$i]}/} - touch -r $k $docdir/${src[$i]}/${k#${S[$i]}/} - gzip_one $docdir/${src[$i]}/${k#${S[$i]}/} - done - done - if [ $i -eq 0 ] ; then - install $myname $docdir/$src - touch -t `date '+%m%d0900'` $docdir/$src/$myname - gzip_one $docdir/$src/$myname - else - ln $docdir/$src/$myname.gz $docdir/${src[$i]} - fi - ( cd $docdir ; find ${src[$i]} -type d -exec touch -r $W/{} {} \; ) - done + setup_docdir cp -p $B/{LICENSE,README.{iso{,.jp},ext.jp}} $docdir/$src chmod 644 $docdir/$src/LICENSE chown root.root $docdir/$src/{LICENSE,README.{iso{,.jp},ext.jp}} @@ -347,15 +156,16 @@ for i in LICENSE README.{iso{,.jp},ext.jp} ; do gzip_one $docdir/$src/$i done - mv $docdir/$src/{README.{iso{,.jp},ext.jp},$myname}.gz $C - mv $C/{README.{iso{,.jp},ext.jp},$myname}.gz $docdir/$src + mv $docdir/$src/README.{iso{,.jp},ext.jp}.gz $C + mv $docdir/$src/{$func,$myname,$spec}.gz $C + mv $C/README.{iso{,.jp},ext.jp}.gz $docdir/$src + mv $C/{$func,$myname,$spec}.gz $docdir/$src touch -r $S $docdir/$src - convert + convert_links tar cvpf $pkg.tar -C $P `cd $P ; find usr/bin | tail -n+2` tar rvpf $pkg.tar -C $P `cd $P ; find usr/share/man/man1 | tail -n+2` tar rvpf $pkg.tar -C $P usr/share/doc/$src touch -t `date '+%m%d0900'` $pkg.tar ; xz $pkg.tar ; touch $pkg.tar.xz mv $pkg.tar.xz $pkg.txz - read -p "Do you want to keep work files? [y/N] " ans - if [ "x$ans" != "xY" -a "x$ans" != "xy" ] ; then rm -rf $P $C i.[se]t ; fi + cleanup fi --- plamo/00_base/old/shadow-20170227/PlamoBuild.shadow-git_20130908 2017-02-27 13:11:05.000000000 +0900 +++ plamo/00_base/shadow/PlamoBuild.shadow-git_20130908 2017-04-30 17:46:49.000000000 +0900 @@ -4,248 +4,40 @@ url="https://github.com/shadow-maint/shadow.git ftp://plamo.linet.gr.jp/pub/Plamo-src/plamo/00_base/shadow/CVE-2017-2616.patch.gz ftp://plamo.linet.gr.jp/pub/Plamo-src/plamo/00_base/shadow/shadow-adduser-20160122" +verify= +digest= +commitid[0]=578947e pkgbase=shadow vers=git_20130908 arch=`uname -m` -build=P6 +build=P7 src=$pkgbase patchfiles="CVE-2017-2616.patch.gz" OPT_CONFIG="--enable-man --without-selinux --with-libcrack" DOCS="COPYING ChangeLog NEWS README TODO" -template=20170204 +template=20170415 tmplurl=ftp://plamo.linet.gr.jp/pub/Plamo-src/admin ###################################################################### -fscheck() { - PANGRAM="The quick brown fox jumps over the lazy dog." - echo -n "Checking for the filesystem ... " - mkdir pangram ; ( cd pangram ; touch $PANGRAM ) - mv pangram pangram~ ; mkdir pangram ; touch -r pangram~ pangram - tar cpf pangram.tar pangram ; rmdir pangram ; mv pangram~ pangram - for i in $PANGRAM ; do tar rpf pangram.tar pangram/$i ; done - touch -t `date '+%m%d0900'` pangram.tar ; gzip pangram.tar - touch pangram.tar.gz ; mv pangram.tar.gz pangram1.tgz - tar cpf pangram.tar pangram - touch -t `date '+%m%d0900'` pangram.tar ; gzip pangram.tar - touch pangram.tar.gz ; mv pangram.tar.gz pangram2.tgz - if cmp -s pangram1.tgz pangram2.tgz ; then - echo "OK" - rm -rf pangram pangram1.tgz pangram2.tgz - else - echo "NG" - cat <<- "EOF" - Hmm, packaging may not be done properly on this filesystem. - Would you please try again on a default filesystem, thanks! - - Happy packaging!! - - Quitting... - EOF - exit - fi -} - -install2() { - install -d ${2%/*} ; install -m 644 $1 $2 -} - -strip_bindir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - shopt -s nullglob - cd $1 - for i in * ; do - echo "$i" - if [ -h $i ] ; then continue ; fi - if [ -n "`file $i | grep "not stripped"`" ] ; then - echo "stripping -p $i" - strip -p $i - fi - done - ) fi -} - -strip_libdir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - shopt -s nullglob - cd $1 - for i in *.so *.so.* *.a ; do - echo "$i" - if [ -h $i ] ; then continue ; fi - if [ -n "`nm -a $i | grep " a "`" ] ; then - if [ $i != ${i%.a} ] ; then - echo -n "ranlib and " - touch -r $i $i.mt ; ranlib $i ; touch -r $i.mt $i ; rm $i.mt - fi - echo "stripping -gp $i" - strip -gp $i - fi - done - ) fi -} - -gzip_dir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - cd $1 - files=`ls -f --indicator-style=none | sed '/^\.\{1,2\}$/d'` - for i in $files ; do - echo "$i" - if [ ! -f $i -a ! -h $i -o $i != ${i%.gz} ] ; then continue ; fi - lnks=`ls -l $i | awk '{print $2}'` - if [ $lnks -gt 1 ] ; then - inum=`ls -i $i | awk '{print $1}'` - for j in `find . -maxdepth 1 -inum $inum` ; do - if [ ${j#./} == $i ] ; then - gzip -f $i - else - rm -f ${j#./} ; ln $i.gz ${j#./}.gz - fi - done - elif [ -h $i ] ; then - target=`readlink $i` ; rm -f $i ; ln -s $target.gz $i.gz - else - gzip $i - fi - done - for i in $files ; do mv ${i%.gz}.gz $C ; done - for i in $files ; do mv $C/${i%.gz}.gz . ; done - ) fi -} - -gzip_one() { - gzip $1 ; mv $1.gz $C ; mv $C/${1##*/}.gz ${1%/*} -} - -compress() { - for i in {$P,$P/usr}/{sbin,bin} ; do strip_bindir $i ; done - for i in {$P,$P/usr}/$libdir ; do strip_libdir $i ; done - if [ -f $infodir/dir ] ; then rm -f $infodir/dir ; fi - gzip_dir $infodir - for i in `seq 9` n ; do gzip_dir $mandir/man$i ; done -} - -prune_symlink() { - echo "pruning symlink in $1" - if [ -d $1 ] ; then ( - cd $P - rm -f /tmp/iNsT-a.$$ ; touch /tmp/iNsT-a.$$ - for i in `find ${1#$P/} -type l` ; do - target=`readlink $i` - echo "$i -> $target" - echo $i$'\n'$target >> /tmp/iNsT-a.$$ - done - COUNT=1 - LINE=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - while [ -n "$LINE" ] ; do - LINKGOESIN=`dirname $LINE` - LINKNAMEIS=`basename $LINE` - COUNT=$(($COUNT + 1)) - LINKPOINTSTO=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - if [ ! -d install ] ; then mkdir install ; fi - cat <<- EOF >> install/doinst.sh - ( cd $LINKGOESIN ; rm -rf $LINKNAMEIS ) - ( cd $LINKGOESIN ; ln -sf $LINKPOINTSTO $LINKNAMEIS ) - EOF - rm -rf $LINE ; touch -t `date '+%m%d0900'` install/doinst.sh $LINE - COUNT=$(($COUNT + 1)) - LINE=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - done - rm -f /tmp/iNsT-a.$$ - ) fi -} - -convert() { - for i in {$P,$P/usr}/{sbin,bin} ; do prune_symlink $i ; done - for i in {$P,$P/usr}/$libdir ; do prune_symlink $i ; done - prune_symlink $infodir - for i in `seq 9` n ; do prune_symlink $mandir/man$i ; done -} - -fscheck -W=`pwd` -for i in `seq 0 $((${#src[@]} - 1))` ; do - S[$i]=$W/${src[$i]} ; B[$i]=$W/build`test ${#src[@]} -eq 1 || echo $i` -done -P=$W/work ; C=$W/pivot -infodir=$P/usr/share/info -mandir=$P/usr/share/man -docdir=$P/usr/share/doc -myname=`basename $0` -pkg=$pkgbase-$vers-$arch-$build -case $arch in x86_64) libdir=lib64 ;; *) libdir=lib ;; esac -if [ $# -eq 0 ] ; then - opt_download=1 ; opt_config=1 ; opt_build=1 ; opt_package=1 +if [ -f functions ] ; then + source ./functions +elif [ ! -f /usr/share/plamo/functions ] ; then + wget ftp://plamo.linet.gr.jp/pub/Plamo-src/admin/functions + source ./functions else - opt_download=0 ; opt_config=0 ; opt_build=0 ; opt_package=0 - for i in $@ ; do - case $i in - download) opt_download=1 ;; - config) opt_config=1 ;; - build) opt_build=1 ;; - package) opt_package=1 ;; - esac - done + source /usr/share/plamo/functions fi + +fscheck +prepare "$@" if [ $opt_download -eq 1 ] ; then - for i in $url ; do - case ${i##*.} in - git) if [ ! -d `basename ${i##*/} .git` ] ; then git clone $i ; else - ( cd `basename ${i##*/} .git` ; git pull origin master ) ; 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 - ;; - esac - done - for i in $url ; do - case ${i##*.} in - tar) tar xvpf ${i##*/} ;; - gz|tgz) tar xvpzf ${i##*/} ;; - bz2|tbz) tar xvpjf ${i##*/} ;; - xz|txz) tar xvpJf ${i##*/} ;; - git) ( cd `basename ${i##*/} .git` - git checkout origin/master ; git reset --hard 578947e - git set-file-times ) ;; - esac - done + download_sources fi if [ $opt_config -eq 1 ] ; then 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 - 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 + apply_patches cd $B cp -p etc/pam.d/chfn etc/pam.d/chfn.orig cat <<- "EOF" | patch etc/pam.d/chfn @@ -369,12 +161,6 @@ ./autogen.sh for i in `seq 0 $((${#B[@]} - 1))` ; do cd ${B[$i]} - if [ -f Makefile ] ; then - make clean - fi - if [ -f config.log ] ; then - rm -rf config.cache config.log - fi if [ -x configure ] ; then ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --libdir='${exec_prefix}'/$libdir --infodir='${prefix}'/share/info \ @@ -391,12 +177,7 @@ done fi if [ $opt_package -eq 1 ] ; then - if [ `id -u` -ne 0 ] ; then - read -p "Do you want to package as root? [y/N] " ans - if [ "x$ans" == "xY" -o "x$ans" == "xy" ] ; then - cd $W ; /bin/su -c "$0 package" ; exit - fi - fi + root_priv if [ -d $P ] ; then rm -rf $P ; fi ; mkdir -p $P if [ -d $C ] ; then rm -rf $C ; fi ; mkdir -p $C touch $W/i.st ; sleep 1 @@ -423,39 +204,9 @@ gzip_dir $P/usr/share/man/$loc/man5 gzip_dir $P/usr/share/man/$loc/man8 done - for i in `seq 0 $((${#DOCS[@]} - 1))` ; do - for j in ${DOCS[$i]} ; do - for k in ${S[$i]}/$j ; do - install2 $k $docdir/${src[$i]}/${k#${S[$i]}/} - touch -r $k $docdir/${src[$i]}/${k#${S[$i]}/} - gzip_one $docdir/${src[$i]}/${k#${S[$i]}/} - done - done - if [ $i -eq 0 ] ; then - install $myname $docdir/$src - touch -t `date '+%m%d0900'` $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 + setup_docdir touch -t `date '+%m%d0900'` $docdir/$src - convert + convert_links cat <<- EOF >> $P/install/doinst.sh #%% begin initialize $pkg EOF @@ -477,7 +228,7 @@ tar rvpf $pkg.tar -C $P etc/pam.d tar rvpf $pkg.tar -C $P etc/login.defs tar rvpf $pkg.tar -C $P etc/default - tar rvpf $pkg.tar -C $P `cd $P ; find usr/share/locale -name shadow.mo` + tar rvpf $pkg.tar -C $P `cd $P ; find usr/share/locale -name *.mo` for loc in cs da de fi fr hu id it ja_JP.eucJP ko pl pt_BR ru sv tr \ zh_CN zh_TW ; do [ -d $P/usr/share/man/$loc/man1 ] && tar rvpf $pkg.tar -C $P \ @@ -497,6 +248,5 @@ tar rvpf $pkg.tar -C $P install/doinst.sh touch -t `date '+%m%d0900'` $pkg.tar ; xz $pkg.tar ; touch $pkg.tar.xz mv $pkg.tar.xz $pkg.txz - read -p "Do you want to keep work files? [y/N] " ans - if [ "x$ans" != "xY" -a "x$ans" != "xy" ] ; then rm -rf $P $C i.[se]t ; fi + cleanup fi --- plamo/00_base/old/kernel-20160204/PlamoBuild.kernel-4.1.15_plamoRPi2 2016-02-04 17:54:58.000000000 +0900 +++ plamo/00_base/kernel/PlamoBuild.kernel-4.1.15_plamoRPi2 2016-02-19 08:11:19.000000000 +0900 @@ -13,7 +13,7 @@ pkgbase=kernel vers=4.1.15_plamoRPi2 arch=`uname -m` -build=P2 +build=P3 src=linux OPT_CONFIG="" DOCS="" @@ -292,8 +292,8 @@ install -m 644 $B/arch/arm/boot/dts/overlays/README $P/boot/overlays install -m 644 $B/arch/arm/boot/dts/overlays/*.dtb $P/boot/overlays install -m 644 $B/arch/arm/boot/dts/*.dtb $P/boot - ln -sf /usr/src/linux $P/lib/modules/$krel/source - ln -sf /usr/src/linux $P/lib/modules/$krel/build + ln -snf /usr/src/linux $P/lib/modules/$krel/source + ln -snf /usr/src/linux $P/lib/modules/$krel/build touch $W/i.et cd $W find $P ! -type l -newer i.st ! -newer i.et \ --- plamo/00_base/old/kernel-20160219/PlamoBuild.kernel-4.1.15_plamoRPi2 2016-02-19 08:11:19.000000000 +0900 +++ plamo/00_base/kernel/PlamoBuild.kernel-4.9.36_plamoRPi2 2017-07-27 11:35:43.000000000 +0900 @@ -1,224 +1,55 @@ #!/bin/sh -x ###################################################################### -url="https://github.com/raspberry/linux.git - ftp://plamo.linet.gr.jp/pub/Plamo-test/kernelsrc_patches/UNICON/vd_unicon-kernel-20150627-4.1.patch +url="https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.9.36.tar.xz + ftp://plamo.linet.gr.jp/pub/Plamo-test/kernelsrc_patches/UNICON/vd_unicon-kernel-20161217-4.9.patch ftp://plamo.linet.gr.jp/pub/Plamo-test/kernelsrc_patches/UNICON/vd_unicon-kernel-fonts-20140614.patch.bz2 https://github.com/sfjro/aufs4-standalone.git - ftp://plamo.linet.gr.jp/pub/Plamo-test/kernelsrc_patches/mcp/4.1-panic_beep.patch - ftp://plamo.linet.gr.jp/pub/Plamo-test/kernelsrc_patches/mcp/4.1-morse_code_panics.patch - ftp://plamo.linet.gr.jp/pub/Plamo-test/kernelsrc_patches/toi/tuxonice-for-linux-4.1.6-2015-08-22.patch.bz2 + ftp://plamo.linet.gr.jp/pub/Plamo-test/kernelsrc_patches/mcp/4.9-panic_beep.patch + ftp://plamo.linet.gr.jp/pub/Plamo-test/kernelsrc_patches/mcp/4.9-morse_code_panics.patch + ftp://plamo.linet.gr.jp/pub/Plamo-test/kernelsrc_patches/toi/tuxonice-for-linux-4.9.1-2017-01-06.patch.bz2 ftp://plamo.linet.gr.jp/pub/Plamo-test/kernelsrc_patches/ovlfs/overlayfs-allow_unprivileged_mounts.patch - ftp://plamo.linet.gr.jp/pub/Plamo-test/kernelsrc_patches/config-4.1.15-plamoRPi2" + ftp://plamo.linet.gr.jp/pub/Plamo-test/kernelsrc_patches/rpi/rpi-4.9.36-20170705-3ecb1db.patch.xz + ftp://plamo.linet.gr.jp/pub/Plamo-test/kernelsrc_patches/config-4.9.36-plamo@LV@" +verify= +digest= +branch[3]=aufs4.9 +commitid[3]=c8baf66 pkgbase=kernel -vers=4.1.15_plamoRPi2 +vers=4.9.36_plamo@LV@ arch=`uname -m` -build=P3 -src=linux +build=P1 +src=linux-4.9.36 +patchfiles="" OPT_CONFIG="" DOCS="" +template=20170713 +tmplurl=ftp://plamo.linet.gr.jp/pub/Plamo-src/admin ###################################################################### -fscheck() { - PANGRAM="The quick brown fox jumps over the lazy dog." - echo -n "Checking for the filesystem ... " - mkdir pangram ; ( cd pangram ; touch $PANGRAM ) - mv pangram pangram~ ; mkdir pangram ; touch -r pangram~ pangram - tar cpf pangram.tar pangram ; rmdir pangram ; mv pangram~ pangram - for i in $PANGRAM ; do tar rpf pangram.tar pangram/$i ; done - touch -t `date '+%m%d0900'` pangram.tar ; gzip pangram.tar - touch pangram.tar.gz ; mv pangram.tar.gz pangram1.tgz - tar cpf pangram.tar pangram - touch -t `date '+%m%d0900'` pangram.tar ; gzip pangram.tar - touch pangram.tar.gz ; mv pangram.tar.gz pangram2.tgz - if cmp -s pangram1.tgz pangram2.tgz ; then - echo "OK" - rm -rf pangram pangram1.tgz pangram2.tgz - else - echo "NG" - cat <<- "EOF" - Hmm, packaging may not be done properly on this filesystem. - Would you please try again on a default filesystem, thanks! - - Happy packaging!! - - Quitting... - EOF - exit - fi -} - -install2() { - install -d ${2%/*} ; install -m 644 $1 $2 -} - -strip_bindir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - shopt -s nullglob - cd $1 - for i in * ; do - echo "$i" - if [ -h $i ] ; then continue ; fi - if [ -n "`file $i | grep "not stripped"`" ] ; then - echo "stripping -p $i" - strip -p $i - fi - done - ) fi -} - -strip_libdir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - shopt -s nullglob - cd $1 - for i in *.so *.so.* *.a ; do - echo "$i" - if [ -h $i ] ; then continue ; fi - if [ -n "`nm -a $i | grep " a "`" ] ; then - if [ $i != ${i%.a} ] ; then - echo -n "ranlib and " - touch -r $i $i.mt ; ranlib $i ; touch -r $i.mt $i ; rm $i.mt - fi - echo "stripping -gp $i" - strip -gp $i - fi - done - ) fi -} - -gzip_dir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - cd $1 - files=`ls -f --indicator-style=none | sed '/^\.\{1,2\}$/d'` - for i in $files ; do - echo "$i" - if [ ! -f $i -a ! -h $i -o $i != ${i%.gz} ] ; then continue ; fi - lnks=`ls -l $i | awk '{print $2}'` - if [ $lnks -gt 1 ] ; then - inum=`ls -i $i | awk '{print $1}'` - for j in `find . -maxdepth 1 -inum $inum` ; do - if [ ${j#./} == $i ] ; then - gzip -f $i - else - rm -f ${j#./} ; ln $i.gz ${j#./}.gz - fi - done - elif [ -h $i ] ; then - target=`readlink $i` ; rm -f $i ; ln -s $target.gz $i.gz - else - gzip $i - fi - done - for i in $files ; do mv ${i%.gz}.gz $C ; done - for i in $files ; do mv $C/${i%.gz}.gz . ; done - ) fi -} - -gzip_one() { - gzip $1 ; mv $1.gz $C ; mv $C/${1##*/}.gz ${1%/*} -} - -compress() { - for i in {$P,$P/usr}/{sbin,bin} ; do strip_bindir $i ; done - for i in {$P,$P/usr}/$libdir ; do strip_libdir $i ; done - if [ -f $infodir/dir ] ; then rm -f $infodir/dir ; fi - gzip_dir $infodir - for i in `seq 9` n ; do gzip_dir $mandir/man$i ; done -} - -prune_symlink() { - echo "pruning symlink in $1" - if [ -d $1 ] ; then ( - cd $P - rm -f /tmp/iNsT-a.$$ ; touch /tmp/iNsT-a.$$ - for i in `find ${1#$P/} -type l` ; do - target=`readlink $i` - echo "$i -> $target" - echo $i$'\n'$target >> /tmp/iNsT-a.$$ - done - COUNT=1 - LINE=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - while [ -n "$LINE" ] ; do - LINKGOESIN=`dirname $LINE` - LINKNAMEIS=`basename $LINE` - COUNT=$(($COUNT + 1)) - LINKPOINTSTO=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - if [ ! -d install ] ; then mkdir install ; fi - cat <<- EOF >> install/doinst.sh - ( cd $LINKGOESIN ; rm -rf $LINKNAMEIS ) - ( cd $LINKGOESIN ; ln -sf $LINKPOINTSTO $LINKNAMEIS ) - EOF - rm -rf $LINE ; touch -t `date '+%m%d0900'` install/doinst.sh $LINE - COUNT=$(($COUNT + 1)) - LINE=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - done - rm -f /tmp/iNsT-a.$$ - ) fi -} - -convert() { - for i in {$P,$P/usr}/{sbin,bin} ; do prune_symlink $i ; done - for i in {$P,$P/usr}/$libdir ; do prune_symlink $i ; done - prune_symlink $infodir - for i in `seq 9` n ; do prune_symlink $mandir/man$i ; done -} - -fscheck -W=`pwd` -for i in `seq 0 $((${#src[@]} - 1))` ; do - S[$i]=$W/${src[$i]} ; B[$i]=$W/build`test ${#src[@]} -eq 1 || echo $i` -done -P=$W/work ; C=$W/pivot -infodir=$P/usr/share/info -mandir=$P/usr/share/man -docdir=$P/usr/share/doc -myname=`basename $0` -pkg=$pkgbase-$vers-$arch-$build -case $arch in x86_64) libdir=lib64 ;; *) libdir=lib ;; esac -if [ $# -eq 0 ] ; then - opt_download=1 ; opt_config=1 ; opt_build=1 ; opt_package=1 +if [ -f functions ] ; then + source ./functions +elif [ ! -f /usr/share/plamo/functions ] ; then + wget ftp://plamo.linet.gr.jp/pub/Plamo-src/admin/functions + source ./functions else - opt_download=0 ; opt_config=0 ; opt_build=0 ; opt_package=0 - for i in $@ ; do - case $i in - download) opt_download=1 ;; - config) opt_config=1 ;; - build) opt_build=1 ;; - package) opt_package=1 ;; - esac - done + source /usr/share/plamo/functions fi + +fscheck +case `uname -m` in i686) lv=SMP ;; x86_64) lv=64 ;; armv7l) lv=RPi2 ;; esac +url=${url/@LV@/$lv} ; vers=${vers/@LV@/$lv} +prepare "$@" if [ $opt_download -eq 1 ] ; then - for i in $url ; do - case ${i##*.} in - git) if [ ! -d `basename ${i##*/} .git` ] ; then git clone $i ; fi ;; - *) if [ ! -f ${i##*/} ] ; then wget $i ; fi ;; - esac - done - for i in $url ; do - case ${i##*.} in - tar) tar xvpf ${i##*/} ;; - gz) tar xvpzf ${i##*/} ;; - bz2) tar xvpjf ${i##*/} ;; - xz) tar xvpJf ${i##*/} ;; - git) ( cd `basename ${i##*/} .git` - case `basename ${i##*/} .git` in - linux) git checkout origin/rpi-4.1.y ; git reset --hard d51c7d8 ;; - aufs4-*) git checkout origin/aufs4.1 ; git reset --hard 2b569cf ;; - esac ) ;; - esac - done + download_sources fi if [ $opt_config -eq 1 ] ; then 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 + apply_patches cd $B - rm -rf .git ; touch .git - patch -Np1 -i $W/vd_unicon-kernel-20150627-4.1.patch + patch -Np1 -i $W/vd_unicon-kernel-20161217-4.9.patch bunzip2 -c $W/vd_unicon-kernel-fonts-20140614.patch.bz2 | patch -Np1 -i - patch -Np1 -i $W/aufs4-standalone/aufs4-kbuild.patch patch -Np1 -i $W/aufs4-standalone/aufs4-base.patch @@ -227,14 +58,30 @@ cp -av $W/aufs4-standalone/Documentation . cp -av $W/aufs4-standalone/fs . cp -pv $W/aufs4-standalone/include/uapi/linux/aufs_type.h include/uapi/linux - patch -Np1 -i $W/4.1-panic_beep.patch - patch -Np1 -i $W/4.1-morse_code_panics.patch - bunzip2 -c $W/tuxonice-for-linux-4.1.6-2015-08-22.patch.bz2 | patch -Np1 -i - + patch -Np1 -i $W/4.9-panic_beep.patch + patch -Np1 -i $W/4.9-morse_code_panics.patch + bunzip2 -c $W/tuxonice-for-linux-4.9.1-2017-01-06.patch.bz2 | patch -Np1 -i - + chmod 755 scripts/tuxonice_output_to_csv.sh patch -Np1 -i $W/overlayfs-allow_unprivileged_mounts.patch - cp -p $W/config-4.1.15-plamoRPi2 .config - cp -p arch/arm/boot/install.sh{,.orig} - sed -i '/INSTALLKERNEL/s@^@#@g' arch/arm/boot/install.sh - cat <<- "EOF" | patch arch/arm/boot/install.sh + if [ `uname -m` == armv7l ] ; then + unxz -c $W/rpi-4.9.36-20170705-3ecb1db.patch.xz | patch -Np1 -i - + chmod 755 drivers/net/wireless/realtek/rtl8192cu/{clean,runwpa,wlan0dhcp} + chmod 755 scripts/{knlinfo,mkknlimg} + fi + cp -p $W/config-4.9.36-plamo$lv .config + if [ $arch == i686 -o $arch == x86_64 ] ; then + cp -p arch/x86/boot/install.sh{,.orig} + head -n-9 arch/x86/boot/install.sh.orig > arch/x86/boot/install.sh + sed -i '/INSTALLKERNEL/s@^@#@g' arch/x86/boot/install.sh + cat <<- "EOF" | patch arch/x86/boot/install.sh + 48a49 + > cp .config $4/config-$1 + EOF + sed -i '/\(vmlinuz\|System.map\)$/s@$@-\$1@g' arch/x86/boot/install.sh + else + cp -p arch/arm/boot/install.sh{,.orig} + sed -i '/INSTALLKERNEL/s@^@#@g' arch/arm/boot/install.sh + cat <<- "EOF" | patch arch/arm/boot/install.sh 40a41,42 > cp .config $4/config-$1 > @@ -243,17 +90,12 @@ --- > scripts/mkknlimg $2 $4/kernel7.img-$1 EOF + fi for i in `seq 0 $((${#B[@]} - 1))` ; do cd ${B[$i]} - if [ -f Makefile ] ; then - make clean - fi - if [ -f config.log ] ; then - 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 @@ -267,12 +109,7 @@ done fi if [ $opt_package -eq 1 ] ; then - if [ `id -u` -ne 0 ] ; then - read -p "Do you want to package as root? [y/N] " ans - if [ "x$ans" == "xY" -o "x$ans" == "xy" ] ; then - cd $W ; /bin/su -c "$0 package" ; exit - fi - fi + root_priv if [ -d $P ] ; then rm -rf $P ; fi ; mkdir -p $P if [ -d $C ] ; then rm -rf $C ; fi ; mkdir -p $C touch $W/i.st ; sleep 1 @@ -280,45 +117,36 @@ cd ${B[$i]} if [ -f Makefile ] ; then install -d $P/boot - make zinstall INSTALL_PATH=$P/boot + make `[ $arch == armv7l ] && echo z`install INSTALL_PATH=$P/boot make modules_install INSTALL_MOD_PATH=$P fi done krel=${vers//_/-} - cp -p $P/boot/config{-$krel,} - cp -p $P/boot/kernel7.img{-$krel,} - cp -p $P/boot/System.map{-$krel,} - install -d $P/boot/overlays - install -m 644 $B/arch/arm/boot/dts/overlays/README $P/boot/overlays - install -m 644 $B/arch/arm/boot/dts/overlays/*.dtb $P/boot/overlays - install -m 644 $B/arch/arm/boot/dts/*.dtb $P/boot - ln -snf /usr/src/linux $P/lib/modules/$krel/source - ln -snf /usr/src/linux $P/lib/modules/$krel/build + if [ $arch == i686 -o $arch == x86_64 ] ; then + ln -s config-$krel $P/boot/config + ln -s vmlinuz-$krel $P/boot/vmlinuz + ln -s System.map-$krel $P/boot/System.map + else + cp -p $P/boot/config{-$krel,} + cp -p $P/boot/kernel7.img{-$krel,} + cp -p $P/boot/System.map{-$krel,} + install -m 644 $B/arch/arm/boot/Image $P/boot/Image-$krel + install -m 644 $B/arch/arm/boot/dts/*.dtb $P/boot + install -d $P/boot/overlays + install -m 644 $B/arch/arm/boot/dts/overlays/README $P/boot/overlays + install -m 644 $B/arch/arm/boot/dts/overlays/*.dtbo $P/boot/overlays + fi + ln -sfn /usr/src/linux $P/lib/modules/$krel/source + ln -sfn /usr/src/linux $P/lib/modules/$krel/build touch $W/i.et cd $W find $P ! -type l -newer i.st ! -newer i.et \ -exec touch -t `date '+%m%d0900'` {} \; compress - for i in `seq 0 $((${#DOCS[@]} - 1))` ; do - for j in ${DOCS[$i]} ; do - for k in ${S[$i]}/$j ; do - install2 $k $docdir/${src[$i]}/${k#${S[$i]}/} - touch -r $k $docdir/${src[$i]}/${k#${S[$i]}/} - gzip_one $docdir/${src[$i]}/${k#${S[$i]}/} - done - done - install -d $docdir/$src - if [ $i -eq 0 ] ; then - install $myname $docdir/$src - touch -t `date '+%m%d0900'` $docdir/$src/$myname - gzip_one $docdir/$src/$myname - else - ln $docdir/$src/$myname.gz $docdir/${src[$i]} - fi - ( cd $docdir ; find ${src[$i]} -type d -exec touch -r $W/{} {} \; ) - done - touch -t `date '+%m%d0900'` $docdir/$src - convert + install -d $docdir/$src + setup_docdir + convert_links + prune_symlink $P/boot prune_symlink $P/lib/modules/$krel touch -t `date '+%m%d0900'` $P/lib/modules/$krel tar cvpf $pkg.tar -C $P `cd $P ; find boot -maxdepth 1 | tail -n+2` @@ -328,6 +156,5 @@ tar rvpf $pkg.tar -C $P install/doinst.sh touch -t `date '+%m%d0900'` $pkg.tar ; xz $pkg.tar ; touch $pkg.tar.xz mv $pkg.tar.xz $pkg.txz - read -p "Do you want to keep work files? [y/N] " ans - if [ "x$ans" != "xY" -a "x$ans" != "xy" ] ; then rm -rf $P $C i.[se]t ; fi + cleanup fi --- plamo/00_base/old/kernel-20170727/PlamoBuild.kernel-4.9.36_plamoRPi2 2017-07-27 11:35:43.000000000 +0900 +++ plamo/00_base/kernel/PlamoBuild.kernel-4.10.17_plamoRPi2 2017-08-13 17:43:47.000000000 +0900 @@ -1,25 +1,25 @@ #!/bin/sh -x ###################################################################### -url="https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.9.36.tar.xz - ftp://plamo.linet.gr.jp/pub/Plamo-test/kernelsrc_patches/UNICON/vd_unicon-kernel-20161217-4.9.patch +url="https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.10.17.tar.xz + ftp://plamo.linet.gr.jp/pub/Plamo-test/kernelsrc_patches/UNICON/vd_unicon-kernel-20170225-4.10.patch ftp://plamo.linet.gr.jp/pub/Plamo-test/kernelsrc_patches/UNICON/vd_unicon-kernel-fonts-20140614.patch.bz2 https://github.com/sfjro/aufs4-standalone.git - ftp://plamo.linet.gr.jp/pub/Plamo-test/kernelsrc_patches/mcp/4.9-panic_beep.patch - ftp://plamo.linet.gr.jp/pub/Plamo-test/kernelsrc_patches/mcp/4.9-morse_code_panics.patch - ftp://plamo.linet.gr.jp/pub/Plamo-test/kernelsrc_patches/toi/tuxonice-for-linux-4.9.1-2017-01-06.patch.bz2 + ftp://plamo.linet.gr.jp/pub/Plamo-test/kernelsrc_patches/mcp/4.10-panic_beep.patch + ftp://plamo.linet.gr.jp/pub/Plamo-test/kernelsrc_patches/mcp/4.10-morse_code_panics.patch + ftp://plamo.linet.gr.jp/pub/Plamo-test/kernelsrc_patches/toi/tuxonice-for-linux-4.10.17-2017-05-24.patch.bz2 ftp://plamo.linet.gr.jp/pub/Plamo-test/kernelsrc_patches/ovlfs/overlayfs-allow_unprivileged_mounts.patch - ftp://plamo.linet.gr.jp/pub/Plamo-test/kernelsrc_patches/rpi/rpi-4.9.36-20170705-3ecb1db.patch.xz - ftp://plamo.linet.gr.jp/pub/Plamo-test/kernelsrc_patches/config-4.9.36-plamo@LV@" + ftp://plamo.linet.gr.jp/pub/Plamo-test/kernelsrc_patches/rpi/rpi-4.10.17-20170521-78cfe36.patch.xz + ftp://plamo.linet.gr.jp/pub/Plamo-test/kernelsrc_patches/config-4.10.17-plamo@LV@" verify= digest= -branch[3]=aufs4.9 -commitid[3]=c8baf66 +branch[3]=aufs4.10 +commitid[3]=a19543b pkgbase=kernel -vers=4.9.36_plamo@LV@ +vers=4.10.17_plamo@LV@ arch=`uname -m` build=P1 -src=linux-4.9.36 +src=linux-4.10.17 patchfiles="" OPT_CONFIG="" DOCS="" @@ -49,7 +49,7 @@ done apply_patches cd $B - patch -Np1 -i $W/vd_unicon-kernel-20161217-4.9.patch + patch -Np1 -i $W/vd_unicon-kernel-20170225-4.10.patch bunzip2 -c $W/vd_unicon-kernel-fonts-20140614.patch.bz2 | patch -Np1 -i - patch -Np1 -i $W/aufs4-standalone/aufs4-kbuild.patch patch -Np1 -i $W/aufs4-standalone/aufs4-base.patch @@ -58,17 +58,17 @@ cp -av $W/aufs4-standalone/Documentation . cp -av $W/aufs4-standalone/fs . cp -pv $W/aufs4-standalone/include/uapi/linux/aufs_type.h include/uapi/linux - patch -Np1 -i $W/4.9-panic_beep.patch - patch -Np1 -i $W/4.9-morse_code_panics.patch - bunzip2 -c $W/tuxonice-for-linux-4.9.1-2017-01-06.patch.bz2 | patch -Np1 -i - + patch -Np1 -i $W/4.10-panic_beep.patch + patch -Np1 -i $W/4.10-morse_code_panics.patch + bunzip2 -c $W/tuxonice-for-linux-4.10.17-2017-05-24.patch.bz2 | patch -Np1 -i - chmod 755 scripts/tuxonice_output_to_csv.sh patch -Np1 -i $W/overlayfs-allow_unprivileged_mounts.patch if [ `uname -m` == armv7l ] ; then - unxz -c $W/rpi-4.9.36-20170705-3ecb1db.patch.xz | patch -Np1 -i - + unxz -c $W/rpi-4.10.17-20170521-78cfe36.patch.xz | patch -Np1 -i - chmod 755 drivers/net/wireless/realtek/rtl8192cu/{clean,runwpa,wlan0dhcp} chmod 755 scripts/{knlinfo,mkknlimg} fi - cp -p $W/config-4.9.36-plamo$lv .config + cp -p $W/config-4.10.17-plamo$lv .config if [ $arch == i686 -o $arch == x86_64 ] ; then cp -p arch/x86/boot/install.sh{,.orig} head -n-9 arch/x86/boot/install.sh.orig > arch/x86/boot/install.sh @@ -85,10 +85,11 @@ 40a41,42 > cp .config $4/config-$1 > - 54c56 + 54c56,57 < cat $2 > $4/$base-$1 --- > scripts/mkknlimg $2 $4/kernel7.img-$1 + > cat ${2/zImage/Image} > $4/Image-$1 EOF fi for i in `seq 0 $((${#B[@]} - 1))` ; do @@ -130,7 +131,6 @@ cp -p $P/boot/config{-$krel,} cp -p $P/boot/kernel7.img{-$krel,} cp -p $P/boot/System.map{-$krel,} - install -m 644 $B/arch/arm/boot/Image $P/boot/Image-$krel install -m 644 $B/arch/arm/boot/dts/*.dtb $P/boot install -d $P/boot/overlays install -m 644 $B/arch/arm/boot/dts/overlays/README $P/boot/overlays --- plamo/00_base/old/libgcc-20160128/PlamoBuild.libgcc-4.8.5 2016-01-28 13:05:06.000000000 +0900 +++ plamo/00_base/libgcc/PlamoBuild.libgcc-4.8.5 2017-04-08 16:45:17.000000000 +0900 @@ -2,12 +2,15 @@ ###################################################################### url="http://ftp.gnu.org/gnu/gcc/gcc-4.8.5/gcc-4.8.5.tar.bz2 - https://patchwork.ozlabs.org/patch/342434/mbox" + ftp://plamo.linet.gr.jp/pub/Plamo-src/plamo/01_minimum/devel.txz/gcc/gcc-4.8-filename-output.patch" +verify= +commitid= pkgbase=libgcc vers=4.8.5 arch=`uname -m` -build=P2 +build=P3 src=gcc-$vers +patchfiles="gcc-4.8-filename-output.patch" OPT_CONFIG="--disable-werror --disable-multilib --enable-install-libiberty --enable-__cxa_atexit --enable-threads=posix --enable-shared --enable-languages=c,c++,fortran,go --enable-gnu-unique-object @@ -15,214 +18,34 @@ --with-linker-hash-style=gnu --enable-clocale=gnu --disable-libstdcxx-pch" DOCS="COPYING ChangeLog ABOUT-NLS NEWS COPYING3.LIB ChangeLog.tree-ssa COPYING3 COPYING.RUNTIME README COPYING.LIB MAINTAINERS" +template=20170323 +tmplurl=ftp://plamo.linet.gr.jp/pub/Plamo-src/admin ###################################################################### -fscheck() { - PANGRAM="The quick brown fox jumps over the lazy dog." - echo -n "Checking for the filesystem ... " - mkdir pangram ; ( cd pangram ; touch $PANGRAM ) - mv pangram pangram~ ; mkdir pangram ; touch -r pangram~ pangram - tar cpf pangram.tar pangram ; rmdir pangram ; mv pangram~ pangram - for i in $PANGRAM ; do tar rpf pangram.tar pangram/$i ; done - touch -t `date '+%m%d0900'` pangram.tar ; gzip pangram.tar - touch pangram.tar.gz ; mv pangram.tar.gz pangram1.tgz - tar cpf pangram.tar pangram - touch -t `date '+%m%d0900'` pangram.tar ; gzip pangram.tar - touch pangram.tar.gz ; mv pangram.tar.gz pangram2.tgz - if cmp -s pangram1.tgz pangram2.tgz ; then - echo "OK" - rm -rf pangram pangram1.tgz pangram2.tgz - else - echo "NG" - cat <<- "EOF" - Hmm, packaging may not be done properly on this filesystem. - Would you please try again on a default filesystem, thanks! - - Happy packaging!! - - Quitting... - EOF - exit - fi -} - -install2() { - install -d ${2%/*} ; install -m 644 $1 $2 -} - -strip_bindir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - shopt -s extglob nullglob - cd $1 - for i in `echo !(*.so|*.so.*|*.a|*.o)` ; do - echo "$i" - if [ -h $i ] ; then continue ; fi - if [ -n "`file $i | grep "not stripped"`" ] ; then - echo "stripping -p $i" - strip -p $i - fi - done - ) fi -} - -strip_libdir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - shopt -s nullglob - cd $1 - for i in *.so *.so.* *.a ; do - echo "$i" - if [ -h $i ] ; then continue ; fi - if [ -n "`nm -a $i | grep " a "`" ] ; then - if [ $i != ${i%.a} ] ; then - echo -n "ranlib and " - touch -r $i $i.mt ; ranlib $i ; touch -r $i.mt $i ; rm $i.mt - fi - echo "stripping -gp $i" - strip -gp $i - fi - done - ) fi -} - -gzip_dir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - cd $1 - files=`ls -f --indicator-style=none | sed '/^\.\{1,2\}$/d'` - for i in $files ; do - echo "$i" - if [ ! -f $i -a ! -h $i -o $i != ${i%.gz} ] ; then continue ; fi - lnks=`ls -l $i | awk '{print $2}'` - if [ $lnks -gt 1 ] ; then - inum=`ls -i $i | awk '{print $1}'` - for j in `find . -maxdepth 1 -inum $inum` ; do - if [ ${j#./} == $i ] ; then - gzip -f $i - else - rm -f ${j#./} ; ln $i.gz ${j#./}.gz - fi - done - elif [ -h $i ] ; then - target=`readlink $i` ; rm -f $i ; ln -s $target.gz $i.gz - else - gzip $i - fi - done - for i in $files ; do mv ${i%.gz}.gz $C ; done - for i in $files ; do mv $C/${i%.gz}.gz . ; done - ) fi -} - -gzip_one() { - gzip $1 ; mv $1.gz $C ; mv $C/${1##*/}.gz ${1%/*} -} - -compress() { - for i in {$P,$P/usr}/{sbin,bin} ; do strip_bindir $i ; done - for i in {$P,$P/usr}/$libdir ; do strip_libdir $i ; done - if [ -f $infodir/dir ] ; then rm -f $infodir/dir ; fi - gzip_dir $infodir - for i in `seq 9` n ; do gzip_dir $mandir/man$i ; done -} - -prune_symlink() { - echo "pruning symlink in $1" - if [ -d $1 ] ; then ( - cd $P - rm -f /tmp/iNsT-a.$$ ; touch /tmp/iNsT-a.$$ - for i in `find ${1#$P/} -type l` ; do - target=`readlink $i` - echo "$i -> $target" - echo $i$'\n'$target >> /tmp/iNsT-a.$$ - done - COUNT=1 - LINE=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - while [ -n "$LINE" ] ; do - LINKGOESIN=`dirname $LINE` - LINKNAMEIS=`basename $LINE` - COUNT=$(($COUNT + 1)) - LINKPOINTSTO=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - if [ ! -d install ] ; then mkdir install ; fi - cat <<- EOF >> install/doinst.sh - ( cd $LINKGOESIN ; rm -rf $LINKNAMEIS ) - ( cd $LINKGOESIN ; ln -sf $LINKPOINTSTO $LINKNAMEIS ) - EOF - rm -rf $LINE ; touch -t `date '+%m%d0900'` install/doinst.sh $LINE - COUNT=$(($COUNT + 1)) - LINE=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - done - rm -f /tmp/iNsT-a.$$ - ) fi -} - -convert() { - for i in {$P,$P/usr}/{sbin,bin} ; do prune_symlink $i ; done - for i in {$P,$P/usr}/$libdir ; do prune_symlink $i ; done - prune_symlink $infodir - for i in `seq 9` n ; do prune_symlink $mandir/man$i ; done -} - -fscheck -W=`pwd` -for i in `seq 0 $((${#src[@]} - 1))` ; do - S[$i]=$W/${src[$i]} ; B[$i]=$W/build`test ${#src[@]} -eq 1 || echo $i` -done -P=$W/work ; C=$W/pivot -infodir=$P/usr/share/info -mandir=$P/usr/share/man -docdir=$P/usr/share/doc -myname=`basename $0` -pkg=$pkgbase-$vers-$arch-$build -case $arch in x86_64) libdir=lib64 ;; *) libdir=lib ;; esac -if [ $# -eq 0 ] ; then - opt_download=1 ; opt_config=1 ; opt_build=1 ; opt_package=1 +if [ -f functions ] ; then + source ./functions +elif [ ! -f /usr/share/plamo/functions ] ; then + wget ftp://plamo.linet.gr.jp/pub/Plamo-src/admin/functions + source ./functions else - opt_download=0 ; opt_config=0 ; opt_build=0 ; opt_package=0 - for i in $@ ; do - case $i in - download) opt_download=1 ;; - config) opt_config=1 ;; - build) opt_build=1 ;; - package) opt_package=1 ;; - esac - done + source /usr/share/plamo/functions fi + +fscheck +prepare "$@" if [ $opt_download -eq 1 ] ; then - alt=gcc-4.8-filename-output.patch - for i in $url ; do - if [ ${i##*/} == mbox ] ; then - [ ! -f $alt ] && wget $i -O $alt - elif [ ! -f ${i##*/} ] ; then - wget $i - fi - done - for i in $url ; do - case ${i##*.} in - tar) tar xvpf ${i##*/} ;; - gz) tar xvpzf ${i##*/} ;; - bz2) tar xvpjf ${i##*/} ;; - esac - done + download_sources fi if [ $opt_config -eq 1 ] ; then 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 -Np0 -i $W/gcc-4.8-filename-output.patch + apply_patches for i in `seq 0 $((${#B[@]} - 1))` ; do cd ${B[$i]} - if [ -f Makefile ] ; then - make clean - fi - if [ -f config.log ] ; then - 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]} \ --libexecdir=/usr/$libdir \ --build=$arch-pc-linux-gnu`[ $arch == armv7l ] && echo eabi` \ @@ -239,12 +62,7 @@ done fi if [ $opt_package -eq 1 ] ; then - if [ `id -u` -ne 0 ] ; then - read -p "Do you want to package as root? [y/N] " ans - if [ "x$ans" == "xY" -o "x$ans" == "xy" ] ; then - cd $W ; /bin/su -c "$0 package" ; exit - fi - fi + root_priv if [ -d $P ] ; then rm -rf $P ; fi ; mkdir -p $P if [ -d $C ] ; then rm -rf $C ; fi ; mkdir -p $C touch $W/i.st ; sleep 1 @@ -266,29 +84,12 @@ find $P ! -type l -newer i.st ! -newer i.et \ -exec touch -t `date '+%m%d0900'` {} \; compress - for i in `seq 0 $((${#DOCS[@]} - 1))` ; do - for j in ${DOCS[$i]} ; do - for k in ${S[$i]}/$j ; do - install2 $k $docdir/${src[$i]}/${k#${S[$i]}/} - touch -r $k $docdir/${src[$i]}/${k#${S[$i]}/} - gzip_one $docdir/${src[$i]}/${k#${S[$i]}/} - done - done - if [ $i -eq 0 ] ; then - install $myname $docdir/$src - touch -t `date '+%m%d0900'` $docdir/$src/$myname - gzip_one $docdir/$src/$myname - else - ln $docdir/$src/$myname.gz $docdir/${src[$i]} - fi - ( cd $docdir ; find ${src[$i]} -type d -exec touch -r $W/{} {} \; ) - done - convert + setup_docdir + convert_links tar cvpf $pkg.tar -C $P `cd $P ; find usr/$libdir | 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 mv $pkg.tar.xz $pkg.txz - read -p "Do you want to keep work files? [y/N] " ans - if [ "x$ans" != "xY" -a "x$ans" != "xy" ] ; then rm -rf $P $C i.[se]t ; fi + cleanup fi --- plamo/00_base/old/glibc-20161209/PlamoBuild.glibc-2.20 2016-12-09 19:27:29.000000000 +0900 +++ plamo/00_base/glibc/PlamoBuild.glibc-2.20 2017-04-05 20:52:20.000000000 +0900 @@ -11,10 +11,12 @@ ftp://plamo.linet.gr.jp/pub/Plamo-src/plamo/00_base/glibc/CVE-2015-8776.patch ftp://plamo.linet.gr.jp/pub/Plamo-src/plamo/00_base/glibc/CVE-2015-8778.patch ftp://plamo.linet.gr.jp/pub/Plamo-src/plamo/00_base/glibc/CVE-2015-8779.patch" +verify= +commitid= pkgbase=glibc vers=2.20 arch=`uname -m` -build=P5 +build=P6 src=$pkgbase-$vers patchfiles="glibc-2.19-fhs-1.patch glibc-2.20-do_ftell_wide-memleak.patch glibc-2.20-getifaddrs_internal-segfault.patch @@ -23,232 +25,37 @@ OPT_CONFIG="--enable-kernel=2.6.32 --enable-obsolete-rpc" DOCS="BUGS CONFORMANCE COPYING* ChangeLog* INSTALL LICENSES NEWS PROJECTS README" -template=20161020 +template=20170323 tmplurl=ftp://plamo.linet.gr.jp/pub/Plamo-src/admin ###################################################################### -fscheck() { - PANGRAM="The quick brown fox jumps over the lazy dog." - echo -n "Checking for the filesystem ... " - mkdir pangram ; ( cd pangram ; touch $PANGRAM ) - mv pangram pangram~ ; mkdir pangram ; touch -r pangram~ pangram - tar cpf pangram.tar pangram ; rmdir pangram ; mv pangram~ pangram - for i in $PANGRAM ; do tar rpf pangram.tar pangram/$i ; done - touch -t `date '+%m%d0900'` pangram.tar ; gzip pangram.tar - touch pangram.tar.gz ; mv pangram.tar.gz pangram1.tgz - tar cpf pangram.tar pangram - touch -t `date '+%m%d0900'` pangram.tar ; gzip pangram.tar - touch pangram.tar.gz ; mv pangram.tar.gz pangram2.tgz - if cmp -s pangram1.tgz pangram2.tgz ; then - echo "OK" - rm -rf pangram pangram1.tgz pangram2.tgz - else - echo "NG" - cat <<- "EOF" - Hmm, packaging may not be done properly on this filesystem. - Would you please try again on a default filesystem, thanks! - - Happy packaging!! - - Quitting... - EOF - exit - fi -} - -install2() { - install -d ${2%/*} ; install -m 644 $1 $2 -} - -strip_bindir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - shopt -s nullglob - cd $1 - for i in * ; do - echo "$i" - if [ -h $i ] ; then continue ; fi - if [ -n "`file $i | grep "not stripped"`" ] ; then - echo "stripping -p $i" - strip -p $i - fi - done - ) fi -} - -strip_libdir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - shopt -s nullglob - cd $1 - for i in *.so *.so.* *.a ; do - echo "$i" - if [ -h $i ] ; then continue ; fi - if [ -n "`nm -a $i | grep " a "`" ] ; then - if [ $i != ${i%.a} ] ; then - echo -n "ranlib and " - touch -r $i $i.mt ; ranlib $i ; touch -r $i.mt $i ; rm $i.mt - fi - echo "stripping -gp $i" - strip -gp $i - fi - done - ) fi -} - -gzip_dir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - cd $1 - files=`ls -f --indicator-style=none | sed '/^\.\{1,2\}$/d'` - for i in $files ; do - echo "$i" - if [ ! -f $i -a ! -h $i -o $i != ${i%.gz} ] ; then continue ; fi - lnks=`ls -l $i | awk '{print $2}'` - if [ $lnks -gt 1 ] ; then - inum=`ls -i $i | awk '{print $1}'` - for j in `find . -maxdepth 1 -inum $inum` ; do - if [ ${j#./} == $i ] ; then - gzip -f $i - else - rm -f ${j#./} ; ln $i.gz ${j#./}.gz - fi - done - elif [ -h $i ] ; then - target=`readlink $i` ; rm -f $i ; ln -s $target.gz $i.gz - else - gzip $i - fi - done - for i in $files ; do mv ${i%.gz}.gz $C ; done - for i in $files ; do mv $C/${i%.gz}.gz . ; done - ) fi -} - -gzip_one() { - gzip $1 ; mv $1.gz $C ; mv $C/${1##*/}.gz ${1%/*} -} - -compress() { - for i in {$P,$P/usr}/{sbin,bin} ; do strip_bindir $i ; done - for i in {$P,$P/usr}/$libdir ; do strip_libdir $i ; done - if [ -f $infodir/dir ] ; then rm -f $infodir/dir ; fi - gzip_dir $infodir - for i in `seq 9` n ; do gzip_dir $mandir/man$i ; done -} - -prune_symlink() { - echo "pruning symlink in $1" - if [ -d $1 ] ; then ( - cd $P - rm -f /tmp/iNsT-a.$$ ; touch /tmp/iNsT-a.$$ - for i in `find ${1#$P/} -type l` ; do - target=`readlink $i` - echo "$i -> $target" - echo $i$'\n'$target >> /tmp/iNsT-a.$$ - done - COUNT=1 - LINE=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - while [ -n "$LINE" ] ; do - LINKGOESIN=`dirname $LINE` - LINKNAMEIS=`basename $LINE` - COUNT=$(($COUNT + 1)) - LINKPOINTSTO=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - if [ ! -d install ] ; then mkdir install ; fi - cat <<- EOF >> install/doinst.sh - ( cd $LINKGOESIN ; rm -rf $LINKNAMEIS ) - ( cd $LINKGOESIN ; ln -sf $LINKPOINTSTO $LINKNAMEIS ) - EOF - rm -rf $LINE ; touch -t `date '+%m%d0900'` install/doinst.sh $LINE - COUNT=$(($COUNT + 1)) - LINE=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - done - rm -f /tmp/iNsT-a.$$ - ) fi -} - -convert() { - for i in {$P,$P/usr}/{sbin,bin} ; do prune_symlink $i ; done - for i in {$P,$P/usr}/$libdir ; do prune_symlink $i ; done - prune_symlink $infodir - for i in `seq 9` n ; do prune_symlink $mandir/man$i ; done -} - -fscheck -W=`pwd` -for i in `seq 0 $((${#src[@]} - 1))` ; do - S[$i]=$W/${src[$i]} ; B[$i]=$W/build`test ${#src[@]} -eq 1 || echo $i` - S2[$i]=$W/source`test ${#src[@]} -eq 1 || echo $i` -done -P=$W/work ; C=$W/pivot -infodir=$P/usr/share/info -mandir=$P/usr/share/man -docdir=$P/usr/share/doc -myname=`basename $0` -pkg=$pkgbase-$vers-$arch-$build -case $arch in x86_64) libdir=lib64 ;; *) libdir=lib ;; esac -if [ $# -eq 0 ] ; then - opt_download=1 ; opt_config=1 ; opt_build=1 ; opt_package=1 +if [ -f functions ] ; then + source ./functions +elif [ ! -f /usr/share/plamo/functions ] ; then + wget ftp://plamo.linet.gr.jp/pub/Plamo-src/admin/functions + source ./functions else - opt_download=0 ; opt_config=0 ; opt_build=0 ; opt_package=0 - for i in $@ ; do - case $i in - download) opt_download=1 ;; - config) opt_config=1 ;; - build) opt_build=1 ;; - package) opt_package=1 ;; - esac - done + source /usr/share/plamo/functions fi + +fscheck +prepare "$@" +S2=$W/source if [ $opt_download -eq 1 ] ; then - for i in $url ; do - 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|tgz) tar xvpzf ${i##*/} ;; - bz2|tbz) tar xvpjf ${i##*/} ;; - xz|txz) tar xvpJf ${i##*/} ;; - esac - done + download_sources fi if [ $opt_config -eq 1 ] ; then for i in `seq 0 $((${#B[@]} - 1))` ; do if [ -d ${S2[$i]} ] ; then rm -rf ${S2[$i]} ; fi ; cp -a ${S[$i]} ${S2[$i]} if [ -d ${B[$i]} ] ; then rm -rf ${B[$i]} ; fi ; mkdir ${B[$i]} done - for i in `seq 0 $((${#B[@]} - 1))` ; do - cd ${S2[$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 + false && apply_patches + cd $S2 + for j in $patchfiles ; do + case ${j##*.} in + gz) gunzip -c $W/$j | patch -Np1 -i - ;; + *) patch -Np1 -i $W/$j ;; + esac done cp -p localedata/Makefile{,.orig} cat <<- "EOF" | patch localedata/Makefile @@ -256,13 +63,6 @@ > --no-archive \ EOF for i in `seq 0 $((${#B[@]} - 1))` ; do - cd ${S2[$i]} - if [ -f Makefile ] ; then - make clean - fi - if [ -f config.log ] ; then - rm -rf config.cache config.log - fi cd ${B[$i]} case $arch in i686) @@ -297,12 +97,7 @@ done fi if [ $opt_package -eq 1 ] ; then - if [ `id -u` -ne 0 ] ; then - read -p "Do you want to package as root? [y/N] " ans - if [ "x$ans" == "xY" -o "x$ans" == "xy" ] ; then - cd $W ; /bin/su -c "$0 package" ; exit - fi - fi + root_priv if [ -d $P ] ; then rm -rf $P ; fi ; mkdir -p $P if [ -d $C ] ; then rm -rf $C ; fi ; mkdir -p $C touch $W/i.st ; sleep 1 @@ -370,38 +165,8 @@ strip_bindir $P/usr/$libdir/glibc/getconf strip_libdir $P/usr/$libdir/audit touch -t `date '+%m%d0900'` $P/usr/$libdir/{gconv,glibc/getconf,audit} - for i in `seq 0 $((${#DOCS[@]} - 1))` ; do - for j in ${DOCS[$i]} ; do - for k in ${S[$i]}/$j ; do - install2 $k $docdir/${src[$i]}/${k#${S[$i]}/} - touch -r $k $docdir/${src[$i]}/${k#${S[$i]}/} - gzip_one $docdir/${src[$i]}/${k#${S[$i]}/} - done - done - if [ $i -eq 0 ] ; then - install $myname $docdir/$src - touch -t `date '+%m%d0900'` $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 - convert + setup_docdir + convert_links prune_symlink $P/usr/share/locale touch -t `date '+%m%d0900'` $P/usr/share/locale cat <<- EOF >> $P/install/doinst.sh @@ -453,6 +218,5 @@ tar rvpf $pkg.tar -C $P install/doinst.sh touch -t `date '+%m%d0900'` $pkg.tar ; xz $pkg.tar ; touch $pkg.tar.xz mv $pkg.tar.xz $pkg.txz - read -p "Do you want to keep work files? [y/N] " ans - if [ "x$ans" != "xY" -a "x$ans" != "xy" ] ; then rm -rf $P $C i.[se]t ; fi + cleanup fi --- plamo/00_base/old/coreutils-20160710/PlamoBuild.coreutils-8.25 2016-07-10 10:52:28.000000000 +0900 +++ plamo/00_base/coreutils/PlamoBuild.coreutils-8.25 2017-04-01 19:22:35.000000000 +0900 @@ -2,10 +2,12 @@ ###################################################################### url="http://ftp.gnu.org/gnu/coreutils/coreutils-8.25.tar.xz" +verify= +commitid= pkgbase=coreutils vers=8.25 arch=`uname -m` -build=P3 +build=P4 src=$pkgbase-$vers patchfiles="" OPT_CONFIG="--enable-install-program=arch @@ -13,229 +15,29 @@ DOCS="COPYING TODO INSTALL THANKS ChangeLog-2006 ChangeLog-2008 NEWS ChangeLog ChangeLog-2007 README ChangeLog-2005 AUTHORS ABOUT-NLS THANKS-to-translators" +template=20170323 +tmplurl=ftp://plamo.linet.gr.jp/pub/Plamo-src/admin ###################################################################### -fscheck() { - PANGRAM="The quick brown fox jumps over the lazy dog." - echo -n "Checking for the filesystem ... " - mkdir pangram ; ( cd pangram ; touch $PANGRAM ) - mv pangram pangram~ ; mkdir pangram ; touch -r pangram~ pangram - tar cpf pangram.tar pangram ; rmdir pangram ; mv pangram~ pangram - for i in $PANGRAM ; do tar rpf pangram.tar pangram/$i ; done - touch -t `date '+%m%d0900'` pangram.tar ; gzip pangram.tar - touch pangram.tar.gz ; mv pangram.tar.gz pangram1.tgz - tar cpf pangram.tar pangram - touch -t `date '+%m%d0900'` pangram.tar ; gzip pangram.tar - touch pangram.tar.gz ; mv pangram.tar.gz pangram2.tgz - if cmp -s pangram1.tgz pangram2.tgz ; then - echo "OK" - rm -rf pangram pangram1.tgz pangram2.tgz - else - echo "NG" - cat <<- "EOF" - Hmm, packaging may not be done properly on this filesystem. - Would you please try again on a default filesystem, thanks! - - Happy packaging!! - - Quitting... - EOF - exit - fi -} - -install2() { - install -d ${2%/*} ; install -m 644 $1 $2 -} - -strip_bindir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - shopt -s nullglob - cd $1 - for i in * ; do - echo "$i" - if [ -h $i ] ; then continue ; fi - if [ -n "`file $i | grep "not stripped"`" ] ; then - echo "stripping -p $i" - strip -p $i - fi - done - ) fi -} - -strip_libdir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - shopt -s nullglob - cd $1 - for i in *.so *.so.* *.a ; do - echo "$i" - if [ -h $i ] ; then continue ; fi - if [ -n "`nm -a $i | grep " a "`" ] ; then - if [ $i != ${i%.a} ] ; then - echo -n "ranlib and " - touch -r $i $i.mt ; ranlib $i ; touch -r $i.mt $i ; rm $i.mt - fi - echo "stripping -gp $i" - strip -gp $i - fi - done - ) fi -} - -gzip_dir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - cd $1 - files=`ls -f --indicator-style=none | sed '/^\.\{1,2\}$/d'` - for i in $files ; do - echo "$i" - if [ ! -f $i -a ! -h $i -o $i != ${i%.gz} ] ; then continue ; fi - lnks=`ls -l $i | awk '{print $2}'` - if [ $lnks -gt 1 ] ; then - inum=`ls -i $i | awk '{print $1}'` - for j in `find . -maxdepth 1 -inum $inum` ; do - if [ ${j#./} == $i ] ; then - gzip -f $i - else - rm -f ${j#./} ; ln $i.gz ${j#./}.gz - fi - done - elif [ -h $i ] ; then - target=`readlink $i` ; rm -f $i ; ln -s $target.gz $i.gz - else - gzip $i - fi - done - for i in $files ; do mv ${i%.gz}.gz $C ; done - for i in $files ; do mv $C/${i%.gz}.gz . ; done - ) fi -} - -gzip_one() { - gzip $1 ; mv $1.gz $C ; mv $C/${1##*/}.gz ${1%/*} -} - -compress() { - for i in {$P,$P/usr}/{sbin,bin} ; do strip_bindir $i ; done - for i in {$P,$P/usr}/$libdir ; do strip_libdir $i ; done - if [ -f $infodir/dir ] ; then rm -f $infodir/dir ; fi - gzip_dir $infodir - for i in `seq 9` n ; do gzip_dir $mandir/man$i ; done -} - -prune_symlink() { - echo "pruning symlink in $1" - if [ -d $1 ] ; then ( - cd $P - rm -f /tmp/iNsT-a.$$ ; touch /tmp/iNsT-a.$$ - for i in `find ${1#$P/} -type l` ; do - target=`readlink $i` - echo "$i -> $target" - echo $i$'\n'$target >> /tmp/iNsT-a.$$ - done - COUNT=1 - LINE=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - while [ -n "$LINE" ] ; do - LINKGOESIN=`dirname $LINE` - LINKNAMEIS=`basename $LINE` - COUNT=$(($COUNT + 1)) - LINKPOINTSTO=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - if [ ! -d install ] ; then mkdir install ; fi - cat <<- EOF >> install/doinst.sh - ( cd $LINKGOESIN ; rm -rf $LINKNAMEIS ) - ( cd $LINKGOESIN ; ln -sf $LINKPOINTSTO $LINKNAMEIS ) - EOF - rm -rf $LINE ; touch -t `date '+%m%d0900'` install/doinst.sh $LINE - COUNT=$(($COUNT + 1)) - LINE=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - done - rm -f /tmp/iNsT-a.$$ - ) fi -} - -convert() { - for i in {$P,$P/usr}/{sbin,bin} ; do prune_symlink $i ; done - for i in {$P,$P/usr}/$libdir ; do prune_symlink $i ; done - prune_symlink $infodir - for i in `seq 9` n ; do prune_symlink $mandir/man$i ; done -} - -fscheck -W=`pwd` -for i in `seq 0 $((${#src[@]} - 1))` ; do - S[$i]=$W/${src[$i]} ; B[$i]=$W/build`test ${#src[@]} -eq 1 || echo $i` -done -P=$W/work ; C=$W/pivot -infodir=$P/usr/share/info -mandir=$P/usr/share/man -docdir=$P/usr/share/doc -myname=`basename $0` -pkg=$pkgbase-$vers-$arch-$build -case $arch in x86_64) libdir=lib64 ;; *) libdir=lib ;; esac -if [ $# -eq 0 ] ; then - opt_download=1 ; opt_config=1 ; opt_build=1 ; opt_package=1 +if [ -f functions ] ; then + source ./functions +elif [ ! -f /usr/share/plamo/functions ] ; then + wget ftp://plamo.linet.gr.jp/pub/Plamo-src/admin/functions + source ./functions else - opt_download=0 ; opt_config=0 ; opt_build=0 ; opt_package=0 - for i in $@ ; do - case $i in - download) opt_download=1 ;; - config) opt_config=1 ;; - build) opt_build=1 ;; - package) opt_package=1 ;; - esac - done + source /usr/share/plamo/functions fi + +fscheck +prepare "$@" if [ $opt_download -eq 1 ] ; then - for i in $url ; do - 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|tgz) tar xvpzf ${i##*/} ;; - bz2|tbz) tar xvpjf ${i##*/} ;; - xz|txz) tar xvpJf ${i##*/} ;; - esac - done + download_sources fi if [ $opt_config -eq 1 ] ; then 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 - 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 + apply_patches cd $B cp -p po/Makevars{,.orig} sed 's@EXTRA_LOCALE_CATEGORIES@#&@g' po/Makevars.orig > po/Makevars @@ -246,12 +48,6 @@ fi for i in `seq 0 $((${#B[@]} - 1))` ; do cd ${B[$i]} - if [ -f Makefile ] ; then - make clean - fi - if [ -f config.log ] ; then - rm -rf config.cache config.log - fi if [ -x configure ] ; then ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --libdir='${exec_prefix}'/$libdir --infodir='${prefix}'/share/info \ @@ -268,12 +64,7 @@ done fi if [ $opt_package -eq 1 ] ; then - if [ `id -u` -ne 0 ] ; then - read -p "Do you want to package as root? [y/N] " ans - if [ "x$ans" == "xY" -o "x$ans" == "xy" ] ; then - cd $W ; /bin/su -c "$0 package" ; exit - fi - fi + root_priv if [ -d $P ] ; then rm -rf $P ; fi ; mkdir -p $P if [ -d $C ] ; then rm -rf $C ; fi ; mkdir -p $C touch $W/i.st ; sleep 1 @@ -297,24 +88,8 @@ compress strip_libdir $P/usr/libexec/coreutils touch -t `date '+%m%d0900'` $P/usr/libexec/coreutils - for i in `seq 0 $((${#DOCS[@]} - 1))` ; do - for j in ${DOCS[$i]} ; do - for k in ${S[$i]}/$j ; do - install2 $k $docdir/${src[$i]}/${k#${S[$i]}/} - touch -r $k $docdir/${src[$i]}/${k#${S[$i]}/} - gzip_one $docdir/${src[$i]}/${k#${S[$i]}/} - done - done - if [ $i -eq 0 ] ; then - install $myname $docdir/$src - touch -t `date '+%m%d0900'` $docdir/$src/$myname - gzip_one $docdir/$src/$myname - else - ln $docdir/$src/$myname.gz $docdir/${src[$i]} - fi - ( cd $docdir ; find ${src[$i]} -type d -exec touch -r $W/{} {} \; ) - done - convert + setup_docdir + convert_links prune_symlink $P/usr/share/locale tar cvpf $pkg.tar -C $P `cd $P ; find sbin | tail -n+2` tar rvpf $pkg.tar -C $P `cd $P ; find bin | tail -n+2` @@ -327,6 +102,5 @@ tar rvpf $pkg.tar -C $P install/doinst.sh touch -t `date '+%m%d0900'` $pkg.tar ; xz $pkg.tar ; touch $pkg.tar.xz mv $pkg.tar.xz $pkg.txz - read -p "Do you want to keep work files? [y/N] " ans - if [ "x$ans" != "xY" -a "x$ans" != "xy" ] ; then rm -rf $P $C i.[se]t ; fi + cleanup fi --- plamo/00_base/old/tar-20161124/PlamoBuild.tar-1.26 2016-11-24 09:05:00.000000000 +0900 +++ plamo/00_base/tar/PlamoBuild.tar-1.26 2017-05-02 11:16:38.000000000 +0900 @@ -5,248 +5,43 @@ ftp://plamo.linet.gr.jp/pub/Plamo-src/plamo/00_base/tar/tar-1.23-tartime.patch.gz ftp://plamo.linet.gr.jp/pub/Plamo-src/plamo/00_base/tar/tar-1.23-txz.patch.gz ftp://plamo.linet.gr.jp/pub/Plamo-src/plamo/00_base/tar/tar-1.26-no-gets.patch.gz" +verify= +digest= +commitid= pkgbase=tar vers=1.26 arch=`uname -m` -build=P3 +build=P4 src=$pkgbase-$vers patchfiles="`echo tar-1.2{3-{tartime,txz},6-no-gets}.patch.gz`" OPT_CONFIG="" DOCS="NEWS TODO README THANKS ChangeLog.1 AUTHORS INSTALL ABOUT-NLS ChangeLog COPYING" -template=20161020 +template=20170415 tmplurl=ftp://plamo.linet.gr.jp/pub/Plamo-src/admin ###################################################################### -fscheck() { - PANGRAM="The quick brown fox jumps over the lazy dog." - echo -n "Checking for the filesystem ... " - mkdir pangram ; ( cd pangram ; touch $PANGRAM ) - mv pangram pangram~ ; mkdir pangram ; touch -r pangram~ pangram - tar cpf pangram.tar pangram ; rmdir pangram ; mv pangram~ pangram - for i in $PANGRAM ; do tar rpf pangram.tar pangram/$i ; done - touch -t `date '+%m%d0900'` pangram.tar ; gzip pangram.tar - touch pangram.tar.gz ; mv pangram.tar.gz pangram1.tgz - tar cpf pangram.tar pangram - touch -t `date '+%m%d0900'` pangram.tar ; gzip pangram.tar - touch pangram.tar.gz ; mv pangram.tar.gz pangram2.tgz - if cmp -s pangram1.tgz pangram2.tgz ; then - echo "OK" - rm -rf pangram pangram1.tgz pangram2.tgz - else - echo "NG" - cat <<- "EOF" - Hmm, packaging may not be done properly on this filesystem. - Would you please try again on a default filesystem, thanks! - - Happy packaging!! - - Quitting... - EOF - exit - fi -} - -install2() { - install -d ${2%/*} ; install -m 644 $1 $2 -} - -strip_bindir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - shopt -s nullglob - cd $1 - for i in * ; do - echo "$i" - if [ -h $i ] ; then continue ; fi - if [ -n "`file $i | grep "not stripped"`" ] ; then - echo "stripping -p $i" - strip -p $i - fi - done - ) fi -} - -strip_libdir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - shopt -s nullglob - cd $1 - for i in *.so *.so.* *.a ; do - echo "$i" - if [ -h $i ] ; then continue ; fi - if [ -n "`nm -a $i | grep " a "`" ] ; then - if [ $i != ${i%.a} ] ; then - echo -n "ranlib and " - touch -r $i $i.mt ; ranlib $i ; touch -r $i.mt $i ; rm $i.mt - fi - echo "stripping -gp $i" - strip -gp $i - fi - done - ) fi -} - -gzip_dir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - cd $1 - files=`ls -f --indicator-style=none | sed '/^\.\{1,2\}$/d'` - for i in $files ; do - echo "$i" - if [ ! -f $i -a ! -h $i -o $i != ${i%.gz} ] ; then continue ; fi - lnks=`ls -l $i | awk '{print $2}'` - if [ $lnks -gt 1 ] ; then - inum=`ls -i $i | awk '{print $1}'` - for j in `find . -maxdepth 1 -inum $inum` ; do - if [ ${j#./} == $i ] ; then - gzip -f $i - else - rm -f ${j#./} ; ln $i.gz ${j#./}.gz - fi - done - elif [ -h $i ] ; then - target=`readlink $i` ; rm -f $i ; ln -s $target.gz $i.gz - else - gzip $i - fi - done - for i in $files ; do mv ${i%.gz}.gz $C ; done - for i in $files ; do mv $C/${i%.gz}.gz . ; done - ) fi -} - -gzip_one() { - gzip $1 ; mv $1.gz $C ; mv $C/${1##*/}.gz ${1%/*} -} - -compress() { - for i in {$P,$P/usr}/{sbin,bin} ; do strip_bindir $i ; done - for i in {$P,$P/usr}/$libdir ; do strip_libdir $i ; done - if [ -f $infodir/dir ] ; then rm -f $infodir/dir ; fi - gzip_dir $infodir - for i in `seq 9` n ; do gzip_dir $mandir/man$i ; done -} - -prune_symlink() { - echo "pruning symlink in $1" - if [ -d $1 ] ; then ( - cd $P - rm -f /tmp/iNsT-a.$$ ; touch /tmp/iNsT-a.$$ - for i in `find ${1#$P/} -type l` ; do - target=`readlink $i` - echo "$i -> $target" - echo $i$'\n'$target >> /tmp/iNsT-a.$$ - done - COUNT=1 - LINE=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - while [ -n "$LINE" ] ; do - LINKGOESIN=`dirname $LINE` - LINKNAMEIS=`basename $LINE` - COUNT=$(($COUNT + 1)) - LINKPOINTSTO=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - if [ ! -d install ] ; then mkdir install ; fi - cat <<- EOF >> install/doinst.sh - ( cd $LINKGOESIN ; rm -rf $LINKNAMEIS ) - ( cd $LINKGOESIN ; ln -sf $LINKPOINTSTO $LINKNAMEIS ) - EOF - rm -rf $LINE ; touch -t `date '+%m%d0900'` install/doinst.sh $LINE - COUNT=$(($COUNT + 1)) - LINE=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - done - rm -f /tmp/iNsT-a.$$ - ) fi -} - -convert() { - for i in {$P,$P/usr}/{sbin,bin} ; do prune_symlink $i ; done - for i in {$P,$P/usr}/$libdir ; do prune_symlink $i ; done - prune_symlink $infodir - for i in `seq 9` n ; do prune_symlink $mandir/man$i ; done -} - -fscheck -W=`pwd` -for i in `seq 0 $((${#src[@]} - 1))` ; do - S[$i]=$W/${src[$i]} ; B[$i]=$W/build`test ${#src[@]} -eq 1 || echo $i` -done -P=$W/work ; C=$W/pivot -infodir=$P/usr/share/info -mandir=$P/usr/share/man -docdir=$P/usr/share/doc -myname=`basename $0` -pkg=$pkgbase-$vers-$arch-$build -case $arch in x86_64) libdir=lib64 ;; *) libdir=lib ;; esac -if [ $# -eq 0 ] ; then - opt_download=1 ; opt_config=1 ; opt_build=1 ; opt_package=1 +if [ -f functions ] ; then + source ./functions +elif [ ! -f /usr/share/plamo/functions ] ; then + wget ftp://plamo.linet.gr.jp/pub/Plamo-src/admin/functions + source ./functions else - opt_download=0 ; opt_config=0 ; opt_build=0 ; opt_package=0 - for i in $@ ; do - case $i in - download) opt_download=1 ;; - config) opt_config=1 ;; - build) opt_build=1 ;; - package) opt_package=1 ;; - esac - done + source /usr/share/plamo/functions fi + +fscheck +prepare "$@" if [ $opt_download -eq 1 ] ; then - for i in $url ; do - 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|tgz) tar xvpzf ${i##*/} ;; - bz2|tbz) tar xvpjf ${i##*/} ;; - xz|txz) tar xvpJf ${i##*/} ;; - esac - done + download_sources fi if [ $opt_config -eq 1 ] ; then 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 + apply_patches 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 - if [ -f config.log ] ; then - rm -rf config.cache config.log - fi if [ -x configure ] ; then ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --libdir='${exec_prefix}'/$libdir --infodir='${prefix}'/share/info \ @@ -263,12 +58,7 @@ done fi if [ $opt_package -eq 1 ] ; then - if [ `id -u` -ne 0 ] ; then - read -p "Do you want to package as root? [y/N] " ans - if [ "x$ans" == "xY" -o "x$ans" == "xy" ] ; then - cd $W ; /bin/su -c "$0 package" ; exit - fi - fi + root_priv if [ -d $P ] ; then rm -rf $P ; fi ; mkdir -p $P if [ -d $C ] ; then rm -rf $C ; fi ; mkdir -p $C touch $W/i.st ; sleep 1 @@ -284,38 +74,8 @@ -exec touch -t `date '+%m%d0900'` {} \; compress strip_bindir $P/usr/libexec - for i in `seq 0 $((${#DOCS[@]} - 1))` ; do - for j in ${DOCS[$i]} ; do - for k in ${S[$i]}/$j ; do - install2 $k $docdir/${src[$i]}/${k#${S[$i]}/} - touch -r $k $docdir/${src[$i]}/${k#${S[$i]}/} - gzip_one $docdir/${src[$i]}/${k#${S[$i]}/} - done - done - if [ $i -eq 0 ] ; then - install $myname $docdir/$src - touch -t `date '+%m%d0900'` $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 - convert + setup_docdir + convert_links tar cvpf $pkg.tar -C $P `cd $P ; find usr/bin | tail -n+2` tar rvpf $pkg.tar -C $P `cd $P ; find usr/libexec | tail -n+2` tar rvpf $pkg.tar -C $P `cd $P ; find usr/share/locale -name *.mo` @@ -323,6 +83,5 @@ tar rvpf $pkg.tar -C $P usr/share/doc/$src touch -t `date '+%m%d0900'` $pkg.tar ; xz $pkg.tar ; touch $pkg.tar.xz mv $pkg.tar.xz $pkg.txz - read -p "Do you want to keep work files? [y/N] " ans - if [ "x$ans" != "xY" -a "x$ans" != "xy" ] ; then rm -rf $P $C i.[se]t ; fi + cleanup fi --- plamo/00_base/old/glibc-20170405/PlamoBuild.glibc-2.20 2017-04-05 20:52:20.000000000 +0900 +++ plamo/00_base/glibc/PlamoBuild.glibc-2.20 2017-11-01 10:21:04.000000000 +0900 @@ -12,11 +12,13 @@ ftp://plamo.linet.gr.jp/pub/Plamo-src/plamo/00_base/glibc/CVE-2015-8778.patch ftp://plamo.linet.gr.jp/pub/Plamo-src/plamo/00_base/glibc/CVE-2015-8779.patch" verify= +digest= +branch= commitid= pkgbase=glibc vers=2.20 arch=`uname -m` -build=P6 +build=P7 src=$pkgbase-$vers patchfiles="glibc-2.19-fhs-1.patch glibc-2.20-do_ftell_wide-memleak.patch glibc-2.20-getifaddrs_internal-segfault.patch @@ -25,7 +27,7 @@ OPT_CONFIG="--enable-kernel=2.6.32 --enable-obsolete-rpc" DOCS="BUGS CONFORMANCE COPYING* ChangeLog* INSTALL LICENSES NEWS PROJECTS README" -template=20170323 +template=20170713 tmplurl=ftp://plamo.linet.gr.jp/pub/Plamo-src/admin ###################################################################### --- plamo/00_base/old/hdsetup-20170220/PlamoBuild.hdsetup-6.2 2017-02-20 15:05:53.000000000 +0900 +++ plamo/00_base/hdsetup/PlamoBuild.hdsetup-6.2 2017-04-07 13:06:40.000000000 +0900 @@ -13,10 +13,12 @@ ftp://plamo.linet.gr.jp/pub/Plamo-src/plamo/00_base/tar/tar-1.23-txz.patch.gz ftp://plamo.linet.gr.jp/pub/Plamo-src/plamo/00_base/tar/tar-1.26-no-gets.patch.gz ftp://plamo.linet.gr.jp/pub/Plamo-src/plamo/00_base/hdsetup/hdsetup-plamoscripts.tar.gz" +verify= +commitid= pkgbase=hdsetup vers=6.2 arch=`uname -m` -build=P1 +build=P2 src[0]=busybox-1.25.1 src[1]=dialog-1.3-20160828 src[2]=coreutils-8.25 @@ -24,14 +26,9 @@ src[4]=bzip2-1.0.6 src[5]=xz-5.2.2 src[6]=tar-1.26 -patchfiles[0]="" -patchfiles[1]="" -patchfiles[2]="" -patchfiles[3]="" -patchfiles[4]="" -patchfiles[5]="" +patchfiles="" patchfiles[6]="`echo tar-1.2{3-{tartime,txz},6-no-gets}.patch.gz`" -OPT_CONFIG[0]="" +OPT_CONFIG="" OPT_CONFIG[1]="--bindir=/bin --enable-nls --with-ncursesw --enable-widec" OPT_CONFIG[2]="--bindir=/bin --enable-no-install-program=chroot,hostid,nice" OPT_CONFIG[2]+=",who,users,pinky,uptime,stty,df,stdbuf,[,base64,base32" @@ -46,246 +43,37 @@ OPT_CONFIG[2]+=",tty,uname,unexpand,uniq,unlink,vdir,wc,whoami,yes --without-gmp" OPT_CONFIG[3]="--bindir=/bin" -OPT_CONFIG[4]="" OPT_CONFIG[5]="--bindir=/bin --disable-xzdec --disable-lzmadec --disable-lzmainfo --disable-lzma-links --disable-scripts" OPT_CONFIG[6]="--bindir=/bin" DOCS="LICENSE INSTALL TODO AUTHORS README TODO_unicode" -template=20170204 +template=20170323 tmplurl=ftp://plamo.linet.gr.jp/pub/Plamo-src/admin ###################################################################### -fscheck() { - PANGRAM="The quick brown fox jumps over the lazy dog." - echo -n "Checking for the filesystem ... " - mkdir pangram ; ( cd pangram ; touch $PANGRAM ) - mv pangram pangram~ ; mkdir pangram ; touch -r pangram~ pangram - tar cpf pangram.tar pangram ; rmdir pangram ; mv pangram~ pangram - for i in $PANGRAM ; do tar rpf pangram.tar pangram/$i ; done - touch -t `date '+%m%d0900'` pangram.tar ; gzip pangram.tar - touch pangram.tar.gz ; mv pangram.tar.gz pangram1.tgz - tar cpf pangram.tar pangram - touch -t `date '+%m%d0900'` pangram.tar ; gzip pangram.tar - touch pangram.tar.gz ; mv pangram.tar.gz pangram2.tgz - if cmp -s pangram1.tgz pangram2.tgz ; then - echo "OK" - rm -rf pangram pangram1.tgz pangram2.tgz - else - echo "NG" - cat <<- "EOF" - Hmm, packaging may not be done properly on this filesystem. - Would you please try again on a default filesystem, thanks! - - Happy packaging!! - - Quitting... - EOF - exit - fi -} - -install2() { - install -d ${2%/*} ; install -m 644 $1 $2 -} - -strip_bindir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - shopt -s nullglob - cd $1 - for i in * ; do - echo "$i" - if [ -h $i ] ; then continue ; fi - if [ -n "`file $i | grep "not stripped"`" ] ; then - echo "stripping -p $i" - strip -p $i - fi - done - ) fi -} - -strip_libdir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - shopt -s nullglob - cd $1 - for i in *.so *.so.* *.a ; do - echo "$i" - if [ -h $i ] ; then continue ; fi - if [ -n "`nm -a $i | grep " a "`" ] ; then - if [ $i != ${i%.a} ] ; then - echo -n "ranlib and " - touch -r $i $i.mt ; ranlib $i ; touch -r $i.mt $i ; rm $i.mt - fi - echo "stripping -gp $i" - strip -gp $i - fi - done - ) fi -} - -gzip_dir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - cd $1 - files=`ls -f --indicator-style=none | sed '/^\.\{1,2\}$/d'` - for i in $files ; do - echo "$i" - if [ ! -f $i -a ! -h $i -o $i != ${i%.gz} ] ; then continue ; fi - lnks=`ls -l $i | awk '{print $2}'` - if [ $lnks -gt 1 ] ; then - inum=`ls -i $i | awk '{print $1}'` - for j in `find . -maxdepth 1 -inum $inum` ; do - if [ ${j#./} == $i ] ; then - gzip -f $i - else - rm -f ${j#./} ; ln $i.gz ${j#./}.gz - fi - done - elif [ -h $i ] ; then - target=`readlink $i` ; rm -f $i ; ln -s $target.gz $i.gz - else - gzip $i - fi - done - for i in $files ; do mv ${i%.gz}.gz $C ; done - for i in $files ; do mv $C/${i%.gz}.gz . ; done - ) fi -} - -gzip_one() { - gzip $1 ; mv $1.gz $C ; mv $C/${1##*/}.gz ${1%/*} -} - -compress() { - for i in {$P,$P/usr}/{sbin,bin} ; do strip_bindir $i ; done - for i in {$P,$P/usr}/$libdir ; do strip_libdir $i ; done - if [ -f $infodir/dir ] ; then rm -f $infodir/dir ; fi - gzip_dir $infodir - for i in `seq 9` n ; do gzip_dir $mandir/man$i ; done -} - -prune_symlink() { - echo "pruning symlink in $1" - if [ -d $1 ] ; then ( - cd $P - rm -f /tmp/iNsT-a.$$ ; touch /tmp/iNsT-a.$$ - for i in `find ${1#$P/} -type l` ; do - target=`readlink $i` - echo "$i -> $target" - echo $i$'\n'$target >> /tmp/iNsT-a.$$ - done - COUNT=1 - LINE=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - while [ -n "$LINE" ] ; do - LINKGOESIN=`dirname $LINE` - LINKNAMEIS=`basename $LINE` - COUNT=$(($COUNT + 1)) - LINKPOINTSTO=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - if [ ! -d install ] ; then mkdir install ; fi - cat <<- EOF >> install/doinst.sh - ( cd $LINKGOESIN ; rm -rf $LINKNAMEIS ) - ( cd $LINKGOESIN ; ln -sf $LINKPOINTSTO $LINKNAMEIS ) - EOF - rm -rf $LINE ; touch -t `date '+%m%d0900'` install/doinst.sh $LINE - COUNT=$(($COUNT + 1)) - LINE=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - done - rm -f /tmp/iNsT-a.$$ - ) fi -} - -convert() { - for i in {$P,$P/usr}/{sbin,bin} ; do prune_symlink $i ; done - for i in {$P,$P/usr}/$libdir ; do prune_symlink $i ; done - prune_symlink $infodir - for i in `seq 9` n ; do prune_symlink $mandir/man$i ; done -} - -fscheck -W=`pwd` -for i in `seq 0 $((${#src[@]} - 1))` ; do - S[$i]=$W/${src[$i]} ; B[$i]=$W/build`test ${#src[@]} -eq 1 || echo $i` -done -P=$W/work ; C=$W/pivot -infodir=$P/usr/share/info -mandir=$P/usr/share/man -docdir=$P/usr/share/doc -myname=`basename $0` -pkg=$pkgbase-$vers-$arch-$build -case $arch in x86_64) libdir=lib64 ;; *) libdir=lib ;; esac -if [ $# -eq 0 ] ; then - opt_download=1 ; opt_config=1 ; opt_build=1 ; opt_package=1 +if [ -f functions ] ; then + source ./functions +elif [ ! -f /usr/share/plamo/functions ] ; then + wget ftp://plamo.linet.gr.jp/pub/Plamo-src/admin/functions + source ./functions else - opt_download=0 ; opt_config=0 ; opt_build=0 ; opt_package=0 - for i in $@ ; do - case $i in - download) opt_download=1 ;; - config) opt_config=1 ;; - build) opt_build=1 ;; - package) opt_package=1 ;; - esac - done + source /usr/share/plamo/functions fi + +fscheck +prepare "$@" if [ $opt_download -eq 1 ] ; then - for i in $url ; do - 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|tgz) tar xvpzf ${i##*/} ;; - bz2|tbz) tar xvpjf ${i##*/} ;; - xz|txz) tar xvpJf ${i##*/} ;; - esac - done + download_sources fi if [ $opt_config -eq 1 ] ; then 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 - 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 + apply_patches cd ${B[0]} cp -p $W/busybox-1.25.1-config .config for i in `seq 0 $((${#B[@]} - 1))` ; do cd ${B[$i]} - if [ -f [Mm]akefile ] ; then - make clean - fi - if [ -f config.log ] ; then - rm -rf config.cache config.log - fi if [ -x configure ] ; then ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --libdir='${exec_prefix}'/$libdir --infodir='${prefix}'/share/info \ @@ -308,12 +96,7 @@ done fi if [ $opt_package -eq 1 ] ; then - if [ `id -u` -ne 0 ] ; then - read -p "Do you want to package as root? [y/N] " ans - if [ "x$ans" == "xY" -o "x$ans" == "xy" ] ; then - cd $W ; /bin/su -c "$0 package" ; exit - fi - fi + root_priv if [ -d $P ] ; then rm -rf $P ; fi ; mkdir -p $P if [ -d $C ] ; then rm -rf $C ; fi ; mkdir -p $C touch $W/i.st ; sleep 1 @@ -343,37 +126,7 @@ compress strip_bindir $P/sbin/installer touch -t `date '+%m%d0900'` $P/sbin/installer - for i in `seq 0 $((${#DOCS[@]} - 1))` ; do - for j in ${DOCS[$i]} ; do - for k in ${S[$i]}/$j ; do - install2 $k $docdir/${src[$i]}/${k#${S[$i]}/} - touch -r $k $docdir/${src[$i]}/${k#${S[$i]}/} - gzip_one $docdir/${src[$i]}/${k#${S[$i]}/} - done - done - if [ $i -eq 0 ] ; then - install $myname $docdir/$src - touch -t `date '+%m%d0900'` $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 + setup_docdir cp -a $S/docs $docdir/$src for i in busybox.pod BusyBox.txt busybox.{1,net} BusyBox.html ; do cp -a $B/docs/$i $docdir/$src/docs @@ -383,16 +136,15 @@ touch -r $S/docs $docdir/$src/docs chown -R root.root $docdir/$src/docs mv $docdir/$src/{docs,{INSTALL,TODO,AUTHORS,README}.gz} $C - mv $docdir/$src/{TODO_unicode,$myname,$spec}.gz $C + mv $docdir/$src/{TODO_unicode,$func,$myname,$spec}.gz $C mv $C/{docs,{INSTALL,TODO,AUTHORS,README}.gz} $docdir/$src - mv $C/{TODO_unicode,$myname,$spec}.gz $docdir/$src + mv $C/{TODO_unicode,$func,$myname,$spec}.gz $docdir/$src touch -r $S $docdir/$src - convert + convert_links tar cvpf $pkg.tar -C $P `cd $P ; find sbin -maxdepth 1 | tail -n+2` tar rvpf $pkg.tar -C $P usr/lib/setup tar rvpf $pkg.tar -C $P usr/share/doc/$src touch -t `date '+%m%d0900'` $pkg.tar ; xz $pkg.tar ; touch $pkg.tar.xz mv $pkg.tar.xz $pkg.txz - read -p "Do you want to keep work files? [y/N] " ans - if [ "x$ans" != "xY" -a "x$ans" != "xy" ] ; then rm -rf $P $C i.[se]t ; fi + cleanup fi --- plamo/00_base/old/sysvinit-20170502/PlamoBuild.sysvinit-2.88dsf 2017-05-02 11:05:13.000000000 +0900 +++ plamo/00_base/sysvinit/PlamoBuild.sysvinit-2.88dsf 2017-05-07 23:16:02.000000000 +0900 @@ -9,7 +9,7 @@ pkgbase=sysvinit vers=2.88dsf arch=`uname -m` -build=P19 +build=P20 src=$pkgbase-$vers patchfiles="" OPT_CONFIG="" @@ -101,7 +101,7 @@ touch -r etc/rc.d $P/etc/rc.d cat <<- EOF >> $P/install/doinst.sh #%% begin initialize $src - EOF + EOF cat <<- "EOF" >> $P/install/doinst.sh vers=`ls /usr/lib/setup/Plamo* | tail -n1 | cut -d"/" -f5` echo "%s %r ($vers) %v" > /etc/motd.in --- plamo/00_base/old/shadow-20170430/PlamoBuild.shadow-git_20130908 2017-04-30 17:46:49.000000000 +0900 +++ plamo/00_base/shadow/PlamoBuild.shadow-git_20130908 2017-06-24 14:34:20.000000000 +0900 @@ -39,17 +39,17 @@ done apply_patches cd $B - cp -p etc/pam.d/chfn etc/pam.d/chfn.orig + cp -p etc/pam.d/chfn{,.orig} cat <<- "EOF" | patch etc/pam.d/chfn 2a3 > auth include system-auth EOF - cp -p etc/pam.d/chsh etc/pam.d/chsh.orig + cp -p etc/pam.d/chsh{,.orig} cat <<- "EOF" | patch etc/pam.d/chsh 2a3 > auth include system-auth EOF - cp -p etc/pam.d/login etc/pam.d/login.orig + cp -p etc/pam.d/login{,.orig} cat <<- "EOF" | patch etc/pam.d/login 7c7 < session required pam_selinux.so close @@ -64,7 +64,7 @@ > session required pam_lastlog.so > session optional pam_ck_connector.so nox11 EOF - cp -p etc/pam.d/su etc/pam.d/su.orig + cp -p etc/pam.d/su{,.orig} cat <<- "EOF" | patch etc/pam.d/su 6c6 < auth required pam_wheel.so use_uid @@ -79,15 +79,15 @@ --- > #session required pam_selinux.so open multiple EOF - cp -p etc/pam.d/chage etc/pam.d/chage.orig + cp -p etc/pam.d/chage{,.orig} cat <<- "EOF" | patch etc/pam.d/chage 2a3 > auth include system-auth EOF - cp -p etc/useradd etc/useradd.orig + cp -p etc/useradd{,.orig} sed '/^GROUP=/s@1000@100@g' etc/useradd.orig \ | sed '/^CREATE_MAIL_SPOOL=/s@yes@no@g' > etc/useradd - cp -p etc/login.defs etc/login.defs.orig + cp -p etc/login.defs{,.orig} cat <<- "EOF" | patch etc/login.defs 17c17 < FAILLOG_ENAB yes @@ -231,13 +231,13 @@ tar rvpf $pkg.tar -C $P `cd $P ; find usr/share/locale -name *.mo` for loc in cs da de fi fr hu id it ja_JP.eucJP ko pl pt_BR ru sv tr \ zh_CN zh_TW ; do - [ -d $P/usr/share/man/$loc/man1 ] && tar rvpf $pkg.tar -C $P \ + [ -d $mandir/$loc/man1 ] && tar rvpf $pkg.tar -C $P \ `cd $P ; find usr/share/man/$loc/man1 | tail -n+2` - [ -d $P/usr/share/man/$loc/man3 ] && tar rvpf $pkg.tar -C $P \ + [ -d $mandir/$loc/man3 ] && tar rvpf $pkg.tar -C $P \ `cd $P ; find usr/share/man/$loc/man3 | tail -n+2` - [ -d $P/usr/share/man/$loc/man5 ] && tar rvpf $pkg.tar -C $P \ + [ -d $mandir/$loc/man5 ] && tar rvpf $pkg.tar -C $P \ `cd $P ; find usr/share/man/$loc/man5 | tail -n+2` - [ -d $P/usr/share/man/$loc/man8 ] && tar rvpf $pkg.tar -C $P \ + [ -d $mandir/$loc/man8 ] && tar rvpf $pkg.tar -C $P \ `cd $P ; find usr/share/man/$loc/man8 | tail -n+2` done tar rvpf $pkg.tar -C $P `cd $P ; find usr/share/man/man1 | tail -n+2` --- plamo/00_base/old/sudo-20160607/PlamoBuild.sudo-1.8.15 2016-06-07 14:15:45.000000000 +0900 +++ plamo/00_base/sudo/PlamoBuild.sudo-1.8.15 2017-05-02 09:58:11.000000000 +0900 @@ -2,236 +2,47 @@ ###################################################################### url="http://www.sudo.ws/sudo/dist/sudo-1.8.15.tar.gz" +verify= +digest= +commitid= pkgbase=sudo vers=1.8.15 arch=`uname -m` -build=P3 +build=P4 src=$pkgbase-$vers +patchfiles="" OPT_CONFIG="--with-pam --without-sendmail --with-env-editor --with-all-insults --with-hal-insults --with-secure-path" DOCS="ABOUT-NLS ChangeLog INSTALL* MANIFEST NEWS README* `echo doc/{CONTRIBUTORS,HISTORY,LICENSE,TROUBLESHOOTING,UPGRADE}`" +template=20170415 +tmplurl=ftp://plamo.linet.gr.jp/pub/Plamo-src/admin ###################################################################### -fscheck() { - PANGRAM="The quick brown fox jumps over the lazy dog." - echo -n "Checking for the filesystem ... " - mkdir pangram ; ( cd pangram ; touch $PANGRAM ) - mv pangram pangram~ ; mkdir pangram ; touch -r pangram~ pangram - tar cpf pangram.tar pangram ; rmdir pangram ; mv pangram~ pangram - for i in $PANGRAM ; do tar rpf pangram.tar pangram/$i ; done - touch -t `date '+%m%d0900'` pangram.tar ; gzip pangram.tar - touch pangram.tar.gz ; mv pangram.tar.gz pangram1.tgz - tar cpf pangram.tar pangram - touch -t `date '+%m%d0900'` pangram.tar ; gzip pangram.tar - touch pangram.tar.gz ; mv pangram.tar.gz pangram2.tgz - if cmp -s pangram1.tgz pangram2.tgz ; then - echo "OK" - rm -rf pangram pangram1.tgz pangram2.tgz - else - echo "NG" - cat <<- "EOF" - Hmm, packaging may not be done properly on this filesystem. - Would you please try again on a default filesystem, thanks! - - Happy packaging!! - - Quitting... - EOF - exit - fi -} - -install2() { - install -d ${2%/*} ; install -m 644 $1 $2 -} - -strip_bindir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - shopt -s nullglob - cd $1 - for i in * ; do - echo "$i" - if [ -h $i ] ; then continue ; fi - if [ -n "`file $i | grep "not stripped"`" ] ; then - echo "stripping -p $i" - strip -p $i - fi - done - ) fi -} - -strip_libdir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - shopt -s nullglob - cd $1 - for i in *.so *.so.* *.a ; do - echo "$i" - if [ -h $i ] ; then continue ; fi - if [ -n "`nm -a $i | grep " a "`" ] ; then - if [ $i != ${i%.a} ] ; then - echo -n "ranlib and " - touch -r $i $i.mt ; ranlib $i ; touch -r $i.mt $i ; rm $i.mt - fi - echo "stripping -gp $i" - strip -gp $i - fi - done - ) fi -} - -gzip_dir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - cd $1 - files=`ls -f --indicator-style=none | sed '/^\.\{1,2\}$/d'` - for i in $files ; do - echo "$i" - if [ ! -f $i -a ! -h $i -o $i != ${i%.gz} ] ; then continue ; fi - lnks=`ls -l $i | awk '{print $2}'` - if [ $lnks -gt 1 ] ; then - inum=`ls -i $i | awk '{print $1}'` - for j in `find . -maxdepth 1 -inum $inum` ; do - if [ ${j#./} == $i ] ; then - gzip -f $i - else - rm -f ${j#./} ; ln $i.gz ${j#./}.gz - fi - done - elif [ -h $i ] ; then - target=`readlink $i` ; rm -f $i ; ln -s $target.gz $i.gz - else - gzip $i - fi - done - for i in $files ; do mv ${i%.gz}.gz $C ; done - for i in $files ; do mv $C/${i%.gz}.gz . ; done - ) fi -} - -gzip_one() { - gzip $1 ; mv $1.gz $C ; mv $C/${1##*/}.gz ${1%/*} -} - -compress() { - for i in {$P,$P/usr}/{sbin,bin} ; do strip_bindir $i ; done - for i in {$P,$P/usr}/$libdir ; do strip_libdir $i ; done - if [ -f $infodir/dir ] ; then rm -f $infodir/dir ; fi - gzip_dir $infodir - for i in `seq 9` n ; do gzip_dir $mandir/man$i ; done -} - -prune_symlink() { - echo "pruning symlink in $1" - if [ -d $1 ] ; then ( - cd $P - rm -f /tmp/iNsT-a.$$ ; touch /tmp/iNsT-a.$$ - for i in `find ${1#$P/} -type l` ; do - target=`readlink $i` - echo "$i -> $target" - echo $i$'\n'$target >> /tmp/iNsT-a.$$ - done - COUNT=1 - LINE=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - while [ -n "$LINE" ] ; do - LINKGOESIN=`dirname $LINE` - LINKNAMEIS=`basename $LINE` - COUNT=$(($COUNT + 1)) - LINKPOINTSTO=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - if [ ! -d install ] ; then mkdir install ; fi - cat <<- EOF >> install/doinst.sh - ( cd $LINKGOESIN ; rm -rf $LINKNAMEIS ) - ( cd $LINKGOESIN ; ln -sf $LINKPOINTSTO $LINKNAMEIS ) - EOF - rm -rf $LINE ; touch -t `date '+%m%d0900'` install/doinst.sh $LINE - COUNT=$(($COUNT + 1)) - LINE=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - done - rm -f /tmp/iNsT-a.$$ - ) fi -} - -convert() { - for i in {$P,$P/usr}/{sbin,bin} ; do prune_symlink $i ; done - for i in {$P,$P/usr}/$libdir ; do prune_symlink $i ; done - prune_symlink $P/usr/libexec/sudo - prune_symlink $infodir - for i in `seq 9` n ; do prune_symlink $mandir/man$i ; done -} - -fscheck -W=`pwd` -for i in `seq 0 $((${#src[@]} - 1))` ; do - S[$i]=$W/${src[$i]} ; B[$i]=$W/build`test ${#src[@]} -eq 1 || echo $i` -done -P=$W/work ; C=$W/pivot -infodir=$P/usr/share/info -mandir=$P/usr/share/man -docdir=$P/usr/share/doc -myname=`basename $0` -pkg=$pkgbase-$vers-$arch-$build -case $arch in x86_64) libdir=lib64 ;; *) libdir=lib ;; esac -if [ $# -eq 0 ] ; then - opt_download=1 ; opt_config=1 ; opt_build=1 ; opt_package=1 +if [ -f functions ] ; then + source ./functions +elif [ ! -f /usr/share/plamo/functions ] ; then + wget ftp://plamo.linet.gr.jp/pub/Plamo-src/admin/functions + source ./functions else - opt_download=0 ; opt_config=0 ; opt_build=0 ; opt_package=0 - for i in $@ ; do - case $i in - download) opt_download=1 ;; - config) opt_config=1 ;; - build) opt_build=1 ;; - package) opt_package=1 ;; - esac - done + source /usr/share/plamo/functions fi + +fscheck +prepare "$@" if [ $opt_download -eq 1 ] ; then - for i in $url ; do - 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|tgz) tar xvpzf ${i##*/} ;; - bz2|tbz) tar xvpjf ${i##*/} ;; - xz|txz) tar xvpJf ${i##*/} ;; - esac - done + download_sources fi if [ $opt_config -eq 1 ] ; then 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 + apply_patches + cd $B + cp -p plugins/sudoers/sudoers.in{,.orig} + sed -i 's/ *$//' plugins/sudoers/sudoers.in for i in `seq 0 $((${#B[@]} - 1))` ; do cd ${B[$i]} - if [ -f Makefile ] ; then - make clean - fi - if [ -f config.log ] ; then - rm -rf config.cache config.log - fi if [ -x configure ] ; then ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --libdir='${exec_prefix}'/$libdir --infodir='${prefix}'/share/info \ @@ -248,12 +59,7 @@ done fi if [ $opt_package -eq 1 ] ; then - if [ `id -u` -ne 0 ] ; then - read -p "Do you want to package as root? [y/N] " ans - if [ "x$ans" == "xY" -o "x$ans" == "xy" ] ; then - cd $W ; /bin/su -c "$0 package" ; exit - fi - fi + root_priv if [ -d $P ] ; then rm -rf $P ; fi ; mkdir -p $P if [ -d $C ] ; then rm -rf $C ; fi ; mkdir -p $C touch $W/i.st ; sleep 1 @@ -279,28 +85,14 @@ -exec touch -t `date '+%m%d0900'` {} \; compress strip_libdir $P/usr/libexec/sudo - for i in `seq 0 $((${#DOCS[@]} - 1))` ; do - for j in ${DOCS[$i]} ; do - for k in ${S[$i]}/$j ; do - install2 $k $docdir/${src[$i]}/${k#${S[$i]}/} - touch -r $k $docdir/${src[$i]}/${k#${S[$i]}/} - gzip_one $docdir/${src[$i]}/${k#${S[$i]}/} - done - done - if [ $i -eq 0 ] ; then - install $myname $docdir/$src - touch -t `date '+%m%d0900'` $docdir/$src/$myname - gzip_one $docdir/$src/$myname - else - ln $docdir/$src/$myname.gz $docdir/${src[$i]} - fi - ( cd $docdir ; find ${src[$i]} -type d -exec touch -r $W/{} {} \; ) - done + setup_docdir mv $docdir/sudo/examples $docdir/$src - mv $docdir/$src/{examples,$myname.gz} $C - mv $C/{examples,$myname.gz} $docdir/$src + mv $docdir/$src/{examples,{$func,$myname,$spec}.gz} $C + mv $C/{examples,{$func,$myname,$spec}.gz} $docdir/$src touch -t `date '+%m%d0900'` $docdir/$src{,/doc} - convert + false && convert_links + for i in $P/usr/{sbin,bin,libexec/sudo} ; do prune_symlink $i ; done + for i in 5 8 ; do prune_symlink $mandir/man$i ; done touch -t `date '+%m%d0900'` $P/usr/libexec/sudo cat <<- "EOF" >> $P/install/doinst.sh @@ -316,7 +108,7 @@ tar rvpf $pkg.tar -C $P `cd $P ; find usr/bin | tail -n+2` tar rvpf $pkg.tar -C $P usr/libexec/sudo tar rvpf $pkg.tar -C $P `cd $P ; find usr/include | 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/locale -name *.mo` tar rvpf $pkg.tar -C $P `cd $P ; find etc -maxdepth 1 | tail -n+2` tar rvpf $pkg.tar -C $P var/{run,db}/sudo tar rvpf $pkg.tar -C $P `cd $P ; find usr/share/man/man5 | tail -n+2` @@ -325,6 +117,5 @@ tar rvpf $pkg.tar -C $P install/doinst.sh touch -t `date '+%m%d0900'` $pkg.tar ; xz $pkg.tar ; touch $pkg.tar.xz mv $pkg.tar.xz $pkg.txz - read -p "Do you want to keep work files? [y/N] " ans - if [ "x$ans" != "xY" -a "x$ans" != "xy" ] ; then rm -rf $P $C i.[se]t ; fi + cleanup fi --- plamo/00_base/old/dhcp-20160606/PlamoBuild.dhcp-4.3.3 2016-06-06 06:43:26.000000000 +0900 +++ plamo/00_base/dhcp/PlamoBuild.dhcp-4.3.3 2017-04-01 20:11:15.000000000 +0900 @@ -2,225 +2,39 @@ ###################################################################### url="http://ftp.isc.org/isc/dhcp/4.3.3/dhcp-4.3.3.tar.gz" +verify= +commitid= pkgbase=dhcp vers=4.3.3 arch=`uname -m` -build=P4 +build=P5 src=$pkgbase-$vers +patchfiles="" OPT_CONFIG="" DOCS="LICENSE README RELNOTES" +template=20170323 +tmplurl=ftp://plamo.linet.gr.jp/pub/Plamo-src/admin ###################################################################### -fscheck() { - PANGRAM="The quick brown fox jumps over the lazy dog." - echo -n "Checking for the filesystem ... " - mkdir pangram ; ( cd pangram ; touch $PANGRAM ) - mv pangram pangram~ ; mkdir pangram ; touch -r pangram~ pangram - tar cpf pangram.tar pangram ; rmdir pangram ; mv pangram~ pangram - for i in $PANGRAM ; do tar rpf pangram.tar pangram/$i ; done - touch -t `date '+%m%d0900'` pangram.tar ; gzip pangram.tar - touch pangram.tar.gz ; mv pangram.tar.gz pangram1.tgz - tar cpf pangram.tar pangram - touch -t `date '+%m%d0900'` pangram.tar ; gzip pangram.tar - touch pangram.tar.gz ; mv pangram.tar.gz pangram2.tgz - if cmp -s pangram1.tgz pangram2.tgz ; then - echo "OK" - rm -rf pangram pangram1.tgz pangram2.tgz - else - echo "NG" - cat <<- "EOF" - Hmm, packaging may not be done properly on this filesystem. - Would you please try again on a default filesystem, thanks! - - Happy packaging!! - - Quitting... - EOF - exit - fi -} - -install2() { - install -d ${2%/*} ; install -m 644 $1 $2 -} - -strip_bindir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - shopt -s nullglob - cd $1 - for i in * ; do - echo "$i" - if [ -h $i ] ; then continue ; fi - if [ -n "`file $i | grep "not stripped"`" ] ; then - echo "stripping -p $i" - strip -p $i - fi - done - ) fi -} - -strip_libdir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - shopt -s nullglob - cd $1 - for i in *.so *.so.* *.a ; do - echo "$i" - if [ -h $i ] ; then continue ; fi - if [ -n "`nm -a $i | grep " a "`" ] ; then - if [ $i != ${i%.a} ] ; then - echo -n "ranlib and " - touch -r $i $i.mt ; ranlib $i ; touch -r $i.mt $i ; rm $i.mt - fi - echo "stripping -gp $i" - strip -gp $i - fi - done - ) fi -} - -gzip_dir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - cd $1 - files=`ls -f --indicator-style=none | sed '/^\.\{1,2\}$/d'` - for i in $files ; do - echo "$i" - if [ ! -f $i -a ! -h $i -o $i != ${i%.gz} ] ; then continue ; fi - lnks=`ls -l $i | awk '{print $2}'` - if [ $lnks -gt 1 ] ; then - inum=`ls -i $i | awk '{print $1}'` - for j in `find . -maxdepth 1 -inum $inum` ; do - if [ ${j#./} == $i ] ; then - gzip -f $i - else - rm -f ${j#./} ; ln $i.gz ${j#./}.gz - fi - done - elif [ -h $i ] ; then - target=`readlink $i` ; rm -f $i ; ln -s $target.gz $i.gz - else - gzip $i - fi - done - for i in $files ; do mv ${i%.gz}.gz $C ; done - for i in $files ; do mv $C/${i%.gz}.gz . ; done - ) fi -} - -gzip_one() { - gzip $1 ; mv $1.gz $C ; mv $C/${1##*/}.gz ${1%/*} -} - -compress() { - for i in {$P,$P/usr}/{sbin,bin} ; do strip_bindir $i ; done - for i in {$P,$P/usr}/$libdir ; do strip_libdir $i ; done - if [ -f $infodir/dir ] ; then rm -f $infodir/dir ; fi - gzip_dir $infodir - for i in `seq 9` n ; do gzip_dir $mandir/man$i ; done -} - -prune_symlink() { - echo "pruning symlink in $1" - if [ -d $1 ] ; then ( - cd $P - rm -f /tmp/iNsT-a.$$ ; touch /tmp/iNsT-a.$$ - for i in `find ${1#$P/} -type l` ; do - target=`readlink $i` - echo "$i -> $target" - echo $i$'\n'$target >> /tmp/iNsT-a.$$ - done - COUNT=1 - LINE=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - while [ -n "$LINE" ] ; do - LINKGOESIN=`dirname $LINE` - LINKNAMEIS=`basename $LINE` - COUNT=$(($COUNT + 1)) - LINKPOINTSTO=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - if [ ! -d install ] ; then mkdir install ; fi - cat <<- EOF >> install/doinst.sh - ( cd $LINKGOESIN ; rm -rf $LINKNAMEIS ) - ( cd $LINKGOESIN ; ln -sf $LINKPOINTSTO $LINKNAMEIS ) - EOF - rm -rf $LINE ; touch -t `date '+%m%d0900'` install/doinst.sh $LINE - COUNT=$(($COUNT + 1)) - LINE=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - done - rm -f /tmp/iNsT-a.$$ - ) fi -} - -convert() { - for i in {$P,$P/usr}/{sbin,bin} ; do prune_symlink $i ; done - for i in {$P,$P/usr}/$libdir ; do prune_symlink $i ; done - prune_symlink $infodir - for i in `seq 9` n ; do prune_symlink $mandir/man$i ; done -} - -fscheck -W=`pwd` -for i in `seq 0 $((${#src[@]} - 1))` ; do - S[$i]=$W/${src[$i]} ; B[$i]=$W/build`test ${#src[@]} -eq 1 || echo $i` -done -P=$W/work ; C=$W/pivot -infodir=$P/usr/share/info -mandir=$P/usr/share/man -docdir=$P/usr/share/doc -myname=`basename $0` -pkg=$pkgbase-$vers-$arch-$build -case $arch in x86_64) libdir=lib64 ;; *) libdir=lib ;; esac -if [ $# -eq 0 ] ; then - opt_download=1 ; opt_config=1 ; opt_build=1 ; opt_package=1 +if [ -f functions ] ; then + source ./functions +elif [ ! -f /usr/share/plamo/functions ] ; then + wget ftp://plamo.linet.gr.jp/pub/Plamo-src/admin/functions + source ./functions else - opt_download=0 ; opt_config=0 ; opt_build=0 ; opt_package=0 - for i in $@ ; do - case $i in - download) opt_download=1 ;; - config) opt_config=1 ;; - build) opt_build=1 ;; - package) opt_package=1 ;; - esac - done + source /usr/share/plamo/functions fi + +fscheck +prepare "$@" if [ $opt_download -eq 1 ] ; then - for i in $url ; do - 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|tgz) tar xvpzf ${i##*/} ;; - bz2|tbz) tar xvpjf ${i##*/} ;; - xz|txz) tar xvpJf ${i##*/} ;; - esac - done + download_sources fi if [ $opt_config -eq 1 ] ; then 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 + apply_patches cd $B cp -p client/scripts/linux{,.orig} cat <<- "EOF" | patch client/scripts/linux @@ -232,12 +46,6 @@ sed -i '/^script/s@etc@sbin@g' client/dhclient.conf.example for i in `seq 0 $((${#B[@]} - 1))` ; do cd ${B[$i]} - if [ -f Makefile ] ; then - make clean - fi - if [ -f config.log ] ; then - rm -rf config.cache config.log - fi if [ -x configure ] ; then ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --libdir='${exec_prefix}'/$libdir --infodir='${prefix}'/share/info \ @@ -254,12 +62,7 @@ done fi if [ $opt_package -eq 1 ] ; then - if [ `id -u` -ne 0 ] ; then - read -p "Do you want to package as root? [y/N] " ans - if [ "x$ans" == "xY" -o "x$ans" == "xy" ] ; then - cd $W ; /bin/su -c "$0 package" ; exit - fi - fi + root_priv if [ -d $P ] ; then rm -rf $P ; fi ; mkdir -p $P if [ -d $C ] ; then rm -rf $C ; fi ; mkdir -p $C touch $W/i.st ; sleep 1 @@ -277,24 +80,8 @@ find $P ! -type l -newer i.st ! -newer i.et \ -exec touch -t `date '+%m%d0900'` {} \; compress - for i in `seq 0 $((${#DOCS[@]} - 1))` ; do - for j in ${DOCS[$i]} ; do - for k in ${S[$i]}/$j ; do - install2 $k $docdir/${src[$i]}/${k#${S[$i]}/} - touch -r $k $docdir/${src[$i]}/${k#${S[$i]}/} - gzip_one $docdir/${src[$i]}/${k#${S[$i]}/} - done - done - if [ $i -eq 0 ] ; then - install $myname $docdir/$src - touch -t `date '+%m%d0900'` $docdir/$src/$myname - gzip_one $docdir/$src/$myname - else - ln $docdir/$src/$myname.gz $docdir/${src[$i]} - fi - ( cd $docdir ; find ${src[$i]} -type d -exec touch -r $W/{} {} \; ) - done - convert + setup_docdir + convert_links install -d $P/install cat <<- "EOF" > $P/install/doinst.sh dhc_config() { @@ -324,6 +111,5 @@ tar rvpf $pkg.tar -C $P install/doinst.sh touch -t `date '+%m%d0900'` $pkg.tar ; xz $pkg.tar ; touch $pkg.tar.xz mv $pkg.tar.xz $pkg.txz - read -p "Do you want to keep work files? [y/N] " ans - if [ "x$ans" != "xY" -a "x$ans" != "xy" ] ; then rm -rf $P $C i.[se]t ; fi + cleanup fi --- plamo/00_base/old/glibc-20171101/PlamoBuild.glibc-2.20 2017-11-01 10:21:04.000000000 +0900 +++ plamo/00_base/glibc/PlamoBuild.glibc-2.20 2018-01-08 06:18:13.000000000 +0900 @@ -18,7 +18,7 @@ pkgbase=glibc vers=2.20 arch=`uname -m` -build=P7 +build=P8 src=$pkgbase-$vers patchfiles="glibc-2.19-fhs-1.patch glibc-2.20-do_ftell_wide-memleak.patch glibc-2.20-getifaddrs_internal-segfault.patch @@ -86,7 +86,8 @@ --libdir='${exec_prefix}'/$libdir --infodir='${prefix}'/share/info \ --mandir='${prefix}'/share/man ${OPT_CONFIG[$i]} \ --libexecdir=/usr/$libdir/glibc \ - --build=$arch-pc-linux --target=$arch-pc-linux + --build=$arch-pc-linux-gnu`[ $arch == armv7l ] && echo eabi` \ + --target=$arch-pc-linux-gnu`[ $arch == armv7l ] && echo eabi` fi done fi --- plamo/00_base/old/nvi-20160710/PlamoBuild.nvi-1.79 2016-07-10 11:39:09.000000000 +0900 +++ plamo/00_base/nvi/PlamoBuild.nvi-1.79 2017-04-26 06:54:18.000000000 +0900 @@ -3,12 +3,16 @@ ###################################################################### url="http://pkgs.fedoraproject.org/repo/pkgs/nvi-m17n/nvi-1.79.tar.gz/765e2153f5fc4f21793f2edc2647305a/nvi-1.79.tar.gz http://pkgs.fedoraproject.org/repo/pkgs/nvi-m17n/nvi-1.79.m17n-20040401.diff.gz/851650ced51697b3b08400fa75621c97/nvi-1.79.m17n-20040401.diff.gz - ftp://plamo.linet.gr.jp/pub/Plamo-src.new/plamo/00_base/nvi/nvi-1.79-64bit_breakage.patch.gz - ftp://plamo.linet.gr.jp/pub/Plamo-src.new/plamo/00_base/nvi/nvi-1.79-DESTDIR.patch.gz" + ftp://plamo.linet.gr.jp/pub/Plamo-src/plamo/00_base/nvi/nvi-1.79-64bit_breakage.patch.gz + ftp://plamo.linet.gr.jp/pub/Plamo-src/plamo/00_base/nvi/nvi-1.79-DESTDIR.patch.gz + ftp://plamo.linet.gr.jp/pub/Plamo-src/plamo/00_base/nvi/nvi-cmdwrapper.gz" +verify= +digest= +commitid= pkgbase=nvi vers=1.79 arch=`uname -m` -build=P8 +build=P9 src=$pkgbase-$vers patchfiles="" OPT_CONFIG="--enable-multibyte=euc-jp" @@ -20,245 +24,38 @@ `echo docs/internals/{gdb.script,structures,autowrite,quoting}` `echo docs/internals/{input,context,openmode,cscope.NOTES}` docs/changelog docs/tutorial/* `echo build/README{,.LynxOS}` LICENSE" +template=20170415 +tmplurl=ftp://plamo.linet.gr.jp/pub/Plamo-src/admin ###################################################################### -fscheck() { - PANGRAM="The quick brown fox jumps over the lazy dog." - echo -n "Checking for the filesystem ... " - mkdir pangram ; ( cd pangram ; touch $PANGRAM ) - mv pangram pangram~ ; mkdir pangram ; touch -r pangram~ pangram - tar cpf pangram.tar pangram ; rmdir pangram ; mv pangram~ pangram - for i in $PANGRAM ; do tar rpf pangram.tar pangram/$i ; done - touch -t `date '+%m%d0900'` pangram.tar ; gzip pangram.tar - touch pangram.tar.gz ; mv pangram.tar.gz pangram1.tgz - tar cpf pangram.tar pangram - touch -t `date '+%m%d0900'` pangram.tar ; gzip pangram.tar - touch pangram.tar.gz ; mv pangram.tar.gz pangram2.tgz - if cmp -s pangram1.tgz pangram2.tgz ; then - echo "OK" - rm -rf pangram pangram1.tgz pangram2.tgz - else - echo "NG" - cat <<- "EOF" - Hmm, packaging may not be done properly on this filesystem. - Would you please try again on a default filesystem, thanks! - - Happy packaging!! - - Quitting... - EOF - exit - fi -} - -install2() { - install -d ${2%/*} ; install -m 644 $1 $2 -} - -strip_bindir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - shopt -s nullglob - cd $1 - for i in * ; do - echo "$i" - if [ -h $i ] ; then continue ; fi - if [ -n "`file $i | grep "not stripped"`" ] ; then - echo "stripping -p $i" - strip -p $i - fi - done - ) fi -} - -strip_libdir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - shopt -s nullglob - cd $1 - for i in *.so *.so.* *.a ; do - echo "$i" - if [ -h $i ] ; then continue ; fi - if [ -n "`nm -a $i | grep " a "`" ] ; then - if [ $i != ${i%.a} ] ; then - echo -n "ranlib and " - touch -r $i $i.mt ; ranlib $i ; touch -r $i.mt $i ; rm $i.mt - fi - echo "stripping -gp $i" - strip -gp $i - fi - done - ) fi -} - -gzip_dir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - cd $1 - files=`ls -f --indicator-style=none | sed '/^\.\{1,2\}$/d'` - for i in $files ; do - echo "$i" - if [ ! -f $i -a ! -h $i -o $i != ${i%.gz} ] ; then continue ; fi - lnks=`ls -l $i | awk '{print $2}'` - if [ $lnks -gt 1 ] ; then - inum=`ls -i $i | awk '{print $1}'` - for j in `find . -maxdepth 1 -inum $inum` ; do - if [ ${j#./} == $i ] ; then - gzip -f $i - else - rm -f ${j#./} ; ln $i.gz ${j#./}.gz - fi - done - elif [ -h $i ] ; then - target=`readlink $i` ; rm -f $i ; ln -s $target.gz $i.gz - else - gzip $i - fi - done - for i in $files ; do mv ${i%.gz}.gz $C ; done - for i in $files ; do mv $C/${i%.gz}.gz . ; done - ) fi -} - -gzip_one() { - gzip $1 ; mv $1.gz $C ; mv $C/${1##*/}.gz ${1%/*} -} - -compress() { - for i in {$P,$P/usr}/{sbin,bin} ; do strip_bindir $i ; done - for i in {$P,$P/usr}/$libdir ; do strip_libdir $i ; done - if [ -f $infodir/dir ] ; then rm -f $infodir/dir ; fi - gzip_dir $infodir - for i in `seq 9` n ; do gzip_dir $mandir/man$i ; done -} - -prune_symlink() { - echo "pruning symlink in $1" - if [ -d $1 ] ; then ( - cd $P - rm -f /tmp/iNsT-a.$$ ; touch /tmp/iNsT-a.$$ - for i in `find ${1#$P/} -type l` ; do - target=`readlink $i` - echo "$i -> $target" - echo $i$'\n'$target >> /tmp/iNsT-a.$$ - done - COUNT=1 - LINE=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - while [ -n "$LINE" ] ; do - LINKGOESIN=`dirname $LINE` - LINKNAMEIS=`basename $LINE` - COUNT=$(($COUNT + 1)) - LINKPOINTSTO=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - if [ ! -d install ] ; then mkdir install ; fi - cat <<- EOF >> install/doinst.sh - ( cd $LINKGOESIN ; rm -rf $LINKNAMEIS ) - ( cd $LINKGOESIN ; ln -sf $LINKPOINTSTO $LINKNAMEIS ) - EOF - rm -rf $LINE ; touch -t `date '+%m%d0900'` install/doinst.sh $LINE - COUNT=$(($COUNT + 1)) - LINE=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - done - rm -f /tmp/iNsT-a.$$ - ) fi -} - -convert() { - for i in {$P,$P/usr}/{sbin,bin} ; do prune_symlink $i ; done - for i in {$P,$P/usr}/$libdir ; do prune_symlink $i ; done - prune_symlink $infodir - for i in `seq 9` n ; do prune_symlink $mandir/man$i ; done -} - -fscheck -W=`pwd` -for i in `seq 0 $((${#src[@]} - 1))` ; do - S[$i]=$W/${src[$i]} ; B[$i]=$W/build`test ${#src[@]} -eq 1 || echo $i` -done -P=$W/work ; C=$W/pivot -infodir=$P/usr/share/info -mandir=$P/usr/share/man -docdir=$P/usr/share/doc -myname=`basename $0` -pkg=$pkgbase-$vers-$arch-$build -case $arch in x86_64) libdir=lib64 ;; *) libdir=lib ;; esac -if [ $# -eq 0 ] ; then - opt_download=1 ; opt_config=1 ; opt_build=1 ; opt_package=1 +if [ -f functions ] ; then + source ./functions +elif [ ! -f /usr/share/plamo/functions ] ; then + wget ftp://plamo.linet.gr.jp/pub/Plamo-src/admin/functions + source ./functions else - opt_download=0 ; opt_config=0 ; opt_build=0 ; opt_package=0 - for i in $@ ; do - case $i in - download) opt_download=1 ;; - config) opt_config=1 ;; - build) opt_build=1 ;; - package) opt_package=1 ;; - esac - done + source /usr/share/plamo/functions fi + +fscheck +prepare "$@" if [ $opt_download -eq 1 ] ; then - for i in $url ; do - 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|tgz) tar xvpzf ${i##*/} ;; - bz2|tbz) tar xvpjf ${i##*/} ;; - xz|txz) tar xvpJf ${i##*/} ;; - esac - done + download_sources fi if [ $opt_config -eq 1 ] ; then 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 - 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 + apply_patches cd $B chmod -R u+w . gunzip -c $W/nvi-1.79.m17n-20040401.diff.gz | patch -Np0 -i - gunzip -c $W/nvi-1.79-64bit_breakage.patch.gz | patch -Np1 -i - gunzip -c $W/nvi-1.79-DESTDIR.patch.gz | patch -Np1 -i - cp -p build/configure{,.orig} - sed '/^LDFLAGS=/s@$LDFLAGS@${LDFLAGS-"-lncurses"}@g' build/configure.orig \ - > build/configure + sed -i '/^LDFLAGS=/s@$LDFLAGS@${LDFLAGS-"-lncurses"}@g' build/configure for i in `seq 0 $((${#B[@]} - 1))` ; do cd ${B[$i]}/build - if [ -f Makefile ] ; then - make clean - fi - if [ -f config.log ] ; then - rm -rf config.cache config.log - fi if [ -x configure ] ; then ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --libdir='${exec_prefix}'/$libdir --infodir='${prefix}'/share/info \ @@ -275,12 +72,7 @@ done fi if [ $opt_package -eq 1 ] ; then - if [ `id -u` -ne 0 ] ; then - read -p "Do you want to package as root? [y/N] " ans - if [ "x$ans" == "xY" -o "x$ans" == "xy" ] ; then - cd $W ; /bin/su -c "$0 package" ; exit - fi - fi + root_priv if [ -d $P ] ; then rm -rf $P ; fi ; mkdir -p $P if [ -d $C ] ; then rm -rf $C ; fi ; mkdir -p $C touch $W/i.st ; sleep 1 @@ -292,47 +84,7 @@ done install -d $P/usr/libexec mv $P/usr/bin/{vi,ex,view} $P/usr/libexec - cat <<- "EOF" > $P/usr/bin/vi - #!/bin/sh - - optend=0 ; optarg=0 ; nargv=() - for arg in "$@" ; do - file=0 - if [ $optend -eq 1 ] ; then - file=1 - elif [ $optarg -eq 1 ] ; then - optarg=0 - elif [ "${arg:0:1}" == "-" ] ; then - if [ "$arg" == "--" ] ; then - optend=1 - elif [ `expr length "$(expr "$arg" : ".*\([ctw].*\)")"` -eq 1 ] ; then - optarg=1 - fi - elif [ "${arg:0:1}" != "+" ] ; then - file=1 - fi - if [ $file -eq 1 ] ; then - if [ -f "$arg" ] ; then - if [ `nkf -g "$arg"` == UTF-8 ] ; then - temp=`mktemp /tmp/vi.XXXXXX` - nkf -e "$arg" > $temp - touch -r "$arg" $temp - arg=$temp - fi - fi - fi - nargv=("${nargv[@]}" "$arg") - done - /usr/libexec/${0##*/} "${nargv[@]}" - i=0 - for arg in "$@" ; do - if [ "$arg" != "${nargv[$i]}" ] ; then - [ ${nargv[$i]} -nt "$arg" ] && nkf -w ${nargv[$i]} > "$arg" - rm ${nargv[$i]} - fi - let ++i - done - EOF + gunzip -c $W/nvi-cmdwrapper.gz > $P/usr/bin/vi chmod 755 $P/usr/bin/vi ln $P/usr/bin/{vi,ex} ln $P/usr/bin/{vi,view} @@ -343,33 +95,17 @@ compress strip_bindir $P/usr/libexec gzip_dir $mandir/cat1 - for i in `seq 0 $((${#DOCS[@]} - 1))` ; do - for j in ${DOCS[$i]} ; do - for k in ${S[$i]}/$j ; do - install2 $k $docdir/${src[$i]}/${k#${S[$i]}/} - touch -r $k $docdir/${src[$i]}/${k#${S[$i]}/} - gzip_one $docdir/${src[$i]}/${k#${S[$i]}/} - done - done - if [ $i -eq 0 ] ; then - install $myname $docdir/$src - touch -t `date '+%m%d0900'` $docdir/$src/$myname - gzip_one $docdir/$src/$myname - else - ln $docdir/$src/$myname.gz $docdir/${src[$i]} - fi - ( cd $docdir ; find ${src[$i]} -type d -exec touch -r $W/{} {} \; ) - done + setup_docdir chmod 755 $docdir/$src/docs/tutorial/vi.tut.csh.gz cp -a $B/docs.m17n $docdir/$src chown -R root.root $docdir/$src/docs.m17n find $docdir/$src/docs.m17n -exec touch -t `date '+%m%d0900'` {} \; gzip_dir $docdir/$src/docs.m17n touch -t `date '+%m%d0900'` $docdir/$src/docs.m17n - mv $docdir/$src/{docs.m17n,$myname.gz} $C - mv $C/{docs.m17n,$myname.gz} $docdir/$src + mv $docdir/$src/{docs.m17n,{$func,$myname,$spec}.gz} $C + mv $C/{docs.m17n,{$func,$myname,$spec}.gz} $docdir/$src touch -r $S $docdir/$src - convert + convert_links tar cvpf $pkg.tar -C $P `cd $P ; find usr/bin | tail -n+2` tar rvpf $pkg.tar -C $P `cd $P ; find usr/libexec | tail -n+2` tar rvpf $pkg.tar -C $P usr/share/vi @@ -378,6 +114,5 @@ tar rvpf $pkg.tar -C $P usr/share/doc/$src touch -t `date '+%m%d0900'` $pkg.tar ; xz $pkg.tar ; touch $pkg.tar.xz mv $pkg.tar.xz $pkg.txz - read -p "Do you want to keep work files? [y/N] " ans - if [ "x$ans" != "xY" -a "x$ans" != "xy" ] ; then rm -rf $P $C i.[se]t ; fi + cleanup fi --- plamo/00_base/old/kernel-20170813/PlamoBuild.kernel-4.10.17_plamoRPi2 2017-08-13 17:43:47.000000000 +0900 +++ plamo/00_base/kernel/PlamoBuild.kernel-4.11.12_plamo@LV@ 2017-08-29 16:03:40.000000000 +0900 @@ -1,25 +1,27 @@ #!/bin/sh -x ###################################################################### -url="https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.10.17.tar.xz - ftp://plamo.linet.gr.jp/pub/Plamo-test/kernelsrc_patches/UNICON/vd_unicon-kernel-20170225-4.10.patch +url="https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.11.12.tar.xz + ftp://plamo.linet.gr.jp/pub/Plamo-test/kernelsrc_patches/UNICON/vd_unicon-kernel-20170506-4.11.patch ftp://plamo.linet.gr.jp/pub/Plamo-test/kernelsrc_patches/UNICON/vd_unicon-kernel-fonts-20140614.patch.bz2 https://github.com/sfjro/aufs4-standalone.git - ftp://plamo.linet.gr.jp/pub/Plamo-test/kernelsrc_patches/mcp/4.10-panic_beep.patch - ftp://plamo.linet.gr.jp/pub/Plamo-test/kernelsrc_patches/mcp/4.10-morse_code_panics.patch - ftp://plamo.linet.gr.jp/pub/Plamo-test/kernelsrc_patches/toi/tuxonice-for-linux-4.10.17-2017-05-24.patch.bz2 + ftp://plamo.linet.gr.jp/pub/Plamo-test/kernelsrc_patches/aufs/4.11.12-aufs_fix.patch + ftp://plamo.linet.gr.jp/pub/Plamo-test/kernelsrc_patches/mcp/4.11-panic_beep.patch + ftp://plamo.linet.gr.jp/pub/Plamo-test/kernelsrc_patches/mcp/4.11-morse_code_panics.patch + ftp://plamo.linet.gr.jp/pub/Plamo-test/kernelsrc_patches/toi/tuxonice-for-linux-4.11.12-2017-07-24.patch.bz2 + ftp://plamo.linet.gr.jp/pub/Plamo-test/kernelsrc_patches/toi/4.11.12-tuxonice_fix.patch ftp://plamo.linet.gr.jp/pub/Plamo-test/kernelsrc_patches/ovlfs/overlayfs-allow_unprivileged_mounts.patch - ftp://plamo.linet.gr.jp/pub/Plamo-test/kernelsrc_patches/rpi/rpi-4.10.17-20170521-78cfe36.patch.xz - ftp://plamo.linet.gr.jp/pub/Plamo-test/kernelsrc_patches/config-4.10.17-plamo@LV@" + ftp://plamo.linet.gr.jp/pub/Plamo-test/kernelsrc_patches/rpi/rpi-4.11.12-20170719-d5c0e92.patch.xz + ftp://plamo.linet.gr.jp/pub/Plamo-test/kernelsrc_patches/config-4.11.12-plamo@LV@" verify= digest= -branch[3]=aufs4.10 -commitid[3]=a19543b +branch[3]=aufs4.11.7+ +commitid[3]=71715aa pkgbase=kernel -vers=4.10.17_plamo@LV@ +vers=4.11.12_plamo@LV@ arch=`uname -m` build=P1 -src=linux-4.10.17 +src=linux-4.11.12 patchfiles="" OPT_CONFIG="" DOCS="" @@ -49,7 +51,7 @@ done apply_patches cd $B - patch -Np1 -i $W/vd_unicon-kernel-20170225-4.10.patch + patch -Np1 -i $W/vd_unicon-kernel-20170506-4.11.patch bunzip2 -c $W/vd_unicon-kernel-fonts-20140614.patch.bz2 | patch -Np1 -i - patch -Np1 -i $W/aufs4-standalone/aufs4-kbuild.patch patch -Np1 -i $W/aufs4-standalone/aufs4-base.patch @@ -58,17 +60,19 @@ cp -av $W/aufs4-standalone/Documentation . cp -av $W/aufs4-standalone/fs . cp -pv $W/aufs4-standalone/include/uapi/linux/aufs_type.h include/uapi/linux - patch -Np1 -i $W/4.10-panic_beep.patch - patch -Np1 -i $W/4.10-morse_code_panics.patch - bunzip2 -c $W/tuxonice-for-linux-4.10.17-2017-05-24.patch.bz2 | patch -Np1 -i - + patch -Np1 -i $W/4.11.12-aufs_fix.patch + patch -Np1 -i $W/4.11-panic_beep.patch + patch -Np1 -i $W/4.11-morse_code_panics.patch + bunzip2 -c $W/tuxonice-for-linux-4.11.12-2017-07-24.patch.bz2 | patch -Np1 -i - + patch -Np1 -i $W/4.11.12-tuxonice_fix.patch chmod 755 scripts/tuxonice_output_to_csv.sh patch -Np1 -i $W/overlayfs-allow_unprivileged_mounts.patch if [ `uname -m` == armv7l ] ; then - unxz -c $W/rpi-4.10.17-20170521-78cfe36.patch.xz | patch -Np1 -i - + unxz -c $W/rpi-4.11.12-20170719-d5c0e92.patch.xz | patch -Np1 -i - chmod 755 drivers/net/wireless/realtek/rtl8192cu/{clean,runwpa,wlan0dhcp} chmod 755 scripts/{knlinfo,mkknlimg} fi - cp -p $W/config-4.10.17-plamo$lv .config + cp -p $W/config-4.11.12-plamo$lv .config if [ $arch == i686 -o $arch == x86_64 ] ; then cp -p arch/x86/boot/install.sh{,.orig} head -n-9 arch/x86/boot/install.sh.orig > arch/x86/boot/install.sh @@ -85,11 +89,10 @@ 40a41,42 > cp .config $4/config-$1 > - 54c56,57 + 54c56 < cat $2 > $4/$base-$1 --- > scripts/mkknlimg $2 $4/kernel7.img-$1 - > cat ${2/zImage/Image} > $4/Image-$1 EOF fi for i in `seq 0 $((${#B[@]} - 1))` ; do --- plamo/00_base/old/kernel-20170829/PlamoBuild.kernel-4.11.12_plamo@LV@ 2017-08-29 16:03:40.000000000 +0900 +++ plamo/00_base/kernel/PlamoBuild.kernel-4.12.14_plamo@LV@ 2018-12-01 09:43:44.000000000 +0900 @@ -1,31 +1,29 @@ #!/bin/sh -x ###################################################################### -url="https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.11.12.tar.xz - ftp://plamo.linet.gr.jp/pub/Plamo-test/kernelsrc_patches/UNICON/vd_unicon-kernel-20170506-4.11.patch +url="https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.12.14.tar.xz + ftp://plamo.linet.gr.jp/pub/Plamo-test/kernelsrc_patches/UNICON/vd_unicon-kernel-20170708-4.12.patch ftp://plamo.linet.gr.jp/pub/Plamo-test/kernelsrc_patches/UNICON/vd_unicon-kernel-fonts-20140614.patch.bz2 https://github.com/sfjro/aufs4-standalone.git - ftp://plamo.linet.gr.jp/pub/Plamo-test/kernelsrc_patches/aufs/4.11.12-aufs_fix.patch - ftp://plamo.linet.gr.jp/pub/Plamo-test/kernelsrc_patches/mcp/4.11-panic_beep.patch - ftp://plamo.linet.gr.jp/pub/Plamo-test/kernelsrc_patches/mcp/4.11-morse_code_panics.patch - ftp://plamo.linet.gr.jp/pub/Plamo-test/kernelsrc_patches/toi/tuxonice-for-linux-4.11.12-2017-07-24.patch.bz2 - ftp://plamo.linet.gr.jp/pub/Plamo-test/kernelsrc_patches/toi/4.11.12-tuxonice_fix.patch + ftp://plamo.linet.gr.jp/pub/Plamo-test/kernelsrc_patches/mcp/4.12-panic_beep.patch + ftp://plamo.linet.gr.jp/pub/Plamo-test/kernelsrc_patches/mcp/4.12-morse_code_panics.patch + ftp://plamo.linet.gr.jp/pub/Plamo-test/kernelsrc_patches/toi/tuxonice-for-linux-4.12.14-2017-09-20.patch.bz2 ftp://plamo.linet.gr.jp/pub/Plamo-test/kernelsrc_patches/ovlfs/overlayfs-allow_unprivileged_mounts.patch - ftp://plamo.linet.gr.jp/pub/Plamo-test/kernelsrc_patches/rpi/rpi-4.11.12-20170719-d5c0e92.patch.xz - ftp://plamo.linet.gr.jp/pub/Plamo-test/kernelsrc_patches/config-4.11.12-plamo@LV@" + ftp://plamo.linet.gr.jp/pub/Plamo-test/kernelsrc_patches/rpi/rpi-4.12.14-20170906-6fe4193.patch.xz + ftp://plamo.linet.gr.jp/pub/Plamo-test/kernelsrc_patches/config-4.12.14-plamo@LV@" verify= digest= -branch[3]=aufs4.11.7+ -commitid[3]=71715aa +branch[3]=aufs4.12 +commitid[3]=31266c0 pkgbase=kernel -vers=4.11.12_plamo@LV@ +vers=4.12.14_plamo@LV@ arch=`uname -m` build=P1 -src=linux-4.11.12 +src=linux-4.12.14 patchfiles="" OPT_CONFIG="" DOCS="" -template=20170713 +template=20180815 tmplurl=ftp://plamo.linet.gr.jp/pub/Plamo-src/admin ###################################################################### @@ -51,7 +49,7 @@ done apply_patches cd $B - patch -Np1 -i $W/vd_unicon-kernel-20170506-4.11.patch + patch -Np1 -i $W/vd_unicon-kernel-20170708-4.12.patch bunzip2 -c $W/vd_unicon-kernel-fonts-20140614.patch.bz2 | patch -Np1 -i - patch -Np1 -i $W/aufs4-standalone/aufs4-kbuild.patch patch -Np1 -i $W/aufs4-standalone/aufs4-base.patch @@ -60,19 +58,17 @@ cp -av $W/aufs4-standalone/Documentation . cp -av $W/aufs4-standalone/fs . cp -pv $W/aufs4-standalone/include/uapi/linux/aufs_type.h include/uapi/linux - patch -Np1 -i $W/4.11.12-aufs_fix.patch - patch -Np1 -i $W/4.11-panic_beep.patch - patch -Np1 -i $W/4.11-morse_code_panics.patch - bunzip2 -c $W/tuxonice-for-linux-4.11.12-2017-07-24.patch.bz2 | patch -Np1 -i - - patch -Np1 -i $W/4.11.12-tuxonice_fix.patch + patch -Np1 -i $W/4.12-panic_beep.patch + patch -Np1 -i $W/4.12-morse_code_panics.patch + bunzip2 -c $W/tuxonice-for-linux-4.12.14-2017-09-20.patch.bz2 | patch -Np1 -i - chmod 755 scripts/tuxonice_output_to_csv.sh patch -Np1 -i $W/overlayfs-allow_unprivileged_mounts.patch if [ `uname -m` == armv7l ] ; then - unxz -c $W/rpi-4.11.12-20170719-d5c0e92.patch.xz | patch -Np1 -i - + unxz -c $W/rpi-4.12.14-20170906-6fe4193.patch.xz | patch -Np1 -i - chmod 755 drivers/net/wireless/realtek/rtl8192cu/{clean,runwpa,wlan0dhcp} chmod 755 scripts/{knlinfo,mkknlimg} fi - cp -p $W/config-4.11.12-plamo$lv .config + cp -p $W/config-4.12.14-plamo$lv .config if [ $arch == i686 -o $arch == x86_64 ] ; then cp -p arch/x86/boot/install.sh{,.orig} head -n-9 arch/x86/boot/install.sh.orig > arch/x86/boot/install.sh @@ -143,21 +139,21 @@ ln -sfn /usr/src/linux $P/lib/modules/$krel/build touch $W/i.et cd $W - find $P ! -type l -newer i.st ! -newer i.et \ - -exec touch -t `date '+%m%d0900'` {} \; + TZ=UTC find $P ! -type l -newer i.st ! -newer i.et \ + -exec touch -t `date -u '+%m%d0000'` {} \; compress install -d $docdir/$src setup_docdir convert_links prune_symlink $P/boot prune_symlink $P/lib/modules/$krel - touch -t `date '+%m%d0900'` $P/lib/modules/$krel + TZ=UTC touch -t `date -u '+%m%d0000'` $P/lib/modules/$krel tar cvpf $pkg.tar -C $P `cd $P ; find boot -maxdepth 1 | tail -n+2` tar rvpf $pkg.tar -C $P lib/modules/$krel tar rvpf $pkg.tar -C $P lib/firmware 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 - mv $pkg.tar.xz $pkg.txz + TZ=UTC touch -t `date -u '+%m%d0000'` $pkg.tar + xz $pkg.tar ; touch $pkg.tar.xz ; mv $pkg.tar.xz $pkg.txz cleanup fi --- plamo/00_base/old/kernel-20181201/PlamoBuild.kernel-4.12.14_plamo@LV@ 2018-12-01 09:43:44.000000000 +0900 +++ plamo/00_base/kernel/PlamoBuild.kernel-4.13.16_plamo@LV@ 2018-12-04 17:39:11.000000000 +0900 @@ -1,25 +1,25 @@ #!/bin/sh -x ###################################################################### -url="https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.12.14.tar.xz - ftp://plamo.linet.gr.jp/pub/Plamo-test/kernelsrc_patches/UNICON/vd_unicon-kernel-20170708-4.12.patch +url="https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.13.16.tar.xz + ftp://plamo.linet.gr.jp/pub/Plamo-test/kernelsrc_patches/UNICON/vd_unicon-kernel-20170909-4.13.patch ftp://plamo.linet.gr.jp/pub/Plamo-test/kernelsrc_patches/UNICON/vd_unicon-kernel-fonts-20140614.patch.bz2 https://github.com/sfjro/aufs4-standalone.git - ftp://plamo.linet.gr.jp/pub/Plamo-test/kernelsrc_patches/mcp/4.12-panic_beep.patch - ftp://plamo.linet.gr.jp/pub/Plamo-test/kernelsrc_patches/mcp/4.12-morse_code_panics.patch - ftp://plamo.linet.gr.jp/pub/Plamo-test/kernelsrc_patches/toi/tuxonice-for-linux-4.12.14-2017-09-20.patch.bz2 + ftp://plamo.linet.gr.jp/pub/Plamo-test/kernelsrc_patches/mcp/4.13-panic_beep.patch + ftp://plamo.linet.gr.jp/pub/Plamo-test/kernelsrc_patches/mcp/4.13-morse_code_panics.patch + ftp://plamo.linet.gr.jp/pub/Plamo-test/kernelsrc_patches/toi/tuxonice-for-linux-4.13.16-2017-11-24.patch.bz2 ftp://plamo.linet.gr.jp/pub/Plamo-test/kernelsrc_patches/ovlfs/overlayfs-allow_unprivileged_mounts.patch - ftp://plamo.linet.gr.jp/pub/Plamo-test/kernelsrc_patches/rpi/rpi-4.12.14-20170906-6fe4193.patch.xz - ftp://plamo.linet.gr.jp/pub/Plamo-test/kernelsrc_patches/config-4.12.14-plamo@LV@" + ftp://plamo.linet.gr.jp/pub/Plamo-test/kernelsrc_patches/rpi/rpi-4.13.16-20171117-c9b4367.patch.xz + ftp://plamo.linet.gr.jp/pub/Plamo-test/kernelsrc_patches/config-4.13.16-plamo@LV@" verify= digest= -branch[3]=aufs4.12 -commitid[3]=31266c0 +branch[3]=aufs4.13 +commitid[3]=78cbc7f pkgbase=kernel -vers=4.12.14_plamo@LV@ +vers=4.13.16_plamo@LV@ arch=`uname -m` build=P1 -src=linux-4.12.14 +src=linux-4.13.16 patchfiles="" OPT_CONFIG="" DOCS="" @@ -49,7 +49,7 @@ done apply_patches cd $B - patch -Np1 -i $W/vd_unicon-kernel-20170708-4.12.patch + patch -Np1 -i $W/vd_unicon-kernel-20170909-4.13.patch bunzip2 -c $W/vd_unicon-kernel-fonts-20140614.patch.bz2 | patch -Np1 -i - patch -Np1 -i $W/aufs4-standalone/aufs4-kbuild.patch patch -Np1 -i $W/aufs4-standalone/aufs4-base.patch @@ -58,17 +58,17 @@ cp -av $W/aufs4-standalone/Documentation . cp -av $W/aufs4-standalone/fs . cp -pv $W/aufs4-standalone/include/uapi/linux/aufs_type.h include/uapi/linux - patch -Np1 -i $W/4.12-panic_beep.patch - patch -Np1 -i $W/4.12-morse_code_panics.patch - bunzip2 -c $W/tuxonice-for-linux-4.12.14-2017-09-20.patch.bz2 | patch -Np1 -i - + patch -Np1 -i $W/4.13-panic_beep.patch + patch -Np1 -i $W/4.13-morse_code_panics.patch + bunzip2 -c $W/tuxonice-for-linux-4.13.16-2017-11-24.patch.bz2 | patch -Np1 -i - chmod 755 scripts/tuxonice_output_to_csv.sh patch -Np1 -i $W/overlayfs-allow_unprivileged_mounts.patch if [ `uname -m` == armv7l ] ; then - unxz -c $W/rpi-4.12.14-20170906-6fe4193.patch.xz | patch -Np1 -i - + unxz -c $W/rpi-4.13.16-20171117-c9b4367.patch.xz | patch -Np1 -i - chmod 755 drivers/net/wireless/realtek/rtl8192cu/{clean,runwpa,wlan0dhcp} chmod 755 scripts/{knlinfo,mkknlimg} fi - cp -p $W/config-4.12.14-plamo$lv .config + cp -p $W/config-4.13.16-plamo$lv .config if [ $arch == i686 -o $arch == x86_64 ] ; then cp -p arch/x86/boot/install.sh{,.orig} head -n-9 arch/x86/boot/install.sh.orig > arch/x86/boot/install.sh --- plamo/00_base/old/kernel-20181204/PlamoBuild.kernel-4.13.16_plamo@LV@ 2018-12-04 17:39:11.000000000 +0900 +++ plamo/00_base/kernel/PlamoBuild.kernel-4.14.85_plamo@LV@ 2018-12-16 11:37:38.000000000 +0900 @@ -1,25 +1,25 @@ #!/bin/sh -x ###################################################################### -url="https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.13.16.tar.xz - ftp://plamo.linet.gr.jp/pub/Plamo-test/kernelsrc_patches/UNICON/vd_unicon-kernel-20170909-4.13.patch +url="https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.85.tar.xz + ftp://plamo.linet.gr.jp/pub/Plamo-test/kernelsrc_patches/UNICON/vd_unicon-kernel-20171118-4.14.patch ftp://plamo.linet.gr.jp/pub/Plamo-test/kernelsrc_patches/UNICON/vd_unicon-kernel-fonts-20140614.patch.bz2 https://github.com/sfjro/aufs4-standalone.git - ftp://plamo.linet.gr.jp/pub/Plamo-test/kernelsrc_patches/mcp/4.13-panic_beep.patch - ftp://plamo.linet.gr.jp/pub/Plamo-test/kernelsrc_patches/mcp/4.13-morse_code_panics.patch - ftp://plamo.linet.gr.jp/pub/Plamo-test/kernelsrc_patches/toi/tuxonice-for-linux-4.13.16-2017-11-24.patch.bz2 + ftp://plamo.linet.gr.jp/pub/Plamo-test/kernelsrc_patches/mcp/4.14-panic_beep.patch + ftp://plamo.linet.gr.jp/pub/Plamo-test/kernelsrc_patches/mcp/4.14-morse_code_panics.patch + ftp://plamo.linet.gr.jp/pub/Plamo-test/kernelsrc_patches/toi/tuxonice-for-linux-4.14.32-2018-04-07.patch.bz2 ftp://plamo.linet.gr.jp/pub/Plamo-test/kernelsrc_patches/ovlfs/overlayfs-allow_unprivileged_mounts.patch - ftp://plamo.linet.gr.jp/pub/Plamo-test/kernelsrc_patches/rpi/rpi-4.13.16-20171117-c9b4367.patch.xz - ftp://plamo.linet.gr.jp/pub/Plamo-test/kernelsrc_patches/config-4.13.16-plamo@LV@" + ftp://plamo.linet.gr.jp/pub/Plamo-test/kernelsrc_patches/rpi/rpi-4.14.85-20181205-802d877.patch.xz + ftp://plamo.linet.gr.jp/pub/Plamo-test/kernelsrc_patches/config-4.14.85-plamo@LV@" verify= digest= -branch[3]=aufs4.13 -commitid[3]=78cbc7f +branch[3]=aufs4.14.73+ +commitid[3]=df6d0ef pkgbase=kernel -vers=4.13.16_plamo@LV@ +vers=4.14.85_plamo@LV@ arch=`uname -m` build=P1 -src=linux-4.13.16 +src=linux-4.14.85 patchfiles="" OPT_CONFIG="" DOCS="" @@ -49,7 +49,7 @@ done apply_patches cd $B - patch -Np1 -i $W/vd_unicon-kernel-20170909-4.13.patch + patch -Np1 -i $W/vd_unicon-kernel-20171118-4.14.patch bunzip2 -c $W/vd_unicon-kernel-fonts-20140614.patch.bz2 | patch -Np1 -i - patch -Np1 -i $W/aufs4-standalone/aufs4-kbuild.patch patch -Np1 -i $W/aufs4-standalone/aufs4-base.patch @@ -58,17 +58,17 @@ cp -av $W/aufs4-standalone/Documentation . cp -av $W/aufs4-standalone/fs . cp -pv $W/aufs4-standalone/include/uapi/linux/aufs_type.h include/uapi/linux - patch -Np1 -i $W/4.13-panic_beep.patch - patch -Np1 -i $W/4.13-morse_code_panics.patch - bunzip2 -c $W/tuxonice-for-linux-4.13.16-2017-11-24.patch.bz2 | patch -Np1 -i - + patch -Np1 -i $W/4.14-panic_beep.patch + patch -Np1 -i $W/4.14-morse_code_panics.patch + bunzip2 -c $W/tuxonice-for-linux-4.14.32-2018-04-07.patch.bz2 | patch -Np1 -i - chmod 755 scripts/tuxonice_output_to_csv.sh patch -Np1 -i $W/overlayfs-allow_unprivileged_mounts.patch if [ `uname -m` == armv7l ] ; then - unxz -c $W/rpi-4.13.16-20171117-c9b4367.patch.xz | patch -Np1 -i - + unxz -c $W/rpi-4.14.85-20181205-802d877.patch.xz | patch -Np1 -i - chmod 755 drivers/net/wireless/realtek/rtl8192cu/{clean,runwpa,wlan0dhcp} chmod 755 scripts/{knlinfo,mkknlimg} fi - cp -p $W/config-4.13.16-plamo$lv .config + cp -p $W/config-4.14.85-plamo$lv .config if [ $arch == i686 -o $arch == x86_64 ] ; then cp -p arch/x86/boot/install.sh{,.orig} head -n-9 arch/x86/boot/install.sh.orig > arch/x86/boot/install.sh @@ -150,7 +150,6 @@ TZ=UTC touch -t `date -u '+%m%d0000'` $P/lib/modules/$krel tar cvpf $pkg.tar -C $P `cd $P ; find boot -maxdepth 1 | tail -n+2` tar rvpf $pkg.tar -C $P lib/modules/$krel - tar rvpf $pkg.tar -C $P lib/firmware tar rvpf $pkg.tar -C $P usr/share/doc/$src tar rvpf $pkg.tar -C $P install/doinst.sh TZ=UTC touch -t `date -u '+%m%d0000'` $pkg.tar --- plamo/00_base/old/kernel-20181216/PlamoBuild.kernel-4.14.85_plamo@LV@ 2018-12-16 11:37:38.000000000 +0900 +++ plamo/00_base/kernel/PlamoBuild.kernel-4.15.18_plamo@LV@ 2018-12-19 08:35:29.000000000 +0900 @@ -1,25 +1,25 @@ #!/bin/sh -x ###################################################################### -url="https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.85.tar.xz - ftp://plamo.linet.gr.jp/pub/Plamo-test/kernelsrc_patches/UNICON/vd_unicon-kernel-20171118-4.14.patch +url="https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.15.18.tar.xz + ftp://plamo.linet.gr.jp/pub/Plamo-test/kernelsrc_patches/UNICON/vd_unicon-kernel-20180203-4.15.patch ftp://plamo.linet.gr.jp/pub/Plamo-test/kernelsrc_patches/UNICON/vd_unicon-kernel-fonts-20140614.patch.bz2 https://github.com/sfjro/aufs4-standalone.git - ftp://plamo.linet.gr.jp/pub/Plamo-test/kernelsrc_patches/mcp/4.14-panic_beep.patch - ftp://plamo.linet.gr.jp/pub/Plamo-test/kernelsrc_patches/mcp/4.14-morse_code_panics.patch - ftp://plamo.linet.gr.jp/pub/Plamo-test/kernelsrc_patches/toi/tuxonice-for-linux-4.14.32-2018-04-07.patch.bz2 + ftp://plamo.linet.gr.jp/pub/Plamo-test/kernelsrc_patches/mcp/4.15-panic_beep.patch + ftp://plamo.linet.gr.jp/pub/Plamo-test/kernelsrc_patches/mcp/4.15-morse_code_panics.patch + ftp://plamo.linet.gr.jp/pub/Plamo-test/kernelsrc_patches/toi/tuxonice-for-linux-4.15.15-2018-04-07.patch.bz2 ftp://plamo.linet.gr.jp/pub/Plamo-test/kernelsrc_patches/ovlfs/overlayfs-allow_unprivileged_mounts.patch - ftp://plamo.linet.gr.jp/pub/Plamo-test/kernelsrc_patches/rpi/rpi-4.14.85-20181205-802d877.patch.xz - ftp://plamo.linet.gr.jp/pub/Plamo-test/kernelsrc_patches/config-4.14.85-plamo@LV@" + ftp://plamo.linet.gr.jp/pub/Plamo-test/kernelsrc_patches/rpi/rpi-4.15.18-20180521-1b75d3e.patch.xz + ftp://plamo.linet.gr.jp/pub/Plamo-test/kernelsrc_patches/config-4.15.18-plamo@LV@" verify= digest= -branch[3]=aufs4.14.73+ -commitid[3]=df6d0ef +branch[3]=aufs4.15 +commitid[3]=8289398 pkgbase=kernel -vers=4.14.85_plamo@LV@ +vers=4.15.18_plamo@LV@ arch=`uname -m` build=P1 -src=linux-4.14.85 +src=linux-4.15.18 patchfiles="" OPT_CONFIG="" DOCS="" @@ -49,7 +49,7 @@ done apply_patches cd $B - patch -Np1 -i $W/vd_unicon-kernel-20171118-4.14.patch + patch -Np1 -i $W/vd_unicon-kernel-20180203-4.15.patch bunzip2 -c $W/vd_unicon-kernel-fonts-20140614.patch.bz2 | patch -Np1 -i - patch -Np1 -i $W/aufs4-standalone/aufs4-kbuild.patch patch -Np1 -i $W/aufs4-standalone/aufs4-base.patch @@ -58,17 +58,17 @@ cp -av $W/aufs4-standalone/Documentation . cp -av $W/aufs4-standalone/fs . cp -pv $W/aufs4-standalone/include/uapi/linux/aufs_type.h include/uapi/linux - patch -Np1 -i $W/4.14-panic_beep.patch - patch -Np1 -i $W/4.14-morse_code_panics.patch - bunzip2 -c $W/tuxonice-for-linux-4.14.32-2018-04-07.patch.bz2 | patch -Np1 -i - + patch -Np1 -i $W/4.15-panic_beep.patch + patch -Np1 -i $W/4.15-morse_code_panics.patch + bunzip2 -c $W/tuxonice-for-linux-4.15.15-2018-04-07.patch.bz2 | patch -Np1 -i - chmod 755 scripts/tuxonice_output_to_csv.sh patch -Np1 -i $W/overlayfs-allow_unprivileged_mounts.patch if [ `uname -m` == armv7l ] ; then - unxz -c $W/rpi-4.14.85-20181205-802d877.patch.xz | patch -Np1 -i - + unxz -c $W/rpi-4.15.18-20180521-1b75d3e.patch.xz | patch -Np1 -i - chmod 755 drivers/net/wireless/realtek/rtl8192cu/{clean,runwpa,wlan0dhcp} chmod 755 scripts/{knlinfo,mkknlimg} fi - cp -p $W/config-4.14.85-plamo$lv .config + cp -p $W/config-4.15.18-plamo$lv .config if [ $arch == i686 -o $arch == x86_64 ] ; then cp -p arch/x86/boot/install.sh{,.orig} head -n-9 arch/x86/boot/install.sh.orig > arch/x86/boot/install.sh --- plamo/00_base/old/btrfs_progs-20161121/PlamoBuild.btrfs_progs-v4.8.3 2016-11-21 00:25:25.000000000 +0900 +++ plamo/00_base/btrfs_progs/PlamoBuild.btrfs_progs-v4.8.3 2017-04-01 19:01:50.000000000 +0900 @@ -2,247 +2,41 @@ ###################################################################### url="https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v4.8.3.tar.gz" +verify= +commitid= pkgbase=btrfs_progs vers=v4.8.3 arch=`uname -m` -build=P1 +build=P2 src=btrfs-progs-$vers patchfiles="" OPT_CONFIG="--bindir=/sbin" DOCS="CHANGES COPYING INSTALL README.md" -template=20161020 +template=20170323 tmplurl=ftp://plamo.linet.gr.jp/pub/Plamo-src/admin ###################################################################### -fscheck() { - PANGRAM="The quick brown fox jumps over the lazy dog." - echo -n "Checking for the filesystem ... " - mkdir pangram ; ( cd pangram ; touch $PANGRAM ) - mv pangram pangram~ ; mkdir pangram ; touch -r pangram~ pangram - tar cpf pangram.tar pangram ; rmdir pangram ; mv pangram~ pangram - for i in $PANGRAM ; do tar rpf pangram.tar pangram/$i ; done - touch -t `date '+%m%d0900'` pangram.tar ; gzip pangram.tar - touch pangram.tar.gz ; mv pangram.tar.gz pangram1.tgz - tar cpf pangram.tar pangram - touch -t `date '+%m%d0900'` pangram.tar ; gzip pangram.tar - touch pangram.tar.gz ; mv pangram.tar.gz pangram2.tgz - if cmp -s pangram1.tgz pangram2.tgz ; then - echo "OK" - rm -rf pangram pangram1.tgz pangram2.tgz - else - echo "NG" - cat <<- "EOF" - Hmm, packaging may not be done properly on this filesystem. - Would you please try again on a default filesystem, thanks! - - Happy packaging!! - - Quitting... - EOF - exit - fi -} - -install2() { - install -d ${2%/*} ; install -m 644 $1 $2 -} - -strip_bindir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - shopt -s nullglob - cd $1 - for i in * ; do - echo "$i" - if [ -h $i ] ; then continue ; fi - if [ -n "`file $i | grep "not stripped"`" ] ; then - echo "stripping -p $i" - strip -p $i - fi - done - ) fi -} - -strip_libdir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - shopt -s nullglob - cd $1 - for i in *.so *.so.* *.a ; do - echo "$i" - if [ -h $i ] ; then continue ; fi - if [ -n "`nm -a $i | grep " a "`" ] ; then - if [ $i != ${i%.a} ] ; then - echo -n "ranlib and " - touch -r $i $i.mt ; ranlib $i ; touch -r $i.mt $i ; rm $i.mt - fi - echo "stripping -gp $i" - strip -gp $i - fi - done - ) fi -} - -gzip_dir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - cd $1 - files=`ls -f --indicator-style=none | sed '/^\.\{1,2\}$/d'` - for i in $files ; do - echo "$i" - if [ ! -f $i -a ! -h $i -o $i != ${i%.gz} ] ; then continue ; fi - lnks=`ls -l $i | awk '{print $2}'` - if [ $lnks -gt 1 ] ; then - inum=`ls -i $i | awk '{print $1}'` - for j in `find . -maxdepth 1 -inum $inum` ; do - if [ ${j#./} == $i ] ; then - gzip -f $i - else - rm -f ${j#./} ; ln $i.gz ${j#./}.gz - fi - done - elif [ -h $i ] ; then - target=`readlink $i` ; rm -f $i ; ln -s $target.gz $i.gz - else - gzip $i - fi - done - for i in $files ; do mv ${i%.gz}.gz $C ; done - for i in $files ; do mv $C/${i%.gz}.gz . ; done - ) fi -} - -gzip_one() { - gzip $1 ; mv $1.gz $C ; mv $C/${1##*/}.gz ${1%/*} -} - -compress() { - for i in {$P,$P/usr}/{sbin,bin} ; do strip_bindir $i ; done - for i in {$P,$P/usr}/$libdir ; do strip_libdir $i ; done - if [ -f $infodir/dir ] ; then rm -f $infodir/dir ; fi - gzip_dir $infodir - for i in `seq 9` n ; do gzip_dir $mandir/man$i ; done -} - -prune_symlink() { - echo "pruning symlink in $1" - if [ -d $1 ] ; then ( - cd $P - rm -f /tmp/iNsT-a.$$ ; touch /tmp/iNsT-a.$$ - for i in `find ${1#$P/} -type l` ; do - target=`readlink $i` - echo "$i -> $target" - echo $i$'\n'$target >> /tmp/iNsT-a.$$ - done - COUNT=1 - LINE=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - while [ -n "$LINE" ] ; do - LINKGOESIN=`dirname $LINE` - LINKNAMEIS=`basename $LINE` - COUNT=$(($COUNT + 1)) - LINKPOINTSTO=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - if [ ! -d install ] ; then mkdir install ; fi - cat <<- EOF >> install/doinst.sh - ( cd $LINKGOESIN ; rm -rf $LINKNAMEIS ) - ( cd $LINKGOESIN ; ln -sf $LINKPOINTSTO $LINKNAMEIS ) - EOF - rm -rf $LINE ; touch -t `date '+%m%d0900'` install/doinst.sh $LINE - COUNT=$(($COUNT + 1)) - LINE=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - done - rm -f /tmp/iNsT-a.$$ - ) fi -} - -convert() { - for i in {$P,$P/usr}/{sbin,bin} ; do prune_symlink $i ; done - for i in {$P,$P/usr}/$libdir ; do prune_symlink $i ; done - prune_symlink $infodir - for i in `seq 9` n ; do prune_symlink $mandir/man$i ; done -} - -fscheck -W=`pwd` -for i in `seq 0 $((${#src[@]} - 1))` ; do - S[$i]=$W/${src[$i]} ; B[$i]=$W/build`test ${#src[@]} -eq 1 || echo $i` -done -P=$W/work ; C=$W/pivot -infodir=$P/usr/share/info -mandir=$P/usr/share/man -docdir=$P/usr/share/doc -myname=`basename $0` -pkg=$pkgbase-$vers-$arch-$build -case $arch in x86_64) libdir=lib64 ;; *) libdir=lib ;; esac -if [ $# -eq 0 ] ; then - opt_download=1 ; opt_config=1 ; opt_build=1 ; opt_package=1 +if [ -f functions ] ; then + source ./functions +elif [ ! -f /usr/share/plamo/functions ] ; then + wget ftp://plamo.linet.gr.jp/pub/Plamo-src/admin/functions + source ./functions else - opt_download=0 ; opt_config=0 ; opt_build=0 ; opt_package=0 - for i in $@ ; do - case $i in - download) opt_download=1 ;; - config) opt_config=1 ;; - build) opt_build=1 ;; - package) opt_package=1 ;; - esac - done + source /usr/share/plamo/functions fi + +fscheck +prepare "$@" if [ $opt_download -eq 1 ] ; then - for i in $url ; do - 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|tgz) tar xvpzf ${i##*/} ;; - bz2|tbz) tar xvpjf ${i##*/} ;; - xz|txz) tar xvpJf ${i##*/} ;; - esac - done + download_sources fi if [ $opt_config -eq 1 ] ; then 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 + apply_patches 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 - if [ -f config.log ] ; then - rm -rf config.cache config.log - fi if [ -x configure ] ; then ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --libdir='${exec_prefix}'/$libdir --infodir='${prefix}'/share/info \ @@ -259,12 +53,7 @@ done fi if [ $opt_package -eq 1 ] ; then - if [ `id -u` -ne 0 ] ; then - read -p "Do you want to package as root? [y/N] " ans - if [ "x$ans" == "xY" -o "x$ans" == "xy" ] ; then - cd $W ; /bin/su -c "$0 package" ; exit - fi - fi + root_priv if [ -d $P ] ; then rm -rf $P ; fi ; mkdir -p $P if [ -d $C ] ; then rm -rf $C ; fi ; mkdir -p $C touch $W/i.st ; sleep 1 @@ -279,38 +68,8 @@ find $P ! -type l -newer i.st ! -newer i.et \ -exec touch -t `date '+%m%d0900'` {} \; compress - for i in `seq 0 $((${#DOCS[@]} - 1))` ; do - for j in ${DOCS[$i]} ; do - for k in ${S[$i]}/$j ; do - install2 $k $docdir/${src[$i]}/${k#${S[$i]}/} - touch -r $k $docdir/${src[$i]}/${k#${S[$i]}/} - gzip_one $docdir/${src[$i]}/${k#${S[$i]}/} - done - done - if [ $i -eq 0 ] ; then - install $myname $docdir/$src - touch -t `date '+%m%d0900'` $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 - convert + setup_docdir + convert_links tar cvpf $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 usr/include/btrfs @@ -320,6 +79,5 @@ tar rvpf $pkg.tar -C $P install/doinst.sh touch -t `date '+%m%d0900'` $pkg.tar ; xz $pkg.tar ; touch $pkg.tar.xz mv $pkg.tar.xz $pkg.txz - read -p "Do you want to keep work files? [y/N] " ans - if [ "x$ans" != "xY" -a "x$ans" != "xy" ] ; then rm -rf $P $C i.[se]t ; fi + cleanup fi --- plamo/00_base/old/openssh-20170116/PlamoBuild.openssh-7.4p1 2017-01-16 19:36:28.000000000 +0900 +++ plamo/00_base/openssh/PlamoBuild.openssh-7.5p1 2017-04-26 08:39:21.000000000 +0900 @@ -1,9 +1,12 @@ #!/bin/sh ###################################################################### -url="http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-7.4p1.tar.gz" +url="http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-7.5p1.tar.gz" +verify= +digest= +commitid= pkgbase=openssh -vers=7.4p1 +vers=7.5p1 arch=`uname -m` build=P2 src=$pkgbase-$vers @@ -13,231 +16,29 @@ DOCS="CREDITS INSTALL LICENCE OVERVIEW PROTOCOL PROTOCOL.agent `echo PROTOCOL.{certkeys,chacha20poly1305,key,krl,mux}` README `echo README.{dns,platform,privsep,tun}` TODO ChangeLog" -template=20161020 +template=20170415 tmplurl=ftp://plamo.linet.gr.jp/pub/Plamo-src/admin ###################################################################### -fscheck() { - PANGRAM="The quick brown fox jumps over the lazy dog." - echo -n "Checking for the filesystem ... " - mkdir pangram ; ( cd pangram ; touch $PANGRAM ) - mv pangram pangram~ ; mkdir pangram ; touch -r pangram~ pangram - tar cpf pangram.tar pangram ; rmdir pangram ; mv pangram~ pangram - for i in $PANGRAM ; do tar rpf pangram.tar pangram/$i ; done - touch -t `date '+%m%d0900'` pangram.tar ; gzip pangram.tar - touch pangram.tar.gz ; mv pangram.tar.gz pangram1.tgz - tar cpf pangram.tar pangram - touch -t `date '+%m%d0900'` pangram.tar ; gzip pangram.tar - touch pangram.tar.gz ; mv pangram.tar.gz pangram2.tgz - if cmp -s pangram1.tgz pangram2.tgz ; then - echo "OK" - rm -rf pangram pangram1.tgz pangram2.tgz - else - echo "NG" - cat <<- "EOF" - Hmm, packaging may not be done properly on this filesystem. - Would you please try again on a default filesystem, thanks! - - Happy packaging!! - - Quitting... - EOF - exit - fi -} - -install2() { - install -d ${2%/*} ; install -m 644 $1 $2 -} - -strip_bindir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - shopt -s nullglob - cd $1 - for i in * ; do - echo "$i" - if [ -h $i ] ; then continue ; fi - if [ -n "`file $i | grep "not stripped"`" ] ; then - echo "stripping -p $i" - strip -p $i - fi - done - ) fi -} - -strip_libdir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - shopt -s nullglob - cd $1 - for i in *.so *.so.* *.a ; do - echo "$i" - if [ -h $i ] ; then continue ; fi - if [ -n "`nm -a $i | grep " a "`" ] ; then - if [ $i != ${i%.a} ] ; then - echo -n "ranlib and " - touch -r $i $i.mt ; ranlib $i ; touch -r $i.mt $i ; rm $i.mt - fi - echo "stripping -gp $i" - strip -gp $i - fi - done - ) fi -} - -gzip_dir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - cd $1 - files=`ls -f --indicator-style=none | sed '/^\.\{1,2\}$/d'` - for i in $files ; do - echo "$i" - if [ ! -f $i -a ! -h $i -o $i != ${i%.gz} ] ; then continue ; fi - lnks=`ls -l $i | awk '{print $2}'` - if [ $lnks -gt 1 ] ; then - inum=`ls -i $i | awk '{print $1}'` - for j in `find . -maxdepth 1 -inum $inum` ; do - if [ ${j#./} == $i ] ; then - gzip -f $i - else - rm -f ${j#./} ; ln $i.gz ${j#./}.gz - fi - done - elif [ -h $i ] ; then - target=`readlink $i` ; rm -f $i ; ln -s $target.gz $i.gz - else - gzip $i - fi - done - for i in $files ; do mv ${i%.gz}.gz $C ; done - for i in $files ; do mv $C/${i%.gz}.gz . ; done - ) fi -} - -gzip_one() { - gzip $1 ; mv $1.gz $C ; mv $C/${1##*/}.gz ${1%/*} -} - -compress() { - for i in {$P,$P/usr}/{sbin,bin} ; do strip_bindir $i ; done - for i in {$P,$P/usr}/$libdir ; do strip_libdir $i ; done - if [ -f $infodir/dir ] ; then rm -f $infodir/dir ; fi - gzip_dir $infodir - for i in `seq 9` n ; do gzip_dir $mandir/man$i ; done -} - -prune_symlink() { - echo "pruning symlink in $1" - if [ -d $1 ] ; then ( - cd $P - rm -f /tmp/iNsT-a.$$ ; touch /tmp/iNsT-a.$$ - for i in `find ${1#$P/} -type l` ; do - target=`readlink $i` - echo "$i -> $target" - echo $i$'\n'$target >> /tmp/iNsT-a.$$ - done - COUNT=1 - LINE=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - while [ -n "$LINE" ] ; do - LINKGOESIN=`dirname $LINE` - LINKNAMEIS=`basename $LINE` - COUNT=$(($COUNT + 1)) - LINKPOINTSTO=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - if [ ! -d install ] ; then mkdir install ; fi - cat <<- EOF >> install/doinst.sh - ( cd $LINKGOESIN ; rm -rf $LINKNAMEIS ) - ( cd $LINKGOESIN ; ln -sf $LINKPOINTSTO $LINKNAMEIS ) - EOF - rm -rf $LINE ; touch -t `date '+%m%d0900'` install/doinst.sh $LINE - COUNT=$(($COUNT + 1)) - LINE=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - done - rm -f /tmp/iNsT-a.$$ - ) fi -} - -convert() { - for i in {$P,$P/usr}/{sbin,bin} ; do prune_symlink $i ; done - for i in {$P,$P/usr}/$libdir ; do prune_symlink $i ; done - prune_symlink $infodir - for i in `seq 9` n ; do prune_symlink $mandir/man$i ; done -} - -fscheck -W=`pwd` -for i in `seq 0 $((${#src[@]} - 1))` ; do - S[$i]=$W/${src[$i]} ; B[$i]=$W/build`test ${#src[@]} -eq 1 || echo $i` -done -P=$W/work ; C=$W/pivot -infodir=$P/usr/share/info -mandir=$P/usr/share/man -docdir=$P/usr/share/doc -myname=`basename $0` -pkg=$pkgbase-$vers-$arch-$build -case $arch in x86_64) libdir=lib64 ;; *) libdir=lib ;; esac -if [ $# -eq 0 ] ; then - opt_download=1 ; opt_config=1 ; opt_build=1 ; opt_package=1 +if [ -f functions ] ; then + source ./functions +elif [ ! -f /usr/share/plamo/functions ] ; then + wget ftp://plamo.linet.gr.jp/pub/Plamo-src/admin/functions + source ./functions else - opt_download=0 ; opt_config=0 ; opt_build=0 ; opt_package=0 - for i in $@ ; do - case $i in - download) opt_download=1 ;; - config) opt_config=1 ;; - build) opt_build=1 ;; - package) opt_package=1 ;; - esac - done + source /usr/share/plamo/functions fi + +fscheck +prepare "$@" if [ $opt_download -eq 1 ] ; then - for i in $url ; do - 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|tgz) tar xvpzf ${i##*/} ;; - bz2|tbz) tar xvpjf ${i##*/} ;; - xz|txz) tar xvpJf ${i##*/} ;; - esac - done + download_sources fi if [ $opt_config -eq 1 ] ; then 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 - 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 + apply_patches cd $B cp -p sshd_config{,.orig} sed -i -e 's@^#\(UsePAM\) no$@\1 yes@g' \ @@ -248,12 +49,6 @@ fi for i in `seq 0 $((${#B[@]} - 1))` ; do cd ${B[$i]} - if [ -f Makefile ] ; then - make clean - fi - if [ -f config.log ] ; then - rm -rf config.cache config.log - fi if [ -x configure ] ; then ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --libdir='${exec_prefix}'/$libdir --infodir='${prefix}'/share/info \ @@ -270,12 +65,7 @@ done fi if [ $opt_package -eq 1 ] ; then - if [ `id -u` -ne 0 ] ; then - read -p "Do you want to package as root? [y/N] " ans - if [ "x$ans" == "xY" -o "x$ans" == "xy" ] ; then - cd $W ; /bin/su -c "$0 package" ; exit - fi - fi + root_priv if [ -d $P ] ; then rm -rf $P ; fi ; mkdir -p $P if [ -d $C ] ; then rm -rf $C ; fi ; mkdir -p $C touch $W/i.st ; sleep 1 @@ -301,38 +91,8 @@ -exec touch -t `date '+%m%d0900'` {} \; compress strip_bindir $P/usr/libexec - for i in `seq 0 $((${#DOCS[@]} - 1))` ; do - for j in ${DOCS[$i]} ; do - for k in ${S[$i]}/$j ; do - install2 $k $docdir/${src[$i]}/${k#${S[$i]}/} - touch -r $k $docdir/${src[$i]}/${k#${S[$i]}/} - gzip_one $docdir/${src[$i]}/${k#${S[$i]}/} - done - done - if [ $i -eq 0 ] ; then - install $myname $docdir/$src - touch -t `date '+%m%d0900'` $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 - convert + setup_docdir + convert_links cat <<- "EOF" >> $P/install/doinst.sh ssh_config() { @@ -360,6 +120,5 @@ tar rvpf $pkg.tar -C $P install/doinst.sh touch -t `date '+%m%d0900'` $pkg.tar ; xz $pkg.tar ; touch $pkg.tar.xz mv $pkg.tar.xz $pkg.txz - read -p "Do you want to keep work files? [y/N] " ans - if [ "x$ans" != "xY" -a "x$ans" != "xy" ] ; then rm -rf $P $C i.[se]t ; fi + cleanup fi --- plamo/00_base/old/microcode_ctl-20160121/PlamoBuild.microcode_ctl-2.1_6 2016-01-21 20:12:32.000000000 +0900 +++ plamo/00_base/microcode_ctl/PlamoBuild.microcode_ctl-2.1_6 2017-04-24 19:55:56.000000000 +0900 @@ -1,217 +1,47 @@ #!/bin/sh ###################################################################### -url="https://fedorahosted.org/released/microcode_ctl/microcode_ctl-2.1-6.tar.xz +url="http://ftp.jaist.ac.jp/pub/Linux/Momonga/development/source/SOURCES/microcode_ctl-2.1-6.tar.xz http://downloadmirror.intel.com/24616/eng/microcode-20150107.tgz" +verify= +digest= +commitid= pkgbase=microcode_ctl vers=2.1_6 arch=`uname -m` -build=P3 +build=P4 src=$pkgbase-2.1-6 +patchfiles="" OPT_CONFIG="" DOCS="README Changelog" +template=20170415 +tmplurl=ftp://plamo.linet.gr.jp/pub/Plamo-src/admin ###################################################################### -fscheck() { - PANGRAM="The quick brown fox jumps over the lazy dog." - echo -n "Checking for the filesystem ... " - mkdir pangram ; ( cd pangram ; touch $PANGRAM ) - mv pangram pangram~ ; mkdir pangram ; touch -r pangram~ pangram - tar cpf pangram.tar pangram ; rmdir pangram ; mv pangram~ pangram - for i in $PANGRAM ; do tar rpf pangram.tar pangram/$i ; done - touch -t `date '+%m%d0900'` pangram.tar ; gzip pangram.tar - touch pangram.tar.gz ; mv pangram.tar.gz pangram1.tgz - tar cpf pangram.tar pangram - touch -t `date '+%m%d0900'` pangram.tar ; gzip pangram.tar - touch pangram.tar.gz ; mv pangram.tar.gz pangram2.tgz - if cmp -s pangram1.tgz pangram2.tgz ; then - echo "OK" - rm -rf pangram pangram1.tgz pangram2.tgz - else - echo "NG" - cat <<- "EOF" - Hmm, packaging may not be done properly on this filesystem. - Would you please try again on a default filesystem, thanks! - - Happy packaging!! - - Quitting... - EOF - exit - fi -} - -install2() { - install -d ${2%/*} ; install -m 644 $1 $2 -} - -strip_bindir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - shopt -s nullglob - cd $1 - for i in * ; do - echo "$i" - if [ -h $i ] ; then continue ; fi - if [ -n "`file $i | grep "not stripped"`" ] ; then - echo "stripping -p $i" - strip -p $i - fi - done - ) fi -} - -strip_libdir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - shopt -s nullglob - cd $1 - for i in *.so *.so.* *.a ; do - echo "$i" - if [ -h $i ] ; then continue ; fi - if [ -n "`nm -a $i | grep " a "`" ] ; then - if [ $i != ${i%.a} ] ; then - echo -n "ranlib and " - touch -r $i $i.mt ; ranlib $i ; touch -r $i.mt $i ; rm $i.mt - fi - echo "stripping -gp $i" - strip -gp $i - fi - done - ) fi -} - -gzip_dir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - cd $1 - files=`ls -f --indicator-style=none | sed '/^\.\{1,2\}$/d'` - for i in $files ; do - echo "$i" - if [ ! -f $i -a ! -h $i -o $i != ${i%.gz} ] ; then continue ; fi - lnks=`ls -l $i | awk '{print $2}'` - if [ $lnks -gt 1 ] ; then - inum=`ls -i $i | awk '{print $1}'` - for j in `find . -maxdepth 1 -inum $inum` ; do - if [ ${j#./} == $i ] ; then - gzip -f $i - else - rm -f ${j#./} ; ln $i.gz ${j#./}.gz - fi - done - elif [ -h $i ] ; then - target=`readlink $i` ; rm -f $i ; ln -s $target.gz $i.gz - else - gzip $i - fi - done - for i in $files ; do mv ${i%.gz}.gz $C ; done - for i in $files ; do mv $C/${i%.gz}.gz . ; done - ) fi -} - -gzip_one() { - gzip $1 ; mv $1.gz $C ; mv $C/${1##*/}.gz ${1%/*} -} - -compress() { - for i in {$P,$P/usr}/{sbin,bin} ; do strip_bindir $i ; done - for i in {$P,$P/usr}/$libdir ; do strip_libdir $i ; done - if [ -f $infodir/dir ] ; then rm -f $infodir/dir ; fi - gzip_dir $infodir - for i in `seq 9` n ; do gzip_dir $mandir/man$i ; done -} - -prune_symlink() { - echo "pruning symlink in $1" - if [ -d $1 ] ; then ( - cd $P - rm -f /tmp/iNsT-a.$$ ; touch /tmp/iNsT-a.$$ - for i in `find ${1#$P/} -type l` ; do - target=`readlink $i` - echo "$i -> $target" - echo $i$'\n'$target >> /tmp/iNsT-a.$$ - done - COUNT=1 - LINE=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - while [ -n "$LINE" ] ; do - LINKGOESIN=`dirname $LINE` - LINKNAMEIS=`basename $LINE` - COUNT=$(($COUNT + 1)) - LINKPOINTSTO=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - if [ ! -d install ] ; then mkdir install ; fi - cat <<- EOF >> install/doinst.sh - ( cd $LINKGOESIN ; rm -rf $LINKNAMEIS ) - ( cd $LINKGOESIN ; ln -sf $LINKPOINTSTO $LINKNAMEIS ) - EOF - rm -rf $LINE ; touch -t `date '+%m%d0900'` install/doinst.sh $LINE - COUNT=$(($COUNT + 1)) - LINE=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - done - rm -f /tmp/iNsT-a.$$ - ) fi -} - -convert() { - for i in {$P,$P/usr}/{sbin,bin} ; do prune_symlink $i ; done - for i in {$P,$P/usr}/$libdir ; do prune_symlink $i ; done - prune_symlink $infodir - for i in `seq 9` n ; do prune_symlink $mandir/man$i ; done -} - -fscheck -W=`pwd` -for i in `seq 0 $((${#src[@]} - 1))` ; do - S[$i]=$W/${src[$i]} ; B[$i]=$W/build`test ${#src[@]} -eq 1 || echo $i` -done -P=$W/work ; C=$W/pivot -infodir=$P/usr/share/info -mandir=$P/usr/share/man -docdir=$P/usr/share/doc -myname=`basename $0` -pkg=$pkgbase-$vers-$arch-$build -case $arch in x86_64) libdir=lib64 ;; *) libdir=lib ;; esac -if [ $# -eq 0 ] ; then - opt_download=1 ; opt_config=1 ; opt_build=1 ; opt_package=1 +if [ -f functions ] ; then + source ./functions +elif [ ! -f /usr/share/plamo/functions ] ; then + wget ftp://plamo.linet.gr.jp/pub/Plamo-src/admin/functions + source ./functions else - opt_download=0 ; opt_config=0 ; opt_build=0 ; opt_package=0 - for i in $@ ; do - case $i in - download) opt_download=1 ;; - config) opt_config=1 ;; - build) opt_build=1 ;; - package) opt_package=1 ;; - esac - done + source /usr/share/plamo/functions fi + +fscheck +prepare "$@" if [ $opt_download -eq 1 ] ; then - for i in $url ; do - if [ ! -f ${i##*/} ] ; then wget $i ; fi - done - for i in $url ; do - case ${i##*.} in - tar) tar xvpf ${i##*/} ;; - gz) tar xvpzf ${i##*/} ;; - bz2) tar xvpjf ${i##*/} ;; - xz) tar xvpJf ${i##*/} ;; - esac - done + download_sources fi if [ $opt_config -eq 1 ] ; then 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 + apply_patches for i in `seq 0 $((${#B[@]} - 1))` ; do cd ${B[$i]} - if [ -f Makefile ] ; then - make clean - fi - if [ -f config.log ] ; then - 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 @@ -225,12 +55,7 @@ done fi if [ $opt_package -eq 1 ] ; then - if [ `id -u` -ne 0 ] ; then - read -p "Do you want to package as root? [y/N] " ans - if [ "x$ans" == "xY" -o "x$ans" == "xy" ] ; then - cd $W ; /bin/su -c "$0 package" ; exit - fi - fi + root_priv if [ -d $P ] ; then rm -rf $P ; fi ; mkdir -p $P if [ -d $C ] ; then rm -rf $C ; fi ; mkdir -p $C touch $W/i.st ; sleep 1 @@ -245,29 +70,12 @@ find $P ! -type l -newer i.st ! -newer i.et \ -exec touch -t `date '+%m%d0900'` {} \; compress - for i in `seq 0 $((${#DOCS[@]} - 1))` ; do - for j in ${DOCS[$i]} ; do - for k in ${S[$i]}/$j ; do - install2 $k $docdir/${src[$i]}/${k#${S[$i]}/} - touch -r $k $docdir/${src[$i]}/${k#${S[$i]}/} - gzip_one $docdir/${src[$i]}/${k#${S[$i]}/} - done - done - if [ $i -eq 0 ] ; then - install $myname $docdir/$src - touch -t `date '+%m%d0900'` $docdir/$src/$myname - gzip_one $docdir/$src/$myname - else - ln $docdir/$src/$myname.gz $docdir/${src[$i]} - fi - ( cd $docdir ; find ${src[$i]} -type d -exec touch -r $W/{} {} \; ) - done - convert + setup_docdir + convert_links tar cvpf $pkg.tar -C $P `cd $P ; find usr/sbin | tail -n+2` tar rvpf $pkg.tar -C $P lib/firmware/intel-ucode tar rvpf $pkg.tar -C $P usr/share/doc/$src touch -t `date '+%m%d0900'` $pkg.tar ; xz $pkg.tar ; touch $pkg.tar.xz mv $pkg.tar.xz $pkg.txz - read -p "Do you want to keep work files? [y/N] " ans - if [ "x$ans" != "xY" -a "x$ans" != "xy" ] ; then rm -rf $P $C i.[se]t ; fi + cleanup fi --- plamo/00_base/old/openssl-20170301/PlamoBuild.openssl-1.0.2k 2017-03-01 08:00:25.000000000 +0900 +++ plamo/00_base/openssl/PlamoBuild.openssl-1.0.2k 2017-04-26 08:58:22.000000000 +0900 @@ -3,253 +3,48 @@ ###################################################################### url="http://www.openssl.org/source/openssl-1.0.2k.tar.gz ftp://plamo.linet.gr.jp/pub/Plamo-src/plamo/00_base/openssl/mkcabundle.pl" +verify= +digest= +commitid= pkgbase=openssl vers=1.0.2k arch=`uname -m` -build=P2 +build=P3 src=$pkgbase-$vers patchfiles="" OPT_CONFIG="" DOCS="ACKNOWLEDGMENTS CHANGES CHANGES.SSLeay CONTRIBUTING FAQ INSTALL `echo INSTALL.{DJGPP,MacOS,NW,OS2,VMS,W32,W64,WCE}` LICENSE NEWS PROBLEMS README README.ASN1 README.ENGINE" -template=20170204 +template=20170415 tmplurl=ftp://plamo.linet.gr.jp/pub/Plamo-src/admin ###################################################################### -fscheck() { - PANGRAM="The quick brown fox jumps over the lazy dog." - echo -n "Checking for the filesystem ... " - mkdir pangram ; ( cd pangram ; touch $PANGRAM ) - mv pangram pangram~ ; mkdir pangram ; touch -r pangram~ pangram - tar cpf pangram.tar pangram ; rmdir pangram ; mv pangram~ pangram - for i in $PANGRAM ; do tar rpf pangram.tar pangram/$i ; done - touch -t `date '+%m%d0900'` pangram.tar ; gzip pangram.tar - touch pangram.tar.gz ; mv pangram.tar.gz pangram1.tgz - tar cpf pangram.tar pangram - touch -t `date '+%m%d0900'` pangram.tar ; gzip pangram.tar - touch pangram.tar.gz ; mv pangram.tar.gz pangram2.tgz - if cmp -s pangram1.tgz pangram2.tgz ; then - echo "OK" - rm -rf pangram pangram1.tgz pangram2.tgz - else - echo "NG" - cat <<- "EOF" - Hmm, packaging may not be done properly on this filesystem. - Would you please try again on a default filesystem, thanks! - - Happy packaging!! - - Quitting... - EOF - exit - fi -} - -install2() { - install -d ${2%/*} ; install -m 644 $1 $2 -} - -strip_bindir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - shopt -s nullglob - cd $1 - for i in * ; do - echo "$i" - if [ -h $i ] ; then continue ; fi - if [ -n "`file $i | grep "not stripped"`" ] ; then - echo "stripping -p $i" - strip -p $i - fi - done - ) fi -} - -strip_libdir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - shopt -s nullglob - cd $1 - for i in *.so *.so.* *.a ; do - echo "$i" - if [ -h $i ] ; then continue ; fi - if [ -n "`nm -a $i | grep " a "`" ] ; then - if [ $i != ${i%.a} ] ; then - echo -n "ranlib and " - touch -r $i $i.mt ; ranlib $i ; touch -r $i.mt $i ; rm $i.mt - fi - echo "stripping -gp $i" - strip -gp $i - fi - done - ) fi -} - -gzip_dir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - cd $1 - files=`ls -f --indicator-style=none | sed '/^\.\{1,2\}$/d'` - for i in $files ; do - echo "$i" - if [ ! -f $i -a ! -h $i -o $i != ${i%.gz} ] ; then continue ; fi - lnks=`ls -l $i | awk '{print $2}'` - if [ $lnks -gt 1 ] ; then - inum=`ls -i $i | awk '{print $1}'` - for j in `find . -maxdepth 1 -inum $inum` ; do - if [ ${j#./} == $i ] ; then - gzip -f $i - else - rm -f ${j#./} ; ln $i.gz ${j#./}.gz - fi - done - elif [ -h $i ] ; then - target=`readlink $i` ; rm -f $i ; ln -s $target.gz $i.gz - else - gzip $i - fi - done - for i in $files ; do mv ${i%.gz}.gz $C ; done - for i in $files ; do mv $C/${i%.gz}.gz . ; done - ) fi -} - -gzip_one() { - gzip $1 ; mv $1.gz $C ; mv $C/${1##*/}.gz ${1%/*} -} - -compress() { - for i in {$P,$P/usr}/{sbin,bin} ; do strip_bindir $i ; done - for i in {$P,$P/usr}/$libdir ; do strip_libdir $i ; done - if [ -f $infodir/dir ] ; then rm -f $infodir/dir ; fi - gzip_dir $infodir - for i in `seq 9` n ; do gzip_dir $mandir/man$i ; done -} - -prune_symlink() { - echo "pruning symlink in $1" - if [ -d $1 ] ; then ( - cd $P - rm -f /tmp/iNsT-a.$$ ; touch /tmp/iNsT-a.$$ - for i in `find ${1#$P/} -type l` ; do - target=`readlink $i` - echo "$i -> $target" - echo $i$'\n'$target >> /tmp/iNsT-a.$$ - done - COUNT=1 - LINE=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - while [ -n "$LINE" ] ; do - LINKGOESIN=`dirname $LINE` - LINKNAMEIS=`basename $LINE` - COUNT=$(($COUNT + 1)) - LINKPOINTSTO=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - if [ ! -d install ] ; then mkdir install ; fi - cat <<- EOF >> install/doinst.sh - ( cd $LINKGOESIN ; rm -rf $LINKNAMEIS ) - ( cd $LINKGOESIN ; ln -sf $LINKPOINTSTO $LINKNAMEIS ) - EOF - rm -rf $LINE ; touch -t `date '+%m%d0900'` install/doinst.sh $LINE - COUNT=$(($COUNT + 1)) - LINE=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - done - rm -f /tmp/iNsT-a.$$ - ) fi -} - -convert() { - for i in {$P,$P/usr}/{sbin,bin} ; do prune_symlink $i ; done - for i in {$P,$P/usr}/$libdir ; do prune_symlink $i ; done - prune_symlink $infodir - for i in `seq 9` n ; do prune_symlink $mandir/man$i ; done -} - -fscheck -W=`pwd` -for i in `seq 0 $((${#src[@]} - 1))` ; do - S[$i]=$W/${src[$i]} ; B[$i]=$W/build`test ${#src[@]} -eq 1 || echo $i` -done -P=$W/work ; C=$W/pivot -infodir=$P/usr/share/info -mandir=$P/usr/share/man -docdir=$P/usr/share/doc -myname=`basename $0` -pkg=$pkgbase-$vers-$arch-$build -case $arch in x86_64) libdir=lib64 ;; *) libdir=lib ;; esac -if [ $# -eq 0 ] ; then - opt_download=1 ; opt_config=1 ; opt_build=1 ; opt_package=1 +if [ -f functions ] ; then + source ./functions +elif [ ! -f /usr/share/plamo/functions ] ; then + wget ftp://plamo.linet.gr.jp/pub/Plamo-src/admin/functions + source ./functions else - opt_download=0 ; opt_config=0 ; opt_build=0 ; opt_package=0 - for i in $@ ; do - case $i in - download) opt_download=1 ;; - config) opt_config=1 ;; - build) opt_build=1 ;; - package) opt_package=1 ;; - esac - done + source /usr/share/plamo/functions fi + +fscheck +prepare "$@" if [ $opt_download -eq 1 ] ; then - for i in $url ; do - 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 + download_sources 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|tgz) tar xvpzf ${i##*/} ;; - bz2|tbz) tar xvpjf ${i##*/} ;; - xz|txz) tar xvpJf ${i##*/} ;; - esac - done fi if [ $opt_config -eq 1 ] ; then 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 + apply_patches 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 - if [ -f config.log ] ; then - rm -rf config.cache config.log - fi if [ -x configure ] ; then ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --libdir='${exec_prefix}'/$libdir --infodir='${prefix}'/share/info \ @@ -274,12 +69,7 @@ done fi if [ $opt_package -eq 1 ] ; then - if [ `id -u` -ne 0 ] ; then - read -p "Do you want to package as root? [y/N] " ans - if [ "x$ans" == "xY" -o "x$ans" == "xy" ] ; then - cd $W ; /bin/su -c "$0 package" ; exit - fi - fi + root_priv if [ -d $P ] ; then rm -rf $P ; fi ; mkdir -p $P if [ -d $C ] ; then rm -rf $C ; fi ; mkdir -p $C touch $W/i.st ; sleep 1 @@ -300,39 +90,9 @@ compress strip_libdir $P/usr/$libdir/engines touch -t `date '+%m%d0900'` $P/usr/$libdir/engines - for i in `seq 0 $((${#DOCS[@]} - 1))` ; do - for j in ${DOCS[$i]} ; do - for k in ${S[$i]}/$j ; do - install2 $k $docdir/${src[$i]}/${k#${S[$i]}/} - touch -r $k $docdir/${src[$i]}/${k#${S[$i]}/} - gzip_one $docdir/${src[$i]}/${k#${S[$i]}/} - done - done - if [ $i -eq 0 ] ; then - install $myname $docdir/$src - touch -t `date '+%m%d0900'` $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 + setup_docdir touch -t `date '+%m%d0900'` $docdir/$src - convert + convert_links prune_symlink $P/etc/ssl/certs/demo prune_symlink $P/usr/share touch -t `date '+%m%d0900'` $P/etc/ssl/certs/demo @@ -351,6 +111,5 @@ tar rvpf $pkg.tar -C $P install/doinst.sh touch -t `date '+%m%d0900'` $pkg.tar ; xz $pkg.tar ; touch $pkg.tar.xz mv $pkg.tar.xz $pkg.txz - read -p "Do you want to keep work files? [y/N] " ans - if [ "x$ans" != "xY" -a "x$ans" != "xy" ] ; then rm -rf $P $C i.[se]t ; fi + cleanup fi --- plamo/00_base/old/acl-20160105/PlamoBuild.acl-2.2.51 2016-01-05 23:39:45.000000000 +0900 +++ plamo/00_base/acl/PlamoBuild.acl-2.2.51 2017-04-09 13:28:38.000000000 +0900 @@ -2,215 +2,45 @@ ###################################################################### url="http://download.savannah.gnu.org/releases/acl/acl-2.2.51.src.tar.gz" +verify= +commitid= pkgbase=acl vers=2.2.51 arch=`uname -m` -build=P2 +build=P3 src=$pkgbase-$vers +patchfiles="" OPT_CONFIG="" DOCS="README `echo doc/{{extensions,libacl}.txt,TODO,PORTING,CHANGES}` `echo doc/{COPYING,COPYING.LGPL,INSTALL,old-acl.5}`" +template=20170323 +tmplurl=ftp://plamo.linet.gr.jp/pub/Plamo-src/admin ###################################################################### -fscheck() { - PANGRAM="The quick brown fox jumps over the lazy dog." - echo -n "Checking for the filesystem ... " - mkdir pangram ; ( cd pangram ; touch $PANGRAM ) - mv pangram pangram~ ; mkdir pangram ; touch -r pangram~ pangram - tar cpf pangram.tar pangram ; rmdir pangram ; mv pangram~ pangram - for i in $PANGRAM ; do tar rpf pangram.tar pangram/$i ; done - touch -t `date '+%m%d0900'` pangram.tar ; gzip pangram.tar - touch pangram.tar.gz ; mv pangram.tar.gz pangram1.tgz - tar cpf pangram.tar pangram - touch -t `date '+%m%d0900'` pangram.tar ; gzip pangram.tar - touch pangram.tar.gz ; mv pangram.tar.gz pangram2.tgz - if cmp -s pangram1.tgz pangram2.tgz ; then - echo "OK" - rm -rf pangram pangram1.tgz pangram2.tgz - else - echo "NG" - cat <<- "EOF" - Hmm, packaging may not be done properly on this filesystem. - Would you please try again on a default filesystem, thanks! - - Happy packaging!! - - Quitting... - EOF - exit - fi -} - -install2() { - install -d ${2%/*} ; install -m 644 $1 $2 -} - -strip_bindir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - shopt -s nullglob - cd $1 - for i in * ; do - echo "$i" - if [ -h $i ] ; then continue ; fi - if [ -n "`file $i | grep "not stripped"`" ] ; then - echo "stripping -p $i" - strip -p $i - fi - done - ) fi -} - -strip_libdir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - shopt -s nullglob - cd $1 - for i in *.so *.so.* *.a ; do - echo "$i" - if [ -h $i ] ; then continue ; fi - if [ -n "`nm -a $i | grep " a "`" ] ; then - if [ $i != ${i%.a} ] ; then - echo -n "ranlib and " - touch -r $i $i.mt ; ranlib $i ; touch -r $i.mt $i ; rm $i.mt - fi - echo "stripping -gp $i" - strip -gp $i - fi - done - ) fi -} - -gzip_dir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - cd $1 - files=`ls -f --indicator-style=none | sed '/^\.\{1,2\}$/d'` - for i in $files ; do - echo "$i" - if [ ! -f $i -a ! -h $i -o $i != ${i%.gz} ] ; then continue ; fi - lnks=`ls -l $i | awk '{print $2}'` - if [ $lnks -gt 1 ] ; then - inum=`ls -i $i | awk '{print $1}'` - for j in `find . -maxdepth 1 -inum $inum` ; do - if [ ${j#./} == $i ] ; then - gzip -f $i - else - rm -f ${j#./} ; ln $i.gz ${j#./}.gz - fi - done - elif [ -h $i ] ; then - target=`readlink $i` ; rm -f $i ; ln -s $target.gz $i.gz - else - gzip $i - fi - done - for i in $files ; do mv ${i%.gz}.gz $C ; done - for i in $files ; do mv $C/${i%.gz}.gz . ; done - ) fi -} - -gzip_one() { - gzip $1 ; mv $1.gz $C ; mv $C/${1##*/}.gz ${1%/*} -} - -compress() { - for i in {$P,$P/usr}/{sbin,bin} ; do strip_bindir $i ; done - for i in {$P,$P/usr}/$libdir ; do strip_libdir $i ; done - if [ -f $infodir/dir ] ; then rm -f $infodir/dir ; fi - gzip_dir $infodir - for i in `seq 9` n ; do gzip_dir $mandir/man$i ; done -} - -prune_symlink() { - echo "pruning symlink in $1" - if [ -d $1 ] ; then ( - cd $P - rm -f /tmp/iNsT-a.$$ ; touch /tmp/iNsT-a.$$ - for i in `find ${1#$P/} -type l` ; do - target=`readlink $i` - echo "$i -> $target" - echo $i$'\n'$target >> /tmp/iNsT-a.$$ - done - COUNT=1 - LINE=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - while [ -n "$LINE" ] ; do - LINKGOESIN=`dirname $LINE` - LINKNAMEIS=`basename $LINE` - COUNT=$(($COUNT + 1)) - LINKPOINTSTO=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - if [ ! -d install ] ; then mkdir install ; fi - cat <<- EOF >> install/doinst.sh - ( cd $LINKGOESIN ; rm -rf $LINKNAMEIS ) - ( cd $LINKGOESIN ; ln -sf $LINKPOINTSTO $LINKNAMEIS ) - EOF - rm -rf $LINE ; touch -t `date '+%m%d0900'` install/doinst.sh $LINE - COUNT=$(($COUNT + 1)) - LINE=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - done - rm -f /tmp/iNsT-a.$$ - ) fi -} - -convert() { - for i in {$P,$P/usr}/{sbin,bin} ; do prune_symlink $i ; done - for i in {$P,$P/usr}/$libdir ; do prune_symlink $i ; done - prune_symlink $infodir - for i in `seq 9` n ; do prune_symlink $mandir/man$i ; done -} - -fscheck -W=`pwd` -for i in `seq 0 $((${#src[@]} - 1))` ; do - S[$i]=$W/${src[$i]} ; B[$i]=$W/build`test ${#src[@]} -eq 1 || echo $i` -done -P=$W/work ; C=$W/pivot -infodir=$P/usr/share/info -mandir=$P/usr/share/man -docdir=$P/usr/share/doc -myname=`basename $0` -pkg=$pkgbase-$vers-$arch-$build -case $arch in x86_64) libdir=lib64 ;; *) libdir=lib ;; esac -if [ $# -eq 0 ] ; then - opt_download=1 ; opt_config=1 ; opt_build=1 ; opt_package=1 +if [ -f functions ] ; then + source ./functions +elif [ ! -f /usr/share/plamo/functions ] ; then + wget ftp://plamo.linet.gr.jp/pub/Plamo-src/admin/functions + source ./functions else - opt_download=0 ; opt_config=0 ; opt_build=0 ; opt_package=0 - for i in $@ ; do - case $i in - download) opt_download=1 ;; - config) opt_config=1 ;; - build) opt_build=1 ;; - package) opt_package=1 ;; - esac - done + source /usr/share/plamo/functions fi + +fscheck +prepare "$@" if [ $opt_download -eq 1 ] ; then - for i in $url ; do - if [ ! -f ${i##*/} ] ; then wget $i ; fi - done - for i in $url ; do - case ${i##*.} in - tar) tar xvpf ${i##*/} ;; - gz) tar xvpzf ${i##*/} ;; - bz2) tar xvpjf ${i##*/} ;; - esac - done + download_sources fi if [ $opt_config -eq 1 ] ; then 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 + apply_patches for i in `seq 0 $((${#B[@]} - 1))` ; do cd ${B[$i]} - if [ -f Makefile ] ; then - make clean - fi - if [ -f config.log ] ; then - 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 @@ -224,12 +54,7 @@ done fi if [ $opt_package -eq 1 ] ; then - if [ `id -u` -ne 0 ] ; then - read -p "Do you want to package as root? [y/N] " ans - if [ "x$ans" == "xY" -o "x$ans" == "xy" ] ; then - cd $W ; /bin/su -c "$0 package" ; exit - fi - fi + root_priv if [ -d $P ] ; then rm -rf $P ; fi ; mkdir -p $P if [ -d $C ] ; then rm -rf $C ; fi ; mkdir -p $C touch $W/i.st ; sleep 1 @@ -245,23 +70,7 @@ find $P ! -type l -newer i.st ! -newer i.et \ -exec touch -t `date '+%m%d0900'` {} \; compress - for i in `seq 0 $((${#DOCS[@]} - 1))` ; do - for j in ${DOCS[$i]} ; do - for k in ${S[$i]}/$j ; do - install2 $k $docdir/${src[$i]}/${k#${S[$i]}/} - touch -r $k $docdir/${src[$i]}/${k#${S[$i]}/} - gzip_one $docdir/${src[$i]}/${k#${S[$i]}/} - done - done - if [ $i -eq 0 ] ; then - install $myname $docdir/$src - touch -t `date '+%m%d0900'` $docdir/$src/$myname - gzip_one $docdir/$src/$myname - else - ln $docdir/$src/$myname.gz $docdir/${src[$i]} - fi - ( cd $docdir ; find ${src[$i]} -type d -exec touch -r $W/{} {} \; ) - done + setup_docdir cp -a $S/examples $docdir/$src rm $docdir/$src/examples/Makefile chmod -R o+r $docdir/$src/examples @@ -269,14 +78,14 @@ mv $docdir/$src/{examples,$myname.gz} $C mv $C/{examples,$myname.gz} $docdir/$src touch -t `date '+%m%d0900'` $docdir/$src{,/doc,/examples} - convert + convert_links prune_symlink $P/usr/libexec tar cvpf $pkg.tar -C $P `cd $P ; find usr/bin | tail -n+2` tar rvpf $pkg.tar -C $P `cd $P ; find usr/libexec | 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/include/sys | tail -n+2` tar rvpf $pkg.tar -C $P usr/include/acl - 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/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/man3 | tail -n+2` tar rvpf $pkg.tar -C $P `cd $P ; find usr/share/man/man5 | tail -n+2` @@ -284,6 +93,5 @@ tar rvpf $pkg.tar -C $P install/doinst.sh touch -t `date '+%m%d0900'` $pkg.tar ; xz $pkg.tar ; touch $pkg.tar.xz mv $pkg.tar.xz $pkg.txz - read -p "Do you want to keep work files? [y/N] " ans - if [ "x$ans" != "xY" -a "x$ans" != "xy" ] ; then rm -rf $P $C i.[se]t ; fi + cleanup fi --- plamo/00_base/old/at-20151225/PlamoBuild.at-3.1.13 2015-12-25 10:57:46.000000000 +0900 +++ plamo/00_base/at/PlamoBuild.at-3.1.13 2017-04-01 18:24:42.000000000 +0900 @@ -2,214 +2,44 @@ ###################################################################### url="http://repository.timesys.com/buildsources/a/at/at-3.1.13/at-3.1.13.tar.gz" +verify= +commitid= pkgbase=at vers=3.1.13 arch=`uname -m` -build=P2 +build=P3 src=$pkgbase-$vers +patchfiles="" OPT_CONFIG="" DOCS="COPYING ChangeLog Copyright Problems README timespec" +template=20170323 +tmplurl=ftp://plamo.linet.gr.jp/pub/Plamo-src/admin ###################################################################### -fscheck() { - PANGRAM="The quick brown fox jumps over the lazy dog." - echo -n "Checking for the filesystem ... " - mkdir pangram ; ( cd pangram ; touch $PANGRAM ) - mv pangram pangram~ ; mkdir pangram ; touch -r pangram~ pangram - tar cpf pangram.tar pangram ; rmdir pangram ; mv pangram~ pangram - for i in $PANGRAM ; do tar rpf pangram.tar pangram/$i ; done - touch -t `date '+%m%d0900'` pangram.tar ; gzip pangram.tar - touch pangram.tar.gz ; mv pangram.tar.gz pangram1.tgz - tar cpf pangram.tar pangram - touch -t `date '+%m%d0900'` pangram.tar ; gzip pangram.tar - touch pangram.tar.gz ; mv pangram.tar.gz pangram2.tgz - if cmp -s pangram1.tgz pangram2.tgz ; then - echo "OK" - rm -rf pangram pangram1.tgz pangram2.tgz - else - echo "NG" - cat <<- "EOF" - Hmm, packaging may not be done properly on this filesystem. - Would you please try again on a default filesystem, thanks! - - Happy packaging!! - - Quitting... - EOF - exit - fi -} - -install2() { - install -d ${2%/*} ; install -m 644 $1 $2 -} - -strip_bindir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - shopt -s nullglob - cd $1 - for i in * ; do - echo "$i" - if [ -h $i ] ; then continue ; fi - if [ -n "`file $i | grep "not stripped"`" ] ; then - echo "stripping -p $i" - strip -p $i - fi - done - ) fi -} - -strip_libdir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - shopt -s nullglob - cd $1 - for i in *.so *.so.* *.a ; do - echo "$i" - if [ -h $i ] ; then continue ; fi - if [ -n "`nm -a $i | grep " a "`" ] ; then - if [ $i != ${i%.a} ] ; then - echo -n "ranlib and " - touch -r $i $i.mt ; ranlib $i ; touch -r $i.mt $i ; rm $i.mt - fi - echo "stripping -gp $i" - strip -gp $i - fi - done - ) fi -} - -gzip_dir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - cd $1 - files=`ls -f --indicator-style=none | sed '/^\.\{1,2\}$/d'` - for i in $files ; do - echo "$i" - if [ ! -f $i -a ! -h $i -o $i != ${i%.gz} ] ; then continue ; fi - lnks=`ls -l $i | awk '{print $2}'` - if [ $lnks -gt 1 ] ; then - inum=`ls -i $i | awk '{print $1}'` - for j in `find . -maxdepth 1 -inum $inum` ; do - if [ ${j#./} == $i ] ; then - gzip -f $i - else - rm -f ${j#./} ; ln $i.gz ${j#./}.gz - fi - done - elif [ -h $i ] ; then - target=`readlink $i` ; rm -f $i ; ln -s $target.gz $i.gz - else - gzip $i - fi - done - for i in $files ; do mv ${i%.gz}.gz $C ; done - for i in $files ; do mv $C/${i%.gz}.gz . ; done - ) fi -} - -gzip_one() { - gzip $1 ; mv $1.gz $C ; mv $C/${1##*/}.gz ${1%/*} -} - -compress() { - for i in {$P,$P/usr}/{sbin,bin} ; do strip_bindir $i ; done - for i in {$P,$P/usr}/$libdir ; do strip_libdir $i ; done - if [ -f $infodir/dir ] ; then rm -f $infodir/dir ; fi - gzip_dir $infodir - for i in `seq 9` n ; do gzip_dir $mandir/man$i ; done -} - -prune_symlink() { - echo "pruning symlink in $1" - if [ -d $1 ] ; then ( - cd $P - rm -f /tmp/iNsT-a.$$ ; touch /tmp/iNsT-a.$$ - for i in `find ${1#$P/} -type l` ; do - target=`readlink $i` - echo "$i -> $target" - echo $i$'\n'$target >> /tmp/iNsT-a.$$ - done - COUNT=1 - LINE=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - while [ -n "$LINE" ] ; do - LINKGOESIN=`dirname $LINE` - LINKNAMEIS=`basename $LINE` - COUNT=$(($COUNT + 1)) - LINKPOINTSTO=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - if [ ! -d install ] ; then mkdir install ; fi - cat <<- EOF >> install/doinst.sh - ( cd $LINKGOESIN ; rm -rf $LINKNAMEIS ) - ( cd $LINKGOESIN ; ln -sf $LINKPOINTSTO $LINKNAMEIS ) - EOF - rm -rf $LINE ; touch -t `date '+%m%d0900'` install/doinst.sh $LINE - COUNT=$(($COUNT + 1)) - LINE=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - done - rm -f /tmp/iNsT-a.$$ - ) fi -} - -convert() { - for i in {$P,$P/usr}/{sbin,bin} ; do prune_symlink $i ; done - for i in {$P,$P/usr}/$libdir ; do prune_symlink $i ; done - prune_symlink $infodir - for i in `seq 9` n ; do prune_symlink $mandir/man$i ; done -} - -fscheck -W=`pwd` -for i in `seq 0 $((${#src[@]} - 1))` ; do - S[$i]=$W/${src[$i]} ; B[$i]=$W/build`test ${#src[@]} -eq 1 || echo $i` -done -P=$W/work ; C=$W/pivot -infodir=$P/usr/share/info -mandir=$P/usr/share/man -docdir=$P/usr/share/doc -myname=`basename $0` -pkg=$pkgbase-$vers-$arch-$build -case $arch in x86_64) libdir=lib64 ;; *) libdir=lib ;; esac -if [ $# -eq 0 ] ; then - opt_download=1 ; opt_config=1 ; opt_build=1 ; opt_package=1 +if [ -f functions ] ; then + source ./functions +elif [ ! -f /usr/share/plamo/functions ] ; then + wget ftp://plamo.linet.gr.jp/pub/Plamo-src/admin/functions + source ./functions else - opt_download=0 ; opt_config=0 ; opt_build=0 ; opt_package=0 - for i in $@ ; do - case $i in - download) opt_download=1 ;; - config) opt_config=1 ;; - build) opt_build=1 ;; - package) opt_package=1 ;; - esac - done + source /usr/share/plamo/functions fi + +fscheck +prepare "$@" if [ $opt_download -eq 1 ] ; then - for i in $url ; do - if [ ! -f ${i##*/} ] ; then wget $i ; fi - done - for i in $url ; do - case ${i##*.} in - tar) tar xvpf ${i##*/} ;; - gz) tar xvpzf ${i##*/} ;; - bz2) tar xvpjf ${i##*/} ;; - esac - done + download_sources fi if [ $opt_config -eq 1 ] ; then 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 + apply_patches for i in `seq 0 $((${#B[@]} - 1))` ; do cd ${B[$i]} - if [ -f Makefile ] ; then - make clean - fi - if [ -f config.log ] ; then - 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 @@ -223,12 +53,7 @@ done fi if [ $opt_package -eq 1 ] ; then - if [ `id -u` -ne 0 ] ; then - read -p "Do you want to package as root? [y/N] " ans - if [ "x$ans" == "xY" -o "x$ans" == "xy" ] ; then - cd $W ; /bin/su -c "$0 package" ; exit - fi - fi + root_priv if [ -d $P ] ; then rm -rf $P ; fi ; mkdir -p $P if [ -d $C ] ; then rm -rf $C ; fi ; mkdir -p $C touch $W/i.st ; sleep 1 @@ -251,24 +76,8 @@ find $P ! -type l -newer i.st ! -newer i.et \ -exec touch -t `date '+%m%d0900'` {} \; compress - for i in `seq 0 $((${#DOCS[@]} - 1))` ; do - for j in ${DOCS[$i]} ; do - for k in ${S[$i]}/$j ; do - install2 $k $docdir/${src[$i]}/${k#${S[$i]}/} - touch -r $k $docdir/${src[$i]}/${k#${S[$i]}/} - gzip_one $docdir/${src[$i]}/${k#${S[$i]}/} - done - done - if [ $i -eq 0 ] ; then - install $myname $docdir/$src - touch -t `date '+%m%d0900'` $docdir/$src/$myname - gzip_one $docdir/$src/$myname - else - ln $docdir/$src/$myname.gz $docdir/${src[$i]} - fi - ( cd $docdir ; find ${src[$i]} -type d -exec touch -r $W/{} {} \; ) - done - convert + setup_docdir + convert_links 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 etc/at.deny @@ -281,6 +90,5 @@ tar rvpf $pkg.tar -C $P install/doinst.sh touch -t `date '+%m%d0900'` $pkg.tar ; xz $pkg.tar ; touch $pkg.tar.xz mv $pkg.tar.xz $pkg.txz - read -p "Do you want to keep work files? [y/N] " ans - if [ "x$ans" != "xY" -a "x$ans" != "xy" ] ; then rm -rf $P $C i.[se]t ; fi + cleanup fi --- plamo/00_base/old/attr-20160105/PlamoBuild.attr-2.4.44 2016-01-05 23:43:17.000000000 +0900 +++ plamo/00_base/attr/PlamoBuild.attr-2.4.44 2017-04-09 13:29:21.000000000 +0900 @@ -2,214 +2,44 @@ ###################################################################### url="http://download.savannah.gnu.org/releases/attr/attr-2.4.44.src.tar.gz" +verify= +commitid= pkgbase=attr vers=2.4.44 arch=`uname -m` -build=P3 +build=P4 src=$pkgbase-$vers +patchfiles="" OPT_CONFIG="" DOCS="README `echo doc/{INSTALL,PORTING,CHANGES,COPYING}`" +template=20170323 +tmplurl=ftp://plamo.linet.gr.jp/pub/Plamo-src/admin ###################################################################### -fscheck() { - PANGRAM="The quick brown fox jumps over the lazy dog." - echo -n "Checking for the filesystem ... " - mkdir pangram ; ( cd pangram ; touch $PANGRAM ) - mv pangram pangram~ ; mkdir pangram ; touch -r pangram~ pangram - tar cpf pangram.tar pangram ; rmdir pangram ; mv pangram~ pangram - for i in $PANGRAM ; do tar rpf pangram.tar pangram/$i ; done - touch -t `date '+%m%d0900'` pangram.tar ; gzip pangram.tar - touch pangram.tar.gz ; mv pangram.tar.gz pangram1.tgz - tar cpf pangram.tar pangram - touch -t `date '+%m%d0900'` pangram.tar ; gzip pangram.tar - touch pangram.tar.gz ; mv pangram.tar.gz pangram2.tgz - if cmp -s pangram1.tgz pangram2.tgz ; then - echo "OK" - rm -rf pangram pangram1.tgz pangram2.tgz - else - echo "NG" - cat <<- "EOF" - Hmm, packaging may not be done properly on this filesystem. - Would you please try again on a default filesystem, thanks! - - Happy packaging!! - - Quitting... - EOF - exit - fi -} - -install2() { - install -d ${2%/*} ; install -m 644 $1 $2 -} - -strip_bindir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - shopt -s nullglob - cd $1 - for i in * ; do - echo "$i" - if [ -h $i ] ; then continue ; fi - if [ -n "`file $i | grep "not stripped"`" ] ; then - echo "stripping -p $i" - strip -p $i - fi - done - ) fi -} - -strip_libdir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - shopt -s nullglob - cd $1 - for i in *.so *.so.* *.a ; do - echo "$i" - if [ -h $i ] ; then continue ; fi - if [ -n "`nm -a $i | grep " a "`" ] ; then - if [ $i != ${i%.a} ] ; then - echo -n "ranlib and " - touch -r $i $i.mt ; ranlib $i ; touch -r $i.mt $i ; rm $i.mt - fi - echo "stripping -gp $i" - strip -gp $i - fi - done - ) fi -} - -gzip_dir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - cd $1 - files=`ls -f --indicator-style=none | sed '/^\.\{1,2\}$/d'` - for i in $files ; do - echo "$i" - if [ ! -f $i -a ! -h $i -o $i != ${i%.gz} ] ; then continue ; fi - lnks=`ls -l $i | awk '{print $2}'` - if [ $lnks -gt 1 ] ; then - inum=`ls -i $i | awk '{print $1}'` - for j in `find . -maxdepth 1 -inum $inum` ; do - if [ ${j#./} == $i ] ; then - gzip -f $i - else - rm -f ${j#./} ; ln $i.gz ${j#./}.gz - fi - done - elif [ -h $i ] ; then - target=`readlink $i` ; rm -f $i ; ln -s $target.gz $i.gz - else - gzip $i - fi - done - for i in $files ; do mv ${i%.gz}.gz $C ; done - for i in $files ; do mv $C/${i%.gz}.gz . ; done - ) fi -} - -gzip_one() { - gzip $1 ; mv $1.gz $C ; mv $C/${1##*/}.gz ${1%/*} -} - -compress() { - for i in {$P,$P/usr}/{sbin,bin} ; do strip_bindir $i ; done - for i in {$P,$P/usr}/$libdir ; do strip_libdir $i ; done - if [ -f $infodir/dir ] ; then rm -f $infodir/dir ; fi - gzip_dir $infodir - for i in `seq 9` n ; do gzip_dir $mandir/man$i ; done -} - -prune_symlink() { - echo "pruning symlink in $1" - if [ -d $1 ] ; then ( - cd $P - rm -f /tmp/iNsT-a.$$ ; touch /tmp/iNsT-a.$$ - for i in `find ${1#$P/} -type l` ; do - target=`readlink $i` - echo "$i -> $target" - echo $i$'\n'$target >> /tmp/iNsT-a.$$ - done - COUNT=1 - LINE=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - while [ -n "$LINE" ] ; do - LINKGOESIN=`dirname $LINE` - LINKNAMEIS=`basename $LINE` - COUNT=$(($COUNT + 1)) - LINKPOINTSTO=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - if [ ! -d install ] ; then mkdir install ; fi - cat <<- EOF >> install/doinst.sh - ( cd $LINKGOESIN ; rm -rf $LINKNAMEIS ) - ( cd $LINKGOESIN ; ln -sf $LINKPOINTSTO $LINKNAMEIS ) - EOF - rm -rf $LINE ; touch -t `date '+%m%d0900'` install/doinst.sh $LINE - COUNT=$(($COUNT + 1)) - LINE=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - done - rm -f /tmp/iNsT-a.$$ - ) fi -} - -convert() { - for i in {$P,$P/usr}/{sbin,bin} ; do prune_symlink $i ; done - for i in {$P,$P/usr}/$libdir ; do prune_symlink $i ; done - prune_symlink $infodir - for i in `seq 9` n ; do prune_symlink $mandir/man$i ; done -} - -fscheck -W=`pwd` -for i in `seq 0 $((${#src[@]} - 1))` ; do - S[$i]=$W/${src[$i]} ; B[$i]=$W/build`test ${#src[@]} -eq 1 || echo $i` -done -P=$W/work ; C=$W/pivot -infodir=$P/usr/share/info -mandir=$P/usr/share/man -docdir=$P/usr/share/doc -myname=`basename $0` -pkg=$pkgbase-$vers-$arch-$build -case $arch in x86_64) libdir=lib64 ;; *) libdir=lib ;; esac -if [ $# -eq 0 ] ; then - opt_download=1 ; opt_config=1 ; opt_build=1 ; opt_package=1 +if [ -f functions ] ; then + source ./functions +elif [ ! -f /usr/share/plamo/functions ] ; then + wget ftp://plamo.linet.gr.jp/pub/Plamo-src/admin/functions + source ./functions else - opt_download=0 ; opt_config=0 ; opt_build=0 ; opt_package=0 - for i in $@ ; do - case $i in - download) opt_download=1 ;; - config) opt_config=1 ;; - build) opt_build=1 ;; - package) opt_package=1 ;; - esac - done + source /usr/share/plamo/functions fi + +fscheck +prepare "$@" if [ $opt_download -eq 1 ] ; then - for i in $url ; do - if [ ! -f ${i##*/} ] ; then wget $i ; fi - done - for i in $url ; do - case ${i##*.} in - tar) tar xvpf ${i##*/} ;; - gz) tar xvpzf ${i##*/} ;; - bz2) tar xvpjf ${i##*/} ;; - esac - done + download_sources fi if [ $opt_config -eq 1 ] ; then 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 + apply_patches for i in `seq 0 $((${#B[@]} - 1))` ; do cd ${B[$i]} - if [ -f Makefile ] ; then - make clean - fi - if [ -f config.log ] ; then - 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 @@ -223,12 +53,7 @@ done fi if [ $opt_package -eq 1 ] ; then - if [ `id -u` -ne 0 ] ; then - read -p "Do you want to package as root? [y/N] " ans - if [ "x$ans" == "xY" -o "x$ans" == "xy" ] ; then - cd $W ; /bin/su -c "$0 package" ; exit - fi - fi + root_priv if [ -d $P ] ; then rm -rf $P ; fi ; mkdir -p $P if [ -d $C ] ; then rm -rf $C ; fi ; mkdir -p $C touch $W/i.st ; sleep 1 @@ -244,37 +69,21 @@ find $P ! -type l -newer i.st ! -newer i.et \ -exec touch -t `date '+%m%d0900'` {} \; compress - for i in `seq 0 $((${#DOCS[@]} - 1))` ; do - for j in ${DOCS[$i]} ; do - for k in ${S[$i]}/$j ; do - install2 $k $docdir/${src[$i]}/${k#${S[$i]}/} - touch -r $k $docdir/${src[$i]}/${k#${S[$i]}/} - gzip_one $docdir/${src[$i]}/${k#${S[$i]}/} - done - done - if [ $i -eq 0 ] ; then - install $myname $docdir/$src - touch -t `date '+%m%d0900'` $docdir/$src/$myname - gzip_one $docdir/$src/$myname - else - ln $docdir/$src/$myname.gz $docdir/${src[$i]} - fi - ( cd $docdir ; find ${src[$i]} -type d -exec touch -r $W/{} {} \; ) - done + setup_docdir cp -a $S/examples $docdir/$src rm $docdir/$src/examples/Makefile chmod -R o+r $docdir/$src/examples chown -R root.root $docdir/$src/examples - mv $docdir/$src/{examples,doc,$myname.gz} $C - mv $C/{examples,doc,$myname.gz} $docdir/$src + mv $docdir/$src/{examples,doc,{$func,$myname,$spec}.gz} $C + mv $C/{examples,doc,{$func,$myname,$spec}.gz} $docdir/$src touch -t `date '+%m%d0900'` $docdir/$src{,/examples,/doc} - convert + convert_links prune_symlink $P/usr/libexec tar cvpf $pkg.tar -C $P `cd $P ; find usr/bin | tail -n+2` tar rvpf $pkg.tar -C $P `cd $P ; find usr/libexec | tail -n+2` tar rvpf $pkg.tar -C $P `cd $P ; find usr/$libdir | tail -n+2` tar rvpf $pkg.tar -C $P usr/include/attr - 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/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/man2 | tail -n+2` tar rvpf $pkg.tar -C $P `cd $P ; find usr/share/man/man3 | tail -n+2` @@ -283,6 +92,5 @@ tar rvpf $pkg.tar -C $P install/doinst.sh touch -t `date '+%m%d0900'` $pkg.tar ; xz $pkg.tar ; touch $pkg.tar.xz mv $pkg.tar.xz $pkg.txz - read -p "Do you want to keep work files? [y/N] " ans - if [ "x$ans" != "xY" -a "x$ans" != "xy" ] ; then rm -rf $P $C i.[se]t ; fi + cleanup fi --- plamo/00_base/old/bash-20160403/PlamoBuild.bash-4.3.30 2016-04-03 09:46:50.000000000 +0900 +++ plamo/00_base/bash/PlamoBuild.bash-4.3.30 2017-04-09 13:30:34.000000000 +0900 @@ -2,218 +2,47 @@ ###################################################################### url="http://ftp.gnu.org/gnu/bash/bash-4.3.30.tar.gz" +verify= +commitid= pkgbase=bash vers=4.3.30 arch=`uname -m` -build=P2 +build=P3 src[0]=$pkgbase-$vers src[1]=${src[0]} +patchfiles="" OPT_CONFIG[0]="--bindir=/bin --without-bash-malloc --with-installed-readline" OPT_CONFIG[1]="${OPT_CONFIG[0]} --enable-static-link" -DOCS[0]="ABOUT-NLS AUTHORS ChangeLog CHANGES COMPAT COPYING INSTALL +DOCS="ABOUT-NLS AUTHORS ChangeLog CHANGES COMPAT COPYING INSTALL NEWS NOTES POSIX RBASH README Y2K" -DOCS[1]="" +template=20170323 +tmplurl=ftp://plamo.linet.gr.jp/pub/Plamo-src/admin ###################################################################### -fscheck() { - PANGRAM="The quick brown fox jumps over the lazy dog." - echo -n "Checking for the filesystem ... " - mkdir pangram ; ( cd pangram ; touch $PANGRAM ) - mv pangram pangram~ ; mkdir pangram ; touch -r pangram~ pangram - tar cpf pangram.tar pangram ; rmdir pangram ; mv pangram~ pangram - for i in $PANGRAM ; do tar rpf pangram.tar pangram/$i ; done - touch -t `date '+%m%d0900'` pangram.tar ; gzip pangram.tar - touch pangram.tar.gz ; mv pangram.tar.gz pangram1.tgz - tar cpf pangram.tar pangram - touch -t `date '+%m%d0900'` pangram.tar ; gzip pangram.tar - touch pangram.tar.gz ; mv pangram.tar.gz pangram2.tgz - if cmp -s pangram1.tgz pangram2.tgz ; then - echo "OK" - rm -rf pangram pangram1.tgz pangram2.tgz - else - echo "NG" - cat <<- "EOF" - Hmm, packaging may not be done properly on this filesystem. - Would you please try again on a default filesystem, thanks! - - Happy packaging!! - - Quitting... - EOF - exit - fi -} - -install2() { - install -d ${2%/*} ; install -m 644 $1 $2 -} - -strip_bindir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - shopt -s nullglob - cd $1 - for i in * ; do - echo "$i" - if [ -h $i ] ; then continue ; fi - if [ -n "`file $i | grep "not stripped"`" ] ; then - echo "stripping -p $i" - strip -p $i - fi - done - ) fi -} - -strip_libdir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - shopt -s nullglob - cd $1 - for i in *.so *.so.* *.a ; do - echo "$i" - if [ -h $i ] ; then continue ; fi - if [ -n "`nm -a $i | grep " a "`" ] ; then - if [ $i != ${i%.a} ] ; then - echo -n "ranlib and " - touch -r $i $i.mt ; ranlib $i ; touch -r $i.mt $i ; rm $i.mt - fi - echo "stripping -gp $i" - strip -gp $i - fi - done - ) fi -} - -gzip_dir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - cd $1 - files=`ls -f --indicator-style=none | sed '/^\.\{1,2\}$/d'` - for i in $files ; do - echo "$i" - if [ ! -f $i -a ! -h $i -o $i != ${i%.gz} ] ; then continue ; fi - lnks=`ls -l $i | awk '{print $2}'` - if [ $lnks -gt 1 ] ; then - inum=`ls -i $i | awk '{print $1}'` - for j in `find . -maxdepth 1 -inum $inum` ; do - if [ ${j#./} == $i ] ; then - gzip -f $i - else - rm -f ${j#./} ; ln $i.gz ${j#./}.gz - fi - done - elif [ -h $i ] ; then - target=`readlink $i` ; rm -f $i ; ln -s $target.gz $i.gz - else - gzip $i - fi - done - for i in $files ; do mv ${i%.gz}.gz $C ; done - for i in $files ; do mv $C/${i%.gz}.gz . ; done - ) fi -} - -gzip_one() { - gzip $1 ; mv $1.gz $C ; mv $C/${1##*/}.gz ${1%/*} -} - -compress() { - for i in {$P,$P/usr}/{sbin,bin} ; do strip_bindir $i ; done - for i in {$P,$P/usr}/$libdir ; do strip_libdir $i ; done - if [ -f $infodir/dir ] ; then rm -f $infodir/dir ; fi - gzip_dir $infodir - for i in `seq 9` n ; do gzip_dir $mandir/man$i ; done -} - -prune_symlink() { - echo "pruning symlink in $1" - if [ -d $1 ] ; then ( - cd $P - rm -f /tmp/iNsT-a.$$ ; touch /tmp/iNsT-a.$$ - for i in `find ${1#$P/} -type l` ; do - target=`readlink $i` - echo "$i -> $target" - echo $i$'\n'$target >> /tmp/iNsT-a.$$ - done - COUNT=1 - LINE=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - while [ -n "$LINE" ] ; do - LINKGOESIN=`dirname $LINE` - LINKNAMEIS=`basename $LINE` - COUNT=$(($COUNT + 1)) - LINKPOINTSTO=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - if [ ! -d install ] ; then mkdir install ; fi - cat <<- EOF >> install/doinst.sh - ( cd $LINKGOESIN ; rm -rf $LINKNAMEIS ) - ( cd $LINKGOESIN ; ln -sf $LINKPOINTSTO $LINKNAMEIS ) - EOF - rm -rf $LINE ; touch -t `date '+%m%d0900'` install/doinst.sh $LINE - COUNT=$(($COUNT + 1)) - LINE=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - done - rm -f /tmp/iNsT-a.$$ - ) fi -} - -convert() { - for i in {$P,$P/usr}/{sbin,bin} ; do prune_symlink $i ; done - for i in {$P,$P/usr}/$libdir ; do prune_symlink $i ; done - prune_symlink $infodir - for i in `seq 9` n ; do prune_symlink $mandir/man$i ; done -} - -fscheck -W=`pwd` -for i in `seq 0 $((${#src[@]} - 1))` ; do - S[$i]=$W/${src[$i]} ; B[$i]=$W/build`test ${#src[@]} -eq 1 || echo $i` -done -P=$W/work ; C=$W/pivot -infodir=$P/usr/share/info -mandir=$P/usr/share/man -docdir=$P/usr/share/doc -myname=`basename $0` -pkg=$pkgbase-$vers-$arch-$build -case $arch in x86_64) libdir=lib64 ;; *) libdir=lib ;; esac -if [ $# -eq 0 ] ; then - opt_download=1 ; opt_config=1 ; opt_build=1 ; opt_package=1 +if [ -f functions ] ; then + source ./functions +elif [ ! -f /usr/share/plamo/functions ] ; then + wget ftp://plamo.linet.gr.jp/pub/Plamo-src/admin/functions + source ./functions else - opt_download=0 ; opt_config=0 ; opt_build=0 ; opt_package=0 - for i in $@ ; do - case $i in - download) opt_download=1 ;; - config) opt_config=1 ;; - build) opt_build=1 ;; - package) opt_package=1 ;; - esac - done + source /usr/share/plamo/functions fi + +fscheck +prepare "$@" if [ $opt_download -eq 1 ] ; then - for i in $url ; do - if [ ! -f ${i##*/} ] ; then wget $i ; fi - done - for i in $url ; do - case ${i##*.} in - tar) tar xvpf ${i##*/} ;; - gz) tar xvpzf ${i##*/} ;; - bz2) tar xvpjf ${i##*/} ;; - esac - done + download_sources fi if [ $opt_config -eq 1 ] ; then 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 + apply_patches for i in `seq 0 $((${#B[@]} - 1))` ; do cd ${B[$i]} - if [ -f Makefile ] ; then - make clean - fi - if [ -f config.log ] ; then - 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 @@ -227,12 +56,7 @@ done fi if [ $opt_package -eq 1 ] ; then - if [ `id -u` -ne 0 ] ; then - read -p "Do you want to package as root? [y/N] " ans - if [ "x$ans" == "xY" -o "x$ans" == "xy" ] ; then - cd $W ; /bin/su -c "$0 package" ; exit - fi - fi + root_priv if [ -d $P ] ; then rm -rf $P ; fi ; mkdir -p $P if [ -d $C ] ; then rm -rf $C ; fi ; mkdir -p $C touch $W/i.st ; sleep 1 @@ -251,36 +75,19 @@ find $P ! -type l -newer i.st ! -newer i.et \ -exec touch -t `date '+%m%d0900'` {} \; compress - for i in `seq 0 $((${#DOCS[@]} - 1))` ; do - for j in ${DOCS[$i]} ; do - for k in ${S[$i]}/$j ; do - install2 $k $docdir/${src[$i]}/${k#${S[$i]}/} - touch -r $k $docdir/${src[$i]}/${k#${S[$i]}/} - gzip_one $docdir/${src[$i]}/${k#${S[$i]}/} - done - done - if [ $i -eq 0 ] ; then - install $myname $docdir/$src - touch -t `date '+%m%d0900'` $docdir/$src/$myname - gzip_one $docdir/$src/$myname - else - false && ln $docdir/$src/$myname.gz $docdir/${src[$i]} - fi - ( cd $docdir ; find ${src[$i]} -type d -exec touch -r $W/{} {} \; ) - done + setup_docdir mv $docdir/html $docdir/$src - mv $docdir/$src/{html,$myname.gz} $C - mv $C/{html,$myname.gz} $docdir/$src + mv $docdir/$src/{html,{$func,$myname,$spec}.gz} $C + mv $C/{html,{$func,$myname,$spec}.gz} $docdir/$src touch -r $S $docdir/$src - convert + convert_links tar cvpf $pkg.tar -C $P `cd $P ; find bin | 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/locale -name *.mo` tar rvpf $pkg.tar -C $P `cd $P ; find usr/share/info | tail -n+2` tar rvpf $pkg.tar -C $P `cd $P ; find usr/share/man/man1 | 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 mv $pkg.tar.xz $pkg.txz - read -p "Do you want to keep work files? [y/N] " ans - if [ "x$ans" != "xY" -a "x$ans" != "xy" ] ; then rm -rf $P $C i.[se]t ; fi + cleanup fi --- plamo/00_base/old/btrfs_progs-20170401/PlamoBuild.btrfs_progs-v4.8.3 2017-04-01 19:01:50.000000000 +0900 +++ plamo/00_base/btrfs_progs/PlamoBuild.btrfs_progs-v4.12.1 2018-12-26 13:56:19.000000000 +0900 @@ -1,18 +1,20 @@ #!/bin/sh ###################################################################### -url="https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v4.8.3.tar.gz" +url="https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v4.12.1.tar.gz" verify= +digest= +branch= commitid= pkgbase=btrfs_progs -vers=v4.8.3 +vers=v4.12.1 arch=`uname -m` build=P2 src=btrfs-progs-$vers patchfiles="" OPT_CONFIG="--bindir=/sbin" DOCS="CHANGES COPYING INSTALL README.md" -template=20170323 +template=20180815 tmplurl=ftp://plamo.linet.gr.jp/pub/Plamo-src/admin ###################################################################### @@ -65,8 +67,8 @@ done touch $W/i.et cd $W - find $P ! -type l -newer i.st ! -newer i.et \ - -exec touch -t `date '+%m%d0900'` {} \; + TZ=UTC find $P ! -type l -newer i.st ! -newer i.et \ + -exec touch -t `date -u '+%m%d0000'` {} \; compress setup_docdir convert_links @@ -77,7 +79,7 @@ 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 - mv $pkg.tar.xz $pkg.txz + TZ=UTC touch -t `date -u '+%m%d0000'` $pkg.tar + xz $pkg.tar ; touch $pkg.tar.xz ; mv $pkg.tar.xz $pkg.txz cleanup fi --- plamo/00_base/old/bzip2-20160320/PlamoBuild.bzip2-1.0.6 2016-03-20 21:14:04.000000000 +0900 +++ plamo/00_base/bzip2/PlamoBuild.bzip2-1.0.6 2017-04-01 19:15:12.000000000 +0900 @@ -2,219 +2,49 @@ ###################################################################### url="http://www.bzip.org/1.0.6/bzip2-1.0.6.tar.gz" +verify= +commitid= pkgbase=bzip2 vers=1.0.6 arch=`uname -m` -build=P4 +build=P5 src=$pkgbase-$vers +patchfiles="" OPT_CONFIG="" DOCS="LICENSE README README.COMPILATION.PROBLEMS README.XML.STUFF CHANGES" +template=20170323 +tmplurl=ftp://plamo.linet.gr.jp/pub/Plamo-src/admin ###################################################################### -fscheck() { - PANGRAM="The quick brown fox jumps over the lazy dog." - echo -n "Checking for the filesystem ... " - mkdir pangram ; ( cd pangram ; touch $PANGRAM ) - mv pangram pangram~ ; mkdir pangram ; touch -r pangram~ pangram - tar cpf pangram.tar pangram ; rmdir pangram ; mv pangram~ pangram - for i in $PANGRAM ; do tar rpf pangram.tar pangram/$i ; done - touch -t `date '+%m%d0900'` pangram.tar ; gzip pangram.tar - touch pangram.tar.gz ; mv pangram.tar.gz pangram1.tgz - tar cpf pangram.tar pangram - touch -t `date '+%m%d0900'` pangram.tar ; gzip pangram.tar - touch pangram.tar.gz ; mv pangram.tar.gz pangram2.tgz - if cmp -s pangram1.tgz pangram2.tgz ; then - echo "OK" - rm -rf pangram pangram1.tgz pangram2.tgz - else - echo "NG" - cat <<- "EOF" - Hmm, packaging may not be done properly on this filesystem. - Would you please try again on a default filesystem, thanks! - - Happy packaging!! - - Quitting... - EOF - exit - fi -} - -install2() { - install -d ${2%/*} ; install -m 644 $1 $2 -} - -strip_bindir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - shopt -s nullglob - cd $1 - for i in * ; do - echo "$i" - if [ -h $i ] ; then continue ; fi - if [ -n "`file $i | grep "not stripped"`" ] ; then - echo "stripping -p $i" - strip -p $i - fi - done - ) fi -} - -strip_libdir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - shopt -s nullglob - cd $1 - for i in *.so *.so.* *.a ; do - echo "$i" - if [ -h $i ] ; then continue ; fi - if [ -n "`nm -a $i | grep " a "`" ] ; then - if [ $i != ${i%.a} ] ; then - echo -n "ranlib and " - touch -r $i $i.mt ; ranlib $i ; touch -r $i.mt $i ; rm $i.mt - fi - echo "stripping -gp $i" - strip -gp $i - fi - done - ) fi -} - -gzip_dir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - cd $1 - files=`ls -f --indicator-style=none | sed '/^\.\{1,2\}$/d'` - for i in $files ; do - echo "$i" - if [ ! -f $i -a ! -h $i -o $i != ${i%.gz} ] ; then continue ; fi - lnks=`ls -l $i | awk '{print $2}'` - if [ $lnks -gt 1 ] ; then - inum=`ls -i $i | awk '{print $1}'` - for j in `find . -maxdepth 1 -inum $inum` ; do - if [ ${j#./} == $i ] ; then - gzip -f $i - else - rm -f ${j#./} ; ln $i.gz ${j#./}.gz - fi - done - elif [ -h $i ] ; then - target=`readlink $i` ; rm -f $i ; ln -s $target.gz $i.gz - else - gzip $i - fi - done - for i in $files ; do mv ${i%.gz}.gz $C ; done - for i in $files ; do mv $C/${i%.gz}.gz . ; done - ) fi -} - -gzip_one() { - gzip $1 ; mv $1.gz $C ; mv $C/${1##*/}.gz ${1%/*} -} - -compress() { - for i in {$P,$P/usr}/{sbin,bin} ; do strip_bindir $i ; done - for i in {$P,$P/usr}/$libdir ; do strip_libdir $i ; done - if [ -f $infodir/dir ] ; then rm -f $infodir/dir ; fi - gzip_dir $infodir - for i in `seq 9` n ; do gzip_dir $mandir/man$i ; done -} - -prune_symlink() { - echo "pruning symlink in $1" - if [ -d $1 ] ; then ( - cd $P - rm -f /tmp/iNsT-a.$$ ; touch /tmp/iNsT-a.$$ - for i in `find ${1#$P/} -type l` ; do - target=`readlink $i` - echo "$i -> $target" - echo $i$'\n'$target >> /tmp/iNsT-a.$$ - done - COUNT=1 - LINE=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - while [ -n "$LINE" ] ; do - LINKGOESIN=`dirname $LINE` - LINKNAMEIS=`basename $LINE` - COUNT=$(($COUNT + 1)) - LINKPOINTSTO=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - if [ ! -d install ] ; then mkdir install ; fi - cat <<- EOF >> install/doinst.sh - ( cd $LINKGOESIN ; rm -rf $LINKNAMEIS ) - ( cd $LINKGOESIN ; ln -sf $LINKPOINTSTO $LINKNAMEIS ) - EOF - rm -rf $LINE ; touch -t `date '+%m%d0900'` install/doinst.sh $LINE - COUNT=$(($COUNT + 1)) - LINE=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - done - rm -f /tmp/iNsT-a.$$ - ) fi -} - -convert() { - for i in {$P,$P/usr}/{sbin,bin} ; do prune_symlink $i ; done - for i in {$P,$P/usr}/$libdir ; do prune_symlink $i ; done - prune_symlink $infodir - for i in `seq 9` n ; do prune_symlink $mandir/man$i ; done -} - -fscheck -W=`pwd` -for i in `seq 0 $((${#src[@]} - 1))` ; do - S[$i]=$W/${src[$i]} ; B[$i]=$W/build`test ${#src[@]} -eq 1 || echo $i` -done -P=$W/work ; C=$W/pivot -infodir=$P/usr/share/info -mandir=$P/usr/share/man -docdir=$P/usr/share/doc -myname=`basename $0` -pkg=$pkgbase-$vers-$arch-$build -case $arch in x86_64) libdir=lib64 ;; *) libdir=lib ;; esac -if [ $# -eq 0 ] ; then - opt_download=1 ; opt_config=1 ; opt_build=1 ; opt_package=1 +if [ -f functions ] ; then + source ./functions +elif [ ! -f /usr/share/plamo/functions ] ; then + wget ftp://plamo.linet.gr.jp/pub/Plamo-src/admin/functions + source ./functions else - opt_download=0 ; opt_config=0 ; opt_build=0 ; opt_package=0 - for i in $@ ; do - case $i in - download) opt_download=1 ;; - config) opt_config=1 ;; - build) opt_build=1 ;; - package) opt_package=1 ;; - esac - done + source /usr/share/plamo/functions fi + +fscheck +prepare "$@" if [ $opt_download -eq 1 ] ; then - for i in $url ; do - if [ ! -f ${i##*/} ] ; then wget $i ; fi - done - for i in $url ; do - case ${i##*.} in - tar) tar xvpf ${i##*/} ;; - gz) tar xvpzf ${i##*/} ;; - bz2) tar xvpjf ${i##*/} ;; - esac - done + download_sources fi if [ $opt_config -eq 1 ] ; then 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 + apply_patches cd $B cp -p Makefile{,.orig} sed -i -e 's@\@$(LIBDIR)@g' -e 's@\@share/&@g' \ -e '/ln/s@$(PREFIX)/bin/@@' Makefile for i in `seq 0 $((${#B[@]} - 1))` ; do cd ${B[$i]} - if [ -f Makefile ] ; then - make clean - fi - if [ -f config.log ] ; then - 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 @@ -229,12 +59,7 @@ done fi if [ $opt_package -eq 1 ] ; then - if [ `id -u` -ne 0 ] ; then - read -p "Do you want to package as root? [y/N] " ans - if [ "x$ans" == "xY" -o "x$ans" == "xy" ] ; then - cd $W ; /bin/su -c "$0 package" ; exit - fi - fi + root_priv if [ -d $P ] ; then rm -rf $P ; fi ; mkdir -p $P if [ -d $C ] ; then rm -rf $C ; fi ; mkdir -p $C touch $W/i.st ; sleep 1 @@ -256,24 +81,8 @@ find $P ! -type l -newer i.st ! -newer i.et \ -exec touch -t `date '+%m%d0900'` {} \; compress - for i in `seq 0 $((${#DOCS[@]} - 1))` ; do - for j in ${DOCS[$i]} ; do - for k in ${S[$i]}/$j ; do - install2 $k $docdir/${src[$i]}/${k#${S[$i]}/} - touch -r $k $docdir/${src[$i]}/${k#${S[$i]}/} - gzip_one $docdir/${src[$i]}/${k#${S[$i]}/} - done - done - if [ $i -eq 0 ] ; then - install $myname $docdir/$src - touch -t `date '+%m%d0900'` $docdir/$src/$myname - gzip_one $docdir/$src/$myname - else - ln $docdir/$src/$myname.gz $docdir/${src[$i]} - fi - ( cd $docdir ; find ${src[$i]} -type d -exec touch -r $W/{} {} \; ) - done - convert + setup_docdir + convert_links tar cvpf $pkg.tar -C $P `cd $P ; find bin | 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/bin | tail -n+2` @@ -284,6 +93,5 @@ tar rvpf $pkg.tar -C $P install/doinst.sh touch -t `date '+%m%d0900'` $pkg.tar ; xz $pkg.tar ; touch $pkg.tar.xz mv $pkg.tar.xz $pkg.txz - read -p "Do you want to keep work files? [y/N] " ans - if [ "x$ans" != "xY" -a "x$ans" != "xy" ] ; then rm -rf $P $C i.[se]t ; fi + cleanup fi --- plamo/00_base/old/coreutils-20170401/PlamoBuild.coreutils-8.25 2017-04-01 19:22:35.000000000 +0900 +++ plamo/00_base/coreutils/PlamoBuild.coreutils-8.25 2017-12-02 19:11:47.000000000 +0900 @@ -3,11 +3,13 @@ ###################################################################### url="http://ftp.gnu.org/gnu/coreutils/coreutils-8.25.tar.xz" verify= +digest= +branch= commitid= pkgbase=coreutils vers=8.25 arch=`uname -m` -build=P4 +build=P5 src=$pkgbase-$vers patchfiles="" OPT_CONFIG="--enable-install-program=arch @@ -15,7 +17,7 @@ DOCS="COPYING TODO INSTALL THANKS ChangeLog-2006 ChangeLog-2008 NEWS ChangeLog ChangeLog-2007 README ChangeLog-2005 AUTHORS ABOUT-NLS THANKS-to-translators" -template=20170323 +template=20170713 tmplurl=ftp://plamo.linet.gr.jp/pub/Plamo-src/admin ###################################################################### @@ -43,15 +45,13 @@ sed 's@EXTRA_LOCALE_CATEGORIES@#&@g' po/Makevars.orig > po/Makevars cp -p src/copy.c{,.orig} sed 's@FASTREAD@NONE@g' src/copy.c.orig > src/copy.c - if [ `id -u` -eq 0 ] ; then - export FORCE_UNSAFE_CONFIGURE=1 - fi for i in `seq 0 $((${#B[@]} - 1))` ; do cd ${B[$i]} if [ -x configure ] ; then ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --libdir='${exec_prefix}'/$libdir --infodir='${prefix}'/share/info \ - --mandir='${prefix}'/share/man ${OPT_CONFIG[$i]} + --mandir='${prefix}'/share/man ${OPT_CONFIG[$i]} \ + FORCE_UNSAFE_CONFIGURE=1 fi done fi --- plamo/00_base/old/cracklib-20160320/PlamoBuild.cracklib-2.8.18 2016-03-20 21:22:29.000000000 +0900 +++ plamo/00_base/cracklib/PlamoBuild.cracklib-2.8.18 2017-04-09 13:31:44.000000000 +0900 @@ -3,218 +3,46 @@ ###################################################################### url="http://downloads.sourceforge.net/cracklib/cracklib-2.8.18.tar.gz http://downloads.sourceforge.net/cracklib/cracklib-words-20080507.gz - ftp://plamo.linet.gr.jp/pub/Plamo-src.new/plamo/00_base/cracklib/cracklib-2.8.15-heimdal-1.patch" + ftp://plamo.linet.gr.jp/pub/Plamo-src/plamo/00_base/cracklib/cracklib-2.8.15-heimdal-1.patch" +verify= +commitid= pkgbase=cracklib vers=2.8.18 arch=`uname -m` -build=P4 +build=P5 src=$pkgbase-$vers +patchfiles="cracklib-2.8.15-heimdal-1.patch" OPT_CONFIG="--with-default-dict=/lib/cracklib/pw_dict" DOCS="README-WORDS README-DAWG NEWS AUTHORS INSTALL ABOUT-NLS README-LICENSE README COPYING.LIB ChangeLog" +template=20170323 +tmplurl=ftp://plamo.linet.gr.jp/pub/Plamo-src/admin ###################################################################### -fscheck() { - PANGRAM="The quick brown fox jumps over the lazy dog." - echo -n "Checking for the filesystem ... " - mkdir pangram ; ( cd pangram ; touch $PANGRAM ) - mv pangram pangram~ ; mkdir pangram ; touch -r pangram~ pangram - tar cpf pangram.tar pangram ; rmdir pangram ; mv pangram~ pangram - for i in $PANGRAM ; do tar rpf pangram.tar pangram/$i ; done - touch -t `date '+%m%d0900'` pangram.tar ; gzip pangram.tar - touch pangram.tar.gz ; mv pangram.tar.gz pangram1.tgz - tar cpf pangram.tar pangram - touch -t `date '+%m%d0900'` pangram.tar ; gzip pangram.tar - touch pangram.tar.gz ; mv pangram.tar.gz pangram2.tgz - if cmp -s pangram1.tgz pangram2.tgz ; then - echo "OK" - rm -rf pangram pangram1.tgz pangram2.tgz - else - echo "NG" - cat <<- "EOF" - Hmm, packaging may not be done properly on this filesystem. - Would you please try again on a default filesystem, thanks! - - Happy packaging!! - - Quitting... - EOF - exit - fi -} - -install2() { - install -d ${2%/*} ; install -m 644 $1 $2 -} - -strip_bindir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - shopt -s nullglob - cd $1 - for i in * ; do - echo "$i" - if [ -h $i ] ; then continue ; fi - if [ -n "`file $i | grep "not stripped"`" ] ; then - echo "stripping -p $i" - strip -p $i - fi - done - ) fi -} - -strip_libdir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - shopt -s nullglob - cd $1 - for i in *.so *.so.* *.a ; do - echo "$i" - if [ -h $i ] ; then continue ; fi - if [ -n "`nm -a $i | grep " a "`" ] ; then - if [ $i != ${i%.a} ] ; then - echo -n "ranlib and " - touch -r $i $i.mt ; ranlib $i ; touch -r $i.mt $i ; rm $i.mt - fi - echo "stripping -gp $i" - strip -gp $i - fi - done - ) fi -} - -gzip_dir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - cd $1 - files=`ls -f --indicator-style=none | sed '/^\.\{1,2\}$/d'` - for i in $files ; do - echo "$i" - if [ ! -f $i -a ! -h $i -o $i != ${i%.gz} ] ; then continue ; fi - lnks=`ls -l $i | awk '{print $2}'` - if [ $lnks -gt 1 ] ; then - inum=`ls -i $i | awk '{print $1}'` - for j in `find . -maxdepth 1 -inum $inum` ; do - if [ ${j#./} == $i ] ; then - gzip -f $i - else - rm -f ${j#./} ; ln $i.gz ${j#./}.gz - fi - done - elif [ -h $i ] ; then - target=`readlink $i` ; rm -f $i ; ln -s $target.gz $i.gz - else - gzip $i - fi - done - for i in $files ; do mv ${i%.gz}.gz $C ; done - for i in $files ; do mv $C/${i%.gz}.gz . ; done - ) fi -} - -gzip_one() { - gzip $1 ; mv $1.gz $C ; mv $C/${1##*/}.gz ${1%/*} -} - -compress() { - for i in {$P,$P/usr}/{sbin,bin} ; do strip_bindir $i ; done - for i in {$P,$P/usr}/$libdir ; do strip_libdir $i ; done - if [ -f $infodir/dir ] ; then rm -f $infodir/dir ; fi - gzip_dir $infodir - for i in `seq 9` n ; do gzip_dir $mandir/man$i ; done -} - -prune_symlink() { - echo "pruning symlink in $1" - if [ -d $1 ] ; then ( - cd $P - rm -f /tmp/iNsT-a.$$ ; touch /tmp/iNsT-a.$$ - for i in `find ${1#$P/} -type l` ; do - target=`readlink $i` - echo "$i -> $target" - echo $i$'\n'$target >> /tmp/iNsT-a.$$ - done - COUNT=1 - LINE=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - while [ -n "$LINE" ] ; do - LINKGOESIN=`dirname $LINE` - LINKNAMEIS=`basename $LINE` - COUNT=$(($COUNT + 1)) - LINKPOINTSTO=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - if [ ! -d install ] ; then mkdir install ; fi - cat <<- EOF >> install/doinst.sh - ( cd $LINKGOESIN ; rm -rf $LINKNAMEIS ) - ( cd $LINKGOESIN ; ln -sf $LINKPOINTSTO $LINKNAMEIS ) - EOF - rm -rf $LINE ; touch -t `date '+%m%d0900'` install/doinst.sh $LINE - COUNT=$(($COUNT + 1)) - LINE=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - done - rm -f /tmp/iNsT-a.$$ - ) fi -} - -convert() { - for i in {$P,$P/usr}/{sbin,bin} ; do prune_symlink $i ; done - for i in {$P,$P/usr}/$libdir ; do prune_symlink $i ; done - prune_symlink $infodir - for i in `seq 9` n ; do prune_symlink $mandir/man$i ; done -} - -fscheck -W=`pwd` -for i in `seq 0 $((${#src[@]} - 1))` ; do - S[$i]=$W/${src[$i]} ; B[$i]=$W/build`test ${#src[@]} -eq 1 || echo $i` -done -P=$W/work ; C=$W/pivot -infodir=$P/usr/share/info -mandir=$P/usr/share/man -docdir=$P/usr/share/doc -myname=`basename $0` -pkg=$pkgbase-$vers-$arch-$build -case $arch in x86_64) libdir=lib64 ;; *) libdir=lib ;; esac -if [ $# -eq 0 ] ; then - opt_download=1 ; opt_config=1 ; opt_build=1 ; opt_package=1 +if [ -f functions ] ; then + source ./functions +elif [ ! -f /usr/share/plamo/functions ] ; then + wget ftp://plamo.linet.gr.jp/pub/Plamo-src/admin/functions + source ./functions else - opt_download=0 ; opt_config=0 ; opt_build=0 ; opt_package=0 - for i in $@ ; do - case $i in - download) opt_download=1 ;; - config) opt_config=1 ;; - build) opt_build=1 ;; - package) opt_package=1 ;; - esac - done + source /usr/share/plamo/functions fi + +fscheck +prepare "$@" if [ $opt_download -eq 1 ] ; then - for i in $url ; do - if [ ! -f ${i##*/} ] ; then wget $i ; fi - done - for i in $url ; do - case ${i##*.} in - tar) tar xvpf ${i##*/} ;; - gz) tar xvpzf ${i##*/} ;; - bz2) tar xvpjf ${i##*/} ;; - esac - done + download_sources fi if [ $opt_config -eq 1 ] ; then 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/cracklib-2.8.15-heimdal-1.patch + apply_patches for i in `seq 0 $((${#B[@]} - 1))` ; do cd ${B[$i]} - if [ -f Makefile ] ; then - make clean - fi - if [ -f config.log ] ; then - 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 @@ -228,12 +56,7 @@ done fi if [ $opt_package -eq 1 ] ; then - if [ `id -u` -ne 0 ] ; then - read -p "Do you want to package as root? [y/N] " ans - if [ "x$ans" == "xY" -o "x$ans" == "xy" ] ; then - cd $W ; /bin/su -c "$0 package" ; exit - fi - fi + root_priv if [ -d $P ] ; then rm -rf $P ; fi ; mkdir -p $P if [ -d $C ] ; then rm -rf $C ; fi ; mkdir -p $C touch $W/i.st ; sleep 1 @@ -257,24 +80,8 @@ find $P ! -type l -newer i.st ! -newer i.et \ -exec touch -t `date '+%m%d0900'` {} \; compress - for i in `seq 0 $((${#DOCS[@]} - 1))` ; do - for j in ${DOCS[$i]} ; do - for k in ${S[$i]}/$j ; do - install2 $k $docdir/${src[$i]}/${k#${S[$i]}/} - touch -r $k $docdir/${src[$i]}/${k#${S[$i]}/} - gzip_one $docdir/${src[$i]}/${k#${S[$i]}/} - done - done - if [ $i -eq 0 ] ; then - install $myname $docdir/$src - touch -t `date '+%m%d0900'` $docdir/$src/$myname - gzip_one $docdir/$src/$myname - else - ln $docdir/$src/$myname.gz $docdir/${src[$i]} - fi - ( cd $docdir ; find ${src[$i]} -type d -exec touch -r $W/{} {} \; ) - done - convert + setup_docdir + convert_links prune_symlink $P/usr/share/dict rm $P/usr/$libdir/libcrack.so.2.8.1 cat <<- EOF >> $P/install/doinst.sh @@ -291,13 +98,12 @@ 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 | 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/locale -name *.mo` tar rvpf $pkg.tar -C $P usr/share/{cracklib,dict} tar rvpf $pkg.tar -C $P lib/cracklib 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 mv $pkg.tar.xz $pkg.txz - read -p "Do you want to keep work files? [y/N] " ans - if [ "x$ans" != "xY" -a "x$ans" != "xy" ] ; then rm -rf $P $C i.[se]t ; fi + cleanup fi --- plamo/00_base/old/dcron-20151227/PlamoBuild.dcron-4.5 2015-12-27 22:56:24.000000000 +0900 +++ plamo/00_base/dcron/PlamoBuild.dcron-4.5 2017-04-01 20:02:12.000000000 +0900 @@ -2,203 +2,39 @@ ###################################################################### url="http://www.jimpryor.net/linux/releases/dcron-4.5.tar.gz" +verify= +commitid= pkgbase=dcron vers=4.5 arch=`uname -m` -build=P4 +build=P5 src=$pkgbase-$vers +patchfiles="" OPT_CONFIG="" DOCS="README CHANGELOG CHANGELOG.working" +template=20170323 +tmplurl=ftp://plamo.linet.gr.jp/pub/Plamo-src/admin ###################################################################### -fscheck() { - PANGRAM="The quick brown fox jumps over the lazy dog." - echo -n "Checking for the filesystem ... " - mkdir pangram ; ( cd pangram ; touch $PANGRAM ) - mv pangram pangram~ ; mkdir pangram ; touch -r pangram~ pangram - tar cpf pangram.tar pangram ; rmdir pangram ; mv pangram~ pangram - for i in $PANGRAM ; do tar rpf pangram.tar pangram/$i ; done - touch -t `date '+%m%d0900'` pangram.tar ; gzip pangram.tar - touch pangram.tar.gz ; mv pangram.tar.gz pangram1.tgz - tar cpf pangram.tar pangram - touch -t `date '+%m%d0900'` pangram.tar ; gzip pangram.tar - touch pangram.tar.gz ; mv pangram.tar.gz pangram2.tgz - if cmp -s pangram1.tgz pangram2.tgz ; then - echo "OK" - rm -rf pangram pangram1.tgz pangram2.tgz - else - echo "NG" - cat <<- "EOF" - Hmm, packaging may not be done properly on this filesystem. - Would you please try again on a default filesystem, thanks! - - Happy packaging!! - - Quitting... - EOF - exit - fi -} - -install2() { - install -d ${2%/*} ; install -m 644 $1 $2 -} - -strip_bindir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - shopt -s nullglob - cd $1 - for i in * ; do - echo "$i" - if [ -h $i ] ; then continue ; fi - if [ -n "`file $i | grep "not stripped"`" ] ; then - echo "stripping -p $i" - strip -p $i - fi - done - ) fi -} - -strip_libdir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - shopt -s nullglob - cd $1 - for i in *.so *.so.* *.a ; do - echo "$i" - if [ -h $i ] ; then continue ; fi - if [ -n "`nm -a $i | grep " a "`" ] ; then - if [ $i != ${i%.a} ] ; then - echo -n "ranlib and " - touch -r $i $i.mt ; ranlib $i ; touch -r $i.mt $i ; rm $i.mt - fi - echo "stripping -gp $i" - strip -gp $i - fi - done - ) fi -} - -gzip_dir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - cd $1 - files=`ls -f --indicator-style=none | sed '/^\.\{1,2\}$/d'` - for i in $files ; do - echo "$i" - if [ ! -f $i -a ! -h $i -o $i != ${i%.gz} ] ; then continue ; fi - lnks=`ls -l $i | awk '{print $2}'` - if [ $lnks -gt 1 ] ; then - inum=`ls -i $i | awk '{print $1}'` - for j in `find . -maxdepth 1 -inum $inum` ; do - if [ ${j#./} == $i ] ; then - gzip -f $i - else - rm -f ${j#./} ; ln $i.gz ${j#./}.gz - fi - done - elif [ -h $i ] ; then - target=`readlink $i` ; rm -f $i ; ln -s $target.gz $i.gz - else - gzip $i - fi - done - for i in $files ; do mv ${i%.gz}.gz $C ; done - for i in $files ; do mv $C/${i%.gz}.gz . ; done - ) fi -} - -gzip_one() { - gzip $1 ; mv $1.gz $C ; mv $C/${1##*/}.gz ${1%/*} -} - -compress() { - for i in {$P,$P/usr}/{sbin,bin} ; do strip_bindir $i ; done - for i in {$P,$P/usr}/$libdir ; do strip_libdir $i ; done - if [ -f $infodir/dir ] ; then rm -f $infodir/dir ; fi - gzip_dir $infodir - for i in `seq 9` n ; do gzip_dir $mandir/man$i ; done -} - -prune_symlink() { - echo "pruning symlink in $1" - if [ -d $1 ] ; then ( - cd $P - rm -f /tmp/iNsT-a.$$ ; touch /tmp/iNsT-a.$$ - for i in `find ${1#$P/} -type l` ; do - target=`readlink $i` - echo "$i -> $target" - echo $i$'\n'$target >> /tmp/iNsT-a.$$ - done - COUNT=1 - LINE=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - while [ -n "$LINE" ] ; do - LINKGOESIN=`dirname $LINE` - LINKNAMEIS=`basename $LINE` - COUNT=$(($COUNT + 1)) - LINKPOINTSTO=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - if [ ! -d install ] ; then mkdir install ; fi - cat <<- EOF >> install/doinst.sh - ( cd $LINKGOESIN ; rm -rf $LINKNAMEIS ) - ( cd $LINKGOESIN ; ln -sf $LINKPOINTSTO $LINKNAMEIS ) - EOF - rm -rf $LINE ; touch -t `date '+%m%d0900'` install/doinst.sh $LINE - COUNT=$(($COUNT + 1)) - LINE=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - done - rm -f /tmp/iNsT-a.$$ - ) fi -} - -convert() { - for i in {$P,$P/usr}/{sbin,bin} ; do prune_symlink $i ; done - for i in {$P,$P/usr}/$libdir ; do prune_symlink $i ; done - prune_symlink $infodir - for i in `seq 9` n ; do prune_symlink $mandir/man$i ; done -} - -fscheck -W=`pwd` -for i in `seq 0 $((${#src[@]} - 1))` ; do - S[$i]=$W/${src[$i]} ; B[$i]=$W/build`test ${#src[@]} -eq 1 || echo $i` -done -P=$W/work ; C=$W/pivot -infodir=$P/usr/share/info -mandir=$P/usr/share/man -docdir=$P/usr/share/doc -myname=`basename $0` -pkg=$pkgbase-$vers-$arch-$build -case $arch in x86_64) libdir=lib64 ;; *) libdir=lib ;; esac -if [ $# -eq 0 ] ; then - opt_download=1 ; opt_config=1 ; opt_build=1 ; opt_package=1 +if [ -f functions ] ; then + source ./functions +elif [ ! -f /usr/share/plamo/functions ] ; then + wget ftp://plamo.linet.gr.jp/pub/Plamo-src/admin/functions + source ./functions else - opt_download=0 ; opt_config=0 ; opt_build=0 ; opt_package=0 - for i in $@ ; do - case $i in - download) opt_download=1 ;; - config) opt_config=1 ;; - build) opt_build=1 ;; - package) opt_package=1 ;; - esac - done + source /usr/share/plamo/functions fi + +fscheck +prepare "$@" if [ $opt_download -eq 1 ] ; then - for i in $url ; do - if [ ! -f ${i##*/} ] ; then wget $i ; fi - done - for i in $url ; do - case ${i##*.} in - tar) tar xvpf ${i##*/} ;; - gz) tar xvpzf ${i##*/} ;; - bz2) tar xvpjf ${i##*/} ;; - esac - done + download_sources fi if [ $opt_config -eq 1 ] ; then 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 + apply_patches cd $B cp -p extra/crond.rc{,.orig} cat <<- "EOF" | patch extra/crond.rc @@ -244,15 +80,9 @@ EOF for i in `seq 0 $((${#B[@]} - 1))` ; do cd ${B[$i]} - if [ -f Makefile ] ; then - make clean - fi - if [ -f config.log ] ; then - 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,12 +96,7 @@ done fi if [ $opt_package -eq 1 ] ; then - if [ `id -u` -ne 0 ] ; then - read -p "Do you want to package as root? [y/N] " ans - if [ "x$ans" == "xY" -o "x$ans" == "xy" ] ; then - cd $W ; /bin/su -c "$0 package" ; exit - fi - fi + root_priv if [ -d $P ] ; then rm -rf $P ; fi ; mkdir -p $P if [ -d $C ] ; then rm -rf $C ; fi ; mkdir -p $C touch $W/i.st ; sleep 1 @@ -302,24 +127,8 @@ find $P ! -type l -newer i.st ! -newer i.et \ -exec touch -t `date '+%m%d0900'` {} \; compress - for i in `seq 0 $((${#DOCS[@]} - 1))` ; do - for j in ${DOCS[$i]} ; do - for k in ${S[$i]}/$j ; do - install2 $k $docdir/${src[$i]}/${k#${S[$i]}/} - touch -r $k $docdir/${src[$i]}/${k#${S[$i]}/} - gzip_one $docdir/${src[$i]}/${k#${S[$i]}/} - done - done - if [ $i -eq 0 ] ; then - install $myname $docdir/$src - touch -t `date '+%m%d0900'` $docdir/$src/$myname - gzip_one $docdir/$src/$myname - else - ln $docdir/$src/$myname.gz $docdir/${src[$i]} - fi - ( cd $docdir ; find ${src[$i]} -type d -exec touch -r $W/{} {} \; ) - done - convert + setup_docdir + convert_links tar cvpf $pkg.tar -C $P `cd $P ; find usr/sbin | tail -n+2` tar rvpf $pkg.tar -C $P `cd $P ; find usr/bin | tail -n+2` tar rvpf $pkg.tar -C $P etc/cron.{d,hourly,daily,weekly,monthly} @@ -330,6 +139,5 @@ tar rvpf $pkg.tar -C $P usr/share/doc/$src touch -t `date '+%m%d0900'` $pkg.tar ; xz $pkg.tar ; touch $pkg.tar.xz mv $pkg.tar.xz $pkg.txz - read -p "Do you want to keep work files? [y/N] " ans - if [ "x$ans" != "xY" -a "x$ans" != "xy" ] ; then rm -rf $P $C i.[se]t ; fi + cleanup fi --- plamo/00_base/old/dhcp-20170401/PlamoBuild.dhcp-4.3.3 2017-04-01 20:11:15.000000000 +0900 +++ plamo/00_base/dhcp/PlamoBuild.dhcp-4.3.3 2018-02-02 15:10:53.000000000 +0900 @@ -3,16 +3,21 @@ ###################################################################### url="http://ftp.isc.org/isc/dhcp/4.3.3/dhcp-4.3.3.tar.gz" verify= +digest= +branch= commitid= pkgbase=dhcp vers=4.3.3 arch=`uname -m` -build=P5 +build=P6 src=$pkgbase-$vers patchfiles="" -OPT_CONFIG="" +OPT_CONFIG="--with-srv-lease-file=/var/db/dhcpd.leases + --with-srv6-lease-file=/var/db/dhcpd6.leases + --with-cli-lease-file=/var/db/dhclient.leases + --with-cli6-lease-file=/var/db/dhclient6.leases" DOCS="LICENSE README RELNOTES" -template=20170323 +template=20170713 tmplurl=ftp://plamo.linet.gr.jp/pub/Plamo-src/admin ###################################################################### --- plamo/00_base/old/dialog-20161120/PlamoBuild.dialog-1.3_20160828 2016-11-20 12:36:09.000000000 +0900 +++ plamo/00_base/dialog/PlamoBuild.dialog-1.3_20160828 2017-04-09 13:32:38.000000000 +0900 @@ -2,248 +2,42 @@ ###################################################################### url="ftp://invisible-island.net/dialog/dialog-1.3-20160828.tgz" +verify= +commitid= pkgbase=dialog vers=1.3_20160828 arch=`uname -m` -build=P1 +build=P2 src=$pkgbase-1.3-20160828 patchfiles="" OPT_CONFIG="--bindir=/bin --enable-nls --with-shared --with-ncursesw --enable-widec" DOCS="CHANGES README COPYING" -template=20161020 +template=20170323 tmplurl=ftp://plamo.linet.gr.jp/pub/Plamo-src/admin ###################################################################### -fscheck() { - PANGRAM="The quick brown fox jumps over the lazy dog." - echo -n "Checking for the filesystem ... " - mkdir pangram ; ( cd pangram ; touch $PANGRAM ) - mv pangram pangram~ ; mkdir pangram ; touch -r pangram~ pangram - tar cpf pangram.tar pangram ; rmdir pangram ; mv pangram~ pangram - for i in $PANGRAM ; do tar rpf pangram.tar pangram/$i ; done - touch -t `date '+%m%d0900'` pangram.tar ; gzip pangram.tar - touch pangram.tar.gz ; mv pangram.tar.gz pangram1.tgz - tar cpf pangram.tar pangram - touch -t `date '+%m%d0900'` pangram.tar ; gzip pangram.tar - touch pangram.tar.gz ; mv pangram.tar.gz pangram2.tgz - if cmp -s pangram1.tgz pangram2.tgz ; then - echo "OK" - rm -rf pangram pangram1.tgz pangram2.tgz - else - echo "NG" - cat <<- "EOF" - Hmm, packaging may not be done properly on this filesystem. - Would you please try again on a default filesystem, thanks! - - Happy packaging!! - - Quitting... - EOF - exit - fi -} - -install2() { - install -d ${2%/*} ; install -m 644 $1 $2 -} - -strip_bindir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - shopt -s nullglob - cd $1 - for i in * ; do - echo "$i" - if [ -h $i ] ; then continue ; fi - if [ -n "`file $i | grep "not stripped"`" ] ; then - echo "stripping -p $i" - strip -p $i - fi - done - ) fi -} - -strip_libdir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - shopt -s nullglob - cd $1 - for i in *.so *.so.* *.a ; do - echo "$i" - if [ -h $i ] ; then continue ; fi - if [ -n "`nm -a $i | grep " a "`" ] ; then - if [ $i != ${i%.a} ] ; then - echo -n "ranlib and " - touch -r $i $i.mt ; ranlib $i ; touch -r $i.mt $i ; rm $i.mt - fi - echo "stripping -gp $i" - strip -gp $i - fi - done - ) fi -} - -gzip_dir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - cd $1 - files=`ls -f --indicator-style=none | sed '/^\.\{1,2\}$/d'` - for i in $files ; do - echo "$i" - if [ ! -f $i -a ! -h $i -o $i != ${i%.gz} ] ; then continue ; fi - lnks=`ls -l $i | awk '{print $2}'` - if [ $lnks -gt 1 ] ; then - inum=`ls -i $i | awk '{print $1}'` - for j in `find . -maxdepth 1 -inum $inum` ; do - if [ ${j#./} == $i ] ; then - gzip -f $i - else - rm -f ${j#./} ; ln $i.gz ${j#./}.gz - fi - done - elif [ -h $i ] ; then - target=`readlink $i` ; rm -f $i ; ln -s $target.gz $i.gz - else - gzip $i - fi - done - for i in $files ; do mv ${i%.gz}.gz $C ; done - for i in $files ; do mv $C/${i%.gz}.gz . ; done - ) fi -} - -gzip_one() { - gzip $1 ; mv $1.gz $C ; mv $C/${1##*/}.gz ${1%/*} -} - -compress() { - for i in {$P,$P/usr}/{sbin,bin} ; do strip_bindir $i ; done - for i in {$P,$P/usr}/$libdir ; do strip_libdir $i ; done - if [ -f $infodir/dir ] ; then rm -f $infodir/dir ; fi - gzip_dir $infodir - for i in `seq 9` n ; do gzip_dir $mandir/man$i ; done -} - -prune_symlink() { - echo "pruning symlink in $1" - if [ -d $1 ] ; then ( - cd $P - rm -f /tmp/iNsT-a.$$ ; touch /tmp/iNsT-a.$$ - for i in `find ${1#$P/} -type l` ; do - target=`readlink $i` - echo "$i -> $target" - echo $i$'\n'$target >> /tmp/iNsT-a.$$ - done - COUNT=1 - LINE=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - while [ -n "$LINE" ] ; do - LINKGOESIN=`dirname $LINE` - LINKNAMEIS=`basename $LINE` - COUNT=$(($COUNT + 1)) - LINKPOINTSTO=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - if [ ! -d install ] ; then mkdir install ; fi - cat <<- EOF >> install/doinst.sh - ( cd $LINKGOESIN ; rm -rf $LINKNAMEIS ) - ( cd $LINKGOESIN ; ln -sf $LINKPOINTSTO $LINKNAMEIS ) - EOF - rm -rf $LINE ; touch -t `date '+%m%d0900'` install/doinst.sh $LINE - COUNT=$(($COUNT + 1)) - LINE=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - done - rm -f /tmp/iNsT-a.$$ - ) fi -} - -convert() { - for i in {$P,$P/usr}/{sbin,bin} ; do prune_symlink $i ; done - for i in {$P,$P/usr}/$libdir ; do prune_symlink $i ; done - prune_symlink $infodir - for i in `seq 9` n ; do prune_symlink $mandir/man$i ; done -} - -fscheck -W=`pwd` -for i in `seq 0 $((${#src[@]} - 1))` ; do - S[$i]=$W/${src[$i]} ; B[$i]=$W/build`test ${#src[@]} -eq 1 || echo $i` -done -P=$W/work ; C=$W/pivot -infodir=$P/usr/share/info -mandir=$P/usr/share/man -docdir=$P/usr/share/doc -myname=`basename $0` -pkg=$pkgbase-$vers-$arch-$build -case $arch in x86_64) libdir=lib64 ;; *) libdir=lib ;; esac -if [ $# -eq 0 ] ; then - opt_download=1 ; opt_config=1 ; opt_build=1 ; opt_package=1 +if [ -f functions ] ; then + source ./functions +elif [ ! -f /usr/share/plamo/functions ] ; then + wget ftp://plamo.linet.gr.jp/pub/Plamo-src/admin/functions + source ./functions else - opt_download=0 ; opt_config=0 ; opt_build=0 ; opt_package=0 - for i in $@ ; do - case $i in - download) opt_download=1 ;; - config) opt_config=1 ;; - build) opt_build=1 ;; - package) opt_package=1 ;; - esac - done + source /usr/share/plamo/functions fi + +fscheck +prepare "$@" if [ $opt_download -eq 1 ] ; then - for i in $url ; do - 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|tgz) tar xvpzf ${i##*/} ;; - bz2|tbz) tar xvpjf ${i##*/} ;; - xz|txz) tar xvpJf ${i##*/} ;; - esac - done + download_sources fi if [ $opt_config -eq 1 ] ; then 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 + apply_patches 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 - if [ -f config.log ] ; then - rm -rf config.cache config.log - fi if [ -x configure ] ; then ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --libdir=/$libdir --infodir='${prefix}'/share/info \ @@ -260,12 +54,7 @@ done fi if [ $opt_package -eq 1 ] ; then - if [ `id -u` -ne 0 ] ; then - read -p "Do you want to package as root? [y/N] " ans - if [ "x$ans" == "xY" -o "x$ans" == "xy" ] ; then - cd $W ; /bin/su -c "$0 package" ; exit - fi - fi + root_priv if [ -d $P ] ; then rm -rf $P ; fi ; mkdir -p $P if [ -d $C ] ; then rm -rf $C ; fi ; mkdir -p $C touch $W/i.st ; sleep 1 @@ -280,46 +69,15 @@ find $P ! -type l -newer i.st ! -newer i.et \ -exec touch -t `date '+%m%d0900'` {} \; compress - for i in `seq 0 $((${#DOCS[@]} - 1))` ; do - for j in ${DOCS[$i]} ; do - for k in ${S[$i]}/$j ; do - install2 $k $docdir/${src[$i]}/${k#${S[$i]}/} - touch -r $k $docdir/${src[$i]}/${k#${S[$i]}/} - gzip_one $docdir/${src[$i]}/${k#${S[$i]}/} - done - done - if [ $i -eq 0 ] ; then - install $myname $docdir/$src - touch -t `date '+%m%d0900'` $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 - convert + setup_docdir + convert_links tar cvpf $pkg.tar -C $P `cd $P ; find bin | 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/share/locale -name "*.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 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 mv $pkg.tar.xz $pkg.txz - read -p "Do you want to keep work files? [y/N] " ans - if [ "x$ans" != "xY" -a "x$ans" != "xy" ] ; then rm -rf $P $C i.[se]t ; fi + cleanup fi --- plamo/00_base/old/dosfstools-20161204/PlamoBuild.dosfstools-3.0.26 2016-12-04 12:56:09.000000000 +0900 +++ plamo/00_base/dosfstools/PlamoBuild.dosfstools-3.0.26 2017-04-01 20:48:24.000000000 +0900 @@ -2,10 +2,12 @@ ###################################################################### url="http://mirror.opencompute.org/onie/dosfstools-3.0.26.tar.xz" +verify= +commitid= pkgbase=dosfstools vers=3.0.26 arch=`uname -m` -build=P3 +build=P4 src=$pkgbase-$vers patchfiles="" OPT_CONFIG="" @@ -13,239 +15,31 @@ `echo doc/{ChangeLog.mkdosfs,ChangeLog.dosfsck,README.mkdosfs}` `echo doc/{ANNOUNCE.mkdosfs,README.dosfstools-2.x}` COPYING VERSION ChangeLog" -template=20161020 +template=20170323 tmplurl=ftp://plamo.linet.gr.jp/pub/Plamo-src/admin ###################################################################### -fscheck() { - PANGRAM="The quick brown fox jumps over the lazy dog." - echo -n "Checking for the filesystem ... " - mkdir pangram ; ( cd pangram ; touch $PANGRAM ) - mv pangram pangram~ ; mkdir pangram ; touch -r pangram~ pangram - tar cpf pangram.tar pangram ; rmdir pangram ; mv pangram~ pangram - for i in $PANGRAM ; do tar rpf pangram.tar pangram/$i ; done - touch -t `date '+%m%d0900'` pangram.tar ; gzip pangram.tar - touch pangram.tar.gz ; mv pangram.tar.gz pangram1.tgz - tar cpf pangram.tar pangram - touch -t `date '+%m%d0900'` pangram.tar ; gzip pangram.tar - touch pangram.tar.gz ; mv pangram.tar.gz pangram2.tgz - if cmp -s pangram1.tgz pangram2.tgz ; then - echo "OK" - rm -rf pangram pangram1.tgz pangram2.tgz - else - echo "NG" - cat <<- "EOF" - Hmm, packaging may not be done properly on this filesystem. - Would you please try again on a default filesystem, thanks! - - Happy packaging!! - - Quitting... - EOF - exit - fi -} - -install2() { - install -d ${2%/*} ; install -m 644 $1 $2 -} - -strip_bindir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - shopt -s nullglob - cd $1 - for i in * ; do - echo "$i" - if [ -h $i ] ; then continue ; fi - if [ -n "`file $i | grep "not stripped"`" ] ; then - echo "stripping -p $i" - strip -p $i - fi - done - ) fi -} - -strip_libdir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - shopt -s nullglob - cd $1 - for i in *.so *.so.* *.a ; do - echo "$i" - if [ -h $i ] ; then continue ; fi - if [ -n "`nm -a $i | grep " a "`" ] ; then - if [ $i != ${i%.a} ] ; then - echo -n "ranlib and " - touch -r $i $i.mt ; ranlib $i ; touch -r $i.mt $i ; rm $i.mt - fi - echo "stripping -gp $i" - strip -gp $i - fi - done - ) fi -} - -gzip_dir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - cd $1 - files=`ls -f --indicator-style=none | sed '/^\.\{1,2\}$/d'` - for i in $files ; do - echo "$i" - if [ ! -f $i -a ! -h $i -o $i != ${i%.gz} ] ; then continue ; fi - lnks=`ls -l $i | awk '{print $2}'` - if [ $lnks -gt 1 ] ; then - inum=`ls -i $i | awk '{print $1}'` - for j in `find . -maxdepth 1 -inum $inum` ; do - if [ ${j#./} == $i ] ; then - gzip -f $i - else - rm -f ${j#./} ; ln $i.gz ${j#./}.gz - fi - done - elif [ -h $i ] ; then - target=`readlink $i` ; rm -f $i ; ln -s $target.gz $i.gz - else - gzip $i - fi - done - for i in $files ; do mv ${i%.gz}.gz $C ; done - for i in $files ; do mv $C/${i%.gz}.gz . ; done - ) fi -} - -gzip_one() { - gzip $1 ; mv $1.gz $C ; mv $C/${1##*/}.gz ${1%/*} -} - -compress() { - for i in {$P,$P/usr}/{sbin,bin} ; do strip_bindir $i ; done - for i in {$P,$P/usr}/$libdir ; do strip_libdir $i ; done - if [ -f $infodir/dir ] ; then rm -f $infodir/dir ; fi - gzip_dir $infodir - for i in `seq 9` n ; do gzip_dir $mandir/man$i ; done -} - -prune_symlink() { - echo "pruning symlink in $1" - if [ -d $1 ] ; then ( - cd $P - rm -f /tmp/iNsT-a.$$ ; touch /tmp/iNsT-a.$$ - for i in `find ${1#$P/} -type l` ; do - target=`readlink $i` - echo "$i -> $target" - echo $i$'\n'$target >> /tmp/iNsT-a.$$ - done - COUNT=1 - LINE=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - while [ -n "$LINE" ] ; do - LINKGOESIN=`dirname $LINE` - LINKNAMEIS=`basename $LINE` - COUNT=$(($COUNT + 1)) - LINKPOINTSTO=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - if [ ! -d install ] ; then mkdir install ; fi - cat <<- EOF >> install/doinst.sh - ( cd $LINKGOESIN ; rm -rf $LINKNAMEIS ) - ( cd $LINKGOESIN ; ln -sf $LINKPOINTSTO $LINKNAMEIS ) - EOF - rm -rf $LINE ; touch -t `date '+%m%d0900'` install/doinst.sh $LINE - COUNT=$(($COUNT + 1)) - LINE=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - done - rm -f /tmp/iNsT-a.$$ - ) fi -} - -convert() { - for i in {$P,$P/usr}/{sbin,bin} ; do prune_symlink $i ; done - for i in {$P,$P/usr}/$libdir ; do prune_symlink $i ; done - prune_symlink $infodir - for i in `seq 9` n ; do prune_symlink $mandir/man$i ; done -} - -fscheck -W=`pwd` -for i in `seq 0 $((${#src[@]} - 1))` ; do - S[$i]=$W/${src[$i]} ; B[$i]=$W/build`test ${#src[@]} -eq 1 || echo $i` -done -P=$W/work ; C=$W/pivot -infodir=$P/usr/share/info -mandir=$P/usr/share/man -docdir=$P/usr/share/doc -myname=`basename $0` -pkg=$pkgbase-$vers-$arch-$build -case $arch in x86_64) libdir=lib64 ;; *) libdir=lib ;; esac -if [ $# -eq 0 ] ; then - opt_download=1 ; opt_config=1 ; opt_build=1 ; opt_package=1 +if [ -f functions ] ; then + source ./functions +elif [ ! -f /usr/share/plamo/functions ] ; then + wget ftp://plamo.linet.gr.jp/pub/Plamo-src/admin/functions + source ./functions else - opt_download=0 ; opt_config=0 ; opt_build=0 ; opt_package=0 - for i in $@ ; do - case $i in - download) opt_download=1 ;; - config) opt_config=1 ;; - build) opt_build=1 ;; - package) opt_package=1 ;; - esac - done + source /usr/share/plamo/functions fi + +fscheck +prepare "$@" if [ $opt_download -eq 1 ] ; then - for i in $url ; do - 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|tgz) tar xvpzf ${i##*/} ;; - bz2|tbz) tar xvpjf ${i##*/} ;; - xz|txz) tar xvpJf ${i##*/} ;; - esac - done + download_sources fi if [ $opt_config -eq 1 ] ; then 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 + apply_patches 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 - if [ -f config.log ] ; then - rm -rf config.cache config.log - fi if [ -x configure ] ; then ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --libdir='${exec_prefix}'/$libdir --infodir='${prefix}'/share/info \ @@ -262,12 +56,7 @@ done fi if [ $opt_package -eq 1 ] ; then - if [ `id -u` -ne 0 ] ; then - read -p "Do you want to package as root? [y/N] " ans - if [ "x$ans" == "xY" -o "x$ans" == "xy" ] ; then - cd $W ; /bin/su -c "$0 package" ; exit - fi - fi + root_priv if [ -d $P ] ; then rm -rf $P ; fi ; mkdir -p $P if [ -d $C ] ; then rm -rf $C ; fi ; mkdir -p $C touch $W/i.st ; sleep 1 @@ -283,38 +72,8 @@ -exec touch -t `date '+%m%d0900'` {} \; compress gzip_dir $mandir/de/man8 - for i in `seq 0 $((${#DOCS[@]} - 1))` ; do - for j in ${DOCS[$i]} ; do - for k in ${S[$i]}/$j ; do - install2 $k $docdir/${src[$i]}/${k#${S[$i]}/} - touch -r $k $docdir/${src[$i]}/${k#${S[$i]}/} - gzip_one $docdir/${src[$i]}/${k#${S[$i]}/} - done - done - if [ $i -eq 0 ] ; then - install $myname $docdir/$src - touch -t `date '+%m%d0900'` $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 - convert + setup_docdir + convert_links tar cvpf $pkg.tar -C $P `cd $P ; find usr/sbin | 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 `cd $P ; find usr/share/man/de/man8 | tail -n+2` @@ -322,6 +81,5 @@ tar rvpf $pkg.tar -C $P install/doinst.sh touch -t `date '+%m%d0900'` $pkg.tar ; xz $pkg.tar ; touch $pkg.tar.xz mv $pkg.tar.xz $pkg.txz - read -p "Do you want to keep work files? [y/N] " ans - if [ "x$ans" != "xY" -a "x$ans" != "xy" ] ; then rm -rf $P $C i.[se]t ; fi + cleanup fi --- plamo/00_base/old/dump-20160409/PlamoBuild.dump-0.4b44 2016-04-09 21:37:03.000000000 +0900 +++ plamo/00_base/dump/PlamoBuild.dump-0.4b44 2017-04-01 21:00:30.000000000 +0900 @@ -2,220 +2,47 @@ ###################################################################### url="http://jaist.dl.sourceforge.net/sourceforge/dump/dump-0.4b44.tar.gz - ftp://plamo.linet.gr.jp/pub/Plamo-src.new/plamo/00_base/dump/dump-0.4b41-destdir.patch.gz - ftp://plamo.linet.gr.jp/pub/Plamo-src.new/plamo/00_base/dump/dump-0.4b44-com_err.patch.gz" + ftp://plamo.linet.gr.jp/pub/Plamo-src/plamo/00_base/dump/dump-0.4b41-destdir.patch.gz + ftp://plamo.linet.gr.jp/pub/Plamo-src/plamo/00_base/dump/dump-0.4b44-com_err.patch.gz" +verify= +commitid= pkgbase=dump vers=0.4b44 arch=`uname -m` -build=P3 +build=P4 src=$pkgbase-$vers +patchfiles="`echo dump-0.4b4{1-destdir,4-com_err}.patch.gz`" OPT_CONFIG="--disable-transselinux" DOCS="COPYRIGHT TODO KNOWNBUGS REPORTING-BUGS README THANKS CHANGES MAINTAINERS INSTALL" +template=20170323 +tmplurl=ftp://plamo.linet.gr.jp/pub/Plamo-src/admin ###################################################################### -fscheck() { - PANGRAM="The quick brown fox jumps over the lazy dog." - echo -n "Checking for the filesystem ... " - mkdir pangram ; ( cd pangram ; touch $PANGRAM ) - mv pangram pangram~ ; mkdir pangram ; touch -r pangram~ pangram - tar cpf pangram.tar pangram ; rmdir pangram ; mv pangram~ pangram - for i in $PANGRAM ; do tar rpf pangram.tar pangram/$i ; done - touch -t `date '+%m%d0900'` pangram.tar ; gzip pangram.tar - touch pangram.tar.gz ; mv pangram.tar.gz pangram1.tgz - tar cpf pangram.tar pangram - touch -t `date '+%m%d0900'` pangram.tar ; gzip pangram.tar - touch pangram.tar.gz ; mv pangram.tar.gz pangram2.tgz - if cmp -s pangram1.tgz pangram2.tgz ; then - echo "OK" - rm -rf pangram pangram1.tgz pangram2.tgz - else - echo "NG" - cat <<- "EOF" - Hmm, packaging may not be done properly on this filesystem. - Would you please try again on a default filesystem, thanks! - - Happy packaging!! - - Quitting... - EOF - exit - fi -} - -install2() { - install -d ${2%/*} ; install -m 644 $1 $2 -} - -strip_bindir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - shopt -s nullglob - cd $1 - for i in * ; do - echo "$i" - if [ -h $i ] ; then continue ; fi - if [ -n "`file $i | grep "not stripped"`" ] ; then - echo "stripping -p $i" - strip -p $i - fi - done - ) fi -} - -strip_libdir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - shopt -s nullglob - cd $1 - for i in *.so *.so.* *.a ; do - echo "$i" - if [ -h $i ] ; then continue ; fi - if [ -n "`nm -a $i | grep " a "`" ] ; then - if [ $i != ${i%.a} ] ; then - echo -n "ranlib and " - touch -r $i $i.mt ; ranlib $i ; touch -r $i.mt $i ; rm $i.mt - fi - echo "stripping -gp $i" - strip -gp $i - fi - done - ) fi -} - -gzip_dir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - cd $1 - files=`ls -f --indicator-style=none | sed '/^\.\{1,2\}$/d'` - for i in $files ; do - echo "$i" - if [ ! -f $i -a ! -h $i -o $i != ${i%.gz} ] ; then continue ; fi - lnks=`ls -l $i | awk '{print $2}'` - if [ $lnks -gt 1 ] ; then - inum=`ls -i $i | awk '{print $1}'` - for j in `find . -maxdepth 1 -inum $inum` ; do - if [ ${j#./} == $i ] ; then - gzip -f $i - else - rm -f ${j#./} ; ln $i.gz ${j#./}.gz - fi - done - elif [ -h $i ] ; then - target=`readlink $i` ; rm -f $i ; ln -s $target.gz $i.gz - else - gzip $i - fi - done - for i in $files ; do mv ${i%.gz}.gz $C ; done - for i in $files ; do mv $C/${i%.gz}.gz . ; done - ) fi -} - -gzip_one() { - gzip $1 ; mv $1.gz $C ; mv $C/${1##*/}.gz ${1%/*} -} - -compress() { - for i in {$P,$P/usr}/{sbin,bin} ; do strip_bindir $i ; done - for i in {$P,$P/usr}/$libdir ; do strip_libdir $i ; done - if [ -f $infodir/dir ] ; then rm -f $infodir/dir ; fi - gzip_dir $infodir - for i in `seq 9` n ; do gzip_dir $mandir/man$i ; done -} - -prune_symlink() { - echo "pruning symlink in $1" - if [ -d $1 ] ; then ( - cd $P - rm -f /tmp/iNsT-a.$$ ; touch /tmp/iNsT-a.$$ - for i in `find ${1#$P/} -type l` ; do - target=`readlink $i` - echo "$i -> $target" - echo $i$'\n'$target >> /tmp/iNsT-a.$$ - done - COUNT=1 - LINE=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - while [ -n "$LINE" ] ; do - LINKGOESIN=`dirname $LINE` - LINKNAMEIS=`basename $LINE` - COUNT=$(($COUNT + 1)) - LINKPOINTSTO=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - if [ ! -d install ] ; then mkdir install ; fi - cat <<- EOF >> install/doinst.sh - ( cd $LINKGOESIN ; rm -rf $LINKNAMEIS ) - ( cd $LINKGOESIN ; ln -sf $LINKPOINTSTO $LINKNAMEIS ) - EOF - rm -rf $LINE ; touch -t `date '+%m%d0900'` install/doinst.sh $LINE - COUNT=$(($COUNT + 1)) - LINE=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - done - rm -f /tmp/iNsT-a.$$ - ) fi -} - -convert() { - for i in {$P,$P/usr}/{sbin,bin} ; do prune_symlink $i ; done - for i in {$P,$P/usr}/$libdir ; do prune_symlink $i ; done - prune_symlink $infodir - for i in `seq 9` n ; do prune_symlink $mandir/man$i ; done -} - -fscheck -W=`pwd` -for i in `seq 0 $((${#src[@]} - 1))` ; do - S[$i]=$W/${src[$i]} ; B[$i]=$W/build`test ${#src[@]} -eq 1 || echo $i` -done -P=$W/work ; C=$W/pivot -infodir=$P/usr/share/info -mandir=$P/usr/share/man -docdir=$P/usr/share/doc -myname=`basename $0` -pkg=$pkgbase-$vers-$arch-$build -case $arch in x86_64) libdir=lib64 ;; *) libdir=lib ;; esac -if [ $# -eq 0 ] ; then - opt_download=1 ; opt_config=1 ; opt_build=1 ; opt_package=1 +if [ -f functions ] ; then + source ./functions +elif [ ! -f /usr/share/plamo/functions ] ; then + wget ftp://plamo.linet.gr.jp/pub/Plamo-src/admin/functions + source ./functions else - opt_download=0 ; opt_config=0 ; opt_build=0 ; opt_package=0 - for i in $@ ; do - case $i in - download) opt_download=1 ;; - config) opt_config=1 ;; - build) opt_build=1 ;; - package) opt_package=1 ;; - esac - done + source /usr/share/plamo/functions fi + +fscheck +prepare "$@" if [ $opt_download -eq 1 ] ; then - for i in $url ; do - if [ ! -f ${i##*/} ] ; then wget $i ; fi - done - for i in $url ; do - case ${i##*.} in - tar) tar xvpf ${i##*/} ;; - gz) tar xvpzf ${i##*/} ;; - bz2) tar xvpjf ${i##*/} ;; - esac - done + download_sources fi if [ $opt_config -eq 1 ] ; then 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/dump-0.4b41-destdir.patch.gz | patch -Np1 -i - - gunzip -c $W/dump-0.4b44-com_err.patch.gz | patch -Np1 -i - + apply_patches for i in `seq 0 $((${#B[@]} - 1))` ; do cd ${B[$i]} - if [ -f Makefile ] ; then - make clean - fi - if [ -f config.log ] ; then - 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 @@ -229,12 +56,7 @@ done fi if [ $opt_package -eq 1 ] ; then - if [ `id -u` -ne 0 ] ; then - read -p "Do you want to package as root? [y/N] " ans - if [ "x$ans" == "xY" -o "x$ans" == "xy" ] ; then - cd $W ; /bin/su -c "$0 package" ; exit - fi - fi + root_priv if [ -d $P ] ; then rm -rf $P ; fi ; mkdir -p $P if [ -d $C ] ; then rm -rf $C ; fi ; mkdir -p $C touch $W/i.st ; sleep 1 @@ -249,38 +71,23 @@ find $P ! -type l -newer i.st ! -newer i.et \ -exec touch -t `date '+%m%d0900'` {} \; compress - for i in `seq 0 $((${#DOCS[@]} - 1))` ; do - for j in ${DOCS[$i]} ; do - for k in ${S[$i]}/$j ; do - install2 $k $docdir/${src[$i]}/${k#${S[$i]}/} - touch -r $k $docdir/${src[$i]}/${k#${S[$i]}/} - gzip_one $docdir/${src[$i]}/${k#${S[$i]}/} - done - done - if [ $i -eq 0 ] ; then - install $myname $docdir/$src - touch -t `date '+%m%d0900'` $docdir/$src/$myname - gzip_one $docdir/$src/$myname - else - ln $docdir/$src/$myname.gz $docdir/${src[$i]} - fi - ( cd $docdir ; find ${src[$i]} -type d -exec touch -r $W/{} {} \; ) - done + setup_docdir cp -a $S/examples $docdir/$src chmod -R g-w $docdir/$src/examples chown -R root.root $docdir/$src/examples mv $docdir/$src/{examples,{REPORTING-BUGS,README,THANKS}.gz} $C - mv $docdir/$src/{CHANGES,MAINTAINERS,INSTALL,$myname}.gz $C + mv $docdir/$src/{CHANGES,MAINTAINERS,INSTALL}.gz $C + mv $docdir/$src/{$func,$myname,$spec}.gz $C mv $C/{examples,{REPORTING-BUGS,README,THANKS}.gz} $docdir/$src - mv $C/{CHANGES,MAINTAINERS,INSTALL,$myname}.gz $docdir/$src + mv $C/{CHANGES,MAINTAINERS,INSTALL}.gz $docdir/$src + mv $C/{$func,$myname,$spec}.gz $docdir/$src touch -r $S $docdir/$src - convert + convert_links tar cvpf $pkg.tar -C $P `cd $P ; find usr/sbin | 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 mv $pkg.tar.xz $pkg.txz - read -p "Do you want to keep work files? [y/N] " ans - if [ "x$ans" != "xY" -a "x$ans" != "xy" ] ; then rm -rf $P $C i.[se]t ; fi + cleanup fi --- plamo/00_base/old/e2fsprogs-20161206/PlamoBuild.e2fsprogs-1.43.3 2016-12-06 05:39:01.000000000 +0900 +++ plamo/00_base/e2fsprogs/PlamoBuild.e2fsprogs-1.43.3 2017-04-01 21:11:11.000000000 +0900 @@ -2,10 +2,12 @@ ###################################################################### url="http://downloads.sourceforge.net/e2fsprogs/e2fsprogs-1.43.3.tar.gz" +verify= +commitid= pkgbase=e2fsprogs vers=1.43.3 arch=`uname -m` -build=P2 +build=P3 src=$pkgbase-$vers patchfiles="" OPT_CONFIG="--enable-elf-shlibs --disable-libuuid --disable-libblkid @@ -13,231 +15,29 @@ --with-root-prefix=" DOCS="INSTALL.elfbin RELEASE-NOTES README NOTICE ABOUT-NLS INSTALL SUBMITTING-PATCHES" -template=20161020 +template=20170323 tmplurl=ftp://plamo.linet.gr.jp/pub/Plamo-src/admin ###################################################################### -fscheck() { - PANGRAM="The quick brown fox jumps over the lazy dog." - echo -n "Checking for the filesystem ... " - mkdir pangram ; ( cd pangram ; touch $PANGRAM ) - mv pangram pangram~ ; mkdir pangram ; touch -r pangram~ pangram - tar cpf pangram.tar pangram ; rmdir pangram ; mv pangram~ pangram - for i in $PANGRAM ; do tar rpf pangram.tar pangram/$i ; done - touch -t `date '+%m%d0900'` pangram.tar ; gzip pangram.tar - touch pangram.tar.gz ; mv pangram.tar.gz pangram1.tgz - tar cpf pangram.tar pangram - touch -t `date '+%m%d0900'` pangram.tar ; gzip pangram.tar - touch pangram.tar.gz ; mv pangram.tar.gz pangram2.tgz - if cmp -s pangram1.tgz pangram2.tgz ; then - echo "OK" - rm -rf pangram pangram1.tgz pangram2.tgz - else - echo "NG" - cat <<- "EOF" - Hmm, packaging may not be done properly on this filesystem. - Would you please try again on a default filesystem, thanks! - - Happy packaging!! - - Quitting... - EOF - exit - fi -} - -install2() { - install -d ${2%/*} ; install -m 644 $1 $2 -} - -strip_bindir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - shopt -s nullglob - cd $1 - for i in * ; do - echo "$i" - if [ -h $i ] ; then continue ; fi - if [ -n "`file $i | grep "not stripped"`" ] ; then - echo "stripping -p $i" - strip -p $i - fi - done - ) fi -} - -strip_libdir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - shopt -s nullglob - cd $1 - for i in *.so *.so.* *.a ; do - echo "$i" - if [ -h $i ] ; then continue ; fi - if [ -n "`nm -a $i | grep " a "`" ] ; then - if [ $i != ${i%.a} ] ; then - echo -n "ranlib and " - touch -r $i $i.mt ; ranlib $i ; touch -r $i.mt $i ; rm $i.mt - fi - echo "stripping -gp $i" - strip -gp $i - fi - done - ) fi -} - -gzip_dir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - cd $1 - files=`ls -f --indicator-style=none | sed '/^\.\{1,2\}$/d'` - for i in $files ; do - echo "$i" - if [ ! -f $i -a ! -h $i -o $i != ${i%.gz} ] ; then continue ; fi - lnks=`ls -l $i | awk '{print $2}'` - if [ $lnks -gt 1 ] ; then - inum=`ls -i $i | awk '{print $1}'` - for j in `find . -maxdepth 1 -inum $inum` ; do - if [ ${j#./} == $i ] ; then - gzip -f $i - else - rm -f ${j#./} ; ln $i.gz ${j#./}.gz - fi - done - elif [ -h $i ] ; then - target=`readlink $i` ; rm -f $i ; ln -s $target.gz $i.gz - else - gzip $i - fi - done - for i in $files ; do mv ${i%.gz}.gz $C ; done - for i in $files ; do mv $C/${i%.gz}.gz . ; done - ) fi -} - -gzip_one() { - gzip $1 ; mv $1.gz $C ; mv $C/${1##*/}.gz ${1%/*} -} - -compress() { - for i in {$P,$P/usr}/{sbin,bin} ; do strip_bindir $i ; done - for i in {$P,$P/usr}/$libdir ; do strip_libdir $i ; done - if [ -f $infodir/dir ] ; then rm -f $infodir/dir ; fi - gzip_dir $infodir - for i in `seq 9` n ; do gzip_dir $mandir/man$i ; done -} - -prune_symlink() { - echo "pruning symlink in $1" - if [ -d $1 ] ; then ( - cd $P - rm -f /tmp/iNsT-a.$$ ; touch /tmp/iNsT-a.$$ - for i in `find ${1#$P/} -type l` ; do - target=`readlink $i` - echo "$i -> $target" - echo $i$'\n'$target >> /tmp/iNsT-a.$$ - done - COUNT=1 - LINE=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - while [ -n "$LINE" ] ; do - LINKGOESIN=`dirname $LINE` - LINKNAMEIS=`basename $LINE` - COUNT=$(($COUNT + 1)) - LINKPOINTSTO=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - if [ ! -d install ] ; then mkdir install ; fi - cat <<- EOF >> install/doinst.sh - ( cd $LINKGOESIN ; rm -rf $LINKNAMEIS ) - ( cd $LINKGOESIN ; ln -sf $LINKPOINTSTO $LINKNAMEIS ) - EOF - rm -rf $LINE ; touch -t `date '+%m%d0900'` install/doinst.sh $LINE - COUNT=$(($COUNT + 1)) - LINE=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - done - rm -f /tmp/iNsT-a.$$ - ) fi -} - -convert() { - for i in {$P,$P/usr}/{sbin,bin} ; do prune_symlink $i ; done - for i in {$P,$P/usr}/$libdir ; do prune_symlink $i ; done - prune_symlink $infodir - for i in `seq 9` n ; do prune_symlink $mandir/man$i ; done -} - -fscheck -W=`pwd` -for i in `seq 0 $((${#src[@]} - 1))` ; do - S[$i]=$W/${src[$i]} ; B[$i]=$W/build`test ${#src[@]} -eq 1 || echo $i` -done -P=$W/work ; C=$W/pivot -infodir=$P/usr/share/info -mandir=$P/usr/share/man -docdir=$P/usr/share/doc -myname=`basename $0` -pkg=$pkgbase-$vers-$arch-$build -case $arch in x86_64) libdir=lib64 ;; *) libdir=lib ;; esac -if [ $# -eq 0 ] ; then - opt_download=1 ; opt_config=1 ; opt_build=1 ; opt_package=1 +if [ -f functions ] ; then + source ./functions +elif [ ! -f /usr/share/plamo/functions ] ; then + wget ftp://plamo.linet.gr.jp/pub/Plamo-src/admin/functions + source ./functions else - opt_download=0 ; opt_config=0 ; opt_build=0 ; opt_package=0 - for i in $@ ; do - case $i in - download) opt_download=1 ;; - config) opt_config=1 ;; - build) opt_build=1 ;; - package) opt_package=1 ;; - esac - done + source /usr/share/plamo/functions fi + +fscheck +prepare "$@" if [ $opt_download -eq 1 ] ; then - for i in $url ; do - 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|tgz) tar xvpzf ${i##*/} ;; - bz2|tbz) tar xvpjf ${i##*/} ;; - xz|txz) tar xvpJf ${i##*/} ;; - esac - done + download_sources fi if [ $opt_config -eq 1 ] ; then 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 - 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 + apply_patches cd $B if [ $arch == x86_64 ] ; then cp -p configure{,.orig} @@ -247,12 +47,6 @@ sed -i 's@,dir_index@@g' misc/mke2fs.conf.in for i in `seq 0 $((${#B[@]} - 1))` ; do cd ${B[$i]} - if [ -f Makefile ] ; then - make clean - fi - if [ -f config.log ] ; then - rm -rf config.cache config.log - fi if [ -x configure ] ; then ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --libdir='${exec_prefix}'/$libdir --infodir='${prefix}'/share/info \ @@ -269,12 +63,7 @@ done fi if [ $opt_package -eq 1 ] ; then - if [ `id -u` -ne 0 ] ; then - read -p "Do you want to package as root? [y/N] " ans - if [ "x$ans" == "xY" -o "x$ans" == "xy" ] ; then - cd $W ; /bin/su -c "$0 package" ; exit - fi - fi + root_priv if [ -d $P ] ; then rm -rf $P ; fi ; mkdir -p $P if [ -d $C ] ; then rm -rf $C ; fi ; mkdir -p $C touch $W/i.st ; sleep 1 @@ -282,46 +71,16 @@ cd ${B[$i]} if [ -f Makefile ] ; then make install DESTDIR=$P + make install-libs DESTDIR=$P fi done - make install-libs DESTDIR=$P touch $W/i.et cd $W find $P ! -type l -newer i.st ! -newer i.et \ -exec touch -t `date '+%m%d0900'` {} \; compress - for i in `seq 0 $((${#DOCS[@]} - 1))` ; do - for j in ${DOCS[$i]} ; do - for k in ${S[$i]}/$j ; do - install2 $k $docdir/${src[$i]}/${k#${S[$i]}/} - touch -r $k $docdir/${src[$i]}/${k#${S[$i]}/} - gzip_one $docdir/${src[$i]}/${k#${S[$i]}/} - done - done - if [ $i -eq 0 ] ; then - install $myname $docdir/$src - touch -t `date '+%m%d0900'` $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 - convert + setup_docdir + convert_links tar cvpf $pkg.tar -C $P `cd $P ; find sbin | 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 usr/bin | tail -n+2` @@ -341,6 +100,5 @@ tar rvpf $pkg.tar -C $P install/doinst.sh touch -t `date '+%m%d0900'` $pkg.tar ; xz $pkg.tar ; touch $pkg.tar.xz mv $pkg.tar.xz $pkg.txz - read -p "Do you want to keep work files? [y/N] " ans - if [ "x$ans" != "xY" -a "x$ans" != "xy" ] ; then rm -rf $P $C i.[se]t ; fi + cleanup fi --- plamo/00_base/old/ed-20151229/PlamoBuild.ed-1.5 2015-12-29 20:36:35.000000000 +0900 +++ plamo/00_base/ed/PlamoBuild.ed-1.5 2017-04-01 21:29:07.000000000 +0900 @@ -2,214 +2,44 @@ ###################################################################### url="http://gnu.raffsoftware.com/ed/ed-1.5.tar.gz" +verify= +commitid= pkgbase=ed vers=1.5 arch=`uname -m` -build=P2 +build=P3 src=$pkgbase-$vers +patchfiles="" OPT_CONFIG="" DOCS="AUTHORS COPYING ChangeLog INSTALL NEWS README TODO" +template=20170323 +tmplurl=ftp://plamo.linet.gr.jp/pub/Plamo-src/admin ###################################################################### -fscheck() { - PANGRAM="The quick brown fox jumps over the lazy dog." - echo -n "Checking for the filesystem ... " - mkdir pangram ; ( cd pangram ; touch $PANGRAM ) - mv pangram pangram~ ; mkdir pangram ; touch -r pangram~ pangram - tar cpf pangram.tar pangram ; rmdir pangram ; mv pangram~ pangram - for i in $PANGRAM ; do tar rpf pangram.tar pangram/$i ; done - touch -t `date '+%m%d0900'` pangram.tar ; gzip pangram.tar - touch pangram.tar.gz ; mv pangram.tar.gz pangram1.tgz - tar cpf pangram.tar pangram - touch -t `date '+%m%d0900'` pangram.tar ; gzip pangram.tar - touch pangram.tar.gz ; mv pangram.tar.gz pangram2.tgz - if cmp -s pangram1.tgz pangram2.tgz ; then - echo "OK" - rm -rf pangram pangram1.tgz pangram2.tgz - else - echo "NG" - cat <<- "EOF" - Hmm, packaging may not be done properly on this filesystem. - Would you please try again on a default filesystem, thanks! - - Happy packaging!! - - Quitting... - EOF - exit - fi -} - -install2() { - install -d ${2%/*} ; install -m 644 $1 $2 -} - -strip_bindir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - shopt -s nullglob - cd $1 - for i in * ; do - echo "$i" - if [ -h $i ] ; then continue ; fi - if [ -n "`file $i | grep "not stripped"`" ] ; then - echo "stripping -p $i" - strip -p $i - fi - done - ) fi -} - -strip_libdir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - shopt -s nullglob - cd $1 - for i in *.so *.so.* *.a ; do - echo "$i" - if [ -h $i ] ; then continue ; fi - if [ -n "`nm -a $i | grep " a "`" ] ; then - if [ $i != ${i%.a} ] ; then - echo -n "ranlib and " - touch -r $i $i.mt ; ranlib $i ; touch -r $i.mt $i ; rm $i.mt - fi - echo "stripping -gp $i" - strip -gp $i - fi - done - ) fi -} - -gzip_dir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - cd $1 - files=`ls -f --indicator-style=none | sed '/^\.\{1,2\}$/d'` - for i in $files ; do - echo "$i" - if [ ! -f $i -a ! -h $i -o $i != ${i%.gz} ] ; then continue ; fi - lnks=`ls -l $i | awk '{print $2}'` - if [ $lnks -gt 1 ] ; then - inum=`ls -i $i | awk '{print $1}'` - for j in `find . -maxdepth 1 -inum $inum` ; do - if [ ${j#./} == $i ] ; then - gzip -f $i - else - rm -f ${j#./} ; ln $i.gz ${j#./}.gz - fi - done - elif [ -h $i ] ; then - target=`readlink $i` ; rm -f $i ; ln -s $target.gz $i.gz - else - gzip $i - fi - done - for i in $files ; do mv ${i%.gz}.gz $C ; done - for i in $files ; do mv $C/${i%.gz}.gz . ; done - ) fi -} - -gzip_one() { - gzip $1 ; mv $1.gz $C ; mv $C/${1##*/}.gz ${1%/*} -} - -compress() { - for i in {$P,$P/usr}/{sbin,bin} ; do strip_bindir $i ; done - for i in {$P,$P/usr}/$libdir ; do strip_libdir $i ; done - if [ -f $infodir/dir ] ; then rm -f $infodir/dir ; fi - gzip_dir $infodir - for i in `seq 9` n ; do gzip_dir $mandir/man$i ; done -} - -prune_symlink() { - echo "pruning symlink in $1" - if [ -d $1 ] ; then ( - cd $P - rm -f /tmp/iNsT-a.$$ ; touch /tmp/iNsT-a.$$ - for i in `find ${1#$P/} -type l` ; do - target=`readlink $i` - echo "$i -> $target" - echo $i$'\n'$target >> /tmp/iNsT-a.$$ - done - COUNT=1 - LINE=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - while [ -n "$LINE" ] ; do - LINKGOESIN=`dirname $LINE` - LINKNAMEIS=`basename $LINE` - COUNT=$(($COUNT + 1)) - LINKPOINTSTO=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - if [ ! -d install ] ; then mkdir install ; fi - cat <<- EOF >> install/doinst.sh - ( cd $LINKGOESIN ; rm -rf $LINKNAMEIS ) - ( cd $LINKGOESIN ; ln -sf $LINKPOINTSTO $LINKNAMEIS ) - EOF - rm -rf $LINE ; touch -t `date '+%m%d0900'` install/doinst.sh $LINE - COUNT=$(($COUNT + 1)) - LINE=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - done - rm -f /tmp/iNsT-a.$$ - ) fi -} - -convert() { - for i in {$P,$P/usr}/{sbin,bin} ; do prune_symlink $i ; done - for i in {$P,$P/usr}/$libdir ; do prune_symlink $i ; done - prune_symlink $infodir - for i in `seq 9` n ; do prune_symlink $mandir/man$i ; done -} - -fscheck -W=`pwd` -for i in `seq 0 $((${#src[@]} - 1))` ; do - S[$i]=$W/${src[$i]} ; B[$i]=$W/build`test ${#src[@]} -eq 1 || echo $i` -done -P=$W/work ; C=$W/pivot -infodir=$P/usr/share/info -mandir=$P/usr/share/man -docdir=$P/usr/share/doc -myname=`basename $0` -pkg=$pkgbase-$vers-$arch-$build -case $arch in x86_64) libdir=lib64 ;; *) libdir=lib ;; esac -if [ $# -eq 0 ] ; then - opt_download=1 ; opt_config=1 ; opt_build=1 ; opt_package=1 +if [ -f functions ] ; then + source ./functions +elif [ ! -f /usr/share/plamo/functions ] ; then + wget ftp://plamo.linet.gr.jp/pub/Plamo-src/admin/functions + source ./functions else - opt_download=0 ; opt_config=0 ; opt_build=0 ; opt_package=0 - for i in $@ ; do - case $i in - download) opt_download=1 ;; - config) opt_config=1 ;; - build) opt_build=1 ;; - package) opt_package=1 ;; - esac - done + source /usr/share/plamo/functions fi + +fscheck +prepare "$@" if [ $opt_download -eq 1 ] ; then - for i in $url ; do - if [ ! -f ${i##*/} ] ; then wget $i ; fi - done - for i in $url ; do - case ${i##*.} in - tar) tar xvpf ${i##*/} ;; - gz) tar xvpzf ${i##*/} ;; - bz2) tar xvpjf ${i##*/} ;; - esac - done + download_sources fi if [ $opt_config -eq 1 ] ; then 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 + apply_patches for i in `seq 0 $((${#B[@]} - 1))` ; do cd ${B[$i]} - if [ -f Makefile ] ; then - make clean - fi - if [ -f config.log ] ; then - 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 @@ -223,12 +53,7 @@ done fi if [ $opt_package -eq 1 ] ; then - if [ `id -u` -ne 0 ] ; then - read -p "Do you want to package as root? [y/N] " ans - if [ "x$ans" == "xY" -o "x$ans" == "xy" ] ; then - cd $W ; /bin/su -c "$0 package" ; exit - fi - fi + root_priv if [ -d $P ] ; then rm -rf $P ; fi ; mkdir -p $P if [ -d $C ] ; then rm -rf $C ; fi ; mkdir -p $C touch $W/i.st ; sleep 1 @@ -244,25 +69,9 @@ find $P ! -type l -newer i.st ! -newer i.et \ -exec touch -t `date '+%m%d0900'` {} \; compress - for i in `seq 0 $((${#DOCS[@]} - 1))` ; do - for j in ${DOCS[$i]} ; do - for k in ${S[$i]}/$j ; do - install2 $k $docdir/${src[$i]}/${k#${S[$i]}/} - touch -r $k $docdir/${src[$i]}/${k#${S[$i]}/} - gzip_one $docdir/${src[$i]}/${k#${S[$i]}/} - done - done - if [ $i -eq 0 ] ; then - install $myname $docdir/$src - touch -t `date '+%m%d0900'` $docdir/$src/$myname - gzip_one $docdir/$src/$myname - else - ln $docdir/$src/$myname.gz $docdir/${src[$i]} - fi - ( cd $docdir ; find ${src[$i]} -type d -exec touch -r $W/{} {} \; ) - done + setup_docdir touch -t `date '+%m%d0900'` $docdir/$src - convert + convert_links tar cvpf $pkg.tar -C $P `cd $P ; find usr/bin | tail -n+2` tar rvpf $pkg.tar -C $P `cd $P ; find usr/share/info | tail -n+2` tar rvpf $pkg.tar -C $P `cd $P ; find usr/share/man/man1 | tail -n+2` @@ -270,6 +79,5 @@ tar rvpf $pkg.tar -C $P install/doinst.sh touch -t `date '+%m%d0900'` $pkg.tar ; xz $pkg.tar ; touch $pkg.tar.xz mv $pkg.tar.xz $pkg.txz - read -p "Do you want to keep work files? [y/N] " ans - if [ "x$ans" != "xY" -a "x$ans" != "xy" ] ; then rm -rf $P $C i.[se]t ; fi + cleanup fi --- plamo/00_base/old/eject-20160823/PlamoBuild.eject-2.1.5 2016-08-23 13:14:54.000000000 +0900 +++ plamo/00_base/eject/PlamoBuild.eject-2.1.5 2017-04-05 23:15:50.000000000 +0900 @@ -3,247 +3,43 @@ ###################################################################### url="http://ftp.caixamagica.pt/anvil/pool/main/e/eject/eject_2.1.5+deb1+cvs20081104.orig.tar.gz http://ftp.caixamagica.pt/anvil/pool/main/e/eject/eject_2.1.5+deb1+cvs20081104-8.diff.gz" +verify= +commitid= pkgbase=eject vers=2.1.5 arch=`uname -m` -build=P3 +build=P4 src=$pkgbase-$vers+deb1+cvs20081104 patchfiles="eject_2.1.5+deb1+cvs20081104-8.diff.gz" OPT_CONFIG="" DOCS="TODO NEWS PORTING COPYING INSTALL README AUTHORS PROBLEMS ChangeLog" +template=20170323 +tmplurl=ftp://plamo.linet.gr.jp/pub/Plamo-src/admin ###################################################################### -fscheck() { - PANGRAM="The quick brown fox jumps over the lazy dog." - echo -n "Checking for the filesystem ... " - mkdir pangram ; ( cd pangram ; touch $PANGRAM ) - mv pangram pangram~ ; mkdir pangram ; touch -r pangram~ pangram - tar cpf pangram.tar pangram ; rmdir pangram ; mv pangram~ pangram - for i in $PANGRAM ; do tar rpf pangram.tar pangram/$i ; done - touch -t `date '+%m%d0900'` pangram.tar ; gzip pangram.tar - touch pangram.tar.gz ; mv pangram.tar.gz pangram1.tgz - tar cpf pangram.tar pangram - touch -t `date '+%m%d0900'` pangram.tar ; gzip pangram.tar - touch pangram.tar.gz ; mv pangram.tar.gz pangram2.tgz - if cmp -s pangram1.tgz pangram2.tgz ; then - echo "OK" - rm -rf pangram pangram1.tgz pangram2.tgz - else - echo "NG" - cat <<- "EOF" - Hmm, packaging may not be done properly on this filesystem. - Would you please try again on a default filesystem, thanks! - - Happy packaging!! - - Quitting... - EOF - exit - fi -} - -install2() { - install -d ${2%/*} ; install -m 644 $1 $2 -} - -strip_bindir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - shopt -s nullglob - cd $1 - for i in * ; do - echo "$i" - if [ -h $i ] ; then continue ; fi - if [ -n "`file $i | grep "not stripped"`" ] ; then - echo "stripping -p $i" - strip -p $i - fi - done - ) fi -} - -strip_libdir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - shopt -s nullglob - cd $1 - for i in *.so *.so.* *.a ; do - echo "$i" - if [ -h $i ] ; then continue ; fi - if [ -n "`nm -a $i | grep " a "`" ] ; then - if [ $i != ${i%.a} ] ; then - echo -n "ranlib and " - touch -r $i $i.mt ; ranlib $i ; touch -r $i.mt $i ; rm $i.mt - fi - echo "stripping -gp $i" - strip -gp $i - fi - done - ) fi -} - -gzip_dir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - cd $1 - files=`ls -f --indicator-style=none | sed '/^\.\{1,2\}$/d'` - for i in $files ; do - echo "$i" - if [ ! -f $i -a ! -h $i -o $i != ${i%.gz} ] ; then continue ; fi - lnks=`ls -l $i | awk '{print $2}'` - if [ $lnks -gt 1 ] ; then - inum=`ls -i $i | awk '{print $1}'` - for j in `find . -maxdepth 1 -inum $inum` ; do - if [ ${j#./} == $i ] ; then - gzip -f $i - else - rm -f ${j#./} ; ln $i.gz ${j#./}.gz - fi - done - elif [ -h $i ] ; then - target=`readlink $i` ; rm -f $i ; ln -s $target.gz $i.gz - else - gzip $i - fi - done - for i in $files ; do mv ${i%.gz}.gz $C ; done - for i in $files ; do mv $C/${i%.gz}.gz . ; done - ) fi -} - -gzip_one() { - gzip $1 ; mv $1.gz $C ; mv $C/${1##*/}.gz ${1%/*} -} - -compress() { - for i in {$P,$P/usr}/{sbin,bin} ; do strip_bindir $i ; done - for i in {$P,$P/usr}/$libdir ; do strip_libdir $i ; done - if [ -f $infodir/dir ] ; then rm -f $infodir/dir ; fi - gzip_dir $infodir - for i in `seq 9` n ; do gzip_dir $mandir/man$i ; done -} - -prune_symlink() { - echo "pruning symlink in $1" - if [ -d $1 ] ; then ( - cd $P - rm -f /tmp/iNsT-a.$$ ; touch /tmp/iNsT-a.$$ - for i in `find ${1#$P/} -type l` ; do - target=`readlink $i` - echo "$i -> $target" - echo $i$'\n'$target >> /tmp/iNsT-a.$$ - done - COUNT=1 - LINE=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - while [ -n "$LINE" ] ; do - LINKGOESIN=`dirname $LINE` - LINKNAMEIS=`basename $LINE` - COUNT=$(($COUNT + 1)) - LINKPOINTSTO=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - if [ ! -d install ] ; then mkdir install ; fi - cat <<- EOF >> install/doinst.sh - ( cd $LINKGOESIN ; rm -rf $LINKNAMEIS ) - ( cd $LINKGOESIN ; ln -sf $LINKPOINTSTO $LINKNAMEIS ) - EOF - rm -rf $LINE ; touch -t `date '+%m%d0900'` install/doinst.sh $LINE - COUNT=$(($COUNT + 1)) - LINE=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - done - rm -f /tmp/iNsT-a.$$ - ) fi -} - -convert() { - for i in {$P,$P/usr}/{sbin,bin} ; do prune_symlink $i ; done - for i in {$P,$P/usr}/$libdir ; do prune_symlink $i ; done - prune_symlink $infodir - for i in `seq 9` n ; do prune_symlink $mandir/man$i ; done -} - -fscheck -W=`pwd` -for i in `seq 0 $((${#src[@]} - 1))` ; do - S[$i]=$W/${src[$i]} ; B[$i]=$W/build`test ${#src[@]} -eq 1 || echo $i` -done -P=$W/work ; C=$W/pivot -infodir=$P/usr/share/info -mandir=$P/usr/share/man -docdir=$P/usr/share/doc -myname=`basename $0` -pkg=$pkgbase-$vers-$arch-$build -case $arch in x86_64) libdir=lib64 ;; *) libdir=lib ;; esac -if [ $# -eq 0 ] ; then - opt_download=1 ; opt_config=1 ; opt_build=1 ; opt_package=1 +if [ -f functions ] ; then + source ./functions +elif [ ! -f /usr/share/plamo/functions ] ; then + wget ftp://plamo.linet.gr.jp/pub/Plamo-src/admin/functions + source ./functions else - opt_download=0 ; opt_config=0 ; opt_build=0 ; opt_package=0 - for i in $@ ; do - case $i in - download) opt_download=1 ;; - config) opt_config=1 ;; - build) opt_build=1 ;; - package) opt_package=1 ;; - esac - done + source /usr/share/plamo/functions fi + +fscheck +prepare "$@" if [ $opt_download -eq 1 ] ; then - for i in $url ; do - 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|tgz) tar xvpzf ${i##*/} ;; - bz2|tbz) tar xvpjf ${i##*/} ;; - xz|txz) tar xvpJf ${i##*/} ;; - esac - done + download_sources fi if [ $opt_config -eq 1 ] ; then 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 - 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 + apply_patches cd $B ./bootstrap for i in `seq 0 $((${#B[@]} - 1))` ; do cd ${B[$i]} - if [ -f Makefile ] ; then - make clean - fi - if [ -f config.log ] ; then - rm -rf config.cache config.log - fi if [ -x configure ] ; then ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --libdir='${exec_prefix}'/$libdir --infodir='${prefix}'/share/info \ @@ -260,12 +56,7 @@ done fi if [ $opt_package -eq 1 ] ; then - if [ `id -u` -ne 0 ] ; then - read -p "Do you want to package as root? [y/N] " ans - if [ "x$ans" == "xY" -o "x$ans" == "xy" ] ; then - cd $W ; /bin/su -c "$0 package" ; exit - fi - fi + root_priv if [ -d $P ] ; then rm -rf $P ; fi ; mkdir -p $P if [ -d $C ] ; then rm -rf $C ; fi ; mkdir -p $C touch $W/i.st ; sleep 1 @@ -280,30 +71,13 @@ find $P ! -type l -newer i.st ! -newer i.et \ -exec touch -t `date '+%m%d0900'` {} \; compress - for i in `seq 0 $((${#DOCS[@]} - 1))` ; do - for j in ${DOCS[$i]} ; do - for k in ${S[$i]}/$j ; do - install2 $k $docdir/${src[$i]}/${k#${S[$i]}/} - touch -r $k $docdir/${src[$i]}/${k#${S[$i]}/} - gzip_one $docdir/${src[$i]}/${k#${S[$i]}/} - done - done - if [ $i -eq 0 ] ; then - install $myname $docdir/$src - touch -t `date '+%m%d0900'` $docdir/$src/$myname - gzip_one $docdir/$src/$myname - else - ln $docdir/$src/$myname.gz $docdir/${src[$i]} - fi - ( cd $docdir ; find ${src[$i]} -type d -exec touch -r $W/{} {} \; ) - done - convert + setup_docdir + convert_links tar cvpf $pkg.tar -C $P `cd $P ; find usr/bin | 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/man/man1 | tail -n+2` tar rvpf $pkg.tar -C $P usr/share/doc/$src touch -t `date '+%m%d0900'` $pkg.tar ; xz $pkg.tar ; touch $pkg.tar.xz mv $pkg.tar.xz $pkg.txz - read -p "Do you want to keep work files? [y/N] " ans - if [ "x$ans" != "xY" -a "x$ans" != "xy" ] ; then rm -rf $P $C i.[se]t ; fi + cleanup fi --- plamo/00_base/old/extipl-20160329/PlamoBuild.extipl-5.04 2016-03-29 13:21:20.000000000 +0900 +++ plamo/00_base/extipl/PlamoBuild.extipl-5.04 2017-04-05 12:50:47.000000000 +0900 @@ -2,207 +2,43 @@ ###################################################################### url="http://jaist.dl.sourceforge.jp/extipl/2166/extipl-5.04.tar.gz - ftp://plamo.linet.gr.jp/pub/Plamo-src.new/plamo/00_base/extipl/extipl-5.04-syscall.patch.gz - ftp://plamo.linet.gr.jp/pub/Plamo-src.new/plamo/00_base/extipl/extipl-5.04-x86_64.patch.gz + ftp://plamo.linet.gr.jp/pub/Plamo-src/plamo/00_base/extipl/extipl-5.04-syscall.patch.gz + ftp://plamo.linet.gr.jp/pub/Plamo-src/plamo/00_base/extipl/extipl-5.04-x86_64.patch.gz http://jaist.dl.sourceforge.net/sourceforge/nasm/nasm-0.98.38.tar.bz2" +verify= +commitid= pkgbase=extipl vers=5.04 arch=`uname -m` -build=P4 +build=P5 src=$pkgbase-$vers +patchfiles="" OPT_CONFIG="" DOCS="`echo doc/{English,Japanese}/{extipl,scorpius,techical}.txt` COPYING README" +template=20170323 +tmplurl=ftp://plamo.linet.gr.jp/pub/Plamo-src/admin ###################################################################### -fscheck() { - PANGRAM="The quick brown fox jumps over the lazy dog." - echo -n "Checking for the filesystem ... " - mkdir pangram ; ( cd pangram ; touch $PANGRAM ) - mv pangram pangram~ ; mkdir pangram ; touch -r pangram~ pangram - tar cpf pangram.tar pangram ; rmdir pangram ; mv pangram~ pangram - for i in $PANGRAM ; do tar rpf pangram.tar pangram/$i ; done - touch -t `date '+%m%d0900'` pangram.tar ; gzip pangram.tar - touch pangram.tar.gz ; mv pangram.tar.gz pangram1.tgz - tar cpf pangram.tar pangram - touch -t `date '+%m%d0900'` pangram.tar ; gzip pangram.tar - touch pangram.tar.gz ; mv pangram.tar.gz pangram2.tgz - if cmp -s pangram1.tgz pangram2.tgz ; then - echo "OK" - rm -rf pangram pangram1.tgz pangram2.tgz - else - echo "NG" - cat <<- "EOF" - Hmm, packaging may not be done properly on this filesystem. - Would you please try again on a default filesystem, thanks! - - Happy packaging!! - - Quitting... - EOF - exit - fi -} - -install2() { - install -d ${2%/*} ; install -m 644 $1 $2 -} - -strip_bindir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - shopt -s nullglob - cd $1 - for i in * ; do - echo "$i" - if [ -h $i ] ; then continue ; fi - if [ -n "`file $i | grep "not stripped"`" ] ; then - echo "stripping -p $i" - strip -p $i - fi - done - ) fi -} - -strip_libdir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - shopt -s nullglob - cd $1 - for i in *.so *.so.* *.a ; do - echo "$i" - if [ -h $i ] ; then continue ; fi - if [ -n "`nm -a $i | grep " a "`" ] ; then - if [ $i != ${i%.a} ] ; then - echo -n "ranlib and " - touch -r $i $i.mt ; ranlib $i ; touch -r $i.mt $i ; rm $i.mt - fi - echo "stripping -gp $i" - strip -gp $i - fi - done - ) fi -} - -gzip_dir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - cd $1 - files=`ls -f --indicator-style=none | sed '/^\.\{1,2\}$/d'` - for i in $files ; do - echo "$i" - if [ ! -f $i -a ! -h $i -o $i != ${i%.gz} ] ; then continue ; fi - lnks=`ls -l $i | awk '{print $2}'` - if [ $lnks -gt 1 ] ; then - inum=`ls -i $i | awk '{print $1}'` - for j in `find . -maxdepth 1 -inum $inum` ; do - if [ ${j#./} == $i ] ; then - gzip -f $i - else - rm -f ${j#./} ; ln $i.gz ${j#./}.gz - fi - done - elif [ -h $i ] ; then - target=`readlink $i` ; rm -f $i ; ln -s $target.gz $i.gz - else - gzip $i - fi - done - for i in $files ; do mv ${i%.gz}.gz $C ; done - for i in $files ; do mv $C/${i%.gz}.gz . ; done - ) fi -} - -gzip_one() { - gzip $1 ; mv $1.gz $C ; mv $C/${1##*/}.gz ${1%/*} -} - -compress() { - for i in {$P,$P/usr}/{sbin,bin} ; do strip_bindir $i ; done - for i in {$P,$P/usr}/$libdir ; do strip_libdir $i ; done - if [ -f $infodir/dir ] ; then rm -f $infodir/dir ; fi - gzip_dir $infodir - for i in `seq 9` n ; do gzip_dir $mandir/man$i ; done -} - -prune_symlink() { - echo "pruning symlink in $1" - if [ -d $1 ] ; then ( - cd $P - rm -f /tmp/iNsT-a.$$ ; touch /tmp/iNsT-a.$$ - for i in `find ${1#$P/} -type l` ; do - target=`readlink $i` - echo "$i -> $target" - echo $i$'\n'$target >> /tmp/iNsT-a.$$ - done - COUNT=1 - LINE=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - while [ -n "$LINE" ] ; do - LINKGOESIN=`dirname $LINE` - LINKNAMEIS=`basename $LINE` - COUNT=$(($COUNT + 1)) - LINKPOINTSTO=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - if [ ! -d install ] ; then mkdir install ; fi - cat <<- EOF >> install/doinst.sh - ( cd $LINKGOESIN ; rm -rf $LINKNAMEIS ) - ( cd $LINKGOESIN ; ln -sf $LINKPOINTSTO $LINKNAMEIS ) - EOF - rm -rf $LINE ; touch -t `date '+%m%d0900'` install/doinst.sh $LINE - COUNT=$(($COUNT + 1)) - LINE=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - done - rm -f /tmp/iNsT-a.$$ - ) fi -} - -convert() { - for i in {$P,$P/usr}/{sbin,bin} ; do prune_symlink $i ; done - for i in {$P,$P/usr}/$libdir ; do prune_symlink $i ; done - prune_symlink $infodir - for i in `seq 9` n ; do prune_symlink $mandir/man$i ; done -} - -fscheck -W=`pwd` -for i in `seq 0 $((${#src[@]} - 1))` ; do - S[$i]=$W/${src[$i]} ; B[$i]=$W/build`test ${#src[@]} -eq 1 || echo $i` -done -P=$W/work ; C=$W/pivot -infodir=$P/usr/share/info -mandir=$P/usr/share/man -docdir=$P/usr/share/doc -myname=`basename $0` -pkg=$pkgbase-$vers-$arch-$build -case $arch in x86_64) libdir=lib64 ;; *) libdir=lib ;; esac -if [ $# -eq 0 ] ; then - opt_download=1 ; opt_config=1 ; opt_build=1 ; opt_package=1 +if [ -f functions ] ; then + source ./functions +elif [ ! -f /usr/share/plamo/functions ] ; then + wget ftp://plamo.linet.gr.jp/pub/Plamo-src/admin/functions + source ./functions else - opt_download=0 ; opt_config=0 ; opt_build=0 ; opt_package=0 - for i in $@ ; do - case $i in - download) opt_download=1 ;; - config) opt_config=1 ;; - build) opt_build=1 ;; - package) opt_package=1 ;; - esac - done + source /usr/share/plamo/functions fi + +fscheck +prepare "$@" if [ $opt_download -eq 1 ] ; then - for i in $url ; do - if [ ! -f ${i##*/} ] ; then wget $i ; fi - done - for i in $url ; do - case ${i##*.} in - tar) tar xvpf ${i##*/} ;; - gz) tar xvpzf ${i##*/} ;; - bz2) tar xvpjf ${i##*/} ;; - esac - done + download_sources fi if [ $opt_config -eq 1 ] ; then 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 + apply_patches cd $B if [ $arch != x86_64 ] ; then gunzip -c $W/extipl-5.04-syscall.patch.gz | patch -Np1 -i - @@ -216,15 +52,9 @@ PATH="$W/nasm/bin:$PATH" for i in `seq 0 $((${#B[@]} - 1))` ; do cd ${B[$i]} - if [ -f Makefile ] ; then - make clean - fi - if [ -f config.log ] ; then - 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 @@ -239,12 +69,7 @@ cd src ; make fi if [ $opt_package -eq 1 ] ; then - if [ `id -u` -ne 0 ] ; then - read -p "Do you want to package as root? [y/N] " ans - if [ "x$ans" == "xY" -o "x$ans" == "xy" ] ; then - cd $W ; /bin/su -c "$0 package" ; exit - fi - fi + root_priv if [ -d $P ] ; then rm -rf $P ; fi ; mkdir -p $P if [ -d $C ] ; then rm -rf $C ; fi ; mkdir -p $C touch $W/i.st ; sleep 1 @@ -262,30 +87,13 @@ find $P ! -type l -newer i.st ! -newer i.et \ -exec touch -t `date '+%m%d0900'` {} \; compress - for i in `seq 0 $((${#DOCS[@]} - 1))` ; do - for j in ${DOCS[$i]} ; do - for k in ${S[$i]}/$j ; do - install2 $k $docdir/${src[$i]}/${k#${S[$i]}/} - touch -r $k $docdir/${src[$i]}/${k#${S[$i]}/} - gzip_one $docdir/${src[$i]}/${k#${S[$i]}/} - done - done - if [ $i -eq 0 ] ; then - install $myname $docdir/$src - touch -t `date '+%m%d0900'` $docdir/$src/$myname - gzip_one $docdir/$src/$myname - else - ln $docdir/$src/$myname.gz $docdir/${src[$i]} - fi - ( cd $docdir ; find ${src[$i]} -type d -exec touch -r $W/{} {} \; ) - done - convert + setup_docdir + convert_links tar cvpf $pkg.tar -C $P `cd $P ; find sbin | 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 `cd $P ; find usr/share/man/ja_JP.eucJP/man8 | tail -n+2` tar rvpf $pkg.tar -C $P usr/share/doc/$src touch -t `date '+%m%d0900'` $pkg.tar ; xz $pkg.tar ; touch $pkg.tar.xz mv $pkg.tar.xz $pkg.txz - read -p "Do you want to keep work files? [y/N] " ans - if [ "x$ans" != "xY" -a "x$ans" != "xy" ] ; then rm -rf $P $C i.[se]t ; fi + cleanup fi --- plamo/00_base/old/fbset-20151227/PlamoBuild.fbset-2.1 2015-12-27 19:57:23.000000000 +0900 +++ plamo/00_base/fbset/PlamoBuild.fbset-2.1 2017-04-05 12:56:59.000000000 +0900 @@ -3,219 +3,48 @@ ###################################################################### url="http://users.telenet.be/geertu/Linux/fbdev/fbset-2.1.tar.gz http://archive.debian.org/debian/pool/main/f/fbset/fbset_2.1-23.diff.gz" +verify= +commitid= pkgbase=fbset vers=2.1 arch=`uname -m` -build=P2 +build=P3 src=$pkgbase-$vers +patchfiles="fbset_2.1-23.diff.gz" OPT_CONFIG="" DOCS="INSTALL" +template=20170323 +tmplurl=ftp://plamo.linet.gr.jp/pub/Plamo-src/admin ###################################################################### -fscheck() { - PANGRAM="The quick brown fox jumps over the lazy dog." - echo -n "Checking for the filesystem ... " - mkdir pangram ; ( cd pangram ; touch $PANGRAM ) - mv pangram pangram~ ; mkdir pangram ; touch -r pangram~ pangram - tar cpf pangram.tar pangram ; rmdir pangram ; mv pangram~ pangram - for i in $PANGRAM ; do tar rpf pangram.tar pangram/$i ; done - touch -t `date '+%m%d0900'` pangram.tar ; gzip pangram.tar - touch pangram.tar.gz ; mv pangram.tar.gz pangram1.tgz - tar cpf pangram.tar pangram - touch -t `date '+%m%d0900'` pangram.tar ; gzip pangram.tar - touch pangram.tar.gz ; mv pangram.tar.gz pangram2.tgz - if cmp -s pangram1.tgz pangram2.tgz ; then - echo "OK" - rm -rf pangram pangram1.tgz pangram2.tgz - else - echo "NG" - cat <<- "EOF" - Hmm, packaging may not be done properly on this filesystem. - Would you please try again on a default filesystem, thanks! - - Happy packaging!! - - Quitting... - EOF - exit - fi -} - -install2() { - install -d ${2%/*} ; install -m 644 $1 $2 -} - -strip_bindir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - shopt -s nullglob - cd $1 - for i in * ; do - echo "$i" - if [ -h $i ] ; then continue ; fi - if [ -n "`file $i | grep "not stripped"`" ] ; then - echo "stripping -p $i" - strip -p $i - fi - done - ) fi -} - -strip_libdir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - shopt -s nullglob - cd $1 - for i in *.so *.so.* *.a ; do - echo "$i" - if [ -h $i ] ; then continue ; fi - if [ -n "`nm -a $i | grep " a "`" ] ; then - if [ $i != ${i%.a} ] ; then - echo -n "ranlib and " - touch -r $i $i.mt ; ranlib $i ; touch -r $i.mt $i ; rm $i.mt - fi - echo "stripping -gp $i" - strip -gp $i - fi - done - ) fi -} - -gzip_dir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - cd $1 - files=`ls -f --indicator-style=none | sed '/^\.\{1,2\}$/d'` - for i in $files ; do - echo "$i" - if [ ! -f $i -a ! -h $i -o $i != ${i%.gz} ] ; then continue ; fi - lnks=`ls -l $i | awk '{print $2}'` - if [ $lnks -gt 1 ] ; then - inum=`ls -i $i | awk '{print $1}'` - for j in `find . -maxdepth 1 -inum $inum` ; do - if [ ${j#./} == $i ] ; then - gzip -f $i - else - rm -f ${j#./} ; ln $i.gz ${j#./}.gz - fi - done - elif [ -h $i ] ; then - target=`readlink $i` ; rm -f $i ; ln -s $target.gz $i.gz - else - gzip $i - fi - done - for i in $files ; do mv ${i%.gz}.gz $C ; done - for i in $files ; do mv $C/${i%.gz}.gz . ; done - ) fi -} - -gzip_one() { - gzip $1 ; mv $1.gz $C ; mv $C/${1##*/}.gz ${1%/*} -} - -compress() { - for i in {$P,$P/usr}/{sbin,bin} ; do strip_bindir $i ; done - for i in {$P,$P/usr}/$libdir ; do strip_libdir $i ; done - if [ -f $infodir/dir ] ; then rm -f $infodir/dir ; fi - gzip_dir $infodir - for i in `seq 9` n ; do gzip_dir $mandir/man$i ; done -} - -prune_symlink() { - echo "pruning symlink in $1" - if [ -d $1 ] ; then ( - cd $P - rm -f /tmp/iNsT-a.$$ ; touch /tmp/iNsT-a.$$ - for i in `find ${1#$P/} -type l` ; do - target=`readlink $i` - echo "$i -> $target" - echo $i$'\n'$target >> /tmp/iNsT-a.$$ - done - COUNT=1 - LINE=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - while [ -n "$LINE" ] ; do - LINKGOESIN=`dirname $LINE` - LINKNAMEIS=`basename $LINE` - COUNT=$(($COUNT + 1)) - LINKPOINTSTO=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - if [ ! -d install ] ; then mkdir install ; fi - cat <<- EOF >> install/doinst.sh - ( cd $LINKGOESIN ; rm -rf $LINKNAMEIS ) - ( cd $LINKGOESIN ; ln -sf $LINKPOINTSTO $LINKNAMEIS ) - EOF - rm -rf $LINE ; touch -t `date '+%m%d0900'` install/doinst.sh $LINE - COUNT=$(($COUNT + 1)) - LINE=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - done - rm -f /tmp/iNsT-a.$$ - ) fi -} - -convert() { - for i in {$P,$P/usr}/{sbin,bin} ; do prune_symlink $i ; done - for i in {$P,$P/usr}/$libdir ; do prune_symlink $i ; done - prune_symlink $infodir - for i in `seq 9` n ; do prune_symlink $mandir/man$i ; done -} - -fscheck -W=`pwd` -for i in `seq 0 $((${#src[@]} - 1))` ; do - S[$i]=$W/${src[$i]} ; B[$i]=$W/build`test ${#src[@]} -eq 1 || echo $i` -done -P=$W/work ; C=$W/pivot -infodir=$P/usr/share/info -mandir=$P/usr/share/man -docdir=$P/usr/share/doc -myname=`basename $0` -pkg=$pkgbase-$vers-$arch-$build -case $arch in x86_64) libdir=lib64 ;; *) libdir=lib ;; esac -if [ $# -eq 0 ] ; then - opt_download=1 ; opt_config=1 ; opt_build=1 ; opt_package=1 +if [ -f functions ] ; then + source ./functions +elif [ ! -f /usr/share/plamo/functions ] ; then + wget ftp://plamo.linet.gr.jp/pub/Plamo-src/admin/functions + source ./functions else - opt_download=0 ; opt_config=0 ; opt_build=0 ; opt_package=0 - for i in $@ ; do - case $i in - download) opt_download=1 ;; - config) opt_config=1 ;; - build) opt_build=1 ;; - package) opt_package=1 ;; - esac - done + source /usr/share/plamo/functions fi + +fscheck +prepare "$@" if [ $opt_download -eq 1 ] ; then - for i in $url ; do - if [ ! -f ${i##*/} ] ; then wget $i ; fi - done - for i in $url ; do - case ${i##*.} in - tar) tar xvpf ${i##*/} ;; - gz) tar xvpzf ${i##*/} ;; - bz2) tar xvpjf ${i##*/} ;; - esac - done + download_sources fi if [ $opt_config -eq 1 ] ; then 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 + apply_patches cd $B - gunzip -c $W/fbset_2.1-23.diff.gz | patch -Np1 -i - for i in `cat debian/patches/series` ; do patch -Np1 -i debian/patches/$i done for i in `seq 0 $((${#B[@]} - 1))` ; do cd ${B[$i]} - if [ -f Makefile ] ; then - make clean - fi - if [ -f config.log ] ; then - 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 @@ -229,12 +58,7 @@ done fi if [ $opt_package -eq 1 ] ; then - if [ `id -u` -ne 0 ] ; then - read -p "Do you want to package as root? [y/N] " ans - if [ "x$ans" == "xY" -o "x$ans" == "xy" ] ; then - cd $W ; /bin/su -c "$0 package" ; exit - fi - fi + root_priv if [ -d $P ] ; then rm -rf $P ; fi ; mkdir -p $P if [ -d $C ] ; then rm -rf $C ; fi ; mkdir -p $C touch $W/i.st ; sleep 1 @@ -249,24 +73,8 @@ find $P ! -type l -newer i.st ! -newer i.et \ -exec touch -t `date '+%m%d0900'` {} \; compress - for i in `seq 0 $((${#DOCS[@]} - 1))` ; do - for j in ${DOCS[$i]} ; do - for k in ${S[$i]}/$j ; do - install2 $k $docdir/${src[$i]}/${k#${S[$i]}/} - touch -r $k $docdir/${src[$i]}/${k#${S[$i]}/} - gzip_one $docdir/${src[$i]}/${k#${S[$i]}/} - done - done - if [ $i -eq 0 ] ; then - install $myname $docdir/$src - touch -t `date '+%m%d0900'` $docdir/$src/$myname - gzip_one $docdir/$src/$myname - else - ln $docdir/$src/$myname.gz $docdir/${src[$i]} - fi - ( cd $docdir ; find ${src[$i]} -type d -exec touch -r $W/{} {} \; ) - done - convert + setup_docdir + convert_links tar cvpf $pkg.tar -C $P `cd $P ; find bin | tail -n+2` tar rvpf $pkg.tar -C $P etc/fb.modes tar rvpf $pkg.tar -C $P `cd $P ; find usr/share/man/man1 | tail -n+2` @@ -274,6 +82,5 @@ tar rvpf $pkg.tar -C $P usr/share/doc/$src touch -t `date '+%m%d0900'` $pkg.tar ; xz $pkg.tar ; touch $pkg.tar.xz mv $pkg.tar.xz $pkg.txz - read -p "Do you want to keep work files? [y/N] " ans - if [ "x$ans" != "xY" -a "x$ans" != "xy" ] ; then rm -rf $P $C i.[se]t ; fi + cleanup fi --- plamo/00_base/old/file-20160407/PlamoBuild.file-5.22 2016-04-07 16:06:48.000000000 +0900 +++ plamo/00_base/file/PlamoBuild.file-5.22 2017-04-05 13:10:47.000000000 +0900 @@ -2,214 +2,44 @@ ###################################################################### url="ftp://ftp.astron.com/pub/file/file-5.22.tar.gz" +verify= +commitid= pkgbase=file vers=5.22 arch=`uname -m` -build=P5 +build=P6 src=$pkgbase-$vers +patchfiles="" OPT_CONFIG="" DOCS="AUTHORS COPYING ChangeLog INSTALL NEWS README TODO MAINT" +template=20170323 +tmplurl=ftp://plamo.linet.gr.jp/pub/Plamo-src/admin ###################################################################### -fscheck() { - PANGRAM="The quick brown fox jumps over the lazy dog." - echo -n "Checking for the filesystem ... " - mkdir pangram ; ( cd pangram ; touch $PANGRAM ) - mv pangram pangram~ ; mkdir pangram ; touch -r pangram~ pangram - tar cpf pangram.tar pangram ; rmdir pangram ; mv pangram~ pangram - for i in $PANGRAM ; do tar rpf pangram.tar pangram/$i ; done - touch -t `date '+%m%d0900'` pangram.tar ; gzip pangram.tar - touch pangram.tar.gz ; mv pangram.tar.gz pangram1.tgz - tar cpf pangram.tar pangram - touch -t `date '+%m%d0900'` pangram.tar ; gzip pangram.tar - touch pangram.tar.gz ; mv pangram.tar.gz pangram2.tgz - if cmp -s pangram1.tgz pangram2.tgz ; then - echo "OK" - rm -rf pangram pangram1.tgz pangram2.tgz - else - echo "NG" - cat <<- "EOF" - Hmm, packaging may not be done properly on this filesystem. - Would you please try again on a default filesystem, thanks! - - Happy packaging!! - - Quitting... - EOF - exit - fi -} - -install2() { - install -d ${2%/*} ; install -m 644 $1 $2 -} - -strip_bindir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - shopt -s nullglob - cd $1 - for i in * ; do - echo "$i" - if [ -h $i ] ; then continue ; fi - if [ -n "`file $i | grep "not stripped"`" ] ; then - echo "stripping -p $i" - strip -p $i - fi - done - ) fi -} - -strip_libdir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - shopt -s nullglob - cd $1 - for i in *.so *.so.* *.a ; do - echo "$i" - if [ -h $i ] ; then continue ; fi - if [ -n "`nm -a $i | grep " a "`" ] ; then - if [ $i != ${i%.a} ] ; then - echo -n "ranlib and " - touch -r $i $i.mt ; ranlib $i ; touch -r $i.mt $i ; rm $i.mt - fi - echo "stripping -gp $i" - strip -gp $i - fi - done - ) fi -} - -gzip_dir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - cd $1 - files=`ls -f --indicator-style=none | sed '/^\.\{1,2\}$/d'` - for i in $files ; do - echo "$i" - if [ ! -f $i -a ! -h $i -o $i != ${i%.gz} ] ; then continue ; fi - lnks=`ls -l $i | awk '{print $2}'` - if [ $lnks -gt 1 ] ; then - inum=`ls -i $i | awk '{print $1}'` - for j in `find . -maxdepth 1 -inum $inum` ; do - if [ ${j#./} == $i ] ; then - gzip -f $i - else - rm -f ${j#./} ; ln $i.gz ${j#./}.gz - fi - done - elif [ -h $i ] ; then - target=`readlink $i` ; rm -f $i ; ln -s $target.gz $i.gz - else - gzip $i - fi - done - for i in $files ; do mv ${i%.gz}.gz $C ; done - for i in $files ; do mv $C/${i%.gz}.gz . ; done - ) fi -} - -gzip_one() { - gzip $1 ; mv $1.gz $C ; mv $C/${1##*/}.gz ${1%/*} -} - -compress() { - for i in {$P,$P/usr}/{sbin,bin} ; do strip_bindir $i ; done - for i in {$P,$P/usr}/$libdir ; do strip_libdir $i ; done - if [ -f $infodir/dir ] ; then rm -f $infodir/dir ; fi - gzip_dir $infodir - for i in `seq 9` n ; do gzip_dir $mandir/man$i ; done -} - -prune_symlink() { - echo "pruning symlink in $1" - if [ -d $1 ] ; then ( - cd $P - rm -f /tmp/iNsT-a.$$ ; touch /tmp/iNsT-a.$$ - for i in `find ${1#$P/} -type l` ; do - target=`readlink $i` - echo "$i -> $target" - echo $i$'\n'$target >> /tmp/iNsT-a.$$ - done - COUNT=1 - LINE=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - while [ -n "$LINE" ] ; do - LINKGOESIN=`dirname $LINE` - LINKNAMEIS=`basename $LINE` - COUNT=$(($COUNT + 1)) - LINKPOINTSTO=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - if [ ! -d install ] ; then mkdir install ; fi - cat <<- EOF >> install/doinst.sh - ( cd $LINKGOESIN ; rm -rf $LINKNAMEIS ) - ( cd $LINKGOESIN ; ln -sf $LINKPOINTSTO $LINKNAMEIS ) - EOF - rm -rf $LINE ; touch -t `date '+%m%d0900'` install/doinst.sh $LINE - COUNT=$(($COUNT + 1)) - LINE=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - done - rm -f /tmp/iNsT-a.$$ - ) fi -} - -convert() { - for i in {$P,$P/usr}/{sbin,bin} ; do prune_symlink $i ; done - for i in {$P,$P/usr}/$libdir ; do prune_symlink $i ; done - prune_symlink $infodir - for i in `seq 9` n ; do prune_symlink $mandir/man$i ; done -} - -fscheck -W=`pwd` -for i in `seq 0 $((${#src[@]} - 1))` ; do - S[$i]=$W/${src[$i]} ; B[$i]=$W/build`test ${#src[@]} -eq 1 || echo $i` -done -P=$W/work ; C=$W/pivot -infodir=$P/usr/share/info -mandir=$P/usr/share/man -docdir=$P/usr/share/doc -myname=`basename $0` -pkg=$pkgbase-$vers-$arch-$build -case $arch in x86_64) libdir=lib64 ;; *) libdir=lib ;; esac -if [ $# -eq 0 ] ; then - opt_download=1 ; opt_config=1 ; opt_build=1 ; opt_package=1 +if [ -f functions ] ; then + source ./functions +elif [ ! -f /usr/share/plamo/functions ] ; then + wget ftp://plamo.linet.gr.jp/pub/Plamo-src/admin/functions + source ./functions else - opt_download=0 ; opt_config=0 ; opt_build=0 ; opt_package=0 - for i in $@ ; do - case $i in - download) opt_download=1 ;; - config) opt_config=1 ;; - build) opt_build=1 ;; - package) opt_package=1 ;; - esac - done + source /usr/share/plamo/functions fi + +fscheck +prepare "$@" if [ $opt_download -eq 1 ] ; then - for i in $url ; do - if [ ! -f ${i##*/} ] ; then wget $i ; fi - done - for i in $url ; do - case ${i##*.} in - tar) tar xvpf ${i##*/} ;; - gz) tar xvpzf ${i##*/} ;; - bz2) tar xvpjf ${i##*/} ;; - esac - done + download_sources fi if [ $opt_config -eq 1 ] ; then 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 + apply_patches for i in `seq 0 $((${#B[@]} - 1))` ; do cd ${B[$i]} - if [ -f Makefile ] ; then - make clean - fi - if [ -f config.log ] ; then - 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 @@ -223,12 +53,7 @@ done fi if [ $opt_package -eq 1 ] ; then - if [ `id -u` -ne 0 ] ; then - read -p "Do you want to package as root? [y/N] " ans - if [ "x$ans" == "xY" -o "x$ans" == "xy" ] ; then - cd $W ; /bin/su -c "$0 package" ; exit - fi - fi + root_priv if [ -d $P ] ; then rm -rf $P ; fi ; mkdir -p $P if [ -d $C ] ; then rm -rf $C ; fi ; mkdir -p $C touch $W/i.st ; sleep 1 @@ -243,24 +68,8 @@ find $P ! -type l -newer i.st ! -newer i.et \ -exec touch -t `date '+%m%d0900'` {} \; compress - for i in `seq 0 $((${#DOCS[@]} - 1))` ; do - for j in ${DOCS[$i]} ; do - for k in ${S[$i]}/$j ; do - install2 $k $docdir/${src[$i]}/${k#${S[$i]}/} - touch -r $k $docdir/${src[$i]}/${k#${S[$i]}/} - gzip_one $docdir/${src[$i]}/${k#${S[$i]}/} - done - done - if [ $i -eq 0 ] ; then - install $myname $docdir/$src - touch -t `date '+%m%d0900'` $docdir/$src/$myname - gzip_one $docdir/$src/$myname - else - ln $docdir/$src/$myname.gz $docdir/${src[$i]} - fi - ( cd $docdir ; find ${src[$i]} -type d -exec touch -r $W/{} {} \; ) - done - convert + setup_docdir + convert_links tar cvpf $pkg.tar -C $P `cd $P ; find usr/bin | 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/include | tail -n+2` @@ -273,6 +82,5 @@ tar rvpf $pkg.tar -C $P install/doinst.sh touch -t `date '+%m%d0900'` $pkg.tar ; xz $pkg.tar ; touch $pkg.tar.xz mv $pkg.tar.xz $pkg.txz - read -p "Do you want to keep work files? [y/N] " ans - if [ "x$ans" != "xY" -a "x$ans" != "xy" ] ; then rm -rf $P $C i.[se]t ; fi + cleanup fi --- plamo/00_base/old/findutils-20160824/PlamoBuild.findutils-4.6.0 2016-08-24 14:34:06.000000000 +0900 +++ plamo/00_base/findutils/PlamoBuild.findutils-4.6.0 2017-04-05 13:24:09.000000000 +0900 @@ -2,246 +2,42 @@ ###################################################################### url="http://ftp.gnu.org/gnu/findutils/findutils-4.6.0.tar.gz" +verify= +commitid= pkgbase=findutils vers=4.6.0 arch=`uname -m` -build=P4 +build=P5 src=$pkgbase-$vers patchfiles="" OPT_CONFIG="" DOCS="ABOUT-NLS README AUTHORS README-hacking NEWS THANKS INSTALL COPYING ChangeLog tool-versions.txt ChangeLog-2013 README-alpha TODO" +template=20170323 +tmplurl=ftp://plamo.linet.gr.jp/pub/Plamo-src/admin ###################################################################### -fscheck() { - PANGRAM="The quick brown fox jumps over the lazy dog." - echo -n "Checking for the filesystem ... " - mkdir pangram ; ( cd pangram ; touch $PANGRAM ) - mv pangram pangram~ ; mkdir pangram ; touch -r pangram~ pangram - tar cpf pangram.tar pangram ; rmdir pangram ; mv pangram~ pangram - for i in $PANGRAM ; do tar rpf pangram.tar pangram/$i ; done - touch -t `date '+%m%d0900'` pangram.tar ; gzip pangram.tar - touch pangram.tar.gz ; mv pangram.tar.gz pangram1.tgz - tar cpf pangram.tar pangram - touch -t `date '+%m%d0900'` pangram.tar ; gzip pangram.tar - touch pangram.tar.gz ; mv pangram.tar.gz pangram2.tgz - if cmp -s pangram1.tgz pangram2.tgz ; then - echo "OK" - rm -rf pangram pangram1.tgz pangram2.tgz - else - echo "NG" - cat <<- "EOF" - Hmm, packaging may not be done properly on this filesystem. - Would you please try again on a default filesystem, thanks! - - Happy packaging!! - - Quitting... - EOF - exit - fi -} - -install2() { - install -d ${2%/*} ; install -m 644 $1 $2 -} - -strip_bindir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - shopt -s nullglob - cd $1 - for i in * ; do - echo "$i" - if [ -h $i ] ; then continue ; fi - if [ -n "`file $i | grep "not stripped"`" ] ; then - echo "stripping -p $i" - strip -p $i - fi - done - ) fi -} - -strip_libdir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - shopt -s nullglob - cd $1 - for i in *.so *.so.* *.a ; do - echo "$i" - if [ -h $i ] ; then continue ; fi - if [ -n "`nm -a $i | grep " a "`" ] ; then - if [ $i != ${i%.a} ] ; then - echo -n "ranlib and " - touch -r $i $i.mt ; ranlib $i ; touch -r $i.mt $i ; rm $i.mt - fi - echo "stripping -gp $i" - strip -gp $i - fi - done - ) fi -} - -gzip_dir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - cd $1 - files=`ls -f --indicator-style=none | sed '/^\.\{1,2\}$/d'` - for i in $files ; do - echo "$i" - if [ ! -f $i -a ! -h $i -o $i != ${i%.gz} ] ; then continue ; fi - lnks=`ls -l $i | awk '{print $2}'` - if [ $lnks -gt 1 ] ; then - inum=`ls -i $i | awk '{print $1}'` - for j in `find . -maxdepth 1 -inum $inum` ; do - if [ ${j#./} == $i ] ; then - gzip -f $i - else - rm -f ${j#./} ; ln $i.gz ${j#./}.gz - fi - done - elif [ -h $i ] ; then - target=`readlink $i` ; rm -f $i ; ln -s $target.gz $i.gz - else - gzip $i - fi - done - for i in $files ; do mv ${i%.gz}.gz $C ; done - for i in $files ; do mv $C/${i%.gz}.gz . ; done - ) fi -} - -gzip_one() { - gzip $1 ; mv $1.gz $C ; mv $C/${1##*/}.gz ${1%/*} -} - -compress() { - for i in {$P,$P/usr}/{sbin,bin} ; do strip_bindir $i ; done - for i in {$P,$P/usr}/$libdir ; do strip_libdir $i ; done - if [ -f $infodir/dir ] ; then rm -f $infodir/dir ; fi - gzip_dir $infodir - for i in `seq 9` n ; do gzip_dir $mandir/man$i ; done -} - -prune_symlink() { - echo "pruning symlink in $1" - if [ -d $1 ] ; then ( - cd $P - rm -f /tmp/iNsT-a.$$ ; touch /tmp/iNsT-a.$$ - for i in `find ${1#$P/} -type l` ; do - target=`readlink $i` - echo "$i -> $target" - echo $i$'\n'$target >> /tmp/iNsT-a.$$ - done - COUNT=1 - LINE=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - while [ -n "$LINE" ] ; do - LINKGOESIN=`dirname $LINE` - LINKNAMEIS=`basename $LINE` - COUNT=$(($COUNT + 1)) - LINKPOINTSTO=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - if [ ! -d install ] ; then mkdir install ; fi - cat <<- EOF >> install/doinst.sh - ( cd $LINKGOESIN ; rm -rf $LINKNAMEIS ) - ( cd $LINKGOESIN ; ln -sf $LINKPOINTSTO $LINKNAMEIS ) - EOF - rm -rf $LINE ; touch -t `date '+%m%d0900'` install/doinst.sh $LINE - COUNT=$(($COUNT + 1)) - LINE=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - done - rm -f /tmp/iNsT-a.$$ - ) fi -} - -convert() { - for i in {$P,$P/usr}/{sbin,bin} ; do prune_symlink $i ; done - for i in {$P,$P/usr}/$libdir ; do prune_symlink $i ; done - prune_symlink $infodir - for i in `seq 9` n ; do prune_symlink $mandir/man$i ; done -} - -fscheck -W=`pwd` -for i in `seq 0 $((${#src[@]} - 1))` ; do - S[$i]=$W/${src[$i]} ; B[$i]=$W/build`test ${#src[@]} -eq 1 || echo $i` -done -P=$W/work ; C=$W/pivot -infodir=$P/usr/share/info -mandir=$P/usr/share/man -docdir=$P/usr/share/doc -myname=`basename $0` -pkg=$pkgbase-$vers-$arch-$build -case $arch in x86_64) libdir=lib64 ;; *) libdir=lib ;; esac -if [ $# -eq 0 ] ; then - opt_download=1 ; opt_config=1 ; opt_build=1 ; opt_package=1 +if [ -f functions ] ; then + source ./functions +elif [ ! -f /usr/share/plamo/functions ] ; then + wget ftp://plamo.linet.gr.jp/pub/Plamo-src/admin/functions + source ./functions else - opt_download=0 ; opt_config=0 ; opt_build=0 ; opt_package=0 - for i in $@ ; do - case $i in - download) opt_download=1 ;; - config) opt_config=1 ;; - build) opt_build=1 ;; - package) opt_package=1 ;; - esac - done + source /usr/share/plamo/functions fi + +fscheck +prepare "$@" if [ $opt_download -eq 1 ] ; then - for i in $url ; do - 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|tgz) tar xvpzf ${i##*/} ;; - bz2|tbz) tar xvpjf ${i##*/} ;; - xz|txz) tar xvpJf ${i##*/} ;; - esac - done + download_sources fi if [ $opt_config -eq 1 ] ; then 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 + apply_patches 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 - if [ -f config.log ] ; then - rm -rf config.cache config.log - fi if [ -x configure ] ; then ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --libdir='${exec_prefix}'/$libdir --infodir='${prefix}'/share/info \ @@ -258,12 +54,7 @@ done fi if [ $opt_package -eq 1 ] ; then - if [ `id -u` -ne 0 ] ; then - read -p "Do you want to package as root? [y/N] " ans - if [ "x$ans" == "xY" -o "x$ans" == "xy" ] ; then - cd $W ; /bin/su -c "$0 package" ; exit - fi - fi + root_priv if [ -d $P ] ; then rm -rf $P ; fi ; mkdir -p $P if [ -d $C ] ; then rm -rf $C ; fi ; mkdir -p $C touch $W/i.st ; sleep 1 @@ -280,24 +71,8 @@ find $P ! -type l -newer i.st ! -newer i.et \ -exec touch -t `date '+%m%d0900'` {} \; compress - for i in `seq 0 $((${#DOCS[@]} - 1))` ; do - for j in ${DOCS[$i]} ; do - for k in ${S[$i]}/$j ; do - install2 $k $docdir/${src[$i]}/${k#${S[$i]}/} - touch -r $k $docdir/${src[$i]}/${k#${S[$i]}/} - gzip_one $docdir/${src[$i]}/${k#${S[$i]}/} - done - done - if [ $i -eq 0 ] ; then - install $myname $docdir/$src - touch -t `date '+%m%d0900'` $docdir/$src/$myname - gzip_one $docdir/$src/$myname - else - ln $docdir/$src/$myname.gz $docdir/${src[$i]} - fi - ( cd $docdir ; find ${src[$i]} -type d -exec touch -r $W/{} {} \; ) - done - convert + setup_docdir + convert_links tar cvpf $pkg.tar -C $P `cd $P ; find usr/bin | 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/info | tail -n+2` @@ -305,6 +80,5 @@ tar rvpf $pkg.tar -C $P usr/share/doc/$src touch -t `date '+%m%d0900'` $pkg.tar ; xz $pkg.tar ; touch $pkg.tar.xz mv $pkg.tar.xz $pkg.txz - read -p "Do you want to keep work files? [y/N] " ans - if [ "x$ans" != "xY" -a "x$ans" != "xy" ] ; then rm -rf $P $C i.[se]t ; fi + cleanup fi --- plamo/00_base/old/gawk-20161109/PlamoBuild.gawk-4.1.4 2016-11-09 23:31:23.000000000 +0900 +++ plamo/00_base/gawk/PlamoBuild.gawk-4.1.4 2017-04-09 13:33:14.000000000 +0900 @@ -2,10 +2,12 @@ ###################################################################### url="http://ftp.gnu.org/gnu/gawk/gawk-4.1.4.tar.xz" +verify= +commitid= pkgbase=gawk vers=4.1.4 arch=`uname -m` -build=P1 +build=P2 src=$pkgbase-$vers patchfiles="" OPT_CONFIG="--without-mpfr" @@ -14,239 +16,31 @@ `echo README_d/README.{solaris,bootstrap,macosx,gcc-3,mpfr}` ChangeLog ChangeLog.0 ABOUT-NLS README NEWS.0 COPYING INSTALL AUTHORS" -template=20161020 +template=20170323 tmplurl=ftp://plamo.linet.gr.jp/pub/Plamo-src/admin ###################################################################### -fscheck() { - PANGRAM="The quick brown fox jumps over the lazy dog." - echo -n "Checking for the filesystem ... " - mkdir pangram ; ( cd pangram ; touch $PANGRAM ) - mv pangram pangram~ ; mkdir pangram ; touch -r pangram~ pangram - tar cpf pangram.tar pangram ; rmdir pangram ; mv pangram~ pangram - for i in $PANGRAM ; do tar rpf pangram.tar pangram/$i ; done - touch -t `date '+%m%d0900'` pangram.tar ; gzip pangram.tar - touch pangram.tar.gz ; mv pangram.tar.gz pangram1.tgz - tar cpf pangram.tar pangram - touch -t `date '+%m%d0900'` pangram.tar ; gzip pangram.tar - touch pangram.tar.gz ; mv pangram.tar.gz pangram2.tgz - if cmp -s pangram1.tgz pangram2.tgz ; then - echo "OK" - rm -rf pangram pangram1.tgz pangram2.tgz - else - echo "NG" - cat <<- "EOF" - Hmm, packaging may not be done properly on this filesystem. - Would you please try again on a default filesystem, thanks! - - Happy packaging!! - - Quitting... - EOF - exit - fi -} - -install2() { - install -d ${2%/*} ; install -m 644 $1 $2 -} - -strip_bindir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - shopt -s nullglob - cd $1 - for i in * ; do - echo "$i" - if [ -h $i ] ; then continue ; fi - if [ -n "`file $i | grep "not stripped"`" ] ; then - echo "stripping -p $i" - strip -p $i - fi - done - ) fi -} - -strip_libdir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - shopt -s nullglob - cd $1 - for i in *.so *.so.* *.a ; do - echo "$i" - if [ -h $i ] ; then continue ; fi - if [ -n "`nm -a $i | grep " a "`" ] ; then - if [ $i != ${i%.a} ] ; then - echo -n "ranlib and " - touch -r $i $i.mt ; ranlib $i ; touch -r $i.mt $i ; rm $i.mt - fi - echo "stripping -gp $i" - strip -gp $i - fi - done - ) fi -} - -gzip_dir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - cd $1 - files=`ls -f --indicator-style=none | sed '/^\.\{1,2\}$/d'` - for i in $files ; do - echo "$i" - if [ ! -f $i -a ! -h $i -o $i != ${i%.gz} ] ; then continue ; fi - lnks=`ls -l $i | awk '{print $2}'` - if [ $lnks -gt 1 ] ; then - inum=`ls -i $i | awk '{print $1}'` - for j in `find . -maxdepth 1 -inum $inum` ; do - if [ ${j#./} == $i ] ; then - gzip -f $i - else - rm -f ${j#./} ; ln $i.gz ${j#./}.gz - fi - done - elif [ -h $i ] ; then - target=`readlink $i` ; rm -f $i ; ln -s $target.gz $i.gz - else - gzip $i - fi - done - for i in $files ; do mv ${i%.gz}.gz $C ; done - for i in $files ; do mv $C/${i%.gz}.gz . ; done - ) fi -} - -gzip_one() { - gzip $1 ; mv $1.gz $C ; mv $C/${1##*/}.gz ${1%/*} -} - -compress() { - for i in {$P,$P/usr}/{sbin,bin} ; do strip_bindir $i ; done - for i in {$P,$P/usr}/$libdir ; do strip_libdir $i ; done - if [ -f $infodir/dir ] ; then rm -f $infodir/dir ; fi - gzip_dir $infodir - for i in `seq 9` n ; do gzip_dir $mandir/man$i ; done -} - -prune_symlink() { - echo "pruning symlink in $1" - if [ -d $1 ] ; then ( - cd $P - rm -f /tmp/iNsT-a.$$ ; touch /tmp/iNsT-a.$$ - for i in `find ${1#$P/} -type l` ; do - target=`readlink $i` - echo "$i -> $target" - echo $i$'\n'$target >> /tmp/iNsT-a.$$ - done - COUNT=1 - LINE=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - while [ -n "$LINE" ] ; do - LINKGOESIN=`dirname $LINE` - LINKNAMEIS=`basename $LINE` - COUNT=$(($COUNT + 1)) - LINKPOINTSTO=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - if [ ! -d install ] ; then mkdir install ; fi - cat <<- EOF >> install/doinst.sh - ( cd $LINKGOESIN ; rm -rf $LINKNAMEIS ) - ( cd $LINKGOESIN ; ln -sf $LINKPOINTSTO $LINKNAMEIS ) - EOF - rm -rf $LINE ; touch -t `date '+%m%d0900'` install/doinst.sh $LINE - COUNT=$(($COUNT + 1)) - LINE=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - done - rm -f /tmp/iNsT-a.$$ - ) fi -} - -convert() { - for i in {$P,$P/usr}/{sbin,bin} ; do prune_symlink $i ; done - for i in {$P,$P/usr}/$libdir ; do prune_symlink $i ; done - prune_symlink $infodir - for i in `seq 9` n ; do prune_symlink $mandir/man$i ; done -} - -fscheck -W=`pwd` -for i in `seq 0 $((${#src[@]} - 1))` ; do - S[$i]=$W/${src[$i]} ; B[$i]=$W/build`test ${#src[@]} -eq 1 || echo $i` -done -P=$W/work ; C=$W/pivot -infodir=$P/usr/share/info -mandir=$P/usr/share/man -docdir=$P/usr/share/doc -myname=`basename $0` -pkg=$pkgbase-$vers-$arch-$build -case $arch in x86_64) libdir=lib64 ;; *) libdir=lib ;; esac -if [ $# -eq 0 ] ; then - opt_download=1 ; opt_config=1 ; opt_build=1 ; opt_package=1 +if [ -f functions ] ; then + source ./functions +elif [ ! -f /usr/share/plamo/functions ] ; then + wget ftp://plamo.linet.gr.jp/pub/Plamo-src/admin/functions + source ./functions else - opt_download=0 ; opt_config=0 ; opt_build=0 ; opt_package=0 - for i in $@ ; do - case $i in - download) opt_download=1 ;; - config) opt_config=1 ;; - build) opt_build=1 ;; - package) opt_package=1 ;; - esac - done + source /usr/share/plamo/functions fi + +fscheck +prepare "$@" if [ $opt_download -eq 1 ] ; then - for i in $url ; do - 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|tgz) tar xvpzf ${i##*/} ;; - bz2|tbz) tar xvpjf ${i##*/} ;; - xz|txz) tar xvpJf ${i##*/} ;; - esac - done + download_sources fi if [ $opt_config -eq 1 ] ; then 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 + apply_patches 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 - if [ -f config.log ] ; then - rm -rf config.cache config.log - fi if [ -x configure ] ; then ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --libdir='${exec_prefix}'/$libdir --infodir='${prefix}'/share/info \ @@ -263,12 +57,7 @@ done fi if [ $opt_package -eq 1 ] ; then - if [ `id -u` -ne 0 ] ; then - read -p "Do you want to package as root? [y/N] " ans - if [ "x$ans" == "xY" -o "x$ans" == "xy" ] ; then - cd $W ; /bin/su -c "$0 package" ; exit - fi - fi + root_priv if [ -d $P ] ; then rm -rf $P ; fi ; mkdir -p $P if [ -d $C ] ; then rm -rf $C ; fi ; mkdir -p $C touch $W/i.st ; sleep 1 @@ -286,43 +75,13 @@ strip_bindir $P/usr/libexec/awk strip_libdir $P/usr/$libdir/gawk touch -t `date '+%m%d0900'` $P/usr/libexec/awk $P/usr/$libdir/gawk - for i in `seq 0 $((${#DOCS[@]} - 1))` ; do - for j in ${DOCS[$i]} ; do - for k in ${S[$i]}/$j ; do - install2 $k $docdir/${src[$i]}/${k#${S[$i]}/} - touch -r $k $docdir/${src[$i]}/${k#${S[$i]}/} - gzip_one $docdir/${src[$i]}/${k#${S[$i]}/} - done - done - if [ $i -eq 0 ] ; then - install $myname $docdir/$src - touch -t `date '+%m%d0900'` $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 - convert + setup_docdir + convert_links tar cvpf $pkg.tar -C $P `cd $P ; find usr/bin | tail -n+2` tar rvpf $pkg.tar -C $P usr/libexec/awk tar rvpf $pkg.tar -C $P usr/$libdir/gawk tar rvpf $pkg.tar -C $P `cd $P ; find usr/include | 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/locale -name *.mo` tar rvpf $pkg.tar -C $P usr/share/awk tar rvpf $pkg.tar -C $P `cd $P ; find usr/share/info | tail -n+2` tar rvpf $pkg.tar -C $P `cd $P ; find usr/share/man/man1 | tail -n+2` @@ -331,6 +90,5 @@ tar rvpf $pkg.tar -C $P install/doinst.sh touch -t `date '+%m%d0900'` $pkg.tar ; xz $pkg.tar ; touch $pkg.tar.xz mv $pkg.tar.xz $pkg.txz - read -p "Do you want to keep work files? [y/N] " ans - if [ "x$ans" != "xY" -a "x$ans" != "xy" ] ; then rm -rf $P $C i.[se]t ; fi + cleanup fi --- plamo/00_base/old/glibc-20180108/PlamoBuild.glibc-2.20 2018-01-08 06:18:13.000000000 +0900 +++ plamo/00_base/glibc/PlamoBuild.glibc-2.20 2018-04-21 17:04:05.000000000 +0900 @@ -18,7 +18,7 @@ pkgbase=glibc vers=2.20 arch=`uname -m` -build=P8 +build=P9 src=$pkgbase-$vers patchfiles="glibc-2.19-fhs-1.patch glibc-2.20-do_ftell_wide-memleak.patch glibc-2.20-getifaddrs_internal-segfault.patch @@ -137,6 +137,7 @@ /usr/$libdir/pstoedit /usr/heimdal/$libdir /usr/$libdir/xulrunner + /opt/mariadb/$libdir /opt/mysql/$libdir /opt/pgsql/$libdir EOF --- plamo/00_base/old/grep-20151231/PlamoBuild.grep-2.20 2015-12-31 14:07:40.000000000 +0900 +++ plamo/00_base/grep/PlamoBuild.grep-2.20 2017-04-05 23:21:23.000000000 +0900 @@ -2,219 +2,46 @@ ###################################################################### url="http://ftp.gnu.org/gnu/grep/grep-2.20.tar.xz - https://raw.githubusercontent.com/maximeh/buildroot/master/package/grep/0001-fix-CVE-2015-1345.patch" + ftp://plamo.linet.gr.jp/pub/Plamo-src/plamo/00_base/grep/0001-fix-CVE-2015-1345.patch" +verify= +commitid= pkgbase=grep vers=2.20 arch=`uname -m` -build=P3 +build=P4 src=$pkgbase-$vers +patchfiles="0001-fix-CVE-2015-1345.patch" OPT_CONFIG="--disable-perl-regexp" DOCS="INSTALL NEWS README AUTHORS ABOUT-NLS COPYING THANKS TODO ChangeLog-2009 README-alpha README-release ChangeLog" +template=20170323 +tmplurl=ftp://plamo.linet.gr.jp/pub/Plamo-src/admin ###################################################################### -fscheck() { - PANGRAM="The quick brown fox jumps over the lazy dog." - echo -n "Checking for the filesystem ... " - mkdir pangram ; ( cd pangram ; touch $PANGRAM ) - mv pangram pangram~ ; mkdir pangram ; touch -r pangram~ pangram - tar cpf pangram.tar pangram ; rmdir pangram ; mv pangram~ pangram - for i in $PANGRAM ; do tar rpf pangram.tar pangram/$i ; done - touch -t `date '+%m%d0900'` pangram.tar ; gzip pangram.tar - touch pangram.tar.gz ; mv pangram.tar.gz pangram1.tgz - tar cpf pangram.tar pangram - touch -t `date '+%m%d0900'` pangram.tar ; gzip pangram.tar - touch pangram.tar.gz ; mv pangram.tar.gz pangram2.tgz - if cmp -s pangram1.tgz pangram2.tgz ; then - echo "OK" - rm -rf pangram pangram1.tgz pangram2.tgz - else - echo "NG" - cat <<- "EOF" - Hmm, packaging may not be done properly on this filesystem. - Would you please try again on a default filesystem, thanks! - - Happy packaging!! - - Quitting... - EOF - exit - fi -} - -install2() { - install -d ${2%/*} ; install -m 644 $1 $2 -} - -strip_bindir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - shopt -s nullglob - cd $1 - for i in * ; do - echo "$i" - if [ -h $i ] ; then continue ; fi - if [ -n "`file $i | grep "not stripped"`" ] ; then - echo "stripping -p $i" - strip -p $i - fi - done - ) fi -} - -strip_libdir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - shopt -s nullglob - cd $1 - for i in *.so *.so.* *.a ; do - echo "$i" - if [ -h $i ] ; then continue ; fi - if [ -n "`nm -a $i | grep " a "`" ] ; then - if [ $i != ${i%.a} ] ; then - echo -n "ranlib and " - touch -r $i $i.mt ; ranlib $i ; touch -r $i.mt $i ; rm $i.mt - fi - echo "stripping -gp $i" - strip -gp $i - fi - done - ) fi -} - -gzip_dir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - cd $1 - files=`ls -f --indicator-style=none | sed '/^\.\{1,2\}$/d'` - for i in $files ; do - echo "$i" - if [ ! -f $i -a ! -h $i -o $i != ${i%.gz} ] ; then continue ; fi - lnks=`ls -l $i | awk '{print $2}'` - if [ $lnks -gt 1 ] ; then - inum=`ls -i $i | awk '{print $1}'` - for j in `find . -maxdepth 1 -inum $inum` ; do - if [ ${j#./} == $i ] ; then - gzip -f $i - else - rm -f ${j#./} ; ln $i.gz ${j#./}.gz - fi - done - elif [ -h $i ] ; then - target=`readlink $i` ; rm -f $i ; ln -s $target.gz $i.gz - else - gzip $i - fi - done - for i in $files ; do mv ${i%.gz}.gz $C ; done - for i in $files ; do mv $C/${i%.gz}.gz . ; done - ) fi -} - -gzip_one() { - gzip $1 ; mv $1.gz $C ; mv $C/${1##*/}.gz ${1%/*} -} - -compress() { - for i in {$P,$P/usr}/{sbin,bin} ; do strip_bindir $i ; done - for i in {$P,$P/usr}/$libdir ; do strip_libdir $i ; done - if [ -f $infodir/dir ] ; then rm -f $infodir/dir ; fi - gzip_dir $infodir - for i in `seq 9` n ; do gzip_dir $mandir/man$i ; done -} - -prune_symlink() { - echo "pruning symlink in $1" - if [ -d $1 ] ; then ( - cd $P - rm -f /tmp/iNsT-a.$$ ; touch /tmp/iNsT-a.$$ - for i in `find ${1#$P/} -type l` ; do - target=`readlink $i` - echo "$i -> $target" - echo $i$'\n'$target >> /tmp/iNsT-a.$$ - done - COUNT=1 - LINE=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - while [ -n "$LINE" ] ; do - LINKGOESIN=`dirname $LINE` - LINKNAMEIS=`basename $LINE` - COUNT=$(($COUNT + 1)) - LINKPOINTSTO=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - if [ ! -d install ] ; then mkdir install ; fi - cat <<- EOF >> install/doinst.sh - ( cd $LINKGOESIN ; rm -rf $LINKNAMEIS ) - ( cd $LINKGOESIN ; ln -sf $LINKPOINTSTO $LINKNAMEIS ) - EOF - rm -rf $LINE ; touch -t `date '+%m%d0900'` install/doinst.sh $LINE - COUNT=$(($COUNT + 1)) - LINE=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - done - rm -f /tmp/iNsT-a.$$ - ) fi -} - -convert() { - for i in {$P,$P/usr}/{sbin,bin} ; do prune_symlink $i ; done - for i in {$P,$P/usr}/$libdir ; do prune_symlink $i ; done - prune_symlink $infodir - for i in `seq 9` n ; do prune_symlink $mandir/man$i ; done -} - -fscheck -W=`pwd` -for i in `seq 0 $((${#src[@]} - 1))` ; do - S[$i]=$W/${src[$i]} ; B[$i]=$W/build`test ${#src[@]} -eq 1 || echo $i` -done -P=$W/work ; C=$W/pivot -infodir=$P/usr/share/info -mandir=$P/usr/share/man -docdir=$P/usr/share/doc -myname=`basename $0` -pkg=$pkgbase-$vers-$arch-$build -case $arch in x86_64) libdir=lib64 ;; *) libdir=lib ;; esac -if [ $# -eq 0 ] ; then - opt_download=1 ; opt_config=1 ; opt_build=1 ; opt_package=1 +if [ -f functions ] ; then + source ./functions +elif [ ! -f /usr/share/plamo/functions ] ; then + wget ftp://plamo.linet.gr.jp/pub/Plamo-src/admin/functions + source ./functions else - opt_download=0 ; opt_config=0 ; opt_build=0 ; opt_package=0 - for i in $@ ; do - case $i in - download) opt_download=1 ;; - config) opt_config=1 ;; - build) opt_build=1 ;; - package) opt_package=1 ;; - esac - done + source /usr/share/plamo/functions fi + +fscheck +prepare "$@" if [ $opt_download -eq 1 ] ; then - for i in $url ; do - if [ ! -f ${i##*/} ] ; then wget $i ; fi - done - for i in $url ; do - case ${i##*.} in - tar) tar xvpf ${i##*/} ;; - gz) tar xvpzf ${i##*/} ;; - bz2) tar xvpjf ${i##*/} ;; - xz) tar xvpJf ${i##*/} ;; - esac - done + download_sources fi if [ $opt_config -eq 1 ] ; then 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/0001-fix-CVE-2015-1345.patch + apply_patches for i in `seq 0 $((${#B[@]} - 1))` ; do cd ${B[$i]} - if [ -f Makefile ] ; then - make clean - fi - if [ -f config.log ] ; then - 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 @@ -228,12 +55,7 @@ done fi if [ $opt_package -eq 1 ] ; then - if [ `id -u` -ne 0 ] ; then - read -p "Do you want to package as root? [y/N] " ans - if [ "x$ans" == "xY" -o "x$ans" == "xy" ] ; then - cd $W ; /bin/su -c "$0 package" ; exit - fi - fi + root_priv if [ -d $P ] ; then rm -rf $P ; fi ; mkdir -p $P if [ -d $C ] ; then rm -rf $C ; fi ; mkdir -p $C touch $W/i.st ; sleep 1 @@ -248,30 +70,13 @@ find $P ! -type l -newer i.st ! -newer i.et \ -exec touch -t `date '+%m%d0900'` {} \; compress - for i in `seq 0 $((${#DOCS[@]} - 1))` ; do - for j in ${DOCS[$i]} ; do - for k in ${S[$i]}/$j ; do - install2 $k $docdir/${src[$i]}/${k#${S[$i]}/} - touch -r $k $docdir/${src[$i]}/${k#${S[$i]}/} - gzip_one $docdir/${src[$i]}/${k#${S[$i]}/} - done - done - if [ $i -eq 0 ] ; then - install $myname $docdir/$src - touch -t `date '+%m%d0900'` $docdir/$src/$myname - gzip_one $docdir/$src/$myname - else - ln $docdir/$src/$myname.gz $docdir/${src[$i]} - fi - ( cd $docdir ; find ${src[$i]} -type d -exec touch -r $W/{} {} \; ) - done - convert + setup_docdir + convert_links tar cvpf $pkg.tar -C $P `cd $P ; find usr/bin | 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/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 usr/share/doc/$src touch -t `date '+%m%d0900'` $pkg.tar ; xz $pkg.tar ; touch $pkg.tar.xz mv $pkg.tar.xz $pkg.txz - read -p "Do you want to keep work files? [y/N] " ans - if [ "x$ans" != "xY" -a "x$ans" != "xy" ] ; then rm -rf $P $C i.[se]t ; fi + cleanup fi --- plamo/00_base/old/groff-20160730/PlamoBuild.groff-1.18.1.1 2016-07-30 04:51:27.000000000 +0900 +++ plamo/00_base/groff/PlamoBuild.groff-1.18.1.1 2017-04-06 07:40:57.000000000 +0900 @@ -3,252 +3,45 @@ ###################################################################### url="http://ftp.gnu.org/gnu/groff/old/groff-1.18.1.1.tar.gz https://launchpad.net/ubuntu/+archive/primary/+files/groff_1.18.1.1-20.diff.gz - ftp://plamo.linet.gr.jp/pub/Plamo-src.new/plamo/00_base/groff/groff-1.18.1.1-fix-minus-char.patch.gz - ftp://plamo.linet.gr.jp/pub/Plamo-src.new/plamo/00_base/groff/groff-1.18.1.1-polyfill_fix.patch.gz" + ftp://plamo.linet.gr.jp/pub/Plamo-src/plamo/00_base/groff/groff-1.18.1.1-fix-minus-char.patch.gz + ftp://plamo.linet.gr.jp/pub/Plamo-src/plamo/00_base/groff/groff-1.18.1.1-polyfill_fix.patch.gz" +verify= +commitid= pkgbase=groff vers=1.18.1.1 arch=`uname -m` -build=P5 +build=P6 src=$pkgbase-$vers -patchfiles="" +patchfiles="groff_1.18.1.1-20.diff.gz + `echo groff-1.18.1.1-{fix-minus-char,polyfill_fix}.patch.gz`" OPT_CONFIG="--enable-multibyte" DOCS="BUG-REPORT COPYING ChangeLog FDL INSTALL* MANIFEST MORE.STUFF NEWS PROBLEMS PROJECTS README* REVISION TODO VERSION" +template=20170323 +tmplurl=ftp://plamo.linet.gr.jp/pub/Plamo-src/admin ###################################################################### -fscheck() { - PANGRAM="The quick brown fox jumps over the lazy dog." - echo -n "Checking for the filesystem ... " - mkdir pangram ; ( cd pangram ; touch $PANGRAM ) - mv pangram pangram~ ; mkdir pangram ; touch -r pangram~ pangram - tar cpf pangram.tar pangram ; rmdir pangram ; mv pangram~ pangram - for i in $PANGRAM ; do tar rpf pangram.tar pangram/$i ; done - touch -t `date '+%m%d0900'` pangram.tar ; gzip pangram.tar - touch pangram.tar.gz ; mv pangram.tar.gz pangram1.tgz - tar cpf pangram.tar pangram - touch -t `date '+%m%d0900'` pangram.tar ; gzip pangram.tar - touch pangram.tar.gz ; mv pangram.tar.gz pangram2.tgz - if cmp -s pangram1.tgz pangram2.tgz ; then - echo "OK" - rm -rf pangram pangram1.tgz pangram2.tgz - else - echo "NG" - cat <<- "EOF" - Hmm, packaging may not be done properly on this filesystem. - Would you please try again on a default filesystem, thanks! - - Happy packaging!! - - Quitting... - EOF - exit - fi -} - -install2() { - install -d ${2%/*} ; install -m 644 $1 $2 -} - -strip_bindir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - shopt -s nullglob - cd $1 - for i in * ; do - echo "$i" - if [ -h $i ] ; then continue ; fi - if [ -n "`file $i | grep "not stripped"`" ] ; then - echo "stripping -p $i" - strip -p $i - fi - done - ) fi -} - -strip_libdir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - shopt -s nullglob - cd $1 - for i in *.so *.so.* *.a ; do - echo "$i" - if [ -h $i ] ; then continue ; fi - if [ -n "`nm -a $i | grep " a "`" ] ; then - if [ $i != ${i%.a} ] ; then - echo -n "ranlib and " - touch -r $i $i.mt ; ranlib $i ; touch -r $i.mt $i ; rm $i.mt - fi - echo "stripping -gp $i" - strip -gp $i - fi - done - ) fi -} - -gzip_dir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - cd $1 - files=`ls -f --indicator-style=none | sed '/^\.\{1,2\}$/d'` - for i in $files ; do - echo "$i" - if [ ! -f $i -a ! -h $i -o $i != ${i%.gz} ] ; then continue ; fi - lnks=`ls -l $i | awk '{print $2}'` - if [ $lnks -gt 1 ] ; then - inum=`ls -i $i | awk '{print $1}'` - for j in `find . -maxdepth 1 -inum $inum` ; do - if [ ${j#./} == $i ] ; then - gzip -f $i - else - rm -f ${j#./} ; ln $i.gz ${j#./}.gz - fi - done - elif [ -h $i ] ; then - target=`readlink $i` ; rm -f $i ; ln -s $target.gz $i.gz - else - gzip $i - fi - done - for i in $files ; do mv ${i%.gz}.gz $C ; done - for i in $files ; do mv $C/${i%.gz}.gz . ; done - ) fi -} - -gzip_one() { - gzip $1 ; mv $1.gz $C ; mv $C/${1##*/}.gz ${1%/*} -} - -compress() { - for i in {$P,$P/usr}/{sbin,bin} ; do strip_bindir $i ; done - for i in {$P,$P/usr}/$libdir ; do strip_libdir $i ; done - if [ -f $infodir/dir ] ; then rm -f $infodir/dir ; fi - gzip_dir $infodir - for i in `seq 9` n ; do gzip_dir $mandir/man$i ; done -} - -prune_symlink() { - echo "pruning symlink in $1" - if [ -d $1 ] ; then ( - cd $P - rm -f /tmp/iNsT-a.$$ ; touch /tmp/iNsT-a.$$ - for i in `find ${1#$P/} -type l` ; do - target=`readlink $i` - echo "$i -> $target" - echo $i$'\n'$target >> /tmp/iNsT-a.$$ - done - COUNT=1 - LINE=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - while [ -n "$LINE" ] ; do - LINKGOESIN=`dirname $LINE` - LINKNAMEIS=`basename $LINE` - COUNT=$(($COUNT + 1)) - LINKPOINTSTO=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - if [ ! -d install ] ; then mkdir install ; fi - cat <<- EOF >> install/doinst.sh - ( cd $LINKGOESIN ; rm -rf $LINKNAMEIS ) - ( cd $LINKGOESIN ; ln -sf $LINKPOINTSTO $LINKNAMEIS ) - EOF - rm -rf $LINE ; touch -t `date '+%m%d0900'` install/doinst.sh $LINE - COUNT=$(($COUNT + 1)) - LINE=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - done - rm -f /tmp/iNsT-a.$$ - ) fi -} - -convert() { - for i in {$P,$P/usr}/{sbin,bin} ; do prune_symlink $i ; done - for i in {$P,$P/usr}/$libdir ; do prune_symlink $i ; done - prune_symlink $infodir - for i in `seq 9` n ; do prune_symlink $mandir/man$i ; done -} - -fscheck -W=`pwd` -for i in `seq 0 $((${#src[@]} - 1))` ; do - S[$i]=$W/${src[$i]} ; B[$i]=$W/build`test ${#src[@]} -eq 1 || echo $i` -done -P=$W/work ; C=$W/pivot -infodir=$P/usr/share/info -mandir=$P/usr/share/man -docdir=$P/usr/share/doc -myname=`basename $0` -pkg=$pkgbase-$vers-$arch-$build -case $arch in x86_64) libdir=lib64 ;; *) libdir=lib ;; esac -if [ $# -eq 0 ] ; then - opt_download=1 ; opt_config=1 ; opt_build=1 ; opt_package=1 +if [ -f functions ] ; then + source ./functions +elif [ ! -f /usr/share/plamo/functions ] ; then + wget ftp://plamo.linet.gr.jp/pub/Plamo-src/admin/functions + source ./functions else - opt_download=0 ; opt_config=0 ; opt_build=0 ; opt_package=0 - for i in $@ ; do - case $i in - download) opt_download=1 ;; - config) opt_config=1 ;; - build) opt_build=1 ;; - package) opt_package=1 ;; - esac - done + source /usr/share/plamo/functions fi + +fscheck +prepare "$@" if [ $opt_download -eq 1 ] ; then - for i in $url ; do - 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|tgz) tar xvpzf ${i##*/} ;; - bz2|tbz) tar xvpjf ${i##*/} ;; - xz|txz) tar xvpJf ${i##*/} ;; - esac - done + download_sources fi if [ $opt_config -eq 1 ] ; then 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 + apply_patches 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 - cd $B - gunzip -c $W/groff_1.18.1.1-20.diff.gz | patch -Np1 -i - - gunzip -c $W/groff-1.18.1.1-fix-minus-char.patch.gz | patch -Np1 -i - - gunzip -c $W/groff-1.18.1.1-polyfill_fix.patch.gz | patch -Np1 -i - - for i in `seq 0 $((${#B[@]} - 1))` ; do - cd ${B[$i]} - if [ -f Makefile ] ; then - make clean - fi - if [ -f config.log ] ; then - rm -rf config.cache config.log - fi if [ -x configure ] ; then ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --libdir='${exec_prefix}'/$libdir --infodir='${prefix}'/share/info \ @@ -265,12 +58,7 @@ done fi if [ $opt_package -eq 1 ] ; then - if [ `id -u` -ne 0 ] ; then - read -p "Do you want to package as root? [y/N] " ans - if [ "x$ans" == "xY" -o "x$ans" == "xy" ] ; then - cd $W ; /bin/su -c "$0 package" ; exit - fi - fi + root_priv if [ -d $P ] ; then rm -rf $P ; fi ; mkdir -p $P if [ -d $C ] ; then rm -rf $C ; fi ; mkdir -p $C touch $W/i.st ; sleep 1 @@ -293,37 +81,23 @@ find $P ! -type l -newer i.st ! -newer i.et \ -exec touch -t `date '+%m%d0900'` {} \; compress - for i in `seq 0 $((${#DOCS[@]} - 1))` ; do - for j in ${DOCS[$i]} ; do - for k in ${S[$i]}/$j ; do - install2 $k $docdir/${src[$i]}/${k#${S[$i]}/} - touch -r $k $docdir/${src[$i]}/${k#${S[$i]}/} - gzip_one $docdir/${src[$i]}/${k#${S[$i]}/} - done - done - if [ $i -eq 0 ] ; then - install $myname $docdir/$src - touch -t `date '+%m%d0900'` $docdir/$src/$myname - gzip_one $docdir/$src/$myname - else - ln $docdir/$src/$myname.gz $docdir/${src[$i]} - fi - ( cd $docdir ; find ${src[$i]} -type d -exec touch -r $W/{} {} \; ) - done + setup_docdir mv $gdocdir/{html,examples,me{ref,intro}.me,pic.ms} $docdir/$src mv $gdocdir/{me{ref,intro},pic}.ps $docdir/$src mv $docdir/$src/{html,examples,me{ref,intro}.me,pic.ms} $C mv $docdir/$src/{me{ref,intro},pic}.ps $C mv $docdir/$src/{BUG-REPORT,COPYING,ChangeLog,FDL,INSTALL*}.gz $C mv $docdir/$src/{MANIFEST,MORE.STUFF,NEWS,PROBLEMS,PROJECTS}.gz $C - mv $docdir/$src/{README*,REVISION,TODO,VERSION,$myname}.gz $C + mv $docdir/$src/{README*,REVISION,TODO,VERSION}.gz $C + mv $docdir/$src/{$func,$myname,$spec}.gz $C mv $C/{html,examples,me{ref,intro}.me,pic.ms} $docdir/$src mv $C/{me{ref,intro},pic}.ps $docdir/$src mv $C/{BUG-REPORT,COPYING,ChangeLog,FDL,INSTALL*}.gz $docdir/$src mv $C/{MANIFEST,MORE.STUFF,NEWS,PROBLEMS,PROJECTS}.gz $docdir/$src - mv $C/{README*,REVISION,TODO,VERSION,$myname}.gz $docdir/$src + mv $C/{README*,REVISION,TODO,VERSION}.gz $docdir/$src + mv $C/{$func,$myname,$spec}.gz $docdir/$src touch -r $S $docdir/$src - convert + convert_links tar cvpf $pkg.tar -C $P `cd $P ; find usr/bin | tail -n+2` tar rvpf $pkg.tar -C $P usr/$libdir/groff tar rvpf $pkg.tar -C $P usr/share/groff @@ -335,6 +109,5 @@ tar rvpf $pkg.tar -C $P install/doinst.sh touch -t `date '+%m%d0900'` $pkg.tar ; xz $pkg.tar ; touch $pkg.tar.xz mv $pkg.tar.xz $pkg.txz - read -p "Do you want to keep work files? [y/N] " ans - if [ "x$ans" != "xY" -a "x$ans" != "xy" ] ; then rm -rf $P $C i.[se]t ; fi + cleanup fi --- plamo/00_base/old/grub-20160621/PlamoBuild.grub-2.02~beta2 2016-06-21 22:41:23.000000000 +0900 +++ plamo/00_base/grub/PlamoBuild.grub-2.02~beta2 2017-04-09 13:33:34.000000000 +0900 @@ -1,245 +1,45 @@ #!/bin/sh ###################################################################### -url="http://http.debian.net/debian/pool/main/g/grub2/grub2_2.02~beta2.orig.tar.xz - http://http.debian.net/debian/pool/main/g/grub2/grub2_2.02~beta2-32.debian.tar.xz - ftp://plamo.linet.gr.jp/pub/Plamo-src.new/plamo/00_base/grub/plamo_grubconfig.tar.gz" +url="https://launchpad.net/ubuntu/+archive/primary/+files/grub2_2.02~beta2.orig.tar.xz + https://launchpad.net/ubuntu/+archive/primary/+files/grub2_2.02~beta2-32.debian.tar.xz + ftp://plamo.linet.gr.jp/pub/Plamo-src/plamo/00_base/grub/plamo_grubconfig.tar.gz" +verify= +commitid= pkgbase=grub vers=2.02~beta2 arch=`uname -m` -build=P13 +build=P14 src[0]=$pkgbase-$vers src[1]=${src[0]} -patchfiles[0]="" -patchfiles[1]="" +patchfiles="" OPT_CONFIG[0]="--disable-grub-mount --disable-werror" OPT_CONFIG[1]="${OPT_CONFIG[0]} --with-platform=efi" -DOCS[0]="BUGS TODO THANKS COPYING ABOUT-NLS ChangeLog AUTHORS README +DOCS="BUGS TODO THANKS COPYING ABOUT-NLS ChangeLog AUTHORS README NEWS INSTALL" -DOCS[1]="" +template=20170323 +tmplurl=ftp://plamo.linet.gr.jp/pub/Plamo-src/admin ###################################################################### -fscheck() { - PANGRAM="The quick brown fox jumps over the lazy dog." - echo -n "Checking for the filesystem ... " - mkdir pangram ; ( cd pangram ; touch $PANGRAM ) - mv pangram pangram~ ; mkdir pangram ; touch -r pangram~ pangram - tar cpf pangram.tar pangram ; rmdir pangram ; mv pangram~ pangram - for i in $PANGRAM ; do tar rpf pangram.tar pangram/$i ; done - touch -t `date '+%m%d0900'` pangram.tar ; gzip pangram.tar - touch pangram.tar.gz ; mv pangram.tar.gz pangram1.tgz - tar cpf pangram.tar pangram - touch -t `date '+%m%d0900'` pangram.tar ; gzip pangram.tar - touch pangram.tar.gz ; mv pangram.tar.gz pangram2.tgz - if cmp -s pangram1.tgz pangram2.tgz ; then - echo "OK" - rm -rf pangram pangram1.tgz pangram2.tgz - else - echo "NG" - cat <<- "EOF" - Hmm, packaging may not be done properly on this filesystem. - Would you please try again on a default filesystem, thanks! - - Happy packaging!! - - Quitting... - EOF - exit - fi -} - -install2() { - install -d ${2%/*} ; install -m 644 $1 $2 -} - -strip_bindir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - shopt -s nullglob - cd $1 - for i in * ; do - echo "$i" - if [ -h $i ] ; then continue ; fi - if [ -n "`file $i | grep "not stripped"`" ] ; then - echo "stripping -p $i" - strip -p $i - fi - done - ) fi -} - -strip_libdir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - shopt -s nullglob - cd $1 - for i in *.so *.so.* *.a ; do - echo "$i" - if [ -h $i ] ; then continue ; fi - if [ -n "`nm -a $i | grep " a "`" ] ; then - if [ $i != ${i%.a} ] ; then - echo -n "ranlib and " - touch -r $i $i.mt ; ranlib $i ; touch -r $i.mt $i ; rm $i.mt - fi - echo "stripping -gp $i" - strip -gp $i - fi - done - ) fi -} - -gzip_dir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - cd $1 - files=`ls -f --indicator-style=none | sed '/^\.\{1,2\}$/d'` - for i in $files ; do - echo "$i" - if [ ! -f $i -a ! -h $i -o $i != ${i%.gz} ] ; then continue ; fi - lnks=`ls -l $i | awk '{print $2}'` - if [ $lnks -gt 1 ] ; then - inum=`ls -i $i | awk '{print $1}'` - for j in `find . -maxdepth 1 -inum $inum` ; do - if [ ${j#./} == $i ] ; then - gzip -f $i - else - rm -f ${j#./} ; ln $i.gz ${j#./}.gz - fi - done - elif [ -h $i ] ; then - target=`readlink $i` ; rm -f $i ; ln -s $target.gz $i.gz - else - gzip $i - fi - done - for i in $files ; do mv ${i%.gz}.gz $C ; done - for i in $files ; do mv $C/${i%.gz}.gz . ; done - ) fi -} - -gzip_one() { - gzip $1 ; mv $1.gz $C ; mv $C/${1##*/}.gz ${1%/*} -} - -compress() { - for i in {$P,$P/usr}/{sbin,bin} ; do strip_bindir $i ; done - for i in {$P,$P/usr}/$libdir ; do strip_libdir $i ; done - if [ -f $infodir/dir ] ; then rm -f $infodir/dir ; fi - gzip_dir $infodir - for i in `seq 9` n ; do gzip_dir $mandir/man$i ; done -} - -prune_symlink() { - echo "pruning symlink in $1" - if [ -d $1 ] ; then ( - cd $P - rm -f /tmp/iNsT-a.$$ ; touch /tmp/iNsT-a.$$ - for i in `find ${1#$P/} -type l` ; do - target=`readlink $i` - echo "$i -> $target" - echo $i$'\n'$target >> /tmp/iNsT-a.$$ - done - COUNT=1 - LINE=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - while [ -n "$LINE" ] ; do - LINKGOESIN=`dirname $LINE` - LINKNAMEIS=`basename $LINE` - COUNT=$(($COUNT + 1)) - LINKPOINTSTO=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - if [ ! -d install ] ; then mkdir install ; fi - cat <<- EOF >> install/doinst.sh - ( cd $LINKGOESIN ; rm -rf $LINKNAMEIS ) - ( cd $LINKGOESIN ; ln -sf $LINKPOINTSTO $LINKNAMEIS ) - EOF - rm -rf $LINE ; touch -t `date '+%m%d0900'` install/doinst.sh $LINE - COUNT=$(($COUNT + 1)) - LINE=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - done - rm -f /tmp/iNsT-a.$$ - ) fi -} - -convert() { - for i in {$P,$P/usr}/{sbin,bin} ; do prune_symlink $i ; done - for i in {$P,$P/usr}/$libdir ; do prune_symlink $i ; done - prune_symlink $infodir - for i in `seq 9` n ; do prune_symlink $mandir/man$i ; done -} - -fscheck -W=`pwd` -for i in `seq 0 $((${#src[@]} - 1))` ; do - S[$i]=$W/${src[$i]} ; B[$i]=$W/build`test ${#src[@]} -eq 1 || echo $i` -done -P=$W/work ; C=$W/pivot -infodir=$P/usr/share/info -mandir=$P/usr/share/man -docdir=$P/usr/share/doc -myname=`basename $0` -pkg=$pkgbase-$vers-$arch-$build -case $arch in x86_64) libdir=lib64 ;; *) libdir=lib ;; esac -if [ $# -eq 0 ] ; then - opt_download=1 ; opt_config=1 ; opt_build=1 ; opt_package=1 +if [ -f functions ] ; then + source ./functions +elif [ ! -f /usr/share/plamo/functions ] ; then + wget ftp://plamo.linet.gr.jp/pub/Plamo-src/admin/functions + source ./functions else - opt_download=0 ; opt_config=0 ; opt_build=0 ; opt_package=0 - for i in $@ ; do - case $i in - download) opt_download=1 ;; - config) opt_config=1 ;; - build) opt_build=1 ;; - package) opt_package=1 ;; - esac - done + source /usr/share/plamo/functions fi + +fscheck +prepare "$@" if [ $opt_download -eq 1 ] ; then - for i in $url ; do - 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|tgz) tar xvpzf ${i##*/} ;; - bz2|tbz) tar xvpjf ${i##*/} ;; - xz|txz) tar xvpJf ${i##*/} ;; - esac - done + download_sources fi if [ $opt_config -eq 1 ] ; then 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 - 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 + apply_patches for i in `seq 0 $((${#B[@]} - 1))` ; do cd ${B[$i]} for j in `cat $W/debian/patches/series` ; do @@ -251,12 +51,6 @@ done for i in `seq 0 $((${#B[@]} - 1))` ; do cd ${B[$i]} - if [ -f Makefile ] ; then - make clean - fi - if [ -f config.log ] ; then - rm -rf config.cache config.log - fi if [ -x configure ] ; then ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --libdir='${exec_prefix}'/$libdir --infodir='${prefix}'/share/info \ @@ -273,12 +67,7 @@ done fi if [ $opt_package -eq 1 ] ; then - if [ `id -u` -ne 0 ] ; then - read -p "Do you want to package as root? [y/N] " ans - if [ "x$ans" == "xY" -o "x$ans" == "xy" ] ; then - cd $W ; /bin/su -c "$0 package" ; exit - fi - fi + root_priv if [ -d $P ] ; then rm -rf $P ; fi ; mkdir -p $P if [ -d $C ] ; then rm -rf $C ; fi ; mkdir -p $C touch $W/i.st ; sleep 1 @@ -317,30 +106,14 @@ find $P ! -type l -newer i.st ! -newer i.et \ -exec touch -t `date '+%m%d0900'` {} \; compress - for i in `seq 0 $((${#DOCS[@]} - 1))` ; do - for j in ${DOCS[$i]} ; do - for k in ${S[$i]}/$j ; do - install2 $k $docdir/${src[$i]}/${k#${S[$i]}/} - touch -r $k $docdir/${src[$i]}/${k#${S[$i]}/} - gzip_one $docdir/${src[$i]}/${k#${S[$i]}/} - done - done - if [ $i -eq 0 ] ; then - install $myname $docdir/$src - touch -t `date '+%m%d0900'` $docdir/$src/$myname - gzip_one $docdir/$src/$myname - else - false && ln $docdir/$src/$myname.gz $docdir/${src[$i]} - fi - ( cd $docdir ; find ${src[$i]} -type d -exec touch -r $W/{} {} \; ) - done - convert + setup_docdir + convert_links tar cvpf $pkg.tar -C $P `cd $P ; find sbin | 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 usr/$libdir/grub tar rvpf $pkg.tar -C $P usr/share/grub - 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/locale -name *.mo` tar rvpf $pkg.tar -C $P `cd $P ; find usr/share/info | tail -n+2` tar rvpf $pkg.tar -C $P etc/grub.d tar rvpf $pkg.tar -C $P `cd $P ; find etc/bash_completion.d | tail -n+2` @@ -349,6 +122,5 @@ tar rvpf $pkg.tar -C $P usr/share/doc/$src touch -t `date '+%m%d0900'` $pkg.tar ; xz $pkg.tar ; touch $pkg.tar.xz mv $pkg.tar.xz $pkg.txz - read -p "Do you want to keep work files? [y/N] " ans - if [ "x$ans" != "xY" -a "x$ans" != "xy" ] ; then rm -rf $P $C i.[se]t ; fi + cleanup fi --- plamo/00_base/old/gzip-20161120/PlamoBuild.gzip-1.8 2016-11-20 13:16:18.000000000 +0900 +++ plamo/00_base/gzip/PlamoBuild.gzip-1.8 2017-04-05 17:21:57.000000000 +0900 @@ -2,248 +2,42 @@ ###################################################################### url="http://ftp.gnu.org/gnu/gzip/gzip-1.8.tar.gz" +verify= +commitid= pkgbase=gzip vers=1.8 arch=`uname -m` -build=P1 +build=P2 src=$pkgbase-$vers patchfiles="" OPT_CONFIG="--bindir=/bin" DOCS="NEWS INSTALL COPYING README AUTHORS ChangeLog algorithm.doc README-release ChangeLog-2007 TODO THANKS" -template=20161020 +template=20170323 tmplurl=ftp://plamo.linet.gr.jp/pub/Plamo-src/admin ###################################################################### -fscheck() { - PANGRAM="The quick brown fox jumps over the lazy dog." - echo -n "Checking for the filesystem ... " - mkdir pangram ; ( cd pangram ; touch $PANGRAM ) - mv pangram pangram~ ; mkdir pangram ; touch -r pangram~ pangram - tar cpf pangram.tar pangram ; rmdir pangram ; mv pangram~ pangram - for i in $PANGRAM ; do tar rpf pangram.tar pangram/$i ; done - touch -t `date '+%m%d0900'` pangram.tar ; gzip pangram.tar - touch pangram.tar.gz ; mv pangram.tar.gz pangram1.tgz - tar cpf pangram.tar pangram - touch -t `date '+%m%d0900'` pangram.tar ; gzip pangram.tar - touch pangram.tar.gz ; mv pangram.tar.gz pangram2.tgz - if cmp -s pangram1.tgz pangram2.tgz ; then - echo "OK" - rm -rf pangram pangram1.tgz pangram2.tgz - else - echo "NG" - cat <<- "EOF" - Hmm, packaging may not be done properly on this filesystem. - Would you please try again on a default filesystem, thanks! - - Happy packaging!! - - Quitting... - EOF - exit - fi -} - -install2() { - install -d ${2%/*} ; install -m 644 $1 $2 -} - -strip_bindir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - shopt -s nullglob - cd $1 - for i in * ; do - echo "$i" - if [ -h $i ] ; then continue ; fi - if [ -n "`file $i | grep "not stripped"`" ] ; then - echo "stripping -p $i" - strip -p $i - fi - done - ) fi -} - -strip_libdir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - shopt -s nullglob - cd $1 - for i in *.so *.so.* *.a ; do - echo "$i" - if [ -h $i ] ; then continue ; fi - if [ -n "`nm -a $i | grep " a "`" ] ; then - if [ $i != ${i%.a} ] ; then - echo -n "ranlib and " - touch -r $i $i.mt ; ranlib $i ; touch -r $i.mt $i ; rm $i.mt - fi - echo "stripping -gp $i" - strip -gp $i - fi - done - ) fi -} - -gzip_dir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - cd $1 - files=`ls -f --indicator-style=none | sed '/^\.\{1,2\}$/d'` - for i in $files ; do - echo "$i" - if [ ! -f $i -a ! -h $i -o $i != ${i%.gz} ] ; then continue ; fi - lnks=`ls -l $i | awk '{print $2}'` - if [ $lnks -gt 1 ] ; then - inum=`ls -i $i | awk '{print $1}'` - for j in `find . -maxdepth 1 -inum $inum` ; do - if [ ${j#./} == $i ] ; then - gzip -f $i - else - rm -f ${j#./} ; ln $i.gz ${j#./}.gz - fi - done - elif [ -h $i ] ; then - target=`readlink $i` ; rm -f $i ; ln -s $target.gz $i.gz - else - gzip $i - fi - done - for i in $files ; do mv ${i%.gz}.gz $C ; done - for i in $files ; do mv $C/${i%.gz}.gz . ; done - ) fi -} - -gzip_one() { - gzip $1 ; mv $1.gz $C ; mv $C/${1##*/}.gz ${1%/*} -} - -compress() { - for i in {$P,$P/usr}/{sbin,bin} ; do strip_bindir $i ; done - for i in {$P,$P/usr}/$libdir ; do strip_libdir $i ; done - if [ -f $infodir/dir ] ; then rm -f $infodir/dir ; fi - gzip_dir $infodir - for i in `seq 9` n ; do gzip_dir $mandir/man$i ; done -} - -prune_symlink() { - echo "pruning symlink in $1" - if [ -d $1 ] ; then ( - cd $P - rm -f /tmp/iNsT-a.$$ ; touch /tmp/iNsT-a.$$ - for i in `find ${1#$P/} -type l` ; do - target=`readlink $i` - echo "$i -> $target" - echo $i$'\n'$target >> /tmp/iNsT-a.$$ - done - COUNT=1 - LINE=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - while [ -n "$LINE" ] ; do - LINKGOESIN=`dirname $LINE` - LINKNAMEIS=`basename $LINE` - COUNT=$(($COUNT + 1)) - LINKPOINTSTO=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - if [ ! -d install ] ; then mkdir install ; fi - cat <<- EOF >> install/doinst.sh - ( cd $LINKGOESIN ; rm -rf $LINKNAMEIS ) - ( cd $LINKGOESIN ; ln -sf $LINKPOINTSTO $LINKNAMEIS ) - EOF - rm -rf $LINE ; touch -t `date '+%m%d0900'` install/doinst.sh $LINE - COUNT=$(($COUNT + 1)) - LINE=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - done - rm -f /tmp/iNsT-a.$$ - ) fi -} - -convert() { - for i in {$P,$P/usr}/{sbin,bin} ; do prune_symlink $i ; done - for i in {$P,$P/usr}/$libdir ; do prune_symlink $i ; done - prune_symlink $infodir - for i in `seq 9` n ; do prune_symlink $mandir/man$i ; done -} - -fscheck -W=`pwd` -for i in `seq 0 $((${#src[@]} - 1))` ; do - S[$i]=$W/${src[$i]} ; B[$i]=$W/build`test ${#src[@]} -eq 1 || echo $i` -done -P=$W/work ; C=$W/pivot -infodir=$P/usr/share/info -mandir=$P/usr/share/man -docdir=$P/usr/share/doc -myname=`basename $0` -pkg=$pkgbase-$vers-$arch-$build -case $arch in x86_64) libdir=lib64 ;; *) libdir=lib ;; esac -if [ $# -eq 0 ] ; then - opt_download=1 ; opt_config=1 ; opt_build=1 ; opt_package=1 +if [ -f functions ] ; then + source ./functions +elif [ ! -f /usr/share/plamo/functions ] ; then + wget ftp://plamo.linet.gr.jp/pub/Plamo-src/admin/functions + source ./functions else - opt_download=0 ; opt_config=0 ; opt_build=0 ; opt_package=0 - for i in $@ ; do - case $i in - download) opt_download=1 ;; - config) opt_config=1 ;; - build) opt_build=1 ;; - package) opt_package=1 ;; - esac - done + source /usr/share/plamo/functions fi + +fscheck +prepare "$@" if [ $opt_download -eq 1 ] ; then - for i in $url ; do - 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|tgz) tar xvpzf ${i##*/} ;; - bz2|tbz) tar xvpjf ${i##*/} ;; - xz|txz) tar xvpJf ${i##*/} ;; - esac - done + download_sources fi if [ $opt_config -eq 1 ] ; then 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 + apply_patches 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 - if [ -f config.log ] ; then - rm -rf config.cache config.log - fi if [ -x configure ] ; then ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --libdir='${exec_prefix}'/$libdir --infodir='${prefix}'/share/info \ @@ -260,12 +54,7 @@ done fi if [ $opt_package -eq 1 ] ; then - if [ `id -u` -ne 0 ] ; then - read -p "Do you want to package as root? [y/N] " ans - if [ "x$ans" == "xY" -o "x$ans" == "xy" ] ; then - cd $W ; /bin/su -c "$0 package" ; exit - fi - fi + root_priv if [ -d $P ] ; then rm -rf $P ; fi ; mkdir -p $P if [ -d $C ] ; then rm -rf $C ; fi ; mkdir -p $C touch $W/i.st ; sleep 1 @@ -282,38 +71,8 @@ find $P ! -type l -newer i.st ! -newer i.et \ -exec touch -t `date '+%m%d0900'` {} \; compress - for i in `seq 0 $((${#DOCS[@]} - 1))` ; do - for j in ${DOCS[$i]} ; do - for k in ${S[$i]}/$j ; do - install2 $k $docdir/${src[$i]}/${k#${S[$i]}/} - touch -r $k $docdir/${src[$i]}/${k#${S[$i]}/} - gzip_one $docdir/${src[$i]}/${k#${S[$i]}/} - done - done - if [ $i -eq 0 ] ; then - install $myname $docdir/$src - touch -t `date '+%m%d0900'` $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 - convert + setup_docdir + convert_links tar cvpf $pkg.tar -C $P `cd $P ; find bin | 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/share/info | tail -n+2` @@ -321,6 +80,5 @@ tar rvpf $pkg.tar -C $P usr/share/doc/$src touch -t `date '+%m%d0900'` $pkg.tar ; xz $pkg.tar ; touch $pkg.tar.xz mv $pkg.tar.xz $pkg.txz - read -p "Do you want to keep work files? [y/N] " ans - if [ "x$ans" != "xY" -a "x$ans" != "xy" ] ; then rm -rf $P $C i.[se]t ; fi + cleanup fi --- plamo/00_base/old/hdsetup-20170407/PlamoBuild.hdsetup-6.2 2017-04-07 13:06:40.000000000 +0900 +++ plamo/00_base/hdsetup/PlamoBuild.hdsetup-6.2 2018-01-26 08:36:44.000000000 +0900 @@ -14,11 +14,13 @@ ftp://plamo.linet.gr.jp/pub/Plamo-src/plamo/00_base/tar/tar-1.26-no-gets.patch.gz ftp://plamo.linet.gr.jp/pub/Plamo-src/plamo/00_base/hdsetup/hdsetup-plamoscripts.tar.gz" verify= +digest= +branch= commitid= pkgbase=hdsetup vers=6.2 arch=`uname -m` -build=P2 +build=P3 src[0]=busybox-1.25.1 src[1]=dialog-1.3-20160828 src[2]=coreutils-8.25 @@ -47,7 +49,7 @@ --disable-lzmainfo --disable-lzma-links --disable-scripts" OPT_CONFIG[6]="--bindir=/bin" DOCS="LICENSE INSTALL TODO AUTHORS README TODO_unicode" -template=20170323 +template=20170713 tmplurl=ftp://plamo.linet.gr.jp/pub/Plamo-src/admin ###################################################################### --- plamo/00_base/old/hibernate_script-20160107/PlamoBuild.hibernate_script-2.0 2016-01-07 13:18:05.000000000 +0900 +++ plamo/00_base/hibernate_script/PlamoBuild.hibernate_script-2.0 2017-04-07 14:36:04.000000000 +0900 @@ -1,218 +1,48 @@ #!/bin/sh ###################################################################### -url="http://tuxonice.net/files/hibernate-script-2.0.tar.gz" +url="http://tuxonice.nigelcunningham.com.au/downloads/all/hibernate-script-2.0.tar.gz" +verify= +commitid= pkgbase=hibernate_script vers=2.0 arch=noarch -build=P4 +build=P5 src=hibernate-script-$vers +patchfiles="" OPT_CONFIG="" DOCS="COPYING SCRIPTLET-API README.xfs README CHANGELOG" +template=20170323 +tmplurl=ftp://plamo.linet.gr.jp/pub/Plamo-src/admin ###################################################################### -fscheck() { - PANGRAM="The quick brown fox jumps over the lazy dog." - echo -n "Checking for the filesystem ... " - mkdir pangram ; ( cd pangram ; touch $PANGRAM ) - mv pangram pangram~ ; mkdir pangram ; touch -r pangram~ pangram - tar cpf pangram.tar pangram ; rmdir pangram ; mv pangram~ pangram - for i in $PANGRAM ; do tar rpf pangram.tar pangram/$i ; done - touch -t `date '+%m%d0900'` pangram.tar ; gzip pangram.tar - touch pangram.tar.gz ; mv pangram.tar.gz pangram1.tgz - tar cpf pangram.tar pangram - touch -t `date '+%m%d0900'` pangram.tar ; gzip pangram.tar - touch pangram.tar.gz ; mv pangram.tar.gz pangram2.tgz - if cmp -s pangram1.tgz pangram2.tgz ; then - echo "OK" - rm -rf pangram pangram1.tgz pangram2.tgz - else - echo "NG" - cat <<- "EOF" - Hmm, packaging may not be done properly on this filesystem. - Would you please try again on a default filesystem, thanks! - - Happy packaging!! - - Quitting... - EOF - exit - fi -} - -install2() { - install -d ${2%/*} ; install -m 644 $1 $2 -} - -strip_bindir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - shopt -s nullglob - cd $1 - for i in * ; do - echo "$i" - if [ -h $i ] ; then continue ; fi - if [ -n "`file $i | grep "not stripped"`" ] ; then - echo "stripping -p $i" - strip -p $i - fi - done - ) fi -} - -strip_libdir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - shopt -s nullglob - cd $1 - for i in *.so *.so.* *.a ; do - echo "$i" - if [ -h $i ] ; then continue ; fi - if [ -n "`nm -a $i | grep " a "`" ] ; then - if [ $i != ${i%.a} ] ; then - echo -n "ranlib and " - touch -r $i $i.mt ; ranlib $i ; touch -r $i.mt $i ; rm $i.mt - fi - echo "stripping -gp $i" - strip -gp $i - fi - done - ) fi -} - -gzip_dir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - cd $1 - files=`ls -f --indicator-style=none | sed '/^\.\{1,2\}$/d'` - for i in $files ; do - echo "$i" - if [ ! -f $i -a ! -h $i -o $i != ${i%.gz} ] ; then continue ; fi - lnks=`ls -l $i | awk '{print $2}'` - if [ $lnks -gt 1 ] ; then - inum=`ls -i $i | awk '{print $1}'` - for j in `find . -maxdepth 1 -inum $inum` ; do - if [ ${j#./} == $i ] ; then - gzip -f $i - else - rm -f ${j#./} ; ln $i.gz ${j#./}.gz - fi - done - elif [ -h $i ] ; then - target=`readlink $i` ; rm -f $i ; ln -s $target.gz $i.gz - else - gzip $i - fi - done - for i in $files ; do mv ${i%.gz}.gz $C ; done - for i in $files ; do mv $C/${i%.gz}.gz . ; done - ) fi -} - -gzip_one() { - gzip $1 ; mv $1.gz $C ; mv $C/${1##*/}.gz ${1%/*} -} - -compress() { - for i in {$P,$P/usr}/{sbin,bin} ; do strip_bindir $i ; done - for i in {$P,$P/usr}/$libdir ; do strip_libdir $i ; done - if [ -f $infodir/dir ] ; then rm -f $infodir/dir ; fi - gzip_dir $infodir - for i in `seq 9` n ; do gzip_dir $mandir/man$i ; done -} - -prune_symlink() { - echo "pruning symlink in $1" - if [ -d $1 ] ; then ( - cd $P - rm -f /tmp/iNsT-a.$$ ; touch /tmp/iNsT-a.$$ - for i in `find ${1#$P/} -type l` ; do - target=`readlink $i` - echo "$i -> $target" - echo $i$'\n'$target >> /tmp/iNsT-a.$$ - done - COUNT=1 - LINE=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - while [ -n "$LINE" ] ; do - LINKGOESIN=`dirname $LINE` - LINKNAMEIS=`basename $LINE` - COUNT=$(($COUNT + 1)) - LINKPOINTSTO=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - if [ ! -d install ] ; then mkdir install ; fi - cat <<- EOF >> install/doinst.sh - ( cd $LINKGOESIN ; rm -rf $LINKNAMEIS ) - ( cd $LINKGOESIN ; ln -sf $LINKPOINTSTO $LINKNAMEIS ) - EOF - rm -rf $LINE ; touch -t `date '+%m%d0900'` install/doinst.sh $LINE - COUNT=$(($COUNT + 1)) - LINE=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - done - rm -f /tmp/iNsT-a.$$ - ) fi -} - -convert() { - for i in {$P,$P/usr}/{sbin,bin} ; do prune_symlink $i ; done - for i in {$P,$P/usr}/$libdir ; do prune_symlink $i ; done - prune_symlink $infodir - for i in `seq 9` n ; do prune_symlink $mandir/man$i ; done -} - -fscheck -W=`pwd` -for i in `seq 0 $((${#src[@]} - 1))` ; do - S[$i]=$W/${src[$i]} ; B[$i]=$W/build`test ${#src[@]} -eq 1 || echo $i` -done -P=$W/work ; C=$W/pivot -infodir=$P/usr/share/info -mandir=$P/usr/share/man -docdir=$P/usr/share/doc -myname=`basename $0` -pkg=$pkgbase-$vers-$arch-$build -case $arch in x86_64) libdir=lib64 ;; *) libdir=lib ;; esac -if [ $# -eq 0 ] ; then - opt_download=1 ; opt_config=1 ; opt_build=1 ; opt_package=1 +if [ -f functions ] ; then + source ./functions +elif [ ! -f /usr/share/plamo/functions ] ; then + wget ftp://plamo.linet.gr.jp/pub/Plamo-src/admin/functions + source ./functions else - opt_download=0 ; opt_config=0 ; opt_build=0 ; opt_package=0 - for i in $@ ; do - case $i in - download) opt_download=1 ;; - config) opt_config=1 ;; - build) opt_build=1 ;; - package) opt_package=1 ;; - esac - done + source /usr/share/plamo/functions fi + +fscheck +prepare "$@" if [ $opt_download -eq 1 ] ; then - for i in $url ; do - if [ ! -f ${i##*/} ] ; then wget $i ; fi - done - for i in $url ; do - case ${i##*.} in - tar) tar xvpf ${i##*/} ;; - gz) tar xvpzf ${i##*/} ;; - bz2) tar xvpjf ${i##*/} ;; - esac - done + download_sources fi if [ $opt_config -eq 1 ] ; then 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 + apply_patches cd $B cp -p install.sh{,.orig} sed -i '/MAN_DIR=/s@man@share/man@g' install.sh for i in `seq 0 $((${#B[@]} - 1))` ; do cd ${B[$i]} - if [ -f Makefile ] ; then - make clean - fi - if [ -f config.log ] ; then - 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 @@ -226,12 +56,7 @@ done fi if [ $opt_package -eq 1 ] ; then - if [ `id -u` -ne 0 ] ; then - read -p "Do you want to package as root? [y/N] " ans - if [ "x$ans" == "xY" -o "x$ans" == "xy" ] ; then - cd $W ; /bin/su -c "$0 package" ; exit - fi - fi + root_priv if [ -d $P ] ; then rm -rf $P ; fi ; mkdir -p $P if [ -d $C ] ; then rm -rf $C ; fi ; mkdir -p $C touch $W/i.st ; sleep 1 @@ -251,24 +76,8 @@ find $P ! -type l -newer i.st ! -newer i.et \ -exec touch -t `date '+%m%d0900'` {} \; compress - for i in `seq 0 $((${#DOCS[@]} - 1))` ; do - for j in ${DOCS[$i]} ; do - for k in ${S[$i]}/$j ; do - install2 $k $docdir/${src[$i]}/${k#${S[$i]}/} - touch -r $k $docdir/${src[$i]}/${k#${S[$i]}/} - gzip_one $docdir/${src[$i]}/${k#${S[$i]}/} - done - done - if [ $i -eq 0 ] ; then - install $myname $docdir/$src - touch -t `date '+%m%d0900'` $docdir/$src/$myname - gzip_one $docdir/$src/$myname - else - ln $docdir/$src/$myname.gz $docdir/${src[$i]} - fi - ( cd $docdir ; find ${src[$i]} -type d -exec touch -r $W/{} {} \; ) - done - convert + setup_docdir + convert_links tar cvpf $pkg.tar -C $P `cd $P ; find usr/sbin | tail -n+2` tar rvpf $pkg.tar -C $P usr/share/hibernate tar rvpf $pkg.tar -C $P etc/hibernate @@ -278,6 +87,5 @@ tar rvpf $pkg.tar -C $P usr/share/doc/$src touch -t `date '+%m%d0900'` $pkg.tar ; xz $pkg.tar ; touch $pkg.tar.xz mv $pkg.tar.xz $pkg.txz - read -p "Do you want to keep work files? [y/N] " ans - if [ "x$ans" != "xY" -a "x$ans" != "xy" ] ; then rm -rf $P $C i.[se]t ; fi + cleanup fi --- plamo/00_base/old/iproute2-20160107/PlamoBuild.iproute2-4.2.0 2016-01-07 07:54:00.000000000 +0900 +++ plamo/00_base/iproute2/PlamoBuild.iproute2-4.2.0 2017-04-07 15:09:10.000000000 +0900 @@ -2,215 +2,44 @@ ###################################################################### url="https://www.kernel.org/pub/linux/utils/net/iproute2/iproute2-4.2.0.tar.xz" +verify= +commitid= pkgbase=iproute2 vers=4.2.0 arch=`uname -m` -build=P2 +build=P3 src=$pkgbase-$vers +patchfiles="" OPT_CONFIG="" DOCS="COPYING README*" +template=20170323 +tmplurl=ftp://plamo.linet.gr.jp/pub/Plamo-src/admin ###################################################################### -fscheck() { - PANGRAM="The quick brown fox jumps over the lazy dog." - echo -n "Checking for the filesystem ... " - mkdir pangram ; ( cd pangram ; touch $PANGRAM ) - mv pangram pangram~ ; mkdir pangram ; touch -r pangram~ pangram - tar cpf pangram.tar pangram ; rmdir pangram ; mv pangram~ pangram - for i in $PANGRAM ; do tar rpf pangram.tar pangram/$i ; done - touch -t `date '+%m%d0900'` pangram.tar ; gzip pangram.tar - touch pangram.tar.gz ; mv pangram.tar.gz pangram1.tgz - tar cpf pangram.tar pangram - touch -t `date '+%m%d0900'` pangram.tar ; gzip pangram.tar - touch pangram.tar.gz ; mv pangram.tar.gz pangram2.tgz - if cmp -s pangram1.tgz pangram2.tgz ; then - echo "OK" - rm -rf pangram pangram1.tgz pangram2.tgz - else - echo "NG" - cat <<- "EOF" - Hmm, packaging may not be done properly on this filesystem. - Would you please try again on a default filesystem, thanks! - - Happy packaging!! - - Quitting... - EOF - exit - fi -} - -install2() { - install -d ${2%/*} ; install -m 644 $1 $2 -} - -strip_bindir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - shopt -s nullglob - cd $1 - for i in * ; do - echo "$i" - if [ -h $i ] ; then continue ; fi - if [ -n "`file $i | grep "not stripped"`" ] ; then - echo "stripping -p $i" - strip -p $i - fi - done - ) fi -} - -strip_libdir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - shopt -s nullglob - cd $1 - for i in *.so *.so.* *.a ; do - echo "$i" - if [ -h $i ] ; then continue ; fi - if [ -n "`nm -a $i | grep " a "`" ] ; then - if [ $i != ${i%.a} ] ; then - echo -n "ranlib and " - touch -r $i $i.mt ; ranlib $i ; touch -r $i.mt $i ; rm $i.mt - fi - echo "stripping -gp $i" - strip -gp $i - fi - done - ) fi -} - -gzip_dir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - cd $1 - files=`ls -f --indicator-style=none | sed '/^\.\{1,2\}$/d'` - for i in $files ; do - echo "$i" - if [ ! -f $i -a ! -h $i -o $i != ${i%.gz} ] ; then continue ; fi - lnks=`ls -l $i | awk '{print $2}'` - if [ $lnks -gt 1 ] ; then - inum=`ls -i $i | awk '{print $1}'` - for j in `find . -maxdepth 1 -inum $inum` ; do - if [ ${j#./} == $i ] ; then - gzip -f $i - else - rm -f ${j#./} ; ln $i.gz ${j#./}.gz - fi - done - elif [ -h $i ] ; then - target=`readlink $i` ; rm -f $i ; ln -s $target.gz $i.gz - else - gzip $i - fi - done - for i in $files ; do mv ${i%.gz}.gz $C ; done - for i in $files ; do mv $C/${i%.gz}.gz . ; done - ) fi -} - -gzip_one() { - gzip $1 ; mv $1.gz $C ; mv $C/${1##*/}.gz ${1%/*} -} - -compress() { - for i in {$P,$P/usr}/{sbin,bin} ; do strip_bindir $i ; done - for i in {$P,$P/usr}/$libdir ; do strip_libdir $i ; done - if [ -f $infodir/dir ] ; then rm -f $infodir/dir ; fi - gzip_dir $infodir - for i in `seq 9` n ; do gzip_dir $mandir/man$i ; done -} - -prune_symlink() { - echo "pruning symlink in $1" - if [ -d $1 ] ; then ( - cd $P - rm -f /tmp/iNsT-a.$$ ; touch /tmp/iNsT-a.$$ - for i in `find ${1#$P/} -type l` ; do - target=`readlink $i` - echo "$i -> $target" - echo $i$'\n'$target >> /tmp/iNsT-a.$$ - done - COUNT=1 - LINE=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - while [ -n "$LINE" ] ; do - LINKGOESIN=`dirname $LINE` - LINKNAMEIS=`basename $LINE` - COUNT=$(($COUNT + 1)) - LINKPOINTSTO=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - if [ ! -d install ] ; then mkdir install ; fi - cat <<- EOF >> install/doinst.sh - ( cd $LINKGOESIN ; rm -rf $LINKNAMEIS ) - ( cd $LINKGOESIN ; ln -sf $LINKPOINTSTO $LINKNAMEIS ) - EOF - rm -rf $LINE ; touch -t `date '+%m%d0900'` install/doinst.sh $LINE - COUNT=$(($COUNT + 1)) - LINE=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - done - rm -f /tmp/iNsT-a.$$ - ) fi -} - -convert() { - for i in {$P,$P/usr}/{sbin,bin} ; do prune_symlink $i ; done - for i in {$P,$P/usr}/$libdir ; do prune_symlink $i ; done - prune_symlink $infodir - for i in `seq 9` n ; do prune_symlink $mandir/man$i ; done -} - -fscheck -W=`pwd` -for i in `seq 0 $((${#src[@]} - 1))` ; do - S[$i]=$W/${src[$i]} ; B[$i]=$W/build`test ${#src[@]} -eq 1 || echo $i` -done -P=$W/work ; C=$W/pivot -infodir=$P/usr/share/info -mandir=$P/usr/share/man -docdir=$P/usr/share/doc -myname=`basename $0` -pkg=$pkgbase-$vers-$arch-$build -case $arch in x86_64) libdir=lib64 ;; *) libdir=lib ;; esac -if [ $# -eq 0 ] ; then - opt_download=1 ; opt_config=1 ; opt_build=1 ; opt_package=1 +if [ -f functions ] ; then + source ./functions +elif [ ! -f /usr/share/plamo/functions ] ; then + wget ftp://plamo.linet.gr.jp/pub/Plamo-src/admin/functions + source ./functions else - opt_download=0 ; opt_config=0 ; opt_build=0 ; opt_package=0 - for i in $@ ; do - case $i in - download) opt_download=1 ;; - config) opt_config=1 ;; - build) opt_build=1 ;; - package) opt_package=1 ;; - esac - done + source /usr/share/plamo/functions fi + +fscheck +prepare "$@" if [ $opt_download -eq 1 ] ; then - for i in $url ; do - if [ ! -f ${i##*/} ] ; then wget $i ; fi - done - for i in $url ; do - case ${i##*.} in - tar) tar xvpf ${i##*/} ;; - gz) tar xvpzf ${i##*/} ;; - bz2) tar xvpjf ${i##*/} ;; - xz) tar xvpJf ${i##*/} ;; - esac - done + download_sources fi if [ $opt_config -eq 1 ] ; then 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 + apply_patches for i in `seq 0 $((${#B[@]} - 1))` ; do cd ${B[$i]} - if [ -f Makefile ] ; then - make clean - fi - if [ -f config.log ] ; then - 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 @@ -224,12 +53,7 @@ done fi if [ $opt_package -eq 1 ] ; then - if [ `id -u` -ne 0 ] ; then - read -p "Do you want to package as root? [y/N] " ans - if [ "x$ans" == "xY" -o "x$ans" == "xy" ] ; then - cd $W ; /bin/su -c "$0 package" ; exit - fi - fi + root_priv if [ -d $P ] ; then rm -rf $P ; fi ; mkdir -p $P if [ -d $C ] ; then rm -rf $C ; fi ; mkdir -p $C touch $W/i.st ; sleep 1 @@ -246,28 +70,12 @@ -exec touch -t `date '+%m%d0900'` {} \; compress strip_libdir $P/usr/$libdir/tc - for i in `seq 0 $((${#DOCS[@]} - 1))` ; do - for j in ${DOCS[$i]} ; do - for k in ${S[$i]}/$j ; do - install2 $k $docdir/${src[$i]}/${k#${S[$i]}/} - touch -r $k $docdir/${src[$i]}/${k#${S[$i]}/} - gzip_one $docdir/${src[$i]}/${k#${S[$i]}/} - done - done - if [ $i -eq 0 ] ; then - install $myname $docdir/$src - touch -t `date '+%m%d0900'` $docdir/$src/$myname - gzip_one $docdir/$src/$myname - else - ln $docdir/$src/$myname.gz $docdir/${src[$i]} - fi - ( cd $docdir ; find ${src[$i]} -type d -exec touch -r $W/{} {} \; ) - done + setup_docdir mv $docdir/iproute2 $docdir/$src/doc - mv $docdir/$src/{doc,$myname.gz} $C - mv $C/{doc,$myname.gz} $docdir/$src + mv $docdir/$src/{doc,{$func,$myname,$spec}.gz} $C + mv $C/{doc,{$func,$myname,$spec}.gz} $docdir/$src touch -r $S $docdir/$src - convert + convert_links touch -t `date '+%m%d0900'` $P/usr/$libdir/tc tar cvpf $pkg.tar -C $P `cd $P ; find sbin | tail -n+2` tar rvpf $pkg.tar -C $P usr/$libdir/tc @@ -280,6 +88,5 @@ tar rvpf $pkg.tar -C $P install/doinst.sh touch -t `date '+%m%d0900'` $pkg.tar ; xz $pkg.tar ; touch $pkg.tar.xz mv $pkg.tar.xz $pkg.txz - read -p "Do you want to keep work files? [y/N] " ans - if [ "x$ans" != "xY" -a "x$ans" != "xy" ] ; then rm -rf $P $C i.[se]t ; fi + cleanup fi --- plamo/00_base/old/iputils-20160321/PlamoBuild.iputils-s20101006 2016-03-21 18:20:06.000000000 +0900 +++ plamo/00_base/iputils/PlamoBuild.iputils-s20101006 2017-04-07 16:26:40.000000000 +0900 @@ -2,223 +2,50 @@ ###################################################################### url="http://www.skbuff.net/iputils/iputils-s20101006.tar.bz2 - ftp://plamo.linet.gr.jp/pub/Plamo-src.new/plamo/00_base/iputils/iputils-s20101006-fixes-1.patch.gz - ftp://plamo.linet.gr.jp/pub/Plamo-src.new/plamo/00_base/iputils/iputils-s20100418-doc-1.patch.gz - ftp://plamo.linet.gr.jp/pub/Plamo-src.new/plamo/00_base/iputils/iputils-s20101006-Makefile.patch.gz" + ftp://plamo.linet.gr.jp/pub/Plamo-src/plamo/00_base/iputils/iputils-s20101006-fixes-1.patch.gz + ftp://plamo.linet.gr.jp/pub/Plamo-src/plamo/00_base/iputils/iputils-s20100418-doc-1.patch.gz + ftp://plamo.linet.gr.jp/pub/Plamo-src/plamo/00_base/iputils/iputils-s20101006-Makefile.patch.gz" +verify= +commitid= pkgbase=iputils vers=s20101006 arch=`uname -m` -build=P2 +build=P3 src=$pkgbase-$vers +patchfiles="`echo iputils-s2010{{1006-fixes,0418-doc}-1,1006-Makefile}.patch.gz`" OPT_CONFIG="" DOCS="INSTALL RELNOTES" +template=20170323 +tmplurl=ftp://plamo.linet.gr.jp/pub/Plamo-src/admin ###################################################################### -fscheck() { - PANGRAM="The quick brown fox jumps over the lazy dog." - echo -n "Checking for the filesystem ... " - mkdir pangram ; ( cd pangram ; touch $PANGRAM ) - mv pangram pangram~ ; mkdir pangram ; touch -r pangram~ pangram - tar cpf pangram.tar pangram ; rmdir pangram ; mv pangram~ pangram - for i in $PANGRAM ; do tar rpf pangram.tar pangram/$i ; done - touch -t `date '+%m%d0900'` pangram.tar ; gzip pangram.tar - touch pangram.tar.gz ; mv pangram.tar.gz pangram1.tgz - tar cpf pangram.tar pangram - touch -t `date '+%m%d0900'` pangram.tar ; gzip pangram.tar - touch pangram.tar.gz ; mv pangram.tar.gz pangram2.tgz - if cmp -s pangram1.tgz pangram2.tgz ; then - echo "OK" - rm -rf pangram pangram1.tgz pangram2.tgz - else - echo "NG" - cat <<- "EOF" - Hmm, packaging may not be done properly on this filesystem. - Would you please try again on a default filesystem, thanks! - - Happy packaging!! - - Quitting... - EOF - exit - fi -} - -install2() { - install -d ${2%/*} ; install -m 644 $1 $2 -} - -strip_bindir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - shopt -s nullglob - cd $1 - for i in * ; do - echo "$i" - if [ -h $i ] ; then continue ; fi - if [ -n "`file $i | grep "not stripped"`" ] ; then - echo "stripping -p $i" - strip -p $i - fi - done - ) fi -} - -strip_libdir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - shopt -s nullglob - cd $1 - for i in *.so *.so.* *.a ; do - echo "$i" - if [ -h $i ] ; then continue ; fi - if [ -n "`nm -a $i | grep " a "`" ] ; then - if [ $i != ${i%.a} ] ; then - echo -n "ranlib and " - touch -r $i $i.mt ; ranlib $i ; touch -r $i.mt $i ; rm $i.mt - fi - echo "stripping -gp $i" - strip -gp $i - fi - done - ) fi -} - -gzip_dir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - cd $1 - files=`ls -f --indicator-style=none | sed '/^\.\{1,2\}$/d'` - for i in $files ; do - echo "$i" - if [ ! -f $i -a ! -h $i -o $i != ${i%.gz} ] ; then continue ; fi - lnks=`ls -l $i | awk '{print $2}'` - if [ $lnks -gt 1 ] ; then - inum=`ls -i $i | awk '{print $1}'` - for j in `find . -maxdepth 1 -inum $inum` ; do - if [ ${j#./} == $i ] ; then - gzip -f $i - else - rm -f ${j#./} ; ln $i.gz ${j#./}.gz - fi - done - elif [ -h $i ] ; then - target=`readlink $i` ; rm -f $i ; ln -s $target.gz $i.gz - else - gzip $i - fi - done - for i in $files ; do mv ${i%.gz}.gz $C ; done - for i in $files ; do mv $C/${i%.gz}.gz . ; done - ) fi -} - -gzip_one() { - gzip $1 ; mv $1.gz $C ; mv $C/${1##*/}.gz ${1%/*} -} - -compress() { - for i in {$P,$P/usr}/{sbin,bin} ; do strip_bindir $i ; done - for i in {$P,$P/usr}/$libdir ; do strip_libdir $i ; done - if [ -f $infodir/dir ] ; then rm -f $infodir/dir ; fi - gzip_dir $infodir - for i in `seq 9` n ; do gzip_dir $mandir/man$i ; done -} - -prune_symlink() { - echo "pruning symlink in $1" - if [ -d $1 ] ; then ( - cd $P - rm -f /tmp/iNsT-a.$$ ; touch /tmp/iNsT-a.$$ - for i in `find ${1#$P/} -type l` ; do - target=`readlink $i` - echo "$i -> $target" - echo $i$'\n'$target >> /tmp/iNsT-a.$$ - done - COUNT=1 - LINE=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - while [ -n "$LINE" ] ; do - LINKGOESIN=`dirname $LINE` - LINKNAMEIS=`basename $LINE` - COUNT=$(($COUNT + 1)) - LINKPOINTSTO=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - if [ ! -d install ] ; then mkdir install ; fi - cat <<- EOF >> install/doinst.sh - ( cd $LINKGOESIN ; rm -rf $LINKNAMEIS ) - ( cd $LINKGOESIN ; ln -sf $LINKPOINTSTO $LINKNAMEIS ) - EOF - rm -rf $LINE ; touch -t `date '+%m%d0900'` install/doinst.sh $LINE - COUNT=$(($COUNT + 1)) - LINE=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - done - rm -f /tmp/iNsT-a.$$ - ) fi -} - -convert() { - for i in {$P,$P/usr}/{sbin,bin} ; do prune_symlink $i ; done - for i in {$P,$P/usr}/$libdir ; do prune_symlink $i ; done - prune_symlink $infodir - for i in `seq 9` n ; do prune_symlink $mandir/man$i ; done -} - -fscheck -W=`pwd` -for i in `seq 0 $((${#src[@]} - 1))` ; do - S[$i]=$W/${src[$i]} ; B[$i]=$W/build`test ${#src[@]} -eq 1 || echo $i` -done -P=$W/work ; C=$W/pivot -infodir=$P/usr/share/info -mandir=$P/usr/share/man -docdir=$P/usr/share/doc -myname=`basename $0` -pkg=$pkgbase-$vers-$arch-$build -case $arch in x86_64) libdir=lib64 ;; *) libdir=lib ;; esac -if [ $# -eq 0 ] ; then - opt_download=1 ; opt_config=1 ; opt_build=1 ; opt_package=1 +if [ -f functions ] ; then + source ./functions +elif [ ! -f /usr/share/plamo/functions ] ; then + wget ftp://plamo.linet.gr.jp/pub/Plamo-src/admin/functions + source ./functions else - opt_download=0 ; opt_config=0 ; opt_build=0 ; opt_package=0 - for i in $@ ; do - case $i in - download) opt_download=1 ;; - config) opt_config=1 ;; - build) opt_build=1 ;; - package) opt_package=1 ;; - esac - done + source /usr/share/plamo/functions fi + +fscheck +prepare "$@" if [ $opt_download -eq 1 ] ; then - for i in $url ; do - if [ ! -f ${i##*/} ] ; then wget $i ; fi - done - for i in $url ; do - case ${i##*.} in - tar) tar xvpf ${i##*/} ;; - gz) tar xvpzf ${i##*/} ;; - bz2) tar xvpjf ${i##*/} ;; - esac - done + download_sources fi if [ $opt_config -eq 1 ] ; then 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 + apply_patches cd $B - gunzip -c $W/iputils-s20101006-fixes-1.patch.gz | patch -Np1 -i - - gunzip -c $W/iputils-s20100418-doc-1.patch.gz | patch -Np1 -i - - gunzip -c $W/iputils-s20101006-Makefile.patch.gz | patch -Np1 -i - cp -p Makefile{,.orig} sed -i "s|@LIBDIR@|/usr/$libdir|" Makefile for i in `seq 0 $((${#B[@]} - 1))` ; do cd ${B[$i]} - if [ -f Makefile ] ; then - make clean - fi - if [ -f config.log ] ; then - 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 @@ -233,12 +60,7 @@ done fi if [ $opt_package -eq 1 ] ; then - if [ `id -u` -ne 0 ] ; then - read -p "Do you want to package as root? [y/N] " ans - if [ "x$ans" == "xY" -o "x$ans" == "xy" ] ; then - cd $W ; /bin/su -c "$0 package" ; exit - fi - fi + root_priv if [ -d $P ] ; then rm -rf $P ; fi ; mkdir -p $P if [ -d $C ] ; then rm -rf $C ; fi ; mkdir -p $C touch $W/i.st ; sleep 1 @@ -261,24 +83,8 @@ find $P ! -type l -newer i.st ! -newer i.et \ -exec touch -t `date '+%m%d0900'` {} \; compress - for i in `seq 0 $((${#DOCS[@]} - 1))` ; do - for j in ${DOCS[$i]} ; do - for k in ${S[$i]}/$j ; do - install2 $k $docdir/${src[$i]}/${k#${S[$i]}/} - touch -r $k $docdir/${src[$i]}/${k#${S[$i]}/} - gzip_one $docdir/${src[$i]}/${k#${S[$i]}/} - done - done - if [ $i -eq 0 ] ; then - install $myname $docdir/$src - touch -t `date '+%m%d0900'` $docdir/$src/$myname - gzip_one $docdir/$src/$myname - else - ln $docdir/$src/$myname.gz $docdir/${src[$i]} - fi - ( cd $docdir ; find ${src[$i]} -type d -exec touch -r $W/{} {} \; ) - done - convert + setup_docdir + convert_links tar cvpf $pkg.tar -C $P `cd $P ; find 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 usr/bin | tail -n+2` @@ -286,6 +92,5 @@ tar rvpf $pkg.tar -C $P usr/share/doc/$src touch -t `date '+%m%d0900'` $pkg.tar ; xz $pkg.tar ; touch $pkg.tar.xz mv $pkg.tar.xz $pkg.txz - read -p "Do you want to keep work files? [y/N] " ans - if [ "x$ans" != "xY" -a "x$ans" != "xy" ] ; then rm -rf $P $C i.[se]t ; fi + cleanup fi --- plamo/00_base/old/kbd-20161124/PlamoBuild.kbd-1.15.5 2016-11-24 09:12:52.000000000 +0900 +++ plamo/00_base/kbd/PlamoBuild.kbd-1.15.5 2017-04-07 15:27:56.000000000 +0900 @@ -5,248 +5,42 @@ 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" +verify= +commitid= pkgbase=kbd vers=1.15.5 arch=`uname -m` -build=P4 +build=P5 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 +template=20170323 tmplurl=ftp://plamo.linet.gr.jp/pub/Plamo-src/admin ###################################################################### -fscheck() { - PANGRAM="The quick brown fox jumps over the lazy dog." - echo -n "Checking for the filesystem ... " - mkdir pangram ; ( cd pangram ; touch $PANGRAM ) - mv pangram pangram~ ; mkdir pangram ; touch -r pangram~ pangram - tar cpf pangram.tar pangram ; rmdir pangram ; mv pangram~ pangram - for i in $PANGRAM ; do tar rpf pangram.tar pangram/$i ; done - touch -t `date '+%m%d0900'` pangram.tar ; gzip pangram.tar - touch pangram.tar.gz ; mv pangram.tar.gz pangram1.tgz - tar cpf pangram.tar pangram - touch -t `date '+%m%d0900'` pangram.tar ; gzip pangram.tar - touch pangram.tar.gz ; mv pangram.tar.gz pangram2.tgz - if cmp -s pangram1.tgz pangram2.tgz ; then - echo "OK" - rm -rf pangram pangram1.tgz pangram2.tgz - else - echo "NG" - cat <<- "EOF" - Hmm, packaging may not be done properly on this filesystem. - Would you please try again on a default filesystem, thanks! - - Happy packaging!! - - Quitting... - EOF - exit - fi -} - -install2() { - install -d ${2%/*} ; install -m 644 $1 $2 -} - -strip_bindir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - shopt -s nullglob - cd $1 - for i in * ; do - echo "$i" - if [ -h $i ] ; then continue ; fi - if [ -n "`file $i | grep "not stripped"`" ] ; then - echo "stripping -p $i" - strip -p $i - fi - done - ) fi -} - -strip_libdir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - shopt -s nullglob - cd $1 - for i in *.so *.so.* *.a ; do - echo "$i" - if [ -h $i ] ; then continue ; fi - if [ -n "`nm -a $i | grep " a "`" ] ; then - if [ $i != ${i%.a} ] ; then - echo -n "ranlib and " - touch -r $i $i.mt ; ranlib $i ; touch -r $i.mt $i ; rm $i.mt - fi - echo "stripping -gp $i" - strip -gp $i - fi - done - ) fi -} - -gzip_dir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - cd $1 - files=`ls -f --indicator-style=none | sed '/^\.\{1,2\}$/d'` - for i in $files ; do - echo "$i" - if [ ! -f $i -a ! -h $i -o $i != ${i%.gz} ] ; then continue ; fi - lnks=`ls -l $i | awk '{print $2}'` - if [ $lnks -gt 1 ] ; then - inum=`ls -i $i | awk '{print $1}'` - for j in `find . -maxdepth 1 -inum $inum` ; do - if [ ${j#./} == $i ] ; then - gzip -f $i - else - rm -f ${j#./} ; ln $i.gz ${j#./}.gz - fi - done - elif [ -h $i ] ; then - target=`readlink $i` ; rm -f $i ; ln -s $target.gz $i.gz - else - gzip $i - fi - done - for i in $files ; do mv ${i%.gz}.gz $C ; done - for i in $files ; do mv $C/${i%.gz}.gz . ; done - ) fi -} - -gzip_one() { - gzip $1 ; mv $1.gz $C ; mv $C/${1##*/}.gz ${1%/*} -} - -compress() { - for i in {$P,$P/usr}/{sbin,bin} ; do strip_bindir $i ; done - for i in {$P,$P/usr}/$libdir ; do strip_libdir $i ; done - if [ -f $infodir/dir ] ; then rm -f $infodir/dir ; fi - gzip_dir $infodir - for i in `seq 9` n ; do gzip_dir $mandir/man$i ; done -} - -prune_symlink() { - echo "pruning symlink in $1" - if [ -d $1 ] ; then ( - cd $P - rm -f /tmp/iNsT-a.$$ ; touch /tmp/iNsT-a.$$ - for i in `find ${1#$P/} -type l` ; do - target=`readlink $i` - echo "$i -> $target" - echo $i$'\n'$target >> /tmp/iNsT-a.$$ - done - COUNT=1 - LINE=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - while [ -n "$LINE" ] ; do - LINKGOESIN=`dirname $LINE` - LINKNAMEIS=`basename $LINE` - COUNT=$(($COUNT + 1)) - LINKPOINTSTO=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - if [ ! -d install ] ; then mkdir install ; fi - cat <<- EOF >> install/doinst.sh - ( cd $LINKGOESIN ; rm -rf $LINKNAMEIS ) - ( cd $LINKGOESIN ; ln -sf $LINKPOINTSTO $LINKNAMEIS ) - EOF - rm -rf $LINE ; touch -t `date '+%m%d0900'` install/doinst.sh $LINE - COUNT=$(($COUNT + 1)) - LINE=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - done - rm -f /tmp/iNsT-a.$$ - ) fi -} - -convert() { - for i in {$P,$P/usr}/{sbin,bin} ; do prune_symlink $i ; done - for i in {$P,$P/usr}/$libdir ; do prune_symlink $i ; done - prune_symlink $infodir - for i in `seq 9` n ; do prune_symlink $mandir/man$i ; done -} - -fscheck -W=`pwd` -for i in `seq 0 $((${#src[@]} - 1))` ; do - S[$i]=$W/${src[$i]} ; B[$i]=$W/build`test ${#src[@]} -eq 1 || echo $i` -done -P=$W/work ; C=$W/pivot -infodir=$P/usr/share/info -mandir=$P/usr/share/man -docdir=$P/usr/share/doc -myname=`basename $0` -pkg=$pkgbase-$vers-$arch-$build -case $arch in x86_64) libdir=lib64 ;; *) libdir=lib ;; esac -if [ $# -eq 0 ] ; then - opt_download=1 ; opt_config=1 ; opt_build=1 ; opt_package=1 +if [ -f functions ] ; then + source ./functions +elif [ ! -f /usr/share/plamo/functions ] ; then + wget ftp://plamo.linet.gr.jp/pub/Plamo-src/admin/functions + source ./functions else - opt_download=0 ; opt_config=0 ; opt_build=0 ; opt_package=0 - for i in $@ ; do - case $i in - download) opt_download=1 ;; - config) opt_config=1 ;; - build) opt_build=1 ;; - package) opt_package=1 ;; - esac - done + source /usr/share/plamo/functions fi + +fscheck +prepare "$@" if [ $opt_download -eq 1 ] ; then - for i in $url ; do - 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|tgz) tar xvpzf ${i##*/} ;; - bz2|tbz) tar xvpjf ${i##*/} ;; - xz|txz) tar xvpJf ${i##*/} ;; - esac - done + download_sources fi if [ $opt_config -eq 1 ] ; then 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 + apply_patches 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 - if [ -f config.log ] ; then - rm -rf config.cache config.log - fi if [ -x configure ] ; then ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --libdir='${exec_prefix}'/$libdir --infodir='${prefix}'/share/info \ @@ -263,12 +57,7 @@ done fi if [ $opt_package -eq 1 ] ; then - if [ `id -u` -ne 0 ] ; then - read -p "Do you want to package as root? [y/N] " ans - if [ "x$ans" == "xY" -o "x$ans" == "xy" ] ; then - cd $W ; /bin/su -c "$0 package" ; exit - fi - fi + root_priv if [ -d $P ] ; then rm -rf $P ; fi ; mkdir -p $P if [ -d $C ] ; then rm -rf $C ; fi ; mkdir -p $C touch $W/i.st ; sleep 1 @@ -288,38 +77,8 @@ find $P ! -type l -newer i.st ! -newer i.et \ -exec touch -t `date '+%m%d0900'` {} \; compress - for i in `seq 0 $((${#DOCS[@]} - 1))` ; do - for j in ${DOCS[$i]} ; do - for k in ${S[$i]}/$j ; do - install2 $k $docdir/${src[$i]}/${k#${S[$i]}/} - touch -r $k $docdir/${src[$i]}/${k#${S[$i]}/} - gzip_one $docdir/${src[$i]}/${k#${S[$i]}/} - done - done - if [ $i -eq 0 ] ; then - install $myname $docdir/$src - touch -t `date '+%m%d0900'` $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 - convert + setup_docdir + convert_links prune_symlink $P/usr/share/keymaps touch -t `date '+%m%d0900'` $P/usr/share/keymaps tar cvpf $pkg.tar -C $P `cd $P ; find bin | tail -n+2` @@ -334,6 +93,5 @@ tar rvpf $pkg.tar -C $P install/doinst.sh touch -t `date '+%m%d0900'` $pkg.tar ; xz $pkg.tar ; touch $pkg.tar.xz mv $pkg.tar.xz $pkg.txz - read -p "Do you want to keep work files? [y/N] " ans - if [ "x$ans" != "xY" -a "x$ans" != "xy" ] ; then rm -rf $P $C i.[se]t ; fi + cleanup fi --- plamo/00_base/old/kernel-20181219/PlamoBuild.kernel-4.15.18_plamo@LV@ 2018-12-19 08:35:29.000000000 +0900 +++ plamo/00_base/kernel/PlamoBuild.kernel-4.16.18_plamo@LV@ 2018-12-23 18:07:52.000000000 +0900 @@ -1,25 +1,25 @@ #!/bin/sh -x ###################################################################### -url="https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.15.18.tar.xz - ftp://plamo.linet.gr.jp/pub/Plamo-test/kernelsrc_patches/UNICON/vd_unicon-kernel-20180203-4.15.patch +url="https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.16.18.tar.xz + ftp://plamo.linet.gr.jp/pub/Plamo-test/kernelsrc_patches/UNICON/vd_unicon-kernel-20180407-4.16.patch ftp://plamo.linet.gr.jp/pub/Plamo-test/kernelsrc_patches/UNICON/vd_unicon-kernel-fonts-20140614.patch.bz2 https://github.com/sfjro/aufs4-standalone.git - ftp://plamo.linet.gr.jp/pub/Plamo-test/kernelsrc_patches/mcp/4.15-panic_beep.patch - ftp://plamo.linet.gr.jp/pub/Plamo-test/kernelsrc_patches/mcp/4.15-morse_code_panics.patch - ftp://plamo.linet.gr.jp/pub/Plamo-test/kernelsrc_patches/toi/tuxonice-for-linux-4.15.15-2018-04-07.patch.bz2 + ftp://plamo.linet.gr.jp/pub/Plamo-test/kernelsrc_patches/mcp/4.16-panic_beep.patch + ftp://plamo.linet.gr.jp/pub/Plamo-test/kernelsrc_patches/mcp/4.16-morse_code_panics.patch + ftp://plamo.linet.gr.jp/pub/Plamo-test/kernelsrc_patches/toi/tuxonice-for-linux-4.16.0-2018-04-07.patch.bz2 ftp://plamo.linet.gr.jp/pub/Plamo-test/kernelsrc_patches/ovlfs/overlayfs-allow_unprivileged_mounts.patch - ftp://plamo.linet.gr.jp/pub/Plamo-test/kernelsrc_patches/rpi/rpi-4.15.18-20180521-1b75d3e.patch.xz - ftp://plamo.linet.gr.jp/pub/Plamo-test/kernelsrc_patches/config-4.15.18-plamo@LV@" + ftp://plamo.linet.gr.jp/pub/Plamo-test/kernelsrc_patches/rpi/rpi-4.16.18-20180614-fd4f278.patch.xz + ftp://plamo.linet.gr.jp/pub/Plamo-test/kernelsrc_patches/config-4.16.18-plamo@LV@" verify= digest= -branch[3]=aufs4.15 -commitid[3]=8289398 +branch[3]=aufs4.16 +commitid[3]=e0f5222 pkgbase=kernel -vers=4.15.18_plamo@LV@ +vers=4.16.18_plamo@LV@ arch=`uname -m` build=P1 -src=linux-4.15.18 +src=linux-4.16.18 patchfiles="" OPT_CONFIG="" DOCS="" @@ -49,7 +49,7 @@ done apply_patches cd $B - patch -Np1 -i $W/vd_unicon-kernel-20180203-4.15.patch + patch -Np1 -i $W/vd_unicon-kernel-20180407-4.16.patch bunzip2 -c $W/vd_unicon-kernel-fonts-20140614.patch.bz2 | patch -Np1 -i - patch -Np1 -i $W/aufs4-standalone/aufs4-kbuild.patch patch -Np1 -i $W/aufs4-standalone/aufs4-base.patch @@ -58,17 +58,17 @@ cp -av $W/aufs4-standalone/Documentation . cp -av $W/aufs4-standalone/fs . cp -pv $W/aufs4-standalone/include/uapi/linux/aufs_type.h include/uapi/linux - patch -Np1 -i $W/4.15-panic_beep.patch - patch -Np1 -i $W/4.15-morse_code_panics.patch - bunzip2 -c $W/tuxonice-for-linux-4.15.15-2018-04-07.patch.bz2 | patch -Np1 -i - + patch -Np1 -i $W/4.16-panic_beep.patch + patch -Np1 -i $W/4.16-morse_code_panics.patch + bunzip2 -c $W/tuxonice-for-linux-4.16.0-2018-04-07.patch.bz2 | patch -Np1 -i - chmod 755 scripts/tuxonice_output_to_csv.sh patch -Np1 -i $W/overlayfs-allow_unprivileged_mounts.patch if [ `uname -m` == armv7l ] ; then - unxz -c $W/rpi-4.15.18-20180521-1b75d3e.patch.xz | patch -Np1 -i - + unxz -c $W/rpi-4.16.18-20180614-fd4f278.patch.xz | patch -Np1 -i - chmod 755 drivers/net/wireless/realtek/rtl8192cu/{clean,runwpa,wlan0dhcp} chmod 755 scripts/{knlinfo,mkknlimg} fi - cp -p $W/config-4.15.18-plamo$lv .config + cp -p $W/config-4.16.18-plamo$lv .config if [ $arch == i686 -o $arch == x86_64 ] ; then cp -p arch/x86/boot/install.sh{,.orig} head -n-9 arch/x86/boot/install.sh.orig > arch/x86/boot/install.sh --- plamo/00_base/old/kmod-20160606/PlamoBuild.kmod-22 2016-06-06 08:18:11.000000000 +0900 +++ plamo/00_base/kmod/PlamoBuild.kmod-22 2017-04-07 15:47:32.000000000 +0900 @@ -2,233 +2,41 @@ ###################################################################### url="https://www.kernel.org/pub/linux/utils/kernel/kmod/kmod-22.tar.xz" +verify= +commitid= pkgbase=kmod vers=22 arch=`uname -m` -build=P4 +build=P5 src=$pkgbase-$vers +patchfiles="" OPT_CONFIG="--bindir=/bin" DOCS="NEWS COPYING TODO README" +template=20170323 +tmplurl=ftp://plamo.linet.gr.jp/pub/Plamo-src/admin ###################################################################### -fscheck() { - PANGRAM="The quick brown fox jumps over the lazy dog." - echo -n "Checking for the filesystem ... " - mkdir pangram ; ( cd pangram ; touch $PANGRAM ) - mv pangram pangram~ ; mkdir pangram ; touch -r pangram~ pangram - tar cpf pangram.tar pangram ; rmdir pangram ; mv pangram~ pangram - for i in $PANGRAM ; do tar rpf pangram.tar pangram/$i ; done - touch -t `date '+%m%d0900'` pangram.tar ; gzip pangram.tar - touch pangram.tar.gz ; mv pangram.tar.gz pangram1.tgz - tar cpf pangram.tar pangram - touch -t `date '+%m%d0900'` pangram.tar ; gzip pangram.tar - touch pangram.tar.gz ; mv pangram.tar.gz pangram2.tgz - if cmp -s pangram1.tgz pangram2.tgz ; then - echo "OK" - rm -rf pangram pangram1.tgz pangram2.tgz - else - echo "NG" - cat <<- "EOF" - Hmm, packaging may not be done properly on this filesystem. - Would you please try again on a default filesystem, thanks! - - Happy packaging!! - - Quitting... - EOF - exit - fi -} - -install2() { - install -d ${2%/*} ; install -m 644 $1 $2 -} - -strip_bindir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - shopt -s nullglob - cd $1 - for i in * ; do - echo "$i" - if [ -h $i ] ; then continue ; fi - if [ -n "`file $i | grep "not stripped"`" ] ; then - echo "stripping -p $i" - strip -p $i - fi - done - ) fi -} - -strip_libdir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - shopt -s nullglob - cd $1 - for i in *.so *.so.* *.a ; do - echo "$i" - if [ -h $i ] ; then continue ; fi - if [ -n "`nm -a $i | grep " a "`" ] ; then - if [ $i != ${i%.a} ] ; then - echo -n "ranlib and " - touch -r $i $i.mt ; ranlib $i ; touch -r $i.mt $i ; rm $i.mt - fi - echo "stripping -gp $i" - strip -gp $i - fi - done - ) fi -} - -gzip_dir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - cd $1 - files=`ls -f --indicator-style=none | sed '/^\.\{1,2\}$/d'` - for i in $files ; do - echo "$i" - if [ ! -f $i -a ! -h $i -o $i != ${i%.gz} ] ; then continue ; fi - lnks=`ls -l $i | awk '{print $2}'` - if [ $lnks -gt 1 ] ; then - inum=`ls -i $i | awk '{print $1}'` - for j in `find . -maxdepth 1 -inum $inum` ; do - if [ ${j#./} == $i ] ; then - gzip -f $i - else - rm -f ${j#./} ; ln $i.gz ${j#./}.gz - fi - done - elif [ -h $i ] ; then - target=`readlink $i` ; rm -f $i ; ln -s $target.gz $i.gz - else - gzip $i - fi - done - for i in $files ; do mv ${i%.gz}.gz $C ; done - for i in $files ; do mv $C/${i%.gz}.gz . ; done - ) fi -} - -gzip_one() { - gzip $1 ; mv $1.gz $C ; mv $C/${1##*/}.gz ${1%/*} -} - -compress() { - for i in {$P,$P/usr}/{sbin,bin} ; do strip_bindir $i ; done - for i in {$P,$P/usr}/$libdir ; do strip_libdir $i ; done - if [ -f $infodir/dir ] ; then rm -f $infodir/dir ; fi - gzip_dir $infodir - for i in `seq 9` n ; do gzip_dir $mandir/man$i ; done -} - -prune_symlink() { - echo "pruning symlink in $1" - if [ -d $1 ] ; then ( - cd $P - rm -f /tmp/iNsT-a.$$ ; touch /tmp/iNsT-a.$$ - for i in `find ${1#$P/} -type l` ; do - target=`readlink $i` - echo "$i -> $target" - echo $i$'\n'$target >> /tmp/iNsT-a.$$ - done - COUNT=1 - LINE=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - while [ -n "$LINE" ] ; do - LINKGOESIN=`dirname $LINE` - LINKNAMEIS=`basename $LINE` - COUNT=$(($COUNT + 1)) - LINKPOINTSTO=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - if [ ! -d install ] ; then mkdir install ; fi - cat <<- EOF >> install/doinst.sh - ( cd $LINKGOESIN ; rm -rf $LINKNAMEIS ) - ( cd $LINKGOESIN ; ln -sf $LINKPOINTSTO $LINKNAMEIS ) - EOF - rm -rf $LINE ; touch -t `date '+%m%d0900'` install/doinst.sh $LINE - COUNT=$(($COUNT + 1)) - LINE=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - done - rm -f /tmp/iNsT-a.$$ - ) fi -} - -convert() { - for i in {$P,$P/usr}/{sbin,bin} ; do prune_symlink $i ; done - for i in {$P,$P/usr}/$libdir ; do prune_symlink $i ; done - prune_symlink $infodir - for i in `seq 9` n ; do prune_symlink $mandir/man$i ; done -} - -fscheck -W=`pwd` -for i in `seq 0 $((${#src[@]} - 1))` ; do - S[$i]=$W/${src[$i]} ; B[$i]=$W/build`test ${#src[@]} -eq 1 || echo $i` -done -P=$W/work ; C=$W/pivot -infodir=$P/usr/share/info -mandir=$P/usr/share/man -docdir=$P/usr/share/doc -myname=`basename $0` -pkg=$pkgbase-$vers-$arch-$build -case $arch in x86_64) libdir=lib64 ;; *) libdir=lib ;; esac -if [ $# -eq 0 ] ; then - opt_download=1 ; opt_config=1 ; opt_build=1 ; opt_package=1 +if [ -f functions ] ; then + source ./functions +elif [ ! -f /usr/share/plamo/functions ] ; then + wget ftp://plamo.linet.gr.jp/pub/Plamo-src/admin/functions + source ./functions else - opt_download=0 ; opt_config=0 ; opt_build=0 ; opt_package=0 - for i in $@ ; do - case $i in - download) opt_download=1 ;; - config) opt_config=1 ;; - build) opt_build=1 ;; - package) opt_package=1 ;; - esac - done + source /usr/share/plamo/functions fi + +fscheck +prepare "$@" if [ $opt_download -eq 1 ] ; then - for i in $url ; do - 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|tgz) tar xvpzf ${i##*/} ;; - bz2|tbz) tar xvpjf ${i##*/} ;; - xz|txz) tar xvpJf ${i##*/} ;; - esac - done + download_sources fi if [ $opt_config -eq 1 ] ; then 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 + apply_patches for i in `seq 0 $((${#B[@]} - 1))` ; do cd ${B[$i]} - if [ -f Makefile ] ; then - make clean - fi - if [ -f config.log ] ; then - rm -rf config.cache config.log - fi if [ -x configure ] ; then ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --libdir='${exec_prefix}'/$libdir --infodir='${prefix}'/share/info \ @@ -245,12 +53,7 @@ done fi if [ $opt_package -eq 1 ] ; then - if [ `id -u` -ne 0 ] ; then - read -p "Do you want to package as root? [y/N] " ans - if [ "x$ans" == "xY" -o "x$ans" == "xy" ] ; then - cd $W ; /bin/su -c "$0 package" ; exit - fi - fi + root_priv if [ -d $P ] ; then rm -rf $P ; fi ; mkdir -p $P if [ -d $C ] ; then rm -rf $C ; fi ; mkdir -p $C touch $W/i.st ; sleep 1 @@ -292,24 +95,8 @@ install usblp /bin/true EOF touch -t `date '+%m%d0900'` $P/etc/modprobe.d{,/plamo-default.conf.new} - for i in `seq 0 $((${#DOCS[@]} - 1))` ; do - for j in ${DOCS[$i]} ; do - for k in ${S[$i]}/$j ; do - install2 $k $docdir/${src[$i]}/${k#${S[$i]}/} - touch -r $k $docdir/${src[$i]}/${k#${S[$i]}/} - gzip_one $docdir/${src[$i]}/${k#${S[$i]}/} - done - done - if [ $i -eq 0 ] ; then - install $myname $docdir/$src - touch -t `date '+%m%d0900'` $docdir/$src/$myname - gzip_one $docdir/$src/$myname - else - ln $docdir/$src/$myname.gz $docdir/${src[$i]} - fi - ( cd $docdir ; find ${src[$i]} -type d -exec touch -r $W/{} {} \; ) - done - convert + setup_docdir + convert_links cat <<- "EOF" >> $P/install/doinst.sh mv etc/modprobe.d/plamo-default.conf.new /tmp @@ -335,6 +122,5 @@ tar rvpf $pkg.tar -C $P install/doinst.sh touch -t `date '+%m%d0900'` $pkg.tar ; xz $pkg.tar ; touch $pkg.tar.xz mv $pkg.tar.xz $pkg.txz - read -p "Do you want to keep work files? [y/N] " ans - if [ "x$ans" != "xY" -a "x$ans" != "xy" ] ; then rm -rf $P $C i.[se]t ; fi + cleanup fi --- plamo/00_base/old/less-20170407/PlamoBuild.less-382 2017-04-07 16:07:12.000000000 +0900 +++ plamo/00_base/less/PlamoBuild.less-382 2017-06-24 13:49:07.000000000 +0900 @@ -10,16 +10,19 @@ ftp://ftp.jp.freebsd.org/pub/FreeBSD/ports/distfiles/less-382-iso262.ext03.patch.gz ftp://plamo.linet.gr.jp/pub/Plamo-src/plamo/00_base/less/less-382-def_priority.patch.gz" verify= +digest= commitid= pkgbase=less vers=382 arch=`uname -m` -build=P5 +build=P6 src=$pkgbase-$vers -patchfiles="" +patchfiles="`echo less-382-iso25{8,8-259,9-260}.patch.gz` + `echo less-382-iso26{0-261,1-262,2.ext03}.patch.gz` + less-382-def_priority.patch.gz" OPT_CONFIG="" DOCS="COPYING INSTALL LICENSE NEWS README" -template=20170323 +template=20170415 tmplurl=ftp://plamo.linet.gr.jp/pub/Plamo-src/admin ###################################################################### @@ -41,16 +44,10 @@ 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 + chmod +w $B/* apply_patches cd $B - gunzip -c $W/less-382-iso258.patch.gz | patch -Np1 -fT -i - - gunzip -c $W/less-382-iso258-259.patch.gz | patch -Np1 -i - - gunzip -c $W/less-382-iso259-260.patch.gz | patch -Np1 -fT -i - - gunzip -c $W/less-382-iso260-261.patch.gz | patch -Np1 -i - - gunzip -c $W/less-382-iso261-262.patch.gz | patch -Np1 -i - - gunzip -c $W/less-382-iso262.ext03.patch.gz | patch -Np1 -fT -i - - gunzip -c $W/less-382-def_priority.patch.gz | patch -Np1 -i - - cp -p Makefile.in Makefile.in.orig ; chmod 644 Makefile.in + cp -p Makefile.in{,.orig} sed -i -e '/^\t\${INSTALL_/s@\${bindir@$(DESTDIR)&@g' \ -e '/^\t\${INSTALL_/s@\${mandir@$(DESTDIR)&@g' \ -e '/\/mkinstalldirs/s@\${bindir@$(DESTDIR)&@g' \ @@ -148,18 +145,17 @@ compress setup_docdir cp -p $B/{LICENSE,README.{iso{,.jp},ext.jp}} $docdir/$src - chmod 644 $docdir/$src/LICENSE + touch -t 200508302245.48 $docdir/$src/LICENSE + touch -t 200602180957.24 $docdir/$src/README.iso{,.jp} + touch -t 201106291956.57 $docdir/$src/README.ext.jp + nkf -e --overwrite $docdir/$src/README.iso.jp chown root.root $docdir/$src/{LICENSE,README.{iso{,.jp},ext.jp}} - nkf -e --in-place $docdir/$src/README.iso.jp - touch -r $B/README.iso.jp $docdir/$src/README.iso.jp rm $docdir/$src/LICENSE.gz for i in LICENSE README.{iso{,.jp},ext.jp} ; do gzip_one $docdir/$src/$i done - mv $docdir/$src/README.{iso{,.jp},ext.jp}.gz $C - mv $docdir/$src/{$func,$myname,$spec}.gz $C - mv $C/README.{iso{,.jp},ext.jp}.gz $docdir/$src - mv $C/{$func,$myname,$spec}.gz $docdir/$src + mv $docdir/$src/{README.{iso{,.jp},ext.jp},$func,$myname,$spec}.gz $C + mv $C/{README.{iso{,.jp},ext.jp},$func,$myname,$spec}.gz $docdir/$src touch -r $S $docdir/$src convert_links tar cvpf $pkg.tar -C $P `cd $P ; find usr/bin | tail -n+2` --- plamo/00_base/old/libcap-20160107/PlamoBuild.libcap-2.22 2016-01-07 09:39:29.000000000 +0900 +++ plamo/00_base/libcap/PlamoBuild.libcap-2.22 2017-04-29 11:14:59.000000000 +0900 @@ -2,214 +2,44 @@ ###################################################################### url="http://ftp.de.debian.org/debian/pool/main/libc/libcap2/libcap2_2.22.orig.tar.gz" +verify= +commitid= pkgbase=libcap vers=2.22 arch=`uname -m` -build=P2 +build=P3 src=$pkgbase-$vers +patchfiles="" OPT_CONFIG="" DOCS="CHANGELOG License README" +template=20170323 +tmplurl=ftp://plamo.linet.gr.jp/pub/Plamo-src/admin ###################################################################### -fscheck() { - PANGRAM="The quick brown fox jumps over the lazy dog." - echo -n "Checking for the filesystem ... " - mkdir pangram ; ( cd pangram ; touch $PANGRAM ) - mv pangram pangram~ ; mkdir pangram ; touch -r pangram~ pangram - tar cpf pangram.tar pangram ; rmdir pangram ; mv pangram~ pangram - for i in $PANGRAM ; do tar rpf pangram.tar pangram/$i ; done - touch -t `date '+%m%d0900'` pangram.tar ; gzip pangram.tar - touch pangram.tar.gz ; mv pangram.tar.gz pangram1.tgz - tar cpf pangram.tar pangram - touch -t `date '+%m%d0900'` pangram.tar ; gzip pangram.tar - touch pangram.tar.gz ; mv pangram.tar.gz pangram2.tgz - if cmp -s pangram1.tgz pangram2.tgz ; then - echo "OK" - rm -rf pangram pangram1.tgz pangram2.tgz - else - echo "NG" - cat <<- "EOF" - Hmm, packaging may not be done properly on this filesystem. - Would you please try again on a default filesystem, thanks! - - Happy packaging!! - - Quitting... - EOF - exit - fi -} - -install2() { - install -d ${2%/*} ; install -m 644 $1 $2 -} - -strip_bindir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - shopt -s nullglob - cd $1 - for i in * ; do - echo "$i" - if [ -h $i ] ; then continue ; fi - if [ -n "`file $i | grep "not stripped"`" ] ; then - echo "stripping -p $i" - strip -p $i - fi - done - ) fi -} - -strip_libdir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - shopt -s nullglob - cd $1 - for i in *.so *.so.* *.a ; do - echo "$i" - if [ -h $i ] ; then continue ; fi - if [ -n "`nm -a $i | grep " a "`" ] ; then - if [ $i != ${i%.a} ] ; then - echo -n "ranlib and " - touch -r $i $i.mt ; ranlib $i ; touch -r $i.mt $i ; rm $i.mt - fi - echo "stripping -gp $i" - strip -gp $i - fi - done - ) fi -} - -gzip_dir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - cd $1 - files=`ls -f --indicator-style=none | sed '/^\.\{1,2\}$/d'` - for i in $files ; do - echo "$i" - if [ ! -f $i -a ! -h $i -o $i != ${i%.gz} ] ; then continue ; fi - lnks=`ls -l $i | awk '{print $2}'` - if [ $lnks -gt 1 ] ; then - inum=`ls -i $i | awk '{print $1}'` - for j in `find . -maxdepth 1 -inum $inum` ; do - if [ ${j#./} == $i ] ; then - gzip -f $i - else - rm -f ${j#./} ; ln $i.gz ${j#./}.gz - fi - done - elif [ -h $i ] ; then - target=`readlink $i` ; rm -f $i ; ln -s $target.gz $i.gz - else - gzip $i - fi - done - for i in $files ; do mv ${i%.gz}.gz $C ; done - for i in $files ; do mv $C/${i%.gz}.gz . ; done - ) fi -} - -gzip_one() { - gzip $1 ; mv $1.gz $C ; mv $C/${1##*/}.gz ${1%/*} -} - -compress() { - for i in {$P,$P/usr}/{sbin,bin} ; do strip_bindir $i ; done - for i in {$P,$P/usr}/$libdir ; do strip_libdir $i ; done - if [ -f $infodir/dir ] ; then rm -f $infodir/dir ; fi - gzip_dir $infodir - for i in `seq 9` n ; do gzip_dir $mandir/man$i ; done -} - -prune_symlink() { - echo "pruning symlink in $1" - if [ -d $1 ] ; then ( - cd $P - rm -f /tmp/iNsT-a.$$ ; touch /tmp/iNsT-a.$$ - for i in `find ${1#$P/} -type l` ; do - target=`readlink $i` - echo "$i -> $target" - echo $i$'\n'$target >> /tmp/iNsT-a.$$ - done - COUNT=1 - LINE=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - while [ -n "$LINE" ] ; do - LINKGOESIN=`dirname $LINE` - LINKNAMEIS=`basename $LINE` - COUNT=$(($COUNT + 1)) - LINKPOINTSTO=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - if [ ! -d install ] ; then mkdir install ; fi - cat <<- EOF >> install/doinst.sh - ( cd $LINKGOESIN ; rm -rf $LINKNAMEIS ) - ( cd $LINKGOESIN ; ln -sf $LINKPOINTSTO $LINKNAMEIS ) - EOF - rm -rf $LINE ; touch -t `date '+%m%d0900'` install/doinst.sh $LINE - COUNT=$(($COUNT + 1)) - LINE=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - done - rm -f /tmp/iNsT-a.$$ - ) fi -} - -convert() { - for i in {$P,$P/usr}/{sbin,bin} ; do prune_symlink $i ; done - for i in {$P,$P/usr}/$libdir ; do prune_symlink $i ; done - prune_symlink $infodir - for i in `seq 9` n ; do prune_symlink $mandir/man$i ; done -} - -fscheck -W=`pwd` -for i in `seq 0 $((${#src[@]} - 1))` ; do - S[$i]=$W/${src[$i]} ; B[$i]=$W/build`test ${#src[@]} -eq 1 || echo $i` -done -P=$W/work ; C=$W/pivot -infodir=$P/usr/share/info -mandir=$P/usr/share/man -docdir=$P/usr/share/doc -myname=`basename $0` -pkg=$pkgbase-$vers-$arch-$build -case $arch in x86_64) libdir=lib64 ;; *) libdir=lib ;; esac -if [ $# -eq 0 ] ; then - opt_download=1 ; opt_config=1 ; opt_build=1 ; opt_package=1 +if [ -f functions ] ; then + source ./functions +elif [ ! -f /usr/share/plamo/functions ] ; then + wget ftp://plamo.linet.gr.jp/pub/Plamo-src/admin/functions + source ./functions else - opt_download=0 ; opt_config=0 ; opt_build=0 ; opt_package=0 - for i in $@ ; do - case $i in - download) opt_download=1 ;; - config) opt_config=1 ;; - build) opt_build=1 ;; - package) opt_package=1 ;; - esac - done + source /usr/share/plamo/functions fi + +fscheck +prepare "$@" if [ $opt_download -eq 1 ] ; then - for i in $url ; do - if [ ! -f ${i##*/} ] ; then wget $i ; fi - done - for i in $url ; do - case ${i##*.} in - tar) tar xvpf ${i##*/} ;; - gz) tar xvpzf ${i##*/} ;; - bz2) tar xvpjf ${i##*/} ;; - esac - done + download_sources fi if [ $opt_config -eq 1 ] ; then 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 + apply_patches for i in `seq 0 $((${#B[@]} - 1))` ; do cd ${B[$i]} - if [ -f Makefile ] ; then - make clean - fi - if [ -f config.log ] ; then - 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 @@ -223,12 +53,7 @@ done fi if [ $opt_package -eq 1 ] ; then - if [ `id -u` -ne 0 ] ; then - read -p "Do you want to package as root? [y/N] " ans - if [ "x$ans" == "xY" -o "x$ans" == "xy" ] ; then - cd $W ; /bin/su -c "$0 package" ; exit - fi - fi + root_priv if [ -d $P ] ; then rm -rf $P ; fi ; mkdir -p $P if [ -d $C ] ; then rm -rf $C ; fi ; mkdir -p $C touch $W/i.st ; sleep 1 @@ -249,24 +74,9 @@ compress strip_libdir $P/$libdir/security touch -t `date '+%m%d0900'` $P/$libdir/security - for i in `seq 0 $((${#DOCS[@]} - 1))` ; do - for j in ${DOCS[$i]} ; do - for k in ${S[$i]}/$j ; do - install2 $k $docdir/${src[$i]}/${k#${S[$i]}/} - touch -r $k $docdir/${src[$i]}/${k#${S[$i]}/} - gzip_one $docdir/${src[$i]}/${k#${S[$i]}/} - done - done - if [ $i -eq 0 ] ; then - install $myname $docdir/$src - touch -t `date '+%m%d0900'` $docdir/$src/$myname - gzip_one $docdir/$src/$myname - else - ln $docdir/$src/$myname.gz $docdir/${src[$i]} - fi - ( cd $docdir ; find ${src[$i]} -type d -exec touch -r $W/{} {} \; ) - done - convert + setup_docdir + touch -t `date '+%m%d0900'` $docdir/$src + convert_links tar cvpf $pkg.tar -C $P `cd $P ; find sbin | tail -n+2` tar rvpf $pkg.tar -C $P `cd $P ; find $libdir -maxdepth 1 | tail -n+2` tar rvpf $pkg.tar -C $P `cd $P ; find usr/$libdir | tail -n+2` @@ -278,6 +88,5 @@ tar rvpf $pkg.tar -C $P install/doinst.sh touch -t `date '+%m%d0900'` $pkg.tar ; xz $pkg.tar ; touch $pkg.tar.xz mv $pkg.tar.xz $pkg.txz - read -p "Do you want to keep work files? [y/N] " ans - if [ "x$ans" != "xY" -a "x$ans" != "xy" ] ; then rm -rf $P $C i.[se]t ; fi + cleanup fi --- plamo/00_base/old/libgcc-20170408/PlamoBuild.libgcc-4.8.5 2017-04-08 16:45:17.000000000 +0900 +++ plamo/00_base/libgcc/PlamoBuild.libgcc-4.8.5 2017-10-15 19:50:35.000000000 +0900 @@ -1,16 +1,17 @@ #!/bin/sh ###################################################################### -url="http://ftp.gnu.org/gnu/gcc/gcc-4.8.5/gcc-4.8.5.tar.bz2 - ftp://plamo.linet.gr.jp/pub/Plamo-src/plamo/01_minimum/devel.txz/gcc/gcc-4.8-filename-output.patch" +url="http://ftp.gnu.org/gnu/gcc/gcc-4.8.5/gcc-4.8.5.tar.bz2" verify= +digest= +branch= commitid= pkgbase=libgcc vers=4.8.5 arch=`uname -m` -build=P3 +build=P4 src=gcc-$vers -patchfiles="gcc-4.8-filename-output.patch" +patchfiles="" OPT_CONFIG="--disable-werror --disable-multilib --enable-install-libiberty --enable-__cxa_atexit --enable-threads=posix --enable-shared --enable-languages=c,c++,fortran,go --enable-gnu-unique-object @@ -18,7 +19,7 @@ --with-linker-hash-style=gnu --enable-clocale=gnu --disable-libstdcxx-pch" DOCS="COPYING ChangeLog ABOUT-NLS NEWS COPYING3.LIB ChangeLog.tree-ssa COPYING3 COPYING.RUNTIME README COPYING.LIB MAINTAINERS" -template=20170323 +template=20170713 tmplurl=ftp://plamo.linet.gr.jp/pub/Plamo-src/admin ###################################################################### --- plamo/00_base/old/libtirpc-20160826/PlamoBuild.libtirpc-0.2.3 2016-08-26 13:45:34.000000000 +0900 +++ plamo/00_base/libtirpc/PlamoBuild.libtirpc-0.2.3 2017-04-17 14:29:27.000000000 +0900 @@ -2,254 +2,47 @@ ###################################################################### url="http://downloads.sourceforge.net/libtirpc/libtirpc-0.2.3.tar.bz2 - http://www.linuxfromscratch.org/patches/downloads/libtirpc/libtirpc-0.2.3-remove_nis-1.patch - http://sourceforge.net/p/libtirpc/mailman/attachment/1364308888.2660.119.camel%40willson.li.ssimo.org/1" + ftp://plamo.linet.gr.jp/pub/Plamo-src/plamo/00_base/libtirpc/libtirpc-0.2.3-remove_nis-1.patch + ftp://plamo.linet.gr.jp/pub/Plamo-src/plamo/00_base/libtirpc/0001-Switch-to-use-standard-GSSAPI-by-default.patch" +verify= +digest= +commitid= pkgbase=libtirpc vers=0.2.3 arch=`uname -m` -build=P4 +build=P5 src=$pkgbase-$vers -patchfiles="" +patchfiles="libtirpc-0.2.3-remove_nis-1.patch + 0001-Switch-to-use-standard-GSSAPI-by-default.patch" OPT_CONFIG="" DOCS="VERSION TODO THANKS README NEWS INSTALL ChangeLog COPYING AUTHORS" +template=20170415 +tmplurl=ftp://plamo.linet.gr.jp/pub/Plamo-src/admin ###################################################################### -fscheck() { - PANGRAM="The quick brown fox jumps over the lazy dog." - echo -n "Checking for the filesystem ... " - mkdir pangram ; ( cd pangram ; touch $PANGRAM ) - mv pangram pangram~ ; mkdir pangram ; touch -r pangram~ pangram - tar cpf pangram.tar pangram ; rmdir pangram ; mv pangram~ pangram - for i in $PANGRAM ; do tar rpf pangram.tar pangram/$i ; done - touch -t `date '+%m%d0900'` pangram.tar ; gzip pangram.tar - touch pangram.tar.gz ; mv pangram.tar.gz pangram1.tgz - tar cpf pangram.tar pangram - touch -t `date '+%m%d0900'` pangram.tar ; gzip pangram.tar - touch pangram.tar.gz ; mv pangram.tar.gz pangram2.tgz - if cmp -s pangram1.tgz pangram2.tgz ; then - echo "OK" - rm -rf pangram pangram1.tgz pangram2.tgz - else - echo "NG" - cat <<- "EOF" - Hmm, packaging may not be done properly on this filesystem. - Would you please try again on a default filesystem, thanks! - - Happy packaging!! - - Quitting... - EOF - exit - fi -} - -install2() { - install -d ${2%/*} ; install -m 644 $1 $2 -} - -strip_bindir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - shopt -s nullglob - cd $1 - for i in * ; do - echo "$i" - if [ -h $i ] ; then continue ; fi - if [ -n "`file $i | grep "not stripped"`" ] ; then - echo "stripping -p $i" - strip -p $i - fi - done - ) fi -} - -strip_libdir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - shopt -s nullglob - cd $1 - for i in *.so *.so.* *.a ; do - echo "$i" - if [ -h $i ] ; then continue ; fi - if [ -n "`nm -a $i | grep " a "`" ] ; then - if [ $i != ${i%.a} ] ; then - echo -n "ranlib and " - touch -r $i $i.mt ; ranlib $i ; touch -r $i.mt $i ; rm $i.mt - fi - echo "stripping -gp $i" - strip -gp $i - fi - done - ) fi -} - -gzip_dir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - cd $1 - files=`ls -f --indicator-style=none | sed '/^\.\{1,2\}$/d'` - for i in $files ; do - echo "$i" - if [ ! -f $i -a ! -h $i -o $i != ${i%.gz} ] ; then continue ; fi - lnks=`ls -l $i | awk '{print $2}'` - if [ $lnks -gt 1 ] ; then - inum=`ls -i $i | awk '{print $1}'` - for j in `find . -maxdepth 1 -inum $inum` ; do - if [ ${j#./} == $i ] ; then - gzip -f $i - else - rm -f ${j#./} ; ln $i.gz ${j#./}.gz - fi - done - elif [ -h $i ] ; then - target=`readlink $i` ; rm -f $i ; ln -s $target.gz $i.gz - else - gzip $i - fi - done - for i in $files ; do mv ${i%.gz}.gz $C ; done - for i in $files ; do mv $C/${i%.gz}.gz . ; done - ) fi -} - -gzip_one() { - gzip $1 ; mv $1.gz $C ; mv $C/${1##*/}.gz ${1%/*} -} - -compress() { - for i in {$P,$P/usr}/{sbin,bin} ; do strip_bindir $i ; done - for i in {$P,$P/usr}/$libdir ; do strip_libdir $i ; done - if [ -f $infodir/dir ] ; then rm -f $infodir/dir ; fi - gzip_dir $infodir - for i in `seq 9` n ; do gzip_dir $mandir/man$i ; done -} - -prune_symlink() { - echo "pruning symlink in $1" - if [ -d $1 ] ; then ( - cd $P - rm -f /tmp/iNsT-a.$$ ; touch /tmp/iNsT-a.$$ - for i in `find ${1#$P/} -type l` ; do - target=`readlink $i` - echo "$i -> $target" - echo $i$'\n'$target >> /tmp/iNsT-a.$$ - done - COUNT=1 - LINE=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - while [ -n "$LINE" ] ; do - LINKGOESIN=`dirname $LINE` - LINKNAMEIS=`basename $LINE` - COUNT=$(($COUNT + 1)) - LINKPOINTSTO=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - if [ ! -d install ] ; then mkdir install ; fi - cat <<- EOF >> install/doinst.sh - ( cd $LINKGOESIN ; rm -rf $LINKNAMEIS ) - ( cd $LINKGOESIN ; ln -sf $LINKPOINTSTO $LINKNAMEIS ) - EOF - rm -rf $LINE ; touch -t `date '+%m%d0900'` install/doinst.sh $LINE - COUNT=$(($COUNT + 1)) - LINE=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - done - rm -f /tmp/iNsT-a.$$ - ) fi -} - -convert() { - for i in {$P,$P/usr}/{sbin,bin} ; do prune_symlink $i ; done - for i in {$P,$P/usr}/$libdir ; do prune_symlink $i ; done - prune_symlink $infodir - for i in `seq 9` n ; do prune_symlink $mandir/man$i ; done -} - -fscheck -W=`pwd` -for i in `seq 0 $((${#src[@]} - 1))` ; do - S[$i]=$W/${src[$i]} ; B[$i]=$W/build`test ${#src[@]} -eq 1 || echo $i` -done -P=$W/work ; C=$W/pivot -infodir=$P/usr/share/info -mandir=$P/usr/share/man -docdir=$P/usr/share/doc -myname=`basename $0` -pkg=$pkgbase-$vers-$arch-$build -case $arch in x86_64) libdir=lib64 ;; *) libdir=lib ;; esac -if [ $# -eq 0 ] ; then - opt_download=1 ; opt_config=1 ; opt_build=1 ; opt_package=1 +if [ -f functions ] ; then + source ./functions +elif [ ! -f /usr/share/plamo/functions ] ; then + wget ftp://plamo.linet.gr.jp/pub/Plamo-src/admin/functions + source ./functions else - opt_download=0 ; opt_config=0 ; opt_build=0 ; opt_package=0 - for i in $@ ; do - case $i in - download) opt_download=1 ;; - config) opt_config=1 ;; - build) opt_build=1 ;; - package) opt_package=1 ;; - esac - done + source /usr/share/plamo/functions fi + +fscheck +prepare "$@" if [ $opt_download -eq 1 ] ; then - alt=0001-Switch-to-use-standard-GSSAPI-by-default.patch - for i in $url ; do - if [ ${i##*/} == 1 ] ; then - [ ! -f $alt ] && wget $i -O $alt - elif [ ! -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|tgz) tar xvpzf ${i##*/} ;; - bz2|tbz) tar xvpjf ${i##*/} ;; - xz|txz) tar xvpJf ${i##*/} ;; - esac - done + download_sources fi if [ $opt_config -eq 1 ] ; then 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 - 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 + apply_patches cd $B - patch -Np1 -i $W/libtirpc-0.2.3-remove_nis-1.patch - patch -Np1 -i $W/0001-Switch-to-use-standard-GSSAPI-by-default.patch autoreconf for i in `seq 0 $((${#B[@]} - 1))` ; do cd ${B[$i]} - if [ -f Makefile ] ; then - make clean - fi - if [ -f config.log ] ; then - rm -rf config.cache config.log - fi if [ -x configure ] ; then ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --libdir='${exec_prefix}'/$libdir --infodir='${prefix}'/share/info \ @@ -266,12 +59,7 @@ done fi if [ $opt_package -eq 1 ] ; then - if [ `id -u` -ne 0 ] ; then - read -p "Do you want to package as root? [y/N] " ans - if [ "x$ans" == "xY" -o "x$ans" == "xy" ] ; then - cd $W ; /bin/su -c "$0 package" ; exit - fi - fi + root_priv if [ -d $P ] ; then rm -rf $P ; fi ; mkdir -p $P if [ -d $C ] ; then rm -rf $C ; fi ; mkdir -p $C touch $W/i.st ; sleep 1 @@ -292,24 +80,8 @@ find $P ! -type l -newer i.st ! -newer i.et \ -exec touch -t `date '+%m%d0900'` {} \; compress - for i in `seq 0 $((${#DOCS[@]} - 1))` ; do - for j in ${DOCS[$i]} ; do - for k in ${S[$i]}/$j ; do - install2 $k $docdir/${src[$i]}/${k#${S[$i]}/} - touch -r $k $docdir/${src[$i]}/${k#${S[$i]}/} - gzip_one $docdir/${src[$i]}/${k#${S[$i]}/} - done - done - if [ $i -eq 0 ] ; then - install $myname $docdir/$src - touch -t `date '+%m%d0900'` $docdir/$src/$myname - gzip_one $docdir/$src/$myname - else - ln $docdir/$src/$myname.gz $docdir/${src[$i]} - fi - ( cd $docdir ; find ${src[$i]} -type d -exec touch -r $W/{} {} \; ) - done - convert + setup_docdir + convert_links rm $P/usr/$libdir/libtirpc.so.1.0.10 tar cvpf $pkg.tar -C $P `cd $P ; find $libdir | tail -n+2` tar rvpf $pkg.tar -C $P \ @@ -322,6 +94,5 @@ tar rvpf $pkg.tar -C $P install/doinst.sh touch -t `date '+%m%d0900'` $pkg.tar ; xz $pkg.tar ; touch $pkg.tar.xz mv $pkg.tar.xz $pkg.txz - read -p "Do you want to keep work files? [y/N] " ans - if [ "x$ans" != "xY" -a "x$ans" != "xy" ] ; then rm -rf $P $C i.[se]t ; fi + cleanup fi --- plamo/00_base/old/lilo-20160323/PlamoBuild.lilo-24.2 2016-03-23 07:18:35.000000000 +0900 +++ plamo/00_base/lilo/PlamoBuild.lilo-24.2 2017-04-22 18:00:47.000000000 +0900 @@ -2,213 +2,50 @@ ###################################################################### url="http://lilo.alioth.debian.org/ftp/sources/lilo-24.2.tar.gz - ftp://ftp.internat.freebsd.org/pub/FreeBSD/distfiles/Dev86src-0.16.18.tar.gz - ftp://plamo.linet.gr.jp/pub/Plamo-src.new/plamo/00_base/lilo/dev86-0.16.17-x86_64.patch.gz - ftp://plamo.linet.gr.jp/pub/Plamo-src.new/plamo/00_base/lilo/dev86-0.16.17-copt.patch.gz - ftp://plamo.linet.gr.jp/pub/Plamo-src.new/plamo/00_base/lilo/plamo_liloconfig.tar.gz" + ftp://ftp.tw.freebsd.org/pub/FreeBSD/FreeBSD/ports/distfiles/Dev86src-0.16.18.tar.gz + ftp://plamo.linet.gr.jp/pub/Plamo-src/plamo/00_base/lilo/dev86-0.16.17-x86_64.patch.gz + ftp://plamo.linet.gr.jp/pub/Plamo-src/plamo/00_base/lilo/dev86-0.16.17-copt.patch.gz + ftp://plamo.linet.gr.jp/pub/Plamo-src/plamo/00_base/lilo/plamo_liloconfig.tar.gz" +verify= +digest= +commitid= pkgbase=lilo vers=24.2 arch=`uname -m` -build=P2 +build=P3 src=$pkgbase-$vers +patchfiles="" OPT_CONFIG="" DOCS="`echo readme/README.{bitmaps,common.problems,disk,nokeyboard}` `echo readme/{README.{pseudo,volumeID,raid1},INCOMPAT,README}` NEWS CHANGELOG TODO README COPYING CHANGELOG_old TOOLS" +template=20170415 +tmplurl=ftp://plamo.linet.gr.jp/pub/Plamo-src/admin ###################################################################### -fscheck() { - PANGRAM="The quick brown fox jumps over the lazy dog." - echo -n "Checking for the filesystem ... " - mkdir pangram ; ( cd pangram ; touch $PANGRAM ) - mv pangram pangram~ ; mkdir pangram ; touch -r pangram~ pangram - tar cpf pangram.tar pangram ; rmdir pangram ; mv pangram~ pangram - for i in $PANGRAM ; do tar rpf pangram.tar pangram/$i ; done - touch -t `date '+%m%d0900'` pangram.tar ; gzip pangram.tar - touch pangram.tar.gz ; mv pangram.tar.gz pangram1.tgz - tar cpf pangram.tar pangram - touch -t `date '+%m%d0900'` pangram.tar ; gzip pangram.tar - touch pangram.tar.gz ; mv pangram.tar.gz pangram2.tgz - if cmp -s pangram1.tgz pangram2.tgz ; then - echo "OK" - rm -rf pangram pangram1.tgz pangram2.tgz - else - echo "NG" - cat <<- "EOF" - Hmm, packaging may not be done properly on this filesystem. - Would you please try again on a default filesystem, thanks! - - Happy packaging!! - - Quitting... - EOF - exit - fi -} - -install2() { - install -d ${2%/*} ; install -m 644 $1 $2 -} - -strip_bindir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - shopt -s nullglob - cd $1 - for i in * ; do - echo "$i" - if [ -h $i ] ; then continue ; fi - if [ -n "`file $i | grep "not stripped"`" ] ; then - echo "stripping -p $i" - strip -p $i - fi - done - ) fi -} - -strip_libdir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - shopt -s nullglob - cd $1 - for i in *.so *.so.* *.a ; do - echo "$i" - if [ -h $i ] ; then continue ; fi - if [ -n "`nm -a $i | grep " a "`" ] ; then - if [ $i != ${i%.a} ] ; then - echo -n "ranlib and " - touch -r $i $i.mt ; ranlib $i ; touch -r $i.mt $i ; rm $i.mt - fi - echo "stripping -gp $i" - strip -gp $i - fi - done - ) fi -} - -gzip_dir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - cd $1 - files=`ls -f --indicator-style=none | sed '/^\.\{1,2\}$/d'` - for i in $files ; do - echo "$i" - if [ ! -f $i -a ! -h $i -o $i != ${i%.gz} ] ; then continue ; fi - lnks=`ls -l $i | awk '{print $2}'` - if [ $lnks -gt 1 ] ; then - inum=`ls -i $i | awk '{print $1}'` - for j in `find . -maxdepth 1 -inum $inum` ; do - if [ ${j#./} == $i ] ; then - gzip -f $i - else - rm -f ${j#./} ; ln $i.gz ${j#./}.gz - fi - done - elif [ -h $i ] ; then - target=`readlink $i` ; rm -f $i ; ln -s $target.gz $i.gz - else - gzip $i - fi - done - for i in $files ; do mv ${i%.gz}.gz $C ; done - for i in $files ; do mv $C/${i%.gz}.gz . ; done - ) fi -} - -gzip_one() { - gzip $1 ; mv $1.gz $C ; mv $C/${1##*/}.gz ${1%/*} -} - -compress() { - for i in {$P,$P/usr}/{sbin,bin} ; do strip_bindir $i ; done - for i in {$P,$P/usr}/$libdir ; do strip_libdir $i ; done - if [ -f $infodir/dir ] ; then rm -f $infodir/dir ; fi - gzip_dir $infodir - for i in `seq 9` n ; do gzip_dir $mandir/man$i ; done -} - -prune_symlink() { - echo "pruning symlink in $1" - if [ -d $1 ] ; then ( - cd $P - rm -f /tmp/iNsT-a.$$ ; touch /tmp/iNsT-a.$$ - for i in `find ${1#$P/} -type l` ; do - target=`readlink $i` - echo "$i -> $target" - echo $i$'\n'$target >> /tmp/iNsT-a.$$ - done - COUNT=1 - LINE=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - while [ -n "$LINE" ] ; do - LINKGOESIN=`dirname $LINE` - LINKNAMEIS=`basename $LINE` - COUNT=$(($COUNT + 1)) - LINKPOINTSTO=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - if [ ! -d install ] ; then mkdir install ; fi - cat <<- EOF >> install/doinst.sh - ( cd $LINKGOESIN ; rm -rf $LINKNAMEIS ) - ( cd $LINKGOESIN ; ln -sf $LINKPOINTSTO $LINKNAMEIS ) - EOF - rm -rf $LINE ; touch -t `date '+%m%d0900'` install/doinst.sh $LINE - COUNT=$(($COUNT + 1)) - LINE=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - done - rm -f /tmp/iNsT-a.$$ - ) fi -} - -convert() { - for i in {$P,$P/usr}/{sbin,bin} ; do prune_symlink $i ; done - for i in {$P,$P/usr}/$libdir ; do prune_symlink $i ; done - prune_symlink $infodir - for i in `seq 9` n ; do prune_symlink $mandir/man$i ; done -} - -fscheck -W=`pwd` -for i in `seq 0 $((${#src[@]} - 1))` ; do - S[$i]=$W/${src[$i]} ; B[$i]=$W/build`test ${#src[@]} -eq 1 || echo $i` -done -P=$W/work ; C=$W/pivot -infodir=$P/usr/share/info -mandir=$P/usr/share/man -docdir=$P/usr/share/doc -myname=`basename $0` -pkg=$pkgbase-$vers-$arch-$build -case $arch in x86_64) libdir=lib64 ;; *) libdir=lib ;; esac -if [ $# -eq 0 ] ; then - opt_download=1 ; opt_config=1 ; opt_build=1 ; opt_package=1 +if [ -f functions ] ; then + source ./functions +elif [ ! -f /usr/share/plamo/functions ] ; then + wget ftp://plamo.linet.gr.jp/pub/Plamo-src/admin/functions + source ./functions else - opt_download=0 ; opt_config=0 ; opt_build=0 ; opt_package=0 - for i in $@ ; do - case $i in - download) opt_download=1 ;; - config) opt_config=1 ;; - build) opt_build=1 ;; - package) opt_package=1 ;; - esac - done + source /usr/share/plamo/functions fi + +fscheck +prepare "$@" if [ $opt_download -eq 1 ] ; then - for i in $url ; do - if [ ! -f ${i##*/} ] ; then wget $i ; fi - done - for i in $url ; do - case ${i##*.} in - tar) tar xvpf ${i##*/} ;; - gz) tar xvpzf ${i##*/} ;; - bz2) tar xvpjf ${i##*/} ;; - esac - done + download_sources fi if [ $opt_config -eq 1 ] ; then 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 + apply_patches cd $B - cp -p checkit checkit.orig - sed 's@^gcc @LANG=C gcc @g' checkit.orig > checkit - cp -p diagnose/Makefile diagnose/Makefile.orig + cp -p checkit{,.orig} + sed -i 's@^gcc @LANG=C &@g' checkit + cp -p diagnose/Makefile{,.orig} cat <<- "EOF" | patch diagnose/Makefile 36c36 < @if [ -x /usr/bin/bcc -o -x /usr/local/bin/bcc ]; then echo Okay; \ @@ -219,18 +56,12 @@ gunzip -c $W/dev86-0.16.17-x86_64.patch.gz | patch -Np1 -i - gunzip -c $W/dev86-0.16.17-copt.patch.gz | patch -Np1 -i - make PREFIX=$W/dev86 install - PATH="$W/dev86/bin:$PATH" + PATH=$W/dev86/bin:$PATH for i in `seq 0 $((${#B[@]} - 1))` ; do cd ${B[$i]} - if [ -f Makefile ] ; then - make clean - fi - if [ -f config.log ] ; then - 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 @@ -244,12 +75,7 @@ done fi if [ $opt_package -eq 1 ] ; then - if [ `id -u` -ne 0 ] ; then - read -p "Do you want to package as root? [y/N] " ans - if [ "x$ans" == "xY" -o "x$ans" == "xy" ] ; then - cd $W ; /bin/su -c "$0 package" ; exit - fi - fi + root_priv if [ -d $P ] ; then rm -rf $P ; fi ; mkdir -p $P if [ -d $C ] ; then rm -rf $C ; fi ; mkdir -p $C touch $W/i.st ; sleep 1 @@ -276,23 +102,7 @@ cp -p plamo_liloconfig/var/log/setup/$i $P/var/log/setup chown root.root $P/var/log/setup/$i done - for i in `seq 0 $((${#DOCS[@]} - 1))` ; do - for j in ${DOCS[$i]} ; do - for k in ${S[$i]}/$j ; do - install2 $k $docdir/${src[$i]}/${k#${S[$i]}/} - touch -r $k $docdir/${src[$i]}/${k#${S[$i]}/} - gzip_one $docdir/${src[$i]}/${k#${S[$i]}/} - done - done - if [ $i -eq 0 ] ; then - install $myname $docdir/$src - touch -t `date '+%m%d0900'` $docdir/$src/$myname - gzip_one $docdir/$src/$myname - else - ln $docdir/$src/$myname.gz $docdir/${src[$i]} - fi - ( cd $docdir ; find ${src[$i]} -type d -exec touch -r $W/{} {} \; ) - done + setup_docdir mkdir $docdir/$src/sample for i in sample/lilo.{old-{raid,special},example}.conf \ images/{{inside,onlyblue,tuxlogo}_16c.dat,README} ; do @@ -302,11 +112,13 @@ cp -a $S/doc $docdir/$src chown -R root.root $docdir/$src/{sample,doc} mv $docdir/$src/{readme,sample,{NEWS,CHANGELOG,TODO,README}.gz} $C - mv $docdir/$src/{{COPYING,CHANGELOG_old,TOOLS}.gz,doc,$myname.gz} $C + mv $docdir/$src/{{COPYING,CHANGELOG_old,TOOLS}.gz,doc} $C + mv $docdir/$src/{$func,$myname,$spec}.gz $C mv $C/{readme,sample,{NEWS,CHANGELOG,TODO,README}.gz} $docdir/$src - mv $C/{{COPYING,CHANGELOG_old,TOOLS}.gz,doc,$myname.gz} $docdir/$src + mv $C/{{COPYING,CHANGELOG_old,TOOLS}.gz,doc} $docdir/$src + mv $C/{$func,$myname,$spec}.gz $docdir/$src touch -r $S $docdir/$src - convert + convert_links tar cvpf $pkg.tar -C $P `cd $P ; find sbin | 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 boot | tail -n+2` @@ -317,6 +129,5 @@ tar rvpf $pkg.tar -C $P install/doinst.sh touch -t `date '+%m%d0900'` $pkg.tar ; xz $pkg.tar ; touch $pkg.tar.xz mv $pkg.tar.xz $pkg.txz - read -p "Do you want to keep work files? [y/N] " ans - if [ "x$ans" != "xY" -a "x$ans" != "xy" ] ; then rm -rf $P $C i.[se]t ; fi + cleanup fi --- plamo/00_base/old/linux_firmware-20160126/PlamoBuild.linux_firmware-git_20160112 2016-01-26 12:06:22.000000000 +0900 +++ plamo/00_base/linux_firmware/PlamoBuild.linux_firmware-git_20160112 2017-04-17 15:47:29.000000000 +0900 @@ -2,11 +2,15 @@ ###################################################################### url="https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git" +verify= +digest= +commitid=40e9ae8 pkgbase=linux_firmware vers=git_20160112 arch=noarch -build=P2 +build=P3 src=linux-firmware +patchfiles="" OPT_CONFIG="" DOCS="GPL-3 `echo LICENCE.{Abilis,IntcSST2,Marvell,OLPC}` LICENSE.radeon `echo LICENCE.{agere,atheros_firmware,broadcom_bcm43xx,ca0132}` @@ -22,215 +26,36 @@ `echo LICENCE.{kaweth,moxa,nvidia,open-ath9k-htc-firmware,qat_firmware}` `echo LICENCE.{qla1280,ti-keystone}` `echo LICENSE.{QualcommAtheros_{ar3k,ath10k},amdgpu,atmel,hfi1_firmware}` - LICENSE.i915" + LICENSE.i915 ChangeLog" +template=20170415 +tmplurl=ftp://plamo.linet.gr.jp/pub/Plamo-src/admin ###################################################################### -fscheck() { - PANGRAM="The quick brown fox jumps over the lazy dog." - echo -n "Checking for the filesystem ... " - mkdir pangram ; ( cd pangram ; touch $PANGRAM ) - mv pangram pangram~ ; mkdir pangram ; touch -r pangram~ pangram - tar cpf pangram.tar pangram ; rmdir pangram ; mv pangram~ pangram - for i in $PANGRAM ; do tar rpf pangram.tar pangram/$i ; done - touch -t `date '+%m%d0900'` pangram.tar ; gzip pangram.tar - touch pangram.tar.gz ; mv pangram.tar.gz pangram1.tgz - tar cpf pangram.tar pangram - touch -t `date '+%m%d0900'` pangram.tar ; gzip pangram.tar - touch pangram.tar.gz ; mv pangram.tar.gz pangram2.tgz - if cmp -s pangram1.tgz pangram2.tgz ; then - echo "OK" - rm -rf pangram pangram1.tgz pangram2.tgz - else - echo "NG" - cat <<- "EOF" - Hmm, packaging may not be done properly on this filesystem. - Would you please try again on a default filesystem, thanks! - - Happy packaging!! - - Quitting... - EOF - exit - fi -} - -install2() { - install -d ${2%/*} ; install -m 644 $1 $2 -} - -strip_bindir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - shopt -s nullglob - cd $1 - for i in * ; do - echo "$i" - if [ -h $i ] ; then continue ; fi - if [ -n "`file $i | grep "not stripped"`" ] ; then - echo "stripping -p $i" - strip -p $i - fi - done - ) fi -} - -strip_libdir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - shopt -s nullglob - cd $1 - for i in *.so *.so.* *.a ; do - echo "$i" - if [ -h $i ] ; then continue ; fi - if [ -n "`nm -a $i | grep " a "`" ] ; then - if [ $i != ${i%.a} ] ; then - echo -n "ranlib and " - touch -r $i $i.mt ; ranlib $i ; touch -r $i.mt $i ; rm $i.mt - fi - echo "stripping -gp $i" - strip -gp $i - fi - done - ) fi -} - -gzip_dir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - cd $1 - files=`ls -f --indicator-style=none | sed '/^\.\{1,2\}$/d'` - for i in $files ; do - echo "$i" - if [ ! -f $i -a ! -h $i -o $i != ${i%.gz} ] ; then continue ; fi - lnks=`ls -l $i | awk '{print $2}'` - if [ $lnks -gt 1 ] ; then - inum=`ls -i $i | awk '{print $1}'` - for j in `find . -maxdepth 1 -inum $inum` ; do - if [ ${j#./} == $i ] ; then - gzip -f $i - else - rm -f ${j#./} ; ln $i.gz ${j#./}.gz - fi - done - elif [ -h $i ] ; then - target=`readlink $i` ; rm -f $i ; ln -s $target.gz $i.gz - else - gzip $i - fi - done - for i in $files ; do mv ${i%.gz}.gz $C ; done - for i in $files ; do mv $C/${i%.gz}.gz . ; done - ) fi -} - -gzip_one() { - gzip $1 ; mv $1.gz $C ; mv $C/${1##*/}.gz ${1%/*} -} - -compress() { - for i in {$P,$P/usr}/{sbin,bin} ; do strip_bindir $i ; done - for i in {$P,$P/usr}/$libdir ; do strip_libdir $i ; done - if [ -f $infodir/dir ] ; then rm -f $infodir/dir ; fi - gzip_dir $infodir - for i in `seq 9` n ; do gzip_dir $mandir/man$i ; done -} - -prune_symlink() { - echo "pruning symlink in $1" - if [ -d $1 ] ; then ( - cd $P - rm -f /tmp/iNsT-a.$$ ; touch /tmp/iNsT-a.$$ - for i in `find ${1#$P/} -type l` ; do - target=`readlink $i` - echo "$i -> $target" - echo $i$'\n'$target >> /tmp/iNsT-a.$$ - done - COUNT=1 - LINE=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - while [ -n "$LINE" ] ; do - LINKGOESIN=`dirname $LINE` - LINKNAMEIS=`basename $LINE` - COUNT=$(($COUNT + 1)) - LINKPOINTSTO=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - if [ ! -d install ] ; then mkdir install ; fi - cat <<- EOF >> install/doinst.sh - ( cd $LINKGOESIN ; rm -rf $LINKNAMEIS ) - ( cd $LINKGOESIN ; ln -sf $LINKPOINTSTO $LINKNAMEIS ) - EOF - rm -rf $LINE ; touch -t `date '+%m%d0900'` install/doinst.sh $LINE - COUNT=$(($COUNT + 1)) - LINE=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - done - rm -f /tmp/iNsT-a.$$ - ) fi -} - -convert() { - for i in {$P,$P/usr}/{sbin,bin} ; do prune_symlink $i ; done - for i in {$P,$P/usr}/$libdir ; do prune_symlink $i ; done - prune_symlink $infodir - for i in `seq 9` n ; do prune_symlink $mandir/man$i ; done -} - -fscheck -W=`pwd` -for i in `seq 0 $((${#src[@]} - 1))` ; do - S[$i]=$W/${src[$i]} ; B[$i]=$W/build`test ${#src[@]} -eq 1 || echo $i` -done -P=$W/work ; C=$W/pivot -infodir=$P/usr/share/info -mandir=$P/usr/share/man -docdir=$P/usr/share/doc -myname=`basename $0` -pkg=$pkgbase-$vers-$arch-$build -case $arch in x86_64) libdir=lib64 ;; *) libdir=lib ;; esac -if [ $# -eq 0 ] ; then - opt_download=1 ; opt_config=1 ; opt_build=1 ; opt_package=1 +if [ -f functions ] ; then + source ./functions +elif [ ! -f /usr/share/plamo/functions ] ; then + wget ftp://plamo.linet.gr.jp/pub/Plamo-src/admin/functions + source ./functions else - opt_download=0 ; opt_config=0 ; opt_build=0 ; opt_package=0 - for i in $@ ; do - case $i in - download) opt_download=1 ;; - config) opt_config=1 ;; - build) opt_build=1 ;; - package) opt_package=1 ;; - esac - done + source /usr/share/plamo/functions fi + +fscheck +prepare "$@" if [ $opt_download -eq 1 ] ; then - for i in $url ; do - case ${i##*.} in - git) if [ ! -d `basename ${i##*/} .git` ] ; then git clone $i ; else - ( cd `basename ${i##*/} .git` ; git pull origin master ) ; fi ;; - *) if [ ! -f ${i##*/} ] ; then wget $i ; fi ;; - esac - done - for i in $url ; do - case ${i##*.} in - tar) tar xvpf ${i##*/} ;; - gz) tar xvpzf ${i##*/} ;; - bz2) tar xvpjf ${i##*/} ;; - git) ( cd `basename ${i##*/} .git` - git checkout origin/master ; git reset --hard 40e9ae8 - git set-file-times ) ;; - esac - done + download_sources + nkf -e --overwrite linux-firmware/ChangeLog fi if [ $opt_config -eq 1 ] ; then 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 + apply_patches for i in `seq 0 $((${#B[@]} - 1))` ; do cd ${B[$i]} - if [ -f Makefile ] ; then - make clean - fi - if [ -f config.log ] ; then - 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 @@ -244,12 +69,7 @@ done fi if [ $opt_package -eq 1 ] ; then - if [ `id -u` -ne 0 ] ; then - read -p "Do you want to package as root? [y/N] " ans - if [ "x$ans" == "xY" -o "x$ans" == "xy" ] ; then - cd $W ; /bin/su -c "$0 package" ; exit - fi - fi + root_priv if [ -d $P ] ; then rm -rf $P ; fi ; mkdir -p $P if [ -d $C ] ; then rm -rf $C ; fi ; mkdir -p $C touch $W/i.st ; sleep 1 @@ -264,25 +84,9 @@ find $P ! -type l -newer i.st ! -newer i.et \ -exec touch -t `date '+%m%d0900'` {} \; compress - for i in `seq 0 $((${#DOCS[@]} - 1))` ; do - for j in ${DOCS[$i]} ; do - for k in ${S[$i]}/$j ; do - install2 $k $docdir/${src[$i]}/${k#${S[$i]}/} - touch -r $k $docdir/${src[$i]}/${k#${S[$i]}/} - gzip_one $docdir/${src[$i]}/${k#${S[$i]}/} - done - done - if [ $i -eq 0 ] ; then - install $myname $docdir/$src - touch -t `date '+%m%d0900'` $docdir/$src/$myname - gzip_one $docdir/$src/$myname - else - ln $docdir/$src/$myname.gz $docdir/${src[$i]} - fi - ( cd $docdir ; find ${src[$i]} -type d -exec touch -r $W/{} {} \; ) - done + setup_docdir touch -t `date '+%m%d0900'` $docdir/$src - convert + convert_links for i in . cxgb4 libertas ti-connectivity ; do touch -t `date '+%m%d0900'` $P/lib/firmware/$i done @@ -291,6 +95,5 @@ tar rvpf $pkg.tar -C $P install/doinst.sh touch -t `date '+%m%d0900'` $pkg.tar ; xz $pkg.tar ; touch $pkg.tar.xz mv $pkg.tar.xz $pkg.txz - read -p "Do you want to keep work files? [y/N] " ans - if [ "x$ans" != "xY" -a "x$ans" != "xy" ] ; then rm -rf $P $C i.[se]t ; fi + cleanup fi --- plamo/00_base/old/linux_pam-20161121/PlamoBuild.linux_pam-1.1.8 2016-11-21 18:30:32.000000000 +0900 +++ plamo/00_base/linux_pam/PlamoBuild.linux_pam-1.1.8 2017-05-08 14:48:20.000000000 +0900 @@ -1,251 +1,46 @@ #!/bin/sh ###################################################################### -url="https://fedorahosted.org/releases/l/i/linux-pam/Linux-PAM-1.1.8.tar.bz2 +url="http://www.linux-pam.org/library/Linux-PAM-1.1.8.tar.bz2 ftp://plamo.linet.gr.jp/pub/Plamo-src/plamo/00_base/linux_pam/pam-1.1.8-cve-2013-7041.patch ftp://plamo.linet.gr.jp/pub/Plamo-src/plamo/00_base/linux_pam/pam-1.1.8-cve-2014-2583.patch" +verify= +digest= +commitid= pkgbase=linux_pam vers=1.1.8 arch=`uname -m` -build=P3 +build=P4 src=Linux-PAM-$vers patchfiles="`echo pam-1.1.8-cve-{2013-7041,2014-2583}.patch`" OPT_CONFIG="--enable-static --enable-read-both-confs --disable-nis" DOCS="NEWS ABOUT-NLS Copyright README COPYING AUTHORS CHANGELOG ChangeLog INSTALL ChangeLog-CVS" -template=20161020 +template=20170415 tmplurl=ftp://plamo.linet.gr.jp/pub/Plamo-src/admin ###################################################################### -fscheck() { - PANGRAM="The quick brown fox jumps over the lazy dog." - echo -n "Checking for the filesystem ... " - mkdir pangram ; ( cd pangram ; touch $PANGRAM ) - mv pangram pangram~ ; mkdir pangram ; touch -r pangram~ pangram - tar cpf pangram.tar pangram ; rmdir pangram ; mv pangram~ pangram - for i in $PANGRAM ; do tar rpf pangram.tar pangram/$i ; done - touch -t `date '+%m%d0900'` pangram.tar ; gzip pangram.tar - touch pangram.tar.gz ; mv pangram.tar.gz pangram1.tgz - tar cpf pangram.tar pangram - touch -t `date '+%m%d0900'` pangram.tar ; gzip pangram.tar - touch pangram.tar.gz ; mv pangram.tar.gz pangram2.tgz - if cmp -s pangram1.tgz pangram2.tgz ; then - echo "OK" - rm -rf pangram pangram1.tgz pangram2.tgz - else - echo "NG" - cat <<- "EOF" - Hmm, packaging may not be done properly on this filesystem. - Would you please try again on a default filesystem, thanks! - - Happy packaging!! - - Quitting... - EOF - exit - fi -} - -install2() { - install -d ${2%/*} ; install -m 644 $1 $2 -} - -strip_bindir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - shopt -s nullglob - cd $1 - for i in * ; do - echo "$i" - if [ -h $i ] ; then continue ; fi - if [ -n "`file $i | grep "not stripped"`" ] ; then - echo "stripping -p $i" - strip -p $i - fi - done - ) fi -} - -strip_libdir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - shopt -s nullglob - cd $1 - for i in *.so *.so.* *.a ; do - echo "$i" - if [ -h $i ] ; then continue ; fi - if [ -n "`nm -a $i | grep " a "`" ] ; then - if [ $i != ${i%.a} ] ; then - echo -n "ranlib and " - touch -r $i $i.mt ; ranlib $i ; touch -r $i.mt $i ; rm $i.mt - fi - echo "stripping -gp $i" - strip -gp $i - fi - done - ) fi -} - -gzip_dir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - cd $1 - files=`ls -f --indicator-style=none | sed '/^\.\{1,2\}$/d'` - for i in $files ; do - echo "$i" - if [ ! -f $i -a ! -h $i -o $i != ${i%.gz} ] ; then continue ; fi - lnks=`ls -l $i | awk '{print $2}'` - if [ $lnks -gt 1 ] ; then - inum=`ls -i $i | awk '{print $1}'` - for j in `find . -maxdepth 1 -inum $inum` ; do - if [ ${j#./} == $i ] ; then - gzip -f $i - else - rm -f ${j#./} ; ln $i.gz ${j#./}.gz - fi - done - elif [ -h $i ] ; then - target=`readlink $i` ; rm -f $i ; ln -s $target.gz $i.gz - else - gzip $i - fi - done - for i in $files ; do mv ${i%.gz}.gz $C ; done - for i in $files ; do mv $C/${i%.gz}.gz . ; done - ) fi -} - -gzip_one() { - gzip $1 ; mv $1.gz $C ; mv $C/${1##*/}.gz ${1%/*} -} - -compress() { - for i in {$P,$P/usr}/{sbin,bin} ; do strip_bindir $i ; done - for i in {$P,$P/usr}/$libdir ; do strip_libdir $i ; done - if [ -f $infodir/dir ] ; then rm -f $infodir/dir ; fi - gzip_dir $infodir - for i in `seq 9` n ; do gzip_dir $mandir/man$i ; done -} - -prune_symlink() { - echo "pruning symlink in $1" - if [ -d $1 ] ; then ( - cd $P - rm -f /tmp/iNsT-a.$$ ; touch /tmp/iNsT-a.$$ - for i in `find ${1#$P/} -type l` ; do - target=`readlink $i` - echo "$i -> $target" - echo $i$'\n'$target >> /tmp/iNsT-a.$$ - done - COUNT=1 - LINE=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - while [ -n "$LINE" ] ; do - LINKGOESIN=`dirname $LINE` - LINKNAMEIS=`basename $LINE` - COUNT=$(($COUNT + 1)) - LINKPOINTSTO=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - if [ ! -d install ] ; then mkdir install ; fi - cat <<- EOF >> install/doinst.sh - ( cd $LINKGOESIN ; rm -rf $LINKNAMEIS ) - ( cd $LINKGOESIN ; ln -sf $LINKPOINTSTO $LINKNAMEIS ) - EOF - rm -rf $LINE ; touch -t `date '+%m%d0900'` install/doinst.sh $LINE - COUNT=$(($COUNT + 1)) - LINE=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - done - rm -f /tmp/iNsT-a.$$ - ) fi -} - -convert() { - for i in {$P,$P/usr}/{sbin,bin} ; do prune_symlink $i ; done - for i in {$P,$P/usr}/$libdir ; do prune_symlink $i ; done - prune_symlink $infodir - for i in `seq 9` n ; do prune_symlink $mandir/man$i ; done -} - -fscheck -W=`pwd` -for i in `seq 0 $((${#src[@]} - 1))` ; do - S[$i]=$W/${src[$i]} ; B[$i]=$W/build`test ${#src[@]} -eq 1 || echo $i` -done -P=$W/work ; C=$W/pivot -infodir=$P/usr/share/info -mandir=$P/usr/share/man -docdir=$P/usr/share/doc -myname=`basename $0` -pkg=$pkgbase-$vers-$arch-$build -case $arch in x86_64) libdir=lib64 ;; *) libdir=lib ;; esac -if [ $# -eq 0 ] ; then - opt_download=1 ; opt_config=1 ; opt_build=1 ; opt_package=1 +if [ -f functions ] ; then + source ./functions +elif [ ! -f /usr/share/plamo/functions ] ; then + wget ftp://plamo.linet.gr.jp/pub/Plamo-src/admin/functions + source ./functions else - opt_download=0 ; opt_config=0 ; opt_build=0 ; opt_package=0 - for i in $@ ; do - case $i in - download) opt_download=1 ;; - config) opt_config=1 ;; - build) opt_build=1 ;; - package) opt_package=1 ;; - esac - done + source /usr/share/plamo/functions fi + +fscheck +prepare "$@" if [ $opt_download -eq 1 ] ; then - for i in $url ; do - 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|tgz) tar xvpzf ${i##*/} ;; - bz2|tbz) tar xvpjf ${i##*/} ;; - xz|txz) tar xvpJf ${i##*/} ;; - esac - done + download_sources fi if [ $opt_config -eq 1 ] ; then 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 + apply_patches 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 - if [ -f config.log ] ; then - rm -rf config.cache config.log - fi if [ -x configure ] ; then ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --libdir=/usr/$libdir --infodir='${prefix}'/share/info \ @@ -263,12 +58,7 @@ done fi if [ $opt_package -eq 1 ] ; then - if [ `id -u` -ne 0 ] ; then - read -p "Do you want to package as root? [y/N] " ans - if [ "x$ans" == "xY" -o "x$ans" == "xy" ] ; then - cd $W ; /bin/su -c "$0 package" ; exit - fi - fi + root_priv if [ -d $P ] ; then rm -rf $P ; fi ; mkdir -p $P if [ -d $C ] ; then rm -rf $C ; fi ; mkdir -p $C touch $W/i.st ; sleep 1 @@ -313,7 +103,7 @@ # # The PAM configuration file for shutdown/reboot operations # - + auth sufficient pam_rootok.so auth required pam_unix.so @@ -354,53 +144,23 @@ compress strip_libdir $P/$libdir/security touch -t `date '+%m%d0900'` $P/$libdir/security - for i in `seq 0 $((${#DOCS[@]} - 1))` ; do - for j in ${DOCS[$i]} ; do - for k in ${S[$i]}/$j ; do - install2 $k $docdir/${src[$i]}/${k#${S[$i]}/} - touch -r $k $docdir/${src[$i]}/${k#${S[$i]}/} - gzip_one $docdir/${src[$i]}/${k#${S[$i]}/} - done - done - if [ $i -eq 0 ] ; then - install $myname $docdir/$src - touch -t `date '+%m%d0900'` $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 + setup_docdir mv $docdir/Linux-PAM $docdir/$src/doc mv $docdir/$src/{doc,{ABOUT-NLS,Copyright,README,COPYING,AUTHORS}.gz} $C mv $docdir/$src/{CHANGELOG,ChangeLog,INSTALL,ChangeLog-CVS}.gz $C - mv $docdir/$src/{$myname,$spec}.gz $C + mv $docdir/$src/{$func,$myname,$spec}.gz $C mv $C/{doc,{ABOUT-NLS,Copyright,README,COPYING,AUTHORS}.gz} $docdir/$src mv $C/{CHANGELOG,ChangeLog,INSTALL,ChangeLog-CVS}.gz $docdir/$src - mv $C/{$myname,$spec}.gz $docdir/$src + mv $C/{$func,$myname,$spec}.gz $docdir/$src touch -r $S $docdir/$src - convert + convert_links prune_symlink $P/etc/pam.d touch -t `date '+%m%d0900'` $P/etc/pam.d tar cvpf $pkg.tar -C $P `cd $P ; find sbin | tail -n+2` tar rvpf $pkg.tar -C $P `cd $P ; find $libdir -maxdepth 1 | tail -n+2` tar rvpf $pkg.tar -C $P `cd $P ; find usr/$libdir | tail -n+2` tar rvpf $pkg.tar -C $P usr/include/security - 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/locale -name *.mo` tar rvpf $pkg.tar -C $P etc/{security,environment,pam.d,securetty} 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` @@ -409,6 +169,5 @@ tar rvpf $pkg.tar -C $P install/doinst.sh touch -t `date '+%m%d0900'` $pkg.tar ; xz $pkg.tar ; touch $pkg.tar.xz mv $pkg.tar.xz $pkg.txz - read -p "Do you want to keep work files? [y/N] " ans - if [ "x$ans" != "xY" -a "x$ans" != "xy" ] ; then rm -rf $P $C i.[se]t ; fi + cleanup fi --- plamo/00_base/old/logrotate-20160606/PlamoBuild.logrotate-3.8.1 2016-06-06 08:26:47.000000000 +0900 +++ plamo/00_base/logrotate/PlamoBuild.logrotate-3.8.1 2017-04-24 11:52:59.000000000 +0900 @@ -1,234 +1,43 @@ #!/bin/sh ###################################################################### -url="https://fedorahosted.org/releases/l/o/logrotate/logrotate-3.8.1.tar.gz" +url="http://ftp.nara.wide.ad.jp/pub/sunfreeware/SOURCES/logrotate-3.8.1.tar.gz" +verify= +digest= +commitid= pkgbase=logrotate vers=3.8.1 arch=`uname -m` -build=P4 +build=P5 src=$pkgbase-$vers +patchfiles="" OPT_CONFIG="" DOCS="README.HPUX README.Solaris CHANGES COPYING" +template=20170415 +tmplurl=ftp://plamo.linet.gr.jp/pub/Plamo-src/admin ###################################################################### -fscheck() { - PANGRAM="The quick brown fox jumps over the lazy dog." - echo -n "Checking for the filesystem ... " - mkdir pangram ; ( cd pangram ; touch $PANGRAM ) - mv pangram pangram~ ; mkdir pangram ; touch -r pangram~ pangram - tar cpf pangram.tar pangram ; rmdir pangram ; mv pangram~ pangram - for i in $PANGRAM ; do tar rpf pangram.tar pangram/$i ; done - touch -t `date '+%m%d0900'` pangram.tar ; gzip pangram.tar - touch pangram.tar.gz ; mv pangram.tar.gz pangram1.tgz - tar cpf pangram.tar pangram - touch -t `date '+%m%d0900'` pangram.tar ; gzip pangram.tar - touch pangram.tar.gz ; mv pangram.tar.gz pangram2.tgz - if cmp -s pangram1.tgz pangram2.tgz ; then - echo "OK" - rm -rf pangram pangram1.tgz pangram2.tgz - else - echo "NG" - cat <<- "EOF" - Hmm, packaging may not be done properly on this filesystem. - Would you please try again on a default filesystem, thanks! - - Happy packaging!! - - Quitting... - EOF - exit - fi -} - -install2() { - install -d ${2%/*} ; install -m 644 $1 $2 -} - -strip_bindir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - shopt -s nullglob - cd $1 - for i in * ; do - echo "$i" - if [ -h $i ] ; then continue ; fi - if [ -n "`file $i | grep "not stripped"`" ] ; then - echo "stripping -p $i" - strip -p $i - fi - done - ) fi -} - -strip_libdir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - shopt -s nullglob - cd $1 - for i in *.so *.so.* *.a ; do - echo "$i" - if [ -h $i ] ; then continue ; fi - if [ -n "`nm -a $i | grep " a "`" ] ; then - if [ $i != ${i%.a} ] ; then - echo -n "ranlib and " - touch -r $i $i.mt ; ranlib $i ; touch -r $i.mt $i ; rm $i.mt - fi - echo "stripping -gp $i" - strip -gp $i - fi - done - ) fi -} - -gzip_dir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - cd $1 - files=`ls -f --indicator-style=none | sed '/^\.\{1,2\}$/d'` - for i in $files ; do - echo "$i" - if [ ! -f $i -a ! -h $i -o $i != ${i%.gz} ] ; then continue ; fi - lnks=`ls -l $i | awk '{print $2}'` - if [ $lnks -gt 1 ] ; then - inum=`ls -i $i | awk '{print $1}'` - for j in `find . -maxdepth 1 -inum $inum` ; do - if [ ${j#./} == $i ] ; then - gzip -f $i - else - rm -f ${j#./} ; ln $i.gz ${j#./}.gz - fi - done - elif [ -h $i ] ; then - target=`readlink $i` ; rm -f $i ; ln -s $target.gz $i.gz - else - gzip $i - fi - done - for i in $files ; do mv ${i%.gz}.gz $C ; done - for i in $files ; do mv $C/${i%.gz}.gz . ; done - ) fi -} - -gzip_one() { - gzip $1 ; mv $1.gz $C ; mv $C/${1##*/}.gz ${1%/*} -} - -compress() { - for i in {$P,$P/usr}/{sbin,bin} ; do strip_bindir $i ; done - for i in {$P,$P/usr}/$libdir ; do strip_libdir $i ; done - if [ -f $infodir/dir ] ; then rm -f $infodir/dir ; fi - gzip_dir $infodir - for i in `seq 9` n ; do gzip_dir $mandir/man$i ; done -} - -prune_symlink() { - echo "pruning symlink in $1" - if [ -d $1 ] ; then ( - cd $P - rm -f /tmp/iNsT-a.$$ ; touch /tmp/iNsT-a.$$ - for i in `find ${1#$P/} -type l` ; do - target=`readlink $i` - echo "$i -> $target" - echo $i$'\n'$target >> /tmp/iNsT-a.$$ - done - COUNT=1 - LINE=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - while [ -n "$LINE" ] ; do - LINKGOESIN=`dirname $LINE` - LINKNAMEIS=`basename $LINE` - COUNT=$(($COUNT + 1)) - LINKPOINTSTO=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - if [ ! -d install ] ; then mkdir install ; fi - cat <<- EOF >> install/doinst.sh - ( cd $LINKGOESIN ; rm -rf $LINKNAMEIS ) - ( cd $LINKGOESIN ; ln -sf $LINKPOINTSTO $LINKNAMEIS ) - EOF - rm -rf $LINE ; touch -t `date '+%m%d0900'` install/doinst.sh $LINE - COUNT=$(($COUNT + 1)) - LINE=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - done - rm -f /tmp/iNsT-a.$$ - ) fi -} - -convert() { - for i in {$P,$P/usr}/{sbin,bin} ; do prune_symlink $i ; done - for i in {$P,$P/usr}/$libdir ; do prune_symlink $i ; done - prune_symlink $infodir - for i in `seq 9` n ; do prune_symlink $mandir/man$i ; done -} - -fscheck -W=`pwd` -for i in `seq 0 $((${#src[@]} - 1))` ; do - S[$i]=$W/${src[$i]} ; B[$i]=$W/build`test ${#src[@]} -eq 1 || echo $i` -done -P=$W/work ; C=$W/pivot -infodir=$P/usr/share/info -mandir=$P/usr/share/man -docdir=$P/usr/share/doc -myname=`basename $0` -pkg=$pkgbase-$vers-$arch-$build -case $arch in x86_64) libdir=lib64 ;; *) libdir=lib ;; esac -if [ $# -eq 0 ] ; then - opt_download=1 ; opt_config=1 ; opt_build=1 ; opt_package=1 +if [ -f functions ] ; then + source ./functions +elif [ ! -f /usr/share/plamo/functions ] ; then + wget ftp://plamo.linet.gr.jp/pub/Plamo-src/admin/functions + source ./functions else - opt_download=0 ; opt_config=0 ; opt_build=0 ; opt_package=0 - for i in $@ ; do - case $i in - download) opt_download=1 ;; - config) opt_config=1 ;; - build) opt_build=1 ;; - package) opt_package=1 ;; - esac - done + source /usr/share/plamo/functions fi + +fscheck +prepare "$@" if [ $opt_download -eq 1 ] ; then - for i in $url ; do - 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|tgz) tar xvpzf ${i##*/} ;; - bz2|tbz) tar xvpjf ${i##*/} ;; - xz|txz) tar xvpJf ${i##*/} ;; - esac - done + download_sources fi if [ $opt_config -eq 1 ] ; then 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 + apply_patches for i in `seq 0 $((${#B[@]} - 1))` ; do cd ${B[$i]} - if [ -f Makefile ] ; then - make clean - fi - if [ -f config.log ] ; then - rm -rf config.cache config.log - fi if [ -x configure ] ; then ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --libdir='${exec_prefix}'/$libdir --infodir='${prefix}'/share/info \ @@ -245,12 +54,7 @@ done fi if [ $opt_package -eq 1 ] ; then - if [ `id -u` -ne 0 ] ; then - read -p "Do you want to package as root? [y/N] " ans - if [ "x$ans" == "xY" -o "x$ans" == "xy" ] ; then - cd $W ; /bin/su -c "$0 package" ; exit - fi - fi + root_priv if [ -d $P ] ; then rm -rf $P ; fi ; mkdir -p $P if [ -d $C ] ; then rm -rf $C ; fi ; mkdir -p $C touch $W/i.st ; sleep 1 @@ -306,29 +110,13 @@ find $P ! -type l -newer i.st ! -newer i.et \ -exec touch -t `date '+%m%d0900'` {} \; compress - for i in `seq 0 $((${#DOCS[@]} - 1))` ; do - for j in ${DOCS[$i]} ; do - for k in ${S[$i]}/$j ; do - install2 $k $docdir/${src[$i]}/${k#${S[$i]}/} - touch -r $k $docdir/${src[$i]}/${k#${S[$i]}/} - gzip_one $docdir/${src[$i]}/${k#${S[$i]}/} - done - done - if [ $i -eq 0 ] ; then - install $myname $docdir/$src - touch -t `date '+%m%d0900'` $docdir/$src/$myname - gzip_one $docdir/$src/$myname - else - ln $docdir/$src/$myname.gz $docdir/${src[$i]} - fi - ( cd $docdir ; find ${src[$i]} -type d -exec touch -r $W/{} {} \; ) - done + setup_docdir cp -a $S/examples $docdir/$src chown -R root.root $docdir/$src/examples - mv $docdir/$src/{examples,{COPYING,$myname}.gz} $C - mv $C/{examples,{COPYING,$myname}.gz} $docdir/$src + mv $docdir/$src/{examples,{COPYING,$func,$myname,$spec}.gz} $C + mv $C/{examples,{COPYING,$func,$myname,$spec}.gz} $docdir/$src touch -r $S $docdir/$src - convert + convert_links install -d $P/install cat <<- "EOF" > $P/install/doinst.sh mv etc/logrotate.conf.new /tmp @@ -347,6 +135,5 @@ tar rvpf $pkg.tar -C $P install/doinst.sh touch -t `date '+%m%d0900'` $pkg.tar ; xz $pkg.tar ; touch $pkg.tar.xz mv $pkg.tar.xz $pkg.txz - read -p "Do you want to keep work files? [y/N] " ans - if [ "x$ans" != "xY" -a "x$ans" != "xy" ] ; then rm -rf $P $C i.[se]t ; fi + cleanup fi --- plamo/00_base/old/lsb_release-20170220/PlamoBuild.lsb_release-1.4 2017-02-20 19:21:26.000000000 +0900 +++ plamo/00_base/lsb_release/PlamoBuild.lsb_release-1.4 2017-04-24 12:27:45.000000000 +0900 @@ -2,239 +2,40 @@ ###################################################################### url="http://downloads.sourceforge.net/lsb/lsb-release-1.4.tar.gz" +verify= +digest= +commitid= pkgbase=lsb_release vers=1.4 arch=noarch -build=P7 +build=P8 src=lsb-release-$vers patchfiles="" OPT_CONFIG="" DOCS="ChangeLog INSTALL README lsb-release.template lsb_release.examples" -template=20170204 +template=20170415 tmplurl=ftp://plamo.linet.gr.jp/pub/Plamo-src/admin ###################################################################### -fscheck() { - PANGRAM="The quick brown fox jumps over the lazy dog." - echo -n "Checking for the filesystem ... " - mkdir pangram ; ( cd pangram ; touch $PANGRAM ) - mv pangram pangram~ ; mkdir pangram ; touch -r pangram~ pangram - tar cpf pangram.tar pangram ; rmdir pangram ; mv pangram~ pangram - for i in $PANGRAM ; do tar rpf pangram.tar pangram/$i ; done - touch -t `date '+%m%d0900'` pangram.tar ; gzip pangram.tar - touch pangram.tar.gz ; mv pangram.tar.gz pangram1.tgz - tar cpf pangram.tar pangram - touch -t `date '+%m%d0900'` pangram.tar ; gzip pangram.tar - touch pangram.tar.gz ; mv pangram.tar.gz pangram2.tgz - if cmp -s pangram1.tgz pangram2.tgz ; then - echo "OK" - rm -rf pangram pangram1.tgz pangram2.tgz - else - echo "NG" - cat <<- "EOF" - Hmm, packaging may not be done properly on this filesystem. - Would you please try again on a default filesystem, thanks! - - Happy packaging!! - - Quitting... - EOF - exit - fi -} - -install2() { - install -d ${2%/*} ; install -m 644 $1 $2 -} - -strip_bindir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - shopt -s nullglob - cd $1 - for i in * ; do - echo "$i" - if [ -h $i ] ; then continue ; fi - if [ -n "`file $i | grep "not stripped"`" ] ; then - echo "stripping -p $i" - strip -p $i - fi - done - ) fi -} - -strip_libdir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - shopt -s nullglob - cd $1 - for i in *.so *.so.* *.a ; do - echo "$i" - if [ -h $i ] ; then continue ; fi - if [ -n "`nm -a $i | grep " a "`" ] ; then - if [ $i != ${i%.a} ] ; then - echo -n "ranlib and " - touch -r $i $i.mt ; ranlib $i ; touch -r $i.mt $i ; rm $i.mt - fi - echo "stripping -gp $i" - strip -gp $i - fi - done - ) fi -} - -gzip_dir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - cd $1 - files=`ls -f --indicator-style=none | sed '/^\.\{1,2\}$/d'` - for i in $files ; do - echo "$i" - if [ ! -f $i -a ! -h $i -o $i != ${i%.gz} ] ; then continue ; fi - lnks=`ls -l $i | awk '{print $2}'` - if [ $lnks -gt 1 ] ; then - inum=`ls -i $i | awk '{print $1}'` - for j in `find . -maxdepth 1 -inum $inum` ; do - if [ ${j#./} == $i ] ; then - gzip -f $i - else - rm -f ${j#./} ; ln $i.gz ${j#./}.gz - fi - done - elif [ -h $i ] ; then - target=`readlink $i` ; rm -f $i ; ln -s $target.gz $i.gz - else - gzip $i - fi - done - for i in $files ; do mv ${i%.gz}.gz $C ; done - for i in $files ; do mv $C/${i%.gz}.gz . ; done - ) fi -} - -gzip_one() { - gzip $1 ; mv $1.gz $C ; mv $C/${1##*/}.gz ${1%/*} -} - -compress() { - for i in {$P,$P/usr}/{sbin,bin} ; do strip_bindir $i ; done - for i in {$P,$P/usr}/$libdir ; do strip_libdir $i ; done - if [ -f $infodir/dir ] ; then rm -f $infodir/dir ; fi - gzip_dir $infodir - for i in `seq 9` n ; do gzip_dir $mandir/man$i ; done -} - -prune_symlink() { - echo "pruning symlink in $1" - if [ -d $1 ] ; then ( - cd $P - rm -f /tmp/iNsT-a.$$ ; touch /tmp/iNsT-a.$$ - for i in `find ${1#$P/} -type l` ; do - target=`readlink $i` - echo "$i -> $target" - echo $i$'\n'$target >> /tmp/iNsT-a.$$ - done - COUNT=1 - LINE=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - while [ -n "$LINE" ] ; do - LINKGOESIN=`dirname $LINE` - LINKNAMEIS=`basename $LINE` - COUNT=$(($COUNT + 1)) - LINKPOINTSTO=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - if [ ! -d install ] ; then mkdir install ; fi - cat <<- EOF >> install/doinst.sh - ( cd $LINKGOESIN ; rm -rf $LINKNAMEIS ) - ( cd $LINKGOESIN ; ln -sf $LINKPOINTSTO $LINKNAMEIS ) - EOF - rm -rf $LINE ; touch -t `date '+%m%d0900'` install/doinst.sh $LINE - COUNT=$(($COUNT + 1)) - LINE=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - done - rm -f /tmp/iNsT-a.$$ - ) fi -} - -convert() { - for i in {$P,$P/usr}/{sbin,bin} ; do prune_symlink $i ; done - for i in {$P,$P/usr}/$libdir ; do prune_symlink $i ; done - prune_symlink $infodir - for i in `seq 9` n ; do prune_symlink $mandir/man$i ; done -} - -fscheck -W=`pwd` -for i in `seq 0 $((${#src[@]} - 1))` ; do - S[$i]=$W/${src[$i]} ; B[$i]=$W/build`test ${#src[@]} -eq 1 || echo $i` -done -P=$W/work ; C=$W/pivot -infodir=$P/usr/share/info -mandir=$P/usr/share/man -docdir=$P/usr/share/doc -myname=`basename $0` -pkg=$pkgbase-$vers-$arch-$build -case $arch in x86_64) libdir=lib64 ;; *) libdir=lib ;; esac -if [ $# -eq 0 ] ; then - opt_download=1 ; opt_config=1 ; opt_build=1 ; opt_package=1 +if [ -f functions ] ; then + source ./functions +elif [ ! -f /usr/share/plamo/functions ] ; then + wget ftp://plamo.linet.gr.jp/pub/Plamo-src/admin/functions + source ./functions else - opt_download=0 ; opt_config=0 ; opt_build=0 ; opt_package=0 - for i in $@ ; do - case $i in - download) opt_download=1 ;; - config) opt_config=1 ;; - build) opt_build=1 ;; - package) opt_package=1 ;; - esac - done + source /usr/share/plamo/functions fi + +fscheck +prepare "$@" if [ $opt_download -eq 1 ] ; then - for i in $url ; do - 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|tgz) tar xvpzf ${i##*/} ;; - bz2|tbz) tar xvpjf ${i##*/} ;; - xz|txz) tar xvpJf ${i##*/} ;; - esac - done + download_sources fi if [ $opt_config -eq 1 ] ; then 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 - 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 + apply_patches cd $B cp -p Makefile{,.orig} sed -i -e '/^prefix=/s@/local@@g' -e '/^mandir=/s@/man@/share/man@g' \ @@ -242,12 +43,6 @@ -e '/^mandir=/!s@${prefix}@$(DESTDIR)&@g' Makefile for i in `seq 0 $((${#B[@]} - 1))` ; do cd ${B[$i]} - if [ -f Makefile ] ; then - make clean - fi - if [ -f config.log ] ; then - rm -rf config.cache config.log - fi if [ -x configure ] ; then ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --libdir='${exec_prefix}'/$libdir --infodir='${prefix}'/share/info \ @@ -264,12 +59,7 @@ done fi if [ $opt_package -eq 1 ] ; then - if [ `id -u` -ne 0 ] ; then - read -p "Do you want to package as root? [y/N] " ans - if [ "x$ans" == "xY" -o "x$ans" == "xy" ] ; then - cd $W ; /bin/su -c "$0 package" ; exit - fi - fi + root_priv if [ -d $P ] ; then rm -rf $P ; fi ; mkdir -p $P if [ -d $C ] ; then rm -rf $C ; fi ; mkdir -p $C touch $W/i.st ; sleep 1 @@ -288,44 +78,13 @@ find $P ! -type l -newer i.st ! -newer i.et \ -exec touch -t `date '+%m%d0900'` {} \; compress - for i in `seq 0 $((${#DOCS[@]} - 1))` ; do - for j in ${DOCS[$i]} ; do - for k in ${S[$i]}/$j ; do - install2 $k $docdir/${src[$i]}/${k#${S[$i]}/} - touch -r $k $docdir/${src[$i]}/${k#${S[$i]}/} - gzip_one $docdir/${src[$i]}/${k#${S[$i]}/} - done - done - if [ $i -eq 0 ] ; then - install $myname $docdir/$src - touch -t `date '+%m%d0900'` $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 - convert + setup_docdir + convert_links tar cvpf $pkg.tar -C $P `cd $P ; find usr/bin | tail -n+2` tar rvpf $pkg.tar -C $P etc/plamo-release tar rvpf $pkg.tar -C $P `cd $P ; find usr/share/man/man1 | tail -n+2` tar rvpf $pkg.tar -C $P usr/share/doc/$src touch -t `date '+%m%d0900'` $pkg.tar ; xz $pkg.tar ; touch $pkg.tar.xz mv $pkg.tar.xz $pkg.txz - read -p "Do you want to keep work files? [y/N] " ans - if [ "x$ans" != "xY" -a "x$ans" != "xy" ] ; then rm -rf $P $C i.[se]t ; fi + cleanup fi --- plamo/00_base/old/lvm2-20161203/PlamoBuild.lvm2-2.02.90 2016-12-03 15:49:01.000000000 +0900 +++ plamo/00_base/lvm2/PlamoBuild.lvm2-2.02.90 2017-04-24 12:39:14.000000000 +0900 @@ -2,10 +2,13 @@ ###################################################################### url="ftp://sources.redhat.com/pub/lvm2/releases/LVM2.2.02.90.tgz" +verify= +digest= +commitid= pkgbase=lvm2 vers=2.02.90 arch=`uname -m` -build=P4 +build=P5 src=LVM2.$vers patchfiles="" OPT_CONFIG="--exec-prefix= --enable-static_link --enable-applib @@ -13,242 +16,34 @@ --with-thin=internal" DOCS="COPYING.LIB COPYING INSTALL VERSION_DM README VERSION WHATS_NEW WHATS_NEW_DM" -template=20161020 +template=20170415 tmplurl=ftp://plamo.linet.gr.jp/pub/Plamo-src/admin ###################################################################### -fscheck() { - PANGRAM="The quick brown fox jumps over the lazy dog." - echo -n "Checking for the filesystem ... " - mkdir pangram ; ( cd pangram ; touch $PANGRAM ) - mv pangram pangram~ ; mkdir pangram ; touch -r pangram~ pangram - tar cpf pangram.tar pangram ; rmdir pangram ; mv pangram~ pangram - for i in $PANGRAM ; do tar rpf pangram.tar pangram/$i ; done - touch -t `date '+%m%d0900'` pangram.tar ; gzip pangram.tar - touch pangram.tar.gz ; mv pangram.tar.gz pangram1.tgz - tar cpf pangram.tar pangram - touch -t `date '+%m%d0900'` pangram.tar ; gzip pangram.tar - touch pangram.tar.gz ; mv pangram.tar.gz pangram2.tgz - if cmp -s pangram1.tgz pangram2.tgz ; then - echo "OK" - rm -rf pangram pangram1.tgz pangram2.tgz - else - echo "NG" - cat <<- "EOF" - Hmm, packaging may not be done properly on this filesystem. - Would you please try again on a default filesystem, thanks! - - Happy packaging!! - - Quitting... - EOF - exit - fi -} - -install2() { - install -d ${2%/*} ; install -m 644 $1 $2 -} - -strip_bindir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - shopt -s nullglob - cd $1 - for i in * ; do - echo "$i" - if [ -h $i ] ; then continue ; fi - if [ -n "`file $i | grep "not stripped"`" ] ; then - echo "stripping -p $i" - strip -p $i - fi - done - ) fi -} - -strip_libdir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - shopt -s nullglob - cd $1 - for i in *.so *.so.* *.a ; do - echo "$i" - if [ -h $i ] ; then continue ; fi - if [ -n "`nm -a $i | grep " a "`" ] ; then - if [ $i != ${i%.a} ] ; then - echo -n "ranlib and " - touch -r $i $i.mt ; ranlib $i ; touch -r $i.mt $i ; rm $i.mt - fi - echo "stripping -gp $i" - strip -gp $i - fi - done - ) fi -} - -gzip_dir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - cd $1 - files=`ls -f --indicator-style=none | sed '/^\.\{1,2\}$/d'` - for i in $files ; do - echo "$i" - if [ ! -f $i -a ! -h $i -o $i != ${i%.gz} ] ; then continue ; fi - lnks=`ls -l $i | awk '{print $2}'` - if [ $lnks -gt 1 ] ; then - inum=`ls -i $i | awk '{print $1}'` - for j in `find . -maxdepth 1 -inum $inum` ; do - if [ ${j#./} == $i ] ; then - gzip -f $i - else - rm -f ${j#./} ; ln $i.gz ${j#./}.gz - fi - done - elif [ -h $i ] ; then - target=`readlink $i` ; rm -f $i ; ln -s $target.gz $i.gz - else - gzip $i - fi - done - for i in $files ; do mv ${i%.gz}.gz $C ; done - for i in $files ; do mv $C/${i%.gz}.gz . ; done - ) fi -} - -gzip_one() { - gzip $1 ; mv $1.gz $C ; mv $C/${1##*/}.gz ${1%/*} -} - -compress() { - for i in {$P,$P/usr}/{sbin,bin} ; do strip_bindir $i ; done - for i in {$P,$P/usr}/$libdir ; do strip_libdir $i ; done - if [ -f $infodir/dir ] ; then rm -f $infodir/dir ; fi - gzip_dir $infodir - for i in `seq 9` n ; do gzip_dir $mandir/man$i ; done -} - -prune_symlink() { - echo "pruning symlink in $1" - if [ -d $1 ] ; then ( - cd $P - rm -f /tmp/iNsT-a.$$ ; touch /tmp/iNsT-a.$$ - for i in `find ${1#$P/} -type l` ; do - target=`readlink $i` - echo "$i -> $target" - echo $i$'\n'$target >> /tmp/iNsT-a.$$ - done - COUNT=1 - LINE=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - while [ -n "$LINE" ] ; do - LINKGOESIN=`dirname $LINE` - LINKNAMEIS=`basename $LINE` - COUNT=$(($COUNT + 1)) - LINKPOINTSTO=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - if [ ! -d install ] ; then mkdir install ; fi - cat <<- EOF >> install/doinst.sh - ( cd $LINKGOESIN ; rm -rf $LINKNAMEIS ) - ( cd $LINKGOESIN ; ln -sf $LINKPOINTSTO $LINKNAMEIS ) - EOF - rm -rf $LINE ; touch -t `date '+%m%d0900'` install/doinst.sh $LINE - COUNT=$(($COUNT + 1)) - LINE=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - done - rm -f /tmp/iNsT-a.$$ - ) fi -} - -convert() { - for i in {$P,$P/usr}/{sbin,bin} ; do prune_symlink $i ; done - for i in {$P,$P/usr}/$libdir ; do prune_symlink $i ; done - prune_symlink $infodir - for i in `seq 9` n ; do prune_symlink $mandir/man$i ; done -} - -fscheck -W=`pwd` -for i in `seq 0 $((${#src[@]} - 1))` ; do - S[$i]=$W/${src[$i]} ; B[$i]=$W/build`test ${#src[@]} -eq 1 || echo $i` -done -P=$W/work ; C=$W/pivot -infodir=$P/usr/share/info -mandir=$P/usr/share/man -docdir=$P/usr/share/doc -myname=`basename $0` -pkg=$pkgbase-$vers-$arch-$build -case $arch in x86_64) libdir=lib64 ;; *) libdir=lib ;; esac -if [ $# -eq 0 ] ; then - opt_download=1 ; opt_config=1 ; opt_build=1 ; opt_package=1 +if [ -f functions ] ; then + source ./functions +elif [ ! -f /usr/share/plamo/functions ] ; then + wget ftp://plamo.linet.gr.jp/pub/Plamo-src/admin/functions + source ./functions else - opt_download=0 ; opt_config=0 ; opt_build=0 ; opt_package=0 - for i in $@ ; do - case $i in - download) opt_download=1 ;; - config) opt_config=1 ;; - build) opt_build=1 ;; - package) opt_package=1 ;; - esac - done + source /usr/share/plamo/functions fi + +fscheck +prepare "$@" if [ $opt_download -eq 1 ] ; then - for i in $url ; do - 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|tgz) tar xvpzf ${i##*/} ;; - bz2|tbz) tar xvpjf ${i##*/} ;; - xz|txz) tar xvpJf ${i##*/} ;; - esac - done + download_sources fi if [ $opt_config -eq 1 ] ; then 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 - 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 + apply_patches cd $B cp -p daemons/dmeventd/Makefile.in{,.orig} sed -i 's@$(ELDFLAGS) @@' daemons/dmeventd/Makefile.in for i in `seq 0 $((${#B[@]} - 1))` ; do cd ${B[$i]} - if [ -f Makefile ] ; then - make clean - fi - if [ -f config.log ] ; then - rm -rf config.cache config.log - fi if [ -x configure ] ; then ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --libdir='${exec_prefix}'/$libdir --infodir='${prefix}'/share/info \ @@ -266,12 +61,7 @@ done fi if [ $opt_package -eq 1 ] ; then - if [ `id -u` -ne 0 ] ; then - read -p "Do you want to package as root? [y/N] " ans - if [ "x$ans" == "xY" -o "x$ans" == "xy" ] ; then - cd $W ; /bin/su -c "$0 package" ; exit - fi - fi + root_priv if [ -d $P ] ; then rm -rf $P ; fi ; mkdir -p $P if [ -d $C ] ; then rm -rf $C ; fi ; mkdir -p $C touch $W/i.st ; sleep 1 @@ -292,38 +82,8 @@ compress strip_libdir $P/$libdir/device-mapper touch -t `date '+%m%d0900'` $P/$libdir/device-mapper - for i in `seq 0 $((${#DOCS[@]} - 1))` ; do - for j in ${DOCS[$i]} ; do - for k in ${S[$i]}/$j ; do - install2 $k $docdir/${src[$i]}/${k#${S[$i]}/} - touch -r $k $docdir/${src[$i]}/${k#${S[$i]}/} - gzip_one $docdir/${src[$i]}/${k#${S[$i]}/} - done - done - if [ $i -eq 0 ] ; then - install $myname $docdir/$src - touch -t `date '+%m%d0900'` $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 - convert + setup_docdir + convert_links tar cvpf $pkg.tar -C $P `cd $P ; find sbin | tail -n+2` tar rvpf $pkg.tar -C $P `cd $P ; find $libdir -maxdepth 1 | tail -n+2` tar rvpf $pkg.tar -C $P \ @@ -336,6 +96,5 @@ tar rvpf $pkg.tar -C $P install/doinst.sh touch -t `date '+%m%d0900'` $pkg.tar ; xz $pkg.tar ; touch $pkg.tar.xz mv $pkg.tar.xz $pkg.txz - read -p "Do you want to keep work files? [y/N] " ans - if [ "x$ans" != "xY" -a "x$ans" != "xy" ] ; then rm -rf $P $C i.[se]t ; fi + cleanup fi --- plamo/00_base/old/lzo-20160113/PlamoBuild.lzo-2.09 2016-01-13 13:13:06.000000000 +0900 +++ plamo/00_base/lzo/PlamoBuild.lzo-2.09 2017-04-24 13:23:34.000000000 +0900 @@ -2,214 +2,45 @@ ###################################################################### url="http://www.oberhumer.com/opensource/lzo/download/lzo-2.09.tar.gz" +verify= +digest= +commitid= pkgbase=lzo vers=2.09 arch=`uname -m` -build=P2 +build=P3 src=$pkgbase-$vers +patchfiles="" OPT_CONFIG="--enable-shared" DOCS="AUTHORS BUGS COPYING ChangeLog INSTALL NEWS README THANKS" +template=20170415 +tmplurl=ftp://plamo.linet.gr.jp/pub/Plamo-src/admin ###################################################################### -fscheck() { - PANGRAM="The quick brown fox jumps over the lazy dog." - echo -n "Checking for the filesystem ... " - mkdir pangram ; ( cd pangram ; touch $PANGRAM ) - mv pangram pangram~ ; mkdir pangram ; touch -r pangram~ pangram - tar cpf pangram.tar pangram ; rmdir pangram ; mv pangram~ pangram - for i in $PANGRAM ; do tar rpf pangram.tar pangram/$i ; done - touch -t `date '+%m%d0900'` pangram.tar ; gzip pangram.tar - touch pangram.tar.gz ; mv pangram.tar.gz pangram1.tgz - tar cpf pangram.tar pangram - touch -t `date '+%m%d0900'` pangram.tar ; gzip pangram.tar - touch pangram.tar.gz ; mv pangram.tar.gz pangram2.tgz - if cmp -s pangram1.tgz pangram2.tgz ; then - echo "OK" - rm -rf pangram pangram1.tgz pangram2.tgz - else - echo "NG" - cat <<- "EOF" - Hmm, packaging may not be done properly on this filesystem. - Would you please try again on a default filesystem, thanks! - - Happy packaging!! - - Quitting... - EOF - exit - fi -} - -install2() { - install -d ${2%/*} ; install -m 644 $1 $2 -} - -strip_bindir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - shopt -s nullglob - cd $1 - for i in * ; do - echo "$i" - if [ -h $i ] ; then continue ; fi - if [ -n "`file $i | grep "not stripped"`" ] ; then - echo "stripping -p $i" - strip -p $i - fi - done - ) fi -} - -strip_libdir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - shopt -s nullglob - cd $1 - for i in *.so *.so.* *.a ; do - echo "$i" - if [ -h $i ] ; then continue ; fi - if [ -n "`nm -a $i | grep " a "`" ] ; then - if [ $i != ${i%.a} ] ; then - echo -n "ranlib and " - touch -r $i $i.mt ; ranlib $i ; touch -r $i.mt $i ; rm $i.mt - fi - echo "stripping -gp $i" - strip -gp $i - fi - done - ) fi -} - -gzip_dir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - cd $1 - files=`ls -f --indicator-style=none | sed '/^\.\{1,2\}$/d'` - for i in $files ; do - echo "$i" - if [ ! -f $i -a ! -h $i -o $i != ${i%.gz} ] ; then continue ; fi - lnks=`ls -l $i | awk '{print $2}'` - if [ $lnks -gt 1 ] ; then - inum=`ls -i $i | awk '{print $1}'` - for j in `find . -maxdepth 1 -inum $inum` ; do - if [ ${j#./} == $i ] ; then - gzip -f $i - else - rm -f ${j#./} ; ln $i.gz ${j#./}.gz - fi - done - elif [ -h $i ] ; then - target=`readlink $i` ; rm -f $i ; ln -s $target.gz $i.gz - else - gzip $i - fi - done - for i in $files ; do mv ${i%.gz}.gz $C ; done - for i in $files ; do mv $C/${i%.gz}.gz . ; done - ) fi -} - -gzip_one() { - gzip $1 ; mv $1.gz $C ; mv $C/${1##*/}.gz ${1%/*} -} - -compress() { - for i in {$P,$P/usr}/{sbin,bin} ; do strip_bindir $i ; done - for i in {$P,$P/usr}/$libdir ; do strip_libdir $i ; done - if [ -f $infodir/dir ] ; then rm -f $infodir/dir ; fi - gzip_dir $infodir - for i in `seq 9` n ; do gzip_dir $mandir/man$i ; done -} - -prune_symlink() { - echo "pruning symlink in $1" - if [ -d $1 ] ; then ( - cd $P - rm -f /tmp/iNsT-a.$$ ; touch /tmp/iNsT-a.$$ - for i in `find ${1#$P/} -type l` ; do - target=`readlink $i` - echo "$i -> $target" - echo $i$'\n'$target >> /tmp/iNsT-a.$$ - done - COUNT=1 - LINE=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - while [ -n "$LINE" ] ; do - LINKGOESIN=`dirname $LINE` - LINKNAMEIS=`basename $LINE` - COUNT=$(($COUNT + 1)) - LINKPOINTSTO=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - if [ ! -d install ] ; then mkdir install ; fi - cat <<- EOF >> install/doinst.sh - ( cd $LINKGOESIN ; rm -rf $LINKNAMEIS ) - ( cd $LINKGOESIN ; ln -sf $LINKPOINTSTO $LINKNAMEIS ) - EOF - rm -rf $LINE ; touch -t `date '+%m%d0900'` install/doinst.sh $LINE - COUNT=$(($COUNT + 1)) - LINE=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - done - rm -f /tmp/iNsT-a.$$ - ) fi -} - -convert() { - for i in {$P,$P/usr}/{sbin,bin} ; do prune_symlink $i ; done - for i in {$P,$P/usr}/$libdir ; do prune_symlink $i ; done - prune_symlink $infodir - for i in `seq 9` n ; do prune_symlink $mandir/man$i ; done -} - -fscheck -W=`pwd` -for i in `seq 0 $((${#src[@]} - 1))` ; do - S[$i]=$W/${src[$i]} ; B[$i]=$W/build`test ${#src[@]} -eq 1 || echo $i` -done -P=$W/work ; C=$W/pivot -infodir=$P/usr/share/info -mandir=$P/usr/share/man -docdir=$P/usr/share/doc -myname=`basename $0` -pkg=$pkgbase-$vers-$arch-$build -case $arch in x86_64) libdir=lib64 ;; *) libdir=lib ;; esac -if [ $# -eq 0 ] ; then - opt_download=1 ; opt_config=1 ; opt_build=1 ; opt_package=1 +if [ -f functions ] ; then + source ./functions +elif [ ! -f /usr/share/plamo/functions ] ; then + wget ftp://plamo.linet.gr.jp/pub/Plamo-src/admin/functions + source ./functions else - opt_download=0 ; opt_config=0 ; opt_build=0 ; opt_package=0 - for i in $@ ; do - case $i in - download) opt_download=1 ;; - config) opt_config=1 ;; - build) opt_build=1 ;; - package) opt_package=1 ;; - esac - done + source /usr/share/plamo/functions fi + +fscheck +prepare "$@" if [ $opt_download -eq 1 ] ; then - for i in $url ; do - if [ ! -f ${i##*/} ] ; then wget $i ; fi - done - for i in $url ; do - case ${i##*.} in - tar) tar xvpf ${i##*/} ;; - gz) tar xvpzf ${i##*/} ;; - bz2) tar xvpjf ${i##*/} ;; - esac - done + download_sources fi if [ $opt_config -eq 1 ] ; then 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 + apply_patches for i in `seq 0 $((${#B[@]} - 1))` ; do cd ${B[$i]} - if [ -f Makefile ] ; then - make clean - fi - if [ -f config.log ] ; then - 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 @@ -223,12 +54,7 @@ done fi if [ $opt_package -eq 1 ] ; then - if [ `id -u` -ne 0 ] ; then - read -p "Do you want to package as root? [y/N] " ans - if [ "x$ans" == "xY" -o "x$ans" == "xy" ] ; then - cd $W ; /bin/su -c "$0 package" ; exit - fi - fi + root_priv if [ -d $P ] ; then rm -rf $P ; fi ; mkdir -p $P if [ -d $C ] ; then rm -rf $C ; fi ; mkdir -p $C touch $W/i.st ; sleep 1 @@ -243,35 +69,18 @@ find $P ! -type l -newer i.st ! -newer i.et \ -exec touch -t `date '+%m%d0900'` {} \; compress - for i in `seq 0 $((${#DOCS[@]} - 1))` ; do - for j in ${DOCS[$i]} ; do - for k in ${S[$i]}/$j ; do - install2 $k $docdir/${src[$i]}/${k#${S[$i]}/} - touch -r $k $docdir/${src[$i]}/${k#${S[$i]}/} - gzip_one $docdir/${src[$i]}/${k#${S[$i]}/} - done - done - if [ $i -eq 0 ] ; then - install $myname $docdir/$src - touch -t `date '+%m%d0900'` $docdir/$src/$myname - gzip_one $docdir/$src/$myname - else - ln $docdir/$src/$myname.gz $docdir/${src[$i]} - fi - ( cd $docdir ; find ${src[$i]} -type d -exec touch -r $W/{} {} \; ) - done + setup_docdir cp -a $S/{doc,examples} $docdir/$src chown -R root.root $docdir/$src/{doc,examples} - mv $docdir/$src/{doc,examples,$myname.gz} $C - mv $C/{doc,examples,$myname.gz} $docdir/$src + mv $docdir/$src/{doc,examples,{$func,$myname,$spec}.gz} $C + mv $C/{doc,examples,{$func,$myname,$spec}.gz} $docdir/$src touch -r $S $docdir/$src - convert + convert_links tar cvpf $pkg.tar -C $P `cd $P ; find usr/$libdir | tail -n+2` tar rvpf $pkg.tar -C $P `cd $P ; find usr/include/lzo | 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 mv $pkg.tar.xz $pkg.txz - read -p "Do you want to keep work files? [y/N] " ans - if [ "x$ans" != "xY" -a "x$ans" != "xy" ] ; then rm -rf $P $C i.[se]t ; fi + cleanup fi --- plamo/00_base/old/man-20160113/PlamoBuild.man-1.6g 2016-01-13 21:15:05.000000000 +0900 +++ plamo/00_base/man/PlamoBuild.man-1.6g 2017-04-29 10:56:37.000000000 +0900 @@ -2,204 +2,41 @@ ###################################################################### url="http://www.ibiblio.org/pub/Linux/apps/doctools/man/man-1.6g.tar.gz" +verify= +digest= +commitid= pkgbase=man vers=1.6g arch=`uname -m` -build=P2 +build=P3 src=$pkgbase-$vers +patchfiles="" OPT_CONFIG="" DOCS="COPYING README README.HP README.GNU-WIN32 INSTALL TODO LSM README.IRIX HISTORY" +template=20170415 +tmplurl=ftp://plamo.linet.gr.jp/pub/Plamo-src/admin ###################################################################### -fscheck() { - PANGRAM="The quick brown fox jumps over the lazy dog." - echo -n "Checking for the filesystem ... " - mkdir pangram ; ( cd pangram ; touch $PANGRAM ) - mv pangram pangram~ ; mkdir pangram ; touch -r pangram~ pangram - tar cpf pangram.tar pangram ; rmdir pangram ; mv pangram~ pangram - for i in $PANGRAM ; do tar rpf pangram.tar pangram/$i ; done - touch -t `date '+%m%d0900'` pangram.tar ; gzip pangram.tar - touch pangram.tar.gz ; mv pangram.tar.gz pangram1.tgz - tar cpf pangram.tar pangram - touch -t `date '+%m%d0900'` pangram.tar ; gzip pangram.tar - touch pangram.tar.gz ; mv pangram.tar.gz pangram2.tgz - if cmp -s pangram1.tgz pangram2.tgz ; then - echo "OK" - rm -rf pangram pangram1.tgz pangram2.tgz - else - echo "NG" - cat <<- "EOF" - Hmm, packaging may not be done properly on this filesystem. - Would you please try again on a default filesystem, thanks! - - Happy packaging!! - - Quitting... - EOF - exit - fi -} - -install2() { - install -d ${2%/*} ; install -m 644 $1 $2 -} - -strip_bindir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - shopt -s nullglob - cd $1 - for i in * ; do - echo "$i" - if [ -h $i ] ; then continue ; fi - if [ -n "`file $i | grep "not stripped"`" ] ; then - echo "stripping -p $i" - strip -p $i - fi - done - ) fi -} - -strip_libdir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - shopt -s nullglob - cd $1 - for i in *.so *.so.* *.a ; do - echo "$i" - if [ -h $i ] ; then continue ; fi - if [ -n "`nm -a $i | grep " a "`" ] ; then - if [ $i != ${i%.a} ] ; then - echo -n "ranlib and " - touch -r $i $i.mt ; ranlib $i ; touch -r $i.mt $i ; rm $i.mt - fi - echo "stripping -gp $i" - strip -gp $i - fi - done - ) fi -} - -gzip_dir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - cd $1 - files=`ls -f --indicator-style=none | sed '/^\.\{1,2\}$/d'` - for i in $files ; do - echo "$i" - if [ ! -f $i -a ! -h $i -o $i != ${i%.gz} ] ; then continue ; fi - lnks=`ls -l $i | awk '{print $2}'` - if [ $lnks -gt 1 ] ; then - inum=`ls -i $i | awk '{print $1}'` - for j in `find . -maxdepth 1 -inum $inum` ; do - if [ ${j#./} == $i ] ; then - gzip -f $i - else - rm -f ${j#./} ; ln $i.gz ${j#./}.gz - fi - done - elif [ -h $i ] ; then - target=`readlink $i` ; rm -f $i ; ln -s $target.gz $i.gz - else - gzip $i - fi - done - for i in $files ; do mv ${i%.gz}.gz $C ; done - for i in $files ; do mv $C/${i%.gz}.gz . ; done - ) fi -} - -gzip_one() { - gzip $1 ; mv $1.gz $C ; mv $C/${1##*/}.gz ${1%/*} -} - -compress() { - for i in {$P,$P/usr}/{sbin,bin} ; do strip_bindir $i ; done - for i in {$P,$P/usr}/$libdir ; do strip_libdir $i ; done - if [ -f $infodir/dir ] ; then rm -f $infodir/dir ; fi - gzip_dir $infodir - for i in `seq 9` n ; do gzip_dir $mandir/man$i ; done -} - -prune_symlink() { - echo "pruning symlink in $1" - if [ -d $1 ] ; then ( - cd $P - rm -f /tmp/iNsT-a.$$ ; touch /tmp/iNsT-a.$$ - for i in `find ${1#$P/} -type l` ; do - target=`readlink $i` - echo "$i -> $target" - echo $i$'\n'$target >> /tmp/iNsT-a.$$ - done - COUNT=1 - LINE=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - while [ -n "$LINE" ] ; do - LINKGOESIN=`dirname $LINE` - LINKNAMEIS=`basename $LINE` - COUNT=$(($COUNT + 1)) - LINKPOINTSTO=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - if [ ! -d install ] ; then mkdir install ; fi - cat <<- EOF >> install/doinst.sh - ( cd $LINKGOESIN ; rm -rf $LINKNAMEIS ) - ( cd $LINKGOESIN ; ln -sf $LINKPOINTSTO $LINKNAMEIS ) - EOF - rm -rf $LINE ; touch -t `date '+%m%d0900'` install/doinst.sh $LINE - COUNT=$(($COUNT + 1)) - LINE=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - done - rm -f /tmp/iNsT-a.$$ - ) fi -} - -convert() { - for i in {$P,$P/usr}/{sbin,bin} ; do prune_symlink $i ; done - for i in {$P,$P/usr}/$libdir ; do prune_symlink $i ; done - prune_symlink $infodir - for i in `seq 9` n ; do prune_symlink $mandir/man$i ; done -} - -fscheck -W=`pwd` -for i in `seq 0 $((${#src[@]} - 1))` ; do - S[$i]=$W/${src[$i]} ; B[$i]=$W/build`test ${#src[@]} -eq 1 || echo $i` -done -P=$W/work ; C=$W/pivot -infodir=$P/usr/share/info -mandir=$P/usr/share/man -docdir=$P/usr/share/doc -myname=`basename $0` -pkg=$pkgbase-$vers-$arch-$build -case $arch in x86_64) libdir=lib64 ;; *) libdir=lib ;; esac -if [ $# -eq 0 ] ; then - opt_download=1 ; opt_config=1 ; opt_build=1 ; opt_package=1 +if [ -f functions ] ; then + source ./functions +elif [ ! -f /usr/share/plamo/functions ] ; then + wget ftp://plamo.linet.gr.jp/pub/Plamo-src/admin/functions + source ./functions else - opt_download=0 ; opt_config=0 ; opt_build=0 ; opt_package=0 - for i in $@ ; do - case $i in - download) opt_download=1 ;; - config) opt_config=1 ;; - build) opt_build=1 ;; - package) opt_package=1 ;; - esac - done + source /usr/share/plamo/functions fi + +fscheck +prepare "$@" if [ $opt_download -eq 1 ] ; then - for i in $url ; do - if [ ! -f ${i##*/} ] ; then wget $i ; fi - done - for i in $url ; do - case ${i##*.} in - tar) tar xvpf ${i##*/} ;; - gz) tar xvpzf ${i##*/} ;; - bz2) tar xvpjf ${i##*/} ;; - esac - done + download_sources fi if [ $opt_config -eq 1 ] ; then 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 + apply_patches cd $B cp -p src/man.conf.in{,.orig} cat <<- "EOF" | patch src/man.conf.in @@ -208,7 +45,7 @@ --- > MANPATH /opt/kde/share/man > MANPATH /opt/mysql/man - > MANPATH /opt/texlive/2009/texmf/doc/man + > MANPATH /opt/texlive/2015/texmf/doc/man 67,69c69,71 < MANPATH_MAP /usr/X11R6/bin /usr/X11R6/man < MANPATH_MAP /usr/bin/X11 /usr/X11R6/man @@ -216,16 +53,10 @@ --- > MANPATH_MAP /opt/kde/bin /opt/kde/share/man > MANPATH_MAP /opt/mysql/bin /opt/mysql/man - > MANPATH_MAP /opt/texlive /opt/texlive/2009/texmf/doc/man + > MANPATH_MAP /opt/texlive /opt/texlive/2015/texmf/doc/man EOF for i in `seq 0 $((${#B[@]} - 1))` ; do cd ${B[$i]} - if [ -f Makefile ] ; then - make clean - fi - if [ -f config.log ] ; then - rm -rf config.cache config.log - fi if [ -x configure ] ; then ./configure -confdir /etc +fhs +lang all fi @@ -240,12 +71,7 @@ done fi if [ $opt_package -eq 1 ] ; then - if [ `id -u` -ne 0 ] ; then - read -p "Do you want to package as root? [y/N] " ans - if [ "x$ans" == "xY" -o "x$ans" == "xy" ] ; then - cd $W ; /bin/su -c "$0 package" ; exit - fi - fi + root_priv if [ -d $P ] ; then rm -rf $P ; fi ; mkdir -p $P if [ -d $C ] ; then rm -rf $C ; fi ; mkdir -p $C touch $W/i.st ; sleep 1 @@ -266,28 +92,12 @@ gzip_dir $mandir/$i/man5 gzip_dir $mandir/$i/man8 done - for i in `seq 0 $((${#DOCS[@]} - 1))` ; do - for j in ${DOCS[$i]} ; do - for k in ${S[$i]}/$j ; do - install2 $k $docdir/${src[$i]}/${k#${S[$i]}/} - touch -r $k $docdir/${src[$i]}/${k#${S[$i]}/} - gzip_one $docdir/${src[$i]}/${k#${S[$i]}/} - done - done - if [ $i -eq 0 ] ; then - install $myname $docdir/$src - touch -t `date '+%m%d0900'` $docdir/$src/$myname - gzip_one $docdir/$src/$myname - else - ln $docdir/$src/$myname.gz $docdir/${src[$i]} - fi - ( cd $docdir ; find ${src[$i]} -type d -exec touch -r $W/{} {} \; ) - done - convert + setup_docdir + convert_links 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 etc/man.conf - tar rvpf $pkg.tar -C $P `cd $P ; find usr/share/locale -name "man"` + tar rvpf $pkg.tar -C $P `cd $P ; find usr/share/locale -name man` 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` @@ -299,6 +109,5 @@ tar rvpf $pkg.tar -C $P usr/share/doc/$src touch -t `date '+%m%d0900'` $pkg.tar ; xz $pkg.tar ; touch $pkg.tar.xz mv $pkg.tar.xz $pkg.txz - read -p "Do you want to keep work files? [y/N] " ans - if [ "x$ans" != "xY" -a "x$ans" != "xy" ] ; then rm -rf $P $C i.[se]t ; fi + cleanup fi --- plamo/00_base/old/mdadm-20160113/PlamoBuild.mdadm-3.2.3 2016-01-13 21:44:34.000000000 +0900 +++ plamo/00_base/mdadm/PlamoBuild.mdadm-3.2.3 2017-04-24 13:46:02.000000000 +0900 @@ -2,218 +2,49 @@ ###################################################################### url="http://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-3.2.3.tar.bz2" +verify= +digest= +commitid= pkgbase=mdadm vers=3.2.3 arch=`uname -m` -build=P3 +build=P4 src=$pkgbase-$vers +patchfiles="" OPT_CONFIG="" DOCS="mdmon-design.txt COPYING ANNOUNCE-3.0.3 ANNOUNCE-3.1.2 TODO ANNOUNCE-3.0.2 ANNOUNCE-3.1.1 INSTALL ANNOUNCE-3.2.2 ANNOUNCE-3.2.3 ANNOUNCE-3.2.1 ANNOUNCE-3.1 README.initramfs ANNOUNCE-3.1.3 ANNOUNCE-3.0.1 ANNOUNCE-3.1.4 ANNOUNCE-3.1.5 ChangeLog ANNOUNCE-3.0 external-reshape-design.txt ANNOUNCE-3.2" +template=20170415 +tmplurl=ftp://plamo.linet.gr.jp/pub/Plamo-src/admin ###################################################################### -fscheck() { - PANGRAM="The quick brown fox jumps over the lazy dog." - echo -n "Checking for the filesystem ... " - mkdir pangram ; ( cd pangram ; touch $PANGRAM ) - mv pangram pangram~ ; mkdir pangram ; touch -r pangram~ pangram - tar cpf pangram.tar pangram ; rmdir pangram ; mv pangram~ pangram - for i in $PANGRAM ; do tar rpf pangram.tar pangram/$i ; done - touch -t `date '+%m%d0900'` pangram.tar ; gzip pangram.tar - touch pangram.tar.gz ; mv pangram.tar.gz pangram1.tgz - tar cpf pangram.tar pangram - touch -t `date '+%m%d0900'` pangram.tar ; gzip pangram.tar - touch pangram.tar.gz ; mv pangram.tar.gz pangram2.tgz - if cmp -s pangram1.tgz pangram2.tgz ; then - echo "OK" - rm -rf pangram pangram1.tgz pangram2.tgz - else - echo "NG" - cat <<- "EOF" - Hmm, packaging may not be done properly on this filesystem. - Would you please try again on a default filesystem, thanks! - - Happy packaging!! - - Quitting... - EOF - exit - fi -} - -install2() { - install -d ${2%/*} ; install -m 644 $1 $2 -} - -strip_bindir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - shopt -s nullglob - cd $1 - for i in * ; do - echo "$i" - if [ -h $i ] ; then continue ; fi - if [ -n "`file $i | grep "not stripped"`" ] ; then - echo "stripping -p $i" - strip -p $i - fi - done - ) fi -} - -strip_libdir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - shopt -s nullglob - cd $1 - for i in *.so *.so.* *.a ; do - echo "$i" - if [ -h $i ] ; then continue ; fi - if [ -n "`nm -a $i | grep " a "`" ] ; then - if [ $i != ${i%.a} ] ; then - echo -n "ranlib and " - touch -r $i $i.mt ; ranlib $i ; touch -r $i.mt $i ; rm $i.mt - fi - echo "stripping -gp $i" - strip -gp $i - fi - done - ) fi -} - -gzip_dir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - cd $1 - files=`ls -f --indicator-style=none | sed '/^\.\{1,2\}$/d'` - for i in $files ; do - echo "$i" - if [ ! -f $i -a ! -h $i -o $i != ${i%.gz} ] ; then continue ; fi - lnks=`ls -l $i | awk '{print $2}'` - if [ $lnks -gt 1 ] ; then - inum=`ls -i $i | awk '{print $1}'` - for j in `find . -maxdepth 1 -inum $inum` ; do - if [ ${j#./} == $i ] ; then - gzip -f $i - else - rm -f ${j#./} ; ln $i.gz ${j#./}.gz - fi - done - elif [ -h $i ] ; then - target=`readlink $i` ; rm -f $i ; ln -s $target.gz $i.gz - else - gzip $i - fi - done - for i in $files ; do mv ${i%.gz}.gz $C ; done - for i in $files ; do mv $C/${i%.gz}.gz . ; done - ) fi -} - -gzip_one() { - gzip $1 ; mv $1.gz $C ; mv $C/${1##*/}.gz ${1%/*} -} - -compress() { - for i in {$P,$P/usr}/{sbin,bin} ; do strip_bindir $i ; done - for i in {$P,$P/usr}/$libdir ; do strip_libdir $i ; done - if [ -f $infodir/dir ] ; then rm -f $infodir/dir ; fi - gzip_dir $infodir - for i in `seq 9` n ; do gzip_dir $mandir/man$i ; done -} - -prune_symlink() { - echo "pruning symlink in $1" - if [ -d $1 ] ; then ( - cd $P - rm -f /tmp/iNsT-a.$$ ; touch /tmp/iNsT-a.$$ - for i in `find ${1#$P/} -type l` ; do - target=`readlink $i` - echo "$i -> $target" - echo $i$'\n'$target >> /tmp/iNsT-a.$$ - done - COUNT=1 - LINE=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - while [ -n "$LINE" ] ; do - LINKGOESIN=`dirname $LINE` - LINKNAMEIS=`basename $LINE` - COUNT=$(($COUNT + 1)) - LINKPOINTSTO=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - if [ ! -d install ] ; then mkdir install ; fi - cat <<- EOF >> install/doinst.sh - ( cd $LINKGOESIN ; rm -rf $LINKNAMEIS ) - ( cd $LINKGOESIN ; ln -sf $LINKPOINTSTO $LINKNAMEIS ) - EOF - rm -rf $LINE ; touch -t `date '+%m%d0900'` install/doinst.sh $LINE - COUNT=$(($COUNT + 1)) - LINE=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - done - rm -f /tmp/iNsT-a.$$ - ) fi -} - -convert() { - for i in {$P,$P/usr}/{sbin,bin} ; do prune_symlink $i ; done - for i in {$P,$P/usr}/$libdir ; do prune_symlink $i ; done - prune_symlink $infodir - for i in `seq 9` n ; do prune_symlink $mandir/man$i ; done -} - -fscheck -W=`pwd` -for i in `seq 0 $((${#src[@]} - 1))` ; do - S[$i]=$W/${src[$i]} ; B[$i]=$W/build`test ${#src[@]} -eq 1 || echo $i` -done -P=$W/work ; C=$W/pivot -infodir=$P/usr/share/info -mandir=$P/usr/share/man -docdir=$P/usr/share/doc -myname=`basename $0` -pkg=$pkgbase-$vers-$arch-$build -case $arch in x86_64) libdir=lib64 ;; *) libdir=lib ;; esac -if [ $# -eq 0 ] ; then - opt_download=1 ; opt_config=1 ; opt_build=1 ; opt_package=1 +if [ -f functions ] ; then + source ./functions +elif [ ! -f /usr/share/plamo/functions ] ; then + wget ftp://plamo.linet.gr.jp/pub/Plamo-src/admin/functions + source ./functions else - opt_download=0 ; opt_config=0 ; opt_build=0 ; opt_package=0 - for i in $@ ; do - case $i in - download) opt_download=1 ;; - config) opt_config=1 ;; - build) opt_build=1 ;; - package) opt_package=1 ;; - esac - done + source /usr/share/plamo/functions fi + +fscheck +prepare "$@" if [ $opt_download -eq 1 ] ; then - for i in $url ; do - if [ ! -f ${i##*/} ] ; then wget $i ; fi - done - for i in $url ; do - case ${i##*.} in - tar) tar xvpf ${i##*/} ;; - gz) tar xvpzf ${i##*/} ;; - bz2) tar xvpjf ${i##*/} ;; - esac - done + download_sources fi if [ $opt_config -eq 1 ] ; then 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 + apply_patches for i in `seq 0 $((${#B[@]} - 1))` ; do cd ${B[$i]} - if [ -f Makefile ] ; then - make clean - fi - if [ -f config.log ] ; then - 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 @@ -227,12 +58,7 @@ done fi if [ $opt_package -eq 1 ] ; then - if [ `id -u` -ne 0 ] ; then - read -p "Do you want to package as root? [y/N] " ans - if [ "x$ans" == "xY" -o "x$ans" == "xy" ] ; then - cd $W ; /bin/su -c "$0 package" ; exit - fi - fi + root_priv if [ -d $P ] ; then rm -rf $P ; fi ; mkdir -p $P if [ -d $C ] ; then rm -rf $C ; fi ; mkdir -p $C touch $W/i.st ; sleep 1 @@ -249,24 +75,8 @@ find $P ! -type l -newer i.st ! -newer i.et \ -exec touch -t `date '+%m%d0900'` {} \; compress - for i in `seq 0 $((${#DOCS[@]} - 1))` ; do - for j in ${DOCS[$i]} ; do - for k in ${S[$i]}/$j ; do - install2 $k $docdir/${src[$i]}/${k#${S[$i]}/} - touch -r $k $docdir/${src[$i]}/${k#${S[$i]}/} - gzip_one $docdir/${src[$i]}/${k#${S[$i]}/} - done - done - if [ $i -eq 0 ] ; then - install $myname $docdir/$src - touch -t `date '+%m%d0900'` $docdir/$src/$myname - gzip_one $docdir/$src/$myname - else - ln $docdir/$src/$myname.gz $docdir/${src[$i]} - fi - ( cd $docdir ; find ${src[$i]} -type d -exec touch -r $W/{} {} \; ) - done - convert + setup_docdir + convert_links tar cvpf $pkg.tar -C $P `cd $P ; find sbin | tail -n+2` tar rvpf $pkg.tar -C $P `cd $P ; find lib/udev/rules.d | tail -n+2` tar rvpf $pkg.tar -C $P etc/mdadm.conf @@ -276,6 +86,5 @@ tar rvpf $pkg.tar -C $P usr/share/doc/$src touch -t `date '+%m%d0900'` $pkg.tar ; xz $pkg.tar ; touch $pkg.tar.xz mv $pkg.tar.xz $pkg.txz - read -p "Do you want to keep work files? [y/N] " ans - if [ "x$ans" != "xY" -a "x$ans" != "xy" ] ; then rm -rf $P $C i.[se]t ; fi + cleanup fi --- plamo/00_base/old/microcode_ctl-20170424/PlamoBuild.microcode_ctl-2.1_6 2017-04-24 19:55:56.000000000 +0900 +++ plamo/00_base/microcode_ctl/PlamoBuild.microcode_ctl-2.1_6 2018-12-26 21:00:56.000000000 +0900 @@ -1,20 +1,21 @@ #!/bin/sh ###################################################################### -url="http://ftp.jaist.ac.jp/pub/Linux/Momonga/development/source/SOURCES/microcode_ctl-2.1-6.tar.xz - http://downloadmirror.intel.com/24616/eng/microcode-20150107.tgz" +url="https://releases.pagure.org/microcode_ctl/microcode_ctl-2.1-6.tar.xz + https://files01.tchspt.com/tempd/microcode-20180108.tgz" verify= digest= +branch= commitid= pkgbase=microcode_ctl vers=2.1_6 arch=`uname -m` -build=P4 +build=P6 src=$pkgbase-2.1-6 patchfiles="" OPT_CONFIG="" DOCS="README Changelog" -template=20170415 +template=20180815 tmplurl=ftp://plamo.linet.gr.jp/pub/Plamo-src/admin ###################################################################### @@ -50,7 +51,7 @@ for i in `seq 0 $((${#B[@]} - 1))` ; do cd ${B[$i]} if [ -f Makefile ] ; then - make MICROCODE_INTEL=$W/microcode-20150107.tgz + make MICROCODE_INTEL=$W/microcode-20180108.tgz fi done fi @@ -67,15 +68,22 @@ done touch $W/i.et cd $W - find $P ! -type l -newer i.st ! -newer i.et \ - -exec touch -t `date '+%m%d0900'` {} \; + TZ=UTC find $P ! -type l -newer i.st ! -newer i.et \ + -exec touch -t `date -u '+%m%d0000'` {} \; compress setup_docdir + cp -a $W/releasenote $docdir/$src + chmod g-w $docdir/$src/releasenote + chown root.root $docdir/$src/releasenote + gzip_one $docdir/$src/releasenote + mv $docdir/$src/{releasenote,$func,$myname,$spec}.gz $C + mv $C/{releasenote,$func,$myname,$spec}.gz $docdir/$src + touch -r $S $docdir/$src convert_links tar cvpf $pkg.tar -C $P `cd $P ; find usr/sbin | tail -n+2` tar rvpf $pkg.tar -C $P lib/firmware/intel-ucode tar rvpf $pkg.tar -C $P usr/share/doc/$src - touch -t `date '+%m%d0900'` $pkg.tar ; xz $pkg.tar ; touch $pkg.tar.xz - mv $pkg.tar.xz $pkg.txz + TZ=UTC touch -t `date -u '+%m%d0000'` $pkg.tar + xz $pkg.tar ; touch $pkg.tar.xz ; mv $pkg.tar.xz $pkg.txz cleanup fi --- plamo/00_base/old/mlocate-20170424/PlamoBuild.mlocate-0.24 2017-04-24 20:04:59.000000000 +0900 +++ plamo/00_base/mlocate/PlamoBuild.mlocate-0.26 2017-04-29 10:58:10.000000000 +0900 @@ -1,18 +1,18 @@ #!/bin/sh ###################################################################### -url="http://downloads.sourceforge.net/kongoni/mlocate-0.24.tar.xz" +url="https://fossies.org/linux/privat/mlocate-0.26.tar.xz" verify= digest= commitid= pkgbase=mlocate -vers=0.24 +vers=0.26 arch=`uname -m` -build=P3 +build=P1 src=$pkgbase-$vers patchfiles="" OPT_CONFIG="" -DOCS="README ChangeLog NEWS INSTALL AUTHORS ABOUT-NLS COPYING" +DOCS="README NEWS AUTHORS INSTALL ABOUT-NLS COPYING ChangeLog" template=20170415 tmplurl=ftp://plamo.linet.gr.jp/pub/Plamo-src/admin ###################################################################### @@ -66,10 +66,8 @@ done install -d $P/etc cat <<- "EOF" > $P/etc/updatedb.conf - PRUNEFS="sysfs selinuxfs usbdevfs devpts NFS nfs nfs4 afs sfs proc - smbfs cifs autofs auto iso9660 udf" - PRUNEPATHS="/tmp /usr/tmp /var/tmp /afs /net /sfs /selinux /udev - /mnt/floppy /media" + PRUNEFS="afs auto autofs cifs devpts iso9660 nfs nfs4 proc selinuxfs sfs smbfs sysfs udf usbfs" + PRUNEPATHS="/afs /media /mnt /net /sfs /tmp /udev /var/tmp" EOF install -d $P/etc/cron.daily cat <<- "EOF" > $P/etc/cron.daily/mlocate @@ -86,7 +84,7 @@ setup_docdir convert_links tar cvpf $pkg.tar -C $P `cd $P ; find usr/bin | 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/locale -name *.mo` tar rvpf $pkg.tar -C $P var/mlocate tar rvpf $pkg.tar -C $P etc/updatedb.conf tar rvpf $pkg.tar -C $P etc/cron.daily/mlocate --- plamo/00_base/old/ncurses-20161208/PlamoBuild.ncurses-6.0 2016-12-08 12:47:34.000000000 +0900 +++ plamo/00_base/ncurses/PlamoBuild.ncurses-6.0 2017-03-31 14:59:04.000000000 +0900 @@ -3,242 +3,41 @@ ###################################################################### url="http://ftp.gnu.org/gnu/ncurses/ncurses-6.0.tar.gz ftp://plamo.linet.gr.jp/pub/Plamo-src/plamo/00_base/ncurses/ncurses-6.0-Charable.patch.gz" +verify= +commitid= pkgbase=ncurses vers=6.0 arch=`uname -m` -build=P5 +build=P6 src=$pkgbase-$vers patchfiles="ncurses-6.0-Charable.patch.gz" OPT_CONFIG="--with-shared --without-debug --enable-widec --with-manpage-format=normal --disable-ext-colors" DOCS="README.MinGW README README.emx NEWS ANNOUNCE COPYING INSTALL TO-DO AUTHORS" -template=20161020 +template=20170323 tmplurl=ftp://plamo.linet.gr.jp/pub/Plamo-src/admin ###################################################################### -fscheck() { - PANGRAM="The quick brown fox jumps over the lazy dog." - echo -n "Checking for the filesystem ... " - mkdir pangram ; ( cd pangram ; touch $PANGRAM ) - mv pangram pangram~ ; mkdir pangram ; touch -r pangram~ pangram - tar cpf pangram.tar pangram ; rmdir pangram ; mv pangram~ pangram - for i in $PANGRAM ; do tar rpf pangram.tar pangram/$i ; done - touch -t `date '+%m%d0900'` pangram.tar ; gzip pangram.tar - touch pangram.tar.gz ; mv pangram.tar.gz pangram1.tgz - tar cpf pangram.tar pangram - touch -t `date '+%m%d0900'` pangram.tar ; gzip pangram.tar - touch pangram.tar.gz ; mv pangram.tar.gz pangram2.tgz - if cmp -s pangram1.tgz pangram2.tgz ; then - echo "OK" - rm -rf pangram pangram1.tgz pangram2.tgz - else - echo "NG" - cat <<- "EOF" - Hmm, packaging may not be done properly on this filesystem. - Would you please try again on a default filesystem, thanks! - - Happy packaging!! - - Quitting... - EOF - exit - fi -} - -install2() { - install -d ${2%/*} ; install -m 644 $1 $2 -} - -strip_bindir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - shopt -s nullglob - cd $1 - for i in * ; do - echo "$i" - if [ -h $i ] ; then continue ; fi - if [ -n "`file $i | grep "not stripped"`" ] ; then - echo "stripping -p $i" - strip -p $i - fi - done - ) fi -} - -strip_libdir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - shopt -s nullglob - cd $1 - for i in *.so *.so.* *.a ; do - echo "$i" - if [ -h $i ] ; then continue ; fi - if [ -n "`nm -a $i | grep " a "`" ] ; then - if [ $i != ${i%.a} ] ; then - echo -n "ranlib and " - touch -r $i $i.mt ; ranlib $i ; touch -r $i.mt $i ; rm $i.mt - fi - echo "stripping -gp $i" - strip -gp $i - fi - done - ) fi -} - -gzip_dir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - cd $1 - files=`ls -f --indicator-style=none | sed '/^\.\{1,2\}$/d'` - for i in $files ; do - echo "$i" - if [ ! -f $i -a ! -h $i -o $i != ${i%.gz} ] ; then continue ; fi - lnks=`ls -l $i | awk '{print $2}'` - if [ $lnks -gt 1 ] ; then - inum=`ls -i $i | awk '{print $1}'` - for j in `find . -maxdepth 1 -inum $inum` ; do - if [ ${j#./} == $i ] ; then - gzip -f $i - else - rm -f ${j#./} ; ln $i.gz ${j#./}.gz - fi - done - elif [ -h $i ] ; then - target=`readlink $i` ; rm -f $i ; ln -s $target.gz $i.gz - else - gzip $i - fi - done - for i in $files ; do mv ${i%.gz}.gz $C ; done - for i in $files ; do mv $C/${i%.gz}.gz . ; done - ) fi -} - -gzip_one() { - gzip $1 ; mv $1.gz $C ; mv $C/${1##*/}.gz ${1%/*} -} - -compress() { - for i in {$P,$P/usr}/{sbin,bin} ; do strip_bindir $i ; done - for i in {$P,$P/usr}/$libdir ; do strip_libdir $i ; done - if [ -f $infodir/dir ] ; then rm -f $infodir/dir ; fi - gzip_dir $infodir - for i in `seq 9` n ; do gzip_dir $mandir/man$i ; done -} - -prune_symlink() { - echo "pruning symlink in $1" - if [ -d $1 ] ; then ( - cd $P - rm -f /tmp/iNsT-a.$$ ; touch /tmp/iNsT-a.$$ - for i in `find ${1#$P/} -type l` ; do - target=`readlink $i` - echo "$i -> $target" - echo $i$'\n'$target >> /tmp/iNsT-a.$$ - done - COUNT=1 - LINE=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - while [ -n "$LINE" ] ; do - LINKGOESIN=`dirname $LINE` - LINKNAMEIS=`basename $LINE` - COUNT=$(($COUNT + 1)) - LINKPOINTSTO=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - if [ ! -d install ] ; then mkdir install ; fi - cat <<- EOF >> install/doinst.sh - ( cd $LINKGOESIN ; rm -rf $LINKNAMEIS ) - ( cd $LINKGOESIN ; ln -sf $LINKPOINTSTO $LINKNAMEIS ) - EOF - rm -rf $LINE ; touch -t `date '+%m%d0900'` install/doinst.sh $LINE - COUNT=$(($COUNT + 1)) - LINE=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - done - rm -f /tmp/iNsT-a.$$ - ) fi -} - -convert() { - for i in {$P,$P/usr}/{sbin,bin} ; do prune_symlink $i ; done - for i in {$P,$P/usr}/$libdir ; do prune_symlink $i ; done - prune_symlink $P/usr/include - prune_symlink $infodir - for i in `seq 9` n ; do prune_symlink $mandir/man$i ; done -} - -fscheck -W=`pwd` -for i in `seq 0 $((${#src[@]} - 1))` ; do - S[$i]=$W/${src[$i]} ; B[$i]=$W/build`test ${#src[@]} -eq 1 || echo $i` -done -P=$W/work ; C=$W/pivot -infodir=$P/usr/share/info -mandir=$P/usr/share/man -docdir=$P/usr/share/doc -myname=`basename $0` -pkg=$pkgbase-$vers-$arch-$build -case $arch in x86_64) libdir=lib64 ;; *) libdir=lib ;; esac -if [ $# -eq 0 ] ; then - opt_download=1 ; opt_config=1 ; opt_build=1 ; opt_package=1 +if [ -f functions ] ; then + source ./functions +elif [ ! -f /usr/share/plamo/functions ] ; then + wget ftp://plamo.linet.gr.jp/pub/Plamo-src/admin/functions + source ./functions else - opt_download=0 ; opt_config=0 ; opt_build=0 ; opt_package=0 - for i in $@ ; do - case $i in - download) opt_download=1 ;; - config) opt_config=1 ;; - build) opt_build=1 ;; - package) opt_package=1 ;; - esac - done + source /usr/share/plamo/functions fi + +fscheck +prepare "$@" if [ $opt_download -eq 1 ] ; then - for i in $url ; do - 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|tgz) tar xvpzf ${i##*/} ;; - bz2|tbz) tar xvpjf ${i##*/} ;; - xz|txz) tar xvpJf ${i##*/} ;; - esac - done + download_sources fi if [ $opt_config -eq 1 ] ; then 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 - 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 + apply_patches cd $B if [ $arch == x86_64 ] ; then cp -p misc/run_tic.in{,.orig} @@ -246,12 +45,6 @@ fi for i in `seq 0 $((${#B[@]} - 1))` ; do cd ${B[$i]} - if [ -f Makefile ] ; then - make clean - fi - if [ -f config.log ] ; then - rm -rf config.cache config.log - fi if [ -x configure ] ; then ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --libdir=/$libdir --infodir='${prefix}'/share/info \ @@ -268,12 +61,7 @@ done fi if [ $opt_package -eq 1 ] ; then - if [ `id -u` -ne 0 ] ; then - read -p "Do you want to package as root? [y/N] " ans - if [ "x$ans" == "xY" -o "x$ans" == "xy" ] ; then - cd $W ; /bin/su -c "$0 package" ; exit - fi - fi + root_priv if [ -d $P ] ; then rm -rf $P ; fi ; mkdir -p $P if [ -d $C ] ; then rm -rf $C ; fi ; mkdir -p $C touch $W/i.st ; sleep 1 @@ -292,6 +80,7 @@ ln -s libpanelw.so.$vers $P/$libdir/libpanelw.so.5 ln -s libmenuw.so.$vers $P/$libdir/libmenuw.so.5 ln -s libformw.so.$vers $P/$libdir/libformw.so.5 + ln -s libncursesw.so.$vers $P/$libdir/libncurses.so.5 install -d $P/usr/$libdir ln -s /usr/share/terminfo $P/usr/$libdir touch $W/i.et @@ -299,38 +88,12 @@ find $P ! -type l -newer i.st ! -newer i.et \ -exec touch -t `date '+%m%d0900'` {} \; compress - for i in `seq 0 $((${#DOCS[@]} - 1))` ; do - for j in ${DOCS[$i]} ; do - for k in ${S[$i]}/$j ; do - install2 $k $docdir/${src[$i]}/${k#${S[$i]}/} - touch -r $k $docdir/${src[$i]}/${k#${S[$i]}/} - gzip_one $docdir/${src[$i]}/${k#${S[$i]}/} - done - done - if [ $i -eq 0 ] ; then - install $myname $docdir/$src - touch -t `date '+%m%d0900'` $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 - convert + setup_docdir + false && convert_links + prune_symlink $P/usr/bin + for i in $P{,/usr}/$libdir ; do prune_symlink $i ; done + prune_symlink $P/usr/include + for i in 1 3 5 7 ; do prune_symlink $mandir/man$i ; done tar cvpf $pkg.tar -C $P `cd $P ; find usr/bin | 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 | tail -n+2` @@ -344,6 +107,5 @@ tar rvpf $pkg.tar -C $P install/doinst.sh touch -t `date '+%m%d0900'` $pkg.tar ; xz $pkg.tar ; touch $pkg.tar.xz mv $pkg.tar.xz $pkg.txz - read -p "Do you want to keep work files? [y/N] " ans - if [ "x$ans" != "xY" -a "x$ans" != "xy" ] ; then rm -rf $P $C i.[se]t ; fi + cleanup fi --- plamo/00_base/old/net_tools-20160114/PlamoBuild.net_tools-1.60 2016-01-14 11:49:19.000000000 +0900 +++ plamo/00_base/net_tools/PlamoBuild.net_tools-1.60 2017-04-26 20:54:47.000000000 +0900 @@ -3,219 +3,56 @@ ###################################################################### url="http://downloads.sourceforge.net/net-tools/net-tools-1.60.tar.bz2 http://simosnet.com/livecdroom/source/solydxk/main/n/net-tools/net-tools_1.60-24.1.diff.gz" +verify= +digest= +commitid= pkgbase=net_tools vers=1.60 arch=`uname -m` -build=P2 +build=P3 src=net-tools-$vers +patchfiles="net-tools_1.60-24.1.diff.gz" OPT_CONFIG="" DOCS="ABOUT-NLS COPYING INSTALLING README README.ipv6 TODO" +template=20170415 +tmplurl=ftp://plamo.linet.gr.jp/pub/Plamo-src/admin ###################################################################### -fscheck() { - PANGRAM="The quick brown fox jumps over the lazy dog." - echo -n "Checking for the filesystem ... " - mkdir pangram ; ( cd pangram ; touch $PANGRAM ) - mv pangram pangram~ ; mkdir pangram ; touch -r pangram~ pangram - tar cpf pangram.tar pangram ; rmdir pangram ; mv pangram~ pangram - for i in $PANGRAM ; do tar rpf pangram.tar pangram/$i ; done - touch -t `date '+%m%d0900'` pangram.tar ; gzip pangram.tar - touch pangram.tar.gz ; mv pangram.tar.gz pangram1.tgz - tar cpf pangram.tar pangram - touch -t `date '+%m%d0900'` pangram.tar ; gzip pangram.tar - touch pangram.tar.gz ; mv pangram.tar.gz pangram2.tgz - if cmp -s pangram1.tgz pangram2.tgz ; then - echo "OK" - rm -rf pangram pangram1.tgz pangram2.tgz - else - echo "NG" - cat <<- "EOF" - Hmm, packaging may not be done properly on this filesystem. - Would you please try again on a default filesystem, thanks! - - Happy packaging!! - - Quitting... - EOF - exit - fi -} - -install2() { - install -d ${2%/*} ; install -m 644 $1 $2 -} - -strip_bindir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - shopt -s nullglob - cd $1 - for i in * ; do - echo "$i" - if [ -h $i ] ; then continue ; fi - if [ -n "`file $i | grep "not stripped"`" ] ; then - echo "stripping -p $i" - strip -p $i - fi - done - ) fi -} - -strip_libdir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - shopt -s nullglob - cd $1 - for i in *.so *.so.* *.a ; do - echo "$i" - if [ -h $i ] ; then continue ; fi - if [ -n "`nm -a $i | grep " a "`" ] ; then - if [ $i != ${i%.a} ] ; then - echo -n "ranlib and " - touch -r $i $i.mt ; ranlib $i ; touch -r $i.mt $i ; rm $i.mt - fi - echo "stripping -gp $i" - strip -gp $i - fi - done - ) fi -} - -gzip_dir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - cd $1 - files=`ls -f --indicator-style=none | sed '/^\.\{1,2\}$/d'` - for i in $files ; do - echo "$i" - if [ ! -f $i -a ! -h $i -o $i != ${i%.gz} ] ; then continue ; fi - lnks=`ls -l $i | awk '{print $2}'` - if [ $lnks -gt 1 ] ; then - inum=`ls -i $i | awk '{print $1}'` - for j in `find . -maxdepth 1 -inum $inum` ; do - if [ ${j#./} == $i ] ; then - gzip -f $i - else - rm -f ${j#./} ; ln $i.gz ${j#./}.gz - fi - done - elif [ -h $i ] ; then - target=`readlink $i` ; rm -f $i ; ln -s $target.gz $i.gz - else - gzip $i - fi - done - for i in $files ; do mv ${i%.gz}.gz $C ; done - for i in $files ; do mv $C/${i%.gz}.gz . ; done - ) fi -} - -gzip_one() { - gzip $1 ; mv $1.gz $C ; mv $C/${1##*/}.gz ${1%/*} -} - -compress() { - for i in {$P,$P/usr}/{sbin,bin} ; do strip_bindir $i ; done - for i in {$P,$P/usr}/$libdir ; do strip_libdir $i ; done - if [ -f $infodir/dir ] ; then rm -f $infodir/dir ; fi - gzip_dir $infodir - for i in `seq 9` n ; do gzip_dir $mandir/man$i ; done -} - -prune_symlink() { - echo "pruning symlink in $1" - if [ -d $1 ] ; then ( - cd $P - rm -f /tmp/iNsT-a.$$ ; touch /tmp/iNsT-a.$$ - for i in `find ${1#$P/} -type l` ; do - target=`readlink $i` - echo "$i -> $target" - echo $i$'\n'$target >> /tmp/iNsT-a.$$ - done - COUNT=1 - LINE=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - while [ -n "$LINE" ] ; do - LINKGOESIN=`dirname $LINE` - LINKNAMEIS=`basename $LINE` - COUNT=$(($COUNT + 1)) - LINKPOINTSTO=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - if [ ! -d install ] ; then mkdir install ; fi - cat <<- EOF >> install/doinst.sh - ( cd $LINKGOESIN ; rm -rf $LINKNAMEIS ) - ( cd $LINKGOESIN ; ln -sf $LINKPOINTSTO $LINKNAMEIS ) - EOF - rm -rf $LINE ; touch -t `date '+%m%d0900'` install/doinst.sh $LINE - COUNT=$(($COUNT + 1)) - LINE=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - done - rm -f /tmp/iNsT-a.$$ - ) fi -} - -convert() { - for i in {$P,$P/usr}/{sbin,bin} ; do prune_symlink $i ; done - for i in {$P,$P/usr}/$libdir ; do prune_symlink $i ; done - prune_symlink $infodir - for i in `seq 9` n ; do prune_symlink $mandir/man$i ; done -} - -fscheck -W=`pwd` -for i in `seq 0 $((${#src[@]} - 1))` ; do - S[$i]=$W/${src[$i]} ; B[$i]=$W/build`test ${#src[@]} -eq 1 || echo $i` -done -P=$W/work ; C=$W/pivot -infodir=$P/usr/share/info -mandir=$P/usr/share/man -docdir=$P/usr/share/doc -myname=`basename $0` -pkg=$pkgbase-$vers-$arch-$build -case $arch in x86_64) libdir=lib64 ;; *) libdir=lib ;; esac -if [ $# -eq 0 ] ; then - opt_download=1 ; opt_config=1 ; opt_build=1 ; opt_package=1 +if [ -f functions ] ; then + source ./functions +elif [ ! -f /usr/share/plamo/functions ] ; then + wget ftp://plamo.linet.gr.jp/pub/Plamo-src/admin/functions + source ./functions else - opt_download=0 ; opt_config=0 ; opt_build=0 ; opt_package=0 - for i in $@ ; do - case $i in - download) opt_download=1 ;; - config) opt_config=1 ;; - build) opt_build=1 ;; - package) opt_package=1 ;; - esac - done + source /usr/share/plamo/functions fi + +fscheck +prepare "$@" if [ $opt_download -eq 1 ] ; then - for i in $url ; do - if [ ! -f ${i##*/} ] ; then wget $i ; fi - done - for i in $url ; do - case ${i##*.} in - tar) tar xvpf ${i##*/} ;; - gz) tar xvpzf ${i##*/} ;; - bz2) tar xvpjf ${i##*/} ;; - esac - done + download_sources fi if [ $opt_config -eq 1 ] ; then 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 + apply_patches cd $B - gunzip -c $W/net-tools_1.60-24.1.diff.gz | patch -Np1 -i - for i in `cat debian/patches/series` ; do patch -Np1 -i debian/patches/$i done + cp -p iptunnel.c{,.orig} + cat <<- "EOF" | patch iptunnel.c + 29d28 + < #include + 38a38 + > #include + EOF for i in `seq 0 $((${#B[@]} - 1))` ; do cd ${B[$i]} - if [ -f Makefile ] ; then - make clean - fi - if [ -f config.log ] ; then - 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 @@ -256,12 +93,7 @@ done fi if [ $opt_package -eq 1 ] ; then - if [ `id -u` -ne 0 ] ; then - read -p "Do you want to package as root? [y/N] " ans - if [ "x$ans" == "xY" -o "x$ans" == "xy" ] ; then - cd $W ; /bin/su -c "$0 package" ; exit - fi - fi + root_priv if [ -d $P ] ; then rm -rf $P ; fi ; mkdir -p $P if [ -d $C ] ; then rm -rf $C ; fi ; mkdir -p $C touch $W/i.st ; sleep 1 @@ -276,24 +108,8 @@ find $P ! -type l -newer i.st ! -newer i.et \ -exec touch -t `date '+%m%d0900'` {} \; compress - for i in `seq 0 $((${#DOCS[@]} - 1))` ; do - for j in ${DOCS[$i]} ; do - for k in ${S[$i]}/$j ; do - install2 $k $docdir/${src[$i]}/${k#${S[$i]}/} - touch -r $k $docdir/${src[$i]}/${k#${S[$i]}/} - gzip_one $docdir/${src[$i]}/${k#${S[$i]}/} - done - done - if [ $i -eq 0 ] ; then - install $myname $docdir/$src - touch -t `date '+%m%d0900'` $docdir/$src/$myname - gzip_one $docdir/$src/$myname - else - ln $docdir/$src/$myname.gz $docdir/${src[$i]} - fi - ( cd $docdir ; find ${src[$i]} -type d -exec touch -r $W/{} {} \; ) - done - convert + setup_docdir + convert_links tar cvpf $pkg.tar -C $P `cd $P ; find sbin | tail -n+2` tar rvpf $pkg.tar -C $P `cd $P ; find bin | tail -n+2` tar rvpf $pkg.tar -C $P `cd $P ; find usr/share/man/man1 | tail -n+2` @@ -303,6 +119,5 @@ tar rvpf $pkg.tar -C $P install/doinst.sh touch -t `date '+%m%d0900'` $pkg.tar ; xz $pkg.tar ; touch $pkg.tar.xz mv $pkg.tar.xz $pkg.txz - read -p "Do you want to keep work files? [y/N] " ans - if [ "x$ans" != "xY" -a "x$ans" != "xy" ] ; then rm -rf $P $C i.[se]t ; fi + cleanup fi --- plamo/00_base/old/netkit_combo-20160409/PlamoBuild.netkit_combo-0.17 2016-04-09 20:56:43.000000000 +0900 +++ plamo/00_base/netkit_combo/PlamoBuild.netkit_combo-0.17 2017-04-26 21:01:15.000000000 +0900 @@ -1,32 +1,36 @@ #!/bin/sh ###################################################################### -url="ftp://ftp.linux.org.uk/pub/linux/Networking/netkit/netkit-combo-0.17.tar.gz - ftp://plamo.linet.gr.jp/pub/Plamo-src.new/plamo/00_base/netkit_combo/biff+comsat-0.17.diff.gz - ftp://plamo.linet.gr.jp/pub/Plamo-src.new/plamo/00_base/netkit_combo/biff+comsat.offset.diff.gz - ftp://plamo.linet.gr.jp/pub/Plamo-src.new/plamo/00_base/netkit_combo/biff+comsat.badutmp.diff.gz - ftp://plamo.linet.gr.jp/pub/Plamo-src.new/plamo/00_base/netkit_combo/bsd-finger_0.17-13.diff.gz - ftp://plamo.linet.gr.jp/pub/Plamo-src.new/plamo/00_base/netkit_combo/linux-ftpd_0.17-29.diff.gz - ftp://plamo.linet.gr.jp/pub/Plamo-src.new/plamo/00_base/netkit_combo/netkit-bootparamd_0.17-9.diff.gz - ftp://plamo.linet.gr.jp/pub/Plamo-src.new/plamo/00_base/netkit_combo/netkit-ftp_0.17-19.diff.gz - ftp://plamo.linet.gr.jp/pub/Plamo-src.new/plamo/00_base/netkit_combo/netkit-ntalk_0.17-14.diff.gz - ftp://plamo.linet.gr.jp/pub/Plamo-src.new/plamo/00_base/netkit_combo/routed.18.candidate.final.patch.gz - ftp://plamo.linet.gr.jp/pub/Plamo-src.new/plamo/00_base/netkit_combo/netkit-routed-0.17.diff.gz - ftp://plamo.linet.gr.jp/pub/Plamo-src.new/plamo/00_base/netkit_combo/netkit-rsh_0.17-14.diff.gz - ftp://plamo.linet.gr.jp/pub/Plamo-src.new/plamo/00_base/netkit_combo/netkit-rusers_0.17-7.1.diff.gz - ftp://plamo.linet.gr.jp/pub/Plamo-src.new/plamo/00_base/netkit_combo/netkit-rwall_0.17-6.2.diff.gz - ftp://plamo.linet.gr.jp/pub/Plamo-src.new/plamo/00_base/netkit_combo/netkit-rwho_0.17-12.diff.gz - ftp://plamo.linet.gr.jp/pub/Plamo-src.new/plamo/00_base/netkit_combo/netkit-telnet_0.17-36.diff.gz - ftp://plamo.linet.gr.jp/pub/Plamo-src.new/plamo/00_base/netkit_combo/netkit-tftp_0.17-17.diff.gz - ftp://plamo.linet.gr.jp/pub/Plamo-src.new/plamo/00_base/netkit_combo/netkit-timed-0.17.diff.gz - ftp://plamo.linet.gr.jp/pub/Plamo-src.new/plamo/00_base/netkit_combo/netwrite-0.17.diff.gz - ftp://plamo.linet.gr.jp/pub/Plamo-src.new/plamo/00_base/netkit_combo/netkit-combo-0.17-diffs.patch.gz - ftp://plamo.linet.gr.jp/pub/Plamo-src.new/plamo/00_base/netkit_combo/netkit-combo-0.17-tirpc.patch.gz" +url="http://ftp.linux.org.uk/pub/linux/Networking/netkit/netkit-combo-0.17.tar.gz + ftp://plamo.linet.gr.jp/pub/Plamo-src/plamo/00_base/netkit_combo/biff+comsat-0.17.diff.gz + ftp://plamo.linet.gr.jp/pub/Plamo-src/plamo/00_base/netkit_combo/biff+comsat.offset.diff.gz + ftp://plamo.linet.gr.jp/pub/Plamo-src/plamo/00_base/netkit_combo/biff+comsat.badutmp.diff.gz + ftp://plamo.linet.gr.jp/pub/Plamo-src/plamo/00_base/netkit_combo/bsd-finger_0.17-13.diff.gz + ftp://plamo.linet.gr.jp/pub/Plamo-src/plamo/00_base/netkit_combo/linux-ftpd_0.17-29.diff.gz + ftp://plamo.linet.gr.jp/pub/Plamo-src/plamo/00_base/netkit_combo/netkit-bootparamd_0.17-9.diff.gz + ftp://plamo.linet.gr.jp/pub/Plamo-src/plamo/00_base/netkit_combo/netkit-ftp_0.17-19.diff.gz + ftp://plamo.linet.gr.jp/pub/Plamo-src/plamo/00_base/netkit_combo/netkit-ntalk_0.17-14.diff.gz + ftp://plamo.linet.gr.jp/pub/Plamo-src/plamo/00_base/netkit_combo/routed.18.candidate.final.patch.gz + ftp://plamo.linet.gr.jp/pub/Plamo-src/plamo/00_base/netkit_combo/netkit-routed-0.17.diff.gz + ftp://plamo.linet.gr.jp/pub/Plamo-src/plamo/00_base/netkit_combo/netkit-rsh_0.17-14.diff.gz + ftp://plamo.linet.gr.jp/pub/Plamo-src/plamo/00_base/netkit_combo/netkit-rusers_0.17-7.1.diff.gz + ftp://plamo.linet.gr.jp/pub/Plamo-src/plamo/00_base/netkit_combo/netkit-rwall_0.17-6.2.diff.gz + ftp://plamo.linet.gr.jp/pub/Plamo-src/plamo/00_base/netkit_combo/netkit-rwho_0.17-12.diff.gz + ftp://plamo.linet.gr.jp/pub/Plamo-src/plamo/00_base/netkit_combo/netkit-telnet_0.17-36.diff.gz + ftp://plamo.linet.gr.jp/pub/Plamo-src/plamo/00_base/netkit_combo/netkit-tftp_0.17-17.diff.gz + ftp://plamo.linet.gr.jp/pub/Plamo-src/plamo/00_base/netkit_combo/netkit-timed-0.17.diff.gz + ftp://plamo.linet.gr.jp/pub/Plamo-src/plamo/00_base/netkit_combo/netwrite-0.17.diff.gz + ftp://plamo.linet.gr.jp/pub/Plamo-src/plamo/00_base/netkit_combo/netkit-combo-0.17-diffs.patch.gz + ftp://plamo.linet.gr.jp/pub/Plamo-src/plamo/00_base/netkit_combo/netkit-combo-0.17-tirpc.patch.gz" +verify= +digest= +commitid= pkgbase=netkit_combo vers=0.17 arch=`uname -m` -build=P9 +build=P10 src=netkit-combo-$vers +patchfiles="" OPT_CONFIG="" DOCS="README `echo biff+comsat/{ChangeLog,README}` @@ -46,196 +50,29 @@ `echo netkit-tftp/{BUGS,ChangeLog,README}` `echo netkit-timed/{BUGS,ChangeLog,README,timed/CHANGES}` `echo netwrite/{COPYING,ChangeLog,README{,.old}}`" +template=20170415 +tmplurl=ftp://plamo.linet.gr.jp/pub/Plamo-src/admin ###################################################################### -fscheck() { - PANGRAM="The quick brown fox jumps over the lazy dog." - echo -n "Checking for the filesystem ... " - mkdir pangram ; ( cd pangram ; touch $PANGRAM ) - mv pangram pangram~ ; mkdir pangram ; touch -r pangram~ pangram - tar cpf pangram.tar pangram ; rmdir pangram ; mv pangram~ pangram - for i in $PANGRAM ; do tar rpf pangram.tar pangram/$i ; done - touch -t `date '+%m%d0900'` pangram.tar ; gzip pangram.tar - touch pangram.tar.gz ; mv pangram.tar.gz pangram1.tgz - tar cpf pangram.tar pangram - touch -t `date '+%m%d0900'` pangram.tar ; gzip pangram.tar - touch pangram.tar.gz ; mv pangram.tar.gz pangram2.tgz - if cmp -s pangram1.tgz pangram2.tgz ; then - echo "OK" - rm -rf pangram pangram1.tgz pangram2.tgz - else - echo "NG" - cat <<- "EOF" - Hmm, packaging may not be done properly on this filesystem. - Would you please try again on a default filesystem, thanks! - - Happy packaging!! - - Quitting... - EOF - exit - fi -} - -install2() { - install -d ${2%/*} ; install -m 644 $1 $2 -} - -strip_bindir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - shopt -s nullglob - cd $1 - for i in * ; do - echo "$i" - if [ -h $i ] ; then continue ; fi - if [ -n "`file $i | grep "not stripped"`" ] ; then - echo "stripping -p $i" - strip -p $i - fi - done - ) fi -} - -strip_libdir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - shopt -s nullglob - cd $1 - for i in *.so *.so.* *.a ; do - echo "$i" - if [ -h $i ] ; then continue ; fi - if [ -n "`nm -a $i | grep " a "`" ] ; then - if [ $i != ${i%.a} ] ; then - echo -n "ranlib and " - touch -r $i $i.mt ; ranlib $i ; touch -r $i.mt $i ; rm $i.mt - fi - echo "stripping -gp $i" - strip -gp $i - fi - done - ) fi -} - -gzip_dir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - cd $1 - files=`ls -f --indicator-style=none | sed '/^\.\{1,2\}$/d'` - for i in $files ; do - echo "$i" - if [ ! -f $i -a ! -h $i -o $i != ${i%.gz} ] ; then continue ; fi - lnks=`ls -l $i | awk '{print $2}'` - if [ $lnks -gt 1 ] ; then - inum=`ls -i $i | awk '{print $1}'` - for j in `find . -maxdepth 1 -inum $inum` ; do - if [ ${j#./} == $i ] ; then - gzip -f $i - else - rm -f ${j#./} ; ln $i.gz ${j#./}.gz - fi - done - elif [ -h $i ] ; then - target=`readlink $i` ; rm -f $i ; ln -s $target.gz $i.gz - else - gzip $i - fi - done - for i in $files ; do mv ${i%.gz}.gz $C ; done - for i in $files ; do mv $C/${i%.gz}.gz . ; done - ) fi -} - -gzip_one() { - gzip $1 ; mv $1.gz $C ; mv $C/${1##*/}.gz ${1%/*} -} - -compress() { - for i in {$P,$P/usr}/{sbin,bin} ; do strip_bindir $i ; done - for i in {$P,$P/usr}/$libdir ; do strip_libdir $i ; done - if [ -f $infodir/dir ] ; then rm -f $infodir/dir ; fi - gzip_dir $infodir - for i in `seq 9` n ; do gzip_dir $mandir/man$i ; done -} - -prune_symlink() { - echo "pruning symlink in $1" - if [ -d $1 ] ; then ( - cd $P - rm -f /tmp/iNsT-a.$$ ; touch /tmp/iNsT-a.$$ - for i in `find ${1#$P/} -type l` ; do - target=`readlink $i` - echo "$i -> $target" - echo $i$'\n'$target >> /tmp/iNsT-a.$$ - done - COUNT=1 - LINE=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - while [ -n "$LINE" ] ; do - LINKGOESIN=`dirname $LINE` - LINKNAMEIS=`basename $LINE` - COUNT=$(($COUNT + 1)) - LINKPOINTSTO=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - if [ ! -d install ] ; then mkdir install ; fi - cat <<- EOF >> install/doinst.sh - ( cd $LINKGOESIN ; rm -rf $LINKNAMEIS ) - ( cd $LINKGOESIN ; ln -sf $LINKPOINTSTO $LINKNAMEIS ) - EOF - rm -rf $LINE ; touch -t `date '+%m%d0900'` install/doinst.sh $LINE - COUNT=$(($COUNT + 1)) - LINE=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - done - rm -f /tmp/iNsT-a.$$ - ) fi -} - -convert() { - for i in {$P,$P/usr}/{sbin,bin} ; do prune_symlink $i ; done - for i in {$P,$P/usr}/$libdir ; do prune_symlink $i ; done - prune_symlink $infodir - for i in `seq 9` n ; do prune_symlink $mandir/man$i ; done -} - -fscheck -W=`pwd` -for i in `seq 0 $((${#src[@]} - 1))` ; do - S[$i]=$W/${src[$i]} ; B[$i]=$W/build`test ${#src[@]} -eq 1 || echo $i` -done -P=$W/work ; C=$W/pivot -infodir=$P/usr/share/info -mandir=$P/usr/share/man -docdir=$P/usr/share/doc -myname=`basename $0` -pkg=$pkgbase-$vers-$arch-$build -case $arch in x86_64) libdir=lib64 ;; *) libdir=lib ;; esac -if [ $# -eq 0 ] ; then - opt_download=1 ; opt_config=1 ; opt_build=1 ; opt_package=1 +if [ -f functions ] ; then + source ./functions +elif [ ! -f /usr/share/plamo/functions ] ; then + wget ftp://plamo.linet.gr.jp/pub/Plamo-src/admin/functions + source ./functions else - opt_download=0 ; opt_config=0 ; opt_build=0 ; opt_package=0 - for i in $@ ; do - case $i in - download) opt_download=1 ;; - config) opt_config=1 ;; - build) opt_build=1 ;; - package) opt_package=1 ;; - esac - done + source /usr/share/plamo/functions fi + +fscheck +prepare "$@" if [ $opt_download -eq 1 ] ; then - for i in $url ; do - if [ ! -f ${i##*/} ] ; then wget $i ; fi - done - for i in $url ; do - case ${i##*.} in - tar) tar xvpf ${i##*/} ;; - gz) tar xvpzf ${i##*/} ;; - bz2) tar xvpjf ${i##*/} ;; - esac - done + download_sources fi if [ $opt_config -eq 1 ] ; then 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 + apply_patches cd $B/biff+comsat gunzip -c $W/biff+comsat-0.17.diff.gz | patch -Np1 -i - gunzip -c $W/biff+comsat.offset.diff.gz | patch -Np1 -i - @@ -282,12 +119,6 @@ for i in $B/*/configure ; do sed -i '/^MANDIR=/s@man@share/man@g' $i ; done for i in `seq 0 $((${#B[@]} - 1))` ; do cd ${B[$i]} - if [ -f Makefile ] ; then - make clean - fi - if [ -f config.log ] ; then - rm -rf config.cache config.log - fi if [ -x configure ] ; then ./configure --prefix=/usr --installroot=$P ${OPT_CONFIG[$i]} fi @@ -302,12 +133,7 @@ done fi if [ $opt_package -eq 1 ] ; then - if [ `id -u` -ne 0 ] ; then - read -p "Do you want to package as root? [y/N] " ans - if [ "x$ans" == "xY" -o "x$ans" == "xy" ] ; then - cd $W ; /bin/su -c "$0 package" ; exit - fi - fi + root_priv if [ -d $P ] ; then rm -rf $P ; fi ; mkdir -p $P if [ -d $C ] ; then rm -rf $C ; fi ; mkdir -p $C touch $W/i.st ; sleep 1 @@ -324,23 +150,7 @@ find $P ! -type l -newer i.st ! -newer i.et \ -exec touch -t `date '+%m%d0900'` {} \; compress - for i in `seq 0 $((${#DOCS[@]} - 1))` ; do - for j in ${DOCS[$i]} ; do - for k in ${S[$i]}/$j ; do - install2 $k $docdir/${src[$i]}/${k#${S[$i]}/} - touch -r $k $docdir/${src[$i]}/${k#${S[$i]}/} - gzip_one $docdir/${src[$i]}/${k#${S[$i]}/} - done - done - if [ $i -eq 0 ] ; then - install $myname $docdir/$src - touch -t `date '+%m%d0900'` $docdir/$src/$myname - gzip_one $docdir/$src/$myname - else - ln $docdir/$src/$myname.gz $docdir/${src[$i]} - fi - ( cd $docdir ; find ${src[$i]} -type d -exec touch -r $W/{} {} \; ) - done + setup_docdir rm $docdir/$src/netkit-routed/ChangeLog.gz install2 $B/netkit-routed/ChangeLog $docdir/$src/netkit-routed touch -t 200012251418.04 $docdir/$src/netkit-routed/ChangeLog @@ -350,7 +160,7 @@ touch -t 200012251420.54 $docdir/$src/netkit-routed/README gzip_one $docdir/$src/netkit-routed/README touch -r $S/netkit-routed $docdir/$src/netkit-routed - convert + convert_links tar cvpf $pkg.tar -C $P `cd $P ; find 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 usr/bin | tail -n+2` @@ -362,6 +172,5 @@ tar rvpf $pkg.tar -C $P install/doinst.sh touch -t `date '+%m%d0900'` $pkg.tar ; xz $pkg.tar ; touch $pkg.tar.xz mv $pkg.tar.xz $pkg.txz - read -p "Do you want to keep work files? [y/N] " ans - if [ "x$ans" != "xY" -a "x$ans" != "xy" ] ; then rm -rf $P $C i.[se]t ; fi + cleanup fi --- plamo/00_base/old/nkf-20160324a/PlamoBuild.nkf-2.1.2 2016-03-24 12:26:46.000000000 +0900 +++ plamo/00_base/nkf/PlamoBuild.nkf-2.1.2 2017-04-26 06:16:13.000000000 +0900 @@ -2,203 +2,40 @@ ###################################################################### url="http://jaist.dl.sourceforge.jp/nkf/53171/nkf-2.1.2.tar.gz" +verify= +digest= +commitid= pkgbase=nkf vers=2.1.2 arch=`uname -m` -build=P4 +build=P5 src=$pkgbase-$vers +patchfiles="" OPT_CONFIG="" DOCS="INSTALL INSTALL.j" +template=20170415 +tmplurl=ftp://plamo.linet.gr.jp/pub/Plamo-src/admin ###################################################################### -fscheck() { - PANGRAM="The quick brown fox jumps over the lazy dog." - echo -n "Checking for the filesystem ... " - mkdir pangram ; ( cd pangram ; touch $PANGRAM ) - mv pangram pangram~ ; mkdir pangram ; touch -r pangram~ pangram - tar cpf pangram.tar pangram ; rmdir pangram ; mv pangram~ pangram - for i in $PANGRAM ; do tar rpf pangram.tar pangram/$i ; done - touch -t `date '+%m%d0900'` pangram.tar ; gzip pangram.tar - touch pangram.tar.gz ; mv pangram.tar.gz pangram1.tgz - tar cpf pangram.tar pangram - touch -t `date '+%m%d0900'` pangram.tar ; gzip pangram.tar - touch pangram.tar.gz ; mv pangram.tar.gz pangram2.tgz - if cmp -s pangram1.tgz pangram2.tgz ; then - echo "OK" - rm -rf pangram pangram1.tgz pangram2.tgz - else - echo "NG" - cat <<- "EOF" - Hmm, packaging may not be done properly on this filesystem. - Would you please try again on a default filesystem, thanks! - - Happy packaging!! - - Quitting... - EOF - exit - fi -} - -install2() { - install -d ${2%/*} ; install -m 644 $1 $2 -} - -strip_bindir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - shopt -s nullglob - cd $1 - for i in * ; do - echo "$i" - if [ -h $i ] ; then continue ; fi - if [ -n "`file $i | grep "not stripped"`" ] ; then - echo "stripping -p $i" - strip -p $i - fi - done - ) fi -} - -strip_libdir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - shopt -s nullglob - cd $1 - for i in *.so *.so.* *.a ; do - echo "$i" - if [ -h $i ] ; then continue ; fi - if [ -n "`nm -a $i | grep " a "`" ] ; then - if [ $i != ${i%.a} ] ; then - echo -n "ranlib and " - touch -r $i $i.mt ; ranlib $i ; touch -r $i.mt $i ; rm $i.mt - fi - echo "stripping -gp $i" - strip -gp $i - fi - done - ) fi -} - -gzip_dir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - cd $1 - files=`ls -f --indicator-style=none | sed '/^\.\{1,2\}$/d'` - for i in $files ; do - echo "$i" - if [ ! -f $i -a ! -h $i -o $i != ${i%.gz} ] ; then continue ; fi - lnks=`ls -l $i | awk '{print $2}'` - if [ $lnks -gt 1 ] ; then - inum=`ls -i $i | awk '{print $1}'` - for j in `find . -maxdepth 1 -inum $inum` ; do - if [ ${j#./} == $i ] ; then - gzip -f $i - else - rm -f ${j#./} ; ln $i.gz ${j#./}.gz - fi - done - elif [ -h $i ] ; then - target=`readlink $i` ; rm -f $i ; ln -s $target.gz $i.gz - else - gzip $i - fi - done - for i in $files ; do mv ${i%.gz}.gz $C ; done - for i in $files ; do mv $C/${i%.gz}.gz . ; done - ) fi -} - -gzip_one() { - gzip $1 ; mv $1.gz $C ; mv $C/${1##*/}.gz ${1%/*} -} - -compress() { - for i in {$P,$P/usr}/{sbin,bin} ; do strip_bindir $i ; done - for i in {$P,$P/usr}/$libdir ; do strip_libdir $i ; done - if [ -f $infodir/dir ] ; then rm -f $infodir/dir ; fi - gzip_dir $infodir - for i in `seq 9` n ; do gzip_dir $mandir/man$i ; done -} - -prune_symlink() { - echo "pruning symlink in $1" - if [ -d $1 ] ; then ( - cd $P - rm -f /tmp/iNsT-a.$$ ; touch /tmp/iNsT-a.$$ - for i in `find ${1#$P/} -type l` ; do - target=`readlink $i` - echo "$i -> $target" - echo $i$'\n'$target >> /tmp/iNsT-a.$$ - done - COUNT=1 - LINE=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - while [ -n "$LINE" ] ; do - LINKGOESIN=`dirname $LINE` - LINKNAMEIS=`basename $LINE` - COUNT=$(($COUNT + 1)) - LINKPOINTSTO=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - if [ ! -d install ] ; then mkdir install ; fi - cat <<- EOF >> install/doinst.sh - ( cd $LINKGOESIN ; rm -rf $LINKNAMEIS ) - ( cd $LINKGOESIN ; ln -sf $LINKPOINTSTO $LINKNAMEIS ) - EOF - rm -rf $LINE ; touch -t `date '+%m%d0900'` install/doinst.sh $LINE - COUNT=$(($COUNT + 1)) - LINE=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - done - rm -f /tmp/iNsT-a.$$ - ) fi -} - -convert() { - for i in {$P,$P/usr}/{sbin,bin} ; do prune_symlink $i ; done - for i in {$P,$P/usr}/$libdir ; do prune_symlink $i ; done - prune_symlink $infodir - for i in `seq 9` n ; do prune_symlink $mandir/man$i ; done -} - -fscheck -W=`pwd` -for i in `seq 0 $((${#src[@]} - 1))` ; do - S[$i]=$W/${src[$i]} ; B[$i]=$W/build`test ${#src[@]} -eq 1 || echo $i` -done -P=$W/work ; C=$W/pivot -infodir=$P/usr/share/info -mandir=$P/usr/share/man -docdir=$P/usr/share/doc -myname=`basename $0` -pkg=$pkgbase-$vers-$arch-$build -case $arch in x86_64) libdir=lib64 ;; *) libdir=lib ;; esac -if [ $# -eq 0 ] ; then - opt_download=1 ; opt_config=1 ; opt_build=1 ; opt_package=1 +if [ -f functions ] ; then + source ./functions +elif [ ! -f /usr/share/plamo/functions ] ; then + wget ftp://plamo.linet.gr.jp/pub/Plamo-src/admin/functions + source ./functions else - opt_download=0 ; opt_config=0 ; opt_build=0 ; opt_package=0 - for i in $@ ; do - case $i in - download) opt_download=1 ;; - config) opt_config=1 ;; - build) opt_build=1 ;; - package) opt_package=1 ;; - esac - done + source /usr/share/plamo/functions fi + +fscheck +prepare "$@" if [ $opt_download -eq 1 ] ; then - for i in $url ; do - if [ ! -f ${i##*/} ] ; then wget $i ; fi - done - for i in $url ; do - case ${i##*.} in - tar) tar xvpf ${i##*/} ;; - gz) tar xvpzf ${i##*/} ;; - bz2) tar xvpjf ${i##*/} ;; - esac - done + download_sources fi if [ $opt_config -eq 1 ] ; then 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 + apply_patches cd $B cp -p Makefile{,.orig} sed -i -e 's@/local@@g' -e 's@$(prefix)@$(DESTDIR)&@g' \ @@ -219,15 +56,9 @@ EOF for i in `seq 0 $((${#B[@]} - 1))` ; do cd ${B[$i]} - if [ -f Makefile ] ; then - make clean - fi - if [ -f config.log ] ; then - 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 @@ -244,12 +75,7 @@ sed -i 's@/local@@g' NKF.mod/Makefile fi if [ $opt_package -eq 1 ] ; then - if [ `id -u` -ne 0 ] ; then - read -p "Do you want to package as root? [y/N] " ans - if [ "x$ans" == "xY" -o "x$ans" == "xy" ] ; then - cd $W ; /bin/su -c "$0 package" ; exit - fi - fi + root_priv if [ -d $P ] ; then rm -rf $P ; fi ; mkdir -p $P if [ -d $C ] ; then rm -rf $C ; fi ; mkdir -p $C touch $W/i.st ; sleep 1 @@ -272,24 +98,8 @@ touch -t `date '+%m%d0900'` \ $P/usr/$libdir/perl5/site_perl/*/$arch-linux-thread-multi/auto/NKF gzip_dir $mandir/ja_JP.eucJP/man1 - for i in `seq 0 $((${#DOCS[@]} - 1))` ; do - for j in ${DOCS[$i]} ; do - for k in ${S[$i]}/$j ; do - install2 $k $docdir/${src[$i]}/${k#${S[$i]}/} - touch -r $k $docdir/${src[$i]}/${k#${S[$i]}/} - gzip_one $docdir/${src[$i]}/${k#${S[$i]}/} - done - done - if [ $i -eq 0 ] ; then - install $myname $docdir/$src - touch -t `date '+%m%d0900'` $docdir/$src/$myname - gzip_one $docdir/$src/$myname - else - ln $docdir/$src/$myname.gz $docdir/${src[$i]} - fi - ( cd $docdir ; find ${src[$i]} -type d -exec touch -r $W/{} {} \; ) - done - convert + setup_docdir + convert_links tar cvpf $pkg.tar -C $P `cd $P ; find usr/bin | tail -n+2` tar rvpf $pkg.tar -C $P \ usr/$libdir/perl5/site_perl/5.14.2/$arch-linux-thread-multi/{auto/NKF,NKF.pm} @@ -299,6 +109,5 @@ tar rvpf $pkg.tar -C $P usr/share/doc/$src touch -t `date '+%m%d0900'` $pkg.tar ; xz $pkg.tar ; touch $pkg.tar.xz mv $pkg.tar.xz $pkg.txz - read -p "Do you want to keep work files? [y/N] " ans - if [ "x$ans" != "xY" -a "x$ans" != "xy" ] ; then rm -rf $P $C i.[se]t ; fi + cleanup fi --- plamo/00_base/old/nvi-20170426/PlamoBuild.nvi-1.79 2017-04-26 06:54:18.000000000 +0900 +++ plamo/00_base/nvi/PlamoBuild.nvi-1.79 2018-08-15 17:39:36.000000000 +0900 @@ -1,18 +1,19 @@ #!/bin/sh ###################################################################### -url="http://pkgs.fedoraproject.org/repo/pkgs/nvi-m17n/nvi-1.79.tar.gz/765e2153f5fc4f21793f2edc2647305a/nvi-1.79.tar.gz - http://pkgs.fedoraproject.org/repo/pkgs/nvi-m17n/nvi-1.79.m17n-20040401.diff.gz/851650ced51697b3b08400fa75621c97/nvi-1.79.m17n-20040401.diff.gz +url="http://motoyuki.bsdclub.org/data/FreeBSD/distfiles/nvi-1.79.tar.gz + http://motoyuki.bsdclub.org/data/FreeBSD/distfiles/nvi-m17n-1.79-20040608.diff.gz ftp://plamo.linet.gr.jp/pub/Plamo-src/plamo/00_base/nvi/nvi-1.79-64bit_breakage.patch.gz ftp://plamo.linet.gr.jp/pub/Plamo-src/plamo/00_base/nvi/nvi-1.79-DESTDIR.patch.gz ftp://plamo.linet.gr.jp/pub/Plamo-src/plamo/00_base/nvi/nvi-cmdwrapper.gz" verify= digest= +branch= commitid= pkgbase=nvi vers=1.79 arch=`uname -m` -build=P9 +build=P10 src=$pkgbase-$vers patchfiles="" OPT_CONFIG="--enable-multibyte=euc-jp" @@ -24,7 +25,7 @@ `echo docs/internals/{gdb.script,structures,autowrite,quoting}` `echo docs/internals/{input,context,openmode,cscope.NOTES}` docs/changelog docs/tutorial/* `echo build/README{,.LynxOS}` LICENSE" -template=20170415 +template=20180815 tmplurl=ftp://plamo.linet.gr.jp/pub/Plamo-src/admin ###################################################################### @@ -49,14 +50,14 @@ apply_patches cd $B chmod -R u+w . - gunzip -c $W/nvi-1.79.m17n-20040401.diff.gz | patch -Np0 -i - + gunzip -c $W/nvi-m17n-1.79-20040608.diff.gz \ + | sed '/^\(---\|+++\) /s@\t[[:graph:]]*$@@' | patch -Np0 -fZ -i - gunzip -c $W/nvi-1.79-64bit_breakage.patch.gz | patch -Np1 -i - gunzip -c $W/nvi-1.79-DESTDIR.patch.gz | patch -Np1 -i - - cp -p build/configure{,.orig} - sed -i '/^LDFLAGS=/s@$LDFLAGS@${LDFLAGS-"-lncurses"}@g' build/configure for i in `seq 0 $((${#B[@]} - 1))` ; do cd ${B[$i]}/build if [ -x configure ] ; then + export ADDLDFLAGS="-lncurses" ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --libdir='${exec_prefix}'/$libdir --infodir='${prefix}'/share/info \ --mandir='${prefix}'/share/man ${OPT_CONFIG[$i]} @@ -83,36 +84,41 @@ fi done install -d $P/usr/libexec - mv $P/usr/bin/{vi,ex,view} $P/usr/libexec + mv $P/usr/bin/vi $P/usr/libexec gunzip -c $W/nvi-cmdwrapper.gz > $P/usr/bin/vi chmod 755 $P/usr/bin/vi - ln $P/usr/bin/{vi,ex} - ln $P/usr/bin/{vi,view} + ln -f $P/usr/bin/{vi,ex} + ln -f $P/usr/bin/{vi,view} touch $W/i.et cd $W - find $P ! -type l -newer i.st ! -newer i.et \ - -exec touch -t `date '+%m%d0900'` {} \; + TZ=UTC find $P ! -type l -newer i.st ! -newer i.et \ + -exec touch -t `date -u '+%m%d0000'` {} \; compress strip_bindir $P/usr/libexec - gzip_dir $mandir/cat1 setup_docdir chmod 755 $docdir/$src/docs/tutorial/vi.tut.csh.gz + for i in curses regex ; do + install -d $docdir/$src/$i + cp -p $B/$i/README.m17n $docdir/$src/$i + chown root.root $docdir/$src/$i/README.m17n + gzip_one $docdir/$src/$i/README.m17n + done cp -a $B/docs.m17n $docdir/$src chown -R root.root $docdir/$src/docs.m17n - find $docdir/$src/docs.m17n -exec touch -t `date '+%m%d0900'` {} \; gzip_dir $docdir/$src/docs.m17n - touch -t `date '+%m%d0900'` $docdir/$src/docs.m17n + TZ=UTC touch -t `date -u '+%m%d0000'` $docdir/$src/{curses,regex,docs.m17n} + mv $docdir/$src/{curses,build,LICENSE.gz,regex} $C mv $docdir/$src/{docs.m17n,{$func,$myname,$spec}.gz} $C + mv $C/{curses,build,LICENSE.gz,regex} $docdir/$src mv $C/{docs.m17n,{$func,$myname,$spec}.gz} $docdir/$src touch -r $S $docdir/$src convert_links tar cvpf $pkg.tar -C $P `cd $P ; find usr/bin | tail -n+2` tar rvpf $pkg.tar -C $P `cd $P ; find usr/libexec | tail -n+2` tar rvpf $pkg.tar -C $P usr/share/vi - tar rvpf $pkg.tar -C $P `cd $P ; find usr/share/man/cat1 | tail -n+2` tar rvpf $pkg.tar -C $P `cd $P ; find usr/share/man/man1 | tail -n+2` tar rvpf $pkg.tar -C $P usr/share/doc/$src - touch -t `date '+%m%d0900'` $pkg.tar ; xz $pkg.tar ; touch $pkg.tar.xz - mv $pkg.tar.xz $pkg.txz + TZ=UTC touch -t `date -u '+%m%d0000'` $pkg.tar + xz $pkg.tar ; touch $pkg.tar.xz ; mv $pkg.tar.xz $pkg.txz cleanup fi --- plamo/00_base/old/openbsd_inetd-20160114/PlamoBuild.openbsd_inetd-0.20080125 2016-01-14 19:12:30.000000000 +0900 +++ plamo/00_base/openbsd_inetd/PlamoBuild.openbsd_inetd-0.20080125 2017-04-26 13:47:52.000000000 +0900 @@ -1,221 +1,52 @@ #!/bin/sh ###################################################################### -url="http://ftp.debian.org/debian/pool/main/o/openbsd-inetd/openbsd-inetd_0.20080125.orig.tar.gz - http://ftp.debian.org/debian/pool/main/o/openbsd-inetd/openbsd-inetd_0.20080125-6.diff.gz" +url="http://ftp.acc.umu.se/mirror/cdimage/snapshot/Debian/pool/main/o/openbsd-inetd/openbsd-inetd_0.20080125.orig.tar.gz + http://ftp.acc.umu.se/mirror/cdimage/snapshot/Debian/pool/main/o/openbsd-inetd/openbsd-inetd_0.20080125-6.diff.gz + ftp://plamo.linet.gr.jp/pub/Plamo-src/plamo/00_base/openbsd_inetd/openbsd-inetd.conf.gz" +verify= +digest= +commitid= pkgbase=openbsd_inetd vers=0.20080125 arch=`uname -m` -build=P2 +build=P3 src=openbsd-inetd-$vers.orig +patchfiles="openbsd-inetd_0.20080125-6.diff.gz" OPT_CONFIG="" DOCS="ChangeLog" +template=20170415 +tmplurl=ftp://plamo.linet.gr.jp/pub/Plamo-src/admin ###################################################################### -fscheck() { - PANGRAM="The quick brown fox jumps over the lazy dog." - echo -n "Checking for the filesystem ... " - mkdir pangram ; ( cd pangram ; touch $PANGRAM ) - mv pangram pangram~ ; mkdir pangram ; touch -r pangram~ pangram - tar cpf pangram.tar pangram ; rmdir pangram ; mv pangram~ pangram - for i in $PANGRAM ; do tar rpf pangram.tar pangram/$i ; done - touch -t `date '+%m%d0900'` pangram.tar ; gzip pangram.tar - touch pangram.tar.gz ; mv pangram.tar.gz pangram1.tgz - tar cpf pangram.tar pangram - touch -t `date '+%m%d0900'` pangram.tar ; gzip pangram.tar - touch pangram.tar.gz ; mv pangram.tar.gz pangram2.tgz - if cmp -s pangram1.tgz pangram2.tgz ; then - echo "OK" - rm -rf pangram pangram1.tgz pangram2.tgz - else - echo "NG" - cat <<- "EOF" - Hmm, packaging may not be done properly on this filesystem. - Would you please try again on a default filesystem, thanks! - - Happy packaging!! - - Quitting... - EOF - exit - fi -} - -install2() { - install -d ${2%/*} ; install -m 644 $1 $2 -} - -strip_bindir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - shopt -s nullglob - cd $1 - for i in * ; do - echo "$i" - if [ -h $i ] ; then continue ; fi - if [ -n "`file $i | grep "not stripped"`" ] ; then - echo "stripping -p $i" - strip -p $i - fi - done - ) fi -} - -strip_libdir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - shopt -s nullglob - cd $1 - for i in *.so *.so.* *.a ; do - echo "$i" - if [ -h $i ] ; then continue ; fi - if [ -n "`nm -a $i | grep " a "`" ] ; then - if [ $i != ${i%.a} ] ; then - echo -n "ranlib and " - touch -r $i $i.mt ; ranlib $i ; touch -r $i.mt $i ; rm $i.mt - fi - echo "stripping -gp $i" - strip -gp $i - fi - done - ) fi -} - -gzip_dir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - cd $1 - files=`ls -f --indicator-style=none | sed '/^\.\{1,2\}$/d'` - for i in $files ; do - echo "$i" - if [ ! -f $i -a ! -h $i -o $i != ${i%.gz} ] ; then continue ; fi - lnks=`ls -l $i | awk '{print $2}'` - if [ $lnks -gt 1 ] ; then - inum=`ls -i $i | awk '{print $1}'` - for j in `find . -maxdepth 1 -inum $inum` ; do - if [ ${j#./} == $i ] ; then - gzip -f $i - else - rm -f ${j#./} ; ln $i.gz ${j#./}.gz - fi - done - elif [ -h $i ] ; then - target=`readlink $i` ; rm -f $i ; ln -s $target.gz $i.gz - else - gzip $i - fi - done - for i in $files ; do mv ${i%.gz}.gz $C ; done - for i in $files ; do mv $C/${i%.gz}.gz . ; done - ) fi -} - -gzip_one() { - gzip $1 ; mv $1.gz $C ; mv $C/${1##*/}.gz ${1%/*} -} - -compress() { - for i in {$P,$P/usr}/{sbin,bin} ; do strip_bindir $i ; done - for i in {$P,$P/usr}/$libdir ; do strip_libdir $i ; done - if [ -f $infodir/dir ] ; then rm -f $infodir/dir ; fi - gzip_dir $infodir - for i in `seq 9` n ; do gzip_dir $mandir/man$i ; done -} - -prune_symlink() { - echo "pruning symlink in $1" - if [ -d $1 ] ; then ( - cd $P - rm -f /tmp/iNsT-a.$$ ; touch /tmp/iNsT-a.$$ - for i in `find ${1#$P/} -type l` ; do - target=`readlink $i` - echo "$i -> $target" - echo $i$'\n'$target >> /tmp/iNsT-a.$$ - done - COUNT=1 - LINE=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - while [ -n "$LINE" ] ; do - LINKGOESIN=`dirname $LINE` - LINKNAMEIS=`basename $LINE` - COUNT=$(($COUNT + 1)) - LINKPOINTSTO=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - if [ ! -d install ] ; then mkdir install ; fi - cat <<- EOF >> install/doinst.sh - ( cd $LINKGOESIN ; rm -rf $LINKNAMEIS ) - ( cd $LINKGOESIN ; ln -sf $LINKPOINTSTO $LINKNAMEIS ) - EOF - rm -rf $LINE ; touch -t `date '+%m%d0900'` install/doinst.sh $LINE - COUNT=$(($COUNT + 1)) - LINE=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - done - rm -f /tmp/iNsT-a.$$ - ) fi -} - -convert() { - for i in {$P,$P/usr}/{sbin,bin} ; do prune_symlink $i ; done - for i in {$P,$P/usr}/$libdir ; do prune_symlink $i ; done - prune_symlink $infodir - for i in `seq 9` n ; do prune_symlink $mandir/man$i ; done -} - -fscheck -W=`pwd` -for i in `seq 0 $((${#src[@]} - 1))` ; do - S[$i]=$W/${src[$i]} ; B[$i]=$W/build`test ${#src[@]} -eq 1 || echo $i` -done -P=$W/work ; C=$W/pivot -infodir=$P/usr/share/info -mandir=$P/usr/share/man -docdir=$P/usr/share/doc -myname=`basename $0` -pkg=$pkgbase-$vers-$arch-$build -case $arch in x86_64) libdir=lib64 ;; *) libdir=lib ;; esac -if [ $# -eq 0 ] ; then - opt_download=1 ; opt_config=1 ; opt_build=1 ; opt_package=1 +if [ -f functions ] ; then + source ./functions +elif [ ! -f /usr/share/plamo/functions ] ; then + wget ftp://plamo.linet.gr.jp/pub/Plamo-src/admin/functions + source ./functions else - opt_download=0 ; opt_config=0 ; opt_build=0 ; opt_package=0 - for i in $@ ; do - case $i in - download) opt_download=1 ;; - config) opt_config=1 ;; - build) opt_build=1 ;; - package) opt_package=1 ;; - esac - done + source /usr/share/plamo/functions fi + +fscheck +prepare "$@" if [ $opt_download -eq 1 ] ; then - for i in $url ; do - if [ ! -f ${i##*/} ] ; then wget $i ; fi - done - for i in $url ; do - case ${i##*.} in - tar) tar xvpf ${i##*/} ;; - gz) tar xvpzf ${i##*/} ;; - bz2) tar xvpjf ${i##*/} ;; - esac - done + download_sources fi if [ $opt_config -eq 1 ] ; then 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 + apply_patches cd $B - gunzip -c $W/openbsd-inetd_0.20080125-6.diff.gz | patch -Np1 -i - for i in `grep "^[^#]" debian/patches/series` ; do patch -Np1 -i debian/patches/$i done for i in `seq 0 $((${#B[@]} - 1))` ; do cd ${B[$i]} - if [ -f Makefile ] ; then - make -f Makefile.debian clean - fi - if [ -f config.log ] ; then - 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 @@ -229,12 +60,7 @@ done fi if [ $opt_package -eq 1 ] ; then - if [ `id -u` -ne 0 ] ; then - read -p "Do you want to package as root? [y/N] " ans - if [ "x$ans" == "xY" -o "x$ans" == "xy" ] ; then - cd $W ; /bin/su -c "$0 package" ; exit - fi - fi + root_priv if [ -d $P ] ; then rm -rf $P ; fi ; mkdir -p $P if [ -d $C ] ; then rm -rf $C ; fi ; mkdir -p $C touch $W/i.st ; sleep 1 @@ -249,163 +75,19 @@ install -d $mandir/man8 install -m 644 inetd.8 $mandir/man8 install -d $P/etc - cat <<- "EOF" > $P/etc/inetd.conf - # See "man 8 inetd" for more information. - # - # If you make changes to this file, either reboot your machine or send the - # inetd a HUP signal: - # Do a "ps x" as root and look up the pid of inetd. Then do a - # "kill -HUP ". - # The inetd will re-read this file whenever it gets that signal. - # - # - # - # The first 4 services are really only used for debugging purposes, so - # we comment them out since they can otherwise be used for some nasty - # denial-of-service attacks. If you need them, uncomment them. - # echo stream tcp nowait root internal - # echo dgram udp wait root internal - # discard stream tcp nowait root internal - # discard dgram udp wait root internal - # daytime stream tcp nowait root internal - # daytime dgram udp wait root internal - # chargen stream tcp nowait root internal - # chargen dgram udp wait root internal - time stream tcp nowait root internal - time dgram udp wait root internal - # - # These are standard services. - # - ftp stream tcp nowait root /usr/sbin/tcpd in.ftpd - telnet stream tcp nowait root /usr/sbin/tcpd in.telnetd - # - # Use this one instead if you want to snoop on telnet users (try to use this - # for ethical purposes, ok folks?) : - # telnet stream tcp nowait root /usr/sbin/tcpd /usr/sbin/in.telnetsnoopd - # - # This is generally unnecessary. The daemon provided by INN will handle the - # incoming NNTP connections. - # nntp stream tcp nowait root /usr/sbin/tcpd in.nntpd - # - # This is for BSD sendmail. NOTE: It's not a good idea to uncomment this - # one, since sendmail is already set up to run as a daemon in /etc/rc.d/rc.M. - # But, if you really want to run sendmail this way for some reason, you'll - # need to uncomment the smtp line below AND change the line in /etc/rc.d/rc.M - # to run sendmail like this: /usr/sbin/sendmail -q30m - # ...otherwise the queue will not be processed. - # smtp stream tcp nowait root /usr/sbin/tcpd sendmail -bs - # - # The comsat daemon notifies the user of new mail when biff is set to y: - comsat dgram udp wait root /usr/sbin/tcpd in.comsat - # - # Shell, login, exec and talk are BSD protocols. - # - shell stream tcp nowait root /usr/sbin/tcpd in.rshd -L - login stream tcp nowait root /usr/sbin/tcpd in.rlogind - # exec stream tcp nowait root /usr/sbin/tcpd in.rexecd - # talk dgram udp wait root /usr/sbin/tcpd in.talkd - # ntalk dgram udp wait root /usr/sbin/tcpd in.talkd - ssh stream tcp nowait root /usr/sbin/tcpd /usr/sbin/sshd -i - - # - # Kerberos authenticated services - # - # klogin stream tcp nowait root /usr/sbin/tcpd rlogind -k - # eklogin stream tcp nowait root /usr/sbin/tcpd rlogind -k -x - # kshell stream tcp nowait root /usr/sbin/tcpd rshd -k - # - # Services run ONLY on the Kerberos server - # - # krbupdate stream tcp nowait root /usr/sbin/tcpd registerd - # kpasswd stream tcp nowait root /usr/sbin/tcpd kpasswdd - # - # Pop et al - # - # pop2 stream tcp nowait root /usr/sbin/tcpd in.pop2d - pop3 stream tcp nowait root /usr/sbin/tcpd ipop3d - imap stream tcp nowait root /usr/sbin/tcpd imapd - pop3s stream tcp nowait root /usr/sbin/tcpd ipop3d - imaps stream tcp nowait root /usr/sbin/tcpd imapd - # - # The ipop3d POP3 server is part of the Pine distribution. If you've - # installed the Pine package, you may wish to switch to ipop3d by - # commenting out the pop3 line above, and uncommenting the pop3 line below. - #pop3 stream tcp nowait root /usr/sbin/tcpd ipop3d - # imap2 stream tcp nowait root /usr/sbin/tcpd imapd - # - # The Internet UUCP service. - # - # uucp stream tcp nowait uucp /usr/sbin/tcpd /usr/lib/uucp/uucico -l - # - # Tftp service is provided primarily for booting. Most sites - # run this only on machines acting as "boot servers." - # - # tftp dgram udp wait nobody /usr/sbin/tcpd in.tftpd - # bootps dgram udp wait root /usr/sbin/in.bootpd in.bootpd - # - # Finger, systat and netstat give out user information which may be - # valuable to potential "system crackers." Many sites choose to disable - # some or all of these services to improve security. - # Try "telnet localhost systat" and "telnet localhost netstat" to see that - # information yourself! - # - # finger stream tcp nowait nobody /usr/sbin/tcpd in.fingerd -w - # systat stream tcp nowait nobody /usr/sbin/tcpd /bin/ps -auwwx - # netstat stream tcp nowait root /usr/sbin/tcpd /bin/netstat -a - # - # Ident service is used for net authentication - auth stream tcp wait root /usr/sbin/in.identd in.identd -w -t120 -l - # - # These are to start Samba, an smb server that can export filesystems to - # Pathworks, Lanmanager for DOS, Windows for Workgroups, Windows95, Lanmanager - # for Windows, Lanmanager for OS/2, Windows NT, etc. - # If you're running smbd and nmbd from daemons in /etc/rc.d/rc.samba, then you - # shouldn't uncomment these lines. - # netbios-ssn stream tcp nowait root /usr/local/samba/bin/smbd smbd - # netbios-ns dgram udp wait root /usr/local/samba/bin/nmbd nmbd - # - # Sun-RPC based services. - # - # - # rstatd/1-3 dgram rpc/udp wait root /usr/sbin/tcpd rpc.rstatd - # rusersd/2-3 dgram rpc/udp wait root /usr/sbin/tcpd rpc.rusersd - # walld/1 dgram rpc/udp wait root /usr/sbin/tcpd rpc.rwalld - # - - skkserv stream tcp nowait nobody /usr/sbin/tcpd /usr/libexec/dbskkd-cdb - printer stream tcp nowait lp /usr/lib/cups/daemon/cups-lpd cups-lpd - # End of inetd.conf. - swat stream tcp nowait root /usr/sbin/tcpd /usr/sbin/swat - EOF + gunzip -c $W/openbsd-inetd.conf.gz > $P/etc/inetd.conf touch $W/i.et cd $W find $P ! -type l -newer i.st ! -newer i.et \ -exec touch -t `date '+%m%d0900'` {} \; compress - for i in `seq 0 $((${#DOCS[@]} - 1))` ; do - for j in ${DOCS[$i]} ; do - for k in ${S[$i]}/$j ; do - install2 $k $docdir/${src[$i]}/${k#${S[$i]}/} - touch -r $k $docdir/${src[$i]}/${k#${S[$i]}/} - gzip_one $docdir/${src[$i]}/${k#${S[$i]}/} - done - done - if [ $i -eq 0 ] ; then - install $myname $docdir/$src - touch -t `date '+%m%d0900'` $docdir/$src/$myname - gzip_one $docdir/$src/$myname - else - ln $docdir/$src/$myname.gz $docdir/${src[$i]} - fi - ( cd $docdir ; find ${src[$i]} -type d -exec touch -r $W/{} {} \; ) - done - convert + setup_docdir + convert_links tar cvpf $pkg.tar -C $P `cd $P ; find usr/sbin | 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 etc/inetd.conf tar rvpf $pkg.tar -C $P usr/share/doc/$src touch -t `date '+%m%d0900'` $pkg.tar ; xz $pkg.tar ; touch $pkg.tar.xz mv $pkg.tar.xz $pkg.txz - read -p "Do you want to keep work files? [y/N] " ans - if [ "x$ans" != "xY" -a "x$ans" != "xy" ] ; then rm -rf $P $C i.[se]t ; fi + cleanup fi --- plamo/00_base/old/openssh-20170426/PlamoBuild.openssh-7.5p1 2017-04-26 08:39:21.000000000 +0900 +++ plamo/00_base/openssh/PlamoBuild.openssh-7.8p1 2018-12-26 22:01:04.000000000 +0900 @@ -1,22 +1,21 @@ #!/bin/sh ###################################################################### -url="http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-7.5p1.tar.gz" +url="http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-7.8p1.tar.gz" verify= digest= +branch= commitid= pkgbase=openssh -vers=7.5p1 +vers=7.8p1 arch=`uname -m` build=P2 src=$pkgbase-$vers patchfiles="" OPT_CONFIG="--sysconfdir=/etc/ssh --with-pam --with-privsep-user=sshd --with-privsep-path=/var/lib/sshd --with-md5-passwords" -DOCS="CREDITS INSTALL LICENCE OVERVIEW PROTOCOL PROTOCOL.agent - `echo PROTOCOL.{certkeys,chacha20poly1305,key,krl,mux}` - README `echo README.{dns,platform,privsep,tun}` TODO ChangeLog" -template=20170415 +DOCS="CREDITS INSTALL LICENCE OVERVIEW PROTOCOL* README* TODO ChangeLog" +template=20180815 tmplurl=ftp://plamo.linet.gr.jp/pub/Plamo-src/admin ###################################################################### @@ -87,8 +86,8 @@ install -m 644 contrib/ssh-copy-id.1 $mandir/man1 touch $W/i.et cd $W - find $P ! -type l -newer i.st ! -newer i.et \ - -exec touch -t `date '+%m%d0900'` {} \; + TZ=UTC find $P ! -type l -newer i.st ! -newer i.et \ + -exec touch -t `date -u '+%m%d0000'` {} \; compress strip_bindir $P/usr/libexec setup_docdir @@ -106,7 +105,7 @@ for i in ssh sshd ; do ssh_config $i ; done EOF - touch -t `date '+%m%d0900'` $P/install/doinst.sh + TZ=UTC touch -t `date -u '+%m%d0000'` $P/install/doinst.sh 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 usr/libexec | tail -n+2` @@ -118,7 +117,7 @@ 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 - mv $pkg.tar.xz $pkg.txz + TZ=UTC touch -t `date -u '+%m%d0000'` $pkg.tar + xz $pkg.tar ; touch $pkg.tar.xz ; mv $pkg.tar.xz $pkg.txz cleanup fi --- plamo/00_base/old/openssl-20170426/PlamoBuild.openssl-1.0.2k 2017-04-26 08:58:22.000000000 +0900 +++ plamo/00_base/openssl/PlamoBuild.openssl-1.0.2p 2018-12-26 22:15:30.000000000 +0900 @@ -1,22 +1,22 @@ #!/bin/sh ###################################################################### -url="http://www.openssl.org/source/openssl-1.0.2k.tar.gz +url="http://www.openssl.org/source/openssl-1.0.2p.tar.gz ftp://plamo.linet.gr.jp/pub/Plamo-src/plamo/00_base/openssl/mkcabundle.pl" verify= digest= +branch= commitid= pkgbase=openssl -vers=1.0.2k +vers=1.0.2p arch=`uname -m` -build=P3 +build=P2 src=$pkgbase-$vers patchfiles="" OPT_CONFIG="" -DOCS="ACKNOWLEDGMENTS CHANGES CHANGES.SSLeay CONTRIBUTING FAQ INSTALL - `echo INSTALL.{DJGPP,MacOS,NW,OS2,VMS,W32,W64,WCE}` LICENSE NEWS - PROBLEMS README README.ASN1 README.ENGINE" -template=20170415 +DOCS="ACKNOWLEDGMENTS CHANGES* CONTRIBUTING FAQ INSTALL* LICENSE NEWS + PROBLEMS README*" +template=20180815 tmplurl=ftp://plamo.linet.gr.jp/pub/Plamo-src/admin ###################################################################### @@ -85,17 +85,17 @@ ln -s /etc/ssl $P/usr/share touch $W/i.et cd $W - find $P ! -type l -newer i.st ! -newer i.et \ - -exec touch -t `date '+%m%d0900'` {} \; + TZ=UTC find $P ! -type l -newer i.st ! -newer i.et \ + -exec touch -t `date -u '+%m%d0000'` {} \; compress strip_libdir $P/usr/$libdir/engines - touch -t `date '+%m%d0900'` $P/usr/$libdir/engines + TZ=UTC touch -t `date -u '+%m%d0000'` $P/usr/$libdir/engines setup_docdir - touch -t `date '+%m%d0900'` $docdir/$src + TZ=UTC touch -t `date -u '+%m%d0000'` $docdir/$src convert_links prune_symlink $P/etc/ssl/certs/demo prune_symlink $P/usr/share - touch -t `date '+%m%d0900'` $P/etc/ssl/certs/demo + TZ=UTC touch -t `date -u '+%m%d0000'` $P/etc/ssl/certs/demo tar cvpf $pkg.tar -C $P `cd $P ; find usr/bin | tail -n+2` tar rvpf $pkg.tar -C $P usr/$libdir/engines tar rvpf $pkg.tar -C $P `cd $P ; find usr/$libdir/pkgconfig | tail -n+2` @@ -109,7 +109,7 @@ tar rvpf $pkg.tar -C $P `cd $P ; find usr/share/man/man7 | 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 - mv $pkg.tar.xz $pkg.txz + TZ=UTC touch -t `date -u '+%m%d0000'` $pkg.tar + xz $pkg.tar ; touch $pkg.tar.xz ; mv $pkg.tar.xz $pkg.txz cleanup fi --- plamo/00_base/old/os_prober-20160115/PlamoBuild.os_prober-1.56 2016-01-15 11:33:11.000000000 +0900 +++ plamo/00_base/os_prober/PlamoBuild.os_prober-1.74 2017-04-26 13:40:54.000000000 +0900 @@ -1,215 +1,47 @@ #!/bin/sh ###################################################################### -url="http://distribution-us.hexxeh.net/raspbian/archive/raspbian/pool/main/o/os-prober/os-prober_1.56.tar.gz" +url="http://http.debian.net/debian/pool/main/o/os-prober/os-prober_1.74.tar.xz + ftp://plamo.linet.gr.jp/pub/Plamo-src/plamo/00_base/os_prober/plamo-detect.patch.gz" +verify= +digest= +commitid= pkgbase=os_prober -vers=1.56 +vers=1.74 arch=`uname -m` build=P2 -src=os-prober-$vers +src=os-prober +patchfiles="plamo-detect.patch.gz" OPT_CONFIG="" DOCS="README TODO" +template=20170415 +tmplurl=ftp://plamo.linet.gr.jp/pub/Plamo-src/admin ###################################################################### -fscheck() { - PANGRAM="The quick brown fox jumps over the lazy dog." - echo -n "Checking for the filesystem ... " - mkdir pangram ; ( cd pangram ; touch $PANGRAM ) - mv pangram pangram~ ; mkdir pangram ; touch -r pangram~ pangram - tar cpf pangram.tar pangram ; rmdir pangram ; mv pangram~ pangram - for i in $PANGRAM ; do tar rpf pangram.tar pangram/$i ; done - touch -t `date '+%m%d0900'` pangram.tar ; gzip pangram.tar - touch pangram.tar.gz ; mv pangram.tar.gz pangram1.tgz - tar cpf pangram.tar pangram - touch -t `date '+%m%d0900'` pangram.tar ; gzip pangram.tar - touch pangram.tar.gz ; mv pangram.tar.gz pangram2.tgz - if cmp -s pangram1.tgz pangram2.tgz ; then - echo "OK" - rm -rf pangram pangram1.tgz pangram2.tgz - else - echo "NG" - cat <<- "EOF" - Hmm, packaging may not be done properly on this filesystem. - Would you please try again on a default filesystem, thanks! - - Happy packaging!! - - Quitting... - EOF - exit - fi -} - -install2() { - install -d ${2%/*} ; install -m 644 $1 $2 -} - -strip_bindir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - shopt -s nullglob - cd $1 - for i in * ; do - echo "$i" - if [ -h $i ] ; then continue ; fi - if [ -n "`file $i | grep "not stripped"`" ] ; then - echo "stripping -p $i" - strip -p $i - fi - done - ) fi -} - -strip_libdir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - shopt -s nullglob - cd $1 - for i in *.so *.so.* *.a ; do - echo "$i" - if [ -h $i ] ; then continue ; fi - if [ -n "`nm -a $i | grep " a "`" ] ; then - if [ $i != ${i%.a} ] ; then - echo -n "ranlib and " - touch -r $i $i.mt ; ranlib $i ; touch -r $i.mt $i ; rm $i.mt - fi - echo "stripping -gp $i" - strip -gp $i - fi - done - ) fi -} - -gzip_dir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - cd $1 - files=`ls -f --indicator-style=none | sed '/^\.\{1,2\}$/d'` - for i in $files ; do - echo "$i" - if [ ! -f $i -a ! -h $i -o $i != ${i%.gz} ] ; then continue ; fi - lnks=`ls -l $i | awk '{print $2}'` - if [ $lnks -gt 1 ] ; then - inum=`ls -i $i | awk '{print $1}'` - for j in `find . -maxdepth 1 -inum $inum` ; do - if [ ${j#./} == $i ] ; then - gzip -f $i - else - rm -f ${j#./} ; ln $i.gz ${j#./}.gz - fi - done - elif [ -h $i ] ; then - target=`readlink $i` ; rm -f $i ; ln -s $target.gz $i.gz - else - gzip $i - fi - done - for i in $files ; do mv ${i%.gz}.gz $C ; done - for i in $files ; do mv $C/${i%.gz}.gz . ; done - ) fi -} - -gzip_one() { - gzip $1 ; mv $1.gz $C ; mv $C/${1##*/}.gz ${1%/*} -} - -compress() { - for i in {$P,$P/usr}/{sbin,bin} ; do strip_bindir $i ; done - for i in {$P,$P/usr}/$libdir ; do strip_libdir $i ; done - if [ -f $infodir/dir ] ; then rm -f $infodir/dir ; fi - gzip_dir $infodir - for i in `seq 9` n ; do gzip_dir $mandir/man$i ; done -} - -prune_symlink() { - echo "pruning symlink in $1" - if [ -d $1 ] ; then ( - cd $P - rm -f /tmp/iNsT-a.$$ ; touch /tmp/iNsT-a.$$ - for i in `find ${1#$P/} -type l` ; do - target=`readlink $i` - echo "$i -> $target" - echo $i$'\n'$target >> /tmp/iNsT-a.$$ - done - COUNT=1 - LINE=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - while [ -n "$LINE" ] ; do - LINKGOESIN=`dirname $LINE` - LINKNAMEIS=`basename $LINE` - COUNT=$(($COUNT + 1)) - LINKPOINTSTO=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - if [ ! -d install ] ; then mkdir install ; fi - cat <<- EOF >> install/doinst.sh - ( cd $LINKGOESIN ; rm -rf $LINKNAMEIS ) - ( cd $LINKGOESIN ; ln -sf $LINKPOINTSTO $LINKNAMEIS ) - EOF - rm -rf $LINE ; touch -t `date '+%m%d0900'` install/doinst.sh $LINE - COUNT=$(($COUNT + 1)) - LINE=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - done - rm -f /tmp/iNsT-a.$$ - ) fi -} - -convert() { - for i in {$P,$P/usr}/{sbin,bin} ; do prune_symlink $i ; done - for i in {$P,$P/usr}/$libdir ; do prune_symlink $i ; done - prune_symlink $infodir - for i in `seq 9` n ; do prune_symlink $mandir/man$i ; done -} - -fscheck -W=`pwd` -for i in `seq 0 $((${#src[@]} - 1))` ; do - S[$i]=$W/${src[$i]} ; B[$i]=$W/build`test ${#src[@]} -eq 1 || echo $i` -done -P=$W/work ; C=$W/pivot -infodir=$P/usr/share/info -mandir=$P/usr/share/man -docdir=$P/usr/share/doc -myname=`basename $0` -pkg=$pkgbase-$vers-$arch-$build -case $arch in x86_64) libdir=lib64 ;; *) libdir=lib ;; esac -if [ $# -eq 0 ] ; then - opt_download=1 ; opt_config=1 ; opt_build=1 ; opt_package=1 +if [ -f functions ] ; then + source ./functions +elif [ ! -f /usr/share/plamo/functions ] ; then + wget ftp://plamo.linet.gr.jp/pub/Plamo-src/admin/functions + source ./functions else - opt_download=0 ; opt_config=0 ; opt_build=0 ; opt_package=0 - for i in $@ ; do - case $i in - download) opt_download=1 ;; - config) opt_config=1 ;; - build) opt_build=1 ;; - package) opt_package=1 ;; - esac - done + source /usr/share/plamo/functions fi + +fscheck +prepare "$@" if [ $opt_download -eq 1 ] ; then - for i in $url ; do - if [ ! -f ${i##*/} ] ; then wget $i ; fi - done - for i in $url ; do - case ${i##*.} in - tar) tar xvpf ${i##*/} ;; - gz) tar xvpzf ${i##*/} ;; - bz2) tar xvpjf ${i##*/} ;; - esac - done + download_sources fi if [ $opt_config -eq 1 ] ; then 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 + apply_patches for i in `seq 0 $((${#B[@]} - 1))` ; do cd ${B[$i]} - if [ -f Makefile ] ; then - make clean - fi - if [ -f config.log ] ; then - 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 @@ -223,12 +55,7 @@ done fi if [ $opt_package -eq 1 ] ; then - if [ `id -u` -ne 0 ] ; then - read -p "Do you want to package as root? [y/N] " ans - if [ "x$ans" == "xY" -o "x$ans" == "xy" ] ; then - cd $W ; /bin/su -c "$0 package" ; exit - fi - fi + root_priv if [ -d $P ] ; then rm -rf $P ; fi ; mkdir -p $P if [ -d $C ] ; then rm -rf $C ; fi ; mkdir -p $C touch $W/i.st ; sleep 1 @@ -245,12 +72,18 @@ install -d $P/usr/lib/os-probes/{mounted,init} install os-probes/common/50mounted-tests $P/usr/lib/os-probes install os-probes/mounted/common/* $P/usr/lib/os-probes/mounted - install os-probes/mounted/x86/* $P/usr/lib/os-probes/mounted + install -d $P/usr/lib/os-probes/mounted/efi + install os-probes/mounted/x86/efi/* $P/usr/lib/os-probes/mounted/efi + install os-probes/mounted/x86/[0-9]* $P/usr/lib/os-probes/mounted + install os-probes/mounted/powerpc/20macosx $P/usr/lib/os-probes/mounted install os-probes/init/common/10filesystems $P/usr/lib/os-probes/init install -d $P/usr/lib/linux-boot-probes/mounted - install linux-boot-probes/common/50mounted-tests $P/usr/lib/linux-boot-probes - install linux-boot-probes/mounted/common/* $P/usr/lib/linux-boot-probes/mounted - install linux-boot-probes/mounted/x86/* $P/usr/lib/linux-boot-probes/mounted + install linux-boot-probes/common/50mounted-tests \ + $P/usr/lib/linux-boot-probes + install linux-boot-probes/mounted/common/* \ + $P/usr/lib/linux-boot-probes/mounted + install linux-boot-probes/mounted/x86/* \ + $P/usr/lib/linux-boot-probes/mounted install -d $P/usr/share/os-prober install common.sh $P/usr/share/os-prober install -d $P/var/lib/os-prober @@ -259,24 +92,8 @@ find $P ! -type l -newer i.st ! -newer i.et \ -exec touch -t `date '+%m%d0900'` {} \; compress - for i in `seq 0 $((${#DOCS[@]} - 1))` ; do - for j in ${DOCS[$i]} ; do - for k in ${S[$i]}/$j ; do - install2 $k $docdir/${src[$i]}/${k#${S[$i]}/} - touch -r $k $docdir/${src[$i]}/${k#${S[$i]}/} - gzip_one $docdir/${src[$i]}/${k#${S[$i]}/} - done - done - if [ $i -eq 0 ] ; then - install $myname $docdir/$src - touch -t `date '+%m%d0900'` $docdir/$src/$myname - gzip_one $docdir/$src/$myname - else - ln $docdir/$src/$myname.gz $docdir/${src[$i]} - fi - ( cd $docdir ; find ${src[$i]} -type d -exec touch -r $W/{} {} \; ) - done - convert + setup_docdir + convert_links tar cvpf $pkg.tar -C $P `cd $P ; find usr/bin | tail -n+2` tar rvpf $pkg.tar -C $P `cd $P ; find usr/lib -maxdepth 1 | tail -n+2` tar rvpf $pkg.tar -C $P usr/share/os-prober @@ -284,6 +101,5 @@ tar rvpf $pkg.tar -C $P usr/share/doc/$src touch -t `date '+%m%d0900'` $pkg.tar ; xz $pkg.tar ; touch $pkg.tar.xz mv $pkg.tar.xz $pkg.txz - read -p "Do you want to keep work files? [y/N] " ans - if [ "x$ans" != "xY" -a "x$ans" != "xy" ] ; then rm -rf $P $C i.[se]t ; fi + cleanup fi --- plamo/00_base/old/pciutils-20160402/PlamoBuild.pciutils-3.1.8 2016-04-02 18:33:35.000000000 +0900 +++ plamo/00_base/pciutils/PlamoBuild.pciutils-3.1.8 2017-04-29 10:38:25.000000000 +0900 @@ -3,203 +3,40 @@ ###################################################################### url="http://www.kernel.org/pub/software/utils/pciutils/pciutils-3.1.8.tar.bz2 http://pciids.sourceforge.net/v2.2/pci.ids" +verify= +digest= +commitid= pkgbase=pciutils vers=3.1.8 arch=`uname -m` -build=P4 +build=P5 src=$pkgbase-$vers +patchfiles="" OPT_CONFIG="" DOCS="TODO README ChangeLog README.Windows COPYING" +template=20170415 +tmplurl=ftp://plamo.linet.gr.jp/pub/Plamo-src/admin ###################################################################### -fscheck() { - PANGRAM="The quick brown fox jumps over the lazy dog." - echo -n "Checking for the filesystem ... " - mkdir pangram ; ( cd pangram ; touch $PANGRAM ) - mv pangram pangram~ ; mkdir pangram ; touch -r pangram~ pangram - tar cpf pangram.tar pangram ; rmdir pangram ; mv pangram~ pangram - for i in $PANGRAM ; do tar rpf pangram.tar pangram/$i ; done - touch -t `date '+%m%d0900'` pangram.tar ; gzip pangram.tar - touch pangram.tar.gz ; mv pangram.tar.gz pangram1.tgz - tar cpf pangram.tar pangram - touch -t `date '+%m%d0900'` pangram.tar ; gzip pangram.tar - touch pangram.tar.gz ; mv pangram.tar.gz pangram2.tgz - if cmp -s pangram1.tgz pangram2.tgz ; then - echo "OK" - rm -rf pangram pangram1.tgz pangram2.tgz - else - echo "NG" - cat <<- "EOF" - Hmm, packaging may not be done properly on this filesystem. - Would you please try again on a default filesystem, thanks! - - Happy packaging!! - - Quitting... - EOF - exit - fi -} - -install2() { - install -d ${2%/*} ; install -m 644 $1 $2 -} - -strip_bindir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - shopt -s nullglob - cd $1 - for i in * ; do - echo "$i" - if [ -h $i ] ; then continue ; fi - if [ -n "`file $i | grep "not stripped"`" ] ; then - echo "stripping -p $i" - strip -p $i - fi - done - ) fi -} - -strip_libdir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - shopt -s nullglob - cd $1 - for i in *.so *.so.* *.a ; do - echo "$i" - if [ -h $i ] ; then continue ; fi - if [ -n "`nm -a $i | grep " a "`" ] ; then - if [ $i != ${i%.a} ] ; then - echo -n "ranlib and " - touch -r $i $i.mt ; ranlib $i ; touch -r $i.mt $i ; rm $i.mt - fi - echo "stripping -gp $i" - strip -gp $i - fi - done - ) fi -} - -gzip_dir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - cd $1 - files=`ls -f --indicator-style=none | sed '/^\.\{1,2\}$/d'` - for i in $files ; do - echo "$i" - if [ ! -f $i -a ! -h $i -o $i != ${i%.gz} ] ; then continue ; fi - lnks=`ls -l $i | awk '{print $2}'` - if [ $lnks -gt 1 ] ; then - inum=`ls -i $i | awk '{print $1}'` - for j in `find . -maxdepth 1 -inum $inum` ; do - if [ ${j#./} == $i ] ; then - gzip -f $i - else - rm -f ${j#./} ; ln $i.gz ${j#./}.gz - fi - done - elif [ -h $i ] ; then - target=`readlink $i` ; rm -f $i ; ln -s $target.gz $i.gz - else - gzip $i - fi - done - for i in $files ; do mv ${i%.gz}.gz $C ; done - for i in $files ; do mv $C/${i%.gz}.gz . ; done - ) fi -} - -gzip_one() { - gzip $1 ; mv $1.gz $C ; mv $C/${1##*/}.gz ${1%/*} -} - -compress() { - for i in {$P,$P/usr}/{sbin,bin} ; do strip_bindir $i ; done - for i in {$P,$P/usr}/$libdir ; do strip_libdir $i ; done - if [ -f $infodir/dir ] ; then rm -f $infodir/dir ; fi - gzip_dir $infodir - for i in `seq 9` n ; do gzip_dir $mandir/man$i ; done -} - -prune_symlink() { - echo "pruning symlink in $1" - if [ -d $1 ] ; then ( - cd $P - rm -f /tmp/iNsT-a.$$ ; touch /tmp/iNsT-a.$$ - for i in `find ${1#$P/} -type l` ; do - target=`readlink $i` - echo "$i -> $target" - echo $i$'\n'$target >> /tmp/iNsT-a.$$ - done - COUNT=1 - LINE=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - while [ -n "$LINE" ] ; do - LINKGOESIN=`dirname $LINE` - LINKNAMEIS=`basename $LINE` - COUNT=$(($COUNT + 1)) - LINKPOINTSTO=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - if [ ! -d install ] ; then mkdir install ; fi - cat <<- EOF >> install/doinst.sh - ( cd $LINKGOESIN ; rm -rf $LINKNAMEIS ) - ( cd $LINKGOESIN ; ln -sf $LINKPOINTSTO $LINKNAMEIS ) - EOF - rm -rf $LINE ; touch -t `date '+%m%d0900'` install/doinst.sh $LINE - COUNT=$(($COUNT + 1)) - LINE=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - done - rm -f /tmp/iNsT-a.$$ - ) fi -} - -convert() { - for i in {$P,$P/usr}/{sbin,bin} ; do prune_symlink $i ; done - for i in {$P,$P/usr}/$libdir ; do prune_symlink $i ; done - prune_symlink $infodir - for i in `seq 9` n ; do prune_symlink $mandir/man$i ; done -} - -fscheck -W=`pwd` -for i in `seq 0 $((${#src[@]} - 1))` ; do - S[$i]=$W/${src[$i]} ; B[$i]=$W/build`test ${#src[@]} -eq 1 || echo $i` -done -P=$W/work ; C=$W/pivot -infodir=$P/usr/share/info -mandir=$P/usr/share/man -docdir=$P/usr/share/doc -myname=`basename $0` -pkg=$pkgbase-$vers-$arch-$build -case $arch in x86_64) libdir=lib64 ;; *) libdir=lib ;; esac -if [ $# -eq 0 ] ; then - opt_download=1 ; opt_config=1 ; opt_build=1 ; opt_package=1 +if [ -f functions ] ; then + source ./functions +elif [ ! -f /usr/share/plamo/functions ] ; then + wget ftp://plamo.linet.gr.jp/pub/Plamo-src/admin/functions + source ./functions else - opt_download=0 ; opt_config=0 ; opt_build=0 ; opt_package=0 - for i in $@ ; do - case $i in - download) opt_download=1 ;; - config) opt_config=1 ;; - build) opt_build=1 ;; - package) opt_package=1 ;; - esac - done + source /usr/share/plamo/functions fi + +fscheck +prepare "$@" if [ $opt_download -eq 1 ] ; then - for i in $url ; do - if [ ! -f ${i##*/} ] ; then wget $i ; fi - done - for i in $url ; do - case ${i##*.} in - tar) tar xvpf ${i##*/} ;; - gz) tar xvpzf ${i##*/} ;; - bz2) tar xvpjf ${i##*/} ;; - esac - done + download_sources fi if [ $opt_config -eq 1 ] ; then 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 + apply_patches cd $B cp -p $W/pci.ids . if [ $arch == x86_64 ] ; then @@ -208,15 +45,9 @@ fi for i in `seq 0 $((${#B[@]} - 1))` ; do cd ${B[$i]} - if [ -f Makefile ] ; then - make clean - fi - if [ -f config.log ] ; then - 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 @@ -230,12 +61,7 @@ done fi if [ $opt_package -eq 1 ] ; then - if [ `id -u` -ne 0 ] ; then - read -p "Do you want to package as root? [y/N] " ans - if [ "x$ans" == "xY" -o "x$ans" == "xy" ] ; then - cd $W ; /bin/su -c "$0 package" ; exit - fi - fi + root_priv if [ -d $P ] ; then rm -rf $P ; fi ; mkdir -p $P if [ -d $C ] ; then rm -rf $C ; fi ; mkdir -p $C touch $W/i.st ; sleep 1 @@ -251,24 +77,8 @@ find $P ! -type l -newer i.st ! -newer i.et \ -exec touch -t `date '+%m%d0900'` {} \; compress - for i in `seq 0 $((${#DOCS[@]} - 1))` ; do - for j in ${DOCS[$i]} ; do - for k in ${S[$i]}/$j ; do - install2 $k $docdir/${src[$i]}/${k#${S[$i]}/} - touch -r $k $docdir/${src[$i]}/${k#${S[$i]}/} - gzip_one $docdir/${src[$i]}/${k#${S[$i]}/} - done - done - if [ $i -eq 0 ] ; then - install $myname $docdir/$src - touch -t `date '+%m%d0900'` $docdir/$src/$myname - gzip_one $docdir/$src/$myname - else - ln $docdir/$src/$myname.gz $docdir/${src[$i]} - fi - ( cd $docdir ; find ${src[$i]} -type d -exec touch -r $W/{} {} \; ) - done - convert + setup_docdir + convert_links tar cvpf $pkg.tar -C $P `cd $P ; find usr/sbin | tail -n+2` tar rvpf $pkg.tar -C $P \ `cd $P ; find usr/$libdir ! -name pkgconfig | tail -n+2` @@ -280,6 +90,5 @@ tar rvpf $pkg.tar -C $P install/doinst.sh touch -t `date '+%m%d0900'` $pkg.tar ; xz $pkg.tar ; touch $pkg.tar.xz mv $pkg.tar.xz $pkg.txz - read -p "Do you want to keep work files? [y/N] " ans - if [ "x$ans" != "xY" -a "x$ans" != "xy" ] ; then rm -rf $P $C i.[se]t ; fi + cleanup fi --- plamo/00_base/old/pm_utils-20160115/PlamoBuild.pm_utils-1.4.1 2016-01-15 15:19:53.000000000 +0900 +++ plamo/00_base/pm_utils/PlamoBuild.pm_utils-1.4.1 2017-04-29 12:02:33.000000000 +0900 @@ -2,214 +2,45 @@ ###################################################################### url="http://pm-utils.freedesktop.org/releases/pm-utils-1.4.1.tar.gz" +verify= +digest= +commitid= pkgbase=pm_utils vers=1.4.1 arch=`uname -m` -build=P3 +build=P4 src=pm-utils-$vers -OPT_CONFIG="--sysconfdir=/etc" +patchfiles="" +OPT_CONFIG="" DOCS="README* AUTHORS COPYING ChangeLog INSTALL NEWS TODO pm/HOWTO*" +template=20170415 +tmplurl=ftp://plamo.linet.gr.jp/pub/Plamo-src/admin ###################################################################### -fscheck() { - PANGRAM="The quick brown fox jumps over the lazy dog." - echo -n "Checking for the filesystem ... " - mkdir pangram ; ( cd pangram ; touch $PANGRAM ) - mv pangram pangram~ ; mkdir pangram ; touch -r pangram~ pangram - tar cpf pangram.tar pangram ; rmdir pangram ; mv pangram~ pangram - for i in $PANGRAM ; do tar rpf pangram.tar pangram/$i ; done - touch -t `date '+%m%d0900'` pangram.tar ; gzip pangram.tar - touch pangram.tar.gz ; mv pangram.tar.gz pangram1.tgz - tar cpf pangram.tar pangram - touch -t `date '+%m%d0900'` pangram.tar ; gzip pangram.tar - touch pangram.tar.gz ; mv pangram.tar.gz pangram2.tgz - if cmp -s pangram1.tgz pangram2.tgz ; then - echo "OK" - rm -rf pangram pangram1.tgz pangram2.tgz - else - echo "NG" - cat <<- "EOF" - Hmm, packaging may not be done properly on this filesystem. - Would you please try again on a default filesystem, thanks! - - Happy packaging!! - - Quitting... - EOF - exit - fi -} - -install2() { - install -d ${2%/*} ; install -m 644 $1 $2 -} - -strip_bindir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - shopt -s nullglob - cd $1 - for i in * ; do - echo "$i" - if [ -h $i ] ; then continue ; fi - if [ -n "`file $i | grep "not stripped"`" ] ; then - echo "stripping -p $i" - strip -p $i - fi - done - ) fi -} - -strip_libdir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - shopt -s nullglob - cd $1 - for i in *.so *.so.* *.a ; do - echo "$i" - if [ -h $i ] ; then continue ; fi - if [ -n "`nm -a $i | grep " a "`" ] ; then - if [ $i != ${i%.a} ] ; then - echo -n "ranlib and " - touch -r $i $i.mt ; ranlib $i ; touch -r $i.mt $i ; rm $i.mt - fi - echo "stripping -gp $i" - strip -gp $i - fi - done - ) fi -} - -gzip_dir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - cd $1 - files=`ls -f --indicator-style=none | sed '/^\.\{1,2\}$/d'` - for i in $files ; do - echo "$i" - if [ ! -f $i -a ! -h $i -o $i != ${i%.gz} ] ; then continue ; fi - lnks=`ls -l $i | awk '{print $2}'` - if [ $lnks -gt 1 ] ; then - inum=`ls -i $i | awk '{print $1}'` - for j in `find . -maxdepth 1 -inum $inum` ; do - if [ ${j#./} == $i ] ; then - gzip -f $i - else - rm -f ${j#./} ; ln $i.gz ${j#./}.gz - fi - done - elif [ -h $i ] ; then - target=`readlink $i` ; rm -f $i ; ln -s $target.gz $i.gz - else - gzip $i - fi - done - for i in $files ; do mv ${i%.gz}.gz $C ; done - for i in $files ; do mv $C/${i%.gz}.gz . ; done - ) fi -} - -gzip_one() { - gzip $1 ; mv $1.gz $C ; mv $C/${1##*/}.gz ${1%/*} -} - -compress() { - for i in {$P,$P/usr}/{sbin,bin} ; do strip_bindir $i ; done - for i in {$P,$P/usr}/$libdir ; do strip_libdir $i ; done - if [ -f $infodir/dir ] ; then rm -f $infodir/dir ; fi - gzip_dir $infodir - for i in `seq 9` n ; do gzip_dir $mandir/man$i ; done -} - -prune_symlink() { - echo "pruning symlink in $1" - if [ -d $1 ] ; then ( - cd $P - rm -f /tmp/iNsT-a.$$ ; touch /tmp/iNsT-a.$$ - for i in `find ${1#$P/} -type l` ; do - target=`readlink $i` - echo "$i -> $target" - echo $i$'\n'$target >> /tmp/iNsT-a.$$ - done - COUNT=1 - LINE=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - while [ -n "$LINE" ] ; do - LINKGOESIN=`dirname $LINE` - LINKNAMEIS=`basename $LINE` - COUNT=$(($COUNT + 1)) - LINKPOINTSTO=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - if [ ! -d install ] ; then mkdir install ; fi - cat <<- EOF >> install/doinst.sh - ( cd $LINKGOESIN ; rm -rf $LINKNAMEIS ) - ( cd $LINKGOESIN ; ln -sf $LINKPOINTSTO $LINKNAMEIS ) - EOF - rm -rf $LINE ; touch -t `date '+%m%d0900'` install/doinst.sh $LINE - COUNT=$(($COUNT + 1)) - LINE=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - done - rm -f /tmp/iNsT-a.$$ - ) fi -} - -convert() { - for i in {$P,$P/usr}/{sbin,bin} ; do prune_symlink $i ; done - for i in {$P,$P/usr}/$libdir ; do prune_symlink $i ; done - prune_symlink $infodir - for i in `seq 9` n ; do prune_symlink $mandir/man$i ; done -} - -fscheck -W=`pwd` -for i in `seq 0 $((${#src[@]} - 1))` ; do - S[$i]=$W/${src[$i]} ; B[$i]=$W/build`test ${#src[@]} -eq 1 || echo $i` -done -P=$W/work ; C=$W/pivot -infodir=$P/usr/share/info -mandir=$P/usr/share/man -docdir=$P/usr/share/doc -myname=`basename $0` -pkg=$pkgbase-$vers-$arch-$build -case $arch in x86_64) libdir=lib64 ;; *) libdir=lib ;; esac -if [ $# -eq 0 ] ; then - opt_download=1 ; opt_config=1 ; opt_build=1 ; opt_package=1 +if [ -f functions ] ; then + source ./functions +elif [ ! -f /usr/share/plamo/functions ] ; then + wget ftp://plamo.linet.gr.jp/pub/Plamo-src/admin/functions + source ./functions else - opt_download=0 ; opt_config=0 ; opt_build=0 ; opt_package=0 - for i in $@ ; do - case $i in - download) opt_download=1 ;; - config) opt_config=1 ;; - build) opt_build=1 ;; - package) opt_package=1 ;; - esac - done + source /usr/share/plamo/functions fi + +fscheck +prepare "$@" if [ $opt_download -eq 1 ] ; then - for i in $url ; do - if [ ! -f ${i##*/} ] ; then wget $i ; fi - done - for i in $url ; do - case ${i##*.} in - tar) tar xvpf ${i##*/} ;; - gz) tar xvpzf ${i##*/} ;; - bz2) tar xvpjf ${i##*/} ;; - esac - done + download_sources fi if [ $opt_config -eq 1 ] ; then 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 + apply_patches for i in `seq 0 $((${#B[@]} - 1))` ; do cd ${B[$i]} - if [ -f Makefile ] ; then - make clean - fi - if [ -f config.log ] ; then - 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 @@ -223,12 +54,7 @@ done fi if [ $opt_package -eq 1 ] ; then - if [ `id -u` -ne 0 ] ; then - read -p "Do you want to package as root? [y/N] " ans - if [ "x$ans" == "xY" -o "x$ans" == "xy" ] ; then - cd $W ; /bin/su -c "$0 package" ; exit - fi - fi + root_priv if [ -d $P ] ; then rm -rf $P ; fi ; mkdir -p $P if [ -d $C ] ; then rm -rf $C ; fi ; mkdir -p $C touch $W/i.st ; sleep 1 @@ -243,24 +69,8 @@ find $P ! -type l -newer i.st ! -newer i.et \ -exec touch -t `date '+%m%d0900'` {} \; compress - for i in `seq 0 $((${#DOCS[@]} - 1))` ; do - for j in ${DOCS[$i]} ; do - for k in ${S[$i]}/$j ; do - install2 $k $docdir/${src[$i]}/${k#${S[$i]}/} - touch -r $k $docdir/${src[$i]}/${k#${S[$i]}/} - gzip_one $docdir/${src[$i]}/${k#${S[$i]}/} - done - done - if [ $i -eq 0 ] ; then - install $myname $docdir/$src - touch -t `date '+%m%d0900'` $docdir/$src/$myname - gzip_one $docdir/$src/$myname - else - ln $docdir/$src/$myname.gz $docdir/${src[$i]} - fi - ( cd $docdir ; find ${src[$i]} -type d -exec touch -r $W/{} {} \; ) - done - convert + setup_docdir + convert_links 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 usr/$libdir/pm-utils @@ -272,6 +82,5 @@ tar rvpf $pkg.tar -C $P install/doinst.sh touch -t `date '+%m%d0900'` $pkg.tar ; xz $pkg.tar ; touch $pkg.tar.xz mv $pkg.tar.xz $pkg.txz - read -p "Do you want to keep work files? [y/N] " ans - if [ "x$ans" != "xY" -a "x$ans" != "xy" ] ; then rm -rf $P $C i.[se]t ; fi + cleanup fi --- plamo/00_base/old/procinfo_ng-20160409/PlamoBuild.procinfo_ng-2.0.304 2016-04-09 21:10:53.000000000 +0900 +++ plamo/00_base/procinfo_ng/PlamoBuild.procinfo_ng-2.0.304 2017-04-29 12:08:42.000000000 +0900 @@ -2,214 +2,45 @@ ###################################################################### url="http://downloads.sourceforge.net/procinfo-ng/procinfo-ng-2.0.304.tar.bz2" +verify= +digest= +commitid= pkgbase=procinfo_ng vers=2.0.304 arch=`uname -m` -build=P3 +build=P4 src=procinfo-ng-$vers +patchfiles="" OPT_CONFIG="" DOCS="GPL-2.txt LICENSE.txt LGPL-2.1.txt" +template=20170415 +tmplurl=ftp://plamo.linet.gr.jp/pub/Plamo-src/admin ###################################################################### -fscheck() { - PANGRAM="The quick brown fox jumps over the lazy dog." - echo -n "Checking for the filesystem ... " - mkdir pangram ; ( cd pangram ; touch $PANGRAM ) - mv pangram pangram~ ; mkdir pangram ; touch -r pangram~ pangram - tar cpf pangram.tar pangram ; rmdir pangram ; mv pangram~ pangram - for i in $PANGRAM ; do tar rpf pangram.tar pangram/$i ; done - touch -t `date '+%m%d0900'` pangram.tar ; gzip pangram.tar - touch pangram.tar.gz ; mv pangram.tar.gz pangram1.tgz - tar cpf pangram.tar pangram - touch -t `date '+%m%d0900'` pangram.tar ; gzip pangram.tar - touch pangram.tar.gz ; mv pangram.tar.gz pangram2.tgz - if cmp -s pangram1.tgz pangram2.tgz ; then - echo "OK" - rm -rf pangram pangram1.tgz pangram2.tgz - else - echo "NG" - cat <<- "EOF" - Hmm, packaging may not be done properly on this filesystem. - Would you please try again on a default filesystem, thanks! - - Happy packaging!! - - Quitting... - EOF - exit - fi -} - -install2() { - install -d ${2%/*} ; install -m 644 $1 $2 -} - -strip_bindir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - shopt -s nullglob - cd $1 - for i in * ; do - echo "$i" - if [ -h $i ] ; then continue ; fi - if [ -n "`file $i | grep "not stripped"`" ] ; then - echo "stripping -p $i" - strip -p $i - fi - done - ) fi -} - -strip_libdir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - shopt -s nullglob - cd $1 - for i in *.so *.so.* *.a ; do - echo "$i" - if [ -h $i ] ; then continue ; fi - if [ -n "`nm -a $i | grep " a "`" ] ; then - if [ $i != ${i%.a} ] ; then - echo -n "ranlib and " - touch -r $i $i.mt ; ranlib $i ; touch -r $i.mt $i ; rm $i.mt - fi - echo "stripping -gp $i" - strip -gp $i - fi - done - ) fi -} - -gzip_dir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - cd $1 - files=`ls -f --indicator-style=none | sed '/^\.\{1,2\}$/d'` - for i in $files ; do - echo "$i" - if [ ! -f $i -a ! -h $i -o $i != ${i%.gz} ] ; then continue ; fi - lnks=`ls -l $i | awk '{print $2}'` - if [ $lnks -gt 1 ] ; then - inum=`ls -i $i | awk '{print $1}'` - for j in `find . -maxdepth 1 -inum $inum` ; do - if [ ${j#./} == $i ] ; then - gzip -f $i - else - rm -f ${j#./} ; ln $i.gz ${j#./}.gz - fi - done - elif [ -h $i ] ; then - target=`readlink $i` ; rm -f $i ; ln -s $target.gz $i.gz - else - gzip $i - fi - done - for i in $files ; do mv ${i%.gz}.gz $C ; done - for i in $files ; do mv $C/${i%.gz}.gz . ; done - ) fi -} - -gzip_one() { - gzip $1 ; mv $1.gz $C ; mv $C/${1##*/}.gz ${1%/*} -} - -compress() { - for i in {$P,$P/usr}/{sbin,bin} ; do strip_bindir $i ; done - for i in {$P,$P/usr}/$libdir ; do strip_libdir $i ; done - if [ -f $infodir/dir ] ; then rm -f $infodir/dir ; fi - gzip_dir $infodir - for i in `seq 9` n ; do gzip_dir $mandir/man$i ; done -} - -prune_symlink() { - echo "pruning symlink in $1" - if [ -d $1 ] ; then ( - cd $P - rm -f /tmp/iNsT-a.$$ ; touch /tmp/iNsT-a.$$ - for i in `find ${1#$P/} -type l` ; do - target=`readlink $i` - echo "$i -> $target" - echo $i$'\n'$target >> /tmp/iNsT-a.$$ - done - COUNT=1 - LINE=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - while [ -n "$LINE" ] ; do - LINKGOESIN=`dirname $LINE` - LINKNAMEIS=`basename $LINE` - COUNT=$(($COUNT + 1)) - LINKPOINTSTO=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - if [ ! -d install ] ; then mkdir install ; fi - cat <<- EOF >> install/doinst.sh - ( cd $LINKGOESIN ; rm -rf $LINKNAMEIS ) - ( cd $LINKGOESIN ; ln -sf $LINKPOINTSTO $LINKNAMEIS ) - EOF - rm -rf $LINE ; touch -t `date '+%m%d0900'` install/doinst.sh $LINE - COUNT=$(($COUNT + 1)) - LINE=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - done - rm -f /tmp/iNsT-a.$$ - ) fi -} - -convert() { - for i in {$P,$P/usr}/{sbin,bin} ; do prune_symlink $i ; done - for i in {$P,$P/usr}/$libdir ; do prune_symlink $i ; done - prune_symlink $infodir - for i in `seq 9` n ; do prune_symlink $mandir/man$i ; done -} - -fscheck -W=`pwd` -for i in `seq 0 $((${#src[@]} - 1))` ; do - S[$i]=$W/${src[$i]} ; B[$i]=$W/build`test ${#src[@]} -eq 1 || echo $i` -done -P=$W/work ; C=$W/pivot -infodir=$P/usr/share/info -mandir=$P/usr/share/man -docdir=$P/usr/share/doc -myname=`basename $0` -pkg=$pkgbase-$vers-$arch-$build -case $arch in x86_64) libdir=lib64 ;; *) libdir=lib ;; esac -if [ $# -eq 0 ] ; then - opt_download=1 ; opt_config=1 ; opt_build=1 ; opt_package=1 +if [ -f functions ] ; then + source ./functions +elif [ ! -f /usr/share/plamo/functions ] ; then + wget ftp://plamo.linet.gr.jp/pub/Plamo-src/admin/functions + source ./functions else - opt_download=0 ; opt_config=0 ; opt_build=0 ; opt_package=0 - for i in $@ ; do - case $i in - download) opt_download=1 ;; - config) opt_config=1 ;; - build) opt_build=1 ;; - package) opt_package=1 ;; - esac - done + source /usr/share/plamo/functions fi + +fscheck +prepare "$@" if [ $opt_download -eq 1 ] ; then - for i in $url ; do - if [ ! -f ${i##*/} ] ; then wget $i ; fi - done - for i in $url ; do - case ${i##*.} in - tar) tar xvpf ${i##*/} ;; - gz) tar xvpzf ${i##*/} ;; - bz2) tar xvpjf ${i##*/} ;; - esac - done + download_sources fi if [ $opt_config -eq 1 ] ; then 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 + apply_patches for i in `seq 0 $((${#B[@]} - 1))` ; do cd ${B[$i]} - if [ -f Makefile ] ; then - make clean - fi - if [ -f config.log ] ; then - 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 @@ -223,12 +54,7 @@ done fi if [ $opt_package -eq 1 ] ; then - if [ `id -u` -ne 0 ] ; then - read -p "Do you want to package as root? [y/N] " ans - if [ "x$ans" == "xY" -o "x$ans" == "xy" ] ; then - cd $W ; /bin/su -c "$0 package" ; exit - fi - fi + root_priv if [ -d $P ] ; then rm -rf $P ; fi ; mkdir -p $P if [ -d $C ] ; then rm -rf $C ; fi ; mkdir -p $C touch $W/i.st ; sleep 1 @@ -243,29 +69,12 @@ find $P ! -type l -newer i.st ! -newer i.et \ -exec touch -t `date '+%m%d0900'` {} \; compress - for i in `seq 0 $((${#DOCS[@]} - 1))` ; do - for j in ${DOCS[$i]} ; do - for k in ${S[$i]}/$j ; do - install2 $k $docdir/${src[$i]}/${k#${S[$i]}/} - touch -r $k $docdir/${src[$i]}/${k#${S[$i]}/} - gzip_one $docdir/${src[$i]}/${k#${S[$i]}/} - done - done - if [ $i -eq 0 ] ; then - install $myname $docdir/$src - touch -t `date '+%m%d0900'` $docdir/$src/$myname - gzip_one $docdir/$src/$myname - else - ln $docdir/$src/$myname.gz $docdir/${src[$i]} - fi - ( cd $docdir ; find ${src[$i]} -type d -exec touch -r $W/{} {} \; ) - done - convert + setup_docdir + convert_links tar cvpf $pkg.tar -C $P `cd $P ; find usr/bin | 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 touch -t `date '+%m%d0900'` $pkg.tar ; xz $pkg.tar ; touch $pkg.tar.xz mv $pkg.tar.xz $pkg.txz - read -p "Do you want to keep work files? [y/N] " ans - if [ "x$ans" != "xY" -a "x$ans" != "xy" ] ; then rm -rf $P $C i.[se]t ; fi + cleanup fi --- plamo/00_base/old/procps_ng-20160408/PlamoBuild.procps_ng-3.3.11 2016-04-08 15:09:37.000000000 +0900 +++ plamo/00_base/procps_ng/PlamoBuild.procps_ng-3.3.11 2017-04-29 12:14:13.000000000 +0900 @@ -2,216 +2,46 @@ ###################################################################### url="http://downloads.sourceforge.net/procps-ng/procps-ng-3.3.11.tar.xz" +verify= +digest= +commitid= pkgbase=procps_ng vers=3.3.11 arch=`uname -m` -build=P2 +build=P3 src=procps-ng-$vers +patchfiles="" OPT_CONFIG="--exec-prefix= --disable-kill --enable-skill" DOCS="AUTHORS NEWS COPYING ABOUT-NLS ChangeLog COPYING.LIB `echo Documentation/{CodingStyle.md,FAQ,TODO,bugs.md}`" +template=20170415 +tmplurl=ftp://plamo.linet.gr.jp/pub/Plamo-src/admin ###################################################################### -fscheck() { - PANGRAM="The quick brown fox jumps over the lazy dog." - echo -n "Checking for the filesystem ... " - mkdir pangram ; ( cd pangram ; touch $PANGRAM ) - mv pangram pangram~ ; mkdir pangram ; touch -r pangram~ pangram - tar cpf pangram.tar pangram ; rmdir pangram ; mv pangram~ pangram - for i in $PANGRAM ; do tar rpf pangram.tar pangram/$i ; done - touch -t `date '+%m%d0900'` pangram.tar ; gzip pangram.tar - touch pangram.tar.gz ; mv pangram.tar.gz pangram1.tgz - tar cpf pangram.tar pangram - touch -t `date '+%m%d0900'` pangram.tar ; gzip pangram.tar - touch pangram.tar.gz ; mv pangram.tar.gz pangram2.tgz - if cmp -s pangram1.tgz pangram2.tgz ; then - echo "OK" - rm -rf pangram pangram1.tgz pangram2.tgz - else - echo "NG" - cat <<- "EOF" - Hmm, packaging may not be done properly on this filesystem. - Would you please try again on a default filesystem, thanks! - - Happy packaging!! - - Quitting... - EOF - exit - fi -} - -install2() { - install -d ${2%/*} ; install -m 644 $1 $2 -} - -strip_bindir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - shopt -s nullglob - cd $1 - for i in * ; do - echo "$i" - if [ -h $i ] ; then continue ; fi - if [ -n "`file $i | grep "not stripped"`" ] ; then - echo "stripping -p $i" - strip -p $i - fi - done - ) fi -} - -strip_libdir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - shopt -s nullglob - cd $1 - for i in *.so *.so.* *.a ; do - echo "$i" - if [ -h $i ] ; then continue ; fi - if [ -n "`nm -a $i | grep " a "`" ] ; then - if [ $i != ${i%.a} ] ; then - echo -n "ranlib and " - touch -r $i $i.mt ; ranlib $i ; touch -r $i.mt $i ; rm $i.mt - fi - echo "stripping -gp $i" - strip -gp $i - fi - done - ) fi -} - -gzip_dir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - cd $1 - files=`ls -f --indicator-style=none | sed '/^\.\{1,2\}$/d'` - for i in $files ; do - echo "$i" - if [ ! -f $i -a ! -h $i -o $i != ${i%.gz} ] ; then continue ; fi - lnks=`ls -l $i | awk '{print $2}'` - if [ $lnks -gt 1 ] ; then - inum=`ls -i $i | awk '{print $1}'` - for j in `find . -maxdepth 1 -inum $inum` ; do - if [ ${j#./} == $i ] ; then - gzip -f $i - else - rm -f ${j#./} ; ln $i.gz ${j#./}.gz - fi - done - elif [ -h $i ] ; then - target=`readlink $i` ; rm -f $i ; ln -s $target.gz $i.gz - else - gzip $i - fi - done - for i in $files ; do mv ${i%.gz}.gz $C ; done - for i in $files ; do mv $C/${i%.gz}.gz . ; done - ) fi -} - -gzip_one() { - gzip $1 ; mv $1.gz $C ; mv $C/${1##*/}.gz ${1%/*} -} - -compress() { - for i in {$P,$P/usr}/{sbin,bin} ; do strip_bindir $i ; done - for i in {$P,$P/usr}/$libdir ; do strip_libdir $i ; done - if [ -f $infodir/dir ] ; then rm -f $infodir/dir ; fi - gzip_dir $infodir - for i in `seq 9` n ; do gzip_dir $mandir/man$i ; done -} - -prune_symlink() { - echo "pruning symlink in $1" - if [ -d $1 ] ; then ( - cd $P - rm -f /tmp/iNsT-a.$$ ; touch /tmp/iNsT-a.$$ - for i in `find ${1#$P/} -type l` ; do - target=`readlink $i` - echo "$i -> $target" - echo $i$'\n'$target >> /tmp/iNsT-a.$$ - done - COUNT=1 - LINE=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - while [ -n "$LINE" ] ; do - LINKGOESIN=`dirname $LINE` - LINKNAMEIS=`basename $LINE` - COUNT=$(($COUNT + 1)) - LINKPOINTSTO=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - if [ ! -d install ] ; then mkdir install ; fi - cat <<- EOF >> install/doinst.sh - ( cd $LINKGOESIN ; rm -rf $LINKNAMEIS ) - ( cd $LINKGOESIN ; ln -sf $LINKPOINTSTO $LINKNAMEIS ) - EOF - rm -rf $LINE ; touch -t `date '+%m%d0900'` install/doinst.sh $LINE - COUNT=$(($COUNT + 1)) - LINE=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - done - rm -f /tmp/iNsT-a.$$ - ) fi -} - -convert() { - for i in {$P,$P/usr}/{sbin,bin} ; do prune_symlink $i ; done - for i in {$P,$P/usr}/$libdir ; do prune_symlink $i ; done - prune_symlink $infodir - for i in `seq 9` n ; do prune_symlink $mandir/man$i ; done -} - -fscheck -W=`pwd` -for i in `seq 0 $((${#src[@]} - 1))` ; do - S[$i]=$W/${src[$i]} ; B[$i]=$W/build`test ${#src[@]} -eq 1 || echo $i` -done -P=$W/work ; C=$W/pivot -infodir=$P/usr/share/info -mandir=$P/usr/share/man -docdir=$P/usr/share/doc -myname=`basename $0` -pkg=$pkgbase-$vers-$arch-$build -case $arch in x86_64) libdir=lib64 ;; *) libdir=lib ;; esac -if [ $# -eq 0 ] ; then - opt_download=1 ; opt_config=1 ; opt_build=1 ; opt_package=1 +if [ -f functions ] ; then + source ./functions +elif [ ! -f /usr/share/plamo/functions ] ; then + wget ftp://plamo.linet.gr.jp/pub/Plamo-src/admin/functions + source ./functions else - opt_download=0 ; opt_config=0 ; opt_build=0 ; opt_package=0 - for i in $@ ; do - case $i in - download) opt_download=1 ;; - config) opt_config=1 ;; - build) opt_build=1 ;; - package) opt_package=1 ;; - esac - done + source /usr/share/plamo/functions fi + +fscheck +prepare "$@" if [ $opt_download -eq 1 ] ; then - for i in $url ; do - if [ ! -f ${i##*/} ] ; then wget $i ; fi - done - for i in $url ; do - case ${i##*.} in - tar) tar xvpf ${i##*/} ;; - gz) tar xvpzf ${i##*/} ;; - bz2) tar xvpjf ${i##*/} ;; - xz) tar xvpJf ${i##*/} ;; - esac - done + download_sources fi if [ $opt_config -eq 1 ] ; then 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 + apply_patches for i in `seq 0 $((${#B[@]} - 1))` ; do cd ${B[$i]} - if [ -f Makefile ] ; then - make clean - fi - if [ -f config.log ] ; then - rm -rf config.cache config.log - fi if [ -x configure ] ; then - ./configure --prefix=/usr --libdir=/usr/$libdir \ - --infodir='${prefix}'/share/info \ + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --libdir=/usr/$libdir --infodir='${prefix}'/share/info \ --mandir='${prefix}'/share/man ${OPT_CONFIG[$i]} fi done @@ -225,12 +55,7 @@ done fi if [ $opt_package -eq 1 ] ; then - if [ `id -u` -ne 0 ] ; then - read -p "Do you want to package as root? [y/N] " ans - if [ "x$ans" == "xY" -o "x$ans" == "xy" ] ; then - cd $W ; /bin/su -c "$0 package" ; exit - fi - fi + root_priv if [ -d $P ] ; then rm -rf $P ; fi ; mkdir -p $P if [ -d $C ] ; then rm -rf $C ; fi ; mkdir -p $C touch $W/i.st ; sleep 1 @@ -245,30 +70,14 @@ find $P ! -type l -newer i.st ! -newer i.et \ -exec touch -t `date '+%m%d0900'` {} \; compress - for i in `seq 0 $((${#DOCS[@]} - 1))` ; do - for j in ${DOCS[$i]} ; do - for k in ${S[$i]}/$j ; do - install2 $k $docdir/${src[$i]}/${k#${S[$i]}/} - touch -r $k $docdir/${src[$i]}/${k#${S[$i]}/} - gzip_one $docdir/${src[$i]}/${k#${S[$i]}/} - done - done - if [ $i -eq 0 ] ; then - install $myname $docdir/$src - touch -t `date '+%m%d0900'` $docdir/$src/$myname - gzip_one $docdir/$src/$myname - else - ln $docdir/$src/$myname.gz $docdir/${src[$i]} - fi - ( cd $docdir ; find ${src[$i]} -type d -exec touch -r $W/{} {} \; ) - done - convert + setup_docdir + convert_links 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 ! -name pkgconfig | tail -n+2` tar rvpf $pkg.tar -C $P usr/include/proc - 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/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/man3 | tail -n+2` tar rvpf $pkg.tar -C $P `cd $P ; find usr/share/man/man5 | tail -n+2` @@ -277,6 +86,5 @@ tar rvpf $pkg.tar -C $P install/doinst.sh touch -t `date '+%m%d0900'` $pkg.tar ; xz $pkg.tar ; touch $pkg.tar.xz mv $pkg.tar.xz $pkg.txz - read -p "Do you want to keep work files? [y/N] " ans - if [ "x$ans" != "xY" -a "x$ans" != "xy" ] ; then rm -rf $P $C i.[se]t ; fi + cleanup fi --- plamo/00_base/old/readline-20160827/PlamoBuild.readline-6.3.8 2016-08-27 18:10:21.000000000 +0900 +++ plamo/00_base/readline/PlamoBuild.readline-6.3 2017-04-29 12:22:54.000000000 +0900 @@ -10,237 +10,40 @@ http://ftp.gnu.org/gnu/readline/readline-6.3-patches/readline63-006 http://ftp.gnu.org/gnu/readline/readline-6.3-patches/readline63-007 http://ftp.gnu.org/gnu/readline/readline-6.3-patches/readline63-008" +verify= +digest= +commitid= pkgbase=readline vers=6.3 arch=`uname -m` -build=P3 +build=P4 src=$pkgbase-$vers patchfiles="" OPT_CONFIG="--with-curses" DOCS="COPYING README MANIFEST INSTALL CHANGELOG CHANGES NEWS USAGE" +template=20170415 +tmplurl=ftp://plamo.linet.gr.jp/pub/Plamo-src/admin ###################################################################### -fscheck() { - PANGRAM="The quick brown fox jumps over the lazy dog." - echo -n "Checking for the filesystem ... " - mkdir pangram ; ( cd pangram ; touch $PANGRAM ) - mv pangram pangram~ ; mkdir pangram ; touch -r pangram~ pangram - tar cpf pangram.tar pangram ; rmdir pangram ; mv pangram~ pangram - for i in $PANGRAM ; do tar rpf pangram.tar pangram/$i ; done - touch -t `date '+%m%d0900'` pangram.tar ; gzip pangram.tar - touch pangram.tar.gz ; mv pangram.tar.gz pangram1.tgz - tar cpf pangram.tar pangram - touch -t `date '+%m%d0900'` pangram.tar ; gzip pangram.tar - touch pangram.tar.gz ; mv pangram.tar.gz pangram2.tgz - if cmp -s pangram1.tgz pangram2.tgz ; then - echo "OK" - rm -rf pangram pangram1.tgz pangram2.tgz - else - echo "NG" - cat <<- "EOF" - Hmm, packaging may not be done properly on this filesystem. - Would you please try again on a default filesystem, thanks! - - Happy packaging!! - - Quitting... - EOF - exit - fi -} - -install2() { - install -d ${2%/*} ; install -m 644 $1 $2 -} - -strip_bindir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - shopt -s nullglob - cd $1 - for i in * ; do - echo "$i" - if [ -h $i ] ; then continue ; fi - if [ -n "`file $i | grep "not stripped"`" ] ; then - echo "stripping -p $i" - strip -p $i - fi - done - ) fi -} - -strip_libdir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - shopt -s nullglob - cd $1 - for i in *.so *.so.* *.a ; do - echo "$i" - if [ -h $i ] ; then continue ; fi - if [ -n "`nm -a $i | grep " a "`" ] ; then - if [ $i != ${i%.a} ] ; then - echo -n "ranlib and " - touch -r $i $i.mt ; ranlib $i ; touch -r $i.mt $i ; rm $i.mt - fi - echo "stripping -gp $i" - strip -gp $i - fi - done - ) fi -} - -gzip_dir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - cd $1 - files=`ls -f --indicator-style=none | sed '/^\.\{1,2\}$/d'` - for i in $files ; do - echo "$i" - if [ ! -f $i -a ! -h $i -o $i != ${i%.gz} ] ; then continue ; fi - lnks=`ls -l $i | awk '{print $2}'` - if [ $lnks -gt 1 ] ; then - inum=`ls -i $i | awk '{print $1}'` - for j in `find . -maxdepth 1 -inum $inum` ; do - if [ ${j#./} == $i ] ; then - gzip -f $i - else - rm -f ${j#./} ; ln $i.gz ${j#./}.gz - fi - done - elif [ -h $i ] ; then - target=`readlink $i` ; rm -f $i ; ln -s $target.gz $i.gz - else - gzip $i - fi - done - for i in $files ; do mv ${i%.gz}.gz $C ; done - for i in $files ; do mv $C/${i%.gz}.gz . ; done - ) fi -} - -gzip_one() { - gzip $1 ; mv $1.gz $C ; mv $C/${1##*/}.gz ${1%/*} -} - -compress() { - for i in {$P,$P/usr}/{sbin,bin} ; do strip_bindir $i ; done - for i in {$P,$P/usr}/$libdir ; do strip_libdir $i ; done - if [ -f $infodir/dir ] ; then rm -f $infodir/dir ; fi - gzip_dir $infodir - for i in `seq 9` n ; do gzip_dir $mandir/man$i ; done -} - -prune_symlink() { - echo "pruning symlink in $1" - if [ -d $1 ] ; then ( - cd $P - rm -f /tmp/iNsT-a.$$ ; touch /tmp/iNsT-a.$$ - for i in `find ${1#$P/} -type l` ; do - target=`readlink $i` - echo "$i -> $target" - echo $i$'\n'$target >> /tmp/iNsT-a.$$ - done - COUNT=1 - LINE=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - while [ -n "$LINE" ] ; do - LINKGOESIN=`dirname $LINE` - LINKNAMEIS=`basename $LINE` - COUNT=$(($COUNT + 1)) - LINKPOINTSTO=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - if [ ! -d install ] ; then mkdir install ; fi - cat <<- EOF >> install/doinst.sh - ( cd $LINKGOESIN ; rm -rf $LINKNAMEIS ) - ( cd $LINKGOESIN ; ln -sf $LINKPOINTSTO $LINKNAMEIS ) - EOF - rm -rf $LINE ; touch -t `date '+%m%d0900'` install/doinst.sh $LINE - COUNT=$(($COUNT + 1)) - LINE=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - done - rm -f /tmp/iNsT-a.$$ - ) fi -} - -convert() { - for i in {$P,$P/usr}/{sbin,bin} ; do prune_symlink $i ; done - for i in {$P,$P/usr}/$libdir ; do prune_symlink $i ; done - prune_symlink $infodir - for i in `seq 9` n ; do prune_symlink $mandir/man$i ; done -} - -fscheck -W=`pwd` -for i in `seq 0 $((${#src[@]} - 1))` ; do - S[$i]=$W/${src[$i]} ; B[$i]=$W/build`test ${#src[@]} -eq 1 || echo $i` -done -P=$W/work ; C=$W/pivot -infodir=$P/usr/share/info -mandir=$P/usr/share/man -docdir=$P/usr/share/doc -myname=`basename $0` -pkg=$pkgbase-$vers-$arch-$build -case $arch in x86_64) libdir=lib64 ;; *) libdir=lib ;; esac -if [ $# -eq 0 ] ; then - opt_download=1 ; opt_config=1 ; opt_build=1 ; opt_package=1 +if [ -f functions ] ; then + source ./functions +elif [ ! -f /usr/share/plamo/functions ] ; then + wget ftp://plamo.linet.gr.jp/pub/Plamo-src/admin/functions + source ./functions else - opt_download=0 ; opt_config=0 ; opt_build=0 ; opt_package=0 - for i in $@ ; do - case $i in - download) opt_download=1 ;; - config) opt_config=1 ;; - build) opt_build=1 ;; - package) opt_package=1 ;; - esac - done + source /usr/share/plamo/functions fi + +fscheck +prepare "$@" if [ $opt_download -eq 1 ] ; then - for i in $url ; do - 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|tgz) tar xvpzf ${i##*/} ;; - bz2|tbz) tar xvpjf ${i##*/} ;; - xz|txz) tar xvpJf ${i##*/} ;; - esac - done + download_sources fi if [ $opt_config -eq 1 ] ; then 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 - 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 + apply_patches cd $B patch -Np0 -i $W/readline63-001 patch -Np0 -i $W/readline63-002 @@ -252,12 +55,6 @@ patch -Np0 -i $W/readline63-008 for i in `seq 0 $((${#B[@]} - 1))` ; do cd ${B[$i]} - if [ -f Makefile ] ; then - make clean - fi - if [ -f config.log ] ; then - rm -rf config.cache config.log - fi if [ -x configure ] ; then ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --libdir=/$libdir --infodir='${prefix}'/share/info \ @@ -274,12 +71,7 @@ done fi if [ $opt_package -eq 1 ] ; then - if [ `id -u` -ne 0 ] ; then - read -p "Do you want to package as root? [y/N] " ans - if [ "x$ans" == "xY" -o "x$ans" == "xy" ] ; then - cd $W ; /bin/su -c "$0 package" ; exit - fi - fi + root_priv if [ -d $P ] ; then rm -rf $P ; fi ; mkdir -p $P if [ -d $C ] ; then rm -rf $C ; fi ; mkdir -p $C touch $W/i.st ; sleep 1 @@ -299,24 +91,8 @@ find $P ! -type l -newer i.st ! -newer i.et \ -exec touch -t `date '+%m%d0900'` {} \; compress - for i in `seq 0 $((${#DOCS[@]} - 1))` ; do - for j in ${DOCS[$i]} ; do - for k in ${S[$i]}/$j ; do - install2 $k $docdir/${src[$i]}/${k#${S[$i]}/} - touch -r $k $docdir/${src[$i]}/${k#${S[$i]}/} - gzip_one $docdir/${src[$i]}/${k#${S[$i]}/} - done - done - if [ $i -eq 0 ] ; then - install $myname $docdir/$src - touch -t `date '+%m%d0900'` $docdir/$src/$myname - gzip_one $docdir/$src/$myname - else - ln $docdir/$src/$myname.gz $docdir/${src[$i]} - fi - ( cd $docdir ; find ${src[$i]} -type d -exec touch -r $W/{} {} \; ) - done - convert + setup_docdir + convert_links rm $P/$libdir/lib{history,readline}.so tar cvpf $pkg.tar -C $P `cd $P ; find $libdir | tail -n+2` tar rvpf $pkg.tar -C $P `cd $P ; find usr/$libdir | tail -n+2` @@ -328,6 +104,5 @@ tar rvpf $pkg.tar -C $P install/doinst.sh touch -t `date '+%m%d0900'` $pkg.tar ; xz $pkg.tar ; touch $pkg.tar.xz mv $pkg.tar.xz $pkg.txz - read -p "Do you want to keep work files? [y/N] " ans - if [ "x$ans" != "xY" -a "x$ans" != "xy" ] ; then rm -rf $P $C i.[se]t ; fi + cleanup fi --- plamo/00_base/old/reiserfsprogs-20160116/PlamoBuild.reiserfsprogs-3.6.21 2016-01-16 07:37:16.000000000 +0900 +++ plamo/00_base/reiserfsprogs/PlamoBuild.reiserfsprogs-3.6.21 2017-04-29 12:31:13.000000000 +0900 @@ -2,214 +2,45 @@ ###################################################################### url="https://www.kernel.org/pub/linux/kernel/people/jeffm/reiserfsprogs/v3.6.21/reiserfsprogs-3.6.21.tar.bz2" +verify= +digest= +commitid= pkgbase=reiserfsprogs vers=3.6.21 arch=`uname -m` -build=P2 +build=P3 src=$pkgbase-$vers +patchfiles="" OPT_CONFIG="" DOCS="NEWS README AUTHORS INSTALL ChangeLog COPYING CREDITS" +template=20170415 +tmplurl=ftp://plamo.linet.gr.jp/pub/Plamo-src/admin ###################################################################### -fscheck() { - PANGRAM="The quick brown fox jumps over the lazy dog." - echo -n "Checking for the filesystem ... " - mkdir pangram ; ( cd pangram ; touch $PANGRAM ) - mv pangram pangram~ ; mkdir pangram ; touch -r pangram~ pangram - tar cpf pangram.tar pangram ; rmdir pangram ; mv pangram~ pangram - for i in $PANGRAM ; do tar rpf pangram.tar pangram/$i ; done - touch -t `date '+%m%d0900'` pangram.tar ; gzip pangram.tar - touch pangram.tar.gz ; mv pangram.tar.gz pangram1.tgz - tar cpf pangram.tar pangram - touch -t `date '+%m%d0900'` pangram.tar ; gzip pangram.tar - touch pangram.tar.gz ; mv pangram.tar.gz pangram2.tgz - if cmp -s pangram1.tgz pangram2.tgz ; then - echo "OK" - rm -rf pangram pangram1.tgz pangram2.tgz - else - echo "NG" - cat <<- "EOF" - Hmm, packaging may not be done properly on this filesystem. - Would you please try again on a default filesystem, thanks! - - Happy packaging!! - - Quitting... - EOF - exit - fi -} - -install2() { - install -d ${2%/*} ; install -m 644 $1 $2 -} - -strip_bindir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - shopt -s nullglob - cd $1 - for i in * ; do - echo "$i" - if [ -h $i ] ; then continue ; fi - if [ -n "`file $i | grep "not stripped"`" ] ; then - echo "stripping -p $i" - strip -p $i - fi - done - ) fi -} - -strip_libdir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - shopt -s nullglob - cd $1 - for i in *.so *.so.* *.a ; do - echo "$i" - if [ -h $i ] ; then continue ; fi - if [ -n "`nm -a $i | grep " a "`" ] ; then - if [ $i != ${i%.a} ] ; then - echo -n "ranlib and " - touch -r $i $i.mt ; ranlib $i ; touch -r $i.mt $i ; rm $i.mt - fi - echo "stripping -gp $i" - strip -gp $i - fi - done - ) fi -} - -gzip_dir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - cd $1 - files=`ls -f --indicator-style=none | sed '/^\.\{1,2\}$/d'` - for i in $files ; do - echo "$i" - if [ ! -f $i -a ! -h $i -o $i != ${i%.gz} ] ; then continue ; fi - lnks=`ls -l $i | awk '{print $2}'` - if [ $lnks -gt 1 ] ; then - inum=`ls -i $i | awk '{print $1}'` - for j in `find . -maxdepth 1 -inum $inum` ; do - if [ ${j#./} == $i ] ; then - gzip -f $i - else - rm -f ${j#./} ; ln $i.gz ${j#./}.gz - fi - done - elif [ -h $i ] ; then - target=`readlink $i` ; rm -f $i ; ln -s $target.gz $i.gz - else - gzip $i - fi - done - for i in $files ; do mv ${i%.gz}.gz $C ; done - for i in $files ; do mv $C/${i%.gz}.gz . ; done - ) fi -} - -gzip_one() { - gzip $1 ; mv $1.gz $C ; mv $C/${1##*/}.gz ${1%/*} -} - -compress() { - for i in {$P,$P/usr}/{sbin,bin} ; do strip_bindir $i ; done - for i in {$P,$P/usr}/$libdir ; do strip_libdir $i ; done - if [ -f $infodir/dir ] ; then rm -f $infodir/dir ; fi - gzip_dir $infodir - for i in `seq 9` n ; do gzip_dir $mandir/man$i ; done -} - -prune_symlink() { - echo "pruning symlink in $1" - if [ -d $1 ] ; then ( - cd $P - rm -f /tmp/iNsT-a.$$ ; touch /tmp/iNsT-a.$$ - for i in `find ${1#$P/} -type l` ; do - target=`readlink $i` - echo "$i -> $target" - echo $i$'\n'$target >> /tmp/iNsT-a.$$ - done - COUNT=1 - LINE=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - while [ -n "$LINE" ] ; do - LINKGOESIN=`dirname $LINE` - LINKNAMEIS=`basename $LINE` - COUNT=$(($COUNT + 1)) - LINKPOINTSTO=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - if [ ! -d install ] ; then mkdir install ; fi - cat <<- EOF >> install/doinst.sh - ( cd $LINKGOESIN ; rm -rf $LINKNAMEIS ) - ( cd $LINKGOESIN ; ln -sf $LINKPOINTSTO $LINKNAMEIS ) - EOF - rm -rf $LINE ; touch -t `date '+%m%d0900'` install/doinst.sh $LINE - COUNT=$(($COUNT + 1)) - LINE=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - done - rm -f /tmp/iNsT-a.$$ - ) fi -} - -convert() { - for i in {$P,$P/usr}/{sbin,bin} ; do prune_symlink $i ; done - for i in {$P,$P/usr}/$libdir ; do prune_symlink $i ; done - prune_symlink $infodir - for i in `seq 9` n ; do prune_symlink $mandir/man$i ; done -} - -fscheck -W=`pwd` -for i in `seq 0 $((${#src[@]} - 1))` ; do - S[$i]=$W/${src[$i]} ; B[$i]=$W/build`test ${#src[@]} -eq 1 || echo $i` -done -P=$W/work ; C=$W/pivot -infodir=$P/usr/share/info -mandir=$P/usr/share/man -docdir=$P/usr/share/doc -myname=`basename $0` -pkg=$pkgbase-$vers-$arch-$build -case $arch in x86_64) libdir=lib64 ;; *) libdir=lib ;; esac -if [ $# -eq 0 ] ; then - opt_download=1 ; opt_config=1 ; opt_build=1 ; opt_package=1 +if [ -f functions ] ; then + source ./functions +elif [ ! -f /usr/share/plamo/functions ] ; then + wget ftp://plamo.linet.gr.jp/pub/Plamo-src/admin/functions + source ./functions else - opt_download=0 ; opt_config=0 ; opt_build=0 ; opt_package=0 - for i in $@ ; do - case $i in - download) opt_download=1 ;; - config) opt_config=1 ;; - build) opt_build=1 ;; - package) opt_package=1 ;; - esac - done + source /usr/share/plamo/functions fi + +fscheck +prepare "$@" if [ $opt_download -eq 1 ] ; then - for i in $url ; do - if [ ! -f ${i##*/} ] ; then wget $i ; fi - done - for i in $url ; do - case ${i##*.} in - tar) tar xvpf ${i##*/} ;; - gz) tar xvpzf ${i##*/} ;; - bz2) tar xvpjf ${i##*/} ;; - esac - done + download_sources fi if [ $opt_config -eq 1 ] ; then 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 + apply_patches for i in `seq 0 $((${#B[@]} - 1))` ; do cd ${B[$i]} - if [ -f Makefile ] ; then - make clean - fi - if [ -f config.log ] ; then - 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 @@ -223,12 +54,7 @@ done fi if [ $opt_package -eq 1 ] ; then - if [ `id -u` -ne 0 ] ; then - read -p "Do you want to package as root? [y/N] " ans - if [ "x$ans" == "xY" -o "x$ans" == "xy" ] ; then - cd $W ; /bin/su -c "$0 package" ; exit - fi - fi + root_priv if [ -d $P ] ; then rm -rf $P ; fi ; mkdir -p $P if [ -d $C ] ; then rm -rf $C ; fi ; mkdir -p $C touch $W/i.st ; sleep 1 @@ -243,29 +69,12 @@ find $P ! -type l -newer i.st ! -newer i.et \ -exec touch -t `date '+%m%d0900'` {} \; compress - for i in `seq 0 $((${#DOCS[@]} - 1))` ; do - for j in ${DOCS[$i]} ; do - for k in ${S[$i]}/$j ; do - install2 $k $docdir/${src[$i]}/${k#${S[$i]}/} - touch -r $k $docdir/${src[$i]}/${k#${S[$i]}/} - gzip_one $docdir/${src[$i]}/${k#${S[$i]}/} - done - done - if [ $i -eq 0 ] ; then - install $myname $docdir/$src - touch -t `date '+%m%d0900'` $docdir/$src/$myname - gzip_one $docdir/$src/$myname - else - ln $docdir/$src/$myname.gz $docdir/${src[$i]} - fi - ( cd $docdir ; find ${src[$i]} -type d -exec touch -r $W/{} {} \; ) - done - convert + setup_docdir + convert_links tar cvpf $pkg.tar -C $P `cd $P ; find usr/sbin | 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 touch -t `date '+%m%d0900'` $pkg.tar ; xz $pkg.tar ; touch $pkg.tar.xz mv $pkg.tar.xz $pkg.txz - read -p "Do you want to keep work files? [y/N] " ans - if [ "x$ans" != "xY" -a "x$ans" != "xy" ] ; then rm -rf $P $C i.[se]t ; fi + cleanup fi --- plamo/00_base/old/rsyslog-20160116/PlamoBuild.rsyslog-4.6.8 2016-01-16 07:36:47.000000000 +0900 +++ plamo/00_base/rsyslog/PlamoBuild.rsyslog-4.6.8 2017-04-29 12:41:10.000000000 +0900 @@ -2,214 +2,45 @@ ###################################################################### url="http://download.rsyslog.com/rsyslog/rsyslog-4.6.8.tar.gz" +verify= +digest= +commitid= pkgbase=rsyslog vers=4.6.8 arch=`uname -m` -build=P4 +build=P5 src=$pkgbase-$vers +patchfiles="" OPT_CONFIG="--sbindir=/sbin" DOCS="COPYING README AUTHORS INSTALL COPYING.LESSER NEWS ChangeLog" +template=20170415 +tmplurl=ftp://plamo.linet.gr.jp/pub/Plamo-src/admin ###################################################################### -fscheck() { - PANGRAM="The quick brown fox jumps over the lazy dog." - echo -n "Checking for the filesystem ... " - mkdir pangram ; ( cd pangram ; touch $PANGRAM ) - mv pangram pangram~ ; mkdir pangram ; touch -r pangram~ pangram - tar cpf pangram.tar pangram ; rmdir pangram ; mv pangram~ pangram - for i in $PANGRAM ; do tar rpf pangram.tar pangram/$i ; done - touch -t `date '+%m%d0900'` pangram.tar ; gzip pangram.tar - touch pangram.tar.gz ; mv pangram.tar.gz pangram1.tgz - tar cpf pangram.tar pangram - touch -t `date '+%m%d0900'` pangram.tar ; gzip pangram.tar - touch pangram.tar.gz ; mv pangram.tar.gz pangram2.tgz - if cmp -s pangram1.tgz pangram2.tgz ; then - echo "OK" - rm -rf pangram pangram1.tgz pangram2.tgz - else - echo "NG" - cat <<- "EOF" - Hmm, packaging may not be done properly on this filesystem. - Would you please try again on a default filesystem, thanks! - - Happy packaging!! - - Quitting... - EOF - exit - fi -} - -install2() { - install -d ${2%/*} ; install -m 644 $1 $2 -} - -strip_bindir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - shopt -s nullglob - cd $1 - for i in * ; do - echo "$i" - if [ -h $i ] ; then continue ; fi - if [ -n "`file $i | grep "not stripped"`" ] ; then - echo "stripping -p $i" - strip -p $i - fi - done - ) fi -} - -strip_libdir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - shopt -s nullglob - cd $1 - for i in *.so *.so.* *.a ; do - echo "$i" - if [ -h $i ] ; then continue ; fi - if [ -n "`nm -a $i | grep " a "`" ] ; then - if [ $i != ${i%.a} ] ; then - echo -n "ranlib and " - touch -r $i $i.mt ; ranlib $i ; touch -r $i.mt $i ; rm $i.mt - fi - echo "stripping -gp $i" - strip -gp $i - fi - done - ) fi -} - -gzip_dir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - cd $1 - files=`ls -f --indicator-style=none | sed '/^\.\{1,2\}$/d'` - for i in $files ; do - echo "$i" - if [ ! -f $i -a ! -h $i -o $i != ${i%.gz} ] ; then continue ; fi - lnks=`ls -l $i | awk '{print $2}'` - if [ $lnks -gt 1 ] ; then - inum=`ls -i $i | awk '{print $1}'` - for j in `find . -maxdepth 1 -inum $inum` ; do - if [ ${j#./} == $i ] ; then - gzip -f $i - else - rm -f ${j#./} ; ln $i.gz ${j#./}.gz - fi - done - elif [ -h $i ] ; then - target=`readlink $i` ; rm -f $i ; ln -s $target.gz $i.gz - else - gzip $i - fi - done - for i in $files ; do mv ${i%.gz}.gz $C ; done - for i in $files ; do mv $C/${i%.gz}.gz . ; done - ) fi -} - -gzip_one() { - gzip $1 ; mv $1.gz $C ; mv $C/${1##*/}.gz ${1%/*} -} - -compress() { - for i in {$P,$P/usr}/{sbin,bin} ; do strip_bindir $i ; done - for i in {$P,$P/usr}/$libdir ; do strip_libdir $i ; done - if [ -f $infodir/dir ] ; then rm -f $infodir/dir ; fi - gzip_dir $infodir - for i in `seq 9` n ; do gzip_dir $mandir/man$i ; done -} - -prune_symlink() { - echo "pruning symlink in $1" - if [ -d $1 ] ; then ( - cd $P - rm -f /tmp/iNsT-a.$$ ; touch /tmp/iNsT-a.$$ - for i in `find ${1#$P/} -type l` ; do - target=`readlink $i` - echo "$i -> $target" - echo $i$'\n'$target >> /tmp/iNsT-a.$$ - done - COUNT=1 - LINE=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - while [ -n "$LINE" ] ; do - LINKGOESIN=`dirname $LINE` - LINKNAMEIS=`basename $LINE` - COUNT=$(($COUNT + 1)) - LINKPOINTSTO=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - if [ ! -d install ] ; then mkdir install ; fi - cat <<- EOF >> install/doinst.sh - ( cd $LINKGOESIN ; rm -rf $LINKNAMEIS ) - ( cd $LINKGOESIN ; ln -sf $LINKPOINTSTO $LINKNAMEIS ) - EOF - rm -rf $LINE ; touch -t `date '+%m%d0900'` install/doinst.sh $LINE - COUNT=$(($COUNT + 1)) - LINE=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - done - rm -f /tmp/iNsT-a.$$ - ) fi -} - -convert() { - for i in {$P,$P/usr}/{sbin,bin} ; do prune_symlink $i ; done - for i in {$P,$P/usr}/$libdir ; do prune_symlink $i ; done - prune_symlink $infodir - for i in `seq 9` n ; do prune_symlink $mandir/man$i ; done -} - -fscheck -W=`pwd` -for i in `seq 0 $((${#src[@]} - 1))` ; do - S[$i]=$W/${src[$i]} ; B[$i]=$W/build`test ${#src[@]} -eq 1 || echo $i` -done -P=$W/work ; C=$W/pivot -infodir=$P/usr/share/info -mandir=$P/usr/share/man -docdir=$P/usr/share/doc -myname=`basename $0` -pkg=$pkgbase-$vers-$arch-$build -case $arch in x86_64) libdir=lib64 ;; *) libdir=lib ;; esac -if [ $# -eq 0 ] ; then - opt_download=1 ; opt_config=1 ; opt_build=1 ; opt_package=1 +if [ -f functions ] ; then + source ./functions +elif [ ! -f /usr/share/plamo/functions ] ; then + wget ftp://plamo.linet.gr.jp/pub/Plamo-src/admin/functions + source ./functions else - opt_download=0 ; opt_config=0 ; opt_build=0 ; opt_package=0 - for i in $@ ; do - case $i in - download) opt_download=1 ;; - config) opt_config=1 ;; - build) opt_build=1 ;; - package) opt_package=1 ;; - esac - done + source /usr/share/plamo/functions fi + +fscheck +prepare "$@" if [ $opt_download -eq 1 ] ; then - for i in $url ; do - if [ ! -f ${i##*/} ] ; then wget $i ; fi - done - for i in $url ; do - case ${i##*.} in - tar) tar xvpf ${i##*/} ;; - gz) tar xvpzf ${i##*/} ;; - bz2) tar xvpjf ${i##*/} ;; - esac - done + download_sources fi if [ $opt_config -eq 1 ] ; then 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 + apply_patches for i in `seq 0 $((${#B[@]} - 1))` ; do cd ${B[$i]} - if [ -f Makefile ] ; then - make clean - fi - if [ -f config.log ] ; then - 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 @@ -223,12 +54,7 @@ done fi if [ $opt_package -eq 1 ] ; then - if [ `id -u` -ne 0 ] ; then - read -p "Do you want to package as root? [y/N] " ans - if [ "x$ans" == "xY" -o "x$ans" == "xy" ] ; then - cd $W ; /bin/su -c "$0 package" ; exit - fi - fi + root_priv if [ -d $P ] ; then rm -rf $P ; fi ; mkdir -p $P if [ -d $C ] ; then rm -rf $C ; fi ; mkdir -p $C touch $W/i.st ; sleep 1 @@ -330,24 +156,8 @@ compress strip_libdir $P/usr/$libdir/rsyslog touch -t `date '+%m%d0900'` $P/usr/$libdir/rsyslog - for i in `seq 0 $((${#DOCS[@]} - 1))` ; do - for j in ${DOCS[$i]} ; do - for k in ${S[$i]}/$j ; do - install2 $k $docdir/${src[$i]}/${k#${S[$i]}/} - touch -r $k $docdir/${src[$i]}/${k#${S[$i]}/} - gzip_one $docdir/${src[$i]}/${k#${S[$i]}/} - done - done - if [ $i -eq 0 ] ; then - install $myname $docdir/$src - touch -t `date '+%m%d0900'` $docdir/$src/$myname - gzip_one $docdir/$src/$myname - else - ln $docdir/$src/$myname.gz $docdir/${src[$i]} - fi - ( cd $docdir ; find ${src[$i]} -type d -exec touch -r $W/{} {} \; ) - done - convert + setup_docdir + convert_links tar cvpf $pkg.tar -C $P `cd $P ; find sbin | tail -n+2` tar rvpf $pkg.tar -C $P usr/$libdir/rsyslog tar rvpf $pkg.tar -C $P etc/rsyslog.{d,conf} @@ -357,6 +167,5 @@ tar rvpf $pkg.tar -C $P usr/share/doc/$src touch -t `date '+%m%d0900'` $pkg.tar ; xz $pkg.tar ; touch $pkg.tar.xz mv $pkg.tar.xz $pkg.txz - read -p "Do you want to keep work files? [y/N] " ans - if [ "x$ans" != "xY" -a "x$ans" != "xy" ] ; then rm -rf $P $C i.[se]t ; fi + cleanup fi --- plamo/00_base/old/sed-20160317/PlamoBuild.sed-4.2.2 2016-03-17 15:20:12.000000000 +0900 +++ plamo/00_base/sed/PlamoBuild.sed-4.2.2 2017-04-29 12:49:16.000000000 +0900 @@ -2,215 +2,46 @@ ###################################################################### url="http://ftp.gnu.org/gnu/sed/sed-4.2.2.tar.gz" +verify= +digest= +commitid= pkgbase=sed vers=4.2.2 arch=`uname -m` -build=P2 +build=P3 src=$pkgbase-$vers +patchfiles="" OPT_CONFIG="--bindir=/bin" DOCS="COPYING.DOC INSTALL README README-alpha THANKS AUTHORS COPYING ChangeLog ABOUT-NLS BUGS NEWS" +template=20170415 +tmplurl=ftp://plamo.linet.gr.jp/pub/Plamo-src/admin ###################################################################### -fscheck() { - PANGRAM="The quick brown fox jumps over the lazy dog." - echo -n "Checking for the filesystem ... " - mkdir pangram ; ( cd pangram ; touch $PANGRAM ) - mv pangram pangram~ ; mkdir pangram ; touch -r pangram~ pangram - tar cpf pangram.tar pangram ; rmdir pangram ; mv pangram~ pangram - for i in $PANGRAM ; do tar rpf pangram.tar pangram/$i ; done - touch -t `date '+%m%d0900'` pangram.tar ; gzip pangram.tar - touch pangram.tar.gz ; mv pangram.tar.gz pangram1.tgz - tar cpf pangram.tar pangram - touch -t `date '+%m%d0900'` pangram.tar ; gzip pangram.tar - touch pangram.tar.gz ; mv pangram.tar.gz pangram2.tgz - if cmp -s pangram1.tgz pangram2.tgz ; then - echo "OK" - rm -rf pangram pangram1.tgz pangram2.tgz - else - echo "NG" - cat <<- "EOF" - Hmm, packaging may not be done properly on this filesystem. - Would you please try again on a default filesystem, thanks! - - Happy packaging!! - - Quitting... - EOF - exit - fi -} - -install2() { - install -d ${2%/*} ; install -m 644 $1 $2 -} - -strip_bindir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - shopt -s nullglob - cd $1 - for i in * ; do - echo "$i" - if [ -h $i ] ; then continue ; fi - if [ -n "`file $i | grep "not stripped"`" ] ; then - echo "stripping -p $i" - strip -p $i - fi - done - ) fi -} - -strip_libdir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - shopt -s nullglob - cd $1 - for i in *.so *.so.* *.a ; do - echo "$i" - if [ -h $i ] ; then continue ; fi - if [ -n "`nm -a $i | grep " a "`" ] ; then - if [ $i != ${i%.a} ] ; then - echo -n "ranlib and " - touch -r $i $i.mt ; ranlib $i ; touch -r $i.mt $i ; rm $i.mt - fi - echo "stripping -gp $i" - strip -gp $i - fi - done - ) fi -} - -gzip_dir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - cd $1 - files=`ls -f --indicator-style=none | sed '/^\.\{1,2\}$/d'` - for i in $files ; do - echo "$i" - if [ ! -f $i -a ! -h $i -o $i != ${i%.gz} ] ; then continue ; fi - lnks=`ls -l $i | awk '{print $2}'` - if [ $lnks -gt 1 ] ; then - inum=`ls -i $i | awk '{print $1}'` - for j in `find . -maxdepth 1 -inum $inum` ; do - if [ ${j#./} == $i ] ; then - gzip -f $i - else - rm -f ${j#./} ; ln $i.gz ${j#./}.gz - fi - done - elif [ -h $i ] ; then - target=`readlink $i` ; rm -f $i ; ln -s $target.gz $i.gz - else - gzip $i - fi - done - for i in $files ; do mv ${i%.gz}.gz $C ; done - for i in $files ; do mv $C/${i%.gz}.gz . ; done - ) fi -} - -gzip_one() { - gzip $1 ; mv $1.gz $C ; mv $C/${1##*/}.gz ${1%/*} -} - -compress() { - for i in {$P,$P/usr}/{sbin,bin} ; do strip_bindir $i ; done - for i in {$P,$P/usr}/$libdir ; do strip_libdir $i ; done - if [ -f $infodir/dir ] ; then rm -f $infodir/dir ; fi - gzip_dir $infodir - for i in `seq 9` n ; do gzip_dir $mandir/man$i ; done -} - -prune_symlink() { - echo "pruning symlink in $1" - if [ -d $1 ] ; then ( - cd $P - rm -f /tmp/iNsT-a.$$ ; touch /tmp/iNsT-a.$$ - for i in `find ${1#$P/} -type l` ; do - target=`readlink $i` - echo "$i -> $target" - echo $i$'\n'$target >> /tmp/iNsT-a.$$ - done - COUNT=1 - LINE=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - while [ -n "$LINE" ] ; do - LINKGOESIN=`dirname $LINE` - LINKNAMEIS=`basename $LINE` - COUNT=$(($COUNT + 1)) - LINKPOINTSTO=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - if [ ! -d install ] ; then mkdir install ; fi - cat <<- EOF >> install/doinst.sh - ( cd $LINKGOESIN ; rm -rf $LINKNAMEIS ) - ( cd $LINKGOESIN ; ln -sf $LINKPOINTSTO $LINKNAMEIS ) - EOF - rm -rf $LINE ; touch -t `date '+%m%d0900'` install/doinst.sh $LINE - COUNT=$(($COUNT + 1)) - LINE=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - done - rm -f /tmp/iNsT-a.$$ - ) fi -} - -convert() { - for i in {$P,$P/usr}/{sbin,bin} ; do prune_symlink $i ; done - for i in {$P,$P/usr}/$libdir ; do prune_symlink $i ; done - prune_symlink $infodir - for i in `seq 9` n ; do prune_symlink $mandir/man$i ; done -} - -fscheck -W=`pwd` -for i in `seq 0 $((${#src[@]} - 1))` ; do - S[$i]=$W/${src[$i]} ; B[$i]=$W/build`test ${#src[@]} -eq 1 || echo $i` -done -P=$W/work ; C=$W/pivot -infodir=$P/usr/share/info -mandir=$P/usr/share/man -docdir=$P/usr/share/doc -myname=`basename $0` -pkg=$pkgbase-$vers-$arch-$build -case $arch in x86_64) libdir=lib64 ;; *) libdir=lib ;; esac -if [ $# -eq 0 ] ; then - opt_download=1 ; opt_config=1 ; opt_build=1 ; opt_package=1 +if [ -f functions ] ; then + source ./functions +elif [ ! -f /usr/share/plamo/functions ] ; then + wget ftp://plamo.linet.gr.jp/pub/Plamo-src/admin/functions + source ./functions else - opt_download=0 ; opt_config=0 ; opt_build=0 ; opt_package=0 - for i in $@ ; do - case $i in - download) opt_download=1 ;; - config) opt_config=1 ;; - build) opt_build=1 ;; - package) opt_package=1 ;; - esac - done + source /usr/share/plamo/functions fi + +fscheck +prepare "$@" if [ $opt_download -eq 1 ] ; then - for i in $url ; do - if [ ! -f ${i##*/} ] ; then wget $i ; fi - done - for i in $url ; do - case ${i##*.} in - tar) tar xvpf ${i##*/} ;; - gz) tar xvpzf ${i##*/} ;; - bz2) tar xvpjf ${i##*/} ;; - esac - done + download_sources fi if [ $opt_config -eq 1 ] ; then 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 + apply_patches for i in `seq 0 $((${#B[@]} - 1))` ; do cd ${B[$i]} - if [ -f Makefile ] ; then - make clean - fi - if [ -f config.log ] ; then - 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 @@ -225,12 +56,7 @@ done fi if [ $opt_package -eq 1 ] ; then - if [ `id -u` -ne 0 ] ; then - read -p "Do you want to package as root? [y/N] " ans - if [ "x$ans" == "xY" -o "x$ans" == "xy" ] ; then - cd $W ; /bin/su -c "$0 package" ; exit - fi - fi + root_priv if [ -d $P ] ; then rm -rf $P ; fi ; mkdir -p $P if [ -d $C ] ; then rm -rf $C ; fi ; mkdir -p $C touch $W/i.st ; sleep 1 @@ -248,39 +74,22 @@ find $P ! -type l -newer i.st ! -newer i.et \ -exec touch -t `date '+%m%d0900'` {} \; compress - for i in `seq 0 $((${#DOCS[@]} - 1))` ; do - for j in ${DOCS[$i]} ; do - for k in ${S[$i]}/$j ; do - install2 $k $docdir/${src[$i]}/${k#${S[$i]}/} - touch -r $k $docdir/${src[$i]}/${k#${S[$i]}/} - gzip_one $docdir/${src[$i]}/${k#${S[$i]}/} - done - done - if [ $i -eq 0 ] ; then - install $myname $docdir/$src - touch -t `date '+%m%d0900'` $docdir/$src/$myname - gzip_one $docdir/$src/$myname - else - ln $docdir/$src/$myname.gz $docdir/${src[$i]} - fi - ( cd $docdir ; find ${src[$i]} -type d -exec touch -r $W/{} {} \; ) - done + setup_docdir mv $docdir/sed $docdir/$src/doc mv $docdir/$src/{doc,{THANKS,AUTHORS,COPYING,ChangeLog,ABOUT-NLS}.gz} $C - mv $docdir/$src/{BUGS,NEWS,$myname}.gz $C + mv $docdir/$src/{BUGS,NEWS,$func,$myname,$spec}.gz $C mv $C/{doc,{THANKS,AUTHORS,COPYING,ChangeLog,ABOUT-NLS}.gz} $docdir/$src - mv $C/{BUGS,NEWS,$myname}.gz $docdir/$src + mv $C/{BUGS,NEWS,$func,$myname,$spec}.gz $docdir/$src touch -r $S $docdir/$src - convert + convert_links tar cvpf $pkg.tar -C $P `cd $P ; find bin | 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/share/locale -name "*.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/info | tail -n+2` tar rvpf $pkg.tar -C $P `cd $P ; find usr/share/man/man1 | 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 mv $pkg.tar.xz $pkg.txz - read -p "Do you want to keep work files? [y/N] " ans - if [ "x$ans" != "xY" -a "x$ans" != "xy" ] ; then rm -rf $P $C i.[se]t ; fi + cleanup fi --- plamo/00_base/old/shadow-20170624/PlamoBuild.shadow-git_20130908 2017-06-24 14:34:20.000000000 +0900 +++ plamo/00_base/shadow/PlamoBuild.shadow-git_20130908 2018-01-26 08:59:08.000000000 +0900 @@ -3,19 +3,20 @@ ###################################################################### url="https://github.com/shadow-maint/shadow.git ftp://plamo.linet.gr.jp/pub/Plamo-src/plamo/00_base/shadow/CVE-2017-2616.patch.gz - ftp://plamo.linet.gr.jp/pub/Plamo-src/plamo/00_base/shadow/shadow-adduser-20160122" + ftp://plamo.linet.gr.jp/pub/Plamo-src/plamo/00_base/shadow/shadow-adduser-20180125" verify= digest= +branch= commitid[0]=578947e pkgbase=shadow vers=git_20130908 arch=`uname -m` -build=P7 +build=P8 src=$pkgbase patchfiles="CVE-2017-2616.patch.gz" OPT_CONFIG="--enable-man --without-selinux --with-libcrack" DOCS="COPYING ChangeLog NEWS README TODO" -template=20170415 +template=20170713 tmplurl=ftp://plamo.linet.gr.jp/pub/Plamo-src/admin ###################################################################### @@ -187,7 +188,7 @@ make install DESTDIR=$P fi done - install $W/shadow-adduser-20160122 $P/usr/sbin/adduser + install $W/shadow-adduser-20180125 $P/usr/sbin/adduser install -d $mandir/ja_JP.eucJP/man{1,5,8} for i in `cd $mandir/ja ; find . -type f` ; do nkf -We $mandir/ja/$i > $mandir/ja_JP.eucJP/$i --- plamo/00_base/old/sudo-20170502/PlamoBuild.sudo-1.8.15 2017-05-02 09:58:11.000000000 +0900 +++ plamo/00_base/sudo/PlamoBuild.sudo-1.8.15 2018-01-31 18:31:40.000000000 +0900 @@ -4,18 +4,20 @@ url="http://www.sudo.ws/sudo/dist/sudo-1.8.15.tar.gz" verify= digest= +branch= commitid= pkgbase=sudo vers=1.8.15 arch=`uname -m` -build=P4 +build=P5 src=$pkgbase-$vers patchfiles="" -OPT_CONFIG="--with-pam --without-sendmail --with-env-editor - --with-all-insults --with-hal-insults --with-secure-path" +OPT_CONFIG="--with-pam --with-vardir=/var/db/sudo --without-sendmail + --with-env-editor --with-all-insults --with-hal-insults + --with-secure-path" DOCS="ABOUT-NLS ChangeLog INSTALL* MANIFEST NEWS README* `echo doc/{CONTRIBUTORS,HISTORY,LICENSE,TROUBLESHOOTING,UPGRADE}`" -template=20170415 +template=20170713 tmplurl=ftp://plamo.linet.gr.jp/pub/Plamo-src/admin ###################################################################### --- plamo/00_base/old/sysfsutils-20160827/PlamoBuild.sysfsutils-2.1.0 2016-08-27 20:08:51.000000000 +0900 +++ plamo/00_base/sysfsutils/PlamoBuild.sysfsutils-2.1.0 2017-05-02 10:11:12.000000000 +0900 @@ -2,247 +2,44 @@ ###################################################################### url="http://downloads.sourceforge.net/linux-diag/sysfsutils-2.1.0.tar.gz - ftp://plamo.linet.gr.jp/pub/Plamo-src.new/plamo/00_base/sysfsutils/sysfs_get_link.patch" + ftp://plamo.linet.gr.jp/pub/Plamo-src/plamo/00_base/sysfsutils/sysfs_get_link.patch" +verify= +digest= +commitid= pkgbase=sysfsutils vers=2.1.0 arch=`uname -m` -build=P4 +build=P5 src=$pkgbase-$vers patchfiles="sysfs_get_link.patch" OPT_CONFIG="" DOCS="TODO NEWS INSTALL README COPYING CREDITS AUTHORS docs/libsysfs.txt ChangeLog" +template=20170415 +tmplurl=ftp://plamo.linet.gr.jp/pub/Plamo-src/admin ###################################################################### -fscheck() { - PANGRAM="The quick brown fox jumps over the lazy dog." - echo -n "Checking for the filesystem ... " - mkdir pangram ; ( cd pangram ; touch $PANGRAM ) - mv pangram pangram~ ; mkdir pangram ; touch -r pangram~ pangram - tar cpf pangram.tar pangram ; rmdir pangram ; mv pangram~ pangram - for i in $PANGRAM ; do tar rpf pangram.tar pangram/$i ; done - touch -t `date '+%m%d0900'` pangram.tar ; gzip pangram.tar - touch pangram.tar.gz ; mv pangram.tar.gz pangram1.tgz - tar cpf pangram.tar pangram - touch -t `date '+%m%d0900'` pangram.tar ; gzip pangram.tar - touch pangram.tar.gz ; mv pangram.tar.gz pangram2.tgz - if cmp -s pangram1.tgz pangram2.tgz ; then - echo "OK" - rm -rf pangram pangram1.tgz pangram2.tgz - else - echo "NG" - cat <<- "EOF" - Hmm, packaging may not be done properly on this filesystem. - Would you please try again on a default filesystem, thanks! - - Happy packaging!! - - Quitting... - EOF - exit - fi -} - -install2() { - install -d ${2%/*} ; install -m 644 $1 $2 -} - -strip_bindir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - shopt -s nullglob - cd $1 - for i in * ; do - echo "$i" - if [ -h $i ] ; then continue ; fi - if [ -n "`file $i | grep "not stripped"`" ] ; then - echo "stripping -p $i" - strip -p $i - fi - done - ) fi -} - -strip_libdir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - shopt -s nullglob - cd $1 - for i in *.so *.so.* *.a ; do - echo "$i" - if [ -h $i ] ; then continue ; fi - if [ -n "`nm -a $i | grep " a "`" ] ; then - if [ $i != ${i%.a} ] ; then - echo -n "ranlib and " - touch -r $i $i.mt ; ranlib $i ; touch -r $i.mt $i ; rm $i.mt - fi - echo "stripping -gp $i" - strip -gp $i - fi - done - ) fi -} - -gzip_dir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - cd $1 - files=`ls -f --indicator-style=none | sed '/^\.\{1,2\}$/d'` - for i in $files ; do - echo "$i" - if [ ! -f $i -a ! -h $i -o $i != ${i%.gz} ] ; then continue ; fi - lnks=`ls -l $i | awk '{print $2}'` - if [ $lnks -gt 1 ] ; then - inum=`ls -i $i | awk '{print $1}'` - for j in `find . -maxdepth 1 -inum $inum` ; do - if [ ${j#./} == $i ] ; then - gzip -f $i - else - rm -f ${j#./} ; ln $i.gz ${j#./}.gz - fi - done - elif [ -h $i ] ; then - target=`readlink $i` ; rm -f $i ; ln -s $target.gz $i.gz - else - gzip $i - fi - done - for i in $files ; do mv ${i%.gz}.gz $C ; done - for i in $files ; do mv $C/${i%.gz}.gz . ; done - ) fi -} - -gzip_one() { - gzip $1 ; mv $1.gz $C ; mv $C/${1##*/}.gz ${1%/*} -} - -compress() { - for i in {$P,$P/usr}/{sbin,bin} ; do strip_bindir $i ; done - for i in {$P,$P/usr}/$libdir ; do strip_libdir $i ; done - if [ -f $infodir/dir ] ; then rm -f $infodir/dir ; fi - gzip_dir $infodir - for i in `seq 9` n ; do gzip_dir $mandir/man$i ; done -} - -prune_symlink() { - echo "pruning symlink in $1" - if [ -d $1 ] ; then ( - cd $P - rm -f /tmp/iNsT-a.$$ ; touch /tmp/iNsT-a.$$ - for i in `find ${1#$P/} -type l` ; do - target=`readlink $i` - echo "$i -> $target" - echo $i$'\n'$target >> /tmp/iNsT-a.$$ - done - COUNT=1 - LINE=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - while [ -n "$LINE" ] ; do - LINKGOESIN=`dirname $LINE` - LINKNAMEIS=`basename $LINE` - COUNT=$(($COUNT + 1)) - LINKPOINTSTO=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - if [ ! -d install ] ; then mkdir install ; fi - cat <<- EOF >> install/doinst.sh - ( cd $LINKGOESIN ; rm -rf $LINKNAMEIS ) - ( cd $LINKGOESIN ; ln -sf $LINKPOINTSTO $LINKNAMEIS ) - EOF - rm -rf $LINE ; touch -t `date '+%m%d0900'` install/doinst.sh $LINE - COUNT=$(($COUNT + 1)) - LINE=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - done - rm -f /tmp/iNsT-a.$$ - ) fi -} - -convert() { - for i in {$P,$P/usr}/{sbin,bin} ; do prune_symlink $i ; done - for i in {$P,$P/usr}/$libdir ; do prune_symlink $i ; done - prune_symlink $infodir - for i in `seq 9` n ; do prune_symlink $mandir/man$i ; done -} - -fscheck -W=`pwd` -for i in `seq 0 $((${#src[@]} - 1))` ; do - S[$i]=$W/${src[$i]} ; B[$i]=$W/build`test ${#src[@]} -eq 1 || echo $i` -done -P=$W/work ; C=$W/pivot -infodir=$P/usr/share/info -mandir=$P/usr/share/man -docdir=$P/usr/share/doc -myname=`basename $0` -pkg=$pkgbase-$vers-$arch-$build -case $arch in x86_64) libdir=lib64 ;; *) libdir=lib ;; esac -if [ $# -eq 0 ] ; then - opt_download=1 ; opt_config=1 ; opt_build=1 ; opt_package=1 +if [ -f functions ] ; then + source ./functions +elif [ ! -f /usr/share/plamo/functions ] ; then + wget ftp://plamo.linet.gr.jp/pub/Plamo-src/admin/functions + source ./functions else - opt_download=0 ; opt_config=0 ; opt_build=0 ; opt_package=0 - for i in $@ ; do - case $i in - download) opt_download=1 ;; - config) opt_config=1 ;; - build) opt_build=1 ;; - package) opt_package=1 ;; - esac - done + source /usr/share/plamo/functions fi + +fscheck +prepare "$@" if [ $opt_download -eq 1 ] ; then - for i in $url ; do - 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|tgz) tar xvpzf ${i##*/} ;; - bz2|tbz) tar xvpjf ${i##*/} ;; - xz|txz) tar xvpJf ${i##*/} ;; - esac - done + download_sources fi if [ $opt_config -eq 1 ] ; then 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 + apply_patches 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 - if [ -f config.log ] ; then - rm -rf config.cache config.log - fi if [ -x configure ] ; then ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --libdir='${exec_prefix}'/$libdir --infodir='${prefix}'/share/info \ @@ -259,12 +56,7 @@ done fi if [ $opt_package -eq 1 ] ; then - if [ `id -u` -ne 0 ] ; then - read -p "Do you want to package as root? [y/N] " ans - if [ "x$ans" == "xY" -o "x$ans" == "xy" ] ; then - cd $W ; /bin/su -c "$0 package" ; exit - fi - fi + root_priv if [ -d $P ] ; then rm -rf $P ; fi ; mkdir -p $P if [ -d $C ] ; then rm -rf $C ; fi ; mkdir -p $C touch $W/i.st ; sleep 1 @@ -279,24 +71,8 @@ find $P ! -type l -newer i.st ! -newer i.et \ -exec touch -t `date '+%m%d0900'` {} \; compress - for i in `seq 0 $((${#DOCS[@]} - 1))` ; do - for j in ${DOCS[$i]} ; do - for k in ${S[$i]}/$j ; do - install2 $k $docdir/${src[$i]}/${k#${S[$i]}/} - touch -r $k $docdir/${src[$i]}/${k#${S[$i]}/} - gzip_one $docdir/${src[$i]}/${k#${S[$i]}/} - done - done - if [ $i -eq 0 ] ; then - install $myname $docdir/$src - touch -t `date '+%m%d0900'` $docdir/$src/$myname - gzip_one $docdir/$src/$myname - else - ln $docdir/$src/$myname.gz $docdir/${src[$i]} - fi - ( cd $docdir ; find ${src[$i]} -type d -exec touch -r $W/{} {} \; ) - done - convert + setup_docdir + convert_links tar cvpf $pkg.tar -C $P `cd $P ; find usr/bin | tail -n+2` tar rvpf $pkg.tar -C $P `cd $P ; find usr/$libdir | tail -n+2` tar rvpf $pkg.tar -C $P usr/include/sysfs @@ -305,6 +81,5 @@ tar rvpf $pkg.tar -C $P install/doinst.sh touch -t `date '+%m%d0900'` $pkg.tar ; xz $pkg.tar ; touch $pkg.tar.xz mv $pkg.tar.xz $pkg.txz - read -p "Do you want to keep work files? [y/N] " ans - if [ "x$ans" != "xY" -a "x$ans" != "xy" ] ; then rm -rf $P $C i.[se]t ; fi + cleanup fi --- plamo/00_base/old/syslinux-20160323/PlamoBuild.syslinux-6.03 2016-03-23 20:36:22.000000000 +0900 +++ plamo/00_base/syslinux/PlamoBuild.syslinux-6.03 2017-05-02 10:24:15.000000000 +0900 @@ -6,227 +6,55 @@ http://git.yoctoproject.org/cgit.cgi/poky/plain/meta/recipes-devtools/syslinux/syslinux/syslinux-libupload-depend-lib.patch http://git.yoctoproject.org/cgit.cgi/poky/plain/meta/recipes-devtools/syslinux/syslinux/syslinux-remove-clean-script.patch http://www.nasm.us/pub/nasm/releasebuilds/2.11.08/nasm-2.11.08.tar.xz" +verify= +digest= +commitid= pkgbase=syslinux vers=6.03 arch=`uname -m` -build=P2 +build=P3 src=$pkgbase-$vers +patchfiles="syslinux-fix-parallel-building-issue.patch + syslinux-libupload-depend-lib.patch syslinux-remove-clean-script.patch" OPT_CONFIG="" DOCS="COPYING NEWS README" +template=20170415 +tmplurl=ftp://plamo.linet.gr.jp/pub/Plamo-src/admin ###################################################################### -fscheck() { - PANGRAM="The quick brown fox jumps over the lazy dog." - echo -n "Checking for the filesystem ... " - mkdir pangram ; ( cd pangram ; touch $PANGRAM ) - mv pangram pangram~ ; mkdir pangram ; touch -r pangram~ pangram - tar cpf pangram.tar pangram ; rmdir pangram ; mv pangram~ pangram - for i in $PANGRAM ; do tar rpf pangram.tar pangram/$i ; done - touch -t `date '+%m%d0900'` pangram.tar ; gzip pangram.tar - touch pangram.tar.gz ; mv pangram.tar.gz pangram1.tgz - tar cpf pangram.tar pangram - touch -t `date '+%m%d0900'` pangram.tar ; gzip pangram.tar - touch pangram.tar.gz ; mv pangram.tar.gz pangram2.tgz - if cmp -s pangram1.tgz pangram2.tgz ; then - echo "OK" - rm -rf pangram pangram1.tgz pangram2.tgz - else - echo "NG" - cat <<- "EOF" - Hmm, packaging may not be done properly on this filesystem. - Would you please try again on a default filesystem, thanks! - - Happy packaging!! - - Quitting... - EOF - exit - fi -} - -install2() { - install -d ${2%/*} ; install -m 644 $1 $2 -} - -strip_bindir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - shopt -s nullglob - cd $1 - for i in * ; do - echo "$i" - if [ -h $i ] ; then continue ; fi - if [ -n "`file $i | grep "not stripped"`" ] ; then - echo "stripping -p $i" - strip -p $i - fi - done - ) fi -} - -strip_libdir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - shopt -s nullglob - cd $1 - for i in *.so *.so.* *.a ; do - echo "$i" - if [ -h $i ] ; then continue ; fi - if [ -n "`nm -a $i | grep " a "`" ] ; then - if [ $i != ${i%.a} ] ; then - echo -n "ranlib and " - touch -r $i $i.mt ; ranlib $i ; touch -r $i.mt $i ; rm $i.mt - fi - echo "stripping -gp $i" - strip -gp $i - fi - done - ) fi -} - -gzip_dir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - cd $1 - files=`ls -f --indicator-style=none | sed '/^\.\{1,2\}$/d'` - for i in $files ; do - echo "$i" - if [ ! -f $i -a ! -h $i -o $i != ${i%.gz} ] ; then continue ; fi - lnks=`ls -l $i | awk '{print $2}'` - if [ $lnks -gt 1 ] ; then - inum=`ls -i $i | awk '{print $1}'` - for j in `find . -maxdepth 1 -inum $inum` ; do - if [ ${j#./} == $i ] ; then - gzip -f $i - else - rm -f ${j#./} ; ln $i.gz ${j#./}.gz - fi - done - elif [ -h $i ] ; then - target=`readlink $i` ; rm -f $i ; ln -s $target.gz $i.gz - else - gzip $i - fi - done - for i in $files ; do mv ${i%.gz}.gz $C ; done - for i in $files ; do mv $C/${i%.gz}.gz . ; done - ) fi -} - -gzip_one() { - gzip $1 ; mv $1.gz $C ; mv $C/${1##*/}.gz ${1%/*} -} - -compress() { - for i in {$P,$P/usr}/{sbin,bin} ; do strip_bindir $i ; done - for i in {$P,$P/usr}/$libdir ; do strip_libdir $i ; done - if [ -f $infodir/dir ] ; then rm -f $infodir/dir ; fi - gzip_dir $infodir - for i in `seq 9` n ; do gzip_dir $mandir/man$i ; done -} - -prune_symlink() { - echo "pruning symlink in $1" - if [ -d $1 ] ; then ( - cd $P - rm -f /tmp/iNsT-a.$$ ; touch /tmp/iNsT-a.$$ - for i in `find ${1#$P/} -type l` ; do - target=`readlink $i` - echo "$i -> $target" - echo $i$'\n'$target >> /tmp/iNsT-a.$$ - done - COUNT=1 - LINE=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - while [ -n "$LINE" ] ; do - LINKGOESIN=`dirname $LINE` - LINKNAMEIS=`basename $LINE` - COUNT=$(($COUNT + 1)) - LINKPOINTSTO=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - if [ ! -d install ] ; then mkdir install ; fi - cat <<- EOF >> install/doinst.sh - ( cd $LINKGOESIN ; rm -rf $LINKNAMEIS ) - ( cd $LINKGOESIN ; ln -sf $LINKPOINTSTO $LINKNAMEIS ) - EOF - rm -rf $LINE ; touch -t `date '+%m%d0900'` install/doinst.sh $LINE - COUNT=$(($COUNT + 1)) - LINE=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - done - rm -f /tmp/iNsT-a.$$ - ) fi -} - -convert() { - for i in {$P,$P/usr}/{sbin,bin} ; do prune_symlink $i ; done - for i in {$P,$P/usr}/$libdir ; do prune_symlink $i ; done - prune_symlink $infodir - for i in `seq 9` n ; do prune_symlink $mandir/man$i ; done -} - -fscheck -W=`pwd` -for i in `seq 0 $((${#src[@]} - 1))` ; do - S[$i]=$W/${src[$i]} ; B[$i]=$W/build`test ${#src[@]} -eq 1 || echo $i` -done -P=$W/work ; C=$W/pivot -infodir=$P/usr/share/info -mandir=$P/usr/share/man -docdir=$P/usr/share/doc -myname=`basename $0` -pkg=$pkgbase-$vers-$arch-$build -case $arch in x86_64) libdir=lib64 ;; *) libdir=lib ;; esac -if [ $# -eq 0 ] ; then - opt_download=1 ; opt_config=1 ; opt_build=1 ; opt_package=1 +if [ -f functions ] ; then + source ./functions +elif [ ! -f /usr/share/plamo/functions ] ; then + wget ftp://plamo.linet.gr.jp/pub/Plamo-src/admin/functions + source ./functions else - opt_download=0 ; opt_config=0 ; opt_build=0 ; opt_package=0 - for i in $@ ; do - case $i in - download) opt_download=1 ;; - config) opt_config=1 ;; - build) opt_build=1 ;; - package) opt_package=1 ;; - esac - done + source /usr/share/plamo/functions fi + +fscheck +prepare "$@" if [ $opt_download -eq 1 ] ; then - for i in $url ; do - if [ ! -f ${i##*/} ] ; then wget $i ; fi - done - for i in $url ; do - case ${i##*.} in - tar) tar xvpf ${i##*/} ;; - gz) tar xvpzf ${i##*/} ;; - bz2) tar xvpjf ${i##*/} ;; - xz) tar xvpJf ${i##*/} ;; - esac - done + download_sources fi if [ $opt_config -eq 1 ] ; then 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 + apply_patches cd $W/nasm-2.11.08 ./configure --prefix=$W/nasm make install PATH="$W/nasm/bin:$PATH" cd $B - patch -Np1 -i $W/syslinux-fix-parallel-building-issue.patch - patch -Np1 -i $W/syslinux-libupload-depend-lib.patch - patch -Np1 -i $W/syslinux-remove-clean-script.patch if [ $arch == i686 ] ; then cp -p Makefile{,.orig} sed -i '/^all_firmware/s@ efi64@@' Makefile fi for i in `seq 0 $((${#B[@]} - 1))` ; do cd ${B[$i]} - if [ -f Makefile ] ; then - make clean - fi - if [ -f config.log ] ; then - 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 @@ -240,12 +68,7 @@ done fi if [ $opt_package -eq 1 ] ; then - if [ `id -u` -ne 0 ] ; then - read -p "Do you want to package as root? [y/N] " ans - if [ "x$ans" == "xY" -o "x$ans" == "xy" ] ; then - cd $W ; /bin/su -c "$0 package" ; exit - fi - fi + root_priv if [ -d $P ] ; then rm -rf $P ; fi ; mkdir -p $P if [ -d $C ] ; then rm -rf $C ; fi ; mkdir -p $C touch $W/i.st ; sleep 1 @@ -260,30 +83,14 @@ find $P ! -type l -newer i.st ! -newer i.et \ -exec touch -t `date '+%m%d0900'` {} \; compress - for i in `seq 0 $((${#DOCS[@]} - 1))` ; do - for j in ${DOCS[$i]} ; do - for k in ${S[$i]}/$j ; do - install2 $k $docdir/${src[$i]}/${k#${S[$i]}/} - touch -r $k $docdir/${src[$i]}/${k#${S[$i]}/} - gzip_one $docdir/${src[$i]}/${k#${S[$i]}/} - done - done - if [ $i -eq 0 ] ; then - install $myname $docdir/$src - touch -t `date '+%m%d0900'` $docdir/$src/$myname - gzip_one $docdir/$src/$myname - else - ln $docdir/$src/$myname.gz $docdir/${src[$i]} - fi - ( cd $docdir ; find ${src[$i]} -type d -exec touch -r $W/{} {} \; ) - done + setup_docdir cp -a $S/doc $docdir/$src chmod -R g-w $docdir/$src/doc chown -R root.root $docdir/$src/doc - mv $docdir/$src/{doc,{NEWS,README,$myname}.gz} $C - mv $C/{doc,{NEWS,README,$myname}.gz} $docdir/$src + mv $docdir/$src/{doc,{NEWS,README,$func,$myname,$spec}.gz} $C + mv $C/{doc,{NEWS,README,$func,$myname,$spec}.gz} $docdir/$src touch -t `date '+%m%d0900'` $docdir/$src - convert + convert_links tar cvpf $pkg.tar -C $P `cd $P ; find usr/bin | tail -n+2` tar rvpf $pkg.tar -C $P `cd $P ; find sbin | tail -n+2` tar rvpf $pkg.tar -C $P usr/share/syslinux @@ -291,6 +98,5 @@ tar rvpf $pkg.tar -C $P usr/share/doc/$src touch -t `date '+%m%d0900'` $pkg.tar ; xz $pkg.tar ; touch $pkg.tar.xz mv $pkg.tar.xz $pkg.txz - read -p "Do you want to keep work files? [y/N] " ans - if [ "x$ans" != "xY" -a "x$ans" != "xy" ] ; then rm -rf $P $C i.[se]t ; fi + cleanup fi --- plamo/00_base/old/sysvinit-20170507/PlamoBuild.sysvinit-2.88dsf 2017-05-07 23:16:02.000000000 +0900 +++ plamo/00_base/sysvinit/PlamoBuild.sysvinit-2.88dsf 2018-01-26 08:42:44.000000000 +0900 @@ -2,20 +2,21 @@ ###################################################################### url="http://download.savannah.gnu.org/releases/sysvinit/sysvinit-2.88dsf.tar.bz2 - ftp://plamo.linet.gr.jp/pub/Plamo-src/plamo/00_base/sysvinit/plamo-rc-scripts-20160908.tgz" + ftp://plamo.linet.gr.jp/pub/Plamo-src/plamo/00_base/sysvinit/plamo-rc-scripts-20171021.tgz" verify= digest= +branch= commitid= pkgbase=sysvinit vers=2.88dsf arch=`uname -m` -build=P20 +build=P21 src=$pkgbase-$vers patchfiles="" OPT_CONFIG="" DOCS="`echo doc/{bootlogd.README,Install,Changelog,Propaganda}` COPYING COPYRIGHT Makefile README" -template=20170415 +template=20170713 tmplurl=ftp://plamo.linet.gr.jp/pub/Plamo-src/admin ###################################################################### --- plamo/00_base/old/tar-20170502/PlamoBuild.tar-1.26 2017-05-02 11:16:38.000000000 +0900 +++ plamo/00_base/tar/PlamoBuild.tar-1.26 2017-12-02 19:02:55.000000000 +0900 @@ -7,17 +7,18 @@ ftp://plamo.linet.gr.jp/pub/Plamo-src/plamo/00_base/tar/tar-1.26-no-gets.patch.gz" verify= digest= +branch= commitid= pkgbase=tar vers=1.26 arch=`uname -m` -build=P4 +build=P5 src=$pkgbase-$vers patchfiles="`echo tar-1.2{3-{tartime,txz},6-no-gets}.patch.gz`" OPT_CONFIG="" DOCS="NEWS TODO README THANKS ChangeLog.1 AUTHORS INSTALL ABOUT-NLS ChangeLog COPYING" -template=20170415 +template=20170713 tmplurl=ftp://plamo.linet.gr.jp/pub/Plamo-src/admin ###################################################################### @@ -45,7 +46,8 @@ if [ -x configure ] ; then ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --libdir='${exec_prefix}'/$libdir --infodir='${prefix}'/share/info \ - --mandir='${prefix}'/share/man ${OPT_CONFIG[$i]} + --mandir='${prefix}'/share/man ${OPT_CONFIG[$i]} \ + FORCE_UNSAFE_CONFIGURE=1 fi done fi --- plamo/00_base/old/tcp_wrappers-20160607/PlamoBuild.tcp_wrappers-7.6.q 2016-06-07 14:34:48.000000000 +0900 +++ plamo/00_base/tcp_wrappers/PlamoBuild.tcp_wrappers-7.6.q 2017-05-02 11:40:41.000000000 +0900 @@ -3,238 +3,46 @@ ###################################################################### url="http://archive.debian.org/debian/pool/main/t/tcp-wrappers/tcp-wrappers_7.6.q.orig.tar.gz http://archive.debian.org/debian/pool/main/t/tcp-wrappers/tcp-wrappers_7.6.q-16.diff.gz" +verify= +digest= +commitid= pkgbase=tcp_wrappers vers=7.6.q arch=`uname -m` -build=P5 +build=P6 src=tcp_wrappers_7.6 +patchfiles="tcp-wrappers_7.6.q-16.diff.gz" OPT_CONFIG="" DOCS="README BLURB DISCLAIMER CHANGES README.IRIX README.NIS" +template=20170415 +tmplurl=ftp://plamo.linet.gr.jp/pub/Plamo-src/admin ###################################################################### -fscheck() { - PANGRAM="The quick brown fox jumps over the lazy dog." - echo -n "Checking for the filesystem ... " - mkdir pangram ; ( cd pangram ; touch $PANGRAM ) - mv pangram pangram~ ; mkdir pangram ; touch -r pangram~ pangram - tar cpf pangram.tar pangram ; rmdir pangram ; mv pangram~ pangram - for i in $PANGRAM ; do tar rpf pangram.tar pangram/$i ; done - touch -t `date '+%m%d0900'` pangram.tar ; gzip pangram.tar - touch pangram.tar.gz ; mv pangram.tar.gz pangram1.tgz - tar cpf pangram.tar pangram - touch -t `date '+%m%d0900'` pangram.tar ; gzip pangram.tar - touch pangram.tar.gz ; mv pangram.tar.gz pangram2.tgz - if cmp -s pangram1.tgz pangram2.tgz ; then - echo "OK" - rm -rf pangram pangram1.tgz pangram2.tgz - else - echo "NG" - cat <<- "EOF" - Hmm, packaging may not be done properly on this filesystem. - Would you please try again on a default filesystem, thanks! - - Happy packaging!! - - Quitting... - EOF - exit - fi -} - -install2() { - install -d ${2%/*} ; install -m 644 $1 $2 -} - -strip_bindir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - shopt -s nullglob - cd $1 - for i in * ; do - echo "$i" - if [ -h $i ] ; then continue ; fi - if [ -n "`file $i | grep "not stripped"`" ] ; then - echo "stripping -p $i" - strip -p $i - fi - done - ) fi -} - -strip_libdir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - shopt -s nullglob - cd $1 - for i in *.so *.so.* *.a ; do - echo "$i" - if [ -h $i ] ; then continue ; fi - if [ -n "`nm -a $i | grep " a "`" ] ; then - if [ $i != ${i%.a} ] ; then - echo -n "ranlib and " - touch -r $i $i.mt ; ranlib $i ; touch -r $i.mt $i ; rm $i.mt - fi - echo "stripping -gp $i" - strip -gp $i - fi - done - ) fi -} - -gzip_dir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - cd $1 - files=`ls -f --indicator-style=none | sed '/^\.\{1,2\}$/d'` - for i in $files ; do - echo "$i" - if [ ! -f $i -a ! -h $i -o $i != ${i%.gz} ] ; then continue ; fi - lnks=`ls -l $i | awk '{print $2}'` - if [ $lnks -gt 1 ] ; then - inum=`ls -i $i | awk '{print $1}'` - for j in `find . -maxdepth 1 -inum $inum` ; do - if [ ${j#./} == $i ] ; then - gzip -f $i - else - rm -f ${j#./} ; ln $i.gz ${j#./}.gz - fi - done - elif [ -h $i ] ; then - target=`readlink $i` ; rm -f $i ; ln -s $target.gz $i.gz - else - gzip $i - fi - done - for i in $files ; do mv ${i%.gz}.gz $C ; done - for i in $files ; do mv $C/${i%.gz}.gz . ; done - ) fi -} - -gzip_one() { - gzip $1 ; mv $1.gz $C ; mv $C/${1##*/}.gz ${1%/*} -} - -compress() { - for i in {$P,$P/usr}/{sbin,bin} ; do strip_bindir $i ; done - for i in {$P,$P/usr}/$libdir ; do strip_libdir $i ; done - if [ -f $infodir/dir ] ; then rm -f $infodir/dir ; fi - gzip_dir $infodir - for i in `seq 9` n ; do gzip_dir $mandir/man$i ; done -} - -prune_symlink() { - echo "pruning symlink in $1" - if [ -d $1 ] ; then ( - cd $P - rm -f /tmp/iNsT-a.$$ ; touch /tmp/iNsT-a.$$ - for i in `find ${1#$P/} -type l` ; do - target=`readlink $i` - echo "$i -> $target" - echo $i$'\n'$target >> /tmp/iNsT-a.$$ - done - COUNT=1 - LINE=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - while [ -n "$LINE" ] ; do - LINKGOESIN=`dirname $LINE` - LINKNAMEIS=`basename $LINE` - COUNT=$(($COUNT + 1)) - LINKPOINTSTO=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - if [ ! -d install ] ; then mkdir install ; fi - cat <<- EOF >> install/doinst.sh - ( cd $LINKGOESIN ; rm -rf $LINKNAMEIS ) - ( cd $LINKGOESIN ; ln -sf $LINKPOINTSTO $LINKNAMEIS ) - EOF - rm -rf $LINE ; touch -t `date '+%m%d0900'` install/doinst.sh $LINE - COUNT=$(($COUNT + 1)) - LINE=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - done - rm -f /tmp/iNsT-a.$$ - ) fi -} - -convert() { - for i in {$P,$P/usr}/{sbin,bin} ; do prune_symlink $i ; done - for i in {$P,$P/usr}/$libdir ; do prune_symlink $i ; done - prune_symlink $infodir - for i in `seq 9` n ; do prune_symlink $mandir/man$i ; done -} - -fscheck -W=`pwd` -for i in `seq 0 $((${#src[@]} - 1))` ; do - S[$i]=$W/${src[$i]} ; B[$i]=$W/build`test ${#src[@]} -eq 1 || echo $i` -done -P=$W/work ; C=$W/pivot -infodir=$P/usr/share/info -mandir=$P/usr/share/man -docdir=$P/usr/share/doc -myname=`basename $0` -pkg=$pkgbase-$vers-$arch-$build -case $arch in x86_64) libdir=lib64 ;; *) libdir=lib ;; esac -if [ $# -eq 0 ] ; then - opt_download=1 ; opt_config=1 ; opt_build=1 ; opt_package=1 +if [ -f functions ] ; then + source ./functions +elif [ ! -f /usr/share/plamo/functions ] ; then + wget ftp://plamo.linet.gr.jp/pub/Plamo-src/admin/functions + source ./functions else - opt_download=0 ; opt_config=0 ; opt_build=0 ; opt_package=0 - for i in $@ ; do - case $i in - download) opt_download=1 ;; - config) opt_config=1 ;; - build) opt_build=1 ;; - package) opt_package=1 ;; - esac - done + source /usr/share/plamo/functions fi + +fscheck +prepare "$@" if [ $opt_download -eq 1 ] ; then - for i in $url ; do - 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|tgz) tar xvpzf ${i##*/} ;; - bz2|tbz) tar xvpjf ${i##*/} ;; - xz|txz) tar xvpJf ${i##*/} ;; - esac - done + download_sources fi if [ $opt_config -eq 1 ] ; then 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 + apply_patches cd $B - gunzip -c $W/tcp-wrappers_7.6.q-16.diff.gz | patch -Np1 -i - for i in `cat debian/patches/series` ; do patch -Np1 -i debian/patches/$i done for i in `seq 0 $((${#B[@]} - 1))` ; do cd ${B[$i]} - if [ -f Makefile ] ; then - make clean - fi - if [ -f config.log ] ; then - rm -rf config.cache config.log - fi if [ -x configure ] ; then ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --libdir='${exec_prefix}'/$libdir --infodir='${prefix}'/share/info \ @@ -251,12 +59,7 @@ done fi if [ $opt_package -eq 1 ] ; then - if [ `id -u` -ne 0 ] ; then - read -p "Do you want to package as root? [y/N] " ans - if [ "x$ans" == "xY" -o "x$ans" == "xy" ] ; then - cd $W ; /bin/su -c "$0 package" ; exit - fi - fi + root_priv if [ -d $P ] ; then rm -rf $P ; fi ; mkdir -p $P if [ -d $C ] ; then rm -rf $C ; fi ; mkdir -p $C touch $W/i.st ; sleep 1 @@ -319,24 +122,8 @@ find $P ! -type l -newer i.st ! -newer i.et \ -exec touch -t `date '+%m%d0900'` {} \; compress - for i in `seq 0 $((${#DOCS[@]} - 1))` ; do - for j in ${DOCS[$i]} ; do - for k in ${S[$i]}/$j ; do - install2 $k $docdir/${src[$i]}/${k#${S[$i]}/} - touch -r $k $docdir/${src[$i]}/${k#${S[$i]}/} - gzip_one $docdir/${src[$i]}/${k#${S[$i]}/} - done - done - if [ $i -eq 0 ] ; then - install $myname $docdir/$src - touch -t `date '+%m%d0900'` $docdir/$src/$myname - gzip_one $docdir/$src/$myname - else - ln $docdir/$src/$myname.gz $docdir/${src[$i]} - fi - ( cd $docdir ; find ${src[$i]} -type d -exec touch -r $W/{} {} \; ) - done - convert + setup_docdir + convert_links cat <<- "EOF" >> $P/install/doinst.sh hosts_config() { @@ -362,6 +149,5 @@ tar rvpf $pkg.tar -C $P install/doinst.sh touch -t `date '+%m%d0900'` $pkg.tar ; xz $pkg.tar ; touch $pkg.tar.xz mv $pkg.tar.xz $pkg.txz - read -p "Do you want to keep work files? [y/N] " ans - if [ "x$ans" != "xY" -a "x$ans" != "xy" ] ; then rm -rf $P $C i.[se]t ; fi + cleanup fi --- plamo/00_base/old/tcsh-20160409/PlamoBuild.tcsh-6.19.00 2016-04-09 21:13:31.000000000 +0900 +++ plamo/00_base/tcsh/PlamoBuild.tcsh-6.19.00 2017-05-02 11:51:42.000000000 +0900 @@ -2,215 +2,46 @@ ###################################################################### url="http://ftp.osuosl.org/pub/blfs/conglomeration/tcsh/tcsh-6.19.00.tar.gz" +verify= +digest= +commitid= pkgbase=tcsh vers=6.19.00 arch=`uname -m` -build=P3 +build=P4 src=$pkgbase-$vers +patchfiles="" OPT_CONFIG="" DOCS="BUGS Copyright FAQ Fixes NewThings Ported README README.imake WishList Y2K src.desc" +template=20170415 +tmplurl=ftp://plamo.linet.gr.jp/pub/Plamo-src/admin ###################################################################### -fscheck() { - PANGRAM="The quick brown fox jumps over the lazy dog." - echo -n "Checking for the filesystem ... " - mkdir pangram ; ( cd pangram ; touch $PANGRAM ) - mv pangram pangram~ ; mkdir pangram ; touch -r pangram~ pangram - tar cpf pangram.tar pangram ; rmdir pangram ; mv pangram~ pangram - for i in $PANGRAM ; do tar rpf pangram.tar pangram/$i ; done - touch -t `date '+%m%d0900'` pangram.tar ; gzip pangram.tar - touch pangram.tar.gz ; mv pangram.tar.gz pangram1.tgz - tar cpf pangram.tar pangram - touch -t `date '+%m%d0900'` pangram.tar ; gzip pangram.tar - touch pangram.tar.gz ; mv pangram.tar.gz pangram2.tgz - if cmp -s pangram1.tgz pangram2.tgz ; then - echo "OK" - rm -rf pangram pangram1.tgz pangram2.tgz - else - echo "NG" - cat <<- "EOF" - Hmm, packaging may not be done properly on this filesystem. - Would you please try again on a default filesystem, thanks! - - Happy packaging!! - - Quitting... - EOF - exit - fi -} - -install2() { - install -d ${2%/*} ; install -m 644 $1 $2 -} - -strip_bindir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - shopt -s nullglob - cd $1 - for i in * ; do - echo "$i" - if [ -h $i ] ; then continue ; fi - if [ -n "`file $i | grep "not stripped"`" ] ; then - echo "stripping -p $i" - strip -p $i - fi - done - ) fi -} - -strip_libdir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - shopt -s nullglob - cd $1 - for i in *.so *.so.* *.a ; do - echo "$i" - if [ -h $i ] ; then continue ; fi - if [ -n "`nm -a $i | grep " a "`" ] ; then - if [ $i != ${i%.a} ] ; then - echo -n "ranlib and " - touch -r $i $i.mt ; ranlib $i ; touch -r $i.mt $i ; rm $i.mt - fi - echo "stripping -gp $i" - strip -gp $i - fi - done - ) fi -} - -gzip_dir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - cd $1 - files=`ls -f --indicator-style=none | sed '/^\.\{1,2\}$/d'` - for i in $files ; do - echo "$i" - if [ ! -f $i -a ! -h $i -o $i != ${i%.gz} ] ; then continue ; fi - lnks=`ls -l $i | awk '{print $2}'` - if [ $lnks -gt 1 ] ; then - inum=`ls -i $i | awk '{print $1}'` - for j in `find . -maxdepth 1 -inum $inum` ; do - if [ ${j#./} == $i ] ; then - gzip -f $i - else - rm -f ${j#./} ; ln $i.gz ${j#./}.gz - fi - done - elif [ -h $i ] ; then - target=`readlink $i` ; rm -f $i ; ln -s $target.gz $i.gz - else - gzip $i - fi - done - for i in $files ; do mv ${i%.gz}.gz $C ; done - for i in $files ; do mv $C/${i%.gz}.gz . ; done - ) fi -} - -gzip_one() { - gzip $1 ; mv $1.gz $C ; mv $C/${1##*/}.gz ${1%/*} -} - -compress() { - for i in {$P,$P/usr}/{sbin,bin} ; do strip_bindir $i ; done - for i in {$P,$P/usr}/$libdir ; do strip_libdir $i ; done - if [ -f $infodir/dir ] ; then rm -f $infodir/dir ; fi - gzip_dir $infodir - for i in `seq 9` n ; do gzip_dir $mandir/man$i ; done -} - -prune_symlink() { - echo "pruning symlink in $1" - if [ -d $1 ] ; then ( - cd $P - rm -f /tmp/iNsT-a.$$ ; touch /tmp/iNsT-a.$$ - for i in `find ${1#$P/} -type l` ; do - target=`readlink $i` - echo "$i -> $target" - echo $i$'\n'$target >> /tmp/iNsT-a.$$ - done - COUNT=1 - LINE=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - while [ -n "$LINE" ] ; do - LINKGOESIN=`dirname $LINE` - LINKNAMEIS=`basename $LINE` - COUNT=$(($COUNT + 1)) - LINKPOINTSTO=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - if [ ! -d install ] ; then mkdir install ; fi - cat <<- EOF >> install/doinst.sh - ( cd $LINKGOESIN ; rm -rf $LINKNAMEIS ) - ( cd $LINKGOESIN ; ln -sf $LINKPOINTSTO $LINKNAMEIS ) - EOF - rm -rf $LINE ; touch -t `date '+%m%d0900'` install/doinst.sh $LINE - COUNT=$(($COUNT + 1)) - LINE=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - done - rm -f /tmp/iNsT-a.$$ - ) fi -} - -convert() { - for i in {$P,$P/usr}/{sbin,bin} ; do prune_symlink $i ; done - for i in {$P,$P/usr}/$libdir ; do prune_symlink $i ; done - prune_symlink $infodir - for i in `seq 9` n ; do prune_symlink $mandir/man$i ; done -} - -fscheck -W=`pwd` -for i in `seq 0 $((${#src[@]} - 1))` ; do - S[$i]=$W/${src[$i]} ; B[$i]=$W/build`test ${#src[@]} -eq 1 || echo $i` -done -P=$W/work ; C=$W/pivot -infodir=$P/usr/share/info -mandir=$P/usr/share/man -docdir=$P/usr/share/doc -myname=`basename $0` -pkg=$pkgbase-$vers-$arch-$build -case $arch in x86_64) libdir=lib64 ;; *) libdir=lib ;; esac -if [ $# -eq 0 ] ; then - opt_download=1 ; opt_config=1 ; opt_build=1 ; opt_package=1 +if [ -f functions ] ; then + source ./functions +elif [ ! -f /usr/share/plamo/functions ] ; then + wget ftp://plamo.linet.gr.jp/pub/Plamo-src/admin/functions + source ./functions else - opt_download=0 ; opt_config=0 ; opt_build=0 ; opt_package=0 - for i in $@ ; do - case $i in - download) opt_download=1 ;; - config) opt_config=1 ;; - build) opt_build=1 ;; - package) opt_package=1 ;; - esac - done + source /usr/share/plamo/functions fi + +fscheck +prepare "$@" if [ $opt_download -eq 1 ] ; then - for i in $url ; do - if [ ! -f ${i##*/} ] ; then wget $i ; fi - done - for i in $url ; do - case ${i##*.} in - tar) tar xvpf ${i##*/} ;; - gz) tar xvpzf ${i##*/} ;; - bz2) tar xvpjf ${i##*/} ;; - esac - done + download_sources fi if [ $opt_config -eq 1 ] ; then 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 + apply_patches for i in `seq 0 $((${#B[@]} - 1))` ; do cd ${B[$i]} - if [ -f Makefile ] ; then - make clean - fi - if [ -f config.log ] ; then - 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 @@ -224,12 +55,7 @@ done fi if [ $opt_package -eq 1 ] ; then - if [ `id -u` -ne 0 ] ; then - read -p "Do you want to package as root? [y/N] " ans - if [ "x$ans" == "xY" -o "x$ans" == "xy" ] ; then - cd $W ; /bin/su -c "$0 package" ; exit - fi - fi + root_priv if [ -d $P ] ; then rm -rf $P ; fi ; mkdir -p $P if [ -d $C ] ; then rm -rf $C ; fi ; mkdir -p $C touch $W/i.st ; sleep 1 @@ -250,33 +76,16 @@ find $P ! -type l -newer i.st ! -newer i.et \ -exec touch -t `date '+%m%d0900'` {} \; compress - for i in `seq 0 $((${#DOCS[@]} - 1))` ; do - for j in ${DOCS[$i]} ; do - for k in ${S[$i]}/$j ; do - install2 $k $docdir/${src[$i]}/${k#${S[$i]}/} - touch -r $k $docdir/${src[$i]}/${k#${S[$i]}/} - gzip_one $docdir/${src[$i]}/${k#${S[$i]}/} - done - done - if [ $i -eq 0 ] ; then - install $myname $docdir/$src - touch -t `date '+%m%d0900'` $docdir/$src/$myname - gzip_one $docdir/$src/$myname - else - ln $docdir/$src/$myname.gz $docdir/${src[$i]} - fi - ( cd $docdir ; find ${src[$i]} -type d -exec touch -r $W/{} {} \; ) - done - convert + setup_docdir + convert_links tar cvpf $pkg.tar -C $P `cd $P ; find bin | 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/share/locale -name "*.cat"` + tar rvpf $pkg.tar -C $P `cd $P ; find usr/share/locale -name *.cat` 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 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 mv $pkg.tar.xz $pkg.txz - read -p "Do you want to keep work files? [y/N] " ans - if [ "x$ans" != "xY" -a "x$ans" != "xy" ] ; then rm -rf $P $C i.[se]t ; fi + cleanup fi --- plamo/00_base/old/timezone-20160910/PlamoBuild.timezone-2016f 2016-09-10 23:56:28.000000000 +0900 +++ plamo/00_base/timezone/PlamoBuild.timezone-2016f 2017-05-02 12:27:11.000000000 +0900 @@ -3,222 +3,41 @@ ###################################################################### url="http://www.iana.org/time-zones/repository/releases/tzcode2016f.tar.gz http://www.iana.org/time-zones/repository/releases/tzdata2016f.tar.gz - ftp://plamo.linet.gr.jp/pub/Plamo-src.new/plamo/00_base/timezone/plamo_timeconfig.tar.gz" + ftp://plamo.linet.gr.jp/pub/Plamo-src/plamo/00_base/timezone/plamo_timeconfig.tar.gz" +verify= +digest= +commitid= pkgbase=timezone vers=2016f arch=`uname -m` -build=P1 +build=P2 src=$pkgbase-$vers patchfiles="" OPT_CONFIG="" DOCS="CONTRIBUTING LICENSE NEWS README Theory tz-art.htm tz-how-to.html tz-link.htm" +template=20170415 +tmplurl=ftp://plamo.linet.gr.jp/pub/Plamo-src/admin ###################################################################### -fscheck() { - PANGRAM="The quick brown fox jumps over the lazy dog." - echo -n "Checking for the filesystem ... " - mkdir pangram ; ( cd pangram ; touch $PANGRAM ) - mv pangram pangram~ ; mkdir pangram ; touch -r pangram~ pangram - tar cpf pangram.tar pangram ; rmdir pangram ; mv pangram~ pangram - for i in $PANGRAM ; do tar rpf pangram.tar pangram/$i ; done - touch -t `date '+%m%d0900'` pangram.tar ; gzip pangram.tar - touch pangram.tar.gz ; mv pangram.tar.gz pangram1.tgz - tar cpf pangram.tar pangram - touch -t `date '+%m%d0900'` pangram.tar ; gzip pangram.tar - touch pangram.tar.gz ; mv pangram.tar.gz pangram2.tgz - if cmp -s pangram1.tgz pangram2.tgz ; then - echo "OK" - rm -rf pangram pangram1.tgz pangram2.tgz - else - echo "NG" - cat <<- "EOF" - Hmm, packaging may not be done properly on this filesystem. - Would you please try again on a default filesystem, thanks! - - Happy packaging!! - - Quitting... - EOF - exit - fi -} - -install2() { - install -d ${2%/*} ; install -m 644 $1 $2 -} - -strip_bindir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - shopt -s nullglob - cd $1 - for i in * ; do - echo "$i" - if [ -h $i ] ; then continue ; fi - if [ -n "`file $i | grep "not stripped"`" ] ; then - echo "stripping -p $i" - strip -p $i - fi - done - ) fi -} - -strip_libdir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - shopt -s nullglob - cd $1 - for i in *.so *.so.* *.a ; do - echo "$i" - if [ -h $i ] ; then continue ; fi - if [ -n "`nm -a $i | grep " a "`" ] ; then - if [ $i != ${i%.a} ] ; then - echo -n "ranlib and " - touch -r $i $i.mt ; ranlib $i ; touch -r $i.mt $i ; rm $i.mt - fi - echo "stripping -gp $i" - strip -gp $i - fi - done - ) fi -} - -gzip_dir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - cd $1 - files=`ls -f --indicator-style=none | sed '/^\.\{1,2\}$/d'` - for i in $files ; do - echo "$i" - if [ ! -f $i -a ! -h $i -o $i != ${i%.gz} ] ; then continue ; fi - lnks=`ls -l $i | awk '{print $2}'` - if [ $lnks -gt 1 ] ; then - inum=`ls -i $i | awk '{print $1}'` - for j in `find . -maxdepth 1 -inum $inum` ; do - if [ ${j#./} == $i ] ; then - gzip -f $i - else - rm -f ${j#./} ; ln $i.gz ${j#./}.gz - fi - done - elif [ -h $i ] ; then - target=`readlink $i` ; rm -f $i ; ln -s $target.gz $i.gz - else - gzip $i - fi - done - for i in $files ; do mv ${i%.gz}.gz $C ; done - for i in $files ; do mv $C/${i%.gz}.gz . ; done - ) fi -} - -gzip_one() { - gzip $1 ; mv $1.gz $C ; mv $C/${1##*/}.gz ${1%/*} -} - -compress() { - for i in {$P,$P/usr}/{sbin,bin} ; do strip_bindir $i ; done - for i in {$P,$P/usr}/$libdir ; do strip_libdir $i ; done - if [ -f $infodir/dir ] ; then rm -f $infodir/dir ; fi - gzip_dir $infodir - for i in `seq 9` n ; do gzip_dir $mandir/man$i ; done -} - -prune_symlink() { - echo "pruning symlink in $1" - if [ -d $1 ] ; then ( - cd $P - rm -f /tmp/iNsT-a.$$ ; touch /tmp/iNsT-a.$$ - for i in `find ${1#$P/} -type l` ; do - target=`readlink $i` - echo "$i -> $target" - echo $i$'\n'$target >> /tmp/iNsT-a.$$ - done - COUNT=1 - LINE=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - while [ -n "$LINE" ] ; do - LINKGOESIN=`dirname $LINE` - LINKNAMEIS=`basename $LINE` - COUNT=$(($COUNT + 1)) - LINKPOINTSTO=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - if [ ! -d install ] ; then mkdir install ; fi - cat <<- EOF >> install/doinst.sh - ( cd $LINKGOESIN ; rm -rf $LINKNAMEIS ) - ( cd $LINKGOESIN ; ln -sf $LINKPOINTSTO $LINKNAMEIS ) - EOF - rm -rf $LINE ; touch -t `date '+%m%d0900'` install/doinst.sh $LINE - COUNT=$(($COUNT + 1)) - LINE=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - done - rm -f /tmp/iNsT-a.$$ - ) fi -} - -convert() { - for i in {$P,$P/usr}/{sbin,bin} ; do prune_symlink $i ; done - for i in {$P,$P/usr}/$libdir ; do prune_symlink $i ; done - prune_symlink $infodir - for i in `seq 9` n ; do prune_symlink $mandir/man$i ; done -} - -fscheck -W=`pwd` -for i in `seq 0 $((${#src[@]} - 1))` ; do - S[$i]=$W/${src[$i]} ; B[$i]=$W/build`test ${#src[@]} -eq 1 || echo $i` -done -P=$W/work ; C=$W/pivot -infodir=$P/usr/share/info -mandir=$P/usr/share/man -docdir=$P/usr/share/doc -myname=`basename $0` -pkg=$pkgbase-$vers-$arch-$build -case $arch in x86_64) libdir=lib64 ;; *) libdir=lib ;; esac -if [ $# -eq 0 ] ; then - opt_download=1 ; opt_config=1 ; opt_build=1 ; opt_package=1 +if [ -f functions ] ; then + source ./functions +elif [ ! -f /usr/share/plamo/functions ] ; then + wget ftp://plamo.linet.gr.jp/pub/Plamo-src/admin/functions + source ./functions else - opt_download=0 ; opt_config=0 ; opt_build=0 ; opt_package=0 - for i in $@ ; do - case $i in - download) opt_download=1 ;; - config) opt_config=1 ;; - build) opt_build=1 ;; - package) opt_package=1 ;; - esac - done + source /usr/share/plamo/functions fi + +fscheck +prepare "$@" if [ $opt_download -eq 1 ] ; then - for i in $url ; do - 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 - false && for i in $url ; do - case ${i##*.} in - tar) tar xvpf ${i##*/} ;; - gz|tgz) tar xvpzf ${i##*/} ;; - bz2|tbz) tar xvpjf ${i##*/} ;; - xz|txz) tar xvpJf ${i##*/} ;; - esac + false && download_sources + url=($url) + for i in `seq 0 $((${#url[@]} - 1))` ; do + j=${url[$i]%%#*} ; k=`[[ ${url[$i]} =~ \# ]] && echo ${url[$i]#*#}` + if [ ! -f ${j##*/} ] ; then wget $j + verify_signature $j "${verify[$i]}" "${digest[$i]}" "$k" ; fi done mkdir timezone-2016f tar xvpzf tzcode2016f.tar.gz -C timezone-2016f @@ -229,25 +48,9 @@ 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 + apply_patches 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 - if [ -f config.log ] ; then - rm -rf config.cache config.log - fi if [ -x configure ] ; then ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --libdir='${exec_prefix}'/$libdir --infodir='${prefix}'/share/info \ @@ -264,12 +67,7 @@ done fi if [ $opt_package -eq 1 ] ; then - if [ `id -u` -ne 0 ] ; then - read -p "Do you want to package as root? [y/N] " ans - if [ "x$ans" == "xY" -o "x$ans" == "xy" ] ; then - cd $W ; /bin/su -c "$0 package" ; exit - fi - fi + root_priv if [ -d $P ] ; then rm -rf $P ; fi ; mkdir -p $P if [ -d $C ] ; then rm -rf $C ; fi ; mkdir -p $C touch $W/i.st ; sleep 1 @@ -292,25 +90,9 @@ find $P ! -type l -newer i.st ! -newer i.et \ -exec touch -t `date '+%m%d0900'` {} \; compress - for i in `seq 0 $((${#DOCS[@]} - 1))` ; do - for j in ${DOCS[$i]} ; do - for k in ${S[$i]}/$j ; do - install2 $k $docdir/${src[$i]}/${k#${S[$i]}/} - touch -r $k $docdir/${src[$i]}/${k#${S[$i]}/} - gzip_one $docdir/${src[$i]}/${k#${S[$i]}/} - done - done - if [ $i -eq 0 ] ; then - install $myname $docdir/$src - touch -t `date '+%m%d0900'` $docdir/$src/$myname - gzip_one $docdir/$src/$myname - else - ln $docdir/$src/$myname.gz $docdir/${src[$i]} - fi - ( cd $docdir ; find ${src[$i]} -type d -exec touch -r $W/{} {} \; ) - done + setup_docdir touch -t `date '+%m%d0900'` $docdir/$src - convert + convert_links prune_symlink $P/usr/share cat <<- "EOF" >> $P/install/doinst.sh @@ -336,6 +118,5 @@ tar rvpf $pkg.tar -C $P install/doinst.sh touch -t `date '+%m%d0900'` $pkg.tar ; xz $pkg.tar ; touch $pkg.tar.xz mv $pkg.tar.xz $pkg.txz - read -p "Do you want to keep work files? [y/N] " ans - if [ "x$ans" != "xY" -a "x$ans" != "xy" ] ; then rm -rf $P $C i.[se]t ; fi + cleanup fi --- plamo/00_base/old/traceroute-20160121/PlamoBuild.traceroute-2.0.18 2016-01-21 20:26:50.000000000 +0900 +++ plamo/00_base/traceroute/PlamoBuild.traceroute-2.0.18 2017-05-02 12:36:06.000000000 +0900 @@ -2,214 +2,45 @@ ###################################################################### url="http://downloads.sourceforge.net/traceroute/traceroute-2.0.18.tar.gz" +verify= +digest= +commitid= pkgbase=traceroute vers=2.0.18 arch=`uname -m` -build=P2 +build=P3 src=$pkgbase-$vers +patchfiles="" OPT_CONFIG="" DOCS="COPYING.LIB CREDITS ChangeLog COPYING VERSION TODO README" +template=20170415 +tmplurl=ftp://plamo.linet.gr.jp/pub/Plamo-src/admin ###################################################################### -fscheck() { - PANGRAM="The quick brown fox jumps over the lazy dog." - echo -n "Checking for the filesystem ... " - mkdir pangram ; ( cd pangram ; touch $PANGRAM ) - mv pangram pangram~ ; mkdir pangram ; touch -r pangram~ pangram - tar cpf pangram.tar pangram ; rmdir pangram ; mv pangram~ pangram - for i in $PANGRAM ; do tar rpf pangram.tar pangram/$i ; done - touch -t `date '+%m%d0900'` pangram.tar ; gzip pangram.tar - touch pangram.tar.gz ; mv pangram.tar.gz pangram1.tgz - tar cpf pangram.tar pangram - touch -t `date '+%m%d0900'` pangram.tar ; gzip pangram.tar - touch pangram.tar.gz ; mv pangram.tar.gz pangram2.tgz - if cmp -s pangram1.tgz pangram2.tgz ; then - echo "OK" - rm -rf pangram pangram1.tgz pangram2.tgz - else - echo "NG" - cat <<- "EOF" - Hmm, packaging may not be done properly on this filesystem. - Would you please try again on a default filesystem, thanks! - - Happy packaging!! - - Quitting... - EOF - exit - fi -} - -install2() { - install -d ${2%/*} ; install -m 644 $1 $2 -} - -strip_bindir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - shopt -s nullglob - cd $1 - for i in * ; do - echo "$i" - if [ -h $i ] ; then continue ; fi - if [ -n "`file $i | grep "not stripped"`" ] ; then - echo "stripping -p $i" - strip -p $i - fi - done - ) fi -} - -strip_libdir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - shopt -s nullglob - cd $1 - for i in *.so *.so.* *.a ; do - echo "$i" - if [ -h $i ] ; then continue ; fi - if [ -n "`nm -a $i | grep " a "`" ] ; then - if [ $i != ${i%.a} ] ; then - echo -n "ranlib and " - touch -r $i $i.mt ; ranlib $i ; touch -r $i.mt $i ; rm $i.mt - fi - echo "stripping -gp $i" - strip -gp $i - fi - done - ) fi -} - -gzip_dir() { - echo "compressing in $1" - if [ -d $1 ] ; then ( - cd $1 - files=`ls -f --indicator-style=none | sed '/^\.\{1,2\}$/d'` - for i in $files ; do - echo "$i" - if [ ! -f $i -a ! -h $i -o $i != ${i%.gz} ] ; then continue ; fi - lnks=`ls -l $i | awk '{print $2}'` - if [ $lnks -gt 1 ] ; then - inum=`ls -i $i | awk '{print $1}'` - for j in `find . -maxdepth 1 -inum $inum` ; do - if [ ${j#./} == $i ] ; then - gzip -f $i - else - rm -f ${j#./} ; ln $i.gz ${j#./}.gz - fi - done - elif [ -h $i ] ; then - target=`readlink $i` ; rm -f $i ; ln -s $target.gz $i.gz - else - gzip $i - fi - done - for i in $files ; do mv ${i%.gz}.gz $C ; done - for i in $files ; do mv $C/${i%.gz}.gz . ; done - ) fi -} - -gzip_one() { - gzip $1 ; mv $1.gz $C ; mv $C/${1##*/}.gz ${1%/*} -} - -compress() { - for i in {$P,$P/usr}/{sbin,bin} ; do strip_bindir $i ; done - for i in {$P,$P/usr}/$libdir ; do strip_libdir $i ; done - if [ -f $infodir/dir ] ; then rm -f $infodir/dir ; fi - gzip_dir $infodir - for i in `seq 9` n ; do gzip_dir $mandir/man$i ; done -} - -prune_symlink() { - echo "pruning symlink in $1" - if [ -d $1 ] ; then ( - cd $P - rm -f /tmp/iNsT-a.$$ ; touch /tmp/iNsT-a.$$ - for i in `find ${1#$P/} -type l` ; do - target=`readlink $i` - echo "$i -> $target" - echo $i$'\n'$target >> /tmp/iNsT-a.$$ - done - COUNT=1 - LINE=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - while [ -n "$LINE" ] ; do - LINKGOESIN=`dirname $LINE` - LINKNAMEIS=`basename $LINE` - COUNT=$(($COUNT + 1)) - LINKPOINTSTO=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - if [ ! -d install ] ; then mkdir install ; fi - cat <<- EOF >> install/doinst.sh - ( cd $LINKGOESIN ; rm -rf $LINKNAMEIS ) - ( cd $LINKGOESIN ; ln -sf $LINKPOINTSTO $LINKNAMEIS ) - EOF - rm -rf $LINE ; touch -t `date '+%m%d0900'` install/doinst.sh $LINE - COUNT=$(($COUNT + 1)) - LINE=`sed -n "${COUNT}p" /tmp/iNsT-a.$$` - done - rm -f /tmp/iNsT-a.$$ - ) fi -} - -convert() { - for i in {$P,$P/usr}/{sbin,bin} ; do prune_symlink $i ; done - for i in {$P,$P/usr}/$libdir ; do prune_symlink $i ; done - prune_symlink $infodir - for i in `seq 9` n ; do prune_symlink $mandir/man$i ; done -} - -fscheck -W=`pwd` -for i in `seq 0 $((${#src[@]} - 1))` ; do - S[$i]=$W/${src[$i]} ; B[$i]=$W/build`test ${#src[@]} -eq 1 || echo $i` -done -P=$W/work ; C=$W/pivot -infodir=$P/usr/share/info -mandir=$P/usr/share/man -docdir=$P/usr/share/doc -myname=`basename $0` -pkg=$pkgbase-$vers-$arch-$build -case $arch in x86_64) libdir=lib64 ;; *) libdir=lib ;; esac -if [ $# -eq 0 ] ; then - opt_download=1 ; opt_config=1 ; opt_build=1 ; opt_package=1 +if [ -f functions ] ; then + source ./functions +elif [ ! -f /usr/share/plamo/functions ] ; then + wget ftp://plamo.linet.gr.jp/pub/Plamo-src/admin/functions + source ./functions else - opt_download=0 ; opt_config=0 ; opt_build=0 ; opt_package=0 - for i in $@ ; do - case $i in - download) opt_download=1 ;; - config) opt_config=1 ;; - build) opt_build=1 ;; - package) opt_package=1 ;; - esac - done + source /usr/share/plamo/functions fi + +fscheck +prepare "$@" if [ $opt_download -eq 1 ] ; then - for i in $url ; do - if [ ! -f ${i##*/} ] ; then wget $i ; fi - done - for i in $url ; do - case ${i##*.} in - tar) tar xvpf ${i##*/} ;; - gz) tar xvpzf ${i##*/} ;; - bz2) tar xvpjf ${i##*/} ;; - esac - done + download_sources fi if [ $opt_config -eq 1 ] ; then 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 + apply_patches for i in `seq 0 $((${#B[@]} - 1))` ; do cd ${B[$i]} - if [ -f Makefile ] ; then - make clean - fi - if [ -f config.log ] ; then - 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 @@ -223,12 +54,7 @@ done fi if [ $opt_p