sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by George Sherwood (648c796cc3ec42c0f02b64ba38510836f4aea862)

From: George Sherwood <scm AT sourcemage.org>
To: sm-commit AT lists.ibiblio.org
Subject: [SM-Commit] GIT changes to master grimoire by George Sherwood (648c796cc3ec42c0f02b64ba38510836f4aea862)
Date: Sat, 1 Sep 2007 01:15:15 -0500

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

disk/netatalk/BUILD | 2 -
disk/netatalk/CONFIGURE | 36
++++++++++++++---------------
disk/netatalk/DETAILS | 14 ++++++++---
disk/netatalk/HISTORY | 10 ++++++++
disk/netatalk/PRE_BUILD | 4 +++
disk/netatalk/netatalk-2.0.3-db43.patch | 32 +++++++++++++++++++++++++
disk/netatalk/netatalk-2.0.3-newerdb.patch | 28 ++++++++++++++++++++++
7 files changed, 103 insertions(+), 23 deletions(-)

New commits:
commit 648c796cc3ec42c0f02b64ba38510836f4aea862
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>

netatalk: Updated to version 2.0.3. Fixed compiles problems with
newer version of db. Bug #11524. Added patches from gentoo for
this problem. Cleaned up DETAILS and fixed bug that spell was
using variable OPTS in CONFIGURE.

diff --git a/disk/netatalk/BUILD b/disk/netatalk/BUILD
index e6a05ed..43fb2fd 100755
--- a/disk/netatalk/BUILD
+++ b/disk/netatalk/BUILD
@@ -1,3 +1,3 @@
-OPTS="--enable-redhat --enable-fhs" &&
+OPTS="--enable-redhat --enable-fhs $NETATALK_OPTS" &&

default_build
diff --git a/disk/netatalk/CONFIGURE b/disk/netatalk/CONFIGURE
index a86c952..42dcf86 100755
--- a/disk/netatalk/CONFIGURE
+++ b/disk/netatalk/CONFIGURE
@@ -1,89 +1,89 @@
-config_query_option OPTS \
+config_query_option NETATALK_OPTS \
"Enable admin group?" y \
"--enable-admin-group" \
"--disable-admin-group" &&

-config_query_option OPTS \
+config_query_option NETATALK_OPTS \
"Enable timelord (time server)?" n \
"--enable-timelord" \
"--disable-timelord" &&

-config_query_option OPTS \
+config_query_option NETATALK_OPTS \
"Enable valid shell check?" y \
"--enable-shell-check" \
"--disable-shell-check" &&

-config_query_option OPTS \
+config_query_option NETATALK_OPTS \
"Enable filename mangling?" y \
"--with-mangling" \
"--without-mangling" &&

-config_query_option OPTS \
+config_query_option NETATALK_OPTS \
"Enable Andrew FileSystem support?" n \
"--enable-afs" \
"--disable-afs" &&

-config_query_option OPTS \
+config_query_option NETATALK_OPTS \
"Enable DDP?" y \
"--enable-ddp" \
"--disable-ddp" &&

-config_query_option OPTS \
+config_query_option NETATALK_OPTS \
"Enable AFP 3.x calls?" y \
"--enable-afp3" \
"--disable-afp3" &&

-config_query_option OPTS \
+config_query_option NETATALK_OPTS
\
"Enable the EXPERIMENTAL dropbox fix (INSECURE!)?" n \
"--enable-dropkludge" \
"--disable-dropkludge"
&&

-config_query_option OPTS \
+config_query_option NETATALK_OPTS \
"Enable Apple2 boot server?" n \
"--enable-a2boot" \
"--disable-a2boot" &&

-config_query_option OPTS \
+config_query_option NETATALK_OPTS \
"Enable debug code?" n \
"--enable-debug1" \
"--disable-debug1" &&

-config_query_option OPTS
\
+config_query_option NETATALK_OPTS
\
"Enable CNID with Concurrent DBD Data Store (cdb)?" y
\
"--with-cnid-cdb-backend"
\
"--without-cnid-cdb-backend"
&&

-config_query_option OPTS
\
+config_query_option NETATALK_OPTS
\
"Enable CNID with Database Daemon Data Store (dbd)?" y
\
"--with-cnid-dbd-backend"
\
"--without-cnid-dbd-backend"
&&

-config_query_option OPTS \
+config_query_option NETATALK_OPTS
\
"Enable transaction support for dbd backend?" n \
"--with-cnid-dbd-txn" \
"--without-cnid-dbd-txn" &&

-config_query_option OPTS \
+config_query_option NETATALK_OPTS
\
"Enable CNID with transactional BDB Data Store?" n \
"--with-cnid-db3-backend" \
"--without-cnid-db3-backend" &&

