diff options
Diffstat (limited to 'net-p2p/adchpp/files')
8 files changed, 0 insertions, 392 deletions
diff --git a/net-p2p/adchpp/files/adchpp-2.8.0-fix_guide_paths.patch b/net-p2p/adchpp/files/adchpp-2.8.0-fix_guide_paths.patch deleted file mode 100644 index 50d6f7f..0000000 --- a/net-p2p/adchpp/files/adchpp-2.8.0-fix_guide_paths.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -ru adchpp_2.8.0_source.orig//SConstruct adchpp_2.8.0_source//SConstruct ---- adchpp_2.8.0_source.orig//SConstruct 2012-02-23 05:36:29.568476919 +0100 -+++ adchpp_2.8.0_source//SConstruct 2012-02-23 05:38:21.349477159 +0100 -@@ -242,6 +242,6 @@ - - guide_path = '#/docs/user_guide/' - env.Command(doc_path + 'user_guide/basic_guide.html', guide_path + 'basic_guide.txt', asciidoc) -- env.Command(doc_path + 'user_guide/novice_guide.html', guide_path + 'novice_guide.txt', asciidoc) -+ env.Command(doc_path + 'user_guide/expert_guide.html', guide_path + 'expert_guide.txt', asciidoc) - env.Command(doc_path + 'user_guide/images', guide_path + 'images', Copy('$TARGET', '$SOURCE')) - diff --git a/net-p2p/adchpp/files/adchpp-2.8.0-fix_python.patch b/net-p2p/adchpp/files/adchpp-2.8.0-fix_python.patch deleted file mode 100644 index a02d264..0000000 --- a/net-p2p/adchpp/files/adchpp-2.8.0-fix_python.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -ru adchpp_2.8.0_source.orig//swig/SConscript adchpp_2.8.0_source//swig/SConscript ---- adchpp_2.8.0_source.orig//swig/SConscript 2012-02-24 07:15:25.531177571 +0100 -+++ adchpp_2.8.0_source//swig/SConscript 2012-02-24 08:33:33.992187579 +0100 -@@ -78,10 +78,6 @@ - env.Append(SWIGFLAGS=['-c++','-threads','-Wall','-python', '-O', '-modern', '-features', 'autodoc=1']) - env['SWIGOUTDIR'] = Dir(dev.get_build_path('bin')) - -- if env['arch'] != 'x86': -- print 'Skipping Python module' -- return -- - version = sys.version[0] + sys.version[2] - - if version not in ('25','26','27'): diff --git a/net-p2p/adchpp/files/adchpp-2.8.0-fix_ruby.patch b/net-p2p/adchpp/files/adchpp-2.8.0-fix_ruby.patch deleted file mode 100644 index 4979cbc..0000000 --- a/net-p2p/adchpp/files/adchpp-2.8.0-fix_ruby.patch +++ /dev/null @@ -1,50 +0,0 @@ -diff -ru adchpp_2.8.0_source.orig//SConstruct adchpp_2.8.0_source//SConstruct ---- adchpp_2.8.0_source.orig//SConstruct 2012-02-24 07:15:25.533177571 +0100 -+++ adchpp_2.8.0_source//SConstruct 2012-02-25 04:41:51.205484894 +0100 -@@ -89,6 +89,7 @@ - ('prefix', 'Prefix to use when cross compiling', ''), - EnumVariable('arch', 'Target architecture', 'x86', ['x86', 'x64', 'ia64']), - ('python', 'Python path to use when compiling python extensions', distutils.sysconfig.get_config_var('prefix')), -+ ('ruby', 'Path to the ruby binary', 'ruby'), - BoolVariable('docs', 'Build docs (requires asciidoc)', 'no') - ) - -@@ -188,8 +189,6 @@ - conf.env.Append(CPPDEFINES='HAVE_POLL_H') - if conf.CheckCHeader('sys/epoll.h'): - conf.env.Append(CPPDEFINES=['HAVE_SYS_EPOLL_H']) -- if conf.CheckCHeader('ruby.h'): -- conf.env['HAVE_RUBY_H'] = True - if conf.CheckLib('dl', 'dlopen'): - conf.env.Append(CPPDEFINES=['HAVE_DL']) - if not dev.is_win32(): -diff -ru adchpp_2.8.0_source.orig//swig/SConscript adchpp_2.8.0_source//swig/SConscript ---- adchpp_2.8.0_source.orig//swig/SConscript 2012-02-24 07:15:25.531177571 +0100 -+++ adchpp_2.8.0_source//swig/SConscript 2012-02-25 04:41:31.767484854 +0100 -@@ -18,12 +18,13 @@ - return "" - - def getRbConf(name): -- return runCommand(['ruby', '-rmkmf', '-e', "print Config.expand('$(" + name + ")')"]) -+ return runCommand([dev.env['ruby'], '-rmkmf', '-e', "print RbConfig.expand('$(" + name + ")')"]) - - def buildRbModule(): - env = dev.env.Clone() -+ conf = Configure(env) - -- if 'HAVE_RUBY_H' not in env or not runCommand(['ruby', '-v']): -+ if not runCommand([dev.env['ruby'], '-v']): - print "Ruby not found, skipping ruby module" - return - -@@ -69,6 +70,10 @@ - - rb = env.SharedLibrary(dev.get_target(source_path, 'rbadchpp'), [f], - SHLIBPREFIX='') -+ if not conf.CheckCHeader( 'ruby.h' ): -+ print "ruby.h not found, skipping ruby module" -+ return -+ - targets.append(rb) - - def buildPyModule(): diff --git a/net-p2p/adchpp/files/adchpp-2.9.0-add_SWIGLUA_REF.patch b/net-p2p/adchpp/files/adchpp-2.9.0-add_SWIGLUA_REF.patch deleted file mode 100644 index d46edbd..0000000 --- a/net-p2p/adchpp/files/adchpp-2.9.0-add_SWIGLUA_REF.patch +++ /dev/null @@ -1,118 +0,0 @@ -=== modified file 'changelog.txt' ---- changelog.txt 2012-11-26 17:28:07 +0000 -+++ changelog.txt 2013-02-07 21:44:55 +0000 -@@ -1,4 +1,5 @@ - * Improve Lua scripts -+* [L#1118699] Normalize per-entity data storage from Lua - - -- 2.9.0 2012-10-23 -- - * Add Lua FileSystem - -=== modified file 'plugins/Script/examples/access.lua' ---- plugins/Script/examples/access.lua 2012-11-26 17:28:07 +0000 -+++ plugins/Script/examples/access.lua 2013-02-07 21:44:55 +0000 -@@ -104,7 +104,7 @@ - local pm = adchpp.getPM() - local sm = adchpp.getSM() - --local saltsHandle = pm:registerByteVectorData() -+local saltsHandle = pm:registerPluginData() - - -- forward declarations. - local cut_str, -@@ -892,7 +892,7 @@ - - autil.reply(c, "You are registered, please provide a password") - -- c:setByteVectorData(saltsHandle, cm:enterVerify(c, true)) -+ c:setPluginData(saltsHandle, cm:enterVerify(c, true)) - return false - end - -@@ -902,7 +902,7 @@ - return false - end - -- local salt = c:getByteVectorData(saltsHandle) -+ local salt = c:getPluginData(saltsHandle) - - if not salt then - autil.dump(c, adchpp.AdcCommand_ERROR_PROTOCOL_GENERIC, "You didn't get any salt?") - -=== modified file 'swig/lua.i' ---- swig/lua.i 2012-08-04 19:24:47 +0000 -+++ swig/lua.i 2013-02-07 21:44:55 +0000 -@@ -1,4 +1,5 @@ - %module luadchpp -+%include "lua_fnptr.i" - - /* - in addition to the elements defined here and in adchpp.i, the Lua interface also includes: -@@ -9,6 +10,15 @@ - before a script is being loaded or unloaded. return true to discard further processing. - */ - -+%inline %{ -+/* Deleter for per-entity objects */ -+static void free_lua_ref(void *data) { -+ SWIGLUA_REF *ref = reinterpret_cast<SWIGLUA_REF*> (data); -+ swiglua_ref_clear(ref); -+ delete ref; -+} -+%} -+ - typedef unsigned int size_t; - - %{ -@@ -307,38 +317,22 @@ - } - - %extend adchpp::Entity { -- std::string getStringData(const PluginDataHandle& handle) { -- void* ret = $self->getPluginData(handle); -- if(ret) { -- return *reinterpret_cast<std::string*>(ret); -- } -- return std::string(); -- } -- -- void setStringData(const PluginDataHandle& handle, std::string data) { -- $self->setPluginData(handle, reinterpret_cast<void*>(new std::string(data))); -- } -- -- ByteVector getByteVectorData(const PluginDataHandle& handle) { -- void* ret = $self->getPluginData(handle); -- if(ret) { -- return *reinterpret_cast<ByteVector*>(ret); -- } -- return ByteVector(); -- } -- -- void setByteVectorData(const PluginDataHandle& handle, ByteVector data) { -- $self->setPluginData(handle, reinterpret_cast<void*>(new ByteVector(data))); -+ SWIGLUA_REF getPluginData(const PluginDataHandle& handle) { -+ void* ret = $self->getPluginData(handle); -+ if(ret) { -+ return *reinterpret_cast<SWIGLUA_REF*>(ret); -+ } -+ return {0, 0}; -+ } -+ -+ void setPluginData(const PluginDataHandle& handle, SWIGLUA_REF data) { -+ $self->setPluginData(handle, reinterpret_cast<void*>(new SWIGLUA_REF(data))); - } - } - - %extend adchpp::PluginManager { -- PluginDataHandle registerStringData() { -- return self->registerPluginData(PluginData::simpleDataDeleter<std::string>); -- } -- -- PluginDataHandle registerByteVectorData() { -- return self->registerPluginData(PluginData::simpleDataDeleter<ByteVector>); -+ PluginDataHandle registerPluginData() { -+ return self->registerPluginData(free_lua_ref); - } - } - - diff --git a/net-p2p/adchpp/files/adchpp-2.9.0-fix_cflags.patch b/net-p2p/adchpp/files/adchpp-2.9.0-fix_cflags.patch deleted file mode 100644 index cdf0534..0000000 --- a/net-p2p/adchpp/files/adchpp-2.9.0-fix_cflags.patch +++ /dev/null @@ -1,78 +0,0 @@ -diff -ur adchpp_2.9.0_source.orig/SConstruct adchpp_2.9.0_source/SConstruct ---- adchpp_2.9.0_source.orig/SConstruct 2013-02-07 21:31:11.952964272 +0100 -+++ adchpp_2.9.0_source/SConstruct 2013-02-07 21:33:06.574966920 +0100 -@@ -6,9 +6,9 @@ - from build_util import Dev - - gcc_flags = { -- 'common': ['-g', '-Wall', '-Wextra', '-Wno-unused-parameter', '-Wno-unused-value', '-Wno-missing-field-initializers', '-Wno-address', '-Wno-unknown-pragmas', '-fexceptions'], -+ 'common': ['-fexceptions'], - 'debug': [], -- 'release' : ['-O3', '-fno-ipa-cp-clone'] -+ 'release' : [] - } - - gcc_xxflags = { -@@ -45,7 +45,7 @@ - } - - gcc_link_flags = { -- 'common' : ['-g', '-Wl,--no-undefined', '-time'], -+ 'common' : ['-Wl,--no-undefined', '-time'], - 'debug' : [], - 'release' : ['-O3'] - } -@@ -77,6 +77,22 @@ - langs = ['lua', 'python', 'ruby'] - - defEnv = Environment(ENV = os.environ) -+ -+if 'CC' in os.environ: -+ defEnv.Replace(CC = os.environ['CC']) -+ -+if 'CXX' in os.environ: -+ defEnv.Replace(CXX = os.environ['CXX']) -+ -+if 'CCFLAGS' in os.environ: -+ defEnv.Replace(CCFLAGS = os.environ['CCFLAGS'].split()) -+ -+if 'CXXFLAGS' in os.environ: -+ defEnv.Replace(CXXFLAGS = os.environ['CXXFLAGS'].split()) -+ -+if 'LINKFLAGS' in os.environ: -+ defEnv.Replace(CXXFLAGS = os.environ['LINKFLAGS'].split()) -+ - opts = Variables('custom.py', ARGUMENTS) - - if sys.platform == 'win32': -@@ -111,6 +127,21 @@ - - env = Environment(ENV = os.environ, tools = [defEnv['tools'], 'swig'], toolpath = ['tools'], options = opts, TARGET_ARCH = TARGET_ARCH, MSVS_ARCH = TARGET_ARCH) - -+if 'CC' in os.environ: -+ env.Replace(CC = os.environ['CC']) -+ -+if 'CXX' in os.environ: -+ env.Replace(CXX = os.environ['CXX']) -+ -+if 'CCFLAGS' in os.environ: -+ env.Replace(CCFLAGS = os.environ['CCFLAGS'].split()) -+ -+if 'CXXFLAGS' in os.environ: -+ env.Replace(CXXFLAGS = os.environ['CXXFLAGS'].split()) -+ -+if 'LINKFLAGS' in os.environ: -+ env.Replace(CXXFLAGS = os.environ['LINKFLAGS'].split()) -+ - # filter out boost from dependencies to get a speedier rebuild scan - # this means that if boost changes, scons -c needs to be run - # delete .sconsign.dblite to see the effects of this if you're upgrading -@@ -143,8 +174,6 @@ - - if env['savetemps']: - env.Append(CCFLAGS = ['-save-temps', '-fverbose-asm']) -- else: -- env.Append(CCFLAGS = ['-pipe']) - - # require i686 instructions for atomic<int64_t>, used by boost::lockfree (otherwise lockfree - # lists won't actually be lock-free). diff --git a/net-p2p/adchpp/files/adchpp-2.9.0-fix_listreg.patch b/net-p2p/adchpp/files/adchpp-2.9.0-fix_listreg.patch deleted file mode 100644 index 8768d45..0000000 --- a/net-p2p/adchpp/files/adchpp-2.9.0-fix_listreg.patch +++ /dev/null @@ -1,40 +0,0 @@ -=== modified file 'changelog.txt' ---- changelog.txt 2012-10-23 15:42:01 +0000 -+++ changelog.txt 2012-11-26 17:28:07 +0000 -@@ -1,3 +1,5 @@ -+* Improve Lua scripts -+ - -- 2.9.0 2012-10-23 -- - * Add Lua FileSystem - * Add Lua Socket - -=== modified file 'plugins/Script/examples/access.lua' ---- plugins/Script/examples/access.lua 2012-09-25 17:09:17 +0000 -+++ plugins/Script/examples/access.lua 2012-11-26 17:28:07 +0000 -@@ -1376,19 +1376,21 @@ - - local list = {} - for _, v in base.ipairs(registered_users()) do -- if v.level <= user.level and (#param == 0 or (v.nick and string.match(string.lower(v.nick), param, 1))) then -+ local other_level = v.level -+ if not other_level then other_level = 0 end -+ if other_level <= user.level and (#param == 0 or (v.nick and string.match(string.lower(v.nick), param, 1))) then - local fields = {} - if v.nick then - table.insert(fields, "\tNick: " .. v.nick) - end -- if settings.passinlist.value ~=0 and v.level < user.level and v.password then -+ if settings.passinlist.value ~=0 and other_level < user.level and v.password then - table.insert(fields, "\n\tPassword: " .. v.password) - end - if v.cid then - table.insert(fields, "\n\tCID: " .. v.cid) - end -- if settings.passinlist.value ~=0 and v.level <= user.level then -- table.insert(fields, "Level: " .. v.level) -+ if settings.passinlist.value ~=0 and other_level <= user.level then -+ table.insert(fields, "Level: " .. other_level) - end - if v.regtime then - table.insert(fields, "\n\tRegistered: " .. time_diff(v.regtime) .. " ago") - diff --git a/net-p2p/adchpp/files/adchpp-2.9.0-fix_luasockets_guide.patch b/net-p2p/adchpp/files/adchpp-2.9.0-fix_luasockets_guide.patch deleted file mode 100644 index 5f180e8..0000000 --- a/net-p2p/adchpp/files/adchpp-2.9.0-fix_luasockets_guide.patch +++ /dev/null @@ -1,45 +0,0 @@ -=== modified file 'docs/user_guide/expert_guide.txt' ---- docs/user_guide/expert_guide.txt 2012-10-23 15:42:01 +0000 -+++ docs/user_guide/expert_guide.txt 2012-12-26 20:32:26 +0000 -@@ -1,6 +1,6 @@ - = ADCH++ Expert User Guide - Authors & contributors : Toast <toast@adcportal.com>, eMTee <emtee11@gmail.com>, Pirre <pierreparys@hotmail.com>, Poy <poy@123gen.com> --Document Version 0.4.2 -+Document Version 0.4.3 - :toc: - This version of the guide corresponds with ADCH++ version: *2.9.0* - -@@ -259,7 +259,7 @@ - - == PtokaX API2 bridge for ADCH++ - --It's possible to create or use existing PtokaX API2 LUA scripts in your hub using the ADCHPP-PtokaX bridge script. The bridge is separately maintained and available to download at https://launchpad.net/adchpp-ptokax[its home page]. Before you go on make sure you read the documentation provided in the ADCHPP-PtokaX package. -+It's possible to create or use existing PtokaX API2 LUA scripts in your hub using the ADCHPP-PtokaX bridge script. The bridge is separately maintained and available to download at https://launchpad.net/adchpp-ptokax[its home page]. Before you go on make sure you read the documentation (README.txt) provided in the ADCHPP-PtokaX package. - - CAUTION: To avoid problems make sure you use the revision of PtokaX bridge script corresponding to the ADCH++ version you run. - -@@ -318,13 +318,9 @@ - px\px_badsearch.lua - -------------------------------------- - --Some of the PtokaX scripts (like FreshStuff or Feedwatch) may require LUA filesystem or socket library. In case of any of these libraries needed they can be configured in the following way under Windows: -- --The Adchpp-PtokaX package contains the required libraries as precompiled .dll binaries. You should extract the libs to the directories indicated by each script (it could be the normal ADCH\++ dir or their own sub-dir). In general, where there should have been a px\*\*\*.dll file in an original PtokaX configuration, you want to put the corresponding \***.dll file instead. When a script asks you to put the files to "scripts/libs", you want to actually put them in the ADCH++ directory itself (next to the other binary files). -- --CAUTION: Make sure you use the .dlls corresponding to the compiler your ADCH\++ compiled with (If you are using the officially released version of ADCH++, then pick "release-mingw-x86" packages). -- --TIP: Linux users can found more information about library compilation and placement in the !readme.txt file provided in the "libs" folder of the Adchpp-PtokaX package. -+Some of the PtokaX scripts (like FreshStuff or Feedwatch) may require LUA filesystem or socket library. Since version 2.9.0 the ADCH++ repository contains these libraries and the Windows binary distributions include the compiled libraries as .dll's. -+ -+CAUTION: Sometimes the libraries (.dll's in Windows) have to be copied to the appropriate place when a PtokaX scripts search for them in esoteric paths (for example lv/libs for Leviathan). You can get more information from the README file that comes with ADCHPP-PtokaX package. - - This is the example of how the Freshstuff script should be correctly configured. Add the script as you would normally do with any scripts. The rest of the directory contents should look like this: - -@@ -646,5 +642,6 @@ - 0.4.0: Added the Advanced hub security (guard) section (emtee, pirre) - 0.4.1: Added compile instructions for Clang (poy) - 0.4.2: Updated corresponding to ADCH++ version 2.9.0 (emtee) -+0.4.3: Update LUASockets info (emtee) - //////////////////////////////////////////////////////////////// - // vim: set syntax=asciidoc: - diff --git a/net-p2p/adchpp/files/adchpp-2.9.0-fix_nullptr.patch b/net-p2p/adchpp/files/adchpp-2.9.0-fix_nullptr.patch deleted file mode 100644 index 36a0612..0000000 --- a/net-p2p/adchpp/files/adchpp-2.9.0-fix_nullptr.patch +++ /dev/null @@ -1,36 +0,0 @@ -=== modified file 'adchpp/ManagedSocket.cpp' ---- adchpp/ManagedSocket.cpp 2012-09-25 17:00:52 +0000 -+++ adchpp/ManagedSocket.cpp 2012-12-26 20:06:52 +0000 -@@ -223,10 +223,18 @@ - if(failedHandler) { - failedHandler(reason, info); - -+ // using nullptr fails on older GCCs for which we're using nullptr.h; using 0 fails on VS... -+#ifndef FAKE_NULLPTR - connectedHandler = nullptr; - readyHandler = nullptr; - dataHandler = nullptr; - failedHandler = nullptr; -+#else -+ connectedHandler = 0; -+ readyHandler = 0; -+ dataHandler = 0; -+ failedHandler = 0; -+#endif - } - } - - -=== modified file 'adchpp/nullptr.h' ---- adchpp/nullptr.h 2012-06-25 17:11:13 +0000 -+++ adchpp/nullptr.h 2012-12-26 20:06:52 +0000 -@@ -6,6 +6,8 @@ - #ifdef __GNUC__ - #if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 6) // GCC 4.6 is the first GCC to implement nullptr. - -+#define FAKE_NULLPTR -+ - const // this is a const object... - class { - public: - |