svn commit: r269519 - in stable/10: lib/libarchive rescue/rescue

[Dimitry Andric]

Author: dim
Date: Mon Aug  4 14:56:49 2014
New Revision: 269519
URL: http://svnweb.freebsd.org/changeset/base/269519

Log:
  MFC r269125:
  
  In r232153, libarchive 3.0.3 was imported, replacing the archive_hash.h
  header with archive_crypto_private.h, and its ARCHIVE_HASH_xxx macros
  were renamed to ARCHIVE_CRYPTO_xxx.
  
  Rename these macros in lib/libarchive/config_freebsd.h, to re-enable the
  hashes for libarchive again.  This affects the mtree format writer, and
  the xar format reader and writer modules.
  
  This also requires changes in the library order for statically linking
  rescue, otherwise ld would complain about redefined symbols.  Thanks to
  jkim for pointing out the solution.
  
  Reviewed by:	kientzle

Modified:
  stable/10/lib/libarchive/config_freebsd.h
  stable/10/rescue/rescue/Makefile
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/lib/libarchive/config_freebsd.h
==============================================================================
--- stable/10/lib/libarchive/config_freebsd.h	Mon Aug  4 12:25:36 2014	(r269518)
+++ stable/10/lib/libarchive/config_freebsd.h	Mon Aug  4 14:56:49 2014	(r269519)
@@ -228,15 +228,15 @@
 
 /* FreeBSD defines for archive_hash.h */
 #ifdef WITH_OPENSSL
-#define ARCHIVE_HASH_MD5_OPENSSL 1
-#define ARCHIVE_HASH_RMD160_OPENSSL 1
-#define ARCHIVE_HASH_SHA1_OPENSSL
-#define ARCHIVE_HASH_SHA256_OPENSSL 1
-#define ARCHIVE_HASH_SHA384_OPENSSL 1
-#define ARCHIVE_HASH_SHA512_OPENSSL 1
+#define ARCHIVE_CRYPTO_MD5_OPENSSL 1
+#define ARCHIVE_CRYPTO_RMD160_OPENSSL 1
+#define ARCHIVE_CRYPTO_SHA1_OPENSSL
+#define ARCHIVE_CRYPTO_SHA256_OPENSSL 1
+#define ARCHIVE_CRYPTO_SHA384_OPENSSL 1
+#define ARCHIVE_CRYPTO_SHA512_OPENSSL 1
 #else
-#define ARCHIVE_HASH_MD5_LIBMD 1
-#define ARCHIVE_HASH_SHA1_LIBMD 1
-#define ARCHIVE_HASH_SHA256_LIBMD 1
-#define ARCHIVE_HASH_SHA512_LIBMD 1
+#define ARCHIVE_CRYPTO_MD5_LIBMD 1
+#define ARCHIVE_CRYPTO_SHA1_LIBMD 1
+#define ARCHIVE_CRYPTO_SHA256_LIBMD 1
+#define ARCHIVE_CRYPTO_SHA512_LIBMD 1
 #endif

Modified: stable/10/rescue/rescue/Makefile
==============================================================================
--- stable/10/rescue/rescue/Makefile	Mon Aug  4 12:25:36 2014	(r269518)
+++ stable/10/rescue/rescue/Makefile	Mon Aug  4 14:56:49 2014	(r269519)
@@ -125,7 +125,11 @@ CRUNCH_LIBS+= -lipx
 .if ${MK_ZFS} != "no"
 CRUNCH_LIBS+= -lavl -lzfs_core -lzfs -lnvpair -lpthread -luutil -lumem
 .endif
-CRUNCH_LIBS+= -lgeom -lbsdxml -lkiconv -lmd -lsbuf -lufs -lz
+CRUNCH_LIBS+= -lgeom -lbsdxml -lkiconv
+.if ${MK_OPENSSL} == "no"
+CRUNCH_LIBS+= -lmd
+.endif
+CRUNCH_LIBS+= -lsbuf -lufs -lz
 
 .if ${MACHINE_CPUARCH} == "i386"
 CRUNCH_PROGS_sbin+= bsdlabel sconfig fdisk
@@ -194,10 +198,11 @@ CRUNCH_ALIAS_xz= unxz lzma unlzma xzcat 
 CRUNCH_LIBS+= -llzma
 
 CRUNCH_PROGS_usr.bin+= tar
-CRUNCH_LIBS+= -larchive -lmd
+CRUNCH_LIBS+= -larchive
 .if ${MK_OPENSSL} != "no"
 CRUNCH_LIBS+= -lcrypto
 .endif
+CRUNCH_LIBS+= -lmd
 
 CRUNCH_PROGS_usr.bin+= vi
 CRUNCH_ALIAS_vi= ex