rpms/cfs/devel cfs_1.4.1-cfix.patch,1.2,1.3
Enrico Scholz (ensc)
fedora-extras-commits at redhat.com
Sat Jun 3 11:36:28 UTC 2006
Author: ensc
Update of /cvs/extras/rpms/cfs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25136
Modified Files:
cfs_1.4.1-cfix.patch
Log Message:
added some '#include <unistd.h>'
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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- cfs_1.4.1-cfix.patch 3 Jun 2006 11:27:54 -0000 1.2
+++ cfs_1.4.1-cfix.patch 3 Jun 2006 11:36:27 -0000 1.3
@@ -1,6 +1,14 @@
---- 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 @@
+--- 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
+@@ -21,6 +21,7 @@
+ * december 1997
+ */
+ #include <stdio.h>
++#include <unistd.h>
+ #include <rpc/rpc.h>
+ #include <sys/time.h>
+ #ifdef irix
+@@ -49,6 +50,7 @@
#include "nfsproto.h"
#include "admproto.h"
#include "cfs.h"
@@ -8,7 +16,7 @@
#ifdef SOLARIS2X
/* NOTE! delete the #define statfs below if this won't compile on
-@@ -64,6 +65,10 @@
+@@ -64,6 +66,10 @@
#define IDLE 0
#endif
@@ -19,7 +27,7 @@
main(argc,argv)
int argc;
char **argv;
-@@ -233,7 +238,7 @@ main(argc,argv)
+@@ -233,7 +239,7 @@ main(argc,argv)
cfmt=0;
} else {
cfmt=1;
@@ -28,7 +36,7 @@
cfmt=0;
fclose(fp);
}
-@@ -274,8 +279,10 @@ main(argc,argv)
+@@ -274,8 +280,10 @@ main(argc,argv)
exit(1);
}
cln->cl_auth = authunix_create_default();
@@ -41,7 +49,7 @@
clnt_perrno(status);
exit(1);
}
-@@ -291,8 +298,8 @@ struct {
+@@ -291,8 +299,8 @@ struct {
int tail;
} argq = {{0},0,0};
@@ -52,7 +60,7 @@
{
argq.tail++;
argq.tail %= QS;
-@@ -303,6 +310,7 @@ enq(f)
+@@ -303,6 +311,7 @@ enq(f)
argq.data[argq.tail]=f;
}
@@ -60,8 +68,8 @@
deq()
{
if (argq.head==argq.tail)
---- 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
+--- 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
@@ -32,12 +32,19 @@
#include "nfsproto.h"
#include "admproto.h"
@@ -119,9 +127,17 @@
flen(fd)
int fd;
{
---- 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 @@
+--- 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
+@@ -25,6 +25,7 @@
+ */
+
+ #include <stdio.h>
++#include <unistd.h>
+ #include <sys/types.h>
+ #include <sys/file.h>
+ #include <sys/socket.h>
+@@ -32,7 +33,9 @@
/* #include <arpa/inet.h> */
#include <netdb.h>
#include <rpc/rpc.h>
@@ -131,7 +147,7 @@
#ifndef NORLIMITS
#include <sys/resource.h>
#endif
-@@ -44,6 +46,7 @@
+@@ -44,6 +47,7 @@
#include "cfs.h"
#include <stdlib.h>
@@ -139,7 +155,7 @@
struct in_addr validhost;
-@@ -52,8 +55,8 @@ void nfs_program_2();
+@@ -52,8 +56,8 @@ void nfs_program_2();
void adm_program_2();
#include <string.h>
#else
@@ -150,7 +166,7 @@
#endif
#ifdef __NetBSD__
int _rpcsvcdirty;
-@@ -73,6 +76,9 @@ int mount_pid =0;
+@@ -73,6 +77,9 @@ int mount_pid =0;
int umount_pid =0;
unsigned int doexit =0;
@@ -160,7 +176,7 @@
main(argc,argv)
int argc;
char **argv;
-@@ -265,7 +271,7 @@ main(argc,argv)
+@@ -265,7 +272,7 @@ main(argc,argv)
exit(1);
}
@@ -169,8 +185,8 @@
{
int i;
static instance ina,inb;
---- 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
+--- 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
@@ -17,11 +17,16 @@
* OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR PURPOSE.
*/
@@ -226,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:24:30.000000000 +0200
-+++ cfs-1.4.1/cfs_adm.c 2006-06-03 13:24:30.000000000 +0200
+--- 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
@@ -18,19 +18,29 @@
/*
* server adm rpc handlers - ver 1.3.2
@@ -365,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:24:30.000000000 +0200
++++ cfs-1.4.1/cfs_cipher.c 2006-06-03 13:28:55.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 +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:24:30.000000000 +0200
++++ cfs-1.4.1/cfs_cipher.h 2006-06-03 13:28:55.000000000 +0200
@@ -0,0 +1,29 @@
+// $Id$ --*- c -*--
+
@@ -434,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:24:30.000000000 +0200
++++ cfs-1.4.1/cfs_des.c 2006-06-03 13:28:55.000000000 +0200
@@ -22,6 +22,9 @@
* block_cipher(key, block, decrypting)
*/
@@ -524,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:24:30.000000000 +0200
++++ cfs-1.4.1/cfs_des.h 2006-06-03 13:28:55.000000000 +0200
@@ -0,0 +1,30 @@
+// $Id$ --*- c -*--
+
@@ -556,8 +572,8 @@
+
+
+#endif // H_CFS_CFS_DES_H
---- 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
+--- 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
@@ -20,10 +20,13 @@
* local file system interface
*/
@@ -965,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:24:30.000000000 +0200
++++ cfs-1.4.1/cfs_fh.h 2006-06-03 13:28:55.000000000 +0200
@@ -0,0 +1,61 @@
+// $Id$ --*- c -*--
+
@@ -1028,17 +1044,20 @@
+
+
+#endif // H_CFS_CFS_FH_H
---- 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 @@
+--- 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
+@@ -20,8 +20,10 @@
* rpc handlers
* access control policies
*/
+#include "cfs_nfs.h"
#include <stdio.h>
++#include <unistd.h>
#include <sys/file.h>
-@@ -33,25 +34,31 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
+@@ -33,25 +35,31 @@
#else
#include <dirent.h>
#endif
@@ -1074,7 +1093,7 @@
strcat(ret,x);
}
return ret;
-@@ -303,7 +310,7 @@ nfsproc_read_2_svc(readargs *ap, struct
+@@ -303,7 +311,7 @@ nfsproc_read_2_svc(readargs *ap, struct
static char buffer[8192];
int fd;
int uid;
@@ -1083,7 +1102,7 @@
cfskey *key;
int ht;
cfs_fileid *h;
-@@ -345,7 +352,7 @@ nfsproc_read_2_svc(readargs *ap, struct
+@@ -345,7 +353,7 @@ nfsproc_read_2_svc(readargs *ap, struct
break;
}
ret.readres_u.reply.data.data_len =
@@ -1092,7 +1111,7 @@
ret.readres_u.reply.data.data_val = buffer;
ret.status = NFS_OK;
break;
-@@ -950,6 +957,7 @@ cfsopendir(dir,cookie)
+@@ -950,6 +958,7 @@ cfsopendir(dir,cookie)
return ret;
}
@@ -1100,7 +1119,7 @@
cfsclosedir(dp)
DIR *dp;
{
-@@ -969,6 +977,7 @@ nfsproc_statfs_2_svc(nfs_fh *ap, struct
+@@ -969,6 +978,7 @@ nfsproc_statfs_2_svc(nfs_fh *ap, struct
return (&ret);
}
@@ -1108,7 +1127,7 @@
rootgetattr(f)
struct fattr *f;
{
-@@ -989,6 +998,7 @@ rootgetattr(f)
+@@ -989,6 +999,7 @@ rootgetattr(f)
}
@@ -1116,7 +1135,7 @@
setstatfsokres(s)
statfsokres *s;
{
-@@ -1157,6 +1167,7 @@ rootreaddir(ap)
+@@ -1157,6 +1168,7 @@ rootreaddir(ap)
extern struct in_addr validhost;
@@ -1125,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:24:30.000000000 +0200
++++ cfs-1.4.1/cfs_nfs.h 2006-06-03 13:28:55.000000000 +0200
@@ -0,0 +1,29 @@
+// $Id$ --*- c -*--
+
@@ -1156,8 +1175,8 @@
+
+
+#endif // H_CFS_CFS_NFS_H
---- 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
+--- 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
@@ -30,7 +30,10 @@
#include "admproto.h"
#include "cfs.h"
@@ -1199,7 +1218,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:24:30.000000000 +0200
++++ cfs-1.4.1/getpass.c 2006-06-03 13:28:55.000000000 +0200
@@ -33,19 +33,24 @@
* SUCH DAMAGE.
*/
@@ -1303,7 +1322,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:24:30.000000000 +0200
++++ cfs-1.4.1/getpass.h 2006-06-03 13:28:55.000000000 +0200
@@ -0,0 +1,29 @@
+// $Id$ --*- c -*--
+
@@ -1335,7 +1354,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:24:30.000000000 +0200
++++ cfs-1.4.1/mcg.c 2006-06-03 13:28:55.000000000 +0200
@@ -31,6 +31,7 @@
/*
* codebook encrypt one block with given expanded key
@@ -1353,7 +1372,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:24:30.000000000 +0200
++++ cfs-1.4.1/mcg.h 2006-06-03 13:28:55.000000000 +0200
@@ -15,6 +15,9 @@
* OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR PURPOSE.
*/
@@ -1374,7 +1393,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:24:30.000000000 +0200
++++ cfs-1.4.1/mcgsbox.c 2006-06-03 13:28:55.000000000 +0200
@@ -23,6 +23,7 @@
@@ -1401,8 +1420,14 @@
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:24:30.000000000 +0200
-@@ -24,6 +24,7 @@
++++ cfs-1.4.1/cdetach.c 2006-06-03 13:29:50.000000000 +0200
+@@ -19,11 +19,13 @@
+ * client side detach
+ */
+ #include <stdio.h>
++#include <unistd.h>
+ #include <rpc/rpc.h>
+ #include "nfsproto.h"
#include "admproto.h"
#include "cfs.h"
@@ -1410,7 +1435,7 @@
main(argc,argv)
int argc;
char **argv;
-@@ -40,8 +41,9 @@ main(argc,argv)
+@@ -40,8 +42,9 @@ main(argc,argv)
ap.name=argv[1];
ap.uid=getuid();
if ((status = callrpc("localhost",ADM_PROGRAM,ADM_VERSION,
@@ -1423,7 +1448,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:24:30.000000000 +0200
++++ cfs-1.4.1/shs.c 2006-06-03 13:28:55.000000000 +0200
@@ -48,6 +48,7 @@
#include <sys/types.h>
@@ -1432,8 +1457,8 @@
#include "shs.h"
static long nbits;
---- 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
+--- 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
@@ -25,14 +25,18 @@
#include "nfsproto.h"
#include "admproto.h"
@@ -1466,7 +1491,7 @@
exit(2);
}
--- /dev/null 2006-05-19 20:31:51.509353000 +0200
-+++ cfs-1.4.1/cfs_adm.h 2006-06-03 13:24:30.000000000 +0200
++++ cfs-1.4.1/cfs_adm.h 2006-06-03 13:28:55.000000000 +0200
@@ -0,0 +1,26 @@
+// $Id$ --*- c -*--
+
@@ -1494,8 +1519,8 @@
+void genmasks(cfskey *k);
+
+#endif // H_ENSC_CFS_CFS_ADM_H
---- 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
+--- 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
@@ -24,8 +24,13 @@
#include "nfsproto.h"
#include "admproto.h"
More information about the fedora-extras-commits
mailing list