Commit graph

59 commits

Author SHA1 Message Date
jschauma
99e6fe788b Change dependency of jakarta-ant into apache-ant, as it's now known.
All build fine with the new version of ant.
2003-06-03 17:02:44 +00:00
jmmv
0916498c1b Place WRKSRC where it belongs, to make pkglint happy; ok'ed by wiz. 2003-03-29 12:40:00 +00:00
jlam
d7f69e47ce Instead of including bsd.pkg.install.mk directly in a package Makefile,
have it be automatically included by bsd.pkg.mk if USE_PKGINSTALL is set
to "YES".  This enforces the requirement that bsd.pkg.install.mk be
included at the end of a package Makefile.  Idea suggested by Julio M.
Merino Vidal <jmmv at menta.net>.
2003-01-28 22:03:00 +00:00
jlam
8d07c1b468 Use the JAVA_HOME of the JDK upon which the jakarta-tomcat package depends
as the default JAVA_HOME.  It can still be overridden by an environment
variable.
2002-12-28 22:34:13 +00:00
jlam
659d9c5347 Convert to use buildlink2, bsd.pkg.install.mk, and java-vm.mk. 2002-12-28 21:35:04 +00:00
jlam
e503817fe4 Refer to www/ap-jk (distributed as part of Tomcat) instead of the older
www/ap-jserv.
2002-12-28 21:09:15 +00:00
jlam
87e060f2b7 Replace "/usr/pkg" with "%D". 2002-12-26 22:59:32 +00:00
jlam
04c8f5b996 Use PKG_JAVA_HOME consistently instead of JAVA_HOME now that JAVA_HOME is
no longer defined by bsd.pkg.mk.
2002-10-10 01:01:09 +00:00
wiz
e8817c9088 Complete standardization of messages according to latest pkglint. 2002-09-24 12:29:55 +00:00
abs
3b7a88e009 since we need ant.jar at runtime, switch jakarta-ant from BUILD_DEPENDS to DEPENDS 2002-06-19 09:10:00 +00:00
abs
21a6a78e8d Add a 'flush' option to the rc.d script. Bump version to jakarta-tomcat-3.2.4nb1
If you've used tomcat this probably comes under the category of bugfix :)
2002-05-23 15:48:44 +00:00
cjep
8da02ed7f6 Add NetBSD tags. 2002-05-20 19:06:03 +00:00
abs
a2accd70ae include crimson.jar and ant.jar in default CLASSPATH 2002-05-17 13:24:57 +00:00
jwise
de51c9466a Fix build in java2 case. This is somewhat of a kluge for the fact that
tomcat makes mistaken assumptions about which revisions of java some
features became available in, and to ensure that the package works with
both jdk-1.1 and later (emulated) jdks.
2002-04-19 17:48:21 +00:00
jwise
60715496a9 Update jakarta-servletapi, jakarta-tomcat, and ap-jk to version 3.2.4.
We are not advancing to the 3.3 or 4.0 branches at the moment, as neither
will work with our native JDK without a lot more work.

Changes since Tomcat 3.2.3 (the last pkgsrc version):

7.1 Fixes and Enhancements in Release 3.2.4

