summaryrefslogtreecommitdiff
path: root/net-p2p/linuxdcpp/files
diff options
context:
space:
mode:
Diffstat (limited to 'net-p2p/linuxdcpp/files')
-rw-r--r--net-p2p/linuxdcpp/files/patch-BufferSocket.cpp11
-rw-r--r--net-p2p/linuxdcpp/files/patch-SConstruct86
-rw-r--r--net-p2p/linuxdcpp/files/patch-dcpp_CryptoManager.cpp26
-rw-r--r--net-p2p/linuxdcpp/files/patch-libc++64
4 files changed, 0 insertions, 187 deletions
diff --git a/net-p2p/linuxdcpp/files/patch-BufferSocket.cpp b/net-p2p/linuxdcpp/files/patch-BufferSocket.cpp
deleted file mode 100644
index a00d597f6bd5..000000000000
--- a/net-p2p/linuxdcpp/files/patch-BufferSocket.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- dcpp/BufferedSocket.cpp.orig 2014-06-18 00:29:48.737534795 +0200
-+++ dcpp/BufferedSocket.cpp 2011-04-17 19:57:09.000000000 +0200
-@@ -478,7 +478,7 @@
-
- void BufferedSocket::addTask(Tasks task, TaskData* data) {
- dcassert(task == DISCONNECT || task == SHUTDOWN || task == UPDATED || sock.get());
-- tasks.push_back(make_pair(task, data)); taskSem.signal();
-+ tasks.push_back(make_pair(task, boost::shared_ptr<TaskData>(data))); taskSem.signal();
- }
-
- } // namespace dcpp
diff --git a/net-p2p/linuxdcpp/files/patch-SConstruct b/net-p2p/linuxdcpp/files/patch-SConstruct
deleted file mode 100644
index 10d0f43993a3..000000000000
--- a/net-p2p/linuxdcpp/files/patch-SConstruct
+++ /dev/null
@@ -1,86 +0,0 @@
---- SConstruct.orig 2011-04-17 17:57:09 UTC
-+++ SConstruct
-@@ -20,7 +20,7 @@ BUILD_LOCALE_PATH = BUILD_PATH + 'locale/'
- BUILD_FLAGS = {
- 'common' : ['-I#', '-D_GNU_SOURCE', '-D_LARGEFILE_SOURCE', '-D_FILE_OFFSET_BITS=64', '-D_REENTRANT'],
- 'debug' : ['-g', '-ggdb', '-Wall', '-D_DEBUG'],
-- 'release' : ['-O3', '-fomit-frame-pointer', '-DNDEBUG']
-+ 'release' : ['-fomit-frame-pointer', '-DNDEBUG']
- }
-
- # ----------------------------------------------------------------------
-@@ -106,6 +106,7 @@ else:
- vars.AddVariables(
- BoolVariable('debug', 'Compile the program with debug information', 0),
- BoolVariable('release', 'Compile the program with optimizations', 0),
-+ BoolVariable('libnotify', 'Enable notifications through libnotify', 1),
- BoolVariable('profile', 'Compile the program with profiling information', 0),
- PathVariable('PREFIX', 'Compile the program with PREFIX as the root for installation', '/usr/local', PathVariable.PathIsDir),
- ('FAKE_ROOT', 'Make scons install the program under a fake root', '')
-@@ -131,14 +132,23 @@ if os.environ.has_key('CC'):
- env['CC'] = os.environ['CC']
-
- if os.environ.has_key('CXXFLAGS'):
-- env['CPPFLAGS'] = env['CXXFLAGS'] = os.environ['CXXFLAGS'].split()
-+ env['CXXFLAGS'] = os.environ['CXXFLAGS'].split()
-
-+if os.environ.has_key('CPPFLAGS'):
-+ env['CPPFLAGS'] = os.environ['CPPFLAGS'].split()
-+
- if os.environ.has_key('LDFLAGS'):
- env['LINKFLAGS'] = os.environ['LDFLAGS'].split()
-
- if os.environ.has_key('CFLAGS'):
- env['CFLAGS'] = os.environ['CFLAGS'].split()
-
-+if os.environ.has_key('CPPPATH'):
-+ env['CPPPATH'] = os.environ['CPPPATH'].split()
-+
-+if os.environ.has_key('LIBPATH'):
-+ env['LIBPATH'] = os.environ['LIBPATH'].split()
-+
- env['CPPDEFINES'] = [] # Initialize as a list so Append doesn't concat strings
-
- env.SConsignFile('build/sconf/.sconsign')
-@@ -185,10 +195,6 @@ conf = env.Configure(
-
- if not 'install' in COMMAND_LINE_TARGETS:
-
-- if not conf.CheckCXXVersion(env['CXX'], 4, 1):
-- print 'Compiler version check failed. g++ 4.1 or later is needed'
-- Exit(1)
--
- if not conf.CheckPKGConfig():
- print '\tpkg-config not found.'
- Exit(1)
-@@ -256,21 +262,20 @@ if not 'install' in COMMAND_LINE_TARGETS:
-
- if not conf.CheckHeader('iconv.h'):
- Exit(1)
-- elif conf.CheckLibWithHeader('iconv', 'iconv.h', 'c', 'iconv(0, (const char **)0, 0, (char**)0, 0);'):
-- conf.env.Append(CPPDEFINES = ('ICONV_CONST', 'const'))
-
- if conf.CheckHeader(['sys/types.h', 'sys/socket.h', 'ifaddrs.h', 'net/if.h']):
- conf.env.Append(CPPDEFINES = 'HAVE_IFADDRS_H')
-
- # TODO: Implement a plugin system so libnotify doesn't have compile-time dependencies
-- if not conf.CheckPKG('libnotify >= 0.4.1'):
-- print '\tlibnotify >= 0.4.1 not found, disabling notifications.'
-- print '\tNote: You might have the lib but not the headers'
-- else:
-- conf.env.Append(CPPDEFINES = 'HAVE_LIBNOTIFY')
-- conf.env.ParseConfig('pkg-config --libs libnotify')
-- if conf.CheckPKG('libnotify >= 0.7'):
-- conf.env.Append(CPPDEFINES = 'HAVE_LIBNOTIFY_0_7')
-+ if conf.env.get('libnotify'):
-+ if not conf.CheckPKG('libnotify >= 0.4.1'):
-+ print '\tlibnotify >= 0.4.1 not found, disabling notifications.'
-+ print '\tNote: You might have the lib but not the headers'
-+ else:
-+ conf.env.Append(CPPDEFINES = 'HAVE_LIBNOTIFY')
-+ conf.env.ParseConfig('pkg-config --libs libnotify')
-+ if conf.CheckPKG('libnotify >= 0.7'):
-+ conf.env.Append(CPPDEFINES = 'HAVE_LIBNOTIFY_0_7')
-
- conf.CheckBZRRevision()
-
diff --git a/net-p2p/linuxdcpp/files/patch-dcpp_CryptoManager.cpp b/net-p2p/linuxdcpp/files/patch-dcpp_CryptoManager.cpp
deleted file mode 100644
index 3584893ee6af..000000000000
--- a/net-p2p/linuxdcpp/files/patch-dcpp_CryptoManager.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
---- dcpp/CryptoManager.cpp.orig 2011-04-17 17:57:09 UTC
-+++ dcpp/CryptoManager.cpp
-@@ -107,12 +107,20 @@ CryptoManager::CryptoManager()
- };
-
- if(dh) {
-- dh->p = BN_bin2bn(dh4096_p, sizeof(dh4096_p), 0);
-- dh->g = BN_bin2bn(dh4096_g, sizeof(dh4096_g), 0);
-+ BIGNUM *p, *g;
-
-- if (!dh->p || !dh->g) {
-+ p = BN_bin2bn(dh4096_p, sizeof(dh4096_p), 0);
-+ g = BN_bin2bn(dh4096_g, sizeof(dh4096_g), 0);
-+
-+ if (!p || !g) {
- dh.reset();
- } else {
-+#if OPENSSL_VERSION_NUMBER < 0x10100005L
-+ dh->p = p;
-+ dh->g = g;
-+#else
-+ DH_set0_pqg(dh, p, NULL, g);
-+#endif
- SSL_CTX_set_options(serverContext, SSL_OP_SINGLE_DH_USE);
- SSL_CTX_set_options(serverVerContext, SSL_OP_SINGLE_DH_USE);
- SSL_CTX_set_tmp_dh(serverContext, (DH*)dh);
diff --git a/net-p2p/linuxdcpp/files/patch-libc++ b/net-p2p/linuxdcpp/files/patch-libc++
deleted file mode 100644
index 97091c88b6d9..000000000000
--- a/net-p2p/linuxdcpp/files/patch-libc++
+++ /dev/null
@@ -1,64 +0,0 @@
---- dcpp/stdinc.h.orig
-+++ dcpp/stdinc.h
-@@ -123,7 +123,7 @@
- #include <boost/scoped_array.hpp>
- #include <boost/noncopyable.hpp>
-
--#if defined(_MSC_VER) || defined(_STLPORT_VERSION)
-+#if defined(_MSC_VER) || defined(_STLPORT_VERSION) || defined(_LIBCPP_VERSION)
-
- #include <unordered_map>
- #include <unordered_set>
-@@ -139,5 +139,8 @@
-
-+#ifdef _LIBCPP_VERSION
-+namespace std { namespace tr1 { using namespace std; }}
-+#endif
- namespace dcpp {
- using namespace std;
- using namespace std::tr1;
- }
---- dcpp/CID.h.orig 2011-04-17 21:57:09.000000000 +0400
-+++ dcpp/CID.h 2013-09-13 00:50:16.544145469 +0400
-@@ -57,7 +57,10 @@
-
- } // namespace dcpp
-
--namespace std { namespace tr1 {
-+namespace std {
-+#ifndef _LIBCPP_VERSION
-+namespace tr1 {
-+#endif
- template<>
- struct hash<dcpp::CID> {
- size_t operator()(const dcpp::CID& rhs) const {
-@@ -65,6 +68,8 @@
- }
- };
-+#ifndef _LIBCPP_VERSION
- }
-+#endif
- }
-
- #endif // !defined(CID_H)
---- dcpp/HashValue.h.orig 2011-04-17 21:57:09.000000000 +0400
-+++ dcpp/HashValue.h 2013-09-13 00:48:18.173057104 +0400
-@@ -46,12 +46,17 @@
-
- } // namespace dcpp
-
--namespace std { namespace tr1 {
-+namespace std {
-+#ifndef _LIBCPP_VERSION
-+namespace tr1 {
-+#endif
- template<typename T>
- struct hash<dcpp::HashValue<T> > {
- size_t operator()(const dcpp::HashValue<T>& rhs) const { return *(size_t*)rhs.data; }
- };
-+#ifndef _LIBCPP_VERSION
- }
-+#endif
- }
-
- #endif // !defined(HASH_VALUE_H)
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-31 21:41:02 +0000