2 changed files with 134 additions and 0 deletions
@ -0,0 +1,41 @@
|
||||
--- apr-util/dbm/apr_dbm_berkeleydb.c.orig 2002-12-04 21:53:07.000000000 +0100
|
||||
+++ apr-util/dbm/apr_dbm_berkeleydb.c 2002-12-05 20:35:36.000000000 +0100
|
||||
@@ -73,9 +73,7 @@
|
||||
*/
|
||||
|
||||
#if defined(DB_VERSION_MAJOR) && (DB_VERSION_MAJOR == 4)
|
||||
-/* At this time, there are no differences from our perspective between
|
||||
- * DB3 and DB4. */
|
||||
-#define DB_VER 3
|
||||
+#define DB_VER 4
|
||||
#elif defined(DB_VERSION_MAJOR) && (DB_VERSION_MAJOR == 3)
|
||||
#define DB_VER 3
|
||||
#elif defined(DB_VERSION_MAJOR) && (DB_VERSION_MAJOR == 2)
|
||||
@@ -193,7 +191,17 @@
|
||||
{
|
||||
int dberr;
|
||||
|
||||
-#if DB_VER == 3
|
||||
+#if DB_VER == 4 && DB_VERSION_MINOR >= 1
|
||||
+ if ((dberr = db_create(&file.bdb, NULL, 0)) == 0) {
|
||||
+ if ((dberr = (*file.bdb->open)(file.bdb, NULL, pathname, NULL,
|
||||
+ DB_HASH, dbmode,
|
||||
+ apr_posix_perms2mode(perm))) != 0) {
|
||||
+ /* close the DB handler */
|
||||
+ (void) (*file.bdb->close)(file.bdb, 0);
|
||||
+ }
|
||||
+ }
|
||||
+ file.curs = NULL;
|
||||
+#elif DB_VER == 3
|
||||
if ((dberr = db_create(&file.bdb, NULL, 0)) == 0) {
|
||||
if ((dberr = (*file.bdb->open)(file.bdb, pathname, NULL,
|
||||
DB_HASH, dbmode,
|
||||
@@ -339,7 +347,7 @@
|
||||
dberr = (*f->bdb->seq)(f->bdb, &first, &data, R_FIRST);
|
||||
#else
|
||||
if ((dberr = (*f->bdb->cursor)(f->bdb, NULL, &f->curs
|
||||
-#if DB_VER == 3
|
||||
+#if (DB_VER == 3 || DB_VER == 4)
|
||||
, 0
|
||||
#elif (DB_VERSION_MAJOR == 2) && (DB_VERSION_MINOR > 5)
|
||||
, 0
|
||||
@ -0,0 +1,93 @@
|
||||
## |
||||
## subversion.spec -- OpenPKG RPM Specification |
||||
## Copyright (c) 2000-2002 Cable & Wireless Deutschland GmbH |
||||
## Copyright (c) 2000-2002 The OpenPKG Project <http://www.openpkg.org/> |
||||
## Copyright (c) 2000-2002 Ralf S. Engelschall <rse@engelschall.com> |
||||
## |
||||
## Permission to use, copy, modify, and distribute this software for |
||||
## any purpose with or without fee is hereby granted, provided that |
||||
## the above copyright notice and this permission notice appear in all |
||||
## copies. |
||||
## |
||||
## THIS SOFTWARE IS PROVIDED AS IS'' AND ANY EXPRESSED OR IMPLIED |
||||
## WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF |
||||
## MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. |
||||
## IN NO EVENT SHALL THE AUTHORS AND COPYRIGHT HOLDERS AND THEIR |
||||
## CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, |
||||
## SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT |
||||
## LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF |
||||
## USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND |
||||
## ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, |
||||
## OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT |
||||
## OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF |
||||
## SUCH DAMAGE. |
||||
## |
||||
|
||||
# package version |
||||
%define V_release 0.16.0 |
||||
%define V_subdir 15/2123 |
||||
%define V_built 3987 |
||||
|
||||
# package information |
||||
Name: subversion |
||||
Summary: Source Revision Control System |
||||
URL: http://subversion.tigris.org/ |
||||
Vendor: Tigris |
||||
Packager: The OpenPKG Project |
||||
Distribution: OpenPKG [EVAL] |
||||
Group: SCM |
||||
License: Apache/BSD |
||||
Version: %{V_release} |
||||
Release: 20021205 |
||||
|
||||
# list of sources |
||||
Source0: http://subversion.tigris.org/files/documents/%{V_subdir}/subversion-r%{V_built}.tar.gz |
||||
Patch0: subversion.patch |
||||
|
||||
# build information |
||||
Prefix: %{l_prefix} |
||||
BuildRoot: %{l_buildroot} |
||||
BuildPreReq: OpenPKG, openpkg >= 20020206, libxml, db, diffutils, openssl, zlib |
||||
PreReq: OpenPKG, openpkg >= 20020206, diffutils |
||||
AutoReq: no |
||||
AutoReqProv: no |
||||
|
||||
%description |
||||
Subversion is a new version control system that is a compelling |
||||
replacement for CVS. |
||||
|
||||
%prep |
||||
%setup -q -n subversion-r%{V_built} |
||||
%patch -p0 |
||||
|
||||
%build |
||||
CC="%{l_cc}" \ |
||||
CFLAGS="%{l_cflags -O}" \ |
||||
CPPFLAGS="%{l_cppflags} -I%{l_prefix}/include/libxml2" \ |
||||
LDFLAGS="%{l_ldflags}" \ |
||||
./configure \ |
||||
--prefix=%{l_prefix} \ |
||||
--with-berkeley-db=%{l_prefix} \ |
||||
--with-ssl \ |
||||
--with-zlib \ |
||||
--disable-shared |
||||
%{l_make} %{l_mflags -O} |
||||
|
||||
%install |
||||
rm -rf $RPM_BUILD_ROOT |
||||
%{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT |
||||
rm -rf $RPM_BUILD_ROOT%{l_prefix}/include |
||||
rm -rf $RPM_BUILD_ROOT%{l_prefix}/lib |
||||
rm -rf $RPM_BUILD_ROOT%{l_prefix}/share/doc |
||||
rm -rf $RPM_BUILD_ROOT%{l_prefix}/build |
||||
rm -f $RPM_BUILD_ROOT%{l_prefix}/man/man1/neon* |
||||
rm -rf $RPM_BUILD_ROOT%{l_prefix}/man/man3 |
||||
rm -f $RPM_BUILD_ROOT%{l_prefix}/bin/*-config |
||||
strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true |
||||
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} |
||||
|
||||
%files -f files |
||||
|
||||
%clean |
||||
rm -rf $RPM_BUILD_ROOT |
||||
|
||||
Loading…
Reference in new issue