Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

see ChangeLog

  • Loading branch information...
commit 571b2ede53929d26d457f1eeb838224a5836b422 1 parent 4b5a126
dancy authored
Showing with 24 additions and 11 deletions.
  1. +10 −0 ChangeLog
  2. +9 −6 ftpd.cl
  3. +1 −1  install-repo
  4. +4 −4 makefile
View
10 ChangeLog
@@ -1,6 +1,16 @@
*** Don't forget to consider incrementing the version number in ftpd.cl
*** [and leave this message at the top of the file]
+2007-07-18 Ahmon Dancy <dancy@dancy>
+1.0.31
+
+ * makefile: Build w/ 8.1
+
+ * install-repo: Pass --update to createrepo
+
+ * ftpd.cl: Set LC_TIME=POSIX environment for /bin/ls command to
+ maintain expected time format for FTP clients.
+
2006-08-30 root <root@gills2.dancysoft.com>
1.0.30
View
15 ftpd.cl
@@ -5,11 +5,11 @@
;; (http://opensource.franz.com/preamble.html),
;; known as the LLGPL.
;;
-;; $Id: ftpd.cl,v 1.42 2006/08/30 21:23:08 dancy Exp $
+;; $Id: ftpd.cl,v 1.43 2007/07/18 16:19:55 dancy Exp $
(in-package :user)
-(defvar *ftpd-version* "1.0.30")
+(defvar *ftpd-version* "1.0.31")
(eval-when (compile)
(proclaim '(optimize (safety 1) (space 1) (speed 3) (debug 2))))
@@ -254,7 +254,7 @@
;;;
-(defun spawn-command (cmdvec)
+(defun spawn-command (cmdvec &key env)
(if (not (vectorp cmdvec))
(error "Ack!! non-vector passed to spawn-command"))
(multiple-value-bind (stdout stderr pid)
@@ -262,6 +262,7 @@
:input "/dev/null"
:output :stream
:error-output :stream
+ :environment env
:wait nil)
(mp:process-run-function "stderr reader" 'stderr-reader stderr)
(values stdout pid)))
@@ -273,9 +274,10 @@
(ftp-log "~A~%" line)))
(ignore-errors (close stderr))))
-(defmacro with-external-command ((streamvar cmdvec) &body body)
+(defmacro with-external-command ((streamvar cmdvec &key env) &body body)
(let ((pidvar (gensym)))
- `(multiple-value-bind (,streamvar ,pidvar) (spawn-command ,cmdvec)
+ `(multiple-value-bind (,streamvar ,pidvar)
+ (spawn-command ,cmdvec :env ,env)
(unwind-protect (progn ,@body)
(close ,streamvar)
(sys:reap-os-subprocess :pid ,pidvar)))))
@@ -1209,7 +1211,8 @@
(concatenate 'vector
#.(vector "/bin/ls" "/bin/ls")
default-options
- options))
+ options)
+ :env '("LC_TIME" "POSIX"))
(let (line)
(while (setf line (read-line stream nil nil))
(outline "~A" line)))))
View
2  install-repo
@@ -15,7 +15,7 @@ latest=`/bin/ls -t RPMS/$arch/aftpd-*.rpm | grep -v debuginfo | head -1`
ssh $host "cd $path && rm -f aftpd-*"
scp $latest $host:$path
-ssh $host "createrepo $path"
+ssh $host "createrepo -q --update $path"
View
8 makefile
@@ -5,15 +5,15 @@
# (http://opensource.franz.com/preamble.html),
# known as the LLGPL.
#
-# $Id: makefile,v 1.29 2006/11/29 18:43:19 dancy Exp $
+# $Id: makefile,v 1.30 2007/07/18 16:19:55 dancy Exp $
#
# This makefile requires GNU make.
platform = $(shell uname -s)
-preferred_lisp=/fi/cl/8.0/bin/mlisp
-alt_lisp0=/usr/local/acl80/mlisp
-alt_lisp1=/storage1/acl80/mlisp
+preferred_lisp=/fi/cl/8.1/bin/mlisp
+alt_lisp0=/usr/local/acl81/mlisp
+alt_lisp1=/storage1/acl81/mlisp
mlisp:=$(shell if test -x $(preferred_lisp); then \
echo $(preferred_lisp); \
Please sign in to comment.
Something went wrong with that request. Please try again.