From 960fc3ebbeca07c2eaa662d214853a6bb3ceb9c3 Mon Sep 17 00:00:00 2001
From: Martin Nagy <mnagy@fedoraproject.org>
Date: Mar 06 2008 15:40:16 +0000
Subject: - fix chmod o+x (#225085)

- increase the maximum number of cnid_dbd processes to 512 (#232805)
- papd now writes debugging output to stderr when invoked with -d (#150021)
- fix multiarch conflict for netatalk-devel (#342681)

---

diff --git a/netatalk-2.0.3-chmod.patch b/netatalk-2.0.3-chmod.patch
new file mode 100644
index 0000000..3455bbe
--- /dev/null
+++ b/netatalk-2.0.3-chmod.patch
@@ -0,0 +1,20 @@
+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
+@@ -415,14 +415,14 @@ mode_t mode;
+ struct stat *st;
+ {
+ struct stat sb;
+-mode_t mask = S_IRUSR |S_IWUSR | S_IRGRP | S_IWGRP |S_IROTH | S_IWOTH;
++mode_t mask = S_IRWXU | S_IRWXG | S_IRWXO;  /* rwx for owner group and other, by default */
+ 
+     if (!st) {
+         if (stat(name, &sb) != 0)
+             return -1;
+         st = &sb;
+     }
+-   mode &= mask;	/* keep only rw-rw-rw in mode */
++
+    mode |= st->st_mode & ~mask; /* keep other bits from previous mode */
+    if ( chmod( name,  mode & ~default_options.umask ) < 0 && errno != EPERM ) {
+        return -1;
diff --git a/netatalk-2.0.3-log_stderr.patch b/netatalk-2.0.3-log_stderr.patch
new file mode 100644
index 0000000..ad2f645
--- /dev/null
+++ b/netatalk-2.0.3-log_stderr.patch
@@ -0,0 +1,22 @@
+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
+@@ -260,7 +260,7 @@ int main( ac, av )
+ 
+     switch (server_lock("papd", pidfile, debug)) {
+     case 0: /* open a couple things again in the child */
+-      if ((c = open("/", O_RDONLY)) >= 0) {
++      if (!debug && (c = open("/", O_RDONLY)) >= 0) {
+ 	dup2(c, 1);
+ 	dup2(c, 2);
+       }
+@@ -287,7 +287,8 @@ int main( ac, av )
+     openlog( p, LOG_PID );
+ #else /* ultrix */
+     set_processname(p);
+-    syslog_setup(log_debug, logtype_default, logoption_ndelay|logoption_pid, logfacility_lpr );
++    syslog_setup(log_debug, logtype_default, logoption_ndelay | logoption_pid |
++               debug ? logoption_perror : 0, logfacility_lpr );
+ #endif /* ultrix */
+ 
+     LOG(log_info, logtype_papd, "restart (%s)", version );
diff --git a/netatalk-2.0.3-maxsrv.patch b/netatalk-2.0.3-maxsrv.patch
new file mode 100644
index 0000000..b721ec6
--- /dev/null
+++ b/netatalk-2.0.3-maxsrv.patch
@@ -0,0 +1,12 @@
+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
+@@ -93,7 +93,7 @@
+ static int srvfd;
+ static int rqstfd;
+ 
+-#define MAXSRV 128
++#define MAXSRV 512
+ 
+ #define MAXSPAWN   3                   /* Max times respawned in.. */
+ 
diff --git a/netatalk-2.0.3-multiarch.patch b/netatalk-2.0.3-multiarch.patch
new file mode 100644
index 0000000..be18833
--- /dev/null
+++ b/netatalk-2.0.3-multiarch.patch
@@ -0,0 +1,13 @@
+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
+@@ -218,9 +218,6 @@ fi
+ if test "@includedir@" != /usr/include ; then
+   includes="-I@includedir@"
+ fi
+-if test "@libdir@" != /usr/lib ; then
+-  libs="-L@libdir@"
+-fi
+ af_cflags="$af_cflags $includes"
+ af_libs="$libs -latalk"
+ 
diff --git a/netatalk.spec b/netatalk.spec
index 393b9ce..9ddce93 100644
--- a/netatalk.spec
+++ b/netatalk.spec
@@ -1,7 +1,7 @@
 Summary: AppleTalk networking programs
 Name:    netatalk
 Version: 2.0.3
-Release: 18%{?dist}
+Release: 19%{?dist}
 Epoch:   4
 License: GPL
 Group:   System Environment/Daemons
@@ -17,6 +17,10 @@ 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-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
 Url:	 http://netatalk.sourceforge.net/
 Requires: pam
 Requires(post): /sbin/chkconfig /sbin/ldconfig
@@ -50,6 +54,10 @@ programs.
 %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
 
 ln -s ./NEWS ChangeLog
 
@@ -190,6 +198,12 @@ fi
 %{_mandir}/man*/netatalk-config.1*
 
 %changelog
+* Thu Mar 06 2008 Martin Nagy <mnagy@redhat.com> - 4:2.0.3-19
+- fix chmod o+x (#225085)
+- increase the maximum number of cnid_dbd processes to 512 (#232805)
+- papd now writes debugging output to stderr when invoked with -d (#150021)
+- fix multiarch conflict for netatalk-devel (#342681)
+
 * Mon Feb 25 2008 Martin Nagy <mnagy@redhat.com> - 4:2.0.3-18
 - make init script LSB compliant (#246993)