o Update to 1.6.0a

o Keep FORBIDDEN line since I have been unable to verify if bugs
  have been thoroughly fixed

PR:		56618
Submitted by:	YazzY <yazzy@yazzy.org>
This commit is contained in:
Mario Sergio Fujikawa Ferreira 2003-10-08 14:44:25 +00:00
parent a9ac780445
commit da65b36eda
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=90640
18 changed files with 86 additions and 444 deletions

View file

@ -6,8 +6,7 @@
#
PORTNAME= xmule
PORTVERSION= 1.4.3
PORTREVISION= 1
PORTVERSION= 1.6.0
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= xmule
@ -48,6 +47,14 @@ post-patch:
@${REINPLACE_CMD} -E \
-e 's| ||' \
${WRKSRC}/src/MD5Sum.cpp
# do not install a generic named ed2k binary
@${REINPLACE_CMD} -E \
-e 's|^(bin_PROGRAMS.+)ed2k|\1|' \
${WRKSRC}/src/Makefile.in
# update documentation regarding aforementioned change
@${REINPLACE_CMD} -E \
-e 's|/usr/local/bin/ed2k|${PREFIX}/bin/${PORTNAME}-ed2k-handler|' \
${WRKSRC}/ED2K-Links.HOWTO
pre-configure:
@${FIND} ${WRKSRC} -type f -name "Makefile.in" | \
@ -55,8 +62,16 @@ pre-configure:
${REINPLACE_CMD} -E \
-e 's!^(AUTOCONF|AUTOHEADER|AUTOMAKE|ACLOCAL).*$$!\1=${TRUE}!'
post-build:
# build the generic named ed2k binary
# it will installed in an adhoc fashion
@cd ${BUILD_WRKSRC}/src; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ed2k
post-install:
@${CAT} ${PKGMESSAGE}
# do not install a generic named ed2k binary
# install it under a more specific name
@${INSTALL_PROGRAM} ${WRKSRC}/src/ed2k \
${PREFIX}/bin/${PORTNAME}-ed2k-handler
.include <bsd.port.pre.mk>

View file

@ -1 +1 @@
MD5 (xmule-1.4.3.tar.bz2) = 419b5a764f1d9fd676daa6819e1cf537
MD5 (xmule-1.6.0.tar.bz2) = 513aee4826007d2e9c5bade5ca48b144

View file

@ -1,7 +1,7 @@
--- src/Preferences.cpp.orig Mon May 26 12:08:45 2003
+++ src/Preferences.cpp Mon May 26 12:10:14 2003
@@ -65,7 +65,7 @@
extern int sprintf(char *__restrict __s,__const char*__restrict __format,...) __attribute__ ((__format__ (__printf__, 2,3)));
--- src/Preferences.cpp.orig Tue Sep 9 00:56:24 2003
+++ src/Preferences.cpp Tue Sep 9 00:56:21 2003
@@ -60,7 +60,7 @@
#endif
#ifdef __FreeBSD__
-extern long long atoll(char *s);

View file

@ -1,29 +1,12 @@
--- configure.orig Mon May 26 22:56:09 2003
+++ configure Tue May 27 17:55:59 2003
@@ -1712,8 +1712,6 @@
# Checks for programs.
# hopefully this prevents -O2
-CXXFLAGS="-g -rdynamic"
-CFLAGS="-g -rdynamic"
ac_ext=cc
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -7149,7 +7147,7 @@
--- configure.orig Tue Sep 9 00:47:46 2003
+++ configure Tue Sep 9 00:46:14 2003
@@ -7540,7 +7540,8 @@
echo "$as_me:$LINENO: checking if wxWindows was linked with GTK2" >&5
echo $ECHO_N "checking if wxWindows was linked with GTK2... $ECHO_C" >&6
- if $WX_CONFIG_NAME --cppflags | grep -q 'gtk2' ; then
+#if $WX_CONFIG_NAME --cppflags | grep -q 'gtk2' ; then
+ if $WX_CONFIG_NAME --static --libs | grep -q 'glib-2' ; then
GTK_USEDVERSION=2
echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6
@@ -7161,7 +7159,7 @@
-if test x$GTK_USEDVERSION == x2 ; then
+if test x$GTK_USEDVERSION = x2 ; then
# Check whether --enable-gtktest or --disable-gtktest was given.
if test "${enable_gtktest+set}" = set; then
enableval="$enable_gtktest"

