rpm/tomcat
SHA256
1
0
Fork 0
forked from pool/tomcat
Code Pull Requests Activity

Accepting request 186566 from Java:packages

Browse Source 
- add _constraints to not schedule build on some build machines
  workaround for bnc#832762

- Add missing 'su root tomcat' line to logrotate. See also
  https://bugzilla.redhat.com/show_bug.cgi?id=790334 

- call chown --no-dereference in init script
  (bnc#822177#c7/prevents CVE-2013-1976)
 

- update to 7.0.42 (bugfix release)
  see http://tomcat.apache.org/tomcat-7.0-doc/changelog.html
- fix file list to be compatible for new rpm

OBS-URL: https://build.opensuse.org/request/show/186566
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/tomcat?expand=0&rev=12
This commit is contained in:
Tomáš Chvátal 2013-08-23 09:04:29 +00:00 committed by Git OBS Bridge
commit 95157b5ca2
11 changed files with 4404 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
_constraints Normal file
View File

@ -0,0 +1,7 @@
<constraints>
<hardware>
<physicalmemory>
<size unit="M">2048</size>
</physicalmemory>
</hardware>
</constraints>

3
apache-tomcat-7.0.39-src.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d9b4daceb2040bff84dbc37ea07d442cf6b0a608b2d161f15740147fac76101d
size 4295207

17
apache-tomcat-7.0.39-src.tar.gz.asc
View File

@ -1,17 +0,0 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (MingW32)
iQIcBAABAgAGBQJRTFF7AAoJEBDAHFovYFnnDm4P/ifNvkjNTbPMrDBrWGxXu5NT
nqr8P5VGeIJkLrKa5yc107rWZm7A/IJRjvaXu1rn1dz7gA+xKfCHCBjYd1VKo0h+
f0ZQVFoY592MhF73wQ5IgFFalTIVfeaydq1jTml+8cuWPUUw4Li1ejvWwF7/JPQJ
QgyDxGNQKYt6UvJrByI6nONA4PVbcPMBqt9DOxIo+JC1ToOgWVIK5IyvC3PHC+aF
sEP8izTT/8frdxvH1km1yhv7lmfmeGnjkJDUtVY4DYRCWpH4AnAGJpTZTRj65gwf
Cxjxf508mKmPrE7tRJwyCQKQcd+6M/ei0xvR3xJeOXwaxzC7cJQT36I+p9V6Hqlt
7J50CjnCyR9kbHm7bU13WJK28DBJ0QEEWtJZrfb3oolWrE5r2xmPKfPX5rfXyXz5
rhQgjs2QuvtjVNTV3pcr3ogZwhpborYYz56WG3nDA21vATjJb9FlUN87ovMgIGJH
8LHrDfJaD/0m7Btvgz1b41z7FFQcbUqJH7WUiTw8s4ala7t55vG5tsZCn9UXfCtv
5Gb7miXcz/C2aeSIyU9QpyGNPk6jw+kQjK7TgB+5J8jZlYiBmdFGVl5JIdsrMRxS
f++frff2ov8FlD4Wxqr1+5VPSHf9vPNPAbg2rXJxI+whxKQi7cf0OybNsUPJ1lDX
CJad5mKFG+WqaViAZ5Dx
=IQvN
-----END PGP SIGNATURE-----

3
apache-tomcat-7.0.42-src.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5dbc2194b894de0b620752f18f5dc69901627f49b87d9dfb5951750bb9c20c72
size 4422120

17
apache-tomcat-7.0.42-src.tar.gz.asc Normal file
View File

@ -0,0 +1,17 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (MingW32)
iQIcBAABAgAGBQJR0okBAAoJEBDAHFovYFnnOGIP/0BLyBwPIDb0SiYtTNJPEW1x
SP0DXVHO66ptX5kmGcTBVEUdPsRDL5hl4Uhg38v/CCu9osmtb/TYrg1zQ/DNcZN4
5MtXZ++ciRIrOHLYGaehzEKnz8K5b8G3dC6K3oECQfXLDKsHBwI939Ms9nBmJ92/
MpZzuP0KVI4TKWGdSSe6z5ffShVW4poHPS4ie8TJxp+fUWi7B4h17xK4H1xynZXo
1e3AY5HCnK+7PFJSq8vhhAITmOsg+DXbwEL3r057dvbpTltd9SgIqdCbCf7xWDVY
iI/GplGMgNiUw1TGnmmdqA0eyBwzuFp/zdh2/M/X3cQ25dAOV/7Do9e9FWwA9Xj5
X1u8e0Emcm1VmbVnbky+WokFExVcMa87pH0Im2DDhw4xltoTGrzExFfPVgmiFV56
+6YIUsHUS+rnLUXhosGIPnNHkE3lhbkkQ9UhvxMNOQpoTFwzT5yUhBKCfXLtxgil
OIY7yysAfgMQq9ziRBQ9k39sqHonTBUrsH+NDEdr/fVD6FQtVkykeviRact2nh26
y6+Am2yqK/+Xbn7lRgZCYMdi3T1mZmFZvVm4/oa1/HdySjmdY1quwgznHDkkzEI3
na76VnLtVsx0JwnildUwRku2uyGmXT+LniD3Yrc9HixNG4jQXCxEbN4VDI5Nweh7
WiiE3SKwQGGDhVaNkxmN
=i6GQ
-----END PGP SIGNATURE-----

2242
local.bl Normal file
View File

File diff suppressed because it is too large Load Diff

2102
obs.bl Normal file
View File

File diff suppressed because it is too large Load Diff

6
tomcat-7.0.init
View File

@ -169,7 +169,7 @@ function makeHomeDir() {
cp -pLR /usr/share/${NAME}/conf $CATALINA_HOME
ln -fs /usr/share/java/tomcat ${CATALINA_HOME}/lib
ln -fs /usr/share/tomcat/webapps ${CATALINA_HOME}/webapps
chown ${TOMCAT_USER}:${TOMCAT_USER} /var/log/${NAME}
chown --no-dereference ${TOMCAT_USER}:${TOMCAT_USER} /var/log/${NAME}
fi
}
@ -207,9 +207,9 @@ function start() {
# fix permissions on the log and pid files
export CATALINA_PID="/var/run/${NAME}.pid"
touch $CATALINA_PID
chown ${TOMCAT_USER}:${TOMCAT_USER} $CATALINA_PID
chown --no-dereference ${TOMCAT_USER}:${TOMCAT_USER} $CATALINA_PID
touch $TOMCAT_LOG
chown ${TOMCAT_USER}:${TOMCAT_USER} $TOMCAT_LOG
chown --no-dereference ${TOMCAT_USER}:${TOMCAT_USER} $TOMCAT_LOG
if [ "$CATALINA_HOME" != "/usr/share/tomcat" ]; then
# Create a tomcat directory if it doesn't exist
makeHomeDir

1
tomcat-7.0.logrotate
View File

@ -4,5 +4,6 @@
rotate 52
compress
missingok
su root tomcat
create 0644 tomcat tomcat
}

25
tomcat.changes
View File

@ -1,3 +1,28 @@
-------------------------------------------------------------------
Fri Aug 9 09:18:44 UTC 2013 - mvyskocil@suse.com
- add _constraints to not schedule build on some build machines
workaround for bnc#832762
-------------------------------------------------------------------
Tue Aug 6 20:24:06 UTC 2013 - robert.munteanu@gmail.com
- Add missing 'su root tomcat' line to logrotate. See also
https://bugzilla.redhat.com/show_bug.cgi?id=790334
-------------------------------------------------------------------
Fri Jul 26 13:06:35 UTC 2013 - mvyskocil@suse.com
- call chown --no-dereference in init script
(bnc#822177#c7/prevents CVE-2013-1976)
-------------------------------------------------------------------
Tue Jul 23 14:33:47 UTC 2013 - mvyskocil@suse.com
- update to 7.0.42 (bugfix release)
see http://tomcat.apache.org/tomcat-7.0-doc/changelog.html
- fix file list to be compatible for new rpm
-------------------------------------------------------------------
Thu Apr 18 12:23:13 UTC 2013 - mvyskocil@suse.com

7
tomcat.spec
View File

@ -26,7 +26,7 @@
%define major_version 7
%define minor_version 0
%define micro_version 39
%define micro_version 42
%define packdname apache-tomcat-%{version}-src
%define tcuid 91
@ -98,6 +98,7 @@ BuildRequires: jakarta-commons-dbcp
BuildRequires: jakarta-commons-pool
BuildRequires: jakarta-taglibs-standard >= 1.1
BuildRequires: java-devel >= 1.6.0
BuildRequires: javapackages-tools
BuildRequires: jpackage-utils >= 1.7.0
BuildRequires: junit
BuildRequires: sed
@ -641,7 +642,7 @@ fi
%attr(0755,root,root) %{_initrddir}/%{name}
%endif
#bnc#565901
%attr(0755,root,root) %{bindir}/catalina.sh
%{bindir}/catalina.sh
%if ! %{with_systemd}
%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
%endif
@ -649,7 +650,7 @@ fi
# % config(noreplace) %{_sysconfdir}/sysconfig/%{name}
# bnc#726307
%attr(0775,root,tomcat) %dir %{confdir}
%attr(0775,root,tomcat) %dir %{confdir}/Catalina
%{confdir}/Catalina
# % attr(0775,root,tomcat) %dir %{confdir}/Catalina/localhost
%config(noreplace) %{confdir}/%{name}.conf
%config(noreplace) %{confdir}/*.policy