Author: bdubbs Date: 2005-03-22 09:12:39 -0700 (Tue, 22 Mar 2005) New Revision: 886
Added: trunk/MPlayer/MPlayer-1.0pre6a-kernel_2.6-1.patch trunk/cdrdao/cdrdao-1.1.9-gcc34-1.patch trunk/kdesdk/ trunk/kdesdk/kdesdk-3.3.2-db43-1.patch trunk/openoffice/OOo_1.1.4-freetype-1.patch trunk/openoffice/OOo_1.1.4-gcc33-1.patch trunk/openoffice/OOo_1.1.4-jdk_1.4.2_fix-1.patch trunk/openoffice/OOo_1.1.4-no_pam-1.patch trunk/openoffice/OOo_1.1.4-nptl-1.patch trunk/openoffice/OOo_1.1.4-test_bin_loc-1.patch trunk/php/ trunk/php/php-5.0.3-db43-1.patch Log: Second batch of BLFS updates Added: trunk/MPlayer/MPlayer-1.0pre6a-kernel_2.6-1.patch =================================================================== --- trunk/MPlayer/MPlayer-1.0pre6a-kernel_2.6-1.patch 2005-03-22 16:05:53 UTC (rev 885) +++ trunk/MPlayer/MPlayer-1.0pre6a-kernel_2.6-1.patch 2005-03-22 16:12:39 UTC (rev 886) @@ -0,0 +1,23 @@ +Submitted By: Jim Gifford (jim at linuxfromscratch dot org) +Date: 2004-04-29 +Initial Package Version: 1.0pre4 +Origin: Jim Gifford +Upstream Status: Sent +Description: Fixes Compile Issues with the 2.6 Kernel + +$LastChangedBy: randy $ +$Date: 2005-01-20 06:17:46 -0600 (Thu, 20 Jan 2005) $ + +diff -Naur MPlayer-1.0pre4.orig/osdep/kerneltwosix.h MPlayer-1.0pre4/osdep/kerneltwosix.h +--- MPlayer-1.0pre4.orig/osdep/kerneltwosix.h 2004-01-10 09:48:15.000000000 +0000 ++++ MPlayer-1.0pre4/osdep/kerneltwosix.h 2004-04-30 02:10:54.429252761 +0000 +@@ -1,9 +1,3 @@ + #include <linux/version.h> +-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,70) +-#define __KERNEL__ +-#include <linux/thread_info.h> +-#include <linux/list.h> +-#undef __KERNEL__ +-#endif + + Added: trunk/cdrdao/cdrdao-1.1.9-gcc34-1.patch =================================================================== --- trunk/cdrdao/cdrdao-1.1.9-gcc34-1.patch 2005-03-22 16:05:53 UTC (rev 885) +++ trunk/cdrdao/cdrdao-1.1.9-gcc34-1.patch 2005-03-22 16:12:39 UTC (rev 886) @@ -0,0 +1,39 @@ +Submitted By: BLFS Book <[email protected]> +Date: 2005-01-24 +Initial Package Version: 1.1.9 +Upstream Status: Already in CVS +Origin: Cdrdao CVS +Description: Fixes gcdmaster compilation issue with GCC-3.4.x + +$LastChangedBy: randy $ +$Date: 2005-01-24 22:39:14 -0600 (Mon, 24 Jan 2005) $ + +diff -Naur cdrdao-1.1.9-orig/xdao/Project.h cdrdao-1.1.9/xdao/Project.h +--- cdrdao-1.1.9-orig/xdao/Project.h 2004-02-12 01:13:32.000000000 +0000 ++++ cdrdao-1.1.9/xdao/Project.h 2005-01-25 01:22:03.961953520 +0000 +@@ -51,14 +51,12 @@ + virtual void createToolbar() = 0; + virtual void createStatusbar(); + void updateWindowTitle(); +- void saveProject(); + void saveAsProject(); + Gtk::FileSelection *saveFileSelector_; + void saveFileSelectorOKCB(); + void saveFileSelectorCancelCB(); + + virtual bool on_delete_event(GdkEventAny *event); +- virtual void recordToc2CD() = 0; + virtual void projectInfo() = 0; + + public: +@@ -67,7 +65,9 @@ + void readToc(char *name); + void statusMessage(const char *fmt, ...); + void tocBlockedMsg(const char *); +- virtual bool closeProject() = 0; ++ virtual bool closeProject() = 0; ++ virtual void saveProject(); ++ virtual void recordToc2CD() = 0; + int projectNumber(); + TocEdit *tocEdit(); + gint getViewNumber(); Added: trunk/kdesdk/kdesdk-3.3.2-db43-1.patch =================================================================== --- trunk/kdesdk/kdesdk-3.3.2-db43-1.patch 2005-03-22 16:05:53 UTC (rev 885) +++ trunk/kdesdk/kdesdk-3.3.2-db43-1.patch 2005-03-22 16:12:39 UTC (rev 886) @@ -0,0 +1,30 @@ +Submitted By: Igor Zivkovic <[EMAIL PROTECTED]> +Date: 2005-01-10 +Initial Package Version: 3.3.2 +Upstream Status: Not submitted. +Origin: http://www.sleepycat.com/docs/ref/upgrade.4.3/toc.html +Description: Adds support for Berkeley DB-4.3.x. + +$LastChangedBy: igor $ +$Date: 2005-01-10 16:43:51 -0600 (Mon, 10 Jan 2005) $ + +--- kdesdk-3.3.2/kbabel/kbabeldict/modules/dbsearchengine/database.cpp.orig 2005-01-10 15:58:10.523087880 +0000 ++++ kdesdk-3.3.2/kbabel/kbabeldict/modules/dbsearchengine/database.cpp 2005-01-10 15:58:14.681455712 +0000 +@@ -728,7 +728,7 @@ + DataBaseManager::count () + { + DB_BTREE_STAT *dstat = 0; +- db->stat (db, &dstat, DB_FAST_STAT); ++ db->stat (db, NULL, &dstat, DB_FAST_STAT); + int ret = dstat->bt_nkeys; + free (dstat); + +@@ -963,7 +963,7 @@ + int nrec; + DB_BTREE_STAT *stat; + // memset(&stat,0,sizeof(DB_BTREE_STAT)); +- if (infoDb->stat (infoDb, &stat, DB_FAST_STAT)) ++ if (infoDb->stat (infoDb, NULL, &stat, DB_FAST_STAT)) + fprintf (stderr, "Cannot stat\n"); + nrec = stat->bt_nkeys; + free (stat); Added: trunk/openoffice/OOo_1.1.4-freetype-1.patch =================================================================== --- trunk/openoffice/OOo_1.1.4-freetype-1.patch 2005-03-22 16:05:53 UTC (rev 885) +++ trunk/openoffice/OOo_1.1.4-freetype-1.patch 2005-03-22 16:12:39 UTC (rev 886) @@ -0,0 +1,42 @@ +Submitted By: DJ Lucas <dj_At_linuxfromscratch_DOT_org> +Date: 2004-12-12 +Origin: Self +Initial Package Version: 1.1.3 +Description: Fixes build when used with system freetype-2.1.5+. +Upstream Status: Not submitted + +$LastChangedBy: dj $ +$Date: 2005-02-16 18:32:29 -0600 (Wed, 16 Feb 2005) $ + +--- OOo_1.1.3_src-orig/vcl/source/glyphs/gcach_ftyp.cxx 2004-08-27 05:00:20.000000000 -0500 ++++ OOo_1.1.3_src/vcl/source/glyphs/gcach_ftyp.cxx 2004-12-08 01:25:05.690230824 -0600 +@@ -77,12 +77,13 @@ + #include <osl/file.hxx> + #include <osl/thread.hxx> + +-#include "freetype/freetype.h" +-#include "freetype/ftglyph.h" +-#include "freetype/ftoutln.h" +-#include "freetype/tttables.h" +-#include "freetype/tttags.h" +-#include "freetype/ttnameid.h" ++#include <ft2build.h> ++#include <freetype/freetype.h> ++#include <freetype/ftglyph.h> ++#include <freetype/ftoutln.h> ++#include <freetype/tttables.h> ++#include <freetype/tttags.h> ++#include <freetype/ttnameid.h> + + #ifndef FREETYPE_PATCH + // VERSION_MINOR in freetype.h is too coarse +--- OOo_1.1.3_src-orig/vcl/source/glyphs/gcach_layout.cxx 2004-01-09 12:13:49.000000000 -0600 ++++ OOo_1.1.3_src/vcl/source/glyphs/gcach_layout.cxx 2004-12-08 01:26:45.845004984 -0600 +@@ -68,6 +68,7 @@ + #endif + + #ifndef _SV_GCACHFTYP_HXX ++#include <ft2build.h> + #include <freetype/freetype.h> + #include <gcach_ftyp.hxx> + #endif Added: trunk/openoffice/OOo_1.1.4-gcc33-1.patch =================================================================== --- trunk/openoffice/OOo_1.1.4-gcc33-1.patch 2005-03-22 16:05:53 UTC (rev 885) +++ trunk/openoffice/OOo_1.1.4-gcc33-1.patch 2005-03-22 16:12:39 UTC (rev 886) @@ -0,0 +1,21 @@ +Submitted By: DJ Lucas <dj_At_linuxfromscratch_DOT_org> +Date: 2004-12-25 +Origin: OOO-Build-1.3.7 +Initial Package Version: 1.1.4 +Description: Fixes build when used with gcc-3.3.4. +Upstream Status: Not required + +$LastChangedBy: dj $ +$Date: 2005-02-16 18:32:29 -0600 (Wed, 16 Feb 2005) $ + +--- OOo_1.1.3_src-orig/icu/makefile.mk 2003-07-16 12:26:10.000000000 -0500 ++++ OOo_1.1.3_src/icu/makefile.mk 2004-12-19 00:10:13.591321672 -0600 +@@ -93,7 +93,7 @@ + + CONFIGURE_DIR=source + +-CONFIGURE_ACTION=sh -c 'CFLAGS=-O CXXFLAGS=-O ./configure --enable-layout --enable-static --enable-shared=yes --enable-64bit-libs=no' ++CONFIGURE_ACTION=sh -c 'CFLAGS=-O CXXFLAGS=-O ./configure --enable-layout --enable-static --enable-shared=yes --enable-64bit-libs=no --enable-extras=no' + + #CONFIGURE_FLAGS=--enable-layout --enable-static --enable-shared=yes --enable-64bit-libs=no + CONFIGURE_FLAGS= Added: trunk/openoffice/OOo_1.1.4-jdk_1.4.2_fix-1.patch =================================================================== --- trunk/openoffice/OOo_1.1.4-jdk_1.4.2_fix-1.patch 2005-03-22 16:05:53 UTC (rev 885) +++ trunk/openoffice/OOo_1.1.4-jdk_1.4.2_fix-1.patch 2005-03-22 16:12:39 UTC (rev 886) @@ -0,0 +1,44 @@ +Submitted By: Tushar Teredesai <[EMAIL PROTECTED]> +Date: 2003-10-14 +Initial Package Version: 1.1.0 +Origin: http://archive.linuxfromscratch.org/mail-archives/blfs-dev/2003-October/003975.html + Posted by Michael Brömer +Description: Fixes compilation with jdk-1.4.2 +Upstream Status: Not applied + +$LastChangedBy: dj $ +$Date: 2005-02-16 18:32:29 -0600 (Wed, 16 Feb 2005) $ + +--- oo_1.1_src/odk/source/OOSupport/org/netbeans/modules/openoffice/wizard/OOIDLWizardIterator.java.orig 2003-10-14 00:36:53.000000000 -0500 ++++ oo_1.1_src/odk/source/OOSupport/org/netbeans/modules/openoffice/wizard/OOIDLWizardIterator.java 2003-10-14 00:38:40.000000000 -0500 +@@ -207,7 +207,7 @@ + index--; + } + +- public org.openide.WizardDescriptor$Panel current() ++ public org.openide.WizardDescriptor.Panel current() + { + return panels[index]; + } +--- oo_1.1_src/odk/source/OOSupport/org/netbeans/modules/openoffice/wizard/OOServiceCreateIterator.java.orig 2003-10-14 00:37:27.000000000 -0500 ++++ oo_1.1_src/odk/source/OOSupport/org/netbeans/modules/openoffice/wizard/OOServiceCreateIterator.java 2003-10-14 00:38:53.000000000 -0500 +@@ -214,7 +214,7 @@ + index--; + } + +- public org.openide.WizardDescriptor$Panel current() { ++ public org.openide.WizardDescriptor.Panel current() { + return panels[index]; + } + +--- oo_1.1_src/odk/source/OOSupport/org/netbeans/modules/openoffice/wizard/OOAddInCreateIterator.java.orig 2003-10-14 00:37:55.000000000 -0500 ++++ oo_1.1_src/odk/source/OOSupport/org/netbeans/modules/openoffice/wizard/OOAddInCreateIterator.java 2003-10-14 00:39:05.000000000 -0500 +@@ -200,7 +200,7 @@ + index--; + } + +- public org.openide.WizardDescriptor$Panel current() { ++ public org.openide.WizardDescriptor.Panel current() { + return panels[index]; + } + Added: trunk/openoffice/OOo_1.1.4-no_pam-1.patch =================================================================== --- trunk/openoffice/OOo_1.1.4-no_pam-1.patch 2005-03-22 16:05:53 UTC (rev 885) +++ trunk/openoffice/OOo_1.1.4-no_pam-1.patch 2005-03-22 16:12:39 UTC (rev 886) @@ -0,0 +1,192 @@ +Submitted By: DJ Lucas <dj_AT_linuxfromscratch_DOT_org> +Date: 2004-12-24 +Initial Package Version: 1.1rc4 +Origin: openoffice-1.1.2-no_pam-1.patch (Tushar Teredesai) +Description: OpenOffice requires PAM headers in /usr/include/security; + these headers are not available in most of the LFS based systems. This + patch removes the need for PAM headers by removing the functions that + use PAM. Updated for OpenOffice-1.1.3 +Upstream Status: Not Required + +$LastChangedBy: dj $ +$Date: 2005-02-16 18:32:29 -0600 (Wed, 16 Feb 2005) $ + +--- OOo_1.1.3_src/sal/osl/unx/security.c.orig 2004-12-24 14:18:55.966151056 -0600 ++++ OOo_1.1.3_src/sal/osl/unx/security.c 2004-12-24 14:20:47.761155632 -0600 +@@ -133,8 +133,6 @@ + * + */ + +-#include <security/pam_appl.h> +- + typedef struct { + char* name; + char* password; +@@ -143,10 +141,10 @@ + typedef struct { + int (*pam_start)(const char *service_name, const char *user, + const struct pam_conv *pam_conversation, +- pam_handle_t **pamh); +- int (*pam_end) (pam_handle_t *pamh, int pam_status); +- int (*pam_authenticate) (pam_handle_t *pamh, int flags); +- int (*pam_acct_mgmt) (pam_handle_t *pamh, int flags); ++ void **pamh); ++ int (*pam_end) (void *pamh, int pam_status); ++ int (*pam_authenticate) (void *pamh, int flags); ++ int (*pam_acct_mgmt) (void *pamh, int flags); + } sal_PamModule; + + /* +@@ -164,69 +162,7 @@ + osl_PamConversation (int num_msg, const struct pam_message **msgm, + struct pam_response **response, void *appdata_ptr) + { +- int i; +- sal_Bool error; +- sal_PamData *pam_data; +- struct pam_response *p_reply; +- +- /* resource initialization */ +- pam_data = (sal_PamData*) appdata_ptr; +- p_reply = (struct pam_response *) calloc( num_msg, +- sizeof(struct pam_response)); +- if ( p_reply == NULL || pam_data == NULL ) +- { +- if ( p_reply != NULL ) +- free ( p_reply ); +- *response = NULL; +- return PAM_CONV_ERR; +- } +- +- /* pseudo dialog */ +- error = sal_False; +- for ( i = 0; i < num_msg ; i++ ) +- { +- switch ( msgm[ i ]->msg_style ) +- { +- case PAM_PROMPT_ECHO_OFF: +- p_reply[ i ].resp_retcode = 0; +- p_reply[ i ].resp = strdup( pam_data->password ); +- break; +- case PAM_PROMPT_ECHO_ON: +- p_reply[ i ].resp_retcode = 0; +- p_reply[ i ].resp = strdup( pam_data->name ); +- break; +- case PAM_ERROR_MSG: +- case PAM_TEXT_INFO: +- case PAM_BINARY_PROMPT: +- case PAM_BINARY_MSG: +- p_reply[ i ].resp_retcode = 0; +- p_reply[ i ].resp = NULL; +- break; +- default: +- error = sal_True; +- break; +- } +- } +- +- /* free resources on error */ +- if ( error ) +- { +- for ( i = 0; i < num_msg ; i++ ) +- if ( p_reply[ i ].resp ) +- { +- memset ( p_reply[ i ].resp, 0, +- strlen( p_reply[ i ].resp ) ); +- free ( p_reply[ i ].resp ); +- } +- free ( p_reply ); +- +- *response = NULL; +- return PAM_CONV_ERR; +- } +- +- /* well done */ +- *response = p_reply; +- return PAM_SUCCESS; ++ return -1; + } + + /* +@@ -239,45 +175,6 @@ + static sal_PamModule* osl_getPAM() + { + static sal_PamModule *pam_module = NULL; +- static sal_Bool load_once = sal_False; +- +- if ( !load_once ) +- { +- /* get library-handle. cannot use osl-module, since +- RTLD_GLOBAL is required for PAM-0.64 RH 5.2 +- (but not for PAM-0.66 RH 6.0) */ +- void *pam_hdl; +- +- pam_hdl = dlopen( "libpam.so.0", RTLD_GLOBAL | RTLD_LAZY ); +- +- if ( pam_hdl != NULL ) +- pam_module = (sal_PamModule*)calloc( 1, sizeof(sal_PamModule) ); +- +- /* load functions */ +- if ( pam_module != NULL ) +- { +- pam_module->pam_acct_mgmt = (int (*)(pam_handle_t *, int)) dlsym ( pam_hdl, "pam_acct_mgmt" ); +- pam_module->pam_authenticate +- = (int (*)(pam_handle_t *, int)) dlsym ( pam_hdl, "pam_authenticate" ); +- pam_module->pam_end = (int (*)(pam_handle_t *, int)) dlsym ( pam_hdl, "pam_end" ); +- pam_module->pam_start = (int (*)(const char *, const char *, const struct pam_conv *, pam_handle_t **)) dlsym ( pam_hdl, "pam_start" ); +- +- /* free resources, if not completely successful */ +- if ( (pam_module->pam_start == NULL) +- || (pam_module->pam_end == NULL) +- || (pam_module->pam_authenticate == NULL) +- || (pam_module->pam_acct_mgmt == NULL) ) +- { +- free( pam_module ); +- pam_module = NULL; +- dlclose( pam_hdl ); +- } +- } +- +- /* never try again */ +- load_once = sal_True; +- } +- + return pam_module; + } + +@@ -289,35 +186,6 @@ + osl_PamAuthentification( const sal_Char* name, const sal_Char* password ) + { + sal_Bool success = sal_False; +- +- sal_PamModule* pam_module; +- +- pam_module = osl_getPAM(); +- if ( pam_module != NULL ) +- { +- pam_handle_t *pam_handle = NULL; +- struct pam_conv pam_conversation; +- sal_PamData pam_data; +- +- int return_value; +- +- pam_data.name = (char*) name; +- pam_data.password = (char*) password; +- +- pam_conversation.conv = osl_PamConversation; +- pam_conversation.appdata_ptr = (void*)(&pam_data); +- +- return_value = pam_module->pam_start( "su", name, +- &pam_conversation, &pam_handle); +- if (return_value == PAM_SUCCESS ) +- return_value = pam_module->pam_authenticate(pam_handle, 0); +- if (return_value == PAM_SUCCESS ) +- return_value = pam_module->pam_acct_mgmt(pam_handle, 0); +- pam_module->pam_end( pam_handle, return_value ); +- +- success = (sal_Bool)(return_value == PAM_SUCCESS); +- } +- + return success; + } + Added: trunk/openoffice/OOo_1.1.4-nptl-1.patch =================================================================== --- trunk/openoffice/OOo_1.1.4-nptl-1.patch 2005-03-22 16:05:53 UTC (rev 885) +++ trunk/openoffice/OOo_1.1.4-nptl-1.patch 2005-03-22 16:12:39 UTC (rev 886) @@ -0,0 +1,25 @@ +Submitted By: DJ Lucas <dj_AT_linuxfromscratch_DOT_org> +Date: 2004-12-12 +Initial Package Version: 1.1.3 +Origin: Gentoo +Description: Fixes compilation with nptl. +Upstream Status: Unknown (uneeded???) + +$LastChangedBy: dj $ +$Date: 2005-02-16 18:32:29 -0600 (Wed, 16 Feb 2005) $ + +diff -Naur OOo_1.1.3_src-orig/sal/osl/unx/process.c OOo_1.1.3_src/sal/osl/unx/process.c +--- OOo_1.1.3_src-orig/sal/osl/unx/process.c 2003-07-02 08:34:17.000000000 -0500 ++++ OOo_1.1.3_src/sal/osl/unx/process.c 2004-12-07 22:02:03.317233024 -0600 +@@ -1017,11 +1017,6 @@ + for (i = 0; data.m_pszEnv[i] != NULL; i++) + putenv(data.m_pszEnv[i]); + +-#if defined(LINUX) +- /* mfe: linux likes to have just one thread when the exec family is called */ +- /* this np function has this purpose ... */ +- pthread_kill_other_threads_np(); +-#endif + OSL_TRACE("ChildStatusProc : starting '%s'",data.m_pszArgs[0]); + + /* Connect std IO to pipe ends */ Added: trunk/openoffice/OOo_1.1.4-test_bin_loc-1.patch =================================================================== --- trunk/openoffice/OOo_1.1.4-test_bin_loc-1.patch 2005-03-22 16:05:53 UTC (rev 885) +++ trunk/openoffice/OOo_1.1.4-test_bin_loc-1.patch 2005-03-22 16:12:39 UTC (rev 886) @@ -0,0 +1,84 @@ +Submitted By: Tushar Teredesai <[EMAIL PROTECTED]> +Date: 2003-09-21 +Origin: http://www.openoffice.org/issues/show_bug.cgi?id=10719 +Initial Package Version: 1.1rc4 +Description: The installation script looks for test binary in the wrong + location. LFS installs the binary in /bin. If the test binary is not found, + it results in a corrupted installation. This patch is part of the BLFS book. +Upstream Status: Not applied + +$LastChangedBy: dj $ +$Date: 2005-02-16 18:32:29 -0600 (Wed, 16 Feb 2005) $ + +diff -ur oo_1.1rc4_src.orig/setup2/script/serverstartup.sh oo_1.1rc4_src/setup2/script/serverstartup.sh +--- oo_1.1rc4_src.orig/setup2/script/serverstartup.sh 2003-06-12 04:53:08.000000000 -0500 ++++ oo_1.1rc4_src/setup2/script/serverstartup.sh 2003-09-21 02:13:07.000000000 -0500 +@@ -66,7 +66,7 @@ + SCO_SV) test=/bin/test ;; + NetBSD) test=/bin/test ;; + FreeBSD) test=/bin/test ;; +- *) test=/usr/bin/test ;; ++ *) test=/bin/test ;; + esac + + if $test -L "$0" ; then +diff -ur oo_1.1rc4_src.orig/setup2/script/setupserver oo_1.1rc4_src/setup2/script/setupserver +--- oo_1.1rc4_src.orig/setup2/script/setupserver 2003-06-12 04:53:18.000000000 -0500 ++++ oo_1.1rc4_src/setup2/script/setupserver 2003-09-21 02:13:16.000000000 -0500 +@@ -235,7 +235,7 @@ + case $sd_platform in + SCO_SV) test=/bin/test ;; + FreeBSD) test=/bin/test ;; +- *) test=/usr/bin/test ;; ++ *) test=/bin/test ;; + esac + sd_cwd="`pwd`" + +diff -ur oo_1.1rc4_src.orig/setup2/script/websnooper oo_1.1rc4_src/setup2/script/websnooper +--- oo_1.1rc4_src.orig/setup2/script/websnooper 2003-06-12 04:53:55.000000000 -0500 ++++ oo_1.1rc4_src/setup2/script/websnooper 2003-09-21 02:13:23.000000000 -0500 +@@ -7,7 +7,7 @@ + SCO_SV) test=/bin/test ;; + NetBSD) test=/bin/test ;; + FreeBSD) test=/bin/test ;; +- *) test=/usr/bin/test ;; ++ *) test=/bin/test ;; + esac + + if $test -L "$0" ; then +diff -ur oo_1.1rc4_src.orig/setup2/source/custom/jvmsetup/loader/jvmsetup.sh oo_1.1rc4_src/setup2/source/custom/jvmsetup/loader/jvmsetup.sh +--- oo_1.1rc4_src.orig/setup2/source/custom/jvmsetup/loader/jvmsetup.sh 2003-06-12 04:54:49.000000000 -0500 ++++ oo_1.1rc4_src/setup2/source/custom/jvmsetup/loader/jvmsetup.sh 2003-09-21 02:13:29.000000000 -0500 +@@ -67,7 +67,7 @@ + case $sd_platform in + SCO_SV) test=/bin/test ;; + FreeBSD) test=/bin/test ;; +- *) test=/usr/bin/test ;; ++ *) test=/bin/test ;; + esac + + sd_cwd="`pwd`" +diff -ur oo_1.1rc4_src.orig/ucb/source/main/ucb.sh oo_1.1rc4_src/ucb/source/main/ucb.sh +--- oo_1.1rc4_src.orig/ucb/source/main/ucb.sh 2001-04-08 16:29:21.000000000 -0500 ++++ oo_1.1rc4_src/ucb/source/main/ucb.sh 2003-09-21 02:13:43.000000000 -0500 +@@ -78,7 +78,7 @@ + SCO_SV) test=/bin/test ;; + NetBSD) test=/bin/test ;; + FreeBSD) test=/bin/test ;; +- *) test=/usr/bin/test ;; ++ *) test=/bin/test ;; + esac + + sd_cwd="`pwd`" +diff -ur oo_1.1rc4_src.orig/xmlhelp/source/com/sun/star/help/helpserver.sh oo_1.1rc4_src/xmlhelp/source/com/sun/star/help/helpserver.sh +--- oo_1.1rc4_src.orig/xmlhelp/source/com/sun/star/help/helpserver.sh 2003-03-27 12:07:29.000000000 -0600 ++++ oo_1.1rc4_src/xmlhelp/source/com/sun/star/help/helpserver.sh 2003-09-21 02:13:37.000000000 -0500 +@@ -124,7 +124,7 @@ + sd_platform=`uname -s` + case $sd_platform in + SCO_SV) test=/bin/test ;; +- *) test=/usr/bin/test ;; ++ *) test=/bin/test ;; + esac + sd_cwd="`pwd`" + Added: trunk/php/php-5.0.3-db43-1.patch =================================================================== --- trunk/php/php-5.0.3-db43-1.patch 2005-03-22 16:05:53 UTC (rev 885) +++ trunk/php/php-5.0.3-db43-1.patch 2005-03-22 16:12:39 UTC (rev 886) @@ -0,0 +1,21 @@ +Submitted By: Igor Zivkovic <[EMAIL PROTECTED]> +Date: 2005-01-10 +Initial Package Version: 5.0.3 +Upstream Status: Not submitted. +Origin: http://www.sleepycat.com/docs/ref/upgrade.4.3/toc.html +Description: Adds support for Berkeley DB-4.3.x. + +$LastChangedBy: igor $ +$Date: 2005-01-10 16:43:51 -0600 (Mon, 10 Jan 2005) $ + +--- php-5.0.3/ext/dba/dba_db4.c.orig 2005-01-10 00:10:49.798665848 +0000 ++++ php-5.0.3/ext/dba/dba_db4.c 2005-01-10 00:23:10.805015760 +0000 +@@ -36,7 +36,7 @@ + #include <db.h> + #endif + +-static void php_dba_db4_errcall_fcn(const char *errpfx, char *msg) ++static void php_dba_db4_errcall_fcn(const DB_ENV *dbenv, const char *errpfx, const char *msg) + { + TSRMLS_FETCH(); + -- http://linuxfromscratch.org/mailman/listinfo/patches FAQ: http://www.linuxfromscratch.org/faq/ Unsubscribe: See the above information page
