Menu
▾
▴
[Devil-linux-commit] build/scripts LPRng, 1.11, 1.12 awstats, 1.5, 1.6 build-iso, 1.92, 1.93 cd_cleanup, 1.22, 1.23 create_cd_dirs, 1.43, 1.44 dar, 1.6, 1.7 httpd, 1.21, 1.22 krb5, 1.14, 1.15 libdbi, 1.3, 1.4 man-pages, 1.11, 1.12 mysql, 1.36, 1.37 pam_mount, 1.3, 1.4 php, 1.39, 1.40 razor-agents, 1.9, 1.10 samba, 1.42, 1.43 snort, 1.23, 1.24
|
From: Heiko Z. <smi...@us...> - 2015-11-27 21:57:19
|
Update of /cvsroot/devil-linux/build/scripts In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv12969/scripts Modified Files: LPRng awstats build-iso cd_cleanup create_cd_dirs dar httpd krb5 libdbi man-pages mysql pam_mount php razor-agents samba snort Log Message: reduced the ISO sizes and removed unwanted files & folders Index: krb5 =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/krb5,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- krb5 6 Oct 2015 00:59:16 -0000 1.14 +++ krb5 27 Nov 2015 21:57:17 -0000 1.15 @@ -34,6 +34,7 @@ mkdir -p $TMPDIR/usr/sbin || exit 1 make install DESTDIR=$TMPDIR || exit 1 + rm -rf $TMPDIR/usr/share/examples || exit 1 cp -dpR $TMPDIR/usr/share/* $CDDIR/usr/share/ || exit 1 rm -rf $TMPDIR/usr/share || exit 1 copy_docs $TMPDIR Index: httpd =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/httpd,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- httpd 21 Jun 2015 13:23:35 -0000 1.21 +++ httpd 27 Nov 2015 21:57:17 -0000 1.22 @@ -97,6 +97,8 @@ rm -rf $TMPDIR/etc/apache2/build || exit 1 rm -rf $TMPDIR/usr/lib/*a || exit 1 rm -rf $TMPDIR/usr/include || exit 1 + rm -rf $TMPDIR/usr/share/apache2/default-site/htdocs/manual || exit 1 + rm -rf $TMPDIR/usr/share/apache2/icons || exit 1 cp -dpR $TMPDIR/etc/* $ETCDIR/etc/ || exit 1 rm -rf $TMPDIR/etc copy_docs $TMPDIR/ Index: samba =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/samba,v retrieving revision 1.42 retrieving revision 1.43 diff -u -d -r1.42 -r1.43 --- samba 6 Oct 2015 00:59:17 -0000 1.42 +++ samba 27 Nov 2015 21:57:17 -0000 1.43 @@ -47,6 +47,7 @@ rm -rf $TMPDIR/usr/include || exit 1 copy_files $TMPDIR/usr/share/samba $CDDIR/usr/share || exit 1 rm -rf $TMPDIR/usr/share/samba || exit 1 + rm -v $TMPDIR/usr/bin/smbtorture || exit 1 copy_files $TMPDIR/usr $CDDIR/ || exit 1 copy_files $TMPDIR/var $CDDIR/ || exit 1 rm -rf $TMPDIR || exit 1 Index: cd_cleanup =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/cd_cleanup,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- cd_cleanup 31 Oct 2015 14:37:58 -0000 1.22 +++ cd_cleanup 27 Nov 2015 21:57:17 -0000 1.23 @@ -16,7 +16,7 @@ case $1 in install ) - ls -1 $CDDIR/usr/include/* | grep -v "^python" | xargs -n 1 rm -rf + ls -1d $CDDIR/usr/include/* | grep -v "/usr/include/python" | xargs -n 1 rm -rf find $CDDIR -type f -name '*.la' | grep -v Magick | xargs -n 1 rm -f find $CDDIR -type f -name '*.a' | xargs -n 1 rm -f for DIR in $INITRDDIR $CDDIR @@ -31,7 +31,11 @@ done rm -rf $CDDIR/usr/lib/pkgconfig - + rm -rf $CDDIR/usr/share/pkgconfig + rm -rf $CDDIR/usr/share/aclocal + rm -rf $CDDIR/usr/share/doc/* + rm -rf $CDDIR/usr/share/info/* + if [ "$CONFIG_DEVIL_DOC_ISO" != "y" ]; then rm -rf $ISODIR/cdtree/doc || exit 1 fi Index: libdbi =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/libdbi,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- libdbi 5 Dec 2011 09:11:38 -0000 1.3 +++ libdbi 27 Nov 2015 21:57:17 -0000 1.4 @@ -16,7 +16,7 @@ case $1 in build ) - ./configure --prefix=/usr --disable-docs || exit 1 + ./configure --prefix=/usr --localstatedir=/var --disable-docs || exit 1 make $PMAKE all || exit 1 # install it in local system, because other programs could need it Index: awstats =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/awstats,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- awstats 6 Jan 2010 14:53:27 -0000 1.5 +++ awstats 27 Nov 2015 21:57:17 -0000 1.6 @@ -22,6 +22,8 @@ if [ "$CONFIG_AWSTATS" = "y" ]; then rm -rf $TMPDIR || exit 1 + rm -rf tools/webmin 2> /dev/null + mkdir -p $CDDIR/usr/local/awstats || exit 1 cp -dpR * $CDDIR/usr/local/awstats/ || exit 1 Index: create_cd_dirs =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/create_cd_dirs,v retrieving revision 1.43 retrieving revision 1.44 diff -u -d -r1.43 -r1.44 --- create_cd_dirs 6 Oct 2015 00:59:15 -0000 1.43 +++ create_cd_dirs 27 Nov 2015 21:57:17 -0000 1.44 @@ -31,6 +31,8 @@ DIRS='boot lib/modules bin sbin usr/bin usr/sbin usr/lib usr/share usr/share/doc usr/share/man usr/share/info usr/share/devillinux shm opt dev tmp root etc mnt sys jail' mk_dir $CDDIR $DIRS mkdir -p $CDDIR/usr/share/man/man{1,2,3,4,5,6,7,8,9} + ln -sf /usr/share/info $CDDIR/usr/info + ln -sf /usr/share/doc $CDDIR/usr/doc # the initrd tree DIRS='cd cdrom dev floppy lib proc sbin tmp shm' @@ -50,7 +52,7 @@ DIRS='bin boot cd cdrom floppy initrd lib proc sbin var home' mk_dir $CDDIR $DIRS - DIRS='bin doc include info lib man sbin share src' + DIRS='bin include lib man sbin share src' mk_dir $CDDIR/usr $DIRS mk_dir $CDDIR/usr/local $DIRS Index: LPRng =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/LPRng,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- LPRng 5 Dec 2011 09:11:37 -0000 1.11 +++ LPRng 27 Nov 2015 21:57:17 -0000 1.12 @@ -37,6 +37,7 @@ # install it into build system, because we need it later make install DESTDIR=$TMPDIR || exit 1 rm -rf $TMPDIR/usr/lib || exit 1 + rm -rf $TMPDIR/usr/share/LPRng || exit 1 rm -rf $TMPDIR/etc/rc.d || exit 1 find $TMPDIR/etc -name \*.sample | xargs rm || exit 1 copy_docs $TMPDIR Index: pam_mount =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/pam_mount,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- pam_mount 5 Dec 2011 09:11:38 -0000 1.3 +++ pam_mount 27 Nov 2015 21:57:17 -0000 1.4 @@ -16,7 +16,7 @@ case $1 in build ) - ./configure --prefix=/usr --sysconfdir=/etc || exit 1 + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var || exit 1 make $PMAKE || exit 1 ;; Index: snort =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/snort,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- snort 5 Dec 2011 09:11:38 -0000 1.23 +++ snort 27 Nov 2015 21:57:17 -0000 1.24 @@ -36,6 +36,7 @@ rm -rf $TMPDIR || exit 1 mkdir -p $TMPDIR || exit 1 make install DESTDIR=$TMPDIR || exit 1 + rm -rf $TMPDIR/usr/src || exit 1 copy_docs $TMPDIR copy_files $TMPDIR/usr $CDDIR/ || exit 1 rm -rf $TMPDIR || exit 1 Index: dar =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/dar,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- dar 5 Dec 2011 09:11:37 -0000 1.6 +++ dar 27 Nov 2015 21:57:17 -0000 1.7 @@ -20,7 +20,7 @@ build ) if [ "$CONFIG_DAR" = "y" ]; then # Don't use infinints as they suck RAM up. 64bits should allow 4GB^2 of archive. - ./configure --enable-mode=64 --prefix=/usr + ./configure --sysconfdir=/etc --enable-mode=64 --prefix=/usr make LDFLAGS="-Wl,-z,noexecstack" $PMAKE all || exit 1 fi @@ -35,6 +35,7 @@ copy_docs $TMPDIR rm -rf $TMPDIR/usr/{man,info} || exit 1 rm -rf $TMPDIR/usr/include || exit 1 + rm -rf $TMPDIR/usr/share/dar || exit 1 rm -f $TMPDIR/usr/lib/*a || exit 1 mkdir -p $CDDIR copy_files $TMPDIR/usr $CDDIR/ || exit 1 Index: mysql =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/mysql,v retrieving revision 1.36 retrieving revision 1.37 diff -u -d -r1.36 -r1.37 --- mysql 20 Oct 2015 00:22:21 -0000 1.36 +++ mysql 27 Nov 2015 21:57:17 -0000 1.37 @@ -49,6 +49,7 @@ rm -rf $TMPDIR/usr/include || exit 1 test -d $TMPDIR/usr/lib64 && mv $TMPDIR/usr/lib64 $TMPDIR/usr/lib rm $TMPDIR/usr/lib/*.a || exit 1 + rm -v $TMPDIR/usr/bin/mysql*test* || exit 1 copy_docs $TMPDIR rm -rf $TMPDIR/usr/mysql-test || exit 1 rm -rf $TMPDIR/usr/share/mysql-test || exit 1 Index: man-pages =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/man-pages,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- man-pages 23 Feb 2010 00:49:12 -0000 1.11 +++ man-pages 27 Nov 2015 21:57:17 -0000 1.12 @@ -19,19 +19,16 @@ echo copying missing man pages for MAN in man? do - cp -upR $MAN $CDDIR/usr/share/man + cp -vupR $MAN $CDDIR/usr/share/man/ done mv $CDDIR/usr/man $CDDIR/usr/share/man && ln -sf share/man $CDDIR/usr/man echo cleaning out unneeded man directories #delete man pages we don't need in DL - rm -rf $CDDIR/usr/share/man/man2 &> /dev/null - mkdir -p $CDDIR/usr/share/man/man2 - rm -rf $CDDIR/usr/share/man/man3 &> /dev/null - mkdir -p $CDDIR/usr/share/man/man3 - rm -rf $CDDIR/usr/share/man/man9 &> /dev/null - mkdir -p $CDDIR/usr/share/man/man9 + rm -rf $CDDIR/usr/share/man/man2/* &> /dev/null + rm -rf $CDDIR/usr/share/man/man3/* &> /dev/null + rm -rf $CDDIR/usr/share/man/man9/* &> /dev/null rm -rf $CDDIR/usr/share/man/cat2 &> /dev/null rm -rf $CDDIR/usr/share/man/cat3 &> /dev/null rm -rf $CDDIR/usr/share/man/cat9 &> /dev/null @@ -49,14 +46,19 @@ #done #exit 1 + echo "uncompressing man pages" + find $CDDIR/usr/share/man/ -type f -name '*bz2' | xargs -r bunzip2 + find $CDDIR/usr/share/man/ -type f -name '*gz' | xargs -r gunzip + find $CDDIR/usr/share/man/ -type f -name '*lzma' | xargs -r unlzma + echo "compressing man pages" - find $CDDIR/usr/share/man/ -type f -a ! -name '*bz2' -a ! -name '*gz' | xargs -r lzma -f -9 + find $CDDIR/usr/share/man/ -type f | xargs -r xz # Try to fix symlinks broken after compressing for a in $(ls -1d $CDDIR/usr/share/man/*); do pushd $a for i in `find -type l -exec file {} \; | grep "broken symbolic link" | awk ' {print $1}' | tr -s "[:]" "\040"` ; do - $(ln -sf `echo $i | sed 's/\([0-9]\)\(.*\)$/\1/'`'.lzma' `readlink $i | sed 's/\([0-9]\)\(.*\)$/\1/'`'.lzma') && rm -f $i + $(ln -sf `echo $i | sed 's/\([0-9]\)\(.*\)$/\1/'`'.xz' `readlink $i | sed 's/\([0-9]\)\(.*\)$/\1/'`'.xz') && rm -f $i done popd done Index: php =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/php,v retrieving revision 1.39 retrieving revision 1.40 diff -u -d -r1.39 -r1.40 --- php 6 Oct 2015 00:59:17 -0000 1.39 +++ php 27 Nov 2015 21:57:17 -0000 1.40 @@ -20,7 +20,7 @@ build ) if [ "$CONFIG_PHP" = "y" ]; then PARAMS="--sysconfdir=/etc --with-config-file-path=/etc --prefix=/usr --enable-inline-optimization" - PARAMS="$PARAMS --enable-pcntl --enable-cgi " + PARAMS="$PARAMS --mandir=/usr/share/man --enable-pcntl --enable-cgi" PARAMS="$PARAMS --enable-discard-path --with-zlib --with-bz2 --enable-calendar --with-gmp" PARAMS="$PARAMS --enable-dba --with-gdbm --with-db4 --with-xsl=/usr --with-dom-exslt" PARAMS="$PARAMS --enable-ftp --enable-soap --enable-wddx --enable-exif" @@ -102,10 +102,16 @@ make install INSTALL_ROOT=$TMPDIR + mv $TMPDIR/usr/php/man/man1/* $CDDIR/usr/share/man/man1 || exit 1 + rm -rf $TMPDIR/usr/php || exit 1 replace_str $TMPDIR/etc/apache2/httpd.conf ${WORKDIR#*/}/tmp/usr /usr replace_str $TMPDIR/etc/apache2/httpd.conf ${TMPDIR#*/}/usr /usr rm $TMPDIR/etc/apache2/httpd.conf.bak rm $TMPDIR/etc/apache2/httpd.conf.old + rm -rf $TMPDIR/usr/lib/php/build || exit 1 + rm -rf $TMPDIR/usr/lib/php/doc || exit 1 + rm -rf $TMPDIR/usr/lib/php/test || exit 1 + rm -rf $TMPDIR/usr/lib/php/build cp -dp $TMPDIR/etc/apache2/httpd.conf $ETCDIR/etc/apache2/ cp -dp /etc/php.ini $ETCDIR/etc/ || exit 1 cp -dp /etc/pear.conf $ETCDIR/etc/ || exit 1 Index: build-iso =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/build-iso,v retrieving revision 1.92 retrieving revision 1.93 diff -u -d -r1.92 -r1.93 --- build-iso 27 Nov 2015 17:15:11 -0000 1.92 +++ build-iso 27 Nov 2015 21:57:17 -0000 1.93 @@ -250,7 +250,7 @@ # and gzip our ramdisk image and put it in the right place. #gzip -9 -c $WORKDIR/ramdisk > $BOOTIMAGEDIR/initrd.gz - gzip -c $WORKDIR/ramdisk > $BOOTIMAGEDIR/initrd.gz + gzip -9 -c $WORKDIR/ramdisk > $BOOTIMAGEDIR/initrd.gz # we are done with the uncompressed ramdisk image, delete it rm $WORKDIR/ramdisk Index: razor-agents =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/razor-agents,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- razor-agents 5 Dec 2011 09:11:38 -0000 1.9 +++ razor-agents 27 Nov 2015 21:57:17 -0000 1.10 @@ -35,7 +35,8 @@ make DESTDIR=$TMPDIR install || exit 1 - copy_docs $TMPDIR + find -name raz\*.1 -exec mv -vf {} $CDDIR/usr/share/man/man1 \; + rm -rf $TMPDIR/usr/share/man || exit 1 copy_files $TMPDIR/usr $CDDIR/ || exit 1 rm -rf $TMPDIR || exit 1 fi |
