svn commit: r321304 - in stable/10: contrib/libarchive contrib/libarchive/libarchive contrib/libarchive/libarchive/test usr.bin/bsdcat usr.bin/cpio usr.bin/tar

2017-07-20 Thread Martin Matuska 
Author: mm
Date: Thu Jul 20 20:16:18 2017
New Revision: 321304
URL: https://svnweb.freebsd.org/changeset/base/321304

Log:
  MFC r320927,320931,320932:
  Bump libarchive to 3.3.2
  
  Vendor changes:
PR #901: don't depend on stdin in a testcase
  
  Relnotes: yes

Modified:
  stable/10/contrib/libarchive/NEWS
  stable/10/contrib/libarchive/libarchive/archive.h
  stable/10/contrib/libarchive/libarchive/archive_entry.h
  
stable/10/contrib/libarchive/libarchive/test/test_archive_read_close_twice_open_filename.c
  stable/10/usr.bin/bsdcat/Makefile
  stable/10/usr.bin/cpio/Makefile
  stable/10/usr.bin/tar/Makefile
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/contrib/libarchive/NEWS
==
--- stable/10/contrib/libarchive/NEWS   Thu Jul 20 20:15:38 2017
(r321303)
+++ stable/10/contrib/libarchive/NEWS   Thu Jul 20 20:16:18 2017
(r321304)
@@ -1,3 +1,5 @@
+Jul 09, 2017: libarchive 3.3.2 released
+
 Mar 16, 2017: NFSv4 ACL support for Linux (librichacl)
 
 Feb 26, 2017: libarchive 3.3.1 released

Modified: stable/10/contrib/libarchive/libarchive/archive.h
==
--- stable/10/contrib/libarchive/libarchive/archive.h   Thu Jul 20 20:15:38 
2017(r321303)
+++ stable/10/contrib/libarchive/libarchive/archive.h   Thu Jul 20 20:16:18 
2017(r321304)
@@ -36,7 +36,7 @@
  * assert that ARCHIVE_VERSION_NUMBER >= 2012108.
  */
 /* Note: Compiler will complain if this does not match archive_entry.h! */
-#defineARCHIVE_VERSION_NUMBER 3003001
+#defineARCHIVE_VERSION_NUMBER 3003002
 
 #include 
 #include   /* for wchar_t */
@@ -155,7 +155,7 @@ __LA_DECL int   archive_version_number(void);
 /*
  * Textual name/version of the library, useful for version displays.
  */
-#defineARCHIVE_VERSION_ONLY_STRING "3.3.1"
+#defineARCHIVE_VERSION_ONLY_STRING "3.3.2"
 #defineARCHIVE_VERSION_STRING "libarchive " ARCHIVE_VERSION_ONLY_STRING
 __LA_DECL const char * archive_version_string(void);
 

Modified: stable/10/contrib/libarchive/libarchive/archive_entry.h
==
--- stable/10/contrib/libarchive/libarchive/archive_entry.h Thu Jul 20 
20:15:38 2017(r321303)
+++ stable/10/contrib/libarchive/libarchive/archive_entry.h Thu Jul 20 
20:16:18 2017(r321304)
@@ -30,7 +30,7 @@
 #defineARCHIVE_ENTRY_H_INCLUDED
 
 /* Note: Compiler will complain if this does not match archive.h! */
-#defineARCHIVE_VERSION_NUMBER 3003001
+#defineARCHIVE_VERSION_NUMBER 3003002
 
 /*
  * Note: archive_entry.h is for use outside of libarchive; the

Modified: 
stable/10/contrib/libarchive/libarchive/test/test_archive_read_close_twice_open_filename.c
==
--- 
stable/10/contrib/libarchive/libarchive/test/test_archive_read_close_twice_open_filename.c
  Thu Jul 20 20:15:38 2017(r321303)
+++ 
stable/10/contrib/libarchive/libarchive/test/test_archive_read_close_twice_open_filename.c
  Thu Jul 20 20:16:18 2017(r321304)
@@ -28,10 +28,12 @@ __FBSDID("$FreeBSD$");
 
 DEFINE_TEST(test_archive_read_close_twice_open_filename)
 {
+   const char *filename = "empty.file";
struct archive* a = archive_read_new();
 
+   assertMakeFile(filename, 0644, "");
assertEqualInt(ARCHIVE_OK, archive_read_support_format_empty(a));
-   assertEqualInt(ARCHIVE_OK, archive_read_open_filename(a, 0, 0));
+   assertEqualInt(ARCHIVE_OK, archive_read_open_filename(a, filename, 0));
assertEqualInt(0, archive_errno(a));
assertEqualString(NULL, archive_error_string(a));
 

Modified: stable/10/usr.bin/bsdcat/Makefile
==
--- stable/10/usr.bin/bsdcat/Makefile   Thu Jul 20 20:15:38 2017
(r321303)
+++ stable/10/usr.bin/bsdcat/Makefile   Thu Jul 20 20:16:18 2017
(r321304)
@@ -6,7 +6,7 @@ _LIBARCHIVEDIR= ${SRCTOP}/contrib/libarchive
 _LIBARCHIVECONFDIR=${SRCTOP}/lib/libarchive
 
 PROG=  bsdcat
-BSDCAT_VERSION_STRING= 3.3.1
+BSDCAT_VERSION_STRING= 3.3.2
 
 .PATH: ${_LIBARCHIVEDIR}/cat
 SRCS=  bsdcat.c cmdline.c

Modified: stable/10/usr.bin/cpio/Makefile
==
--- stable/10/usr.bin/cpio/Makefile Thu Jul 20 20:15:38 2017
(r321303)
+++ stable/10/usr.bin/cpio/Makefile Thu Jul 20 20:16:18 2017
(r321304)
@@ -6,7 +6,7 @@ LIBARCHIVEDIR=  ${.CURDIR}/../../contrib/libarchive
 LIBARCHIVECONFDIR= ${.CURDIR}/../../lib/libarchive
 
 PROG=  bsdcpio
-BSDCPIO_VERSION_STRING=3.3.1
+BSDCPIO_VERSION_STRING=3.3.2
 
 .PATH: ${LIBARCHIVEDIR}/cpio
 SRCS=  cpio.c cmdline.c

Modified: stable/10/usr.bin/tar/Makefile

svn commit: r321291 - stable/10/sys/geom

2017-07-20 Thread Alexander Motin 
Author: mav
Date: Thu Jul 20 11:37:02 2017
New Revision: 321291
URL: https://svnweb.freebsd.org/changeset/base/321291

Log:
  MFC r320729: Add GEOM::descr attribute for symmetry with GEOM::ident.

Modified:
  stable/10/sys/geom/geom_disk.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/geom/geom_disk.c
==
--- stable/10/sys/geom/geom_disk.c  Thu Jul 20 11:36:25 2017
(r321290)
+++ stable/10/sys/geom/geom_disk.c  Thu Jul 20 11:37:02 2017
(r321291)
@@ -502,6 +502,8 @@ g_disk_start(struct bio *bp)
break;
else if (g_handleattr_str(bp, "GEOM::ident", dp->d_ident))
break;
+   else if (g_handleattr_str(bp, "GEOM::descr", dp->d_descr))
+   break;
else if (g_handleattr_uint16_t(bp, "GEOM::hba_vendor",
dp->d_hba_vendor))
break;
___
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"