December 2015 - Wine-Commits

Sebastian Lackner : ntdll/tests: Add more tests for SystemHandleInformation.
by Alexandre Julliard Dec. 24, 2015

Dec. 24, 2015

Module: wine Branch: master Commit: e4e906c871ffe3e4acc055d5158a8b971f212aea URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4e906c871ffe3e4acc055d51… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Dec 21 12:51:49 2015 +0100 ntdll/tests: Add more tests for SystemHandleInformation. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/info.c | 54 +++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 43 insertions(+), 11 deletions(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index a521447..3219dbb 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -474,30 +474,62 @@ static void test_query_module(void) static void test_query_handle(void) { NTSTATUS status; - ULONG ReturnLength; + ULONG ExpectedLength, ReturnLength; ULONG SystemInformationLength = sizeof(SYSTEM_HANDLE_INFORMATION); SYSTEM_HANDLE_INFORMATION* shi = HeapAlloc(GetProcessHeap(), 0, SystemInformationLength); + HANDLE EventHandle; + BOOL found; + INT i; + + EventHandle = CreateEventA(NULL, FALSE, FALSE, NULL); + ok( EventHandle != NULL, "CreateEventA failed %u\n", GetLastError() ); /* Request the needed length : a SystemInformationLength greater than one struct sets ReturnLength */ + ReturnLength = 0xdeadbeef; status = pNtQuerySystemInformation(SystemHandleInformation, shi, SystemInformationLength, &ReturnLength); todo_wine ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status); + ok( ReturnLength != 0xdeadbeef, "Expected valid ReturnLength\n" ); SystemInformationLength = ReturnLength; shi = HeapReAlloc(GetProcessHeap(), 0, shi , SystemInformationLength); + + ReturnLength = 0xdeadbeef; status = pNtQuerySystemInformation(SystemHandleInformation, shi, SystemInformationLength, &ReturnLength); - if (status != STATUS_INFO_LENGTH_MISMATCH) /* vista */ + while (status == STATUS_INFO_LENGTH_MISMATCH) /* Vista / 2008 */ { - ok( status == STATUS_SUCCESS, - "Expected STATUS_SUCCESS, got %08x\n", status); + SystemInformationLength *= 2; + shi = HeapReAlloc(GetProcessHeap(), 0, shi, SystemInformationLength); + status = pNtQuerySystemInformation(SystemHandleInformation, shi, SystemInformationLength, &ReturnLength); + } + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status ); + ExpectedLength = FIELD_OFFSET(SYSTEM_HANDLE_INFORMATION, Handle[shi->Count]); + todo_wine ok( ReturnLength == ExpectedLength || broken(ReturnLength == ExpectedLength - sizeof(DWORD)), /* Vista / 2008 */ + "Expected length %u, got %u\n", ExpectedLength, ReturnLength ); + todo_wine ok( shi->Count > 1, "Expected more than 1 handle, got %u\n", shi->Count ); + for (i = 0, found = FALSE; i < shi->Count && !found; i++) + found = (shi->Handle[i].OwnerPid == GetCurrentProcessId()) && + ((HANDLE)(ULONG_PTR)shi->Handle[i].HandleValue == EventHandle); + todo_wine ok( found, "Expected to find event handle in handle list\n" ); + + CloseHandle(EventHandle); - /* Check if we have some return values */ - trace("Number of Handles : %d\n", shi->Count); - todo_wine - { - /* our implementation is a stub for now */ - ok( shi->Count > 1, "Expected more than 1 handles, got (%d)\n", shi->Count); - } + ReturnLength = 0xdeadbeef; + status = pNtQuerySystemInformation(SystemHandleInformation, shi, SystemInformationLength, &ReturnLength); + while (status == STATUS_INFO_LENGTH_MISMATCH) /* Vista / 2008 */ + { + SystemInformationLength *= 2; + shi = HeapReAlloc(GetProcessHeap(), 0, shi, SystemInformationLength); + status = pNtQuerySystemInformation(SystemHandleInformation, shi, SystemInformationLength, &ReturnLength); } + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status ); + for (i = 0, found = FALSE; i < shi->Count && !found; i++) + found = (shi->Handle[i].OwnerPid == GetCurrentProcessId()) && + ((HANDLE)(ULONG_PTR)shi->Handle[i].HandleValue == EventHandle); + ok( !found, "Unexpectedly found event handle in handle list\n" ); + + status = pNtQuerySystemInformation(SystemHandleInformation, NULL, SystemInformationLength, &ReturnLength); + ok( status == STATUS_ACCESS_VIOLATION, "Expected STATUS_ACCESS_VIOLATION, got %08x\n", status ); + HeapFree( GetProcessHeap(), 0, shi); }

1 0

Sebastian Lackner : advapi32: Add stubs for RegCreateKeyTransacted[A/W] functions.
by Alexandre Julliard Dec. 24, 2015

Dec. 24, 2015

