Update .SRCINFO after package update

- Also include ns-2.35-gcc-compile-errors.patch file.

2 files changed, 49 insertions, 1 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6c6166cb3ea3..881bb67cb61e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = ns
 	pkgdesc = Discrete event simulator targeted at networking research
 	pkgver = 2.35
-	pkgrel = 5
+	pkgrel = 6
 	url = http://www.isi.edu/nsnam/ns/
 	arch = i686
 	arch = x86_64
@@ -15,10 +15,12 @@ pkgbase = ns
 	source = ns-2.35-linkstate-erase.fix
 	source = ns-2.35-tcl86.patch
 	source = ns-2.35-getopts.patch
+	source = ns-2.35-gcc-compile-errors.patch
 	sha256sums = 2a32e831bcec7d255042a544577559d15eae67696d0e3d30881cedc1112e2387
 	sha256sums = aedba646d1bc4d716031f9ea996e6d99c9bb227e7647138cccf39bdd6c069c3a
 	sha256sums = 7aa4a22492f2be37c81fcdc813972a6bde105e183a013d7b814a56f7bcef872c
 	sha256sums = 4d02ff0cf1c79d67c440c788d7163c7c873a6e4e2970bab3319cbe29f9b20c14
+	sha256sums = efbbe60f2be7f3daf28eec60437d6d2fc24e8b934e24d6b4b35cbc5a270f88c0
 
 pkgname = ns
 
diff --git a/ns-2.35-gcc-compile-errors.patch b/ns-2.35-gcc-compile-errors.patch
new file mode 100644
index 000000000000..8ba3785621bf
--- /dev/null
+++ b/ns-2.35-gcc-compile-errors.patch
@@ -0,0 +1,46 @@
+commit 17cab371bcd9bb08c7ffd0f2a4d3b7efafa5ab6b
+Author: Sergio Correia <sergio@correia.cc>
+Date:   Tue Jun 28 15:16:04 2016 -0400
+
+    Fix the following compile errors in a modern gcc:
+    
+    - error: reference to ‘hash’ is ambiguous
+      > use the global namespace `::', as `::hash'
+    
+    - narrowing conversion of ‘252’ from ‘int’ to ‘char’ inside { }
+      > use a static_cast to convert to `char'
+
+diff --git a/bitmap/play.xbm b/bitmap/play.xbm
+index 4d63679..0bda522 100644
+--- a/bitmap/play.xbm
++++ b/bitmap/play.xbm
+@@ -1,5 +1,5 @@
+ #define play_width 15
+ #define play_height 12
+ static char play_bits[] = {
+-   0x00, 0x00, 0x0c, 0x00, 0x3c, 0x00, 0xfc, 0x00, 0xfc, 0x03, 0xfc, 0x0f,
+-   0xfc, 0x0f, 0xfc, 0x03, 0xfc, 0x00, 0x3c, 0x00, 0x0c, 0x00, 0x00, 0x00};
++   0x00, 0x00, 0x0c, 0x00, 0x3c, 0x00, static_cast<char>(0xfc), 0x00, static_cast<char>(0xfc), 0x03, static_cast<char>(0xfc), 0x0f,
++   static_cast<char>(0xfc), 0x0f, static_cast<char>(0xfc), 0x03, static_cast<char>(0xfc), 0x00, 0x3c, 0x00, 0x0c, 0x00, 0x00, 0x00};
+diff --git a/mdart/mdart_adp.cc b/mdart/mdart_adp.cc
+index a96346e..6bb9225 100644
+--- a/mdart/mdart_adp.cc
++++ b/mdart/mdart_adp.cc
+@@ -105,7 +105,7 @@ void ADP::sendDarq(nsaddr_t reqId, int reqpktId) {
+ #ifdef DEBUG_ADP
+ 	fprintf(stdout, "%.9f\tADP::sendDarq(%d)\t\t\tin node %d\twith address %s\n", CURRENT_TIME, reqId, mdart_->id_, bitString(mdart_->address_));
+ #endif
+-	nsaddr_t dstAdd_ = hash(reqId);
++	nsaddr_t dstAdd_ = ::hash(reqId);
+ #ifdef DEBUG_ADP
+ 	fprintf(stdout, "\tsending darq for node %s\n", bitString(dstAdd_));
+ #endif
+@@ -393,7 +393,7 @@ void ADP::sendDaup() {
+ 	fprintf(stdout, "%.9f\tMDART::sendDaup()\t\t\t\tin node %d\twith address %s\n", CURRENT_TIME, mdart_->id_, bitString(mdart_->address_));
+ //	printDHT();
+ #endif
+-	nsaddr_t dstAdd_ = hash(mdart_->id_);
++	nsaddr_t dstAdd_ = ::hash(mdart_->id_);
+ #ifdef DEBUG_ADP
+ 	fprintf(stdout, "\tsending daup for node  %s\n", bitString(dstAdd_));
+ 	mdart_->routingTable_->print();