View file

@ -1,150 +0,0 @@
--- src/KnownFile.cpp.orig Wed Apr 30 14:30:10 2003
+++ src/KnownFile.cpp Mon May 26 12:46:29 2003
@@ -271,6 +271,73 @@
return ferror(file);
}
+static void MD4Transform(uint32 Hash[4], uint32 x[16])
+{
+ uint32 a = Hash[0];
+ uint32 b = Hash[1];
+ uint32 c = Hash[2];
+ uint32 d = Hash[3];
+
+ /* Round 1 */
+ MD4_FF(a, b, c, d, x[ 0], S11); // 01
+ MD4_FF(d, a, b, c, x[ 1], S12); // 02
+ MD4_FF(c, d, a, b, x[ 2], S13); // 03
+ MD4_FF(b, c, d, a, x[ 3], S14); // 04
+ MD4_FF(a, b, c, d, x[ 4], S11); // 05
+ MD4_FF(d, a, b, c, x[ 5], S12); // 06
+ MD4_FF(c, d, a, b, x[ 6], S13); // 07
+ MD4_FF(b, c, d, a, x[ 7], S14); // 08
+ MD4_FF(a, b, c, d, x[ 8], S11); // 09
+ MD4_FF(d, a, b, c, x[ 9], S12); // 10
+ MD4_FF(c, d, a, b, x[10], S13); // 11
+ MD4_FF(b, c, d, a, x[11], S14); // 12
+ MD4_FF(a, b, c, d, x[12], S11); // 13
+ MD4_FF(d, a, b, c, x[13], S12); // 14
+ MD4_FF(c, d, a, b, x[14], S13); // 15
+ MD4_FF(b, c, d, a, x[15], S14); // 16
+
+ /* Round 2 */
+ MD4_GG(a, b, c, d, x[ 0], S21); // 17
+ MD4_GG(d, a, b, c, x[ 4], S22); // 18
+ MD4_GG(c, d, a, b, x[ 8], S23); // 19
+ MD4_GG(b, c, d, a, x[12], S24); // 20
+ MD4_GG(a, b, c, d, x[ 1], S21); // 21
+ MD4_GG(d, a, b, c, x[ 5], S22); // 22
+ MD4_GG(c, d, a, b, x[ 9], S23); // 23
+ MD4_GG(b, c, d, a, x[13], S24); // 24
+ MD4_GG(a, b, c, d, x[ 2], S21); // 25
+ MD4_GG(d, a, b, c, x[ 6], S22); // 26
+ MD4_GG(c, d, a, b, x[10], S23); // 27
+ MD4_GG(b, c, d, a, x[14], S24); // 28
+ MD4_GG(a, b, c, d, x[ 3], S21); // 29
+ MD4_GG(d, a, b, c, x[ 7], S22); // 30
+ MD4_GG(c, d, a, b, x[11], S23); // 31
+ MD4_GG(b, c, d, a, x[15], S24); // 32
+
+ /* Round 3 */
+ MD4_HH(a, b, c, d, x[ 0], S31); // 33
+ MD4_HH(d, a, b, c, x[ 8], S32); // 34
+ MD4_HH(c, d, a, b, x[ 4], S33); // 35
+ MD4_HH(b, c, d, a, x[12], S34); // 36
+ MD4_HH(a, b, c, d, x[ 2], S31); // 37
+ MD4_HH(d, a, b, c, x[10], S32); // 38
+ MD4_HH(c, d, a, b, x[ 6], S33); // 39
+ MD4_HH(b, c, d, a, x[14], S34); // 40
+ MD4_HH(a, b, c, d, x[ 1], S31); // 41
+ MD4_HH(d, a, b, c, x[ 9], S32); // 42
+ MD4_HH(c, d, a, b, x[ 5], S33); // 43
+ MD4_HH(b, c, d, a, x[13], S34); // 44
+ MD4_HH(a, b, c, d, x[ 3], S31); // 45
+ MD4_HH(d, a, b, c, x[11], S32); // 46
+ MD4_HH(c, d, a, b, x[ 7], S33); // 47
+ MD4_HH(b, c, d, a, x[15], S34); // 48
+
+ Hash[0] += a;
+ Hash[1] += b;
+ Hash[2] += c;
+ Hash[3] += d;
+}
+
void CKnownFile::CreateHashFromInput(FILE* file,CFile* file2, int Length, uchar* Output, uchar* in_string) {
// time critial
bool PaddingStarted = false;
@@ -342,73 +409,6 @@
return m_iPartCount>0?m_iPartCount:(m_iPartCount=((m_nFileSize+(PARTSIZE-1))/PARTSIZE));
}
#endif
-
-static void MD4Transform(uint32 Hash[4], uint32 x[16])
-{
- uint32 a = Hash[0];
- uint32 b = Hash[1];
- uint32 c = Hash[2];
- uint32 d = Hash[3];
-
- /* Round 1 */
- MD4_FF(a, b, c, d, x[ 0], S11); // 01
- MD4_FF(d, a, b, c, x[ 1], S12); // 02
- MD4_FF(c, d, a, b, x[ 2], S13); // 03
- MD4_FF(b, c, d, a, x[ 3], S14); // 04
- MD4_FF(a, b, c, d, x[ 4], S11); // 05
- MD4_FF(d, a, b, c, x[ 5], S12); // 06
- MD4_FF(c, d, a, b, x[ 6], S13); // 07
- MD4_FF(b, c, d, a, x[ 7], S14); // 08
- MD4_FF(a, b, c, d, x[ 8], S11); // 09
- MD4_FF(d, a, b, c, x[ 9], S12); // 10
- MD4_FF(c, d, a, b, x[10], S13); // 11
- MD4_FF(b, c, d, a, x[11], S14); // 12
- MD4_FF(a, b, c, d, x[12], S11); // 13
- MD4_FF(d, a, b, c, x[13], S12); // 14
- MD4_FF(c, d, a, b, x[14], S13); // 15
- MD4_FF(b, c, d, a, x[15], S14); // 16
-
- /* Round 2 */
- MD4_GG(a, b, c, d, x[ 0], S21); // 17
- MD4_GG(d, a, b, c, x[ 4], S22); // 18
- MD4_GG(c, d, a, b, x[ 8], S23); // 19
- MD4_GG(b, c, d, a, x[12], S24); // 20
- MD4_GG(a, b, c, d, x[ 1], S21); // 21
- MD4_GG(d, a, b, c, x[ 5], S22); // 22
- MD4_GG(c, d, a, b, x[ 9], S23); // 23
- MD4_GG(b, c, d, a, x[13], S24); // 24
- MD4_GG(a, b, c, d, x[ 2], S21); // 25
- MD4_GG(d, a, b, c, x[ 6], S22); // 26
- MD4_GG(c, d, a, b, x[10], S23); // 27
- MD4_GG(b, c, d, a, x[14], S24); // 28
- MD4_GG(a, b, c, d, x[ 3], S21); // 29
- MD4_GG(d, a, b, c, x[ 7], S22); // 30
- MD4_GG(c, d, a, b, x[11], S23); // 31
- MD4_GG(b, c, d, a, x[15], S24); // 32
-
- /* Round 3 */
- MD4_HH(a, b, c, d, x[ 0], S31); // 33
- MD4_HH(d, a, b, c, x[ 8], S32); // 34
- MD4_HH(c, d, a, b, x[ 4], S33); // 35
- MD4_HH(b, c, d, a, x[12], S34); // 36
- MD4_HH(a, b, c, d, x[ 2], S31); // 37
- MD4_HH(d, a, b, c, x[10], S32); // 38
- MD4_HH(c, d, a, b, x[ 6], S33); // 39
- MD4_HH(b, c, d, a, x[14], S34); // 40
- MD4_HH(a, b, c, d, x[ 1], S31); // 41
- MD4_HH(d, a, b, c, x[ 9], S32); // 42
- MD4_HH(c, d, a, b, x[ 5], S33); // 43
- MD4_HH(b, c, d, a, x[13], S34); // 44
- MD4_HH(a, b, c, d, x[ 3], S31); // 45
- MD4_HH(d, a, b, c, x[11], S32); // 46
- MD4_HH(c, d, a, b, x[ 7], S33); // 47
- MD4_HH(b, c, d, a, x[15], S34); // 48
-
- Hash[0] += a;
- Hash[1] += b;
- Hash[2] += c;
- Hash[3] += d;
-}
// Adde by Tarod [Juanjo]
void CAbstractFile::SetFileName(char* NewName)