Module: wine Branch: master Commit: 723146ca6d3953ed0465e189ab8ead1d9cbce4bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=723146ca6d3953ed0465e189a… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Dec 23 17:18:38 2015 +0100 advapi32: Add stubs for RegCreateKeyTransacted[A/W] functions. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/advapi32.spec | 4 ++-- dlls/advapi32/registry.c | 25 +++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index ff2b0de..36f176b 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -581,8 +581,8 @@ @ stdcall RegCreateKeyExA(long str long ptr long long ptr ptr ptr) @ stdcall RegCreateKeyExW(long wstr long ptr long long ptr ptr ptr) @ stdcall RegCreateKeyW(long wstr ptr) -# @ stub RegCreateKeyTransactedA -# @ stub RegCreateKeyTransactedW +@ stdcall RegCreateKeyTransactedA(long str long ptr long long ptr ptr ptr long ptr) +@ stdcall RegCreateKeyTransactedW(long wstr long ptr long long ptr ptr ptr long ptr) @ stdcall RegDeleteKeyA(long str) @ stdcall RegDeleteKeyExA(long str long long) @ stdcall RegDeleteKeyExW(long wstr long long) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index 4f33fe6..8317698 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -479,6 +479,31 @@ LSTATUS WINAPI RegCreateKeyA( HKEY hkey, LPCSTR lpSubKey, PHKEY phkResult ) } +/****************************************************************************** + * RegCreateKeyTransactedW [ADVAPI32.@] + */ +LSTATUS WINAPI RegCreateKeyTransactedW( HKEY hkey, LPCWSTR name, DWORD reserved, LPWSTR class, + DWORD options, REGSAM access, SECURITY_ATTRIBUTES *sa, + PHKEY retkey, LPDWORD dispos, HANDLE transaction, PVOID reserved2 ) +{ + FIXME( "(%p,%s,%u,%s,%u,%u,%p,%p,%p,%p,%p): stub\n", hkey, debugstr_w(name), reserved, + debugstr_w(class), options, access, sa, retkey, dispos, transaction, reserved2 ); + return ERROR_CALL_NOT_IMPLEMENTED; +} + + +/****************************************************************************** + * RegCreateKeyTransactedA [ADVAPI32.@] + */ +LSTATUS WINAPI RegCreateKeyTransactedA( HKEY hkey, LPCSTR name, DWORD reserved, LPSTR class, + DWORD options, REGSAM access, SECURITY_ATTRIBUTES *sa, + PHKEY retkey, LPDWORD dispos, HANDLE transaction, PVOID reserved2 ) +{ + FIXME( "(%p,%s,%u,%s,%u,%u,%p,%p,%p,%p,%p): stub\n", hkey, debugstr_a(name), reserved, + debugstr_a(class), options, access, sa, retkey, dispos, transaction, reserved2 ); + return ERROR_CALL_NOT_IMPLEMENTED; +} + /****************************************************************************** * RegOpenKeyExW [ADVAPI32.@]

1 0

Alexandre Julliard : Import of upstream bugzilla release 4.4.11.
by Alexandre Julliard Dec. 24, 2015

Dec. 24, 2015

