Fri Feb 16 13:18:26 2018 UTC ()
gnome-vfs: fix build with openssl-1.1.

struct SSL is opaque in openssl-1.1; and the SSL_free() man page
says that one should not free members of it manually (in both
the openssl-1.0 and openssl-1.1 man pages).

Regen two other patches (NFC for these).

Bump PKGREVISION.


(wiz)
diff -r1.115 -r1.116 pkgsrc/sysutils/gnome-vfs/Makefile
diff -r1.37 -r1.38 pkgsrc/sysutils/gnome-vfs/distinfo
diff -r1.11 -r1.12 pkgsrc/sysutils/gnome-vfs/patches/patch-ae
diff -r1.1 -r1.2 pkgsrc/sysutils/gnome-vfs/patches/patch-ar
diff -r0 -r1.1 pkgsrc/sysutils/gnome-vfs/patches/patch-libgnomevfs_gnome-vfs-ssl.c
cvs diff -r1.115 -r1.116 pkgsrc/sysutils/gnome-vfs/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/gnome-vfs/Makefile 2018/01/28 20:10:38 1.115
+++ pkgsrc/sysutils/gnome-vfs/Makefile 2018/02/16 13:18:26 1.116
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1# $NetBSD: Makefile,v 1.115 2018/01/28 20:10:38 wiz Exp $ 1# $NetBSD: Makefile,v 1.116 2018/02/16 13:18:26 wiz Exp $
2 2
3PKGREVISION= 33 3PKGREVISION= 34
4 4
5PKGCONFIG_OVERRIDE= gnome-vfs-2.0.pc.in 5PKGCONFIG_OVERRIDE= gnome-vfs-2.0.pc.in
6PKGCONFIG_OVERRIDE+= gnome-vfs-module-2.0.pc.in 6PKGCONFIG_OVERRIDE+= gnome-vfs-module-2.0.pc.in
7 7
8OWN_DIRS= ${PKG_SYSCONFDIR}/modules 8OWN_DIRS= ${PKG_SYSCONFDIR}/modules
9 9
10EGFILES+= modules/default-modules.conf 10EGFILES+= modules/default-modules.conf
11EGFILES+= modules/ssl-modules.conf 11EGFILES+= modules/ssl-modules.conf
12 12
13GCONF_SCHEMAS= desktop_default_applications.schemas 13GCONF_SCHEMAS= desktop_default_applications.schemas
14GCONF_SCHEMAS+= desktop_gnome_url_handlers.schemas 14GCONF_SCHEMAS+= desktop_gnome_url_handlers.schemas
15GCONF_SCHEMAS+= system_dns_sd.schemas 15GCONF_SCHEMAS+= system_dns_sd.schemas
16GCONF_SCHEMAS+= system_http_proxy.schemas 16GCONF_SCHEMAS+= system_http_proxy.schemas
cvs diff -r1.37 -r1.38 pkgsrc/sysutils/gnome-vfs/distinfo (expand / switch to unified diff)

