source: clfs-sysroot/patches/shadow-4.1.4.2-sysroot_hacks-1.patch@ bf90190

Last change on this file since bf90190 was ff4d8eb6, checked in by Joe Ciccone <jciccone@…>, 15 years ago

Updated Shadow to 4.1.4.2.
  • Property mode set to 100644
File size: 68.6 KB
RevLine 
[fc7c84a]1Submitted By: Joe Ciccone <jciccone@gmail.com>
2Date: 2006-11-24
3Initial Package Version: 4.0.18.1
4 Rediffed Against 4.1.2.2 by Joe Ciccone on 2009-01-03
5 Rediffed Against 4.1.4.1 by Joe Ciccone on 2009-07-11
[ff4d8eb6]6 Rediffed Against 4.1.4.2 by Joe Ciccone on 2009-07-26
[fc7c84a]7Origin: Joe Ciccone
8Upstream Status: None
9Description: Changes the hardcoded /etc to the value of the --sysconfdir
10 parameter passed to configure. Allows the utilities to be run
11 as a user other then root and properly modify the passwd and group
12 files for the target system. This patch also disables the
13 calls that flushes the nscd cache. There is no point in flushing
14 the hosts cache db when it wasn't modified.
15
[ff4d8eb6]16diff -Naur shadow-4.1.4.2.orig/aclocal.m4 shadow-4.1.4.2/aclocal.m4
17--- shadow-4.1.4.2.orig/aclocal.m4 2009-07-23 21:15:54.000000000 -0400
18+++ shadow-4.1.4.2/aclocal.m4 2009-07-26 14:30:10.903936315 -0400
[fc7c84a]19@@ -1,4 +1,4 @@
20-# generated automatically by aclocal 1.10.2 -*- Autoconf -*-
21+# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
22
23 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
24 # 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
25@@ -13,7 +13,7 @@
26
27 m4_ifndef([AC_AUTOCONF_VERSION],
28 [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
29-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.63],,
30+m4_if(AC_AUTOCONF_VERSION, [2.63],,
31 [m4_warning([this file was generated for autoconf 2.63.
32 You have another version of autoconf. It may work, but is not guaranteed to.
33 If you have problems, you may need to regenerate the build system entirely.
34@@ -4122,18 +4122,6 @@
35 dynamic_linker='GNU/Linux ld.so'
36 ;;
37
38-netbsdelf*-gnu)
39- version_type=linux
40- need_lib_prefix=no
41- need_version=no
42- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
43- soname_spec='${libname}${release}${shared_ext}$major'
44- shlibpath_var=LD_LIBRARY_PATH
45- shlibpath_overrides_runpath=no
46- hardcode_into_libs=yes
47- dynamic_linker='NetBSD ld.elf_so'
48- ;;
49-
50 netbsd*)
51 version_type=sunos
52 need_lib_prefix=no
53@@ -4725,7 +4713,7 @@
54 lt_cv_deplibs_check_method=pass_all
55 ;;
56
57-netbsd* | netbsdelf*-gnu)
58+netbsd*)
59 if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
60 lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
61 else
62@@ -5406,7 +5394,7 @@
63 ;;
64 esac
65 ;;
66- netbsd* | netbsdelf*-gnu)
67+ netbsd*)
68 ;;
69 *qnx* | *nto*)
70 # QNX uses GNU C++, but need to define -shared option too, otherwise
71@@ -5831,9 +5819,6 @@
72 cygwin* | mingw* | cegcc*)
73 _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
74 ;;
75- linux* | k*bsd*-gnu)
76- _LT_TAGVAR(link_all_deplibs, $1)=no
77- ;;
78 *)
79 _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
80 ;;
81@@ -5898,9 +5883,6 @@
82 openbsd*)
83 with_gnu_ld=no
84 ;;
85- linux* | k*bsd*-gnu)
86- _LT_TAGVAR(link_all_deplibs, $1)=no
87- ;;
88 esac
89
90 _LT_TAGVAR(ld_shlibs, $1)=yes
91@@ -6083,7 +6065,7 @@
92 fi
93 ;;
94
95- netbsd* | netbsdelf*-gnu)
96+ netbsd*)
97 if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
98 _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
99 wlarc=
100@@ -6258,7 +6240,6 @@
101 if test "$aix_use_runtimelinking" = yes; then
102 shared_flag="$shared_flag "'${wl}-G'
103 fi
104- _LT_TAGVAR(link_all_deplibs, $1)=no
105 else
106 # not using gcc
107 if test "$host_cpu" = ia64; then
108@@ -6497,7 +6478,7 @@
109 _LT_TAGVAR(link_all_deplibs, $1)=yes
110 ;;
111
112- netbsd* | netbsdelf*-gnu)
113+ netbsd*)
114 if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
115 _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
116 else
117@@ -10181,7 +10162,7 @@
118 AC_SUBST($1)dnl
119 ])
120
121-# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
122+# Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc.
123 #
124 # This file is free software; the Free Software Foundation
125 # gives unlimited permission to copy and/or distribute it,
126@@ -10196,7 +10177,7 @@
127 [am__api_version='1.10'
128 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
129 dnl require some minimum version. Point them to the right macro.
130-m4_if([$1], [1.10.2], [],
131+m4_if([$1], [1.10.1], [],
132 [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
133 ])
134
135@@ -10210,12 +10191,12 @@
136 # AM_SET_CURRENT_AUTOMAKE_VERSION
137 # -------------------------------
138 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
139-# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
140+# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
141 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
142-[AM_AUTOMAKE_VERSION([1.10.2])dnl
143+[AM_AUTOMAKE_VERSION([1.10.1])dnl
144 m4_ifndef([AC_AUTOCONF_VERSION],
145 [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
146-_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
147+_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)])
148
149 # AM_AUX_DIR_EXPAND -*- Autoconf -*-
150
151@@ -10465,28 +10446,19 @@
152
153 # Generate code to set up dependency tracking. -*- Autoconf -*-
154
155-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008
156+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
157 # Free Software Foundation, Inc.
158 #
159 # This file is free software; the Free Software Foundation
160 # gives unlimited permission to copy and/or distribute it,
161 # with or without modifications, as long as this notice is preserved.
162
163-#serial 4
164+#serial 3
165
166 # _AM_OUTPUT_DEPENDENCY_COMMANDS
167 # ------------------------------
168 AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
169-[# Autoconf 2.62 quotes --file arguments for eval, but not when files
170-# are listed without --file. Let's play safe and only enable the eval
171-# if we detect the quoting.
172-case $CONFIG_FILES in
173-*\'*) eval set x "$CONFIG_FILES" ;;
174-*) set x $CONFIG_FILES ;;
175-esac
176-shift
177-for mf
178-do
179+[for mf in $CONFIG_FILES; do
180 # Strip MF so we end up with the name of the file.
181 mf=`echo "$mf" | sed -e 's/:.*$//'`
182 # Check whether this is an Automake generated Makefile or not.
183@@ -10847,13 +10819,13 @@
184
185 # Helper functions for option handling. -*- Autoconf -*-
186
187-# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc.
188+# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
189 #
190 # This file is free software; the Free Software Foundation
191 # gives unlimited permission to copy and/or distribute it,
192 # with or without modifications, as long as this notice is preserved.
193
194-# serial 4
195+# serial 3
196
197 # _AM_MANGLE_OPTION(NAME)
198 # -----------------------
199@@ -10870,7 +10842,7 @@
200 # ----------------------------------
201 # OPTIONS is a space-separated list of Automake options.
202 AC_DEFUN([_AM_SET_OPTIONS],
203-[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
204+[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
205
206 # _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
207 # -------------------------------------------
[ff4d8eb6]208diff -Naur shadow-4.1.4.2.orig/configure shadow-4.1.4.2/configure
209--- shadow-4.1.4.2.orig/configure 2009-07-23 21:15:56.000000000 -0400
210+++ shadow-4.1.4.2/configure 2009-07-26 14:30:10.910389331 -0400
[fc7c84a]211@@ -6786,7 +6786,7 @@
212 lt_cv_deplibs_check_method=pass_all
213 ;;
214
215-netbsd* | netbsdelf*-gnu)
216+netbsd*)
217 if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
218 lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
219 else
220@@ -9444,9 +9444,6 @@
221 openbsd*)
222 with_gnu_ld=no
223 ;;
224- linux* | k*bsd*-gnu)
225- link_all_deplibs=no
226- ;;
227 esac
228
229 ld_shlibs=yes
230@@ -9629,7 +9626,7 @@
231 fi
232 ;;
233
234- netbsd* | netbsdelf*-gnu)
235+ netbsd*)
236 if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
237 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
238 wlarc=
239@@ -9804,7 +9801,6 @@
240 if test "$aix_use_runtimelinking" = yes; then
241 shared_flag="$shared_flag "'${wl}-G'
242 fi
243- link_all_deplibs=no
244 else
245 # not using gcc
246 if test "$host_cpu" = ia64; then
247@@ -10219,7 +10215,7 @@
248 link_all_deplibs=yes
249 ;;
250
251- netbsd* | netbsdelf*-gnu)
252+ netbsd*)
253 if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
254 archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
255 else
256@@ -11196,18 +11192,6 @@
257 dynamic_linker='GNU/Linux ld.so'
258 ;;
259
260-netbsdelf*-gnu)
261- version_type=linux
262- need_lib_prefix=no
263- need_version=no
264- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
265- soname_spec='${libname}${release}${shared_ext}$major'
266- shlibpath_var=LD_LIBRARY_PATH
267- shlibpath_overrides_runpath=no
268- hardcode_into_libs=yes
269- dynamic_linker='NetBSD ld.elf_so'
270- ;;
271-
272 netbsd*)
273 version_type=sunos
274 need_lib_prefix=no
275@@ -12141,7 +12125,7 @@
276 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
277 lt_status=$lt_dlunknown
278 cat > conftest.$ac_ext <<_LT_EOF
279-#line 12144 "configure"
280+#line 12128 "configure"
281 #include "confdefs.h"
282
283 #if HAVE_DLFCN_H
284@@ -12237,7 +12221,7 @@
285 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
286 lt_status=$lt_dlunknown
287 cat > conftest.$ac_ext <<_LT_EOF
288-#line 12240 "configure"
289+#line 12224 "configure"
290 #include "confdefs.h"
291
292 #if HAVE_DLFCN_H
[ff4d8eb6]293@@ -24905,16 +24889,7 @@
[fc7c84a]294
295
296 case $ac_file$ac_mode in
297- "depfiles":C) test x"$AMDEP_TRUE" != x"" || # Autoconf 2.62 quotes --file arguments for eval, but not when files
298-# are listed without --file. Let's play safe and only enable the eval
299-# if we detect the quoting.
300-case $CONFIG_FILES in
301-*\'*) eval set x "$CONFIG_FILES" ;;
302-*) set x $CONFIG_FILES ;;
303-esac
304-shift
305-for mf
306-do
307+ "depfiles":C) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do
308 # Strip MF so we end up with the name of the file.
309 mf=`echo "$mf" | sed -e 's/:.*$//'`
310 # Check whether this is an Automake generated Makefile or not.
[ff4d8eb6]311diff -Naur shadow-4.1.4.2.orig/contrib/Makefile.in shadow-4.1.4.2/contrib/Makefile.in
312--- shadow-4.1.4.2.orig/contrib/Makefile.in 2009-07-23 21:15:59.000000000 -0400
313+++ shadow-4.1.4.2/contrib/Makefile.in 2009-07-26 14:30:10.910389331 -0400
[fc7c84a]314@@ -1,4 +1,4 @@
315-# Makefile.in generated by automake 1.10.2 from Makefile.am.
316+# Makefile.in generated by automake 1.10.1 from Makefile.am.
317 # @configure_input@
318
319 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
320@@ -200,8 +200,8 @@
321 @for dep in $?; do \
322 case '$(am__configure_deps)' in \
323 *$$dep*) \
324- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
325- && { if test -f $@; then exit 0; else break; fi; }; \
326+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
327+ && exit 0; \
328 exit 1;; \
329 esac; \
330 done; \
[ff4d8eb6]331diff -Naur shadow-4.1.4.2.orig/doc/Makefile.in shadow-4.1.4.2/doc/Makefile.in
332--- shadow-4.1.4.2.orig/doc/Makefile.in 2009-07-23 21:15:59.000000000 -0400
333+++ shadow-4.1.4.2/doc/Makefile.in 2009-07-26 14:30:10.910389331 -0400
[fc7c84a]334@@ -1,4 +1,4 @@
335-# Makefile.in generated by automake 1.10.2 from Makefile.am.
336+# Makefile.in generated by automake 1.10.1 from Makefile.am.
337 # @configure_input@
338
339 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
340@@ -199,8 +199,8 @@
341 @for dep in $?; do \
342 case '$(am__configure_deps)' in \
343 *$$dep*) \
344- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
345- && { if test -f $@; then exit 0; else break; fi; }; \
346+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
347+ && exit 0; \
348 exit 1;; \
349 esac; \
350 done; \
[ff4d8eb6]351diff -Naur shadow-4.1.4.2.orig/etc/Makefile.in shadow-4.1.4.2/etc/Makefile.in
352--- shadow-4.1.4.2.orig/etc/Makefile.in 2009-07-23 21:15:59.000000000 -0400
353+++ shadow-4.1.4.2/etc/Makefile.in 2009-07-26 14:30:10.910389331 -0400
[fc7c84a]354@@ -1,4 +1,4 @@
355-# Makefile.in generated by automake 1.10.2 from Makefile.am.
356+# Makefile.in generated by automake 1.10.1 from Makefile.am.
357 # @configure_input@
358
359 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
360@@ -238,8 +238,8 @@
361 @for dep in $?; do \
362 case '$(am__configure_deps)' in \
363 *$$dep*) \
364- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
365- && { if test -f $@; then exit 0; else break; fi; }; \
366+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
367+ && exit 0; \
368 exit 1;; \
369 esac; \
370 done; \
371@@ -396,7 +396,7 @@
372 unique=`for i in $$list; do \
373 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
374 done | \
375- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
376+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
377 END { if (nonempty) { for (i in files) print i; }; }'`; \
378 mkid -fID $$unique
379 tags: TAGS
[ff4d8eb6]380diff -Naur shadow-4.1.4.2.orig/etc/pam.d/Makefile.in shadow-4.1.4.2/etc/pam.d/Makefile.in
381--- shadow-4.1.4.2.orig/etc/pam.d/Makefile.in 2009-07-23 21:15:59.000000000 -0400
382+++ shadow-4.1.4.2/etc/pam.d/Makefile.in 2009-07-26 14:30:10.910389331 -0400
[fc7c84a]383@@ -1,4 +1,4 @@
384-# Makefile.in generated by automake 1.10.2 from Makefile.am.
385+# Makefile.in generated by automake 1.10.1 from Makefile.am.
386 # @configure_input@
387
388 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
389@@ -230,8 +230,8 @@
390 @for dep in $?; do \
391 case '$(am__configure_deps)' in \
392 *$$dep*) \
393- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
394- && { if test -f $@; then exit 0; else break; fi; }; \
395+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
396+ && exit 0; \
397 exit 1;; \
398 esac; \
399 done; \
[ff4d8eb6]400diff -Naur shadow-4.1.4.2.orig/lib/commonio.c shadow-4.1.4.2/lib/commonio.c
401--- shadow-4.1.4.2.orig/lib/commonio.c 2009-05-10 09:49:05.000000000 -0400
402+++ shadow-4.1.4.2/lib/commonio.c 2009-07-26 14:30:10.910389331 -0400
[fc7c84a]403@@ -215,16 +215,6 @@
404 return NULL;
405 }
406
407-#ifdef HAVE_FCHOWN
408- if (fchown (fileno (fp), sb->st_uid, sb->st_gid) != 0) {
409- goto fail;
410- }
411-#else
412- if (chown (name, sb->st_mode) != 0) {
413- goto fail;
414- }
415-#endif
416-
417 #ifdef HAVE_FCHMOD
418 if (fchmod (fileno (fp), sb->st_mode & 0664) != 0) {
419 goto fail;
420@@ -408,8 +398,8 @@
421 /* Tell nscd when lock count goes to zero,
422 if any of the files were changed. */
423 if (nscd_need_reload) {
424- nscd_flush_cache ("passwd");
425- nscd_flush_cache ("group");
426+// nscd_flush_cache ("passwd");
427+// nscd_flush_cache ("group");
428 nscd_need_reload = false;
429 }
430 #ifdef HAVE_LCKPWDF
431@@ -872,7 +862,7 @@
432 * Default permissions for new [g]shadow files.
433 * (passwd and group always exist...)
434 */
435- sb.st_mode = 0400;
436+ sb.st_mode = 0600;
437 sb.st_uid = 0;
438 sb.st_gid = 0;
439 }
[ff4d8eb6]440diff -Naur shadow-4.1.4.2.orig/lib/defines.h shadow-4.1.4.2/lib/defines.h
441--- shadow-4.1.4.2.orig/lib/defines.h 2009-05-19 04:05:10.000000000 -0400
442+++ shadow-4.1.4.2/lib/defines.h 2009-07-26 14:30:10.910389331 -0400
[fc7c84a]443@@ -299,20 +299,20 @@
444 (strncpy((A), (B), sizeof(A) - 1), (A)[sizeof(A) - 1] = '\0')
445
446 #ifndef PASSWD_FILE
447-#define PASSWD_FILE "/etc/passwd"
448+#define PASSWD_FILE SYSCONFDIR"/passwd"
449 #endif
450
451 #ifndef GROUP_FILE
452-#define GROUP_FILE "/etc/group"
453+#define GROUP_FILE SYSCONFDIR"/group"
454 #endif
455
456 #ifndef SHADOW_FILE
457-#define SHADOW_FILE "/etc/shadow"
458+#define SHADOW_FILE SYSCONFDIR"/shadow"
459 #endif
460
461 #ifdef SHADOWGRP
462 #ifndef SGROUP_FILE
463-#define SGROUP_FILE "/etc/gshadow"
464+#define SGROUP_FILE SYSCONFDIR"/gshadow"
465 #endif
466 #endif
467
[ff4d8eb6]468diff -Naur shadow-4.1.4.2.orig/lib/getdef.c shadow-4.1.4.2/lib/getdef.c
469--- shadow-4.1.4.2.orig/lib/getdef.c 2009-04-23 07:46:47.000000000 -0400
470+++ shadow-4.1.4.2/lib/getdef.c 2009-07-26 14:30:10.914142709 -0400
[fc7c84a]471@@ -128,7 +128,7 @@
472 };
473
474 #ifndef LOGINDEFS
475-#define LOGINDEFS "/etc/login.defs"
476+#define LOGINDEFS SYSCONFDIR"/login.defs"
477 #endif
478
479 static char def_fname[] = LOGINDEFS; /* login config defs file */
[ff4d8eb6]480diff -Naur shadow-4.1.4.2.orig/lib/gshadow_.h shadow-4.1.4.2/lib/gshadow_.h
481--- shadow-4.1.4.2.orig/lib/gshadow_.h 2009-04-24 20:20:11.000000000 -0400
482+++ shadow-4.1.4.2/lib/gshadow_.h 2009-07-26 14:30:10.914142709 -0400
[fc7c84a]483@@ -71,5 +71,5 @@
484 int putsgent ();
485 #endif
486
487-#define GSHADOW "/etc/gshadow"
488+#define GSHADOW SYSCONFDIR"/gshadow"
489 #endif /* ifndef _H_GSHADOW */
[ff4d8eb6]490diff -Naur shadow-4.1.4.2.orig/lib/Makefile.am shadow-4.1.4.2/lib/Makefile.am
491--- shadow-4.1.4.2.orig/lib/Makefile.am 2009-04-24 05:47:28.000000000 -0400
492+++ shadow-4.1.4.2/lib/Makefile.am 2009-07-26 14:30:10.914142709 -0400
[fc7c84a]493@@ -2,6 +2,7 @@
494 AUTOMAKE_OPTIONS = 1.0 foreign
495
496 DEFS =
497+AM_CPPFLAGS = -DSYSCONFDIR=\"$(sysconfdir)\"
498
499 noinst_LTLIBRARIES = libshadow.la
500
[ff4d8eb6]501diff -Naur shadow-4.1.4.2.orig/lib/Makefile.in shadow-4.1.4.2/lib/Makefile.in
502--- shadow-4.1.4.2.orig/lib/Makefile.in 2009-07-23 21:15:59.000000000 -0400
503+++ shadow-4.1.4.2/lib/Makefile.in 2009-07-26 14:30:10.914142709 -0400
[fc7c84a]504@@ -1,4 +1,4 @@
505-# Makefile.in generated by automake 1.10.2 from Makefile.am.
506+# Makefile.in generated by automake 1.10.1 from Makefile.am.
507 # @configure_input@
508
509 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
510@@ -214,6 +214,7 @@
511 top_builddir = @top_builddir@
512 top_srcdir = @top_srcdir@
513 AUTOMAKE_OPTIONS = 1.0 foreign
514+AM_CPPFLAGS = -DSYSCONFDIR=\"$(sysconfdir)\"
515 noinst_LTLIBRARIES = libshadow.la
516 libshadow_la_LDFLAGS = -version-info 0:0:0
517 libshadow_la_SOURCES = \
518@@ -275,8 +276,8 @@
519 @for dep in $?; do \
520 case '$(am__configure_deps)' in \
521 *$$dep*) \
522- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
523- && { if test -f $@; then exit 0; else break; fi; }; \
524+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
525+ && exit 0; \
526 exit 1;; \
527 esac; \
528 done; \
529@@ -377,7 +378,7 @@
530 unique=`for i in $$list; do \
531 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
532 done | \
533- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
534+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
535 END { if (nonempty) { for (i in files) print i; }; }'`; \
536 mkid -fID $$unique
537 tags: TAGS
[ff4d8eb6]538diff -Naur shadow-4.1.4.2.orig/lib/port.h shadow-4.1.4.2/lib/port.h
539--- shadow-4.1.4.2.orig/lib/port.h 2008-04-26 20:40:13.000000000 -0400
540+++ shadow-4.1.4.2/lib/port.h 2009-07-26 14:30:10.914142709 -0400
[fc7c84a]541@@ -52,7 +52,7 @@
542 * PORT_DAY - Day of the week to a bit value (0 = Sunday).
543 */
544
545-#define PORTS "/etc/porttime"
546+#define PORTS SYSCONFDIR"/porttime"
547 #define PORT_IDS 64
548 #define PORT_TTY 64
549 #define PORT_TIMES 24
[ff4d8eb6]550diff -Naur shadow-4.1.4.2.orig/libmisc/limits.c shadow-4.1.4.2/libmisc/limits.c
551--- shadow-4.1.4.2.orig/libmisc/limits.c 2009-04-30 17:08:50.000000000 -0400
552+++ shadow-4.1.4.2/libmisc/limits.c 2009-07-26 14:30:10.914142709 -0400
[fc7c84a]553@@ -54,7 +54,7 @@
554 #endif
555 #ifdef LIMITS
556 #ifndef LIMITS_FILE
557-#define LIMITS_FILE "/etc/limits"
558+#define LIMITS_FILE SYSCONFDIR"/limits"
559 #endif
560 #define LOGIN_ERROR_RLIMIT 1
561 #define LOGIN_ERROR_LOGIN 2
[ff4d8eb6]562diff -Naur shadow-4.1.4.2.orig/libmisc/Makefile.am shadow-4.1.4.2/libmisc/Makefile.am
563--- shadow-4.1.4.2.orig/libmisc/Makefile.am 2009-05-17 14:39:06.000000000 -0400
564+++ shadow-4.1.4.2/libmisc/Makefile.am 2009-07-26 14:30:10.914142709 -0400
[fc7c84a]565@@ -1,6 +1,8 @@
566
567 EXTRA_DIST = .indent.pro xgetXXbyYY.c
568
569+AM_CPPFLAGS = -DSYSCONFDIR=\"$(sysconfdir)\"
570+
571 INCLUDES = -I$(top_srcdir)/lib
572
573 noinst_LIBRARIES = libmisc.a
[ff4d8eb6]574diff -Naur shadow-4.1.4.2.orig/libmisc/Makefile.in shadow-4.1.4.2/libmisc/Makefile.in
575--- shadow-4.1.4.2.orig/libmisc/Makefile.in 2009-07-23 21:15:59.000000000 -0400
576+++ shadow-4.1.4.2/libmisc/Makefile.in 2009-07-26 14:30:10.914142709 -0400
[fc7c84a]577@@ -1,4 +1,4 @@
578-# Makefile.in generated by automake 1.10.2 from Makefile.am.
579+# Makefile.in generated by automake 1.10.1 from Makefile.am.
580 # @configure_input@
581
582 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
583@@ -233,6 +233,7 @@
584 top_builddir = @top_builddir@
585 top_srcdir = @top_srcdir@
586 EXTRA_DIST = .indent.pro xgetXXbyYY.c
587+AM_CPPFLAGS = -DSYSCONFDIR=\"$(sysconfdir)\"
588 INCLUDES = -I$(top_srcdir)/lib
589 noinst_LIBRARIES = libmisc.a
590 libmisc_a_SOURCES = \
591@@ -305,8 +306,8 @@
592 @for dep in $?; do \
593 case '$(am__configure_deps)' in \
594 *$$dep*) \
595- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
596- && { if test -f $@; then exit 0; else break; fi; }; \
597+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
598+ && exit 0; \
599 exit 1;; \
600 esac; \
601 done; \
602@@ -438,7 +439,7 @@
603 unique=`for i in $$list; do \
604 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
605 done | \
606- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
607+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
608 END { if (nonempty) { for (i in files) print i; }; }'`; \
609 mkid -fID $$unique
610 tags: TAGS
[ff4d8eb6]611diff -Naur shadow-4.1.4.2.orig/Makefile.in shadow-4.1.4.2/Makefile.in
612--- shadow-4.1.4.2.orig/Makefile.in 2009-07-23 21:16:00.000000000 -0400
613+++ shadow-4.1.4.2/Makefile.in 2009-07-26 14:30:10.914142709 -0400
[fc7c84a]614@@ -1,4 +1,4 @@
615-# Makefile.in generated by automake 1.10.2 from Makefile.am.
616+# Makefile.in generated by automake 1.10.1 from Makefile.am.
617 # @configure_input@
618
619 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
620@@ -283,7 +283,7 @@
621 -rm -rf .libs _libs
622
623 distclean-libtool:
624- -rm -f libtool config.lt
625+ -rm -f libtool
626
627 # This directory's subdirectories are mostly independent; you can cd
628 # into them and run `make' without going through this Makefile.
629@@ -360,7 +360,7 @@
630 unique=`for i in $$list; do \
631 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
632 done | \
633- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
634+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
635 END { if (nonempty) { for (i in files) print i; }; }'`; \
636 mkid -fID $$unique
637 tags: TAGS
[ff4d8eb6]638diff -Naur shadow-4.1.4.2.orig/man/cs/Makefile.in shadow-4.1.4.2/man/cs/Makefile.in
639--- shadow-4.1.4.2.orig/man/cs/Makefile.in 2009-07-23 21:15:59.000000000 -0400
640+++ shadow-4.1.4.2/man/cs/Makefile.in 2009-07-26 14:30:10.914142709 -0400
[fc7c84a]641@@ -1,4 +1,4 @@
642-# Makefile.in generated by automake 1.10.2 from Makefile.am.
643+# Makefile.in generated by automake 1.10.1 from Makefile.am.
644 # @configure_input@
645
646 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
647@@ -223,8 +223,8 @@
648 @for dep in $?; do \
649 case '$(am__configure_deps)' in \
650 *$$dep*) \
651- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
652- && { if test -f $@; then exit 0; else break; fi; }; \
653+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
654+ && exit 0; \
655 exit 1;; \
656 esac; \
657 done; \
658@@ -265,8 +265,8 @@
659 esac; \
660 done; \
661 for i in $$list; do \
662- if test -f $$i; then file=$$i; \
663- else file=$(srcdir)/$$i; fi; \
664+ if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
665+ else file=$$i; fi; \
666 ext=`echo $$i | sed -e 's/^.*\\.//'`; \
667 case "$$ext" in \
668 1*) ;; \
669@@ -310,8 +310,8 @@
670 esac; \
671 done; \
672 for i in $$list; do \
673- if test -f $$i; then file=$$i; \
674- else file=$(srcdir)/$$i; fi; \
675+ if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
676+ else file=$$i; fi; \
677 ext=`echo $$i | sed -e 's/^.*\\.//'`; \
678 case "$$ext" in \
679 5*) ;; \
680@@ -355,8 +355,8 @@
681 esac; \
682 done; \
683 for i in $$list; do \
684- if test -f $$i; then file=$$i; \
685- else file=$(srcdir)/$$i; fi; \
686+ if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
687+ else file=$$i; fi; \
688 ext=`echo $$i | sed -e 's/^.*\\.//'`; \
689 case "$$ext" in \
690 8*) ;; \
[ff4d8eb6]691diff -Naur shadow-4.1.4.2.orig/man/de/Makefile.in shadow-4.1.4.2/man/de/Makefile.in
692--- shadow-4.1.4.2.orig/man/de/Makefile.in 2009-07-23 21:15:59.000000000 -0400
693+++ shadow-4.1.4.2/man/de/Makefile.in 2009-07-26 14:30:10.914142709 -0400
[fc7c84a]694@@ -1,4 +1,4 @@
695-# Makefile.in generated by automake 1.10.2 from Makefile.am.
696+# Makefile.in generated by automake 1.10.1 from Makefile.am.
697 # @configure_input@
698
699 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
700@@ -223,8 +223,8 @@
701 @for dep in $?; do \
702 case '$(am__configure_deps)' in \
703 *$$dep*) \
704- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
705- && { if test -f $@; then exit 0; else break; fi; }; \
706+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
707+ && exit 0; \
708 exit 1;; \
709 esac; \
710 done; \
711@@ -265,8 +265,8 @@
712 esac; \
713 done; \
714 for i in $$list; do \
715- if test -f $$i; then file=$$i; \
716- else file=$(srcdir)/$$i; fi; \
717+ if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
718+ else file=$$i; fi; \
719 ext=`echo $$i | sed -e 's/^.*\\.//'`; \
720 case "$$ext" in \
721 1*) ;; \
722@@ -310,8 +310,8 @@
723 esac; \
724 done; \
725 for i in $$list; do \
726- if test -f $$i; then file=$$i; \
727- else file=$(srcdir)/$$i; fi; \
728+ if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
729+ else file=$$i; fi; \
730 ext=`echo $$i | sed -e 's/^.*\\.//'`; \
731 case "$$ext" in \
732 5*) ;; \
733@@ -355,8 +355,8 @@
734 esac; \
735 done; \
736 for i in $$list; do \
737- if test -f $$i; then file=$$i; \
738- else file=$(srcdir)/$$i; fi; \
739+ if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
740+ else file=$$i; fi; \
741 ext=`echo $$i | sed -e 's/^.*\\.//'`; \
742 case "$$ext" in \
743 8*) ;; \
[ff4d8eb6]744diff -Naur shadow-4.1.4.2.orig/man/es/Makefile.in shadow-4.1.4.2/man/es/Makefile.in
745--- shadow-4.1.4.2.orig/man/es/Makefile.in 2009-07-23 21:15:59.000000000 -0400
746+++ shadow-4.1.4.2/man/es/Makefile.in 2009-07-26 14:30:10.917476044 -0400
[fc7c84a]747@@ -1,4 +1,4 @@
748-# Makefile.in generated by automake 1.10.2 from Makefile.am.
749+# Makefile.in generated by automake 1.10.1 from Makefile.am.
750 # @configure_input@
751
752 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
753@@ -206,8 +206,8 @@
754 @for dep in $?; do \
755 case '$(am__configure_deps)' in \
756 *$$dep*) \
757- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
758- && { if test -f $@; then exit 0; else break; fi; }; \
759+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
760+ && exit 0; \
761 exit 1;; \
762 esac; \
763 done; \
[ff4d8eb6]764diff -Naur shadow-4.1.4.2.orig/man/fi/Makefile.in shadow-4.1.4.2/man/fi/Makefile.in
765--- shadow-4.1.4.2.orig/man/fi/Makefile.in 2009-07-23 21:15:59.000000000 -0400
766+++ shadow-4.1.4.2/man/fi/Makefile.in 2009-07-26 14:30:10.917476044 -0400
[fc7c84a]767@@ -1,4 +1,4 @@
768-# Makefile.in generated by automake 1.10.2 from Makefile.am.
769+# Makefile.in generated by automake 1.10.1 from Makefile.am.
770 # @configure_input@
771
772 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
[ff4d8eb6]773@@ -206,8 +206,8 @@
[fc7c84a]774 @for dep in $?; do \
775 case '$(am__configure_deps)' in \
776 *$$dep*) \
777- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
778- && { if test -f $@; then exit 0; else break; fi; }; \
779+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
780+ && exit 0; \
781 exit 1;; \
782 esac; \
783 done; \
[ff4d8eb6]784@@ -248,8 +248,8 @@
[fc7c84a]785 esac; \
786 done; \
787 for i in $$list; do \
788- if test -f $$i; then file=$$i; \
789- else file=$(srcdir)/$$i; fi; \
790+ if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
791+ else file=$$i; fi; \
792 ext=`echo $$i | sed -e 's/^.*\\.//'`; \
793 case "$$ext" in \
794 1*) ;; \
[ff4d8eb6]795diff -Naur shadow-4.1.4.2.orig/man/fr/Makefile.in shadow-4.1.4.2/man/fr/Makefile.in
796--- shadow-4.1.4.2.orig/man/fr/Makefile.in 2009-07-23 21:15:59.000000000 -0400
797+++ shadow-4.1.4.2/man/fr/Makefile.in 2009-07-26 14:30:10.917476044 -0400
[fc7c84a]798@@ -1,4 +1,4 @@
799-# Makefile.in generated by automake 1.10.2 from Makefile.am.
800+# Makefile.in generated by automake 1.10.1 from Makefile.am.
801 # @configure_input@
802
803 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
804@@ -229,8 +229,8 @@
805 @for dep in $?; do \
806 case '$(am__configure_deps)' in \
807 *$$dep*) \
808- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
809- && { if test -f $@; then exit 0; else break; fi; }; \
810+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
811+ && exit 0; \
812 exit 1;; \
813 esac; \
814 done; \
815@@ -271,8 +271,8 @@
816 esac; \
817 done; \
818 for i in $$list; do \
819- if test -f $$i; then file=$$i; \
820- else file=$(srcdir)/$$i; fi; \
821+ if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
822+ else file=$$i; fi; \
823 ext=`echo $$i | sed -e 's/^.*\\.//'`; \
824 case "$$ext" in \
825 1*) ;; \
826@@ -316,8 +316,8 @@
827 esac; \
828 done; \
829 for i in $$list; do \
830- if test -f $$i; then file=$$i; \
831- else file=$(srcdir)/$$i; fi; \
832+ if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
833+ else file=$$i; fi; \
834 ext=`echo $$i | sed -e 's/^.*\\.//'`; \
835 case "$$ext" in \
836 3*) ;; \
837@@ -361,8 +361,8 @@
838 esac; \
839 done; \
840 for i in $$list; do \
841- if test -f $$i; then file=$$i; \
842- else file=$(srcdir)/$$i; fi; \
843+ if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
844+ else file=$$i; fi; \
845 ext=`echo $$i | sed -e 's/^.*\\.//'`; \
846 case "$$ext" in \
847 5*) ;; \
848@@ -406,8 +406,8 @@
849 esac; \
850 done; \
851 for i in $$list; do \
852- if test -f $$i; then file=$$i; \
853- else file=$(srcdir)/$$i; fi; \
854+ if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
855+ else file=$$i; fi; \
856 ext=`echo $$i | sed -e 's/^.*\\.//'`; \
857 case "$$ext" in \
858 8*) ;; \
[ff4d8eb6]859diff -Naur shadow-4.1.4.2.orig/man/hu/Makefile.in shadow-4.1.4.2/man/hu/Makefile.in
860--- shadow-4.1.4.2.orig/man/hu/Makefile.in 2009-07-23 21:15:59.000000000 -0400
861+++ shadow-4.1.4.2/man/hu/Makefile.in 2009-07-26 14:30:10.917476044 -0400
[fc7c84a]862@@ -1,4 +1,4 @@
863-# Makefile.in generated by automake 1.10.2 from Makefile.am.
864+# Makefile.in generated by automake 1.10.1 from Makefile.am.
865 # @configure_input@
866
867 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
868@@ -213,8 +213,8 @@
869 @for dep in $?; do \
870 case '$(am__configure_deps)' in \
871 *$$dep*) \
872- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
873- && { if test -f $@; then exit 0; else break; fi; }; \
874+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
875+ && exit 0; \
876 exit 1;; \
877 esac; \
878 done; \
879@@ -255,8 +255,8 @@
880 esac; \
881 done; \
882 for i in $$list; do \
883- if test -f $$i; then file=$$i; \
884- else file=$(srcdir)/$$i; fi; \
885+ if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
886+ else file=$$i; fi; \
887 ext=`echo $$i | sed -e 's/^.*\\.//'`; \
888 case "$$ext" in \
889 1*) ;; \
890@@ -300,8 +300,8 @@
891 esac; \
892 done; \
893 for i in $$list; do \
894- if test -f $$i; then file=$$i; \
895- else file=$(srcdir)/$$i; fi; \
896+ if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
897+ else file=$$i; fi; \
898 ext=`echo $$i | sed -e 's/^.*\\.//'`; \
899 case "$$ext" in \
900 5*) ;; \
901@@ -345,8 +345,8 @@
902 esac; \
903 done; \
904 for i in $$list; do \
905- if test -f $$i; then file=$$i; \
906- else file=$(srcdir)/$$i; fi; \
907+ if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
908+ else file=$$i; fi; \
909 ext=`echo $$i | sed -e 's/^.*\\.//'`; \
910 case "$$ext" in \
911 8*) ;; \
[ff4d8eb6]912diff -Naur shadow-4.1.4.2.orig/man/id/Makefile.in shadow-4.1.4.2/man/id/Makefile.in
913--- shadow-4.1.4.2.orig/man/id/Makefile.in 2009-07-23 21:15:59.000000000 -0400
914+++ shadow-4.1.4.2/man/id/Makefile.in 2009-07-26 14:30:10.917476044 -0400
[fc7c84a]915@@ -1,4 +1,4 @@
916-# Makefile.in generated by automake 1.10.2 from Makefile.am.
917+# Makefile.in generated by automake 1.10.1 from Makefile.am.
918 # @configure_input@
919
920 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
921@@ -204,8 +204,8 @@
922 @for dep in $?; do \
923 case '$(am__configure_deps)' in \
924 *$$dep*) \
925- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
926- && { if test -f $@; then exit 0; else break; fi; }; \
927+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
928+ && exit 0; \
929 exit 1;; \
930 esac; \
931 done; \
932@@ -246,8 +246,8 @@
933 esac; \
934 done; \
935 for i in $$list; do \
936- if test -f $$i; then file=$$i; \
937- else file=$(srcdir)/$$i; fi; \
938+ if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
939+ else file=$$i; fi; \
940 ext=`echo $$i | sed -e 's/^.*\\.//'`; \
941 case "$$ext" in \
942 1*) ;; \
943@@ -291,8 +291,8 @@
944 esac; \
945 done; \
946 for i in $$list; do \
947- if test -f $$i; then file=$$i; \
948- else file=$(srcdir)/$$i; fi; \
949+ if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
950+ else file=$$i; fi; \
951 ext=`echo $$i | sed -e 's/^.*\\.//'`; \
952 case "$$ext" in \
953 8*) ;; \
[ff4d8eb6]954diff -Naur shadow-4.1.4.2.orig/man/it/Makefile.in shadow-4.1.4.2/man/it/Makefile.in
955--- shadow-4.1.4.2.orig/man/it/Makefile.in 2009-07-23 21:15:59.000000000 -0400
956+++ shadow-4.1.4.2/man/it/Makefile.in 2009-07-26 14:30:10.917476044 -0400
[fc7c84a]957@@ -1,4 +1,4 @@
958-# Makefile.in generated by automake 1.10.2 from Makefile.am.
959+# Makefile.in generated by automake 1.10.1 from Makefile.am.
960 # @configure_input@
961
962 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
963@@ -227,8 +227,8 @@
964 @for dep in $?; do \
965 case '$(am__configure_deps)' in \
966 *$$dep*) \
967- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
968- && { if test -f $@; then exit 0; else break; fi; }; \
969+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
970+ && exit 0; \
971 exit 1;; \
972 esac; \
973 done; \
974@@ -269,8 +269,8 @@
975 esac; \
976 done; \
977 for i in $$list; do \
978- if test -f $$i; then file=$$i; \
979- else file=$(srcdir)/$$i; fi; \
980+ if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
981+ else file=$$i; fi; \
982 ext=`echo $$i | sed -e 's/^.*\\.//'`; \
983 case "$$ext" in \
984 1*) ;; \
985@@ -314,8 +314,8 @@
986 esac; \
987 done; \
988 for i in $$list; do \
989- if test -f $$i; then file=$$i; \
990- else file=$(srcdir)/$$i; fi; \
991+ if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
992+ else file=$$i; fi; \
993 ext=`echo $$i | sed -e 's/^.*\\.//'`; \
994 case "$$ext" in \
995 3*) ;; \
996@@ -359,8 +359,8 @@
997 esac; \
998 done; \
999 for i in $$list; do \
1000- if test -f $$i; then file=$$i; \
1001- else file=$(srcdir)/$$i; fi; \
1002+ if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
1003+ else file=$$i; fi; \
1004 ext=`echo $$i | sed -e 's/^.*\\.//'`; \
1005 case "$$ext" in \
1006 5*) ;; \
1007@@ -404,8 +404,8 @@
1008 esac; \
1009 done; \
1010 for i in $$list; do \
1011- if test -f $$i; then file=$$i; \
1012- else file=$(srcdir)/$$i; fi; \
1013+ if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
1014+ else file=$$i; fi; \
1015 ext=`echo $$i | sed -e 's/^.*\\.//'`; \
1016 case "$$ext" in \
1017 8*) ;; \
[ff4d8eb6]1018diff -Naur shadow-4.1.4.2.orig/man/ja/Makefile.in shadow-4.1.4.2/man/ja/Makefile.in
1019--- shadow-4.1.4.2.orig/man/ja/Makefile.in 2009-07-23 21:15:59.000000000 -0400
1020+++ shadow-4.1.4.2/man/ja/Makefile.in 2009-07-26 14:30:10.917476044 -0400
[fc7c84a]1021@@ -1,4 +1,4 @@
1022-# Makefile.in generated by automake 1.10.2 from Makefile.am.
1023+# Makefile.in generated by automake 1.10.1 from Makefile.am.
1024 # @configure_input@
1025
1026 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
1027@@ -219,8 +219,8 @@
1028 @for dep in $?; do \
1029 case '$(am__configure_deps)' in \
1030 *$$dep*) \
1031- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
1032- && { if test -f $@; then exit 0; else break; fi; }; \
1033+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
1034+ && exit 0; \
1035 exit 1;; \
1036 esac; \
1037 done; \
1038@@ -261,8 +261,8 @@
1039 esac; \
1040 done; \
1041 for i in $$list; do \
1042- if test -f $$i; then file=$$i; \
1043- else file=$(srcdir)/$$i; fi; \
1044+ if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
1045+ else file=$$i; fi; \
1046 ext=`echo $$i | sed -e 's/^.*\\.//'`; \
1047 case "$$ext" in \
1048 1*) ;; \
1049@@ -306,8 +306,8 @@
1050 esac; \
1051 done; \
1052 for i in $$list; do \
1053- if test -f $$i; then file=$$i; \
1054- else file=$(srcdir)/$$i; fi; \
1055+ if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
1056+ else file=$$i; fi; \
1057 ext=`echo $$i | sed -e 's/^.*\\.//'`; \
1058 case "$$ext" in \
1059 5*) ;; \
1060@@ -351,8 +351,8 @@
1061 esac; \
1062 done; \
1063 for i in $$list; do \
1064- if test -f $$i; then file=$$i; \
1065- else file=$(srcdir)/$$i; fi; \
1066+ if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
1067+ else file=$$i; fi; \
1068 ext=`echo $$i | sed -e 's/^.*\\.//'`; \
1069 case "$$ext" in \
1070 8*) ;; \
[ff4d8eb6]1071diff -Naur shadow-4.1.4.2.orig/man/ko/Makefile.in shadow-4.1.4.2/man/ko/Makefile.in
1072--- shadow-4.1.4.2.orig/man/ko/Makefile.in 2009-07-23 21:15:59.000000000 -0400
1073+++ shadow-4.1.4.2/man/ko/Makefile.in 2009-07-26 14:30:10.917476044 -0400
[fc7c84a]1074@@ -1,4 +1,4 @@
1075-# Makefile.in generated by automake 1.10.2 from Makefile.am.
1076+# Makefile.in generated by automake 1.10.1 from Makefile.am.
1077 # @configure_input@
1078
1079 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
1080@@ -213,8 +213,8 @@
1081 @for dep in $?; do \
1082 case '$(am__configure_deps)' in \
1083 *$$dep*) \
1084- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
1085- && { if test -f $@; then exit 0; else break; fi; }; \
1086+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
1087+ && exit 0; \
1088 exit 1;; \
1089 esac; \
1090 done; \
1091@@ -255,8 +255,8 @@
1092 esac; \
1093 done; \
1094 for i in $$list; do \
1095- if test -f $$i; then file=$$i; \
1096- else file=$(srcdir)/$$i; fi; \
1097+ if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
1098+ else file=$$i; fi; \
1099 ext=`echo $$i | sed -e 's/^.*\\.//'`; \
1100 case "$$ext" in \
1101 1*) ;; \
1102@@ -300,8 +300,8 @@
1103 esac; \
1104 done; \
1105 for i in $$list; do \
1106- if test -f $$i; then file=$$i; \
1107- else file=$(srcdir)/$$i; fi; \
1108+ if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
1109+ else file=$$i; fi; \
1110 ext=`echo $$i | sed -e 's/^.*\\.//'`; \
1111 case "$$ext" in \
1112 5*) ;; \
1113@@ -345,8 +345,8 @@
1114 esac; \
1115 done; \
1116 for i in $$list; do \
1117- if test -f $$i; then file=$$i; \
1118- else file=$(srcdir)/$$i; fi; \
1119+ if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
1120+ else file=$$i; fi; \
1121 ext=`echo $$i | sed -e 's/^.*\\.//'`; \
1122 case "$$ext" in \
1123 8*) ;; \
[ff4d8eb6]1124diff -Naur shadow-4.1.4.2.orig/man/Makefile.in shadow-4.1.4.2/man/Makefile.in
1125--- shadow-4.1.4.2.orig/man/Makefile.in 2009-07-23 21:16:14.000000000 -0400
1126+++ shadow-4.1.4.2/man/Makefile.in 2009-07-26 14:30:10.917476044 -0400
[fc7c84a]1127@@ -1,4 +1,4 @@
1128-# Makefile.in generated by automake 1.10.2 from Makefile.am.
1129+# Makefile.in generated by automake 1.10.1 from Makefile.am.
1130 # @configure_input@
1131
1132 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
1133@@ -353,8 +353,8 @@
1134 @for dep in $?; do \
1135 case '$(am__configure_deps)' in \
1136 *$$dep*) \
1137- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
1138- && { if test -f $@; then exit 0; else break; fi; }; \
1139+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
1140+ && exit 0; \
1141 exit 1;; \
1142 esac; \
1143 done; \
1144@@ -397,8 +397,8 @@
1145 esac; \
1146 done; \
1147 for i in $$list; do \
1148- if test -f $$i; then file=$$i; \
1149- else file=$(srcdir)/$$i; fi; \
1150+ if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
1151+ else file=$$i; fi; \
1152 ext=`echo $$i | sed -e 's/^.*\\.//'`; \
1153 case "$$ext" in \
1154 1*) ;; \
1155@@ -442,8 +442,8 @@
1156 esac; \
1157 done; \
1158 for i in $$list; do \
1159- if test -f $$i; then file=$$i; \
1160- else file=$(srcdir)/$$i; fi; \
1161+ if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
1162+ else file=$$i; fi; \
1163 ext=`echo $$i | sed -e 's/^.*\\.//'`; \
1164 case "$$ext" in \
1165 3*) ;; \
1166@@ -487,8 +487,8 @@
1167 esac; \
1168 done; \
1169 for i in $$list; do \
1170- if test -f $$i; then file=$$i; \
1171- else file=$(srcdir)/$$i; fi; \
1172+ if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
1173+ else file=$$i; fi; \
1174 ext=`echo $$i | sed -e 's/^.*\\.//'`; \
1175 case "$$ext" in \
1176 5*) ;; \
1177@@ -532,8 +532,8 @@
1178 esac; \
1179 done; \
1180 for i in $$list; do \
1181- if test -f $$i; then file=$$i; \
1182- else file=$(srcdir)/$$i; fi; \
1183+ if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
1184+ else file=$$i; fi; \
1185 ext=`echo $$i | sed -e 's/^.*\\.//'`; \
1186 case "$$ext" in \
1187 8*) ;; \
1188@@ -642,7 +642,7 @@
1189 unique=`for i in $$list; do \
1190 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
1191 done | \
1192- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
1193+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
1194 END { if (nonempty) { for (i in files) print i; }; }'`; \
1195 mkid -fID $$unique
1196 tags: TAGS
[ff4d8eb6]1197diff -Naur shadow-4.1.4.2.orig/man/pl/Makefile.in shadow-4.1.4.2/man/pl/Makefile.in
1198--- shadow-4.1.4.2.orig/man/pl/Makefile.in 2009-07-23 21:16:00.000000000 -0400
1199+++ shadow-4.1.4.2/man/pl/Makefile.in 2009-07-26 14:30:10.920809384 -0400
[fc7c84a]1200@@ -1,4 +1,4 @@
1201-# Makefile.in generated by automake 1.10.2 from Makefile.am.
1202+# Makefile.in generated by automake 1.10.1 from Makefile.am.
1203 # @configure_input@
1204
1205 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
1206@@ -230,8 +230,8 @@
1207 @for dep in $?; do \
1208 case '$(am__configure_deps)' in \
1209 *$$dep*) \
1210- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
1211- && { if test -f $@; then exit 0; else break; fi; }; \
1212+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
1213+ && exit 0; \
1214 exit 1;; \
1215 esac; \
1216 done; \
1217@@ -272,8 +272,8 @@
1218 esac; \
1219 done; \
1220 for i in $$list; do \
1221- if test -f $$i; then file=$$i; \
1222- else file=$(srcdir)/$$i; fi; \
1223+ if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
1224+ else file=$$i; fi; \
1225 ext=`echo $$i | sed -e 's/^.*\\.//'`; \
1226 case "$$ext" in \
1227 1*) ;; \
1228@@ -317,8 +317,8 @@
1229 esac; \
1230 done; \
1231 for i in $$list; do \
1232- if test -f $$i; then file=$$i; \
1233- else file=$(srcdir)/$$i; fi; \
1234+ if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
1235+ else file=$$i; fi; \
1236 ext=`echo $$i | sed -e 's/^.*\\.//'`; \
1237 case "$$ext" in \
1238 5*) ;; \
1239@@ -362,8 +362,8 @@
1240 esac; \
1241 done; \
1242 for i in $$list; do \
1243- if test -f $$i; then file=$$i; \
1244- else file=$(srcdir)/$$i; fi; \
1245+ if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
1246+ else file=$$i; fi; \
1247 ext=`echo $$i | sed -e 's/^.*\\.//'`; \
1248 case "$$ext" in \
1249 8*) ;; \
[ff4d8eb6]1250diff -Naur shadow-4.1.4.2.orig/man/pt_BR/Makefile.in shadow-4.1.4.2/man/pt_BR/Makefile.in
1251--- shadow-4.1.4.2.orig/man/pt_BR/Makefile.in 2009-07-23 21:16:00.000000000 -0400
1252+++ shadow-4.1.4.2/man/pt_BR/Makefile.in 2009-07-26 14:30:10.920809384 -0400
[fc7c84a]1253@@ -1,4 +1,4 @@
1254-# Makefile.in generated by automake 1.10.2 from Makefile.am.
1255+# Makefile.in generated by automake 1.10.1 from Makefile.am.
1256 # @configure_input@
1257
1258 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
1259@@ -209,8 +209,8 @@
1260 @for dep in $?; do \
1261 case '$(am__configure_deps)' in \
1262 *$$dep*) \
1263- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
1264- && { if test -f $@; then exit 0; else break; fi; }; \
1265+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
1266+ && exit 0; \
1267 exit 1;; \
1268 esac; \
1269 done; \
1270@@ -251,8 +251,8 @@
1271 esac; \
1272 done; \
1273 for i in $$list; do \
1274- if test -f $$i; then file=$$i; \
1275- else file=$(srcdir)/$$i; fi; \
1276+ if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
1277+ else file=$$i; fi; \
1278 ext=`echo $$i | sed -e 's/^.*\\.//'`; \
1279 case "$$ext" in \
1280 1*) ;; \
1281@@ -296,8 +296,8 @@
1282 esac; \
1283 done; \
1284 for i in $$list; do \
1285- if test -f $$i; then file=$$i; \
1286- else file=$(srcdir)/$$i; fi; \
1287+ if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
1288+ else file=$$i; fi; \
1289 ext=`echo $$i | sed -e 's/^.*\\.//'`; \
1290 case "$$ext" in \
1291 5*) ;; \
1292@@ -341,8 +341,8 @@
1293 esac; \
1294 done; \
1295 for i in $$list; do \
1296- if test -f $$i; then file=$$i; \
1297- else file=$(srcdir)/$$i; fi; \
1298+ if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
1299+ else file=$$i; fi; \
1300 ext=`echo $$i | sed -e 's/^.*\\.//'`; \
1301 case "$$ext" in \
1302 8*) ;; \
[ff4d8eb6]1303diff -Naur shadow-4.1.4.2.orig/man/ru/Makefile.in shadow-4.1.4.2/man/ru/Makefile.in
1304--- shadow-4.1.4.2.orig/man/ru/Makefile.in 2009-07-23 21:16:00.000000000 -0400
1305+++ shadow-4.1.4.2/man/ru/Makefile.in 2009-07-26 14:30:10.920809384 -0400
[fc7c84a]1306@@ -1,4 +1,4 @@
1307-# Makefile.in generated by automake 1.10.2 from Makefile.am.
1308+# Makefile.in generated by automake 1.10.1 from Makefile.am.
1309 # @configure_input@
1310
1311 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
1312@@ -230,8 +230,8 @@
1313 @for dep in $?; do \
1314 case '$(am__configure_deps)' in \
1315 *$$dep*) \
1316- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
1317- && { if test -f $@; then exit 0; else break; fi; }; \
1318+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
1319+ && exit 0; \
1320 exit 1;; \
1321 esac; \
1322 done; \
1323@@ -272,8 +272,8 @@
1324 esac; \
1325 done; \
1326 for i in $$list; do \
1327- if test -f $$i; then file=$$i; \
1328- else file=$(srcdir)/$$i; fi; \
1329+ if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
1330+ else file=$$i; fi; \
1331 ext=`echo $$i | sed -e 's/^.*\\.//'`; \
1332 case "$$ext" in \
1333 1*) ;; \
1334@@ -317,8 +317,8 @@
1335 esac; \
1336 done; \
1337 for i in $$list; do \
1338- if test -f $$i; then file=$$i; \
1339- else file=$(srcdir)/$$i; fi; \
1340+ if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
1341+ else file=$$i; fi; \
1342 ext=`echo $$i | sed -e 's/^.*\\.//'`; \
1343 case "$$ext" in \
1344 3*) ;; \
1345@@ -362,8 +362,8 @@
1346 esac; \
1347 done; \
1348 for i in $$list; do \
1349- if test -f $$i; then file=$$i; \
1350- else file=$(srcdir)/$$i; fi; \
1351+ if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
1352+ else file=$$i; fi; \
1353 ext=`echo $$i | sed -e 's/^.*\\.//'`; \
1354 case "$$ext" in \
1355 5*) ;; \
1356@@ -407,8 +407,8 @@
1357 esac; \
1358 done; \
1359 for i in $$list; do \
1360- if test -f $$i; then file=$$i; \
1361- else file=$(srcdir)/$$i; fi; \
1362+ if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
1363+ else file=$$i; fi; \
1364 ext=`echo $$i | sed -e 's/^.*\\.//'`; \
1365 case "$$ext" in \
1366 8*) ;; \
[ff4d8eb6]1367diff -Naur shadow-4.1.4.2.orig/man/sv/Makefile.in shadow-4.1.4.2/man/sv/Makefile.in
1368--- shadow-4.1.4.2.orig/man/sv/Makefile.in 2009-07-23 21:16:00.000000000 -0400
1369+++ shadow-4.1.4.2/man/sv/Makefile.in 2009-07-26 14:30:10.920809384 -0400
[fc7c84a]1370@@ -1,4 +1,4 @@
1371-# Makefile.in generated by automake 1.10.2 from Makefile.am.
1372+# Makefile.in generated by automake 1.10.1 from Makefile.am.
1373 # @configure_input@
1374
1375 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
1376@@ -228,8 +228,8 @@
1377 @for dep in $?; do \
1378 case '$(am__configure_deps)' in \
1379 *$$dep*) \
1380- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
1381- && { if test -f $@; then exit 0; else break; fi; }; \
1382+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
1383+ && exit 0; \
1384 exit 1;; \
1385 esac; \
1386 done; \
1387@@ -270,8 +270,8 @@
1388 esac; \
1389 done; \
1390 for i in $$list; do \
1391- if test -f $$i; then file=$$i; \
1392- else file=$(srcdir)/$$i; fi; \
1393+ if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
1394+ else file=$$i; fi; \
1395 ext=`echo $$i | sed -e 's/^.*\\.//'`; \
1396 case "$$ext" in \
1397 1*) ;; \
1398@@ -315,8 +315,8 @@
1399 esac; \
1400 done; \
1401 for i in $$list; do \
1402- if test -f $$i; then file=$$i; \
1403- else file=$(srcdir)/$$i; fi; \
1404+ if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
1405+ else file=$$i; fi; \
1406 ext=`echo $$i | sed -e 's/^.*\\.//'`; \
1407 case "$$ext" in \
1408 3*) ;; \
1409@@ -360,8 +360,8 @@
1410 esac; \
1411 done; \
1412 for i in $$list; do \
1413- if test -f $$i; then file=$$i; \
1414- else file=$(srcdir)/$$i; fi; \
1415+ if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
1416+ else file=$$i; fi; \
1417 ext=`echo $$i | sed -e 's/^.*\\.//'`; \
1418 case "$$ext" in \
1419 5*) ;; \
1420@@ -405,8 +405,8 @@
1421 esac; \
1422 done; \
1423 for i in $$list; do \
1424- if test -f $$i; then file=$$i; \
1425- else file=$(srcdir)/$$i; fi; \
1426+ if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
1427+ else file=$$i; fi; \
1428 ext=`echo $$i | sed -e 's/^.*\\.//'`; \
1429 case "$$ext" in \
1430 8*) ;; \
[ff4d8eb6]1431diff -Naur shadow-4.1.4.2.orig/man/tr/Makefile.in shadow-4.1.4.2/man/tr/Makefile.in
1432--- shadow-4.1.4.2.orig/man/tr/Makefile.in 2009-07-23 21:16:00.000000000 -0400
1433+++ shadow-4.1.4.2/man/tr/Makefile.in 2009-07-26 14:30:10.920809384 -0400
[fc7c84a]1434@@ -1,4 +1,4 @@
1435-# Makefile.in generated by automake 1.10.2 from Makefile.am.
1436+# Makefile.in generated by automake 1.10.1 from Makefile.am.
1437 # @configure_input@
1438
1439 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
1440@@ -216,8 +216,8 @@
1441 @for dep in $?; do \
1442 case '$(am__configure_deps)' in \
1443 *$$dep*) \
1444- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
1445- && { if test -f $@; then exit 0; else break; fi; }; \
1446+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
1447+ && exit 0; \
1448 exit 1;; \
1449 esac; \
1450 done; \
1451@@ -258,8 +258,8 @@
1452 esac; \
1453 done; \
1454 for i in $$list; do \
1455- if test -f $$i; then file=$$i; \
1456- else file=$(srcdir)/$$i; fi; \
1457+ if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
1458+ else file=$$i; fi; \
1459 ext=`echo $$i | sed -e 's/^.*\\.//'`; \
1460 case "$$ext" in \
1461 1*) ;; \
1462@@ -303,8 +303,8 @@
1463 esac; \
1464 done; \
1465 for i in $$list; do \
1466- if test -f $$i; then file=$$i; \
1467- else file=$(srcdir)/$$i; fi; \
1468+ if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
1469+ else file=$$i; fi; \
1470 ext=`echo $$i | sed -e 's/^.*\\.//'`; \
1471 case "$$ext" in \
1472 5*) ;; \
1473@@ -348,8 +348,8 @@
1474 esac; \
1475 done; \
1476 for i in $$list; do \
1477- if test -f $$i; then file=$$i; \
1478- else file=$(srcdir)/$$i; fi; \
1479+ if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
1480+ else file=$$i; fi; \
1481 ext=`echo $$i | sed -e 's/^.*\\.//'`; \
1482 case "$$ext" in \
1483 8*) ;; \
[ff4d8eb6]1484diff -Naur shadow-4.1.4.2.orig/man/zh_CN/Makefile.in shadow-4.1.4.2/man/zh_CN/Makefile.in
1485--- shadow-4.1.4.2.orig/man/zh_CN/Makefile.in 2009-07-23 21:16:00.000000000 -0400
1486+++ shadow-4.1.4.2/man/zh_CN/Makefile.in 2009-07-26 14:30:10.920809384 -0400
[fc7c84a]1487@@ -1,4 +1,4 @@
1488-# Makefile.in generated by automake 1.10.2 from Makefile.am.
1489+# Makefile.in generated by automake 1.10.1 from Makefile.am.
1490 # @configure_input@
1491
1492 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
1493@@ -217,8 +217,8 @@
1494 @for dep in $?; do \
1495 case '$(am__configure_deps)' in \
1496 *$$dep*) \
1497- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
1498- && { if test -f $@; then exit 0; else break; fi; }; \
1499+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
1500+ && exit 0; \
1501 exit 1;; \
1502 esac; \
1503 done; \
1504@@ -259,8 +259,8 @@
1505 esac; \
1506 done; \
1507 for i in $$list; do \
1508- if test -f $$i; then file=$$i; \
1509- else file=$(srcdir)/$$i; fi; \
1510+ if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
1511+ else file=$$i; fi; \
1512 ext=`echo $$i | sed -e 's/^.*\\.//'`; \
1513 case "$$ext" in \
1514 1*) ;; \
1515@@ -304,8 +304,8 @@
1516 esac; \
1517 done; \
1518 for i in $$list; do \
1519- if test -f $$i; then file=$$i; \
1520- else file=$(srcdir)/$$i; fi; \
1521+ if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
1522+ else file=$$i; fi; \
1523 ext=`echo $$i | sed -e 's/^.*\\.//'`; \
1524 case "$$ext" in \
1525 5*) ;; \
1526@@ -349,8 +349,8 @@
1527 esac; \
1528 done; \
1529 for i in $$list; do \
1530- if test -f $$i; then file=$$i; \
1531- else file=$(srcdir)/$$i; fi; \
1532+ if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
1533+ else file=$$i; fi; \
1534 ext=`echo $$i | sed -e 's/^.*\\.//'`; \
1535 case "$$ext" in \
1536 8*) ;; \
[ff4d8eb6]1537diff -Naur shadow-4.1.4.2.orig/man/zh_TW/Makefile.in shadow-4.1.4.2/man/zh_TW/Makefile.in
1538--- shadow-4.1.4.2.orig/man/zh_TW/Makefile.in 2009-07-23 21:16:00.000000000 -0400
1539+++ shadow-4.1.4.2/man/zh_TW/Makefile.in 2009-07-26 14:30:10.920809384 -0400
[fc7c84a]1540@@ -1,4 +1,4 @@
1541-# Makefile.in generated by automake 1.10.2 from Makefile.am.
1542+# Makefile.in generated by automake 1.10.1 from Makefile.am.
1543 # @configure_input@
1544
1545 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
1546@@ -217,8 +217,8 @@
1547 @for dep in $?; do \
1548 case '$(am__configure_deps)' in \
1549 *$$dep*) \
1550- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
1551- && { if test -f $@; then exit 0; else break; fi; }; \
1552+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
1553+ && exit 0; \
1554 exit 1;; \
1555 esac; \
1556 done; \
1557@@ -259,8 +259,8 @@
1558 esac; \
1559 done; \
1560 for i in $$list; do \
1561- if test -f $$i; then file=$$i; \
1562- else file=$(srcdir)/$$i; fi; \
1563+ if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
1564+ else file=$$i; fi; \
1565 ext=`echo $$i | sed -e 's/^.*\\.//'`; \
1566 case "$$ext" in \
1567 1*) ;; \
1568@@ -304,8 +304,8 @@
1569 esac; \
1570 done; \
1571 for i in $$list; do \
1572- if test -f $$i; then file=$$i; \
1573- else file=$(srcdir)/$$i; fi; \
1574+ if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
1575+ else file=$$i; fi; \
1576 ext=`echo $$i | sed -e 's/^.*\\.//'`; \
1577 case "$$ext" in \
1578 5*) ;; \
1579@@ -349,8 +349,8 @@
1580 esac; \
1581 done; \
1582 for i in $$list; do \
1583- if test -f $$i; then file=$$i; \
1584- else file=$(srcdir)/$$i; fi; \
1585+ if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
1586+ else file=$$i; fi; \
1587 ext=`echo $$i | sed -e 's/^.*\\.//'`; \
1588 case "$$ext" in \
1589 8*) ;; \
[ff4d8eb6]1590diff -Naur shadow-4.1.4.2.orig/src/chage.c shadow-4.1.4.2/src/chage.c
1591--- shadow-4.1.4.2.orig/src/chage.c 2009-04-30 17:39:39.000000000 -0400
1592+++ shadow-4.1.4.2/src/chage.c 2009-07-26 14:30:10.920809384 -0400
[fc7c84a]1593@@ -808,7 +808,7 @@
1594
1595 ruid = getuid ();
1596 rgid = getgid ();
1597- amroot = (ruid == 0);
1598+ amroot = 1; /* (ruid == 0); */
1599 #ifdef WITH_SELINUX
1600 if (amroot && (is_selinux_enabled () > 0)) {
1601 amroot = (selinux_check_passwd_access (PASSWD__ROOTOK) == 0);
[ff4d8eb6]1602diff -Naur shadow-4.1.4.2.orig/src/chfn.c shadow-4.1.4.2/src/chfn.c
1603--- shadow-4.1.4.2.orig/src/chfn.c 2009-04-30 17:39:39.000000000 -0400
1604+++ shadow-4.1.4.2/src/chfn.c 2009-07-26 14:30:10.923713238 -0400
[fc7c84a]1605@@ -719,7 +719,7 @@
1606
1607 SYSLOG ((LOG_INFO, "changed user '%s' information", user));
1608
1609- nscd_flush_cache ("passwd");
1610+// nscd_flush_cache ("passwd");
1611
1612 closelog ();
1613 exit (E_SUCCESS);
[ff4d8eb6]1614diff -Naur shadow-4.1.4.2.orig/src/chgpasswd.c shadow-4.1.4.2/src/chgpasswd.c
1615--- shadow-4.1.4.2.orig/src/chgpasswd.c 2009-04-30 17:39:39.000000000 -0400
1616+++ shadow-4.1.4.2/src/chgpasswd.c 2009-07-26 14:30:10.923713238 -0400
[fc7c84a]1617@@ -537,7 +537,7 @@
1618
1619 close_files ();
1620
1621- nscd_flush_cache ("group");
1622+// nscd_flush_cache ("group");
1623
1624 return (0);
1625 }
[ff4d8eb6]1626diff -Naur shadow-4.1.4.2.orig/src/chpasswd.c shadow-4.1.4.2/src/chpasswd.c
1627--- shadow-4.1.4.2.orig/src/chpasswd.c 2009-05-10 09:49:05.000000000 -0400
1628+++ shadow-4.1.4.2/src/chpasswd.c 2009-07-26 14:30:10.923713238 -0400
[fc7c84a]1629@@ -578,7 +578,7 @@
1630 close_files ();
1631 #endif
1632
1633- nscd_flush_cache ("passwd");
1634+// nscd_flush_cache ("passwd");
1635
1636 return (0);
1637 }
[ff4d8eb6]1638diff -Naur shadow-4.1.4.2.orig/src/chsh.c shadow-4.1.4.2/src/chsh.c
1639--- shadow-4.1.4.2.orig/src/chsh.c 2009-04-30 17:39:39.000000000 -0400
1640+++ shadow-4.1.4.2/src/chsh.c 2009-07-26 14:30:10.923713238 -0400
[fc7c84a]1641@@ -56,7 +56,7 @@
1642 #include "exitcodes.h"
1643
1644 #ifndef SHELLS_FILE
1645-#define SHELLS_FILE "/etc/shells"
1646+#define SHELLS_FILE SYSCONFDIR"/shells"
1647 #endif
1648 /*
1649 * Global variables
1650@@ -443,7 +443,7 @@
1651 /*
1652 * This command behaves different for root and non-root users.
1653 */
1654- amroot = (getuid () == 0);
1655+ amroot = 1; //(getuid () == 0);
1656
1657 /*
1658 * Get the program name. The program name is used as a prefix to
1659@@ -543,7 +543,7 @@
1660
1661 SYSLOG ((LOG_INFO, "changed user '%s' shell to '%s'", user, loginsh));
1662
1663- nscd_flush_cache ("passwd");
1664+// nscd_flush_cache ("passwd");
1665
1666 closelog ();
1667 exit (E_SUCCESS);
[ff4d8eb6]1668diff -Naur shadow-4.1.4.2.orig/src/gpasswd.c shadow-4.1.4.2/src/gpasswd.c
1669--- shadow-4.1.4.2.orig/src/gpasswd.c 2009-04-30 17:39:40.000000000 -0400
1670+++ shadow-4.1.4.2/src/gpasswd.c 2009-07-26 14:30:10.923713238 -0400
[fc7c84a]1671@@ -86,7 +86,7 @@
1672 /* The UID of the caller */
1673 static uid_t bywho;
1674 /* Indicate if gpasswd was called by root */
1675-#define amroot (0 == bywho)
1676+#define amroot 1 /* (0 == bywho) */
1677
1678 /* The number of retries for th user to provide and repeat a new password */
1679 #ifndef RETRIES
1680@@ -1173,12 +1173,14 @@
1681 * output, etc.
1682 */
1683 output:
1684+/*
1685 if (setuid (0) != 0) {
1686 fputs (_("Cannot change ID to root.\n"), stderr);
1687 SYSLOG ((LOG_ERR, "can't setuid(0)"));
1688 closelog ();
1689 exit (E_NOPERM);
1690 }
1691+*/
1692 pwd_init ();
1693
1694 open_files ();
1695@@ -1191,7 +1193,7 @@
1696
1697 close_files ();
1698
1699- nscd_flush_cache ("group");
1700+// nscd_flush_cache ("group");
1701
1702 exit (E_SUCCESS);
1703 }
[ff4d8eb6]1704diff -Naur shadow-4.1.4.2.orig/src/groupadd.c shadow-4.1.4.2/src/groupadd.c
1705--- shadow-4.1.4.2.orig/src/groupadd.c 2009-06-05 18:16:58.000000000 -0400
1706+++ shadow-4.1.4.2/src/groupadd.c 2009-07-26 14:30:10.923713238 -0400
1707@@ -604,7 +604,7 @@
[fc7c84a]1708 grp_update ();
1709 close_files ();
1710
1711- nscd_flush_cache ("group");
1712+// nscd_flush_cache ("group");
1713
1714 exit (E_SUCCESS);
1715 /*@notreached@*/
[ff4d8eb6]1716diff -Naur shadow-4.1.4.2.orig/src/groupdel.c shadow-4.1.4.2/src/groupdel.c
1717--- shadow-4.1.4.2.orig/src/groupdel.c 2009-04-30 17:39:40.000000000 -0400
1718+++ shadow-4.1.4.2/src/groupdel.c 2009-07-26 14:30:10.923713238 -0400
[fc7c84a]1719@@ -426,7 +426,7 @@
1720
1721 close_files ();
1722
1723- nscd_flush_cache ("group");
1724+// nscd_flush_cache ("group");
1725
1726 return E_SUCCESS;
1727 }
[ff4d8eb6]1728diff -Naur shadow-4.1.4.2.orig/src/groupmod.c shadow-4.1.4.2/src/groupmod.c
1729--- shadow-4.1.4.2.orig/src/groupmod.c 2009-06-05 18:16:58.000000000 -0400
1730+++ shadow-4.1.4.2/src/groupmod.c 2009-07-26 14:30:10.923713238 -0400
1731@@ -815,7 +815,7 @@
[fc7c84a]1732
1733 close_files ();
1734
1735- nscd_flush_cache ("group");
1736+// nscd_flush_cache ("group");
1737
1738 return E_SUCCESS;
1739 }
[ff4d8eb6]1740diff -Naur shadow-4.1.4.2.orig/src/grpck.c shadow-4.1.4.2/src/grpck.c
1741--- shadow-4.1.4.2.orig/src/grpck.c 2009-05-09 17:20:57.000000000 -0400
1742+++ shadow-4.1.4.2/src/grpck.c 2009-07-26 14:30:10.923713238 -0400
[fc7c84a]1743@@ -836,7 +836,7 @@
1744 /* Commit the change in the database if needed */
1745 close_files (changed);
1746
1747- nscd_flush_cache ("group");
1748+// nscd_flush_cache ("group");
1749
1750 /*
1751 * Tell the user what we did and exit.
[ff4d8eb6]1752diff -Naur shadow-4.1.4.2.orig/src/grpconv.c shadow-4.1.4.2/src/grpconv.c
1753--- shadow-4.1.4.2.orig/src/grpconv.c 2008-09-06 08:51:54.000000000 -0400
1754+++ shadow-4.1.4.2/src/grpconv.c 2009-07-26 14:30:10.926850479 -0400
[fc7c84a]1755@@ -217,7 +217,7 @@
1756 }
1757 gr_locked = false;
1758
1759- nscd_flush_cache ("group");
1760+// nscd_flush_cache ("group");
1761
1762 return 0;
1763 }
[ff4d8eb6]1764diff -Naur shadow-4.1.4.2.orig/src/grpunconv.c shadow-4.1.4.2/src/grpunconv.c
1765--- shadow-4.1.4.2.orig/src/grpunconv.c 2008-09-06 08:51:54.000000000 -0400
1766+++ shadow-4.1.4.2/src/grpunconv.c 2009-07-26 14:30:10.926850479 -0400
[fc7c84a]1767@@ -186,7 +186,7 @@
1768 /* continue */
1769 }
1770
1771- nscd_flush_cache ("group");
1772+// nscd_flush_cache ("group");
1773
1774 return 0;
1775 }
[ff4d8eb6]1776diff -Naur shadow-4.1.4.2.orig/src/login_nopam.c shadow-4.1.4.2/src/login_nopam.c
1777--- shadow-4.1.4.2.orig/src/login_nopam.c 2008-09-13 14:03:51.000000000 -0400
1778+++ shadow-4.1.4.2/src/login_nopam.c 2009-07-26 14:30:10.926850479 -0400
[fc7c84a]1779@@ -59,7 +59,7 @@
1780
1781 /* Path name of the access control file. */
1782 #ifndef TABLE
1783-#define TABLE "/etc/login.access"
1784+#define TABLE SYSCONFDIR"/login.access"
1785 #endif
1786
1787 /* Delimiters for fields and for lists of users, ttys or hosts. */
[ff4d8eb6]1788diff -Naur shadow-4.1.4.2.orig/src/logoutd.c shadow-4.1.4.2/src/logoutd.c
1789--- shadow-4.1.4.2.orig/src/logoutd.c 2009-04-30 17:08:50.000000000 -0400
1790+++ shadow-4.1.4.2/src/logoutd.c 2009-07-26 14:30:10.926850479 -0400
[fc7c84a]1791@@ -50,7 +50,7 @@
1792 #endif
1793
1794 #ifndef HUP_MESG_FILE
1795-#define HUP_MESG_FILE "/etc/logoutd.mesg"
1796+#define HUP_MESG_FILE SYSCONFDIR"/logoutd.mesg"
1797 #endif
1798
1799 /* local function prototypes */
[ff4d8eb6]1800diff -Naur shadow-4.1.4.2.orig/src/Makefile.am shadow-4.1.4.2/src/Makefile.am
1801--- shadow-4.1.4.2.orig/src/Makefile.am 2009-05-09 17:10:18.000000000 -0400
1802+++ shadow-4.1.4.2/src/Makefile.am 2009-07-26 14:30:10.926850479 -0400
[fc7c84a]1803@@ -3,7 +3,7 @@
1804 .indent.pro
1805
1806 ubindir = ${prefix}/bin
1807-usbindir = ${prefix}/sbin
1808+usbindir = ${prefix}/bin
1809 suidperms = 4755
1810
1811 INCLUDES = \
1812@@ -56,7 +56,7 @@
1813 LDADD = $(INTLLIBS) \
1814 $(top_builddir)/libmisc/libmisc.a \
1815 $(top_builddir)/lib/libshadow.la
1816-AM_CPPFLAGS = -DLOCALEDIR=\"$(datadir)/locale\"
1817+AM_CPPFLAGS = -DSYSCONFDIR=\"$(sysconfdir)\" -DLOCALEDIR=\"$(datadir)/locale\" -DSG=\"`echo sg | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`\" -DVIGR=\"`echo vigr | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`\"
1818
1819 if ACCT_TOOLS_SETUID
1820 LIBPAM_SUID = $(LIBPAM)
1821@@ -106,11 +106,11 @@
1822
1823 install-am: all-am
1824 $(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
1825- ln -sf newgrp $(DESTDIR)$(ubindir)/sg
1826- ln -sf vipw $(DESTDIR)$(usbindir)/vigr
1827+ ln -sf `echo newgrp | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` $(DESTDIR)$(ubindir)/`echo sg | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`
1828+ ln -sf `echo vipw | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` $(DESTDIR)$(usbindir)/`echo vigr | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`
1829 for i in $(suidbins); do \
1830- chmod -f $(suidperms) $(DESTDIR)$(bindir)/$$i; \
1831+ chmod -f 4755 $(DESTDIR)$(bindir)/`echo $$i | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
1832 done
1833 for i in $(suidubins); do \
1834- chmod -f $(suidperms) $(DESTDIR)$(ubindir)/$$i; \
1835+ chmod -f 4755 $(DESTDIR)$(ubindir)/`echo $$i | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
1836 done
[ff4d8eb6]1837diff -Naur shadow-4.1.4.2.orig/src/Makefile.in shadow-4.1.4.2/src/Makefile.in
1838--- shadow-4.1.4.2.orig/src/Makefile.in 2009-07-23 21:16:00.000000000 -0400
1839+++ shadow-4.1.4.2/src/Makefile.in 2009-07-26 14:30:10.926850479 -0400
[fc7c84a]1840@@ -1,4 +1,4 @@
1841-# Makefile.in generated by automake 1.10.2 from Makefile.am.
1842+# Makefile.in generated by automake 1.10.1 from Makefile.am.
1843 # @configure_input@
1844
1845 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
1846@@ -382,7 +382,7 @@
1847 .indent.pro
1848
1849 ubindir = ${prefix}/bin
1850-usbindir = ${prefix}/sbin
1851+usbindir = ${prefix}/bin
1852 suidperms = 4755
1853 INCLUDES = \
1854 -I${top_srcdir}/lib \
1855@@ -394,7 +394,7 @@
1856 $(top_builddir)/libmisc/libmisc.a \
1857 $(top_builddir)/lib/libshadow.la
1858
1859-AM_CPPFLAGS = -DLOCALEDIR=\"$(datadir)/locale\"
1860+AM_CPPFLAGS = -DSYSCONFDIR=\"$(sysconfdir)\" -DLOCALEDIR=\"$(datadir)/locale\" -DSG=\"`echo sg | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`\" -DVIGR=\"`echo vigr | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`\"
1861 @ACCT_TOOLS_SETUID_FALSE@LIBPAM_SUID =
1862 @ACCT_TOOLS_SETUID_TRUE@LIBPAM_SUID = $(LIBPAM)
1863 @USE_PAM_FALSE@LIBCRYPT_NOPAM = $(LIBCRYPT)
1864@@ -442,8 +442,8 @@
1865 @for dep in $?; do \
1866 case '$(am__configure_deps)' in \
1867 *$$dep*) \
1868- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
1869- && { if test -f $@; then exit 0; else break; fi; }; \
1870+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
1871+ && exit 0; \
1872 exit 1;; \
1873 esac; \
1874 done; \
1875@@ -760,7 +760,7 @@
1876 unique=`for i in $$list; do \
1877 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
1878 done | \
1879- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
1880+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
1881 END { if (nonempty) { for (i in files) print i; }; }'`; \
1882 mkid -fID $$unique
1883 tags: TAGS
1884@@ -941,13 +941,13 @@
1885
1886 install-am: all-am
1887 $(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
1888- ln -sf newgrp $(DESTDIR)$(ubindir)/sg
1889- ln -sf vipw $(DESTDIR)$(usbindir)/vigr
1890+ ln -sf `echo newgrp | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` $(DESTDIR)$(ubindir)/`echo sg | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`
1891+ ln -sf `echo vipw | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` $(DESTDIR)$(usbindir)/`echo vigr | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`
1892 for i in $(suidbins); do \
1893- chmod -f $(suidperms) $(DESTDIR)$(bindir)/$$i; \
1894+ chmod -f 4755 $(DESTDIR)$(bindir)/`echo $$i | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
1895 done
1896 for i in $(suidubins); do \
1897- chmod -f $(suidperms) $(DESTDIR)$(ubindir)/$$i; \
1898+ chmod -f 4755 $(DESTDIR)$(ubindir)/`echo $$i | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
1899 done
1900 # Tell versions [3.59,3.63) of GNU make to not export all variables.
1901 # Otherwise a system limit (for SysV at least) may be exceeded.
[ff4d8eb6]1902diff -Naur shadow-4.1.4.2.orig/src/newgrp.c shadow-4.1.4.2/src/newgrp.c
1903--- shadow-4.1.4.2.orig/src/newgrp.c 2009-07-23 16:38:56.000000000 -0400
1904+++ shadow-4.1.4.2/src/newgrp.c 2009-07-26 14:30:10.934038324 -0400
[fc7c84a]1905@@ -296,7 +296,7 @@
1906 if ((pid_t)-1 == child) {
1907 /* error in fork() */
1908 fprintf (stderr, _("%s: failure forking: %s\n"),
1909- is_newgrp ? "newgrp" : "sg", strerror (errno));
1910+ is_newgrp ? "newgrp" : SG, strerror (errno));
1911 #ifdef WITH_AUDIT
1912 if (group) {
1913 snprintf (audit_buf, sizeof(audit_buf),
1914@@ -417,7 +417,7 @@
1915 */
1916 Prog = Basename (argv[0]);
1917 is_newgrp = (strcmp (Prog, "newgrp") == 0);
1918- OPENLOG (is_newgrp ? "newgrp" : "sg");
1919+ OPENLOG (is_newgrp ? "newgrp" : SG);
1920 gid = getgid ();
1921 argc--;
1922 argv++;
[ff4d8eb6]1923diff -Naur shadow-4.1.4.2.orig/src/newusers.c shadow-4.1.4.2/src/newusers.c
1924--- shadow-4.1.4.2.orig/src/newusers.c 2009-05-10 09:49:05.000000000 -0400
1925+++ shadow-4.1.4.2/src/newusers.c 2009-07-26 14:30:10.934038324 -0400
[fc7c84a]1926@@ -1041,8 +1041,8 @@
1927
1928 close_files ();
1929
1930- nscd_flush_cache ("passwd");
1931- nscd_flush_cache ("group");
1932+// nscd_flush_cache ("passwd");
1933+// nscd_flush_cache ("group");
1934
1935 #ifdef USE_PAM
1936 unsigned int i;
[ff4d8eb6]1937diff -Naur shadow-4.1.4.2.orig/src/passwd.c shadow-4.1.4.2/src/passwd.c
1938--- shadow-4.1.4.2.orig/src/passwd.c 2009-05-22 09:32:30.000000000 -0400
1939+++ shadow-4.1.4.2/src/passwd.c 2009-07-26 14:30:10.934038324 -0400
[fc7c84a]1940@@ -775,7 +775,7 @@
1941 * The program behaves differently when executed by root than when
1942 * executed by a normal user.
1943 */
1944- amroot = (getuid () == 0);
1945+ amroot = 1; //(getuid () == 0);
1946
1947 /*
1948 * Get the program name. The program name is used as a prefix to
1949@@ -1088,20 +1088,22 @@
1950 exit (E_SUCCESS);
1951 }
1952 #endif /* USE_PAM */
1953+/*
1954 if (setuid (0) != 0) {
1955 fputs (_("Cannot change ID to root.\n"), stderr);
1956 SYSLOG ((LOG_ERR, "can't setuid(0)"));
1957 closelog ();
1958 exit (E_NOPERM);
1959 }
1960+*/
1961 if (spw_file_present ()) {
1962 update_shadow ();
1963 } else {
1964 update_noshadow ();
1965 }
1966
1967- nscd_flush_cache ("passwd");
1968- nscd_flush_cache ("group");
1969+ //nscd_flush_cache ("passwd");
1970+ //nscd_flush_cache ("group");
1971
1972 SYSLOG ((LOG_INFO, "password for '%s' changed by '%s'", name, myname));
1973 closelog ();
[ff4d8eb6]1974diff -Naur shadow-4.1.4.2.orig/src/pwck.c shadow-4.1.4.2/src/pwck.c
1975--- shadow-4.1.4.2.orig/src/pwck.c 2009-06-05 18:16:58.000000000 -0400
1976+++ shadow-4.1.4.2/src/pwck.c 2009-07-26 14:30:10.934038324 -0400
[fc7c84a]1977@@ -704,7 +704,7 @@
1978
1979 close_files (changed);
1980
1981- nscd_flush_cache ("passwd");
1982+// nscd_flush_cache ("passwd");
1983
1984 /*
1985 * Tell the user what we did and exit.
[ff4d8eb6]1986diff -Naur shadow-4.1.4.2.orig/src/pwconv.c shadow-4.1.4.2/src/pwconv.c
1987--- shadow-4.1.4.2.orig/src/pwconv.c 2009-04-30 17:39:40.000000000 -0400
1988+++ shadow-4.1.4.2/src/pwconv.c 2009-07-26 14:30:10.937479067 -0400
[fc7c84a]1989@@ -269,7 +269,7 @@
1990 }
1991 }
1992
1993- nscd_flush_cache ("passwd");
1994+// nscd_flush_cache ("passwd");
1995
1996 return E_SUCCESS;
1997 }
[ff4d8eb6]1998diff -Naur shadow-4.1.4.2.orig/src/pwunconv.c shadow-4.1.4.2/src/pwunconv.c
1999--- shadow-4.1.4.2.orig/src/pwunconv.c 2009-04-30 17:44:37.000000000 -0400
2000+++ shadow-4.1.4.2/src/pwunconv.c 2009-07-26 14:30:10.937479067 -0400
[fc7c84a]2001@@ -194,7 +194,7 @@
2002 /* continue */
2003 }
2004
2005- nscd_flush_cache ("passwd");
2006+// nscd_flush_cache ("passwd");
2007
2008 return 0;
2009 }
[ff4d8eb6]2010diff -Naur shadow-4.1.4.2.orig/src/suauth.c shadow-4.1.4.2/src/suauth.c
2011--- shadow-4.1.4.2.orig/src/suauth.c 2008-09-13 12:29:23.000000000 -0400
2012+++ shadow-4.1.4.2/src/suauth.c 2009-07-26 14:30:10.937479067 -0400
[fc7c84a]2013@@ -40,7 +40,7 @@
2014 #include "prototypes.h"
2015
2016 #ifndef SUAUTHFILE
2017-#define SUAUTHFILE "/etc/suauth"
2018+#define SUAUTHFILE SYSCONFDIR"/suauth"
2019 #endif
2020
2021 #define NOACTION 0
[ff4d8eb6]2022diff -Naur shadow-4.1.4.2.orig/src/useradd.c shadow-4.1.4.2/src/useradd.c
2023--- shadow-4.1.4.2.orig/src/useradd.c 2009-06-05 18:16:58.000000000 -0400
2024+++ shadow-4.1.4.2/src/useradd.c 2009-07-26 14:30:10.937479067 -0400
[fc7c84a]2025@@ -67,11 +67,11 @@
2026 #include "shadowio.h"
2027
2028 #ifndef SKEL_DIR
2029-#define SKEL_DIR "/etc/skel"
2030+#define SKEL_DIR SYSCONFDIR"/skel"
2031 #endif
2032 #ifndef USER_DEFAULTS_FILE
2033-#define USER_DEFAULTS_FILE "/etc/default/useradd"
2034-#define NEW_USER_FILE "/etc/default/nuaddXXXXXX"
2035+#define USER_DEFAULTS_FILE SYSCONFDIR"/default/useradd"
2036+#define NEW_USER_FILE SYSCONFDIR"/default/nuaddXXXXXX"
2037 #endif
2038 /*
2039 * Needed for MkLinux DR1/2/2.1 - J.
[ff4d8eb6]2040@@ -2027,8 +2027,8 @@
[fc7c84a]2041 selinux_update_mapping ();
2042 #endif
2043
2044- nscd_flush_cache ("passwd");
2045- nscd_flush_cache ("group");
2046+// nscd_flush_cache ("passwd");
2047+// nscd_flush_cache ("group");
2048
2049 return E_SUCCESS;
2050 }
[ff4d8eb6]2051diff -Naur shadow-4.1.4.2.orig/src/userdel.c shadow-4.1.4.2/src/userdel.c
2052--- shadow-4.1.4.2.orig/src/userdel.c 2009-05-22 06:41:12.000000000 -0400
2053+++ shadow-4.1.4.2/src/userdel.c 2009-07-26 14:30:10.937479067 -0400
[fc7c84a]2054@@ -993,8 +993,8 @@
2055 user_cancel (user_name);
2056 close_files ();
2057
2058- nscd_flush_cache ("passwd");
2059- nscd_flush_cache ("group");
2060+// nscd_flush_cache ("passwd");
2061+// nscd_flush_cache ("group");
2062
2063 return ((0 != errors) ? E_HOMEDIR : E_SUCCESS);
2064 }
[ff4d8eb6]2065diff -Naur shadow-4.1.4.2.orig/src/usermod.c shadow-4.1.4.2/src/usermod.c
2066--- shadow-4.1.4.2.orig/src/usermod.c 2009-05-22 06:42:53.000000000 -0400
2067+++ shadow-4.1.4.2/src/usermod.c 2009-07-26 14:30:10.940818569 -0400
[fc7c84a]2068@@ -1781,8 +1781,8 @@
2069 }
2070 close_files ();
2071
2072- nscd_flush_cache ("passwd");
2073- nscd_flush_cache ("group");
2074+// nscd_flush_cache ("passwd");
2075+// nscd_flush_cache ("group");
2076
2077 #ifdef WITH_SELINUX
2078 if (Zflg) {
[ff4d8eb6]2079diff -Naur shadow-4.1.4.2.orig/src/vipw.c shadow-4.1.4.2/src/vipw.c
2080--- shadow-4.1.4.2.orig/src/vipw.c 2009-05-25 15:51:28.000000000 -0400
2081+++ shadow-4.1.4.2/src/vipw.c 2009-07-26 14:30:10.940818569 -0400
2082@@ -328,7 +328,7 @@
[fc7c84a]2083 (void) textdomain (PACKAGE);
2084
2085 progname = ((a = strrchr (*argv, '/')) ? a + 1 : *argv);
2086- do_vipw = (strcmp (progname, "vigr") != 0);
2087+ do_vipw = (strcmp (progname, VIGR) != 0);
2088
2089 OPENLOG (do_vipw ? "vipw" : "vigr");
2090
[ff4d8eb6]2091@@ -408,8 +408,8 @@
[fc7c84a]2092 #endif
2093 }
2094
2095- nscd_flush_cache ("passwd");
2096- nscd_flush_cache ("group");
2097+// nscd_flush_cache ("passwd");
2098+// nscd_flush_cache ("group");
2099
2100 return E_SUCCESS;
2101 }
Note: See TracBrowser for help on using the repository browser.