Module: bugzilla Branch: master Commit: 6f9bf887fbf23b4c5ca77b6ad2043acd5f49bf63 URL: http://source.winehq.org/git/bugzilla.git/?a=commit;h=6f9bf887fbf23b4c5ca77… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 24 14:33:49 2015 +0100 Import of upstream bugzilla release 4.4.11. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .htaccess | 7 +--- Bugzilla/Constants.pm | 2 +- Bugzilla/Install/Filesystem.pm | 45 ++++------------------- Bugzilla/Template.pm | 3 ++ Bugzilla/WebService/Product.pm | 1 + docs/bugzilla.ent | 12 +++--- docs/bugzilla.ent.tmpl | 4 +- docs/en/xml/bugzilla.ent | 12 +++--- docs/en/xml/installation.xml | 2 +- mod_perl.pl | 2 +- showdependencygraph.cgi | 11 ++++-- template/en/default/pages/release-notes.html.tmpl | 19 ++++++++++ 12 files changed, 55 insertions(+), 65 deletions(-) diff --git a/.htaccess b/.htaccess index 8b50250..22e6658 100644 --- a/.htaccess +++ b/.htaccess @@ -5,12 +5,7 @@ Deny from all </IfVersion> <IfVersion >= 2.4> - <IfModule mod_perl.c> - Deny from all - </IfModule> - <IfModule !mod_perl.c> - Require all denied - </IfModule> + Require all denied </IfVersion> </IfModule> <IfModule !mod_version.c> diff --git a/Bugzilla/Constants.pm b/Bugzilla/Constants.pm index 64356c0..f35e416 100644 --- a/Bugzilla/Constants.pm +++ b/Bugzilla/Constants.pm @@ -182,7 +182,7 @@ use Memoize; # CONSTANTS # # Bugzilla version -use constant BUGZILLA_VERSION => "4.4.10"; +use constant BUGZILLA_VERSION => "4.4.11"; # Location of the remote and local XML files to track new releases. use constant REMOTE_FILE => 'http://updates.bugzilla.org/bugzilla-update.xml'; diff --git a/Bugzilla/Install/Filesystem.pm b/Bugzilla/Install/Filesystem.pm index 457f66f..eaca1f8 100644 --- a/Bugzilla/Install/Filesystem.pm +++ b/Bugzilla/Install/Filesystem.pm @@ -48,12 +48,7 @@ use constant HT_DEFAULT_DENY => <<EOT; Deny from all </IfVersion> <IfVersion >= 2.4> - <IfModule mod_perl.c> - Deny from all - </IfModule> - <IfModule !mod_perl.c> - Require all denied - </IfModule> + Require all denied </IfVersion> </IfModule> <IfModule !mod_version.c> @@ -349,12 +344,7 @@ EOT Allow from all </IfVersion> <IfVersion >= 2.4> - <IfModule mod_perl.c> - Allow from all - </IfModule> - <IfModule !mod_perl.c> - Require all granted - </IfModule> + Require all granted </IfVersion> </IfModule> <IfModule !mod_version.c> @@ -368,12 +358,7 @@ EOT Deny from all </IfVersion> <IfVersion >= 2.4> - <IfModule mod_perl.c> - Deny from all - </IfModule> - <IfModule !mod_perl.c> - Require all denied - </IfModule> + Require all denied </IfVersion> </IfModule> <IfModule !mod_version.c> @@ -393,14 +378,8 @@ EOT Deny from all </IfVersion> <IfVersion >= 2.4> - <IfModule mod_perl.c> - Allow from 192.20.225.0/24 - Deny from all - </IfModule> - <IfModule !mod_perl.c> - Require ip 192.20.225.0/24 - Require all denied - </IfModule> + Require ip 192.20.225.0/24 + Require all denied </IfVersion> </IfModule> <IfModule !mod_version.c> @@ -416,12 +395,7 @@ EOT Allow from all </IfVersion> <IfVersion >= 2.4> - <IfModule mod_perl.c> - Allow from all - </IfModule> - <IfModule !mod_perl.c> - Require all granted - </IfModule> + Require all granted </IfVersion> </IfModule> <IfModule !mod_version.c> @@ -435,12 +409,7 @@ EOT Deny from all </IfVersion> <IfVersion >= 2.4> - <IfModule mod_perl.c> - Deny from all - </IfModule> - <IfModule !mod_perl.c> - Require all denied - </IfModule> + Require all denied </IfVersion> </IfModule> <IfModule !mod_version.c> diff --git a/Bugzilla/Template.pm b/Bugzilla/Template.pm index 72d899c..cfcbc66 100644 --- a/Bugzilla/Template.pm +++ b/Bugzilla/Template.pm @@ -719,6 +719,9 @@ sub create { { my ($var) = @_; $var = ' ' . $var if substr($var, 0, 1) eq '='; + # backslash is not special to CSV, but it can be used to confuse some browsers... + # so we do not allow it to happen. We only do this for logged-in users. + $var =~ s/\\/\x{FF3C}/g if Bugzilla->user->id; $var =~ s/\"/\"\"/g; if ($var !~ /^-?(\d+\.)?\d*$/) { $var = "\"$var\""; diff --git a/Bugzilla/WebService/Product.pm b/Bugzilla/WebService/Product.pm index 1c8d75b..e383cb5 100644 --- a/Bugzilla/WebService/Product.pm +++ b/Bugzilla/WebService/Product.pm @@ -28,6 +28,7 @@ use constant PUBLIC_METHODS => qw( get get_accessible_products get_enterable_products + get_products get_selectable_products update ); diff --git a/docs/bugzilla.ent b/docs/bugzilla.ent index 34b6472..5a9e044 100644 --- a/docs/bugzilla.ent +++ b/docs/bugzilla.ent @@ -1,5 +1,5 @@ -<!ENTITY bz-ver "4.4.10"> -<!ENTITY bz-date "2015-09-10"> +<!ENTITY bz-ver "4.4.11"> +<!ENTITY bz-date "2015-12-22"> <!ENTITY current-year "2015"> <!ENTITY min-perl-ver "5.8.1"> @@ -52,11 +52,11 @@ <!ENTITY min-io-scalar-ver "any">  -<!ENTITY min-dbd-mysql-ver "4.001"> -<!ENTITY min-mysql-ver "5.0.15"> -<!ENTITY min-dbd-oracle-ver "1.19"> -<!ENTITY min-oracle-ver "10.02.0"> <!ENTITY min-dbd-pg-ver "2.7.0"> <!ENTITY min-pg-ver "8.03.0000"> +<!ENTITY min-dbd-mysql-ver "4.001"> +<!ENTITY min-mysql-ver "5.0.15"> <!ENTITY min-dbd-sqlite-ver "1.29"> <!ENTITY min-sqlite-ver "3.6.22"> +<!ENTITY min-dbd-oracle-ver "1.19"> +<!ENTITY min-oracle-ver "10.02.0"> diff --git a/docs/bugzilla.ent.tmpl b/docs/bugzilla.ent.tmpl index cb37c0e..f81421a 100644 --- a/docs/bugzilla.ent.tmpl +++ b/docs/bugzilla.ent.tmpl @@ -1,5 +1,5 @@ -<!ENTITY bz-ver "4.4.10"> -<!ENTITY bz-date "2015-09-10"> +<!ENTITY bz-ver "4.4.11"> +<!ENTITY bz-date "2015-12-22"> <!ENTITY current-year "2015"> <!ENTITY min-perl-ver "5.8.1"> diff --git a/docs/en/xml/bugzilla.ent b/docs/en/xml/bugzilla.ent index 34b6472..5a9e044 100644 --- a/docs/en/xml/bugzilla.ent +++ b/docs/en/xml/bugzilla.ent @@ -1,5 +1,5 @@ -<!ENTITY bz-ver "4.4.10"> -<!ENTITY bz-date "2015-09-10"> +<!ENTITY bz-ver "4.4.11"> +<!ENTITY bz-date "2015-12-22"> <!ENTITY current-year "2015"> <!ENTITY min-perl-ver "5.8.1"> @@ -52,11 +52,11 @@ <!ENTITY min-io-scalar-ver "any">  -<!ENTITY min-dbd-mysql-ver "4.001"> -<!ENTITY min-mysql-ver "5.0.15"> -<!ENTITY min-dbd-oracle-ver "1.19"> -<!ENTITY min-oracle-ver "10.02.0"> <!ENTITY min-dbd-pg-ver "2.7.0"> <!ENTITY min-pg-ver "8.03.0000"> +<!ENTITY min-dbd-mysql-ver "4.001"> +<!ENTITY min-mysql-ver "5.0.15"> <!ENTITY min-dbd-sqlite-ver "1.29"> <!ENTITY min-sqlite-ver "3.6.22"> +<!ENTITY min-dbd-oracle-ver "1.19"> +<!ENTITY min-oracle-ver "10.02.0"> diff --git a/docs/en/xml/installation.xml b/docs/en/xml/installation.xml index 5ef6be5..4bc2da7 100644 --- a/docs/en/xml/installation.xml +++ b/docs/en/xml/installation.xml @@ -1058,7 +1058,7 @@ SetEnv LD_LIBRARY_PATH /u01/app/oracle/product/10.2.0/lib/ AddHandler cgi-script .cgi Options +ExecCGI DirectoryIndex index.cgi index.html -AllowOverride Limit FileInfo Indexes Options +AllowOverride All </Directory> </programlisting> diff --git a/mod_perl.pl b/mod_perl.pl index ae15ae5..4794e28 100644 --- a/mod_perl.pl +++ b/mod_perl.pl @@ -73,7 +73,7 @@ PerlChildInitHandler "sub { Bugzilla::RNG::srand(); srand(); }" PerlCleanupHandler Apache2::SizeLimit Bugzilla::ModPerl::CleanupHandler PerlOptions +ParseHeaders Options +ExecCGI - AllowOverride Limit FileInfo Indexes Options + AllowOverride All DirectoryIndex index.cgi index.html </Directory> EOT diff --git a/showdependencygraph.cgi b/showdependencygraph.cgi index 4187bdd..00fd206 100755 --- a/showdependencygraph.cgi +++ b/showdependencygraph.cgi @@ -58,7 +58,7 @@ sub CreateImagemap { # Pick up bugid from the mapdata label field. Getting the title from # bugtitle hash instead of mapdata allows us to get the summary even # when showsummary is off, and also gives us status and resolution. - my $bugtitle = html_quote(clean_text($bugtitles{$bugid})); + my $bugtitle = $bugtitles{$bugid}; $map .= qq{<area alt="bug $bugid" name="bug$bugid" shape="rect" } . qq{title="$bugtitle" href="$url" } . qq{coords="$leftx,$topy,$rightx,$bottomy">\n}; @@ -176,13 +176,16 @@ foreach my $k (@bug_ids) { # Retrieve bug information from the database my ($stat, $resolution, $summary) = $dbh->selectrow_array($sth, undef, $k); + $vars->{'short_desc'} = $summary if ($k eq $cgi->param('id')); + # Resolution and summary are shown only if user can see the bug - if (!$user->can_see_bug($k)) { + if ($user->can_see_bug($k)) { + $summary = html_quote(clean_text($summary)); + } + else { $resolution = $summary = ''; } - $vars->{'short_desc'} = $summary if ($k eq $cgi->param('id')); - my @params; if ($summary ne "" && $cgi->param('showsummary')) { diff --git a/template/en/default/pages/release-notes.html.tmpl b/template/en/default/pages/release-notes.html.tmpl index d810688..7763413 100644 --- a/template/en/default/pages/release-notes.html.tmpl +++ b/template/en/default/pages/release-notes.html.tmpl @@ -45,6 +45,25 @@ <h2 id="v44_point">Updates in this 4.4.x Release</h2> +<h3>4.4.11</h3> + +<p>This release fixes two security issues. See the + <a href="https://www.bugzilla.org/security/4.2.15/">Security Advisory</a> + for details.</p> + +<p>This release also contains the following [% terms.bug %] fix:</p> + +<ul> + <li>mod_perl now works correctly with mod_access_compat turned off on + Apache 2.4. The (incorrect) fix implemented in [% terms.Bugzilla %] 4.4.9 + has been backed out. To regenerate the <kbd>.htaccess</kbd> files, you + must first delete all existing ones in subdirectories: + <pre>find . -mindepth 2 -name .htaccess -exec rm -f {} \;</pre> + You must then run <kbd>checksetup.pl</kbd> again to recreate them with + the correct syntax. + (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=1223790">[% terms.Bug %] 1223790</a>)</li> +</ul> + <h3>4.4.10</h3> <p>This release fixes one security issue. See the

