gcc-2.95 compilation fixes for libsandbox.c, #70351

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index c75eb9764f037bbe272727e77d012b20ef37fdfe..78f4b02daf80fc12c14d54dc73e12744790eedd8 100644 (file)
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,21 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 fd921f2db89809d28d25cdcef43fae76 portage-2.0.51-r3.ebuild 12435
-MD5 0470399965cfb502cde05cb35599b7f9 portage-2.0.51_rc7.ebuild 11795
-MD5 2baf8f1a5dcf8f500d4b2888b2fedaa1 portage-2.0.51-r2.ebuild 12293
-MD5 63cadb5f6ef798aaa8b95a899fdea82f portage-2.0.50-r11.ebuild 11572
 MD5 ba4ae80e5e6cf58aac9c5aa1cc5f777e ChangeLog 411
 MD5 c697b628359c7055961817876804f0a6 metadata.xml 221
+MD5 63cadb5f6ef798aaa8b95a899fdea82f portage-2.0.50-r11.ebuild 11572
+MD5 2baf8f1a5dcf8f500d4b2888b2fedaa1 portage-2.0.51-r2.ebuild 12293
+MD5 0470399965cfb502cde05cb35599b7f9 portage-2.0.51_rc7.ebuild 11795
+MD5 fd921f2db89809d28d25cdcef43fae76 portage-2.0.51-r3.ebuild 12435
+MD5 a754ca9e2eea9f8484bf5f93d339043a files/README.RESCUE 1911
 MD5 5375f0805d4d56dc961ad81162854790 files/digest-portage-2.0.50-r11 71
-MD5 3da3469e2b40b9a6b37fd54b2e6c7b98 files/digest-portage-2.0.51_rc7 71
 MD5 d2608171176cc00a43ead2ed136ed328 files/digest-portage-2.0.51-r2 70
+MD5 3da3469e2b40b9a6b37fd54b2e6c7b98 files/digest-portage-2.0.51_rc7 71
 MD5 5ea5d3ffe4a24cd1c719420cd0a2de11 files/digest-portage-2.0.51-r3 70
-MD5 a754ca9e2eea9f8484bf5f93d339043a files/README.RESCUE 1911
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBjhR7BDOEqLMd+jQRArU8AJ9hRvT07Q0myPe8+Um6F4EwJRDZkQCePAq7
-zBo7sSp+AYWRVyogacW9WN8=
-=lhY7
------END PGP SIGNATURE-----
+MD5 8c6ba58bbfddca72824b15dacbed69ec files/gcc-2.95-libsandbox.patch 1163

diff --git a/sys-apps/portage/files/gcc-2.95-libsandbox.patch b/sys-apps/portage/files/gcc-2.95-libsandbox.patch
new file mode 100644 (file)
index 0000000..99ca922
--- /dev/null
+++ b/sys-apps/portage/files/gcc-2.95-libsandbox.patch
@@ -0,0 +1,29 @@
+diff -u portage-2.0.51-r3-orig/src/sandbox-1.1/libsandbox.c.orig portage-2.0.51-r3/src/sandbox-1.1/libsandbox.c
+--- portage-2.0.51-r3-orig/src/sandbox-1.1/libsandbox.c        3 Nov 2004 13:15:59 -0000       
++++ portage-2.0.51-r3/src/sandbox-1.1/libsandbox.c     7 Nov 2004 15:07:14 -0000
+@@ -1171,6 +1171,7 @@
+       char *debug_log_path = NULL;
+       int debug_log_file = 0;
+       char buffer[512];
++      char *dpath = NULL;
+ 
+       init_wrappers();
+ 
+@@ -1207,7 +1208,7 @@
+                               sprintf(buffer, "%s:%*s%s\n", func, (int) (10 - strlen(func)), "",
+                                                               absolute_path);
+                               // log_path somehow gets corrupted.  figuring out why would be good.
+-                              char *dpath = strdup(log_path);
++                              dpath = strdup(log_path);
+                               if ((0 == lstat(log_path, &log_stat))
+                                               && (0 == S_ISREG(log_stat.st_mode))
+                                               ) {
+@@ -1240,7 +1241,7 @@
+                               sprintf(buffer, "%s:%*s%s\n", func, (int) (10 - strlen(func)), "",
+                                                               absolute_path);
+                               //debug_log_path somehow gets corupted, same thing as log_path above.
+-                              char *dpath = strdup(debug_log_path);
++                              dpath = strdup(debug_log_path);
+                               if ((0 == lstat(debug_log_path, &debug_log_stat))
+                                               && (0 == S_ISREG(debug_log_stat.st_mode))
+                                               ) {