[arch-commits] Commit in java7-openjdk/trunk (5 files)

Guillaume Alaux guillaume at nymeria.archlinux.org
Mon May 20 09:51:47 EDT 2013


    Date: Monday, May 20, 2013 @ 15:51:47
  Author: guillaume
Revision: 186019

Fixed sa-jdi.jar permissions - FS#35141

Added:
  java7-openjdk/trunk/01_fix_openjdk_cmds_path.diff
    (from rev 185845, java7-openjdk/trunk/openjdk7_fix_jdk_cmds_path.diff)
  java7-openjdk/trunk/02_fix_corba_cmds_path.diff
    (from rev 185845, java7-openjdk/trunk/fix_corba_cmds_path.diff)
Modified:
  java7-openjdk/trunk/PKGBUILD
Deleted:
  java7-openjdk/trunk/fix_corba_cmds_path.diff
  java7-openjdk/trunk/openjdk7_fix_jdk_cmds_path.diff

---------------------------------+
 01_fix_openjdk_cmds_path.diff   |   39 ++++++++++++++++++++++++++++++++++++++
 02_fix_corba_cmds_path.diff     |   32 +++++++++++++++++++++++++++++++
 PKGBUILD                        |   14 ++++++++-----
 fix_corba_cmds_path.diff        |   29 ----------------------------
 openjdk7_fix_jdk_cmds_path.diff |   36 -----------------------------------
 5 files changed, 80 insertions(+), 70 deletions(-)

Copied: java7-openjdk/trunk/01_fix_openjdk_cmds_path.diff (from rev 185845, java7-openjdk/trunk/openjdk7_fix_jdk_cmds_path.diff)
===================================================================
--- 01_fix_openjdk_cmds_path.diff	                        (rev 0)
+++ 01_fix_openjdk_cmds_path.diff	2013-05-20 13:51:47 UTC (rev 186019)
@@ -0,0 +1,39 @@
+--- openjdk/jdk/make/common/shared/Defs-utils.gmk.orig	2013-05-19 20:01:25.676093296 +0000
++++ openjdk/jdk/make/common/shared/Defs-utils.gmk	2013-05-19 20:01:54.312572109 +0000
+@@ -98,9 +98,9 @@
+ CHMOD          = $(UTILS_COMMAND_PATH)chmod
+ CMP            = $(UTILS_USR_BIN_PATH)cmp
+ COMM           = $(UTILS_USR_BIN_PATH)comm
+-COMPRESS       = $(UTILS_USR_BIN_PATH)compress
++COMPRESS       = $(UTILS_COMMAND_PATH)compress
+ CP             = $(UTILS_COMMAND_PATH)cp
+-CPIO           = $(UTILS_COMMAND_PATH)cpio
++CPIO           = $(UTILS_USR_BIN_PATH)cpio
+ CUT            = $(UTILS_USR_BIN_PATH)cut
+ DATE           = $(UTILS_COMMAND_PATH)date
+ DF             = $(UTILS_COMMAND_PATH)df
+@@ -108,13 +108,13 @@
+ DIRNAME        = $(UTILS_USR_BIN_PATH)dirname
+ DUMP           = $(UTILS_CCS_BIN_PATH)dump
+ ECHO           = $(UTILS_COMMAND_PATH)echo
+-EGREP          = $(UTILS_COMMAND_PATH)egrep
++EGREP          = $(UTILS_USR_BIN_PATH)egrep
+ EXPR           = $(UTILS_USR_BIN_PATH)expr
+ FILE           = $(UTILS_USR_BIN_PATH)file
+ FIND           = $(UTILS_USR_BIN_PATH)find
+ FMT            = $(UTILS_COMMAND_PATH)fmt
+ GDB            = $(UTILS_USR_BIN_PATH)gdb
+-GREP           = $(UTILS_COMMAND_PATH)grep
++GREP           = $(UTILS_USR_BIN_PATH)grep
+ GUNZIP         = $(UTILS_COMMAND_PATH)gunzip
+ # GZIP is used for solaris. Linux and windows use tar czf
+ GZIP           = $(UTILS_COMMAND_PATH)gzip
+@@ -148,7 +148,7 @@
+ TAIL           = $(UTILS_USR_BIN_PATH)tail
+ TAR            = $(UTILS_COMMAND_PATH)tar
+ TEST           = $(UTILS_USR_BIN_PATH)test
+-TOUCH          = $(UTILS_COMMAND_PATH)touch
++TOUCH          = $(UTILS_USR_BIN_PATH)touch
+ TR             = $(UTILS_USR_BIN_PATH)tr
+ TRUE           = $(UTILS_COMMAND_PATH)true
+ UNAME          = $(UTILS_COMMAND_PATH)uname

