Author: markt
Date: Tue Dec 9 20:46:44 2014
New Revision: 1644174
URL: http://svn.apache.org/r1644174
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=57285
Make sure Windows uninstaller runs with the required elevated privileges.
Modified:
tomcat/tc8.0.x/trunk/ (props changed)
tomcat/tc8.0.x/trunk/BUILDING.txt
tomcat/tc8.0.x/trunk/res/tomcat.nsi
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc8.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Dec 9 20:46:44 2014
@@ -1 +1 @@
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1643002,1643045,1643054-1643055,1643066,1643121,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017
+/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1643002,1643045,1643054-1643055,1643066,1643121,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169
Modified: tomcat/tc8.0.x/trunk/BUILDING.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/BUILDING.txt?rev=1644174&r1=1644173&r2=1644174&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/BUILDING.txt (original)
+++ tomcat/tc8.0.x/trunk/BUILDING.txt Tue Dec 9 20:46:44 2014
@@ -266,7 +266,14 @@ You can build them by using the followin
You will be prompted for the GPG passphrase when the release build
starts, unless "gpg.passphrase" property is set.
- 2. Build the release:
+ 2. If building the Windows installer
+
+ If running the build in a UAC enabled environment, building the Windows
+ installer requires elevated privileges. The simplest way to do this is to
+ open the command prompt used for the build with the "Run as administrator"
+ option.
+
+ 3. Build the release:
cd ${tomcat.source}
ant release
Modified: tomcat/tc8.0.x/trunk/res/tomcat.nsi
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/res/tomcat.nsi?rev=1644174&r1=1644173&r2=1644174&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/res/tomcat.nsi (original)
+++ tomcat/tc8.0.x/trunk/res/tomcat.nsi Tue Dec 9 20:46:44 2014
@@ -16,7 +16,6 @@
; Tomcat script for Nullsoft Installer
!ifdef UNINSTALLONLY
- RequestExecutionLevel user
OutFile "tempinstaller.exe"
!else
OutFile tomcat-installer.exe
Modified: tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml?rev=1644174&r1=1644173&r2=1644174&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Tue Dec 9 20:46:44 2014
@@ -257,6 +257,10 @@
1643813 to pick up additional fixes since the 2.2 release including
one for a possible infinite loop. (markt)
</fix>
+ <fix>
+ <bug>57285</bug>: Restore the manifest entry that marks the Windows
+ uninstaller application as requiring elevated privileges. (markt)
+ </fix>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
