CVS commit: pkgsrc/sysutils/gnome-vfs

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Fri Feb 16 13:18:26 UTC 2018

Modified Files:
        pkgsrc/sysutils/gnome-vfs: Makefile distinfo
        pkgsrc/sysutils/gnome-vfs/patches: patch-ae patch-ar
Added Files:
        pkgsrc/sysutils/gnome-vfs/patches: patch-libgnomevfs_gnome-vfs-ssl.c

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.115 -r1.116 pkgsrc/sysutils/gnome-vfs/Makefile
cvs rdiff -u -r1.37 -r1.38 pkgsrc/sysutils/gnome-vfs/distinfo
cvs rdiff -u -r1.11 -r1.12 pkgsrc/sysutils/gnome-vfs/patches/patch-ae
cvs rdiff -u -r1.1 -r1.2 pkgsrc/sysutils/gnome-vfs/patches/patch-ar
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/sysutils/gnome-vfs/patches/patch-libgnomevfs_gnome-vfs-ssl.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/sysutils/gnome-vfs/Makefile
diff -u pkgsrc/sysutils/gnome-vfs/Makefile:1.115 pkgsrc/sysutils/gnome-vfs/Makefile:1.116
--- pkgsrc/sysutils/gnome-vfs/Makefile:1.115    Sun Jan 28 20:10:38 2018
+++ pkgsrc/sysutils/gnome-vfs/Makefile  Fri Feb 16 13:18:26 2018
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.115 2018/01/28 20:10:38 wiz Exp $
+# $NetBSD: Makefile,v 1.116 2018/02/16 13:18:26 wiz Exp $
 
-PKGREVISION=           33
+PKGREVISION=           34
 
 PKGCONFIG_OVERRIDE=    gnome-vfs-2.0.pc.in
 PKGCONFIG_OVERRIDE+=   gnome-vfs-module-2.0.pc.in

Index: pkgsrc/sysutils/gnome-vfs/distinfo
diff -u pkgsrc/sysutils/gnome-vfs/distinfo:1.37 pkgsrc/sysutils/gnome-vfs/distinfo:1.38
--- pkgsrc/sysutils/gnome-vfs/distinfo:1.37     Wed Nov  4 01:32:16 2015
+++ pkgsrc/sysutils/gnome-vfs/distinfo  Fri Feb 16 13:18:26 2018
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.37 2015/11/04 01:32:16 agc Exp $
+$NetBSD: distinfo,v 1.38 2018/02/16 13:18:26 wiz Exp $
 
 SHA1 (gnome-vfs-2.24.4.tar.bz2) = 0dc634e7dd979fd218f378902c0ca1af80738961
 RMD160 (gnome-vfs-2.24.4.tar.bz2) = 6a5952bea02dfc96782b6f1129fe765f5313a75b
@@ -6,14 +6,14 @@ SHA512 (gnome-vfs-2.24.4.tar.bz2) = db4e
 Size (gnome-vfs-2.24.4.tar.bz2) = 1890370 bytes
 SHA1 (patch-aa) = a5a3ac6be3e2a888eaaab108807d2aff651e62db
 SHA1 (patch-ab) = 6320180870f234a150dfe40f8f990deec7a2a0b5
-SHA1 (patch-ae) = 42f8f07f8729ad1fb88bd9f0032d7450c6d2c8c5
+SHA1 (patch-ae) = 22db92bc83d869f75ca7e2d467f1929b006d2521
 SHA1 (patch-af) = 6724c4a43d0d9525f5361ba7380c91adbf656e56
 SHA1 (patch-ai) = 6afefb35bfe3fc37e84048b95ccc272a01542ec2
 SHA1 (patch-am) = 4e037da71db0d3aae236475a0f2ead12738f35f9
 SHA1 (patch-ao) = 0cc64574f6d430ca385f22d28690b9cea9181390
 SHA1 (patch-ap) = cf09ffdef9e1b03425d60e69302e8e589928d370
 SHA1 (patch-aq) = 1d5ed4d6c1b3a282e68bedf6892fa8a9678ea39b
-SHA1 (patch-ar) = 33bac387ffe861141f9cd6564c24956d3e9e4cb4
+SHA1 (patch-ar) = 8979e4d3281c382ed70acff1706e134a7b654053
 SHA1 (patch-au) = e3c681dd445d0774981a50eb22ae14ff4db5902c
 SHA1 (patch-ax) = 6b9b11df5d530b7b3aa6a3997feb7c1c93e7b2db
 SHA1 (patch-ba) = 5299eb32ff0c14eb98d8f7dd5e104cd931a02b51
@@ -24,4 +24,5 @@ SHA1 (patch-cb) = 370c75a72d8575051bb5f0
 SHA1 (patch-cc) = 010674b9e7674cc4b84a57ac680a5769c5cffd29
 SHA1 (patch-cd) = 64ce812ca541dc34705586b4b01446b29bab8613
 SHA1 (patch-ce) = 718d7de318e85e58b7412345496263ca559e9a73
+SHA1 (patch-libgnomevfs_gnome-vfs-ssl.c) = f5e1017cdbc32815ae448f59f0804788eadecef8
 SHA1 (patch-modules_inotify-kernel.c) = 049236b40569358a91c6a58881c13be63a16aff5

Index: pkgsrc/sysutils/gnome-vfs/patches/patch-ae
diff -u pkgsrc/sysutils/gnome-vfs/patches/patch-ae:1.11 pkgsrc/sysutils/gnome-vfs/patches/patch-ae:1.12
--- pkgsrc/sysutils/gnome-vfs/patches/patch-ae:1.11     Sat Oct 12 04:39:01 2013
+++ pkgsrc/sysutils/gnome-vfs/patches/patch-ae  Fri Feb 16 13:18:26 2018
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.11 2013/10/12 04:39:01 richard Exp $
+$NetBSD: patch-ae,v 1.12 2018/02/16 13:18:26 wiz Exp $
 
 builtin krb5-config in platforms such as solaris do not support
 the gssapi option, and need an explicit -lgss