Copied: java7-openjdk/trunk/02_fix_corba_cmds_path.diff (from rev 185845, java7-openjdk/trunk/fix_corba_cmds_path.diff)
===================================================================
--- 02_fix_corba_cmds_path.diff	                        (rev 0)
+++ 02_fix_corba_cmds_path.diff	2013-05-20 13:51:47 UTC (rev 186019)
@@ -0,0 +1,32 @@
+--- openjdk/corba/make/common/shared/Defs-utils.gmk.orig	2013-05-19 19:57:58.530784147 +0000
++++ openjdk/corba/make/common/shared/Defs-utils.gmk	2013-05-19 19:58:44.777147938 +0000
+@@ -83,9 +83,9 @@
+ CHMOD          = $(UTILS_COMMAND_PATH)chmod
+ CMP            = $(UTILS_USR_BIN_PATH)cmp
+ COMM           = $(UTILS_USR_BIN_PATH)comm
+-COMPRESS       = $(UTILS_USR_BIN_PATH)compress
++COMPRESS       = $(UTILS_COMMAND_PATH)compress
+ CP             = $(UTILS_COMMAND_PATH)cp
+-CPIO           = $(UTILS_COMMAND_PATH)cpio
++CPIO           = $(UTILS_USR_BIN_PATH)cpio
+ CUT            = $(UTILS_USR_BIN_PATH)cut
+ DATE           = $(UTILS_COMMAND_PATH)date
+ DF             = $(UTILS_COMMAND_PATH)df
+@@ -131,7 +131,7 @@
+ TAIL           = $(UTILS_USR_BIN_PATH)tail
+ TAR            = $(UTILS_COMMAND_PATH)tar
+ TEST           = $(UTILS_USR_BIN_PATH)test
+-TOUCH          = $(UTILS_COMMAND_PATH)touch
++TOUCH          = $(UTILS_USR_BIN_PATH)touch
+ TR             = $(UTILS_USR_BIN_PATH)tr
+ TRUE           = $(UTILS_COMMAND_PATH)true
+ UNAME          = $(UTILS_COMMAND_PATH)uname
+@@ -182,7 +182,7 @@
+   # others have it in /usr/bin.
+   SORT=$(firstword $(wildcard $(UTILS_COMMAND_PATH)sort) \
+                    $(wildcard $(UTILS_USR_BIN_PATH)sort))
+-  NAWK           = $(USRBIN_PATH)gawk
++  NAWK           = $(UTILS_COMMAND_PATH)gawk
+   # Intrinsic unix command, with backslash-escaped character interpretation
+   ECHO           = /bin/echo -e
+   # These are really in UTILS_USR_BIN_PATH on Linux (only sccs is not)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-05-20 13:50:38 UTC (rev 186018)
+++ PKGBUILD	2013-05-20 13:51:47 UTC (rev 186019)
@@ -43,8 +43,8 @@
         ${_url}/langtools/archive/${_LANGTOOLS_CHANGESET}.tar.gz			# langtools.tar.gz
         ${_url}/hotspot/archive/${_HOTSPOT_CHANGESET}.tar.gz				# hotspot.tar.gz
         fontconfig-paths.diff
