[gentoo-commits] repo/gentoo:master commit in: app-arch/xar/files/

[gentoo-commits] repo/gentoo:master commit in: app-arch/xar/files/

[Fabian Groffen]

commit:     92ae9ac4cbb9cb0dbf8b54c14b1404b18dbe13f9
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue Jan  1 17:00:08 2019 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue Jan  1 17:00:26 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92ae9ac4

app-arch/xar: fix compatibility with openssl-1.0

create/destroy in 1.0 were renamed to new/free in 1.1, but defines for
backwards compatibility are in 1.1 so use the old names to ensure we can
still compile on 1.0.

Closes: https://bugs.gentoo.org/674268
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 app-arch/xar/files/xar-1.8-openssl-1.1.patch | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-arch/xar/files/xar-1.8-openssl-1.1.patch b/app-arch/xar/files/xar-1.8-openssl-1.1.patch
index bd0b1daab00..f811d99d07e 100644
--- a/app-arch/xar/files/xar-1.8-openssl-1.1.patch
+++ b/app-arch/xar/files/xar-1.8-openssl-1.1.patch
@@ -19,7 +19,7 @@ for it anymore.
  	OpenSSL_add_all_digests();
  	HASH_CTX(hash)->type = EVP_get_digestbyname(digest_name);
 -	EVP_DigestInit(&HASH_CTX(hash)->digest, HASH_CTX(hash)->type);
-+	HASH_CTX(hash)->digest = EVP_MD_CTX_new();
++	HASH_CTX(hash)->digest = EVP_MD_CTX_create();
 +	EVP_DigestInit(HASH_CTX(hash)->digest, HASH_CTX(hash)->type);
  #endif
  	
@@ -39,7 +39,7 @@ for it anymore.
  #else
 -	EVP_DigestFinal(&HASH_CTX(hash)->digest, buffer, &HASH_CTX(hash)->length);
 +	EVP_DigestFinal(HASH_CTX(hash)->digest, buffer, &HASH_CTX(hash)->length);
-+	EVP_MD_CTX_free(HASH_CTX(hash)->digest);
++	EVP_MD_CTX_destroy(HASH_CTX(hash)->digest);
  #endif
  	
  	*nbyte = HASH_CTX(hash)->length;

[gentoo-commits] repo/gentoo:master commit in: app-arch/xar/files/

[Fabian Groffen]

commit:     348988482c55e071b0019b3dfaf3297b489cc4e5
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Mon Nov  1 10:21:24 2021 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Mon Nov  1 10:21:38 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34898848

app-arch/xar-1.8.0.0.452: unbreak build on Darwin

Closes: https://bugs.gentoo.org/821178
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 app-arch/xar/files/xar-1.8.0.0.452-linux.patch | 35 +++++++++++++++++++++-----
 1 file changed, 29 insertions(+), 6 deletions(-)

diff --git a/app-arch/xar/files/xar-1.8.0.0.452-linux.patch b/app-arch/xar/files/xar-1.8.0.0.452-linux.patch
index 8cbe48acc44..a9e9575c400 100644
--- a/app-arch/xar/files/xar-1.8.0.0.452-linux.patch
+++ b/app-arch/xar/files/xar-1.8.0.0.452-linux.patch
@@ -1,30 +1,47 @@
 --- a/configure.ac
 +++ b/configure.ac
