Thu Nov 29 07:31:02 2012 UTC ()
patch-gssftp_ftp_ftp_var.h rewritten


(adam)
diff -r1.5 -r1.6 pkgsrc/security/mit-krb5-appl/distinfo
diff -r1.1 -r1.2 pkgsrc/security/mit-krb5-appl/patches/patch-gssftp_ftp_ftp_var.h
cvs diff -r1.5 -r1.6 pkgsrc/security/mit-krb5-appl/distinfo (expand / switch to unified diff)

--- pkgsrc/security/mit-krb5-appl/distinfo 2012/02/26 13:16:32 1.5
+++ pkgsrc/security/mit-krb5-appl/distinfo 2012/11/29 07:31:02 1.6
@@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
1$NetBSD: distinfo,v 1.5 2012/02/26 13:16:32 adam Exp $ 1$NetBSD: distinfo,v 1.6 2012/11/29 07:31:02 adam Exp $
2 2
3SHA1 (krb5-appl-1.0.3-signed.tar) = 6711c1b46633e666e6e707363ffffce5e1c84d9d 3SHA1 (krb5-appl-1.0.3-signed.tar) = 6711c1b46633e666e6e707363ffffce5e1c84d9d
4RMD160 (krb5-appl-1.0.3-signed.tar) = 491359af5da2ea3c680811b08d9696eb43794a21 4RMD160 (krb5-appl-1.0.3-signed.tar) = 491359af5da2ea3c680811b08d9696eb43794a21
5Size (krb5-appl-1.0.3-signed.tar) = 634880 bytes 5Size (krb5-appl-1.0.3-signed.tar) = 634880 bytes
6SHA1 (patch-ab) = 4522fcdb396d2079ac6405926a64f907d94a2593 6SHA1 (patch-ab) = 4522fcdb396d2079ac6405926a64f907d94a2593
7SHA1 (patch-gssftp_ftp_cmds_c) = 24942a2bcfc0cb0ce3045da5468d315c5b1bfadb 7SHA1 (patch-gssftp_ftp_cmds_c) = 24942a2bcfc0cb0ce3045da5468d315c5b1bfadb
8SHA1 (patch-gssftp_ftp_ftp_var.h) = bd851e19a70db30bec53d20d75bb1855a13b3084 8SHA1 (patch-gssftp_ftp_ftp_var.h) = 44a7483c6af469738ae4eab3d1450bac259d71ac
cvs diff -r1.1 -r1.2 pkgsrc/security/mit-krb5-appl/patches/patch-gssftp_ftp_ftp_var.h (expand / switch to unified diff)

--- pkgsrc/security/mit-krb5-appl/patches/patch-gssftp_ftp_ftp_var.h 2012/02/26 13:16:32 1.1
+++ pkgsrc/security/mit-krb5-appl/patches/patch-gssftp_ftp_ftp_var.h 2012/11/29 07:31:02 1.2
@@ -1,16 +1,38 @@ @@ -1,16 +1,38 @@
1$NetBSD: patch-gssftp_ftp_ftp_var.h,v 1.1 2012/02/26 13:16:32 adam Exp $ 1$NetBSD: patch-gssftp_ftp_ftp_var.h,v 1.2 2012/11/29 07:31:02 adam Exp $
2 2
3Don't redefine sig_t and sigtype. 3Don't redefine sig_t and sigtype.
4 4
5--- gssftp/ftp/ftp_var.h.orig 2012-02-26 13:04:30.000000000 +0000 5--- gssftp/ftp/ftp_var.h.orig 2012-02-26 13:04:30.000000000 +0000
6+++ gssftp/ftp/ftp_var.h 6+++ gssftp/ftp/ftp_var.h
7@@ -57,9 +57,7 @@ FILE* fdopen_socket(SOCKET s, char* mode 7@@ -53,15 +53,6 @@
8 typedef void (*sig_t)(int); 8 #define PERROR_SOCKET(str) perror(str)
9 typedef void sigtype; 
10 #else 
11-#define sig_t my_sig_t 
12 #define sigtype krb5_sigtype 
13-typedef sigtype (*sig_t)(); 
14 #endif 9 #endif
15  10
 11-#ifdef _WIN32
 12-typedef void (*sig_t)(int);
 13-typedef void sigtype;
 14-#else
 15-#define sig_t my_sig_t
 16-#define sigtype krb5_sigtype
 17-typedef sigtype (*sig_t)();
 18-#endif
 19-
16 /* 20 /*
 21 * FTP global variables.
 22 */
 23@@ -168,6 +159,15 @@
 24 extern struct macel macros[16];
 25 extern char macbuf[4096];
 26
 27+#ifdef _WIN32
 28+typedef void (*sig_t)(int);
 29+typedef void sigtype;
 30+#else
 31+#define sig_t my_sig_t
 32+#define sigtype krb5_sigtype
 33+typedef sigtype (*sig_t)();
 34+#endif
 35+
 36 #ifdef DEFINITIONS
 37 #undef extern
 38 #endif