| 1 |
grozin 15/04/28 14:27:09 |
| 2 |
|
| 3 |
Added: bsd-sockets-test-1.2.11.patch |
| 4 |
sbcl-1.2.11-solaris.patch |
| 5 |
Log: |
| 6 |
Version bump, closing #547958 |
| 7 |
|
| 8 |
(Portage version: 2.2.18/cvs/Linux i686, signed Manifest commit with key 0x3AFFCE974D34BD8C!) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.1 dev-lisp/sbcl/files/bsd-sockets-test-1.2.11.patch |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lisp/sbcl/files/bsd-sockets-test-1.2.11.patch?rev=1.1&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lisp/sbcl/files/bsd-sockets-test-1.2.11.patch?rev=1.1&content-type=text/plain |
| 15 |
|
| 16 |
Index: bsd-sockets-test-1.2.11.patch |
| 17 |
=================================================================== |
| 18 |
diff -r -U2 sbcl-1.2.11.orig/contrib/sb-bsd-sockets/tests.lisp sbcl-1.2.11/contrib/sb-bsd-sockets/tests.lisp |
| 19 |
--- sbcl-1.2.11.orig/contrib/sb-bsd-sockets/tests.lisp 2015-04-27 20:56:47.000000000 +0600 |
| 20 |
+++ sbcl-1.2.11/contrib/sb-bsd-sockets/tests.lisp 2015-04-28 22:27:32.588146072 +0600 |
| 21 |
@@ -36,13 +36,13 @@ |
| 22 |
;;; Apparently getprotobyname_r on FreeBSD says -1 and EINTR |
| 23 |
;;; for unknown protocols... |
| 24 |
-#-(and freebsd sb-thread) |
| 25 |
-#-(and dragonfly sb-thread) |
| 26 |
-(deftest get-protocol-by-name/error |
| 27 |
- (handler-case (get-protocol-by-name "nonexistent-protocol") |
| 28 |
- (unknown-protocol () |
| 29 |
- t) |
| 30 |
- (:no-error () |
| 31 |
- nil)) |
| 32 |
- t) |
| 33 |
+;#-(and freebsd sb-thread) |
| 34 |
+;#-(and dragonfly sb-thread) |
| 35 |
+;(deftest get-protocol-by-name/error |
| 36 |
+; (handler-case (get-protocol-by-name "nonexistent-protocol") |
| 37 |
+; (unknown-protocol () |
| 38 |
+; t) |
| 39 |
+; (:no-error () |
| 40 |
+; nil)) |
| 41 |
+; t) |
| 42 |
|
| 43 |
(deftest make-inet-socket.smoke |
| 44 |
@@ -92,19 +92,19 @@ |
| 45 |
t) |
| 46 |
|
| 47 |
-#-win32 |
| 48 |
-(deftest make-inet6-socket.smoke |
| 49 |
- (handler-case |
| 50 |
- (let ((s (make-instance 'inet6-socket :type :stream :protocol (get-protocol-by-name "tcp")))) |
| 51 |
- (> (socket-file-descriptor s) 1)) |
| 52 |
- (address-family-not-supported () t)) |
| 53 |
- t) |
| 54 |
- |
| 55 |
-#-win32 |
| 56 |
-(deftest make-inet6-socket.keyword |
| 57 |
- (handler-case |
| 58 |
- (let ((s (make-instance 'inet6-socket :type :stream :protocol :tcp))) |
| 59 |
- (> (socket-file-descriptor s) 1)) |
| 60 |
- (address-family-not-supported () t)) |
| 61 |
- t) |
| 62 |
+;#-win32 |
| 63 |
+;(deftest make-inet6-socket.smoke |
| 64 |
+; (handler-case |
| 65 |
+; (let ((s (make-instance 'inet6-socket :type :stream :protocol (get-protocol-by-name "tcp")))) |
| 66 |
+; (> (socket-file-descriptor s) 1)) |
| 67 |
+; (address-family-not-supported () t)) |
| 68 |
+; t) |
| 69 |
+ |
| 70 |
+;#-win32 |
| 71 |
+;(deftest make-inet6-socket.keyword |
| 72 |
+; (handler-case |
| 73 |
+; (let ((s (make-instance 'inet6-socket :type :stream :protocol :tcp))) |
| 74 |
+; (> (socket-file-descriptor s) 1)) |
| 75 |
+; (address-family-not-supported () t)) |
| 76 |
+; t) |
| 77 |
|
| 78 |
(deftest* (non-block-socket) |
| 79 |
@@ -114,52 +114,52 @@ |
| 80 |
t) |
| 81 |
|
| 82 |
-(deftest inet-socket-bind |
| 83 |
- (let* ((tcp (get-protocol-by-name "tcp")) |
| 84 |
- (address (make-inet-address "127.0.0.1")) |
| 85 |
- (s1 (make-instance 'inet-socket :type :stream :protocol tcp)) |
| 86 |
- (s2 (make-instance 'inet-socket :type :stream :protocol tcp))) |
| 87 |
- (unwind-protect |
| 88 |
- ;; Given the functions we've got so far, if you can think of a |
| 89 |
- ;; better way to make sure the bind succeeded than trying it |
| 90 |
- ;; twice, let me know |
| 91 |
- (progn |
| 92 |
- (socket-bind s1 address 0) |
| 93 |
- (handler-case |
| 94 |
- (let ((port (nth-value 1 (socket-name s1)))) |
| 95 |
- (socket-bind s2 address port) |
| 96 |
- nil) |
| 97 |
- (address-in-use-error () t))) |
| 98 |
- (socket-close s1) |
| 99 |
- (socket-close s2))) |
| 100 |
- t) |
| 101 |
- |
| 102 |
-#-win32 |
| 103 |
-(deftest inet6-socket-bind |
| 104 |
- (handler-case |
| 105 |
- (let* ((tcp (get-protocol-by-name "tcp")) |
| 106 |
- (address (make-inet6-address "::1")) |
| 107 |
- (s1 (make-instance 'inet6-socket :type :stream :protocol tcp)) |
| 108 |
- (s2 (make-instance 'inet6-socket :type :stream :protocol tcp))) |
| 109 |
- (unwind-protect |
| 110 |
- ;; Given the functions we've got so far, if you can think of a |
| 111 |
- ;; better way to make sure the bind succeeded than trying it |
| 112 |
- ;; twice, let me know |
| 113 |
- (handler-case |
| 114 |
- (socket-bind s1 address 0) |
| 115 |
- (socket-error () |
| 116 |
- ;; This may mean no IPv6 support, can't fail a test |
| 117 |
- ;; because of that (address-family-not-supported doesn't catch that) |
| 118 |
- t) |
| 119 |
- (:no-error (x) |
| 120 |
- (declare (ignore x)) |
| 121 |
- (handler-case |
| 122 |
- (let ((port (nth-value 1 (socket-name s1)))) |
| 123 |
- (socket-bind s2 address port) |
| 124 |
- nil) |
| 125 |
- (address-in-use-error () t)))) |
| 126 |
- (socket-close s1) |
| 127 |
- (socket-close s2))) |
| 128 |
- (address-family-not-supported () t)) |
| 129 |
- t) |
| 130 |
+;(deftest inet-socket-bind |
| 131 |
+; (let* ((tcp (get-protocol-by-name "tcp")) |
| 132 |
+; (address (make-inet-address "127.0.0.1")) |
| 133 |
+; (s1 (make-instance 'inet-socket :type :stream :protocol tcp)) |
| 134 |
+; (s2 (make-instance 'inet-socket :type :stream :protocol tcp))) |
| 135 |
+; (unwind-protect |
| 136 |
+; ;; Given the functions we've got so far, if you can think of a |
| 137 |
+; ;; better way to make sure the bind succeeded than trying it |
| 138 |
+; ;; twice, let me know |
| 139 |
+; (progn |
| 140 |
+; (socket-bind s1 address 0) |
| 141 |
+; (handler-case |
| 142 |
+; (let ((port (nth-value 1 (socket-name s1)))) |
| 143 |
+; (socket-bind s2 address port) |
| 144 |
+; nil) |
| 145 |
+; (address-in-use-error () t))) |
| 146 |
+; (socket-close s1) |
| 147 |
+; (socket-close s2))) |
| 148 |
+; t) |
| 149 |
+ |
| 150 |
+;#-win32 |
| 151 |
+;(deftest inet6-socket-bind |
| 152 |
+; (handler-case |
| 153 |
+; (let* ((tcp (get-protocol-by-name "tcp")) |
| 154 |
+; (address (make-inet6-address "::1")) |
| 155 |
+; (s1 (make-instance 'inet6-socket :type :stream :protocol tcp)) |
| 156 |
+; (s2 (make-instance 'inet6-socket :type :stream :protocol tcp))) |
| 157 |
+; (unwind-protect |
| 158 |
+; ;; Given the functions we've got so far, if you can think of a |
| 159 |
+; ;; better way to make sure the bind succeeded than trying it |
| 160 |
+; ;; twice, let me know |
| 161 |
+; (handler-case |
| 162 |
+; (socket-bind s1 address 0) |
| 163 |
+; (socket-error () |
| 164 |
+; ;; This may mean no IPv6 support, can't fail a test |
| 165 |
+; ;; because of that (address-family-not-supported doesn't catch that) |
| 166 |
+; t) |
| 167 |
+; (:no-error (x) |
| 168 |
+; (declare (ignore x)) |
| 169 |
+; (handler-case |
| 170 |
+; (let ((port (nth-value 1 (socket-name s1)))) |
| 171 |
+; (socket-bind s2 address port) |
| 172 |
+; nil) |
| 173 |
+; (address-in-use-error () t)))) |
| 174 |
+; (socket-close s1) |
| 175 |
+; (socket-close s2))) |
| 176 |
+; (address-family-not-supported () t)) |
| 177 |
+; t) |
| 178 |
|
| 179 |
(deftest* (simple-sockopt-test) |
| 180 |
@@ -228,35 +228,35 @@ |
| 181 |
;;; the message ended up |
| 182 |
|
| 183 |
-#-win32 |
| 184 |
-(deftest simple-local-client |
| 185 |
- (progn |
| 186 |
- ;; SunOS (Solaris) and Darwin systems don't have a socket at |
| 187 |
- ;; /dev/log. We might also be building in a chroot or |
| 188 |
- ;; something, so don't fail this test just because the file is |
| 189 |
- ;; unavailable, or if it's a symlink to some weird character |
| 190 |
- ;; device. |
| 191 |
- (when (block nil |
| 192 |
- (handler-bind ((sb-posix:syscall-error |
| 193 |
- (lambda (e) |
| 194 |
- (declare (ignore e)) |
| 195 |
- (return nil)))) |
| 196 |
- (sb-posix:s-issock |
| 197 |
- (sb-posix::stat-mode (sb-posix:stat "/dev/log"))))) |
| 198 |
- (let ((s (make-instance 'local-socket :type :datagram))) |
| 199 |
- (format t "Connecting ~A... " s) |
| 200 |
- (finish-output) |
| 201 |
- (handler-case |
| 202 |
- (socket-connect s "/dev/log") |
| 203 |
- (sb-bsd-sockets::socket-error () |
| 204 |
- (setq s (make-instance 'local-socket :type :stream)) |
| 205 |
- (format t "failed~%Retrying with ~A... " s) |
| 206 |
- (finish-output) |
| 207 |
- (socket-connect s "/dev/log"))) |
| 208 |
- (format t "ok.~%") |
| 209 |
- (let ((stream (socket-make-stream s :input t :output t :buffering :none))) |
| 210 |
- (format stream |
| 211 |
- "<7>bsd-sockets: Don't panic. We're testing local-domain client code; this message can safely be ignored")))) |
| 212 |
- t) |
| 213 |
- t) |
| 214 |
+;#-win32 |
| 215 |
+;(deftest simple-local-client |
| 216 |
+; (progn |
| 217 |
+; ;; SunOS (Solaris) and Darwin systems don't have a socket at |
| 218 |
+; ;; /dev/log. We might also be building in a chroot or |
| 219 |
+; ;; something, so don't fail this test just because the file is |
| 220 |
+; ;; unavailable, or if it's a symlink to some weird character |
| 221 |
+; ;; device. |
| 222 |
+; (when (block nil |
| 223 |
+; (handler-bind ((sb-posix:syscall-error |
| 224 |
+; (lambda (e) |
| 225 |
+; (declare (ignore e)) |
| 226 |
+; (return nil)))) |
| 227 |
+; (sb-posix:s-issock |
| 228 |
+; (sb-posix::stat-mode (sb-posix:stat "/dev/log"))))) |
| 229 |
+; (let ((s (make-instance 'local-socket :type :datagram))) |
| 230 |
+; (format t "Connecting ~A... " s) |
| 231 |
+; (finish-output) |
| 232 |
+; (handler-case |
| 233 |
+; (socket-connect s "/dev/log") |
| 234 |
+; (sb-bsd-sockets::socket-error () |
| 235 |
+; (setq s (make-instance 'local-socket :type :stream)) |
| 236 |
+; (format t "failed~%Retrying with ~A... " s) |
| 237 |
+; (finish-output) |
| 238 |
+; (socket-connect s "/dev/log"))) |
| 239 |
+; (format t "ok.~%") |
| 240 |
+; (let ((stream (socket-make-stream s :input t :output t :buffering :none))) |
| 241 |
+; (format stream |
| 242 |
+; "<7>bsd-sockets: Don't panic. We're testing local-domain client code; this message can safely be ignored")))) |
| 243 |
+; t) |
| 244 |
+; t) |
| 245 |
|
| 246 |
|
| 247 |
@@ -373,58 +373,58 @@ |
| 248 |
len address port (subseq buf 0 (min 10 len))))))) |
| 249 |
|
| 250 |
-#+sb-thread |
| 251 |
-(deftest interrupt-io |
| 252 |
- (let (result) |
| 253 |
- (labels |
| 254 |
- ((client (port) |
| 255 |
- (setf result |
| 256 |
- (let ((s (make-instance 'inet-socket |
| 257 |
- :type :stream |
| 258 |
- :protocol :tcp))) |
| 259 |
- (socket-connect s #(127 0 0 1) port) |
| 260 |
- (let ((stream (socket-make-stream s |
| 261 |
- :input t |
| 262 |
- :output t |
| 263 |
- :buffering :none))) |
| 264 |
- (handler-case |
| 265 |
- (prog1 |
| 266 |
- (catch 'stop |
| 267 |
- (progn |
| 268 |
- (read-char stream) |
| 269 |
- (sleep 0.1) |
| 270 |
- (sleep 0.1) |
| 271 |
- (sleep 0.1))) |
| 272 |
- (close stream)) |
| 273 |
- (error (c) |
| 274 |
- c)))))) |
| 275 |
- (server () |
| 276 |
- (let ((s (make-instance 'inet-socket |
| 277 |
- :type :stream |
| 278 |
- :protocol :tcp))) |
| 279 |
- (setf (sockopt-reuse-address s) t) |
| 280 |
- (socket-bind s (make-inet-address "127.0.0.1") 0) |
| 281 |
- (socket-listen s 5) |
| 282 |
- (multiple-value-bind (* port) |
| 283 |
- (socket-name s) |
| 284 |
- (let* ((client (sb-thread:make-thread |
| 285 |
- (lambda () (client port)))) |
| 286 |
- (r (socket-accept s)) |
| 287 |
- (stream (socket-make-stream r |
| 288 |
- :input t |
| 289 |
- :output t |
| 290 |
- :buffering :none)) |
| 291 |
- (ok :ok)) |
| 292 |
- (socket-close s) |
| 293 |
- (sleep 5) |
| 294 |
- (sb-thread:interrupt-thread client |
| 295 |
- (lambda () (throw 'stop ok))) |
| 296 |
- (sleep 5) |
| 297 |
- (setf ok :not-ok) |
| 298 |
- (write-char #\x stream) |
| 299 |
- (close stream) |
| 300 |
- (socket-close r)))))) |
| 301 |
- (server)) |
| 302 |
- result) |
| 303 |
- :ok) |
| 304 |
+;#+sb-thread |
| 305 |
+;(deftest interrupt-io |
| 306 |
+; (let (result) |
| 307 |
+; (labels |
| 308 |
+; ((client (port) |
| 309 |
+; (setf result |
| 310 |
+; (let ((s (make-instance 'inet-socket |
| 311 |
+; :type :stream |
| 312 |
+; :protocol :tcp))) |
| 313 |
+; (socket-connect s #(127 0 0 1) port) |
| 314 |
+; (let ((stream (socket-make-stream s |
| 315 |
+; :input t |
| 316 |
+; :output t |
| 317 |
+; :buffering :none))) |
| 318 |
+; (handler-case |
| 319 |
+; (prog1 |
| 320 |
+; (catch 'stop |
| 321 |
+; (progn |
| 322 |
+; (read-char stream) |
| 323 |
+; (sleep 0.1) |
| 324 |
+; (sleep 0.1) |
| 325 |
+; (sleep 0.1))) |
| 326 |
+; (close stream)) |
| 327 |
+; (error (c) |
| 328 |
+; c)))))) |
| 329 |
+; (server () |
| 330 |
+; (let ((s (make-instance 'inet-socket |
| 331 |
+; :type :stream |
| 332 |
+; :protocol :tcp))) |
| 333 |
+; (setf (sockopt-reuse-address s) t) |
| 334 |
+; (socket-bind s (make-inet-address "127.0.0.1") 0) |
| 335 |
+; (socket-listen s 5) |
| 336 |
+; (multiple-value-bind (* port) |
| 337 |
+; (socket-name s) |
| 338 |
+; (let* ((client (sb-thread:make-thread |
| 339 |
+; (lambda () (client port)))) |
| 340 |
+; (r (socket-accept s)) |
| 341 |
+; (stream (socket-make-stream r |
| 342 |
+; :input t |
| 343 |
+; :output t |
| 344 |
+; :buffering :none)) |
| 345 |
+; (ok :ok)) |
| 346 |
+; (socket-close s) |
| 347 |
+; (sleep 5) |
| 348 |
+; (sb-thread:interrupt-thread client |
| 349 |
+; (lambda () (throw 'stop ok))) |
| 350 |
+; (sleep 5) |
| 351 |
+; (setf ok :not-ok) |
| 352 |
+; (write-char #\x stream) |
| 353 |
+; (close stream) |
| 354 |
+; (socket-close r)))))) |
| 355 |
+; (server)) |
| 356 |
+; result) |
| 357 |
+; :ok) |
| 358 |
|
| 359 |
(defmacro with-client-and-server ((server-socket-var client-socket-var) &body body) |
| 360 |
@@ -485,4 +485,5 @@ |
| 361 |
client server (unsigned-byte 8) ,direction))))) |
| 362 |
|
| 363 |
- (define-shutdown-tests :output) |
| 364 |
- (define-shutdown-tests :io)) |
| 365 |
+; (define-shutdown-tests :output) |
| 366 |
+; (define-shutdown-tests :io)) |
| 367 |
+) |
| 368 |
|
| 369 |
|
| 370 |
|
| 371 |
1.1 dev-lisp/sbcl/files/sbcl-1.2.11-solaris.patch |
| 372 |
|
| 373 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lisp/sbcl/files/sbcl-1.2.11-solaris.patch?rev=1.1&view=markup |
| 374 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lisp/sbcl/files/sbcl-1.2.11-solaris.patch?rev=1.1&content-type=text/plain |
| 375 |
|
| 376 |
Index: sbcl-1.2.11-solaris.patch |
| 377 |
=================================================================== |
| 378 |
diff -r -U2 sbcl-1.2.11.orig/src/runtime/Config.x86-sunos sbcl-1.2.11/src/runtime/Config.x86-sunos |
| 379 |
--- sbcl-1.2.11.orig/src/runtime/Config.x86-sunos 2015-04-27 20:56:50.000000000 +0600 |
| 380 |
+++ sbcl-1.2.11/src/runtime/Config.x86-sunos 2015-04-28 22:38:01.569103626 +0600 |
| 381 |
@@ -12,6 +12,6 @@ |
| 382 |
CC=gcc |
| 383 |
CFLAGS = -g -O2 -Wall -D__EXTENSIONS__ -D_POSIX_C_SOURCE=199506L -DSVR4 -D_REENTRANT -fno-omit-frame-pointer |
| 384 |
-NM = nm -xgp |
| 385 |
-GREP = ggrep |
| 386 |
+NM = nm -t x -p |
| 387 |
+GREP = grep |
| 388 |
|
| 389 |
ASSEM_SRC = x86-assem.S ldso-stubs.S |
Archives