bakabtw/packages
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[packages] pepperspot: Refresh patches

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/packages@31955 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
acinonyx 2012-05-28 16:20:56 +00:00
parent 74f58fe13c
commit 79833cd0a1
2 changed files with 42 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
net/pepperspot/patches/101-cflags.patch
View File

@ -1,6 +1,6 @@
--- a/configure
+++ b/configure
@@ -2801,8 +2801,6 @@ am__tar='${AMTAR} chof - "$$tardir"'; am
@@ -2815,8 +2815,6 @@ am__tar='${AMTAR} chof - "$$tardir"'; am
ac_config_headers="$ac_config_headers config.h"

98
net/pepperspot/patches/110-fix-compile.patch
View File

@ -1,8 +1,6 @@
Index: pepperspot-0.4/src/cmdline.c
===================================================================
--- pepperspot-0.4.orig/src/cmdline.c 2010-01-16 14:25:11.000000000 +0200
+++ pepperspot-0.4/src/cmdline.c 2012-05-28 16:21:56.000000000 +0300
@@ -1335,7 +1335,7 @@
--- a/src/cmdline.c
+++ b/src/cmdline.c
@@ -1335,7 +1335,7 @@ cmdline_parser_required (struct gengetop
#endif
int
@ -11,11 +9,9 @@ Index: pepperspot-0.4/src/cmdline.c
{
int c; /* Character of the parsed option. */
char *multi_token, *multi_next; /* for multiple options */
Index: pepperspot-0.4/src/ippool.c
===================================================================
--- pepperspot-0.4.orig/src/ippool.c 2010-01-20 09:42:01.000000000 +0200
+++ pepperspot-0.4/src/ippool.c 2012-05-28 16:22:57.000000000 +0300
@@ -267,7 +267,7 @@
--- a/src/ippool.c
+++ b/src/ippool.c
@@ -267,7 +267,7 @@ void ippool_getv6suffix(struct in6_addr
/* Get IP address and mask */
int ippool_aton(struct in_addr *addr, struct in_addr *mask,
@ -24,11 +20,9 @@ Index: pepperspot-0.4/src/ippool.c
{
/* Parse only first instance of network for now */
/* Eventually "number" will indicate the token which we want to parse */
Index: pepperspot-0.4/src/pepper.c
===================================================================
--- pepperspot-0.4.orig/src/pepper.c 2012-05-28 16:09:54.000000000 +0300
+++ pepperspot-0.4/src/pepper.c 2012-05-28 16:10:39.000000000 +0300
@@ -3305,7 +3305,7 @@
--- a/src/pepper.c
+++ b/src/pepper.c
@@ -3305,7 +3305,7 @@ static int dnprot_accept(struct app_conn
* \return 0
* \author Sebastien Vincent
*/
@ -37,7 +31,7 @@ Index: pepperspot-0.4/src/pepper.c
{
struct ippoolm_t* ipm = NULL;
struct in6_addr dst;
@@ -3377,7 +3377,7 @@
@@ -3377,7 +3377,7 @@ static int cb_tun6_ind(struct tun6_t* tu
* \param len data length
* \return 0
*/
@ -46,7 +40,7 @@ Index: pepperspot-0.4/src/pepper.c
{
struct ippoolm_t *ipm = NULL;
struct in_addr dst;
@@ -3459,7 +3459,7 @@
@@ -3459,7 +3459,7 @@ int cb_tun_ind(struct tun_t *tun_obj, vo
* \param conn redir connection that we will filled up up-to-date value
* \return 0 if success, -1 otherwise
*/
@ -55,7 +49,7 @@ Index: pepperspot-0.4/src/pepper.c
struct redir_conn_t *conn)
{
struct ippoolm_t *ipm = NULL;
@@ -3524,7 +3524,7 @@
@@ -3524,7 +3524,7 @@ static int cb_redir_getstate(struct redi
* \param conn redir connection that we will filled up up-to-date value
* \return 0 if success, -1 otherwise
*/
@ -64,7 +58,7 @@ Index: pepperspot-0.4/src/pepper.c
{
struct ippoolm_t *ipm = NULL;
struct app_conn_t *appconn = NULL;
@@ -4354,9 +4354,9 @@
@@ -4354,9 +4354,9 @@ int upprot_getipv6(struct app_conn_t *ap
* \param pack_req packet for request
* \return 0 if success, -1 otherwise
*/
@ -76,11 +70,9 @@ Index: pepperspot-0.4/src/pepper.c
{
struct radius_attr_t *attr = NULL;
Index: pepperspot-0.4/src/tun.c
===================================================================
--- pepperspot-0.4.orig/src/tun.c 2010-01-27 14:05:01.000000000 +0200
+++ pepperspot-0.4/src/tun.c 2012-05-28 16:20:10.000000000 +0300
@@ -226,7 +226,7 @@
--- a/src/tun.c
+++ b/src/tun.c
@@ -226,7 +226,7 @@ int tun_addaddr(struct tun_t *this,
struct sockaddr_nl local;
int addr_len = 0;
int fd = -1;
@ -89,7 +81,7 @@ Index: pepperspot-0.4/src/tun.c
struct sockaddr_nl nladdr;
struct iovec iov;
@@ -507,7 +507,7 @@
@@ -507,7 +507,7 @@ int tun_setaddr(struct tun_t *this,
* \param delete 1 = delete route, 0 = add route
* \return 0 if success, -1 otherwise
*/
@ -98,11 +90,9 @@ Index: pepperspot-0.4/src/tun.c
struct in_addr *dst,
struct in_addr *gateway,
struct in_addr *mask,
Index: pepperspot-0.4/src/dhcp.c
===================================================================
--- pepperspot-0.4.orig/src/dhcp.c 2012-05-28 15:57:59.000000000 +0300
+++ pepperspot-0.4/src/dhcp.c 2012-05-28 16:42:50.000000000 +0300
@@ -2111,7 +2111,7 @@
--- a/src/dhcp.c
+++ b/src/dhcp.c
@@ -2111,7 +2111,7 @@ int dhcp_timeout(struct dhcp_t *this)
return 0;
}
@ -111,7 +101,7 @@ Index: pepperspot-0.4/src/dhcp.c
{
/* To avoid unused parameter warning */
this = NULL;
@@ -2640,7 +2640,7 @@
@@ -2640,7 +2640,7 @@ static int dhcp_gettag(struct dhcp_packe
* \return 0 if success, -1 otherwise4
*/
static int dhcp_sendOFFER(struct dhcp_conn_t *conn,
@ -120,7 +110,7 @@ Index: pepperspot-0.4/src/dhcp.c
{
struct dhcp_t *this = conn->parent;
struct dhcp_fullpacket_t packet;
@@ -2762,7 +2762,7 @@
@@ -2762,7 +2762,7 @@ static int dhcp_sendOFFER(struct dhcp_co
* \return 0 if success, -1 otherwise
*/
static int dhcp_sendACK(struct dhcp_conn_t *conn,
@ -129,7 +119,7 @@ Index: pepperspot-0.4/src/dhcp.c
{
struct dhcp_t *this = conn->parent;
struct dhcp_fullpacket_t packet;
@@ -2895,7 +2895,7 @@
@@ -2895,7 +2895,7 @@ static int dhcp_sendACK(struct dhcp_conn
* \return 0 if success, -1 otherwise
*/
static int dhcp_sendNAK(struct dhcp_conn_t *conn,
@ -138,7 +128,7 @@ Index: pepperspot-0.4/src/dhcp.c
{
struct dhcp_t *this = conn->parent;
struct dhcp_fullpacket_t packet;
@@ -3496,7 +3496,7 @@
@@ -3496,7 +3496,7 @@ int dhcp_data_req(struct dhcp_conn_t *co
* \return 0
*/
static int dhcp_sendARP(struct dhcp_conn_t *conn,
@ -147,11 +137,9 @@ Index: pepperspot-0.4/src/dhcp.c
{
struct dhcp_t *this = conn->parent;
struct dhcp_arp_fullpacket_t packet;
Index: pepperspot-0.4/src/radius.c
===================================================================
--- pepperspot-0.4.orig/src/radius.c 2012-05-28 15:57:59.000000000 +0300
+++ pepperspot-0.4/src/radius.c 2012-05-28 16:37:47.000000000 +0300
@@ -210,7 +210,7 @@
--- a/src/radius.c
+++ b/src/radius.c
@@ -210,7 +210,7 @@ static int radius_acctreq_authenticator(
* \param secretlen length of secret
* \return 0
*/
@ -160,7 +148,7 @@ Index: pepperspot-0.4/src/radius.c
struct radius_packet_t *pack,
uint8_t *req_auth,
char *secret, int secretlen)
@@ -801,7 +801,7 @@
@@ -801,7 +801,7 @@ int radius_addattr(struct radius_t *this
return 0;
}
@ -169,7 +157,7 @@ Index: pepperspot-0.4/src/radius.c
uint8_t type, uint32_t vendor_id, uint8_t vendor_type,
struct in6_addr value, uint8_t *data, uint16_t dlen)
{
@@ -1124,7 +1124,7 @@
@@ -1124,7 +1124,7 @@ int radius_getattrv6(struct radius_packe
return 0;
}
@ -178,7 +166,7 @@ Index: pepperspot-0.4/src/radius.c
int *dstlen, uint8_t *src, int srclen,
uint8_t *authenticator, char *secret, int secretlen)
{
@@ -1346,7 +1346,7 @@
@@ -1346,7 +1346,7 @@ int radius_pwdecode(struct radius_t *thi
return 0;
}
@ -187,11 +175,9 @@ Index: pepperspot-0.4/src/radius.c
int *dstlen, uint8_t *src, int srclen,
uint8_t *authenticator, char *secret, int secretlen)
{
Index: pepperspot-0.4/src/redir.c
===================================================================
--- pepperspot-0.4.orig/src/redir.c 2012-05-28 15:57:59.000000000 +0300
+++ pepperspot-0.4/src/redir.c 2012-05-28 16:41:17.000000000 +0300
@@ -974,7 +974,7 @@
--- a/src/redir.c
+++ b/src/redir.c
@@ -974,7 +974,7 @@ void redir_set(struct redir_t *redir, in
* \param dstsize size of dst
* \return 0 if success, -1 otherwise
*/
@ -200,7 +186,7 @@ Index: pepperspot-0.4/src/redir.c
{
char *p1 = NULL;
char *p2 = NULL;
@@ -1045,7 +1045,7 @@
@@ -1045,7 +1045,7 @@ static int redir_getpath(struct redir_t
/**
* \brief Get the url of an HTTP request.
*/
@ -209,7 +195,7 @@ Index: pepperspot-0.4/src/redir.c
{
char *p1 = NULL;
char *p3 = NULL;
@@ -1128,7 +1128,7 @@
@@ -1128,7 +1128,7 @@ static int redir_geturl(struct redir_t *
* \return 0 if found, -1 otherwise (not found, malformed HTTP response)
*/
/* TODO: Should be merged with other parsers */
@ -218,7 +204,7 @@ Index: pepperspot-0.4/src/redir.c
char *param,
char *dst, int dstsize)
{
@@ -1362,9 +1362,9 @@
@@ -1362,9 +1362,9 @@ static int redir_getreq(struct redir_t *
* \param cbp pointer for callback
* \return 0
*/
@ -230,7 +216,7 @@ Index: pepperspot-0.4/src/redir.c
{
struct radius_attr_t *interimattr = NULL;
struct radius_attr_t *stateattr = NULL;
@@ -1696,7 +1696,7 @@
@@ -1696,7 +1696,7 @@ static int redir_cb_radius_auth_conf(str
* \param conn redir connection
* \return 0 if success, -1 otherwise
*/
@ -239,11 +225,9 @@ Index: pepperspot-0.4/src/redir.c
struct redir_conn_t *conn)
{
struct radius_t *radius = NULL; /* Radius client instance */
Index: pepperspot-0.4/src/tun6.c
===================================================================
--- pepperspot-0.4.orig/src/tun6.c 2009-11-09 17:01:57.000000000 +0200
+++ pepperspot-0.4/src/tun6.c 2012-05-28 16:44:07.000000000 +0300
@@ -1080,7 +1080,7 @@
--- a/src/tun6.c
+++ b/src/tun6.c
@@ -1080,7 +1080,7 @@ int tun6_setaddr(struct tun6_t *this, st
return code;
}
@ -252,7 +236,7 @@ Index: pepperspot-0.4/src/tun6.c
{
/* TODO : use _iface_route */
this = NULL;
@@ -1096,7 +1096,7 @@
@@ -1096,7 +1096,7 @@ int tun6_set_cb_ind(struct tun6_t *this,
return 0;
}