[maven] Disable animal-sniffer on RHEL
by Mikolaj Izdebski
commit 4e46797c532d5b34b29540c322bed7697671a8ad
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Mon Aug 27 14:17:46 2012 +0200
Disable animal-sniffer on RHEL
maven.spec | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 deletions(-)
---
diff --git a/maven.spec b/maven.spec
index de21e71..82a94c8 100644
--- a/maven.spec
+++ b/maven.spec
@@ -2,7 +2,7 @@
Name: maven
Version: 3.0.4
-Release: 10%{?dist}
+Release: 11%{?dist}
Summary: Java project management and project comprehension tool
Group: Development/Tools
@@ -45,7 +45,6 @@ Patch201: 0004-Fix-text-scope-skipping-with-maven.test.skip.patch
BuildArch: noarch
BuildRequires: aether >= 1.13.1
-BuildRequires: animal-sniffer >= 1.6-5
BuildRequires: apache-commons-parent
BuildRequires: async-http-client
BuildRequires: atinject
@@ -70,9 +69,11 @@ BuildRequires: plexus-containers-container-default
BuildRequires: sisu >= 2.1.1-2
BuildRequires: sonatype-oss-parent
BuildRequires: xmlunit
+%if 0%{?fedora}
+BuildRequires: animal-sniffer >= 1.6-5
+%endif
Requires: aether >= 1.13.1
-Requires: animal-sniffer >= 1.6-5
Requires: apache-commons-cli
Requires: apache-commons-parent
Requires: async-http-client
@@ -99,6 +100,9 @@ Requires: sonatype-oss-parent
Requires: xbean
Requires: xerces-j2
Requires: yum-utils
+%if 0%{?fedora}
+Requires: animal-sniffer >= 1.6-5
+%endif
# for noarch->arch change
@@ -160,6 +164,11 @@ sed -i -e s:'-classpath "${M2_HOME}"/boot/plexus-classworlds-\*.jar':'-classpath
src/bin/mvn*
popd
+# Disable animal-sniffer on RHEL
+if [ %{?rhel} ]; then
+ %pom_remove_plugin :animal-sniffer-maven-plugin
+fi
+
%build
mvn-rpmbuild -e install javadoc:aggregate
@@ -367,6 +376,9 @@ ln -sf `rpm --eval '%%{_jnidir}'` %{_datadir}/%{name}/repository-jni/JPP
%changelog
+* Mon Aug 27 2012 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 3.0.4-11
+- Disable animal-sniffer on RHEL
+
* Wed Jul 25 2012 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 3.0.4-10
- Fix exit code of mvn-rpmbuild outside of mock
- Fix bug in compatibility jar handling
11 years, 8 months
Broken dependencies: joda-time
by Fedora Koji Build System
joda-time has broken dependencies in the epel-5 tree:
On ppc:
joda-time-1.5.2-7.tzdata2008d.el5.noarch requires java > 0:1.5.0
Please resolve this as soon as possible.
11 years, 8 months
Broken dependencies: joda-time
by Fedora Koji Build System
joda-time has broken dependencies in the epel-5 tree:
On ppc:
joda-time-1.5.2-7.tzdata2008d.el5.noarch requires java > 0:1.5.0
Please resolve this as soon as possible.
11 years, 8 months
[Bug 709532] New: CVE-2011-1498 httpcomponents-client: sends Proxy-Authorization header to host when tunneling requests through authenticated proxy server [fedora-15]
by Red Hat Bugzilla
Please do not reply directly to this email. All additional
comments should be made in the comments box of this bug.
Summary: CVE-2011-1498 httpcomponents-client: sends Proxy-Authorization header to host when tunneling requests through authenticated proxy server [fedora-15]
https://bugzilla.redhat.com/show_bug.cgi?id=709532
Summary: CVE-2011-1498 httpcomponents-client: sends
Proxy-Authorization header to host when tunneling
requests through authenticated proxy server
[fedora-15]
Product: Fedora
Version: 15
Platform: All
OS/Version: Linux
Status: NEW
Keywords: Security, SecurityTracking
Severity: medium
Priority: medium
Component: httpcomponents-client
AssignedTo: sochotni(a)redhat.com
ReportedBy: vdanen(a)redhat.com
QAContact: extras-qa(a)fedoraproject.org
CC: sochotni(a)redhat.com, sgehwolf(a)redhat.com,
java-sig-commits(a)lists.fedoraproject.org
Blocks: 709531
Classification: Fedora
Story Points: ---
fedora-15 tracking bug for httpcomponents-client: see blocks bug list for full
details of the security issue(s).
This bug is never intended to be made public, please put any public notes
in the 'blocks' bugs.
[bug automatically created by: add-tracking-bugs]
--
Configure bugmail: https://bugzilla.redhat.com/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are on the CC list for the bug.
11 years, 8 months
[tomcat: 2/2] - Updated to 7.0.29 - Add pidfile as tmpfile - Use systemd for running as unprivileged user - Resolv
by Ivan Afonichev
commit 18fb32c606d8d831d66a11c7a3f8e8eb98326346
Merge: 24d9982 5955ecc
Author: Ivan Afonichev <ivan.afonichev(a)gmail.com>
Date: Sat Aug 25 01:48:20 2012 +0400
- Updated to 7.0.29
- Add pidfile as tmpfile
- Use systemd for running as unprivileged user
- Resolves: rhbz 847751 upgrade path was broken
- Resolves: rhbz 850343 use new systemd-rpm macros
Merge branch 'f17' of ssh://pkgs.fedoraproject.org/tomcat
Conflicts:
tomcat.spec
sources | 2 +-
tomcat-7.0-tomcat-sysd | 30 ++++--------------------------
tomcat-7.0.init | 10 +++++-----
tomcat-7.0.service | 3 +++
tomcat-7.0.wrapper | 18 +++++++++++-------
tomcat.spec | 38 +++++++++++++++++++++-----------------
6 files changed, 45 insertions(+), 56 deletions(-)
---
diff --cc tomcat-7.0-tomcat-sysd
index 1e79816,1e79816..192329c
--- a/tomcat-7.0-tomcat-sysd
+++ b/tomcat-7.0-tomcat-sysd
@@@ -9,7 -9,7 +9,7 @@@
# SERVICE_NAME is a required value only if the service name is
# different from 'tomcat'
#
--NAME="${SERVICE_NAME:-tomcat}"
++export NAME="${SERVICE_NAME:-tomcat}"
#I'll bet this isn't required.
# unset ISBOOT
@@@ -42,47 -42,47 +42,25 @@@ if [ -r "/etc/sysconfig/${NAME}" ]; the
. /etc/sysconfig/${NAME}
fi
--function parseOptions() {
-- options=""
-- options="$options $(
-- awk '!/^#/ && !/^$/ { ORS=" "; print "export ", $0, ";" }' \
-- $TOMCAT_CFG
-- )"
-- if [ -r "/etc/sysconfig/${NAME}" ]; then
-- options="$options $(
-- awk '!/^#/ && !/^$/ { ORS=" ";
-- print "export ", $0, ";" }' \
-- /etc/sysconfig/${NAME}
-- )"
-- fi
-- TOMCAT_SCRIPT="$options ${TOMCAT_SCRIPT}"
--}
--
# See how we were called.
function start() {
# fix permissions on the log and pid files
export CATALINA_PID="/var/run/${NAME}.pid"
-- touch $CATALINA_PID 2>&1
-- if [ "$?" -eq "0" ]; then
-- chown ${TOMCAT_USER}:${TOMCAT_USER} $CATALINA_PID
-- fi
touch $TOMCAT_LOG 2>&1
if [ "$?" -eq "0" ]; then
chown ${TOMCAT_USER}:${TOMCAT_USER} $TOMCAT_LOG
fi
-- parseOptions
if [ "$SECURITY_MANAGER" = "true" ]; then
-- $SU - $TOMCAT_USER -c "${TOMCAT_SCRIPT} start-security" >> $TOMCAT_LOG 2>&1
++ ${TOMCAT_SCRIPT} start-security >> $TOMCAT_LOG 2>&1
else
-- $SU - $TOMCAT_USER -c "${TOMCAT_SCRIPT} start" >> $TOMCAT_LOG 2>&1
++ ${TOMCAT_SCRIPT} start #>> $TOMCAT_LOG 2>&1
fi
}
function stop() {
-- parseOptions
-- $SU - $TOMCAT_USER -c "${TOMCAT_SCRIPT} stop" >> $TOMCAT_LOG 2>&1
++ ${TOMCAT_SCRIPT} stop >> $TOMCAT_LOG 2>&1
}
# See how we were called.
diff --cc tomcat-7.0.init
index cddf8cd,cddf8cd..f5269f5
--- a/tomcat-7.0.init
+++ b/tomcat-7.0.init
@@@ -149,7 -149,7 +149,7 @@@ function start()
return
fi
if [ -f "/var/lock/subsys/${NAME}" ]; then
-- if [ -f "/var/run/${NAME}.pid" ]; then
++ if [ -s "/var/run/${NAME}.pid" ]; then
read kpid < /var/run/${NAME}.pid
# if checkpid $kpid 2>&1; then
if [ -d "/proc/${kpid}" ]; then
@@@ -210,7 -210,7 +210,7 @@@ function stop()
fi
if [ "$RETVAL" -eq "0" ]; then
count="0"
-- if [ -f "/var/run/${NAME}.pid" ]; then
++ if [ -s "/var/run/${NAME}.pid" ]; then
read kpid < /var/run/${NAME}.pid
until [ "$(ps --pid $kpid | grep -c $kpid)" -eq "0" ] || \
[ "$count" -gt "$SHUTDOWN_WAIT" ]; do
@@@ -262,7 -262,7 +262,7 @@@ case "$1" i
start
;;
condrestart|try-restart)
-- if [ -f "/var/run/${NAME}.pid" ]; then
++ if [ -s "/var/run/${NAME}.pid" ]; then
stop
start
fi
@@@ -271,13 -271,13 +271,13 @@@
RETVAL="3"
;;
force-reload)
-- if [ -f "/var/run/${NAME}.pid" ]; then
++ if [ -s "/var/run/${NAME}.pid" ]; then
stop
start
fi
;;
status)
-- if [ -f "/var/run/${NAME}.pid" ]; then
++ if [ -s "/var/run/${NAME}.pid" ]; then
read kpid < /var/run/${NAME}.pid
if [ -d "/proc/${kpid}" ]; then
log_success_msg "${NAME} (pid ${kpid}) is running..."
diff --cc tomcat-7.0.service
index e556336,e556336..7cfa4bf
--- a/tomcat-7.0.service
+++ b/tomcat-7.0.service
@@@ -14,6 -14,6 +14,9 @@@ After=syslog.target network.targe
Type=forking
ExecStart=/usr/sbin/tomcat-sysd start
ExecStop=/usr/sbin/tomcat-sysd stop
++User=tomcat
++Group=tomcat
++
[Install]
WantedBy=multi-user.target
diff --cc tomcat-7.0.wrapper
index ad3091b,ad3091b..820c622
--- a/tomcat-7.0.wrapper
+++ b/tomcat-7.0.wrapper
@@@ -8,16 -8,16 +8,20 @@@ els
fi
# Get the tomcat config (use this for environment specific settings)
--#if [ -z "${TOMCAT_CFG}" ]; then
--# TOMCAT_CFG="/etc/tomcat/tomcat.conf"
--#fi
++if [ -z "${TOMCAT_CFG}" ]; then
++ TOMCAT_CFG="/etc/tomcat/tomcat.conf"
++fi
--#if [ -r "$TOMCAT_CFG" ]; then
--# . $TOMCAT_CFG
--#fi
++if [ -r "$TOMCAT_CFG" ]; then
++ . $TOMCAT_CFG
++fi
--set_javacmd
++# Get instance specific config file
++if [ -r "/etc/sysconfig/${NAME}" ]; then
++ . /etc/sysconfig/${NAME}
++fi
++set_javacmd
# CLASSPATH munging
if [ -n "$JSSE_HOME" ]; then
CLASSPATH="${CLASSPATH}:$(build-classpath jcert jnet jsse 2>/dev/null)"
diff --cc tomcat.spec
index d73e34d,df758e8..1adb964
--- a/tomcat.spec
+++ b/tomcat.spec
@@@ -324,6 -324,6 +324,8 @@@ zip -u output/build/bin/tomcat-juli.ja
%{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{libdir}
%{__install} -d -m 0775 ${RPM_BUILD_ROOT}%{logdir}
/bin/touch ${RPM_BUILD_ROOT}%{logdir}/catalina.out
++%{__install} -d -m 0775 ${RPM_BUILD_ROOT}%{_localstatedir}/run
++/bin/touch ${RPM_BUILD_ROOT}%{_localstatedir}/run/%{name}.pid
/bin/echo "%{name}-%{major_version}.%{minor_version}.%{micro_version} RPM installed" >> ${RPM_BUILD_ROOT}%{logdir}/catalina.out
%{__install} -d -m 0775 ${RPM_BUILD_ROOT}%{homedir}
%{__install} -d -m 0775 ${RPM_BUILD_ROOT}%{tempdir}
@@@ -472,6 -472,6 +474,11 @@@ don
# replace temporary copy with link
%{__ln_s} -f %{bindir}/tomcat-juli.jar ${RPM_BUILD_ROOT}%{libdir}/
++mkdir -p ${RPM_BUILD_ROOT}%{_prefix}/lib/tmpfiles.d
++cat > ${RPM_BUILD_ROOT}%{_prefix}/lib/tmpfiles.d/%{name}.conf <<EOF
++f %{_localstatedir}/run/%{name}.pid 0644 tomcat tomcat -
++EOF
++
%pre
# add the tomcat user and group
@@@ -481,10 -481,10 +488,7 @@@
%post
# install but don't activate
--if [ $1 -eq 1 ]; then
-- #initial installation
-- /bin/systemctl daemon-reload >/dev/null 2>&1 || :
--fi
++%systemd_post %{name}.service
%post systemv
# install but don't activate
@@@ -509,19 -509,19 +513,10 @@@
%preun
# clean tempdir and workdir on removal or upgrade
%{__rm} -rf %{workdir}/* %{tempdir}/*
--if [ "$1" = "0" ]; then
-- # package removal, not upgrade
-- /bin/systemctl --no-reload disable tomcat.service > /dev/null 2>&1 || :
-- /bin/systemctl stop tomcat.service > /dev/null 2>&1 || :
--fi
++%systemd_preun %{name}.service
%postun
--/bin/systemctl daemon-reload > /dev/null 2>&1 || :
--if [ $1 -ge 1 ]; then
-- #package upgrade, not uninstall
-- /bin/systemctl try-restart tomcat.service > /dev/null 2>&1 || :
--fi
--
++%systemd_postun_with_restart %{name}.service
%postun jsp-%{jspspec}-api
if [ "$1" = "0" ]; then
@@@ -562,6 -562,6 +557,7 @@@ f
%defattr(0664,root,tomcat,0770)
%attr(0770,root,tomcat) %dir %{logdir}
%attr(0660,tomcat,tomcat) %{logdir}/catalina.out
++%attr(0644,tomcat,tomcat) %{_localstatedir}/run/%{name}.pid
%attr(0770,root,tomcat) %dir %{cachedir}
%attr(0770,root,tomcat) %dir %{tempdir}
%attr(0770,root,tomcat) %dir %{workdir}
@@@ -577,6 -577,6 +573,7 @@@
%attr(0660,tomcat,tomcat) %config(noreplace) %{confdir}/tomcat-users.xml
%attr(0664,tomcat,tomcat) %config(noreplace) %{confdir}/web.xml
%dir %{homedir}
++%{_prefix}/lib/tmpfiles.d/%{name}.conf
%{bindir}/bootstrap.jar
%{bindir}/catalina-tasks.xml
%{homedir}/lib
@@@ -660,8 -660,8 +657,15 @@@
%attr(0644,root,root) %{_unitdir}/%{name}-jsvc.service
%changelog
-* Thu Jul 26 2012 Ivan Afonichev <ivan.afonichev(a)gmail.com> 0:7.0.29-1
++* Fri Aug 24 2012 Ivan Afonichev <ivan.afonichev(a)gmail.com> 0:7.0.29-1
+ - Updated to 7.0.29
++- Add pidfile as tmpfile
++- Use systemd for running as unprivileged user
++- Resolves: rhbz 847751 upgrade path was broken
++- Resolves: rhbz 850343 use new systemd-rpm macros
++
+* Sat Jul 21 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0:7.0.28-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
* Mon Jul 2 2012 Ivan Afonichev <ivan.afonichev(a)gmail.com> 0:7.0.28-1
- Updated to 7.0.28
11 years, 8 months