--- tor-0.2.3.2-alpha/configure.in	2011-07-18 21:22:03.000000000 +0400
+++ tor-0.2.3.2-alpha-patched/configure.in	2011-07-30 13:22:03.016297139 +0400
@@ -9,6 +9,11 @@
 
 AC_CANONICAL_HOST
 
+GENTOO_CFLAGS="$CFLAGS"
+GENTOO_LDFLAGS="$LDFLAGS"
+CFLAGS=
+LDFLAGS=
+
 if test -f /etc/redhat-release ; then
   if test -f /usr/kerberos/include ; then
     CPPFLAGS="$CPPFLAGS -I/usr/kerberos/include"
@@ -563,9 +568,11 @@
         [#include <miniupnpc/miniwget.h>
          #include <miniupnpc/miniupnpc.h>
          #include <miniupnpc/upnpcommands.h>],
-        [void upnpDiscover(int delay, const char * multicastif,
-         const char * minissdpdsock, int sameport);],
-        [upnpDiscover(1, 0, 0, 0); exit(0);],
+        [upnpDiscover(int delay, const char * multicastif,
+             const char * minissdpdsock, int sameport,
+             int ipv6,
+             int * error);],
+        [upnpDiscover(1, 0, 0, 0, 0, 0); exit(0);],
         [--with-libminiupnpc-dir],
         [/usr/lib/])
 fi
@@ -1211,6 +1218,8 @@
 
 
 CPPFLAGS="$CPPFLAGS $TOR_CPPFLAGS_libevent $TOR_CPPFLAGS_openssl $TOR_CPPFLAGS_zlib"
+CFLAGS="$CFLAGS $GENTOO_CFLAGS"
+LDFLAGS="$LDFLAGS $GENTOO_LDFLAGS"
 
 AC_CONFIG_FILES([
         Doxyfile
--- tor-0.2.3.2-alpha/src/tools/tor-fw-helper/tor-fw-helper-upnp.c	2011-07-12 00:33:54.000000000 +0400
+++ tor-0.2.3.2-alpha-patched/src/tools/tor-fw-helper/tor-fw-helper-upnp.c	2011-07-30 13:24:25.336297096 +0400
@@ -75,7 +75,7 @@
   memset(&(state->data), 0, sizeof(struct IGDdatas));
   state->init = 0;
 
-  devlist = upnpDiscover(UPNP_DISCOVER_TIMEOUT, NULL, NULL, 0);
+  devlist = upnpDiscover(UPNP_DISCOVER_TIMEOUT, NULL, NULL, 0, 0, NULL);
   if (NULL == devlist) {
     fprintf(stderr, "E: upnpDiscover returned: NULL\n");
     return UPNP_ERR_NODEVICESFOUND;
@@ -175,7 +175,7 @@
   r = UPNP_AddPortMapping(state->urls.controlURL,
                           state->data.first.servicetype,
                           external_port_str, internal_port_str,
-                          state->lanaddr, UPNP_DESC, "TCP", 0);
+                          state->lanaddr, UPNP_DESC, "TCP", 0, 0);
   if (r != UPNPCOMMAND_SUCCESS)
     return UPNP_ERR_ADDPORTMAPPING;