← Back to branch summary

~ubuntu-branches/ubuntu/maverick/squid/maverick-proposed

« back to all changes in this revision

Viewing changes to helpers/external_acl/ip_user/Makefile.in

  • Committer: Bazaar Package Importer
  • Author(s): Chuck Short, Chuck Short
  • Date: 2010-07-02 13:43:09 UTC
  • mfrom: (1.1.18 upstream) (7.3.4 squeeze)
  • Revision ID: james.westby@ubuntu.com-20100702134309-i8g2on09rm2blea1
Tags: 2.7.STABLE9-2ubuntu1
https://launchpad.net/bugs/268816
https://launchpad.net/bugs/503777
https://launchpad.net/bugs/543798
https://launchpad.net/bugs/580590
* Merge from debian unstable, remaining changes:
  + 99-ubuntu-ssl-cert-snakeoil:
    - src/cf.data.pre:
      * Add reference to snakeoil /etc/ssl
     - debian/control:
      + Add ssl-cert to Depends to brin in snakeoil certificates.
  + debian/logrotate: use sarg-reports rather than sarg-maint. (LP: #268816)
  + debian/patches/99-fix-storeurl-move-temp.dpatch: Fix bug with 302 response moved temporarily. 
    (LP: #503777)
  + debian/squid.upstart, debian/rules: Convert initscripts to upstart.
  + debian/patches/90-cf.data.ubuntu.dpatch: Add an example refresh pattern for debs
    (foundations-lucid-local-report spec)
  + debian/rules: Disable optimizations for arm. (LP: #543798)
  + Dropped:
    + debian/patches/99-squid-capability.dpatch: No longer needed.
    + debian/patches/08-CVE-2010-0308.dpatch: No longer needed.
    + debian/patches/09-CVE-2010-0639.dpatch: No longer needed.

 [Chuck Short]
 * debian/squid.upstart: Re-add maxfds. (LP: #580590)

Show diffs side-by-side

added added

removed removed

Lines of Context:
helpers/external_acl/ip_user/Makefile.in
17
17
#
18
18
#  Makefile for the ip_user external_acl helper by Rodrigo Campos
19
19
#
20
 
#  $Id: Makefile.in,v 1.29.2.1 2009/05/01 01:24:26 squidadm Exp $
 
20
#  $Id: Makefile.in,v 1.29.2.3 2010/03/14 20:27:17 squidadm Exp $
21
21
#
22
22
#  Uncomment and customize the following to suit your needs:
23
23
#
44
44
subdir = helpers/external_acl/ip_user
45
45
DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in
46
46
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
47
 
am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
48
 
        $(top_srcdir)/configure.in
 
47
am__aclocal_m4_deps = $(top_srcdir)/m4/ax_lib_socket_nsl.m4 \
 
48
        $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
49
49
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
50
50
        $(ACLOCAL_M4)
51
51
mkinstalldirs = $(install_sh) -d
120
120
LIBSASL = @LIBSASL@
121
121
LIB_DB = @LIB_DB@
122
122
LIB_EPOLL = @LIB_EPOLL@
123
 
LIB_LBER = @LIB_LBER@
124
123
LIB_LDAP = @LIB_LDAP@
125
124
LIB_MALLOC = @LIB_MALLOC@
126
125
LN = @LN@
132
131
MKDIR_P = @MKDIR_P@
133
132
MV = @MV@
134
133
NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@
 
134
NIS_LIBS = @NIS_LIBS@
135
135
NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@
136
136
OBJEXT = @OBJEXT@
137
137
OPT_DEFAULT_HOSTS = @OPT_DEFAULT_HOSTS@