crux-commits
Threads by month
- ----- 2025 -----
- January
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2008 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2007 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2006 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
May 2007
- 1 participants
- 1643 discussions
commit 6e83a5ce6daa965c963ceb3de7f4d735c92f7ead
Author: Tilman Sauerbeck <tilman(a)code-monkey.de>
Date: Thu Feb 23 17:36:26 2006 +0000
windowmaker: moved to opt
1
0
ports/opt (master): atk, hicolor-icon-theme, pango, glitz, cairo, gtk: moved to opt
by crux@crux.nu 19 May '07
by crux@crux.nu 19 May '07
19 May '07
commit ed2205204aefbff066c471e0d049626bd9e19e2b
Author: Tilman Sauerbeck <tilman(a)code-monkey.de>
Date: Thu Feb 23 17:34:42 2006 +0000
atk, hicolor-icon-theme, pango, glitz, cairo, gtk: moved to opt
diff --git a/atk/.footprint b/atk/.footprint
new file mode 100644
index 0000000..48516ef
--- /dev/null
+++ b/atk/.footprint
@@ -0,0 +1,37 @@
+drwxr-xr-x root/root usr/
+drwxr-xr-x root/root usr/include/
+drwxr-xr-x root/root usr/include/atk-1.0/
+drwxr-xr-x root/root usr/include/atk-1.0/atk/
+-rw-r--r-- root/root usr/include/atk-1.0/atk/atk-enum-types.h
+-rw-r--r-- root/root usr/include/atk-1.0/atk/atk.h
+-rw-r--r-- root/root usr/include/atk-1.0/atk/atkaction.h
+-rw-r--r-- root/root usr/include/atk-1.0/atk/atkcomponent.h
+-rw-r--r-- root/root usr/include/atk-1.0/atk/atkdocument.h
+-rw-r--r-- root/root usr/include/atk-1.0/atk/atkeditabletext.h
+-rw-r--r-- root/root usr/include/atk-1.0/atk/atkgobjectaccessible.h
+-rw-r--r-- root/root usr/include/atk-1.0/atk/atkhyperlink.h
+-rw-r--r-- root/root usr/include/atk-1.0/atk/atkhypertext.h
+-rw-r--r-- root/root usr/include/atk-1.0/atk/atkimage.h
+-rw-r--r-- root/root usr/include/atk-1.0/atk/atknoopobject.h
+-rw-r--r-- root/root usr/include/atk-1.0/atk/atknoopobjectfactory.h
+-rw-r--r-- root/root usr/include/atk-1.0/atk/atkobject.h
+-rw-r--r-- root/root usr/include/atk-1.0/atk/atkobjectfactory.h
+-rw-r--r-- root/root usr/include/atk-1.0/atk/atkregistry.h
+-rw-r--r-- root/root usr/include/atk-1.0/atk/atkrelation.h
+-rw-r--r-- root/root usr/include/atk-1.0/atk/atkrelationset.h
+-rw-r--r-- root/root usr/include/atk-1.0/atk/atkrelationtype.h
+-rw-r--r-- root/root usr/include/atk-1.0/atk/atkselection.h
+-rw-r--r-- root/root usr/include/atk-1.0/atk/atkstate.h
+-rw-r--r-- root/root usr/include/atk-1.0/atk/atkstateset.h
+-rw-r--r-- root/root usr/include/atk-1.0/atk/atkstreamablecontent.h
+-rw-r--r-- root/root usr/include/atk-1.0/atk/atktable.h
+-rw-r--r-- root/root usr/include/atk-1.0/atk/atktext.h
+-rw-r--r-- root/root usr/include/atk-1.0/atk/atkutil.h
+-rw-r--r-- root/root usr/include/atk-1.0/atk/atkvalue.h
+drwxr-xr-x root/root usr/lib/
+-rwxr-xr-x root/root usr/lib/libatk-1.0.la
+lrwxrwxrwx root/root usr/lib/libatk-1.0.so -> libatk-1.0.so.0.1010.3
+lrwxrwxrwx root/root usr/lib/libatk-1.0.so.0 -> libatk-1.0.so.0.1010.3
+-rwxr-xr-x root/root usr/lib/libatk-1.0.so.0.1010.3
+drwxr-xr-x root/root usr/lib/pkgconfig/
+-rw-r--r-- root/root usr/lib/pkgconfig/atk.pc
diff --git a/atk/.md5sum b/atk/.md5sum
new file mode 100644
index 0000000..f48a7a3
--- /dev/null
+++ b/atk/.md5sum
@@ -0,0 +1 @@
+c84a01fea567b365c0d44b227fead948 atk-1.10.3.tar.bz2
diff --git a/atk/Pkgfile b/atk/Pkgfile
new file mode 100644
index 0000000..a56ea90
--- /dev/null
+++ b/atk/Pkgfile
@@ -0,0 +1,17 @@
+# Description: A set of interfaces for accessibility
+# URL: http://www.gtk.org/
+# Maintainer: Matt Housh, jaeger at morpheus dot net
+# Depends on: glib
+
+name=atk
+version=1.10.3
+release=1
+source=(ftp://ftp.gtk.org/pub/gtk/v2.8/$name-$version.tar.bz2)
+
+build () {
+ cd $name-$version
+ ./configure --prefix=/usr
+ make
+ make DESTDIR=$PKG install
+ rm -r $PKG/usr/share
+}
1
0
commit 8baf11b506096ef219822ff4769ef0a05e334e42
Author: Juergen Daubert <juergen.daubert(a)t-online.de>
Date: Thu Feb 23 16:31:31 2006 +0000
merge changes 756,757 to 2.2 branch
diff --git a/fcron/Pkgfile b/fcron/Pkgfile
index b28bccc..876dfd6 100644
--- a/fcron/Pkgfile
+++ b/fcron/Pkgfile
@@ -14,6 +14,7 @@ build () {
autoconf
./configure --prefix=/usr \
--with-etcdir=/etc/fcron \
+ --mandir=/usr/man \
--with-docdir=/usr/doc \
--with-spooldir=/var/spool/fcron \
--with-fifodir=/var/run \
1
0
commit 42f630af4f5ad1f4f4106665bbf6d71738ff44a1
Author: Juergen Daubert <juergen.daubert(a)t-online.de>
Date: Fri Feb 24 08:54:10 2006 +0000
python: added patch for bdb 4.4.x
diff --git a/python/.md5sum b/python/.md5sum
index f403fa7..4986599 100644
--- a/python/.md5sum
+++ b/python/.md5sum
@@ -1,2 +1,3 @@
98db1465629693fc434d4dc52db93838 Python-2.4.2.tar.bz2
-572d78932e9b229a9a8ed6fad2cac213 python-2.4.2.patch
+3df7e7060e9a8dea0e46e1103b5bf7a0 python-2.4.2-bsddb.patch
+84c40c182680d71e2d2330a4f38e5647 python-2.4.2.patch
diff --git a/python/Pkgfile b/python/Pkgfile
index 6013fdc..6d8d469 100644
--- a/python/Pkgfile
+++ b/python/Pkgfile
@@ -5,13 +5,16 @@
name=python
version=2.4.2
-release=1
+release=2
source=(http://www.python.org/ftp/$name/$version/Python-$version.tar.bz2 \
- $name-$version.patch)
+ $name-$version.patch $name-$version-bsddb.patch)
build () {
cd Python-$version
+
patch -p1 < ../$name-$version.patch
+ patch -p1 < ../$name-$version-bsddb.patch
+
./configure --prefix=/usr \
--enable-shared \
--with-threads \
@@ -22,6 +25,7 @@ build () {
ln -sf python2.4 $PKG/usr/bin/python
ln -sf python2.4 $PKG/usr/lib/python
ln -sf python2.4 $PKG/usr/include/python
+
rm -r $PKG/usr/lib/python/{test,{email,bsddb}/test}
rm -r $PKG/usr/lib/python/distutils/tests
}
diff --git a/python/python-2.4.2-bsddb.patch b/python/python-2.4.2-bsddb.patch
new file mode 100644
index 0000000..7b28c49
--- /dev/null
+++ b/python/python-2.4.2-bsddb.patch
@@ -0,0 +1,1024 @@
+diff -Nru Python-2.4.2.orig/Lib/bsddb/__init__.py Python-2.4.2/Lib/bsddb/__init__.py
+--- Python-2.4.2.orig/Lib/bsddb/__init__.py 2006-02-13 18:18:16.000000000 +0100
++++ Python-2.4.2/Lib/bsddb/__init__.py 2006-01-27 07:17:25.000000000 +0100
+@@ -372,6 +372,8 @@
+ try:
+ import thread
+ del thread
++ if db.version() < (3, 3, 0):
++ db.DB_THREAD = 0
+ except ImportError:
+ db.DB_THREAD = 0
+
+diff -Nru Python-2.4.2.orig/Lib/bsddb/db.py Python-2.4.2/Lib/bsddb/db.py
+--- Python-2.4.2.orig/Lib/bsddb/db.py 2006-02-13 18:18:16.000000000 +0100
++++ Python-2.4.2/Lib/bsddb/db.py 2006-01-27 07:17:25.000000000 +0100
+@@ -37,7 +37,7 @@
+ # case we ever want to augment the stuff in _db in any way. For now
+ # it just simply imports everything from _db.
+
+-if __name__[:len('bsddb3.')] == 'bsddb3.':
++if __name__.startswith('bsddb3.'):
+ # import _pybsddb binary as it should be the more recent version from
+ # a standalone pybsddb addon package than the version included with
+ # python as bsddb._bsddb.
+diff -Nru Python-2.4.2.orig/Lib/bsddb/dbobj.py Python-2.4.2/Lib/bsddb/dbobj.py
+--- Python-2.4.2.orig/Lib/bsddb/dbobj.py 2006-02-13 18:18:16.000000000 +0100
++++ Python-2.4.2/Lib/bsddb/dbobj.py 2006-01-27 07:28:12.000000000 +0100
+@@ -77,6 +77,8 @@
+ return apply(self._cobj.txn_stat, args, kwargs)
+ def set_tx_max(self, *args, **kwargs):
+ return apply(self._cobj.set_tx_max, args, kwargs)
++ def set_tx_timestamp(self, *args, **kwargs):
++ return apply(self._cobj.set_tx_timestamp, args, kwargs)
+ def lock_detect(self, *args, **kwargs):
+ return apply(self._cobj.lock_detect, args, kwargs)
+ def lock_get(self, *args, **kwargs):
+@@ -164,6 +166,8 @@
+ return apply(self._cobj.rename, args, kwargs)
+ def set_bt_minkey(self, *args, **kwargs):
+ return apply(self._cobj.set_bt_minkey, args, kwargs)
++ def set_bt_compare(self, *args, **kwargs):
++ return apply(self._cobj.set_bt_compare, args, kwargs)
+ def set_cachesize(self, *args, **kwargs):
+ return apply(self._cobj.set_cachesize, args, kwargs)
+ def set_flags(self, *args, **kwargs):
+diff -Nru Python-2.4.2.orig/Lib/bsddb/dbtables.py Python-2.4.2/Lib/bsddb/dbtables.py
+--- Python-2.4.2.orig/Lib/bsddb/dbtables.py 2006-02-13 18:18:16.000000000 +0100
++++ Python-2.4.2/Lib/bsddb/dbtables.py 2006-01-27 07:17:25.000000000 +0100
+@@ -15,7 +15,7 @@
+ # This provides a simple database table interface built on top of
+ # the Python BerkeleyDB 3 interface.
+ #
+-_cvsid = '$Id: dbtables.py,v 1.11 2004/08/08 00:54:20 tim_one Exp $'
++_cvsid = '$Id: dbtables.py 36901 2004-08-08 00:54:21Z tim_one $'
+
+ import re
+ import sys
+diff -Nru Python-2.4.2.orig/Modules/_bsddb.c Python-2.4.2/Modules/_bsddb.c
+--- Python-2.4.2.orig/Modules/_bsddb.c 2006-02-13 18:18:17.000000000 +0100
++++ Python-2.4.2/Modules/_bsddb.c 2006-01-30 01:22:16.000000000 +0100
+@@ -97,8 +97,8 @@
+ #error "eek! DBVER can't handle minor versions > 9"
+ #endif
+
+-#define PY_BSDDB_VERSION "4.3.0"
+-static char *rcs_id = "$Id: _bsddb.c,v 1.38.2.1 2004/12/16 09:48:37 greg Exp $";
++#define PY_BSDDB_VERSION "4.4.2"
++static char *rcs_id = "$Id: _bsddb.c 42205 2006-01-30 00:22:08Z gregory.p.smith $";
+
+
+ #ifdef WITH_THREAD
+@@ -153,7 +153,7 @@
+
+ static PyObject* DBError; /* Base class, all others derive from this */
+ static PyObject* DBCursorClosedError; /* raised when trying to use a closed cursor object */
+-static PyObject* DBKeyEmptyError; /* DB_KEYEMPTY */
++static PyObject* DBKeyEmptyError; /* DB_KEYEMPTY: also derives from KeyError */
+ static PyObject* DBKeyExistError; /* DB_KEYEXIST */
+ static PyObject* DBLockDeadlockError; /* DB_LOCK_DEADLOCK */
+ static PyObject* DBLockNotGrantedError; /* DB_LOCK_NOTGRANTED */
+@@ -212,10 +212,10 @@
+
+ struct behaviourFlags {
+ /* What is the default behaviour when DB->get or DBCursor->get returns a
+- DB_NOTFOUND error? Return None or raise an exception? */
++ DB_NOTFOUND || DB_KEYEMPTY error? Return None or raise an exception? */
+ unsigned int getReturnsNone : 1;
+ /* What is the default behaviour for DBCursor.set* methods when DBCursor->get
+- * returns a DB_NOTFOUND error? Return None or raise an exception? */
++ * returns a DB_NOTFOUND || DB_KEYEMPTY error? Return None or raise? */
+ unsigned int cursorSetReturnsNone : 1;
+ };
+
+@@ -244,6 +244,7 @@
+ struct behaviourFlags moduleFlags;
+ #if (DBVER >= 33)
+ PyObject* associateCallback;
++ PyObject* btCompareCallback;
+ int primaryDBType;
+ #endif
+ #ifdef HAVE_WEAKREF
+@@ -265,6 +266,7 @@
+ typedef struct {
+ PyObject_HEAD
+ DB_TXN* txn;
++ PyObject *env;
+ #ifdef HAVE_WEAKREF
+ PyObject *in_weakreflist; /* List of weak references */
+ #endif
+@@ -649,7 +651,7 @@
+ int dlen = -1;
+ int doff = -1;
+ int flags = 0;
+- char* kwnames[] = { "flags", "dlen", "doff", NULL };
++ static const char* kwnames[] = { "flags", "dlen", "doff", NULL };
+
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs, format, kwnames,
+ &flags, &dlen, &doff))
+@@ -672,7 +674,8 @@
+ err = self->dbc->c_get(self->dbc, &key, &data, flags);
+ MYDB_END_ALLOW_THREADS;
+
+- if ((err == DB_NOTFOUND) && self->mydb->moduleFlags.getReturnsNone) {
++ if ((err == DB_NOTFOUND || err == DB_KEYEMPTY)
++ && self->mydb->moduleFlags.getReturnsNone) {
+ Py_INCREF(Py_None);
+ retval = Py_None;
+ }
+@@ -741,6 +744,7 @@
+ self->myenvobj = NULL;
+ #if (DBVER >= 33)
+ self->associateCallback = NULL;
++ self->btCompareCallback = NULL;
+ self->primaryDBType = 0;
+ #endif
+ #ifdef HAVE_WEAKREF
+@@ -815,6 +819,10 @@
+ Py_DECREF(self->associateCallback);
+ self->associateCallback = NULL;
+ }
++ if (self->btCompareCallback != NULL) {
++ Py_DECREF(self->btCompareCallback);
++ self->btCompareCallback = NULL;
++ }
+ #endif
+ PyObject_Del(self);
+ }
+@@ -905,7 +913,7 @@
+ }
+ #endif
+
+- if (self->db_env) {
++ if (self->db_env && !self->closed) {
+ MYDB_BEGIN_ALLOW_THREADS;
+ self->db_env->close(self->db_env, 0);
+ MYDB_END_ALLOW_THREADS;
+@@ -921,6 +929,8 @@
+ DBTxnObject* self = PyObject_New(DBTxnObject, &DBTxn_Type);
+ if (self == NULL)
+ return NULL;
++ Py_INCREF(myenv);
++ self->env = (PyObject*)myenv;
+ #ifdef HAVE_WEAKREF
+ self->in_weakreflist = NULL;
+ #endif
+@@ -931,11 +941,10 @@
+ #else
+ err = txn_begin(myenv->db_env, parent, &(self->txn), flags);
+ #endif
+- /* TODO add a weakref(self) to the self->myenvobj->open_child_weakrefs
+- * list so that a DBEnv can refuse to close without aborting any open
+- * open DBTxns and closing any open DBs first. */
+ MYDB_END_ALLOW_THREADS;
+ if (makeDBError(err)) {
++ Py_DECREF(self->env);
++ PyObject_Del(self);
+ self = NULL;
+ }
+ return self;
+@@ -966,6 +975,7 @@
+ }
+ #endif
+
++ Py_DECREF(self->env);
+ PyObject_Del(self);
+ }
+
+@@ -1140,9 +1150,10 @@
+ #if (DBVER >= 41)
+ PyObject *txnobj = NULL;
+ DB_TXN *txn = NULL;
+- char* kwnames[] = {"secondaryDB", "callback", "flags", "txn", NULL};
++ static const char* kwnames[] = {"secondaryDB", "callback", "flags", "txn",
++ NULL};
+ #else
+- char* kwnames[] = {"secondaryDB", "callback", "flags", NULL};
++ static const char* kwnames[] = {"secondaryDB", "callback", "flags", NULL};
+ #endif
+
+ #if (DBVER >= 41)
+@@ -1165,6 +1176,7 @@
+ makeTypeError("DB", (PyObject*)secondaryDB);
+ return NULL;
+ }
++ CHECK_DB_NOT_CLOSED(secondaryDB);
+ if (callback == Py_None) {
+ callback = NULL;
+ }
+@@ -1174,9 +1186,7 @@
+ }
+
+ /* Save a reference to the callback in the secondary DB. */
+- if (self->associateCallback != NULL) {
+- Py_DECREF(self->associateCallback);
+- }
++ Py_XDECREF(secondaryDB->associateCallback);
+ Py_INCREF(callback);
+ secondaryDB->associateCallback = callback;
+ secondaryDB->primaryDBType = _DB_get_type(self);
+@@ -1210,8 +1220,8 @@
+ MYDB_END_ALLOW_THREADS;
+
+ if (err) {
+- Py_DECREF(self->associateCallback);
+- self->associateCallback = NULL;
++ Py_XDECREF(secondaryDB->associateCallback);
++ secondaryDB->associateCallback = NULL;
+ secondaryDB->primaryDBType = 0;
+ }
+
+@@ -1249,7 +1259,7 @@
+ PyObject* retval = NULL;
+ DBT key, data;
+ DB_TXN *txn = NULL;
+- char* kwnames[] = { "txn", "flags", NULL };
++ static const char* kwnames[] = { "txn", "flags", NULL };
+
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|Oi:consume", kwnames,
+ &txnobj, &flags))
+@@ -1279,7 +1289,8 @@
+ err = self->db->get(self->db, txn, &key, &data, flags|consume_flag);
+ MYDB_END_ALLOW_THREADS;
+
+- if ((err == DB_NOTFOUND) && self->moduleFlags.getReturnsNone) {
++ if ((err == DB_NOTFOUND || err == DB_KEYEMPTY)
++ && self->moduleFlags.getReturnsNone) {
+ err = 0;
+ Py_INCREF(Py_None);
+ retval = Py_None;
+@@ -1318,7 +1329,7 @@
+ DBC* dbc;
+ PyObject* txnobj = NULL;
+ DB_TXN *txn = NULL;
+- char* kwnames[] = { "txn", "flags", NULL };
++ static const char* kwnames[] = { "txn", "flags", NULL };
+
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|Oi:cursor", kwnames,
+ &txnobj, &flags))
+@@ -1343,7 +1354,7 @@
+ PyObject* keyobj;
+ DBT key;
+ DB_TXN *txn = NULL;
+- char* kwnames[] = { "key", "txn", "flags", NULL };
++ static const char* kwnames[] = { "key", "txn", "flags", NULL };
+
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O|Oi:delete", kwnames,
+ &keyobj, &txnobj, &flags))
+@@ -1395,7 +1406,8 @@
+ int doff = -1;
+ DBT key, data;
+ DB_TXN *txn = NULL;
+- char* kwnames[] = {"key", "default", "txn", "flags", "dlen", "doff", NULL};
++ static const char* kwnames[] = {"key", "default", "txn", "flags", "dlen",
++ "doff", NULL};
+
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O|OOiii:get", kwnames,
+ &keyobj, &dfltobj, &txnobj, &flags, &dlen,
+@@ -1424,12 +1436,13 @@
+ err = self->db->get(self->db, txn, &key, &data, flags);
+ MYDB_END_ALLOW_THREADS;
+
+- if ((err == DB_NOTFOUND) && (dfltobj != NULL)) {
++ if ((err == DB_NOTFOUND || err == DB_KEYEMPTY) && (dfltobj != NULL)) {
+ err = 0;
+ Py_INCREF(dfltobj);
+ retval = dfltobj;
+ }
+- else if ((err == DB_NOTFOUND) && self->moduleFlags.getReturnsNone) {
++ else if ((err == DB_NOTFOUND || err == DB_KEYEMPTY)
++ && self->moduleFlags.getReturnsNone) {
+ err = 0;
+ Py_INCREF(Py_None);
+ retval = Py_None;
+@@ -1461,7 +1474,8 @@
+ int doff = -1;
+ DBT key, pkey, data;
+ DB_TXN *txn = NULL;
+- char* kwnames[] = {"key", "default", "txn", "flags", "dlen", "doff", NULL};
++ static const char* kwnames[] = {"key", "default", "txn", "flags", "dlen",
++ "doff", NULL};
+
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O|OOiii:pget", kwnames,
+ &keyobj, &dfltobj, &txnobj, &flags, &dlen,
+@@ -1493,12 +1507,13 @@
+ err = self->db->pget(self->db, txn, &key, &pkey, &data, flags);
+ MYDB_END_ALLOW_THREADS;
+
+- if ((err == DB_NOTFOUND) && (dfltobj != NULL)) {
++ if ((err == DB_NOTFOUND || err == DB_KEYEMPTY) && (dfltobj != NULL)) {
+ err = 0;
+ Py_INCREF(dfltobj);
+ retval = dfltobj;
+ }
+- else if ((err == DB_NOTFOUND) && self->moduleFlags.getReturnsNone) {
++ else if ((err == DB_NOTFOUND || err == DB_KEYEMPTY)
++ && self->moduleFlags.getReturnsNone) {
+ err = 0;
+ Py_INCREF(Py_None);
+ retval = Py_None;
+@@ -1510,7 +1525,7 @@
+
+ if (self->primaryDBType == DB_RECNO ||
+ self->primaryDBType == DB_QUEUE)
+- pkeyObj = PyInt_FromLong(*(long *)pkey.data);
++ pkeyObj = PyInt_FromLong(*(int *)pkey.data);
+ else
+ pkeyObj = PyString_FromStringAndSize(pkey.data, pkey.size);
+
+@@ -1519,14 +1534,22 @@
+ PyObject *keyObj;
+ int type = _DB_get_type(self);
+ if (type == DB_RECNO || type == DB_QUEUE)
+- keyObj = PyInt_FromLong(*(long *)key.data);
++ keyObj = PyInt_FromLong(*(int *)key.data);
+ else
+ keyObj = PyString_FromStringAndSize(key.data, key.size);
++#if (PY_VERSION_HEX >= 0x02040000)
++ retval = PyTuple_Pack(3, keyObj, pkeyObj, dataObj);
++#else
+ retval = Py_BuildValue("OOO", keyObj, pkeyObj, dataObj);
++#endif
+ }
+ else /* return just the pkey and data */
+ {
++#if (PY_VERSION_HEX >= 0x02040000)
++ retval = PyTuple_Pack(2, pkeyObj, dataObj);
++#else
+ retval = Py_BuildValue("OO", pkeyObj, dataObj);
++#endif
+ }
+ FREE_DBT(pkey);
+ FREE_DBT(data);
+@@ -1549,7 +1572,7 @@
+ PyObject* retval = NULL;
+ DBT key, data;
+ DB_TXN *txn = NULL;
+- char* kwnames[] = { "key", "txn", NULL };
++ static const char* kwnames[] = { "key", "txn", NULL };
+
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O|O:get_size", kwnames,
+ &keyobj, &txnobj))
+@@ -1592,7 +1615,7 @@
+ PyObject* retval = NULL;
+ DBT key, data;
+ DB_TXN *txn = NULL;
+- char* kwnames[] = { "key", "data", "txn", "flags", NULL };
++ static const char* kwnames[] = { "key", "data", "txn", "flags", NULL };
+
+
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs, "OO|Oi:get_both", kwnames,
+@@ -1623,7 +1646,8 @@
+ err = self->db->get(self->db, txn, &key, &data, flags);
+ MYDB_END_ALLOW_THREADS;
+
+- if ((err == DB_NOTFOUND) && self->moduleFlags.getReturnsNone) {
++ if ((err == DB_NOTFOUND || err == DB_KEYEMPTY)
++ && self->moduleFlags.getReturnsNone) {
+ err = 0;
+ Py_INCREF(Py_None);
+ retval = Py_None;
+@@ -1742,7 +1766,7 @@
+ DBT key;
+ DB_TXN *txn = NULL;
+ DB_KEY_RANGE range;
+- char* kwnames[] = { "key", "txn", "flags", NULL };
++ static const char* kwnames[] = { "key", "txn", "flags", NULL };
+
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O|Oi:key_range", kwnames,
+ &keyobj, &txnobj, &flags))
+@@ -1773,17 +1797,17 @@
+ PyObject *txnobj = NULL;
+ DB_TXN *txn = NULL;
+ /* with dbname */
+- char* kwnames[] = {
++ static const char* kwnames[] = {
+ "filename", "dbname", "dbtype", "flags", "mode", "txn", NULL};
+ /* without dbname */
+- char* kwnames_basic[] = {
++ static const char* kwnames_basic[] = {
+ "filename", "dbtype", "flags", "mode", "txn", NULL};
+ #else
+ /* with dbname */
+- char* kwnames[] = {
++ static const char* kwnames[] = {
+ "filename", "dbname", "dbtype", "flags", "mode", NULL};
+ /* without dbname */
+- char* kwnames_basic[] = {
++ static const char* kwnames_basic[] = {
+ "filename", "dbtype", "flags", "mode", NULL};
+ #endif
+
+@@ -1867,7 +1891,8 @@
+ PyObject* keyobj, *dataobj, *retval;
+ DBT key, data;
+ DB_TXN *txn = NULL;
+- char* kwnames[] = { "key", "data", "txn", "flags", "dlen", "doff", NULL };
++ static const char* kwnames[] = { "key", "data", "txn", "flags", "dlen",
++ "doff", NULL };
+
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs, "OO|Oiii:put", kwnames,
+ &keyobj, &dataobj, &txnobj, &flags, &dlen, &doff))
+@@ -1907,7 +1932,7 @@
+ char* filename;
+ char* database = NULL;
+ int err, flags=0;
+- char* kwnames[] = { "filename", "dbname", "flags", NULL};
++ static const char* kwnames[] = { "filename", "dbname", "flags", NULL};
+
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs, "s|zi:remove", kwnames,
+ &filename, &database, &flags))
+@@ -1959,6 +1984,160 @@
+ RETURN_NONE();
+ }
+
++#if (DBVER >= 33)
++static int
++_default_cmp (const DBT *leftKey,
++ const DBT *rightKey)
++{
++ int res;
++ int lsize = leftKey->size, rsize = rightKey->size;
++
++ res = memcmp (leftKey->data, rightKey->data,
++ lsize < rsize ? lsize : rsize);
++
++ if (res == 0) {
++ if (lsize < rsize) {
++ res = -1;
++ }
++ else if (lsize > rsize) {
++ res = 1;
++ }
++ }
++ return res;
++}
++
++static int
++_db_compareCallback (DB* db,
++ const DBT *leftKey,
++ const DBT *rightKey)
++{
++ int res = 0;
++ PyObject *args;
++ PyObject *result;
++ PyObject *leftObject;
++ PyObject *rightObject;
++ DBObject *self = (DBObject *) db->app_private;
++
++ if (self == NULL || self->btCompareCallback == NULL) {
++ MYDB_BEGIN_BLOCK_THREADS;
++ PyErr_SetString (PyExc_TypeError,
++ (self == 0
++ ? "DB_bt_compare db is NULL."
++ : "DB_bt_compare callback is NULL."));
++ /* we're in a callback within the DB code, we can't raise */
++ PyErr_Print ();
++ res = _default_cmp (leftKey, rightKey);
++ MYDB_END_BLOCK_THREADS;
++ }
++ else {
++ MYDB_BEGIN_BLOCK_THREADS;
++
++ leftObject = PyString_FromStringAndSize (leftKey->data, leftKey->size);
++ rightObject = PyString_FromStringAndSize (rightKey->data, rightKey->size);
++
++ args = PyTuple_New (2);
++ Py_INCREF (self);
++ PyTuple_SET_ITEM (args, 0, leftObject); /* steals reference */
++ PyTuple_SET_ITEM (args, 1, rightObject); /* steals reference */
++
++ result = PyEval_CallObject (self->btCompareCallback, args);
++ if (result == 0) {
++ /* we're in a callback within the DB code, we can't raise */
++ PyErr_Print ();
++ res = _default_cmp (leftKey, rightKey);
++ }
++ else if (PyInt_Check (result)) {
++ res = PyInt_AsLong (result);
++ }
++ else {
++ PyErr_SetString (PyExc_TypeError,
++ "DB_bt_compare callback MUST return an int.");
++ /* we're in a callback within the DB code, we can't raise */
++ PyErr_Print ();
++ res = _default_cmp (leftKey, rightKey);
++ }
++
++ Py_DECREF (args);
++ Py_XDECREF (result);
++
++ MYDB_END_BLOCK_THREADS;
++ }
++ return res;
++}
++
++static PyObject*
++DB_set_bt_compare (DBObject* self, PyObject* args)
++{
++ int err;
++ PyObject *comparator;
++ PyObject *tuple, *emptyStr, *result;
++
++ if (!PyArg_ParseTuple(args,"O:set_bt_compare", &comparator ))
++ return NULL;
++
++ CHECK_DB_NOT_CLOSED (self);
++
++ if (! PyCallable_Check (comparator)) {
++ makeTypeError ("Callable", comparator);
++ return NULL;
++ }
++
++ /*
++ * Perform a test call of the comparator function with two empty
++ * string objects here. verify that it returns an int (0).
++ * err if not.
++ */
++ tuple = PyTuple_New (2);
++
++ emptyStr = PyString_FromStringAndSize (NULL, 0);
++ Py_INCREF(emptyStr);
++ PyTuple_SET_ITEM (tuple, 0, emptyStr);
++ PyTuple_SET_ITEM (tuple, 1, emptyStr); /* steals reference */
++ result = PyEval_CallObject (comparator, tuple);
++ Py_DECREF (tuple);
++ if (result == 0 || !PyInt_Check(result)) {
++ PyErr_SetString (PyExc_TypeError,
++ "callback MUST return an int");
++ return NULL;
++ }
++ else if (PyInt_AsLong(result) != 0) {
++ PyErr_SetString (PyExc_TypeError,
++ "callback failed to return 0 on two empty strings");
++ return NULL;
++ }
++
++ /* We don't accept multiple set_bt_compare operations, in order to
++ * simplify the code. This would have no real use, as one cannot
++ * change the function once the db is opened anyway */
++ if (self->btCompareCallback != NULL) {
++ PyErr_SetString (PyExc_RuntimeError, "set_bt_compare () cannot be called more than once");
++ return NULL;
++ }
++
++ Py_INCREF (comparator);
++ self->btCompareCallback = comparator;
++
++ /* This is to workaround a problem with un-initialized threads (see
++ comment in DB_associate) */
++#ifdef WITH_THREAD
++ PyEval_InitThreads();
++#endif
++
++ err = self->db->set_bt_compare (self->db,
++ (comparator != NULL ?
++ _db_compareCallback : NULL));
++
++ if (err) {
++ /* restore the old state in case of error */
++ Py_DECREF (comparator);
++ self->btCompareCallback = NULL;
++ }
++
++ RETURN_IF_ERR ();
++ RETURN_NONE ();
++}
++#endif /* DBVER >= 33 */
++
+
+ static PyObject*
+ DB_set_cachesize(DBObject* self, PyObject* args)
+@@ -2171,9 +2350,9 @@
+ #if (DBVER >= 43)
+ PyObject* txnobj = NULL;
+ DB_TXN *txn = NULL;
+- char* kwnames[] = { "txn", "flags", NULL };
++ static const char* kwnames[] = { "txn", "flags", NULL };
+ #else
+- char* kwnames[] = { "flags", NULL };
++ static const char* kwnames[] = { "flags", NULL };
+ #endif
+
+ #if (DBVER >= 43)
+@@ -2313,7 +2492,7 @@
+ u_int32_t count=0;
+ PyObject* txnobj = NULL;
+ DB_TXN *txn = NULL;
+- char* kwnames[] = { "txn", "flags", NULL };
++ static const char* kwnames[] = { "txn", "flags", NULL };
+
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|Oi:cursor", kwnames,
+ &txnobj, &flags))
+@@ -2357,7 +2536,8 @@
+ char* dbName=NULL;
+ char* outFileName=NULL;
+ FILE* outFile=NULL;
+- char* kwnames[] = { "filename", "dbname", "outfile", "flags", NULL };
++ static const char* kwnames[] = { "filename", "dbname", "outfile", "flags",
++ NULL };
+
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs, "s|zzi:verify", kwnames,
+ &fileName, &dbName, &outFileName, &flags))
+@@ -2414,7 +2594,7 @@
+ int err;
+ u_int32_t flags=0;
+ char *passwd = NULL;
+- char* kwnames[] = { "passwd", "flags", NULL };
++ static const char* kwnames[] = { "passwd", "flags", NULL };
+
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs, "s|i:set_encrypt", kwnames,
+ &passwd, &flags)) {
+@@ -2584,7 +2764,15 @@
+ err = self->db->get(self->db, txn, &key, &data, 0);
+ MYDB_END_ALLOW_THREADS;
+ FREE_DBT(key);
+- return PyInt_FromLong((err == DB_BUFFER_SMALL) || (err == 0));
++
++ if (err == DB_BUFFER_SMALL || err == 0) {
++ return PyInt_FromLong(1);
++ } else if (err == DB_NOTFOUND || err == DB_KEYEMPTY) {
++ return PyInt_FromLong(0);
++ }
++
++ makeDBError(err);
++ return NULL;
+ }
+
+
+@@ -2682,8 +2870,8 @@
+ Py_DECREF(item);
+ }
+
+- /* DB_NOTFOUND is okay, it just means we got to the end */
+- if (err != DB_NOTFOUND && makeDBError(err)) {
++ /* DB_NOTFOUND || DB_KEYEMPTY is okay, it means we got to the end */
++ if (err != DB_NOTFOUND && err != DB_KEYEMPTY && makeDBError(err)) {
+ Py_DECREF(list);
+ list = NULL;
+ }
+@@ -2846,7 +3034,8 @@
+ int dlen = -1;
+ int doff = -1;
+ DBT key, data;
+- char* kwnames[] = { "key","data", "flags", "dlen", "doff", NULL };
++ static const char* kwnames[] = { "key","data", "flags", "dlen", "doff",
++ NULL };
+
+ CLEAR_DBT(key);
+ CLEAR_DBT(data);
+@@ -2890,7 +3079,8 @@
+ err = self->dbc->c_get(self->dbc, &key, &data, flags);
+ MYDB_END_ALLOW_THREADS;
+
+- if ((err == DB_NOTFOUND) && self->mydb->moduleFlags.getReturnsNone) {
++ if ((err == DB_NOTFOUND || err == DB_KEYEMPTY)
++ && self->mydb->moduleFlags.getReturnsNone) {
+ Py_INCREF(Py_None);
+ retval = Py_None;
+ }
+@@ -2931,7 +3121,8 @@
+ int dlen = -1;
+ int doff = -1;
+ DBT key, pkey, data;
+- char* kwnames[] = { "key","data", "flags", "dlen", "doff", NULL };
++ static const char* kwnames[] = { "key","data", "flags", "dlen", "doff",
++ NULL };
+
+ CLEAR_DBT(key);
+ CLEAR_DBT(data);
+@@ -2977,7 +3168,8 @@
+ err = self->dbc->c_pget(self->dbc, &key, &pkey, &data, flags);
+ MYDB_END_ALLOW_THREADS;
+
+- if ((err == DB_NOTFOUND) && self->mydb->moduleFlags.getReturnsNone) {
++ if ((err == DB_NOTFOUND || err == DB_KEYEMPTY)
++ && self->mydb->moduleFlags.getReturnsNone) {
+ Py_INCREF(Py_None);
+ retval = Py_None;
+ }
+@@ -2991,24 +3183,32 @@
+
+ if (self->mydb->primaryDBType == DB_RECNO ||
+ self->mydb->primaryDBType == DB_QUEUE)
+- pkeyObj = PyInt_FromLong(*(long *)pkey.data);
++ pkeyObj = PyInt_FromLong(*(int *)pkey.data);
+ else
+ pkeyObj = PyString_FromStringAndSize(pkey.data, pkey.size);
+
+- if (flags & DB_SET_RECNO) /* return key, pkey and data */
++ if (key.data && key.size) /* return key, pkey and data */
+ {
+ PyObject *keyObj;
+ int type = _DB_get_type(self->mydb);
+ if (type == DB_RECNO || type == DB_QUEUE)
+- keyObj = PyInt_FromLong(*(long *)key.data);
++ keyObj = PyInt_FromLong(*(int *)key.data);
+ else
+ keyObj = PyString_FromStringAndSize(key.data, key.size);
++#if (PY_VERSION_HEX >= 0x02040000)
++ retval = PyTuple_Pack(3, keyObj, pkeyObj, dataObj);
++#else
+ retval = Py_BuildValue("OOO", keyObj, pkeyObj, dataObj);
++#endif
+ FREE_DBT(key);
+ }
+ else /* return just the pkey and data */
+ {
++#if (PY_VERSION_HEX >= 0x02040000)
++ retval = PyTuple_Pack(2, pkeyObj, dataObj);
++#else
+ retval = Py_BuildValue("OO", pkeyObj, dataObj);
++#endif
+ }
+ FREE_DBT(pkey);
+ FREE_DBT(data);
+@@ -3083,7 +3283,8 @@
+ int err, flags = 0;
+ PyObject* keyobj, *dataobj;
+ DBT key, data;
+- char* kwnames[] = { "key", "data", "flags", "dlen", "doff", NULL };
++ static const char* kwnames[] = { "key", "data", "flags", "dlen", "doff",
++ NULL };
+ int dlen = -1;
+ int doff = -1;
+
+@@ -3118,7 +3319,7 @@
+ int err, flags = 0;
+ DBT key, data;
+ PyObject* retval, *keyobj;
+- char* kwnames[] = { "key", "flags", "dlen", "doff", NULL };
++ static const char* kwnames[] = { "key", "flags", "dlen", "doff", NULL };
+ int dlen = -1;
+ int doff = -1;
+
+@@ -3144,7 +3345,8 @@
+ MYDB_BEGIN_ALLOW_THREADS;
+ err = self->dbc->c_get(self->dbc, &key, &data, flags|DB_SET);
+ MYDB_END_ALLOW_THREADS;
+- if ((err == DB_NOTFOUND) && self->mydb->moduleFlags.cursorSetReturnsNone) {
++ if ((err == DB_NOTFOUND || err == DB_KEYEMPTY)
++ && self->mydb->moduleFlags.cursorSetReturnsNone) {
+ Py_INCREF(Py_None);
+ retval = Py_None;
+ }
+@@ -3187,7 +3389,7 @@
+ int err, flags = 0;
+ DBT key, data;
+ PyObject* retval, *keyobj;
+- char* kwnames[] = { "key", "flags", "dlen", "doff", NULL };
++ static const char* kwnames[] = { "key", "flags", "dlen", "doff", NULL };
+ int dlen = -1;
+ int doff = -1;
+
+@@ -3216,7 +3418,8 @@
+ MYDB_BEGIN_ALLOW_THREADS;
+ err = self->dbc->c_get(self->dbc, &key, &data, flags|DB_SET_RANGE);
+ MYDB_END_ALLOW_THREADS;
+- if ((err == DB_NOTFOUND) && self->mydb->moduleFlags.cursorSetReturnsNone) {
++ if ((err == DB_NOTFOUND || err == DB_KEYEMPTY)
++ && self->mydb->moduleFlags.cursorSetReturnsNone) {
+ Py_INCREF(Py_None);
+ retval = Py_None;
+ }
+@@ -3271,7 +3474,7 @@
+ MYDB_BEGIN_ALLOW_THREADS;
+ err = self->dbc->c_get(self->dbc, &key, &data, flags|DB_GET_BOTH);
+ MYDB_END_ALLOW_THREADS;
+- if ((err == DB_NOTFOUND) && returnsNone) {
++ if ((err == DB_NOTFOUND || err == DB_KEYEMPTY) && returnsNone) {
+ Py_INCREF(Py_None);
+ retval = Py_None;
+ }
+@@ -3376,7 +3579,7 @@
+ PyObject* retval;
+ int dlen = -1;
+ int doff = -1;
+- char* kwnames[] = { "recno","flags", "dlen", "doff", NULL };
++ static const char* kwnames[] = { "recno","flags", "dlen", "doff", NULL };
+
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs, "i|iii:set_recno", kwnames,
+ &irecno, &flags, &dlen, &doff))
+@@ -3411,7 +3614,8 @@
+ MYDB_BEGIN_ALLOW_THREADS;
+ err = self->dbc->c_get(self->dbc, &key, &data, flags|DB_SET_RECNO);
+ MYDB_END_ALLOW_THREADS;
+- if ((err == DB_NOTFOUND) && self->mydb->moduleFlags.cursorSetReturnsNone) {
++ if ((err == DB_NOTFOUND || err == DB_KEYEMPTY)
++ && self->mydb->moduleFlags.cursorSetReturnsNone) {
+ Py_INCREF(Py_None);
+ retval = Py_None;
+ }
+@@ -3479,7 +3683,8 @@
+ MYDB_BEGIN_ALLOW_THREADS;
+ err = self->dbc->c_get(self->dbc, &key, &data, flags | DB_JOIN_ITEM);
+ MYDB_END_ALLOW_THREADS;
+- if ((err == DB_NOTFOUND) && self->mydb->moduleFlags.getReturnsNone) {
++ if ((err == DB_NOTFOUND || err == DB_KEYEMPTY)
++ && self->mydb->moduleFlags.getReturnsNone) {
+ Py_INCREF(Py_None);
+ retval = Py_None;
+ }
+@@ -3568,7 +3773,8 @@
+ char *database = NULL;
+ PyObject *txnobj = NULL;
+ DB_TXN *txn = NULL;
+- char* kwnames[] = { "file", "database", "txn", "flags", NULL };
++ static const char* kwnames[] = { "file", "database", "txn", "flags",
++ NULL };
+
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs, "ss|Oi:dbremove", kwnames,
+ &file, &database, &txnobj, &flags)) {
+@@ -3595,7 +3801,8 @@
+ char *newname = NULL;
+ PyObject *txnobj = NULL;
+ DB_TXN *txn = NULL;
+- char* kwnames[] = { "file", "database", "newname", "txn", "flags", NULL };
++ static const char* kwnames[] = { "file", "database", "newname", "txn",
++ "flags", NULL };
+
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs, "sss|Oi:dbrename", kwnames,
+ &file, &database, &newname, &txnobj, &flags)) {
+@@ -3619,7 +3826,7 @@
+ int err;
+ u_int32_t flags=0;
+ char *passwd = NULL;
+- char* kwnames[] = { "passwd", "flags", NULL };
++ static const char* kwnames[] = { "passwd", "flags", NULL };
+
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs, "s|i:set_encrypt", kwnames,
+ &passwd, &flags)) {
+@@ -3642,7 +3849,7 @@
+ int err;
+ u_int32_t flags=0;
+ u_int32_t timeout = 0;
+- char* kwnames[] = { "timeout", "flags", NULL };
++ static const char* kwnames[] = { "timeout", "flags", NULL };
+
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs, "ii:set_timeout", kwnames,
+ &timeout, &flags)) {
+@@ -3780,6 +3987,25 @@
+ }
+
+
++#if (DBVER >= 33)
++static PyObject*
++DBEnv_set_lg_regionmax(DBEnvObject* self, PyObject* args)
++{
++ int err, lg_max;
++
++ if (!PyArg_ParseTuple(args, "i:set_lg_regionmax", &lg_max))
++ return NULL;
++ CHECK_ENV_NOT_CLOSED(self);
++
++ MYDB_BEGIN_ALLOW_THREADS;
++ err = self->db_env->set_lg_regionmax(self->db_env, lg_max);
++ MYDB_END_ALLOW_THREADS;
++ RETURN_IF_ERR();
++ RETURN_NONE();
++}
++#endif
++
++
+ static PyObject*
+ DBEnv_set_lk_detect(DBEnvObject* self, PyObject* args)
+ {
+@@ -3910,7 +4136,7 @@
+ int flags = 0;
+ PyObject* txnobj = NULL;
+ DB_TXN *txn = NULL;
+- char* kwnames[] = { "parent", "flags", NULL };
++ static const char* kwnames[] = { "parent", "flags", NULL };
+
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|Oi:txn_begin", kwnames,
+ &txnobj, &flags))
+@@ -3954,9 +4180,23 @@
+ return NULL;
+ CHECK_ENV_NOT_CLOSED(self);
+
+- MYDB_BEGIN_ALLOW_THREADS;
+ err = self->db_env->set_tx_max(self->db_env, max);
+- MYDB_END_ALLOW_THREADS;
++ RETURN_IF_ERR();
++ RETURN_NONE();
++}
++
++
++static PyObject*
++DBEnv_set_tx_timestamp(DBEnvObject* self, PyObject* args)
++{
++ int err;
++ time_t stamp;
++
++ if (!PyArg_ParseTuple(args, "i:set_tx_timestamp", &stamp))
++ return NULL;
++ CHECK_ENV_NOT_CLOSED(self);
++
++ err = self->db_env->set_tx_timestamp(self->db_env, &stamp);
+ RETURN_IF_ERR();
+ RETURN_NONE();
+ }
+@@ -4101,8 +4341,13 @@
+ #endif
+ MAKE_ENTRY(nrequests);
+ MAKE_ENTRY(nreleases);
+- MAKE_ENTRY(nnowaits);
++#if (DBVER < 44)
++ MAKE_ENTRY(nnowaits); /* these were renamed in 4.4 */
+ MAKE_ENTRY(nconflicts);
++#else
++ MAKE_ENTRY(lock_nowait);
++ MAKE_ENTRY(lock_wait);
++#endif
+ MAKE_ENTRY(ndeadlocks);
+ MAKE_ENTRY(regsize);
+ MAKE_ENTRY(region_wait);
+@@ -4400,6 +4645,9 @@
+ {"remove", (PyCFunction)DB_remove, METH_VARARGS|METH_KEYWORDS},
+ {"rename", (PyCFunction)DB_rename, METH_VARARGS},
+ {"set_bt_minkey", (PyCFunction)DB_set_bt_minkey, METH_VARARGS},
++#if (DBVER >= 33)
++ {"set_bt_compare", (PyCFunction)DB_set_bt_compare, METH_VARARGS},
++#endif
+ {"set_cachesize", (PyCFunction)DB_set_cachesize, METH_VARARGS},
+ #if (DBVER >= 41)
+ {"set_encrypt", (PyCFunction)DB_set_encrypt, METH_VARARGS|METH_KEYWORDS},
+@@ -4489,6 +4737,9 @@
+ {"set_lg_bsize", (PyCFunction)DBEnv_set_lg_bsize, METH_VARARGS},
+ {"set_lg_dir", (PyCFunction)DBEnv_set_lg_dir, METH_VARARGS},
+ {"set_lg_max", (PyCFunction)DBEnv_set_lg_max, METH_VARARGS},
++#if (DBVER >= 33)
++ {"set_lg_regionmax",(PyCFunction)DBEnv_set_lg_regionmax, METH_VARARGS},
++#endif
+ {"set_lk_detect", (PyCFunction)DBEnv_set_lk_detect, METH_VARARGS},
+ {"set_lk_max", (PyCFunction)DBEnv_set_lk_max, METH_VARARGS},
+ #if (DBVER >= 32)
+@@ -4502,6 +4753,7 @@
+ {"txn_checkpoint", (PyCFunction)DBEnv_txn_checkpoint, METH_VARARGS},
+ {"txn_stat", (PyCFunction)DBEnv_txn_stat, METH_VARARGS},
+ {"set_tx_max", (PyCFunction)DBEnv_set_tx_max, METH_VARARGS},
++ {"set_tx_timestamp", (PyCFunction)DBEnv_set_tx_timestamp, METH_VARARGS},
+ {"lock_detect", (PyCFunction)DBEnv_lock_detect, METH_VARARGS},
+ {"lock_get", (PyCFunction)DBEnv_lock_get, METH_VARARGS},
+ {"lock_id", (PyCFunction)DBEnv_lock_id, METH_VARARGS},
+@@ -4734,7 +4986,7 @@
+ {
+ PyObject* dbenvobj = NULL;
+ int flags = 0;
+- char* kwnames[] = { "dbEnv", "flags", NULL};
++ static const char* kwnames[] = { "dbEnv", "flags", NULL};
+
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|Oi:DB", kwnames,
+ &dbenvobj, &flags))
+@@ -4821,6 +5073,8 @@
+
+ /* Create the module and add the functions */
+ m = Py_InitModule(_bsddbModuleName, bsddb_methods);
++ if (m == NULL)
++ return;
+
+ /* Add some symbolic constants to the module */
+ d = PyModule_GetDict(m);
+@@ -4938,7 +5192,11 @@
+ ADD_INT(d, DB_LOCK_IREAD);
+ ADD_INT(d, DB_LOCK_IWR);
+ #if (DBVER >= 33)
++#if (DBVER < 44)
+ ADD_INT(d, DB_LOCK_DIRTY);
++#else
++ ADD_INT(d, DB_LOCK_READ_UNCOMMITTED); /* renamed in 4.4 */
++#endif
+ ADD_INT(d, DB_LOCK_WWRITE);
+ #endif
+
+@@ -5040,6 +5298,11 @@
+ ADD_INT(d, DB_MULTIPLE_KEY);
+ #endif
+
++#if (DBVER >= 44)
++ ADD_INT(d, DB_READ_UNCOMMITTED); /* replaces DB_DIRTY_READ in 4.4 */
++ ADD_INT(d, DB_READ_COMMITTED);
++#endif
++
+ #if (DBVER >= 33)
+ ADD_INT(d, DB_DONOTINDEX);
+ #endif
+@@ -5117,12 +5380,15 @@
+ DBError = PyErr_NewException("bsddb._db.DBError", NULL, NULL);
+ PyDict_SetItemString(d, "DBError", DBError);
+
+- /* Some magic to make DBNotFoundError derive from both DBError and
+- KeyError, since the API only supports using one base class. */
++ /* Some magic to make DBNotFoundError and DBKeyEmptyError derive
++ * from both DBError and KeyError, since the API only supports
++ * using one base class. */
+ PyDict_SetItemString(d, "KeyError", PyExc_KeyError);
+- PyRun_String("class DBNotFoundError(DBError, KeyError): pass",
++ PyRun_String("class DBNotFoundError(DBError, KeyError): pass\n"
++ "class DBKeyEmptyError(DBError, KeyError): pass",
+ Py_file_input, d, d);
+ DBNotFoundError = PyDict_GetItemString(d, "DBNotFoundError");
++ DBKeyEmptyError = PyDict_GetItemString(d, "DBKeyEmptyError");
+ PyDict_DelItemString(d, "KeyError");
+
+
diff --git a/python/python-2.4.2.patch b/python/python-2.4.2.patch
index 063314b..e0e6fb0 100644
--- a/python/python-2.4.2.patch
+++ b/python/python-2.4.2.patch
@@ -66,7 +66,7 @@ diff -Nru Python-2.4.2.orig/Modules/Setup.dist Python-2.4.2/Modules/Setup.dist
-#DBLIB=$(DB)/lib
-#_bsddb _bsddb.c -I$(DBINC) -L$(DBLIB) -ldb-$(DBLIBVER)
+DB=/usr
-+DBLIBVER=4.3
++DBLIBVER=4.4
+DBINC=$(DB)/include
+DBLIB=$(DB)/lib
+_bsddb _bsddb.c -I$(DBINC) -L$(DBLIB) -ldb-$(DBLIBVER)
1
0
19 May '07
commit 6e1d6d9ce77b038df167a0113faebd5455bd79f3
Author: Juergen Daubert <juergen.daubert(a)t-online.de>
Date: Fri Feb 24 08:17:08 2006 +0000
mysql: update to 5.0.18, added innodb support
diff --git a/mysql/.footprint b/mysql/.footprint
index afaacc7..be4d4bf 100644
--- a/mysql/.footprint
+++ b/mysql/.footprint
@@ -5,8 +5,7 @@ drwxr-xr-x root/root etc/rc.d/
drwxr-xr-x root/root usr/
drwxr-xr-x root/root usr/bin/
-rwxr-xr-x root/root usr/bin/comp_err
--rwxr-xr-x root/root usr/bin/isamchk
--rwxr-xr-x root/root usr/bin/isamlog
+-rwxr-xr-x root/root usr/bin/innochecksum
-rwxr-xr-x root/root usr/bin/msql2mysql
-rwxr-xr-x root/root usr/bin/my_print_defaults
-rwxr-xr-x root/root usr/bin/myisam_ftdump
@@ -40,12 +39,11 @@ drwxr-xr-x root/root usr/bin/
-rwxr-xr-x root/root usr/bin/mysqldumpslow
-rwxr-xr-x root/root usr/bin/mysqlhotcopy
-rwxr-xr-x root/root usr/bin/mysqlimport
--rwxr-xr-x root/root usr/bin/mysqlmanager
--rwxr-xr-x root/root usr/bin/mysqlmanager-pwgen
--rwxr-xr-x root/root usr/bin/mysqlmanagerc
-rwxr-xr-x root/root usr/bin/mysqlshow
-rwxr-xr-x root/root usr/bin/mysqltest
--rwxr-xr-x root/root usr/bin/pack_isam
+-rwxr-xr-x root/root usr/bin/mysqltestmanager
+-rwxr-xr-x root/root usr/bin/mysqltestmanager-pwgen
+-rwxr-xr-x root/root usr/bin/mysqltestmanagerc
-rwxr-xr-x root/root usr/bin/perror
-rwxr-xr-x root/root usr/bin/replace
-rwxr-xr-x root/root usr/bin/resolve_stack_dump
@@ -74,6 +72,7 @@ drwxr-xr-x root/root usr/include/mysql/
-rw-r--r-- root/root usr/include/mysql/mysql_embed.h
-rw-r--r-- root/root usr/include/mysql/mysql_time.h
-rw-r--r-- root/root usr/include/mysql/mysql_version.h
+-rw-r--r-- root/root usr/include/mysql/mysqld_ername.h
-rw-r--r-- root/root usr/include/mysql/mysqld_error.h
-rw-r--r-- root/root usr/include/mysql/raid.h
-rw-r--r-- root/root usr/include/mysql/readline.h
@@ -87,27 +86,23 @@ drwxr-xr-x root/root usr/lib/
drwxr-xr-x root/root usr/lib/mysql/
-rw-r--r-- root/root usr/lib/mysql/libdbug.a
-rw-r--r-- root/root usr/lib/mysql/libheap.a
--rw-r--r-- root/root usr/lib/mysql/libmerge.a
-rw-r--r-- root/root usr/lib/mysql/libmyisam.a
-rw-r--r-- root/root usr/lib/mysql/libmyisammrg.a
-rw-r--r-- root/root usr/lib/mysql/libmysqlclient.a
-rwxr-xr-x root/root usr/lib/mysql/libmysqlclient.la
-lrwxrwxrwx root/root usr/lib/mysql/libmysqlclient.so -> libmysqlclient.so.14.0.0
-lrwxrwxrwx root/root usr/lib/mysql/libmysqlclient.so.14 -> libmysqlclient.so.14.0.0
--rwxr-xr-x root/root usr/lib/mysql/libmysqlclient.so.14.0.0
+lrwxrwxrwx root/root usr/lib/mysql/libmysqlclient.so -> libmysqlclient.so.15.0.0
+lrwxrwxrwx root/root usr/lib/mysql/libmysqlclient.so.15 -> libmysqlclient.so.15.0.0
+-rwxr-xr-x root/root usr/lib/mysql/libmysqlclient.so.15.0.0
-rw-r--r-- root/root usr/lib/mysql/libmysqlclient_r.a
-rwxr-xr-x root/root usr/lib/mysql/libmysqlclient_r.la
-lrwxrwxrwx root/root usr/lib/mysql/libmysqlclient_r.so -> libmysqlclient_r.so.14.0.0
-lrwxrwxrwx root/root usr/lib/mysql/libmysqlclient_r.so.14 -> libmysqlclient_r.so.14.0.0
--rwxr-xr-x root/root usr/lib/mysql/libmysqlclient_r.so.14.0.0
+lrwxrwxrwx root/root usr/lib/mysql/libmysqlclient_r.so -> libmysqlclient_r.so.15.0.0
+lrwxrwxrwx root/root usr/lib/mysql/libmysqlclient_r.so.15 -> libmysqlclient_r.so.15.0.0
+-rwxr-xr-x root/root usr/lib/mysql/libmysqlclient_r.so.15.0.0
-rw-r--r-- root/root usr/lib/mysql/libmystrings.a
-rw-r--r-- root/root usr/lib/mysql/libmysys.a
--rw-r--r-- root/root usr/lib/mysql/libnisam.a
-rw-r--r-- root/root usr/lib/mysql/libvio.a
drwxr-xr-x root/root usr/man/
drwxr-xr-x root/root usr/man/man1/
--rw-r--r-- root/root usr/man/man1/isamchk.1.gz
--rw-r--r-- root/root usr/man/man1/isamlog.1.gz
-rw-r--r-- root/root usr/man/man1/msql2mysql.1.gz
-rw-r--r-- root/root usr/man/man1/myisamchk.1.gz
-rw-r--r-- root/root usr/man/man1/myisamlog.1.gz
@@ -128,13 +123,14 @@ drwxr-xr-x root/root usr/man/man1/
-rw-r--r-- root/root usr/man/man1/mysqlhotcopy.1.gz
-rw-r--r-- root/root usr/man/man1/mysqlimport.1.gz
-rw-r--r-- root/root usr/man/man1/mysqlman.1.gz
+-rw-r--r-- root/root usr/man/man1/mysqlmanager.1.gz
-rw-r--r-- root/root usr/man/man1/mysqlshow.1.gz
--rw-r--r-- root/root usr/man/man1/pack_isam.1.gz
-rw-r--r-- root/root usr/man/man1/perror.1.gz
-rw-r--r-- root/root usr/man/man1/replace.1.gz
-rw-r--r-- root/root usr/man/man1/safe_mysqld.1.gz
drwxr-xr-x root/root usr/sbin/
-rwxr-xr-x root/root usr/sbin/mysqld
+-rwxr-xr-x root/root usr/sbin/mysqlmanager
drwxr-xr-x root/root usr/share/
drwxr-xr-x root/root usr/share/mysql/
drwxr-xr-x root/root usr/share/mysql/charsets/
@@ -166,7 +162,6 @@ drwxr-xr-x root/root usr/share/mysql/charsets/
-rw-r--r-- root/root usr/share/mysql/charsets/swe7.xml
drwxr-xr-x root/root usr/share/mysql/english/
-rw-r--r-- root/root usr/share/mysql/english/errmsg.sys
--rw-r--r-- root/root usr/share/mysql/english/errmsg.txt
-rw-r--r-- root/root usr/share/mysql/fill_help_tables.sql
-rw-r--r-- root/root usr/share/mysql/my-huge.cnf
-rw-r--r-- root/root usr/share/mysql/my-innodb-heavy-4G.cnf
diff --git a/mysql/.md5sum b/mysql/.md5sum
index a9574f0..b3dd9ed 100644
--- a/mysql/.md5sum
+++ b/mysql/.md5sum
@@ -1,3 +1,3 @@
-2ffa29fde41f56c31747141801076a62 my.cnf
-a2db4edb3e1e3b8e0f8c2242225ea513 mysql-4.1.18.tar.gz
+c92bf44516b82cad857fb386dbb64bfe my.cnf
+f18153b0239aaa03fc5a751f2d82cb71 mysql-5.0.18.tar.gz
642a596f13ebd7e459c5ff2fd382f06b mysqld
diff --git a/mysql/Pkgfile b/mysql/Pkgfile
index d8e0b1d..cdb900c 100644
--- a/mysql/Pkgfile
+++ b/mysql/Pkgfile
@@ -4,9 +4,9 @@
# Depends on: ncurses, zlib
name=mysql
-version=4.1.18
+version=5.0.18
release=1
-source=(http://mirrors.sunsite.dk/mysql/Downloads/MySQL-4.1/$name-$version.tar.gz \
+source=(http://mirrors.sunsite.dk/mysql/Downloads/MySQL-5.0/$name-$version.tar.gz \
my.cnf mysqld)
build () {
@@ -18,7 +18,7 @@ build () {
--enable-assembler \
--enable-thread-safe-client \
--without-berkeley-db \
- --without-innodb \
+ --enable-innodb \
--without-debug \
--without-docs \
--without-bench
diff --git a/mysql/README b/mysql/README
index 192d2fb..0b36822 100644
--- a/mysql/README
+++ b/mysql/README
@@ -1,4 +1,4 @@
-README for mysql 4.1.xx
+README for mysql 5.0.xx
REQUIREMENTS
@@ -26,3 +26,8 @@ PRECAUTION
To obtain such a list of packages for your system, you
may use the command 'prt-get dependent mysql' or use yapo
to list the packages.
+
+INNODB
+ InnoDB table type support is compiled in but disabled by
+ default. Comment out the skip-innodb line in /etc/my.cnf
+ to fully enable InnoDB support.
diff --git a/mysql/my.cnf b/mysql/my.cnf
index 9620c20..37070a6 100644
--- a/mysql/my.cnf
+++ b/mysql/my.cnf
@@ -11,6 +11,7 @@ socket = /tmp/mysql.sock
port = 3306
skip-networking
+skip-innodb
[client]
socket = /tmp/mysql.sock
1
0
commit 07d340e6aaf039bc1f4871d4d100570e87613161
Author: Juergen Daubert <juergen.daubert(a)t-online.de>
Date: Fri Feb 24 08:06:45 2006 +0000
mod_perl: update for perl 5.8.8
diff --git a/mod_perl/.footprint b/mod_perl/.footprint
index 6d23f1c..8621d2a 100644
--- a/mod_perl/.footprint
+++ b/mod_perl/.footprint
@@ -57,203 +57,203 @@ drwxr-xr-x root/root usr/lib/apache/
-rwxr-xr-x root/root usr/lib/apache/mod_perl.so
drwxr-xr-x root/root usr/lib/perl5/
drwxr-xr-x root/root usr/lib/perl5/site_perl/
-drwxr-xr-x root/root usr/lib/perl5/site_perl/5.8.7/
-drwxr-xr-x root/root usr/lib/perl5/site_perl/5.8.7/linux/
--r--r--r-- root/root usr/lib/perl5/site_perl/5.8.7/linux/APR.pm
-drwxr-xr-x root/root usr/lib/perl5/site_perl/5.8.7/linux/APR/
--r--r--r-- root/root usr/lib/perl5/site_perl/5.8.7/linux/APR/Base64.pm
--r--r--r-- root/root usr/lib/perl5/site_perl/5.8.7/linux/APR/Brigade.pm
--r--r--r-- root/root usr/lib/perl5/site_perl/5.8.7/linux/APR/Bucket.pm
--r--r--r-- root/root usr/lib/perl5/site_perl/5.8.7/linux/APR/BucketAlloc.pm
--r--r--r-- root/root usr/lib/perl5/site_perl/5.8.7/linux/APR/BucketType.pm
--r--r--r-- root/root usr/lib/perl5/site_perl/5.8.7/linux/APR/Const.pm
--r--r--r-- root/root usr/lib/perl5/site_perl/5.8.7/linux/APR/Date.pm
--r--r--r-- root/root usr/lib/perl5/site_perl/5.8.7/linux/APR/Error.pm
--r--r--r-- root/root usr/lib/perl5/site_perl/5.8.7/linux/APR/Finfo.pm
--r--r--r-- root/root usr/lib/perl5/site_perl/5.8.7/linux/APR/IpSubnet.pm
--r--r--r-- root/root usr/lib/perl5/site_perl/5.8.7/linux/APR/OS.pm
--r--r--r-- root/root usr/lib/perl5/site_perl/5.8.7/linux/APR/PerlIO.pm
--r--r--r-- root/root usr/lib/perl5/site_perl/5.8.7/linux/APR/Pool.pm
--r--r--r-- root/root usr/lib/perl5/site_perl/5.8.7/linux/APR/SockAddr.pm
--r--r--r-- root/root usr/lib/perl5/site_perl/5.8.7/linux/APR/Socket.pm
--r--r--r-- root/root usr/lib/perl5/site_perl/5.8.7/linux/APR/Status.pm
--r--r--r-- root/root usr/lib/perl5/site_perl/5.8.7/linux/APR/String.pm
--r--r--r-- root/root usr/lib/perl5/site_perl/5.8.7/linux/APR/Table.pm
--r--r--r-- root/root usr/lib/perl5/site_perl/5.8.7/linux/APR/ThreadMutex.pm
--r--r--r-- root/root usr/lib/perl5/site_perl/5.8.7/linux/APR/URI.pm
--r--r--r-- root/root usr/lib/perl5/site_perl/5.8.7/linux/APR/UUID.pm
--r--r--r-- root/root usr/lib/perl5/site_perl/5.8.7/linux/APR/Util.pm
--r--r--r-- root/root usr/lib/perl5/site_perl/5.8.7/linux/APR/XSLoader.pm
-drwxr-xr-x root/root usr/lib/perl5/site_perl/5.8.7/linux/Apache2/
--r--r--r-- root/root usr/lib/perl5/site_perl/5.8.7/linux/Apache2/Access.pm
--r--r--r-- root/root usr/lib/perl5/site_perl/5.8.7/linux/Apache2/Build.pm
--r--r--r-- root/root usr/lib/perl5/site_perl/5.8.7/linux/Apache2/BuildConfig.pm
--r--r--r-- root/root usr/lib/perl5/site_perl/5.8.7/linux/Apache2/CmdParms.pm
--r--r--r-- root/root usr/lib/perl5/site_perl/5.8.7/linux/Apache2/Command.pm
--r--r--r-- root/root usr/lib/perl5/site_perl/5.8.7/linux/Apache2/Connection.pm
--r--r--r-- root/root usr/lib/perl5/site_perl/5.8.7/linux/Apache2/Const.pm
--r--r--r-- root/root usr/lib/perl5/site_perl/5.8.7/linux/Apache2/Directive.pm
--r--r--r-- root/root usr/lib/perl5/site_perl/5.8.7/linux/Apache2/Filter.pm
--r--r--r-- root/root usr/lib/perl5/site_perl/5.8.7/linux/Apache2/FilterRec.pm
--r--r--r-- root/root usr/lib/perl5/site_perl/5.8.7/linux/Apache2/HookRun.pm
--r--r--r-- root/root usr/lib/perl5/site_perl/5.8.7/linux/Apache2/Log.pm
--r--r--r-- root/root usr/lib/perl5/site_perl/5.8.7/linux/Apache2/MPM.pm
--r--r--r-- root/root usr/lib/perl5/site_perl/5.8.7/linux/Apache2/Module.pm
--r--r--r-- root/root usr/lib/perl5/site_perl/5.8.7/linux/Apache2/ParseSource.pm
--r--r--r-- root/root usr/lib/perl5/site_perl/5.8.7/linux/Apache2/PerlSections.pm
-drwxr-xr-x root/root usr/lib/perl5/site_perl/5.8.7/linux/Apache2/PerlSections/
--r--r--r-- root/root usr/lib/perl5/site_perl/5.8.7/linux/Apache2/PerlSections/Dump.pm
--r--r--r-- root/root usr/lib/perl5/site_perl/5.8.7/linux/Apache2/Process.pm
--r--r--r-- root/root usr/lib/perl5/site_perl/5.8.7/linux/Apache2/Reload.pm
--r--r--r-- root/root usr/lib/perl5/site_perl/5.8.7/linux/Apache2/RequestIO.pm
--r--r--r-- root/root usr/lib/perl5/site_perl/5.8.7/linux/Apache2/RequestRec.pm
--r--r--r-- root/root usr/lib/perl5/site_perl/5.8.7/linux/Apache2/RequestUtil.pm
--r--r--r-- root/root usr/lib/perl5/site_perl/5.8.7/linux/Apache2/Resource.pm
--r--r--r-- root/root usr/lib/perl5/site_perl/5.8.7/linux/Apache2/Response.pm
--r--r--r-- root/root usr/lib/perl5/site_perl/5.8.7/linux/Apache2/ServerRec.pm
--r--r--r-- root/root usr/lib/perl5/site_perl/5.8.7/linux/Apache2/ServerUtil.pm
--r--r--r-- root/root usr/lib/perl5/site_perl/5.8.7/linux/Apache2/SizeLimit.pm
--r--r--r-- root/root usr/lib/perl5/site_perl/5.8.7/linux/Apache2/SourceTables.pm
--r--r--r-- root/root usr/lib/perl5/site_perl/5.8.7/linux/Apache2/Status.pm
--r--r--r-- root/root usr/lib/perl5/site_perl/5.8.7/linux/Apache2/SubProcess.pm
--r--r--r-- root/root usr/lib/perl5/site_perl/5.8.7/linux/Apache2/SubRequest.pm
--r--r--r-- root/root usr/lib/perl5/site_perl/5.8.7/linux/Apache2/URI.pm
--r--r--r-- root/root usr/lib/perl5/site_perl/5.8.7/linux/Apache2/Util.pm
--r--r--r-- root/root usr/lib/perl5/site_perl/5.8.7/linux/Apache2/XSLoader.pm
--r--r--r-- root/root usr/lib/perl5/site_perl/5.8.7/linux/Apache2/compat.pm
--r--r--r-- root/root usr/lib/perl5/site_perl/5.8.7/linux/Apache2/porting.pm
-drwxr-xr-x root/root usr/lib/perl5/site_perl/5.8.7/linux/ModPerl/
--r--r--r-- root/root usr/lib/perl5/site_perl/5.8.7/linux/ModPerl/BuildMM.pm
--r--r--r-- root/root usr/lib/perl5/site_perl/5.8.7/linux/ModPerl/BuildOptions.pm
--r--r--r-- root/root usr/lib/perl5/site_perl/5.8.7/linux/ModPerl/CScan.pm
--r--r--r-- root/root usr/lib/perl5/site_perl/5.8.7/linux/ModPerl/Code.pm
--r--r--r-- root/root usr/lib/perl5/site_perl/5.8.7/linux/ModPerl/Config.pm
--r--r--r-- root/root usr/lib/perl5/site_perl/5.8.7/linux/ModPerl/Const.pm
--r--r--r-- root/root usr/lib/perl5/site_perl/5.8.7/linux/ModPerl/FunctionMap.pm
--r--r--r-- root/root usr/lib/perl5/site_perl/5.8.7/linux/ModPerl/Global.pm
--r--r--r-- root/root usr/lib/perl5/site_perl/5.8.7/linux/ModPerl/MM.pm
--r--r--r-- root/root usr/lib/perl5/site_perl/5.8.7/linux/ModPerl/Manifest.pm
--r--r--r-- root/root usr/lib/perl5/site_perl/5.8.7/linux/ModPerl/MapUtil.pm
--r--r--r-- root/root usr/lib/perl5/site_perl/5.8.7/linux/ModPerl/MethodLookup.pm
--r--r--r-- root/root usr/lib/perl5/site_perl/5.8.7/linux/ModPerl/ParseSource.pm
--r--r--r-- root/root usr/lib/perl5/site_perl/5.8.7/linux/ModPerl/PerlRun.pm
--r--r--r-- root/root usr/lib/perl5/site_perl/5.8.7/linux/ModPerl/PerlRunPrefork.pm
--r--r--r-- root/root usr/lib/perl5/site_perl/5.8.7/linux/ModPerl/Registry.pm
--r--r--r-- root/root usr/lib/perl5/site_perl/5.8.7/linux/ModPerl/RegistryBB.pm
--r--r--r-- root/root usr/lib/perl5/site_perl/5.8.7/linux/ModPerl/RegistryCooker.pm
--r--r--r-- root/root usr/lib/perl5/site_perl/5.8.7/linux/ModPerl/RegistryLoader.pm
--r--r--r-- root/root usr/lib/perl5/site_perl/5.8.7/linux/ModPerl/RegistryPrefork.pm
--r--r--r-- root/root usr/lib/perl5/site_perl/5.8.7/linux/ModPerl/StructureMap.pm
--r--r--r-- root/root usr/lib/perl5/site_perl/5.8.7/linux/ModPerl/TestReport.pm
--r--r--r-- root/root usr/lib/perl5/site_perl/5.8.7/linux/ModPerl/TestRun.pm
--r--r--r-- root/root usr/lib/perl5/site_perl/5.8.7/linux/ModPerl/TypeMap.pm
--r--r--r-- root/root usr/lib/perl5/site_perl/5.8.7/linux/ModPerl/Util.pm
--r--r--r-- root/root usr/lib/perl5/site_perl/5.8.7/linux/ModPerl/WrapXS.pm
-drwxr-xr-x root/root usr/lib/perl5/site_perl/5.8.7/linux/auto/
-drwxr-xr-x root/root usr/lib/perl5/site_perl/5.8.7/linux/auto/APR/
--r-xr-xr-x root/root usr/lib/perl5/site_perl/5.8.7/linux/auto/APR/APR.so
-drwxr-xr-x root/root usr/lib/perl5/site_perl/5.8.7/linux/auto/APR/Base64/
--r-xr-xr-x root/root usr/lib/perl5/site_perl/5.8.7/linux/auto/APR/Base64/Base64.so
-drwxr-xr-x root/root usr/lib/perl5/site_perl/5.8.7/linux/auto/APR/Brigade/
--r-xr-xr-x root/root usr/lib/perl5/site_perl/5.8.7/linux/auto/APR/Brigade/Brigade.so
-drwxr-xr-x root/root usr/lib/perl5/site_perl/5.8.7/linux/auto/APR/Bucket/
--r-xr-xr-x root/root usr/lib/perl5/site_perl/5.8.7/linux/auto/APR/Bucket/Bucket.so
-drwxr-xr-x root/root usr/lib/perl5/site_perl/5.8.7/linux/auto/APR/BucketAlloc/
--r-xr-xr-x root/root usr/lib/perl5/site_perl/5.8.7/linux/auto/APR/BucketAlloc/BucketAlloc.so
-drwxr-xr-x root/root usr/lib/perl5/site_perl/5.8.7/linux/auto/APR/BucketType/
--r-xr-xr-x root/root usr/lib/perl5/site_perl/5.8.7/linux/auto/APR/BucketType/BucketType.so
-drwxr-xr-x root/root usr/lib/perl5/site_perl/5.8.7/linux/auto/APR/Const/
--r-xr-xr-x root/root usr/lib/perl5/site_perl/5.8.7/linux/auto/APR/Const/Const.so
-drwxr-xr-x root/root usr/lib/perl5/site_perl/5.8.7/linux/auto/APR/Date/
--r-xr-xr-x root/root usr/lib/perl5/site_perl/5.8.7/linux/auto/APR/Date/Date.so
-drwxr-xr-x root/root usr/lib/perl5/site_perl/5.8.7/linux/auto/APR/Error/
--r-xr-xr-x root/root usr/lib/perl5/site_perl/5.8.7/linux/auto/APR/Error/Error.so
-drwxr-xr-x root/root usr/lib/perl5/site_perl/5.8.7/linux/auto/APR/Finfo/
--r-xr-xr-x root/root usr/lib/perl5/site_perl/5.8.7/linux/auto/APR/Finfo/Finfo.so
-drwxr-xr-x root/root usr/lib/perl5/site_perl/5.8.7/linux/auto/APR/IpSubnet/
--r-xr-xr-x root/root usr/lib/perl5/site_perl/5.8.7/linux/auto/APR/IpSubnet/IpSubnet.so
-drwxr-xr-x root/root usr/lib/perl5/site_perl/5.8.7/linux/auto/APR/OS/
--r-xr-xr-x root/root usr/lib/perl5/site_perl/5.8.7/linux/auto/APR/OS/OS.so
-drwxr-xr-x root/root usr/lib/perl5/site_perl/5.8.7/linux/auto/APR/PerlIO/
--r-xr-xr-x root/root usr/lib/perl5/site_perl/5.8.7/linux/auto/APR/PerlIO/PerlIO.so
-drwxr-xr-x root/root usr/lib/perl5/site_perl/5.8.7/linux/auto/APR/Pool/
--r-xr-xr-x root/root usr/lib/perl5/site_perl/5.8.7/linux/auto/APR/Pool/Pool.so
-drwxr-xr-x root/root usr/lib/perl5/site_perl/5.8.7/linux/auto/APR/SockAddr/
--r-xr-xr-x root/root usr/lib/perl5/site_perl/5.8.7/linux/auto/APR/SockAddr/SockAddr.so
-drwxr-xr-x root/root usr/lib/perl5/site_perl/5.8.7/linux/auto/APR/Socket/
--r-xr-xr-x root/root usr/lib/perl5/site_perl/5.8.7/linux/auto/APR/Socket/Socket.so
-drwxr-xr-x root/root usr/lib/perl5/site_perl/5.8.7/linux/auto/APR/Status/
--r-xr-xr-x root/root usr/lib/perl5/site_perl/5.8.7/linux/auto/APR/Status/Status.so
-drwxr-xr-x root/root usr/lib/perl5/site_perl/5.8.7/linux/auto/APR/String/
--r-xr-xr-x root/root usr/lib/perl5/site_perl/5.8.7/linux/auto/APR/String/String.so
-drwxr-xr-x root/root usr/lib/perl5/site_perl/5.8.7/linux/auto/APR/Table/
--r-xr-xr-x root/root usr/lib/perl5/site_perl/5.8.7/linux/auto/APR/Table/Table.so
-drwxr-xr-x root/root usr/lib/perl5/site_perl/5.8.7/linux/auto/APR/ThreadMutex/
--r-xr-xr-x root/root usr/lib/perl5/site_perl/5.8.7/linux/auto/APR/ThreadMutex/ThreadMutex.so
-drwxr-xr-x root/root usr/lib/perl5/site_perl/5.8.7/linux/auto/APR/URI/
--r-xr-xr-x root/root usr/lib/perl5/site_perl/5.8.7/linux/auto/APR/URI/URI.so
-drwxr-xr-x root/root usr/lib/perl5/site_perl/5.8.7/linux/auto/APR/UUID/
--r-xr-xr-x root/root usr/lib/perl5/site_perl/5.8.7/linux/auto/APR/UUID/UUID.so
-drwxr-xr-x root/root usr/lib/perl5/site_perl/5.8.7/linux/auto/APR/Util/
--r-xr-xr-x root/root usr/lib/perl5/site_perl/5.8.7/linux/auto/APR/Util/Util.so
-drwxr-xr-x root/root usr/lib/perl5/site_perl/5.8.7/linux/auto/Apache2/
-drwxr-xr-x root/root usr/lib/perl5/site_perl/5.8.7/linux/auto/Apache2/Access/
--r-xr-xr-x root/root usr/lib/perl5/site_perl/5.8.7/linux/auto/Apache2/Access/Access.so
-drwxr-xr-x root/root usr/lib/perl5/site_perl/5.8.7/linux/auto/Apache2/Build/
--r--r--r-- root/root usr/lib/perl5/site_perl/5.8.7/linux/auto/Apache2/Build/autosplit.ix
-drwxr-xr-x root/root usr/lib/perl5/site_perl/5.8.7/linux/auto/Apache2/CmdParms/
--r-xr-xr-x root/root usr/lib/perl5/site_perl/5.8.7/linux/auto/Apache2/CmdParms/CmdParms.so
-drwxr-xr-x root/root usr/lib/perl5/site_perl/5.8.7/linux/auto/Apache2/Command/
--r-xr-xr-x root/root usr/lib/perl5/site_perl/5.8.7/linux/auto/Apache2/Command/Command.so
-drwxr-xr-x root/root usr/lib/perl5/site_perl/5.8.7/linux/auto/Apache2/Connection/
--r-xr-xr-x root/root usr/lib/perl5/site_perl/5.8.7/linux/auto/Apache2/Connection/Connection.so
-drwxr-xr-x root/root usr/lib/perl5/site_perl/5.8.7/linux/auto/Apache2/Const/
--r-xr-xr-x root/root usr/lib/perl5/site_perl/5.8.7/linux/auto/Apache2/Const/Const.so
-drwxr-xr-x root/root usr/lib/perl5/site_perl/5.8.7/linux/auto/Apache2/Directive/
--r-xr-xr-x root/root usr/lib/perl5/site_perl/5.8.7/linux/auto/Apache2/Directive/Directive.so
-drwxr-xr-x root/root usr/lib/perl5/site_perl/5.8.7/linux/auto/Apache2/Filter/
--r-xr-xr-x root/root usr/lib/perl5/site_perl/5.8.7/linux/auto/Apache2/Filter/Filter.so
-drwxr-xr-x root/root usr/lib/perl5/site_perl/5.8.7/linux/auto/Apache2/FilterRec/
--r-xr-xr-x root/root usr/lib/perl5/site_perl/5.8.7/linux/auto/Apache2/FilterRec/FilterRec.so
-drwxr-xr-x root/root usr/lib/perl5/site_perl/5.8.7/linux/auto/Apache2/HookRun/
--r-xr-xr-x root/root usr/lib/perl5/site_perl/5.8.7/linux/auto/Apache2/HookRun/HookRun.so
-drwxr-xr-x root/root usr/lib/perl5/site_perl/5.8.7/linux/auto/Apache2/Log/
--r-xr-xr-x root/root usr/lib/perl5/site_perl/5.8.7/linux/auto/Apache2/Log/Log.so
-drwxr-xr-x root/root usr/lib/perl5/site_perl/5.8.7/linux/auto/Apache2/MPM/
--r-xr-xr-x root/root usr/lib/perl5/site_perl/5.8.7/linux/auto/Apache2/MPM/MPM.so
-drwxr-xr-x root/root usr/lib/perl5/site_perl/5.8.7/linux/auto/Apache2/Module/
--r-xr-xr-x root/root usr/lib/perl5/site_perl/5.8.7/linux/auto/Apache2/Module/Module.so
-drwxr-xr-x root/root usr/lib/perl5/site_perl/5.8.7/linux/auto/Apache2/Process/
--r-xr-xr-x root/root usr/lib/perl5/site_perl/5.8.7/linux/auto/Apache2/Process/Process.so
-drwxr-xr-x root/root usr/lib/perl5/site_perl/5.8.7/linux/auto/Apache2/RequestIO/
--r-xr-xr-x root/root usr/lib/perl5/site_perl/5.8.7/linux/auto/Apache2/RequestIO/RequestIO.so
-drwxr-xr-x root/root usr/lib/perl5/site_perl/5.8.7/linux/auto/Apache2/RequestRec/
--r-xr-xr-x root/root usr/lib/perl5/site_perl/5.8.7/linux/auto/Apache2/RequestRec/RequestRec.so
-drwxr-xr-x root/root usr/lib/perl5/site_perl/5.8.7/linux/auto/Apache2/RequestUtil/
--r-xr-xr-x root/root usr/lib/perl5/site_perl/5.8.7/linux/auto/Apache2/RequestUtil/RequestUtil.so
-drwxr-xr-x root/root usr/lib/perl5/site_perl/5.8.7/linux/auto/Apache2/Response/
--r-xr-xr-x root/root usr/lib/perl5/site_perl/5.8.7/linux/auto/Apache2/Response/Response.so
-drwxr-xr-x root/root usr/lib/perl5/site_perl/5.8.7/linux/auto/Apache2/ServerRec/
--r-xr-xr-x root/root usr/lib/perl5/site_perl/5.8.7/linux/auto/Apache2/ServerRec/ServerRec.so
-drwxr-xr-x root/root usr/lib/perl5/site_perl/5.8.7/linux/auto/Apache2/ServerUtil/
--r-xr-xr-x root/root usr/lib/perl5/site_perl/5.8.7/linux/auto/Apache2/ServerUtil/ServerUtil.so
-drwxr-xr-x root/root usr/lib/perl5/site_perl/5.8.7/linux/auto/Apache2/SubProcess/
--r-xr-xr-x root/root usr/lib/perl5/site_perl/5.8.7/linux/auto/Apache2/SubProcess/SubProcess.so
-drwxr-xr-x root/root usr/lib/perl5/site_perl/5.8.7/linux/auto/Apache2/SubRequest/
--r-xr-xr-x root/root usr/lib/perl5/site_perl/5.8.7/linux/auto/Apache2/SubRequest/SubRequest.so
-drwxr-xr-x root/root usr/lib/perl5/site_perl/5.8.7/linux/auto/Apache2/URI/
--r-xr-xr-x root/root usr/lib/perl5/site_perl/5.8.7/linux/auto/Apache2/URI/URI.so
-drwxr-xr-x root/root usr/lib/perl5/site_perl/5.8.7/linux/auto/Apache2/Util/
--r-xr-xr-x root/root usr/lib/perl5/site_perl/5.8.7/linux/auto/Apache2/Util/Util.so
--r--r--r-- root/root usr/lib/perl5/site_perl/5.8.7/linux/auto/Apache2/typemap
-drwxr-xr-x root/root usr/lib/perl5/site_perl/5.8.7/linux/auto/ModPerl/
-drwxr-xr-x root/root usr/lib/perl5/site_perl/5.8.7/linux/auto/ModPerl/Const/
--r-xr-xr-x root/root usr/lib/perl5/site_perl/5.8.7/linux/auto/ModPerl/Const/Const.so
-drwxr-xr-x root/root usr/lib/perl5/site_perl/5.8.7/linux/auto/ModPerl/Global/
--r-xr-xr-x root/root usr/lib/perl5/site_perl/5.8.7/linux/auto/ModPerl/Global/Global.so
-drwxr-xr-x root/root usr/lib/perl5/site_perl/5.8.7/linux/auto/ModPerl/Util/
--r-xr-xr-x root/root usr/lib/perl5/site_perl/5.8.7/linux/auto/ModPerl/Util/Util.so
--r--r--r-- root/root usr/lib/perl5/site_perl/5.8.7/linux/mod_perl2.pm
+drwxr-xr-x root/root usr/lib/perl5/site_perl/5.8.8/
+drwxr-xr-x root/root usr/lib/perl5/site_perl/5.8.8/linux/
+-r--r--r-- root/root usr/lib/perl5/site_perl/5.8.8/linux/APR.pm
+drwxr-xr-x root/root usr/lib/perl5/site_perl/5.8.8/linux/APR/
+-r--r--r-- root/root usr/lib/perl5/site_perl/5.8.8/linux/APR/Base64.pm
+-r--r--r-- root/root usr/lib/perl5/site_perl/5.8.8/linux/APR/Brigade.pm
+-r--r--r-- root/root usr/lib/perl5/site_perl/5.8.8/linux/APR/Bucket.pm
+-r--r--r-- root/root usr/lib/perl5/site_perl/5.8.8/linux/APR/BucketAlloc.pm
+-r--r--r-- root/root usr/lib/perl5/site_perl/5.8.8/linux/APR/BucketType.pm
+-r--r--r-- root/root usr/lib/perl5/site_perl/5.8.8/linux/APR/Const.pm
+-r--r--r-- root/root usr/lib/perl5/site_perl/5.8.8/linux/APR/Date.pm
+-r--r--r-- root/root usr/lib/perl5/site_perl/5.8.8/linux/APR/Error.pm
+-r--r--r-- root/root usr/lib/perl5/site_perl/5.8.8/linux/APR/Finfo.pm
+-r--r--r-- root/root usr/lib/perl5/site_perl/5.8.8/linux/APR/IpSubnet.pm
+-r--r--r-- root/root usr/lib/perl5/site_perl/5.8.8/linux/APR/OS.pm
+-r--r--r-- root/root usr/lib/perl5/site_perl/5.8.8/linux/APR/PerlIO.pm
+-r--r--r-- root/root usr/lib/perl5/site_perl/5.8.8/linux/APR/Pool.pm
+-r--r--r-- root/root usr/lib/perl5/site_perl/5.8.8/linux/APR/SockAddr.pm
+-r--r--r-- root/root usr/lib/perl5/site_perl/5.8.8/linux/APR/Socket.pm
+-r--r--r-- root/root usr/lib/perl5/site_perl/5.8.8/linux/APR/Status.pm
+-r--r--r-- root/root usr/lib/perl5/site_perl/5.8.8/linux/APR/String.pm
+-r--r--r-- root/root usr/lib/perl5/site_perl/5.8.8/linux/APR/Table.pm
+-r--r--r-- root/root usr/lib/perl5/site_perl/5.8.8/linux/APR/ThreadMutex.pm
+-r--r--r-- root/root usr/lib/perl5/site_perl/5.8.8/linux/APR/URI.pm
+-r--r--r-- root/root usr/lib/perl5/site_perl/5.8.8/linux/APR/UUID.pm
+-r--r--r-- root/root usr/lib/perl5/site_perl/5.8.8/linux/APR/Util.pm
+-r--r--r-- root/root usr/lib/perl5/site_perl/5.8.8/linux/APR/XSLoader.pm
+drwxr-xr-x root/root usr/lib/perl5/site_perl/5.8.8/linux/Apache2/
+-r--r--r-- root/root usr/lib/perl5/site_perl/5.8.8/linux/Apache2/Access.pm
+-r--r--r-- root/root usr/lib/perl5/site_perl/5.8.8/linux/Apache2/Build.pm
+-r--r--r-- root/root usr/lib/perl5/site_perl/5.8.8/linux/Apache2/BuildConfig.pm
+-r--r--r-- root/root usr/lib/perl5/site_perl/5.8.8/linux/Apache2/CmdParms.pm
+-r--r--r-- root/root usr/lib/perl5/site_perl/5.8.8/linux/Apache2/Command.pm
+-r--r--r-- root/root usr/lib/perl5/site_perl/5.8.8/linux/Apache2/Connection.pm
+-r--r--r-- root/root usr/lib/perl5/site_perl/5.8.8/linux/Apache2/Const.pm
+-r--r--r-- root/root usr/lib/perl5/site_perl/5.8.8/linux/Apache2/Directive.pm
+-r--r--r-- root/root usr/lib/perl5/site_perl/5.8.8/linux/Apache2/Filter.pm
+-r--r--r-- root/root usr/lib/perl5/site_perl/5.8.8/linux/Apache2/FilterRec.pm
+-r--r--r-- root/root usr/lib/perl5/site_perl/5.8.8/linux/Apache2/HookRun.pm
+-r--r--r-- root/root usr/lib/perl5/site_perl/5.8.8/linux/Apache2/Log.pm
+-r--r--r-- root/root usr/lib/perl5/site_perl/5.8.8/linux/Apache2/MPM.pm
+-r--r--r-- root/root usr/lib/perl5/site_perl/5.8.8/linux/Apache2/Module.pm
+-r--r--r-- root/root usr/lib/perl5/site_perl/5.8.8/linux/Apache2/ParseSource.pm
+-r--r--r-- root/root usr/lib/perl5/site_perl/5.8.8/linux/Apache2/PerlSections.pm
+drwxr-xr-x root/root usr/lib/perl5/site_perl/5.8.8/linux/Apache2/PerlSections/
+-r--r--r-- root/root usr/lib/perl5/site_perl/5.8.8/linux/Apache2/PerlSections/Dump.pm
+-r--r--r-- root/root usr/lib/perl5/site_perl/5.8.8/linux/Apache2/Process.pm
+-r--r--r-- root/root usr/lib/perl5/site_perl/5.8.8/linux/Apache2/Reload.pm
+-r--r--r-- root/root usr/lib/perl5/site_perl/5.8.8/linux/Apache2/RequestIO.pm
+-r--r--r-- root/root usr/lib/perl5/site_perl/5.8.8/linux/Apache2/RequestRec.pm
+-r--r--r-- root/root usr/lib/perl5/site_perl/5.8.8/linux/Apache2/RequestUtil.pm
+-r--r--r-- root/root usr/lib/perl5/site_perl/5.8.8/linux/Apache2/Resource.pm
+-r--r--r-- root/root usr/lib/perl5/site_perl/5.8.8/linux/Apache2/Response.pm
+-r--r--r-- root/root usr/lib/perl5/site_perl/5.8.8/linux/Apache2/ServerRec.pm
+-r--r--r-- root/root usr/lib/perl5/site_perl/5.8.8/linux/Apache2/ServerUtil.pm
+-r--r--r-- root/root usr/lib/perl5/site_perl/5.8.8/linux/Apache2/SizeLimit.pm
+-r--r--r-- root/root usr/lib/perl5/site_perl/5.8.8/linux/Apache2/SourceTables.pm
+-r--r--r-- root/root usr/lib/perl5/site_perl/5.8.8/linux/Apache2/Status.pm
+-r--r--r-- root/root usr/lib/perl5/site_perl/5.8.8/linux/Apache2/SubProcess.pm
+-r--r--r-- root/root usr/lib/perl5/site_perl/5.8.8/linux/Apache2/SubRequest.pm
+-r--r--r-- root/root usr/lib/perl5/site_perl/5.8.8/linux/Apache2/URI.pm
+-r--r--r-- root/root usr/lib/perl5/site_perl/5.8.8/linux/Apache2/Util.pm
+-r--r--r-- root/root usr/lib/perl5/site_perl/5.8.8/linux/Apache2/XSLoader.pm
+-r--r--r-- root/root usr/lib/perl5/site_perl/5.8.8/linux/Apache2/compat.pm
+-r--r--r-- root/root usr/lib/perl5/site_perl/5.8.8/linux/Apache2/porting.pm
+drwxr-xr-x root/root usr/lib/perl5/site_perl/5.8.8/linux/ModPerl/
+-r--r--r-- root/root usr/lib/perl5/site_perl/5.8.8/linux/ModPerl/BuildMM.pm
+-r--r--r-- root/root usr/lib/perl5/site_perl/5.8.8/linux/ModPerl/BuildOptions.pm
+-r--r--r-- root/root usr/lib/perl5/site_perl/5.8.8/linux/ModPerl/CScan.pm
+-r--r--r-- root/root usr/lib/perl5/site_perl/5.8.8/linux/ModPerl/Code.pm
+-r--r--r-- root/root usr/lib/perl5/site_perl/5.8.8/linux/ModPerl/Config.pm
+-r--r--r-- root/root usr/lib/perl5/site_perl/5.8.8/linux/ModPerl/Const.pm
+-r--r--r-- root/root usr/lib/perl5/site_perl/5.8.8/linux/ModPerl/FunctionMap.pm
+-r--r--r-- root/root usr/lib/perl5/site_perl/5.8.8/linux/ModPerl/Global.pm
+-r--r--r-- root/root usr/lib/perl5/site_perl/5.8.8/linux/ModPerl/MM.pm
+-r--r--r-- root/root usr/lib/perl5/site_perl/5.8.8/linux/ModPerl/Manifest.pm
+-r--r--r-- root/root usr/lib/perl5/site_perl/5.8.8/linux/ModPerl/MapUtil.pm
+-r--r--r-- root/root usr/lib/perl5/site_perl/5.8.8/linux/ModPerl/MethodLookup.pm
+-r--r--r-- root/root usr/lib/perl5/site_perl/5.8.8/linux/ModPerl/ParseSource.pm
+-r--r--r-- root/root usr/lib/perl5/site_perl/5.8.8/linux/ModPerl/PerlRun.pm
+-r--r--r-- root/root usr/lib/perl5/site_perl/5.8.8/linux/ModPerl/PerlRunPrefork.pm
+-r--r--r-- root/root usr/lib/perl5/site_perl/5.8.8/linux/ModPerl/Registry.pm
+-r--r--r-- root/root usr/lib/perl5/site_perl/5.8.8/linux/ModPerl/RegistryBB.pm
+-r--r--r-- root/root usr/lib/perl5/site_perl/5.8.8/linux/ModPerl/RegistryCooker.pm
+-r--r--r-- root/root usr/lib/perl5/site_perl/5.8.8/linux/ModPerl/RegistryLoader.pm
+-r--r--r-- root/root usr/lib/perl5/site_perl/5.8.8/linux/ModPerl/RegistryPrefork.pm
+-r--r--r-- root/root usr/lib/perl5/site_perl/5.8.8/linux/ModPerl/StructureMap.pm
+-r--r--r-- root/root usr/lib/perl5/site_perl/5.8.8/linux/ModPerl/TestReport.pm
+-r--r--r-- root/root usr/lib/perl5/site_perl/5.8.8/linux/ModPerl/TestRun.pm
+-r--r--r-- root/root usr/lib/perl5/site_perl/5.8.8/linux/ModPerl/TypeMap.pm
+-r--r--r-- root/root usr/lib/perl5/site_perl/5.8.8/linux/ModPerl/Util.pm
+-r--r--r-- root/root usr/lib/perl5/site_perl/5.8.8/linux/ModPerl/WrapXS.pm
+drwxr-xr-x root/root usr/lib/perl5/site_perl/5.8.8/linux/auto/
+drwxr-xr-x root/root usr/lib/perl5/site_perl/5.8.8/linux/auto/APR/
+-r-xr-xr-x root/root usr/lib/perl5/site_perl/5.8.8/linux/auto/APR/APR.so
+drwxr-xr-x root/root usr/lib/perl5/site_perl/5.8.8/linux/auto/APR/Base64/
+-r-xr-xr-x root/root usr/lib/perl5/site_perl/5.8.8/linux/auto/APR/Base64/Base64.so
+drwxr-xr-x root/root usr/lib/perl5/site_perl/5.8.8/linux/auto/APR/Brigade/
+-r-xr-xr-x root/root usr/lib/perl5/site_perl/5.8.8/linux/auto/APR/Brigade/Brigade.so
+drwxr-xr-x root/root usr/lib/perl5/site_perl/5.8.8/linux/auto/APR/Bucket/
+-r-xr-xr-x root/root usr/lib/perl5/site_perl/5.8.8/linux/auto/APR/Bucket/Bucket.so
+drwxr-xr-x root/root usr/lib/perl5/site_perl/5.8.8/linux/auto/APR/BucketAlloc/
+-r-xr-xr-x root/root usr/lib/perl5/site_perl/5.8.8/linux/auto/APR/BucketAlloc/BucketAlloc.so
+drwxr-xr-x root/root usr/lib/perl5/site_perl/5.8.8/linux/auto/APR/BucketType/
+-r-xr-xr-x root/root usr/lib/perl5/site_perl/5.8.8/linux/auto/APR/BucketType/BucketType.so
+drwxr-xr-x root/root usr/lib/perl5/site_perl/5.8.8/linux/auto/APR/Const/
+-r-xr-xr-x root/root usr/lib/perl5/site_perl/5.8.8/linux/auto/APR/Const/Const.so
+drwxr-xr-x root/root usr/lib/perl5/site_perl/5.8.8/linux/auto/APR/Date/
+-r-xr-xr-x root/root usr/lib/perl5/site_perl/5.8.8/linux/auto/APR/Date/Date.so
+drwxr-xr-x root/root usr/lib/perl5/site_perl/5.8.8/linux/auto/APR/Error/
+-r-xr-xr-x root/root usr/lib/perl5/site_perl/5.8.8/linux/auto/APR/Error/Error.so
+drwxr-xr-x root/root usr/lib/perl5/site_perl/5.8.8/linux/auto/APR/Finfo/
+-r-xr-xr-x root/root usr/lib/perl5/site_perl/5.8.8/linux/auto/APR/Finfo/Finfo.so
+drwxr-xr-x root/root usr/lib/perl5/site_perl/5.8.8/linux/auto/APR/IpSubnet/
+-r-xr-xr-x root/root usr/lib/perl5/site_perl/5.8.8/linux/auto/APR/IpSubnet/IpSubnet.so
+drwxr-xr-x root/root usr/lib/perl5/site_perl/5.8.8/linux/auto/APR/OS/
+-r-xr-xr-x root/root usr/lib/perl5/site_perl/5.8.8/linux/auto/APR/OS/OS.so
+drwxr-xr-x root/root usr/lib/perl5/site_perl/5.8.8/linux/auto/APR/PerlIO/
+-r-xr-xr-x root/root usr/lib/perl5/site_perl/5.8.8/linux/auto/APR/PerlIO/PerlIO.so
+drwxr-xr-x root/root usr/lib/perl5/site_perl/5.8.8/linux/auto/APR/Pool/
+-r-xr-xr-x root/root usr/lib/perl5/site_perl/5.8.8/linux/auto/APR/Pool/Pool.so
+drwxr-xr-x root/root usr/lib/perl5/site_perl/5.8.8/linux/auto/APR/SockAddr/
+-r-xr-xr-x root/root usr/lib/perl5/site_perl/5.8.8/linux/auto/APR/SockAddr/SockAddr.so
+drwxr-xr-x root/root usr/lib/perl5/site_perl/5.8.8/linux/auto/APR/Socket/
+-r-xr-xr-x root/root usr/lib/perl5/site_perl/5.8.8/linux/auto/APR/Socket/Socket.so
+drwxr-xr-x root/root usr/lib/perl5/site_perl/5.8.8/linux/auto/APR/Status/
+-r-xr-xr-x root/root usr/lib/perl5/site_perl/5.8.8/linux/auto/APR/Status/Status.so
+drwxr-xr-x root/root usr/lib/perl5/site_perl/5.8.8/linux/auto/APR/String/
+-r-xr-xr-x root/root usr/lib/perl5/site_perl/5.8.8/linux/auto/APR/String/String.so
+drwxr-xr-x root/root usr/lib/perl5/site_perl/5.8.8/linux/auto/APR/Table/
+-r-xr-xr-x root/root usr/lib/perl5/site_perl/5.8.8/linux/auto/APR/Table/Table.so
+drwxr-xr-x root/root usr/lib/perl5/site_perl/5.8.8/linux/auto/APR/ThreadMutex/
+-r-xr-xr-x root/root usr/lib/perl5/site_perl/5.8.8/linux/auto/APR/ThreadMutex/ThreadMutex.so
+drwxr-xr-x root/root usr/lib/perl5/site_perl/5.8.8/linux/auto/APR/URI/
+-r-xr-xr-x root/root usr/lib/perl5/site_perl/5.8.8/linux/auto/APR/URI/URI.so
+drwxr-xr-x root/root usr/lib/perl5/site_perl/5.8.8/linux/auto/APR/UUID/
+-r-xr-xr-x root/root usr/lib/perl5/site_perl/5.8.8/linux/auto/APR/UUID/UUID.so
+drwxr-xr-x root/root usr/lib/perl5/site_perl/5.8.8/linux/auto/APR/Util/
+-r-xr-xr-x root/root usr/lib/perl5/site_perl/5.8.8/linux/auto/APR/Util/Util.so
+drwxr-xr-x root/root usr/lib/perl5/site_perl/5.8.8/linux/auto/Apache2/
+drwxr-xr-x root/root usr/lib/perl5/site_perl/5.8.8/linux/auto/Apache2/Access/
+-r-xr-xr-x root/root usr/lib/perl5/site_perl/5.8.8/linux/auto/Apache2/Access/Access.so
+drwxr-xr-x root/root usr/lib/perl5/site_perl/5.8.8/linux/auto/Apache2/Build/
+-r--r--r-- root/root usr/lib/perl5/site_perl/5.8.8/linux/auto/Apache2/Build/autosplit.ix
+drwxr-xr-x root/root usr/lib/perl5/site_perl/5.8.8/linux/auto/Apache2/CmdParms/
+-r-xr-xr-x root/root usr/lib/perl5/site_perl/5.8.8/linux/auto/Apache2/CmdParms/CmdParms.so
+drwxr-xr-x root/root usr/lib/perl5/site_perl/5.8.8/linux/auto/Apache2/Command/
+-r-xr-xr-x root/root usr/lib/perl5/site_perl/5.8.8/linux/auto/Apache2/Command/Command.so
+drwxr-xr-x root/root usr/lib/perl5/site_perl/5.8.8/linux/auto/Apache2/Connection/
+-r-xr-xr-x root/root usr/lib/perl5/site_perl/5.8.8/linux/auto/Apache2/Connection/Connection.so
+drwxr-xr-x root/root usr/lib/perl5/site_perl/5.8.8/linux/auto/Apache2/Const/
+-r-xr-xr-x root/root usr/lib/perl5/site_perl/5.8.8/linux/auto/Apache2/Const/Const.so
+drwxr-xr-x root/root usr/lib/perl5/site_perl/5.8.8/linux/auto/Apache2/Directive/
+-r-xr-xr-x root/root usr/lib/perl5/site_perl/5.8.8/linux/auto/Apache2/Directive/Directive.so
+drwxr-xr-x root/root usr/lib/perl5/site_perl/5.8.8/linux/auto/Apache2/Filter/
+-r-xr-xr-x root/root usr/lib/perl5/site_perl/5.8.8/linux/auto/Apache2/Filter/Filter.so
+drwxr-xr-x root/root usr/lib/perl5/site_perl/5.8.8/linux/auto/Apache2/FilterRec/
+-r-xr-xr-x root/root usr/lib/perl5/site_perl/5.8.8/linux/auto/Apache2/FilterRec/FilterRec.so
+drwxr-xr-x root/root usr/lib/perl5/site_perl/5.8.8/linux/auto/Apache2/HookRun/
+-r-xr-xr-x root/root usr/lib/perl5/site_perl/5.8.8/linux/auto/Apache2/HookRun/HookRun.so
+drwxr-xr-x root/root usr/lib/perl5/site_perl/5.8.8/linux/auto/Apache2/Log/
+-r-xr-xr-x root/root usr/lib/perl5/site_perl/5.8.8/linux/auto/Apache2/Log/Log.so
+drwxr-xr-x root/root usr/lib/perl5/site_perl/5.8.8/linux/auto/Apache2/MPM/
+-r-xr-xr-x root/root usr/lib/perl5/site_perl/5.8.8/linux/auto/Apache2/MPM/MPM.so
+drwxr-xr-x root/root usr/lib/perl5/site_perl/5.8.8/linux/auto/Apache2/Module/
+-r-xr-xr-x root/root usr/lib/perl5/site_perl/5.8.8/linux/auto/Apache2/Module/Module.so
+drwxr-xr-x root/root usr/lib/perl5/site_perl/5.8.8/linux/auto/Apache2/Process/
+-r-xr-xr-x root/root usr/lib/perl5/site_perl/5.8.8/linux/auto/Apache2/Process/Process.so
+drwxr-xr-x root/root usr/lib/perl5/site_perl/5.8.8/linux/auto/Apache2/RequestIO/
+-r-xr-xr-x root/root usr/lib/perl5/site_perl/5.8.8/linux/auto/Apache2/RequestIO/RequestIO.so
+drwxr-xr-x root/root usr/lib/perl5/site_perl/5.8.8/linux/auto/Apache2/RequestRec/
+-r-xr-xr-x root/root usr/lib/perl5/site_perl/5.8.8/linux/auto/Apache2/RequestRec/RequestRec.so
+drwxr-xr-x root/root usr/lib/perl5/site_perl/5.8.8/linux/auto/Apache2/RequestUtil/
+-r-xr-xr-x root/root usr/lib/perl5/site_perl/5.8.8/linux/auto/Apache2/RequestUtil/RequestUtil.so
+drwxr-xr-x root/root usr/lib/perl5/site_perl/5.8.8/linux/auto/Apache2/Response/
+-r-xr-xr-x root/root usr/lib/perl5/site_perl/5.8.8/linux/auto/Apache2/Response/Response.so
+drwxr-xr-x root/root usr/lib/perl5/site_perl/5.8.8/linux/auto/Apache2/ServerRec/
+-r-xr-xr-x root/root usr/lib/perl5/site_perl/5.8.8/linux/auto/Apache2/ServerRec/ServerRec.so
+drwxr-xr-x root/root usr/lib/perl5/site_perl/5.8.8/linux/auto/Apache2/ServerUtil/
+-r-xr-xr-x root/root usr/lib/perl5/site_perl/5.8.8/linux/auto/Apache2/ServerUtil/ServerUtil.so
+drwxr-xr-x root/root usr/lib/perl5/site_perl/5.8.8/linux/auto/Apache2/SubProcess/
+-r-xr-xr-x root/root usr/lib/perl5/site_perl/5.8.8/linux/auto/Apache2/SubProcess/SubProcess.so
+drwxr-xr-x root/root usr/lib/perl5/site_perl/5.8.8/linux/auto/Apache2/SubRequest/
+-r-xr-xr-x root/root usr/lib/perl5/site_perl/5.8.8/linux/auto/Apache2/SubRequest/SubRequest.so
+drwxr-xr-x root/root usr/lib/perl5/site_perl/5.8.8/linux/auto/Apache2/URI/
+-r-xr-xr-x root/root usr/lib/perl5/site_perl/5.8.8/linux/auto/Apache2/URI/URI.so
+drwxr-xr-x root/root usr/lib/perl5/site_perl/5.8.8/linux/auto/Apache2/Util/
+-r-xr-xr-x root/root usr/lib/perl5/site_perl/5.8.8/linux/auto/Apache2/Util/Util.so
+-r--r--r-- root/root usr/lib/perl5/site_perl/5.8.8/linux/auto/Apache2/typemap
+drwxr-xr-x root/root usr/lib/perl5/site_perl/5.8.8/linux/auto/ModPerl/
+drwxr-xr-x root/root usr/lib/perl5/site_perl/5.8.8/linux/auto/ModPerl/Const/
+-r-xr-xr-x root/root usr/lib/perl5/site_perl/5.8.8/linux/auto/ModPerl/Const/Const.so
+drwxr-xr-x root/root usr/lib/perl5/site_perl/5.8.8/linux/auto/ModPerl/Global/
+-r-xr-xr-x root/root usr/lib/perl5/site_perl/5.8.8/linux/auto/ModPerl/Global/Global.so
+drwxr-xr-x root/root usr/lib/perl5/site_perl/5.8.8/linux/auto/ModPerl/Util/
+-r-xr-xr-x root/root usr/lib/perl5/site_perl/5.8.8/linux/auto/ModPerl/Util/Util.so
+-r--r--r-- root/root usr/lib/perl5/site_perl/5.8.8/linux/mod_perl2.pm
drwxr-xr-x root/root usr/man/
drwxr-xr-x root/root usr/man/man3/
-r--r--r-- root/root usr/man/man3/APR.3pm.gz
diff --git a/mod_perl/Pkgfile b/mod_perl/Pkgfile
index d2ed220..7b1b568 100644
--- a/mod_perl/Pkgfile
+++ b/mod_perl/Pkgfile
@@ -6,7 +6,7 @@
name=mod_perl
version=2.0.2
-release=2
+release=3
source=(http://perl.apache.org/dist/$name-$version.tar.gz)
build(){
1
0
commit da0678bf69612f563225aa19d1bb01ec4cc7da34
Author: Simone Rota <sip(a)crux.nu>
Date: Thu Feb 23 19:17:02 2006 +0000
wvdial: fixed md5sum
diff --git a/wvdial/.md5sum b/wvdial/.md5sum
index b44b8de..09e12d7 100644
--- a/wvdial/.md5sum
+++ b/wvdial/.md5sum
@@ -1,3 +1,3 @@
-d084772c96db6c52371e36b29d95f332 wvdial-1.55.patch
-747b135ca909129a14c777cf53ed3df0 wvdial-1.55.tar.gz
+d084772c96db6c52371e36b29d95f332 wvdial-1.56.patch
+45097f269c7847266e121e4a0f362be9 wvdial-1.56.tar.gz
103230cb9926cb8f3f4d8dc8584f3b9c wvstreams-4.2.2.tar.gz
1
0
commit 91bf05ab490aa3785ff2aa81615636099e949427
Author: Simone Rota <sip(a)crux.nu>
Date: Thu Feb 23 18:45:58 2006 +0000
windowmaker: added gcc4 patch
diff --git a/windowmaker/.md5sum b/windowmaker/.md5sum
index c7c3735..666d9a5 100644
--- a/windowmaker/.md5sum
+++ b/windowmaker/.md5sum
@@ -1 +1,2 @@
aaac5421b686ed2d3e6ab65229c98097 WindowMaker-0.92.0.tar.bz2
+68d8e1b36c5cf4122c754a68d044b9cb windowmaker-0.92.0-gcc4.patch
diff --git a/windowmaker/Pkgfile b/windowmaker/Pkgfile
index 065ca97..dfa8623 100644
--- a/windowmaker/Pkgfile
+++ b/windowmaker/Pkgfile
@@ -5,11 +5,16 @@
name=windowmaker
version=0.92.0
-release=1
-source=(ftp://ftp.windowmaker.org/pub/source/release/WindowMaker-$version.tar.bz2)
+release=2
+source=(ftp://ftp.windowmaker.org/pub/source/release/WindowMaker-$version.tar.bz2 \
+ $name-$version-gcc4.patch)
build() {
cd WindowMaker-$version
+ patch -p0 < ../$name-$version-gcc4.patch
+ aclocal
+ autoconf
+ automake -a
./configure --prefix=/usr
make
make DESTDIR=$PKG install
diff --git a/windowmaker/windowmaker-0.92.0-gcc4.patch b/windowmaker/windowmaker-0.92.0-gcc4.patch
new file mode 100644
index 0000000..6001a08
--- /dev/null
+++ b/windowmaker/windowmaker-0.92.0-gcc4.patch
@@ -0,0 +1,141 @@
+--- configure.ac
++++ configure.ac
+@@ -197,7 +197,7 @@
+
+ AC_CACHE_CHECK(whether gcc supports x86 inline asm,
+ ac_cv_c_inline_asm,
+- [AC_TRY_LINK(,[{int x; asm volatile("movl %%eax, %%ebx\n"::
++ [AC_TRY_LINK(,[{int x; asm volatile("movl %%eax, %%ebx\n\t pushal\n\t popal"::
+ "m" (x),"m" (x),"m" (x),"m" (x),"m" (x),"m" (x),
+ "m" (x),"m" (x),"m" (x),"m" (x),"m" (x),"m" (x));}],
+ ac_cv_c_inline_asm=yes,
+--- wrlib/x86_specific.c
++++ wrlib/x86_specific.c
+@@ -98,15 +98,23 @@
+ int height,
+ int line_offset)
+ {
+- long long rrggbbaa;
+- long long pixel;
++ union {
++ long long rrggbbaa;
++ struct {short int rr, gg, bb, aa;} words;
++ } rrggbbaa;
++
++ union {
++ long long pixel;
++ struct {short int rr, gg, bb, aa;} words;
++ } pixel;
++
+ short *tmp_err;
+ short *tmp_nerr;
+ int x;
+
+ asm volatile
+ (
+- "pushal \n\t"
++ "pushl %%ebx \n\t"
+
+ // pack dr, dg and db into mm6
+ "movl %7, %%eax \n\t"
+@@ -290,7 +298,7 @@
+
+ ".Enda: \n\t" // THE END
+ "emms \n\t"
+- "popal \n\t"
++ "popl %%ebx \n\t"
+ :
+ :
+ "m" (image), // %0
+@@ -309,17 +317,18 @@
+ "m" (width), // %13
+ "m" (height), // %14
+ "m" (line_offset), // %15
+- "m" (rrggbbaa), // %16 (access to rr)
+- "m" ((*((short*)(&rrggbbaa)+1))), // %17 (access to gg)
+- "m" ((*((short*)(&rrggbbaa)+2))), // %18 (access to bb)
+- "m" ((*((short*)(&rrggbbaa)+3))), // %19 (access to aa)
+- "m" (pixel), // %20 (access to pixel.r)
+- "m" ((*((short*)(&pixel)+1))), // %21 (access to pixel.g)
+- "m" ((*((short*)(&pixel)+2))), // %22 (access to pixel.b)
+- "m" ((*((short*)(&pixel)+3))), // %23 (access to pixel.a)
++ "m" (rrggbbaa.rrggbbaa), // %16 (access to rr)
++ "m" (rrggbbaa.words.gg), // %17 (access to gg)
++ "m" (rrggbbaa.words.bb), // %18 (access to bb)
++ "m" (rrggbbaa.words.aa), // %19 (access to aa)
++ "m" (pixel.pixel), // %20 (access to pixel.r)
++ "m" (pixel.words.gg), // %21 (access to pixel.g)
++ "m" (pixel.words.bb), // %22 (access to pixel.b)
++ "m" (pixel.words.aa), // %23 (access to pixel.a)
+ "m" (tmp_err), // %24
+ "m" (tmp_nerr), // %25
+ "m" (x) // %26
++ : "eax", "ecx", "edx", "esi", "edi"
+ );
+ }
+
+@@ -342,8 +351,15 @@
+ int height,
+ int line_offset)
+ {
+- long long rrggbbaa;
+- long long pixel;
++ union {
++ long long rrggbbaa;
++ struct {short int rr, gg, bb, aa;} words;
++ } rrggbbaa;
++
++ union {
++ long long pixel;
++ struct {short int rr, gg, bb, aa;} words;
++ } pixel;
+
+ short *tmp_err;
+ short *tmp_nerr;
+@@ -354,7 +370,7 @@
+
+ asm volatile
+ (
+- "pushal \n\t"
++ "pushl %%ebx \n\t"
+
+ "movl %13, %%eax \n\t" // eax = width
+ "movl %%eax, %%ebx \n\t"
+@@ -424,7 +440,7 @@
+
+ ".Endc: \n\t" // THE END
+ "emms \n\t"
+- "popal \n\t"
++ "popl %%ebx \n\t"
+ :
+ :
+ "m" (image), // %0
+@@ -443,19 +459,20 @@
+ "m" (width), // %13
+ "m" (height), // %14
+ "m" (line_offset), // %15
+- "m" (rrggbbaa), // %16 (access to rr)
+- "m" ((*((short*)(&rrggbbaa)+1))), // %17 (access to gg)
+- "m" ((*((short*)(&rrggbbaa)+2))), // %18 (access to bb)
+- "m" ((*((short*)(&rrggbbaa)+3))), // %19 (access to aa)
+- "m" (pixel), // %20 (access to pixel.r)
+- "m" ((*((short*)(&pixel)+1))), // %21 (access to pixel.g)
+- "m" ((*((short*)(&pixel)+2))), // %22 (access to pixel.b)
+- "m" ((*((short*)(&pixel)+3))), // %23 (access to pixel.a)
++ "m" (rrggbbaa.rrggbbaa), // %16 (access to rr)
++ "m" (rrggbbaa.words.gg), // %17 (access to gg)
++ "m" (rrggbbaa.words.bb), // %18 (access to bb)
++ "m" (rrggbbaa.words.aa), // %19 (access to aa)
++ "m" (pixel.pixel), // %20 (access to pixel.r)
++ "m" (pixel.words.gg), // %21 (access to pixel.g)
++ "m" (pixel.words.bb), // %22 (access to pixel.b)
++ "m" (pixel.words.aa), // %23 (access to pixel.a)
+ "m" (tmp_err), // %24
+ "m" (tmp_nerr), // %25
+ "m" (x), // %26
+ "m" (w1), // %27
+ "m" (w2) // %28
++ : "eax", "ecx", "edx", "esi", "edi"
+ );
+ }
+
1
0
ports/opt (master): Updated libsndfile, xscreensaver. Added new ports madwifi and sharutils. Pulled jack down from attic.
by crux@crux.nu 19 May '07
by crux@crux.nu 19 May '07
19 May '07
commit d0a0934de94604d7827d8d05c62af4277cbf8887
Author: Jason Thomas Dolan <jay(a)jaydolan.com>
Date: Thu Feb 23 18:45:10 2006 +0000
Updated libsndfile, xscreensaver. Added new ports madwifi and sharutils. Pulled jack down from attic.
diff --git a/audiofile/Pkgfile b/audiofile/Pkgfile
index 11bafb4..499093e 100644
--- a/audiofile/Pkgfile
+++ b/audiofile/Pkgfile
@@ -7,7 +7,7 @@
name=audiofile
version=0.2.6
release=1
-source=(http://www.68k.org/~michael/audiofile/$name-$version.tar.gz)
+source=(http://www.68k.org/~michael/$name/$name-$version.tar.gz)
build () {
cd $name-$version
diff --git a/jack/.footprint b/jack/.footprint
new file mode 100644
index 0000000..121aa52
--- /dev/null
+++ b/jack/.footprint
@@ -0,0 +1,49 @@
+drwxr-xr-x root/root usr/
+drwxr-xr-x root/root usr/bin/
+-rwxr-xr-x root/root usr/bin/jack_bufsize
+-rwxr-xr-x root/root usr/bin/jack_connect
+-rwxr-xr-x root/root usr/bin/jack_disconnect
+-rwxr-xr-x root/root usr/bin/jack_freewheel
+-rwxr-xr-x root/root usr/bin/jack_impulse_grabber
+-rwxr-xr-x root/root usr/bin/jack_load
+-rwxr-xr-x root/root usr/bin/jack_lsp
+-rwxr-xr-x root/root usr/bin/jack_metro
+-rwxr-xr-x root/root usr/bin/jack_monitor_client
+-rwxr-xr-x root/root usr/bin/jack_showtime
+-rwxr-xr-x root/root usr/bin/jack_simple_client
+-rwxr-xr-x root/root usr/bin/jack_transport
+-rwxr-xr-x root/root usr/bin/jack_unload
+-rwxr-xr-x root/root usr/bin/jackd
+-rwxr-xr-x root/root usr/bin/jackrec
+drwxr-xr-x root/root usr/include/
+drwxr-xr-x root/root usr/include/jack/
+-rw-r--r-- root/root usr/include/jack/intclient.h
+-rw-r--r-- root/root usr/include/jack/jack.h
+-rw-r--r-- root/root usr/include/jack/ringbuffer.h
+-rw-r--r-- root/root usr/include/jack/statistics.h
+-rw-r--r-- root/root usr/include/jack/thread.h
+-rw-r--r-- root/root usr/include/jack/timestamps.h
+-rw-r--r-- root/root usr/include/jack/transport.h
+-rw-r--r-- root/root usr/include/jack/types.h
+drwxr-xr-x root/root usr/lib/
+drwxr-xr-x root/root usr/lib/jack/
+-rwxr-xr-x root/root usr/lib/jack/inprocess.la
+-rwxr-xr-x root/root usr/lib/jack/inprocess.so
+-rwxr-xr-x root/root usr/lib/jack/intime.la
+-rwxr-xr-x root/root usr/lib/jack/intime.so
+-rwxr-xr-x root/root usr/lib/jack/jack_alsa.la
+-rwxr-xr-x root/root usr/lib/jack/jack_alsa.so
+-rwxr-xr-x root/root usr/lib/jack/jack_dummy.la
+-rwxr-xr-x root/root usr/lib/jack/jack_dummy.so
+-rwxr-xr-x root/root usr/lib/jack/jack_oss.la
+-rwxr-xr-x root/root usr/lib/jack/jack_oss.so
+-rwxr-xr-x root/root usr/lib/libjack.la
+lrwxrwxrwx root/root usr/lib/libjack.so -> libjack.so.0.0.23
+lrwxrwxrwx root/root usr/lib/libjack.so.0 -> libjack.so.0.0.23
+-rwxr-xr-x root/root usr/lib/libjack.so.0.0.23
+drwxr-xr-x root/root usr/lib/pkgconfig/
+-rw-r--r-- root/root usr/lib/pkgconfig/jack.pc
+drwxr-xr-x root/root usr/man/
+drwxr-xr-x root/root usr/man/man1/
+-rw-r--r-- root/root usr/man/man1/jackd.1.gz
+-rw-r--r-- root/root usr/man/man1/jackstart.1.gz
diff --git a/jack/.md5sum b/jack/.md5sum
new file mode 100644
index 0000000..bf2f3e1
--- /dev/null
+++ b/jack/.md5sum
@@ -0,0 +1 @@
+dc28b3e8a663c090227e83be6fc1f2d4 jack-audio-connection-kit-0.100.0.tar.gz
diff --git a/jack/Pkgfile b/jack/Pkgfile
new file mode 100644
index 0000000..10e6a4c
--- /dev/null
+++ b/jack/Pkgfile
@@ -0,0 +1,15 @@
+# Maintainer: Jay Dolan jasonthomasdolan at yahoo dot com
+# Description: Jack Audio Connection Kit
+# Url: http://jackit.sf.net
+# Depends on: alsa-lib,libsndfile
+
+name=jack
+version=0.100.0
+release=1
+source=(http://dl.sf.net/jackit/$name-audio-connection-kit-$version.tar.gz)
+
+build(){
+ cd $name-audio-connection-kit-$version
+ ./configure --prefix=/usr --with-gnu-ld
+ make && make DESTDIR=$PKG install
+}
diff --git a/jack/README b/jack/README
new file mode 100644
index 0000000..227ccb2
--- /dev/null
+++ b/jack/README
@@ -0,0 +1,21 @@
+Jack - Audio Connection Kit
+
+NOTES
+
+Jack is a versatile, high-performance sound server. It is geared
+towards music professionals, and offers excellent low-latency
+operation when properly configured.
+
+Jack works best with, but does not require, a low-latency patched
+kernel. To obtain a patch for your kernel, see:
+
+ http://members.optusnet.com.au/ckolivas/kernel
+
+If you are using a patched kernel and wish to run jackd as a
+non-priviliged user, consider launching the jack daemon with:
+
+ schedtool -I -e jackd [options]
+
+This will allow jackd to run in near real-time, to provide
+minimum latency, without starving other processes.
+
diff --git a/libsndfile/.footprint b/libsndfile/.footprint
index c74568e..65cf57c 100644
--- a/libsndfile/.footprint
+++ b/libsndfile/.footprint
@@ -9,9 +9,9 @@ drwxr-xr-x root/root usr/include/
drwxr-xr-x root/root usr/lib/
-rw-r--r-- root/root usr/lib/libsndfile.a
-rwxr-xr-x root/root usr/lib/libsndfile.la
-lrwxrwxrwx root/root usr/lib/libsndfile.so -> libsndfile.so.1.0.12
-lrwxrwxrwx root/root usr/lib/libsndfile.so.1 -> libsndfile.so.1.0.12
--rwxr-xr-x root/root usr/lib/libsndfile.so.1.0.12
+lrwxrwxrwx root/root usr/lib/libsndfile.so -> libsndfile.so.1.0.14
+lrwxrwxrwx root/root usr/lib/libsndfile.so.1 -> libsndfile.so.1.0.14
+-rwxr-xr-x root/root usr/lib/libsndfile.so.1.0.14
drwxr-xr-x root/root usr/lib/pkgconfig/
-rw-r--r-- root/root usr/lib/pkgconfig/sndfile.pc
drwxr-xr-x root/root usr/man/
diff --git a/libsndfile/.md5sum b/libsndfile/.md5sum
index 374e5b6..16e0b48 100644
--- a/libsndfile/.md5sum
+++ b/libsndfile/.md5sum
@@ -1 +1 @@
-03718b7b225b298f41c19620b8906108 libsndfile-1.0.12.tar.gz
+3513c2283f4063f57615c5b9b45bf30a libsndfile-1.0.14.tar.gz
diff --git a/libsndfile/Pkgfile b/libsndfile/Pkgfile
index ce5631e..dc7d294 100644
--- a/libsndfile/Pkgfile
+++ b/libsndfile/Pkgfile
@@ -4,7 +4,7 @@
# Depends on:
name=libsndfile
-version=1.0.12
+version=1.0.14
release=1
source=(http://www.mega-nerd.com/$name/$name-$version.tar.gz)
diff --git a/madwifi/.footprint b/madwifi/.footprint
new file mode 100644
index 0000000..df601c9
--- /dev/null
+++ b/madwifi/.footprint
@@ -0,0 +1,35 @@
+drwxr-xr-x root/root lib/
+drwxr-xr-x root/root lib/modules/
+drwxr-xr-x root/root lib/modules/<kernel-version>/
+drwxr-xr-x root/root lib/modules/<kernel-version>/net/
+-rw-r--r-- root/root lib/modules/<kernel-version>/net/ath_hal.ko
+-rw-r--r-- root/root lib/modules/<kernel-version>/net/ath_pci.ko
+-rw-r--r-- root/root lib/modules/<kernel-version>/net/ath_rate_sample.ko
+-rw-r--r-- root/root lib/modules/<kernel-version>/net/wlan.ko
+-rw-r--r-- root/root lib/modules/<kernel-version>/net/wlan_acl.ko
+-rw-r--r-- root/root lib/modules/<kernel-version>/net/wlan_ccmp.ko
+-rw-r--r-- root/root lib/modules/<kernel-version>/net/wlan_scan_ap.ko
+-rw-r--r-- root/root lib/modules/<kernel-version>/net/wlan_scan_sta.ko
+-rw-r--r-- root/root lib/modules/<kernel-version>/net/wlan_tkip.ko
+-rw-r--r-- root/root lib/modules/<kernel-version>/net/wlan_wep.ko
+-rw-r--r-- root/root lib/modules/<kernel-version>/net/wlan_xauth.ko
+drwxr-xr-x root/root usr/
+drwxr-xr-x root/root usr/bin/
+-rwxr-xr-x root/root usr/bin/80211debug
+-rwxr-xr-x root/root usr/bin/80211stats
+-rwxr-xr-x root/root usr/bin/athchans
+-rwxr-xr-x root/root usr/bin/athctrl
+-rwxr-xr-x root/root usr/bin/athdebug
+-rwxr-xr-x root/root usr/bin/athkey
+-rwxr-xr-x root/root usr/bin/athstats
+-rwxr-xr-x root/root usr/bin/wlanconfig
+drwxr-xr-x root/root usr/man/
+drwxr-xr-x root/root usr/man/man8/
+-rw-r--r-- root/root usr/man/man8/80211debug.8.gz
+-rw-r--r-- root/root usr/man/man8/80211stats.8.gz
+-rw-r--r-- root/root usr/man/man8/athchans.8.gz
+-rw-r--r-- root/root usr/man/man8/athctrl.8.gz
+-rw-r--r-- root/root usr/man/man8/athdebug.8.gz
+-rw-r--r-- root/root usr/man/man8/athkey.8.gz
+-rw-r--r-- root/root usr/man/man8/athstats.8.gz
+-rw-r--r-- root/root usr/man/man8/wlanconfig.8.gz
diff --git a/madwifi/Pkgfile b/madwifi/Pkgfile
new file mode 100644
index 0000000..760278d
--- /dev/null
+++ b/madwifi/Pkgfile
@@ -0,0 +1,14 @@
+# Description: Kernel module for Atheros based 802.11a/b/g cards
+# Maintainer: Jay Dolan jasonthomasdolan at yahoo dot com
+# Url: http://madwifi.org
+# Depends on: sharutils
+
+name=madwifi
+version=current
+release=1
+source=(http://snapshots.madwifi.org/$name-ng-$version.tar.gz)
+
+build(){
+ cd $name* && make KERNELPATH=/usr/src/linux-$(uname -r)
+ make DESTDIR=$PKG BINDIR=/usr/bin MANDIR=/usr/man install
+}
diff --git a/madwifi/README b/madwifi/README
new file mode 100644
index 0000000..decfe7a
--- /dev/null
+++ b/madwifi/README
@@ -0,0 +1,21 @@
+PRE-INSTALL
+
+ Kernel sources must exist in /usr/src/linux[-version]
+
+ Note that this port does not provide a .md5sum, as it is built from
+ a daily svn snapshot of madwifi-ng.
+
+POST-INSTALL
+
+ Run depmod -a, edit /etc/modprobe.conf and /etc/rc.d/net. The module
+ name is ath_hal or ath_pci, depending on your card. The wireless
+ ifdevice name is ath0. Something like this should work:
+
+ /etc/modprobe.conf:
+ alias ath0 ath_pci
+
+ /etc/rc.d/net:
+ wlanconfig ath0 create wlandev wifi0 wlanmode sta
+
+ The ath0 device may then be manipulated with ifconfig or dhcpcd.
+
diff --git a/sharutils/.footprint b/sharutils/.footprint
new file mode 100644
index 0000000..22d2087
--- /dev/null
+++ b/sharutils/.footprint
@@ -0,0 +1,18 @@
+drwxr-xr-x root/root usr/
+drwxr-xr-x root/root usr/bin/
+-rwxr-xr-x root/root usr/bin/compress-dummy
+-rwxr-xr-x root/root usr/bin/mail-files
+-rwxr-xr-x root/root usr/bin/mailshar
+-rwxr-xr-x root/root usr/bin/remsync
+-rwxr-xr-x root/root usr/bin/shar
+-rwxr-xr-x root/root usr/bin/unshar
+-rwxr-xr-x root/root usr/bin/uudecode
+-rwxr-xr-x root/root usr/bin/uuencode
+drwxr-xr-x root/root usr/man/
+drwxr-xr-x root/root usr/man/man1/
+-rw-r--r-- root/root usr/man/man1/shar.1.gz
+-rw-r--r-- root/root usr/man/man1/unshar.1.gz
+-rw-r--r-- root/root usr/man/man1/uudecode.1.gz
+-rw-r--r-- root/root usr/man/man1/uuencode.1.gz
+drwxr-xr-x root/root usr/man/man5/
+-rw-r--r-- root/root usr/man/man5/uuencode.5.gz
diff --git a/sharutils/.md5sum b/sharutils/.md5sum
new file mode 100644
index 0000000..5b18df7
--- /dev/null
+++ b/sharutils/.md5sum
@@ -0,0 +1 @@
+c081e3acfeab71cf76dca79f8f76c62d sharutils-4.6.tar.bz2
diff --git a/sharutils/Pkgfile b/sharutils/Pkgfile
new file mode 100644
index 0000000..585c454
--- /dev/null
+++ b/sharutils/Pkgfile
@@ -0,0 +1,16 @@
+# Description: GNU shar (encoding/decoding) utilities
+# Maintainer: Jay Dolan jasonthomasdolan at yahoo dot com
+# Url: http://www.gnu.org/software/sharutils/sharutils.html
+# Depends on:
+
+name=sharutils
+version=4.6
+release=1
+source=(ftp://ftp.gnu.org/gnu/$name/REL-$version/$name-$version.tar.bz2)
+
+build(){
+ cd $name-$version
+ ./configure --prefix=/usr --disable-nls
+ make DESTDIR=$PKG install
+ rm -rf $PKG/usr/info
+}
diff --git a/xscreensaver/.md5sum b/xscreensaver/.md5sum
index 3f37259..20c0bd1 100644
--- a/xscreensaver/.md5sum
+++ b/xscreensaver/.md5sum
@@ -1 +1 @@
-27491d117a8f7ae57d1fdf5f15d61ac6 xscreensaver-4.23.tar.gz
+174b6a7cebd892c1a6c2d56bf5ac5af6 xscreensaver-4.24.tar.gz
diff --git a/xscreensaver/Pkgfile b/xscreensaver/Pkgfile
index f8b0f14..e9f2249 100644
--- a/xscreensaver/Pkgfile
+++ b/xscreensaver/Pkgfile
@@ -4,7 +4,7 @@
# Depends on: bc,libglade,netpbm,fortune
name=xscreensaver
-version=4.23
+version=4.24
release=1
source=(http://www.jwz.org/$name/$name-$version.tar.gz)
1
0
commit f325019579bc8e84d85de8e7216e85bff05f358a
Author: Juergen Daubert <juergen.daubert(a)t-online.de>
Date: Fri Feb 24 08:00:22 2006 +0000
apache: removed some configure options
diff --git a/apache/.footprint b/apache/.footprint
index 2a5f24c..f221382 100644
--- a/apache/.footprint
+++ b/apache/.footprint
@@ -90,14 +90,12 @@ drwxr-xr-x root/root usr/lib/apache/build/
-rwxr-xr-x root/root usr/lib/apache/mod_auth_dbm.so
-rwxr-xr-x root/root usr/lib/apache/mod_auth_digest.so
-rwxr-xr-x root/root usr/lib/apache/mod_autoindex.so
--rwxr-xr-x root/root usr/lib/apache/mod_cache.so
-rwxr-xr-x root/root usr/lib/apache/mod_cern_meta.so
-rwxr-xr-x root/root usr/lib/apache/mod_cgi.so
-rwxr-xr-x root/root usr/lib/apache/mod_dav.so
-rwxr-xr-x root/root usr/lib/apache/mod_dav_fs.so
-rwxr-xr-x root/root usr/lib/apache/mod_deflate.so
-rwxr-xr-x root/root usr/lib/apache/mod_dir.so
--rwxr-xr-x root/root usr/lib/apache/mod_disk_cache.so
-rwxr-xr-x root/root usr/lib/apache/mod_env.so
-rwxr-xr-x root/root usr/lib/apache/mod_expires.so
-rwxr-xr-x root/root usr/lib/apache/mod_ext_filter.so
@@ -107,14 +105,9 @@ drwxr-xr-x root/root usr/lib/apache/build/
-rwxr-xr-x root/root usr/lib/apache/mod_info.so
-rwxr-xr-x root/root usr/lib/apache/mod_log_config.so
-rwxr-xr-x root/root usr/lib/apache/mod_log_forensic.so
--rwxr-xr-x root/root usr/lib/apache/mod_mem_cache.so
-rwxr-xr-x root/root usr/lib/apache/mod_mime.so
-rwxr-xr-x root/root usr/lib/apache/mod_mime_magic.so
-rwxr-xr-x root/root usr/lib/apache/mod_negotiation.so
--rwxr-xr-x root/root usr/lib/apache/mod_proxy.so
--rwxr-xr-x root/root usr/lib/apache/mod_proxy_connect.so
--rwxr-xr-x root/root usr/lib/apache/mod_proxy_ftp.so
--rwxr-xr-x root/root usr/lib/apache/mod_proxy_http.so
-rwxr-xr-x root/root usr/lib/apache/mod_rewrite.so
-rwxr-xr-x root/root usr/lib/apache/mod_setenvif.so
-rwxr-xr-x root/root usr/lib/apache/mod_speling.so
diff --git a/apache/Pkgfile b/apache/Pkgfile
index 04f634a..c1e1a82 100644
--- a/apache/Pkgfile
+++ b/apache/Pkgfile
@@ -6,7 +6,7 @@
name=apache
version=2.0.55
-release=1
+release=2
source=(http://www.apache.org/dist/httpd/httpd-$version.tar.bz2 \
$name-ssl_cert.patch crux.layout apache)
@@ -22,8 +22,6 @@ build(){
--enable-mods-shared=all \
--enable-ssl \
--enable-deflate \
- --enable-proxy{,-connect,-ftp,-http} \
- --enable{,-disk,-mem}-cache \
--with-gdbm \
--with-expat=/usr \
--with-mpm=prefork
1
0