[Pkg-apache-commits] r1102 - in /trunk/apache2: changelog patches/00list patches/074_link_support_progs_with_lcrypt.dpatch

[sf at alioth.debian.org]

Author: sf
Date: Sat Dec  5 22:59:57 2009
New Revision: 1102

URL: http://svn.debian.org/wsvn/pkg-apache/?sc=1&rev=1102
Log:
Link with -lcrypt where necessary to fix a FTBFS with binutils-gold

Added:
    trunk/apache2/patches/074_link_support_progs_with_lcrypt.dpatch   (with props)
Modified:
    trunk/apache2/changelog
    trunk/apache2/patches/00list

Modified: trunk/apache2/changelog
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/changelog?rev=1102&op=diff
==============================================================================
--- trunk/apache2/changelog (original)
+++ trunk/apache2/changelog Sat Dec  5 22:59:57 2009
@@ -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 at debian.org>  Fri, 27 Nov 2009 19:36:24 +0100
 

Modified: trunk/apache2/patches/00list
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/patches/00list?rev=1102&op=diff
==============================================================================
--- trunk/apache2/patches/00list (original)
+++ trunk/apache2/patches/00list Sat Dec  5 22:59:57 2009
@@ -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

Added: trunk/apache2/patches/074_link_support_progs_with_lcrypt.dpatch
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/patches/074_link_support_progs_with_lcrypt.dpatch?rev=1102&op=file
==============================================================================
--- trunk/apache2/patches/074_link_support_progs_with_lcrypt.dpatch (added)
+++ trunk/apache2/patches/074_link_support_progs_with_lcrypt.dpatch Sat Dec  5 22:59:57 2009
@@ -1,0 +1,39 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 074_support_link_lcrypt.dpatch by Stefan Fritsch <sf at 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)
+
+ at 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=""

Propchange: trunk/apache2/patches/074_link_support_progs_with_lcrypt.dpatch
------------------------------------------------------------------------------
    svn:executable = *