--- pkgsrc/sysutils/gnome-vfs/distinfo 2015/11/04 01:32:16 1.37
+++ pkgsrc/sysutils/gnome-vfs/distinfo 2018/02/16 13:18:26 1.38
@@ -1,27 +1,28 @@ @@ -1,27 +1,28 @@
1$NetBSD: distinfo,v 1.37 2015/11/04 01:32:16 agc Exp $ 1$NetBSD: distinfo,v 1.38 2018/02/16 13:18:26 wiz Exp $
2 2
3SHA1 (gnome-vfs-2.24.4.tar.bz2) = 0dc634e7dd979fd218f378902c0ca1af80738961 3SHA1 (gnome-vfs-2.24.4.tar.bz2) = 0dc634e7dd979fd218f378902c0ca1af80738961
4RMD160 (gnome-vfs-2.24.4.tar.bz2) = 6a5952bea02dfc96782b6f1129fe765f5313a75b 4RMD160 (gnome-vfs-2.24.4.tar.bz2) = 6a5952bea02dfc96782b6f1129fe765f5313a75b
5SHA512 (gnome-vfs-2.24.4.tar.bz2) = db4e49f5356647667c4d40c7ce5c299c934cb41069b2086fb89c4e87b2202b5009616d65c1dafeb93e37033a5a68965342c2b18d87b8a3265c4347dec5128581 5SHA512 (gnome-vfs-2.24.4.tar.bz2) = db4e49f5356647667c4d40c7ce5c299c934cb41069b2086fb89c4e87b2202b5009616d65c1dafeb93e37033a5a68965342c2b18d87b8a3265c4347dec5128581
6Size (gnome-vfs-2.24.4.tar.bz2) = 1890370 bytes 6Size (gnome-vfs-2.24.4.tar.bz2) = 1890370 bytes
7SHA1 (patch-aa) = a5a3ac6be3e2a888eaaab108807d2aff651e62db 7SHA1 (patch-aa) = a5a3ac6be3e2a888eaaab108807d2aff651e62db
8SHA1 (patch-ab) = 6320180870f234a150dfe40f8f990deec7a2a0b5 8SHA1 (patch-ab) = 6320180870f234a150dfe40f8f990deec7a2a0b5
9SHA1 (patch-ae) = 42f8f07f8729ad1fb88bd9f0032d7450c6d2c8c5 9SHA1 (patch-ae) = 22db92bc83d869f75ca7e2d467f1929b006d2521
10SHA1 (patch-af) = 6724c4a43d0d9525f5361ba7380c91adbf656e56 10SHA1 (patch-af) = 6724c4a43d0d9525f5361ba7380c91adbf656e56
11SHA1 (patch-ai) = 6afefb35bfe3fc37e84048b95ccc272a01542ec2 11SHA1 (patch-ai) = 6afefb35bfe3fc37e84048b95ccc272a01542ec2
12SHA1 (patch-am) = 4e037da71db0d3aae236475a0f2ead12738f35f9 12SHA1 (patch-am) = 4e037da71db0d3aae236475a0f2ead12738f35f9
13SHA1 (patch-ao) = 0cc64574f6d430ca385f22d28690b9cea9181390 13SHA1 (patch-ao) = 0cc64574f6d430ca385f22d28690b9cea9181390
14SHA1 (patch-ap) = cf09ffdef9e1b03425d60e69302e8e589928d370 14SHA1 (patch-ap) = cf09ffdef9e1b03425d60e69302e8e589928d370
15SHA1 (patch-aq) = 1d5ed4d6c1b3a282e68bedf6892fa8a9678ea39b 15SHA1 (patch-aq) = 1d5ed4d6c1b3a282e68bedf6892fa8a9678ea39b
16SHA1 (patch-ar) = 33bac387ffe861141f9cd6564c24956d3e9e4cb4 16SHA1 (patch-ar) = 8979e4d3281c382ed70acff1706e134a7b654053
17SHA1 (patch-au) = e3c681dd445d0774981a50eb22ae14ff4db5902c 17SHA1 (patch-au) = e3c681dd445d0774981a50eb22ae14ff4db5902c
18SHA1 (patch-ax) = 6b9b11df5d530b7b3aa6a3997feb7c1c93e7b2db 18SHA1 (patch-ax) = 6b9b11df5d530b7b3aa6a3997feb7c1c93e7b2db
19SHA1 (patch-ba) = 5299eb32ff0c14eb98d8f7dd5e104cd931a02b51 19SHA1 (patch-ba) = 5299eb32ff0c14eb98d8f7dd5e104cd931a02b51
20SHA1 (patch-bb) = 2d9eb2c86b88856fe6e71614a189029e51ae4608 20SHA1 (patch-bb) = 2d9eb2c86b88856fe6e71614a189029e51ae4608
21SHA1 (patch-bc) = dbea92c8f896ab242d6532be364841f6234359b4 21SHA1 (patch-bc) = dbea92c8f896ab242d6532be364841f6234359b4
22SHA1 (patch-bd) = 28cee53d3cecb18fe3b0c66b73bcece231e6fc42 22SHA1 (patch-bd) = 28cee53d3cecb18fe3b0c66b73bcece231e6fc42
23SHA1 (patch-cb) = 370c75a72d8575051bb5f02d54fdd4a191ac00eb 23SHA1 (patch-cb) = 370c75a72d8575051bb5f02d54fdd4a191ac00eb
24SHA1 (patch-cc) = 010674b9e7674cc4b84a57ac680a5769c5cffd29 24SHA1 (patch-cc) = 010674b9e7674cc4b84a57ac680a5769c5cffd29
25SHA1 (patch-cd) = 64ce812ca541dc34705586b4b01446b29bab8613 25SHA1 (patch-cd) = 64ce812ca541dc34705586b4b01446b29bab8613
26SHA1 (patch-ce) = 718d7de318e85e58b7412345496263ca559e9a73 26SHA1 (patch-ce) = 718d7de318e85e58b7412345496263ca559e9a73
 27SHA1 (patch-libgnomevfs_gnome-vfs-ssl.c) = f5e1017cdbc32815ae448f59f0804788eadecef8