-config_query_option OPTS \
+config_query_option NETATALK_OPTS \
"Enable LAST CNID scheme?" y \
"--with-cnid-last-backend" \
"--without-cnid-last-backend" &&

-config_query_option OPTS \
+config_query_option NETATALK_OPTS \
"Enable HASH CNID scheme?" n \
"--with-cnid-hash-backend" \
"--without-cnid-hash-backend" &&

-config_query_option OPTS \
+config_query_option NETATALK_OPTS \
"Enable DID CNID scheme?" n \
"--with-cnid-tdb-backend" \
"--without-cnid-tdb-backend" &&

-config_query_option OPTS \
+config_query_option NETATALK_OPTS \
"Enable MTAB CNID scheme?" n \
"--with-mtab-backend" \
"--without-mtab-backend"
diff --git a/disk/netatalk/DETAILS b/disk/netatalk/DETAILS
index 3fd83c0..3c1a4c3 100755
--- a/disk/netatalk/DETAILS
+++ b/disk/netatalk/DETAILS
@@ -1,14 +1,20 @@
SPELL=netatalk
- VERSION=2.0.2
+ VERSION=2.0.3
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
- MD5[0]=9c51a84c3a8d2f97ad5191e3251aa685
+
SOURCE_HASH=sha512:28067912c440663213ddfbb71406daa0ecb7bd9d4e06f66978d259afd0eec2b3f01c7784432a3a991b9e39f784fef150bbf82dc4e63b9256cd582426954a35b4
WEB_SITE=http://netatalk.sourceforge.net/
ENTERED=20020321
- UPDATED=20030822
LICENSE[0]=GPL
SHORT="Seamless file and print services to AppleShare clients"
cat << EOF
-Netatalk is a freely-available, kernel level implementation of the AppleTalk
Protocol Suite, originally for BSD-derived systems. A *NIX/*BSD system
running netatalk is capable of serving many macintosh clients simultaneously
as an AppleTalk router, AppleShare file server, *NIX/*BSD print server, and
for accessing AppleTalk printers via Printer Access Protocol (PAP). Included
are a number of minor printing and debugging utilities. Since full support
requires AppleTalk to be compiled into your kernel, this release only sets up
Apple filesharing over tcp/ip.
+Netatalk is a freely-available, kernel level implementation of the AppleTalk
+Protocol Suite, originally for BSD-derived systems. A *NIX/*BSD system
+running netatalk is capable of serving many macintosh clients simultaneously
+as an AppleTalk router, AppleShare file server, *NIX/*BSD print server,
+and for accessing AppleTalk printers via Printer Access Protocol (PAP).
+Included are a number of minor printing and debugging utilities. Since
+full support requires AppleTalk to be compiled into your kernel, this
+release only sets up Apple filesharing over tcp/ip.
EOF
diff --git a/disk/netatalk/HISTORY b/disk/netatalk/HISTORY
index 425273c..69f6fbf 100644
--- a/disk/netatalk/HISTORY
+++ b/disk/netatalk/HISTORY
@@ -1,3 +1,13 @@
+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
+ * 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
+
http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-fs/netatalk/files
+
2006-06-25 George Sherwood <george AT beernabeer.com>
* DEPENDS: Changed to CUPS from cups

diff --git a/disk/netatalk/PRE_BUILD b/disk/netatalk/PRE_BUILD
new file mode 100755
index 0000000..d42601d
--- /dev/null
+++ b/disk/netatalk/PRE_BUILD
@@ -0,0 +1,4 @@
+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
new file mode 100644
index 0000000..93d3e4b
--- /dev/null
+++ b/disk/netatalk/netatalk-2.0.3-db43.patch
@@ -0,0 +1,32 @@
+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
new file mode 100644
index 0000000..f64c8cf
--- /dev/null
+++ b/disk/netatalk/netatalk-2.0.3-newerdb.patch
@@ -0,0 +1,28 @@
+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

[SM-Commit] GIT changes to master grimoire by George Sherwood (648c796cc3ec42c0f02b64ba38510836f4aea862), George Sherwood, 09/01/2007
- Re: [SM-Commit] GIT changes to master grimoire by George Sherwood (648c796cc3ec42c0f02b64ba38510836f4aea862), Ladislav Hagara, 09/02/2007
  - Re: [SM-Commit] GIT changes to master grimoire by George Sherwood (648c796cc3ec42c0f02b64ba38510836f4aea862), Elisamuel Resto, 09/02/2007
    - Re: [SM-Commit] GIT changes to master grimoire by George Sherwood (648c796cc3ec42c0f02b64ba38510836f4aea862), Andraž 'ruskie' Levstik, 09/03/2007
  - Re: [SM-Commit] GIT changes to master grimoire by George Sherwood (648c796cc3ec42c0f02b64ba38510836f4aea862), George Sherwood, 09/02/2007