~ubuntu-branches/ubuntu/natty/pam/natty-security

« back to all changes in this revision

Viewing changes to modules/pam_succeed_if/Makefile.in

  • Committer: Bazaar Package Importer
  • Author(s): Steve Langasek
  • Date: 2009-08-26 00:40:14 UTC
  • mfrom: (1.1.5 upstream)
  • Revision ID: james.westby@ubuntu.com-20090826004014-qsd46mostuyljeqp
Tags: 1.1.0-1ubuntu1
* Merge from Debian, remaining changes:
  - debian/libpam-modules.postinst: Add PATH to /etc/environment if it's not
    present there or in /etc/security/pam_env.conf. (should send to Debian).
  - debian/libpam0g.postinst: only ask questions during update-manager when
    there are non-default services running.
  - debian/patches-applied/series: Ubuntu patches are as below ...
  - debian/patches-applied/ubuntu-no-error-if-missingok: add a new, magic
    module option 'missingok' which will suppress logging of errors by
    libpam if the module is not found.
  - debian/patches-applied/ubuntu-regression_fix_securetty: prompt for
    password on bad username.
  - debian/patches-applied/ubuntu-rlimit_nice_correction: Explicitly
    initialise RLIMIT_NICE rather than relying on the kernel limits.
  - Change Vcs-Bzr to point at the Ubuntu branch.
  - debian/local/common-password, debian/pam-configs/unix: switch from
    "md5" to "sha512" as password crypt default.
  - Make libpam-modules depend on base-files (>= 5.0.0ubuntu6), to ensure
    run-parts does the right thing in /etc/update-motd.d.
  - debian/patches-applied/pam_motd-legal-notice: display the contents of
    /etc/legal once, then set a flag in the user's homedir to prevent showing
    it again.
  - debian/local/common-{auth,account,password}.md5sums: include the
    Ubuntu-specific intrepid,jaunty md5sums for use during the
    common-session-noninteractive upgrade.
* Dropped changes, superseded upstream:
  - debian/patches-applied/ubuntu-fix_standard_types: Use standard u_int8_t
    type rather than __u8.
  - debian/patches-applied/ubuntu-user_defined_environment: Look at
    ~/.pam_environment too, with the same format as
    /etc/security/pam_env.conf.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
# Makefile.in generated by automake 1.10.1 from Makefile.am.
 
1
# Makefile.in generated by automake 1.10.2 from Makefile.am.
2
2
# @configure_input@
3
3
 
4
4
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
42
42
DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in
43
43
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
44
44
am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
45
 
        $(top_srcdir)/m4/iconv.m4 \
 
45
        $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
 
46
        $(top_srcdir)/m4/japhar_grep_cflags.m4 \
46
47
        $(top_srcdir)/m4/jh_path_xml_catalog.m4 \
47
48
        $(top_srcdir)/m4/ld-O1.m4 $(top_srcdir)/m4/ld-as-needed.m4 \
48
49
        $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
49
50
        $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libprelude.m4 \
50
 
        $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
51
 
        $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/acinclude.m4 \
 
51
        $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
 
52
        $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
 
53
        $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
 
54
        $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
52
55
        $(top_srcdir)/configure.in
53
56
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
54
57
        $(ACLOCAL_M4)
101
104
CFLAGS = @CFLAGS@
102
105
CPP = @CPP@
103
106
CPPFLAGS = @CPPFLAGS@
104
 
CXX = @CXX@
105
 
CXXCPP = @CXXCPP@
106
 
CXXDEPMODE = @CXXDEPMODE@
107
 
CXXFLAGS = @CXXFLAGS@
108
107
CYGPATH_W = @CYGPATH_W@
109
108
DEFS = @DEFS@
110
109
DEPDIR = @DEPDIR@
111
110
DSYMUTIL = @DSYMUTIL@
112
 
ECHO = @ECHO@
 
