Hi,
looking at the source archive of pigeonhole 0.4.20
<https://pigeonhole.dovecot.org/releases/2.2/dovecot-2.2-pigeonhole-0.4.20.tar.gz>
I noticed that the contained ChangeLog mentions v0.4.20.rc1 as first
entry and pigeonhole-version.h defines git revision 7cd71ba as version
where I'd expect 4a55e6c.
This is probably no big deal. But since Makefile.in and install-sh also
differ (see attached diff) from the patch contained in
<http://xi.rename-it.nl/debian.new/pool/jessie-rc-auto/dovecot-2.2/dovecot_2.2.32-1~auto+1.debian.tar.xz>
I thought I'd ask whether this is something without importance or
something which should be changed.
--
Regards
mks
diff -uNr archive/pigeonhole/ChangeLog patchfile/pigeonhole/ChangeLog
--- archive/pigeonhole/ChangeLog 2017-08-27 15:17:38.000000000 +0200
+++ patchfile/pigeonhole/ChangeLog 2017-08-31 11:34:25.726202126 +0200
@@ -1,3 +1,11 @@
+2017-08-27 15:31:23 +0200 Stephan Bosch <stephan.bo...@dovecot.fi> (4a55e6c)
+
+ Released v0.4.20 for Dovecot v2.2.32.
+
+
+M NEWS
+M configure.ac
+
2017-08-18 02:28:14 +0200 Stephan Bosch <stephan.bo...@dovecot.fi> (7cd71ba)
Released v0.4.20.rc1 for Dovecot v2.2.32.rc1.
diff -uNr archive/pigeonhole/install-sh patchfile/pigeonhole/install-sh
--- archive/pigeonhole/install-sh 2016-06-23 13:57:36.000000000 +0200
+++ patchfile/pigeonhole/install-sh 2017-08-31 11:34:25.752870094 +0200
@@ -345,34 +345,41 @@
# is incompatible with FreeBSD 'install' when (umask & 300) != 0.
;;
*)
+ # $RANDOM is not portable (e.g. dash); use it when possible to
+ # lower collision chance
tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
- trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
+ trap 'ret=$?; rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null; exit $ret' 0
+ # As "mkdir -p" follows symlinks and we work in /tmp possibly; so
+ # create the $tmpdir first (and fail if unsuccessful) to make sure
+ # that nobody tries to guess the $tmpdir name.
if (umask $mkdir_umask &&
- exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
+ $mkdirprog $mkdir_mode "$tmpdir" &&
+ exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1
then
if test -z "$dir_arg" || {
# Check for POSIX incompatibilities with -m.
# HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
# other-writable bit of parent directory when it shouldn't.
# FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
- ls_ld_tmpdir=`ls -ld "$tmpdir"`
+ test_tmpdir="$tmpdir/a"
+ ls_ld_tmpdir=`ls -ld "$test_tmpdir"`
case $ls_ld_tmpdir in
d????-?r-*) different_mode=700;;
d????-?--*) different_mode=755;;
*) false;;
esac &&
- $mkdirprog -m$different_mode -p -- "$tmpdir" && {
- ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
+ $mkdirprog -m$different_mode -p -- "$test_tmpdir" && {
+ ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"`
test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
}
}
then posix_mkdir=:
fi
- rmdir "$tmpdir/d" "$tmpdir"
+ rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir"
else
# Remove any dirs left behind by ancient mkdir implementations.
- rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
+ rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null
fi
trap '' 0;;
esac;;
diff -uNr archive/pigeonhole/Makefile.in patchfile/pigeonhole/Makefile.in
--- archive/pigeonhole/Makefile.in 2017-08-27 14:42:39.000000000 +0200
+++ patchfile/pigeonhole/Makefile.in 2017-08-31 11:34:25.759537086 +0200
@@ -86,7 +86,7 @@
$(srcdir)/stamp.h.in $(dist_aclocal_DATA) \
$(dist_pkginc_lib_HEADERS) AUTHORS COPYING ChangeLog INSTALL \
NEWS README TODO compile config.guess config.rpath config.sub \
- depcomp install-sh missing ltmain.sh
+ install-sh missing ltmain.sh
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/dovecot.m4 \
$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
diff -uNr archive/pigeonhole/pigeonhole-version.h patchfile/pigeonhole/pigeonhole-version.h
--- archive/pigeonhole/pigeonhole-version.h 2017-08-27 14:42:44.000000000 +0200
+++ patchfile/pigeonhole/pigeonhole-version.h 2017-08-31 11:34:25.762870581 +0200
@@ -1,6 +1,6 @@
#ifndef PIGEONHOLE_VERSION_H
#define PIGEONHOLE_VERSION_H
-#define PIGEONHOLE_VERSION_FULL PIGEONHOLE_VERSION" (7cd71ba)"
+#define PIGEONHOLE_VERSION_FULL PIGEONHOLE_VERSION" (4a55e6c)"
#endif /* PIGEONHOLE_VERSION_H */
