correct patch

(Portage version: 2.0.51.19)

2 files changed, 11 insertions, 23 deletions

diff --git a/net-dialup/freeradius/Manifest b/net-dialup/freeradius/Manifest
index 74aa360df37e..33b1d5c8fe2f 100644
--- a/net-dialup/freeradius/Manifest
+++ b/net-dialup/freeradius/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 d075f94b574fba2c813ded7d415ef0b3 freeradius-1.0.1.ebuild 2890
 MD5 9b37bc88688cb942777da79117459988 freeradius-1.0.2-r2.ebuild 3106
 MD5 ec265dfc71efb8a8c4da9a90a84845ea freeradius-1.0.2-r4.ebuild 3327
@@ -13,11 +10,4 @@ MD5 5a26f9881af51aed070957e5fc4ed808 files/digest-freeradius-1.0.2-r4 69
 MD5 9f0188ba482e825cf2a89584f8caa813 files/digest-freeradius-1.0.1 69
 MD5 3c2119ec1d8d807fe5ed14944747f0f8 files/freeradius-1.0.1-gcc34.patch 715
 MD5 6b0efd384f551fab6b82794e91dbb4d5 files/freeradius-1.0.2-whole-archive-gentoo.patch 1728
-MD5 a2e7a99e5806049e6958b653814849c1 files/freeradius-1.0.2-sql-escape.patch 3087
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCjCNPjiC39V7gKu0RAsvHAJ91Emkvbavu9lkOrns10rWcStAorACdHw/F
-eFB29UYeNPN/GA68nj1+A3s=
-=GoZC
------END PGP SIGNATURE-----
+MD5 8aad37163f389564f402f677cd270c3c files/freeradius-1.0.2-sql-escape.patch 2851
diff --git a/net-dialup/freeradius/files/freeradius-1.0.2-sql-escape.patch b/net-dialup/freeradius/files/freeradius-1.0.2-sql-escape.patch
index db2a46d1a6d4..3658a83884bc 100644
--- a/net-dialup/freeradius/files/freeradius-1.0.2-sql-escape.patch
+++ b/net-dialup/freeradius/files/freeradius-1.0.2-sql-escape.patch
@@ -1,9 +1,7 @@
-===================================================================
-RCS file: /web/pages/us.freeradius.org/cvs/radiusd/src/modules/rlm_sql/rlm_sql.c,v
-retrieving revision 1.131.2.1
-retrieving revision 1.131.2.3
-diff -u -p -r1.131.2.1 -r1.131.2.3
-@@ -158,6 +158,7 @@ static int rlm_sql_init(void) {
+diff -Nru freeradius-1.0.2.orig/src/modules/rlm_sql/rlm_sql.c freeradius-1.0.2/src/modules/rlm_sql/rlm_sql.c
+--- freeradius-1.0.2.orig/src/modules/rlm_sql/rlm_sql.c	2004-09-30 17:54:22.000000000 +0300
++++ freeradius-1.0.2/src/modules/rlm_sql/rlm_sql.c	2005-05-19 08:32:00.830722112 +0300
+@@ -158,6 +158,7 @@
   */
  static int sql_set_user(SQL_INST *inst, REQUEST *request, char *sqlusername, const char *username);
  static int generate_sql_clients(SQL_INST *inst);
@@ -11,7 +9,7 @@ diff -u -p -r1.131.2.1 -r1.131.2.3
  
  /*
   *	sql xlat function. Right now only SELECTs are supported. Only
-@@ -184,7 +185,7 @@ static int sql_xlat(void *instance, REQU
+@@ -184,7 +185,7 @@
  	/*
  	 * Do an xlat on the provided string (nice recursive operation).
  	 */
@@ -20,7 +18,7 @@ diff -u -p -r1.131.2.1 -r1.131.2.3
  		radlog(L_ERR, "rlm_sql (%s): xlat failed.",
  		       inst->config->xlat_name);
  		return 0;
-@@ -409,18 +410,18 @@ static int sql_escape_func(char *out, in
+@@ -409,18 +410,18 @@
  
  	while (in[0]) {
  		/*
@@ -46,7 +44,7 @@ diff -u -p -r1.131.2.1 -r1.131.2.3
  			snprintf(out, outlen, "=%02X", (unsigned char) in[0]);
  			in++;
  			out += 3;
-@@ -430,7 +431,14 @@ static int sql_escape_func(char *out, in
+@@ -430,7 +431,14 @@
  		}
  
  		/*
@@ -62,7 +60,7 @@ diff -u -p -r1.131.2.1 -r1.131.2.3
  		 */
  		*out = *in;
  		out++;
-@@ -517,7 +525,7 @@ static int sql_groupcmp(void *instance, 
+@@ -517,7 +525,7 @@
  	 */
  	if (sql_set_user(inst, req, sqlusername, 0) < 0)
  		return 1;
@@ -71,7 +69,7 @@ diff -u -p -r1.131.2.1 -r1.131.2.3
  		radlog(L_ERR, "rlm_sql (%s): xlat failed.",
  		       inst->config->xlat_name);
  		/* Remove the username we (maybe) added above */
-@@ -1149,7 +1157,7 @@ static int rlm_sql_checksimul(void *inst
+@@ -1149,7 +1157,7 @@
  	if(sql_set_user(inst, request, sqlusername, 0) <0)
  		return RLM_MODULE_FAIL;
  
@@ -80,7 +78,7 @@ diff -u -p -r1.131.2.1 -r1.131.2.3
  
  	/* initialize the sql socket */
  	sqlsocket = sql_get_socket(inst);
-@@ -1193,7 +1201,7 @@ static int rlm_sql_checksimul(void *inst
+@@ -1193,7 +1201,7 @@
  		return RLM_MODULE_OK;
  	}