View file

@ -1,12 +0,0 @@
--- src/KnownFile.h.orig Tue May 20 21:16:04 2003
+++ src/KnownFile.h Tue May 20 21:23:46 2003
@@ -203,9 +203,6 @@
(a) = MD4_ROTATE_LEFT((a), (s)); \
}
-static void MD4Transform(uint32 Hash[4], uint32 x[16]);
-
-
#if 0
// old implementation
class CFileStatistic{

View file

@ -1,20 +1,20 @@
--- src/xmule.cpp.orig Mon Aug 11 14:38:14 2003
+++ src/xmule.cpp Mon Aug 11 14:38:27 2003
@@ -763,7 +763,7 @@
--- src/xmule.cpp.orig Tue Sep 9 00:15:19 2003
+++ src/xmule.cpp Tue Sep 9 00:16:06 2003
@@ -797,7 +797,7 @@
delete[] emulesig_path;
delete[] xmulesig_path;
}
} //End Added By Bouc7
-#if defined(__Linux__)
+#if 0
#include <execinfo.h>
#endif
@@ -776,7 +776,7 @@
theApp.clientudp->Destroy();
@@ -810,7 +810,7 @@
theApp.clientudp->Destroy();
// (stkn) create backtrace
// (stkn) create backtrace
-#if defined(__Linux__)
+#if 0
void * bt_array[100]; // 100 should be enough ?!?
char ** bt_strings;
int num_entries;
void *bt_array[100]; // 100 should be enough ?!?
char **bt_strings;
int num_entries;