1 0

Alexandre Julliard : Import of upstream bugzilla release 4.4.11.
by Alexandre Julliard Dec. 24, 2015

Dec. 24, 2015

Module: bugzilla Branch: upstream Commit: 6f9bf887fbf23b4c5ca77b6ad2043acd5f49bf63 URL: http://source.winehq.org/git/bugzilla.git/?a=commit;h=6f9bf887fbf23b4c5ca77… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 24 14:33:49 2015 +0100 Import of upstream bugzilla release 4.4.11. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .htaccess | 7 +--- Bugzilla/Constants.pm | 2 +- Bugzilla/Install/Filesystem.pm | 45 ++++------------------- Bugzilla/Template.pm | 3 ++ Bugzilla/WebService/Product.pm | 1 + docs/bugzilla.ent | 12 +++--- docs/bugzilla.ent.tmpl | 4 +- docs/en/xml/bugzilla.ent | 12 +++--- docs/en/xml/installation.xml | 2 +- mod_perl.pl | 2 +- showdependencygraph.cgi | 11 ++++-- template/en/default/pages/release-notes.html.tmpl | 19 ++++++++++ 12 files changed, 55 insertions(+), 65 deletions(-) diff --git a/.htaccess b/.htaccess index 8b50250..22e6658 100644 --- a/.htaccess +++ b/.htaccess @@ -5,12 +5,7 @@ Deny from all </IfVersion> <IfVersion >= 2.4> - <IfModule mod_perl.c> - Deny from all - </IfModule> - <IfModule !mod_perl.c> - Require all denied - </IfModule> + Require all denied </IfVersion> </IfModule> <IfModule !mod_version.c> diff --git a/Bugzilla/Constants.pm b/Bugzilla/Constants.pm index 64356c0..f35e416 100644 --- a/Bugzilla/Constants.pm +++ b/Bugzilla/Constants.pm @@ -182,7 +182,7 @@ use Memoize; # CONSTANTS # # Bugzilla version -use constant BUGZILLA_VERSION => "4.4.10"; +use constant BUGZILLA_VERSION => "4.4.11"; # Location of the remote and local XML files to track new releases. use constant REMOTE_FILE => 'http://updates.bugzilla.org/bugzilla-update.xml'; diff --git a/Bugzilla/Install/Filesystem.pm b/Bugzilla/Install/Filesystem.pm index 457f66f..eaca1f8 100644 --- a/Bugzilla/Install/Filesystem.pm +++ b/Bugzilla/Install/Filesystem.pm @@ -48,12 +48,7 @@ use constant HT_DEFAULT_DENY => <<EOT; Deny from all </IfVersion> <IfVersion >= 2.4> - <IfModule mod_perl.c> - Deny from all - </IfModule> - <IfModule !mod_perl.c> - Require all denied - </IfModule> + Require all denied </IfVersion> </IfModule> <IfModule !mod_version.c> @@ -349,12 +344,7 @@ EOT Allow from all </IfVersion> <IfVersion >= 2.4> - <IfModule mod_perl.c> - Allow from all - </IfModule> - <IfModule !mod_perl.c> - Require all granted - </IfModule> + Require all granted </IfVersion> </IfModule> <IfModule !mod_version.c> @@ -368,12 +358,7 @@ EOT Deny from all </IfVersion> <IfVersion >= 2.4> - <IfModule mod_perl.c> - Deny from all - </IfModule> - <IfModule !mod_perl.c> - Require all denied - </IfModule> + Require all denied </IfVersion> </IfModule> <IfModule !mod_version.c> @@ -393,14 +378,8 @@ EOT Deny from all </IfVersion> <IfVersion >= 2.4> - <IfModule mod_perl.c> - Allow from 192.20.225.0/24 - Deny from all - </IfModule> - <IfModule !mod_perl.c> - Require ip 192.20.225.0/24 - Require all denied - </IfModule> + Require ip 192.20.225.0/24 + Require all denied </IfVersion> </IfModule> <IfModule !mod_version.c> @@ -416,12 +395,7 @@ EOT Allow from all </IfVersion> <IfVersion >= 2.4> - <IfModule mod_perl.c> - Allow from all - </IfModule> - <IfModule !mod_perl.c> - Require all granted - </IfModule> + Require all granted </IfVersion> </IfModule> <IfModule !mod_version.c> @@ -435,12 +409,7 @@ EOT Deny from all </IfVersion> <IfVersion >= 2.4> - <IfModule mod_perl.c> - Deny from all - </IfModule> - <IfModule !mod_perl.c> - Require all denied - </IfModule> + Require all denied </IfVersion> </IfModule> <IfModule !mod_version.c> diff --git a/Bugzilla/Template.pm b/Bugzilla/Template.pm index 72d899c..cfcbc66 100644 --- a/Bugzilla/Template.pm +++ b/Bugzilla/Template.pm @@ -719,6 +719,9 @@ sub create { { my ($var) = @_; $var = ' ' . $var if substr($var, 0, 1) eq '='; + # backslash is not special to CSV, but it can be used to confuse some browsers... + # so we do not allow it to happen. We only do this for logged-in users. + $var =~ s/\\/\x{FF3C}/g if Bugzilla->user->id; $var =~ s/\"/\"\"/g; if ($var !~ /^-?(\d+\.)?\d*$/) { $var = "\"$var\""; diff --git a/Bugzilla/WebService/Product.pm b/Bugzilla/WebService/Product.pm index 1c8d75b..e383cb5 100644 --- a/Bugzilla/WebService/Product.pm +++ b/Bugzilla/WebService/Product.pm @@ -28,6 +28,7 @@ use constant PUBLIC_METHODS => qw( get get_accessible_products get_enterable_products + get_products get_selectable_products update ); diff --git a/docs/bugzilla.ent b/docs/bugzilla.ent index 34b6472..5a9e044 100644 --- a/docs/bugzilla.ent +++ b/docs/bugzilla.ent @@ -1,5 +1,5 @@ -<!ENTITY bz-ver "4.4.10"> -<!ENTITY bz-date "2015-09-10"> +<!ENTITY bz-ver "4.4.11"> +<!ENTITY bz-date "2015-12-22"> <!ENTITY current-year "2015"> <!ENTITY min-perl-ver "5.8.1"> @@ -52,11 +52,11 @@ <!ENTITY min-io-scalar-ver "any">  -<!ENTITY min-dbd-mysql-ver "4.001"> -<!ENTITY min-mysql-ver "5.0.15"> -<!ENTITY min-dbd-oracle-ver "1.19"> -<!ENTITY min-oracle-ver "10.02.0"> <!ENTITY min-dbd-pg-ver "2.7.0"> <!ENTITY min-pg-ver "8.03.0000"> +<!ENTITY min-dbd-mysql-ver "4.001"> +<!ENTITY min-mysql-ver "5.0.15"> <!ENTITY min-dbd-sqlite-ver "1.29"> <!ENTITY min-sqlite-ver "3.6.22"> +<!ENTITY min-dbd-oracle-ver "1.19"> +<!ENTITY min-oracle-ver "10.02.0"> diff --git a/docs/bugzilla.ent.tmpl b/docs/bugzilla.ent.tmpl index cb37c0e..f81421a 100644 --- a/docs/bugzilla.ent.tmpl +++ b/docs/bugzilla.ent.tmpl @@ -1,5 +1,5 @@ -<!ENTITY bz-ver "4.4.10"> -<!ENTITY bz-date "2015-09-10"> +<!ENTITY bz-ver "4.4.11"> +<!ENTITY bz-date "2015-12-22"> <!ENTITY current-year "2015"> <!ENTITY min-perl-ver "5.8.1"> diff --git a/docs/en/xml/bugzilla.ent b/docs/en/xml/bugzilla.ent index 34b6472..5a9e044 100644 --- a/docs/en/xml/bugzilla.ent +++ b/docs/en/xml/bugzilla.ent @@ -1,5 +1,5 @@ -<!ENTITY bz-ver "4.4.10"> -<!ENTITY bz-date "2015-09-10"> +<!ENTITY bz-ver "4.4.11"> +<!ENTITY bz-date "2015-12-22"> <!ENTITY current-year "2015"> <!ENTITY min-perl-ver "5.8.1"> @@ -52,11 +52,11 @@ <!ENTITY min-io-scalar-ver "any">  -<!ENTITY min-dbd-mysql-ver "4.001"> -<!ENTITY min-mysql-ver "5.0.15"> -<!ENTITY min-dbd-oracle-ver "1.19"> -<!ENTITY min-oracle-ver "10.02.0"> <!ENTITY min-dbd-pg-ver "2.7.0"> <!ENTITY min-pg-ver "8.03.0000"> +<!ENTITY min-dbd-mysql-ver "4.001"> +<!ENTITY min-mysql-ver "5.0.15"> <!ENTITY min-dbd-sqlite-ver "1.29"> <!ENTITY min-sqlite-ver "3.6.22"> +<!ENTITY min-dbd-oracle-ver "1.19"> +<!ENTITY min-oracle-ver "10.02.0"> diff --git a/docs/en/xml/installation.xml b/docs/en/xml/installation.xml index 5ef6be5..4bc2da7 100644 --- a/docs/en/xml/installation.xml +++ b/docs/en/xml/installation.xml @@ -1058,7 +1058,7 @@ SetEnv LD_LIBRARY_PATH /u01/app/oracle/product/10.2.0/lib/ AddHandler cgi-script .cgi Options +ExecCGI DirectoryIndex index.cgi index.html -AllowOverride Limit FileInfo Indexes Options +AllowOverride All </Directory> </programlisting> diff --git a/mod_perl.pl b/mod_perl.pl index ae15ae5..4794e28 100644 --- a/mod_perl.pl +++ b/mod_perl.pl @@ -73,7 +73,7 @@ PerlChildInitHandler "sub { Bugzilla::RNG::srand(); srand(); }" PerlCleanupHandler Apache2::SizeLimit Bugzilla::ModPerl::CleanupHandler PerlOptions +ParseHeaders Options +ExecCGI - AllowOverride Limit FileInfo Indexes Options + AllowOverride All DirectoryIndex index.cgi index.html </Directory> EOT diff --git a/showdependencygraph.cgi b/showdependencygraph.cgi index 4187bdd..00fd206 100755 --- a/showdependencygraph.cgi +++ b/showdependencygraph.cgi @@ -58,7 +58,7 @@ sub CreateImagemap { # Pick up bugid from the mapdata label field. Getting the title from # bugtitle hash instead of mapdata allows us to get the summary even # when showsummary is off, and also gives us status and resolution. - my $bugtitle = html_quote(clean_text($bugtitles{$bugid})); + my $bugtitle = $bugtitles{$bugid}; $map .= qq{<area alt="bug $bugid" name="bug$bugid" shape="rect" } . qq{title="$bugtitle" href="$url" } . qq{coords="$leftx,$topy,$rightx,$bottomy">\n}; @@ -176,13 +176,16 @@ foreach my $k (@bug_ids) { # Retrieve bug information from the database my ($stat, $resolution, $summary) = $dbh->selectrow_array($sth, undef, $k); + $vars->{'short_desc'} = $summary if ($k eq $cgi->param('id')); + # Resolution and summary are shown only if user can see the bug - if (!$user->can_see_bug($k)) { + if ($user->can_see_bug($k)) { + $summary = html_quote(clean_text($summary)); + } + else { $resolution = $summary = ''; } - $vars->{'short_desc'} = $summary if ($k eq $cgi->param('id')); - my @params; if ($summary ne "" && $cgi->param('showsummary')) { diff --git a/template/en/default/pages/release-notes.html.tmpl b/template/en/default/pages/release-notes.html.tmpl index d810688..7763413 100644 --- a/template/en/default/pages/release-notes.html.tmpl +++ b/template/en/default/pages/release-notes.html.tmpl @@ -45,6 +45,25 @@ <h2 id="v44_point">Updates in this 4.4.x Release</h2> +<h3>4.4.11</h3> + +<p>This release fixes two security issues. See the + <a href="https://www.bugzilla.org/security/4.2.15/">Security Advisory</a> + for details.</p> + +<p>This release also contains the following [% terms.bug %] fix:</p> + +<ul> + <li>mod_perl now works correctly with mod_access_compat turned off on + Apache 2.4. The (incorrect) fix implemented in [% terms.Bugzilla %] 4.4.9 + has been backed out. To regenerate the <kbd>.htaccess</kbd> files, you + must first delete all existing ones in subdirectories: + <pre>find . -mindepth 2 -name .htaccess -exec rm -f {} \;</pre> + You must then run <kbd>checksetup.pl</kbd> again to recreate them with + the correct syntax. + (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=1223790">[% terms.Bug %] 1223790</a>)</li> +</ul> + <h3>4.4.10</h3> <p>This release fixes one security issue. See the

