[gentoo-commits] proj/elfix:master commit in: misc/install-xattr/

[gentoo-commits] proj/elfix:master commit in: misc/install-xattr/

[Anthony G. Basile]

commit:     5540ed149f49361c35b57c1f06bb346b80263b3a
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 13 02:29:44 2014 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Mon Oct 13 02:29:44 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/elfix.git;a=commit;h=5540ed14

misc/install-xattr: fix whitespace in ChangeLog

---
 misc/install-xattr/ChangeLog | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/misc/install-xattr/ChangeLog b/misc/install-xattr/ChangeLog
index e998592..b8c947d 100644
--- a/misc/install-xattr/ChangeLog
+++ b/misc/install-xattr/ChangeLog
@@ -2,6 +2,7 @@ Okay we'll document changes here.  This is a small project, so we don't
 have to be very formal.  
 
 2014-10-12
+
 	* Release 0.4
 	* Correct a fork bomb.  See https://bugs.gentoo.org/show_bug.cgi?id=523994.
 
@@ -24,6 +25,7 @@ have to be very formal.
 	see https://bugs.gentoo.org/show_bug.cgi?id=465000.
 
 THANKS
+
 	* Mike Frysinger <vapier@gentoo.org> for your relentless attention.
 	* Greg Turner <gmturner007@ameritech.net> for testing and fixing bugs.
 	* Jason Zaman <jason@perfinion.com> for testing and fixing bugs.

[gentoo-commits] proj/elfix:master commit in: misc/install-xattr/

[Sam James]

commit:     5dd019205cba747802b98c5283b8accf0ff47eda
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 29 03:57:14 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jan 29 03:57:14 2023 +0000
URL:        https://gitweb.gentoo.org/proj/elfix.git/commit/?id=5dd01920

install-xattr: IWYU fixes

Signed-off-by: Sam James <sam <AT> gentoo.org>

 misc/install-xattr/install-xattr.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/misc/install-xattr/install-xattr.c b/misc/install-xattr/install-xattr.c
index 33b9fe1..1f53273 100644
--- a/misc/install-xattr/install-xattr.c
+++ b/misc/install-xattr/install-xattr.c
@@ -20,19 +20,19 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <ctype.h>
 #include <err.h>
 #include <fnmatch.h>
-#include <ctype.h>
 #include <getopt.h>
 #include <libgen.h>
-#include <unistd.h>
+#include <stdlib.h>
+#include <signal.h>
+#include <string.h>
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <sys/stat.h>
 #include <sys/xattr.h>
+#include <unistd.h>
 
 static char *
 xstrdup(const char *s)
