Hello community,

here is the log from the commit of package hfsutils for openSUSE:Factory 
checked in at 2020-04-05 20:50:42
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/hfsutils (Old)
 and      /work/SRC/openSUSE:Factory/.hfsutils.new.3248 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "hfsutils"

Sun Apr  5 20:50:42 2020 rev:21 rq:790470 version:3.2.6

Changes:
--------
--- /work/SRC/openSUSE:Factory/hfsutils/hfsutils.changes        2017-12-15 
14:01:08.196922795 +0100
+++ /work/SRC/openSUSE:Factory/.hfsutils.new.3248/hfsutils.changes      
2020-04-05 20:51:00.301036804 +0200
@@ -1,0 +2,8 @@
+Tue Mar 31 10:09:55 UTC 2020 - Josef Möllers <[email protected]>
+
+- Define hfs_error_path in hcopy.c, hfssh.c and hfswish.c,
+  declare it "extern" in copyin.c and copyout.c,
+  do not declare it in libhfs/hfs.h.
+  [bsc#1160268, bug1160268-no-common.patch]
+
+-------------------------------------------------------------------

New:
----
  bug1160268-no-common.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ hfsutils.spec ++++++
--- /var/tmp/diff_new_pack.uOj49F/_old  2020-04-05 20:51:01.697038139 +0200
+++ /var/tmp/diff_new_pack.uOj49F/_new  2020-04-05 20:51:01.697038139 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package hfsutils
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -12,7 +12,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
@@ -20,9 +20,9 @@
 Version:        3.2.6
 Release:        0
 Summary:        Tools Used for the Macintosh's Hierarchical File System
-License:        GPL-2.0+
+License:        GPL-2.0-or-later
 Group:          System/Filesystems
-Url:            http://www.mars.org/home/rob/proj/hfs/
+URL:            http://www.mars.org/home/rob/proj/hfs/
 Source0:        ftp://ftp.mars.org/pub/hfs/hfsutils-%{version}.tar.gz
 Patch0:         hfsutils-%{version}.dif
 Patch1:         hfsutils-%{version}-ia64.dif
@@ -30,6 +30,7 @@
 Patch3:         hfsutils-%{version}-conf.dif
 Patch4:         hfsutils-%{version}-errno.dif
 Patch5:         hfsutils-exclusive-open.patch
+Patch6:         bug1160268-no-common.patch
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  tcl-devel
@@ -62,6 +63,7 @@
 %patch3
 %patch4
 %patch5 -p1
+%patch6 -p1
 
 %build
 autoreconf --force --install

++++++ bug1160268-no-common.patch ++++++
Index: hfsutils-3.2.6/hcopy.c
===================================================================
--- hfsutils-3.2.6.orig/hcopy.c
+++ hfsutils-3.2.6/hcopy.c
@@ -42,6 +42,8 @@
 
 extern int optind;
 
+char *hfs_error_path;
+
 /*
  * NAME:       automode_unix()
  * DESCRIPTION:        automatically choose copyin transfer mode for UNIX path
Index: hfsutils-3.2.6/libhfs/hfs.h
===================================================================
--- hfsutils-3.2.6.orig/libhfs/hfs.h
+++ hfsutils-3.2.6/libhfs/hfs.h
@@ -115,7 +115,6 @@ typedef struct {
 # define HFS_FNDR_ISALIAS              (1 << 15)
 
 extern const char *hfs_error;
-char *hfs_error_path;
 extern const unsigned char hfs_charorder[];
 
 # define HFS_MODE_RDONLY       0
Index: hfsutils-3.2.6/copyin.c
===================================================================
--- hfsutils-3.2.6.orig/copyin.c
+++ hfsutils-3.2.6/copyin.c
@@ -48,6 +48,7 @@ int dup(int);
 
 const char *cpi_error = "no error";
 
+extern char *hfs_error_path;
 extern int errno;
 
 # define ERROR(code, str)      (cpi_error = (str), errno = (code))
Index: hfsutils-3.2.6/copyout.c
===================================================================
--- hfsutils-3.2.6.orig/copyout.c
+++ hfsutils-3.2.6/copyout.c
@@ -49,6 +49,7 @@ int dup(int);
 
 const char *cpo_error = "no error";
 
+extern char *hfs_error_path;
 extern int errno;
 
 # define ERROR(code, str)      (cpo_error = (str), errno = (code))
Index: hfsutils-3.2.6/hfssh.c
===================================================================
--- hfsutils-3.2.6.orig/hfssh.c
+++ hfsutils-3.2.6/hfssh.c
@@ -32,6 +32,8 @@
 # include "tclhfs.h"
 # include "suid.h"
 
+char *hfs_error_path;
+
 /*
  * NAME:       Tcl->AppInit()
  * DESCRIPTION:        initialize interpreter
Index: hfsutils-3.2.6/hfswish.c
===================================================================
--- hfsutils-3.2.6.orig/hfswish.c
+++ hfsutils-3.2.6/hfswish.c
@@ -35,6 +35,7 @@
 
 static
 char *argv0;
+char *hfs_error_path;
 
 # define DEFBITMAP(interp, name)  \
          Tk_DefineBitmap(interp, Tk_GetUid(#name),  \

Reply via email to