rpms/netatalk/devel netatalk-2.0.3-chmod.patch, NONE, 1.1 netatalk-2.0.3-log_stderr.patch, NONE, 1.1 netatalk-2.0.3-maxsrv.patch, NONE, 1.1 netatalk-2.0.3-multiarch.patch, NONE, 1.1 netatalk.spec, 1.43, 1.44

[Martin Nagy (mnagy)]

Author: mnagy

Update of /cvs/extras/rpms/netatalk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10764

Modified Files:
	netatalk.spec 
Added Files:
	netatalk-2.0.3-chmod.patch netatalk-2.0.3-log_stderr.patch 
	netatalk-2.0.3-maxsrv.patch netatalk-2.0.3-multiarch.patch 
Log Message:
* Thu Mar 06 2008 Martin Nagy <mnagy at 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)


netatalk-2.0.3-chmod.patch:

--- NEW FILE netatalk-2.0.3-chmod.patch ---
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;

netatalk-2.0.3-log_stderr.patch:

--- NEW FILE netatalk-2.0.3-log_stderr.patch ---
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 );

netatalk-2.0.3-maxsrv.patch:

--- NEW FILE netatalk-2.0.3-maxsrv.patch ---
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.. */
 

netatalk-2.0.3-multiarch.patch:

--- NEW FILE netatalk-2.0.3-multiarch.patch ---
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 at includedir@"
 fi
-if test "@libdir@" != /usr/lib ; then
-  libs="-L at libdir@"
-fi
 af_cflags="$af_cflags $includes"
 af_libs="$libs -latalk"
 


Index: netatalk.spec
===================================================================
RCS file: /cvs/extras/rpms/netatalk/devel/netatalk.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- netatalk.spec	25 Feb 2008 15:46:32 -0000	1.43
+++ netatalk.spec	6 Mar 2008 15:40:16 -0000	1.44
@@ -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 @@
 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 @@
 %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 @@
 %{_mandir}/man*/netatalk-config.1*
 
 %changelog
+* Thu Mar 06 2008 Martin Nagy <mnagy at 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 at redhat.com> - 4:2.0.3-18
 - make init script LSB compliant (#246993)