Fixed 127983, 125796

Package-Manager: portage-2.1_rc1-r2

4 files changed, 104 insertions, 0 deletions

diff --git a/net-misc/scponly/files/digest-scponly-4.3 b/net-misc/scponly/files/digest-scponly-4.3
index 86b72bbb8528..30eb3e8ab1da 100644
--- a/net-misc/scponly/files/digest-scponly-4.3
+++ b/net-misc/scponly/files/digest-scponly-4.3
@@ -1 +1,3 @@
 MD5 2cef26fe5ed740031a067f189c293e77 scponly-4.3.tgz 94889
+RMD160 780baf0a2be4b3042d721953c109c06ff0d9d1a2 scponly-4.3.tgz 94889
+SHA256 e707315e4f90ccc3f882e6b21617dc4543bab77edbe40546fe230119609b6143 scponly-4.3.tgz 94889
diff --git a/net-misc/scponly/files/digest-scponly-4.6 b/net-misc/scponly/files/digest-scponly-4.6
index faf07b395d69..7db9b807bbdd 100644
--- a/net-misc/scponly/files/digest-scponly-4.6
+++ b/net-misc/scponly/files/digest-scponly-4.6
@@ -1 +1,3 @@
 MD5 0425cb868cadd026851238452f1db907 scponly-4.6.tgz 96578
+RMD160 c30d4b02314b53dce54d2f3f8e531c18792c7f60 scponly-4.6.tgz 96578
+SHA256 dfa5a334d66150289a391aea4dc00d1b039c644fd1c628bdeddaa7b0710e01a7 scponly-4.6.tgz 96578
diff --git a/net-misc/scponly/files/digest-scponly-4.6-r1 b/net-misc/scponly/files/digest-scponly-4.6-r1
new file mode 100644
index 000000000000..7db9b807bbdd
--- /dev/null
+++ b/net-misc/scponly/files/digest-scponly-4.6-r1
@@ -0,0 +1,3 @@
+MD5 0425cb868cadd026851238452f1db907 scponly-4.6.tgz 96578
+RMD160 c30d4b02314b53dce54d2f3f8e531c18792c7f60 scponly-4.6.tgz 96578
+SHA256 dfa5a334d66150289a391aea4dc00d1b039c644fd1c628bdeddaa7b0710e01a7 scponly-4.6.tgz 96578
diff --git a/net-misc/scponly/files/scponly-4.6-helper.patch b/net-misc/scponly/files/scponly-4.6-helper.patch
new file mode 100644
index 000000000000..875de04fc1ce
--- /dev/null
+++ b/net-misc/scponly/files/scponly-4.6-helper.patch
@@ -0,0 +1,97 @@
+--- scponly-4.6/helper.c.orig	Tue Jan 31 22:04:16 2006
++++ scponly-4.6/helper.c	Thu Mar 23 00:53:01 2006
+@@ -133,6 +133,78 @@
+ 	char		**tmpptr=av;
+ 	int			ch;
+ 	int			ac=0;
++	char		**av2 = NULL;
++
++	/*	
++	 *	first count the arguments in the vector
++	 */
++	tmpptr=av;
++	while (*tmpptr!=NULL)
++	{	
++		*tmpptr++;
++		ac++;
++	}
++
++#ifdef PROG_RSYNC
++	if (exact_match(PROG_RSYNC, av[0]))
++	{
++		/*
++		 *	these are the long opts (beginning "--") which we
++		 *	allow for rsync
++		 */
++		char *permitted_long_opts[] = {
++				"--server",
++				"--sender",
++				"--delete",
++				NULL	/* last element must be NULL */
++			};
++
++		/*
++		 *	make a copy of the args excluding any permitted long
++		 *	options
++		 */
++		int i, j;
++		av2 = malloc(ac * sizeof *av2);
++		av2[0] = av[0];
++		for (i = 1, j = 1; i < ac; ++i)
++		{
++			if (0 == strncmp(av[i], "--", 2))
++			{
++				char **p;
++				/*
++				 *	test against permitted opts
++				 */
++				for (p = permitted_long_opts; *p; ++p)
++				{
++					if (exact_match(av[i], *p))
++						break;
++				}
++				
++				if (*p)
++				{
++					/*
++					 *	permitted; skip this one
++					 */
++					continue;
++				}
++				else
++				{
++					/*
++					 *	no match
++					 */
++					syslog(LOG_ERR, "option %s is not permitted for use with %s (%s)",
++						av[i], cmdarg->name, logstamp());
++					return 1;
++				}
++			}
++			av2[j++] = av[i];
++			    
++		}
++		av2[j] = NULL;
++		ac = j;
++		av = av2;
++	}
++#endif /* PROG_RSYNC */
+ 
+ 	while (cmdarg != NULL)
+ 	{
+@@ -151,15 +223,6 @@
+ 			 */
+ 			if (1 == cmdarg->getoptflag)
+ 			{
+-				/*	
+-				 *	first count the arguments in the vector
+-				 */
+-				tmpptr=av;
+-				while (*tmpptr!=NULL)
+-				{	
+-					*tmpptr++;
+-					ac++;
+-				}
+ 				/* 
+ 				 *	now use getopt to look for our problem option
+ 				 */