SliTaz Repositories

     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/netatalk/stuff/netatalk-2.0.3-newer-db.patch	Wed Mar 03 11:21:08 2010 +0000
     1.3 @@ -0,0 +1,94 @@
     1.4 +diff -urN netatalk-2.0.3.orig/bin/cnid/cnid_index.c netatalk-2.0.3/bin/cnid/cnid_index.c
     1.5 +--- netatalk-2.0.3.orig/bin/cnid/cnid_index.c	2005-04-10 12:49:18.000000000 +0000
     1.6 ++++ netatalk-2.0.3/bin/cnid/cnid_index.c	2007-08-11 17:01:38.000000000 +0000
     1.7 +@@ -1,5 +1,5 @@
     1.8 + /*
     1.9 +- * $Id: cnid_index.c,v 1.1.2.4 2005/04/10 12:49:18 didg Exp $
    1.10 ++ * $Id: cnid_index.c,v 1.1.2.5 2005/09/13 16:57:44 didg Exp $
    1.11 +  *
    1.12 +  * All Rights Reserved.  See COPYING.
    1.13 +  */
    1.14 +@@ -274,7 +274,11 @@
    1.15 +     DB_BTREE_STAT *sp;
    1.16 +     DB *db = db_table[dbi].db;
    1.17 + 
    1.18 ++#if DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 3)
    1.19 ++    ret = db->stat(db, db_txn, &sp, 0);
    1.20 ++#else
    1.21 +     ret = db->stat(db, &sp, 0);
    1.22 ++#endif
    1.23 + 
    1.24 +     if (ret) {
    1.25 +         LOG(log_error, logtype_cnid, "error getting stat infotmation on database: %s", db_strerror(errno));
    1.26 +diff -urN netatalk-2.0.3.orig/etc/cnid_dbd/dbif.c netatalk-2.0.3/etc/cnid_dbd/dbif.c
    1.27 +--- netatalk-2.0.3.orig/etc/cnid_dbd/dbif.c	2004-12-21 13:36:12.000000000 +0000
    1.28 ++++ netatalk-2.0.3/etc/cnid_dbd/dbif.c	2007-08-11 17:10:19.000000000 +0000
    1.29 +@@ -1,5 +1,5 @@
    1.30 + /*
    1.31 +- * $Id: dbif.c,v 1.1.4.15.2.1 2004/12/21 13:36:12 didg Exp $
    1.32 ++ * $Id: dbif.c,v 1.1.4.15.2.2 2005/09/13 16:57:45 didg Exp $
    1.33 +  *
    1.34 +  * Copyright (C) Joerg Lenneis 2003
    1.35 +  * All Rights Reserved.  See COPYING.
    1.36 +@@ -514,7 +514,11 @@
    1.37 +     DB_BTREE_STAT *sp;
    1.38 +     DB *db = db_table[dbi].db;
    1.39 + 
    1.40 ++#if DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 3)
    1.41 ++    ret = db->stat(db, db_txn, &sp, 0);
    1.42 ++#else
    1.43 +     ret = db->stat(db, &sp, 0);
    1.44 ++#endif
    1.45 + 
    1.46 +     if (ret) {
    1.47 +         LOG(log_error, logtype_cnid, "error getting stat infotmation on database: %s", db_strerror(errno));
    1.48 +diff -urN netatalk-2.0.3.orig/macros/db3-check.m4 netatalk-2.0.3/macros/db3-check.m4
    1.49 +--- netatalk-2.0.3.orig/macros/db3-check.m4	2004-08-11 03:01:11.000000000 +0000
    1.50 ++++ netatalk-2.0.3/macros/db3-check.m4	2007-08-11 16:57:02.000000000 +0000
    1.51 +@@ -1,4 +1,4 @@
    1.52 +-dnl $Id: db3-check.m4,v 1.11.6.9 2004/08/11 03:01:11 bfernhomberg Exp $
    1.53 ++dnl $Id: db3-check.m4,v 1.11.6.9.2.2 2006/09/09 01:36:39 didg Exp $
    1.54 + dnl Autoconf macros to check for the Berkeley DB library
    1.55 + 
    1.56 + 
    1.57 +@@ -111,7 +111,12 @@
    1.58 + 	CFLAGS="$savedcflags"
    1.59 + ])
    1.60 + 
    1.61 +-
    1.62 ++dnl I don't understand this stuff below
    1.63 ++dnl AFAIK it works for 4.1 and 4.2 and (4.3 xor 4.4) 
    1.64 ++dnl you can have 4.2 and 4.3 installed
    1.65 ++dnl but If you have 4.3 and 4.4 it won't work with 4.3
    1.66 ++dnl only 4.4
    1.67 ++dnl didier 
    1.68 + AC_DEFUN([NETATALK_BERKELEY_LINK],
    1.69 + [
    1.70 + atalk_cv_lib_db=no
    1.71 +@@ -119,6 +124,17 @@
    1.72 + NETATALK_BDB_LINK_TRY(atalk_cv_db_db42,[-ldb42])
    1.73 + NETATALK_BDB_LINK_TRY(atalk_cv_db_db_42,[-ldb-42])
    1.74 + NETATALK_BDB_LINK_TRY(atalk_cv_db_db_4_2,[-ldb-4-2])
    1.75 ++
    1.76 ++NETATALK_BDB_LINK_TRY(atalk_cv_db_db_4_dot_2,[-ldb-4.4])
    1.77 ++NETATALK_BDB_LINK_TRY(atalk_cv_db_db42,[-ldb44])
    1.78 ++NETATALK_BDB_LINK_TRY(atalk_cv_db_db_42,[-ldb-44])
    1.79 ++NETATALK_BDB_LINK_TRY(atalk_cv_db_db_4_2,[-ldb-4-4])
    1.80 ++
    1.81 ++NETATALK_BDB_LINK_TRY(atalk_cv_db_db_4_dot_2,[-ldb-4.3])
    1.82 ++NETATALK_BDB_LINK_TRY(atalk_cv_db_db42,[-ldb43])
    1.83 ++NETATALK_BDB_LINK_TRY(atalk_cv_db_db_42,[-ldb-43])
    1.84 ++NETATALK_BDB_LINK_TRY(atalk_cv_db_db_4_2,[-ldb-4-3])
    1.85 ++
    1.86 + NETATALK_BDB_LINK_TRY(atalk_cv_db_db_4_dot_1,[-ldb-4.1])
    1.87 + NETATALK_BDB_LINK_TRY(atalk_cv_db_db41,[-ldb41])
    1.88 + NETATALK_BDB_LINK_TRY(atalk_cv_db_db_41,[-ldb-41])
    1.89 +@@ -134,7 +150,7 @@
    1.90 + 	trybdbdir=""
    1.91 + 	dobdbsearch=yes
    1.92 + 	bdb_search_dirs="/usr/local/include /usr/include"
    1.93 +-	search_subdirs="/db4.2 /db42 /db4.1 /db41 /db4 /"
    1.94 ++	search_subdirs="/db4.2 /db42 /db4.3 /db43 /db4.4 /db44 /db4.1 /db41 /db4 /"
    1.95 + 
    1.96 + dnl required BDB version
    1.97 + 	DB_MAJOR_REQ=4