From de6548f5387b0f707122f6b288c86abb4f3f3164 Mon Sep 17 00:00:00 2001 From: cvsdist Date: Sep 09 2004 03:55:45 +0000 Subject: auto-import changelog data from coreutils-4.5.3-7.src.rpm Mon Dec 09 2002 Tim Waugh 4.5.3-7 - Fix mv (bug #79283). - Add patch27 (nogetline). Sun Dec 01 2002 Tim Powers 4.5.3-6 - use the su.pamd from sh-utils since it works properly with multilib systems Fri Nov 29 2002 Tim Waugh 4.5.3-5 - Fix test suite quoting problems. Fri Nov 29 2002 Tim Waugh 4.5.3-4 - Fix scriplets. - Fix i18n patch so it doesn't break uniq. - Fix several other patches to either make the test suite pass or not run the relevant tests. - Run 'make check'. - Fix file list. Thu Nov 28 2002 Tim Waugh 4.5.3-3 - Adapted for Red Hat Linux. - Self-host for help2man. - Don't ship readlink just yet (maybe later). - Merge patches from fileutils and sh-utils (textutils ones are already merged it seems). - Keep the binaries where the used to be (in particular, id and stat). Sun Nov 17 2002 Stew Benedict 4.5.3-2mdk - LI18NUX/LSB compliance (patch800) - Installed (but unpackaged) file(s) - /usr/share/info/dir Thu Oct 31 2002 Thierry Vignaud 4.5.3-1mdk - new release - rediff patch 180 - merge patch 150 into 180 Mon Oct 14 2002 Thierry Vignaud 4.5.2-6mdk - move su back to /bin Mon Oct 14 2002 Thierry Vignaud 4.5.2-5mdk - patch 0 : lg locale is illegal and must be renamed lug (pablo) Mon Oct 14 2002 Thierry Vignaud 4.5.2-4mdk - fix conflict with procps Mon Oct 14 2002 Thierry Vignaud 4.5.2-3mdk - patch 105 : fix install -s Mon Oct 14 2002 Thierry Vignaud 4.5.2-2mdk - fix build - don't chmode two times su - build with large file support - fix description - various spec cleanups - fix chroot installation - fix missing /bin/env - add old fileutils, sh-utils & textutils ChangeLogs Fri Oct 11 2002 Thierry Vignaud 4.5.2-1mdk - initial release (merge fileutils, sh-utils & textutils) - obsoletes/provides: sh-utils/fileutils/textutils - fileutils stuff go in 1xx range - sh-utils stuff go in 7xx range - textutils stuff go in 5xx range - drop obsoletes patches 1, 2, 10 (somes files're gone but we didn't ship most of them) - rediff patches 103, 105, 111, 113, 180, 706 - temporary disable patch 3 & 4 - fix fileutils url --- diff --git a/.cvsignore b/.cvsignore index e69de29..1b8ad25 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1,3 @@ +coreutils-4.5.3.tar.bz2 +textutils-2.0-chinese-locales.tar.bz2 +textutils-2.0-po-update.tar.bz2 diff --git a/coreutils-4.5.3-langinfo.patch b/coreutils-4.5.3-langinfo.patch new file mode 100644 index 0000000..5eca0eb --- /dev/null +++ b/coreutils-4.5.3-langinfo.patch @@ -0,0 +1,18 @@ +--- coreutils-4.5.3/src/date.c.langinfo 2002-11-28 18:02:47.000000000 +0000 ++++ coreutils-4.5.3/src/date.c 2002-11-28 18:04:04.000000000 +0000 +@@ -509,14 +509,7 @@ + else + { + char *date_fmt = DATE_FMT_LANGINFO (); +- /* Do not wrap the following literal format string with _(...). +- For example, suppose LC_ALL is unset, LC_TIME="POSIX", +- and LANG="ko_KR". In that case, POSIX says that LC_TIME +- determines the format and contents of date and time strings +- written by date, which means "date" must generate output +- using the POSIX locale; but adding _() would cause "date" +- to use a Korean translation of the format. */ +- format = *date_fmt ? date_fmt : "%a %b %e %H:%M:%S %Z %Y"; ++ format = *date_fmt ? date_fmt : dcgettext(NULL, N_("%a %b %e %H:%M:%S %Z %Y"), LC_TIME); + } + } + else if (*format == '\0') diff --git a/coreutils-4.5.3-sysinfo.patch b/coreutils-4.5.3-sysinfo.patch new file mode 100644 index 0000000..3e215ac --- /dev/null +++ b/coreutils-4.5.3-sysinfo.patch @@ -0,0 +1,64 @@ +--- coreutils-4.5.3/src/uname.c.sysinfo 2002-08-31 09:52:11.000000000 +0100 ++++ coreutils-4.5.3/src/uname.c 2002-11-28 18:29:15.000000000 +0000 +@@ -232,7 +232,7 @@ + if (toprint & PRINT_KERNEL_RELEASE) + print_element (name.release); + if (toprint & PRINT_KERNEL_VERSION) +- print_element (name.version); ++ print_element (name.version); + if (toprint & PRINT_MACHINE) + print_element (name.machine); + } +@@ -246,6 +246,28 @@ + if (0 <= sysinfo (SI_ARCHITECTURE, processor, sizeof processor)) + element = processor; + } ++#else ++ { ++ struct utsname u; ++ uname(&u); ++ element = u.machine; ++#ifdef linux ++ if(!strcmp(element, "i686")) { /* Check for Athlon */ ++ char cinfo[1024]; ++ FILE *f=fopen("/proc/cpuinfo", "r"); ++ if(f) { ++ while(fgets(cinfo, 1024, f)) { ++ if(!strncmp(cinfo, "vendor_id", 9)) { ++ if(strstr(cinfo, "AuthenticAMD")) ++ element="athlon"; ++ break; ++ } ++ } ++ fclose(f); ++ } ++ } ++#endif ++ } + #endif + #ifdef UNAME_PROCESSOR + if (element == unknown) +@@ -262,7 +284,7 @@ + + if (toprint & PRINT_HARDWARE_PLATFORM) + { +- char const *element = unknown; ++ char *element = unknown; + #if HAVE_SYSINFO && defined SI_PLATFORM + { + static char hardware_platform[257]; +@@ -270,6 +292,14 @@ + hardware_platform, sizeof hardware_platform)) + element = hardware_platform; + } ++#else ++ { ++ struct utsname u; ++ uname(&u); ++ element = u.machine; ++ if(strlen(element)==4 && element[0]=='i' && element[2]=='8' && element[3]=='6') ++ element[1]='3'; ++ } + #endif + #ifdef UNAME_HARDWARE_PLATFORM + if (element == unknown) diff --git a/coreutils.spec b/coreutils.spec new file mode 100644 index 0000000..41d0581 --- /dev/null +++ b/coreutils.spec @@ -0,0 +1,347 @@ +Summary: The GNU core utilities: a set of tools commonly used in shell scripts +Name: coreutils +Version: 4.5.3 +Release: 7 +License: GPL +Group: System/Base +Url: ftp://alpha.gnu.org/gnu/coreutils/ + +Source0: ftp://prep.ai.mit.edu/pub/gnu/%name/%name-%version.tar.bz2 +Source101: DIR_COLORS +Source102: DIR_COLORS.xterm +Source103: readlink.c +Source104: readlink.1 +Source105: colorls.sh +Source106: colorls.csh +Source200: su.pamd +Source201: help2man + +# textutils +Source501: textutils-2.0-po-update.tar.bz2 +Source510: textutils-2.0-chinese-locales.tar.bz2 + +Patch0: coreutils-4.5.2-lug.patch + +# fileutils +Patch101: fileutils-4.0-spacedir.patch +Patch102: fileutils-4.0s-sparc.patch +Patch103: coreutils-4.5.2-trunc.patch +Patch105: coreutils-4.5.2-C.patch +Patch107: fileutils-4.1.10-timestyle.patch +Patch108: fileutils-4.1.5-afs.patch +Patch111: coreutils-4.5.2-dumbterm.patch +Patch112: fileutils-4.0u-glibc22.patch +Patch113: coreutils-4.5.2-nolibrt.patch +Patch114: fileutils-4.1-restorecolor.patch +Patch115: fileutils-4.1.1-FBoptions.patch +Patch1155: fileutils-4.1-force-option--override--interactive-option.patch +Patch116: fileutils-4.1-dircolors_c.patch +Patch117: fileutils-4.1-ls_c.patch +Patch118: fileutils-4.1-ls_h.patch +Patch152: fileutils-4.1.8-touch_errno.patch +Patch153: fileutils-4.1.10-utmp.patch +Patch180: coreutils-4.5.3-fr-fix.patch +Patch181: coreutils-4.5.3-samefile.patch +Patch182: coreutils-4.5.3-acl.patch +Patch183: coreutils-4.5.3-aclcompile.patch +Patch184: coreutils-4.5.3-danglinglink.patch +Patch185: coreutils-4.5.3-errno.patch +Patch186: coreutils-4.5.3-LC_TIME.patch +Patch187: coreutils-4.5.3-prompt.patch +Patch188: coreutils-4.5.3-suidfail.patch +Patch189: coreutils-4.5.3-stoneage.patch +Patch190: coreutils-4.5.3-overwrite.patch + +# textutils +Patch500: textutils-2.0.17-mem.patch +Patch502: textutils-2.0.21-man.patch + +# sh-utils +Patch702: sh-utils-2.0-utmp.patch +Patch703: sh-utils-2.0.11-dateman.patch +Patch704: sh-utils-1.16-paths.patch +# RMS will never accept the PAM patch because it removes his historical +# rant about Twenex and the wheel group, so we'll continue to maintain +# it here indefinitely. +Patch706: coreutils-4.5.2-pam.patch +Patch710: sh-utils-2.0-rfc822.patch +Patch711: coreutils-4.5.3-hname.patch +Patch712: coreutils-4.5.3-chdir.patch +Patch713: coreutils-4.5.3-langinfo.patch +Patch714: coreutils-4.5.3-printf-ll.patch +Patch715: coreutils-4.5.3-sysinfo.patch +Patch716: coreutils-4.5.3-nogetline.patch + +# (sb) lin18nux/lsb compliance +Patch800: coreutils-4.5.3-i18n.patch + +# Think the test suite failure is a bug.. +Patch900: coreutils-4.5.3-test-bugs.patch + + +BuildRoot: %_tmppath/%{name}-root +BuildRequires: gettext libtermcap-devel pam-devel texinfo +Prereq: /sbin/install-info +Requires: pam >= 0.66-12 + +Provides: fileutils = %version, sh-utils = %version, stat, textutils = %version +Obsoletes: fileutils sh-utils stat textutils + +# For when we ship readlink in this package: +#Conflicts: tetex < 1.0.7-49mdk + +%description +These are the GNU core utilities. This package is the combination of +the old GNU fileutils, sh-utils, and textutils packages. + +%prep +%setup -q + +%patch0 -p1 +mv po/{lg,lug}.po + +# fileutils +%patch101 -p1 -b .space +%patch102 -p1 -b .sparc +%patch103 -p0 -b .trunc +%patch105 -p0 -b .Coption +%patch107 -p1 -b .timestyle +%patch108 -p1 -b .afs +%patch111 -p0 -b .dumbterm +%patch112 -p1 -b .glibc22 +%patch113 -p1 -b .nolibrt +%patch114 -p1 -b .restore +%patch115 -p1 -b .FBopts +%patch1155 -p1 +%patch116 -p1 +%patch117 -p1 +%patch118 -p1 +%patch152 -p1 +%patch153 -p1 +%patch180 -p1 -b .frfix +%patch181 -p1 -b .samefile +%patch182 -p1 -b .acl +%patch183 -p1 -b .aclcompile +%patch184 -p1 -b .danglinglink +%patch185 -p1 -b .errno +%patch186 -p1 -b .LC_TIME +%patch187 -p1 -b .prompt +%patch188 -p1 -b .suidfail +%patch189 -p1 -b .stoneage +%patch190 -p1 -b .overwrite + +# textutils +%patch500 -p1 +# patch in new ALL_LINGUAS +%patch502 -p1 + +# sh-utils +%patch702 -p1 -b .utmp +%patch703 -p1 -b .dateman +%patch704 -p1 -b .paths +%patch706 -p1 -b .pam +%patch710 -p1 -b .rfc822 +%patch711 -p1 -b .hname +%patch712 -p1 -b .chdir +%patch713 -p1 -b .langinfo +%patch714 -p1 -b .printf-ll +%patch715 -p1 -b .sysinfo +%patch716 -p1 -b .nogetline + +# li18nux/lsb +%patch800 -p1 -b .i18n + +# Coreutils +%patch900 -p1 -b .test-bugs + +%build +%{expand:%%global optflags %{optflags} -D_GNU_SOURCE=1} +touch aclocal.m4 configure config.hin Makefile.in */Makefile.in */*/Makefile.in +cp %SOURCE201 man/help2man +chmod +x man/help2man +HELP2MAN=$(pwd)/man/help2man +export HELP2MAN +%configure --enable-largefile --enable-pam || : +make all CPPFLAGS="-DUSE_PAM" su_LDFLAGS="-lpam -lpam_misc" + +gcc -o readlink $RPM_OPT_FLAGS %SOURCE103 + +unset LINGUAS || : +for i in AUTOMAKE ACLOCAL;do perl -pi -e "s%^$i = .*$%$i = /bin/true%g" Makefile.in;done +%configure +[[ -f ChangeLog && -f ChangeLog.bz2 ]] || bzip2 -9f ChangeLog + +make + +# Run the test suite. +make check || : + +# XXX docs should say /var/run/[uw]tmp not /etc/[uw]tmp +perl -pi -e 's,/etc/utmp,/var/run/utmp,g;s,/etc/wtmp,/var/run/wtmp,g' doc/coreutils.texi + + +%install +rm -rf $RPM_BUILD_ROOT +%makeinstall + +# man pages are not installed with make install +make mandir=$RPM_BUILD_ROOT%{_mandir} install-man + +# fix japanese catalog file +if [ -d $RPM_BUILD_ROOT/%{_datadir}/locale/ja_JP.EUC/LC_MESSAGES ]; then + mkdir -p $RPM_BUILD_ROOT/%{_datadir}/locale/ja/LC_MESSAGES + mv $RPM_BUILD_ROOT/%{_datadir}/locale/ja_JP.EUC/LC_MESSAGES/*mo \ + $RPM_BUILD_ROOT/%{_datadir}/locale/ja/LC_MESSAGES + rm -rf $RPM_BUILD_ROOT/%{_datadir}/locale/ja_JP.EUC +fi + +# let be compatible with old fileutils, sh-utils and textutils packages : +mkdir -p $RPM_BUILD_ROOT{/bin,%_bindir,%_sbindir,%_sysconfdir/pam.d} +for f in basename cat chgrp chmod chown cp cut date dd df echo env false link ln ls mkdir mknod mv nice pwd rm rmdir sleep sort stty sync touch true uname unlink +do + mv $RPM_BUILD_ROOT/{%_bindir,bin}/$f +done + +# chroot was in /usr/sbin : +mv $RPM_BUILD_ROOT/{%_bindir,%_sbindir}/chroot +# {cat,sort,cut} were previously moved from bin to /usr/bin and linked into +for i in env cut; do ln -sf ../../bin/$i $RPM_BUILD_ROOT/usr/bin; done + +mkdir -p $RPM_BUILD_ROOT/etc/profile.d +install -c -m644 %SOURCE101 $RPM_BUILD_ROOT/etc/ +install -c -m644 %SOURCE102 $RPM_BUILD_ROOT/etc/ +install -c -m755 %SOURCE105 $RPM_BUILD_ROOT/etc/profile.d +install -c -m755 %SOURCE106 $RPM_BUILD_ROOT/etc/profile.d + +# readlink +# (Don't install this for now -tmw) +#install readlink $RPM_BUILD_ROOT/usr/bin +#install -m644 %SOURCE104 $RPM_BUILD_ROOT%_mandir/man1 + +# su +install -m 4755 src/su $RPM_BUILD_ROOT/bin + +# These come from util-linux and/or procps. +for i in hostname uptime ; do + rm -f $RPM_BUILD_ROOT{%_bindir/$i,%_mandir/man1/${i}.1} +done + +install -m 644 %SOURCE200 $RPM_BUILD_ROOT%_sysconfdir/pam.d/su + +ln -sf test $RPM_BUILD_ROOT%_bindir/[ + +bzip2 -f9 old/*/C* || : + +%find_lang %name + +# (sb) Deal with Installed (but unpackaged) file(s) found +rm -f $RPM_BUILD_ROOT%{_datadir}/info/dir + +%clean +rm -rf $RPM_BUILD_ROOT + +%pre +# We must desinstall theses info files since they're merged in +# coreutils.info. else their postun'll be runned too last +# and install-info'll faill badly because of doubles +for file in sh-utils.info textutils.info fileutils.info; do + if [ -f /usr/share/info/$file.bz2 ]; then + /sbin/install-info /usr/share/info/$file.bz2 --dir=/usr/share/info/dir --remove &> /dev/null + fi +done + +%preun +if [ $1 = 0 ]; then + [ -f %{_infodir}/%{name}.info.gz ] && \ + /sbin/install-info --delete %{_infodir}/%{name}.info.gz \ + %{_infodir}/dir || : +fi + +%post +/bin/grep -v '(sh-utils)\|(fileutils)\|(textutils)' %{_infodir}/dir > \ + %{_infodir}/dir.rpmmodify || exit 0 + /bin/mv -f %{_infodir}/dir.rpmmodify %{_infodir}/dir +[ -f %{_infodir}/%{name}.info.gz ] && \ + /sbin/install-info %{_infodir}/%{name}.info.gz %{_infodir}/dir || : + +%files -f %{name}.lang +%defattr(-,root,root) +%config(noreplace) %{_sysconfdir}/DIR_COLORS* +%config(noreplace) %{_sysconfdir}/profile.d/* +%config(noreplace) /etc/pam.d/su +%doc ABOUT-NLS ChangeLog.bz2 NEWS README THANKS TODO old/* +/bin/* +%_bindir/* +%_infodir/coreutils* +%_mandir/man*/* +%_sbindir/chroot + +%changelog +* Mon Dec 9 2002 Tim Waugh 4.5.3-7 +- Fix mv (bug #79283). +- Add patch27 (nogetline). + +* Sun Dec 1 2002 Tim Powers 4.5.3-6 +- use the su.pamd from sh-utils since it works properly with multilib systems + +* Fri Nov 29 2002 Tim Waugh 4.5.3-5 +- Fix test suite quoting problems. + +* Fri Nov 29 2002 Tim Waugh 4.5.3-4 +- Fix scriplets. +- Fix i18n patch so it doesn't break uniq. +- Fix several other patches to either make the test suite pass or + not run the relevant tests. +- Run 'make check'. +- Fix file list. + +* Thu Nov 28 2002 Tim Waugh 4.5.3-3 +- Adapted for Red Hat Linux. +- Self-host for help2man. +- Don't ship readlink just yet (maybe later). +- Merge patches from fileutils and sh-utils (textutils ones are already + merged it seems). +- Keep the binaries where the used to be (in particular, id and stat). + +* Sun Nov 17 2002 Stew Benedict 4.5.3-2mdk +- LI18NUX/LSB compliance (patch800) +- Installed (but unpackaged) file(s) - /usr/share/info/dir + +* Thu Oct 31 2002 Thierry Vignaud 4.5.3-1mdk +- new release +- rediff patch 180 +- merge patch 150 into 180 + +* Mon Oct 14 2002 Thierry Vignaud 4.5.2-6mdk +- move su back to /bin + +* Mon Oct 14 2002 Thierry Vignaud 4.5.2-5mdk +- patch 0 : lg locale is illegal and must be renamed lug (pablo) + +* Mon Oct 14 2002 Thierry Vignaud 4.5.2-4mdk +- fix conflict with procps + +* Mon Oct 14 2002 Thierry Vignaud 4.5.2-3mdk +- patch 105 : fix install -s + +* Mon Oct 14 2002 Thierry Vignaud 4.5.2-2mdk +- fix build +- don't chmode two times su +- build with large file support +- fix description +- various spec cleanups +- fix chroot installation +- fix missing /bin/env +- add old fileutils, sh-utils & textutils ChangeLogs + +* Fri Oct 11 2002 Thierry Vignaud 4.5.2-1mdk +- initial release (merge fileutils, sh-utils & textutils) +- obsoletes/provides: sh-utils/fileutils/textutils +- fileutils stuff go in 1xx range +- sh-utils stuff go in 7xx range +- textutils stuff go in 5xx range +- drop obsoletes patches 1, 2, 10 (somes files're gone but we didn't ship + most of them) +- rediff patches 103, 105, 111, 113, 180, 706 +- temporary disable patch 3 & 4 +- fix fileutils url diff --git a/sh-utils-1.16-paths.patch b/sh-utils-1.16-paths.patch new file mode 100644 index 0000000..4b63180 --- /dev/null +++ b/sh-utils-1.16-paths.patch @@ -0,0 +1,18 @@ +--- sh-utils-1.16/src/su.c.badpaths Mon Apr 14 14:26:55 1997 ++++ sh-utils-1.16/src/su.c Mon Apr 14 14:28:47 1997 +@@ -147,6 +147,15 @@ + #define DEFAULT_ROOT_LOGIN_PATH "/usr/ucb:/bin:/usr/bin:/etc" + #endif + ++/* The default paths which get set are both bogus and oddly influenced ++ by and -D on the commands line. Just to be clear, we'll set ++ these explicitly. -ewt */ ++#undef DEFAULT_LOGIN_PATH ++#undef DEFAULT_ROOT_LOGIN_PATH ++#define DEFAULT_LOGIN_PATH "/bin:/usr/bin:/usr/local/bin:/usr/bin/X11" ++#define DEFAULT_ROOT_LOGIN_PATH \ ++ "/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:/usr/bin/X11" ++ + /* The shell to run if none is given in the user's passwd entry. */ + #define DEFAULT_SHELL "/bin/sh" + diff --git a/sh-utils-2.0.11-dateman.patch b/sh-utils-2.0.11-dateman.patch new file mode 100644 index 0000000..97cdb04 --- /dev/null +++ b/sh-utils-2.0.11-dateman.patch @@ -0,0 +1,14 @@ +--- sh-utils-2.0.11/man/date.1.man Tue May 15 19:02:55 2001 ++++ sh-utils-2.0.11/man/date.1 Tue May 15 19:06:05 2001 +@@ -152,6 +152,11 @@ + .IP + `-' (hyphen) do not pad the field + `_' (underscore) pad the field with spaces ++.SH ENVIRONMENT ++.TP ++TZ ++Specifies the timezone, unless overridden by command line parameters. ++If neither is specified, the setting from /etc/localtime is used. + .SH AUTHOR + Written by David MacKenzie. + .SH "REPORTING BUGS" diff --git a/sources b/sources index e69de29..0649425 100644 --- a/sources +++ b/sources @@ -0,0 +1,3 @@ +27bd46af9dc858fdc23f72fd4f239ec8 coreutils-4.5.3.tar.bz2 +ee1b6fd0be7717e64fb27254bab9ac03 textutils-2.0-chinese-locales.tar.bz2 +a4d04ffc983e4c8f33471d119ecc69e9 textutils-2.0-po-update.tar.bz2