Minix/pkgsrc-ng
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Import of pkgsrc-2013Q2

Browse Source
This commit is contained in:
Lionel Sambuc
2013-09-26 17:14:40 +02:00
commit 785076ae39
74991 changed files with 4380255 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
www/ap-python/patches/patch-aa Normal file
View File

@@ -0,0 +1,13 @@
$NetBSD: patch-aa,v 1.3 2008/07/10 14:59:57 joerg Exp $
--- src/Makefile.in.orig 2001-04-07 07:43:21.000000000 +0200
+++ src/Makefile.in 2004-07-20 23:12:57.000000000 +0200
@@ -52,7 +52,7 @@
INCLUDES=@INCLUDES@
LIBS=@LIBS@
LDFLAGS=@LDFLAGS@
-OPT=
+OPT=-DEAPI -fPIC
CFLAGS=$(OPT) $(INCLUDES)
srcdir=.

124
www/ap-python/patches/patch-ab Normal file
View File

@@ -0,0 +1,124 @@
$NetBSD: patch-ab,v 1.1.1.1 2002/02/05 21:05:58 drochner Exp $
--- src/tableobject.c.orig Mon May 28 23:00:41 2001
+++ src/tableobject.c Sun Nov 4 18:28:55 2001
@@ -185,6 +185,105 @@
};
/**
+ ** table_get
+ **
+ *
+ * Implements dictionary like get(k,[x]) method.
+ */
+
+static PyObject * table_get(tableobject *self, PyObject *args)
+{
+
+ PyObject *key,*v;
+ PyObject *failob = Py_None;
+ array_header *ah;
+ table_entry *elts;
+ int i, j;
+
+ if(!PyArg_ParseTuple(args, "O|O:get", &key, &failob))
+ return NULL;
+ v=tablegetitem(self,key);
+ if(v = NULL) {
+ v=failob;
+ Py_INCREF(failob);
+ }
+ return v;
+}
+
+/**
+ ** table_keys
+ **
+ *
+ * Implements dictionary like items() method.
+ */
+
+static PyObject * table_items(tableobject *self)
+{
+
+ PyObject *v;
+ array_header *ah;
+ table_entry *elts;
+ int i, j;
+
+ ah = ap_table_elts(self->table);
+ elts = (table_entry *) ah->elts;
+
+ v = PyList_New(ah->nelts);
+
+ for (i = 0, j = 0; i < ah->nelts; i++)
+ {
+ if (elts[i].key)
+ {
+ PyObject *vp = PyTuple_New(2);
+ if(vp == NULL) {
+ Py_DECREF(v);
+ return NULL;
+ }
+ PyTuple_SET_ITEM(vp,0,PyString_FromString(elts[i].key));
+ PyTuple_SET_ITEM(vp,1,PyString_FromString(ap_table_get(self->table,
+ elts[i].key)));
+ PyList_SetItem(v, j, vp);
+ j++;
+ }
+ }
+ return v;
+}
+/**
+ ** table_keys
+ **
+ *
+ * Implements dictionary like values() method.
+ * This mostly for completeness sake, I can't see use for it
+ */
+
+static PyObject * table_values(tableobject *self)
+{
+
+ PyObject *v;
+ array_header *ah;
+ table_entry *elts;
+ int i, j;
+
+ ah = ap_table_elts(self->table);
+ elts = (table_entry *) ah->elts;
+
+ v = PyList_New(ah->nelts);
+
+ for (i = 0, j = 0; i < ah->nelts; i++)
+ {
+ if (elts[i].key)
+ {
+ PyObject *val = PyString_FromString(ap_table_get(self->table,
+ elts[i].key));
+ PyList_SetItem(v, j, val);
+ j++;
+ }
+ }
+ return v;
+}
+
+
+/**
** table_keys
**
*
@@ -261,9 +360,13 @@
/* table method definitions */
static PyMethodDef tablemethods[] = {
- {"keys", (PyCFunction)table_keys, METH_VARARGS},
{"has_key", (PyCFunction)table_has_key, METH_VARARGS},
{"add", (PyCFunction)mp_table_add, METH_VARARGS},
+ {"items", (PyCFunction)table_items, METH_VARARGS},
+ {"keys", (PyCFunction)table_keys, METH_VARARGS},
+ {"get", (PyCFunction)table_get, METH_VARARGS},
+ {"values", (PyCFunction)table_values, METH_VARARGS},
+ /* Still needs: copy, update, clear, setdefault, popitem */
{NULL, NULL} /* sentinel */
};

18
www/ap-python/patches/patch-ac Normal file
View File

