rpms/cfs/devel cfs_1.4.1-cfix.patch,1.3,1.4
Enrico Scholz (ensc)
fedora-extras-commits at redhat.com
Sat Jun 3 12:10:05 UTC 2006
Author: ensc
Update of /cvs/extras/rpms/cfs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27780
Modified Files:
cfs_1.4.1-cfix.patch
Log Message:
fixed a 'size_t' vs 'unsigned int' issue
cfs_1.4.1-cfix.patch:
Index: cfs_1.4.1-cfix.patch
===================================================================
RCS file: /cvs/extras/rpms/cfs/devel/cfs_1.4.1-cfix.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- cfs_1.4.1-cfix.patch 3 Jun 2006 11:36:27 -0000 1.3
+++ cfs_1.4.1-cfix.patch 3 Jun 2006 12:10:05 -0000 1.4
@@ -1,5 +1,5 @@
---- cfs-1.4.1/cattach.c.cfix 2006-06-03 13:28:55.000000000 +0200
-+++ cfs-1.4.1/cattach.c 2006-06-03 13:29:18.000000000 +0200
+--- cfs-1.4.1/cattach.c.cfix 2006-06-03 13:37:02.000000000 +0200
++++ cfs-1.4.1/cattach.c 2006-06-03 13:37:02.000000000 +0200
@@ -21,6 +21,7 @@
* december 1997
*/
@@ -68,8 +68,8 @@
deq()
{
if (argq.head==argq.tail)
---- cfs-1.4.1/ccat.c.cfix 2006-06-03 13:28:55.000000000 +0200
-+++ cfs-1.4.1/ccat.c 2006-06-03 13:28:55.000000000 +0200
+--- cfs-1.4.1/ccat.c.cfix 2006-06-03 13:37:02.000000000 +0200
++++ cfs-1.4.1/ccat.c 2006-06-03 13:37:02.000000000 +0200
@@ -32,12 +32,19 @@
#include "nfsproto.h"
#include "admproto.h"
@@ -127,8 +127,8 @@
flen(fd)
int fd;
{
---- cfs-1.4.1/cfs.c.cfix 2006-06-03 13:28:55.000000000 +0200
-+++ cfs-1.4.1/cfs.c 2006-06-03 13:29:38.000000000 +0200
+--- cfs-1.4.1/cfs.c.cfix 2006-06-03 13:37:02.000000000 +0200
++++ cfs-1.4.1/cfs.c 2006-06-03 13:37:02.000000000 +0200
@@ -25,6 +25,7 @@
*/
@@ -185,8 +185,8 @@
{
int i;
static instance ina,inb;
---- cfs-1.4.1/cfs.h.cfix 2006-06-03 13:28:55.000000000 +0200
-+++ cfs-1.4.1/cfs.h 2006-06-03 13:28:55.000000000 +0200
+--- cfs-1.4.1/cfs.h.cfix 2006-06-03 13:37:02.000000000 +0200
++++ cfs-1.4.1/cfs.h 2006-06-03 13:37:02.000000000 +0200
@@ -17,11 +17,16 @@
* OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR PURPOSE.
*/
@@ -242,8 +242,8 @@
+void freeinstance(int i);
+
+#endif // H_ENSC_CFS_CFS_H
---- cfs-1.4.1/cfs_adm.c.cfix 2006-06-03 13:28:55.000000000 +0200
-+++ cfs-1.4.1/cfs_adm.c 2006-06-03 13:28:55.000000000 +0200
+--- cfs-1.4.1/cfs_adm.c.cfix 2006-06-03 13:37:02.000000000 +0200
++++ cfs-1.4.1/cfs_adm.c 2006-06-03 13:37:02.000000000 +0200
@@ -18,19 +18,29 @@
/*
* server adm rpc handlers - ver 1.3.2
@@ -381,7 +381,7 @@
l =snprintf(fn, NFS_MAXPATHLEN, "%s/...",path);
--- cfs-1.4.1/cfs_cipher.c.cfix 1997-12-03 22:40:32.000000000 +0100
-+++ cfs-1.4.1/cfs_cipher.c 2006-06-03 13:28:55.000000000 +0200
++++ cfs-1.4.1/cfs_cipher.c 2006-06-03 13:37:02.000000000 +0200
@@ -14,14 +14,16 @@
* REPRESENTATION OR WARRANTY OF ANY KIND CONCERNING THE MERCHANTABILITY
* OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR PURPOSE.
@@ -418,7 +418,7 @@
cfs_admkey *key;
cfskey *k;
--- /dev/null 2006-05-19 20:31:51.509353000 +0200
-+++ cfs-1.4.1/cfs_cipher.h 2006-06-03 13:28:55.000000000 +0200
++++ cfs-1.4.1/cfs_cipher.h 2006-06-03 13:37:02.000000000 +0200
@@ -0,0 +1,29 @@
+// $Id$ --*- c -*--
+
@@ -450,7 +450,7 @@
+
+#endif // H_CFS_CFS_CIPHER_H
--- cfs-1.4.1/cfs_des.c.cfix 1995-12-25 07:23:32.000000000 +0100
-+++ cfs-1.4.1/cfs_des.c 2006-06-03 13:28:55.000000000 +0200
++++ cfs-1.4.1/cfs_des.c 2006-06-03 13:37:02.000000000 +0200
@@ -22,6 +22,9 @@
* block_cipher(key, block, decrypting)
*/
@@ -540,7 +540,7 @@
bcopy("encrypt!",s.key,8);
--- /dev/null 2006-05-19 20:31:51.509353000 +0200
-+++ cfs-1.4.1/cfs_des.h 2006-06-03 13:28:55.000000000 +0200
++++ cfs-1.4.1/cfs_des.h 2006-06-03 13:37:02.000000000 +0200
@@ -0,0 +1,30 @@
+// $Id$ --*- c -*--
+
@@ -572,8 +572,8 @@
+
+
+#endif // H_CFS_CFS_DES_H
---- cfs-1.4.1/cfs_fh.c.cfix 2006-06-03 13:28:55.000000000 +0200
-+++ cfs-1.4.1/cfs_fh.c 2006-06-03 13:28:55.000000000 +0200
+--- cfs-1.4.1/cfs_fh.c.cfix 2006-06-03 13:37:02.000000000 +0200
++++ cfs-1.4.1/cfs_fh.c 2006-06-03 13:37:02.000000000 +0200
@@ -20,10 +20,13 @@
* local file system interface
*/
@@ -981,7 +981,7 @@
int i;
cfs_fileid *f;
--- /dev/null 2006-05-19 20:31:51.509353000 +0200
-+++ cfs-1.4.1/cfs_fh.h 2006-06-03 13:28:55.000000000 +0200
++++ cfs-1.4.1/cfs_fh.h 2006-06-03 13:37:02.000000000 +0200
@@ -0,0 +1,61 @@
+// $Id$ --*- c -*--
+
@@ -1044,8 +1044,8 @@
+
+
+#endif // H_CFS_CFS_FH_H
---- cfs-1.4.1/cfs_nfs.c.cfix 2006-06-03 13:28:55.000000000 +0200
-+++ cfs-1.4.1/cfs_nfs.c 2006-06-03 13:30:20.000000000 +0200
+--- cfs-1.4.1/cfs_nfs.c.cfix 2006-06-03 13:37:02.000000000 +0200
++++ cfs-1.4.1/cfs_nfs.c 2006-06-03 13:37:02.000000000 +0200
@@ -20,8 +20,10 @@
* rpc handlers
* access control policies
@@ -1144,7 +1144,7 @@
SR rp;
{
--- /dev/null 2006-05-19 20:31:51.509353000 +0200
-+++ cfs-1.4.1/cfs_nfs.h 2006-06-03 13:28:55.000000000 +0200
++++ cfs-1.4.1/cfs_nfs.h 2006-06-03 13:37:02.000000000 +0200
@@ -0,0 +1,29 @@
+// $Id$ --*- c -*--
+
@@ -1175,8 +1175,8 @@
+
+
+#endif // H_CFS_CFS_NFS_H
---- cfs-1.4.1/cmkdir.c.cfix 2006-06-03 13:28:55.000000000 +0200
-+++ cfs-1.4.1/cmkdir.c 2006-06-03 13:28:55.000000000 +0200
+--- cfs-1.4.1/cmkdir.c.cfix 2006-06-03 13:37:02.000000000 +0200
++++ cfs-1.4.1/cmkdir.c 2006-06-03 13:37:40.000000000 +0200
@@ -30,7 +30,10 @@
#include "admproto.h"
#include "cfs.h"
@@ -1188,7 +1188,7 @@
main(argc,argv)
int argc;
char **argv;
-@@ -42,12 +45,12 @@ main(argc,argv)
+@@ -42,18 +45,18 @@ main(argc,argv)
cfs_admkey k;
cfskey kt;
char path[1024];
@@ -1203,6 +1203,13 @@
int ciph=CFS_BLOWFISH;
int cfmt=1;
int smsize=LARGESMSIZE;
+ unsigned char ekey[128];
+ unsigned char ek1[128];
+- unsigned int l;
++ size_t l;
+ int keycheck=1;
+ int rfd; /* File descriptor for /dev/random.*/
+
@@ -172,11 +175,11 @@ main(argc,argv)
exit(1);
}
@@ -1218,7 +1225,7 @@
assert(1 == read(rfd, ((char*)&r), 1));
for (i=0; i<sizeof(r); i++) {
--- cfs-1.4.1/getpass.c.cfix 1997-12-03 22:51:34.000000000 +0100
-+++ cfs-1.4.1/getpass.c 2006-06-03 13:28:55.000000000 +0200
++++ cfs-1.4.1/getpass.c 2006-06-03 13:37:02.000000000 +0200
@@ -33,19 +33,24 @@
* SUCH DAMAGE.
*/
@@ -1322,7 +1329,7 @@
case CFS_SAFER_SK128:
Safer_Init_Module();
--- /dev/null 2006-05-19 20:31:51.509353000 +0200
-+++ cfs-1.4.1/getpass.h 2006-06-03 13:28:55.000000000 +0200
++++ cfs-1.4.1/getpass.h 2006-06-03 13:37:02.000000000 +0200
@@ -0,0 +1,29 @@
+// $Id$ --*- c -*--
+
@@ -1354,7 +1361,7 @@
+
+#endif // H_CFS_GETPASS_H
--- cfs-1.4.1/mcg.c.cfix 1995-12-25 07:25:33.000000000 +0100
-+++ cfs-1.4.1/mcg.c 2006-06-03 13:28:55.000000000 +0200
++++ cfs-1.4.1/mcg.c 2006-06-03 13:37:02.000000000 +0200
@@ -31,6 +31,7 @@
/*
* codebook encrypt one block with given expanded key
@@ -1372,7 +1379,7 @@
unsigned char *blk;
mcg_key *key;
--- cfs-1.4.1/mcg.h.cfix 1995-12-25 07:25:33.000000000 +0100
-+++ cfs-1.4.1/mcg.h 2006-06-03 13:28:55.000000000 +0200
++++ cfs-1.4.1/mcg.h 2006-06-03 13:37:02.000000000 +0200
@@ -15,6 +15,9 @@
* OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR PURPOSE.
*/
@@ -1393,7 +1400,7 @@
+
+#endif // H_CFS_MCG_H
--- cfs-1.4.1/mcgsbox.c.cfix 1995-12-25 07:25:33.000000000 +0100
-+++ cfs-1.4.1/mcgsbox.c 2006-06-03 13:28:55.000000000 +0200
++++ cfs-1.4.1/mcgsbox.c 2006-06-03 13:37:02.000000000 +0200
@@ -23,6 +23,7 @@
@@ -1420,7 +1427,7 @@
unsigned char *key;
mcg_key *ek;
--- cfs-1.4.1/cdetach.c.cfix 1995-12-25 07:22:35.000000000 +0100
-+++ cfs-1.4.1/cdetach.c 2006-06-03 13:29:50.000000000 +0200
++++ cfs-1.4.1/cdetach.c 2006-06-03 13:37:02.000000000 +0200
@@ -19,11 +19,13 @@
* client side detach
*/
@@ -1448,7 +1455,7 @@
exit(1);
}
--- cfs-1.4.1/shs.c.cfix 1995-12-25 07:49:33.000000000 +0100
-+++ cfs-1.4.1/shs.c 2006-06-03 13:28:55.000000000 +0200
++++ cfs-1.4.1/shs.c 2006-06-03 13:37:02.000000000 +0200
@@ -48,6 +48,7 @@
#include <sys/types.h>
@@ -1457,8 +1464,8 @@
#include "shs.h"
static long nbits;
---- cfs-1.4.1/cname.c.cfix 2006-06-03 13:28:55.000000000 +0200
-+++ cfs-1.4.1/cname.c 2006-06-03 13:28:55.000000000 +0200
+--- cfs-1.4.1/cname.c.cfix 2006-06-03 13:37:02.000000000 +0200
++++ cfs-1.4.1/cname.c 2006-06-03 13:37:02.000000000 +0200
@@ -25,14 +25,18 @@
#include "nfsproto.h"
#include "admproto.h"
@@ -1491,7 +1498,7 @@
exit(2);
}
--- /dev/null 2006-05-19 20:31:51.509353000 +0200
-+++ cfs-1.4.1/cfs_adm.h 2006-06-03 13:28:55.000000000 +0200
++++ cfs-1.4.1/cfs_adm.h 2006-06-03 13:37:02.000000000 +0200
@@ -0,0 +1,26 @@
+// $Id$ --*- c -*--
+
@@ -1519,8 +1526,8 @@
+void genmasks(cfskey *k);
+
+#endif // H_ENSC_CFS_CFS_ADM_H
---- cfs-1.4.1/cpasswd.c.cfix 2006-06-03 13:28:55.000000000 +0200
-+++ cfs-1.4.1/cpasswd.c 2006-06-03 13:28:55.000000000 +0200
+--- cfs-1.4.1/cpasswd.c.cfix 2006-06-03 13:37:02.000000000 +0200
++++ cfs-1.4.1/cpasswd.c 2006-06-03 13:37:02.000000000 +0200
@@ -24,8 +24,13 @@
#include "nfsproto.h"
#include "admproto.h"
More information about the fedora-extras-commits
mailing list