wok annotate netatalk/stuff/netatalk-2.0.3-newer-db.patch @ rev 5884

unfs3: add CONFIG_FILES
author Pascal Bellard <pascal.bellard@slitaz.org>
date Wed Jul 21 15:02:43 2010 +0200 (2010-07-21)
parents
children
rev   line source
pascal@1255 1 diff -urN netatalk-2.0.3.orig/bin/cnid/cnid_index.c netatalk-2.0.3/bin/cnid/cnid_index.c
pascal@1255 2 --- netatalk-2.0.3.orig/bin/cnid/cnid_index.c 2005-04-10 12:49:18.000000000 +0000
pascal@1255 3 +++ netatalk-2.0.3/bin/cnid/cnid_index.c 2007-08-11 17:01:38.000000000 +0000
pascal@1255 4 @@ -1,5 +1,5 @@
pascal@1255 5 /*
pascal@1255 6 - * $Id: cnid_index.c,v 1.1.2.4 2005/04/10 12:49:18 didg Exp $
pascal@1255 7 + * $Id: cnid_index.c,v 1.1.2.5 2005/09/13 16:57:44 didg Exp $
pascal@1255 8 *
pascal@1255 9 * All Rights Reserved. See COPYING.
pascal@1255 10 */
pascal@1255 11 @@ -274,7 +274,11 @@
pascal@1255 12 DB_BTREE_STAT *sp;
pascal@1255 13 DB *db = db_table[dbi].db;
pascal@1255 14
pascal@1255 15 +#if DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 3)
pascal@1255 16 + ret = db->stat(db, db_txn, &sp, 0);
pascal@1255 17 +#else
pascal@1255 18 ret = db->stat(db, &sp, 0);
pascal@1255 19 +#endif
pascal@1255 20
pascal@1255 21 if (ret) {
pascal@1255 22 LOG(log_error, logtype_cnid, "error getting stat infotmation on database: %s", db_strerror(errno));
pascal@1255 23 diff -urN netatalk-2.0.3.orig/etc/cnid_dbd/dbif.c netatalk-2.0.3/etc/cnid_dbd/dbif.c
pascal@1255 24 --- netatalk-2.0.3.orig/etc/cnid_dbd/dbif.c 2004-12-21 13:36:12.000000000 +0000
pascal@1255 25 +++ netatalk-2.0.3/etc/cnid_dbd/dbif.c 2007-08-11 17:10:19.000000000 +0000
pascal@1255 26 @@ -1,5 +1,5 @@
pascal@1255 27 /*
pascal@1255 28 - * $Id: dbif.c,v 1.1.4.15.2.1 2004/12/21 13:36:12 didg Exp $
pascal@1255 29 + * $Id: dbif.c,v 1.1.4.15.2.2 2005/09/13 16:57:45 didg Exp $
pascal@1255 30 *
pascal@1255 31 * Copyright (C) Joerg Lenneis 2003
pascal@1255 32 * All Rights Reserved. See COPYING.
pascal@1255 33 @@ -514,7 +514,11 @@
pascal@1255 34 DB_BTREE_STAT *sp;
pascal@1255 35 DB *db = db_table[dbi].db;
pascal@1255 36
pascal@1255 37 +#if DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 3)
pascal@1255 38 + ret = db->stat(db, db_txn, &sp, 0);
pascal@1255 39 +#else
pascal@1255 40 ret = db->stat(db, &sp, 0);
pascal@1255 41 +#endif
pascal@1255 42
pascal@1255 43 if (ret) {
pascal@1255 44 LOG(log_error, logtype_cnid, "error getting stat infotmation on database: %s", db_strerror(errno));
pascal@1255 45 diff -urN netatalk-2.0.3.orig/macros/db3-check.m4 netatalk-2.0.3/macros/db3-check.m4
pascal@1255 46 --- netatalk-2.0.3.orig/macros/db3-check.m4 2004-08-11 03:01:11.000000000 +0000
pascal@1255 47 +++ netatalk-2.0.3/macros/db3-check.m4 2007-08-11 16:57:02.000000000 +0000
pascal@1255 48 @@ -1,4 +1,4 @@
pascal@1255 49 -dnl $Id: db3-check.m4,v 1.11.6.9 2004/08/11 03:01:11 bfernhomberg Exp $
pascal@1255 50 +dnl $Id: db3-check.m4,v 1.11.6.9.2.2 2006/09/09 01:36:39 didg Exp $
pascal@1255 51 dnl Autoconf macros to check for the Berkeley DB library
pascal@1255 52
pascal@1255 53
pascal@1255 54 @@ -111,7 +111,12 @@
pascal@1255 55 CFLAGS="$savedcflags"
pascal@1255 56 ])
pascal@1255 57
pascal@1255 58 -
pascal@1255 59 +dnl I don't understand this stuff below
pascal@1255 60 +dnl AFAIK it works for 4.1 and 4.2 and (4.3 xor 4.4)
pascal@1255 61 +dnl you can have 4.2 and 4.3 installed
pascal@1255 62 +dnl but If you have 4.3 and 4.4 it won't work with 4.3
pascal@1255 63 +dnl only 4.4
pascal@1255 64 +dnl didier
pascal@1255 65 AC_DEFUN([NETATALK_BERKELEY_LINK],
pascal@1255 66 [
pascal@1255 67 atalk_cv_lib_db=no
pascal@1255 68 @@ -119,6 +124,17 @@
pascal@1255 69 NETATALK_BDB_LINK_TRY(atalk_cv_db_db42,[-ldb42])
pascal@1255 70 NETATALK_BDB_LINK_TRY(atalk_cv_db_db_42,[-ldb-42])
pascal@1255 71 NETATALK_BDB_LINK_TRY(atalk_cv_db_db_4_2,[-ldb-4-2])
pascal@1255 72 +
pascal@1255 73 +NETATALK_BDB_LINK_TRY(atalk_cv_db_db_4_dot_2,[-ldb-4.4])
pascal@1255 74 +NETATALK_BDB_LINK_TRY(atalk_cv_db_db42,[-ldb44])
pascal@1255 75 +NETATALK_BDB_LINK_TRY(atalk_cv_db_db_42,[-ldb-44])
pascal@1255 76 +NETATALK_BDB_LINK_TRY(atalk_cv_db_db_4_2,[-ldb-4-4])
pascal@1255 77 +
pascal@1255 78 +NETATALK_BDB_LINK_TRY(atalk_cv_db_db_4_dot_2,[-ldb-4.3])
pascal@1255 79 +NETATALK_BDB_LINK_TRY(atalk_cv_db_db42,[-ldb43])
pascal@1255 80 +NETATALK_BDB_LINK_TRY(atalk_cv_db_db_42,[-ldb-43])
pascal@1255 81 +NETATALK_BDB_LINK_TRY(atalk_cv_db_db_4_2,[-ldb-4-3])
pascal@1255 82 +
pascal@1255 83 NETATALK_BDB_LINK_TRY(atalk_cv_db_db_4_dot_1,[-ldb-4.1])
pascal@1255 84 NETATALK_BDB_LINK_TRY(atalk_cv_db_db41,[-ldb41])
pascal@1255 85 NETATALK_BDB_LINK_TRY(atalk_cv_db_db_41,[-ldb-41])
pascal@1255 86 @@ -134,7 +150,7 @@
pascal@1255 87 trybdbdir=""
pascal@1255 88 dobdbsearch=yes
pascal@1255 89 bdb_search_dirs="/usr/local/include /usr/include"
pascal@1255 90 - search_subdirs="/db4.2 /db42 /db4.1 /db41 /db4 /"
pascal@1255 91 + search_subdirs="/db4.2 /db42 /db4.3 /db43 /db4.4 /db44 /db4.1 /db41 /db4 /"
pascal@1255 92
pascal@1255 93 dnl required BDB version
pascal@1255 94 DB_MAJOR_REQ=4