This section highlights the bugs fixed in this release.

  -  Cookie name expires is a reserved token (#1114)
  -  Thread initialization problem in thread pool (#1745)
  -  AJP12 returned invalid HTTP headers when redirecting to very
     long URLS (#2333)
  -  Fixed casting problem in JspFactoryImpl.getPageContext().  (#4260)
  -  Setting sesstion-timeout in web.xml did not prevent sessions from
     timing out.  (#4412)
  -  Fixed race condition in ServerSocketFactory.getDefault().  (#4418)
  -  Removed the restrictions on encoded spcecial characters in URLs
     that was added as a security precaution in 3.2.3.  The encoded
     special characters are not decoded and remain the URL and
     path info returned to servlets.
  -  Jk_nt_service now supports the ability to be restarted automatically
     by the Windows 2000 service control manager if Tomcat terminates
     abnormally.
  -  Fixed invalid servlet mapping in web.xml generated by JspC (#3474, #3499)
  -  Added findResource() and findResources() to AdaptiveClassLoader12
  -  A Date: HTTP header is now sent in responses when running stand
     alone. (#345)
  -  Simple held on to a reference to removed objects preventing
     garbage collection.
  -  Tomcat 3.2.4 now ships with JAXP 1.1.  Prior releases used
     JAXP 1.0.1.  Tomcat 3.2.4 remains completely compatible with
     the older version of JAXP and there is no requirement for users
     to upgrade to JAXP 1.1 unless their applications require the new
     version.
  -  Fixed NullPointerException in HttpConnectionHandler.  (#4577)


7.2 Security Vulnerabilities fixed in Tomcat 3.2.4

The randomness of generated session ids has been enhanced to prevent the
generation of guessable ids.
2002-04-19 15:54:20 +00:00
jwise
d0399ba78c Quick fix for apache.org security advisory -- example webapps as present
have a cross-site scripting vulnerability.  For now, we remove them, but
we will update to a newer version when one is available.
2002-04-09 18:24:51 +00:00
abs
440afc65cb Move MAKE_FLAGS= to after .include "../../mk/bsd.pkg.mk" to ensure it overrides any external settings 2002-03-26 16:37:26 +00:00
abs
46b5373763 73 dork points and a swift beating about the head with a clue-by-four for
my previous change.
When resetting any externally set MAKE_FLAGS, it makes sense to check if
this Makefile is trying to set it itself...
2002-03-25 19:19:52 +00:00
abs
c09eb4bd41 If we're overriding MAKE_PROGRAM to ant we should probably reset MAKE_FLAGS
to avoid any 'make' MAKE_FLAGS confusing 'ant'.
2002-03-10 23:59:00 +00:00
skrll
08bdd44549 mkdir -> ${MKDIR}
rmdir -> ${RMDIR}
rm -> ${RM} (${RM} added to PLIST_SUBST)
chmod -> ${CHMOD}
chown -> ${CHOWN}
2002-02-15 10:12:28 +00:00
zuntum
431e7a7dda Move pkg/ files into package's toplevel directory 2001-11-01 02:15:23 +00:00
jlam
f79573370a Mechanical changes to 375 files to change dependency patterns of the form
foo-* to foo-[0-9]*.  This is to cause the dependencies to match only the
packages whose base package name is "foo", and not those named "foo-bar".
A concrete example is p5-Net-* matching p5-Net-DNS as well as p5-Net.  Also
change dependency examples in Packages.txt to reflect this.
2001-09-27 23:17:41 +00:00
abs
83a3a4c393 Do not install a .orig file (also fixes binary package under Linux) 2001-08-23 18:06:16 +00:00
jwise
b9a0798e67 Update jakarta-{servletapi,tomcat} to version 3.2.3. The only real change
is a fix to a security problem allowing unauthorized access to protected
content.
2001-08-11 22:05:22 +00:00
abs
ce60f0d4b2 Switch to a dynamic PLIST so we can install against jdk or sun-jdk 2001-06-21 13:12:25 +00:00
abs
d9a13bd466 Obey rc.conf if present (modelled on apache rc.d file), plus allow entries
to be prepended to CLASSPATH by setting optional tomcat_classpath
2001-05-24 16:06:43 +00:00
wiz
d3c112794d Add size. 2001-05-21 21:45:45 +00:00
agc
8f972b049a + move the distfile digest/checksum value from files/md5 to distinfo
+ move the patch digest/checksum values from files/patch-sum to distinfo
2001-04-17 12:12:16 +00:00
jwise
8d52d896ed Fix thinko in a message. Purely aesthetic. 2001-04-13 07:47:43 +00:00
jwise
9001444411 Make sure .orig files from patching don't get installed. 2001-04-05 19:12:21 +00:00
wennmach
c58997e660 RCS Id police 2001-04-03 11:05:24 +00:00
jwise
26c8fd12f2 Add a run' rc script command corresponding to the tomcat run' startup
directive -- run in the foreground for debugging purposes.
2001-04-02 18:50:50 +00:00
jwise
5eb36a59e5 Ease out-of-the-box integration with mod_jk (pkgsrc/www/ap-jk):
* include a workers.properties which works out of the box -- this
    file may be better off as part of the ap-jk package, even though it
    is somewhat tomcat-specific.  I'll give this possibility more thought.

  * modify the apache config file fragment generator which runs on tomcat
    startup to generate an Include-able apache config file fragment which
    works out of the box to laod mod_jk.
2001-03-29 23:26:24 +00:00
jwise
ef69051153 Add `workers.properties' to config files which receive special treatment. 2001-03-29 22:22:13 +00:00
jwise
d7919a47cb New path on master site for tomcat. Yay. 2001-03-29 00:19:34 +00:00
jwise
b5ebe4334c Fix pattern in jakarta-servletapi dependency. 2001-03-28 23:19:46 +00:00
jwise
8cab80135c Add mandatory tomcat jar files at end of CLASSPATH, not front, so that they
don't override user-provided jar files.

Needed for cocoon, which must find xerces as the first SAX implementation in
it's class path.
2001-03-28 04:28:44 +00:00
jwise
69e2bc749e Remove outdated note about ${JAVA_HOME} (if unset, it is set by the
rc.d script), and add a note pointing users to the rc.d script.
2001-03-28 03:18:36 +00:00
jwise
3cc22ec64f Update jakarta-tomcat to version 3.2.1.
Changes in the package since version 3.1.1 (the last pkgsrc version):
=====================================================================

  * tomcat is now always installed under ${PREFIX}/tomcat.  Making
    ${TOMCAT_HOME} configurable added much complexity for not real
    gain.

    It had been my intention to aim for a hier(7) like install for
    tomcat with this version, but at this point there are way to many
    hard-coded relative paths (relative to tomcat.home) in tomcat,
    and in addition, all of the (quite good, really) documentation
    assumes the standard install paths.

    Note that the previous default value of ${TOMCAT_HOME} was
    ${PREFIX}/jakarta/tomcat.

  * an rc.subr compatible (but not requiring) startup script is now installed
    as ${PREFIX}/etc/rc.d/tomcat.

  * if Sun's JSSE (Java Secure Socket Extensions) is in ${CLASSPATH} when
    the pkg is built, tomcat will be built with support for SSL in the
    standalone server mode.  This soft dependency will be replaced by a
    hard dependency as soon as I get a chance to import a JSSE package
    (soon).

  * likewise, I will import an ap-jk package for the new apache connector
    (mod_jk) soon.  ap-jserv continues to be usable for this purpose.

Changes in tomcat itself since version 3.1.1:
=============================================

New in tomcat-3.2.1:
--------------------
Tomcat 3.2.1 is a maintenance and bug fix release, based on the Tomcat 3.2
(final) code base.  The following changes are included:

- Disallowed requesting JSP pages under the WEB-INF directory
  (/WEB-INF/dummy.jsp).  Previously, only requests for static files
  were being disallowed.

- The JDBCRealm request interceptor will now log the description of any
  JDBC exception that occurs, to aid in debugging.

SECURITY VULNERABILITIES FIXED IN TOMCAT 3.2.1
(note that these fixes were also made to the tomcat-3.1 branch in tomcat 3.1.1)

Protection of Resources in /WEB-INF and /META-INF Directories

The servlet specification prohibits servlet containers from serving resources
in the /WEB-INF and /META-INF directories of a web application archive directly
to clients.  In Tomcat 3.2, this means that URLs like:

   http://localhost:8080/examples/WEB-INF/web.xml

will return an error message, rather than the contents of your deployment
descriptor.  However, there is a vulnerability in Tomcat 3.2 that exposes
this information if the client requests a URL like this instead:

       http://localhost:8080/examples//WEB-INF/web.xml

(note the double slash before "WEB-INF").  This vulnerability has been
corrected in Tomcat 3.2.1.

Show Source Vulnerability

The example application delivered with Tomcat 3.2 included a mechanism to
display the source code for the JSP page examples.  This mechanism could
be used to bypass the restrictions on displaying sensitive information in
the WEB-INF and META-INF directories.  This vulnerability has been removed.

New in tomcat-3.2:
------------------
Tomcat 3.2 is mainly a performance tune-up release, although a few new
features have been added.

- Support for mod_jk, which is a replacement to the elderly mod_jserv, has
  had several bugs fixed and has received much more testing.  It is now
  recommended that all users use mod_jk instead of mod_jserv.

- Support JAXP-based XML parser independence.

- New and often requested "how-to" documents covering the following topics:
     - Configuring workers.properties
     - IIS and Netscape configuration
     - Running tomcat inside an IIS or Netscape process
     - Running Tomcat as a Windows NT service
     - Configuring a JDBC realm
     - Configuring mod_jk

- First round of policy-based security support intended for running untrusted
  code inside of Tomcat.  Interested users should test this support and post
  feedback to the Tomcat users mailing list.

- SSL support for standalone Tomcat. (Preliminary support first appeared in
  3.1, but the support in 3.2 has received more testing and documentation
  support).

- Thread reuse is now enabled by default. The thread pool support code was part
  of 3.1, but not enabled since it was new.

- Support for plug-able session managers.  Unfortunately, no how-to documents
  that support this functionality exist (yet). For the adventurous, be aware
  that the interface that allows administrators to plug session managers is
  the normal Interceptor interface.

- An almost total rewrite of the HTTP request handling now results in improved
  performance when running Tomcat stand-alone.

- Significantly reduced garbage collection.

- The code underwent a refactoring effort resulting in improved readability.

- And of course, hundreds of miscellaneous improvements and fixes.
2001-03-28 02:46:07 +00:00
abs
8c6280da9e Some people might consider "@unexec rm -rf %D/jakarta/tomcat/webapps"
a little hostile to anyone who is actually using tomcat and would prefer
to not have their apps nuked on package update.

Tomcat wipes webapps/ROOT, webapps/examples, and webapps/test directories
on install anyway, so replace the above with entries for those directories.

This allows anyone using other directories in webapps to keep their apps on
package update.
2001-03-06 13:33:41 +00:00
wiz
9d1f44690c We want RCS Ids in the patches.
This is one of the things pkglint checks, so _please_ use it.
2001-02-28 10:26:02 +00:00
hubertf
d32e698de6 Cleanup MKDIR usage => INSTALL_*_DIR
XXX need to teach pkglint to be more picky about this
2001-02-25 04:17:35 +00:00
wiz
a0745845b3 Update to new COMMENT style: COMMENT var in Makefile instead of pkg/COMMENT. 2001-02-17 17:21:28 +00:00
wiz
b979f7222a Add automatic ${VARIABLE} handling for MESSAGE files.
Convert most MESSAGE files to new syntax (${VARIABLE} gets replaced,
not @VARIABLE@, nor @@VARIABLE@@).
By default, substitutions are done for LOCALBASE, PKGNAME, PREFIX,
X11BASE, X11PREFIX; additional patterns can be added via MESSAGE_SUBST.
Clean up some packages while I'm there; add RCS tags to most MESSAGEs.
Remove some uninteresting MESSAGEs.
2001-01-29 11:34:21 +00:00
jwise
a024161d9c Update jakarta-tomcat to 3.1.1. This is a security fix release, and the
vulnerabilities file will be updated.

Changes from jakarta-tomcat-3.1:

===============================================================================
6.  SECURITY VULNERABILITIES FIXED IN TOMCAT 3.1.1


6.1 Administrative Application Enabled By Default

The administrative application (at context path "/admin") was enabled by
default in Tomcat 3.1, which allowed unauthenticated remote users to add and
remove appliations from a running Tomcat 3.1 installation if it was left
installed.

To avoid such problems, the administrative application has been removed from
the binary distribution of Tomcat 3.1.1.  It can be installed if desired by:
- Downloading the source distribution of Tomcat 3.1.1.
- Modifying the "build.xml" file to remove the commenting around the
  logic that creates the adminstrative application.
- Running the build.sh or build.bat script.


6.2 Case Sensitive Matches on Static Resources

In Tomcat 3.1, matches against the filenames of static resources was done in a
case insensitive manner on case insensitive platforms (such as Microsoft
Windows).  This can cause sensitive information to be exposed to remote users
who experiment with differently cased request URIs.

To avoid such problems, Tomcat 3.1.1 performs filename comparisons for static
resources in a case sensitive manner, even on Windows.  This means that your
hyperlinks must specify the correct case, or a 404 error will be returned.

Because this can cause significant conversion problems for existing
applications deployed on Tomcat 3.1, a configuration option is provided to
temporarily turn off case sensitive matching.  Edit the file "conf/web.xml"
and modify the value for the "caseSensitive" initialization parameter to the
default file-serving servlet.

WARNING:  CHANGING THIS SETTING WILL RE-INTRODUCE THE SECURITY VULNERABILITY
PRESENT IN TOMCAT 3.1 -- IT IS *STRONGLY* RECOMMENDED THAT YOU CORRECT YOUR
URLS TO MATCH CORRECTLY INSTEAD OF USING THIS OPTION.  Note:  All later
versions of Tomcat perform filename matches in a case sensitive manner.


6.3 Snoop Servlet Mappings in Example Application

In the deployment descriptor for the example application delivered with
Tomcat 3.1, a "snoop" servlet was mapped to URL patterns "/snoop" and
"*.snp".  Theses mappings (in particular the second one) could cause exposure
of sensitive information on the internal organization of your web application
(for example, when a non-existent page "foo.snp" is requested).

To avoid these problems, the offending mappings have been commented out.


6.4 Show Source Vulnerability

The example application delivered with Tomcat 3.1 included a mechanism to
display the source code for the JSP page examples.  This mechanism could
be used to bypass the restrictions on displaying sensitive information in
the WEB-INF and META-INF directories.  This vulnerability has been removed.


6.5 Requesting Unknown JSP Pages

In Tomcat 3.1, the error message in response to a request for an unknown JSP
page would include the absolute disk file pathname of the corresponding file
which could not be found, which exposes sensitive information about how your
application is deployed.  The error message has been adjusted to include only
the context-relative path of the JSP page which could not be found.


6.6 Session ID Vulnerability

The algorithm used to calculate session identifiers for new sessions was
subject to attack by attempting to guess what the next session identifier will
be, and therefore hijack the session.  In addition, the generated identifier
exposed sensitive information (the number of sessions that have been created
since this web application was started.

To avoid these problems, the session identifier generation algorithm has been
replaced by the algorithm used in Tomcat 3.2, which is not subject to these
attacks, and does not expose session count information.


6.7 Server Shutdown Vulnerability

In Tomcat 3.1, it was possible to establish a remote network connection to the
AJP12 connector and cause Tomcat to shut itself down.  Now, this network
connection must be created from the same server that Tomcat is running on.

NOTE:  While this is more secure than Tomcat 3.1 (and mirrors the protection
provided by Tomcat 3.2), it is still vulnerable to attack by users who can
create socket connections from the server.  Suitable use of firewalls and
"TCP Wrappers" applications are suggested around the APJ12 port.
2000-12-13 03:49:30 +00:00
jwise
878ed232c1 Fix typo. 2000-10-18 18:12:22 +00:00
wiz
70c6348982 add RCS Ids 2000-09-03 13:38:49 +00:00
wiz
3a81981f42 move line to silence pkglint 2000-09-03 13:38:31 +00:00
wiz
eb21550097 We don't need tomcat.sh.orig installed, so delete it. 2000-08-28 14:28:56 +00:00
jwise
4095b265f7 We stopped setting ${PREFIX} several revs ago. Get rid of NO_MTREE= 2000-05-31 23:44:58 +00:00