rpms/scponly/FC-3 scponly-4.3-optreset.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 scponly.spec, 1.1, 1.2 sources, 1.2, 1.3

[Warren Togami (wtogami)]

Author: wtogami

Update of /cvs/extras/rpms/scponly/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13505

Modified Files:
	.cvsignore scponly.spec sources 
Added Files:
	scponly-4.3-optreset.patch 
Log Message:
4.3 security update


scponly-4.3-optreset.patch:

--- NEW FILE scponly-4.3-optreset.patch ---
http://bugs.gentoo.org/show_bug.cgi?id=116526#c11

--- helper.c.orig	2005-12-23 06:08:59.000000000 +0100
+++ helper.c	2005-12-28 10:51:29.000000000 +0100
@@ -39,7 +39,9 @@
 
 extern char *optarg;
 extern int optind;
+#ifdef HAVE_OPTRESET
 extern int optreset;
+#endif
 
 #ifdef UNIX_COMPAT
 char* solaris_needs_strsep(char** str, char* delims)
@@ -160,8 +162,14 @@
 				 *	now use getopt to look for our problem option
 				 */
 #ifdef HAVE_GETOPT
+#ifdef HAVE_OPTRESET
 				optreset=1;
+#endif
+#ifdef __GLIBC__
+				optind=0;
+#else
 				optind=1;
+#endif
 				/*
 				 *	tell getopt to only be strict if the 'opts' is well defined
 				 */


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/scponly/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	3 Nov 2005 16:06:31 -0000	1.2
+++ .cvsignore	2 Jan 2006 18:48:07 -0000	1.3
@@ -1 +1 @@
-scponly-4.1.tgz
+scponly-4.3.tgz


Index: scponly.spec
===================================================================
RCS file: /cvs/extras/rpms/scponly/FC-3/scponly.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- scponly.spec	3 Nov 2005 16:06:32 -0000	1.1
+++ scponly.spec	2 Jan 2006 18:48:07 -0000	1.2
@@ -1,11 +1,12 @@
 Summary: Restricted shell for ssh based file services
 Name: scponly
-Version: 4.1
-Release: 6%{?dist}
+Version: 4.3
+Release: 1%{?dist}
 License: BSD
 Group: Applications/Internet
 URL: http://sublimation.org/scponly/
 Source: http://sublimation.org/scponly/scponly-%{version}.tgz
+Patch0: scponly-4.3-optreset.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 
 # Checks only for location of binaries
@@ -20,6 +21,7 @@
 
 %prep
 %setup -q
+%patch0 -p0
 
 %build
 %configure
@@ -45,6 +47,10 @@
 %{_bindir}/scponly
 
 %changelog
+* Mon Jan 02 2006 Warren Togami <wtogami at redhat.com> - 4.3-1
+- security fixes
+- Gentoo's patch for optreset which is not supplied by glibc
+
 * Thu Nov 03 2005 Warren Togami <wtogami at redhat.com> - 4.1-6
 - use macro in substitution
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/scponly/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	3 Nov 2005 16:06:32 -0000	1.2
+++ sources	2 Jan 2006 18:48:07 -0000	1.3
@@ -1 +1 @@
-32e4b87dc46c78573010c1146e9744f0  scponly-4.1.tgz
+2cef26fe5ed740031a067f189c293e77  scponly-4.3.tgz