From 894d44237ceac13345f21510b36c1182576170de Mon Sep 17 00:00:00 2001
From: Kevin Rosenberg <kevin@rosenberg.net>
Date: Tue, 2 Jun 2009 18:33:44 -0600
Subject: [PATCH] fix permissions, remove dylib libs

---
 ChangeLog                  |   2 +-
 db-mysql/Makefile          |   2 +-
 db-mysql/clsql_mysql.dylib | Bin 13048 -> 0 bytes
 db-mysql/z.dylib           | Bin 8332 -> 0 bytes
 sql/#pool.lisp#            | 133 -------------------------------------
 uffi/clsql_uffi.dylib      | Bin 8380 -> 0 bytes
 uffi/z.dylib               | Bin 8332 -> 0 bytes
 7 files changed, 2 insertions(+), 135 deletions(-)
 delete mode 100644 db-mysql/clsql_mysql.dylib
 delete mode 100644 db-mysql/z.dylib
 delete mode 100644 sql/#pool.lisp#
 delete mode 100644 uffi/clsql_uffi.dylib
 delete mode 100644 uffi/z.dylib

diff --git a/ChangeLog b/ChangeLog
index 0e1c1d6..8a196d6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,7 +2,7 @@
 	* Version 4.0.5
 	* sql/database.lisp: Add process-lock for deleting database from
 	a pool (thanks to Ralf Mattes).
-	
+
 25 Feb 2008  Kevin Rosenberg <kevin@rosenberg.net>
 	* Version 4.0.4
 	* sql/expressions.lisp: Remove stray form (thanks to Samuel Ward)
diff --git a/db-mysql/Makefile b/db-mysql/Makefile
index bffec74..f8e4a42 100644
--- a/db-mysql/Makefile
+++ b/db-mysql/Makefile
@@ -28,7 +28,7 @@ shared_lib=$(base).so
 all: $(shared_lib)
 
 CFLAGS=-I /usr/local/include/mysql -I /usr/include/mysql -I /sw/include/mysql -I /opt/local/include/mysql -I /usr/local/mysql/include
-LDFLAGS=-L/usr/local/lib64/mysql -L/usr/local/mysql/lib32 -L/usr/local/lib/mysql -L/usr/lib/mysql -L/sw/lib -L/opt/local/lib/mysql -L/usr/local/mysql/lib -L/usr/lib/gcc/i686-pc-cygwin/3.4.4 -lmysqlclient -lz -lc 
+LDFLAGS=-L/usr/local/lib64/mysql -L/usr/local/mysql/lib32 -L/usr/local/lib/mysql -L/usr/lib/mysql -L/sw/lib -L/opt/local/lib/mysql -L/usr/local/mysql/lib -L/usr/lib/gcc/i686-pc-cygwin/3.4.4 -lmysqlclient -lz -lc
 
 ifneq ($(OS_CYGWIN),0)
   CFLAGS=-I /cygdrive/c/Program\ Files/MySQL/MySQL\ Server\ 5.0/include
