Update of /cvsroot/devil-linux/build/scripts
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv2952/scripts
Modified Files:
Python clamav grub
Log Message:
only use paxctl when it's actually there...
Index: Python
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/Python,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- Python 24 Jan 2015 21:08:15 -0000 1.35
+++ Python 7 Feb 2015 00:34:55 -0000 1.36
@@ -58,8 +58,10 @@
cp -dpvf pyconfig.h $CDDIR/usr/include/python*/ || exit 1
rm -rf $TMPDIR
- # otherwise sagator won't work with the new clamav
- paxctl -m $CDDIR/usr/bin/python
+ if [ "$CONFIG_GRSECURITY" = "y" ] ; then
+ # otherwise sagator won't work with the new clamav
+ paxctl -m $CDDIR/usr/bin/python
+ fi
fi
;;
Index: clamav
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/clamav,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- clamav 18 Oct 2013 21:29:59 -0000 1.26
+++ clamav 7 Feb 2015 00:34:55 -0000 1.27
@@ -47,9 +47,11 @@
rm -rf $TMPDIR/usr/include || exit 1
rm -rf $TMPDIR/usr/lib/*a || exit 1
- paxctl -m $TMPDIR/usr/lib/*
- paxctl -m $TMPDIR/usr/bin/*
- paxctl -m $TMPDIR/usr/sbin/*
+ if [ "$CONFIG_GRSECURITY" = "y" ] ; then
+ paxctl -m $TMPDIR/usr/lib/*
+ paxctl -m $TMPDIR/usr/bin/*
+ paxctl -m $TMPDIR/usr/sbin/*
+ fi
copy_docs $TMPDIR
Index: grub
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/grub,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- grub 18 Dec 2011 21:22:49 -0000 1.26
+++ grub 7 Feb 2015 00:34:55 -0000 1.27
@@ -31,8 +31,10 @@
rm -rf $TMPDIR || exit 1
mkdir -p $TMPDIR || exit 1
make install DESTDIR=$TMPDIR || exit 1
- paxctl -pemrxs $TMPDIR/sbin/*
- paxctl -pemrxs $TMPDIR/usr/bin/*
+ if [ "$CONFIG_GRSECURITY" = "y" ] ; then
+ paxctl -pemrxs $TMPDIR/sbin/*
+ paxctl -pemrxs $TMPDIR/usr/bin/*
+ fi
copy_docs $TMPDIR
cp -dpvR $TMPDIR/etc/* $ETCDIR/etc/ || exit 1
rm -rf $TMPDIR/etc
|
