rpms/ncpfs/devel ncpfs-2.2.6-align.patch, NONE, 1.1 ncpfs.spec, 1.25, 1.26

[fedora-cvs-commits at redhat.com]

Author: stransky

Update of /cvs/dist/rpms/ncpfs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31882

Modified Files:
	ncpfs.spec 
Added Files:
	ncpfs-2.2.6-align.patch 
Log Message:
fix for #186683 - ncpmount needs downgrade to work properly

ncpfs-2.2.6-align.patch:
 ndslib.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE ncpfs-2.2.6-align.patch ---
--- ncpfs-2.2.6/lib/ndslib.c.olddd	2005-01-27 18:35:59.000000000 +0100
+++ ncpfs-2.2.6/lib/ndslib.c	2006-04-11 11:35:15.000000000 +0200
@@ -957,7 +957,7 @@
 	NWDSCCODE err;
 	int n1, n3;
 	u_int16_t n3a;
-	char rpb_b[DEFAULT_MESSAGE_LEN];
+	char rpb_b[DEFAULT_MESSAGE_LEN] __attribute__ ((aligned (4)));
 	Buf_T rpb;
     	size_t k1tl;
     


Index: ncpfs.spec
===================================================================
RCS file: /cvs/dist/rpms/ncpfs/devel/ncpfs.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- ncpfs.spec	11 Feb 2006 04:42:58 -0000	1.25
+++ ncpfs.spec	11 Apr 2006 09:46:07 -0000	1.26
@@ -1,7 +1,7 @@
 Summary: Utilities for the ncpfs filesystem, a NetWare client for Linux.
 Name: ncpfs
 Version: 2.2.6
-Release: 1.2.1
+Release: 2
 License: GPL
 Source: http://ftp.cvut.cz/ncpfs/ncpfs-%{version}.tar.gz
 Patch: ncpfs-2.2.3-fix.patch
@@ -10,6 +10,7 @@
 Patch5: ncpfs-2.2.6-getuid.patch
 Patch6: ncpfs-2.2.4-gcc4.patch
 Patch7: ncpfs-2.2.6-ldconfig.patch
+Patch8: ncpfs-2.2.6-align.patch
 Group: Applications/System
 Requires: ipxutils
 Buildroot: %{_tmppath}/%{name}-%{version}-root
@@ -45,6 +46,7 @@
 %patch5 -p1 -b .getuid
 %patch6 -p1 -b .gcc4
 %patch7 -p1 -b .ld
+%patch8 -p1 -b .align
 
 %build
 %ifarch s390 s390x
@@ -116,6 +118,10 @@
 %{_mandir}/man8/ipx*
 
 %changelog
+* Tue Apr 11 2006 Martin Stransky <stransky at redhat.com> - 2.2.6-2
+- fix for #186683 - ncpmount needs downgrade to work properly,
+  rpb_b[] needs to be aligned to 4 bytes with -fstack-protector enabled
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.2.6-1.2.1
 - bump again for double-long bug on ppc(64)