We want to allow builds in chroots that lack /bin/sh. Thus, system(3) and popen(3) need to be tweaked to use the right shell. For the bootstrap glibc, we just use whatever `sh' can be found in $PATH. The final glibc instead uses the hard-coded absolute file name of `bash'. In addition, status should be initialized to 0 and not -1. diff --git a/libio/iopopen.c b/libio/iopopen.c index ebc381ed7c..e0d3ed1bc3 100644 --- a/libio/iopopen.c +++ b/libio/iopopen.c @@ -85,7 +85,7 @@ spawn_process (posix_spawn_file_actions_t *fa, FILE *fp, const char *command, return false; } - if (__posix_spawn (&((_IO_proc_file *) fp)->pid, _PATH_BSHELL, fa, 0, + if (__posix_spawnp (&((_IO_proc_file *) fp)->pid, "sh", fa, 0, (char *const[]){ (char*) "sh", (char*) "-c", (char *) command, NULL }, __environ) != 0) return false; diff --git a/sysdeps/posix/system.c b/sysdeps/posix/system.c index a03f478fc7..94da6facf3 100644 --- a/sysdeps/posix/system.c +++ b/sysdeps/posix/system.c @@ -101,7 +101,7 @@ cancel_handler (void *arg) static int do_system (const char *line) { - int status = -1; + int status = 0; int ret; pid_t pid; struct sigaction sa; @@ -145,7 +145,7 @@ do_system (const char *line) __posix_spawnattr_setflags (&spawn_attr, POSIX_SPAWN_SETSIGDEF | POSIX_SPAWN_SETSIGMASK); - ret = __posix_spawn (&pid, SHELL_PATH, 0, &spawn_attr, + ret = __posix_spawnp (&pid, SHELL_NAME, 0, &spawn_attr, (char *const[]){ (char *) SHELL_NAME, (char *) "-c", (char *) line, NULL }, --- a/include/spawn.h +++ b/include/spawn.h @@ -5,6 +5,9 @@ __typeof (posix_spawn) __posix_spawn; libc_hidden_proto (__posix_spawn) +__typeof (posix_spawnp) __posix_spawnp; +libc_hidden_proto (__posix_spawnp) + __typeof (posix_spawn_file_actions_addclose) __posix_spawn_file_actions_addclose attribute_hidden; --- a/posix/spawnp.c +++ b/posix/spawnp.c @@ -31,6 +31,7 @@ __posix_spawnp (pid_t *pid, const char *file, SPAWN_XFLAGS_USE_PATH); } versioned_symbol (libc, __posix_spawnp, posix_spawnp, GLIBC_2_15); +libc_hidden_def (__posix_spawnp) #if SHLIB_COMPAT (libc, GLIBC_2_2, GLIBC_2_15) root/gnu/packages/java-compression.scm
AgeCommit message (Expand)Author
2020-08-19gnu: java-snappy: Update to 1.1.7.5....* gnu/packages/java-compression.scm (java-snappy): Update to 1.1.7.5. Tobias Geerinckx-Rice
2020-07-17gnu: maven: Install from pom file....* gnu/packages/java.scm (java-plexus-container-default-bootstrap) (java-plexus-component-annotations, java-plexus-cipher, java-asm) (java-jsr250, java-commons-cli, java-slf4j-api, java-slf4j-simple) (java-bsh, java-jboss-el-api-spec, java-jboss-interceptors-api-spec) (java-cdi-api, java-eclipse-sisu-plexus): Install from pom file. * gnu/packages/maven.scm (maven-resolver-api, maven-resolver-spi) (maven-resolver-util, maven-resolver-connector-basic, maven-resolver-impl) (java-plexus-utils, maven-artifact, maven-model, maven-builder-support) (maven-settings, maven-settings-builder, maven-model-builder) (maven-repository-metadata, maven-resolver-provider, maven-plugin-api) (maven-core, maven-embedder, maven-compat): Install from pom file. Julien Lepiller
2020-07-17gnu: java-plexus-archiver: Update to 4.2.2....* gnu/packages/java.scm (java-plexus-archiver): Update to 4.2.2. (java-plexus-container-default, java-commons-compress) (java-geronimo-xbean-reflect): Install from pom file. (java-guava): Install from pom [source]: Use git source instead of generated source jar. * gnu/packages/java-compression.scm (java-xz, java-iq80-snappy): Install from pom. Julien Lepiller
2020-05-17gnu: java-xz: Remove duplicate definition....* gnu/packages/java.scm (java-xz): Remove duplicate variable. (java-plexus-archiver)[inputs]: Use java-xz. * gnu/packages/java-compression.scm (java-tukaani-xz): Rename to java-xz. Julien Lepiller
2020-03-13gnu: java-iq80-snappy: Don't use unstable tarball....* gnu/packages/java-compression.scm (java-iq80-snappy)[source]: Use GIT-FETCH and GIT-FILE-NAME. Tobias Geerinckx-Rice
2020-03-13gnu: java-snappy@1.0: Don't use unstable tarball....* gnu/packages/java-compression.scm (java-snappy-1)[name]: Restate. [source]: Use GIT-FETCH and GIT-FILE-NAME. Tobias Geerinckx-Rice
2020-03-12gnu: java-snappy: Don't use unstable tarball....* gnu/packages/java-compression.scm (java-snappy)[source]: Use GIT-FETCH and GIT-FILE-NAME. [arguments]: Add ‘make-git-checkout-writable’ phase. Tobias Geerinckx-Rice
2020-03-12gnu: java-snappy: Update to 1.1.7.3....* gnu/packages/java-compression.scm (java-snappy): Update to 1.1.7.3. Tobias Geerinckx-Rice