1 0

Alexandre Julliard : Merge branch 'upstream'.
by Alexandre Julliard Dec. 24, 2015

Dec. 24, 2015

Module: bugzilla Branch: master Commit: 0205fb7815123c9703815447aedf89fe6a9bc9ed URL: http://source.winehq.org/git/bugzilla.git/?a=commit;h=0205fb7815123c9703815… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 24 14:37:44 2015 +0100 Merge branch 'upstream'. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> ---

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard Dec. 24, 2015

Dec. 24, 2015

Module: wine Branch: master Commit: b30167e2403ff39f33205e5c6bd069b1517b1cdd URL: http://source.winehq.org/git/wine.git/?a=commit;h=b30167e2403ff39f33205e5c6… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Wed Dec 23 17:36:00 2015 +0200 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/lt.po b/po/lt.po index f016adf..7c78f2f 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2015-11-20 09:57+0300\n" +"PO-Revision-Date: 2015-12-23 17:35+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -1042,7 +1042,7 @@ msgstr "Parinkite aplanką" #: comdlg32.rc:148 msgid "Font size has to be a number." -msgstr "" +msgstr "Šrifto dydis turi būti skaičius." #: comdlg32.rc:83 oleview.rc:98 msgid "Ready"

1 0

Thomas Petazzoni : configure: Allow to override the location of the *-config scripts.
by Alexandre Julliard Dec. 24, 2015