@@ -0,0 +1,18 @@
$NetBSD: patch-ac,v 1.1.1.1 2002/02/05 21:05:58 drochner Exp $
--- src/mod_python.c.orig Sat Nov 10 13:06:57 2001
+++ src/mod_python.c Sat Nov 10 13:07:53 2001
@@ -474,11 +474,13 @@
if (! ((m = PyImport_ImportModule(MODULENAME)))) {
fprintf(stderr, "make_obcallback(): could not import %s.\n", MODULENAME);
+ PyErr_Print();
}
- if (! ((obCallBack = PyObject_CallMethod(m, INITFUNC, NULL)))) {
+ if (m && ! ((obCallBack = PyObject_CallMethod(m, INITFUNC, NULL)))) {
fprintf(stderr, "make_obcallback(): could not call %s.\n",
INITFUNC);
+ PyErr_Print();
}
return obCallBack;

30
www/ap-python/patches/patch-ad Normal file
View File

@@ -0,0 +1,30 @@
$NetBSD: patch-ad,v 1.2 2009/08/30 03:08:40 obache Exp $
--- Makefile.in.orig 2000-12-06 03:05:37.000000000 +0000
+++ Makefile.in
@@ -82,7 +82,7 @@ install_dso: dso
@echo
@echo "Performing DSO installation."
@echo
- $(INSTALL) src/mod_python.so $(LIBEXECDIR)
+ $(INSTALL) src/mod_python.so $(DESTDIR)$(LIBEXECDIR)
@$(MAKE) install_py_lib
@echo
@echo "Now don't forget to edit your main config and add"
@@ -114,12 +114,13 @@ install_static: static
@echo
install_py_lib:
- $(INSTALL) -d $(PY_STD_LIB)/site-packages/mod_python
+ $(INSTALL) -d $(DESTDIR)$(PY_STD_LIB)/site-packages/mod_python
@for f in `ls lib/python/mod_python/*.py`; \
do \
- $(INSTALL) $$f $(PY_STD_LIB)/site-packages/mod_python; \
+ $(BSD_INSTALL_DATA) $$f $(DESTDIR)$(PY_STD_LIB)/site-packages/mod_python; \
done
- python $(PY_STD_LIB)/compileall.py $(PY_STD_LIB)/site-packages/mod_python
+ @PYTHON_BIN@ $(PY_STD_LIB)/compileall.py $(DESTDIR)$(PY_STD_LIB)/site-packages/mod_python
+ @PYTHON_BIN@ -O $(PY_STD_LIB)/compileall.py $(DESTDIR)$(PY_STD_LIB)/site-packages/mod_python
clean:
cd src && $(MAKE) clean

14
www/ap-python/patches/patch-ae Normal file
View File

@@ -0,0 +1,14 @@
$NetBSD: patch-ae,v 1.1 2003/12/03 09:44:10 darcy Exp $
--- lib/python/mod_python/apache.py.orig 2002-04-19 14:20:40.000000000 -0400
+++ lib/python/mod_python/apache.py
@@ -552,6 +552,9 @@
elif string.lower(h) == "content-type":
self.req.content_type = v
self.req.headers_out[h] = v
+ elif h.lower() == "location":
+ self.req.status = HTTP_MOVED_TEMPORARILY
+ self.req.headers_out["location"] = v
else:
self.req.headers_out.add(h, v)
self.req.send_http_header()

23
www/ap-python/patches/patch-af Normal file
View File

@@ -0,0 +1,23 @@
$NetBSD: patch-af,v 1.1 2003/12/03 09:44:10 darcy Exp $
--- lib/python/mod_python/cgihandler.py.orig 2000-12-05 22:05:37.000000000 -0500
+++ lib/python/mod_python/cgihandler.py
@@ -108,6 +108,7 @@
# thread safe, this is why we must obtain the lock.
cwd = os.getcwd()
os.chdir(dir)
+ sys.path.append (dir)
# simulate cgi environment
env, si, so = apache.setup_cgi(req)
@@ -119,7 +120,9 @@
raise apache.SERVER_RETURN, apache.HTTP_NOT_FOUND
# this executes the module
- imp.load_module(module_name, fd, path, desc)
+ try: imp.load_module(module_name, fd, path, desc)
+ except SystemExit, e:
+ if not e or not e.args or e.args[0]: raise
return apache.OK

25
www/ap-python/patches/patch-ag Normal file
View File

@@ -0,0 +1,25 @@
$NetBSD: patch-ag,v 1.1 2003/12/03 09:44:10 darcy Exp $
--- lib/python/mod_python/apache.py.orig 2002-04-19 14:20:40.000000000 -0400
+++ lib/python/mod_python/apache.py
@@ -529,17 +529,9 @@
# are headers over yet?
headers_over = 0
- # first try RFC-compliant CRLF
- ss = string.split(self.headers, '\r\n\r\n', 1)
- if len(ss) < 2:
- # second try with \n\n
- ss = string.split(self.headers, '\n\n', 1)
- if len(ss) >= 2:
- headers_over = 1
- else:
- headers_over = 1
-
- if headers_over:
+ # split the headers from the body.
+ ss = string.split(self.headers.replace('\r\n', '\n'), '\n\n', 1)
+ if len(ss) == 2:
# headers done, process them
string.replace(ss[0], '\r\n', '\n')
lines = string.split(ss[0], '\n')