Merge commit 'refs/merge-requests/300' of gitorious.org:f-droid/fdroiddata

This commit is contained in:
Daniel Martí 2014-01-01 23:38:47 +01:00
commit a23b479790
3 changed files with 102 additions and 0 deletions

View file

@ -0,0 +1,33 @@
Category:System
License:GPLv2
Web Site:https://code.google.com/p/gogodroid/
Source Code:https://code.google.com/p/gogodroid/source
Issue Tracker:https://code.google.com/p/gogodroid/issues/list
Summary:Graphical frontend of gogoc for Android
Description:
TSP is a control protocol used to establish and maintain static tunnels.
The Gateway6 client (gogoc) is used on the host computer to connect to a
tunnel broker using the TSP protocol and to get the information for its
tunnel. When it receives the information for the tunnel, the Gateway6
client creates the static tunnel on its operating system.
GogoDroid is a graphical frontend of gogoc for Android.
.
Requires Root: Yes
Repo Type:svn
Repo:http://gogodroid.googlecode.com/svn/trunk/gogodroid
Build Version:1.3,13
commit=40
patch=remove_dup_defn.patch;sformat.patch
build=cd gogoc-android &&
$$NDK$$/ndk-build && \
cp libs/armeabi/gogoc ../res/raw
Auto Update Mode:None
Update Check Mode:None
Current Version:1.3
Current Version Code:13

View file

@ -0,0 +1,17 @@
Index: gogoc-android/native/gogoc-1_2-RELEASE/gogoc-tsp/src/tsp/tsp_setup.c
===================================================================
--- a/gogoc-android/native/gogoc-1_2-RELEASE/gogoc-tsp/src/tsp/tsp_setup.c (revision 40)
+++ b/gogoc-android/native/gogoc-1_2-RELEASE/gogoc-tsp/src/tsp/tsp_setup.c (working copy)
@@ -45,12 +45,6 @@
#include <linux/if.h>
#include <linux/route.h>
-struct in6_ifreq {
- struct in6_addr ifr6_addr;
- __u32 ifr6_prefixlen;
- int ifr6_ifindex;
-};
-
struct in6_rtmsg {
struct in6_addr rtmsg_dst;
struct in6_addr rtmsg_src;

View file

@ -0,0 +1,52 @@
Index: gogoc-android/native/gogoc-1_2-RELEASE/gogoc-tsp/src/lib/cli.c
===================================================================
--- a/gogoc-android/native/gogoc-1_2-RELEASE/gogoc-tsp/src/lib/cli.c (revision 40)
+++ b/gogoc-android/native/gogoc-1_2-RELEASE/gogoc-tsp/src/lib/cli.c (working copy)
@@ -29,7 +29,7 @@
// Print the message, if a message was passed.
if( message )
{
- printf(message);
+ printf("%s", message);
}
// Print the usage.
Index: gogoc-android/native/gogoc-1_2-RELEASE/gogoc-tsp/src/tsp/tsp_redirect.c
===================================================================
--- a/gogoc-android/native/gogoc-1_2-RELEASE/gogoc-tsp/src/tsp/tsp_redirect.c (revision 40)
+++ b/gogoc-android/native/gogoc-1_2-RELEASE/gogoc-tsp/src/tsp/tsp_redirect.c (working copy)
@@ -60,7 +60,7 @@
}
/* Set the broker address */
- pal_snprintf(new_broker->address, MAX_REDIRECT_ADDRESS_LENGTH, address);
+ pal_snprintf(new_broker->address, MAX_REDIRECT_ADDRESS_LENGTH, "%s", address);
/* Validate that the address was set correctly */
if (strlen(new_broker->address) != strlen(address)) {
@@ -433,7 +433,7 @@
if (strlen(line) && (line[strlen(line) - 1] == '\n' || line[strlen(line) - 1] == '\r')) line[strlen(line) - 1] = '\0';
/* Copy the line to the buffer */
- sprintf(buffer, line);
+ sprintf(buffer, "%s", line);
/* We found a server, so stop looking */
found_server = 1;
Index: gogoc-android/native/gogoc-1_2-RELEASE/gogoc-tsp/src/tsp/tsp_setup.c
===================================================================
--- a/gogoc-android/native/gogoc-1_2-RELEASE/gogoc-tsp/src/tsp/tsp_setup.c (revision 40)
+++ b/gogoc-android/native/gogoc-1_2-RELEASE/gogoc-tsp/src/tsp/tsp_setup.c (working copy)
@@ -45,12 +45,6 @@
#include <linux/if.h>
#include <linux/route.h>
-struct in6_ifreq {
- struct in6_addr ifr6_addr;
- __u32 ifr6_prefixlen;
- int ifr6_ifindex;
-};
-
struct in6_rtmsg {
struct in6_addr rtmsg_dst;
struct in6_addr rtmsg_src;