diff options
Diffstat (limited to 'contrib')
-rw-r--r-- | contrib/Makefile.am | 2 | ||||
-rw-r--r-- | contrib/hostlist.cgi | 5 | ||||
-rw-r--r-- | contrib/hostlist.php | 35 | ||||
-rwxr-xr-x | contrib/report.sh | 62 | ||||
-rwxr-xr-x | contrib/submit | 13 |
5 files changed, 53 insertions, 64 deletions
diff --git a/contrib/Makefile.am b/contrib/Makefile.am index 6a6c1e7ab..501758369 100644 --- a/contrib/Makefile.am +++ b/contrib/Makefile.am | |||
@@ -27,8 +27,6 @@ dist_pkgdata_DATA = \ | |||
27 | 27 | ||
28 | EXTRA_DIST = \ | 28 | EXTRA_DIST = \ |
29 | coverage.sh \ | 29 | coverage.sh \ |
30 | hostlist.cgi \ | ||
31 | hostlist.php \ | ||
32 | report.sh \ | 30 | report.sh \ |
33 | terminate.py.in \ | 31 | terminate.py.in \ |
34 | gnunet_pyexpect.py.in \ | 32 | gnunet_pyexpect.py.in \ |
diff --git a/contrib/hostlist.cgi b/contrib/hostlist.cgi deleted file mode 100644 index f04246e47..000000000 --- a/contrib/hostlist.cgi +++ /dev/null | |||
@@ -1,5 +0,0 @@ | |||
1 | #!/bin/sh | ||
2 | # This is a CGI script to generate the host list on-demand. | ||
3 | # by Michael Wensley, with minor improvements by Christian Grothoff | ||
4 | echo -ne "Content-Type: application/octet-stream\r\n\r\n" | ||
5 | 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 index 158561542..000000000 --- a/contrib/hostlist.php +++ /dev/null | |||
@@ -1,35 +0,0 @@ | |||
1 | <?php | ||
2 | // Requires PHP >= 4.3.0 | ||
3 | // Author: "Krasko Oleksandr" <0m3r.mail@gmail.com> | ||
4 | // Minor improvements by Christian Grothoff <christian@grothoff.org> | ||
5 | header("Content-Type: application/octet-stream\r\n\r\n"); | ||
6 | $extmas = array(); | ||
7 | $pv=$_GET['p']; | ||
8 | if (isset($pv)) | ||
9 | { | ||
10 | for ($ii=0;$ii<64;$ii++) | ||
11 | if (0 != ($pv & (1 << $ii))) | ||
12 | $extmas[] = $ii; | ||
13 | } | ||
14 | else | ||
15 | { | ||
16 | $extmas = array('2','3','4','5','6','8','12','17','23','25'); | ||
17 | } | ||
18 | $path = '/var/lib/gnunet/data/hosts/'; // adjust as necessary | ||
19 | $dir = opendir($path); | ||
20 | if (! $dir) | ||
21 | die("Cannot open directory $path.\n"); | ||
22 | $mas = array(); | ||
23 | while ($fname = readdir($dir)) { | ||
24 | $fn = $path . '/' . $fname; | ||
25 | if (is_file($fn)) { | ||
26 | $dpo = strpos($fname, '.') + 1; | ||
27 | $len = strlen($fname); | ||
28 | if (in_array(substr($fname, $dpo - $len), $extmas)) | ||
29 | $mas[] = $fn; | ||
30 | } | ||
31 | } | ||
32 | shuffle($mas); // randomize order | ||
33 | foreach ($mas as $val) | ||
34 | echo file_get_contents($val); | ||
35 | ?> | ||
diff --git a/contrib/report.sh b/contrib/report.sh index 37a1c41ad..6e1d39949 100755 --- a/contrib/report.sh +++ b/contrib/report.sh | |||
@@ -156,6 +156,26 @@ else | |||
156 | fi | 156 | fi |
157 | fi | 157 | fi |
158 | 158 | ||
159 | TEST=`$WHICH dpkg 2> /dev/null` | ||
160 | if test -n "$TEST"; then | ||
161 | LINES=`dpkg -s libunistring-dev | grep Version | wc -l` | ||
162 | if test "$LINES" = "1" | ||
163 | then | ||
164 | VERSION=`dpkg -s libunistring-dev | grep Version | awk '{print $2}'` | ||
165 | echo "libunistring : libunistring3-dev-$VERSION.deb" | ||
166 | else | ||
167 | echo "libunistring : dpkg: libunistring3-dev not installed" | ||
168 | fi | ||
169 | else | ||
170 | TEST=`$WHICH rpm 2> /dev/null` | ||
171 | if test -n "$TEST"; then | ||
172 | rpm -q unistring | sed -e "s/unistring-//" 2> /dev/null | \ | ||
173 | awk '{print "libunistring : "$1.rpm}' | ||
174 | else | ||
175 | echo "libunistring : Test not available" | ||
176 | fi | ||
177 | fi | ||
178 | |||
159 | TEST=`$WHICH gettext 2> /dev/null` | 179 | TEST=`$WHICH gettext 2> /dev/null` |
160 | if test -n "$TEST"; then | 180 | if test -n "$TEST"; then |
161 | gettext --version | head -n1 2> /dev/null | \ | 181 | gettext --version | head -n1 2> /dev/null | \ |
@@ -173,15 +193,7 @@ else | |||
173 | echo "libcurl : Not found" | 193 | echo "libcurl : Not found" |
174 | fi | 194 | fi |
175 | 195 | ||
176 | 196 | echo -n "libmicrohttpd : " | |
177 | TEST=`which qmake 2> /dev/null` | ||
178 | if test -x "$TEST"; then | ||
179 | qmake --version | tail -n 1 | awk '{print "Qt : "$4}' | ||
180 | else | ||
181 | echo "Qt : Not found" | ||
182 | fi | ||
183 | |||
184 | echo -n "MHD : " | ||
185 | TMPFILE=`mktemp /tmp/mhd-version-testXXXXXX` | 197 | TMPFILE=`mktemp /tmp/mhd-version-testXXXXXX` |
186 | cat - >$TMPFILE.c <<EOF | 198 | cat - >$TMPFILE.c <<EOF |
187 | #include <microhttpd.h> | 199 | #include <microhttpd.h> |
@@ -197,4 +209,36 @@ gcc -o $TMPFILE $TMPFILE.c 2> /dev/null && $TMPFILE || echo "Not found" | |||
197 | rm -f $TMPFILE $TMPFILE.bin | 209 | rm -f $TMPFILE $TMPFILE.bin |
198 | 210 | ||
199 | 211 | ||
212 | echo -n "GNU GLPK : " | ||
213 | TMPFILE=`mktemp /tmp/glpk-version-testXXXXXX` | ||
214 | cat - >$TMPFILE.c <<EOF | ||
215 | #include <glpk.h> | ||
216 | #include <stdio.h> | ||
217 | int main() | ||
218 | { | ||
219 | fprintf (stdout, "%u.%u\n", GLP_MAJOR_VERSION, GLP_MINOR_VERSION); | ||
220 | return 0; | ||
221 | } | ||
222 | EOF | ||
223 | |||
224 | gcc -o $TMPFILE $TMPFILE.c 2> /dev/null && $TMPFILE || echo "Not found" | ||
225 | rm -f $TMPFILE $TMPFILE.bin | ||
226 | |||
227 | |||
228 | echo -n "GNUtls : " | ||
229 | TMPFILE=`mktemp /tmp/gnutls-version-testXXXXXX` | ||
230 | cat - >$TMPFILE.c <<EOF | ||
231 | #include <gnutls/gnutls.h> | ||
232 | #include <stdio.h> | ||
233 | int main() | ||
234 | { | ||
235 | fprintf (stdout, "%s\n", GNUTLS_VERSION); | ||
236 | return 0; | ||
237 | } | ||
238 | EOF | ||
239 | |||
240 | gcc -o $TMPFILE $TMPFILE.c 2> /dev/null && $TMPFILE || echo "Not found" | ||
241 | rm -f $TMPFILE $TMPFILE.bin | ||
242 | |||
243 | |||
200 | echo "--------------------------------------------------------------" | 244 | echo "--------------------------------------------------------------" |
diff --git a/contrib/submit b/contrib/submit deleted file mode 100755 index 552b253d2..000000000 --- a/contrib/submit +++ /dev/null | |||
@@ -1,13 +0,0 @@ | |||
1 | #!/bin/sh | ||
2 | echo "Are you sure you want to commit changes to these files?" | ||
3 | svn status | ||
4 | read dummy | ||
5 | svn diff | ||
6 | echo "Are you sure you want to commit the changes above (CTRL-C to abort)" | ||
7 | read dummy | ||
8 | if test 0 != $# | ||
9 | then | ||
10 | svn commit -m "$*" | ||
11 | else | ||
12 | svn commit | ||
13 | fi | ||