rpms/cfs/devel cfs_1.4.1-cfix.patch,1.1,1.2
Enrico Scholz (ensc)
fedora-extras-commits at redhat.com
Sat Jun 3 11:27:54 UTC 2006
Author: ensc
Update of /cvs/extras/rpms/cfs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25036
Modified Files:
cfs_1.4.1-cfix.patch
Log Message:
fixed some x86_64 issues
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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cfs_1.4.1-cfix.patch 3 Jun 2006 11:12:57 -0000 1.1
+++ cfs_1.4.1-cfix.patch 3 Jun 2006 11:27:54 -0000 1.2
@@ -1,5 +1,5 @@
---- cfs-1.4.1/cattach.c.cfix 2006-06-03 12:56:19.000000000 +0200
-+++ cfs-1.4.1/cattach.c 2006-06-03 12:56:19.000000000 +0200
+--- cfs-1.4.1/cattach.c.cfix 2006-06-03 13:24:30.000000000 +0200
++++ cfs-1.4.1/cattach.c 2006-06-03 13:24:30.000000000 +0200
@@ -49,6 +49,7 @@
#include "nfsproto.h"
#include "admproto.h"
@@ -60,8 +60,8 @@
deq()
{
if (argq.head==argq.tail)
---- cfs-1.4.1/ccat.c.cfix 2006-06-03 12:56:19.000000000 +0200
-+++ cfs-1.4.1/ccat.c 2006-06-03 12:56:19.000000000 +0200
+--- cfs-1.4.1/ccat.c.cfix 2006-06-03 13:24:30.000000000 +0200
++++ cfs-1.4.1/ccat.c 2006-06-03 13:24:30.000000000 +0200
@@ -32,12 +32,19 @@
#include "nfsproto.h"
#include "admproto.h"
@@ -119,8 +119,8 @@
flen(fd)
int fd;
{
---- cfs-1.4.1/cfs.c.cfix 2006-06-03 12:56:19.000000000 +0200
-+++ cfs-1.4.1/cfs.c 2006-06-03 12:56:19.000000000 +0200
+--- cfs-1.4.1/cfs.c.cfix 2006-06-03 13:24:30.000000000 +0200
++++ cfs-1.4.1/cfs.c 2006-06-03 13:24:30.000000000 +0200
@@ -32,7 +32,9 @@
/* #include <arpa/inet.h> */
#include <netdb.h>
@@ -169,8 +169,8 @@
{
int i;
static instance ina,inb;
---- cfs-1.4.1/cfs.h.cfix 2006-06-03 12:56:19.000000000 +0200
-+++ cfs-1.4.1/cfs.h 2006-06-03 12:56:35.000000000 +0200
+--- cfs-1.4.1/cfs.h.cfix 2006-06-03 13:24:30.000000000 +0200
++++ cfs-1.4.1/cfs.h 2006-06-03 13:24:30.000000000 +0200
@@ -17,11 +17,16 @@
* OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR PURPOSE.
*/
@@ -226,8 +226,8 @@
+void freeinstance(int i);
+
+#endif // H_ENSC_CFS_CFS_H
---- cfs-1.4.1/cfs_adm.c.cfix 2006-06-03 12:56:19.000000000 +0200
-+++ cfs-1.4.1/cfs_adm.c 2006-06-03 12:56:19.000000000 +0200
+--- cfs-1.4.1/cfs_adm.c.cfix 2006-06-03 13:24:30.000000000 +0200
++++ cfs-1.4.1/cfs_adm.c 2006-06-03 13:24:30.000000000 +0200
@@ -18,19 +18,29 @@
/*
* server adm rpc handlers - ver 1.3.2
@@ -365,7 +365,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 12:56:19.000000000 +0200
++++ cfs-1.4.1/cfs_cipher.c 2006-06-03 13:24:30.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.
@@ -402,7 +402,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 12:56:19.000000000 +0200
++++ cfs-1.4.1/cfs_cipher.h 2006-06-03 13:24:30.000000000 +0200
@@ -0,0 +1,29 @@
+// $Id$ --*- c -*--
+
@@ -434,7 +434,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 12:56:19.000000000 +0200
++++ cfs-1.4.1/cfs_des.c 2006-06-03 13:24:30.000000000 +0200
@@ -22,6 +22,9 @@
* block_cipher(key, block, decrypting)
*/
@@ -524,7 +524,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 12:56:19.000000000 +0200
++++ cfs-1.4.1/cfs_des.h 2006-06-03 13:24:30.000000000 +0200
@@ -0,0 +1,30 @@
+// $Id$ --*- c -*--
+
@@ -556,9 +556,9 @@
+
+
+#endif // H_CFS_CFS_DES_H
---- cfs-1.4.1/cfs_fh.c.cfix 2006-06-03 12:56:19.000000000 +0200
-+++ cfs-1.4.1/cfs_fh.c 2006-06-03 12:56:19.000000000 +0200
-@@ -20,6 +20,8 @@
+--- cfs-1.4.1/cfs_fh.c.cfix 2006-06-03 13:24:30.000000000 +0200
++++ cfs-1.4.1/cfs_fh.c 2006-06-03 13:25:16.000000000 +0200
+@@ -20,10 +20,13 @@
* local file system interface
*/
@@ -567,7 +567,12 @@
#include <sys/types.h>
#include <sys/file.h>
#include <sys/stat.h>
-@@ -47,6 +49,8 @@
+ #include <errno.h>
++#include <unistd.h>
+ #ifdef NeXT
+ #include <sys/dir.h>
+ #define dirent direct
+@@ -47,6 +50,8 @@
#include "nfsproto.h"
#include "admproto.h"
#include "cfs.h"
@@ -576,7 +581,7 @@
#ifdef NO_UTIMES
/* simulate utimes with utime */
-@@ -71,6 +75,22 @@ int nfds=0; /* number of open fd's curre
+@@ -71,10 +76,26 @@ int nfds=0; /* number of open fd's curre
int cfserrno=NFS_OK;
@@ -599,7 +604,12 @@
/*
* get an encrypted block from fd, which damn well better be valid
*/
-@@ -88,7 +108,7 @@ readblock(blk,fd,offset,len,key,vect)
+-int
++ssize_t
+ readblock(blk,fd,offset,len,key,vect)
+ char *blk; /* data */
+ int fd; /* fd */
+@@ -88,7 +109,7 @@ readblock(blk,fd,offset,len,key,vect)
int iolen;
int readmore=0;
int userbytes;
@@ -608,7 +618,16 @@
/* first, normalize to the proper boundries */
fronterr = offset&(CFSBLOCK-1);
-@@ -129,14 +149,14 @@ writeblock(blk,fd,offset,len,key,vect)
+@@ -120,7 +141,7 @@ readblock(blk,fd,offset,len,key,vect)
+ /*
+ * write an encrypted block to fd
+ */
+-int
++ssize_t
+ writeblock(blk,fd,offset,len,key,vect)
+ char *blk; /* data */
+ int fd; /* fd */
+@@ -129,14 +150,14 @@ writeblock(blk,fd,offset,len,key,vect)
cfskey *key; /* des key */
char *vect; /* perturb. vector */
{
@@ -625,7 +644,7 @@
/* first, normalize to the proper boundries */
fronterr = offset&(CFSBLOCK-1);
-@@ -209,10 +229,10 @@ encryptname(key,s)
+@@ -209,10 +230,10 @@ encryptname(key,s)
char *s;
{
static char cryptname[NFS_MAXNAMLEN+1];
@@ -640,7 +659,7 @@
if ((s==NULL) || ((l=strlen(s)+1)>MAXCLEARNAME))
return NULL;
-@@ -220,12 +240,12 @@ encryptname(key,s)
+@@ -220,12 +241,12 @@ encryptname(key,s)
return s;
l=(l+(CFSBLOCK-1)) & (~(CFSBLOCK-1));
bzero((char *)cryptstring,l);
@@ -655,7 +674,7 @@
strcat(cryptname,x);
}
return cryptname;
-@@ -236,8 +256,9 @@ encryptname(key,s)
+@@ -236,8 +257,9 @@ encryptname(key,s)
* reversible (see unchksum) and backwards-compatible (at least for 7-bit
* characters).
*/
@@ -666,7 +685,7 @@
long l;
{
u_long acc;
-@@ -263,8 +284,9 @@ chksum(s,l)
+@@ -263,8 +285,9 @@ chksum(s,l)
s[i] ^= bits[i%8];
}
@@ -677,7 +696,7 @@
long l;
{
u_long acc;
-@@ -294,9 +316,9 @@ decryptname(key,s)
+@@ -294,9 +317,9 @@ decryptname(key,s)
cfskey *key;
char *s;
{
@@ -689,7 +708,7 @@
char *p, *q;
int l;
int i;
-@@ -305,10 +327,10 @@ decryptname(key,s)
+@@ -305,10 +328,10 @@ decryptname(key,s)
return NULL;
if (!strcmp(s,".") || !strcmp(s,".."))
return s;
@@ -702,7 +721,7 @@
x[2]='\0';
l=0;
while (*p) {
-@@ -325,12 +347,13 @@ decryptname(key,s)
+@@ -325,12 +348,13 @@ decryptname(key,s)
return NULL;
dodecrypt(key,clearstring,l,10241,zerovect);
unchksum(clearstring,l);
@@ -718,7 +737,7 @@
int l;
int salt;
char *vect;
-@@ -350,9 +373,10 @@ doencrypt(k,s,l,salt,vect)
+@@ -350,9 +374,10 @@ doencrypt(k,s,l,salt,vect)
}
}
@@ -730,7 +749,7 @@
int l;
int salt;
char *vect;
-@@ -375,7 +399,7 @@ dodecrypt(k,s,l,salt,vect)
+@@ -375,7 +400,7 @@ dodecrypt(k,s,l,salt,vect)
/*
* convert size of data to size of block to be written
*/
@@ -739,7 +758,7 @@
int d;
{
return isbndry(d)?d:(d+CFSBLOCK);
-@@ -385,7 +409,7 @@ vtod(d)
+@@ -385,7 +410,7 @@ vtod(d)
/*
* convert file size into #of valid bits
*/
@@ -748,7 +767,7 @@
int d;
{
return isbndry(d)?d:(d-CFSBLOCK);
-@@ -394,6 +418,7 @@ dtov(d)
+@@ -394,6 +419,7 @@ dtov(d)
/*
* is block size a CFS boundry?
*/
@@ -756,7 +775,7 @@
isbndry(d)
int d;
{
-@@ -474,7 +499,7 @@ geth(h)
+@@ -474,7 +500,7 @@ geth(h)
return r;
}
@@ -765,7 +784,7 @@
htype(f)
cfs_fileid *f;
{
-@@ -486,6 +511,7 @@ htype(f)
+@@ -486,6 +512,7 @@ htype(f)
return H_REG;
}
@@ -773,7 +792,7 @@
iid(f)
cfs_fileid *f;
{
-@@ -497,15 +523,17 @@ iid(f)
+@@ -497,15 +524,17 @@ iid(f)
return f->ins->id;
}
@@ -792,7 +811,7 @@
fhmode(f,mode)
cfs_fileid *f;
int mode;
-@@ -516,6 +544,7 @@ fhmode(f,mode)
+@@ -516,6 +545,7 @@ fhmode(f,mode)
}
/* return the inode of me */
@@ -800,7 +819,7 @@
fhid(f)
cfs_fileid *f;
{
-@@ -527,20 +556,23 @@ fhid(f)
+@@ -527,20 +557,23 @@ fhid(f)
}
/* return the inode of .. (directory only) */
@@ -825,7 +844,7 @@
fhuid(f,u)
cfs_fileid *f;
int u;
-@@ -554,6 +586,7 @@ fhuid(f,u)
+@@ -554,6 +587,7 @@ fhuid(f,u)
return (f->ins->uid==u);
}
@@ -833,7 +852,7 @@
cfsno(err)
int err;
{
-@@ -684,6 +717,7 @@ fhgetstat(h,sb)
+@@ -684,6 +718,7 @@ fhgetstat(h,sb)
return 0;
}
@@ -841,7 +860,7 @@
closeout(f)
cfs_fileid *f;
{
-@@ -695,6 +729,7 @@ closeout(f)
+@@ -695,6 +730,7 @@ closeout(f)
}
}
@@ -849,7 +868,7 @@
closeall()
{
if (openfd!=NULL) {
-@@ -705,6 +740,7 @@ closeall()
+@@ -705,6 +741,7 @@ closeall()
}
}
@@ -857,7 +876,7 @@
fhsetattr(f,a)
cfs_fileid *f;
sattr *a;
-@@ -802,10 +838,11 @@ fhsetattrprime(f,a)
+@@ -802,10 +839,11 @@ fhsetattrprime(f,a)
return 0;
}
@@ -870,7 +889,7 @@
{
char path[NFS_MAXPATHLEN+1];
struct stat sb;
-@@ -830,7 +867,7 @@ int
+@@ -830,7 +868,7 @@ int
fhmkfileent(p,comp,h)
cfs_fileid *p;
char *comp;
@@ -879,7 +898,7 @@
{
char path[NFS_MAXPATHLEN+1];
int fd;
-@@ -871,7 +908,7 @@ fhmkfileent(p,comp,h)
+@@ -871,7 +909,7 @@ fhmkfileent(p,comp,h)
*/
buf.i[0]=(u_long)sb.st_ino;
buf.i[1]=(u_long)sb.st_ctime;
@@ -888,7 +907,7 @@
/* des is just used here as a hash fn to spread the bits */
/* since we only use 32 bits of the result, its a nonperfect */
/* hash. but this doesn't really matter since collisions */
-@@ -910,7 +947,7 @@ int
+@@ -910,7 +948,7 @@ int
fhlook(p,comp,h)
cfs_fileid *p;
char *comp;
@@ -897,7 +916,7 @@
{
char path[NFS_MAXPATHLEN+1];
char linkname[NFS_MAXPATHLEN+1];
-@@ -1034,6 +1071,7 @@ mkhandle(p,n,comp,ino,h,vect,vectname
+@@ -1034,6 +1072,7 @@ mkhandle(p,n,comp,ino,h,vect,vectname
return 0;
}
@@ -905,7 +924,7 @@
inserth(f)
cfs_fileid *f;
{
-@@ -1044,11 +1082,12 @@ inserth(f)
+@@ -1044,11 +1083,12 @@ inserth(f)
instances[f->ins->id]->file[bucket]=f;
}
@@ -919,7 +938,7 @@
{
bzero((char *)h,sizeof(fhdata));
bcopy((char *)magictest,(char *)h->magic,sizeof(magictest));
-@@ -1114,6 +1153,7 @@ fhopendir(d)
+@@ -1114,6 +1154,7 @@ fhopendir(d)
return dp;
}
@@ -927,7 +946,7 @@
fhclosedir(dp)
DIR *dp;
{
-@@ -1249,7 +1289,7 @@ rootrd(cookie)
+@@ -1249,7 +1290,7 @@ rootrd(cookie)
} else while (cookie<(NINSTANCES+2)) {
if (instances[cookie-2] != NULL) {
if (instances[cookie-2]->anon)
@@ -936,7 +955,7 @@
else
strcpy(d.d_name,
instances[cookie-2]->name);
-@@ -1268,7 +1308,7 @@ rootrd(cookie)
+@@ -1268,7 +1309,7 @@ rootrd(cookie)
int
fhrootlook(n,h)
char *n;
@@ -946,7 +965,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 12:56:19.000000000 +0200
++++ cfs-1.4.1/cfs_fh.h 2006-06-03 13:24:30.000000000 +0200
@@ -0,0 +1,61 @@
+// $Id$ --*- c -*--
+
@@ -1009,8 +1028,8 @@
+
+
+#endif // H_CFS_CFS_FH_H
---- cfs-1.4.1/cfs_nfs.c.cfix 2006-06-03 12:56:19.000000000 +0200
-+++ cfs-1.4.1/cfs_nfs.c 2006-06-03 12:56:19.000000000 +0200
+--- cfs-1.4.1/cfs_nfs.c.cfix 2006-06-03 13:24:30.000000000 +0200
++++ cfs-1.4.1/cfs_nfs.c 2006-06-03 13:24:30.000000000 +0200
@@ -20,6 +20,7 @@
* rpc handlers
* access control policies
@@ -1106,7 +1125,7 @@
SR rp;
{
--- /dev/null 2006-05-19 20:31:51.509353000 +0200
-+++ cfs-1.4.1/cfs_nfs.h 2006-06-03 12:56:19.000000000 +0200
++++ cfs-1.4.1/cfs_nfs.h 2006-06-03 13:24:30.000000000 +0200
@@ -0,0 +1,29 @@
+// $Id$ --*- c -*--
+
@@ -1137,8 +1156,8 @@
+
+
+#endif // H_CFS_CFS_NFS_H
---- cfs-1.4.1/cmkdir.c.cfix 2006-06-03 12:56:19.000000000 +0200
-+++ cfs-1.4.1/cmkdir.c 2006-06-03 12:56:19.000000000 +0200
+--- cfs-1.4.1/cmkdir.c.cfix 2006-06-03 13:24:30.000000000 +0200
++++ cfs-1.4.1/cmkdir.c 2006-06-03 13:24:30.000000000 +0200
@@ -30,7 +30,10 @@
#include "admproto.h"
#include "cfs.h"
@@ -1180,7 +1199,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 12:56:19.000000000 +0200
++++ cfs-1.4.1/getpass.c 2006-06-03 13:24:30.000000000 +0200
@@ -33,19 +33,24 @@
* SUCH DAMAGE.
*/
@@ -1284,7 +1303,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 12:56:19.000000000 +0200
++++ cfs-1.4.1/getpass.h 2006-06-03 13:24:30.000000000 +0200
@@ -0,0 +1,29 @@
+// $Id$ --*- c -*--
+
@@ -1316,7 +1335,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 12:56:19.000000000 +0200
++++ cfs-1.4.1/mcg.c 2006-06-03 13:24:30.000000000 +0200
@@ -31,6 +31,7 @@
/*
* codebook encrypt one block with given expanded key
@@ -1334,7 +1353,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 12:56:19.000000000 +0200
++++ cfs-1.4.1/mcg.h 2006-06-03 13:24:30.000000000 +0200
@@ -15,6 +15,9 @@
* OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR PURPOSE.
*/
@@ -1355,7 +1374,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 12:56:19.000000000 +0200
++++ cfs-1.4.1/mcgsbox.c 2006-06-03 13:24:30.000000000 +0200
@@ -23,6 +23,7 @@
@@ -1382,7 +1401,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 12:56:19.000000000 +0200
++++ cfs-1.4.1/cdetach.c 2006-06-03 13:24:30.000000000 +0200
@@ -24,6 +24,7 @@
#include "admproto.h"
#include "cfs.h"
@@ -1404,7 +1423,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 12:56:19.000000000 +0200
++++ cfs-1.4.1/shs.c 2006-06-03 13:24:30.000000000 +0200
@@ -48,6 +48,7 @@
#include <sys/types.h>
@@ -1413,8 +1432,8 @@
#include "shs.h"
static long nbits;
---- cfs-1.4.1/cname.c.cfix 2006-06-03 12:56:19.000000000 +0200
-+++ cfs-1.4.1/cname.c 2006-06-03 12:56:19.000000000 +0200
+--- cfs-1.4.1/cname.c.cfix 2006-06-03 13:24:30.000000000 +0200
++++ cfs-1.4.1/cname.c 2006-06-03 13:24:30.000000000 +0200
@@ -25,14 +25,18 @@
#include "nfsproto.h"
#include "admproto.h"
@@ -1447,7 +1466,7 @@
exit(2);
}
--- /dev/null 2006-05-19 20:31:51.509353000 +0200
-+++ cfs-1.4.1/cfs_adm.h 2006-06-03 12:56:19.000000000 +0200
++++ cfs-1.4.1/cfs_adm.h 2006-06-03 13:24:30.000000000 +0200
@@ -0,0 +1,26 @@
+// $Id$ --*- c -*--
+
@@ -1475,8 +1494,8 @@
+void genmasks(cfskey *k);
+
+#endif // H_ENSC_CFS_CFS_ADM_H
---- cfs-1.4.1/cpasswd.c.cfix 2006-06-03 12:56:19.000000000 +0200
-+++ cfs-1.4.1/cpasswd.c 2006-06-03 12:56:19.000000000 +0200
+--- cfs-1.4.1/cpasswd.c.cfix 2006-06-03 13:24:30.000000000 +0200
++++ cfs-1.4.1/cpasswd.c 2006-06-03 13:24:30.000000000 +0200
@@ -24,8 +24,13 @@
#include "nfsproto.h"
#include "admproto.h"
More information about the fedora-extras-commits
mailing list