Merge pull request #22 from NewYorkCoin-NYC/Openssl-Update

Openssl update
NewYorkCoin-NYC · Apr 3, 2018 · 1b71124 · 1b71124
2 parents e81238a + b3d64a1
commit 1b71124
Show file tree

Hide file tree

Showing 11 changed files with 14 additions and 6 deletions.
diff --git a/src/bitcoinrpc.cpp b/src/bitcoinrpc.cpp
@@ -1,5 +1,6 @@
 // Copyright (c) 2010 Satoshi Nakamoto
 // Copyright (c) 2009-2012 The Bitcoin developers
+// Copyright (c) 2017-2018 NewYorkCoin Community developers
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 

diff --git a/src/checkpoints.cpp b/src/checkpoints.cpp
@@ -1,4 +1,5 @@
 // Copyright (c) 2009-2012 The Bitcoin developers
+// Copyright (c) 2017-2018 NewYorkCoin Community developers
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 

diff --git a/src/init.cpp b/src/init.cpp
@@ -1,5 +1,6 @@
 // Copyright (c) 2009-2010 Satoshi Nakamoto
 // Copyright (c) 2009-2014 The Bitcoin developers
+// Copyright (c) 2017-2018 NewYorkCoin Community developers
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 

diff --git a/src/main.cpp b/src/main.cpp
@@ -1,5 +1,6 @@
 // Copyright (c) 2009-2010 Satoshi Nakamoto
 // Copyright (c) 2009-2014 The Bitcoin developers
+// Copyright (c) 2017-2018 NewYorkCoin Community developers
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 

diff --git a/src/makefile.mingw b/src/makefile.mingw
@@ -27,7 +27,7 @@ INCLUDEPATHS= \
  -I"$(CURDIR)" \
  -I"$(DEPSDIR)/include" \
  -I"$(DEPSDIR)/boost_1_57_0/" \
- -I"$(DEPSDIR)/openssl-1.0.2n/include/" \
+ -I"$(DEPSDIR)/openssl-1.0.2o/include/" \
  -I"$(DEPSDIR)/db-4.8.30.NC/build_unix/" \
  -I"$(DEPSDIR)/miniupnpc/"
 
@@ -36,7 +36,7 @@ LIBPATHS= \
  -L"$(DEPSDIR)/lib" \
  -L"$(DEPSDIR)/boost_1_57_0/stage/lib" \
  -L"$(DEPSDIR)/db-4.8.30.NC/build_unix" \
- -L"$(DEPSDIR)/openssl-1.0.2n/dist/lib" \
+ -L"$(DEPSDIR)/openssl-1.0.2o/" \
  -L"$(DEPSDIR)/miniupnpc" 
 
 LIBS= \

diff --git a/src/makefile.osx b/src/makefile.osx
@@ -188,4 +188,4 @@ clean:
 	-rm -f obj/build.h
 	-cd leveldb && $(MAKE) clean || true
 
-FORCE:
+FORCE:
diff --git a/src/net.cpp b/src/net.cpp
@@ -1,5 +1,6 @@
 // Copyright (c) 2009-2010 Satoshi Nakamoto
 // Copyright (c) 2009-2014 The Bitcoin developers
+// Copyright (c) 2017-2018 NewYorkCoin Community developers
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 

diff --git a/src/qt/forms/aboutdialog.ui b/src/qt/forms/aboutdialog.ui
@@ -50,7 +50,7 @@
           <cursorShape>IBeamCursor</cursorShape>
          </property>
          <property name="text">
-          <string>&lt;b&gt;newyorkc&lt;/b&gt; version</string>
+          <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;NewYorkCoin&lt;/span&gt; version&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
          </property>
          <property name="textInteractionFlags">
           <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>

diff --git a/src/qt/forms/optionsdialog.ui b/src/qt/forms/optionsdialog.ui
@@ -23,7 +23,7 @@
       <enum>QTabWidget::North</enum>
      </property>
      <property name="currentIndex">
-      <number>1</number>
+      <number>2</number>
      </property>
      <widget class="QWidget" name="tabMain">
       <attribute name="title">

diff --git a/src/util.cpp b/src/util.cpp
@@ -1,5 +1,6 @@
 // Copyright (c) 2009-2010 Satoshi Nakamoto
 // Copyright (c) 2009-2012 The Bitcoin developers
+// Copyright (c) 2017-2018 NewYorkCoin Community developers
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
@@ -1142,7 +1143,8 @@ void ReadConfigFile(map<string, string>& mapSettingsRet,
                        fprintf(ConfFile, "rpcport=18823\n");
                        fprintf(ConfFile, "listen=1\n");
                        fprintf(ConfFile, "server=1\n");
-                       fprintf(ConfFile, "maxconnections=100\n");
+                       fprintf(ConfFile, "maxconnections=20\n");
+                       fprintf(ConfFile, "addnode=nyc.theincrediblemachine.tv\n");
                        fprintf(ConfFile, "addnode=62.213.218.23\n");
                        fprintf(ConfFile, "addnode=67.86.78.250\n");
                        fprintf(ConfFile, "addnode=71.34.149.166\n");

diff --git a/src/wallet.cpp b/src/wallet.cpp
@@ -1,5 +1,6 @@
 // Copyright (c) 2009-2010 Satoshi Nakamoto
 // Copyright (c) 2009-2014 The Bitcoin developers
+// Copyright (c) 2017-2018 NewYorkCoin Community developers
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.