From 3183e5f76424681bd86630a6d35a5c65201d31fe Mon Sep 17 00:00:00 2001
From: Maros Barabas <mbarabas@fedoraproject.org>
Date: Sep 12 2007 11:09:00 +0000
Subject: Build fix


---

diff --git a/netatalk-2.0.3-build_open.patch b/netatalk-2.0.3-build_open.patch
new file mode 100644
index 0000000..c883eac
--- /dev/null
+++ b/netatalk-2.0.3-build_open.patch
@@ -0,0 +1,36 @@
+--- netatalk-2.0.3/libatalk/cnid/cdb/cnid_cdb_open.c.old	2004-03-22 05:38:51.000000000 +0100
++++ netatalk-2.0.3/libatalk/cnid/cdb/cnid_cdb_open.c	2007-09-11 17:59:59.000000000 +0200
+@@ -131,9 +131,9 @@
+ static int my_open(DB * p, const char *f, const char *d, DBTYPE t, u_int32_t flags, int mode)
+ {
+ #if DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1)
+-    return p->open(p, NULL, f, d, t, flags, mode);
++    return (p->open)(p, NULL, f, d, t, flags, mode);
+ #else
+-    return p->open(p, f, d, t, flags, mode);
++    return (p->open)(p, f, d, t, flags, mode);
+ #endif
+ }
+ 
+@@ -275,7 +275,7 @@
+     }
+ 
+     /* Open the database environment. */
+-    if ((rc = db->dbenv->open(db->dbenv, path, DBOPTIONS, 0666 & ~mask)) != 0) {
++    if ((rc = (db->dbenv->open)(db->dbenv, path, DBOPTIONS, 0666 & ~mask)) != 0) {
+ 	LOG(log_error, logtype_default, "cnid_open: dbenv->open (rw) of %s failed: %s", path, db_strerror(rc));
+ 	/* FIXME: This should probably go. Even if it worked, any use for a read-only DB? Didier? */
+         if (rc == DB_RUNRECOVERY) {
+@@ -288,10 +288,10 @@
+         /* We can't get a full transactional environment, so multi-access
+          * is out of the question.  Let's assume a read-only environment,
+          * and try to at least get a shared memory pool. */
+-        if ((rc = db->dbenv->open(db->dbenv, path, DB_INIT_MPOOL, 0666 & ~mask)) != 0) {
++        if ((rc = (db->dbenv->open)(db->dbenv, path, DB_INIT_MPOOL, 0666 & ~mask)) != 0) {
+             /* Nope, not a MPOOL, either.  Last-ditch effort: we'll try to
+              * open the environment with no flags. */
+-            if ((rc = db->dbenv->open(db->dbenv, path, 0, 0666 & ~mask)) != 0) {
++            if ((rc = (db->dbenv->open)(db->dbenv, path, 0, 0666 & ~mask)) != 0) {
+                 LOG(log_error, logtype_default, "cnid_open: dbenv->open of %s failed: %s", path, db_strerror(rc));
+                 goto fail_lock;
+             }
diff --git a/netatalk.spec b/netatalk.spec
index 3b3910c..76ad578 100644
--- a/netatalk.spec
+++ b/netatalk.spec
@@ -1,7 +1,7 @@
 Summary: AppleTalk networking programs
 Name:    netatalk
 Version: 2.0.3
-Release: 13%{?dist}
+Release: 14%{?dist}
 Epoch:   4
 License: GPL
 Group:   System Environment/Daemons
@@ -16,6 +16,7 @@ Patch1:  netatalk-2.0.2-db4_2-db4_3.patch
 Patch2:  netatalk-2.0.2-uams_no_pie.patch
 Patch3:  netatalk-2.0.2-extern_ucreator.patch
 Patch4:  netatalk-2.0.3-nodefault.patch
+Patch5:  netatalk-2.0.3-build_open.patch
 Url:	 http://netatalk.sourceforge.net/
 Requires: pam
 Requires(post): /sbin/chkconfig /sbin/ldconfig
@@ -48,6 +49,7 @@ programs.
 %patch2  -p1 -b .uams_no_pie
 %patch3  -p1 -b .extern_ucreator
 %patch4  -p1
+%patch5  -p1 -b .build_open
 
 ln -s ./NEWS ChangeLog
 
@@ -186,6 +188,9 @@ fi
 %{_mandir}/man*/netatalk-config.1*
 
 %changelog
+* Wed Sep 12 2007 Maros Barabas <mbarabas@redhat.com> -4:2.0.3-14
+- patch to build on FC, bad open call 
+
 * Tue Sep 11 2007 Maros Barabas <mbarabas@redhat.com> - 4:2.0.3-13
 - rebuild