--- a/ChangeLog	Tue May 12 20:27:44 2015 +0100
+++ b/ChangeLog	Tue May 12 23:16:36 2015 +0100
@@ -1,3 +1,14 @@
+2015-05-12  Andrew John Hughes  <gnu_andrew@member.fsf.org>
+
+	PR2348: Avoid following symlinks for CACAO
+	and JamVM patches
+	* Makefile.am:
+	(extract-cacao): Move extracted directory
+	to cacao/cacao and create version-specific
+	symlink.
+	(extract-jamvm): Likewise but for jamvm/jamvm.
+	* NEWS: Updated.
+
 2015-05-12  Andrew John Hughes  <gnu_andrew@member.fsf.org>
 
 	PR2347: Fix CACAO patches to apply again

--- a/Makefile.am	Tue May 12 20:27:44 2015 +0100
+++ b/Makefile.am	Tue May 12 23:16:36 2015 +0100
@@ -1064,9 +1064,8 @@
 	  mkdir cacao ; \
 	  $(TAR) xzf $(CACAO_SRC_ZIP) -C cacao ; \
 	  dir=$$(basename cacao/cacao-*) ; \
-	  ln -s $$dir cacao/cacao ; \
-	  cd cacao/cacao ; \
-	  cd .. ; \
+	  mv -v cacao/$$dir cacao/cacao ; \
+	  ln -s cacao cacao/$$dir ; \
 	fi
 endif
 endif
@@ -1085,7 +1084,8 @@
 	  mkdir jamvm ; \
 	  $(TAR) xzf $(JAMVM_SRC_ZIP) -C jamvm ; \
 	  dir=$$(basename jamvm/jamvm-*) ; \
-	  ln -s $$dir jamvm/jamvm ; \
+	  mv -v jamvm/$$dir jamvm/jamvm ; \
+	  ln -s jamvm jamvm/$$dir ; \
 	fi
 endif
 	mkdir -p stamps

--- a/NEWS	Tue May 12 20:27:44 2015 +0100
+++ b/NEWS	Tue May 12 23:16:36 2015 +0100
@@ -61,6 +61,7 @@
   - PR2257: clean-extract-nashorn rule is never run
   - PR2329: jamvm parallel unpack failures
   - PR2347: Fix CACAO patches to apply again
+  - PR2348: Avoid following symlinks for CACAO and JamVM patches
   - Don't substitute 'j' for '-j' inside -I directives
   - Extend 8041658 to all files in the HotSpot build.
   - Remove jcheck