summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Elias Pipping <pipping@exherbo.org> 2014-02-23 14:49:17 +0100
committerAvatar Elias Pipping <pipping@exherbo.org> 2014-02-23 14:49:17 +0100
commit3a84a9946535b3cc95227f4451e0a612df28efca (patch)
tree157accd5f00c8d4eb46bba01e7f8ec1b6929910e
parent2adebe3f55e285db5aa960de64d540a2e4b6f6a9 (diff)
downloadlisp-3a84a9946535b3cc95227f4451e0a612df28efca.tar.gz
lisp-3a84a9946535b3cc95227f4451e0a612df28efca.tar.xz
sbcl: Replace patch with a less invasive version
-rw-r--r--packages/dev-lang/sbcl/files/sbcl-sydbox.patch136
1 files changed, 27 insertions, 109 deletions
diff --git a/packages/dev-lang/sbcl/files/sbcl-sydbox.patch b/packages/dev-lang/sbcl/files/sbcl-sydbox.patch
index 5eba529..e217993 100644
--- a/packages/dev-lang/sbcl/files/sbcl-sydbox.patch
+++ b/packages/dev-lang/sbcl/files/sbcl-sydbox.patch
@@ -1,119 +1,37 @@
Source: Elias Pipping <pipping@exherbo.org>
Upstream: no
Reason: Tests should not write to /dev/log or call `rmdir /`
---- sbcl-1.1.1/contrib/sb-bsd-sockets/tests.lisp
-+++ sbcl-1.1.1/contrib/sb-bsd-sockets/tests.lisp
-@@ -177,37 +177,38 @@
+
+---
+ contrib/sb-bsd-sockets/tests.lisp | 2 +-
+ contrib/sb-posix/posix-tests.lisp | 1 +
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/contrib/sb-bsd-sockets/tests.lisp b/contrib/sb-bsd-sockets/tests.lisp
+index 95fcf43..0e1baa0 100644
+--- a/contrib/sb-bsd-sockets/tests.lisp
++++ b/contrib/sb-bsd-sockets/tests.lisp
+@@ -174,7 +174,7 @@
;;; to look at /etc/syslog.conf or local equivalent to find out where
;;; the message ended up
-#-win32
--(deftest simple-local-client
-- (progn
-- ;; SunOS (Solaris) and Darwin systems don't have a socket at
-- ;; /dev/log. We might also be building in a chroot or
-- ;; something, so don't fail this test just because the file is
-- ;; unavailable, or if it's a symlink to some weird character
-- ;; device.
-- (when (block nil
-- (handler-bind ((sb-posix:syscall-error
-- (lambda (e)
-- (declare (ignore e))
-- (return nil))))
-- (sb-posix:s-issock
-- (sb-posix::stat-mode (sb-posix:stat "/dev/log")))))
-- (let ((s (make-instance 'local-socket :type :datagram)))
-- (format t "Connecting ~A... " s)
-- (finish-output)
-- (handler-case
-- (socket-connect s "/dev/log")
-- (sb-bsd-sockets::socket-error ()
-- (setq s (make-instance 'local-socket :type :stream))
-- (format t "failed~%Retrying with ~A... " s)
-- (finish-output)
-- (socket-connect s "/dev/log")))
-- (format t "ok.~%")
-- (let ((stream (socket-make-stream s :input t :output t :buffering :none)))
-- (format stream
-- "<7>bsd-sockets: Don't panic. We're testing local-domain client code; this message can safely be ignored"))))
-- t)
-- t)
-+;;;; Disabled on Exherbo: Tests should not write to /dev/log
-+;; #-win32
-+;; (deftest simple-local-client
-+;; (progn
-+;; ;; SunOS (Solaris) and Darwin systems don't have a socket at
-+;; ;; /dev/log. We might also be building in a chroot or
-+;; ;; something, so don't fail this test just because the file is
-+;; ;; unavailable, or if it's a symlink to some weird character
-+;; ;; device.
-+;; (when (block nil
-+;; (handler-bind ((sb-posix:syscall-error
-+;; (lambda (e)
-+;; (declare (ignore e))
-+;; (return nil))))
-+;; (sb-posix:s-issock
-+;; (sb-posix::stat-mode (sb-posix:stat "/dev/log")))))
-+;; (let ((s (make-instance 'local-socket :type :datagram)))
-+;; (format t "Connecting ~A... " s)
-+;; (finish-output)
-+;; (handler-case
-+;; (socket-connect s "/dev/log")
-+;; (sb-bsd-sockets::socket-error ()
-+;; (setq s (make-instance 'local-socket :type :stream))
-+;; (format t "failed~%Retrying with ~A... " s)
-+;; (finish-output)
-+;; (socket-connect s "/dev/log")))
-+;; (format t "ok.~%")
-+;; (let ((stream (socket-make-stream s :input t :output t :buffering :none)))
-+;; (format stream
-+;; "<7>bsd-sockets: Don't panic. We're testing local-domain client code; this message can safely be ignored"))))
-+;; t)
-+;; t)
-
-
- ;;; these require that the internet (or bits of it, at least) is available
---- sbcl-1.0.58/contrib/sb-posix/posix-tests.lisp
-+++ sbcl-1.0.58/contrib/sb-posix/posix-tests.lisp
-@@ -167,23 +167,24 @@
++#+nil ; Tests should not write to /dev/log
+ (deftest simple-local-client
+ (progn
+ ;; SunOS (Solaris) and Darwin systems don't have a socket at
+diff --git a/contrib/sb-posix/posix-tests.lisp b/contrib/sb-posix/posix-tests.lisp
+index c73f2d1..4bb897a 100644
+--- a/contrib/sb-posix/posix-tests.lisp
++++ b/contrib/sb-posix/posix-tests.lisp
+@@ -167,6 +167,7 @@
#+win32
#.sb-posix::einval)
--(deftest rmdir.error.3
-- (handler-case
-- (sb-posix:rmdir #-win32 "/" #+win32 (sb-ext:posix-getenv "windir"))
-- (sb-posix:syscall-error (c)
-- (typep
-- (sb-posix:syscall-errno c)
-- '(member
-- #+(or darwin openbsd)
-- #.sb-posix:eisdir
-- #+win32
-- #.sb-posix::eacces
-- #+win32
-- #.sb-posix::enotempty
-- #+sunos
-- #.sb-posix::einval
-- #-(or darwin openbsd win32 sunos)
-- #.sb-posix::ebusy)))) t)
-+;;;; Tests should not call `rmdir /`
-+;; (deftest rmdir.error.3
-+;; (handler-case
-+;; (sb-posix:rmdir #-win32 "/" #+win32 (sb-ext:posix-getenv "windir"))
-+;; (sb-posix:syscall-error (c)
-+;; (typep
-+;; (sb-posix:syscall-errno c)
-+;; '(member
-+;; #+(or darwin openbsd)
-+;; #.sb-posix:eisdir
-+;; #+win32
-+;; #.sb-posix::eacces
-+;; #+win32
-+;; #.sb-posix::enotempty
-+;; #+sunos
-+;; #.sb-posix::einval
-+;; #-(or darwin openbsd win32 sunos)
-+;; #.sb-posix::ebusy)))) t)
-
- (deftest rmdir.error.4
- (let* ((dir (ensure-directories-exist
++#+nil ; Tests should not call `rmdir /`
+ (deftest rmdir.error.3
+ (handler-case
+ (sb-posix:rmdir #-win32 "/" #+win32 (sb-ext:posix-getenv "windir"))
+--
+1.8.5.4
+