diff --git a/.avalon-logkit.metadata b/.avalon-logkit.metadata new file mode 100644 index 0000000..0009b0f --- /dev/null +++ b/.avalon-logkit.metadata @@ -0,0 +1 @@ +7792933a3d753d3251a1039ab3ed7d4b755e775d SOURCES/avalon-logkit-2.1-src.zip diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..a920466 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +SOURCES/avalon-logkit-2.1-src.zip diff --git a/SOURCES/avalon-logkit-2.1.pom b/SOURCES/avalon-logkit-2.1.pom new file mode 100644 index 0000000..09cefd6 --- /dev/null +++ b/SOURCES/avalon-logkit-2.1.pom @@ -0,0 +1,31 @@ + + 4.0.0 + avalon-logkit + avalon-logkit + Avalon Logkit + 2.1 + Log4j-like logging toolkit. + 1997 + + + log4j + log4j + 1.2.11 + + + servletapi + servletapi + 2.3 + + + geronimo-spec + geronimo-spec-javamail + 1.3.1-rc3 + + + geronimo-spec + geronimo-spec-jms + 1.1-rc4 + + + \ No newline at end of file diff --git a/SOURCES/avalon-logkit-encoding.patch b/SOURCES/avalon-logkit-encoding.patch new file mode 100644 index 0000000..5e129f7 --- /dev/null +++ b/SOURCES/avalon-logkit-encoding.patch @@ -0,0 +1,28 @@ +diff --git a/src/java/org/apache/log/ContextMap.java b/src/java/org/apache/log/ContextMap.java +index 046106b..2305955 100644 +--- a/src/java/org/apache/log/ContextMap.java ++++ b/src/java/org/apache/log/ContextMap.java +@@ -29,8 +29,8 @@ import java.util.Hashtable; + *
  • hostname ->helm.realityforge.org
    • + *
  • ipaddress ->1.2.3.4
    • + *
  • interface ->127.0.0.1
    • +- *
  • caller � �->com.biz.MyCaller.method(MyCaller.java:18)
    • +- *
  • source � �->1.6.3.2:33
    • ++ *
  • caller ->com.biz.MyCaller.method(MyCaller.java:18)
    • ++ *
  • source ->1.6.3.2:33
    • + * + * The context is bound to a thread (and inherited by sub-threads) but + * it can also be added to by LogTargets. +diff --git a/src/java/org/apache/log/Logger.java b/src/java/org/apache/log/Logger.java +index 43ce1b7..d1f7efd 100644 +--- a/src/java/org/apache/log/Logger.java ++++ b/src/java/org/apache/log/Logger.java +@@ -295,7 +295,7 @@ public class Logger + } + + /** +- * Determine if messages of priority �will be logged. ++ * Determine if messages of priority will be logged. + * @param priority the priority + * @return true if messages will be logged + */ diff --git a/SOURCES/avalon-logkit-pom-deps.patch b/SOURCES/avalon-logkit-pom-deps.patch new file mode 100644 index 0000000..1ad37de --- /dev/null +++ b/SOURCES/avalon-logkit-pom-deps.patch @@ -0,0 +1,33 @@ +--- pom.xml 2011-04-21 14:24:29.000000000 +0200 ++++ pom.xml.new 2011-05-05 14:37:27.016877493 +0200 +@@ -13,19 +13,19 @@ + 1.2.11 + + +- servletapi +- servletapi +- 2.3 ++ javax.servlet ++ servlet-api ++ 2.5 + + +- geronimo-spec +- geronimo-spec-javamail +- 1.3.1-rc3 ++ javax.mail ++ mail ++ 1.4.3 + + +- geronimo-spec +- geronimo-spec-jms +- 1.1-rc4 ++ javax.jms ++ jms ++ 1.1.1 + + +- +\ No newline at end of file ++ diff --git a/SOURCES/fix-java6-compile.patch b/SOURCES/fix-java6-compile.patch new file mode 100644 index 0000000..87bd582 --- /dev/null +++ b/SOURCES/fix-java6-compile.patch @@ -0,0 +1,13 @@ +--- src/java/org/apache/log/output/db/DefaultDataSource.java.sav 2005-08-29 21:03:50.000000000 +0300 ++++ src/java/org/apache/log/output/db/DefaultDataSource.java 2010-11-09 21:05:58.775055594 +0200 +@@ -111,4 +111,10 @@ public class DefaultDataSource + { + m_logWriter = logWriter; + } ++ ++ public boolean isWrapperFor(Class iface) { ++ return false; ++ } ++ ++ public T unwrap(java.lang.Class iface) {return null;} + } diff --git a/SOURCES/java7.patch b/SOURCES/java7.patch new file mode 100644 index 0000000..0f28673 --- /dev/null +++ b/SOURCES/java7.patch @@ -0,0 +1,9 @@ +--- src/java/org/apache/log/output/db/DefaultDataSource.java.sav 2012-04-18 00:41:59.000000000 +0300 ++++ src/java/org/apache/log/output/db/DefaultDataSource.java 2012-04-18 00:46:17.454272754 +0300 +@@ -117,4 +117,6 @@ public class DefaultDataSource + } + + public T unwrap(java.lang.Class iface) {return null;} ++ ++ public java.util.logging.Logger getParentLogger() {return null;} + } diff --git a/SPECS/avalon-logkit.spec b/SPECS/avalon-logkit.spec new file mode 100644 index 0000000..af8d95f --- /dev/null +++ b/SPECS/avalon-logkit.spec @@ -0,0 +1,259 @@ +# Copyright (c) 2000-2005, JPackage Project +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the +# distribution. +# 3. Neither the name of the JPackage Project nor the names of its +# contributors may be used to endorse or promote products derived +# from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# + +%global short_name logkit +%global camelcase_short_name LogKit + +Name: avalon-%{short_name} +Version: 2.1 +Release: 14%{?dist} +Epoch: 0 +Summary: Java logging toolkit +License: ASL 2.0 +Group: Development/Libraries +URL: http://avalon.apache.org/%{short_name}/ +Source0: http://archive.apache.org/dist/excalibur/%{name}/source/%{name}-%{version}-src.zip +Source1: http://repo1.maven.org/maven2/avalon-logkit/avalon-logkit/%{version}/%{name}-%{version}.pom +Patch0: fix-java6-compile.patch +Patch1: avalon-logkit-pom-deps.patch +Patch2: avalon-logkit-encoding.patch +Patch3: java7.patch +Requires: avalon-framework >= 0:4.1.4 +Requires: tomcat-servlet-3.0-api +Requires: jms + +BuildRequires: jpackage-utils >= 0:1.5 +BuildRequires: ant +BuildRequires: javamail +BuildRequires: ant-junit +BuildRequires: log4j +BuildRequires: avalon-framework >= 0:4.1.4 +# Required for converting jars to OSGi bundles +BuildRequires: aqute-bnd +BuildRequires: tomcat-servlet-3.0-api +BuildRequires: jms + +BuildArch: noarch + + +%description +LogKit is a logging toolkit designed for secure performance orientated +logging in applications. To get started using LogKit, it is recomended +that you read the whitepaper and browse the API docs. + +%package javadoc +Summary: Javadoc for %{name} +Group: Documentation +Requires: jpackage-utils + +%description javadoc +Javadoc for %{name}. + +%prep +%setup -q +%patch0 + +cp %{SOURCE1} pom.xml +%patch1 +%patch2 -p1 +%patch3 +# remove all binary libs +find . -name "*.jar" -exec rm -f {} \; + +%build +export CLASSPATH=$(build-classpath log4j javamail/mailapi jms servlet jdbc-stdext avalon-framework junit):$PWD/build/classes +ant -Dencoding=ISO-8859-1 -Dnoget=true clean jar javadoc +# Convert to OSGi bundle +java -jar $(build-classpath aqute-bnd) wrap target/%{name}-%{version}.jar + +%install +# jars +install -d -m 755 $RPM_BUILD_ROOT%{_javadir} +install -d -m 755 $RPM_BUILD_ROOT/%{_mavenpomdir} + +install -m 644 target/%{name}-%{version}.bar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar + +install -pm 644 pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{name}.pom +%add_maven_depmap JPP-%{name}.pom %{name}.jar -a "%{short_name}:%{short_name},org.apache.avalon.logkit:%{name}" + +# javadoc +install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name} +cp -pr dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} + +%files +%doc LICENSE.txt NOTICE.txt +%{_mavendepmapfragdir}/%{name} +%{_mavenpomdir}/JPP-%{name}.pom +%{_javadir}/%{name}.jar + +%files javadoc +%doc LICENSE.txt NOTICE.txt +%{_javadocdir}/%{name} + +%changelog +* Fri Dec 27 2013 Daniel Mach - 02.1-14 +- Mass rebuild 2013-12-27 + +* Fri Jun 28 2013 Mikolaj Izdebski - 0:2.1-13 +- Rebuild to regenerate API documentation +- Resolves: CVE-2013-1571 + +* Wed Feb 13 2013 Fedora Release Engineering - 0:2.1-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Tue Aug 21 2012 Stanislav Ochotnicky - 0:2.1-11 +- Change build-classpath call from macro to shell expansion + +* Thu Aug 16 2012 Mikolaj Izdebski - 0:2.1-10 +- Fix license tag +- Install NOTICE file + +* Wed Jul 18 2012 Fedora Release Engineering - 0:2.1-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Wed Apr 18 2012 Alexander Kurtakov 0:2.1-8 +- Another Java 7 fix. +- BR/R servlet 3.0 api. + +* Thu Jan 12 2012 Fedora Release Engineering - 0:2.1-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Tue Oct 18 2011 Stanislav Ochotnicky - 0:2.1-6 +- aqute-bndlib renamed to aqute-bnd (#745166) +- Fix compilation with openjdk 1.7.0 +- Use new maven macros +- Packaging tweaks + +* Fri May 6 2011 Stanislav Ochotnicky - 0:2.1-5 +- Fix up depdenencies in pom + +* Tue May 3 2011 Severin Gehwolf 0:2.1-4 +- Convert jar's to OSGi bundles using aqute-bndlib. + +* Thu Apr 21 2011 Stanislav Ochotnicky - 0:2.1-3 +- Add maven metadata into package +- Tweaks according to new guidelines + +* Mon Feb 07 2011 Fedora Release Engineering - 0:2.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Tue Nov 9 2010 Alexander Kurtakov 0:2.1-2 +- Add missing ant-junit BR. + +* Tue Nov 9 2010 Alexander Kurtakov 0:2.1-1 +- Update to 2.1 (rhbz#599622). + +* Tue Nov 9 2010 Stanislav Ochotnicky - 0:1.2-9 +- Fix build to use tomcat6 +- Cleanups, various packaging problems fixed + +* Fri Jul 24 2009 Fedora Release Engineering - 0:1.2-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Mon Feb 23 2009 Fedora Release Engineering - 0:1.2-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Wed Jul 9 2008 Tom "spot" Callaway - 0:1.2-6 +- drop repotag +- fix license tag + +* Tue Feb 19 2008 Fedora Release Engineering - 0:1.2-5jpp.5 +- Autorebuild for GCC 4.3 + +* Fri Feb 09 2007 Permaine Cheung 0:1.2-4jpp.5%{?dist} +- Fix source URL, BuildRoot + +* Thu Feb 08 2007 Permaine Cheung 0:1.2-4jpp.4%{?dist} +- rpmlint cleanup. + +* Thu Aug 03 2006 Deepak Bhole 0:1.2-4jpp.3 +- Added missing requirements. + +* Sat Jul 22 2006 Jakub Jelinek - 0:1.2-4jpp_2fc +- Rebuilt + +* Wed Jul 19 2006 Deepak Bhole 0:1.2-4jpp_1fc +- Added conditional native compilation. +- Removed name/release/version defines as applicable. + +* Fri Aug 20 2004 Ralph Apel 0:1.2-3jpp +- Build with ant-1.6.2 + +* Fri May 09 2003 David Walluck 0:1.2-2jpp +- update for JPackage 1.5 + +* Fri Mar 21 2003 Nicolas Mailhot 1.2-1jpp +- For jpackage-utils 1.5 + +* Tue May 07 2002 Guillaume Rousse 1.0.1-4jpp +- hardcoded distribution and vendor tag +- group tag again + +* Thu May 2 2002 Guillaume Rousse 1.0.1-3jpp +- distribution tag +- group tag + +* Mon Mar 18 2002 Guillaume Rousse 1.0.1-2jpp +- generic servlet support + +* Sun Feb 03 2002 Guillaume Rousse 1.0.1-1jpp +- 1.0.1 +- versioned dir for javadoc +- no dependencies for and javadoc package +- adaptation for new servlet3 package +- drop j2ee package +- regenerated the patch +- section package + +* Wed Dec 5 2001 Guillaume Rousse 1.0-4jpp +- javadoc into javadoc package +- Requires and BuildRequires servletapi3 >= 3.2.3-2 +- regenerated the patch + +* Wed Nov 21 2001 Christian Zoffoli 1.0-3jpp +- changed extension --> jpp + +* Tue Nov 20 2001 Guillaume Rousse 1.0-2jpp +- non-free extension classes back in original archive +- removed packager tag + +* Sun Oct 28 2001 Guillaume Rousse 1.0-1jpp +- 1.0 + +* Tue Oct 9 2001 Guillaume Rousse 1.0-0.b5.2jpp +- non-free extension as additional package + +* Sat Oct 6 2001 Guillaume Rousse 1.0-0.b5.1jpp +- 1.0b5 +- first unified release +- used original tarball + +* Mon Sep 10 2001 Guillaume Rousse 1.0-0.b4.1mdk +- first Mandrake release