From 0c4a96a9149d88dc68c1fb809cd43c3eede31a89 Mon Sep 17 00:00:00 2001 From: cvs2git Date: Wed, 31 Mar 1999 07:39:21 +0000 Subject: [PATCH] This commit was manufactured by cvs2git to create branch 'rpm3'. Sprout from master 1999-03-31 07:39:21 UTC Artur Frysiak '- change macro name from man-pages-ver to man_pages_ver (work with rpm 2.9x); change Source URL to manpages' Delete: glibc-info.patch ldconfig-bklinks.patch ldconfig-glibc.patch ldconfig.8 nscd.init utmpd.init --- glibc-info.patch | 15 ---- ldconfig-bklinks.patch | 19 ----- ldconfig-glibc.patch | 15 ---- ldconfig.8 | 189 ----------------------------------------- nscd.init | 56 ------------ utmpd.init | 46 ---------- 6 files changed, 340 deletions(-) delete mode 100644 glibc-info.patch delete mode 100644 ldconfig-bklinks.patch delete mode 100644 ldconfig-glibc.patch delete mode 100644 ldconfig.8 delete mode 100644 nscd.init delete mode 100644 utmpd.init diff --git a/glibc-info.patch b/glibc-info.patch deleted file mode 100644 index 5c0d78d..0000000 --- a/glibc-info.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -Nru glibc-2.1/manual/libc.texinfo glibc-2.1.new/manual/libc.texinfo ---- glibc-2.1/manual/libc.texinfo Tue Jan 12 18:22:16 1999 -+++ glibc-2.1.new/manual/libc.texinfo Sat Feb 27 02:40:12 1999 -@@ -5,9 +5,9 @@ - @setchapternewpage odd - - @comment Tell install-info what to do. --@dircategory GNU libraries -+@dircategory Libraries: - @direntry --* Libc: (libc). C library. -+* Libc: (libc) C library. - @end direntry - - @c This tells texinfo.tex to use the real section titles in xrefs in diff --git a/ldconfig-bklinks.patch b/ldconfig-bklinks.patch deleted file mode 100644 index 81a6d3e..0000000 --- a/ldconfig-bklinks.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- ldconfig-970926/ldconfig.c.ewt Tue Oct 21 13:44:27 1997 -+++ ldconfig-970926/ldconfig.c Tue Oct 21 13:45:37 1997 -@@ -182,8 +182,14 @@ - *islink = S_ISLNK(statbuf.st_mode); - - /* then try opening it */ -- if (!(file = fopen(buff, "rb"))) -- warn("can't open %s (%s), skipping", buff, strerror(errno)); -+ if (!(file = fopen(buff, "rb"))) { -+ if (*islink) { -+ if (strstr(buff, ".so.")) -+ unlink(buff); -+ } else { -+ warn("can't open %s (%s), skipping", buff, strerror(errno)); -+ } -+ } - else - { - /* now make sure it's a shared library */ diff --git a/ldconfig-glibc.patch b/ldconfig-glibc.patch deleted file mode 100644 index 32eed0d..0000000 --- a/ldconfig-glibc.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -Nur ldconfig-980708/ldconfig.c ldconfig-980708.orig/ldconfig.c ---- ldconfig-980708/ldconfig.c Wed Jul 8 19:55:57 1998 -+++ ldconfig-980708.orig/ldconfig.c Tue Oct 6 08:07:23 1998 -@@ -33,7 +33,11 @@ - #include - #include - #include -+#if ((__GLIBC__ == 2) && (__GLIBC_MINOR__ >= 1)) -+#include -+#else - #include -+#endif /* glibc-2.1 */ - #ifdef _LIBC - #include - #else diff --git a/ldconfig.8 b/ldconfig.8 deleted file mode 100644 index 8228529..0000000 --- a/ldconfig.8 +++ /dev/null @@ -1,189 +0,0 @@ -.TH ldconfig 8 "14 March 1998" -.SH NAME -ldconfig \- determine run-time link bindings -.SH SYNOPSIS -ldconfig -.RB [ \-DvqnNX ] -.RB [ \-f\ conf ] -.RB [ \-C\ cache ] -.RB [ \-r\ root ] -.IR directory \ ... -.PD 0 -.PP -.PD -ldconfig -.B \-l -.RB [ \-Dvq ] -.IR library \ ... -.PD 0 -.PP -.PD -ldconfig -.B \-p -.SH DESCRIPTION -.B ldconfig -creates the necessary links and cache (for use by the run-time linker, -.IR ld.so ) -to the most recent shared libraries found in the directories specified -on the command line, in the file -.IR /etc/ld.so.conf , -and in the trusted directories -.RI ( /usr/lib -and -.IR /lib ). -.B ldconfig -checks the header and file names of the libraries it encounters when -determining which versions should have their links updated. -.B ldconfig -ignores symbolic links when scanning for libraries. -.PP -.B ldconfig -will attempt to deduce the type of ELF libs (ie. libc5 or libc6/glibc) -based on what C libs if any the library was linked against, therefore when -making dynamic libraries, it is wise to explicitly link against libc (use -lc). -.PP -Some existing libs do not contain enough information to allow the deduction of -their type, therefore the -.IR /etc/ld.so.conf -file format allows the specification of an expected type. This is -.B only -used for those ELF libs which we can not work out. The format -is like this "dirname=TYPE", where type can be libc4, libc5 or libc6. -(This syntax also works on the command line). Spaces are -.B not -allowed. Also see the -.B -p -option. -.PP -Directory names containing an -.B = are no longer legal -unless they also have an expected type specifier. -.PP -.B ldconfig -should normally be run by the super-user as it may require write -permission on some root owned directories and files. -It is normally run automatically at bootup, from /etc/rc, or manually -whenever new DLL's are installed. -.SH OPTIONS -.TP -.B \-D -Debug mode. -Implies -.B \-N -and -.BR \-X . -.TP -.B \-v -Verbose mode. -Print current version number, the name of each directory as it -is scanned and any links that are created. -Overrides quiet mode. -.TP -.B \-q -Quiet mode. -Don't print warnings. -.TP -.B \-n -Only process directories specified on the command line. -Don't process the trusted directories -.RI ( /usr/lib -and -.IR /lib ) -nor those specified in -.IR /etc/ld.so.conf . -Implies -.BR \-N . -.TP -.B \-N -Don't rebuild the cache. -Unless -.B \-X -is also specified, links are still updated. -.TP -.B \-X -Don't update links. -Unless -.B \-N -is also specified, the cache is still rebuilt. -.TP -.B \-f conf -Use -.B conf -instead of -.IR /etc/ld.so.conf . -.TP -.B \-C cache -Use -.B cache -instead of -.IR /etc/ld.so.cache . -.TP -.B \-r root -Change to and use -.B root -as the root directory. -.TP -.B \-l -Library mode. -Manually link individual libraries. -Intended for use by experts only. -.TP -.B \-p -Print the lists of directories and candidate libraries stored in -the current cache. -.SH EXAMPLES -In the bootup file -.I /etc/rc -having the line -.RS - -/sbin/ldconfig -v - -.RE -will set up the correct links for the shared binaries and rebuild -the cache. -.TP -On the command line -.RS - -# /sbin/ldconfig -n /lib - -.RE -as root after the installation of a new DLL, will properly update the -shared library symbolic links in /lib. - -.SH FILES -.PD 0 -.TP 20 -.B /lib/ld.so -execution time linker/loader -.TP 20 -.B /etc/ld.so.conf -File containing a list of colon, space, tab, newline, or comma spearated -directories in which to search for libraries. -.TP 20 -.B /etc/ld.so.cache -File containing an ordered list of libraries found in the directories -specified in -.BR /etc/ld.so.conf . -.TP -.B lib*.so.version -shared libraries -.PD -.SH SEE ALSO -.BR ldd (1), -.BR ld.so (8). -.SH BUGS -.LP -.BR ldconfig 's -functionality, in conjunction with -.BR ld.so , -is only available for executables compiled using libc version 4.4.3 or greater. -.PP -.BR ldconfig , -being a user process, must be run manually and has no means of dynamically -determining and relinking shared libraries for use by -.BR ld.so -when a new DLL is installed. -.SH AUTHORS -David Engel and Mitch D'Souza. diff --git a/nscd.init b/nscd.init deleted file mode 100644 index 395df9d..0000000 --- a/nscd.init +++ /dev/null @@ -1,56 +0,0 @@ -#!/bin/sh -# -# nscd: Starts the Name Switch Cache Daemon -# -# chkconfig: - 30 80 -# description: This is a daemon which handles passwd and group lookups \ -# for running programs and cache the results for the next \ -# query. You should start this daemon only if you use \ -# slow Services like NIS or NIS+ -# processname: nscd -# config: /etc/nscd.conf -# - -# Sanity checks. -[ -f /etc/nscd.conf ] || exit 0 -[ -x /usr/sbin/nscd ] || exit 0 - -# Source function library. -. /etc/rc.d/init.d/functions - -# See how we were called. -case "$1" in - start) - secure="" -# for table in passwd group -# do -# if egrep '^'$table':.*nisplus' /etc/nsswitch.conf >/dev/null -# then -# /usr/lib/nscd_nischeck $table || -# secure="$secure -S $table,yes" -# fi -# done - show Starting Name Switch Cache Daemon - daemon nscd $secure - touch /var/lock/subsys/nscd - ;; - stop) - show Stopping Name Switch Cache Daemon - busy - /usr/sbin/nscd -K - rm -f /var/lock/subsys/nscd - deltext - ok - ;; - status) - status nscd - ;; - restart|reload) - $0 stop - $0 start - ;; - *) - echo "Usage: $0 {start|stop|status|restart|reload}" - ;; -esac -exit 0 diff --git a/utmpd.init b/utmpd.init deleted file mode 100644 index f3d1814..0000000 --- a/utmpd.init +++ /dev/null @@ -1,46 +0,0 @@ -#!/bin/sh -# -# /etc/rc.d/init.d/utmpd -# -# Starts the utmpd daemon -# -# chkconfig: 2345 25 55 -# description: Utmpd daemon -# processname: utmpd -# -# Source function library. -. /etc/rc.d/init.d/functions - -# See how we were called. -# -case "$1" in - start) - show Starting utmpd daemon - # Clean up /var/run and create /var/run/utmp so that we can login. - #( cd /var/run && find . ! -type d -exec rm -f -- {} \; ) - : > /var/run/utmpx - : > /var/run/utmp - if [ ! -f /var/log/wtmpx ]; then - : > /var/log/wtmpx - fi - daemon utmpd - touch /var/lock/subsys/utmpd - ;; - stop) - show Stopping utmpd daemon - killproc utmpd - rm -f /var/lock/subsys/utmpd - ;; - reload|restart) - $0 stop - $0 start - ;; - status) - status utmpd - ;; - *) - echo "Usage: $0 {start|stop|restart|reload|status}" - exit 1 -esac - -exit 0 -- 2.44.0