Tue Jul 14 15:36:57 UTC 2009

Author: jskala

Update of /cvs/extras/rpms/netatalk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26129

Modified Files:
	netatalk.spec 
Added Files:
	netatalk-2.0.4-db4_2-db4_3.patch 
	netatalk-2.0.4-extern_ucreator.patch 
	netatalk-2.0.4-open_call.patch 
Removed Files:
	netatalk-1.6.3-norc.patch netatalk-2.0.2-db4_2-db4_3.patch 
	netatalk-2.0.2-extern_ucreator.patch 
	netatalk-2.0.3-chmod.patch netatalk-2.0.3-db4_5.patch 
	netatalk-2.0.3-log_stderr.patch netatalk-2.0.3-lsb.patch 
	netatalk-2.0.3-maxsrv.patch netatalk-2.0.3-multiarch.patch 
	netatalk-2.0.3-open_call.patch netatalk-2.0.3-papd_cmds.patch 
Log Message:
* Tue Jul 14 2009 Jiri Skala <jskala at redhat.com> - 4:2.0.4-1
- updated to latest upstream version


netatalk-2.0.4-db4_2-db4_3.patch:

--- NEW FILE netatalk-2.0.4-db4_2-db4_3.patch ---
diff -up netatalk-2.0.4/bin/cnid/cnid_index.c.db4_2-db4_3 netatalk-2.0.4/bin/cnid/cnid_index.c
--- netatalk-2.0.4/bin/cnid/cnid_index.c.db4_2-db4_3	2009-07-14 15:54:50.444609410 +0200
+++ netatalk-2.0.4/bin/cnid/cnid_index.c	2009-07-14 15:58:10.143829111 +0200
@@ -277,11 +277,11 @@ static int dbif_count(const int dbi, u_i
 #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);
+    ret = db->stat(db, (DB_TXN*)0L, &sp, 0);
 #endif
 
     if (ret) {
-        LOG(log_error, logtype_cnid, "error getting stat infotmation on database: %s", db_strerror(errno));
+        LOG(log_error, logtype_cnid, "error getting stat information on database: %s", db_strerror(errno));
         return -1;
     }
 
diff -up netatalk-2.0.4/etc/cnid_dbd/dbif.c.db4_2-db4_3 netatalk-2.0.4/etc/cnid_dbd/dbif.c
--- netatalk-2.0.4/etc/cnid_dbd/dbif.c.db4_2-db4_3	2009-07-14 15:55:16.428613311 +0200
+++ netatalk-2.0.4/etc/cnid_dbd/dbif.c	2009-07-14 15:57:17.038828997 +0200
@@ -516,11 +516,11 @@ int dbif_count(const int dbi, u_int32_t 
 #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);
+    ret = db->stat(db, (DB_TXN*)0L, &sp, 0);
 #endif
 
     if (ret) {
-        LOG(log_error, logtype_cnid, "error getting stat infotmation on database: %s", db_strerror(errno));
+        LOG(log_error, logtype_cnid, "error getting stat information on database: %s", db_strerror(errno));
         return -1;
     }
 

netatalk-2.0.4-extern_ucreator.patch:

--- NEW FILE netatalk-2.0.4-extern_ucreator.patch ---
diff -up netatalk-2.0.4/etc/afpd/desktop.c.extern_ucreator netatalk-2.0.4/etc/afpd/desktop.c
--- netatalk-2.0.4/etc/afpd/desktop.c.extern_ucreator	2009-07-14 16:26:36.984610055 +0200
+++ netatalk-2.0.4/etc/afpd/desktop.c	2009-07-14 16:27:01.607580009 +0200
@@ -312,7 +312,7 @@ addicon_err:
 }
 
 static const u_char	utag[] = { 0, 0, 0, 0 };
-static const u_char	ucreator[] = { 0, 0, 0, 0 };/* { 'U', 'N', 'I', 'X' };*/
+u_char			ucreator[] = { 0, 0, 0, 0 };/* { 'U', 'N', 'I', 'X' };*/
 static const u_char	utype[] = { 0, 0, 0, 0 };/* { 'T', 'E', 'X', 'T' };*/
 static const short	usize = 256;
 

netatalk-2.0.4-open_call.patch:

--- NEW FILE netatalk-2.0.4-open_call.patch ---
diff -up netatalk-2.0.4/bin/cnid/cnid_index.c.open_call netatalk-2.0.4/bin/cnid/cnid_index.c
--- netatalk-2.0.4/bin/cnid/cnid_index.c.open_call	2009-07-14 16:31:13.662612798 +0200
+++ netatalk-2.0.4/bin/cnid/cnid_index.c	2009-07-14 16:32:12.494829074 +0200
@@ -356,7 +356,7 @@ static int dbif_env_init(void)
     if (db_errlog != NULL)
         db_env->set_errfile(db_env, db_errlog); 
     db_env->set_verbose(db_env, DB_VERB_RECOVERY, 1);
-    if ((ret = db_env->open(db_env, ".", DBOPTIONS | DB_PRIVATE | DB_RECOVER, 0))) {
+    if ((ret = (db_env->open)(db_env, ".", DBOPTIONS | DB_PRIVATE | DB_RECOVER, 0))) {
         LOG(log_error, logtype_cnid, "error opening DB environment: %s", 
             db_strerror(ret));
         db_env->close(db_env, 0);
diff -up netatalk-2.0.4/etc/cnid_dbd/dbif.c.open_call netatalk-2.0.4/etc/cnid_dbd/dbif.c
--- netatalk-2.0.4/etc/cnid_dbd/dbif.c.open_call	2009-07-14 16:27:46.905837395 +0200
+++ netatalk-2.0.4/etc/cnid_dbd/dbif.c	2009-07-14 16:33:31.712829253 +0200
@@ -77,9 +77,9 @@ static int db_compat_open(DB *db, char *
     int ret;
 
 #if DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1)
-    ret = db->open(db, db_txn, file, name, type, DB_CREATE, mode); 
+    ret = (db->open)(db, db_txn, file, name, type, DB_CREATE, mode); 
 #else
-    ret = db->open(db,       file, name, type, DB_CREATE, mode); 
+    ret = (db->open)(db,       file, name, type, DB_CREATE, mode); 
 #endif
 
     if (ret) {
@@ -163,7 +163,7 @@ int dbif_env_init(struct db_param *dbp)
     if (db_errlog != NULL)
         db_env->set_errfile(db_env, db_errlog); 
     db_env->set_verbose(db_env, DB_VERB_RECOVERY, 1);
-    if ((ret = db_env->open(db_env, ".", DBOPTIONS | DB_PRIVATE | DB_RECOVER, 0))) {
+    if ((ret = (db_env->open)(db_env, ".", DBOPTIONS | DB_PRIVATE | DB_RECOVER, 0))) {
         LOG(log_error, logtype_cnid, "error opening DB environment: %s", 
             db_strerror(ret));
         db_env->close(db_env, 0);
@@ -197,7 +197,7 @@ int dbif_env_init(struct db_param *dbp)
     
     if (db_errlog != NULL)
         db_env->set_errfile(db_env, db_errlog);
-    if ((ret = db_env->open(db_env, ".", DBOPTIONS , 0))) {
+    if ((ret = (db_env->open)(db_env, ".", DBOPTIONS , 0))) {
         LOG(log_error, logtype_cnid, "error opening DB environment after recovery: %s",
             db_strerror(ret));
         db_env->close(db_env, 0);
diff -up netatalk-2.0.4/libatalk/cnid/cdb/cnid_cdb_open.c.open_call netatalk-2.0.4/libatalk/cnid/cdb/cnid_cdb_open.c
--- netatalk-2.0.4/libatalk/cnid/cdb/cnid_cdb_open.c.open_call	2009-03-29 09:23:23.000000000 +0200
+++ netatalk-2.0.4/libatalk/cnid/cdb/cnid_cdb_open.c	2009-07-14 16:27:46.924861205 +0200
@@ -131,9 +131,9 @@ static int  my_associate (DB *p, DB *s,
 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 @@ struct _cnid_db *cnid_cdb_open(const cha
     }
 
     /* 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 @@ struct _cnid_db *cnid_cdb_open(const cha
         /* 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 -up netatalk-2.0.4/libatalk/cnid/db3/cnid_db3_open.c.open_call netatalk-2.0.4/libatalk/cnid/db3/cnid_db3_open.c
--- netatalk-2.0.4/libatalk/cnid/db3/cnid_db3_open.c.open_call	2009-03-29 09:23:24.000000000 +0200
+++ netatalk-2.0.4/libatalk/cnid/db3/cnid_db3_open.c	2009-07-14 16:27:46.928827444 +0200
@@ -133,9 +133,9 @@ static int my_yield(void)
 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 | DB_AUTO_COMMIT, mode);
+    return (p->open)(p, NULL, f, d, t, flags | DB_AUTO_COMMIT, mode);
 #else
-    return p->open(p, f, d, t, flags, mode);
+    return (p->open)(p, f, d, t, flags, mode);
 #endif
 }
 
@@ -350,7 +350,7 @@ struct _cnid_db *cnid_db3_open(const cha
 #endif /* DB_VERSION_MINOR > 1 */
 
     /* 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) {
         if (rc == DB_RUNRECOVERY) {
             /* This is the mother of all errors.  We _must_ fail here. */
             LOG(log_error, logtype_default,
@@ -361,10 +361,10 @@ struct _cnid_db *cnid_db3_open(const cha
         /* 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;
             }


Index: netatalk.spec
===================================================================
RCS file: /cvs/extras/rpms/netatalk/devel/netatalk.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- netatalk.spec	26 Feb 2009 04:58:22 -0000	1.52
+++ netatalk.spec	14 Jul 2009 15:36:57 -0000	1.53
@@ -1,24 +1,18 @@
 Summary: AppleTalk networking programs
 Name:    netatalk
-Version: 2.0.3
-Release: 27%{?dist}
+Version: 2.0.4
+Release: 1%{?dist}
 Epoch:   4
 License: GPLv2+
 Group:   System Environment/Daemons
 Source0: http://download.sourceforge.net/netatalk/netatalk-%{version}.tar.bz2
 Source1: atalk.init
 Source2: netatalk.pam-system-auth
-Patch0:  netatalk-2.0.3-db4_5.patch
-Patch1:  netatalk-2.0.2-db4_2-db4_3.patch
+Patch1:  netatalk-2.0.4-db4_2-db4_3.patch
 Patch2:  netatalk-2.0.2-uams_no_pie.patch
-Patch3:  netatalk-2.0.2-extern_ucreator.patch
+Patch3:  netatalk-2.0.4-extern_ucreator.patch
 Patch4:  netatalk-2.0.3-nodefault.patch
-Patch5:  netatalk-2.0.3-open_call.patch
-Patch6:  netatalk-2.0.3-chmod.patch
-Patch7:  netatalk-2.0.3-maxsrv.patch
-Patch8:  netatalk-2.0.3-log_stderr.patch
-Patch9:  netatalk-2.0.3-multiarch.patch
-Patch10: netatalk-2.0.3-papd_cmds.patch
+Patch5:  netatalk-2.0.4-open_call.patch
 Url:	 http://netatalk.sourceforge.net/
 Requires: pam
 Requires(post): /sbin/chkconfig /sbin/ldconfig
@@ -32,16 +26,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 This package enables Linux to talk to Macintosh computers via the
 AppleTalk networking protocol. It includes a daemon to allow Linux
 to act as a file server over EtherTalk or IP for Mac's.
-The systems without coreutils 7.0 and later require netatalk-timeout package.
-
-%package timeout
-Summary: Timeout utility for the systems without coreutils
-Group:   System Environment/Daemons
-Requires: %{name} = %{epoch}:%{version}-%{release}
-Conflicts: coreutils >= 7.0
-
-%description timeout
-The package contains the timeout utility that was a part of netatalk earlier. The coreutils 7.0 and later contains this utility too therefore the timeout is separated to sub-package for usage on the systems without coreutils.
 
 %package devel
 Summary: Headers for Appletalk development
@@ -53,17 +37,11 @@ programs.
 
 %prep
 %setup -q
-%patch0  -p1 -b .db4_5
 %patch1  -p1 -b .db4_2-db4_3
 %patch2  -p1 -b .uams_no_pie
 %patch3  -p1 -b .extern_ucreator
 %patch4  -p1
 %patch5  -p1 -b .open_call
-%patch6  -p1 -b .chmod
-%patch7  -p1 -b .maxsrv
-%patch8  -p1 -b .log_stderr
-%patch9  -p1 -b .multiarch
-%patch10 -p1 -b .papd_cmds
 
 ln -s ./NEWS ChangeLog
 
@@ -186,19 +164,13 @@ fi
 %{_sbindir}/*
 %{_bindir}/*
 %exclude %{_bindir}/netatalk-config
-%exclude %{_bindir}/timeout
 %{_mandir}/man*/*
 %exclude %{_mandir}/man*/netatalk-config*
-%exclude %{_mandir}/man1/timeout.1.gz
 %{_datadir}/netatalk
 %dir %{_libdir}/atalk
 %{_libdir}/atalk/*.so
 %{_libexecdir}/*
 
-%files timeout
-%{_bindir}/timeout
-%{_mandir}/man1/timeout.1.gz
-
 %files devel
 %defattr(-,root,root)
 %dir %{_includedir}/atalk
@@ -210,6 +182,9 @@ fi
 %{_mandir}/man*/netatalk-config.1*
 
 %changelog
+* Tue Jul 14 2009 Jiri Skala <jskala at redhat.com> - 4:2.0.4-1
+- updated to latest upstream version
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4:2.0.3-27
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


--- netatalk-1.6.3-norc.patch DELETED ---


--- netatalk-2.0.2-db4_2-db4_3.patch DELETED ---


--- netatalk-2.0.2-extern_ucreator.patch DELETED ---


--- netatalk-2.0.3-chmod.patch DELETED ---


--- netatalk-2.0.3-db4_5.patch DELETED ---


--- netatalk-2.0.3-log_stderr.patch DELETED ---


--- netatalk-2.0.3-lsb.patch DELETED ---


--- netatalk-2.0.3-maxsrv.patch DELETED ---


--- netatalk-2.0.3-multiarch.patch DELETED ---


--- netatalk-2.0.3-open_call.patch DELETED ---


--- netatalk-2.0.3-papd_cmds.patch DELETED ---