@@ -301,7 +301,7 @@ main(int argc, char* argv[])
 	while (1) {
 		int option_index;
 		int c = getopt_long(argc, argv_copy, "dt:g:m:o:S:Zb", long_options, &option_index);
- 
+
 		if (c == -1)
 			break;
 

[gentoo-commits] proj/elfix:master commit in: misc/install-xattr/

[Sam James]

commit:     cbe23e2638435ddeced39979099fceb77fbb98fb
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 24 03:04:39 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jan 24 03:05:32 2023 +0000
URL:        https://gitweb.gentoo.org/proj/elfix.git/commit/?id=cbe23e26

install-xattr: minor test fixups

- Add set -x like we did for fix-gnustack (87ca5c5bbe63ea3c9227fdd4a01ccdc1ce723323)
  for easier debugging when something fails.

- Use Bash tests everywhere given we're already using Bash.

- Use portable Bash shebang.

- Fix shellcheck nits.

Signed-off-by: Sam James <sam <AT> gentoo.org>

 misc/install-xattr/checkcopyattrs.sh | 52 ++++++++++++++++++------------------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/misc/install-xattr/checkcopyattrs.sh b/misc/install-xattr/checkcopyattrs.sh
index a9149d7..9d5dc13 100755
--- a/misc/install-xattr/checkcopyattrs.sh
+++ b/misc/install-xattr/checkcopyattrs.sh
@@ -1,5 +1,5 @@
-#!/bin/bash
-set -e
+#!/usr/bin/env bash
+set -ex
 
 touch a b c
 mkdir -p d e h
@@ -13,41 +13,41 @@ setfattr -n user.pax.flags -v "r" c
 ./install-xattr b y
 ./install-xattr c z
 
-[ "$(getfattr --only-values -n user.foo x)" == "bar" ]
-[ "$(getfattr --only-values -n user.bas x)" == "x" ]
-[ "$(getfattr --only-values -n user.pax.flags x)" == "mr" ]
-[ "$(getfattr --only-values -n user.pax.flags y)" == "p" ]
-[ "$(getfattr --only-values -n user.pax.flags z)" == "r" ]
+[[ "$(getfattr --only-values -n user.foo x)" == "bar" ]]
+[[ "$(getfattr --only-values -n user.bas x)" == "x" ]]
+[[ "$(getfattr --only-values -n user.pax.flags x)" == "mr" ]]
+[[ "$(getfattr --only-values -n user.pax.flags y)" == "p" ]]
+[[ "$(getfattr --only-values -n user.pax.flags z)" == "r" ]]
 
 ./install-xattr a b c d
 
-[ "$(getfattr --only-values -n user.foo d/a)" == "bar" ]
-[ "$(getfattr --only-values -n user.bas d/a)" == "x" ]
-[ "$(getfattr --only-values -n user.pax.flags d/a)" == "mr" ]
-[ "$(getfattr --only-values -n user.pax.flags d/b)" == "p" ]
-[ "$(getfattr --only-values -n user.pax.flags d/c)" == "r" ]
+[[ "$(getfattr --only-values -n user.foo d/a)" == "bar" ]]
+[[ "$(getfattr --only-values -n user.bas d/a)" == "x" ]]
+[[ "$(getfattr --only-values -n user.pax.flags d/a)" == "mr" ]]
+[[ "$(getfattr --only-values -n user.pax.flags d/b)" == "p" ]]
+[[ "$(getfattr --only-values -n user.pax.flags d/c)" == "r" ]]
 
 # This tests if the src file was inside a directory
 # the correct dst location should be f/a. NOT f/d/a.
 ./install-xattr d/a h
 
-[ -x h/a ]
-[ ! -x h/d/a ]
-[ "$(getfattr --only-values -n user.foo h/a)" == "bar" ]
-[ "$(getfattr --only-values -n user.bas h/a)" == "x" ]
+[[ -x h/a ]]
+[[ ! -x h/d/a ]]
+[[ "$(getfattr --only-values -n user.foo h/a)" == "bar" ]]
+[[ "$(getfattr --only-values -n user.bas h/a)" == "x" ]]
 
 ./install-xattr -t e a b c
 
-[ "$(getfattr --only-values -n user.foo e/a)" == "bar" ]
-[ "$(getfattr --only-values -n user.bas e/a)" == "x" ]
-[ "$(getfattr --only-values -n user.pax.flags e/a)" == "mr" ]
-[ "$(getfattr --only-values -n user.pax.flags e/b)" == "p" ]
-[ "$(getfattr --only-values -n user.pax.flags e/c)" == "r" ]
+[[ "$(getfattr --only-values -n user.foo e/a)" == "bar" ]]
+[[ "$(getfattr --only-values -n user.bas e/a)" == "x" ]]
+[[ "$(getfattr --only-values -n user.pax.flags e/a)" == "mr" ]]
+[[ "$(getfattr --only-values -n user.pax.flags e/b)" == "p" ]]
+[[ "$(getfattr --only-values -n user.pax.flags e/c)" == "r" ]]
 
 ./install-xattr a -D f/a
-[ "$(getfattr --only-values -n user.foo f/a)" == "bar" ]
-[ "$(getfattr --only-values -n user.bas f/a)" == "x" ]
-[ "$(getfattr --only-values -n user.pax.flags f/a)" == "mr" ]
+[[ "$(getfattr --only-values -n user.foo f/a)" == "bar" ]]
+[[ "$(getfattr --only-values -n user.bas f/a)" == "x" ]]
+[[ "$(getfattr --only-values -n user.pax.flags f/a)" == "mr" ]]
 
 # Check that we can copy large files
 truncate -s2G a
@@ -68,8 +68,8 @@ truncate -s2G a
 ./install-xattr -p a backup-a
 ./install-xattr -d g/g/g
 
-./install-xattr -o $(id -u) a mode-a
-./install-xattr -g $(id -g) a mode-a
+./install-xattr -o "$(id -u)" a mode-a
+./install-xattr -g "$(id -g)" a mode-a
 ./install-xattr -m 666 a mode-a
 
 # Let's abuse ourselves

[gentoo-commits] proj/elfix:master commit in: misc/install-xattr/

[Sam James]

commit:     09f9b61bdfa488d78bdba4562eb208bd1f062eaf
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 24 02:45:11 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jan 24 03:03:23 2023 +0000
URL:        https://gitweb.gentoo.org/proj/elfix.git/commit/?id=09f9b61b

install-xattr: fix chdir arg when OLDPWD is nulL

Fix core.NonNullParamChecker with chdir().

Clang's scan-build says:
```
install-xattr.c:331:9: warning: Null pointer passed to 1st parameter expecting 'nonnull' [core.NonNullParamChecker]
    if (chdir(oldpwd) != 0)
        ^~~~~~~~~~~~~
```

It's right - oldpwd could easily have been null:
```
$ env -u OLDPWD __PORTAGE_HELPER_PATH=foo ./install-xattr --version
```

Signed-off-by: Sam James <sam <AT> gentoo.org>

 misc/install-xattr/install-xattr.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/misc/install-xattr/install-xattr.c b/misc/install-xattr/install-xattr.c
index 2966af4..33b9fe1 100644
--- a/misc/install-xattr/install-xattr.c
+++ b/misc/install-xattr/install-xattr.c
@@ -345,7 +345,7 @@ main(int argc, char* argv[])
 	char *portage_helper_path = getenv("__PORTAGE_HELPER_PATH");
 	char *portage_helper_canpath = NULL;
 	if (portage_helper_path)
-		if (chdir(oldpwd) != 0)
+		if (!oldpwd || chdir(oldpwd) != 0)
 			err(1, "failed to chdir %s", oldpwd);
 
 	switch (fork()) {

[gentoo-commits] proj/elfix:master commit in: misc/install-xattr/

[Sam James]

commit:     844b96fc02e9edcf57ab493ae7da286daaa1c8cd
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 11 06:53:26 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jan 11 06:53:32 2023 +0000
URL:        https://gitweb.gentoo.org/proj/elfix.git/commit/?id=844b96fc

install-xattr: update copyright year, fix typo

Signed-off-by: Sam James <sam <AT> gentoo.org>

 misc/install-xattr/install-xattr.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/misc/install-xattr/install-xattr.c b/misc/install-xattr/install-xattr.c
index 23b6af3..2966af4 100644
--- a/misc/install-xattr/install-xattr.c
+++ b/misc/install-xattr/install-xattr.c
@@ -1,7 +1,7 @@
-/* Copyright 2014 Gentoo Foundation
+/* Copyright 2014-2023 Gentoo Foundation
  * Distributed under the terms of the GNU General Public License v2
  *
- * Wrapper for coreutil's install to preserve extended attributes.
+ * Wrapper for coreutils install to preserve extended attributes.
  *
  * Copyright 2014 Anthony G. Basile - <blueness@gentoo.org>
  * Copyright 2014 Mike Frysinger    - <vapier@gentoo.org>

[gentoo-commits] proj/elfix:master commit in: misc/install-xattr/

[Sam James]

commit:     776afeae92d2afd3340cd753abc58ccd8daba48f
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jan  6 06:39:30 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jan 10 05:21:39 2023 +0000
URL:        https://gitweb.gentoo.org/proj/elfix.git/commit/?id=776afeae

install-xattr: fix small memory leak

There's another with strdup/malloc but it gets a bit messier
to fix so let's leave that for now (this is mostly about correctness
anyway, as the runtime of install-xattr is very small):
```
Direct leak of 4097 byte(s) in 1 object(s) allocated from:
    #0 0x7f4a2c22e257 in __interceptor_malloc /usr/src/debug/sys-devel/gcc-13.0.0_pre20230101/gcc-13-20230101/libsanitizer/asan/asan_malloc_linux.cpp:69
    #1 0x7f4a2c1d2b40 in __interceptor_realpath /usr/src/debug/sys-devel/gcc-13.0.0_pre20230101/gcc-13-20230101/libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc:3904
    #2 0x55da3adf5629 in realpath /usr/include/bits/stdlib.h:42
    #3 0x55da3adf5629 in main /home/sam/git/elfix/misc/install-xattr/install-xattr.c:252
```

Signed-off-by: Sam James <sam <AT> gentoo.org>

 misc/install-xattr/install-xattr.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/misc/install-xattr/install-xattr.c b/misc/install-xattr/install-xattr.c
index db6dabd..23b6af3 100644
--- a/misc/install-xattr/install-xattr.c
+++ b/misc/install-xattr/install-xattr.c
@@ -248,7 +248,6 @@ main(int argc, char* argv[])
 	char *target = NULL;           /* the target file or directory                                 */
 	char *path;                    /* path to the target file                                      */
 
-	char *mypath = realpath("/proc/self/exe", NULL); /* path to argv[0]                            */
 	char *install;                                   /* path to the system install                 */
 
 	struct stat s;                 /* test if a file is a regular file or a directory              */
@@ -353,7 +352,9 @@ main(int argc, char* argv[])
 		case -1:
 			err(1, "fork() failed");
 
-		case 0:
+		case 0: {
+			char *mypath = realpath("/proc/self/exe", NULL); /* path to argv[0] */
+
 			/* find system install avoiding mypath and portage_helper_path! */
 			if (portage_helper_path)
 				portage_helper_canpath = realpath(portage_helper_path, NULL);
@@ -363,6 +364,7 @@ main(int argc, char* argv[])
 			argv[0] = install;        /* so coreutils' lib/program.c behaves  */
 			execv(install, argv);     /* The kernel will free(install).       */
 			err(1, "execv() failed");
+		}
 
 		default:
 			wait(&status);

[gentoo-commits] proj/elfix:master commit in: misc/install-xattr/

[Sam James]

commit:     2a0dffbf0080dc74f82910a74f051d835cfd653f
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jan  6 03:06:50 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jan 10 05:21:39 2023 +0000
URL:        https://gitweb.gentoo.org/proj/elfix.git/commit/?id=2a0dffbf

install-xattr: avoid accessing empty storage

UBSAN reports:
```
install-xattr.c:124:16: runtime error: load of address 0x55555556d440 with insufficient space for an object of type 'char'
0x55555556d440: note: pointer points here
 00 00 00 00  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  61 00 00 00
              ^
    #0 0x555555557a27 in copyxattr /home/sam/git/elfix/misc/install-xattr/install-xattr.c:124
    #1 0x555555556a4d in main /home/sam/git/elfix/misc/install-xattr/install-xattr.c:410
    #2 0x7ffff77c864f  (/usr/lib64/libc.so.6+0x2364f)
    #3 0x7ffff77c8708 in __libc_start_main (/usr/lib64/libc.so.6+0x23708)
    #4 0x555555557114 in _start (/home/sam/git/elfix/misc/install-xattr/install-xattr+0x3114)
```

Triggered with:
```
mkdir /tmp/a
touch /tmp/foo
./install-xattr -c /tmp/foo /tmp/foo2 /tmp/a
```

I don't see this with Clang or < GCC 12, but I do with GCC 13 (13.0.0_pre20230101 p5);
I suspect it's because of object-size improvements.

Signed-off-by: Sam James <sam <AT> gentoo.org>

 misc/install-xattr/install-xattr.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/misc/install-xattr/install-xattr.c b/misc/install-xattr/install-xattr.c
index 66530f9..db6dabd 100644
--- a/misc/install-xattr/install-xattr.c
+++ b/misc/install-xattr/install-xattr.c
@@ -119,6 +119,10 @@ copyxattr(const char *source, const char *target)
 	lxattr = xmalloc(lsize);
 	xlistxattr(source, lxattr, lsize);
 
+	/* There's no xattrs at all. */
+	if (lsize == 0)
+		return;
+
 	i = 0;
 	while (1) {
 		while (lxattr[i++] == 0)

[gentoo-commits] proj/elfix:master commit in: misc/install-xattr/

[Anthony G. Basile]

commit:     2786e5e5c7a2f4a9ae2bf05322fa40cbb58afea0
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 10 00:52:31 2019 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sun Nov 10 00:58:26 2019 +0000
URL:        https://gitweb.gentoo.org/proj/elfix.git/commit/?id=2786e5e5

install-xattr: fix mangling of parameter order by getopt_long()

See: https://bugs.gentoo.org/699550

Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>

 misc/install-xattr/install-xattr.c | 53 +++++++++++++++++++++++---------------
 1 file changed, 32 insertions(+), 21 deletions(-)

diff --git a/misc/install-xattr/install-xattr.c b/misc/install-xattr/install-xattr.c
index 1c39e69..66530f9 100644
--- a/misc/install-xattr/install-xattr.c
+++ b/misc/install-xattr/install-xattr.c
@@ -234,6 +234,8 @@ main(int argc, char* argv[])
 	int i;
 	int status;                    /* exit status of child "install" process                       */
 
+	char** argv_copy;              /* copy argv to avoid mangling by getopt_long()                 */
+
 	int opts_directory = 0;        /* if -d was given, then all arguments are directories          */
 	int opts_target_directory = 0; /* if -t was given, then we're installing to a target directory */
 	int target_is_directory = 0;   /* is the target a directory?                                   */
@@ -270,23 +272,32 @@ main(int argc, char* argv[])
 
 	opterr = 0; /* we skip many legitimate flags, so silence any warning */
 
-	while (1) {
-		static struct option long_options[] = {
-			{           "directory",       no_argument, 0, 'd'},
-			{    "target-directory", required_argument, 0, 't'},
-			{               "group", required_argument, 0, 'g'},
-			{                "mode", required_argument, 0, 'm'},
-			{               "owner", required_argument, 0, 'o'},
-			{              "suffix", required_argument, 0, 'S'},
-			{             "context", optional_argument, 0, 'Z'},
-			{              "backup", optional_argument, 0, 'b'},
-			{                "help",       no_argument, 0,  0 },
-			{                     0,                 0, 0,  0 }
-		};
+	static struct option long_options[] = {
+		{           "directory",       no_argument, 0, 'd'},
+		{    "target-directory", required_argument, 0, 't'},
+		{               "group", required_argument, 0, 'g'},
+		{                "mode", required_argument, 0, 'm'},
+		{               "owner", required_argument, 0, 'o'},
+		{              "suffix", required_argument, 0, 'S'},
+		{             "context", optional_argument, 0, 'Z'},
+		{              "backup", optional_argument, 0, 'b'},
+		{                "help",       no_argument, 0,  0 },
+		{                     0,                 0, 0,  0 }
+	};
+
+	/* We copy argv[] because getopts_long() mangles the order of the arguments.
+	 * We pass the original argv[] to install in the fork() while we use
+	 * argv_copy[] for the copying of the xattrs since optind assumes a reorder
+	 * parameter list.
+	 */
+	argv_copy = (char **)malloc(argc*sizeof(char *));
 
-		int option_index;
-		int c = getopt_long(argc, argv, "dt:g:m:o:S:Zb", long_options, &option_index);
+	for (i = 0; i < argc; i++)
+		argv_copy[i] = strdup(argv[i]);
 
+	while (1) {
+		int option_index;
+		int c = getopt_long(argc, argv_copy, "dt:g:m:o:S:Zb", long_options, &option_index);
  
 		if (c == -1)
 			break;
@@ -365,7 +376,7 @@ main(int argc, char* argv[])
 				goto done;
 
 			if (!opts_target_directory) {
-				target = argv[last];
+				target = argv_copy[last];
 				if (stat(target, &s) != 0) {
 					err(1, "failed to stat %s", target);
 					return EXIT_FAILURE;
@@ -384,8 +395,8 @@ main(int argc, char* argv[])
 					last++;
 
 				for (i = first; i < last; i++) {
-					if (stat(argv[i], &s) != 0) {
-						err(1, "failed to stat %s", argv[i]);
+					if (stat(argv_copy[i], &s) != 0) {
+						err(1, "failed to stat %s", argv_copy[i]);
 						return EXIT_FAILURE;
 					}
 					/* We reproduce install's behavior and skip
@@ -395,12 +406,12 @@ main(int argc, char* argv[])
 					if (S_ISDIR(s.st_mode))
 						continue;
 
-					path = path_join(target, basename(argv[i]));
-					copyxattr(argv[i], path);
+					path = path_join(target, basename(argv_copy[i]));
+					copyxattr(argv_copy[i], path);
 					free(path);
 				}
 			} else
-				copyxattr(argv[first], target);
+				copyxattr(argv_copy[first], target);
 
 
  done:

[gentoo-commits] proj/elfix:master commit in: misc/install-xattr/

[Anthony G. Basile]

commit:     4806e70b0659cae50e13435bf167999380e109f9
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 10 00:52:31 2019 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sun Nov 10 00:54:43 2019 +0000
URL:        https://gitweb.gentoo.org/proj/elfix.git/commit/?id=4806e70b

install-xattr: fix mangling of byte order

See: https://bugs.gentoo.org/699550

Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>

 misc/install-xattr/install-xattr.c | 53 +++++++++++++++++++++++---------------
 1 file changed, 32 insertions(+), 21 deletions(-)

diff --git a/misc/install-xattr/install-xattr.c b/misc/install-xattr/install-xattr.c
index 1c39e69..66530f9 100644
--- a/misc/install-xattr/install-xattr.c
+++ b/misc/install-xattr/install-xattr.c
@@ -234,6 +234,8 @@ main(int argc, char* argv[])
 	int i;
 	int status;                    /* exit status of child "install" process                       */
 
+	char** argv_copy;              /* copy argv to avoid mangling by getopt_long()                 */
+
 	int opts_directory = 0;        /* if -d was given, then all arguments are directories          */
 	int opts_target_directory = 0; /* if -t was given, then we're installing to a target directory */
 	int target_is_directory = 0;   /* is the target a directory?                                   */
@@ -270,23 +272,32 @@ main(int argc, char* argv[])
 
 	opterr = 0; /* we skip many legitimate flags, so silence any warning */
 
-	while (1) {
-		static struct option long_options[] = {
-			{           "directory",       no_argument, 0, 'd'},
-			{    "target-directory", required_argument, 0, 't'},
-			{               "group", required_argument, 0, 'g'},
-			{                "mode", required_argument, 0, 'm'},
-			{               "owner", required_argument, 0, 'o'},
-			{              "suffix", required_argument, 0, 'S'},
-			{             "context", optional_argument, 0, 'Z'},
-			{              "backup", optional_argument, 0, 'b'},
-			{                "help",       no_argument, 0,  0 },
-			{                     0,                 0, 0,  0 }
-		};
+	static struct option long_options[] = {
+		{           "directory",       no_argument, 0, 'd'},
+		{    "target-directory", required_argument, 0, 't'},
+		{               "group", required_argument, 0, 'g'},
+		{                "mode", required_argument, 0, 'm'},
+		{               "owner", required_argument, 0, 'o'},
+		{              "suffix", required_argument, 0, 'S'},
+		{             "context", optional_argument, 0, 'Z'},
+		{              "backup", optional_argument, 0, 'b'},
+		{                "help",       no_argument, 0,  0 },
+		{                     0,                 0, 0,  0 }
+	};
+
+	/* We copy argv[] because getopts_long() mangles the order of the arguments.
+	 * We pass the original argv[] to install in the fork() while we use
+	 * argv_copy[] for the copying of the xattrs since optind assumes a reorder
+	 * parameter list.
+	 */
+	argv_copy = (char **)malloc(argc*sizeof(char *));
 
-		int option_index;
-		int c = getopt_long(argc, argv, "dt:g:m:o:S:Zb", long_options, &option_index);
+	for (i = 0; i < argc; i++)
+		argv_copy[i] = strdup(argv[i]);
 
+	while (1) {
+		int option_index;
+		int c = getopt_long(argc, argv_copy, "dt:g:m:o:S:Zb", long_options, &option_index);
  
 		if (c == -1)
 			break;
@@ -365,7 +376,7 @@ main(int argc, char* argv[])
 				goto done;
 
 			if (!opts_target_directory) {
-				target = argv[last];
+				target = argv_copy[last];
 				if (stat(target, &s) != 0) {
 					err(1, "failed to stat %s", target);
 					return EXIT_FAILURE;
@@ -384,8 +395,8 @@ main(int argc, char* argv[])
 					last++;
 
 				for (i = first; i < last; i++) {
-					if (stat(argv[i], &s) != 0) {
-						err(1, "failed to stat %s", argv[i]);
+					if (stat(argv_copy[i], &s) != 0) {
+						err(1, "failed to stat %s", argv_copy[i]);
 						return EXIT_FAILURE;
 					}
 					/* We reproduce install's behavior and skip
@@ -395,12 +406,12 @@ main(int argc, char* argv[])
 					if (S_ISDIR(s.st_mode))
 						continue;
 
-					path = path_join(target, basename(argv[i]));
-					copyxattr(argv[i], path);
+					path = path_join(target, basename(argv_copy[i]));
+					copyxattr(argv_copy[i], path);
 					free(path);
 				}
 			} else
-				copyxattr(argv[first], target);
+				copyxattr(argv_copy[first], target);
 
 
  done:

[gentoo-commits] proj/elfix:master commit in: misc/install-xattr/

[Anthony G. Basile]

commit:     2e6303d7f1cac6d8eceb64fd3bc747b61e5f5f84
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 10 00:52:01 2019 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sun Nov 10 00:54:36 2019 +0000
URL:        https://gitweb.gentoo.org/proj/elfix.git/commit/?id=2e6303d7

install-xattr: -Z and -b flags do not accept arguments

Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>

 misc/install-xattr/install-xattr.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/misc/install-xattr/install-xattr.c b/misc/install-xattr/install-xattr.c
index 5c8a978..1c39e69 100644
--- a/misc/install-xattr/install-xattr.c
+++ b/misc/install-xattr/install-xattr.c
@@ -285,7 +285,7 @@ main(int argc, char* argv[])
 		};
 
 		int option_index;
-		int c = getopt_long(argc, argv, "dt:g:m:o:S:Z:", long_options, &option_index);
+		int c = getopt_long(argc, argv, "dt:g:m:o:S:Zb", long_options, &option_index);
 
  
 		if (c == -1)

[gentoo-commits] proj/elfix:master commit in: misc/install-xattr/

[Anthony G. Basile]

commit:     1715286f9665488334e6c7e5154523648f383d61
Author:     Raimonds Cicans <ray <AT> apollo <DOT> lv>
AuthorDate: Sat Nov  9 18:16:11 2019 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sat Nov  9 18:23:50 2019 +0000
URL:        https://gitweb.gentoo.org/proj/elfix.git/commit/?id=1715286f

install-xattr: correct -Z flag, bug #699550

Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>

 misc/install-xattr/install-xattr.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/misc/install-xattr/install-xattr.c b/misc/install-xattr/install-xattr.c
index 5c8a978..ab3d041 100644
--- a/misc/install-xattr/install-xattr.c
+++ b/misc/install-xattr/install-xattr.c
@@ -278,14 +278,14 @@ main(int argc, char* argv[])
 			{                "mode", required_argument, 0, 'm'},
 			{               "owner", required_argument, 0, 'o'},
 			{              "suffix", required_argument, 0, 'S'},
-			{             "context", optional_argument, 0, 'Z'},
+			{             "context", optional_argument, 0,  0 },
 			{              "backup", optional_argument, 0, 'b'},
 			{                "help",       no_argument, 0,  0 },
 			{                     0,                 0, 0,  0 }
 		};
 
 		int option_index;
-		int c = getopt_long(argc, argv, "dt:g:m:o:S:Z:", long_options, &option_index);
+		int c = getopt_long(argc, argv, "dt:g:m:o:S:Z", long_options, &option_index);
 
  
 		if (c == -1)

[gentoo-commits] proj/elfix:master commit in: misc/install-xattr/

[Anthony G. Basile]

commit:     0439f0adc98cc088e997e92f4d4a335bd4d8dcbc
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sat Nov  9 18:19:31 2019 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sat Nov  9 18:23:57 2019 +0000
URL:        https://gitweb.gentoo.org/proj/elfix.git/commit/?id=0439f0ad

install-xattr: correct -b flag

Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>

 misc/install-xattr/install-xattr.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/misc/install-xattr/install-xattr.c b/misc/install-xattr/install-xattr.c
index ab3d041..cc52b2c 100644
--- a/misc/install-xattr/install-xattr.c
+++ b/misc/install-xattr/install-xattr.c
@@ -279,13 +279,13 @@ main(int argc, char* argv[])
 			{               "owner", required_argument, 0, 'o'},
 			{              "suffix", required_argument, 0, 'S'},
 			{             "context", optional_argument, 0,  0 },
-			{              "backup", optional_argument, 0, 'b'},
+			{              "backup", optional_argument, 0,  0 },
 			{                "help",       no_argument, 0,  0 },
 			{                     0,                 0, 0,  0 }
 		};
 
 		int option_index;
-		int c = getopt_long(argc, argv, "dt:g:m:o:S:Z", long_options, &option_index);
+		int c = getopt_long(argc, argv, "dt:g:m:o:S:Zb", long_options, &option_index);
 
  
 		if (c == -1)

[gentoo-commits] proj/elfix:master commit in: misc/install-xattr/

[Anthony G. Basile]

commit:     920955039276dba6059cd281b1f0c17c8218c60e
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 14 18:39:44 2019 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sun Apr 14 18:40:01 2019 +0000
URL:        https://gitweb.gentoo.org/proj/elfix.git/commit/?id=92095503

install-xattr: address compiler warnings, bug #682110

Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>

 misc/install-xattr/install-xattr.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/misc/install-xattr/install-xattr.c b/misc/install-xattr/install-xattr.c
index 3e20b63..5c8a978 100644
--- a/misc/install-xattr/install-xattr.c
+++ b/misc/install-xattr/install-xattr.c
@@ -239,7 +239,7 @@ main(int argc, char* argv[])
 	int target_is_directory = 0;   /* is the target a directory?                                   */
 
 	int first, last;               /* argv indices of the first file/directory and last            */
-	char *target;                  /* the target file or directory                                 */
+	char *target = NULL;           /* the target file or directory                                 */
 	char *path;                    /* path to the target file                                      */
 
 	char *mypath = realpath("/proc/self/exe", NULL); /* path to argv[0]                            */
@@ -331,7 +331,8 @@ main(int argc, char* argv[])
 	char *portage_helper_path = getenv("__PORTAGE_HELPER_PATH");
 	char *portage_helper_canpath = NULL;
 	if (portage_helper_path)
-		chdir(oldpwd);
+		if (chdir(oldpwd) != 0)
+			err(1, "failed to chdir %s", oldpwd);
 
 	switch (fork()) {
 		case -1:

[gentoo-commits] proj/elfix:master commit in: misc/install-xattr/

[Anthony G. Basile]

commit:     dac123cefa79db06f25b64f8f863b85aa2456342
Author:     Nick Bowler <nbowler <AT> draconx <DOT> ca>
AuthorDate: Sat Mar 30 10:10:31 2019 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sat Mar 30 10:11:55 2019 +0000
URL:        https://gitweb.gentoo.org/proj/elfix.git/commit/?id=dac123ce

install-xattr: report any errors by "stat"

Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>

 misc/install-xattr/checkcopyattrs.sh | 3 +++
 misc/install-xattr/install-xattr.c   | 8 ++++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/misc/install-xattr/checkcopyattrs.sh b/misc/install-xattr/checkcopyattrs.sh
index 9196795..a9149d7 100755
--- a/misc/install-xattr/checkcopyattrs.sh
+++ b/misc/install-xattr/checkcopyattrs.sh
@@ -49,6 +49,9 @@ setfattr -n user.pax.flags -v "r" c
 [ "$(getfattr --only-values -n user.bas f/a)" == "x" ]
 [ "$(getfattr --only-values -n user.pax.flags f/a)" == "mr" ]
 
+# Check that we can copy large files
+truncate -s2G a
+./install-xattr a x
 
 # The following are just tests to make sure the raw install
 # options don't get lost in our optargs parsing.

diff --git a/misc/install-xattr/install-xattr.c b/misc/install-xattr/install-xattr.c
index 0b5eb25..3e20b63 100644
--- a/misc/install-xattr/install-xattr.c
+++ b/misc/install-xattr/install-xattr.c
@@ -365,8 +365,10 @@ main(int argc, char* argv[])
 
 			if (!opts_target_directory) {
 				target = argv[last];
-				if (stat(target, &s) != 0)
+				if (stat(target, &s) != 0) {
+					err(1, "failed to stat %s", target);
 					return EXIT_FAILURE;
+				}
 				target_is_directory = S_ISDIR(s.st_mode);
 			} else {
 				/* target was set above with the -t option */
@@ -381,8 +383,10 @@ main(int argc, char* argv[])
 					last++;
 
 				for (i = first; i < last; i++) {
-					if (stat(argv[i], &s) != 0)
+					if (stat(argv[i], &s) != 0) {
+						err(1, "failed to stat %s", argv[i]);
 						return EXIT_FAILURE;
+					}
 					/* We reproduce install's behavior and skip
 					 * all extra directories on the command line
 					 * that are not the final target directory.

[gentoo-commits] proj/elfix:master commit in: misc/install-xattr/

[Anthony G. Basile]

commit:     21244127487826a78472c7699a9dbdbc8db52ac0
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Mon Jun  8 13:07:22 2015 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Mon Jun  8 13:07:22 2015 +0000
URL:        https://gitweb.gentoo.org/proj/elfix.git/commit/?id=21244127

misc/install-xattr: update ChangeLog

 misc/install-xattr/ChangeLog | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/misc/install-xattr/ChangeLog b/misc/install-xattr/ChangeLog
index b8c947d..1d25ca5 100644
--- a/misc/install-xattr/ChangeLog
+++ b/misc/install-xattr/ChangeLog
@@ -1,6 +1,12 @@
 Okay we'll document changes here.  This is a small project, so we don't
 have to be very formal.  
 
+2015-06-08
+
+	* Release 0.5
+	* Correct whitespace in PORTAGE_XATTR_EXCLUDE.
+	https://bugs.gentoo.org/show_bug.cgi?id=550654.
+
 2014-10-12
 
 	* Release 0.4

[gentoo-commits] proj/elfix:master commit in: misc/install-xattr/

[Anthony G. Basile]

commit:     d4b136d91ba101673e79836229f3155f502eb056
Author:     Jason Zaman <jason <AT> perfinion <DOT> com>
AuthorDate: Thu May 28 14:31:00 2015 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Fri May 29 11:31:46 2015 +0000
URL:        https://gitweb.gentoo.org/proj/elfix.git/commit/?id=d4b136d9

misc/install-xattr: ignore all whitespace in PORTAGE_XATTR_EXCLUDE

if the PORTAGE_XATTR_EXCLUDE variable contains whitespace other
than just ' ', the matching fails to exclude what comes after it.

This replaces all whitespace instead of only just space.

Signed-off-by: Jason Zaman <perfinion <AT> gentoo.org>

 misc/install-xattr/install-xattr.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/misc/install-xattr/install-xattr.c b/misc/install-xattr/install-xattr.c
index b650c67..0b5eb25 100644
--- a/misc/install-xattr/install-xattr.c
+++ b/misc/install-xattr/install-xattr.c
@@ -261,8 +261,12 @@ main(int argc, char* argv[])
 	 * strings.  Also, no need to free(exclude) before we exit().
 	 */
 	char *p = exclude;
-	while ((p = strchr(p, ' ')))
-		*p++ = '\0';
+	char *pend = p + len_exclude;
+	while (p != pend) {
+		if (isspace(*p))
+			*p = '\0';
+		p++;
+	}
 
 	opterr = 0; /* we skip many legitimate flags, so silence any warning */
 

[gentoo-commits] proj/elfix:master commit in: misc/install-xattr/

[Anthony G. Basile]

commit:     5a4029395a17ec9875df3d28efbde0ef0b82868c
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sun Nov  2 21:47:25 2014 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sun Nov  2 21:47:45 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/elfix.git;a=commit;h=5a402939

misc/install-xattr: add btrfs.* to excluded xattrs

X-Gentoo-Bug: 527636
X-Gentoo-Bug-URL: https://bugs.gentoo.org/527636

---
 misc/install-xattr/install-xattr.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/misc/install-xattr/install-xattr.c b/misc/install-xattr/install-xattr.c
index 2f349df..b650c67 100644
--- a/misc/install-xattr/install-xattr.c
+++ b/misc/install-xattr/install-xattr.c
@@ -251,7 +251,7 @@ main(int argc, char* argv[])
 
 	portage_xattr_exclude = getenv("PORTAGE_XATTR_EXCLUDE");
 	if (portage_xattr_exclude == NULL)
-		exclude = xstrdup("security.* trusted.* system.nfs4_acl");
+		exclude = xstrdup("btrfs.* security.* trusted.* system.nfs4_acl");
 	else
 		exclude = xstrdup(portage_xattr_exclude);
 

[gentoo-commits] proj/elfix:master commit in: misc/install-xattr/

[Anthony G. Basile]

commit:     1fe072a94e105b9132f9d65cea8a3439249855a4
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 13 02:21:16 2014 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Mon Oct 13 02:21:16 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/elfix.git;a=commit;h=1fe072a9

misc/install-xattr: update ChangeLog

---
 misc/install-xattr/ChangeLog | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/misc/install-xattr/ChangeLog b/misc/install-xattr/ChangeLog
index 91b31c9..e998592 100644
--- a/misc/install-xattr/ChangeLog
+++ b/misc/install-xattr/ChangeLog
@@ -1,6 +1,10 @@
 Okay we'll document changes here.  This is a small project, so we don't
 have to be very formal.  
 
+2014-10-12
+	* Release 0.4
+	* Correct a fork bomb.  See https://bugs.gentoo.org/show_bug.cgi?id=523994.
+
 2014-07-21
 
 	* Release 0.3
@@ -23,3 +27,4 @@ THANKS
 	* Mike Frysinger <vapier@gentoo.org> for your relentless attention.
 	* Greg Turner <gmturner007@ameritech.net> for testing and fixing bugs.
 	* Jason Zaman <jason@perfinion.com> for testing and fixing bugs.
+	* Zac Medico <zmedico@gentoo.org> for fixing a fork bomb.

[gentoo-commits] proj/elfix:master commit in: misc/install-xattr/

[Anthony G. Basile]

commit:     24d22f45656fb88c63763ca319a2275b8f642d9e
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Thu Oct  9 02:38:51 2014 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Thu Oct  9 02:38:51 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/elfix.git;a=commit;h=24d22f45

misc/install-xattr: correct potential fork bomb

The which() function compares portage_helper_path, to canpath
and skips it when appropriate:

	if (portage_helper_path)
		if (!strcmp(portage_helper_path, canpath))
			goto skip;

However, portage_helper_path has not been canonicalized with
the realpath function, so strcmp can return false even though
the paths are equivalent.  This may occurs when /usr/lib is a
symlink to /usr/lib64.

X-Gentoo-Bug: 523994
X-Gentoo-Bug-URL: https://bugs.gentoo.org/523994

---
 misc/install-xattr/install-xattr.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/misc/install-xattr/install-xattr.c b/misc/install-xattr/install-xattr.c
index 805c0a4..2f349df 100644
--- a/misc/install-xattr/install-xattr.c
+++ b/misc/install-xattr/install-xattr.c
@@ -325,6 +325,7 @@ main(int argc, char* argv[])
 	 */
 	char *oldpwd = getenv("OLDPWD");
 	char *portage_helper_path = getenv("__PORTAGE_HELPER_PATH");
+	char *portage_helper_canpath = NULL;
 	if (portage_helper_path)
 		chdir(oldpwd);
 
@@ -334,8 +335,11 @@ main(int argc, char* argv[])
 
 		case 0:
 			/* find system install avoiding mypath and portage_helper_path! */
-			install = which(mypath, portage_helper_path);
+			if (portage_helper_path)
+				portage_helper_canpath = realpath(portage_helper_path, NULL);
+			install = which(mypath, portage_helper_canpath);
 			free(mypath);
+			free(portage_helper_canpath);
 			argv[0] = install;        /* so coreutils' lib/program.c behaves  */
 			execv(install, argv);     /* The kernel will free(install).       */
 			err(1, "execv() failed");

[gentoo-commits] proj/elfix:master commit in: misc/install-xattr/

[Anthony G. Basile]

commit:     d8932d7ee8fd1a3bd00af100717546f39e271f05
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 21 21:06:13 2014 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Mon Jul 21 21:26:31 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/elfix.git;a=commit;h=d8932d7e

misc/install-xattr/ChangeLog: updated

---
 misc/install-xattr/ChangeLog | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/misc/install-xattr/ChangeLog b/misc/install-xattr/ChangeLog
index 13752a3..91b31c9 100644
--- a/misc/install-xattr/ChangeLog
+++ b/misc/install-xattr/ChangeLog
@@ -1,6 +1,19 @@
 Okay we'll document changes here.  This is a small project, so we don't
 have to be very formal.  
 
+2014-07-21
+
+	* Release 0.3
+	* Correctly determine dst path if src is in a dir.
+	* Exclude trusted.* extended attribute namespace.
+
+2014-06-15
+
+	* Release 0.2
+	* Correct the behavior of install-xattr for when it is executed in a portage
+	environment.  We must chdir to OLDPWD rather than using PWD else we wind up
+	installing into /usr/lib/portage.
+
 2014-02-13
 
 	* Release version 0.1.  For discussion leading up to this release,
@@ -9,3 +22,4 @@ have to be very formal.
 THANKS
 	* Mike Frysinger <vapier@gentoo.org> for your relentless attention.
 	* Greg Turner <gmturner007@ameritech.net> for testing and fixing bugs.
+	* Jason Zaman <jason@perfinion.com> for testing and fixing bugs.

[gentoo-commits] proj/elfix:master commit in: misc/install-xattr/

[Anthony G. Basile]

commit:     275ca5400dfe6266a948da802aa19358b3475f95
Author:     Jason Zaman <jason <AT> perfinion <DOT> com>
AuthorDate: Fri Jun 27 12:07:04 2014 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Fri Jun 27 12:26:20 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/elfix.git;a=commit;h=275ca540

misc/install-xattr: test used a dir that already existed

'f' was used by another test, do the test in a new dir instead
so that there is no chance for a conflict

Signed-off-by: Jason Zaman <jason <AT> perfinion.com>

---
 misc/install-xattr/Makefile          |  2 +-
 misc/install-xattr/checkcopyattrs.sh | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/misc/install-xattr/Makefile b/misc/install-xattr/Makefile
index 7143f3f..0474569 100644
--- a/misc/install-xattr/Makefile
+++ b/misc/install-xattr/Makefile
@@ -14,7 +14,7 @@ install: install-xattr
 
 check: checkcopyattrs.sh install-xattr
 	$(PWD)/checkcopyattrs.sh
-	rm -rf a b c d e f g x y z backup-a* mode-a target-a target-install-xattr
+	rm -rf a b c d e f g h x y z backup-a* mode-a target-a target-install-xattr
 
 clean:
 	rm -f *.o *~ install-xattr

diff --git a/misc/install-xattr/checkcopyattrs.sh b/misc/install-xattr/checkcopyattrs.sh
index 0249013..9196795 100755
--- a/misc/install-xattr/checkcopyattrs.sh
+++ b/misc/install-xattr/checkcopyattrs.sh
@@ -2,7 +2,7 @@
 set -e
 
 touch a b c
-mkdir -p d e f
+mkdir -p d e h
 setfattr -n user.foo -v "bar" a
 setfattr -n user.bas -v "x" a
 setfattr -n user.pax.flags -v "mr" a
@@ -29,12 +29,12 @@ setfattr -n user.pax.flags -v "r" c
 
 # This tests if the src file was inside a directory
 # the correct dst location should be f/a. NOT f/d/a.
-./install-xattr d/a f
+./install-xattr d/a h
 
-[ -x f/a ]
-[ ! -x f/d/a ]
-[ "$(getfattr --only-values -n user.foo f/a)" == "bar" ]
-[ "$(getfattr --only-values -n user.bas f/a)" == "x" ]
+[ -x h/a ]
+[ ! -x h/d/a ]
+[ "$(getfattr --only-values -n user.foo h/a)" == "bar" ]
+[ "$(getfattr --only-values -n user.bas h/a)" == "x" ]
 
 ./install-xattr -t e a b c
 
@@ -87,4 +87,4 @@ setfattr -n user.pax.flags -v "r" c
 #              set SELinux security context of files and directories
 
 # Okay, let's clean up after ourselves
-rm -rf a b c d e f g x y z backup-a* mode-a target-a target-install-xattr
+rm -rf a b c d e f g h x y z backup-a* mode-a target-a target-install-xattr

[gentoo-commits] proj/elfix:master commit in: misc/install-xattr/

[Anthony G. Basile]

commit:     be6c34290f1c5a0c4e52b03dc5f668046409a84a
Author:     Jason Zaman <jason <AT> perfinion <DOT> com>
AuthorDate: Fri Jun 27 12:07:03 2014 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Fri Jun 27 12:26:28 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/elfix.git;a=commit;h=be6c3429

misc/install-xattr: exclude trusted.* by default

trusted.* xattrs require the sys_admin capability
and should be excluded by default

Signed-off-by: Jason Zaman <jason <AT> perfinion.com>

---
 misc/install-xattr/install-xattr.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/misc/install-xattr/install-xattr.c b/misc/install-xattr/install-xattr.c
index f2157fd..805c0a4 100644
--- a/misc/install-xattr/install-xattr.c
+++ b/misc/install-xattr/install-xattr.c
@@ -251,7 +251,7 @@ main(int argc, char* argv[])
 
 	portage_xattr_exclude = getenv("PORTAGE_XATTR_EXCLUDE");
 	if (portage_xattr_exclude == NULL)
-		exclude = xstrdup("security.* system.nfs4_acl");
+		exclude = xstrdup("security.* trusted.* system.nfs4_acl");
 	else
 		exclude = xstrdup(portage_xattr_exclude);
 

[gentoo-commits] proj/elfix:master commit in: misc/install-xattr/

[Anthony G. Basile]

commit:     18586b8eef2dee0f432d7f57b642fa177aebc788
Author:     Jason Zaman <jason <AT> perfinion <DOT> com>
AuthorDate: Tue Jun 24 19:07:08 2014 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Tue Jun 24 21:50:07 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/elfix.git;a=commit;h=18586b8e

Correctly determine dst path if src is in a dir

There is a mismatch between how install and install-xattr determines
the destination path.

When running `install src/a dst/' the correct output is `dst/a'.

install-xattr was incorrectly joining the paths so thought the output
was `dst/src/a' which did not exist.

A test case has been added to the test script too.

Signed-off-by: Jason Zaman <jason <AT> perfinion.com>
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>

---
 misc/install-xattr/checkcopyattrs.sh | 11 ++++++++++-
 misc/install-xattr/install-xattr.c   |  2 +-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/misc/install-xattr/checkcopyattrs.sh b/misc/install-xattr/checkcopyattrs.sh
index 2e8f30f..0249013 100755
--- a/misc/install-xattr/checkcopyattrs.sh
+++ b/misc/install-xattr/checkcopyattrs.sh
@@ -2,7 +2,7 @@
 set -e
 
 touch a b c
-mkdir -p d e
+mkdir -p d e f
 setfattr -n user.foo -v "bar" a
 setfattr -n user.bas -v "x" a
 setfattr -n user.pax.flags -v "mr" a
@@ -27,6 +27,15 @@ setfattr -n user.pax.flags -v "r" c
 [ "$(getfattr --only-values -n user.pax.flags d/b)" == "p" ]
 [ "$(getfattr --only-values -n user.pax.flags d/c)" == "r" ]
 
+# This tests if the src file was inside a directory
+# the correct dst location should be f/a. NOT f/d/a.
+./install-xattr d/a f
+
+[ -x f/a ]
+[ ! -x f/d/a ]
+[ "$(getfattr --only-values -n user.foo f/a)" == "bar" ]
+[ "$(getfattr --only-values -n user.bas f/a)" == "x" ]
+
 ./install-xattr -t e a b c
 
 [ "$(getfattr --only-values -n user.foo e/a)" == "bar" ]

diff --git a/misc/install-xattr/install-xattr.c b/misc/install-xattr/install-xattr.c
index 3d70b5e..f2157fd 100644
--- a/misc/install-xattr/install-xattr.c
+++ b/misc/install-xattr/install-xattr.c
@@ -382,7 +382,7 @@ main(int argc, char* argv[])
 					if (S_ISDIR(s.st_mode))
 						continue;
 
-					path = path_join(target, argv[i]);
+					path = path_join(target, basename(argv[i]));
 					copyxattr(argv[i], path);
 					free(path);
 				}

[gentoo-commits] proj/elfix:master commit in: misc/install-xattr/

[Anthony G. Basile]

commit:     8fe175f9c0c592a49eff7941f60d28afc7e02308
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 15 22:09:42 2014 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sun Jun 15 22:09:42 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/elfix.git;a=commit;h=8fe175f9

misc/install-xattr: chdir to OLDPWD if we are wrapped by __PORTAGE_HELPER_PATH

---
 misc/install-xattr/install-xattr.c | 47 +++++++++++++++-----------------------
 1 file changed, 19 insertions(+), 28 deletions(-)

diff --git a/misc/install-xattr/install-xattr.c b/misc/install-xattr/install-xattr.c
index 126ffb9..3d70b5e 100644
--- a/misc/install-xattr/install-xattr.c
+++ b/misc/install-xattr/install-xattr.c
@@ -162,7 +162,7 @@ copyxattr(const char *source, const char *target)
 
 
 static char *
-which(char *mypath)
+which(char *mypath, char *portage_helper_path)
 {
 	/* $PATH for system install */
 	char *path = NULL, *env_path = getenv("PATH");
@@ -175,35 +175,16 @@ which(char *mypath)
 	} else
 		path = xstrdup(env_path);
 
-	/* $PORTAGE_BIN_PATH for portage install */
-	char *portpath = NULL, *portage_bin_path = getenv("PORTAGE_BIN_PATH");
-
-	/* If we have a $PORTAGE_BIN_PATH, then assume portage's install is at
-	 * $PORTAGE_BIN_PATH/install.  Check if this file exists, and if it does
-	 * set portpath = $PORTAGE_BIN_PATH/install.  If it doesn't then set
-	 * portpath = NULL.
-	 */
-	if (portage_bin_path != NULL) {
-		struct stat s;
-
-		portpath = path_join(portage_bin_path, "install");
-		portpath = realpath(portpath, NULL);
-
-		if (stat(portpath, &s) == 0)      /* If the path exsist but isn't a file/sym link, portpath = NULL */
-			if (!S_ISREG(s.st_mode))
-				portpath = NULL;
-	}
-
 	char *dir;       /* one directory in the colon delimited $PATH string */
-	char *canfile;   /* candidate install's path = dir + "/install"       */
 	char *canpath;   /* candidate install's canonical path                */
 	char *savedptr;  /* reentrant context for strtok_r()                  */
 
 	dir = strtok_r(path, ":", &savedptr);
 
 	while (dir) {
-		canfile = path_join(dir, "install");
+		char *canfile = path_join(dir, "install");
 		canpath = realpath(canfile, NULL);
+		free(canfile);
 
 		/* ignore invalid paths that cannot be canonicalized */
 		if (!canpath)
@@ -218,8 +199,8 @@ which(char *mypath)
 		/* If portage install's canonical path == candidate install's canonical path,
 		 * then we skip this path otheriwise we get into an infinite self-invocation.
 		 */
-		if (portpath)
-			if (!strcmp(portpath, canpath))
+		if (portage_helper_path)
+			if (!strcmp(portage_helper_path, canpath))
 				goto skip;
 
 		/* If the canpath exists and is either a regular file or sym link,
@@ -230,7 +211,6 @@ which(char *mypath)
 		if (stat(canpath, &s) == 0)
 			if (S_ISREG(s.st_mode)) {
 				free(path);
-				free(portpath);
 				return canpath;
 			}
 
@@ -240,8 +220,6 @@ which(char *mypath)
 		dir = strtok_r(NULL, ":", &savedptr);
 	}
 
-	free(portpath);
-
 	if (env_path == NULL)
 		err(1, "failed to find 'install' in standard utilities path");
 	else
@@ -338,12 +316,25 @@ main(int argc, char* argv[])
 	first = optind;
 	last = argc - 1;
 
+	/* Do we need to chdir to OLDPWD?  This is required when we are called my a
+	 * wrapper like ${__PORTAGE_HELPER_PATH} which then passes its directory as
+	 * $PWD and the source directory from which it was called as $OLDPWD.  But
+	 * we want the system install to run in the source directory, ie $OLDPWD,
+	 * so we chdir to it.  Currently we assume that if __PORTAGE_HELPER_PATH
+	 * is set, then we chdir to oldpwd.
+	 */
+	char *oldpwd = getenv("OLDPWD");
+	char *portage_helper_path = getenv("__PORTAGE_HELPER_PATH");
+	if (portage_helper_path)
+		chdir(oldpwd);
+
 	switch (fork()) {
 		case -1:
 			err(1, "fork() failed");
 
 		case 0:
-			install = which(mypath);  /* find system install avoiding mypath! */
+			/* find system install avoiding mypath and portage_helper_path! */
+			install = which(mypath, portage_helper_path);
 			free(mypath);
 			argv[0] = install;        /* so coreutils' lib/program.c behaves  */
 			execv(install, argv);     /* The kernel will free(install).       */

[gentoo-commits] proj/elfix:master commit in: misc/install-xattr/

[Anthony G. Basile]

commit:     22bb503d1f3cb9b7251f43fd8ea7936bdf7e2654
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 11 11:22:11 2014 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Wed Jun 11 11:24:10 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/elfix.git;a=commit;h=22bb503d

misc/install-xattr: fix pointer issues in which()

This fixes the following two issues:
1. free(canfile) was called before we had finished using canfile.
2. strcmp(portpath, canpath) was segfaulting if portpath == NULL.

---
 misc/install-xattr/install-xattr.c | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/misc/install-xattr/install-xattr.c b/misc/install-xattr/install-xattr.c
index 4a165d0..126ffb9 100644
--- a/misc/install-xattr/install-xattr.c
+++ b/misc/install-xattr/install-xattr.c
@@ -164,8 +164,8 @@ copyxattr(const char *source, const char *target)
 static char *
 which(char *mypath)
 {
-	char *path, *env_path = getenv("PATH");                         /* $PATH to search for system install */
-	char *portpath, *portage_bin_path = getenv("PORTAGE_BIN_PATH"); /* We skip $PORTAGE_BIN_PATH/install  */
+	/* $PATH for system install */
+	char *path = NULL, *env_path = getenv("PATH");
 
 	/* If we don't have $PATH in our environment, then pick a sane path. */
 	if (env_path == NULL) {
@@ -175,24 +175,22 @@ which(char *mypath)
 	} else
 		path = xstrdup(env_path);
 
+	/* $PORTAGE_BIN_PATH for portage install */
+	char *portpath = NULL, *portage_bin_path = getenv("PORTAGE_BIN_PATH");
+
 	/* If we have a $PORTAGE_BIN_PATH, then assume portage's install is at
-	 * $PORTAGE_BIN_PATH/install.  See if this file exists, and if it does
+	 * $PORTAGE_BIN_PATH/install.  Check if this file exists, and if it does
 	 * set portpath = $PORTAGE_BIN_PATH/install.  If it doesn't then set
 	 * portpath = NULL.
 	 */
-
-	if (portage_bin_path == NULL)
-		portpath = NULL;
-	else {
+	if (portage_bin_path != NULL) {
 		struct stat s;
 
 		portpath = path_join(portage_bin_path, "install");
 		portpath = realpath(portpath, NULL);
 
-		if (stat(portpath, &s) != 0)      /* If the path doesn't exsist, then portpath = NULL        */
-			portpath = NULL;
-		else
-			if (!S_ISREG(s.st_mode))  /* If it exists and isn't a file/sym link, portpath = NULL */
+		if (stat(portpath, &s) == 0)      /* If the path exsist but isn't a file/sym link, portpath = NULL */
+			if (!S_ISREG(s.st_mode))
 				portpath = NULL;
 	}
 
@@ -206,7 +204,6 @@ which(char *mypath)
 	while (dir) {
 		canfile = path_join(dir, "install");
 		canpath = realpath(canfile, NULL);
-		free(canfile);
 
 		/* ignore invalid paths that cannot be canonicalized */
 		if (!canpath)
@@ -221,8 +218,9 @@ which(char *mypath)
 		/* If portage install's canonical path == candidate install's canonical path,
 		 * then we skip this path otheriwise we get into an infinite self-invocation.
 		 */
-		if (!strcmp(portpath, canpath))
-			goto skip;
+		if (portpath)
+			if (!strcmp(portpath, canpath))
+				goto skip;
 
 		/* If the canpath exists and is either a regular file or sym link,
 		 * assume we found the system's install.
@@ -242,6 +240,8 @@ which(char *mypath)
 		dir = strtok_r(NULL, ":", &savedptr);
 	}
 
+	free(portpath);
+
 	if (env_path == NULL)
 		err(1, "failed to find 'install' in standard utilities path");
 	else

[gentoo-commits] proj/elfix:master commit in: misc/install-xattr/

[Anthony G. Basile]

commit:     522ab491f4e677baaa508cd43603861f7b0108fe
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 10 21:02:19 2014 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Tue Jun 10 21:02:19 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/elfix.git;a=commit;h=522ab491

misc/install-xattr: skip portage's install when searching for system install

---
 misc/install-xattr/install-xattr.c | 39 ++++++++++++++++++++++++++++++++------
 1 file changed, 33 insertions(+), 6 deletions(-)

diff --git a/misc/install-xattr/install-xattr.c b/misc/install-xattr/install-xattr.c
index 7b73cc3..4a165d0 100644
--- a/misc/install-xattr/install-xattr.c
+++ b/misc/install-xattr/install-xattr.c
@@ -164,8 +164,8 @@ copyxattr(const char *source, const char *target)
 static char *
 which(char *mypath)
 {
-	char *path, *env_path = getenv("PATH");              /* full $PATH string          */
-	char *portage_bin_path = getenv("PORTAGE_BIN_PATH"); /* PORTAGE BIN $PATHs to skip */
+	char *path, *env_path = getenv("PATH");                         /* $PATH to search for system install */
+	char *portpath, *portage_bin_path = getenv("PORTAGE_BIN_PATH"); /* We skip $PORTAGE_BIN_PATH/install  */
 
 	/* If we don't have $PATH in our environment, then pick a sane path. */
 	if (env_path == NULL) {
@@ -175,14 +175,32 @@ which(char *mypath)
 	} else
 		path = xstrdup(env_path);
 
+	/* If we have a $PORTAGE_BIN_PATH, then assume portage's install is at
+	 * $PORTAGE_BIN_PATH/install.  See if this file exists, and if it does
+	 * set portpath = $PORTAGE_BIN_PATH/install.  If it doesn't then set
+	 * portpath = NULL.
+	 */
+
+	if (portage_bin_path == NULL)
+		portpath = NULL;
+	else {
+		struct stat s;
+
+		portpath = path_join(portage_bin_path, "install");
+		portpath = realpath(portpath, NULL);
+
+		if (stat(portpath, &s) != 0)      /* If the path doesn't exsist, then portpath = NULL        */
+			portpath = NULL;
+		else
+			if (!S_ISREG(s.st_mode))  /* If it exists and isn't a file/sym link, portpath = NULL */
+				portpath = NULL;
+	}
+
 	char *dir;       /* one directory in the colon delimited $PATH string */
 	char *canfile;   /* candidate install's path = dir + "/install"       */
 	char *canpath;   /* candidate install's canonical path                */
-	char *sdir;      /* one directory in the $INSTALL_EXCLUDE_PATH string */
 	char *savedptr;  /* reentrant context for strtok_r()                  */
 
-	struct stat s;
-
 	dir = strtok_r(path, ":", &savedptr);
 
 	while (dir) {
@@ -194,18 +212,27 @@ which(char *mypath)
 		if (!canpath)
 			goto skip;
 
-		/* If argv[0]'s canonical path == candidates install's canonical path,
+		/* If argv[0]'s canonical path == candidate install's canonical path,
 		 * then we skip this path otheriwise we get into an infinite self-invocation.
 		 */
 		if (!strcmp(mypath, canpath))
 			goto skip;
 
+		/* If portage install's canonical path == candidate install's canonical path,
+		 * then we skip this path otheriwise we get into an infinite self-invocation.
+		 */
+		if (!strcmp(portpath, canpath))
+			goto skip;
+
 		/* If the canpath exists and is either a regular file or sym link,
 		 * assume we found the system's install.
                  */
+		struct stat s;
+
 		if (stat(canpath, &s) == 0)
 			if (S_ISREG(s.st_mode)) {
 				free(path);
+				free(portpath);
 				return canpath;
 			}
 

[gentoo-commits] proj/elfix:master commit in: misc/install-xattr/

[Anthony G. Basile]

commit:     84ca9ab04c49503ff2ef4346c45da63597ac204a
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 10 01:44:33 2014 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Tue Jun 10 01:49:08 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/elfix.git;a=commit;h=84ca9ab0

misc/install-xattr: /proc/self/exe for canonical path to self

Evaluating realpath(argv[0], NULL) when argv[0] is in the $PATH just
returns argv[0] and not the full canonical path.  Using /proc/self/exe
is more reliable.

---
 misc/install-xattr/install-xattr.c | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/misc/install-xattr/install-xattr.c b/misc/install-xattr/install-xattr.c
index 7dc248b..7b73cc3 100644
--- a/misc/install-xattr/install-xattr.c
+++ b/misc/install-xattr/install-xattr.c
@@ -162,9 +162,8 @@ copyxattr(const char *source, const char *target)
 
 
 static char *
-which(const char *myfile)
+which(char *mypath)
 {
-	char *mypath = realpath(myfile, NULL);               /* argv[0]'s canonical path   */
 	char *path, *env_path = getenv("PATH");              /* full $PATH string          */
 	char *portage_bin_path = getenv("PORTAGE_BIN_PATH"); /* PORTAGE BIN $PATHs to skip */
 
@@ -206,7 +205,6 @@ which(const char *myfile)
                  */
 		if (stat(canpath, &s) == 0)
 			if (S_ISREG(s.st_mode)) {
-				free(mypath);
 				free(path);
 				return canpath;
 			}
@@ -238,11 +236,13 @@ main(int argc, char* argv[])
 	int first, last;               /* argv indices of the first file/directory and last            */
 	char *target;                  /* the target file or directory                                 */
 	char *path;                    /* path to the target file                                      */
-	char *install;                 /* path to the system install                                   */
+
+	char *mypath = realpath("/proc/self/exe", NULL); /* path to argv[0]                            */
+	char *install;                                   /* path to the system install                 */
 
 	struct stat s;                 /* test if a file is a regular file or a directory              */
 
-	char *portage_xattr_exclude;  /* strings of excluded xattr names from $PORTAGE_XATTR_EXCLUDE   */
+	char *portage_xattr_exclude;   /* strings of excluded xattr names from $PORTAGE_XATTR_EXCLUDE  */
 
 	portage_xattr_exclude = getenv("PORTAGE_XATTR_EXCLUDE");
 	if (portage_xattr_exclude == NULL)
@@ -316,9 +316,10 @@ main(int argc, char* argv[])
 			err(1, "fork() failed");
 
 		case 0:
-			install = which(argv[0]);
-			argv[0] = install;    /* so coreutils' lib/program.c behaves */
-			execv(install, argv); /* The kernel will free(install).      */
+			install = which(mypath);  /* find system install avoiding mypath! */
+			free(mypath);
+			argv[0] = install;        /* so coreutils' lib/program.c behaves  */
+			execv(install, argv);     /* The kernel will free(install).       */
 			err(1, "execv() failed");
 
 		default:

[gentoo-commits] proj/elfix:master commit in: misc/install-xattr/

[Anthony G. Basile]

commit:     ba08589f95e4ec77b5e7f73f97278730dc426bcd
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sun Jun  8 20:15:06 2014 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Tue Jun 10 01:49:02 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/elfix.git;a=commit;h=ba08589f

misc/install-xattr: refine the behavior of which()

The wrapper must avoid invoking itself in its attempt to find the
system `install` path.  The old behavior was to avoid looking in
the same directory as the wrapper, but this is too crude since we
might have the wrapper in /usr/bin (say), and the system `install`
in the same directory, in which case we'll wind up skipping it.
The new behavior of which() is to accept argv[0], find its canonical
path and skip if it is equal to the canditate system `install` we
are checking.

We also add PORTAGE_BIN_PATH which will be used in a future commit
to avoid this wrapper from finding portage's wrapper.  We can then
get into a situation where the portage wrapper, usually at
${PORTAGE_BIN_PATH}/ebuild-helpers/xattr/install calls this wrapper,
usually at /usr/bin/install-xattr, which in turn calls the portage
wrapper in an infinite self-invocation (fork bomb).

---
 misc/install-xattr/install-xattr.c | 42 ++++++++++++++++++++++----------------
 1 file changed, 24 insertions(+), 18 deletions(-)

diff --git a/misc/install-xattr/install-xattr.c b/misc/install-xattr/install-xattr.c
index c0c68f9..7dc248b 100644
--- a/misc/install-xattr/install-xattr.c
+++ b/misc/install-xattr/install-xattr.c
@@ -162,10 +162,11 @@ copyxattr(const char *source, const char *target)
 
 
 static char *
-which(const char *mydir)
+which(const char *myfile)
 {
-	char *mycandir = realpath(mydir, NULL);  /* canonical value of argv[0]'s dirname */
-	char *path, *env_path = getenv("PATH");  /* full $PATH string                    */
+	char *mypath = realpath(myfile, NULL);               /* argv[0]'s canonical path   */
+	char *path, *env_path = getenv("PATH");              /* full $PATH string          */
+	char *portage_bin_path = getenv("PORTAGE_BIN_PATH"); /* PORTAGE BIN $PATHs to skip */
 
 	/* If we don't have $PATH in our environment, then pick a sane path. */
 	if (env_path == NULL) {
@@ -175,39 +176,44 @@ which(const char *mydir)
 	} else
 		path = xstrdup(env_path);
 
-	char *dir;       /* one directory in the $PATH string */
-	char *candir;    /* canonical value of that directory */
-	char *file;      /* file name = path + "/install"     */
-	char *savedptr;  /* reentrant context for strtok_r()  */
+	char *dir;       /* one directory in the colon delimited $PATH string */
+	char *canfile;   /* candidate install's path = dir + "/install"       */
+	char *canpath;   /* candidate install's canonical path                */
+	char *sdir;      /* one directory in the $INSTALL_EXCLUDE_PATH string */
+	char *savedptr;  /* reentrant context for strtok_r()                  */
 
 	struct stat s;
 
 	dir = strtok_r(path, ":", &savedptr);
 
 	while (dir) {
-		candir = realpath(dir, NULL);
+		canfile = path_join(dir, "install");
+		canpath = realpath(canfile, NULL);
+		free(canfile);
 
 		/* ignore invalid paths that cannot be canonicalized */
-		if (!candir)
+		if (!canpath)
 			goto skip;
 
-		file = path_join(candir, "install");
+		/* If argv[0]'s canonical path == candidates install's canonical path,
+		 * then we skip this path otheriwise we get into an infinite self-invocation.
+		 */
+		if (!strcmp(mypath, canpath))
+			goto skip;
 
-		/* If the file exists and is either a regular file or sym link,
+		/* If the canpath exists and is either a regular file or sym link,
 		 * assume we found the system's install.
                  */
-		if (stat(file, &s) == 0)
+		if (stat(canpath, &s) == 0)
 			if (S_ISREG(s.st_mode)) {
-				free(candir);
-				free(mycandir);
+				free(mypath);
 				free(path);
-				return file;
+				return canpath;
 			}
 
-		free(file);
 
  skip:
-		free(candir);
+		free(canpath);
 		dir = strtok_r(NULL, ":", &savedptr);
 	}
 
@@ -310,7 +316,7 @@ main(int argc, char* argv[])
 			err(1, "fork() failed");
 
 		case 0:
-			install = which(dirname(argv[0]));
+			install = which(argv[0]);
 			argv[0] = install;    /* so coreutils' lib/program.c behaves */
 			execv(install, argv); /* The kernel will free(install).      */
 			err(1, "execv() failed");

[gentoo-commits] proj/elfix:master commit in: misc/install-xattr/

[Anthony G. Basile]

commit:     03c8c49c168246e6941d1344bcb4605955de0a26
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sun Jun  8 20:15:06 2014 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sun Jun  8 20:15:06 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/elfix.git;a=commit;h=03c8c49c

misc/install: refine the behavior of which()

The wrapper must avoid invoking itself in its attempt to find the
system `install` path.  The old behavior was to avoid looking in
the same directory as the wrapper, but this is too crude since we
might have the wrapper in /usr/bin (say), and the system `install`
in the same directory, in which case we'll wind up skipping it.
The new behavior of which() is to accept argv[0], find its canonical
path and skip if it is equal to the canditate system `install` we
are checking.

We also add PORTAGE_BIN_PATH which will be used in a future commit
to avoid this wrapper from finding portage's wrapper.  We can then
get into a situation where the portage wrapper, usually at
${PORTAGE_BIN_PATH}/ebuild-helpers/xattr/install calls this wrapper,
usually at /usr/bin/install-xattr, which in turn calls the portage
wrapper in an infinite self-invocation (fork bomb).

---
 misc/install-xattr/install-xattr.c | 42 ++++++++++++++++++++++----------------
 1 file changed, 24 insertions(+), 18 deletions(-)

diff --git a/misc/install-xattr/install-xattr.c b/misc/install-xattr/install-xattr.c
index c0c68f9..7dc248b 100644
--- a/misc/install-xattr/install-xattr.c
+++ b/misc/install-xattr/install-xattr.c
@@ -162,10 +162,11 @@ copyxattr(const char *source, const char *target)
 
 
 static char *
-which(const char *mydir)
+which(const char *myfile)
 {
-	char *mycandir = realpath(mydir, NULL);  /* canonical value of argv[0]'s dirname */
-	char *path, *env_path = getenv("PATH");  /* full $PATH string                    */
+	char *mypath = realpath(myfile, NULL);               /* argv[0]'s canonical path   */
+	char *path, *env_path = getenv("PATH");              /* full $PATH string          */
+	char *portage_bin_path = getenv("PORTAGE_BIN_PATH"); /* PORTAGE BIN $PATHs to skip */
 
 	/* If we don't have $PATH in our environment, then pick a sane path. */
 	if (env_path == NULL) {
@@ -175,39 +176,44 @@ which(const char *mydir)
 	} else
 		path = xstrdup(env_path);
 
-	char *dir;       /* one directory in the $PATH string */
-	char *candir;    /* canonical value of that directory */
-	char *file;      /* file name = path + "/install"     */
-	char *savedptr;  /* reentrant context for strtok_r()  */
+	char *dir;       /* one directory in the colon delimited $PATH string */
+	char *canfile;   /* candidate install's path = dir + "/install"       */
+	char *canpath;   /* candidate install's canonical path                */
+	char *sdir;      /* one directory in the $INSTALL_EXCLUDE_PATH string */
+	char *savedptr;  /* reentrant context for strtok_r()                  */
 
 	struct stat s;
 
 	dir = strtok_r(path, ":", &savedptr);
 
 	while (dir) {
-		candir = realpath(dir, NULL);
+		canfile = path_join(dir, "install");
+		canpath = realpath(canfile, NULL);
+		free(canfile);
 
 		/* ignore invalid paths that cannot be canonicalized */
-		if (!candir)
+		if (!canpath)
 			goto skip;
 
-		file = path_join(candir, "install");
+		/* If argv[0]'s canonical path == candidates install's canonical path,
+		 * then we skip this path otheriwise we get into an infinite self-invocation.
+		 */
+		if (!strcmp(mypath, canpath))
+			goto skip;
 
-		/* If the file exists and is either a regular file or sym link,
+		/* If the canpath exists and is either a regular file or sym link,
 		 * assume we found the system's install.
                  */
-		if (stat(file, &s) == 0)
+		if (stat(canpath, &s) == 0)
 			if (S_ISREG(s.st_mode)) {
-				free(candir);
-				free(mycandir);
+				free(mypath);
 				free(path);
-				return file;
+				return canpath;
 			}
 
-		free(file);
 
  skip:
-		free(candir);
+		free(canpath);
 		dir = strtok_r(NULL, ":", &savedptr);
 	}
 
@@ -310,7 +316,7 @@ main(int argc, char* argv[])
 			err(1, "fork() failed");
 
 		case 0:
-			install = which(dirname(argv[0]));
+			install = which(argv[0]);
 			argv[0] = install;    /* so coreutils' lib/program.c behaves */
 			execv(install, argv); /* The kernel will free(install).      */
 			err(1, "execv() failed");

[gentoo-commits] proj/elfix:master commit in: misc/install-xattr/

[Anthony G. Basile]

commit:     53a5c9cababc4a681c026b7ce445e29da4666d6c
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sun Jun  1 00:27:08 2014 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sun Jun  1 00:27:18 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/elfix.git;a=commit;h=53a5c9ca

misc/install-xattr: remove argv[0]'s dirname check

We should not skip argv[0]'s canonical dirname == the path's canonical dirname
because both install and install-xattr are usually installed in /usr/bin.  We
won't get into an infinite self-invocation because the basename is different.

---
 misc/install-xattr/install-xattr.c | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/misc/install-xattr/install-xattr.c b/misc/install-xattr/install-xattr.c
index 8de76db..c0c68f9 100644
--- a/misc/install-xattr/install-xattr.c
+++ b/misc/install-xattr/install-xattr.c
@@ -191,12 +191,6 @@ which(const char *mydir)
 		if (!candir)
 			goto skip;
 
-		/* If argv[0]'s canonical dirname == the path's canonical dirname, then we
-		 * skip this path otheriwise we get into an infinite self-invocation.
-		 */
-		if (!strcmp(mycandir, candir))
-			goto skip;
-
 		file = path_join(candir, "install");
 
 		/* If the file exists and is either a regular file or sym link,

[gentoo-commits] proj/elfix:master commit in: misc/install-xattr/

[Anthony G. Basile]

commit:     c520a73a702519336236efdba4e40eb5b83c7ce8
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 13 19:09:47 2014 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Thu Feb 13 19:09:47 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/elfix.git;a=commit;h=c520a73a

misc/install-xattr/Makefile: fix install rule

---
 misc/install-xattr/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/misc/install-xattr/Makefile b/misc/install-xattr/Makefile
index bbc2cf1..7143f3f 100644
--- a/misc/install-xattr/Makefile
+++ b/misc/install-xattr/Makefile
@@ -9,8 +9,8 @@ install-xattr: install-xattr.c
 
 PREFIX = /usr
 BINDIR = $(PREFIX)/bin
-install: xattr-install
-	install -m 755 -D install-xattr $(DESTDIR)$(BINDIR)/install-xattr
+install: install-xattr
+	install -m 755 -D install-xattr $(DESTDIR)$(BINDIR)/$<
 
 check: checkcopyattrs.sh install-xattr
 	$(PWD)/checkcopyattrs.sh

[gentoo-commits] proj/elfix:master commit in: misc/install-xattr/

[Anthony G. Basile]

commit:     aa5272261f5c426624ee817ae67994b392cc327d
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 13 19:02:10 2014 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Thu Feb 13 19:02:10 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/elfix.git;a=commit;h=aa527226

misc/install-xattr: license under GPL version 3

---
 misc/install-xattr/COPYING         | 674 +++++++++++++++++++++++++++++++++++++
 misc/install-xattr/install-xattr.c |  15 +-
 2 files changed, 688 insertions(+), 1 deletion(-)

diff --git a/misc/install-xattr/COPYING b/misc/install-xattr/COPYING
new file mode 100644
index 0000000..94a9ed0
--- /dev/null
+++ b/misc/install-xattr/COPYING
@@ -0,0 +1,674 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.

diff --git a/misc/install-xattr/install-xattr.c b/misc/install-xattr/install-xattr.c
index e27016b..8de76db 100644
--- a/misc/install-xattr/install-xattr.c
+++ b/misc/install-xattr/install-xattr.c
@@ -1,10 +1,23 @@
 /* Copyright 2014 Gentoo Foundation
  * Distributed under the terms of the GNU General Public License v2
  *
+ * Wrapper for coreutil's install to preserve extended attributes.
+ *
  * Copyright 2014 Anthony G. Basile - <blueness@gentoo.org>
  * Copyright 2014 Mike Frysinger    - <vapier@gentoo.org>
  *
- * Wrapper for coreutil's install to preserve extended attributes.
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <stdio.h>

[gentoo-commits] proj/elfix:master commit in: misc/install-xattr/

[Anthony G. Basile]

commit:     84ebf842cb9065b6f75d3117c3e73e90bb838472
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 13 18:49:28 2014 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Thu Feb 13 18:49:28 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/elfix.git;a=commit;h=84ebf842

misc/install-xattr: switch to simple Makefile

---
 misc/install-xattr/.gitignore        |  1 +
 misc/install-xattr/ChangeLog         | 11 +++++++++++
 misc/install-xattr/Makefile          | 22 ++++++++++++++++++++++
 misc/install-xattr/Makefile.am       | 16 ----------------
 misc/install-xattr/autogen.sh        |  6 ------
 misc/install-xattr/checkcopyattrs.sh |  3 +++
 misc/install-xattr/configure.ac      | 30 ------------------------------
 7 files changed, 37 insertions(+), 52 deletions(-)

diff --git a/misc/install-xattr/.gitignore b/misc/install-xattr/.gitignore
index a0bcfaa..670a765 100644
--- a/misc/install-xattr/.gitignore
+++ b/misc/install-xattr/.gitignore
@@ -12,3 +12,4 @@ install-xattr
 x
 y
 z
+!Makefile

diff --git a/misc/install-xattr/ChangeLog b/misc/install-xattr/ChangeLog
new file mode 100644
index 0000000..13752a3
--- /dev/null
+++ b/misc/install-xattr/ChangeLog
@@ -0,0 +1,11 @@
+Okay we'll document changes here.  This is a small project, so we don't
+have to be very formal.  
+
+2014-02-13
+
+	* Release version 0.1.  For discussion leading up to this release,
+	see https://bugs.gentoo.org/show_bug.cgi?id=465000.
+
+THANKS
+	* Mike Frysinger <vapier@gentoo.org> for your relentless attention.
+	* Greg Turner <gmturner007@ameritech.net> for testing and fixing bugs.

diff --git a/misc/install-xattr/Makefile b/misc/install-xattr/Makefile
new file mode 100644
index 0000000..bbc2cf1
--- /dev/null
+++ b/misc/install-xattr/Makefile
@@ -0,0 +1,22 @@
+CFLAGS ?= -O2 -pipe -g
+CFLAGS += -Wall
+PWD = $$(pwd)
+
+all: install-xattr
+
+install-xattr: install-xattr.c
+	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $@ $< $(LDLIBS)
+
+PREFIX = /usr
+BINDIR = $(PREFIX)/bin
+install: xattr-install
+	install -m 755 -D install-xattr $(DESTDIR)$(BINDIR)/install-xattr
+
+check: checkcopyattrs.sh install-xattr
+	$(PWD)/checkcopyattrs.sh
+	rm -rf a b c d e f g x y z backup-a* mode-a target-a target-install-xattr
+
+clean:
+	rm -f *.o *~ install-xattr
+
+.PHONY: all check clean install

diff --git a/misc/install-xattr/Makefile.am b/misc/install-xattr/Makefile.am
deleted file mode 100644
index d2ba4d7..0000000
--- a/misc/install-xattr/Makefile.am
+++ /dev/null
@@ -1,16 +0,0 @@
-CFLAGS=
-noinst_PROGRAMS = install-xattr
-install_xattr_SOURCES = install-xattr.c
-install_xattr_CFLAGS = -ggdb -Wall -O3
-
-check_SCRIPTS = checkcopyattrs
-TEST = $(check_SCRIPTS)
-
-checkcopyattrs:
-	$(srcdir)/checkcopyattrs.sh
-
-EXTRA_DIST = checkcopyattrs.sh
-CLEANFILES = a b c x y z d/* e/* f/* 
-
-clean-local:
-	-rm -rf d e f g backup* mode* target*

diff --git a/misc/install-xattr/autogen.sh b/misc/install-xattr/autogen.sh
deleted file mode 100755
index 3888ff3..0000000
--- a/misc/install-xattr/autogen.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-aclocal && \
-autoheader && \
-autoconf && \
-automake --add-missing --copy

diff --git a/misc/install-xattr/checkcopyattrs.sh b/misc/install-xattr/checkcopyattrs.sh
index 210a21c..2e8f30f 100755
--- a/misc/install-xattr/checkcopyattrs.sh
+++ b/misc/install-xattr/checkcopyattrs.sh
@@ -76,3 +76,6 @@ setfattr -n user.pax.flags -v "r" c
 #
 #       -Z, --context=CONTEXT
 #              set SELinux security context of files and directories
+
+# Okay, let's clean up after ourselves
+rm -rf a b c d e f g x y z backup-a* mode-a target-a target-install-xattr

diff --git a/misc/install-xattr/configure.ac b/misc/install-xattr/configure.ac
deleted file mode 100644
index aca8b1f..0000000
--- a/misc/install-xattr/configure.ac
+++ /dev/null
@@ -1,30 +0,0 @@
-#                                               -*- Autoconf -*-
-# Process this file with autoconf to produce a configure script.
-
-AC_PREREQ([2.69])
-AC_INIT([install-xattr],[1])
-AC_CONFIG_SRCDIR([install-xattr.c])
-AC_CONFIG_HEADERS([config.h])
-
-AM_INIT_AUTOMAKE([1.13 foreign])
-
-# Checks for programs.
-AC_PROG_CC
-AC_PROG_INSTALL
-
-# Checks for libraries.
-
-# Checks for header files.
-AC_CHECK_HEADERS([stdlib.h string.h unistd.h])
-
-# Checks for typedefs, structures, and compiler characteristics.
-AC_TYPE_SIZE_T
-AC_TYPE_SSIZE_T
-
-# Checks for library functions.
-AC_FUNC_FORK
-AC_FUNC_MALLOC
-AC_CHECK_FUNCS([memset realpath strdup])
-
-AC_CONFIG_FILES([Makefile])
-AC_OUTPUT