From b3d2a8141a2beab4e83e4b421e8a15aae12485c9 Mon Sep 17 00:00:00 2001
From: Clifford Wolf <clifford@clifford.at>
Date: Wed, 28 Dec 2005 00:47:04 +0000
Subject: [PATCH] Clifford Wolf: Some more hotfixes: glibc, rc
(sysfiles), pam.d (shadow) Updated: mine (0.24) and dialog (1.0-20051219)
[2005122801444301692] (https://www.rocklinux.net/submaster)
git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@6941 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc
---
package/base/dialog/dialog.desc | 4 +--
package/base/glibc/glibc.conf | 31 ++++++++++++-------
package/base/mine/mine.desc | 4 +--
package/base/shadow/pamd-default_config.patch | 7 +++++
package/base/shadow/shadow.conf | 1 +
package/base/sysfiles/rc.c | 2 +-
6 files changed, 33 insertions(+), 16 deletions(-)
diff --git a/package/base/dialog/dialog.desc b/package/base/dialog/dialog.desc
index c6d069a03..e7560fd3f 100644
--- a/package/base/dialog/dialog.desc
+++ b/package/base/dialog/dialog.desc
@@ -44,8 +44,8 @@
[L] GPL
[S] Stable
-[V] 1.0-20051207
+[V] 1.0-20051219
[P] X -?---5---9 111.700
-[D] 915327012 dialog-1.0-20051207.tgz ftp://invisible-island.net/dialog/
+[D] 1401994684 dialog-1.0-20051219.tgz ftp://invisible-island.net/dialog/
diff --git a/package/base/glibc/glibc.conf b/package/base/glibc/glibc.conf
index bc1725d73..048ca6a18 100644
--- a/package/base/glibc/glibc.conf
+++ b/package/base/glibc/glibc.conf
@@ -142,8 +142,10 @@ glibc_custmain() {
# NPTL doesn't work with plain i386 CPUs
if [ $pkg_glibc_linuxthreads = 1 ]; then
temp_arch_target="$arch_target"
+ temp_arch_build="$arch_build"
else
temp_arch_target="${arch_target/i386/i486}"
+ temp_arch_build="${arch_build/i386/i486}"
fi
# Disable glibc internal debuging but build debuging and profile
@@ -153,7 +155,8 @@ glibc_custmain() {
--with-gnu-binutils --enable-add-ons"$ADDONS" $G_PROFILE \
--with-headers=$root/$prefix/include --with-gd=/$prefix \
--with-gd-lib=/$prefix/lib --with-gd-include=/$prefix/include \
- --cache-file=config.cache --build=${arch_build} --host=${temp_arch_target}
+ --cache-file=config.cache \
+ --build=${temp_arch_build} --host=${temp_arch_target}
eval $MAKE prefix=/usr slibdir=/lib sysconfdir=/etc all
if [ -z "$pkg_glibc_cross" ]
@@ -165,21 +168,33 @@ glibc_custmain() {
fi
ln -sf libbsd-compat.a $root/$prefix/lib/libbsd.a
+ # install locales
+ #
+ eval $MAKE localedata/install-locales
+ cp ../localedata/SUPPORTED $root/usr/share/i18n/
+
+ # copy crypt documentation
+ #
+ cp ../crypt/README.ufc-crypt $docdir/README.crypt
+
+ # NSCD Init script and config
+ #
+ cp $confdir/nscd.conf $confdir/nsswitch.conf $root/etc/
+ install_init nscd $confdir/nscd.init
+
# Misc. stuff
#
if [ $stagelevel -gt 1 -a -z "$pkg_glibc_cross" ]
then
- # install locales and linuxthread manpages
+ # install linuxthread manpages
#
- eval $MAKE localedata/install-locales
- cp ../localedata/SUPPORTED $root/usr/share/i18n/
mkdir -p $root/usr/share/man/man3
if [ -f /usr/bin/perl -a $pkg_glibc_linuxthreads = 1 ] ; then
eval $MAKE -C ../linuxthreads/man \
MANDIR=$root/usr/share/man/man3 all install
fi
- # copy linuxthreads and crypt documentation
+ # copy linuxthreads documentation
#
if [ $pkg_glibc_linuxthreads = 1 ]; then
cp ../linuxthreads/ChangeLog $docdir/ChangeLog.threads
@@ -188,12 +203,6 @@ glibc_custmain() {
cp ../linuxthreads/FAQ.html $docdir/FAQ-threads.html
cp -r ../linuxthreads/Examples $docdir/examples.threads
fi
- cp ../crypt/README.ufc-crypt $docdir/README.crypt
-
- # NSCD Init script and config
- #
- cp $confdir/nscd.conf $confdir/nsswitch.conf $root/etc/
- install_init nscd $confdir/nscd.init
fi
# No wrong absolute path in *.so linker scripts
diff --git a/package/base/mine/mine.desc b/package/base/mine/mine.desc
index 5056dc68c..a4d9d4195 100644
--- a/package/base/mine/mine.desc
+++ b/package/base/mine/mine.desc
@@ -35,8 +35,8 @@
[L] GPL
[S] Stable
-[V] 0.23
+[V] 0.24
[P] X 01---5---9 112.100
-[D] 2372097410 mine-0.23.tar.bz2 http://www.rocklinux.net/people/clifford/GEM-MINE/
+[D] 3983830394 mine-0.24.tar.bz2 http://www.rocklinux.net/people/clifford/GEM-MINE/
diff --git a/package/base/shadow/pamd-default_config.patch b/package/base/shadow/pamd-default_config.patch
index 69c68b89d..553b22aee 100644
--- a/package/base/shadow/pamd-default_config.patch
+++ b/package/base/shadow/pamd-default_config.patch
@@ -86,3 +86,10 @@
auth sufficient pam_rootok.so
account required pam_permit.so
-password required pam_make.so /var/db
+--- ./etc/pam.d/passwd.orig 2005-12-27 21:06:57.000000000 +0100
++++ ./etc/pam.d/passwd 2005-12-27 21:07:04.000000000 +0100
+@@ -1,3 +1,3 @@
+ #%PAM-1.0
+ # /etc/pam.d/passwd - sample PAM config file for the `passwd' service
+-password required pam_unix_passwd.so
++password required pam_unix.so
diff --git a/package/base/shadow/shadow.conf b/package/base/shadow/shadow.conf
index bec342e49..e2ac8f7f7 100644
--- a/package/base/shadow/shadow.conf
+++ b/package/base/shadow/shadow.conf
@@ -30,6 +30,7 @@ pm_shadow() {
cp etc/login.defs $root/etc/login.defs
if [ -d $root/etc/pam.d ]; then
for x in etc/pam.d/[a-z]*; do
+ [[ "$x" == *.orig ]] && continue
if [ -f $root/$x ]; then
touch $root/$x
else
diff --git a/package/base/sysfiles/rc.c b/package/base/sysfiles/rc.c
index 758e319f5..cb0eaa0d3 100644
--- a/package/base/sysfiles/rc.c
+++ b/package/base/sysfiles/rc.c
@@ -156,7 +156,7 @@ int main(int argc, char ** argv) {
for (i=1; i<64; i++) {
if ( i == SIGKILL ) continue;
if ( i == SIGSTOP ) continue;
- if( signal(i, SIG_DFL) == SIG_ERR ) {
+ if ( signal(i, SIG_DFL) == SIG_ERR && i < 32 ) {
fprintf(stderr, "rc: Can't reset signal #%d: "
"%s\n", i, strerror(errno) );
return 1;