27SHA1 (patch-modules_inotify-kernel.c) = 049236b40569358a91c6a58881c13be63a16aff5 28SHA1 (patch-modules_inotify-kernel.c) = 049236b40569358a91c6a58881c13be63a16aff5
cvs diff -r1.11 -r1.12 pkgsrc/sysutils/gnome-vfs/patches/patch-ae (expand / switch to unified diff)

--- pkgsrc/sysutils/gnome-vfs/patches/patch-ae 2013/10/12 04:39:01 1.11
+++ pkgsrc/sysutils/gnome-vfs/patches/patch-ae 2018/02/16 13:18:26 1.12
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: patch-ae,v 1.11 2013/10/12 04:39:01 richard Exp $ 1$NetBSD: patch-ae,v 1.12 2018/02/16 13:18:26 wiz Exp $
2 2
3builtin krb5-config in platforms such as solaris do not support 3builtin krb5-config in platforms such as solaris do not support
4the gssapi option, and need an explicit -lgss 4the gssapi option, and need an explicit -lgss
5 5
6--- configure.orig 2010-09-28 09:35:20.000000000 +0000 6--- configure.orig 2010-09-28 09:35:20.000000000 +0000
7+++ configure 7+++ configure
8@@ -14875,7 +14875,7 @@ _ACEOF 8@@ -14875,7 +14875,7 @@ _ACEOF
9  9
10 fi 10 fi
11  11
12-for ac_func in getdtablesize open64 lseek64 statfs statvfs seteuid setegid setresuid setresgid readdir_r mbrtowc inet_pton getdelim sysctlbyname poll posix_fadvise fchmod atoll mmap 12-for ac_func in getdtablesize open64 lseek64 statfs statvfs seteuid setegid setresuid setresgid readdir_r mbrtowc inet_pton getdelim sysctlbyname poll posix_fadvise fchmod atoll mmap
13+for ac_func in getdtablesize login_tty open64 lseek64 statfs statvfs seteuid setegid setresuid setresgid readdir_r mbrtowc inet_pton getdelim sysctlbyname poll posix_fadvise fchmod atoll mmap 13+for ac_func in getdtablesize login_tty open64 lseek64 statfs statvfs seteuid setegid setresuid setresgid readdir_r mbrtowc inet_pton getdelim sysctlbyname poll posix_fadvise fchmod atoll mmap
14 do : 14 do :
@@ -17,28 +17,28 @@ the gssapi option, and need an explicit  @@ -17,28 +17,28 @@ the gssapi option, and need an explicit
17@@ -15143,9 +15143,11 @@ $as_echo_n "checking number of arguments 17@@ -15143,9 +15143,11 @@ $as_echo_n "checking number of arguments
18 int 18 int
19 main () 19 main ()
20 { 20 {
21+#ifndef HAVE_STATVFS 21+#ifndef HAVE_STATVFS
22 struct statfs st; 22 struct statfs st;
23 statfs(NULL, &st); 23 statfs(NULL, &st);
24 ; 24 ;
25+#endif 25+#endif
26 return 0; 26 return 0;
27 } 27 }
28 _ACEOF 28 _ACEOF
29@@ -15717,9 +15719,14 @@ fi 29@@ -15717,9 +15719,14 @@ fi
30 30
31 31
32 if test "x$KRB5_CONFIG" != "xnone"; then 32 if test "x$KRB5_CONFIG" != "xnone"; then
33- GSSAPI_LIBS="`${KRB5_CONFIG} --libs gssapi`" 33- GSSAPI_LIBS="`${KRB5_CONFIG} --libs gssapi`"
34- GSSAPI_CFLAGS="`${KRB5_CONFIG} --cflags gssapi`" 34- GSSAPI_CFLAGS="`${KRB5_CONFIG} --cflags gssapi`"
35- 35-
36+ # make sure krb5-config supports gssapi option 36+ # make sure krb5-config supports gssapi option
37+ if $KRB5_CONFIG --libs gssapi 2>&1 | grep "Unknown option" > /dev/null ; then 37+ if $KRB5_CONFIG --libs gssapi 2>&1 | grep "Unknown option" > /dev/null ; then
38+ GSSAPI_LIBS="`${KRB5_CONFIG} --libs` -lgss" 38+ GSSAPI_LIBS="`${KRB5_CONFIG} --libs` -lgss"
39+ GSSAPI_CFLAGS="`${KRB5_CONFIG} --cflags`" 39+ GSSAPI_CFLAGS="`${KRB5_CONFIG} --cflags`"
40+ else 40+ else
41+ GSSAPI_LIBS="`${KRB5_CONFIG} --libs gssapi`" 41+ GSSAPI_LIBS="`${KRB5_CONFIG} --libs gssapi`"
42+ GSSAPI_CFLAGS="`${KRB5_CONFIG} --cflags gssapi`" 42+ GSSAPI_CFLAGS="`${KRB5_CONFIG} --cflags gssapi`"
43+ fi 43+ fi
44 saved_CPPFLAGS="$CPPFLAGS" 44 saved_CPPFLAGS="$CPPFLAGS"
cvs diff -r1.1 -r1.2 pkgsrc/sysutils/gnome-vfs/patches/patch-ar (expand / switch to unified diff)

