svn commit: r284750 - stable/10/usr.bin/calendar/calendars
Author: brueffer Date: Wed Jun 24 12:19:11 2015 New Revision: 284750 URL: https://svnweb.freebsd.org/changeset/base/284750 Log: MFH: r284249 Correct Hawaii's admission day. PR: 192651 Modified: stable/10/usr.bin/calendar/calendars/calendar.holiday Directory Properties: stable/10/ (props changed) Modified: stable/10/usr.bin/calendar/calendars/calendar.holiday == --- stable/10/usr.bin/calendar/calendars/calendar.holiday Wed Jun 24 09:28:43 2015(r284749) +++ stable/10/usr.bin/calendar/calendars/calendar.holiday Wed Jun 24 12:19:11 2015(r284750) @@ -357,7 +357,7 @@ 08/31 Independence Day (Merdeka) in Malaysia 08/31 Independence Day in Trinidad and Tobago 08/31 Pashtoonian Day in Afghanistan -08/FriThirdAdmission Day in Hawaii, 1984 (3rd Friday) +08/FriThirdAdmission Day in Hawaii, 1959 (3rd Friday) 09/01 Army Day in Chile 09/03 Independence Day in Qatar 09/03 Memorial Day in Tunisia ___ 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
svn commit: r284757 - stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs
Author: avg
Date: Wed Jun 24 14:37:55 2015
New Revision: 284757
URL: https://svnweb.freebsd.org/changeset/base/284757
Log:
MFC r284301: MFV r284040: check that datasets are snapshots
Modified:
stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c
stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c
==
--- stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c Wed Jun
24 14:37:19 2015(r284756)
+++ stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c Wed Jun
24 14:37:55 2015(r284757)
@@ -855,6 +855,10 @@ dmu_send_estimate(dsl_dataset_t *ds, dsl
if (!dsl_dataset_is_snapshot(ds))
return (SET_ERROR(EINVAL));
+ /* fromsnap, if provided, must be a snapshot */
+ if (fromds != NULL !dsl_dataset_is_snapshot(fromds))
+ return (SET_ERROR(EINVAL));
+
/*
* fromsnap must be an earlier snapshot from the same fs as tosnap,
* or the origin's fs.
Modified: stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c
==
--- stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c
Wed Jun 24 14:37:19 2015(r284756)
+++ stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c
Wed Jun 24 14:37:55 2015(r284757)
@@ -5364,11 +5364,19 @@ zfs_ioc_space_snaps(const char *lastsnap
return (error);
error = dsl_dataset_hold(dp, lastsnap, FTAG, new);
+ if (error == 0 !dsl_dataset_is_snapshot(new)) {
+ dsl_dataset_rele(new, FTAG);
+ error = SET_ERROR(EINVAL);
+ }
if (error != 0) {
dsl_pool_rele(dp, FTAG);
return (error);
}
error = dsl_dataset_hold(dp, firstsnap, FTAG, old);
+ if (error == 0 !dsl_dataset_is_snapshot(old)) {
+ dsl_dataset_rele(old, FTAG);
+ error = SET_ERROR(EINVAL);
+ }
if (error != 0) {
dsl_dataset_rele(new, FTAG);
dsl_pool_rele(dp, FTAG);
___
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
svn commit: r284758 - stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs
Author: avg
Date: Wed Jun 24 14:39:26 2015
New Revision: 284758
URL: https://svnweb.freebsd.org/changeset/base/284758
Log:
MFC r284303: MFV r283534: 5515 dataset user hold doesn't reject empty tags
Modified:
stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c
==
--- stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c
Wed Jun 24 14:37:55 2015(r284757)
+++ stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c
Wed Jun 24 14:39:26 2015(r284758)
@@ -25,12 +25,11 @@
* All rights reserved.
* Copyright 2013 Martin Matuska m...@freebsd.org. All rights reserved.
* Copyright 2014 Xin Li delp...@freebsd.org. All rights reserved.
- * Copyright 2011 Nexenta Systems, Inc. All rights reserved.
+ * Copyright 2015 Nexenta Systems, Inc. All rights reserved.
* Copyright (c) 2014, Joyent, Inc. All rights reserved.
* Copyright (c) 2011, 2014 by Delphix. All rights reserved.
* Copyright (c) 2013 by Saso Kiselkov. All rights reserved.
* Copyright (c) 2013 Steven Hartland. All rights reserved.
- * Copyright (c) 2014, Nexenta Systems, Inc. All rights reserved.
*/
/*
@@ -5242,6 +5241,7 @@ zfs_ioc_smb_acl(zfs_cmd_t *zc)
static int
zfs_ioc_hold(const char *pool, nvlist_t *args, nvlist_t *errlist)
{
+ nvpair_t *pair;
nvlist_t *holds;
int cleanup_fd = -1;
int error;
@@ -5251,6 +5251,19 @@ zfs_ioc_hold(const char *pool, nvlist_t
if (error != 0)
return (SET_ERROR(EINVAL));
+ /* make sure the user didn't pass us any invalid (empty) tags */
+ for (pair = nvlist_next_nvpair(holds, NULL); pair != NULL;
+ pair = nvlist_next_nvpair(holds, pair)) {
+ char *htag;
+
+ error = nvpair_value_string(pair, htag);
+ if (error != 0)
+ return (SET_ERROR(error));
+
+ if (strlen(htag) == 0)
+ return (SET_ERROR(EINVAL));
+ }
+
if (nvlist_lookup_int32(args, cleanup_fd, cleanup_fd) == 0) {
error = zfs_onexit_fd_hold(cleanup_fd, minor);
if (error != 0)
___
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
svn commit: r284754 - stable/10/cddl/contrib/opensolaris/cmd/zfs
Author: avg
Date: Wed Jun 24 14:30:04 2015
New Revision: 284754
URL: https://svnweb.freebsd.org/changeset/base/284754
Log:
MFC r284309: zfs clone should not mount the clone if canmount == noauto
Modified:
stable/10/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c
==
--- stable/10/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c Wed Jun 24
12:48:55 2015(r284753)
+++ stable/10/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c Wed Jun 24
14:30:04 2015(r284754)
@@ -593,6 +593,17 @@ finish_progress(char *done)
}
/*
+ * Check if the dataset is mountable and should be automatically mounted.
+ */
+static boolean_t
+should_auto_mount(zfs_handle_t *zhp)
+{
+ if (!zfs_prop_valid_for_type(ZFS_PROP_CANMOUNT, zfs_get_type(zhp)))
+ return (B_FALSE);
+ return (zfs_prop_get_int(zhp, ZFS_PROP_CANMOUNT) == ZFS_CANMOUNT_ON);
+}
+
+/*
* zfs clone [-p] [-o prop=value] ... snap fs | vol
*
* Given an existing dataset, create a writable copy whose initial contents
@@ -677,9 +688,22 @@ zfs_do_clone(int argc, char **argv)
clone = zfs_open(g_zfs, argv[1], ZFS_TYPE_DATASET);
if (clone != NULL) {
- if (zfs_get_type(clone) != ZFS_TYPE_VOLUME)
- if ((ret = zfs_mount(clone, NULL, 0)) == 0)
- ret = zfs_share(clone);
+ /*
+* If the user doesn't want the dataset
+* automatically mounted, then skip the mount/share
+* step.
+*/
+ if (should_auto_mount(clone)) {
+ if ((ret = zfs_mount(clone, NULL, 0)) != 0) {
+ (void) fprintf(stderr, gettext(clone
+ successfully created,
+ but not mounted\n));
+ } else if ((ret = zfs_share(clone)) != 0) {
+ (void) fprintf(stderr, gettext(clone
+ successfully created,
+ but not shared\n));
+ }
+ }
zfs_close(clone);
}
}
@@ -728,7 +752,6 @@ zfs_do_create(int argc, char **argv)
int ret = 1;
nvlist_t *props;
uint64_t intval;
- int canmount = ZFS_CANMOUNT_OFF;
if (nvlist_alloc(props, NV_UNIQUE_NAME, 0) != 0)
nomem();
@@ -868,19 +891,15 @@ zfs_do_create(int argc, char **argv)
goto error;
ret = 0;
- /*
-* if the user doesn't want the dataset automatically mounted,
-* then skip the mount/share step
-*/
- if (zfs_prop_valid_for_type(ZFS_PROP_CANMOUNT, type))
- canmount = zfs_prop_get_int(zhp, ZFS_PROP_CANMOUNT);
/*
* Mount and/or share the new filesystem as appropriate. We provide a
* verbose error message to let the user know that their filesystem was
* in fact created, even if we failed to mount or share it.
+* If the user doesn't want the dataset automatically mounted,
+* then skip the mount/share step altogether.
*/
- if (!nomount canmount == ZFS_CANMOUNT_ON) {
+ if (!nomount should_auto_mount(zhp)) {
if (zfs_mount(zhp, NULL, 0) != 0) {
(void) fprintf(stderr, gettext(filesystem
successfully created, but not mounted\n));
___
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
svn commit: r284786 - stable/10/contrib/sendmail/src
Author: gshapiro Date: Thu Jun 25 01:49:44 2015 New Revision: 284786 URL: https://svnweb.freebsd.org/changeset/base/284786 Log: MFC: An additional fix for the openssl Weak DH remediation: The import of openssl to address the FreeBSD-SA-15:10.openssl security advisory includes a change which rejects handshakes with DH parameters below 768 bits. sendmail releases prior to 8.15.2 (not yet released), defaulted to a 512 bit DH parameter setting for client connections. The first fix committed last week changed the default to 1024 bits. This commit fixes the case where the DHParameters option is set to a file which doesn't exist, which is the case on newer versions of FreeBSD which enable STARTTLS by default by auto-creating TLS certificates. Modified: stable/10/contrib/sendmail/src/sendmail.h Directory Properties: stable/10/ (props changed) Modified: stable/10/contrib/sendmail/src/sendmail.h == --- stable/10/contrib/sendmail/src/sendmail.h Thu Jun 25 01:42:59 2015 (r284785) +++ stable/10/contrib/sendmail/src/sendmail.h Thu Jun 25 01:49:44 2015 (r284786) @@ -1935,7 +1935,7 @@ struct termescape /* server requirements */ #define TLS_I_SRV (TLS_I_SRV_CERT | TLS_I_RSA_TMP | TLS_I_VRFY_PATH | \ -TLS_I_VRFY_LOC | TLS_I_TRY_DH | TLS_I_DH512 | \ +TLS_I_VRFY_LOC | TLS_I_TRY_DH | TLS_I_DH1024 | \ TLS_I_CACHE) /* client requirements */ ___ 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
svn commit: r284787 - stable/10
Author: gshapiro Date: Thu Jun 25 01:51:14 2015 New Revision: 284787 URL: https://svnweb.freebsd.org/changeset/base/284787 Log: Add a note on the second sendmail fix for WeakDH interoperability. Modified: stable/10/UPDATING Modified: stable/10/UPDATING == --- stable/10/UPDATING Thu Jun 25 01:49:44 2015(r284786) +++ stable/10/UPDATING Thu Jun 25 01:51:14 2015(r284787) @@ -16,6 +16,10 @@ from older versions of FreeBSD, try WITH stable/10, and then rebuild without this option. The bootstrap process from older version of current is a bit fragile. +20150624: + An additional fix for the issue described in the 20150614 sendmail + entry below has been been committed in revision 284786. + 20150615: The fix for the issue described in the 20150614 sendmail entry below has been been committed in revision 284485. The work ___ 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
svn commit: r284773 - stable/10/usr.bin/mkimg
Author: marcel
Date: Wed Jun 24 18:40:34 2015
New Revision: 284773
URL: https://svnweb.freebsd.org/changeset/base/284773
Log:
MFC r284269, r284270, r284655, r284656, r284658:
VHD fixes for Microsoft Azure:
1. Round the image size to the VHD geometry and then round to a
multiple of 1MB.
2. Change the creator OS from FBSD to Wi2k. It matters...
3. Bump the VHD tool version and the mkimg version.
Approved by: re (gjb)
Modified:
stable/10/usr.bin/mkimg/Makefile
stable/10/usr.bin/mkimg/format.c
stable/10/usr.bin/mkimg/vhd.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/usr.bin/mkimg/Makefile
==
--- stable/10/usr.bin/mkimg/MakefileWed Jun 24 18:29:34 2015
(r284772)
+++ stable/10/usr.bin/mkimg/MakefileWed Jun 24 18:40:34 2015
(r284773)
@@ -4,7 +4,7 @@ PROG= mkimg
SRCS= format.c image.c mkimg.c scheme.c
MAN= mkimg.1
-MKIMG_VERSION=20150222
+MKIMG_VERSION=20150620
mkimg.o: Makefile
CFLAGS+=-DMKIMG_VERSION=${MKIMG_VERSION}
Modified: stable/10/usr.bin/mkimg/format.c
==
--- stable/10/usr.bin/mkimg/format.cWed Jun 24 18:29:34 2015
(r284772)
+++ stable/10/usr.bin/mkimg/format.cWed Jun 24 18:40:34 2015
(r284773)
@@ -78,14 +78,10 @@ format_selected(void)
int
format_write(int fd)
{
- lba_t size;
int error;
if (format == NULL)
return (ENOSYS);
- size = image_get_size();
- error = format-resize(size);
- if (!error)
- error = format-write(fd);
+ error = format-write(fd);
return (error);
}
Modified: stable/10/usr.bin/mkimg/vhd.c
==
--- stable/10/usr.bin/mkimg/vhd.c Wed Jun 24 18:29:34 2015
(r284772)
+++ stable/10/usr.bin/mkimg/vhd.c Wed Jun 24 18:40:34 2015
(r284773)
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2014 Marcel Moolenaar
+ * Copyright (c) 2014, 2015 Marcel Moolenaar
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -62,6 +62,12 @@ __FBSDID($FreeBSD$);
#defineVHD_SECTOR_SIZE 512
#defineVHD_BLOCK_SIZE (4096 * VHD_SECTOR_SIZE)/* 2MB blocks */
+struct vhd_geom {
+ uint16_tcylinders;
+ uint8_t heads;
+ uint8_t sectors;
+};
+
struct vhd_footer {
uint64_tcookie;
#defineVHD_FOOTER_COOKIE 0x636f6e6563746978
@@ -75,14 +81,12 @@ struct vhd_footer {
uint32_tcreator_tool;
#defineVHD_CREATOR_TOOL0x2a696d67 /* FreeBSD mkimg */
uint32_tcreator_version;
-#defineVHD_CREATOR_VERSION 0x0001
+#defineVHD_CREATOR_VERSION 0x0002
uint32_tcreator_os;
-#defineVHD_CREATOR_OS 0x46425344
+#defineVHD_CREATOR_OS 0x5769326b /* Wi2k */
uint64_toriginal_size;
uint64_tcurrent_size;
- uint16_tcylinders;
- uint8_t heads;
- uint8_t sectors;
+ struct vhd_geom geometry;
uint32_tdisk_type;
#defineVHD_DISK_TYPE_FIXED 2
#defineVHD_DISK_TYPE_DYNAMIC 3
@@ -111,46 +115,48 @@ vhd_checksum(void *buf, size_t sz)
}
static void
-vhd_geometry(struct vhd_footer *footer, uint64_t image_size)
+vhd_geometry(uint64_t image_size, struct vhd_geom *geom)
{
lba_t imgsz;
long cth;
+ imgsz = image_size / VHD_SECTOR_SIZE;
+
/* Respect command line options if possible. */
if (nheads 1 nheads 256
nsecs 1 nsecs 256
ncyls 65536) {
- be16enc(footer-cylinders, ncyls);
- footer-heads = nheads;
- footer-sectors = nsecs;
+ geom-cylinders = (ncyls != 0) ? ncyls :
+ imgsz / (nheads * nsecs);
+ geom-heads = nheads;
+ geom-sectors = nsecs;
return;
}
- imgsz = image_size / VHD_SECTOR_SIZE;
if (imgsz 65536 * 16 * 255)
imgsz = 65536 * 16 * 255;
if (imgsz = 65535 * 16 * 63) {
- be16enc(footer-cylinders, imgsz / (16 * 255));
- footer-heads = 16;
- footer-sectors = 255;
+ geom-cylinders = imgsz / (16 * 255);
+ geom-heads = 16;
+ geom-sectors = 255;
return;
}
- footer-sectors = 17;
+ geom-sectors = 17;
cth = imgsz / 17;
- footer-heads = (cth + 1023) / 1024;
- if (footer-heads 4)
- footer-heads = 4;
- if (cth = (footer-heads * 1024) || footer-heads 16) {
- footer-heads = 16;
- footer-sectors = 31;
+
Re: svn commit: r284773 - stable/10/usr.bin/mkimg
On Wed, Jun 24, 2015 at 06:40:35PM +, Marcel Moolenaar wrote: Author: marcel Date: Wed Jun 24 18:40:34 2015 New Revision: 284773 URL: https://svnweb.freebsd.org/changeset/base/284773 Log: MFC r284269, r284270, r284655, r284656, r284658: VHD fixes for Microsoft Azure: 1. Round the image size to the VHD geometry and then round to a multiple of 1MB. 2. Change the creator OS from FBSD to Wi2k. It matters... 3. Bump the VHD tool version and the mkimg version. Thank you! Glen pgpD_4wDnIPXh.pgp Description: PGP signature
svn commit: r284776 - stable/10/sys/netinet
Author: eri
Date: Wed Jun 24 19:06:54 2015
New Revision: 284776
URL: https://svnweb.freebsd.org/changeset/base/284776
Log:
MFC r284512: Properly handle locking on the ARP protocol request sending.
Modified:
stable/10/sys/netinet/if_ether.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/netinet/if_ether.c
==
--- stable/10/sys/netinet/if_ether.cWed Jun 24 18:58:42 2015
(r284775)
+++ stable/10/sys/netinet/if_ether.cWed Jun 24 19:06:54 2015
(r284776)
@@ -365,6 +365,7 @@ retry:
if ((la-la_flags LLE_VALID)
((la-la_flags LLE_STATIC) || la-la_expire time_uptime)) {
bcopy(la-ll_addr, desten, ifp-if_addrlen);
+ renew = 0;
/*
* If entry has an expiry time and it is approaching,
* see if we need to send an ARP request within this
@@ -372,13 +373,21 @@ retry:
*/
if (!(la-la_flags LLE_STATIC)
time_uptime + la-la_preempt la-la_expire) {
- arprequest(ifp, NULL, SIN(dst)-sin_addr, NULL);
+ renew = 1;
la-la_preempt--;
}
*lle = la;
- error = 0;
- goto done;
+
+ if (flags LLE_EXCLUSIVE)
+ LLE_WUNLOCK(la);
+ else
+ LLE_RUNLOCK(la);
+
+ if (renew == 1)
+ arprequest(ifp, NULL, SIN(dst)-sin_addr, NULL);
+
+ return (0);
}
if (la-la_flags LLE_STATIC) { /* should not happen! */
___
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
svn commit: r284778 - in stable/10: contrib/file contrib/file/doc contrib/file/magic contrib/file/magic/Magdir contrib/file/python contrib/file/src contrib/file/tests lib/libmagic
Author: delphij Date: Wed Jun 24 19:58:14 2015 New Revision: 284778 URL: https://svnweb.freebsd.org/changeset/base/284778 Log: MFC r284237,284277: file 5.23. Relnotes: yes Added: stable/10/contrib/file/magic/Magdir/cbor - copied unchanged from r284237, head/contrib/file/magic/Magdir/cbor stable/10/contrib/file/magic/Magdir/nasa - copied unchanged from r284237, head/contrib/file/magic/Magdir/nasa stable/10/contrib/file/src/gmtime_r.c - copied unchanged from r284237, head/contrib/file/src/gmtime_r.c stable/10/contrib/file/src/localtime_r.c - copied unchanged from r284237, head/contrib/file/src/localtime_r.c Modified: stable/10/contrib/file/ChangeLog stable/10/contrib/file/Makefile.in stable/10/contrib/file/TODO stable/10/contrib/file/aclocal.m4 stable/10/contrib/file/compile stable/10/contrib/file/config.h.in stable/10/contrib/file/configure stable/10/contrib/file/configure.ac stable/10/contrib/file/depcomp stable/10/contrib/file/doc/Makefile.in stable/10/contrib/file/doc/file.man stable/10/contrib/file/doc/libmagic.man stable/10/contrib/file/ltmain.sh stable/10/contrib/file/magic/Magdir/android stable/10/contrib/file/magic/Magdir/apple stable/10/contrib/file/magic/Magdir/archive stable/10/contrib/file/magic/Magdir/audio stable/10/contrib/file/magic/Magdir/cafebabe stable/10/contrib/file/magic/Magdir/commands stable/10/contrib/file/magic/Magdir/compress stable/10/contrib/file/magic/Magdir/console stable/10/contrib/file/magic/Magdir/dyadic stable/10/contrib/file/magic/Magdir/filesystems stable/10/contrib/file/magic/Magdir/gnu stable/10/contrib/file/magic/Magdir/images stable/10/contrib/file/magic/Magdir/jpeg stable/10/contrib/file/magic/Magdir/linux stable/10/contrib/file/magic/Magdir/mach stable/10/contrib/file/magic/Magdir/mathematica stable/10/contrib/file/magic/Magdir/misctools stable/10/contrib/file/magic/Magdir/modem stable/10/contrib/file/magic/Magdir/mozilla stable/10/contrib/file/magic/Magdir/os2 stable/10/contrib/file/magic/Magdir/pdf stable/10/contrib/file/magic/Magdir/perl stable/10/contrib/file/magic/Magdir/riff stable/10/contrib/file/magic/Magdir/sereal stable/10/contrib/file/magic/Magdir/sgml stable/10/contrib/file/magic/Magdir/varied.script stable/10/contrib/file/magic/Magdir/vorbis stable/10/contrib/file/magic/Makefile.am stable/10/contrib/file/magic/Makefile.in stable/10/contrib/file/missing stable/10/contrib/file/python/Makefile.in stable/10/contrib/file/src/Makefile.in stable/10/contrib/file/src/apprentice.c stable/10/contrib/file/src/ascmagic.c stable/10/contrib/file/src/cdf.c stable/10/contrib/file/src/cdf.h stable/10/contrib/file/src/compress.c stable/10/contrib/file/src/encoding.c stable/10/contrib/file/src/file.c stable/10/contrib/file/src/file.h stable/10/contrib/file/src/file_opts.h stable/10/contrib/file/src/fsmagic.c stable/10/contrib/file/src/funcs.c stable/10/contrib/file/src/is_tar.c stable/10/contrib/file/src/magic.c stable/10/contrib/file/src/magic.h stable/10/contrib/file/src/magic.h.in stable/10/contrib/file/src/print.c stable/10/contrib/file/src/readcdf.c stable/10/contrib/file/src/readelf.c stable/10/contrib/file/src/softmagic.c stable/10/contrib/file/tests/Makefile.in stable/10/lib/libmagic/config.h Directory Properties: stable/10/ (props changed) Modified: stable/10/contrib/file/ChangeLog == --- stable/10/contrib/file/ChangeLogWed Jun 24 19:16:41 2015 (r284777) +++ stable/10/contrib/file/ChangeLogWed Jun 24 19:58:14 2015 (r284778) @@ -1,3 +1,56 @@ +2015-06-11 8:52 Christos Zoulas chris...@zoulas.com + + * redo long option encoding to fix off-by-one in 5.23 + +2015-06-10 13:50 Christos Zoulas chris...@zoulas.com + + * release 5.23 + +2015-06-09 16:10 Christos Zoulas chris...@zoulas.com + + * Fix issue with regex range for magic with offset + * Always return true from mget with USE (success to mget not match + indication). Fixes mime evaluation after USE magic + * PR/459: Don't insert magic entries to the list if there are parsing + errors for them. + +2015-06-03 16:00 Christos Zoulas chris...@zoulas.com + + * PR/455: Add utf-7 encoding + +2015-06-03 14:30 Christos Zoulas chris...@zoulas.com + + * PR/455: Implement -Z, look inside, but don't report on compression + * PR/454: Fix allocation error on bad magic. + +2015-05-29 10:30 Christos Zoulas chris...@zoulas.com + + * handle MAGIC_CONTINUE everywhere, not just in softmagic + +2015-05-21 14:30 Christos Zoulas chris...@zoulas.com + + * don't print descriptions for NAME types when mime. + +2015-04-09 15:59 Christos Zoulas chris...@zoulas.com + + * Add --extension to list the known extensions for this file type + Idea by Andrew J
