Source Mage code commit list

[George Sherwood <scm AT sourcemage.org>]

GIT changes to master grimoire by George Sherwood <gsherwood AT sourcemage.org>:

 disk/netatalk/DETAILS                      |    4 +--
 disk/netatalk/HISTORY                      |    8 ++++++-
 disk/netatalk/PRE_BUILD                    |    4 ---
 disk/netatalk/netatalk-2.0.3-db43.patch    |   32 
-----------------------------
 disk/netatalk/netatalk-2.0.3-newerdb.patch |   28 -------------------------
 5 files changed, 9 insertions(+), 67 deletions(-)

New commits:
commit 9797f92442bee100e05964a1ca72045190d79609
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>

    netatalk: Updated to version 2.0.4. Removed incorporated patches.

diff --git a/disk/netatalk/DETAILS b/disk/netatalk/DETAILS
index 3c1a4c3..62f552e 100755
--- a/disk/netatalk/DETAILS
+++ b/disk/netatalk/DETAILS
@@ -1,9 +1,9 @@
            SPELL=netatalk
-         VERSION=2.0.3
+         VERSION=2.0.4
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
-     
SOURCE_HASH=sha512:28067912c440663213ddfbb71406daa0ecb7bd9d4e06f66978d259afd0eec2b3f01c7784432a3a991b9e39f784fef150bbf82dc4e63b9256cd582426954a35b4
+     
SOURCE_HASH=sha512:c469cb61e8d134ed0280ef5a88d93d1ac2329acb47cceb8268e4b9e576af87fe3e94289d59154e7bc452e2cb33ae100393e041f386ac10c8dd266767aa1c7d0d
         WEB_SITE=http://netatalk.sourceforge.net/
          ENTERED=20020321
       LICENSE[0]=GPL
diff --git a/disk/netatalk/HISTORY b/disk/netatalk/HISTORY
index 69f6fbf..a0de0d8 100644
--- a/disk/netatalk/HISTORY
+++ b/disk/netatalk/HISTORY
@@ -1,8 +1,14 @@
+2009-05-29 George Sherwood <gsherwood AT sourcemage.org>
+       * DETAILS: Updated to version 2.0.4
+       * PRE_BUILD: Removed. Patches incorporated upstream
+       * netatalk-2.0.3-db43.patch: Removed.
+       * netatalk-2.0.3-newerdb.patch: Removed
+
 2007-09-01 George Sherwood <george AT beernabeer.com>
        * DETAILS: Updated to version 2.0.3. Removed UPDATED
        * CONFIGURE: Changed variable from OPTS to NETATALK_OPTS
        * BUILD: Added NETATALK_OPTS to OPTS
-       * PREB_BUILD: Added to patch for newer db versions. Fixed Bug #11524
+       * PRE_BUILD: Added to patch for newer db versions. Fixed Bug #11524
        * netatalk-2.0.3-db43.patch: Added gentoo patch from
          
http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-fs/netatalk/files
        * netatalk-2.0.3-newerdb.patch: Added gentoo patch from
