diff -Nru aufs-tools-4.9+20170918/aubrsync aufs-tools-4.14+20190211/aubrsync --- aufs-tools-4.9+20170918/aubrsync 2017-09-14 16:24:31.000000000 +0000 +++ aufs-tools-4.14+20190211/aubrsync 2019-02-05 07:22:47.000000000 +0000 @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright (C) 2005-2015 Junjiro R. Okajima +# Copyright (C) 2005-2019 Junjiro R. Okajima # # This program, aufs is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff -Nru aufs-tools-4.9+20170918/aubusy aufs-tools-4.14+20190211/aubusy --- aufs-tools-4.9+20170918/aubusy 2017-09-14 16:24:31.000000000 +0000 +++ aufs-tools-4.14+20190211/aubusy 2019-02-05 07:22:47.000000000 +0000 @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright (C) 2011-2014 Junjiro R. Okajima +# Copyright (C) 2011-2019 Junjiro R. Okajima # # This program, aufs is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff -Nru aufs-tools-4.9+20170918/auchk aufs-tools-4.14+20190211/auchk --- aufs-tools-4.9+20170918/auchk 2017-09-14 16:24:31.000000000 +0000 +++ aufs-tools-4.14+20190211/auchk 2019-02-05 07:22:47.000000000 +0000 @@ -1,6 +1,6 @@ #!/bin/sh - -# Copyright (C) 2005-2011 Junjiro R. Okajima +# Copyright (C) 2005-2019 Junjiro R. Okajima # # This program, aufs is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff -Nru aufs-tools-4.9+20170918/aufs.in.5 aufs-tools-4.14+20190211/aufs.in.5 --- aufs-tools-4.9+20170918/aufs.in.5 2017-09-14 16:24:31.000000000 +0000 +++ aufs-tools-4.14+20190211/aufs.in.5 2019-02-05 07:22:47.000000000 +0000 @@ -434,7 +434,7 @@ .B dirren .TQ .B nodirren -Activates or disactivates the special handling for renaming a directory +Activates or deactivates the special handling for renaming a directory (DIRREN) feature. In order to use this feature, CONFIG_AUFS_DIRREN has to be enabled and `dirren' mount option has to be specified too. @@ -447,7 +447,7 @@ Note that `udba=notify' option may not work with DIRREN, since it is based upon the name, while DIRREN handles both of before\- and -after\-renamed names. The internal name comparision may not work +after\-renamed names. The internal name comparison may not work correctly. In this case, aufs behaves like the default `udba=reval' is specified. @@ -581,6 +581,8 @@ .RE For example, when you give `\*[DROPLVL]=3', mount.aufs(8) converts it to `\*[DROPLVL1],\*[DROPLVL2],\*[DROPLVL3]'. +Also mount.aufs(8) provides `ephemeral' mount option which is equivalent +to `\*[DROPLVL]=3'. For your more convenience, mount.aufs(8) provides the negative values for each level. Note that there is no level 0, and no difference between @@ -996,6 +998,9 @@ support\-able largest inode number on a branch is less than 2305843009213693950 (LLONG_MAX/4\-1). This is the current limitation of aufs. +Note that the xino-array feature which was introduced in aufs4.14 and +later made this limitation obsolete. + On 64bit environment, this limitation becomes more strict and the supported largest inode number is less than LLONG_MAX/8\-1. In order to estimate the size of the table for your readonly branch fs, @@ -2420,7 +2425,7 @@ .\" activities. .SH COPYRIGHT -Copyright \(co 2005\-2017 Junjiro R. Okajima +Copyright \(co 2005\-2019 Junjiro R. Okajima .SH AUTHOR Junjiro R. Okajima diff -Nru aufs-tools-4.9+20170918/aufs.shlib aufs-tools-4.14+20190211/aufs.shlib --- aufs-tools-4.9+20170918/aufs.shlib 2017-09-14 16:24:31.000000000 +0000 +++ aufs-tools-4.14+20190211/aufs.shlib 2019-02-05 07:22:47.000000000 +0000 @@ -1,5 +1,5 @@ # -# Copyright (C) 2005-2011 Junjiro R. Okajima +# Copyright (C) 2005-2019 Junjiro R. Okajima # # This program, aufs is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff -Nru aufs-tools-4.9+20170918/auibusy.c aufs-tools-4.14+20190211/auibusy.c --- aufs-tools-4.9+20170918/auibusy.c 2017-09-14 16:24:31.000000000 +0000 +++ aufs-tools-4.14+20190211/auibusy.c 2019-02-05 07:22:47.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2011-2015 Junjiro R. Okajima + * Copyright (C) 2011-2019 Junjiro R. Okajima * * This program, aufs is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -Nru aufs-tools-4.9+20170918/aumvdown.8 aufs-tools-4.14+20190211/aumvdown.8 --- aufs-tools-4.9+20170918/aumvdown.8 2017-09-14 16:24:31.000000000 +0000 +++ aufs-tools-4.14+20190211/aumvdown.8 2019-02-05 07:22:47.000000000 +0000 @@ -110,7 +110,7 @@ \fBaufs\fP(5) .SH COPYRIGHT -Copyright \(co 2011\-2015 Junjiro R. Okajima +Copyright \(co 2011\-2019 Junjiro R. Okajima .SH AUTHOR Junjiro R. Okajima diff -Nru aufs-tools-4.9+20170918/aumvdown.c aufs-tools-4.14+20190211/aumvdown.c --- aufs-tools-4.9+20170918/aumvdown.c 2017-09-14 16:24:31.000000000 +0000 +++ aufs-tools-4.14+20190211/aumvdown.c 2019-02-05 07:22:47.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2011-2017 Junjiro R. Okajima + * Copyright (C) 2011-2019 Junjiro R. Okajima * * This program, aufs is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -Nru aufs-tools-4.9+20170918/auplink.c aufs-tools-4.14+20190211/auplink.c --- aufs-tools-4.9+20170918/auplink.c 2017-09-14 16:24:31.000000000 +0000 +++ aufs-tools-4.14+20190211/auplink.c 2019-02-05 07:22:47.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2015 Junjiro R. Okajima + * Copyright (C) 2005-2019 Junjiro R. Okajima * * This program, aufs is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -Nru aufs-tools-4.9+20170918/auplink_ftw aufs-tools-4.14+20190211/auplink_ftw --- aufs-tools-4.9+20170918/auplink_ftw 2017-09-14 16:24:31.000000000 +0000 +++ aufs-tools-4.14+20190211/auplink_ftw 2019-02-05 07:22:47.000000000 +0000 @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright (C) 2016-2017 Junjiro R. Okajima +# Copyright (C) 2016-2019 Junjiro R. Okajima # # This program, aufs is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff -Nru aufs-tools-4.9+20170918/au_util.h aufs-tools-4.14+20190211/au_util.h --- aufs-tools-4.9+20170918/au_util.h 2017-09-14 16:24:31.000000000 +0000 +++ aufs-tools-4.14+20190211/au_util.h 2019-02-05 07:22:47.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2017 Junjiro R. Okajima + * Copyright (C) 2005-2019 Junjiro R. Okajima * * This program, aufs is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -33,13 +33,13 @@ char *au_decode_mntpnt(char *src, char *dst, int len); #endif -#define AuRelease "20170918" +#define AuRelease "20190211" #ifdef AUFHSM #define AuFhsmStr " with FHSM" #else #define AuFhsmStr "" #endif -#define AuVersionGitBranch "aufs4.9" +#define AuVersionGitBranch "aufs4.14" #define AuVersion "aufs-util for " AuVersionGitBranch AuFhsmStr " " AuRelease #define DROPLVL "droplvl" diff -Nru aufs-tools-4.9+20170918/br.c aufs-tools-4.14+20190211/br.c --- aufs-tools-4.9+20170918/br.c 2017-09-14 16:24:31.000000000 +0000 +++ aufs-tools-4.14+20190211/br.c 2019-02-05 07:22:47.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2015 Junjiro R. Okajima + * Copyright (C) 2005-2019 Junjiro R. Okajima * * This program, aufs is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -Nru aufs-tools-4.9+20170918/c2sh.c aufs-tools-4.14+20190211/c2sh.c --- aufs-tools-4.9+20170918/c2sh.c 2017-09-14 16:24:31.000000000 +0000 +++ aufs-tools-4.14+20190211/c2sh.c 2019-02-05 07:22:47.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2015 Junjiro R. Okajima + * Copyright (C) 2005-2019 Junjiro R. Okajima * * This program, aufs is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -Nru aufs-tools-4.9+20170918/c2tmac.c aufs-tools-4.14+20190211/c2tmac.c --- aufs-tools-4.9+20170918/c2tmac.c 2017-09-14 16:24:31.000000000 +0000 +++ aufs-tools-4.14+20190211/c2tmac.c 2019-02-05 07:22:47.000000000 +0000 @@ -1,6 +1,6 @@ /* - * Copyright (C) 2005-2015 Junjiro R. Okajima + * Copyright (C) 2005-2019 Junjiro R. Okajima * * This program, aufs is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -Nru aufs-tools-4.9+20170918/debian/changelog aufs-tools-4.14+20190211/debian/changelog --- aufs-tools-4.9+20170918/debian/changelog 2018-05-26 12:35:47.000000000 +0000 +++ aufs-tools-4.14+20190211/debian/changelog 2020-02-25 19:15:22.000000000 +0000 @@ -1,3 +1,17 @@ +aufs-tools (1:4.14+20190211-1ubuntu1) focal; urgency=medium + + * Patch out autfs ver check, yes ubuntu kernel is newer. + + -- Dimitri John Ledkov Tue, 25 Feb 2020 19:15:22 +0000 + +aufs-tools (1:4.14+20190211-1) unstable; urgency=medium + + * New upstream release. + * debian/control: + - Update to Debian policy 4.3.0, no changes needed. + + -- Jan Luca Naumann Tue, 26 Feb 2019 09:58:39 +0100 + aufs-tools (1:4.9+20170918-2) unstable; urgency=medium * debian/control: diff -Nru aufs-tools-4.9+20170918/debian/control aufs-tools-4.14+20190211/debian/control --- aufs-tools-4.9+20170918/debian/control 2018-05-26 12:35:47.000000000 +0000 +++ aufs-tools-4.14+20190211/debian/control 2020-02-25 19:15:22.000000000 +0000 @@ -1,9 +1,10 @@ Source: aufs-tools Section: kernel Priority: optional -Maintainer: Jan Luca Naumann +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Jan Luca Naumann Build-Depends: debhelper (>= 11), linux-libc-dev, aufs-dev -Standards-Version: 4.1.4 +Standards-Version: 4.3.0 Homepage: http://aufs.sourceforge.net/ Vcs-Browser: https://salsa.debian.org/janluca-guest/aufs-tools-debian Vcs-Git: https://salsa.debian.org/janluca-guest/aufs-tools-debian.git diff -Nru aufs-tools-4.9+20170918/debian/patches/no-version-check.patch aufs-tools-4.14+20190211/debian/patches/no-version-check.patch --- aufs-tools-4.9+20170918/debian/patches/no-version-check.patch 1970-01-01 00:00:00.000000000 +0000 +++ aufs-tools-4.14+20190211/debian/patches/no-version-check.patch 2020-02-25 19:15:22.000000000 +0000 @@ -0,0 +1,12 @@ +Description: Patch out autfs ver check, yes ubuntu kernel is newer. +Author: Dimitri John Ledkov + +--- aufs-tools-4.14+20190211.orig/ver.c ++++ aufs-tools-4.14+20190211/ver.c +@@ -39,5 +39,5 @@ int main(int argc, char *argv[]) + puts("Wrong version!\n" + AuVersion ", but aufs is " AUFS_VERSION ".\n" + "See README in detail and try git branch -a."); +- return -1; ++ return 0; + } diff -Nru aufs-tools-4.9+20170918/debian/patches/series aufs-tools-4.14+20190211/debian/patches/series --- aufs-tools-4.9+20170918/debian/patches/series 2018-05-26 12:35:47.000000000 +0000 +++ aufs-tools-4.14+20190211/debian/patches/series 2020-02-25 19:15:22.000000000 +0000 @@ -3,3 +3,4 @@ 0003-libau-Makefile-ensure-shared-overwrite-pie-flag.patch # 0003-xino.patch 0004-libau-Makefile-disable-strip.patch +no-version-check.patch diff -Nru aufs-tools-4.9+20170918/extlib/glibc/au_nftw.c aufs-tools-4.14+20190211/extlib/glibc/au_nftw.c --- aufs-tools-4.9+20170918/extlib/glibc/au_nftw.c 2017-09-14 16:24:31.000000000 +0000 +++ aufs-tools-4.14+20190211/extlib/glibc/au_nftw.c 2019-02-05 07:22:47.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2017 Junjiro R. Okajima + * Copyright (C) 2005-2019 Junjiro R. Okajima * * This program, aufs is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -Nru aufs-tools-4.9+20170918/extlib/non-glibc/au_decode_mntpnt.c aufs-tools-4.14+20190211/extlib/non-glibc/au_decode_mntpnt.c --- aufs-tools-4.9+20170918/extlib/non-glibc/au_decode_mntpnt.c 2017-09-14 16:24:31.000000000 +0000 +++ aufs-tools-4.14+20190211/extlib/non-glibc/au_decode_mntpnt.c 2019-02-05 07:22:47.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016-2017 Junjiro R. Okajima + * Copyright (C) 2016-2019 Junjiro R. Okajima * * This program, aufs is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -Nru aufs-tools-4.9+20170918/extlib/non-glibc/au_nftw.c aufs-tools-4.14+20190211/extlib/non-glibc/au_nftw.c --- aufs-tools-4.9+20170918/extlib/non-glibc/au_nftw.c 2017-09-14 16:24:31.000000000 +0000 +++ aufs-tools-4.14+20190211/extlib/non-glibc/au_nftw.c 2019-02-05 07:22:47.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016-2017 Junjiro R. Okajima + * Copyright (C) 2016-2019 Junjiro R. Okajima * * This program, aufs is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -Nru aufs-tools-4.9+20170918/extlib/non-glibc/error_at_line.c aufs-tools-4.14+20190211/extlib/non-glibc/error_at_line.c --- aufs-tools-4.9+20170918/extlib/non-glibc/error_at_line.c 2017-09-14 16:24:31.000000000 +0000 +++ aufs-tools-4.14+20190211/extlib/non-glibc/error_at_line.c 2019-02-05 07:22:47.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2013-2017 Junjiro R. Okajima + * Copyright (C) 2013-2019 Junjiro R. Okajima * * This program, aufs is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -Nru aufs-tools-4.9+20170918/extlib/non-glibc/error_at_line.h aufs-tools-4.14+20190211/extlib/non-glibc/error_at_line.h --- aufs-tools-4.9+20170918/extlib/non-glibc/error_at_line.h 2017-09-14 16:24:31.000000000 +0000 +++ aufs-tools-4.14+20190211/extlib/non-glibc/error_at_line.h 2019-02-05 07:22:47.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2013-2017 Junjiro R. Okajima + * Copyright (C) 2013-2019 Junjiro R. Okajima * * This program, aufs is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -Nru aufs-tools-4.9+20170918/fhsm/aufhsm.8 aufs-tools-4.14+20190211/fhsm/aufhsm.8 --- aufs-tools-4.9+20170918/fhsm/aufhsm.8 2017-09-14 16:24:31.000000000 +0000 +++ aufs-tools-4.14+20190211/fhsm/aufhsm.8 2019-02-05 07:22:47.000000000 +0000 @@ -81,7 +81,7 @@ .BR aufs (5) .SH COPYRIGHT -Copyright \(co 2011-2015 Junjiro R. Okajima +Copyright \(co 2011-2019 Junjiro R. Okajima .SH AUTHOR Junjiro R. Okajima diff -Nru aufs-tools-4.9+20170918/fhsm/aufhsm.c aufs-tools-4.14+20190211/fhsm/aufhsm.c --- aufs-tools-4.9+20170918/fhsm/aufhsm.c 2017-09-14 16:24:31.000000000 +0000 +++ aufs-tools-4.14+20190211/fhsm/aufhsm.c 2019-02-05 07:22:47.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2011-2015 Junjiro R. Okajima + * Copyright (C) 2011-2019 Junjiro R. Okajima * * This program, aufs is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -Nru aufs-tools-4.9+20170918/fhsm/aufhsmd.8 aufs-tools-4.14+20190211/fhsm/aufhsmd.8 --- aufs-tools-4.9+20170918/fhsm/aufhsmd.8 2017-09-14 16:24:31.000000000 +0000 +++ aufs-tools-4.14+20190211/fhsm/aufhsmd.8 2019-02-05 07:22:47.000000000 +0000 @@ -62,7 +62,7 @@ .BR aufs (5) .SH COPYRIGHT -Copyright \(co 2011-2015 Junjiro R. Okajima +Copyright \(co 2011-2019 Junjiro R. Okajima .SH AUTHOR Junjiro R. Okajima diff -Nru aufs-tools-4.9+20170918/fhsm/aufhsmd.c aufs-tools-4.14+20190211/fhsm/aufhsmd.c --- aufs-tools-4.9+20170918/fhsm/aufhsmd.c 2017-09-14 16:24:31.000000000 +0000 +++ aufs-tools-4.14+20190211/fhsm/aufhsmd.c 2019-02-05 07:22:47.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2011-2015 Junjiro R. Okajima + * Copyright (C) 2011-2019 Junjiro R. Okajima * * This program, aufs is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -Nru aufs-tools-4.9+20170918/fhsm/aufhsm-list aufs-tools-4.14+20190211/fhsm/aufhsm-list --- aufs-tools-4.9+20170918/fhsm/aufhsm-list 2017-09-14 16:24:31.000000000 +0000 +++ aufs-tools-4.14+20190211/fhsm/aufhsm-list 2019-02-05 07:22:47.000000000 +0000 @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright (C) 2011-2014 Junjiro R. Okajima +# Copyright (C) 2011-2019 Junjiro R. Okajima # # This program, aufs is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff -Nru aufs-tools-4.9+20170918/fhsm/aufhsm-list.8 aufs-tools-4.14+20190211/fhsm/aufhsm-list.8 --- aufs-tools-4.9+20170918/fhsm/aufhsm-list.8 2017-09-14 16:24:31.000000000 +0000 +++ aufs-tools-4.14+20190211/fhsm/aufhsm-list.8 2019-02-05 07:22:47.000000000 +0000 @@ -48,7 +48,7 @@ .BR aufs (5) .SH COPYRIGHT -Copyright \(co 2011-2015 Junjiro R. Okajima +Copyright \(co 2011-2019 Junjiro R. Okajima .SH AUTHOR Junjiro R. Okajima diff -Nru aufs-tools-4.9+20170918/fhsm/aufs_fhsm.5 aufs-tools-4.14+20190211/fhsm/aufs_fhsm.5 --- aufs-tools-4.9+20170918/fhsm/aufs_fhsm.5 2017-09-14 16:24:31.000000000 +0000 +++ aufs-tools-4.14+20190211/fhsm/aufs_fhsm.5 2019-02-05 07:22:47.000000000 +0000 @@ -406,7 +406,7 @@ .BR aufhsm-list (8) .SH COPYRIGHT -Copyright \(co 2011\-2015 Junjiro R. Okajima +Copyright \(co 2011\-2019 Junjiro R. Okajima .SH AUTHOR Junjiro R. Okajima diff -Nru aufs-tools-4.9+20170918/fhsm/comm.h aufs-tools-4.14+20190211/fhsm/comm.h --- aufs-tools-4.9+20170918/fhsm/comm.h 2017-09-14 16:24:31.000000000 +0000 +++ aufs-tools-4.14+20190211/fhsm/comm.h 2019-02-05 07:22:47.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2011-2017 Junjiro R. Okajima + * Copyright (C) 2011-2019 Junjiro R. Okajima * * This program, aufs is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -Nru aufs-tools-4.9+20170918/fhsm/daemon.h aufs-tools-4.14+20190211/fhsm/daemon.h --- aufs-tools-4.9+20170918/fhsm/daemon.h 2017-09-14 16:24:31.000000000 +0000 +++ aufs-tools-4.14+20190211/fhsm/daemon.h 2019-02-05 07:22:47.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2011-2015 Junjiro R. Okajima + * Copyright (C) 2011-2019 Junjiro R. Okajima * * This program, aufs is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -Nru aufs-tools-4.9+20170918/fhsm/event.c aufs-tools-4.14+20190211/fhsm/event.c --- aufs-tools-4.9+20170918/fhsm/event.c 2017-09-14 16:24:31.000000000 +0000 +++ aufs-tools-4.14+20190211/fhsm/event.c 2019-02-05 07:22:47.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2011-2015 Junjiro R. Okajima + * Copyright (C) 2011-2019 Junjiro R. Okajima * * This program, aufs is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -Nru aufs-tools-4.9+20170918/fhsm/fhsm.c aufs-tools-4.14+20190211/fhsm/fhsm.c --- aufs-tools-4.9+20170918/fhsm/fhsm.c 2017-09-14 16:24:31.000000000 +0000 +++ aufs-tools-4.14+20190211/fhsm/fhsm.c 2019-02-05 07:22:47.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2011-2015 Junjiro R. Okajima + * Copyright (C) 2011-2019 Junjiro R. Okajima * * This program, aufs is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -Nru aufs-tools-4.9+20170918/fhsm/list.c aufs-tools-4.14+20190211/fhsm/list.c --- aufs-tools-4.9+20170918/fhsm/list.c 2017-09-14 16:24:31.000000000 +0000 +++ aufs-tools-4.14+20190211/fhsm/list.c 2019-02-05 07:22:47.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2011-2015 Junjiro R. Okajima + * Copyright (C) 2011-2019 Junjiro R. Okajima * * This program, aufs is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -Nru aufs-tools-4.9+20170918/fhsm/log.c aufs-tools-4.14+20190211/fhsm/log.c --- aufs-tools-4.9+20170918/fhsm/log.c 2017-09-14 16:24:31.000000000 +0000 +++ aufs-tools-4.14+20190211/fhsm/log.c 2019-02-05 07:22:47.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2011-2015 Junjiro R. Okajima + * Copyright (C) 2011-2019 Junjiro R. Okajima * * This program, aufs is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -Nru aufs-tools-4.9+20170918/fhsm/log.h aufs-tools-4.14+20190211/fhsm/log.h --- aufs-tools-4.9+20170918/fhsm/log.h 2017-09-14 16:24:31.000000000 +0000 +++ aufs-tools-4.14+20190211/fhsm/log.h 2019-02-05 07:22:47.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2011-2015 Junjiro R. Okajima + * Copyright (C) 2011-2019 Junjiro R. Okajima * * This program, aufs is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -Nru aufs-tools-4.9+20170918/fhsm/Makefile aufs-tools-4.14+20190211/fhsm/Makefile --- aufs-tools-4.9+20170918/fhsm/Makefile 2017-09-14 16:24:31.000000000 +0000 +++ aufs-tools-4.14+20190211/fhsm/Makefile 2019-02-05 07:22:47.000000000 +0000 @@ -1,5 +1,5 @@ -# Copyright (C) 2011-2015 Junjiro R. Okajima +# Copyright (C) 2011-2019 Junjiro R. Okajima # # This program, aufs is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff -Nru aufs-tools-4.9+20170918/fhsm/msg.c aufs-tools-4.14+20190211/fhsm/msg.c --- aufs-tools-4.9+20170918/fhsm/msg.c 2017-09-14 16:24:31.000000000 +0000 +++ aufs-tools-4.14+20190211/fhsm/msg.c 2019-02-05 07:22:47.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2011-2017 Junjiro R. Okajima + * Copyright (C) 2011-2019 Junjiro R. Okajima * * This program, aufs is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -Nru aufs-tools-4.9+20170918/fhsm/mvdown.c aufs-tools-4.14+20190211/fhsm/mvdown.c --- aufs-tools-4.9+20170918/fhsm/mvdown.c 2017-09-14 16:24:31.000000000 +0000 +++ aufs-tools-4.14+20190211/fhsm/mvdown.c 2019-02-05 07:22:47.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2011-2015 Junjiro R. Okajima + * Copyright (C) 2011-2019 Junjiro R. Okajima * * This program, aufs is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -Nru aufs-tools-4.9+20170918/fhsm/shm.c aufs-tools-4.14+20190211/fhsm/shm.c --- aufs-tools-4.9+20170918/fhsm/shm.c 2017-09-14 16:24:31.000000000 +0000 +++ aufs-tools-4.14+20190211/fhsm/shm.c 2019-02-05 07:22:47.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2011-2015 Junjiro R. Okajima + * Copyright (C) 2011-2019 Junjiro R. Okajima * * This program, aufs is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -Nru aufs-tools-4.9+20170918/libau/libau.c aufs-tools-4.14+20190211/libau/libau.c --- aufs-tools-4.9+20170918/libau/libau.c 2017-09-14 16:24:31.000000000 +0000 +++ aufs-tools-4.14+20190211/libau/libau.c 2019-02-05 07:22:47.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2015 Junjiro R. Okajima + * Copyright (C) 2009-2019 Junjiro R. Okajima * * This program, aufs is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -Nru aufs-tools-4.9+20170918/libau/libau.h aufs-tools-4.14+20190211/libau/libau.h --- aufs-tools-4.9+20170918/libau/libau.h 2017-09-14 16:24:31.000000000 +0000 +++ aufs-tools-4.14+20190211/libau/libau.h 2019-02-05 07:22:47.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2017 Junjiro R. Okajima + * Copyright (C) 2009-2019 Junjiro R. Okajima * * This program, aufs is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -Nru aufs-tools-4.9+20170918/libau/Makefile aufs-tools-4.14+20190211/libau/Makefile --- aufs-tools-4.9+20170918/libau/Makefile 2017-09-14 16:24:31.000000000 +0000 +++ aufs-tools-4.14+20190211/libau/Makefile 2019-02-05 07:22:47.000000000 +0000 @@ -1,4 +1,4 @@ -# Copyright (C) 2005-2017 Junjiro R. Okajima +# Copyright (C) 2005-2019 Junjiro R. Okajima # # This program, aufs is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff -Nru aufs-tools-4.9+20170918/libau/pathconf.c aufs-tools-4.14+20190211/libau/pathconf.c --- aufs-tools-4.9+20170918/libau/pathconf.c 2017-09-14 16:24:31.000000000 +0000 +++ aufs-tools-4.14+20190211/libau/pathconf.c 2019-02-05 07:22:47.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2017 Junjiro R. Okajima + * Copyright (C) 2009-2019 Junjiro R. Okajima * * This program, aufs is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -Nru aufs-tools-4.9+20170918/libau/rdu.c aufs-tools-4.14+20190211/libau/rdu.c --- aufs-tools-4.9+20170918/libau/rdu.c 2017-09-14 16:24:31.000000000 +0000 +++ aufs-tools-4.14+20190211/libau/rdu.c 2019-02-05 07:22:47.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2015 Junjiro R. Okajima + * Copyright (C) 2009-2019 Junjiro R. Okajima * * This program, aufs is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -Nru aufs-tools-4.9+20170918/libau/rdu.h aufs-tools-4.14+20190211/libau/rdu.h --- aufs-tools-4.9+20170918/libau/rdu.h 2017-09-14 16:24:31.000000000 +0000 +++ aufs-tools-4.14+20190211/libau/rdu.h 2019-02-05 07:22:47.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2015 Junjiro R. Okajima + * Copyright (C) 2009-2019 Junjiro R. Okajima * * This program, aufs is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -Nru aufs-tools-4.9+20170918/libau/rdu_lib.c aufs-tools-4.14+20190211/libau/rdu_lib.c --- aufs-tools-4.9+20170918/libau/rdu_lib.c 2017-09-14 16:24:31.000000000 +0000 +++ aufs-tools-4.14+20190211/libau/rdu_lib.c 2019-02-05 07:22:47.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2017 Junjiro R. Okajima + * Copyright (C) 2009-2019 Junjiro R. Okajima * * This program, aufs is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -Nru aufs-tools-4.9+20170918/Makefile aufs-tools-4.14+20190211/Makefile --- aufs-tools-4.9+20170918/Makefile 2017-09-14 16:24:31.000000000 +0000 +++ aufs-tools-4.14+20190211/Makefile 2019-02-05 07:22:47.000000000 +0000 @@ -1,5 +1,5 @@ -# Copyright (C) 2005-2017 Junjiro R. Okajima +# Copyright (C) 2005-2019 Junjiro R. Okajima # # This program, aufs is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -66,8 +66,9 @@ echo no; } |\ tee ${LastTestGlibc}) endef -$(filter-out clean, ${MAKECMDGOALS} all): \ +pre: $(eval Glibc=$(call test_glibc, ${CC}, ver.c)) +$(filter-out clean, ${MAKECMDGOALS} all): pre #$(warning Glibc=${Glibc}) LibAuDir ?= /usr/lib @@ -122,6 +123,8 @@ ${Bin}: LDLIBS = -L. -lautil ${BinObj}: %.o: %.c ${LibUtilHdr} ${LibUtil} +ARFLAGS := ${ARFLAGS}U +export ARFLAGS ${LibUtilObj}: %.o: %.c ${LibUtilHdr} #${LibUtil}: ${LibUtil}(${LibUtilObj}) ${LibUtil}: $(foreach o, ${LibUtilObj}, ${LibUtil}(${o})) diff -Nru aufs-tools-4.9+20170918/mng_fhsm.c aufs-tools-4.14+20190211/mng_fhsm.c --- aufs-tools-4.9+20170918/mng_fhsm.c 2017-09-14 16:24:31.000000000 +0000 +++ aufs-tools-4.14+20190211/mng_fhsm.c 2019-02-05 07:22:47.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2011-2015 Junjiro R. Okajima + * Copyright (C) 2011-2019 Junjiro R. Okajima * * This program, aufs is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -Nru aufs-tools-4.9+20170918/mount.aufs.c aufs-tools-4.14+20190211/mount.aufs.c --- aufs-tools-4.9+20170918/mount.aufs.c 2017-09-14 16:24:31.000000000 +0000 +++ aufs-tools-4.14+20190211/mount.aufs.c 2019-02-05 07:22:47.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2017 Junjiro R. Okajima + * Copyright (C) 2005-2019 Junjiro R. Okajima * * This program, aufs is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -22,7 +22,7 @@ */ #define _XOPEN_SOURCE 500 /* getsubopt */ -#define _BSD_SOURCE /* dirfd */ +#define _DEFAULT_SOURCE /* dirfd */ #include #include @@ -41,6 +41,8 @@ #define ARRAY_SIZE(x) (sizeof(x)/sizeof((x)[0])) #endif +#define EPHEMERAL "ephemeral" + #define DROPLVL_STR(lvl) \ { \ .set = DROPLVL ## lvl, \ @@ -65,7 +67,8 @@ #define DROPLVL_INVALID ARRAY_SIZE(droplvl.str) -enum { Remount, Bind, Drop, Fake, Update, Verbose, AuFlush, LastOpt }; +enum { Remount, Bind, Drop, Ephemeral, Fake, Update, Verbose, AuFlush, + LastOpt }; static void test_opts(char opts[], unsigned char flags[]) { int c; @@ -74,6 +77,7 @@ [Remount] = "remount", [Bind] = "bind", [Drop] = DROPLVL, + [Ephemeral] = EPHEMERAL, NULL }; @@ -107,6 +111,11 @@ } droplvl.val = l; break; + case Ephemeral: /* equiv to droplvl=3 */ + flags[Drop] = 1; + droplvl.arg = last; + droplvl.val = 3; + break; } } free(o); @@ -170,7 +179,10 @@ AuFin("internal error, src %p, l %zu, droplvl %p", src, l, droplvl.arg); } - l -= sizeof(DROPLVL) - 1 + 2; /* "=N" */ + if (0 == strncmp(droplvl.arg, DROPLVL, sizeof(DROPLVL) - 1)) + l -= sizeof(DROPLVL) - 1 + 2; /* "=N" */ + else + l -= sizeof(EPHEMERAL) - 1; o = malloc(l); t = droplvl.arg - src; diff -Nru aufs-tools-4.9+20170918/mtab.c aufs-tools-4.14+20190211/mtab.c --- aufs-tools-4.9+20170918/mtab.c 2017-09-14 16:24:31.000000000 +0000 +++ aufs-tools-4.14+20190211/mtab.c 2019-02-05 07:22:47.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2017 Junjiro R. Okajima + * Copyright (C) 2005-2019 Junjiro R. Okajima * * This program, aufs is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -Nru aufs-tools-4.9+20170918/perror.c aufs-tools-4.14+20190211/perror.c --- aufs-tools-4.9+20170918/perror.c 2017-09-14 16:24:31.000000000 +0000 +++ aufs-tools-4.14+20190211/perror.c 2019-02-05 07:22:47.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2013-2017 Junjiro R. Okajima + * Copyright (C) 2013-2019 Junjiro R. Okajima * * This program, aufs is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -Nru aufs-tools-4.9+20170918/plink.c aufs-tools-4.14+20190211/plink.c --- aufs-tools-4.9+20170918/plink.c 2017-09-14 16:24:31.000000000 +0000 +++ aufs-tools-4.14+20190211/plink.c 2019-02-05 07:22:47.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2017 Junjiro R. Okajima + * Copyright (C) 2005-2019 Junjiro R. Okajima * * This program, aufs is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -Nru aufs-tools-4.9+20170918/proc_mnt.c aufs-tools-4.14+20190211/proc_mnt.c --- aufs-tools-4.9+20170918/proc_mnt.c 2017-09-14 16:24:31.000000000 +0000 +++ aufs-tools-4.14+20190211/proc_mnt.c 2019-02-05 07:22:47.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2017 Junjiro R. Okajima + * Copyright (C) 2005-2019 Junjiro R. Okajima * * This program, aufs is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -Nru aufs-tools-4.9+20170918/umount.aufs.c aufs-tools-4.14+20190211/umount.aufs.c --- aufs-tools-4.9+20170918/umount.aufs.c 2017-09-14 16:24:31.000000000 +0000 +++ aufs-tools-4.14+20190211/umount.aufs.c 2019-02-05 07:22:47.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010-2015 Junjiro R. Okajima + * Copyright (C) 2010-2019 Junjiro R. Okajima * * This program, aufs is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -Nru aufs-tools-4.9+20170918/ver.c aufs-tools-4.14+20190211/ver.c --- aufs-tools-4.9+20170918/ver.c 2017-09-14 16:24:31.000000000 +0000 +++ aufs-tools-4.14+20190211/ver.c 2019-02-05 07:22:47.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2011-2017 Junjiro R. Okajima + * Copyright (C) 2011-2019 Junjiro R. Okajima * * This program, aufs is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -28,7 +28,7 @@ { int err; regex_t preg; - const char *pat = "^4\\.(9|[1-9][0-9])"; /* aufs4.9 and later */ + const char *pat = "^4\\.(1[4-9]|[2-9][0-9])"; /* aufs4.14 and later */ err = regcomp(&preg, pat, REG_EXTENDED | REG_NOSUB); assert(!err); /* internal error */