View file

@ -1,19 +0,0 @@
ATTENTIONATTENTION:
Note: Settings were NEVER saved for SharedFile and QueueList and
possibly some other lists... Due to this, unless you are using xMule
for the first time, there will be no saved settings for these two
lists; thus, it will think all of their columns are to be hidden.
Best fix: right-click on the grey top of each list and select each
item in that popup to display the columns... be SURE to quit xMule
after doing this because if it crashes you have to do this step
again!
Messy fix: rm /homedir/.lmule/preferences.dat this will remove
EVERYTHING, including shares and whatnot. The preferences.dat is a
binary file, thus it will be *incredibly* difficult to change by
hand.
Information taken from xMule developer
Ted R. Smith <un-thesis@users.sourceforge.net>

View file

@ -1,5 +1,5 @@
bin/ed2k
bin/xmule
bin/xmule-ed2k-handler
share/gnome/applications/xmule.desktop
share/gnome/pixmaps/xmule.xpm
share/locale/de/LC_MESSAGES/xmule.mo
@ -7,12 +7,16 @@ share/locale/ee/LC_MESSAGES/xmule.mo
share/locale/es/LC_MESSAGES/xmule.mo
share/locale/es_MX/LC_MESSAGES/xmule.mo
share/locale/fr/LC_MESSAGES/xmule.mo
share/locale/it/LC_MESSAGES/xmule.mo
share/locale/ko/LC_MESSAGES/xmule.mo
share/locale/pl/LC_MESSAGES/xmule.mo
share/locale/tr/LC_MESSAGES/xmule.mo
@unexec rmdir %D/share/locale/tr/LC_MESSAGES 2>/dev/null || true
@unexec rmdir %D/share/locale/tr 2>/dev/null || true
@unexec rmdir %D/share/locale/pl/LC_MESSAGES 2>/dev/null || true
@unexec rmdir %D/share/locale/pl 2>/dev/null || true
@unexec rmdir %D/share/locale/it/LC_MESSAGES 2>/dev/null || true
@unexec rmdir %D/share/locale/it 2>/dev/null || true
@unexec rmdir %D/share/locale/fr/LC_MESSAGES 2>/dev/null || true
@unexec rmdir %D/share/locale/fr 2>/dev/null || true
@unexec rmdir %D/share/locale/es_MX/LC_MESSAGES 2>/dev/null || true

