OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael Schloh
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 19-Nov-2004 19:50:59
Branch: HEAD Handle: 2004111918505900
Modified files:
openpkg-src/tftp tftp.spec tftpd.remap
Log:
correct erroneous logic in remap file when (by our default) using both
secure chroot(8) mode, and supplying a remap rule for nonabolute
paths, and also do some remap file whitespace cleanups
Summary:
Revision Changes Path
1.46 +1 -1 openpkg-src/tftp/tftp.spec
1.2 +6 -6 openpkg-src/tftp/tftpd.remap
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/tftp/tftp.spec
============================================================================
$ cvs diff -u -r1.45 -r1.46 tftp.spec
--- openpkg-src/tftp/tftp.spec 9 Oct 2004 07:48:16 -0000 1.45
+++ openpkg-src/tftp/tftp.spec 19 Nov 2004 18:50:59 -0000 1.46
@@ -34,7 +34,7 @@
Group: Network
License: GPL
Version: 0.40
-Release: 20041009
+Release: 20041119
# package options
%option with_fsl yes
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/tftp/tftpd.remap
============================================================================
$ cvs diff -u -r1.1 -r1.2 tftpd.remap
--- openpkg-src/tftp/tftpd.remap 24 Oct 2002 13:46:24 -0000 1.1
+++ openpkg-src/tftp/tftpd.remap 19 Nov 2004 18:50:59 -0000 1.2
@@ -24,10 +24,10 @@
#
# "#" begins a comment, unless \-escaped
#
-ri ^[a-z]: # Remove "drive letters"
-rg \\ / # Convert backslashes to slashes
-rg \# @ # Convert hash marks to @ signs
-rg /../ /..no../ # Convert /../ to /..no../
+ri ^[a-z]: # Remove drive letters
+rg \\ / # Convert backslashes
to slashes
+rg \# @ # Convert hash marks to
@ signs
+rg /../ /..no../ # Convert /../ to /..no../
e ^incoming/ # These are always ok
-r ^[^/] @l_prefix@/pub/\0 # Convert non-absolute files
-a ^\. # Reject requests for hidden
files
+r ^[^/] /\0 # Convert nonabsolute files
+a ^\. # Reject requests for
hidden files
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
