Menu
▾
▴
[Devil-linux-commit] build/scripts LPRng, 1.5, 1.6 bash, 1.8, 1.9 gawk, 1.10, 1.11 postfix, 1.37, 1.38
|
From: Heiko Z. <smi...@us...> - 2009-09-09 19:49:45
|
Update of /cvsroot/devil-linux/build/scripts In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv28767/scripts Modified Files: LPRng bash gawk postfix Log Message: - updated ImageMagick-6.5.5-8 - updated LPRng-3.8.33 - updated alsa-driver-1.0.21 - updated alsa-lib-1.0.21 - updated alsa-tools-1.0.21 - updated alsa-utils-1.0.21 - updated bash-3.2.48 - updated cdrtools-2.01.01a64 - updated dnsmasq-2.50 - updated dovecot-1.2.4 - updated e2fsprogs-1.41.9 - updated gawk-3.1.7 - updated glib-2.21.6 - updated gmp-4.3.1 - updated gnupg-1.4.10 - updated gnutls-2.8.3 - updated postfix-2.6.5 - updated shorewall-common-4.2.11 - updated shorewall-perl-4.2.11 - updated shorewall-shell-4.2.11 - upgrade-config now corrects the syslog-ng configuration for the new version Index: postfix =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/postfix,v retrieving revision 1.37 retrieving revision 1.38 diff -u -d -r1.37 -r1.38 --- postfix 27 Sep 2008 13:33:46 -0000 1.37 +++ postfix 9 Sep 2009 19:49:32 -0000 1.38 @@ -72,32 +72,19 @@ install ) if [ "$CONFIG_POSTFIX" = "y" ]; then - mkdir -p $CDDIR/usr/{bin,sbin} || exit 1 - mkdir -p $CDDIR/usr/libexec/postfix || exit 1 - mkdir -p $CDDIR/usr/lib || exit 1 - mkdir -p $CDDIR/var/lib/postfix || exit 1 - copy_man man/man1 - copy_man man/man5 - copy_man man/man8 - mkdir -p $DOCDIR/postfix || exit 1 - cp -dp README_FILES/* $DOCDIR/postfix || exit 1 - - chmod 755 bin/* || exit 1 - cp -dp bin/* $CDDIR/usr/sbin || exit 1 - [ ! -e $CDDIR/usr/bin/mailq ] && ln -sf ../sbin/sendmail $CDDIR/usr/bin/mailq - [ ! -e $CDDIR/usr/bin/newaliases ] && ln -sf ../sbin/sendmail $CDDIR/usr/bin/newaliases - [ ! -e $CDDIR/usr/lib/sendmail ] && ln -sf ../sbin/sendmail $CDDIR/usr/lib/sendmail + mkdir -p $TMPDIR + make non-interactive-package install_root=$TMPDIR data_directory=/var/spool/postfix manpage_directory=/usr/share/man - cp -dp libexec/* $CDDIR/usr/libexec/postfix/ || exit 1 - ln -sf smtp $CDDIR/usr/libexec/postfix/lmtp || exit 1 - ln -sf qmgr $CDDIR/usr/libexec/postfix/nqmgr || exit 1 - mkdir -p $ETCDIR/etc/postfix || exit 1 - cp -dp conf/* $ETCDIR/etc/postfix || exit 1 - rm $ETCDIR/etc/postfix/*.rej 2> /dev/null - rm $ETCDIR/etc/postfix/LICENSE - rm $ETCDIR/etc/postfix/TLS_LICENSE + cp -fdpvR $TMPDIR/etc/* $ETCDIR/etc/ || exit 1 + ln -sf /usr/sbin/sendmail /usr/lib/sendmail || exit 1 + rm -rf $TMPDIR/etc || exit 1 touch $ETCDIR/etc/aliases + copy_man $TMPDIR + + cp -fdpvR $TMPDIR/* $CDDIR/ || exit 1 + rm -rf $TMPDIR || exit 1 + # set some default parameters echo "mail_name = Postfix on Devil-Linux" >> $ETCDIR/etc/postfix/main.cf echo "canonical_maps = hash:/etc/postfix/canonical" >> $ETCDIR/etc/postfix/main.cf @@ -107,29 +94,27 @@ echo "transport_maps = hash:/etc/postfix/transport" >> $ETCDIR/etc/postfix/main.cf echo "masquerade_exceptions = root" >> $ETCDIR/etc/postfix/main.cf - replace_str $ETCDIR/etc/postfix/main.cf "setgid_group =" "setgid_group = postdrop" + #replace_str $ETCDIR/etc/postfix/main.cf "setgid_group =" "setgid_group = postdrop" replace_str $ETCDIR/etc/postfix/main.cf "#alias_database = hash:/etc/aliases" "alias_database = hash:/etc/aliases" - replace_str $ETCDIR/etc/postfix/main.cf "sendmail_path =" "#sendmail_path =" - replace_str $ETCDIR/etc/postfix/main.cf "newaliases_path =" "#newaliases_path =" - replace_str $ETCDIR/etc/postfix/main.cf "mailq_path =" "#mailq_path =" - replace_str $ETCDIR/etc/postfix/main.cf "manpage_directory =" "#manpage_directory =" - replace_str $ETCDIR/etc/postfix/main.cf "sample_directory =" "#sample_directory =" - replace_str $ETCDIR/etc/postfix/main.cf "readme_directory =" "#readme_directory =" - replace_str $ETCDIR/etc/postfix/main.cf "/var/lib/postfix" "/var/spool/postfix" + #replace_str $ETCDIR/etc/postfix/main.cf "sendmail_path =" "#sendmail_path =" + #replace_str $ETCDIR/etc/postfix/main.cf "newaliases_path =" "#newaliases_path =" + #replace_str $ETCDIR/etc/postfix/main.cf "mailq_path =" "#mailq_path =" + #replace_str $ETCDIR/etc/postfix/main.cf "manpage_directory =" "#manpage_directory =" + #replace_str $ETCDIR/etc/postfix/main.cf "sample_directory =" "#sample_directory =" + #replace_str $ETCDIR/etc/postfix/main.cf "readme_directory =" "#readme_directory =" + #replace_str $ETCDIR/etc/postfix/main.cf "/var/lib/postfix" "/var/spool/postfix" # set correct file permissions chmod 755 $CDDIR/usr/libexec/postfix/* || exit 1 chown 101.102 $CDDIR/usr/sbin/{postqueue,postdrop} || exit 1 chmod 2755 $CDDIR/usr/sbin/{postqueue,postdrop} || exit 1 - mkdir -p $CDDIR/var/spool/postfix/{maildrop,public} || exit 1 + chown -R 101.102 $CDDIR/var/spool/postfix/* || exit 1 chown 101.0 $CDDIR/var/spool/postfix || exit 1 - chown 101.102 $CDDIR/var/spool/postfix/{maildrop,public} || exit 1 chmod 1733 $CDDIR/var/spool/postfix/maildrop || exit 1 chmod 755 $CDDIR/var/spool/postfix/public || exit 1 - chmod 755 $ETCDIR/etc/postfix/post-install || exit 1 - chmod 755 $ETCDIR/etc/postfix/postfix-script || exit 1 + #chmod 755 $ETCDIR/etc/postfix/post-install || exit 1 + #chmod 755 $ETCDIR/etc/postfix/postfix-script || exit 1 chmod o+r $ETCDIR/etc/postfix/* || exit 1 - chown 101.0 $CDDIR/var/lib/postfix || exit 1 groupadd -g 101 postfix || exit 1 groupadd -g 102 postdrop || exit 1 Index: LPRng =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/LPRng,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- LPRng 21 Mar 2007 10:19:29 -0000 1.5 +++ LPRng 9 Sep 2009 19:49:32 -0000 1.6 @@ -32,7 +32,7 @@ sed -i 's@\(fi\|done\) \\@\1; \\@' Makefile.in && replace_str ./Makefile.in 'SHELL="@SHELL@"' 'SHELL=@SHELL@' && ./configure --prefix=/usr --localstatedir=/var --sysconfdir=/etc \ - --with-userid=lpadmin --with-groupid=lpadmin --disable-nls --with-pic || exit 1 + --with-userid=lpadmin --with-groupid=lpadmin --disable-nls --with-pic --disable-werror || exit 1 make $PMAKE all || exit 1 strip_debug fi Index: bash =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/bash,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- bash 17 Feb 2008 22:08:32 -0000 1.8 +++ bash 9 Sep 2009 19:49:32 -0000 1.9 @@ -27,7 +27,6 @@ build ) if [ ! -f .done_dl_patches ]; then bzcat $DL_DIR/src/bash-3.2-arc4random-1.patch.bz2 | patch -p1 || exit 1 - bzcat $DL_DIR/src/bash-3.2-fixes-7.patch.bz2 | patch -p1 || exit 1 touch .done_dl_patches fi ./configure --prefix=/usr --bindir=/bin \ Index: gawk =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/gawk,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- gawk 1 May 2007 00:30:31 -0000 1.10 +++ gawk 9 Sep 2009 19:49:32 -0000 1.11 @@ -26,7 +26,7 @@ case $1 in build ) if [ ! -f .DL-patch.done ]; then - bzcat $DL_DIR/src/gawk-3.1.5-segfault_fix-1.patch.bz2 | patch -p1 || exit 1 + #bzcat $DL_DIR/src/gawk-3.1.5-segfault_fix-1.patch.bz2 | patch -p1 || exit 1 touch .DL-patch.done fi ./configure --prefix=/usr --libexecdir=/usr/bin --disable-nls || exit 1 |
