PurpleI2P
/
i2pd
mirror of https://github.com/PurpleI2P/i2pd.git
1
0
Fork 0
Code Issues Releases Activity
Browse Source

Merge pull request #304 from hagen-i2p/fixes 

Misc fixes
pull/306/head
orignal 9 years ago
parent
ad79ec7b1f 654371cb6a
commit
ccc96bc610
9 changed files with 56 additions and 134 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      SAM.h
  2. 11
      build/BUILD_NOTES.md
  3. 5
      build/Dockerfile
  4. 61
      build/cmake_modules/FindCryptoPP.cmake
  5. 11
      debian/changelog
  6. 10
      debian/control
  7. 58
      debian/copyright
  8. 30
      debian/patches/rename-binary.patch
  9. 2
      debian/watch

2
SAM.h
Unescape View File

@ -41,7 +41,7 @@ namespace client
const char SAM_DEST_REPLY_I2P_ERROR[] = "DEST REPLY RESULT=I2P_ERROR\n"; const char SAM_DEST_REPLY_I2P_ERROR[] = "DEST REPLY RESULT=I2P_ERROR\n";
const char SAM_NAMING_LOOKUP[] = "NAMING LOOKUP"; const char SAM_NAMING_LOOKUP[] = "NAMING LOOKUP";
const char SAM_NAMING_REPLY[] = "NAMING REPLY RESULT=OK NAME=ME VALUE=%s\n"; const char SAM_NAMING_REPLY[] = "NAMING REPLY RESULT=OK NAME=ME VALUE=%s\n";
const char SAM_DATAGRAM_RECEIVED[] = "DATAGRAM RECEIVED DESTINATION=%s SIZE=%lu\n"; const char SAM_DATAGRAM_RECEIVED[] = "DATAGRAM RECEIVED DESTINATION=%s SIZE=%zu\n";
const char SAM_NAMING_REPLY_INVALID_KEY[] = "NAMING REPLY RESULT=INVALID_KEY NAME=%s\n"; const char SAM_NAMING_REPLY_INVALID_KEY[] = "NAMING REPLY RESULT=INVALID_KEY NAME=%s\n";
const char SAM_NAMING_REPLY_KEY_NOT_FOUND[] = "NAMING REPLY RESULT=INVALID_KEY_NOT_FOUND NAME=%s\n"; const char SAM_NAMING_REPLY_KEY_NOT_FOUND[] = "NAMING REPLY RESULT=INVALID_KEY_NOT_FOUND NAME=%s\n";
const char SAM_PARAM_MIN[] = "MIN"; const char SAM_PARAM_MIN[] = "MIN";

11
build/BUILD_NOTES.md
Unescape View File

@ -3,7 +3,7 @@ Build notes
Common build/install process: Common build/install process:
* git clone https://github.com/PrivacySolutions/i2pd.git * git clone https://github.com/PurpleI2P/i2pd.git
* cd i2pd/build * cd i2pd/build
* cmake -DCMAKE_BUILD_TYPE=Release <more options> . * cmake -DCMAKE_BUILD_TYPE=Release <more options> .
* make * make
@ -19,13 +19,13 @@ Debian
------ ------
Required "-dev" packages: Required "-dev" packages:
* cmake
* libboost-filesystem-dev * libboost-filesystem-dev
* libboost-program-options-dev * libboost-program-options-dev
* libboost-regex-dev * libboost-regex-dev
* libboost-system-dev * libboost-system-dev
* libboost-date-time-dev * libboost-date-time-dev
* libcrypto++-dev * libssl-dev
FreeBSD FreeBSD
------- -------
@ -37,12 +37,11 @@ Required ports:
* devel/cmake * devel/cmake
* devel/boost-libs * devel/boost-libs
* lang/gcc47 # or later version * lang/gcc47 # or later version
* security/cryptopp
To use newer compiler you should set these variables: To use newer compiler you should set these variables:
export CC=/usr/local/bin/gcc47 export CC=/usr/local/bin/gcc47
export CXX=/usr/local/bin/g++47 export CXX=/usr/local/bin/g++47
Replace "47" with your actual gcc version Replace "47" with your actual gcc version

5
build/Dockerfile
Unescape View File

