[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Mldonkey-commits] mldonkey config/Makefile.config.in config/Makef...
|
From: |
mldonkey-commits |
|
Subject: |
[Mldonkey-commits] mldonkey config/Makefile.config.in config/Makef... |
|
Date: |
Thu, 26 Jan 2006 00:25:26 +0000 |
CVSROOT: /sources/mldonkey
Module name: mldonkey
Branch:
Changes by: spiralvoice <address@hidden> 06/01/26 00:25:25
Modified files:
config : Makefile.config.in Makefile.in config.h.in
configure.in
distrib : ChangeLog
src/daemon/common: commonNetwork.ml
src/daemon/driver: driverInteractive.ml
src/networks/donkey: donkeyClient.ml donkeyGlobals.ml
donkeyInteractive.ml donkeyMain.ml
donkeyOptions.ml
src/utils/lib : autoconf.ml.new.in stubs_c.c unix32.ml
unix32.mli
Added files:
src/networks/donkey: donkeySui.ml.in donkeySui1.ml donkeySui2.ml
src/utils/lib : CryptoPP_stubs.c CryptoPP_stubs.h
Log message:
patch #4823
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/config/Makefile.config.in.diff?tr1=1.55&tr2=1.56&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/config/Makefile.in.diff?tr1=1.142&tr2=1.143&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/config/config.h.in.diff?tr1=1.22&tr2=1.23&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/config/configure.in.diff?tr1=1.246&tr2=1.247&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/distrib/ChangeLog.diff?tr1=1.685&tr2=1.686&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/daemon/common/commonNetwork.ml.diff?tr1=1.25&tr2=1.26&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/daemon/driver/driverInteractive.ml.diff?tr1=1.57&tr2=1.58&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/networks/donkey/donkeyClient.ml.diff?tr1=1.81&tr2=1.82&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/networks/donkey/donkeyGlobals.ml.diff?tr1=1.73&tr2=1.74&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/networks/donkey/donkeyInteractive.ml.diff?tr1=1.85&tr2=1.86&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/networks/donkey/donkeyMain.ml.diff?tr1=1.44&tr2=1.45&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/networks/donkey/donkeyOptions.ml.diff?tr1=1.36&tr2=1.37&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/networks/donkey/donkeySui.ml.in?rev=1.1
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/networks/donkey/donkeySui1.ml?rev=1.1
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/networks/donkey/donkeySui2.ml?rev=1.1
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/utils/lib/CryptoPP_stubs.c?rev=1.1
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/utils/lib/CryptoPP_stubs.h?rev=1.1
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/utils/lib/autoconf.ml.new.in.diff?tr1=1.21&tr2=1.22&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/utils/lib/stubs_c.c.diff?tr1=1.31&tr2=1.32&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/utils/lib/unix32.ml.diff?tr1=1.55&tr2=1.56&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/utils/lib/unix32.mli.diff?tr1=1.19&tr2=1.20&r1=text&r2=text
Patches:
Index: mldonkey/config/Makefile.config.in
diff -u mldonkey/config/Makefile.config.in:1.55
mldonkey/config/Makefile.config.in:1.56
--- mldonkey/config/Makefile.config.in:1.55 Wed Jan 4 22:32:42 2006
+++ mldonkey/config/Makefile.config.in Thu Jan 26 00:25:24 2006
@@ -33,7 +33,7 @@
address@hidden@
address@hidden@
address@hidden@
address@hidden@
address@hidden@
address@hidden@
address@hidden@
address@hidden@
Index: mldonkey/config/Makefile.in
diff -u mldonkey/config/Makefile.in:1.142 mldonkey/config/Makefile.in:1.143
--- mldonkey/config/Makefile.in:1.142 Wed Jan 25 22:29:53 2006
+++ mldonkey/config/Makefile.in Thu Jan 26 00:25:24 2006
@@ -26,7 +26,7 @@
NO_LIBS_byte=
NO_LIBS_opt=
NO_STATIC_LIBS_opt=
-
+NO_CMXA=
LIBS_byte=-custom unix.cma str.cma
LIBS_opt= unix.cmxa str.cmxa
@@ -102,9 +102,6 @@
CFLAGS:=$(CFLAGS) $(CONFIG_INCLUDES) $(GTKCFLAGS)
-# CryptoPP doesn't like -fomit-frame-pointer
-CXXFLAGS:=$(CXXFLAGS) -fno-omit-frame-pointer
-
# use_tags$(EXE)
TARGETS= mlnet$(EXE)
@@ -194,7 +191,6 @@
$(LIB)/md4_comp.c $(LIB)/md4_c.c \
$(LIB)/gettext.ml4 $(LIB)/md5_c.c $(LIB)/sha1_c.c \
$(LIB)/tiger.c \
- $(LIB)/CryptoPP.cc \
$(LIB)/stubs_c.c $(LIB)/set2.ml $(LIB)/queues.ml \
$(LIB)/charsetstubs.c $(LIB)/charset.ml
@@ -302,11 +298,19 @@
MAIN_SRCS=$(COMMON)/commonMain.ml
-DONKEY_SRCS= \
+ifeq ("$(DONKEY_SUI)", "yes")
+ CRYPTOPP_LIBS_flags += -cc $(CXX) $(CXXFLAGS) -ccopt -fno-omit-frame-pointer
+ DONKEY_SRCS += $(LIB)/CryptoPP.cc $(LIB)/CryptoPP_stubs.c
$(SRC_DONKEY)/donkeySui1.ml $(SRC_DONKEY)/donkeySui.ml
+else
+ DONKEY_SRCS += $(SRC_DONKEY)/donkeySui2.ml $(SRC_DONKEY)/donkeySui.ml
+endif
+
+DONKEY_SRCS += \
\
$(SRC_DONKEY)/donkeyTypes.ml \
$(SRC_DONKEY)/donkeyOptions.ml \
- $(SRC_DONKEY)/donkeyMftp.ml $(SRC_DONKEY)/donkeyImport.ml \
+ $(SRC_DONKEY)/donkeyMftp.ml \
+ $(SRC_DONKEY)/donkeyImport.ml \
$(SRC_DONKEY)/donkeyOpenProtocol.ml \
$(SRC_DONKEY)/donkeyProtoClient.ml \
$(SRC_DONKEY)/donkeyProtoServer.ml \
@@ -315,7 +319,7 @@
\
$(SRC_DONKEY)/donkeyGlobals.ml \
$(SRC_DONKEY)/donkeyProtoCom.ml \
- \
+ \
$(SRC_DONKEY)/donkeyComplexOptions.ml \
$(SRC_DONKEY)/donkeySupernode.ml \
$(SRC_DONKEY)/donkeyShare.ml \
@@ -337,9 +341,6 @@
$(SRC_DONKEY)/donkeyInteractive.ml \
$(SRC_DONKEY)/donkeyMain.ml
-# $(SRC_DONKEY)/donkeySourcesMisc.ml \
-# $(SRC_DONKEY)/donkeySources.ml \
-
OPENNAP_SRCS= \
$(SRC_OPENNAP)/napigator.mll \
@@ -1408,18 +1409,15 @@
CORE_SRCS += $($2_SRCS)
-## TARGETS += $1$(EXE)
-
-ifneq ("$(GUI)" , "no")
-
-## BUNDLE_TARGETS += $1+gui$(EXE)
-
endif
-endif
-
$1_CMXA= cdk.cmxa common.cmxa client.cmxa $1.cmxa driver.cmxa
+
+ifeq ("$2", "DONKEY")
+$1_SRCS+= $(CRYPTOPP_SRCS) $(MAIN_SRCS)
+else
$1_SRCS= $(MAIN_SRCS)
+endif
EXPAND_LIB($2,$1)
@@ -1497,8 +1495,6 @@
######################################################################
-NO_CMXA=
-
define([[EXPAND]],[[
$1_ZOG := $(filter %.zog, $($1_SRCS))
$1_MLL := $(filter %.mll, $($1_SRCS))
@@ -1518,17 +1514,17 @@
TMPSOURCES += $($1_ML4:.ml4=.ml) $($1_MLT:.mlt=.ml) $($1_MLP:.mlcpp=.ml)
$($1_MLL:.mll=.ml) $($1_MLY:.mly=.ml) $($1_MLY:.mly=.mli) $($1_ZOG:.zog=.ml)
$2: $($1_OBJS) $($1_CMXS) $($1_CMXAS)
- $(OCAMLOPT) -cc "$(CXX)" -linkall $(PLUGIN_FLAG) -o address@hidden
$($1_OBJS) $(LIBS_opt) $(LIBS_flags) $($3_LIBS_opt) $($3_LIBS_flags)
$($5_LIBS_opt) $($5_LIBS_flags) -I build $($1_CMXAS) $($1_CMXS)
+ $(OCAMLOPT) -linkall $(PLUGIN_FLAG) -o address@hidden $($1_OBJS)
$(LIBS_opt) $(LIBS_flags) $($3_LIBS_opt) $($3_LIBS_flags) $($5_LIBS_opt)
$($5_LIBS_flags) $($6_LIBS_opt) $($6_LIBS_flags) -I build $($1_CMXAS)
$($1_CMXS)
$2.byte: $($1_OBJS) $($1_CMOS) $($1_CMAS)
- $(OCAMLC) -cc "$(CXX)" -linkall -o address@hidden $($1_OBJS)
$(LIBS_byte) $(LIBS_flags) $($3_LIBS_byte) $($3_LIBS_flags) $($5_LIBS_byte)
$($5_LIBS_flags) -I build $($1_CMAS) $($1_CMOS)
+ $(OCAMLC) -linkall -o address@hidden $($1_OBJS) $(LIBS_byte)
$(LIBS_flags) $($3_LIBS_byte) $($3_LIBS_flags) $($5_LIBS_byte) $($5_LIBS_flags)
$($6_LIBS_byte) $($6_LIBS_flags) -I build $($1_CMAS) $($1_CMOS)
$2.static: $($1_OBJS) $($1_CMXS) $($1_CMXAS)
- $(OCAMLOPT) -cc "$(CXX)" -linkall $(PLUGIN_FLAG) -ccopt -static -o
address@hidden $($1_OBJS) $(LIBS_opt) $(LIBS_flags) $($3_LIBS_flags)
$($3_STATIC_LIBS_opt) $($5_LIBS_flags) $($5_STATIC_LIBS_opt) -I build
$($1_CMXAS) $($1_CMXS)
+ $(OCAMLOPT) -linkall $(PLUGIN_FLAG) -ccopt -static -o address@hidden
$($1_OBJS) $(LIBS_opt) $(LIBS_flags) $($3_LIBS_flags) $($3_STATIC_LIBS_opt)
$($5_LIBS_flags) $($5_STATIC_LIBS_opt) $($6_LIBS_flags) $($6_STATIC_LIBS_opt)
-I build $($1_CMXAS) $($1_CMXS)
]])
-EXPAND(mldonkey,mldonkey,NO,mldonkey,GD)
-EXPAND(mldonkey+gui,mldonkey+gui,GTK,mldonkey+gui,GD)
+EXPAND(mldonkey,mldonkey,NO,mldonkey,GD,CRYPTOPP)
+EXPAND(mldonkey+gui,mldonkey+gui,GTK,mldonkey+gui,GD,CRYPTOPP)
EXPAND(MLPROGRESS, mlprogress,GTK, MLPROGRESS)
EXPAND(MLDONKEYGUI,mlgui,GTK,MLDONKEYGUI)
@@ -1540,12 +1536,18 @@
EXPAND(mldc+gui,mldc+gui,GTK,mldc+gui,GD)
EXPAND(mlnap,mlnap,NO,mlnap,GD)
EXPAND(mlnap+gui,mlnap+gui,GTK,mlnap+gui,GD)
-EXPAND(MLNET,mlnet,NO,MLNET,GD)
-EXPAND(mlnet+gui,mlnet+gui,GTK,mlnet+gui,GD)
+EXPAND(MLNET,mlnet,NO,MLNET,GD,CRYPTOPP)
+EXPAND(mlnet+gui,mlnet+gui,GTK,mlnet+gui,GD,CRYPTOPP)
EXPAND(mlgnut,mlgnut,NO,mlgnut,GD)
-EXPAND(mlbt,mlbt,NO,mlbt,GD)
EXPAND(mlgnut+gui,mlgnut+gui,GTK,mlgnut+gui,GD)
+EXPAND(mlg2,mlg2,NO,mlg2,GD)
+EXPAND(mlg2+gui,mlg2+gui,GTK,mlg2+gui,GD)
+EXPAND(mlbt,mlbt,NO,mlbt,GD)
EXPAND(mlbt+gui,mlbt+gui,GTK,mlbt+gui,GD)
+EXPAND(mlfasttrack,mlfasttrack,NO,mlfasttrack,GD)
+EXPAND(mlfasttrack+gui,mlfasttrack+gui,GTK,mlfasttrack+gui,GD)
+EXPAND(mlfileTP,mlfiletp,NO,mlfileTP,GD)
+EXPAND(mlfileTP+gui,mlfiletp+gui,GTK,mlfileTP+gui,GD)
EXPAND(mlslsk,mlslsk,NO,mlslsk,GD)
EXPAND(mlslsk+gui,mlslsk+gui,GTK,mlslsk+gui,GD)
EXPAND(MLDONKEY_IM,mlim,GTK,MLDONKEY_IM)
@@ -1596,7 +1598,7 @@
TMPSOURCES += $(TOP_ML4:.ml4=.ml) $(TOP_MLL:.mll=.ml) $(TOP_MLY:.mly=.ml)
$(TOP_MLY:.mly=.mli) $(TOP_ZOG:.zog=.ml)
mldonkeytop: $(TOP_OBJS) $(TOP_CMOS) $(TOP_CMAS)
- $(OCAMLMKTOP) -cc "$(CXX)" -linkall $(PLUGIN_FLAG) -o $@ $(TOP_OBJS)
$(LIBS_byte) $(LIBS_flags) $(_LIBS_byte) $(_LIBS_flags) -I build $(TOP_CMAS)
$(TOP_CMOS)
+ $(OCAMLMKTOP) -linkall $(PLUGIN_FLAG) -o $@ $(TOP_OBJS) $(LIBS_byte)
$(LIBS_flags) $(_LIBS_byte) $(_LIBS_flags) $(CRYPTOPP_LIBS_byte)
$(CRYPTOPP_LIBS_flags) -I build $(TOP_CMAS) $(TOP_CMOS)
@@ -1700,6 +1702,7 @@
rm -f packages/slackware/mldonkey.options
rm -f packages/windows/mlnet.nsi
rm -f src/daemon/driver/driverGraphics.ml
+ rm -f src/networks/donkey/donkeySui.ml
rm -f src/utils/lib/autoconf.ml
rm -f src/utils/lib/autoconf.ml.new
rm -f src/utils/lib/gAutoconf.ml
Index: mldonkey/config/config.h.in
diff -u mldonkey/config/config.h.in:1.22 mldonkey/config/config.h.in:1.23
--- mldonkey/config/config.h.in:1.22 Wed Nov 30 23:46:24 2005
+++ mldonkey/config/config.h.in Thu Jan 26 00:25:24 2006
@@ -159,3 +159,6 @@
/* Define to 1 if you have the <gnu/libc-versions.h> header file. */
#undef HAVE_GNU_LIBC_VERSION_H
+
+/* Define to 1 if you want to use CryptoPP */
+#undef HAVE_CRYPTOPP
Index: mldonkey/config/configure.in
diff -u mldonkey/config/configure.in:1.246 mldonkey/config/configure.in:1.247
--- mldonkey/config/configure.in:1.246 Wed Jan 25 22:29:53 2006
+++ mldonkey/config/configure.in Thu Jan 26 00:25:24 2006
@@ -13,17 +13,9 @@
SUB_VERSION=3 # range 0-7 due to eMule limitations
AC_PROG_CC
+CC_VERSION=`$CC -dumpversion`
AC_EXEEXT
AC_PROG_CPP
-AC_PROG_CXX
-
-AC_CHECK_TOOL(NEWCXX, [$CXX], [$CXX], [no])
-if test x"$NEWCXX" = x"no"
-then
- AC_MSG_ERROR("No valid c++ compiler found")
-else
- CXX=$NEWCXX
-fi
AC_CANONICAL_HOST
@@ -165,6 +157,8 @@
SOULSEEK=no
OPENFT=no
DONKEY=yes
+DONKEY_SUI=yes
+DONKEY_SUI_FILE=DonkeySui2
BITTORRENT=yes
FASTTRACK=yes
FILETP=yes
@@ -183,6 +177,7 @@
RELEASENAME="$RELEASENAME-nomultinet"
fi
AC_ARG_ENABLE(donkey, [ --disable-donkey allows you to remove
support for eDonkey], [DONKEY="$enableval"])
+AC_ARG_ENABLE(donkeysui, [ --disable-donkeysui allows you to remove
support for eMule SecureUserIdent], [DONKEY_SUI="$enableval"])
AC_ARG_ENABLE(bittorrent, [ --disable-bittorrent allows you to remove
support for Bittorent], [BITTORRENT="$enableval"])
AC_ARG_ENABLE(filetp, [ --disable-filetp allows you to remove
support for fileTP], [FILETP="$enableval"])
AC_ARG_ENABLE(gnutella, [ --disable-gnutella allows you to remove
support for Gnutella], [GNUTELLA="$enableval"])
@@ -549,7 +544,7 @@
AC_CHECK_LIB(z,zlibVersion,[AC_DEFINE(HAVE_ZLIBVERSION, 1,)])
if test "$BZIP2" != "no"; then
-
AC_CHECK_HEADERS(bzlib.h,[AC_CHECK_LIB(bz2,BZ2_bzReadOpen,[BZIP2=yes],[BZIP2=no])])
+
AC_CHECK_HEADERS(bzlib.h,[AC_CHECK_LIB(bz2,BZ2_bzReadOpen,[BZIP2=yes],[BZIP2=no])],[BZIP2=no])
fi
if test "$BZIP2" = "yes"; then
@@ -569,8 +564,9 @@
if test "$ICONV" = "yes"; then
AM_ICONV
if test "$am_cv_func_iconv" != "yes"; then
- AC_MSG_FAILURE([iconv() is missing, did you install the libraries and the
developer packages for libiconv?])
- fi
+ AC_DEFINE(DISABLE_ICONV, 1, [Define to 1 if you want to replace iconv and
related with stubs.])
+ ICONV=no
+ else
LIBS="$LIBS $LIBICONV"
AC_CHECK_FUNCS([locale_charset],,
AC_TRY_LINK([#include <langinfo.h>],
@@ -580,8 +576,10 @@
AC_CHECK_LIB(charset,locale_charset)
AC_CHECK_HEADERS([libcharset.h])
AC_CHECK_HEADERS([locale.h])
+ fi
else
AC_DEFINE(DISABLE_ICONV, 1, [Define to 1 if you want to replace iconv and
related with stubs.])
+ ICONV=no
fi
# On linux plaforms, we will have to check that includes from kernel are
@@ -596,8 +594,7 @@
AC_CHECK_HEADER(linux/types.h,[CONFIG_INCLUDES="-I
/usr/src/linux/include"])
CPPFLAGS=$OLD_CPPFLAGS]
)
- AC_CHECK_HEADERS(gnu/libc-version.h,,)
- AC_MSG_CHECKING(for GNU C Library version)
+ AC_CHECK_HEADERS(gnu/libc-version.h,[AC_MSG_CHECKING(for GNU C
Library version)
cat >try.c <<'EOCP'
/* Find out version of GNU C library. __GLIBC__ and __GLIBC_MINOR__
@@ -629,7 +626,7 @@
$CC -o try ./try.c
GLIBC_VERSION="`./try`"
AC_MSG_RESULT($GLIBC_VERSION)
- rm -f try try.*
+ rm -f try try.*],)
;;
*) ;;
esac
@@ -643,11 +640,31 @@
if test -f $OCAMLLIB/lablgl.$OCAMLLIB_EXT; then
LABLGL_CMXA=lablgl.$OCAMLLIB_EXT
fi
+
+CXX_VERSION=
AC_MSG_NOTICE(checking for activated networks)
if test "$DONKEY" = "yes"; then
AC_MSG_CHECKING(eDonkey)
if test -d ../src/networks/donkey; then
AC_MSG_RESULT(yes)
+ if test "$DONKEY_SUI" = "yes"; then
+ AC_PROG_CXX
+
+ AC_CHECK_TOOL(NEWCXX, [$CXX], [no])
+ AC_MSG_CHECKING(eMule SUI)
+ if test x"$NEWCXX" = x"no"
+ then
+ AC_MSG_RESULT(no)
+ CXX=
+ DONKEY_SUI=no
+ else
+ AC_MSG_RESULT(yes)
+ CXX=$NEWCXX
+ CXX_VERSION=`$CXX -dumpversion`
+ DONKEY_SUI_FILE=DonkeySui1
+ AC_DEFINE(HAVE_CRYPTOPP, 1,)
+ fi
+ fi
# AC_MSG_CHECKING(eDonkey server)
# if test -d ../src/networks/server; then
# AC_MSG_RESULT(no)
@@ -658,6 +675,7 @@
# fi
else
DONKEY=no
+ DONKEY_SUI=no
AC_MSG_RESULT(no)
fi
fi
@@ -1140,7 +1158,8 @@
AC_SUBST(OPENFT)
AC_SUBST(FASTTRACK)
AC_SUBST(DONKEY)
-AC_SUBST(OPEN_DONKEY)
+AC_SUBST(DONKEY_SUI)
+AC_SUBST(DONKEY_SUI_FILE)
AC_SUBST(DONKEY_SERVER)
AC_SUBST(GUI)
@@ -1175,6 +1194,8 @@
BUILD_SYSTEM="`uname -s` `uname -m` `uname -r`"
AC_SUBST(BUILD_SYSTEM)
AC_SUBST(GLIBC_VERSION)
+AC_SUBST(CC_VERSION)
+AC_SUBST(CXX_VERSION)
AC_SUBST(CONFIGURE_ARGUMENTS)
AC_SUBST(CONFIGURE_RUN)
@@ -1184,6 +1205,7 @@
Makefile.config \
mldonkey.rc \
$AUTOCONF.new $GTK_AUTOCONF.new \
+ ../src/networks/donkey/donkeySui.ml \
../src/daemon/driver/driverGraphics.ml \
../packages/rpm/mldonkey.spec \
../packages/rpm/Makefile \
@@ -1206,7 +1228,11 @@
echo -e "\nNetwork modules:"
echo -n " - eDonkey "
if test "$DONKEY" = "yes"; then
- echo "enabled"
+ if test "$DONKEY_SUI" = "yes"; then
+ echo "enabled (eMule SUI enabled)"
+ else
+ echo "enabled (eMule SUI disabled)"
+ fi
else
echo " disabled"
fi
@@ -1331,8 +1357,17 @@
fi
fi
-echo -e "\nNow execute '$GNU_MAKE' to start compiling with Ocaml
$OCAMLVERSION. Good luck!"
+echo -e "\nCompilers:"
+echo -e " - Ocaml version $OCAMLVERSION"
+echo -e " - $CC version $CC_VERSION"
+if test "x$CXX" != "x"; then
+ echo -e " - $CXX version $CXX_VERSION"
+fi
+echo -e "\nNow execute '$GNU_MAKE' to start compiling. Good luck!"
+
echo -e "\nTo compile a static code execute: $GNU_MAKE mlnet.static"
echo "To produce a release tarball execute: $GNU_MAKE
release.mlnet.static"
echo "To clean the build directory execute: $GNU_MAKE maintainerclean"
-echo -e "\nCompiling CryptoPP.cc can take several minutes, on slow machines up
to half an hour."
+if test "$DONKEY_SUI" = "yes"; then
+ echo -e "\nCompiling CryptoPP.cc can take several minutes, on slow machines
up to half an hour."
+fi
Index: mldonkey/distrib/ChangeLog
diff -u mldonkey/distrib/ChangeLog:1.685 mldonkey/distrib/ChangeLog:1.686
--- mldonkey/distrib/ChangeLog:1.685 Wed Jan 25 22:29:53 2006
+++ mldonkey/distrib/ChangeLog Thu Jan 26 00:25:24 2006
@@ -14,6 +14,14 @@
ChangeLog
=========
+2006/01/26
+4823: EDK: CryptoPP optional, disable with --disable-donkeysui
+ Makefile: link CryptoPP stuff only in binaries which need it
+ Buildinfo: show compiler versions
+ Configure: display compiler versions (schlumpf)
+ Configure: if iconv checking fails continue with disabled iconv
+ Configure: do not use bzip2 if bzip.h is not found (FLI4L buildroot)
+
2006/01/25
4820: Move CommonGraphics to DriverGraphics, check libgd version
Configure: Check if libgd > 2.0.14 is installed
Index: mldonkey/src/daemon/common/commonNetwork.ml
diff -u mldonkey/src/daemon/common/commonNetwork.ml:1.25
mldonkey/src/daemon/common/commonNetwork.ml:1.26
--- mldonkey/src/daemon/common/commonNetwork.ml:1.25 Fri Dec 16 20:56:31 2005
+++ mldonkey/src/daemon/common/commonNetwork.ml Thu Jan 26 00:25:24 2006
@@ -278,10 +278,19 @@
networks := r :: !networks;
Hashtbl.add networks_by_name r.network_name r;
Hashtbl.add networks_by_num r.network_num r;
+ let s =
+ if r.network_name = "Donkey" then
+ if Autoconf.donkey_sui = "yes" then
+ "Donkey (SUI)"
+ else
+ "Donkey (noSUI)"
+ else
+ r.network_name
+ in
if !networks_string = "" then
- networks_string := r.network_name
+ networks_string := s
else
- networks_string := Printf.sprintf "%s %s" !networks_string r.network_name;
+ networks_string := Printf.sprintf "%s %s" !networks_string s;
(* lprintf_nl "Network %s registered" r.network_name; *)
r
Index: mldonkey/src/daemon/driver/driverInteractive.ml
diff -u mldonkey/src/daemon/driver/driverInteractive.ml:1.57
mldonkey/src/daemon/driver/driverInteractive.ml:1.58
--- mldonkey/src/daemon/driver/driverInteractive.ml:1.57 Wed Jan 25
22:29:53 2006
+++ mldonkey/src/daemon/driver/driverInteractive.ml Thu Jan 26 00:25:25 2006
@@ -1626,6 +1626,8 @@
^ (if Autoconf.scm_version <> "" then "\nSCM version info: " ^
Autoconf.scm_version else "")
^ "\nNetworks: " ^ !networks_string
^ "\nOcaml version: " ^ Sys.ocaml_version
+ ^ " - C compiler version: " ^ Autoconf.cc_version
+ ^ (if Autoconf.cxx_version <> "" then " - C++ compiler version: " ^
Autoconf.cxx_version else "")
^ "\nBuild on: " ^ Autoconf.build_system ^ " (" ^ Unix2.endianness () ^
")"
^ (if Autoconf.glibc_version = "" then ""
else
Index: mldonkey/src/networks/donkey/donkeyClient.ml
diff -u mldonkey/src/networks/donkey/donkeyClient.ml:1.81
mldonkey/src/networks/donkey/donkeyClient.ml:1.82
--- mldonkey/src/networks/donkey/donkeyClient.ml:1.81 Mon Jan 16 16:05:14 2006
+++ mldonkey/src/networks/donkey/donkeyClient.ml Thu Jan 26 00:25:25 2006
@@ -1001,7 +1001,7 @@
end;
let pubkey = get_pubkey c in
- let signature = Unix32.create_signature pubkey (String.length pubkey)
c.client_req_challenge !ip_type !ip in
+ let signature = DonkeySui.SUI.create_signature pubkey (String.length
pubkey) c.client_req_challenge !ip_type !ip in
if !verbose_msg_clients then begin
lprintf_nl () "%s [send_signature] [sigLen: %d] [keyLen: %d] [reqChall:
%Ld] [ipType: %d] [ip: %Ld]" (full_client_identifier c) (String.length
signature) (String.length pubkey) c.client_req_challenge !ip_type !ip;
@@ -1736,7 +1736,7 @@
lprintf_nl () "%s [ESigReq] [verify_signature] [keyLen: %d] [sigLen:
%d] [sentChall: %Ld] [ipType %d] [ip: %Ld]" (full_client_identifier c)
(String.length pubKey) (String.length t.Q.signature) c.client_sent_challenge
!ip_type !id;
end;
- let verified = Unix32.verify_signature pubKey (String.length pubKey)
t.Q.signature (String.length t.Q.signature) c.client_sent_challenge !ip_type
!id in
+ let verified = DonkeySui.SUI.verify_signature pubKey (String.length
pubKey) t.Q.signature (String.length t.Q.signature) c.client_sent_challenge
!ip_type !id in
c.client_sui_verified <- Some verified;
c.client_sent_challenge <- Int64.zero;
client_must_update c;
Index: mldonkey/src/networks/donkey/donkeyGlobals.ml
diff -u mldonkey/src/networks/donkey/donkeyGlobals.ml:1.73
mldonkey/src/networks/donkey/donkeyGlobals.ml:1.74
--- mldonkey/src/networks/donkey/donkeyGlobals.ml:1.73 Thu Jan 19 01:53:54 2006
+++ mldonkey/src/networks/donkey/donkeyGlobals.ml Thu Jan 26 00:25:25 2006
@@ -956,16 +956,17 @@
let client_public_key = ref ""
+
let _ =
option_hook client_private_key (fun _ ->
- client_public_key := Unix32.load_key (!!client_private_key);
-
+ if Autoconf.donkey_sui = "yes" then begin
+ client_public_key := DonkeySui.SUI.load_key (!!client_private_key);
(
let key_checked = ref false in
let key_check_again = ref false in
let rec check_client_private_key () =
key_checked := true;
- if not (String.sub !!client_private_key 0 5 = "MIIBC") then
+ if not (try String.sub !!client_private_key 0 4 = "MIIB" with e ->
false) then
if !key_check_again then
begin
lprintf_nl () "can not create proper client_private_key,
exiting...";
@@ -974,7 +975,7 @@
else
begin
lprintf_nl () "bad client_private_key detected, creating new key";
- set_simple_option donkey_ini "client_private_key"
(Unix32.create_key ());
+ set_simple_option donkey_ini "client_private_key"
(DonkeySui.SUI.create_key ());
key_check_again := true
end
in
@@ -985,6 +986,7 @@
check_client_private_key ()
end
);
+ end
)
let server_accept_multiple_getsources s =
Index: mldonkey/src/networks/donkey/donkeyInteractive.ml
diff -u mldonkey/src/networks/donkey/donkeyInteractive.ml:1.85
mldonkey/src/networks/donkey/donkeyInteractive.ml:1.86
--- mldonkey/src/networks/donkey/donkeyInteractive.ml:1.85 Mon Jan 16
16:05:14 2006
+++ mldonkey/src/networks/donkey/donkeyInteractive.ml Thu Jan 26 00:25:25 2006
@@ -941,7 +941,7 @@
"reset_md4", Arg_none (fun _ ->
set_simple_option donkey_ini "client_md4" (Md4.to_string (mldonkey_md4
(Md4.random ())));
- set_simple_option donkey_ini "client_private_key" (Unix32.create_key
());
+ if Autoconf.donkey_sui = "yes" then set_simple_option donkey_ini
"client_private_key" (DonkeySui.SUI.create_key ());
"reset client_md4/client_private_key"
), ":\t\t\t\t\treset client_md4/client_private_key to random values";
Index: mldonkey/src/networks/donkey/donkeyMain.ml
diff -u mldonkey/src/networks/donkey/donkeyMain.ml:1.44
mldonkey/src/networks/donkey/donkeyMain.ml:1.45
--- mldonkey/src/networks/donkey/donkeyMain.ml:1.44 Wed Jan 11 18:53:30 2006
+++ mldonkey/src/networks/donkey/donkeyMain.ml Thu Jan 26 00:25:25 2006
@@ -183,8 +183,9 @@
let enabler = ref true in
is_enabled := true;
network.op_network_disable <- disable enabler;
+ if Autoconf.donkey_sui = "yes" then
(try
- client_public_key := Unix32.load_key (!!client_private_key)
+ client_public_key := DonkeySui.SUI.load_key (!!client_private_key)
with _ -> ());
if not !!enable_donkey then enable_donkey =:= true;
@@ -294,8 +295,10 @@
Options.option_hook global_login reset_tags;
Options.option_hook login reset_tags;
- Options.option_hook enable_sui reset_tags;
-
+ Options.option_hook enable_sui ( fun _ ->
+ if Autoconf.donkey_sui = "no" && !!enable_sui then enable_sui =:= false;
+ reset_tags ());
+
(**** START TIMERS ****)
add_session_option_timer enabler check_client_connections_delay
(fun _ ->
Index: mldonkey/src/networks/donkey/donkeyOptions.ml
diff -u mldonkey/src/networks/donkey/donkeyOptions.ml:1.36
mldonkey/src/networks/donkey/donkeyOptions.ml:1.37
--- mldonkey/src/networks/donkey/donkeyOptions.ml:1.36 Sun Jan 1 19:25:42 2006
+++ mldonkey/src/networks/donkey/donkeyOptions.ml Thu Jan 26 00:25:25 2006
@@ -161,7 +161,7 @@
"The MD4 of this client" Md4.option (mldonkey_md4 (Md4.random ()))
let client_private_key = define_option donkey_section ["client_private_key"]
- "The RSA private key of this client" string_option (Unix32.create_key ())
+ "The RSA private key of this client" string_option
(DonkeySui.SUI.create_key ())
let enable_sui = define_option donkey_section ["enable_sui"]
"Enable secure user identification support" bool_option true
Index: mldonkey/src/utils/lib/autoconf.ml.new.in
diff -u mldonkey/src/utils/lib/autoconf.ml.new.in:1.21
mldonkey/src/utils/lib/autoconf.ml.new.in:1.22
--- mldonkey/src/utils/lib/autoconf.ml.new.in:1.21 Wed Jan 25 22:29:53 2006
+++ mldonkey/src/utils/lib/autoconf.ml.new.in Thu Jan 26 00:25:25 2006
@@ -6,6 +6,8 @@
let sub_version = "@SUB_VERSION@"
let scm_version = "@SCM_VERSION@"
let glibc_version = "@GLIBC_VERSION@"
+let cc_version = "@CC_VERSION@"
+let cxx_version = "@CXX_VERSION@"
let build_system = "@BUILD_SYSTEM@"
let configure_arguments = "@CONFIGURE_ARGUMENTS@"
@@ -22,6 +24,7 @@
let filetp = "@FILETP@"
let bittorrent = "@BITTORRENT@"
let donkey = "@DONKEY@"
+let donkey_sui = "@DONKEY_SUI@"
exception OutOfBoundsAccess
let outofboundsaccess = OutOfBoundsAccess
Index: mldonkey/src/utils/lib/stubs_c.c
diff -u mldonkey/src/utils/lib/stubs_c.c:1.31
mldonkey/src/utils/lib/stubs_c.c:1.32
--- mldonkey/src/utils/lib/stubs_c.c:1.31 Mon Jan 16 16:02:44 2006
+++ mldonkey/src/utils/lib/stubs_c.c Thu Jan 26 00:25:25 2006
@@ -1179,13 +1179,6 @@
}
-// Crypto
-void crypto_exit();
-void createKey(char buf[]);
-unsigned long loadKey(char privateKeyBase64[], char buf[]);
-int createSignature(byte *buf, int maxLen, byte *key, int keyLen, uint32_t
cInt, uint8_t ipType, uint32_t ip);
-int verifySignature(byte *key, int keyLen, byte *sig, int sigLen, uint32_t
cInt, uint8_t ipType, uint32_t ip);
-
value
external_exit (void)
{
@@ -1207,7 +1200,9 @@
pthread_win32_process_detach_np();
#endif
- crypto_exit();
+#if defined(HAVE_CRYPTOPP)
+// crypto_exit();
+#endif
return Val_unit;
}
@@ -1219,70 +1214,6 @@
return caml_copy_string(buf);
}
-
-// return private key Base64Encoded
-value
-ml_createKey() {
- char buf[4096];
- createKey(buf);
- return caml_copy_string(buf);
-}
-
-// return public key
-value
-ml_loadKey(value privatekey) {
- char *s = String_val(privatekey);
- char buf[4096];
- unsigned long len = loadKey(s, buf);
-
- value res;
- res = caml_alloc_string(len);
- memmove(String_val(res), buf, len);
-
- return res;
-}
-
-value
-ml_createSignature(value m_key, value m_keyLen, value m_cInt, value m_ipType,
value m_ip) {
-
- byte *key = (byte*) String_val(m_key);
- int keyLen = Int_val(m_keyLen);
- uint32_t cInt = Int64_val(m_cInt);
- int ipType = Int_val(m_ipType);
- uint32_t ip = Int64_val(m_ip);
-
- byte buf[4096];
-
- int len = createSignature(buf, 200, key, keyLen, cInt, ipType, ip);
-
- value res;
- res = caml_alloc_string(len);
- memmove(String_val(res), buf, len);
-
- return res;
-}
-
-value
-ml_verifySignature(value m_key, value m_keyLen, value m_sig, value m_sigLen,
value m_cInt, value m_ipType, value m_ip) {
-
- byte* key = (byte*) String_val(m_key);
- int keyLen = Int_val(m_keyLen);
- byte* sig = (byte*) String_val(m_sig);
- int sigLen = Int_val(m_sigLen);
- uint32_t cInt = Int64_val(m_cInt);
- int ipType = Int_val(m_ipType);
- uint32_t ip = Int64_val(m_ip);
-
- return Val_bool(
- verifySignature(key, keyLen, sig, sigLen, cInt, ipType,
ip)
- );
-}
-
-value
-ml_verifySignature_bytecode(value *argv, int argn) {
- return ml_verifySignature(argv[0], argv[1], argv[2], argv[3], argv[4],
argv[5], argv[6]);
-}
-
value ml_check_endianness(void)
{
CAMLparam0 ();
Index: mldonkey/src/utils/lib/unix32.ml
diff -u mldonkey/src/utils/lib/unix32.ml:1.55
mldonkey/src/utils/lib/unix32.ml:1.56
--- mldonkey/src/utils/lib/unix32.ml:1.55 Thu Jan 19 01:53:54 2006
+++ mldonkey/src/utils/lib/unix32.ml Thu Jan 26 00:25:25 2006
@@ -48,12 +48,6 @@
external external_exit : unit -> unit = "external_exit"
external uname : unit -> string = "ml_uname"
-(* CryptoPP *)
-external create_key : unit -> string = "ml_createKey"
-external load_key : string -> string = "ml_loadKey"
-external create_signature : string -> int -> int64 -> int -> int64 -> string =
"ml_createSignature"
-external verify_signature : string -> int -> string -> int -> int64 -> int ->
int64 -> bool = "ml_verifySignature_bytecode" "ml_verifySignature"
-
(* let really_write fd s pos len =
try
Unix2.really_write fd s pos len
Index: mldonkey/src/utils/lib/unix32.mli
diff -u mldonkey/src/utils/lib/unix32.mli:1.19
mldonkey/src/utils/lib/unix32.mli:1.20
--- mldonkey/src/utils/lib/unix32.mli:1.19 Mon Jan 9 00:25:59 2006
+++ mldonkey/src/utils/lib/unix32.mli Thu Jan 26 00:25:25 2006
@@ -25,12 +25,6 @@
val external_exit : unit -> unit
val uname : unit -> string
-(* CryptoPP *)
-val create_key : unit -> string
-val load_key : string -> string
-val create_signature : string -> int -> int64 -> int -> int64 -> string
-val verify_signature : string -> int -> string -> int -> int64 -> int -> int64
-> bool
-
val create_dir_mask : string ref
val close : t -> unit
(* val force_fd : t -> Unix.file_descr *)