Update of /cvsroot/devil-linux/build/scripts
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv13811/scripts
Modified Files:
functions sagator
Log Message:
added patch for sagator to support umask for milter socket
Index: sagator
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/sagator,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- sagator 30 Aug 2010 20:31:10 -0000 1.22
+++ sagator 2 Dec 2010 18:25:58 -0000 1.23
@@ -19,10 +19,8 @@
case $1 in
build )
if [ "$CONFIG_SAGATOR" = "y" ]; then
- if [ ! -f devil_patch_done ]; then
- bzcat $DL_DIR/src/sagator_clamav-0.96.2.patch.bz2 | patch -p0 || exit 1
- touch devil_patch_done
- fi
+ patch_from_file 0 $DL_DIR/src/sagator_clamav-0.96.2.patch.bz2
+ patch_from_file 1 $DL_DIR/src/sagator-milter_umask.patch.bz2
#replace_str Makefile python2.2 python2.3
export PYTHONHOME=$WORKDIR/Python-install/usr
Index: functions
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/functions,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -d -r1.70 -r1.71
--- functions 2 Dec 2010 18:18:13 -0000 1.70
+++ functions 2 Dec 2010 18:25:58 -0000 1.71
@@ -524,11 +524,11 @@
fi
}
-# patch_from_file <path-to-patch> <-pX>
+# patch_from_file <-pX> <path-to-patch>
function patch_from_file {
- PATCH=$1
+ PATCH=$2
EXTENSION=${PATCH##*.}
- P=$2
+ P=$1
FLAGPATCH=.devil-linux-patch-${PATCH//\//_}.done
if [ ! -f ${FLAGPATCH} ]; then
echo "applying patch: $PATCH"
|
