Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
List overview
Download
scm-commits
March 2011
----- 2025 -----
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
scm-commits@lists.fedoraproject.org
379 participants
14469 discussions
Start a n
N
ew thread
[firefox/f13/master] Update to 3.6.14
by Jan Horak
01 Mar '11
01 Mar '11
commit 06005f4e0ff859a4e037e784e8f803df5eb37cdd Author: Jan Horak <jhorak(a)redhat.com> Date: Tue Mar 1 09:52:40 2011 +0100 Update to 3.6.14 .gitignore | 2 ++ firefox.spec | 11 +++++++---- sources | 4 ++-- 3 files changed, 11 insertions(+), 6 deletions(-) --- diff --git a/.gitignore b/.gitignore index 89864bd..79741ee 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,5 @@ firefox-langpacks-3.6.7-20100720.tar.bz2 /firefox-langpacks-3.6.12-20101027.tar.bz2 /firefox-langpacks-3.6.13-20101210.tar.bz2 /firefox-3.6.13.source.tar.bz2 +/firefox-3.6.14.source.tar.bz2 +/firefox-langpacks-3.6.14-20110301.tar.bz2 diff --git a/firefox.spec b/firefox.spec index 7c878a8..c0e69aa 100644 --- a/firefox.spec +++ b/firefox.spec @@ -7,8 +7,8 @@ # xulrunner_version matches the firefox package. # xulrunner_version_max is first next incompatible xulrunner version -%define xulrunner_version 1.9.2.13-1 -%define xulrunner_version_max 1.9.2.14 +%define xulrunner_version 1.9.2.14-1 +%define xulrunner_version_max 1.9.2.15 %define internal_version 3.6 @@ -23,7 +23,7 @@ Summary: Mozilla Firefox Web browser Name: firefox -Version: 3.6.13 +Version: 3.6.14 Release: 1%{?prever}%{?dist} URL:
http://www.mozilla.org/projects/firefox/
License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -31,7 +31,7 @@ Group: Applications/Internet # From
ftp://ftp.mozilla.org/pub/firefox/releases/%{version}%{?pretag}/source
Source0: firefox-%{version}%{?prever}.source.tar.bz2 %if %{build_langpacks} -Source2: firefox-langpacks-%{version}-20101210.tar.bz2 +Source2: firefox-langpacks-%{version}-20110301.tar.bz2 %endif Source10: firefox-mozconfig Source11: firefox-mozconfig-branded @@ -358,6 +358,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #--------------------------------------------------------------------- %changelog +* Tue Mar 1 2011 Jan Horak <jhorak(a)redhat.com> - 3.6.14-1 +- Update to 3.6.14 + * Thu Dec 9 2010 Jan Horak <jhorak(a)redhat.com> - firefox.spec-1 - Update to firefox.spec diff --git a/sources b/sources index 536f984..7f1af14 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -92a8ff1e098c60f03c14fed8c5a5c32c firefox-langpacks-3.6.13-20101210.tar.bz2 -d7c90aed8209beefa74badf02e8eeae1 firefox-3.6.13.source.tar.bz2 +ab0d00cd33e6b2388429dda1c01abd01 firefox-3.6.14.source.tar.bz2 +6f72b550709c23895e0f535eaf54b531 firefox-langpacks-3.6.14-20110301.tar.bz2
1
0
0
0
[google-guice/f15/master] Update to 3.0rc2
by Stanislav Ochotnicky
01 Mar '11
01 Mar '11
commit 413ef46791d251942ef9af085311ceb4fa5a61ed Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com> Date: Tue Mar 1 09:10:00 2011 +0100 Update to 3.0rc2 - Changes according to new guidelines (versionless jars & javadocs) .gitignore | 1 + google-guice.spec | 69 +++++----- sisu-custom.patch | 419 +++++++++++++++++++++++++++++++++++++++++++++++++++++ sources | 2 +- 4 files changed, 455 insertions(+), 36 deletions(-) --- diff --git a/.gitignore b/.gitignore index 66bd6b3..7b27d20 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /guice-2.0-1219.tar.xz +/guice-3.0-rc2-src.zip diff --git a/google-guice.spec b/google-guice.spec index bad2a1a..45a8f51 100644 --- a/google-guice.spec +++ b/google-guice.spec @@ -1,9 +1,8 @@ %global short_name guice -%global revision 1219 Name: google-%{short_name} -Version: 2.0 -Release: 4.1219svn%{?dist} +Version: 3.0 +Release: 0.1.rc2%{?dist} Summary: Lightweight dependency injection framework @@ -13,17 +12,12 @@ URL:
http://code.google.com/p/%{name}
# svn export -r1219
http://google-guice.googlecode.com/svn/trunk/
guice-2.0-1219 # tar caf guice-2.0-1219.tar.xz guice-2.0-1219 -Source0: %{short_name}-%{version}-%{revision}.tar.xz +Source0: https://%{name}.googlecode.com/files/%{short_name}-%{version}-rc2-src.zip -# TODO upstream -Patch0: 0001-aop-fix.patch -# see
http://code.google.com/p/google-guice/issues/detail?id=436
-# needed for sisu-inject (and maven-3) -Patch1: 0002-get-type-converter-binding.patch -# remove aopalliacne dep from pom and parent pom -Patch2: 0003-aopaliance.patch - -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +# patch from
http://github.com/sonatype/sisu-guice
+# excluded changes to pom.xml files that changed groupIds +# needed for maven 3 to work +Patch0: sisu-custom.patch BuildArch: noarch @@ -35,6 +29,8 @@ BuildRequires: aqute-bndlib BuildRequires: objectweb-asm BuildRequires: junit BuildRequires: atinject +BuildRequires: zip +BuildRequires: slf4j Requires: java >= 1:1.6.0 Requires(post): jpackage-utils @@ -68,10 +64,11 @@ Requires: jpackage-utils %{summary}. %prep -%setup -q -n %{short_name}-%{version}-%{revision} -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 +%setup -q -n %{short_name}-%{version}-rc2-src +%patch0 + +# remove parent definition referencing google-parent +sed -ie '/<parent>/,/<\/parent/ {d}' pom.xml # remove bundled libraries find . -name '*.class' -delete @@ -81,12 +78,12 @@ find . -name '*.jar' -not -name 'munge.jar' -delete # re-create symlinks pushd lib/build -build-jar-repository -s -p . aqute-bndlib cglib \ +build-jar-repository -s -p . aqute-bndlib cglib slf4j \ jarjar junit objectweb-asm \ mv aqute-bndlib*.jar bnd-0.0.384.jar mv cglib*.jar cglib-2.2.1-snapshot.jar -mv jarjar*.jar jarjar-1.0rc8.jar +mv jarjar*.jar jarjar-snapshot.jar mv objectweb-asmasm-all.jar asm-3.1.jar popd @@ -116,37 +113,35 @@ pushd build/no_aop/ # javadoc fails without this directory mkdir -p servlet/lib/build -ant -Dversion=%{version} jar javadoc +ant -Dversion=%{version} jar popd %install -rm -rf $RPM_BUILD_ROOT - install -d -m 0755 $RPM_BUILD_ROOT%{_javadir} pushd build/no_aop -install -pm 644 build/dist/%{short_name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar -(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed "s|google-||g"`; done) -(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done) +install -pm 644 build/dist/%{short_name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar +ln -sf %{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{short_name}.jar install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir} -install -pm 644 %{short_name}-parent/pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{short_name}-parent.pom +install -pm 644 pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{name}-parent.pom +%add_to_maven_depmap com.google.inject %{short_name}-parent %{version} JPP %{name}-parent -install -pm 644 pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{name}.pom +install -pm 644 core/pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{name}.pom %add_to_maven_depmap com.google.inject %{short_name} %{version} JPP %{name} # provide sisu group/artifact (should be just mavenized google-guice # with %add_to_maven_depmap org.sonatype.sisu sisu-%{short_name} %{version} JPP %{name} - +popd # javadoc -install -d -m 0755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} -cp -pr build/javadoc/* %{buildroot}%{_javadocdir}/%{name}-%{version}/ -ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name} - +install -d -m 0755 $RPM_BUILD_ROOT%{_javadocdir}/%{name} +cp -r javadoc/* %{buildroot}%{_javadocdir}/%{name} +%pre javadoc +# workaround for rpm bug, can be removed in F-17 +[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \ +rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || : -%clean -rm -rf $RPM_BUILD_ROOT %post %update_maven_depmap @@ -166,11 +161,15 @@ rm -rf $RPM_BUILD_ROOT %files javadoc %defattr(-,root,root,-) %doc COPYING -%doc %{_javadocdir}/%{name}* +%doc %{_javadocdir}/%{name} %changelog +* Tue Mar 1 2011 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 3.0-0.1.rc2 +- Update to 3.0rc2 +- Changes according to new guidelines (versionless jars & javadocs) + * Tue Feb 08 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.0-4.1219svn - Rebuilt for
https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
diff --git a/sisu-custom.patch b/sisu-custom.patch new file mode 100644 index 0000000..c0058ae --- /dev/null +++ b/sisu-custom.patch @@ -0,0 +1,419 @@ +Index: core/test/com/google/inject/TypeConversionTest.java +=================================================================== +--- core/test/com/google/inject/TypeConversionTest.java (revision 1482) ++++ core/test/com/google/inject/TypeConversionTest.java (working copy) +@@ -366,7 +366,7 @@ + @Inject @NumericValue Date date; + } + +- public void testCannotConvertUnannotatedBindings() { ++/*public void testCannotConvertUnannotatedBindings() { + Injector injector = Guice.createInjector(new AbstractModule() { + protected void configure() { + bind(String.class).toInstance("55"); +@@ -380,5 +380,5 @@ + Asserts.assertContains(expected.getMessage(), + "Could not find a suitable constructor in java.lang.Integer."); + } +- } ++ }*/ + } +Index: core/test/com/google/inject/internal/util/LineNumbersTest.java +=================================================================== +--- core/test/com/google/inject/internal/util/LineNumbersTest.java (revision 1482) ++++ core/test/com/google/inject/internal/util/LineNumbersTest.java (working copy) +@@ -22,7 +22,12 @@ + import com.google.inject.Guice; + import com.google.inject.Inject; + import com.google.inject.matcher.Matchers; ++import java.lang.reflect.Modifier; + import junit.framework.TestCase; ++import org.objectweb.asm.ClassWriter; ++import org.objectweb.asm.MethodVisitor; ++import org.objectweb.asm.Opcodes; ++import org.objectweb.asm.Type; + + /** + * @author jessewilson(a)google.com (Jesse Wilson) +@@ -75,4 +80,49 @@ + } + interface B {} + ++ static class GeneratingClassLoader extends ClassLoader { ++ static String name = "__generated"; ++ ++ GeneratingClassLoader() { ++ super(B.class.getClassLoader()); ++ } ++ ++ Class generate() { ++ ClassWriter cw = new ClassWriter(ClassWriter.COMPUTE_MAXS); ++ cw.visit(Opcodes.V1_5, Modifier.PUBLIC, name, null, Type.getInternalName(Object.class), null); ++ ++ String sig = "("+Type.getDescriptor(B.class)+")V"; ++ ++ MethodVisitor mv = cw.visitMethod(Modifier.PUBLIC, "<init>", sig, null, null); ++ ++ mv.visitAnnotation(Type.getDescriptor(Inject.class), true); ++ mv.visitCode(); ++ mv.visitVarInsn(Opcodes.ALOAD, 0); ++ mv.visitMethodInsn( Opcodes.INVOKESPECIAL, Type.getInternalName(Object.class), "<init>", "()V" ); ++ mv.visitInsn(Opcodes.RETURN); ++ mv.visitMaxs(0, 0); ++ mv.visitEnd(); ++ cw.visitEnd(); ++ ++ byte[] buf = cw.toByteArray(); ++ ++ return defineClass(name.replace('/', '.'), buf, 0, buf.length); ++ } ++ } ++ ++ public void testIgnoreClassesWithUnavailableByteCode() { ++ try { ++ Guice.createInjector(new AbstractModule() { ++ protected void configure() { ++ bind(new GeneratingClassLoader().generate()); ++ } ++ }); ++ fail(); ++ } catch (CreationException expected) { ++ assertContains(expected.getMessage(), ++ "1) No implementation for " + B.class.getName() + " was bound.", ++ "for parameter 0 at " + GeneratingClassLoader.name + ".<init>(Unknown Source)", ++ "at " + LineNumbersTest.class.getName(), ".configure(LineNumbersTest.java:"); ++ } ++ } + } +Index: core/test/com/google/inject/ScopesTest.java +=================================================================== +--- core/test/com/google/inject/ScopesTest.java (revision 1482) ++++ core/test/com/google/inject/ScopesTest.java (working copy) +@@ -238,7 +238,7 @@ + Asserts.assertNotSerializable(Scopes.NO_SCOPE); + } + +- public void testUnscopedProviderWorksOutsideOfRequestedScope() { ++/*public void testUnscopedProviderWorksOutsideOfRequestedScope() { + final RememberProviderScope scope = new RememberProviderScope(); + + Injector injector = Guice.createInjector(new AbstractModule() { +@@ -254,7 +254,7 @@ + // this line fails with a NullPointerException because the Providers + // passed to Scope.scope() don't work outside of the scope() method. + assertTrue(listProvider.get() instanceof ArrayList); +- } ++ }*/ + + public void testScopeAnnotationWithoutRuntimeRetention() { + try { +Index: core/src/com/google/inject/internal/BindingProcessor.java +=================================================================== +--- core/src/com/google/inject/internal/BindingProcessor.java (revision 1482) ++++ core/src/com/google/inject/internal/BindingProcessor.java (working copy) +@@ -51,6 +51,12 @@ + */ + final class BindingProcessor extends AbstractProcessor { + ++//------------------------------------------------------------------------------ ++ private static final boolean DISABLE_MISPLACED_ANNOTATION_CHECK ++ = Boolean.parseBoolean(System.getProperty( ++ "guice.disable.misplaced.annotation.check", "false")); ++//------------------------------------------------------------------------------ ++ + private final List<CreationListener> creationListeners = Lists.newArrayList(); + private final Initializer initializer; + private final List<Runnable> uninitializedBindings = Lists.newArrayList(); +@@ -221,8 +227,14 @@ + } + + private <T> void validateKey(Object source, Key<T> key) { ++//------------------------------------------------------------------------------ ++if (!DISABLE_MISPLACED_ANNOTATION_CHECK) { ++//------------------------------------------------------------------------------ + Annotations.checkForMisplacedScopeAnnotations( + key.getTypeLiteral().getRawType(), source, errors); ++//------------------------------------------------------------------------------ ++} ++//------------------------------------------------------------------------------ + } + + <T> UntargettedBindingImpl<T> invalidBinding(InjectorImpl injector, Key<T> key, Object source) { +Index: core/src/com/google/inject/internal/InjectorShell.java +=================================================================== +--- core/src/com/google/inject/internal/InjectorShell.java (revision 1482) ++++ core/src/com/google/inject/internal/InjectorShell.java (working copy) +@@ -239,6 +239,15 @@ + new ProviderInstanceBindingImpl<Logger>(injector, key, + SourceProvider.UNKNOWN_SOURCE, loggerFactory, Scoping.UNSCOPED, + loggerFactory, ImmutableSet.<InjectionPoint>of())); ++ ++ try { ++ Key<org.slf4j.Logger> slf4jKey = Key.get(org.slf4j.Logger.class); ++ SLF4JLoggerFactory slf4jLoggerFactory = new SLF4JLoggerFactory(injector); ++ injector.state.putBinding(slf4jKey, ++ new ProviderInstanceBindingImpl<org.slf4j.Logger>(injector, slf4jKey, ++ SourceProvider.UNKNOWN_SOURCE, slf4jLoggerFactory, Scoping.UNSCOPED, ++ slf4jLoggerFactory, ImmutableSet.<InjectionPoint>of())); ++ } catch (Throwable e) {} + } + + private static class LoggerFactory implements InternalFactory<Logger>, Provider<Logger> { +@@ -258,6 +267,43 @@ + } + } + ++ private static class SLF4JLoggerFactory implements InternalFactory<org.slf4j.Logger>, Provider<org.slf4j.Logger> { ++ private final Injector injector; ++ ++ private org.slf4j.ILoggerFactory loggerFactory; ++ ++ SLF4JLoggerFactory(Injector injector) { ++ this.injector = injector; ++ } ++ ++ org.slf4j.ILoggerFactory loggerFactory() { ++ if (loggerFactory == null) { ++ try { ++ loggerFactory = injector.getInstance(org.slf4j.ILoggerFactory.class); ++ } catch (Throwable e) { ++ loggerFactory = org.slf4j.LoggerFactory.getILoggerFactory(); ++ } ++ } ++ return loggerFactory; ++ } ++ ++ public org.slf4j.Logger get(Errors errors, InternalContext context, Dependency<?> dependency, boolean linked) { ++ InjectionPoint injectionPoint = dependency.getInjectionPoint(); ++ if (injectionPoint != null) { ++ return loggerFactory().getLogger(injectionPoint.getMember().getDeclaringClass().getName()); ++ } ++ return loggerFactory().getLogger(org.slf4j.Logger.ROOT_LOGGER_NAME); ++ } ++ ++ public org.slf4j.Logger get() { ++ return loggerFactory().getLogger(org.slf4j.Logger.ROOT_LOGGER_NAME); ++ } ++ ++ public String toString() { ++ return "Provider<org.slf4j.Logger>"; ++ } ++ } ++ + private static class RootModule implements Module { + final Stage stage; + +Index: core/src/com/google/inject/internal/util/FinalizableReferenceQueue.java +=================================================================== +--- core/src/com/google/inject/internal/util/FinalizableReferenceQueue.java (revision 1482) ++++ core/src/com/google/inject/internal/util/FinalizableReferenceQueue.java (working copy) +@@ -118,24 +118,27 @@ + @SuppressWarnings("unchecked") + public FinalizableReferenceQueue() { + // We could start the finalizer lazily, but I'd rather it blow up early. +- ReferenceQueue<Object> queue; +- boolean threadStarted = false; ++ ReferenceQueue<Object> queue = null; + try { + queue = (ReferenceQueue<Object>) startFinalizer.invoke(null, + FinalizableReference.class, this); +- threadStarted = true; + } catch (IllegalAccessException e) { + // Finalizer.startFinalizer() is public. + throw new AssertionError(e); + } catch (Throwable t) { +- logger.log(Level.INFO, "Failed to start reference finalizer thread." ++ logger.log(Level.WARNING, "Exception in startFinalizer method.", t); ++ } ++ ++ if (queue == null) { ++ logger.log(Level.INFO, "Reference Finalizer thread is not available." + + " Reference cleanup will only occur when new references are" +- + " created.", t); +- queue = new ReferenceQueue<Object>(); ++ + " created."); ++ this.queue = new ReferenceQueue<Object>(); ++ this.threadStarted = false; ++ } else { ++ this.queue = queue; ++ this.threadStarted = true; + } +- +- this.queue = queue; +- this.threadStarted = threadStarted; + } + + /** +Index: core/src/com/google/inject/internal/util/LineNumbers.java +=================================================================== +--- core/src/com/google/inject/internal/util/LineNumbers.java (revision 1482) ++++ core/src/com/google/inject/internal/util/LineNumbers.java (working copy) +@@ -58,8 +58,9 @@ + + if (!type.isArray()) { + InputStream in = type.getResourceAsStream("/" + type.getName().replace('.', '/') + ".class"); +- Preconditions.checkArgument(in != null, "Cannot find bytecode for %s", type); +- new ClassReader(in).accept(new LineNumberReader(), ClassReader.SKIP_FRAMES); ++ if (in != null) { ++ new ClassReader(in).accept(new LineNumberReader(), ClassReader.SKIP_FRAMES); ++ } + } + } + +Index: core/src/com/google/inject/internal/util/Finalizer.java +=================================================================== +--- core/src/com/google/inject/internal/util/Finalizer.java (revision 1482) ++++ core/src/com/google/inject/internal/util/Finalizer.java (working copy) +@@ -21,6 +21,7 @@ + import java.lang.ref.ReferenceQueue; + import java.lang.ref.WeakReference; + import java.lang.reflect.Method; ++import java.util.concurrent.Executor; + import java.util.logging.Level; + import java.util.logging.Logger; + +@@ -45,7 +46,7 @@ + * class loader from getting garbage collected, and this class can detect when + * the main class loader has been garbage collected and stop itself. + */ +-public class Finalizer extends Thread { ++public class Finalizer implements Runnable { + + private static final Logger logger + = Logger.getLogger(Finalizer.class.getName()); +@@ -54,6 +55,17 @@ + private static final String FINALIZABLE_REFERENCE + = "com.google.inject.internal.util.FinalizableReference"; + ++ /** Use "-Dguice.executor.class=Clazz" where Clazz implements java.util.concurrent.Executor. */ ++ private static final String EXECUTOR_CLASS_NAME; ++ ++ static { ++ String executorClassName = null; ++ try { ++ executorClassName = System.getProperty("guice.executor.class"); ++ } catch (Throwable t) {} ++ EXECUTOR_CLASS_NAME = executorClassName; ++ } ++ + /** + * Starts the Finalizer thread. FinalizableReferenceQueue calls this method + * reflectively. +@@ -78,9 +90,33 @@ + "Expected " + FINALIZABLE_REFERENCE + "."); + } + ++ if ("NONE".equalsIgnoreCase(EXECUTOR_CLASS_NAME)) { ++ return null; ++ } ++ + Finalizer finalizer = new Finalizer(finalizableReferenceClass, frq); +- finalizer.start(); +- return finalizer.queue; ++ ++ try { ++ if (EXECUTOR_CLASS_NAME == null || EXECUTOR_CLASS_NAME.length() == 0) { ++ Thread thread = new Thread(finalizer, Finalizer.class.getName()); ++ thread.setDaemon(true); ++ // TODO: Priority? ++ thread.start(); ++ } else { ++ Class<?> executorClass; ++ try { ++ executorClass = Thread.currentThread().getContextClassLoader().loadClass(EXECUTOR_CLASS_NAME); ++ } catch (Throwable ignore) { ++ executorClass = Class.forName(EXECUTOR_CLASS_NAME); ++ } ++ // use custom Executor supplied by an external container ++ ((Executor)executorClass.newInstance()).execute(finalizer); ++ } ++ return finalizer.queue; ++ } catch (Throwable t) { ++ logger.log(Level.WARNING, "Cannot start Finalizer thread.", t); ++ return null; ++ } + } + + private final WeakReference<Class<?>> finalizableReferenceClassReference; +@@ -89,24 +125,18 @@ + + /** Constructs a new finalizer thread. */ + private Finalizer(Class<?> finalizableReferenceClass, Object frq) { +- super(Finalizer.class.getName()); + + this.finalizableReferenceClassReference + = new WeakReference<Class<?>>(finalizableReferenceClass); + + // Keep track of the FRQ that started us so we know when to stop. + this.frqReference = new PhantomReference<Object>(frq, queue); +- +- setDaemon(true); +- +- // TODO: Priority? + } + + /** + * Loops continuously, pulling references off the queue and cleaning them up. + */ + @SuppressWarnings("InfiniteLoopStatement") +- @Override + public void run() { + try { + while (true) { +Index: core/src/com/google/inject/internal/BytecodeGen.java +=================================================================== +--- core/src/com/google/inject/internal/BytecodeGen.java (revision 1482) ++++ core/src/com/google/inject/internal/BytecodeGen.java (working copy) +@@ -119,8 +119,7 @@ + end[NO_AOP]*/ + + /** Use "-Dguice.custom.loader=false" to disable custom classloading. */ +- private static final boolean CUSTOM_LOADER_ENABLED +- = Boolean.parseBoolean(System.getProperty("guice.custom.loader", "true")); ++ private static final boolean CUSTOM_LOADER_ENABLED; + + /** + * Weak cache of bridge class loaders that make the Guice implementation +@@ -129,6 +128,14 @@ + private static final Map<ClassLoader, ClassLoader> CLASS_LOADER_CACHE; + + static { ++ boolean customLoaderEnabled; ++ try { ++ customLoaderEnabled = Boolean.parseBoolean(System.getProperty("guice.custom.loader", "true")); ++ } catch (Throwable e) { ++ customLoaderEnabled = false; // unlikely we'll also have permissions for custom loading ++ } ++ CUSTOM_LOADER_ENABLED = customLoaderEnabled; ++ + if (CUSTOM_LOADER_ENABLED) { + CLASS_LOADER_CACHE = new MapMaker().weakKeys().weakValues().makeComputingMap( + new Function<ClassLoader, ClassLoader>() { +Index: core/src/com/google/inject/Scopes.java +=================================================================== +--- core/src/com/google/inject/Scopes.java (revision 1482) ++++ core/src/com/google/inject/Scopes.java (working copy) +@@ -17,7 +17,6 @@ + package com.google.inject; + + import com.google.inject.internal.CircularDependencyProxy; +-import com.google.inject.internal.InternalInjectorCreator; + import com.google.inject.internal.LinkedBindingImpl; + import com.google.inject.spi.BindingScopingVisitor; + import com.google.inject.spi.ExposedBinding; +@@ -53,14 +52,9 @@ + public T get() { + if (instance == null) { + /* +- * Use a pretty coarse lock. We don't want to run into deadlocks +- * when two threads try to load circularly-dependent objects. +- * Maybe one of these days we will identify independent graphs of +- * objects and offer to load them in parallel. +- * + * This block is re-entrant for circular dependencies. + */ +- synchronized (InternalInjectorCreator.class) { ++ synchronized (this) { + if (instance == null) { + T provided = creator.get(); + diff --git a/sources b/sources index dd6bba4..d392954 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8c63986768946922fcb7647b4bd5c9c9 guice-2.0-1219.tar.xz +4965b31ce54cec8104af02788092515b guice-3.0-rc2-src.zip
1
0
0
0
File firefox-langpacks-3.6.14-20110301.tar.bz2 uploaded to lookaside cache by xhorak
by Jan Horak
01 Mar '11
01 Mar '11
A file has been added to the lookaside cache for firefox: 6f72b550709c23895e0f535eaf54b531 firefox-langpacks-3.6.14-20110301.tar.bz2
1
0
0
0
File firefox-3.6.14.source.tar.bz2 uploaded to lookaside cache by xhorak
by Jan Horak
01 Mar '11
01 Mar '11
A file has been added to the lookaside cache for firefox: ab0d00cd33e6b2388429dda1c01abd01 firefox-3.6.14.source.tar.bz2
1
0
0
0
[file] - fix #678458 - support for Python 3.2 compiled files
by Jan Kaluža
01 Mar '11
01 Mar '11
commit 834f7f82ab963c6de8d013f27433bea2995c832a Author: Jan Kaluza <hanzz.k(a)gmail.com> Date: Tue Mar 1 09:50:36 2011 +0100 - fix #678458 - support for Python 3.2 compiled files file-5.05-python-3.2.patch | 20 ++++++++++++++++++++ file.spec | 8 +++++++- 2 files changed, 27 insertions(+), 1 deletions(-) --- diff --git a/file-5.05-python-3.2.patch b/file-5.05-python-3.2.patch new file mode 100644 index 0000000..f1cc147 --- /dev/null +++ b/file-5.05-python-3.2.patch @@ -0,0 +1,20 @@ +diff --git a/magic/Magdir/python b/magic/Magdir/python +index 107b091..bee1b69 100644 +--- a/magic/Magdir/python ++++ b/magic/Magdir/python +@@ -1,6 +1,6 @@ + + #------------------------------------------------------------------------------ +-# $File: python,v 1.16 2010/12/31 18:15:28 christos Exp $ ++# $File: python,v 1.17 2011/02/08 13:45:15 christos Exp $ + # python: file(1) magic for python + # + # From: David Necas <yeti(a)physics.muni.cz> +@@ -20,6 +20,7 @@ + 0 belong 0x03f30d0a python 2.7 byte-compiled + 0 belong 0x3b0c0d0a python 3.0 byte-compiled + 0 belong 0x4f0c0d0a python 3.1 byte-compiled ++0 belong 0x6c0c0d0a python 3.2 byte-compiled + + 0 search/1/w #!\ /usr/bin/python Python script text executable + !:mime text/x-python diff --git a/file.spec b/file.spec index 0e487b2..570f8d6 100644 --- a/file.spec +++ b/file.spec @@ -5,7 +5,7 @@ Summary: A utility for determining file types Name: file Version: 5.05 -Release: 3%{?dist} +Release: 4%{?dist} License: BSD Group: Applications/File Source0:
ftp://ftp.astron.com/pub/file/file-%{version}.tar.gz
@@ -15,6 +15,7 @@ Patch1: file-5.04-zip64.patch Patch2: file-5.05-python-magic.patch Patch3: file-5.05-latex-improve.patch Patch4: file-5.05-rpm-archs.patch +Patch5: file-5.05-python-3.2.patch Requires: file-libs = %{version}-%{release} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -76,6 +77,8 @@ file(1) command. %patch3 -p1 #fixes #676041 %patch4 -p1 +#fixes #678458 +%patch5 -p1 iconv -f iso-8859-1 -t utf-8 < doc/libmagic.man > doc/libmagic.man_ touch -r doc/libmagic.man doc/libmagic.man_ @@ -155,6 +158,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Tue Mar 01 2011 Jan Kaluza <jkaluza(a)redhat.com> - 5.05-4 +- fix #678458 - support for Python 3.2 compiled files + * Thu Feb 10 2011 Jan Kaluza <jkaluza(a)redhat.com> - 5.05-3 - fix #676543 - improved TeX and LaTeX recognition - fix #676041 - detect all supported RPM architectures
1
0
0
0
File guice-3.0-rc2-src.zip uploaded to lookaside cache by sochotni
by Stanislav Ochotnicky
01 Mar '11
01 Mar '11
A file has been added to the lookaside cache for google-guice: 4965b31ce54cec8104af02788092515b guice-3.0-rc2-src.zip
1
0
0
0
[aether/f15/master] (2 commits) ...Rebuild after bugfix update to plexus-containers (#675865)
by Stanislav Ochotnicky
01 Mar '11
01 Mar '11
Summary of changes: 2763116... Update to latest version (*) ea5d8c8... Rebuild after bugfix update to plexus-containers (#675865) (*) (*) This commit already existed in another branch; no separate mail sent
1
0
0
0
[xulrunner/f13/master] Update to 1.9.2.14
by Jan Horak
01 Mar '11
01 Mar '11
commit de69660d838835a8b212bb416de2f63a91da862d Author: Jan Horak <jhorak(a)redhat.com> Date: Tue Mar 1 08:58:05 2011 +0100 Update to 1.9.2.14 .gitignore | 1 + sources | 2 +- xulrunner.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) --- diff --git a/.gitignore b/.gitignore index 15f9ce1..a2d4c9f 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ xulrunner-1.9.2.7.source.tar.bz2 /xulrunner-1.9.2.11.source.tar.bz2 /xulrunner-1.9.2.12.source.tar.bz2 /xulrunner-1.9.2.13.source.tar.bz2 +/xulrunner-1.9.2.14.source.tar.bz2 diff --git a/sources b/sources index 50ee003..cd95fea 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d7c90aed8209beefa74badf02e8eeae1 xulrunner-1.9.2.13.source.tar.bz2 +ab0d00cd33e6b2388429dda1c01abd01 xulrunner-1.9.2.14.source.tar.bz2 diff --git a/xulrunner.spec b/xulrunner.spec index 9a9b60a..1939f00 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -15,7 +15,7 @@ Summary: XUL Runtime for Gecko Applications Name: xulrunner -Version: 1.9.2.13 +Version: 1.9.2.14 Release: 1%{?pretag}%{?dist} URL:
http://developer.mozilla.org/En/XULRunner
License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -428,6 +428,9 @@ fi #--------------------------------------------------------------------- %changelog +* Tue Mar 1 2011 Jan Horak <jhorak(a)redhat.com> - 1.9.2.14-1 +- Update to 1.9.2.14 + * Thu Dec 9 2010 Jan Horak <jhorak(a)redhat.com> - 1.9.2.13-1 - Update to 1.9.2.13
1
0
0
0
File xulrunner-1.9.2.14.source.tar.bz2 uploaded to lookaside cache by xhorak
by Jan Horak
01 Mar '11
01 Mar '11
A file has been added to the lookaside cache for xulrunner: ab0d00cd33e6b2388429dda1c01abd01 xulrunner-1.9.2.14.source.tar.bz2
1
0
0
0
[perl-Dist-CheckConflicts] Created tag perl-Dist-CheckConflicts-0.02-2.el4
by Paul Howarth
01 Mar '11
01 Mar '11
The lightweight tag 'perl-Dist-CheckConflicts-0.02-2.el4' was created pointing to: fa57707... Initial import of perl-Dist-CheckConflicts-0.02-2
1
0
0
0
← Newer
1
...
1438
1439
1440
1441
1442
1443
1444
...
1447
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
1001
1002
1003
1004
1005
1006
1007
1008
1009
1010
1011
1012
1013
1014
1015
1016
1017
1018
1019
1020
1021
1022
1023
1024
1025
1026
1027
1028
1029
1030
1031
1032
1033
1034
1035
1036
1037
1038
1039
1040
1041
1042
1043
1044
1045
1046
1047
1048
1049
1050
1051
1052
1053
1054
1055
1056
1057
1058
1059
1060
1061
1062
1063
1064
1065
1066
1067
1068
1069
1070
1071
1072
1073
1074
1075
1076
1077
1078
1079
1080
1081
1082
1083
1084
1085
1086
1087
1088
1089
1090
1091
1092
1093
1094
1095
1096
1097
1098
1099
1100
1101
1102
1103
1104
1105
1106
1107
1108
1109
1110
1111
1112
1113
1114
1115
1116
1117
1118
1119
1120
1121
1122
1123
1124
1125
1126
1127
1128
1129
1130
1131
1132
1133
1134
1135
1136
1137
1138
1139
1140
1141
1142
1143
1144
1145
1146
1147
1148
1149
1150
1151
1152
1153
1154
1155
1156
1157
1158
1159
1160
1161
1162
1163
1164
1165
1166
1167
1168
1169
1170
1171
1172
1173
1174
1175
1176
1177
1178
1179
1180
1181
1182
1183
1184
1185
1186
1187
1188
1189
1190
1191
1192
1193
1194
1195
1196
1197
1198
1199
1200
1201
1202
1203
1204
1205
1206
1207
1208
1209
1210
1211
1212
1213
1214
1215
1216
1217
1218
1219
1220
1221
1222
1223
1224
1225
1226
1227
1228
1229
1230
1231
1232
1233
1234
1235
1236
1237
1238
1239
1240
1241
1242
1243
1244
1245
1246
1247
1248
1249
1250
1251
1252
1253
1254
1255
1256
1257
1258
1259
1260
1261
1262
1263
1264
1265
1266
1267
1268
1269
1270
1271
1272
1273
1274
1275
1276
1277
1278
1279
1280
1281
1282
1283
1284
1285
1286
1287
1288
1289
1290
1291
1292
1293
1294
1295
1296
1297
1298
1299
1300
1301
1302
1303
1304
1305
1306
1307
1308
1309
1310
1311
1312
1313
1314
1315
1316
1317
1318
1319
1320
1321
1322
1323
1324
1325
1326
1327
1328
1329
1330
1331
1332
1333
1334
1335
1336
1337
1338
1339
1340
1341
1342
1343
1344
1345
1346
1347
1348
1349
1350
1351
1352
1353
1354
1355
1356
1357
1358
1359
1360
1361
1362
1363
1364
1365
1366
1367
1368
1369
1370
1371
1372
1373
1374
1375
1376
1377
1378
1379
1380
1381
1382
1383
1384
1385
1386
1387
1388
1389
1390
1391
1392
1393
1394
1395
1396
1397
1398
1399
1400
1401
1402
1403
1404
1405
1406
1407
1408
1409
1410
1411
1412
1413
1414
1415
1416
1417
1418
1419
1420
1421
1422
1423
1424
1425
1426
1427
1428
1429
1430
1431
1432
1433
1434
1435
1436
1437
1438
1439
1440
1441
1442
1443
1444
1445
1446
1447
Results per page:
10
25
50
100
200