diff options
author | cvs2svn <cvs2svn@FreeBSD.org> | 2003-10-02 20:55:58 +0000 |
---|---|---|
committer | cvs2svn <cvs2svn@FreeBSD.org> | 2003-10-02 20:55:58 +0000 |
commit | 1cf501d6f87b43d3b20cdc1df1942dccff3796bd (patch) | |
tree | 888348323662d1fceb365259a7bc1b95e8e8d3f1 /net-p2p/xmule/files | |
parent | . s:NO_CDROM:RESTRICTED: as neither the distfiles nor the packages should (diff) |
This commit was manufactured by cvs2svn to create tag 'RELEASE_4_9_0'.release/4.9.0
Notes
Notes:
svn path=/head/; revision=90063
svn path=/tags/RELEASE_4_9_0/; revision=90064; tag=release/4.9.0
Diffstat (limited to 'net-p2p/xmule/files')
-rw-r--r-- | net-p2p/xmule/files/patch-Preferences.cpp | 11 | ||||
-rw-r--r-- | net-p2p/xmule/files/patch-configure | 29 | ||||
-rw-r--r-- | net-p2p/xmule/files/patch-src::ClientCredits.cpp | 11 | ||||
-rw-r--r-- | net-p2p/xmule/files/patch-src::KnownFile.cpp | 150 | ||||
-rw-r--r-- | net-p2p/xmule/files/patch-src::KnownFile.h | 12 | ||||
-rw-r--r-- | net-p2p/xmule/files/patch-src::WebServer.cpp | 13 | ||||
-rw-r--r-- | net-p2p/xmule/files/patch-src::otherfunctions.cpp | 11 | ||||
-rw-r--r-- | net-p2p/xmule/files/patch-src::xmule.cpp | 20 |
8 files changed, 0 insertions, 257 deletions
diff --git a/net-p2p/xmule/files/patch-Preferences.cpp b/net-p2p/xmule/files/patch-Preferences.cpp deleted file mode 100644 index e71a84094959..000000000000 --- a/net-p2p/xmule/files/patch-Preferences.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- 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))); - - #ifdef __FreeBSD__ --extern long long atoll(char *s); -+extern long long atoll(const char *s); - #endif /* __FreeBSD__ */ - - /// new implementation diff --git a/net-p2p/xmule/files/patch-configure b/net-p2p/xmule/files/patch-configure deleted file mode 100644 index b58f27461f1e..000000000000 --- a/net-p2p/xmule/files/patch-configure +++ /dev/null @@ -1,29 +0,0 @@ ---- 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 @@ - - 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 --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" diff --git a/net-p2p/xmule/files/patch-src::ClientCredits.cpp b/net-p2p/xmule/files/patch-src::ClientCredits.cpp deleted file mode 100644 index 8277638bcad3..000000000000 --- a/net-p2p/xmule/files/patch-src::ClientCredits.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- src/ClientCredits.cpp.orig Tue May 27 15:25:08 2003 -+++ src/ClientCredits.cpp Tue May 27 15:25:19 2003 -@@ -22,7 +22,7 @@ - #include "ClientCredits.h" - #include "opcodes.h" - #include <math.h> --#include "/usr/include/time.h" -+#include <sys/time.h> - #include <sys/types.h> - #include <sys/stat.h> - #include <fcntl.h> diff --git a/net-p2p/xmule/files/patch-src::KnownFile.cpp b/net-p2p/xmule/files/patch-src::KnownFile.cpp deleted file mode 100644 index 504b5557f695..000000000000 --- a/net-p2p/xmule/files/patch-src::KnownFile.cpp +++ /dev/null @@ -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) diff --git a/net-p2p/xmule/files/patch-src::KnownFile.h b/net-p2p/xmule/files/patch-src::KnownFile.h deleted file mode 100644 index a37dc00c4ee6..000000000000 --- a/net-p2p/xmule/files/patch-src::KnownFile.h +++ /dev/null @@ -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{ diff --git a/net-p2p/xmule/files/patch-src::WebServer.cpp b/net-p2p/xmule/files/patch-src::WebServer.cpp deleted file mode 100644 index 4087253695dd..000000000000 --- a/net-p2p/xmule/files/patch-src::WebServer.cpp +++ /dev/null @@ -1,13 +0,0 @@ ---- src/WebServer.cpp.orig Tue May 20 20:42:30 2003 -+++ src/WebServer.cpp Tue May 20 21:06:14 2003 -@@ -9,6 +9,10 @@ - #include <wx/wfstream.h> - #include <wx/txtstrm.h> - -+#ifdef __FreeBSD__ -+extern long long atoll(const char *s); -+#endif /* __FreeBSD__ */ -+ - #ifdef _DEBUG - #undef THIS_FILE - static char THIS_FILE[]=__FILE__; diff --git a/net-p2p/xmule/files/patch-src::otherfunctions.cpp b/net-p2p/xmule/files/patch-src::otherfunctions.cpp deleted file mode 100644 index b96a5b978c1d..000000000000 --- a/net-p2p/xmule/files/patch-src::otherfunctions.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- src/otherfunctions.cpp.orig Mon May 26 12:05:22 2003 -+++ src/otherfunctions.cpp Mon May 26 12:05:37 2003 -@@ -546,7 +546,7 @@ - } - - #ifdef __FreeBSD__ --long long atoll( char * s ){ -+long long atoll(const char * s){ - return strtoll(s, (char **)NULL, 10); - } - #endif /* __FreeBSD__ */ diff --git a/net-p2p/xmule/files/patch-src::xmule.cpp b/net-p2p/xmule/files/patch-src::xmule.cpp deleted file mode 100644 index 09480748d421..000000000000 --- a/net-p2p/xmule/files/patch-src::xmule.cpp +++ /dev/null @@ -1,20 +0,0 @@ ---- 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 @@ - delete[] xmulesig_path; - } - --#if defined(__Linux__) -+#if 0 - #include <execinfo.h> - #endif - -@@ -776,7 +776,7 @@ - theApp.clientudp->Destroy(); - - // (stkn) create backtrace --#if defined(__Linux__) -+#if 0 - void * bt_array[100]; // 100 should be enough ?!? - char ** bt_strings; - int num_entries; |