-        fix_corba_cmds_path.diff
-        openjdk7_fix_jdk_cmds_path.diff
+        01_fix_openjdk_cmds_path.diff
+        02_fix_corba_cmds_path.diff
         openjdk7_nonreparenting-wm.diff
         jdk7-openjdk.profile
         jdk7-openjdk.profile.csh
@@ -59,8 +59,8 @@
             '2806de9d41a91acff5bb917ec9dc41cb805e893b43828491b920f9ec14b53b12'
             'c184f29b13626e7327f58e4c1df506daf2b57d8084b7a2d2106504ab0fd5eaac'
             '9ad943ceb3dbcdf45d72974fc3667886a7ed65c69ab9abc17be5412827551a7f'
-            '7b2db65bfb9d5014e1522178d65cabf05dfa85e0926cde5648b5a338db376479'
-            'b742113dc6debc3eb92a246e442595481c04a2a3973e7902b86037acb50050ea'
+            '583af9025df545264a15665e4c9f981bc7286aaecc6d312dced485102cf5dda9'
+            'd57754ff320475023688bd7c7af38a9ea37e27ed8c1edd3b1572e4d8b41b78d3'
             'fd615f476ef17853ae55b7aee3c92b6738f9ea584e915749b1caa7fdc5ff9ca4'
             'bd55299e08e6f8e61ba5baad0990170891801a29a1e8137e502b5e8a10fc37ea'
             '3f28f8bfc6dd105a07f747d7135c77a77de433e2b8647dd7520a900135203fbd'
