File turnpike-gmodule-and-unused-warning.patch of Package turnpike
Index: turnpike-0.1.2/configure.ac
===================================================================
--- turnpike-0.1.2.orig/configure.ac
+++ turnpike-0.1.2/configure.ac
@@ -108,6 +108,11 @@ PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.6)
AC_SUBST(GTK_CFLAGS)
AC_SUBST(GTK_LIBS)
+dnl check for gmodule
+PKG_CHECK_MODULES(GMODULE, gmodule-2.0)
+AC_SUBST(GMODULE_CFLAGS)
+AC_SUBST(GGMODULE_LIBS)
+
dnl check for libxml
LIBXML_REQUIRED_VERSION=2.6.0
PKG_CHECK_MODULES(BASE_DEPENDENCIES, libxml-2.0 >= $LIBXML_REQUIRED_VERSION)
Index: turnpike-0.1.2/VPNClient/vpnlogin/src/Makefile.am
===================================================================
--- turnpike-0.1.2.orig/VPNClient/vpnlogin/src/Makefile.am
+++ turnpike-0.1.2/VPNClient/vpnlogin/src/Makefile.am
@@ -5,6 +5,7 @@ INCLUDES = \
-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
@LIBXML_CFLAGS@ \
@GTK_CFLAGS@ \
+ @GMODULE_CFLAGS@ \
-I${top_srcdir}/ErrorGenerator/ \
-I${top_srcdir}/utility/ \
-I${top_srcdir}/VPNClient/vpnlogin/include \
@@ -29,7 +30,7 @@ vpnlogin_SOURCES = \
gui-hooks.c
vpnlogin_LDFLAGS = -export-dynamic
-vpnlogin_LDADD = $(INTLLIBS) -lcrypto ../../../ErrorGenerator/libErrorHandling.la ../../CommonUI/libCommonUI.la ../../../utility/libgetip.la @GTK_LIBS@ @LIBXML_LIBS@
+vpnlogin_LDADD = $(INTLLIBS) -lcrypto ../../../ErrorGenerator/libErrorHandling.la ../../CommonUI/libCommonUI.la ../../../utility/libgetip.la @GTK_LIBS@ @LIBXML_LIBS@ @GMODULE_LIBS@
#noinst_HEADERS=interface.h callbacks.h utility.h externs.h
Index: turnpike-0.1.2/VPNClient/CommonUI/CommonUI.c
===================================================================
--- turnpike-0.1.2.orig/VPNClient/CommonUI/CommonUI.c
+++ turnpike-0.1.2/VPNClient/CommonUI/CommonUI.c
@@ -1058,7 +1058,6 @@ int receiveEvents(Inf_t* Inf_pointer)
size_t bufLen = 0;
char sendBuf[1024];
comHeader_t *comHeader;
- char *currptr;
//extern int server_addr;
//extern int source_addr;
@@ -1069,7 +1068,6 @@ int receiveEvents(Inf_t* Inf_pointer)
comHeader->ac_errno = 0;
bufLen += sizeof(comHeader_t);
- currptr = &sendBuf[bufLen];
comHeader->ac_len = bufLen;
sendLen = send(Inf_pointer->eventsockfd, sendBuf,bufLen,0);
@@ -2230,22 +2228,18 @@ int parse_profile_to_racoon_conf_buf(Inf
{
if ( cur_node->type == XML_ELEMENT_NODE )
{
- int mode = -1, encalgo = -1, hashalgo = -1, dhgroup = -1, authmethod = -1;
-
if(strcmp((const char*)cur_node->name, "entry") == 0)
{
buffer= xmlGetProp(cur_node,(const xmlChar*)"mode");
if(buffer)
{
- mode = ph1ModeValue((char*)buffer);
xmlFree(buffer);
}
buffer= xmlGetProp(cur_node,(const xmlChar*)"encalgo");
if(buffer)
{
- encalgo = ph1EncValue((char*)buffer);
strcpy(enc, (const char*)buffer);
xmlFree(buffer);
}
@@ -2253,7 +2247,6 @@ int parse_profile_to_racoon_conf_buf(Inf
buffer= xmlGetProp(cur_node,(const xmlChar*)"hashalgo");
if(buffer)
{
- hashalgo = ph1HashValue((char*)buffer);
strcpy(hash, (const char*)buffer);
xmlFree(buffer);
}
@@ -2261,7 +2254,6 @@ int parse_profile_to_racoon_conf_buf(Inf
buffer= xmlGetProp(cur_node,(const xmlChar*)"dhgroup");
if(buffer)
{
- dhgroup = ph1DhValue((char*)buffer);
if(strcmp((const char*)buffer, "dh1") == 0)
strcpy(dh, "1");
else
@@ -2272,7 +2264,6 @@ int parse_profile_to_racoon_conf_buf(Inf
buffer= xmlGetProp(cur_node,(const xmlChar*)"authmethod");
if(buffer)
{
- authmethod = ph1AuthValue((char*)buffer);
if(strcmp((const char*)buffer, "X.509") == 0)
strcpy(auth, "rsasig");
else
@@ -2341,15 +2332,11 @@ int parse_profile_to_racoon_conf_buf(Inf
{
if ( cur_node->type == XML_ELEMENT_NODE )
{
- int encalgo = -1, hashalgo = -1, dhgroup = -1;
-
if(strcmp((const char*)cur_node->name, "entry") == 0)
{
-
buffer= xmlGetProp(cur_node,(const xmlChar*)"encalgo");
if(buffer)
{
- encalgo = ph2EncValue((char*)buffer);
strcpy(ph2enc, (const char*)buffer);
xmlFree(buffer);
}
@@ -2357,7 +2344,6 @@ int parse_profile_to_racoon_conf_buf(Inf
buffer= xmlGetProp(cur_node,(const xmlChar*)"hashalgo");
if(buffer)
{
- hashalgo = ph2HashValue((char*)buffer);
strcpy(ph2hash, (const char*)buffer);
xmlFree(buffer);
}
@@ -2365,7 +2351,6 @@ int parse_profile_to_racoon_conf_buf(Inf
buffer= xmlGetProp(cur_node,(const xmlChar*)"pfsgroup");
if(buffer)
{
- dhgroup = ph2DhValue((char*)buffer);
strcpy(ph2pfs, (const char*)buffer);
xmlFree(buffer);
}
Index: turnpike-0.1.2/VPNClient/vpnlogin/src/utility.c
===================================================================
--- turnpike-0.1.2.orig/VPNClient/vpnlogin/src/utility.c
+++ turnpike-0.1.2/VPNClient/vpnlogin/src/utility.c
@@ -1072,7 +1072,7 @@ int writeCurrentProfileToFile()
char fileName[256] = {0};
int i, len;
- xmlNodePtr childptr, policyptr = NULL;
+ xmlNodePtr policyptr = NULL;
xmlNodePtr root_node = NULL;
xmlDocPtr doc;
@@ -1131,7 +1131,7 @@ int writeCurrentProfileToFile()
strcpy(vfile, VENDOR_PROFILE_PREFIX);
strcat(vfile, profileName);
strcat(vfile, ".prf");
- childptr=xmlNewTextChild(root,NULL,(const xmlChar *)"vendor",(const xmlChar *)vfile);
+ xmlNewTextChild(root,NULL,(const xmlChar *)"vendor",(const xmlChar *)vfile);
strcpy(vfile, Inf.userHome);
strcat(vfile, VENDOR_FILE);
@@ -1150,10 +1150,10 @@ int writeCurrentProfileToFile()
unloadmodule();
pmPluginActive = 0;
}
- childptr=xmlNewTextChild(root,NULL,(const xmlChar *)"gateway_ip",(const xmlChar *)gatewayip);
- childptr=xmlNewTextChild(root,NULL,(const xmlChar *)"gateway_type",(const xmlChar *)gatewayType);
+ xmlNewTextChild(root,NULL,(const xmlChar *)"gateway_ip",(const xmlChar *)gatewayip);
+ xmlNewTextChild(root,NULL,(const xmlChar *)"gateway_type",(const xmlChar *)gatewayType);
if(strcmp(authentication_type, "X.509 Certificate") == 0)
- childptr=xmlNewTextChild(root,NULL,(const xmlChar *)"certificate",(const xmlChar *)cert);
+ xmlNewTextChild(root,NULL,(const xmlChar *)"certificate",(const xmlChar *)cert);
policyptr=xmlNewChild(root,NULL,(const xmlChar *)"policies", NULL);
writePhase1PoliciesToFile(policyptr);
Index: turnpike-0.1.2/VPNClient/vpnlogin/src/ph2fill.c
===================================================================
--- turnpike-0.1.2.orig/VPNClient/vpnlogin/src/ph2fill.c
+++ turnpike-0.1.2/VPNClient/vpnlogin/src/ph2fill.c
@@ -267,7 +267,6 @@ add_columns (GtkTreeView *treeview)
{
GtkCellRenderer *renderer;
GtkTreeModel *model = gtk_tree_view_get_model (treeview);
- int columns = 0;
GtkTreeViewColumn *current_column = NULL;
@@ -275,7 +274,7 @@ add_columns (GtkTreeView *treeview)
while((current_column = (gtk_tree_view_get_column (treeview,0))))
{
- columns = gtk_tree_view_remove_column(treeview, current_column);
+ gtk_tree_view_remove_column(treeview, current_column);
}
/* number column */
Index: turnpike-0.1.2/VPNClient/vpnlogin/src/menuUpdate.c
===================================================================
--- turnpike-0.1.2.orig/VPNClient/vpnlogin/src/menuUpdate.c
+++ turnpike-0.1.2/VPNClient/vpnlogin/src/menuUpdate.c
@@ -44,7 +44,7 @@
int main(int argc, char **argv)
{
- xmlNode *cur_node, *child_node, *folder_node = NULL, *vpn_node = NULL;
+ xmlNode *cur_node, *folder_node = NULL, *vpn_node = NULL;
xmlChar *buffer;
xmlDocPtr doc;
int mode = -1;
@@ -131,7 +131,7 @@ int main(int argc, char **argv)
}
}
}
- child_node=xmlNewTextChild(folder_node,NULL,(const xmlChar *)"Include",(const xmlChar *)DESKTOPFILE);
+ xmlNewTextChild(folder_node,NULL,(const xmlChar *)"Include",(const xmlChar *)DESKTOPFILE);
xmlKeepBlanksDefault(0);
xmlSaveFormatFile(XMLFILE,doc,1);