Browse Source

Clifford Wolf:


			
			
				rocklinux
			
			
		
Clifford Wolf 19 years ago
parent
commit
b3d2a8141a
6 changed files with 33 additions and 16 deletions
  1. +2
    -2
      package/base/dialog/dialog.desc
  2. +20
    -11
      package/base/glibc/glibc.conf
  3. +2
    -2
      package/base/mine/mine.desc
  4. +7
    -0
      package/base/shadow/pamd-default_config.patch
  5. +1
    -0
      package/base/shadow/shadow.conf
  6. +1
    -1
      package/base/sysfiles/rc.c

+ 2
- 2
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/

+ 20
- 11
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

+ 2
- 2
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/

+ 7
- 0
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

+ 1
- 0
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

+ 1
- 1
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;

Loading…
Cancel
Save