View file

@ -6,8 +6,7 @@
#
PORTNAME= xmule
PORTVERSION= 1.4.3
PORTREVISION= 1
PORTVERSION= 1.6.0
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= xmule
@ -48,6 +47,14 @@ post-patch:
@${REINPLACE_CMD} -E \
-e 's| ||' \
${WRKSRC}/src/MD5Sum.cpp
# do not install a generic named ed2k binary
@${REINPLACE_CMD} -E \
-e 's|^(bin_PROGRAMS.+)ed2k|\1|' \
${WRKSRC}/src/Makefile.in
# update documentation regarding aforementioned change
@${REINPLACE_CMD} -E \
-e 's|/usr/local/bin/ed2k|${PREFIX}/bin/${PORTNAME}-ed2k-handler|' \
${WRKSRC}/ED2K-Links.HOWTO
pre-configure:
@${FIND} ${WRKSRC} -type f -name "Makefile.in" | \
@ -55,8 +62,16 @@ pre-configure:
${REINPLACE_CMD} -E \
-e 's!^(AUTOCONF|AUTOHEADER|AUTOMAKE|ACLOCAL).*$$!\1=${TRUE}!'
post-build:
# build the generic named ed2k binary
# it will installed in an adhoc fashion
@cd ${BUILD_WRKSRC}/src; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ed2k
post-install:
@${CAT} ${PKGMESSAGE}
# do not install a generic named ed2k binary
# install it under a more specific name
@${INSTALL_PROGRAM} ${WRKSRC}/src/ed2k \
${PREFIX}/bin/${PORTNAME}-ed2k-handler
.include <bsd.port.pre.mk>

View file

@ -1 +1 @@
MD5 (xmule-1.4.3.tar.bz2) = 419b5a764f1d9fd676daa6819e1cf537
MD5 (xmule-1.6.0.tar.bz2) = 513aee4826007d2e9c5bade5ca48b144

View file

@ -1,7 +1,7 @@
--- src/Preferences.cpp.orig Mon May 26 12:08:45 2003
+++ src/Preferences.cpp Mon May 26 12:10:14 2003
@@ -65,7 +65,7 @@
extern int sprintf(char *__restrict __s,__const char*__restrict __format,...) __attribute__ ((__format__ (__printf__, 2,3)));
--- src/Preferences.cpp.orig Tue Sep 9 00:56:24 2003
+++ src/Preferences.cpp Tue Sep 9 00:56:21 2003
@@ -60,7 +60,7 @@
#endif
#ifdef __FreeBSD__
-extern long long atoll(char *s);

View file

@ -1,29 +1,12 @@
--- configure.orig Mon May 26 22:56:09 2003
+++ configure Tue May 27 17:55:59 2003
@@ -1712,8 +1712,6 @@
# Checks for programs.
# hopefully this prevents -O2
-CXXFLAGS="-g -rdynamic"
-CFLAGS="-g -rdynamic"
ac_ext=cc
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -7149,7 +7147,7 @@
--- configure.orig Tue Sep 9 00:47:46 2003
+++ configure Tue Sep 9 00:46:14 2003
@@ -7540,7 +7540,8 @@
echo "$as_me:$LINENO: checking if wxWindows was linked with GTK2" >&5
echo $ECHO_N "checking if wxWindows was linked with GTK2... $ECHO_C" >&6
- if $WX_CONFIG_NAME --cppflags | grep -q 'gtk2' ; then
+#if $WX_CONFIG_NAME --cppflags | grep -q 'gtk2' ; then
+ if $WX_CONFIG_NAME --static --libs | grep -q 'glib-2' ; then
GTK_USEDVERSION=2
echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6
@@ -7161,7 +7159,7 @@
-if test x$GTK_USEDVERSION == x2 ; then
+if test x$GTK_USEDVERSION = x2 ; then
# Check whether --enable-gtktest or --disable-gtktest was given.
if test "${enable_gtktest+set}" = set; then
enableval="$enable_gtktest"

