[Pkg-privacy-commits] [onioncat] 190/340: version string improved

[Ximin Luo]

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch debian
in repository onioncat.

commit b596ce374c02f26fa6825935288c61dbfda6814b
Author: eagle <eagle at 58e1ccc2-750e-0410-8d0d-f93ca75ab447>
Date:   Thu Aug 27 08:59:29 2009 +0000

    version string improved
    
    git-svn-id: http://www.cypherpunk.at/svn/onioncat/trunk@511 58e1ccc2-750e-0410-8d0d-f93ca75ab447
---
 ChangeLog       |  1 +
 configure       | 22 +++++++++++-----------
 configure.ac    |  2 +-
 src/ocat.c      |  2 +-
 src/ocatsetup.c |  4 ++++
 src/ocattun.c   |  2 ++
 6 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index fe211fd..f0d9849 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,5 @@
 * version 0.2.0
+ - version string improved
  - syslog messages contain name and PID
  - fixed some compiler warnings
  - updated hosts.onioncat
diff --git a/configure b/configure
index 37d9770..90aa597 100755
--- a/configure
+++ b/configure
@@ -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.0.r509.
+# Generated by GNU Autoconf 2.62 for onioncat 0.2.0.r511.
 #
 # Report bugs to <rahra at cypherpunk.at>.
 #
@@ -596,8 +596,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='onioncat'
 PACKAGE_TARNAME='onioncat'
-PACKAGE_VERSION='0.2.0.r509'
-PACKAGE_STRING='onioncat 0.2.0.r509'
+PACKAGE_VERSION='0.2.0.r511'
+PACKAGE_STRING='onioncat 0.2.0.r511'
 PACKAGE_BUGREPORT='rahra at cypherpunk.at'
 
 ac_subst_vars='SHELL
@@ -1259,7 +1259,7 @@ if test "$ac_init_help" = "long"; then
   # 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.0.r509 to adapt to many kinds of systems.
+\`configure' configures onioncat 0.2.0.r511 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1329,7 +1329,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of onioncat 0.2.0.r509:";;
+     short | recursive ) echo "Configuration of onioncat 0.2.0.r511:";;
    esac
   cat <<\_ACEOF
 
@@ -1421,7 +1421,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-onioncat configure 0.2.0.r509
+onioncat configure 0.2.0.r511
 generated by GNU Autoconf 2.62
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1435,7 +1435,7 @@ cat >config.log <<_ACEOF
 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.0.r509, which was
+It was created by onioncat $as_me 0.2.0.r511, which was
 generated by GNU Autoconf 2.62.  Invocation command line was
 
   $ $0 $@
@@ -2084,7 +2084,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='onioncat'
- VERSION='0.2.0.r509'
+ VERSION='0.2.0.r511'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -2235,7 +2235,7 @@ ac_config_headers="$ac_config_headers config.h"
 
 
 cat >>confdefs.h <<\_ACEOF
-#define SVN_REVISION "509"
+#define SVN_REVISION "511"
 _ACEOF
 
 
@@ -5208,7 +5208,7 @@ exec 6>&1
 # 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.0.r509, which was
+This file was extended by onioncat $as_me 0.2.0.r511, which was
 generated by GNU Autoconf 2.62.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -5261,7 +5261,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.0.r509
+onioncat config.status 0.2.0.r511
 configured by $0, generated by GNU Autoconf 2.62,
   with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
diff --git a/configure.ac b/configure.ac
index dd60b2d..57017a8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 
 AC_PREREQ(2.62)
-define([svnversion], esyscmd([sh -c "svnversion | tr -d 'M\n'"]))dnl
+define([svnversion], esyscmd([sh -c "echo -n $(( `svnversion | tr -d 'M'` + 1 ))"]))dnl
 AC_INIT([onioncat],[[0.2.0.r]svnversion],[rahra at cypherpunk.at])
 AM_INIT_AUTOMAKE([-Wall -Werror])
 AC_CONFIG_HEADERS([config.h])
diff --git a/src/ocat.c b/src/ocat.c
index a8c8c85..a0c93ef 100644
--- a/src/ocat.c
+++ b/src/ocat.c
@@ -385,7 +385,7 @@ int main(int argc, char *argv[])
       exit(0);
    }
 
-   log_msg(LOG_INFO | LOG_FERR, "%s (c) %s -- compiled %s %s", OCAT_AUTHOR, PACKAGE_STRING, __DATE__, __TIME__);
+   log_msg(LOG_INFO, "%s", CNF(version));
 
 #if 0
    if (CNF(config_file))
diff --git a/src/ocatsetup.c b/src/ocatsetup.c
index 5cb3493..efc68a4 100644
--- a/src/ocatsetup.c
+++ b/src/ocatsetup.c
@@ -130,7 +130,11 @@ void init_setup(void)
    setup_.socks_dst->sin_len = SOCKADDR_SIZE(setup_.socks_dst);
 #endif
 
+#ifdef DEBUG
    snprintf(setup_.version, VERSION_STRING_LEN, "%s (c) %s -- compiled %s %s", PACKAGE_STRING, OCAT_AUTHOR, __DATE__, __TIME__);
+#else
+   snprintf(setup_.version, VERSION_STRING_LEN, "%s (c) %s", PACKAGE_STRING, OCAT_AUTHOR);
+#endif
 
    ctrl_listen_.sin_family = AF_INET;
    ctrl_listen_.sin_port = htons(setup_.ocat_ctrl_port);
diff --git a/src/ocattun.c b/src/ocattun.c
index ad53f7b..2bc9c04 100644
--- a/src/ocattun.c
+++ b/src/ocattun.c
@@ -34,7 +34,9 @@ char *tun_dev_ = TUN_DEV;
 
 int tun_alloc(char *dev, int dev_s, struct in6_addr addr)
 {
+#ifdef __linux__
    struct ifreq ifr;
+#endif
    int fd;
    char astr[INET6_ADDRSTRLEN];
    char astr4[INET_ADDRSTRLEN];

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/onioncat.git