[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
new snapshot and release coming soon: updating gnulib
From: |
Jim Meyering |
Subject: |
new snapshot and release coming soon: updating gnulib |
Date: |
Thu, 22 Mar 2018 16:19:49 -0700 |
There have been several bug fixes in the year since the sed-4.4
release, so I want to make a new release very soon. I expect to
make the first pre-release snapshot today. But first, I will push
these two changes.
>From 9b1e01da2e91037ca5afc80f49edac4ae1a6c8c5 Mon Sep 17 00:00:00 2001
From: Jim Meyering <address@hidden>
Date: Thu, 22 Mar 2018 15:51:33 -0700
Subject: [PATCH 1/2] build: update gnulib to latest
* gnulib: Update submodule.
* bootstrap: Update from gnulib.
* testsuite/init.sh: Likewise.
---
bootstrap | 10 +++++-----
gnulib | 2 +-
testsuite/init.sh | 23 ++++++++++++++++++-----
3 files changed, 24 insertions(+), 11 deletions(-)
diff --git a/bootstrap b/bootstrap
index e5f983c..92be114 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1,6 +1,6 @@
#! /bin/sh
# Print a version string.
-scriptversion=2017-01-09.19; # UTC
+scriptversion=2018-03-07.03; # UTC
# Bootstrap this package from checked-out sources.
@@ -141,7 +141,7 @@ po_download_command_format=\
# Fallback for downloading .po files (if rsync fails).
po_download_command_format2=\
"wget --mirror -nd -q -np -A.po -P '%s' \
- http://translationproject.org/latest/%s/"
+ https://translationproject.org/latest/%s/"
# Prefer a non-empty tarname (4th argument of AC_INIT if given), else
# fall back to the package name (1st argument with munging)
@@ -699,7 +699,7 @@ download_po_files() {
echo "$me: getting translations into $subdir for $domain..."
cmd=$(printf "$po_download_command_format" "$domain" "$subdir")
eval "$cmd" && return
- # Fallback to HTTP.
+ # Fallback to HTTPS.
cmd=$(printf "$po_download_command_format2" "$subdir" "$domain")
eval "$cmd"
}
@@ -792,7 +792,7 @@ symlink_to_dir()
# aren't confused into doing unnecessary builds. Conversely, if the
# existing symlink's timestamp is older than the source, make it afresh,
# so that broken tools aren't confused into skipping needed builds. See
- # <http://lists.gnu.org/archive/html/bug-gnulib/2011-05/msg00326.html>.
+ # <https://lists.gnu.org/r/bug-gnulib/2011-05/msg00326.html>.
test -h "$dst" &&
src_ls=$(ls -diL "$src" 2>/dev/null) && set $src_ls && src_i=$1 &&
dst_ls=$(ls -diL "$dst" 2>/dev/null) && set $dst_ls && dst_i=$1 &&
@@ -1020,7 +1020,7 @@ bootstrap_epilogue
echo "$0: done. Now you can run './configure'."
# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
# time-stamp-time-zone: "UTC0"
diff --git a/gnulib b/gnulib
index 646a44e..66ae2f3 160000
--- a/gnulib
+++ b/gnulib
@@ -1 +1 @@
-Subproject commit 646a44e1b190c4a7f6a9f32c63230c619e38d251
+Subproject commit 66ae2f356a594c83ad690d0dfadbc9c9a4cec5f4
diff --git a/testsuite/init.sh b/testsuite/init.sh
index d37f157..93d14f5 100644
--- a/testsuite/init.sh
+++ b/testsuite/init.sh
@@ -62,6 +62,19 @@
ME_=`expr "./$0" : '.*/\(.*\)$'`
+# Prepare PATH_SEPARATOR.
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+ # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which
+ # contains only /bin. Note that ksh looks also at the FPATH variable,
+ # so we have to set that as well for the test.
+ PATH_SEPARATOR=:
+ (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
+ && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
+ || PATH_SEPARATOR=';'
+ }
+fi
+
# We use a trap below for cleanup. This requires us to go through
# hoops to get the right exit status transported through the handler.
# So use 'Exit STATUS' instead of 'exit STATUS' inside of the tests.
@@ -250,7 +263,7 @@ test -n "$BASH_VERSION" && unalias -a
# That is part of the shell-selection test above. Why use aliases rather
# than functions? Because support for hyphen-containing aliases is more
# widespread than that for hyphen-containing function names.
-test -n "$EXEEXT" && shopt -s expand_aliases
+test -n "$EXEEXT" && test -n "$BASH_VERSION" && shopt -s expand_aliases
# Enable glibc's malloc-perturbing option.
# This is useful for exposing code that depends on the fact that
@@ -429,13 +442,13 @@ path_prepend_ ()
path_dir_=$1
case $path_dir_ in
'') fail_ "invalid path dir: '$1'";;
- /*) abs_path_dir_=$path_dir_;;
+ /* | ?:*) abs_path_dir_=$path_dir_;;
*) abs_path_dir_=$initial_cwd_/$path_dir_;;
esac
case $abs_path_dir_ in
- *:*) fail_ "invalid path dir: '$abs_path_dir_'";;
+ *$PATH_SEPARATOR*) fail_ "invalid path dir: '$abs_path_dir_'";;
esac
- PATH="$abs_path_dir_:$PATH"
+ PATH="$abs_path_dir_$PATH_SEPARATOR$PATH"
# Create an alias, FOO, for each FOO.exe in this directory.
create_exe_shims_ "$abs_path_dir_" \
@@ -514,7 +527,7 @@ rand_bytes_ ()
fi
n_plus_50_=`expr $n_ + 50`
- cmds_='date; date +%N; free; who -a; w; ps auxww; ps ef; netstat -n'
+ cmds_='date; date +%N; free; who -a; w; ps auxww; ps -ef'
data_=` (eval "$cmds_") 2>&1 | gzip `
# Ensure that $data_ has length at least 50+$n_
--
2.16.1.72.g5be1f00a9
>From c0375163a4521918a6291f4842b47567bae2a067 Mon Sep 17 00:00:00 2001
From: Jim Meyering <address@hidden>
Date: Thu, 22 Mar 2018 16:12:26 -0700
Subject: [PATCH 2/2] maint: ignore more artifacts
* .gitignore: Also ignore sed-*.tar.xz.sig files.
* lib/.gitignore: Ignore more gnulib-provided sources.
---
.gitignore | 1 +
lib/.gitignore | 48 +++++++++++++++++++++++++++++++-----------------
2 files changed, 32 insertions(+), 17 deletions(-)
diff --git a/.gitignore b/.gitignore
index c411f8c..f8f0ec1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -73,6 +73,7 @@
/po/sed.pot
/po/stamp-po
/sed-*.tar.xz
+/sed-*.tar.xz.sig
/sed-[4-9]*
/sed/.dirstamp
/sed/Makefile
diff --git a/lib/.gitignore b/lib/.gitignore
index 8c94888..b532504 100644
--- a/lib/.gitignore
+++ b/lib/.gitignore
@@ -206,32 +206,46 @@ xstriconv.c
xstriconv.h
xstrndup.c
xstrndup.h
-/progname.c
-/progname.h
-/ignore-value.h
+/acl-internal.c
/alignof.h
-/close-stream.c
-/close-stream.h
/closeout.c
/closeout.h
-/fpending.c
-/fpending.h
-/stdalign.in.h
-/acl-internal.c
-/get-permissions.c
-/set-permissions.c
-/ctype.in.h
+/close-stream.c
+/close-stream.h
/ctype.h
+/ctype.in.h
/dfa.c
/dfa.h
+/filename.h
+/fpending.c
+/fpending.h
+/getopt-cdefs.in.h
+/getopt-core.h
+/getopt-ext.h
+/getopt-pfx-core.h
+/getopt-pfx-ext.h
+/get-permissions.c
/getprogname.c
/getprogname.h
-/localeinfo.c
-/localeinfo.h
-/isblank.c
-/limits.in.h
-/limits.h
+/gnulib.mk.bak
/hard-locale.c
/hard-locale.h
+/ignore-value.h
+/isblank.c
+/limits.h
+/limits.in.h
+/localeinfo.c
+/localeinfo.h
+/localtime-buffer.c
+/localtime-buffer.h
/memrchr.c
/minmax.h
+/_Noreturn.h
+/progname.c
+/progname.h
+/set-permissions.c
+/stat-time.c
+/stat-time.h
+/stat-w32.c
+/stat-w32.h
+/stdalign.in.h
--
2.16.1.72.g5be1f00a9
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- new snapshot and release coming soon: updating gnulib,
Jim Meyering <=