View file

@ -1,150 +0,0 @@
--- src/KnownFile.cpp.orig Wed Apr 30 14:30:10 2003
+++ src/KnownFile.cpp Mon May 26 12:46:29 2003
@@ -271,6 +271,73 @@
return ferror(file);
}
+static void MD4Transform(uint32 Hash[4], uint32 x[16])
+{
+ uint32 a = Hash[0];
+ uint32 b = Hash[1];
+ uint32 c = Hash[2];
+ uint32 d = Hash[3];
+
+ /* Round 1 */
+ MD4_FF(a, b, c, d, x[ 0], S11); // 01
+ MD4_FF(d, a, b, c, x[ 1], S12); // 02
+ MD4_FF(c, d, a, b, x[ 2], S13); // 03
+ MD4_FF(b, c, d, a, x[ 3], S14); // 04
+ MD4_FF(a, b, c, d, x[ 4], S11); // 05
+ MD4_FF(d, a, b, c, x[ 5], S12); // 06
+ MD4_FF(c, d, a, b, x[ 6], S13); // 07
+ MD4_FF(b, c, d, a, x[ 7], S14); // 08
+ MD4_FF(a, b, c, d, x[ 8], S11); // 09
+ MD4_FF(d, a, b, c, x[ 9], S12); // 10
+ MD4_FF(c, d, a, b, x[10], S13); // 11
+ MD4_FF(b, c, d, a, x[11], S14); // 12
+ MD4_FF(a, b, c, d, x[12], S11); // 13
+ MD4_FF(d, a, b, c, x[13], S12); // 14
+ MD4_FF(c, d, a, b, x[14], S13); // 15
+ MD4_FF(b, c, d, a, x[15], S14); // 16
+
+ /* Round 2 */
+ MD4_GG(a, b, c, d, x[ 0], S21); // 17
+ MD4_GG(d, a, b, c, x[ 4], S22); // 18
+ MD4_GG(c, d, a, b, x[ 8], S23); // 19
+ MD4_GG(b, c, d, a, x[12], S24); // 20
+ MD4_GG(a, b, c, d, x[ 1], S21); // 21
+ MD4_GG(d, a, b, c, x[ 5], S22); // 22
+ MD4_GG(c, d, a, b, x[ 9], S23); // 23
+ MD4_GG(b, c, d, a, x[13], S24); // 24
+ MD4_GG(a, b, c, d, x[ 2], S21); // 25
+ MD4_GG(d, a, b, c, x[ 6], S22); // 26
+ MD4_GG(c, d, a, b, x[10], S23); // 27
+ MD4_GG(b, c, d, a, x[14], S24); // 28
+ MD4_GG(a, b, c, d, x[ 3], S21); // 29
+ MD4_GG(d, a, b, c, x[ 7], S22); // 30
+ MD4_GG(c, d, a, b, x[11], S23); // 31
+ MD4_GG(b, c, d, a, x[15], S24); // 32
+
+ /* Round 3 */
+ MD4_HH(a, b, c, d, x[ 0], S31); // 33
+ MD4_HH(d, a, b, c, x[ 8], S32); // 34
+ MD4_HH(c, d, a, b, x[ 4], S33); // 35
+ MD4_HH(b, c, d, a, x[12], S34); // 36
+ MD4_HH(a, b, c, d, x[ 2], S31); // 37
+ MD4_HH(d, a, b, c, x[10], S32); // 38
+ MD4_HH(c, d, a, b, x[ 6], S33); // 39
+ MD4_HH(b, c, d, a, x[14], S34); // 40
+ MD4_HH(a, b, c, d, x[ 1], S31); // 41
+ MD4_HH(d, a, b, c, x[ 9], S32); // 42
+ MD4_HH(c, d, a, b, x[ 5], S33); // 43
+ MD4_HH(b, c, d, a, x[13], S34); // 44
+ MD4_HH(a, b, c, d, x[ 3], S31); // 45
+ MD4_HH(d, a, b, c, x[11], S32); // 46
+ MD4_HH(c, d, a, b, x[ 7], S33); // 47
+ MD4_HH(b, c, d, a, x[15], S34); // 48
+
+ Hash[0] += a;
+ Hash[1] += b;
+ Hash[2] += c;
+ Hash[3] += d;
+}
+
void CKnownFile::CreateHashFromInput(FILE* file,CFile* file2, int Length, uchar* Output, uchar* in_string) {
// time critial
bool PaddingStarted = false;
@@ -342,73 +409,6 @@
return m_iPartCount>0?m_iPartCount:(m_iPartCount=((m_nFileSize+(PARTSIZE-1))/PARTSIZE));
}
#endif
-
-static void MD4Transform(uint32 Hash[4], uint32 x[16])
-{
- uint32 a = Hash[0];
- uint32 b = Hash[1];
- uint32 c = Hash[2];
- uint32 d = Hash[3];
-
- /* Round 1 */
- MD4_FF(a, b, c, d, x[ 0], S11); // 01
- MD4_FF(d, a, b, c, x[ 1], S12); // 02
- MD4_FF(c, d, a, b, x[ 2], S13); // 03
- MD4_FF(b, c, d, a, x[ 3], S14); // 04
- MD4_FF(a, b, c, d, x[ 4], S11); // 05
- MD4_FF(d, a, b, c, x[ 5], S12); // 06
- MD4_FF(c, d, a, b, x[ 6], S13); // 07
- MD4_FF(b, c, d, a, x[ 7], S14); // 08
- MD4_FF(a, b, c, d, x[ 8], S11); // 09
- MD4_FF(d, a, b, c, x[ 9], S12); // 10
- MD4_FF(c, d, a, b, x[10], S13); // 11
- MD4_FF(b, c, d, a, x[11], S14); // 12
- MD4_FF(a, b, c, d, x[12], S11); // 13
- MD4_FF(d, a, b, c, x[13], S12); // 14
- MD4_FF(c, d, a, b, x[14], S13); // 15
- MD4_FF(b, c, d, a, x[15], S14); // 16
-
- /* Round 2 */
- MD4_GG(a, b, c, d, x[ 0], S21); // 17
- MD4_GG(d, a, b, c, x[ 4], S22); // 18
- MD4_GG(c, d, a, b, x[ 8], S23); // 19
- MD4_GG(b, c, d, a, x[12], S24); // 20
- MD4_GG(a, b, c, d, x[ 1], S21); // 21
- MD4_GG(d, a, b, c, x[ 5], S22); // 22
- MD4_GG(c, d, a, b, x[ 9], S23); // 23
- MD4_GG(b, c, d, a, x[13], S24); // 24
- MD4_GG(a, b, c, d, x[ 2], S21); // 25
- MD4_GG(d, a, b, c, x[ 6], S22); // 26
- MD4_GG(c, d, a, b, x[10], S23); // 27
- MD4_GG(b, c, d, a, x[14], S24); // 28
- MD4_GG(a, b, c, d, x[ 3], S21); // 29
- MD4_GG(d, a, b, c, x[ 7], S22); // 30
- MD4_GG(c, d, a, b, x[11], S23); // 31
- MD4_GG(b, c, d, a, x[15], S24); // 32
-
- /* Round 3 */
- MD4_HH(a, b, c, d, x[ 0], S31); // 33
- MD4_HH(d, a, b, c, x[ 8], S32); // 34
- MD4_HH(c, d, a, b, x[ 4], S33); // 35
- MD4_HH(b, c, d, a, x[12], S34); // 36
- MD4_HH(a, b, c, d, x[ 2], S31); // 37
- MD4_HH(d, a, b, c, x[10], S32); // 38
- MD4_HH(c, d, a, b, x[ 6], S33); // 39
- MD4_HH(b, c, d, a, x[14], S34); // 40
- MD4_HH(a, b, c, d, x[ 1], S31); // 41
- MD4_HH(d, a, b, c, x[ 9], S32); // 42
- MD4_HH(c, d, a, b, x[ 5], S33); // 43
- MD4_HH(b, c, d, a, x[13], S34); // 44
- MD4_HH(a, b, c, d, x[ 3], S31); // 45
- MD4_HH(d, a, b, c, x[11], S32); // 46
- MD4_HH(c, d, a, b, x[ 7], S33); // 47
- MD4_HH(b, c, d, a, x[15], S34); // 48
-
- Hash[0] += a;
- Hash[1] += b;
- Hash[2] += c;
- Hash[3] += d;
-}
// Adde by Tarod [Juanjo]
void CAbstractFile::SetFileName(char* NewName)

