Merge branch 'maint' into next

2024-11-23 18:14:25 +08:00 · 2017-08-13 22:40:15 -04:00 · 2017-08-13 22:40:15 -04:00 · 80c21ca370
commit 80c21ca370
parent c920def92d f25b334c50
14 changed files with 59 additions and 78 deletions
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@ -28,7 +28,7 @@ install-doc-libs: libext2fs.info libext2fs.dvi
 		$(INSTALL_DATA) $$i $(DESTDIR)$(infodir)/$$i ; \
 	done
 	$(E) "	GZIP $(infodir)/libext2fs.info*"
-	-$(Q) gzip -9 $(DESTDIR)$(infodir)/libext2fs.info*
+	-$(Q) gzip -9n $(DESTDIR)$(infodir)/libext2fs.info*

 uninstall-doc-libs:
 	$(RM) -rf $(DESTDIR)$(infodir)/libext2fs.info*
--- a/lib/support/mkquota.c
+++ b/lib/support/mkquota.c
@ -50,11 +50,13 @@ static void print_dquot(const char *desc, struct dquot *dq)
 {
 	if (desc)
 		fprintf(stderr, "%s: ", desc);
-	fprintf(stderr, "%u %ld:%ld:%ld %ld:%ld:%ld\n",
-		dq->dq_id, dq->dq_dqb.dqb_curspace,
-		dq->dq_dqb.dqb_bsoftlimit, dq->dq_dqb.dqb_bhardlimit,
-		dq->dq_dqb.dqb_curinodes,
-		dq->dq_dqb.dqb_isoftlimit, dq->dq_dqb.dqb_ihardlimit);
+	fprintf(stderr, "%u %lld:%lld:%lld %lld:%lld:%lld\n",
+		dq->dq_id, (long long) dq->dq_dqb.dqb_curspace,
+		(long long) dq->dq_dqb.dqb_bsoftlimit,
+		(long long) dq->dq_dqb.dqb_bhardlimit,
+		(long long) dq->dq_dqb.dqb_curinodes,
+		(long long) dq->dq_dqb.dqb_isoftlimit,
+		(long long) dq->dq_dqb.dqb_ihardlimit);
 }
 #else
 static void print_dquot(const char *desc EXT2FS_ATTR((unused)),
@ -524,11 +526,11 @@ static int scan_dquots_callback(struct dquot *dquot, void *cb_data)
 	    dq->dq_dqb.dqb_curinodes != dquot->dq_dqb.dqb_curinodes) {
 		scan_data->usage_is_inconsistent = 1;
 		fprintf(stderr, "[QUOTA WARNING] Usage inconsistent for ID %u:"
-			"actual (%ld, %ld) != expected (%ld, %ld)\n",
-			dq->dq_id, dq->dq_dqb.dqb_curspace,
-			dq->dq_dqb.dqb_curinodes,
-			dquot->dq_dqb.dqb_curspace,
-			dquot->dq_dqb.dqb_curinodes);
+			"actual (%lld, %lld) != expected (%lld, %lld)\n",
+			dq->dq_id, (long long) dq->dq_dqb.dqb_curspace,
+			(long long) dq->dq_dqb.dqb_curinodes,
+			(long long) dquot->dq_dqb.dqb_curspace,
+			(long long) dquot->dq_dqb.dqb_curinodes);
 	}

 	if (scan_data->update_limits) {
--- a/po/ca.po
+++ b/po/ca.po
@ -7021,14 +7021,14 @@ msgid "<proceeding>\n"
 msgstr "<continuar>\n"

 #: misc/util.c:104
-#, fuzzy, c-format
+#, c-format
 msgid "Proceed anyway (or wait %d seconds) ? (y,N) "
-msgstr "Voleu continuar de totes maneres (o esperar %d segons) ? (s,n)"
+msgstr "Voleu continuar de totes maneres (o esperar %d segons) ? (s,N)"

 #: misc/util.c:108
-#, fuzzy
+#,
 msgid "Proceed anyway? (y,N) "
-msgstr "Voleu continuar de totes maneres? (s,n)"
+msgstr "Voleu continuar de totes maneres? (s,N)"

 #: misc/util.c:133
 msgid "mke2fs forced anyway.  Hope /etc/mtab is incorrect.\n"
--- a/po/de.po
+++ b/po/de.po
@ -7077,14 +7077,14 @@ msgid "<proceeding>\n"
 msgstr "<Verarbeitung läuft\n"

 #: misc/util.c:104
-#, fuzzy, c-format
+#, c-format
 msgid "Proceed anyway (or wait %d seconds) ? (y,N) "
-msgstr "Trotzdem fortfahren (oder %d Sekunden warten) ? (j,n) "
+msgstr "Trotzdem fortfahren (oder %d Sekunden warten) ? (j,N) "

 #: misc/util.c:108
-#, fuzzy
+#,
 msgid "Proceed anyway? (y,N) "
-msgstr "Trotzdem fortfahren? (j,n) "
+msgstr "Trotzdem fortfahren? (j,N) "

 #: misc/util.c:133
 msgid "mke2fs forced anyway.  Hope /etc/mtab is incorrect.\n"
--- a/po/fi.po
+++ b/po/fi.po
@ -6460,14 +6460,14 @@ msgid "<proceeding>\n"
 msgstr "<jatketaan>\n"

 #: misc/util.c:104
-#, fuzzy, c-format
+#, c-format
 msgid "Proceed anyway (or wait %d seconds) ? (y,N) "
-msgstr "Jatketaanko silti (vai odotetaanko %d sekuntia)? (k,e)"
+msgstr "Jatketaanko silti (vai odotetaanko %d sekuntia)? (k,E)"

 #: misc/util.c:108
-#, fuzzy
+#,
 msgid "Proceed anyway? (y,N) "
-msgstr "Jatketaanko silti? (k,e) "
+msgstr "Jatketaanko silti? (k,E) "

 #: misc/util.c:133
 msgid "mke2fs forced anyway.  Hope /etc/mtab is incorrect.\n"
--- a/po/id.po
+++ b/po/id.po
@ -6867,14 +6867,14 @@ msgid "<proceeding>\n"
 msgstr ""

 #: misc/util.c:104
-#, fuzzy, c-format
+#, c-format
 msgid "Proceed anyway (or wait %d seconds) ? (y,N) "
-msgstr "Jalankan saja? (y,n) "
+msgstr "Jalankan saja? (y,N) "

 #: misc/util.c:108
-#, fuzzy
+#,
 msgid "Proceed anyway? (y,N) "
-msgstr "Jalankan saja? (y,n) "
+msgstr "Jalankan saja? (y,N) "

 #: misc/util.c:133
 msgid "mke2fs forced anyway.  Hope /etc/mtab is incorrect.\n"
--- a/po/it.po
+++ b/po/it.po
@ -6857,14 +6857,14 @@ msgid "<proceeding>\n"
 msgstr ""

 #: misc/util.c:104
-#, fuzzy, c-format
+#, c-format
 msgid "Proceed anyway (or wait %d seconds) ? (y,N) "
-msgstr "Procedere comunque? (s,n) "
+msgstr "Procedere comunque? (s,N) "

 #: misc/util.c:108
-#, fuzzy
+#,
 msgid "Proceed anyway? (y,N) "
-msgstr "Procedere comunque? (s,n) "
+msgstr "Procedere comunque? (s,N) "

 #: misc/util.c:133
 msgid "mke2fs forced anyway.  Hope /etc/mtab is incorrect.\n"
--- a/po/ms.po
+++ b/po/ms.po
@ -6689,14 +6689,14 @@ msgid "<proceeding>\n"
 msgstr ""

 #: misc/util.c:104
-#, fuzzy, c-format
+#, c-format
 msgid "Proceed anyway (or wait %d seconds) ? (y,N) "
-msgstr "Teruskan juga? (y,t)"
+msgstr "Teruskan juga? (y,T)"

 #: misc/util.c:108
-#, fuzzy
+#,
 msgid "Proceed anyway? (y,N) "
-msgstr "Teruskan juga? (y,t)"
+msgstr "Teruskan juga? (y,T)"

 #: misc/util.c:133
 msgid "mke2fs forced anyway.  Hope /etc/mtab is incorrect.\n"
--- a/po/nl.po
+++ b/po/nl.po
@ -7018,14 +7018,14 @@ msgid "<proceeding>\n"
 msgstr "<verdergaand>\n"

 #: misc/util.c:104
-#, fuzzy, c-format
+#, c-format
 msgid "Proceed anyway (or wait %d seconds) ? (y,N) "
-msgstr "Toch doorgaan (of %d seconden wachten)? (j,n) "
+msgstr "Toch doorgaan (of %d seconden wachten)? (j,N) "

 #: misc/util.c:108
-#, fuzzy
+#,
 msgid "Proceed anyway? (y,N) "
-msgstr "Toch doorgaan? (j,n) "
+msgstr "Toch doorgaan? (j,N) "

 #: misc/util.c:133
 msgid "mke2fs forced anyway.  Hope /etc/mtab is incorrect.\n"
--- a/po/tr.po
+++ b/po/tr.po
@ -7106,14 +7106,14 @@ msgid "<proceeding>\n"
 msgstr ""

 #: misc/util.c:104
-#, fuzzy, c-format
+#, c-format
 msgid "Proceed anyway (or wait %d seconds) ? (y,N) "
-msgstr "Yine de devam edilsin mi? (e/h) "
+msgstr "Yine de devam edilsin mi? (e/H) "

 #: misc/util.c:108
-#, fuzzy
+#,
 msgid "Proceed anyway? (y,N) "
-msgstr "Yine de devam edilsin mi? (e/h) "
+msgstr "Yine de devam edilsin mi? (e/H) "

 #: misc/util.c:133
 msgid "mke2fs forced anyway.  Hope /etc/mtab is incorrect.\n"
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@ -6773,14 +6773,14 @@ msgid "<proceeding>\n"
 msgstr "<处理中>\n"

 #: misc/util.c:104
-#, fuzzy, c-format
+#, c-format
 msgid "Proceed anyway (or wait %d seconds) ? (y,N) "
-msgstr "无论如何也要继续（或等待 %d 秒）?（y,n） "
+msgstr "无论如何也要继续（或等待 %d 秒）?（y,N） "

 #: misc/util.c:108
-#, fuzzy
+#,
 msgid "Proceed anyway? (y,N) "
-msgstr "无论如何也要继续?（y,n） "
+msgstr "无论如何也要继续?（y,N） "

 #: misc/util.c:133
 msgid "mke2fs forced anyway.  Hope /etc/mtab is incorrect.\n"
--- a/resize/Makefile.in
+++ b/resize/Makefile.in
@ -112,35 +112,6 @@ mostlyclean: clean
 distclean: clean
 	$(RM) -f .depend Makefile $(srcdir)/TAGS $(srcdir)/Makefile.in.old

-#
-# Kludge to create a "special" e2fsprogs distribution file.
-#
-
-SRCROOT = `echo e2fsprogs-@E2FSPROGS_VERSION@ | sed -e 's/-WIP//' \
-			-e 's/pre-//' -e 's/-PLUS//'`
-TAR=tar
-
-$(top_srcdir)/.exclude-file:
-	a=$(SRCROOT); \
-	(cd $(top_srcdir)/.. ; find e2fsprogs \( -name \*~ -o -name \*.orig \
-		-o -name CVS -o -name \*.rej \) -print) \
-		| sed -e "s/e2fsprogs/$$a/" > $(top_srcdir)/.exclude-file
-	echo "$(SRCROOT)/build" >> $(top_srcdir)/.exclude-file
-	echo "$(SRCROOT)/rpm.log" >> $(top_srcdir)/.exclude-file
-	echo "$(SRCROOT)/powerquest" >> $(top_srcdir)/.exclude-file
-	echo "$(SRCROOT)/.exclude-file" >> $(top_srcdir)/.exclude-file
-	echo $(SRCROOT)/e2fsprogs-@E2FSPROGS_VERSION@.tar.gz \
-		>> $(top_srcdir)/.exclude-file
-	echo $(SRCROOT)/e2fsprogs-ALL-@E2FSPROGS_VERSION@.tar.gz \
-		>> $(top_srcdir)/.exclude-file
-
-source_tar_file: $(top_srcdir)/.exclude-file
-	(cd $(top_srcdir)/..; a=$(SRCROOT); rm -f $$a ; ln -sf e2fsprogs $$a ; \
-		$(TAR) -c -h -v -f - \
-			-X $$a/.exclude-file $$a | \
-		gzip -9 > e2fsprogs-ALL-@E2FSPROGS_VERSION@.tar.gz)
-	rm -f $(top_srcdir)/.exclude-file
-
 # +++ Dependency line eater +++
 # 
 # Makefile dependencies follow.  This must be the last section in
--- a/tests/test_config
+++ b/tests/test_config
@ -34,6 +34,8 @@ E2FSCK_CONFIG=/dev/null
 export E2FSCK_CONFIG
 MKE2FS_CONFIG=./mke2fs.conf
 export MKE2FS_CONFIG
+BLKID_FILE=/dev/null
+export BLKID_FILE
 unset MKE2FS_FIRST_META_BG
 E2FSPROGS_SKIP_PROGRESS=yes
 export E2FSPROGS_SKIP_PROGRESS
--- a/util/gen-tarball.in
+++ b/util/gen-tarball.in
@ -34,6 +34,10 @@ case $1 in
 	;;
 esac

+if test -z "$SOURCE_DATE_EPOCH" ; then
+    export SOURCE_DATE_EPOCH=$(cd $top_srcdir; git log -1 --pretty=%ct)
+fi
+
 mv ../e2fsprogs.spec $top_srcdir/e2fsprogs.spec
 (cd $top_srcdir/.. ; find $base_e2fsprogs \( -name \*~ -o -name \*.orig \
 		-o -name CVS -o -name \*.rej -o -name Makefile.pq \
@ -45,8 +49,10 @@ sed -e "s;^;$SRCROOT/;" < $srcdir/$list.exclude >> $exclude

 (cd $top_srcdir/.. ; rm -f $SRCROOT ; ln -sf $base_e2fsprogs $SRCROOT)

-(cd $top_srcdir/.. ; tar -c -h -v -f - -X $exclude $SRCROOT) \
-	 | $GZIP -9 -c > $SRCROOT.tar.gz
+(cd $top_srcdir/.. ; \
+ tar -c -h -f - -X $exclude --sort=name --owner=0 --group=0 \
+     --numeric-owner --mtime="@${SOURCE_DATE_EPOCH}" $SRCROOT) \
+    | $GZIP -9n -c > $SRCROOT.tar.gz
 $GZIP -l $SRCROOT.tar.gz

 (cd $top_srcdir/.. ; rm -f $SRCROOT)