@ -1,12 +1,11 @@
FROM ubuntu FROM ubuntu
RUN apt-get update && apt-get install -y libboost-dev libboost-filesystem-dev \ RUN apt-get update && apt-get install -y libboost-dev libboost-filesystem-dev \
libboost-program-options-dev libboost-regex-dev libcrypto++-dev \ libboost-program-options-dev libboost-regex-dev libboost-date-time-dev \
libboost-date-time-dev git build-essential libssl-dev git build-essential
RUN git clone https://github.com/PurpleI2P/i2pd.git RUN git clone https://github.com/PurpleI2P/i2pd.git
WORKDIR /i2pd WORKDIR /i2pd
RUN make RUN make
CMD ./i2p CMD ./i2p

61
build/cmake_modules/FindCryptoPP.cmake
Unescape View File

@ -1,61 +0,0 @@
# - Find Crypto++
if(CRYPTO++_INCLUDE_DIR AND CRYPTO++_LIBRARIES)
set(CRYPTO++_FOUND TRUE)
else(CRYPTO++_INCLUDE_DIR AND CRYPTO++_LIBRARIES)
find_path(CRYPTO++_INCLUDE_DIR cryptopp/cryptlib.h
/usr/include
/usr/local/include
$ENV{SystemDrive}/Crypto++/include
$ENV{CRYPTOPP}
$ENV{CRYPTOPP}/..
$ENV{CRYPTOPP}/include
${PROJECT_SOURCE_DIR}/../..
)
find_library(CRYPTO++_LIBRARIES NAMES cryptopp
PATHS
/usr/lib
/usr/local/lib
/opt/local/lib
$ENV{SystemDrive}/Crypto++/lib
$ENV{CRYPTOPP}/lib
)
if(MSVC AND NOT CRYPTO++_LIBRARIES) # Give a chance for MSVC multiconfig
if(CMAKE_SIZEOF_VOID_P EQUAL 8)
set(PLATFORM x64)
else()
set(PLATFORM Win32)
endif()
find_library(CRYPTO++_LIBRARIES_RELEASE NAMES cryptlib cryptopp
HINTS
${PROJECT_SOURCE_DIR}/../../cryptopp/${PLATFORM}/Output/Release
PATHS
$ENV{CRYPTOPP}/Win32/Output/Release
)
find_library(CRYPTO++_LIBRARIES_DEBUG NAMES cryptlib cryptopp
HINTS
${PROJECT_SOURCE_DIR}/../../cryptopp/${PLATFORM}/Output/Debug
PATHS
$ENV{CRYPTOPP}/Win32/Output/Debug
)
set(CRYPTO++_LIBRARIES
debug ${CRYPTO++_LIBRARIES_DEBUG}
optimized ${CRYPTO++_LIBRARIES_RELEASE}
CACHE PATH "Path to Crypto++ library" FORCE
)
endif()
if(CRYPTO++_INCLUDE_DIR AND CRYPTO++_LIBRARIES)
set(CRYPTO++_FOUND TRUE)
message(STATUS "Found Crypto++: ${CRYPTO++_INCLUDE_DIR}, ${CRYPTO++_LIBRARIES}")
else(CRYPTO++_INCLUDE_DIR AND CRYPTO++_LIBRARIES)
set(CRYPTO++_FOUND FALSE)
message(STATUS "Crypto++ not found.")
endif(CRYPTO++_INCLUDE_DIR AND CRYPTO++_LIBRARIES)
mark_as_advanced(CRYPTO++_INCLUDE_DIR CRYPTO++_LIBRARIES)
endif(CRYPTO++_INCLUDE_DIR AND CRYPTO++_LIBRARIES)

11
debian/changelog vendored
Unescape View File