@@ -27,8 +27,8 @@ the gssapi option, and need an explicit 
  }
  _ACEOF
 @@ -15717,9 +15719,14 @@ fi
-
-
+ 
+ 
  if test "x$KRB5_CONFIG" != "xnone"; then
 -   GSSAPI_LIBS="`${KRB5_CONFIG} --libs gssapi`"
 -   GSSAPI_CFLAGS="`${KRB5_CONFIG} --cflags gssapi`"

Index: pkgsrc/sysutils/gnome-vfs/patches/patch-ar
diff -u pkgsrc/sysutils/gnome-vfs/patches/patch-ar:1.1 pkgsrc/sysutils/gnome-vfs/patches/patch-ar:1.2
--- pkgsrc/sysutils/gnome-vfs/patches/patch-ar:1.1      Wed Sep 19 22:22:40 2007
+++ pkgsrc/sysutils/gnome-vfs/patches/patch-ar  Fri Feb 16 13:18:26 2018
@@ -1,8 +1,8 @@
-$NetBSD: patch-ar,v 1.1 2007/09/19 22:22:40 wiz Exp $
+$NetBSD: patch-ar,v 1.2 2018/02/16 13:18:26 wiz Exp $
 
---- libgnomevfs/gnome-vfs-pty.c.orig   Tue Nov 22 15:10:17 2005
-+++ libgnomevfs/gnome-vfs-pty.c        Wed Apr 26 23:15:08 2006
-@@ -306,7 +306,7 @@ _gnome_vfs_pty_run_on_pty(int fd, gboole
+--- libgnomevfs/gnome-vfs-pty.c.orig   2010-02-09 12:16:14.000000000 +0000
++++ libgnomevfs/gnome-vfs-pty.c
+@@ -330,7 +330,7 @@ _gnome_vfs_pty_run_on_pty(int fd, gboole
                chdir(directory);
        }
  
@@ -11,7 +11,7 @@ $NetBSD: patch-ar,v 1.1 2007/09/19 22:22
        /* This sets stdin, stdout, stderr to the socket */     
        if (login && login_tty (fd) == -1) {
                g_printerr ("mount child process login_tty failed: %s\n", strerror (errno));
-@@ -629,6 +629,7 @@ _gnome_vfs_pty_set_size(int master, int 
+@@ -654,6 +654,7 @@ _gnome_vfs_pty_set_size(int master, int 
  static char *
  _gnome_vfs_pty_ptsname(int master)
  {
@@ -19,7 +19,7 @@ $NetBSD: patch-ar,v 1.1 2007/09/19 22:22
  #if defined(HAVE_PTSNAME_R)
        gsize len = 1024;
        char *buf = NULL;
-@@ -674,6 +675,7 @@ _gnome_vfs_pty_ptsname(int master)
+@@ -699,6 +700,7 @@ _gnome_vfs_pty_ptsname(int master)
                return g_strdup_printf("/dev/pts/%d", pty);
        }
  #endif
@@ -27,7 +27,7 @@ $NetBSD: patch-ar,v 1.1 2007/09/19 22:22
        return NULL;
  }
  
-@@ -681,10 +683,10 @@ static int
+@@ -706,10 +708,10 @@ static int
  _gnome_vfs_pty_getpt(void)
  {
        int fd, flags;
@@ -40,7 +40,7 @@ $NetBSD: patch-ar,v 1.1 2007/09/19 22:22
        fd = posix_openpt(O_RDWR | O_NOCTTY);
  #else
        /* Try to allocate a pty by accessing the pty master multiplex. */
-@@ -703,7 +705,7 @@ _gnome_vfs_pty_getpt(void)
+@@ -728,7 +730,7 @@ _gnome_vfs_pty_getpt(void)
  static int
  _gnome_vfs_pty_grantpt(int master)
  {
@@ -49,7 +49,7 @@ $NetBSD: patch-ar,v 1.1 2007/09/19 22:22
        return grantpt(master);
  #else
        return 0;
-@@ -713,6 +715,9 @@ _gnome_vfs_pty_grantpt(int master)
+@@ -738,6 +740,9 @@ _gnome_vfs_pty_grantpt(int master)
  static int
  _gnome_vfs_pty_unlockpt(int fd)
  {
@@ -59,11 +59,11 @@ $NetBSD: patch-ar,v 1.1 2007/09/19 22:22
  #ifdef HAVE_UNLOCKPT
        return unlockpt(fd);
  #elif defined(TIOCSPTLCK)
-@@ -720,6 +725,7 @@ _gnome_vfs_pty_unlockpt(int fd)
-       return ioctl(fd, TIOCSPTLCK, &zero);
+@@ -746,6 +751,7 @@ _gnome_vfs_pty_unlockpt(int fd)
  #else
        return -1;
-+#endif
  #endif
++#endif
  }
  
+ static int

Added files:

Index: pkgsrc/sysutils/gnome-vfs/patches/patch-libgnomevfs_gnome-vfs-ssl.c
diff -u /dev/null pkgsrc/sysutils/gnome-vfs/patches/patch-libgnomevfs_gnome-vfs-ssl.c:1.1
--- /dev/null   Fri Feb 16 13:18:26 2018
+++ pkgsrc/sysutils/gnome-vfs/patches/patch-libgnomevfs_gnome-vfs-ssl.c Fri Feb 16 13:18:26 2018
@@ -0,0 +1,26 @@
+$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)