Dec. 24, 2015

Module: wine Branch: master Commit: 4ab21edfb10d0a910e24709aab9f3afff8a84ae7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ab21edfb10d0a910e24709aa… Author: Thomas Petazzoni <thomas.petazzoni(a)free-electrons.com> Date: Tue Dec 22 22:29:20 2015 +0100 configure: Allow to override the location of the *-config scripts. Signed-off-by: Thomas Petazzoni <thomas.petazzoni(a)free-electrons.com> Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 28 ++++++++++++++-------------- configure.ac | 20 ++++++++++---------- 2 files changed, 24 insertions(+), 24 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4ab21edfb10d0a910e247…

1 0

Austin English : api-ms-win-core-path-l1-1-0: Add stub dll.
by Alexandre Julliard Dec. 24, 2015

Dec. 24, 2015

Module: wine Branch: master Commit: 88b1a5fa21e3d799153f7fe12683d92d7e35d777 URL: http://source.winehq.org/git/wine.git/?a=commit;h=88b1a5fa21e3d799153f7fe12… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Dec 15 23:12:26 2015 -0600 api-ms-win-core-path-l1-1-0: Add stub dll. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-core-path-l1-1-0/Makefile.in | 1 + .../api-ms-win-core-path-l1-1-0.spec | 22 ++++++++++++++++++++++ 4 files changed, 26 insertions(+) diff --git a/configure b/configure index 8fe1910..a1b7247 100755 --- a/configure +++ b/configure @@ -901,6 +901,7 @@ enable_api_ms_win_core_memory_l1_1_1 enable_api_ms_win_core_misc_l1_1_0 enable_api_ms_win_core_namedpipe_l1_1_0 enable_api_ms_win_core_namedpipe_l1_2_0 +enable_api_ms_win_core_path_l1_1_0 enable_api_ms_win_core_processenvironment_l1_1_0 enable_api_ms_win_core_processenvironment_l1_2_0 enable_api_ms_win_core_processthreads_l1_1_0 @@ -17294,6 +17295,7 @@ wine_fn_config_dll api-ms-win-core-memory-l1-1-1 enable_api_ms_win_core_memory_l wine_fn_config_dll api-ms-win-core-misc-l1-1-0 enable_api_ms_win_core_misc_l1_1_0 wine_fn_config_dll api-ms-win-core-namedpipe-l1-1-0 enable_api_ms_win_core_namedpipe_l1_1_0 wine_fn_config_dll api-ms-win-core-namedpipe-l1-2-0 enable_api_ms_win_core_namedpipe_l1_2_0 +wine_fn_config_dll api-ms-win-core-path-l1-1-0 enable_api_ms_win_core_path_l1_1_0 wine_fn_config_dll api-ms-win-core-processenvironment-l1-1-0 enable_api_ms_win_core_processenvironment_l1_1_0 wine_fn_config_dll api-ms-win-core-processenvironment-l1-2-0 enable_api_ms_win_core_processenvironment_l1_2_0 wine_fn_config_dll api-ms-win-core-processthreads-l1-1-0 enable_api_ms_win_core_processthreads_l1_1_0 diff --git a/configure.ac b/configure.ac index ffeecf4..01c481b 100644 --- a/configure.ac +++ b/configure.ac @@ -2633,6 +2633,7 @@ WINE_CONFIG_DLL(api-ms-win-core-memory-l1-1-1) WINE_CONFIG_DLL(api-ms-win-core-misc-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-namedpipe-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-namedpipe-l1-2-0) +WINE_CONFIG_DLL(api-ms-win-core-path-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-processenvironment-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-processenvironment-l1-2-0) WINE_CONFIG_DLL(api-ms-win-core-processthreads-l1-1-0) diff --git a/dlls/api-ms-win-core-path-l1-1-0/Makefile.in b/dlls/api-ms-win-core-path-l1-1-0/Makefile.in new file mode 100644 index 0000000..af2c5f6 --- /dev/null +++ b/dlls/api-ms-win-core-path-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-path-l1-1-0.dll diff --git a/dlls/api-ms-win-core-path-l1-1-0/api-ms-win-core-path-l1-1-0.spec b/dlls/api-ms-win-core-path-l1-1-0/api-ms-win-core-path-l1-1-0.spec new file mode 100644 index 0000000..cb10d89 --- /dev/null +++ b/dlls/api-ms-win-core-path-l1-1-0/api-ms-win-core-path-l1-1-0.spec @@ -0,0 +1,22 @@ +@ stub PathAllocCanonicalize +@ stub PathAllocCombine +@ stub PathCchAddBackslash +@ stub PathCchAddBackslashEx +@ stub PathCchAddExtension +@ stub PathCchAppend +@ stub PathCchAppendEx +@ stub PathCchCanonicalize +@ stub PathCchCanonicalizeEx +@ stub PathCchCombine +@ stub PathCchCombineEx +@ stub PathCchFindExtension +@ stub PathCchIsRoot +@ stub PathCchRemoveBackslash +@ stub PathCchRemoveBackslashEx +@ stub PathCchRemoveExtension +@ stub PathCchRemoveFileSpec +@ stub PathCchRenameExtension +@ stub PathCchSkipRoot +@ stub PathCchStripPrefix +@ stub PathCchStripToRoot +@ stub PathIsUNCEx

