--- 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/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-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/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-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/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 --- 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-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/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/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/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/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-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/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/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/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-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/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/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-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/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-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/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/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-20160324/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/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-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/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/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/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/01_minimum/aspell.txz/old/aspell-20160615/PlamoBuild.aspell-0.60.6.1 2016-06-15 13:07:08.000000000 +0900 +++ plamo/01_minimum/aspell.txz/aspell/PlamoBuild.aspell-0.60.6.1 2016-09-02 09:42:02.000000000 +0900 @@ -5,8 +5,9 @@ pkgbase=aspell vers=0.60.6.1 arch=`uname -m` -build=P2 +build=P3 src=$pkgbase-$vers +patchfiles="" OPT_CONFIG="" DOCS="TODO README ABOUT-NLS COPYING" ###################################################################### @@ -223,6 +224,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 @@ -261,6 +273,7 @@ fi done sver=`echo $vers | cut -d. -f1-2` + ln -s /usr/$libdir/aspell-$sver/spell $P/usr/bin ln -s /usr/$libdir/aspell-$sver/ispell $P/usr/bin touch $W/i.et cd $W --- plamo/01_minimum/old/autofs-20160616/PlamoBuild.autofs-5.1.1 2016-06-16 12:23:38.000000000 +0900 +++ plamo/01_minimum/autofs/PlamoBuild.autofs-5.1.1 2016-07-17 20:49:52.000000000 +0900 @@ -6,7 +6,7 @@ pkgbase=autofs vers=5.1.1 arch=`uname -m` -build=P2 +build=P3 src=$pkgbase-$vers patchfiles="autofs_init_sleep.patch" OPT_CONFIG="--with-confdir=/etc --without-openldap" @@ -305,6 +305,7 @@ done convert cat <<- "EOF" >> $P/install/doinst.sh + autofs_config() { mv etc/auto$1.new /tmp if [ -f etc/auto$1 ] ; then --- plamo/01_minimum/old/cpio-20160618/PlamoBuild.cpio-2.11 2016-06-18 19:12:11.000000000 +0900 +++ plamo/01_minimum/cpio/PlamoBuild.cpio-2.11 2016-07-10 12:03:44.000000000 +0900 @@ -7,7 +7,7 @@ pkgbase=cpio vers=2.11 arch=`uname -m` -build=P3 +build=P4 src=$pkgbase-$vers patchfiles="cpio-2.11-stdio.in.patch CVE-2014-9112.patch" OPT_CONFIG="" @@ -280,6 +280,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/01_minimum/old/cpufreqd-20160619/PlamoBuild.cpufreqd-2.4.2 2016-06-19 19:02:58.000000000 +0900 +++ plamo/01_minimum/cpufreqd/PlamoBuild.cpufreqd-2.4.2 2016-07-17 12:54:50.000000000 +0900 @@ -5,7 +5,7 @@ pkgbase=cpufreqd vers=2.4.2 arch=`uname -m` -build=P4 +build=P5 src=$pkgbase-$vers patchfiles="" OPT_CONFIG="" @@ -280,6 +280,76 @@ done mv $P/etc/cpufreqd.conf $C mv $C/cpufreqd.conf $P/etc/cpufreqd.conf.new + cat <<- "EOF" > $P/etc/cpufreqd.conf.sample + [General] + pidfile=/var/run/cpufreqd.pid + poll_interval=2 + verbosity=4 + enable_remote=1 + remote_group=root + [/General] + + [sensors_plugin] + sensors_conf=/etc/sensors3.conf + [/sensors_plugin] + + [Profile] + name=On Demand High + minfreq=40% + maxfreq=100% + policy=ondemand + [/Profile] + + [Profile] + name=On Demand Low + minfreq=20% + maxfreq=80% + policy=ondemand + [/Profile] + + [Profile] + name=Performance High + minfreq=100% + maxfreq=100% + policy=performance + [/Profile] + + [Profile] + name=Performance Low + minfreq=80% + maxfreq=80% + policy=performance + [/Profile] + + [Profile] + name=Powersave High + minfreq=70% + maxfreq=70% + policy=powersave + [/Profile] + + [Profile] + name=Powersave Low + minfreq=30% + maxfreq=30% + policy=powersave + [/Profile] + + [Rule] + name=Default Rule + sensor=temp1:0-60 + cpu_interval=0-100 + profile=Performance High + [/Rule] + + [Rule] + name=CPU Too Hot + sensor=temp1:61-100 + cpu_interval=50-100 + profile=On Demand Low + [/Rule] + + EOF install -d $P/etc/rc.d/init.d cat <<- "EOF" > $P/etc/rc.d/init.d/cpufreqd #!/bin/sh @@ -366,7 +436,7 @@ 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 `cd $P ; find usr/$libdir | tail -n+2` - tar rvpf $pkg.tar -C $P etc/cpufreqd.conf.new + tar rvpf $pkg.tar -C $P etc/cpufreqd.conf.{new,sample} tar rvpf $pkg.tar -C $P etc/rc.d/init.d/cpufreqd 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` --- plamo/01_minimum/devel.txz/old/kernel_headers-20160124/PlamoBuild.kernel_headers-4.1.15_plamoRPi2 2016-01-24 09:32:55.000000000 +0900 +++ plamo/01_minimum/devel.txz/kernel_headers/PlamoBuild.kernel_headers-4.1.15_plamoRPi2 2016-02-04 07:41:05.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_headers vers=4.1.15_plamoRPi2 arch=arm -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,7 +232,6 @@ 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 for i in `seq 0 $((${#B[@]} - 1))` ; do cd ${B[$i]} if [ -f Makefile ] ; then --- plamo/01_minimum/devel.txz/old/libc-20160110/PlamoBuild.libc-2.20 2016-01-10 10:04:36.000000000 +0900 +++ plamo/01_minimum/devel.txz/libc/PlamoBuild.libc-2.20 2016-03-14 16:28:14.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=libc vers=2.20 arch=`uname -m` -build=P2 +build=P3 src=glibc-$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/01_minimum/devel.txz/old/bison-20160623/PlamoBuild.bison-3.0.4 2016-06-23 12:53:11.000000000 +0900 +++ plamo/01_minimum/devel.txz/bison/PlamoBuild.bison-3.0.4 2016-08-11 16:10:13.000000000 +0900 @@ -5,7 +5,7 @@ pkgbase=bison vers=3.0.4 arch=`uname -m` -build=P2 +build=P3 src=$pkgbase-$vers patchfiles="" OPT_CONFIG="" @@ -305,7 +305,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/share/locale -name *.mo` - tar rvpf $pkg.tar -C $P `cd $P ; find usr/share/aclocal -name *.mo` + tar rvpf $pkg.tar -C $P `cd $P ; find usr/share/aclocal | tail -n+2` tar rvpf $pkg.tar -C $P usr/share/bison 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` --- plamo/01_minimum/devel.txz/old/cloog-20160624/PlamoBuild.cloog-0.17.0 2016-06-24 12:00:24.000000000 +0900 +++ plamo/01_minimum/devel.txz/cloog/PlamoBuild.cloog-0.17.0 2016-09-02 18:30:13.000000000 +0900 @@ -5,7 +5,7 @@ pkgbase=cloog vers=0.17.0 arch=`uname -m` -build=P2 +build=P3 src=$pkgbase-$vers patchfiles="" OPT_CONFIG="" @@ -241,9 +241,9 @@ < test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"; \ < $(INSTALL_DATA) $(srcdir)/isl.py $(DESTDIR)$(libdir)/$$libisl-gdb.py; esac --- - > $(DESTDIR)/usr/share/gdb/auto-load/$$libisl-gdb.py; \ - > test -z "/usr/share/gdb/auto-load" || $(MKDIR_P) "$(DESTDIR)/usr/share/gdb/auto-load"; \ - > $(INSTALL_DATA) $(srcdir)/isl.py $(DESTDIR)/usr/share/gdb/auto-load/$$libisl-gdb.py; esac + > $(DESTDIR)/usr/share/gdb/auto-load$(libdir)/$$libisl-gdb.py; \ + > test -z "/usr/share/gdb/auto-load$(libdir)" || $(MKDIR_P) "$(DESTDIR)/usr/share/gdb/auto-load$(libdir)"; \ + > $(INSTALL_DATA) $(srcdir)/isl.py $(DESTDIR)/usr/share/gdb/auto-load$(libdir)/$$libisl-gdb.py; esac EOF for i in `seq 0 $((${#B[@]} - 1))` ; do cd ${B[$i]} @@ -311,7 +311,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/gdb/auto-load | tail -n+2` + tar rvpf $pkg.tar -C $P `cd $P ; find usr/share/gdb/auto-load/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 --- plamo/01_minimum/devel.txz/old/g++-20160111/PlamoBuild.g++-4.8.4 2016-01-11 22:18:25.000000000 +0900 +++ plamo/01_minimum/devel.txz/g++/PlamoBuild.g++-4.8.5 2016-01-28 13:42:18.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=g++ -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/01_minimum/devel.txz/old/gcc-20160111/PlamoBuild.gcc-4.8.4 2016-01-11 22:54:27.000000000 +0900 +++ plamo/01_minimum/devel.txz/gcc/PlamoBuild.gcc-4.8.5 2016-01-28 13:21:21.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=gcc -vers=4.8.4 +vers=4.8.5 arch=`uname -m` -build=P3 +build=P2 src=$pkgbase-$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/01_minimum/devel.txz/old/gettext-20160702/PlamoBuild.gettext-0.19.7 2016-07-02 03:16:22.000000000 +0900 +++ plamo/01_minimum/devel.txz/gettext/PlamoBuild.gettext-0.19.7 2016-08-24 20:36:49.000000000 +0900 @@ -5,7 +5,7 @@ pkgbase=gettext vers=0.19.7 arch=`uname -m` -build=P2 +build=P4 src=$pkgbase-$vers patchfiles="" OPT_CONFIG="" @@ -237,6 +237,8 @@ cd $B cp -p gettext-tools/src/Makefile.in{,.orig} sed -i 's@$(GCJ)@LANG=C &@g' gettext-tools/src/Makefile.in + export EMACS=`( which emacs || which emacs_mini ) 2> /dev/null \ + | sed 's@.*/@@'` for i in `seq 0 $((${#B[@]} - 1))` ; do cd ${B[$i]} if [ -f Makefile ] ; then @@ -308,10 +310,13 @@ 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/$libdir | tail -n+2` + tar rvpf $pkg.tar -C $P `cd $P ; find usr/$libdir -maxdepth 1 | 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/gettext 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/emacs/site-lisp | tail -n+2` + tar rvpf $pkg.tar -C $P `cd $P ; find usr/share/aclocal | tail -n+2` + tar rvpf $pkg.tar -C $P usr/share/$src 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/man3 | tail -n+2` --- plamo/01_minimum/devel.txz/old/kernel_headers-20160204/PlamoBuild.kernel_headers-4.1.15_plamoRPi2 2016-02-04 07:41:05.000000000 +0900 +++ plamo/01_minimum/devel.txz/kernel_headers/PlamoBuild.kernel_headers-4.1.15_plamoRPi2 2016-02-19 08:30:28.000000000 +0900 @@ -13,7 +13,7 @@ pkgbase=kernel_headers vers=4.1.15_plamoRPi2 arch=arm -build=P2 +build=P3 src=linux OPT_CONFIG="" DOCS="" --- plamo/01_minimum/devel.txz/old/libc-20160314/PlamoBuild.libc-2.20 2016-03-14 16:28:14.000000000 +0900 +++ plamo/01_minimum/devel.txz/libc/PlamoBuild.libc-2.20 2016-06-07 07:55:19.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=libc vers=2.20 arch=`uname -m` -build=P3 +build=P4 src=glibc-$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 --- plamo/01_minimum/old/gdbm-20160712/PlamoBuild.gdbm-1.10 2016-07-12 13:30:33.000000000 +0900 +++ plamo/01_minimum/gdbm/PlamoBuild.gdbm-1.10 2016-09-03 23:08:19.000000000 +0900 @@ -5,10 +5,10 @@ pkgbase=gdbm vers=1.10 arch=`uname -m` -build=P2 +build=P3 src=$pkgbase-$vers patchfiles="" -OPT_CONFIG="" +OPT_CONFIG="--enable-libgdbm-compat" DOCS="NEWS README THANKS AUTHORS INSTALL ABOUT-NLS ChangeLog COPYING NOTE-WARNING" ###################################################################### --- plamo/01_minimum/old/get_pkginfo-20160712/PlamoBuild.get_pkginfo-git_20160217 2016-07-12 14:18:25.000000000 +0900 +++ plamo/01_minimum/get_pkginfo/PlamoBuild.get_pkginfo-git_20160222 2016-07-19 07:46:16.000000000 +0900 @@ -4,9 +4,9 @@ url="https://github.com/plamolinux/get_pkginfo.git ftp://plamo.linet.gr.jp/pub/Plamo-src.new/plamo/01_minimum/get_pkginfo/gitlog2changelog.py" pkgbase=get_pkginfo -vers=git_20160217 +vers=git_20160222 arch=noarch -build=P3 +build=P1 src=$pkgbase patchfiles="" OPT_CONFIG="" @@ -226,7 +226,7 @@ bz2|tbz) tar xvpjf ${i##*/} ;; xz|txz) tar xvpJf ${i##*/} ;; git) ( cd `basename ${i##*/} .git` - git checkout origin/master ; git reset --hard a8e552a + git checkout origin/master ; git reset --hard facec2d git set-file-times ; TZ=UTC ../gitlog2changelog.py) ;; esac done --- plamo/01_minimum/gnupg_tls.txz/old/gnupg-20160714/PlamoBuild.gnupg-2.0.29 2016-07-14 22:53:35.000000000 +0900 +++ plamo/01_minimum/gnupg_tls.txz/gnupg/PlamoBuild.gnupg-2.0.30 2016-09-04 23:16:19.000000000 +0900 @@ -1,9 +1,9 @@ #!/bin/sh ###################################################################### -url="https://www.gnupg.org/ftp/gcrypt/gnupg/gnupg-2.0.29.tar.bz2" +url="https://www.gnupg.org/ftp/gcrypt/gnupg/gnupg-2.0.30.tar.bz2" pkgbase=gnupg -vers=2.0.29 +vers=2.0.30 arch=`uname -m` build=P2 src=$pkgbase-$vers @@ -273,6 +273,7 @@ make install DESTDIR=$P fi done + ln -s gpg2 $P/usr/bin/gpg touch $W/i.et cd $W find $P ! -type l -newer i.st ! -newer i.et \ @@ -312,6 +313,7 @@ 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/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/01_minimum/gnupg_tls.txz/old/libgcrypt-20160715/PlamoBuild.libgcrypt-1.5.4 2016-07-15 10:26:39.000000000 +0900 +++ plamo/01_minimum/gnupg_tls.txz/libgcrypt/PlamoBuild.libgcrypt-1.5.6 2016-09-06 14:56:54.000000000 +0900 @@ -1,20 +1,19 @@ #!/bin/sh ###################################################################### -url="https://www.gnupg.org/ftp/gcrypt/libgcrypt/libgcrypt-1.5.4.tar.bz2 - ftp://plamo.linet.gr.jp/pub/Plamo-src.new/plamo/01_minimum/gnupg_tls.txz/libgcrypt/CVE-2014-3591.patch.gz +url="https://www.gnupg.org/ftp/gcrypt/libgcrypt/libgcrypt-1.5.6.tar.bz2 ftp://plamo.linet.gr.jp/pub/Plamo-src.new/plamo/01_minimum/gnupg_tls.txz/libgcrypt/CVE-2015-0837-1.patch.gz ftp://plamo.linet.gr.jp/pub/Plamo-src.new/plamo/01_minimum/gnupg_tls.txz/libgcrypt/CVE-2015-0837-2.patch.gz ftp://plamo.linet.gr.jp/pub/Plamo-src.new/plamo/01_minimum/gnupg_tls.txz/libgcrypt/CVE-2015-0837-3.patch.gz" pkgbase=libgcrypt -vers=1.5.4 +vers=1.5.6 arch=`uname -m` -build=P3 +build=P2 src=$pkgbase-$vers -patchfiles="`echo CVE-{2014-3591,2015-0837-{1,2,3}}.patch.gz`" +patchfiles="`echo CVE-2015-0837-{1,2,3}.patch.gz`" OPT_CONFIG="--with-capabilities" -DOCS="NEWS INSTALL COPYING COPYING.LIB AUTHORS ChangeLog THANKS - README.GIT README ChangeLog-2011 TODO" +DOCS="README ChangeLog-2011 COPYING ChangeLog TODO NEWS README.GIT + COPYING.LIB THANKS AUTHORS INSTALL" ###################################################################### fscheck() { --- plamo/01_minimum/old/keyutils-20160720/PlamoBuild.keyutils-1.5.1 2016-07-20 00:46:34.000000000 +0900 +++ plamo/01_minimum/keyutils/PlamoBuild.keyutils-1.5.1 2016-08-01 17:17:50.000000000 +0900 @@ -5,7 +5,7 @@ pkgbase=keyutils vers=1.5.1 arch=`uname -m` -build=P2 +build=P3 src=$pkgbase-$vers patchfiles="" OPT_CONFIG="" @@ -301,8 +301,8 @@ convert 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 lib | tail -n+2` - tar rvpf $pkg.tar -C $P `cd $P ; find usr/lib | 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/keyutils tar rvpf $pkg.tar -C $P etc/request-key.conf --- plamo/01_minimum/old/mcelog-20160911/PlamoBuild.mcelog-git_20160907 2016-09-11 19:16:07.000000000 +0900 +++ plamo/01_minimum/mcelog/PlamoBuild.mcelog-git_20160907 2016-10-13 16:30:39.000000000 +0900 @@ -6,7 +6,7 @@ pkgbase=mcelog vers=git_20160907 arch=`uname -m` -build=P1 +build=P2 src=$pkgbase patchfiles="" OPT_CONFIG="" @@ -235,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 mcelog.init{,.orig} cat <<- "EOF" | patch mcelog.init @@ -254,17 +265,6 @@ EOF 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/01_minimum/network.txz/old/bind-20160806/PlamoBuild.bind-9.9.9_P2 2016-08-06 07:20:47.000000000 +0900 +++ plamo/01_minimum/network.txz/bind/PlamoBuild.bind-9.9.9_P2 2016-08-09 16:37:24.000000000 +0900 @@ -6,7 +6,7 @@ pkgbase=bind vers=9.9.9_P2 arch=`uname -m` -build=P2 +build=P3 src=$pkgbase-9.9.9-P2 patchfiles="" OPT_CONFIG="--with-libxml2=no --with-libtool" @@ -412,7 +412,7 @@ for i in master.localhost localhost.rev ; do named_config $i done - mv var/named/named.conf.new /tmp + mv var/named/named.root.new /tmp if [ -f var/named/named.root ] ; then if diff -q var/named/named.root{.internic,} > /dev/null 2>&1 ; then mv var/named/named.root{,.old} --- plamo/01_minimum/network.txz/old/bind-20160809/PlamoBuild.bind-9.9.9_P2 2016-08-09 16:37:24.000000000 +0900 +++ plamo/01_minimum/network.txz/bind/PlamoBuild.bind-9.9.9_P2 2016-09-07 23:52:22.000000000 +0900 @@ -6,7 +6,7 @@ pkgbase=bind vers=9.9.9_P2 arch=`uname -m` -build=P3 +build=P4 src=$pkgbase-9.9.9-P2 patchfiles="" OPT_CONFIG="--with-libxml2=no --with-libtool" @@ -414,10 +414,11 @@ done mv var/named/named.root.new /tmp if [ -f var/named/named.root ] ; then - if diff -q var/named/named.root{.internic,} > /dev/null 2>&1 ; then - mv var/named/named.root{,.old} + if diff -q var/named/named.root.internic var/named/named.root \ + > /dev/null 2>&1 ; then + mv var/named/named.root var/named/named.root.old mv /tmp/named.root.new var/named/named.root - cp -p var/named/named.root{,.internic} + cp -p var/named/named.root var/named/named.root.internic echo "New root hint file has been installed." echo "Old one has been moved to /var/named/named.root.old." else @@ -427,7 +428,7 @@ fi else mv /tmp/named.root.new var/named/named.root - cp -p var/named/named.root{,.internic} + cp -p var/named/named.root var/named/named.root.internic echo "New root hint file has been installed." fi EOF --- plamo/01_minimum/network.txz/old/curl-20160806/PlamoBuild.curl-7.49.1 2016-08-06 13:24:23.000000000 +0900 +++ plamo/01_minimum/network.txz/curl/PlamoBuild.curl-7.50.1 2016-09-06 20:58:44.000000000 +0900 @@ -1,9 +1,9 @@ #!/bin/sh ###################################################################### -url="http://curl.haxx.se/download/curl-7.49.1.tar.bz2" +url="http://curl.haxx.se/download/curl-7.50.1.tar.bz2" pkgbase=curl -vers=7.49.1 +vers=7.50.1 arch=`uname -m` build=P2 src=$pkgbase-$vers --- plamo/01_minimum/network.txz/old/ntp-20160928/PlamoBuild.ntp-4.2.8p7 2016-09-28 13:52:23.000000000 +0900 +++ plamo/01_minimum/network.txz/ntp/PlamoBuild.ntp-4.2.8p8 2016-09-28 16:36:03.000000000 +0900 @@ -1,18 +1,18 @@ #!/bin/sh ###################################################################### -url="http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-4.2.8p7.tar.gz" +url="http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-4.2.8p8.tar.gz" pkgbase=ntp -vers=4.2.8p7 +vers=4.2.8p8 arch=`uname -m` -build=P2 +build=P1 src=$pkgbase-$vers patchfiles="" OPT_CONFIG="" -DOCS="README.leapsmear ChangeLog NEWS CommitLog README readme.y2kfixes - COPYRIGHT README.hackers CommitLog-4.1.0 WHERE-TO-START - README.patches TODO README.refclocks INSTALL README.pullrequests - README.versions README.bk NOTES.y2kfixes" +DOCS="README.hackers README.bk NEWS WHERE-TO-START README.leapsmear + readme.y2kfixes CommitLog-4.1.0 README NOTES.y2kfixes CommitLog + COPYRIGHT INSTALL README.refclocks TODO ChangeLog README.versions + README.patches README.pullrequests" ###################################################################### fscheck() { @@ -347,12 +347,14 @@ done mv $docdir/sntp $docdir/$src mv $docdir/ntp $docdir/$src/html - mv $docdir/$src/{sntp,{WHERE-TO-START,README.patches,TODO}.gz} $C - mv $docdir/$src/{{README.refclocks,INSTALL,README.pullrequests}.gz,html} $C - mv $docdir/$src/{README.versions,README.bk,NOTES.y2kfixes,$myname}.gz $C - mv $C/{sntp,{WHERE-TO-START,README.patches,TODO}.gz} $docdir/$src - mv $C/{{README.refclocks,INSTALL,README.pullrequests}.gz,html} $docdir/$src - mv $C/{README.versions,README.bk,NOTES.y2kfixes,$myname}.gz $docdir/$src + mv $docdir/$src/{sntp,README.gz,html,{NOTES.y2kfixes,CommitLog}.gz} $C + mv $docdir/$src/{COPYRIGHT,INSTALL,README.refclocks,TODO,ChangeLog}.gz $C + mv $docdir/$src/{README.versions,README.patches,README.pullrequests}.gz $C + mv $docdir/$src/$myname.gz $C + mv $C/{sntp,README.gz,html,{NOTES.y2kfixes,CommitLog}.gz} $docdir/$src + mv $C/{COPYRIGHT,INSTALL,README.refclocks,TODO,ChangeLog}.gz $docdir/$src + mv $C/{README.versions,README.patches,README.pullrequests}.gz $docdir/$src + mv $C/$myname.gz $docdir/$src touch -r $S $docdir/$src convert install -d $P/install --- plamo/01_minimum/network.txz/old/bind-20160907/PlamoBuild.bind-9.9.9_P2 2016-09-07 23:52:22.000000000 +0900 +++ plamo/01_minimum/network.txz/bind/PlamoBuild.bind-9.9.9_P3 2016-10-01 07:53:30.000000000 +0900 @@ -1,13 +1,13 @@ #!/bin/sh ###################################################################### -url="http://ftp.isc.org/isc/bind/9.9.9-P2/bind-9.9.9-P2.tar.gz +url="http://ftp.isc.org/isc/bind/9.9.9-P3/bind-9.9.9-P3.tar.gz http://www.internic.net/domain/named.root" pkgbase=bind -vers=9.9.9_P2 +vers=9.9.9_P3 arch=`uname -m` -build=P4 -src=$pkgbase-9.9.9-P2 +build=P2 +src=$pkgbase-9.9.9-P3 patchfiles="" OPT_CONFIG="--with-libxml2=no --with-libtool" DOCS="CHANGES COPYRIGHT FAQ HISTORY README" --- plamo/01_minimum/network.txz/old/curl-20160906/PlamoBuild.curl-7.50.1 2016-09-06 20:58:44.000000000 +0900 +++ plamo/01_minimum/network.txz/curl/PlamoBuild.curl-7.50.3 2016-09-24 08:32:13.000000000 +0900 @@ -1,9 +1,9 @@ #!/bin/sh ###################################################################### -url="http://curl.haxx.se/download/curl-7.50.1.tar.bz2" +url="http://curl.haxx.se/download/curl-7.50.3.tar.bz2" pkgbase=curl -vers=7.50.1 +vers=7.50.3 arch=`uname -m` build=P2 src=$pkgbase-$vers @@ -11,12 +11,12 @@ OPT_CONFIG="--disable-ldap --disable-rtsp --with-gssapi-includes=/usr/heimdal/include --without-librtmp" DOCS="`echo docs/{VERSIONS,MAIL-ETIQUETTE,HTTP-COOKIES.md,BINDINGS}` - `echo docs/{RELEASE-PROCEDURE,BUGS,CODE_STYLE.md,KNOWN_BUGS}` - `echo docs/{SSLCERTS,LICENSE-MIXING,HTTP2.md,README.win32}` - `echo docs/{INTERNALS,THANKS,README.netware,TheArtOfHttpScripting}` - `echo docs/{INSTALL.devcpp,SECURITY,CHECKSRC.md,FAQ,INSTALL}` - `echo docs/{ROADMAP.md,FEATURES,MANUAL,CODE_OF_CONDUCT.md}` - `echo docs/{RESOURCES,CONTRIBUTE,HISTORY,TODO,SSL-PROBLEMS}` + `echo docs/{RELEASE-PROCEDURE,BUGS,SSL-PROBLEMS.md,CODE_STYLE.md}` + `echo docs/{KNOWN_BUGS,HTTP2.md,README.win32,INTERNALS.md}` + `echo docs/{LICENSE-MIXING.md,THANKS,README.netware,TheArtOfHttpScripting}` + `echo docs/{INSTALL.devcpp,CHECKSRC.md,FAQ,INSTALL,ROADMAP.md,FEATURES}` + `echo docs/{MANUAL,CODE_OF_CONDUCT.md,RESOURCES,SECURITY.md,TODO}` + `echo docs/{CONTRIBUTE.md,HISTORY.md,SSLCERTS.md}` README CHANGES RELEASE-NOTES COPYING" ###################################################################### --- plamo/01_minimum/network.txz/old/cyrus_sasl-20160806/PlamoBuild.cyrus_sasl-2.1.23 2016-08-06 16:57:10.000000000 +0900 +++ plamo/01_minimum/network.txz/cyrus_sasl/PlamoBuild.cyrus_sasl-2.1.26 2016-09-25 07:18:16.000000000 +0900 @@ -1,18 +1,16 @@ #!/bin/sh ###################################################################### -url="ftp://ftp.cyrusimap.org/cyrus-sasl/cyrus-sasl-2.1.23.tar.gz - ftp://plamo.linet.gr.jp/pub/Plamo-src.new/plamo/01_minimum/network.txz/cyrus_sasl/cyrus-sasl-blfs.patch.gz - ftp://plamo.linet.gr.jp/pub/Plamo-src.new/plamo/01_minimum/network.txz/cyrus_sasl/cyrus-sasl-64bit-plugindir.patch.gz" +url="ftp://ftp.cyrusimap.org/cyrus-sasl/cyrus-sasl-2.1.26.tar.gz" pkgbase=cyrus_sasl -vers=2.1.23 +vers=2.1.26 arch=`uname -m` -build=P4 +build=P1 src=cyrus-sasl-$vers -patchfiles="cyrus-sasl-blfs.patch.gz cyrus-sasl-64bit-plugindir.patch.gz" +patchfiles="" OPT_CONFIG="--with-dbpath=/var/lib/sasl/sasldb2 --with-saslauthd=/var/run/saslauthd" -DOCS="README AUTHORS COPYING ChangeLog INSTALL NEWS" +DOCS="ChangeLog INSTALL AUTHORS INSTALL.TXT COPYING NEWS README" ###################################################################### fscheck() { @@ -236,6 +234,10 @@ esac done done + cp -p Makefile.in{,.orig} + sed -i 's@$(prefix)/lib@$(libdir)@g' Makefile.in + cp -p plugins/Makefile.in{,.orig} + sed -i 's@$(prefix)/lib/sasl2@$(plugindir)@g' plugins/Makefile.in for i in `seq 0 $((${#B[@]} - 1))` ; do cd ${B[$i]} if [ -f Makefile ] ; then @@ -348,7 +350,10 @@ convert touch -t `date '+%m%d0900'` $P/usr/$libdir/sasl2 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 -maxdepth 1 | tail -n+2` + tar rvpf $pkg.tar -C $P \ + `cd $P ; find usr/$libdir -maxdepth 1 -name libsasl2.*` + tar rvpf $pkg.tar -C $P usr/$libdir/sasl2 + tar rvpf $pkg.tar -C $P `cd $P ; find usr/$libdir/pkgconfig | tail -n+2` tar rvpf $pkg.tar -C $P usr/include/sasl tar rvpf $pkg.tar -C $P etc/sasl2 tar rvpf $pkg.tar -C $P etc/rc.d/init.d/saslauthd --- plamo/01_minimum/network.txz/old/dnsmasq-20160806/PlamoBuild.dnsmasq-2.66 2016-08-06 18:26:45.000000000 +0900 +++ plamo/01_minimum/network.txz/dnsmasq/PlamoBuild.dnsmasq-2.76 2016-09-25 07:54:28.000000000 +0900 @@ -1,17 +1,16 @@ #!/bin/sh ###################################################################### -url="http://www.thekelleys.org.uk/dnsmasq/dnsmasq-2.66.tar.gz - ftp://plamo.linet.gr.jp/pub/Plamo-src.new/plamo/01_minimum/network.txz/dnsmasq/cve-2015-3294.patch.gz" +url="http://www.thekelleys.org.uk/dnsmasq/dnsmasq-2.76.tar.gz" pkgbase=dnsmasq -vers=2.66 +vers=2.76 arch=`uname -m` -build=P3 +build=P1 src=$pkgbase-$vers -patchfiles="cve-2015-3294.patch.gz" +patchfiles="" OPT_CONFIG="" -DOCS="CHANGELOG CHANGELOG.archive COPYING COPYING-v3 FAQ VERSION - dnsmasq.conf.example doc.html setup.html" +DOCS="FAQ COPYING setup.html CHANGELOG COPYING-v3 CHANGELOG.archive + doc.html" ###################################################################### fscheck() { @@ -271,7 +270,7 @@ for i in `seq 0 $((${#B[@]} - 1))` ; do cd ${B[$i]} if [ -f Makefile ] ; then - make install-i18n PREFIX=/usr DESTDIR=$P + make install-i18n DESTDIR=$P PREFIX=/usr fi done install -d $P/etc --- plamo/01_minimum/network.txz/old/ethtool-20160923/PlamoBuild.ethtool-3.10 2016-09-23 15:47:42.000000000 +0900 +++ plamo/01_minimum/network.txz/ethtool/PlamoBuild.ethtool-4.6 2016-09-23 16:36:42.000000000 +0900 @@ -1,15 +1,15 @@ #!/bin/sh ###################################################################### -url="https://www.kernel.org/pub/software/network/ethtool/ethtool-3.10.tar.gz" +url="https://www.kernel.org/pub/software/network/ethtool/ethtool-4.6.tar.xz" pkgbase=ethtool -vers=3.10 +vers=4.6 arch=`uname -m` -build=P2 +build=P1 src=$pkgbase-$vers patchfiles="" OPT_CONFIG="" -DOCS="README AUTHORS COPYING ChangeLog INSTALL NEWS LICENSE" +DOCS="AUTHORS NEWS INSTALL COPYING README ChangeLog LICENSE" ###################################################################### fscheck() { --- plamo/01_minimum/network.txz/old/hostapd-20160920/PlamoBuild.hostapd-2.0 2016-09-20 15:52:27.000000000 +0900 +++ plamo/01_minimum/network.txz/hostapd/PlamoBuild.hostapd-2.5 2016-10-01 20:43:06.000000000 +0900 @@ -1,15 +1,15 @@ #!/bin/sh ###################################################################### -url="http://hostap.epitest.fi/releases/hostapd-2.0.tar.gz" +url="http://hostap.epitest.fi/releases/hostapd-2.5.tar.gz" pkgbase=hostapd -vers=2.0 +vers=2.5 arch=`uname -m` -build=P2 +build=P1 src=$pkgbase-$vers patchfiles="" OPT_CONFIG="" -DOCS="COPYING README +DOCS="CONTRIBUTIONS COPYING README `echo hostapd/{ChangeLog,README{,-WPS},{eap_testing,hlr_auc_gw}.txt}`" ###################################################################### @@ -235,28 +235,24 @@ done done cd $B - cp -p hostapd/Makefile{,.orig} - sed 's@/local@@g' hostapd/Makefile.orig \ - | sed 's@\@sbin@g' > hostapd/Makefile cp -p hostapd/{defconfig,.config} cat <<- "EOF" | patch hostapd/.config - 10a11 - > CFLAGS += -I/usr/include/libnl3 - 16c17 + 16c16 < #CONFIG_DRIVER_WIRED=y --- > CONFIG_DRIVER_WIRED=y - 106c107 + 31c31 + < #CONFIG_LIBNL32=y + --- + > CONFIG_LIBNL32=y + 114c114 < #CONFIG_WPS=y --- > CONFIG_WPS=y - 155c156 + 164c164 < #CONFIG_DEBUG_FILE=y --- > CONFIG_DEBUG_FILE=y - 269a271,272 - > - > CONFIG_LIBNL32=y EOF for i in `seq 0 $((${#B[@]} - 1))` ; do cd ${B[$i]}/hostapd @@ -277,7 +273,7 @@ for i in `seq 0 $((${#B[@]} - 1))` ; do cd ${B[$i]}/hostapd if [ -f Makefile ] ; then - make + make BINDIR=/usr/sbin fi done fi @@ -294,13 +290,37 @@ for i in `seq 0 $((${#B[@]} - 1))` ; do cd ${B[$i]}/hostapd if [ -f Makefile ] ; then - make install DESTDIR=$P + make install DESTDIR=$P BINDIR=/usr/sbin fi done install -d $mandir/man1 install -m 644 $B/hostapd/hostapd_cli.1 $mandir/man1 install -d $mandir/man8 install -m 644 $B/hostapd/hostapd.8 $mandir/man8 + install -d $P/etc + cat <<- "EOF" > $P/etc/hostapd.conf.new + interface=wlan0 + ctrl_interface=/var/run/hostapd + ctrl_interface_group=wheel + ssid="replace SSID" + country_code=JP + ieee80211d=1 + hw_mode=g + macaddr_acl=0 + accept_mac_file=/etc/hostapd.accept + deny_mac_file=/etc/hostapd.deny + auth_algs=1 + wpa=2 + wpa_psk_file=/etc/hostapd.wpa_psk + wpa_key_mgmt=WPA-PSK + rsn_pairwise=CCMP + EOF + install -m 644 $B/hostapd/hostapd.accept $P/etc/hostapd.accept.new + sed -i '/^00/s/^/#/' $P/etc/hostapd.accept.new + install -m 644 $B/hostapd/hostapd.deny $P/etc/hostapd.deny.new + sed -i '/^00/s/^/#/' $P/etc/hostapd.deny.new + install -m 644 $B/hostapd/hostapd.wpa_psk $P/etc/hostapd.wpa_psk.new + sed -i '/^00/s/^/#/' $P/etc/hostapd.wpa_psk.new install -d $P/etc/rc.d/init.d cat <<- "EOF" > $P/etc/rc.d/init.d/hostapd #!/bin/sh @@ -336,48 +356,6 @@ exit 0 EOF chmod 644 $P/etc/rc.d/init.d/hostapd - cat <<- "EOF" > $P/etc/hostapd.conf.new - interface=wlan0 - ctrl_interface=/var/run/hostapd - ctrl_interface_group=wheel - ssid="replace SSID" - country_code=JP - ieee80211d=1 - hw_mode=g - macaddr_acl=0 - accept_mac_file=/etc/hostapd.accept - deny_mac_file=/etc/hostapd.deny - auth_algs=1 - wpa=2 - wpa_psk_file=/etc/hostapd.wpa_psk - wpa_key_mgmt=WPA-PSK - rsn_pairwise=CCMP - EOF - cat <<- "EOF" > $P/etc/hostapd.accept.new - # List of MAC addresses that are allowed to authenticate (IEEE 802.11) - # with the AP. - #00:11:22:33:44:55 - #00:66:77:88:99:aa - #00:00:22:33:44:55 - EOF - cat <<- "EOF" > $P/etc/hostapd.deny.new - # List of MAC addresses that are not allowed to authenticate (IEEE 802.11) - # with the AP. - #00:20:30:40:50:60 - #00:ab:cd:ef:12:34 - #00:00:30:40:50:60 - EOF - cat <<- "EOF" > $P/etc/hostapd.wpa_psk.new - # List of WPA PSKs. Each line, except for empty lines and lines starting - # with #, must contain a MAC address and PSK separated with a space. - # Special MAC address 00:00:00:00:00:00 can be used to configure PSKs that - # anyone can use. PSK can be configured as an ASCII passphrase of 8..63 - # characters or as a 256-bit hex PSK (64 hex digits). - #00:00:00:00:00:00 secret passphrase - #00:11:22:33:44:55 another passphrase - #00:22:33:44:55:66 0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef - #00:00:00:00:00:00 another passphrase for all STAs - EOF touch $W/i.et cd $W find $P ! -type l -newer i.st ! -newer i.et \ @@ -417,7 +395,7 @@ fi } - for in conf accept deny wpa_psk; do + for i in conf accept deny wpa_psk ; do hostapd_config $i done EOF --- plamo/01_minimum/network.txz/old/iw-20160920/PlamoBuild.iw-3.10 2016-09-20 18:21:59.000000000 +0900 +++ plamo/01_minimum/network.txz/iw/PlamoBuild.iw-4.7 2016-09-23 21:11:34.000000000 +0900 @@ -1,15 +1,15 @@ #!/bin/sh ###################################################################### -url="https://www.kernel.org/pub/software/network/iw/iw-3.10.tar.bz2" +url="https://www.kernel.org/pub/software/network/iw/iw-4.7.tar.xz" pkgbase=iw -vers=3.10 +vers=4.7 arch=`uname -m` -build=P2 +build=P1 src=$pkgbase-$vers patchfiles="" OPT_CONFIG="" -DOCS="COPYING README" +DOCS="CONTRIBUTING COPYING README" ###################################################################### fscheck() { --- plamo/01_minimum/network.txz/old/libidn-20160921/PlamoBuild.libidn-1.32 2016-09-21 14:30:36.000000000 +0900 +++ plamo/01_minimum/network.txz/libidn/PlamoBuild.libidn-1.33 2016-09-23 21:26:08.000000000 +0900 @@ -1,11 +1,11 @@ #!/bin/sh ###################################################################### -url="http://ftp.gnu.org/gnu/libidn/libidn-1.32.tar.gz" +url="http://ftp.gnu.org/gnu/libidn/libidn-1.33.tar.gz" pkgbase=libidn -vers=1.32 +vers=1.33 arch=`uname -m` -build=P2 +build=P1 src=$pkgbase-$vers patchfiles="" OPT_CONFIG="" --- plamo/01_minimum/network.txz/old/libnl3-20160923/PlamoBuild.libnl3-3.2.9 2016-09-23 11:16:26.000000000 +0900 +++ plamo/01_minimum/network.txz/libnl3/PlamoBuild.libnl3-3.2.25 2016-09-23 23:56:11.000000000 +0900 @@ -1,11 +1,11 @@ #!/bin/sh ###################################################################### -url="http://www.infradead.org/~tgr/libnl/files/libnl-3.2.9.tar.gz" +url="http://www.infradead.org/~tgr/libnl/files/libnl-3.2.25.tar.gz" pkgbase=libnl3 -vers=3.2.9 +vers=3.2.25 arch=`uname -m` -build=P2 +build=P1 src=libnl-$vers patchfiles="" OPT_CONFIG="" --- plamo/01_minimum/network.txz/old/libpcap-20160921/PlamoBuild.libpcap-1.7.2 2016-09-21 15:26:37.000000000 +0900 +++ plamo/01_minimum/network.txz/libpcap/PlamoBuild.libpcap-1.8.0 2016-09-24 06:23:18.000000000 +0900 @@ -1,17 +1,17 @@ #!/bin/sh ###################################################################### -url="http://www.tcpdump.org/release/libpcap-1.7.2.tar.gz" +url="http://www.tcpdump.org/release/libpcap-1.8.0.tar.gz" pkgbase=libpcap -vers=1.7.2 +vers=1.8.0 arch=`uname -m` -build=P2 +build=P1 src=$pkgbase-$vers patchfiles="" OPT_CONFIG="" -DOCS="README.sita README.tru64 CHANGES README.hpux README pcap-sita.html - README.macosx README.dag INSTALL.txt README.linux TODO README.septel - VERSION LICENSE CREDITS README.aix README.Win32" +DOCS="README.Win32 VERSION LICENSE README.tru64 README.dag README + pcap-sita.html CHANGES README.septel README.macosx README.hpux + README.sita README.linux INSTALL.txt CREDITS TODO README.aix" ###################################################################### fscheck() { --- plamo/01_minimum/network.txz/old/libraw1394-20160921/PlamoBuild.libraw1394-2.0.5 2016-09-21 15:44:17.000000000 +0900 +++ plamo/01_minimum/network.txz/libraw1394/PlamoBuild.libraw1394-2.1.2 2016-09-24 06:39:39.000000000 +0900 @@ -1,15 +1,15 @@ #!/bin/sh ###################################################################### -url="https://www.kernel.org/pub/linux/libs/ieee1394/libraw1394-2.0.5.tar.xz" +url="https://www.kernel.org/pub/linux/libs/ieee1394/libraw1394-2.1.2.tar.xz" pkgbase=libraw1394 -vers=2.0.5 +vers=2.1.2 arch=`uname -m` -build=P2 +build=P1 src=$pkgbase-$vers patchfiles="" OPT_CONFIG="" -DOCS="ChangeLog COPYING.LIB AUTHORS README NEWS INSTALL" +DOCS="AUTHORS COPYING.LIB ChangeLog INSTALL NEWS README" ###################################################################### fscheck() { --- plamo/01_minimum/network.txz/old/libssh-20160921/PlamoBuild.libssh-0.7.2 2016-09-21 21:02:17.000000000 +0900 +++ plamo/01_minimum/network.txz/libssh/PlamoBuild.libssh-0.7.3 2016-09-24 06:53:59.000000000 +0900 @@ -1,15 +1,16 @@ #!/bin/sh ###################################################################### -url="https://red.libssh.org/attachments/download/177/libssh-0.7.2.tar.xz" +url="https://red.libssh.org/attachments/download/195/libssh-0.7.3.tar.xz" pkgbase=libssh -vers=0.7.2 +vers=0.7.3 arch=`uname -m` -build=P2 +build=P1 src=$pkgbase-$vers patchfiles="" OPT_CONFIG="" -DOCS="BSD COPYING AUTHORS INSTALL README README.CodingStyle ChangeLog" +DOCS="BSD COPYING AUTHORS INSTALL README README.CodingStyle + SubmittingPatches ChangeLog" ###################################################################### fscheck() { --- plamo/01_minimum/network.txz/old/libssh2-20160924/PlamoBuild.libssh2-1.5.0 2016-09-24 07:36:49.000000000 +0900 +++ plamo/01_minimum/network.txz/libssh2/PlamoBuild.libssh2-1.7.0 2016-09-24 07:29:19.000000000 +0900 @@ -1,15 +1,16 @@ #!/bin/sh ###################################################################### -url="https://www.libssh2.org/download/libssh2-1.5.0.tar.gz" +url="https://www.libssh2.org/download/libssh2-1.7.0.tar.gz" pkgbase=libssh2 -vers=1.5.0 +vers=1.7.0 arch=`uname -m` -build=P2 +build=P1 src=$pkgbase-$vers patchfiles="" OPT_CONFIG="" -DOCS="`echo docs/{BINDINGS,HACKING,INSTALL,AUTHORS,TODO}` +DOCS="`echo docs/{BINDINGS,HACKING,INSTALL_CMAKE,AUTHORS,TODO}` + `echo docs/{INSTALL_AUTOTOOLS,HACKING.CRYPTO}` README RELEASE-NOTES ChangeLog COPYING NEWS" ###################################################################### --- plamo/01_minimum/network.txz/old/ntp-20160928a/PlamoBuild.ntp-4.2.8p8 2016-09-28 16:36:03.000000000 +0900 +++ plamo/01_minimum/network.txz/ntp/PlamoBuild.ntp-4.2.8p8 2016-10-13 08:06:33.000000000 +0900 @@ -5,7 +5,7 @@ pkgbase=ntp vers=4.2.8p8 arch=`uname -m` -build=P1 +build=P2 src=$pkgbase-$vers patchfiles="" OPT_CONFIG="" @@ -289,7 +289,7 @@ #!/bin/sh start() { - if ps ax | grep -q ntpd ; then + if ps ax | grep ntpd | grep -vq grep ; then echo "NTP daemon already running. NTP start aborted." exit 0 fi --- plamo/01_minimum/network.txz/old/ppp-20160928/PlamoBuild.ppp-2.4.6 2016-09-28 15:56:58.000000000 +0900 +++ plamo/01_minimum/network.txz/ppp/PlamoBuild.ppp-2.4.7 2016-09-28 16:41:13.000000000 +0900 @@ -1,12 +1,12 @@ #!/bin/sh ###################################################################### -url="https://download.samba.org/pub/ppp/ppp-2.4.6.tar.gz +url="https://download.samba.org/pub/ppp/ppp-2.4.7.tar.gz ftp://plamo.linet.gr.jp/pub/Plamo-src.new/plamo/01_minimum/network.txz/ppp/plamo-ppp-scripts.tgz" pkgbase=ppp -vers=2.4.6 +vers=2.4.7 arch=`uname -m` -build=P2 +build=P1 src=$pkgbase-$vers patchfiles="" OPT_CONFIG="" @@ -294,8 +294,8 @@ find $P ! -type l -newer i.st ! -newer i.et \ -exec touch -t `date '+%m%d0900'` {} \; compress - strip_libdir $P/usr/$libdir/pppd/2.4.6 - touch -t `date '+%m%d0900'` $P/usr/$libdir/pppd/2.4.6 + strip_libdir $P/usr/$libdir/pppd/$vers + touch -t `date '+%m%d0900'` $P/usr/$libdir/pppd/$vers for i in `seq 0 $((${#DOCS[@]} - 1))` ; do for j in ${DOCS[$i]} ; do for k in ${S[$i]}/$j ; do --- plamo/01_minimum/network.txz/old/socat-20160929/PlamoBuild.socat-1.7.2.3 2016-09-29 11:10:19.000000000 +0900 +++ plamo/01_minimum/network.txz/socat/PlamoBuild.socat-1.7.3.1 2016-09-29 11:20:15.000000000 +0900 @@ -1,16 +1,16 @@ #!/bin/sh ###################################################################### -url="http://www.dest-unreach.org/socat/download/Archive/socat-1.7.2.3.tar.gz" +url="http://www.dest-unreach.org/socat/download/socat-1.7.3.1.tar.bz2" pkgbase=socat -vers=1.7.2.3 +vers=1.7.3.1 arch=`uname -m` -build=P2 +build=P1 src=$pkgbase-$vers patchfiles="" OPT_CONFIG="" -DOCS="FAQ CHANGES VERSION DEVELOPMENT PORTING SECURITY README - BUGREPORTS README.FIPS EXAMPLES FILES COPYING COPYING.OpenSSL" +DOCS="FAQ DEVELOPMENT PORTING COPYING.OpenSSL FILES README.FIPS + README CHANGES SECURITY BUGREPORTS COPYING EXAMPLES" ###################################################################### fscheck() { --- plamo/01_minimum/network.txz/old/stunnel-20160929/PlamoBuild.stunnel-5.20 2016-09-29 12:57:48.000000000 +0900 +++ plamo/01_minimum/network.txz/stunnel/PlamoBuild.stunnel-5.36 2016-09-29 13:04:18.000000000 +0900 @@ -1,11 +1,11 @@ #!/bin/sh ###################################################################### -url="ftp://ftp.stunnel.org/stunnel/archive/5.x/stunnel-5.20.tar.gz" +url="https://www.stunnel.org/downloads/stunnel-5.36.tar.gz" pkgbase=stunnel -vers=5.20 +vers=5.36 arch=`uname -m` -build=P2 +build=P1 src=$pkgbase-$vers patchfiles="" OPT_CONFIG="" --- plamo/01_minimum/network.txz/old/wpa_supplicant-20160929/PlamoBuild.wpa_supplicant-2.0 2016-09-29 14:41:35.000000000 +0900 +++ plamo/01_minimum/network.txz/wpa_supplicant/PlamoBuild.wpa_supplicant-2.5 2016-09-29 16:25:35.000000000 +0900 @@ -1,18 +1,17 @@ #!/bin/sh ###################################################################### -url="http://hostap.epitest.fi/releases/wpa_supplicant-2.0.tar.gz" +url="http://hostap.epitest.fi/releases/wpa_supplicant-2.5.tar.gz" pkgbase=wpa_supplicant -vers=2.0 +vers=2.5 arch=`uname -m` -build=P2 +build=P1 src=$pkgbase-$vers patchfiles="" OPT_CONFIG="" -DOCS="README - `echo wpa_supplicant/{README-HS20,eap_testing.txt,todo.txt,ChangeLog}` - `echo wpa_supplicant/README{-P2P,,-WPS,-Windows.txt}` - COPYING" +DOCS="`echo wpa_supplicant/{README-HS20,eap_testing.txt,README-Windows.txt}` + `echo wpa_supplicant/{ChangeLog,README-WPS,todo.txt,README-P2P,README}` + CONTRIBUTIONS COPYING README" ###################################################################### fscheck() { @@ -237,41 +236,36 @@ done done cd $B - cp -p wpa_supplicant/Makefile{,.orig} - sed '/^export/s@/local\(.*\)/$@\1@g' wpa_supplicant/Makefile.orig \ - > wpa_supplicant/Makefile cp -p wpa_supplicant/{defconfig,.config} cat <<- "EOF" | patch wpa_supplicant/.config - 10a11 - > CFLAGS += -I/usr/include/libnl3 - 199c200 + 44c44 + < #CONFIG_LIBNL32=y + --- + > CONFIG_LIBNL32=y + 151c151 < #CONFIG_WPS=y --- > CONFIG_WPS=y - 245c246 + 203c203 < #CONFIG_READLINE=y --- > CONFIG_READLINE=y - 376c377 + 331c331 < #CONFIG_CTRL_IFACE_DBUS=y --- > CONFIG_CTRL_IFACE_DBUS=y - 380c381 + 335c335 < #CONFIG_CTRL_IFACE_DBUS_NEW=y --- > CONFIG_CTRL_IFACE_DBUS_NEW=y - 383c384 + 338c338 < #CONFIG_CTRL_IFACE_DBUS_INTRO=y --- > CONFIG_CTRL_IFACE_DBUS_INTRO=y - 410c411 + 365c365 < #CONFIG_DEBUG_FILE=y --- > CONFIG_DEBUG_FILE=y - 523a525,527 - > - > CONFIG_IPV6=y - > CONFIG_LIBNL32=y EOF for i in `seq 0 $((${#B[@]} - 1))` ; do cd ${B[$i]}/wpa_supplicant @@ -295,7 +289,7 @@ make fi done - ( cd wpa_gui-qt4 ; qmake ; make ) + make wpa_gui-qt4 fi if [ $opt_package -eq 1 ] ; then if [ `id -u` -ne 0 ] ; then @@ -310,7 +304,7 @@ for i in `seq 0 $((${#B[@]} - 1))` ; do cd ${B[$i]}/wpa_supplicant if [ -f Makefile ] ; then - make install DESTDIR=$P + make install DESTDIR=$P BINDIR=/usr/sbin fi done wpadir=$B/wpa_supplicant @@ -343,6 +337,7 @@ install -m 644 $wpadir/doc/docbook/wpa_priv.8 $mandir/man8 install -m 644 $wpadir/doc/docbook/wpa_gui.8 $mandir/man8 install -m 644 $wpadir/doc/docbook/wpa_background.8 $mandir/man8 + install -m 644 $wpadir/doc/docbook/eapol_test.8 $mandir/man8 install -d $P/etc/rc.d/init.d cat <<- "EOF" > $P/etc/rc.d/init.d/wpa_supplicant #!/bin/sh @@ -382,7 +377,7 @@ exit 0 EOF chmod 644 $P/etc/rc.d/init.d/wpa_supplicant - cat <<- "EOF" | unexpand > $P/etc/wpa_supplicant.conf.dist + cat <<- "EOF" | unexpand > $P/etc/wpa_supplicant.conf.new ctrl_interface=/var/run/wpa_supplicant ctrl_interface_group=wheel network={ @@ -416,17 +411,15 @@ cp -a $S/wpa_supplicant/examples $docdir/$src/wpa_supplicant chmod -R g-w $docdir/$src/wpa_supplicant/examples chown -R root.root $docdir/$src/wpa_supplicant/examples - mv $docdir/$src/wpa_supplicant/{examples,README-{WPS,Windows.txt}.gz} $C - mv $C/{examples,README-{WPS,Windows.txt}.gz} $docdir/$src/wpa_supplicant touch -r $S $docdir/$src/wpa_supplicant convert install -d $P/install cat <<- "EOF" > $P/install/doinst.sh + mv etc/wpa_supplicant.conf.new /tmp if [ -f etc/wpa_supplicant.conf ] ; then - rm etc/wpa_supplicant.conf.dist + mv /tmp/wpa_supplicant.conf.new etc/wpa_supplicant.conf.dist else - mv etc/wpa_supplicant.conf.dist /tmp - mv /tmp/wpa_supplicant.conf.dist etc/wpa_supplicant.conf + mv /tmp/wpa_supplicant.conf.new etc/wpa_supplicant.conf fi EOF touch -t `date '+%m%d0900'` $P/install/doinst.sh @@ -434,7 +427,7 @@ tar rvpf $pkg.tar -C $P `cd $P ; find usr/share/dbus-1/system-services | tail -n+2` tar rvpf $pkg.tar -C $P etc/dbus-1/system.d/wpa_supplicant.conf tar rvpf $pkg.tar -C $P etc/rc.d/init.d/wpa_supplicant - tar rvpf $pkg.tar -C $P etc/wpa_supplicant.conf.dist + tar rvpf $pkg.tar -C $P etc/wpa_supplicant.conf.new 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/01_minimum/nfs.txz/old/nfs_utils-20161005/PlamoBuild.nfs_utils-1.2.9 2016-10-05 16:03:34.000000000 +0900 +++ plamo/01_minimum/nfs.txz/nfs_utils/PlamoBuild.nfs_utils-1.3.4 2016-10-06 08:07:19.000000000 +0900 @@ -1,12 +1,12 @@ #!/bin/sh ###################################################################### -url="https://www.kernel.org/pub/linux/utils/nfs-utils/1.2.9/nfs-utils-1.2.9.tar.xz +url="https://www.kernel.org/pub/linux/utils/nfs-utils/1.3.4/nfs-utils-1.3.4.tar.xz https://raw.githubusercontent.com/pld-linux/nfs-utils/master/nfs-utils-heimdal.patch" pkgbase=nfs_utils -vers=1.2.9 +vers=1.3.4 arch=`uname -m` -build=P2 +build=P1 src=nfs-utils-$vers patchfiles="nfs-utils-heimdal.patch" OPT_CONFIG="--disable-nfsv4 --disable-gss --with-krb5=/usr/heimdal" @@ -237,7 +237,7 @@ cd $B cp -p configure{,.orig} cat <<- "EOF" | patch configure - 18769c18769 + 19966c19966 < -f $dir/lib/libroken.a; then --- > \( -f $dir/lib/libroken.so -o -f $dir/lib64/libroken.so \); then --- plamo/01_minimum/nfs.txz/old/rpcbind-20161005/PlamoBuild.rpcbind-0.2.0 2016-10-05 12:10:08.000000000 +0900 +++ plamo/01_minimum/nfs.txz/rpcbind/PlamoBuild.rpcbind-0.2.1 2016-10-06 08:13:20.000000000 +0900 @@ -1,15 +1,15 @@ #!/bin/sh ###################################################################### -url="http://downloads.sourceforge.net/rpcbind/rpcbind-0.2.0.tar.bz2" +url="http://downloads.sourceforge.net/rpcbind/rpcbind-0.2.1.tar.bz2" pkgbase=rpcbind -vers=0.2.0 +vers=0.2.1 arch=`uname -m` -build=P2 +build=P1 src=$pkgbase-$vers patchfiles="" OPT_CONFIG="" -DOCS="README NEWS ChangeLog INSTALL COPYING AUTHORS" +DOCS="README NEWS INSTALL ChangeLog COPYING AUTHORS" ###################################################################### fscheck() { --- plamo/01_minimum/old/nilfs_utils-20161006/PlamoBuild.nilfs_utils-2.1.1 2016-10-06 09:54:35.000000000 +0900 +++ plamo/01_minimum/nilfs_utils/PlamoBuild.nilfs_utils-2.2.5 2016-10-07 08:05:02.000000000 +0900 @@ -1,15 +1,15 @@ #!/bin/sh ###################################################################### -url="http://nilfs.sourceforge.net/download/nilfs-utils-2.1.1.tar.bz2" +url="http://nilfs.sourceforge.net/download/nilfs-utils-2.2.5.tar.bz2" pkgbase=nilfs_utils -vers=2.1.1 +vers=2.2.5 arch=`uname -m` -build=P2 +build=P1 src=nilfs-utils-$vers patchfiles="" -OPT_CONFIG="" -DOCS="README AUTHORS INSTALL NEWS ChangeLog COPYING" +OPT_CONFIG="--without-selinux" +DOCS="AUTHORS README COPYING NEWS ChangeLog INSTALL" ###################################################################### fscheck() { @@ -296,6 +296,7 @@ done convert 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` 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` --- plamo/01_minimum/old/pcre-20161007/PlamoBuild.pcre-8.36 2016-10-07 11:45:12.000000000 +0900 +++ plamo/01_minimum/pcre/PlamoBuild.pcre-8.39 2016-10-08 10:54:14.000000000 +0900 @@ -1,14 +1,13 @@ #!/bin/sh ###################################################################### -url="http://downloads.sourceforge.net/pcre/pcre-8.36.tar.bz2 - ftp://plamo.linet.gr.jp/pub/Plamo-src.new/plamo/01_minimum/pcre/CVE-2014-8964.patch.gz" +url="http://downloads.sourceforge.net/pcre/pcre-8.39.tar.bz2" pkgbase=pcre -vers=8.36 +vers=8.39 arch=`uname -m` -build=P3 +build=P1 src=$pkgbase-$vers -patchfiles="CVE-2014-8964.patch.gz" +patchfiles="" OPT_CONFIG="--enable-pcre16 --enable-pcre32 --enable-unicode-properties --enable-pcregrep-libz --enable-pcregrep-libbz2 --enable-pcretest-libreadline" @@ -276,7 +275,7 @@ make install DESTDIR=$P fi done - ln -s libpcre.so.1.2.4 $P/usr/$libdir/libpcre.so.0 + ln -s libpcre.so.1.2.7 $P/usr/$libdir/libpcre.so.0 touch $W/i.et cd $W find $P ! -type l -newer i.st ! -newer i.et \ --- plamo/01_minimum/old/rpm2targz-20161013/PlamoBuild.rpm2targz-git_20100823 2016-10-13 13:50:29.000000000 +0900 +++ plamo/01_minimum/rpm2targz/PlamoBuild.rpm2targz-git_20120517 2016-10-14 07:46:27.000000000 +0900 @@ -5,9 +5,9 @@ ftp://plamo.linet.gr.jp/pub/Plamo-src.new/plamo/01_minimum/rpm2targz/rpm2cpio ftp://plamo.linet.gr.jp/pub/Plamo-src.new/plamo/01_minimum/rpm2targz/gitlog2changelog.py" pkgbase=rpm2targz -vers=git_20100823 +vers=git_20120517 arch=`uname -m` -build=P2 +build=P1 src=$pkgbase patchfiles="" OPT_CONFIG="" @@ -227,7 +227,7 @@ bz2|tbz) tar xvpjf ${i##*/} ;; xz|txz) tar xvpJf ${i##*/} ;; git) ( cd `basename ${i##*/} .git` - git checkout origin/master ; git reset --hard 4dc68a9 + git checkout origin/master ; git reset --hard e47270a git set-file-times ; TZ=UTC ../gitlog2changelog.py) ;; esac done --- plamo/01_minimum/old/ruby-20161014/PlamoBuild.ruby-2.2.3 2016-10-14 10:47:36.000000000 +0900 +++ plamo/01_minimum/ruby/PlamoBuild.ruby-2.2.3 2016-10-18 06:53:57.000000000 +0900 @@ -5,7 +5,7 @@ pkgbase=ruby vers=2.2.3 arch=`uname -m` -build=P2 +build=P3 src=$pkgbase-$vers patchfiles="" OPT_CONFIG="--enable-shared" @@ -291,9 +291,10 @@ find $P ! -type l -newer i.st ! -newer i.et \ -exec touch -t `date '+%m%d0900'` {} \; compress - for i in `find $P/usr/$libdir/ruby/${vers%.*}.0/$triplet -name "*.so"` ; do - strip_libdir ${i%/*} - touch -t `date '+%m%d0900'` ${i%/*} + for i in `find $P/usr/$libdir/ruby/${vers%.*}.0/$triplet -name "*.so" \ + | sed 's@\(.*\)/.*@\1@' | sort | uniq` ; do + strip_libdir $i + touch -t `date '+%m%d0900'` $i done for i in `seq 0 $((${#DOCS[@]} - 1))` ; do for j in ${DOCS[$i]} ; do --- plamo/01_minimum/old/screen-20161014/PlamoBuild.screen-4.3.1 2016-10-14 17:49:38.000000000 +0900 +++ plamo/01_minimum/screen/PlamoBuild.screen-4.4.0 2016-10-15 00:06:07.000000000 +0900 @@ -1,17 +1,16 @@ #!/bin/sh ###################################################################### -url="http://ftp.gnu.org/gnu/screen/screen-4.3.1.tar.gz - ftp://plamo.linet.gr.jp/pub/Plamo-src.new/plamo/01_minimum/screen/CVE-2015-6806.patch.gz" +url="http://ftp.gnu.org/gnu/screen/screen-4.4.0.tar.gz" pkgbase=screen -vers=4.3.1 +vers=4.4.0 arch=`uname -m` -build=P3 +build=P1 src=$pkgbase-$vers -patchfiles="CVE-2015-6806.patch.gz" +patchfiles="" OPT_CONFIG="" -DOCS="NEWS NEWS.3.7 NEWS.3.6 NEWS.3.9 INSTALL README FAQ NEWS.3.5 - TODO COPYING ChangeLog HACKING" +DOCS="FAQ NEWS.3.9 COPYING NEWS.3.5 NEWS.3.7 HACKING NEWS NEWS.3.6 + ChangeLog INSTALL TODO README" ###################################################################### fscheck() { --- plamo/01_minimum/old/sg3_utils-20161015/PlamoBuild.sg3_utils-1.32 2016-10-15 00:01:30.000000000 +0900 +++ plamo/01_minimum/sg3_utils/PlamoBuild.sg3_utils-1.42 2016-10-16 06:50:07.000000000 +0900 @@ -1,17 +1,17 @@ #!/bin/sh ###################################################################### -url="http://sg.danny.cz/sg/p/sg3_utils-1.32.tar.bz2" +url="http://sg.danny.cz/sg/p/sg3_utils-1.42.tar.xz" pkgbase=sg3_utils -vers=1.32 +vers=1.42 arch=`uname -m` -build=P2 +build=P1 src=$pkgbase-$vers patchfiles="" OPT_CONFIG="" -DOCS="ChangeLog README.freebsd README BSD_LICENSE README.solaris - README.win32 COPYING NEWS README.tru64 CREDITS INSTALL TODO - AUTHORS COVERAGE README.iscsi README.sg_start" +DOCS="NEWS README README.sg_start README.iscsi README.solaris CREDITS + ChangeLog BSD_LICENSE COPYING README.win32 AUTHORS COVERAGE + README.freebsd INSTALL README.tru64" ###################################################################### fscheck() { --- plamo/01_minimum/old/sqlite-20161015/PlamoBuild.sqlite-3.14.2 2016-10-15 08:48:01.000000000 +0900 +++ plamo/01_minimum/sqlite/PlamoBuild.sqlite-3.15.0 2016-10-16 06:53:06.000000000 +0900 @@ -1,12 +1,12 @@ #!/bin/sh ###################################################################### -url="http://sqlite.org/2016/sqlite-autoconf-3140200.tar.gz" +url="http://sqlite.org/2016/sqlite-autoconf-3150000.tar.gz" pkgbase=sqlite -vers=3.14.2 +vers=3.15.0 arch=`uname -m` -build=P2 -src=$pkgbase-autoconf-3140200 +build=P1 +src=$pkgbase-autoconf-3150000 patchfiles="" OPT_CONFIG="" DOCS="INSTALL README.txt" --- plamo/01_minimum/old/squashfs-20161015/PlamoBuild.squashfs-4.2 2016-10-15 09:07:31.000000000 +0900 +++ plamo/01_minimum/squashfs/PlamoBuild.squashfs-4.3 2016-10-16 06:59:18.000000000 +0900 @@ -1,17 +1,17 @@ #!/bin/sh ###################################################################### -url="http://downloads.sourceforge.net/squashfs/squashfs4.2.tar.gz" +url="http://downloads.sourceforge.net/squashfs/squashfs4.3.tar.gz" pkgbase=squashfs -vers=4.2 +vers=4.3 arch=`uname -m` -build=P2 +build=P1 src=$pkgbase$vers patchfiles="" OPT_CONFIG="" -DOCS="INSTALL COPYING PERFORMANCE.README README DONATIONS - ACKNOWLEDGEMENTS CHANGES pseudo-file.example README-4.2 - `echo OLD-READMEs/README-{3.3,2.0,3.1,3.2,4.0,AMD64,4.1,2.1,3.0}`" +DOCS="ACKNOWLEDGEMENTS README README-4.3 pseudo-file.example DONATIONS + `echo OLD-READMEs/README-{3.{0,3,2},2.0,3.1,4.0,2.1,4.2,AMD64,4.1}` + COPYING INSTALL PERFORMANCE.README CHANGES" ###################################################################### fscheck() { @@ -246,11 +246,11 @@ < #LZO_SUPPORT = 1 --- > LZO_SUPPORT = 1 - 97c97 + 111c111 < INSTALL_DIR = /usr/local/bin --- > INSTALL_DIR = /usr/bin - 256,258c256,258 + 303,305c303,305 < mkdir -p $(INSTALL_DIR) < cp mksquashfs $(INSTALL_DIR) < cp unsquashfs $(INSTALL_DIR) --- plamo/01_minimum/old/sysstat-20161015/PlamoBuild.sysstat-10.0.4 2016-10-15 09:35:13.000000000 +0900 +++ plamo/01_minimum/sysstat/PlamoBuild.sysstat-11.5.1 2016-10-16 07:01:32.000000000 +0900 @@ -1,15 +1,15 @@ #!/bin/sh ###################################################################### -url="http://pagesperso-orange.fr/sebastien.godard/sysstat-10.0.4.tar.bz2" +url="http://pagesperso-orange.fr/sebastien.godard/sysstat-11.5.1.tar.bz2" pkgbase=sysstat -vers=10.0.4 +vers=11.5.1 arch=`uname -m` -build=P2 +build=P1 src=$pkgbase-$vers patchfiles="" OPT_CONFIG="--docdir=/usr/share/doc/sysstat" -DOCS="CHANGES COPYING CREDITS README TODO FAQ INSTALL" +DOCS="FAQ COPYING README.md CHANGES INSTALL CREDITS" ###################################################################### fscheck() { --- plamo/01_minimum/tcl.txz/old/tcl-20161016/PlamoBuild.tcl-8.5.10 2016-10-16 10:07:44.000000000 +0900 +++ plamo/01_minimum/tcl.txz/tcl/PlamoBuild.tcl-8.6.6 2016-10-18 09:13:35.000000000 +0900 @@ -1,17 +1,17 @@ #!/bin/sh ###################################################################### -url="http://downloads.sourceforge.net/tcl/tcl8.5.10-src.tar.gz" +url="http://downloads.sourceforge.net/tcl/tcl8.6.6-src.tar.gz" pkgbase=tcl -vers=8.5.10 +vers=8.6.6 arch=`uname -m` -build=P2 -src=tcl$vers +build=P1 +src=$pkgbase$vers patchfiles="" OPT_CONFIG="--enable-threads" -DOCS="changes ChangeLog.2000 ChangeLog.1999 ChangeLog.2002 - ChangeLog.2003 ChangeLog.2005 README ChangeLog ChangeLog.2001 - license.terms ChangeLog.2004" +DOCS="ChangeLog.2004 ChangeLog.2002 ChangeLog.2005 ChangeLog.2008 + ChangeLog.1999 changes ChangeLog license.terms ChangeLog.2007 + ChangeLog.2003 README ChangeLog.2000 ChangeLog.2001" ###################################################################### fscheck() { @@ -239,17 +239,17 @@ if [ $arch == x86_64 ] ; then cp -p unix/configure{,.orig} cat <<- "EOF" | patch unix/configure - 18772c18772 + 18923c18923 < TCL_LIBRARY='$(prefix)/lib/tcl$(VERSION)' --- > TCL_LIBRARY='$(prefix)/lib64/tcl$(VERSION)' - 18894,18895c18894,18895 + 19053,19054c19053,19054 < elif test "$prefix/lib" != "$libdir"; then < TCL_PACKAGE_PATH="${libdir} ${prefix}/lib ${TCL_PACKAGE_PATH}" --- > elif test "$prefix/lib64" != "$libdir"; then > TCL_PACKAGE_PATH="${libdir} ${prefix}/lib64 ${TCL_PACKAGE_PATH}" - 18897c18897 + 19056c19056 < TCL_PACKAGE_PATH="${prefix}/lib ${TCL_PACKAGE_PATH}" --- > TCL_PACKAGE_PATH="${prefix}/lib64 ${TCL_PACKAGE_PATH}" @@ -294,14 +294,18 @@ make install DESTDIR=$P install-private-headers fi done - ln -s tclsh8.5 $P/usr/bin/tclsh - mv $P/usr/bin/{tclsh8.5,tclsh} $C - mv $C/{tclsh8.5,tclsh} $P/usr/bin + ln -s tclsh8.6 $P/usr/bin/tclsh + mv $P/usr/bin/{tclsh8.6,sqlite3_analyzer,tclsh} $C + mv $C/{tclsh8.6,sqlite3_analyzer,tclsh} $P/usr/bin 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 `find $P/usr/$libdir -mindepth 2 -name "*.so"` ; do + strip_libdir ${i%/*} + touch -t `date '+%m%d0900'` ${i%/*} + done for i in `seq 0 $((${#DOCS[@]} - 1))` ; do for j in ${DOCS[$i]} ; do for k in ${S[$i]}/$j ; do @@ -321,9 +325,9 @@ done convert tar cvpf $pkg.tar -C $P `cd $P ; find usr/bin | tail -n+2` - tar rvpf $pkg.tar -C $P usr/$libdir/tcl8.5 - tar rvpf $pkg.tar -C $P usr/$libdir/{libtcl8.5.so,tclConfig.sh,libtclstub8.5.a} - tar rvpf $pkg.tar -C $P usr/$libdir/tcl8 + tar rvpf $pkg.tar -C $P `cd $P ; find usr/$libdir/pkgconfig | tail -n+2` + tar rvpf $pkg.tar -C $P \ + `cd $P ; find usr/$libdir -maxdepth 1 ! -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/man/man1 | tail -n+2` tar rvpf $pkg.tar -C $P `cd $P ; find usr/share/man/man3 | tail -n+2` --- plamo/01_minimum/tcl.txz/old/expect-20161016/PlamoBuild.expect-5.45 2016-10-16 10:30:47.000000000 +0900 +++ plamo/01_minimum/tcl.txz/expect/PlamoBuild.expect-5.45 2016-10-18 09:34:12.000000000 +0900 @@ -5,8 +5,8 @@ pkgbase=expect vers=5.45 arch=`uname -m` -build=P2 -src=expect$vers +build=P3 +src=$pkgbase$vers patchfiles="" OPT_CONFIG="" DOCS="INSTALL NEWS ChangeLog README FAQ license.terms HISTORY" --- plamo/01_minimum/tcl.txz/old/tclx-20161016/PlamoBuild.tclx-8.4 2016-10-16 11:56:55.000000000 +0900 +++ plamo/01_minimum/tcl.txz/tclx/PlamoBuild.tclx-8.4.1 2016-10-18 09:58:54.000000000 +0900 @@ -1,18 +1,17 @@ #!/bin/sh ###################################################################### -url="http://downloads.sourceforge.net/tclx/tclx8.4.tar.bz2 - http://ftp.slackware.com/pub/slackware/slackware-14.0/source/tcl/tclx/tclx-8.4.configure.diff.gz +url="http://downloads.sourceforge.net/tclx/tclx8.4.1.tar.bz2 http://ftp.slackware.com/pub/slackware/slackware-14.0/source/tcl/tclx/tclx-8.4.gcc4.diff.gz - http://downloads.sourceforge.net/tcl/tcl8.5.10-src.tar.gz" + http://downloads.sourceforge.net/tcl/tcl8.6.6-src.tar.gz" pkgbase=tclx -vers=8.4 +vers=8.4.1 arch=`uname -m` -build=P2 -src=tclx$vers -patchfiles="tclx-8.4.configure.diff.gz tclx-8.4.gcc4.diff.gz" +build=P1 +src=${pkgbase}8.4 +patchfiles="tclx-8.4.gcc4.diff.gz" OPT_CONFIG="" -DOCS="README license.terms ChangeLog" +DOCS="ChangeLog README license.terms" ###################################################################### fscheck() { @@ -236,27 +235,27 @@ esac done done - cd $W/tcl8.5.10 + cd $W/tcl8.6.6 if [ $arch == x86_64 ] ; then cp -p unix/configure{,.orig} cat <<- "EOF" | patch unix/configure - 18772c18772 + 18923c18923 < TCL_LIBRARY='$(prefix)/lib/tcl$(VERSION)' --- > TCL_LIBRARY='$(prefix)/lib64/tcl$(VERSION)' - 18894,18895c18894,18895 + 19053,19054c19053,19054 < elif test "$prefix/lib" != "$libdir"; then < TCL_PACKAGE_PATH="${libdir} ${prefix}/lib ${TCL_PACKAGE_PATH}" --- > elif test "$prefix/lib64" != "$libdir"; then > TCL_PACKAGE_PATH="${libdir} ${prefix}/lib64 ${TCL_PACKAGE_PATH}" - 18897c18897 + 19056c19056 < TCL_PACKAGE_PATH="${prefix}/lib ${TCL_PACKAGE_PATH}" --- > TCL_PACKAGE_PATH="${prefix}/lib64 ${TCL_PACKAGE_PATH}" EOF fi - cd $W/tcl8.5.10/unix + cd $W/tcl8.6.6/unix ./configure --prefix=/usr --libdir=/usr/$libdir --enable-threads for i in `seq 0 $((${#B[@]} - 1))` ; do cd ${B[$i]} @@ -302,8 +301,8 @@ find $P ! -type l -newer i.st ! -newer i.et \ -exec touch -t `date '+%m%d0900'` {} \; compress - strip_libdir $P/usr/$libdir/tclx$vers - touch -t `date '+%m%d0900'` $P/usr/$libdir/tclx$vers + strip_libdir $P/usr/$libdir/tclx8.4 + touch -t `date '+%m%d0900'` $P/usr/$libdir/tclx8.4 for i in `seq 0 $((${#DOCS[@]} - 1))` ; do for j in ${DOCS[$i]} ; do for k in ${S[$i]}/$j ; do @@ -322,7 +321,7 @@ ( cd $docdir ; find ${src[$i]} -type d -exec touch -r $W/{} {} \; ) done convert - tar cvpf $pkg.tar -C $P usr/$libdir/tclx$vers + tar cvpf $pkg.tar -C $P usr/$libdir/tclx8.4 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/man/mann | tail -n+2` tar rvpf $pkg.tar -C $P usr/share/doc/$src --- plamo/01_minimum/tcl.txz/old/itcl-20161016/PlamoBuild.itcl-3.4 2016-10-16 14:23:21.000000000 +0900 +++ plamo/01_minimum/tcl.txz/itcl/PlamoBuild.itcl-4.0.5 2016-10-18 10:38:51.000000000 +0900 @@ -1,16 +1,16 @@ #!/bin/sh ###################################################################### -url="ftp://plamo.linet.gr.jp/pub/Plamo-src.new/plamo/01_minimum/tcl.txz/itcl/itcl3.4-20080207.tar.bz2 - http://downloads.sourceforge.net/tcl/tcl8.5.10-src.tar.gz" +url="http://downloads.sourceforge.net/incrtcl/itcl4.0.5.tar.gz + http://downloads.sourceforge.net/tcl/tcl8.6.6-src.tar.gz" pkgbase=itcl -vers=3.4 +vers=4.0.5 arch=`uname -m` -build=P2 -src=itcl$vers +build=P1 +src=$pkgbase$vers patchfiles="" OPT_CONFIG="" -DOCS="license.terms CHANGES ChangeLog INCOMPATIBLE README TODO" +DOCS="releasenotes.txt ChangeLog TODO license.terms README" ###################################################################### fscheck() { @@ -234,27 +234,27 @@ esac done done - cd $W/tcl8.5.10 + cd $W/tcl8.6.6 if [ $arch == x86_64 ] ; then cp -p unix/configure{,.orig} cat <<- "EOF" | patch unix/configure - 18772c18772 + 18923c18923 < TCL_LIBRARY='$(prefix)/lib/tcl$(VERSION)' --- > TCL_LIBRARY='$(prefix)/lib64/tcl$(VERSION)' - 18894,18895c18894,18895 + 19053,19054c19053,19054 < elif test "$prefix/lib" != "$libdir"; then < TCL_PACKAGE_PATH="${libdir} ${prefix}/lib ${TCL_PACKAGE_PATH}" --- > elif test "$prefix/lib64" != "$libdir"; then > TCL_PACKAGE_PATH="${libdir} ${prefix}/lib64 ${TCL_PACKAGE_PATH}" - 18897c18897 + 19056c19056 < TCL_PACKAGE_PATH="${prefix}/lib ${TCL_PACKAGE_PATH}" --- > TCL_PACKAGE_PATH="${prefix}/lib64 ${TCL_PACKAGE_PATH}" EOF fi - cd $W/tcl8.5.10/unix + cd $W/tcl8.6.6/unix ./configure --prefix=/usr --libdir=/usr/$libdir --enable-threads for i in `seq 0 $((${#B[@]} - 1))` ; do cd ${B[$i]} @@ -320,7 +320,7 @@ ( cd $docdir ; find ${src[$i]} -type d -exec touch -r $W/{} {} \; ) done convert - tar cvpf $pkg.tar -C $P `cd $P ; find usr/$libdir -maxdepth 1 | tail -n+2` + tar cvpf $pkg.tar -C $P usr/$libdir/itcl$vers 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/man/mann | tail -n+2` tar rvpf $pkg.tar -C $P usr/share/doc/$src --- plamo/01_minimum/old/texinfo-20161017/PlamoBuild.texinfo-6.1 2016-10-17 14:55:34.000000000 +0900 +++ plamo/01_minimum/texinfo/PlamoBuild.texinfo-6.3 2016-10-18 11:01:32.000000000 +0900 @@ -1,11 +1,11 @@ #!/bin/sh ###################################################################### -url="http://ftp.gnu.org/gnu/texinfo/texinfo-6.1.tar.xz" +url="http://ftp.gnu.org/gnu/texinfo/texinfo-6.3.tar.xz" pkgbase=texinfo -vers=6.1 +vers=6.3 arch=`uname -m` -build=P2 +build=P1 src=$pkgbase-$vers patchfiles="" OPT_CONFIG="" --- plamo/01_minimum/old/time-20161017/PlamoBuild.time-1.7 2016-10-17 15:16:10.000000000 +0900 +++ plamo/01_minimum/time/PlamoBuild.time-1.7 2016-10-18 11:28:14.000000000 +0900 @@ -235,24 +235,7 @@ done cd $B cp -p Makefile.in{,.orig} - cat <<- "EOF" | patch Makefile.in - 117c117 - < $(mkinstalldirs) $(bindir) - --- - > $(mkinstalldirs) $(DESTDIR)$(bindir) - 120c120 - < $(INSTALL_PROGRAM) $$p $(bindir)/`echo $$p|sed '$(transform)'`; \ - --- - > $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \ - 179c179 - < $(mkinstalldirs) $(infodir) - --- - > $(mkinstalldirs) $(DESTDIR)$(infodir) - 182c182 - < $(INSTALL_DATA) $(srcdir)/$$ifile $(infodir)/$$ifile; \ - --- - > $(INSTALL_DATA) $(srcdir)/$$ifile $(DESTDIR)$(infodir)/$$ifile; \ - EOF + sed -i 's@$(bindir)@$(DESTDIR)&@;s@$(infodir)@$(DESTDIR)&@' Makefile.in for i in `seq 0 $((${#B[@]} - 1))` ; do cd ${B[$i]} if [ -f Makefile ] ; then --- plamo/01_minimum/old/tree-20161017/PlamoBuild.tree-1.6.0 2016-10-17 15:31:58.000000000 +0900 +++ plamo/01_minimum/tree/PlamoBuild.tree-1.7.0 2016-10-18 11:21:37.000000000 +0900 @@ -1,11 +1,11 @@ #!/bin/sh ###################################################################### -url="ftp://mama.indstate.edu/linux/tree/tree-1.6.0.tgz" +url="ftp://mama.indstate.edu/linux/tree/tree-1.7.0.tgz" pkgbase=tree -vers=1.6.0 +vers=1.7.0 arch=`uname -m` -build=P2 +build=P1 src=$pkgbase-$vers patchfiles="" OPT_CONFIG="" @@ -235,22 +235,7 @@ done cd $B cp -p Makefile{,.orig} - cat <<- "EOF" | patch Makefile - 97,98c97,98 - < install -d $(BINDIR) - < install -d $(MANDIR) - --- - > install -d $(DESTDIR)$(BINDIR) - > install -d $(DESTDIR)$(MANDIR) - 100c100 - < install -s $(TREE_DEST) $(BINDIR)/$(TREE_DEST); \ - --- - > install -s $(TREE_DEST) $(DESTDIR)$(BINDIR)/$(TREE_DEST); \ - 102c102 - < install doc/$(MAN) $(MANDIR)/$(MAN) - --- - > install doc/$(MAN) $(DESTDIR)$(MANDIR)/$(MAN) - EOF + sed -i 's@$(BINDIR)@$(DESTDIR)&@;s@$(MANDIR)@$(DESTDIR)&@' Makefile for i in `seq 0 $((${#B[@]} - 1))` ; do cd ${B[$i]} if [ -f Makefile ] ; then --- plamo/05_ext/AV.txz/old/pulseaudio-20160430/PlamoBuild.pulseaudio-7.1 2016-04-30 09:49:06.000000000 +0900 +++ plamo/05_ext/AV.txz/pulseaudio/PlamoBuild.pulseaudio-7.1 2016-06-07 17:03:19.000000000 +0900 @@ -308,7 +308,7 @@ done convert touch -t `date '+%m%d0900'` $P/usr/share/bash-completion/completions - cat <<- EOF >> $P/install/doinst.sh + cat <<- "EOF" >> $P/install/doinst.sh if [ -x usr/bin/esd ] ; then ( cd usr/bin ; rm -rf esd ) ( cd usr/bin ; ln -sf esdcompat esd ) --- plamo/05_ext/devel2.txz/old/gcc_go-20160112/PlamoBuild.gcc_go-4.8.4 2016-01-12 11:12:39.000000000 +0900 +++ plamo/05_ext/devel2.txz/gcc_go/PlamoBuild.gcc_go-4.8.5 2016-01-28 14:21:29.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=gcc_go -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/05_ext/devel2.txz/old/gfortran-20160112/PlamoBuild.gfortran-4.8.4 2016-01-12 10:25:33.000000000 +0900 +++ plamo/05_ext/devel2.txz/gfortran/PlamoBuild.gfortran-4.8.5 2016-01-28 14:19:19.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=gfortran -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/05_ext/tk.txz/old/tk-20161016/PlamoBuild.tk-8.5.10 2016-10-16 10:07:13.000000000 +0900 +++ plamo/05_ext/tk.txz/tk/PlamoBuild.tk-8.6.6 2016-10-18 09:27:55.000000000 +0900 @@ -1,16 +1,16 @@ #!/bin/sh ###################################################################### -url="http://downloads.sourceforge.net/tcl/tk8.5.10-src.tar.gz" +url="http://downloads.sourceforge.net/tcl/tk8.6.6-src.tar.gz" pkgbase=tk -vers=8.5.10 +vers=8.6.6 arch=`uname -m` -build=P2 -src=tk$vers +build=P1 +src=$pkgbase$vers patchfiles="" OPT_CONFIG="--enable-threads" -DOCS="changes ChangeLog.2002 README ChangeLog license.terms - ChangeLog.2004" +DOCS="ChangeLog.2004 ChangeLog.2002 changes ChangeLog license.terms + ChangeLog.2007 README" ###################################################################### fscheck() { @@ -278,9 +278,9 @@ make install DESTDIR=$P install-private-headers fi done - ln -s wish8.5 $P/usr/bin/wish - mv $P/usr/bin/{wish8.5,wish} $C - mv $C/{wish8.5,wish} $P/usr/bin + ln -s wish8.6 $P/usr/bin/wish + mv $P/usr/bin/{wish8.6,wish} $C + mv $C/{wish8.6,wish} $P/usr/bin touch $W/i.et cd $W find $P ! -type l -newer i.st ! -newer i.et \ @@ -305,8 +305,9 @@ done convert tar cvpf $pkg.tar -C $P `cd $P ; find usr/bin | tail -n+2` - tar rvpf $pkg.tar -C $P usr/$libdir/tk8.5 - tar rvpf $pkg.tar -C $P usr/$libdir/{libtk8.5.so,tkConfig.sh,libtkstub8.5.a} + tar rvpf $pkg.tar -C $P usr/$libdir/tk8.6 + tar rvpf $pkg.tar -C $P `cd $P ; find usr/$libdir/pkgconfig | tail -n+2` + tar rvpf $pkg.tar -C $P usr/$libdir/{libtk8.6.so,tkConfig.sh,libtkstub8.6.a} 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/man/man1 | tail -n+2` tar rvpf $pkg.tar -C $P `cd $P ; find usr/share/man/man3 | tail -n+2` --- plamo/05_ext/tk.txz/old/Tix-20161016/PlamoBuild.Tix-8.4.3 2016-10-16 13:42:31.000000000 +0900 +++ plamo/05_ext/tk.txz/Tix/PlamoBuild.Tix-8.4.3 2016-10-18 10:32:24.000000000 +0900 @@ -4,13 +4,13 @@ url="http://downloads.sourceforge.net/tix/Tix8.4.3-src.tar.gz http://ftp.slackware.com/pub/slackware/slackware-14.0/source/tcl/tix/tix.tcl8.5.patch.gz http://ftp.slackware.com/pub/slackware/slackware-14.0/source/tcl/tix/tix.soname.patch.gz - http://downloads.sourceforge.net/tcl/tcl8.5.10-src.tar.gz - http://downloads.sourceforge.net/tcl/tk8.5.10-src.tar.gz" + http://downloads.sourceforge.net/tcl/tcl8.6.6-src.tar.gz + http://downloads.sourceforge.net/tcl/tk8.6.6-src.tar.gz" pkgbase=Tix vers=8.4.3 arch=`uname -m` -build=P2 -src=Tix$vers +build=P3 +src=$pkgbase$vers patchfiles="tix.tcl8.5.patch.gz tix.soname.patch.gz" OPT_CONFIG="" DOCS="license.terms README.txt ChangeLog" @@ -237,34 +237,34 @@ esac done done - cd $W/tcl8.5.10 + cd $W/tcl8.6.6 if [ $arch == x86_64 ] ; then cp -p unix/configure{,.orig} cat <<- "EOF" | patch unix/configure - 18772c18772 + 18923c18923 < TCL_LIBRARY='$(prefix)/lib/tcl$(VERSION)' --- > TCL_LIBRARY='$(prefix)/lib64/tcl$(VERSION)' - 18894,18895c18894,18895 + 19053,19054c19053,19054 < elif test "$prefix/lib" != "$libdir"; then < TCL_PACKAGE_PATH="${libdir} ${prefix}/lib ${TCL_PACKAGE_PATH}" --- > elif test "$prefix/lib64" != "$libdir"; then > TCL_PACKAGE_PATH="${libdir} ${prefix}/lib64 ${TCL_PACKAGE_PATH}" - 18897c18897 + 19056c19056 < TCL_PACKAGE_PATH="${prefix}/lib ${TCL_PACKAGE_PATH}" --- > TCL_PACKAGE_PATH="${prefix}/lib64 ${TCL_PACKAGE_PATH}" EOF fi - cd $W/tcl8.5.10/unix + cd $W/tcl8.6.6/unix ./configure --prefix=/usr --libdir=/usr/$libdir --enable-threads - cd $W/tk8.5.10 + cd $W/tk8.6.6 if [ $arch == x86_64 ] ; then cp -p unix/configure{,.orig} sed -i '/^TK_LIBRARY=/s@lib@lib64@g' unix/configure fi - cd $W/tk8.5.10/unix + cd $W/tk8.6.6/unix ./configure --prefix=/usr --libdir=/usr/$libdir --enable-threads for i in `seq 0 $((${#B[@]} - 1))` ; do cd ${B[$i]} @@ -277,7 +277,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]} \ + CPPFLAGS="-DUSE_INTERP_RESULT" fi done fi @@ -306,6 +307,7 @@ fi done chown -R root.root $P/usr/$libdir/Tix$vers/{pref,bitmaps} + chmod -R g-w $P/usr/$libdir/Tix$vers/bitmaps rmdir $P/usr/$libdir/Tix$vers/html install -d $P/usr/share/man/mann install -m 644 man/*.n $P/usr/share/man/mann --- plamo/05_ext/tk.txz/old/itk-20161016/PlamoBuild.itk-3.4 2016-10-16 15:08:06.000000000 +0900 +++ plamo/05_ext/tk.txz/itk/PlamoBuild.itk-4.0.2 2016-10-18 10:40:55.000000000 +0900 @@ -1,17 +1,17 @@ #!/bin/sh ###################################################################### -url="ftp://plamo.linet.gr.jp/pub/Plamo-src.new/plamo/05_ext/tk.txz/itk/itk3.4-20080207.tar.bz2 - http://downloads.sourceforge.net/tcl/tcl8.5.10-src.tar.gz - http://downloads.sourceforge.net/tcl/tk8.5.10-src.tar.gz" +url="http://downloads.sourceforge.net/incrtcl/itk4.0.2.tar.gz + http://downloads.sourceforge.net/tcl/tcl8.6.6-src.tar.gz + http://downloads.sourceforge.net/tcl/tk8.6.6-src.tar.gz" pkgbase=itk -vers=3.4 +vers=4.0.2 arch=`uname -m` -build=P2 -src=itk$vers +build=P1 +src=$pkgbase$vers patchfiles="" OPT_CONFIG="" -DOCS="license.terms CHANGES ChangeLog INCOMPATIBLE README TODO" +DOCS="license.terms" ###################################################################### fscheck() { @@ -235,34 +235,34 @@ esac done done - cd $W/tcl8.5.10 + cd $W/tcl8.6.6 if [ $arch == x86_64 ] ; then cp -p unix/configure{,.orig} cat <<- "EOF" | patch unix/configure - 18772c18772 + 18923c18923 < TCL_LIBRARY='$(prefix)/lib/tcl$(VERSION)' --- > TCL_LIBRARY='$(prefix)/lib64/tcl$(VERSION)' - 18894,18895c18894,18895 + 19053,19054c19053,19054 < elif test "$prefix/lib" != "$libdir"; then < TCL_PACKAGE_PATH="${libdir} ${prefix}/lib ${TCL_PACKAGE_PATH}" --- > elif test "$prefix/lib64" != "$libdir"; then > TCL_PACKAGE_PATH="${libdir} ${prefix}/lib64 ${TCL_PACKAGE_PATH}" - 18897c18897 + 19056c19056 < TCL_PACKAGE_PATH="${prefix}/lib ${TCL_PACKAGE_PATH}" --- > TCL_PACKAGE_PATH="${prefix}/lib64 ${TCL_PACKAGE_PATH}" EOF fi - cd $W/tcl8.5.10/unix + cd $W/tcl8.6.6/unix ./configure --prefix=/usr --libdir=/usr/$libdir --enable-threads - cd $W/tk8.5.10 + cd $W/tk8.6.6 if [ $arch == x86_64 ] ; then cp -p unix/configure{,.orig} sed -i '/^TK_LIBRARY=/s@lib@lib64@g' unix/configure fi - cd $W/tk8.5.10/unix + cd $W/tk8.6.6/unix ./configure --prefix=/usr --libdir=/usr/$libdir --enable-threads for i in `seq 0 $((${#B[@]} - 1))` ; do cd ${B[$i]} @@ -275,8 +275,7 @@ 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]} \ - --with-itcl=/usr/$libdir + --mandir='${prefix}'/share/man ${OPT_CONFIG[$i]} fi done fi --- plamo/09_kernel/old/kernelsrc-20160124/PlamoBuild.kernelsrc-4.1.15_plamoRPi2 2016-01-24 10:56:14.000000000 +0900 +++ plamo/09_kernel/kernelsrc/PlamoBuild.kernelsrc-4.1.15_plamoRPi2 2016-02-04 08:06:31.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=kernelsrc vers=4.1.15_plamoRPi2 arch=noarch -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,7 +232,6 @@ 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 for i in `seq 0 $((${#B[@]} - 1))` ; do cd ${B[$i]} if [ -f Makefile ] ; then @@ -278,12 +275,12 @@ fi done install -d $P/usr/src - cp -dR . $P/usr/src/$src - rm $P/usr/src/$src/.git - find $P/usr/src/$src \( -name ".get_maintainer.ignore" \ + cp -dR . $P/usr/src/$src-4.1.15 + rm $P/usr/src/$src-4.1.15/.git + find $P/usr/src/$src-4.1.15 \( -name ".get_maintainer.ignore" \ -o -name ".gitignore" -o -name ".mailmap" -o -name "*.orig" \) \ -exec rm {} \; -# ln -s $src $P/usr/src/linux + ln -s $src-4.1.15 $P/usr/src/linux install -d $P/sbin cat <<- "EOF" > $P/sbin/installkernel #!/bin/sh @@ -308,20 +305,10 @@ # $4 - default install path (blank if root directory) # - if [ "$(basename $2)" = "zImage" ]; then - # Compressed install - echo "Installing compressed kernel" - base=vmlinuz - else - # Normal install - echo "Installing normal kernel" - base=vmlinux - fi - [ -f $4/config ] && mv $4/config $4/config.old cp .config $4/config - [ -f $4/$base ] && mv $4/$base $4/$base.old - cat $2 > $4/$base + [ -f $4/kernel7.img ] && mv $4/kernel7.img $4/kernel7.old + scripts/mkknlimg $2 > $4/kernel7.img [ -f $4/System.map ] && mv $4/System.map $4/System.old cp $3 $4/System.map @@ -358,11 +345,11 @@ touch -t `date '+%m%d0900'` $docdir/$src convert prune_symlink $P/usr/src - touch -t `date '+%m%d0900'` $P/usr/src/$src/arch/arm/boot/dts/include - touch -t `date '+%m%d0900'` $P/usr/src/$src/arch/metag/boot/dts/include - touch -t `date '+%m%d0900'` $P/usr/src/$src/arch/mips/boot/dts/include - touch -t `date '+%m%d0900'` $P/usr/src/$src/arch/powerpc/boot/dts/include - touch -t `date '+%m%d0900'` $P/usr/src/$src/tools/testing/selftests/powerpc/copyloops + touch -t `date '+%m%d0900'` $P/usr/src/$src-4.1.15/arch/arm/boot/dts/include + touch -t `date '+%m%d0900'` $P/usr/src/$src-4.1.15/arch/metag/boot/dts/include + touch -t `date '+%m%d0900'` $P/usr/src/$src-4.1.15/arch/mips/boot/dts/include + touch -t `date '+%m%d0900'` $P/usr/src/$src-4.1.15/arch/powerpc/boot/dts/include + touch -t `date '+%m%d0900'` $P/usr/src/$src-4.1.15/tools/testing/selftests/powerpc/copyloops tar cvpf $pkg.tar -C $P `cd $P ; find usr/src -maxdepth 1 | tail -n+2` tar rvpf $pkg.tar -C $P `cd $P ; find sbin | tail -n+2` tar rvpf $pkg.tar -C $P usr/share/doc/$src --- plamo/09_kernel/old/kernelsrc-20160204/PlamoBuild.kernelsrc-4.1.15_plamoRPi2 2016-02-04 08:06:31.000000000 +0900 +++ plamo/09_kernel/kernelsrc/PlamoBuild.kernelsrc-4.1.15_plamoRPi2 2016-02-19 08:31:04.000000000 +0900 @@ -13,7 +13,7 @@ pkgbase=kernelsrc vers=4.1.15_plamoRPi2 arch=noarch -build=P2 +build=P3 src=linux OPT_CONFIG="" DOCS="" --- plamo/99_test/old/gcc_all-20160111/PlamoBuild.gcc_all-4.8.4 2016-01-11 18:25:36.000000000 +0900 +++ plamo/99_test/gcc_all/PlamoBuild.gcc_all-4.8.5 2016-01-27 16:51:19.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=gcc_all -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() {