try again

OBS-URL: https://build.opensuse.org/package/show/Archiving/libarchive?expand=0&rev=50

libarchive-openssl.patch

@@ -1,5 +1,7 @@
---- libarchive/archive_crypto.c.orig
-+++ libarchive/archive_crypto.c
+Index: libarchive/archive_digest.c
+===================================================================
+--- libarchive/archive_digest.c.orig
++++ libarchive/archive_digest.c
 @@ -207,6 +207,7 @@ __archive_nettle_md5final(archive_md5_ct
  static int
  __archive_openssl_md5init(archive_md5_ctx *ctx)
@@ -48,13 +50,15 @@
    EVP_DigestInit(ctx, EVP_sha512());
    return (ARCHIVE_OK);
  }
---- libarchive/archive_crypto_private.h.orig
-+++ libarchive/archive_crypto_private.h
-@@ -135,6 +135,7 @@
-   defined(ARCHIVE_CRYPTO_SHA512_OPENSSL)
- #define	ARCHIVE_CRYPTO_OPENSSL 1
+Index: libarchive/archive_cryptor_private.h
+===================================================================
+--- libarchive/archive_cryptor_private.h.orig
++++ libarchive/archive_cryptor_private.h
+@@ -100,6 +100,7 @@ typedef struct {
+ 
+ #elif defined(HAVE_LIBCRYPTO)
  #include <openssl/evp.h>
 +#include <openssl/conf.h>
- #endif
+ #define AES_BLOCK_SIZE	16
+ #define AES_MAX_KEY_SIZE 32
  
- /* Windows crypto headers */

libarchive-xattr.patch

@@ -1,11 +0,0 @@
---- libarchive-3.1.2.orig/configure.ac
-+++ libarchive-3.1.2/configure.ac
-@@ -568,7 +568,7 @@ AC_ARG_ENABLE([xattr],
- if test "x$enable_xattr" != "xno"; then
- 	AC_CHECK_HEADERS([attr/xattr.h])
- 	AC_CHECK_HEADERS([sys/xattr.h sys/ea.h])
--	AC_CHECK_LIB(attr,setxattr)
-+	AC_SEARCH_LIBS([setxattr], [attr])
- 	AC_CHECK_FUNCS([extattr_get_file extattr_list_file])
- 	AC_CHECK_FUNCS([extattr_set_fd extattr_set_file])
- 	AC_CHECK_FUNCS([fgetxattr flistxattr fsetxattr getxattr])

libarchive.changes

@@ -4,10 +4,12 @@ Mon May  9 08:42:19 UTC 2016 - adrian@suse.de
 - update to version 3.2.0
   * Fixes CVE-2016-1541
   * changes are only documented in git history
+  * updated openssl patch
 
 - removed obsolete patches for:
   * CVE-2013-0211.patch
   * directory-traversal-fix.patch
+  * libarchive-xattr.patch
 
 -------------------------------------------------------------------
 Fri May  6 14:45:14 UTC 2016 - normand@linux.vnet.ibm.com

libarchive.spec

@@ -56,7 +56,6 @@ BuildRequires:  pkg-config
 BuildRequires:  xz-devel
 BuildRequires:  zlib-devel
 Patch0:         libarchive-openssl.patch
-Patch1:         libarchive-xattr.patch
 
 %description
 Libarchive is a programming library that can create and read several
@@ -163,10 +162,7 @@ static library for libarchive
 %prep
 %setup -q
 %if %{with openssl}
-%patch0
-%endif
-%if !0%{?skip_autoreconf}
-%patch1 -p1
+%patch0 -p0
 %endif
 
 %build