diff options
Diffstat (limited to 'security/drweb-sendmail/files/patch-aa')
| -rw-r--r-- | security/drweb-sendmail/files/patch-aa | 108 |
1 files changed, 62 insertions, 46 deletions
diff --git a/security/drweb-sendmail/files/patch-aa b/security/drweb-sendmail/files/patch-aa index e2fe53f64570..29746db21562 100644 --- a/security/drweb-sendmail/files/patch-aa +++ b/security/drweb-sendmail/files/patch-aa @@ -1,57 +1,73 @@ ---- configure.orig Tue Oct 16 19:28:21 2001 -+++ configure Wed Feb 20 23:50:34 2002 -@@ -135,7 +135,7 @@ +--- configure.orig Mon Mar 18 20:43:16 2002 ++++ configure Fri May 10 11:49:42 2002 +@@ -104,7 +104,7 @@ + if [ "$INPUT" != "y" -a "x$INPUT" != "x" ] ; then MILTER_VER="FFR" - fi - + fi - if [ $MILTER_VER = "STD" ] ; then + if [ $MILTER_VER = "xSTD" ] ; then SM_LIB="libsm" SM_LIB_CMD="-lsm" - elif [ $OS = "Linux_DW" ] ; then -@@ -173,40 +173,15 @@ - rm -f configure.cache - echo $n "${SM_DIR}${c}" >> configure.cache - -- OBJ_DIR=`ls -1 "$SM_DIR" | grep "obj.*"` -- if [ ! -d "$SM_DIR/$OBJ_DIR" ] ; then + elif [ $OS = "Linux" ] ; then +@@ -114,52 +114,6 @@ + SM_LIB="" + SM_LIB_CMD="" + fi +- if [ ! -f include/libmilter/mfapi.h ] ; then +- echo "no include/libmilter/mfapi.h" +- fi +- if [ ! -f include/libmilter/mfdef.h ] ; then +- echo "no include/libmilter/mfdef.h" +- fi +- if [ "x$SM_LIB" != "x" -a ! -f "lib/$SM_LIB.a" ] ; then +- NO_ADD="yes" +- echo "no lib/$SM_LIB.a" +- else +- NO_ADD="no" +- fi +- if [ ! -f lib/libmilter.a ] ; then +- echo "no lib/libmilter.a" +- fi +- if [ ! -f include/libmilter/mfapi.h\ +- -o\ +- ! -f include/libmilter/mfdef.h\ +- -o\ +- ! -f lib/libmilter.a\ +- -o $NO_ADD = "yes" ] ; then +- echo +- echo "Please copy (or make symlinks) for next files:" +- echo "in ./include/libmilter directory mfapi.h and mfdef.h" +- echo $n "in ./lib directory libmilter.a" +- if [ $SM_LIB = "libsm" -a $OS = "Linux" ] ; then +- echo " and libsm.a" +- elif [ $SM_LIB = "libsmutil" ] ; then +- echo " and libsmutil.a" +- else +- echo +- fi - echo -- echo "Cannot found directory in that Sendmail puts results of compilation" -- echo "Please re-build Sendmail or enter name (not a path) of this directory" -- echo $n ">$c" -- read INPUT -- if [ "x$INPUT" = "x" ] ; then -- echo "Try later." -- exit 2 -- elif [ ! -d "$SM_DIR/$INPUT" ] ; then -- echo "$SM_DIR/$INPUT not found" -- exit 1 +- echo "So you should have next tree:" +- echo "include/libmilter/mfapi.h" +- echo " mfdef.h" +- echo "lib/libmilter.a" +- if [ $SM_LIB = "libsm" -a $OS = "Linux" ] ; then +- echo " libsm.a" +- elif [ $SM_LIB = "libsmutil" ] ; then +- echo " libsmutil.a" - fi -- OBJ_DIR="$INPUT" -- fi -- -- if [ ! -f "$SM_DIR/$OBJ_DIR/libmilter/libmilter.a" ] ; then -- echo "Cannot found Milter library (libmilter.a)" -- echo "Please go to $SM_DIR/libmilter and build it" +- echo +- echo "Do it and try again" - exit 1 - fi -- if [ "x$SM_LIB" != "x" -a ! -f "$SM_DIR/$OBJ_DIR/$SM_LIB/$SM_LIB.a" ] ; then -- echo "Cannot found additional library ($SM_LIB.a)" -- echo "Please go to $SM_DIR and check it" -- exit 1 -- fi - rm -fr include/libmilter - rm -f lib/libmilter.a -- ln -s "$SM_DIR/include/libmilter" include/libmilter -- ln -s "$SM_DIR/$OBJ_DIR/libmilter/libmilter.a" lib/libmilter.a -+ if [ ! -f /usr/lib/libmilter.a ] ; then -+ ln -s "$SM_DIR/include/libmilter" include/libmilter -+ ln -s "../libmilter/libmilter.a" lib/libmilter.a -+ fi - if [ "x$SM_LIB" != "x" ] ; then - rm -f "lib/$SM_LIB.a" -- ln -s "$SM_DIR/$OBJ_DIR/$SM_LIB/$SM_LIB.a" "lib/$SM_LIB.a" -+ ln -s "../libsmutil/$SM_LIB.a" "lib/$SM_LIB.a" - fi else DRWEB_SM="" + fi +@@ -256,7 +210,7 @@ + if [ "x$BSD_MAKE" = "xyes" ] ; then + COMPILE_RULE_1=".c.o:" + COMPILE_RULE_2=" \$(CC) -c \$(ADD_CFLAGS) -D__SIGNAL_BASED_DW \${.ALLSRC}" +- COMPILE_RULE_3=" \$(CC) -c \$(ADD_CFLAGS) -D__THREAD_BASED_DW \${.ALLSRC} -o \${.PREFIX}_r.o" ++ COMPILE_RULE_3=" \$(CC) -c \$(ADD_CFLAGS) -D_THREAD_SAFE -D__THREAD_BASED_DW \${.ALLSRC} -o \${.PREFIX}_r.o" + COMPILE_RULE_4="" + else + COMPILE_RULE_1="%.o: %.c" |