From 562919446e09d32d1a90ea5e51be0c254739daff Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20R=C4=99korajski?= Date: Fri, 21 Apr 2006 23:40:25 +0000 Subject: [PATCH 1/1] - orphaned, outdated Changed files: apache-mod_python-3-DESTDIR.patch -> 1.2 apache-mod_python-3-static-lib-dir-fix.patch -> 1.2 apache-mod_python-3.conf -> 1.2 apache-mod_python-DEAPI_fix.patch -> 1.2 apache-mod_python-Makefile-in.patch -> 1.4 apache-mod_python-cleanup.patch -> 1.2 apache-mod_python-shared.patch -> 1.2 apache-mod_python-static-lib-dir-fix.patch -> 1.2 --- apache-mod_python-3-DESTDIR.patch | 30 ------------ apache-mod_python-3-static-lib-dir-fix.patch | 12 ----- apache-mod_python-3.conf | 1 - apache-mod_python-DEAPI_fix.patch | 31 ------------- apache-mod_python-Makefile-in.patch | 12 ----- apache-mod_python-cleanup.patch | 49 -------------------- apache-mod_python-shared.patch | 11 ----- apache-mod_python-static-lib-dir-fix.patch | 12 ----- 8 files changed, 158 deletions(-) delete mode 100644 apache-mod_python-3-DESTDIR.patch delete mode 100644 apache-mod_python-3-static-lib-dir-fix.patch delete mode 100644 apache-mod_python-3.conf delete mode 100644 apache-mod_python-DEAPI_fix.patch delete mode 100644 apache-mod_python-Makefile-in.patch delete mode 100644 apache-mod_python-cleanup.patch delete mode 100644 apache-mod_python-shared.patch delete mode 100644 apache-mod_python-static-lib-dir-fix.patch diff --git a/apache-mod_python-3-DESTDIR.patch b/apache-mod_python-3-DESTDIR.patch deleted file mode 100644 index 77ffb8a..0000000 --- a/apache-mod_python-3-DESTDIR.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- Makefile.in.es Fri Nov 1 13:32:49 2002 -+++ Makefile.in Fri Nov 1 13:34:47 2002 -@@ -92,7 +92,8 @@ - @echo - @echo "Performing DSO installation." - @echo -- $(INSTALL) src/mod_python.so $(LIBEXECDIR) -+ $(INSTALL) -d $(DESTDIR)$(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" -@@ -102,13 +103,13 @@ - @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; \ -+ $(INSTALL) $$f $(DESTDIR)$(PY_STD_LIB)/site-packages/mod_python; \ - done -- ${PYTHON_BIN} $(PY_STD_LIB)/compileall.py $(PY_STD_LIB)/site-packages/mod_python -- ${PYTHON_BIN} -O $(PY_STD_LIB)/compileall.py $(PY_STD_LIB)/site-packages/mod_python -+ ${PYTHON_BIN} $(PY_STD_LIB)/compileall.pyc $(DESTDIR)$(PY_STD_LIB)/site-packages/mod_python -+ ${PYTHON_BIN} -O $(PY_STD_LIB)/compileall.pyc $(DESTDIR)$(PY_STD_LIB)/site-packages/mod_python - - clean: - cd src && $(MAKE) clean diff --git a/apache-mod_python-3-static-lib-dir-fix.patch b/apache-mod_python-3-static-lib-dir-fix.patch deleted file mode 100644 index 6196f97..0000000 --- a/apache-mod_python-3-static-lib-dir-fix.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- configure.in Fri Nov 1 01:13:47 2002 -+++ configure.in1 Fri Nov 1 01:12:46 2002 -@@ -254,7 +254,8 @@ - - PyLIBP=${PyEXEC_INSTALLDIR}/lib/python${PyVERSION} - PyLIBPL=${PyLIBP}/config --PyPYTHONLIBS=${PyLIBPL}/libpython${PyVERSION}.a -+#PyPYTHONLIBS=${PyLIBPL}/libpython${PyVERSION}.a -+PyPYTHONLIBS=/usr/lib/libpython${PyVERSION}.a - PyLIBS=`grep "^LIB[[SMC]]=" ${PyLIBPL}/Makefile | cut -f2 -d= | tr '\011\012\015' ' '` - PyMODLIBS=`grep "^LOCALMODLIBS=" ${PyLIBPL}/Makefile | cut -f2 -d= | tr '\011\012\015' ' '` - PY_LIBS="${PyPYTHONLIBS} ${PyLIBS} ${PyMODLIBS}" diff --git a/apache-mod_python-3.conf b/apache-mod_python-3.conf deleted file mode 100644 index 5afa09b..0000000 --- a/apache-mod_python-3.conf +++ /dev/null @@ -1 +0,0 @@ -LoadModule python_module /usr/lib/apache/mod_python.so diff --git a/apache-mod_python-DEAPI_fix.patch b/apache-mod_python-DEAPI_fix.patch deleted file mode 100644 index 0d44921..0000000 --- a/apache-mod_python-DEAPI_fix.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff -Naur mod_python-2.7.8.org/src/Makefile.in mod_python-2.7.8/src/Makefile.in ---- mod_python-2.7.8.org/src/Makefile.in Sun Jun 22 13:30:21 2003 -+++ mod_python-2.7.8/src/Makefile.in Sun Jun 22 13:30:43 2003 -@@ -52,7 +52,7 @@ - INCLUDES=@INCLUDES@ - LIBS=@LIBS@ - LDFLAGS=@LDFLAGS@ --OPT= -+OPT=@OPT@ - CFLAGS=$(OPT) $(INCLUDES) - srcdir=. - -@@ -119,4 +119,4 @@ - serverobject.o: serverobject.c - connobject.o: connobject.c - --# DO NOT DELETE THIS LINE -\ No newline at end of file -+# DO NOT DELETE THIS LINE -diff -Naur mod_python-2.7.8.org/configure.in mod_python-2.7.8/configure.in ---- mod_python-2.7.8.org/configure.in Sun Jun 22 13:41:45 2003 -+++ mod_python-2.7.8/configure.in Sun Jun 22 13:42:01 2003 -@@ -301,6 +301,8 @@ - AC_PATH_PROG(MKDEP, "makedepend") - fi - -+AC_SUBST(OPT, $OPT) -+ - AC_OUTPUT(Makefile src/Makefile src/libpython.module Doc/Makefile) - - if test -n "$MKDEP"; then diff --git a/apache-mod_python-Makefile-in.patch b/apache-mod_python-Makefile-in.patch deleted file mode 100644 index e6e9a64..0000000 --- a/apache-mod_python-Makefile-in.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -uNr mod_python-2.7.6/Makefile.in mod_python-2.7.6.orig/Makefile.in -+++ mod_python-2.7.6/Makefile.in Wed Feb 6 09:49:05 2002 ---- mod_python-2.7.6.orig/Makefile.in Wed Feb 6 09:47:01 2002 -@@ -120,7 +120,7 @@ - do \ - $(INSTALL) $$f $(DESTDIR)$(PY_STD_LIB)/site-packages/mod_python; \ - done -+ python $(PY_STD_LIB)/compileall.pyc $(DESTDIR)$(PY_STD_LIB)/site-packages/mod_python -- python $(PY_STD_LIB)/compileall.py $(DESTDIR)$(PY_STD_LIB)/site-packages/mod_python - - clean: - cd src && $(MAKE) clean diff --git a/apache-mod_python-cleanup.patch b/apache-mod_python-cleanup.patch deleted file mode 100644 index c591b23..0000000 --- a/apache-mod_python-cleanup.patch +++ /dev/null @@ -1,49 +0,0 @@ -Index: mod_python/lib/python/mod_python/apache.py -=================================================================== -RCS file: /home/devel/CVS/rhn/modules/mod_python/lib/python/mod_python/apache.py,v -retrieving revision 1.4 -diff -u -r1.4 apache.py ---- mod_python/lib/python/mod_python/apache.py 2 Aug 2001 22:52:50 -0000 1.4 -+++ mod_python/lib/python/mod_python/apache.py 28 Feb 2002 02:57:53 -0000 -@@ -58,10 +58,6 @@ - # variable stores the last PythonPath in raw (unevaled) form. - _path = None - --# this is used in Request.__init__ --def _cleanup_request(_req): -- _req._Request = None -- - class Request: - """ This is a normal Python Class that can be subclassed. - However, most of its functionality comes from a built-in -@@ -73,11 +69,6 @@ - # look at __setattr__ if changing this line! - self._req = _req - -- # this will decrement the reference to the _req -- # object at cleanup time. If we don't do this, we -- # get a cirular reference and _req never gets destroyed. -- _req.register_cleanup(_cleanup_request, _req) -- - def __getattr__(self, attr): - try: - return getattr(self._req, attr) -@@ -129,6 +120,7 @@ - - # is there a Request object for this request? - if not _req._Request: -+ # warning, creating circular reference here - _req._Request = Request(_req) - - req = _req._Request -@@ -239,6 +231,10 @@ - htype=htype, hname=handler, debug=debug) - finally: - exc_traceback = None -+ -+ if htype == "PythonCleanupHandler": -+ # destroy the circular reference -+ _req._Request = req = None - - return result - diff --git a/apache-mod_python-shared.patch b/apache-mod_python-shared.patch deleted file mode 100644 index 1c04d9d..0000000 --- a/apache-mod_python-shared.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- mod_python-2.6.4/configure.in.wiget Tue Dec 12 19:08:13 2000 -+++ mod_python-2.6.4/configure.in Tue Dec 12 19:13:21 2000 -@@ -187,7 +187,7 @@ - if test -z "$PYTHON_SRC"; then - PyLIBP=${PyEXEC_INSTALLDIR}/lib/python${PyVERSION} - PyLIBPL=${PyLIBP}/config -- PyPYTHONLIBS=${PyLIBPL}/libpython${PyVERSION}.a -+ PyPYTHONLIBS="-L${PyLIBPL} -lpython${PyVERSION}" - PyLIBS=`grep "^LIB[[SMC]]=" ${PyLIBPL}/Makefile | cut -f2 -d= | tr '\011\012\015' ' '` - PyMODLIBS=`grep "^LOCALMODLIBS=" ${PyLIBPL}/Makefile | cut -f2 -d= | tr '\011\012\015' ' '` - PY_LIBS="${PyPYTHONLIBS} ${PyLIBS} ${PyMODLIBS}" diff --git a/apache-mod_python-static-lib-dir-fix.patch b/apache-mod_python-static-lib-dir-fix.patch deleted file mode 100644 index ad17e8d..0000000 --- a/apache-mod_python-static-lib-dir-fix.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- mod_python-2.7.8/configure.in Mon Jun 11 21:16:25 2001 -+++ mod_python-2.7.8.new/configure.in Wed Oct 16 16:11:36 2002 -@@ -242,7 +242,8 @@ - if test -z "$PYTHON_SRC"; then - PyLIBP=${PyEXEC_INSTALLDIR}/lib/python${PyVERSION} - PyLIBPL=${PyLIBP}/config -- PyPYTHONLIBS=${PyLIBPL}/libpython${PyVERSION}.a -+ # PyPYTHONLIBS=${PyLIBPL}/libpython${PyVERSION}.a -+ PyPYTHONLIBS=/usr/lib/libpython${PyVERSION}.a - PyLIBS=`grep "^LIB[[SMC]]=" ${PyLIBPL}/Makefile | cut -f2 -d= | tr '\011\012\015' ' '` - PyMODLIBS=`grep "^LOCALMODLIBS=" ${PyLIBPL}/Makefile | cut -f2 -d= | tr '\011\012\015' ' '` - PY_LIBS="${PyPYTHONLIBS} ${PyLIBS} ${PyMODLIBS}" -- 2.43.0