1 0

Andrew Eikum : maintainers: Alphabetize.
by Alexandre Julliard Dec. 24, 2015

Dec. 24, 2015

Module: wine Branch: master Commit: 101d70fd48b7f62d7f34427ef7d74017f55fb502 URL: http://source.winehq.org/git/wine.git/?a=commit;h=101d70fd48b7f62d7f34427ef… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Dec 23 09:03:19 2015 -0600 maintainers: Alphabetize. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- MAINTAINERS | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index a32c686..f622df0 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -28,6 +28,13 @@ Maintainers List ----------------------------------- +ARM, ARM64 +M: André Hentschel <nerv(a)dawncrow.de> +F: dlls/dbghelp/cpu_arm* +F: dlls/msvcrt/except_arm.c +F: dlls/ntdll/signal_arm* +F: programs/winedbg/be_arm* + Audio I/O M: Andrew Eikum <aeikum(a)codeweavers.com> F: dlls/dsound/ @@ -42,13 +49,6 @@ F: dlls/x3daudio*/ F: dlls/xapofx*/ F: dlls/xaudio*/ -ARM, ARM64 -M: André Hentschel <nerv(a)dawncrow.de> -F: dlls/dbghelp/cpu_arm* -F: dlls/msvcrt/except_arm.c -F: dlls/ntdll/signal_arm* -F: programs/winedbg/be_arm* - Common Controls Library P: Nikolay Sivov <nsivov(a)codeweavers.com> F: dlls/comctl32/ @@ -113,8 +113,8 @@ F: dlls/hidclass.sys/ HTML rendering (Gecko) M: Jacek Caban <jacek(a)codeweavers.com> -F: dlls/mshtml/ F: dlls/ieframe/ +F: dlls/mshtml/ F: dlls/shdocvw/ Input methods @@ -131,8 +131,8 @@ F: dlls/winemac.drv/ Media format conversion M: Andrew Eikum <aeikum(a)codeweavers.com> -F: dlls/msacm32/ F: dlls/*.acm/ +F: dlls/msacm32/ Microsoft C Runtime M: Piotr Caban <piotr(a)codeweavers.com>

