← Back to branch summary

~ubuntu-branches/debian/wheezy/apache2/wheezy

« back to all changes in this revision

Viewing changes to debian/rules

  • Committer: Package Import Robot
  • Author(s): Stefan Fritsch, Stefan Fritsch, Arno Töll
  • Date: 2012-02-01 21:49:04 UTC
  • mfrom: (0.13.15)
  • Revision ID: package-import@ubuntu.com-20120201214904-nlchebp6wu7z55jw
Tags: 2.2.22-1
http://bugs.debian.org/653801
[ Stefan Fritsch ]
* New upstream release, urgency medium due to security fixes:
  - Fix CVE-2012-0021: mod_log_config: DoS with '%{cookiename}C' log format
  - Fix CVE-2012-0031: Unprivileged child process could cause the parent to
    crash at shutdown
  - Fix CVE-2012-0053: Exposure of "httpOnly" cookies in code 400 error
    message.
* Move httxt2dbm to apache2-utils
* Adjust debian/control to point to new git repository.

[ Arno Töll ]
* Fix "typo in /etc/apache2/apache2.conf" (Closes: #653801)

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/rules
205
205
                fi \
206
206
        done
207
207
        cd debian && ln -s $(INSTALL_DIR_RELATIVE)/worker tmp
208
 
        for m in logresolve ab; do d=debian/tmp/usr/share/man/ ;\
209
 
                perl -p -e 's/^([.]TH.*?) 8 (.*)/$$1 1 $$2/' < $$d/man8/$$m.8 > $$d/man1/$$m.1 ;\
210
 
        done
211
208
        #cleanup of death
212
209
        rm -rf $(DEFAULT_MPM)/etc/apache2/original
213
210
        rm -rf $(DEFAULT_MPM)/usr/include
214
211
        rm -rf $(DEFAULT_MPM)/usr/share/apache2/build
215
212
        rm -f $(DEFAULT_MPM)/usr/share/man/man8/httpd.8 # We install our own
216
213
        rm -f $(DEFAULT_MPM)/usr/sbin/apxs $(DEFAULT_MPM)/usr/sbin/apache2 debian/tmp/usr/sbin/apachectl
217
 
        mv $(DEFAULT_MPM)/usr/share/man/man8/apxs.8 $(DEFAULT_MPM)/usr/share/man/man8/apxs2.8
 
214
        mv $(DEFAULT_MPM)/usr/share/man/man1/apxs.1 $(DEFAULT_MPM)/usr/share/man/man1/apxs2.1
218
215
        mv $(DEFAULT_MPM)/usr/share/man/man8/apachectl.8 $(DEFAULT_MPM)/usr/share/man/man8/apache2ctl.8
219
216
        dh_install -a --list-missing
220
217
        # DO NOT FALL FOR THE TEMPTATION TO MV INTO PACKAGES OR DOOM