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

Accepting request 288480 from Apache

Browse Source 
1

OBS-URL: https://build.opensuse.org/request/show/288480
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/apache2?expand=0&rev=100
This commit is contained in:
Dominique Leuenberger 2015-03-03 10:10:37 +00:00 committed by Git OBS Bridge
commit 098227407e
8 changed files with 732 additions and 426 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitattributes vendored
View File

@ -23,4 +23,3 @@
*.zst filter=lfs diff=lfs merge=lfs -text
## Specific LFS patterns
60C5442D.key filter=lfs diff=lfs merge=lfs -text
Apache.xpm filter=lfs diff=lfs merge=lfs -text

3
Apache.xpm
View File

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

55
apache2.changes
View File

@ -1,3 +1,58 @@
-------------------------------------------------------------------
Thu Feb 26 08:17:42 UTC 2015 - jsegitz@novell.com
- Patched get_module_list to ensure proper SELinux context for
sysconfig.d/loadmodule.conf
-------------------------------------------------------------------
Wed Feb 25 21:02:59 UTC 2015 - tchvatal@suse.com
- Pname -> name variable reduction
- Try to fix sle11 build
-------------------------------------------------------------------
Wed Feb 25 19:59:36 UTC 2015 - tchvatal@suse.com
- Version bumpt o 2.4.12:
*) mpm_winnt: Accept utf-8 (Unicode) service names and descriptions for
internationalization. [William Rowe]
*) mpm_winnt: Normalize the error and status messages emitted by service.c,
the service control interface for Windows. [William Rowe]
*) configure: Fix --enable-v4-mapped configuration on *BSD. PR 53824.
[ olli hauer <ohauer gmx.de>, Yann Ylavic ]
-------------------------------------------------------------------
Wed Feb 25 18:03:20 UTC 2015 - tchvatal@suse.com
- Exit cleanly on end of the post and cleanup the update detection
- Remove Apache.xpm as it ain't used
-------------------------------------------------------------------
Wed Feb 25 15:59:26 UTC 2015 - tchvatal@suse.com
- Cleanup init/unit decision making and provide just systemd service
on systemd systems
-------------------------------------------------------------------
Wed Feb 25 13:53:16 UTC 2015 - tchvatal@suse.com
- Deprecate realver define as it is equal to version.
- Explicitely state MPM mods to ensure we don't lose some bnc#444878
-------------------------------------------------------------------
Wed Feb 25 13:23:40 UTC 2015 - tchvatal@suse.com
- Pass over spec-cleaner, there should be no actual technical
change in this just reduction of lines in the spec
-------------------------------------------------------------------
Mon Feb 23 16:58:11 UTC 2015 - kstreitova@suse.com
- add httpd-2.4.x-mod_lua_websocket_DoS.patch to fix mod_lua bug
where a maliciously crafted websockets PING after a script calls
r:wsupgrade() can cause a child process crash
[CVE-2015-0228], [bnc#918352].
-------------------------------------------------------------------
Tue Feb 3 15:12:04 UTC 2015 - pgajdos@suse.com

1036
apache2.spec
View File

File diff suppressed because it is too large Load Diff

7
get_module_list
View File

@ -105,7 +105,12 @@ done
echo >&3 -e "#\n"
exec 3<&-
chmod 644 $TMPFILE
mv $TMPFILE $sysconfdir/sysconfig.d/loadmodule.conf
if ! mv -Z $TMPFILE $sysconfdir/sysconfig.d/loadmodule.conf 2>/dev/null; then
mv $TMPFILE $sysconfdir/sysconfig.d/loadmodule.conf
if selinuxenabled; then
restorecon $sysconfdir/sysconfig.d/loadmodule.conf
fi
fi
#echo -n ". "

3
httpd-2.4.11.tar.bz2
View File

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

3
httpd-2.4.12.tar.bz2 Normal file
View File

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

50
httpd-2.4.x-mod_lua_websocket_DoS.patch Normal file
View File

@ -0,0 +1,50 @@
From 643f0fcf3b8ab09a68f0ecd2aa37aafeda3e63ef Mon Sep 17 00:00:00 2001
From: Eric Covener <covener@apache.org>
Date: Wed, 4 Feb 2015 14:44:23 +0000
Subject: [PATCH] *) SECURITY: CVE-2015-0228 (cve.mitre.org) mod_lua: A
maliciously crafted websockets PING after a script calls r:wsupgrade()
can cause a child process crash. [Edward Lu <Chaosed0 gmail.com>]
Discovered by Guido Vranken <guidovranken gmail.com>
Submitted by: Edward Lu
Committed by: covener
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1657261 13f79535-47bb-0310-9956-ffa450edef68
---
diff --git a/modules/lua/lua_request.c b/modules/lua/lua_request.c
index dded599..1200c55 100644
--- a/modules/lua/lua_request.c
+++ b/modules/lua/lua_request.c
@@ -2227,6 +2227,7 @@ static int lua_websocket_read(lua_State *L)
{
apr_socket_t *sock;
apr_status_t rv;
+ int do_read = 1;
int n = 0;
apr_size_t len = 1;
apr_size_t plen = 0;
@@ -2244,6 +2245,8 @@ static int lua_websocket_read(lua_State *L)
mask_bytes = apr_pcalloc(r->pool, 4);
sock = ap_get_conn_socket(r->connection);
+ while (do_read) {
+ do_read = 0;
/* Get opcode and FIN bit */
if (plaintext) {
rv = apr_socket_recv(sock, &byte, &len);
@@ -2377,10 +2380,11 @@ static int lua_websocket_read(lua_State *L)
frame[0] = 0x8A;
frame[1] = 0;
apr_socket_send(sock, frame, &plen); /* Pong! */
- lua_websocket_read(L); /* read the next frame instead */
+ do_read = 1;
}
}
}
+ }
return 0;
}