@ -1,11 +1,6 @@
i2pd (20140919-2) unstable; urgency=low i2pd (2.1.0-1) unstable; urgency=low
* updated to latest sources * updated to version 2.1.0/0.9.23
* updated deps
-- hagen <hagen@i2pmail.org> Fri, 19 Sep 2014 05:16:12 +0000 -- hagen <hagen@i2pmail.org> Fri, 19 Sep 2014 05:16:12 +0000
i2pd (20140919-1) unstable; urgency=low
* Initial release (Closes: #nnnn)
-- hagen <hagen@i2pmail.org> Mon, 19 Sep 2014 00:00:00 +0000

10
debian/control vendored
Unescape View File

@ -3,17 +3,17 @@ Section: net
Priority: extra Priority: extra
Maintainer: hagen <hagen@i2pmail.org> Maintainer: hagen <hagen@i2pmail.org>
Build-Depends: debhelper (>= 8.0.0), dpkg-dev (>= 1.16.1~), Build-Depends: debhelper (>= 8.0.0), dpkg-dev (>= 1.16.1~),
cmake (>= 2.8), gcc (>= 4.6) | clang (>= 3.3), gcc (>= 4.6) | clang (>= 3.3),
libboost-regex-dev, libboost-regex-dev,
libboost-system-dev (>= 1.46), libboost-system-dev (>= 1.46),
libboost-date-time-dev, libboost-date-time-dev,
libboost-filesystem-dev, libboost-filesystem-dev,
libboost-program-options-dev, libboost-program-options-dev,
libcrypto++-dev libssl-dev
Standards-Version: 3.9.3 Standards-Version: 3.9.3
Homepage: https://github.com/PrivacySolutions/i2pd Homepage: https://github.com/PurpleI2P/i2pd
Vcs-Git: git://github.com/PrivacySolutions/i2pd.git Vcs-Git: git://github.com/PurpleI2P/i2pd.git
Vcs-Browser: https://github.com/PrivacySolutions/i2pd.git Vcs-Browser: https://github.com/PurpleI2P/i2pd.git
Package: i2pd Package: i2pd
Architecture: any Architecture: any

58
debian/copyright vendored
Unescape View File

@ -3,38 +3,38 @@ Upstream-Name: i2pd
Source: https://github.com/PurpleI2P Source: https://github.com/PurpleI2P
Files: * Files: *
Copyright: 2013-2014 PurpleI2P Copyright: 2013-2015 PurpleI2P
License: BSD-3-clause License: BSD-3-clause
Copyright (c) 2013-2015, The PurpleI2P Project Copyright (c) 2013-2015, The PurpleI2P Project
.
All rights reserved. All rights reserved.
.
Redistribution and use in source and binary forms, with or without modification, are Redistribution and use in source and binary forms, with or without modification, are
permitted provided that the following conditions are met: permitted provided that the following conditions are met:
.
1. Redistributions of source code must retain the above copyright notice, this list of 1. Redistributions of source code must retain the above copyright notice, this list of
conditions and the following disclaimer. conditions and the following disclaimer.
.
2. Redistributions in binary form must reproduce the above copyright notice, this list of 2. Redistributions in binary form must reproduce the above copyright notice, this list of
conditions and the following disclaimer in the documentation and/or other materials conditions and the following disclaimer in the documentation and/or other materials
provided with the distribution. provided with the distribution.
.
3. Neither the name of the copyright holder nor the names of its contributors may be used 3. Neither the name of the copyright holder nor the names of its contributors may be used
to endorse or promote products derived from this software without specific prior written to endorse or promote products derived from this software without specific prior written
permission. permission.
.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
Files: debian/* Files: debian/*
Copyright: 2014 hagen <hagen@i2pmail.org> Copyright: 2014-2015 hagen <hagen@i2pmail.org>
License: GPL-2.0+ License: GPL-2.0+
This package is free software; you can redistribute it and/or modify This package is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by

30
debian/patches/rename-binary.patch vendored
Unescape View File

@ -1,23 +1,13 @@
diff --git a/Makefile b/Makefile
index f65d7a1..6f998bf 100644
--- a/Makefile --- a/Makefile
+++ b/Makefile +++ b/Makefile
@@ -10,9 +10,9 @@ @@ -3,7 +3,7 @@ SHLIB := libi2pd.so
include Makefile.linux ARLIB := libi2pd.a
endif SHLIB_CLIENT := libi2pdclient.so
ARLIB_CLIENT := libi2pdclient.a
-I2PD := i2p
+I2PD := i2pd
GREP := fgrep
DEPS := obj/make.dep
-all: obj i2p
+all: obj i2pd
-i2p: $(OBJECTS:obj/%=obj/%)
+i2pd: $(OBJECTS:obj/%=obj/%)
$(CXX) -o $@ $^ $(LDFLAGS) $(LIBS)
.SUFFIXES:
@@ -25,7 +25,7 @@
mkdir -p obj
clean:
- rm -fr obj i2p
+ rm -fr obj i2pd
.PHONY: all
.PHONY: clean

2
debian/watch vendored
Unescape View File

@ -1,3 +1,3 @@
version=3 version=3
opts=filenamemangle=s/.+\/v?(\d\S*)\.tar\.gz/i2pd-$1\.tar\.gz/ \ opts=filenamemangle=s/.+\/v?(\d\S*)\.tar\.gz/i2pd-$1\.tar\.gz/ \
https://github.com/PrivacySolutions/i2pd/tags .*/v?(\d\S*)\.tar\.gz https://github.com/PurpleI2P/i2pd/tags .*/v?(\d\S*)\.tar\.gz

Write Preview
Loading…
Cancel
Save