updating report.sh, removing obsolete hostlist scripts

diff --git a/Makefile.am b/Makefile.am
index 1c804cb90221211c3907db0b00cffad22e31f951..39a37a9402d345ced0dcd3887ffa21c07d7055b7 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -11,7 +11,7 @@ gnunetincludedir = $(includedir)/gnunet
 gnunetinclude_HEADERS = gnunet_config.h
 
 docdir = $(datadir)/doc/gnunet/
-doc_DATA = COPYING
+doc_DATA = COPYING README
 
 ACLOCAL_AMFLAGS = -I m4
 

diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index 6a6c1e7abc550327ef98ff18ecf7cbca38628fb4..501758369b8775664670cd93f4d3ae0db2ac0cc0 100644 (file)
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -27,8 +27,6 @@ dist_pkgdata_DATA = \
 
 EXTRA_DIST = \
  coverage.sh \
- hostlist.cgi \
- hostlist.php \
  report.sh \
  terminate.py.in \
  gnunet_pyexpect.py.in \

diff --git a/contrib/hostlist.cgi b/contrib/hostlist.cgi
deleted file mode 100644 (file)
index f04246e..0000000
--- a/contrib/hostlist.cgi
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-# This is a CGI script to generate the host list on-demand.
-# by Michael Wensley, with minor improvements by Christian Grothoff
-echo -ne "Content-Type: application/octet-stream\r\n\r\n"
-cat /var/lib/gnunet/data/hosts/*.{2,3,4,5,6,8,12,17,23,25}

diff --git a/contrib/hostlist.php b/contrib/hostlist.php
deleted file mode 100644 (file)
index 1585615..0000000
--- a/contrib/hostlist.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-// Requires PHP >= 4.3.0
-// Author: "Krasko Oleksandr" <0m3r.mail@gmail.com>
-// Minor improvements by Christian Grothoff <christian@grothoff.org>
-header("Content-Type: application/octet-stream\r\n\r\n");
-$extmas = array();
-$pv=$_GET['p'];
-if (isset($pv))
-  {
-    for ($ii=0;$ii<64;$ii++)
-      if (0 != ($pv & (1 << $ii)))
-       $extmas[] = $ii;
-  }
-else
-  {
-    $extmas = array('2','3','4','5','6','8','12','17','23','25');
-  }
-$path = '/var/lib/gnunet/data/hosts/'; // adjust as necessary
-$dir = opendir($path);
-if (! $dir)
-  die("Cannot open directory $path.\n");
-$mas = array();
-while ($fname = readdir($dir)) {
-  $fn = $path . '/' . $fname;
-  if (is_file($fn)) {
-    $dpo = strpos($fname, '.') + 1;
-    $len = strlen($fname);
-    if (in_array(substr($fname, $dpo - $len), $extmas)) 
-      $mas[] = $fn;
-  }
-}
-shuffle($mas); // randomize order
-foreach ($mas as $val) 
-  echo file_get_contents($val);
-?>

diff --git a/contrib/report.sh b/contrib/report.sh
index 37a1c41ad0931454cf69e263c264db4d6d4f18e5..6e1d399490272a5f26050e3a085740643b2f1167 100755 (executable)
--- a/contrib/report.sh
+++ b/contrib/report.sh
@@ -156,6 +156,26 @@ else
   fi
 fi
 
+TEST=`$WHICH dpkg 2> /dev/null`
+if test -n "$TEST"; then
+  LINES=`dpkg -s libunistring-dev | grep Version | wc -l`
+  if test "$LINES" = "1"
+  then
+    VERSION=`dpkg -s libunistring-dev | grep Version | awk '{print $2}'`
+    echo "libunistring   : libunistring3-dev-$VERSION.deb"
+  else
+    echo "libunistring   : dpkg: libunistring3-dev not installed"
+  fi
+else
+  TEST=`$WHICH rpm 2> /dev/null`
+  if test -n "$TEST"; then
+    rpm -q unistring | sed -e "s/unistring-//" 2> /dev/null | \
+      awk '{print "libunistring   : "$1.rpm}'
+  else
+    echo "libunistring   : Test not available"
+  fi
+fi
+
 TEST=`$WHICH gettext 2> /dev/null`
 if test -n "$TEST"; then
   gettext --version | head -n1 2> /dev/null | \
@@ -173,15 +193,7 @@ else
   echo "libcurl        : Not found"
 fi
 
-
-TEST=`which qmake 2> /dev/null`
-if test -x "$TEST"; then
-  qmake --version | tail -n 1 | awk '{print "Qt             : "$4}'
-else
-  echo "Qt             : Not found"
-fi
-
-echo -n "MHD            : "
+echo -n "libmicrohttpd  : "
 TMPFILE=`mktemp /tmp/mhd-version-testXXXXXX`
 cat - >$TMPFILE.c <<EOF
 #include <microhttpd.h>
@@ -197,4 +209,36 @@ gcc -o $TMPFILE $TMPFILE.c 2> /dev/null && $TMPFILE || echo "Not found"
 rm -f $TMPFILE $TMPFILE.bin
 
 
+echo -n "GNU GLPK       : "
+TMPFILE=`mktemp /tmp/glpk-version-testXXXXXX`
+cat - >$TMPFILE.c <<EOF
+#include <glpk.h>
+#include <stdio.h>
+int main()
+{
+  fprintf (stdout, "%u.%u\n", GLP_MAJOR_VERSION, GLP_MINOR_VERSION);
+  return 0;
+}
+EOF
+
+gcc -o $TMPFILE $TMPFILE.c 2> /dev/null && $TMPFILE || echo "Not found"
+rm -f $TMPFILE $TMPFILE.bin
+
+
+echo -n "GNUtls         : "
+TMPFILE=`mktemp /tmp/gnutls-version-testXXXXXX`
+cat - >$TMPFILE.c <<EOF
+#include <gnutls/gnutls.h>
+#include <stdio.h>
+int main()
+{
+  fprintf (stdout, "%s\n", GNUTLS_VERSION);
+  return 0;
+}
+EOF
+
+gcc -o $TMPFILE $TMPFILE.c 2> /dev/null && $TMPFILE || echo "Not found"
+rm -f $TMPFILE $TMPFILE.bin
+
+
 echo "--------------------------------------------------------------"

diff --git a/contrib/submit b/contrib/submit
deleted file mode 100755 (executable)
index 552b253..0000000
--- a/contrib/submit
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-echo "Are you sure you want to commit changes to these files?"
-svn status
-read dummy
-svn diff
-echo "Are you sure you want to commit the changes above (CTRL-C to abort)"
-read dummy
-if test 0 != $#
-then
-  svn commit -m "$*"
-else
-  svn commit 
-fi

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 738d9706048c0d48a216c676ac48c7105f8289d4..16b24888ed9265f51351f68f6eb376b731c1bb05 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,3 +1,6 @@
 SUBDIRS = man
 
 EXTRA_DIST = README.mysql README.postgres
+
+docdir = $(datadir)/doc/gnunet/
+doc_DATA = README.mysql README.postgres