diff options
| author | Stefan Fritsch <sf@debian.org> | 2009-12-05 22:59:57 +0000 |
|---|---|---|
| committer | Stefan Fritsch <sf@sfritsch.de> | 2012-01-02 10:37:05 +0100 |
| commit | b5565a12e65c96ed718e4b75697ea1dc3e02ed93 (patch) | |
| tree | 12a30931dafef96ab10b6c1c8cf1dcc1dabbc3ca | |
| parent | c647df5bebaf14de12d066fb5d9f6dcbf6a1ac04 (diff) | |
| download | apache2-b5565a12e65c96ed718e4b75697ea1dc3e02ed93.tar.gz | |
Link with -lcrypt where necessary to fix a FTBFS with binutils-gold
git-svn-id: svn+ssh://svn.debian.org/svn/pkg-apache/trunk/apache2@1102 01b336ce-410b-0410-9a02-a0e7f243c266
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | debian/patches/00list | 1 | ||||
| -rwxr-xr-x | debian/patches/074_link_support_progs_with_lcrypt.dpatch | 39 |
3 files changed, 42 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 2b0b2dd1..e7e10081 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ apache2 (2.2.14-4) UNRELEASED; urgency=low * Automatically listen on port 443 if mod_gnutls is loaded (closes: #558234). + * Link with -lcrypt where necessary to fix a FTBFS with binutils-gold + (closes: #553946). -- Stefan Fritsch <sf@debian.org> Fri, 27 Nov 2009 19:36:24 +0100 diff --git a/debian/patches/00list b/debian/patches/00list index 28e8bdb8..d0663758 100644 --- a/debian/patches/00list +++ b/debian/patches/00list @@ -23,6 +23,7 @@ 071_fix_cacheenable.dpatch 072_CVE-2009-3555.dpatch 073_mod_dav_trunk_fixes.dpatch +074_link_support_progs_with_lcrypt.dpatch 099_config_guess_sub_update 200_cp_suexec.dpatch 201_build_suexec-custom.dpatch diff --git a/debian/patches/074_link_support_progs_with_lcrypt.dpatch b/debian/patches/074_link_support_progs_with_lcrypt.dpatch new file mode 100755 index 00000000..1242d97e --- /dev/null +++ b/debian/patches/074_link_support_progs_with_lcrypt.dpatch @@ -0,0 +1,39 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 074_support_link_lcrypt.dpatch by Stefan Fritsch <sf@debian.org> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Link support programs with -lcrypt where necessary. Required by +## DP: binutils-gold (bug #553946) + +@DPATCH@ +diff -urNad trunk~/configure trunk/configure +--- trunk~/configure 2009-12-05 23:44:43.501042252 +0100 ++++ trunk/configure 2009-12-05 23:47:07.640043829 +0100 +@@ -14628,11 +14628,11 @@ + + fi + +-htpasswd_LTFLAGS="" ++htpasswd_LTFLAGS="-lcrypt" + htdigest_LTFLAGS="" + rotatelogs_LTFLAGS="" + logresolve_LTFLAGS="" +-htdbm_LTFLAGS="" ++htdbm_LTFLAGS="-lcrypt" + ab_LTFLAGS="" + checkgid_LTFLAGS="" + htcacheclean_LTFLAGS="" +diff -urNad trunk~/support/config.m4 trunk/support/config.m4 +--- trunk~/support/config.m4 2006-12-24 15:40:19.000000000 +0100 ++++ trunk/support/config.m4 2009-12-05 23:47:29.388150162 +0100 +@@ -1,8 +1,8 @@ +-htpasswd_LTFLAGS="" ++htpasswd_LTFLAGS="-lcrypt" + htdigest_LTFLAGS="" + rotatelogs_LTFLAGS="" + logresolve_LTFLAGS="" +-htdbm_LTFLAGS="" ++htdbm_LTFLAGS="-lcrypt" + ab_LTFLAGS="" + checkgid_LTFLAGS="" + htcacheclean_LTFLAGS="" |