diff --git a/disk/netatalk/PRE_BUILD b/disk/netatalk/PRE_BUILD
deleted file mode 100755
index d42601d..0000000
--- a/disk/netatalk/PRE_BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-patch -p1 < $SCRIPT_DIRECTORY/netatalk-2.0.3-db43.patch &&
-patch -p1 < $SCRIPT_DIRECTORY/netatalk-2.0.3-newerdb.patch
diff --git a/disk/netatalk/netatalk-2.0.3-db43.patch 
b/disk/netatalk/netatalk-2.0.3-db43.patch
deleted file mode 100644
index 93d3e4b..0000000
--- a/disk/netatalk/netatalk-2.0.3-db43.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Index: netatalk-2.0.3/bin/cnid/cnid_index.c
-===================================================================
---- netatalk-2.0.3.orig/bin/cnid/cnid_index.c
-+++ netatalk-2.0.3/bin/cnid/cnid_index.c
-@@ -274,7 +274,11 @@ static int dbif_count(const int dbi, u_i
-     DB_BTREE_STAT *sp;
-     DB *db = db_table[dbi].db;
- 
-+#if DB_VERSION_MAJOR > 4 || ( DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 
3 )
-+    ret = db->stat(db, db_txn, &sp, 0);
-+#else
-     ret = db->stat(db, &sp, 0);
-+#endif
- 
-     if (ret) {
-         LOG(log_error, logtype_cnid, "error getting stat infotmation on 
database: %s", db_strerror(errno));
-Index: netatalk-2.0.3/etc/cnid_dbd/dbif.c
-===================================================================
---- netatalk-2.0.3.orig/etc/cnid_dbd/dbif.c
-+++ netatalk-2.0.3/etc/cnid_dbd/dbif.c
-@@ -514,7 +514,11 @@ int dbif_count(const int dbi, u_int32_t 
-     DB_BTREE_STAT *sp;
-     DB *db = db_table[dbi].db;
- 
-+#if DB_VERSION_MAJOR > 4 || ( DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 
3 )
-+    ret = db->stat(db, db_txn, &sp, 0);
-+#else
-     ret = db->stat(db, &sp, 0);
-+#endif
- 
-     if (ret) {
-         LOG(log_error, logtype_cnid, "error getting stat infotmation on 
database: %s", db_strerror(errno));
diff --git a/disk/netatalk/netatalk-2.0.3-newerdb.patch 
b/disk/netatalk/netatalk-2.0.3-newerdb.patch
deleted file mode 100644
index f64c8cf..0000000
--- a/disk/netatalk/netatalk-2.0.3-newerdb.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Index: netatalk-2.0.3/macros/db3-check.m4
-===================================================================
---- netatalk-2.0.3.orig/macros/db3-check.m4
-+++ netatalk-2.0.3/macros/db3-check.m4
-@@ -115,6 +115,14 @@ int main(void) {
- AC_DEFUN([NETATALK_BERKELEY_LINK],
- [
- atalk_cv_lib_db=no
-+NETATALK_BDB_LINK_TRY(atalk_cv_db_db_4_dot_4,[-ldb-4.4])
-+NETATALK_BDB_LINK_TRY(atalk_cv_db_db44,[-ldb44])
-+NETATALK_BDB_LINK_TRY(atalk_cv_db_db_44,[-ldb-44])
-+NETATALK_BDB_LINK_TRY(atalk_cv_db_db_4_4,[-ldb-4-4])
-+NETATALK_BDB_LINK_TRY(atalk_cv_db_db_4_dot_3,[-ldb-4.3])
-+NETATALK_BDB_LINK_TRY(atalk_cv_db_db43,[-ldb43])
-+NETATALK_BDB_LINK_TRY(atalk_cv_db_db_43,[-ldb-43])
-+NETATALK_BDB_LINK_TRY(atalk_cv_db_db_4_3,[-ldb-4-3])
- NETATALK_BDB_LINK_TRY(atalk_cv_db_db_4_dot_2,[-ldb-4.2])
- NETATALK_BDB_LINK_TRY(atalk_cv_db_db42,[-ldb42])
- NETATALK_BDB_LINK_TRY(atalk_cv_db_db_42,[-ldb-42])
-@@ -134,7 +142,7 @@ AC_DEFUN([AC_PATH_BDB], 
-       trybdbdir=""
-       dobdbsearch=yes
-       bdb_search_dirs="/usr/local/include /usr/include"
--      search_subdirs="/db4.2 /db42 /db4.1 /db41 /db4 /"
-+      search_subdirs="/db4.4 /db44 /db4.3 /db43 /db4.2 /db42 /db4.1 /db41 
/db4 /"
- 
- dnl required BDB version
-       DB_MAJOR_REQ=4