From 77f8b10bf34880c8f66d3da43bdd4736f1097ad7 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Wed, 16 Aug 2023 20:14:03 -0400 Subject: [PATCH] xar: rebuild for openssl3 --- srcpkgs/xar/patches/autoconf.patch | 95 +++++++++++++++++++ .../xar/patches/configure_disable_rpath.patch | 12 +-- srcpkgs/xar/patches/ext2.patch | 4 +- srcpkgs/xar/patches/openssl1.1.patch | 60 ++---------- srcpkgs/xar/template | 8 +- 5 files changed, 120 insertions(+), 59 deletions(-) create mode 100644 srcpkgs/xar/patches/autoconf.patch diff --git a/srcpkgs/xar/patches/autoconf.patch b/srcpkgs/xar/patches/autoconf.patch new file mode 100644 index 00000000000..4cc64dd8a05 --- /dev/null +++ b/srcpkgs/xar/patches/autoconf.patch @@ -0,0 +1,95 @@ +From a14be07c0aae3bf6f732d1ca5f625ba375702121 Mon Sep 17 00:00:00 2001 +From: Andrew Childs +Date: Sun, 15 Nov 2020 19:12:33 +0900 +Subject: [PATCH 1/2] Add useless descriptions to AC_DEFINE + +Removes autoheader warnings. +--- + configure.ac | 42 +++++++++++++++++++++--------------------- + 1 file changed, 21 insertions(+), 21 deletions(-) + +diff --git a/xar/configure.ac b/xar/configure.ac +index 812b5ff..358ab89 100644 +--- a/xar/configure.ac ++++ b/xar/configure.ac +@@ -210,48 +210,48 @@ AC_CHECK_MEMBERS([struct stat.st_flags]) + + AC_CHECK_SIZEOF(uid_t) + if test $ac_cv_sizeof_uid_t = "4"; then +-AC_DEFINE(UID_STRING, RId32) +-AC_DEFINE(UID_CAST, (uint32_t)) ++AC_DEFINE([UID_STRING], RId32, [UID_STRING]) ++AC_DEFINE([UID_CAST], (uint32_t), [UID_CAST]) + elif test $ac_cv_sizeof_uid_t = "8"; then +-AC_DEFINE(UID_STRING, PRId64) +-AC_DEFINE(UID_CAST, (uint64_t)) ++AC_DEFINE([UID_STRING], PRId64, [UID_STRING]) ++AC_DEFINE([UID_CAST], (uint64_t), [UID_CAST]) + else + AC_ERROR(can not detect the size of your system's uid_t type) + fi + + AC_CHECK_SIZEOF(gid_t) + if test $ac_cv_sizeof_gid_t = "4"; then +-AC_DEFINE(GID_STRING, PRId32) +-AC_DEFINE(GID_CAST, (uint32_t)) ++AC_DEFINE([GID_STRING], PRId32, [GID_STRING]) ++AC_DEFINE([GID_CAST], (uint32_t), [GID_CAST]) + elif test $ac_cv_sizeof_gid_t = "8"; then +-AC_DEFINE(GID_STRING, PRId64) +-AC_DEFINE(GID_CAST, (uint64_t)) ++AC_DEFINE([GID_STRING], PRId64, [GID_STRING]) ++AC_DEFINE([GID_CAST], (uint64_t), [GID_CAST]) + else + AC_ERROR(can not detect the size of your system's gid_t type) + fi + + AC_CHECK_SIZEOF(ino_t) + if test $ac_cv_sizeof_ino_t = "4"; then +-AC_DEFINE(INO_STRING, PRId32) +-AC_DEFINE(INO_HEXSTRING, PRIx32) +-AC_DEFINE(INO_CAST, (uint32_t)) ++AC_DEFINE([INO_STRING], PRId32, [INO_STRING]) ++AC_DEFINE([INO_HEXSTRING], PRIx32, [INO_HEXSTRING]) ++AC_DEFINE([INO_CAST], (uint32_t), [INO_CAST]) + elif test $ac_cv_sizeof_ino_t = "8"; then +-AC_DEFINE(INO_STRING, PRId64) +-AC_DEFINE(INO_HEXSTRING, PRIx64) +-AC_DEFINE(INO_CAST, (uint64_t)) ++AC_DEFINE([INO_STRING], PRId64, [INO_STRING]) ++AC_DEFINE([INO_HEXSTRING], PRIx64, [INO_HEXSTRING]) ++AC_DEFINE([INO_CAST], (uint64_t), [INO_CAST]) + else + AC_ERROR(can not detect the size of your system's ino_t type) + fi + + AC_CHECK_SIZEOF(dev_t) + if test $ac_cv_sizeof_dev_t = "4"; then +-AC_DEFINE(DEV_STRING, PRId32) +-AC_DEFINE(DEV_HEXSTRING, PRIx32) +-AC_DEFINE(DEV_CAST, (uint32_t)) ++AC_DEFINE([DEV_STRING], PRId32, [DEV_STRING]) ++AC_DEFINE([DEV_HEXSTRING], PRIx32, [DEV_HEXSTRING]) ++AC_DEFINE([DEV_CAST], (uint32_t), [DEV_CAST]) + elif test $ac_cv_sizeof_dev_t = "8"; then +-AC_DEFINE(DEV_STRING, PRId64) +-AC_DEFINE(DEV_HEXSTRING, PRIx64) +-AC_DEFINE(DEV_CAST, (uint64_t)) ++AC_DEFINE([DEV_STRING], PRId64, [DEV_STRING]) ++AC_DEFINE([DEV_HEXSTRING], PRIx64, [DEV_HEXSTRING]) ++AC_DEFINE([DEV_CAST], (uint64_t), [DEV_CAST]) + else + AC_ERROR(can not detect the size of your system's dev_t type) + fi +@@ -261,7 +261,7 @@ AC_CHECK_LIB(acl, acl_get_file) + dnl Check for paths + AC_PREFIX_DEFAULT(/usr/local) + +-AC_CHECK_FUNC([asprintf], AC_DEFINE([HAVE_ASPRINTF])) ++AC_CHECK_FUNC([asprintf], AC_DEFINE([HAVE_ASPRINTF], [], [HAVE_ASPRINTF])) + + dnl + dnl Configure libxml2. +-- +2.28.0 + diff --git a/srcpkgs/xar/patches/configure_disable_rpath.patch b/srcpkgs/xar/patches/configure_disable_rpath.patch index ea04251838d..3dde90917c8 100644 --- a/srcpkgs/xar/patches/configure_disable_rpath.patch +++ b/srcpkgs/xar/patches/configure_disable_rpath.patch @@ -1,11 +1,11 @@ ---- a/configure 2012-08-23 16:25:41.891044934 +0200 -+++ b/configure 2012-08-23 16:25:47.690906017 +0200 -@@ -3277,7 +3277,7 @@ case "${host}" in - CFLAGS="$CFLAGS" +--- a/xar/configure.ac ++++ b/xar/configure.ac +@@ -136,7 +136,7 @@ abi="elf" - CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE" + dnl Linux needs this for things like asprintf() and poll() flags. + CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE" - RPATH="-Wl,-rpath," + RPATH="" ;; *-*-netbsd*) - echo "$as_me:$LINENO: checking ABI" >&5 + AC_MSG_CHECKING([ABI]) diff --git a/srcpkgs/xar/patches/ext2.patch b/srcpkgs/xar/patches/ext2.patch index ed6c4010959..dc64ae859e5 100644 --- a/srcpkgs/xar/patches/ext2.patch +++ b/srcpkgs/xar/patches/ext2.patch @@ -1,5 +1,5 @@ ---- a/lib/ext2.c -+++ b/lib/ext2.c +--- a/xar/lib/ext2.c ++++ b/xar/lib/ext2.c @@ -139,8 +139,10 @@ if(! (flags & ~EXT2_NOCOMPR_FL) ) x_addprop(f, "NoCompBlock"); diff --git a/srcpkgs/xar/patches/openssl1.1.patch b/srcpkgs/xar/patches/openssl1.1.patch index 49a32fb7f89..949acc9a8b9 100644 --- a/srcpkgs/xar/patches/openssl1.1.patch +++ b/srcpkgs/xar/patches/openssl1.1.patch @@ -1,54 +1,14 @@ Reason: The OpenSSL_add_all_ciphers api doesn't was removed in OpenSSL 1.1 so we just replace the check with something that exists in OpenSSL and LibreSSL ---- ---- a/configure 2012-09-17 13:30:07.000000000 +0200 -+++ b/configure 2012-09-17 13:30:07.000000000 +0200 -@@ -4878,9 +4878,9 @@ - - done - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for OpenSSL_add_all_ciphers in -lcrypto" >&5 --$as_echo_n "checking for OpenSSL_add_all_ciphers in -lcrypto... " >&6; } --if ${ac_cv_lib_crypto_OpenSSL_add_all_ciphers+:} false; then : -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for OPENSSL_init_crypto in -lcrypto" >&5 -+$as_echo_n "checking for OPENSSL_init_crypto in -lcrypto... " >&6; } -+if ${ac_cv_lib_crypto_OPENSSL_init_crypto+:} false; then : - $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS -@@ -4894,27 +4894,27 @@ - #ifdef __cplusplus - extern "C" - #endif --char OpenSSL_add_all_ciphers (); -+char OPENSSL_init_crypto (); - int - main () - { --return OpenSSL_add_all_ciphers (); -+return OPENSSL_init_crypto (); - ; - return 0; - } - _ACEOF - if ac_fn_c_try_link "$LINENO"; then : -- ac_cv_lib_crypto_OpenSSL_add_all_ciphers=yes -+ ac_cv_lib_crypto_OPENSSL_init_crypto=yes - else -- ac_cv_lib_crypto_OpenSSL_add_all_ciphers=no -+ ac_cv_lib_crypto_OPENSSL_init_crypto=no +--- a/xar/configure.ac ++++ b/xar/configure.ac +@@ -329,7 +329,7 @@ + dnl + have_libcrypto="1" + AC_CHECK_HEADERS([openssl/evp.h], , [have_libcrypto="0"]) +-AC_CHECK_LIB([crypto], [OpenSSL_add_all_ciphers], , [have_libcrypto="0"]) ++AC_CHECK_LIB([crypto], [OPENSSL_init_crypto], , [have_libcrypto="0"]) + if test "x${have_libcrypto}" = "x0" ; then + AC_MSG_ERROR([Cannot build without libcrypto (OpenSSL)]) fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypto_OpenSSL_add_all_ciphers" >&5 --$as_echo "$ac_cv_lib_crypto_OpenSSL_add_all_ciphers" >&6; } --if test "x$ac_cv_lib_crypto_OpenSSL_add_all_ciphers" = xyes; then : -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypto_OPENSSL_init_crypto" >&5 -+$as_echo "$ac_cv_lib_crypto_OPENSSL_init_crypto" >&6; } -+if test "x$ac_cv_lib_crypto_OPENSSL_init_crypto" = xyes; then : - cat >>confdefs.h <<_ACEOF - #define HAVE_LIBCRYPTO 1 - _ACEOF diff --git a/srcpkgs/xar/template b/srcpkgs/xar/template index 65f1a249724..9c544d4c468 100644 --- a/srcpkgs/xar/template +++ b/srcpkgs/xar/template @@ -1,9 +1,11 @@ # Template file for 'xar' pkgname=xar version=1.6.1 -revision=9 +revision=10 build_style=gnu-configure +build_wrksrc="xar" configure_args="ac_cv_sizeof_uid_t=4" +hostmakedepends="automake" makedepends="zlib-devel bzip2-devel e2fsprogs-devel acl-devel libxml2-devel openssl-devel" short_desc="Archiver for the eXtensible ARchiver format" maintainer="Orphaned " @@ -19,6 +21,10 @@ case "$XBPS_TARGET_MACHINE" in ;; esac +pre_configure() { + autoreconf -fi +} + post_install() { vlicense LICENSE }