diff --git a/db-mysql/clsql_mysql.dylib b/db-mysql/clsql_mysql.dylib
deleted file mode 100644
index e637f21d08107c2e8fa498ccb01f61cdcb05602b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 13048
zcmeHOPlyv&7=P<dHK5&%x|M(;5pvLr^&f3dWp~*@m)h3q1_Td}*<|9zotdP`1b5p~
zmj=OMSbAs=?V*=a3f?>j>Vl}N2Njgyq31m)2(B0;2N9|MzL_^<l8x)N*zdtN@Atm<
z{ryc234FQ#^69_pgb@9Z1cdO#H9~0E`ykgLQcmc{CjjCrsSeo5=K~1bf+eME&baD;
zt=oU@Lm|F{G3}90V6BO{$V*DA=$aM7IuL5QW4sy+Yot9MgZhY8yZ*6}iIGT)oobIs
z)PEF5%DmwkZF?zK`V&7CBl2lmhX^rdt$bVC9YcdJ@lE^NVo?1*K%^Z1^2pam+ixHZ
zCDpHXs-J}HX-RpiW|yUFOj>4mUg^J`F497*rClx56SPI|l45-Zk@E2PS6}F3<5BiK
zP*QH}FHm?qFSKGSBn7!Q@Zk36`lnCM|9!1~^^f%jsYlW$;I{?)&b>l3kYqjZ5eO~H
zOF}wI5w8u$j+KOe$35ak{dXAhff-;1m;q*h8DIvO0cL<1_zyAgm})ux`oj14g6z+o
z!SnS}sPpGa!71xKsxR;K^$iPT>gi1{+w%3MpKW=Imt(4I@(P{i^=4mk;~`C%jAb-$
zB9rj-gr{X5r#1<3=O!W^t1oAQG$+(e0yiD88+#vki^%FF{cLl-{t92NeX*lazm+-B
zJHn-nt4COPXM{8Fh%nO~p}tIw`NM~Q3rbSQu*2wXTl{J`txhTU%@3Uo=xf|q(snh7
zo@e;g(KZ<Jv)c-u-YR(6CWz=X??>LGuP41VgO~J{ccZ7luyzgwc6oY>{aI*J-soHI
z5U}ZuB6x4dv^P2w6uIIZj-&k5-XZ;-YrjK$(y)jDkzD#Y0SPcam;q*h8DIvO0cL<1
zU<Q~0W`G%B2ABb6;Jss@wd#8B+U16r0cL<1U<Q~0W`G%B2ABb6fEi#0n1TN%1DF}W
zScOLO+1mkVeFPy)^ZC0K{uOuxcmRepbN>xt8n%aj4%;B?pAQI8QFt?KepL7q=zmxE
zPsF*P@ITPsRrnz=4Wv+<JHS*F;RWE7!ZW}hE8IdHUE#~fWdir932-}xe~RH>V)(BZ
zz8J%3M_>#^U>rtlh73W7k2EIX?I}4~bMlrcr%WSnRs@as%c@(Ol#@j#Uvy65!Ybn;
zoc@=Env;`OsWe?H3z)dJQJt3i_W@NyUuhe;sVJH>EUT0=Tr-G94o+T{jf!ClnX{_j
zTGF1Sr%@=FIoHg~O6hd9^NRkrAgiW1-Kj1VO%!UG&PjKw*Ntt=ta9rZw%N<eoh^6i
ui%!+7xU!h<G<Rxtk6Np)?RNKK2Na0jjfUOFS_~Djq@kjnE<E>0B*YtW{wg5=

diff --git a/db-mysql/z.dylib b/db-mysql/z.dylib
deleted file mode 100644
index 8821d0905e05e443e97a4d083dbaef40aa6de9e2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8332
zcmeI1!D<sx6ozlxNF$03h)^hKs5=)E3krp<A}us1BA7*YhndXO4Bkv?GXutUk$nYU
zp^xAr_ym0dtzEcqBk0ye>;LD@ZBkobK+b`G&bfEaIrq*t%X9Sm$LYK=W)7-C*P+8%
zV=C}7&^{#6-q>m*n6_HEfM@+Ri1{>;Jb9bD*sU+te_k+V887H@)Wj-g<QMGq2@+Xv
zwwrzzp65=<-`)2SiNidc<X=_KZ(|Q%Gs$)ldJJtm+5Njm1+`>F|F0gr|0*Q%to8iq
z#(K;1t7DV*hkp;p`!m<u5`sl&^Xu`iwY_hx#iK99@%+LAp2PiW-Tj+Yc(%L&y?|)^
zuJN}`dG23jtiNDb^By;$O^9c?Z{uZarcn%b8@AsGZKF3Fys-_NM$~xGv1yX!!OG(R
z;L->M<311JeV@5mcAqKxxY~EY%6S3LeKeJCO#f2;%i$nTdcl+PB4ns30VSXWlz<XY
z0!ly$C;=s)1eAa=-w9#s?BhMSgVB9F&raOl!RYpQg$J#6@}Ua3g+7&l5>Nt4KnW-T
zC7=Y9fD%vwN<axHf&Y#G#=DrzRygauTMnY{lriV?K^gx<+(dkfiKwY#vfb-SRAjMD
vq??3svTHatmqA`c5~W$3X0PzV?%;)+sLOVdb;S1juZta*E4{GO_0{GNx$S#9

diff --git a/sql/#pool.lisp# b/sql/#pool.lisp#
deleted file mode 100644
index 4573155..0000000
--- a/sql/#pool.lisp#
+++ /dev/null
@@ -1,133 +0,0 @@
-;;;; -*- Mode: LISP; Syntax: ANSI-Common-Lisp; Base: 10 -*-
-;;;; *************************************************************************
-;;;; FILE IDENTIFICATION
-;;;;
-;;;; Name:          pool.lisp
-;;;; Purpose:       Support function for connection pool
-;;;; Programmers:   Kevin M. Rosenberg, Marc Battyani
-;;;; Date Started:  Apr 2002
-;;;;
-;;;; $Id$
-;;;;
-;;;; This file, part of CLSQL, is Copyright (c) 2002-2003 by Kevin M. Rosenberg
-;;;;
-;;;; CLSQL users are granted the rights to distribute and use this software
-;;;; as governed by the terms of the Lisp Lesser GNU Public License
-;;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL.
-;;;; *************************************************************************
-
-(in-package #:clsql-sys)
-
-(defvar *db-pool* (make-hash-table :test #'equal))
-(defvar *db-pool-lock* (make-process-lock "DB Pool lock"))
-
-(defclass conn-pool ()
-  ((connection-spec :accessor connection-spec :initarg :connection-spec)
-   (database-type :accessor pool-database-type :initarg :pool-database-type)
-   (free-connections :accessor free-connections
-                     :initform (make-array 5 :fill-pointer 0 :adjustable t))
-   (all-connections :accessor all-connections
-                    :initform (make-array 5 :fill-pointer 0 :adjustable t))
-   (lock :accessor conn-pool-lock
-         :initform (make-process-lock "Connection pool"))))
-
-(defun acquire-from-conn-pool (pool)
-  (or (with-process-lock ((conn-pool-lock pool) "Acquire from pool")
-        (when (plusp (length (free-connections pool)))
-          (let ((pconn (vector-pop (free-connections pool))))
-            ;; test if connection still valid.
-            ;; Currently, on supported on MySQL
-            (cond
-              ((eq :mysql (database-type pconn))
-               (handler-case
-                   (database-query "SHOW ERRORS LIMIT 1" pconn nil nil)
-                 (error (e)
-                   ;; we could check for error type 2006 for "SERVER GONE AWAY",
-                   ;; but, it's safer just to disconnect the pooled conn for any error
-                   (warn "Database connection ~S had an error when attempted to be acquired from the pool:
-  ~S
-Disconnecting.~%"
-                         pconn e)
-                   (ignore-errors (database-disconnect pconn))
-                   nil)
-                 (:no-error (res fields)
-                   (declare (ignore res fields))
-                   pconn)))
-              (t
-               pconn)))))
-      (let ((conn (connect (connection-spec pool)
-                           :database-type (pool-database-type pool)
-                           :if-exists :new
-                           :make-default nil)))
-        (with-process-lock ((conn-pool-lock pool) "Acquire from pool")
-          (vector-push-extend conn (all-connections pool))
-          (setf (conn-pool conn) pool))
-        conn)))
-
-(defun release-to-conn-pool (conn)
-  (let ((pool (conn-pool conn)))
-    (with-process-lock ((conn-pool-lock pool) "Release to pool")
-      (vector-push-extend conn (free-connections pool)))))
-
-(defun clear-conn-pool (pool)
-  (with-process-lock ((conn-pool-lock pool) "Clear pool")
-    (loop for conn across (all-connections pool)
-          do (setf (conn-pool conn) nil)
-          ;; disconnect may error if remote side closed connection
-          (ignore-errors (disconnect :database conn)))
-    (setf (fill-pointer (free-connections pool)) 0)
-    (setf (fill-pointer (all-connections pool)) 0))
-  nil)
-
-(defun find-or-create-connection-pool (connection-spec database-type)
-  "Find connection pool in hash table, creates a new connection pool
-if not found"
-  (with-process-lock (*db-pool-lock* "Find-or-create connection")
-    (let* ((key (list connection-spec database-type))
-           (conn-pool (gethash key *db-pool*)))
-      (unless conn-pool
-        (setq conn-pool (make-instance 'conn-pool
-                                       :connection-spec connection-spec
-                                       :pool-database-type database-type))
-        (setf (gethash key *db-pool*) conn-pool))
-      conn-pool)))
-
-(defun acquire-from-pool (connection-spec database-type &optional pool)
-  (unless (typep pool 'conn-pool)
-    (setf pool (find-or-create-connection-pool connection-spec database-type)))
-  (acquire-from-conn-pool pool))
-
-(defun release-to-pool (database)
-  (release-to-conn-pool database))
-
-(defun disconnect-pooled (&optional clear)
-  "Disconnects all connections in the pool."
-  (with-process-lock (*db-pool-lock* "Disconnect pooled")
-    (maphash
-     #'(lambda (key conn-pool)
-         (declare (ignore key))
-         (clear-conn-pool conn-pool))
-     *db-pool*)
-    (when clear (clrhash *db-pool*)))
-  t)
-
-;(defun pool-start-sql-recording (pool &key (types :command))
-;  "Start all stream in the pool recording actions of TYPES"
-;  (dolist (con (pool-connections pool))
-;    (start-sql-recording :type types
-;                        :database (connection-database con))))
-
-;(defun pool-stop-sql-recording (pool &key (types :command))
-;  "Start all stream in the pool recording actions of TYPES"
-;  (dolist (con (pool-connections pool))
-;    (stop-sql-recording :type types
-;                         :database (connection-database con))))
-
-;(defmacro with-database-connection (pool &body body)
-;  `(let ((connection (obtain-connection ,pool))
-;         (results nil))
-;    (unwind-protect
-;         (with-database ((connection-database connection))
-;           (setq results (multiple-value-list (progn ,@body))))
-;      (release-connection connection))
-;    (values-list results)))
diff --git a/uffi/clsql_uffi.dylib b/uffi/clsql_uffi.dylib
deleted file mode 100644
index 3741fc2c7948b8abe90ac594c1b2039d130ce8b7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8380
zcmeI1L2DCH5P)CWtwvh9Q4tD)#<Ns{7HRPm=mU#V0%kQu@Udy4DcK~Y*@Y?uE9>R4
z6n}xY{s8gNlZP~x1}~CBK`+7{A{2~}LopD<btaoNX+@77WCmtu-n=)H*>7{%o%h|Z
zKTa~nMnS`%CqQRM7*oK8K&zlaBzY<c&ag!K3$U0!1`26C5yH%_oBait<N57L#>SyI
z+90QQT45VOmJr5@nO)P389#Eo#&^~45$$jdypKQz{m;jf@gNEodmqx^{)0L~WOP#>
zoEPHveB^^Qf}Fu=--8;Djm#i=yoLg~$Q$jSYGD7fphDbUSiHsO7lLOHg&_71_6->9
zAI}DI9-Jvqb?jsA$=v4DUUT=x!rbd={2h#kqyBSFfHhz}4w?W(!TUnRv-n^5n_&JC
zf%R}7NA_qz1c(3;AOb{y2oM1xKm>>Y5%|Xh4)FI<-Yb0nbT(ADdafUHHayt!Tupwy
zch_#kdeNmicQK>Ro4#qGad=qWX6klT^0r-RU$(|P9{!RCciPI<c?(~HFtYUPpnVXN
z{Lro(vh_u{o_c!I;fInpWNoK=QEK}RcO9)M_v8n4s}l-+lWo~mw`wCh?ntP8x;x4n
zXSIFFU8yy(aKD4+RqLf)X)$wRle?WMJE5>nO6k|?*RDByLPi|T-F)^5TW6OV_HOKf
zc=wihAb2}0;=Txj_I$b!0U|&IhyW2F0z`la5CI}U1c(3;AOim%0hlAh=L!Yqy%+Gi
z1;{y2^l?6arSB^+XODwFi34`XxdR5jo}7XBee|IK&f=pmtuEw5+A3y@tjJ~cOm>ao
zC|s0HD=pG1#mq|a5o{Q%u;EY1#Y3yOER0eqZ>{=gML}QA1=&J3OUCsX2FYeYFXzRz
JtKgLx`w58!)xQ7$

diff --git a/uffi/z.dylib b/uffi/z.dylib
deleted file mode 100644
index 39d4200482bdca0c2469a555e99f562962341825..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8332
zcmeI1y-EX75QT4a#ekv#5d=YlT1Q0-!77jxqKHU}bVD{9O>px=k_8ouSV!;;d;$wg
zOB*}!2`qwz*a#L@DU9d1SrSESL1y6W%>9|U_kLT>ef#Bo*cdYig(1cZ1IAeJA?O4W
zNhQ-M1pOB24&a$H1aUu2q@Fvh`>{X%n*T6v%p4Zzaa7MN(+CEvbpwec;;DEr3(s@=
z6x=<iBjRN0ncn`N^7%H_2y%M6{RlOVT&Fkty@rKcvZDX32JgQHiEM3bZzdBP0lz3F
zd4KpbINqOo1Di%L1zkQ}-|b$sD{m{etL4Yjb)LidaMb@dYw#>N0_{LFzU%XCeV+3_
z8S}pw#=OTUv;^@io;f(c*^pWEYSl%zU{lAj<roMRY^<m$0VSXWlz<XY0!ly$C;=s)
z1eCzv6L{to(w(bWxMpJ>-%iV)Yc?i6NBGbpt@AMC5A>@9lz<XY0!ly$C;=s)1eAah
zPy$Lo3H&<(=tZN$Yq8fm(``ggc4PMEW8L@_aUAg&HzFsB&UP^`wpVi8oaA#ECs#FW
pn@g?k*<u$;PNB4q1-F6)zoRaDUMVYXxqRSN{Jm1lWb;9``2a{FV8{Rf

-- 
2.34.1