1 0

Nikolay Sivov : ole32: Simplify OleRegGetUserType() using existing helper.
by Alexandre Julliard Dec. 24, 2015

Dec. 24, 2015

Module: wine Branch: master Commit: 98505b40763bac5f42575cc21b47c07370798726 URL: http://source.winehq.org/git/wine.git/?a=commit;h=98505b40763bac5f42575cc21… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Dec 23 00:36:12 2015 +0300 ole32: Simplify OleRegGetUserType() using existing helper. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/ole2.c | 42 ++++++++++-------------------------------- 1 file changed, 10 insertions(+), 32 deletions(-) diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index f28b9d0..41fe4bd 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -677,47 +677,26 @@ HRESULT WINAPI OleRegGetUserType( DWORD dwFormOfType, LPOLESTR* pszUserType) { - WCHAR keyName[60]; DWORD dwKeyType; DWORD cbData; HKEY clsidKey; - LONG hres; - - /* - * Initialize the out parameter. - */ - *pszUserType = NULL; + HRESULT hres; + LONG ret; - /* - * Build the key name we're looking for - */ - sprintfW( keyName, clsidfmtW, - clsid->Data1, clsid->Data2, clsid->Data3, - clsid->Data4[0], clsid->Data4[1], clsid->Data4[2], clsid->Data4[3], - clsid->Data4[4], clsid->Data4[5], clsid->Data4[6], clsid->Data4[7] ); + TRACE("(%s, %d, %p)\n", debugstr_guid(clsid), dwFormOfType, pszUserType); - TRACE("(%s, %d, %p)\n", debugstr_w(keyName), dwFormOfType, pszUserType); + *pszUserType = NULL; - /* - * Open the class id Key - */ - hres = open_classes_key(HKEY_CLASSES_ROOT, keyName, MAXIMUM_ALLOWED, &clsidKey); - if (hres != ERROR_SUCCESS) - return REGDB_E_CLASSNOTREG; + hres = COM_OpenKeyForCLSID(clsid, NULL, KEY_READ, &clsidKey); + if (FAILED(hres)) + return hres; /* * Retrieve the size of the name string. */ cbData = 0; - hres = RegQueryValueExW(clsidKey, - emptyW, - NULL, - &dwKeyType, - NULL, - &cbData); - - if (hres!=ERROR_SUCCESS) + if (RegQueryValueExW(clsidKey, emptyW, NULL, &dwKeyType, NULL, &cbData)) { RegCloseKey(clsidKey); return REGDB_E_READREGDB; @@ -734,7 +713,7 @@ HRESULT WINAPI OleRegGetUserType( return E_OUTOFMEMORY; } - hres = RegQueryValueExW(clsidKey, + ret = RegQueryValueExW(clsidKey, emptyW, NULL, &dwKeyType, @@ -743,11 +722,10 @@ HRESULT WINAPI OleRegGetUserType( RegCloseKey(clsidKey); - if (hres != ERROR_SUCCESS) + if (ret != ERROR_SUCCESS) { CoTaskMemFree(*pszUserType); *pszUserType = NULL; - return REGDB_E_READREGDB; }

1 0