Hello community, here is the log from the commit of package pam-config for openSUSE:Factory checked in at 2014-04-06 07:10:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pam-config (Old) and /work/SRC/openSUSE:Factory/.pam-config.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pam-config" Changes: -------- --- /work/SRC/openSUSE:Factory/pam-config/pam-config.changes 2013-02-07 14:25:26.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.pam-config.new/pam-config.changes 2014-04-06 07:10:30.000000000 +0200 @@ -1,0 +2,16 @@ +Wed Apr 2 15:25:47 CEST 2014 - [email protected] + +- Update to pam-config 0.87 + - Add support for pam_access.so +- Rervert last change, it will break manually adjusted config + files as documented + +------------------------------------------------------------------- +Mon Mar 17 13:02:30 UTC 2014 - [email protected] + +- "pam-config --debug --update" in the %post section fails if any + /etc/pam.d/common-$TYPE file is not a symlink to /etc/pam.d/common-$TYPE-pc. + Fix that by adding '--force'. This is mainly an update issue since + fresh configs are created appropriatly + +------------------------------------------------------------------- Old: ---- pam-config-0.86.tar.bz2 New: ---- pam-config-0.87.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pam-config.spec ++++++ --- /var/tmp/diff_new_pack.WMW0sh/_old 2014-04-06 07:10:30.000000000 +0200 +++ /var/tmp/diff_new_pack.WMW0sh/_new 2014-04-06 07:10:30.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package pam-config # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,7 +20,7 @@ Summary: Modify common PAM configuration files License: GPL-2.0 Group: System/Management -Version: 0.86 +Version: 0.87 Release: 0 PreReq: pam >= 0.99 Source: %{name}-%{version}.tar.bz2 ++++++ pam-config-0.86.tar.bz2 -> pam-config-0.87.tar.bz2 ++++++ ++++ 13548 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pam-config-0.86/ChangeLog new/pam-config-0.87/ChangeLog --- old/pam-config-0.86/ChangeLog 2013-02-07 09:54:48.000000000 +0100 +++ new/pam-config-0.87/ChangeLog 2014-04-02 15:10:18.000000000 +0200 @@ -1,3 +1,10 @@ +2014-04-02 Thorsten Kukuk <[email protected]> + + * rlease version 0.87 + + * src/mod_pam_access.c: New. + * src/supported-modules.h: Ad pam_access. + 2013-02-07 Thorsten Kukuk <[email protected]> * release version 0.86 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pam-config-0.86/NEWS new/pam-config-0.87/NEWS --- old/pam-config-0.86/NEWS 2013-02-07 09:58:54.000000000 +0100 +++ new/pam-config-0.87/NEWS 2014-04-02 15:12:02.000000000 +0200 @@ -1,9 +1,12 @@ pam-config NEWS -- history of user-visible changes. -Copyright (C) 2006-2013 Thorsten Kukuk <[email protected]>. +Copyright (C) 2006-2014 Thorsten Kukuk <[email protected]>. Please enter bug reports into bugzilla.novell.com. +Version 0.87 +* Add support for pam_access. + Version 0.86 * Revert last change regarding sha512. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pam-config-0.86/config.h.in new/pam-config-0.87/config.h.in --- old/pam-config-0.86/config.h.in 2013-02-07 09:55:53.000000000 +0100 +++ new/pam-config-0.87/config.h.in 2014-04-02 15:11:24.000000000 +0200 @@ -67,6 +67,9 @@ /* Define to the one symbol short name of this package. */ #undef PACKAGE_TARNAME +/* Define to the home page for this package. */ +#undef PACKAGE_URL + /* Define to the version of this package. */ #undef PACKAGE_VERSION diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pam-config-0.86/configure.in new/pam-config-0.87/configure.in --- old/pam-config-0.86/configure.in 2013-02-07 09:55:00.000000000 +0100 +++ new/pam-config-0.87/configure.in 2014-04-02 15:11:09.000000000 +0200 @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT(src/pam-config.c) -AM_INIT_AUTOMAKE("pam-config", 0.86) +AM_INIT_AUTOMAKE("pam-config", 0.87) AM_CONFIG_HEADER(config.h) AC_PREFIX_DEFAULT(/usr) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pam-config-0.86/src/Makefile.am new/pam-config-0.87/src/Makefile.am --- old/pam-config-0.86/src/Makefile.am 2012-11-12 14:09:34.000000000 +0100 +++ new/pam-config-0.87/src/Makefile.am 2014-04-02 14:45:02.000000000 +0200 @@ -31,7 +31,7 @@ mod_pam_csync.c mod_pam_fp.c mod_pam_fprint.c mod_pam_pwhistory.c \ mod_pam_selinux.c mod_pam_gnome_keyring.c mod_pam_passwdqc.c \ mod_pam_exec.c mod_pam_sss.c mod_pam_fprintd.c mod_pam_systemd.c \ - mod_pam_ecryptfs.c + mod_pam_ecryptfs.c mod_pam_access.c noinst_HEADERS = pam-config.h pam-module.h diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pam-config-0.86/src/mod_pam_access.c new/pam-config-0.87/src/mod_pam_access.c --- old/pam-config-0.86/src/mod_pam_access.c 1970-01-01 01:00:00.000000000 +0100 +++ new/pam-config-0.87/src/mod_pam_access.c 2014-04-02 15:09:12.000000000 +0200 @@ -0,0 +1,74 @@ +/* Copyright (C) 2014 Thorsten Kukuk + Author: Thorsten Kukuk <[email protected]> + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License version 2 as + published by the Free Software Foundation. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software Foundation, + Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + + +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <ctype.h> + +#include "pam-config.h" +#include "pam-module.h" + +static int +write_config_access (pam_module_t *this, enum write_type op, FILE *fp) +{ + option_set_t *opt_set = this->get_opt_set (this, op); + + if (debug) + debug_write_call (this, op); + + if (!opt_set->is_enabled (opt_set, "is_enabled")) + return 0; + + if (op != ACCOUNT) + return 0; + + fprintf (fp, "account\trequired\tpam_access.so\t"); + + WRITE_CONFIG_OPTIONS + + return 0; +} + + +GETOPT_START_1(ACCOUNT) +GETOPT_END_1(ACCOUNT) + +PRINT_ARGS("access") +PRINT_XMLHELP("access") + +/* ---- contruct module object ---- */ +DECLARE_BOOL_OPTS_4 (is_enabled, debug, nodefgroup, noaudit); +DECLARE_STRING_OPTS_3 (accessfile, fieldsep, listsep); +DECLARE_OPT_SETS; + +static module_helptext_t helptext[] = {{"", NULL, "pam_access for account access rules"}, + {NULL, NULL, NULL}}; + +/* at last construct the complete module object */ +pam_module_t mod_pam_access = { "pam_access.so", opt_sets, helptext, + &def_parse_config, + &def_print_module, + &write_config_access, + &get_opt_set, + &getopt, + &print_args, + &print_xmlhelp}; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pam-config-0.86/src/pam-config.8 new/pam-config-0.87/src/pam-config.8 --- old/pam-config-0.86/src/pam-config.8 2013-02-07 09:55:58.000000000 +0100 +++ new/pam-config-0.87/src/pam-config.8 2014-04-02 15:12:09.000000000 +0200 @@ -1,161 +1,22 @@ +'\" t .\" Title: pam-config .\" Author: [see the "AUTHOR" section] -.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/> -.\" Date: 02/07/2013 +.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/> +.\" Date: 04/02/2014 .\" Manual: Reference Manual .\" Source: Reference Manual .\" Language: English .\" -.TH "PAM\-CONFIG" "8" "02/07/2013" "Reference Manual" "Reference Manual" +.TH "PAM\-CONFIG" "8" "04/02/2014" "Reference Manual" "Reference Manual" .\" ----------------------------------------------------------------- -.\" * (re)Define some macros +.\" * Define some portability stuff .\" ----------------------------------------------------------------- .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" toupper - uppercase a string (locale-aware) +.\" http://bugs.debian.org/507673 +.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de toupper -.tr aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ -\\$* -.tr aabbccddeeffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" SH-xref - format a cross-reference to an SH section -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de SH-xref -.ie n \{\ -.\} -.toupper \\$* -.el \{\ -\\$* -.\} -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" SH - level-one heading that works better for non-TTY output -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de1 SH -.\" put an extra blank line of space above the head in non-TTY output -.if t \{\ -.sp 1 -.\} -.sp \\n[PD]u -.nr an-level 1 -.set-an-margin -.nr an-prevailing-indent \\n[IN] -.fi -.in \\n[an-margin]u -.ti 0 -.HTML-TAG ".NH \\n[an-level]" -.it 1 an-trap -.nr an-no-space-flag 1 -.nr an-break-flag 1 -\." make the size of the head bigger -.ps +3 -.ft B -.ne (2v + 1u) -.ie n \{\ -.\" if n (TTY output), use uppercase -.toupper \\$* -.\} -.el \{\ -.nr an-break-flag 0 -.\" if not n (not TTY), use normal case (not uppercase) -\\$1 -.in \\n[an-margin]u -.ti 0 -.\" if not n (not TTY), put a border/line under subheading -.sp -.6 -\l'\n(.lu' -.\} -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" SS - level-two heading that works better for non-TTY output -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de1 SS -.sp \\n[PD]u -.nr an-level 1 -.set-an-margin -.nr an-prevailing-indent \\n[IN] -.fi -.in \\n[IN]u -.ti \\n[SN]u -.it 1 an-trap -.nr an-no-space-flag 1 -.nr an-break-flag 1 -.ps \\n[PS-SS]u -\." make the size of the head bigger -.ps +2 -.ft B -.ne (2v + 1u) -.if \\n[.$] \&\\$* -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" BB/BE - put background/screen (filled box) around block of text -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de BB -.if t \{\ -.sp -.5 -.br -.in +2n -.ll -2n -.gcolor red -.di BX -.\} -.. -.de EB -.if t \{\ -.if "\\$2"adjust-for-leading-newline" \{\ -.sp -1 -.\} -.br -.di -.in -.ll -.gcolor -.nr BW \\n(.lu-\\n(.i -.nr BH \\n(dn+.5v -.ne \\n(BHu+.5v -.ie "\\$2"adjust-for-leading-newline" \{\ -\M[\\$1]\h'1n'\v'+.5v'\D'P \\n(BWu 0 0 \\n(BHu -\\n(BWu 0 0 -\\n(BHu'\M[] -.\} -.el \{\ -\M[\\$1]\h'1n'\v'-.5v'\D'P \\n(BWu 0 0 \\n(BHu -\\n(BWu 0 0 -\\n(BHu'\M[] -.\} -.in 0 -.sp -.5v -.nf -.BX -.in -.sp .5v -.fi -.\} -.. -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" BM/EM - put colored marker in margin next to block of text -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de BM -.if t \{\ -.br -.ll -2n -.gcolor red -.di BX -.\} -.. -.de EM -.if t \{\ -.br -.di -.ll -.gcolor -.nr BH \\n(dn -.ne \\n(BHu -\M[\\$1]\D'P -.75n 0 0 \\n(BHu -(\\n[.i]u - \\n(INu - .75n) 0 0 -\\n(BHu'\M[] -.in 0 -.nf -.BX -.in -.fi -.\} -.. +.ie \n(.g .ds Aq \(aq +.el .ds Aq ' .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- @@ -166,20 +27,15 @@ .\" ----------------------------------------------------------------- .\" * MAIN CONTENT STARTS HERE * .\" ----------------------------------------------------------------- -.SH "Name" +.SH "NAME" pam-config \- Adjust common PAM config files -.SH "Synopsis" -.fam C +.SH "SYNOPSIS" .HP \w'\fBpam\-config\fR\ 'u \fBpam\-config\fR [\-\-debug] [\-\-list\-modules] [\-\-service\ \fIservice\-name\fR] \-a | \-c | \-d | \-q [\-f] [\fImodule\-name\fR] -.fam -.fam C .HP \w'\fBpam\-config\fR\ 'u \fBpam\-config\fR \-\-version -.fam .SH "DESCRIPTION" .PP - \fBpam\-config\fR adjusts predefined PAM config files\&. .SH "OPTIONS" @@ -256,6 +112,53 @@ .PP The global modules get inserted into the common\-{account,auth,password,session} files which are included by the single service files\&. .PP +\fB\-\-access\fR +.RS 4 +pam_access for account access rules +.RE +.PP +\fB\-\-access\-debug\fR +.RS 4 +Add +\fBdebug\fR +option to all pam_access\&.so invocations\&. +.RE +.PP +\fB\-\-access\-nodefgroup\fR +.RS 4 +Add +\fBnodefgroup\fR +option to all pam_access\&.so invocations\&. +.RE +.PP +\fB\-\-access\-noaudit\fR +.RS 4 +Add +\fBnoaudit\fR +option to all pam_access\&.so invocations\&. +.RE +.PP +\fB\-\-access\-accessfile=\fR\fIvalue\fR +.RS 4 +Add +\fBaccessfile=\fR\fIvalue\fR +option to pam_access\&.so\&. +.RE +.PP +\fB\-\-access\-fieldsep=\fR\fIvalue\fR +.RS 4 +Add +\fBfieldsep=\fR\fIvalue\fR +option to pam_access\&.so\&. +.RE +.PP +\fB\-\-access\-listsep=\fR\fIvalue\fR +.RS 4 +Add +\fBlistsep=\fR\fIvalue\fR +option to pam_access\&.so\&. +.RE +.PP \fB\-\-apparmor\fR .RS 4 Enable/Disable pam_apparmor\&.so @@ -1214,9 +1117,7 @@ .RS 4 .PP These modules can only be added to single service files\&. See also -the section called \(lq\c -.SH-xref "USAGE EXAMPLES\c" -\&\(rq\&. +the section called \(lqUSAGE EXAMPLES\(rq\&. .PP \fB\-\-ck_connector\fR .RS 4 @@ -1369,7 +1270,7 @@ .RE .SH "NOTES" .PP -The configuration for gobal service modules written by pam\-config is ignored by the system if the common\-{account,auth,password,session} symlinks don\'t point to the common\-{account,auth,password,session}\-pc files\&. +The configuration for gobal service modules written by pam\-config is ignored by the system if the common\-{account,auth,password,session} symlinks don\*(Aqt point to the common\-{account,auth,password,session}\-pc files\&. .SH "USAGE EXAMPLES" .PP pam\-config \-q \-\-unix @@ -1393,7 +1294,6 @@ .RE .SH "SEE ALSO" .PP - \fBPAM\fR(8), \fBpam_unix\fR(8), \fBpam_cracklib\fR(8), @@ -1404,6 +1304,5 @@ \fBpam_make\fR(8) .SH "AUTHOR" .PP - \fBpam\-config\fR was written by Thorsten Kukuk <kukuk@thkukuk\&.de>\&. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pam-config-0.86/src/pam-config.8.xml new/pam-config-0.87/src/pam-config.8.xml --- old/pam-config-0.86/src/pam-config.8.xml 2013-02-07 09:55:57.000000000 +0100 +++ new/pam-config-0.87/src/pam-config.8.xml 2014-04-02 15:12:09.000000000 +0200 @@ -162,6 +162,62 @@ </para> <variablelist> <varlistentry> + <term><option>--access</option></term> + <listitem> + <para> + pam_access for account access rules + </para> + </listitem> + </varlistentry> + <varlistentry> + <term><option>--access-debug</option></term> + <listitem> + <para> + Add <option>debug</option> option to all pam_access.so invocations. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term><option>--access-nodefgroup</option></term> + <listitem> + <para> + Add <option>nodefgroup</option> option to all pam_access.so invocations. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term><option>--access-noaudit</option></term> + <listitem> + <para> + Add <option>noaudit</option> option to all pam_access.so invocations. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term><option>--access-accessfile=</option><replaceable>value</replaceable></term> + <listitem> + <para> + Add <option>accessfile=</option><replaceable>value</replaceable> option to pam_access.so. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term><option>--access-fieldsep=</option><replaceable>value</replaceable></term> + <listitem> + <para> + Add <option>fieldsep=</option><replaceable>value</replaceable> option to pam_access.so. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term><option>--access-listsep=</option><replaceable>value</replaceable></term> + <listitem> + <para> + Add <option>listsep=</option><replaceable>value</replaceable> option to pam_access.so. + </para> + </listitem> + </varlistentry> + <varlistentry> <term><option>--apparmor</option></term> <listitem> <para> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pam-config-0.86/src/pam-config.c new/pam-config-0.87/src/pam-config.c --- old/pam-config-0.86/src/pam-config.c 2013-02-07 09:54:07.000000000 +0100 +++ new/pam-config-0.87/src/pam-config.c 2014-04-02 14:49:36.000000000 +0200 @@ -1,4 +1,4 @@ -/* Copyright (C) 2006, 2007, 2008, 2009, 2012, 2013 Thorsten Kukuk +/* Copyright (C) 2006, 2007, 2008, 2009, 2012, 2013, 2014 Thorsten Kukuk Author: Thorsten Kukuk <[email protected]> This program is free software; you can redistribute it and/or modify @@ -752,7 +752,7 @@ print_xmlhelp (); return 0; case 'v': - print_version (program, "2008"); + print_version (program, "2014"); return 0; case 'u': print_usage (stdout, program); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pam-config-0.86/src/supported-modules.h new/pam-config-0.87/src/supported-modules.h --- old/pam-config-0.86/src/supported-modules.h 2012-11-12 14:09:34.000000000 +0100 +++ new/pam-config-0.87/src/supported-modules.h 2014-04-02 14:43:31.000000000 +0200 @@ -1,3 +1,4 @@ +extern pam_module_t mod_pam_access; extern pam_module_t mod_pam_apparmor; extern pam_module_t mod_pam_ccreds; extern pam_module_t mod_pam_cracklib; @@ -43,6 +44,7 @@ extern pam_module_t mod_pam_systemd; pam_module_t *common_module_list[] = { + &mod_pam_access, &mod_pam_apparmor, &mod_pam_ccreds, &mod_pam_cracklib, @@ -80,6 +82,7 @@ }; static pam_module_t *module_list_account[] = { + &mod_pam_access, &mod_pam_unix2, &mod_pam_unix, &mod_pam_krb5, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pam-config-0.86/tests/config/Makefile new/pam-config-0.87/tests/config/Makefile --- old/pam-config-0.86/tests/config/Makefile 2013-02-07 09:55:52.000000000 +0100 +++ new/pam-config-0.87/tests/config/Makefile 2014-04-02 15:11:23.000000000 +0200 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # tests/config/Makefile. Generated from Makefile.in by configure. -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -14,9 +14,55 @@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/pam-config -pkglibdir = $(libdir)/pam-config pkgincludedir = $(includedir)/pam-config +pkglibdir = $(libdir)/pam-config +pkglibexecdir = $(libexecdir)/pam-config am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c @@ -32,7 +78,8 @@ build_triplet = x86_64-suse-linux-gnu host_triplet = x86_64-suse-linux-gnu subdir = tests/config -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/mkinstalldirs ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \ @@ -46,14 +93,34 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_$(V)) +am__v_P_ = $(am__v_P_$(AM_DEFAULT_VERBOSITY)) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_$(V)) +am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_$(V)) +am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = ${SHELL} /home/kukuk/pakete/svn/pam-config/trunk/missing --run aclocal-1.10 -AMTAR = ${SHELL} /home/kukuk/pakete/svn/pam-config/trunk/missing --run tar -AUTOCONF = ${SHELL} /home/kukuk/pakete/svn/pam-config/trunk/missing --run autoconf -AUTOHEADER = ${SHELL} /home/kukuk/pakete/svn/pam-config/trunk/missing --run autoheader -AUTOMAKE = ${SHELL} /home/kukuk/pakete/svn/pam-config/trunk/missing --run automake-1.10 +ACLOCAL = aclocal-1.13 +AMTAR = $${TAR-tar} +AM_DEFAULT_VERBOSITY = 1 +AUTOCONF = autoconf +AUTOHEADER = autoheader +AUTOMAKE = automake-1.13 AWK = gawk CC = gcc CCDEPMODE = depmode=gcc3 @@ -66,12 +133,12 @@ ECHO_C = ECHO_N = -n ECHO_T = -EGREP = /bin/grep -E +EGREP = /usr/bin/grep -E EXEEXT = EXTRA_CFLAGS = -Werror -W -Wall -Wbad-function-cast -Wcast-align -Wcast-qual -DXTSTRINGDEFINES -Winline -Wmissing-declarations -Wmissing-prototypes -Wnested-externs -Wshadow -Wstrict-prototypes -Wundef GMSGFMT = /usr/bin/msgfmt GMSGFMT_015 = /usr/bin/msgfmt -GREP = /bin/grep +GREP = /usr/bin/grep INSTALL = /usr/bin/install -c INSTALL_DATA = ${INSTALL} -m 644 INSTALL_PROGRAM = ${INSTALL} @@ -87,7 +154,7 @@ LTLIBICONV = -liconv LTLIBINTL = LTLIBOBJS = -MAKEINFO = ${SHELL} /home/kukuk/pakete/svn/pam-config/trunk/missing --run makeinfo +MAKEINFO = makeinfo MKDIR_P = /bin/mkdir -p MSGFMT = /usr/bin/msgfmt MSGFMT_015 = /usr/bin/msgfmt @@ -98,6 +165,7 @@ PACKAGE_NAME = PACKAGE_STRING = PACKAGE_TARNAME = +PACKAGE_URL = PACKAGE_VERSION = PATH_SEPARATOR = : POSUB = po @@ -106,7 +174,7 @@ SHELL = /bin/sh STRIP = USE_NLS = yes -VERSION = 0.86 +VERSION = 0.87 XGETTEXT = /usr/bin/xgettext XGETTEXT_015 = /usr/bin/xgettext XMLCATALOG = /usr/bin/xmlcatalog @@ -121,8 +189,8 @@ am__include = include am__leading_dot = . am__quote = -am__tar = ${AMTAR} chof - "$$tardir" -am__untar = ${AMTAR} xf - +am__tar = $${TAR-tar} chof - "$$tardir" +am__untar = $${TAR-tar} xf - bindir = ${exec_prefix}/bin build = x86_64-suse-linux-gnu build_alias = @@ -143,7 +211,7 @@ htmldir = ${docdir} includedir = ${prefix}/include infodir = ${datarootdir}/info -install_sh = $(SHELL) /home/kukuk/pakete/svn/pam-config/trunk/install-sh +install_sh = ${SHELL} /home/kukuk/pakete/svn/pam-config/trunk/install-sh libdir = ${exec_prefix}/lib libexecdir = ${exec_prefix}/libexec localedir = ${datarootdir}/locale @@ -171,14 +239,14 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tests/config/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu tests/config/Makefile + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnits tests/config/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --gnits tests/config/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -196,11 +264,12 @@ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -tags: TAGS -TAGS: +$(am__aclocal_m4_deps): +tags TAGS: -ctags: CTAGS -CTAGS: +ctags CTAGS: + +cscope cscopelist: distdir: $(DISTFILES) @@ -219,13 +288,17 @@ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ if test -d $$d/$$file; then \ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ || exit 1; \ fi; \ done @@ -243,16 +316,22 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -271,6 +350,8 @@ html: html-am +html-am: + info: info-am info-am: @@ -279,18 +360,28 @@ install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am @@ -313,15 +404,17 @@ .MAKE: install-am install-strip -.PHONY: all all-am check check-am clean clean-generic distclean \ - distclean-generic distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am +.PHONY: all all-am check check-am clean clean-generic cscopelist-am \ + ctags-am distclean distclean-generic distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ + pdf-am ps ps-am tags-am uninstall uninstall-am + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pam-config-0.86/tests/pam-config.test/Makefile new/pam-config-0.87/tests/pam-config.test/Makefile --- old/pam-config-0.86/tests/pam-config.test/Makefile 2013-02-07 09:55:52.000000000 +0100 +++ new/pam-config-0.87/tests/pam-config.test/Makefile 2014-04-02 15:11:23.000000000 +0200 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # tests/pam-config.test/Makefile. Generated from Makefile.in by configure. -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -14,9 +14,55 @@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/pam-config -pkglibdir = $(libdir)/pam-config pkgincludedir = $(includedir)/pam-config +pkglibdir = $(libdir)/pam-config +pkglibexecdir = $(libexecdir)/pam-config am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c @@ -32,7 +78,8 @@ build_triplet = x86_64-suse-linux-gnu host_triplet = x86_64-suse-linux-gnu subdir = tests/pam-config.test -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/mkinstalldirs ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \ @@ -46,14 +93,34 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_$(V)) +am__v_P_ = $(am__v_P_$(AM_DEFAULT_VERBOSITY)) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_$(V)) +am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_$(V)) +am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = ${SHELL} /home/kukuk/pakete/svn/pam-config/trunk/missing --run aclocal-1.10 -AMTAR = ${SHELL} /home/kukuk/pakete/svn/pam-config/trunk/missing --run tar -AUTOCONF = ${SHELL} /home/kukuk/pakete/svn/pam-config/trunk/missing --run autoconf -AUTOHEADER = ${SHELL} /home/kukuk/pakete/svn/pam-config/trunk/missing --run autoheader -AUTOMAKE = ${SHELL} /home/kukuk/pakete/svn/pam-config/trunk/missing --run automake-1.10 +ACLOCAL = aclocal-1.13 +AMTAR = $${TAR-tar} +AM_DEFAULT_VERBOSITY = 1 +AUTOCONF = autoconf +AUTOHEADER = autoheader +AUTOMAKE = automake-1.13 AWK = gawk CC = gcc CCDEPMODE = depmode=gcc3 @@ -66,12 +133,12 @@ ECHO_C = ECHO_N = -n ECHO_T = -EGREP = /bin/grep -E +EGREP = /usr/bin/grep -E EXEEXT = EXTRA_CFLAGS = -Werror -W -Wall -Wbad-function-cast -Wcast-align -Wcast-qual -DXTSTRINGDEFINES -Winline -Wmissing-declarations -Wmissing-prototypes -Wnested-externs -Wshadow -Wstrict-prototypes -Wundef GMSGFMT = /usr/bin/msgfmt GMSGFMT_015 = /usr/bin/msgfmt -GREP = /bin/grep +GREP = /usr/bin/grep INSTALL = /usr/bin/install -c INSTALL_DATA = ${INSTALL} -m 644 INSTALL_PROGRAM = ${INSTALL} @@ -87,7 +154,7 @@ LTLIBICONV = -liconv LTLIBINTL = LTLIBOBJS = -MAKEINFO = ${SHELL} /home/kukuk/pakete/svn/pam-config/trunk/missing --run makeinfo +MAKEINFO = makeinfo MKDIR_P = /bin/mkdir -p MSGFMT = /usr/bin/msgfmt MSGFMT_015 = /usr/bin/msgfmt @@ -98,6 +165,7 @@ PACKAGE_NAME = PACKAGE_STRING = PACKAGE_TARNAME = +PACKAGE_URL = PACKAGE_VERSION = PATH_SEPARATOR = : POSUB = po @@ -106,7 +174,7 @@ SHELL = /bin/sh STRIP = USE_NLS = yes -VERSION = 0.86 +VERSION = 0.87 XGETTEXT = /usr/bin/xgettext XGETTEXT_015 = /usr/bin/xgettext XMLCATALOG = /usr/bin/xmlcatalog @@ -121,8 +189,8 @@ am__include = include am__leading_dot = . am__quote = -am__tar = ${AMTAR} chof - "$$tardir" -am__untar = ${AMTAR} xf - +am__tar = $${TAR-tar} chof - "$$tardir" +am__untar = $${TAR-tar} xf - bindir = ${exec_prefix}/bin build = x86_64-suse-linux-gnu build_alias = @@ -143,7 +211,7 @@ htmldir = ${docdir} includedir = ${prefix}/include infodir = ${datarootdir}/info -install_sh = $(SHELL) /home/kukuk/pakete/svn/pam-config/trunk/install-sh +install_sh = ${SHELL} /home/kukuk/pakete/svn/pam-config/trunk/install-sh libdir = ${exec_prefix}/lib libexecdir = ${exec_prefix}/libexec localedir = ${datarootdir}/locale @@ -171,14 +239,14 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tests/pam-config.test/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu tests/pam-config.test/Makefile + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnits tests/pam-config.test/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --gnits tests/pam-config.test/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -196,11 +264,12 @@ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -tags: TAGS -TAGS: +$(am__aclocal_m4_deps): +tags TAGS: -ctags: CTAGS -CTAGS: +ctags CTAGS: + +cscope cscopelist: distdir: $(DISTFILES) @@ -219,13 +288,17 @@ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ if test -d $$d/$$file; then \ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ || exit 1; \ fi; \ done @@ -243,16 +316,22 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -271,6 +350,8 @@ html: html-am +html-am: + info: info-am info-am: @@ -279,18 +360,28 @@ install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am @@ -313,15 +404,17 @@ .MAKE: install-am install-strip -.PHONY: all all-am check check-am clean clean-generic distclean \ - distclean-generic distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am +.PHONY: all all-am check check-am clean clean-generic cscopelist-am \ + ctags-am distclean distclean-generic distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ + pdf-am ps ps-am tags-am uninstall uninstall-am + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