@@ -89,7 +89,10 @@
   . /etc/profile.d/apache-ant.sh
 
   cp ${srcdir}/*.diff ${srcdir}/icedtea-${_icedtea_ver}/patches
-  export DISTRIBUTION_PATCHES="patches/fontconfig-paths.diff patches/fix_corba_cmds_path.diff patches/openjdk7_fix_jdk_cmds_path.diff patches/openjdk7_nonreparenting-wm.diff"
+  export DISTRIBUTION_PATCHES="patches/fontconfig-paths.diff \
+                               patches/01_fix_openjdk_cmds_path.diff \
+                               patches/02_fix_corba_cmds_path.diff \
+                               patches/openjdk7_nonreparenting-wm.diff"
 
   if [ "$_bootstrap" = "1" ]; then
      BOOTSTRAPOPT="--enable-bootstrap --with-ecj-jar=/usr/share/java/ecj.jar"
@@ -328,6 +331,7 @@
   install -m755 ${srcdir}/${pkgname}.profile ${pkgdir}/etc/profile.d/jdk.sh
   install -m755 ${srcdir}/${pkgname}.profile.csh ${pkgdir}/etc/profile.d/jdk.csh
 
+  # Temporarily fixing FS#35141
   chmod go+r ${pkgdir}/usr/lib/jvm/java-7-openjdk/lib/sa-jdi.jar
 }
 

Deleted: fix_corba_cmds_path.diff
===================================================================
--- fix_corba_cmds_path.diff	2013-05-20 13:50:38 UTC (rev 186018)
+++ fix_corba_cmds_path.diff	2013-05-20 13:51:47 UTC (rev 186019)
@@ -1,29 +0,0 @@
---- openjdk/corba/make/common/shared/Defs-utils.gmk.old	2008-04-13 13:26:12.000000000 +0300
-+++ openjdk/corba/make/common/shared/Defs-utils.gmk	2008-04-14 15:35:13.000000000 +0300
-@@ -76,7 +76,7 @@
- CHMOD          = $(UTILS_COMMAND_PATH)chmod
- CMP            = $(UTILS_USR_BIN_PATH)cmp
- COMM           = $(UTILS_USR_BIN_PATH)comm
--COMPRESS       = $(UTILS_USR_BIN_PATH)compress
-+COMPRESS       = $(UTILS_COMMAND_PATH)compress
- CP             = $(UTILS_COMMAND_PATH)cp
- CPIO           = $(UTILS_COMMAND_PATH)cpio
- CUT            = $(UTILS_USR_BIN_PATH)cut
-@@ -125,7 +125,7 @@
- TAIL           = $(UTILS_USR_BIN_PATH)tail
- TAR            = $(UTILS_COMMAND_PATH)tar
- TEST           = $(UTILS_USR_BIN_PATH)test
--TOUCH          = $(UTILS_COMMAND_PATH)touch
-+TOUCH          = $(UTILS_USR_BIN_PATH)touch
- TR             = $(UTILS_USR_BIN_PATH)tr
- TRUE           = $(UTILS_COMMAND_PATH)true
- UNAME          = $(UTILS_COMMAND_PATH)uname
-@@ -176,7 +176,7 @@
-   # others have it in /usr/bin.
-   SORT=$(firstword $(wildcard $(UTILS_COMMAND_PATH)sort) \
- 		   $(wildcard $(UTILS_USR_BIN_PATH)sort))
--  NAWK           = $(USRBIN_PATH)gawk
-+  NAWK           = $(UTILS_COMMAND_PATH)gawk
-   # Intrinsic unix command, with backslash-escaped character interpretation
-   ECHO           = /bin/echo -e
-   # These are really in UTILS_USR_BIN_PATH on Linux (only sccs is not)

Deleted: openjdk7_fix_jdk_cmds_path.diff
===================================================================
--- openjdk7_fix_jdk_cmds_path.diff	2013-05-20 13:50:38 UTC (rev 186018)
+++ openjdk7_fix_jdk_cmds_path.diff	2013-05-20 13:51:47 UTC (rev 186019)
@@ -1,36 +0,0 @@
---- openjdk/jdk/make/common/shared/Defs-utils.gmk.old	2011-08-06 15:46:01.000000000 +0200
-+++ openjdk/jdk/make/common/shared/Defs-utils.gmk	2011-08-06 15:59:26.000000000 +0200
-@@ -91,7 +91,7 @@
- CHMOD          = $(UTILS_COMMAND_PATH)chmod
- CMP            = $(UTILS_USR_BIN_PATH)cmp
- COMM           = $(UTILS_USR_BIN_PATH)comm
--COMPRESS       = $(UTILS_USR_BIN_PATH)compress
-+COMPRESS       = $(UTILS_COMMAND_PATH)compress
- CP             = $(UTILS_COMMAND_PATH)cp
- CPIO           = $(UTILS_COMMAND_PATH)cpio
- CUT            = $(UTILS_USR_BIN_PATH)cut
-@@ -101,13 +101,13 @@
- DIRNAME        = $(UTILS_USR_BIN_PATH)dirname
- DUMP           = $(UTILS_CCS_BIN_PATH)dump
- ECHO           = $(UTILS_COMMAND_PATH)echo
--EGREP          = $(UTILS_COMMAND_PATH)egrep
-+EGREP          = $(UTILS_USR_BIN_PATH)egrep
- EXPR           = $(UTILS_USR_BIN_PATH)expr
- FILE           = $(UTILS_USR_BIN_PATH)file
- FIND           = $(UTILS_USR_BIN_PATH)find
- FMT            = $(UTILS_COMMAND_PATH)fmt
- GDB            = $(UTILS_USR_BIN_PATH)gdb
--GREP           = $(UTILS_COMMAND_PATH)grep
-+GREP           = $(UTILS_USR_BIN_PATH)grep
- GUNZIP         = $(UTILS_COMMAND_PATH)gunzip
- # GZIP is used for solaris. Linux and windows use tar czf
- GZIP           = $(UTILS_COMMAND_PATH)gzip
-@@ -140,7 +140,7 @@
- TAIL           = $(UTILS_USR_BIN_PATH)tail
- TAR            = $(UTILS_COMMAND_PATH)tar
- TEST           = $(UTILS_USR_BIN_PATH)test
--TOUCH          = $(UTILS_COMMAND_PATH)touch
-+TOUCH          = $(UTILS_USR_BIN_PATH)touch
- TR             = $(UTILS_USR_BIN_PATH)tr
- TRUE           = $(UTILS_COMMAND_PATH)true
- UNAME          = $(UTILS_COMMAND_PATH)uname



More information about the arch-commits mailing list