111
DUMPBIN = @DUMPBIN@
113
112
ECHO_C = @ECHO_C@
114
113
ECHO_N = @ECHO_N@
115
114
ECHO_T = @ECHO_T@
116
115
EGREP = @EGREP@
117
116
EXEEXT = @EXEEXT@
118
 
F77 = @F77@
119
 
FFLAGS = @FFLAGS@
 
117
FGREP = @FGREP@
120
118
FO2PDF = @FO2PDF@
 
119
GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
121
120
GMSGFMT = @GMSGFMT@
122
121
GMSGFMT_015 = @GMSGFMT_015@
123
122
GREP = @GREP@
129
128
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
130
129
INTLLIBS = @INTLLIBS@
131
130
INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 
131
LD = @LD@
132
132
LDFLAGS = @LDFLAGS@
133
133
LEX = @LEX@
134
134
LEXLIB = @LEXLIB@
152
152
LIBS = @LIBS@
153
153
LIBSELINUX = @LIBSELINUX@
154
154
LIBTOOL = @LIBTOOL@
 
155
LIPO = @LIPO@
155
156
LN_S = @LN_S@
156
157
LTLIBICONV = @LTLIBICONV@
157
158
LTLIBINTL = @LTLIBINTL@
161
162
MSGFMT = @MSGFMT@
162
163
MSGFMT_015 = @MSGFMT_015@
163
164
MSGMERGE = @MSGMERGE@
 
165
NM = @NM@
164
166
NMEDIT = @NMEDIT@
 
167
OBJDUMP = @OBJDUMP@
165
168
OBJEXT = @OBJEXT@
 
169
OTOOL = @OTOOL@
 
170
OTOOL64 = @OTOOL64@
166
171
PACKAGE = @PACKAGE@
167
172
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
168
173
PACKAGE_NAME = @PACKAGE_NAME@
169
174
PACKAGE_STRING = @PACKAGE_STRING@
170
175
PACKAGE_TARNAME = @PACKAGE_TARNAME@
171
176
PACKAGE_VERSION = @PACKAGE_VERSION@
172
 
PAM_READ_BOTH_CONFS = @PAM_READ_BOTH_CONFS@
173
177
PATH_SEPARATOR = @PATH_SEPARATOR@
174
178
PIE_CFLAGS = @PIE_CFLAGS@
175
179
PIE_LDFLAGS = @PIE_LDFLAGS@
183
187
STRIP = @STRIP@
184
188
USE_NLS = @USE_NLS@
185
189
VERSION = @VERSION@
186
 
WITH_DEBUG = @WITH_DEBUG@
187
 
WITH_PAMLOCKING = @WITH_PAMLOCKING@
188
190
XGETTEXT = @XGETTEXT@
189
191
XGETTEXT_015 = @XGETTEXT_015@
 
192
XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
190
193
XMLCATALOG = @XMLCATALOG@
191
194
XMLLINT = @XMLLINT@
192
195
XML_CATALOG_FILE = @XML_CATALOG_FILE@
198
201
abs_top_builddir = @abs_top_builddir@
199
202
abs_top_srcdir = @abs_top_srcdir@
200
203
ac_ct_CC = @ac_ct_CC@
201
 
ac_ct_CXX = @ac_ct_CXX@
202
 
ac_ct_F77 = @ac_ct_F77@
 
204
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
203
205
am__include = @am__include@
204
206
am__leading_dot = @am__leading_dot@
205
207
am__quote = @am__quote@
231
233
libexecdir = @libexecdir@
232
234
localedir = @localedir@
233
235
localstatedir = @localstatedir@
 
236
lt_ECHO = @lt_ECHO@
234
237
mandir = @mandir@
235
238
mkdir_p = @mkdir_p@
236
239
oldincludedir = @oldincludedir@
245
248
srcdir = @srcdir@
246
249
sysconfdir = @sysconfdir@
247
250
target_alias = @target_alias@
 
