Projects
Extra
aMule
Sign Up
Log In
Username
Password
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
Expand all
Collapse all
Changes of Revision 24
View file
update.diff.xz
Added
@@ -0,0 +1,186 @@ +diff --git a/.svn-revision b/.svn-revision +index ca56113..af198bb 100644 +--- a/.svn-revision ++++ b/.svn-revision +@@ -1 +1 @@ +-10865 ++10869 +diff --git a/configure b/configure +index ae0a1bc..990a088 100755 +--- a/configure ++++ b/configure +@@ -15800,17 +15800,17 @@ modified= + if test -f "$srcdir/.svn-revision"; then + svndate="rev. `cat $srcdir/.svn-revision`" + elif test -d "$srcdir"/.svn; then +- svndate="rev. `svnversion "$srcdir" | sed -e 'h;s/[0-9][0-9]*:\(.*\)/\1/;s/\([0-9][0-9]*\).*/\1/;x;/.*M.*/{x;s/$/+/;b;};x'`" ++ svndate="rev. `svnversion "$srcdir" | ${SED} -e 'h;s/[0-9][0-9]*:\(.*\)/\1/;s/\([0-9][0-9]*\).*/\1/;x;/.*M.*/{x;s/$/+/;b;};x'`" + elif test -d "$srcdir"/.git; then + +- git_revision=`git -C "$srcdir" log --max-count=1 --pretty='tformat:%h'` +- if test -n "`git -C "$srcdir" status --porcelain --untracked-files=no`" ; then ++ git_revision=`git --git-dir="$srcdir"/.git log --max-count=1 --pretty='tformat:%h'` ++ if test -n "`git --git-dir="$srcdir"/.git --work-tree="$srcdir" status --porcelain --untracked-files=no`" ; then + modified="+" + fi + if test -f $srcdir/.git/svn/.metadata ; then +- git_sha=`git -C "$srcdir" log --max-count=1 --pretty='tformat:%H'` +- svndate=`git -C "$srcdir" rev-list ${git_sha} | while read sha; do +- svn_revision=\`git -C "$srcdir" svn find-rev \${sha}\` ++ git_sha=`git --git-dir="$srcdir"/.git log --max-count=1 --pretty='tformat:%H'` ++ svndate=`git --git-dir="$srcdir"/.git rev-list ${git_sha} | while read sha; do ++ svn_revision=\`git --git-dir="$srcdir"/.git svn find-rev \${sha}\` + if test -n "\${svn_revision}" ; then + if test \${sha} = ${git_sha} ; then + echo "rev. \${svn_revision}${modified}" +diff --git a/configure.in b/configure.in +index c14db04..466a6a1 100644 +--- a/configure.in ++++ b/configure.in +@@ -379,19 +379,19 @@ dnl SVNDATE for tarballs + + dnl SVNDATE for Subversion checkouts + [test -d "$srcdir"/.svn], +- [svndate="rev. `svnversion "$srcdir" | sed -e 'h;s/[[0-9]][[0-9]]*:\(.*\)/\1/;s/\([[0-9]][[0-9]]*\).*/\1/;x;/.*M.*/{x;s/$/+/;b;};x'`"], ++ [svndate="rev. `svnversion "$srcdir" | ${SED} -e 'h;s/[[0-9]][[0-9]]*:\(.*\)/\1/;s/\([[0-9]][[0-9]]*\).*/\1/;x;/.*M.*/{x;s/$/+/;b;};x'`"], + + dnl SVNDATE for git/git-svn clones + [test -d "$srcdir"/.git], + [ +- git_revision=`git -C "$srcdir" log --max-count=1 --pretty='tformat:%h'` +- if test -n "`git -C "$srcdir" status --porcelain --untracked-files=no`" ; then ++ git_revision=`git --git-dir="$srcdir"/.git log --max-count=1 --pretty='tformat:%h'` ++ if test -n "`git --git-dir="$srcdir"/.git --work-tree="$srcdir" status --porcelain --untracked-files=no`" ; then + modified="+" + fi + if test -f $srcdir/.git/svn/.metadata ; then +- git_sha=`git -C "$srcdir" log --max-count=1 --pretty='tformat:%H'` +- svndate=`git -C "$srcdir" rev-list ${git_sha} | while read sha; do +- svn_revision=\`git -C "$srcdir" svn find-rev \${sha}\` ++ git_sha=`git --git-dir="$srcdir"/.git log --max-count=1 --pretty='tformat:%H'` ++ svndate=`git --git-dir="$srcdir"/.git rev-list ${git_sha} | while read sha; do ++ svn_revision=\`git --git-dir="$srcdir"/.git svn find-rev \${sha}\` + if test -n "\${svn_revision}" ; then + if test \${sha} = ${git_sha} ; then + echo "rev. \${svn_revision}${modified}" +diff --git a/docs/Changelog b/docs/Changelog +index 562606a..c9918cd 100644 +--- a/docs/Changelog ++++ b/docs/Changelog +@@ -16,6 +16,7 @@ Version 2.4.0 - The river knows. + * Adapt configure to handle subversion repository clones in + mercurial and git + * Fix bfd detection for systems missing -liberty ++ * Add support for 'canceled.met' to the fileview tool + + iz0bbz: + * Fix WinSock library version detection with MinGW-w64 +@@ -27,6 +28,7 @@ Version 2.4.0 - The river knows. + Mr Hyde: + * Fix "Disable computer's timed standby mode" for MacOS 10.9 Mavericks + * Compilation fix on Linux Slackware 64bit and MacOS 10.9.4 ++ * Fix configure on Mac + + Stu Redman: + * Display hashing progress in progress bars +diff --git a/src/MD4Hash.h b/src/MD4Hash.h +index 068f1e1..4c91449 100644 +--- a/src/MD4Hash.h ++++ b/src/MD4Hash.h +@@ -28,8 +28,6 @@ + + #include "ArchSpecific.h" // Needed for Raw{Peek,Poke}UInt64() + +-#include "kademlia/utils/UInt128.h" // Needed for CUInt128 +- + #include <common/MuleDebug.h> // Needed for MULE_VALIDATE_PARAMS + + #ifdef USE_WX_EXTENSIONS +@@ -64,18 +62,6 @@ public: + Clear(); + } + +- /** +- * Create a CMD4Hash from a CUInt128 +- * +- * @param hash The 128 bits integer to be used. +- * +- */ +- CMD4Hash(const Kademlia::CUInt128& hash) { +- byte transitional_array[MD4HASH_LENGTH]; +- hash.ToByteArray(transitional_array); +- SetHash(transitional_array); +- } +- + ~CMD4Hash() { + } + +diff --git a/src/utils/fileview/FileView.cpp b/src/utils/fileview/FileView.cpp +index 62ee4df..0c8c985 100644 +--- a/src/utils/fileview/FileView.cpp ++++ b/src/utils/fileview/FileView.cpp +@@ -146,6 +146,8 @@ int CFileView::OnRun() + DecodeStatisticsDat(file); + } else if (basename.Find(wxT(".part.met")) != wxNOT_FOUND) { + DecodePartMetFile(file); ++ } else if (basename == wxT("canceled.met")) { ++ DecodeCanceledMet(file); + } else { + cerr << "ERROR: Don't know how to decode " << *it << endl; + } +diff --git a/src/utils/fileview/eD2kFiles.cpp b/src/utils/fileview/eD2kFiles.cpp +index 84f845d..48f0234 100644 +--- a/src/utils/fileview/eD2kFiles.cpp ++++ b/src/utils/fileview/eD2kFiles.cpp +@@ -35,7 +35,8 @@ enum VersionType { + PrefFile, + PartMetFile, + CreditFile, +- KnownFileList ++ KnownFileList, ++ CanceledFileList + }; + + static wxString VersionInfo(uint8_t version, uint8_t type) +@@ -63,6 +64,10 @@ static wxString VersionInfo(uint8_t version, uint8_t type) + } else if (version == MET_HEADER_WITH_LARGEFILES) { + verStr = wxT("MET_HEADER_WITH_LARGEFILES"); + } ++ } else if (type == CanceledFileList) { ++ if (version == CANCELEDFILE_VERSION) { ++ verStr = wxT("CANCELEDFILE_VERSION"); ++ } + } + return hex(version) + wxT(' ') + verStr; + }; +@@ -268,3 +273,18 @@ void DecodeStatisticsDat(const CFileDataIO& file) + cout << "Total received bytes : " << tmp << " (" << CastItoXBytes(tmp) << ")\n"; + } + } ++ ++void DecodeCanceledMet(const CFileDataIO& file) ++{ ++ uint8_t version = file.ReadUInt8(); ++ cout << "Version : " << VersionInfo(version, CanceledFileList) << endl; ++ if (version != CANCELEDFILE_VERSION) { ++ cerr << "File seems to be corrupt, invalid version!" << endl; ++ return; ++ } ++ uint32_t records = file.ReadUInt32(); ++ cout << "Records : " << records << '\n'; ++ for (uint32_t i = 0; i < records; i++) { ++ cout << "\tFile hash : " << file.ReadHash() << '\n'; ++ } ++} +diff --git a/src/utils/fileview/eD2kFiles.h b/src/utils/fileview/eD2kFiles.h +index 7292431..2edc223 100644 +--- a/src/utils/fileview/eD2kFiles.h ++++ b/src/utils/fileview/eD2kFiles.h +@@ -34,6 +34,7 @@ void DecodeServerMet(const CFileDataIO& file); + void DecodeClientsMet(const CFileDataIO& file); + void DecodeKnownMet(const CFileDataIO& file); + void DecodePartMetFile(const CFileDataIO& file); ++void DecodeCanceledMet(const CFileDataIO& file); + + /* Not really eD2k related... */ + void DecodeStatisticsDat(const CFileDataIO& file);
Locations
Projects
Search
Status Monitor
Help
Open Build Service
OBS Manuals
API Documentation
OBS Portal
Reporting a Bug
Contact
Mailing List
Forums
Chat (IRC)
Twitter
Open Build Service (OBS)
is an
openSUSE project
.