View file

@ -1,12 +0,0 @@
--- src/KnownFile.h.orig Tue May 20 21:16:04 2003
+++ src/KnownFile.h Tue May 20 21:23:46 2003
@@ -203,9 +203,6 @@
(a) = MD4_ROTATE_LEFT((a), (s)); \
}
-static void MD4Transform(uint32 Hash[4], uint32 x[16]);
-
-
#if 0
// old implementation
class CFileStatistic{

View file

@ -1,20 +1,20 @@
--- src/xmule.cpp.orig Mon Aug 11 14:38:14 2003
+++ src/xmule.cpp Mon Aug 11 14:38:27 2003
@@ -763,7 +763,7 @@
--- src/xmule.cpp.orig Tue Sep 9 00:15:19 2003
+++ src/xmule.cpp Tue Sep 9 00:16:06 2003
@@ -797,7 +797,7 @@
delete[] emulesig_path;
delete[] xmulesig_path;
}
} //End Added By Bouc7
-#if defined(__Linux__)
+#if 0
#include <execinfo.h>
#endif
@@ -776,7 +776,7 @@
theApp.clientudp->Destroy();
@@ -810,7 +810,7 @@
theApp.clientudp->Destroy();
// (stkn) create backtrace
// (stkn) create backtrace
-#if defined(__Linux__)
+#if 0
void * bt_array[100]; // 100 should be enough ?!?
char ** bt_strings;
int num_entries;
void *bt_array[100]; // 100 should be enough ?!?
char **bt_strings;
int num_entries;

