diff --git a/.cvsignore b/.cvsignore index b68d7ec..bbfece9 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -scponly-4.1.tgz +scponly-4.3.tgz diff --git a/scponly-4.3-optreset.patch b/scponly-4.3-optreset.patch new file mode 100644 index 0000000..65e3336 --- /dev/null +++ b/scponly-4.3-optreset.patch @@ -0,0 +1,29 @@ +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 + */ diff --git a/scponly.spec b/scponly.spec index c8ce7b0..d2a62c9 100644 --- a/scponly.spec +++ b/scponly.spec @@ -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 @@ as a wrapper to the "tried and true" ssh suite of applications. %prep %setup -q +%patch0 -p0 %build %configure @@ -45,6 +47,10 @@ sed -i "s|%{_prefix}/local/|%{_prefix}/|g" scponly.8* INSTALL README %{_bindir}/scponly %changelog +* Mon Jan 02 2006 Warren Togami - 4.3-1 +- security fixes +- Gentoo's patch for optreset which is not supplied by glibc + * Thu Nov 03 2005 Warren Togami - 4.1-6 - use macro in substitution diff --git a/sources b/sources index 4bf5b68..5ad64c8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -32e4b87dc46c78573010c1146e9744f0 scponly-4.1.tgz +2cef26fe5ed740031a067f189c293e77 scponly-4.3.tgz