Browse Source

Clifford Wolf:


			
			
				rocklinux
			
			
		
Clifford Wolf 19 years ago
parent
commit
d40087ca64
7 changed files with 10 additions and 280 deletions
  1. +4
    -0
      package/base/pam/pam.conf
  2. +0
    -30
      package/base/shadow/hotfix.patch
  3. +0
    -34
      package/base/shadow/libpam-fix.patch
  4. +2
    -2
      package/base/shadow/login_defs.patch
  5. +0
    -210
      package/base/shadow/no-chauthtok.patch
  6. +2
    -2
      package/base/shadow/shadow.conf
  7. +2
    -2
      package/base/shadow/shadow.desc

+ 4
- 0
package/base/pam/pam.conf

@ -26,6 +26,10 @@
#
libdir="$root/lib"
# fix libdir in the .la files (the *.so files are in /lib)
hook_add postflist 5 "sed -i -e \"s,^libdir=.*,libdir=/lib,\" \
$root/usr/lib/libpam.la $root/usr/lib/libpam_misc.la $root/usr/lib/libpamc.la"
install_pam_configs() {
mkdir -p $root/etc/pam.d
if [ ! -f $root/etc/pam.d/other ]; then

+ 0
- 30
package/base/shadow/hotfix.patch

@ -1,30 +0,0 @@
# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
#
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
# Please add additional copyright information _after_ the line containing
# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
#
# ROCK Linux: rock-src/package/base/shadow/hotfix.patch
# ROCK Linux is Copyright (C) 1998 - 2005 Clifford Wolf
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
#
# --- ROCK-COPYRIGHT-NOTE-END ---
--- ./libmisc/login_desrpc.c
+++ ./libmisc/login_desrpc.c
@@ -21,6 +21,8 @@
#include <config.h>
#endif
+#include "defines.h"
+
#ifdef DES_RPC
#include "rcsid.h"
RCSID("$Id: hotfix.patch,v 1.3 2003/01/10 12:12:54 clifford Exp $")

+ 0
- 34
package/base/shadow/libpam-fix.patch

@ -1,34 +0,0 @@
# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
#
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
# Please add additional copyright information _after_ the line containing
# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
#
# ROCK Linux: rock-src/package/base/shadow/libpam-fix.patch
# ROCK Linux is Copyright (C) 1998 - 2005 Clifford Wolf
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
#
# --- ROCK-COPYRIGHT-NOTE-END ---
diff -dur shadow-4.0.5/src/Makefile.in shadow-4.0.5-p/src/Makefile.in
--- shadow-4.0.5/src/Makefile.in 2004-10-26 03:34:09.000000000 +0200
+++ shadow-4.0.5-p/src/Makefile.in 2004-11-07 04:56:47.042845024 +0100
@@ -352,8 +352,10 @@
# id and groups are from gnu, sulogin from sysvinit
suidbins = su
suidubins = chage chfn chsh expiry gpasswd newgrp passwd
+# Add $(LIBPAM) to $(LDADD) because libmisc and libshadow are using some
+# functions provided by the PAM library.
LDADD = $(top_builddir)/libmisc/libmisc.a \
- $(top_builddir)/lib/libshadow.la
+ $(top_builddir)/lib/libshadow.la $(LIBPAM)
chpasswd_LDADD = $(LDADD) $(LIBPAM)
chage_LDADD = $(LDADD) $(LIBPAM)

+ 2
- 2
package/base/shadow/login_defs.patch

@ -17,8 +17,8 @@
#
# --- ROCK-COPYRIGHT-NOTE-END ---
--- ./etc/login.defs.linux.orig Fri Jan 5 15:33:49 2001
+++ ./etc/login.defs.linux Fri Jan 5 15:38:52 2001
--- ./etc/login.defs.orig Fri Jan 5 15:33:49 2001
+++ ./etc/login.defs Fri Jan 5 15:38:52 2001
@@ -230,7 +230,7 @@
#
# If compiled with cracklib support, where are the dictionaries

+ 0
- 210
package/base/shadow/no-chauthtok.patch

@ -1,210 +0,0 @@
# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
#
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
# Please add additional copyright information _after_ the line containing
# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
#
# ROCK Linux: rock-src/package/base/shadow/no-chauthtok.patch
# ROCK Linux is Copyright (C) 1998 - 2005 Clifford Wolf
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
#
# --- ROCK-COPYRIGHT-NOTE-END ---
--- ./src/chage.c.orig 2004-12-22 17:32:12.194686152 +0100
+++ ./src/chage.c 2004-12-22 17:34:47.019149256 +0100
@@ -748,21 +748,6 @@
SYSLOG ((LOG_INFO, "changed password expiry for %s", name));
#ifdef USE_PAM
- if (!lflg) {
- if (retval == PAM_SUCCESS) {
- retval = pam_chauthtok (pamh, 0);
- if (retval != PAM_SUCCESS) {
- pam_end (pamh, retval);
- }
- }
-
- if (retval != PAM_SUCCESS) {
- fprintf (stderr, _("%s: PAM chauthtok failed\n"),
- Prog);
- exit (1);
- }
- }
-
if (retval == PAM_SUCCESS)
pam_end (pamh, PAM_SUCCESS);
--- ./src/chpasswd.c.orig 2004-12-22 17:35:32.017308496 +0100
+++ ./src/chpasswd.c 2004-12-22 17:34:59.981178728 +0100
@@ -325,18 +325,6 @@
pw_unlock ();
#ifdef USE_PAM
- if (retval == PAM_SUCCESS) {
- retval = pam_chauthtok (pamh, 0);
- if (retval != PAM_SUCCESS) {
- pam_end (pamh, retval);
- }
- }
-
- if (retval != PAM_SUCCESS) {
- fprintf (stderr, _("%s: PAM chauthtok failed\n"), Prog);
- exit (1);
- }
-
if (retval == PAM_SUCCESS)
pam_end (pamh, PAM_SUCCESS);
#endif /* USE_PAM */
--- ./src/groupadd.c.orig 2004-12-22 17:35:52.601179272 +0100
+++ ./src/groupadd.c 2004-12-22 17:35:57.214477944 +0100
@@ -584,18 +584,6 @@
close_files ();
#ifdef USE_PAM
- if (retval == PAM_SUCCESS) {
- retval = pam_chauthtok (pamh, 0);
- if (retval != PAM_SUCCESS) {
- pam_end (pamh, retval);
- }
- }
-
- if (retval != PAM_SUCCESS) {
- fprintf (stderr, _("%s: PAM chauthtok failed\n"), Prog);
- exit (1);
- }
-
if (retval == PAM_SUCCESS)
pam_end (pamh, PAM_SUCCESS);
#endif /* USE_PAM */
--- ./src/groupdel.c.orig 2004-12-22 17:36:03.971450728 +0100
+++ ./src/groupdel.c 2004-12-22 17:36:08.384779800 +0100
@@ -402,18 +402,6 @@
close_files ();
#ifdef USE_PAM
- if (retval == PAM_SUCCESS) {
- retval = pam_chauthtok (pamh, 0);
- if (retval != PAM_SUCCESS) {
- pam_end (pamh, retval);
- }
- }
-
- if (retval != PAM_SUCCESS) {
- fprintf (stderr, _("%s: PAM chauthtok failed\n"), Prog);
- exit (1);
- }
-
if (retval == PAM_SUCCESS)
pam_end (pamh, PAM_SUCCESS);
#endif /* USE_PAM */
--- ./src/groupmod.c.orig 2004-12-22 17:36:16.650523216 +0100
+++ ./src/groupmod.c 2004-12-22 17:36:20.521934672 +0100
@@ -596,18 +596,6 @@
close_files ();
#ifdef USE_PAM
- if (retval == PAM_SUCCESS) {
- retval = pam_chauthtok (pamh, 0);
- if (retval != PAM_SUCCESS) {
- pam_end (pamh, retval);
- }
- }
-
- if (retval != PAM_SUCCESS) {
- fprintf (stderr, _("%s: PAM chauthtok failed\n"), Prog);
- exit (1);
- }
-
if (retval == PAM_SUCCESS)
pam_end (pamh, PAM_SUCCESS);
#endif /* USE_PAM */
--- ./src/newusers.c.orig 2004-12-22 17:36:27.011948040 +0100
+++ ./src/newusers.c 2004-12-22 17:36:31.626246560 +0100
@@ -598,18 +598,6 @@
(void) pw_unlock ();
#ifdef USE_PAM
- if (retval == PAM_SUCCESS) {
- retval = pam_chauthtok (pamh, 0);
- if (retval != PAM_SUCCESS) {
- pam_end (pamh, retval);
- }
- }
-
- if (retval != PAM_SUCCESS) {
- fprintf (stderr, _("%s: PAM chauthtok failed\n"), Prog);
- exit (1);
- }
-
if (retval == PAM_SUCCESS)
pam_end (pamh, PAM_SUCCESS);
#endif /* USE_PAM */
--- ./src/useradd.c.orig 2004-12-22 17:36:37.990279080 +0100
+++ ./src/useradd.c 2004-12-22 17:36:41.877688104 +0100
@@ -1776,18 +1776,6 @@
close_files ();
#ifdef USE_PAM
- if (retval == PAM_SUCCESS) {
- retval = pam_chauthtok (pamh, 0);
- if (retval != PAM_SUCCESS) {
- pam_end (pamh, retval);
- }
- }
-
- if (retval != PAM_SUCCESS) {
- fprintf (stderr, _("%s: PAM chauthtok failed\n"), Prog);
- exit (1);
- }
-
if (retval == PAM_SUCCESS)
pam_end (pamh, PAM_SUCCESS);
#endif /* USE_PAM */
--- ./src/userdel.c.orig 2004-12-22 17:36:45.031208696 +0100
+++ ./src/userdel.c 2004-12-22 17:36:48.645659216 +0100
@@ -807,17 +807,6 @@
user_cancel (user_name);
close_files ();
#ifdef USE_PAM
- if (retval == PAM_SUCCESS) {
- retval = pam_chauthtok (pamh, 0);
- if (retval != PAM_SUCCESS)
- pam_end (pamh, retval);
- }
-
- if (retval != PAM_SUCCESS) {
- fprintf (stderr, _("%s: PAM chauthtok failed\n"), Prog);
- exit (E_PW_UPDATE);
- }
-
if (retval == PAM_SUCCESS)
pam_end (pamh, PAM_SUCCESS);
#endif /* USE_PAM */
--- ./src/usermod.c.orig 2004-12-22 17:36:51.806178744 +0100
+++ ./src/usermod.c 2004-12-22 17:36:55.669591416 +0100
@@ -1487,18 +1487,6 @@
exit (E_GRP_UPDATE);
#ifdef USE_PAM
- if (retval == PAM_SUCCESS) {
- retval = pam_chauthtok (pamh, 0);
- if (retval != PAM_SUCCESS) {
- pam_end (pamh, retval);
- }
- }
-
- if (retval != PAM_SUCCESS) {
- fprintf (stderr, _("%s: PAM chauthtok failed\n"), Prog);
- exit (1);
- }
-
if (retval == PAM_SUCCESS)
pam_end (pamh, PAM_SUCCESS);
#endif /* USE_PAM */

+ 2
- 2
package/base/shadow/shadow.conf

@ -27,7 +27,7 @@ pc_shadow() {
pm_shadow() {
cp etc/limits etc/login.access $root/etc/
cp etc/login.defs.linux $root/etc/login.defs
cp etc/login.defs $root/etc/login.defs
if [ -d $root/etc/pam.d ]; then
for x in etc/pam.d/[a-z]*; do
if [ -f $root/$x ]; then
@ -47,6 +47,6 @@ pm_shadow() {
preconf="pc_shadow"
postmake="pm_shadow"
confopt="$confopt --enable-shared --disable-desrpc"
confopt="$confopt --enable-shared --disable-desrpc --without-selinux"
libdir="$root/lib"

+ 2
- 2
package/base/shadow/shadow.desc

@ -37,8 +37,8 @@
[L] BSD
[S] Stable
[V] 4.0.6
[V] 4.0.13
[P] X -?-3-----9 179.200
[D] 2338140328 shadow-4.0.6.tar.bz2 ftp://ftp.pld.org.pl/software/shadow/
[D] 3897482874 shadow-4.0.13.tar.bz2 ftp://ftp.pld.org.pl/software/shadow/

Loading…
Cancel
Save