--- pkgsrc/sysutils/gnome-vfs/patches/patch-ar 2007/09/19 22:22:40 1.1
+++ pkgsrc/sysutils/gnome-vfs/patches/patch-ar 2018/02/16 13:18:26 1.2
@@ -1,69 +1,69 @@ @@ -1,69 +1,69 @@
1$NetBSD: patch-ar,v 1.1 2007/09/19 22:22:40 wiz Exp $ 1$NetBSD: patch-ar,v 1.2 2018/02/16 13:18:26 wiz Exp $
2 2
3--- libgnomevfs/gnome-vfs-pty.c.orig Tue Nov 22 15:10:17 2005 3--- libgnomevfs/gnome-vfs-pty.c.orig 2010-02-09 12:16:14.000000000 +0000
4+++ libgnomevfs/gnome-vfs-pty.c Wed Apr 26 23:15:08 2006 4+++ libgnomevfs/gnome-vfs-pty.c
5@@ -306,7 +306,7 @@ _gnome_vfs_pty_run_on_pty(int fd, gboole 5@@ -330,7 +330,7 @@ _gnome_vfs_pty_run_on_pty(int fd, gboole
6 chdir(directory); 6 chdir(directory);
7 } 7 }
8  8
9-#ifdef HAVE_UTMP_H 9-#ifdef HAVE_UTMP_H
10+#ifdef HAVE_LOGIN_TTY 10+#ifdef HAVE_LOGIN_TTY
11 /* This sets stdin, stdout, stderr to the socket */  11 /* This sets stdin, stdout, stderr to the socket */
12 if (login && login_tty (fd) == -1) { 12 if (login && login_tty (fd) == -1) {
13 g_printerr ("mount child process login_tty failed: %s\n", strerror (errno)); 13 g_printerr ("mount child process login_tty failed: %s\n", strerror (errno));
14@@ -629,6 +629,7 @@ _gnome_vfs_pty_set_size(int master, int  14@@ -654,6 +654,7 @@ _gnome_vfs_pty_set_size(int master, int
15 static char * 15 static char *
16 _gnome_vfs_pty_ptsname(int master) 16 _gnome_vfs_pty_ptsname(int master)
17 { 17 {
18+#ifndef __APPLE__ 18+#ifndef __APPLE__
19 #if defined(HAVE_PTSNAME_R) 19 #if defined(HAVE_PTSNAME_R)
20 gsize len = 1024; 20 gsize len = 1024;
21 char *buf = NULL; 21 char *buf = NULL;
22@@ -674,6 +675,7 @@ _gnome_vfs_pty_ptsname(int master) 22@@ -699,6 +700,7 @@ _gnome_vfs_pty_ptsname(int master)
23 return g_strdup_printf("/dev/pts/%d", pty); 23 return g_strdup_printf("/dev/pts/%d", pty);
24 } 24 }
25 #endif 25 #endif
26+#endif /* __APPLE__ */ 26+#endif /* __APPLE__ */
27 return NULL; 27 return NULL;
28 } 28 }
29  29
30@@ -681,10 +683,10 @@ static int 30@@ -706,10 +708,10 @@ static int
31 _gnome_vfs_pty_getpt(void) 31 _gnome_vfs_pty_getpt(void)
32 { 32 {
33 int fd, flags; 33 int fd, flags;
34-#ifdef HAVE_GETPT 34-#ifdef HAVE_GETPT
35+#if defined(HAVE_GETPT) && !defined(__APPLE__) 35+#if defined(HAVE_GETPT) && !defined(__APPLE__)
36 /* Call the system's function for allocating a pty. */ 36 /* Call the system's function for allocating a pty. */
37 fd = getpt(); 37 fd = getpt();
38-#elif defined(HAVE_POSIX_OPENPT) 38-#elif defined(HAVE_POSIX_OPENPT)
39+#elif defined(HAVE_POSIX_OPENPT) && !defined(__APPLE__) 39+#elif defined(HAVE_POSIX_OPENPT) && !defined(__APPLE__)
40 fd = posix_openpt(O_RDWR | O_NOCTTY); 40 fd = posix_openpt(O_RDWR | O_NOCTTY);
41 #else 41 #else
42 /* Try to allocate a pty by accessing the pty master multiplex. */ 42 /* Try to allocate a pty by accessing the pty master multiplex. */
43@@ -703,7 +705,7 @@ _gnome_vfs_pty_getpt(void) 43@@ -728,7 +730,7 @@ _gnome_vfs_pty_getpt(void)
44 static int 44 static int
45 _gnome_vfs_pty_grantpt(int master) 45 _gnome_vfs_pty_grantpt(int master)
46 { 46 {
47-#ifdef HAVE_GRANTPT 47-#ifdef HAVE_GRANTPT
48+#if defined(HAVE_GRANTPT) && !defined(__APPLE__) 48+#if defined(HAVE_GRANTPT) && !defined(__APPLE__)
49 return grantpt(master); 49 return grantpt(master);
50 #else 50 #else
51 return 0; 51 return 0;
52@@ -713,6 +715,9 @@ _gnome_vfs_pty_grantpt(int master) 52@@ -738,6 +740,9 @@ _gnome_vfs_pty_grantpt(int master)
53 static int 53 static int
54 _gnome_vfs_pty_unlockpt(int fd) 54 _gnome_vfs_pty_unlockpt(int fd)
55 { 55 {
56+#ifdef __APPLE__ 56+#ifdef __APPLE__
57+ return -1; 57+ return -1;
58+#else 58+#else
59 #ifdef HAVE_UNLOCKPT 59 #ifdef HAVE_UNLOCKPT
60 return unlockpt(fd); 60 return unlockpt(fd);
61 #elif defined(TIOCSPTLCK) 61 #elif defined(TIOCSPTLCK)
62@@ -720,6 +725,7 @@ _gnome_vfs_pty_unlockpt(int fd) 62@@ -746,6 +751,7 @@ _gnome_vfs_pty_unlockpt(int fd)
63 return ioctl(fd, TIOCSPTLCK, &zero); 
64 #else 63 #else
65 return -1; 64 return -1;
66+#endif 
67 #endif 65 #endif
 66+#endif
68 } 67 }
69  68
 69 static int
File Added: pkgsrc/sysutils/gnome-vfs/patches/patch-libgnomevfs_gnome-vfs-ssl.c
$NetBSD: patch-libgnomevfs_gnome-vfs-ssl.c,v 1.1 2018/02/16 13:18:26 wiz Exp $

struct SSL is opaque in openssl-1.1; and the SSL_free() man page
says that one should not free members of it manually (in both
the openssl-1.0 and openssl-1.1 man pages).

--- libgnomevfs/gnome-vfs-ssl.c.orig	2010-02-09 12:16:14.000000000 +0000
+++ libgnomevfs/gnome-vfs-ssl.c
@@ -400,9 +400,6 @@ gnome_vfs_ssl_create_from_fd (GnomeVFSSS
 			}
 		}
 
-                if (ssl->private->ssl->ctx)
-                        SSL_CTX_free (ssl->private->ssl->ctx);
-
                 SSL_free (ssl->private->ssl);
 		g_free (ssl->private);
 		g_free (ssl);
@@ -705,7 +702,6 @@ gnome_vfs_ssl_destroy (GnomeVFSSSL *ssl,
 		}
 	}
 	
-	SSL_CTX_free (ssl->private->ssl->ctx);
 	SSL_free (ssl->private->ssl);
 	close (ssl->private->sockfd);
 	if (ssl->private->timeout)