[Pkg-privacy-commits] [onioncat] 205/340: merged GarliCat branch back into trunk onioncat-privatehosts.pl added (code by zzz)
Ximin Luo
infinity0 at moszumanska.debian.org
Sat Aug 22 13:04:40 UTC 2015
This is an automated email from the git hooks/post-receive script.
infinity0 pushed a commit to branch debian
in repository onioncat.
commit a608fb11cc8e9cd86076d411da06dc4d855ff77e
Merge: df652ab 8b6658d
Author: eagle <eagle at 58e1ccc2-750e-0410-8d0d-f93ca75ab447>
Date: Sun Nov 29 21:37:56 2009 +0000
merged GarliCat branch back into trunk
onioncat-privatehosts.pl added (code by zzz)
git-svn-id: http://www.cypherpunk.at/svn/onioncat/trunk@534 58e1ccc2-750e-0410-8d0d-f93ca75ab447
ChangeLog | 2 +
Makefile.in | 1 +
configure | 34 +++++++++----
configure.ac | 1 +
i2p/Garlicat-HOWTO | 97 ++++++++++++++++++++++++++++++++++++
i2p/onioncat-privatehosts.pl | 67 +++++++++++++++++++++++++
man/Makefile.in | 1 +
man/ocat.1 | 37 ++++++++++----
src/Makefile.am | 8 ++-
src/Makefile.in | 28 +++++++----
src/cygwin/Makefile.in | 1 +
src/ocat.c | 37 ++++++++++----
src/ocat.h | 36 ++++---------
src/{ocatcompat.c => ocat_netdesc.c} | 33 +++++++++---
src/ocat_netdesc.h | 94 ++++++++++++++++++++++++++++++++++
src/ocatctrl.c | 3 +-
src/ocatlibe.c | 17 +++----
src/ocatsetup.c | 46 +++++++++++------
src/ocatsocks.c | 12 +++--
src/ocattun.c | 11 ++--
src/ocatv6conv.c | 6 +--
21 files changed, 459 insertions(+), 113 deletions(-)
diff --cc ChangeLog
index b9b5e29,f0d9849..c16237a
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,8 -1,3 +1,10 @@@
+* version 0.2.2
++ - GarliCat branch merged back into trunk
++ - added onioncat-privatehosts.pl to trunk (written by zzz)
+
+* version 0.2.1
+ - released 2009/11/29, Bernhard R. Fischer
+
* version 0.2.0
- version string improved
- syslog messages contain name and PID
diff --cc configure
index c3153d4,2bba706..de8078d
--- a/configure
+++ b/configure
@@@ -1,6 -1,6 +1,6 @@@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
- # Generated by GNU Autoconf 2.62 for onioncat 0.2.2.r533.
-# Generated by GNU Autoconf 2.62 for onioncat 0.2.0.r531.
++# Generated by GNU Autoconf 2.62 for onioncat 0.2.2.r534.
#
# Report bugs to <rahra at cypherpunk.at>.
#
@@@ -596,8 -596,8 +596,8 @@@ SHELL=${CONFIG_SHELL-/bin/sh
# Identity of this package.
PACKAGE_NAME='onioncat'
PACKAGE_TARNAME='onioncat'
- PACKAGE_VERSION='0.2.2.r533'
- PACKAGE_STRING='onioncat 0.2.2.r533'
-PACKAGE_VERSION='0.2.0.r531'
-PACKAGE_STRING='onioncat 0.2.0.r531'
++PACKAGE_VERSION='0.2.2.r534'
++PACKAGE_STRING='onioncat 0.2.2.r534'
PACKAGE_BUGREPORT='rahra at cypherpunk.at'
ac_subst_vars='SHELL
@@@ -1259,7 -1260,7 +1260,7 @@@ if test "$ac_init_help" = "long"; the
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
- \`configure' configures onioncat 0.2.2.r533 to adapt to many kinds of systems.
-\`configure' configures onioncat 0.2.0.r531 to adapt to many kinds of systems.
++\`configure' configures onioncat 0.2.2.r534 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@@ -1329,7 -1330,7 +1330,7 @@@ f
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of onioncat 0.2.2.r533:";;
- short | recursive ) echo "Configuration of onioncat 0.2.0.r531:";;
++ short | recursive ) echo "Configuration of onioncat 0.2.2.r534:";;
esac
cat <<\_ACEOF
@@@ -1421,7 -1422,7 +1422,7 @@@ f
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
- onioncat configure 0.2.2.r533
-onioncat configure 0.2.0.r531
++onioncat configure 0.2.2.r534
generated by GNU Autoconf 2.62
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@@ -1435,7 -1436,7 +1436,7 @@@ cat >config.log <<_ACEO
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
- It was created by onioncat $as_me 0.2.2.r533, which was
-It was created by onioncat $as_me 0.2.0.r531, which was
++It was created by onioncat $as_me 0.2.2.r534, which was
generated by GNU Autoconf 2.62. Invocation command line was
$ $0 $@
@@@ -2084,7 -2085,7 +2085,7 @@@ f
# Define the identity of the package.
PACKAGE='onioncat'
- VERSION='0.2.2.r533'
- VERSION='0.2.0.r531'
++ VERSION='0.2.2.r534'
cat >>confdefs.h <<_ACEOF
@@@ -2235,7 -2236,7 +2236,7 @@@ ac_config_headers="$ac_config_headers c
cat >>confdefs.h <<\_ACEOF
- #define SVN_REVISION "533"
-#define SVN_REVISION "531"
++#define SVN_REVISION "534"
_ACEOF
@@@ -5208,7 -5220,7 +5220,7 @@@ exec 6>&
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
- This file was extended by onioncat $as_me 0.2.2.r533, which was
-This file was extended by onioncat $as_me 0.2.0.r531, which was
++This file was extended by onioncat $as_me 0.2.2.r534, which was
generated by GNU Autoconf 2.62. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@@ -5261,7 -5273,7 +5273,7 @@@ Report bugs to <bug-autoconf at gnu.org>.
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_version="\\
- onioncat config.status 0.2.2.r533
-onioncat config.status 0.2.0.r531
++onioncat config.status 0.2.2.r534
configured by $0, generated by GNU Autoconf 2.62,
with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff --cc i2p/Garlicat-HOWTO
index 0000000,351ddd0..351ddd0
mode 000000,100644..100644
--- a/i2p/Garlicat-HOWTO
+++ b/i2p/Garlicat-HOWTO
diff --cc i2p/onioncat-privatehosts.pl
index 0000000,0000000..746c327
new file mode 100755
--- /dev/null
+++ b/i2p/onioncat-privatehosts.pl
@@@ -1,0 -1,0 +1,67 @@@
++#!/usr/bin/perl
++#
++# Reads hosts.txt and generates a file which can be used as privatehosts.txt
++# for the I2P router to convert GarliCat-IDs back to the original key.
++#
++# The original hostname, full IPV6 address, and b32 name are included as a
++# comment for each host.
++#
++# See below for perl package requirements.
++#
++# zzz 1/08 public domain
++#
++
++use strict;
++use CGI qw(:standard);
++use MIME::Base64;
++use Convert::Base32;
++use Digest::SHA qw(sha256);
++use Digest::SHA qw(sha256_hex);
++
++my $hosthash;
++
++# load the whole db into memory
++sub loadhosts
++{
++ my $hostcount = 0;
++ open(local *STATLIST, "hosts.txt") or die "Can't access hosts.txt!";
++ while (<STATLIST>) {
++ my $name;
++ my $key;
++ my $restofline;
++ ($name,$restofline) = split(/=/);
++ $key = $restofline;
++ $name = lc($name);
++ chomp($key);
++ $hosthash->{$name} = $key;
++ $hostcount++;
++ }
++ close STATLIST;
++}
++
++
++sub printhosts
++{
++ my @sorted = keys %$hosthash;
++ my $name;
++ foreach $name (@sorted) {
++ my $b64 = $hosthash->{$name};
++ $b64 =~ s/-/+/g;
++ $b64 =~ s/~/\//g;
++ my $decoded = decode_base64($b64);
++ my $hash=sha256($decoded);
++ my $hexhash = sha256_hex($decoded);
++ my $encoded = encode_base32($hash);
++ print "#" . $name . " fd60:db4d:ddb5";
++ for (my $i = 0; $i < 20; $i += 4) {
++ printf(":%s", substr($hexhash, $i, 4));
++ }
++ print " " . $encoded . ".b32.i2p\n";
++ print substr($encoded, 0, 16) . ".oc.b32.i2p=" . $hosthash->{$name} . "\n";
++ }
++ return 0;
++}
++
++loadhosts();
++printhosts();
++
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/onioncat.git
More information about the Pkg-privacy-commits
mailing list