Packman Build Service PMBS

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

Changes of Revision 29

aMule.spec Changed

update.diff.xz Changed

@@ -1,1390 +0,0 @@
-diff --git a/.svn-revision b/.svn-revision
-index ca56113..c616311 100644
---- a/.svn-revision
-+++ b/.svn-revision
-@@ -1 +1 @@
--10865
-+10873
-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..168d809 100644
---- a/docs/Changelog
-+++ b/docs/Changelog
-@@ -16,6 +16,10 @@ 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
-+		* Implemented the missing 'show shared' command in amulecmd
-+		* Fix check for a valid locale config entry being done *after*
-+		  the locale has been set
- 
- 	iz0bbz:
- 		* Fix WinSock library version detection with MinGW-w64
-@@ -27,6 +31,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/KnownFile.cpp b/src/KnownFile.cpp
-index 7960806..0e39630 100644
---- a/src/KnownFile.cpp
-+++ b/src/KnownFile.cpp
-@@ -613,7 +613,9 @@ bool CKnownFile::LoadTagsFromFile(const CFileDataIO* file)
- 				break;
- 
- 			case FT_PERMISSIONS:
--				// Ignore it, it's not used anymore.
-+			case FT_KADLASTPUBLISHKEY:
-+			case FT_PARTFILENAME:
-+				// Old tags, not used anymore. Just purge them.
- 				break;
- 
- 			case FT_AICH_HASH: {
-@@ -640,11 +642,6 @@ bool CKnownFile::LoadTagsFromFile(const CFileDataIO* file)
- 				SetLastPublishTimeKadNotes( newtag.GetInt() );
- 				break;
- 
--			case FT_KADLASTPUBLISHKEY:
--				// Just purge it
--				wxASSERT( newtag.IsInt() );
--				break;
--
- 			default:
- 				// Store them here and write them back on saving.
- 				m_taglist.push_back(newtag);
-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/PartFile.cpp b/src/PartFile.cpp
-index 7f302a5..fe49f72 100644
---- a/src/PartFile.cpp
-+++ b/src/PartFile.cpp
-@@ -281,9 +281,6 @@ void CPartFile::CreatePartFile()
- 
- 	m_CorruptionBlackBox->SetPartFileInfo(GetFileName().GetPrintable(), m_partmetfilename.RemoveAllExt().GetPrintable());
- 
--	wxString strPartName = m_partmetfilename.RemoveExt().GetRaw();
--	m_taglist.push_back(CTagString(FT_PARTFILENAME, strPartName ));
--
- 	m_gaplist.Init(GetFileSize(), true);	// Init empty
- 
- 	m_PartPath = m_fullname.RemoveExt();
-@@ -485,6 +482,7 @@ uint8 CPartFile::LoadPartFile(const CPath& in_directory, const CPath& filename,
- 					// old tags: as long as they are not needed, take the chance to purge them
- 					case FT_PERMISSIONS:
- 					case FT_KADLASTPUBLISHKEY:
-+					case FT_PARTFILENAME:
- 						break;
- 					case FT_DL_ACTIVE_TIME:
- 						if (newtag.IsInt()) {
-diff --git a/src/SearchFile.cpp b/src/SearchFile.cpp
-index 31c2c41..af6a40d 100644
---- a/src/SearchFile.cpp
-+++ b/src/SearchFile.cpp
-@@ -82,6 +82,11 @@ CSearchFile::CSearchFile(const CMemFile& data, bool optUTF8, wxUIntPtr searchID,
- 			case FT_COMPLETE_SOURCES:
- 				m_completeSourceCount = tag.GetInt();
- 				break;
-+			case FT_PERMISSIONS:
-+			case FT_KADLASTPUBLISHKEY:
-+			case FT_PARTFILENAME:
-+				// Just ignore
-+				break;
- 			default:
- 				AddTagUnique(tag);
- 		}
-diff --git a/src/TextClient.cpp b/src/TextClient.cpp
-index d81fa8a..9eaaefc 100644
---- a/src/TextClient.cpp
-+++ b/src/TextClient.cpp
-@@ -444,6 +444,10 @@ int CamulecmdApp::ProcessCommand(int CmdId)
- 			request_list.push_back(new CECPacket(EC_OP_GET_SERVER_LIST, EC_DETAIL_CMD));
- 			break;
- 
-+		case CMD_ID_SHOW_SHARED:
-+			request_list.push_back(new CECPacket(EC_OP_GET_SHARED_FILES));
-+			break;
-+
- 		case CMD_ID_RESET_LOG:
- 			request_list.push_back(new CECPacket(EC_OP_RESET_LOG));

aMule.tar.xz Changed