diff --git a/netatalk-2.0.2-db4_2-db4_3.patch b/netatalk-2.0.2-db4_2-db4_3.patch index a4fd7ea..c2822be 100644 --- a/netatalk-2.0.2-db4_2-db4_3.patch +++ b/netatalk-2.0.2-db4_2-db4_3.patch @@ -1,6 +1,7 @@ ---- netatalk-2.0.2/etc/cnid_dbd/dbif.c.db4_2-db4_3 2004-12-21 08:36:12.000000000 -0500 -+++ netatalk-2.0.2/etc/cnid_dbd/dbif.c 2005-02-21 13:21:45.000000000 -0500 -@@ -514,10 +514,10 @@ +diff -up netatalk-2.0.3/bin/cnid/cnid_index.c.db4_2-db4_3 netatalk-2.0.3/bin/cnid/cnid_index.c +--- netatalk-2.0.3/bin/cnid/cnid_index.c.db4_2-db4_3 2008-10-10 10:32:53.000000000 +0200 ++++ netatalk-2.0.3/bin/cnid/cnid_index.c 2008-10-10 10:32:53.000000000 +0200 +@@ -274,10 +274,10 @@ static int dbif_count(const int dbi, u_i DB_BTREE_STAT *sp; DB *db = db_table[dbi].db; @@ -13,9 +14,10 @@ return -1; } ---- netatalk-2.0.2/bin/cnid/cnid_index.c.db4_2-db4_3 2005-01-03 08:49:55.000000000 -0500 -+++ netatalk-2.0.2/bin/cnid/cnid_index.c 2005-02-21 13:23:12.000000000 -0500 -@@ -274,10 +274,10 @@ +diff -up netatalk-2.0.3/etc/cnid_dbd/dbif.c.db4_2-db4_3 netatalk-2.0.3/etc/cnid_dbd/dbif.c +--- netatalk-2.0.3/etc/cnid_dbd/dbif.c.db4_2-db4_3 2008-10-10 10:32:53.000000000 +0200 ++++ netatalk-2.0.3/etc/cnid_dbd/dbif.c 2008-10-10 10:32:53.000000000 +0200 +@@ -514,10 +514,10 @@ int dbif_count(const int dbi, u_int32_t DB_BTREE_STAT *sp; DB *db = db_table[dbi].db; diff --git a/netatalk-2.0.2-extern_ucreator.patch b/netatalk-2.0.2-extern_ucreator.patch index 3eaab67..3e3a919 100644 --- a/netatalk-2.0.2-extern_ucreator.patch +++ b/netatalk-2.0.2-extern_ucreator.patch @@ -1,6 +1,7 @@ ---- netatalk-2.0.2/etc/afpd/desktop.c.extern_ucreator 2004-10-09 08:48:21.000000000 -0400 -+++ netatalk-2.0.2/etc/afpd/desktop.c 2005-03-07 15:44:07.000000000 -0500 -@@ -310,7 +310,7 @@ +diff -up netatalk-2.0.3/etc/afpd/desktop.c.extern_ucreator netatalk-2.0.3/etc/afpd/desktop.c +--- netatalk-2.0.3/etc/afpd/desktop.c.extern_ucreator 2008-10-10 10:33:04.000000000 +0200 ++++ netatalk-2.0.3/etc/afpd/desktop.c 2008-10-10 10:33:04.000000000 +0200 +@@ -312,7 +312,7 @@ addicon_err: } static u_char utag[] = { 0, 0, 0, 0 }; diff --git a/netatalk-2.0.2-uams_no_pie.patch b/netatalk-2.0.2-uams_no_pie.patch index 09ab725..c41c66f 100644 --- a/netatalk-2.0.2-uams_no_pie.patch +++ b/netatalk-2.0.2-uams_no_pie.patch @@ -1,5 +1,6 @@ ---- netatalk-2.0.2/etc/uams/Makefile.am.uams_no_pie 2004-08-10 23:11:07.000000000 -0400 -+++ netatalk-2.0.2/etc/uams/Makefile.am 2005-02-21 14:30:23.000000000 -0500 +diff -up netatalk-2.0.3/etc/uams/Makefile.am.uams_no_pie netatalk-2.0.3/etc/uams/Makefile.am +--- netatalk-2.0.3/etc/uams/Makefile.am.uams_no_pie 2008-10-10 10:32:59.000000000 +0200 ++++ netatalk-2.0.3/etc/uams/Makefile.am 2008-10-10 10:32:59.000000000 +0200 @@ -1,5 +1,5 @@ # Makefile.am for etc/uams/ - @@ -7,9 +8,10 @@ SUBDIRS = uams_krb4 # ---- netatalk-2.0.2/macros/gssapi-check.m4.uams_no_pie 2004-06-18 03:57:19.000000000 -0400 -+++ netatalk-2.0.2/macros/gssapi-check.m4 2005-02-21 14:58:26.000000000 -0500 -@@ -126,7 +126,7 @@ +diff -up netatalk-2.0.3/macros/gssapi-check.m4.uams_no_pie netatalk-2.0.3/macros/gssapi-check.m4 +--- netatalk-2.0.3/macros/gssapi-check.m4.uams_no_pie 2008-10-10 10:32:59.000000000 +0200 ++++ netatalk-2.0.3/macros/gssapi-check.m4 2008-10-10 10:32:59.000000000 +0200 +@@ -126,7 +126,7 @@ AC_DEFUN([NETATALK_GSSAPI_CHECK], if test x"$ac_cv_func_gss_acquire_cred" = x"yes"; then AC_DEFINE(HAVE_GSSAPI,1,[Whether to enable GSSAPI support]) AC_MSG_RESULT([yes]) diff --git a/netatalk-2.0.3-chmod.patch b/netatalk-2.0.3-chmod.patch index 3455bbe..f15f806 100644 --- a/netatalk-2.0.3-chmod.patch +++ b/netatalk-2.0.3-chmod.patch @@ -1,6 +1,6 @@ diff -up netatalk-2.0.3/etc/afpd/unix.c.chmod netatalk-2.0.3/etc/afpd/unix.c ---- netatalk-2.0.3/etc/afpd/unix.c.chmod 2008-03-06 09:09:57.000000000 +0100 -+++ netatalk-2.0.3/etc/afpd/unix.c 2008-03-06 09:10:43.000000000 +0100 +--- netatalk-2.0.3/etc/afpd/unix.c.chmod 2008-10-10 10:33:20.000000000 +0200 ++++ netatalk-2.0.3/etc/afpd/unix.c 2008-10-10 10:33:20.000000000 +0200 @@ -415,14 +415,14 @@ mode_t mode; struct stat *st; { diff --git a/netatalk-2.0.3-db4_5.patch b/netatalk-2.0.3-db4_5.patch index 0d95146..1c20b9a 100644 --- a/netatalk-2.0.3-db4_5.patch +++ b/netatalk-2.0.3-db4_5.patch @@ -1,9 +1,11 @@ ---- netatalk-2.0.3/macros/db3-check.m4.db4_3 2004-08-11 05:01:11.000000000 +0200 -+++ netatalk-2.0.3/macros/db3-check.m4 2007-01-23 14:27:14.000000000 +0100 -@@ -115,6 +115,8 @@ +diff -up netatalk-2.0.3/macros/db3-check.m4.db4_5 netatalk-2.0.3/macros/db3-check.m4 +--- netatalk-2.0.3/macros/db3-check.m4.db4_5 2008-10-10 10:32:48.000000000 +0200 ++++ netatalk-2.0.3/macros/db3-check.m4 2008-10-10 10:32:48.000000000 +0200 +@@ -115,6 +115,9 @@ int main(void) { AC_DEFUN([NETATALK_BERKELEY_LINK], [ atalk_cv_lib_db=no ++NETATALK_BDB_LINK_TRY(atalk_cv_db_db_4_dot_7,[-ldb-4.7]) +NETATALK_BDB_LINK_TRY(atalk_cv_db_db_4_dot_5,[-ldb-4.5]) +NETATALK_BDB_LINK_TRY(atalk_cv_db_db_4_dot_3,[-ldb-4.3]) NETATALK_BDB_LINK_TRY(atalk_cv_db_db_4_dot_2,[-ldb-4.2]) diff --git a/netatalk-2.0.3-log_stderr.patch b/netatalk-2.0.3-log_stderr.patch index ad2f645..11788b1 100644 --- a/netatalk-2.0.3-log_stderr.patch +++ b/netatalk-2.0.3-log_stderr.patch @@ -1,6 +1,6 @@ diff -up netatalk-2.0.3/etc/papd/main.c.log_stderr netatalk-2.0.3/etc/papd/main.c ---- netatalk-2.0.3/etc/papd/main.c.log_stderr 2004-06-09 03:25:53.000000000 +0200 -+++ netatalk-2.0.3/etc/papd/main.c 2008-03-06 12:14:58.000000000 +0100 +--- netatalk-2.0.3/etc/papd/main.c.log_stderr 2008-10-10 10:33:30.000000000 +0200 ++++ netatalk-2.0.3/etc/papd/main.c 2008-10-10 10:33:30.000000000 +0200 @@ -260,7 +260,7 @@ int main( ac, av ) switch (server_lock("papd", pidfile, debug)) { diff --git a/netatalk-2.0.3-maxsrv.patch b/netatalk-2.0.3-maxsrv.patch index b721ec6..11e7858 100644 --- a/netatalk-2.0.3-maxsrv.patch +++ b/netatalk-2.0.3-maxsrv.patch @@ -1,6 +1,6 @@ diff -up netatalk-2.0.3/etc/cnid_dbd/cnid_metad.c.maxsrv netatalk-2.0.3/etc/cnid_dbd/cnid_metad.c ---- netatalk-2.0.3/etc/cnid_dbd/cnid_metad.c.maxsrv 2008-03-06 09:20:52.000000000 +0100 -+++ netatalk-2.0.3/etc/cnid_dbd/cnid_metad.c 2008-03-06 09:22:40.000000000 +0100 +--- netatalk-2.0.3/etc/cnid_dbd/cnid_metad.c.maxsrv 2008-10-10 10:33:25.000000000 +0200 ++++ netatalk-2.0.3/etc/cnid_dbd/cnid_metad.c 2008-10-10 10:33:25.000000000 +0200 @@ -93,7 +93,7 @@ static int srvfd; static int rqstfd; diff --git a/netatalk-2.0.3-multiarch.patch b/netatalk-2.0.3-multiarch.patch index be18833..bfeaa87 100644 --- a/netatalk-2.0.3-multiarch.patch +++ b/netatalk-2.0.3-multiarch.patch @@ -1,6 +1,6 @@ diff -up netatalk-2.0.3/distrib/config/netatalk-config.in.multiarch netatalk-2.0.3/distrib/config/netatalk-config.in ---- netatalk-2.0.3/distrib/config/netatalk-config.in.multiarch 2008-03-06 15:54:27.000000000 +0100 -+++ netatalk-2.0.3/distrib/config/netatalk-config.in 2008-03-06 15:55:00.000000000 +0100 +--- netatalk-2.0.3/distrib/config/netatalk-config.in.multiarch 2008-10-10 10:33:35.000000000 +0200 ++++ netatalk-2.0.3/distrib/config/netatalk-config.in 2008-10-10 10:33:35.000000000 +0200 @@ -218,9 +218,6 @@ fi if test "@includedir@" != /usr/include ; then includes="-I@includedir@" diff --git a/netatalk-2.0.3-open_call.patch b/netatalk-2.0.3-open_call.patch index 4c3fe4e..5df0519 100644 --- a/netatalk-2.0.3-open_call.patch +++ b/netatalk-2.0.3-open_call.patch @@ -1,6 +1,72 @@ +diff -up netatalk-2.0.3/bin/cnid/cnid_index.c.open_call netatalk-2.0.3/bin/cnid/cnid_index.c +--- netatalk-2.0.3/bin/cnid/cnid_index.c.open_call 2008-10-10 10:33:14.000000000 +0200 ++++ netatalk-2.0.3/bin/cnid/cnid_index.c 2008-10-10 10:33:14.000000000 +0200 +@@ -123,9 +123,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) { +@@ -353,7 +353,7 @@ static int dbif_env_init(void) + db_env->set_errfile(db_env, db_errlog); + db_env->set_verbose(db_env, DB_VERB_RECOVERY, 1); + db_env->set_verbose(db_env, DB_VERB_CHKPOINT, 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); +@@ -379,7 +379,7 @@ static int dbif_env_init(void) + } + 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.3/etc/cnid_dbd/dbif.c.open_call netatalk-2.0.3/etc/cnid_dbd/dbif.c +--- netatalk-2.0.3/etc/cnid_dbd/dbif.c.open_call 2008-10-10 10:33:14.000000000 +0200 ++++ netatalk-2.0.3/etc/cnid_dbd/dbif.c 2008-10-10 10:33:14.000000000 +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) { +@@ -164,7 +164,7 @@ int dbif_env_init(struct db_param *dbp) + db_env->set_errfile(db_env, db_errlog); + db_env->set_verbose(db_env, DB_VERB_RECOVERY, 1); + db_env->set_verbose(db_env, DB_VERB_CHKPOINT, 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); +@@ -198,7 +198,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.3/libatalk/cnid/cdb/cnid_cdb_open.c.open_call netatalk-2.0.3/libatalk/cnid/cdb/cnid_cdb_open.c ---- netatalk-2.0.3/libatalk/cnid/cdb/cnid_cdb_open.c.open_call 2007-09-17 15:21:26.000000000 +0200 -+++ netatalk-2.0.3/libatalk/cnid/cdb/cnid_cdb_open.c 2007-09-17 15:21:43.000000000 +0200 +--- netatalk-2.0.3/libatalk/cnid/cdb/cnid_cdb_open.c.open_call 2008-10-10 10:33:14.000000000 +0200 ++++ netatalk-2.0.3/libatalk/cnid/cdb/cnid_cdb_open.c 2008-10-10 10:33:14.000000000 +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) { @@ -36,8 +102,8 @@ diff -up netatalk-2.0.3/libatalk/cnid/cdb/cnid_cdb_open.c.open_call netatalk-2.0 goto fail_lock; } diff -up netatalk-2.0.3/libatalk/cnid/db3/cnid_db3_open.c.open_call netatalk-2.0.3/libatalk/cnid/db3/cnid_db3_open.c ---- netatalk-2.0.3/libatalk/cnid/db3/cnid_db3_open.c.open_call 2007-09-17 15:14:36.000000000 +0200 -+++ netatalk-2.0.3/libatalk/cnid/db3/cnid_db3_open.c 2007-09-17 15:15:06.000000000 +0200 +--- netatalk-2.0.3/libatalk/cnid/db3/cnid_db3_open.c.open_call 2008-10-10 10:33:14.000000000 +0200 ++++ netatalk-2.0.3/libatalk/cnid/db3/cnid_db3_open.c 2008-10-10 10:33:14.000000000 +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) { @@ -72,69 +138,3 @@ diff -up netatalk-2.0.3/libatalk/cnid/db3/cnid_db3_open.c.open_call netatalk-2.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.3/bin/cnid/cnid_index.c.open_call netatalk-2.0.3/bin/cnid/cnid_index.c ---- netatalk-2.0.3/bin/cnid/cnid_index.c.open_call 2007-09-17 15:14:49.000000000 +0200 -+++ netatalk-2.0.3/bin/cnid/cnid_index.c 2007-09-17 15:15:35.000000000 +0200 -@@ -123,9 +123,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) { -@@ -353,7 +353,7 @@ static int dbif_env_init(void) - db_env->set_errfile(db_env, db_errlog); - db_env->set_verbose(db_env, DB_VERB_RECOVERY, 1); - db_env->set_verbose(db_env, DB_VERB_CHKPOINT, 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); -@@ -379,7 +379,7 @@ static int dbif_env_init(void) - } - 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.3/etc/cnid_dbd/dbif.c.open_call netatalk-2.0.3/etc/cnid_dbd/dbif.c ---- netatalk-2.0.3/etc/cnid_dbd/dbif.c.open_call 2007-09-17 15:14:59.000000000 +0200 -+++ netatalk-2.0.3/etc/cnid_dbd/dbif.c 2007-09-17 15:16:54.000000000 +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) { -@@ -164,7 +164,7 @@ int dbif_env_init(struct db_param *dbp) - db_env->set_errfile(db_env, db_errlog); - db_env->set_verbose(db_env, DB_VERB_RECOVERY, 1); - db_env->set_verbose(db_env, DB_VERB_CHKPOINT, 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); -@@ -198,7 +198,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 --git a/netatalk.spec b/netatalk.spec index d0ccc14..166f0e7 100644 --- a/netatalk.spec +++ b/netatalk.spec @@ -1,16 +1,13 @@ Summary: AppleTalk networking programs Name: netatalk Version: 2.0.3 -Release: 20%{?dist} +Release: 21%{?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-1.6.3-norc.patch -#Patch1: netatalk-1.5.5-openssl097.patch -#Patch2: netatalk-1.5.5-pathcat.patch Patch0: netatalk-2.0.3-db4_5.patch Patch1: netatalk-2.0.2-db4_2-db4_3.patch Patch2: netatalk-2.0.2-uams_no_pie.patch @@ -45,9 +42,6 @@ programs. %prep %setup -q -#%patch0 -p 1 -b .norc -#%patch1 -p 1 -b .openssl097 -#%patch2 -p1 -b .pathcat %patch0 -p1 -b .db4_5 %patch1 -p1 -b .db4_2-db4_3 %patch2 -p1 -b .uams_no_pie @@ -198,6 +192,9 @@ fi %{_mandir}/man*/netatalk-config.1* %changelog +* Mon Oct 13 2008 Jiri Skala - 4:2.0.3-21 +- fix #465050 - FTBFS netatalk-2.0.3-19 - regenerated patches + * Mon Aug 11 2008 Tom "spot" Callaway - 4:2.0.3-20 - fix license tag