November 2013 - openSUSE Commits - openSUSE Mailing Lists

commit terminology for openSUSE:Factory
by root＠hilbert.suse.de 01 Nov '13

01 Nov '13

Hello community, here is the log from the commit of package terminology for openSUSE:Factory checked in at 2013-11-01 14:39:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/terminology (Old) and /work/SRC/openSUSE:Factory/.terminology.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "terminology" Changes: -------- --- /work/SRC/openSUSE:Factory/terminology/terminology.changes 2013-04-03 23:46:50.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.terminology.new/terminology.changes 2013-11-01 14:39:09.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Oct 31 01:20:42 UTC 2013 - simon(a)simotek.net + +- Recommends new terminology-theme-openSUSE + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ terminology.spec ++++++ --- /var/tmp/diff_new_pack.dkiMC7/_old 2013-11-01 14:39:10.000000000 +0100 +++ /var/tmp/diff_new_pack.dkiMC7/_new 2013-11-01 14:39:10.000000000 +0100 @@ -37,6 +37,7 @@ %endif BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: elementary >= 1.7.0 +Recommends: terminology-theme-openSUSE %description Fast and lightweight terminal emulator using EFL libraries. -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit obs-service-tar_scm for openSUSE:Factory
by root＠hilbert.suse.de 01 Nov '13

01 Nov '13

Hello community, here is the log from the commit of package obs-service-tar_scm for openSUSE:Factory checked in at 2013-11-01 14:38:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/obs-service-tar_scm (Old) and /work/SRC/openSUSE:Factory/.obs-service-tar_scm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "obs-service-tar_scm" Changes: -------- --- /work/SRC/openSUSE:Factory/obs-service-tar_scm/obs-service-tar_scm.changes 2013-08-07 20:46:06.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.obs-service-tar_scm.new/obs-service-tar_scm.changes 2013-11-01 14:38:37.000000000 +0100 @@ -1,0 +2,6 @@ +Wed Oct 30 14:02:27 UTC 2013 - adrian(a)suse.de + +- Bump version to 0.3.1 + * do not execute tar base file name + +------------------------------------------------------------------- Old: ---- obs-service-tar_scm-0.3.0.1375457512.9de0986.tar.gz New: ---- obs-service-tar_scm-0.3.1.1383144507.58d1af8.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ obs-service-tar_scm.spec ++++++ --- /var/tmp/diff_new_pack.R8MhWe/_old 2013-11-01 14:38:39.000000000 +0100 +++ /var/tmp/diff_new_pack.R8MhWe/_new 2013-11-01 14:38:39.000000000 +0100 @@ -19,7 +19,7 @@ %define service tar_scm Name: obs-service-%{service} -Version: 0.3.0.1375457512.9de0986 +Version: 0.3.1.1383144507.58d1af8 Release: 0 Summary: An OBS source service: checkout or update a tar ball from svn/git/hg License: GPL-2.0+ ++++++ _service ++++++ --- /var/tmp/diff_new_pack.R8MhWe/_old 2013-11-01 14:38:39.000000000 +0100 +++ /var/tmp/diff_new_pack.R8MhWe/_new 2013-11-01 14:38:39.000000000 +0100 @@ -4,7 +4,7 @@ <param name="scm">git</param> <param name="exclude">.git</param> <param name="version">git-master</param> - <param name="versionformat">0.3.0.%ct.%h</param> + <param name="versionformat">0.3.1.%ct.%h</param> <param name="revision">master</param> </service> ++++++ obs-service-tar_scm-0.3.0.1375457512.9de0986.tar.gz -> obs-service-tar_scm-0.3.1.1383144507.58d1af8.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-service-tar_scm-0.3.0.1375457512.9de0986/tar_scm new/obs-service-tar_scm-0.3.1.1383144507.58d1af8/tar_scm --- old/obs-service-tar_scm-0.3.0.1375457512.9de0986/tar_scm 2013-08-02 17:47:31.000000000 +0200 +++ new/obs-service-tar_scm-0.3.1.1383144507.58d1af8/tar_scm 2013-10-30 15:58:20.000000000 +0100 @@ -24,7 +24,6 @@ USE_SUBMODULES=enable # MYHISTORYDEPTH="" INCLUDES="" - MYTARFILENAME='${NAME}-${VERSION}' } get_config_options () { @@ -97,13 +96,9 @@ USE_SUBMODULES="$2" shift ;; - *-tarfilename) - MYTARFILENAME="$2" - shift - ;; *) echo "Unknown parameter: $1" - echo 'Usage: $SERVICE --scm $SCM --url $URL [--subdir $SUBDIR] [--revision $REVISION] [--version $VERSION] [--include $INCLUDE]* [--exclude $EXCLUDE]* [--versionformat $FORMAT] [--versionprefix $PREFIX] [--filename $FILENAME] [--package-meta $META] [--submodules disable] [--tarfilename "${NAME}-${VERSION}"] --outdir $OUT' + echo 'Usage: $SERVICE --scm $SCM --url $URL [--subdir $SUBDIR] [--revision $REVISION] [--version $VERSION] [--include $INCLUDE]* [--exclude $EXCLUDE]* [--versionformat $FORMAT] [--versionprefix $PREFIX] [--filename $FILENAME] [--package-meta $META] [--submodules disable] --outdir $OUT' exit 1 ;; esac @@ -396,18 +391,23 @@ TAR_VERSION="$MYPREFIX$version" } +ISO_CLEANUP_RE='s@([0-9]{4})-([0-9]{2})-([0-9]{2}) +([0-9]{2})([:]([0-9]{2})([:]([0-9]{2}))?)?( +[-+][0-9]{3,4})?@\1\2\3T\4\6\8@g' + get_version () { case "$MYSCM" in git) #version=`safe_run git show --pretty=format:"$MYFORMAT" | head -n 1` if [[ "$MYFORMAT" =~ .*@PARENT_TAG@.* ]] ; then - MYFORMAT=${MYFORMAT/@PARENT_TAG@/$(git describe --tags --abbrev=0)} + PARENT_TAG=$(git describe --tags --abbrev=0) + PARENT_TAG=${PARENT_TAG/-/.} + MYFORMAT=${MYFORMAT/@PARENT_TAG@/$PARENT_TAG} + echo "MYFORMAT: $MYFORMAT" if [ $? -gt 0 ] ; then echo -e "\e[0;31mThe git repository has no tags, thus @PARENT_TAG@ can not be expanded\e[0m" exit 1 fi fi - version=`safe_run git log -n1 --date=short --pretty=format:"$MYFORMAT"|sed 's@-@@g'` + version=`safe_run git log -n1 --date=short --pretty=format:"$MYFORMAT" | sed -r -e "$ISO_CLEANUP_RE" -e 's@[-:]@@g'` ;; svn) #rev=`LC_ALL=C safe_run svn info | awk '/^Revision:/ { print $2 }'` @@ -441,7 +441,7 @@ # extract only the first value from the tuple, except for maybe # 'sub(...)' which is only available since 2.4 (first introduced # in openSUSE 12.3). - version=`safe_run hg log -l1 -r$rev --template "$MYFORMAT"|sed 's@-@@g'` + version=`safe_run hg log -l1 -r$rev --template "$MYFORMAT" | sed -r -e "$ISO_CLEANUP_RE" -e 's@[-:]@@g'` ;; bzr) #safe_run bzr log -l1 ... @@ -461,29 +461,26 @@ if [ -z "$TAR_VERSION" ]; then TAR_BASENAME="$FILE" else - NAME="$FILE" - VERSION="$TAR_VERSION" - TAR_BASEDIR="${FILE}-${TAR_VERSION}" - TAR_BASENAME=`eval echo ${MYTARFILENAME}` + TAR_BASENAME="${FILE}-${TAR_VERSION}" fi MYINCLUDES="" for INC in $INCLUDES; do - MYINCLUDES="$MYINCLUDES $TAR_BASEDIR/$INC" + MYINCLUDES="$MYINCLUDES $TAR_BASENAME/$INC" done if [ -z "$MYINCLUDES" ]; then - MYINCLUDES="$TAR_BASEDIR" + MYINCLUDES="$TAR_BASENAME" fi safe_run cd "$MYOUTDIR" if [ -n "$CACHEDIRECTORY" ]; then - debug cp -a "$REPOPATH/$MYSUBDIR" "$TAR_BASEDIR" - safe_run cp -a "$REPOPATH/$MYSUBDIR" "$TAR_BASEDIR" + debug cp -a "$REPOPATH/$MYSUBDIR" "$TAR_BASENAME" + safe_run cp -a "$REPOPATH/$MYSUBDIR" "$TAR_BASENAME" else - debug "mv #2: $REPOPATH/$MYSUBDIR -> $TAR_BASEDIR" - safe_run mv "$REPOPATH/$MYSUBDIR" "$TAR_BASEDIR" + debug mv3 "$REPOPATH/$MYSUBDIR" "$TAR_BASENAME" + safe_run mv "$REPOPATH/$MYSUBDIR" "$TAR_BASENAME" fi } @@ -496,8 +493,8 @@ } cleanup () { - debug rm -rf "$TAR_BASEDIR" "$FILE" - rm -rf "$TAR_BASEDIR" "$FILE" + debug rm -rf "$TAR_BASENAME" "$FILE" + rm -rf "$TAR_BASENAME" "$FILE" } main () { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-service-tar_scm-0.3.0.1375457512.9de0986/tar_scm.service new/obs-service-tar_scm-0.3.1.1383144507.58d1af8/tar_scm.service --- old/obs-service-tar_scm-0.3.0.1375457512.9de0986/tar_scm.service 2013-08-02 17:47:31.000000000 +0200 +++ new/obs-service-tar_scm-0.3.1.1383144507.58d1af8/tar_scm.service 2013-10-30 15:58:20.000000000 +0100 @@ -66,11 +66,5 @@ <allowedvalue>enable</allowedvalue> <allowedvalue>disable</allowedvalue> </param> - <param name="tarfilename"> - <description>RPM or Deb naming?</description> - <allowedvalue>${NAME}-${VERSION}</allowedvalue> - <allowedvalue>${NAME}_${VERSION}</allowedvalue> - <allowedvalue>${NAME}_${VERSION}.orig</allowedvalue> - </param> </service> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-service-tar_scm-0.3.0.1375457512.9de0986/tests/commontests.py new/obs-service-tar_scm-0.3.1.1383144507.58d1af8/tests/commontests.py --- old/obs-service-tar_scm-0.3.0.1375457512.9de0986/tests/commontests.py 2013-08-02 17:47:31.000000000 +0200 +++ new/obs-service-tar_scm-0.3.1.1383144507.58d1af8/tests/commontests.py 2013-10-30 15:58:20.000000000 +0100 @@ -9,12 +9,7 @@ from utils import mkfreshdir class CommonTests(TestEnvironment, TestAssertions): - def default_name(self): - return "repo" - - def basename(self, name=None, version=None): - if name is None: - name = self.default_name() + def basename(self, name='repo', version=None): if version is None: version = self.default_version() return '%s-%s' % (name, version) @@ -58,36 +53,6 @@ self.tar_scm_std('--filename', filename, '--version', version) self.assertTarOnly(self.basename(filename, version)) - def test_tarfilename(self): - filename = 'myfilename' - version = '0.7' - tarfilename = '${NAME}-${VERSION}' - tarbasename = filename + "-" + version - self.tar_scm_std('--filename', filename, '--version', version, '--tarfilename', tarfilename) - self.assertTarOnly( tarbasename = tarbasename, toptardir = self.basename(filename, version) ) - - def test_tarfilename_NAME_VERSION_defaults(self): - tarfilename = '${NAME}_${VERSION}' - tarbasename = self.default_name() + "_" + self.default_version() - self.tar_scm_std( '--tarfilename', tarfilename) - self.assertTarOnly( tarbasename = tarbasename, toptardir = self.basename() ) - - def test_tarfilename_NAME_VERSION(self): - filename = 'myfilename' - version = '0.7' - tarfilename = '${NAME}_${VERSION}' - tarbasename = filename + "_" + version - self.tar_scm_std('--filename', filename, '--version', version, '--tarfilename', tarfilename) - self.assertTarOnly( tarbasename = tarbasename, toptardir = self.basename(filename, version) ) - - def test_tarfilename_NAME_VERSION_orig(self): - filename = 'myfilename' - version = '0.7' - tarfilename = '${NAME}_${VERSION}.orig' - tarbasename = filename + "_" + version + ".orig" - self.tar_scm_std('--filename', filename, '--version', version, '--tarfilename', tarfilename) - self.assertTarOnly( tarbasename = tarbasename, toptardir = self.basename(filename, version) ) - def test_revision_nop(self): self.tar_scm_std('--revision', self.rev(2)) th = self.assertTarOnly(self.basename()) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-service-tar_scm-0.3.0.1375457512.9de0986/tests/githgtests.py new/obs-service-tar_scm-0.3.1.1383144507.58d1af8/tests/githgtests.py --- old/obs-service-tar_scm-0.3.0.1375457512.9de0986/tests/githgtests.py 2013-08-02 17:47:31.000000000 +0200 +++ new/obs-service-tar_scm-0.3.1.1383144507.58d1af8/tests/githgtests.py 2013-10-30 15:58:20.000000000 +0100 @@ -20,6 +20,10 @@ self.tar_scm_std('--versionformat', self.yyyymmdd_format) self.assertTarOnly(self.basename(version = self.dateYYYYMMDD(self.rev(2)))) + def test_versionformat_dateYYYYMMDDHHMMSS(self): + self.tar_scm_std('--versionformat', self.yyyymmddhhmmss_format) + self.assertTarOnly(self.basename(version = self.dateYYYYMMDDHHMMSS(self.rev(2)))) + def _mixed_version_format(self): return self.mixed_version_template % (self.timestamp_format, self.abbrev_hash_format) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-service-tar_scm-0.3.0.1375457512.9de0986/tests/gittests.py new/obs-service-tar_scm-0.3.1.1383144507.58d1af8/tests/gittests.py --- old/obs-service-tar_scm-0.3.0.1375457512.9de0986/tests/gittests.py 2013-08-02 17:47:31.000000000 +0200 +++ new/obs-service-tar_scm-0.3.1.1383144507.58d1af8/tests/gittests.py 2013-10-30 15:58:20.000000000 +0100 @@ -16,6 +16,7 @@ abbrev_hash_format = '%h' timestamp_format = '%ct' yyyymmdd_format = '%cd' + yyyymmddhhmmss_format = '%ci' def default_version(self): return self.timestamps(self.rev(2)) @@ -30,6 +31,11 @@ dateobj = datetime.date.fromtimestamp(float(self.timestamps(rev))) return dateobj.strftime("%4Y%02m%02d") + # This comment line helps align lines with hgtests.py. + def dateYYYYMMDDHHMMSS(self, rev): + dateobj = datetime.datetime.fromtimestamp(float(self.timestamps(rev))) + return dateobj.strftime("%4Y%02m%02dT%02H%02M%02S") + def rev(self, rev): f = self.fixtures return f.revs[f.repo_path][rev] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-service-tar_scm-0.3.0.1375457512.9de0986/tests/hgtests.py new/obs-service-tar_scm-0.3.1.1383144507.58d1af8/tests/hgtests.py --- old/obs-service-tar_scm-0.3.0.1375457512.9de0986/tests/hgtests.py 2013-08-02 17:47:31.000000000 +0200 +++ new/obs-service-tar_scm-0.3.1.1383144507.58d1af8/tests/hgtests.py 2013-10-30 15:58:20.000000000 +0100 @@ -15,6 +15,7 @@ abbrev_hash_format = '{node|short}' timestamp_format = '{date}' yyyymmdd_format = '{date|shortdate}' + yyyymmddhhmmss_format = '{date|isodatesec}' def default_version(self): return self.rev(2) @@ -28,3 +29,7 @@ def dateYYYYMMDD(self, rev): dateobj = datetime.date.fromtimestamp(self.timestamps(rev)[0]) return dateobj.strftime("%4Y%02m%02d") + + def dateYYYYMMDDHHMMSS(self, rev): + dateobj = datetime.datetime.fromtimestamp(self.timestamps(rev)[0]) + return dateobj.strftime("%4Y%02m%02dT%02H%02M%02S") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-service-tar_scm-0.3.0.1375457512.9de0986/tests/testassertions.py new/obs-service-tar_scm-0.3.1.1383144507.58d1af8/tests/testassertions.py --- old/obs-service-tar_scm-0.3.0.1375457512.9de0986/tests/testassertions.py 2013-08-02 17:47:31.000000000 +0200 +++ new/obs-service-tar_scm-0.3.1.1383144507.58d1af8/tests/testassertions.py 2013-10-30 15:58:20.000000000 +0100 @@ -79,9 +79,9 @@ tarpath = os.path.join(self.outdir, tar) return tarchecker(tarpath, toptardir) - def assertTarOnly(self, tarbasename, toptardir=None, **kwargs): + def assertTarOnly(self, tarbasename, **kwargs): dirents = self.assertNumDirents(self.outdir, 1) - return self.checkTar(dirents[0], tarbasename, toptardir, **kwargs) + return self.checkTar(dirents[0], tarbasename, **kwargs) def assertTarAndDir(self, tarbasename, dirname=None, **kwargs): if not dirname: @@ -103,7 +103,7 @@ self.assertTrue(os.path.isdir(os.path.join(self.outdir, wd)), dirname + ' should be directory') - return self.checkTar(tar, tarbasename, toptardir=dirname, **kwargs) + return self.checkTar(tar, tarbasename, **kwargs) def assertTarMemberContains(self, th, tarmember, contents): f = th.extractfile(tarmember) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit ez-ipupdate for openSUSE:Factory
by root＠hilbert.suse.de 01 Nov '13

01 Nov '13

Hello community, here is the log from the commit of package ez-ipupdate for openSUSE:Factory checked in at 2013-11-01 14:38:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ez-ipupdate (Old) and /work/SRC/openSUSE:Factory/.ez-ipupdate.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ez-ipupdate" Changes: -------- --- /work/SRC/openSUSE:Factory/ez-ipupdate/ez-ipupdate.changes 2013-04-12 20:29:55.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ez-ipupdate.new/ez-ipupdate.changes 2013-11-01 14:38:32.000000000 +0100 @@ -1,0 +2,17 @@ +Wed Oct 30 16:11:00 CET 2013 - pth(a)suse.de + +- Modify the creation of the service symlink. +- Use %builroot instead of $RPM_OPT_FLAGS. + +------------------------------------------------------------------- +Tue Oct 29 13:55:29 CET 2013 - pth(a)suse.de + +- Remove dist-xz from the options to AM_INIT_AUTOMAKE to make + it build on SLE. + +------------------------------------------------------------------- +Sun Oct 27 17:57:26 UTC 2013 - p.drouand(a)gmail.com + +- Add systemd support for openSUSE >= 12.3 + +------------------------------------------------------------------- New: ---- ez-ipupdate.service ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ez-ipupdate.spec ++++++ --- /var/tmp/diff_new_pack.GzCsb7/_old 2013-11-01 14:38:34.000000000 +0100 +++ /var/tmp/diff_new_pack.GzCsb7/_new 2013-11-01 14:38:34.000000000 +0100 @@ -26,6 +26,7 @@ Source0: %{name}-%{version}.tar.bz2 Source1: ez-ipupdate.init Source2: ez-ipupdate.example.conf +Source3: ez-ipupdate.service Patch: ez-ipupdate.example.conf.patch Patch1: ez-ipupdate-3.0.11b8-include.diff Patch2: ez-ipupdate-format-string-vuln.patch @@ -41,7 +42,12 @@ Patch8: ez-ipupdate-code_cleanup.patch Url: http://ez-ipupdate.com/ BuildRoot: %{_tmppath}/%{name}-%{version}-build -PreReq: %insserv_prereq +%if 0%{?suse_version} >=1230 +BuildRequires: pkgconfig(systemd) +%{?systemd_requires} +%else +Requires(pre): %insserv_prereq +%endif %description ez-ipupdate is a small utility for updating your hostname for any of @@ -94,24 +100,45 @@ make %{?_smp_mflags} %install -make DESTDIR=$RPM_BUILD_ROOT install -install -m 755 -d $RPM_BUILD_ROOT%{_sysconfdir} -install -m 755 -d $RPM_BUILD_ROOT%{_sysconfdir}/init.d -install -m 755 -d $RPM_BUILD_ROOT%{_localstatedir}/lib/ez-ipupdate/ -install -m 600 %{S:2} $RPM_BUILD_ROOT%{_sysconfdir}/ez-ipupdate.conf -install -m 755 %{S:1} $RPM_BUILD_ROOT%{_sysconfdir}/init.d/ez-ipupdate -install -d $RPM_BUILD_ROOT%{_sbindir} -ln -sf /etc/init.d/ez-ipupdate $RPM_BUILD_ROOT%{_sbindir}/rcez-ipupdate +make DESTDIR=%{buildroot} install +install -m 755 -d %{buildroot}%{_sysconfdir} +install -d %{buildroot}%{_sbindir} +%if 0%{?suse_version} >=1230 +install -m 755 -d %{buildroot}%{_unitdir} +%else +install -m 755 -d %{buildroot}%{_sysconfdir}/init.d +%endif +install -m 755 -d %{buildroot}%{_localstatedir}/lib/ez-ipupdate/ +install -m 600 %{S:2} %{buildroot}%{_sysconfdir}/ez-ipupdate.conf +%if 0%{?suse_version} >=1230 +install -m 755 %{S:3} %{buildroot}%{_unitdir}/ez-ipupdate.service +ln -sf /sbin/service %{buildroot}%{_sbindir}/rcez-ipupdate +%else +install -m 755 %{S:1} %{buildroot}%{_sysconfdir}/init.d/ez-ipupdate +ln -sf /etc/init.d/ez-ipupdate %{buildroot}%{_sbindir}/rcez-ipupdate +%endif %preun +%if 0%{?suse_version} >=1230 +%service_del_preun %{name}.service +%else %stop_on_removal %{name} +%endif %post +%if 0%{?suse_version} >=1230 +%service_add_post %{name}.service +%else %{fillup_and_insserv -f %{name}} +%endif %postun +%if 0%{?suse_version} >=1230 +%service_del_postun +%else %{name}.service %restart_on_update %{name} %insserv_cleanup +%endif %files %defattr(-, root, root) @@ -119,7 +146,11 @@ %{_bindir}/ez-ipupdate %{_sbindir}/rcez-ipupdate %config(noreplace) %{_sysconfdir}/ez-ipupdate.conf +%if 0%{?suse_version} >=1230 +%{_unitdir}/%{name}.service +%else %{_sysconfdir}/init.d/ez-ipupdate +%endif %{_localstatedir}/lib/ez-ipupdate/ %changelog ++++++ ez-ipupdate-fix_autofoo.patch ++++++ --- /var/tmp/diff_new_pack.GzCsb7/_old 2013-11-01 14:38:34.000000000 +0100 +++ /var/tmp/diff_new_pack.GzCsb7/_new 2013-11-01 14:38:34.000000000 +0100 @@ -1,12 +1,12 @@ --- Makefile.am | 11 ++++++++--- - configure.in | 59 ++++++++++++++++++++++++++++++++--------------------------- + configure.ac | 59 ++++++++++++++++++++++++++++++++--------------------------- 2 files changed, 40 insertions(+), 30 deletions(-) Index: Makefile.am =================================================================== ---- Makefile.am.orig 2001-07-07 23:19:35.000000000 +0200 -+++ Makefile.am 2013-04-11 12:05:21.086671161 +0200 +--- Makefile.am.orig 2013-10-29 13:53:18.608827074 +0100 ++++ Makefile.am 2013-10-29 13:54:03.306789770 +0100 @@ -1,8 +1,13 @@ bin_PROGRAMS = ez-ipupdate @@ -27,7 +27,7 @@ Index: configure.ac =================================================================== --- configure.ac.orig 2003-04-17 19:32:34.000000000 +0200 -+++ configure.ac 2013-04-11 12:19:08.454510832 +0200 ++++ configure.ac 2013-10-29 13:54:34.338065989 +0100 @@ -1,9 +1,10 @@ dnl Process this file with autoconf to produce a configure script. @@ -39,7 +39,7 @@ +AC_CONFIG_SRCDIR([ez-ipupdate.c]) +AC_CONFIG_HEADERS(config.h) +AC_CONFIG_FILES(Makefile) -+AM_INIT_AUTOMAKE([foreign dist-xz]) ++AM_INIT_AUTOMAKE([foreign]) dnl Checks for programs. ++++++ ez-ipupdate.service ++++++ [Unit] Description=Ez-ipupdate Check and update your IP to dynamic DNS Server After=network.target [Service] Type=forking PIDFile=/run/ez-ipupdate/ez-ipupdate.pid ExecStart=/usr/sbin/ez-ipupdate --daemon --config-file /etc/ez-ipupdate/default.conf --pid-file /run/ez-ipupdate/ez-ipupdate.pid [Install] WantedBy=multi-user.target -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit java-1_7_0-openjdk for openSUSE:13.1
by root＠hilbert.suse.de 01 Nov '13

01 Nov '13

