← Back to branch summary

~ubuntu-branches/ubuntu/utopic/squid3/utopic-proposed

« back to all changes in this revision

Viewing changes to helpers/ntlm_auth/Makefile.in

  • Committer: Package Import Robot
  • Author(s): Yolanda Robla
  • Date: 2013-07-10 17:12:42 UTC
  • mfrom: (21.2.18 sid)
  • Revision ID: package-import@ubuntu.com-20130710171242-2i9v941ikbpnjyqk
Tags: 3.3.4-1ubuntu1
https://launchpad.net/bugs/1199883
* Merge from Debian unstable (LP: #1199883).  Remaining changes:
  + debian/control:
    - Update maintainer.
    - Suggests apparmor (>= 2.3)
    - Depends on ssl-cert ((>= 1.0-11ubuntu1), autopkgtests
  + debian/squid3.upstart
    - Move ulimit command to script section so that it applies
      to the started squid daemon. Thanks to Timur Irmatov (LP: 986159)
    - Work around squid not handling SIGHUP by adding respawn to
      upstart job. (LP: 978356)
  + debian/NEWS.Debian: Rename NEWS.debian, add note regarding squid3
    transition in 12.04 (LP: 924739)
  + debian/rules
    - Re-enable all hardening options lost in the squid->squid3
      transition (LP: 986314)
  + squid3.resolvconf, debian/squid3.postinst, debian/squid3.postrm,
    debian/squid3.preinst, debian/squid3.prerm:
    - Convert init script to upstart
  + debian/patches/99-ubuntu-ssl-cert-snakeoil:
    - Use snakeoil certificates.
  + debian/logrotate
    - Use sar-reports rather than sarg-maint. (LP: 26616)
  + debian/patches/90-cf.data.ubuntu.dpatch:
    - Add an example refresh pattern for debs.
      (foundations-lucid-local-report spec)
  + Add disabled by default AppArmor profile (LP: 497790)
    - debian/squid3.upstart: load profile in pre-start stanza
    - add debian/usr.sbin.squid3 profile
    - debian/rules:
      + install debian/usr.sbin.squid3, etc/apparmor.d/force-complain and
        etc/apparmor.d/disable into $(INSTALLDIR)
      + use dh_apparmor
    - debian/squid3.install: install etc/apparmor.d/disable, force-complain
      and usr.sbin.squid3
    - debian/squid3.preinst: disable profile on clean install or upgrades
      from earlier than when we shipped the profile
  + debian/tests:
    - Add autopkgtests.

* Dropped:
  - debian/patches: dropped patches, superseded by new release:
    + 98-CVE-2012-5643.patch
    + 99-lp1117517_r12473.patch
  - debian/rules: fix FTBFS, removed --with-cppunit-basedir flag,
    included in Debian.
  - debian/control: Dropped transitional packages from squid, no
    longer required.

* Refreshed patches:
  - 01-cf.data.debian.patch
  - 02-makefile-defaults.patch
  - 15-cachemgr-default-config.patch

* debian/tests/test-squid.py: fixed case problem with ftp test

Show diffs side-by-side

added added

removed removed

Lines of Context:
helpers/ntlm_auth/Makefile.in
14
14
# PARTICULAR PURPOSE.
15
15
 
16
16
@SET_MAKE@
17
 
 
18
 
#  Makefile for storage modules in the Squid Object Cache server
19
 
#
20
 
#  $Id$
21
 
#
22
17
VPATH = @srcdir@
23
18
pkgdatadir = $(datadir)/@PACKAGE@
24
19
pkgincludedir = $(includedir)/@PACKAGE@
41
36
subdir = helpers/ntlm_auth
42
37
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
43
38
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
44
 
am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
 
39
am__aclocal_m4_deps = $(top_srcdir)/acinclude/init.m4 \
 
40
        $(top_srcdir)/acinclude/squid-util.m4 \
 
41
        $(top_srcdir)/acinclude/compiler-flags.m4 \
 
42
        $(top_srcdir)/acinclude/os-deps.m4 \
 
43
        $(top_srcdir)/acinclude/krb5.m4 $(top_srcdir)/acinclude/pam.m4 \
 
44
        $(top_srcdir)/acinclude/pkg.m4 \
 
45
        $(top_srcdir)/acinclude/lib-checks.m4 \
 
46
        $(top_srcdir)/acinclude/ax_cxx_compile_stdcxx_0x.m4 \
 
47
        $(top_srcdir)/acinclude/ax_cxx_0x_types.m4 \
45
48
        $(top_srcdir)/configure.ac
46
49
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
47
50
        $(ACLOCAL_M4)
105
108
AUTOMAKE = @AUTOMAKE@
106
109
AWK = @AWK@
107
110
BASIC_AUTH_HELPERS = @BASIC_AUTH_HELPERS@
 
111
BZR = @BZR@
108
112
CACHE_EFFECTIVE_USER = @CACHE_EFFECTIVE_USER@
109
 
CACHE_HTTP_PORT = @CACHE_HTTP_PORT@
110
 
CACHE_ICP_PORT = @CACHE_ICP_PORT@
111
113
CC = @CC@
112
114
CCDEPMODE = @CCDEPMODE@
113
115
CFLAGS = @CFLAGS@
122
124
CXXDEPMODE = @CXXDEPMODE@
123
125
CXXFLAGS = @CXXFLAGS@
124
126
CYGPATH_W = @CYGPATH_W@
 
127
DEFAULT_HOSTS = @DEFAULT_HOSTS@
125
128
DEFAULT_LOG_DIR = @DEFAULT_LOG_DIR@
126
 
DEFAULT_PIDFILE = @DEFAULT_PIDFILE@
 
129
DEFAULT_PID_FILE = @DEFAULT_PID_FILE@
 
130
DEFAULT_SWAP_DIR = @DEFAULT_SWAP_DIR@
127
131
DEFS = @DEFS@
128
132
DEPDIR = @DEPDIR@
129
133
DIGEST_AUTH_HELPERS = @DIGEST_AUTH_HELPERS@
134
138
DISK_PROGRAMS = @DISK_PROGRAMS@
135
139
DSYMUTIL = @DSYMUTIL@
136
140
DUMPBIN = @DUMPBIN@
137
 
ECAPLIB = @ECAPLIB@
138
141
ECAP_LIBS = @ECAP_LIBS@
139
142
ECHO_C = @ECHO_C@
140
143
ECHO_N = @ECHO_N@
141
144
ECHO_T = @ECHO_T@
142
145
EGREP = @EGREP@
143
146
EPOLL_LIBS = @EPOLL_LIBS@
 
147
EUILIB = @EUILIB@
144
148
EXEEXT = @EXEEXT@
145
149
EXPATLIB = @EXPATLIB@
146
150
EXTERNAL_ACL_HELPERS = @EXTERNAL_ACL_HELPERS@
 
151
EXT_LIBECAP_CFLAGS = @EXT_LIBECAP_CFLAGS@
 
152
EXT_LIBECAP_LIBS = @EXT_LIBECAP_LIBS@
147
153
FALSE = @FALSE@
148
154
FGREP = @FGREP@
149
155
GREP = @GREP@
155
161
INSTALL_PROGRAM = @INSTALL_PROGRAM@
156
162
INSTALL_SCRIPT = @INSTALL_SCRIPT@
157
163
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 
164
KRB5INCS = @KRB5INCS@
 
165
KRB5LIBS = @KRB5LIBS@
 
166
LBERLIB = @LBERLIB@
158
167
LD = @LD@
 
168
LDAPLIB = @LDAPLIB@
159
169
LDFLAGS = @LDFLAGS@
160
170
LIBADD_DL = @LIBADD_DL@
161
171
LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
167
177
LIBSASL = @LIBSASL@
168
178
LIBTOOL = @LIBTOOL@
169
179
LIB_DB = @LIB_DB@
170
 
LIB_LBER = @LIB_LBER@
171
 
LIB_LDAP = @LIB_LDAP@
172
180
LIPO = @LIPO@
173
181
LN = @LN@
174
182
LN_S = @LN_S@
 
183
LOG_DAEMON_HELPERS = @LOG_DAEMON_HELPERS@
175
184
LTDLDEPS = @LTDLDEPS@
176
185
LTDLINCL = @LTDLINCL@
177
186
LTDLOPEN = @LTDLOPEN@
191
200
NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@
192
201
OBJDUMP = @OBJDUMP@
193
202
OBJEXT = @OBJEXT@
194
 
OPT_DEFAULT_HOSTS = @OPT_DEFAULT_HOSTS@
195
203
OTOOL = @OTOOL@
196
204
OTOOL64 = @OTOOL64@
197
205
PACKAGE = @PACKAGE@
203
211
PACKAGE_VERSION = @PACKAGE_VERSION@
204
212
PATH_SEPARATOR = @PATH_SEPARATOR@
205
213
PERL = @PERL@
 
214
PKG_CONFIG = @PKG_CONFIG@
 
215
PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 
216
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
206
217
PO2HTML = @PO2HTML@
 
218
PO2TEXT = @PO2TEXT@
 
219
POD2MAN = @POD2MAN@
207
220
RANLIB = @RANLIB@
208
221
REGEXLIB = @REGEXLIB@
209
222
REPL_LIBS = @REPL_LIBS@
225
238
STORE_LIBS_TO_BUILD = @STORE_LIBS_TO_BUILD@
226
239
STORE_TESTS = @STORE_TESTS@
227
240
STRIP = @STRIP@
 
241
TR = @TR@
228
242
TRUE = @TRUE@
 
243
URL_REWRITE_HELPERS = @URL_REWRITE_HELPERS@
229
244
VERSION = @VERSION@
230
245
WIN32_PSAPI = @WIN32_PSAPI@
231
246
XMLLIB = @XMLLIB@
238
253
ac_ct_CC = @ac_ct_CC@
239
254
ac_ct_CXX = @ac_ct_CXX@
240
255
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 
256
ac_krb5_config = @ac_krb5_config@
241
257
am__include = @am__include@
242
258
am__leading_dot = @am__leading_dot@
243
259
am__quote = @am__quote@
288
304
top_build_prefix = @top_build_prefix@
289
305
top_builddir = @top_builddir@
290
306
top_srcdir = @top_srcdir@
291
 
DIST_SUBDIRS = fakeauth no_check smb_lm mswin_sspi
 
307
DIST_SUBDIRS = fake smb_lm SSPI
292
308
SUBDIRS = $(NTLM_AUTH_HELPERS)
293
309
all: all-recursive
294
310