diff options
| author | Stefan Fritsch <sf@debian.org> | 2009-09-27 06:29:37 +0000 |
|---|---|---|
| committer | Stefan Fritsch <sf@sfritsch.de> | 2012-01-02 10:37:05 +0100 |
| commit | c835a1b97e4d3063c0102674c9bfce4437bf649d (patch) | |
| tree | 219244b0865c8165a002767d426a72f1a009e91c | |
| parent | 039795800cac1b7063989eace06ec811b7172ad8 (diff) | |
| download | apache2-c835a1b97e4d3063c0102674c9bfce4437bf649d.tar.gz | |
prepare for new upstream
git-svn-id: svn+ssh://svn.debian.org/svn/pkg-apache/trunk/apache2@1058 01b336ce-410b-0410-9a02-a0e7f243c266
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | debian/config-dir/mods-available/proxy_scgi.load | 2 | ||||
| -rw-r--r-- | debian/patches/00list | 3 | ||||
| -rwxr-xr-x | debian/rules | 1 |
4 files changed, 7 insertions, 5 deletions
diff --git a/debian/changelog b/debian/changelog index 2872956a..de1b1180 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,9 @@ -apache2 (2.2.13-3) UNRELEASED; urgency=low +apache2 (2.2.14-1) UNRELEASED; urgency=low + * New upstream version: + - new module mod_proxy_scgi * Disable hardening option -pie again, as gdb in Debian does not support - it properly. + it properly and it is broken on mips*. -- Stefan Fritsch <sf@debian.org> Wed, 23 Sep 2009 20:41:04 +0200 diff --git a/debian/config-dir/mods-available/proxy_scgi.load b/debian/config-dir/mods-available/proxy_scgi.load new file mode 100644 index 00000000..fb6b0d7e --- /dev/null +++ b/debian/config-dir/mods-available/proxy_scgi.load @@ -0,0 +1,2 @@ +# Depends: proxy +LoadModule proxy_scgi_module /usr/lib/apache2/modules/mod_proxy_scgi.so diff --git a/debian/patches/00list b/debian/patches/00list index 15569ad6..06acfd28 100644 --- a/debian/patches/00list +++ b/debian/patches/00list @@ -19,9 +19,6 @@ 067_fix_segfault_in_ab.dpatch 068_mod_dav_detect_EOF.dpatch 069_no_deflate_for_HEAD.dpatch -070_better_missing_cert_error_msg.dpatch -071_CVE-2009-3094.dpatch -072_CVE-2009-3095.dpatch 099_config_guess_sub_update 200_cp_suexec.dpatch 201_build_suexec-custom.dpatch diff --git a/debian/rules b/debian/rules index 143fcfcd..4280fc4f 100755 --- a/debian/rules +++ b/debian/rules @@ -45,6 +45,7 @@ AP2_MODS_CONFARGS = --enable-authn-alias=shared --enable-authnz-ldap=shared \ --enable-ldap=shared --enable-proxy=shared \ --enable-proxy-connect=shared --enable-proxy-ftp=shared \ --enable-proxy-http=shared --enable-proxy-ajp=shared \ + --enable-proxy-scgi=shared \ --enable-proxy-balancer=shared --enable-ssl=shared \ --enable-authn-dbm=shared --enable-authn-anon=shared \ --enable-authn-dbd=shared --enable-authn-file=shared \ |