summaryrefslogtreecommitdiffstats
path: root/fakechroot-svn-no-dup-envs.patch
diff options
context:
space:
mode:
authorRichard W.M. Jones <rjones@redhat.com>2010-12-03 13:17:00 +0000
committerRichard W.M. Jones <rjones@redhat.com>2010-12-05 09:33:25 +0000
commit66a9d53e48f14d7fe1d9f4b801a1c5582d83efa6 (patch)
tree555e29f52452cd88a6deb086b86bb55ab85f5fff /fakechroot-svn-no-dup-envs.patch
parent304ee3695e41904d8b2184922732f47aa6ccc0d4 (diff)
downloadfebootstrap-3.0.tar.gz
febootstrap-3.0.tar.xz
febootstrap-3.0.zip
Rewrite febootstrap as a general supermin appliance building tool.3.0
This complete rewrite of the building tools turns febootstrap into a general purpose, cross-distro, supermin appliance only build tool. There is now only one program 'febootstrap' which is used to build a supermin appliance from a list of packages. Normal appliances are not supported. The tools are incompatible with febootstrap 2.x (use the febootstrap-2.x branch from git to get the old package).
Diffstat (limited to 'fakechroot-svn-no-dup-envs.patch')
-rw-r--r--fakechroot-svn-no-dup-envs.patch38
1 files changed, 0 insertions, 38 deletions
diff --git a/fakechroot-svn-no-dup-envs.patch b/fakechroot-svn-no-dup-envs.patch
deleted file mode 100644
index 87f8e6f..0000000
--- a/fakechroot-svn-no-dup-envs.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Note, this patch has been included in upstream fakechroot >= 2.9
-
-Index: src/libfakechroot.c
-===================================================================
---- src/libfakechroot.c (revision 311)
-+++ src/libfakechroot.c (working copy)
-@@ -1479,7 +1479,7 @@
- char *env;
- char tmp[FAKECHROOT_MAXPATH], newfilename[FAKECHROOT_MAXPATH], argv0[FAKECHROOT_MAXPATH];
- char *ptr;
-- unsigned int i, j, n;
-+ unsigned int i, j, n, len;
- size_t sizeenvp;
- char c;
- char *fakechroot_path, *fakechroot_ptr, fakechroot_buf[FAKECHROOT_MAXPATH];
-@@ -1519,12 +1519,19 @@
- errno = ENOMEM;
- return -1;
- }
-- for (ep = envp, i = 0; *ep != NULL; ++ep, ++i) {
-- newenvp[i] = *ep;
-+ for (ep = envp, i = 0; *ep != NULL; ++ep) {
-+ for (j = 0; j < sizeof (envkey) / sizeof (char *); j++) {
-+ len = strlen (envkey[j]);
-+ if (strncmp (*ep, envkey[j], len) == 0 && (*ep)[len] == '=')
-+ goto skip;
-+ }
-+ newenvp[i] = *ep;
-+ i++;
-+ skip: ;
- }
-
- /* Add our variables to newenvp */
-- newenvp = realloc( newenvp, ((sizeenvp + 1) * sizeof(char *) + sizeof(envkey)) );
-+ newenvp = realloc( newenvp, i * sizeof(char *) + sizeof(envkey) );
- if (newenvp == NULL) {
- errno = ENOMEM;
- return -1;