View file

@ -1,19 +0,0 @@
ATTENTIONATTENTION:
Note: Settings were NEVER saved for SharedFile and QueueList and
possibly some other lists... Due to this, unless you are using xMule
for the first time, there will be no saved settings for these two
lists; thus, it will think all of their columns are to be hidden.
Best fix: right-click on the grey top of each list and select each
item in that popup to display the columns... be SURE to quit xMule
after doing this because if it crashes you have to do this step
again!
Messy fix: rm /homedir/.lmule/preferences.dat this will remove
EVERYTHING, including shares and whatnot. The preferences.dat is a
binary file, thus it will be *incredibly* difficult to change by
hand.
Information taken from xMule developer
Ted R. Smith <un-thesis@users.sourceforge.net>

View file

@ -1,5 +1,5 @@
bin/ed2k
bin/xmule
bin/xmule-ed2k-handler
share/gnome/applications/xmule.desktop
share/gnome/pixmaps/xmule.xpm
share/locale/de/LC_MESSAGES/xmule.mo
@ -7,12 +7,16 @@ share/locale/ee/LC_MESSAGES/xmule.mo
share/locale/es/LC_MESSAGES/xmule.mo
share/locale/es_MX/LC_MESSAGES/xmule.mo
share/locale/fr/LC_MESSAGES/xmule.mo
share/locale/it/LC_MESSAGES/xmule.mo
share/locale/ko/LC_MESSAGES/xmule.mo
share/locale/pl/LC_MESSAGES/xmule.mo
share/locale/tr/LC_MESSAGES/xmule.mo
@unexec rmdir %D/share/locale/tr/LC_MESSAGES 2>/dev/null || true
@unexec rmdir %D/share/locale/tr 2>/dev/null || true
@unexec rmdir %D/share/locale/pl/LC_MESSAGES 2>/dev/null || true
@unexec rmdir %D/share/locale/pl 2>/dev/null || true
@unexec rmdir %D/share/locale/it/LC_MESSAGES 2>/dev/null || true
@unexec rmdir %D/share/locale/it 2>/dev/null || true
@unexec rmdir %D/share/locale/fr/LC_MESSAGES 2>/dev/null || true
@unexec rmdir %D/share/locale/fr 2>/dev/null || true
@unexec rmdir %D/share/locale/es_MX/LC_MESSAGES 2>/dev/null || true