Hello community, here is the log from the commit of package java-1_7_0-openjdk for openSUSE:13.1 checked in at 2013-11-01 07:55:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:13.1/java-1_7_0-openjdk (Old) and /work/SRC/openSUSE:13.1/.java-1_7_0-openjdk.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "java-1_7_0-openjdk" Changes: -------- --- /work/SRC/openSUSE:13.1/java-1_7_0-openjdk/java-1_7_0-openjdk.changes 2013-09-23 10:54:22.000000000 +0200 +++ /work/SRC/openSUSE:13.1/.java-1_7_0-openjdk.new/java-1_7_0-openjdk.changes 2013-11-01 07:55:16.000000000 +0100 @@ -1,0 +2,253 @@ +Tue Oct 29 09:53:04 UTC 2013 - mvyskocil(a)suse.com + +- refresh zero-powerpc patches + * java-1.7.0-openjdk-ppc-zero-hotspot.patch + * java-1.7.0-openjdk-ppc-zero-jdk.patch +- re-add _constraints + +------------------------------------------------------------------- +Tue Oct 22 13:29:45 UTC 2013 - mvyskocil(a)suse.com + +- Update to icedtea 2.4.3 (bnc#846999) + synchronized OpenJDK 7 support with the upstream u45 b31 tag +* Security fixes + - S8006900, CVE-2013-3829: Add new date/time capability + - S8008589: Better MBean permission validation + - S8011071, CVE-2013-5780: Better crypto provider handling + - S8011081, CVE-2013-5772: Improve jhat + - S8011157, CVE-2013-5814: Improve CORBA portablility + - S8012071, CVE-2013-5790: Better Building of Beans + - S8012147: Improve tool support + - S8012277: CVE-2013-5849: Improve AWT DataFlavor + - S8012425, CVE-2013-5802: Transform TransformerFactory + - S8013503, CVE-2013-5851: Improve stream factories + - S8013506: Better Pack200 data handling + - S8013510, CVE-2013-5809: Augment image writing code + - S8013514: Improve stability of cmap class + - S8013739, CVE-2013-5817: Better LDAP resource management + - S8013744, CVE-2013-5783: Better tabling for AWT + - S8014085: Better serialization support in JMX classes + - S8014093, CVE-2013-5782: Improve parsing of images + - S8014098: Better profile validation + - S8014102, CVE-2013-5778: Improve image conversion + - S8014341, CVE-2013-5803: Better service from Kerberos servers + - S8014349, CVE-2013-5840: (cl) Class.getDeclaredClass problematic in some class loader configurations + - S8014530, CVE-2013-5825: Better digital signature processing + - S8014534: Better profiling support + - S8014987, CVE-2013-5842: Augment serialization handling + - S8015614: Update build settings + - S8015731: Subject java.security.auth.subject to improvements + - S8015743, CVE-2013-5774: Address internet addresses + - S8016256: Make finalization final + - S8016653, CVE-2013-5804: javadoc should ignore ignoreable characters in names + - S8016675, CVE-2013-5797: Make Javadoc pages more robust + - S8017196, CVE-2013-5850: Ensure Proxies are handled appropriately + - S8017287, CVE-2013-5829: Better resource disposal + - S8017291, CVE-2013-5830: Cast Proxies Aside + - S8017298, CVE-2013-4002: Better XML support + - S8017300, CVE-2013-5784: Improve Interface Implementation + - S8017505, CVE-2013-5820: Better Client Service + - S8019292: Better Attribute Value Exceptions + - S8019617: Better view of objects + - S8020293: JVM crash + - S8021275, CVE-2013-5805: Better screening for ScreenMenu + - S8021282, CVE-2013-5806: Better recycling of object instances + - S8021286: Improve MacOS resourcing + - S8021290, CVE-2013-5823: Better signature validation + - S8022931, CVE-2013-5800: Enhance Kerberos exceptions + - S8022940: Enhance CORBA translations + - S8023683: Enhance class file parsing +* Backports + - S6614237: missing codepage Cp290 at java runtime + - S8005932: Java 7 on mac os x only provides text clipboard formats + - S8014046: (process) Runtime.exec(String) fails if command contains spaces [win] + - S8015144: Performance regression in ICU OpenType Layout library + - S8015965: (process) Typo in name of property to allow ambiguous commands + - S8015978: Incorrect transformation of XPath expression "string(-0)" + - S8016357: Update hotspot diagnostic class + - S8019584: javax/management/remote/mandatory/loading/MissingClassTest.java failed in nightly against jdk7u45: java.io.InvalidObjectException: Invalid notification: null + - S8019969: nioNetworkChannelInet6/SetOptionGetOptionTestInet6 test case crashes + - S8020032: 7u fastdebug doesn't generate fastdebuginfo file + - S8020085: Linux ARM build failure for 7u45 + - S8020088: Increment minor version of HSx for 7u45 and initialize the build number + - S8020551: increment hsx build to b03 for 7u45-b03 + - S8020943: Memory leak when GCNotifier uses create_from_platform_dependent_str() + - S8021287: Improve MacOS resourcing + - S8021355: REGRESSION: Five closed/java/awt/SplashScreen tests fail since 7u45 b01 on Linux, Solaris + - S8021360: object not exported" on start of JMXConnectorServer for RMI-IIOP protocol with security manager + - S8021366: java_util/Properties/PropertiesWithOtherEncodings fails during 7u45 nightly testing + - S8021577: JCK test api/javax_management/jmx_serial/modelmbean/ModelMBeanNotificationInfo/serial/index.html#Input has failed since jdk 7u45 b01 + - S8021899: Re-adjust fix of # 8020498 in 7u45 after mergeing 7u40 + - S8021901: Increment hsx build to b05 for 7u45-b05 + - S8021933: Add extra check for fix # JDK-8014530 + - S8021969: The index_AccessAllowed jnlp can not load successfully with exception thrown in the log. + - S8022066: Evaluation of method reference to signature polymorphic method crashes VM + - S8022086: Fixing licence of newly added files + - S8022254: Remove incorrect jdk7u45-b05 tag from jdk7u-cpu forest + - S8022661: InetAddress.writeObject() performs flush() on object output stream + - S8022682: Supporting XOM + - S8022808: Kitchensink hangs on macos + - S8022856: 7u45 l10n resource file translation update + - S8023323: Increment hsx build to b06 for 7u45-b08 + - S8023457: Event based tracing framework needs a mutex for thread groups + - S8023478: Test fails with HS crash in GCNotifier. + - S8023741: Increment hsx 24.45 build to b07 for 7u45-b09 + - S8023771: when USER_RELEASE_SUFFIX is set in order to add a string to java -version, build number in the bundles names should not be changed to b00 + - S8023888: Increment hsx 24.45 build to b08 for 7u45-b10 + - S8023964: java/io/IOException/LastErrorString.java should be @ignore-d + - S8024369: Increment build # of hs24.0 to b57 for 7u40-b61 psu + - S8024668: api/java_nio/charset/Charset/index.html#Methods JCK-runtime test fails with 7u45 b11 + - S8024697: Fix for 8020983 causes Xcheck:jni warnings + - S8024863: X11: Support GNOME Shell as mutter + - S8024883: (se) SelectableChannel.register throws NPE if fd >= 64k (lnx) + - S8025128: File.createTempFile fails if prefix is absolute path + - S8025170: jdk7u51 7u-1-prebuild is failing since 9/19 +* Bug fixes + - PR1400: Menu of maximized AWT window not working in Mate + +------------------------------------------------------------------- +Wed Sep 25 07:44:27 UTC 2013 - mvyskocil(a)suse.com + +- Update to icedtea 2.4.2 +* System LCMS 2 support again enabled by default, requiring 2.5 or above. +* OpenJDK + - S7122222: GC log is limited to 2G for 32-bit + - S7162400: Intermittent java.io.IOException: Bad file number during HotSpotVirtualMachine.executeCommand + - S7165807: Non optimized initialization of NSS crypto library leads to scalability issues + - S7199324: IPv6: JMXConnectorServer.getConnectionIDs() return IDs contradicting to address grammar + - S8001345: VM crashes with assert(n->outcnt() != 0 || C->top() == n || n->is_Proj()) failed: No dead instructions after post-alloc + - S8001424: G1: Rename certain G1-specific flags + - S8001425: G1: Change the default values for certain G1 specific flags + - S8004859: Graphics.getClipBounds/getClip return difference nonequivalent bounds, depending from transform + - S8005019: JTable passes row index instead of length when inserts selection interval + - S8005194: [parfait] #353 sun/awt/image/jpeg/imageioJPEG.c Memory leak of pointer 'scale' allocated with calloc() + - S8006941: [macosx] Deadlock in drag and drop + - S8007898: Incorrect optimization of Memory Barriers in Matcher::post_store_load_barrier() + - S8009168: accessibility.properties syntax issue + - S8009985: [parfait] Uninitialised variable at jdk/src/solaris/native/com/sun/management/UnixOperatingSystem_md.c + - S8011064: Some tests have failed with SIGSEGV on arm-hflt on build b82 + - S8011569: ARM -- avoid native stack walking + - S8011760: assert(delta != 0) failed: dup pointer in MemBaseline::malloc_sort_by_addr + - S8012144: multiple SIGSEGVs fails on staxf + - S8012156: tools/javac/file/zip/T6865530.java fails for win32/64 + - S8012241: NMT huge memory footprint, it usually leads to OOME + - S8012366: Fix for 8007815 breaks down when only building OpenJDK (without deploy and install forests) + - S8013546: compiler/8011901/Test8011901.java fails with CompilationError: Compilation failed + - S8013719: Increment build # of hs23.21 to b02 + - S8013791: G1: G1CollectorPolicy::initialize_flags() may set min_alignment > max_alignment + - S8014264: The applet pathguy_TimeDead throws java.lang.NullPointerException in java console once click drop-down check box. + - S8014312: Fork hs23.25 hsx from hs23.21 for jdk7u25 and reinitialize build number + - S8014805: NPE is thrown during certpath validation if certificate does not have AuthorityKeyIdentifier extension + - S8014850: Third Party License Readme updates for 7u40 + - S8014925: Disable sun.reflect.Reflection.getCallerClass(int) with a temporary switch to re-enable it + - S8015237: Parallelize string table scanning during strong root processing + - S8015411: Bump the hsx build number for 7u21-b50 for customer + - S8015441: runThese crashed with assert(opcode == Op_ConP || opcode == Op_ThreadLocal || opcode == Op_CastX2P ..) failed: sanity + - S8015576: CMS: svc agent throws java.lang.RuntimeException: No type named "FreeList" in database + - S8015668: overload resolution: performance regression in JDK 7 + - S8015884: runThese crashed with SIGSEGV, hs_err has an error instead of stacktrace + - S8016074: NMT: assertion failed: assert(thread->thread_state() == from) failed: coming from wrong thread state + - S8016102: Increment build # of hs23.25 to b02 for 7u25-b31 psu + - S8016131: nsk/sysdict/vm/stress/chain tests crash the VM in 'entry_frame_is_first()' + - S8016133: Regression: diff. behavior with user-defined SAXParser + - S8016157: During CTW: C2: assert(!def_outside->member(r)) failed: Use of external LRG overlaps the same LRG defined in this block + - S8016331: Minor issues in event tracing metadata + - S8016648: FEATURE_SECURE_PROCESSING set to true or false causes SAXParseException to be thrown + - S8016734: Remove extra code due to duplicated push + - S8016737: After clicking on "Print UNCOLLATED" button, the print out come in order 'Page 1', 'Page 2', 'Page 1' + - S8016740: assert in GC_locker from PSOldGen::expand with -XX:+PrintGCDetails and Verbose + - S8016767: Provide man pages generated from DARB for OpenJDK + - S8017070: G1: assert(_card_counts[card_num] <= G1ConcRSHotCardLimit) failed + - S8017159: Unexclude sun/tools/JMAP/Basic.sh test + - S8017173: XMLCipher with RSA_OAEP Key Transport algorithm can't be instantiated + - S8017174: NPE when using Logger.getAnonymousLogger or LogManager.getLogManager().getLogger + - S8017189: [macosx] AWT program menu disabled on Mac + - S8017252: new hotspot build - hs24-b51 + - S8017478: Kitchensink crashed with SIGSEGV in BaselineReporter::diff_callsites + - S8017483: G1 tests fail with native OOME on Solaris x86 after HeapBaseMinAddress has been increased + - S8017510: Add a regression test for 8005956 + - S8017566: Backout 8000450 - Cannot access to com.sun.corba.se.impl.orb.ORBImpl + - S8017588: SA: jstack -l throws UnalignedAddressException while attaching to core file for java that was started with CMS GC + - S8019155: Update makefiles with correct jfr packages + - S8019201: Regression: java.awt.image.ConvolveOp throws java.awt.image.ImagingOpException + - S8019236: [macosx] Add javadoc to the handleWindowFocusEvent in CEmbeddedFrame + - S8019265: [macosx] apple.laf.useScreenMenuBar regression comparing with jdk6 + - S8019298: new hotspot build - hs24-b52 + - S8019381: HashMap.isEmpty is non-final, potential issues for get/remove + - S8019541: 7u40 l10n resource file translation update + - S8019587: [macosx] Possibility to set the same frame for the different screens + - S8019625: Test compiler/8005956/PolynomialRoot.java timeouts on Solaris SPARCs + - S8019628: [macosx] closed/java/awt/Modal/BlockedMouseInputTest/BlockedMouseInputTest.html failed since 7u40b30 on MacOS + - S8019826: Test com/sun/management/HotSpotDiagnosticMXBean/SetVMOption.java fails with NPE + - S8019933: new hotspot build - hs24-b53 + - S8019979: Replace CheckPackageAccess test with better one from closed repo + - S8020038: [macosx] Incorrect usage of invokeLater() and likes in callbacks called via JNI from AppKit thread + - S8020054: (tz) Support tzdata2013d + - S8020155: PSR:PERF G1 not collecting old regions when humongous allocations interfer + - S8020215: Different execution plan when using JIT vs interpreter + - S8020228: Restore the translated version of logging_xx.properties + - S8020298: [macosx] Incorrect merge in the lwawt code + - S8020319: Update Japanese man pages for 7u40 + - S8020371: [macosx] applets with Drag and Drop fail with IllegalArgumentException + - S8020381: new hotspot build - hs24-b54 + - S8020425: Product options incorrectly removed in minor version + - S8020430: NullPointerException in xml sqe nightly result on 2013-07-12 + - S8020433: Crash when using -XX:+RestoreMXCSROnJNICalls + - S8020498: Crash when both libnet.so and libmawt.so are loaded + - S8020525: Increment build # of hs23.25 to b03 for 7u25-b34 psu ++++ 56 more lines (skipped) ++++ between /work/SRC/openSUSE:13.1/java-1_7_0-openjdk/java-1_7_0-openjdk.changes ++++ and /work/SRC/openSUSE:13.1/.java-1_7_0-openjdk.new/java-1_7_0-openjdk.changes Old: ---- 23ae4e0e0cce.tar.gz 5be6b670d08b.tar.gz 5f53e7717116.tar.gz 65d95818d79e.tar.gz 91c95fd8eea8.tar.gz ae86c6974e8e.tar.gz c0e48fdfb695.tar.gz icedtea-2.4.1.tar.gz icedtea-2.4.1.tar.gz.sig jamvm-7c8dceb90880616b7dd670f257961a1f5f371ec3.tar.gz java-1.7.0-openjdk-arm-fixes.patch java-1.7.0-openjdk-bitmap.patch java-1.7.0-openjdk-fork.patch java-1.7.0-openjdk-size_t.patch openjdk-7-src-b147-awt-crasher.patch New: ---- 3c8eb52a32ea.tar.gz 652eb396f959.tar.gz 7958751eb9ef.tar.gz 8ed5df839fbc.tar.gz 8f220f7b51c7.tar.gz PStack-808293.patch RH661505-toBeReverted.patch abrt_friendly_hs_log_jdk7.patch b59e02d9e72b.tar.gz e2f5917da3c1.tar.gz gstackbounds.patch icedtea-2.4.3.tar.xz icedtea-2.4.3.tar.xz.sig jamvm-ac22c9948434e528ece451642b4ebde40953ee7e.tar.gz java-1.7.0-openjdk-freetype-check-fix.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ java-1_7_0-openjdk.spec ++++++ --- /var/tmp/diff_new_pack.RDWi8j/_old 2013-11-01 07:55:18.000000000 +0100 +++ /var/tmp/diff_new_pack.RDWi8j/_new 2013-11-01 07:55:18.000000000 +0100 @@ -43,7 +43,7 @@ # If runtests is 0 test suites will not be run. %define runtests 0 -%define icedtea_version 2.4.1 +%define icedtea_version 2.4.3 %define hg_tag icedtea-{icedtea_version}-branchpoint %define openjdkdate 27_jun_2011 @@ -132,7 +132,7 @@ Group: Development/Languages/Java Url: http://icedtea.classpath.org -Source0: http://icedtea.wildebeest.org/download/source/icedtea-%{icedtea_version}.ta… +Source0: http://icedtea.wildebeest.org/download/source/icedtea-%{icedtea_version}.ta… # Gnome access bridge #Source9: %{accessurl}%{accessmajorver}/java-access-bridge-%{accessver}.tar.bz2 @@ -143,22 +143,22 @@ Source3: mauve-%{mauvedate}.tar.gz Source4: mauve_tests -Source5: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/archive/ae86c69… -Source6: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba/archive/2… -Source7: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp/archive/5b… -Source8: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws/archive/c… -Source9: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk/archive/65d… -Source10: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools/archi… -Source11: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot/archive… +Source5: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/archive/e2f5917… +Source6: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba/archive/8… +Source7: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp/archive/8f… +Source8: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws/archive/6… +Source9: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk/archive/795… +Source10: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools/archi… +Source11: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot/archive… # zero compatible hotspot #TODO: not needed Source12: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/hotspot/archive… -Source13: http://icedtea.classpath.org/download/drops/jamvm/jamvm-7c8dceb90880616b7dd… +Source13: http://icedtea.classpath.org/download/drops/jamvm/jamvm-ac22c9948434e528ece… #Source1000: java-1_7_0-openjdk-rpmlintrc # those properties are for opeSUSE only Source1001: fontconfig.SuSE.properties -Source2000: icedtea-%{icedtea_version}.tar.gz.sig +Source2000: icedtea-%{icedtea_version}.tar.xz.sig Source2001: java-1_7_0-openjdk.keyring # RPM/distribution specific patches @@ -185,27 +185,30 @@ # OpenJDK specific patches # -# Type fixing for s390 -Patch101: java-1.7.0-openjdk-bitmap.patch -Patch102: java-1.7.0-openjdk-size_t.patch - -# Patches for Arm -Patch103: java-1.7.0-openjdk-arm-fixes.patch - # Patch for PPC/PPC64 -Patch105: java-1.7.0-openjdk-ppc-zero-jdk.patch -Patch106: java-1.7.0-openjdk-ppc-zero-hotspot.patch +Patch104: java-1.7.0-openjdk-ppc-zero-jdk.patch +Patch105: java-1.7.0-openjdk-ppc-zero-hotspot.patch + +Patch106: java-1.7.0-openjdk-freetype-check-fix.patch # Patches for AArch64 -Patch107: java-1.7.0-openjdk-fork.patch Patch108: java-1.7.0-openjdk-zero-arch.patch Patch109: java-1.7.0-openjdk-makefiles-zero.patch +# allow to create hs_pid.log in tmp (in 700 permissions) if working directory is unwritable +Patch200: abrt_friendly_hs_log_jdk7.patch + # # Optional component packages # +#Workaround RH902004 +Patch402: gstackbounds.patch +Patch403: PStack-808293.patch +Patch404: RH661505-toBeReverted.patch +# End of tmp patches + # SUSE patches - from java-1_6_0-openjdk package Patch1000: java-1_7_0-openjdk-suse-desktop-files.patch @@ -230,6 +233,7 @@ BuildRequires: desktop-file-utils BuildRequires: giflib-devel BuildRequires: jpackage-utils >= 1.7.5 +BuildRequires: krb5-devel BuildRequires: libjpeg-devel # since 2.4.1 release, newest lcms2 is needed BuildRequires: liblcms2-devel >= 2.5 @@ -507,7 +511,6 @@ --with-parallel-jobs="${NUM_PROC}" \ %endif --with-pkgversion="suse-%{release}-%{_arch}" \ - --disable-bootstrap \ --with-jdk-home="/etc/alternatives/java_sdk/" \ %if %{with_pulseaudio} --enable-pulse-java \ @@ -538,7 +541,7 @@ # export an another patches dir, as this will not be in chroot, which is the # reason I use quilt - to be able edit patches directly in chroot function qpatch() { - quilt import ${1} ${2} + quilt import "${@}" quilt push } @@ -551,25 +554,26 @@ # qpatch -p0 %{PATCH6} # % endif -# Typo fixes -qpatch -p0 %{PATCH101} -qpatch -p0 %{PATCH102} - -# Arm fixes -qpatch -p0 %{PATCH103} +qpatch -p0 %{PATCH106} +qpatch -p0 %{PATCH200} %ifarch ppc ppc64 # PPC fixes +qpatch -p0 %{PATCH104} qpatch -p0 %{PATCH105} -qpatch -p0 %{PATCH106} %endif # AArch64 fixes -qpatch -p1 %{PATCH107} qpatch -p0 %{PATCH108} qpatch -p0 %{PATCH109} +%ifarch %{jit_arches} +qpatch -p0 %{PATCH402} +qpatch -p0 %{PATCH403} +%endif +qpatch -p0 -R %{PATCH404} + #SUSE specific fixes qpatch -p1 %{PATCH1002} ++++++ 23ae4e0e0cce.tar.gz -> 3c8eb52a32ea.tar.gz ++++++ ++++ 660491 lines of diff (skipped) ++++++ jamvm-7c8dceb90880616b7dd670f257961a1f5f371ec3.tar.gz -> 652eb396f959.tar.gz ++++++ ++++ 541782 lines of diff (skipped) ++++++ 23ae4e0e0cce.tar.gz -> 7958751eb9ef.tar.gz ++++++ /work/SRC/openSUSE:13.1/java-1_7_0-openjdk/23ae4e0e0cce.tar.gz /work/SRC/openSUSE:13.1/.java-1_7_0-openjdk.new/7958751eb9ef.tar.gz differ: char 5, line 1 ++++++ 23ae4e0e0cce.tar.gz -> 8ed5df839fbc.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/corba-23ae4e0e0cce/.hgtags new/corba-8ed5df839fbc/.hgtags --- old/corba-23ae4e0e0cce/.hgtags 2013-07-01 16:21:59.000000000 +0200 +++ new/corba-8ed5df839fbc/.hgtags 2013-10-16 16:17:36.000000000 +0200 @@ -296,7 +296,9 @@ b2adfd931a2504948d4fee780e4175122be10484 jdk7u21-b10 61e2e2d9cfcea20132b50d8fb7ead66a8a373db7 jdk7u21-b11 3c774492beaaff241c654add2c4e683b9ff002f2 jdk7u21-b30 +fa2a377ce52dfa88fca858d735d78b53f2b5b754 jdk7u21-b50 fa2a377ce52dfa88fca858d735d78b53f2b5b754 jdk7u21-b12 +c0231d18f496dd0bc133e128f6b667a4d8f569a5 jdk7u21-b31 3d0f2d5b1866860f7089b51cca8ca0ca41c04d9c jdk7u25-b01 cdbafc5080eeb8ea3fec9fe7d071e0bf96635581 jdk7u25-b02 2057de7ee6b17ab3335ec6cd5730f88f4cfe9502 jdk7u25-b03 @@ -308,10 +310,29 @@ 161ec4dd450d59e1b8ad136db231925c97ff6205 jdk7u25-b09 c9da98e82bb006dccd94a50871d6cdb66fa2d7e7 jdk7u25-b10 109386df5b8e259d0af802217769a3c448404e49 jdk7u25-b11 +38282b734daefcbb8155b7d7ef9664130330ed14 jdk7u14-b16 +8b1d77697ca4d2a9c29d67fd2ff03aded9b06012 jdk7u14-b17 +862b43d26e03bbceb3465f93354860e0d17eb324 jdk7u14-b18 +bfbaab73969d4d978d0280d6ad51bac8c47dbaf8 jdk7u14-b19 +bfbaab73969d4d978d0280d6ad51bac8c47dbaf8 jdk7u14-b19 +a921b45a1f9086a7d598a76f920639050386f996 jdk7u14-b19 +54320e5d9da60df24f0e2c57c011809911dc06e1 jdk7u14-b20 +fb590ca4de9aaf1f6bca945be040dffc55b5e8d2 jdk7u14-b21 +e5d89aa2c1a11dba841a646858dda9ea18dc8f57 jdk7u14-b22 +d85df1552f877a1cc51f43bc07a42a0c48f18e0b jdk7u40-b23 +d3ab3b19caa02ee85359cfe07b6e0b74eb7b3d74 jdk7u40-b24 +abfc54516d0b7f9aed34ef175f6bbb93fda4cbb3 jdk7u40-b25 +be9099c54a35c00d0dfe6beeed8ea5d4ab3cd3fe jdk7u40-b26 +f745eeabb0eaabe8c0835c175b31f1e1c0f00bd4 jdk7u40-b27 +c8b9201f88f4ce417df7a40efcb7fef656d94512 jdk7u40-b28 +1ad0a5a3f7b1e9d95670d733d7e70714050ba6bf jdk7u40-b29 ef8e6f8305d524f3b448a85f901aadf1adc81fc0 jdk7u25-b12 eca480919c71072a31f62a61cb3aad30677007e3 jdk7u25-b13 577c4dd1a6e9bc1bb2c2e5d5ecbab8eacb4121af jdk7u25-b14 4fde7ac2ecf4b170022ebbf8a961e6dbb229ccab jdk7u25-b15 +ddff7b2f69faaa8883e3986447daeab289f25e03 jdk7u25-b31 +9e2247c5d4b82798d393daf4e50cbadcaf0dc844 jdk7u25-b33 +1e888b6e1fb63cff9ea120bc7b0667578d82823b jdk7u25-b34 f4bec833a24b20f5ae770d0650350fc8950c9dc0 jdk7u25-b30 65d0e39500d56c6ea1fd52abbd1bef7966c3e87f jdk7u25-b16 d77153cbe030f91f432fae7c356cf6b5aab12a12 jdk7u25-b32 @@ -333,3 +354,40 @@ c8b9201f88f4ce417df7a40efcb7fef656d94512 jdk7u40-b28 1ad0a5a3f7b1e9d95670d733d7e70714050ba6bf jdk7u40-b29 651dcadbd9774165e017f8b7d1bde7d7d280ae1d jdk7u40-b30 +23ae4e0e0cce13779c531a704bf95fda1764882b icedtea-2.4.1 +3d2b811b8a798ff3b619f8330b08f551f7fdfd80 jdk7u40-b31 +c5f85903c49aa716ee3cb93361dd60a3e88d866d jdk7u40-b32 +1b7fbfdc31b859097d6a365ad0ba0e8ef92b4063 jdk7u40-b33 +ddd543ddf33017a15623cdf6908ae4ef2958e24e jdk7u40-b34 +fab3339a833da9631ead479621edcf6df2df457d jdk7u40-b35 +cd3871b1516988ea4a3099d6e1886abe2e74e771 jdk7u40-b36 +dc9a63376b39223bfb612d9e8efd275023de6399 jdk7u40-b37 +8391dff270bbf75dc434e53ed68993ab833475e8 jdk7u40-b38 +d7c73fd53c84cbb4333559cf788e554a2ef9326c jdk7u40-b39 +a91b57bf60bd982814bc1616ea46a1069416f5e4 jdk7u40-b40 +acb0571052b8dbef036fc50235ef95c0a46cff6b jdk7u40-b41 +b4a480a039bc19b27bfb5fcbbbf75e651d2718b7 jdk7u40-b42 +e29ea0b297e519010e661603a07bb8d48fa904a2 jdk7u40-b43 +08737d863a7aa5eb39374b26c9585e1770affe92 jdk7u40-b60 +5ea58899ae9f26e8ad21d1be15f73d426e2b5fb1 icedtea-2.4.2 +504acad3372298a79c231696d805f00f3beb2362 jdk7u40-b61 +c9c225fb19c3aa6e1242c051833ecc69d00b7aa1 jdk7u40-b62 +4f54264ca4df2fc50fbb9bb2654dad97776d10ac jdk7u45-b01 +1a1a1dedf437c50797a49c21a12161a79c761757 jdk7u45-b02 +3a2cca8c2f209b533af6c1201cc8aee43628e578 jdk7u45-b03 +4f4f7869bd6585042ad9596426dd1aa0829b8e98 jdk7u45-b04 +faee62d13040eae3d081f0383843a391ceef1edd jdk7u45-b05 +435dd0e1ab9ec9cbc83dc5ed260886f6becbef25 jdk7u45-b06 +2e19615f6045c3f39e39c56c485f7bc1df97e2ce jdk7u45-b07 +771c5c869d16d2da5668e412f505ad75f8f610c1 jdk7u45-b08 +a89d69bef3614f618843f5e9a495b12d13597851 jdk7u45-b09 +fd8a2041b75c4f712f2b08d627388d44a0cf2ee7 jdk7u45-b10 +55e0d3d9514343f380336b68aa8691a89b2e710b jdk7u45-b11 +336566c2905a49fc9a6f90f5ecd30517cfcaefff jdk7u45-b12 +6cadc3dd82a423f6c24460bb1997c0f39159dd93 jdk7u45-b13 +43e22471d0c29451f282b162864c2d3e494d5871 jdk7u45-b14 +3d7a52de59f03589d7a9334a6895063ff3331bfc jdk7u45-b15 +b1f069eb48edfa6fb7428dc045a53e287215ef4a jdk7u45-b16 +8b8793f06c56e343962b473bc0fb79f23b8be734 jdk7u45-b17 +80f65a8f58500ef5d93ddf4426d9c1909b79fadf jdk7u45-b18 +a15e4a54504471f1e34a494ed66235870722a0f5 jdk7u45-b30 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/corba-23ae4e0e0cce/THIRD_PARTY_README new/corba-8ed5df839fbc/THIRD_PARTY_README --- old/corba-23ae4e0e0cce/THIRD_PARTY_README 2013-07-01 16:21:59.000000000 +0200 +++ new/corba-8ed5df839fbc/THIRD_PARTY_README 2013-10-16 16:17:36.000000000 +0200 @@ -1912,6 +1912,35 @@ ------------------------------------------------------------------------------- +%% This notice is provided with respect to Sparkle v.1.5, +which is included with JRE 7 on Mac OS X. + +--- begin of LICENSE --- + +Copyright (c) 2012 Sparkle.org and Andy Matuschak + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. + +--- end of LICENSE --- + +------------------------------------------------------------------------------- + %% Portions licensed from Taligent, Inc. ------------------------------------------------------------------------------- @@ -3169,12 +3198,12 @@ %% This notice is provided with respect to the following which is included with JRE 7, JDK 7, and OpenJDK 7, except where noted: - Apache Derby 10.8.1.2 [included with JDK 7 only] + Apache Derby 10.8.3.0 [included with JDK 7 only] Apache Jakarta BCEL 5.2 Apache Jakarta Regexp 1.4 Apache Santuario XMLSec-Java 1.4.2 Apache Xalan-Java 2.7.1 - Apache Xerces2 Java 2.10.0 + Apache Xerces2 Java 2.11.0 Apache XML Resolver 1.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/corba-23ae4e0e0cce/make/common/shared/Defs-java.gmk new/corba-8ed5df839fbc/make/common/shared/Defs-java.gmk --- old/corba-23ae4e0e0cce/make/common/shared/Defs-java.gmk 2013-07-01 16:21:59.000000000 +0200 +++ new/corba-8ed5df839fbc/make/common/shared/Defs-java.gmk 2013-10-16 16:17:36.000000000 +0200 @@ -81,7 +81,7 @@ ifeq ($(ARCH_DATA_MODEL), 32) JAVAC_JVM_FLAGS += -J-XX:ThreadStackSize=768 else - JAVAC_JVM_FLAGS += -J-XX:ThreadStackSize=1536 + JAVAC_JVM_FLAGS += -J-XX:ThreadStackSize=1664 endif JAVAC_JVM_FLAGS += $(JAVA_TOOLS_FLAGS:%=-J%) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/corba-23ae4e0e0cce/make/common/shared/Platform.gmk new/corba-8ed5df839fbc/make/common/shared/Platform.gmk --- old/corba-23ae4e0e0cce/make/common/shared/Platform.gmk 2013-07-01 16:21:59.000000000 +0200 +++ new/corba-8ed5df839fbc/make/common/shared/Platform.gmk 2013-10-16 16:17:36.000000000 +0200 @@ -154,7 +154,7 @@ # Arch and OS name/version mach := $(shell uname -m) ifneq (,$(wildcard /usr/bin/dpkg-architecture)) - mach := $(shell (dpkg-architecture -qDEB_BUILD_ARCH_CPU 2>/dev/null || echo $(mach)) | sed 's/powerpc$$/ppc/;s/hppa/parisc/') + mach := $(shell (dpkg-architecture -qDEB_HOST_ARCH_CPU 2>/dev/null || echo $(mach)) | sed 's/arm64/aarch64/;s/powerpc$$/ppc/;s/hppa/parisc/') endif archExpr = case "$(mach)" in \ i[3-9]86) \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/corba-23ae4e0e0cce/src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_ja.properties new/corba-8ed5df839fbc/src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_ja.properties --- old/corba-23ae4e0e0cce/src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_ja.properties 2013-07-01 16:21:59.000000000 +0200 +++ new/corba-8ed5df839fbc/src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_ja.properties 2013-10-16 16:17:36.000000000 +0200 @@ -60,12 +60,12 @@ servertool.getserverid1=applicationName\u306E\u30B5\u30FC\u30D0\u30FCID\u3092\u8FD4\u3057\u307E\u3059 servertool.getserverid2=\tapplicationName {0}\u306E\u30B5\u30FC\u30D0\u30FCID\u306F{1}\u3067\u3059 -servertool.list=\n\t\u30EA\u30B9\u30C8\u3092\u8868\u793A\u3057\u307E\u3059\n +servertool.list=\n\tlist\n servertool.list1=\u767B\u9332\u3055\u308C\u305F\u3059\u3079\u3066\u306E\u30B5\u30FC\u30D0\u30FC\u306E\u30EA\u30B9\u30C8\u3092\u8868\u793A\u3057\u307E\u3059 servertool.list2=\n\t\u30B5\u30FC\u30D0\u30FCID\t\u30B5\u30FC\u30D0\u30FC\u306E\u30AF\u30E9\u30B9\u540D\t\t\u30B5\u30FC\u30D0\u30FC\u30FB\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\n\t---------\t----------------\t\t----------------------\n -servertool.listactive=\n\t\u30A2\u30AF\u30C6\u30A3\u30D6\u306A\u30B5\u30FC\u30D0\u30FC\u306E\u30EA\u30B9\u30C8\u3092\u8868\u793A\u3057\u307E\u3059 +servertool.listactive=\n\tlistactive servertool.listactive1=\u73FE\u5728\u30A2\u30AF\u30C6\u30A3\u30D6\u306A\u30B5\u30FC\u30D0\u30FC\u306E\u30EA\u30B9\u30C8\u3092\u8868\u793A\u3057\u307E\u3059 -servertool.listappnames=\tapplicationNames\u306E\u30EA\u30B9\u30C8\u3092\u8868\u793A\u3057\u307E\u3059\n +servertool.listappnames=\tlistappnames\n servertool.listappnames1=\u73FE\u5728\u5B9A\u7FA9\u3055\u308C\u3066\u3044\u308BapplicationNames\u306E\u30EA\u30B9\u30C8\u3092\u8868\u793A\u3057\u307E\u3059 servertool.listappnames2=\u73FE\u5728\u5B9A\u7FA9\u3055\u308C\u3066\u3044\u308B\u30B5\u30FC\u30D0\u30FCapplicationNames: @@ -76,7 +76,7 @@ servertool.startserver1=\u767B\u9332\u3055\u308C\u305F\u30B5\u30FC\u30D0\u30FC\u3092\u8D77\u52D5\u3057\u307E\u3059 servertool.startserver2=\t\u30B5\u30FC\u30D0\u30FC\u306E\u8D77\u52D5\u306B\u6210\u529F\u3057\u307E\u3057\u305F\u3002 -servertool.quit=\n\t\u7D42\u4E86\u3057\u307E\u3059\n +servertool.quit=\n\tquit\n servertool.quit1=\u3053\u306E\u30C4\u30FC\u30EB\u3092\u7D42\u4E86\u3057\u307E\u3059 servertool.help=\thelp\n\t\u307E\u305F\u306F\n\thelp <command name>\n diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/corba-23ae4e0e0cce/src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_ko.properties new/corba-8ed5df839fbc/src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_ko.properties --- old/corba-23ae4e0e0cce/src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_ko.properties 2013-07-01 16:21:59.000000000 +0200 +++ new/corba-8ed5df839fbc/src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_ko.properties 2013-10-16 16:17:36.000000000 +0200 @@ -26,7 +26,7 @@ orbd.usage=\uC0AC\uC6A9\uBC95: {0} <options> \n\n\uC5EC\uAE30\uC11C <options>\uB294 \uB2E4\uC74C\uACFC \uAC19\uC2B5\uB2C8\uB2E4.\n -port ORBD\uAC00 \uC2DC\uC791\uB418\uC5B4\uC57C \uD558\uB294 \uD65C\uC131 \uD3EC\uD2B8\uB85C, \uAE30\uBCF8\uAC12\uC740 1049\uC785\uB2C8\uB2E4(\uC120\uD0DD \uC0AC\uD56D).\n -defaultdb ORBD \uD30C\uC77C\uC758 \uB514\uB809\uD1A0\uB9AC\uB85C, \uAE30\uBCF8\uAC12\uC740 "./orb.db"\uC785\uB2C8\uB2E4(\uC120\uD0DD \uC0AC\uD56D).\n -serverid ORBD\uC758 \uC11C\uBC84 ID\uB85C, \uAE30\uBCF8\uAC12\uC740 1 \uC785\uB2C8\uB2E4(\uC120\uD0DD \uC0AC\uD56D).\n -ORBInitialPort \uCD08\uAE30 \uD3EC\uD2B8\uC785\uB2C8\uB2E4(\uD544\uC218).\n -ORBInitialHost \uCD08\uAE30 HostName\uC785\uB2C8\uB2E4(\uD544\uC218).\n servertool.usage=\uC0AC\uC6A9\uBC95: {0} <options> \n\n\uC5EC\uAE30\uC11C <options>\uB294 \uB2E4\uC74C\uACFC \uAC19\uC2B5\uB2C8\uB2E4.\n -ORBInitialPort \uCD08\uAE30 \uD3EC\uD2B8\uC785\uB2C8\uB2E4(\uD544\uC218).\n -ORBInitialHost \uCD08\uAE30 HostName\uC785\uB2C8\uB2E4(\uD544\uC218).\n -servertool.banner=\n\nJava IDL \uC11C\uBC84 \uD234 \uC2DC\uC791 \n\uD504\uB86C\uD504\uD2B8\uC5D0 \uBA85\uB839\uC744 \uC785\uB825\uD558\uC2ED\uC2DC\uC624.\n +servertool.banner=\n\nJava IDL \uC11C\uBC84 \uD234 \uC2DC\uC791 \n\uD504\uB86C\uD504\uD2B8\uC5D0 \uBA85\uB839\uC744 \uC785\uB825\uD558\uC2ED\uC2DC\uC624. \n servertool.shorthelp=\n\n\t\uC0AC\uC6A9 \uAC00\uB2A5\uD55C \uBA85\uB839: \n\t------------------- \n servertool.baddef=\uC798\uBABB\uB41C \uC11C\uBC84 \uC815\uC758: {0} servertool.nosuchserver=\t\uD574\uB2F9 \uC11C\uBC84\uB97C \uCC3E\uC744 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/corba-23ae4e0e0cce/src/share/classes/com/sun/corba/se/impl/presentation/rmi/IDLNameTranslatorImpl.java new/corba-8ed5df839fbc/src/share/classes/com/sun/corba/se/impl/presentation/rmi/IDLNameTranslatorImpl.java --- old/corba-23ae4e0e0cce/src/share/classes/com/sun/corba/se/impl/presentation/rmi/IDLNameTranslatorImpl.java 2013-07-01 16:21:59.000000000 +0200 +++ new/corba-8ed5df839fbc/src/share/classes/com/sun/corba/se/impl/presentation/rmi/IDLNameTranslatorImpl.java 2013-10-16 16:17:36.000000000 +0200 @@ -905,28 +905,4 @@ return contents.toString(); } - - public static void main(String[] args) { - - Class remoteInterface = java.rmi.Remote.class; - - if( args.length > 0 ) { - String className = args[0]; - try { - remoteInterface = Class.forName(className); - } catch(Exception e) { - e.printStackTrace(); - System.exit(-1); - } - } - - System.out.println("Building name translation for " + remoteInterface); - try { - IDLNameTranslator nameTranslator = - IDLNameTranslatorImpl.get(remoteInterface); - System.out.println(nameTranslator); - } catch(IllegalStateException ise) { - ise.printStackTrace(); - } - } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/corba-23ae4e0e0cce/src/share/classes/com/sun/corba/se/impl/presentation/rmi/InvocationHandlerFactoryImpl.java new/corba-8ed5df839fbc/src/share/classes/com/sun/corba/se/impl/presentation/rmi/InvocationHandlerFactoryImpl.java --- old/corba-23ae4e0e0cce/src/share/classes/com/sun/corba/se/impl/presentation/rmi/InvocationHandlerFactoryImpl.java 2013-07-01 16:21:59.000000000 +0200 +++ new/corba-8ed5df839fbc/src/share/classes/com/sun/corba/se/impl/presentation/rmi/InvocationHandlerFactoryImpl.java 2013-10-16 16:17:36.000000000 +0200 @@ -43,6 +43,8 @@ import com.sun.corba.se.spi.orbutil.proxy.DelegateInvocationHandlerImpl ; import com.sun.corba.se.spi.orbutil.proxy.CompositeInvocationHandler ; import com.sun.corba.se.spi.orbutil.proxy.CompositeInvocationHandlerImpl ; +import java.security.AccessController; +import java.security.PrivilegedAction; public class InvocationHandlerFactoryImpl implements InvocationHandlerFactory { @@ -114,24 +116,32 @@ // which extends org.omg.CORBA.Object. This handler delegates all // calls directly to a DynamicStubImpl, which extends // org.omg.CORBA.portable.ObjectImpl. - InvocationHandler dynamicStubHandler = + final InvocationHandler dynamicStubHandler = DelegateInvocationHandlerImpl.create( stub ) ; // Create an invocation handler that handles any remote interface // methods. - InvocationHandler stubMethodHandler = new StubInvocationHandlerImpl( + final InvocationHandler stubMethodHandler = new StubInvocationHandlerImpl( pm, classData, stub ) ; // Create a composite handler that handles the DynamicStub interface // as well as the remote interfaces. final CompositeInvocationHandler handler = new CustomCompositeInvocationHandlerImpl( stub ) ; + + AccessController.doPrivileged(new PrivilegedAction<Void>() { + @Override + public Void run() { handler.addInvocationHandler( DynamicStub.class, dynamicStubHandler ) ; handler.addInvocationHandler( org.omg.CORBA.Object.class, dynamicStubHandler ) ; handler.addInvocationHandler( Object.class, dynamicStubHandler ) ; + return null; + } + }); + // If the method passed to invoke is not from DynamicStub or its superclasses, // it must be from an implemented interface, so we just handle diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/corba-23ae4e0e0cce/src/share/classes/com/sun/corba/se/impl/transport/SelectorImpl.java new/corba-8ed5df839fbc/src/share/classes/com/sun/corba/se/impl/transport/SelectorImpl.java --- old/corba-23ae4e0e0cce/src/share/classes/com/sun/corba/se/impl/transport/SelectorImpl.java 2013-07-01 16:21:59.000000000 +0200 +++ new/corba-8ed5df839fbc/src/share/classes/com/sun/corba/se/impl/transport/SelectorImpl.java 2013-10-16 16:17:36.000000000 +0200 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -55,7 +55,7 @@ /** * @author Harold Carr */ -public class SelectorImpl +class SelectorImpl extends Thread implements diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/corba-23ae4e0e0cce/src/share/classes/com/sun/corba/se/spi/orbutil/proxy/CompositeInvocationHandlerImpl.java new/corba-8ed5df839fbc/src/share/classes/com/sun/corba/se/spi/orbutil/proxy/CompositeInvocationHandlerImpl.java --- old/corba-23ae4e0e0cce/src/share/classes/com/sun/corba/se/spi/orbutil/proxy/CompositeInvocationHandlerImpl.java 2013-07-01 16:21:59.000000000 +0200 +++ new/corba-8ed5df839fbc/src/share/classes/com/sun/corba/se/spi/orbutil/proxy/CompositeInvocationHandlerImpl.java 2013-10-16 16:17:36.000000000 +0200 @@ -36,6 +36,7 @@ import com.sun.corba.se.spi.logging.CORBALogDomains ; import com.sun.corba.se.impl.logging.ORBUtilSystemException ; +import com.sun.corba.se.impl.presentation.rmi.DynamicAccessPermission; public class CompositeInvocationHandlerImpl implements CompositeInvocationHandler @@ -46,11 +47,13 @@ public void addInvocationHandler( Class interf, InvocationHandler handler ) { + checkAccess(); classToInvocationHandler.put( interf, handler ) ; } public void setDefaultHandler( InvocationHandler handler ) { + checkAccess(); defaultHandler = handler ; } @@ -78,4 +81,12 @@ return handler.invoke( proxy, method, args ) ; } + + private static final DynamicAccessPermission perm = new DynamicAccessPermission("access"); + private void checkAccess() { + final SecurityManager sm = System.getSecurityManager(); + if (sm != null) { + sm.checkPermission(perm); +} + } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/corba-23ae4e0e0cce/src/share/classes/com/sun/tools/corba/se/idl/idl_ja.prp new/corba-8ed5df839fbc/src/share/classes/com/sun/tools/corba/se/idl/idl_ja.prp --- old/corba-23ae4e0e0cce/src/share/classes/com/sun/tools/corba/se/idl/idl_ja.prp 2013-07-01 16:21:59.000000000 +0200 +++ new/corba-8ed5df839fbc/src/share/classes/com/sun/tools/corba/se/idl/idl_ja.prp 2013-10-16 16:17:36.000000000 +0200 @@ -114,7 +114,7 @@ ParseException.badState=%0 (\u884C%1): %2\u306F\u30B9\u30C6\u30FC\u30C8\u30D5\u30EB\u30FB\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306B\u3067\u304D\u307E\u305B\u3093\u3002\u8907\u6570\u306E\u30B9\u30C6\u30FC\u30C8\u30D5\u30EB\u89AA\u304C\u3042\u308A\u307E\u3059\u3002\n%3\n%4 ParseException.branchLabel=%0 (\u884C%1): case %2\u306F\u3059\u3067\u306B\u5BA3\u8A00\u3055\u308C\u3066\u3044\u307E\u3059\u3002\n%3\n%4 ParseException.branchName=%0 (\u884C%1): %2\u3068\u3044\u3046\u540D\u524D\u306E\u5206\u5C90\u306F\u3059\u3067\u306B\u5BA3\u8A00\u3055\u308C\u3066\u3044\u307E\u3059\u3002\n%3\n%4 -ParseException.duplicateInit=%0 (\u884C%1): \u521D\u671F\u5316\u5B50\u306B\u306F\u524D\u306E\u521D\u671F\u5316\u5B50\u3068\u540C\u3058\u7F72\u540D\u304C\u3042\u308A\u307E\u3059\u3002\n%2\n%3 +ParseException.duplicateInit=%0 (\u884C%1): \u521D\u671F\u5316\u5B50\u306B\u306F\u524D\u306E\u521D\u671F\u5316\u5B50\u3068\u540C\u3058\u30B7\u30B0\u30CD\u30C1\u30E3\u304C\u3042\u308A\u307E\u3059\u3002\n%2\n%3 ParseException.duplicateState=%0 (\u884C%1): \u30C7\u30FC\u30BF\u30FB\u30E1\u30F3\u30D0\u30FC%2\u306E\u540D\u524D\u304C\u524D\u306E\u30C7\u30FC\u30BF\u30FB\u30E1\u30F3\u30D0\u30FC\u3068\u540C\u3058\u3067\u3059\u3002\n%3\n%4 ParseException.elseNoIf=%0 (\u884C%1): \u4E00\u81F4\u3059\u308B#if\u304C\u306A\u3044#else\u304C\u691C\u51FA\u3055\u308C\u307E\u3057\u305F\u3002\n%2\n%3 ParseException.endNoIf=%0 (\u884C%1): \u4E00\u81F4\u3059\u308B#if\u304C\u306A\u3044#endif\u304C\u691C\u51FA\u3055\u308C\u307E\u3057\u305F\u3002\n%2\n%3 @@ -146,7 +146,7 @@ ParseException.stringTooLong=%0 (\u884C%1): "%2"\u306F%3\u6587\u5B57\u4EE5\u5185\u306B\u3057\u3066\u304F\u3060\u3055\u3044\u3002\n%4\n%5 ParseException.syntax1=%0 (\u884C%1): `%2'\u304C\u5FC5\u8981\u3067\u3059\u304C\u3001`%3'\u304C\u691C\u51FA\u3055\u308C\u307E\u3057\u305F\u3002\n%4\n%5 ParseException.syntax2=%0 (\u884C%1): %2\u306E1\u3064\u304C\u5FC5\u8981\u3067\u3059\u304C\u3001`%3'\u304C\u691C\u51FA\u3055\u308C\u307E\u3057\u305F\u3002\n%4\n%5 -ParseException.unclosed=%0: \u30B3\u30E1\u30F3\u30C8\u3067\u4E88\u671F\u3057\u306A\u3044EOF\u3092\u691C\u51FA\u3057\u307E\u3057\u305F\u3002 +ParseException.unclosed=%0: \u30B3\u30E1\u30F3\u30C8\u3067\u4E88\u671F\u3057\u306A\u3044\u30D5\u30A1\u30A4\u30EB\u306E\u7D42\u308F\u308A\u3092\u691C\u51FA\u3057\u307E\u3057\u305F\u3002 ParseException.undeclaredType=%0 (\u884C%1): %2\u306F\u5BA3\u8A00\u3055\u308C\u3066\u3044\u306A\u3044\u578B\u3067\u3059\u3002\n%3\n%4 ParseException.warning=%0 (\u884C%1): %2\n%3\n%4 ParseException.constExprType=%0 (\u884C%1): \u5B9A\u6570\u5F0F\u306E\u578B\u306F%2\u3067\u3059\u304C\u3001%3\u306B\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002\n%4\n%5 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/corba-23ae4e0e0cce/src/share/classes/com/sun/tools/corba/se/idl/idl_zh_CN.prp new/corba-8ed5df839fbc/src/share/classes/com/sun/tools/corba/se/idl/idl_zh_CN.prp --- old/corba-23ae4e0e0cce/src/share/classes/com/sun/tools/corba/se/idl/idl_zh_CN.prp 2013-07-01 16:21:59.000000000 +0200 +++ new/corba-8ed5df839fbc/src/share/classes/com/sun/tools/corba/se/idl/idl_zh_CN.prp 2013-10-16 16:17:36.000000000 +0200 @@ -64,7 +64,7 @@ # # Translator: Start Translating -Compile.parsing=\u6B63\u5728\u5BF9 %0 \u8FDB\u884C\u8BED\u6CD5\u5206\u6790 +Compile.parsing=\u6B63\u5728\u89E3\u6790 %0 Compile.parseDone=\u5B8C\u6210 - %0 Compile.generating=\u6B63\u5728\u751F\u6210 %0 Compile.genDone=\u5B8C\u6210 - %0 @@ -165,7 +165,7 @@ Token.endOfFile=EOF Token.unknown=? Util.cantCreatePkg=\u65E0\u6CD5\u521B\u5EFA\u7A0B\u5E8F\u5305%0\u3002 -Version.product=IDL \u8BED\u6CD5\u5206\u6790\u5668\u6846\u67B6, \u7248\u672C "%0" +Version.product=IDL \u89E3\u6790\u5668\u6846\u67B6, \u7248\u672C "%0" Version.number=3.2 default=\u9519\u8BEF! \u8BF7\u6C42\u4E86\u4E0D\u5B58\u5728\u7684\u6D88\u606F\u3002\u6D88\u606F\u6587\u4EF6\u672A\u5305\u542B\u5173\u952E\u5B57: %0\u3002 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/corba-23ae4e0e0cce/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/toJavaPortable_ja.prp new/corba-8ed5df839fbc/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/toJavaPortable_ja.prp --- old/corba-23ae4e0e0cce/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/toJavaPortable_ja.prp 2013-07-01 16:21:59.000000000 +0200 +++ new/corba-8ed5df839fbc/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/toJavaPortable_ja.prp 2013-10-16 16:17:36.000000000 +0200 @@ -53,7 +53,7 @@ # toJavaProlog1=%0\u306B\u3088\u3063\u3066\u751F\u6210\u3055\u308C\u307E\u3057\u305F toJavaProlog2=%0\u304B\u3089 -PreEmit.indeterminateTypeInfo=%0\u306E\u30BF\u30A4\u30D7\u60C5\u5831\u3092\u5224\u65AD\u3067\u304D\u307E\u305B\u3093\u3002 +PreEmit.indeterminateTypeInfo=%0\u306E\u30BF\u30A4\u30D7\u60C5\u5831\u3092\u5224\u5225\u3067\u304D\u307E\u305B\u3093\u3002 InterfaceGen.noImpl=%0\u306E\u30ED\u30FC\u30AB\u30EB\u5B9F\u88C5\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002 Version.product=IDL-to-Java\u30B3\u30F3\u30D1\u30A4\u30E9(\u30DD\u30FC\u30BF\u30D6\u30EB)\u3001\u30D0\u30FC\u30B8\u30E7\u30F3"%0" Version.number=3.2 @@ -65,4 +65,5 @@ # -d, -emitAll, -f, -i, -keep, -m, -sep, -pkgPrefix, -td, -v, -verbose, -version, -implbase # Do not translate the string "java com.sun.tools.corba.se.idl.toJavaPortable.Compile" # -usage=\u30B3\u30F3\u30D1\u30A4\u30E9\u306E\u4F7F\u7528\u65B9\u6CD5:\n\n java com.sun.tools.corba.se.idl.toJavaPortable.Compile [options] <idl file>\n\n<idl file>\u306FIDL\u5B9A\u7FA9\u3092\u542B\u3080\u30D5\u30A1\u30A4\u30EB\u306E\u540D\u524D\u3067\u3001\n[options]\u306F\u6B21\u306B\u30EA\u30B9\u30C8\u3059\u308B\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u7D44\u5408\u305B\u3067\u3059\u3002\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\n\u7701\u7565\u53EF\u80FD\u3067\u3001\u4EFB\u610F\u306E\u9806\u5E8F\u3067\u8868\u793A\u3055\u308C\u307E\u3059\u3002<idl file>\u306F\u5FC5\u9808\u3067\u3001\n\u6700\u5F8C\u306B\u8868\u793A\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002\n \n\u30AA\u30D7\u30B7\u30E7\u30F3:\n-d <symbol> IDL\u30D5\u30A1\u30A4\u30EB\u306E\u6B21\u306E\u884C\u3068\n \u540C\u3058\u3067\u3059: #define <symbol>\n-emitAll #included\u30D5\u30A1\u30A4\u30EB\u3067\u898B\u3064\u304B\u3063\u305F\u30BF\u30A4\u30D7\u3092\u542B\u3080\u3001\u3059\u3079\u3066\u306E\u30BF\u30A4\u30D7\u3092\u767A\u884C\u3057\u307E\u3059\u3002\n-f<side> \u767A\u884C\u3059\u308B\u30D0\u30A4\u30F3\u30C7\u30A3\u30F3\u30B0\u3092\u5B9A\u7FA9\u3057\u307E\u3059\u3002<side>\u306Fclient\u3001\n server\u3001all\u3001serverTIE\u3001allTIE\u306E\u3044\u305A\u308C\u304B\u3067\u3059\u3002serverTIE\u3068allTIE\u306F\n \u59D4\u4EFB\u30E2\u30C7\u30EB\u30FB\u30B9\u30B1\u30EB\u30C8\u30F3\u3092\u767A\u884C\u3057\u307E\u3059\u3002\u3053\u306E\u30D5\u30E9\u30B0\u3092\n \u4F7F\u7528\u3057\u306A\u3044\u5834\u5408\u306F\u3001-fclient\u3068\u307F\u306A\u3055\u308C\u307E\u3059\u3002\n-i <include path> \u30C7\u30D5\u30A9\u30EB\u30C8\u3067\u306F\u3001\u73FE\u5728\u306E\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306E\u30A4\u30F3\u30AF\u30EB\u30FC\u30C9\u3055\u308C\u305F\u30D5\u30A1\u30A4\u30EB\u304C\n \u30B9\u30AD\u30E3\u30F3\u3055\u308C\u307E\u3059\u3002\u3053\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u5225\u306E\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3092\u8FFD\u52A0\u3057\u307E\u3059\u3002\n-keep \u751F\u6210\u3055\u308C\u308B\u30D5\u30A1\u30A4\u30EB\u304C\u3059\u3067\u306B\u5B58\u5728\u3059\u308B\u5834\u5408\u306F\u3001\u4E0A\u66F8\u304D\n \u3057\u307E\u305B\u3093\u3002\u30C7\u30D5\u30A9\u30EB\u30C8\u3067\u306F\u4E0A\u66F8\u304D\u3055\u308C\u307E\u3059\u3002\n-noWarn \u8B66\u544A\u3092\u51FA\u3055\u306A\u3044\u3088\u3046\u306B\u3057\u307E\u3059\u3002\n-oldImplBase \u53E4\u3044(1.4\u4EE5\u524D) JDK ORB\u3068\u4E92\u63DB\u6027\u306E\u3042\u308B\u30B9\u30B1\u30EB\u30C8\u30F3\u3092\u751F\u6210\u3057\u307E\u3059\u3002\n-pkgPrefix <t> <prefix> \u30D5\u30A1\u30A4\u30EB\u30FB\u30B9\u30B3\u30FC\u30D7\u3067\u30BF\u30A4\u30D7\u307E\u305F\u306F\u30E2\u30B8\u30E5\u30FC\u30EB\u540D<t>\u304C\u691C\u51FA\u3055\u308C\u305F\u5834\u5408\u3001\n <t>\u306B\u5BFE\u3057\u3066\u751F\u6210\u3055\u308C\u305F\u3059\u3079\u3066\u306E\u30D5\u30A1\u30A4\u30EB\u306EJava\u30D1\u30C3\u30B1\u30FC\u30B8\u540D\u3092\n <prefix>\u3067\u59CB\u3081\u307E\u3059\u3002\n-pkgTranslate <t> <pkg> \u30BF\u30A4\u30D7\u307E\u305F\u306F\u30E2\u30B8\u30E5\u30FC\u30EB\u540D<t>\u304C\u691C\u51FA\u3055\u308C\u305F\u5834\u5408\u3001\n \u751F\u6210\u3055\u308C\u305FJava\u30D1\u30C3\u30B1\u30FC\u30B8\u5185\u3067<pkg>\u306B\u7F6E\u63DB\u3055\u308C\u307E\u3059\u3002pkgPrefix\u306E\n \u5909\u66F4\u304C\u5148\u306B\u884C\u308F\u308C\u308B\u3053\u3068\u306B\u6CE8\u610F\u3057\u3066\u304F\u3060\u3055\u3044\u3002<t>\u306F\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\n \u6B63\u5F0F\u540D\u3068\u5B8C\u5168\u306B\u4E00\u81F4\u3057\u3066\u3044\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002\u307E\u305F\u3001<t>\u3092\n org\u3001org.omg\u307E\u305F\u306Forg.omg\u306E\u30B5\u30D6\u30D1\u30C3\u30B1\u30FC\u30B8\u306B\u3057\u306A\u3044\u3067\u304F\u3060\u3055\u3044\u3002\n-skeletonName <xxx%yyy> \u30D1\u30BF\u30FC\u30F3\u306B\u5F93\u3063\u3066\u30B9\u30B1\u30EB\u30C8\u30F3\u306B\u540D\u524D\u3092\u4ED8\u3051\u307E\u3059\u3002\n \u30C7\u30D5\u30A9\u30EB\u30C8\u306F\u6B21\u306E\u3068\u304A\u308A\u3067\u3059:\n POA\u30D9\u30FC\u30B9\u30FB\u30AF\u30E9\u30B9\u306E\u5834\u5408\u306F%POA (-fserver\u307E\u305F\u306F-fall) \n oldImplBase\u30D9\u30FC\u30B9\u30FB\u30AF\u30E9\u30B9\u306E\u5834\u5408\u306F_%ImplBase\n (-oldImplBase\u304A\u3088\u3073(-fserver\u307E\u305F\u306F-fall))\u3002\n-td <dir> \u51FA\u529B\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306B\u306F\u3001\u73FE\u5728\u306E\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306E\u304B\u308F\u308A\u306B<dir>\u3092\n \u4F7F\u7528\u3057\u307E\u3059\u3002\n-tieName <xxx%yyy> \u30D1\u30BF\u30FC\u30F3\u306B\u5F93\u3063\u3066tie\u306B\u540D\u524D\u3092\u4ED8\u3051\u307E\u3059\u3002\u30C7\u30D5\u30A9\u30EB\u30C8\u306F\u6B21\u306E\u3068\u304A\u308A\u3067\u3059:\n POA tie\u306E\u5834\u5408\u306F%POATie (-fserverTie\u307E\u305F\u306F-fallTie) \n oldImplBase tie\u306E\u5834\u5408\u306F%_Tie\n (-oldImplBase\u304A\u3088\u3073(-fserverTie\u307E\u305F\u306F-fallTie))\u3002\n-v, -verbose \u8A73\u7D30\u30E2\u30FC\u30C9\u3002\n-version \u30D0\u30FC\u30B8\u30E7\u30F3\u756A\u53F7\u3092\u8868\u793A\u3057\u3066\u7D42\u4E86\u3057\u307E\u3059\u3002\n +usage=\u30B3\u30F3\u30D1\u30A4\u30E9\u306E\u4F7F\u7528\u65B9\u6CD5:\n\n java com.sun.tools.corba.se.idl.toJavaPortable.Compile [options] <idl file>\n\n<idl file>\u306FIDL\u5B9A\u7FA9\u3092\u542B\u3080\u30D5\u30A1\u30A4\u30EB\u306E\u540D\u524D\u3067\u3001\n[options]\u306F\u6B21\u306B\u30EA\u30B9\u30C8\u3059\u308B\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u7D44\u5408\u305B\u3067\u3059\u3002\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\n\u7701\u7565\u53EF\u80FD\u3067\u3001\u4EFB\u610F\u306E\u9806\u5E8F\u3067\u8868\u793A\u3055\u308C\u307E\u3059\u3002<idl file>\u306F\u5FC5\u9808\u3067\u3001\n\u6700\u5F8C\u306B\u8868\u793A\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002\n \n\u30AA\u30D7\u30B7\u30E7\u30F3:\n-d <symbol> IDL\u30D5\u30A1\u30A4\u30EB\u306E\u6B21\u306E\u884C\u3068\n \u540C\u3058\u3067\u3059: #define <symbol>\n-emitAll #included\u30D5\u30A1\u30A4\u30EB\u3067\u898B\u3064\u304B\u3063\u305F\u30BF\u30A4\u30D7\u3092\u542B\u3080\u3001\u3059\u3079\u3066\u306E\u30BF\u30A4\u30D7\u3092\u767A\u884C\u3057\u307E\u3059\u3002\n-f<side> \u767A\u884C\u3059\u308B\u30D0\u30A4\u30F3\u30C7\u30A3\u30F3\u30B0\u3092\u5B9A\u7FA9\u3057\u307E\u3059\u3002<side>\u306Fclient\u3001\n server\u3001all\u3001serverTIE\u3001allTIE\u306E\u3044\u305A\u308C\u304B\u3067\u3059\u3002serverTIE\u3068allTIE\u306F\n \u59D4\u4EFB\u30E2\u30C7\u30EB\u30FB\u30B9\u30B1\u30EB\u30C8\u30F3\u3092\u767A\u884C\u3057\u307E\u3059\u3002\u3053\u306E\u30D5\u30E9\u30B0\u3092\n \u4F7F\u7528\u3057\u306A\u3044\u5834\u5408\u306F\u3001-fclient\u3068\u307F\u306A\u3055\u308C\u307E\u3059\u3002\n-i <include path> \u30C7\u30D5\u30A9\u30EB\u30C8\u3067\u306F\u3001\u73FE\u5728\u306E\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306E\u30A4\u30F3\u30AF\u30EB\u30FC\u30C9\u3055\u308C\u305F\u30D5\u30A1\u30A4\u30EB\u304C\n \u30B9\u30AD\u30E3\u30F3\u3055\u308C\u307E\u3059\u3002\u3053\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u5225\u306E\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3092\u8FFD\u52A0\u3057\u307E\u3059\u3002\n-keep \u751F\u6210\u3055\u308C\u308B\u30D5\u30A1\u30A4\u30EB\u304C\u3059\u3067\u306B\u5B58\u5728\u3059\u308B\u5834\u5408\u306F\u3001\u4E0A\u66F8\u304D\n \u3057\u307E\u305B\u3093\u3002\u30C7\u30D5\u30A9\u30EB\u30C8\u3067\u306F\u4E0A\u66F8\u304D\u3055\u308C\u307E\u3059\u3002\n-noWarn \u8B66\u544A\u3092\u51FA\u3055\u306A\u3044\u3088\u3046\u306B\u3057\u307E\u3059\u3002\n-oldImplBase \u53E4\u3044(1.4\u4EE5\u524D) JDK ORB\u3068\u4E92\u63DB\u6027\u306E\u3042\u308B\u30B9\u30B1\u30EB\u30C8\u30F3\u3092\u751F\u6210\u3057\u307E\u3059\u3002\n-pkgPrefix <t> <prefix> \u30D5\u30A1\u30A4\u30EB\u30FB\u30B9\u30B3\u30FC\u30D7\u3067\u30BF\u30A4\u30D7\u307E\u305F\u306F\u30E2\u30B8\u30E5\u30FC\u30EB\u540D<t>\u304C\u691C\u51FA\u3055\u308C\u305F\u5834\u5408\u3001\n <t>\u306B\u5BFE\u3057\u3066\u751F\u6210\u3055\u308C\u305F\u3059\u3079\u3066\u306E\u30D5\u30A1\u30A4\u30EB\u306EJava\u30D1\u30C3\u30B1\u30FC\u30B8\u540D\u3092\n <prefix>\u3067\u59CB\u3081\u307E\u3059\u3002\n-pkgTranslate <t> <pkg> \u30BF\u30A4\u30D7\u307E\u305F\u306F\u30E2\u30B8\u30E5\u30FC\u30EB\u540D<t>\u304C\u691C\u51FA\u3055\u308C\u305F\u5834\u5408\u3001\n \u751F\u6210\u3055\u308C\u305FJava\u30D1\u30C3\u30B1\u30FC\u30B8\u5185\u3067<pkg>\u306B\u7F6E\u63DB\u3055\u308C\u307E\u3059\u3002pkgPrefix\u306E\n \u5909\u66F4\u304C\u5148\u306B\u884C\u308F\u308C\u308B\u3053\u3068\u306B\u6CE8\u610F\u3057\u3066\u304F\u3060\u3055\u3044\u3002<t>\u306F\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\n \u6B63\u5F0F\u540D\u3068\u5B8C\u5168\u306B\u4E00\u81F4\u3057\u3066\u3044\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002\u307E\u305F\u3001<t>\u3092\n \ +org\u3001org.omg\u307E\u305F\u306Forg.omg\u306E\u30B5\u30D6\u30D1\u30C3\u30B1\u30FC\u30B8\u306B\u3057\u306A\u3044\u3067\u304F\u3060\u3055\u3044\u3002\n-skeletonName <xxx%yyy> \u30D1\u30BF\u30FC\u30F3\u306B\u5F93\u3063\u3066\u30B9\u30B1\u30EB\u30C8\u30F3\u306B\u540D\u524D\u3092\u4ED8\u3051\u307E\u3059\u3002\n \u30C7\u30D5\u30A9\u30EB\u30C8\u306F\u6B21\u306E\u3068\u304A\u308A\u3067\u3059:\n POA\u30D9\u30FC\u30B9\u30FB\u30AF\u30E9\u30B9\u306E\u5834\u5408\u306F%POA (-fserver\u307E\u305F\u306F-fall) \n oldImplBase\u30D9\u30FC\u30B9\u30FB\u30AF\u30E9\u30B9\u306E\u5834\u5408\u306F_%ImplBase\n (-oldImplBase\u304A\u3088\u3073(-fserver\u307E\u305F\u306F-fall))\u3002\n-td <dir> \u51FA\u529B\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306B\u306F\u3001\u73FE\u5728\u306E\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306E\u304B\u308F\u308A\u306B<dir>\u3092\n \u4F7F\u7528\u3057\u307E\u3059\u3002\n-tieName <xxx%yyy> \u30D1\u30BF\u30FC\u30F3\u306B\u5F93\u3063\u3066tie\u306B\u540D\u524D\u3092\u4ED8\u3051\u307E\u3059\u3002\u30C7\u30D5\u30A9\u30EB\u30C8\u306F\u6B21\u306E\u3068\u304A\u308A\u3067\u3059:\n POA tie\u306E\u5834\u5408\u306F%POATie (-fserverTie\u307E\u305F\u306F-fallTie) \n oldImplBase tie\u306E\u5834\u5408\u306F%_Tie\n (-oldImplBase\u304A\u3088\u3073(-fserverTie\u307E\u305F\u306F-fallTie))\u3002\n-v, -verbose \u8A73\u7D30\u30E2\u30FC\u30C9\u3002\n-version \u30D0\u30FC\u30B8\u30E7\u30F3\u756A\u53F7\u3092\u8868\u793A\u3057\u3066\u7D42\u4E86\u3057\u307E\u3059\u3002\n diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/corba-23ae4e0e0cce/src/share/classes/sun/rmi/rmic/iiop/StubGenerator.java new/corba-8ed5df839fbc/src/share/classes/sun/rmi/rmic/iiop/StubGenerator.java --- old/corba-23ae4e0e0cce/src/share/classes/sun/rmi/rmic/iiop/StubGenerator.java 2013-07-01 16:21:59.000000000 +0200 +++ new/corba-8ed5df839fbc/src/share/classes/sun/rmi/rmic/iiop/StubGenerator.java 2013-10-16 16:17:36.000000000 +0200 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -34,6 +34,9 @@ import java.io.File; import java.io.IOException; +import java.io.SerializablePermission; +import java.security.AccessController; +import java.security.PrivilegedAction; import java.util.Vector; import java.util.Hashtable; import java.util.Enumeration; @@ -49,6 +52,7 @@ import com.sun.corba.se.impl.util.PackagePrefixChecker; import sun.rmi.rmic.Main; + /** * An IIOP stub/tie generator for rmic. * @@ -78,6 +82,7 @@ protected boolean castArray = false; protected Hashtable transactionalObjects = new Hashtable() ; protected boolean POATie = false ; + protected boolean emitPermissionCheck = false; /** * Default constructor for Main to use. @@ -193,6 +198,9 @@ } else if (argv[i].equals("-standardPackage")) { standardPackage = true; argv[i] = null; + } else if (argv[i].equals("-emitPermissionCheck")) { + emitPermissionCheck = true; + argv[i] = null; } else if (arg.equals("-xstubbase")) { argv[i] = null; if (++i < argv.length && argv[i] != null && !argv[i].startsWith("-")) { @@ -390,9 +398,22 @@ writePackageAndImports(p); +// generate +// import java.security.AccessController; +// import java.security.PrivilegedAction; +// import java.io.SerializablePermission; + if (emitPermissionCheck) { + p.pln("import java.security.AccessController;"); + p.pln("import java.security.PrivilegedAction;"); + p.pln("import java.io.SerializablePermission;"); + p.pln(); + p.pln(); + } + // Declare the stub class; implement all remote interfaces. p.p("public class " + currentClass); + p.p(" extends " + getName(stubBaseClass)); p.p(" implements "); if (remoteInterfaces.length > 0) { @@ -422,6 +443,56 @@ writeIds( p, theType, false ); p.pln(); + if (emitPermissionCheck) { + + // produce the following generated code + // private static Void checkPermission() { + // SecurityManager sm = System.getSecurityManager(); + // if (sm != null) { + // sm.checkPermission(new SerializablePermission( + // "enableSubclassImplementation")); // testing + // } + // return null; + // } + // + // private _XXXXXX_Stub(Void ignore) { + // } + // + // public _XXXXXX_Stub() { + // this(checkPermission()); + // } + // where XXXXXX is the name of the remote interface + + p.pln(); + p.plnI("private static Void checkPermission() {"); + p.plnI("SecurityManager sm = System.getSecurityManager();"); + p.pln("if (sm != null) {"); + p.pI(); + p.plnI("sm.checkPermission(new SerializablePermission("); + p.plnI("\"enableSubclassImplementation\"));"); + p.pO(); + p.pO(); + p.pOln("}"); + p.pln("return null;"); + p.pO(); + p.pOln("}"); + p.pln(); + p.pO(); + + p.pI(); + p.pln("private " + currentClass + "(Void ignore) { }"); + p.pln(); + + p.plnI("public " + currentClass + "() { "); + p.pln("this(checkPermission());"); + p.pOln("}"); + p.pln(); + } + + if (!emitPermissionCheck) { + p.pI(); + } + // Write the _ids() method... p.plnI("public String[] _ids() { "); @@ -815,7 +886,6 @@ CompoundType theType) throws IOException { // Wtite the method declaration and opening brace... - String methodName = method.getName(); String methodIDLName = method.getIDLName(); @@ -1631,7 +1701,7 @@ // Write data members... p.pln(); - p.pln("private " + getName(theType) + " target = null;"); + p.pln("volatile private " + getName(theType) + " target = null;"); p.pln(); // Write the ids... @@ -1695,6 +1765,10 @@ if (remoteMethods.length > 0) { p.plnI("try {"); + p.pln(getName(theType) + " target = this.target;"); + p.plnI("if (target == null) {"); + p.pln("throw new java.io.IOException();"); + p.pOln("}"); p.plnI(idExtInputStream + " "+in+" = "); p.pln("(" + idExtInputStream + ") "+_in+";"); p.pO(); ++++++ 23ae4e0e0cce.tar.gz -> 8f220f7b51c7.tar.gz ++++++ ++++ 840481 lines of diff (skipped) ++++++ PStack-808293.patch ++++++ --- openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/tools/PStack.java 2012-04-06 02:26:33.322164601 +0200 +++ openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/tools/PStack.java 2012-04-06 02:26:57.958514071 +0200 @@ -1,5 +1,6 @@ /* * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, Red Hat Inc. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -84,7 +85,8 @@ out.print("----------------- "); out.print(th); out.println(" -----------------"); - while (f != null) { + int maxStack = 256; + while (f != null && maxStack-- > 0) { ClosestSymbol sym = f.closestSymbolToPC(); Address pc = f.pc(); out.print(pc + "\t"); @@ -158,10 +160,19 @@ printUnknown(out); } } + Address oldPC = f.pc(); + Address oldFP = f.localVariableBase(); f = f.sender(th); + if (f != null + && oldPC.equals(f.pc()) + && oldFP.equals(f.localVariableBase())) { + // We didn't make any progress + f = null; + } } } catch (Exception exp) { - exp.printStackTrace(); + // exp.printStackTrace(); + out.println("bad stack: " + exp); // continue, may be we can do a better job for other threads } if (isJava && concurrentLocks) { ++++++ RH661505-toBeReverted.patch ++++++ # HG changeset patch # User andrew # Date 1378467880 -3600 # Node ID 3372405e49a9e5cd27af64e16eb7e44539ea3339 # Parent b2611b1a750cf38b795d1df24c5bea9b9c246e0f RH661505: JPEGs with sRGB IEC61966-2.1 color profiles have wrong colors diff -r b2611b1a750c -r 3372405e49a9 src/share/native/sun/awt/image/jpeg/imageioJPEG.c --- openjdk/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c Wed Sep 04 18:20:38 2013 +0100 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c Fri Sep 06 12:44:40 2013 +0100 @@ -1454,6 +1454,8 @@ "[S"); } +#define JPEG_APP1 (JPEG_APP0 + 1) /* EXIF APP1 marker code */ + JNIEXPORT jlong JNICALL Java_com_sun_imageio_plugins_jpeg_JPEGImageReader_initJPEGImageReader (JNIEnv *env, @@ -1507,6 +1509,7 @@ // Set up to keep any APP2 markers, as these might contain ICC profile // data + jpeg_save_markers(cinfo, JPEG_APP1, 0xFFFF); jpeg_save_markers(cinfo, ICC_MARKER, 0xFFFF); /* @@ -1569,8 +1572,6 @@ imageio_init_source((j_decompress_ptr) cinfo); } -#define JPEG_APP1 (JPEG_APP0 + 1) /* EXIF APP1 marker code */ - /* * For EXIF images, the APP1 will appear immediately after the SOI, * so it's safe to only look at the first marker in the list. ++++++ abrt_friendly_hs_log_jdk7.patch ++++++ --- openjdk/hotspot/src/share/vm/utilities/vmError.cpp 2012-02-02 16:17:24.476664897 +0100 +++ openjdk/hotspot/src/share/vm/utilities/vmError.cpp 2012-02-02 16:17:24.476664897 +0100 @@ -929,6 +929,7 @@ } } + /* if (fd == -1) { const char *cwd = os::get_current_directory(buffer, sizeof(buffer)); size_t len = strlen(cwd); @@ -938,6 +939,24 @@ os::file_separator(), os::current_process_id()); fd = open(buffer, O_RDWR | O_CREAT | O_TRUNC, 0666); } + */ + + if (fd == -1) { + const char * tmpdir = os::get_temp_directory(); + // try temp directory if it exists. + if (tmpdir != NULL && tmpdir[0] != '\0') { + jio_snprintf(buffer, sizeof(buffer), "%s%sjvm-%u", + tmpdir, os::file_separator(), os::current_process_id()); + // if mkdir() failed, hs_err will be created in temporary directory + if (!mkdir(buffer, 0700)) { // only read+execute flags are needed + // but we need to write into the directory too + jio_snprintf(buffer, sizeof(buffer), "%s%sjvm-%u%shs_error.log", + tmpdir, os::file_separator(), os::current_process_id(), + os::file_separator()); + fd = open(buffer, O_WRONLY | O_CREAT | O_TRUNC, 0444); // read-only file + } + } + } if (fd == -1) { const char * tmpdir = os::get_temp_directory(); ++++++ 23ae4e0e0cce.tar.gz -> b59e02d9e72b.tar.gz ++++++ /work/SRC/openSUSE:13.1/java-1_7_0-openjdk/23ae4e0e0cce.tar.gz /work/SRC/openSUSE:13.1/.java-1_7_0-openjdk.new/b59e02d9e72b.tar.gz differ: char 5, line 1 ++++++ 23ae4e0e0cce.tar.gz -> e2f5917da3c1.tar.gz ++++++ ++++ 250773 lines of diff (skipped) ++++++ gstackbounds.patch ++++++ diff --git a/src/os/linux/vm/os_linux.cpp b/src/os/linux/vm/os_linux.cpp --- openjdk/hotspot/src/os/linux/vm/os_linux.cpp +++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp @@ -2763,39 +2763,47 @@ // writing thread stacks don't use growable mappings (i.e. those // creeated with MAP_GROWSDOWN), and aren't marked "[stack]", so this // only applies to the main thread. - -static -bool get_stack_bounds(uintptr_t *bottom, uintptr_t *top) { - - char buf[128]; - int fd, sz; - - if ((fd = ::open("/proc/self/maps", O_RDONLY)) < 0) { +static bool +get_stack_bounds(uintptr_t *bottom, uintptr_t *top) +{ + FILE *f = fopen("/proc/self/maps", "r"); + if (f == NULL) return false; - } - - const char kw[] = "[stack]"; - const int kwlen = sizeof(kw)-1; - - // Address part of /proc/self/maps couldn't be more than 128 bytes - while ((sz = os::get_line_chars(fd, buf, sizeof(buf))) > 0) { - if (sz > kwlen && ::memcmp(buf+sz-kwlen, kw, kwlen) == 0) { - // Extract addresses - if (sscanf(buf, "%" SCNxPTR "-%" SCNxPTR, bottom, top) == 2) { - uintptr_t sp = (uintptr_t) __builtin_frame_address(0); - if (sp >= *bottom && sp <= *top) { - ::close(fd); - return true; - } + + while (!feof(f)) { + size_t dummy; + char *str = NULL; + ssize_t len = getline(&str, &dummy, f); + if (len == -1) { + fclose(f); + if (str != NULL) + free(str); + return false; + } + + if (len > 0 && str[len-1] == '\n') { + str[len-1] = 0; + len--; + } + + static const char *stack_str = "[stack]"; + if (len > (ssize_t)strlen(stack_str) + && (strcmp(str + len - strlen(stack_str), stack_str) == 0)) { + if (sscanf(str, "%" SCNxPTR "-%" SCNxPTR, bottom, top) == 2) { + uintptr_t sp = (uintptr_t)__builtin_frame_address(0); + if (sp >= *bottom && sp <= *top) { + free(str); + fclose(f); + return true; } - } - } - - ::close(fd); + } + } + free(str); + } + fclose(f); return false; } - // If the (growable) stack mapping already extends beyond the point // where we're going to put our guard pages, truncate the mapping at // that point by munmap()ping it. This ensures that when we later diff --git a/src/share/vm/runtime/os.cpp b/src/share/vm/runtime/os.cpp --- openjdk/hotspot/src/share/vm/runtime/os.cpp +++ openjdk/hotspot/src/share/vm/runtime/os.cpp @@ -1353,43 +1353,6 @@ return result; } -// Read file line by line, if line is longer than bsize, -// skip rest of line. -int os::get_line_chars(int fd, char* buf, const size_t bsize){ - size_t sz, i = 0; - - // read until EOF, EOL or buf is full - while ((sz = (int) read(fd, &buf[i], 1)) == 1 && i < (bsize-2) && buf[i] != '\n') { - ++i; - } - - if (buf[i] == '\n') { - // EOL reached so ignore EOL character and return - - buf[i] = 0; - return (int) i; - } - - buf[i+1] = 0; - - if (sz != 1) { - // EOF reached. if we read chars before EOF return them and - // return EOF on next call otherwise return EOF - - return (i == 0) ? -1 : (int) i; - } - - // line is longer than size of buf, skip to EOL - char ch; - while (read(fd, &ch, 1) == 1 && ch != '\n') { - // Do nothing - } - - // return initial part of line that fits in buf. - // If we reached EOF, it will be returned on next call. - - return (int) i; -} void os::SuspendedThreadTask::run() { assert(Threads_lock->owned_by_self() || (_thread == VMThread::vm_thread()), "must have threads lock to call this"); diff --git a/src/share/vm/runtime/os.hpp b/src/share/vm/runtime/os.hpp --- openjdk/hotspot/src/share/vm/runtime/os.hpp +++ openjdk/hotspot/src/share/vm/runtime/os.hpp @@ -672,10 +672,6 @@ // Hook for os specific jvm options that we don't want to abort on seeing static bool obsolete_option(const JavaVMOption *option); - // Read file line by line. If line is longer than bsize, - // rest of line is skipped. Returns number of bytes read or -1 on EOF - static int get_line_chars(int fd, char *buf, const size_t bsize); - // Extensions #include "runtime/os_ext.hpp" ++++++ jamvm-7c8dceb90880616b7dd670f257961a1f5f371ec3.tar.gz -> jamvm-ac22c9948434e528ece451642b4ebde40953ee7e.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jamvm-7c8dceb90880616b7dd670f257961a1f5f371ec3/configure.ac new/jamvm-ac22c9948434e528ece451642b4ebde40953ee7e/configure.ac --- old/jamvm-7c8dceb90880616b7dd670f257961a1f5f371ec3/configure.ac 2013-05-06 04:54:31.000000000 +0200 +++ new/jamvm-ac22c9948434e528ece451642b4ebde40953ee7e/configure.ac 2013-08-28 03:29:48.000000000 +0200 @@ -233,9 +233,14 @@ AC_DEFINE([SHARED_CHAR_BUFFERS],1,[java.lang.String uses shared char buffers]) fi +if test "$with_java_runtime_library" = openjdk7; then + AC_DEFINE([JSR292],1,[VM support for JSR292 (invokedynamic)]) +fi + if test "$with_java_runtime_library" = openjdk8; then AC_DEFINE([JSR292],1,[VM support for JSR292 (invokedynamic)]) AC_DEFINE([JSR308],1,[VM support for JSR308 (type annotations)]) + AC_DEFINE([JSR335],1,[VM support for JSR335 (lambda expressions)]) AC_DEFINE([JSR901],1,[VM support for JSR901 (method parameter reflection)]) fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jamvm-7c8dceb90880616b7dd670f257961a1f5f371ec3/src/alloc.c new/jamvm-ac22c9948434e528ece451642b4ebde40953ee7e/src/alloc.c --- old/jamvm-7c8dceb90880616b7dd670f257961a1f5f371ec3/src/alloc.c 2013-05-06 04:54:31.000000000 +0200 +++ new/jamvm-ac22c9948434e528ece451642b4ebde40953ee7e/src/alloc.c 2013-08-28 03:29:48.000000000 +0200 @@ -290,7 +290,8 @@ char *mem = (char*)mmap(0, args->max_heap, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANON, -1, 0); if(mem == MAP_FAILED) { - perror("Couldn't allocate the heap; try reducing the max heap size (-Xmx)\n"); + perror("Couldn't allocate the heap; try reducing the max " + "heap size (-Xmx)"); return FALSE; } @@ -1217,10 +1218,7 @@ cb->fields[i].class = new_addr; for(i = 0; i < cb->methods_count; i++) - if(cb->methods[i].class == class) - cb->methods[i].class = new_addr; - else - THREAD_REFERENCE(&cb->methods[i].class); + cb->methods[i].class = new_addr; } int threadChildren(Object *ob, Object *new_addr) { @@ -2262,7 +2260,7 @@ MAP_PRIVATE|MAP_ANON, -1, 0); if(mem == MAP_FAILED) { - jam_fprintf(stderr, "Mmap failed - aborting VM...\n"); + perror("Mmap failed - aborting VM..."); exitVM(1); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jamvm-7c8dceb90880616b7dd670f257961a1f5f371ec3/src/class.c new/jamvm-ac22c9948434e528ece451642b4ebde40953ee7e/src/class.c --- old/jamvm-7c8dceb90880616b7dd670f257961a1f5f371ec3/src/class.c 2013-05-06 04:54:31.000000000 +0200 +++ new/jamvm-ac22c9948434e528ece451642b4ebde40953ee7e/src/class.c 2013-08-28 03:29:48.000000000 +0200 @@ -92,6 +92,10 @@ we'll get an abstract method error. */ static char abstract_method[] = {OPC_ABSTRACT_METHOD_ERROR}; +/* Bytecode for a Miranda method. If it is invoked it executes + the unimplemented interface method that it represents. */ +static char miranda_bridge[] = {OPC_MIRANDA_BRIDGE}; + static Class *addClassToHash(Class *class, Object *class_loader) { HashTable *table; Class *entry; @@ -1020,18 +1024,6 @@ return hidden->u.offset = cb->object_size - sizeof(Object*); } -#define MRNDA_CACHE_SZE 10 - -#define resizeMTable(method_table, method_table_size, miranda, count) \ -{ \ - method_table = sysRealloc(method_table, (method_table_size + count) \ - * sizeof(MethodBlock*)); \ - \ - memcpy(&method_table[method_table_size], miranda, \ - count * sizeof(MethodBlock*)); \ - method_table_size += count; \ -} - #define fillinMTable(method_table, methods, methods_count) \ { \ int i; \ @@ -1043,6 +1035,18 @@ } \ } +#define MRNDA_CACHE_INCR 16 + +/* Structure of each Miranda cache entry. The Miranda + cache holds details of new Miranda methods found during + the construction of the interface method table. */ + +typedef struct miranda { + MethodBlock *mb; + int mtbl_idx; + int default_conflict; +} Miranda; + void linkClass(Class *class) { static MethodBlock *obj_fnlzr_mthd = NULL; @@ -1207,21 +1211,23 @@ if(!(cb->access_flags & ACC_INTERFACE)) { int *offsets_pntr = sysMalloc(itbl_offset_count * sizeof(int)); - int old_mtbl_size = method_table_size; - MethodBlock *miranda[MRNDA_CACHE_SZE]; + Miranda *mirandas = NULL; + int new_mtbl_count = 0; int miranda_count = 0; - int mtbl_idx; /* run through table again, this time filling in the offsets array - * for each new interface, run through it's methods and locate * each method in this classes method table */ for(i = spr_imthd_tbl_sze; i < cb->imethod_table_size; i++) { - ClassBlock *intf_cb = CLASS_CB(cb->imethod_table[i].interface); + Class *interface = cb->imethod_table[i].interface; + ClassBlock *intf_cb = CLASS_CB(interface); + cb->imethod_table[i].offsets = offsets_pntr; for(j = 0; j < intf_cb->methods_count; j++) { MethodBlock *intf_mb = &intf_cb->methods[j]; + int mtbl_idx, mrnda_idx; if((intf_mb->access_flags & (ACC_STATIC | ACC_PRIVATE)) || (intf_mb->name[0] == '<')) @@ -1233,49 +1239,112 @@ method */ for(mtbl_idx = method_table_size - 1; mtbl_idx >= 0; mtbl_idx--) if(intf_mb->name == method_table[mtbl_idx]->name && - intf_mb->type == method_table[mtbl_idx]->type) { - *offsets_pntr++ = mtbl_idx; + intf_mb->type == method_table[mtbl_idx]->type) break; - } - if(mtbl_idx < 0) { + /* If we found the method in the method table and it's + a real method (i.e. implemented) or we already have + conflicting defaults we're done */ + if(mtbl_idx >= 0) { + MethodBlock *mb = method_table[mtbl_idx]; + if(!(mb->access_flags & ACC_MIRANDA) || + mb->flags & MB_DEFAULT_CONFLICT) { + *offsets_pntr++ = mtbl_idx; + continue; + } + } - /* didn't find it - add a dummy abstract method (a so-called - miranda method). If it's invoked we'll get an abstract - method error */ - - int k; - for(k = 0; k < miranda_count; k++) - if(intf_mb->name == miranda[k]->name && - intf_mb->type == miranda[k]->type) - break; + /* We didn't find it, or we already have a matching + inherited Miranda method. Search the Miranda cache + to see if we have cached a new Miranda method (either + a new Miranda or an override - see below) */ + for(mrnda_idx = 0; mrnda_idx < miranda_count; mrnda_idx++) + if(intf_mb->name == mirandas[mrnda_idx].mb->name && + intf_mb->type == mirandas[mrnda_idx].mb->type) + break; - *offsets_pntr++ = method_table_size + k; + if(mrnda_idx == miranda_count) { + int new_mtbl_idx, default_conflict = FALSE; - if(k == miranda_count) { - if(miranda_count == MRNDA_CACHE_SZE) { - resizeMTable(method_table, method_table_size, - miranda, MRNDA_CACHE_SZE); - miranda_count = 0; + /* No cached Miranda method. If we found a Miranda + method in the method table we need to check it + against the interface method to see if either one + extends the other. If the method table Miranda + extends the new method it takes precedence and we + don't need a new Miranda. If, however, the new method + extends the method table Miranda, or they are + unrelated, we need to add a new Miranda to override + the method table Miranda (with the new Miranda, or a + default conflict). */ + if(mtbl_idx >= 0) { + MethodBlock *mtbl_mb = method_table[mtbl_idx]; + + if(((mtbl_mb->access_flags & ACC_ABSTRACT) + && (intf_mb->access_flags & ACC_ABSTRACT)) + || mtbl_mb->miranda_mb->class == interface + || implements(interface, mtbl_mb->miranda_mb->class)) { + *offsets_pntr++ = mtbl_idx; + continue; } - miranda[miranda_count++] = intf_mb; + + if(!implements(mtbl_mb->miranda_mb->class, interface)) + default_conflict = TRUE; + + /* The new Miranda is an override, so it replaces + the method in the method table */ + new_mtbl_idx = mtbl_idx; + } else { + /* No cached Miranda, and none in the method table - + simply add a new Miranda - it has a new method + table index */ + new_mtbl_idx = method_table_size + new_mtbl_count++; + } + + /* Extend the Miranda cache if it's full */ + if((miranda_count % MRNDA_CACHE_INCR) == 0) + mirandas = sysRealloc(mirandas, (miranda_count + + MRNDA_CACHE_INCR) * sizeof(Miranda)); + + /* Add the new Miranda to the cache */ + mirandas[miranda_count].mb = intf_mb; + mirandas[miranda_count].mtbl_idx = new_mtbl_idx; + mirandas[miranda_count].default_conflict = default_conflict; + miranda_count++; + } else { + /* Found a matching Miranda method in the cache (either + an override or a new Miranda). Check the two methods + against each other as above. The difference is if + we need to override, we simply modify the cached + Miranda - we don't need to add a new Miranda for the + override */ + MethodBlock *mrnda_mb = mirandas[mrnda_idx].mb; + + if(!((mrnda_mb->access_flags & ACC_ABSTRACT) + && (intf_mb->access_flags & ACC_ABSTRACT)) + && !mirandas[mrnda_idx].default_conflict + && mrnda_mb->class != interface + && !implements(interface, mrnda_mb->class)) { + + if(implements(mrnda_mb->class, interface)) + mirandas[mrnda_idx].mb = intf_mb; + else + mirandas[mrnda_idx].default_conflict = TRUE; } } + + *offsets_pntr++ = mirandas[mrnda_idx].mtbl_idx; } } - if(miranda_count > 0) - resizeMTable(method_table, method_table_size, miranda, - miranda_count); - - if(old_mtbl_size != method_table_size) { - /* We've created some abstract methods */ - int num_mirandas = method_table_size - old_mtbl_size; + if(miranda_count > 0) { + /* We've created some new Miranda methods. Add them to + the method area. The method table may also need expanding + if they are not all overrides */ - mb = sysRealloc(cb->methods, (cb->methods_count + num_mirandas) + mb = sysRealloc(cb->methods, (cb->methods_count + miranda_count) * sizeof(MethodBlock)); - /* If the realloc of the method list gave us a new pointer, the + /* If the realloc of the method area gave us a new pointer, the pointers to them in the method table are now wrong. */ if(mb != cb->methods) { /* mb will be left pointing to the end of the methods */ @@ -1284,18 +1353,43 @@ } else mb += cb->methods_count; - cb->methods_count += num_mirandas; + memset(mb, 0, miranda_count * sizeof(MethodBlock)); + + if(new_mtbl_count > 0) { + method_table_size += new_mtbl_count; + method_table = sysRealloc(method_table, method_table_size * + sizeof(MethodBlock*)); + } - /* Now we've expanded the method list, replace pointers to - the interface methods. */ + /* Now we've expanded the methods, run through the Miranda + cache and fill them in */ + for(i = 0; i < miranda_count; i++,mb++) { + MethodBlock *intf_mb = mirandas[i].mb; + + mb->class = class; + mb->name = intf_mb->name; + mb->type = intf_mb->type; + mb->max_stack = intf_mb->max_stack; + mb->max_locals = intf_mb->max_locals; + mb->args_count = intf_mb->args_count; + mb->method_table_index = mirandas[i].mtbl_idx; + mb->access_flags = intf_mb->access_flags | ACC_MIRANDA; + + if(mirandas[i].default_conflict) { + mb->flags = MB_DEFAULT_CONFLICT; + mb->code_size = sizeof(abstract_method); + mb->code = abstract_method; + } else { + mb->miranda_mb = intf_mb; + mb->code_size = sizeof(miranda_bridge); + mb->code = miranda_bridge; + } - for(i = old_mtbl_size; i < method_table_size; i++,mb++) { - memcpy(mb, method_table[i], sizeof(MethodBlock)); - mb->access_flags |= ACC_MIRANDA; - mb->method_table_index = i; -// mb->class = class; - method_table[i] = mb; + method_table[mirandas[i].mtbl_idx] = mb; } + + sysFree(mirandas); + cb->methods_count += miranda_count; } } @@ -1948,8 +2042,8 @@ if(!(mb->access_flags & (ACC_NATIVE | ACC_ABSTRACT | ACC_MIRANDA))) gcPendingFree(mb->code); - /* Miranda methods are a shallow copy of an interface - method so we must not free the data they point to */ + /* Miranda methods have no exception, line number + or throw tables */ if(mb->access_flags & ACC_MIRANDA) continue; @@ -1960,43 +2054,56 @@ gcPendingFree(mb->throw_table); } - gcPendingFree(cb->methods); - gcPendingFree(cb->inner_classes); - if(cb->extra_attributes != NULL) { + int methods_count; + + /* The method extra attributes does not include the Miranda + methods so we need to adjust the methods count. The + Mirandas are all at the end of the methods and are small + in number - this quick loop is preferable to storing an + extra count in the method block. Likewise, we could put + something in the loop above to track the last non-Miranda, + but extra attributes are also rare. */ + for(i = cb->methods_count - 1; i >= 0 && + cb->methods[i].access_flags & ACC_MIRANDA; i--); + methods_count = i + 1; + freeSingleAttributes(cb->extra_attributes->class_annos); freeIndexedAttributes(cb->extra_attributes->field_annos, cb->fields_count); freeIndexedAttributes(cb->extra_attributes->method_annos, - cb->methods_count); + methods_count); freeIndexedAttributes(cb->extra_attributes->method_parameter_annos, - cb->methods_count); + methods_count); freeIndexedAttributes(cb->extra_attributes->method_anno_default_val, - cb->methods_count); + methods_count); #ifdef JSR308 freeSingleAttributes(cb->extra_attributes->class_type_annos); freeIndexedAttributes(cb->extra_attributes->field_type_annos, cb->fields_count); freeIndexedAttributes(cb->extra_attributes->method_type_annos, - cb->methods_count); + methods_count); #endif #ifdef JSR901 freeIndexedAttributes(cb->extra_attributes->method_parameters, - cb->methods_count); + methods_count); #endif gcPendingFree(cb->extra_attributes); } + gcPendingFree(cb->methods); + gcPendingFree(cb->inner_classes); + if(cb->state >= CLASS_LINKED) { ClassBlock *super_cb = CLASS_CB(cb->super); /* interfaces do not have a method table, or imethod table offsets */ if(!IS_INTERFACE(cb)) { - int spr_imthd_sze = super_cb->imethod_table_size; + int spr_imthd_sze = super_cb->imethod_table_size; gcPendingFree(cb->method_table); if(cb->imethod_table_size > spr_imthd_sze) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jamvm-7c8dceb90880616b7dd670f257961a1f5f371ec3/src/classlib/openjdk/access.c new/jamvm-ac22c9948434e528ece451642b4ebde40953ee7e/src/classlib/openjdk/access.c --- old/jamvm-7c8dceb90880616b7dd670f257961a1f5f371ec3/src/classlib/openjdk/access.c 2013-05-06 04:54:31.000000000 +0200 +++ new/jamvm-ac22c9948434e528ece451642b4ebde40953ee7e/src/classlib/openjdk/access.c 2013-08-28 03:29:48.000000000 +0200 @@ -23,7 +23,7 @@ static Class *magic_accessor; -#ifdef JSR292 +#ifdef JSR335 static Class *magic_lambda; #endif @@ -32,7 +32,7 @@ if(magic_accessor == NULL) return FALSE; -#ifdef JSR292 +#ifdef JSR335 magic_lambda = findSystemClass0(SYMBOL(java_lang_invoke_MagicLambdaImpl)); if(magic_lambda == NULL) return FALSE; @@ -45,7 +45,7 @@ } int classlibAccessCheck(Class *class, Class *referrer) { -#ifdef JSR292 +#ifdef JSR335 if(isSubClassOf(magic_lambda, referrer)) return TRUE; #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jamvm-7c8dceb90880616b7dd670f257961a1f5f371ec3/src/classlib/openjdk/classlib-defs.h new/jamvm-ac22c9948434e528ece451642b4ebde40953ee7e/src/classlib/openjdk/classlib-defs.h --- old/jamvm-7c8dceb90880616b7dd670f257961a1f5f371ec3/src/classlib/openjdk/classlib-defs.h 2013-05-06 04:54:31.000000000 +0200 +++ new/jamvm-ac22c9948434e528ece451642b4ebde40953ee7e/src/classlib/openjdk/classlib-defs.h 2013-08-28 03:29:48.000000000 +0200 @@ -51,9 +51,11 @@ } CachedPolyOffsets; #define CLASSLIB_METHOD_ANNOTATIONS(mb, type_name) { \ - if(type_name == SYMBOL(sig_java_lang_invoke_LambdaForm_Hidden)) \ - mb->flags |= LAMBDA_HIDDEN; \ + if(type_name == SYMBOL(sig_sun_reflect_CallerSensitive)) \ + mb->flags |= MB_CALLER_SENSITIVE; \ + else if(type_name == SYMBOL(sig_java_lang_invoke_LambdaForm_Hidden)) \ + mb->flags |= MB_LAMBDA_HIDDEN; \ else if(type_name == SYMBOL(sig_java_lang_invoke_LambdaForm_Compiled)) \ - mb->flags |= LAMBDA_COMPILED; \ + mb->flags |= MB_LAMBDA_COMPILED; \ } #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jamvm-7c8dceb90880616b7dd670f257961a1f5f371ec3/src/classlib/openjdk/classlib-symbol.h new/jamvm-ac22c9948434e528ece451642b4ebde40953ee7e/src/classlib/openjdk/classlib-symbol.h --- old/jamvm-7c8dceb90880616b7dd670f257961a1f5f371ec3/src/classlib/openjdk/classlib-symbol.h 2013-05-06 04:54:31.000000000 +0200 +++ new/jamvm-ac22c9948434e528ece451642b4ebde40953ee7e/src/classlib/openjdk/classlib-symbol.h 2013-08-28 03:29:48.000000000 +0200 @@ -78,6 +78,7 @@ action(sun_reflect_MethodAccessorImpl, "sun/reflect/MethodAccessorImpl"), \ action(sig_java_lang_invoke_LambdaForm, "Ljava/lang/invoke/LambdaForm;"), \ action(sig_java_lang_invoke_MemberName, "Ljava/lang/invoke/MemberName;"), \ + action(sig_sun_reflect_CallerSensitive, "Lsun/reflect/CallerSensitive;"), \ action(java_lang_invoke_MagicLambdaImpl, \ "java/lang/invoke/MagicLambdaImpl"), \ action(sig_java_lang_invoke_MethodHandle, \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jamvm-7c8dceb90880616b7dd670f257961a1f5f371ec3/src/classlib/openjdk/frame.c new/jamvm-ac22c9948434e528ece451642b4ebde40953ee7e/src/classlib/openjdk/frame.c --- old/jamvm-7c8dceb90880616b7dd670f257961a1f5f371ec3/src/classlib/openjdk/frame.c 2013-05-06 04:54:31.000000000 +0200 +++ new/jamvm-ac22c9948434e528ece451642b4ebde40953ee7e/src/classlib/openjdk/frame.c 2013-08-28 03:29:48.000000000 +0200 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2011, 2012 Robert Lougher <rob(a)jamvm.org.uk>. + * Copyright (C) 2011, 2012, 2013 Robert Lougher <rob(a)jamvm.org.uk>. * * This file is part of JamVM. * @@ -55,7 +55,7 @@ do { for(; last->mb != NULL; last = last->prev) if(!isSubClassOf(method_accessor, last->mb->class) - && !(last->mb->flags & LAMBDA_COMPILED) + && !(last->mb->flags & MB_LAMBDA_COMPILED) && last->mb != mthd_invoke_mb && depth-- <= 0) return last; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jamvm-7c8dceb90880616b7dd670f257961a1f5f371ec3/src/classlib/openjdk/jvm.c new/jamvm-ac22c9948434e528ece451642b4ebde40953ee7e/src/classlib/openjdk/jvm.c --- old/jamvm-7c8dceb90880616b7dd670f257961a1f5f371ec3/src/classlib/openjdk/jvm.c 2013-05-06 04:54:31.000000000 +0200 +++ new/jamvm-ac22c9948434e528ece451642b4ebde40953ee7e/src/classlib/openjdk/jvm.c 2013-08-28 03:29:48.000000000 +0200 @@ -479,7 +479,7 @@ jclass JVM_GetCallerClass(JNIEnv* env, int depth) { TRACE("JVM_GetCallerClass(env=%p, depth=%d)", env, depth); - return getCallerClass(depth); + return getCallerClass(depth == -1 ? 2 : depth); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jamvm-7c8dceb90880616b7dd670f257961a1f5f371ec3/src/classlib/openjdk/mh.c new/jamvm-ac22c9948434e528ece451642b4ebde40953ee7e/src/classlib/openjdk/mh.c --- old/jamvm-7c8dceb90880616b7dd670f257961a1f5f371ec3/src/classlib/openjdk/mh.c 2013-05-06 04:54:31.000000000 +0200 +++ new/jamvm-ac22c9948434e528ece451642b4ebde40953ee7e/src/classlib/openjdk/mh.c 2013-08-28 03:29:48.000000000 +0200 @@ -246,10 +246,11 @@ #define REF_newInvokeSpecial 8 #define REF_invokeInterface 9 -#define IS_METHOD 0x10000 -#define IS_CONSTRUCTOR 0x20000 -#define IS_FIELD 0x40000 -#define IS_TYPE 0x80000 +#define IS_METHOD 0x010000 +#define IS_CONSTRUCTOR 0x020000 +#define IS_FIELD 0x040000 +#define IS_TYPE 0x080000 +#define CALLER_SENSITIVE 0x100000 #define SEARCH_SUPERCLASSES 0x100000 #define SEARCH_INTERFACES 0x200000 @@ -259,7 +260,7 @@ #define REFERENCE_KIND_SHIFT 24 #define REFERENCE_KIND_MASK (0xf000000 >> REFERENCE_KIND_SHIFT) -int stackOverflowCheck(ExecEnv *ee, char *sp) { +static int stackOverflowCheck(ExecEnv *ee, char *sp) { if(sp > ee->stack_end) { if(ee->overflow++) { /* Overflow when we're already throwing stack @@ -277,7 +278,7 @@ return FALSE; } -void executePolyMethod(Object *ob, MethodBlock *mb, uintptr_t *lvars) { +static void executePolyMethod(Object *ob, MethodBlock *mb, uintptr_t *lvars) { if(mb->access_flags & ACC_NATIVE) (*mb->native_invoker)(mb->class, mb, lvars); else { @@ -311,7 +312,7 @@ } } -int sigRetSlotSize(char *sig) { +static int sigRetSlotSize(char *sig) { int len = strlen(sig); if(sig[len-2] != ')') @@ -328,7 +329,9 @@ } } -uintptr_t *invokeBasic(Class *class, MethodBlock *mb, uintptr_t *ostack) { +static uintptr_t *invokeBasic(Class *class, MethodBlock *mb, + uintptr_t *ostack) { + Object *method_handle = (Object*)ostack[0]; Object *form = INST_DATA(method_handle, Object*, mthd_hndl_form_offset); Object *vmentry = INST_DATA(form, Object*, lmda_form_vmentry_offset); @@ -341,7 +344,9 @@ return ostack; } -uintptr_t *linkToSpecial(Class *class, MethodBlock *mb, uintptr_t *ostack) { +static uintptr_t *linkToSpecial(Class *class, MethodBlock *mb, + uintptr_t *ostack) { + Object *mem_name = (Object*)ostack[mb->args_count-1]; MethodBlock *vmtarget = INST_DATA(mem_name, MethodBlock*, mem_name_vmtarget_offset); @@ -352,7 +357,9 @@ return ostack; } -uintptr_t *linkToVirtual(Class *class, MethodBlock *mb, uintptr_t *ostack) { +static uintptr_t *linkToVirtual(Class *class, MethodBlock *mb, + uintptr_t *ostack) { + Object *this = (Object*)ostack[0]; Object *mem_name = (Object*)ostack[mb->args_count-1]; MethodBlock *vmtarget = INST_DATA(mem_name, MethodBlock*, @@ -366,6 +373,15 @@ return ostack; } +static int mbFlags(MethodBlock *mb) { + int flags = mb->access_flags; + + if(mb->flags & MB_CALLER_SENSITIVE) + flags |= CALLER_SENSITIVE; + + return flags; +} + void initMemberName(Object *mname, Object *target) { if(target->class == method_reflect_class) { @@ -374,7 +390,7 @@ ClassBlock *cb = CLASS_CB(decl_class); MethodBlock *mb = &(cb->methods[slot]); - int flags = mb->access_flags | IS_METHOD; + int flags = mbFlags(mb) | IS_METHOD; int ref_kind; if(mb->access_flags & ACC_STATIC) @@ -394,7 +410,7 @@ int slot = INST_DATA(target, int, cons_slot_offset); Class *decl_class = INST_DATA(target, Class*, cons_class_offset); MethodBlock *mb = &(CLASS_CB(decl_class)->methods[slot]); - int flags = mb->access_flags | IS_CONSTRUCTOR | + int flags = mbFlags(mb) | IS_CONSTRUCTOR | (REF_invokeSpecial << REFERENCE_KIND_SHIFT); INST_DATA(mname, Class*, mem_name_clazz_offset) = decl_class; @@ -529,7 +545,7 @@ if(j++ < rlen) { Object *mname = *rpntr++; - int flags = mb->access_flags | IS_METHOD; + int flags = mbFlags(mb) | IS_METHOD; flags |= (mb->access_flags & ACC_STATIC ? REF_invokeStatic : REF_invokeVirtual) @@ -555,7 +571,9 @@ return 0; } -int class2Signature(Class *class, char *buff[], int pos, int *buff_len) { +static int class2Signature(Class *class, char *buff[], int pos, + int *buff_len) { + ClassBlock *cb = CLASS_CB(class); int rem, len, name_len; @@ -587,7 +605,7 @@ return pos; } -char *type2Signature(Object *type, int add_if_absent) { +static char *type2Signature(Object *type, int add_if_absent) { char *sig, *found; if(IS_CLASS(type)) { @@ -633,7 +651,7 @@ #define isStaticPolymorphicSig(id) (id >= ID_linkToStatic) -int polymorphicNameID(Class *clazz, char *name) { +static int polymorphicNameID(Class *clazz, char *name) { if(CLASS_CB(clazz)->name == SYMBOL(java_lang_invoke_MethodHandle)) { if(name == SYMBOL(invoke) || name == SYMBOL(invokeExact)) return ID_invokeGeneric; @@ -651,7 +669,7 @@ return -1; } -NativeMethod polymorphicID2Invoker(int id) { +static NativeMethod polymorphicID2Invoker(int id) { switch(id) { case ID_invokeBasic: return &invokeBasic; @@ -665,7 +683,7 @@ return NULL; } -Object *findMethodHandleType(char *type, Class *accessing_class) { +static Object *findMethodHandleType(char *type, Class *accessing_class) { Object *method_type, *ptypes; char *signature, *sig; Class *rtype; @@ -736,9 +754,9 @@ return mt; } -Object *findMethodHandleConstant(Class *class, int ref_kind, - Class *defining_class, - char *name, char *type) { +static Object *findMethodHandleConstant(Class *class, int ref_kind, + Class *defining_class, + char *name, char *type) { Object *mh; Object *name_str = findInternedString(createString(name)); @@ -810,7 +828,7 @@ return mh; } -int cpType2PrimIdx(int type) { +static int cpType2PrimIdx(int type) { switch(type) { case CONSTANT_Integer: return PRIM_IDX_INT; @@ -825,8 +843,10 @@ } } -PolyMethodBlock *findInvokeDynamicInvoker(Class *class, char *methodname, - char *type, int boot_mthd_idx) { +static PolyMethodBlock *findInvokeDynamicInvoker(Class *class, + char *methodname, + char *type, + int boot_mthd_idx) { Object *exception; Object *boot_mthd; Object *method_type; @@ -948,8 +968,9 @@ return pmb; } -PolyMethodBlock *findMethodHandleInvoker(Class *class, Class *accessing_class, - char *methodname, char *type) { +static PolyMethodBlock *findMethodHandleInvoker(Class *class, + Class *accessing_class, + char *methodname, char *type) { Object *name_str = findInternedString(createString(methodname)); Class *obj_array_class = findArrayClass("[Ljava/lang/Object;"); @@ -1180,7 +1201,7 @@ if(mb == NULL) goto throw_excep; - flags |= mb->access_flags; + flags |= mbFlags(mb); INST_DATA(mname, int, mem_name_flags_offset) = flags; INST_DATA(mname, MethodBlock*, mem_name_vmtarget_offset) = mb; break; @@ -1192,7 +1213,7 @@ if(mb == NULL) goto throw_excep; - flags |= mb->access_flags; + flags |= mbFlags(mb); INST_DATA(mname, int, mem_name_flags_offset) = flags; INST_DATA(mname, MethodBlock*, mem_name_vmtarget_offset) = mb; break; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jamvm-7c8dceb90880616b7dd670f257961a1f5f371ec3/src/classlib/openjdk/natives.c new/jamvm-ac22c9948434e528ece451642b4ebde40953ee7e/src/classlib/openjdk/natives.c --- old/jamvm-7c8dceb90880616b7dd670f257961a1f5f371ec3/src/classlib/openjdk/natives.c 2013-05-06 04:54:31.000000000 +0200 +++ new/jamvm-ac22c9948434e528ece451642b4ebde40953ee7e/src/classlib/openjdk/natives.c 2013-08-28 03:29:48.000000000 +0200 @@ -88,6 +88,23 @@ return ostack; } +uintptr_t *getAddress(Class *class, MethodBlock *mb, uintptr_t *ostack) { + int64_t address = *(int64_t *)&ostack[1]; + uintptr_t *pntr = (uintptr_t *)(uintptr_t)address; + + *(int64_t *)ostack = (int64_t)*pntr; + return ostack + 2; +} + +uintptr_t *putAddress(Class *class, MethodBlock *mb, uintptr_t *ostack) { + int64_t address = *(int64_t *)&ostack[1]; + int64_t value = *(int64_t *)&ostack[3]; + uintptr_t *pntr = (uintptr_t *)(uintptr_t)address; + + *pntr = (uintptr_t)value; + return ostack; +} + uintptr_t *putLongAddress(Class *class, MethodBlock *mb, uintptr_t *ostack) { int64_t address = *(int64_t *)&ostack[1]; int64_t value = *(int64_t *)&ostack[3]; @@ -455,6 +472,8 @@ staticFieldOffset}, {"staticFieldBase", "(Ljava/lang/reflect/Field;)Ljava/lang/Object;", staticFieldBase}, + {"getAddress", "(J)J", getAddress}, + {"putAddress", "(JJ)V", putAddress}, {"putLong", "(JJ)V", putLongAddress}, {"putDouble", "(JD)V", putLongAddress}, {"putInt", "(JI)V", putIntAddress}, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jamvm-7c8dceb90880616b7dd670f257961a1f5f371ec3/src/interp/direct.c new/jamvm-ac22c9948434e528ece451642b4ebde40953ee7e/src/interp/direct.c --- old/jamvm-7c8dceb90880616b7dd670f257961a1f5f371ec3/src/interp/direct.c 2013-05-06 04:54:31.000000000 +0200 +++ new/jamvm-ac22c9948434e528ece451642b4ebde40953ee7e/src/interp/direct.c 2013-08-28 03:29:48.000000000 +0200 @@ -337,6 +337,7 @@ case OPC_DREM: case OPC_FNEG: case OPC_DNEG: case OPC_MONITORENTER: case OPC_MONITOREXIT: case OPC_ABSTRACT_METHOD_ERROR: + case OPC_MIRANDA_BRIDGE: #ifdef USE_CACHE cache = 0; pc += 1; @@ -449,9 +450,6 @@ case OPC_INVOKEVIRTUAL: case OPC_INVOKESPECIAL: case OPC_INVOKESTATIC: case OPC_CHECKCAST: case OPC_INSTANCEOF: case OPC_PUTFIELD: -#ifdef JSR292 - case OPC_INVOKEDYNAMIC: -#endif REWRITE_OPERAND(READ_U2_OP(code + pc)); #ifdef USE_CACHE cache = 0; @@ -660,6 +658,9 @@ } case OPC_INVOKEINTERFACE: +#ifdef JSR292 + case OPC_INVOKEDYNAMIC: +#endif REWRITE_OPERAND(READ_U2_OP(code + pc)); #ifdef USE_CACHE cache = 0; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jamvm-7c8dceb90880616b7dd670f257961a1f5f371ec3/src/interp/engine/interp-threading.h new/jamvm-ac22c9948434e528ece451642b4ebde40953ee7e/src/interp/engine/interp-threading.h --- old/jamvm-7c8dceb90880616b7dd670f257961a1f5f371ec3/src/interp/engine/interp-threading.h 2013-05-06 04:54:31.000000000 +0200 +++ new/jamvm-ac22c9948434e528ece451642b4ebde40953ee7e/src/interp/engine/interp-threading.h 2013-08-28 03:29:48.000000000 +0200 @@ -273,10 +273,10 @@ L(OPC_GETSTATIC_QUICK_REF, level, label), \ L(OPC_PUTSTATIC_QUICK_REF, level, label), \ L(OPC_GETFIELD_THIS_REF, level, label), \ - &&unused, \ - &&unused, \ - &&unused, \ - &&unused, \ + L(OPC_MIRANDA_BRIDGE, level, label), \ + L(OPC_ABSTRACT_METHOD_ERROR, level, label), \ + I(OPC_INLINE_REWRITER, level, label), \ + I(OPC_PROFILE_REWRITER, level, label), \ D(OPC_INVOKEVIRTUAL_QUICK_W, level, label), \ D(OPC_GETFIELD_QUICK_W, level, label), \ D(OPC_PUTFIELD_QUICK_W, level, label), \ @@ -295,16 +295,16 @@ &&unused, \ &&unused, \ L(OPC_MULTIANEWARRAY_QUICK, level, label), \ - L(OPC_INVOKEINTERFACE_QUICK, level, label), \ - L(OPC_ABSTRACT_METHOD_ERROR, level, label), \ - I(OPC_INLINE_REWRITER, level, label), \ - I(OPC_PROFILE_REWRITER, level, label), \ J(OPC_INVOKEHANDLE, level, label), \ - J(OPC_INVOKEDYNAMIC_QUICK, level, label), \ J(OPC_INVOKEBASIC, level, label), \ J(OPC_LINKTOSPECIAL, level, label), \ J(OPC_LINKTOVIRTUAL, level, label), \ J(OPC_LINKTOINTERFACE, level, label), \ + L(OPC_INVOKEINTERFACE_QUICK, level, label), \ + J(OPC_INVOKEDYNAMIC_QUICK, level, label), \ + &&unused, \ + &&unused, \ + &&unused, \ &&unused, \ &&unused}; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jamvm-7c8dceb90880616b7dd670f257961a1f5f371ec3/src/interp/engine/interp.c new/jamvm-ac22c9948434e528ece451642b4ebde40953ee7e/src/interp/engine/interp.c --- old/jamvm-7c8dceb90880616b7dd670f257961a1f5f371ec3/src/interp/engine/interp.c 2013-05-06 04:54:31.000000000 +0200 +++ new/jamvm-ac22c9948434e528ece451642b4ebde40953ee7e/src/interp/engine/interp.c 2013-08-28 03:29:48.000000000 +0200 @@ -2175,6 +2175,7 @@ if(pmb->appendix) *ostack++ = (uintptr_t)pmb->appendix; + new_mb = pmb->mb; arg1 = ostack - new_mb->args_count; NULL_POINTER_CHECK(*arg1); @@ -2187,6 +2188,7 @@ if(pmb->appendix) *ostack++ = (uintptr_t)pmb->appendix; + new_mb = pmb->mb; arg1 = ostack - new_mb->args_count; @@ -2209,6 +2211,7 @@ DEF_OPC_210(OPC_LINKTOVIRTUAL, { Object *mem_name = (Object*)ostack[-1]; + arg1 = ostack - INTRINSIC_ARGS(pc); new_mb = getLinkToVirtualTarget((Object*)*arg1, mem_name); @@ -2217,6 +2220,7 @@ DEF_OPC_210(OPC_LINKTOINTERFACE, { Object *mem_name = (Object*)ostack[-1]; + arg1 = ostack - INTRINSIC_ARGS(pc); new_mb = getLinkToInterfaceTarget((Object*)*arg1, mem_name); @@ -2313,9 +2317,28 @@ PUSH_0((uintptr_t)obj, 4); });) + /* Special bytecode which forms the body of a Miranda method. + If it is invoked it executes the interface method that it + represents. */ + + DEF_OPC_210(OPC_MIRANDA_BRIDGE, { + frame->mb = mb = mb->miranda_mb; + PREPARE_MB(mb); + + pc = (CodePntr)mb->code; + cp = &(CLASS_CB(mb->class)->constant_pool); + + DISPATCH_FIRST + }) + /* Special bytecode which forms the body of an abstract method. If it is invoked it'll throw an abstract method exception. */ + /* A class which has conflicting default interface methods also + throws an abstract method exception if the method is invoked */ + + #define MESSAGE ": conflicting default methods" + DEF_OPC_210(OPC_ABSTRACT_METHOD_ERROR, { /* As the method has been invoked, a frame will exist for the abstract method itself. Pop this to get the correct @@ -2323,7 +2346,14 @@ ee->last_frame = frame->prev; /* Throw the exception */ - signalException(java_lang_AbstractMethodError, mb->name); + if(mb->flags & MB_DEFAULT_CONFLICT) { + char buff[strlen(mb->name) + sizeof(MESSAGE)]; + + strcat(strcpy(buff, mb->name), MESSAGE); + signalException(java_lang_AbstractMethodError, buff); + } else + signalException(java_lang_AbstractMethodError, mb->name); + goto throwException; }) @@ -2398,7 +2428,7 @@ if(exceptionOccurred0(ee)) goto throwException; - DISPATCH(0, *pc == OPC_INVOKEINTERFACE_QUICK ? 5 : 3); + DISPATCH(0, *pc >= OPC_INVOKEINTERFACE_QUICK ? 5 : 3); } else { PREPARE_MB(new_mb); @@ -2438,7 +2468,7 @@ /* Pop frame */ ee->last_frame = frame; - DISPATCH_METHOD_RET(*pc == OPC_INVOKEINTERFACE_QUICK ? 5 : 3); + DISPATCH_METHOD_RET(*pc >= OPC_INVOKEINTERFACE_QUICK ? 5 : 3); #ifdef INLINING DEF_DUMMY_HANDLERS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jamvm-7c8dceb90880616b7dd670f257961a1f5f371ec3/src/jam.h new/jamvm-ac22c9948434e528ece451642b4ebde40953ee7e/src/jam.h --- old/jamvm-7c8dceb90880616b7dd670f257961a1f5f371ec3/src/jam.h 2013-05-06 04:54:31.000000000 +0200 +++ new/jamvm-ac22c9948434e528ece451642b4ebde40953ee7e/src/jam.h 2013-08-28 03:29:48.000000000 +0200 @@ -261,6 +261,10 @@ #define OPC_GETSTATIC_QUICK_REF 219 #define OPC_PUTSTATIC_QUICK_REF 220 #define OPC_GETFIELD_THIS_REF 221 +#define OPC_MIRANDA_BRIDGE 222 +#define OPC_ABSTRACT_METHOD_ERROR 223 +#define OPC_INLINE_REWRITER 224 +#define OPC_PROFILE_REWRITER 225 #define OPC_INVOKEVIRTUAL_QUICK_W 226 #define OPC_GETFIELD_QUICK_W 227 #define OPC_PUTFIELD_QUICK_W 228 @@ -273,16 +277,13 @@ #define OPC_CHECKCAST_QUICK 238 #define OPC_INSTANCEOF_QUICK 239 #define OPC_MULTIANEWARRAY_QUICK 243 -#define OPC_INVOKEINTERFACE_QUICK 244 -#define OPC_ABSTRACT_METHOD_ERROR 245 -#define OPC_INLINE_REWRITER 246 -#define OPC_PROFILE_REWRITER 247 -#define OPC_INVOKEHANDLE 248 -#define OPC_INVOKEDYNAMIC_QUICK 249 -#define OPC_INVOKEBASIC 250 -#define OPC_LINKTOSPECIAL 251 -#define OPC_LINKTOVIRTUAL 252 -#define OPC_LINKTOINTERFACE 253 +#define OPC_INVOKEHANDLE 244 +#define OPC_INVOKEBASIC 245 +#define OPC_LINKTOSPECIAL 246 +#define OPC_LINKTOVIRTUAL 247 +#define OPC_LINKTOINTERFACE 248 +#define OPC_INVOKEINTERFACE_QUICK 249 +#define OPC_INVOKEDYNAMIC_QUICK 250 /* Constant pool tags */ @@ -381,8 +382,10 @@ /* Method flags */ -#define LAMBDA_HIDDEN 1 -#define LAMBDA_COMPILED 2 +#define MB_LAMBDA_HIDDEN 1 +#define MB_LAMBDA_COMPILED 2 +#define MB_CALLER_SENSITIVE 4 +#define MB_DEFAULT_CONFLICT 8 /* Method states (direct or inlining interpreter variants) */ @@ -568,7 +571,10 @@ u2 exception_table_size; u2 line_no_table_size; ExceptionTableEntry *exception_table; - LineNoTableEntry *line_no_table; + union { + LineNoTableEntry *line_no_table; + MethodBlock *miranda_mb; + }; }; struct { union { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jamvm-7c8dceb90880616b7dd670f257961a1f5f371ec3/src/resolve.c new/jamvm-ac22c9948434e528ece451642b4ebde40953ee7e/src/resolve.c --- old/jamvm-7c8dceb90880616b7dd670f257961a1f5f371ec3/src/resolve.c 2013-05-06 04:54:31.000000000 +0200 +++ new/jamvm-ac22c9948434e528ece451642b4ebde40953ee7e/src/resolve.c 2013-08-28 03:29:48.000000000 +0200 @@ -211,14 +211,16 @@ if(exceptionOccurred()) return NULL; -#if 0 if(resolved_cb->access_flags & ACC_INTERFACE) { +#ifdef JSR335 + mb = lookupInterfaceMethod(resolved_class, methodname, + methodtype); +#else signalException(java_lang_IncompatibleClassChangeError, NULL); return NULL; - } #endif - - mb = lookupMethod(resolved_class, methodname, methodtype); + } else + mb = lookupMethod(resolved_class, methodname, methodtype); #ifdef JSR292 if(mb == NULL) ++++++ java-1.7.0-openjdk-freetype-check-fix.patch ++++++ diff -up openjdk/jdk/make/common/shared/Sanity.gmk.sav openjdk/jdk/make/common/shared/Sanity.gmk --- openjdk/jdk/make/common/shared/Sanity.gmk.sav 2012-02-14 16:12:48.000000000 -0500 +++ openjdk/jdk/make/common/shared/Sanity.gmk 2012-03-07 17:31:26.153840755 -0500 @@ -814,12 +814,12 @@ ifdef OPENJDK @(($(CD) $(BUILDDIR)/tools/freetypecheck && $(MAKE)) || \ $(ECHO) "Failed to build freetypecheck." ) > $@ - sane-freetype: $(TEMPDIR)/freetypeinfo - @if [ "`$(CAT) $< | $(GREP) Fail`" != "" ]; then \ - $(ECHO) "ERROR: FreeType version " $(REQUIRED_FREETYPE_VERSION) \ - " or higher is required. \n" \ - "`$(CAT) $<` \n" >> $(ERROR_FILE) ; \ - fi +# sane-freetype: $(TEMPDIR)/freetypeinfo +# @if [ "`$(CAT) $< | $(GREP) Fail`" != "" ]; then \ +# $(ECHO) "ERROR: FreeType version " $(REQUIRED_FREETYPE_VERSION) \ +# " or higher is required. \n" \ +# "`$(CAT) $<` \n" >> $(ERROR_FILE) ; \ +# fi else #do nothing (cross-compiling) sane-freetype: ++++++ java-1.7.0-openjdk-ppc-zero-hotspot.patch ++++++ --- /var/tmp/diff_new_pack.RDWi8j/_old 2013-11-01 07:55:23.000000000 +0100 +++ /var/tmp/diff_new_pack.RDWi8j/_new 2013-11-01 07:55:23.000000000 +0100 @@ -1,11 +1,10 @@ ---- openjdk/hotspot/src/os_cpu/linux_zero/vm/globals_linux_zero.hpp 2012-03-23 10:57:01.000000000 -0400 -+++ openjdk/hotspot/src/os_cpu/linux_zero/vm/globals_linux_zero.hpp 2012-03-23 10:57:00.000000000 -0400 -@@ -32,11 +32,11 @@ - // - +Index: openjdk/hotspot/src/os_cpu/linux_zero/vm/globals_linux_zero.hpp +=================================================================== +--- openjdk/hotspot/src/os_cpu/linux_zero/vm/globals_linux_zero.hpp.orig ++++ openjdk/hotspot/src/os_cpu/linux_zero/vm/globals_linux_zero.hpp +@@ -34,9 +34,9 @@ define_pd_global(bool, DontYieldALot, false); --define_pd_global(intx, ThreadStackSize, 1536); -+define_pd_global(intx, ThreadStackSize, 1664); + define_pd_global(intx, ThreadStackSize, 1664); #ifdef _LP64 -define_pd_global(intx, VMThreadStackSize, 1024); +define_pd_global(intx, VMThreadStackSize, 1664); @@ -13,5 +12,5 @@ -define_pd_global(intx, VMThreadStackSize, 512); +define_pd_global(intx, VMThreadStackSize, 1152); #endif // _LP64 - define_pd_global(intx, SurvivorRatio, 8); define_pd_global(intx, CompilerThreadStackSize, 0); + define_pd_global(uintx, JVMInvokeMethodSlack, 8192); ++++++ java-1.7.0-openjdk-ppc-zero-jdk.patch ++++++ --- /var/tmp/diff_new_pack.RDWi8j/_old 2013-11-01 07:55:23.000000000 +0100 +++ /var/tmp/diff_new_pack.RDWi8j/_new 2013-11-01 07:55:23.000000000 +0100 @@ -1,20 +1,20 @@ ---- openjdk/jdk/make/common/shared/Defs-java.gmk 2012-03-23 10:56:45.000000000 -0400 -+++ openjdk/jdk/make/common/shared/Defs-java.gmk 2012-03-23 10:56:45.000000000 -0400 -@@ -83,9 +83,9 @@ +Index: openjdk/jdk/make/common/shared/Defs-java.gmk +=================================================================== +--- openjdk/jdk/make/common/shared/Defs-java.gmk.orig ++++ openjdk/jdk/make/common/shared/Defs-java.gmk +@@ -88,7 +88,7 @@ JAVAC_JVM_FLAGS = # 64-bit builds require a larger thread stack size. ifeq ($(ARCH_DATA_MODEL), 32) - JAVAC_JVM_FLAGS += -J-XX:ThreadStackSize=768 + JAVAC_JVM_FLAGS += -J-XX:ThreadStackSize=1152 else -- JAVAC_JVM_FLAGS += -J-XX:ThreadStackSize=1536 -+ JAVAC_JVM_FLAGS += -J-XX:ThreadStackSize=1664 + JAVAC_JVM_FLAGS += -J-XX:ThreadStackSize=1664 endif - JAVAC_JVM_FLAGS += $(JAVA_TOOLS_FLAGS:%=-J%) - -diff -up openjdk/corba/make/common/shared/Defs-java.gmk.ppc openjdk/corba/make/common/shared/Defs-java.gmk ---- openjdk/corba/make/common/shared/Defs-java.gmk.ppc 2012-03-24 11:44:34.450072733 +0100 -+++ openjdk/corba/make/common/shared/Defs-java.gmk 2012-03-24 11:44:53.300073137 +0100 +Index: openjdk/corba/make/common/shared/Defs-java.gmk +=================================================================== +--- openjdk/corba/make/common/shared/Defs-java.gmk.orig ++++ openjdk/corba/make/common/shared/Defs-java.gmk @@ -79,9 +79,9 @@ JAVAC_JVM_FLAGS = # 64-bit builds require a larger thread stack size. @@ -22,8 +22,8 @@ - JAVAC_JVM_FLAGS += -J-XX:ThreadStackSize=768 + JAVAC_JVM_FLAGS += -J-XX:ThreadStackSize=1152 else -- JAVAC_JVM_FLAGS += -J-XX:ThreadStackSize=1536 -+ JAVAC_JVM_FLAGS += -J-XX:ThreadStackSize=1664 +- JAVAC_JVM_FLAGS += -J-XX:ThreadStackSize=1664 ++ JAVAC_JVM_FLAGS += -J-XX:ThreadStackSize=1536 endif JAVAC_JVM_FLAGS += $(JAVA_TOOLS_FLAGS:%=-J%) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gvfs for openSUSE:13.1
by root＠hilbert.suse.de 01 Nov '13

01 Nov '13

Hello community, here is the log from the commit of package gvfs for openSUSE:13.1 checked in at 2013-11-01 07:53:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:13.1/gvfs (Old) and /work/SRC/openSUSE:13.1/.gvfs.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gvfs" Changes: -------- --- /work/SRC/openSUSE:13.1/gvfs/gvfs.changes 2013-10-04 12:10:46.000000000 +0200 +++ /work/SRC/openSUSE:13.1/.gvfs.new/gvfs.changes 2013-11-01 07:53:54.000000000 +0100 @@ -1,0 +2,6 @@ +Sat Oct 26 17:57:13 UTC 2013 - stefan.bruens(a)rwth-aachen.de + +- Add gvfs-webdav_file_types.patch: fix webdav access over + gvfsd-fuse, resulting in Input/output error (bnc#848129). + +------------------------------------------------------------------- New: ---- gvfs-webdav_file_types.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gvfs.spec ++++++ --- /var/tmp/diff_new_pack.0iBhMS/_old 2013-11-01 07:53:54.000000000 +0100 +++ /var/tmp/diff_new_pack.0iBhMS/_new 2013-11-01 07:53:54.000000000 +0100 @@ -32,6 +32,8 @@ Patch5: gvfs-nvvfs.patch # PATCH-FEATURE-OPENSUSE gvfs-nds.patch ksamrat(a)novell.com -- Provides NDS browsing for nautilus Patch6: gvfs-nds.patch +# PATCH-FIX-UPSTREAM gvfs-webdav_file_types.patch bgo#706798 bnc#848129 stefan.bruens(a)rwth-aachen.de -- gvfs-webdav_file_types.patch +Patch7: gvfs-webdav_file_types.patch BuildRequires: bluez-devel BuildRequires: docbook-xsl-stylesheets BuildRequires: fuse-devel @@ -139,6 +141,7 @@ translation-update-upstream %patch5 -p1 %patch6 -p1 +%patch7 -p1 %build autoreconf -f ++++++ gvfs-webdav_file_types.patch ++++++ From 921b813784ba0505fff76edb1a3bd20c40b78b75 Mon Sep 17 00:00:00 2001 From: Ross Lagerwall <rosslagerwall(a)gmail.com> Date: Fri, 11 Oct 2013 22:04:51 +0200 Subject: [PATCH] dav: Set file type to regular by default Some servers send empty resourcetype nodes or don't send the node at all for regular files (the spec says that it defaults to empty). Set the file type to regular by default. https://bugzilla.gnome.org/show_bug.cgi?id=706798 --- daemon/gvfsbackenddav.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/daemon/gvfsbackenddav.c b/daemon/gvfsbackenddav.c index 2feb980..39995d6 100644 --- a/daemon/gvfsbackenddav.c +++ b/daemon/gvfsbackenddav.c @@ -991,7 +991,7 @@ ms_response_to_file_info (MsResponse *response, g_file_info_set_name (info, basename); g_file_info_set_edit_name (info, basename); - file_type = G_FILE_TYPE_UNKNOWN; + file_type = G_FILE_TYPE_REGULAR; mime_type = NULL; have_display_name = FALSE; @@ -1013,7 +1013,6 @@ ms_response_to_file_info (MsResponse *response, if (node_has_name (node, "resourcetype")) { file_type = parse_resourcetype (node); - g_file_info_set_file_type (info, file_type); } else if (node_has_name (node, "displayname") && text) { @@ -1059,6 +1058,7 @@ ms_response_to_file_info (MsResponse *response, } } + g_file_info_set_file_type (info, file_type); if (file_type == G_FILE_TYPE_DIRECTORY) { icon = g_themed_icon_new ("folder"); -- 1.8.1.5-- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kernel-source for openSUSE:13.1
by root＠hilbert.suse.de 01 Nov '13

01 Nov '13

Hello community, here is the log from the commit of package kernel-source for openSUSE:13.1 checked in at 2013-11-01 07:33:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:13.1/kernel-source (Old) and /work/SRC/openSUSE:13.1/.kernel-source.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kernel-source" Changes: -------- --- /work/SRC/openSUSE:13.1/kernel-source/kernel-cubox.changes 2013-10-25 18:52:53.000000000 +0200 +++ /work/SRC/openSUSE:13.1/.kernel-source.new/kernel-cubox.changes 2013-11-01 07:34:01.000000000 +0100 @@ -1,0 +2,35 @@ +Wed Oct 30 19:04:18 CET 2013 - dsterba(a)suse.cz + +- Disable patches.suse/btrfs-fix-negative-qgroup-tracking-from-owher.patch + reference: bnc#848059 +- commit e6d4a27 + +------------------------------------------------------------------- +Wed Oct 30 17:49:05 CET 2013 - tiwai(a)suse.de + +- ALSA: hda - Add extra chmap for 2.1 outputs on ASUS laptops + (bnc#846531). +- commit 5b1b1d3 + +------------------------------------------------------------------- +Wed Oct 30 12:36:05 CET 2013 - tiwai(a)suse.de + +- ALSA: hda - Add a fixup for ASUS N76VZ (bnc#846529). +- commit 8bd2042 + +------------------------------------------------------------------- +Mon Oct 28 10:31:59 CET 2013 - jbeulich(a)suse.com + +- Update EC2 config files. +- commit 81dd01f + +------------------------------------------------------------------- +Mon Oct 28 09:25:43 CET 2013 - jbeulich(a)suse.com + +- Refresh Xen patches (bnc#829682, bnc#842063). +- pcifront: Deal with toolstack missing 'XenbusStateClosing' + state. +- Update Xen patches to 3.11.6. +- commit 2339477 + +------------------------------------------------------------------- kernel-debug.changes: same change kernel-default.changes: same change kernel-desktop.changes: same change kernel-docs.changes: same change kernel-ec2.changes: same change kernel-exynos.changes: same change kernel-lpae.changes: same change kernel-pae.changes: same change kernel-source.changes: same change kernel-syms.changes: same change kernel-trace.changes: same change kernel-vanilla.changes: same change kernel-xen.changes: same change ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kernel-cubox.spec ++++++ --- /var/tmp/diff_new_pack.L0GhKl/_old 2013-11-01 07:34:05.000000000 +0100 +++ /var/tmp/diff_new_pack.L0GhKl/_new 2013-11-01 07:34:05.000000000 +0100 @@ -61,7 +61,7 @@ Summary: Kernel for SolidRun Cubox Version: 3.11.6 %if 0%{?is_kotd} -Release: <RELEASE>.g0ba01b7 +Release: <RELEASE>.ge6d4a27 %else Release: 0 %endif kernel-debug.spec: same change kernel-default.spec: same change kernel-desktop.spec: same change kernel-docs.spec: same change kernel-ec2.spec: same change kernel-exynos.spec: same change kernel-lpae.spec: same change kernel-pae.spec: same change kernel-source.spec: same change ++++++ kernel-syms.spec ++++++ --- /var/tmp/diff_new_pack.L0GhKl/_old 2013-11-01 07:34:05.000000000 +0100 +++ /var/tmp/diff_new_pack.L0GhKl/_new 2013-11-01 07:34:05.000000000 +0100 @@ -26,7 +26,7 @@ Version: 3.11.6 %if %using_buildservice %if 0%{?is_kotd} -Release: <RELEASE>.g0ba01b7 +Release: <RELEASE>.ge6d4a27 %else Release: 0 %endif ++++++ kernel-trace.spec ++++++ --- /var/tmp/diff_new_pack.L0GhKl/_old 2013-11-01 07:34:05.000000000 +0100 +++ /var/tmp/diff_new_pack.L0GhKl/_new 2013-11-01 07:34:05.000000000 +0100 @@ -61,7 +61,7 @@ Summary: The Standard Kernel with Tracing Features Version: 3.11.6 %if 0%{?is_kotd} -Release: <RELEASE>.g0ba01b7 +Release: <RELEASE>.ge6d4a27 %else Release: 0 %endif kernel-vanilla.spec: same change kernel-xen.spec: same change ++++++ config.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/i386/ec2 new/config/i386/ec2 --- old/config/i386/ec2 2013-10-14 18:45:32.000000000 +0200 +++ new/config/i386/ec2 2013-10-28 10:31:59.000000000 +0100 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/i386 3.11.5 Kernel Configuration +# Linux/i386 3.11.6 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -1273,6 +1273,8 @@ # CONFIG_IPMI_HANDLER is not set # CONFIG_HW_RANDOM is not set # CONFIG_NVRAM is not set +# CONFIG_RTC is not set +# CONFIG_GEN_RTC is not set # CONFIG_R3964 is not set # CONFIG_MWAVE is not set # CONFIG_PC8736x_GPIO is not set @@ -1509,7 +1511,6 @@ # CONFIG_NEW_LEDS is not set # CONFIG_ACCESSIBILITY is not set # CONFIG_EDAC is not set -CONFIG_RTC_LIB=y # CONFIG_RTC_CLASS is not set # CONFIG_DMADEVICES is not set # CONFIG_AUXDISPLAY is not set diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/x86_64/ec2 new/config/x86_64/ec2 --- old/config/x86_64/ec2 2013-10-14 18:45:32.000000000 +0200 +++ new/config/x86_64/ec2 2013-10-28 10:31:59.000000000 +0100 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 3.11.5 Kernel Configuration +# Linux/x86_64 3.11.6 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y @@ -1266,6 +1266,8 @@ # CONFIG_IPMI_HANDLER is not set # CONFIG_HW_RANDOM is not set # CONFIG_NVRAM is not set +# CONFIG_RTC is not set +# CONFIG_GEN_RTC is not set # CONFIG_R3964 is not set # CONFIG_MWAVE is not set CONFIG_RAW_DRIVER=m @@ -1499,7 +1501,6 @@ # CONFIG_NEW_LEDS is not set # CONFIG_ACCESSIBILITY is not set # CONFIG_EDAC is not set -CONFIG_RTC_LIB=y # CONFIG_RTC_CLASS is not set # CONFIG_DMADEVICES is not set # CONFIG_AUXDISPLAY is not set ++++++ patches.drivers.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.drivers/ALSA-hda-Add-a-fixup-for-ASUS-N76VZ new/patches.drivers/ALSA-hda-Add-a-fixup-for-ASUS-N76VZ --- old/patches.drivers/ALSA-hda-Add-a-fixup-for-ASUS-N76VZ 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.drivers/ALSA-hda-Add-a-fixup-for-ASUS-N76VZ 2013-10-30 17:49:05.000000000 +0100 @@ -0,0 +1,29 @@ +From 6fc16e58adf50c0f1e4478538983fb5ff6f453d4 Mon Sep 17 00:00:00 2001 +From: Takashi Iwai <tiwai(a)suse.de> +Date: Wed, 30 Oct 2013 12:29:40 +0100 +Subject: [PATCH] ALSA: hda - Add a fixup for ASUS N76VZ +Git-commit: 6fc16e58adf50c0f1e4478538983fb5ff6f453d4 +Patch-mainline: Submitted +References: bnc#846529 + +ASUS N76VZ needs the same fixup as N56VZ for supporting the boost +speaker. + +Bugzilla: https://bugzilla.novell.com/show_bug.cgi?id=846529 +Cc: <stable(a)vger.kernel.org> +Signed-off-by: Takashi Iwai <tiwai(a)suse.de> + +--- + sound/pci/hda/patch_realtek.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/sound/pci/hda/patch_realtek.c ++++ b/sound/pci/hda/patch_realtek.c +@@ -4382,6 +4382,7 @@ static const struct snd_pci_quirk alc662 + SND_PCI_QUIRK(0x1028, 0x05db, "Dell", ALC668_FIXUP_DELL_MIC_NO_PRESENCE), + SND_PCI_QUIRK(0x103c, 0x1632, "HP RP5800", ALC662_FIXUP_HP_RP5800), + SND_PCI_QUIRK(0x1043, 0x1477, "ASUS N56VZ", ALC662_FIXUP_ASUS_MODE4), ++ SND_PCI_QUIRK(0x1043, 0x1bf3, "ASUS N76VZ", ALC662_FIXUP_ASUS_MODE4), + SND_PCI_QUIRK(0x1043, 0x8469, "ASUS mobo", ALC662_FIXUP_NO_JACK_DETECT), + SND_PCI_QUIRK(0x105b, 0x0cd6, "Foxconn", ALC662_FIXUP_ASUS_MODE2), + SND_PCI_QUIRK(0x144d, 0xc051, "Samsung R720", ALC662_FIXUP_IDEAPAD), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.drivers/ALSA-hda-Add-extra-chmap-for-2.1-outputs-on-ASUS-lap new/patches.drivers/ALSA-hda-Add-extra-chmap-for-2.1-outputs-on-ASUS-lap --- old/patches.drivers/ALSA-hda-Add-extra-chmap-for-2.1-outputs-on-ASUS-lap 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.drivers/ALSA-hda-Add-extra-chmap-for-2.1-outputs-on-ASUS-lap 2013-10-30 17:49:05.000000000 +0100 @@ -0,0 +1,79 @@ +From 8e38395360844806041ea69ab9690f5f174bc40c Mon Sep 17 00:00:00 2001 +From: Takashi Iwai <tiwai(a)suse.de> +Date: Wed, 30 Oct 2013 17:41:12 +0100 +Subject: [PATCH] ALSA: hda - Add extra chmap for 2.1 outputs on ASUS laptops +Git-commit: 8e38395360844806041ea69ab9690f5f174bc40c +Patch-mainline: Submitted +References: bnc#846531 + +ASUS N56VZ and N76VZ laptops have a bass speaker but its output comes +only from the right channel. This patch adds the extra chmap specific +to these models. + +Bugzilla: https://bugzilla.novell.com/show_bug.cgi?id=846531 +Signed-off-by: Takashi Iwai <tiwai(a)suse.de> + +--- + sound/pci/hda/patch_realtek.c | 30 ++++++++++++++++++++++++++++-- + 1 file changed, 28 insertions(+), 2 deletions(-) + +--- a/sound/pci/hda/patch_realtek.c ++++ b/sound/pci/hda/patch_realtek.c +@@ -4174,6 +4174,25 @@ static void alc272_fixup_mario(struct hd + "hda_codec: failed to override amp caps for NID 0x2\n"); + } + ++static const struct snd_pcm_chmap_elem asus_pcm_2_1_chmaps[] = { ++ { .channels = 2, ++ .map = { SNDRV_CHMAP_FL, SNDRV_CHMAP_FR } }, ++ { .channels = 4, ++ .map = { SNDRV_CHMAP_FL, SNDRV_CHMAP_FR, ++ SNDRV_CHMAP_NA, SNDRV_CHMAP_LFE } }, /* LFE only on right */ ++ { } ++}; ++ ++/* override the 2.1 chmap */ ++static void alc662_fixup_bass_chmap(struct hda_codec *codec, ++ const struct hda_fixup *fix, int action) ++{ ++ if (action == HDA_FIXUP_ACT_BUILD) { ++ struct alc_spec *spec = codec->spec; ++ spec->gen.pcm_rec[0].stream[0].chmap = asus_pcm_2_1_chmaps; ++ } ++} ++ + enum { + ALC662_FIXUP_ASPIRE, + ALC662_FIXUP_IDEAPAD, +@@ -4194,6 +4213,7 @@ enum { + ALC662_FIXUP_INV_DMIC, + ALC668_FIXUP_DELL_MIC_NO_PRESENCE, + ALC668_FIXUP_HEADSET_MODE, ++ ALC662_FIXUP_BASS_CHMAP, + }; + + static const struct hda_fixup alc662_fixups[] = { +@@ -4368,6 +4388,12 @@ static const struct hda_fixup alc662_fix + .type = HDA_FIXUP_FUNC, + .v.func = alc_fixup_headset_mode_alc668, + }, ++ [ALC662_FIXUP_BASS_CHMAP] = { ++ .type = HDA_FIXUP_FUNC, ++ .v.func = alc662_fixup_bass_chmap, ++ .chained = true, ++ .chain_id = ALC662_FIXUP_ASUS_MODE4 ++ }, + }; + + static const struct snd_pci_quirk alc662_fixup_tbl[] = { +@@ -4381,8 +4407,8 @@ static const struct snd_pci_quirk alc662 + SND_PCI_QUIRK(0x1028, 0x05d8, "Dell", ALC668_FIXUP_DELL_MIC_NO_PRESENCE), + SND_PCI_QUIRK(0x1028, 0x05db, "Dell", ALC668_FIXUP_DELL_MIC_NO_PRESENCE), + SND_PCI_QUIRK(0x103c, 0x1632, "HP RP5800", ALC662_FIXUP_HP_RP5800), +- SND_PCI_QUIRK(0x1043, 0x1477, "ASUS N56VZ", ALC662_FIXUP_ASUS_MODE4), +- SND_PCI_QUIRK(0x1043, 0x1bf3, "ASUS N76VZ", ALC662_FIXUP_ASUS_MODE4), ++ SND_PCI_QUIRK(0x1043, 0x1477, "ASUS N56VZ", ALC662_FIXUP_BASS_CHMAP), ++ SND_PCI_QUIRK(0x1043, 0x1bf3, "ASUS N76VZ", ALC662_FIXUP_BASS_CHMAP), + SND_PCI_QUIRK(0x1043, 0x8469, "ASUS mobo", ALC662_FIXUP_NO_JACK_DETECT), + SND_PCI_QUIRK(0x105b, 0x0cd6, "Foxconn", ALC662_FIXUP_ASUS_MODE2), + SND_PCI_QUIRK(0x144d, 0xc051, "Samsung R720", ALC662_FIXUP_IDEAPAD), ++++++ patches.xen.tar.bz2 ++++++ ++++ 47202 lines of diff (skipped) ++++++ series.conf ++++++ --- /var/tmp/diff_new_pack.L0GhKl/_old 2013-11-01 07:34:07.000000000 +0100 +++ /var/tmp/diff_new_pack.L0GhKl/_new 2013-11-01 07:34:07.000000000 +0100 @@ -303,7 +303,7 @@ +dsterba patches.suse/btrfs-0034-optimize-key-searches-in-btrfs_search_slot.patch patches.suse/btrfs-relocate-csums-properly-with-prealloc-extents.patch - patches.suse/btrfs-fix-negative-qgroup-tracking-from-owher.patch ++dsterba patches.suse/btrfs-fix-negative-qgroup-tracking-from-owher.patch patches.suse/btrfs-use-end-trans-in-label-ioctl patches.suse/btrfs-add-ability-to-query-change-feature-bits-online-ioctl patches.suse/introduce-kobj_completion @@ -477,6 +477,8 @@ ########################################################## # Sound ########################################################## + patches.drivers/ALSA-hda-Add-a-fixup-for-ASUS-N76VZ + patches.drivers/ALSA-hda-Add-extra-chmap-for-2.1-outputs-on-ASUS-lap ######################################################## # Char / serial @@ -625,6 +627,7 @@ patches.xen/xen3-fixup-xen # newer changeset backports + patches.xen/1240-pcifront-toolstack-missing-XenbusStateClosing.patch # changes outside arch/{i386,x86_64}/xen patches.xen/xen3-fixup-kconfig @@ -667,6 +670,8 @@ patches.xen/xen3-patch-3.9 patches.xen/xen3-patch-3.10 patches.xen/xen3-patch-3.11 + patches.xen/xen3-patch-3.11.1-2 + patches.xen/xen3-patch-3.11.5-6 # ports of other patches patches.xen/xen3-010-acpi_initrd_override_tables.patch ++++++ source-timestamp ++++++ --- /var/tmp/diff_new_pack.L0GhKl/_old 2013-11-01 07:34:07.000000000 +0100 +++ /var/tmp/diff_new_pack.L0GhKl/_new 2013-11-01 07:34:07.000000000 +0100 @@ -1,3 +1,3 @@ -2013-10-24 18:23:02 +0200 -GIT Revision: 0ba01b7a2bea03711ab3630db1f03f6fa3035232 +2013-10-30 19:04:56 +0100 +GIT Revision: e6d4a2702ebe275d6b1fc8218cb71a98757f35db GIT Branch: openSUSE-13.1 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kernel-source for openSUSE:Factory
by root＠hilbert.suse.de 01 Nov '13

01 Nov '13

Hello community, here is the log from the commit of package kernel-source for openSUSE:Factory checked in at 2013-11-01 07:33:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kernel-source (Old) and /work/SRC/openSUSE:Factory/.kernel-source.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kernel-source" Changes: -------- --- /work/SRC/openSUSE:Factory/kernel-source/kernel-cubox.changes 2013-10-25 18:52:39.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kernel-source.new/kernel-cubox.changes 2013-11-01 07:33:53.000000000 +0100 @@ -1,0 +2,35 @@ +Wed Oct 30 19:04:18 CET 2013 - dsterba(a)suse.cz + +- Disable patches.suse/btrfs-fix-negative-qgroup-tracking-from-owher.patch + reference: bnc#848059 +- commit e6d4a27 + +------------------------------------------------------------------- +Wed Oct 30 17:49:05 CET 2013 - tiwai(a)suse.de + +- ALSA: hda - Add extra chmap for 2.1 outputs on ASUS laptops + (bnc#846531). +- commit 5b1b1d3 + +------------------------------------------------------------------- +Wed Oct 30 12:36:05 CET 2013 - tiwai(a)suse.de + +- ALSA: hda - Add a fixup for ASUS N76VZ (bnc#846529). +- commit 8bd2042 + +------------------------------------------------------------------- +Mon Oct 28 10:31:59 CET 2013 - jbeulich(a)suse.com + +- Update EC2 config files. +- commit 81dd01f + +------------------------------------------------------------------- +Mon Oct 28 09:25:43 CET 2013 - jbeulich(a)suse.com + +- Refresh Xen patches (bnc#829682, bnc#842063). +- pcifront: Deal with toolstack missing 'XenbusStateClosing' + state. +- Update Xen patches to 3.11.6. +- commit 2339477 + +------------------------------------------------------------------- kernel-debug.changes: same change kernel-default.changes: same change kernel-desktop.changes: same change kernel-docs.changes: same change kernel-ec2.changes: same change kernel-exynos.changes: same change kernel-lpae.changes: same change kernel-pae.changes: same change kernel-source.changes: same change kernel-syms.changes: same change kernel-trace.changes: same change kernel-vanilla.changes: same change kernel-xen.changes: same change ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kernel-cubox.spec ++++++ --- /var/tmp/diff_new_pack.kOawzz/_old 2013-11-01 07:33:58.000000000 +0100 +++ /var/tmp/diff_new_pack.kOawzz/_new 2013-11-01 07:33:58.000000000 +0100 @@ -61,7 +61,7 @@ Summary: Kernel for SolidRun Cubox Version: 3.11.6 %if 0%{?is_kotd} -Release: <RELEASE>.g0ba01b7 +Release: <RELEASE>.ge6d4a27 %else Release: 0 %endif kernel-debug.spec: same change kernel-default.spec: same change kernel-desktop.spec: same change kernel-docs.spec: same change kernel-ec2.spec: same change kernel-exynos.spec: same change kernel-lpae.spec: same change kernel-pae.spec: same change kernel-source.spec: same change ++++++ kernel-syms.spec ++++++ --- /var/tmp/diff_new_pack.kOawzz/_old 2013-11-01 07:33:58.000000000 +0100 +++ /var/tmp/diff_new_pack.kOawzz/_new 2013-11-01 07:33:58.000000000 +0100 @@ -26,7 +26,7 @@ Version: 3.11.6 %if %using_buildservice %if 0%{?is_kotd} -Release: <RELEASE>.g0ba01b7 +Release: <RELEASE>.ge6d4a27 %else Release: 0 %endif ++++++ kernel-trace.spec ++++++ --- /var/tmp/diff_new_pack.kOawzz/_old 2013-11-01 07:33:58.000000000 +0100 +++ /var/tmp/diff_new_pack.kOawzz/_new 2013-11-01 07:33:58.000000000 +0100 @@ -61,7 +61,7 @@ Summary: The Standard Kernel with Tracing Features Version: 3.11.6 %if 0%{?is_kotd} -Release: <RELEASE>.g0ba01b7 +Release: <RELEASE>.ge6d4a27 %else Release: 0 %endif kernel-vanilla.spec: same change kernel-xen.spec: same change ++++++ config.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/i386/ec2 new/config/i386/ec2 --- old/config/i386/ec2 2013-10-14 18:45:32.000000000 +0200 +++ new/config/i386/ec2 2013-10-28 10:31:59.000000000 +0100 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/i386 3.11.5 Kernel Configuration +# Linux/i386 3.11.6 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -1273,6 +1273,8 @@ # CONFIG_IPMI_HANDLER is not set # CONFIG_HW_RANDOM is not set # CONFIG_NVRAM is not set +# CONFIG_RTC is not set +# CONFIG_GEN_RTC is not set # CONFIG_R3964 is not set # CONFIG_MWAVE is not set # CONFIG_PC8736x_GPIO is not set @@ -1509,7 +1511,6 @@ # CONFIG_NEW_LEDS is not set # CONFIG_ACCESSIBILITY is not set # CONFIG_EDAC is not set -CONFIG_RTC_LIB=y # CONFIG_RTC_CLASS is not set # CONFIG_DMADEVICES is not set # CONFIG_AUXDISPLAY is not set diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/x86_64/ec2 new/config/x86_64/ec2 --- old/config/x86_64/ec2 2013-10-14 18:45:32.000000000 +0200 +++ new/config/x86_64/ec2 2013-10-28 10:31:59.000000000 +0100 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 3.11.5 Kernel Configuration +# Linux/x86_64 3.11.6 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y @@ -1266,6 +1266,8 @@ # CONFIG_IPMI_HANDLER is not set # CONFIG_HW_RANDOM is not set # CONFIG_NVRAM is not set +# CONFIG_RTC is not set +# CONFIG_GEN_RTC is not set # CONFIG_R3964 is not set # CONFIG_MWAVE is not set CONFIG_RAW_DRIVER=m @@ -1499,7 +1501,6 @@ # CONFIG_NEW_LEDS is not set # CONFIG_ACCESSIBILITY is not set # CONFIG_EDAC is not set -CONFIG_RTC_LIB=y # CONFIG_RTC_CLASS is not set # CONFIG_DMADEVICES is not set # CONFIG_AUXDISPLAY is not set ++++++ patches.drivers.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.drivers/ALSA-hda-Add-a-fixup-for-ASUS-N76VZ new/patches.drivers/ALSA-hda-Add-a-fixup-for-ASUS-N76VZ --- old/patches.drivers/ALSA-hda-Add-a-fixup-for-ASUS-N76VZ 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.drivers/ALSA-hda-Add-a-fixup-for-ASUS-N76VZ 2013-10-30 17:49:05.000000000 +0100 @@ -0,0 +1,29 @@ +From 6fc16e58adf50c0f1e4478538983fb5ff6f453d4 Mon Sep 17 00:00:00 2001 +From: Takashi Iwai <tiwai(a)suse.de> +Date: Wed, 30 Oct 2013 12:29:40 +0100 +Subject: [PATCH] ALSA: hda - Add a fixup for ASUS N76VZ +Git-commit: 6fc16e58adf50c0f1e4478538983fb5ff6f453d4 +Patch-mainline: Submitted +References: bnc#846529 + +ASUS N76VZ needs the same fixup as N56VZ for supporting the boost +speaker. + +Bugzilla: https://bugzilla.novell.com/show_bug.cgi?id=846529 +Cc: <stable(a)vger.kernel.org> +Signed-off-by: Takashi Iwai <tiwai(a)suse.de> + +--- + sound/pci/hda/patch_realtek.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/sound/pci/hda/patch_realtek.c ++++ b/sound/pci/hda/patch_realtek.c +@@ -4382,6 +4382,7 @@ static const struct snd_pci_quirk alc662 + SND_PCI_QUIRK(0x1028, 0x05db, "Dell", ALC668_FIXUP_DELL_MIC_NO_PRESENCE), + SND_PCI_QUIRK(0x103c, 0x1632, "HP RP5800", ALC662_FIXUP_HP_RP5800), + SND_PCI_QUIRK(0x1043, 0x1477, "ASUS N56VZ", ALC662_FIXUP_ASUS_MODE4), ++ SND_PCI_QUIRK(0x1043, 0x1bf3, "ASUS N76VZ", ALC662_FIXUP_ASUS_MODE4), + SND_PCI_QUIRK(0x1043, 0x8469, "ASUS mobo", ALC662_FIXUP_NO_JACK_DETECT), + SND_PCI_QUIRK(0x105b, 0x0cd6, "Foxconn", ALC662_FIXUP_ASUS_MODE2), + SND_PCI_QUIRK(0x144d, 0xc051, "Samsung R720", ALC662_FIXUP_IDEAPAD), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.drivers/ALSA-hda-Add-extra-chmap-for-2.1-outputs-on-ASUS-lap new/patches.drivers/ALSA-hda-Add-extra-chmap-for-2.1-outputs-on-ASUS-lap --- old/patches.drivers/ALSA-hda-Add-extra-chmap-for-2.1-outputs-on-ASUS-lap 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.drivers/ALSA-hda-Add-extra-chmap-for-2.1-outputs-on-ASUS-lap 2013-10-30 17:49:05.000000000 +0100 @@ -0,0 +1,79 @@ +From 8e38395360844806041ea69ab9690f5f174bc40c Mon Sep 17 00:00:00 2001 +From: Takashi Iwai <tiwai(a)suse.de> +Date: Wed, 30 Oct 2013 17:41:12 +0100 +Subject: [PATCH] ALSA: hda - Add extra chmap for 2.1 outputs on ASUS laptops +Git-commit: 8e38395360844806041ea69ab9690f5f174bc40c +Patch-mainline: Submitted +References: bnc#846531 + +ASUS N56VZ and N76VZ laptops have a bass speaker but its output comes +only from the right channel. This patch adds the extra chmap specific +to these models. + +Bugzilla: https://bugzilla.novell.com/show_bug.cgi?id=846531 +Signed-off-by: Takashi Iwai <tiwai(a)suse.de> + +--- + sound/pci/hda/patch_realtek.c | 30 ++++++++++++++++++++++++++++-- + 1 file changed, 28 insertions(+), 2 deletions(-) + +--- a/sound/pci/hda/patch_realtek.c ++++ b/sound/pci/hda/patch_realtek.c +@@ -4174,6 +4174,25 @@ static void alc272_fixup_mario(struct hd + "hda_codec: failed to override amp caps for NID 0x2\n"); + } + ++static const struct snd_pcm_chmap_elem asus_pcm_2_1_chmaps[] = { ++ { .channels = 2, ++ .map = { SNDRV_CHMAP_FL, SNDRV_CHMAP_FR } }, ++ { .channels = 4, ++ .map = { SNDRV_CHMAP_FL, SNDRV_CHMAP_FR, ++ SNDRV_CHMAP_NA, SNDRV_CHMAP_LFE } }, /* LFE only on right */ ++ { } ++}; ++ ++/* override the 2.1 chmap */ ++static void alc662_fixup_bass_chmap(struct hda_codec *codec, ++ const struct hda_fixup *fix, int action) ++{ ++ if (action == HDA_FIXUP_ACT_BUILD) { ++ struct alc_spec *spec = codec->spec; ++ spec->gen.pcm_rec[0].stream[0].chmap = asus_pcm_2_1_chmaps; ++ } ++} ++ + enum { + ALC662_FIXUP_ASPIRE, + ALC662_FIXUP_IDEAPAD, +@@ -4194,6 +4213,7 @@ enum { + ALC662_FIXUP_INV_DMIC, + ALC668_FIXUP_DELL_MIC_NO_PRESENCE, + ALC668_FIXUP_HEADSET_MODE, ++ ALC662_FIXUP_BASS_CHMAP, + }; + + static const struct hda_fixup alc662_fixups[] = { +@@ -4368,6 +4388,12 @@ static const struct hda_fixup alc662_fix + .type = HDA_FIXUP_FUNC, + .v.func = alc_fixup_headset_mode_alc668, + }, ++ [ALC662_FIXUP_BASS_CHMAP] = { ++ .type = HDA_FIXUP_FUNC, ++ .v.func = alc662_fixup_bass_chmap, ++ .chained = true, ++ .chain_id = ALC662_FIXUP_ASUS_MODE4 ++ }, + }; + + static const struct snd_pci_quirk alc662_fixup_tbl[] = { +@@ -4381,8 +4407,8 @@ static const struct snd_pci_quirk alc662 + SND_PCI_QUIRK(0x1028, 0x05d8, "Dell", ALC668_FIXUP_DELL_MIC_NO_PRESENCE), + SND_PCI_QUIRK(0x1028, 0x05db, "Dell", ALC668_FIXUP_DELL_MIC_NO_PRESENCE), + SND_PCI_QUIRK(0x103c, 0x1632, "HP RP5800", ALC662_FIXUP_HP_RP5800), +- SND_PCI_QUIRK(0x1043, 0x1477, "ASUS N56VZ", ALC662_FIXUP_ASUS_MODE4), +- SND_PCI_QUIRK(0x1043, 0x1bf3, "ASUS N76VZ", ALC662_FIXUP_ASUS_MODE4), ++ SND_PCI_QUIRK(0x1043, 0x1477, "ASUS N56VZ", ALC662_FIXUP_BASS_CHMAP), ++ SND_PCI_QUIRK(0x1043, 0x1bf3, "ASUS N76VZ", ALC662_FIXUP_BASS_CHMAP), + SND_PCI_QUIRK(0x1043, 0x8469, "ASUS mobo", ALC662_FIXUP_NO_JACK_DETECT), + SND_PCI_QUIRK(0x105b, 0x0cd6, "Foxconn", ALC662_FIXUP_ASUS_MODE2), + SND_PCI_QUIRK(0x144d, 0xc051, "Samsung R720", ALC662_FIXUP_IDEAPAD), ++++++ patches.xen.tar.bz2 ++++++ ++++ 47202 lines of diff (skipped) ++++++ series.conf ++++++ --- /var/tmp/diff_new_pack.kOawzz/_old 2013-11-01 07:34:01.000000000 +0100 +++ /var/tmp/diff_new_pack.kOawzz/_new 2013-11-01 07:34:01.000000000 +0100 @@ -303,7 +303,7 @@ +dsterba patches.suse/btrfs-0034-optimize-key-searches-in-btrfs_search_slot.patch patches.suse/btrfs-relocate-csums-properly-with-prealloc-extents.patch - patches.suse/btrfs-fix-negative-qgroup-tracking-from-owher.patch ++dsterba patches.suse/btrfs-fix-negative-qgroup-tracking-from-owher.patch patches.suse/btrfs-use-end-trans-in-label-ioctl patches.suse/btrfs-add-ability-to-query-change-feature-bits-online-ioctl patches.suse/introduce-kobj_completion @@ -477,6 +477,8 @@ ########################################################## # Sound ########################################################## + patches.drivers/ALSA-hda-Add-a-fixup-for-ASUS-N76VZ + patches.drivers/ALSA-hda-Add-extra-chmap-for-2.1-outputs-on-ASUS-lap ######################################################## # Char / serial @@ -625,6 +627,7 @@ patches.xen/xen3-fixup-xen # newer changeset backports + patches.xen/1240-pcifront-toolstack-missing-XenbusStateClosing.patch # changes outside arch/{i386,x86_64}/xen patches.xen/xen3-fixup-kconfig @@ -667,6 +670,8 @@ patches.xen/xen3-patch-3.9 patches.xen/xen3-patch-3.10 patches.xen/xen3-patch-3.11 + patches.xen/xen3-patch-3.11.1-2 + patches.xen/xen3-patch-3.11.5-6 # ports of other patches patches.xen/xen3-010-acpi_initrd_override_tables.patch ++++++ source-timestamp ++++++ --- /var/tmp/diff_new_pack.kOawzz/_old 2013-11-01 07:34:01.000000000 +0100 +++ /var/tmp/diff_new_pack.kOawzz/_new 2013-11-01 07:34:01.000000000 +0100 @@ -1,3 +1,3 @@ -2013-10-24 18:23:02 +0200 -GIT Revision: 0ba01b7a2bea03711ab3630db1f03f6fa3035232 +2013-10-30 19:04:56 +0100 +GIT Revision: e6d4a2702ebe275d6b1fc8218cb71a98757f35db GIT Branch: openSUSE-13.1 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xulrunner for openSUSE:13.1
by root＠hilbert.suse.de 01 Nov '13

01 Nov '13

Hello community, here is the log from the commit of package xulrunner for openSUSE:13.1 checked in at 2013-11-01 07:05:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:13.1/xulrunner (Old) and /work/SRC/openSUSE:13.1/.xulrunner.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xulrunner" Changes: -------- --- /work/SRC/openSUSE:13.1/xulrunner/xulrunner.changes 2013-09-23 11:16:15.000000000 +0200 +++ /work/SRC/openSUSE:13.1/.xulrunner.new/xulrunner.changes 2013-11-01 07:05:35.000000000 +0100 @@ -1,0 +2,41 @@ +Thu Oct 24 16:40:37 UTC 2013 - wr(a)rosenauer.org + +- update to 17.0.10esr (bnc#847708) + * require NSS 3.14.4 or above + * MFSA 2013-93/CVE-2013-5590/CVE-2013-5591/CVE-2013-5592 + Miscellaneous memory safety hazards + * MFSA 2013-95/CVE-2013-5604 (bmo#914017) + Access violation with XSLT and uninitialized data + * MFSA 2013-96/CVE-2013-5595 (bmo#916580) + Improperly initialized memory and overflows in some JavaScript + functions + * MFSA 2013-98/CVE-2013-5597 (bmo#918864) + Use-after-free when updating offline cache + * MFSA 2013-100/CVE-2013-5599/CVE-2013-5600/CVE-2013-5601 + (bmo#915210, bmo#915576, bmo#916685) + Miscellaneous use-after-free issues found through ASAN fuzzing + * MFSA 2013-101/CVE-2013-5602 (bmo#897678) + Memory corruption in workers + +------------------------------------------------------------------- +Thu Sep 12 10:06:08 UTC 2013 - wr(a)rosenauer.org + +- update to 17.0.9esr (bnc#840485) + * MFSA 2013-65/CVE-2013-1705 (bmo#882865) + Buffer underflow when generating CRMF requests + * MFSA 2013-76/CVE-2013-1718 + Miscellaneous memory safety hazards + * MFSA 2013-79/CVE-2013-1722 (bmo#893308) + Use-after-free in Animation Manager during stylesheet cloning + * MFSA 2013-82/CVE-2013-1725 (bmo#876762) + Calling scope for new Javascript objects can lead to memory corruption + * MFSA 2013-88/CVE-2013-1730 (bmo#851353) + Compartment mismatch re-attaching XBL-backed nodes + * MFSA 2013-89/CVE-2013-1732 (bmo#883514) + Buffer overflow with multi-column, lists, and floats + * MFSA 2013-90/CVE-2013-1735/CVE-2013-1736 (bmo#898871, bmo#906301) + Memory corruption involving scrolling + * MFSA 2013-91/CVE-2013-1737 (bmo#907727) + User-defined properties on DOM proxies get the wrong "this" object + +------------------------------------------------------------------- Old: ---- l10n-17.0.8.tar.bz2 xulrunner-17.0.8-source.tar.bz2 New: ---- _constraints l10n-17.0.10.tar.bz2 xulrunner-17.0.10-source.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xulrunner.spec ++++++ --- /var/tmp/diff_new_pack.4B9S5h/_old 2013-11-01 07:05:37.000000000 +0100 +++ /var/tmp/diff_new_pack.4B9S5h/_new 2013-11-01 07:05:37.000000000 +0100 @@ -43,13 +43,13 @@ BuildRequires: wireless-tools %endif BuildRequires: mozilla-nspr-devel >= 4.9.5 -BuildRequires: mozilla-nss-devel >= 3.14.3 -Version: 17.0.8 +BuildRequires: mozilla-nss-devel >= 3.14.4 +Version: 17.0.10 Release: 0 -%define releasedate 2013080100 -%define version_internal 17.0.8 +%define releasedate 2013102400 +%define version_internal 17.0.10 %define apiversion 17 -%define uaweight 1700008 +%define uaweight 1700010 Summary: Mozilla Runtime Environment License: MPL-2.0 Group: Productivity/Other ++++++ compare-locales.tar.bz2 ++++++ ++++++ create-tar.sh ++++++ --- /var/tmp/diff_new_pack.4B9S5h/_old 2013-11-01 07:05:37.000000000 +0100 +++ /var/tmp/diff_new_pack.4B9S5h/_new 2013-11-01 07:05:37.000000000 +0100 @@ -2,8 +2,8 @@ CHANNEL="esr17" BRANCH="releases/mozilla-$CHANNEL" -RELEASE_TAG="FIREFOX_17_0_8esr_RELEASE" -VERSION="17.0.8" +RELEASE_TAG="FIREFOX_17_0_10esr_RELEASE" +VERSION="17.0.10" # mozilla echo "cloning $BRANCH..." ++++++ l10n-17.0.8.tar.bz2 -> l10n-17.0.10.tar.bz2 ++++++ /work/SRC/openSUSE:13.1/xulrunner/l10n-17.0.8.tar.bz2 /work/SRC/openSUSE:13.1/.xulrunner.new/l10n-17.0.10.tar.bz2 differ: char 11, line 1 ++++++ source-stamp.txt ++++++ --- /var/tmp/diff_new_pack.4B9S5h/_old 2013-11-01 07:05:37.000000000 +0100 +++ /var/tmp/diff_new_pack.4B9S5h/_new 2013-11-01 07:05:37.000000000 +0100 @@ -1,2 +1,2 @@ -REV=0ebfe6274430 +REV=a112cbb2288e REPO=http://hg.mozilla.org/releases/mozilla-esr17 ++++++ xulrunner-17.0.8-source.tar.bz2 -> xulrunner-17.0.10-source.tar.bz2 ++++++ /work/SRC/openSUSE:13.1/xulrunner/xulrunner-17.0.8-source.tar.bz2 /work/SRC/openSUSE:13.1/.xulrunner.new/xulrunner-17.0.10-source.tar.bz2 differ: char 11, line 1 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xulrunner for openSUSE:Factory
by root＠hilbert.suse.de 01 Nov '13

01 Nov '13

Hello community, here is the log from the commit of package xulrunner for openSUSE:Factory checked in at 2013-11-01 07:05:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xulrunner (Old) and /work/SRC/openSUSE:Factory/.xulrunner.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xulrunner" Changes: -------- --- /work/SRC/openSUSE:Factory/xulrunner/xulrunner.changes 2013-08-11 11:21:20.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xulrunner.new/xulrunner.changes 2013-11-01 07:05:26.000000000 +0100 @@ -1,0 +2,41 @@ +Thu Oct 24 16:40:37 UTC 2013 - wr(a)rosenauer.org + +- update to 17.0.10esr (bnc#847708) + * require NSS 3.14.4 or above + * MFSA 2013-93/CVE-2013-5590/CVE-2013-5591/CVE-2013-5592 + Miscellaneous memory safety hazards + * MFSA 2013-95/CVE-2013-5604 (bmo#914017) + Access violation with XSLT and uninitialized data + * MFSA 2013-96/CVE-2013-5595 (bmo#916580) + Improperly initialized memory and overflows in some JavaScript + functions + * MFSA 2013-98/CVE-2013-5597 (bmo#918864) + Use-after-free when updating offline cache + * MFSA 2013-100/CVE-2013-5599/CVE-2013-5600/CVE-2013-5601 + (bmo#915210, bmo#915576, bmo#916685) + Miscellaneous use-after-free issues found through ASAN fuzzing + * MFSA 2013-101/CVE-2013-5602 (bmo#897678) + Memory corruption in workers + +------------------------------------------------------------------- +Thu Sep 12 10:06:08 UTC 2013 - wr(a)rosenauer.org + +- update to 17.0.9esr (bnc#840485) + * MFSA 2013-65/CVE-2013-1705 (bmo#882865) + Buffer underflow when generating CRMF requests + * MFSA 2013-76/CVE-2013-1718 + Miscellaneous memory safety hazards + * MFSA 2013-79/CVE-2013-1722 (bmo#893308) + Use-after-free in Animation Manager during stylesheet cloning + * MFSA 2013-82/CVE-2013-1725 (bmo#876762) + Calling scope for new Javascript objects can lead to memory corruption + * MFSA 2013-88/CVE-2013-1730 (bmo#851353) + Compartment mismatch re-attaching XBL-backed nodes + * MFSA 2013-89/CVE-2013-1732 (bmo#883514) + Buffer overflow with multi-column, lists, and floats + * MFSA 2013-90/CVE-2013-1735/CVE-2013-1736 (bmo#898871, bmo#906301) + Memory corruption involving scrolling + * MFSA 2013-91/CVE-2013-1737 (bmo#907727) + User-defined properties on DOM proxies get the wrong "this" object + +------------------------------------------------------------------- Old: ---- l10n-17.0.8.tar.bz2 xulrunner-17.0.8-source.tar.bz2 New: ---- _constraints l10n-17.0.10.tar.bz2 xulrunner-17.0.10-source.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xulrunner.spec ++++++ --- /var/tmp/diff_new_pack.lp8zYd/_old 2013-11-01 07:05:31.000000000 +0100 +++ /var/tmp/diff_new_pack.lp8zYd/_new 2013-11-01 07:05:31.000000000 +0100 @@ -43,13 +43,13 @@ BuildRequires: wireless-tools %endif BuildRequires: mozilla-nspr-devel >= 4.9.5 -BuildRequires: mozilla-nss-devel >= 3.14.3 -Version: 17.0.8 +BuildRequires: mozilla-nss-devel >= 3.14.4 +Version: 17.0.10 Release: 0 -%define releasedate 2013080100 -%define version_internal 17.0.8 +%define releasedate 2013102400 +%define version_internal 17.0.10 %define apiversion 17 -%define uaweight 1700008 +%define uaweight 1700010 Summary: Mozilla Runtime Environment License: MPL-2.0 Group: Productivity/Other ++++++ compare-locales.tar.bz2 ++++++ ++++++ create-tar.sh ++++++ --- /var/tmp/diff_new_pack.lp8zYd/_old 2013-11-01 07:05:31.000000000 +0100 +++ /var/tmp/diff_new_pack.lp8zYd/_new 2013-11-01 07:05:31.000000000 +0100 @@ -2,8 +2,8 @@ CHANNEL="esr17" BRANCH="releases/mozilla-$CHANNEL" -RELEASE_TAG="FIREFOX_17_0_8esr_RELEASE" -VERSION="17.0.8" +RELEASE_TAG="FIREFOX_17_0_10esr_RELEASE" +VERSION="17.0.10" # mozilla echo "cloning $BRANCH..." ++++++ l10n-17.0.8.tar.bz2 -> l10n-17.0.10.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/xulrunner/l10n-17.0.8.tar.bz2 /work/SRC/openSUSE:Factory/.xulrunner.new/l10n-17.0.10.tar.bz2 differ: char 11, line 1 ++++++ source-stamp.txt ++++++ --- /var/tmp/diff_new_pack.lp8zYd/_old 2013-11-01 07:05:31.000000000 +0100 +++ /var/tmp/diff_new_pack.lp8zYd/_new 2013-11-01 07:05:31.000000000 +0100 @@ -1,2 +1,2 @@ -REV=0ebfe6274430 +REV=a112cbb2288e REPO=http://hg.mozilla.org/releases/mozilla-esr17 ++++++ xulrunner-17.0.8-source.tar.bz2 -> xulrunner-17.0.10-source.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/xulrunner/xulrunner-17.0.8-source.tar.bz2 /work/SRC/openSUSE:Factory/.xulrunner.new/xulrunner-17.0.10-source.tar.bz2 differ: char 11, line 1 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit MozillaFirefox for openSUSE:13.1
by root＠hilbert.suse.de 01 Nov '13

01 Nov '13

Hello community, here is the log from the commit of package MozillaFirefox for openSUSE:13.1 checked in at 2013-11-01 07:04:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:13.1/MozillaFirefox (Old) and /work/SRC/openSUSE:13.1/.MozillaFirefox.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "MozillaFirefox" Changes: -------- --- /work/SRC/openSUSE:13.1/MozillaFirefox/MozillaFirefox.changes 2013-09-30 09:32:15.000000000 +0200 +++ /work/SRC/openSUSE:13.1/.MozillaFirefox.new/MozillaFirefox.changes 2013-11-01 07:05:09.000000000 +0100 @@ -1,0 +2,29 @@ +Thu Oct 24 18:16:19 UTC 2013 - wr(a)rosenauer.org + +- update to Firefox 25.0 (bnc#847708) + * rebased patches + * requires NSS 3.15.2 or above + * MFSA 2013-93/CVE-2013-5590/CVE-2013-5591/CVE-2013-5592 + Miscellaneous memory safety hazards + * MFSA 2013-94/CVE-2013-5593 (bmo#868327) + Spoofing addressbar through SELECT element + * MFSA 2013-95/CVE-2013-5604 (bmo#914017) + Access violation with XSLT and uninitialized data + * MFSA 2013-96/CVE-2013-5595 (bmo#916580) + Improperly initialized memory and overflows in some JavaScript + functions + * MFSA 2013-97/CVE-2013-5596 (bmo#910881) + Writing to cycle collected object during image decoding + * MFSA 2013-98/CVE-2013-5597 (bmo#918864) + Use-after-free when updating offline cache + * MFSA 2013-99/CVE-2013-5598 (bmo#920515) + Security bypass of PDF.js checks using iframes + * MFSA 2013-100/CVE-2013-5599/CVE-2013-5600/CVE-2013-5601 + (bmo#915210, bmo#915576, bmo#916685) + Miscellaneous use-after-free issues found through ASAN fuzzing + * MFSA 2013-101/CVE-2013-5602 (bmo#897678) + Memory corruption in workers + * MFSA 2013-102/CVE-2013-5603 (bmo#916404) + Use-after-free in HTML document templates + +------------------------------------------------------------------- Old: ---- firefox-24.0-source.tar.bz2 l10n-24.0.tar.bz2 New: ---- firefox-25.0-source.tar.bz2 l10n-25.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ MozillaFirefox.spec ++++++ --- /var/tmp/diff_new_pack.qagPd0/_old 2013-11-01 07:05:20.000000000 +0100 +++ /var/tmp/diff_new_pack.qagPd0/_new 2013-11-01 07:05:20.000000000 +0100 @@ -17,7 +17,7 @@ # -%define major 24 +%define major 25 %define mainver %major.0 %define update_channel release @@ -50,8 +50,8 @@ %else BuildRequires: wireless-tools %endif -BuildRequires: mozilla-nspr-devel >= 4.10 -BuildRequires: mozilla-nss-devel >= 3.15.1 +BuildRequires: mozilla-nspr-devel >= 4.10.1 +BuildRequires: mozilla-nss-devel >= 3.15.2 BuildRequires: nss-shared-helper-devel %if %suse_version > 1210 BuildRequires: pkgconfig(gstreamer-%gstreamer_ver) @@ -63,7 +63,7 @@ %endif Version: %{mainver} Release: 0 -%define releasedate 2013091200 +%define releasedate 2013102400 Provides: firefox = %{mainver} Provides: firefox = %{version}-%{release} Provides: web_browser ++++++ _constraints ++++++ --- /var/tmp/diff_new_pack.qagPd0/_old 2013-11-01 07:05:20.000000000 +0100 +++ /var/tmp/diff_new_pack.qagPd0/_new 2013-11-01 07:05:20.000000000 +0100 @@ -5,7 +5,7 @@ <size unit="G">9</size> </disk> <memory> - <size unit="M">3500</size> + <size unit="M">3800</size> </memory> </hardware> </constraints> ++++++ compare-locales.tar.bz2 ++++++ ++++++ create-tar.sh ++++++ --- /var/tmp/diff_new_pack.qagPd0/_old 2013-11-01 07:05:20.000000000 +0100 +++ /var/tmp/diff_new_pack.qagPd0/_new 2013-11-01 07:05:20.000000000 +0100 @@ -2,8 +2,8 @@ CHANNEL="release" BRANCH="releases/mozilla-$CHANNEL" -RELEASE_TAG="FIREFOX_24_0_RELEASE" -VERSION="24.0" +RELEASE_TAG="FIREFOX_25_0_RELEASE" +VERSION="25.0" # mozilla if [ -d mozilla ]; then ++++++ firefox-24.0-source.tar.bz2 -> firefox-25.0-source.tar.bz2 ++++++ /work/SRC/openSUSE:13.1/MozillaFirefox/firefox-24.0-source.tar.bz2 /work/SRC/openSUSE:13.1/.MozillaFirefox.new/firefox-25.0-source.tar.bz2 differ: char 11, line 1 ++++++ firefox-browser-css.patch ++++++ --- /var/tmp/diff_new_pack.qagPd0/_old 2013-11-01 07:05:20.000000000 +0100 +++ /var/tmp/diff_new_pack.qagPd0/_new 2013-11-01 07:05:20.000000000 +0100 @@ -9,15 +9,15 @@ diff --git a/browser/themes/linux/browser.css b/browser/themes/linux/browser.css --- a/browser/themes/linux/browser.css +++ b/browser/themes/linux/browser.css -@@ -1026,16 +1026,30 @@ toolbar[iconsize="small"] #feed-button { - - #urlbar-display { +@@ -980,16 +980,30 @@ toolbar[iconsize="small"] #webrtc-status margin-top: 0; margin-bottom: 0; -moz-margin-start: 0; color: GrayText; } + %include ../shared/identity-block.inc.css + +#PopupAutoCompleteRichResult .autocomplete-richlistitem { + background-color: -moz-Field !important; +} @@ -32,11 +32,11 @@ + color: -moz-Fieldtext !important; +} + - /* Favicon */ #page-proxy-favicon { - width: 16px; - height: 16px; margin-top: 2px; margin-bottom: 2px; -moz-margin-start: 4px; -moz-margin-end: 3px; + -moz-image-region: rect(0, 16px, 16px, 0); + } + ++++++ firefox-kde.patch ++++++ --- /var/tmp/diff_new_pack.qagPd0/_old 2013-11-01 07:05:20.000000000 +0100 +++ /var/tmp/diff_new_pack.qagPd0/_new 2013-11-01 07:05:20.000000000 +0100 @@ -2,7 +2,7 @@ new file mode 100644 --- /dev/null +++ b/browser/base/content/browser-kde.xul -@@ -0,0 +1,1097 @@ +@@ -0,0 +1,1161 @@ +#filter substitution +<?xml version="1.0"?> +# -*- Mode: HTML -*- @@ -292,6 +292,63 @@ + + <menupopup id="placesContext"/> + ++  ++ <panel id="identity-popup" ++ type="arrow" ++ hidden="true" ++ noautofocus="true" ++ consumeoutsideclicks="true" ++ onpopupshown="if (event.target == this) ++ gIdentityHandler.onPopupShown(event);" ++ orient="vertical" ++ level="top"> ++ <hbox id="identity-popup-container" align="top"> ++ <image id="identity-popup-icon"/> ++ <vbox id="identity-popup-content-box"> ++ <label id="identity-popup-brandName" ++ class="identity-popup-label" ++ value="&brandFullName;"/> ++ <label id="identity-popup-chromeLabel" ++ class="identity-popup-label"/> ++ <label id="identity-popup-connectedToLabel" ++ class="identity-popup-label" ++ value="&identity.connectedTo;"/> ++ <label id="identity-popup-connectedToLabel2" ++ class="identity-popup-label" ++ value="&identity.unverifiedsite2;"/> ++ <description id="identity-popup-content-host" ++ class="identity-popup-description"/> ++ <label id="identity-popup-runByLabel" ++ class="identity-popup-label" ++ value="&identity.runBy;"/> ++ <description id="identity-popup-content-owner" ++ class="identity-popup-description"/> ++ <description id="identity-popup-content-supplemental" ++ class="identity-popup-description"/> ++ <description id="identity-popup-content-verifier" ++ class="identity-popup-description"/> ++ <hbox id="identity-popup-encryption" flex="1"> ++ <vbox> ++ <image id="identity-popup-encryption-icon"/> ++ </vbox> ++ <description id="identity-popup-encryption-label" flex="1" ++ class="identity-popup-description"/> ++ </hbox> ++ <vbox id="identity-popup-permissions"> ++ <separator class="thin"/> ++ <label class="identity-popup-label header" ++ value="&identity.permissions;"/> ++ <vbox id="identity-popup-permission-list" class="indent"/> ++ </vbox> ++ </vbox> ++ </hbox> ++  ++ <hbox id="identity-popup-button-container" pack="end"> ++ <button id="identity-popup-more-info-button" ++ label="&identity.moreInfoLinkText;" ++ oncommand="gIdentityHandler.handleMoreInfoClick(event);"/> ++ </hbox> ++ </panel> + + <panel id="ctrlTab-panel" class="KUI-panel" hidden="true" norestorefocus="true" level="top"> + <hbox> @@ -974,7 +1031,6 @@ + contentcontextmenu="contentAreaContextMenu" + autocompletepopup="PopupAutoComplete"/> + <chatbar id="pinnedchats" layer="true" mousethrough="always" hidden="true"/> -+ <statuspanel id="statusbar-display" inactive="true"/> + </vbox> + <splitter id="social-sidebar-splitter" + class="chromeclass-extrachrome sidebar-splitter" @@ -999,16 +1055,24 @@ + <hbox style="width: 100%;" pack="center">  + <vbox id="full-screen-warning-message" align="center"> + <description id="full-screen-domain-text"/> -+ <description class="full-screen-description" value="&fullscreenExitHint.value;"/> ++ <description class="full-screen-description" value="&fullscreenExitHint2.value;"/> + <vbox id="full-screen-approval-pane" align="center"> -+ <description class="full-screen-description" value="&fullscreenApproval.value;"/> + <hbox> ++#ifndef XP_UNIX ++ <button label="&fullscreenExitButton.label;" ++ oncommand="FullScreen.setFullscreenAllowed(false);" ++ class="full-screen-approval-button"/> ++ <button label="&fullscreenAllowButton.label;" ++ oncommand="FullScreen.setFullscreenAllowed(true);" ++ class="full-screen-approval-button"/> ++#else + <button label="&fullscreenAllowButton.label;" + oncommand="FullScreen.setFullscreenAllowed(true);" + class="full-screen-approval-button"/> + <button label="&fullscreenExitButton.label;" + oncommand="FullScreen.setFullscreenAllowed(false);" + class="full-screen-approval-button"/> ++#endif + </hbox> + <checkbox id="full-screen-remember-decision"/> + </vbox> @@ -1103,7 +1167,7 @@ diff --git a/browser/base/jar.mn b/browser/base/jar.mn --- a/browser/base/jar.mn +++ b/browser/base/jar.mn -@@ -53,16 +53,18 @@ browser.jar: +@@ -52,16 +52,18 @@ browser.jar: content/browser/abouthealthreport/abouthealth.css (content/abouthealthreport/abouthealth.css) #endif content/browser/aboutRobots-icon.png (content/aboutRobots-icon.png) @@ -1208,7 +1272,7 @@ // when the user will select the default. We refresh here periodically // in case the default changes. On other Windows OS's defaults can also // be set while the prefs are open. -@@ -857,14 +863,25 @@ var gAdvancedPane = { +@@ -860,14 +866,25 @@ var gAdvancedPane = { * Set browser as the operating system default browser. */ setDefaultBrowser: function() @@ -1237,7 +1301,7 @@ diff --git a/browser/components/shell/src/Makefile.in b/browser/components/shell/src/Makefile.in --- a/browser/components/shell/src/Makefile.in +++ b/browser/components/shell/src/Makefile.in -@@ -17,10 +17,12 @@ DISABLED_EXTRA_COMPONENTS = nsSetDefault +@@ -16,10 +16,12 @@ USE_STATIC_LIBS = 1 include $(topsrcdir)/config/rules.mk @@ -1686,7 +1750,7 @@ diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in --- a/browser/installer/package-manifest.in +++ b/browser/installer/package-manifest.in -@@ -601,19 +601,21 @@ +@@ -606,19 +606,21 @@ @BINPATH@/defaults/autoconfig/prefcalls.js @BINPATH@/browser/defaults/profile/prefs.js ++++++ firefox-no-default-ualocale.patch ++++++ --- /var/tmp/diff_new_pack.qagPd0/_old 2013-11-01 07:05:20.000000000 +0100 +++ /var/tmp/diff_new_pack.qagPd0/_new 2013-11-01 07:05:20.000000000 +0100 @@ -1,14 +1,14 @@ # HG changeset patch # User Wolfgang Rosenauer <wr(a)rosenauer.org> -# Parent fd73fd56ea00523bcdca2ad4be06d3640888fd58 +# Parent 4ecbbda17c2a7a8f62beb568ab838b45beaaf36a Do not overwrite the locale dynamic pref from xulrunner's all.js with a wrong default value diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js --- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js -@@ -207,17 +207,17 @@ pref("extensions.{972ce4c6-7e08-4474-a28 +@@ -215,17 +215,17 @@ pref("extensions.{972ce4c6-7e08-4474-a28 + pref("xpinstall.whitelist.add", "addons.mozilla.org"); - pref("xpinstall.whitelist.add.36", "getpersonas.com"); pref("xpinstall.whitelist.add.180", "marketplace.firefox.com"); pref("lightweightThemes.update.enabled", true); ++++++ l10n-24.0.tar.bz2 -> l10n-25.0.tar.bz2 ++++++ /work/SRC/openSUSE:13.1/MozillaFirefox/l10n-24.0.tar.bz2 /work/SRC/openSUSE:13.1/.MozillaFirefox.new/l10n-25.0.tar.bz2 differ: char 11, line 1 ++++++ mozilla-arm-disable-edsp.patch ++++++ --- /var/tmp/diff_new_pack.qagPd0/_old 2013-11-01 07:05:20.000000000 +0100 +++ /var/tmp/diff_new_pack.qagPd0/_new 2013-11-01 07:05:20.000000000 +0100 @@ -1,13 +1,13 @@ # HG changeset patch # User Adrian Schröter <adrian(a)suse.de> -# Parent 5b26dbfe65bd4986ea3792f02bc025fec293b51f +# Parent b945e0c3b145b6b2245f42bab52f911c2d1f6759 disable ESDP support (no BNC or BMO reference yet :-() -diff --git a/xpcom/glue/arm.h b/xpcom/glue/arm.h ---- a/xpcom/glue/arm.h -+++ b/xpcom/glue/arm.h -@@ -143,17 +143,17 @@ namespace mozilla { - extern bool NS_COM_GLUE neon_enabled; +diff --git a/mozglue/build/arm.h b/mozglue/build/arm.h +--- a/mozglue/build/arm.h ++++ b/mozglue/build/arm.h +@@ -116,17 +116,17 @@ namespace mozilla { + extern bool MFBT_DATA neon_enabled; #endif #endif } ++++++ mozilla-kde.patch ++++++ --- /var/tmp/diff_new_pack.qagPd0/_old 2013-11-01 07:05:20.000000000 +0100 +++ /var/tmp/diff_new_pack.qagPd0/_new 2013-11-01 07:05:20.000000000 +0100 @@ -26,7 +26,7 @@ diff --git a/modules/libpref/src/Preferences.cpp b/modules/libpref/src/Preferences.cpp --- a/modules/libpref/src/Preferences.cpp +++ b/modules/libpref/src/Preferences.cpp -@@ -23,16 +23,17 @@ +@@ -24,16 +24,17 @@ #include "nsIStringEnumerator.h" #include "nsIZipReader.h" #include "nsPrefBranch.h" @@ -44,7 +44,7 @@ #include "prefread.h" #include "prefapi_private_data.h" -@@ -972,16 +973,34 @@ pref_LoadPrefsInDir(nsIFile* aDir, char +@@ -973,16 +974,34 @@ pref_LoadPrefsInDir(nsIFile* aDir, char static nsresult pref_LoadPrefsInDirList(const char *listId) { @@ -79,7 +79,7 @@ return NS_OK; bool hasMore; -@@ -997,17 +1016,17 @@ static nsresult pref_LoadPrefsInDirList( +@@ -998,17 +1017,17 @@ static nsresult pref_LoadPrefsInDirList( nsAutoCString leaf; path->GetNativeLeafName(leaf); @@ -98,7 +98,7 @@ { nsZipItemPtr<char> manifest(jarReader, name, true); NS_ENSURE_TRUE(manifest.Buffer(), NS_ERROR_NOT_AVAILABLE); -@@ -1101,28 +1120,40 @@ static nsresult pref_InitInitialObjects( +@@ -1102,28 +1121,40 @@ static nsresult pref_InitInitialObjects( /* these pref file names should not be used: we process them after all other application pref files for backwards compatibility */ static const char* specialFiles[] = { #if defined(XP_MACOSX) @@ -184,18 +184,22 @@ diff --git a/toolkit/components/downloads/Makefile.in b/toolkit/components/downloads/Makefile.in --- a/toolkit/components/downloads/Makefile.in +++ b/toolkit/components/downloads/Makefile.in -@@ -23,9 +23,11 @@ ifndef MOZ_SUITE - DISABLED_EXTRA_COMPONENTS = \ - nsDownloadManagerUI.js \ - nsDownloadManagerUI.manifest \ - $(NULL) - endif +@@ -11,13 +11,15 @@ VPATH = @srcdir@ + include $(DEPTH)/config/autoconf.mk + + LIBRARY_NAME = download_s + LIBXUL_LIBRARY = 1 + FAIL_ON_WARNINGS = 1 include $(topsrcdir)/config/rules.mk -+LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre + - CXXFLAGS += $(TK_CFLAGS) + CXXFLAGS += $(TK_CFLAGS) -DGOOGLE_PROTOBUF_NO_RTTI + + LOCAL_INCLUDES += \ + -I$(srcdir)/../protobuf \ ++ -I$(topsrcdir)/toolkit/xre \ + $(NULL) diff --git a/toolkit/components/downloads/nsDownloadManager.cpp b/toolkit/components/downloads/nsDownloadManager.cpp --- a/toolkit/components/downloads/nsDownloadManager.cpp +++ b/toolkit/components/downloads/nsDownloadManager.cpp @@ -2624,12 +2628,12 @@ diff --git a/uriloader/exthandler/Makefile.in b/uriloader/exthandler/Makefile.in --- a/uriloader/exthandler/Makefile.in +++ b/uriloader/exthandler/Makefile.in -@@ -86,9 +86,10 @@ EXTRA_COMPONENTS = \ - # we don't want the shared lib, but we want to force the creation of a static lib. - FORCE_STATIC_LIB = 1 +@@ -77,9 +77,10 @@ endif + endif + include $(topsrcdir)/config/config.mk - include $(topsrcdir)/ipc/chromium/chromium-config.mk include $(topsrcdir)/config/rules.mk + include $(topsrcdir)/ipc/chromium/chromium-config.mk ifneq (,$(filter qt gtk2 gtk3, $(MOZ_WIDGET_TOOLKIT))) CXXFLAGS += $(TK_CFLAGS) $(MOZ_DBUS_GLIB_CFLAGS) @@ -3083,7 +3087,7 @@ diff --git a/widget/gtk2/Makefile.in b/widget/gtk2/Makefile.in --- a/widget/gtk2/Makefile.in +++ b/widget/gtk2/Makefile.in -@@ -67,11 +67,14 @@ DEFINES += -DCAIRO_GFX -DMOZ_APP_NAME=' +@@ -68,11 +68,14 @@ DEFINES += -DCAIRO_GFX -DMOZ_APP_NAME=' INCLUDES += \ -I$(srcdir)/../xpwidgets \ @@ -3101,7 +3105,7 @@ diff --git a/widget/gtk2/nsFilePicker.cpp b/widget/gtk2/nsFilePicker.cpp --- a/widget/gtk2/nsFilePicker.cpp +++ b/widget/gtk2/nsFilePicker.cpp -@@ -1,31 +1,33 @@ +@@ -1,32 +1,34 @@ /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /* This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this @@ -3112,6 +3116,7 @@ #include <gtk/gtk.h> +#include <gdk/gdkx.h> + #include "nsGtkUtils.h" #include "nsIFileURL.h" #include "nsIURI.h" #include "nsIWidget.h" @@ -3135,7 +3140,7 @@ using namespace mozilla; #define MAX_PREVIEW_SIZE 180 -@@ -242,17 +244,19 @@ nsFilePicker::AppendFilters(int32_t aFil +@@ -232,17 +234,19 @@ nsFilePicker::AppendFilters(int32_t aFil return nsBaseFilePicker::AppendFilters(aFilterMask); } @@ -3156,7 +3161,7 @@ mFilters.AppendElement(filter); mFilterNames.AppendElement(name); -@@ -366,16 +370,32 @@ nsFilePicker::Show(int16_t *aReturn) +@@ -356,16 +360,32 @@ nsFilePicker::Show(int16_t *aReturn) NS_IMETHODIMP nsFilePicker::Open(nsIFilePickerShownCallback *aCallback) @@ -3189,7 +3194,7 @@ GtkFileChooserAction action = GetGtkFileChooserAction(mMode); const gchar *accept_button = (action == GTK_FILE_CHOOSER_ACTION_SAVE) -@@ -567,8 +587,235 @@ nsFilePicker::Done(GtkWidget* file_choos +@@ -553,8 +573,235 @@ nsFilePicker::Done(GtkWidget* file_choos if (mCallback) { mCallback->Done(result); mCallback = nullptr; @@ -3449,13 +3454,13 @@ diff --git a/xpcom/components/Makefile.in b/xpcom/components/Makefile.in --- a/xpcom/components/Makefile.in +++ b/xpcom/components/Makefile.in -@@ -28,9 +28,10 @@ LOCAL_INCLUDES = \ - FORCE_STATIC_LIB = 1 +@@ -23,9 +23,10 @@ LOCAL_INCLUDES = \ + -I$(topsrcdir)/chrome/src \ + -I$(topsrcdir)/modules/libjar \ + $(NULL) include $(topsrcdir)/config/rules.mk - DEFINES += -D_IMPL_NS_COM - ifdef MOZ_WIDGET_GTK CXXFLAGS += $(TK_CFLAGS) +LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre @@ -3594,8 +3599,8 @@ diff --git a/xpcom/io/Makefile.in b/xpcom/io/Makefile.in --- a/xpcom/io/Makefile.in +++ b/xpcom/io/Makefile.in -@@ -43,17 +43,17 @@ include $(topsrcdir)/ipc/chromium/chromi - DEFINES += -D_IMPL_NS_COM +@@ -26,17 +26,17 @@ include $(topsrcdir)/config/rules.mk + include $(topsrcdir)/ipc/chromium/chromium-config.mk ifeq ($(OS_ARCH),Linux) ifneq (,$(findstring lib64,$(libdir))) ++++++ mozilla-ppc.patch ++++++ --- /var/tmp/diff_new_pack.qagPd0/_old 2013-11-01 07:05:20.000000000 +0100 +++ /var/tmp/diff_new_pack.qagPd0/_new 2013-11-01 07:05:20.000000000 +0100 @@ -2,7 +2,6 @@ # Parent 21d0e194954e451f0f1935d0ed68ee9eae432ddf # User Wolfgang Rosenauer <wr(a)rosenauer.org> Bug 746112 - RegExp hang on ppc64 in execute. -Bug 750620 - Make double-conversion portable to exotic architectures. TM: mozilla15 diff --git a/js/src/yarr/YarrInterpreter.h b/js/src/yarr/YarrInterpreter.h --- a/js/src/yarr/YarrInterpreter.h @@ -89,25 +88,3 @@ /* * VM page size. It must divide the runtime CPU page size or the code * will abort. -diff --git a/mfbt/double-conversion/utils.h b/mfbt/double-conversion/utils.h ---- a/mfbt/double-conversion/utils.h -+++ b/mfbt/double-conversion/utils.h -@@ -50,17 +50,17 @@ - // the result is equal to 89255e-22. - // The best way to test this, is to create a division-function and to compare - // the output of the division with the expected result. (Inlining must be - // disabled.) - // On Linux,x86 89255e-22 != Div_double(89255.0/1e22) - #if defined(_M_X64) || defined(__x86_64__) || \ - defined(__ARMEL__) || defined(__avr32__) || \ - defined(__hppa__) || defined(__ia64__) || \ -- defined(__mips__) || defined(__powerpc__) || \ -+ defined(__mips__) || defined(__powerpc__) || defined(__powerpc64__) || \ - defined(__sparc__) || defined(__sparc) || defined(__s390__) || \ - defined(__SH4__) || defined(__alpha__) || \ - defined(_MIPS_ARCH_MIPS32R2) - #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 - #elif defined(_M_IX86) || defined(__i386__) || defined(__i386) - #if defined(_WIN32) - // Windows uses a 64bit wide floating point stack. - #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 ++++++ mozilla-shared-nss-db.patch ++++++ --- /var/tmp/diff_new_pack.qagPd0/_old 2013-11-01 07:05:20.000000000 +0100 +++ /var/tmp/diff_new_pack.qagPd0/_new 2013-11-01 07:05:20.000000000 +0100 @@ -7,7 +7,7 @@ diff --git a/configure.in b/configure.in --- a/configure.in +++ b/configure.in -@@ -8330,16 +8330,31 @@ AC_SUBST(QCMS_LIBS) +@@ -8289,16 +8289,31 @@ AC_SUBST(QCMS_LIBS) dnl ======================================================== dnl HarfBuzz @@ -83,7 +83,7 @@ #include "nsComponentManagerUtils.h" #include "nsDirectoryServiceDefs.h" #include "nsICertOverrideService.h" -@@ -1132,18 +1139,34 @@ nsNSSComponent::InitializeNSS(bool showW +@@ -1144,18 +1151,34 @@ nsNSSComponent::InitializeNSS(bool showW ConfigureInternalPKCS11Token(); // The NSS_INIT_NOROOTINIT flag turns off the loading of the root certs @@ -123,15 +123,15 @@ diff --git a/toolkit/library/Makefile.in b/toolkit/library/Makefile.in --- a/toolkit/library/Makefile.in +++ b/toolkit/library/Makefile.in -@@ -490,17 +490,17 @@ EXTRA_DSO_LDOPTS += -INCREMENTAL:NO +@@ -490,17 +490,17 @@ ifneq (,$(or $(filter 1400,$(_MSC_VER)), + ifdef MOZ_DEBUG + EXTRA_DSO_LDOPTS += -INCREMENTAL:NO endif endif endif EXTRA_DSO_LDOPTS += $(LIBS_DIR) - DEFINES += -DIMPL_XREAPI - -EXTRA_DSO_LDOPTS += $(NSPR_LIBS) $(MOZALLOC_LIB) +EXTRA_DSO_LDOPTS += $(NSPR_LIBS) $(MOZALLOC_LIB) $(NSSHELPER_LIBS) ++++++ mozilla-sle11.patch ++++++ --- /var/tmp/diff_new_pack.qagPd0/_old 2013-11-01 07:05:20.000000000 +0100 +++ /var/tmp/diff_new_pack.qagPd0/_new 2013-11-01 07:05:20.000000000 +0100 @@ -2,9 +2,9 @@ References: https://bugzilla.mozilla.org/show_bug.cgi?id=513422 -diff --git a/xpcom/glue/SSE.cpp b/xpcom/glue/SSE.cpp ---- a/xpcom/glue/SSE.cpp -+++ b/xpcom/glue/SSE.cpp +diff --git a/mozglue/build/SSE.cpp b/mozglue/build/SSE.cpp +--- a/mozglue/build/SSE.cpp ++++ b/mozglue/build/SSE.cpp @@ -12,26 +12,77 @@ namespace { // SSE.h has parallel #ifs which declare MOZILLA_SSE_HAVE_CPUID_DETECTION. // We can't declare these functions in the header file, however, because ++++++ source-stamp.txt ++++++ --- /var/tmp/diff_new_pack.qagPd0/_old 2013-11-01 07:05:20.000000000 +0100 +++ /var/tmp/diff_new_pack.qagPd0/_new 2013-11-01 07:05:20.000000000 +0100 @@ -1,2 +1,2 @@ -REV=7c3b0732e765 +REV=de08ee190ca3 REPO=http://hg.mozilla.org/releases/mozilla-release -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0