From 14da3616759b7d16abeb5fcef3713430f0bfb205 Mon Sep 17 00:00:00 2001 From: Stefan Fiedler Date: Mon, 13 Dec 2004 16:36:10 +0000 Subject: [PATCH] Stefan Fiedler: update shadow (4.0.6) Index: package/base/shadow/shadow.desc =================================================================== [2004120715531330389] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@5151 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- package/base/shadow/libpam-fix.patch | 32 ++++++---------------------- package/base/shadow/mallocdef.patch | 30 -------------------------- package/base/shadow/shadow.desc | 4 ++-- package/base/shadow/vigr-fix.patch | 30 -------------------------- 4 files changed, 9 insertions(+), 87 deletions(-) delete mode 100644 package/base/shadow/mallocdef.patch delete mode 100644 package/base/shadow/vigr-fix.patch diff --git a/package/base/shadow/libpam-fix.patch b/package/base/shadow/libpam-fix.patch index a56c1780c..afac25979 100644 --- a/package/base/shadow/libpam-fix.patch +++ b/package/base/shadow/libpam-fix.patch @@ -1,33 +1,15 @@ -# --- 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 - 2004 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/Makefile.in.orig 2003-02-08 13:51:11.000000000 +0100 -+++ ./src/Makefile.in 2003-02-08 13:51:14.000000000 +0100 -@@ -144,8 +144,10 @@ +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.la \ + 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) diff --git a/package/base/shadow/mallocdef.patch b/package/base/shadow/mallocdef.patch deleted file mode 100644 index a458557af..000000000 --- a/package/base/shadow/mallocdef.patch +++ /dev/null @@ -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/mallocdef.patch -# ROCK Linux is Copyright (C) 1998 - 2004 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/xmalloc.c~ Mon Dec 28 21:34:56 1998 -+++ ./libmisc/xmalloc.c Sun May 30 19:03:04 1999 -@@ -16,8 +16,6 @@ - - #include "defines.h" - --extern char *malloc(); -- - char * - xmalloc(size_t size) - { diff --git a/package/base/shadow/shadow.desc b/package/base/shadow/shadow.desc index 7a41c7781..a37d68ca9 100644 --- a/package/base/shadow/shadow.desc +++ b/package/base/shadow/shadow.desc @@ -37,8 +37,8 @@ [L] BSD [S] Stable -[V] 4.0.3 +[V] 4.0.6 [P] X -?-3-5---9 179.100 -[D] 2967342955 shadow-4.0.3.tar.bz2 ftp://ftp.pld.org.pl/software/shadow/ +[D] 2338140328 shadow-4.0.6.tar.bz2 ftp://ftp.pld.org.pl/software/shadow/ diff --git a/package/base/shadow/vigr-fix.patch b/package/base/shadow/vigr-fix.patch deleted file mode 100644 index 24886f8f9..000000000 --- a/package/base/shadow/vigr-fix.patch +++ /dev/null @@ -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/vigr-fix.patch -# ROCK Linux is Copyright (C) 1998 - 2004 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/Makefile.in.orig 2002-03-13 21:04:10.000000000 +0200 -+++ ./src/Makefile.in 2002-10-13 20:11:38.000000000 +0300 -@@ -799,7 +799,7 @@ - - install-exec-hook: - ln -sf newgrp $(DESTDIR)$(bindir)/sg -- ln -sf vigr $(DESTDIR)$(bindir)/vipw -+ ln -sf vipw $(DESTDIR)$(sbindir)/vigr - for i in $(suidbins); do \ - chmod 4755 $(DESTDIR)$(bindir)/$$i; \ - done