-@@ -199,7 +199,16 @@
+@@ -183,7 +183,7 @@
+ 
+ AC_TRY_COMPILE([#include <sys/types.h> 
+ #include <sys/acl.h>], [acl_t a], [AC_DEFINE([HAVE_SYS_ACL_H],[1], [define if you have sys/acl.h and it has a working acl_t type])])
+-AC_CHECK_HEADERS(ext2fs/ext2_fs.h sys/statfs.h sys/xattr.h sys/param.h sys/extattr.h libutil.h)
++AC_CHECK_HEADERS(ext2fs/ext2_fs.h sys/statfs.h sys/vfs.h sys/xattr.h sys/param.h sys/extattr.h libutil.h)
+ AC_CHECK_FUNCS(lgetxattr)
+ AC_CHECK_FUNCS(lsetxattr)
+ AC_CHECK_FUNCS(getxattr)
+@@ -199,7 +199,22 @@
  
  AC_CHECK_MEMBERS([struct statfs.f_fstypename],,,[#include <sys/types.h>
  #include <sys/param.h>
 -#include <sys/mount.h>])
 +#include <sys/mount.h>
-+#include <sys/vfs.h>])
++#ifdef HAVE_SYS_VFS_H
++#include <sys/vfs.h>
++#endif])
 +AC_CHECK_MEMBERS([struct statfs.f_iosize],,,[#include <sys/types.h>
 +#include <sys/param.h>
 +#include <sys/mount.h>
-+#include <sys/vfs.h>])
++#ifdef HAVE_SYS_VFS_H
++#include <sys/vfs.h>
++#endif])
 +AC_CHECK_MEMBERS([struct statfs.f_bsize],,,[#include <sys/types.h>
 +#include <sys/param.h>
 +#include <sys/mount.h>
-+#include <sys/vfs.h>])
++#ifdef HAVE_SYS_VFS_H
++#include <sys/vfs.h>
++#endif])
  AC_CHECK_MEMBERS([struct statvfs.f_fstypename],,,[#include <sys/statvfs.h>])
  AC_CHECK_MEMBERS([struct stat.st_flags])
  
 --- a/lib/util.c
 +++ b/lib/util.c
-@@ -40,6 +40,7 @@
+@@ -40,6 +40,9 @@
  #include <sys/types.h>
  #include <sys/mount.h>
  #include <sys/param.h>
-+#include <sys/vfs.h>
++#ifdef HAVE_SYS_VFS_H
++# include <sys/vfs.h>
++#endif
  #include <arpa/inet.h>
  #include <string.h>
  #include <unistd.h>
@@ -61,6 +78,12 @@
  		}
 --- a/include/config.h.in
 +++ b/include/config.h.in
+@@ -1,4 +1,5 @@
+ #undef HAVE_SYS_STATFS_H
++#undef HAVE_SYS_VFS_H
+ #undef HAVE_SYS_XATTR_H
+ #undef HAVE_SYS_EXTATTR_H
+ #undef HAVE_SYS_PARAM_H
 @@ -15,6 +15,8 @@
  #undef HAVE_STRUCT_STAT_ST_FLAGS
  #undef HAVE_STRUCT_STATVFS_F_FSTYPENAME

[gentoo-commits] repo/gentoo:master commit in: app-arch/xar/files/

[Fabian Groffen]

commit:     b39f0b306fcfca22bc62fe80a9a0fc35b3242733
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Thu Nov  4 20:13:00 2021 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Thu Nov  4 20:13:36 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b39f0b30

app-arch/xar-1.8.0.0.452: fix build on glibc-2.33-r7

Closes: https://bugs.gentoo.org/821703
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 app-arch/xar/files/xar-1.8.0.0.452-linux.patch | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/app-arch/xar/files/xar-1.8.0.0.452-linux.patch b/app-arch/xar/files/xar-1.8.0.0.452-linux.patch
index a9e9575c400..ccfc68369a4 100644
--- a/app-arch/xar/files/xar-1.8.0.0.452-linux.patch
+++ b/app-arch/xar/files/xar-1.8.0.0.452-linux.patch
@@ -35,6 +35,15 @@
  
 --- a/lib/util.c
 +++ b/lib/util.c
+@@ -35,6 +35,8 @@
+  * Christopher Ryan <ryanc@apple.com>
+ */
+ 
++#include "config.h"
++
+ #include <stdio.h>
+ #include <stdint.h>
+ #include <sys/types.h>
 @@ -40,6 +40,9 @@
  #include <sys/types.h>
  #include <sys/mount.h>