251
top_build_prefix = @top_build_prefix@
248
252
top_builddir = @top_builddir@
249
253
top_srcdir = @top_srcdir@
250
254
CLEANFILES = *~
267
271
        @for dep in $?; do \
268
272
          case '$(am__configure_deps)' in \
269
273
            *$$dep*) \
270
 
              cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
271
 
                && exit 0; \
 
274
              ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
 
275
                && { if test -f $@; then exit 0; else break; fi; }; \
272
276
              exit 1;; \
273
277
          esac; \
274
278
        done; \
367
371
          esac; \
368
372
        done; \
369
373
        for i in $$list; do \
370
 
          if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
371
 
          else file=$$i; fi; \
 
374
          if test -f $$i; then file=$$i; \
 
375
          else file=$(srcdir)/$$i; fi; \
372
376
          ext=`echo $$i | sed -e 's/^.*\\.//'`; \
373
377
          case "$$ext" in \
374
378
            8*) ;; \
407
411
        unique=`for i in $$list; do \
408
412
            if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
409
413
          done | \
410
 
          $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
 
414
          $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
411
415
              END { if (nonempty) { for (i in files) print i; }; }'`; \
412
416
        mkid -fID $$unique
413
417
tags: TAGS
450
454
        -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
451
455
 
452
456
check-TESTS: $(TESTS)
453
 
        @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[        ]'; \
 
457
        @failed=0; all=0; xfail=0; xpass=0; skip=0; \
454
458
        srcdir=$(srcdir); export srcdir; \
455
459
        list=' $(TESTS) '; \
456
460
        if test -n "$$list"; then \
461
465
            if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
462
466
              all=`expr $$all + 1`; \
463
467
              case " $(XFAIL_TESTS) " in \
464
 
              *$$ws$$tst$$ws*) \
 
468
              *[\ \     ]$$tst[\ \      ]*) \
465
469
                xpass=`expr $$xpass + 1`; \
466
470
                failed=`expr $$failed + 1`; \
467
471
                echo "XPASS: $$tst"; \
473
477
            elif test $$? -ne 77; then \
474
478
              all=`expr $$all + 1`; \
475
479
              case " $(XFAIL_TESTS) " in \
476
 
              *$$ws$$tst$$ws*) \
 
480
              *[\ \     ]$$tst[\ \      ]*) \
477
481
                xfail=`expr $$xfail + 1`; \
478
482
                echo "XFAIL: $$tst"; \
479
483
              ;; \
487
491
              echo "SKIP: $$tst"; \
488
492
            fi; \
489
493
          done; \
 
494
          if test "$$all" -eq 1; then \
 
495
            tests="test"; \
 
496
            All=""; \
 
497
          else \
 
498
            tests="tests"; \
 
499
            All="All "; \
 
500
          fi; \
490
501
          if test "$$failed" -eq 0; then \
491
502
            if test "$$xfail" -eq 0; then \
492
 
              banner="All $$all tests passed"; \
 
503
              banner="$$All$$all $$tests passed"; \
493
504
            else \
494
 
              banner="All $$all tests behaved as expected ($$xfail expected failures)"; \
 
505
              if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \
 
506
              banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \
495
507
            fi; \
496
508
          else \
497
509
            if test "$$xpass" -eq 0; then \
498
 
              banner="$$failed of $$all tests failed"; \
 
510
              banner="$$failed of $$all $$tests failed"; \
499
511
            else \
500
 
              banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \
 
512
              if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \
 
513
              banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \
501
514
            fi; \
502
515
          fi; \
503
516
          dashes="$$banner"; \
504
517
          skipped=""; \
505
518
          if test "$$skip" -ne 0; then \
506
 
            skipped="($$skip tests were not run)"; \
 
519
            if test "$$skip" -eq 1; then \
 
520
              skipped="($$skip test was not run)"; \
 
521
            else \
 
522
              skipped="($$skip tests were not run)"; \
 
523
            fi; \
507
524
            test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
508
525
              dashes="$$skipped"; \
509
526
          fi; \