4 files changed, 373 insertions, 13 deletions

diff --git a/security/burpsuite/Makefile b/security/burpsuite/Makefile
index 0c7a667ff2c7..9c764b1ee020 100644
--- a/security/burpsuite/Makefile
+++ b/security/burpsuite/Makefile
@@ -6,12 +6,13 @@
 #
 
 PORTNAME=	burpsuite
-PORTVERSION=	1.3.03
+PORTVERSION=	1.4.01
 CATEGORIES=	security java
-MASTER_SITES=	http://www.portswigger.net/suite/
+MASTER_SITES=	http://www.portswigger.net/burp/ \
+		${MASTER_SITE_LOCAL:S,%SUBDIR%,sbz,}
 DISTNAME=	${PORTNAME}_v${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	sbz@FreeBSD.org
 COMMENT=	Burp Suite is an integrated platform for testing web applications
 
 USE_ZIP=	YES
@@ -20,17 +21,21 @@ JAVA_VERSION=	1.5+
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/${DISTNAME}
 
-PLIST_FILES=	bin/${PORTNAME} %%JAVAJARDIR%%/${DISTNAME}.jar
+PLIST_FILES=	bin/${PORTNAME} \
+		%%JAVAJARDIR%%/${DISTNAME}.jar
 
-#.if !defined(NOPORTDOCS)
-PORTDOCS=	readme_-_running_burp.txt terms_and_conditions.txt
-#.endif
+PORTDOCS=	readme_-_running_burp.txt
 
 .include <bsd.port.pre.mk>
 
+# Get BSFEL agreement
+.if !defined(PACKAGE_BUILDING)
+pre-extract:
+	@${SH} ${FILESDIR}/license.sh
+.endif
+
 post-extract:
-	${MV} ${WRKSRC}/readme\ -\ running\ burp.txt ${WRKSRC}/readme_-_running_burp.txt
-	${MV} ${WRKSRC}/terms\ and\ conditions.txt ${WRKSRC}/terms_and_conditions.txt
+	@${MV} ${WRKSRC}/readme\ -\ running\ burp.txt ${WRKSRC}/readme_-_running_burp.txt
 
 pre-install:
 	@${SED} -e 's:%%PATH%%:${JAVAJARDIR}/:' \
@@ -44,7 +49,6 @@ do-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/readme_-_running_burp.txt ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/terms_and_conditions.txt ${DOCSDIR}
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/security/burpsuite/distinfo b/security/burpsuite/distinfo
index 208ba4b25284..0a3a47f4b2d7 100644
--- a/security/burpsuite/distinfo
+++ b/security/burpsuite/distinfo
@@ -1,2 +1,2 @@
-SHA256 (burpsuite_v1.3.03.zip) = 876cc1470dff41e3fbc4ae089f17d71629e05093ba915298e61e26fd00680d6b
-SIZE (burpsuite_v1.3.03.zip) = 2616070
+SHA256 (burpsuite_v1.4.01.zip) = a98148b379442c96202d70180f45c415fc46d5be2e84633799af9d1d43d4132d
+SIZE (burpsuite_v1.4.01.zip) = 2980829
diff --git a/security/burpsuite/files/burpsuite.sh b/security/burpsuite/files/burpsuite.sh
index 29cff364b72e..2c15ee7270c4 100644
--- a/security/burpsuite/files/burpsuite.sh
+++ b/security/burpsuite/files/burpsuite.sh
@@ -4,4 +4,4 @@
 #
 
 cd %%PATH%%
-exec %%JAVA_CMD%% -jar -Xmx256m %%BURP%% "$@"
+exec %%JAVA_CMD%% -jar -Xmx512m %%BURP%% "$@"
diff --git a/security/burpsuite/files/license.sh b/security/burpsuite/files/license.sh
new file mode 100644
index 000000000000..2d84c26000e3
--- /dev/null
+++ b/security/burpsuite/files/license.sh
@@ -0,0 +1,356 @@
+#!/bin/sh
+# $FreeBSD$
+
+# License agreement
+more << EOF_LICENSE
+Burpuite Free Edition Licence Agreement
+Version 1.4.01
+
+This licence agreement (Licence) is a legal agreement between you (Licensee or
+you) and PORTSWIGGER LTD of 6 Altenburg Gardens, London SW11 1JJ (Licensor or
+we) for a suite of tools designed for web application security testers (Burp
+Suite Free Edition or Software), which includes computer software, and the
+online documentation current at the date of the download of this Licence
+(Documentation).
+
+BURP SUITE FREE EDITION REQUIRES A COMPUTER WITH A MINIMUM OF 2GB OF MEMORY AND
+THE OFFICIAL JAVA RUNTIME ENVIRONMENT (VERSION 1.5 OR LATER). BY INSTALLING THE
+SOFTWARE YOU AGREE TO THE TERMS OF THIS LICENCE AND THE TERMS AND CONDITIONS OF
+THE LICENSOR WHICH WILL BIND YOU AND YOUR EMPLOYEES. IF YOU DO NOT AGREE TO THE
+TERMS OF THIS LICENCE AND THE TERMS AND CONDITIONS, WE ARE UNWILLING TO LICENSE
+THE SOFTWARE TO YOU AND YOU MUST DISCONTINUE THE INSTALLATION PROCESS NOW. IN
+THIS CASE THE INSTALLATION WILL TERMINATE.
+
+WARNING: BURP SUITE FREE EDITION IS DESIGNED TO TEST FOR SECURITY FLAWS AND CAN
+DO DAMAGE TO TARGET SYSTEMS DUE TO THE NATURE OF ITS FUNCTIONALITY. TESTING FOR
+SECURITY FLAWS INHERENTLY INVOLVES INTERACTING WITH TARGETS IN NON-STANDARD
+WAYS WHICH CAN CAUSE PROBLEMS IN SOME VULNERABLE TARGETS. YOU MUST TAKE DUE
+CARE WHEN USING THE SOFTWARE, YOU MUST READ ALL DOCUMENTATION BEFORE USE, YOU
+SHOULD BACK UP TARGET SYSTEMS BEFORE USE AND YOU SHOULD NOT USE THE SOFTWARE ON
+PRODUCTION SYSTEMS OR OTHER SYSTEMS FOR WHICH THE RISK OF DAMAGE IS NOT
+ACCEPTED BY YOU.
+
+1.    GRANT AND SCOPE OF LICENCE
+
+1.1    In consideration of you agreeing to abide by the terms of this Licence,
+the Licensor hereby grants to you a non-exclusive, non-transferable licence to
+use the Software and the Documentation on the terms of this Licence.
+
+1.2    You may either:
+
+1.2.1    download, install and use the Software for your internal business
+purposes (which includes bespoke client consultancy, if appropriate) only; and
+
+1.2.1.1    make one copy of the Software for back-up purposes only, provided
+that this is necessary for the activities permitted under condition 1.2.1;
+
+1.2.1.2    receive and use any free supplementary software code or update of
+the Software incorporating "patches" and corrections of errors as may be
+provided by the Licensor from time to time on the basis that they are governed
+by the terms of this Licence;
+
+1.2.1.3    use any Documentation in support of the use permitted under
+condition 1.2.1 and make such numbers of copies of the Documentation as are
+reasonably necessary for its lawful use; and
+
+1.2.1.4    analyse the behaviour and performance of the documented
+functionality of the Software and disclose the findings of such analysis to any
+party provided that such findings are provided simultaneously and in identical
+form to the Licensor; or
+
+1.2.2    transfer the Software to an end-user only provided that you procure
+that the end-user is bound by the terms of this Licence Agreement for the
+benefit of the Licensor and that you indemnify the Licensor against all costs
+(including legal costs) charges and expenses incurred by the Licensor as a
+result of the failure by you to comply with the provisions of this paragraph
+and/or the transfer by you of the Software to the end-user.
+
+1.3    If you are an end-user who has obtained lawfully the Software other than
+by direct acquisition from the Licensor you may carry out the functions on the
+terms specified in paragraph 1.3.1 above and, during the Licence Period, you
+agree to be bound by this Licence Agreement directly in favour of the Licensor.
+
+2.    LICENSEE'S WARRANTY AND UNDERTAKINGS
+
+2.1    You warrant that you are not acquiring the Software as a consumer, but
+will be using the software in your business.
+
+2.2    Except as expressly set out in this Licence or as permitted by any local
+law, you undertake:
+
+2.2.1    not to use the Software or the Documentation for any unlawful
+purposes, particularly as Burp Suite Free Edition contains functionality that
+can be used to attack and compromise computer systems.
+
+2.2.2    to obtain all necessary authorisations from system owners prior to
+using Burp Suite Free Edition thereon;
+
+2.2.3    unless agreed by the Licensor in writing not to copy the Software or
+Documentation except where such copying is incidental to normal use of the
+Software, or where it is necessary for the purpose of back-up or operational
+security;
+
+2.2.4    not to rent, lease, sub-license, loan, translate, merge, adapt, vary
+or modify the Software or Documentation;
+
+2.2.5    not to make alterations to, or modifications of, the whole or any part
+of the Software, nor permit the Software or any part of it to be combined with,
+or become incorporated in, any other programs;
+
+2.2.6    not to disassemble, decompile, reverse engineer or create derivative
+works based on, the whole or any part of the Software nor attempt to do any
+such thing except to the extent that (by virtue of section 296A of the
+Copyright, Designs and Patents Act 1988) such actions cannot be prohibited
+because they are essential for the purpose of achieving inter-operability of
+the Software with another software program, and provided that the information
+obtained by you during such activities:
+
+2.2.6.1    is used only for the purpose of achieving inter-operability of the
+Software with another software program; and
+
+2.2.6.2    is not unnecessarily disclosed or communicated without the
+Licensor's prior written consent to any third party; and
+
+2.2.6.3    is not used to create any software which is substantially similar to
+the Software;
+
+2.2.7    to supervise and control use of the Software and ensure that the
+Software is used by your employees and representatives in accordance with the
+terms of this Licence;
+
+2.2.8    to replace the current version of the Software with any updated or
+upgraded version or new release provided by the Licensor under the terms of
+this Licence immediately on receipt;
+
+2.2.9    to include the copyright notice of the Licensor on all entire and
+partial copies you make of the Software on any medium;
+
+2.2.10    not to provide or otherwise make available the Software in whole or
+in part (including but not limited to program listings, object and source
+program listings, object code and source code), in any form to any person other
+than your employees without prior written consent from the Licensor;
+
+2.2.11    unless specifically authorised by us in writing, not to use the
+Software as part of an automated service offering to third parties;
+
+2.2.12    not to engage in any activity, practice or conduct which would
+constitute an offence under sections 1, 2, or 6 of the Bribery Act 2010, if
+such activity, practice or conduct had been carried out in the UK;
+
+2.2.13    to indemnify and keep indemnified the Licensor against all costs
+(including legal costs), charges and expenses incurred by the Licensor as a
+result of the failure by you to comply with the provisions of this Licence
+Agreement.
+
+3.    SUPPORT AND UPGRADES
+
+Downloading Burp Suite Free Edition does not entitle you to any product
+support. Although reasonable efforts may be made to support you if you are
+experiencing problems or bugs or require feature enhancements, any support will
+be provided at the Licensor’s sole discretion.
+
+4.    INTELLECTUAL PROPERTY RIGHTS
+
+4.1    You acknowledge that all intellectual property rights in the Software
+and the Documentation anywhere in the world belong to the Licensor, that rights
+in the Software are licensed (not sold) to you, and that you have no rights in,
+or to, the Software or the Documentation other than the right to use them in
+accordance with the terms of this Licence.
+
+4.2    You acknowledge that you have no right to have access to the Software in
+source code form
+
+4.3    The integrity of this Software is protected by technical protection
+measures (TPM) so that the intellectual property rights, including copyright,
+in the Software of the Licensor are not misappropriated. You must not attempt
+in any way to remove or circumvent any such TPM, nor apply or manufacture for
+sale or hire, import, distribute, sell or let for hire, offer or expose for
+sale or hire, advertise for sale or hire or have in your possession for private
+or commercial purposes any means the sole intended purpose of which is to
+facilitate the unauthorised removal or circumvention of such TPM.
+
+5.    LICENSOR'S WARRANTY
+
+5.1    The Licensor warrants that for a period of 90 days from the download of
+the Software (Warranty Period) the Software will, when properly used, perform
+substantially in accordance with the functions described in the Documentation
+(provided that the Software is properly used on the computer and with the
+runtime environment for which it was designed as referred to herein).
+
+5.2    You acknowledge that the Software has not been developed to meet your
+individual requirements, and that it is therefore your responsibility to ensure
+that the facilities and functions of the Software as described in the
+Documentation meet your requirements.
+
+5.3    You acknowledge that the Software may not be free of bugs or errors, and
+agree that the existence of minor errors shall not constitute a breach of this
+Licence.
+
+5.4    If, within the Warranty Period, you notify the Licensor in writing of
+any defect or fault in the Software in consequence of which it fails to perform
+substantially in accordance with the Documentation, and such defect or fault
+does not result from you having amended the Software or used it in
+contravention of the terms of this Licence, the Licensor will, at its sole
+option, either repair or replace the Software, provided that you make available
+all the information that may be necessary to help the Licensor to remedy the
+defect or fault, including sufficient information to enable the Licensor to
+recreate the defect or fault.
+
+6.    LICENSOR'S LIABILITY
+
+YOUR ATTENTION IS DRAWN PARTICULARLY TO THE PROVISIONS OF THIS CONDITION
+
+6.1    Nothing in this Licence shall limit or exclude the liability of either
+party for death or personal injury resulting from negligence, fraud, fraudulent
+misrepresentation.
+
+6.2    Subject to condition 6.1, the Licensor's liability for losses suffered
+by you arising out of or in connection with this agreement (including any
+liability for the acts or omissions of its employees, agents and
+subcontractors), whether arising in contract, rt (including negligence),
+misrepresentation or otherwise, shall not include liability for:
+
+6.2.1    loss of turnover, sales oress profits or contracts;
+
+6.2.3    business interruption;
+
+6.2.4    loss of the use of money or anticipated savings;
+
+6.2.5    f opportunity, goodwill or reputation;
+
+6.2.7    loss of, damage to or corruption of software or data; or
+
+6.2.8    any indirectntial loss or damage of any kind howsoever arising and
+whether caused by tort (including negligence), breach of contract or othet
+claims for loss of or damage to your tangible property that fall within the
+terms of condition 5 or any other claims for direc by any of categories 6.2.1
+to 6.2.8 inclusive of this condition 6.2.
+
+6.3    Subject to condition 6.1, the Licensor's maximum ability under or in
+connection with this Licence, or any collateral contract, whether in contract,
+tort (including negligence) orse, shall be limited to £50.
+
+6.4    Subject to condition 6.1, condition 6.2 and condition 6.3, the
+Licensor's liability for ingement of third-party intellectual property rights
+shall be limited to breaches of rights subsisting in the UK.
+
+6.5    This Licthe full extent of the Licensor's obligations and liabilities in
+respect of the supply of the Software. In particular, there arethe Licensor
+except as specifically stated in this Licence. Any condition, warranty,
+representation or other term concerning theplied into, or incorporated in, this
+Licence, or any collateral contract, whether by statute, common law or
+otherwise, is hereby  TERMINATION
+
+7.1    The Licensor may terminate this Licence immediately by written notice to
+you if you commit a material or pail to remedy (if remediable) within 14 days
+after the service of written notice requiring you to do so.
+
+7.2    Upon terminatior any reason:
+
+7.2.1    all rights granted to you under this Licence shall cease;
+
+7.2.2    you must cease all activities author Licence; and
+
+7.2.3    you must immediately delete or remove the Software from all computer
+equipment in your possession, and iely destroy or return to the Licensor (at
+the Licensor's option) all copies of the Software then in your possession,
+custody or ntrol and, in the case of destruction, certify to the Licensor that
+you have done so.
+
+8.    TRANSFER OF RIGHTS AND OBLIGATIONS s Licence is binding on you and us,
+and on our respective successors and assigns.
+
+8.2    You may not transfer, assign, charge ocence, or any of your rights or
+obligations arising under it, without our prior written consent.
+
+8.3    We may transfer, assignose of this Licence, or any of our rights or
+obligations arising under it, at any time during the term of the Licence.
+
+9.    NOy you to us must be given to PortSwigger Ltd at mail@portswigger.net or
+6 Altenburg Gardens London SW11 1JJ. We may give notice e e-mail or postal
+address you provided to us when downloading the Software or provided in other
+communications from you to us.  will be deemed received and properly served
+immediately when posted on our website, 24 hours after an e-mail is sent, or
+three ter the date of posting of any letter. In proving the service of any
+notice, it will be sufficient to prove, in the case of a leer, that such letter
+was properly addressed, stamped and placed in the post and, in the case of an
+e-mail, that such e-mail was e specified e-mail address of the addressee.
+
+10.    EVENTS OUTSIDE OUR CONTROL
+
+10.1    We will not be liable or responsible foy failure to perform, or delay
+in performance of, any of our obligations under this Licence that is caused by
+events outside ourble control (Force Majeure Event).
+
+10.2    A Force Majeure Event includes any act, event, non-happening, omission
+or accident be control and includes in particular (without limitation) the
+following:
+
+10.2.1    strikes, lock-outs or other industrial actioterrorist attack or
+threat of terrorist attack, war (whether declared or not) or threat or
+preparation for war;
+
+10.2.3    fire,ke, subsidence, epidemic or other natural disaster;
+
+10.2.4    impossibility of the use of railways, shipping, aircraft, motor
+trivate telecommunications networks;
+
+10.2.6    the acts, decrees, legislation, regulations or restrictions of any
+government.
+
+1nues, and we will have an extension of time for performance for the duration
+of that period. We will use our reasonable endeavoua solution by which our
+obligations under this Licence may be performed despite the Force Majeure
+Event.
+
+11.    WAIVER
+
+11.1   o insist upon strict performance of any of your obligations under this
+Licence, or if we fail to exercise any of the rights or rtitled under this
+Licence, this shall not constitute a waiver of such rights or remedies and
+shall not relieve you from compliantute a waiver of any subsequent default.
+
+11.3    No waiver by us of any of these terms and conditions shall be effective
+unlessu in writing.
+
+12.    SEVERABILITY
+
+If any of the terms of this Licence are determined by any competent authority
+to be invalid,e to any extent, such term, condition or provision will to that
+extent be severed from the remaining terms, conditions and proviMENT
+
+13.1    This Licence and any document expressly referred to in it represents
+the entire agreement between us in relation tre and the Documentation and
+supersedes any prior agreement, understanding or arrangement between us,
+whether oral or in writing each acknowledge that, in entering into this
+Licence, neither of us has relied on any representation, undertaking or promise
+gi or written in negotiations between us prior to entering into this Licence
+except as expressly stated in this Licence.
+
+13.3    l have any remedy in respect of any untrue statement made by the other,
+whether orally or in writing, prior to the date we enter's only remedy shall be
+for breach of contract as provided in these terms and conditions.
+
+14.    LAW AND JURISDICTION
+
+This Lic formation (including non-contractual disputes or claims) shall be
+governed by and construed in accordance with English law and tted to the
+exclusive jurisdiction of the English courts.
+EOF_LICENSE
+
+agreed=
+while [ x$agreed = x ]; do
+        echo
+        echo "Do you agree to the above license terms? [yes or no] "
+        read reply leftover
+        case $reply in
+                y* | Y*)
+                        agreed=1
+                        ;;
+                n* | n*)
+                        echo
+                        echo "If you don't agree to the license you can't use this software"
+                        exit 1
+                        ;;
+        esac
+done