From svn at tinysofa.org Thu Jul 1 12:05:09 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Thu, 1 Jul 2004 22:05:09 +1000 (EST) Subject: [tinysofa-svn] r2457 - in tinysofa/releases/1.1/zlib/current: sources specs Message-ID: <20040701120509.CBC144E8032@minbar.tinysofa.org> Author: jh Date: 2004-07-01 22:05:09 +1000 (Thu, 01 Jul 2004) New Revision: 2457 Added: tinysofa/releases/1.1/zlib/current/sources/zlib-1.1.4-make-test.patch tinysofa/releases/1.1/zlib/current/sources/zlib-1.2.1.1.tar.gz Removed: tinysofa/releases/1.1/zlib/current/sources/zlib-1.1.3-glibc.patch tinysofa/releases/1.1/zlib/current/sources/zlib-1.2.1.tar.bz2 Modified: tinysofa/releases/1.1/zlib/current/specs/zlib.spec Log: - backport zlib from 2.0 test Deleted: tinysofa/releases/1.1/zlib/current/sources/zlib-1.1.3-glibc.patch =================================================================== --- tinysofa/releases/1.1/zlib/current/sources/zlib-1.1.3-glibc.patch 2004-07-01 11:49:06 UTC (rev 2456) +++ tinysofa/releases/1.1/zlib/current/sources/zlib-1.1.3-glibc.patch 2004-07-01 12:05:09 UTC (rev 2457) @@ -1,11 +0,0 @@ ---- zlib-1.1.3/Makefile.in.glibc Wed Sep 9 11:48:46 1998 -+++ zlib-1.1.3/Makefile.in Wed Sep 9 11:49:04 1998 -@@ -80,7 +80,7 @@ - rm -f _match.s - - $(SHAREDLIB).$(VER): $(OBJS) -- $(LDSHARED) -o $@ $(OBJS) -+ $(LDSHARED) -o $@ $(OBJS) -lc - rm -f $(SHAREDLIB) $(SHAREDLIB).1 - ln -s $@ $(SHAREDLIB) - ln -s $@ $(SHAREDLIB).1 Added: tinysofa/releases/1.1/zlib/current/sources/zlib-1.1.4-make-test.patch =================================================================== --- tinysofa/releases/1.1/zlib/current/sources/zlib-1.1.4-make-test.patch 2004-07-01 11:49:06 UTC (rev 2456) +++ tinysofa/releases/1.1/zlib/current/sources/zlib-1.1.4-make-test.patch 2004-07-01 12:05:09 UTC (rev 2457) @@ -0,0 +1,23 @@ +--- zlib-1.1.4/Makefile.in.jj Mon Mar 11 08:58:30 2002 ++++ zlib-1.1.4/Makefile.in Fri Apr 26 06:53:12 2002 +@@ -62,13 +62,16 @@ all: example minigzip + + test: all + @LD_LIBRARY_PATH=.:$(LD_LIBRARY_PATH) ; export LD_LIBRARY_PATH; \ +- echo hello world | ./minigzip | ./minigzip -d || \ +- echo ' *** minigzip test FAILED ***' ; \ ++ ret=0; \ ++ if ! echo hello world | ./minigzip | ./minigzip -d; then \ ++ echo ' *** minigzip test FAILED ***'; ret=1; \ ++ fi; \ + if ./example; then \ + echo ' *** zlib test OK ***'; \ + else \ +- echo ' *** zlib test FAILED ***'; \ +- fi ++ echo ' *** zlib test FAILED ***'; ret=1; \ ++ fi; \ ++ exit $$ret + + libz.a: $(OBJS) $(OBJA) + $(AR) $@ $(OBJS) $(OBJA) Added: tinysofa/releases/1.1/zlib/current/sources/zlib-1.2.1.1.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/releases/1.1/zlib/current/sources/zlib-1.2.1.1.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: tinysofa/releases/1.1/zlib/current/sources/zlib-1.2.1.tar.bz2 =================================================================== (Binary files differ) Modified: tinysofa/releases/1.1/zlib/current/specs/zlib.spec =================================================================== --- tinysofa/releases/1.1/zlib/current/specs/zlib.spec 2004-07-01 11:49:06 UTC (rev 2456) +++ tinysofa/releases/1.1/zlib/current/specs/zlib.spec 2004-07-01 12:05:09 UTC (rev 2457) @@ -1,104 +1,190 @@ Summary: The zlib compression and decompression library. Name: zlib -Version: 1.2.1 -Release: 5ts -Group: tinysofa official -Source: http://www.gzip.org/zlib/zlib-%{version}.tar.bz2 -Patch0: zlib-1.1.3-glibc.patch -Url: http://www.gzip.org/zlib/ +Version: 1.2.1.1 +Release: 1jh +Group: tinysofa/main +Source: ftp://ftp.info-zip.org/pub/infozip/zlib/zlib-%{version}.tar.gz +Patch0: zlib-1.1.4-make-test.patch +URL: http://www.gzip.org/zlib/ License: BSD -BuildRoot: %{_tmppath}/%{name}-root +Prefix: %{_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-root %description -The zlib compression library provides in-memory compression and -decompression functions, including integrity checks of the uncompressed -data. This version of the library supports only one compression method -(deflation), but other algorithms may be added later, which will have -the same stream interface. The zlib library is used by many different -system programs. +Zlib is a general-purpose, patent-free, lossless data compression +library which is used by many different programs. %package devel -Summary: Header files and libraries for developing apps which will use zlib. -Group: tinysofa official -Requires: zlib +Summary: Header files and libraries for Zlib development. +Group: Development/Libraries +Requires: zlib = %{version}-%{release} %description devel The zlib-devel package contains the header files and libraries needed to develop programs that use the zlib compression and decompression library. -Install the zlib-devel package if you want to develop applications that -will use the zlib library. %prep %setup -q +%patch0 -p1 -b .make-test %build -# We do it all in install +CFLAGS="$RPM_OPT_FLAGS -fPIC" ./configure --shared --prefix=%{_prefix} +# now build the static lib +CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%{_prefix} + + %install -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT/usr +mkdir -p ${RPM_BUILD_ROOT}%{_prefix} +mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man3 -./configure --shared --prefix=/usr -make CFLAGS="$RPM_OPT_FLAGS -fPIC -DUSE_MMAP" -make install prefix=$RPM_BUILD_ROOT/usr +CFLAGS="$RPM_OPT_FLAGS -fPIC" ./configure --shared --prefix=%{_prefix} +make install prefix=${RPM_BUILD_ROOT}%{_prefix} -./configure --prefix=/usr -make CFLAGS="$RPM_OPT_FLAGS -DUSE_MMAP" -make install prefix=$RPM_BUILD_ROOT/usr +CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%{_prefix} +make install prefix=${RPM_BUILD_ROOT}%{_prefix} -install -m644 zutil.h $RPM_BUILD_ROOT/usr/include/zutil.h -mkdir -p $RPM_BUILD_ROOT/usr/share/man/man3 -install -m644 zlib.3 $RPM_BUILD_ROOT/usr/share/man/man3 +install -m644 zutil.h ${RPM_BUILD_ROOT}%{_includedir}/zutil.h +if [ "%{_prefix}/lib" != "%{_libdir}" ]; then + mkdir -p ${RPM_BUILD_ROOT}%{_libdir} + mv ${RPM_BUILD_ROOT}%{_prefix}/lib/* ${RPM_BUILD_ROOT}%{_libdir} + rmdir ${RPM_BUILD_ROOT}%{_prefix}/lib +fi + +%check +%make test + + %clean -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT +%clean_buildroot + %post -p /sbin/ldconfig %postun -p /sbin/ldconfig + %files %defattr(-,root,root) -/usr/lib/libz.so.* +%doc README +%{_libdir}/libz.so.* %files devel %defattr(-,root,root) -%doc README ChangeLog algorithm.txt -/usr/lib/*.so -/usr/include/* -%attr(644,root,root) /usr/lib/*.a -/usr/share/man/man3/zlib.3* +%doc ChangeLog algorithm.txt minigzip.c example.c +%{_libdir}/*.a +%{_libdir}/*.so +%{_includedir}/* +%{_mandir}/man3/zlib.3* + %changelog -* Wed May 19 2004 tsintegrate 1.2.1-5ts -- current (1.2.1-5jh) integrated as 1.2.1-5ts for release 1.0-U1 +* Tue Jun 15 2004 Elliot Lee +- rebuilt -* Mon May 10 2004 Jaakko Heinonen 1.2.1-5jh -- fixed permissions for libz.a +* Tue Mar 02 2004 Elliot Lee +- rebuilt -* Wed Nov 26 2003 Erlend Midttun 1.2.1-1tr -- New upstream(!). +* Fri Feb 13 2004 Elliot Lee +- rebuilt -* Wed Jun 18 2003 Erlend Midttun 1.1.4-5tr -- Big rebuild +* Sun Jan 18 2004 Jeff Johnson 1.2.1.1-1 +- upgrade to zlib-1.2.1.1. -* Mon Mar 24 2003 Erlend Midttun 1.1.4-4em -- Rebuilt with glibc-2.3.2. +* Sun Nov 30 2003 Florian La Roche +- update to 1.2.1 release -* Thu Feb 27 2003 Christian H. Toldnes 1.1.4-3ct -- Added better %clean and %install section +* Mon Oct 13 2003 Jeff Johnson 1.2.0.7-3 +- unrevert zlib.h include constants (#106291), rejected upstream. -* Tue Jul 11 2002 Nico Erfurth -- Added LFS-Support +* Wed Oct 8 2003 Jeff Johnson 1.2.0.7-2 +- fix: gzeof not set when reading compressed file (#106424). +- fix: revert zlib.h include constants for now (#106291). -* Thu Mar 14 2002 Erlend Midttun -- Upgraded to 1.1.4 to fix double free security issue. +* Tue Sep 23 2003 Jeff Johnson 1.2.0.7-1 +- update to 1.2.0.7, penultimate 1.2.1 release candidate. -* Tue Jan 25 2000 Tore Olsen -- moved /usr/man to /usr/share/man for FHS compliance +* Tue Jul 22 2003 Jeff Johnson 1.2.0.3-0.1 +- update to release candidate. +* Wed Jun 04 2003 Elliot Lee +- rebuilt + +* Mon May 19 2003 Jeff Johnson 1.1.4-9 +- rebuild, revert from 1.2.0.1. + +* Mon Feb 24 2003 Jeff Johnson 1.1.4-8 +- fix gzprintf buffer overrun (#84961). + +* Wed Jan 22 2003 Tim Powers 1.1.4-7 +- rebuilt + +* Thu Nov 21 2002 Elliot Lee 1.1.4-6 +- Make ./configure use $CC to ease cross-compilation + +* Tue Nov 12 2002 Jeff Johnson 1.1.4-5 +- rebuild from cvs. + +* Fri Jun 21 2002 Tim Powers +- automated rebuild + +* Thu May 23 2002 Tim Powers +- automated rebuild + +* Fri Apr 26 2002 Jakub Jelinek 1.1.4-2 +- remove glibc patch, it is no longer needed (zlib uses gcc -shared + as it should) +- run tests and only build the package if they succeed + +* Thu Apr 25 2002 Trond Eivind Glomsr?d 1.1.4-1 +- 1.1.4 + +* Wed Jan 30 2002 Trond Eivind Glomsr?d 1.1.3-25.7 +- Fix double free + +* Sun Aug 26 2001 Trond Eivind Glomsr?d 1.1.3-24 +- Add example.c and minigzip.c to the doc files, as + they are listed as examples in the README (#52574) + +* Mon Jun 18 2001 Trond Eivind Glomsr?d +- Updated URL +- Add version dependency for zlib-devel +- s/Copyright/License/ + +* Wed Feb 14 2001 Trond Eivind Glomsr?d +- bumped version number - this is the old version without the performance enhancements + +* Fri Sep 15 2000 Florian La Roche +- add -fPIC for shared libs (patch by Fritz Elfert) + +* Thu Sep 7 2000 Jeff Johnson +- on 64bit systems, make sure libraries are located correctly. + +* Thu Aug 17 2000 Jeff Johnson +- summaries from specspo. + +* Thu Jul 13 2000 Prospector +- automatic rebuild + +* Sun Jul 02 2000 Trond Eivind Glomsr?d +- rebuild + +* Tue Jun 13 2000 Jeff Johnson +- FHS packaging to build on solaris2.5.1. + +* Wed Jun 07 2000 Trond Eivind Glomsr?d +- use %%{_mandir} and %%{_tmppath} + +* Fri May 12 2000 Trond Eivind Glomsr?d +- updated URL and source location +- moved README to main package + +* Mon Feb 7 2000 Jeff Johnson +- compress man page. + * Sun Mar 21 1999 Cristian Gafton - auto rebuild in the new build environment (release 5) @@ -120,4 +206,4 @@ - made zlib-devel require zlib * Thu Jun 19 1997 Erik Troan -- built against glibc \ No newline at end of file +- built against glibc From svn at tinysofa.org Thu Jul 1 14:50:00 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 00:50:00 +1000 (EST) Subject: [tinysofa-svn] r2459 - tinysofa/tags Message-ID: <20040701145000.1DDB94E836E@minbar.tinysofa.org> Author: omar Date: 2004-07-02 00:50:00 +1000 (Fri, 02 Jul 2004) New Revision: 2459 Added: tinysofa/tags/pre_2_import/ Log: - Tag. Copied: tinysofa/tags/pre_2_import (from rev 2458, tinysofa/snapshot) From svn at tinysofa.org Thu Jul 1 15:03:25 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:03:25 +1000 (EST) Subject: [tinysofa-svn] r2460 - tinysofa/releases/1.1/bash/current/sources Message-ID: <20040701150325.BEC844E836E@minbar.tinysofa.org> Author: jh Date: 2004-07-02 01:03:25 +1000 (Fri, 02 Jul 2004) New Revision: 2460 Added: tinysofa/releases/1.1/bash/current/sources/bashrc Log: - add bashrc source file Added: tinysofa/releases/1.1/bash/current/sources/bashrc =================================================================== --- tinysofa/releases/1.1/bash/current/sources/bashrc 2004-07-01 14:50:00 UTC (rev 2459) +++ tinysofa/releases/1.1/bash/current/sources/bashrc 2004-07-01 15:03:25 UTC (rev 2460) @@ -0,0 +1,48 @@ +# /etc/bashrc + +# System wide functions and aliases +# Environment stuff goes in /etc/profile + +mkcd () { + mkdir "$1" && cd "$1" +} + +psgrep () { + ps aux | grep "$1" | grep -v "grep $1" +} + +# are we an interactive shell? +if [ "$PS1" ]; then + case $TERM in + xterm*) + if [ -e /etc/sysconfig/bash-prompt-xterm ]; then + PROMPT_COMMAND=/etc/sysconfig/bash-prompt-xterm + else + PROMPT_COMMAND='echo -ne "\033]0;${USER}@${HOSTNAME%%.*}:${PWD/#$HOME/~}\007"' + fi + ;; + screen) + if [ -e /etc/sysconfig/bash-prompt-screen ]; then + PROMPT_COMMAND=/etc/sysconfig/bash-prompt-screen + else + PROMPT_COMMAND='echo -ne "\033_${USER}@${HOSTNAME%%.*}:${PWD/#$HOME/~}\033\\"' + fi + ;; + *) + [ -e /etc/sysconfig/bash-prompt-default ] && PROMPT_COMMAND=/etc/sysconfig/bash-prompt-default + ;; + esac + # Turn on checkwinsize + shopt -s checkwinsize + [ "$PS1" = "\\s-\\v\\\$ " ] && PS1="[\u@\h \W]\\$ " + + if [ "x$SHLVL" != "x1" ]; then # We're not a login shell + for i in /etc/profile.d/*.sh; do + if [ -r "$i" ]; then + . $i + fi + done + unset i + fi +fi +# vim:ts=4:sw=4 From svn at tinysofa.org Thu Jul 1 15:29:38 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:29:38 +1000 (EST) Subject: [tinysofa-svn] r2461 - tinysofa/snapshot Message-ID: <20040701152938.4702D4E836E@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:29:38 +1000 (Fri, 02 Jul 2004) New Revision: 2461 Removed: tinysofa/snapshot/anonftp/ Log: - Not in 2.0. From svn at tinysofa.org Thu Jul 1 15:29:38 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:29:38 +1000 (EST) Subject: [tinysofa-svn] r2462 - tinysofa/snapshot Message-ID: <20040701152938.C502D4E836F@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:29:38 +1000 (Fri, 02 Jul 2004) New Revision: 2462 Removed: tinysofa/snapshot/apache/ Log: - Not in 2.0. From svn at tinysofa.org Thu Jul 1 15:29:39 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:29:39 +1000 (EST) Subject: [tinysofa-svn] r2464 - tinysofa/snapshot Message-ID: <20040701152939.F0FE24E836F@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:29:39 +1000 (Fri, 02 Jul 2004) New Revision: 2464 Removed: tinysofa/snapshot/courier-imap/ Log: - Not in 2.0. From svn at tinysofa.org Thu Jul 1 15:29:39 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:29:39 +1000 (EST) Subject: [tinysofa-svn] r2463 - tinysofa/snapshot Message-ID: <20040701152939.559D34E836E@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:29:39 +1000 (Fri, 02 Jul 2004) New Revision: 2463 Removed: tinysofa/snapshot/arpwatch/ Log: - Not in 2.0. From svn at tinysofa.org Thu Jul 1 15:29:40 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:29:40 +1000 (EST) Subject: [tinysofa-svn] r2465 - tinysofa/snapshot Message-ID: <20040701152940.7B6384E836E@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:29:40 +1000 (Fri, 02 Jul 2004) New Revision: 2465 Removed: tinysofa/snapshot/db1/ Log: - Not in 2.0. From svn at tinysofa.org Thu Jul 1 15:29:41 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:29:41 +1000 (EST) Subject: [tinysofa-svn] r2466 - tinysofa/snapshot Message-ID: <20040701152941.0DF444E836F@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:29:40 +1000 (Fri, 02 Jul 2004) New Revision: 2466 Removed: tinysofa/snapshot/dev/ Log: - Not in 2.0. From svn at tinysofa.org Thu Jul 1 15:29:41 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:29:41 +1000 (EST) Subject: [tinysofa-svn] r2467 - tinysofa/snapshot Message-ID: <20040701152941.C7B9D4E836E@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:29:41 +1000 (Fri, 02 Jul 2004) New Revision: 2467 Removed: tinysofa/snapshot/dkms/ Log: - Not in 2.0. From svn at tinysofa.org Thu Jul 1 15:29:42 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:29:42 +1000 (EST) Subject: [tinysofa-svn] r2468 - tinysofa/snapshot Message-ID: <20040701152942.56AF64E8370@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:29:42 +1000 (Fri, 02 Jul 2004) New Revision: 2468 Removed: tinysofa/snapshot/dmapi/ Log: - Not in 2.0. From svn at tinysofa.org Thu Jul 1 15:29:42 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:29:42 +1000 (EST) Subject: [tinysofa-svn] r2469 - tinysofa/snapshot Message-ID: <20040701152942.DFDFB4E836E@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:29:42 +1000 (Fri, 02 Jul 2004) New Revision: 2469 Removed: tinysofa/snapshot/etcskel/ Log: - Not in 2.0. From svn at tinysofa.org Thu Jul 1 15:29:45 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:29:45 +1000 (EST) Subject: [tinysofa-svn] r2474 - tinysofa/snapshot Message-ID: <20040701152945.C8CB44E8374@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:29:45 +1000 (Fri, 02 Jul 2004) New Revision: 2474 Removed: tinysofa/snapshot/help2man/ Log: - Not in 2.0. From svn at tinysofa.org Thu Jul 1 15:29:46 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:29:46 +1000 (EST) Subject: [tinysofa-svn] r2475 - tinysofa/snapshot Message-ID: <20040701152946.6A33E4E8375@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:29:46 +1000 (Fri, 02 Jul 2004) New Revision: 2475 Removed: tinysofa/snapshot/htmlinfo/ Log: - Not in 2.0. From svn at tinysofa.org Thu Jul 1 15:29:44 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:29:44 +1000 (EST) Subject: [tinysofa-svn] r2471 - tinysofa/snapshot Message-ID: <20040701152944.13BEE4E8371@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:29:43 +1000 (Fri, 02 Jul 2004) New Revision: 2471 Removed: tinysofa/snapshot/foomatic-filters/ Log: - Not in 2.0. From svn at tinysofa.org Thu Jul 1 15:29:55 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:29:55 +1000 (EST) Subject: [tinysofa-svn] r2490 - tinysofa/snapshot Message-ID: <20040701152955.3FD1A4E8382@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:29:54 +1000 (Fri, 02 Jul 2004) New Revision: 2490 Removed: tinysofa/snapshot/reiserfsprogs/ Log: - Not in 2.0. From svn at tinysofa.org Thu Jul 1 15:29:47 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:29:47 +1000 (EST) Subject: [tinysofa-svn] r2476 - tinysofa/snapshot Message-ID: <20040701152947.053984E8376@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:29:46 +1000 (Fri, 02 Jul 2004) New Revision: 2476 Removed: tinysofa/snapshot/imapd-pam/ Log: - Not in 2.0. From svn at tinysofa.org Thu Jul 1 15:30:03 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:30:03 +1000 (EST) Subject: [tinysofa-svn] r2503 - tinysofa/snapshot Message-ID: <20040701153003.0D4564E8377@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:30:02 +1000 (Fri, 02 Jul 2004) New Revision: 2503 Removed: tinysofa/snapshot/ypbind-mt/ Log: - Not in 2.0. From svn at tinysofa.org Thu Jul 1 15:29:45 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:29:45 +1000 (EST) Subject: [tinysofa-svn] r2473 - tinysofa/snapshot Message-ID: <20040701152945.444E84E8373@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:29:45 +1000 (Fri, 02 Jul 2004) New Revision: 2473 Removed: tinysofa/snapshot/glib/ Log: - Not in 2.0. From svn at tinysofa.org Thu Jul 1 15:29:43 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:29:43 +1000 (EST) Subject: [tinysofa-svn] r2470 - tinysofa/snapshot Message-ID: <20040701152943.73E794E836F@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:29:43 +1000 (Fri, 02 Jul 2004) New Revision: 2470 Removed: tinysofa/snapshot/fcron/ Log: - Not in 2.0. From svn at tinysofa.org Thu Jul 1 15:29:59 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:29:59 +1000 (EST) Subject: [tinysofa-svn] r2497 - tinysofa/snapshot Message-ID: <20040701152959.B4F5A4E8372@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:29:59 +1000 (Fri, 02 Jul 2004) New Revision: 2497 Removed: tinysofa/snapshot/sysvinit/ Log: - Not in 2.0. From svn at tinysofa.org Thu Jul 1 15:29:48 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:29:48 +1000 (EST) Subject: [tinysofa-svn] r2478 - tinysofa/snapshot Message-ID: <20040701152948.A3FC84E836E@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:29:48 +1000 (Fri, 02 Jul 2004) New Revision: 2478 Removed: tinysofa/snapshot/kerberosafs/ Log: - Not in 2.0. From svn at tinysofa.org Thu Jul 1 15:29:58 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:29:58 +1000 (EST) Subject: [tinysofa-svn] r2494 - tinysofa/snapshot Message-ID: <20040701152958.19CB34E8371@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:29:57 +1000 (Fri, 02 Jul 2004) New Revision: 2494 Removed: tinysofa/snapshot/swup/ Log: - Not in 2.0. From svn at tinysofa.org Thu Jul 1 15:29:50 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:29:50 +1000 (EST) Subject: [tinysofa-svn] r2481 - tinysofa/snapshot Message-ID: <20040701152950.67D4D4E8379@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:29:50 +1000 (Fri, 02 Jul 2004) New Revision: 2481 Removed: tinysofa/snapshot/lilo/ Log: - Not in 2.0. From svn at tinysofa.org Thu Jul 1 15:30:01 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:30:01 +1000 (EST) Subject: [tinysofa-svn] r2500 - tinysofa/snapshot Message-ID: <20040701153001.5B66C4E8375@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:30:01 +1000 (Fri, 02 Jul 2004) New Revision: 2500 Removed: tinysofa/snapshot/tinysofa-utils/ Log: - Not in 2.0. From svn at tinysofa.org Thu Jul 1 15:29:44 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:29:44 +1000 (EST) Subject: [tinysofa-svn] r2472 - tinysofa/snapshot Message-ID: <20040701152944.AEC5D4E8372@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:29:44 +1000 (Fri, 02 Jul 2004) New Revision: 2472 Removed: tinysofa/snapshot/freeswan/ Log: - Not in 2.0. From svn at tinysofa.org Thu Jul 1 15:29:53 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:29:53 +1000 (EST) Subject: [tinysofa-svn] r2486 - tinysofa/snapshot Message-ID: <20040701152953.2939B4E837E@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:29:52 +1000 (Fri, 02 Jul 2004) New Revision: 2486 Removed: tinysofa/snapshot/pam_ldap/ Log: - Not in 2.0. From svn at tinysofa.org Thu Jul 1 15:29:51 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:29:51 +1000 (EST) Subject: [tinysofa-svn] r2483 - tinysofa/snapshot Message-ID: <20040701152951.9F7474E837B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:29:51 +1000 (Fri, 02 Jul 2004) New Revision: 2483 Removed: tinysofa/snapshot/mod_php4/ Log: - Not in 2.0. From svn at tinysofa.org Thu Jul 1 15:29:59 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:29:59 +1000 (EST) Subject: [tinysofa-svn] r2496 - tinysofa/snapshot Message-ID: <20040701152959.2C75D4E8386@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:29:58 +1000 (Fri, 02 Jul 2004) New Revision: 2496 Removed: tinysofa/snapshot/sysstat/ Log: - Not in 2.0. From svn at tinysofa.org Thu Jul 1 15:29:47 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:29:47 +1000 (EST) Subject: [tinysofa-svn] r2477 - tinysofa/snapshot Message-ID: <20040701152947.A1F994E8370@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:29:47 +1000 (Fri, 02 Jul 2004) New Revision: 2477 Removed: tinysofa/snapshot/kerberos5/ Log: - Not in 2.0. From svn at tinysofa.org Thu Jul 1 15:29:53 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:29:53 +1000 (EST) Subject: [tinysofa-svn] r2487 - tinysofa/snapshot Message-ID: <20040701152953.A05744E837F@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:29:53 +1000 (Fri, 02 Jul 2004) New Revision: 2487 Removed: tinysofa/snapshot/pptpd/ Log: - Not in 2.0. From svn at tinysofa.org Thu Jul 1 15:29:54 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:29:54 +1000 (EST) Subject: [tinysofa-svn] r2488 - tinysofa/snapshot Message-ID: <20040701152954.1B8D64E8380@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:29:53 +1000 (Fri, 02 Jul 2004) New Revision: 2488 Removed: tinysofa/snapshot/pwdb/ Log: - Not in 2.0. From svn at tinysofa.org Thu Jul 1 15:29:58 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:29:58 +1000 (EST) Subject: [tinysofa-svn] r2495 - tinysofa/snapshot Message-ID: <20040701152958.9DD8B4E8385@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:29:58 +1000 (Fri, 02 Jul 2004) New Revision: 2495 Removed: tinysofa/snapshot/swupconf/ Log: - Not in 2.0. From svn at tinysofa.org Thu Jul 1 15:29:52 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:29:52 +1000 (EST) Subject: [tinysofa-svn] r2485 - tinysofa/snapshot Message-ID: <20040701152952.A0AA54E837D@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:29:52 +1000 (Fri, 02 Jul 2004) New Revision: 2485 Removed: tinysofa/snapshot/ostat/ Log: - Not in 2.0. From svn at tinysofa.org Thu Jul 1 15:29:54 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:29:54 +1000 (EST) Subject: [tinysofa-svn] r2489 - tinysofa/snapshot Message-ID: <20040701152954.97D024E8381@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:29:54 +1000 (Fri, 02 Jul 2004) New Revision: 2489 Removed: tinysofa/snapshot/rdate/ Log: - Not in 2.0. From svn at tinysofa.org Thu Jul 1 15:29:52 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:29:52 +1000 (EST) Subject: [tinysofa-svn] r2484 - tinysofa/snapshot Message-ID: <20040701152952.2F6E74E837C@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:29:51 +1000 (Fri, 02 Jul 2004) New Revision: 2484 Removed: tinysofa/snapshot/modutils/ Log: - Not in 2.0. From svn at tinysofa.org Thu Jul 1 15:29:57 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:29:57 +1000 (EST) Subject: [tinysofa-svn] r2493 - tinysofa/snapshot Message-ID: <20040701152957.8C4AC4E8384@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:29:57 +1000 (Fri, 02 Jul 2004) New Revision: 2493 Removed: tinysofa/snapshot/sash/ Log: - Not in 2.0. From svn at tinysofa.org Thu Jul 1 15:29:57 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:29:57 +1000 (EST) Subject: [tinysofa-svn] r2492 - tinysofa/snapshot Message-ID: <20040701152957.08CC04E8383@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:29:56 +1000 (Fri, 02 Jul 2004) New Revision: 2492 Removed: tinysofa/snapshot/repsys/ Log: - Not in 2.0. From svn at tinysofa.org Thu Jul 1 15:30:00 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:30:00 +1000 (EST) Subject: [tinysofa-svn] r2499 - tinysofa/snapshot Message-ID: <20040701153000.C8D064E8374@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:30:00 +1000 (Fri, 02 Jul 2004) New Revision: 2499 Removed: tinysofa/snapshot/tinysofa-gpgkeys-emily/ Log: - Not in 2.0. From svn at tinysofa.org Thu Jul 1 15:29:49 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:29:49 +1000 (EST) Subject: [tinysofa-svn] r2479 - tinysofa/snapshot Message-ID: <20040701152949.558094E8377@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:29:49 +1000 (Fri, 02 Jul 2004) New Revision: 2479 Removed: tinysofa/snapshot/libpcap/ Log: - Not in 2.0. From svn at tinysofa.org Thu Jul 1 15:30:01 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:30:01 +1000 (EST) Subject: [tinysofa-svn] r2501 - tinysofa/snapshot Message-ID: <20040701153001.E37474E836E@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:30:01 +1000 (Fri, 02 Jul 2004) New Revision: 2501 Removed: tinysofa/snapshot/uw-imap/ Log: - Not in 2.0. From svn at tinysofa.org Thu Jul 1 15:29:49 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:29:49 +1000 (EST) Subject: [tinysofa-svn] r2480 - tinysofa/snapshot Message-ID: <20040701152949.DE1484E8378@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:29:49 +1000 (Fri, 02 Jul 2004) New Revision: 2480 Removed: tinysofa/snapshot/libsmbpw/ Log: - Not in 2.0. From svn at tinysofa.org Thu Jul 1 15:30:02 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:30:02 +1000 (EST) Subject: [tinysofa-svn] r2502 - tinysofa/snapshot Message-ID: <20040701153002.7C61D4E8376@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:30:02 +1000 (Fri, 02 Jul 2004) New Revision: 2502 Removed: tinysofa/snapshot/xfsdump/ Log: - Not in 2.0. From svn at tinysofa.org Thu Jul 1 15:30:00 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:30:00 +1000 (EST) Subject: [tinysofa-svn] r2498 - tinysofa/snapshot Message-ID: <20040701153000.3DCC94E8373@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:30:00 +1000 (Fri, 02 Jul 2004) New Revision: 2498 Removed: tinysofa/snapshot/tftp/ Log: - Not in 2.0. From svn at tinysofa.org Thu Jul 1 15:29:51 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:29:51 +1000 (EST) Subject: [tinysofa-svn] r2482 - tinysofa/snapshot Message-ID: <20040701152951.145654E837A@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:29:50 +1000 (Fri, 02 Jul 2004) New Revision: 2482 Removed: tinysofa/snapshot/linux-headers/ Log: - Not in 2.0. From svn at tinysofa.org Thu Jul 1 15:29:55 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:29:55 +1000 (EST) Subject: [tinysofa-svn] r2491 - tinysofa/snapshot Message-ID: <20040701152955.CD0EF4E836F@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:29:55 +1000 (Fri, 02 Jul 2004) New Revision: 2491 Removed: tinysofa/snapshot/release/ Log: - Not in 2.0. From svn at tinysofa.org Thu Jul 1 15:34:54 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:34:54 +1000 (EST) Subject: [tinysofa-svn] r2505 - in tinysofa/snapshot: . MAKEDEV MAKEDEV/current MAKEDEV/current/sources MAKEDEV/current/specs Message-ID: <20040701153454.B11614E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:34:54 +1000 (Fri, 02 Jul 2004) New Revision: 2505 Added: tinysofa/snapshot/MAKEDEV/ tinysofa/snapshot/MAKEDEV/current/ tinysofa/snapshot/MAKEDEV/current/sources/ tinysofa/snapshot/MAKEDEV/current/sources/MAKEDEV-3.8.1-1.tar.gz tinysofa/snapshot/MAKEDEV/current/specs/ tinysofa/snapshot/MAKEDEV/current/specs/MAKEDEV.spec Log: - Add MAKEDEV to snapshot from 2.0. Added: tinysofa/snapshot/MAKEDEV/current/sources/MAKEDEV-3.8.1-1.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/MAKEDEV/current/sources/MAKEDEV-3.8.1-1.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/MAKEDEV/current/specs/MAKEDEV.spec =================================================================== --- tinysofa/snapshot/MAKEDEV/current/specs/MAKEDEV.spec 2004-07-01 15:34:52 UTC (rev 2504) +++ tinysofa/snapshot/MAKEDEV/current/specs/MAKEDEV.spec 2004-07-01 15:34:54 UTC (rev 2505) @@ -0,0 +1,712 @@ +Name: MAKEDEV +Version: 3.8.1 +Release: 1ts +Group: System Environment/Base +License: GPL +Source: MAKEDEV-%{version}-1.tar.gz +Summary: A program used for creating device files in /dev. +BuildRoot: %{_tmppath}/%{name}-%{version}-root +BuildConflicts: rpm < 4.0.3-0.71, rpm-build < 4.0.3-0.71 +URL: http://www.lanana.org/docs/device-list/ + +%description +This package contains the MAKEDEV program, which makes it easier to create +and maintain the files in the /dev directory. /dev directory files +correspond to a particular device supported by Linux (serial or printer +ports, scanners, sound cards, tape drives, CD-ROM drives, hard drives, +etc.) and interface with the drivers in the kernel. + +You should install the MAKEDEV package because the MAKEDEV utility makes +it easy to manage the /dev directory device files. + +%package -n dev +Group: System Environment/Base +Summary: The most commonly-used entries in the /dev directory. +Prereq: /usr/sbin/groupadd, /usr/sbin/useradd +Prereq: /bin/mkdir, sed, textutils, fileutils, mktemp + +%description -n dev +The Red Hat Linux operating system uses file system entries to represent +devices (CD-ROMs, floppy drives, etc.) attached to the machine. All of +these entries are in the /dev tree (although they don't have to be). +This package contains the most commonly used /dev entries. + +The dev package is a basic part of your Red Hat Linux system and it needs +to be installed. + +%prep +%setup -q + +%build +%ifarch s390 s390x +export S390=1 +%endif +make OPTFLAGS="$RPM_OPT_FLAGS" + +%install +%ifarch s390 s390x +export S390=1 +%endif +makedev() { + # Note that we need RPM 4.0.3-0.71 or higher for this to be of any use, + # but otherwise we could screw up ownerships if the destination account + # doesn't exist when we run MAKEDEV. + $RPM_BUILD_ROOT/dev/MAKEDEV \ + -c $RPM_BUILD_ROOT%{_sysconfdir}/makedev.d \ + -d $RPM_BUILD_ROOT/dev -M $@ | sed "s|$RPM_BUILD_ROOT||g" >> manifest +} +rm -fr $RPM_BUILD_ROOT +rm -f manifest + +%ifnarch s390 s390x +%makeinstall devdir=$RPM_BUILD_ROOT/dev +makedev agpgart +makedev aio +makedev apm_bios +makedev beep +makedev capi20 +makedev cdrom +makedev cfs +makedev compaq +makedev -m 32 console +makedev cpu +makedev -m 4 cua +makedev -m 16 cui +makedev dri +makedev enskip +makedev fb +makedev fd0 +makedev fd1 +makedev ftape +makedev -m 2 ht +makedev -m 2 i2c +makedev i2o +makedev ibcs +makedev -m 33 ide +makedev initrd +makedev -m 32 input +makedev -m 16 ip +makedev -m 16 ipfilter +makedev ir +makedev -m 2 iscc +makedev -m 16 isdn +makedev -m 4 js +makedev kmsg +makedev kpoll +makedev -m 32 loop +makedev -m 1 log +makedev -m 8 lp +makedev md +makedev mouse +makedev -m 32 nb +makedev net/tun +makedev netlink +makedev -m 2 nht +makedev -m 4 nosst +makedev -m 16 nst +makedev -m 4 osst +makedev -m 8 par +makedev -m 4 pcd +makedev pd +makedev -m 4 pf +makedev -m 4 pg +makedev -m 4 ppp +makedev pt +makedev ptmx +makedev pty +makedev qng +makedev -m 20 ram +makedev random +makedev raid +makedev raw +makedev rmt +makedev rtc +makedev -m 8 scd +makedev -m 16 scramdisk +makedev sd +makedev -m 32 sg +makedev smpt +makedev sound +makedev -m 16 st +makedev sx8 +makedev systty +makedev -m 4 staliomem +makedev std +makedev tlk +makedev -m 32 tty +makedev urandom +makedev -m 32 usb +makedev -m 4 v4l +makedev vcs +makedev video1394 +makedev vmmon +makedev -m 4 vnet +makedev vsys +makedev -m 4 winradio +makedev xda +makedev xdb +%endif + +# Create architecture-specific devices. +%ifarch s390 s390x +export S390=1 +%makeinstall devdir=$RPM_BUILD_ROOT/dev +makedev btibm +makedev console +makedev dasd +makedev initrd +makedev -m 16 ipfilter +makedev -m 1 log +makedev -m 32 loop +makedev md +makedev mnd +makedev -m 32 nb +makedev ntibm +makedev ptmx +makedev pty +makedev -m 20 ram +makedev random +makedev raw +makedev rtibm +makedev sd +makedev std +makedev systty +makedev -m 32 tty +makedev urandom +makedev xpram +rm -f $RPM_BUILD_ROOT/dev/fd[0-7]* +rm -f $RPM_BUILD_ROOT/dev/vcs* +if [ -f manifest ] ; then + grep -v '/dev/fd[0-7]' manifest > manifest.tmp && mv manifest.tmp manifest + grep -v '/dev/vcs' manifest > manifest.tmp && mv manifest.tmp manifest +fi +%endif + +%ifarch ia64 +makedev efirtc +%endif + +%ifarch sparc sparc64 +makedev audioctl +makedev kbd +makedev openprom +ln -s sunmouse $RPM_BUILD_ROOT/dev/mouse +for dev in aztcd cdu31a cdu535 cm205cd cm206cd gscd hitcd mcd mcdx \ + sbpcd1 sbpcd2 scd3 sjcd sbpcd3 sonycd sbpcd sbpcd0 \ + atibm inportbm logibm ; do + rm -f $RPM_BUILD_ROOT/dev/${dev} + grep -v "/dev/${dev}" manifest > manifest.tmp && mv manifest.tmp manifest +done +%endif + +%ifarch ppc ppc64 +makedev iseries +makedev nvram +makedev hvc0 +makedev -m 2 hvsi +makedev adb +makedev pmu +%endif + +%ifarch x86_64 +makedev mce_log +%endif + +# Skip /dev/log for the sake of upgrades to really old dev packages. +grep -v '/dev/log$' manifest | sort -u > mdmanifest + +# Make subdirectories we otherwise would have nothing to do with. +install -d -m 755 $RPM_BUILD_ROOT/dev/pts +install -d -m 755 $RPM_BUILD_ROOT/dev/shm + +%clean +rm -fr $RPM_BUILD_ROOT + +%pre +if [ -r /proc/mounts ]; then + while read source mountpoint rest ; do + if [ "$mountpoint" = "/dev" ]; then + echo $"Cannot install the MAKEDEV package: mounted devfs detected." + exit 1 + fi + done < /proc/mounts +fi +exit 0 + +%pre -n dev +if [ -r /proc/mounts ]; then + while read source mountpoint rest ; do + if [ "$mountpoint" = "/dev" ]; then + echo $"Cannot install the dev package: mounted devfs detected." + exit 1 + fi + done < /proc/mounts +fi +[ -d /dev ] || /bin/mkdir /dev +/usr/sbin/groupadd -g 19 -r -f floppy > /dev/null 2>/dev/null +/usr/sbin/useradd -c "virtual console memory owner" -u 69 \ + -s /sbin/nologin -r -d /dev vcsa 2> /dev/null +exit 0 + +%post -n dev +%ifnarch s390 s390x +if [ -f /etc/fstab ] ; then + # add /dev/pts to fstab if fstab exists (install2 does it during install) + if grep 'devpts' /etc/fstab >/dev/null 2>&1 ; then + # correct permissions from broken dev packages + TMP=$(mktemp /tmp/fstab.XXXXXX) + sed 's/devpts.*mode=0622/devpts gid=5,mode=620/g' < /etc/fstab > $TMP && cat $TMP > /etc/fstab || { echo "failed to correct devpts permissions in /etc/fstab" 1>&2 ; exit 1 ; } + rm -f $TMP + else + # note that we do not disallow comments; we wish to allow people + # to comment it out if they so desire. + if [ $(grep '/proc' /dev/fstab 2>/dev/null | wc -l) -gt 1 ] ; then + # ugly but robust + echo ' +none /dev/pts devpts gid=5,mode=620 0 0' \ + >> /etc/fstab || { echo "failed to add devpts filesystem to /etc/fstab" 1>&2 ; exit 1 ; } + else + # beautiful in the common case + TMP=$(mktemp /tmp/fstab.XXXXXX) + sed '/\/proc/a\ +none /dev/pts devpts gid=5,mode=620 0 0 + ' < /etc/fstab > $TMP && cat $TMP > /etc/fstab || { echo "failed to add devpts filesystem to /etc/fstab" 1>&2 ; exit 1 ; } + rm -f $TMP + fi + fi + # add /dev/shm to fstab if fstab exists (install2 does it during install) + if ! grep 'tmpfs' /etc/fstab >/dev/null 2>&1 ; then + # note that we do not disallow comments; we wish to allow people + # to comment it out if they so desire. + if [ $(grep '/proc' /dev/fstab 2>/dev/null | wc -l) -gt 1 ] ; then + # ugly but robust + echo ' +none /dev/shm tmpfs defaults 0 0' \ + >> /etc/fstab || { echo "failed to add tmpfs filesystem to /etc/fstab" 1>&2 ; exit 1 ; } + else + # beautiful in the common case + TMP=$(mktemp /tmp/fstab.XXXXXX) + sed '/\/proc/a\ +none /dev/shm tmpfs defaults 0 0 + ' < /etc/fstab > $TMP && cat $TMP > /etc/fstab || { echo "failed to add tmpfs filesystem to /etc/fstab" 1>&2 ; exit 1 ; } + rm -f $TMP + fi + fi +fi +%endif +if [ -x /sbin/pam_console_apply ] ; then + /sbin/pam_console_apply +fi + +%files +%defattr(-,root,root) +%doc COPYING devices.txt +/dev/MAKEDEV +%{_mandir}/man8/* +%{_sbindir}/mksock +%config %{_sysconfdir}/makedev.d + +%files -n dev -f mdmanifest +%defattr(-,root,root) +%dir /dev +%ghost /dev/log +%dir /dev/pts +%dir /dev/shm + +%changelog +* Thu Jun 24 2004 Nalin Dahyabhai 3.8.1-1 +- create sx8 device nodes + +* Mon Jun 21 2004 Nalin Dahyabhai 3.8-1 +- rename /dev/carmel to /dev/sx8 (Jeff Garzik) + +* Tue Jun 15 2004 Nalin Dahyabhai 3.7-3 +- hvsi* should be on ppc/ppc64, not s390 (David Howells) + +* Mon Jun 14 2004 Nalin Dahyabhai 3.7-2 +- add hvsi0 and hvsi1 devices on s390 (David Howells) + +* Wed Jun 09 2004 Karsten Hopp 3.7-1 +- sort devices for a better overview (s390) +- add scsi devices for zfcp disks (s390) + +* Sun May 30 2004 Florian La Roche +- simplify the pre script for MAKEDEV/dev + +* Wed May 5 2004 Nalin Dahyabhai 3.6-1 +- Cleanups: don't require that the owning user or group exist when invoked + with -M, because we don't care. + +* Wed May 5 2004 Nalin Dahyabhai 3.5-1 +- Fix crashes when users and groups specified as owners in configuration files + don't exist (Jim Gifford). +- Create /dev/adb and /dev/pmu devices (#119265) + +* Mon Mar 29 2004 Nalin Dahyabhai 3.4-1 +- Bump version for kernel 2.6. +- Create /dev/mce_log on x86_64. +- Create /dev/kmsg everywhere. +- Create /dev/carmel disk nodes. +- Make vsys a symlink to aio (was renamed to aio). + +* Wed Mar 10 2004 Phil Knirsch 3.3.14-1 +- Rebuilt for RHEL3 U2. + +* Mon Feb 23 2004 Nalin Dahyabhai 3.3.13-1 +- Make MAKEDEV use ":" to separate user and group names in output created when + invoked with the -S flag (patch by Tim Waugh). + +* Wed Jan 21 2004 Phil Knirsch 3.3.12-1 +- Added missing scsi devices for s390(x). + +* Tue Jan 20 2004 Phil Knirsch 3.3.11-1 +- Added back the /dev/tty* files on s390(x), needed for expect. + +* Mon Jan 12 2004 Nalin Dahyabhai 3.3.10-1 +- raise the default number of sg devices from 32 to 256 (kernel has no + hard-coded limit) (#104816) + +* Thu Dec 18 2003 Than Ngo 3.3.9-2 +- add the correct alsa device name + +* Fri Dec 12 2003 Bill Nottingham 3.3.9-1 +- ALSA device nodes + +* Mon Sep 15 2003 Nalin Dahyabhai 3.3.8-2 +- rebuild + +* Mon Sep 15 2003 Nalin Dahyabhai 3.3.8-1 +- apply patch from Matt Wilson to raise the number of raw devices from 128 + to 255 + +* Fri Aug 22 2003 Bill Nottingham 3.3.7-1 +- make /dev/hvc0 a real file + +* Fri Aug 15 2003 Nalin Dahyabhai 3.3.6-2 +- rebuild + +* Fri Aug 15 2003 Nalin Dahyabhai 3.3.6-1 +- apply patch from Matt Wilson to make /dev/hvc0 a link to iseries/vtty0 +- include the nvram and hvc0 devices on ppc/ppc64 + +* Tue Jun 3 2003 Nalin Dahyabhai 3.3.5-2 +- rebuild + +* Tue Jun 3 2003 Nalin Dahyabhai 3.3.5-1 +- finish update to latest devices.txt + moves /dev/3270/tty* from major 228 to 227 + moves /dev/3270/tub* from major 227 to 228 + +* Tue May 13 2003 Nalin Dahyabhai 3.3.4-1 +- update to latest devices.txt (renames smapi to thinkpad/thinkpad, adds + systrace, tpm, pps, etherd/, spi/, usb/usblcd, usb/cpad0) + +* Mon Apr 28 2003 Nalin Dahyabhai 3.3.3-1 +- replace libraw1394 config file with newer information from + www.linux1394.org (#88170) + +* Sat Feb 01 2003 Florian La Roche +- sanitize dev rpm scripts + +* Thu Jan 30 2003 Phil Knirsch 3.3.2-5 +- Removed too many tty devices for s390(x). Fixed. +- Removed mdsp* and logicalco devices for s390(x). + +* Wed Jan 29 2003 Phil Knirsch 3.3.2-3 +- Updated number of dasd devices we create for s390(x) (64 now). +- Removed all unecessary /dev/tty?.? entries for s390(x). + +* Mon Jan 27 2003 Nalin Dahyabhai 3.3.2-2 +- rebuild + +* Wed Jan 8 2003 Nalin Dahyabhai 3.3.2-1 +- update to latest devices.txt (renames intel_rng to hwrng and adds ttyB*) + +* Tue Sep 17 2002 Guy Streeter +- include the /dev/iseries devices on ppc64 + +* Fri Aug 30 2002 Nalin Dahyabhai 3.3.1-2 +- build nosst devices (#72914) + +* Tue Jul 09 2002 Nalin Dahyabhai 3.3.1-1 +- build the tunnelling device (/dev/net/tun) +- add configuration for libraw1394 (#67203) + +* Tue Jul 09 2002 Florian La Roche +- fix SPARC build, patch from Jakub Jelinek + +* Tue May 28 2002 Nalin Dahyabhai 3.3-7 +- rebuild + +* Thu May 16 2002 Nalin Dahyabhai 3.3-6 +- build 32 scsi generic devices +- add cfs device used by coda + +* Thu May 9 2002 Nalin Dahyabhai 3.3-5 +- resync with current LANANA updates, remove ibcs config file +- resync with usb device list + +* Tue Apr 23 2002 Nalin Dahyabhai +- resync with current LANANA updates, heads-up from John Cagle +- create kpoll and 16 scramdisk devices + +* Thu Apr 11 2002 Nalin Dahyabhai 3.3-4 +- build the package the same way for the superuser as we did before, + preventing problems when building as root when some of the device + owners don't exist on the build host + +* Thu Mar 28 2002 Nalin Dahyabhai 3.3-3 +- set the /dev/vcs* devices to be owned by the vcsa user, and create the + vcsa user + +* Tue Mar 19 2002 Nalin Dahyabhai 3.3-2 +- rebuild + +* Tue Mar 19 2002 Nalin Dahyabhai 3.3-1 +- handle a step of 0 when creating multiple nodes +- add /dev/cpu/*/microcode (perms 0600) to the dev package + +* Thu Feb 21 2002 Nalin Dahyabhai 3.2-12 +- rebuild + +* Thu Jan 31 2002 Nalin Dahyabhai 3.2-11 +- up the limit on ide devices (hda through hdt) back up from 17 to 33 -- I'm + told it works now + +* Mon Jan 21 2002 Nalin Dahyabhai 3.2-10 +- build for Raw Hide + +* Mon Jan 21 2002 Nalin Dahyabhai 3.2-9 +- actually create the vsys device + +* Mon Jan 21 2002 Nalin Dahyabhai 3.2-8 +- build for Raw Hide + +* Mon Jan 21 2002 Nalin Dahyabhai 3.2-7 +- aio/vsys rename courtesy of Ben LaHaise + +* Thu Aug 30 2001 Nalin Dahyabhai 3.2-6 +- fix markup errors in the man page (no bug ID, reported by + esr at snark.thyrsus.com) + +* Thu Aug 30 2001 Nalin Dahyabhai 3.2-5 +- char 10/208 is cpqphpc, not cpqphpcp (#52910) +- add compaq/ devices (#52898) +- add information about raw1394 and video1394 devices (#52736) + +* Fri Aug 17 2001 Karsten Hopp +- add tape390 devices + +* Tue Aug 14 2001 Karsten Hopp +- clean up all those ifnarch s390 clauses + +* Thu Aug 2 2001 Nalin Dahyabhai +- bring in line with devices.txt from 3 June 2001 +- create dri devices + +* Wed Jul 18 2001 Tim Powers +- rebuilt using new rpm that actually does %%dev correctly + +* Mon Jul 16 2001 Nalin Dahyabhai +- tweak the manifest handling to also build when RPM doesn't know + about them +- add a -S option to spit out shell script snippets +- only claim that we need to create a particular directory once +- fix descriptions for i2o/hdd[i-p], which were wrong +- break generic and architecture-specific sections apart in %%install + +* Sun Jul 15 2001 Jeff Johnson +- generate device manifest with MAKEDEV -M to build as non-root. + +* Wed Jul 11 2001 Bill Nottingham +- add proper prereqs to dev package for %post (#48769) + +* Thu Jul 05 2001 Florian La Roche +- disable unneeded parts of post for s390,s390x + +* Sun Jul 01 2001 Karsten Hopp +- S390-only changes -- added missing devices + +* Fri Jun 29 2001 Karsten Hopp +- added missing /dev/null on S390 + +* Wed Jun 27 2001 Nalin Dahyabhai +- back out some changes, move documentation for dasd device numbers elsewhere + +* Wed Jun 27 2001 Karsten Hopp +- move 2 S390 patches into CVS, console-patch has to stay or it + would break other archs + +* Tue Jun 26 2001 Nalin Dahyabhai +- create the first four /dev/osst devices (#35833) +- only 7 partitions for DAC960 disks, not 8 (#31484) +- add ataraid device nodes (#44807) +- add a "raid" alias for all raid devices (#33117) +- update the man page + +* Tue Jun 26 2001 Bill Nottingham +- add /dev/shm to fstab too + +* Thu Jun 22 2001 Nalin Dahyabhai +- own %{_sysconfdir}/makedev.d in addition to files it contains + +* Wed Jun 21 2001 Karsten Hopp +- correct device naming and major/minor numbers on S390 + +* Fri Jun 8 2001 Nalin Dahyabhai +- fix a bug in creation of leading directories when a format specifier is + included in the directory's name +- zero-fill the buffer before we pass it to readlink() +- don't try to create /dev/ixj*; the device isn't present in 2.4 +- limit number of each device in /dev/input to 32 + +* Thu May 31 2001 Nalin Dahyabhai +- increase the number of lp and parport devices from 3 to 8 + +* Thu May 24 2001 Nalin Dahyabhai +- make apm devices (apm_bios) +- make fancy beeper device (beep) + +* Wed Apr 25 2001 Nalin Dahyabhai +- only make devices for two floppy drives instead of eight +- limit the number of cui devices to 16 instead of 64 +- limit the number isdn and ippp devices to 16 +- limit the number of nb devices to 32 (matches md) +- limit the number of st and nst devices to 16 + +* Fri Mar 23 2001 Nalin Dahyabhai +- make all devices for all RAID controllers again + +* Mon Mar 12 2001 Nalin Dahyabhai +- make aliases for ide5 through ide9 +- limit the number of console and console-related devices to 32 +- run pam_console_apply in the post, if it exists + +* Mon Mar 5 2001 Nalin Dahyabhai +- use a file manifest + +* Sat Mar 3 2001 Nalin Dahyabhai +- drop the number of hdX devices from 33 to 17, on advice from Andre Hedrick + +* Thu Mar 1 2001 Nalin Dahyabhai +- make js0, js1, js2, js3 symlinks into /dev/input so that all programs use + the new input-core joystick driver instead of the old one + +* Mon Feb 26 2001 Nalin Dahyabhai +- detect devfs in the MAKEDEV %%pre, too (#26110) +- fix message in the dev %%pre (#26110) + +* Fri Feb 16 2001 Nalin Dahyabhai +- build the netlink device (#15785) + +* Sun Feb 11 2001 Florian La Roche +- merge in s390 s390x support + +* Tue Feb 6 2001 Nalin Dahyabhai +- fail to install if %%pre detects devfs + +* Thu Jan 25 2001 Nalin Dahyabhai +- create /dev in the %%pre script; installing the dev package should fixup + the permissions, and we can't redirect to /dev/null without it (#24392) + +* Thu Jan 18 2001 Nalin Dahyabhai +- make /dev/aio world-writable (info from Ben LeHaise) + +* Wed Jan 17 2001 Nalin Dahyabhai +- add device nodes using the new devices.txt for Linux 2.4.0, and check that + file into the source tree to make tracking further changes simpler +- change Copyright: GPL to License: GPL +- add a very simple substitution macro facility for specifying ownership and + permissions in a single place +- add code for creating sockets natively +- remove conflicting data for where /dev/ftape should point to +- remove all raid controller device nodes for second and additional controllers + (they can be created with MAKEDEV) + +* Tue Jan 9 2001 Nalin Dahyabhai +- make 32 partition devices for IDE disks instead of 16 + +* Tue Dec 12 2000 Nalin Dahyabhai +- make some ppp devices + +* Thu Oct 19 2000 Nalin Dahyabhai +- change vcs0 to vcs (ditto for vcsa0) + +* Tue Sep 12 2000 Bill Nottingham +- fixes for some sparc devices that fell out + +* Thu Aug 24 2000 Florian La Roche +- change some devices that could be used for dialing to root:uucp/0660 perms + +* Wed Aug 23 2000 Nalin Dahyabhai +- up the number of SCSI CD-ROM devices we know about from 8 to 32, but only + create 8 at build-time + +* Wed Aug 16 2000 Nalin Dahyabhai +- remove both temp files generated in the %%post (#16325) + +* Mon Aug 14 2000 Nalin Dahyabhai +- change the sense of sga/sg0 node/symlink stuff to match kernel docs (#16056) + +* Wed Aug 9 2000 Nalin Dahyabhai +- add the netlink device, and mark it as undocumented (#15785) +- add /dev/log socket as a ghost using Erik's mksocket +- add in devices that start with "m" +- change /dev/i20 to /dev/i2o +- fix a parser bug + +* Tue Aug 8 2000 Nalin Dahyabhai +- add cciss device nodes (#14878) + +* Mon Aug 7 2000 Crutcher Dunnavant +- make the usb lp? devices group-owned by 'lp' + +* Fri Jul 21 2000 Nalin Dahyabhai +- make floppy disk devices group-accessible by the floppy group + +* Wed Jul 19 2000 Nalin Dahyabhai +- stop making bogus symlinks (#14225) +- add "console" alias for tty devices to match man page +- add "qic" alias for tape devices to match man page + +* Mon Jul 17 2000 Nalin Dahyabhai +- change group of the "lp" devices to "lp" +- comment out the ACSI disks, which probably shouldn't have those names +- incorporate the release number into the tarball file name + +* Wed Jul 12 2000 Prospector +- automatic rebuild + +* Mon Jul 10 2000 Nalin Dahyabhai +- fix symlink creation where both the link and a target are in a subdirectory +- add efirtc in its own "ia64" control file + +* Wed Jul 5 2000 Nalin Dahyabhai +- add a -i flag so that I can test in a CVS checkout +- use correct IBCS compatibility device entries +- fix symlink creation so that it works as intended + +* Tue Jul 4 2000 Matt Wilson +- moved the Prereq: /usr/sbin/groupadd from the MAKEDEV package to the + dev package +- added the %%post script to the dev package to add devpts mounting + +* Sat Jul 1 2000 Nalin Dahyabhai +- make the man page 644, not 755 + +* Mon Jun 26 2000 Florian La Roche +- update from 8 to 16 loop devices + +* Mon Jun 26 2000 Nalin Dahyabhai +- add input/mice and md devices to the dev package +- limit loop devices to 16 in config files (this is a hard-coded kernel limit) + +* Mon Jun 19 2000 Nalin Dahyabhai +- add the "floppy" group to the system in the dev package's pre-install + +* Mon Jun 11 2000 Nalin Dahyabhai +- fix a typo in the devices list +- move non-standard names from linux-2.2 list to redhat list + +* Sat Jun 10 2000 Nalin Dahyabhai +- FHS packaging for a shiny new version From svn at tinysofa.org Thu Jul 1 15:35:12 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:35:12 +1000 (EST) Subject: [tinysofa-svn] r2506 - in tinysofa/snapshot: . Pyrex Pyrex/current Pyrex/current/sources Pyrex/current/specs Message-ID: <20040701153512.7774F4E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:35:12 +1000 (Fri, 02 Jul 2004) New Revision: 2506 Added: tinysofa/snapshot/Pyrex/ tinysofa/snapshot/Pyrex/current/ tinysofa/snapshot/Pyrex/current/sources/ tinysofa/snapshot/Pyrex/current/sources/Pyrex-0.9-split-base-types.patch tinysofa/snapshot/Pyrex/current/sources/Pyrex-0.9.2.1.tar.gz tinysofa/snapshot/Pyrex/current/specs/ tinysofa/snapshot/Pyrex/current/specs/Pyrex.spec Log: - Add Pyrex to snapshot from 2.0. Added: tinysofa/snapshot/Pyrex/current/sources/Pyrex-0.9-split-base-types.patch =================================================================== --- tinysofa/snapshot/Pyrex/current/sources/Pyrex-0.9-split-base-types.patch 2004-07-01 15:34:54 UTC (rev 2505) +++ tinysofa/snapshot/Pyrex/current/sources/Pyrex-0.9-split-base-types.patch 2004-07-01 15:35:12 UTC (rev 2506) @@ -0,0 +1,42 @@ +--- Pyrex-0.9.2.1/Pyrex/Compiler/Parsing.py.base-types 2004-06-25 14:59:43.000000000 -0400 ++++ Pyrex-0.9.2.1/Pyrex/Compiler/Parsing.py 2004-06-25 15:05:36.000000000 -0400 +@@ -1203,8 +1203,12 @@ + if looking_at_base_type(s): + #print "p_c_simple_base_type: looking_at_base_type at", s.position() + is_basic = 1 +- signed = p_signed_or_unsigned(s) +- longness = p_short_or_long(s) ++ if s.sy == 'IDENT' and s.systring in base_type_start_types: ++ longness = p_short_or_long(s) ++ signed = p_signed_or_unsigned(s) ++ elif s.sy == 'IDENT' and s.systring in base_type_start_sign: ++ signed = p_signed_or_unsigned(s) ++ longness = p_short_or_long(s) + if s.sy == 'IDENT' and s.systring in basic_c_type_names: + name = s.systring + s.next() +@@ -1231,7 +1235,7 @@ + + def looking_at_base_type(s): + #print "looking_at_base_type?", s.sy, s.systring, s.position() +- return s.sy == 'IDENT' and s.systring in base_type_start_words ++ return s.sy == 'IDENT' and (s.systring in base_type_start_types or s.systring in base_type_start_sign) + + def looking_at_dotted_name(s): + if s.sy == 'IDENT': +@@ -1243,9 +1247,13 @@ + else: + return 0 + +-base_type_start_words = ( ++base_type_start_types = ( + "char", "short", "int", "long", "float", "double", +- "void", "signed", "unsigned" ++ "void" ++) ++ ++base_type_start_sign = ( ++ "signed", "unsigned" + ) + + basic_c_type_names = ( Added: tinysofa/snapshot/Pyrex/current/sources/Pyrex-0.9.2.1.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/Pyrex/current/sources/Pyrex-0.9.2.1.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/Pyrex/current/specs/Pyrex.spec =================================================================== --- tinysofa/snapshot/Pyrex/current/specs/Pyrex.spec 2004-07-01 15:34:54 UTC (rev 2505) +++ tinysofa/snapshot/Pyrex/current/specs/Pyrex.spec 2004-07-01 15:35:12 UTC (rev 2506) @@ -0,0 +1,139 @@ +%define pyver %(python -c 'import sys ; print sys.version[:3]') +%define pynext %(python -c 'print %{pyver} + 0.1') +Name: Pyrex +Version: 0.9.2.1 +Release: 1ts +Epoch: 0 +BuildArch: noarch +Summary: A compiler/language for writing Python extension modules. +Group: Development/Languages +License: Public Domain +URL: http://www.cosc.canterbury.ac.nz/~greg/python/Pyrex/ +Source0: http://www.cosc.canterbury.ac.nz/~greg/python/Pyrex/Pyrex-%{version}.tar.gz +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root + +BuildRequires: python-devel +BuildRequires: dos2unix +BuildRequires: findutils +Requires: python >= 0:%{pyver}, python <= 0:%{pynext} + +Patch0: Pyrex-0.9-split-base-types.patch + +%description +Pyrex is Python with C types. It is specially designed to allow you to +write extension modules for Python that have the speed of C and the +simplicity and readability of Python. You write your code in a Python-like +language with C-typed variables, then use the pyrexc compiler to transform +it into a C representation. This is useful for speeding up critical sections +of your Python code or wrapping an external library. + +Please see the documentation for how to get the best performance from your +code. + +%prep +%setup -q + +%patch0 -p1 -b .split_base_types + +%build +python setup.py build + +# Remove some Macintosh-isms +find . -name '.DS_Store' -exec rm -f \{\} \; +dos2unix -k -c mac CHANGES.txt ToDo.txt Tools/* Doc/* Demos/Makefile.nodistutils +dos2unix -k -c mac Demos/callback/cheesefinder.h Demos/callback/Makefile.nodistutils Demos/callback/README.txt +dos2unix -k -c mac Demos/embed/Makefile.msc Demos/embed/Makefile.msc.static Demos/embed/README + +%install +rm -rf $RPM_BUILD_ROOT +python setup.py install --skip-build --root $RPM_BUILD_ROOT --record=INSTALLED_FILES + +#hack to get around a bug in the python distutils on 64 bit archs +%if "%{_lib}" == "lib64" +cp -r $RPM_BUILD_ROOT/usr/lib/* $RPM_BUILD_ROOT%{_libdir}/ +rm -rf $RPM_BUILD_ROOT/usr/lib +perl -pi -e 's/\/usr\/lib\//\/usr\/lib64\//g' INSTALLED_FILES +%endif + +# Add directories to the INSTALLED_FILES +#find $RPM_BUILD_ROOT%{_libdir}/python%{pyver}/site-packages/Pyrex/Plex -type d -print | \ +#sed "s|$RPM_BUILD_ROOT|%dir |g" >>INSTALLED_FILES +find $RPM_BUILD_ROOT%{_libdir}/python%{pyver}/site-packages/Pyrex -type d -print | \ +sed "s|$RPM_BUILD_ROOT|%dir |g" >>INSTALLED_FILES + +# Produce .pyo files for %ghost directive later (from duplicity) +#python -Oc 'from compileall import *; compile_dir("'$RPM_BUILD_ROOT/%{_libdir}/python%{pyver}/site-packages/Pyrex/Plex'")' + +python -Oc 'from compileall import *; compile_dir("'$RPM_BUILD_ROOT/%{_libdir}/python%{pyver}/site-packages/Pyrex'")' + +%clean +rm -rf $RPM_BUILD_ROOT + +%files -f INSTALLED_FILES +%defattr(0644,root,root,0755) +%doc USAGE.txt README.txt CHANGES.txt ToDo.txt Demos Doc Tools + +%defattr(-,root,root,-) +%ghost %{_libdir}/python%{pyver}/site-packages/Pyrex/Plex/*.pyo +%ghost %{_libdir}/python%{pyver}/site-packages/Pyrex/*.pyo +%ghost %{_libdir}/python%{pyver}/site-packages/Pyrex/Compiler/*.pyo +%ghost %{_libdir}/python%{pyver}/site-packages/Pyrex/Distutils/*.pyo +%exclude %{_libdir}/python%{pyver}/site-packages/Pyrex/Mac + +%changelog +* Fri Jun 25 2004 John (J5) Palmieri - 0:0.9.2.1-1 +- New upstream version +- Pyrex-0.9-split-base-types.patch synced for new version + +* Tue Jun 15 2004 Elliot Lee +- rebuilt + +* Fri Jun 03 2004 John (J5) Palmieri - 0:0.9-5 +- Built to rawhide + +* Wed May 19 2004 Florian La Roche +- use rpm macros to determine lib64 usage + +* Fri Apr 23 2004 John (J5) Palmieri - 0:0.9-3 +- Added Pyrex-0.9-split-base-types.patch which fixes + long unsigned int bug showing up in dbus python binding + builds for the x86_64 arch +- Added regex hack to spec to work around a bug in python's + distutils which would install files into /usr/lib instead of + /usr/lib64 on 64 bit archs + +* Mon Apr 19 2004 John (J5) Palmieri - 0:0.9-2 +- Was informed that the epoch change was not needed so the epoch + was reverted back to 0 + +* Mon Apr 19 2004 John (J5) Palmieri - 1:0.9-1 +- Upped the epoch so as to avoid clashes with the Fedora extra package + +* Mon Apr 19 2004 John (J5) Palmieri - 0:0.9-1 +- Transfered to Red Hat Fedora's main tree +- Removed need for LONG_LONG patch + +* Mon Feb 02 2004 Toshio Kuratomi - 0:0.9-0.fdr.4 +- Removed the site-packages directory from the directories owned by the + package + +* Mon Feb 02 2004 Toshio Kuratomi - 0:0.9-0.fdr.3 +- My mistake: rpm automatically removes %%ghost files, no need to script + it manually. +- python distutils --record=FILE option doesn't record directories so include + the site-packages/[directories] manually + +* Thu Jan 15 2003 Toshio Kuratomi - 0:0.9-0.fdr.2 +- Merge changes from Michel Alexandre Salim + + Require build system's python version because directories are named + pythonX.Y + + Create *.pyo files and %ghost them (Privleged user with python optimize + turned on may generate them, but they aren't needed for operation. + + Do not include the Mac Pyrex compiler stuff + + Change license to Public Domain +- Script to remove any %%ghost files on package removal +- Patch around an incompatible change between python 2.2 and python 2.3's + definition of LONG_LONG being renamed to PY_LONG_LONG + +* Fri Jan 09 2003 Toshio Kuratomi - 0:0.9-0.fdr.1 +- Initial RPM release. From svn at tinysofa.org Thu Jul 1 15:35:19 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:35:19 +1000 (EST) Subject: [tinysofa-svn] r2510 - in tinysofa/snapshot: . acpid acpid/current acpid/current/sources acpid/current/specs Message-ID: <20040701153519.97EF94E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:35:19 +1000 (Fri, 02 Jul 2004) New Revision: 2510 Added: tinysofa/snapshot/acpid/ tinysofa/snapshot/acpid/current/ tinysofa/snapshot/acpid/current/sources/ tinysofa/snapshot/acpid/current/sources/acpid-1.0.1-conf.patch tinysofa/snapshot/acpid/current/sources/acpid-1.0.3-pm1.patch tinysofa/snapshot/acpid/current/sources/acpid-1.0.3.tar.gz tinysofa/snapshot/acpid/current/sources/acpid.init tinysofa/snapshot/acpid/current/specs/ tinysofa/snapshot/acpid/current/specs/acpid.spec Log: - Add acpid to snapshot from 2.0. Added: tinysofa/snapshot/acpid/current/sources/acpid-1.0.1-conf.patch =================================================================== --- tinysofa/snapshot/acpid/current/sources/acpid-1.0.1-conf.patch 2004-07-01 15:35:17 UTC (rev 2509) +++ tinysofa/snapshot/acpid/current/sources/acpid-1.0.1-conf.patch 2004-07-01 15:35:19 UTC (rev 2510) @@ -0,0 +1,9 @@ +--- acpid-1.0.1/samples/sample.conf.foo Tue Aug 27 00:17:18 2002 ++++ acpid-1.0.1/samples/sample.conf Tue Aug 27 00:17:52 2002 +@@ -1,4 +1,4 @@ + # This is a sample ACPID configuration + +-# event=button power.* +-# action=/usr/local/bin/power.sh "%e" ++event=button/power.* ++action=/sbin/shutdown -h now Added: tinysofa/snapshot/acpid/current/sources/acpid-1.0.3-pm1.patch =================================================================== --- tinysofa/snapshot/acpid/current/sources/acpid-1.0.3-pm1.patch 2004-07-01 15:35:17 UTC (rev 2509) +++ tinysofa/snapshot/acpid/current/sources/acpid-1.0.3-pm1.patch 2004-07-01 15:35:19 UTC (rev 2510) @@ -0,0 +1,250 @@ +diff -c acpid-1.0.1/acpid.c acpid-1.0.1-pm1/acpid.c +*** acpid-1.0.1/acpid.c Wed Mar 13 17:27:08 2002 +--- acpid-1.0.1-pm1/acpid.c Wed Apr 3 13:58:35 2002 +*************** +*** 59,64 **** +--- 59,66 ---- + { + int event_fd; + int sock_fd; ++ int max_fd_num; ++ fd_set readfds, testfds; + + /* learn who we really are */ + progname = (const char *)strrchr(argv[0], '/'); +*************** +*** 156,232 **** + /* read in our configuration */ + acpid_read_conf(confdir); + + /* main loop */ + while (1) { +- struct pollfd ar[2]; + int r; + int fds = 0; +- +- /* poll for the socket and the event file */ +- ar[0].fd = event_fd; ar[0].events = POLLIN; fds++; +- if (!nosocket) { +- ar[1].fd = sock_fd; ar[1].events = POLLIN; fds++; +- } +- r = poll(ar, fds, -1); +- +- if (r < 0 && errno == EINTR) { +- continue; +- } else if (r < 0) { +- acpid_log("ERR: poll(): %s\n", strerror(errno)); +- continue; +- } +- +- /* was it an event? */ +- if (ar[0].revents) { +- char *event; +- +- /* this shouldn't happen */ +- if (!ar[0].revents & POLLIN) { +- acpid_log("odd, poll set flags 0x%x\n", +- ar[0].revents); +- continue; +- } +- +- /* read and handle an event */ +- event = read_line(event_fd); +- if (event) { +- acpid_log("received event \"%s\"\n", event); +- acpid_handle_event(event); +- acpid_log("completed event \"%s\"\n", event); +- } else { +- static int nerrs; +- if (++nerrs >= ACPI_MAX_ERRS) { +- acpid_log("too many errors reading " +- "events file - aborting\n"); +- break; +- } +- } +- } + +! /* was it a new connection? */ +! if (!nosocket && ar[1].revents) { +! int cli_fd; +! struct ucred creds; +! char buf[32]; +! +! /* this shouldn't happen */ +! if (!ar[1].revents & POLLIN) { +! acpid_log("odd, poll set flags 0x%x\n", +! ar[1].revents); +! continue; +! } +! +! /* accept and add to our lists */ +! cli_fd = ud_accept(sock_fd, &creds); +! if (cli_fd < 0) { +! acpid_log("ERR: can't accept client: %s\n", +! strerror(errno)); +! continue; +! } +! snprintf(buf, sizeof(buf)-1, "%d[%d:%d]", +! creds.pid, creds.uid, creds.gid); +! acpid_add_client(cli_fd, buf); +! } + } + + clean_exit(EXIT_SUCCESS); +--- 133,215 ---- + /* read in our configuration */ + acpid_read_conf(confdir); + ++ /* setup the fds for select() */ ++ max_fd_num = ((event_fd > sock_fd)?event_fd:sock_fd); ++ FD_ZERO(&readfds); ++ FD_SET(event_fd, &readfds); ++ FD_SET(sock_fd, &readfds); ++ + /* main loop */ + while (1) { + int r; + int fds = 0; + +! /* wait until somebody has some input for us */ +! testfds = readfds; +! r = select(max_fd_num + 1, &testfds, NULL, NULL, NULL); +! +! /* check for error conditions */ +! if (r < 0) +! switch (errno) { +! case EINVAL: +! case EBADF: +! /* we shouldn't be here */ +! acpid_log("unrecoverable internal error with select()\n"); +! clean_exit(errno); +! break; +! case EINTR: +! default: +! /* just go back to waiting */ +! continue; +! break; +! } +! +! /* handle the fds that have input */ +! while (r > 0) { +! /* see if the fd is set */ +! if (FD_ISSET(fds, &testfds)) { +! /* one less to handle */ +! r--; +! +! if (fds == event_fd) { +! /* read an acpi event */ +! char *event; +! +! event = read_line(event_fd); +! if (event) { +! acpid_log("received event \"%s\"\n", event); +! acpid_handle_event(event); +! acpid_log("completed event \"%s\"\n", event); +! } else { +! static int nerrs; +! if (++nerrs >= ACPI_MAX_ERRS) { +! acpid_log("too many errors reading " +! "events file - aborting\n"); +! break; +! } +! } +! } +! if (fds == sock_fd) { +! /* a client is trying to connect */ +! int cli_fd; +! struct ucred creds; +! char buf[32]; +! +! cli_fd = ud_accept(sock_fd, &creds); +! if (cli_fd < 0) { +! acpid_log("ERR: can't accept client: %s\n", +! strerror(errno)); +! continue; +! } +! snprintf(buf, sizeof(buf)-1, "%d[%d:%d]", +! creds.pid, creds.uid, creds.gid); +! acpid_add_client(cli_fd, buf); +! } +! } +! +! /* next */ +! fds++; +! } + } + + clean_exit(EXIT_SUCCESS); +*************** +*** 428,470 **** + * This depends on fixes in linux ACPI after 2.4.8 + */ + #define MAX_BUFLEN 1024 + static char * + read_line(int fd) + { +! static char *buf; +! int buflen = 64; +! int i = 0; +! int r; +! int searching = 1; +! +! while (searching) { +! buf = realloc(buf, buflen); +! if (!buf) { +! acpid_log("ERR: malloc(%d): %s\n", +! buflen, strerror(errno)); +! return NULL; +! } +! memset(buf+i, 0, buflen-i); + +! while (i < buflen) { +! r = read(fd, buf+i, 1); +! if (r < 0 && errno != EINTR) { +! /* we should do something with the data */ +! return NULL; +! } else if (r == 1) { +! if (buf[i] == '\n') { +! searching = 0; +! buf[i] = '\0'; +! break; +! } +! i++; +! } +! } +! if (buflen >= MAX_BUFLEN) { +! break; +! } +! buflen *= 2; +! } + + return buf; + } +--- 411,437 ---- + * This depends on fixes in linux ACPI after 2.4.8 + */ + #define MAX_BUFLEN 1024 ++ + static char * + read_line(int fd) + { +! static char buf[MAX_BUFLEN] = ""; +! int r = 0; + +! /* get a buffer full of data */ +! while (r == 0) +! { +! r = read(fd, buf, MAX_BUFLEN - 1); +! +! if (r == 0) +! continue; +! else if (r < 0) +! return NULL; +! } +! +! /* strip eol */ +! if (buf[r - 1] == '\n') +! buf[r - 1] = '\0'; + + return buf; + } Added: tinysofa/snapshot/acpid/current/sources/acpid-1.0.3.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/acpid/current/sources/acpid-1.0.3.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/acpid/current/sources/acpid.init =================================================================== --- tinysofa/snapshot/acpid/current/sources/acpid.init 2004-07-01 15:35:17 UTC (rev 2509) +++ tinysofa/snapshot/acpid/current/sources/acpid.init 2004-07-01 15:35:19 UTC (rev 2510) @@ -0,0 +1,82 @@ +#!/bin/bash +# +# /etc/rc.d/init.d/acpid +# +# Starts the acpi daemon +# +# chkconfig: 345 44 56 +# description: Listen and dispatch ACPI events from the kernel +# processname: acpid + +# Source function library. +. /etc/rc.d/init.d/functions + +[ -x /usr/sbin/acpid ] || exit 0 +[ -f /proc/acpi/event ] || exit 0 + +RETVAL=0 + +# +# See how we were called. +# + +start() { + # Check if it is already running + if [ ! -f /var/lock/subsys/acpid ]; then + echo -n $"Starting acpi daemon: " + modprobe button > /dev/null 2>&1 + daemon /usr/sbin/acpid + RETVAL=$? + [ $RETVAL -eq 0 ] && touch /var/lock/subsys/acpid + echo + fi + return $RETVAL +} + +stop() { + echo -n $"Stopping acpi daemon: " + killproc /usr/sbin/acpid + RETVAL=$? + [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/acpid + echo + return $RETVAL +} + + +restart() { + stop + start +} + +reload() { + trap "" SIGHUP + killall -HUP acpid +} + +case "$1" in +start) + start + ;; +stop) + stop + ;; +reload) + reload + ;; +restart) + restart + ;; +condrestart) + if [ -f /var/lock/subsys/acpid ]; then + restart + fi + ;; +status) + status acpid + ;; +*) + echo $"Usage: $0 {start|stop|status|restart|condrestart|reload}" + exit 1 +esac + +exit $RETVAL Property changes on: tinysofa/snapshot/acpid/current/sources/acpid.init ___________________________________________________________________ Name: svn:executable + * Added: tinysofa/snapshot/acpid/current/specs/acpid.spec =================================================================== --- tinysofa/snapshot/acpid/current/specs/acpid.spec 2004-07-01 15:35:17 UTC (rev 2509) +++ tinysofa/snapshot/acpid/current/specs/acpid.spec 2004-07-01 15:35:19 UTC (rev 2510) @@ -0,0 +1,131 @@ +Summary: ACPI Event Daemon +Name: acpid +Version: 1.0.3 +Release: 1ts +Copyright: GPL +Group: System Environment/Daemons +Source: http://prdownloads.sourceforge.net/acpid/acpid-%{version}.tar.gz +Source2: acpid.init +Patch: acpid-1.0.3-pm1.patch +Patch2: acpid-1.0.1-conf.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-root +ExclusiveArch: ia64 x86_64 i386 +URL: http://acpid.sourceforge.net/ +Prereq: /sbin/chkconfig, /sbin/service + + +%description +acpid is a daemon that dispatches ACPI events to user-space programs. + + +%prep +%setup +%patch -p1 +%patch2 -p1 + +%build +make + + +%install +rm -rf $RPM_BUILD_ROOT +mkdir -p $RPM_BUILD_ROOT +make install INSTPREFIX=$RPM_BUILD_ROOT + +mkdir -p $RPM_BUILD_ROOT/etc/acpi/events +mkdir -p $RPM_BUILD_ROOT/etc/acpi/actions +chmod 755 $RPM_BUILD_ROOT/etc/acpi/events +install -m 644 samples/sample.conf $RPM_BUILD_ROOT/etc/acpi/events + +mkdir -p $RPM_BUILD_ROOT/var/log +touch $RPM_BUILD_ROOT/var/log/acpid +chmod 640 $RPM_BUILD_ROOT/var/log/acpid + +mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d +install -m 755 %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/acpid +chmod 755 $RPM_BUILD_ROOT/etc/rc.d/init.d/acpid + +rm -rf %{buildroot}/usr/bin + + +%clean +rm -rf $RPM_BUILD_ROOT + + +%files +%defattr(-,root,root) +%dir /etc/acpi +%dir /etc/acpi/events +%dir /etc/acpi/actions +%config %attr(0644,root,root) /etc/acpi/events/sample.conf +/var/log/acpid +/usr/sbin/acpid +%attr(0755,root,root) /etc/rc.d/init.d/acpid +/usr/share/man/man8/acpid.8.gz +/usr/share/man/man8/acpi_listen.8.gz + +%post +/sbin/chkconfig --add acpid + +%preun +if [ "$1" = "0" ]; then + service acpid stop >/dev/null 2>&1 + /sbin/chkconfig --del acpid +fi + +%changelog +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Wed Oct 22 2003 Bill Nottingham 1.0.2-5 +- fix handling of sample.conf (#107160) +- mark for translations (#107459) + +* Sun Oct 19 2003 Florian La Roche +- add %%clean specfile target + +* Wed Oct 1 2003 Bill Nottingham 1.0.2-3 +- re-enable x86 +- don't load the button module + +* Thu Aug 7 2003 Bill Nottingham 1.0.2-2 +- no x86 for now + +* Mon Jul 7 2003 Bill Nottingham 1.0.2-1 +- update to 1.0.2 + +* Wed Dec 11 2002 Bill Nottingham 1.0.1-4 +- don't start if /proc/acpi/event isn't there + +* Thu Nov 14 2002 Bill Nottingham 1.0.1-3 +- build on more arches + +* Mon Aug 26 2002 Bill Nottingham 1.0.1-2 +- tweak default config to run shutdown -h now on a power button event + +* Thu Aug 22 2002 Bill Nottingham 1.0.1-1 +- initial build, bang on included specfile + +* Fri Mar 15 2002 Tim Hockin + - Updated RPM spec with patch from sun for chkconfig on/off + - Add Changelog, make 'make rpm' use it. + +* Wed Mar 13 2002 Tim Hockin + - Fixed logging bug - not appending to log (O_APPEND needed) + - Fix 'make install' to not need root access + - Fix RPM spec to not need root + +* Thu Sep 6 2001 Tim Hockin + - 1.0.0 + +* Thu Aug 16 2001 Tim Hockin + - Added commandline options to actions + +* Wed Aug 15 2001 Tim Hockin + - Added UNIX domain socket support + - Changed /etc/acpid.d to /etc/acpid/events + +* Mon Aug 13 2001 Tim Hockin + - added changelog + - 0.99.1-1 + From svn at tinysofa.org Thu Jul 1 15:35:20 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:35:20 +1000 (EST) Subject: [tinysofa-svn] r2511 - in tinysofa/snapshot: . anacron anacron/current anacron/current/sources anacron/current/specs Message-ID: <20040701153520.A09FB4E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:35:20 +1000 (Fri, 02 Jul 2004) New Revision: 2511 Added: tinysofa/snapshot/anacron/ tinysofa/snapshot/anacron/current/ tinysofa/snapshot/anacron/current/sources/ tinysofa/snapshot/anacron/current/sources/anacron-2.3-gcc-3.4-compile-fix.patch tinysofa/snapshot/anacron/current/sources/anacron-2.3-mail-content-type-77108.patch tinysofa/snapshot/anacron/current/sources/anacron-2.3-mk-incl.patch tinysofa/snapshot/anacron/current/sources/anacron.init tinysofa/snapshot/anacron/current/sources/anacron_2.3.orig.tar.gz tinysofa/snapshot/anacron/current/sources/anacrontab tinysofa/snapshot/anacron/current/specs/ tinysofa/snapshot/anacron/current/specs/anacron.spec Log: - Add anacron to snapshot from 2.0. Added: tinysofa/snapshot/anacron/current/sources/anacron-2.3-gcc-3.4-compile-fix.patch =================================================================== --- tinysofa/snapshot/anacron/current/sources/anacron-2.3-gcc-3.4-compile-fix.patch 2004-07-01 15:35:19 UTC (rev 2510) +++ tinysofa/snapshot/anacron/current/sources/anacron-2.3-gcc-3.4-compile-fix.patch 2004-07-01 15:35:20 UTC (rev 2511) @@ -0,0 +1,12 @@ +diff -urN anacron-2.3/gregor.c anacron-2.3-gcc-3.4-compile-fix/gregor.c +--- anacron-2.3/gregor.c 2000-06-23 10:00:14.000000000 +1000 ++++ anacron-2.3-gcc-3.4-compile-fix/gregor.c 2004-06-17 18:09:02.296900872 +1000 +@@ -65,7 +65,7 @@ + { + int dn; + int i; +- const int isleap; /* save three calls to leap() */ ++ int isleap; /* save three calls to leap() */ + + /* Some validity checks */ + Added: tinysofa/snapshot/anacron/current/sources/anacron-2.3-mail-content-type-77108.patch =================================================================== --- tinysofa/snapshot/anacron/current/sources/anacron-2.3-mail-content-type-77108.patch 2004-07-01 15:35:19 UTC (rev 2510) +++ tinysofa/snapshot/anacron/current/sources/anacron-2.3-mail-content-type-77108.patch 2004-07-01 15:35:20 UTC (rev 2511) @@ -0,0 +1,22 @@ +diff -u anacron-2.3/runjob.c~ anacron-2.3/runjob.c +--- anacron-2.3/runjob.c~ 2003-07-10 15:25:44.000000000 +0900 ++++ anacron-2.3/runjob.c 2003-07-10 15:25:44.000000000 +0900 +@@ -35,6 +35,8 @@ + #include + #include "global.h" + ++#include ++ + static int + temp_file() + /* Open a temporary file and return its file descriptor */ +@@ -217,6 +219,9 @@ + xwrite(fd, "To: "); + xwrite(fd, username()); + xwrite(fd, "\n"); ++ xwrite(fd, "Content-Type: text/plain; charset=\""); ++ xwrite(fd, nl_langinfo(CODESET)); ++ xwrite(fd, "\"\n"); + xwrite(fd, "Subject: Anacron job '"); + xwrite(fd, jr->ident); + xwrite(fd, "'\n\n"); Added: tinysofa/snapshot/anacron/current/sources/anacron-2.3-mk-incl.patch =================================================================== --- tinysofa/snapshot/anacron/current/sources/anacron-2.3-mk-incl.patch 2004-07-01 15:35:19 UTC (rev 2510) +++ tinysofa/snapshot/anacron/current/sources/anacron-2.3-mk-incl.patch 2004-07-01 15:35:20 UTC (rev 2511) @@ -0,0 +1,12 @@ +diff -u anacron-2.3/Makefile~ anacron-2.3/Makefile +--- anacron-2.3/Makefile~ 2002-08-28 19:18:49.000000000 +0900 ++++ anacron-2.3/Makefile 2002-08-28 19:18:49.000000000 +0900 +@@ -54,7 +54,7 @@ + $(SHELL) -ec "$(CC) -MM $(ALL_CPPFLAGS) $< \ + | sed '1s/^\(.*\)\.o[ :]*/\1.d &/1' > $@" + +-include $(csources:.c=.d) ++-include $(csources:.c=.d) + + anacron: $(objects) + $(CC) $(LDFLAGS) $^ $(LOADLIBES) -o $@ Added: tinysofa/snapshot/anacron/current/sources/anacron.init =================================================================== --- tinysofa/snapshot/anacron/current/sources/anacron.init 2004-07-01 15:35:19 UTC (rev 2510) +++ tinysofa/snapshot/anacron/current/sources/anacron.init 2004-07-01 15:35:20 UTC (rev 2511) @@ -0,0 +1,61 @@ +#!/bin/sh +# Startup script for anacron +# +# chkconfig: 2345 95 05 +# description: Run cron jobs that were left out due to downtime + +# Source function library. +. /etc/rc.d/init.d/functions + +[ -f /usr/sbin/anacron ] || exit 0 + +prog="anacron" + +start() { + echo -n $"Starting $prog: " + daemon +19 anacron -s + RETVAL=$? + echo + return $RETVAL +} + +stop() { + if test "x`pidof anacron`" != x; then + echo -n $"Stopping $prog: " + killproc anacron + echo + fi + RETVAL=$? + return $RETVAL +} + +case "$1" in + start) + start + ;; + + stop) + stop + ;; + + status) + status anacron + ;; + restart) + stop + start + ;; + condrestart) + if test "x`pidof anacron`" != x; then + stop + start + fi + ;; + + *) + echo $"Usage: $0 {start|stop|restart|condrestart|status}" + exit 1 + +esac + +exit $RETVAL Property changes on: tinysofa/snapshot/anacron/current/sources/anacron.init ___________________________________________________________________ Name: svn:executable + * Added: tinysofa/snapshot/anacron/current/sources/anacron_2.3.orig.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/anacron/current/sources/anacron_2.3.orig.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/anacron/current/sources/anacrontab =================================================================== --- tinysofa/snapshot/anacron/current/sources/anacrontab 2004-07-01 15:35:19 UTC (rev 2510) +++ tinysofa/snapshot/anacron/current/sources/anacrontab 2004-07-01 15:35:20 UTC (rev 2511) @@ -0,0 +1,10 @@ +# /etc/anacrontab: configuration file for anacron + +# See anacron(8) and anacrontab(5) for details. + +SHELL=/bin/sh +PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin + +1 65 cron.daily run-parts /etc/cron.daily +7 70 cron.weekly run-parts /etc/cron.weekly +30 75 cron.monthly run-parts /etc/cron.monthly Added: tinysofa/snapshot/anacron/current/specs/anacron.spec =================================================================== --- tinysofa/snapshot/anacron/current/specs/anacron.spec 2004-07-01 15:35:19 UTC (rev 2510) +++ tinysofa/snapshot/anacron/current/specs/anacron.spec 2004-07-01 15:35:20 UTC (rev 2511) @@ -0,0 +1,252 @@ +Summary: A cron-like program that can run jobs lost during downtime. +Name: anacron +Version: 2.3 +Release: 30ts +License: GPL +Group: System Environment/Base +Source: ftp://ftp.debian.org/debian/pool/main/a/anacron/%{name}_%{version}.orig.tar.gz +Source1: anacrontab +Source2: anacron.init +Patch0: anacron-2.3-mk-incl.patch +Patch1: anacron-2.3-mail-content-type-77108.patch +Patch2: anacron-2.3-gcc-3.4-compile-fix.patch +Requires: /bin/sh +Requires: crontabs +Prereq: /sbin/chkconfig +BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot + +%description +Anacron (like `anac(h)ronistic') is a periodic command scheduler. It +executes commands at intervals specified in days. Unlike cron, it +does not assume that the system is running continuously. It can +therefore be used to control the execution of daily, weekly and +monthly jobs (or anything with a period of n days), on systems that +don't run 24 hours a day. When installed and configured properly, +Anacron will make sure that the commands are run at the specified +intervals as closely as machine-uptime permits. + +This package is pre-configured to execute the daily jobs of the Red +Hat Linux system. You should install this program if your system isn't +powered on 24 hours a day to make sure the maintenance jobs of other +Red Hat Linux packages are executed each day. + +%prep +%setup -q +%patch0 -p1 -b .incl +%patch1 -p1 -b .charset +%patch2 -p1 -b .gcc34 + +%build +make CFLAGS="$RPM_OPT_FLAGS" + +%install +mkdir -p $RPM_BUILD_ROOT/{etc/,usr/sbin/,%{_mandir}/man5,%{_mandir}/man8/} +mkdir -p $RPM_BUILD_ROOT/var/spool/anacron/ + +# +cp anacron $RPM_BUILD_ROOT/usr/sbin +cp anacron.8 $RPM_BUILD_ROOT/%{_mandir}/man8/ +cp anacrontab.5 $RPM_BUILD_ROOT/%{_mandir}/man5/ +cp %SOURCE1 $RPM_BUILD_ROOT/etc + +for i in cron.daily cron.weekly cron.monthly;do +mkdir -p $RPM_BUILD_ROOT/etc/$i/ +cat << EOF > $RPM_BUILD_ROOT/etc/$i/0anacron +#!/bin/sh +# +# anacron's cron script +# +# This script updates anacron time stamps. It is called through run-parts +# either by anacron itself or by cron. +# +# The script is called "0anacron" to assure that it will be executed +# _before_ all other scripts. + +anacron -u $i + +EOF +chmod +x $RPM_BUILD_ROOT/etc/$i/0anacron +done + +# +#for i in `find $RPM_BUILD_ROOT/ -type 'f' -perm '+a=x'`;do +# file $i|grep -q "not stripped" && strip $i +#done + +mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d/ +install -c -m755 %SOURCE2 $RPM_BUILD_ROOT/etc/rc.d/init.d/anacron + +%clean +rm -rf $RPM_BUILD_ROOT + + +%post +/sbin/chkconfig --add anacron + +%preun +if [ "$1" = "0" ]; then + service anacron stop >/dev/null 2>&1 + /sbin/chkconfig --del anacron +fi + +%postun +if [ "$1" -ge "1" ]; then + service anacron condrestart >/dev/null 2>&1 +fi + +%files +%defattr(-,root,root,0755) +%doc COPYING README +%config /etc/anacrontab +%dir /var/spool/anacron/ +%config /etc/rc.d/init.d/* +/%{_mandir}/man5/* +/%{_mandir}/man8/* +/usr/sbin/anacron +%config /etc/cron.daily/0anacron +%config /etc/cron.monthly/0anacron +%config /etc/cron.weekly/0anacron + +%changelog +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Thu Jul 10 2003 Jens Petersen - 2.3-29 +- don't require vixie-cron (#21176) [reported by Gerald Teschl] +- in init script don't remove /var/lock/subsys/anacron when stopping (#58462) +- exit init script with actual exit status (#44600) [reported by Enrico Scholz] + +* Thu Jul 10 2003 Jens Petersen - 2.3-28 +- add a Content-Type header to mails giving the charset encoding (#77108) + +* Thu Jul 10 2003 Jens Petersen - 2.3-27 +- in init script do not touch /var/lock/subsys/anacron when starting (#58462) +- require crontabs (#21176) +- update source url + +* Wed Jun 04 2003 Elliot Lee +- rebuilt + +* Wed Jan 22 2003 Tim Powers +- rebuilt + +* Wed Dec 11 2002 Tim Powers 2.3-24 +- rebuild on all arches + +* Fri Aug 23 2002 Jens Petersen 2.3-23 +- delay the start of anacron by 60min to make startup more pleasant (#68304) +- at startup run jobs serially and nice 19 to reduce load (#65870, #68304) +- spec file now in utf-8 +- dont install non-existant NEWS file +- silence make include warnings + +* Fri Jul 19 2002 Akira TAGOH 2.3-22 +- fix the stripped binary issue. + +* Mon Jul 08 2002 Bill Huang +- Update "Copyright" to "License" in spec file + +* Fri Jun 21 2002 Tim Powers +- automated rebuild + +* Thu May 23 2002 Tim Powers +- automated rebuild + +* Wed Jan 09 2002 Tim Powers +- automated rebuild + +* Sun Jun 24 2001 Elliot Lee +- Bump release + rebuild. + +* Tue Apr 3 2001 Crutcher Dunnavant +- add dependancy to vixie-cron (for /usr/bin/run-parts) + +* Tue Feb 13 2001 Tim Waugh +- killproc is a shell function and can't be passed as a parameter + (bug #27150). + +* Mon Feb 5 2001 Bernhard Rosenkraenzer +- Fix i18n in initscript ("Stopping anacron" wasn't translated) + (#26076) + +* Fri Feb 2 2001 Trond Eivind Glomsr?d +- i18nize initscript + +* Thu Dec 7 2000 Crutcher Dunnavant +- rebuild in rebuild cycle. + +* Mon Oct 30 2000 Matt Wilson +- touch /var/lock/subsys/anacron to prevent excess startage during + init level change + +* Wed Aug 30 2000 Bernhard Rosenkraenzer +- Shut down earlier to prevent NFS mounted /usr filesystems from causing + problems (Bug #16257) + +* Fri Aug 4 2000 Bernhard Rosenkraenzer +- Start it later so services some cron scripts may depend on are running + (Bug #15335) + +* Thu Aug 3 2000 Bernhard Rosenkraenzer +- Fix up initscript (Bug #15123 and an unreported bug) + +* Sat Jul 15 2000 Bill Nottingham +- move initscript back + +* Wed Jul 12 2000 Prospector +- automatic rebuild + +* Mon Jul 10 2000 Bernhard Rosenkraenzer +- Fix up initscripts (Bug #13625) + +* Tue Jul 4 2000 Matt Wilson +- Prereq: /sbin/chkconfig + +* Mon Jun 26 2000 Preston Brown +- move initscript to /etc/init.d, fix up post/preun/postun scripts. + +* Sun Jun 26 2000 Bernhard Rosenkraenzer +- 2.3 + +* Sun Jun 18 2000 Matt Wilson +- use %%{_mandir} + +* Fri Mar 03 2000 Tim Powers +- fixed startup script so that it doesn't put stuff in /var/lock/subsys. + Complains since anacronda turns itself off when it is run, and the file in + /var/lock/subsys isn't removed. + +* Mon Feb 28 2000 Tim Powers +- fixed startup script, now it actually stops, gives status and restarts. + Fixes bug #9835 + +* Mon Feb 7 2000 Bill Nottingham +- handle compressed manpages + +* Fri Feb 4 2000 Bernhard Rosenkraenzer +- rebuild to get compressed man pages +- mark /etc/cron.daily/... as config files + +* Wed Feb 02 2000 Cristian Gafton +- fix annoying defines +- rebuild to update description and group + +* Thu Jan 6 2000 Bernhard Rosenkr?nzer +- initial Red Hat package + +* Wed Dec 29 1999 Chmouel Boudjnah +- Remove cron.hourly check (unusefull). + +* Wed Nov 10 1999 Chmouel Boudjnah +- 2.1 from debian. +- Fix typo in initscripts. + +* Thu Jul 22 1999 Chmouel Boudjnah +- Fix wrong entries in anacrontab. +- Add a /etc/rc.sysinit/ script + +* Tue Apr 27 1999 Chmouel Boudjnah +- Fix bug with /var/spool/anacron/ + +* Sat Apr 10 1999 Chmouel Boudjnah +- First version mainly inspired from the Debian package. From svn at tinysofa.org Thu Jul 1 15:35:26 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:35:26 +1000 (EST) Subject: [tinysofa-svn] r2514 - in tinysofa/snapshot: . apr-util apr-util/current apr-util/current/sources apr-util/current/specs Message-ID: <20040701153526.412E44E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:35:26 +1000 (Fri, 02 Jul 2004) New Revision: 2514 Added: tinysofa/snapshot/apr-util/ tinysofa/snapshot/apr-util/current/ tinysofa/snapshot/apr-util/current/sources/ tinysofa/snapshot/apr-util/current/sources/apr-util-0.9.3-config.patch tinysofa/snapshot/apr-util/current/sources/apr-util-0.9.3-deplibs.patch tinysofa/snapshot/apr-util/current/sources/apr-util-0.9.4-db4.patch tinysofa/snapshot/apr-util/current/sources/apr-util-0.9.4-gcc34.patch tinysofa/snapshot/apr-util/current/sources/apr-util-0.9.4-sdbm.patch tinysofa/snapshot/apr-util/current/sources/apr-util-0.9.4-sdbmnames.patch tinysofa/snapshot/apr-util/current/sources/apr-util-0.9.4-shapass.patch tinysofa/snapshot/apr-util/current/sources/apr-util-0.9.4-xlate.patch tinysofa/snapshot/apr-util/current/sources/apr-util-0.9.4.tar.gz tinysofa/snapshot/apr-util/current/specs/ tinysofa/snapshot/apr-util/current/specs/apr-util.spec Log: - Add apr-util to snapshot from 2.0. Added: tinysofa/snapshot/apr-util/current/sources/apr-util-0.9.3-config.patch =================================================================== --- tinysofa/snapshot/apr-util/current/sources/apr-util-0.9.3-config.patch 2004-07-01 15:35:24 UTC (rev 2513) +++ tinysofa/snapshot/apr-util/current/sources/apr-util-0.9.3-config.patch 2004-07-01 15:35:26 UTC (rev 2514) @@ -0,0 +1,130 @@ + +Remove installed/not-installed detection code. + +--- apr-util-0.9.4/apu-config.in.config ++++ apr-util-0.9.4/apu-config.in +@@ -70,8 +70,6 @@ + + APRUTIL_LIBNAME="@APRUTIL_LIBNAME@" + +-APU_SOURCE_DIR="@abs_srcdir@" +-APU_BUILD_DIR="@abs_builddir@" + APR_XML_EXPAT_OLD="@APR_XML_EXPAT_OLD@" + APU_DB_VERSION="@apu_db_version@" + +@@ -111,42 +109,7 @@ + exit 1 + fi + +-thisdir="`dirname $0`" +-thisdir="`cd $thisdir && pwd`" +-if test -d $bindir; then +- tmpbindir="`cd $bindir && pwd`" +-else +- tmpbindir="" +-fi +-# If we have the realpath program, use it to resolve symlinks. +-# Otherwise, being in a symlinked dir may result in incorrect output. +-if test -x "`which realpath 2>/dev/null`"; then +- thisdir="`realpath $thisdir`" +- if test -d "$APU_SOURCE_DIR"; then +- APU_SOURCE_DIR="`realpath $APU_SOURCE_DIR`" +- fi +- if test -n "$tmpbindir"; then +- tmpbindir="`realpath $tmpbindir`" +- fi +-fi +-if test "$tmpbindir" = "$thisdir"; then +- location=installed +-elif test "$APU_SOURCE_DIR" = "$thisdir"; then +- location=source +-else +- location=build +-fi +- +-if test "$location" = "installed"; then +- LA_FILE="$libdir/lib${APRUTIL_LIBNAME}.la" +- +- LIBS=`echo "$LIBS" | sed -e "s $APU_BUILD_DIR/xml/expat $prefix g" -e "s $prefix/lib/libexpat.la -lexpat g"` +- LDFLAGS=`echo "$LDFLAGS" | sed -e "s $APU_BUILD_DIR/xml/expat $prefix g"` +- INCLUDES=`echo "$INCLUDES" | sed -e "s $APU_BUILD_DIR/xml/expat $prefix g" -e "s -I$prefix/lib g"` +-else +- LA_FILE="$thisdir/lib${APRUTIL_LIBNAME}.la" +-fi +- ++LA_FILE="${libdir}/lib${APRUTIL_LIBNAME}.la" + flags="" + + while test $# -gt 0; do +@@ -173,32 +136,18 @@ + flags="$flags $LIBS" + ;; + --includedir) +- if test "$location" = "installed"; then +- flags="$includedir" +- elif test "$location" = "source"; then +- flags="$APU_SOURCE_DIR/include" +- else +- # this is for VPATH builds +- flags="$thisdir/include $APU_SOURCE_DIR/include" +- fi +- echo $flags ++ echo $includedir + exit 0 + ;; + --includes) +- if test "$location" = "installed"; then +- flags="$flags -I$includedir $INCLUDES" +- elif test "$location" = "source"; then +- flags="$flags -I$APU_SOURCE_DIR/include $INCLUDES" +- else +- # this is for VPATH builds +- flags="$flags -I$thisdir/include -I$APU_SOURCE_DIR/include $INCLUDES" +- fi ++ flags="$flags -I$includedir $INCLUDES" + ;; + --ldflags) + flags="$flags $LDFLAGS" + ;; + --srcdir) +- echo $APU_SOURCE_DIR ++ # Lie - nobody should care about this. ++ echo ${libdir}/apr + exit 0 + ;; + --version) +@@ -206,31 +155,13 @@ + exit 0 + ;; + --link-ld) +- if test "$location" = "installed"; then +- ### avoid using -L if libdir is a "standard" location like /usr/lib +- flags="$flags -L$libdir -l$APRUTIL_LIBNAME" +- else +- flags="$flags -L$thisdir -l$APRUTIL_LIBNAME" +- fi ++ flags="$flags -l$APRUTIL_LIBNAME" + ;; + --link-libtool) +- # If the LA_FILE exists where we think it should be, use it. If we're +- # installed and the LA_FILE does not exist, assume to use -L/-l +- # (the LA_FILE may not have been installed). If we're building ourselves, +- # we'll assume that at some point the .la file be created. +- if test -f "$LA_FILE"; then +- flags="$flags $LA_FILE" +- elif test "$location" = "installed"; then +- ### avoid using -L if libdir is a "standard" location like /usr/lib +- flags="$flags -L$libdir -l$APRUTIL_LIBNAME" +- else +- flags="$flags $LA_FILE" +- fi ++ flags="$flags $LA_FILE" + ;; + --apu-la-file) +- if test -f "$LA_FILE"; then +- flags="$flags $LA_FILE" +- fi ++ flags="$flags $LA_FILE" + ;; + --old-expat) + if test ! -n "$APR_XML_EXPAT_OLD"; then Added: tinysofa/snapshot/apr-util/current/sources/apr-util-0.9.3-deplibs.patch =================================================================== --- tinysofa/snapshot/apr-util/current/sources/apr-util-0.9.3-deplibs.patch 2004-07-01 15:35:24 UTC (rev 2513) +++ tinysofa/snapshot/apr-util/current/sources/apr-util-0.9.3-deplibs.patch 2004-07-01 15:35:26 UTC (rev 2514) @@ -0,0 +1,14 @@ + +Link libaprutil against its dependencies. + +--- apr-util-0.9.3/Makefile.in.deplibs 2003-02-17 00:16:43.000000000 +0000 ++++ apr-util-0.9.3/Makefile.in 2003-04-29 09:08:41.000000000 +0100 +@@ -79,7 +78,7 @@ + + $(TARGET_LIB): + @objects="`find $(SUBDIRS) -name expat -prune -o -name 'gen_uri_delims. at so_ext@' -prune -o -name '*. at so_ext@' -print`"; \ +- tmpcmd="$(LINK) @lib_target@ @EXTRA_OS_LINK@"; \ ++ tmpcmd="$(LINK) $(APRUTIL_LDFLAGS) @lib_target@ $(APRUTIL_LIBS)"; \ + echo $$tmpcmd; \ + $$tmpcmd && touch $@ + Added: tinysofa/snapshot/apr-util/current/sources/apr-util-0.9.4-db4.patch =================================================================== --- tinysofa/snapshot/apr-util/current/sources/apr-util-0.9.4-db4.patch 2004-07-01 15:35:24 UTC (rev 2513) +++ tinysofa/snapshot/apr-util/current/sources/apr-util-0.9.4-db4.patch 2004-07-01 15:35:26 UTC (rev 2514) @@ -0,0 +1,177 @@ + +DB library detection fixes, from HEAD. + +--- apr-util-0.9.4/build/dbm.m4.db4 ++++ apr-util-0.9.4/build/dbm.m4 +@@ -48,6 +48,7 @@ + + # Save the original values of the flags we tweak. + apu_check_lib_save_libs="$LIBS" ++ apu_check_lib_save_ldflags="$LDFLAGS" + apu_check_lib_save_cppflags="$CPPFLAGS" + + # The variable `found' is the prefix under which we've found +@@ -69,15 +70,21 @@ + description="$header and $lib" + ;; + * ) +- LDFLAGS="$LDFLAGS -L$bdb_place/lib" +- CPPFLAGS="$CPPFLAGS -I$bdb_place/include" ++ if test -d $bdb_place; then ++ LDFLAGS="$LDFLAGS -L$bdb_place/lib" ++ CPPFLAGS="$CPPFLAGS -I$bdb_place/include" ++ else ++ AC_MSG_CHECKING([for Berkeley DB $bdb_version in $bdb_place]) ++ AC_MSG_RESULT([directory not found]) ++ continue ++ fi + description="$bdb_place" + ;; + esac + + # Since there is no AC_MSG_NOTICE in autoconf 2.13, we use this + # trick to display a message instead. +- AC_MSG_CHECKING([checking for Berkeley DB $bdb_version in $description]) ++ AC_MSG_CHECKING([for Berkeley DB $bdb_version in $description]) + AC_MSG_RESULT() + + for bdb_libname in $bdb_default_search_lib_names; do +@@ -99,7 +106,7 @@ + | sed -e 's/[^a-zA-Z0-9_]/_/g'`" + changequote([,]) + +- AC_MSG_CHECKING([for $bdb_libname]) ++ AC_MSG_CHECKING([for -l$bdb_libname]) + dnl We can't use AC_CACHE_CHECK here, because that won't print out + dnl the value of the computed cache variable properly. + AC_CACHE_VAL($cache_id, +@@ -350,7 +357,7 @@ + AC_DEFUN(APU_CHECK_DB4, [ + places=$1 + if test -z "$places"; then +- places="std /usr/local /usr/local/BerkeleyDB.4.0" ++ places="std /usr/local /usr/local/BerkeleyDB.4.0 /boot/home/config" + fi + APU_CHECK_BERKELEY_DB("4", "0", "-1", + "$places", +@@ -371,7 +378,7 @@ + AC_DEFUN(APU_CHECK_DB41, [ + places=$1 + if test -z "$places"; then +- places="std /usr/local/BerkeleyDB.4.1" ++ places="std /usr/local/BerkeleyDB.4.1 /boot/home/config" + fi + APU_CHECK_BERKELEY_DB("4", "1", "-1", + "$places", +@@ -384,6 +391,27 @@ + ]) + + ++dnl ++dnl APU_CHECK_DB42: is DB4.2 present? ++dnl ++dnl if present: sets apu_db_header, apu_db_lib, and apu_db_version ++dnl ++AC_DEFUN(APU_CHECK_DB42, [ ++ places=$1 ++ if test -z "$places"; then ++ places="std /usr/local/BerkeleyDB.4.2 /boot/home/config" ++ fi ++ APU_CHECK_BERKELEY_DB("4", "2", "-1", ++ "$places", ++ "db4/db.h db.h", ++ "db-4.2 db4 db" ++ ) ++ if test "$apu_have_db" = "1"; then ++ apu_db_version=4 ++ fi ++]) ++ ++ + AC_DEFUN(APU_CHECK_DB, [ + requested=$1 + check_places=$2 +@@ -431,6 +459,12 @@ + AC_MSG_ERROR(Berkeley db4 not found) + fi + ;; ++ db42) ++ APU_CHECK_DB42("$check_places") ++ if test "$apu_db_version" != "4"; then ++ AC_MSG_ERROR(Berkeley db4 not found) ++ fi ++ ;; + default) + APU_CHECK_DB_ALL("$check_places") + ;; +@@ -438,22 +472,25 @@ + ]) + + dnl +-dnl APU_CHECK_DB_ALL: Try all Berkeley DB versions, from 4.1 to 1. ++dnl APU_CHECK_DB_ALL: Try all Berkeley DB versions, from 4.2 to 1. + dnl + AC_DEFUN(APU_CHECK_DB_ALL, [ + all_places=$1 +- +- APU_CHECK_DB41("$all_places") ++ ++ APU_CHECK_DB42("$all_places") + if test "$apu_db_version" != "4"; then +- APU_CHECK_DB4("$all_places") ++ APU_CHECK_DB41("$all_places") + if test "$apu_db_version" != "4"; then +- APU_CHECK_DB3("$all_places") +- if test "$apu_db_version" != "3"; then +- APU_CHECK_DB2("$all_places") +- if test "$apu_db_version" != "2"; then +- APU_CHECK_DB1("$all_places") +- if test "$apu_db_version" != "1"; then +- APU_CHECK_DB185("$all_places") ++ APU_CHECK_DB4("$all_places") ++ if test "$apu_db_version" != "4"; then ++ APU_CHECK_DB3("$all_places") ++ if test "$apu_db_version" != "3"; then ++ APU_CHECK_DB2("$all_places") ++ if test "$apu_db_version" != "2"; then ++ APU_CHECK_DB1("$all_places") ++ if test "$apu_db_version" != "1"; then ++ APU_CHECK_DB185("$all_places") ++ fi + fi + fi + fi +@@ -487,11 +524,11 @@ + + AC_ARG_WITH(dbm, [ + --with-dbm=DBM choose the DBM type to use. +- DBM={sdbm,gdbm,ndbm,db,db1,db185,db2,db3,db4} ++ DBM={sdbm,gdbm,ndbm,db,db1,db185,db2,db3,db4,db41,db42} + ], [ + if test "$withval" = "yes"; then + AC_MSG_ERROR([--with-dbm needs to specify a DBM type to use. +- One of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4]) ++ One of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42]) + fi + requested="$withval" + ], [ +@@ -665,6 +702,10 @@ + apu_use_db=1 + apu_default_dbm=db4 + ;; ++ db42) ++ apu_use_db=1 ++ apu_default_dbm=db4 ++ ;; + default) + dnl ### use more sophisticated DBMs for the default? + apu_default_dbm="sdbm (default)" +@@ -672,7 +713,7 @@ + ;; + *) + AC_MSG_ERROR([--with-dbm=$look_for is an unknown DBM type. +- Use one of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4]) ++ Use one of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42]) + ;; + esac + Added: tinysofa/snapshot/apr-util/current/sources/apr-util-0.9.4-gcc34.patch =================================================================== --- tinysofa/snapshot/apr-util/current/sources/apr-util-0.9.4-gcc34.patch 2004-07-01 15:35:24 UTC (rev 2513) +++ tinysofa/snapshot/apr-util/current/sources/apr-util-0.9.4-gcc34.patch 2004-07-01 15:35:26 UTC (rev 2514) @@ -0,0 +1,38 @@ + +Fix code which gives undefined behaviour by the C99 standard +(section 6.3.2.3 para 8), and generates a warning for every +use of the macro with gcc 3.4. + +--- apr-util-0.9.4/include/apr_optional.h.gcc34 ++++ apr-util-0.9.4/include/apr_optional.h +@@ -109,9 +109,10 @@ + * confusingly but correctly, the function itself can be static! + * @param name The name of the function + */ +-#define APR_REGISTER_OPTIONAL_FN(name) \ +- (((void (*)(const char *, APR_OPTIONAL_FN_TYPE(name) *)) \ +- &apr_dynamic_fn_register)(#name,name)) ++#define APR_REGISTER_OPTIONAL_FN(name) do { \ ++ APR_OPTIONAL_FN_TYPE(name) *apu__opt = name; \ ++ apr_dynamic_fn_register(#name,(apr_opt_fn_t *)apu__opt); \ ++} while (0) + + /** @internal + * Private function! DO NOT USE! +--- apr-util-0.9.4/include/apr_optional_hooks.h.gcc34 ++++ apr-util-0.9.4/include/apr_optional_hooks.h +@@ -99,10 +99,10 @@ + * @param nOrder an integer determining order before honouring aszPre and aszSucc (for example HOOK_MIDDLE) + */ + +-#define APR_OPTIONAL_HOOK(ns,name,pfn,aszPre,aszSucc,nOrder) \ +- ((void (APR_THREAD_FUNC *)(const char *,ns##_HOOK_##name##_t *,const char * const *, \ +- const char * const *,int))&apr_optional_hook_add)(#name,pfn,aszPre, \ +- aszSucc, nOrder) ++#define APR_OPTIONAL_HOOK(ns,name,pfn,aszPre,aszSucc,nOrder) do { \ ++ ns##_HOOK_##name##_t *apu__hook = pfn; \ ++ apr_optional_hook_add(#name,(void (*)(void))apu__hook,aszPre, aszSucc, nOrder); \ ++} while (0) + + /** + * @internal Added: tinysofa/snapshot/apr-util/current/sources/apr-util-0.9.4-sdbm.patch =================================================================== --- tinysofa/snapshot/apr-util/current/sources/apr-util-0.9.4-sdbm.patch 2004-07-01 15:35:24 UTC (rev 2513) +++ tinysofa/snapshot/apr-util/current/sources/apr-util-0.9.4-sdbm.patch 2004-07-01 15:35:26 UTC (rev 2514) @@ -0,0 +1,44 @@ + +Fix apr_dbm_exists() on an SDBM database on LP64 bigendian. + +--- apr-util-0.9.4/dbm/apr_dbm_sdbm.c.sdbm ++++ apr-util-0.9.4/dbm/apr_dbm_sdbm.c +@@ -218,11 +218,13 @@ + static int vt_sdbm_exists(apr_dbm_t *dbm, apr_datum_t key) + { + int exists; +- apr_sdbm_datum_t *ckey = (apr_sdbm_datum_t *)&key; ++ cvt_datum_t ckey; ++ ++ CONVERT_DATUM(ckey, &key); + + { + apr_sdbm_datum_t value; +- if (apr_sdbm_fetch(dbm->file, &value, *ckey) != APR_SUCCESS) { ++ if (apr_sdbm_fetch(dbm->file, &value, ckey) != APR_SUCCESS) { + exists = 0; + } + else +--- apr-util-0.9.4/test/testdbm.c.sdbm ++++ apr-util-0.9.4/test/testdbm.c +@@ -346,7 +346,7 @@ + } + } + fputs("OK\n", stderr); +- fputs("Testing retrieval: ", stderr); ++ fputs("Testing existance/retrieval: ", stderr); + for (i = 0; i < 10; i++) { + int j; + char c, keydata[10]; +@@ -355,6 +355,11 @@ + } + key.dptr = keydata; + key.dsize = 10; ++ if (!apr_dbm_exists(db, key)) { ++ prdatum(stderr, key); ++ fprintf(stderr, " does not exist!\n"); ++ exit(1); ++ } + rv = apr_dbm_fetch(db, key, &val); + if (rv != APR_SUCCESS || val.dsize != 10 || + (strncmp(val.dptr, valdata, 10) != 0) ) { Added: tinysofa/snapshot/apr-util/current/sources/apr-util-0.9.4-sdbmnames.patch =================================================================== --- tinysofa/snapshot/apr-util/current/sources/apr-util-0.9.4-sdbmnames.patch 2004-07-01 15:35:24 UTC (rev 2513) +++ tinysofa/snapshot/apr-util/current/sources/apr-util-0.9.4-sdbmnames.patch 2004-07-01 15:35:26 UTC (rev 2514) @@ -0,0 +1,38 @@ +--- apr-util-0.9.4/dbm/sdbm/sdbm_pair.h.sdbmnames ++++ apr-util-0.9.4/dbm/sdbm/sdbm_pair.h +@@ -56,14 +56,14 @@ + #define SDBM_PAIR_H + + /* Mini EMBED (pair.c) */ +-#define chkpage sdbm__chkpage +-#define delpair sdbm__delpair +-#define duppair sdbm__duppair +-#define fitpair sdbm__fitpair +-#define getnkey sdbm__getnkey +-#define getpair sdbm__getpair +-#define putpair sdbm__putpair +-#define splpage sdbm__splpage ++#define chkpage apu__sdbm_chkpage ++#define delpair apu__sdbm_delpair ++#define duppair apu__sdbm_duppair ++#define fitpair apu__sdbm_fitpair ++#define getnkey apu__sdbm_getnkey ++#define getpair apu__sdbm_getpair ++#define putpair apu__sdbm_putpair ++#define splpage apu__sdbm_splpage + + int fitpair(char *, int); + void putpair(char *, apr_sdbm_datum_t, apr_sdbm_datum_t); +--- apr-util-0.9.4/dbm/sdbm/sdbm_private.h.sdbmnames ++++ apr-util-0.9.4/dbm/sdbm/sdbm_private.h +@@ -102,6 +102,10 @@ + int lckcnt; /* number of calls to sdbm_lock */ + }; + ++ ++#define sdbm_hash apu__sdbm_hash ++#define sdbm_nullitem apu__sdbm_nullitem ++ + extern const apr_sdbm_datum_t sdbm_nullitem; + + long sdbm_hash(const char *str, int len); Added: tinysofa/snapshot/apr-util/current/sources/apr-util-0.9.4-shapass.patch =================================================================== --- tinysofa/snapshot/apr-util/current/sources/apr-util-0.9.4-shapass.patch 2004-07-01 15:35:24 UTC (rev 2513) +++ tinysofa/snapshot/apr-util/current/sources/apr-util-0.9.4-shapass.patch 2004-07-01 15:35:26 UTC (rev 2514) @@ -0,0 +1,23 @@ + +Fix use of SHA1 passwords. + +--- apr-util-0.9.4/crypto/apr_md5.c.shapass ++++ apr-util-0.9.4/crypto/apr_md5.c +@@ -97,6 +97,7 @@ + */ + #include "apr_strings.h" + #include "apr_md5.h" ++#include "apr_sha1.h" /* needed by apr_password_validate */ + #include "apr_lib.h" + #include "apu_config.h" + +@@ -722,6 +723,9 @@ + */ + apr_md5_encode(passwd, hash, sample, sizeof(sample)); + } ++ else if (!strncmp(hash, APR_SHA1PW_ID, APR_SHA1PW_IDLEN)) { ++ apr_sha1_base64(passwd, strlen(passwd), sample); ++ } + else { + /* + * It's not our algorithm, so feed it to crypt() if possible. Added: tinysofa/snapshot/apr-util/current/sources/apr-util-0.9.4-xlate.patch =================================================================== --- tinysofa/snapshot/apr-util/current/sources/apr-util-0.9.4-xlate.patch 2004-07-01 15:35:24 UTC (rev 2513) +++ tinysofa/snapshot/apr-util/current/sources/apr-util-0.9.4-xlate.patch 2004-07-01 15:35:26 UTC (rev 2514) @@ -0,0 +1,218 @@ +--- apr-util-0.9.4/test/Makefile.in.xlate ++++ apr-util-0.9.4/test/Makefile.in +@@ -41,6 +41,11 @@ + testxml: $(testxml_OBJECTS) $(testxml_LDADD) + $(LINK) $(APRUTIL_LDFLAGS) $(testxml_OBJECTS) $(testxml_LDADD) $(PROGRAM_DEPENDENCIES) + ++testxlate_OBJECTS = testxlate.lo ++testxlate_LDADD = $(TARGET_LIB_PATH) ++testxlate: $(testxlate_OBJECTS) $(testxlate_LDADD) ++ $(LINK) $(APRUTIL_LDFLAGS) $(testxlate_OBJECTS) $(testxlate_LDADD) $(PROGRAM_DEPENDENCIES) ++ + testmd4_OBJECTS = testmd4.lo + testmd4_LDADD = $(TARGET_LIB_PATH) + testmd4: $(testmd4_OBJECTS) $(testmd4_LDADD) +--- apr-util-0.9.4/test/testxlate.c.xlate ++++ apr-util-0.9.4/test/testxlate.c +@@ -61,11 +61,16 @@ + #include "apr_strings.h" + #include "apr_xlate.h" + ++/* "Edelwei" + Unicode character */ + static const char test_utf8[] = "Edelwei\xc3\x9f"; + static const char test_utf7[] = "Edelwei+AN8-"; + static const char test_latin1[] = "Edelwei\xdf"; + static const char test_latin2[] = "Edelwei\xdf"; + ++#define Z "\0" ++static const char test_utf16be[] = Z "E" Z "d" Z "e" Z "l" Z "w" Z "e" Z "i" Z "\xdf"; ++#undef Z ++ + + static int check_status (apr_status_t status, const char *msg) + { +@@ -80,12 +85,12 @@ + } + + static int test_conversion (apr_xlate_t *convset, +- const char *inbuf, +- const char *expected) ++ const char *inbuf, apr_size_t inlen, ++ const char *expected, apr_size_t explen) + { +- static char buf[1024]; ++ static unsigned char buf[1024]; + int retcode = 0; +- apr_size_t inbytes_left = strlen(inbuf) + 1; ++ apr_size_t inbytes_left = inlen; + apr_size_t outbytes_left = sizeof(buf) - 1; + apr_status_t status = apr_xlate_conv_buffer(convset, + inbuf, +@@ -93,19 +98,31 @@ + buf, + &outbytes_left); + retcode |= check_status(status, "apr_xlate_conv_buffer"); +- if ((!status || APR_STATUS_IS_INCOMPLETE(status)) +- && strcmp(buf, expected)) ++ if (status) + { +- printf("ERROR: expected: '%s'\n actual: '%s'" +- "\n inbytes_left: %"APR_SIZE_T_FMT"\n", +- expected, buf, inbytes_left); +- retcode |= 1; ++ printf("ERROR: conv_buffer failed, %d\n", status); ++ retcode = 1; ++ } ++ else if (inbytes_left != 0) { ++ printf("ERROR: %" APR_SIZE_T_FMT " remaining input bytes.\n", ++ inbytes_left); ++ retcode = 1; ++ } ++ else if (memcmp(buf, expected, explen)) { ++ printf("ERROR: expected: '%02x %02x %02x %02x': %s\n" ++ " actual: '%02x %02x %02x %02x': %s\n", ++ expected[0], expected[1], expected[2], expected[3], expected, ++ buf[0], buf[1], buf[2], buf[3], buf); ++ retcode = 1; + } + return retcode; + } + +-static int one_test (const char *cs1, const char *cs2, +- const char *str1, const char *str2, ++#define one_test(a, b, c, d, p) do_test(a, b, c, sizeof(c) - 1, d, sizeof(d) - 1, p) ++ ++static int do_test (const char *cs1, const char *cs2, ++ const char *str1, apr_size_t str1len, ++ const char *str2, apr_size_t str2len, + apr_pool_t *pool) + { + apr_xlate_t *convset; +@@ -113,7 +130,7 @@ + int retcode = check_status(apr_xlate_open(&convset, cs2, cs1, pool), msg); + if (!retcode) + { +- retcode |= test_conversion(convset, str1, str2); ++ retcode |= test_conversion(convset, str1, str1len, str2, str2len); + retcode |= check_status(apr_xlate_close(convset), "apr_xlate_close"); + } + printf("%s: %s -> %s\n", (retcode ? "FAIL" : "PASS"), cs1, cs2); +@@ -142,14 +159,20 @@ + retcode |= one_test("UTF-8", "ISO-8859-1", test_utf8, test_latin1, pool); + retcode |= one_test("ISO-8859-1", "UTF-8", test_latin1, test_utf8, pool); + +- /* 3. ISO-8859-1 <-> ISO-8859-2, identity */ ++ /* 3. UTF-16BE <-> ISO-8859-1 */ ++ retcode |= one_test("UTF-16BE", "ISO-8859-1", test_utf16be, test_latin1, pool); ++ retcode |= one_test("ISO-8859-1", "UTF-16BE", test_latin1, test_utf16be, pool); ++ ++ /* 4. ISO-8859-1 <-> ISO-8859-2, identity */ + retcode |= one_test("ISO-8859-1", "ISO-8859-2", + test_latin1, test_latin2, pool); + retcode |= one_test("ISO-8859-2", "ISO-8859-1", + test_latin2, test_latin1, pool); + +- /* 4. Transformation using charset aliases */ ++ /* 5. Transformation using charset aliases */ ++#if 0 /* fails; glibc iconv bug? */ + retcode |= one_test("UTF-8", "UTF-7", test_utf8, test_utf7, pool); ++#endif + retcode |= one_test("UTF-7", "UTF-8", test_utf7, test_utf8, pool); + + return retcode; +--- apr-util-0.9.4/xlate/xlate.c.xlate ++++ apr-util-0.9.4/xlate/xlate.c +@@ -140,77 +140,6 @@ + return APR_SUCCESS; + } + +-#if APU_HAVE_ICONV +-static void check_sbcs(apr_xlate_t *convset) +-{ +- char inbuf[256], outbuf[256]; +- char *inbufptr = inbuf; +- char *outbufptr = outbuf; +- apr_size_t inbytes_left, outbytes_left; +- int i; +- apr_size_t translated; +- +- for (i = 0; i < sizeof(inbuf); i++) { +- inbuf[i] = i; +- } +- +- inbytes_left = outbytes_left = sizeof(inbuf); +- translated = iconv(convset->ich, (ICONV_INBUF_TYPE)&inbufptr, +- &inbytes_left, &outbufptr, &outbytes_left); +- +- if (translated != (apr_size_t)-1 +- && inbytes_left == 0 +- && outbytes_left == 0) { +- /* hurray... this is simple translation; save the table, +- * close the iconv descriptor +- */ +- +- convset->sbcs_table = apr_palloc(convset->pool, sizeof(outbuf)); +- memcpy(convset->sbcs_table, outbuf, sizeof(outbuf)); +- iconv_close(convset->ich); +- convset->ich = (iconv_t)-1; +- +- /* TODO: add the table to the cache */ +- } +-} +-#elif APU_HAVE_APR_ICONV +-static void check_sbcs(apr_xlate_t *convset) +-{ +- char inbuf[256], outbuf[256]; +- char *inbufptr = inbuf; +- char *outbufptr = outbuf; +- apr_size_t inbytes_left, outbytes_left; +- int i; +- apr_size_t translated; +- apr_status_t rv; +- +- for (i = 0; i < sizeof(inbuf); i++) { +- inbuf[i] = i; +- } +- +- inbytes_left = outbytes_left = sizeof(inbuf); +- rv = apr_iconv(convset->ich, (ICONV_INBUF_TYPE)&inbufptr, +- &inbytes_left, &outbufptr, &outbytes_left, +- &translated); +- +- if ((rv == APR_SUCCESS) +- && (translated != (apr_size_t)-1) +- && inbytes_left == 0 +- && outbytes_left == 0) { +- /* hurray... this is simple translation; save the table, +- * close the iconv descriptor +- */ +- +- convset->sbcs_table = apr_palloc(convset->pool, sizeof(outbuf)); +- memcpy(convset->sbcs_table, outbuf, sizeof(outbuf)); +- apr_iconv_close(convset->ich, convset->pool); +- convset->ich = (apr_iconv_t)-1; +- +- /* TODO: add the table to the cache */ +- } +-} +-#endif /* APU_HAVE_APR_ICONV */ +- + static void make_identity_table(apr_xlate_t *convset) + { + int i; +@@ -267,7 +196,6 @@ + return rv; + } + found = 1; +- check_sbcs(new); + } else + new->ich = (apr_iconv_t)-1; + +@@ -280,7 +208,6 @@ + return rv ? rv : APR_EINVAL; + } + found = 1; +- check_sbcs(new); + } else + new->ich = (iconv_t)-1; + #endif /* APU_HAVE_ICONV */ Added: tinysofa/snapshot/apr-util/current/sources/apr-util-0.9.4.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/apr-util/current/sources/apr-util-0.9.4.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/apr-util/current/specs/apr-util.spec =================================================================== --- tinysofa/snapshot/apr-util/current/specs/apr-util.spec 2004-07-01 15:35:24 UTC (rev 2513) +++ tinysofa/snapshot/apr-util/current/specs/apr-util.spec 2004-07-01 15:35:26 UTC (rev 2514) @@ -0,0 +1,183 @@ + +%define apuver 0 + +Summary: Apache Portable Runtime Utility library +Name: apr-util +Version: 0.9.4 +Release: 16ts +License: Apache Software License +Group: System Environment/Libraries +URL: http://apr.apache.org/ +Source0: %{name}-%{version}.tar.gz +Patch0: apr-util-0.9.3-deplibs.patch +Patch1: apr-util-0.9.3-config.patch +Patch2: apr-util-0.9.4-db4.patch +Patch3: apr-util-0.9.4-gcc34.patch +Patch4: apr-util-0.9.4-sdbm.patch +Patch5: apr-util-0.9.4-sdbmnames.patch +Patch6: apr-util-0.9.4-xlate.patch +Patch7: apr-util-0.9.4-shapass.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot +BuildPrereq: autoconf, libtool, doxygen, apr-devel >= 0:0.9.4-1 +BuildPrereq: openldap-devel, db4-devel, expat-devel +Conflicts: subversion < 0.20.1-2 + +%description +The mission of the Apache Portable Runtime (APR) is to provide a +free library of C data structures and routines. This library +contains additional utility interfaces for APR; including support +for XML, LDAP, database interfaces, URI parsing and more. + +%package devel +Group: Development/Libraries +Summary: APR utility library development kit +Requires: apr-util = %{version}-%{release}, apr-devel +Requires: openldap-devel, db4-devel, expat-devel +Conflicts: subversion-devel < 0.20.1-2 + +%description devel +This package provides the support files which can be used to +build applications using the APR utility library. The mission +of the Apache Portable Runtime (APR) is to provide a free +library of C data structures and routines. + +%prep +%setup -q +%patch0 -p1 -b .deplibs +%patch1 -p1 -b .config +%patch2 -p1 -b .db4 +%patch3 -p1 -b .gcc34 +%patch4 -p1 -b .sdbm +%patch5 -p1 -b .sdbmnames +%patch6 -p1 -b .xlate +%patch7 -p1 -b .shapass + +%build +autoheader && autoconf +%configure --with-apr=%{_prefix} \ + --includedir=%{_includedir}/apr-%{apuver} \ + --with-ldap --without-gdbm +make %{?_smp_mflags} && make dox + +%install +rm -rf $RPM_BUILD_ROOT +make install DESTDIR=$RPM_BUILD_ROOT + +# Documentation +mv docs/dox/html html + +# Unpackaged files +rm -f $RPM_BUILD_ROOT%{_libdir}/aprutil.exp + +%check +# Run the less verbose tests +%define tests testmd5 testrmm teststrmatch testuri testxlate +cd test; make %{?_smp_mflags} %{tests} testdbm +for t in %{tests}; do ./${t} || exit 1; done +./testdbm auto tsdbm +./testdbm -tDB auto tbdb.db + +%clean +rm -rf $RPM_BUILD_ROOT + +%post -p /sbin/ldconfig + +%postun -p /sbin/ldconfig + +%files +%defattr(-,root,root,-) +%doc CHANGES LICENSE +%{_libdir}/libaprutil-%{apuver}.so.* + +%files devel +%defattr(-,root,root,-) +%{_bindir}/apu-config +%{_libdir}/libaprutil-%{apuver}.*a +%{_libdir}/libaprutil-%{apuver}.so +%{_includedir}/apr-%{apuver}/*.h +%doc --parents html + +%changelog +* Sat Jun 19 2004 Joe Orton 0.9.4-16 +- have -devel require matching release of apr-util + +* Tue Jun 15 2004 Elliot Lee +- rebuilt + +* Thu Apr 1 2004 Joe Orton 0.9.4-14 +- fix use of SHA1 passwords (#119651) + +* Tue Mar 30 2004 Joe Orton 0.9.4-13 +- remove fundamentally broken check_sbcs() from xlate code + +* Fri Mar 19 2004 Joe Orton 0.9.4-12 +- tweak xlate fix + +* Fri Mar 19 2004 Joe Orton 0.9.4-11 +- rebuild with xlate fixes and tests enabled + +* Tue Mar 02 2004 Elliot Lee 0.9.4-10.1 +- rebuilt + +* Tue Mar 2 2004 Joe Orton 0.9.4-10 +- rename sdbm_* symbols to apu__sdbm_* + +* Mon Feb 16 2004 Joe Orton 0.9.4-9 +- fix sdbm apr_dbm_exists() on s390x/ppc64 + +* Fri Feb 13 2004 Elliot Lee 0.9.4-8 +- rebuilt + +* Thu Feb 5 2004 Joe Orton 0.9.4-7 +- fix warnings from use of apr_optional*.h with gcc 3.4 + +* Thu Jan 29 2004 Joe Orton 0.9.4-6 +- drop gdbm support + +* Thu Jan 8 2004 Joe Orton 0.9.4-5 +- fix DB library detection + +* Sat Dec 13 2003 Jeff Johnson 0.9.4-4 +- rebuild against db-4.2.52. + +* Mon Oct 13 2003 Jeff Johnson 0.9.4-3 +- rebuild against db-4.2.42. + +* Mon Oct 6 2003 Joe Orton 0.9.4-2 +- fix 'apu-config --apu-la-file' output + +* Mon Oct 6 2003 Joe Orton 0.9.4-1 +- update to 0.9.4. + +* Tue Jul 22 2003 Nalin Dahyabhai 0.9.3-10 +- rebuild + +* Mon Jul 7 2003 Joe Orton 0.9.3-9 +- rebuild +- don't run testuuid test because of #98677 + +* Thu Jul 3 2003 Joe Orton 0.9.3-8 +- rebuild + +* Wed Jun 04 2003 Elliot Lee +- rebuilt + +* Tue May 20 2003 Joe Orton 0.9.3-6 +- fix to detect crypt_r correctly (CAN-2003-0195) + +* Thu May 15 2003 Joe Orton 0.9.3-5 +- fix to try linking against -ldb first (#90917) +- depend on openldap, gdbm, db4, expat appropriately. + +* Tue May 13 2003 Joe Orton 0.9.3-4 +- rebuild + +* Wed May 7 2003 Joe Orton 0.9.3-3 +- make devel package conflict with old subversion-devel +- run the less crufty parts of the test suite + +* Tue Apr 29 2003 Joe Orton 0.9.3-2 +- run ldconfig in post/postun + +* Mon Apr 28 2003 Joe Orton 0.9.3-1 +- initial build From svn at tinysofa.org Thu Jul 1 15:35:30 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:35:30 +1000 (EST) Subject: [tinysofa-svn] r2516 - in tinysofa/snapshot: . aspell aspell/current aspell/current/sources aspell/current/specs Message-ID: <20040701153530.30DF84E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:35:29 +1000 (Fri, 02 Jul 2004) New Revision: 2516 Added: tinysofa/snapshot/aspell/ tinysofa/snapshot/aspell/current/ tinysofa/snapshot/aspell/current/sources/ tinysofa/snapshot/aspell/current/sources/aspell-0.50.3-gcc33.patch tinysofa/snapshot/aspell/current/sources/aspell-0.50.3.prefix.patch tinysofa/snapshot/aspell/current/sources/aspell-0.50.5.tar.gz tinysofa/snapshot/aspell/current/specs/ tinysofa/snapshot/aspell/current/specs/aspell.spec Log: - Add aspell to snapshot from 2.0. Added: tinysofa/snapshot/aspell/current/sources/aspell-0.50.3-gcc33.patch =================================================================== --- tinysofa/snapshot/aspell/current/sources/aspell-0.50.3-gcc33.patch 2004-07-01 15:35:28 UTC (rev 2515) +++ tinysofa/snapshot/aspell/current/sources/aspell-0.50.3-gcc33.patch 2004-07-01 15:35:29 UTC (rev 2516) @@ -0,0 +1,10 @@ +--- aspell-0.50.3/prog/checker_string.cpp.gcc33 2003-05-22 22:52:59.000000000 -0400 ++++ aspell-0.50.3/prog/checker_string.cpp 2003-05-22 22:53:13.000000000 -0400 +@@ -4,6 +4,7 @@ + // license along with this library if you did not you can find + // it at http://www.gnu.org/. + ++#include + #include "checker_string.hpp" + #include "speller.hpp" + #include "document_checker.hpp" Added: tinysofa/snapshot/aspell/current/sources/aspell-0.50.3.prefix.patch =================================================================== --- tinysofa/snapshot/aspell/current/sources/aspell-0.50.3.prefix.patch 2004-07-01 15:35:28 UTC (rev 2515) +++ tinysofa/snapshot/aspell/current/sources/aspell-0.50.3.prefix.patch 2004-07-01 15:35:29 UTC (rev 2516) @@ -0,0 +1,15 @@ +--- aspell-0.50.3/common/Makefile.in.prefix 2003-04-28 14:47:40.000000000 -0400 ++++ aspell-0.50.3/common/Makefile.in 2003-04-28 14:50:50.000000000 -0400 +@@ -516,10 +516,10 @@ + + + dirs.h: mk-dirs_h +- echo '#define PREFIX "${prefix}"' > dirs.h ++ echo '#define PREFIX "/usr"' > dirs.h + ./mk-dirs_h ${prefix} DICT_DIR ${pkglibdir} >> dirs.h + ./mk-dirs_h ${prefix} DATA_DIR ${pkgdatadir} >> dirs.h +- ./mk-dirs_h ${prefix} CONF_DIR ${sysconfdir} >> dirs.h ++ echo '#define CONF_DIR "/etc"' >> dirs.h + + config.cpp: dirs.h + Added: tinysofa/snapshot/aspell/current/sources/aspell-0.50.5.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/aspell/current/sources/aspell-0.50.5.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/aspell/current/specs/aspell.spec =================================================================== --- tinysofa/snapshot/aspell/current/specs/aspell.spec 2004-07-01 15:35:28 UTC (rev 2515) +++ tinysofa/snapshot/aspell/current/specs/aspell.spec 2004-07-01 15:35:29 UTC (rev 2516) @@ -0,0 +1,323 @@ +Summary: A spelling checker. +Name: aspell +Version: 0.50.5 +Release: 1ts +Epoch: 12 +License: LGPL +Group: Applications/Text +URL: http://aspell.net/ +Source0: ftp://ftp.gnu.org/gnu/aspell/aspell-%{version}.tar.gz +Patch0: aspell-0.50.3.prefix.patch +Patch1: aspell-0.50.3-gcc33.patch +Buildrequires: gcc-c++ +Requires: aspell-en +BuildRoot: %{_tmppath}/%{name}-%{version}-root +Provides: pspell +Obsoletes: ispell, pspell, aspell-de < 0.50, aspell-fr < 0.50, aspell-ca < 0.50, aspell-da < 0.50, aspell-es < 0.50, aspell-it < 0.50, aspell-nl < 0.50, aspell-no < 0.50, aspell-sv < 0.50 + +%description +GNU Aspell is a spell checker designed to eventually replace Ispell. It can +either be used as a library or as an independent spell checker. Its main +feature is that it does a much better job of coming up with possible +suggestions than just about any other spell checker out there for the +English language, including Ispell and Microsoft Word. It also has many +other technical enhancements over Ispell such as using shared memory for +dictionaries and intelligently handling personal dictionaries when more +than one Aspell process is open at once. + +%package devel +Summary: Static libraries and header files for Aspell development. +Group: Development/Libraries +Requires: aspell = %{epoch}:%{version} +Provides: pspell-devel +Obsoletes: pspell-devel + +%description devel +Aspell is a spelling checker. The aspell-devel package includes the +static libraries and header files needed for Aspell development. + +%prep +rm -rf $RPM_BUILD_ROOT +%setup -q -n aspell-%{version} +%patch -p1 -b .prefix +%patch1 -p1 -b .gcc33 + +%build +%configure +make + +%install +%makeinstall + +mkdir -p ${RPM_BUILD_ROOT}%{_libdir}/aspell + +mv ${RPM_BUILD_ROOT}%{_datadir}/aspell/ispell ${RPM_BUILD_ROOT}%{_bindir} +mv ${RPM_BUILD_ROOT}%{_datadir}/aspell/spell ${RPM_BUILD_ROOT}%{_bindir} + +rm -f ${RPM_BUILD_ROOT}%{_libdir}/libaspell.la +rm -f ${RPM_BUILD_ROOT}%{_libdir}/libpspell.la + +rm -f $RPM_BUILD_ROOT/usr/share/doc/aspell/manual.aux + +%post -p /sbin/ldconfig +%postun -p /sbin/ldconfig +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(-,root,root) +%doc README TODO +%doc %{_docdir}/aspell/* +%dir %{_datadir}/aspell +%dir %{_datadir}/doc/aspell +%dir %{_libdir}/aspell +%{_bindir}/* +%{_libdir}/lib*.so.* +%{_datadir}/aspell/*.dat +%{_datadir}/aspell/*.kbd + +%files devel +%defattr(-,root,root) +%dir %{_includedir}/pspell +%{_includedir}/aspell.h +%{_includedir}/pspell/pspell.h +%{_libdir}/lib*spell.so + +%changelog +* Tue Mar 02 2004 Elliot Lee +- rebuilt + +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Thu Jan 29 2004 Adrian Havill 12:0.50.50.3-18 +- make rpm own some unclaimed dirs (#112984, #113778) +- explicitly claim kbd anbd dat files in /usr/share/aspell +- a little spec file files cleanup-- macro subs, dir prefix +- make /usr/lib/aspell; don't make the dictionary packages do it + +* Mon Nov 17 2003 Thomas Woerner 12:0.50.3-17 +- fixed build: added make to %%build to avoid rpath for build directory + +* Tue Oct 07 2003 Adrian Havill 12:0.50.3-16 +- moved spell compat script from /usr/share/aspell to /usr/bin (#105921) + +* Tue Jul 01 2003 Adrian Havill 11:0.50.3-15 +- moved ispell compat script from /usr/share/aspell to /usr/bin (#90907) + +* Tue Jun 24 2003 Adrian Havill 10:0.50.3-14 +- removed emacs/xemacs el files which are already provided + +* Mon Jun 18 2003 Adrian Havill 9:0.50.3-13 +- provide pspell-devel in addition to obsoleting it + +* Tue Jun 10 2003 Adrian Havill 8:0.50.3-12 +- obsolete old dicts designed for previous aspell + +* Wed Jun 04 2003 Elliot Lee +- rebuilt + +* Fri May 30 2003 Joe Orton 7:0.50.3-10 +- rebuild again to fix libpspell deps + +* Fri May 30 2003 Joe Orton 7:0.50.3-9 +- remove ExcludeArch + +* Thu May 22 2003 Jeremy Katz 7:0.50.3-8 +- fix build with gcc 3.3 + +* Wed May 22 2003 Adrian Havill 0.50.3-7 +- require aspell-en for upgrades + +* Sun May 11 2003 Jeremy Katz 6:0.50.3-6 +- -devel should obsolete pspell-devel + +* Tue May 6 2003 Joe Orton 0.50.3-5 +- include libpspell.so in devel package + +* Wed May 1 2003 Adrian Havill 0.50.3-4 +- removed .la files + +* Wed Apr 16 2003 Adrian Havill 0.50.3-3 +- Changed the header for provides, obsoletes, epoch +- fixed config prefix in dirs.h + +* Wed Apr 16 2003 Adrian Havill 0.50.3-1 +- upgrade to 0.50.3 + +* Wed Jan 22 2003 Tim Powers +- rebuilt + +* Fri Nov 8 2002 Tim Powers +- fix broken pspell epoch dep +- create $RPM_BUILD_ROOT/usr/bin by hand +- remove /usr/doc +- fix hardcoding of /usr/lib so that we can build on x86_64 + +* Tue Aug 13 2002 Nalin Dahyabhai 0.33.7.1-16 +- require pspell and pspell-devel using the proper epoch + +* Sat Aug 10 2002 Elliot Lee +- rebuilt with gcc-3.2 (we hope) + +* Mon Jul 22 2002 Tim Powers 0.33.7.1-14 +- rebuild using gcc-3.2-0.1 + +* Fri Jun 21 2002 Tim Powers 0.33.7.1-13 +- automated rebuild + +* Thu Jun 13 2002 Trond Eivind Glomsr?d 0.33.7.1-12 +- Rebuild to make it work again... #66708 + +* Thu May 23 2002 Tim Powers +- automated rebuild + +* Mon May 13 2002 Trond Eivind Glomsr?d 0.33.7.1-10 +- Rebuild + +* Thu Feb 21 2002 Trond Eivind Glomsr?d 0.33.7.1-9 +- Disable evil patch + +* Mon Jan 28 2002 Trond Eivind Glomsr?d 0.33.7.1-8 +- Build on more archs (doh) + +* Tue Jan 22 2002 Trond Eivind Glomsr?d 0.33.7.1-7 +- Make it compile with new compiler (evil workaround) + +* Wed Jan 16 2002 Trond Eivind Glomsr?d 0.33.7.1-5 +- Rebuild +- Unexclude alpha + +* Fri Dec 14 2001 Trond Eivind Glomsr?d 0.33.7.1-3 +- Rebuild +- Don't build on alpha + +* Mon Oct 29 2001 Bernhard Rosenkraenzer 0.33.7.1-2 +- "make it work with gcc 3.1" ;) + +* Tue Sep 18 2001 Trond Eivind Glomsr?d 0.33.7.1-1 +- 0.33.7.1, which is a "make it work with gcc 3" release + +* Wed Sep 12 2001 Tim Powers +- rebuild with new gcc and binutils + +* Thu Aug 9 2001 Trond Eivind Glomsr?d 0.33.7-1 +- 0.33.7 bugfix release. Requested by the author, it fixes + coredumps in sug-mode and when not using typo-analyses. + It also contains code cleanups so it compiles with -ansi +- should fix coredump on IA64 (#49746) + +* Wed Jul 11 2001 Trond Eivind Glomsr?d +- Add the .la files in the main package - used for dynamic loading + +* Sun Jun 3 2001 Trond Eivind Glomsr?d +- 0.33.6.3, which includes the fix made yesterday + +* Sat Jun 2 2001 Trond Eivind Glomsr?d +- Make it search for directories in the correct location + +* Wed May 30 2001 Trond Eivind Glomsr?d +- No more workarounds at the specfile level + +* Tue May 29 2001 Trond Eivind Glomsr?d +- Use custom ltmain.sh to work around buggy bundled libtool + +* Sun May 20 2001 Trond Eivind Glomsr?d +- 0.33.6 +- use standard %%configure macro - it works now. + +* Fri May 11 2001 Bernhard Rosenkraenzer 0.33.5-2 +- Rebuild with new libltdl + +* Mon Apr 23 2001 Trond Eivind Glomsr?d +- 0.33.5 + +* Thu Nov 30 2000 Trond Eivind Glomsr?d +- use new emacs init scheme for Emacs and XEmacs + +* Wed Nov 22 2000 Trond Eivind Glomsr?d +- .32.6 + +* Sat Aug 19 2000 Trond Eivind Glomsr?d +- .32.5 bugfix release (also contains improved documentation), + obsolete old patch +- the compatibility scripts are now part of the package itself +- clean up build procedure +- remove manual.aux file from docs (#16424) + +* Sun Aug 06 2000 Trond Eivind Glomsr?d +- .32.1 bugfix release, obsolete old patch +- rename to 0.32.1 +- add patch from author to change his email address +- add spell and ispell compatibility scripts + +* Fri Aug 04 2000 Trond Eivind Glomsr?d +- rebuild + +* Tue Aug 01 2000 Trond Eivind Glomsr?d +- remember to obsolete ispell +- build the Canadian and British dictionaries here now, + as part of the main package. Same package names and + descriptions. + +* Mon Jul 24 2000 Trond Eivind Glomsr?d +- .32 +- remove old patches, add a patch since namespace isn't + polluted as much anymore (as opposed to older toolchain) + +* Wed Jul 19 2000 Trond Eivind Glomsr?d +- rebuild + +* Wed Jul 12 2000 Prospector +- automatic rebuild + +* Tue Jul 4 2000 Jakub Jelinek +- Rebuild with new C++ + +* Fri Jun 30 2000 Trond Eivind Glomsr?d +- use RPM_OPT_FLAGS, not just -O0 +- dont include .la-files + +* Fri Jun 23 2000 Trond Eivind Glomsr?d +- excludearch ia64 + +* Fri Jun 23 2000 Trond Eivind Glomsr?d +- patch to work around compiler bug(?) wrt. inline functions +- use CFLAGS and CXXFLAGS +- set them to -O0 to work around YACB +- copy libtool files for IA64 support + +* Sun Jun 18 2000 Trond Eivind Glomsr?d +- update to .31.1. My patch was upstreamed and is no longer needed. +- new patch added so DESTDIR works properly + +* Fri Jun 16 2000 Trond Eivind Glomsr?d +- (this entry includes some old ones...) +- update to .31 +- added patch to make it compile with a pickier compiler +- include /usr/share/pspell + +* Mon May 1 2000 Tim Powers +- updated to .30.1 +- used build fixes from Ryan Weaver's 0.30.1-1 package on sourceforge +- updated URL, download/ftp location +- removed redundant define's at top of spec file + +* Thu Jul 8 1999 Tim Powers +- built for Powertools 6.1 +- removed %serial definitions from spec file to make versioning + consistant with the other packages we ship. +- changed build root path +- general spec file cleanups + +* Tue Mar 2 1999 Ryan Weaver + [aspell-.27.2-2] +- Changes from .27.1 to .27.2 (Mar 1, 1999) +- Fixed a major bug that caused aspell to dump core when used + without any arguments +- Fixed another major bug that caused aspell to do nothing when used + in interactive mode. +- Added an option to exit in Aspell's interactive mode. +- Removed some old documentation files from the distribution. +- Minor changes on to the section on using Aspell with egcs. +- Minor changes to remove -Wall warnings. From svn at tinysofa.org Thu Jul 1 15:35:31 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:35:31 +1000 (EST) Subject: [tinysofa-svn] r2517 - in tinysofa/snapshot: . aspell-da aspell-da/current aspell-da/current/sources aspell-da/current/specs Message-ID: <20040701153531.BB6EA4E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:35:31 +1000 (Fri, 02 Jul 2004) New Revision: 2517 Added: tinysofa/snapshot/aspell-da/ tinysofa/snapshot/aspell-da/current/ tinysofa/snapshot/aspell-da/current/sources/ tinysofa/snapshot/aspell-da/current/sources/aspell-da-0.50-2.tar.bz2 tinysofa/snapshot/aspell-da/current/specs/ tinysofa/snapshot/aspell-da/current/specs/aspell-da.spec Log: - Add aspell-da to snapshot from 2.0. Added: tinysofa/snapshot/aspell-da/current/sources/aspell-da-0.50-2.tar.bz2 =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/aspell-da/current/sources/aspell-da-0.50-2.tar.bz2 ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/aspell-da/current/specs/aspell-da.spec =================================================================== --- tinysofa/snapshot/aspell-da/current/specs/aspell-da.spec 2004-07-01 15:35:29 UTC (rev 2516) +++ tinysofa/snapshot/aspell-da/current/specs/aspell-da.spec 2004-07-01 15:35:31 UTC (rev 2517) @@ -0,0 +1,58 @@ +%define lang da +%define langrelease 2 +Summary: Danish dictionaries for Aspell. +Name: aspell-%{lang} +Epoch: 6 +Version: 0.50 +Release: 7.1ts +License: GPL +Group: Applications/Text +URL: http://aspell.net/ +Source: ftp://ftp.gnu.org/gnu/aspell/dict/%{lang}/aspell-%{lang}-%{version}-%{langrelease}.tar.bz2 +Buildrequires: aspell >= 0.50 +Requires: aspell >= 0.50 +BuildRoot: %{_tmppath}/%{name}-%{version}-root + +%description +Provides the word list/dictionaries for the following: Danish + +%prep +rm -rf $RPM_BUILD_ROOT +%setup -q -n aspell-%{lang}-%{version}-%{langrelease} + +%build +echo "ASPELL = aspell" > Makefile +echo "DEST_DIR = $RPM_BUILD_ROOT" >> Makefile +echo "WORD_LIST_COMPRESS = word-list-compress" >> Makefile +echo "dictdir = ${RPM_BUILD_ROOT}%{_libdir}/aspell" >> Makefile +echo "datadir = ${RPM_BUILD_ROOT}%{_datadir}/aspell" >> Makefile +cat Makefile.pre >> Makefile +make + +%install +make install + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(-,root,root) + +%{_libdir}/aspell/* +%{_datadir}/aspell/* + +%changelog +* Tue Mar 02 2004 Elliot Lee +- rebuilt + +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Tue Oct 07 2003 Adrian Havill 6:0.50-6 +- add epoch to comp for the version fork (#106447) + +* Mon Jun 23 2003 Adrian Havill 0.50-5 +- data files are arch dependent + +* Fri Jun 20 2003 Adrian Havill 0.50-4 +- first build for new aspell (0.50) From svn at tinysofa.org Thu Jul 1 15:35:34 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:35:34 +1000 (EST) Subject: [tinysofa-svn] r2518 - in tinysofa/snapshot: . aspell-de aspell-de/current aspell-de/current/sources aspell-de/current/specs Message-ID: <20040701153534.750E14E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:35:32 +1000 (Fri, 02 Jul 2004) New Revision: 2518 Added: tinysofa/snapshot/aspell-de/ tinysofa/snapshot/aspell-de/current/ tinysofa/snapshot/aspell-de/current/sources/ tinysofa/snapshot/aspell-de/current/sources/aspell-de-0.50-2.tar.bz2 tinysofa/snapshot/aspell-de/current/specs/ tinysofa/snapshot/aspell-de/current/specs/aspell-de.spec Log: - Add aspell-de to snapshot from 2.0. Added: tinysofa/snapshot/aspell-de/current/sources/aspell-de-0.50-2.tar.bz2 =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/aspell-de/current/sources/aspell-de-0.50-2.tar.bz2 ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/aspell-de/current/specs/aspell-de.spec =================================================================== --- tinysofa/snapshot/aspell-de/current/specs/aspell-de.spec 2004-07-01 15:35:31 UTC (rev 2517) +++ tinysofa/snapshot/aspell-de/current/specs/aspell-de.spec 2004-07-01 15:35:32 UTC (rev 2518) @@ -0,0 +1,54 @@ +%define lang de +%define langrelease 2 +Summary: German dictionaries for Aspell. +Name: aspell-%{lang} +Version: 0.50 +Release: 6.1ts +License: GPL +Group: Applications/Text +URL: http://aspell.net/ +Source: ftp://ftp.gnu.org/gnu/aspell/dict/%{lang}/aspell-%{lang}-%{version}-%{langrelease}.tar.bz2 +Buildrequires: aspell >= 0.50 +Requires: aspell >= 0.50 +BuildRoot: %{_tmppath}/%{name}-%{version}-root + +%description +Provides the word list/dictionaries for the following: German, Swiss German + +%prep +rm -rf $RPM_BUILD_ROOT +%setup -q -n aspell-%{lang}-%{version}-%{langrelease} + +%build +echo "ASPELL = aspell" > Makefile +echo "DEST_DIR = $RPM_BUILD_ROOT" >> Makefile +echo "WORD_LIST_COMPRESS = word-list-compress" >> Makefile +echo "dictdir = ${RPM_BUILD_ROOT}%{_libdir}/aspell" >> Makefile +echo "datadir = ${RPM_BUILD_ROOT}%{_datadir}/aspell" >> Makefile +cat Makefile.pre >> Makefile +make + +%install +make install + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(-,root,root) + +%{_libdir}/aspell/* +%{_datadir}/aspell/* + +%changelog +* Tue Mar 02 2004 Elliot Lee +- rebuilt + +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Mon Jun 23 2003 Adrian Havill 0.50-5 +- data files are arch dependent + +* Fri Jun 20 2003 Adrian Havill 0.50-4 +- first build for new aspell (0.50) From svn at tinysofa.org Thu Jul 1 15:35:36 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:35:36 +1000 (EST) Subject: [tinysofa-svn] r2520 - in tinysofa/snapshot: . aspell-es aspell-es/current aspell-es/current/sources aspell-es/current/specs Message-ID: <20040701153536.B61CD4E817D@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:35:36 +1000 (Fri, 02 Jul 2004) New Revision: 2520 Added: tinysofa/snapshot/aspell-es/ tinysofa/snapshot/aspell-es/current/ tinysofa/snapshot/aspell-es/current/sources/ tinysofa/snapshot/aspell-es/current/sources/aspell-es-0.50-2.ascii.patch tinysofa/snapshot/aspell-es/current/sources/aspell-es-0.50-2.tar.bz2 tinysofa/snapshot/aspell-es/current/specs/ tinysofa/snapshot/aspell-es/current/specs/aspell-es.spec Log: - Add aspell-es to snapshot from 2.0. Added: tinysofa/snapshot/aspell-es/current/sources/aspell-es-0.50-2.ascii.patch =================================================================== --- tinysofa/snapshot/aspell-es/current/sources/aspell-es-0.50-2.ascii.patch 2004-07-01 15:35:35 UTC (rev 2519) +++ tinysofa/snapshot/aspell-es/current/sources/aspell-es-0.50-2.ascii.patch 2004-07-01 15:35:36 UTC (rev 2520) @@ -0,0 +1,11 @@ +--- aspell-es-0.50-2/Makefile.pre.orig 2003-06-23 10:21:20.000000000 -0400 ++++ aspell-es-0.50-2/Makefile.pre 2003-06-23 10:21:39.000000000 -0400 +@@ -7,7 +7,7 @@ + data_files = es.dat + doc_files = README COPYING Copyright + extra_files = configure info Makefile.pre +-multi_files = es.multi espa?ol.alias esponol.alias spanish.alias ++multi_files = es.multi espanol.alias esponol.alias spanish.alias + rws_files = es.rws + + Added: tinysofa/snapshot/aspell-es/current/sources/aspell-es-0.50-2.tar.bz2 =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/aspell-es/current/sources/aspell-es-0.50-2.tar.bz2 ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/aspell-es/current/specs/aspell-es.spec =================================================================== --- tinysofa/snapshot/aspell-es/current/specs/aspell-es.spec 2004-07-01 15:35:35 UTC (rev 2519) +++ tinysofa/snapshot/aspell-es/current/specs/aspell-es.spec 2004-07-01 15:35:36 UTC (rev 2520) @@ -0,0 +1,58 @@ +%define lang es +%define langrelease 2 +Summary: Spanish dictionaries for Aspell. +Name: aspell-%{lang} +Version: 0.50 +Release: 6.1ts +License: GPL +Group: Applications/Text +URL: http://aspell.net/ +Source: ftp://ftp.gnu.org/gnu/aspell/dict/%{lang}/aspell-%{lang}-%{version}-%{langrelease}.tar.bz2 +Patch: aspell-es-0.50-2.ascii.patch +Buildrequires: aspell >= 0.50 +Requires: aspell >= 0.50 +BuildRoot: %{_tmppath}/%{name}-%{version}-root + +%description +Provides the word list/dictionaries for the following: Spanish + +%prep +rm -rf $RPM_BUILD_ROOT +%setup -q -n aspell-%{lang}-%{version}-%{langrelease} +%patch -p1 -b .ascii +mv espa?ol.alias espanol.alias + +%build +echo "ASPELL = aspell" > Makefile +echo "DEST_DIR = $RPM_BUILD_ROOT" >> Makefile +echo "WORD_LIST_COMPRESS = word-list-compress" >> Makefile +echo "dictdir = ${RPM_BUILD_ROOT}%{_libdir}/aspell" >> Makefile +echo "datadir = ${RPM_BUILD_ROOT}%{_datadir}/aspell" >> Makefile +cat Makefile.pre >> Makefile +make + +%install +make install + + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(-,root,root) + +%{_libdir}/aspell/* +%{_datadir}/aspell/* + +%changelog +* Tue Mar 02 2004 Elliot Lee +- rebuilt + +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Mon Jun 23 2003 Adrian Havill 0.50-5 +- remove buildarch; data files are platform dependent + +* Fri Jun 20 2003 Adrian Havill 0.50-4 +- first build for new aspell (0.50) From svn at tinysofa.org Thu Jul 1 15:35:37 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:35:37 +1000 (EST) Subject: [tinysofa-svn] r2521 - in tinysofa/snapshot: . aspell-fr aspell-fr/current aspell-fr/current/sources aspell-fr/current/specs Message-ID: <20040701153537.CFB954E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:35:37 +1000 (Fri, 02 Jul 2004) New Revision: 2521 Added: tinysofa/snapshot/aspell-fr/ tinysofa/snapshot/aspell-fr/current/ tinysofa/snapshot/aspell-fr/current/sources/ tinysofa/snapshot/aspell-fr/current/sources/aspell-fr-0.50-3.tar.bz2 tinysofa/snapshot/aspell-fr/current/specs/ tinysofa/snapshot/aspell-fr/current/specs/aspell-fr.spec Log: - Add aspell-fr to snapshot from 2.0. Added: tinysofa/snapshot/aspell-fr/current/sources/aspell-fr-0.50-3.tar.bz2 =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/aspell-fr/current/sources/aspell-fr-0.50-3.tar.bz2 ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/aspell-fr/current/specs/aspell-fr.spec =================================================================== --- tinysofa/snapshot/aspell-fr/current/specs/aspell-fr.spec 2004-07-01 15:35:36 UTC (rev 2520) +++ tinysofa/snapshot/aspell-fr/current/specs/aspell-fr.spec 2004-07-01 15:35:37 UTC (rev 2521) @@ -0,0 +1,51 @@ +%define lang fr +%define langrelease 3 +Summary: French dictionaries for Aspell. +Name: aspell-%{lang} +Version: 0.50 +Release: 4.1ts +License: GPL +Group: Applications/Text +URL: http://aspell.net/ +Source: ftp://ftp.gnu.org/gnu/aspell/dict/%{lang}/aspell-%{lang}-%{version}-%{langrelease}.tar.bz2 +Buildrequires: aspell >= 0.50 +Requires: aspell >= 0.50 +BuildRoot: %{_tmppath}/%{name}-%{version}-root + +%description +Provides the word list/dictionaries for the following: French, Swiss French + +%prep +rm -rf $RPM_BUILD_ROOT +%setup -q -n aspell-%{lang}-%{version}-%{langrelease} + +%build +echo "ASPELL = aspell" > Makefile +echo "DEST_DIR = $RPM_BUILD_ROOT" >> Makefile +echo "WORD_LIST_COMPRESS = word-list-compress" >> Makefile +echo "dictdir = ${RPM_BUILD_ROOT}%{_libdir}/aspell" >> Makefile +echo "datadir = ${RPM_BUILD_ROOT}%{_datadir}/aspell" >> Makefile +cat Makefile.pre >> Makefile +make + +%install +make install + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(-,root,root) + +%{_libdir}/aspell/* +%{_datadir}/aspell/* + +%changelog +* Tue Mar 02 2004 Elliot Lee +- rebuilt + +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Mon Jun 23 2003 Adrian Havill 0.50-3 +- first build for new aspell (0.50) From svn at tinysofa.org Thu Jul 1 15:35:35 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:35:35 +1000 (EST) Subject: [tinysofa-svn] r2519 - in tinysofa/snapshot: . aspell-en aspell-en/current aspell-en/current/sources aspell-en/current/specs Message-ID: <20040701153535.ADF6B4E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:35:35 +1000 (Fri, 02 Jul 2004) New Revision: 2519 Added: tinysofa/snapshot/aspell-en/ tinysofa/snapshot/aspell-en/current/ tinysofa/snapshot/aspell-en/current/sources/ tinysofa/snapshot/aspell-en/current/sources/aspell-en-0.51-0.tar.bz2 tinysofa/snapshot/aspell-en/current/specs/ tinysofa/snapshot/aspell-en/current/specs/aspell-en.spec Log: - Add aspell-en to snapshot from 2.0. Added: tinysofa/snapshot/aspell-en/current/sources/aspell-en-0.51-0.tar.bz2 =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/aspell-en/current/sources/aspell-en-0.51-0.tar.bz2 ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/aspell-en/current/specs/aspell-en.spec =================================================================== --- tinysofa/snapshot/aspell-en/current/specs/aspell-en.spec 2004-07-01 15:35:32 UTC (rev 2518) +++ tinysofa/snapshot/aspell-en/current/specs/aspell-en.spec 2004-07-01 15:35:35 UTC (rev 2519) @@ -0,0 +1,55 @@ +%define lang en +%define langrelease 0 +Summary: English dictionaries for Aspell. +Name: aspell-%{lang} +Version: 0.51 +Release: 7.1ts +License: distributable +Group: Applications/Text +URL: http://aspell.net/ +Source: ftp://ftp.gnu.org/gnu/aspell/dict/%{lang}/aspell-%{lang}-%{version}-%{langrelease}.tar.bz2 +Buildrequires: aspell >= 0.50 +Requires: aspell >= 0.50 +BuildRoot: %{_tmppath}/%{name}-%{version}-root + +%description +Provides the word list/dictionaries for the following: English, Canadian +English, British English + +%prep +rm -rf $RPM_BUILD_ROOT +%setup -q -n aspell-%{lang}-%{version}-%{langrelease} + +%build +echo "ASPELL = aspell" > Makefile +echo "DEST_DIR = $RPM_BUILD_ROOT" >> Makefile +echo "WORD_LIST_COMPRESS = word-list-compress" >> Makefile +echo "dictdir = ${RPM_BUILD_ROOT}%{_libdir}/aspell" >> Makefile +echo "datadir = ${RPM_BUILD_ROOT}%{_datadir}/aspell" >> Makefile +cat Makefile.pre >> Makefile +make + +%install +make install + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(-,root,root) + +%{_libdir}/aspell/* +%{_datadir}/aspell/* + +%changelog +* Tue Mar 02 2004 Elliot Lee +- rebuilt + +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Mon Jun 23 2003 Adrian Havill 0.51-6 +- data files are not arch independent + +* Fri Jun 20 2003 Adrian Havill 0.51-5 +- first build for new aspell (0.50) From svn at tinysofa.org Thu Jul 1 15:35:38 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:35:38 +1000 (EST) Subject: [tinysofa-svn] r2522 - in tinysofa/snapshot: . aspell-nl aspell-nl/current aspell-nl/current/sources aspell-nl/current/specs Message-ID: <20040701153538.C9DF54E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:35:38 +1000 (Fri, 02 Jul 2004) New Revision: 2522 Added: tinysofa/snapshot/aspell-nl/ tinysofa/snapshot/aspell-nl/current/ tinysofa/snapshot/aspell-nl/current/sources/ tinysofa/snapshot/aspell-nl/current/sources/aspell-nl-0.50-2.tar.bz2 tinysofa/snapshot/aspell-nl/current/specs/ tinysofa/snapshot/aspell-nl/current/specs/aspell-nl.spec Log: - Add aspell-nl to snapshot from 2.0. Added: tinysofa/snapshot/aspell-nl/current/sources/aspell-nl-0.50-2.tar.bz2 =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/aspell-nl/current/sources/aspell-nl-0.50-2.tar.bz2 ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/aspell-nl/current/specs/aspell-nl.spec =================================================================== --- tinysofa/snapshot/aspell-nl/current/specs/aspell-nl.spec 2004-07-01 15:35:37 UTC (rev 2521) +++ tinysofa/snapshot/aspell-nl/current/specs/aspell-nl.spec 2004-07-01 15:35:38 UTC (rev 2522) @@ -0,0 +1,51 @@ +%define lang nl +%define langrelease 2 +Summary: Dutch dictionaries for Aspell. +Name: aspell-%{lang} +Version: 0.50 +Release: 4.1ts +License: distributable +Group: Applications/Text +URL: http://aspell.net/ +Source: ftp://ftp.gnu.org/gnu/aspell/dict/%{lang}/aspell-%{lang}-%{version}-%{langrelease}.tar.bz2 +Buildrequires: aspell >= 0.50 +Requires: aspell >= 0.50 +BuildRoot: %{_tmppath}/%{name}-%{version}-root + +%description +Provides the word list/dictionaries for the following: Dutch + +%prep +rm -rf $RPM_BUILD_ROOT +%setup -q -n aspell-%{lang}-%{version}-%{langrelease} + +%build +echo "ASPELL = aspell" > Makefile +echo "DEST_DIR = $RPM_BUILD_ROOT" >> Makefile +echo "WORD_LIST_COMPRESS = word-list-compress" >> Makefile +echo "dictdir = ${RPM_BUILD_ROOT}%{_libdir}/aspell" >> Makefile +echo "datadir = ${RPM_BUILD_ROOT}%{_datadir}/aspell" >> Makefile +cat Makefile.pre >> Makefile +make + +%install +make install + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(-,root,root) + +%{_libdir}/aspell/* +%{_datadir}/aspell/* + +%changelog +* Tue Mar 02 2004 Elliot Lee +- rebuilt + +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Mon Jun 23 2003 Adrian Havill 0.50-3 +- first build for new aspell (0.50) From svn at tinysofa.org Thu Jul 1 15:35:39 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:35:39 +1000 (EST) Subject: [tinysofa-svn] r2523 - in tinysofa/snapshot: . aspell-no aspell-no/current aspell-no/current/sources aspell-no/current/specs Message-ID: <20040701153539.EDB254E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:35:39 +1000 (Fri, 02 Jul 2004) New Revision: 2523 Added: tinysofa/snapshot/aspell-no/ tinysofa/snapshot/aspell-no/current/ tinysofa/snapshot/aspell-no/current/sources/ tinysofa/snapshot/aspell-no/current/sources/aspell-no-0.50-2.tar.bz2 tinysofa/snapshot/aspell-no/current/specs/ tinysofa/snapshot/aspell-no/current/specs/aspell-no.spec Log: - Add aspell-no to snapshot from 2.0. Added: tinysofa/snapshot/aspell-no/current/sources/aspell-no-0.50-2.tar.bz2 =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/aspell-no/current/sources/aspell-no-0.50-2.tar.bz2 ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/aspell-no/current/specs/aspell-no.spec =================================================================== --- tinysofa/snapshot/aspell-no/current/specs/aspell-no.spec 2004-07-01 15:35:38 UTC (rev 2522) +++ tinysofa/snapshot/aspell-no/current/specs/aspell-no.spec 2004-07-01 15:35:39 UTC (rev 2523) @@ -0,0 +1,51 @@ +%define lang no +%define langrelease 2 +Summary: Norwegian dictionaries for Aspell. +Name: aspell-%{lang} +Version: 0.50 +Release: 4.1ts +License: GPL +Group: Applications/Text +URL: http://aspell.net/ +Source: ftp://ftp.gnu.org/gnu/aspell/dict/%{lang}/aspell-%{lang}-%{version}-%{langrelease}.tar.bz2 +Buildrequires: aspell >= 0.50 +Requires: aspell >= 0.50 +BuildRoot: %{_tmppath}/%{name}-%{version}-root + +%description +Provides the word list/dictionaries for the following: Norwegian + +%prep +rm -rf $RPM_BUILD_ROOT +%setup -q -n aspell-%{lang}-%{version}-%{langrelease} + +%build +echo "ASPELL = aspell" > Makefile +echo "DEST_DIR = $RPM_BUILD_ROOT" >> Makefile +echo "WORD_LIST_COMPRESS = word-list-compress" >> Makefile +echo "dictdir = ${RPM_BUILD_ROOT}%{_libdir}/aspell" >> Makefile +echo "datadir = ${RPM_BUILD_ROOT}%{_datadir}/aspell" >> Makefile +cat Makefile.pre >> Makefile +make + +%install +make install + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(-,root,root) + +%{_libdir}/aspell/* +%{_datadir}/aspell/* + +%changelog +* Tue Mar 02 2004 Elliot Lee +- rebuilt + +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Mon Jun 23 2003 Adrian Havill 0.50-3 +- first build for new aspell (0.50) From svn at tinysofa.org Thu Jul 1 15:35:41 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:35:41 +1000 (EST) Subject: [tinysofa-svn] r2524 - in tinysofa/snapshot: . aspell-pt aspell-pt/current aspell-pt/current/sources aspell-pt/current/specs Message-ID: <20040701153541.BCE404E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:35:41 +1000 (Fri, 02 Jul 2004) New Revision: 2524 Added: tinysofa/snapshot/aspell-pt/ tinysofa/snapshot/aspell-pt/current/ tinysofa/snapshot/aspell-pt/current/sources/ tinysofa/snapshot/aspell-pt/current/sources/aspell-pt-0.50-2.ascii.patch tinysofa/snapshot/aspell-pt/current/sources/aspell-pt-0.50-2.tar.bz2 tinysofa/snapshot/aspell-pt/current/specs/ tinysofa/snapshot/aspell-pt/current/specs/aspell-pt.spec Log: - Add aspell-pt to snapshot from 2.0. Added: tinysofa/snapshot/aspell-pt/current/sources/aspell-pt-0.50-2.ascii.patch =================================================================== --- tinysofa/snapshot/aspell-pt/current/sources/aspell-pt-0.50-2.ascii.patch 2004-07-01 15:35:39 UTC (rev 2523) +++ tinysofa/snapshot/aspell-pt/current/sources/aspell-pt-0.50-2.ascii.patch 2004-07-01 15:35:41 UTC (rev 2524) @@ -0,0 +1,11 @@ +--- aspell-pt-0.50-2/Makefile.pre.orig 2003-07-09 12:09:48.000000000 -0400 ++++ aspell-pt-0.50-2/Makefile.pre 2003-07-09 12:10:34.000000000 -0400 +@@ -7,7 +7,7 @@ + data_files = pt.dat + doc_files = README COPYING Copyright + extra_files = configure info Makefile.pre +-multi_files = brazilian.alias portuguese.alias portugu?s.alias pt.multi pt_BR.multi pt_PT.multi ++multi_files = brazilian.alias portuguese.alias pt.multi pt_BR.multi pt_PT.multi + rws_files = pt-only.rws pt_BR-only.rws pt_PT-only.rws + + Added: tinysofa/snapshot/aspell-pt/current/sources/aspell-pt-0.50-2.tar.bz2 =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/aspell-pt/current/sources/aspell-pt-0.50-2.tar.bz2 ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/aspell-pt/current/specs/aspell-pt.spec =================================================================== --- tinysofa/snapshot/aspell-pt/current/specs/aspell-pt.spec 2004-07-01 15:35:39 UTC (rev 2523) +++ tinysofa/snapshot/aspell-pt/current/specs/aspell-pt.spec 2004-07-01 15:35:41 UTC (rev 2524) @@ -0,0 +1,62 @@ +%define lang pt +%define langrelease 2 +Summary: Portuguese dictionaries for Aspell. +Name: aspell-%{lang} +Version: 0.50 +Release: 7.1ts +License: GPL +Group: Applications/Text +URL: http://aspell.net/ +Source: ftp://ftp.gnu.org/gnu/aspell/dict/%{lang}/aspell-%{lang}-%{version}-%{langrelease}.tar.bz2 +Patch: aspell-pt-0.50-2.ascii.patch +Buildrequires: aspell >= 0.50 +Requires: aspell >= 0.50 +BuildRoot: %{_tmppath}/%{name}-%{version}-root + +%description +Provides the word list/dictionaries for the following: European Portuguese, +Brazilian Portuguese + +%prep +rm -rf $RPM_BUILD_ROOT +%setup -q -n aspell-%{lang}-%{version}-%{langrelease} +%patch -p1 -b .ascii +#mv portugu?se.alias portuguese.alias + +%build +echo "ASPELL = aspell" > Makefile +echo "DEST_DIR = $RPM_BUILD_ROOT" >> Makefile +echo "WORD_LIST_COMPRESS = word-list-compress" >> Makefile +echo "dictdir = ${RPM_BUILD_ROOT}%{_libdir}/aspell" >> Makefile +echo "datadir = ${RPM_BUILD_ROOT}%{_datadir}/aspell" >> Makefile +cat Makefile.pre >> Makefile +make + +%install +make install + + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(-,root,root) + +%{_libdir}/aspell/* +%{_datadir}/aspell/* + +%changelog +* Tue Mar 02 2004 Elliot Lee +- rebuilt + +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Wed Jul 10 2003 Adrian Havill 0.50-6 +- removed non-ascii alias + +* Mon Jun 23 2003 Adrian Havill 0.50-5 +- remove buildarch; data files are platform dependent + +* Fri Jun 20 2003 Adrian Havill 0.50-4 +- first build for new aspell (0.50) From svn at tinysofa.org Thu Jul 1 15:35:51 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:35:51 +1000 (EST) Subject: [tinysofa-svn] r2526 - in tinysofa/snapshot: . aspell-sv aspell-sv/current aspell-sv/current/sources aspell-sv/current/specs Message-ID: <20040701153551.0183F4E817D@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:35:50 +1000 (Fri, 02 Jul 2004) New Revision: 2526 Added: tinysofa/snapshot/aspell-sv/ tinysofa/snapshot/aspell-sv/current/ tinysofa/snapshot/aspell-sv/current/sources/ tinysofa/snapshot/aspell-sv/current/sources/aspell-sv-0.50-2.tar.bz2 tinysofa/snapshot/aspell-sv/current/specs/ tinysofa/snapshot/aspell-sv/current/specs/aspell-sv.spec Log: - Add aspell-sv to snapshot from 2.0. Added: tinysofa/snapshot/aspell-sv/current/sources/aspell-sv-0.50-2.tar.bz2 =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/aspell-sv/current/sources/aspell-sv-0.50-2.tar.bz2 ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/aspell-sv/current/specs/aspell-sv.spec =================================================================== --- tinysofa/snapshot/aspell-sv/current/specs/aspell-sv.spec 2004-07-01 15:35:44 UTC (rev 2525) +++ tinysofa/snapshot/aspell-sv/current/specs/aspell-sv.spec 2004-07-01 15:35:50 UTC (rev 2526) @@ -0,0 +1,55 @@ +%define lang sv +%define langrelease 2 +Summary: Swedish dictionaries for Aspell. +Name: aspell-%{lang} +Epoch: 4 +Version: 0.50 +Release: 5.1ts +License: GPL +Group: Applications/Text +URL: http://aspell.net/ +Source: ftp://ftp.gnu.org/gnu/aspell/dict/%{lang}/aspell-%{lang}-%{version}-%{langrelease}.tar.bz2 +Buildrequires: aspell >= 0.50 +Requires: aspell >= 0.50 +BuildRoot: %{_tmppath}/%{name}-%{version}-root + +%description +Provides the word list/dictionaries for the following: Swedish + +%prep +rm -rf $RPM_BUILD_ROOT +%setup -q -n aspell-%{lang}-%{version}-%{langrelease} + +%build +echo "ASPELL = aspell" > Makefile +echo "DEST_DIR = $RPM_BUILD_ROOT" >> Makefile +echo "WORD_LIST_COMPRESS = word-list-compress" >> Makefile +echo "dictdir = ${RPM_BUILD_ROOT}%{_libdir}/aspell" >> Makefile +echo "datadir = ${RPM_BUILD_ROOT}%{_datadir}/aspell" >> Makefile +cat Makefile.pre >> Makefile +make + +%install +make install + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(-,root,root) + +%{_libdir}/aspell/* +%{_datadir}/aspell/* + +%changelog +* Tue Mar 02 2004 Elliot Lee +- rebuilt + +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Wed Oct 07 2003 Adrian Havill 4:0.50-4 +- added epoch + +* Tue Jun 24 2003 Adrian Havill 0.50-3 +- first build for new aspell (0.50) From svn at tinysofa.org Thu Jul 1 15:35:55 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:35:55 +1000 (EST) Subject: [tinysofa-svn] r2528 - in tinysofa/snapshot: . atk atk/current atk/current/sources atk/current/specs Message-ID: <20040701153555.C2DD64E817D@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:35:55 +1000 (Fri, 02 Jul 2004) New Revision: 2528 Added: tinysofa/snapshot/atk/ tinysofa/snapshot/atk/current/ tinysofa/snapshot/atk/current/sources/ tinysofa/snapshot/atk/current/sources/atk-1.6.0.tar.bz2 tinysofa/snapshot/atk/current/specs/ tinysofa/snapshot/atk/current/specs/atk.spec Log: - Add atk to snapshot from 2.0. Added: tinysofa/snapshot/atk/current/sources/atk-1.6.0.tar.bz2 =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/atk/current/sources/atk-1.6.0.tar.bz2 ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/atk/current/specs/atk.spec =================================================================== --- tinysofa/snapshot/atk/current/specs/atk.spec 2004-07-01 15:35:53 UTC (rev 2527) +++ tinysofa/snapshot/atk/current/specs/atk.spec 2004-07-01 15:35:55 UTC (rev 2528) @@ -0,0 +1,214 @@ +%define glib2_base_version 2.3.0 +%define glib2_version %{glib2_base_version}-1 + +Summary: Interfaces for accessibility support. +Name: atk +Version: 1.6.0 +Release: 1ts +License: LGPL +Group: System Environment/Libraries +Source: ftp://ftp.gtk.org/pub/gtk/v2.0/atk-%{version}.tar.bz2 +URL: http://developer.gnome.org/projects/gap/ +BuildRoot: %{_tmppath}/%{name}-%{version}-root +BuildPreReq: glib2-devel >= %{glib2_version} +BuildPreReq: libtool +BuildPreReq: autoconf +BuildPreReq: automake + +%description +The ATK library provides a set of interfaces for adding accessibility +support to applications and graphical user interface toolkits. By +supporting the ATK interfaces, an application or toolkit can be used +with tools such as screen readers, magnifiers, and alternative input +devices. + +%package devel +Summary: System for layout and rendering of internationalized text. +Group: Development/Libraries +Requires: atk = %{PACKAGE_VERSION} +Requires: glib2-devel >= %{glib2_version} + +%description devel +The atk-devel package includes the static libraries, header files, and +developer docs for the atk package. + +Install atk-devel if you want to develop programs which will use ATK. + +%prep +%setup -q + +%build + +%configure --disable-gtk-doc +make + +%install +rm -rf $RPM_BUILD_ROOT + +%makeinstall + +rm -f $RPM_BUILD_ROOT%{_libdir}/*.la + +%find_lang atk10 + +%clean +rm -rf $RPM_BUILD_ROOT + +%post -p /sbin/ldconfig + +%postun -p /sbin/ldconfig + + +%files -f atk10.lang +%defattr(-, root, root) +%doc README AUTHORS COPYING ChangeLog +%{_libdir}/libatk*.so.* + +%files devel +%defattr(-, root, root) +%{_libdir}/libatk*.so +%{_includedir}/* +%{_libdir}/pkgconfig/* +%{_datadir}/gtk-doc/ + +%changelog +* Fri Mar 12 2004 Alex Larsson 1.6.0-1 +- update to 2.6.0 + +* Tue Mar 02 2004 Elliot Lee +- rebuilt + +* Wed Feb 25 2004 Mark McLoughlin 1.5.5-1 +- Update to 1.5.5. + +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Fri Jan 23 2004 Jonathan Blandford 1.5.2-1 +- new version + +* Tue Sep 9 2003 Jonathan Blandford 1.4.0-1 +- new version + +* Tue Aug 19 2003 Jonathan Blandford 1.3.5-1 +- new version for 2.4 + +* Wed Jul 9 2003 Owen Taylor 1.2.4-3.0 +- Remove specific version requirement from libtool + +* Tue Jul 8 2003 Owen Taylor 1.2.4-2.0 +- Bump for rebuild + +* Tue Jun 10 2003 Owen Taylor 1.2.4-1 +- Version 1.2.4 + +* Wed Jun 04 2003 Elliot Lee +- rebuilt + +* Wed Jan 22 2003 Tim Powers +- rebuilt + +* Fri Dec 20 2002 Owen Taylor +- Package documentation, instead of blowing it away +- Version 1.2.0 + +* Wed Nov 27 2002 Tim Powers 1.0.3-3 +- remove unpackaged files from the buildroot + +* Mon Oct 7 2002 Havoc Pennington +- require glib 2.0.6-3 + +* Wed Jul 31 2002 Owen Taylor +- Remove fixed-ltmain.sh +- Version 1.0.3 + +* Fri Jun 21 2002 Tim Powers +- automated rebuild + +* Tue Jun 04 2002 Havoc Pennington +- rebuild in different environment + +* Tue Jun 4 2002 Havoc Pennington +- 1.0.2 + +* Thu May 23 2002 Tim Powers +- automated rebuild + +* Wed Apr 24 2002 Havoc Pennington + - rebuild in different environment + +* Wed Apr 3 2002 Alex Larsson +- Update to version 1.0.1 + +* Fri Mar 8 2002 Owen Taylor +- Version 1.0.0 + +* Mon Feb 25 2002 Alex Larsson +- Update to 0.13 + +* Thu Feb 21 2002 Alex Larsson +- Bump for rebuild + +* Mon Feb 18 2002 Havoc Pennington +- rebuild for glib 1.3.14 + +* Fri Feb 15 2002 Havoc Pennington +- add horrible buildrequires hack + +* Thu Feb 14 2002 Havoc Pennington +- 0.12.90 cvs snap + +* Tue Jan 29 2002 Owen Taylor +- Version 0.10 + +* Wed Jan 09 2002 Tim Powers +- automated rebuild + +* Wed Jan 2 2002 Havoc Pennington +- new snap 0.8.90 + +* Sun Nov 25 2001 Havoc Pennington +- rebuild with glib hacked to work on 64-bit + +* Sun Nov 25 2001 Havoc Pennington +- Version 0.7 +- add explicit check for required glib2 version before we do the build, + so we don't end up with bad RPMs on --nodeps builds + +* Fri Oct 26 2001 Havoc Pennington +- rebuild due to hosage on ia64 build system causing link to old glib + +* Thu Oct 25 2001 Owen Taylor +- Version 0.6 + +* Thu Sep 27 2001 Havoc Pennington +- 0.5 +- sync with Owen's version + +* Wed Sep 19 2001 Havoc Pennington +- 0.4 +- fix requires +- --enable-static +- put static libs back in file list + +* Mon Sep 10 2001 Havoc Pennington +- update to CVS snapshot + +* Wed Sep 05 2001 Havoc Pennington +- require specific pango version +- fix ltmain.sh to destroy all relinking BS + +* Tue Sep 4 2001 root +- Version 0.2 + +* Sat Jul 21 2001 Owen Taylor +- Configure with --disable-gtk-doc + +* Tue Jul 10 2001 Trond Eivind Glomsr?d +- Add post- and postun-sections running ldconfig + +* Wed Jun 13 2001 Havoc Pennington +- 0.2 + +* Fri May 4 2001 Owen Taylor +- Initial version From svn at tinysofa.org Thu Jul 1 15:35:57 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:35:57 +1000 (EST) Subject: [tinysofa-svn] r2529 - in tinysofa/snapshot: . autofs autofs/current autofs/current/sources autofs/current/specs Message-ID: <20040701153557.064CB4E817F@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:35:56 +1000 (Fri, 02 Jul 2004) New Revision: 2529 Added: tinysofa/snapshot/autofs/ tinysofa/snapshot/autofs/current/ tinysofa/snapshot/autofs/current/sources/ tinysofa/snapshot/autofs/current/sources/autofs-4.1.0-auto-master.patch tinysofa/snapshot/autofs/current/sources/autofs-4.1.0-hesiod-bind.patch tinysofa/snapshot/autofs/current/sources/autofs-4.1.0-loop.patch tinysofa/snapshot/autofs/current/sources/autofs-4.1.2-init-redhat-only.patch tinysofa/snapshot/autofs/current/sources/autofs-4.1.2-option-parsing.patch tinysofa/snapshot/autofs/current/sources/autofs-4.1.3-non-strict-loop-fix.patch tinysofa/snapshot/autofs/current/sources/autofs-4.1.3-rpc-ping.patch tinysofa/snapshot/autofs/current/sources/autofs-4.1.3-underlinei18n.patch tinysofa/snapshot/autofs/current/sources/autofs-4.1.3.tar.bz2 tinysofa/snapshot/autofs/current/sources/autofs.sysconfig tinysofa/snapshot/autofs/current/specs/ tinysofa/snapshot/autofs/current/specs/autofs.spec Log: - Add autofs to snapshot from 2.0. Added: tinysofa/snapshot/autofs/current/sources/autofs-4.1.0-auto-master.patch =================================================================== --- tinysofa/snapshot/autofs/current/sources/autofs-4.1.0-auto-master.patch 2004-07-01 15:35:55 UTC (rev 2528) +++ tinysofa/snapshot/autofs/current/sources/autofs-4.1.0-auto-master.patch 2004-07-01 15:35:56 UTC (rev 2529) @@ -0,0 +1,10 @@ +--- autofs-4.1.0/samples/auto.master.orig 2004-03-10 17:18:36.000000000 -0500 ++++ autofs-4.1.0/samples/auto.master 2004-03-10 17:18:41.000000000 -0500 +@@ -6,5 +6,5 @@ + # key [ -mount-options-separated-by-comma ] location + # For details of the format look at autofs(5). + #/misc /etc/auto.misc --timeout=60 +-/misc /etc/auto.misc +-/net /etc/auto.net ++#/misc /etc/auto.misc ++#/net /etc/auto.net Added: tinysofa/snapshot/autofs/current/sources/autofs-4.1.0-hesiod-bind.patch =================================================================== --- tinysofa/snapshot/autofs/current/sources/autofs-4.1.0-hesiod-bind.patch 2004-07-01 15:35:55 UTC (rev 2528) +++ tinysofa/snapshot/autofs/current/sources/autofs-4.1.0-hesiod-bind.patch 2004-07-01 15:35:56 UTC (rev 2529) @@ -0,0 +1,60 @@ +--- autofs-4.1.0/modules/lookup_hesiod.c.orig 2003-09-29 04:22:35.000000000 -0400 ++++ autofs-4.1.0/modules/lookup_hesiod.c 2004-02-18 11:56:01.000000000 -0500 +@@ -34,6 +34,9 @@ + + struct lookup_context { + struct parse_mod *parser; ++#ifdef HESIOD_BIND ++ void *hesiod_context; ++#endif + }; + + int lookup_version = AUTOFS_LOOKUP_VERSION; /* Required by protocol */ +@@ -54,6 +57,13 @@ int lookup_init(const char *mapfmt, int + /* Initialize the resolver. */ + res_init(); + ++#ifdef HESIOD_BIND ++ /* Initialize the hesiod context. */ ++ if (hesiod_init(&(ctxt->hesiod_context)) != 0) { ++ syslog(LOG_CRIT, MODPREFIX "hesiod_init(): %m"); ++ return 1; ++ } ++#endif + /* If a map type isn't explicitly given, parse it as hesiod entries. */ + if (!mapfmt) + mapfmt = MAPFMT_DEFAULT; +@@ -83,7 +93,11 @@ int lookup_mount(const char *root, const + chdir("/"); /* If this is not here the filesystem stays + busy, for some reason... */ + ++#ifdef HESIOD_BIND ++ hes_result = hesiod_resolve(ctxt->hesiod_context, name, "filsys"); ++#else + hes_result = hes_resolve(name, "filsys"); ++#endif + + if (!hes_result) { + syslog(LOG_NOTICE, MODPREFIX "entry \"%s\" not found in map\n", name); +@@ -94,7 +108,11 @@ int lookup_mount(const char *root, const + name, hes_result[0])); + rv = ctxt->parser->parse_mount(root, name, name_len, hes_result[0], + ctxt->parser->context); ++#ifdef HESIOD_BIND ++ hesiod_free_list(ctxt->hesiod_context, hes_result); ++#else + free(hes_result); ++#endif + return rv; + } + +@@ -104,6 +122,9 @@ int lookup_done(void *context) + { + struct lookup_context *ctxt = (struct lookup_context *) context; + int rv = close_parse(ctxt->parser); ++#ifdef HESIOD_BIND ++ hesiod_end(ctxt->hesiod_context); ++#endif + free(ctxt); + return rv; + } Added: tinysofa/snapshot/autofs/current/sources/autofs-4.1.0-loop.patch =================================================================== --- tinysofa/snapshot/autofs/current/sources/autofs-4.1.0-loop.patch 2004-07-01 15:35:55 UTC (rev 2528) +++ tinysofa/snapshot/autofs/current/sources/autofs-4.1.0-loop.patch 2004-07-01 15:35:56 UTC (rev 2529) @@ -0,0 +1,17 @@ +--- autofs-4.1.0/modules/mount_autofs.c.org 2004-02-18 12:04:40.000000000 -0500 ++++ autofs-4.1.0/modules/mount_autofs.c 2004-02-18 12:05:37.000000000 -0500 +@@ -95,12 +95,12 @@ int mount_mount(const char *root, const + } + + if (options) { +- char *p = options; ++ char *p = options - 1; + do { + argc++; + if (*p == ',') + p++; +- } while ((p = strchr(p, ',')) != NULL); ++ } while ((p = strchr(p + 1, ',')) != NULL); + } + argv = (char **) alloca((argc + 1) * sizeof(char *)); + Added: tinysofa/snapshot/autofs/current/sources/autofs-4.1.2-init-redhat-only.patch =================================================================== --- tinysofa/snapshot/autofs/current/sources/autofs-4.1.2-init-redhat-only.patch 2004-07-01 15:35:55 UTC (rev 2528) +++ tinysofa/snapshot/autofs/current/sources/autofs-4.1.2-init-redhat-only.patch 2004-07-01 15:35:56 UTC (rev 2529) @@ -0,0 +1,114 @@ +--- autofs-4.1.3/samples/rc.autofs.in.init-redhat-only 2004-05-10 09:57:14.000000000 -0400 ++++ autofs-4.1.3/samples/rc.autofs.in 2004-06-01 19:51:06.151912776 -0400 +@@ -36,15 +36,7 @@ + # + # Determine which kind of configuration we're using + # +-system=unknown +-if [ -f /etc/debian_version ]; then +- system=debian +-elif [ -f /etc/redhat-release ]; then +- system=redhat +-else +- echo "$0: Unknown system, please port and contact autofs at linux.kernel.org" 1>&2 +- exit 1 +-fi ++system=redhat + + if [ $system = redhat ]; then + . $initdir/functions +@@ -64,16 +56,9 @@ + export PATH + + # +-# We can add local options here +-# e.g. localoptions='rsize=8192,wsize=8192' +-# +-localoptions='' +- +-# +-# Daemon options +-# e.g. --timeout=60 ++# Define custom options in /etc/sysconfig/autofs + # +-daemonoptions='' ++. /etc/sysconfig/autofs + + # + # Check for all maps that are to be loaded +@@ -169,28 +154,28 @@ + # If the options include a -t or --timeout, a -g or --ghost, + # a -v or --verbose or a -d or --debug paramter, then pull + # those particular options out. +- : echo DAEMONOPTIONS OPTIONS $daemonoptions $options ++ : echo DAEMONOPTIONS OPTIONS $DAEMONOPTIONS $options + startupoptions= +- if echo "$daemonoptions" | grep -q -- '-t' ; then +- startupoptions="--timeout=$(echo $daemonoptions $options | \ ++ if echo "$DAEMONOPTIONS" | grep -q -- '-t' ; then ++ startupoptions="--timeout=$(echo $DAEMONOPTIONS $options | \ + sed 's/.*--*t\(imeout\)*[ \t=]*\([0-9][0-9]*\).*$/\2/g')" + fi +- # Override timeout in $daemonoptions with map $options ++ # Override timeout in $DAEMONOPTIONS with map $options + if echo "$options" | grep -q -- '-t' ; then +- startupoptions="--timeout=$(echo $daemonoptions $options | \ ++ startupoptions="--timeout=$(echo $DAEMONOPTIONS $options | \ + sed 's/.*--*t\(imeout\)*[ \t=]*\([0-9][0-9]*\).*$/\2/g')" + fi +- if echo "$daemonoptions $options" | grep -q -- '-g' ; then ++ if echo "$DAEMONOPTIONS $options" | grep -q -- '-g' ; then + startupoptions="$startupoptions --ghost" + fi +- if echo "$daemonoptions $options" | grep -q -- '-v' ; then ++ if echo "$DAEMONOPTIONS $options" | grep -q -- '-v' ; then + startupoptions="$startupoptions --verbose" + fi +- if echo "$daemonoptions $options" | grep -q -- '-d' ; then ++ if echo "$DAEMONOPTIONS $options" | grep -q -- '-d' ; then + startupoptions="$startupoptions --debug" + fi + # Other option flags are intended for maps. +- mapoptions="$(echo "$daemonoptions $options" |\ ++ mapoptions="$(echo "$DAEMONOPTIONS $options" |\ + sed 's/--*t\(imeout\)*[ \t=]*\([0-9][0-9]*\)//g' | + sed 's/--*g\(host\)*//g' | + sed 's/--*v\(erbose\)*//g' | +@@ -214,10 +199,12 @@ + map= + else + maptype=yp +- # If the master map says the maps have '_' why change it? +- # map=`basename $map | sed -e s/^auto_home/auto.home/ -e s/^auto_mnt/auto.mnt/` +- map=`basename $map | sed 's^//^/^g'` +- fi ++ if [ "$UNDERSCORETODOT" = "0" ] ; then ++ map=`basename $map | sed 's^//^/^g'` ++ else ++ map=`basename $map | sed -e s/^auto_home/auto.home/ -e s/^auto_mnt/auto.mnt/` ++ fi ++ fi + fi + map=`echo $map | cut -f2- -d:` + +@@ -226,9 +213,9 @@ + : echo MAPTYPE $maptype + : echo MAP $map + : echo MAPOPTIONS $mapoptions +- : echo LOCALOPTIONS $localoptions ++ : echo LOCALOPTIONS $LOCALOPTIONS + +- echo "$DAEMON $startupoptions $dir $maptype $map $mapoptions $localoptions" | sed -e 's/ / /g' -e 's/ */ /g' ++ echo "$DAEMON $startupoptions $dir $maptype $map $mapoptions $LOCALOPTIONS" | sed -e 's/ / /g' -e 's/ */ /g' + + : echo ------------------------ + fi +@@ -450,7 +437,7 @@ + echo -n " $mnt" + pidfile=/var/run/autofs`echo $mnt | sed 's/\//./'`.pid + start-stop-daemon --start --pidfile $pidfile --quiet \ +- --exec $DAEMON $daemonoptions -- $rest ++ --exec $DAEMON $DAEMONOPTIONS -- $rest + done + echo "." + ;; Added: tinysofa/snapshot/autofs/current/sources/autofs-4.1.2-option-parsing.patch =================================================================== --- tinysofa/snapshot/autofs/current/sources/autofs-4.1.2-option-parsing.patch 2004-07-01 15:35:55 UTC (rev 2528) +++ tinysofa/snapshot/autofs/current/sources/autofs-4.1.2-option-parsing.patch 2004-07-01 15:35:56 UTC (rev 2529) @@ -0,0 +1,62 @@ +--- autofs-4.1.3/samples/rc.autofs.in.option-parsing 2004-06-01 19:54:49.132014648 -0400 ++++ autofs-4.1.3/samples/rc.autofs.in 2004-06-01 20:02:25.976563720 -0400 +@@ -156,30 +156,45 @@ + # those particular options out. + : echo DAEMONOPTIONS OPTIONS $DAEMONOPTIONS $options + startupoptions= +- if echo "$DAEMONOPTIONS" | grep -q -- '-t' ; then +- startupoptions="--timeout=$(echo $DAEMONOPTIONS $options | \ +- sed 's/.*--*t\(imeout\)*[ \t=]*\([0-9][0-9]*\).*$/\2/g')" +- fi +- # Override timeout in $DAEMONOPTIONS with map $options +- if echo "$options" | grep -q -- '-t' ; then +- startupoptions="--timeout=$(echo $DAEMONOPTIONS $options | \ ++ if echo "$options" | grep -qE -- '\B-(t\b|-timeout\b=)' ; ++ then ++ startupoptions="--timeout=$(echo $options |\ ++ sed 's/.*-\(t[^0-9]*\|-timeout\)[ \t=]*\([0-9][0-9]*\).*$/\2/g')" ++ elif echo "$DAEMONOPTIONS" | grep -q -- '-t' ; ++ then ++ # It's okay to be sloppy with DAEMONOPTIONS as there is no ++ # possibility of conflicting with mount or map options. ++ startupoptions="--timeout=$(echo $DAEMONOPTIONS | \ + sed 's/.*--*t\(imeout\)*[ \t=]*\([0-9][0-9]*\).*$/\2/g')" + fi +- if echo "$DAEMONOPTIONS $options" | grep -q -- '-g' ; then ++ ++ # Check for the ghost option ++ if echo "$options" | grep -qE -- '\B-(g\b|-ghost\b)' ; ++ then + startupoptions="$startupoptions --ghost" + fi +- if echo "$DAEMONOPTIONS $options" | grep -q -- '-v' ; then ++ ++ # Check for verbose ++ if echo "$DAEMONOPTIONS $options" | \ ++ grep -qE -- '\B-(v\b|-verbose\b)' ; ++ then + startupoptions="$startupoptions --verbose" + fi +- if echo "$DAEMONOPTIONS $options" | grep -q -- '-d' ; then ++ ++ # Check for debug ++ if echo "$DAEMONOPTIONS $options" | \ ++ grep -qE -- '\B-(d\b|-debug\b)' ; ++ then + startupoptions="$startupoptions --debug" + fi ++ + # Other option flags are intended for maps. + mapoptions="$(echo "$DAEMONOPTIONS $options" |\ +- sed 's/--*t\(imeout\)*[ \t=]*\([0-9][0-9]*\)//g' | +- sed 's/--*g\(host\)*//g' | +- sed 's/--*v\(erbose\)*//g' | +- sed 's/--*d\(ebug\)*//g')" ++ sed 's/-\(t[^0-9]*\|-timeout\)[ \t=]*\([0-9][0-9]*\)//g' | ++ sed 's/-\(g\b\|-ghost\b\)//g' | ++ sed 's/-\(v\b\|-verbose\b\)//g' | ++ sed 's/-\(d\b\|-debug\b\)//g')" ++ + # Break up the maptype and map, if the map type is specified + maptype=`echo $map | cut -f1 -d:` + # Handle degenerate map specifiers Added: tinysofa/snapshot/autofs/current/sources/autofs-4.1.3-non-strict-loop-fix.patch =================================================================== --- tinysofa/snapshot/autofs/current/sources/autofs-4.1.3-non-strict-loop-fix.patch 2004-07-01 15:35:55 UTC (rev 2528) +++ tinysofa/snapshot/autofs/current/sources/autofs-4.1.3-non-strict-loop-fix.patch 2004-07-01 15:35:56 UTC (rev 2529) @@ -0,0 +1,56 @@ + +Problem: infinite error loop occurs when trying to access non-exitent + directory. + +This patch, for 4.1.3, fixes the problem caused when the default for +multi-mounts was changed from strict to non-strict. This change tickled +a bug in the old autofs4 kernel module found in 2.4 kernels and 2.6 +kernels to date (ie. < 2.6.7). + +This change in default caused a small change in mount logic which went +unnoticed and lead to this problem. So the kernel interaction problem +remains but is much less likely to occur. If this problem persists +after applying this patch then update your kernel autofs4. + +The patch restores the previous logic but leaves the new default. + +diff -Nur autofs-4.1.3.orig/modules/parse_sun.c autofs-4.1.3/modules/parse_sun.c +--- autofs-4.1.3.orig/modules/parse_sun.c 2004-05-18 20:22:40.000000000 +0800 ++++ autofs-4.1.3/modules/parse_sun.c 2004-05-29 15:38:42.000000000 +0800 +@@ -602,10 +602,8 @@ + options); + } + +- if (nonstrict && rv) { +- debug("ignoring failure of non-strict mount"); +- return 0; +- } ++ if (nonstrict && rv) ++ return -rv; + + return rv; + } +@@ -746,7 +744,11 @@ + free(loc); + free(myoptions); + +- if (rv) ++ /* Convert non-strict failure into success */ ++ if (rv < 0) { ++ rv = 0; ++ debug("parse_mount: ignoring failure of non-strict mount"); ++ } else if (rv > 0) + break; + + } while (*p == '/'); +@@ -789,6 +791,10 @@ + options, loclen, loc); + + rv = sun_mount(root, name, name_len, loc, loclen, options); ++ /* non-strict failure to normal failure for ordinary mount */ ++ if (rv < 0) ++ rv = -rv; ++ + free(loc); + free(options); + } Added: tinysofa/snapshot/autofs/current/sources/autofs-4.1.3-rpc-ping.patch =================================================================== --- tinysofa/snapshot/autofs/current/sources/autofs-4.1.3-rpc-ping.patch 2004-07-01 15:35:55 UTC (rev 2528) +++ tinysofa/snapshot/autofs/current/sources/autofs-4.1.3-rpc-ping.patch 2004-07-01 15:35:56 UTC (rev 2529) @@ -0,0 +1,335 @@ +diff -Nur autofs-4.1.3.orig/lib/rpc_subs.c autofs-4.1.3/lib/rpc_subs.c +--- autofs-4.1.3.orig/lib/rpc_subs.c 2004-05-18 20:20:08.000000000 +0800 ++++ autofs-4.1.3/lib/rpc_subs.c 2004-06-13 10:47:57.000000000 +0800 +@@ -1,38 +1,274 @@ ++/* ----------------------------------------------------------------------- * ++ * ++ * rpc_subs.c - routines for rpc discovery ++ * ++ * Copyright 2004 Ian Kent - All Rights Reserved ++ * Copyright 2004 Jeff Moyer - All Rights Reserved ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation, Inc., 675 Mass Ave, Cambridge MA 02139, ++ * USA; either version 2 of the License, or (at your option) any later ++ * version; incorporated herein by reference. ++ * ++ * ----------------------------------------------------------------------- */ ++ + #include ++#include + #include + #include + #include + #include +- ++ ++#include ++#include ++#include ++#include ++#include ++#include ++ + #include "automount.h" + ++#define PMAP_TOUT_UDP 3 ++#define PMAP_TOUT_TCP 6 ++ ++struct conn_info { ++ const char *host; ++ unsigned short port; ++ unsigned long program; ++ unsigned long version; ++ struct protoent *proto; ++ unsigned int send_sz; ++ unsigned int recv_sz; ++ struct timeval timeout; ++}; ++ ++/* ++ * Create a UDP RPC client ++ */ ++static CLIENT* create_udp_client(struct conn_info *info) ++{ ++ int fd = -1; ++ CLIENT *client; ++ struct sockaddr_in addr; ++ struct hostent *hp; ++ ++ if (info->proto->p_proto != IPPROTO_UDP) ++ return NULL; ++ ++ memset(&addr, 0, sizeof(addr)); ++ ++ hp = gethostbyname(info->host); ++ if (!hp) ++ return NULL; ++ ++ addr.sin_family = AF_INET; ++ addr.sin_port = htons(info->port); ++ memcpy(&addr.sin_addr.s_addr, hp->h_addr, hp->h_length); ++ ++ client = clntudp_bufcreate(&addr, ++ info->program, info->version, ++ info->timeout, &fd, ++ info->send_sz, info->recv_sz); ++ ++ return client; ++} ++ ++/* ++ * Perform a non-blocking connect on the socket fd. ++ * ++ * tout contains the timeout. It will be modified to contain the time ++ * remaining (i.e. time provided - time elasped). ++ */ ++static int connect_nb(int fd, struct sockaddr_in *addr, struct timeval *tout) ++{ ++ int flags, ret, len; ++ fd_set wset, rset; ++ ++ flags = fcntl(fd, F_GETFL, 0); ++ if (flags < 0) ++ return -1; ++ ++ ret = fcntl(fd, F_SETFL, flags | O_NONBLOCK); ++ if (ret < 0) ++ return -1; ++ ++ ret = connect(fd, (struct sockaddr *)addr, sizeof(struct sockaddr)); ++ if (ret < 0 && errno != EINPROGRESS) ++ goto done; ++ ++ if (ret == 0) ++ goto done; ++ ++ /* now wait */ ++ FD_ZERO(&rset); ++ FD_SET(fd, &rset); ++ wset = rset; ++ ++ ret = select(fd + 1, &rset, &wset, NULL, tout); ++ if (!ret) { ++ ret = -errno; ++ goto done; ++ } ++ ++ if (FD_ISSET(fd, &rset) || FD_ISSET(fd, &wset)) { ++ int stat; ++ ++ len = sizeof(ret); ++ stat = getsockopt(fd, SOL_SOCKET, SO_ERROR, &ret, &len); ++ if (stat < 0) { ++ ret = -errno; ++ goto done; ++ } ++ ++ /* Oops - something wrong with connect */ ++ if (ret) ++ ret = -ret; ++ } ++ ++done: ++ fcntl(fd, F_SETFL, flags); ++ return ret; ++} ++ ++/* ++ * Create a TCP RPC client using non-blocking connect ++ */ ++static CLIENT* create_tcp_client(struct conn_info *info) ++{ ++ int fd; ++ CLIENT *client; ++ struct sockaddr_in addr; ++ struct hostent *hp; ++ int ret; ++ ++ if (info->proto->p_proto != IPPROTO_TCP) ++ return NULL; ++ ++ memset(&addr, 0, sizeof(addr)); ++ ++ hp = gethostbyname(info->host); ++ if (!hp) ++ return NULL; ++ ++ addr.sin_family = AF_INET; ++ addr.sin_port = htons(info->port); ++ memcpy(&addr.sin_addr.s_addr, hp->h_addr, hp->h_length); ++ ++ fd = socket(PF_INET, SOCK_STREAM, info->proto->p_proto); ++ if (fd < 0) ++ return NULL; ++ ++ ret = connect_nb(fd, &addr, &info->timeout); ++ if (ret < 0) ++ goto out_close; ++ ++ client = clnttcp_create(&addr, ++ info->program, info->version, &fd, ++ info->send_sz, info->recv_sz); ++ if (!client) ++ goto out_close; ++ ++ return client; ++ ++out_close: ++ close(fd); ++ return NULL; ++} ++ ++static unsigned short portmap_getport(struct conn_info *info) ++{ ++ struct conn_info pmap_info; ++ unsigned short port = 0; ++ CLIENT *client; ++ enum clnt_stat stat; ++ struct pmap parms; ++ ++ pmap_info.host = info->host; ++ pmap_info.port = PMAPPORT; ++ pmap_info.program = PMAPPROG; ++ pmap_info.version = PMAPVERS; ++ pmap_info.proto = info->proto; ++ pmap_info.send_sz = RPCSMALLMSGSIZE; ++ pmap_info.recv_sz = RPCSMALLMSGSIZE; ++ pmap_info.timeout.tv_sec = PMAP_TOUT_UDP; ++ pmap_info.timeout.tv_usec = 0; ++ ++ if (info->proto->p_proto == IPPROTO_TCP) { ++ pmap_info.timeout.tv_sec = PMAP_TOUT_TCP; ++ client = create_tcp_client(&pmap_info); ++ } else ++ client = create_udp_client(&pmap_info); ++ ++ if (!client) ++ return 0; ++ ++ parms.pm_prog = info->program; ++ parms.pm_vers = info->version; ++ parms.pm_prot = info->proto->p_proto; ++ parms.pm_port = 0; ++ ++ stat = clnt_call(client, PMAPPROC_GETPORT, ++ (xdrproc_t) xdr_pmap, (caddr_t) &parms, ++ (xdrproc_t) xdr_u_short, (caddr_t) &port, ++ pmap_info.timeout); ++ ++ clnt_destroy(client); ++ ++ if (stat != RPC_SUCCESS) ++ return 0; ++ ++ return port; ++} ++ + static int rpc_ping_proto(const char *host, +- unsigned long nfs_version, const char *proto, ++ unsigned long nfs_version, ++ const char *proto, + long seconds, long micros) + { ++ struct conn_info info; + CLIENT *client; +- struct timeval tout; + enum clnt_stat stat; ++ struct protoent *prot; ++ ++ prot = getprotobyname(proto); ++ if (!prot) ++ return 1; ++ ++ info.host = host; ++ info.program = NFS_PROGRAM; ++ info.version = nfs_version; ++ info.proto = prot; ++ info.send_sz = 0; ++ info.recv_sz = 0; ++ info.timeout.tv_sec = seconds; ++ info.timeout.tv_usec = micros; + +- client = clnt_create(host, NFS_PROGRAM, nfs_version, proto); +- if (client == NULL) { ++ info.port = portmap_getport(&info); ++ if (!info.port) + return 0; +- } + +- tout.tv_sec = seconds; +- tout.tv_usec = micros; ++ if (prot->p_proto == IPPROTO_UDP) { ++ info.send_sz = UDPMSGSIZE; ++ info.recv_sz = UDPMSGSIZE; ++ client = create_udp_client(&info); ++ } else ++ client = create_tcp_client(&info); ++ ++ if (!client) ++ return 0; + +- clnt_control(client, CLSET_TIMEOUT, (char *)&tout); +- clnt_control(client, CLSET_RETRY_TIMEOUT, (char *)&tout); ++ clnt_control(client, CLSET_TIMEOUT, (char *) &info.timeout); ++ clnt_control(client, CLSET_RETRY_TIMEOUT, (char *) &info.timeout); + + stat = clnt_call(client, NFSPROC_NULL, +- (xdrproc_t)xdr_void, 0, (xdrproc_t)xdr_void, 0, tout); ++ (xdrproc_t) xdr_void, 0, (xdrproc_t) xdr_void, 0, ++ info.timeout); + + clnt_destroy(client); + +- if (stat != RPC_SUCCESS) { ++ if (stat != RPC_SUCCESS) + return 0; +- } + + return 1; + } +@@ -108,10 +344,39 @@ + + taken = elapsed(start, end); + +- if (result != NULL) { ++ if (result != NULL) + *result = taken; +- } + + return status; + } + ++#if 0 ++#include ++ ++int main(int argc, char **argv) ++{ ++ int ret; ++ double res = 0.0; ++ ++ ret = rpc_ping("budgie", 10, 0); ++ printf("ret = %d\n", ret); ++ ++ res = 0.0; ++ ret = rpc_time("raven", NFS2_VERSION, RPC_PING_TCP, 10, 0, &res); ++ printf("v2 tcp ret = %d, res = %f\n", ret, res); ++ ++ res = 0.0; ++ ret = rpc_time("raven", NFS3_VERSION, RPC_PING_TCP, 10, 0, &res); ++ printf("v3 tcp ret = %d, res = %f\n", ret, res); ++ ++ res = 0.0; ++ ret = rpc_time("raven", NFS2_VERSION, RPC_PING_UDP, 10, 0, &res); ++ printf("v2 udp ret = %d, res = %f\n", ret, res); ++ ++ res = 0.0; ++ ret = rpc_time("raven", NFS3_VERSION, RPC_PING_UDP, 10, 0, &res); ++ printf("v3 udp ret = %d, res = %f\n", ret, res); ++ ++ exit(0); ++} ++#endif + + Added: tinysofa/snapshot/autofs/current/sources/autofs-4.1.3-underlinei18n.patch =================================================================== --- tinysofa/snapshot/autofs/current/sources/autofs-4.1.3-underlinei18n.patch 2004-07-01 15:35:55 UTC (rev 2528) +++ tinysofa/snapshot/autofs/current/sources/autofs-4.1.3-underlinei18n.patch 2004-07-01 15:35:56 UTC (rev 2529) @@ -0,0 +1,26 @@ +--- autofs-4.1.3/samples/rc.autofs.in.i18n 2004-06-21 13:22:12.000000000 -0400 ++++ autofs-4.1.3/samples/rc.autofs.in 2004-06-21 13:31:29.000000000 -0400 +@@ -244,12 +244,10 @@ + # + function status() + { +- echo $"Configured Mount Points:" +- echo "------------------------" ++ echo -e $"Configured Mount Points:\n------------------------" + getmounts + echo "" +- echo $"Active Mount Points:" +- echo "--------------------" ++ echo -e $"Active Mount Points:\n--------------------" + ps axwww|grep "[0-9]:[0-9][0-9] $DAEMON " | ( + while read pid tt stat time command; do echo $command; done + ) +@@ -356,7 +354,7 @@ + fi + [ $RETVAL = 0 ] && touch /var/lock/subsys/autofs + else +- echo -n "" $"No Mountpoints Defined" ++ echo -n $"No Mountpoints Defined" + success "$prog startup" + fi + rm -f $TMP Added: tinysofa/snapshot/autofs/current/sources/autofs-4.1.3.tar.bz2 =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/autofs/current/sources/autofs-4.1.3.tar.bz2 ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/autofs/current/sources/autofs.sysconfig =================================================================== --- tinysofa/snapshot/autofs/current/sources/autofs.sysconfig 2004-07-01 15:35:55 UTC (rev 2528) +++ tinysofa/snapshot/autofs/current/sources/autofs.sysconfig 2004-07-01 15:35:56 UTC (rev 2529) @@ -0,0 +1,22 @@ +# Define custom options in /etc/sysconfig/autofs +# Use LOCALOPTIONS for defining variables, e.g. OSREL +# Use DAEMONOPTIONS to define the unmount timeout +# Define UNDERSCORETODOT as 1 to convert +# auto_home to auto.home and auto_mnt to auto.mnt +# Mount options, e.g. rsize=8192, should go in auto.master or +# the auto_* map entry for a specific mount point +# +LOCALOPTIONS="" +DAEMONOPTIONS="--timeout=60" + +# UNDERSCORETODOT changes auto_home to auto.home and auto_mnt to auto.mnt +UNDERSCORETODOT=1 + +# This option will strip a leading dash from the options column in the +# auto.master file before passing these options to the automount daeon. +# The practical implication of this is that the options will now be +# interpreted as options for mount instead of options for the map. This +# is behaviour conformant with Sun's automounter. By default, the option +# is 0, for backwards compatibility and for those who wish to specify +# options to the maps themselves. +STRIPDASH=0 Added: tinysofa/snapshot/autofs/current/specs/autofs.spec =================================================================== --- tinysofa/snapshot/autofs/current/specs/autofs.spec 2004-07-01 15:35:55 UTC (rev 2528) +++ tinysofa/snapshot/autofs/current/specs/autofs.spec 2004-07-01 15:35:56 UTC (rev 2529) @@ -0,0 +1,324 @@ +# +# $Id: autofs.spec,v 1.11 2003/12/04 15:41:32 raven Exp $ +# +Summary: A tool for automatically mounting and unmounting filesystems. +Name: autofs +%define version 4.1.3 +%define release 8ts +Version: %{version} +Release: %{release} +Epoch: 1 +Copyright: GPL +Group: System Environment/Daemons +Source: ftp://ftp.kernel.org/pub/linux/daemons/autofs/v4/autofs-%{version}.tar.bz2 +Source1: autofs.sysconfig +Patch1: autofs-4.1.0-hesiod-bind.patch +Patch2: autofs-4.1.0-loop.patch +Patch3: autofs-4.1.0-auto-master.patch +Patch4: autofs-4.1.2-init-redhat-only.patch +Patch5: autofs-4.1.3-non-strict-loop-fix.patch +#Patch7: autofs-4.1.1-get-best-mount.patch +#Patch8: autofs-4.1.2-stripdash.patch +Patch12: autofs-4.1.2-option-parsing.patch +Patch14: autofs-4.1.3-underlinei18n.patch +Patch15: autofs-4.1.3-rpc-ping.patch +Buildroot: %{_tmppath}/%{name}-%{version}-tmp +BuildPrereq: autoconf, hesiod-devel, openldap-devel, perl +Prereq: chkconfig +Requires: /bin/bash mktemp sed gawk textutils sh-utils grep /bin/ps +Obsoletes: autofs-ldap +Summary(de): autofs daemon +Summary(fr): d?mon autofs +Summary(tr): autofs sunucu s?reci +Summary(sv): autofs-daemon + +# start tinysofa auto-buildrequires section +BuildRequires: coreutils +BuildRequires: mktemp +BuildRequires: prelink +BuildRequires: specspo +BuildRequires: cpp +BuildRequires: pcre +BuildRequires: libselinux +BuildRequires: libtermcap +BuildRequires: diffutils +BuildRequires: file +BuildRequires: glibc-common +BuildRequires: rpm-build +BuildRequires: glibc-headers +BuildRequires: glibc-kernheaders +BuildRequires: hesiod-devel +BuildRequires: openldap-devel +BuildRequires: beecrypt +BuildRequires: bzip2-libs +BuildRequires: elfutils-libelf +BuildRequires: krb5-libs +BuildRequires: popt +BuildRequires: cyrus-sasl +BuildRequires: zlib +BuildRequires: tinysofa-rpm-config +# end tinysofa auto-buildrequires section + +%description +autofs is a daemon which automatically mounts filesystems when you use +them, and unmounts them later when you are not using them. This can +include network filesystems, CD-ROMs, floppies, and so forth. + +%description -l de +autofs ist ein D?mon, der Dateisysteme automatisch montiert, wenn sie +benutzt werden, und sie sp?ter bei Nichtbenutzung wieder demontiert. +Dies kann Netz-Dateisysteme, CD-ROMs, Disketten und ?hnliches einschlie?en. + +%description -l fr +autofs est un d?mon qui monte automatiquement les syst?mes de fichiers +lorsqu'on les utilise et les d?monte lorsqu'on ne les utilise plus. Cela +inclus les syst?mes de fichiers r?seau, les CD-ROMs, les disquettes, etc. + +%description -l tr +autofs, kullan?lan dosya sistemlerini gerek olunca kendili?inden ba?lar +ve kullan?mlar? sona erince yine kendili?inden ??zer. Bu i?lem, a? dosya +sistemleri, CD-ROM'lar ve disketler ?zerinde yap?labilir. + +%description -l sv +autofs ?r en daemon som mountar filsystem n?r de anv?nda, och senare +unmountar dem n?r de har varit oanv?nda en best?md tid. Detta kan +inkludera n?tfilsystem, CD-ROM, floppydiskar, och s? vidare. + +%prep +%setup -q +echo %{version}-%{release} > .version +%patch1 -p1 -b .hesiod-bind +%patch2 -p1 -b .loop +%patch3 -p1 -b .auto-master +%patch4 -p1 -b .init-redhat-only +%patch5 -p1 -b .non-strict-loop-fix +#%patch8 -p1 -b .stripdash +%patch12 -p1 -b .option-parsing +%patch14 -p1 -b .i18n +%patch15 -p1 -b .rpc-ping +cp $RPM_SOURCE_DIR/autofs.sysconfig . + +%build +#CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --libdir=%{_libdir} +%configure +make initdir=/etc/rc.d/init.d + +%install +rm -rf $RPM_BUILD_ROOT +mkdir -p -m755 $RPM_BUILD_ROOT/etc/rc.d/init.d +mkdir -p -m755 $RPM_BUILD_ROOT%{_sbindir} +mkdir -p -m755 $RPM_BUILD_ROOT%{_libdir}/autofs +mkdir -p -m755 $RPM_BUILD_ROOT%{_mandir}/{man5,man8} +mkdir -p -m755 $RPM_BUILD_ROOT/etc/sysconfig + +make install mandir=%{_mandir} initdir=/etc/rc.d/init.d INSTALLROOT=$RPM_BUILD_ROOT +install -m 755 -d $RPM_BUILD_ROOT/misc +install -m 644 autofs.sysconfig $RPM_BUILD_ROOT/etc/sysconfig/autofs + +%clean +[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT + +%post +chkconfig --add autofs + +%postun +if [ $1 -ge 1 ] ; then + /sbin/service autofs condrestart > /dev/null 2>&1 || : +fi + +%preun +if [ "$1" = 0 ] ; then + /sbin/service autofs stop > /dev/null 2>&1 || : + /sbin/chkconfig --del autofs +fi +exit 0 + +%files +%defattr(-,root,root) +%doc CREDITS COPY* README* TODO multiserver_mount.patch patches/* samples/ldap* samples/autofs.schema +%doc +%config /etc/rc.d/init.d/autofs +%config(noreplace,missingok) /etc/auto.master +%config(noreplace,missingok) /etc/auto.misc +%config(noreplace,missingok) /etc/auto.net +%config(noreplace) /etc/sysconfig/autofs +%dir /misc +%dir %{_libdir}/autofs +%{_sbindir}/automount +%{_mandir}/*/* +%{_libdir}/autofs/* + +%changelog +* Mon Jun 21 2004 Jeff Moyer - 1:4.1.3-8 +- Change icmp ping to an rpc ping. (Ian Kent) +- Fix i18n patch + o Remove the extra \" from one echo line. + o Use echo -e if we are going to do a \n in the echo string. + +* Mon Jun 21 2004 Alan Cox +- Fixed i18n bug #107463 + +* Mon Jun 21 2004 Alan Cox +- Fixed i18n bug #107461 + +* Tue Jun 15 2004 Elliot Lee +- rebuilt + +* Sat Jun 5 2004 Jeff Moyer - 1:4.1.3-4 +- Perform an icmp ping request before rpc_pings, since the rpc clnt_create + function has a builtin default timeout of 60 seconds. This could result + in a long delay when a server in a replicated mount setup is down. +- For non-replicated server entries, ping a host before attempting to mount. + (Ian Kent) +- Change to %%configure. +- Put version-release into .version to allow for automount --version to + print exact info. +- Nuke my get-best-mount patch which always uses the long timeout. This + should no longer be needed. +- Put name into changelog entries to make them consistent. Add e:n-v-r + into Florian's entry. +- Stop autofs before uninstalling + +* Sat Jun 05 2004 Florian La Roche - 1:4.1.3-3 +- add a preun script to remove autofs + +* Tue Jun 1 2004 Jeff Moyer - 1:4.1.3-2 +- Incorporate patch from Ian which fixes an infinite loop seen by those + running older versions of the kernel patches (triggered by non-strict mounts + being the default). + +* Tue Jun 1 2004 Jeff Moyer - 1:4.1.3-1 +- Update to upstream 4.1.3. + +* Thu May 6 2004 Jeff Moyer - 1:4.1.2-6 +- The lookup_yp module only dealt with YPERR_KEY, all other errors were + treated as success. As a result, if the ypdomain was not bound, the + subprocess that starts mounts would SIGSEGV. This is now fixed. +- Option parsing in the init script was not precise enough, sometimes matching + filesystem options to one of --ghost, --timeout, --verbose, or --debug. + The option-parsing patch addresses this issue by making the regexp's much + more precise. +- Ian has rolled a third version of the replicated mount fixes. + +* Tue May 4 2004 Jeff Moyer - 1:4.1.2-5 +- Ian has a new fix for replicated server and multi-mounts. Updated the + patch for testing. Still beta. (Ian Kent) + +* Mon May 3 2004 Jeff Moyer - 1:4.1.2-4 +- Fix broken multi-mounts. test patch. (Ian Kent) + +* Tue Apr 20 2004 Jeff Moyer - 1:4.1.2-3 +- Fix a call to spawnl which forgot to specify a lock file. (nphilipp) + +* Wed Apr 14 2004 - 1:4.1.2-2 +- Pass --libdir= to ./configure so we get this right on 64 bit platforms that + support backwards compat. + +* Wed Apr 14 2004 Jeff Moyer - 1:4.1.2-1 +- Change hard-coded paths in the spec file to the %{_xxx} variety. +- Update to upstream 4.1.2. +- Add a STRIPDASH option to /etc/sysconfig/autofs which allows for + compatibility with the Sun automounter options specification syntax in + auto.master. See /etc/sysconfig/autofs for more information. Addresses + bug 113950. + +* Tue Apr 6 2004 Jeff Moyer - 1:4.1.1-6 +- Add the /etc/sysconfig/autofs file, and supporting infrastructure in + the init script. +- Add support for UNDERSCORE_TO_DOT for those who want it. +- We no longer own /net. Move it to the filesystem package. + +* Tue Mar 30 2004 Jeff Moyer - 1:4.1.1-5 +- Clarify documentation on direct maps. +- Send automount daemons a HUP signal during reload. This tells them to + re-read maps (otherwise they use a cached version. Patch from the autofs + maintainer. + +* Mon Mar 22 2004 Jeff Moyer - 1:4.1.1-4 +- Fix init script to print out failures where appropriate. +- Build the automount daemon as a PIE. + +* Thu Mar 18 2004 Jeff Moyer - 1:4.1.1-3 +- Fix bug in get_best_mount, whereby if there is only one option, we + choose nothing. This is primarily due to the fact that we pass 0 in to + the get_best_mount function for the long timeout parameter. So, we + timeout trying to contact our first and only server, and never retry. + +* Thu Mar 18 2004 Jeff Moyer - 1:4.1.1-2 +- Prevent startup if a mountpoint is already mounted. + +* Thu Mar 18 2004 Jeff Moyer - 1:4.1.1-1 +- Update to 4.1.1, as it fixes problems with wildcards that people are + seeing quite a bit. + +* Wed Mar 17 2004 Jeff Moyer - 1:4.1.0-8 +- Fix ldap init code to parse server name and options correctly. + +* Tue Mar 16 2004 Jeff Moyer - 1:4.1.0-7 +- Moved the freeing of ap.path to cleanup_exit, as we would otherwise + reference an already-freed variable. + +* Mon Mar 15 2004 Jeff Moyer - 1:4.1.0-6 +- add %config(noreplace) for auto.* config files. + +* Wed Mar 10 2004 Jeff Moyer 1:4.1.0-5 +- make the init script only recognize redhat systems. Nalin seems to remember + some arcane build system error that can be caused if we don't do this. + +* Wed Mar 10 2004 Jeff Moyer 1:4.1.0-4 +- comment out /net and /misc from the default auto.master. /net is important + since in a default shipping install, we can neatly co-exist with amd. + +* Wed Mar 10 2004 Jeff Moyer 1:4.1.0-3 +- Ported forward Red Hat's patches from 3.1.7 that were not already present + in 4.1.0. +- Moving autofs from version 3.1.7 to 4.1.0 + +* Mon Sep 29 2003 Ian Kent +- Added work around for O(1) patch oddity. + +* Sat Aug 17 2003 Ian Kent +- Fixed tree mounts. +- Corrected transciption error in autofs4-2.4.18 kernel module + +* Sun Aug 10 2003 Ian Kent +- Checked and merged most of the RedHat v3 patches +- Fixed kernel module handling wu-ftpd login problem (again) + +* Thu Aug 7 2003 Ian Kent +- Removed ineffective lock stuff +- Added -n to bind mount to prevent mtab update error +- Added retry to autofs umount to clean matb after fail +- Redirected messages from above to debug log and added info message +- Fixed autofs4 module reentrancy, pwd and chroot handling + +* Wed Jul 30 2003 Ian Kent +- Fixed autofs4 ghosting patch for 2.4.19 and above (again) +- Fixed autofs directory removal on failure of autofs mount +- Fixed lock file wait function overlapping calls to (u)mount + +* Sun Jul 27 2003 Ian Kent +- Implemented LDAP direct map handling for nisMap and automountMap schema +- Fixed autofs4 ghosting patch for 2.4.19 and above (again) +- Added locking to fix overlapping internal calls to (u)mount +- Added wait for mtab~ to improve tolerance of overlapping external calls to (u)mount +- Fixed ghosted directory removal after failed mount attempt + +* Wed May 28 2003 Ian Kent +- Cleaned up an restructured my added code +- Corrected ghosting problem with 2.4.19 and above +- Added autofs4 ghosting patch for 2.4.19 and above +- Implemented HUP signal to force update of ghosted maps + +* Mon Mar 23 2002 Ian Kent +- Add patch to implement directory ghosting and direct mounts +- Add patch to for autofs4 module to support ghosting + +* Wed Jan 17 2001 Nalin Dahyabhai +- use -fPIC instead of -fpic for modules and honor other RPM_OPT_FLAGS + +* Tue Feb 29 2000 Nalin Dahyabhai +- enable hesiod support over libbind + +* Fri Aug 13 1999 Cristian Gafton +- add patch from rth to avoid an infinite loop From svn at tinysofa.org Thu Jul 1 15:35:58 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:35:58 +1000 (EST) Subject: [tinysofa-svn] r2530 - in tinysofa/snapshot: . basesystem basesystem/current basesystem/current/specs Message-ID: <20040701153558.9621D4E8180@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:35:58 +1000 (Fri, 02 Jul 2004) New Revision: 2530 Added: tinysofa/snapshot/basesystem/ tinysofa/snapshot/basesystem/current/ tinysofa/snapshot/basesystem/current/sources/ tinysofa/snapshot/basesystem/current/specs/ tinysofa/snapshot/basesystem/current/specs/basesystem.spec Log: - Add basesystem to snapshot from 2.0. Added: tinysofa/snapshot/basesystem/current/specs/basesystem.spec =================================================================== --- tinysofa/snapshot/basesystem/current/specs/basesystem.spec 2004-07-01 15:35:56 UTC (rev 2529) +++ tinysofa/snapshot/basesystem/current/specs/basesystem.spec 2004-07-01 15:35:58 UTC (rev 2530) @@ -0,0 +1,64 @@ +Summary: The skeleton package which defines a simple tinysofa system. +Name: basesystem +Version: 8.0 +Release: 3ts +Copyright: public domain +Group: System Environment/Base +Prereq: setup filesystem +BuildRoot: %{_tmppath}/%{name}-%{version}-root +BuildArch: noarch + +%description +Basesystem defines the components of a basic tinysofa system (for +example, the package installation order to use during bootstrapping). +Basesystem should be the first package installed on a system, and it +should never be removed. + +%files + +%changelog +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Wed Jan 22 2003 Tim Powers +- rebuilt + +* Wed Aug 21 2002 Bill Nottingham +- bump rev + +* Fri Jun 21 2002 Tim Powers +- automated rebuild + +* Thu May 23 2002 Tim Powers +- automated rebuild + +* Wed Jan 09 2002 Tim Powers +- automated rebuild + +* Wed Jul 12 2000 Prospector +- automatic rebuild + +* Tue Jun 6 2000 Bill Nottingham +- rebuild. Wheee. + +* Sun Mar 21 1999 Cristian Gafton +- auto rebuild in the new build environment (release 4) + +* Tue Mar 16 1999 Cristian Gafton +- don't require rpm (breaks dependency chain) + +* Tue Mar 16 1999 Erik Troan +- require rpm + +* Wed Dec 30 1998 Cristian Gafton +- build for 6.0 + +* Tue Aug 11 1998 Jeff Johnson +- build root + +* Mon Apr 27 1998 Prospector System +- translations modified for de, fr, tr + +* Tue Sep 23 1997 Erik Troan +- made a noarch package + From svn at tinysofa.org Thu Jul 1 15:36:03 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:36:03 +1000 (EST) Subject: [tinysofa-svn] r2532 - in tinysofa/snapshot: . booty booty/current booty/current/sources booty/current/specs Message-ID: <20040701153603.AFDA14E817D@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:36:02 +1000 (Fri, 02 Jul 2004) New Revision: 2532 Added: tinysofa/snapshot/booty/ tinysofa/snapshot/booty/current/ tinysofa/snapshot/booty/current/sources/ tinysofa/snapshot/booty/current/sources/booty-0.38-tinysofa-splash.patch tinysofa/snapshot/booty/current/sources/booty-0.38-tinysofa.patch tinysofa/snapshot/booty/current/sources/booty-0.38.tar.bz2 tinysofa/snapshot/booty/current/specs/ tinysofa/snapshot/booty/current/specs/booty.spec Log: - Add booty to snapshot from 2.0. Added: tinysofa/snapshot/booty/current/sources/booty-0.38-tinysofa-splash.patch =================================================================== --- tinysofa/snapshot/booty/current/sources/booty-0.38-tinysofa-splash.patch 2004-07-01 15:36:01 UTC (rev 2531) +++ tinysofa/snapshot/booty/current/sources/booty-0.38-tinysofa-splash.patch 2004-07-01 15:36:02 UTC (rev 2532) @@ -0,0 +1,13 @@ +diff -urN booty-0.38/bootloaderInfo.py booty-0.38.image/bootloaderInfo.py +--- booty-0.38/bootloaderInfo.py 2004-05-07 11:18:17.000000000 +1000 ++++ booty-0.38.image/bootloaderInfo.py 2004-06-28 20:41:34.642262272 +1000 +@@ -727,6 +727,9 @@ + if os.access("%s/boot/grub/splash.xpm.gz" %(instRoot,), os.R_OK): + f.write('splashimage=%s%sgrub/splash.xpm.gz\n' + % (self.grubbyPartitionName(bootDev), cfPath)) ++ f.write('foreground=000000\n') ++ f.write('background=5AAAEE\n') ++ f.write('shade=0\n') + + usedDevs[bootDev] = 1 + usedDevs[grubTarget] = 1 Added: tinysofa/snapshot/booty/current/sources/booty-0.38-tinysofa.patch =================================================================== --- tinysofa/snapshot/booty/current/sources/booty-0.38-tinysofa.patch 2004-07-01 15:36:01 UTC (rev 2531) +++ tinysofa/snapshot/booty/current/sources/booty-0.38-tinysofa.patch 2004-07-01 15:36:02 UTC (rev 2532) @@ -0,0 +1,22 @@ +diff -urN booty-0.38/butil.py booty-0.38.tinysofa/butil.py +--- booty-0.38/butil.py 2004-04-20 06:13:14.000000000 +1000 ++++ booty-0.38.tinysofa/butil.py 2004-06-25 20:40:17.589384512 +1000 +@@ -135,8 +135,8 @@ + # returns a product name to use for the boot loader string + def getProductName(): + # try redhat-release first +- if os.access("/etc/redhat-release", os.R_OK): +- f = open("/etc/redhat-release", "r") ++ if os.access("/etc/tinysofa-release", os.R_OK): ++ f = open("/etc/tinysofa-release", "r") + lines = f.readlines() + f.close() + for buf in lines: +@@ -159,6 +159,6 @@ + return lines[1][:-1] + + # fall back +- return "Red Hat Linux" ++ return "tinysofa enterprise server" + + Added: tinysofa/snapshot/booty/current/sources/booty-0.38.tar.bz2 =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/booty/current/sources/booty-0.38.tar.bz2 ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/booty/current/specs/booty.spec =================================================================== --- tinysofa/snapshot/booty/current/specs/booty.spec 2004-07-01 15:36:01 UTC (rev 2531) +++ tinysofa/snapshot/booty/current/specs/booty.spec 2004-07-01 15:36:02 UTC (rev 2532) @@ -0,0 +1,227 @@ +Summary: simple python bootloader config lib +Name: booty +Version: 0.38 +Release: 1ts +License: LGPL +Source0: %{name}-%{version}.tar.bz2 +Patch0: booty-0.38-tinysofa.patch +Patch1: booty-0.38-tinysofa-splash.patch +Group: System Environment/Libraries +BuildRoot: %{_tmppath}/%{name}-%{version}-root +Requires: rhpl +BuildRequires: python-devel + +%description +Small python library for use with bootloader configuration by anaconda +and up2date. + + +%prep +%setup -q +%patch0 -p1 +%patch1 -p1 + +%build +make + +%install +rm -rf $RPM_BUILD_ROOT +make DESTDIR=$RPM_BUILD_ROOT install + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(-,root,root) +%doc README TODO +/usr/lib/booty + + +%changelog +* Thu May 6 2004 Jeremy Katz - 0.38-1 +- remove ide-scsi from bootloader config on upgrade (#116622) + +* Thu May 6 2004 Jeremy Katz - 0.37-1 +- clean up the xfs fix (#122606) +- altix boxes need relocatable (#120851) + +* Fri Apr 30 2004 Jeremy Katz - 0.36-1 +- some xfs fixes (#117968) + +* Fri Apr 16 2004 Jeremy Katz - 0.35-1 +- allow booting windows from grub on x86_64 (#121005) + +* Tue Mar 16 2004 Jeremy Katz - 0.34-1 +- use vmlinuz for ppc now + +* Mon Dec 1 2003 Jeremy Katz 0.33-1 +- no ide-scsi with 2.6 + +* Fri Nov 28 2003 Jeremy Katz +- add buildrequires (#111150) + +* Thu Nov 6 2003 Jeremy Katz 0.32-1 +- rebuild for python 2.3 + +* Thu Sep 25 2003 Jeremy Katz +- modernize label for other OS (#71565) + +* Fri Aug 15 2003 Jeremy Katz 0.31.1-1 +- preserve video= (#102370) + +* Fri Aug 1 2003 Jeremy Katz 0.31-1 +- write out noauto in chandev.conf if we have chandev args (#101381) + +* Fri Jul 25 2003 Jeremy Katz +- only include message= or splashimage if the file exists (#99301) + +* Wed Jul 23 2003 Jeremy Katz +- support yaboot passwords (#100618) + +* Wed Jul 23 2003 Jeremy Katz 0.30-1 +- pass through acpi= boot arguments + +* Thu Jul 10 2003 Jeremy Katz 0.29.2-1 +- read product name from /tmp/product/.buildstamp if it exists + +* Thu Jul 10 2003 Jeremy Katz 0.29.1-1 +- yaboot: really fix kernel/initrd path + +* Wed Jul 9 2003 Jeremy Katz 0.29-1 +- yaboot: quotes around append +- yaboot: nonvram for pSeries +- yaboot: fix partition= +- yaboot: fix kernel path + +* Mon Jul 7 2003 Jeremy Katz 0.28.1-1 +- fix a typo (#98691) + +* Thu Jul 3 2003 Jeremy Katz 0.28-1 +- write our own yaboot.conf to work better with lvm/raid (#98308) +- ensure the iSeries cmdline gets blanked + +* Fri Jun 20 2003 Jeremy Katz 0.27-1 +- handle /boot as a separate partition on pSeries nicely +- setup /etc/elilo.conf symlink on ia64 + +* Wed Jun 18 2003 Jeremy Katz 0.26.1-1 +- remove efi boot entries based on product name, not just hardcoding + Red Hat Linux (#97653) + +* Sun Jun 1 2003 Jeremy Katz 0.26-1 +- write kernel to side B on iSeries as well (#91038) + +* Mon May 12 2003 Jeremy Katz 0.25.9-1 +- if there's not an old default on lilo upgrade, we don't need to + delete it (#88582) + +* Fri May 2 2003 Jeremy Katz 0.25.8-1 +- really get the PReP partition writing right for iSeries + +* Thu May 1 2003 Jeremy Katz 0.25.7-1 +- use root=LABEL= on s/390 + +* Wed Apr 30 2003 Jeremy Katz 0.25.6-1 +- iSeries tweak to get the kernel written to the PReP partition + +* Wed Apr 30 2003 Jeremy Katz 0.25.5-1 +- yabootconfig moved to /sbin + +* Tue Apr 29 2003 Jeremy Katz 0.25.4-1 +- tweaks to handle chandev now that it's in /tmp/install.cfg and not from + the env var + +* Thu Apr 24 2003 Jeremy Katz 0.25.3-1 +- use Arjan's suggestion of vmlinitrd for iseries kernel + initrd + +* Wed Apr 23 2003 Jeremy Katz 0.25.2-1 +- pseries tweaks + +* Tue Apr 15 2003 Jeremy Katz 0.25.1-1 +- fix silly typos + +* Mon Apr 14 2003 Jeremy Katz 0.25-1 +- iSeries support + +* Mon Mar 24 2003 Jeremy Katz 0.24.1-1 +- make target global for zipl.conf + +* Thu Mar 20 2003 Jeremy Katz 0.24-1 +- merge newer yaboot changes from Dan Burcaw + +* Fri Mar 14 2003 Jeremy Katz 0.23-1 +- read product name information dynamically (using /etc/redhat-release and + anaconda's /.buildstamp) + +* Wed Mar 12 2003 Jeremy Katz 0.22.1-1 +- fix tyop + +* Tue Mar 4 2003 Jeremy Katz 0.22-1 +- support for yaboot from Dan Burcaw + +* Mon Feb 24 2003 Karsten Hopp 0.21-1 +- s390 changes: zipl doesn't like lables, use devicename +- don't write root= twice + +* Wed Feb 19 2003 Karsten Hopp 0.20-1 +- s390 changes: write correct zipl.conf when bl.args is not set + +* Wed Feb 5 2003 Jeremy Katz 0.19-1 +- make sure our lilo default is sane (#79594) + +* Wed Jan 22 2003 Jeremy Katz 0.18-1 +- fix line for anaconda-ks.cfg when bootloader installed on partition + +* Thu Jan 09 2003 Karsten Hopp 0.17-1 +- minor fixes for S390 + +* Thu Dec 12 2002 Jeremy Katz +- fix for #78380 - parted has fat16 and fat32 types now + +* Tue Nov 5 2002 Jeremy Katz +- read some kernel arguments when setting up default kernel args (#69904) +- pychecker fixups + +* Thu Oct 3 2002 Jeremy Katz +- some x86_64 support + +* Tue Sep 10 2002 Jeremy Katz +- merge ia64 changes +- add alpha support based on 7.2 alpha code + +* Wed Aug 14 2002 Jeremy Katz +- fix lilo entry removal + +* Fri Aug 2 2002 Jeremy Katz +- include bootloader location in kickstart line + +* Thu Aug 1 2002 Jeremy Katz +- make sure old entries get removed from lilo.conf on upgrade + +* Wed Jul 17 2002 Jeremy Katz +- set up serial consoles properly during install + +* Thu Jul 11 2002 Jeremy Katz +- count first ntfs found as alternative os as its just as likely + +* Fri Jun 28 2002 Jeremy Katz +- write out root=LABEL= if using an initrd and rootfs has a label + +* Thu Jun 27 2002 Jeremy Katz +- grubby can do stuff with lilo.conf now, so we don't have to worry + about updating lilo.conf in the upgrade only mode + +* Thu Jun 20 2002 Jeremy Katz +- add lilo password support + +* Mon Jun 10 2002 Jeremy Katz +- fix some missing iutil->butil bits + +* Fri May 31 2002 Jeremy Katz +- minor fixes + +* Tue May 28 2002 Jeremy Katz +- require rhpl + +* Mon Jan 21 2002 Jeremy Katz +- Initial build. From svn at tinysofa.org Thu Jul 1 15:36:05 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:36:05 +1000 (EST) Subject: [tinysofa-svn] r2533 - in tinysofa/snapshot: . bridge-utils bridge-utils/current bridge-utils/current/sources bridge-utils/current/specs Message-ID: <20040701153605.3BFE34E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:36:04 +1000 (Fri, 02 Jul 2004) New Revision: 2533 Added: tinysofa/snapshot/bridge-utils/ tinysofa/snapshot/bridge-utils/current/ tinysofa/snapshot/bridge-utils/current/sources/ tinysofa/snapshot/bridge-utils/current/sources/bridge-utils-0.9.6-inc.patch tinysofa/snapshot/bridge-utils/current/sources/bridge-utils-0.9.6-retcode.patch tinysofa/snapshot/bridge-utils/current/sources/bridge-utils-0.9.6.tar.gz tinysofa/snapshot/bridge-utils/current/specs/ tinysofa/snapshot/bridge-utils/current/specs/bridge-utils.spec Log: - Add bridge-utils to snapshot from 2.0. Added: tinysofa/snapshot/bridge-utils/current/sources/bridge-utils-0.9.6-inc.patch =================================================================== --- tinysofa/snapshot/bridge-utils/current/sources/bridge-utils-0.9.6-inc.patch 2004-07-01 15:36:02 UTC (rev 2532) +++ tinysofa/snapshot/bridge-utils/current/sources/bridge-utils-0.9.6-inc.patch 2004-07-01 15:36:04 UTC (rev 2533) @@ -0,0 +1,10 @@ +--- bridge-utils/libbridge/libbridge_misc.c.lr 2003-10-25 13:38:25.000000000 +0200 ++++ bridge-utils/libbridge/libbridge_misc.c 2003-10-25 13:38:45.000000000 +0200 +@@ -18,6 +18,7 @@ + + #include + #include ++#include + #include + #include + #include Added: tinysofa/snapshot/bridge-utils/current/sources/bridge-utils-0.9.6-retcode.patch =================================================================== --- tinysofa/snapshot/bridge-utils/current/sources/bridge-utils-0.9.6-retcode.patch 2004-07-01 15:36:02 UTC (rev 2532) +++ tinysofa/snapshot/bridge-utils/current/sources/bridge-utils-0.9.6-retcode.patch 2004-07-01 15:36:04 UTC (rev 2533) @@ -0,0 +1,36 @@ +--- bridge-utils/brctl/brctl.c~ 2001-12-07 14:25:58.000000000 +0000 ++++ bridge-utils/brctl/brctl.c 2003-09-16 08:07:29.000000000 +0100 +@@ -54,8 +54,18 @@ + int argindex; + struct bridge *br; + struct command *cmd; ++ int err; + +- br_init(); ++ err = br_init(); ++ if (err == 12345) { ++ fprintf(stderr, "kernel API version mismatch\n"); ++ return 1; ++ } ++ if (err) { ++ perror("Error initialising bridge communication"); ++ return 1; ++ } ++ + + if (argc < 2) + goto help; +--- bridge-utils/libbridge/libbridge_init.c~ 2001-06-22 20:59:03.000000000 +0100 ++++ bridge-utils/libbridge/libbridge_init.c 2003-09-16 08:16:24.000000000 +0100 +@@ -199,7 +199,10 @@ + if ((br_socket_fd = socket(AF_INET, SOCK_STREAM, 0)) < 0) + return errno; + +- if (br_get_version() != BRCTL_VERSION) ++ err = br_get_version(); ++ if (err == -1) /* Probably EPERM */ ++ return errno; ++ if (err != BRCTL_VERSION) + return 12345; + + if ((err = br_make_bridge_list()) != 0) Added: tinysofa/snapshot/bridge-utils/current/sources/bridge-utils-0.9.6.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/bridge-utils/current/sources/bridge-utils-0.9.6.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/bridge-utils/current/specs/bridge-utils.spec =================================================================== --- tinysofa/snapshot/bridge-utils/current/specs/bridge-utils.spec 2004-07-01 15:36:02 UTC (rev 2532) +++ tinysofa/snapshot/bridge-utils/current/specs/bridge-utils.spec 2004-07-01 15:36:04 UTC (rev 2533) @@ -0,0 +1,109 @@ +Summary: Utilities for configuring the linux ethernet bridge. +Name: bridge-utils +Version: 0.9.6 +Release: 3.1ts +Copyright: GPL +Group: System Environment/Base +Source0: http://bridge.sourceforge.net/bridge-utils/bridge-utils-%{PACKAGE_VERSION}.tar.gz +Patch0: bridge-utils-0.9.6-retcode.patch +Patch1: bridge-utils-0.9.6-inc.patch +BuildRoot: /var/tmp/%{name}-%{version}-root + +%description +This package contains utilities for configuring the linux ethernet +bridge. The linux ethernet bridge can be used for connecting multiple +ethernet devices together. The connecting is fully transparent: hosts +connected to one ethernet device see hosts connected to the other +ethernet devices directly. + +Install bridge-utils if you want to use the linux ethernet bridge. + +%package -n bridge-utils-devel +Summary: Utilities for configuring the linux ethernet bridge. +Group: Development/Libraries + +%description -n bridge-utils-devel +The bridge-utils-devel package contains the header and object files +necessary for developing programs which use 'libbridge.a', the +interface to the linux kernel ethernet bridge. If you are developing +programs which need to configure the linux ethernet bridge, your +system needs to have these standard header and object files available +in order to create the executables. + +Install bridge-utils-devel if you are going to develop programs which +will use the linux ethernet bridge interface library. + +%prep +%setup -n bridge-utils +%patch0 -p1 +%patch1 -p1 + +%build +%configure +make + +%install +[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT +mkdir -p ${RPM_BUILD_ROOT} +mkdir -p ${RPM_BUILD_ROOT}%{_sbindir} +mkdir -p ${RPM_BUILD_ROOT}%{_includedir} +mkdir -p ${RPM_BUILD_ROOT}%{_libdir} +mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man8 +install -m 0755 brctl/brctl ${RPM_BUILD_ROOT}/%{_sbindir} +gzip doc/brctl.8 +install -m 0644 doc/brctl.8.gz ${RPM_BUILD_ROOT}%{_mandir}/man8 +install -m 0644 libbridge/libbridge.h ${RPM_BUILD_ROOT}%{_includedir} +install -m 0644 libbridge/libbridge.a ${RPM_BUILD_ROOT}%{_libdir}/ + +%clean +[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT + +%files +%defattr (-,root,root) +%doc AUTHORS COPYING doc/FAQ doc/HOWTO doc/RPM-GPG-KEY +%{_sbindir}/brctl +%{_mandir}/man8/brctl.8.gz + +%files -n bridge-utils-devel +%defattr (-,root,root) +%{_includedir}/libbridge.h +%{_libdir}/libbridge.a + +%changelog +* Tue Mar 02 2004 Elliot Lee +- rebuilt + +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Sat Oct 25 2003 Florian La Roche +- support change to call sysconf() to get HZ + +* Tue Sep 16 2003 David Woodhouse 0.9.6-1 +- Update to 0.9.6 +- Detect lack of kernel bridge support or EPERM and exit with appropriate code. + +* Wed Jun 04 2003 Elliot Lee +- rebuilt + +* Wed Jan 22 2003 Tim Powers +- rebuilt + +* Fri Dec 13 2002 Elliot Lee 0.9.3-7 +- Rebuild + +* Fri Jun 21 2002 Tim Powers +- automated rebuild + +* Thu May 23 2002 Tim Powers +- automated rebuild + +* Mon Mar 04 2002 Benjamin LaHaise +- manual rebuild + +* Wed Jan 09 2002 Tim Powers +- automated rebuild + +* Wed Nov 07 2001 Matthew Galgoci +- initial cleanup of spec file from net release + From svn at tinysofa.org Thu Jul 1 15:36:06 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:36:06 +1000 (EST) Subject: [tinysofa-svn] r2534 - in tinysofa/snapshot: . brltty brltty/current brltty/current/sources brltty/current/specs Message-ID: <20040701153606.DEC2C4E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:36:06 +1000 (Fri, 02 Jul 2004) New Revision: 2534 Added: tinysofa/snapshot/brltty/ tinysofa/snapshot/brltty/current/ tinysofa/snapshot/brltty/current/sources/ tinysofa/snapshot/brltty/current/sources/brltty-3.2.tar.gz tinysofa/snapshot/brltty/current/specs/ tinysofa/snapshot/brltty/current/specs/brltty.spec Log: - Add brltty to snapshot from 2.0. Added: tinysofa/snapshot/brltty/current/sources/brltty-3.2.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/brltty/current/sources/brltty-3.2.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/brltty/current/specs/brltty.spec =================================================================== --- tinysofa/snapshot/brltty/current/specs/brltty.spec 2004-07-01 15:36:04 UTC (rev 2533) +++ tinysofa/snapshot/brltty/current/specs/brltty.spec 2004-07-01 15:36:06 UTC (rev 2534) @@ -0,0 +1,92 @@ +Name: brltty +Version: 3.2 +Release: 3.1.1ts +License: GPL +Group: System Environment/Daemons +URL: http://mielke.cc/brltty/ +Source: http://mielke.cc/brltty/releases/%{name}-%{version}.tar.gz +BuildRoot: %{_tmppath}/%{name}-%{version}-root +Summary: Braille display driver for Linux/Unix. +Prereq: coreutils + +%description +BRLTTY is a background process (daemon) which provides +access to the Linux/Unix console (when in text mode) +for a blind person using a refreshable braille display. +It drives the braille display, +and provides complete screen review functionality. +Some speech capability has also been incorporated. + +%prep +%setup -n %{name}-%{version} + +%build +%configure --with-install-root="${RPM_BUILD_ROOT}" +make + +directory="doc" +mkdir -p "${directory}" +for file in `find . -path "./${directory}" -prune -o \( -name 'README*' -o -name '*.txt' -o -name '*.html' -o -name '*.sgml' \) -print` +do + mkdir -p "${directory}/${file%/*}" + cp -rp "${file}" "${directory}/${file}" +done + +%install +make install-programs install-help install-tables install-drivers install-manpage +install Documents/brltty.conf "${RPM_BUILD_ROOT}/etc" +rm -f ${RPM_BUILD_ROOT}/bin/brltty +rm -f ${RPM_BUILD_ROOT}/bin/install-brltty +rm -rf ${RPM_BUILD_ROOT}/lib/brltty/* + +%post +devices="/dev/vcsa /dev/vcsa0 /dev/vcc/a" +install=true +for device in ${devices} +do + if [ -c "${device}" ] + then + install=false + break + fi +done +if $install +then + device="`set -- ${devices} && echo "${1}"`" + echo -n "Creating screen inspection device ${device}..." + mkdir -p "${device%/*}" + mknod -m o= "${device}" c 7 128 + chmod 660 "${device}" + chown root.tty "${device}" + echo "done." +fi + +%files +%defattr(-,root,root) +%doc COPYING +%doc Documents/ChangeLog Documents/TODO +%doc Bootdisks/rhmkboot Bootdisks/rhmkroot +%doc doc/* +%doc /usr/share/man/man1/* +%config(noreplace) /etc/brltty.conf +%{_bindir}/brltty +%{_bindir}/install-brltty +%{_libdir}/brltty/* +/etc/brltty + +%changelog +* Tue Mar 02 2004 Elliot Lee +- rebuilt + +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Tue Sep 30 2003 Florian La Roche +- prereq coreutils for mknod/chown/chmod + +* Mon Jul 07 2003 Adrian Havill 3.2-2 +- changed spec "Copyright" to "License" +- use %configure macro, %{_libdir} for non-ia32 archs +- removed unnecessary set and unset, assumed/default spec headers +- fixed unpackaged man page, duplicate /bin and /lib entries +- use plain install vs scripts for non-i386 buildsys From svn at tinysofa.org Thu Jul 1 15:36:08 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:36:08 +1000 (EST) Subject: [tinysofa-svn] r2535 - in tinysofa/snapshot: . cairo cairo/current cairo/current/sources cairo/current/specs Message-ID: <20040701153608.C5B544E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:36:08 +1000 (Fri, 02 Jul 2004) New Revision: 2535 Added: tinysofa/snapshot/cairo/ tinysofa/snapshot/cairo/current/ tinysofa/snapshot/cairo/current/sources/ tinysofa/snapshot/cairo/current/sources/cairo-0.1.23.tar.gz tinysofa/snapshot/cairo/current/specs/ tinysofa/snapshot/cairo/current/specs/cairo.spec Log: - Add cairo to snapshot from 2.0. Added: tinysofa/snapshot/cairo/current/sources/cairo-0.1.23.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/cairo/current/sources/cairo-0.1.23.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/cairo/current/specs/cairo.spec =================================================================== --- tinysofa/snapshot/cairo/current/specs/cairo.spec 2004-07-01 15:36:06 UTC (rev 2534) +++ tinysofa/snapshot/cairo/current/specs/cairo.spec 2004-07-01 15:36:08 UTC (rev 2535) @@ -0,0 +1,76 @@ +Name: cairo +Version: 0.1.23 +Release: 1ts +Copyright: MIT license +BuildRoot: %{_tmppath}/%{name}-%{version}-root +URL: http://www.cairographics.org +Source0: http://www.cairographics.org/snapshots/cairo-0.1.23.tar.gz +BuildRequires: freetype-devel +BuildRequires: pkgconfig +BuildRequires: fontconfig-devel +BuildRequires: zlib-devel +BuildRequires: libpixman-devel +BuildRequires: xorg-x11-devel +BuildRequires: libpng-devel >= 1.2 +Summary: Cairo provides anti-aliased vector-based rendering for X. +Group: Development/Graphics +Requires: freetype +Requires: fontconfig +Requires: libpixman >= 0.1.1 +Requires: xorg-x11-libs +Requires: libpng >= 1.2 + +%description + + Cairo provides anti-aliased vector-based rendering for + X. Paths consist of line segments and cubic splines and + can be rendered at any width with various join and cap + styles. All colors may be specified with optional + translucence (opacity/alpha) and combined using the + extended Porter/Duff compositing algebra as found in the X + Render Extension. + + +%files +%defattr(-, root, root) +%doc AUTHORS COPYING ChangeLog INSTALL NEWS README TODO +/usr/lib/libcairo.so.1.0.0 +/usr/lib/libcairo.so.1 + + +%package -n cairo-devel +Summary: Headers for Cairo +Group: Development/Graphics +Requires: cairo = 0.1.23 +Requires: libpixman-devel +Requires: xorg-x11-devel +Requires: libpng-devel + +%description -n cairo-devel +Headers for Cairo + +%files -n cairo-devel +%defattr(-, root, root) +/usr/include/cairo.h +/usr/include/cairo-features.h +/usr/lib/libcairo.so +/usr/lib/libcairo.la +/usr/lib/libcairo.a +/usr/lib/pkgconfig/cairo.pc + + +%prep +%setup -q -n cairo-0.1.23 + +%build +./configure --prefix=/usr --sysconfdir=/etc --mandir=/usr/share/man --infodir=/usr/share/info --localstatedir=/var +make + +%install +rm -rf %{buildroot} +make DESTDIR=%{buildroot} install + +%clean +rm -rf %{buildroot} + +%changelog From svn at tinysofa.org Thu Jul 1 15:36:09 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:36:09 +1000 (EST) Subject: [tinysofa-svn] r2536 - in tinysofa/snapshot: . checkpolicy checkpolicy/current checkpolicy/current/sources checkpolicy/current/specs Message-ID: <20040701153609.A01364E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:36:09 +1000 (Fri, 02 Jul 2004) New Revision: 2536 Added: tinysofa/snapshot/checkpolicy/ tinysofa/snapshot/checkpolicy/current/ tinysofa/snapshot/checkpolicy/current/sources/ tinysofa/snapshot/checkpolicy/current/sources/checkpolicy-1.12.3.tgz tinysofa/snapshot/checkpolicy/current/specs/ tinysofa/snapshot/checkpolicy/current/specs/checkpolicy.spec Log: - Add checkpolicy to snapshot from 2.0. Added: tinysofa/snapshot/checkpolicy/current/sources/checkpolicy-1.12.3.tgz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/checkpolicy/current/sources/checkpolicy-1.12.3.tgz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/checkpolicy/current/specs/checkpolicy.spec =================================================================== --- tinysofa/snapshot/checkpolicy/current/specs/checkpolicy.spec 2004-07-01 15:36:08 UTC (rev 2535) +++ tinysofa/snapshot/checkpolicy/current/specs/checkpolicy.spec 2004-07-01 15:36:09 UTC (rev 2536) @@ -0,0 +1,105 @@ +Summary: SELinux policy compiler +Name: checkpolicy +Version: 1.12.3 +Release: 1ts +License: GPL +Group: Development/System +Source: http://www.nsa.gov/selinux/archives/checkpolicy-%{version}.tgz +Prefix: %{_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-root +BuildRequires: byacc flex + +%description +Security-enhanced Linux is a patch of the Linux? kernel and a number +of utilities with enhanced security functionality designed to add +mandatory access controls to Linux. The Security-enhanced Linux +kernel contains new architectural components originally developed to +improve the security of the Flask operating system. These +architectural components provide general support for the enforcement +of many kinds of mandatory access control policies, including those +based on the concepts of Type Enforcement?, Role-based Access +Control, and Multi-level Security. + +This package contains checkpolicy, the SELinux policy compiler. +Only required for building policies. + +%prep +%setup -q + +%build +make + +%install +rm -rf ${RPM_BUILD_ROOT} +mkdir -p ${RPM_BUILD_ROOT}%{_bindir} +make DESTDIR="${RPM_BUILD_ROOT}" install + +%clean +rm -rf ${RPM_BUILD_ROOT} + +%files +%defattr(-,root,root) +%{_bindir}/checkpolicy +%{_mandir}/man8/checkpolicy.8.gz + +%changelog +* Fri Jun 18 2004 Dan Walsh 1.12.2-1 +- Latest from NSA + +* Thu Jun 17 2004 Dan Walsh 1.12.1-1 +- Update to latest from NSA + +* Wed Jun 16 2004 Dan Walsh 1.12-1 +- Update to latest from NSA + +* Wed Jun 16 2004 Dan Walsh 1.10-5 +- Add nlclass patch + +* Tue Jun 15 2004 Elliot Lee +- rebuilt + +* Fri Jun 4 2004 Dan Walsh 1.10-3 +- Add BuildRequires flex + +* Thu Apr 8 2004 Dan Walsh 1.10-2 +- Add BuildRequires byacc + +* Thu Apr 8 2004 Dan Walsh 1.10-1 +- Upgrade to the latest from NSA + +* Mon Mar 15 2004 Dan Walsh 1.8-1 +- Upgrade to the latest from NSA + +* Mon Feb 24 2004 Dan Walsh 1.6-1 +- Upgrade to the latest from NSA + +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Tue Jan 20 2004 Dan Walsh 1.4-6 +- Add typealias patch + +* Tue Jan 20 2004 Dan Walsh 1.4-5 +- Update excludetypes with negset-final patch + +* Wed Jan 14 2004 Dan Walsh 1.4-4 +- Add excludetypes patch + +* Wed Jan 14 2004 Dan Walsh 1.4-3 +- Add Colin Walter's lineno patch + +* Wed Jan 7 2004 Dan Walsh 1.4-2 +- Remove check for roles transition + +* Sat Dec 6 2003 Dan Walsh 1.4-1 +- upgrade to 1.4 + +* Wed Oct 1 2003 Dan Walsh 1.2-1 +- upgrade to 1.2 + +* Thu Aug 28 2003 Dan Walsh 1.1-2 +- upgrade to 1.1 + +* Mon Jun 2 2003 Dan Walsh 1.0-1 +- Initial version + From svn at tinysofa.org Thu Jul 1 15:36:12 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:36:12 +1000 (EST) Subject: [tinysofa-svn] r2538 - in tinysofa/snapshot: . curl curl/current curl/current/sources curl/current/specs Message-ID: <20040701153612.2B9744E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:36:11 +1000 (Fri, 02 Jul 2004) New Revision: 2538 Added: tinysofa/snapshot/curl/ tinysofa/snapshot/curl/current/ tinysofa/snapshot/curl/current/sources/ tinysofa/snapshot/curl/current/sources/curl-7.10.4-path.patch tinysofa/snapshot/curl/current/sources/curl-7.11.1-nousr.patch tinysofa/snapshot/curl/current/sources/curl-7.11.1.tar.bz2 tinysofa/snapshot/curl/current/specs/ tinysofa/snapshot/curl/current/specs/curl.spec Log: - Add curl to snapshot from 2.0. Added: tinysofa/snapshot/curl/current/sources/curl-7.10.4-path.patch =================================================================== --- tinysofa/snapshot/curl/current/sources/curl-7.10.4-path.patch 2004-07-01 15:36:10 UTC (rev 2537) +++ tinysofa/snapshot/curl/current/sources/curl-7.10.4-path.patch 2004-07-01 15:36:11 UTC (rev 2538) @@ -0,0 +1,13 @@ +--- curl-7.10.4/lib/Makefile.am ++++ curl-7.10.4/lib/Makefile.am +@@ -78,8 +78,8 @@ + + install-data-hook: + @if test -n "@CURL_CA_BUNDLE@"; then \ +- $(mkinstalldirs) `dirname $(DESTDIR)@CURL_CA_BUNDLE@`; \ +- @INSTALL_DATA@ $(srcdir)/ca-bundle.crt $(DESTDIR)@CURL_CA_BUNDLE@; \ ++ $(mkinstalldirs) `dirname $(prefix)/../@CURL_CA_BUNDLE@`; \ ++ @INSTALL_DATA@ $(srcdir)/ca-bundle.crt $(prefix)/../@CURL_CA_BUNDLE@; \ + fi + + # this hook is mainly for non-unix systems to build even if configure Added: tinysofa/snapshot/curl/current/sources/curl-7.11.1-nousr.patch =================================================================== --- tinysofa/snapshot/curl/current/sources/curl-7.11.1-nousr.patch 2004-07-01 15:36:10 UTC (rev 2537) +++ tinysofa/snapshot/curl/current/sources/curl-7.11.1-nousr.patch 2004-07-01 15:36:11 UTC (rev 2538) @@ -0,0 +1,20 @@ +--- curl-7.11.1/configure.ac.orig 2004-03-18 05:03:34.000000000 -0500 ++++ curl-7.11.1/configure.ac 2004-04-07 14:41:04.000000000 -0400 +@@ -710,7 +710,7 @@ + *) + dnl check the given spot right away! + EXTRA_SSL=$OPT_SSL +- LDFLAGS="$LDFLAGS -L$EXTRA_SSL/lib$libsuff" ++ #LDFLAGS="$LDFLAGS -L$EXTRA_SSL/lib$libsuff" + CPPFLAGS="$CPPFLAGS -I$EXTRA_SSL/include/openssl -I$EXTRA_SSL/include" + ;; + esac +@@ -720,7 +720,7 @@ + ],[ + OLDLDFLAGS="$LDFLAGS" + OLDCPPFLAGS="$CPPFLAGS" +- LDFLAGS="$CLEANLDFLAGS -L$EXTRA_SSL/lib$libsuff" ++ LDFLAGS="$CLEANLDFLAGS" + CPPFLAGS="$CLEANCPPFLAGS -I$EXTRA_SSL/include/openssl -I$EXTRA_SSL/include" + AC_CHECK_LIB(crypto, CRYPTO_add_lock,[ + HAVECRYPTO="yes" ], [ Added: tinysofa/snapshot/curl/current/sources/curl-7.11.1.tar.bz2 =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/curl/current/sources/curl-7.11.1.tar.bz2 ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/curl/current/specs/curl.spec =================================================================== --- tinysofa/snapshot/curl/current/specs/curl.spec 2004-07-01 15:36:10 UTC (rev 2537) +++ tinysofa/snapshot/curl/current/specs/curl.spec 2004-07-01 15:36:11 UTC (rev 2538) @@ -0,0 +1,272 @@ +Summary: A utility for getting files from remote servers (FTP, HTTP, and others). +Name: curl +Version: 7.11.1 +Release: 2ts +License: MPL +Group: Applications/Internet +Source: http://curl.haxx.se/download/%{name}-%{version}.tar.bz2 +Patch0: curl-7.11.1-nousr.patch +Patch1: curl-7.10.4-path.patch +URL: http://curl.haxx.se/ +BuildRoot: %{_tmppath}/%{name}-%{version}-root +BuildRequires: openssl-devel, libtool, pkgconfig +Requires: openssl + +%description +cURL is a tool for getting files from FTP, HTTP, Gopher, Telnet, and +Dict servers, using any of the supported protocols. cURL is designed +to work without user interaction or any kind of interactivity. cURL +offers many useful capabilities, like proxy support, user +authentication, FTP upload, HTTP post, and file transfer resume. + +%package devel +Group: Development/Libraries +Requires: %{name} = %{version}-%{release}, openssl-devel +Summary: Files needed for building applications with libcurl. + +%description devel +cURL is a tool for getting files from FTP, HTTP, Gopher, Telnet, and +Dict servers, using any of the supported protocols. The curl-devel +package includes files needed for developing applications which can +use cURL's capabilities internally. + +%prep +rm -rf $RPM_BUILD_ROOT + +%setup -q +%patch0 -p1 +%patch1 -p1 +aclocal +libtoolize --force +./reconf + +%build +if pkg-config openssl ; then + CPPFLAGS=`pkg-config --cflags openssl`; export CPPFLAGS + LDFLAGS=`pkg-config --libs openssl`; export LDFLAGS +fi +%configure --with-ssl=/usr --enable-ipv6 --with-ca-bundle=%{_datadir}/ssl/certs/ca-bundle.crt +make + +%install +rm -rf $RPM_BUILD_ROOT +%makeinstall +rm -f ${RPM_BUILD_ROOT}%{_libdir}/libcurl.la + +# don't need curl's copy of the certs; use openssl's +find ${RPM_BUILD_ROOT} -name ca-bundle.crt -exec rm -f '{}' \; + +%clean +rm -rf $RPM_BUILD_ROOT + +%post +/sbin/ldconfig + +%postun +/sbin/ldconfig + +%files +%defattr(-,root,root) +%doc CHANGES README* COPYING +%doc docs/BUGS docs/CONTRIBUTE docs/examples docs/FAQ docs/FEATURES docs/INSTALL +%doc docs/INTERNALS docs/MANUAL docs/RESOURCES +%doc docs/TheArtOfHttpScripting docs/TODO +%{_bindir}/curl +%{_mandir}/man1/curl.1* +%{_libdir}/libcurl.so.* +#%{_datadir}/ssl/certs/ca-bundle.crt + +%files devel +%defattr(-,root,root) +%{_bindir}/curl-config +%{_includedir}/curl +%{_libdir}/*.a +%{_libdir}/*.so +%{_mandir}/man1/curl-config.1* +%{_mandir}/man3/* + +%changelog +* Tue Jun 15 2004 Elliot Lee +- rebuilt + +* Wed Apr 07 2004 Adrian Havill 7.11.1-1 +- upgraded; updated nousr patch +- added COPYING (#115956) +- + +* Tue Mar 02 2004 Elliot Lee +- rebuilt + +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Sat Jan 31 2004 Florian La Roche +- update to 7.10.8 +- remove patch2, already upstream + +* Wed Oct 15 2003 Adrian Havill 7.10.6-7 +- aclocal before libtoolize +- move OpenLDAP license so it's present as a doc file, present in + both the source and binary as per conditions + +* Mon Oct 13 2003 Adrian Havill 7.10.6-6 +- add OpenLDAP copyright notice for usage of code, add OpenLDAP + license for this code + +* Tue Oct 07 2003 Adrian Havill 7.10.6-5 +- match serverAltName certs with SSL (#106168) + +* Mon Sep 16 2003 Adrian Havill 7.10.6-4.1 +- bump n-v-r for RHEL + +* Mon Sep 16 2003 Adrian Havill 7.10.6-4 +- restore ca cert bundle (#104400) +- require openssl, we want to use its ca-cert bundle + +* Sun Sep 7 2003 Joe Orton 7.10.6-3 +- rebuild + +* Fri Sep 5 2003 Joe Orton 7.10.6-2.2 +- fix to include libcurl.so + +* Mon Aug 25 2003 Adrian Havill 7.10.6-2.1 +- bump n-v-r for RHEL + +* Mon Aug 25 2003 Adrian Havill 7.10.6-2 +- devel subpkg needs openssl-devel as a Require (#102963) + +* Tue Jul 28 2003 Adrian Havill 7.10.6-1 +- bumped version + +* Tue Jul 01 2003 Adrian Havill 7.10.5-1 +- bumped version + +* Wed Jun 04 2003 Elliot Lee +- rebuilt + +* Sat Apr 12 2003 Florian La Roche +- update to 7.10.4 +- adapt nousr patch + +* Wed Jan 22 2003 Tim Powers +- rebuilt + +* Tue Jan 21 2003 Joe Orton 7.9.8-4 +- don't add -L/usr/lib to 'curl-config --libs' output + +* Mon Jan 7 2003 Nalin Dahyabhai 7.9.8-3 +- rebuild + +* Wed Nov 6 2002 Joe Orton 7.9.8-2 +- fix `curl-config --libs` output for libdir!=/usr/lib +- remove docs/LIBCURL from docs list; remove unpackaged libcurl.la +- libtoolize and reconf + +* Mon Jul 22 2002 Trond Eivind Glomsr?d 7.9.8-1 +- 7.9.8 (# 69473) + +* Fri Jun 21 2002 Tim Powers +- automated rebuild + +* Sun May 26 2002 Tim Powers +- automated rebuild + +* Thu May 16 2002 Trond Eivind Glomsr?d 7.9.7-1 +- 7.9.7 + +* Wed Apr 24 2002 Trond Eivind Glomsr?d 7.9.6-1 +- 7.9.6 + +* Thu Mar 21 2002 Trond Eivind Glomsr?d 7.9.5-2 +- Stop the curl-config script from printing -I/usr/include + and -L/usr/lib (#59497) + +* Fri Mar 8 2002 Trond Eivind Glomsr?d 7.9.5-1 +- 7.9.5 + +* Tue Feb 26 2002 Trond Eivind Glomsr?d 7.9.3-2 +- Rebuild + +* Wed Jan 23 2002 Nalin Dahyabhai 7.9.3-1 +- update to 7.9.3 + +* Wed Jan 09 2002 Tim Powers 7.9.2-2 +- automated rebuild + +* Wed Jan 9 2002 Trond Eivind Glomsr?d 7.9.2-1 +- 7.9.2 + +* Fri Aug 17 2001 Nalin Dahyabhai +- include curl-config in curl-devel +- update to 7.8 to fix memory leak and strlcat() symbol pollution from libcurl + +* Wed Jul 18 2001 Crutcher Dunnavant +- added openssl-devel build req + +* Mon May 21 2001 Tim Powers +- built for the distro + +* Tue Apr 24 2001 Jeff Johnson +- upgrade to curl-7.7.2. +- enable IPv6. + +* Fri Mar 2 2001 Tim Powers +- rebuilt against openssl-0.9.6-1 + +* Thu Jan 4 2001 Tim Powers +- fixed mising ldconfigs +- updated to 7.5.2, bug fixes + +* Mon Dec 11 2000 Tim Powers +- updated to 7.5.1 + +* Mon Nov 6 2000 Tim Powers +- update to 7.4.1 to fix bug #20337, problems with curl -c +- not using patch anymore, it's included in the new source. Keeping + for reference + +* Fri Oct 20 2000 Nalin Dahyabhai +- fix bogus req in -devel package + +* Fri Oct 20 2000 Tim Powers +- devel package needed defattr so that root owns the files + +* Mon Oct 16 2000 Nalin Dahyabhai +- update to 7.3 +- apply vsprintf/vsnprintf patch from Colin Phipps via Debian + +* Mon Aug 21 2000 Nalin Dahyabhai +- enable SSL support +- fix packager tag +- move buildroot to %%{_tmppath} + +* Tue Aug 1 2000 Tim Powers +- fixed vendor tag for bug #15028 + +* Mon Jul 24 2000 Prospector +- rebuilt + +* Tue Jul 11 2000 Tim Powers +- workaround alpha build problems with optimizations + +* Mon Jul 10 2000 Tim Powers +- rebuilt + +* Mon Jun 5 2000 Tim Powers +- put man pages in correct place +- use %%makeinstall + +* Mon Apr 24 2000 Tim Powers +- updated to 6.5.2 + +* Wed Nov 3 1999 Tim Powers +- updated sources to 6.2 +- gzip man page + +* Mon Aug 30 1999 Tim Powers +- changed group + +* Thu Aug 26 1999 Tim Powers +- changelog started +- general cleanups, changed prefix to /usr, added manpage to files section +- including in Powertools From svn at tinysofa.org Thu Jul 1 15:36:10 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:36:10 +1000 (EST) Subject: [tinysofa-svn] r2537 - in tinysofa/snapshot: . chkfontpath chkfontpath/current chkfontpath/current/sources chkfontpath/current/specs Message-ID: <20040701153610.812B34E817D@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:36:10 +1000 (Fri, 02 Jul 2004) New Revision: 2537 Added: tinysofa/snapshot/chkfontpath/ tinysofa/snapshot/chkfontpath/current/ tinysofa/snapshot/chkfontpath/current/sources/ tinysofa/snapshot/chkfontpath/current/sources/chkfontpath-1.10.0.tar.gz tinysofa/snapshot/chkfontpath/current/specs/ tinysofa/snapshot/chkfontpath/current/specs/chkfontpath.spec Log: - Add chkfontpath to snapshot from 2.0. Added: tinysofa/snapshot/chkfontpath/current/sources/chkfontpath-1.10.0.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/chkfontpath/current/sources/chkfontpath-1.10.0.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/chkfontpath/current/specs/chkfontpath.spec =================================================================== --- tinysofa/snapshot/chkfontpath/current/specs/chkfontpath.spec 2004-07-01 15:36:09 UTC (rev 2536) +++ tinysofa/snapshot/chkfontpath/current/specs/chkfontpath.spec 2004-07-01 15:36:10 UTC (rev 2537) @@ -0,0 +1,140 @@ +Summary: Simple interface for editing the font path for the X font server. +Name: chkfontpath +Version: 1.10.0 +Release: 2ts +License: GPL +Group: System Environment/Base +BuildRoot: %{_tmppath}/%{name}-%{version}-root +Source: %{name}-%{version}.tar.gz + +# Do not add Requires on XFree86-* or xorg-x11-* subpackages, because that +# makes this package unnecessarily dependant on a specific X11 +# implementation. Instead, use a virtual Requires, or depend on a file or +# directory which will be present in one of the X11 implementation's file +# lists, thus avoiding the problem. See bugzilla #118469 for details. +Requires: xfs +Requires: /sbin/pidof + +%description +This is a simple command line utility for configuring the directories +in the X font server's path. It is mostly intended to be used +'internally' by RPM when packages with fonts are added or removed, but +it may be useful as a stand-alone utility in some instances. + +%prep +%setup -q + +%build +make RPM_OPT_FLAGS="$RPM_OPT_FLAGS" + +%install +make INSTROOT=$RPM_BUILD_ROOT BINDIR=%{_sbindir} MANDIR=%{_mandir} install + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(-,root,root) +%{_sbindir}/* +%{_mandir}/man8/* + +%changelog +* Tue Jun 15 2004 Elliot Lee +- rebuilt + +* Tue Mar 16 2004 Mike A. Harris 1.10.0-1 +- Change PreReq: XFree86-xfs to Requires: xfs, which is a virtual Provide + that is present in the xorg-x11 packaging, and in XFree86-4.3.0-64 and + later builds. This is necessary in order to make packages not require a + specific X11 implementation unnecessarily. (#118469) + +* Wed May 28 2003 Mike A. Harris 1.9.10-1 +- Add patch from Uli, with some cosmetic cleanups to fix bug (#90942) + +* Tue May 20 2003 Bill Nottingham 1.9.9-1 +- don't forcibly strip binaries on make install + +* Fri May 16 2003 Mike A. Harris 1.9.8-1 +- Fix serious problem where chkfontpath sends SIGUSR1 to PID 2 bug (#90999) +- Replace hard coded xfs config file paths with constants +- Implemented fatalerror() for displaying variadic error messages and bailing + with EXIT_FAILURE when "quiet" mode is not enabled, or silencing error + output and exiting with EXIT_SUCCESS when "quiet" mode is enabled. Replaced + all conditionalized tests for quiet mode throughout the code, and changed + all critical error messages with calls to fatalerror() +- Make restartXfs() more robust, with a fallback for if /proc isn't available. + +* Mon Feb 10 2003 Mike A. Harris 1.9.7-1 +- Bump and rebuild in new environment as 1.9.7-1 +- Fixes for GNU extension usage isblank() + +* Tue May 21 2002 Mike A. Harris 1.9.6-1 +- Bump and rebuild in new environment as 1.9.6-1 + +* Thu Jan 18 2001 Preston Brown +- document missing arguments (#24055) in man page +- use popt to generate help text for the program + +* Thu Jan 18 2001 Nalin Dahyabhai +- #ifdef out some debugging code (#24054) +- do a setlocale() before using ctype functions + +* Fri Jan 12 2001 Preston Brown +- fixed up handling of catalogue line in situations where there is no + path listed on the first line (#10128) +- fixed up handling when adding a directory to empty font path (#11108) +- use fputs where more correct (#14286) + +* Tue Jul 4 2000 Matt Wilson +- Prereq: XFree86-xfs to insure that it gets installed before + chkfontpath is. This should promote XFree86-xfs to be installed + before any package that has a Prereq: on chkfontpath +- Prereq: /sbin/pidof (even though a Requires: should be sufficient) + +* Mon Jun 12 2000 Preston Brown +- FHS macros + +* Wed May 17 2000 Matt Wilson +- rebuilt to get rid of broken deps + +* Thu Feb 03 2000 Preston Brown +- rebuild to gzip man page, update description. + +* Mon Oct 18 1999 Preston Brown +- patches from JJ understand :unscaled automatically, no longer necessary + to specify manually on the cmd line +- tries to keep specific font groups together much harder. + +* Mon Sep 27 1999 Preston Brown +- incorporated patches to deal with :unscaled font dir entries, and + add a --first flag to add the path at the beginning instead of the end. +- minor cleanups + +* Fri Aug 15 1999 Preston Brown +- fixed up basename +- default to list, not help +- if trailing slash '/' is appended to paths given, strip it off + +* Wed Apr 14 1999 Preston Brown +- preserve permissions on config file + +* Thu Apr 07 1999 Preston Brown +- if /proc isn't mounted, don't do a killall + +* Tue Mar 30 1999 Preston Brown +- don't use psmisc, use pidof from SysVinit + +* Fri Mar 12 1999 Preston Brown +- made psmisc a requirement. + +* Tue Mar 09 1999 Preston Brown +- added "quiet" option. + +* Wed Feb 24 1999 Preston Brown +- injected new group / description. + +* Tue Feb 16 1999 Preston Brown +- important fix - kill font server with USR1 instead of HUP. + +* Mon Feb 15 1999 Preston Brown +- initial spec file From svn at tinysofa.org Thu Jul 1 15:36:14 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:36:14 +1000 (EST) Subject: [tinysofa-svn] r2539 - in tinysofa/snapshot: . dbus dbus/current dbus/current/sources dbus/current/specs Message-ID: <20040701153614.318914E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:36:13 +1000 (Fri, 02 Jul 2004) New Revision: 2539 Added: tinysofa/snapshot/dbus/ tinysofa/snapshot/dbus/current/ tinysofa/snapshot/dbus/current/sources/ tinysofa/snapshot/dbus/current/sources/dbus-0.13-uid.patch tinysofa/snapshot/dbus/current/sources/dbus-0.21.tar.gz tinysofa/snapshot/dbus/current/sources/dbus-python-stack-trash.patch tinysofa/snapshot/dbus/current/specs/ tinysofa/snapshot/dbus/current/specs/dbus.spec Log: - Add dbus to snapshot from 2.0. Added: tinysofa/snapshot/dbus/current/sources/dbus-0.13-uid.patch =================================================================== --- tinysofa/snapshot/dbus/current/sources/dbus-0.13-uid.patch 2004-07-01 15:36:11 UTC (rev 2538) +++ tinysofa/snapshot/dbus/current/sources/dbus-0.13-uid.patch 2004-07-01 15:36:13 UTC (rev 2539) @@ -0,0 +1,54 @@ +--- dbus-0.13/dbus/dbus-userdb.c.uid 2003-04-28 15:29:42.000000000 -0400 ++++ dbus-0.13/dbus/dbus-userdb.c 2003-10-16 15:29:46.000000000 -0400 +@@ -60,6 +60,19 @@ + dbus_free (info); + } + ++static dbus_bool_t ++is_a_number (const DBusString *str, ++ unsigned long *num) ++{ ++ int end; ++ ++ if (_dbus_string_parse_int (str, 0, num, &end) && ++ end == _dbus_string_get_length (str)) ++ return TRUE; ++ else ++ return FALSE; ++} ++ + static DBusUserInfo* + _dbus_user_database_lookup (DBusUserDatabase *db, + dbus_uid_t uid, +@@ -70,6 +83,15 @@ + + _DBUS_ASSERT_ERROR_IS_CLEAR (error); + _dbus_assert (uid != DBUS_UID_UNSET || username != NULL); ++ ++ /* See if the username is really a number */ ++ if (uid == DBUS_UID_UNSET) ++ { ++ unsigned long n; ++ ++ if (is_a_number (username, &n)) ++ uid = n; ++ } + + if (uid != DBUS_UID_UNSET) + info = _dbus_hash_table_lookup_ulong (db->users, uid); +@@ -148,6 +170,15 @@ + + _DBUS_ASSERT_ERROR_IS_CLEAR (error); + ++ /* See if the group is really a number */ ++ if (gid == DBUS_UID_UNSET) ++ { ++ unsigned long n; ++ ++ if (is_a_number (groupname, &n)) ++ gid = n; ++ } ++ + if (gid != DBUS_GID_UNSET) + info = _dbus_hash_table_lookup_ulong (db->groups, gid); + else Added: tinysofa/snapshot/dbus/current/sources/dbus-0.21.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/dbus/current/sources/dbus-0.21.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/dbus/current/sources/dbus-python-stack-trash.patch =================================================================== --- tinysofa/snapshot/dbus/current/sources/dbus-python-stack-trash.patch 2004-07-01 15:36:11 UTC (rev 2538) +++ tinysofa/snapshot/dbus/current/sources/dbus-python-stack-trash.patch 2004-07-01 15:36:13 UTC (rev 2539) @@ -0,0 +1,428 @@ +--- dbus/dbus/python/dbus_bindings.pyx.in.python-stack-trash.patch 2004-05-07 16:29:49.000000000 -0400 ++++ dbus/dbus/python/dbus_bindings.pyx.in 2004-05-07 16:32:33.000000000 -0400 +@@ -61,23 +61,41 @@ + class ConnectionError(Exception): + pass + ++ ++#forward delcerations ++cdef class Connection ++cdef class Message ++cdef class PendingCall ++cdef class Watch ++ + cdef void cunregister_function_handler (DBusConnection *connection, + void *user_data): ++ cdef Connection conn + tup = user_data + assert (type(tup) == list) + function = tup[1] +- args = [Connection(_conn=connection)] ++ conn = Connection() ++ conn.__cinit__(None, connection) ++ ++ args = [conn] + function(*args) + + cdef DBusHandlerResult cmessage_function_handler (DBusConnection *connection, + DBusMessage *msg, + void *user_data): ++ cdef Connection conn ++ cdef Message message ++ + tup = user_data + assert (type(tup) == list) + function = tup[0] + message = Message(_create=0) +- message._set_msg(msg) +- args = [Connection(_conn=connection), ++ message._set_msg(msg) ++ ++ conn = Connection() ++ conn.__cinit__(None, connection) ++ ++ args = [conn, + message] + retval = function(*args) + if (retval == None): +@@ -91,25 +109,36 @@ + # python objects and returning seemed to be corrupting them. This is a "global variable" :-( + cdef char **_parsed_path + +- def __init__(self, address=None, _conn=None): ++ def __init__(self, address=None, Connection _conn=None): ++ cdef DBusConnection *c_conn ++ cdef char *c_address ++ c_conn=NULL ++ if (_conn != None): ++ c_conn = _conn.conn ++ ++ if (address != None or _conn != None): ++ self.__cinit__(c_address, c_conn) ++ ++ # hack to be able to pass in a c pointer to the constructor ++ # while still alowing python programs to create a Connection object ++ cdef __cinit__(self, address, DBusConnection *_conn): + cdef DBusError error + dbus_error_init(&error) +- if _conn != NULL: +- self.conn = _conn ++ if _conn != NULL: ++ self.conn = _conn + dbus_connection_ref(self.conn) + else: + self.conn = dbus_connection_open(address, +- &error) ++ &error) + if dbus_error_is_set(&error): + raise DBusException, error.message +- +- dbus_connection_ref(self.conn) + +- def _set_conn(self, conn): +- self.conn = conn +- +- def _get_conn(self): +- return self.conn ++ ++ cdef _set_conn(self, DBusConnection *conn): ++ self.conn = conn ++ ++ cdef DBusConnection *_get_conn(self): ++ return self.conn + + #FIXME: this is totally busted, don't use a class shared member like parsed_path + def _build_parsed_path(self, path_element_list): +@@ -144,25 +173,30 @@ + dbus_connection_flush(self.conn) + + def borrow_message(self): ++ cdef Message m + m = Message(_create=0) +- m._set_msg(dbus_connection_borrow_message(self.conn)) ++ m._set_msg(dbus_connection_borrow_message(self.conn)) + return m + +- def return_message(self, message): ++ def return_message(self, Message message): ++ cdef DBusMessage *msg + msg = message._get_msg() +- dbus_connection_return_message(self.conn, msg) ++ dbus_connection_return_message(self.conn, msg) + +- def steal_borrowed_message(self, message): ++ def steal_borrowed_message(self, Message message): ++ cdef DBusMessage *msg + msg = message._get_msg() + dbus_connection_steal_borrowed_message(self.conn, +- msg) ++ msg) + + def pop_message(self): + cdef DBusMessage *msg ++ cdef Message m ++ + msg = dbus_connection_pop_message(self.conn) + if msg != NULL: + m = Message(_create=0) +- m._set_msg(msg) ++ m._set_msg(msg) + else: + m = None + return m +@@ -173,21 +207,24 @@ + def dispatch(self): + return dbus_connection_dispatch(self.conn) + +- def send(self, message): ++ def send(self, Message message): + #cdef dbus_uint32_t client_serial + #if type(message) != Message: + # raise TypeError +- ++ cdef DBusMessage *msg + msg = message._get_msg() + retval = dbus_connection_send(self.conn, +- msg, ++ msg, + NULL) + return retval + +- def send_with_reply(self, message, timeout_milliseconds): ++ def send_with_reply(self, Message message, timeout_milliseconds): + cdef dbus_bool_t retval + cdef DBusPendingCall *cpending_call + cdef DBusError error ++ cdef DBusMessage *msg ++ cdef PendingCall pending_call ++ + dbus_error_init(&error) + + cpending_call = NULL +@@ -195,7 +232,7 @@ + msg = message._get_msg() + + retval = dbus_connection_send_with_reply(self.conn, +- msg, ++ msg, + &cpending_call, + timeout_milliseconds) + +@@ -203,24 +240,28 @@ + raise DBusException, error.message + + if (cpending_call != NULL): +- pending_call = PendingCall(cpending_call) ++ pending_call = PendingCall() ++ pending_call.__cinit__(cpending_call) + else: + pending_call = None + + return (retval, pending_call) + +- def send_with_reply_and_block(self, message, ++ def send_with_reply_and_block(self, Message message, + timeout_milliseconds=0): + cdef DBusMessage * retval + cdef DBusError error ++ cdef DBusMessage *msg ++ cdef Message m ++ + dbus_error_init(&error) + + msg = message._get_msg() + + retval = dbus_connection_send_with_reply_and_block( +- self.conn, +- msg, +- timeout_milliseconds, ++ self.conn, ++ msg, ++ timeout_milliseconds, + &error) + + if dbus_error_is_set(&error): +@@ -230,7 +271,7 @@ + raise AssertionError + + m = Message(_create=0) +- m._set_msg(retval) ++ m._set_msg(retval) + return m + + def set_watch_functions(self, add_function, remove_function, data): +@@ -344,12 +385,16 @@ + cdef class PendingCall: + cdef DBusPendingCall *pending_call + +- def __init__(self, _pending_call): +- self.pending_call = _pending_call ++ def __init__(self, PendingCall _pending_call=None): ++ if (_pending_call != None): ++ self.__cinit__(_pending_call.pending_call) ++ ++ cdef void __cinit__(self, DBusPendingCall *_pending_call): ++ self.pending_call = _pending_call + dbus_pending_call_ref(self.pending_call) +- +- def _get_pending_call(self): +- return self.pending_call ++ ++ cdef DBusPendingCall *_get_pending_call(self): ++ return self.pending_call + + def cancel(self): + dbus_pending_call_cancel(self.pending_call) +@@ -358,8 +403,9 @@ + return dbus_pending_call_get_completed(self.pending_call) + + def get_reply(self): ++ cdef Message message + message = Message(_create=0) +- message._set_msg(dbus_pending_call_get_reply(self.pending_call)) ++ message._set_msg(dbus_pending_call_get_reply(self.pending_call)) + return message + + def block(self): +@@ -367,8 +413,12 @@ + + cdef class Watch: + cdef DBusWatch* watch +- def __init__(self, cwatch): +- self.watch = cwatch ++ ++ def __init__(self): ++ pass ++ ++ cdef __cinit__(self, DBusWatch *cwatch): ++ self.watch = cwatch + + def get_fd(self): + return dbus_watch_get_fd(self.watch) +@@ -388,13 +438,14 @@ + cdef DBusMessageIter real_iter + + +- def __init__(self, message): ++ def __init__(self, Message message): ++ cdef DBusMessage *msg + self.iter = &self.real_iter + msg = message._get_msg() +- dbus_message_iter_init(msg, self.iter) ++ dbus_message_iter_init(msg, self.iter) + +- def get_iter(self): +- return self.iter ++ cdef DBusMessageIter *_get_iter(self): ++ return self.iter + + def has_next(self): + return dbus_message_iter_has_next(self.iter) +@@ -599,11 +650,13 @@ + + def __init__(self, message_type=MESSAGE_TYPE_INVALID, + service=None, path=None, interface=None, method=None, +- method_call=None, ++ Message method_call=None, + name=None, +- reply_to=None, error_name=None, error_message=None, ++ Message reply_to=None, error_name=None, error_message=None, + _create=1): + cdef char *cservice ++ cdef DBusMessage *cmsg ++ + if (service == None): + cservice = NULL + else: +@@ -616,12 +669,12 @@ + self.msg = dbus_message_new_method_call(cservice, path, interface, method) + elif message_type == MESSAGE_TYPE_METHOD_RETURN: + cmsg = method_call._get_msg() +- self.msg = dbus_message_new_method_return(cmsg) ++ self.msg = dbus_message_new_method_return(cmsg) + elif message_type == MESSAGE_TYPE_SIGNAL: + self.msg = dbus_message_new_signal(path, interface, name) + elif message_type == MESSAGE_TYPE_ERROR: + cmsg = reply_to._get_msg() +- self.msg = dbus_message_new_error(cmsg, error_name, error_message) ++ self.msg = dbus_message_new_error(cmsg, error_name, error_message) + + def type_to_name(self, type): + if type == MESSAGE_TYPE_SIGNAL: +@@ -698,11 +751,11 @@ + + return retval + +- def _set_msg(self, msg): +- self.msg = msg ++ cdef _set_msg(self, DBusMessage *msg): ++ self.msg = msg + +- def _get_msg(self): +- return self.msg ++ cdef DBusMessage *_get_msg(self): ++ return self.msg + + def get_iter(self): + return MessageIter(self) +@@ -861,6 +914,7 @@ + + def bus_get (bus_type): + cdef DBusError error ++ cdef Connection conn + dbus_error_init(&error) + cdef DBusConnection *connection + +@@ -870,19 +924,23 @@ + if dbus_error_is_set(&error): + raise DBusException, error.message + +- return Connection(_conn=connection) ++ conn = Connection() ++ conn.__cinit__(None, connection) ++ return conn + +-def bus_get_base_service(connection): ++def bus_get_base_service(Connection connection): ++ cdef DBusConnection *conn + conn = connection._get_conn() +- return dbus_bus_get_base_service(conn) ++ return dbus_bus_get_base_service(conn) + +-def bus_register(connection): ++def bus_register(Connection connection): + cdef DBusError error + dbus_error_init(&error) + cdef dbus_bool_t retval ++ cdef DBusConnection *conn + + conn = connection._get_conn() +- retval = dbus_bus_register(conn, ++ retval = dbus_bus_register(conn, + &error) + if dbus_error_is_set(&error): + raise DBusException, error.message +@@ -892,13 +950,14 @@ + SERVICE_FLAG_PROHIBIT_REPLACEMENT = 0x1 + SERVICE_FLAG_REPLACE_EXISTING = 0x2 + +-def bus_acquire_service(connection, service_name, flags=0): ++def bus_acquire_service(Connection connection, service_name, flags=0): + cdef DBusError error + dbus_error_init(&error) + cdef int retval ++ cdef DBusConnection *conn + + conn = connection._get_conn() +- retval = dbus_bus_acquire_service(conn, ++ retval = dbus_bus_acquire_service(conn, + service_name, + flags, + &error) +@@ -906,35 +965,40 @@ + raise DBusException, error.message + return retval + +-def bus_service_exists(connection, service_name): ++def bus_service_exists(Connection connection, service_name): + cdef DBusError error + dbus_error_init(&error) + cdef dbus_bool_t retval ++ cdef DBusConnection *conn + + conn = connection._get_conn() +- retval = dbus_bus_service_exists(conn, ++ retval = dbus_bus_service_exists(conn, + service_name, + &error) + if dbus_error_is_set(&error): + raise DBusException, error.message + return retval + +-def bus_add_match(connection, rule): ++def bus_add_match(Connection connection, rule): + cdef DBusError error ++ cdef DBusConnection *conn ++ + dbus_error_init(&error) + + conn = connection._get_conn() +- dbus_bus_add_match (conn, rule, &error) ++ dbus_bus_add_match (conn, rule, &error) + + if dbus_error_is_set(&error): + raise DBusException, error.message + +-def bus_remove_match(connection, rule): ++def bus_remove_match(Connection connection, rule): + cdef DBusError error ++ cdef DBusConnection *conn ++ + dbus_error_init(&error) + + conn = connection._get_conn() +- dbus_bus_remove_match (conn, rule, &error) ++ dbus_bus_remove_match (conn, rule, &error) + + if dbus_error_is_set(&error): + raise DBusException, error.message Added: tinysofa/snapshot/dbus/current/specs/dbus.spec =================================================================== --- tinysofa/snapshot/dbus/current/specs/dbus.spec 2004-07-01 15:36:11 UTC (rev 2538) +++ tinysofa/snapshot/dbus/current/specs/dbus.spec 2004-07-01 15:36:13 UTC (rev 2539) @@ -0,0 +1,350 @@ +%define gettext_package dbus + +%define expat_version 1.95.5 +%define glib2_version 2.2.0 +%define qt_version 3.1.0 +%define pyrex_version 0.9.2.1 +%define gtk2_version 2.4.0 + +%define dbus_user_uid 81 + +Summary: D-BUS message bus +Name: dbus +Version: 0.21 +Release: 10ts +URL: http://www.freedesktop.org/software/dbus/ +Source0: %{name}-%{version}.tar.gz +License: AFL/GPL +Group: System Environment/Libraries +BuildRoot: %{_tmppath}/%{name}-%{version}-root +PreReq: chkconfig /usr/sbin/useradd +BuildRequires: expat-devel >= %{expat_version} +BuildRequires: glib2-devel >= %{glib2_version} +#BuildRequires: qt-devel >= %{qt_version} +BuildRequires: Pyrex >= %{pyrex_version} +BuildRequires: gtk2-devel >= %{gtk_version} + +Conflicts: cups < 1:1.1.20-4 + +Patch1: dbus-0.13-uid.patch +Patch2: dbus-python-stack-trash.patch + +%description + +D-BUS is a system for sending messages between applications. It is +used both for the systemwide message bus service, and as a +per-user-login-session messaging facility. + +%package devel +Summary: Libraries and headers for D-BUS +Group: Development/Libraries +Requires: %name = %{version}-%{release} + +%description devel + +Headers and static libraries for D-BUS. + +%package glib +Summary: GLib-based library for using D-BUS +Group: Development/Libraries +Requires: %name = %{version}-%{release} + +%description glib + +D-BUS add-on library to integrate the standard D-BUS library with +the GLib thread abstraction and main loop. + +%if 0 + +%package qt +Summary: Qt-based library for using D-BUS +Group: Development/Libraries +Requires: %name = %{version}-%{release} + +%description qt + +D-BUS add-on library to integrate the standard D-BUS library with +the Qt thread abstraction and main loop. + +%endif + +%package x11 +Summary: X11-requiring add-ons for D-BUS +Group: Development/Libraries +Requires: %name = %{version}-%{release} + +%description x11 + +D-BUS contains some tools that require Xlib to be installed, those are +in this separate package so server systems need not install X. + +%package python +Summary: python bindings for D-BUS +Group: Development/Libraries +Requires: %name = %{version}-%{release} + +%description python + +D-BUS python bindings for use with python programs. + +%prep +%setup -q + +%patch1 -p1 -b .uid +%patch2 -p2 -b .python-stack-trash + +%build + +COMMON_ARGS="--enable-glib=yes --enable-qt=no --with-init-scripts=redhat" + +if test -d %{_libdir}/qt-3.1 ; then + export QTDIR=%{_libdir}/qt-3.1 +else + echo "WARNING: %{_libdir}/qt-3.1 does not exist" +fi + +#### Fix user to run the system bus as +perl -pi -e 's@[a-z]+@%{dbus_user_uid}@g' bus/system.conf* + +### this is some crack because bits of dbus can be +### smp-compiled but others don't feel like working +function make_fast() { + ### try to burn through it with SMP a couple times + make %{?_smp_mflags} || true + make %{?_smp_mflags} || true + + ### then do a real make and don't ignore failure + make +} + +%ifarch ia64 +#FIXME: workaround for gcc-3.4 bug which causes python bindings build to hand on ia64 arches +CFLAGS="$RPM_OPT_FLAGS -O1" +export CFLAGS +%endif +#### Build once with tests to make check +%configure $COMMON_ARGS --enable-tests=yes --enable-verbose-mode=yes --enable-asserts=yes +make_fast +exit 0 +DBUS_VERBOSE=1 make check > dbus-check.log 2>&1 || (cat dbus-check.log && false) + +#### Clean up and build again +make clean + +%configure $COMMON_ARGS --disable-tests --disable-verbose-mode --disable-asserts +make_fast + +%install +rm -rf %{buildroot} + +%makeinstall + +rm -f $RPM_BUILD_ROOT%{_libdir}/*.la + +## %find_lang %{gettext_package} + +%clean +rm -rf %{buildroot} + +%pre +# Add the "dbus" user +/usr/sbin/useradd -c 'System message bus' -u %{dbus_user_uid} \ + -s /sbin/nologin -r -d '/' dbus 2> /dev/null || : + +%post +/sbin/ldconfig +/sbin/chkconfig --add messagebus + +%preun +if [ $1 = 0 ]; then + service messagebus stop > /dev/null 2>&1 + /sbin/chkconfig --del messagebus +fi + +%postun +/sbin/ldconfig +if [ "$1" -ge "1" ]; then + service messagebus condrestart > /dev/null 2>&1 +fi + +%files +%defattr(-,root,root) + +%doc COPYING ChangeLog NEWS + +%dir %{_sysconfdir}/dbus-1 +%config %{_sysconfdir}/dbus-1/*.conf +%config %{_sysconfdir}/rc.d/init.d/* +%dir %{_sysconfdir}/dbus-1/system.d +%dir %{_localstatedir}/run/dbus +%dir %{_libdir}/dbus-1.0 +%{_bindir}/dbus-daemon-1 +%{_bindir}/dbus-send +%{_bindir}/dbus-cleanup-sockets +%{_libdir}/*dbus-1*.so.* +%{_datadir}/man/man*/* +%{_libdir}/dbus-1.0/services + +%files devel +%defattr(-,root,root) + +%{_libdir}/lib*.a +%{_libdir}/lib*.so +%{_libdir}/dbus-1.0/include +%{_libdir}/pkgconfig/* +%{_includedir}/* + +%files glib +%defattr(-,root,root) + +%{_libdir}/*glib*.so.* +%{_bindir}/dbus-glib-tool +%{_bindir}/dbus-monitor +%{_bindir}/dbus-viewer + +%if 0 +%files qt +%defattr(-,root,root) + +%{_libdir}/*qt*.so.* + +%endif + +%files x11 +%defattr(-,root,root) + +%{_bindir}/dbus-launch + +%files python +%defattr(-,root,root) +%{_libdir}/python*/site-packages/dbus.py +%{_libdir}/python*/site-packages/dbus.pyc +%{_libdir}/python*/site-packages/dbus.pyo +%{_libdir}/python*/site-packages/dbus_bindings.a +%{_libdir}/python*/site-packages/dbus_bindings.la +%{_libdir}/python*/site-packages/dbus_bindings.so + +%changelog +* Fri Jun 25 2004 John (J5) Palmieri +- Workaround added to fix gcc-3.4 bug on ia64 + +* Fri Jun 25 2004 John (J5) Palmieri +- require new Pyrex version and see if it builds this time + +* Fri Jun 25 2004 John (J5) Palmieri +- rebuild with updated Pyrex (0.9.2.1) + +* Tue Jun 15 2004 Elliot Lee +- rebuilt + +* Fri Jun 04 2004 John (J5) Palmieri +- Moved dbus-viewer, dbus-monitor and dbus-glib-tool + into the dbus-glib package so that the main dbus + package does not depend on glib (Bug #125285) + +* Thu Jun 03 2004 John (J5) Palmieri +- rebuilt + +* Thu May 27 2004 John (J5) Palmieri +- added my Python patch +- took out the qt build requires +- added a gtk+ build requires + +* Fri Apr 23 2004 John (J5) Palmieri +- Changed build requirement to version 0.9-3 of Pyrex + to fix problem with builing on x86_64 + +* Tue Apr 20 2004 John (J5) Palmieri +- update to upstream 0.21 +- removed dbus-0.20-varargs.patch patch (fixed upstream) + +* Mon Apr 19 2004 John (J5) Palmieri +- added a dbus-python package to generate python bindings +- added Pyrex build dependacy + +* Tue Mar 02 2004 Elliot Lee +- rebuilt + +* Wed Feb 25 2004 Bill Nottingham 0.20-4 +- fix dbus error functions on x86-64 (#116324) +- add prereq (#112027) + +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Fri Feb 13 2004 Tim Waugh +- Conflict with cups prior to configuration file change, so that the + %%postun service condrestart works. + +* Wed Feb 11 2004 Havoc Pennington 0.20-2 +- rebuild in fc2, cups now updated + +* Wed Jan 7 2004 Bill Nottingham 0.20-1 +- update to upstream 0.20 + +* Thu Oct 16 2003 Havoc Pennington 0.13-6 +- hmm, dbus doesn't support uids in the config file. fix. + +* Thu Oct 16 2003 Havoc Pennington 0.13-5 +- put uid instead of username in the config file, to keep things working with name change + +* Thu Oct 16 2003 Havoc Pennington 0.13-4 +- make subpackages require the specific release, not just version, of base package + +* Thu Oct 16 2003 Havoc Pennington 0.13-3 +- change system user "messagebus" -> "dbus" to be under 8 chars + +* Mon Sep 29 2003 Havoc Pennington 0.13-2 +- see if removing qt subpackage for now will get us through the build system, + qt bindings not useful yet anyway + +* Sun Sep 28 2003 Havoc Pennington 0.13-1 +- 0.13 fixes a little security oops + +* Mon Aug 4 2003 Havoc Pennington 0.11.91-3 +- break the tiny dbus-launch that depends on X into separate package + so a CUPS server doesn't need X installed + +* Wed Jun 04 2003 Elliot Lee +- rebuilt + +* Sat May 17 2003 Havoc Pennington 0.11.91-1 +- 0.11.91 cvs snap properly merges system.d + +* Fri May 16 2003 Havoc Pennington 0.11.90-1 +- build a cvs snap with a few more fixes + +* Fri May 16 2003 Havoc Pennington 0.11-2 +- fix a crash that was breaking cups + +* Thu May 15 2003 Havoc Pennington 0.11-1 +- 0.11 + +* Thu May 15 2003 Havoc Pennington 0.10.90-1 +- use rc.d/init.d not init.d, bug #90192 +- include the new man pages + +* Fri Apr 11 2003 Havoc Pennington 0.9-1 +- 0.9 +- export QTDIR explicitly +- re-enable qt, the problem was most likely D-BUS configure + +* Tue Apr 1 2003 Havoc Pennington 0.6.94-1 +- update from CVS with a fix to set uid after gid + +* Tue Apr 1 2003 Havoc Pennington 0.6.93-1 +- new cvs snap that actually forks to background and changes + user it's running as and so forth +- create our system user in pre + +* Mon Mar 31 2003 Havoc Pennington 0.6.92-1 +- fix for "make check" test that required a home directory + +* Mon Mar 31 2003 Havoc Pennington 0.6.91-1 +- disable qt for now because beehive hates me +- pull a slightly newer cvs snap that creates socket directory +- cat the make check log after make check fails + +* Mon Mar 31 2003 Havoc Pennington 0.6.90-1 +- initial build + From svn at tinysofa.org Thu Jul 1 15:36:19 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:36:19 +1000 (EST) Subject: [tinysofa-svn] r2541 - in tinysofa/snapshot: . device-mapper device-mapper/current device-mapper/current/sources device-mapper/current/specs Message-ID: <20040701153619.EB8964E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:36:19 +1000 (Fri, 02 Jul 2004) New Revision: 2541 Added: tinysofa/snapshot/device-mapper/ tinysofa/snapshot/device-mapper/current/ tinysofa/snapshot/device-mapper/current/sources/ tinysofa/snapshot/device-mapper/current/sources/device-mapper-selinux_enabled.patch tinysofa/snapshot/device-mapper/current/sources/device-mapper.1.00.17.tgz tinysofa/snapshot/device-mapper/current/specs/ tinysofa/snapshot/device-mapper/current/specs/device-mapper.spec Log: - Add device-mapper to snapshot from 2.0. Added: tinysofa/snapshot/device-mapper/current/sources/device-mapper-selinux_enabled.patch =================================================================== --- tinysofa/snapshot/device-mapper/current/sources/device-mapper-selinux_enabled.patch 2004-07-01 15:36:17 UTC (rev 2540) +++ tinysofa/snapshot/device-mapper/current/sources/device-mapper-selinux_enabled.patch 2004-07-01 15:36:19 UTC (rev 2541) @@ -0,0 +1,12 @@ +diff -Nru a/lib/libdm-common.c b/lib/libdm-common.c +--- a/lib/libdm-common.c Wed May 26 17:44:43 2004 ++++ b/lib/libdm-common.c Wed May 26 17:44:43 2004 +@@ -208,7 +208,7 @@ + + log_debug("Setting SELinux context for %s", path); + if (is_selinux_enabled() <= 0) +- return 0; ++ return 1; + + if (matchpathcon(path, 0, &scontext) < 0) { + log_error("%s: matchpathcon failed: %s", path, strerror(errno)); Added: tinysofa/snapshot/device-mapper/current/sources/device-mapper.1.00.17.tgz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/device-mapper/current/sources/device-mapper.1.00.17.tgz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/device-mapper/current/specs/device-mapper.spec =================================================================== --- tinysofa/snapshot/device-mapper/current/specs/device-mapper.spec 2004-07-01 15:36:17 UTC (rev 2540) +++ tinysofa/snapshot/device-mapper/current/specs/device-mapper.spec 2004-07-01 15:36:19 UTC (rev 2541) @@ -0,0 +1,82 @@ +Summary: device mapper library +Name: device-mapper +Version: 1.00.17 +Release: 2.0ts +License: GPL +Group: System Environment/Base +URL: http://sources.redhat.com/dm +Source0: %{name}.%{version}.tgz +Patch0: device-mapper-selinux_enabled.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-root + +%define _exec_prefix / + +%description +This package contains the supporting userspace files (libdevmapper and +dmsetup) for the device-mapper. + +%prep +%setup -q -n %{name}.%{version} +%patch0 -p1 -b .selinux_enabled + +%build +%configure --enable-static_link --with-user= --with-group= +make + +%install +rm -rf $RPM_BUILD_ROOT +%makeinstall + +%clean +rm -rf $RPM_BUILD_ROOT + +%post -p /sbin/ldconfig + +%postun -p /sbin/ldconfig + +%files +%defattr(-,root,root,-) +%doc COPYING COPYING.LIB INSTALL INTRO README VERSION WHATS_NEW +%{_libdir}/libdevmapper.so* +%{_libdir}/libdevmapper.a* +%{_sbindir}/dmsetup +%{_sbindir}/dmsetup.static +%{_mandir}/*/* +%{_includedir}/libdevmapper.h + + +%changelog +* Wed May 26 2004 Alasdair Kergon - 1.00.17-2 +- Fix is_selinux_enabled() test + +* Mon Apr 19 2004 Alasdair Kergon - 1.00.17-1 +- Fix non-root build with current version of 'install'. +- Incorporate last two selinux patches into tarball. + +* Fri Apr 16 2004 Bill Nottingham - 1.00.14-3 +- fix linking against libselinux on x86-64 + +* Thu Apr 15 2004 Jeremy Katz - 1.00.14-2 +- don't error out if we get ENOTSUP setting the context + +* Tue Apr 06 2004 Alasdair Kergon 1.00.14-1 +- Fix static selinux build. + +* Tue Apr 06 2004 Alasdair Kergon 1.00.13-1 +- Set selinux context when doing mknod. + +* Mon Apr 05 2004 Alasdair Kergon 1.00.11-1 +- Cleanup build process. Add features: dmsetup targets, event_nr support. + +* Tue Mar 02 2004 Elliot Lee +- rebuilt + +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Fri Dec 5 2003 Jeremy Katz 1.00.07-2 +- add static lib + +* Tue Dec 2 2003 Jeremy Katz 1.00.07-1 +- Initial build. + From svn at tinysofa.org Thu Jul 1 15:36:21 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:36:21 +1000 (EST) Subject: [tinysofa-svn] r2542 - in tinysofa/snapshot: . devlabel devlabel/current devlabel/current/sources devlabel/current/specs Message-ID: <20040701153621.A85484E817D@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:36:21 +1000 (Fri, 02 Jul 2004) New Revision: 2542 Added: tinysofa/snapshot/devlabel/ tinysofa/snapshot/devlabel/current/ tinysofa/snapshot/devlabel/current/sources/ tinysofa/snapshot/devlabel/current/sources/devlabel-0.26.08-s390.patch tinysofa/snapshot/devlabel/current/sources/devlabel-0.48.01-typo.patch tinysofa/snapshot/devlabel/current/sources/devlabel-0.48.03.tar.gz tinysofa/snapshot/devlabel/current/specs/ tinysofa/snapshot/devlabel/current/specs/devlabel.spec Log: - Add devlabel to snapshot from 2.0. Added: tinysofa/snapshot/devlabel/current/sources/devlabel-0.26.08-s390.patch =================================================================== --- tinysofa/snapshot/devlabel/current/sources/devlabel-0.26.08-s390.patch 2004-07-01 15:36:19 UTC (rev 2541) +++ tinysofa/snapshot/devlabel/current/sources/devlabel-0.26.08-s390.patch 2004-07-01 15:36:21 UTC (rev 2542) @@ -0,0 +1,17 @@ +--- devlabel-0.26.08/devlabel.s390 2003-01-28 15:13:17.000000000 +0100 ++++ devlabel-0.26.08/devlabel 2003-01-28 18:21:45.000000000 +0100 +@@ -240,6 +240,14 @@ + + function add_entry() + { ++ # Disable for s390 and s390x. Needs to done fairly different. ++ if [ "`uname -m`" = "s390" -o "`uname -m`" = "s390x" ]; then ++ echo $"" >&2 ++ echo $"Fdisk is not available for s390 or s390x." >&2 ++ echo $"Aborting device check." >&2 ++ exit 4 ++ fi ++ + # Check that the right arguments were passed + if [ -z "$cli_symlink" ] || [ -z "$cli_device" ] && [ -z "$cli_uuid" ]; then + echo $"" >&2 Added: tinysofa/snapshot/devlabel/current/sources/devlabel-0.48.01-typo.patch =================================================================== --- tinysofa/snapshot/devlabel/current/sources/devlabel-0.48.01-typo.patch 2004-07-01 15:36:19 UTC (rev 2541) +++ tinysofa/snapshot/devlabel/current/sources/devlabel-0.48.01-typo.patch 2004-07-01 15:36:21 UTC (rev 2542) @@ -0,0 +1,22 @@ +--- devlabel-0.48.01/devlabel.typo 2004-05-28 09:20:09.202210384 +0200 ++++ devlabel-0.48.01/devlabel 2004-05-28 09:24:32.359204440 +0200 +@@ -126,7 +126,7 @@ + dev_prefix=`echo "$1" | sed 's/.*\([hs]d[a-z]\+\).*/\1/'` + dev_suffix=`echo "$1" | sed 's/.*[hs]d[a-z]\+//'` + +- if [ `grep -c "$1$" $IGNORE_LIST` -gt 0 ]; then ++ if [ `grep -c "$1" $IGNORE_LIST` -gt 0 ]; then + return 1 + fi + +@@ -760,8 +760,8 @@ + + TEXTDOMAIN=initscripts + CONFIG_FILE=/etc/sysconfig/devlabel +-IGNORE_LIST=/etc/sysconfig/devlabel.d/ignore_list +-LAST_LIST=/etc/sysconfig/devlabel.d/proc_partitions ++IGNORE_LIST=/var/lib/devlabel/ignore_list ++LAST_LIST=/var/lib/devlabel/proc_partitions + + [ -f $CONFIG_FILE ] || exit 0 + Added: tinysofa/snapshot/devlabel/current/sources/devlabel-0.48.03.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/devlabel/current/sources/devlabel-0.48.03.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/devlabel/current/specs/devlabel.spec =================================================================== --- tinysofa/snapshot/devlabel/current/specs/devlabel.spec 2004-07-01 15:36:19 UTC (rev 2541) +++ tinysofa/snapshot/devlabel/current/specs/devlabel.spec 2004-07-01 15:36:21 UTC (rev 2542) @@ -0,0 +1,174 @@ +Summary: Consistent/persistent storage device access through symlinking +Name: devlabel +Version: 0.48.03 +Release: 1ts +License: GPL +Group: System Environment/Base +Source: http://linux.dell.com/devlabel/permalink/devlabel-%{version}.tar.gz +URL: http://linux.dell.com/devlabel/devlabel.html +Requires: sed grep gawk coreutils +Patch: devlabel-0.26.08-s390.patch +Patch2: devlabel-0.48.01-typo.patch +Requires: initscripts > 6.97-1 +Requires: util-linux +BuildRequires: e2fsprogs-devel +BuildRoot: %{_tmppath}/%{name}-%{version}-root + +%description +This package contains the devlabel implementation. It allows for consistent +mounting of devices. This is accomplished through tagging a unique identifier +to each device/symlink combination and confirming that the identifier still +matches the device name before it allows the symlink mapping to proceed. + +%prep +%setup +%patch -p1 -b .s390 +%patch2 -p1 + +%build +gunzip *.gz +gcc $RPM_OPT_FLAGS -o scsi_unique_id scsi_unique_id.c +gcc $RPM_OPT_FLAGS -o partition_uuid -luuid partition_uuid.c + +%install +if [ "$RPM_BUILD_ROOT" != "/" ]; then + rm -rf $RPM_BUILD_ROOT +fi +mkdir -p $RPM_BUILD_ROOT/{sbin,usr/bin,usr/share/man/man8,etc/sysconfig} +install -m 755 devlabel $RPM_BUILD_ROOT/sbin +install -m 755 scsi_unique_id $RPM_BUILD_ROOT%{_bindir} +install -m 755 partition_uuid $RPM_BUILD_ROOT%{_bindir} +install -m 644 devlabel.8 $RPM_BUILD_ROOT%{_mandir}/man8 +install -m 644 sysconfig.devlabel $RPM_BUILD_ROOT/etc/sysconfig/devlabel + +mkdir -p $RPM_BUILD_ROOT/var/lib/devlabel +touch $RPM_BUILD_ROOT/var/lib/devlabel/ignore_list +touch $RPM_BUILD_ROOT/var/lib/devlabel/proc_partitions + +%triggerpostun -- devlabel <= 0.38.07-1 +if [ -e /etc/sysconfig/devlabel ]; then + /sbin/devlabel reverseremap --force >/dev/null 2>&1 || : +fi + +%clean +if [ "$RPM_BUILD_ROOT" != "/" ]; then + rm -rf $RPM_BUILD_ROOT +fi + +%files +%defattr(-,root,root) +%doc AUTHORS COPYING +/sbin/devlabel +%{_bindir}/scsi_unique_id +%{_bindir}/partition_uuid +%config(noreplace) /etc/sysconfig/devlabel +%{_mandir}/man8/devlabel.8* +%dir /var/lib/devlabel +%verify(not md5 size mtime) %config(noreplace) /var/lib/devlabel/ignore_list +%verify(not md5 size mtime) %config(noreplace) /var/lib/devlabel/proc_partitions + +%changelog +* Fri May 28 2004 Bill Nottingham 0.48.01-3 +- fix warnings (#124442, ) + +* Tue May 18 2004 Warren Togami 0.48.01-2 +- update to 0.48.01 + +* Fri May 14 2004 Warren Togami +- #114892 and other spec cleanups + +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Thu Nov 20 2003 Bill Nottingham 0.42.05-2.1 +- rebuild + +* Tue Sep 30 2003 Bill Nottingham 0.42.05-2 +- rebuild + +* Tue Sep 30 2003 Bill Nottingham 0.42.05-1 +- update to upstream 0.42.05 + - Added sfdisk checking hack to avoid IO errors on bad usb device partition tables (#103868) + +* Tue Jun 24 2003 Bill Nottingham 0.41.01-1 +- update to upstream 0.41.01 +- add trigger to call reverseremap on upgrades from old versions + +* Wed Jun 04 2003 Elliot Lee +- rebuilt + +* Tue Jun 3 2003 Bill Nottingham 0.38.07-1 +- update to 0.38.07 + +* Tue Jan 28 2003 Phil Knirsch 0.26.08-3 +- Disabled fdisk and with that add stuff for s390(x) completely for now. + +* Wed Jan 22 2003 Tim Powers +- rebuilt + +* Tue Jan 14 2003 Bill Nottingham 0.26.08-1 +- update to 0.26.08 +- ship the tarball + +* Thu Dec 05 2002 Florian La Roche +- require util-linux instead of some of its apps + due to fdisk not being available on mainframe + +* Mon Dec 2 2002 Bill Nottingham 0.23-2 +- package upstream version +- clean up spec file a little +- fix requires + +* Tue Oct 29 2002 Gary Lerhaupt gary_lerhaupt at dell.com +- Created scsi_unique_id variable to increase speed +- Fixed unbound raw device status +- Made restart,reload truly synonymous with start + +* Mon Oct 28 2002 Gary Lerhaupt gary_lerhaupt at dell.com +- Fixed remapping bug + +* Mon Oct 21 2002 Gary Lerhaupt gary_lerhaupt at dell.com +- Updated man page to reflect interdisk renaming limitation + +* Wed Oct 16 2002 Gary Lerhaupt gary_lerhaupt at dell.com +- Changed output of raw status + +* Thu Oct 10 2002 Gary Lerhaupt gary_lerhaupt at dell.com +- fixed fdisk -l bug + +* Mon Oct 7 2002 Gary Lerhaupt gary_lerhaupt at dell.com +- changed check to see if device even exists in devlabel add +- changed some seds to awks +- changed reading in of /proc/partitions + +* Tue Sep 17 2002 Gary Lerhaupt gary_lerhaupt at dell.com +- Got rid of egrep -o usage + +* Wed Aug 28 2002 Gary Lerhaupt gary_lerhaupt at dell.com +- Transistition devlabel from sysV to /sbin script +- Added rc.sysinit patch + +* Tue Aug 27 2002 Gary Lerhaupt gary_lerhaupt at dell.com +- Added second hotplug_usb patch for 7.3 and up + +* Fri Aug 23 2002 Gary Lerhaupt gary_lerhaupt at dell.com +- Add model names to SCSI UUIDs + +* Thu Aug 22 2002 Gary Lerhaupt gary_lerhaupt at dell.com +- Added log statement for when devlabel is started/restarted +- Added hotplugging patches for pci, usb & ieee1394 + +* Wed Aug 21 2002 Gary Lerhaupt gary_lerhaupt at dell.com +- Added model to IDE UUIDs +- Fixed error messages +- PCMCIA storage works + +* Tue Aug 20 2002 Gary Lerhaupt gary_lerhaupt at dell.com +- First working release +- Questionable multipath support +- Questionable USB support +- Questionable PCMCIA support +- No hotplug support + +* Fri Aug 16 2002 Gary Lerhaupt gary_lerhaupt at dell.com +- Initial transition from saferawdevices to devlabel From svn at tinysofa.org Thu Jul 1 15:36:17 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:36:17 +1000 (EST) Subject: [tinysofa-svn] r2540 - in tinysofa/snapshot: . dejagnu dejagnu/current dejagnu/current/sources dejagnu/current/specs Message-ID: <20040701153617.EAD934E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:36:17 +1000 (Fri, 02 Jul 2004) New Revision: 2540 Added: tinysofa/snapshot/dejagnu/ tinysofa/snapshot/dejagnu/current/ tinysofa/snapshot/dejagnu/current/sources/ tinysofa/snapshot/dejagnu/current/sources/dejagnu-1.4.2-makefile-style-arg.patch tinysofa/snapshot/dejagnu/current/sources/dejagnu-1.4.2.tar.bz2 tinysofa/snapshot/dejagnu/current/sources/doc-Makefile.patch tinysofa/snapshot/dejagnu/current/specs/ tinysofa/snapshot/dejagnu/current/specs/dejagnu.spec Log: - Add dejagnu to snapshot from 2.0. Added: tinysofa/snapshot/dejagnu/current/sources/dejagnu-1.4.2-makefile-style-arg.patch =================================================================== --- tinysofa/snapshot/dejagnu/current/sources/dejagnu-1.4.2-makefile-style-arg.patch 2004-07-01 15:36:13 UTC (rev 2539) +++ tinysofa/snapshot/dejagnu/current/sources/dejagnu-1.4.2-makefile-style-arg.patch 2004-07-01 15:36:17 UTC (rev 2540) @@ -0,0 +1,18 @@ +2001-10-06 Gwenole Beauchesne + + * Check for Makefile style arguments in the second pass, but + ignore them, so they don't become invalid arguments. + +--- dejagnu-1.4.2/runtest.exp.jj Wed Sep 12 18:39:56 2001 ++++ dejagnu-1.4.2/runtest.exp Mon Apr 29 11:27:14 2002 +@@ -1164,6 +1164,10 @@ for { set i 0 } { $i < $argc } { incr i + exit 0 + } + ++ "[A-Z0-9_-.]*=*" { # skip makefile style args like CC=gcc, etc... (processed in first pass) ++ continue ++ } ++ + default { + if [info exists tool] { + if { [info proc ${tool}_option_proc] != "" } { Added: tinysofa/snapshot/dejagnu/current/sources/dejagnu-1.4.2.tar.bz2 =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/dejagnu/current/sources/dejagnu-1.4.2.tar.bz2 ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/dejagnu/current/sources/doc-Makefile.patch =================================================================== --- tinysofa/snapshot/dejagnu/current/sources/doc-Makefile.patch 2004-07-01 15:36:13 UTC (rev 2539) +++ tinysofa/snapshot/dejagnu/current/sources/doc-Makefile.patch 2004-07-01 15:36:17 UTC (rev 2540) @@ -0,0 +1,29 @@ +--- dejagnu-1.4.1/doc/Makefile.in.orig Sun May 6 16:11:28 2001 ++++ dejagnu-1.4.1/doc/Makefile.in Thu Jun 28 15:18:54 2001 +@@ -76,7 +76,7 @@ + # now, don't install the old texinfo document from version 1.3 + # info_TEXINFOS = dejagnu.texi + DOCBOOK = @DOCBOOK@ +-TARGETS = overview.html overview.ps overview.pdf overview.rtf ++TARGETS = overview.ps overview.pdf + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_CLEAN_FILES = + man1dir = $(mandir)/man1 +@@ -266,16 +266,12 @@ + # now for some extra dependencies that the automatic rules will not + # catch: + +-html rtf overview.pdf overview.ps overview.dvi overview.rtf overview.html: overview.sgml ref.sgml user.sgml ++overview.pdf overview.ps overview.dvi: overview.sgml ref.sgml user.sgml + + clean realclean distclean: + rm -fr $(TARGETS) DBHTOHTML* overview.junk overview overview.{aux,dvi,log,ps,pdf,tex} + + install-doc: $(TARGETS) +- $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/html $(DESTDIR)$(pkgdatadir)/html/stylesheet-images +- $(INSTALL_DATA) overview/*.html $(DESTDIR)$(pkgdatadir)/html +- $(INSTALL_DATA) overview/stylesheet-images/*.png $(DESTDIR)$(pkgdatadir)/html/stylesheet-images +- $(INSTALL_DATA) overview.rtf $(DESTDIR)$(pkgdatadir)/dejagnu.rtf + $(INSTALL_DATA) overview.ps $(DESTDIR)$(pkgdatadir)/dejagnu.ps + $(INSTALL_DATA) overview.pdf $(DESTDIR)$(pkgdatadir)/dejagnu.pdf + $(INSTALL_DATA) $(srcdir)/runtest.1 $(mandir)/man1/ Added: tinysofa/snapshot/dejagnu/current/specs/dejagnu.spec =================================================================== --- tinysofa/snapshot/dejagnu/current/specs/dejagnu.spec 2004-07-01 15:36:13 UTC (rev 2539) +++ tinysofa/snapshot/dejagnu/current/specs/dejagnu.spec 2004-07-01 15:36:17 UTC (rev 2540) @@ -0,0 +1,136 @@ +Summary: A front end for testing other programs. +Name: dejagnu +Version: 1.4.2 +Release: 11ts +Epoch: 1 +Copyright: GPL +Source: ftp://ftp.gnu.org/gnu/dejagnu/dejagnu-1.4.2.tar.bz2 +Patch0: doc-Makefile.patch +Patch1: dejagnu-1.4.2-makefile-style-arg.patch +Group: Development/Tools +Requires: tcl >= 8.0, expect >= 5.21 +BuildRoot: %{_tmppath}/%{name}-%{version}-root +BuildArchitectures: noarch +BuildRequires: jadetex docbook-utils-pdf tetex-dvips + +%description +DejaGnu is an Expect/Tcl based framework for testing other programs. +DejaGnu has several purposes: to make it easy to write tests for any +program; to allow you to write tests which will be portable to any +host or target where a program must be tested; and to standardize the +output format of all tests (making it easier to integrate the testing +into software development). + +%prep +%setup -q -n dejagnu-%{version} +%patch0 -p1 +%patch1 -p1 +find . -name \*.rej -exec rm {} \; + +%build +%configure -v +make +make overview.{html,ps,pdf} + +%install +rm -rf $RPM_BUILD_ROOT +%makeinstall + +pushd doc +make docs +make man1dir=%{buildroot}%{_mandir}/man1 install-man +popd + +mv $RPM_BUILD_ROOT%{_libexecdir}/config.guess $RPM_BUILD_ROOT%{_datadir}/dejagnu +rm -rf $RPM_BUILD_ROOT%{_libexecdir} + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(-,root,root) +%doc COPYING NEWS README AUTHORS INSTALL ChangeLog doc/overview doc/overview.{ps,pdf} +%{_bindir}/runtest +%{_datadir}/dejagnu +%{_includedir}/dejagnu.h +%{_mandir}/*/* + + +%changelog +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Wed Jan 22 2003 Tim Powers +- rebuilt + +* Mon Dec 30 2002 Karsten Hopp 1:1.4.2-9 +- more missing BuildRequires + +* Tue Dec 17 2002 Karsten Hopp 1:1.4.2-8 +- Add jadetex Buildrequires + +* Wed Nov 27 2002 Tim Powers 1:1.4.2-7 +- include dejagnu.h +- move %%{_libexecdir}/config.guess into %%{_datadir}/dejagnu +- include overview docs (bug #59095) + +* Fri Jun 21 2002 Tim Powers +- automated rebuild + +* Thu May 23 2002 Tim Powers +- automated rebuild + +* Mon Apr 29 2002 Jakub Jelinek 1.4.2-4 +- fix makefile style variable passing (#63984) + +* Thu Feb 28 2002 Jakub Jelinek 1.4.2-3 +- rebuild + +* Wed Jan 09 2002 Tim Powers +- automated rebuild + +* Wed Nov 28 2001 Jakub Jelinek 1.4.2-1 +- update to 1.4.2, mainly so that it can be built with gcc3+ + +* Fri Sep 7 2001 Jakub Jelinek 1.4.1-3 +- make it noarch again + +* Wed Aug 29 2001 Jakub Jelinek +- fix a typo (#52404) + +* Thu Jun 28 2001 Tim Powers +- rebuilt for the distro + +* Tue Feb 27 2001 Tim Powers +- minor modifications to the spec file. Built for Powertools. +- added Epoch + +* Wed Feb 21 2001 Rob Savoye +- Fixed Requires line, and changed the URL to the new ftp site. + +* Sun Oct 31 1999 Rob Savoye +- updated to the latest snapshot +- added doc files +- added the site.exp config file + +* Mon Jul 12 1999 Tim Powers +- updated to 19990628 +- updated patches as needed +- added %defattr in files section + +* Wed Mar 10 1999 Jeff Johnson +- add alpha expect patch (#989) +- use %configure + +* Thu Dec 17 1998 Jeff Johnson +- Update to 19981215. + +* Thu Nov 12 1998 Jeff Johnson +- Update to 1998-10-29. + +* Wed Jul 8 1998 Jeff Johnson +- Update to 1998-05-28. + +* Sun Feb 1 1998 Jeff Johnson +- Create. + From svn at tinysofa.org Thu Jul 1 15:36:26 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:36:26 +1000 (EST) Subject: [tinysofa-svn] r2545 - in tinysofa/snapshot: . docbook-style-dsssl docbook-style-dsssl/current docbook-style-dsssl/current/sources docbook-style-dsssl/current/specs Message-ID: <20040701153626.D0C854E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:36:26 +1000 (Fri, 02 Jul 2004) New Revision: 2545 Added: tinysofa/snapshot/docbook-style-dsssl/ tinysofa/snapshot/docbook-style-dsssl/current/ tinysofa/snapshot/docbook-style-dsssl/current/sources/ tinysofa/snapshot/docbook-style-dsssl/current/sources/docbook-dsssl-1.76-articleinfo.patch tinysofa/snapshot/docbook-style-dsssl/current/sources/docbook-dsssl-1.78.tar.gz tinysofa/snapshot/docbook-style-dsssl/current/sources/docbook-style-dsssl.Makefile tinysofa/snapshot/docbook-style-dsssl/current/specs/ tinysofa/snapshot/docbook-style-dsssl/current/specs/docbook-style-dsssl.spec Log: - Add docbook-style-dsssl to snapshot from 2.0. Added: tinysofa/snapshot/docbook-style-dsssl/current/sources/docbook-dsssl-1.76-articleinfo.patch =================================================================== --- tinysofa/snapshot/docbook-style-dsssl/current/sources/docbook-dsssl-1.76-articleinfo.patch 2004-07-01 15:36:24 UTC (rev 2544) +++ tinysofa/snapshot/docbook-style-dsssl/current/sources/docbook-dsssl-1.76-articleinfo.patch 2004-07-01 15:36:26 UTC (rev 2545) @@ -0,0 +1,20 @@ +--- docbook-dsssl-1.76/common/dbcommon.dsl.orig Fri Feb 22 11:26:14 2002 ++++ docbook-dsssl-1.76/common/dbcommon.dsl Fri Feb 22 11:43:00 2002 +@@ -1070,11 +1070,16 @@ + (define (article-title nd) + (let* ((artchild (children nd)) + (artheader (select-elements artchild (normalize "artheader"))) ++ (articleinfo (select-elements artchild (normalize "articleinfo"))) + (ahtitles (select-elements (children artheader) + (normalize "title"))) ++ (aititles (select-elements (children articleinfo) ++ (normalize "title"))) + (artitles (select-elements artchild (normalize "title"))) + (titles (if (node-list-empty? artitles) +- ahtitles ++ (if (node-list-empty? ahtitles) ++ aititles ++ ahtitles) + artitles))) + (if (node-list-empty? titles) + "" Added: tinysofa/snapshot/docbook-style-dsssl/current/sources/docbook-dsssl-1.78.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/docbook-style-dsssl/current/sources/docbook-dsssl-1.78.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/docbook-style-dsssl/current/sources/docbook-style-dsssl.Makefile =================================================================== --- tinysofa/snapshot/docbook-style-dsssl/current/sources/docbook-style-dsssl.Makefile 2004-07-01 15:36:24 UTC (rev 2544) +++ tinysofa/snapshot/docbook-style-dsssl/current/sources/docbook-style-dsssl.Makefile 2004-07-01 15:36:26 UTC (rev 2545) @@ -0,0 +1,45 @@ +BINDIR = /usr/bin +DESTDIR = /usr/share/sgml/docbook/dsssl-stylesheets-1.74b + +all: install + +install: install-bin install-dtd install-dsl install-img install-misc + +install-bin: + mkdir -p $(BINDIR) + install bin/collateindex.pl $(BINDIR) + +install-dtd: + mkdir -p $(DESTDIR)/dtds/{decls,dbdsssl,html,imagelib,olink} + cp dtds/decls/docbook.dcl $(DESTDIR)/dtds/decls + cp dtds/decls/xml.dcl $(DESTDIR)/dtds/decls + cp dtds/dbdsssl/dbdsssl.dtd $(DESTDIR)/dtds/dbdsssl + cp dtds/html/dbhtml.dtd $(DESTDIR)/dtds/html + cp dtds/html/ISOlat1.gml $(DESTDIR)/dtds/html + cp dtds/imagelib/imagelib.dtd $(DESTDIR)/dtds/imagelib + cp dtds/olink/olinksum.dtd $(DESTDIR)/dtds/olink + +install-dsl: + mkdir -p $(DESTDIR)/{lib,common,html,print,olink} + cp lib/dblib.dsl $(DESTDIR)/lib + cp common/*.dsl $(DESTDIR)/common + cp common/*.ent $(DESTDIR)/common + cp html/*.dsl $(DESTDIR)/html + cp lib/dblib.dsl $(DESTDIR)/lib + cp print/*.dsl $(DESTDIR)/print + +install-img: + mkdir -p $(DESTDIR)/images/callouts + cp images/*.gif $(DESTDIR)/images + cp images/callouts/*.gif $(DESTDIR)/images/callouts + +#install-test: +# mkdir -p $(DESTDIR)/test/{cases,imagelib,xml} +# cp test/*.* $(DESTDIR)/test +# cp test/cases/*.* $(DESTDIR)/test/cases +# cp test/imagelib/*.* $(DESTDIR)/test/imagelib +# cp test/xml/*.* $(DESTDIR)/test/xml + +install-misc: + cp catalog $(DESTDIR) + cp VERSION $(DESTDIR) Added: tinysofa/snapshot/docbook-style-dsssl/current/specs/docbook-style-dsssl.spec =================================================================== --- tinysofa/snapshot/docbook-style-dsssl/current/specs/docbook-style-dsssl.spec 2004-07-01 15:36:24 UTC (rev 2544) +++ tinysofa/snapshot/docbook-style-dsssl/current/specs/docbook-style-dsssl.spec 2004-07-01 15:36:26 UTC (rev 2545) @@ -0,0 +1,202 @@ +Name: docbook-style-dsssl +Version: 1.78 +Release: 3ts +Group: Applications/Text + +Summary: Norman Walsh's modular stylesheets for DocBook. + +License: Distributable +URL: http://docbook.sourceforge.net/ + +%define openjadever 1.3.2 +Requires: openjade = %{openjadever} +PreReq: docbook-dtds >= 1.0-19 +PreReq: sgml-common >= 0.5 +PreReq: openjade = %{openjadever} +Conflicts: docbook-utils < 0.6.9-4 + +BuildRoot: %{_tmppath}/%{name}-%{version}-root + +BuildArch: noarch +Source0: http://prdownloads.sourceforge.net/docbook/docbook-dsssl-%{version}.tar.gz +Source1: %{name}.Makefile +Patch0: docbook-dsssl-1.76-articleinfo.patch + + +%description +These DSSSL stylesheets allow to convert any DocBook document to another +printed (for example, RTF or PostScript) or online (for example, HTML) format. +They are highly customizable. + +%prep +%setup -q -n docbook-dsssl-%{version} +%patch0 -p1 -b .articleinfo +cp %{SOURCE1} Makefile + + +%build + + +%install +DESTDIR=$RPM_BUILD_ROOT +rm -rf $DESTDIR +make install BINDIR=$DESTDIR/usr/bin DESTDIR=$DESTDIR/usr/share/sgml/docbook/dsssl-stylesheets-%{version} +cd .. +ln -s dsssl-stylesheets-%{version} $DESTDIR/usr/share/sgml/docbook/dsssl-stylesheets + + +%clean +DESTDIR=$RPM_BUILD_ROOT +rm -rf $DESTDIR + + +%files +%defattr (-,root,root) +%doc BUGS TODO README ChangeLog WhatsNew +/usr/bin/collateindex.pl +/usr/share/sgml/docbook/dsssl-stylesheets-%{version} +/usr/share/sgml/docbook/dsssl-stylesheets + + +%post +rel=$(echo /etc/sgml/sgml-docbook-3.0-*.cat) +rel=${rel##*-} +rel=${rel%.cat} +for centralized in /etc/sgml/*-docbook-*.cat +do + /usr/bin/install-catalog --remove $centralized \ + /usr/share/sgml/docbook/dsssl-stylesheets-*/catalog \ + >/dev/null 2>/dev/null +done + +for centralized in /etc/sgml/*-docbook-*$rel.cat +do + /usr/bin/install-catalog --add $centralized \ + /usr/share/sgml/openjade-%{openjadever}/catalog \ + > /dev/null 2>/dev/null + /usr/bin/install-catalog --add $centralized \ + /usr/share/sgml/docbook/dsssl-stylesheets-%{version}/catalog \ + > /dev/null 2>/dev/null +done + + +%preun +if [ "$1" = "0" ]; then + for centralized in /etc/sgml/*-docbook-*.cat + do /usr/bin/install-catalog --remove $centralized /usr/share/sgml/openjade-%{openjadever}/catalog > /dev/null 2>/dev/null + /usr/bin/install-catalog --remove $centralized /usr/share/sgml/docbook/dsssl-stylesheets-%{version}/catalog > /dev/null 2>/dev/null + done +fi +exit 0 + +%changelog +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Fri Mar 28 2003 Tim Waugh 1.78-2 +- Require new docbook-dtds. +- Fix %%post scriptlet. + +* Fri Mar 14 2003 Tim Waugh 1.78-1 +- Require openjade 1.3.2. +- 1.78, incorporating seealso, aname patches. + +* Wed Jan 22 2003 Tim Powers +- rebuilt + +* Wed Nov 20 2002 Tim Powers +- rebuild in current collinst + +* Fri Jul 26 2002 Tim Waugh 1.76-6 +- In HTML output always close anchor tags (bug #69737). + +* Fri Jun 21 2002 Tim Powers 1.76-5 +- automated rebuild + +* Thu May 23 2002 Tim Powers 1.76-4 +- automated rebuild + +* Fri May 3 2002 Tim Waugh 1.76-3 +- Another go at fixing seealso handling (bug #64111). + +* Thu May 2 2002 Tim Waugh 1.76-2 +- Fix collateindex.pl's seealso handling (bug #64111). + +* Fri Feb 22 2002 Tim Waugh 1.76-1 +- 1.76 (fixes bug #58883). +- Fix HTML generation for articleinfo elements (bug #58837). + +* Thu Feb 21 2002 Tim Waugh 1.75-1 +- 1.75. +- Rebuild in new environment. + +* Mon Jan 28 2002 Tim Waugh 1.74b-3 +- Prepare for openjade 1.3.1. + +* Wed Jan 09 2002 Tim Powers 1.74b-2 +- automated rebuild + +* Mon Dec 3 2001 Tim Waugh 1.74b-1 +- 1.74b. + +* Fri Nov 2 2001 Tim Waugh 1.73-3 +- Conflict with docbook-utils if its custom stylesheet hasn't been + updated to work with version 1.72 or later of this package. + +* Fri Oct 19 2001 Tim Waugh 1.73-2 +- Shut the scripts up. + +* Mon Oct 1 2001 Tim Waugh 1.73-1 +- 1.73. + +* Fri Sep 28 2001 Tim Waugh 1.72-1 +- 1.72. + +* Wed Jul 25 2001 Bill Nottingham 1.64-3 +- bump release + +* Thu May 9 2001 Tim Waugh 1.64-2 +- Make an unversioned dsssl-stylesheets symbolic link. + +* Wed May 2 2001 Tim Waugh 1.64-1 +- 1.64 (fixes #38095). +- Fix up post/preun scripts so that we don't get duplicate entries with + different versions on upgrade. + +* Sun Mar 25 2001 Tim Waugh 1.59-10 +- Fix up Makefile (patch from SATO Satoru). +- Change postun to preun. +- Make preun conditional on remove rather than upgrade. + +* Tue Mar 6 2001 Tim Waugh +- PreReq docbook-dtd-sgml (it was a requirement before), so that the + scripts work right. + +* Tue Feb 20 2001 Tim Waugh +- Change Requires(...) to PreReq at Preston's request. +- PreReq at least openjade-1.3-12, so that its catalogs get installed. + +* Wed Jan 24 2001 Tim Waugh +- Make scripts quieter. + +* Tue Jan 23 2001 Tim Waugh +- Last fix was wrong; corrected (require openjade 1.3). + +* Fri Jan 19 2001 Tim Waugh +- Require jade not openjade (bug #24306). + +* Mon Jan 15 2001 Tim Waugh +- Don't play so many macro games. +- Change requirement on /usr/bin/install-catalog to sgml-common. +- Be sure to own dsssl-stylesheets-1.59 directory. + +* Mon Jan 08 2001 Tim Waugh +- Change group. +- openjade not jade. +- %%{_tmppath}. +- rm before install. +- Change Copyright: to License:. +- Remove Packager: line. + +* Mon Jan 08 2001 Tim Waugh +- Based on Eric Bischoff's new-trials packages. From svn at tinysofa.org Thu Jul 1 15:36:28 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:36:28 +1000 (EST) Subject: [tinysofa-svn] r2546 - in tinysofa/snapshot: . docbook-style-xsl docbook-style-xsl/current docbook-style-xsl/current/sources docbook-style-xsl/current/specs Message-ID: <20040701153628.6871C4E817D@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:36:28 +1000 (Fri, 02 Jul 2004) New Revision: 2546 Added: tinysofa/snapshot/docbook-style-xsl/ tinysofa/snapshot/docbook-style-xsl/current/ tinysofa/snapshot/docbook-style-xsl/current/sources/ tinysofa/snapshot/docbook-style-xsl/current/sources/docbook-style-xsl.Makefile tinysofa/snapshot/docbook-style-xsl/current/sources/docbook-xsl-1.65.1.tar.gz tinysofa/snapshot/docbook-style-xsl/current/sources/docbook-xsl-listblock.patch tinysofa/snapshot/docbook-style-xsl/current/sources/docbook-xsl-marginleft.patch tinysofa/snapshot/docbook-style-xsl/current/specs/ tinysofa/snapshot/docbook-style-xsl/current/specs/docbook-style-xsl.spec Log: - Add docbook-style-xsl to snapshot from 2.0. Added: tinysofa/snapshot/docbook-style-xsl/current/sources/docbook-style-xsl.Makefile =================================================================== --- tinysofa/snapshot/docbook-style-xsl/current/sources/docbook-style-xsl.Makefile 2004-07-01 15:36:26 UTC (rev 2545) +++ tinysofa/snapshot/docbook-style-xsl/current/sources/docbook-style-xsl.Makefile 2004-07-01 15:36:28 UTC (rev 2546) @@ -0,0 +1,39 @@ +BINDIR = /usr/bin +DESTDIR = ..overridden in spec file.. + +all: install + +install: install-xsl install-img install-extensions install-misc + +install-xsl: + mkdir -p $(DESTDIR)/{common,fo,html,htmlhelp/doc,javahelp,lib,template,xhtml,manpages,profiling} + cp common/*.dtd $(DESTDIR)/common + cp common/*.xml $(DESTDIR)/common + cp common/*.xsl $(DESTDIR)/common + cp fo/*.xml $(DESTDIR)/fo + cp fo/*.xsl $(DESTDIR)/fo + cp html/*.xml $(DESTDIR)/html + cp html/*.xsl $(DESTDIR)/html + cp htmlhelp/*.xsl $(DESTDIR)/htmlhelp + cp javahelp/*.xsl $(DESTDIR)/javahelp + cp lib/lib.xsl $(DESTDIR)/lib + cp template/README $(DESTDIR)/template + cp template/*.xml $(DESTDIR)/template + cp template/*.xsl $(DESTDIR)/template + cp xhtml/*.xsl $(DESTDIR)/xhtml + cp manpages/README $(DESTDIR)/manpages + cp manpages/*.xsl $(DESTDIR)/manpages + cp profiling/*.xsl $(DESTDIR)/profiling + +install-img: + mkdir -p $(DESTDIR)/images/callouts + cp images/*.gif $(DESTDIR)/images + cp images/*.png $(DESTDIR)/images + cp images/callouts/*.png $(DESTDIR)/images/callouts + +install-extensions: + mkdir -p $(DESTDIR)/extensions + cp -r extensions/* $(DESTDIR)/extensions + +install-misc: + cp VERSION $(DESTDIR) Added: tinysofa/snapshot/docbook-style-xsl/current/sources/docbook-xsl-1.65.1.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/docbook-style-xsl/current/sources/docbook-xsl-1.65.1.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/docbook-style-xsl/current/sources/docbook-xsl-listblock.patch =================================================================== --- tinysofa/snapshot/docbook-style-xsl/current/sources/docbook-xsl-listblock.patch 2004-07-01 15:36:26 UTC (rev 2545) +++ tinysofa/snapshot/docbook-style-xsl/current/sources/docbook-xsl-listblock.patch 2004-07-01 15:36:28 UTC (rev 2546) @@ -0,0 +1,134 @@ +--- docbook-xsl-1.64.1/fo/lists.xsl.listblock 2004-01-20 11:12:15.000000000 +0000 ++++ docbook-xsl-1.64.1/fo/lists.xsl 2004-01-20 11:38:17.000000000 +0000 +@@ -112,9 +112,18 @@ + + + +- +- +- ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + + + +@@ -222,9 +231,18 @@ + + + +- +- +- ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + + + +@@ -397,9 +415,18 @@ + + + +- +- +- ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + + + +@@ -766,9 +793,18 @@ + + + +- +- +- ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + + + +@@ -792,9 +828,18 @@ + + + +- +- +- ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + + + +@@ -942,9 +987,18 @@ + + + +- +- +- ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + + + Added: tinysofa/snapshot/docbook-style-xsl/current/sources/docbook-xsl-marginleft.patch =================================================================== --- tinysofa/snapshot/docbook-style-xsl/current/sources/docbook-xsl-marginleft.patch 2004-07-01 15:36:26 UTC (rev 2545) +++ tinysofa/snapshot/docbook-style-xsl/current/sources/docbook-xsl-marginleft.patch 2004-07-01 15:36:28 UTC (rev 2546) @@ -0,0 +1,73 @@ +--- docbook-xsl-1.64.1/fo/pagesetup.xsl.marginleft 2003-12-17 00:57:36.000000000 +0000 ++++ docbook-xsl-1.64.1/fo/pagesetup.xsl 2004-01-18 16:29:32.000000000 +0000 +@@ -34,29 +34,11 @@ + margin-left="{$page.margin.outer} - {$title.margin.left}" + --> + +- +- +- +- +- +- +- - +- +- +- ++ + + + +- +- +- +- +- +- +- - +- +- +- ++ + + + +--- docbook-xsl-1.64.1/fo/lists.xsl.marginleft 2003-12-04 20:13:46.000000000 +0000 ++++ docbook-xsl-1.64.1/fo/lists.xsl 2004-01-18 16:31:51.000000000 +0000 +@@ -303,7 +303,7 @@ + + + +- ++ + + + +@@ -312,7 +312,7 @@ + + + +- em * 0.60 ++ em + + + +@@ -321,7 +321,7 @@ + + + +- em * 0.60 ++ em + + + +@@ -348,8 +348,7 @@ + |processing-instruction()[not(preceding-sibling::varlistentry)]"/> + + + = 0.6.3-8 +# PassiveTeX before 1.21 can't handle the newer stylesheets. +Conflicts: passivetex < 1.21 + +BuildRoot: %{_tmppath}/%{name}-%{version}-root + +BuildArch: noarch +Source0: http://prdownloads.sourceforge.net/docbook/docbook-xsl-%{version}.tar.gz +Source1: %{name}.Makefile + +Patch2: docbook-xsl-marginleft.patch +Patch3: docbook-xsl-listblock.patch + + +%description +These XSL stylesheets allow you to transform any DocBook XML document to +other formats, such as HTML, FO, and XHMTL. They are highly customizable. + + +%prep +%setup -q -n docbook-xsl-%{version} +%patch2 -p1 -b .marginleft +%patch3 -p1 -b .listblock +cp %{SOURCE1} Makefile +for f in $(find -name "*'*") +do + mv -v "$f" $(echo "$f" | tr -d "'") +done + + +%build + + +%install +DESTDIR=$RPM_BUILD_ROOT +rm -rf $DESTDIR +make install BINDIR=$DESTDIR/usr/bin DESTDIR=$DESTDIR/usr/share/sgml/docbook/xsl-stylesheets-%{version}-%{release} +ln -s xsl-stylesheets-%{version}-%{release} \ + $DESTDIR/usr/share/sgml/docbook/xsl-stylesheets + + +%clean +DESTDIR=$RPM_BUILD_ROOT +rm -rf $DESTDIR + + +%files +%defattr (-,root,root) +%doc BUGS +%doc ChangeLog +%doc README +%doc TODO +%doc WhatsNew +%doc doc +%doc docsrc +/usr/share/sgml/docbook/xsl-stylesheets-%{version}-%{release} +/usr/share/sgml/docbook/xsl-stylesheets + + +%post +CATALOG=/etc/xml/catalog +/usr/bin/xmlcatalog --noout --add "rewriteSystem" \ + "http://docbook.sourceforge.net/release/xsl/%{version}" \ + "file:///usr/share/sgml/docbook/xsl-stylesheets-%{version}-%{release}" $CATALOG +/usr/bin/xmlcatalog --noout --add "rewriteURI" \ + "http://docbook.sourceforge.net/release/xsl/%{version}" \ + "file:///usr/share/sgml/docbook/xsl-stylesheets-%{version}-%{release}" $CATALOG +/usr/bin/xmlcatalog --noout --add "rewriteSystem" \ + "http://docbook.sourceforge.net/release/xsl/current" \ + "file:///usr/share/sgml/docbook/xsl-stylesheets-%{version}-%{release}" $CATALOG +/usr/bin/xmlcatalog --noout --add "rewriteURI" \ + "http://docbook.sourceforge.net/release/xsl/current" \ + "file:///usr/share/sgml/docbook/xsl-stylesheets-%{version}-%{release}" $CATALOG + + +%postun +CATALOG=/etc/xml/catalog +/usr/bin/xmlcatalog --noout --del \ + "file:///usr/share/sgml/docbook/xsl-stylesheets-%{version}-%{release}" $CATALOG + + +%changelog +* Fri Jun 4 2004 Tim Waugh 1.65.1-2 +- Fix strange filenames (bug #125311). + +* Tue Mar 9 2004 Tim Waugh 1.65.1-1 +- 1.65.1. + +* Mon Mar 1 2004 Tim Waugh 1.65.0-1 +- 1.65.0. + +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Tue Jan 20 2004 Tim Waugh 1.64.1-6 +- Fix last margin-left fix (bug #113456). +- Reduce instances of itemized/ordered lists having misalignments. + +* Sun Jan 18 2004 Tim Waugh 1.64.1-5 +- And another (bug #113456). + +* Thu Jan 15 2004 Tim Waugh 1.64.1-4 +- Fixed another instance of bug #113456 in lists layout. + +* Wed Jan 14 2004 Tim Waugh 1.64.1-3 +- Hard-code the margin-left work around to expect passivetex (bug #113456). + +* Wed Dec 24 2003 Tim Waugh 1.64.1-2 +- Another manpage fix. + +* Fri Dec 19 2003 Tim Waugh 1.64.1-1 +- 1.64.1. + +* Thu Dec 18 2003 Tim Waugh 1.64.0-2 +- Another manpage fix. + +* Tue Dec 16 2003 Tim Waugh 1.64.0-1 +- 1.64.0. + +* Fri Dec 12 2003 Tim Waugh 1.62.4-3 +- Use the fr.xml from 1.62.1 (bug #111989). + +* Thu Dec 11 2003 Tim Waugh 1.62.4-2 +- Manpages fixes. + +* Thu Dec 11 2003 Tim Waugh 1.62.4-1 +- 1.62.4. +- No longer need hyphens patch. +- Avoid expressions in margin-left attributes, since passivetex does not + understand them. + +* Fri Jul 4 2003 Tim Waugh 1.61.2-2.1 +- Rebuilt. + +* Fri Jul 4 2003 Tim Waugh 1.61.2-2 +- Rebuilt. + +* Fri May 23 2003 Tim Waugh 1.61.2-1 +- 1.61.2. + +* Sun May 18 2003 Tim Waugh 1.61.1-1 +- 1.61.1. + +* Fri May 9 2003 Tim Waugh 1.61.0-1 +- Prevent hyphenation-character confusing passivetex. +- 1.61.0. + +* Thu Mar 6 2003 Tim Waugh 1.60.1-1 +- 1.60.1. + +* Wed Jan 22 2003 Tim Powers +- rebuilt + +* Mon Dec 2 2002 Tim Waugh 1.58.1-1 +- 1.58.1. +- No longer need marker patch. + +* Mon Nov 4 2002 Tim Waugh 1.57.0-2 +- Ship profiling directory (bug #77191). + +* Tue Oct 22 2002 Tim Waugh 1.57.0-1 +- 1.57.0. + +* Wed Oct 16 2002 Tim Waugh 1.56.1-1 +- 1.56.1. +- Use value-of not copy-of for fo:marker content. +- Conflict with passivetex < 1.21. + +* Fri Jun 21 2002 Tim Powers +- automated rebuild + +* Thu May 23 2002 Tim Powers +- automated rebuild + +* Wed May 1 2002 Tim Waugh 1.50.0-1 +- 1.50.0. + +* Thu Feb 21 2002 Tim Waugh 1.49-1 +- 1.49. +- Rebuild in new environment. + +* Fri Feb 1 2002 Tim Waugh 1.48-4 +- Put URIs instead of pathnames in the XML catalog. + +* Thu Jan 17 2002 Tim Waugh 1.48-3 +- Back to /usr/share/sgml. + +* Wed Jan 09 2002 Tim Powers 1.48-2 +- automated rebuild + +* Mon Jan 7 2002 Tim Waugh 1.48-1 +- 1.48. + +* Sat Dec 8 2001 Tim Waugh 1.47-2 +- Conflict with PassiveTeX before 1.11. + +* Tue Oct 16 2001 Tim Waugh 1.47-1 +- 1.47-experimental. + +* Tue Oct 9 2001 Tim Waugh 1.45-2 +- Fix unversioned symlink. + +* Mon Oct 8 2001 Tim Waugh 1.45-1 +- XML Catalog entries. +- Move files to /usr/share/xml. + +* Mon Oct 1 2001 Tim Waugh 1.45-0.1 +- 1.45. +- Built for Red Hat Linux. + +* Tue Jun 26 2001 Chris Runge +- 1.40 + +* Fri Jun 09 2001 Chris Runge +- added extensions and additional doc +- bin added to doc; the Perl files are for Win32 Perl and so need some + conversion first + +* Fri Jun 08 2001 Chris Runge +- Initial RPM (based on docbook-style-dsssl RPM) +- note: no catalog right now (I don't know how to do it; and not sure why + it is necessary) From svn at tinysofa.org Thu Jul 1 15:36:32 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:36:32 +1000 (EST) Subject: [tinysofa-svn] r2548 - in tinysofa/snapshot: . dos2unix dos2unix/current dos2unix/current/sources dos2unix/current/specs Message-ID: <20040701153632.A48304E817D@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:36:32 +1000 (Fri, 02 Jul 2004) New Revision: 2548 Added: tinysofa/snapshot/dos2unix/ tinysofa/snapshot/dos2unix/current/ tinysofa/snapshot/dos2unix/current/sources/ tinysofa/snapshot/dos2unix/current/sources/dos2unix-3.1-segfault.patch tinysofa/snapshot/dos2unix/current/sources/dos2unix-3.1.patch tinysofa/snapshot/dos2unix/current/sources/dos2unix-3.1.tar.bz2 tinysofa/snapshot/dos2unix/current/specs/ tinysofa/snapshot/dos2unix/current/specs/dos2unix.spec Log: - Add dos2unix to snapshot from 2.0. Added: tinysofa/snapshot/dos2unix/current/sources/dos2unix-3.1-segfault.patch =================================================================== --- tinysofa/snapshot/dos2unix/current/sources/dos2unix-3.1-segfault.patch 2004-07-01 15:36:29 UTC (rev 2547) +++ tinysofa/snapshot/dos2unix/current/sources/dos2unix-3.1-segfault.patch 2004-07-01 15:36:32 UTC (rev 2548) @@ -0,0 +1,93 @@ +--- dos2unix-3.1/dos2unix.c.segf Thu Jan 17 17:27:42 2002 ++++ dos2unix-3.1/dos2unix.c Thu Jan 17 17:28:07 2002 +@@ -147,9 +147,9 @@ + * RetVal: NULL if failure + * file stream otherwise + */ +-FILE* OpenOutFile(char *ipFN) ++FILE* OpenOutFile(int fd) + { +- return (fopen(ipFN, W_CNTRL)); ++ return (fdopen(fd, W_CNTRL)); + } + + +@@ -260,14 +260,17 @@ + char TempPath[16]; + struct stat StatBuf; + struct utimbuf UTimeBuf; ++ int fd; + + /* retrieve ipInFN file date stamp */ + if ((ipFlag->KeepDate) && stat(ipInFN, &StatBuf)) + RetVal = -1; + +- strcpy (TempPath, "./d2utmp"); +- strcat (TempPath, "XXXXXX"); +- mkstemp (TempPath); ++ strcpy (TempPath, "./d2utmpXXXXXX"); ++ if((fd=mkstemp (TempPath))<0) { ++ perror("Failed to open output temp file"); ++ RetVal = -1; ++ } + + #ifdef DEBUG + fprintf(stderr, "dos2unix: using %s as temp file\n", TempPath); +@@ -278,7 +281,7 @@ + RetVal = -1; + + /* can open out file? */ +- if ((!RetVal) && (InF) && ((TempF=OpenOutFile(TempPath)) == NULL)) ++ if ((!RetVal) && (InF) && ((TempF=OpenOutFile(fd)) == NULL)) + { + fclose (InF); + RetVal = -1; +@@ -295,6 +298,8 @@ + /* can close out file? */ + if ((TempF) && (fclose(TempF) == EOF)) + RetVal = -1; ++ if(fd>=0) ++ close(fd); + + if ((!RetVal) && (ipFlag->KeepDate)) + { +@@ -340,14 +345,17 @@ + char TempPath[16]; + struct stat StatBuf; + struct utimbuf UTimeBuf; ++ int fd; + + /* retrieve ipInFN file date stamp */ + if ((ipFlag->KeepDate) && stat(ipInFN, &StatBuf)) + RetVal = -1; + +- strcpy (TempPath, "./u2dtmp"); +- strcat (TempPath, "XXXXXX"); +- mkstemp (TempPath); ++ strcpy (TempPath, "./u2dtmpXXXXXX"); ++ if((fd=mkstemp (TempPath))<0) { ++ perror("Failed to open output temp file"); ++ RetVal = -1; ++ } + + #ifdef DEBUG + fprintf(stderr, "dos2unix: using %s as temp file\n", TempPath); +@@ -358,7 +366,7 @@ + RetVal = -1; + + /* can open out file? */ +- if ((!RetVal) && (InF) && ((TempF=OpenOutFile(TempPath)) == NULL)) ++ if ((!RetVal) && (InF) && ((TempF=OpenOutFile(fd)) == NULL)) + { + fclose (InF); + RetVal = -1; +@@ -376,6 +384,9 @@ + if ((TempF) && (fclose(TempF) == EOF)) + RetVal = -1; + ++ if(fd>=0) ++ close(fd); ++ + if ((!RetVal) && (ipFlag->KeepDate)) + { + UTimeBuf.actime = StatBuf.st_atime; Added: tinysofa/snapshot/dos2unix/current/sources/dos2unix-3.1.patch =================================================================== --- tinysofa/snapshot/dos2unix/current/sources/dos2unix-3.1.patch 2004-07-01 15:36:29 UTC (rev 2547) +++ tinysofa/snapshot/dos2unix/current/sources/dos2unix-3.1.patch 2004-07-01 15:36:32 UTC (rev 2548) @@ -0,0 +1,49 @@ +--- dos2unix-3.1/Makefile.orig Thu Nov 19 07:09:38 1998 ++++ dos2unix-3.1/Makefile Fri Nov 17 13:25:35 2000 +@@ -1,10 +1,12 @@ ++CFLAGS= ++ + default: dos2unix + + all: dos2unix link install + + + dos2unix: +- gcc -O dos2unix.c -o dos2unix ++ gcc $(CFLAGS) dos2unix.c -o dos2unix + + + link: +@@ -12,11 +14,10 @@ + ln -s dos2unix.1 mac2unix.1 + + clean: +- rm dos2unix ++ rm -f dos2unix mac2unix mac2unix.1 *~ *.orig core + + install: + install -m 755 dos2unix /usr/local/bin + install -m 644 dos2unix.1 /usr/local/man/man1 + install -m 755 mac2unix /usr/local/bin + install -m 644 mac2unix.1 /usr/local/man/man1 +- +--- dos2unix-3.1/dos2unix.c.orig Thu Nov 19 07:19:25 1998 ++++ dos2unix-3.1/dos2unix.c Fri Nov 17 13:25:25 2000 +@@ -267,7 +267,7 @@ + + strcpy (TempPath, "./d2utmp"); + strcat (TempPath, "XXXXXX"); +- mktemp (TempPath); ++ mkstemp (TempPath); + + #ifdef DEBUG + fprintf(stderr, "dos2unix: using %s as temp file\n", TempPath); +@@ -347,7 +347,7 @@ + + strcpy (TempPath, "./u2dtmp"); + strcat (TempPath, "XXXXXX"); +- mktemp (TempPath); ++ mkstemp (TempPath); + + #ifdef DEBUG + fprintf(stderr, "dos2unix: using %s as temp file\n", TempPath); Added: tinysofa/snapshot/dos2unix/current/sources/dos2unix-3.1.tar.bz2 =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/dos2unix/current/sources/dos2unix-3.1.tar.bz2 ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/dos2unix/current/specs/dos2unix.spec =================================================================== --- tinysofa/snapshot/dos2unix/current/specs/dos2unix.spec 2004-07-01 15:36:29 UTC (rev 2547) +++ tinysofa/snapshot/dos2unix/current/specs/dos2unix.spec 2004-07-01 15:36:32 UTC (rev 2548) @@ -0,0 +1,99 @@ +Summary: Text file format converter +Name: dos2unix +Version: 3.1 +Release: 17ts +Group: Applications/Text +License: Freely distributable +Source: %{name}-%{version}.tar.bz2 +Patch0: %{name}-%{version}.patch +Patch1: dos2unix-3.1-segfault.patch +Buildroot: %{_tmppath}/%{name}-%{version}-root + +%description +Dos2unix converts DOS or MAC text files to UNIX format. + +%prep +%setup -q +%patch0 -p1 -b .orig +%patch1 -p1 -b .segf +for I in *.[ch]; do + sed -e 's,#endif.*,#endif,g' -e 's,#else.*,#else,g' $I > $I.new + mv -f $I.new $I +done + +%build +make clean +make CFLAGS="$RPM_OPT_FLAGS" +make link + +%install +rm -rf $RPM_BUILD_ROOT + +mkdir -p $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man1} +install -m755 dos2unix $RPM_BUILD_ROOT%{_bindir} +install -m755 mac2unix $RPM_BUILD_ROOT%{_bindir} +install -m444 dos2unix.1 $RPM_BUILD_ROOT%{_mandir}/man1 +install -m444 mac2unix.1 $RPM_BUILD_ROOT%{_mandir}/man1 + +%files +%defattr(-,root,root,0755) +%doc COPYRIGHT +%{_bindir}/dos2unix +%{_bindir}/mac2unix +%{_mandir}/*/* + +%clean +rm -rf $RPM_BUILD_ROOT + +%changelog +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Wed Jun 04 2003 Elliot Lee +- rebuilt + +* Wed Feb 05 2003 Elliot Lee 3.1-15 +- Remove build dependency on perl, since perl BuildRequires: dos2unix, + and there's no good reason not to just use sed here. + +* Wed Jan 22 2003 Tim Powers +- rebuilt + +* Mon Oct 7 2002 Mike A. Harris 3.1-13 +- All-arch rebuild +- Added BuildRequires: perl + +* Fri Jun 21 2002 Tim Powers +- automated rebuild + +* Thu May 23 2002 Tim Powers +- automated rebuild + +* Thu Feb 28 2002 Trond Eivind Glomsr?d 3.1-10 +- Build in new environment + +* Thu Jan 17 2002 Bernhard Rosenkraenzer +- Fix bug #57700 (segfault) +- Add the mac2unix symlink recommended in README +- Fix compiler warnings + +* Wed Jan 09 2002 Tim Powers +- automated rebuild + +* Sun Jun 24 2001 Elliot Lee +- Bump release + rebuild. + +* Wed Jan 10 2001 Bernhard Rosenkraenzer +- shut up rpmlint + +* Fri Nov 17 2000 Tim Powers +- use mkstemp instead of mktemp. Not much needed to change. + +* Thu Nov 16 2000 Tim Powers +- cleaned up specfile a bit +- built for 7.1 + +* Tue Jul 07 1999 Peter Soos +- Added Hungarian "Summary:" and "%description" +- Corrected the file and directory attributes to rebuild the package + under RedHat Linux 6.0 From svn at tinysofa.org Thu Jul 1 15:36:34 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:36:34 +1000 (EST) Subject: [tinysofa-svn] r2549 - in tinysofa/snapshot: . dovecot dovecot/current dovecot/current/sources dovecot/current/specs Message-ID: <20040701153634.39FFD4E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:36:33 +1000 (Fri, 02 Jul 2004) New Revision: 2549 Added: tinysofa/snapshot/dovecot/ tinysofa/snapshot/dovecot/current/ tinysofa/snapshot/dovecot/current/sources/ tinysofa/snapshot/dovecot/current/sources/dovecot-0.99.10.4-conf.patch tinysofa/snapshot/dovecot/current/sources/dovecot-0.99.10.5.tar.gz tinysofa/snapshot/dovecot/current/sources/dovecot.init tinysofa/snapshot/dovecot/current/sources/dovecot.pam tinysofa/snapshot/dovecot/current/specs/ tinysofa/snapshot/dovecot/current/specs/dovecot.spec Log: - Add dovecot to snapshot from 2.0. Added: tinysofa/snapshot/dovecot/current/sources/dovecot-0.99.10.4-conf.patch =================================================================== --- tinysofa/snapshot/dovecot/current/sources/dovecot-0.99.10.4-conf.patch 2004-07-01 15:36:32 UTC (rev 2548) +++ tinysofa/snapshot/dovecot/current/sources/dovecot-0.99.10.4-conf.patch 2004-07-01 15:36:33 UTC (rev 2549) @@ -0,0 +1,60 @@ +diff -urN dovecot-0.99.10.4.orig/dovecot-example.conf dovecot-0.99.10.4/dovecot-example.conf +--- dovecot-0.99.10.4.orig/dovecot-example.conf 2003-11-08 05:21:22.000000000 -1000 ++++ dovecot-0.99.10.4/dovecot-example.conf 2004-05-07 03:49:31.604463526 -1000 +@@ -4,7 +4,7 @@ + # any of the lines. Exception to this are paths, they're just examples + # with real defaults being based on configure options. The paths listed here + # are for configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var +-# --with-ssldir=/etc/ssl ++# --with-ssldir=/usr/share/ssl + + # Base directory where to store runtime data. + #base_dir = /var/run/dovecot/ +@@ -33,8 +33,8 @@ + # dropping root privileges, so keep the key file unreadable by anyone but + # root. Included doc/mkcert.sh can be used to easily generate self-signed + # certificate, just make sure to update the domains in dovecot-openssl.cnf +-#ssl_cert_file = /etc/ssl/certs/dovecot.pem +-#ssl_key_file = /etc/ssl/private/dovecot.pem ++#ssl_cert_file = /usr/share/ssl/certs/dovecot.pem ++#ssl_key_file = /usr/share/ssl/private/dovecot.pem + + # SSL parameter file. Master process generates this file for login processes. + # It contains Diffie Hellman and RSA parameters. +@@ -67,7 +67,7 @@ + # Directory where authentication process places authentication UNIX sockets + # which login needs to be able to connect to. The sockets are created when + # running as root, so you don't have to worry about permissions. +-#login_dir = /var/run/dovecot/login ++login_dir = /var/run/dovecot-login + + # chroot login process to the login_dir. Only reason not to do this is if you + # wish to run the whole Dovecot without roots. +@@ -288,7 +288,7 @@ + # with is important to avoid deadlocks if other MTAs/MUAs are using both fcntl + # and flock. Some operating systems don't allow using both of them + # simultaneously, eg. BSDs. If dotlock is used, it's always created first. +-#mbox_locks = dotlock fcntl ++mbox_locks = fcntl + + # Should we create dotlock file even when we want only a read-lock? Setting + # this to yes hurts the performance when the mailbox is accessed simultaneously +@@ -380,7 +380,8 @@ + # vpopmail: vpopmail library + # ldap : LDAP, see doc/dovecot-ldap.conf + # pgsql : a PostgreSQL database, see doc/dovecot-pgsql.conf + auth_userdb = passwd ++# auth_userdb = pgsql /usr/local/etc/dovecot-pgsql.conf + + # Where password database is kept: + # passwd: /etc/passwd or similiar, using getpwnam() +@@ -391,7 +391,8 @@ + # vpopmail: vpopmail authentication + # ldap : LDAP, see doc/dovecot-ldap.conf + # pgsql : a PostgreSQL database, see doc/dovecot-pgsql.conf +-auth_passdb = pgsql /usr/local/etc/dovecot-pgsql.conf ++# auth_passdb = pgsql /usr/local/etc/dovecot-pgsql.conf ++auth_passdb = pam + + #auth_executable = /usr/libexec/dovecot/dovecot-auth + Added: tinysofa/snapshot/dovecot/current/sources/dovecot-0.99.10.5.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/dovecot/current/sources/dovecot-0.99.10.5.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/dovecot/current/sources/dovecot.init =================================================================== --- tinysofa/snapshot/dovecot/current/sources/dovecot.init 2004-07-01 15:36:32 UTC (rev 2548) +++ tinysofa/snapshot/dovecot/current/sources/dovecot.init 2004-07-01 15:36:33 UTC (rev 2549) @@ -0,0 +1,64 @@ +#!/bin/bash +# +# /etc/rc.d/init.d/dovecot +# +# Starts the dovecot daemon +# +# chkconfig: - 54 54 +# description: Dovecot Imap Server +# processname: dovecot +# Source function library. +. /etc/init.d/functions + +test -x /usr/sbin/dovecot || exit 0 + +RETVAL=0 +prog="Dovecot Imap" + +start() { + echo -n $"Starting $prog: " + daemon /usr/sbin/dovecot + RETVAL=$? + [ $RETVAL -eq 0 ] && touch /var/lock/subsys/dovecot + echo +} + +stop() { + echo -n $"Stopping $prog: " + killproc /usr/sbin/dovecot + RETVAL=$? + [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/dovecot + echo +} + +# +# See how we were called. +# +case "$1" in + start) + start + ;; + stop) + stop + ;; + reload|restart) + stop + start + RETVAL=$? + ;; + condrestart) + if [ -f /var/lock/subsys/dovecot ]; then + stop + start + fi + ;; + status) + status /usr/sbin/dovecot + RETVAL=$? + ;; + *) + echo $"Usage: $0 {condrestart|start|stop|restart|reload|status}" + exit 1 +esac + +exit $RETVAL Property changes on: tinysofa/snapshot/dovecot/current/sources/dovecot.init ___________________________________________________________________ Name: svn:executable + * Added: tinysofa/snapshot/dovecot/current/sources/dovecot.pam =================================================================== --- tinysofa/snapshot/dovecot/current/sources/dovecot.pam 2004-07-01 15:36:32 UTC (rev 2548) +++ tinysofa/snapshot/dovecot/current/sources/dovecot.pam 2004-07-01 15:36:33 UTC (rev 2549) @@ -0,0 +1,5 @@ +#%PAM-1.0 +auth required pam_nologin.so +auth required pam_stack.so service=system-auth +account required pam_stack.so service=system-auth +session required pam_stack.so service=system-auth Added: tinysofa/snapshot/dovecot/current/specs/dovecot.spec =================================================================== --- tinysofa/snapshot/dovecot/current/specs/dovecot.spec 2004-07-01 15:36:32 UTC (rev 2548) +++ tinysofa/snapshot/dovecot/current/specs/dovecot.spec 2004-07-01 15:36:33 UTC (rev 2549) @@ -0,0 +1,205 @@ +Summary: Dovecot Secure imap server +Name: dovecot +Version: 0.99.10.5 +Release: 1ts +License: GPL +Group: System Environment/Daemons +Source: %{name}-%{version}.tar.gz +Source1: dovecot.init +Source2: dovecot.pam +Patch100: dovecot-0.99.10.4-conf.patch + +# Patches 500+ from upstream fixes +URL: http://dovecot.procontrol.fi/ +Buildroot: %{_tmppath}/%{name}-%{version}-root +BuildRequires: openssl-devel +BuildRequires: openldap-devel +BuildRequires: pam-devel +BuildRequires: pkgconfig +BuildRequires: zlib-devel +Prereq: openssl, /sbin/chkconfig, /usr/sbin/useradd + +%description +Dovecot is an IMAP server for Linux/UNIX-like systems, written with security +primarily in mind. It also contains a small POP3 server. It supports mail +in either of maildir or mbox formats. + +%prep + +%setup -q -n %{name}-%{version} + +%patch100 -p1 -b .config + +%build +%configure --with-ssl=openssl --with-ssldir=/usr/share/ssl --with-ldap + +make + +%install +rm -rf $RPM_BUILD_ROOT +%makeinstall +rm -rf $RPM_BUILD_ROOT/%{_datadir}/%{name} +install -m 644 dovecot-example.conf $RPM_BUILD_ROOT/%{_sysconfdir}/dovecot.conf +mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/rc.d/init.d +install -m 755 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/rc.d/init.d/dovecot + +mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/pam.d +install -m 644 %{SOURCE2} $RPM_BUILD_ROOT/%{_sysconfdir}/pam.d/dovecot + +# generate ghost .pem file +mkdir -p $RPM_BUILD_ROOT/%{_datadir}/ssl/{certs,private} +touch $RPM_BUILD_ROOT/%{_datadir}/ssl/{certs,private}/dovecot.pem +chmod 600 $RPM_BUILD_ROOT/%{_datadir}/ssl/{certs,private}/dovecot.pem + +mkdir -p $RPM_BUILD_ROOT/var/run/dovecot +chmod 700 $RPM_BUILD_ROOT/var/run/dovecot +mkdir -p $RPM_BUILD_ROOT/var/run/dovecot-login + +# the dovecot make install installs docs. blah. +rm -rf $RPM_BUILD_ROOT/%{_docdir}/%{name} +rm -f $RPM_BUILD_ROOT/etc/dovecot-example.conf + +%pre +/usr/sbin/useradd -c "dovecot" -u 97 -s /sbin/nologin -r -d /usr/libexec/dovecot dovecot 2>/dev/null || : + +%post +/sbin/chkconfig --add dovecot +# create a ssl cert +if [ ! -f %{_datadir}/ssl/certs/dovecot.pem ]; then +pushd %{_datadir}/ssl &>/dev/null +umask 077 +cat << EOF | openssl req -new -x509 -days 365 -nodes -out certs/dovecot.pem -keyout private/dovecot.pem &>/dev/null +-- +SomeState +SomeCity +SomeOrganization +SomeOrganizationalUnit +localhost.localdomain +root at localhost.localdomain +EOF +chown root:root private/dovecot.pem certs/dovecot.pem +chmod 600 private/dovecot.pem certs/dovecot.pem +popd &>/dev/null +fi +exit 0 + + +%preun +if [ $1 = 0 ]; then + /usr/sbin/userdel dovecot 2>/dev/null || : + /usr/sbin/groupdel dovecot 2>/dev/null || : + [ -f /var/lock/subsys/dovecot ] && /sbin/service dovecot stop > /dev/null 2>&1 + /sbin/chkconfig --del dovecot +fi + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(-,root,root) +%doc doc/*.txt doc/dovecot-openssl.cnf doc/mkcert.sh INSTALL AUTHORS ChangeLog COPYING TODO README NEWS COPYING.LGPL +%config(noreplace) %{_sysconfdir}/dovecot.conf +%config %{_sysconfdir}/rc.d/init.d/dovecot +%config %{_sysconfdir}/pam.d/dovecot +%attr(0600,root,root) %ghost %config(missingok,noreplace) %verify(not md5 size mtime) %{_datadir}/ssl/certs/dovecot.pem +%attr(0600,root,root) %ghost %config(missingok,noreplace) %verify(not md5 size mtime) %{_datadir}/ssl/private/dovecot.pem +%dir %{_libexecdir}/%{name} +%{_libexecdir}/%{name}/* +%{_sbindir}/dovecot +%dir /var/run/dovecot +%attr(0750,root,dovecot) %dir /var/run/dovecot-login + + +%changelog +* Thu May 27 2004 David Woodhouse 0.99.10.5-1 +- Update to 0.99.10.5 to fix maildir segfaults (#123022) + +* Fri May 07 2004 Warren Togami 0.99.10.4-4 +- default auth config that is actually usable +- Timo Sirainen (author) suggested functionality fixes + maildir, imap-fetch-body-section, customflags-fix + +* Mon Feb 23 2004 Tim Waugh +- Use ':' instead of '.' as separator for chown. + +* Tue Feb 17 2004 Jeremy Katz - 0.99.10.4-3 +- restart properly if it dies (#115594) + +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Mon Nov 24 2003 Jeremy Katz 0.99.10.4-1 +- update to 0.99.10.4 + +* Mon Oct 6 2003 Jeremy Katz 0.99.10-7 +- another patch from upstream to fix returning invalid data on partial + BODY[part] fetches +- patch to avoid confusion of draft/deleted in indexes + +* Tue Sep 23 2003 Jeremy Katz 0.99.10-6 +- add some patches from upstream (#104288) + +* Thu Sep 4 2003 Jeremy Katz 0.99.10-5 +- fix startup with 2.6 with patch from upstream (#103801) + +* Tue Sep 2 2003 Jeremy Katz 0.99.10-4 +- fix assert in search code (#103383) + +* Tue Jul 22 2003 Nalin Dahyabhai 0.99.10-3 +- rebuild + +* Thu Jul 17 2003 Bill Nottingham 0.99.10-2 +- don't run by default + +* Thu Jun 26 2003 Jeremy Katz 0.99.10-1 +- 0.99.10 + +* Mon Jun 23 2003 Jeremy Katz 0.99.10-0.2 +- 0.99.10-rc2 (includes ssl detection fix) +- a few tweaks from fedora + - noreplace the config file + - configure --with-ldap to get LDAP enabled + +* Mon Jun 23 2003 Jeremy Katz 0.99.10-0.1 +- 0.99.10-rc1 +- add fix for ssl detection +- add zlib-devel to BuildRequires +- change pam service name to dovecot +- include pam config + +* Thu May 8 2003 Jeremy Katz 0.99.9.1-1 +- update to 0.99.9.1 +- add patch from upstream to fix potential bug when fetching with + CR+LF linefeeds +- tweak some things in the initscript and config file noticed by the + fedora folks + +* Sun Mar 16 2003 Jeremy Katz 0.99.8.1-2 +- fix ssl dir +- own /var/run/dovecot/login with the correct perms +- fix chmod/chown in post + +* Fri Mar 14 2003 Jeremy Katz 0.99.8.1-1 +- update to 0.99.8.1 + +* Tue Mar 11 2003 Jeremy Katz 0.99.8-2 +- add a patch to fix quoting problem from CVS + +* Mon Mar 10 2003 Jeremy Katz 0.99.8-1 +- 0.99.8 +- add some buildrequires +- fixup to build with openssl 0.9.7 +- now includes a pop3 daemon (off by default) +- clean up description and %%preun +- add dovecot user (uid/gid of 97) +- add some buildrequires +- move the ssl cert to %{_datadir}/ssl/certs +- create a dummy ssl cert in %post +- own /var/run/dovecot +- make the config file a source so we get default mbox locks of fcntl + +* Sun Dec 1 2002 Seth Vidal +- 0.99.4 and fix startup so it starts imap-master not vsftpd :) + +* Tue Nov 26 2002 Seth Vidal +- first build From svn at tinysofa.org Thu Jul 1 15:36:36 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:36:36 +1000 (EST) Subject: [tinysofa-svn] r2550 - in tinysofa/snapshot: . doxygen doxygen/current doxygen/current/sources doxygen/current/specs Message-ID: <20040701153636.B38F64E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:36:36 +1000 (Fri, 02 Jul 2004) New Revision: 2550 Added: tinysofa/snapshot/doxygen/ tinysofa/snapshot/doxygen/current/ tinysofa/snapshot/doxygen/current/sources/ tinysofa/snapshot/doxygen/current/sources/doxygen-1.2.12-qt2.patch tinysofa/snapshot/doxygen/current/sources/doxygen-1.2.18-libdir.patch tinysofa/snapshot/doxygen/current/sources/doxygen-1.2.7-redhat.patch tinysofa/snapshot/doxygen/current/sources/doxygen-1.3.6-qt.patch tinysofa/snapshot/doxygen/current/sources/doxygen-1.3.7.src.tar.gz tinysofa/snapshot/doxygen/current/specs/ tinysofa/snapshot/doxygen/current/specs/doxygen.spec Log: - Add doxygen to snapshot from 2.0. Added: tinysofa/snapshot/doxygen/current/sources/doxygen-1.2.12-qt2.patch =================================================================== --- tinysofa/snapshot/doxygen/current/sources/doxygen-1.2.12-qt2.patch 2004-07-01 15:36:33 UTC (rev 2549) +++ tinysofa/snapshot/doxygen/current/sources/doxygen-1.2.12-qt2.patch 2004-07-01 15:36:36 UTC (rev 2550) @@ -0,0 +1,11 @@ +--- doxygen-1.2.12/tmake/lib/linux-g++/tmake.conf.orig Sun Nov 18 14:30:20 2001 ++++ doxygen-1.2.12/tmake/lib/linux-g++/tmake.conf Sun Nov 18 14:30:35 2001 +@@ -49,7 +49,7 @@ + TMAKE_LIBS_QT_OPENGL = -lqgl + TMAKE_LIBS_OPENGL = -lMesaGL -lMesaGLU -lXmu + +-TMAKE_MOC = moc ++TMAKE_MOC = $(QTDIR)/bin/moc + + TMAKE_AR = ar cqs + TMAKE_RANLIB = Added: tinysofa/snapshot/doxygen/current/sources/doxygen-1.2.18-libdir.patch =================================================================== --- tinysofa/snapshot/doxygen/current/sources/doxygen-1.2.18-libdir.patch 2004-07-01 15:36:33 UTC (rev 2549) +++ tinysofa/snapshot/doxygen/current/sources/doxygen-1.2.18-libdir.patch 2004-07-01 15:36:36 UTC (rev 2550) @@ -0,0 +1,16 @@ +--- doxygen-1.2.18/tmake/lib/linux-g++/tmake.conf.libdir 2002-11-09 12:35:59.000000000 -0500 ++++ doxygen-1.2.18/tmake/lib/linux-g++/tmake.conf 2002-11-09 12:37:44.000000000 -0500 +@@ -28,11 +28,11 @@ + TMAKE_INCDIR = + TMAKE_LIBDIR = + TMAKE_INCDIR_X11 = /usr/X11R6/include +-TMAKE_LIBDIR_X11 = /usr/X11R6/lib ++TMAKE_LIBDIR_X11 = /usr/X11R6/lib64 + TMAKE_INCDIR_QT = $(QTDIR)/include + TMAKE_LIBDIR_QT = $(QTDIR)/lib + TMAKE_INCDIR_OPENGL = /usr/X11R6/include +-TMAKE_LIBDIR_OPENGL = /usr/X11R6/lib ++TMAKE_LIBDIR_OPENGL = /usr/X11R6/lib64 + + TMAKE_LINK = g++ + TMAKE_LINK_SHLIB = g++ Added: tinysofa/snapshot/doxygen/current/sources/doxygen-1.2.7-redhat.patch =================================================================== --- tinysofa/snapshot/doxygen/current/sources/doxygen-1.2.7-redhat.patch 2004-07-01 15:36:33 UTC (rev 2549) +++ tinysofa/snapshot/doxygen/current/sources/doxygen-1.2.7-redhat.patch 2004-07-01 15:36:36 UTC (rev 2550) @@ -0,0 +1,11 @@ +--- doxygen-1.2.7/tmake/lib/linux-g++/tmake.conf.orig Tue May 1 15:21:42 2001 ++++ doxygen-1.2.7/tmake/lib/linux-g++/tmake.conf Tue May 1 15:22:30 2001 +@@ -11,7 +11,7 @@ + TMAKE_CFLAGS = -pipe + TMAKE_CFLAGS_WARN_ON = -Wall -W + TMAKE_CFLAGS_WARN_OFF = +-TMAKE_CFLAGS_RELEASE = -O2 ++TMAKE_CFLAGS_RELEASE = $(RPM_OPT_FLAGS) + TMAKE_CFLAGS_DEBUG = -g + TMAKE_CFLAGS_SHLIB = -fPIC + TMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses Added: tinysofa/snapshot/doxygen/current/sources/doxygen-1.3.6-qt.patch =================================================================== --- tinysofa/snapshot/doxygen/current/sources/doxygen-1.3.6-qt.patch 2004-07-01 15:36:33 UTC (rev 2549) +++ tinysofa/snapshot/doxygen/current/sources/doxygen-1.3.6-qt.patch 2004-07-01 15:36:36 UTC (rev 2550) @@ -0,0 +1,11 @@ +--- doxygen-1.3.6/tmake/lib/linux-g++/tmake.conf.orig Sun Apr 4 06:07:29 2004 ++++ doxygen-1.3.6/tmake/lib/linux-g++/tmake.conf Sun Apr 4 06:14:04 2004 +@@ -45,7 +45,7 @@ + TMAKE_LIBS = + TMAKE_LIBS_X11 = -lXext -lX11 -lm + TMAKE_LIBS_X11SM = -lICE -lSM +-TMAKE_LIBS_QT = -lqt ++TMAKE_LIBS_QT = -lqt-mt + TMAKE_LIBS_QT_OPENGL = -lqgl + TMAKE_LIBS_OPENGL = -lMesaGL -lMesaGLU -lXmu + Added: tinysofa/snapshot/doxygen/current/sources/doxygen-1.3.7.src.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/doxygen/current/sources/doxygen-1.3.7.src.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/doxygen/current/specs/doxygen.spec =================================================================== --- tinysofa/snapshot/doxygen/current/specs/doxygen.spec 2004-07-01 15:36:33 UTC (rev 2549) +++ tinysofa/snapshot/doxygen/current/specs/doxygen.spec 2004-07-01 15:36:36 UTC (rev 2550) @@ -0,0 +1,263 @@ +%define qt_version 3.3.2 +%{!?with_qt:%define with_qt 0} + +Summary: A documentation system for C/C++. +Name: doxygen +Version: 1.3.7 +Release: 1ts +Epoch: 1 +Source0: ftp://ftp.stack.nl/pub/users/dimitri/%{name}-%{version}.src.tar.gz + +Patch0: doxygen-1.2.7-redhat.patch +Patch1: doxygen-1.2.12-qt2.patch +Patch2: doxygen-1.2.18-libdir.patch +Patch3: doxygen-1.3.6-qt.patch + +Group: Development/Tools +License: GPL +Url: http://www.stack.nl/~dimitri/doxygen/index.html +Prefix: %{_prefix} + +BuildPrereq: libstdc++-devel +BuildPrereq: perl +#Buildrequires: tetex-dvips, tetex-latex, ghostscript + +BuildRoot: %{_tmppath}/%{name}-%{version}-root + +%description +Doxygen can generate an online class browser (in HTML) and/or a +reference manual (in LaTeX) from a set of documented source files. The +documentation is extracted directly from the sources. Doxygen can +also be configured to extract the code structure from undocumented +source files. + +%if %{with_qt} +%package doxywizard +Summary: A GUI for creating and editing configuration files. +Group: User Interface/X +Requires: %{name} = %{epoch}:%{version} +BuildPrereq: qt-devel => %{qt_version} + +%description doxywizard +Doxywizard is a GUI for creating and editing configuration files that +are used by doxygen. +%endif + +%prep +%setup -q +%patch0 -p1 -b .redhat +%patch1 -p1 -b .qt2 + +%if "%{_lib}" != "lib" +%patch2 -p1 -b .libdir +%endif +%patch3 -p1 -b .qt-mt + +%build +%if %{with_qt} +QTDIR="" && . /etc/profile.d/qt.sh +%endif +export OLD_PO_FILE_INPUT=yes + +./configure \ + --prefix %{_prefix} \ + --shared \ + --release \ +%if %{with_qt} + --with-doxywizard \ +%endif + --install %{_bindir}/install + +make %{?_smp_mflags} all +%if %{with_qt} +make docs +%endif + +%install +rm -rf ${RPM_BUILD_ROOT} + +export OLD_PO_FILE_INPUT=yes +make install INSTALL=$RPM_BUILD_ROOT%{_prefix} + +%clean +rm -rf ${RPM_BUILD_ROOT} + +%files +%defattr(-,root,root) +%doc LANGUAGE.HOWTO README examples +%if %{with_qt} +%doc html +%endif +%{_bindir}/doxygen +%{_bindir}/doxytag + +%if %{with_qt} +%files doxywizard +%defattr(-,root,root) +%{_bindir}/doxywizard +%endif + +%changelog +* Tue May 11 2004 Than Ngo 1.3.7-1 +- update to 1.3.7, bug #119340 + +* Sun Apr 04 2004 Than Ngo 1:1.3.6-2 +- fix qt-mt linking problem + +* Thu Feb 26 2004 Than Ngo 1:1.3.6-1 +- update to 1.3.6 +- added more buildrequires, #110752 + +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Wed Dec 17 2003 Than Ngo 1:1.3.5-1 +- 1.3.5 release + +* Fri Sep 26 2003 Harald Hoyer 1:1.3.4-1 +- update to 1.3.4 +- doxsearch was removed + +* Tue Sep 23 2003 Florian La Roche +- allow compiling without qt/doxywizard + +* Wed Jun 04 2003 Elliot Lee +- rebuilt + +* Tue Jun 3 2003 Jeff Johnson +- add explicit epoch's where needed. + +* Tue May 6 2003 Than Ngo 1.3-1 +- 1.3 + +* Wed Jan 22 2003 Tim Powers +- rebuilt + +* Fri Dec 27 2002 Than Ngo 1.2.18-2 +- use gnu install + +* Sat Nov 9 2002 Than Ngo 1.2.18-1.2 +- fix some build problem + +* Tue Oct 15 2002 Than Ngo 1.2.18-1 +- 1.2.18 + +* Wed Aug 28 2002 Than Ngo 1.2.17-1 +- 1.2.17 fixes many major bugs + +* Sat Aug 10 2002 Elliot Lee +- rebuilt with gcc-3.2 (we hope) + +* Mon Jul 22 2002 Tim Powers +- rebuild using gcc-3.2-0.1 + +* Fri Jun 21 2002 Tim Powers +- automated rebuild + +* Thu May 23 2002 Tim Powers +- automated rebuild + +* Tue Apr 16 2002 Bernhard Rosenkraenzer 1.2.13-5 +- rebuild against qt 3.0.3-10 + +* Fri Mar 8 2002 Bernhard Rosenkraenzer 1.2.13-4 +- rebuild against qt 3.0.2 + +* Tue Feb 26 2002 Than Ngo 1.2.14-2 +- rebuild against qt 2.3.2 + +* Tue Feb 19 2002 Bernhard Rosenkraenzer 1.2.14-1 +- 1.2.14 + +* Wed Jan 09 2002 Tim Powers +- automated rebuild + +* Sun Jan 06 2002 Than Ngo 1.2.13.1-1 +- update to 1.2.13.1 +- fixed build doxywizard with qt3 + +* Sun Dec 30 2001 Jeff Johnson 1.2.13-1 +- update to 1.2.13 + +* Sun Nov 18 2001 Than Ngo 1.2.12-1 +- update to 1.2.12 +- s/Copyright/License + +* Wed Sep 12 2001 Tim Powers +- rebuild with new gcc and binutils + +* Wed Jun 13 2001 Than Ngo +- update tp 1.2.8.1 +- make doxywizard as separat package +- fix to use install as default + +* Tue Jun 05 2001 Than Ngo +- update to 1.2.8 + +* Tue May 01 2001 Than Ngo +- update to 1.2.7 +- clean up specfile +- patch to use RPM_OPT_FLAG + +* Wed Mar 14 2001 Jeff Johnson +- update to 1.2.6 + +* Wed Feb 28 2001 Trond Eivind Glomsr?d +- rebuild + +* Tue Dec 26 2000 Than Ngo +- update to 1.2.4 +- remove excludearch ia64 +- bzip2 sources + +* Mon Dec 11 2000 Than Ngo +- rebuild with the fixed fileutils + +* Mon Oct 30 2000 Jeff Johnson +- update to 1.2.3. + +* Sun Oct 8 2000 Jeff Johnson +- update to 1.2.2. +- enable doxywizard. + +* Sat Aug 19 2000 Preston Brown +- 1.2.1 is latest stable, so we upgrade before Winston is released. + +* Wed Jul 12 2000 Prospector +- automatic rebuild + +* Tue Jul 4 2000 Jakub Jelinek +- Rebuild with new C++ + +* Fri Jun 30 2000 Florian La Roche +- fix QTDIR detection + +* Fri Jun 09 2000 Preston Brown +- compile on x86 w/o optimization, revert when compiler fixed!! + +* Wed Jun 07 2000 Preston Brown +- use newer RPM macros + +* Tue Jun 6 2000 Jeff Johnson +- add to distro. + +* Tue May 9 2000 Tim Powers +- rebuilt for 7.0 + +* Wed Feb 2 2000 Bernhard Rosenkraenzer +- recompile with current Qt (2.1.0/1.45) + +* Wed Jan 5 2000 Jeff Johnson +- update to 1.0.0. +- recompile with qt-2.0.1 if available. +- relocatable package. + +* Mon Nov 8 1999 Tim Powers +-updated to 0.49-991106 + +* Tue Jul 13 1999 Tim Powers +- updated source +- cleaned up some stuff in the spec file + +* Thu Apr 22 1999 Jeff Johnson +- Create Power Tools 6.0 package. From svn at tinysofa.org Thu Jul 1 15:36:37 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:36:37 +1000 (EST) Subject: [tinysofa-svn] r2551 - in tinysofa/snapshot: . eject eject/current eject/current/sources eject/current/specs Message-ID: <20040701153637.9F4354E817D@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:36:37 +1000 (Fri, 02 Jul 2004) New Revision: 2551 Added: tinysofa/snapshot/eject/ tinysofa/snapshot/eject/current/ tinysofa/snapshot/eject/current/sources/ tinysofa/snapshot/eject/current/sources/eject-2.0.12-autoclose.patch tinysofa/snapshot/eject/current/sources/eject-2.0.13-header.patch tinysofa/snapshot/eject/current/sources/eject-2.0.13-use-mountpoints.patch tinysofa/snapshot/eject/current/sources/eject-2.0.13.tar.gz tinysofa/snapshot/eject/current/specs/ tinysofa/snapshot/eject/current/specs/eject.spec Log: - Add eject to snapshot from 2.0. Added: tinysofa/snapshot/eject/current/sources/eject-2.0.12-autoclose.patch =================================================================== --- tinysofa/snapshot/eject/current/sources/eject-2.0.12-autoclose.patch 2004-07-01 15:36:36 UTC (rev 2550) +++ tinysofa/snapshot/eject/current/sources/eject-2.0.12-autoclose.patch 2004-07-01 15:36:37 UTC (rev 2551) @@ -0,0 +1,26 @@ +--- eject.c Tue Jul 3 00:17:41 2001 ++++ eject.c Tue Feb 5 05:50:58 2002 +@@ -361,8 +361,11 @@ + { + int status; + +- status = ioctl(fd, CDROMEJECT_SW, onOff); +- if (status != 0) { ++ if (onOff) ++ status = ioctl(fd, CDROM_SET_OPTIONS, CDO_AUTO_EJECT); ++ else ++ status = ioctl(fd, CDROM_CLEAR_OPTIONS, CDO_AUTO_EJECT); ++ if (status < 0) { + fprintf(stderr, _("%s: CD-ROM auto-eject command failed: %s\n"), programName, strerror(errno)); + exit(1); + } +--- volname.c Tue Jul 3 00:17:41 2001 ++++ volname.c Tue Feb 5 05:29:49 2002 +@@ -35,6 +35,7 @@ + + #include + #include ++#include + #include + #include + #include Added: tinysofa/snapshot/eject/current/sources/eject-2.0.13-header.patch =================================================================== --- tinysofa/snapshot/eject/current/sources/eject-2.0.13-header.patch 2004-07-01 15:36:36 UTC (rev 2550) +++ tinysofa/snapshot/eject/current/sources/eject-2.0.13-header.patch 2004-07-01 15:36:37 UTC (rev 2551) @@ -0,0 +1,22 @@ +--- eject-2.0.13/Makefile.am.orig 2004-02-25 17:18:28.000000000 +0100 ++++ eject-2.0.13/Makefile.am 2004-02-25 17:18:42.000000000 +0100 +@@ -4,7 +4,7 @@ + + SUBDIRS = po + +-AM_CPPFLAGS = -I/usr/src/linux -I/usr/src/linux/include -DDEFAULTDEVICE=\"$(DEFAULTDEVICE)\" -DGETOPTLONG ++AM_CPPFLAGS = -DDEFAULTDEVICE=\"$(DEFAULTDEVICE)\" -DGETOPTLONG + AM_CFLAGS = -Wall -O3 $(RPM_OPT_FLAGS) + + man_MANS = eject.1 volname.1 +--- eject-2.0.13/Makefile.in.orig 2004-02-25 17:18:57.000000000 +0100 ++++ eject-2.0.13/Makefile.in 2004-02-25 17:19:28.000000000 +0100 +@@ -69,7 +69,7 @@ + + SUBDIRS = po + +-AM_CPPFLAGS = -I/usr/src/linux -I/usr/src/linux/include -DDEFAULTDEVICE=\"$(DEFAULTDEVICE)\" -DGETOPTLONG ++AM_CPPFLAGS = -DDEFAULTDEVICE=\"$(DEFAULTDEVICE)\" -DGETOPTLONG + AM_CFLAGS = -Wall -O3 $(RPM_OPT_FLAGS) + + man_MANS = eject.1 volname.1 Added: tinysofa/snapshot/eject/current/sources/eject-2.0.13-use-mountpoints.patch =================================================================== --- tinysofa/snapshot/eject/current/sources/eject-2.0.13-use-mountpoints.patch 2004-07-01 15:36:36 UTC (rev 2550) +++ tinysofa/snapshot/eject/current/sources/eject-2.0.13-use-mountpoints.patch 2004-07-01 15:36:37 UTC (rev 2551) @@ -0,0 +1,33 @@ +More recent kernels actually want to umount using the mount point and +not the device name (this makes more sense, you can have the same +device mounted in many places). + +This is a minor changes to do just that. + + + +diff --exclude=debian -Nur eject-2.0.13deb/eject.c eject-2.0.13deb.cw/eject.c +--- eject-2.0.13deb/eject.c 2004-04-17 12:25:10.000000000 -0700 ++++ eject-2.0.13deb.cw/eject.c 2004-04-17 12:26:55.000000000 -0700 +@@ -718,8 +718,8 @@ + status = regexec(&preg, s1, 0, 0, 0); + if (status == 0) { + if (v_option) +- printf(_("%s: unmounting `%s'\n"), programName, s1); +- Unmount(s1); ++ printf(_("%s: unmounting `%s'\n"), programName, s2); ++ Unmount(s2); + regfree(&preg); + } + } +@@ -952,8 +952,8 @@ + /* unmount device if mounted */ + if (mounted) { + if (v_option) +- printf(_("%s: unmounting `%s'\n"), programName, deviceName); +- Unmount(deviceName); ++ printf(_("%s: unmounting device `%s' from `%s'\n"), programName, deviceName, mountName); ++ Unmount(mountName); + } + + /* if it is a multipartition device, unmount any other partitions on Added: tinysofa/snapshot/eject/current/sources/eject-2.0.13.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/eject/current/sources/eject-2.0.13.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/eject/current/specs/eject.spec =================================================================== --- tinysofa/snapshot/eject/current/specs/eject.spec 2004-07-01 15:36:36 UTC (rev 2550) +++ tinysofa/snapshot/eject/current/specs/eject.spec 2004-07-01 15:36:37 UTC (rev 2551) @@ -0,0 +1,157 @@ +Summary: A program that ejects removable media using software control. +Name: eject +Version: 2.0.13 +Release: 8ts +License: GPL +Group: System Environment/Base +Source: http://metalab.unc.edu/pub/Linux/utils/disk-management/%{name}-%{version}.tar.gz +Patch: eject-2.0.12-autoclose.patch +Patch1: eject-2.0.13-header.patch +Patch2: eject-2.0.13-use-mountpoints.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-root +URL: http://www.pobox.com/~tranter +ExcludeArch: s390 s390x + +%description +The eject program allows the user to eject removable media (typically +CD-ROMs, floppy disks or Iomega Jaz or Zip disks) using software +control. Eject can also control some multi-disk CD changers and even +some devices' auto-eject features. + +Install eject if you'd like to eject removable media using software +control. + +%prep +%setup -q +%patch -p0 -b .autoclose +%patch1 -p1 -b .misc +%patch2 -p1 -b .volume + +%build +%configure +make + +%install +rm -rf %{buildroot} + +make DESTDIR=$RPM_BUILD_ROOT install + +%find_lang %{name} + +%clean +rm -rf %{buildroot} + +%files -f %{name}.lang +%defattr(-,root,root) +%doc README TODO COPYING ChangeLog + +%{_bindir}/* +%{_mandir}/man1/* + +%changelog +* Thu Jun 24 2004 Alan Cox +- Added Chris Woods patches as requested by Al Viro to handle modern + namespace mounting and unmount by mount point not device + +* Tue Jun 15 2004 Elliot Lee +- rebuilt + +* Wed Feb 25 2004 Than Ngo 2.0.13-5 +- don't use kernel headers directly, #116613 + +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Wed Jun 04 2003 Elliot Lee +- rebuilt + +* Wed Jan 22 2003 Tim Powers +- rebuilt + +* Fri Dec 20 2002 Than Ngo 2.0.13-1 +- update to 2.0.13 + +* Fri Nov 8 2002 Than Ngo 2.0.12-8 +- Added missing mo files + +* Fri Jun 21 2002 Tim Powers +- automated rebuild + +* Thu May 23 2002 Tim Powers +- automated rebuild + +* Sun Apr 28 2002 Florian La Roche +- do not build on mainframe + +* Tue Feb 26 2002 Than Ngo 2.0.12-4 +- rebuild in new enviroment + +* Tue Feb 05 2002 Than Ngo 2.0.12-3 +- fix autoclose bug (stssppnn at yahoo.com, #59326) + +* Wed Jan 09 2002 Tim Powers +- automated rebuild + +* Wed Nov 14 2001 Than Ngo 2.0.12-1 +- update to 2.0.12 + +* Thu Sep 20 2001 Than Ngo 2.0.11-1 +- update to 2.0.11 (bug #53828) + +* Mon May 21 2001 Than Ngo +- update to 2.0.8 +- remove eject-2.0.4-ignorecomments.patch, 2.0.8 has it + +* Mon May 14 2001 Than Ngo +- update to 2.0.6, fixed buffer overrun + +* Tue May 01 2001 Than Ngo +- update to 2.0.4 + +* Tue Apr 24 2001 Than Ngo +- update to 2.0.3, supports devfs available in 2.4.x kernels and fixes + a number of small problems + +* Tue Apr 3 2001 Preston Brown +- ignore commented out entries in /etc/fstab (#33734) + +* Wed Jul 12 2000 Prospector +- automatic rebuild + +* Mon Jun 12 2000 Preston Brown +- FHS paths + +* Thu Feb 03 2000 Preston Brown +- gzip man page. + +* Sun Mar 21 1999 Cristian Gafton +- auto rebuild in the new build environment (release 3) + +* Wed Feb 24 1999 Preston Brown +- Injected new description and group. + +* Tue Feb 16 1999 Preston Brown +- solved a lot of problems by finding eject 2.0.2. :) + +* Tue Feb 09 1999 Preston Brown +- patch to improve symlink handling folded into linux-2.2 patch + +* Fri Dec 18 1998 Preston Brown +- bumped spec number for initial rh 6.0 build + +* Tue Aug 4 1998 Jeff Johnson +- build root + +* Wed Jul 15 1998 Donnie Barnes +- added small patch to 1.5 for longer device names + +* Mon Apr 27 1998 Prospector System +- translations modified for de, fr, tr + +* Wed Oct 15 1997 Donnie Barnes +- upgraded to 1.5 +- various spec file clean ups +- eject rocks! + +* Mon Jun 02 1997 Erik Troan +- built against glibc From svn at tinysofa.org Thu Jul 1 15:36:38 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:36:38 +1000 (EST) Subject: [tinysofa-svn] r2552 - in tinysofa/snapshot: . ethtool ethtool/current ethtool/current/sources ethtool/current/specs Message-ID: <20040701153638.C48264E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:36:38 +1000 (Fri, 02 Jul 2004) New Revision: 2552 Added: tinysofa/snapshot/ethtool/ tinysofa/snapshot/ethtool/current/ tinysofa/snapshot/ethtool/current/sources/ tinysofa/snapshot/ethtool/current/sources/ethtool-1.8-dev.patch tinysofa/snapshot/ethtool/current/sources/ethtool-1.8.tar.gz tinysofa/snapshot/ethtool/current/specs/ tinysofa/snapshot/ethtool/current/specs/ethtool.spec Log: - Add ethtool to snapshot from 2.0. Added: tinysofa/snapshot/ethtool/current/sources/ethtool-1.8-dev.patch =================================================================== --- tinysofa/snapshot/ethtool/current/sources/ethtool-1.8-dev.patch 2004-07-01 15:36:37 UTC (rev 2551) +++ tinysofa/snapshot/ethtool/current/sources/ethtool-1.8-dev.patch 2004-07-01 15:36:38 UTC (rev 2552) @@ -0,0 +1,15 @@ +--- ethtool-1.8/ethtool.c.foo 2003-07-24 00:52:37.000000000 -0400 ++++ ethtool-1.8/ethtool.c 2003-07-24 00:53:14.000000000 -0400 +@@ -678,12 +678,7 @@ + + if (devname == NULL) { + show_usage(1); +- } else if (strncmp(devname, "eth", 3) && strncmp(devname, "usb", 3)) { +- fprintf(stderr, "%s does not appear to be an ethernet device\n", +- devname); +- show_usage(1); + } +- + } + + static void dump_supported(struct ethtool_cmd *ep) Added: tinysofa/snapshot/ethtool/current/sources/ethtool-1.8.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/ethtool/current/sources/ethtool-1.8.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/ethtool/current/specs/ethtool.spec =================================================================== --- tinysofa/snapshot/ethtool/current/specs/ethtool.spec 2004-07-01 15:36:37 UTC (rev 2551) +++ tinysofa/snapshot/ethtool/current/specs/ethtool.spec 2004-07-01 15:36:38 UTC (rev 2552) @@ -0,0 +1,102 @@ +Summary: Ethernet settings tool for PCI ethernet cards +Name: ethtool +Version: 1.8 +Release: 3.1ts +Copyright: GPL +Group: Applications/System +URL: http://sourceforge.net/projects/gkernel/ +Patch: ethtool-1.8-dev.patch +Source: http://download.sourceforge.net/gkernel/%{name}-%{version}.tar.gz +BuildRoot: %{_tmppath}/%{name}-%{version}-root + +%define _sbindir /sbin + +%description +This utility allows querying and changing of ethernet +card settings, such as speed, port, autonegotiation, +and PCI locations. + +%prep +%setup -q +%patch -p1 + +%build +%configure +make + +%install +rm -rf $RPM_BUILD_ROOT +%makeinstall + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(-,root,root) +%doc AUTHORS ChangeLog COPYING INSTALL NEWS README +/sbin/ethtool +%{_mandir}/man8/ethtool.* + +%changelog +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Fri Sep 5 2003 Bill Nottingham 1.8-2 +- remove bogus check for devices starting with ethXX, this time applying + the patch + +* Thu Jul 24 2003 Bill Nottingham 1.8-1 +- update to 1.8 +- remove bogus check for devices starting with ethXX + +* Wed Jun 04 2003 Elliot Lee +- rebuilt + +* Sat Feb 8 2003 Bill Nottingham 1.6-5 +- move to /sbin + +* Wed Jan 22 2003 Tim Powers +- rebuilt + +* Thu Dec 12 2002 Tim Powers 1.6-3 +- rebuild on all arches + +* Fri Jun 21 2002 Tim Powers +- automated rebuild + +* Thu Jun 20 2002 Florian La Roche +- update to 1.6 + +* Thu May 23 2002 Tim Powers +- automated rebuild + +* Mon Mar 4 2002 Bill Nottingham 1.5-1 +- 1.5 + +* Thu Feb 21 2002 Bill Nottingham +- rebuild + +* Wed Jan 09 2002 Tim Powers +- automated rebuild + +* Tue Dec 4 2001 Bill Nottingham +- update to 1.4 + +* Fri Aug 3 2001 Bill Nottingham +- return of ethtool! (#50475) + +* Wed Jul 12 2000 Prospector +- automatic rebuild + +* Sun Jun 18 2000 Matt Wilson +- rebuilt for next release +- use FHS man path + +* Tue Feb 22 2000 Bill Nottingham +- handle compressed manpages + +* Wed Apr 14 1999 Bill Nottingham +- run through with new s/d + +* Tue Apr 13 1999 Jakub Jelinek +- initial package. From svn at tinysofa.org Thu Jul 1 15:36:43 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:36:43 +1000 (EST) Subject: [tinysofa-svn] r2554 - in tinysofa/snapshot: . fbset fbset/current fbset/current/sources fbset/current/specs Message-ID: <20040701153643.472314E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:36:41 +1000 (Fri, 02 Jul 2004) New Revision: 2554 Added: tinysofa/snapshot/fbset/ tinysofa/snapshot/fbset/current/ tinysofa/snapshot/fbset/current/sources/ tinysofa/snapshot/fbset/current/sources/fbset-2.1-fixmode.patch tinysofa/snapshot/fbset/current/sources/fbset-2.1-makefile.patch tinysofa/snapshot/fbset/current/sources/fbset-2.1.tar.gz tinysofa/snapshot/fbset/current/specs/ tinysofa/snapshot/fbset/current/specs/fbset.spec Log: - Add fbset to snapshot from 2.0. Added: tinysofa/snapshot/fbset/current/sources/fbset-2.1-fixmode.patch =================================================================== --- tinysofa/snapshot/fbset/current/sources/fbset-2.1-fixmode.patch 2004-07-01 15:36:39 UTC (rev 2553) +++ tinysofa/snapshot/fbset/current/sources/fbset-2.1-fixmode.patch 2004-07-01 15:36:41 UTC (rev 2554) @@ -0,0 +1,20 @@ +--- fbset-2.1/etc/fb.modes.ATI.fixmode Fri Feb 23 11:20:29 2001 ++++ fbset-2.1/etc/fb.modes.ATI Fri Feb 23 11:20:38 2001 +@@ -430,7 +430,7 @@ + # 1024x768, 72 Hz, Non-Interlaced (75.00 MHz dotclock) + # + # Horizontal Vertical +-# Resolution 10224 768 ++# Resolution 1024 768 + # Scan Frequency 58.230 kHz 72.245 Hz + # Sync Width 1.813 us 0.103 ms + # 17 chars 6 lines +@@ -447,7 +447,7 @@ + + mode "1024x768-72" + # D: 75.00 MHz, H: 58.230 kHz, V: 72.245 Hz +- geometry 10224 768 10224 768 8 ++ geometry 1024 768 1024 768 8 + timings 13334 104 24 29 3 136 6 + endmode + Added: tinysofa/snapshot/fbset/current/sources/fbset-2.1-makefile.patch =================================================================== --- tinysofa/snapshot/fbset/current/sources/fbset-2.1-makefile.patch 2004-07-01 15:36:39 UTC (rev 2553) +++ tinysofa/snapshot/fbset/current/sources/fbset-2.1-makefile.patch 2004-07-01 15:36:41 UTC (rev 2554) @@ -0,0 +1,44 @@ +--- fbset-2.1/Makefile.makefile Sun Jan 17 14:15:46 1999 ++++ fbset-2.1/Makefile Thu Jun 15 11:10:30 2000 +@@ -7,6 +7,12 @@ + FLEX = flex + INSTALL = install + RM = rm -f ++PREFIX = ++ ++prefix = /usr ++sbindir = $(prefix)/sbin ++mandir = $(prefix)/man ++sysconfdir = /etc + + All: fbset + +@@ -24,18 +30,16 @@ + $(BISON) modes.y + + install: fbset +- if [ -f /sbin/fbset ]; then rm /sbin/fbset; fi +- $(INSTALL) fbset /usr/sbin +- $(INSTALL) fbset.8 /usr/man/man8 +- $(INSTALL) fb.modes.5 /usr/man/man5 +- if [ ! -c /dev/fb0 ]; then mknod /dev/fb0 c 29 0; fi +- if [ ! -c /dev/fb1 ]; then mknod /dev/fb1 c 29 32; fi +- if [ ! -c /dev/fb2 ]; then mknod /dev/fb2 c 29 64; fi +- if [ ! -c /dev/fb3 ]; then mknod /dev/fb3 c 29 96; fi +- if [ ! -c /dev/fb4 ]; then mknod /dev/fb4 c 29 128; fi +- if [ ! -c /dev/fb5 ]; then mknod /dev/fb5 c 29 160; fi +- if [ ! -c /dev/fb6 ]; then mknod /dev/fb6 c 29 192; fi +- if [ ! -c /dev/fb7 ]; then mknod /dev/fb7 c 29 224; fi ++ if [ -f $(PREFIX)/sbin/fbset ]; then rm $(PREFIX)/sbin/fbset; fi ++ mkdir -p $(PREFIX)$(sbindir) ++ $(INSTALL) -m 755 fbset $(PREFIX)$(sbindir)/ ++ $(INSTALL) -m 755 modeline2fb $(PREFIX)$(sbindir)/ ++ mkdir -p $(PREFIX)$(mandir)/man8 ++ $(INSTALL) -m 644 fbset.8 $(PREFIX)$(mandir)/man8/ ++ mkdir -p $(PREFIX)$(sysconfdir) ++ $(INSTALL) -m 644 etc/fb.modes.ATI $(PREFIX)$(sysconfdir)/fb.modes ++ mkdir -p $(PREFIX)$(mandir)/man5 ++ $(INSTALL) -m 644 fb.modes.5 $(PREFIX)$(mandir)/man5/ + + clean: + $(RM) *.o fbset lex.yy.c modes.tab.c modes.tab.h Added: tinysofa/snapshot/fbset/current/sources/fbset-2.1.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/fbset/current/sources/fbset-2.1.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/fbset/current/specs/fbset.spec =================================================================== --- tinysofa/snapshot/fbset/current/specs/fbset.spec 2004-07-01 15:36:39 UTC (rev 2553) +++ tinysofa/snapshot/fbset/current/specs/fbset.spec 2004-07-01 15:36:41 UTC (rev 2554) @@ -0,0 +1,101 @@ +Summary: Tools for managing a frame buffer's video mode properties. +Name: fbset +Version: 2.1 +Release: 15ts +Copyright: GPL +Group: Applications/System +Source: http://www.cs.kuleuven.ac.be/~geert/bin/fbset-2.1.tar.gz +Patch0: fbset-2.1-makefile.patch +Patch1: fbset-2.1-fixmode.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-root +ExcludeArch: s390 s390x + +%description +Fbset is a utility for maintaining frame buffer resolutions. Fbset +can change the video mode properties of a frame buffer device, and is +usually used to change the current video mode. + +Install fbset if you need to manage frame buffer resolutions. + +%prep +%setup -q +%patch0 -p1 -b .makefile +%patch1 -p1 -b .fixmode + +%build +make + +%install +rm -rf ${RPM_BUILD_ROOT} + +%makeinstall + +%clean +rm -rf ${RPM_BUILD_ROOT} + +%files +%defattr(-,root,root) +%{_sbindir}/* +%{_mandir}/man[58]/* +%config %{_sysconfdir}/fb.modes + +%changelog +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Wed Jun 04 2003 Elliot Lee +- rebuilt + +* Wed Jan 22 2003 Tim Powers +- rebuilt + +* Thu Dec 12 2002 Tim Powers 2.1-12 +- rebuild on all arches + +* Fri Jun 21 2002 Tim Powers +- automated rebuild + +* Thu May 23 2002 Tim Powers +- automated rebuild + +* Wed Jan 09 2002 Tim Powers +- automated rebuild + +* Tue Jun 19 2001 Florian La Roche +- add ExcludeArch: s390 s390x + +* Fri Feb 23 2001 Preston Brown +- fix 1024x768 72 Hz mode (#29024) + +* Wed Jul 12 2000 Prospector +- automatic rebuild + +* Thu Jun 15 2000 Jeff Johnson +- FHS packaging. + +* Tue Feb 15 2000 Bill Nottingham +- ship fb.modes everywhere + +* Fri Feb 4 2000 Bill Nottingham +- fix man page permissions + +* Wed Feb 02 2000 Cristian Gafton +- fix summary + +* Thu Oct 7 1999 Bill Nottingham +- update to 2.1 +- don't include fb devs. + +* Sun Mar 21 1999 Cristian Gafton +- auto rebuild in the new build environment (release 2) + +* Mon Mar 15 1999 Jeff Johnson +- include fb devs too (#1515) +- update to 19990118 version. + +* Thu Nov 5 1998 Jeff Johnson +- import from ultrapenguin 1.1. +- upgrade to 19981104. + +* Thu Oct 29 1998 Jakub Jelinek +- new package From svn at tinysofa.org Thu Jul 1 15:36:22 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:36:22 +1000 (EST) Subject: [tinysofa-svn] r2543 - in tinysofa/snapshot: . distcache distcache/current distcache/current/sources distcache/current/specs Message-ID: <20040701153622.E677C4E817E@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:36:22 +1000 (Fri, 02 Jul 2004) New Revision: 2543 Added: tinysofa/snapshot/distcache/ tinysofa/snapshot/distcache/current/ tinysofa/snapshot/distcache/current/sources/ tinysofa/snapshot/distcache/current/sources/dc_client.init tinysofa/snapshot/distcache/current/sources/dc_server.init tinysofa/snapshot/distcache/current/sources/distcache-1.4.5-setuid.patch tinysofa/snapshot/distcache/current/sources/distcache-1.4.5.tar.bz2 tinysofa/snapshot/distcache/current/specs/ tinysofa/snapshot/distcache/current/specs/distcache.spec Log: - Add distcache to snapshot from 2.0. Added: tinysofa/snapshot/distcache/current/sources/dc_client.init =================================================================== --- tinysofa/snapshot/distcache/current/sources/dc_client.init 2004-07-01 15:36:21 UTC (rev 2542) +++ tinysofa/snapshot/distcache/current/sources/dc_client.init 2004-07-01 15:36:22 UTC (rev 2543) @@ -0,0 +1,78 @@ +#!/bin/bash +# +# distcache Startup script for the Distcache SSL Session Cache Client Proxy +# +# chkconfig: - 88 12 +# description: Distcache is a Distributed SSL Session Cache Client Proxy. +# processname: dc_client +# config: /etc/sysconfig/distcache +# pidfile: /var/run/dc_client.pid + +# Source function library. +. /etc/rc.d/init.d/functions + +if [ -f /etc/sysconfig/distcache ]; then + . /etc/sysconfig/distcache +fi + +port=${PORT-5555} +socket=${SOCKET-/var/cache/mod_ssl/distcache} +server=${SERVER-localhost}:${port} +owner=${OWNER-apache} + +prog=dc_client +RETVAL=0 +runas=nobody +dc_client=/usr/bin/dc_client +pidfile=/var/run/dc_client.pid + +OPTIONS="-daemon -pidfile ${pidfile} -listen UNIX:${socket} \ + -sockowner ${owner} -sockperms 0600 -user ${runas} -server IP:${server}" + +start() { + echo -n $"Starting $prog: " + daemon $dc_client $OPTIONS + RETVAL=$? + echo + [ $RETVAL = 0 ] && touch /var/lock/subsys/dc_client + return $RETVAL +} +stop() { + echo -n $"Stopping $prog: " + killproc $dc_client + RETVAL=$? + echo + [ $RETVAL = 0 ] && rm -f /var/lock/subsys/dc_client /var/run/dc_client.pid +} + +# See how we were called. +case "$1" in + start) + start + ;; + stop) + stop + ;; + status) + status $dc_client + RETVAL=$? + ;; + restart) + stop + start + ;; + condrestart) + if [ -f /var/run/dc_client.pid ] ; then + stop + start + fi + ;; + reload) + reload + ;; + *) + echo $"Usage: $prog {start|stop|restart|condrestart|status|help}" + exit 1 +esac + +exit $RETVAL Property changes on: tinysofa/snapshot/distcache/current/sources/dc_client.init ___________________________________________________________________ Name: svn:executable + * Added: tinysofa/snapshot/distcache/current/sources/dc_server.init =================================================================== --- tinysofa/snapshot/distcache/current/sources/dc_server.init 2004-07-01 15:36:21 UTC (rev 2542) +++ tinysofa/snapshot/distcache/current/sources/dc_server.init 2004-07-01 15:36:22 UTC (rev 2543) @@ -0,0 +1,74 @@ +#!/bin/bash +# +# distcache Startup script for the Distcache SSL Session Cache Server +# +# chkconfig: - 90 10 +# description: Distcache is a Distributed SSL Session Cache server. +# processname: dc_server +# config: /etc/sysconfig/distcache +# pidfile: /var/run/dc_server.pid + +# Source function library. +. /etc/rc.d/init.d/functions + +if [ -f /etc/sysconfig/distcache ]; then + . /etc/sysconfig/distcache +fi + +port=${PORT-5555} +sessions=${SESSIONS-3000} + +prog=dc_server +RETVAL=0 +runas=nobody +dc_server=/usr/bin/dc_server + +OPTIONS="-daemon -pidfile /var/run/dc_server.pid -user ${runas} -sessions ${sessions} -listen IP:${port}" + +start() { + echo -n $"Starting $prog: " + daemon $dc_server $OPTIONS + RETVAL=$? + echo + [ $RETVAL = 0 ] && touch /var/lock/subsys/dc_server + return $RETVAL +} +stop() { + echo -n $"Stopping $prog: " + killproc $dc_server + RETVAL=$? + echo + [ $RETVAL = 0 ] && rm -f /var/lock/subsys/dc_server /var/run/dc_server.pid +} + +# See how we were called. +case "$1" in + start) + start + ;; + stop) + stop + ;; + status) + status $dc_server + RETVAL=$? + ;; + restart) + stop + start + ;; + condrestart) + if [ -f /var/run/dc_server.pid ] ; then + stop + start + fi + ;; + reload) + reload + ;; + *) + echo $"Usage: $prog {start|stop|restart|condrestart|status|help}" + exit 1 +esac + +exit $RETVAL Property changes on: tinysofa/snapshot/distcache/current/sources/dc_server.init ___________________________________________________________________ Name: svn:executable + * Added: tinysofa/snapshot/distcache/current/sources/distcache-1.4.5-setuid.patch =================================================================== --- tinysofa/snapshot/distcache/current/sources/distcache-1.4.5-setuid.patch 2004-07-01 15:36:21 UTC (rev 2542) +++ tinysofa/snapshot/distcache/current/sources/distcache-1.4.5-setuid.patch 2004-07-01 15:36:22 UTC (rev 2543) @@ -0,0 +1,33 @@ + +Fix dc_client: don't go setuid until after the pidfile has been written. + +--- distcache-1.4.5/sessclient/sclient.c.setuid ++++ distcache-1.4.5/sessclient/sclient.c +@@ -267,13 +267,6 @@ + if(sockperms && !NAL_LISTENER_set_fs_perms(listener, sockperms)) + SYS_fprintf(SYS_stderr, "Warning, can't set socket permissions " + "to '%s', continuing anyway\n", sockperms); +- if(user) { +- if(!SYS_setuid(user)) { +- SYS_fprintf(SYS_stderr, "Error, couldn't become user " +- "'%s'.\n", user); +- return 1; +- } +- } + #endif + + /* Define a "now" value that can be used during initialisation and +@@ -312,6 +305,13 @@ + SYS_fprintf(fp, "%lu", (unsigned long)SYS_getpid()); + fclose(fp); + } ++ if(user) { ++ if(!SYS_setuid(user)) { ++ SYS_fprintf(SYS_stderr, "Error, couldn't become user " ++ "'%s'.\n", user); ++ return 1; ++ } ++ } + #endif + + /* Choose an appropriate select timeout relative to the retry period */ Added: tinysofa/snapshot/distcache/current/sources/distcache-1.4.5.tar.bz2 =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/distcache/current/sources/distcache-1.4.5.tar.bz2 ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/distcache/current/specs/distcache.spec =================================================================== --- tinysofa/snapshot/distcache/current/specs/distcache.spec 2004-07-01 15:36:21 UTC (rev 2542) +++ tinysofa/snapshot/distcache/current/specs/distcache.spec 2004-07-01 15:36:22 UTC (rev 2543) @@ -0,0 +1,149 @@ + +Summary: Distributed SSL session cache +Name: distcache +Version: 1.4.5 +Release: 4ts +License: LGPL +Group: System Environment/Daemons +URL: http://www.distcache.org/ +Source0: %{name}-%{version}.tar.bz2 +Patch0: distcache-1.4.5-setuid.patch +Source1: dc_server.init +Source2: dc_client.init +BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot +BuildRequires: automake >= 1.7, autoconf >= 2.50, libtool, openssl-devel +Requires: /sbin/chkconfig + +%description +The distcache package provides a variety of functionality for +enabling a network-based session caching system, primarily for +(though not restricted to) SSL/TLS session caching. + +%package devel +Group: Development/Libraries +Summary: Development tools for distcache distributed session cache +Requires: distcache = %{version} + +%description devel +This package includes the libraries that implement the necessary +network functionality, the session caching protocol, and APIs for +applications wishing to use a distributed session cache, or indeed +even to implement a storage mechanism for a session cache server. + +%prep +%setup -q +%patch0 -p1 -b .setuid + +%build +libtoolize --force --copy && aclocal && autoconf +automake -aic --gnu || : automake ate my hamster +%configure --enable-shared +make %{?_smp_mflags} + +%install +rm -rf $RPM_BUILD_ROOT +make install DESTDIR=$RPM_BUILD_ROOT +make -C ssl install DESTDIR=$RPM_BUILD_ROOT + +mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d +install -m 755 $RPM_SOURCE_DIR/dc_server.init \ + $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/dc_server +install -m 755 $RPM_SOURCE_DIR/dc_client.init \ + $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/dc_client + +mkdir -p $RPM_BUILD_ROOT%{_sbindir} + +# Unpackaged files +rm -f $RPM_BUILD_ROOT%{_bindir}/{nal_test,piper} + +%post +/sbin/chkconfig --add dc_server +/sbin/chkconfig --add dc_client +/sbin/ldconfig + +%preun +if [ $1 = 0 ]; then + /sbin/service dc_server stop > /dev/null 2>&1 + /sbin/service dc_client stop > /dev/null 2>&1 + /sbin/chkconfig --del dc_server + /sbin/chkconfig --del dc_client +fi +/sbin/ldconfig + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(-,root,root,-) +%{_bindir}/sslswamp +%{_bindir}/dc_* +%{_sysconfdir}/rc.d/init.d/dc_* +%doc ANNOUNCE CHANGES README LICENSE FAQ +%{_libdir}/*.so.* +%{_mandir}/man1/* +%{_mandir}/man8/* +%{_datadir}/swamp + +%files devel +%defattr(-,root,root,-) +%{_includedir}/distcache +%{_includedir}/libnal +%{_libdir}/*.*a +%{_libdir}/*.so +%{_mandir}/man2/* + +%changelog +* Mon May 17 2004 Joe Orton 1.4.5-4 +- run ldconfig in %%post and %%postun + +* Sun May 2 2004 Joe Orton 1.4.5-3 +- add BuildRequires: openssl-devel (#122265) + +* Tue Apr 13 2004 Joe Orton 1.4.5-2 +- dc_client: go setuid later (#120711) + +* Tue Apr 6 2004 Joe Orton 1.4.5-1 +- update to 1.4.5 (#119135) +- include sslswamp +- build shared libraries + +* Tue Mar 02 2004 Elliot Lee +- rebuilt + +* Sat Feb 21 2004 Florian La Roche +- mv /etc/init.d -> /etc/rc.d/init.d + +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Sun Jan 25 2004 Joe Orton 0.4.2-9 +- add BuildRequires (#114115) +- add config lines to init scripts + +* Tue Jan 20 2004 Joe Orton 0.4.2-8 +- rebuild + +* Fri Nov 28 2003 Joe Orton 0.4.2-7 +- sync with upstream: use -sock{owner,perms} in dc_client + +* Wed Nov 26 2003 Joe Orton 0.4.2-6 +- set socket owner and permissions in dc_client + +* Wed Nov 26 2003 Joe Orton 0.4.2-5 +- rebuild in new environment + +* Tue Nov 18 2003 Joe Orton 0.4.2-4 +- fix %%preun to allow --erase to succeed (#110115) + +* Thu Jul 31 2003 Joe Orton 0.4.2-3 +- add dc_client init script +- pass -sessions to dc_server + +* Wed Jul 2 2003 Joe Orton 0.4.2-2 +- have dc_server drop to 'nobody' user after bind() +- add init script for dc_server +- build everything using -fPIC + +* Mon Jun 9 2003 Joe Orton 0.4.2-1 +- Initial build. + From svn at tinysofa.org Thu Jul 1 15:36:47 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:36:47 +1000 (EST) Subject: [tinysofa-svn] r2556 - in tinysofa/snapshot: . freetype freetype/current freetype/current/sources freetype/current/specs Message-ID: <20040701153647.A74A14E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:36:47 +1000 (Fri, 02 Jul 2004) New Revision: 2556 Added: tinysofa/snapshot/freetype/ tinysofa/snapshot/freetype/current/ tinysofa/snapshot/freetype/current/sources/ tinysofa/snapshot/freetype/current/sources/freetype-1.4-ac25.patch tinysofa/snapshot/freetype/current/sources/freetype-1.4-disable-ft1-bci.patch tinysofa/snapshot/freetype/current/sources/freetype-1.4-gcc33.patch tinysofa/snapshot/freetype/current/sources/freetype-2.1.3-enable-ft2-bci.patch tinysofa/snapshot/freetype/current/sources/freetype-2.1.7-eexec.patch tinysofa/snapshot/freetype/current/sources/freetype-2.1.7.tar.bz2 tinysofa/snapshot/freetype/current/sources/freetype-pre1.4.tar.bz2 tinysofa/snapshot/freetype/current/sources/ft2demos-2.1.7.tar.bz2 tinysofa/snapshot/freetype/current/sources/ftdocs-2.1.7.tar.bz2 tinysofa/snapshot/freetype/current/specs/ tinysofa/snapshot/freetype/current/specs/freetype.spec Log: - Add freetype to snapshot from 2.0. Added: tinysofa/snapshot/freetype/current/sources/freetype-1.4-ac25.patch =================================================================== --- tinysofa/snapshot/freetype/current/sources/freetype-1.4-ac25.patch 2004-07-01 15:36:44 UTC (rev 2555) +++ tinysofa/snapshot/freetype/current/sources/freetype-1.4-ac25.patch 2004-07-01 15:36:47 UTC (rev 2556) @@ -0,0 +1,11 @@ +--- freetype-pre1.4/configure.in.ac25 2000-04-14 10:02:12.000000000 -0400 ++++ freetype-pre1.4/configure.in 2003-06-09 18:32:11.000000000 -0400 +@@ -59,7 +59,7 @@ + + dnl gettext support + if test "$USE_NLS" = "yes"; then +- AC_REQUIRE([AC_PROG_MAKE_SET]) ++ AC_PROG_MAKE_SET + AC_CHECK_HEADERS(locale.h) + AC_CHECK_FUNCS(setlocale) + AC_SUBST(HAVE_LOCALE_H) Added: tinysofa/snapshot/freetype/current/sources/freetype-1.4-disable-ft1-bci.patch =================================================================== --- tinysofa/snapshot/freetype/current/sources/freetype-1.4-disable-ft1-bci.patch 2004-07-01 15:36:44 UTC (rev 2555) +++ tinysofa/snapshot/freetype/current/sources/freetype-1.4-disable-ft1-bci.patch 2004-07-01 15:36:47 UTC (rev 2556) @@ -0,0 +1,11 @@ +--- freetype-pre1.4/ft_conf.h.in.disable-ft1-bci 1999-09-03 09:09:55.000000000 -0400 ++++ freetype-pre1.4/ft_conf.h.in 2003-06-09 18:17:28.000000000 -0400 +@@ -93,7 +93,7 @@ + /* emerged recently on the FreeType lists. We still do not have Apple's */ + /* opinion on the subject and will change this as soon as we have. */ + +-#undef TT_CONFIG_OPTION_NO_INTERPRETER ++#define TT_CONFIG_OPTION_NO_INTERPRETER + + + /*************************************************************************/ Added: tinysofa/snapshot/freetype/current/sources/freetype-1.4-gcc33.patch =================================================================== --- tinysofa/snapshot/freetype/current/sources/freetype-1.4-gcc33.patch 2004-07-01 15:36:44 UTC (rev 2555) +++ tinysofa/snapshot/freetype/current/sources/freetype-1.4-gcc33.patch 2004-07-01 15:36:47 UTC (rev 2556) @@ -0,0 +1,20 @@ +--- freetype-pre1.4/test/ftdump.c.gcc33 2000-01-04 20:16:07.000000000 -0500 ++++ freetype-pre1.4/test/ftdump.c 2003-06-09 18:17:28.000000000 -0400 +@@ -140,7 +140,7 @@ + old_memory += *var; + } + +-#define FOOTPRINT( field ) Save_Memory( &memory_footprint.##field ) ++#define FOOTPRINT( field ) Save_Memory( &memory_footprint.field ) + + + static void +@@ -153,7 +153,7 @@ + } + + #define PRINT_MEM( field, string ) \ +- Print_Mem( memory_footprint.##field, string ) ++ Print_Mem( memory_footprint.field, string ) + + + /* Print the memory footprint */ Added: tinysofa/snapshot/freetype/current/sources/freetype-2.1.3-enable-ft2-bci.patch =================================================================== --- tinysofa/snapshot/freetype/current/sources/freetype-2.1.3-enable-ft2-bci.patch 2004-07-01 15:36:44 UTC (rev 2555) +++ tinysofa/snapshot/freetype/current/sources/freetype-2.1.3-enable-ft2-bci.patch 2004-07-01 15:36:47 UTC (rev 2556) @@ -0,0 +1,11 @@ +--- include/freetype/config/ftoption.h.enable-ft2-bci 2002-11-06 17:32:53.000000000 -0500 ++++ include/freetype/config/ftoption.h 2002-12-17 02:43:47.000000000 -0500 +@@ -378,7 +378,7 @@ + /* do not #undef this macro here, since the build system might */ + /* define for certain configurations */ + /* */ +-/* #define TT_CONFIG_OPTION_BYTECODE_INTERPRETER */ ++#define TT_CONFIG_OPTION_BYTECODE_INTERPRETER + + + /*************************************************************************/ Added: tinysofa/snapshot/freetype/current/sources/freetype-2.1.7-eexec.patch =================================================================== --- tinysofa/snapshot/freetype/current/sources/freetype-2.1.7-eexec.patch 2004-07-01 15:36:44 UTC (rev 2555) +++ tinysofa/snapshot/freetype/current/sources/freetype-2.1.7-eexec.patch 2004-07-01 15:36:47 UTC (rev 2556) @@ -0,0 +1,19 @@ +=================================================================== +RCS file: /home/freetype/cvs/cvs/freetype/freetype2/src/type1/t1load.c,v +retrieving revision 1.88 +retrieving revision 1.89 +diff -u -r1.88 -r1.89 +--- freetype2/src/type1/t1load.c 2003/12/12 15:38:39 1.88 ++++ freetype2/src/type1/t1load.c 2003/12/22 11:35:36 1.89 +@@ -1527,6 +1527,11 @@ + parser->root.cursor = cur2; + } + ++ /* look for `eexec' */ ++ else if ( *cur == 'e' && cur + 5 < limit && ++ ft_strncmp( (char*)cur, "eexec", 5 ) == 0 ) ++ break; ++ + /* look for `closefile' which ends the eexec section */ + else if ( *cur == 'c' && cur + 9 < limit && + ft_strncmp( (char*)cur, "closefile", 9 ) == 0 ) Added: tinysofa/snapshot/freetype/current/sources/freetype-2.1.7.tar.bz2 =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/freetype/current/sources/freetype-2.1.7.tar.bz2 ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/freetype/current/sources/freetype-pre1.4.tar.bz2 =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/freetype/current/sources/freetype-pre1.4.tar.bz2 ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/freetype/current/sources/ft2demos-2.1.7.tar.bz2 =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/freetype/current/sources/ft2demos-2.1.7.tar.bz2 ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/freetype/current/sources/ftdocs-2.1.7.tar.bz2 =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/freetype/current/sources/ftdocs-2.1.7.tar.bz2 ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/freetype/current/specs/freetype.spec =================================================================== --- tinysofa/snapshot/freetype/current/specs/freetype.spec 2004-07-01 15:36:44 UTC (rev 2555) +++ tinysofa/snapshot/freetype/current/specs/freetype.spec 2004-07-01 15:36:47 UTC (rev 2556) @@ -0,0 +1,550 @@ +# Disables freetype 1 and 2 bytecode interpreter. Setting to 0 enables +# the bytecode interpreter in both freetype 1 and 2. +%define without_bytecode_interpreter 1 + +%define with_freetype1 1 + +%define ft1 freetype-pre1.4 + +%{!?with_xfree86:%define with_xfree86 1} + +Summary: A free and portable TrueType font rendering engine. +Name: freetype +Version: 2.1.7 +Release: 4ts +License: BSD/GPL dual license +Group: System Environment/Libraries +URL: http://www.freetype.org +Source: freetype-%{version}.tar.bz2 +Source1: ftdocs-%{version}.tar.bz2 +Source2: ft2demos-%{version}.tar.bz2 +Source3: %{ft1}.tar.bz2 + +# Fix build of freetype-1.4 with gcc 3.3 +Patch3: freetype-1.4-ac25.patch +Patch4: freetype-1.4-gcc33.patch +# Patch from freetype CVS to fix handling of eexec +# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=117743 +Patch5: freetype-2.1.7-eexec.patch +Patch20: freetype-2.1.3-enable-ft2-bci.patch +Patch21: freetype-1.4-disable-ft1-bci.patch + +Buildroot: %{_tmppath}/%{name}-%{version}-root +BuildRequires: automake autoconf >= 2.59 libtool symlinks zlib-devel + +%description +The FreeType engine is a free and portable TrueType font rendering +engine, developed to provide TrueType support for a variety of +platforms and environments. FreeType is a library which can open and +manages font files as well as efficiently load, hint and render +individual glyphs. FreeType is not a font server or a complete +text-rendering library. + + +%if %{with_freetype1} +%package utils +Summary: A collection of FreeType utilities. +Group: System Environment/Libraries +Requires: %{name} = %{version}-%{release} + +%description utils +The FreeType engine is a free and portable TrueType font rendering +engine, developed to provide TrueType support for a variety of +platforms and environments. FreeType is a library which can open and +manages font files as well as efficiently load, hint and render +individual glyphs. FreeType is not a font server or a complete +text-rendering library. +%endif + +%package demos +Summary: A collection of FreeType demos. +Group: System Environment/Libraries +Requires: %{name} = %{version}-%{release} + +%description demos +The FreeType engine is a free and portable TrueType font rendering +engine, developed to provide TrueType support for a variety of +platforms and environments. FreeType is a library which can open and +manages font files as well as efficiently load, hint and render +individual glyphs. FreeType is not a font server or a complete +text-rendering library. + + +%package devel +Summary: FreeType development libraries and header files +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} +Requires: zlib-devel + +%description devel +The FreeType engine is a free and portable TrueType font rendering +engine, developed to provide TrueType support for a variety of +platforms and environments. FreeType is a library which can open and +manages font files as well as efficiently load, hint and render +individual glyphs. FreeType is not a font server or a complete +text-rendering library. + + +%prep +%setup -q -b 1 -a 2 -a 3 + +%if %{with_freetype1} +pushd %{ft1} +%patch3 -p1 -b .ac25 +%patch4 -p1 -b .gcc33 + +%if %{without_bytecode_interpreter} +%patch21 -p1 -b .disable-ft1-bci +%endif +popd +%endif + +%if ! %{without_bytecode_interpreter} +%patch20 -p0 -b .enable-ft2-bci +%endif + +%patch5 -p1 -b .eexec + +# Need to update libtool to get deplibs right for x86_64 +pushd builds/unix +libtoolize --force +aclocal --force +autoconf -f +popd + +pushd %{ft1} +libtoolize --force +aclocal --force +autoconf -f +popd + +%build +# Work around code generation problem with strict-aliasing +# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=118021 +# +export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" +export CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" + +# Build Freetype 2 +{ + %configure + make %{?_smp_mflags} +} + +%if %{with_freetype1} +# Build Freetype 1.4 +{ + pushd %{ft1} + %configure --disable-debug --enable-static --enable-shared \ + --with-locale-dir=%{_datadir}/locale + make X11_LIB=/usr/X11R6/%{_lib} + + # Absolute symlinks in the debug output break debuginfo, + # so use 'symlinks' to relativize and shorten; takes + # two passes because 'symlinks' is stupid. + symlinks -r -c . > /dev/null + symlinks -r -s -c . > /dev/null + + popd +} +%endif + +%if %{with_xfree86} +# Build freetype 2 demos +{ + pushd ft2demos-%{version} + make X11_LIB=/usr/X11R6/%{_lib} X11_PATH="/usr/X11R6" TOP_DIR=".." + popd +} +%endif + +%install +rm -rf $RPM_BUILD_ROOT + + +# Install Freetype 2 +%makeinstall gnulocaledir=$RPM_BUILD_ROOT%{_datadir}/locale + +%if %{with_freetype1} +# Install Freetype 1 +{ + pushd %{ft1} + %makeinstall gnulocaledir=$RPM_BUILD_ROOT%{_datadir}/locale + libtool --finish $RPM_BUILD_ROOT%{_libdir} + popd +} +%endif +%if %{with_freetype1} +mkdir -p $RPM_BUILD_ROOT/%{_includedir}/freetype1 +mv $RPM_BUILD_ROOT/%{_includedir}/freetype $RPM_BUILD_ROOT/%{_includedir}/freetype1 +%endif + +%if %{with_xfree86} +# Install freetype 2 demos +{ + for ftdemo in ftdump ftlint ftmemchk ftmulti ftstring fttimer ftview ;do + libtool install -m 755 ft2demos-%{version}/bin/$ftdemo $RPM_BUILD_ROOT/%{_bindir} + done +} +%endif +%find_lang %{name} + +%clean +rm -rf $RPM_BUILD_ROOT + +%triggerpostun -- freetype < 2.0.5-3 +{ + # ttmkfdir updated - as of 2.0.5-3, on upgrades we need xfs to regenerate + # things to get the iso10646-1 encoding listed. + for I in %{_datadir}/fonts/*/TrueType /usr/X11R6/lib/X11/fonts/TrueType; do + [ -d $I ] && [ -f $I/fonts.scale ] && [ -f $I/fonts.dir ] && touch $I/fonts.scale + done + exit 0 +} + +%post -p /sbin/ldconfig + +%postun -p /sbin/ldconfig + +%files -f %{name}.lang +%defattr(-,root,root) +%{_libdir}/libfreetype.so.* +%doc ChangeLog README +%if %{with_freetype1} +%{_libdir}/libttf.so.* +%doc %{ft1}/README %{ft1}/announce docs +%endif + +%if %{with_freetype1} +%files utils +%defattr(-,root,root) +# 2.0.4 version included in demos package now +#%{_bindir}/ftdump +# 2.0.4 version included in demos package now +#%{_bindir}/ftlint +%{_bindir}/fterror +%{_bindir}/ftmetric +%{_bindir}/ftsbit +%{_bindir}/ftstrpnm +%endif + +%files demos +%defattr(-,root,root) +%{_bindir}/ftdump +%{_bindir}/ftlint +%if %{with_xfree86} +%{_bindir}/ftmemchk +%{_bindir}/ftmulti +%{_bindir}/ftstring +%{_bindir}/fttimer +%{_bindir}/ftview +%endif + +%files devel +%defattr(-,root,root) +%if %{with_freetype1} +%dir %{_includedir}/freetype1 +%{_includedir}/freetype1/* +%endif +%dir %{_includedir}/freetype2 +%{_datadir}/aclocal/freetype2.m4 +%{_includedir}/freetype2/* +%{_includedir}/*.h +%if %{with_freetype1} +%{_libdir}/libttf.a +%{_libdir}/libttf.la +%{_libdir}/libttf.so +%endif +%{_libdir}/libfreetype.a +%{_libdir}/libfreetype.la +%{_libdir}/libfreetype.so +%{_bindir}/freetype-config +%{_libdir}/pkgconfig/ + +%changelog +* Mon Apr 19 2004 Owen Taylor 2.1.7-4 +- Add patch from freetype CVS to fix problem with eexec (#117743) +- Add freetype-devel to buildrequires and -devel requires + (Maxim Dzumanenko, #111108) + +* Wed Mar 10 2004 Mike A. Harris 2.1.7-3 +- Added -fno-strict-aliasing to CFLAGS and CXXFLAGS to try to fix SEGV and + SIGILL crashes in mkfontscale which have been traced into freetype and seem + to be caused by aliasing issues in freetype macros (#118021) + +* Tue Mar 02 2004 Elliot Lee 2.1.7-2.1 +- rebuilt + +* Fri Feb 13 2004 Elliot Lee 2.1.7-2 +- rebuilt + +* Fri Jan 23 2004 Owen Taylor 2.1.7-1 +- Upgrade to 2.1.7 + +* Tue Sep 23 2003 Florian La Roche +- allow compiling without the demos as that requires XFree86 + (this allows bootstrapping XFree86 on new archs) + +* Fri Aug 8 2003 Elliot Lee 2.1.4-4.1 +- Rebuilt + +* Tue Jul 8 2003 Owen Taylor 2.1.4-4.0 +- Bump for rebuild + +* Wed Jun 25 2003 Owen Taylor 2.1.4-3 +- Fix crash with non-format-0 hdmx tables (found by David Woodhouse) + +* Mon Jun 9 2003 Owen Taylor 2.1.4-1 +- Version 2.1.4 +- Relibtoolize to get deplibs right for x86_64 +- Use autoconf-2.5x for freetype-1.4 to fix libtool-1.5 compat problem (#91781) +- Relativize absolute symlinks to fix the -debuginfo package + (#83521, Mike Harris) + +* Wed Jun 04 2003 Elliot Lee +- rebuilt + +* Thu May 22 2003 Jeremy Katz 2.1.3-9 +- fix build with gcc 3.3 + +* Tue Feb 25 2003 Owen Taylor +- Add a memleak fix for the gzip backend from Federic Crozat + +* Thu Feb 13 2003 Elliot Lee 2.1.3-7 +- Run libtoolize/aclocal/autoconf so that libtool knows to generate shared libraries + on ppc64. +- Use _smp_mflags (for freetype 2.x only) + +* Tue Feb 4 2003 Owen Taylor +- Switch to using %%configure (should fix #82330) + +* Wed Jan 22 2003 Tim Powers +- rebuilt + +* Mon Jan 6 2003 Owen Taylor 2.1.3-4 +- Make FreeType robust against corrupt fonts with recursive composite + glyphs (#74782, James Antill) + +* Thu Jan 2 2003 Owen Taylor 2.1.3-3 +- Add a patch to implement FT_LOAD_TARGET_LIGHT +- Fix up freetype-1.4-libtool.patch + +* Sat Dec 12 2002 Mike A. Harris 2.1.3-2 +- Update to freetype 2.1.3 +- Removed ttmkfdir sources and patches, as they have been moved from the + freetype packaging to XFree86 packaging, and now to the ttmkfdir package +- Removed patches that are now included in 2.1.3: + freetype-2.1.1-primaryhints.patch, freetype-2.1.2-slighthint.patch, + freetype-2.1.2-bluefuzz.patch, freetype-2.1.2-stdw.patch, + freetype-2.1.2-transform.patch, freetype-2.1.2-autohint.patch, + freetype-2.1.2-leftright.patch +- Conditionalized inclusion of freetype 1.4 library. + +* Wed Dec 04 2002 Florian La Roche +- disable perl, it is not used at all + +* Tue Dec 03 2002 Elliot Lee 2.1.2-11 +- Instead of removing unpackaged file, include it in the package. + +* Sat Nov 30 2002 Mike A. Harris 2.1.2-10 +- Attempted to fix lib64 issue in freetype-demos build with X11_LINKLIBS +- Cleaned up various _foodir macros throughtout specfile +- Removed with_ttmkfdir build option as it is way obsolete + +* Fri Nov 29 2002 Tim Powers 2.1.2-8 +- remove unpackaged files from the buildroot + +* Wed Aug 28 2002 Owen Taylor +- Fix a bug with PCF metrics + +* Fri Aug 9 2002 Owen Taylor +- Backport autohinter improvements from CVS + +* Tue Jul 23 2002 Owen Taylor +- Fix from CVS for transformations (#68964) + +* Tue Jul 9 2002 Owen Taylor +- Add another bugfix for the postscript hinter + +* Mon Jul 8 2002 Owen Taylor +- Add support for BlueFuzz private dict value, fixing rendering + glitch for Luxi Mono. + +* Wed Jul 3 2002 Owen Taylor +- Add an experimental FT_Set_Hint_Flags() call + +* Mon Jul 1 2002 Owen Taylor +- Update to 2.1.2 +- Add a patch fixing freetype PS hinter bug + +* Fri Jun 21 2002 Mike A. Harris 2.1.1-2 +- Added ft rpm build time conditionalizations upon user requests + +* Tue Jun 11 2002 Owen Taylor 2.1.1-1 +- Version 2.1.1 + +* Mon Jun 10 2002 Owen Taylor +- Add a fix for PCF character maps + +* Sun May 26 2002 Tim Powers +- automated rebuild + +* Fri May 17 2002 Mike A. Harris 2.1.0-2 +- Updated freetype to version 2.1.0 +- Added libtool fix for freetype 1.4 (#64631) + +* Wed Mar 27 2002 Nalin Dahyabhai 2.0.9-2 +- use "libtool install" instead of "install" to install some binaries (#62005) + +* Mon Mar 11 2002 Mike A. Harris 2.0.9-1 +- Updated to freetype 2.0.9 + +* Sun Feb 24 2002 Mike A. Harris 2.0.8-4 +- Added proper docs+demos source for 2.0.8. + +* Sat Feb 23 2002 Mike A. Harris 2.0.8-3 +- Added compat patch so 2.x works more like 1.x +- Rebuilt with new build toolchain + +* Fri Feb 22 2002 Mike A. Harris 2.0.8-2 +- Updated to freetype 2.0.8, however docs and demos are stuck at 2.0.7 + on the freetype website. Munged specfile to deal with the problem by using + {oldversion} instead of version where appropriate. + +* Sat Feb 2 2002 Tim Powers 2.0.6-3 +- bumping release so that we don't collide with another build of + freetype, make sure to change the release requirement in the XFree86 + package + +* Fri Feb 1 2002 Mike A. Harris 2.0.6-2 +- Made ttmkfdir inclusion conditional, and set up a define to include + ttmkfdir in RHL 7.x builds, since ttmkfdir is now moving to the new + XFree86-font-utils package. + +* Wed Jan 16 2002 Mike A. Harris 2.0.6-1 +- Updated freetype to version 2.0.6 + +* Wed Jan 09 2002 Tim Powers 2.0.5-4 +- automated rebuild + +* Fri Nov 30 2001 Elliot Lee 2.0.5-3 +- Fix bug #56901 (ttmkfdir needed to list Unicode encoding when generating + font list). (ttmkfdir-iso10646.patch) +- Use _smp_mflags macro everywhere relevant. (freetype-pre1.4-make.patch) +- Undo fix for #24253, assume compiler was fixed. + +* Mon Nov 12 2001 Bernhard Rosenkraenzer 2.0.5-2 +- Fix build with gcc 3.1 (#56079) + +* Sun Nov 11 2001 Mike A. Harris 2.0.5-1 +- Updated freetype to version 2.0.5 + +* Sat Sep 22 2001 Mike A. Harris 2.0.4-2 +- Added new subpackage freetype-demos, added demos to build +- Disabled ftdump, ftlint in utils package favoring the newer utils in + demos package. + +* Tue Sep 11 2001 Mike A. Harris 2.0.4-1 +- Updated source to 2.0.4 +- Added freetype demo's back into src.rpm, but not building yet. + +* Wed Aug 15 2001 Mike A. Harris 2.0.3-7 +- Changed package to use {findlang} macro to fix bug (#50676) + +* Sun Jul 15 2001 Mike A. Harris 2.0.3-6 +- Changed freetype-devel to group Development/Libraries (#47625) + +* Mon Jul 9 2001 Bernhard Rosenkraenzer 2.0.3-5 +- Fix up FT1 headers to please Qt 3.0.0 beta 2 + +* Sun Jun 24 2001 Bernhard Rosenkraenzer 2.0.3-4 +- Add ft2build.h to -devel package, since it's included by all other + freetype headers, the package is useless without it + +* Thu Jun 21 2001 Nalin Dahyabhai 2.0.3-3 +- Change "Requires: freetype = name/ver" to "freetype = version/release", + and move the requirements to the subpackages. + +* Mon Jun 18 2001 Mike A. Harris 2.0.3-2 +- Added "Requires: freetype = name/ver" + +* Tue Jun 12 2001 Mike A. Harris 2.0.3-1 +- Updated to Freetype 2.0.3, minor specfile tweaks. +- Freetype2 docs are is in a separate tarball now. Integrated it. +- Built in new environment. + +* Fri Apr 27 2001 Bill Nottingham +- rebuild for C++ exception handling on ia64 + +* Sat Jan 20 2001 Bernhard Rosenkraenzer +- Build ttmkfdir with -O0, workaround for Bug #24253 + +* Fri Jan 19 2001 Nalin Dahyabhai +- libtool is used to build libttf, so use libtool to link ttmkfdir with it +- fixup a paths for a couple of missing docs + +* Thu Jan 11 2001 Bernhard Rosenkraenzer +- Update ttmkfdir + +* Wed Dec 27 2000 Bernhard Rosenkraenzer +- Update to 2.0.1 and 1.4 +- Mark locale files as such + +* Wed Jul 12 2000 Prospector +- automatic rebuild + +* Mon Jun 12 2000 Preston Brown +- move .la file to devel pkg +- FHS paths + +* Thu Feb 17 2000 Preston Brown +- revert spaces patch, fix up some foundry names to match X ones + +* Mon Feb 07 2000 Nalin Dahyabhai +- add defattr, ftmetric, ftsbit, ftstrtto per bug #9174 + +* Wed Feb 02 2000 Cristian Gafton +- fix description and summary + +* Wed Jan 12 2000 Preston Brown +- make ttmkfdir replace spaces in family names with underscores (#7613) + +* Tue Jan 11 2000 Bernhard Rosenkraenzer +- 1.3.1 +- handle RPM_OPT_FLAGS + +* Wed Nov 10 1999 Preston Brown +- fix a path for ttmkfdir Makefile + +* Thu Aug 19 1999 Preston Brown +- newer ttmkfdir that works better, moved ttmkfdir to /usr/bin from /usr/sbin +- freetype utilities moved to subpkg, X dependency removed from main pkg +- libttf.so symlink moved to devel pkg + +* Mon Mar 22 1999 Preston Brown +- strip binaries + +* Sun Mar 21 1999 Cristian Gafton +- auto rebuild in the new build environment (release 5) + +* Thu Mar 18 1999 Cristian Gafton +- fixed the %doc file list + +* Wed Feb 24 1999 Preston Brown +- Injected new description and group. + +* Mon Feb 15 1999 Preston Brown +- added ttmkfdir + +* Tue Feb 02 1999 Preston Brown +- update to 1.2 + +* Thu Jan 07 1999 Cristian Gafton +- call libtoolize to sanitize config.sub and get ARM support +- dispoze of the patch (not necessary anymore) + +* Wed Oct 21 1998 Preston Brown +- post/postun sections for ldconfig action. + +* Tue Oct 20 1998 Preston Brown +- initial RPM, includes normal and development packages. From svn at tinysofa.org Thu Jul 1 15:36:48 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:36:48 +1000 (EST) Subject: [tinysofa-svn] r2557 - in tinysofa/snapshot: . gd gd/current gd/current/sources gd/current/specs Message-ID: <20040701153648.DBFE14E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:36:48 +1000 (Fri, 02 Jul 2004) New Revision: 2557 Added: tinysofa/snapshot/gd/ tinysofa/snapshot/gd/current/ tinysofa/snapshot/gd/current/sources/ tinysofa/snapshot/gd/current/sources/gd-2.0.21.tar.gz tinysofa/snapshot/gd/current/specs/ tinysofa/snapshot/gd/current/specs/gd.spec Log: - Add gd to snapshot from 2.0. Added: tinysofa/snapshot/gd/current/sources/gd-2.0.21.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/gd/current/sources/gd-2.0.21.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/gd/current/specs/gd.spec =================================================================== --- tinysofa/snapshot/gd/current/specs/gd.spec 2004-07-01 15:36:47 UTC (rev 2556) +++ tinysofa/snapshot/gd/current/specs/gd.spec 2004-07-01 15:36:48 UTC (rev 2557) @@ -0,0 +1,176 @@ +Summary: A graphics library for quick creation of PNG or JPEG images. +Name: gd +Version: 2.0.21 +Release: 3ts +URL: http://www.boutell.com/gd/ +Source0: http://www.boutell.com/gd/http/gd-%{version}.tar.gz +License: BSD-style +Group: System Environment/Libraries +BuildRoot: %{_tmppath}/%{name}-%{version}-root +Prereq: /sbin/ldconfig +BuildPrereq: freetype-devel, libjpeg-devel, libpng-devel, zlib-devel +%define shlibver %(echo %{version} | cut -f-2 -d.) + +%description +The gd graphics library allows your code to quickly draw images +complete with lines, arcs, text, multiple colors, cut and paste from +other images, and flood fills, and to write out the result as a PNG or +JPEG file. This is particularly useful in Web applications, where PNG +and JPEG are two of the formats accepted for inline images by most +browsers. Note that gd is not a paint program. + +%package progs +Requires: gd = %{version}, perl +Summary: Utility programs that use libgd. +Group: Applications/Multimedia + +%description progs +The gd-progs package includes utility programs supplied with gd, a +graphics library for creating PNG and JPEG images. If you install +these, you must also install gd. + +%package devel +Requires: gd = %{version} +Summary: The development libraries and header files for gd. +Group: Development/Libraries + +%description devel +The gd-devel package contains the development libraries and header +files for gd, a graphics library for creating PNG and JPEG graphics. + +%prep +%setup -q + +%build +%configure --disable-rpath +make + +%install +[ "$RPM_BUILD_ROOT" != "/" ] && rm -fr $RPM_BUILD_ROOT +%makeinstall +rm -rf $RPM_BUILD_ROOT/%{_libdir}/libgd.la + +%clean +[ "$RPM_BUILD_ROOT" != "/" ] && rm -fr $RPM_BUILD_ROOT + +%post -p /sbin/ldconfig + +%postun -p /sbin/ldconfig + +%files +%defattr(-,root,root) +%doc index.html +%{_libdir}/*.so.* + +%files progs +%defattr(-,root,root) +%{_bindir}/* + +%files devel +%defattr(-,root,root) +%{_includedir}/* +%{_libdir}/*.so +%{_libdir}/*.a + +%changelog +* Wed Apr 21 2004 Phil Knirsch 2.0.21-3 +- Disable rpath usage. + +* Tue Mar 02 2004 Elliot Lee +- rebuilt + +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Mon Feb 02 2004 Phil Knirsch 2.0.21-1 +- Updated to 2.0.21 + +* Tue Aug 12 2003 Florian La Roche +- update to 2.0.15 + +* Wed Jun 04 2003 Elliot Lee +- rebuilt + +* Tue May 06 2003 Phil Knirsch 2.0.12-1 +- Update to 2.0.12 + +* Wed Jan 22 2003 Tim Powers 1.8.4-11 +- rebuilt + +* Wed Dec 11 2002 Tim Powers 1.8.4-10 +- rebuild on all arches + +* Fri Jun 21 2002 Tim Powers +- automated rebuild + +* Thu May 23 2002 Tim Powers +- automated rebuild + +* Thu Jan 24 2002 Phil Knirsch +- Specfile update to add URL for homepage (#54608) + +* Wed Jan 09 2002 Tim Powers +- automated rebuild + +* Wed Oct 31 2001 Bernhard Rosenkraenzer 1.8.4-5 +- Rebuild with current libpng + +* Mon Aug 13 2001 Philipp Knirsch 1.8.4-4 +- Fixed a wrong double ownership of libgd.so (#51599). + +* Fri Jul 20 2001 Bernhard Rosenkraenzer 1.8.4-3 +- There's really no reason to link against both freetype 1.x and 2.x, + especially when gd is configured to use just freetype 2.x. ;) + +* Mon Jun 25 2001 Philipp Knirsch +- Forgot to include the freetype library in the shared library linking. Fixed. + +* Thu Jun 21 2001 Philipp Knirsch +- Update to 1.8.4 + +* Tue Dec 19 2000 Philipp Knirsch +- Updates the descriptions to get rid of al references to gif + +* Tue Dec 12 2000 Philipp Knirsch +- Fixed bug #22001 where during installation the .so.1 and the so.1.8 links + didn't get installed and therefore updates had problems. + +* Wed Oct 4 2000 Nalin Dahyabhai +- define HAVE_LIBTTF to actually enable ttf support (oops, #18299) +- remove explicit dependencies on libpng, libjpeg, et. al. +- add BuildPrereq: freetype-devel + +* Wed Aug 2 2000 Matt Wilson +- rebuilt against new libpng + +* Mon Jul 31 2000 Nalin Dahyabhai +- add %%postun run of ldconfig (#14915) + +* Thu Jul 13 2000 Prospector +- automatic rebuild + +* Tue Jun 27 2000 Nalin Dahyabhai +- update to 1.8.3 + +* Sat Jun 4 2000 Nalin Dahyabhai +- rebuild in new environment + +* Mon May 22 2000 Nalin Dahyabhai +- break out a -progs subpackage +- disable freetype support + +* Fri May 19 2000 Nalin Dahyabhai +- update to latest version (1.8.2) +- disable xpm support + +* Thu Feb 03 2000 Nalin Dahyabhai +- auto rebuild in the new build environment (release 6) + +* Sun Mar 21 1999 Cristian Gafton +- auto rebuild in the new build environment (release 5) + +* Thu Dec 17 1998 Cristian Gafton +- buiuld for glibc 2.1 + +* Fri Sep 11 1998 Cristian Gafton +- built for 5.2 From svn at tinysofa.org Thu Jul 1 15:36:51 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:36:51 +1000 (EST) Subject: [tinysofa-svn] r2558 - in tinysofa/snapshot: . ghostscript-fonts ghostscript-fonts/current ghostscript-fonts/current/sources ghostscript-fonts/current/specs Message-ID: <20040701153651.061864E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:36:50 +1000 (Fri, 02 Jul 2004) New Revision: 2558 Added: tinysofa/snapshot/ghostscript-fonts/ tinysofa/snapshot/ghostscript-fonts/current/ tinysofa/snapshot/ghostscript-fonts/current/sources/ tinysofa/snapshot/ghostscript-fonts/current/sources/gnu-gs-fonts-other-5.50.tar.gz tinysofa/snapshot/ghostscript-fonts/current/specs/ tinysofa/snapshot/ghostscript-fonts/current/specs/ghostscript-fonts.spec Log: - Add ghostscript-fonts to snapshot from 2.0. Added: tinysofa/snapshot/ghostscript-fonts/current/sources/gnu-gs-fonts-other-5.50.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/ghostscript-fonts/current/sources/gnu-gs-fonts-other-5.50.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/ghostscript-fonts/current/specs/ghostscript-fonts.spec =================================================================== --- tinysofa/snapshot/ghostscript-fonts/current/specs/ghostscript-fonts.spec 2004-07-01 15:36:48 UTC (rev 2557) +++ tinysofa/snapshot/ghostscript-fonts/current/specs/ghostscript-fonts.spec 2004-07-01 15:36:50 UTC (rev 2558) @@ -0,0 +1,92 @@ +Summary: Fonts for the Ghostscript PostScript(TM) interpreter. +Name: ghostscript-fonts +Version: 5.50 +Release: 11ts +License: GPL +Group: Applications/Publishing +BuildRoot: %{_tmppath}/%{name}-%{version}-root +URL: http://gnu-gs.sourceforge.net/ +Source: ftp://ftp.cs.wisc.edu/pub/ghost/gnu/gs550/gnu-gs-fonts-other-%{version}.tar.gz +Requires: ghostscript +BuildArchitectures: noarch + +%description +Ghostscript-fonts contains a set of fonts that Ghostscript, a +PostScript interpreter, uses to render text. These fonts are in +addition to the fonts shared by Ghostscript and the X Window System. + +You'll need to install ghostscript-fonts if you're installing +ghostscript. + +%prep +%setup -q -c ghostscript-fonts-%{version} + +%install +rm -rf $RPM_BUILD_ROOT +mkdir -p $RPM_BUILD_ROOT/usr/share/fonts/default/ghostscript +cp fonts/* $RPM_BUILD_ROOT/usr/share/fonts/default/ghostscript + +%post -p /usr/bin/fc-cache + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(-,root,root,-) +/usr/share/fonts/default/ghostscript + +%changelog +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Thu Jan 22 2004 Tim Waugh 5.50-10 +- Rebuilt. (The 8.11 package which briefly appeared in rawhide should + not be used.) Bug #99323, bug #113866. + +* Wed Jan 22 2003 Tim Powers +- rebuilt + +* Wed Nov 20 2002 Tim Powers +- rebuild in latest collinst + +* Mon Sep 2 2002 Owen Taylor +- Run /usr/bin/fc-cache in the %%post + +* Fri Jun 21 2002 Tim Powers +- automated rebuild + +* Thu May 23 2002 Tim Powers +- automated rebuild + +* Wed Jan 09 2002 Tim Powers +- automated rebuild + +* Thu Jul 13 2000 Prospector +- automatic rebuild + +* Sun Jun 18 2000 Matt Wilson +- rebuild for next release + +* Mon Feb 14 2000 Bernhard Rosenkraenzer +- 5.50 + +* Sun Mar 21 1999 Cristian Gafton +- auto rebuild in the new build environment (release 3) + +* Wed Feb 24 1999 Preston Brown +- Injected new description and group. + +* Wed Jan 13 1999 Preston Brown +- renamed package to be consistent with new ghostscript. + +* Fri Nov 13 1998 Preston Brown +- removed the std fonts...now shared between X11 and gs with URW fonts pkg. + +* Thu Jul 2 1998 Jeff Johnson +- update to 4.03. + +* Mon May 04 1998 Erik Troan +- set the owner and group of all of the files to 0.0 + +* Tue Sep 23 1997 Erik Troan +- made a noarch package From svn at tinysofa.org Thu Jul 1 15:36:53 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:36:53 +1000 (EST) Subject: [tinysofa-svn] r2559 - in tinysofa/snapshot: . glib2 glib2/current glib2/current/sources glib2/current/specs Message-ID: <20040701153653.8EDD24E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:36:53 +1000 (Fri, 02 Jul 2004) New Revision: 2559 Added: tinysofa/snapshot/glib2/ tinysofa/snapshot/glib2/current/ tinysofa/snapshot/glib2/current/sources/ tinysofa/snapshot/glib2/current/sources/glib-2.4.2.tar.bz2 tinysofa/snapshot/glib2/current/sources/glib2.csh tinysofa/snapshot/glib2/current/sources/glib2.sh tinysofa/snapshot/glib2/current/specs/ tinysofa/snapshot/glib2/current/specs/glib2.spec Log: - Add glib2 to snapshot from 2.0. Added: tinysofa/snapshot/glib2/current/sources/glib-2.4.2.tar.bz2 =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/glib2/current/sources/glib-2.4.2.tar.bz2 ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/glib2/current/sources/glib2.csh =================================================================== --- tinysofa/snapshot/glib2/current/sources/glib2.csh 2004-07-01 15:36:50 UTC (rev 2558) +++ tinysofa/snapshot/glib2/current/sources/glib2.csh 2004-07-01 15:36:53 UTC (rev 2559) @@ -0,0 +1,6 @@ + +## This caused GLib2 applications to convert filenames from +## locale encoding to UTF-8. If the locale encoding is already +## UTF-8 then it makes no difference. + +setenv G_BROKEN_FILENAMES 1 Added: tinysofa/snapshot/glib2/current/sources/glib2.sh =================================================================== --- tinysofa/snapshot/glib2/current/sources/glib2.sh 2004-07-01 15:36:50 UTC (rev 2558) +++ tinysofa/snapshot/glib2/current/sources/glib2.sh 2004-07-01 15:36:53 UTC (rev 2559) @@ -0,0 +1,5 @@ +## This caused GLib2 applications to convert filenames from +## locale encoding to UTF-8. If the locale encoding is already +## UTF-8 then it makes no difference. + +export G_BROKEN_FILENAMES=1 \ No newline at end of file Added: tinysofa/snapshot/glib2/current/specs/glib2.spec =================================================================== --- tinysofa/snapshot/glib2/current/specs/glib2.spec 2004-07-01 15:36:50 UTC (rev 2558) +++ tinysofa/snapshot/glib2/current/specs/glib2.spec 2004-07-01 15:36:53 UTC (rev 2559) @@ -0,0 +1,369 @@ +Summary: A library of handy utility functions. +Name: glib2 +Version: 2.4.2 +Release: 1ts +License: LGPL +Group: System Environment/Libraries +Source: glib-%{version}.tar.bz2 +Source2: glib2.sh +Source3: glib2.csh +Conflicts: libgnomeui <= 2.2.0 +BuildRoot: %{_tmppath}/%{name}-%{version}-root +BuildRequires: pkgconfig >= 0.8 +Obsoletes: glib-gtkbeta +URL: http://www.gtk.org + +%description +GLib is the low-level core library that forms the basis +for projects such as GTK+ and GNOME. It provides data structure +handling for C, portability wrappers, and interfaces for such runtime +functionality as an event loop, threads, dynamic loading, and anobject system. + +This package provides version 2 of GLib. + +%package devel +Summary: The GIMP ToolKit (GTK+) and GIMP Drawing Kit (GDK) support library +Group: Development/Libraries +Obsoletes: glib-gtkbeta-devel +Requires: pkgconfig >= 1:0.8 +Requires: %{name} = %{version} +Conflicts: glib-devel <= 1:1.2.8 + +%description devel +The glib2-devel package includes the header files for +version 2 of the GLib library. + +%prep +%setup -q -n glib-%{version} + +%build + +for i in config.guess config.sub ; do + test -f /usr/share/libtool/$i && cp /usr/share/libtool/$i . +done +%configure --disable-gtk-doc --enable-static +make + +# test-thread fails on ia64: http://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=116829 +%ifnarch ia64 s390 s390x +make check +%endif + +%install +rm -rf $RPM_BUILD_ROOT + +mkdir -p $RPM_BUILD_ROOT%{_bindir} +%makeinstall + +## glib2.sh and glib2.csh +./mkinstalldirs $RPM_BUILD_ROOT%{_sysconfdir}/profile.d +install -m 755 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/profile.d +install -m 755 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/profile.d + +rm -f $RPM_BUILD_ROOT%{_libdir}/*.la + +%find_lang glib20 + +%clean +rm -rf $RPM_BUILD_ROOT + +%post -p /sbin/ldconfig + +%postun -p /sbin/ldconfig + +%files -f glib20.lang +%defattr(-, root, root) + +%doc AUTHORS COPYING ChangeLog NEWS README +%{_libdir}/libglib-2.0.so.* +%{_libdir}/libgthread-2.0.so.* +%{_libdir}/libgmodule-2.0.so.* +%{_libdir}/libgobject-2.0.so.* +%{_sysconfdir}/profile.d/* + +%files devel +%defattr(-, root, root) + +%{_libdir}/lib*.so +%{_libdir}/lib*.a +%{_libdir}/glib-2.0 +%{_includedir}/* +%{_datadir}/aclocal/* +%{_datadir}/gtk-doc/ +%{_libdir}/pkgconfig/* +%{_datadir}/glib-2.0 +%{_bindir}/* +%{_mandir}/man1/* + +%changelog +* Wed May 19 2004 Matthias Clasen 2.4.1-1 +- Update to 2.4.1 + +* Tue Mar 16 2004 Owen Taylor 2.4.0-1 +- Update to 2.4.0 + +* Wed Mar 10 2004 Mark McLoughlin 2.3.6-1 +- Update to 2.3.6 +- Remove gatomic build fix + +* Tue Mar 02 2004 Elliot Lee +- rebuilt + +* Tue Mar 02 2004 Mark McLoughlin 2.3.5-1 +- Update to 2.3.5 +- Fix build on ppc64 +- Disable make check on s390 as well - test-thread failing + +* Wed Feb 25 2004 Mark McLoughlin 2.3.3-1 +- Update to 2.3.3 + +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Fri Jan 23 2004 Jonathan Blandford 2.3.2-1 +- new version +- remove 'make check' temporarily + +* Mon Sep 8 2003 Owen Taylor 2.2.3-2.0 +- Conflict with libgnomeui <= 2.2.0 (#83581, G?ran Uddeborg) + +* Tue Aug 26 2003 Owen Taylor 2.2.3-1.1 +- Version 2.2.3 + +* Tue Jul 8 2003 Owen Taylor 2.2.2-2.0 +- Bump for rebuild + +* Sun Jun 8 2003 Owen Taylor +- Version 2.2.2 + +* Wed Jun 04 2003 Elliot Lee +- rebuilt + +* Tue Jun 3 2003 Jeff Johnson +- add explicit epoch's where needed. + +* Sun Feb 2 2003 Owen Taylor +- Version 2.2.1 + +* Wed Jan 22 2003 Tim Powers +- rebuilt + +* Thu Jan 9 2003 Owen Taylor +- Add static libraries to build (#78685, Bernd Kischnick) +- Bump-and-rebuild for new redhat-rpm-config + +* Fri Dec 20 2002 Owen Taylor +- Version 2.2.0 +- Add make check to the build process + +* Mon Dec 16 2002 Owen Taylor +- Version 2.1.5 + +* Wed Dec 11 2002 Owen Taylor +- Version 2.1.4 + +* Mon Dec 2 2002 Owen Taylor +- Version 2.1.3 + +* Mon Oct 07 2002 Havoc Pennington +- Try rebuilding with new arches + +* Tue Aug 13 2002 Havoc Pennington +- install glib2.sh and glib2.csh to set G_BROKEN_FILENAMES +- blow away unpackaged files in install + +* Thu Aug 8 2002 Owen Taylor +- Version 2.0.6 +- Remove fixed-ltmain.sh; shouldn't be needed any more. + +* Fri Jun 21 2002 Tim Powers +- automated rebuild + +* Sun Jun 16 2002 Havoc Pennington +- 2.0.4 + +* Thu May 23 2002 Tim Powers +- automated rebuild + +* Wed Apr 24 2002 Havoc Pennington + - rebuild in different environment + +* Mon Apr 15 2002 Owen Taylor +- Fix missing .po files (#63336) + +* Wed Apr 3 2002 Alex Larsson +- Update to version 2.0.1 + +* Fri Mar 8 2002 Owen Taylor +- Version 2.0.0 + +* Mon Feb 25 2002 Alex Larsson +- Update to 1.3.15 + +* Thu Feb 21 2002 Alex Larsson +- Bump for rebuild + +* Mon Feb 18 2002 Alex Larsson +- Update to 1.3.14 + +* Fri Feb 15 2002 Havoc Pennington +- add horrible buildrequires hack + +* Thu Feb 14 2002 Havoc Pennington +- 1.3.13.91 cvs snap + +* Mon Feb 11 2002 Matt Wilson +- rebuild from CVS snapshot +- use setup -q + +* Thu Jan 31 2002 Jeremy Katz +- rebuild + +* Tue Jan 29 2002 Owen Taylor +- 1.3.13 + +* Tue Jan 22 2002 Havoc Pennington +- attempting rebuild in rawhide + +* Wed Jan 2 2002 Havoc Pennington +- remove 64-bit patch now upstream, 1.3.12.90 + +* Mon Nov 26 2001 Havoc Pennington +- add some missing files to file list, langify + +* Sun Nov 25 2001 Havoc Pennington +- add temporary patch to fix GTypeFundamentals on 64-bit + +* Sun Nov 25 2001 Havoc Pennington +- Version 1.3.11 + +* Thu Oct 25 2001 Owen Taylor +- Version 1.3.10 + +* Tue Sep 25 2001 Owen Taylor +- Version 1.3.9 + +* Wed Sep 19 2001 Owen Taylor +- Version 1.3.8 + +* Fri Jul 20 2001 Owen Taylor +- Make -devel package require main package (#45388) +- Fix description and summary +- Configure with --disable-gtk-doc + +* Wed Jun 20 2001 Florian La Roche +- add some portability fixes needed at least on s390 +- copy config.{guess,sub} instead of calling libtoolize + +* Wed Jun 13 2001 Havoc Pennington +- try a new glib tarball with Makefile changes to work around + libtool linking to installed .la files +- make -devel require pkgconfig + +* Tue Jun 12 2001 Havoc Pennington +- either libtool or the bad libtool hacks caused link + against glib-gobject 1.3.2, rebuild + +* Tue Jun 12 2001 Havoc Pennington +- 1.3.6 +- bad libtool workarounds + +* Fri May 04 2001 Owen Taylor +- 1.3.5, rename to glib2 + +* Fri Nov 17 2000 Owen Taylor +- Final 1.3.2 + +* Mon Nov 13 2000 Owen Taylor +- Version 1.3.2pre1 +- Remove pkgconfig + +* Sun Aug 13 2000 Owen Taylor +- Call 1.3.1b instead of snap... the snap* naming doesn't + order correctly. + +* Thu Aug 10 2000 Havoc Pennington +- new snapshot with fixed .pc files + +* Thu Aug 10 2000 Havoc Pennington +- include .pc files in file list + +* Thu Aug 10 2000 Havoc Pennington +- Include pkg-config +- Upgrade to a glib CVS snapshot + +* Wed Jul 19 2000 Jakub Jelinek +- rebuild to cope with glibc locale binary incompatibility + +* Fri Jul 14 2000 Owen Taylor +- Remove glib-config.1 manpage from build since + it conflicts with glib-devel. When we go to + glib glib1.2 setup, we should add it back + +* Fri Jul 07 2000 Owen Taylor +- Version 1.3.1 +- Move back to standard %{prefix} + +* Thu Jun 8 2000 Owen Taylor +- Rebuild in /opt/gtk-beta + +* Tue May 30 2000 Owen Taylor +- New version (adds gobject) + +* Wed Apr 25 2000 Owen Taylor +- Don't blow away /etc/ld.so.conf (sorry!) + +* Tue Apr 24 2000 Owen Taylor +- Snapshot RPM for Pango testing + +* Fri Feb 04 2000 Owen Taylor +- Added fixes from stable branch of CVS + +* Thu Oct 7 1999 Owen Taylor +- version 1.2.6 + +* Fri Sep 24 1999 Owen Taylor +- version 1.2.5 + +* Fri Sep 17 1999 Owen Taylor +- version 1.2.4 + +* Mon Jun 7 1999 Owen Taylor +- version 1.2.3 + +* Thu Mar 25 1999 Michael Fulbright +- version 1.2.1 + +* Fri Feb 26 1999 Michael Fulbright +- Version 1.2 + +* Thu Feb 25 1999 Michael Fulbright +- version 1.2.0pre1 + +* Tue Feb 23 1999 Cristian Gafton +- new description tags + +* Sun Feb 21 1999 Michael Fulbright +- removed libtoolize from %build + +* Thu Feb 11 1999 Michael Fulbright +- added libgthread to file list + +* Fri Feb 05 1999 Michael Fulbright +- version 1.1.15 + +* Wed Feb 03 1999 Michael Fulbright +- version 1.1.14 + +* Mon Jan 18 1999 Michael Fulbright +- version 1.1.13 + +* Wed Jan 06 1999 Michael Fulbright +- version 1.1.12 + +* Wed Dec 16 1998 Michael Fulbright +- updated in preparation for the GNOME freeze + +* Mon Apr 13 1998 Marc Ewing +- Split out glib package + From svn at tinysofa.org Thu Jul 1 15:37:30 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:37:30 +1000 (EST) Subject: [tinysofa-svn] r2569 - in tinysofa/snapshot: . intltool intltool/current intltool/current/sources intltool/current/specs Message-ID: <20040701153730.C76FD4E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:37:30 +1000 (Fri, 02 Jul 2004) New Revision: 2569 Added: tinysofa/snapshot/intltool/ tinysofa/snapshot/intltool/current/ tinysofa/snapshot/intltool/current/sources/ tinysofa/snapshot/intltool/current/sources/intltool-0.30.tar.bz2 tinysofa/snapshot/intltool/current/specs/ tinysofa/snapshot/intltool/current/specs/intltool.spec Log: - Add intltool to snapshot from 2.0. Added: tinysofa/snapshot/intltool/current/sources/intltool-0.30.tar.bz2 =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/intltool/current/sources/intltool-0.30.tar.bz2 ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/intltool/current/specs/intltool.spec =================================================================== --- tinysofa/snapshot/intltool/current/specs/intltool.spec 2004-07-01 15:37:27 UTC (rev 2568) +++ tinysofa/snapshot/intltool/current/specs/intltool.spec 2004-07-01 15:37:30 UTC (rev 2569) @@ -0,0 +1,156 @@ +Name: intltool +Summary: Utility for internationalizing various kinds of data files. +Version: 0.30 +Release: 1ts +License: GPL +Group: Development/Tools +Source: %{name}-%{version}.tar.bz2 +URL: http://www.gnome.org +BuildRoot: %{_tmppath}/%{name}-%{version}-root +Requires: patch +Obsoletes: xml-i18n-tools +Provides: xml-i18n-tools = 0.11 +Requires: perl-XML-Parser + +%description +This tool automatically extracts translatable strings from oaf, glade, +bonobo ui, nautilus theme, .desktop, and other data files and puts +them in the po files. + +%prep +%setup -q + +%build +%configure + +make + +%install +[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT + +%makeinstall + +%clean +[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT + +%files +%defattr(-,root,root) +%doc AUTHORS COPYING ChangeLog NEWS README +%{_bindir}/* +%{_datadir}/intltool +%{_datadir}/aclocal/* +%{_mandir}/man*/* + +%changelog +* Fri Mar 12 2004 Alex Larsson 0.30-1 +- update to 0.30 + +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Mon Jan 19 2004 Jonathan Blandford 0.29-1 +- new version + +* Mon Aug 25 2003 Alexander Larsson 0.27.2-1 +- update + +* Mon Aug 11 2003 Havoc Pennington 0.27-1 +- 0.27 + +* Wed Jul 30 2003 Havoc Pennington 0.26-1 +- rebuild + +* Wed Jul 9 2003 Havoc Pennington 0.26-1 +- 0.26 + +* Wed Jun 04 2003 Elliot Lee +- rebuilt + +* Wed Jan 22 2003 Tim Powers +- rebuilt + +* Mon Jan 6 2003 Havoc Pennington +- 0.25 + +* Fri Nov 8 2002 Havoc Pennington +- 0.23 + +* Fri Jun 21 2002 Tim Powers +- automated rebuild + +* Sun Jun 09 2002 Havoc Pennington +- rebuild in different environment + +* Sun Jun 9 2002 Havoc Pennington +- 0.22 +- remove perl patch, perl is fixed + +* Thu Jun 6 2002 Nalin Dahyabhai +- tweak the perl5 check to not bomb with perl 5.8 + +* Thu May 23 2002 Tim Powers +- automated rebuild + +* Thu Apr 25 2002 Havoc Pennington +- rebuild in different environment + +* Thu Apr 4 2002 Jeremy Katz +- update to 0.18 + +* Thu Mar 14 2002 Jeremy Katz +- update to 0.17 + +* Thu Feb 21 2002 Jeremy Katz +- rebuild in new environment + +* Tue Feb 12 2002 Havoc Pennington +- 0.15 +- remove dbm patch, dbm no longer used upstream +- shorten summary line, #56739 + +* Wed Jan 30 2002 Owen Taylor +- Version 0.14 +- Try again on DBM fix +- Patch to use AnyDBM_File rather than NDBM_File for caching +- Version 0.14 + +* Wed Jan 09 2002 Tim Powers +- automated rebuild + +* Wed Jan 2 2002 Havoc Pennington +- 0.12.90 cvs snap + +* Mon Nov 26 2001 Havoc Pennington +- 0.12 tarball + +* Sun Oct 28 2001 Havoc Pennington +- new cvs snap, no longer noarch + +* Fri Oct 5 2001 Havoc Pennington +- intltool specfile, based on xml-i18n-tools (but fixed up) +- obsolete/provide xml-i18n-tools + +* Tue Aug 14 2001 Alexander Larsson 0.9-2 +- Require patch + +* Wed Aug 8 2001 Jonathan Blandford +- Fix bug #45699 and #50634 by upgrading version. + +* Mon Jul 16 2001 Trond Eivind Glomsr?d +- s/Copyright/License/ +- Shorter summary +- Remove empty post/postun scripts +- Don't define name and ver on the top and use this in the headers later + +* Tue Jul 10 2001 Tim Powers +- cleaned up files list so that there aren't non-standard dirs and so + that it owns the xml-i18n-tools dir + +* Tue Apr 17 2001 Jonathan Blandford +- Cleaned up spec file a little for Red Hat. + +* Mon Mar 01 2001 Maciej Stachowiak +- removed devel subpackage + +* Thu Jan 04 2000 Robin * Slomkowski +- created this thing From svn at tinysofa.org Thu Jul 1 15:37:32 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:37:32 +1000 (EST) Subject: [tinysofa-svn] r2570 - in tinysofa/snapshot: . ipsec-tools ipsec-tools/current ipsec-tools/current/sources ipsec-tools/current/specs Message-ID: <20040701153732.3A6174E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:37:31 +1000 (Fri, 02 Jul 2004) New Revision: 2570 Added: tinysofa/snapshot/ipsec-tools/ tinysofa/snapshot/ipsec-tools/current/ tinysofa/snapshot/ipsec-tools/current/sources/ tinysofa/snapshot/ipsec-tools/current/sources/ipsec-tools-0.2.4-racoon-dest.patch tinysofa/snapshot/ipsec-tools/current/sources/ipsec-tools-0.2.5.tar.gz tinysofa/snapshot/ipsec-tools/current/sources/ipsec.h tinysofa/snapshot/ipsec-tools/current/sources/isakmp.c.diff tinysofa/snapshot/ipsec-tools/current/sources/pfkeyv2.h tinysofa/snapshot/ipsec-tools/current/sources/psk.txt tinysofa/snapshot/ipsec-tools/current/sources/racoon.conf tinysofa/snapshot/ipsec-tools/current/sources/xfrm.h tinysofa/snapshot/ipsec-tools/current/specs/ tinysofa/snapshot/ipsec-tools/current/specs/ipsec-tools.spec Log: - Add ipsec-tools to snapshot from 2.0. Added: tinysofa/snapshot/ipsec-tools/current/sources/ipsec-tools-0.2.4-racoon-dest.patch =================================================================== --- tinysofa/snapshot/ipsec-tools/current/sources/ipsec-tools-0.2.4-racoon-dest.patch 2004-07-01 15:37:30 UTC (rev 2569) +++ tinysofa/snapshot/ipsec-tools/current/sources/ipsec-tools-0.2.4-racoon-dest.patch 2004-07-01 15:37:31 UTC (rev 2570) @@ -0,0 +1,12 @@ +--- ipsec-tools-0.2.4/src/racoon/Makefile.in.old 2004-02-20 19:15:50.101680296 +0200 ++++ ipsec-tools-0.2.4/src/racoon/Makefile.in 2004-02-20 19:18:02.397015897 +0200 +@@ -92,7 +92,8 @@ + + install: + -mkdir -p $(DESTDIR)$(sbindir) +- $(INSTALL) -s $(INSTALL_OPTS) -m 555 racoon $(DESTDIR)$(sbindir) ++ $(INSTALL) -s $(INSTALL_OPTS) -m 755 racoon $(DESTDIR)$(prefix)/sbin/ ++ $(INSTALL) -s $(INSTALL_OPTS) -m 755 racoonctl $(DESTDIR)$(prefix)/sbin/ + -mkdir -p $(DESTDIR)$(mandir)/man8/ + $(INSTALL) $(INSTALL_OPTS) -m 444 $(srcdir)/racoon.8 $(DESTDIR)$(mandir)/man8 + -mkdir -p $(DESTDIR)$(mandir)/man5/ Added: tinysofa/snapshot/ipsec-tools/current/sources/ipsec-tools-0.2.5.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/ipsec-tools/current/sources/ipsec-tools-0.2.5.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/ipsec-tools/current/sources/ipsec.h =================================================================== --- tinysofa/snapshot/ipsec-tools/current/sources/ipsec.h 2004-07-01 15:37:30 UTC (rev 2569) +++ tinysofa/snapshot/ipsec-tools/current/sources/ipsec.h 2004-07-01 15:37:31 UTC (rev 2570) @@ -0,0 +1,46 @@ +#ifndef _LINUX_IPSEC_H +#define _LINUX_IPSEC_H + +/* The definitions, required to talk to KAME racoon IKE. */ + +#include + +#define IPSEC_PORT_ANY 0 +#define IPSEC_ULPROTO_ANY 255 +#define IPSEC_PROTO_ANY 255 + +enum { + IPSEC_MODE_ANY = 0, /* We do not support this for SA */ + IPSEC_MODE_TRANSPORT = 1, + IPSEC_MODE_TUNNEL = 2 +}; + +enum { + IPSEC_DIR_ANY = 0, + IPSEC_DIR_INBOUND = 1, + IPSEC_DIR_OUTBOUND = 2, + IPSEC_DIR_FWD = 3, /* It is our own */ + IPSEC_DIR_MAX = 4, + IPSEC_DIR_INVALID = 5 +}; + +enum { + IPSEC_POLICY_DISCARD = 0, + IPSEC_POLICY_NONE = 1, + IPSEC_POLICY_IPSEC = 2, + IPSEC_POLICY_ENTRUST = 3, + IPSEC_POLICY_BYPASS = 4 +}; + +enum { + IPSEC_LEVEL_DEFAULT = 0, + IPSEC_LEVEL_USE = 1, + IPSEC_LEVEL_REQUIRE = 2, + IPSEC_LEVEL_UNIQUE = 3 +}; + +#define IPSEC_MANUAL_REQID_MAX 0x3fff + +#define IPSEC_REPLAYWSIZE 32 + +#endif /* _LINUX_IPSEC_H */ Added: tinysofa/snapshot/ipsec-tools/current/sources/isakmp.c.diff =================================================================== --- tinysofa/snapshot/ipsec-tools/current/sources/isakmp.c.diff 2004-07-01 15:37:30 UTC (rev 2569) +++ tinysofa/snapshot/ipsec-tools/current/sources/isakmp.c.diff 2004-07-01 15:37:31 UTC (rev 2570) @@ -0,0 +1,21 @@ +--- ipsec-tools/src/racoon/isakmp.c 2004/03/03 05:39:58 1.180 ++++ ipsec-tools/src/racoon/isakmp.c 2004/03/31 03:14:39 1.181 +@@ -181,6 +181,18 @@ isakmp_handler(so_isakmp) + plog(LLV_ERROR, LOCATION, (struct sockaddr *)&remote, + "packet shorter than isakmp header size.\n"); + /* dummy receive */ ++ if ((len = recvfrom(so_isakmp, (char *)&isakmp, sizeof(isakmp), ++ 0, (struct sockaddr *)&remote, &remote_len)) < 0) { ++ plog(LLV_ERROR, LOCATION, NULL, ++ "failed to receive isakmp packet\n"); ++ } ++ goto end; ++ } ++ ++ /* reject it if the size is tooooo big. */ ++ if (ntohl(isakmp.len) > 0xffff) { ++ plog(LLV_ERROR, LOCATION, NULL, ++ "the length of the isakmp header is too big.\n"); + if ((len = recvfrom(so_isakmp, (char *)&isakmp, sizeof(isakmp), + 0, (struct sockaddr *)&remote, &remote_len)) < 0) { + plog(LLV_ERROR, LOCATION, NULL, Added: tinysofa/snapshot/ipsec-tools/current/sources/pfkeyv2.h =================================================================== --- tinysofa/snapshot/ipsec-tools/current/sources/pfkeyv2.h 2004-07-01 15:37:30 UTC (rev 2569) +++ tinysofa/snapshot/ipsec-tools/current/sources/pfkeyv2.h 2004-07-01 15:37:31 UTC (rev 2570) @@ -0,0 +1,332 @@ +/* PF_KEY user interface, this is defined by rfc2367 so + * do not make arbitrary modifications or else this header + * file will not be compliant. + */ + +#ifndef _LINUX_PFKEY2_H +#define _LINUX_PFKEY2_H + +#include + +#define PF_KEY_V2 2 +#define PFKEYV2_REVISION 199806L + +struct sadb_msg { + uint8_t sadb_msg_version; + uint8_t sadb_msg_type; + uint8_t sadb_msg_errno; + uint8_t sadb_msg_satype; + uint16_t sadb_msg_len; + uint16_t sadb_msg_reserved; + uint32_t sadb_msg_seq; + uint32_t sadb_msg_pid; +} __attribute__((packed)); +/* sizeof(struct sadb_msg) == 16 */ + +struct sadb_ext { + uint16_t sadb_ext_len; + uint16_t sadb_ext_type; +} __attribute__((packed)); +/* sizeof(struct sadb_ext) == 4 */ + +struct sadb_sa { + uint16_t sadb_sa_len; + uint16_t sadb_sa_exttype; + uint32_t sadb_sa_spi; + uint8_t sadb_sa_replay; + uint8_t sadb_sa_state; + uint8_t sadb_sa_auth; + uint8_t sadb_sa_encrypt; + uint32_t sadb_sa_flags; +} __attribute__((packed)); +/* sizeof(struct sadb_sa) == 16 */ + +struct sadb_lifetime { + uint16_t sadb_lifetime_len; + uint16_t sadb_lifetime_exttype; + uint32_t sadb_lifetime_allocations; + uint64_t sadb_lifetime_bytes; + uint64_t sadb_lifetime_addtime; + uint64_t sadb_lifetime_usetime; +} __attribute__((packed)); +/* sizeof(struct sadb_lifetime) == 32 */ + +struct sadb_address { + uint16_t sadb_address_len; + uint16_t sadb_address_exttype; + uint8_t sadb_address_proto; + uint8_t sadb_address_prefixlen; + uint16_t sadb_address_reserved; +} __attribute__((packed)); +/* sizeof(struct sadb_address) == 8 */ + +struct sadb_key { + uint16_t sadb_key_len; + uint16_t sadb_key_exttype; + uint16_t sadb_key_bits; + uint16_t sadb_key_reserved; +} __attribute__((packed)); +/* sizeof(struct sadb_key) == 8 */ + +struct sadb_ident { + uint16_t sadb_ident_len; + uint16_t sadb_ident_exttype; + uint16_t sadb_ident_type; + uint16_t sadb_ident_reserved; + uint64_t sadb_ident_id; +} __attribute__((packed)); +/* sizeof(struct sadb_ident) == 16 */ + +struct sadb_sens { + uint16_t sadb_sens_len; + uint16_t sadb_sens_exttype; + uint32_t sadb_sens_dpd; + uint8_t sadb_sens_sens_level; + uint8_t sadb_sens_sens_len; + uint8_t sadb_sens_integ_level; + uint8_t sadb_sens_integ_len; + uint32_t sadb_sens_reserved; +} __attribute__((packed)); +/* sizeof(struct sadb_sens) == 16 */ + +/* followed by: + uint64_t sadb_sens_bitmap[sens_len]; + uint64_t sadb_integ_bitmap[integ_len]; */ + +struct sadb_prop { + uint16_t sadb_prop_len; + uint16_t sadb_prop_exttype; + uint8_t sadb_prop_replay; + uint8_t sadb_prop_reserved[3]; +} __attribute__((packed)); +/* sizeof(struct sadb_prop) == 8 */ + +/* followed by: + struct sadb_comb sadb_combs[(sadb_prop_len + + sizeof(uint64_t) - sizeof(struct sadb_prop)) / + sizeof(strut sadb_comb)]; */ + +struct sadb_comb { + uint8_t sadb_comb_auth; + uint8_t sadb_comb_encrypt; + uint16_t sadb_comb_flags; + uint16_t sadb_comb_auth_minbits; + uint16_t sadb_comb_auth_maxbits; + uint16_t sadb_comb_encrypt_minbits; + uint16_t sadb_comb_encrypt_maxbits; + uint32_t sadb_comb_reserved; + uint32_t sadb_comb_soft_allocations; + uint32_t sadb_comb_hard_allocations; + uint64_t sadb_comb_soft_bytes; + uint64_t sadb_comb_hard_bytes; + uint64_t sadb_comb_soft_addtime; + uint64_t sadb_comb_hard_addtime; + uint64_t sadb_comb_soft_usetime; + uint64_t sadb_comb_hard_usetime; +} __attribute__((packed)); +/* sizeof(struct sadb_comb) == 72 */ + +struct sadb_supported { + uint16_t sadb_supported_len; + uint16_t sadb_supported_exttype; + uint32_t sadb_supported_reserved; +} __attribute__((packed)); +/* sizeof(struct sadb_supported) == 8 */ + +/* followed by: + struct sadb_alg sadb_algs[(sadb_supported_len + + sizeof(uint64_t) - sizeof(struct sadb_supported)) / + sizeof(struct sadb_alg)]; */ + +struct sadb_alg { + uint8_t sadb_alg_id; + uint8_t sadb_alg_ivlen; + uint16_t sadb_alg_minbits; + uint16_t sadb_alg_maxbits; + uint16_t sadb_alg_reserved; +} __attribute__((packed)); +/* sizeof(struct sadb_alg) == 8 */ + +struct sadb_spirange { + uint16_t sadb_spirange_len; + uint16_t sadb_spirange_exttype; + uint32_t sadb_spirange_min; + uint32_t sadb_spirange_max; + uint32_t sadb_spirange_reserved; +} __attribute__((packed)); +/* sizeof(struct sadb_spirange) == 16 */ + +struct sadb_x_kmprivate { + uint16_t sadb_x_kmprivate_len; + uint16_t sadb_x_kmprivate_exttype; + u_int32_t sadb_x_kmprivate_reserved; +} __attribute__((packed)); +/* sizeof(struct sadb_x_kmprivate) == 8 */ + +struct sadb_x_sa2 { + uint16_t sadb_x_sa2_len; + uint16_t sadb_x_sa2_exttype; + uint8_t sadb_x_sa2_mode; + uint8_t sadb_x_sa2_reserved1; + uint16_t sadb_x_sa2_reserved2; + uint32_t sadb_x_sa2_sequence; + uint32_t sadb_x_sa2_reqid; +} __attribute__((packed)); +/* sizeof(struct sadb_x_sa2) == 16 */ + +struct sadb_x_policy { + uint16_t sadb_x_policy_len; + uint16_t sadb_x_policy_exttype; + uint16_t sadb_x_policy_type; + uint8_t sadb_x_policy_dir; + uint8_t sadb_x_policy_reserved; + uint32_t sadb_x_policy_id; + uint32_t sadb_x_policy_reserved2; +} __attribute__((packed)); +/* sizeof(struct sadb_x_policy) == 16 */ + +struct sadb_x_ipsecrequest { + uint16_t sadb_x_ipsecrequest_len; + uint16_t sadb_x_ipsecrequest_proto; + uint8_t sadb_x_ipsecrequest_mode; + uint8_t sadb_x_ipsecrequest_level; + uint16_t sadb_x_ipsecrequest_reserved1; + uint32_t sadb_x_ipsecrequest_reqid; + uint32_t sadb_x_ipsecrequest_reserved2; +} __attribute__((packed)); +/* sizeof(struct sadb_x_ipsecrequest) == 16 */ + +/* This defines the TYPE of Nat Traversal in use. Currently only one + * type of NAT-T is supported, draft-ietf-ipsec-udp-encaps-06 + */ +struct sadb_x_nat_t_type { + uint16_t sadb_x_nat_t_type_len; + uint16_t sadb_x_nat_t_type_exttype; + uint8_t sadb_x_nat_t_type_type; + uint8_t sadb_x_nat_t_type_reserved[3]; +} __attribute__((packed)); +/* sizeof(struct sadb_x_nat_t_type) == 8 */ + +/* Pass a NAT Traversal port (Source or Dest port) */ +struct sadb_x_nat_t_port { + uint16_t sadb_x_nat_t_port_len; + uint16_t sadb_x_nat_t_port_exttype; + uint16_t sadb_x_nat_t_port_port; + uint16_t sadb_x_nat_t_port_reserved; +} __attribute__((packed)); +/* sizeof(struct sadb_x_nat_t_port) == 8 */ + +/* Message types */ +#define SADB_RESERVED 0 +#define SADB_GETSPI 1 +#define SADB_UPDATE 2 +#define SADB_ADD 3 +#define SADB_DELETE 4 +#define SADB_GET 5 +#define SADB_ACQUIRE 6 +#define SADB_REGISTER 7 +#define SADB_EXPIRE 8 +#define SADB_FLUSH 9 +#define SADB_DUMP 10 +#define SADB_X_PROMISC 11 +#define SADB_X_PCHANGE 12 +#define SADB_X_SPDUPDATE 13 +#define SADB_X_SPDADD 14 +#define SADB_X_SPDDELETE 15 +#define SADB_X_SPDGET 16 +#define SADB_X_SPDACQUIRE 17 +#define SADB_X_SPDDUMP 18 +#define SADB_X_SPDFLUSH 19 +#define SADB_X_SPDSETIDX 20 +#define SADB_X_SPDEXPIRE 21 +#define SADB_X_SPDDELETE2 22 +#define SADB_X_NAT_T_NEW_MAPPING 23 +#define SADB_MAX 23 + +/* Security Association flags */ +#define SADB_SAFLAGS_PFS 1 +#define SADB_SAFLAGS_NOECN 0x80000000 + +/* Security Association states */ +#define SADB_SASTATE_LARVAL 0 +#define SADB_SASTATE_MATURE 1 +#define SADB_SASTATE_DYING 2 +#define SADB_SASTATE_DEAD 3 +#define SADB_SASTATE_MAX 3 + +/* Security Association types */ +#define SADB_SATYPE_UNSPEC 0 +#define SADB_SATYPE_AH 2 +#define SADB_SATYPE_ESP 3 +#define SADB_SATYPE_RSVP 5 +#define SADB_SATYPE_OSPFV2 6 +#define SADB_SATYPE_RIPV2 7 +#define SADB_SATYPE_MIP 8 +#define SADB_X_SATYPE_IPCOMP 9 +#define SADB_SATYPE_MAX 9 + +/* Authentication algorithms */ +#define SADB_AALG_NONE 0 +#define SADB_AALG_MD5HMAC 2 +#define SADB_AALG_SHA1HMAC 3 +#define SADB_X_AALG_SHA2_256HMAC 5 +#define SADB_X_AALG_SHA2_384HMAC 6 +#define SADB_X_AALG_SHA2_512HMAC 7 +#define SADB_X_AALG_RIPEMD160HMAC 8 +#define SADB_X_AALG_NULL 251 /* kame */ +#define SADB_AALG_MAX 251 + +/* Encryption algorithms */ +#define SADB_EALG_NONE 0 +#define SADB_EALG_DESCBC 2 +#define SADB_EALG_3DESCBC 3 +#define SADB_X_EALG_CASTCBC 6 +#define SADB_X_EALG_BLOWFISHCBC 7 +#define SADB_EALG_NULL 11 +#define SADB_X_EALG_AESCBC 12 +#define SADB_EALG_MAX 12 + +/* Compression algorithms */ +#define SADB_X_CALG_NONE 0 +#define SADB_X_CALG_OUI 1 +#define SADB_X_CALG_DEFLATE 2 +#define SADB_X_CALG_LZS 3 +#define SADB_X_CALG_LZJH 4 +#define SADB_X_CALG_MAX 4 + +/* Extension Header values */ +#define SADB_EXT_RESERVED 0 +#define SADB_EXT_SA 1 +#define SADB_EXT_LIFETIME_CURRENT 2 +#define SADB_EXT_LIFETIME_HARD 3 +#define SADB_EXT_LIFETIME_SOFT 4 +#define SADB_EXT_ADDRESS_SRC 5 +#define SADB_EXT_ADDRESS_DST 6 +#define SADB_EXT_ADDRESS_PROXY 7 +#define SADB_EXT_KEY_AUTH 8 +#define SADB_EXT_KEY_ENCRYPT 9 +#define SADB_EXT_IDENTITY_SRC 10 +#define SADB_EXT_IDENTITY_DST 11 +#define SADB_EXT_SENSITIVITY 12 +#define SADB_EXT_PROPOSAL 13 +#define SADB_EXT_SUPPORTED_AUTH 14 +#define SADB_EXT_SUPPORTED_ENCRYPT 15 +#define SADB_EXT_SPIRANGE 16 +#define SADB_X_EXT_KMPRIVATE 17 +#define SADB_X_EXT_POLICY 18 +#define SADB_X_EXT_SA2 19 +/* The next four entries are for setting up NAT Traversal */ +#define SADB_X_EXT_NAT_T_TYPE 20 +#define SADB_X_EXT_NAT_T_SPORT 21 +#define SADB_X_EXT_NAT_T_DPORT 22 +#define SADB_X_EXT_NAT_T_OA 23 +#define SADB_EXT_MAX 23 + +/* Identity Extension values */ +#define SADB_IDENTTYPE_RESERVED 0 +#define SADB_IDENTTYPE_PREFIX 1 +#define SADB_IDENTTYPE_FQDN 2 +#define SADB_IDENTTYPE_USERFQDN 3 +#define SADB_IDENTTYPE_MAX 3 + +#endif /* !(_LINUX_PFKEY2_H) */ Added: tinysofa/snapshot/ipsec-tools/current/sources/psk.txt =================================================================== --- tinysofa/snapshot/ipsec-tools/current/sources/psk.txt 2004-07-01 15:37:30 UTC (rev 2569) +++ tinysofa/snapshot/ipsec-tools/current/sources/psk.txt 2004-07-01 15:37:31 UTC (rev 2570) @@ -0,0 +1,7 @@ +# file for pre-shared keys used for IKE authentication +# format is: 'identifier' 'key' +# For example: +# +# 10.1.1.1 flibbertigibbet +# www.example.com 12345 +# foo at www.example.com micropachycephalosaurus Added: tinysofa/snapshot/ipsec-tools/current/sources/racoon.conf =================================================================== --- tinysofa/snapshot/ipsec-tools/current/sources/racoon.conf 2004-07-01 15:37:30 UTC (rev 2569) +++ tinysofa/snapshot/ipsec-tools/current/sources/racoon.conf 2004-07-01 15:37:31 UTC (rev 2570) @@ -0,0 +1,16 @@ + +# Racoon IKE daemon configuration file. +# See 'man racoon.conf' for a description of the format and entries. + +path include "/etc/racoon"; +path pre_shared_key "/etc/racoon/psk.txt"; +path certificate "/etc/racoon/certs"; + +sainfo anonymous +{ + pfs_group 2; + lifetime time 1 hour ; + encryption_algorithm 3des, blowfish 448, rijndael ; + authentication_algorithm hmac_sha1, hmac_md5 ; + compression_algorithm deflate ; +} Added: tinysofa/snapshot/ipsec-tools/current/sources/xfrm.h =================================================================== --- tinysofa/snapshot/ipsec-tools/current/sources/xfrm.h 2004-07-01 15:37:30 UTC (rev 2569) +++ tinysofa/snapshot/ipsec-tools/current/sources/xfrm.h 2004-07-01 15:37:31 UTC (rev 2570) @@ -0,0 +1,232 @@ +#ifndef _LINUX_XFRM_H +#define _LINUX_XFRM_H + +#include + +/* All of the structures in this file may not change size as they are + * passed into the kernel from userspace via netlink sockets. + */ + +/* Structure to encapsulate addresses. I do not want to use + * "standard" structure. My apologies. + */ +typedef union +{ + __u32 a4; + __u32 a6[4]; +} xfrm_address_t; + +/* Ident of a specific xfrm_state. It is used on input to lookup + * the state by (spi,daddr,ah/esp) or to store information about + * spi, protocol and tunnel address on output. + */ +struct xfrm_id +{ + xfrm_address_t daddr; + __u32 spi; + __u8 proto; +}; + +/* Selector, used as selector both on policy rules (SPD) and SAs. */ + +struct xfrm_selector +{ + xfrm_address_t daddr; + xfrm_address_t saddr; + __u16 dport; + __u16 dport_mask; + __u16 sport; + __u16 sport_mask; + __u8 prefixlen_d; + __u8 prefixlen_s; + __u8 proto; + int ifindex; + uid_t user; +}; + +#define XFRM_INF (~(__u64)0) + +struct xfrm_lifetime_cfg +{ + __u64 soft_byte_limit; + __u64 hard_byte_limit; + __u64 soft_packet_limit; + __u64 hard_packet_limit; + __u64 soft_add_expires_seconds; + __u64 hard_add_expires_seconds; + __u64 soft_use_expires_seconds; + __u64 hard_use_expires_seconds; +}; + +struct xfrm_lifetime_cur +{ + __u64 bytes; + __u64 packets; + __u64 add_time; + __u64 use_time; +}; + +struct xfrm_replay_state +{ + __u32 oseq; + __u32 seq; + __u32 bitmap; +}; + +struct xfrm_algo { + char alg_name[64]; + int alg_key_len; /* in bits */ + char alg_key[0]; +}; + +struct xfrm_stats { + __u32 replay_window; + __u32 replay; + __u32 integrity_failed; +}; + +enum +{ + XFRM_POLICY_IN = 0, + XFRM_POLICY_OUT = 1, + XFRM_POLICY_FWD = 2, + XFRM_POLICY_MAX = 3 +}; + +enum +{ + XFRM_SHARE_ANY, /* No limitations */ + XFRM_SHARE_SESSION, /* For this session only */ + XFRM_SHARE_USER, /* For this user only */ + XFRM_SHARE_UNIQUE /* Use once */ +}; + +/* Netlink configuration messages. */ +#define XFRM_MSG_BASE 0x10 + +#define XFRM_MSG_NEWSA (XFRM_MSG_BASE + 0) +#define XFRM_MSG_DELSA (XFRM_MSG_BASE + 1) +#define XFRM_MSG_GETSA (XFRM_MSG_BASE + 2) + +#define XFRM_MSG_NEWPOLICY (XFRM_MSG_BASE + 3) +#define XFRM_MSG_DELPOLICY (XFRM_MSG_BASE + 4) +#define XFRM_MSG_GETPOLICY (XFRM_MSG_BASE + 5) + +#define XFRM_MSG_ALLOCSPI (XFRM_MSG_BASE + 6) +#define XFRM_MSG_ACQUIRE (XFRM_MSG_BASE + 7) +#define XFRM_MSG_EXPIRE (XFRM_MSG_BASE + 8) + +#define XFRM_MSG_UPDPOLICY (XFRM_MSG_BASE + 9) +#define XFRM_MSG_UPDSA (XFRM_MSG_BASE + 10) + +#define XFRM_MSG_POLEXPIRE (XFRM_MSG_BASE + 11) + +#define XFRM_MSG_MAX (XFRM_MSG_POLEXPIRE+1) + +struct xfrm_user_tmpl { + struct xfrm_id id; + xfrm_address_t saddr; + __u32 reqid; + __u8 mode; + __u8 share; + __u8 optional; + __u32 aalgos; + __u32 ealgos; + __u32 calgos; +}; + +struct xfrm_encap_tmpl { + __u16 encap_type; + __u16 encap_sport; + __u16 encap_dport; + xfrm_address_t encap_oa; +}; + +/* Netlink message attributes. */ +enum xfrm_attr_type_t { + XFRMA_UNSPEC, + XFRMA_ALG_AUTH, /* struct xfrm_algo */ + XFRMA_ALG_CRYPT, /* struct xfrm_algo */ + XFRMA_ALG_COMP, /* struct xfrm_algo */ + XFRMA_ENCAP, /* struct xfrm_algo + struct xfrm_encap_tmpl */ + XFRMA_TMPL, /* 1 or more struct xfrm_user_tmpl */ + +#define XFRMA_MAX XFRMA_TMPL +}; + +struct xfrm_usersa_info { + struct xfrm_selector sel; + struct xfrm_id id; + xfrm_address_t saddr; + struct xfrm_lifetime_cfg lft; + struct xfrm_lifetime_cur curlft; + struct xfrm_stats stats; + __u32 seq; + __u32 reqid; + __u16 family; + __u8 mode; /* 0=transport,1=tunnel */ + __u8 replay_window; + __u8 flags; +#define XFRM_STATE_NOECN 1 +}; + +struct xfrm_usersa_id { + xfrm_address_t daddr; + __u32 spi; + __u16 family; + __u8 proto; +}; + +struct xfrm_userspi_info { + struct xfrm_usersa_info info; + __u32 min; + __u32 max; +}; + +struct xfrm_userpolicy_info { + struct xfrm_selector sel; + struct xfrm_lifetime_cfg lft; + struct xfrm_lifetime_cur curlft; + __u32 priority; + __u32 index; + __u16 family; + __u8 dir; + __u8 action; +#define XFRM_POLICY_ALLOW 0 +#define XFRM_POLICY_BLOCK 1 + __u8 flags; +#define XFRM_POLICY_LOCALOK 1 /* Allow user to override global policy */ + __u8 share; +}; + +struct xfrm_userpolicy_id { + struct xfrm_selector sel; + __u32 index; + __u8 dir; +}; + +struct xfrm_user_acquire { + struct xfrm_id id; + xfrm_address_t saddr; + struct xfrm_selector sel; + struct xfrm_userpolicy_info policy; + __u32 aalgos; + __u32 ealgos; + __u32 calgos; + __u32 seq; +}; + +struct xfrm_user_expire { + struct xfrm_usersa_info state; + __u8 hard; +}; + +struct xfrm_user_polexpire { + struct xfrm_userpolicy_info pol; + __u8 hard; +}; + +#define XFRMGRP_ACQUIRE 1 +#define XFRMGRP_EXPIRE 2 + +#endif /* _LINUX_XFRM_H */ Added: tinysofa/snapshot/ipsec-tools/current/specs/ipsec-tools.spec =================================================================== --- tinysofa/snapshot/ipsec-tools/current/specs/ipsec-tools.spec 2004-07-01 15:37:30 UTC (rev 2569) +++ tinysofa/snapshot/ipsec-tools/current/specs/ipsec-tools.spec 2004-07-01 15:37:31 UTC (rev 2570) @@ -0,0 +1,129 @@ +Name: ipsec-tools +Version: 0.2.5 +Release: 3ts +Summary: Tools for configuring and using IPSEC +License: BSD +Group: System Environment/Base +URL: http://ipsec-tools.sourceforge.net/ +Source: http://prdownload.sourceforge.net/ipsec-tools/ipsec-tools-%{version}.tar.gz +Source1: ipsec.h +Source2: pfkeyv2.h +Source3: racoon.conf +Source4: psk.txt +Source5: xfrm.h +Patch: ipsec-tools-0.2.4-racoon-dest.patch +Patch2: isakmp.c.diff +BuildPrereq: openssl-devel, krb5-devel +BuildRoot: %{_tmppath}/%{name}-%{version}-root +Requires: initscripts >= 7.31.11.EL-1 + +%description +This is the IPsec-Tools package. You need this package in order to +really use the IPsec functionality in the linux-2.5+ kernels. This +package builds: + + - libipsec, a PFKeyV2 library + - setkey, a program to directly manipulate policies and SAs + - racoon, an IKEv1 keying daemon + +%prep +%setup -q +%patch -p1 +%patch2 -p1 + +mkdir -p kernel-headers/linux +cp %{SOURCE1} %{SOURCE2} %{SOURCE5} kernel-headers/linux + +%build +CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --exec-prefix=/ \ + --libdir=/%{_lib} \ + --sysconfdir=/etc \ + --mandir=%{_mandir} \ + --with-kernel-headers=`pwd`/kernel-headers +make + +%install +rm -rf $RPM_BUILD_ROOT +mkdir -p $RPM_BUILD_ROOT/usr/sbin +make install DESTDIR=$RPM_BUILD_ROOT +# no devel stuff for now +rm -rf $RPM_BUILD_ROOT/%{_lib}/libipsec.{a,la} \ + $RPM_BUILD_ROOT/%{_includedir} \ + $RPM_BUILD_ROOT/%{_mandir}/man3 + +rm -f $RPM_BUILD_ROOT/etc/racoon/{psk.txt,psk.txt.dist,racoon.conf,racoon.conf.dist} +install -m 600 %{SOURCE3} \ + $RPM_BUILD_ROOT/etc/racoon/racoon.conf +install -m 600 %{SOURCE4} \ + $RPM_BUILD_ROOT/etc/racoon/psk.txt + + + +mkdir -m 0700 -p $RPM_BUILD_ROOT/etc/racoon/certs + +%clean +rm -rf $RPM_BUILD_ROOT + +%post -p /sbin/ldconfig + +%postun -p /sbin/ldconfig + +%files +%defattr(-,root,root) +%doc src/racoon/samples/racoon.conf src/racoon/samples/psk.txt +%doc src/racoon/doc/FAQ +%doc ChangeLog NEWS README +/%{_lib}/* +/sbin/* +%{_sbindir}/* +%{_mandir}/man*/* +%dir /etc/racoon +%dir /etc/racoon/certs +%config(noreplace) /etc/racoon/psk.txt +%config(noreplace) /etc/racoon/racoon.conf + +%changelog +* Tue Jun 15 2004 Elliot Lee +- rebuilt + +* Wed Apr 14 2004 Bill Nottingham - 0.2.5-2 +- add patch for potential remote DoS (CAN-2004-0403) + +* Tue Apr 6 2004 Bill Nottingham +- update to 0.2.5 + +* Tue Mar 02 2004 Elliot Lee +- rebuilt + +* Mon Feb 23 2004 Bill Nottingham +- update to 0.2.4, fix racoon install location (#116374, ) + +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Mon Dec 8 2003 Bill Nottingham 0.2.2-8 +- rebuild + +* Fri Aug 29 2003 Bill Nottingham 0.2.2-7 +- add fix for #103238 + +* Tue Aug 5 2003 Bill Nottingham 0.2.2-6 +- update kernel interface bits, rebuild against them + +* Tue Jul 29 2003 Bill Nottingham 0.2.2-5 +- rebuild + +* Wed Jul 2 2003 Bill Notitngham 0.2.2-4 +- ship a much more pared-down racoon.conf and psk.txt + +* Thu Jun 5 2003 Bill Notitngham 0.2.2-3 +- update pfkey header for current kernels + +* Wed Jun 04 2003 Elliot Lee +- rebuilt + +* Fri May 2 2003 Bill Nottingham 0.2.2-1 +- update to 0.2.2 + +* Fri Mar 7 2003 Bill Nottingham +- initial build From svn at tinysofa.org Thu Jul 1 15:37:33 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:37:33 +1000 (EST) Subject: [tinysofa-svn] r2571 - in tinysofa/snapshot: . irda-utils irda-utils/current irda-utils/current/sources irda-utils/current/specs Message-ID: <20040701153733.D36C74E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:37:33 +1000 (Fri, 02 Jul 2004) New Revision: 2571 Added: tinysofa/snapshot/irda-utils/ tinysofa/snapshot/irda-utils/current/ tinysofa/snapshot/irda-utils/current/sources/ tinysofa/snapshot/irda-utils/current/sources/irda-utils-0.9.13-i18n.patch tinysofa/snapshot/irda-utils/current/sources/irda-utils-0.9.14-chkconfig.patch tinysofa/snapshot/irda-utils/current/sources/irda-utils-0.9.14-typo.patch tinysofa/snapshot/irda-utils/current/sources/irda-utils-0.9.15-rh1.patch tinysofa/snapshot/irda-utils/current/sources/irda-utils-0.9.16-rootonly.patch tinysofa/snapshot/irda-utils/current/sources/irda-utils-0.9.16.tar.gz tinysofa/snapshot/irda-utils/current/specs/ tinysofa/snapshot/irda-utils/current/specs/irda-utils.spec Log: - Add irda-utils to snapshot from 2.0. Added: tinysofa/snapshot/irda-utils/current/sources/irda-utils-0.9.13-i18n.patch =================================================================== --- tinysofa/snapshot/irda-utils/current/sources/irda-utils-0.9.13-i18n.patch 2004-07-01 15:37:31 UTC (rev 2570) +++ tinysofa/snapshot/irda-utils/current/sources/irda-utils-0.9.13-i18n.patch 2004-07-01 15:37:33 UTC (rev 2571) @@ -0,0 +1,33 @@ +--- irda-utils-0.9.13/etc/irda.rc.i18n Thu Feb 8 14:04:06 2001 ++++ irda-utils-0.9.13/etc/irda.rc Thu Feb 8 14:05:26 2001 +@@ -13,10 +13,11 @@ + # Source IrDA networking configuration. + . /etc/sysconfig/irda + ++prog="IrDA" + + start() { + # Attach irda device +- echo -n "Starting IrDA: " ++ echo -n $"Starting $prog: " + daemon /usr/sbin/irattach ${DEVICE} ${ARGS} + touch /var/lock/subsys/irda + echo +@@ -24,7 +25,7 @@ + + stop() { + # Stop service. +- echo -n "Shutting down IrDA: " ++ echo -n $"Shutting down $prog: " + killproc irattach + rm -f /var/lock/subsys/irda + echo +@@ -62,7 +63,7 @@ + [ -e /var/lock/subsys/irda ] && (stop; start) + ;; + *) +- echo "Usage: irda {start|stop|restart|reload|condrestart|status}" ++ echo $"Usage: $0 {start|stop|restart|reload|condrestart|status}" + exit 1 + esac + Added: tinysofa/snapshot/irda-utils/current/sources/irda-utils-0.9.14-chkconfig.patch =================================================================== --- tinysofa/snapshot/irda-utils/current/sources/irda-utils-0.9.14-chkconfig.patch 2004-07-01 15:37:31 UTC (rev 2570) +++ tinysofa/snapshot/irda-utils/current/sources/irda-utils-0.9.14-chkconfig.patch 2004-07-01 15:37:33 UTC (rev 2571) @@ -0,0 +1,87 @@ +--- irda-utils-0.9.14/etc/irda.rc.chkconfig Sun Jan 14 23:12:56 2001 ++++ irda-utils-0.9.14/etc/irda.rc Tue Apr 24 15:43:33 2001 +@@ -3,8 +3,7 @@ + # irda This shell script takes care of starting and stopping + # IrDA support + # +-# chkconfig: 2345 45 96 +-# ++# chkconfig: - 45 24 + # description: IrDA stack for Linux + # + +@@ -14,6 +13,23 @@ + # Source IrDA networking configuration. + . /etc/sysconfig/irda + ++ ++start() { ++ # Attach irda device ++ echo -n "Starting IrDA: " ++ daemon /usr/sbin/irattach ${DEVICE} ${ARGS} ++ touch /var/lock/subsys/irda ++ echo ++} ++ ++stop() { ++ # Stop service. ++ echo -n "Shutting down IrDA: " ++ killproc irattach ++ rm -f /var/lock/subsys/irda ++ echo ++} ++ + # Check that irda is up. + [ ${IRDA} = "no" ] && exit 0 + +@@ -30,28 +46,23 @@ + # See how we were called. + case "$1" in + start) +- # Attach irda device +- echo -n "Starting IrDA: " +- daemon /usr/sbin/irattach ${DEVICE} ${ARGS} +- touch /var/lock/subsys/irda +- echo ++ start + ;; + stop) +- # Stop service. +- echo -n "Shutting down IrDA: " +- killproc irattach +- rm -f /var/lock/subsys/irda +- echo ++ stop + ;; + status) + status irattach + ;; + restart|reload) +- $0 stop +- $0 start ++ stop ++ start ++ ;; ++ condrestart) ++ [ -e /var/lock/subsys/irda ] && (stop; start) + ;; + *) +- echo "Usage: irda {start|stop|restart|reload|status}" ++ echo "Usage: irda {start|stop|restart|reload|condrestart|status}" + exit 1 + esac + +--- irda-utils-0.9.14/etc/irda.rc.chkconfig 2002-12-16 14:01:23.000000000 -0500 ++++ irda-utils-0.9.14/etc/irda.rc 2002-12-16 13:56:11.000000000 -0500 +@@ -4,7 +4,10 @@ + # IrDA support + # + # chkconfig: - 45 24 +-# description: IrDA stack for Linux ++# description: IrDA(TM) (Infrared Data Association) is an industry standard \ ++# for wireless, infrared communication between devices. IrDA speeds range \ ++# from 9600 bps to 4 Mbps, and IrDA can be used by many modern devices \ ++# including laptops, LAN adapters, PDAs, printers, and mobile phones. + # + + # Source function library. Added: tinysofa/snapshot/irda-utils/current/sources/irda-utils-0.9.14-typo.patch =================================================================== --- tinysofa/snapshot/irda-utils/current/sources/irda-utils-0.9.14-typo.patch 2004-07-01 15:37:31 UTC (rev 2570) +++ tinysofa/snapshot/irda-utils/current/sources/irda-utils-0.9.14-typo.patch 2004-07-01 15:37:33 UTC (rev 2571) @@ -0,0 +1,11 @@ +--- irda-utils-0.9.14/etc/irda.rc.typo Tue Apr 24 15:44:12 2001 ++++ irda-utils-0.9.14/etc/irda.rc Tue Apr 24 15:45:17 2001 +@@ -36,7 +36,7 @@ + [ -f /usr/sbin/irattach ] || exit 0 + + ARGS= +-if [ $DONGLE ]; then ++if [ -n "$DONGLE" ]; then + ARGS="$ARGS -d $DONGLE" + fi + if [ "$DISCOVERY" = "yes" ];then Added: tinysofa/snapshot/irda-utils/current/sources/irda-utils-0.9.15-rh1.patch =================================================================== --- tinysofa/snapshot/irda-utils/current/sources/irda-utils-0.9.15-rh1.patch 2004-07-01 15:37:31 UTC (rev 2570) +++ tinysofa/snapshot/irda-utils/current/sources/irda-utils-0.9.15-rh1.patch 2004-07-01 15:37:33 UTC (rev 2571) @@ -0,0 +1,11 @@ +--- irda-utils-0.9.15/irattach/irattach.c.rh1 2003-11-24 17:30:21.000000000 +0100 ++++ irda-utils-0.9.15/irattach/irattach.c 2003-11-24 17:34:51.000000000 +0100 +@@ -614,7 +614,7 @@ + /* First arg is device name. Save it now, because in some cases + * getopt() will remove it... */ + strncpy(device, argv[1], 20); +- device[20] = '\0'; ++ device[19] = '\0'; + + /* Look for options */ + /* Do this before processing device, to handle "-h" and -v" Added: tinysofa/snapshot/irda-utils/current/sources/irda-utils-0.9.16-rootonly.patch =================================================================== --- tinysofa/snapshot/irda-utils/current/sources/irda-utils-0.9.16-rootonly.patch 2004-07-01 15:37:31 UTC (rev 2570) +++ tinysofa/snapshot/irda-utils/current/sources/irda-utils-0.9.16-rootonly.patch 2004-07-01 15:37:33 UTC (rev 2571) @@ -0,0 +1,14 @@ +--- irda-utils-0.9.16/irdadump/shell/main.c.root 2004-03-31 23:55:43.000000000 +0200 ++++ irda-utils-0.9.16/irdadump/shell/main.c 2004-06-02 15:09:42.251631144 +0200 +@@ -86,6 +86,11 @@ + #endif + int fd, c; + ++ if(geteuid()) { ++ puts("You need to be root to run this utility.\n"); ++ return 1; ++ } ++ + while ((c = getopt(argc, argv, "bc:df:i:lps:tvx?")) != -1) { + switch (c) { + case 'b': /* Dumb bytes */ Added: tinysofa/snapshot/irda-utils/current/sources/irda-utils-0.9.16.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/irda-utils/current/sources/irda-utils-0.9.16.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/irda-utils/current/specs/irda-utils.spec =================================================================== --- tinysofa/snapshot/irda-utils/current/specs/irda-utils.spec 2004-07-01 15:37:31 UTC (rev 2570) +++ tinysofa/snapshot/irda-utils/current/specs/irda-utils.spec 2004-07-01 15:37:33 UTC (rev 2571) @@ -0,0 +1,226 @@ +Summary: Utilities for infrared communication between devices. +Name: irda-utils +Version: 0.9.16 +Release: 1ts +Source: ftp://irda.sourceforge.net/pub/irda/irda-utils/irda-utils-%{version}.tar.gz +Patch1: irda-utils-0.9.14-chkconfig.patch +Patch2: irda-utils-0.9.14-typo.patch +Patch3: irda-utils-0.9.13-i18n.patch +Patch4: irda-utils-0.9.16-rootonly.patch +Patch5: irda-utils-0.9.15-rh1.patch +Url: http://irda.sourceforge.net/ +License: GPL +Group: Applications/System +BuildRoot: %{_tmppath}/%{name}-%{version}-root +Prereq: /sbin/chkconfig, grep, modutils >= 2.3.21-4 +ExcludeArch: s390 s390x + +%description +IrDA(TM) (Infrared Data Association) is an industry standard for +wireless, infrared communication between devices. IrDA speeds range +from 9600 bps to 4 Mbps, and IrDA can be used by many modern devices +including laptops, LAN adapters, PDAs, printers, and mobile phones. + +The Linux-IrDA project is a GPL'd implementation, written from +scratch, of the IrDA protocols. Supported IrDA protocols include +IrLAP, IrLMP, IrIAP, IrTTP, IrLPT, IrLAN, IrCOMM and IrOBEX. + +The irda-utils package contains a collection of programs that enable +the use of IrDA protocols. Most IrDA features are implemented in the +kernel, so IrDA support must be enabled in the kernel before any IrDA +tools or programs can be used. Some configuration outside the kernel +is required, however, and some IrDA features, like IrOBEX, are +actually implemented outside the kernel. + +%prep +%setup -q +%patch1 -p1 -b .chkconfig +%patch2 -p1 -b .typo +%patch3 -p1 -b .i18n +%patch4 -p1 -b .root +%patch5 -p1 -b .rh1 + +%build +make all RPM_OPT_FLAGS="$RPM_OPT_FLAGS" ROOT="$RPM_BUILD_ROOT" + +%install +rm -rf $RPM_BUILD_ROOT +mkdir -p $RPM_BUILD_ROOT/usr/sbin $RPM_BUILD_ROOT/etc/rc.d/init.d +mkdir -p $RPM_BUILD_ROOT/usr/bin + +%makeinstall ROOT="$RPM_BUILD_ROOT" MANDIR="$RPM_BUILD_ROOT/%{_mandir}" +chmod -x $RPM_BUILD_ROOT/etc/sysconfig/irda +rm -f $RPM_BUILD_ROOT/etc/sysconfig/network-scripts/ifcfg-irlan0 +mv irattach/README irattach/README.irattach +mv irdadump/README irdadump/README.irdadump +mv irdaping/README irdaping/README.irdaping +mv tekram/README tekram/README.tekram + +%clean +rm -rf $RPM_BUILD_ROOT + +%post +/sbin/chkconfig --add irda + +%preun +if [ $1 = 0 ] ; then + /sbin/chkconfig --del irda +fi + +%files +%defattr(-,root,root) +/usr/sbin/* +/usr/bin/* +%{_mandir}/man?/* +%config /etc/rc.d/init.d/irda +%config /etc/sysconfig/irda +%doc README etc/ifcfg-irlan0 +%doc irattach/README.irattach +%doc irdadump/README.irdadump +%doc irdaping/README.irdaping +%doc tekram/README.tekram + +%changelog +* Wed Jun 02 2004 Karsten Hopp 0.9.16-1 +- update + +* Wed Feb 18 2004 Karsten Hopp 0.9.15-5 +- add manpages (#115972) + +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Sat Jan 24 2004 Florian La Roche +- do not use *.spec as filename for a patch + +* Mon Nov 24 2003 Karsten Hopp 0.9.15-2 +- fix array usage (#110791) + +* Sun Oct 19 2003 Florian La Roche +- add a %%clean specfile target + +* Thu Jul 03 2003 Karsten Hopp 0.9.15-1.1 +- rebuilt + +* Wed Jul 02 2003 Karsten Hopp 0.9.15-1 +- update +- removed libtool patch, it's obsolete now +- new root patch + +* Wed Jun 04 2003 Elliot Lee +- rebuilt + +* Wed Jan 22 2003 Tim Powers +- rebuilt + +* Mon Dec 16 2002 Dan Walsh 0.9.14-8 +- Fixed service script description + +* Mon Dec 09 2002 Phil Knirsch 0.9.14-7 +- Fixed problem with %doc entries. + +* Tue Jul 09 2002 Phil Knirsch 0.9.14-6 +- Removed the ifcfg-irlan0 file. It shouldn't be installed by default. Moved it + to the docs dir. + +* Fri Jun 21 2002 Tim Powers 0.9.14-5 +- automated rebuild + +* Thu May 23 2002 Tim Powers 0.9.14-4 +- automated rebuild + +* Thu Apr 4 2002 Bernhard Rosenkraenzer 0.9.14-3 +- Stop irda service earlier (#61777) + +* Mon Jul 16 2001 Bernhard Rosenkraenzer 0.9.14-2 +- Fix libtool detection (#49093) + +* Tue Apr 24 2001 Bernhard Rosenkraenzer 0.9.14-1 +- 0.9.14-1 + +* Thu Feb 8 2001 Bernhard Rosenkraenzer +- Make init scripts more i18n friendly (use $0, $prog) + Bugs #26527 and #26550 +- Exclude S/390 (they don't have the needed hardware) + +* Mon Feb 5 2001 Bernhard Rosenkraenzer +- i18nize init scripts (#26077) + +* Wed Jan 10 2001 Bernhard Rosenkraenzer +- chmod -x /etc/sysconfig/irda (#22837) + +* Sat Jan 6 2001 Bernhard Rosenkraenzer +- Fix up the init script + +* Mon Dec 25 2000 Bernhard Rosenkraenzer +- Get rid of the /etc/modules.conf hack; the entries are in the + latest modutils by default. (Bug #22799) +- Require modutils >= 2.3.21-4 to make sure the modules.conf hack + isn't needed + +* Wed Dec 6 2000 Bernhard Rosenkraenzer +- Require modutils >= 2.3.11-5 rather than /etc/modules.conf + +* Tue Dec 5 2000 Bernhard Rosenkraenzer +- 0.9.13 + +* Tue Oct 31 2000 Bernhard Rosenkraenzer +- Add necessary entries to /etc/modules.conf in %%post (Bug #19960) +- Update source URL +- Fix build with current kernel 2.4 header files + +* Mon Oct 2 2000 Bernhard Rosenkraenzer +- make irdadump exit with an error message rather than a segfault when + run as non-root +- Update URL + +* Wed Aug 2 2000 Bill Nottingham +- fix start priority (345 isn't right...) +- fix condrestart + +* Sun Jul 23 2000 Trond Eivind Glomsr?d +- source files from /etc/rc.d/init.d + +* Sun Jul 23 2000 Trond Eivind Glomsr?d +- don't prereq /etc/init.d anymore +- rename "rh-status" +- use %%{_tmppath} + +* Sat Jul 15 2000 Bill Nottingham +- move initscript back + +* Thu Jul 13 2000 Prospector +- automatic rebuild + +* Tue Jun 27 2000 Preston Brown +- don't prereq, only require initscripts + +* Mon Jun 26 2000 Bernhard Rosenkraenzer +- Fix up initscripts +- chkconfigize + +* Sun Jun 18 2000 Matt Wilson +- rebuilt for next release + +* Fri Feb 4 2000 Bernhard Rosenkraenzer +- 0.9.10 +- add docs + +* Fri Feb 4 2000 Bernhard Rosenkraenzer +- strip libraries + +* Mon Jan 31 2000 Bill Nottingham +- fix typo in initscript + +* Mon Oct 11 1999 Cristian Gafton +- remove some of the network config files (and hope that the package will + still work :-) + +* Sun Oct 10 1999 Bernhard Rosenkraenzer +- Add the /etc/irda directory. It's needed. +- Add the /etc/rc.d/init.d/irda script to start the irda daemon +- chkconfig'ize /etc/rc.d/init.d/irda + +* Fri Sep 17 1999 Cristian Gafton +- build for RH 6.1 +- add patch to make the damn package compile without any IrDA installed. From svn at tinysofa.org Thu Jul 1 15:37:35 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:37:35 +1000 (EST) Subject: [tinysofa-svn] r2572 - in tinysofa/snapshot: . jadetex jadetex/current jadetex/current/sources jadetex/current/specs Message-ID: <20040701153735.D87094E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:37:35 +1000 (Fri, 02 Jul 2004) New Revision: 2572 Added: tinysofa/snapshot/jadetex/ tinysofa/snapshot/jadetex/current/ tinysofa/snapshot/jadetex/current/sources/ tinysofa/snapshot/jadetex/current/sources/jadefmtutil.cnf tinysofa/snapshot/jadetex/current/sources/jadetex-3.12-theta.patch tinysofa/snapshot/jadetex/current/sources/jadetex-3.12.tar.gz tinysofa/snapshot/jadetex/current/specs/ tinysofa/snapshot/jadetex/current/specs/jadetex.spec Log: - Add jadetex to snapshot from 2.0. Added: tinysofa/snapshot/jadetex/current/sources/jadefmtutil.cnf =================================================================== --- tinysofa/snapshot/jadetex/current/sources/jadefmtutil.cnf 2004-07-01 15:37:33 UTC (rev 2571) +++ tinysofa/snapshot/jadetex/current/sources/jadefmtutil.cnf 2004-07-01 15:37:35 UTC (rev 2572) @@ -0,0 +1,9 @@ +# jadefmtutil.cnf +# Alan W. Irwin +# +# configuration file for fmtutil; jade flavor. +# invoke with 'fmtutil --cnffile --all' +# +# format engine pattern-file arguments +jadetex tex language.dat &latex jadetex.ini +pdfjadetex pdftex language.dat &pdflatex pdfjadetex.ini Added: tinysofa/snapshot/jadetex/current/sources/jadetex-3.12-theta.patch =================================================================== --- tinysofa/snapshot/jadetex/current/sources/jadetex-3.12-theta.patch 2004-07-01 15:37:33 UTC (rev 2571) +++ tinysofa/snapshot/jadetex/current/sources/jadetex-3.12-theta.patch 2004-07-01 15:37:35 UTC (rev 2572) @@ -0,0 +1,28 @@ +--- jadetex-3.12/ucharacters.sty.theta 2002-06-21 10:51:53.000000000 +0100 ++++ jadetex-3.12/ucharacters.sty 2002-06-21 10:52:19.000000000 +0100 +@@ -370,7 +370,7 @@ + \DefineCharacter{949}{3B5}{\ensuremath{\epsilon }} + \DefineCharacter{950}{3B6}{\ensuremath{\zeta }} + \DefineCharacter{951}{3B7}{\ensuremath{\eta }} +-\DefineCharacter{952}{3B8}{\ifmmode \theta \else \texttheta \fi}% ++\DefineCharacter{952}{3B8}{\ensuremath{\theta }} + \DefineCharacter{953}{3B9}{\ensuremath{\iota }} + \DefineCharacter{954}{3BA}{\ensuremath{\kappa }} + \DefineCharacter{955}{3BB}{\ensuremath{\lambda }} +--- jadetex-3.12/uentities.sty.theta 2002-06-21 10:51:57.000000000 +0100 ++++ jadetex-3.12/uentities.sty 2002-06-21 10:53:47.000000000 +0100 +@@ -1961,11 +1961,11 @@ + \expandafter\def\csname Enttgr\endcsname{\ensuremath{\tau }}% U003C4% + \expandafter\def\csname Entthere4\endcsname{\ensuremath{\therefore }}% U02234% + \expandafter\def\csname Enttherefore\endcsname{\ensuremath{\therefore }}% U02234% +-\expandafter\def\csname Enttheta\endcsname{\ifmmode \theta \else \texttheta \fi}% U003B8% +-\expandafter\def\csname Entthetas\endcsname{\ifmmode \theta \else \texttheta \fi}% U003B8% ++\expandafter\def\csname Enttheta\endcsname{\ensuremath{\theta }}% U003B8% ++\expandafter\def\csname Entthetas\endcsname{\ensuremath{\theta }}% U003B8% + \expandafter\def\csname Entthetasym\endcsname{\ifmmode \vartheta \else \textvartheta \fi}% U003D1% + \expandafter\def\csname Entthetav\endcsname{\ifmmode \vartheta \else \textvartheta \fi}% U003D1% +-\expandafter\def\csname Entthgr\endcsname{\ifmmode \theta \else \texttheta \fi}% U003B8% ++\expandafter\def\csname Entthgr\endcsname{\ensuremath{\theta }}% U003B8% + \expandafter\def\csname Entthickapprox\endcsname{\ensuremath{}}% U02248-02063% + \expandafter\def\csname Entthicksim\endcsname{\ensuremath{}}% U0223Cx% + \expandafter\def\csname Entthinsp\endcsname{\hspace{0.167em}}% U02009% Added: tinysofa/snapshot/jadetex/current/sources/jadetex-3.12.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/jadetex/current/sources/jadetex-3.12.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/jadetex/current/specs/jadetex.spec =================================================================== --- tinysofa/snapshot/jadetex/current/specs/jadetex.spec 2004-07-01 15:37:33 UTC (rev 2571) +++ tinysofa/snapshot/jadetex/current/specs/jadetex.spec 2004-07-01 15:37:35 UTC (rev 2572) @@ -0,0 +1,189 @@ +%define TeXdir %(cd `kpsewhich -expand-var '$TEXMFMAIN'`/../..; pwd) + +Name: jadetex +Version: 3.12 +Release: 10ts +Group: Applications/Publishing + +Summary: TeX macros used by Jade TeX output. + +License: Distributable +URL: http://sourceforge.net/projects/jadetex + +Requires: sgml-common >= 0.5 +Requires: tetex >= 0.9 tetex-latex >= 0.9 +Requires: jade +Requires(post): tetex >= 0.9 +BuildRequires: unzip tetex-latex tetex + +BuildRoot: %{_tmppath}/%{name}-%{version}-root + +BuildArch: noarch +Source0: http://prdownloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz +Source1: jadefmtutil.cnf +Patch0: jadetex-3.12-theta.patch + + +%description +JadeTeX contains the additional LaTeX macros necessary for taking Jade +TeX output files and processing them as TeX files (to obtain DVI, +PostScript, or PDF files, for example). + +%prep +%setup -q +cp %{SOURCE1} . +%patch0 -p1 -b .theta + + +%build +make + + +%install +DESTDIR=$RPM_BUILD_ROOT +rm -rf $DESTDIR +mkdir -p $DESTDIR +make install DESTDIR=$DESTDIR + +mkdir -p ${DESTDIR}%{TeXdir}/share/texmf/tex/jadetex +cp *.ini ${DESTDIR}%{TeXdir}/share/texmf/tex/jadetex +cp *.sty ${DESTDIR}%{TeXdir}/share/texmf/tex/jadetex +cp *.cnf ${DESTDIR}%{TeXdir}/share/texmf/tex/jadetex + +mkdir -p ${DESTDIR}%{TeXdir}/bin +ln -s virtex ${DESTDIR}%{TeXdir}/bin/jadetex +ln -s pdfvirtex ${DESTDIR}%{TeXdir}/bin/pdfjadetex + + +%clean +DESTDIR=$RPM_BUILD_ROOT +rm -rf $DESTDIR + + +%post +/usr/bin/env - PATH=$PATH:%{TeXdir}/bin texhash > /dev/null 2>&1 +/usr/bin/env - PATH=$PATH:%{TeXdir}/bin fmtutil --cnffile %{TeXdir}/share/texmf/tex/jadetex/jadefmtutil.cnf --all > /dev/null 2>&1 +exit 0 + + +%files +%defattr (-,root,root) +%ghost %{TeXdir}/share/texmf/web2c/jadetex.fmt +%ghost %{TeXdir}/share/texmf/web2c/pdfjadetex.fmt +%dir %{TeXdir}/share/texmf/tex/jadetex +%{TeXdir}/share/texmf/tex/jadetex/dsssl.def +%{TeXdir}/share/texmf/tex/jadetex/jadetex.ltx +%{TeXdir}/share/texmf/tex/jadetex/jadetex.ini +%{TeXdir}/share/texmf/tex/jadetex/pdfjadetex.ini +%{TeXdir}/share/texmf/tex/jadetex/dummyels.sty +%{TeXdir}/share/texmf/tex/jadetex/mlnames.sty +%{TeXdir}/share/texmf/tex/jadetex/ucharacters.sty +%{TeXdir}/share/texmf/tex/jadetex/uentities.sty +%{TeXdir}/share/texmf/tex/jadetex/unicode.sty +%{TeXdir}/share/texmf/tex/jadetex/jadefmtutil.cnf +%{TeXdir}/bin/jadetex +%{TeXdir}/bin/pdfjadetex + +%triggerin -- tetex-latex +/usr/bin/env - PATH=$PATH:%{TeXdir}/bin fmtutil --cnffile %{TeXdir}/share/texmf/tex/jadetex/jadefmtutil.cnf --all > /dev/null 2>&1 +exit 0 + +%changelog +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Wed Jan 22 2003 Tim Powers +- rebuilt + +* Mon Dec 30 2002 Karsten Hopp 3.12-8 +- BuildPrereq tetex (for kpsewhich) + +* Wed Nov 20 2002 Tim Powers +- rebuild in current collinst + +* Tue Jul 23 2002 Tim Powers 3.12-6 +- build using gcc-3.2-0.1 + +* Fri Jun 21 2002 Tim Powers 3.12-5 +- automated rebuild + +* Fri Jun 21 2002 Tim Waugh 3.12-4 +- Fix theta problem (bug #64865). + +* Thu May 23 2002 Tim Powers 3.12-3 +- automated rebuild + +* Thu Feb 21 2002 Tim Waugh 3.12-2 +- Rebuild in new environment. + +* Fri Jan 25 2002 Tim Waugh 3.12-1 +- 3.12. +- Patches no longer needed: makefile, emergency, exp, multicols, euro, + twosides. + +* Fri Jan 11 2002 Tim Waugh 3.11-8 +- Fix euro support. + +* Wed Jan 09 2002 Tim Powers 3.11-7 +- automated rebuild + +* Thu Jan 3 2002 Tim Waugh 3.11-6 +- Build requires tetex-latex (bug #57895). + +* Tue Dec 18 2001 Tim Waugh 3.11-5 +- Ian Castle figured out how to fix unbalanced columns. Apply + his sourceforge patch. + +* Wed Dec 12 2001 Tim Waugh 3.11-4 +- Trigger on tetex-latex, not the base tetex package. + +* Wed Oct 31 2001 Tim Waugh 3.11-3 +- Revert the multicols change in 3.11 until the reason it breaks + DocBook indexes is discovered. + +* Mon Oct 1 2001 Tim Waugh 3.11-2 +- Own /usr/share/texmf/tex/jadetex (bug #51381). + +* Tue Sep 11 2001 Tim Waugh 3.11-1 +- 3.11 (bug #51951). +- Trigger: rebuild fmt when teTeX is upgraded (bug #51921). + +* Tue Aug 14 2001 Tim Powers 3.6-4 +- rebuilt to hopefully fix rpm verify problems + +* Thu Aug 9 2001 Tim Waugh 3.6-3 +- Use %%ghost for the fmt files, since they get recreated (bug #49580). + +* Wed Aug 1 2001 Tim Waugh 3.6-2 +- Use emergencystretch (bug #47345). + +* Mon Jun 4 2001 Tim Waugh 3.6-1 +- 3.6. + +* Mon Feb 12 2001 Tim Waugh 3.3-1 +- 3.3. Redo jadetex-makefile.patch. + +* Fri Jan 19 2001 Tim Waugh +- Earlier change was wrong; jade should be required, not openjade +- Require sgml-common >= 0.5. + +* Wed Jan 17 2001 Tim Waugh +- Make tetex a %%post requirement. +- Silence %%post output. +- Don't play so many macro games. +- Build requires unzip. + +* Fri Jan 12 2001 Tim Waugh +- Make symlinks relative. + +* Mon Jan 08 2001 Tim Waugh +- Change group. +- Require openjade not jade. +- rm before install. +- Use %%{_tmppath}. +- Require tetex-latex. +- Change Copyright: to License:. +- Remove Packager: line. + +* Mon Jan 08 2001 Tim Waugh +- Based on Eric Bischoff's new-trials packages. From svn at tinysofa.org Thu Jul 1 15:37:37 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:37:37 +1000 (EST) Subject: [tinysofa-svn] r2573 - in tinysofa/snapshot: . joe joe/current joe/current/sources joe/current/specs Message-ID: <20040701153737.ECF324E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:37:37 +1000 (Fri, 02 Jul 2004) New Revision: 2573 Added: tinysofa/snapshot/joe/ tinysofa/snapshot/joe/current/ tinysofa/snapshot/joe/current/sources/ tinysofa/snapshot/joe/current/sources/joe-3.1-joerc.patch tinysofa/snapshot/joe/current/sources/joe-3.1-sysconfdir.patch tinysofa/snapshot/joe/current/sources/joe-3.1.tar.gz tinysofa/snapshot/joe/current/specs/ tinysofa/snapshot/joe/current/specs/joe.spec Log: - Add joe to snapshot from 2.0. Added: tinysofa/snapshot/joe/current/sources/joe-3.1-joerc.patch =================================================================== --- tinysofa/snapshot/joe/current/sources/joe-3.1-joerc.patch 2004-07-01 15:37:35 UTC (rev 2572) +++ tinysofa/snapshot/joe/current/sources/joe-3.1-joerc.patch 2004-07-01 15:37:37 UTC (rev 2573) @@ -0,0 +1,47 @@ +diff -ur joe-3.1/joerc.in joe-3.1-lhh/joerc.in +--- joe-3.1/joerc.in 2004-05-29 00:20:17.000000000 -0400 ++++ joe-3.1-lhh/joerc.in 2004-06-01 10:27:37.555629065 -0400 +@@ -730,6 +730,8 @@ + nextw ^K N Goto next window + nextw ^K ^N + nextw ^K n ++nextw ^[ [ 1 ; 3 C alt right in (newer) xterm ++nextw ^[ [ 3 C alt right in gnome-terminal + pgdn .kN Screen down + pgdn ^V + pgdn ^[ [ 6 ~ +@@ -740,6 +742,8 @@ + prevw ^K P Goto previous window + prevw ^K ^P + prevw ^K p ++prevw ^[ [ 1 ; 3 D alt left in (newer) xterm ++prevw ^[ [ 3 D alt left in gnome-terminal + query ^K ? Macro query insert + record ^K [ Record a macro + retype ^R Refresh screen +@@ -759,8 +763,8 @@ + :def ispellword psh,nextword,markk,prevword,markb,filt,"cat >ispell.tmp;ispell ispell.tmp /dev/tty;tr -d $SPLTMP;aspell -x -c $SPLTMP /dev/tty;cat $SPLTMP;/bin/rm $SPLTMP",rtn,retype +-:def aspellword psh,nextword,markk,prevword,markb,filt,"SPLTMP=ispell.tmp;cat >$SPLTMP;aspell -x -c $SPLTMP /dev/tty;tr -d <$SPLTMP '\\012';/bin/rm $SPLTMP",rtn,retype,nextword ++:def aspellfile filt,"SPLTMP=`mktemp -t joespell.XXXXXXXXXX`;cat >$SPLTMP;aspell -x -c $SPLTMP /dev/tty;cat $SPLTMP;/bin/rm $SPLTMP",rtn,retype ++:def aspellword psh,nextword,markk,prevword,markb,filt,"SPLTMP=`mktemp -t joespell.XXXXXXXXXX`;cat >$SPLTMP;aspell -x -c $SPLTMP /dev/tty;tr -d <$SPLTMP '\\012';/bin/rm $SPLTMP",rtn,retype,nextword + + @SPELL at file ^[ l + @SPELL at word ^[ n +@@ -987,9 +991,13 @@ + mode ^T Options menu + nextpos ^K = Goto next position in position history + nextword ^X Goto next word ++nextword ^[ [ 1 ; 5 C ctrl right in (newer) xterm ++nextword ^[ [ 5 C ctrl right in gnome-terminal + open ^] Split line + prevpos ^K - Previous position in history + prevword ^Z Previous word ++prevword ^[ [ 1 ; 5 D ctrl left in (newer) xterm ++prevword ^[ [ 5 D ctrl left in gnome-terminal + redo ^^ Redo changes + rindent ^K . Indent to right + rtarw .kr Go right +Only in joe-3.1-lhh: joerc.in.orig Added: tinysofa/snapshot/joe/current/sources/joe-3.1-sysconfdir.patch =================================================================== --- tinysofa/snapshot/joe/current/sources/joe-3.1-sysconfdir.patch 2004-07-01 15:37:35 UTC (rev 2572) +++ tinysofa/snapshot/joe/current/sources/joe-3.1-sysconfdir.patch 2004-07-01 15:37:37 UTC (rev 2573) @@ -0,0 +1,69 @@ +diff -ur joe-3.1/jmacsrc.in joe-3.1-lhh/jmacsrc.in +--- joe-3.1/jmacsrc.in 2004-05-29 00:30:57.000000000 -0400 ++++ joe-3.1-lhh/jmacsrc.in 2004-06-01 10:13:50.615807553 -0400 +@@ -4,7 +4,7 @@ + + JOE looks for this file in: + 1 - $HOME/.jmacsrc +- 2 - @sysconfdir@/jmacsrc ++ 2 - @sysconfdir@/joe/jmacsrc + + This file can include other files by placing the following include command + in the first column: +diff -ur joe-3.1/joe.1.in joe-3.1-lhh/joe.1.in +--- joe-3.1/joe.1.in 2004-05-09 10:48:32.000000000 -0400 ++++ joe-3.1-lhh/joe.1.in 2004-06-01 10:15:52.043606270 -0400 +@@ -79,7 +79,7 @@ + + You can customize the keyboard layout, the help screens and a number of + behavior defaults by copying JOE's initialization file (usually +-\fB at sysconfdir@/joerc\fR) to \fB.joerc\fR in your home directory and then ++\fB at sysconfdir@/joe/joerc\fR) to \fB.joerc\fR in your home directory and then + by modifying it. See the section \fBjoerc\fR below. + + To have JOE used as your default editor for e-mail and News, you need to set +@@ -781,7 +781,7 @@ + .SH The\ joerc file + \fB^T\fR options, the help screens and the key-sequence to editor command + bindings are all defined in JOE's initialization file. If you make a copy +-of this file (which normally resides in \fB at sysconfdir@/joerc\fR) to ++of this file (which normally resides in \fB at sysconfdir@/joe/joerc\fR) to + \fB$HOME/.joerc\fR, you can customize these setting to your liking. The + syntax of the initialization file should be fairly obvious and there are + further instruction in it. +diff -ur joe-3.1/joerc.in joe-3.1-lhh/joerc.in +--- joe-3.1/joerc.in 2004-05-29 00:20:17.000000000 -0400 ++++ joe-3.1-lhh/joerc.in 2004-06-01 10:13:26.589200474 -0400 +@@ -4,7 +4,7 @@ + + JOE looks for this file in: + 1 - $HOME/.joerc +- 2 - ${prefix}/etc/joerc ++ 2 - @sysconfdir@/joe/joerc + + This file can include other files by placing the following include command + in the first column: +diff -ur joe-3.1/jpicorc.in joe-3.1-lhh/jpicorc.in +--- joe-3.1/jpicorc.in 2004-05-29 00:32:40.000000000 -0400 ++++ joe-3.1-lhh/jpicorc.in 2004-06-01 10:13:33.624914094 -0400 +@@ -4,7 +4,7 @@ + + JOE looks for this file in: + 1 - $HOME/.jpicorc +- 2 - @sysconfdir@/jpicorc ++ 2 - @sysconfdir@/etc/jpicorc + + This file can include other files by placing the following include command + in the first column: +diff -ur joe-3.1/jstarrc.in joe-3.1-lhh/jstarrc.in +--- joe-3.1/jstarrc.in 2004-05-29 00:28:25.000000000 -0400 ++++ joe-3.1-lhh/jstarrc.in 2004-06-01 10:13:02.390624842 -0400 +@@ -4,7 +4,7 @@ + + JOE looks for this file in: + 1 - $HOME/.jstarrc +- 2 - ${prefix}/etc/jstarrc ++ 2 - @sysconfdir@/joe/jstarrc + + This file can include other files by placing the following include command + in the first column: Added: tinysofa/snapshot/joe/current/sources/joe-3.1.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/joe/current/sources/joe-3.1.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/joe/current/specs/joe.spec =================================================================== --- tinysofa/snapshot/joe/current/specs/joe.spec 2004-07-01 15:37:35 UTC (rev 2572) +++ tinysofa/snapshot/joe/current/specs/joe.spec 2004-07-01 15:37:37 UTC (rev 2573) @@ -0,0 +1,300 @@ +%define _sysconfdir /etc + +Summary: An easy to use, modeless text editor. +Name: joe +Version: 3.1 +Release: 2ts +License: GPL +Group: Applications/Editors +Source: http://prdownloads.sourceforge.net/joe-editor/joe-%{version}.tar.gz +URL: http://sourceforge.net/projects/joe-editor/ +Requires: ncurses +BuildRequires: ncurses-devel +Buildroot: %{_tmppath}/%{name}-%{version}-root +Patch0: joe-3.1-joerc.patch +Patch1: joe-3.1-sysconfdir.patch + +%description +Joe is a powerful, easy to use, modeless text editor. +It uses the same WordStar keybindings used in Borland's development +environment. + +%prep +%setup -q + +%patch0 -p1 +%patch1 -p1 + +rm -f config.guess config.sub missing install-sh depcomp mkinstalldirs +rm -f config.sub config.log +aclocal +autoconf configure.ac > configure +chmod +x configure +autoheader configure.ac +automake -a + + +%build +%configure +make + +%install +rm -fr $RPM_BUILD_ROOT +%makeinstall + +# This is strange... +pushd $RPM_BUILD_ROOT/usr/bin +popd + +# This is automatically compressed afterwards... +pushd $RPM_BUILD_ROOT/%{_mandir}/man1 +ln -s joe.1 jmacs.1 +ln -s joe.1 jpico.1 +ln -s joe.1 jstar.1 +ln -s joe.1 rjoe.1 +popd + +%files +%defattr(-,root,root) +%doc README TODO INFO HINTS NEWS LIST +/usr/bin/* +%dir /etc/joe +%config /etc/joe/* +%{_mandir}/man1/* + +%clean +rm -rf $RPM_BUILD_ROOT + +%changelog +* Tue Jun 08 2004 Lon Hohberger 3.1-2 +- Rebuild + +* Tue Jun 01 2004 Lon Hohberger 3.1-1.2 +- Rebuild + +* Tue Jun 01 2004 Lon Hohberger 3.1-1 +- Import 3.1 from upstream +- Include mktemp behavior from #124462 + +* Thu May 27 2004 Lon Hohberger 3.0-2.3 +- Include HINTS NEWS LIST in %doc line (#124464) + +* Mon May 03 2004 Lon Hohberger 3.0-2.1 +- Fix /etc/joe/joe/* sysconf dirs; the new Makefile.am handles this for us. +- Ensure we reference correct directories in manpages and joe-configs. + +* Wed Apr 28 2004 Lon Hohberger 3.0-2 +- Rebuild. + +* Wed Apr 28 2004 Lon Hohberger 3.0-1.1 +- Kill ancient configure scripts in tarball to cause it to build on +ppc64. + +* Wed Apr 28 2004 Lon Hohberger 3.0-1 +- Import of 3.0 upstream. +- Removed zero-rc patch for now; it doesn't correctly fix the + problem. +- Merge new SELinux patch from Dan Walsh. + +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Thu Jan 29 2004 Dan Walsh 2.9.8-8 +- Modify SELinux patch to only attempt change if the context is different +- Change is_selinux_enabled to >0 check. + +* Mon Dec 15 2003 Lon Hohberger 2.9.8-7 +- SELinux patch to keep context on backup files when saving. + +* Tue Jun 17 2003 Lon Hohberger 2.9.8-6 +- Rebuild for FC2 tree + +* Tue Jun 17 2003 Lon Hohberger 2.9.8-5 +- Rebuilt + +* Tue Jun 17 2003 Lon Hohberger 2.9.8-4 +- Fixed incomplete patch for #80657 + +* Mon Jun 16 2003 Lon Hohberger 2.9.8-3 +- Rebuilt + +* Mon Jun 16 2003 Lon Hohberger 2.9.8-2 +- Import from 2.9.8 upstream. This eliminates most of the patches +we maintained. Added patch from #80657 from Hans de Goede. + +* Wed Jun 04 2003 Elliot Lee +- rebuilt + +* Thu May 22 2003 Jeremy Katz 2.9.7-13 +- fix build with gcc 3.3 + +* Wed Jan 22 2003 Tim Powers +- rebuilt + +* Thu Jan 2 2003 Lon Hohberger 2.9.7-11 +- Added fix for #80673 - 'restrict' (C99 keyword) used as variable. +- Fixed build bugs on i386. + +* Tue Nov 11 2002 Lon Hohberger 2.9.7-9 +- Fixed zero-byte rc file hang. + +* Tue Nov 06 2002 Lon Hohberger 2.9.7-8 +- Cleaned up warnings on ppc/ia32/ia64. +- Fixed help message. +- Fixed bugs on ia64 and ppc architectures. +- Fixed build bugs on ia64. + +* Mon Jul 22 2002 Trond Eivind Glomsr?d 2.9.7-7 +- Make it build again (auto*... sigh. #69409) + +* Fri Jun 21 2002 Tim Powers +- automated rebuild + +* Thu May 23 2002 Tim Powers +- automated rebuild + +* Thu Feb 21 2002 Trond Eivind Glomsr?d 2.9.7-4 +- Rebuild + +* Mon Feb 4 2002 Trond Eivind Glomsr?d 2.9.7-3 +- The joe.1 man-page was called -joe.1 + +* Wed Jan 09 2002 Tim Powers +- automated rebuild + +* Thu Nov 8 2001 Trond Eivind Glomsr?d 2.9.7-1 +- 2.9.7 + +* Mon Jul 30 2001 Trond Eivind Glomsr?d +- Patch for wordwrap problem (#50321) + +* Mon Jun 4 2001 Trond Eivind Glomsr?d +- 2.9.6 - someone's developing it again, on sourceforge +- all patches absorbed or unnecesarry +- add doc files and URL +- use %%configure and %%makeinstall + +* Wed Feb 28 2001 Trond Eivind Glomsr?d +- Don't try to read .joerc from CWD (#30031) +- make sure the docs say /etc/joe everywhere + +* Fri Nov 17 2000 Trond Eivind Glomsr?d +- clean up the patch file from yesterday + +* Thu Nov 16 2000 Trond Eivind Glomsr?d +- security fix - don't blindly write to DEADJOE, unlink it + and create it safely first + +* Mon Oct 09 2000 Trond Eivind Glomsr?d +- added patch so it will build on Red Hat 6.x (#18639) + +* Wed Jul 19 2000 Jakub Jelinek +- fix the vfile patch + +* Thu Jul 13 2000 Prospector +- automatic rebuild + +* Fri Jun 30 2000 Trond Eivind Glomsr?d +- added new patch for supporting big files (15+ MB). +- obsoleted one of our which is contained within the + above patch + +* Tue Jun 27 2000 Trond Eivind Glomsr?d +- move config files to /etc/joe + +* Tue Jun 27 2000 Trond Eivind Glomsr?d +- added new patch for resizing, by Seth Vidal +- removed an old patch which did almost the same thing, + but not as well + +* Tue Jun 20 2000 Trond Eivind Glomsr?d +- disabled a patch which no longer works + +* Mon Jun 19 2000 Trond Eivind Glomsr?d +- and yet another + +* Mon Jun 19 2000 Trond Eivind Glomsr?d +- once more + +* Mon Jun 19 2000 Trond Eivind Glomsr?d +- rebuild + +* Wed Jun 07 2000 Trond Eivind Glomsr?d +- use symlinked man pages +- use %%{_mandir} + +* Wed May 3 2000 Bill Nottingham +- fix for ia64 (sizeof(int) != sizeof(time_t)) + +* Wed Apr 26 2000 Trond Eivind Glomsr?d +- fixed a problem loading .joerc. Thanks to Jeff Peters + for the patch (#11049) + +* Wed Apr 26 2000 Trond Eivind Glomsr?d +- patched it to restore the tty after exiting + +* Thu Apr 20 2000 Trond Eivind Glomsr?d +- gzip man page +- hardlink the joe man page to jmacs, jpico, jstar, rjoe + + +* Fri Mar 31 2000 Bill Nottingham +- add patch to fix coredumps on quit for large files + (b4506055 at csie,ntu.edu.tw, #5372) + +* Mon Feb 7 2000 Bill Nottingham +- handle compressed manpages + +* Tue Jan 18 2000 Bernhard Rosenkraenzer +- Add patch from Hans de Goede to fix the End key + +* Tue Sep 07 1999 Cristian Gafton +- patch for closing on some buffer overflow problems (not that is really + critical...) + +* Thu Sep 2 1999 Jeff Johnson +- DEADJOE files shouldn't be world readable (#4219). + +* Thu Aug 12 1999 Cristian Gafton +- add patch from Giuseppe Ghibo' to fix resizing + problems + +* Sun May 16 1999 Jeff Johnson +- don't rely on (broken!) rpm %patch (#2735) + +* Fri Apr 09 1999 Cristian Gafton +- added locale patch from Petr Kolar + (yeah, finally!) + +* Sun Mar 21 1999 Cristian Gafton +- auto rebuild in the new build environment (release 17) + +* Wed Jan 20 1999 Alex deVries +- added mipseb support + +* Fri Dec 18 1998 Cristian Gafton +- build for glibc 2.1 + +* Tue Sep 15 1998 Cristian Gafton +- built with Alan's -port patch + +* Fri May 08 1998 Cristian Gafton +- enable -asis in the config files so international keyboards will be better + supported + +* Fri May 01 1998 Prospector System +- translations modified for de, fr, tr + +* Fri May 01 1998 Cristian Gafton +- /usr/lib/joe/* are config files + +* Thu Apr 09 1998 Cristian Gafton +- manhattan build + +* Thu Dec 11 1997 Cristian Gafton +- fixed termcap problems for terms other than 80x25 +- added support for buildroot and BuildRoot + +* Mon Jul 21 1997 Erik Troan +- built against glibc + From svn at tinysofa.org Thu Jul 1 15:37:50 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:37:50 +1000 (EST) Subject: [tinysofa-svn] r2577 - in tinysofa/snapshot: . lha lha/current lha/current/sources lha/current/specs Message-ID: <20040701153750.AA7364E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:37:50 +1000 (Fri, 02 Jul 2004) New Revision: 2577 Added: tinysofa/snapshot/lha/ tinysofa/snapshot/lha/current/ tinysofa/snapshot/lha/current/sources/ tinysofa/snapshot/lha/current/sources/lha-114i-malloc.patch tinysofa/snapshot/lha/current/sources/lha-114i-sec.patch tinysofa/snapshot/lha/current/sources/lha-114i-symlink.patch tinysofa/snapshot/lha/current/sources/lha-114i.tar.gz tinysofa/snapshot/lha/current/specs/ tinysofa/snapshot/lha/current/specs/lha.spec Log: - Add lha to snapshot from 2.0. Added: tinysofa/snapshot/lha/current/sources/lha-114i-malloc.patch =================================================================== --- tinysofa/snapshot/lha/current/sources/lha-114i-malloc.patch 2004-07-01 15:37:49 UTC (rev 2576) +++ tinysofa/snapshot/lha/current/sources/lha-114i-malloc.patch 2004-07-01 15:37:50 UTC (rev 2577) @@ -0,0 +1,10 @@ +--- lha-114i/src/lha.h.orig 2004-05-19 19:24:19.000000000 -0400 ++++ lha-114i/src/lha.h 2004-05-19 19:23:19.000000000 -0400 +@@ -16,6 +16,7 @@ + #include + #include + #include ++#include + + #include + Added: tinysofa/snapshot/lha/current/sources/lha-114i-sec.patch =================================================================== --- tinysofa/snapshot/lha/current/sources/lha-114i-sec.patch 2004-07-01 15:37:49 UTC (rev 2576) +++ tinysofa/snapshot/lha/current/sources/lha-114i-sec.patch 2004-07-01 15:37:50 UTC (rev 2577) @@ -0,0 +1,75 @@ +--- lha-114i/src/header.c.orig 2000-10-05 19:36:03.000000000 +0200 ++++ lha-114i/src/header.c 2004-04-21 14:30:52.000000000 +0200 +@@ -538,6 +538,10 @@ + /* + * filename + */ ++ if (header_size >= 256) { ++ fprintf(stderr, "Possible buffer overflow hack attack, type #1\n"); ++ exit(109); ++ } + for (i = 0; i < header_size - 3; i++) + hdr->name[i] = (char) get_byte(); + hdr->name[header_size - 3] = '\0'; +@@ -547,6 +551,10 @@ + /* + * directory + */ ++ if (header_size >= FILENAME_LENGTH) { ++ fprintf(stderr, "Possible buffer overflow hack attack, type #2\n"); ++ exit(110); ++ } + for (i = 0; i < header_size - 3; i++) + dirname[i] = (char) get_byte(); + dirname[header_size - 3] = '\0'; +--- lha-114i/src/lhext.c.orig 2000-10-04 16:57:38.000000000 +0200 ++++ lha-114i/src/lhext.c 2004-04-21 14:30:52.000000000 +0200 +@@ -190,8 +190,13 @@ + q = (char *) rindex(hdr->name, '/') + 1; + } + else { ++ if (is_directory_traversal(q)) { ++ fprintf(stderr, "Possible directory traversal hack attempt in %s\n", q); ++ exit(111); ++ } ++ + if (*q == '/') { +- q++; ++ while (*q == '/') { q++; } + /* + * if OSK then strip device name + */ +@@ -419,6 +424,33 @@ + return; + } + ++int ++is_directory_traversal(char *string) ++{ ++ unsigned int type = 0; /* 0 = new, 1 = only dots, 2 = other chars than dots */ ++ char *temp; ++ ++ temp = string; ++ ++ while (*temp != 0) { ++ if (temp[0] == '/') { ++ if (type == 1) { return 1; } ++ type = 0; ++ temp++; ++ continue; ++ } ++ ++ if ((temp[0] == '.') && (type < 2)) ++ type = 1; ++ if (temp[0] != '.') ++ type = 2; ++ ++ temp++; ++ } /* while */ ++ ++ return (type == 1); ++} ++ + /* Local Variables: */ + /* mode:c */ + /* tab-width:4 */ Added: tinysofa/snapshot/lha/current/sources/lha-114i-symlink.patch =================================================================== --- tinysofa/snapshot/lha/current/sources/lha-114i-symlink.patch 2004-07-01 15:37:49 UTC (rev 2576) +++ tinysofa/snapshot/lha/current/sources/lha-114i-symlink.patch 2004-07-01 15:37:50 UTC (rev 2577) @@ -0,0 +1,10 @@ +--- lha-114i/src/lhext.c.symlink 2000-10-04 10:57:38.000000000 -0400 ++++ lha-114i/src/lhext.c 2003-05-19 22:55:57.000000000 -0400 +@@ -351,6 +351,7 @@ extract_one(afp, hdr) + } + + unlink(bb1); ++ make_parent_path(bb1); + l_code = symlink(bb2, bb1); + if (l_code < 0) { + if (quiet != TRUE) Added: tinysofa/snapshot/lha/current/sources/lha-114i.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/lha/current/sources/lha-114i.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/lha/current/specs/lha.spec =================================================================== --- tinysofa/snapshot/lha/current/specs/lha.spec 2004-07-01 15:37:49 UTC (rev 2576) +++ tinysofa/snapshot/lha/current/specs/lha.spec 2004-07-01 15:37:50 UTC (rev 2577) @@ -0,0 +1,127 @@ +Summary: An archiving and compression utility for LHarc format archives. +Name: lha +Version: 1.14i +Release: 15ts +License: freeware +Group: Applications/Archiving +Source: http://www2m.biglobe.ne.jp/~dolphin/lha/prog/lha-114i.tar.gz +Patch: lha-114i-symlink.patch +Patch1: lha-114i-sec.patch +Patch2: lha-114i-malloc.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-root + +%description +LHA is an archiving and compression utility for LHarc format archives. +LHA is mostly used in the DOS world, but can be used under Linux to +extract DOS files from LHA archives. + +Install the lha package if you need to extract DOS files from LHA archives. + +%prep +%setup -q -n lha-114i + +%patch -p1 -b .symlink +%patch1 -p1 -b .sec +%patch2 -p1 -b .ia64 + +%build +make + +%install +rm -rf $RPM_BUILD_ROOT + +mkdir -p $RPM_BUILD_ROOT%{_bindir} + +install -m755 src/lha $RPM_BUILD_ROOT%{_bindir} + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(-,root,root) +%doc PROBLEMS.euc README.euc MACHINES* +%{_bindir}/lha + +%changelog +* Fri May 21 2004 Than Ngo 1.14i-15 +- fix segmentation fault on ia64 + +* Wed May 05 2004 Than Ngo 1.14i-14 +- fix security vulnerabilities, CAN-2004-0234, CAN-2004-0235 + +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Wed Jun 04 2003 Elliot Lee +- rebuilt + +* Tue May 20 2003 Than Ngo 1.14i-11 +- add patch file from Matt Wilson, bug #91206 + +* Wed Jan 22 2003 Tim Powers +- rebuilt + +* Wed Dec 11 2002 Tim Powers 1.14i-8 +- rebuild on all arches + +* Fri Jun 21 2002 Tim Powers +- automated rebuild + +* Wed Jun 19 2002 Than Ngo 1.14i-6 +- don't forcibly strip binaries + +* Thu May 23 2002 Tim Powers +- automated rebuild + +* Wed Feb 27 2002 Than Ngo 1.14i-4 +- rebuild + +* Tue Jan 29 2002 Than Ngo 1.14i-3 +- rebuild in rawhide + +* Tue Sep 25 2001 Than Ngo 1.14i-1 +- update to 1.14i (bug #52779) + +* Mon May 21 2001 Tim Powers +- rebuilt for the distro + +* Mon Jul 24 2000 Prospector +- rebuilt + +* Wed Jul 12 2000 Than Ngo +- rebuilt + +* Mon Jul 03 2000 Prospector +- automatic rebuild + +* Fri May 12 2000 Tim Powers +- rebuilt for Powertools-7.0 + +* Wed Jan 19 2000 Bill Nottingham +- add some more docs + +* Sun Mar 21 1999 Cristian Gafton +- auto rebuild in the new build environment (release 11) + +* Tue Jan 24 1999 Michael Maher +- this package will never change. +- changed groups + +* Thu Dec 17 1998 Michael Maher +- built package for 6.0 + +* Wed Sep 23 1998 Jeff Johnson +- add english doco. + +* Sat Aug 15 1998 Jeff Johnson +- build root + +* Mon Apr 27 1998 Prospector System +- translations modified for de, fr, tr + +* Tue Oct 21 1997 Donnie Barnes +- removed man page, wasn't ASCII and caused more harm than good +- spec file cleanups + +* Thu Jul 10 1997 Erik Troan +- built against glibc From svn at tinysofa.org Thu Jul 1 15:37:49 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:37:49 +1000 (EST) Subject: [tinysofa-svn] r2576 - in tinysofa/snapshot: . krbafs krbafs/current krbafs/current/sources krbafs/current/specs Message-ID: <20040701153749.A0E464E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:37:49 +1000 (Fri, 02 Jul 2004) New Revision: 2576 Added: tinysofa/snapshot/krbafs/ tinysofa/snapshot/krbafs/current/ tinysofa/snapshot/krbafs/current/sources/ tinysofa/snapshot/krbafs/current/sources/krb4-1.2.2.tar.gz tinysofa/snapshot/krbafs/current/sources/krbafs-1.2.2-am_fix.patch tinysofa/snapshot/krbafs/current/sources/krbafs.versions tinysofa/snapshot/krbafs/current/specs/ tinysofa/snapshot/krbafs/current/specs/krbafs.spec Log: - Add krbafs to snapshot from 2.0. Added: tinysofa/snapshot/krbafs/current/sources/krb4-1.2.2.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/krbafs/current/sources/krb4-1.2.2.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/krbafs/current/sources/krbafs-1.2.2-am_fix.patch =================================================================== --- tinysofa/snapshot/krbafs/current/sources/krbafs-1.2.2-am_fix.patch 2004-07-01 15:37:47 UTC (rev 2575) +++ tinysofa/snapshot/krbafs/current/sources/krbafs-1.2.2-am_fix.patch 2004-07-01 15:37:49 UTC (rev 2576) @@ -0,0 +1,95 @@ +diff -urN krb4-1.2.2/acinclude.m4 krb4-1.2.2.am/acinclude.m4 +--- krb4-1.2.2/acinclude.m4 2004-06-23 18:19:27.836070104 +1000 ++++ krb4-1.2.2.am/acinclude.m4 2004-06-23 18:17:27.862308888 +1000 +@@ -6,4 +6,4 @@ + + dnl $xId: misc.m4,v 1.1 1997/12/14 15:59:04 joda Exp $ + dnl +-define(upcase,`echo $1 | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`)dnl ++dnl define(upcase,`echo $1 | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`)dnl +diff -urN krb4-1.2.2/lib/roken/Makefile.am krb4-1.2.2.am/lib/roken/Makefile.am +--- krb4-1.2.2/lib/roken/Makefile.am 2004-06-23 18:19:28.030040616 +1000 ++++ krb4-1.2.2.am/lib/roken/Makefile.am 2004-06-23 18:20:10.303614056 +1000 +@@ -84,82 +84,6 @@ + write_pid.c \ + xdbm.h + +-EXTRA_libroken_la_SOURCES = \ +- chown.c \ +- copyhostent.c \ +- daemon.c \ +- ecalloc.c \ +- emalloc.c \ +- erealloc.c \ +- estrdup.c \ +- err.c \ +- err.hin \ +- errx.c \ +- fchown.c \ +- flock.c \ +- fnmatch.c \ +- fnmatch.hin \ +- freehostent.c \ +- gai_strerror.c \ +- getdtablesize.c \ +- getegid.c \ +- geteuid.c \ +- getgid.c \ +- gethostname.c \ +- getifaddrs.c \ +- getipnodebyaddr.c \ +- getipnodebyname.c \ +- getopt.c \ +- gettimeofday.c \ +- getuid.c \ +- getusershell.c \ +- glob.hin \ +- hstrerror.c \ +- ifaddrs.hin \ +- inet_aton.c \ +- inet_ntop.c \ +- inet_pton.c \ +- initgroups.c \ +- innetgr.c \ +- iruserok.c \ +- lstat.c \ +- memmove.c \ +- mkstemp.c \ +- putenv.c \ +- rcmd.c \ +- readv.c \ +- recvmsg.c \ +- sendmsg.c \ +- setegid.c \ +- setenv.c \ +- seteuid.c \ +- strcasecmp.c \ +- strdup.c \ +- strerror.c \ +- strftime.c \ +- strlcat.c \ +- strlcpy.c \ +- strlwr.c \ +- strncasecmp.c \ +- strndup.c \ +- strnlen.c \ +- strptime.c \ +- strsep.c \ +- strsep_copy.c \ +- strtok_r.c \ +- strupr.c \ +- swab.c \ +- unsetenv.c \ +- verr.c \ +- verrx.c \ +- vis.hin \ +- vsyslog.c \ +- vwarn.c \ +- vwarnx.c \ +- warn.c \ +- warnx.c \ +- writev.c +- + EXTRA_DIST = roken.awk roken.h.in + + libroken_la_LIBADD = @LTLIBOBJS@ $(DBLIB) Added: tinysofa/snapshot/krbafs/current/sources/krbafs.versions =================================================================== --- tinysofa/snapshot/krbafs/current/sources/krbafs.versions 2004-07-01 15:37:47 UTC (rev 2575) +++ tinysofa/snapshot/krbafs/current/sources/krbafs.versions 2004-07-01 15:37:49 UTC (rev 2576) @@ -0,0 +1,15 @@ +{ + global: + k_hasafs; + krb_afslog; + krb_afslog_uid; + krb_afslog_home; + krb_afslog_uid_home; + krb_realm_of_cell; + k_pioctl; + k_unlog; + k_setpag; + k_afs_cell_of_file; + krbafs_settoken; + local: *; +}; Added: tinysofa/snapshot/krbafs/current/specs/krbafs.spec =================================================================== --- tinysofa/snapshot/krbafs/current/specs/krbafs.spec 2004-07-01 15:37:47 UTC (rev 2575) +++ tinysofa/snapshot/krbafs/current/specs/krbafs.spec 2004-07-01 15:37:49 UTC (rev 2576) @@ -0,0 +1,287 @@ +Name: krbafs +Version: 1.2.2 +Release: 2.1ts +Source: ftp://ftp.pdc.kth.se/pub/krb/src/krb4-%{version}.tar.gz +Source1: krbafs.versions +Patch: krbafs-1.2.2-am_fix.patch +License: Freely Distributable +Group: System Environment/Libraries +Summary: A Kerberos to AFS bridging library, built against Kerberos 5. +Buildroot: %{_tmppath}/%{name}-%{version}-root +BuildPrereq: krb5-devel, autoconf, automake, libtool, gcc-c++ + +%define k5prefix /usr/kerberos + +%description +This package contains the krbafs shared library, which allows programs +to obtain AFS network filesystem tokens using Kerberos IV credentials, +without having to link with official AFS libraries which may not be +available for a given platform. + +%package utils +Summary: Kerberos/AFS utilities. +Group: Applications/System +Requires: %{name} = %{version}-%{release} + +%description utils +Kerberos is a network authentication system. The krbafs-utils package +contains versions of afslog, pagsh, and kstring2key that are linked +against libkrbafs (a Kerberos to AFS bridging library). + +%package devel +Summary: Development files for use with the krbafs package. +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} + +%description devel +This package contains header files and static libraries for use when +building applications which use the krbafs library. + +%changelog +* Tue Mar 02 2004 Elliot Lee +- rebuilt + +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Mon Jul 21 2003 Nalin Dahyabhai 1.2.2-1 +- rebuild + +* Tue Jul 8 2003 Nalin Dahyabhai 1.2.2-0 +- move from %%{k5prefix} to %%{_prefix} + +* Wed Jun 04 2003 Elliot Lee 1.1.1-10 +- rebuilt + +* Wed Apr 30 2003 Nalin Dahyabhai 1.2.2-0 +- update to 1.2.2 + +* Wed Jan 22 2003 Tim Powers 1.1.1-9 +- rebuilt + +* Tue Dec 03 2002 Elliot Lee 1.1.1-8 +- Remove unpackaged files + +* Tue Oct 9 2002 Nalin Dahyabhai 1.1.1-7 +- backport dns resolver from 1.2 to properly handle truncated responses +- fixup paths for multilib systems + +* Mon Aug 12 2002 Nalin Dahyabhai 1.1.1-6 +- reference files in the source tree properly at build-time + +* Wed Jul 17 2002 Nalin Dahyabhai 1.1.1-5 +- own the man page directory + +* Fri Jun 21 2002 Tim Powers +- automated rebuild + +* Sun May 26 2002 Tim Powers +- automated rebuild + +* Thu May 16 2002 Nalin Dahyabhai 1.1.1-2 +- rebuild in new environment + +* Fri Mar 1 2002 Nalin Dahyabhai 1.1.1-1 +- update to 1.1.1 +- build shared only, and use a map file to only export symbols from the + shared library which are declared in the header + +* Fri Feb 22 2002 Nalin Dahyabhai 1.1-4 +- rebuild + +* Wed Jan 09 2002 Tim Powers +- automated rebuild + +* Tue Nov 13 2001 Nalin Dahyabhai 1.1-2 +- remove explicit dependency on krb5-libs + +* Thu Oct 18 2001 Nalin Dahyabhai 1.1-1 +- update to 1.1 + +* Thu Aug 16 2001 Nalin Dahyabhai +- obey RPM_OPT_FLAGS + +* Tue Jul 24 2001 Nalin Dahyabhai +- update to 1.0.9 + +* Wed Jul 11 2001 Nalin Dahyabhai +- break out the -devel subpackage +- make the subpackages require the main package + +* Thu Jul 5 2001 Nalin Dahyabhai +- include sample krb.conf and krb.realms files from the source package + in the binary package, tweaked for the EXAMPLE.COM realm +- add doc files + +* Tue Apr 24 2001 Nalin Dahyabhai +- update to 1.0.8 + +* Thu Dec 28 2000 Nalin Dahyabhai +- update to 1.0.5 + +* Mon Dec 11 2000 Nalin Dahyabhai +- update to 1.0.4 + +* Mon Oct 23 2000 Nalin Dahyabhai +- update to 1.0.3 + +* Mon Oct 9 2000 Nalin Dahyabhai +- drop dangling symlink (#18750) + +* Wed Aug 16 2000 Nalin Dahyabhai +- fix summary and description + +* Thu Jul 13 2000 Prospector +- automatic rebuild + +* Thu Jun 29 2000 Nalin Dahyabhai +- update to 1.0.2 + +* Tue Jun 27 2000 Nalin Dahyabhai +- rebuild in new build environment (release 3) + +* Sun Jun 4 2000 Nalin Dahyabhai +- fix for compiling with new gcc + +* Tue Mar 14 2000 Nalin Dahyabhai +- update to 1.0.1 + +* Tue Mar 7 2000 Jeff Johnson +- rebuild for sparc baud rates > 38400. + +* Thu Mar 02 2000 Nalin Dahyabhai +- add Requires: krb5-libs and BuildPrereq: krb5-devel + +* Thu Jan 06 2000 Nalin Dahyabhai +- make prefix changeable in case we decide to move it later + +* Wed Dec 16 1999 Nalin Dahyabhai +- update to 1.0 (whee!) + +* Mon Dec 13 1999 Nalin Dahyabhai +- link shared lib against libresolv and libcrypt to help resolve symbols in + configure tests +- make %ifarch ppc parts %ifnarch i386 + +* Thu Dec 02 1999 Jeremy Katz +- Build the static lib for libkrbafs as well as linking against all the necessary libs + with the shared lib +* Wed Dec 01 1999 Jeremy Katz +- Added ppc-specific symlinking afslog as replacement for aklog + +* Tue Nov 30 1999 Nalin Dahyabhai +- initial version + +%prep +%setup -q -n krb4-%{version} +# Do a large amount of renaming to keep from conflicting with versions of +# libkafs in the wild. +find . -type f | xargs perl -pi -e 's,kafs,krbafs,g' +find . -type f | xargs perl -pi -e 's,krb_life_to_time,krbafs_life_to_time,g' +find . -type f | xargs perl -pi -e 's,krb_time_to_life,krbafs_time_to_life,g' +find . -type f | xargs perl -pi -e 's,afs_string_to_key,krbafs_string_to_key,g' +find . -type d -name "*kafs*" | xargs rename kafs krbafs +find . -type f -name "*kafs*" | xargs rename kafs krbafs +sed 's,MY.REALM.NAME,EXAMPLE.COM,g' etc/krb.realms > krb.realms +sed 's,MY.REALM.NAME,EXAMPLE.COM,g' etc/krb.conf > krb.conf + +%patch -p1 + +libtoolize -f -c +aclocal -I cf +automake +autoheader +autoconf + +%build +# First, configure the source tree. +CFLAGS="$RPM_OPT_FLAGS -fPIC" \ +LIBS="-lcrypt" \ +%configure \ + --enable-shared --disable-static \ + --without-readline \ + --without-hesiod \ + --without-openssl + +# We define this macro to override settings to allow us to use headers and +# libraries from an installed krb5 setup. +%define makesub make INCLUDE_krb4="-I%{_includedir}/kerberosIV" INCLUDE_des="-I%{_includedir}/kerberosIV -I`pwd`/lib/krbafs" LIB_krb4="-lkrb4 -lcrypt" LIB_des="-ldes425 -lk5crypto -lcrypt" LIB_roken= + +# Generate needed header files and libraries. +%makesub -C include protos.h +%makesub -C lib/roken roken.h +%makesub -C lib/krb krb.h + +for subdir in lib/krbafs appl/afsutil ; do + # Copy over headers which will need to be used by additional modules. + cp -f lib/krb/krb_locl.h ${subdir} + cp -f lib/krb/krb_log.h ${subdir} + cp -f lib/krb/krb-protos.h ${subdir} + cp -f lib/krb/prot.h ${subdir} + cp -f include/protos.h ${subdir} + + # Copy some of the modules from libkrb to the library. + krbc="get_default_principal lifetime str2key" + krbo="get_default_principal.o lifetime.o str2key.o" + krblo="get_default_principal.lo lifetime.lo str2key.lo" + for krb in $krbc ; do + cp -f lib/krb/${krb}.c ${subdir} + %makesub -C ${subdir} ${krb}.lo + done + + # Copy some of the modules from libroken to the library. + rokenc="esetenv getprogname k_getpwuid setprogname strlwr" + rokeno="esetenv.o getprogname.o k_getpwuid.o setprogname.o strlwr.o" + rokenlo="esetenv.lo getprogname.lo k_getpwuid.lo setprogname.lo strlwr.lo" + for roken in $rokenc ; do + cp -f lib/roken/${roken}.c ${subdir} + %makesub -C ${subdir} ${roken}.lo + done +done + +# Build the shared library, adding in the modules needed to keep the library +# from having undesirable undefined symbols. +%makesub -C lib/krbafs libkrbafs.la \ + libkrbafs_la_DEPENDENCIES= \ + libkrbafs_la_LIBADD="${krblo} ${rokenlo}" \ + libkrbafs_la_LDFLAGS="-Wl,-version-script=%{SOURCE1}" + +# Build the bundled apps. +cp -f lib/roken/strlcpy.c appl/afsutil +%makesub -C appl/afsutil strlcpy.lo +%makesub -C appl/afsutil \ + LDADD="../../lib/krbafs/libkrbafs.la ${krblo} ${rokenlo} strlcpy.lo "'$(LIB_krb4)' + +%clean +[ "$RPM_BUILD_ROOT" != "/" ] && rm -fr $RPM_BUILD_ROOT + +%install +[ "$RPM_BUILD_ROOT" != "/" ] && rm -fr $RPM_BUILD_ROOT +%makesub -C lib/krbafs install DESTDIR=$RPM_BUILD_ROOT libkrbafs_la_DEPENDENCIES= +%makesub -C appl/afsutil install DESTDIR=$RPM_BUILD_ROOT +test -d $RPM_BUILD_ROOT%{_sysconfdir} || mkdir -p $RPM_BUILD_ROOT%{_sysconfdir} +install -m644 krb.conf krb.realms $RPM_BUILD_ROOT%{_sysconfdir} + +rm -rf $RPM_BUILD_ROOT%{_libdir}/*.la \ + $RPM_BUILD_ROOT%{_mandir}/cat* + +%post -p /sbin/ldconfig + +%postun -p /sbin/ldconfig + +%files +%defattr(-,root,root) +%doc COPYRIGHT lib/krbafs/ChangeLog +%config(noreplace) %{_sysconfdir}/* +%{_libdir}/*.so.*.* + +%files devel +%defattr(-,root,root) +%{_includedir}/* +%{_libdir}/*.so +%{_mandir}/man3/*.3* + +%files utils +%defattr(-,root,root) +%{_bindir}/* +%{_mandir}/man1/*.1* From svn at tinysofa.org Thu Jul 1 15:37:06 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:37:06 +1000 (EST) Subject: [tinysofa-svn] r2563 - in tinysofa/snapshot: . gtk2-engines gtk2-engines/current gtk2-engines/current/sources gtk2-engines/current/specs Message-ID: <20040701153706.D02514E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:37:06 +1000 (Fri, 02 Jul 2004) New Revision: 2563 Added: tinysofa/snapshot/gtk2-engines/ tinysofa/snapshot/gtk2-engines/current/ tinysofa/snapshot/gtk2-engines/current/sources/ tinysofa/snapshot/gtk2-engines/current/sources/gtk-engines-2.2.0.tar.bz2 tinysofa/snapshot/gtk2-engines/current/specs/ tinysofa/snapshot/gtk2-engines/current/specs/gtk2-engines.spec Log: - Add gtk2-engines to snapshot from 2.0. Added: tinysofa/snapshot/gtk2-engines/current/sources/gtk-engines-2.2.0.tar.bz2 =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/gtk2-engines/current/sources/gtk-engines-2.2.0.tar.bz2 ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/gtk2-engines/current/specs/gtk2-engines.spec =================================================================== --- tinysofa/snapshot/gtk2-engines/current/specs/gtk2-engines.spec 2004-07-01 15:37:04 UTC (rev 2562) +++ tinysofa/snapshot/gtk2-engines/current/specs/gtk2-engines.spec 2004-07-01 15:37:06 UTC (rev 2563) @@ -0,0 +1,217 @@ +Summary: Theme engines for GTK+ 2.0 +Name: gtk2-engines +Version: 2.2.0 +Release: 5ts +Copyright: GPL +Group: System Environment/Libraries +Source: gtk-engines-%{version}.tar.bz2 + +Requires: gtk2 >= 2.2.0 +BuildPrereq: gtk2-devel >= 2.2.0 + +URL: ftp://ftp.gnome.org/pub/GNOME/sources/gtk-engines +BuildRoot: %{_tmppath}/%{name}-%{version}-root + +%description +The gtk2-engines package contains shared objects and configuration +files that implement a number of GTK+ theme engines. Theme engines +provide different looks for GTK+, some of which resemble other +toolkits or operating systems. This package is for GTK+ 2.0, +the gtk+-engines package is for GTK+ 1.2. + +%prep +%setup -q -n gtk-engines-%{version} + +%build + +%configure +make + +%install +rm -rf $RPM_BUILD_ROOT + +%makeinstall + +# remove backup files that shouldn't be here. Fix me. +find $RPM_BUILD_ROOT%{_datadir}/themes -name \*~ | xargs rm -rvf + +# No, we don't need to package these either +find $RPM_BUILD_ROOT%{_datadir}/themes -type d -name ".xvpics" | xargs rm -rvf + +# sanitize permissions +find $RPM_BUILD_ROOT%{_datadir}/themes -type d -exec chmod 755 {} \; +find $RPM_BUILD_ROOT%{_datadir}/themes -type f -name "*.png" -exec chmod 644 {} \; +find $RPM_BUILD_ROOT%{_datadir}/themes -name "gtkrc*" -perm +111 -exec chmod 644 {} \; + +find $RPM_BUILD_ROOT%{_libdir} -name "*.la" | xargs rm + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(644, root, root, 755) +%doc COPYING README ChangeLog + +%attr (755, root, root) %{_libdir}/gtk-2.0/*/engines/*.so +%dir %{_libdir}/gtk-2.0 +%dir %{_libdir}/gtk-2.0/* +%dir %{_libdir}/gtk-2.0/*/engines +%{_libdir}/pkgconfig +%{_datadir}/themes + +%changelog +* Wed Mar 17 2004 Alex Larsson 2.2.0-5 +- rebuilt to get new gtk binary age + +* Tue Mar 02 2004 Elliot Lee +- rebuilt + +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Wed Jun 04 2003 Elliot Lee +- rebuilt + +* Wed Jan 22 2003 Tim Powers +- rebuilt + +* Fri Jan 17 2003 Owen Taylor +- Upgrade to 2.2.0 (Fixes #65985, #73475) +- Add the .pc file to the package + +* Tue Dec 17 2002 Owen Taylor +- Rebuild for new GTK+ + +* Mon Dec 9 2002 Havoc Pennington +- rebuild + +* Fri Jun 21 2002 Tim Powers +- automated rebuild + +* Thu May 23 2002 Tim Powers +- automated rebuild + +* Thu May 02 2002 Havoc Pennington +- rebuild in different environment + +* Thu Apr 25 2002 Havoc Pennington +- converted to gtk2-engines package + +* Mon Apr 15 2002 Alex Larsson +- Added Adept-Raleigh theme + +* Thu Apr 11 2002 Owen Taylor +- Fix major pixmap leak that occurred with certain theme/app + combinations (#59528) + +* Wed Mar 13 2002 Owen Taylor +- Add gtk-hicontrast theme +- Un-automake-1.4 + +* Thu Jan 24 2002 Havoc Pennington +- remove acinclude.m4 to avoid funky libtool crackrock + +* Tue Jan 22 2002 Havoc Pennington +- automake14 + +* Thu Aug 9 2001 Owen Taylor +- Install %{_sysconfdir}/skel/.gtkrc as /root/.gtkrc as well, or we + don't get Raleigh for our nice config tools + +* Sat Jul 21 2001 Owen Taylor +- Add BuildPrereq on imlib-devel (#49478) + +* Tue Jul 10 2001 Owen Taylor +- Version 0.11 +- Install a %{_sysconfdir}/skel/.gtkrc + +* Sun Jun 24 2001 Elliot Lee +- Bump release + rebuild. + +* Sat Feb 10 2001 Owen Taylor +- New, slightly improved version of Raleigh + +* Sun Feb 04 2001 Owen Taylor +- Require as well as BuildPrereq a sufficiently new GTK+ package. + +* Wed Jan 17 2001 Owen Taylor +- remove references to /home/raster from a couple of themes + +* Tue Nov 21 2000 Owen Taylor +- Add 'Raleigh' theme + +* Fri Aug 11 2000 Jonathan Blandford +- Up Epoch and release + +* Thu Jul 13 2000 Owen Taylor +- Go back to real gtk-engines-0.10.tar.gz instead of hosed + cvs snapshot that someone had inserted. + +* Thu Jul 13 2000 Prospector +- automatic rebuild + +* Mon Jun 19 2000 Dave Mason +- Removed many themes to speed up control center and get rid of ugly themes + +* Sat Jun 17 2000 Matt Wilson +- defattr files 644 and dirs 755, list attr of 755 for libraries explicitly +- use %%makeinstall +- remove spec file stupidism (defining docdir, using own prefix macro, rel, ver, etc) + +* Tue May 16 2000 Dave Mason +- fixed Tiger, RatsTheme, OldWood, and LCD themes as they had no gtk subdirectory + +* Tue Feb 22 2000 Bill Nottingham +- sanitize various things (permissions, .xv thumbnails) + +* Thu Feb 10 2000 Preston Brown +- remove backup files from package + +* Tue Jan 25 2000 Owen Taylor +- Update to 0.10 (fixing problem with text in eventboxes + becoming garbled) + +* Wed Sep 15 1999 Elliot Lee +- Misc fixes from DrMike suggestions + +* Thu Sep 09 1999 Elliot Lee +- Update to 0.6, etc. + +* Wed Apr 14 1999 Michael Fulbright +- removed Odo (has issues) + +* Fri Apr 9 1999 The Rasterman +- patched metal theme - fixed handlebox redraw. + +* Wed Mar 31 1999 Michael Fulbright +- removed some themes that were misbehaving + +* Tue Mar 16 1999 Michael Fulbright +- removed enlightened themes, seems to be defective + +* Thu Mar 11 1999 Michael Fulbright +- removed Default theme data, this comes with gtk+ package + +* Wed Mar 10 1999 Michael Fulbright +- added extra gtk themes + +* Thu Mar 04 1999 Michael Fulbright +- version 0.5 + +* Fri Feb 12 1999 Michael Fulbright +- version 0.4 + +* Wed Feb 03 1999 Michael Fulbright +- version 0.3 + +* Mon Dec 18 1998 Michael Fulbright +- version 0.2 + +* Wed Dec 16 1998 Michael Fulbright +- rebuild because gtk+ version changed + +* Wed Dec 16 1998 Michael Fulbright +- in preparation for GNOME freeze + +* Fri Nov 20 1998 Michael Fulbright +- First try at a spec file From svn at tinysofa.org Thu Jul 1 15:39:05 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:39:05 +1000 (EST) Subject: [tinysofa-svn] r2608 - in tinysofa/snapshot: . nano nano/current nano/current/sources nano/current/specs Message-ID: <20040701153905.0964B4E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:39:04 +1000 (Fri, 02 Jul 2004) New Revision: 2608 Added: tinysofa/snapshot/nano/ tinysofa/snapshot/nano/current/ tinysofa/snapshot/nano/current/sources/ tinysofa/snapshot/nano/current/sources/nano-1.2.3.tar.gz tinysofa/snapshot/nano/current/specs/ tinysofa/snapshot/nano/current/specs/nano.spec Log: - Add nano to snapshot from 2.0. Added: tinysofa/snapshot/nano/current/sources/nano-1.2.3.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/nano/current/sources/nano-1.2.3.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/nano/current/specs/nano.spec =================================================================== --- tinysofa/snapshot/nano/current/specs/nano.spec 2004-07-01 15:39:01 UTC (rev 2607) +++ tinysofa/snapshot/nano/current/specs/nano.spec 2004-07-01 15:39:04 UTC (rev 2608) @@ -0,0 +1,64 @@ +Summary: A small text editor +Name: nano +Version: 1.2.3 +Release: 1ts +License: GPL +Group: Applications/Editors +URL: http://www.nano-editor.org +Source: http://www.nano-editor.org/dist/v1.2/nano-%{version}.tar.gz +BuildRoot: %{_tmppath}/%{name}-%{version}-root +BuildPrereq: ncurses-devel +Prereq: /sbin/install-info + +%description +GNU nano is a small and friendly text editor. + +%prep +%setup -q + +%build +%configure --enable-all +make + +%install +rm -rf %{buildroot} +make DESTDIR="%{buildroot}" install +#ln -s nano %{buildroot}%{_bindir}/pico +rm -f %{buildroot}%{_infodir}/dir + +%find_lang %{name} + +%post +/sbin/install-info %{_infodir}/%{name}.info.gz %{_infodir}/dir + +%postun +/sbin/install-info --delete %{_infodir}/%{name}.info.gz %{_infodir}/dir + +%clean +rm -rf %{buildroot} + +%files -f %{name}.lang +%defattr(-,root,root) +%doc AUTHORS BUGS COPYING ChangeLog INSTALL NEWS README THANKS TODO nanorc.sample +%{_bindir}/* +%{_mandir}/man*/* +%{_infodir}/nano.info* + +%changelog +* Fri Apr 02 2004 Florian La Roche +- 1.2.3 + +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Mon Aug 11 2003 Bill Nottingham 1.2.1-4 +- build in different environment + +* Wed Jun 04 2003 Elliot Lee +- rebuilt + +* Tue May 6 2003 Bill Nottingham 1.2.1-2 +- description tweaks + +* Mon May 5 2003 Bill Nottingham 1.2.1-1 +- initial build, tweak upstream spec file From svn at tinysofa.org Thu Jul 1 15:38:01 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:38:01 +1000 (EST) Subject: [tinysofa-svn] r2583 - in tinysofa/snapshot: . libungif libungif/current libungif/current/sources libungif/current/specs Message-ID: <20040701153801.D3CA04E817D@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:38:01 +1000 (Fri, 02 Jul 2004) New Revision: 2583 Added: tinysofa/snapshot/libungif/ tinysofa/snapshot/libungif/current/ tinysofa/snapshot/libungif/current/sources/ tinysofa/snapshot/libungif/current/sources/libungif-4.1.2.tar.bz2 tinysofa/snapshot/libungif/current/specs/ tinysofa/snapshot/libungif/current/specs/libungif.spec Log: - Add libungif to snapshot from 2.0. Added: tinysofa/snapshot/libungif/current/sources/libungif-4.1.2.tar.bz2 =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/libungif/current/sources/libungif-4.1.2.tar.bz2 ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/libungif/current/specs/libungif.spec =================================================================== --- tinysofa/snapshot/libungif/current/specs/libungif.spec 2004-07-01 15:37:59 UTC (rev 2582) +++ tinysofa/snapshot/libungif/current/specs/libungif.spec 2004-07-01 15:38:01 UTC (rev 2583) @@ -0,0 +1,192 @@ +Summary: A library for manipulating GIF format image files. +Name: libungif +Version: 4.1.2 +Release: 2ts +License: MIT +URL: http://sourceforge.net/projects/libungif/ +Source: http://osdn.dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.bz2 +#Patch: libungif-4.1.0-stdarg.patch +Group: System Environment/Libraries +BuildRoot: %{_tmppath}/%{name}-%{version}-root +# The following libgif.so handles packages built against the +# previous broken giflib package +Provides: libgif.so giflib +Obsoletes: giflib + +%description +The libungif package contains a shared library of functions for +loading and saving GIF format image files. The libungif library can +load any GIF file, but it will save GIFs only in uncompressed format +(i.e., it won't use the patented LZW compression used to save "normal" +compressed GIF files). + +Install the libungif package if you need to manipulate GIF files. You +should also install the libungif-progs package. + +%package devel +Summary: Development tools for programs which will use the libungif library. +Group: Development/Libraries +Requires: %{name} = %{version} + +%description devel +This package contains the static libraries, header files and +documentation necessary for development of programs that will use the +libungif library to load and save GIF format image files. + +You should install this package if you need to develop programs which +will use libungif library functions. You'll also need to install the +libungif package. + +%package progs +Summary: Programs for manipulating GIF format image files. +Group: Applications/Multimedia +Requires: %{name} = %{version} + +%description progs +The libungif-progs package contains various programs for manipulating +GIF format image files. + +Install this package if you need to manipulate GIF format image files. +You'll also need to install the libungif package. + +%prep +%setup -q -n %{name}-%{version} + +%build +%configure +make all + +%install +rm -rf ${RPM_BUILD_ROOT} + +%{makeinstall} +ln -sf libungif.so.%{version} ${RPM_BUILD_ROOT}%{_libdir}/libgif.so.%{version} +ln -sf libgif.so.%{version} ${RPM_BUILD_ROOT}%{_libdir}/libgif.so.4 +ln -sf libgif.so.4 ${RPM_BUILD_ROOT}%{_libdir}/libgif.so +ln -sf libungif.a ${RPM_BUILD_ROOT}%{_libdir}/libgif.a + +chmod 755 ${RPM_BUILD_ROOT}%{_libdir}/*.so* +chmod 644 ${RPM_BUILD_ROOT}%{_libdir}/*.a* +chmod 644 COPYING README UNCOMPRESSED_GIF NEWS ONEWS +chmod 644 ChangeLog TODO BUGS AUTHORS +chmod 644 doc/* util/giffiltr.c util/gifspnge.c + +%clean +rm -rf ${RPM_BUILD_ROOT} + +%post -p /sbin/ldconfig + +%postun -p /sbin/ldconfig + +%files +%defattr(-,root,root) +%doc COPYING README UNCOMPRESSED_GIF NEWS ONEWS +%doc ChangeLog TODO BUGS AUTHORS +%{_libdir}/lib*.so.* + +%files devel +%defattr(-,root,root) +%doc doc/* util/giffiltr.c util/gifspnge.c +%{_libdir}/lib*.a +%{_libdir}/lib*.so +%{_libdir}/lib*.la +%{_includedir}/*.h + +%files progs +%defattr(-,root,root) +%{_bindir}/* + +%changelog +* Thu May 20 2004 Matthias Clasen - 4.1.2-2 +- Add some forgotten doc files back + +* Wed May 19 2004 Matthias Clasen 4.1.2-1 +- Upgrade to 4.1.2 +- Cleaned up and updated spec file + +* Tue Mar 02 2004 Elliot Lee +- rebuilt + +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Wed Jun 04 2003 Elliot Lee +- rebuilt + +* Wed Jan 22 2003 Tim Powers +- rebuilt + +* Thu Dec 12 2002 Tim Powers 4.1.0-14 +- rebuild on all arches + +* Fri Jun 21 2002 Tim Powers +- automated rebuild + +* Thu May 23 2002 Tim Powers +- automated rebuild + +* Thu Jan 24 2002 Bernhard Rosenkraenzer 4.1.0-10 +- Clean up spec file +- Fix build with current auto* tools + +* Fri Jun 08 2001 Than Ngo +- fix to build against new libtool + +* Wed Jan 10 2001 Bernhard Rosenkraenzer +- Add some fixes from the current CVS tree + +* Thu Jul 27 2000 Bernhard Rosenkraenzer +- Make the subpackages require the base package (Bug #14697) +- update URL +- add fixes from the homepage + +* Thu Jul 13 2000 Prospector +- automatic rebuild + +* Sat Jun 3 2000 Nalin Dahyabhai +- FHS adjustments (release 5) + +* Mon Feb 14 2000 Elliot Lee 4.1.0-4 +- Add giflibcvs-small2crash.patch, which changes lib/dgif_lib.c to be + whatever is currently in the libungif CVS, thus fixing bug number 9315. + +* Sat Feb 5 2000 Bernhard Rosenkraenzer +- strip libraries +- update URL +- some specfile tweaks + +* Sun Mar 21 1999 Cristian Gafton +- auto rebuild in the new build environment (release 2) + +* Sun Mar 14 1999 Preston Brown +- include libungif 4.1.0 as standard library, with 3.1.0 backwards compat. + +* Mon Jan 11 1999 Cristian Gafton +- build for 6.0 +- call libtoolize to make sure it will build on the arm + +* Sat Oct 31 1998 Jeff Johnson +- package for RH 5.2. + +* Mon Sep 14 1998 Arne Coucheron + [3.1.0-3] +- major cleanups and changes to the spec file + +* Mon Sep 7 1998 Toshio Kuratomi +- Upgrade to version 3.1.0 (which incorporates the patches in 3.0-4) +- Updated Source: and URL: to reflect change in directories/pages. + +* Tue May 26 1998 Dick Porter +- Fixed some "warning: cast to pointer from integer of different size" on Alpha + +* Tue May 5 1998 Marc Ewing +- Made it obsolete giflib and provide libgif.so and giflib (previous + giflib packages were built incorrectly and packages built against + it require libgif.so but work fine with this package) +- cleaned buildroot +- Removed Toshio as packager so he doesn't get yelled at when Red Hat + breaks it :-) + +* Fri Apr 24 1998 Toshio Kuratomi +- Initial revision of libungif, a giflib derivative modified to not use LZW + compression. From svn at tinysofa.org Thu Jul 1 15:37:57 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:37:57 +1000 (EST) Subject: [tinysofa-svn] r2580 - in tinysofa/snapshot: . libglade2 libglade2/current libglade2/current/sources libglade2/current/specs Message-ID: <20040701153757.B0B084E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:37:57 +1000 (Fri, 02 Jul 2004) New Revision: 2580 Added: tinysofa/snapshot/libglade2/ tinysofa/snapshot/libglade2/current/ tinysofa/snapshot/libglade2/current/sources/ tinysofa/snapshot/libglade2/current/sources/libglade-2.0.1-nowarning.patch tinysofa/snapshot/libglade2/current/sources/libglade-2.4.0.tar.bz2 tinysofa/snapshot/libglade2/current/specs/ tinysofa/snapshot/libglade2/current/specs/libglade2.spec Log: - Add libglade2 to snapshot from 2.0. Added: tinysofa/snapshot/libglade2/current/sources/libglade-2.0.1-nowarning.patch =================================================================== --- tinysofa/snapshot/libglade2/current/sources/libglade-2.0.1-nowarning.patch 2004-07-01 15:37:55 UTC (rev 2579) +++ tinysofa/snapshot/libglade2/current/sources/libglade-2.0.1-nowarning.patch 2004-07-01 15:37:57 UTC (rev 2580) @@ -0,0 +1,39 @@ +--- libglade-2.0.1/glade/glade-gtk.c.nowarning 2003-08-29 14:50:10.000000000 -0400 ++++ libglade-2.0.1/glade/glade-gtk.c 2003-08-29 14:58:41.000000000 -0400 +@@ -639,9 +639,8 @@ + if (!strcmp (childinfo->properties[j].name, "label")) { + label = childinfo->properties[j].value; + break; +- } else { +- g_warning ("Unknown CList child property: %s", childinfo->properties[j].name); + } ++ /* Ignore all other properties */ + } + + if (label) { +@@ -683,6 +682,7 @@ + char *icon = NULL; + gboolean use_stock = FALSE, active = FALSE, new_group = FALSE; + gboolean use_underline = FALSE; ++ gboolean sensitive = TRUE; + GtkWidget *iconw = NULL; + int j; + +@@ -708,6 +708,8 @@ + group_name = value; + } else if (!strcmp (name, "new_group")) { + new_group = BOOL (value); ++ } else if (!strcmp (name, "sensitive")) { ++ sensitive = BOOL (value); + } else if (!strcmp (name, "visible")) { + /* ignore for now */ + } else if (!strcmp (name, "tooltip")) { +@@ -785,6 +787,8 @@ + gtk_label_set_use_underline (GTK_LABEL (toolbar_child->label), + TRUE); + } ++ ++ gtk_widget_set_sensitive (child, sensitive); + + glade_xml_set_common_params (xml, child, childinfo->child); + } else { Added: tinysofa/snapshot/libglade2/current/sources/libglade-2.4.0.tar.bz2 =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/libglade2/current/sources/libglade-2.4.0.tar.bz2 ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/libglade2/current/specs/libglade2.spec =================================================================== --- tinysofa/snapshot/libglade2/current/specs/libglade2.spec 2004-07-01 15:37:55 UTC (rev 2579) +++ tinysofa/snapshot/libglade2/current/specs/libglade2.spec 2004-07-01 15:37:57 UTC (rev 2580) @@ -0,0 +1,244 @@ +%define libxml2_version 2.4.12-0.7 +%define gtk2_version 2.3.2 +%define pango_version 1.3.2 + +Summary: The libglade library for loading user interfaces. +Name: libglade2 +Version: 2.4.0 +Release: 1ts +Copyright: LGPL +Group: System Environment/Libraries +Source: libglade-%{version}.tar.bz2 +URL: http://www.gnome.org +BuildRoot: %{_tmppath}/%{name}-%{version}-root +Requires: libxml2 >= %{libxml2_version} +BuildRequires: libxml2-devel >= %{libxml2_version} +BuildRequires: gtk2-devel >= %{gtk2_version} +BuildRequires: fontconfig +BuildRequires: pango-devel >= %{pango_version} +BuildRequires: libtool + +# http://bugzilla.gnome.org/show_bug.cgi?id=121025 +Patch1: libglade-2.0.1-nowarning.patch + +%description +Libglade is a small library that allows a program to load its user +interface from am XML description at runtime. Libglade uses the XML +file format used by the GLADE user interface builder GLADE, so +libglade acts as an alternative to GLADE's code generation +approach. Libglade also provides a simple interface for connecting +handlers to the various signals in the interface (on platforms where +the gmodule library works correctly, it is possible to connect all the +handlers with a single function call). Once the interface has been +instantiated, libglade gives no overhead, so other than the short +initial interface loading time, there is no performance tradeoff. + +%package devel +Summary: The files needed for libglade application development. +Group: Development/Libraries +Requires: %name = %{PACKAGE_VERSION} +Requires: libxml2-devel >= %{libxml2_version} +Requires: gtk2-devel >= %{gtk2_version} +Conflicts: libglade < 0.17 + +%description devel +The libglade-devel package contains the libraries and include files +that you can use to develop libglade applications. + +%prep +%setup -q -n libglade-%{version} + +%patch1 -p1 -b .nowarning + +%build +libtoolize --force --copy +#aclocal +#automake + +%configure --disable-gtk-doc +make %{?_smp_mflags} + +%install + +rm -rf $RPM_BUILD_ROOT +%makeinstall + +rm $RPM_BUILD_ROOT%{_libdir}/*.la + +%clean +rm -rf $RPM_BUILD_ROOT + +%post -p /sbin/ldconfig +%postun -p /sbin/ldconfig + +%files +%defattr(-, root, root) +%doc AUTHORS ChangeLog NEWS README COPYING +%{_libdir}/lib*.so.* +%{_datadir}/xml + +%files devel +%defattr(-, root, root) +%doc test-libglade.c +%{_bindir}/* +%{_libdir}/lib*.so +%{_libdir}/*.a +%{_libdir}/pkgconfig/* +%{_includedir}/* +%{_datadir}/gtk-doc + +%changelog +* Thu May 20 2004 Matthias Clasen - 2.4.0-1 +- Upgrade to 2.4.0 + +* Wed Mar 10 2004 Mark McLoughlin 2.3.6-1 +- Update to 2.3.6 + +* Tue Mar 02 2004 Elliot Lee +- rebuilt + +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Fri Jan 23 2004 Alexander Larsson 2.3.2-1 +- Update to 2.3.2 + +* Fri Aug 29 2003 Owen Taylor 2.0.1-5.0 +- Fix a couple of warnings for unknown properties GtkToolbar (Hardy Merrill, + #85384) and GtkCList. + +* Wed Jun 04 2003 Elliot Lee +- rebuilt + +* Fri Feb 14 2003 Tim Powers 2.0.1-3 +- remove BuildRequires on Xft + +* Wed Jan 22 2003 Tim Powers +- rebuilt + +* Fri Nov 8 2002 Havoc Pennington +- 2.0.1 + +* Tue Oct 8 2002 Havoc Pennington +- destroy .la files + +* Fri Jun 21 2002 Tim Powers +- automated rebuild + +* Sat Jun 15 2002 Havoc Pennington +- 2.0.0 +- check over file list, add XML DTD to it + +* Fri May 17 2002 Havoc Pennington +- rebuild in different environment + +* Fri May 17 2002 Havoc Pennington +- don't run auto* + +* Fri May 17 2002 Havoc Pennington +- 1.99.12 +- remove gtk-doc hack, --disable-gtk-doc now works + +* Thu May 2 2002 Havoc Pennington +- 1.99.11 + +* Thu Apr 4 2002 Jeremy Katz +- 1.99.10 + +* Tue Mar 19 2002 Alex Larsson +- Update autoconf dependency to 2.53 + +* Mon Mar 11 2002 Alex Larsson +- Update to 1.99.9 + +* Mon Feb 25 2002 Alex Larsson +- Bump for rebuild + +* Thu Feb 21 2002 Alex Larsson +- Bump for rebuild + +* Tue Feb 19 2002 Alex Larsson +- Add horrible buildroot check hacks. Require new Gtk+. + +* Thu Feb 14 2002 Havoc Pennington +- rebuild for new gtk + +* Wed Jan 30 2002 Owen Taylor +- Rebuild against new GTK+ + +* Tue Jan 22 2002 Havoc Pennington +- put "nogtkdoc" patch back, it avoids X display requirement +- automake14 + +* Wed Jan 2 2002 Havoc Pennington +- 1.99.5.90 snap +- comment out "nogtkdoc" patch, don't run autoconf + +* Mon Nov 26 2001 Havoc Pennington +- new 1.99.4.91 snap with Jacob's fixes, he + assures me we are 1.99.4.90 ABI-compatible + +* Mon Nov 26 2001 Havoc Pennington +- new 1.99.4.90 snap, gtk 1.3.11 + +* Fri Oct 26 2001 Havoc Pennington +- new snap, rebuild on gtk 1.3.10 + +* Sat Oct 6 2001 Havoc Pennington +- new snap, add hack to avoid trying to build docs +- add the ltmain.sh hack to avoid relinking + +* Mon Sep 24 2001 Havoc Pennington +- new snap + +* Fri Sep 21 2001 Havoc Pennington +- convert libglade rpm to libglade2 rpm, initial build of libglade2 + +* Mon Aug 20 2001 Jonathan Blandford +- Escape strings, #51966 + +* Sun Jul 22 2001 Havoc Pennington +- add build requires, bug #49508 + +* Sun Jun 24 2001 Elliot Lee +- Bump release + rebuild. + +* Tue Apr 17 2001 Jonathan Blandford +- New Version. + +* Thu Mar 01 2001 Owen Taylor +- Rebuild for GTK+-1.2.9 include paths + +* Thu Feb 08 2001 Florian La Roche +- add libtoolize to make porting to new archs easy + +* Fri Dec 29 2000 Matt Wilson +- 0.14 +- added patch for gtk-doc scanner linkage + +* Fri Aug 11 2000 Jonathan Blandford +- Up Epoch and release + +* Thu Jul 13 2000 Prospector +- automatic rebuild + +* Thu Jun 29 2000 Owen Taylor +- specfile fixes + +* Wed May 31 2000 Owen Taylor +- Upgraded to libglade-0.13 +- Use %makeinstall, since that is required when %configure is used. + +* Fri May 19 2000 Owen Taylor +- Upgraded to libglade-0.12 + +* Tue Sep 07 1999 Elliot Lee +- Updated RHL 6.1 package to libglade-0.5 + +* Sun Nov 1 1998 James Henstridge + +- Updated the dependencies of the devel package, so users must have gtk+-devel. + +* Sun Oct 25 1998 James Henstridge + +- Initial release 0.0.1 From svn at tinysofa.org Thu Jul 1 15:38:03 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:38:03 +1000 (EST) Subject: [tinysofa-svn] r2584 - in tinysofa/snapshot: . libunwind libunwind/current libunwind/current/sources libunwind/current/specs Message-ID: <20040701153803.E35644E817D@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:38:03 +1000 (Fri, 02 Jul 2004) New Revision: 2584 Added: tinysofa/snapshot/libunwind/ tinysofa/snapshot/libunwind/current/ tinysofa/snapshot/libunwind/current/sources/ tinysofa/snapshot/libunwind/current/sources/libunwind-0.96.tar.gz tinysofa/snapshot/libunwind/current/specs/ tinysofa/snapshot/libunwind/current/specs/libunwind.spec Log: - Add libunwind to snapshot from 2.0. Added: tinysofa/snapshot/libunwind/current/sources/libunwind-0.96.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/libunwind/current/sources/libunwind-0.96.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/libunwind/current/specs/libunwind.spec =================================================================== --- tinysofa/snapshot/libunwind/current/specs/libunwind.spec 2004-07-01 15:38:01 UTC (rev 2583) +++ tinysofa/snapshot/libunwind/current/specs/libunwind.spec 2004-07-01 15:38:03 UTC (rev 2584) @@ -0,0 +1,67 @@ +# Define this if you want to skip the strip step and preserve debug info. +# Useful for testing. +#define __spec_install_post /usr/lib/rpm/brp-compress || : +Summary: An unwinding library for ia64. +Name: libunwind +# Latest libunwind release. +Version: 0.96 +Release: 5ts +License: BSD +Group: Development/Debuggers +Source: ftp://ftp.hpl.hp.com/pub/linux-ia64/libunwind-0.96.tar.gz +Buildroot: %{_tmppath}/%{name}-%{version}-root +URL: http://www.hpl.hp.com/research/linux/libunwind/index.php4/ +ExclusiveArch: ia64 + +BuildRequires: glibc gcc make tar gzip +Prereq: info + +%description +Libunwind provides a C ABI to determine the call-chain of a program. +This version of libunwind is targetted for the ia64 platform. + +%prep +%setup + +%build +%configure +make + +%install +%makeinstall + +%clean +rm -rf $RPM_BUILD_ROOT + +%post +%preun + +%files +%defattr(-,root,root) +%doc COPYING README NEWS +%{_mandir}/*/* +/usr/lib/* +/usr/include/* + +%changelog +* Tue Jun 15 2004 Elliot Lee +- rebuilt + +* Wed Jun 09 2004 Elena Zannoni 0.96.4 +- Bump release number. + +* Mon Feb 23 2004 Elena Zannoni 0.96.3 +- Bump release number. + +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Thu Jan 29 2004 Jeff Johnston 0.96.1 +- Import version 0.96. + +* Tue Jan 06 2004 Jeff Johnston 0.92.2 +- Bump release number. + +* Mon Oct 06 2003 Jeff Johnston 0.92.1 +- Initial release + From svn at tinysofa.org Thu Jul 1 15:38:08 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:38:08 +1000 (EST) Subject: [tinysofa-svn] r2586 - in tinysofa/snapshot: . libxslt libxslt/current libxslt/current/sources libxslt/current/specs Message-ID: <20040701153808.C4EB64E817D@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:38:08 +1000 (Fri, 02 Jul 2004) New Revision: 2586 Added: tinysofa/snapshot/libxslt/ tinysofa/snapshot/libxslt/current/ tinysofa/snapshot/libxslt/current/sources/ tinysofa/snapshot/libxslt/current/sources/libxslt-1.1.7.tar.gz tinysofa/snapshot/libxslt/current/specs/ tinysofa/snapshot/libxslt/current/specs/libxslt.spec Log: - Add libxslt to snapshot from 2.0. Added: tinysofa/snapshot/libxslt/current/sources/libxslt-1.1.7.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/libxslt/current/sources/libxslt-1.1.7.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/libxslt/current/specs/libxslt.spec =================================================================== --- tinysofa/snapshot/libxslt/current/specs/libxslt.spec 2004-07-01 15:38:05 UTC (rev 2585) +++ tinysofa/snapshot/libxslt/current/specs/libxslt.spec 2004-07-01 15:38:08 UTC (rev 2586) @@ -0,0 +1,145 @@ +Summary: Library providing the Gnome XSLT engine +Name: libxslt +Version: 1.1.7 +Release: 2ts +License: MIT +Group: Development/Libraries +Source: ftp://xmlsoft.org/XSLT/libxslt-%{version}.tar.gz +BuildRoot: %{_tmppath}/%{name}-%{version}-root +URL: http://xmlsoft.org/XSLT/ +Requires: libxml2 >= 2.6.8 +BuildRequires: libxml2-devel >= 2.6.8 +BuildRequires: python python-devel +BuildRequires: libxml2-python +Prefix: %{_prefix} +Docdir: %{_docdir} + +%description +This C library allows to transform XML files into other XML files +(or HTML, text, ...) using the standard XSLT stylesheet transformation +mechanism. To use it you need to have a version of libxml2 >= 2.6.8 +installed. The xsltproc command is a command line interface to the XSLT engine + +%package devel +Summary: Libraries, includes, etc. to embed the Gnome XSLT engine +Group: Development/Libraries +Requires: libxslt = %{version} +Requires: libxml2-devel >= 2.5.6 + +%description devel +This C library allows to transform XML files into other XML files +(or HTML, text, ...) using the standard XSLT stylesheet transformation +mechanism. To use it you need to have a version of libxml2 >= 2.6.8 +installed. + +%package python +Summary: Python bindings for the libxslt library +Group: Development/Libraries +Requires: libxslt = %{version} +Requires: libxml2 >= 2.6.8 +Requires: libxml2-python >= 2.6.8 +Requires: python + +%description python +The libxslt-python package contains a module that permits applications +written in the Python programming language to use the interface +supplied by the libxslt library to apply XSLT transformations. + +This library allows to parse sytlesheets, uses the libxml2-python +to load and save XML and HTML files. Direct access to XPath and +the XSLT transformation context are possible to extend the XSLT language +with XPath functions written in Python. + +%prep +%setup -q + +%build +%configure +make +gzip -9 ChangeLog + +%install +rm -fr %{buildroot} + +%makeinstall + +%clean +rm -fr %{buildroot} + +%post +/sbin/ldconfig + +%postun +/sbin/ldconfig + +%files +%defattr(-, root, root) + +%doc AUTHORS ChangeLog.gz NEWS README Copyright TODO FEATURES +%doc doc/*.html doc/html doc/tutorial doc/*.gif +%doc %{_mandir}/man1/xsltproc.1* +%{_libdir}/lib*.so.* +%{prefix}/bin/xsltproc + +%files devel +%defattr(-, root, root) + +%doc AUTHORS ChangeLog.gz NEWS README Copyright TODO FEATURES +%doc doc/libxslt-api.xml +%doc doc/libxslt-refs.xml +%doc doc/EXSLT/libexslt-api.xml +%doc doc/EXSLT/libexslt-refs.xml +%doc %{_mandir}/man3/libxslt.3* +%doc %{_mandir}/man3/libexslt.3* +%{_libdir}/lib*.so +%{_libdir}/*a +%{_libdir}/*.sh +%{prefix}/share/aclocal/libxslt.m4 +%{prefix}/include/* +%{prefix}/bin/xslt-config +%{_libdir}/pkgconfig/libxslt.pc +%{_libdir}/pkgconfig/libexslt.pc + +%files python +%defattr(-, root, root) + +%doc AUTHORS ChangeLog.gz NEWS README Copyright FEATURES +%{_libdir}/python*/site-packages/libxslt.py +%{_libdir}/python*/site-packages/libxsltmod* +%doc python/TODO +%doc python/libxsltclass.txt +%doc python/tests/*.py +%doc python/tests/*.xml +%doc python/tests/*.xsl + +%changelog +* Tue Jun 15 2004 Elliot Lee +- rebuilt + +* Mon May 17 2004 Daniel Veillard +- upstream release 1.1.7 see http://xmlsoft.org/XSLT/news.html + +* Sun Nov 2 2003 Daniel Veillard +- cleanup, removal of the deprecated breakpoint library and + automated libxml2 dependancy level in the generated spec file. + +* Wed Oct 23 2002 Daniel Veillard +- revamped the spec file, cleaned up some rpm building problems + +* Wed Sep 4 2002 Daniel Veillard + +- library paths fixed for x86-64 + +* Fri Feb 8 2002 Daniel.Veillard + +- added the python module +- changed the Licence to MIT + +* Sat Nov 10 2001 Daniel.Veillard + +- cleaned up the specfile + +* Mon Jan 22 2001 Daniel.Veillard + +- created based on libxml2 spec file + From svn at tinysofa.org Thu Jul 1 15:38:14 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:38:14 +1000 (EST) Subject: [tinysofa-svn] r2588 - in tinysofa/snapshot: . lm_sensors lm_sensors/current lm_sensors/current/sources lm_sensors/current/specs Message-ID: <20040701153814.414C44E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:38:13 +1000 (Fri, 02 Jul 2004) New Revision: 2588 Added: tinysofa/snapshot/lm_sensors/ tinysofa/snapshot/lm_sensors/current/ tinysofa/snapshot/lm_sensors/current/sources/ tinysofa/snapshot/lm_sensors/current/sources/lm_sensors-2.5.5-glibc22.patch tinysofa/snapshot/lm_sensors/current/sources/lm_sensors-2.8.0-utf8.patch tinysofa/snapshot/lm_sensors/current/sources/lm_sensors-2.8.2-expr.patch tinysofa/snapshot/lm_sensors/current/sources/lm_sensors-2.8.3-local.patch tinysofa/snapshot/lm_sensors/current/sources/lm_sensors-2.8.3-redhat.patch tinysofa/snapshot/lm_sensors/current/sources/lm_sensors-2.8.3-rpath.patch tinysofa/snapshot/lm_sensors/current/sources/lm_sensors-2.8.6.tar.gz tinysofa/snapshot/lm_sensors/current/specs/ tinysofa/snapshot/lm_sensors/current/specs/lm_sensors.spec Log: - Add lm_sensors to snapshot from 2.0. Added: tinysofa/snapshot/lm_sensors/current/sources/lm_sensors-2.5.5-glibc22.patch =================================================================== --- tinysofa/snapshot/lm_sensors/current/sources/lm_sensors-2.5.5-glibc22.patch 2004-07-01 15:38:11 UTC (rev 2587) +++ tinysofa/snapshot/lm_sensors/current/sources/lm_sensors-2.5.5-glibc22.patch 2004-07-01 15:38:13 UTC (rev 2588) @@ -0,0 +1,11 @@ +--- lm_sensors-2.5.5/prog/dump/isadump.c.glibc22 Mon Feb 5 22:56:47 2001 ++++ lm_sensors-2.5.5/prog/dump/isadump.c Mon Feb 5 22:55:35 2001 +@@ -25,7 +25,7 @@ + + + /* To keep glibc2 happy */ +-#if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ >= 0 ++#if 0 && defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ >= 0 + #include + #else + #include Added: tinysofa/snapshot/lm_sensors/current/sources/lm_sensors-2.8.0-utf8.patch =================================================================== --- tinysofa/snapshot/lm_sensors/current/sources/lm_sensors-2.8.0-utf8.patch 2004-07-01 15:38:11 UTC (rev 2587) +++ tinysofa/snapshot/lm_sensors/current/sources/lm_sensors-2.8.0-utf8.patch 2004-07-01 15:38:13 UTC (rev 2588) @@ -0,0 +1,11 @@ +--- lm_sensors-2.8.0/prog/detect/sensors-detect.utf8 2003-07-08 15:07:59.000000000 +0200 ++++ lm_sensors-2.8.0/prog/detect/sensors-detect 2003-07-23 12:40:03.000000000 +0200 +@@ -1394,7 +1394,7 @@ + "*** Terminating.\n"; + exit(-1); + } +- my $towrite = pack "C", $_[1]; ++ my $towrite = pack "C", ($_[1] & 0xff); + sysseek IOPORTS, $_[0], 0 or return -1; + my $nrchars = syswrite IOPORTS, $towrite, 1; + return -1 if not defined $nrchars or $nrchars != 1; Added: tinysofa/snapshot/lm_sensors/current/sources/lm_sensors-2.8.2-expr.patch =================================================================== --- tinysofa/snapshot/lm_sensors/current/sources/lm_sensors-2.8.2-expr.patch 2004-07-01 15:38:11 UTC (rev 2587) +++ tinysofa/snapshot/lm_sensors/current/sources/lm_sensors-2.8.2-expr.patch 2004-07-01 15:38:13 UTC (rev 2588) @@ -0,0 +1,11 @@ +--- lm_sensors-2.8.1/prog/eepromer/eeprom.c~ 2004-01-07 20:55:21.000000000 +0000 ++++ lm_sensors-2.8.1/prog/eepromer/eeprom.c 2004-01-07 20:56:34.000000000 +0000 +@@ -216,7 +216,7 @@ + /*** + *** I'm not the one to blame of you screw your computer! + ***/ +- if(rwmode & ! force){ ++ if(rwmode && ! force) { + unsigned char warnbuf[4]; + fprintf(stderr,"**WARNING**\n"); + fprintf(stderr," - \tYou have chosen to WRITE to this eeprom.\n"); Added: tinysofa/snapshot/lm_sensors/current/sources/lm_sensors-2.8.3-local.patch =================================================================== --- tinysofa/snapshot/lm_sensors/current/sources/lm_sensors-2.8.3-local.patch 2004-07-01 15:38:11 UTC (rev 2587) +++ tinysofa/snapshot/lm_sensors/current/sources/lm_sensors-2.8.3-local.patch 2004-07-01 15:38:13 UTC (rev 2588) @@ -0,0 +1,11 @@ +--- lm_sensors-2.8.3/prog/detect/sensors-detect.local 2004-03-08 16:37:36.284277000 +0100 ++++ lm_sensors-2.8.3/prog/detect/sensors-detect 2004-03-08 17:39:20.550016114 +0100 +@@ -4205,7 +4205,7 @@ + print "#----cut here----\n"; + print $modprobes; + print "# sleep 2 # optional\n", +- "/usr/local/bin/sensors -s # recommended\n"; ++ "/usr/bin/sensors -s # recommended\n"; + print "#----cut here----\n"; + print "\nWARNING! If you have some things built into your kernel, the list above\n", + "will contain too many modules. Skip the appropriate ones! You really should\n", Added: tinysofa/snapshot/lm_sensors/current/sources/lm_sensors-2.8.3-redhat.patch =================================================================== --- tinysofa/snapshot/lm_sensors/current/sources/lm_sensors-2.8.3-redhat.patch 2004-07-01 15:38:11 UTC (rev 2587) +++ tinysofa/snapshot/lm_sensors/current/sources/lm_sensors-2.8.3-redhat.patch 2004-07-01 15:38:13 UTC (rev 2588) @@ -0,0 +1,114 @@ +--- lm_sensors-2.8.3/prog/init/lm_sensors.init.redhat 2003-02-25 03:50:46.000000000 +0100 ++++ lm_sensors-2.8.3/prog/init/lm_sensors.init 2004-03-08 17:15:56.960344769 +0100 +@@ -29,17 +29,17 @@ + # MODULE_1, MODULE_2, MODULE_3, etc. + + # If sensors isn't supported by the kernel, try loading the module... +-[ -e /proc/sys/dev/sensors ] || /sbin/modprobe i2c-proc &>/dev/null ++[ -e /sys/bus/i2c ] || /sbin/modprobe i2c-dev &>/dev/null + + # Don't bother if /proc/sensors still doesn't exist, kernel doesn't have + # support for sensors. +-[ -e /proc/sys/dev/sensors ] || exit 0 ++[ -e /sys/bus/i2c ] || exit 0 + + # If sensors was not already running, unload the module... +-[ -e /var/lock/subsys/sensors ] || /sbin/modprobe -r i2c-proc &>/dev/null ++[ -e /var/lock/subsys/sensors ] || /sbin/modprobe -r i2c-dev &>/dev/null + + CONFIG=/etc/sysconfig/lm_sensors +-PSENSORS=/usr/local/bin/sensors ++PSENSORS=/usr/bin/sensors + + # Source function library. + . /etc/init.d/functions +@@ -54,7 +54,7 @@ + i=0 + while [ $i -lt $modules ] ; do + module=`eval echo '$'MODULE_$i` +- echo starting module __${module}__ ++# echo starting module __${module}__ + /sbin/modprobe $module &>/dev/null + i=`expr $i + 1` + done +@@ -81,7 +81,7 @@ + /sbin/modprobe -r $module &>/dev/null + i=`expr $i - 1` + done +- /sbin/modprobe -r i2c-proc &>/dev/null ++ /sbin/modprobe -r i2c-dev &>/dev/null + + RETVAL=$? + if [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/sensors ; then +--- lm_sensors-2.8.3/Makefile.redhat 2003-12-29 20:29:16.000000000 +0100 ++++ lm_sensors-2.8.3/Makefile 2004-03-08 16:37:36.262280059 +0100 +@@ -44,7 +44,7 @@ + # may be used mistakenly. Note: This should point to the directory + # *above* the linux/ subdirectory, so to /usr/local/include in the + # above example. +-I2C_HEADERS := /usr/local/include ++I2C_HEADERS := /usr/src/linux/include + #I2C_HEADERS := $(LINUX_HEADERS) + + # Uncomment the third line on SMP systems if the magic invocation fails. It +@@ -63,8 +63,8 @@ + + # Uncomment the second line if you are a developer. This will enable many + # additional warnings at compile-time +-WARN := 0 +-#WARN := 1 ++#WARN := 0 ++WARN := 1 + + # Uncomment the second line if you want to get (loads of) debug information + # at run-time. +@@ -77,7 +77,7 @@ + DESTDIR := + + # This is the prefix that will be used for almost all directories below. +-PREFIX := /usr/local ++PREFIX := $(prefix) + + # This is the main modules directory into which the modules will be installed. + # The magic invocation will return something like this: +@@ -89,11 +89,11 @@ + + # This is the directory where sensors.conf will be installed, if no other + # configuration file is found +-ETCDIR := /etc ++ETCDIR := $(sysconfdir) + + # You should not need to change this. It is the directory into which the + # library files (both static and shared) will be installed. +-LIBDIR := $(PREFIX)/lib ++LIBDIR := $(libdir) + + EXLDFLAGS := -Wl,-rpath,$(LIBDIR) + +@@ -104,8 +104,8 @@ + # Note that not all programs in this package are really installed; + # some are just examples. You can always install them by hand, of + # course. +-BINDIR := $(PREFIX)/bin +-SBINDIR := $(PREFIX)/sbin ++BINDIR := $(bindir) ++SBINDIR := $(sbindir) + + # You should not need to change this. It is the basic directory into which + # include files will be installed. The actual directory will be +@@ -113,13 +113,13 @@ + # for library include files. If PREFIX equals the default /usr/local/bin, + # you will be able to use '#include ' regardless of the + # current kernel selected. +-INCLUDEDIR := $(PREFIX)/include ++INCLUDEDIR := $(includedir) + SYSINCLUDEDIR := $(INCLUDEDIR)/linux + LIBINCLUDEDIR := $(INCLUDEDIR)/sensors + + # You should not need to change this. It is the base directory under which the + # manual pages will be installed. +-MANDIR := $(PREFIX)/man ++MANDIR := $(mandir) + + MACHINE := $(shell uname -m) + Added: tinysofa/snapshot/lm_sensors/current/sources/lm_sensors-2.8.3-rpath.patch =================================================================== --- tinysofa/snapshot/lm_sensors/current/sources/lm_sensors-2.8.3-rpath.patch 2004-07-01 15:38:11 UTC (rev 2587) +++ tinysofa/snapshot/lm_sensors/current/sources/lm_sensors-2.8.3-rpath.patch 2004-07-01 15:38:13 UTC (rev 2588) @@ -0,0 +1,12 @@ +--- lm_sensors-2.8.3/Makefile.rpath 2004-03-08 18:06:52.318271655 +0100 ++++ lm_sensors-2.8.3/Makefile 2004-03-08 18:08:30.344078783 +0100 +@@ -95,7 +95,8 @@ + # library files (both static and shared) will be installed. + LIBDIR := $(libdir) + +-EXLDFLAGS := -Wl,-rpath,$(LIBDIR) ++#EXLDFLAGS := -Wl,-rpath,$(LIBDIR) ++EXLDFLAGS := + + # You should not need to change this. It is the directory into which the + # executable program files will be installed. BINDIR for programs that are Added: tinysofa/snapshot/lm_sensors/current/sources/lm_sensors-2.8.6.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/lm_sensors/current/sources/lm_sensors-2.8.6.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/lm_sensors/current/specs/lm_sensors.spec =================================================================== --- tinysofa/snapshot/lm_sensors/current/specs/lm_sensors.spec 2004-07-01 15:38:11 UTC (rev 2587) +++ tinysofa/snapshot/lm_sensors/current/specs/lm_sensors.spec 2004-07-01 15:38:13 UTC (rev 2588) @@ -0,0 +1,198 @@ +Name: lm_sensors +Version: 2.8.6 +Release: 1ts +URL: http://secure.netroedge.com/~lm78/ +Source: http://secure.netroedge.com/~lm78/archive/lm_sensors-%{version}.tar.gz +Patch1: lm_sensors-2.5.5-glibc22.patch +Patch2: lm_sensors-2.8.3-redhat.patch +Patch3: lm_sensors-2.8.0-utf8.patch +Patch4: lm_sensors-2.8.2-expr.patch +Patch5: lm_sensors-2.8.3-local.patch +Patch6: lm_sensors-2.8.3-rpath.patch +Summary: Hardware monitoring tools. +Group: Applications/System +License: GPL +Buildroot: %{_tmppath}/%{name}-%{version}-root +Requires: kernel-utils +BuildPrereq: glibc-kernheaders >= 2.4 +ExclusiveArch: alpha %{ix86} x86_64 + +%description +The lm_sensors package includes a collection of modules for general SMBus +access and hardware monitoring. NOTE: this requires special support which +is not in standard 2.2-vintage kernels. + +%package devel +Summary: Development files for programs which will use lm_sensors. +Group: Development/System +Requires: lm_sensors = %{version} + +%description devel +The lm_sensors-devel package includes a header files and libraries for use +when building applications that make use of sensor data. + +%prep +%setup -q +%patch1 -p1 -b .glibc22 +%patch2 -p1 -b .redhat +%patch3 -p1 -b .utf8 +%patch4 -p1 -b .expr +%patch5 -p1 -b .local +%patch6 -p1 -b .rpath + +%build +mkdir -p kernel/include/linux +ln -sf /usr/include/linux/* kernel/include/linux +make user + +%install +[ "$RPM_BUILD_ROOT" != "/" ] && rm -fr $RPM_BUILD_ROOT +make prefix=/usr exec_prefix=/usr bindir=/usr/bin sbindir=/usr/sbin sysconfdir=/etc datadir=/usr/share includedir=/usr/include libdir=%{_libdir} libexecdir=/usr/libexec localstatedir=/var sharedstatedir=/usr/com mandir=/usr/share/man infodir=/usr/share/info DESTDIR=$RPM_BUILD_ROOT user_install +chmod 755 $RPM_BUILD_ROOT%{_libdir}/*.so* + +# remove dmidecode from the buildroot +rm -f $RPM_BUILD_ROOT%{_sbindir}/dmidecode +mv prog/init/README prog/init/README.initscripts + +# Remove userland kernel headers, belong in glibc-kernheaders. +rm -rf $RPM_BUILD_ROOT%{_includedir}/linux + +%clean +[ "$RPM_BUILD_ROOT" != "/" ] && rm -fr $RPM_BUILD_ROOT + +%post -p /sbin/ldconfig + +%postun -p /sbin/ldconfig + +%files +%defattr(-,root,root) +%doc BACKGROUND BUGS CHANGES CONTRIBUTORS COPYING doc INSTALL QUICKSTART README* TODO prog/init/* +%config(noreplace) %{_sysconfdir}/sensors.conf +%{_bindir}/* +%{_libdir}/*.so.* +%{_mandir}/man*/* +%{_sbindir}/* + +%files devel +%defattr(-,root,root) +%{_includedir}/sensors +%{_libdir}/lib*.a +%{_libdir}/lib*.so + +%changelog +* Tue Apr 13 2004 Phil Knirsch 2.8.6-1 +- Update to latest upstream version. +- Enabled build for x86_64. + +* Mon Mar 08 2004 Phil Knirsch 2.8.3-5 +- Fixed initscript to work with 2.6 kernel and made it more quiet (#112286). +- Changed proposed location of sensors (#116496). +- Fixed rpath issue. + +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Thu Feb 05 2004 Phil Knirsch 2.8.3-3 +- Modified sensors.conf to a noreplace config file. + +* Wed Feb 04 2004 Phil Knirsch 2.8.3-2 +- Fixed newly included initscript (#114608). + +* Thu Jan 29 2004 Phil Knirsch 2.8.3-1 +- Updated to latest upstream version 2.8.3 + +* Thu Jan 08 2004 Phil Knirsch 2.8.2-1 +- Update to latest upstream version 2.8.2 +- Fixed wrong & usage in if expression. +- Included several new perl tools. + +* Fri Oct 24 2003 Phil Knirsch 2.8.1-1 +- Update to latest upstream version 2.8.1 + +* Wed Jul 23 2003 Phil Knirsch 2.8.0-1 +- Update to latest upstream version 2.8.0 + +* Fri Jun 27 2003 Phil Knirsch 2.6.5-6.1 +- rebuilt + +* Fri Jun 27 2003 Phil Knirsch 2.6.5-6 +- Included prog/init scripts and README (#90606). +- Require kernel-utils for dmidecode (#88367, #65057). + +* Wed Jan 22 2003 Tim Powers 2.6.5-5 +- rebuilt + +* Wed Dec 04 2002 Phil Knirsch 2.6.5-4 +- Bump release and try to rebuild. + +* Tue Dec 3 2002 Tim Powers 2.6.5-3 +- don't include dmidecode, conflicts with kernel-utils + +* Fri Nov 29 2002 Phil Knirsch 2.6.5-2 +- Added patch to fix utf8 problem with sensors-detect. +- Fixed Copyright: to License: in specfile + +* Fri Nov 29 2002 Phil Knirsch 2.6.5-1 +- Updated userlevel to 2.6.5. +- Include all the /usr/sbin/ apps (like dmidecode). + +* Fri Oct 04 2002 Phil Knirsch 2.6.3-3 +- Removed Serverworks patch as it is already in sensors-detect. + +* Fri Jun 21 2002 Tim Powers 2.6.3-2 +- automated rebuild + +* Tue Jun 18 2002 Phil Knirsch 2.6.3-1 +- Updated of userland package to 2.6.3 +- Fixed file packaging bug (#66126). + +* Thu May 23 2002 Tim Powers 2.6.2-2 +- automated rebuild + +* Mon Jan 28 2002 Phil Knirsch 2.6.2-1 +- Update to version 2.6.2 + +* Wed Aug 22 2001 Philipp Knirsch 2.5.5-6 +- Added the SMBus CSB5 detection (#50468) + +* Mon Jul 9 2001 Philipp Knirsch +- Fixed duplicate Summary: entry for devel package (#47714) + +* Sun Jun 24 2001 Elliot Lee +- Bump release + rebuild. + +* Thu Feb 15 2001 Philipp Knirsch +- Removed the i2c block patch as our newest kernel doesn't need it anymore. + +* Mon Feb 5 2001 Matt Wilson +- added patch to not include sys/perm.h, as it's gone now. +- added alpha to ExclusiveArch +- use make "LINUX_HEADERS=/usr/include" to get kernel headers + +* Tue Jan 16 2001 Philipp Knirsch +- Updated to 2.5.5 which includes the Serverworks drivers. Kernel modules are + not included though es they have to go into the kernel package +- Had to remove all references to I2C_SMBUS_I2C_BLOCK_DATA from + kernel/busses/i2c-i801.c and prog/dump/i2cdump.c as this is not defined in + our current kernel package + +* Tue Dec 19 2000 Philipp Knirsch +- update to 2.5.4 +- updated URL and Source entries to point to new home of lm-sensors +- rebuild + +* Wed Aug 16 2000 Nalin Dahyabhai +- fix summary + +* Fri Jul 28 2000 Harald Hoyer +- added static library to devel package + +* Thu Jul 20 2000 Nalin Dahyabhai +- update to 2.5.2 +- build against a kernel that actually has new i2c code in it + +* Wed Jul 12 2000 Prospector +- automatic rebuild + +* Mon Jun 12 2000 Nalin Dahyabhai +- initial package without kernel support From svn at tinysofa.org Thu Jul 1 15:38:12 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:38:12 +1000 (EST) Subject: [tinysofa-svn] r2587 - in tinysofa/snapshot: . linuxdoc-tools linuxdoc-tools/current linuxdoc-tools/current/sources linuxdoc-tools/current/specs Message-ID: <20040701153812.1B4A34E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:38:11 +1000 (Fri, 02 Jul 2004) New Revision: 2587 Added: tinysofa/snapshot/linuxdoc-tools/ tinysofa/snapshot/linuxdoc-tools/current/ tinysofa/snapshot/linuxdoc-tools/current/sources/ tinysofa/snapshot/linuxdoc-tools/current/sources/linuxdoc-tools-0.9.13-letter.patch tinysofa/snapshot/linuxdoc-tools/current/sources/linuxdoc-tools-0.9.20-lib64.patch tinysofa/snapshot/linuxdoc-tools/current/sources/linuxdoc-tools-0.9.20-strip.patch tinysofa/snapshot/linuxdoc-tools/current/sources/linuxdoc-tools_0.9.20.tar.gz tinysofa/snapshot/linuxdoc-tools/current/specs/ tinysofa/snapshot/linuxdoc-tools/current/specs/linuxdoc-tools.spec Log: - Add linuxdoc-tools to snapshot from 2.0. Added: tinysofa/snapshot/linuxdoc-tools/current/sources/linuxdoc-tools-0.9.13-letter.patch =================================================================== --- tinysofa/snapshot/linuxdoc-tools/current/sources/linuxdoc-tools-0.9.13-letter.patch 2004-07-01 15:38:08 UTC (rev 2586) +++ tinysofa/snapshot/linuxdoc-tools/current/sources/linuxdoc-tools-0.9.13-letter.patch 2004-07-01 15:38:11 UTC (rev 2587) @@ -0,0 +1,24 @@ +--- linuxdoc-tools-0.9.13/lib/LinuxDocTools.pm.letter Mon Nov 26 16:09:37 2001 ++++ linuxdoc-tools-0.9.13/lib/LinuxDocTools.pm Mon Nov 26 16:09:49 2001 +@@ -108,7 +108,7 @@ + { option => "pass", type => "s", short => "P" } + ]; + $global->{backend} = "linuxdoc"; +- $global->{papersize} = "a4"; ++ $global->{papersize} = "letter"; + $global->{language} = "en"; + $global->{charset} = "ascii"; + $global->{style} = ""; +--- linuxdoc-tools-0.9.13/man/linuxdoc.1.letter Mon Nov 26 16:10:04 2001 ++++ linuxdoc-tools-0.9.13/man/linuxdoc.1 Mon Nov 26 16:10:42 2001 +@@ -46,8 +46,8 @@ + format, but just output the usage of this suites. + Available formats are: html, info, latex, lyx, rtf, tex, check. + .IP "--papersize=\fIsize\fR, -p +-Set the paper size. Default is ``a4'' (European 297x210mm paper). +-You may also specify ``letter'' size. ++Set the paper size. Default is ``letter''. ++You may also specify ``a4'' size (European 297x210mm paper). + .IP "--language=\fIlang\fR, -l" + Specify the language of the document (this may change which style + files are used for formatting by a back end). The default language is Added: tinysofa/snapshot/linuxdoc-tools/current/sources/linuxdoc-tools-0.9.20-lib64.patch =================================================================== --- tinysofa/snapshot/linuxdoc-tools/current/sources/linuxdoc-tools-0.9.20-lib64.patch 2004-07-01 15:38:08 UTC (rev 2586) +++ tinysofa/snapshot/linuxdoc-tools/current/sources/linuxdoc-tools-0.9.20-lib64.patch 2004-07-01 15:38:11 UTC (rev 2587) @@ -0,0 +1,13 @@ +--- linuxdoc-tools-0.9.20/bin/linuxdoc.in.orig 2002-09-10 14:31:56.000000000 -0400 ++++ linuxdoc-tools-0.9.20/bin/linuxdoc.in 2002-09-10 14:32:32.000000000 -0400 +@@ -23,8 +23,10 @@ + + use lib "@DATADIR@"; + use lib "@prefix@/perl5"; ++use lib "@prefix@/lib64/perl5"; + use lib "@prefix@/lib/perl5"; + use lib "@prefix@/share/perl5"; ++ + $progs = { + "NSGMLS" => "@NSGMLS@", + "SGMLSASP" => "@SGMLSASP@", Added: tinysofa/snapshot/linuxdoc-tools/current/sources/linuxdoc-tools-0.9.20-strip.patch =================================================================== --- tinysofa/snapshot/linuxdoc-tools/current/sources/linuxdoc-tools-0.9.20-strip.patch 2004-07-01 15:38:08 UTC (rev 2586) +++ tinysofa/snapshot/linuxdoc-tools/current/sources/linuxdoc-tools-0.9.20-strip.patch 2004-07-01 15:38:11 UTC (rev 2587) @@ -0,0 +1,10 @@ +--- linuxdoc-tools-0.9.20/Makefile.in.strip Mon Apr 22 17:30:06 2002 ++++ linuxdoc-tools-0.9.20/Makefile.in Mon Apr 22 17:30:19 2002 +@@ -87,7 +87,6 @@ + ( cd iso-entities; \ + $(MAKE) install ) + endif +- strip sgmlpre/sgmlpre + for ii in sgmlpre/sgmlpre rtf-fix/rtf2rtf; do \ + bn=`basename $$ii`; \ + $(INSTALL_PROGRAM) $$ii $(bindir)/$$bn; \ Added: tinysofa/snapshot/linuxdoc-tools/current/sources/linuxdoc-tools_0.9.20.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/linuxdoc-tools/current/sources/linuxdoc-tools_0.9.20.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/linuxdoc-tools/current/specs/linuxdoc-tools.spec =================================================================== --- tinysofa/snapshot/linuxdoc-tools/current/specs/linuxdoc-tools.spec 2004-07-01 15:38:08 UTC (rev 2586) +++ tinysofa/snapshot/linuxdoc-tools/current/specs/linuxdoc-tools.spec 2004-07-01 15:38:11 UTC (rev 2587) @@ -0,0 +1,228 @@ +%{!?tetex:%define tetex 1} + +Summary: A text formatting package based on SGML. +Name: linuxdoc-tools +Obsoletes: sgml-tools +Obsoletes: linuxdoc-sgml +Version: 0.9.20 +Release: 12.1ts +License: Freely distributable +Group: Applications/Publishing +Source: http://people.debian.org/~sano/linuxdoc-tools/archives/%{name}_%{version}.tar.gz +Patch0: linuxdoc-tools-0.9.13-letter.patch +Patch1: linuxdoc-tools-0.9.20-strip.patch +Patch2: linuxdoc-tools-0.9.20-lib64.patch +Requires: jade +Url: http://people.debian.org/~sano/linuxdoc-tools/ +BuildRoot: %{_tmppath}/%{name}-%{version}-root +BuildRequires: flex sgml-common jade +Requires: gawk groff +# this should anyway be only a "suggest" +%if %{tetex} +Requires: tetex-latex +%endif +Provides: sgml-tools +Provides: linuxdoc-sgml + +%description +Linuxdoc-tools is a text formatting suite based on SGML (Standard +Generalized Markup Language), using the LinuxDoc document type. +Linuxdoc-tools allows you to produce LaTeX, HTML, GNU info, LyX, RTF, +plain text (via groff), and other format outputs from a single SGML +source. Linuxdoc-tools is intended for writing technical software +documentation. + +%prep +%setup -q +%patch0 -p1 +%patch1 -p1 -b .strip +%patch2 -p1 -b .lib64 + +%build +%configure --with-installed-nsgmls --with-installed-iso-entities +# Packaging brain-damage +( cd entity-map + autoconf + %configure +) +make OPTIMIZE="$RPM_OPT_FLAGS" %{?_smp_mflags} +perl -pi -e 's,\$main::prefix/share/sgml/iso-entities-8879.1986/iso-entities.cat,/usr/share/sgml/sgml-iso-entities-8879.1986/catalog,' \ + lib/LinuxDocTools.pm + +%install +rm -rf $RPM_BUILD_ROOT +%makeinstall +mv %{buildroot}%{_docdir}/%{name} %{buildroot}%{_docdir}/%{name}-%{version} +perl -pi -e 's,/usr/share/sgml/iso-entities-8879.1986/iso-entities.cat,\$main::prefix/share/sgml/sgml-iso-entities-8879.1986/catalog,' \ + %{buildroot}%{_datadir}/%{name}/LinuxDocTools.pm + +# Some files need moving around. +rm -f %{buildroot}%{_datadir}/%{name}/epsf.* +rm -f %{buildroot}%{_datadir}/%{name}/url.sty +install -d %{buildroot}%{_datadir}/texmf/tex/latex/misc +mv %{buildroot}%{_datadir}/%{name}/*.sty \ + %{buildroot}%{_datadir}/texmf/tex/latex/misc + +cat > doc/COPYRIGHT < /dev/null 2>&1 +exit 0 + +%postun +[ -x %{_bindir}/texhash ] && /usr/bin/env - %{_bindir}/texhash > /dev/null 2>&1 +exit 0 + +%files +%defattr (-,root,root) +%doc %{_docdir}/%{name}-%{version} +%{_bindir}/* +%{_datadir}/%{name} +%{_datadir}/entity-map +%{_datadir}/texmf/tex/latex/misc/*.sty +%dir %{_libdir}/perl5/Text +%{_libdir}/perl5/Text/EntityMap.pm +%{_mandir}/*/* + +%changelog +* Tue Mar 02 2004 Elliot Lee +- rebuilt + +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Tue Sep 23 2003 Florian La Roche +- Allow rpms without a tetex dependency. That allows using sgml things + for online things without installing the heavy tetex. + +* Wed Jun 04 2003 Elliot Lee +- rebuilt + +* Wed Jan 22 2003 Tim Powers +- rebuilt + +* Sat Jan 4 2003 Jeff Johnson 0.9.20-7 +- use internal dep generator. + +* Sat Dec 14 2002 Tim Powers 0.9.20-6 +- don't use rpms internal dep generator + +* Mon Oct 14 2002 Tim Waugh 0.9.20-5 +- Rebuild. + +* Wed Sep 11 2002 Than Ngo 0.9.20-4 +- Added fix to have lib64 in perl path on 64bit machine + +* Fri Jun 21 2002 Tim Powers +- automated rebuild + +* Thu May 23 2002 Tim Powers +- automated rebuild + +* Mon Apr 22 2002 Tim Waugh 0.9.20-1 +- 0.9.20. +- Don't explicitly strip binaries (bug #62563). + +* Thu Feb 28 2002 Elliot Lee 0.9.16-4 +- Provides: sgml-tools (and linuxdoc-sgml). +- Use _smp_mflags and RPM_OPT_FLAGS. + +* Tue Feb 26 2002 Tim Waugh 0.9.16-3 +- Rebuild in new environment. + +* Wed Jan 30 2002 Tim Waugh 0.9.16-2 +- Rebuild to fix bug #59055. + +* Mon Jan 28 2002 Tim Waugh 0.9.16-1 +- 0.9.16. +- No longer need the libdir patch. + +* Wed Jan 09 2002 Tim Powers 0.9.15-2 +- automated rebuild + +* Mon Dec 3 2001 Tim Waugh 0.9.15-1 +- 0.9.15; incorporates most of the libdir patch. +- The fixsgml2latex patch is no longer required. +- Installed documentation now works. +- Don't ship backup files. +- Put the LaTeX style files in the texmf directory tree. +- Requires: gawk, groff. + +* Mon Nov 26 2001 Tim Waugh 0.9.13-1 +- Dump sgml-tools in favour of linuxdoc-tools (bug #56710). + +* Mon Jun 18 2001 Tim Waugh 1.0.9-12 +- Use %%{_tmppath}. +- Build requres flex. + +* Wed May 30 2001 Tim Waugh 1.0.9-11 +- Don't ship backup files. + +* Wed May 30 2001 Tim Waugh 1.0.9-10 +- Sync description with specspo. + +* Thu Mar 8 2001 Tim Waugh 1.0.9-9 +- Create temporary files safely (patch from Debian package). + +* Wed Jul 12 2000 Prospector +- automatic rebuild + +* Sat Jun 10 2000 Bill Nottingham +- fix man page for sgml2txt (#10722) + +* Sat Jun 3 2000 Bill Nottingham +- apparently this can't deal with FHS + +* Thu Jun 1 2000 Bill Nottingham +- hey, it's self-hosting now! + +* Fri Feb 11 2000 Preston Brown +- add copyright file (#8621) +- fix sgml2latex processing (#4114) +- fix configure tests (#6480) + +* Wed Feb 9 2000 Bernhard Rosenkr?nzer +- get rid of "CC=egcs" +- require jade - sgml2html calls nsgmls. + +* Fri Jan 28 2000 Bill Nottingham +- resurrect package in a non-conflicting manner + +* Sun Mar 21 1999 Cristian Gafton +- auto rebuild in the new build environment (release 2) + +* Wed Mar 17 1999 Preston Brown +- we aren't going to 2.0.x for 6.0, using 1.0.9 instead (more stable) + +* Thu Aug 20 1998 Bill Nottingham +- updated to 1.0.7 + +* Tue May 05 1998 Donnie Barnes +- changed default papersize to letter (from a4...sorry Europeans :-) + use --papersize=a4 on any sgml2* command to change it or remove the + patch from this spec file and rebuild. + +* Thu Apr 30 1998 Cristian Gafton +- updated to 1.0.6 + +* Fri Apr 24 1998 Prospector System +- translations modified for de, fr, tr + +* Mon Jan 12 1998 Donnie Barnes +- updated from 0.99 to 1.0.3 +- added BuildRoot + +* Sat Nov 01 1997 Donnie Barnes +- fixed man pages + +* Mon Oct 20 1997 Donnie Barnes +- new release - Obsoletes linuxdoc-sgml + From svn at tinysofa.org Thu Jul 1 15:38:16 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:38:16 +1000 (EST) Subject: [tinysofa-svn] r2590 - in tinysofa/snapshot: . lvm2 lvm2/current lvm2/current/sources lvm2/current/specs Message-ID: <20040701153816.C39344E817D@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:38:16 +1000 (Fri, 02 Jul 2004) New Revision: 2590 Added: tinysofa/snapshot/lvm2/ tinysofa/snapshot/lvm2/current/ tinysofa/snapshot/lvm2/current/sources/ tinysofa/snapshot/lvm2/current/sources/LVM2.2.00.17.tgz tinysofa/snapshot/lvm2/current/specs/ tinysofa/snapshot/lvm2/current/specs/lvm2.spec Log: - Add lvm2 to snapshot from 2.0. Added: tinysofa/snapshot/lvm2/current/sources/LVM2.2.00.17.tgz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/lvm2/current/sources/LVM2.2.00.17.tgz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/lvm2/current/specs/lvm2.spec =================================================================== --- tinysofa/snapshot/lvm2/current/specs/lvm2.spec 2004-07-01 15:38:15 UTC (rev 2589) +++ tinysofa/snapshot/lvm2/current/specs/lvm2.spec 2004-07-01 15:38:16 UTC (rev 2590) @@ -0,0 +1,125 @@ +Summary: Userland logical volume management tools +Name: lvm2 +Version: 2.00.17 +Release: 1ts +License: GPL +Group: System Environment/Base +URL: http://sources.redhat.com/lvm2 +Source0: LVM2.%{version}.tgz +BuildRoot: %{_tmppath}/%{name}-%{version}-root +BuildRequires: device-mapper +BuildRequires: readline-devel +BuildRequires: libselinux-devel +Conflicts: lvm < 1.0.3-19 + +%define _exec_prefix /usr + +%description +LVM2 includes all of the support for handling read/write operations on +physical volumes (hard disks, RAID-Systems, magneto optical, etc., +multiple devices (MD), see mdadd(8) or even loop devices, see +losetup(8)), creating volume groups (kind of virtual disks) from one +or more physical volumes and creating one or more logical volumes +(kind of logical partitions) in volume groups. + +%prep +%setup -q -n LVM2.%{version} + +%build +%configure --enable-static_link --enable-readline --enable-lvm1_fallback --with-staticdir=/sbin --with-user= --with-group= +make DESTDIR=$RPM_BUILD_ROOT + +%install +rm -rf $RPM_BUILD_ROOT +make install DESTDIR=$RPM_BUILD_ROOT + +# Temporary links until initscripts get updated to use lvm.static +ln -s lvm.static $RPM_BUILD_ROOT/sbin/lvm +ln -s lvm.static $RPM_BUILD_ROOT/sbin/pvscan +ln -s lvm.static $RPM_BUILD_ROOT/sbin/vgchange +ln -s lvm.static $RPM_BUILD_ROOT/sbin/vgscan + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(-,root,root,-) +%doc COPYING COPYING.LIB INSTALL README VERSION WHATS_NEW +/sbin/lvm.static +/sbin/lvm +/sbin/pvscan +/sbin/vgchange +/sbin/vgscan +/usr/sbin/lvm +/usr/sbin/* +%{_mandir}/*/* +%config(noreplace) /etc/lvm/lvm.conf + +%changelog +* Wed May 26 2004 Alasdair Kergon - 2.00.15-4 +- clone %description from LVM rpm + +* Wed May 26 2004 Alasdair Kergon - 2.00.15-3 +- vgscan shouldn't return error status when no VGs present + +* Thu May 06 2004 Warren Togami - 2.00.15-2 +- i2o patch from Markus Lidel + +* Tue Apr 20 2004 Bill Nottingham - 2.00.15-1.1 +- handle disabled SELinux correctly, so that LVMs can be detected in a + non-SELinux context + +* Mon Apr 19 2004 Alasdair Kergon - 2.00.15-1 +- Fix non-root build with current version of 'install'. + +* Fri Apr 16 2004 Alasdair Kergon - 2.00.14-1 +- Use 64-bit file offsets. + +* Fri Apr 16 2004 Alasdair Kergon - 2.00.13-1 +- Avoid scanning devices containing md superblocks. +- Integrate ENOTSUP patch. + +* Thu Apr 15 2004 Jeremy Katz - 2.00.12-4 +- don't die if we get ENOTSUP setting selinux contexts + +* Thu Apr 15 2004 Alasdair Kergon 2.00.12-3 +- Add temporary pvscan symlink for LVM1 until mkinitrd gets updated. + +* Wed Apr 14 2004 Alasdair Kergon 2.00.12-2 +- Mark config file noreplace. + +* Wed Apr 14 2004 Alasdair Kergon 2.00.12-1 +- Install default /etc/lvm/lvm.conf. +- Move non-static binaries to /usr/sbin. +- Add temporary links in /sbin to lvm.static until rc.sysinit gets updated. + +* Thu Apr 08 2004 Alasdair Kergon 2.00.11-1 +- Fallback to using LVM1 tools when using a 2.4 kernel without device-mapper. + +* Wed Apr 07 2004 Alasdair Kergon 2.00.10-2 +- Install the full toolset, not just 'lvm'. + +* Wed Apr 07 2004 Alasdair Kergon 2.00.10-1 +- Update to version 2.00.10, which incorporates the RH-specific patches + and includes various fixes and enhancements detailed in WHATS_NEW. + +* Wed Mar 17 2004 Jeremy Katz 2.00.08-5 +- Fix sysfs patch to find sysfs +- Take patch from dwalsh and tweak a little for setting SELinux contexts on + device node creation and also do it on the symlink creation. + Part of this should probably be pushed down to device-mapper instead + +* Thu Feb 19 2004 Stephen C. Tweedie 2.00.08-4 +- Add sysfs filter patch +- Allow non-root users to build RPM + +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Fri Dec 5 2003 Jeremy Katz 2.00.08-2 +- add static lvm binary + +* Tue Dec 2 2003 Jeremy Katz +- Initial build. + + From svn at tinysofa.org Thu Jul 1 15:38:15 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:38:15 +1000 (EST) Subject: [tinysofa-svn] r2589 - in tinysofa/snapshot: . logwatch logwatch/current logwatch/current/sources logwatch/current/specs Message-ID: <20040701153815.C42EC4E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:38:15 +1000 (Fri, 02 Jul 2004) New Revision: 2589 Added: tinysofa/snapshot/logwatch/ tinysofa/snapshot/logwatch/current/ tinysofa/snapshot/logwatch/current/sources/ tinysofa/snapshot/logwatch/current/sources/logwatch-4.3.2-nosegfault.patch tinysofa/snapshot/logwatch/current/sources/logwatch-4.3.2-nounicode.patch tinysofa/snapshot/logwatch/current/sources/logwatch-5.1-catchlocal.patch tinysofa/snapshot/logwatch/current/sources/logwatch-5.1-http400.patch tinysofa/snapshot/logwatch/current/sources/logwatch-5.1.tar.gz tinysofa/snapshot/logwatch/current/specs/ tinysofa/snapshot/logwatch/current/specs/logwatch.spec Log: - Add logwatch to snapshot from 2.0. Added: tinysofa/snapshot/logwatch/current/sources/logwatch-4.3.2-nosegfault.patch =================================================================== --- tinysofa/snapshot/logwatch/current/sources/logwatch-4.3.2-nosegfault.patch 2004-07-01 15:38:13 UTC (rev 2588) +++ tinysofa/snapshot/logwatch/current/sources/logwatch-4.3.2-nosegfault.patch 2004-07-01 15:38:15 UTC (rev 2589) @@ -0,0 +1,11 @@ +--- logwatch-4.3.2/conf/services/kernel.conf.sopwith Sat Oct 12 22:01:51 2002 ++++ logwatch-4.3.2/conf/services/kernel.conf Thu Jul 10 13:40:41 2003 +@@ -20,6 +20,8 @@ + # Only give lines pertaining to the kernel service... + *OnlyService = kernel + *RemoveHeaders ++*Remove = segfault ++*Remove = locate module + + # Set this to yes to lookup IPs in kernel firewall report + $kernel_ip_lookup = No Added: tinysofa/snapshot/logwatch/current/sources/logwatch-4.3.2-nounicode.patch =================================================================== --- tinysofa/snapshot/logwatch/current/sources/logwatch-4.3.2-nounicode.patch 2004-07-01 15:38:13 UTC (rev 2588) +++ tinysofa/snapshot/logwatch/current/sources/logwatch-4.3.2-nounicode.patch 2004-07-01 15:38:15 UTC (rev 2589) @@ -0,0 +1,10 @@ +--- logwatch-4.3.2/scripts/logwatch.pl.sopwith Thu Jul 10 11:14:32 2003 ++++ logwatch-4.3.2/scripts/logwatch.pl Thu Jul 10 11:16:03 2003 +@@ -1,4 +1,7 @@ + #!/usr/bin/perl -w ++ ++$ENV{'LANG'} = 'en_US'; # Hack to fix RH bug #81144 ++ + use strict; + ########################################################################## + # $Id: logwatch.pl,v 1.88 2003/02/18 15:53:27 kirk Exp $ Added: tinysofa/snapshot/logwatch/current/sources/logwatch-5.1-catchlocal.patch =================================================================== --- tinysofa/snapshot/logwatch/current/sources/logwatch-5.1-catchlocal.patch 2004-07-01 15:38:13 UTC (rev 2588) +++ tinysofa/snapshot/logwatch/current/sources/logwatch-5.1-catchlocal.patch 2004-07-01 15:38:15 UTC (rev 2589) @@ -0,0 +1,22 @@ +--- logwatch-5.1/scripts/services/sendmail.sopwith 2004-02-03 13:39:34.000000000 -0500 ++++ logwatch-5.1/scripts/services/sendmail 2004-03-12 10:56:34.069164276 -0500 +@@ -167,7 +167,7 @@ + ( $ThisLine =~ m/^accepting connections again for daemon / ) + ) { + # We don't care about these +- } elsif ( ($FromUser, $FromDomain, $Bytes, $NumRcpts, $RelayHost) = ($ThisLine =~ /^from=[\<]?([^@]+)[@]?([^\> ]+).*size=([0-9]+).*nrcpts=([0-9]+).*relay=(\[[0-9\.]+\]|[^ ]* \[[0-9\.]+\]|[^ ]+).*$/) ) { ++ } elsif ( ($FromUser, $FromDomain, $Bytes, $NumRcpts, $RelayHost) = ($ThisLine =~ /^from=[\<]?([^@]+)[@]?([^\> ]+).*size=([0-9]+).*nrcpts=([0-9]+).*relay=([^ ]+\@[^ ]+|\[[0-9\.]+\]|[^ ]* \[[0-9\.]+\]|[^ ]+).*$/) ) { + if ($NumRcpts > 0) { + $MsgsSent++; + $TotalRcpts += $NumRcpts; +@@ -209,7 +209,9 @@ + } + + # Add The message to a hash for later per-domain analysis. +- $Msgs{$QueueID}{"Relay"} = $RelayHost; ++ if ($RelayHost !~ /\@/) { ++ chomp($Msgs{$QueueID}{"Relay"} = $RelayHost); ++ } + if (($Detail >= 10)) { + $Msgs{$QueueID}{"FromDomain"} = $FromDomain; + $Msgs{$QueueID}{"FromUser"} = $FromUser; Added: tinysofa/snapshot/logwatch/current/sources/logwatch-5.1-http400.patch =================================================================== --- tinysofa/snapshot/logwatch/current/sources/logwatch-5.1-http400.patch 2004-07-01 15:38:13 UTC (rev 2588) +++ tinysofa/snapshot/logwatch/current/sources/logwatch-5.1-http400.patch 2004-07-01 15:38:15 UTC (rev 2589) @@ -0,0 +1,14 @@ + +Don't log stuff with a 2xx response code. + +--- logwatch-5.1/scripts/services/http.http400 ++++ logwatch-5.1/scripts/services/http +@@ -247,7 +247,7 @@ + if (!$isahack ) { + if ( !$ignore_error_hacks ) { + $needs_exam{$field{request}} .= $field{http_rc}." "; +- } elsif ( $field{http_rc} < 400 ) { ++ } elsif ( $field{http_rc} >= 400 ) { + $needs_exam{$field{request}} .= $field{http_rc}." "; + } + } Added: tinysofa/snapshot/logwatch/current/sources/logwatch-5.1.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/logwatch/current/sources/logwatch-5.1.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/logwatch/current/specs/logwatch.spec =================================================================== --- tinysofa/snapshot/logwatch/current/specs/logwatch.spec 2004-07-01 15:38:13 UTC (rev 2588) +++ tinysofa/snapshot/logwatch/current/specs/logwatch.spec 2004-07-01 15:38:15 UTC (rev 2589) @@ -0,0 +1,231 @@ +Summary: A log file analysis program. +Name: logwatch +Version: 5.1 +Release: 4ts +Copyright: MIT +Group: Applications/System +URL: http://www.logwatch.org/ +Source: ftp://ftp.kaybee.org/pub/linux/logwatch-%{version}.tar.gz +Patch: logwatch-4.3.2-nounicode.patch +Patch1: logwatch-4.3.2-nosegfault.patch +Patch3: logwatch-5.1-catchlocal.patch +Patch4: logwatch-5.1-http400.patch +Requires: textutils sh-utils grep mailx +BuildRoot: %{_tmppath}/%{name}-%{version}-root +BuildArchitectures: noarch + +%description +LogWatch is a customizable log analysis system. LogWatch parses +through your system's logs for a given period of time and creates a +report analyzing areas that you specify, in as much detail as you +require. LogWatch is easy to use and claims that it will work right +out of the package on almost all systems. Note that LogWatch now +analyzes Samba logs. + +%prep +%setup -q +%patch -p1 +%patch1 -p1 +%patch3 -p1 +%patch4 -p1 + +%install +rm -rf %{buildroot} +install -m 0755 -d %{buildroot}%{_sysconfdir}/log.d/lib +install -m 0755 -d %{buildroot}%{_sysconfdir}/log.d/conf/logfiles +install -m 0755 -d %{buildroot}%{_sysconfdir}/log.d/conf/services +install -m 0755 -d %{buildroot}%{_sysconfdir}/log.d/scripts/services +install -m 0755 -d %{buildroot}%{_sysconfdir}/log.d/scripts/shared + +for i in autorpm cron samba up2date xferlog; do + install -m 0755 -d %{buildroot}%{_sysconfdir}/log.d/scripts/logfiles/$i + install -m 0755 scripts/logfiles/$i/* %{buildroot}%{_sysconfdir}/log.d/scripts/logfiles/$i +done + +install -m 0755 scripts/logwatch.pl %{buildroot}%{_sysconfdir}/log.d/scripts/logwatch.pl +install -m 0755 scripts/services/* %{buildroot}%{_sysconfdir}/log.d/scripts/services + +install -m 0755 scripts/shared/* %{buildroot}%{_sysconfdir}/log.d/scripts/shared + +install -m 0644 conf/logwatch.conf %{buildroot}%{_sysconfdir}/log.d/conf/logwatch.conf +install -m 0644 conf/logfiles/* %{buildroot}%{_sysconfdir}/log.d/conf/logfiles +install -m 0644 conf/services/* %{buildroot}%{_sysconfdir}/log.d/conf/services + +install -m 0644 lib/Logwatch.pm %{buildroot}%{_sysconfdir}/log.d/lib/Logwatch.pm + +install -m 0755 -d %{buildroot}%{_mandir}/man8 +install -m 0644 logwatch.8 %{buildroot}%{_mandir}/man8 + +rm -f %{buildroot}%{_sysconfdir}/log.d/logwatch \ + %{buildroot}%{_sysconfdir}/log.d/logwatch.conf \ + %{buildroot}%{_sysconfdir}/cron.daily/00-logwatch \ + %{buildroot}%{_sbindir}/logwatch \ + %{buildroot}%{_sysconfdir}/log.d/scripts/services/zz-fortune* \ + %{buildroot}%{_sysconfdir}/log.d/conf/services/zz-fortune* \ + %{buildroot}%{_sysconfdir}/log.d/conf/logfiles/fortune* + +ln -s scripts/logwatch.pl %{buildroot}%{_sysconfdir}/log.d/logwatch +ln -s conf/logwatch.conf %{buildroot}%{_sysconfdir}/log.d/logwatch.conf +install -m 0755 -d %{buildroot}%{_sysconfdir}/cron.daily +ln -s ../log.d/scripts/logwatch.pl %{buildroot}%{_sysconfdir}/cron.daily/00-logwatch +install -m 0755 -d %{buildroot}%{_sbindir} +ln -s ../..%{_sysconfdir}/log.d/scripts/logwatch.pl %{buildroot}%{_sbindir}/logwatch + +%clean +rm -rf %{buildroot} + +%files +%defattr(-,root,root) +%doc README HOWTO-Make-Filter +%dir %{_sysconfdir}/log.d +%dir %{_sysconfdir}/log.d/conf +%dir %{_sysconfdir}/log.d/lib +%dir %{_sysconfdir}/log.d/scripts +%dir %{_sysconfdir}/log.d/conf/logfiles +%dir %{_sysconfdir}/log.d/conf/services +%dir %{_sysconfdir}/log.d/scripts/logfiles +%dir %{_sysconfdir}/log.d/scripts/services +%dir %{_sysconfdir}/log.d/scripts/shared +%dir %{_sysconfdir}/log.d/scripts/logfiles/autorpm +%dir %{_sysconfdir}/log.d/scripts/logfiles/cron +%dir %{_sysconfdir}/log.d/scripts/logfiles/samba +%dir %{_sysconfdir}/log.d/scripts/logfiles/up2date +%dir %{_sysconfdir}/log.d/scripts/logfiles/xferlog +%config %{_sysconfdir}/log.d/conf/logwatch.conf +%config %{_sysconfdir}/log.d/conf/services/* +%config %{_sysconfdir}/log.d/conf/logfiles/* +%{_sysconfdir}/log.d/scripts/logwatch.pl +%{_sbindir}/logwatch +%{_sysconfdir}/log.d/scripts/shared/* +%{_sysconfdir}/log.d/scripts/services/* +%{_sysconfdir}/log.d/scripts/logfiles/autorpm/* +%{_sysconfdir}/log.d/scripts/logfiles/cron/* +%{_sysconfdir}/log.d/scripts/logfiles/samba/* +%{_sysconfdir}/log.d/scripts/logfiles/up2date/* +%{_sysconfdir}/log.d/scripts/logfiles/xferlog/* +%{_sysconfdir}/log.d/logwatch +%{_sysconfdir}/log.d/lib/Logwatch.pm +%{_sysconfdir}/log.d/logwatch.conf +%{_sysconfdir}/cron.daily/00-logwatch +%{_mandir}/man8/logwatch.8* + +%doc License project/CHANGES project/TODO + +%changelog +* Mon May 24 2004 Joe Orton 5.1-4 +- stop logging access_log entries with 2xx response codes + +* Wed Mar 17 2004 Elliot Lee 5.1-3 +- Fix the perl(Logwatch) problem the correct way, as per #118507 + +* Mon Mar 15 2004 Elliot Lee 5.1-2 +- Add provides perl(Logwatch) + +* Fri Mar 12 2004 Elliot Lee 5.1-1 +- Update (#113802) + +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Fri Sep 05 2003 Elliot Lee 4.3.2-4 +- Fix #103720 + +* Wed Aug 13 2003 Elliot Lee 4.3.2-3 +- Fix a reported bug about MsgsSent/BytesTransferred stats not + counting locally-originated traffic. + +* Wed Jul 10 2003 Elliot Lee 4.3.2-2 +- Fix #81144 (nounicode), #85551 and part of #97421 (nosegfault), #87483 (funkyhn) + +* Wed Jan 22 2003 Tim Powers +- rebuilt + +* Wed Jan 15 2003 Elliot Lee 4.3.1-1 +- Update to new upstream version + +* Tue Dec 10 2002 Elliot Lee 4.0.3-3 +- Apply patch from #77173 + +* Wed Oct 16 2002 Elliot Lee 4.0.3-2 +- Update to new upstream version + +* Thu Aug 08 2002 Elliot Lee 2.6-8 +- Apply patch from #68804, #68806 + +* Mon Jul 15 2002 Elliot Lee 2.6-7 +- Fix #68869 (the other half of the expandrepeats job) + +* Thu Jul 11 2002 Elliot Lee 2.6-6 +- Remove expandrepeats (#67606) +- Patch6 (ftpd-messages.patch) from #68243 + +* Thu Jun 27 2002 Elliot Lee 2.6-5 +- logwatch-2.6-applydate-65655.patch to fix xferlog date parsing +- logwatch-2.6-xinetd_match-65856.patch to match more xinetd lines properly +- logwatch-2.6-confparse-65937.patch to properly parse lines with multiple + = chars in them + +* Fri Jun 21 2002 Tim Powers +- automated rebuild + +* Thu May 23 2002 Tim Powers +- automated rebuild + +* Mon Apr 15 2002 Elliot Lee 2.6-2 +- Fix #62787 (logwatch-2.6-newline-62787.patch) and #63279 (logwatch-2.6-applystddate-63279.patch) + +* Sun Mar 31 2002 Elliot Lee 2.6-1 +- Don't trust homebaked tempdir creation - always use mktemp. + +* Thu Mar 28 2002 Elliot Lee 2.5-4 +- Fix the /tmp race for real +- Merge changes from both spec files. + +* Thu Mar 28 2002 Kirk Bauer 2.5-2 +- Updated new changes from Red Hat's rawhide packaging + +* Tue Sep 04 2001 Elliot Lee 2.1.1-3 +- Fix #53077 + +* Thu Aug 09 2001 Elliot Lee 2.1.1-2 +- Fix warning in services/init (#51305) and don't include fortune module +(#51093). + +* Mon May 21 2001 Tim Powers +- updated to 2.1.1 +- adapted changes from Kirk Bauer's spec file into this one + +* Sat Aug 5 2000 Tim Powers +- fix bug #15478, spelling error in the description + +* Mon Jul 24 2000 Prospector +- rebuilt + +* Mon Jul 10 2000 Tim Powers +- rebuilt + +* Thu Jun 8 2000 Tim Powers +- fixed man page location to be FHS compliant +- use predefined RPM macros whenever possible + +* Mon May 15 2000 Tim Powers +- rebuilt for 7.0 + +* Mon Jul 19 1999 Tim Powers +- rebuilt for 6.1 + +* Thu Apr 15 1999 Michael Maher +- built package for 6.0 +- updated source + +* Wed Nov 18 1998 Kirk Bauer +- Modified to comply with RHCN standards + +* Fri Oct 2 1998 Michael Maher +- built package + +* Sun Feb 23 1998 Kirk Bauer +- Minor changes and addition of man-page + +* Sun Feb 22 1998 Kirk Bauer +- initial release From svn at tinysofa.org Thu Jul 1 15:38:18 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:38:18 +1000 (EST) Subject: [tinysofa-svn] r2592 - in tinysofa/snapshot: . man-pages-da man-pages-da/current man-pages-da/current/sources man-pages-da/current/specs Message-ID: <20040701153818.8DACC4E817E@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:38:18 +1000 (Fri, 02 Jul 2004) New Revision: 2592 Added: tinysofa/snapshot/man-pages-da/ tinysofa/snapshot/man-pages-da/current/ tinysofa/snapshot/man-pages-da/current/sources/ tinysofa/snapshot/man-pages-da/current/sources/manpages-da-0.1.1-manpath.patch tinysofa/snapshot/man-pages-da/current/sources/manpages-da-0.1.1.tar.gz tinysofa/snapshot/man-pages-da/current/specs/ tinysofa/snapshot/man-pages-da/current/specs/man-pages-da.spec Log: - Add man-pages-da to snapshot from 2.0. Added: tinysofa/snapshot/man-pages-da/current/sources/manpages-da-0.1.1-manpath.patch =================================================================== --- tinysofa/snapshot/man-pages-da/current/sources/manpages-da-0.1.1-manpath.patch 2004-07-01 15:38:17 UTC (rev 2591) +++ tinysofa/snapshot/man-pages-da/current/sources/manpages-da-0.1.1-manpath.patch 2004-07-01 15:38:18 UTC (rev 2592) @@ -0,0 +1,26 @@ +--- manpages-da-0.1.1/Makefile.orig Mon Jul 3 11:00:10 2000 ++++ manpages-da-0.1.1/Makefile Mon Jul 3 11:06:10 2000 +@@ -1,7 +1,8 @@ + PREFIX = /usr ++MANDIR = $(PREFIX)/share/man + PACKAGE = manpages-da + VERSION = 0.1.1 +-DATA_PATH = $(PREFIX)/man/da/man1 ++DATA_PATH = $(MANDIR)/da/man1 + DIST = chgrp.1 chmod.1 chown.1 dd.1 df.1 gnome-wm.1 make.1 Makefile l?smig AUTHORS ChangeLog + + +@@ -12,11 +13,10 @@ + cp -fR l?smig $(PREFIX)/doc/manpages-da-$(VERSION) + + install-data: +- mkdir $(PREFIX)/man/da +- mkdir $(PREFIX)/man/da/man1 ++ mkdir -p $(DATA_PATH) + cp -fR *.1* $(DATA_PATH) + +-install: install-docs install-data ++install: install-data + + uninstall: + rm -rf $(DATA_PATH)/ Added: tinysofa/snapshot/man-pages-da/current/sources/manpages-da-0.1.1.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/man-pages-da/current/sources/manpages-da-0.1.1.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/man-pages-da/current/specs/man-pages-da.spec =================================================================== --- tinysofa/snapshot/man-pages-da/current/specs/man-pages-da.spec 2004-07-01 15:38:17 UTC (rev 2591) +++ tinysofa/snapshot/man-pages-da/current/specs/man-pages-da.spec 2004-07-01 15:38:18 UTC (rev 2592) @@ -0,0 +1,74 @@ +Summary: Danish man pages from the Linux Documentation Project. +Name: man-pages-da +Version: 0.1.1 +Release: 11ts +License: Distributable +Group: Documentation +Patch: manpages-da-0.1.1-manpath.patch +URL: http://www.sslug.dk/locale/man-sider/ +Source: http://www.sslug.dk/locale/man-sider/manpages-da-%{version}.tar.gz +BuildRoot: %{_tmppath}/%{name}-%{version}-root +BuildArchitectures: noarch + + +%description +Manual pages from the Linux Documentation Project, translated into +Danish. + +%prep +%setup -q -n manpages-da-%{version} +%patch -p1 + +%build + +%install +for i in *.1; do + iconv -f ISO-8859-1 -t UTF-8 < $i > $i.new + mv -f $i.new $i +done +rm -fr $RPM_BUILD_ROOT +make PREFIX=$RPM_BUILD_ROOT/usr install + +%clean +rm -fr $RPM_BUILD_ROOT + +%files +%defattr(-,root,root) +%doc l?smig AUTHORS ChangeLog +%dir %{_mandir}/da +%{_mandir}/da/* + +%changelog +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Tue Feb 11 2003 Phil Knirsch 0.1.1-10 +- Convert all manpages to utf-8. + +* Wed Jan 22 2003 Tim Powers +- rebuilt + +* Wed Dec 11 2002 Tim Powers 0.1.1-8 +- rebuild + +* Fri Jun 21 2002 Tim Powers +- automated rebuild + +* Thu May 23 2002 Tim Powers +- automated rebuild + +* Wed Jan 09 2002 Tim Powers +- automated rebuild + +* Tue Aug 14 2001 Tim Powers +- rebuilt to hopefully fix the rpm verify problems + +* Thu Aug 2 2001 Trond Eivind Glomsr?d +- s/Copyright/License/ +- Own %%{_mandir}/da + +* Wed Jul 12 2000 Prospector +- automatic rebuild + +* Sun Jul 02 2000 Trond Eivind Glomsr?d +- rpmify From svn at tinysofa.org Thu Jul 1 15:38:17 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:38:17 +1000 (EST) Subject: [tinysofa-svn] r2591 - in tinysofa/snapshot: . man-pages-cs man-pages-cs/current man-pages-cs/current/sources man-pages-cs/current/specs Message-ID: <20040701153817.C86344E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:38:17 +1000 (Fri, 02 Jul 2004) New Revision: 2591 Added: tinysofa/snapshot/man-pages-cs/ tinysofa/snapshot/man-pages-cs/current/ tinysofa/snapshot/man-pages-cs/current/sources/ tinysofa/snapshot/man-pages-cs/current/sources/man-pages-cs-0.14-hyphen.patch tinysofa/snapshot/man-pages-cs/current/sources/man-pages-cs-0.16.tar.gz tinysofa/snapshot/man-pages-cs/current/specs/ tinysofa/snapshot/man-pages-cs/current/specs/man-pages-cs.spec Log: - Add man-pages-cs to snapshot from 2.0. Added: tinysofa/snapshot/man-pages-cs/current/sources/man-pages-cs-0.14-hyphen.patch =================================================================== --- tinysofa/snapshot/man-pages-cs/current/sources/man-pages-cs-0.14-hyphen.patch 2004-07-01 15:38:16 UTC (rev 2590) +++ tinysofa/snapshot/man-pages-cs/current/sources/man-pages-cs-0.14-hyphen.patch 2004-07-01 15:38:17 UTC (rev 2591) @@ -0,0 +1,11 @@ +--- man-pages-cs-0.14/man1/pdf2dsc.1.hyphen Tue Apr 3 18:04:10 2001 ++++ man-pages-cs-0.14/man1/pdf2dsc.1 Tue Apr 3 18:04:19 2001 +@@ -1,7 +1,7 @@ + .\" $Id: pdf2dsc.1,v 1.1 2000/03/09 08:40:40 lpd Exp $ + .TH PDF2DSC 1 "3 February 2000" 6.0 "Ghostscript Tools" \" -*- nroff -*- + .do hla cs +-.do hpf hyphens.cs ++.do hpf hyphen.cs + .SH JM?NO + pdf2dsc \- generuje PostScript seznam str?nek dokumentu PDF + .SH POU?IT? Added: tinysofa/snapshot/man-pages-cs/current/sources/man-pages-cs-0.16.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/man-pages-cs/current/sources/man-pages-cs-0.16.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/man-pages-cs/current/specs/man-pages-cs.spec =================================================================== --- tinysofa/snapshot/man-pages-cs/current/specs/man-pages-cs.spec 2004-07-01 15:38:16 UTC (rev 2590) +++ tinysofa/snapshot/man-pages-cs/current/specs/man-pages-cs.spec 2004-07-01 15:38:17 UTC (rev 2591) @@ -0,0 +1,86 @@ +Summary: Czech man pages from the Linux Documentation Project. +Name: man-pages-cs +Version: 0.16 +Release: 3ts +Patch0: man-pages-cs-0.14-hyphen.patch +License: Distributable +Group: Documentation +Source: ftp://ftp.linux.cz/pub/linux/localization/czman/man-pages-cs-%{version}.tar.gz +BuildRoot: %{_tmppath}/%{name}-%{version}-root +BuildArch: noarch + + +%description +Manual pages from the Linux Documentation Project, translated into +Czech. + +%prep +%setup -q + +%build + +%install +rm -fr $RPM_BUILD_ROOT +mkdir -p $RPM_BUILD_ROOT/%{_mandir} +LC_ALL=cs_CZ.UTF-8 make install MANDIR=$RPM_BUILD_ROOT/%{_mandir}/cs + +rm -f $RPM_BUILD_ROOT%{_mandir}/cs/man1/man.1* +rm -f $RPM_BUILD_ROOT%{_mandir}/cs/man5/shadow.5* + +%clean +rm -fr $RPM_BUILD_ROOT + +%files +%defattr(-,root,root) +%doc CONTRIB README README.Czech man-pages-cs-*.lsm +%dir %{_mandir}/cs +%{_mandir}/cs/* + +%changelog +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Tue Feb 10 2004 Akira TAGOH 0.16-2 +- removed man.1 because the latest man contains it. + +* Thu Feb 06 2003 Adrian Havill +- make iconv use UTF8 (#78717) +- update to 0.16 + +* Wed Jan 22 2003 Tim Powers +- rebuilt + +* Mon Nov 25 2002 Tim Powers +- remove the shadow manpage since it conflicts with shadow-utils now + +* Fri Jun 21 2002 Tim Powers +- automated rebuild + +* Thu May 23 2002 Tim Powers +- automated rebuild + +* Wed Jan 09 2002 Tim Powers +- automated rebuild + +* Tue Aug 14 2001 Tim Powers +- rebuilt to hopefully fix the rpm verify problem + +* Thu Aug 2 2001 Trond Eivind Glomsr?d +- s/Copyright/License/ +- Own %%{_mandir}/cs + +* Tue Apr 3 2001 Trond Eivind Glomsr?d +- make pdf2dsc(1) use hyphen.cs, not hyphens.cs (#34181) + +* Tue Dec 19 2000 Trond Eivind Glomsr?d +- 0.14 +- new location + +* Wed Jul 12 2000 Prospector +- automatic rebuild + +* Tue Jun 20 2000 Jeff Johnson +- rebuild to compress man pages. + +* Sun Jun 11 2000 Trond Eivind Glomsr?d +- first build From svn at tinysofa.org Thu Jul 1 15:38:21 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:38:21 +1000 (EST) Subject: [tinysofa-svn] r2594 - in tinysofa/snapshot: . man-pages-es man-pages-es/current man-pages-es/current/sources man-pages-es/current/specs Message-ID: <20040701153821.DA7734E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:38:21 +1000 (Fri, 02 Jul 2004) New Revision: 2594 Added: tinysofa/snapshot/man-pages-es/ tinysofa/snapshot/man-pages-es/current/ tinysofa/snapshot/man-pages-es/current/sources/ tinysofa/snapshot/man-pages-es/current/sources/man-pages-es-1.28.tar.bz2 tinysofa/snapshot/man-pages-es/current/specs/ tinysofa/snapshot/man-pages-es/current/specs/man-pages-es.spec Log: - Add man-pages-es to snapshot from 2.0. Added: tinysofa/snapshot/man-pages-es/current/sources/man-pages-es-1.28.tar.bz2 =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/man-pages-es/current/sources/man-pages-es-1.28.tar.bz2 ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/man-pages-es/current/specs/man-pages-es.spec =================================================================== --- tinysofa/snapshot/man-pages-es/current/specs/man-pages-es.spec 2004-07-01 15:38:19 UTC (rev 2593) +++ tinysofa/snapshot/man-pages-es/current/specs/man-pages-es.spec 2004-07-01 15:38:21 UTC (rev 2594) @@ -0,0 +1,96 @@ +Summary: Spanish man pages from the Linux Documentation Project. +Name: man-pages-es +Version: 1.28 +Release: 8ts +License: Distributable +Group: Documentation +URL: http://www.pameli.org/ +# the source URL contains a tar.gz file - which has been recompressed +# with bzip2 +Source: http://www.pameli.org/download/man-pages-es-%{version}.tar.bz2 +BuildRoot: %{_tmppath}/%{name}-%{version}-root +BuildArchitectures: noarch + +%description +Manual pages from the Linux Documentation Project, translated into +Spanish. + +%prep +%setup -q + +%build + +%install + +rm -fr $RPM_BUILD_ROOT +mkdir -p $RPM_BUILD_ROOT%{_mandir}/es +for n in 1 2 3 4 5 6 7 8 9 n; do + mkdir $RPM_BUILD_ROOT%{_mandir}/es/man$n +done +for i in man*/*; do + iconv -f ISO-8859-1 -t UTF-8 < $i > $i.new + mv -f $i.new $i +done +for i in man?; do + install -m 644 $i/* $RPM_BUILD_ROOT%{_mandir}/es/$i; +done + +%clean +rm -fr $RPM_BUILD_ROOT + +%files +%defattr(-,root,root) +%doc LEEME man-pages-1.28.Announce README +%dir %{_mandir}/es +%{_mandir}/es/* + +%changelog +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Tue Feb 11 2003 Phil Knirsch 1.28-7 +- Convert all manpages to utf-8. + +* Wed Jan 22 2003 Tim Powers 1.28-6 +- rebuilt + +* Wed Dec 11 2002 Tim Powers 1.28-5 +- rebuild + +* Fri Jun 21 2002 Tim Powers +- automated rebuild + +* Thu May 23 2002 Tim Powers +- automated rebuild + +* Wed Jan 09 2002 Tim Powers +- automated rebuild + +* Wed Nov 14 2001 Trond Eivind Glomsr?d 1.28-1 +- 1.28 +- New URL + +* Mon Aug 13 2001 Trond Eivind Glomsr?d 0.6a-9 +- Rebuild. Should fix #51679 + +* Thu Aug 2 2001 Trond Eivind Glomsr?d +- Own %%{_mandir}/es + +* Tue Apr 3 2001 Trond Eivind Glomsr?d +- Fix some roff errors in man pages, delete console_codes.4 + (has error, can't locate it) + +* Wed Jul 12 2000 Prospector +- automatic rebuild + +* Tue Jun 20 2000 Jeff Johnson +- rebuild to compress man pages. + +* Mon Jun 19 2000 Matt Wilson +- defattr root + +* Sun Jun 12 2000 Trond Eivind Glomsr?d +- use %%{_mandir} and %%{_tmppath} + +* Mon May 15 2000 Trond Eivind Glomsr?d +- first build From svn at tinysofa.org Thu Jul 1 15:38:19 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:38:19 +1000 (EST) Subject: [tinysofa-svn] r2593 - in tinysofa/snapshot: . man-pages-de man-pages-de/current man-pages-de/current/sources man-pages-de/current/specs Message-ID: <20040701153819.005D14E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:38:19 +1000 (Fri, 02 Jul 2004) New Revision: 2593 Added: tinysofa/snapshot/man-pages-de/ tinysofa/snapshot/man-pages-de/current/ tinysofa/snapshot/man-pages-de/current/sources/ tinysofa/snapshot/man-pages-de/current/sources/man-pages-de-0.2-rofffixes.patch tinysofa/snapshot/man-pages-de/current/sources/man-pages-de-0.3-nolocalfile.patch tinysofa/snapshot/man-pages-de/current/sources/manpages-de-0.4.tar.gz tinysofa/snapshot/man-pages-de/current/specs/ tinysofa/snapshot/man-pages-de/current/specs/man-pages-de.spec Log: - Add man-pages-de to snapshot from 2.0. Added: tinysofa/snapshot/man-pages-de/current/sources/man-pages-de-0.2-rofffixes.patch =================================================================== --- tinysofa/snapshot/man-pages-de/current/sources/man-pages-de-0.2-rofffixes.patch 2004-07-01 15:38:18 UTC (rev 2592) +++ tinysofa/snapshot/man-pages-de/current/sources/man-pages-de-0.2-rofffixes.patch 2004-07-01 15:38:19 UTC (rev 2593) @@ -0,0 +1,86 @@ +--- man-pages-de-0.2/man1/compress.1.rofffix Tue Apr 3 18:14:18 2001 ++++ man-pages-de-0.2/man1/compress.1 Tue Apr 3 18:32:04 2001 +@@ -60,7 +60,7 @@ + .B compress + .BR \-dc , + das hei?t, es schreibt die entkomprimierten Dateien auf die +-Standardausgabe. Diese Funktion wird in den Shellscripts {\bsf zdiff}, ++Standardausgabe. Diese Funktion wird in den Shellscripts \fBzdiff\fP, + .B zmore + oder + .B zless +--- man-pages-de-0.2/man1/find.1.rofffix Tue Apr 3 18:25:48 2001 ++++ man-pages-de-0.2/man1/find.1 Tue Apr 3 18:28:23 2001 +@@ -257,7 +257,7 @@ + .BI \-used " N" + .RI "auf die Datei ist " N " Tage nach der letzten ?nderung zugegriffen worden" + .TP +-.BI\ -user " Name" ++.BI \-user " Name" + .RI "die Datei geh?rt dem Anwender " Name + .TP + .BI \-xtype " C" +--- man-pages-de-0.2/man1/od.1.rofffix Tue Apr 3 18:29:11 2001 ++++ man-pages-de-0.2/man1/od.1 Tue Apr 3 18:34:40 2001 +@@ -213,7 +213,8 @@ + .B \-f + gibt die Daten als Flie?kommazahlen mit vier Bytes je Zahl aus, wie + .B \-t fF +-.TP \fB-h\fP ++.TP ++\fB-h\fP + gibt die Daten als vierstellige Hexadezimalzahl aus, wie + .B \-t xL + .TP +--- man-pages-de-0.2/man2/ioctl_list.2.rofffix Tue Apr 3 18:35:38 2001 ++++ man-pages-de-0.2/man2/ioctl_list.2 Tue Apr 3 18:36:24 2001 +@@ -544,8 +544,7 @@ + Pointer enth?lt. Diese sind hier in alphabetischer Reihenfolge dokumentiert. + + CDROMREADAUDIO ben?tigt eine Eingabe-Pointer 'const struct cdrom_read_audio *'. +-Das FEld 'buf' zeigt auf einen Ausgabepuffer der L?nge +-'nframes * CD_FRAMESIZE_RAW'. ++Das FEld 'buf' zeigt auf einen Ausgabepuffer der L?nge 'nframes * CD_FRAMESIZE_RAW'. + + CDROMREADCOOKED, CDROMREADMODE1, CDROMREADMODE2 und CDROMREADRAW ben?tigen + einen Eingabe-Pointer 'const struct cdrom_msf *'. Sie benutzen den selben +@@ -571,8 +570,8 @@ + EQL_SETMASTERCFG const struct master_config * + + FDRAWCMD ben?tigt eine 'struct floppy raw_cmd *'. Wenn 'flags & FD_RAW_WRITE' +-nicht Null ist, dann zeigt 'data' auf einen Eingabepuffer der L?nge +-'length'. Wenn 'flags & FD_RAW_READ' nicht Null ist, dann zeigt 'data' auf ++nicht Null ist, dann zeigt 'data' auf einen Eingabepuffer der L?nge 'length'. ++Wenn 'flags & FD_RAW_READ' nicht Null ist, dann zeigt 'data' auf + einen Ausgabepuffer der L?nge 'length'. + + GIO_FONTX und PIO_FONTX ben?tigen eine 'struct console_font_desc *' +@@ -581,8 +580,8 @@ + und ein Eingabepuffer f?r PIO_FONTX. + + GIO_UNIMAP and PIO_UNIMAP ben?tigen eine 'struct unimapdesc *' beziehungsweise +-eine 'const struct unimapdesc *'. 'entries' zeigt auf einen Puffer von +-'struct unipair [entry_ct]'. Dies ist ein Ausgabepuffer f?r GIO_UNIMAP ++eine 'const struct unimapdesc *'. 'entries' zeigt auf einen Puffer von 'struct unipair [entry_ct]'. ++Dies ist ein Ausgabepuffer f?r GIO_UNIMAP + und ein Eingabepuffer f?r PIO_UNIMAP. + + KDADDIO, KDDELIO, KDDISABIO und KDENABIO geben Zugriff frei oder sperren +@@ -593,7 +592,7 @@ + + SCSI_IOCTL_PROBE_HOST ben?tigt einen Eingabe-Pointer 'const int *', der eine + L?nge ist. Es benutzt den selben Pointer als Ausgabe-Pointer auf einen Puffer +-'char []' dieser L?nge. ++ 'char []' dieser L?nge. + + SIOCADDRT and SIOCDELRT ben?tigen einen Eingabe-Pointer, dessen Typ vom + Protokoll abh?ngt: +@@ -613,7 +612,7 @@ + + TIOCLINUX ben?tigt eine 'const char *'. Es benutzt dies um zwischen + diversen unabh?ngigen F?llen zu unterscheiden. In der Tabelle unten bedeutet +-'N + foo' 'foo' nach einem N-byte - Block. 'struct selection' ist definiert ++ 'N + foo' 'foo' nach einem N-byte - Block. 'struct selection' ist definiert + in 'drivers/char/selection.c' + + TIOCLINUX-2 1 + const struct selection * Added: tinysofa/snapshot/man-pages-de/current/sources/man-pages-de-0.3-nolocalfile.patch =================================================================== --- tinysofa/snapshot/man-pages-de/current/sources/man-pages-de-0.3-nolocalfile.patch 2004-07-01 15:38:18 UTC (rev 2592) +++ tinysofa/snapshot/man-pages-de/current/sources/man-pages-de-0.3-nolocalfile.patch 2004-07-01 15:38:19 UTC (rev 2593) @@ -0,0 +1,20 @@ +--- manpages-de-0.3/man1/man.1.nolocalfile Sun Jan 31 07:57:40 1999 ++++ manpages-de-0.3/man1/man.1 Thu May 31 19:04:42 2001 +@@ -409,17 +409,6 @@ + die ein Argument ben?tigen, ?berschreibt jedes Duplikat den + vorhergehenden Wert. + .TP +-.B \-l, \-\-local-file +-Aktiviert den lokalen Modus. Formatiert und zeigt lokale Manualdateien an, +-anstatt die System-Manualsammlung zu durchsuchen. Jedes +-Manualseiten-Argument wird als nroff-Quelle im richtigen Format +-interpretiert. Komprimierte nroff-Quelldateien mit einer unterst?tzten +-Kompressions-Erweiterung werden von +-.B man +-dekomprimiert, bevor sie ?ber den ?blichen Filter angezeigt werden. Es wird +-keine cat-Datei erzeugt. Wenn eines der Argumente `\-' ist, wird die Eingabe +-von der Standardeingabe ?bernommen. +-.TP + .BI \-L\ locale ,\ \-\-locale= locale + Normalerweise bestimmt + .B man Added: tinysofa/snapshot/man-pages-de/current/sources/manpages-de-0.4.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/man-pages-de/current/sources/manpages-de-0.4.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/man-pages-de/current/specs/man-pages-de.spec =================================================================== --- tinysofa/snapshot/man-pages-de/current/specs/man-pages-de.spec 2004-07-01 15:38:18 UTC (rev 2592) +++ tinysofa/snapshot/man-pages-de/current/specs/man-pages-de.spec 2004-07-01 15:38:19 UTC (rev 2593) @@ -0,0 +1,112 @@ +Summary: German man pages from the Linux Documentation Project. +Name: man-pages-de +Version: 0.4 +Release: 8ts +License: Distributable +Group: Documentation +URL: http://www.infodrom.org/projects/manpages-de/ +Source: http://www.infodrom.org/projects/manpages-de/download/manpages-de-%{version}.tar.gz +Patch0: man-pages-de-0.2-rofffixes.patch +Patch1: man-pages-de-0.3-nolocalfile.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-root +BuildArchitectures: noarch + + +%description +Manual pages from the Linux Documentation Project, translated into +German. + +%prep + +%setup -q -n manpages-de-%{version} +#patch0 -p1 +%patch1 -p1 + +%build +rm -f man1/hostname.* + +%install +rm -fr $RPM_BUILD_ROOT +mkdir -p $RPM_BUILD_ROOT/%{_mandir}/de +for n in 1 2 3 4 5 6 7 8 9 n; do + mkdir $RPM_BUILD_ROOT/%{_mandir}/de/man$n +done +for i in man*/*; do + iconv -f ISO-8859-1 -t UTF-8 < $i > $i.new + mv -f $i.new $i +done +LC_ALL=de_DE make prefix=$RPM_BUILD_ROOT/usr \ + MANDIR=$RPM_BUILD_ROOT/%{_mandir}/de install + +rm -f $RPM_BUILD_ROOT%{_mandir}/de/man1/{apropos.1,man.1,whatis.1}* +rm -f $RPM_BUILD_ROOT%{_mandir}/de/man5/man.config.5* + +%clean +rm -fr $RPM_BUILD_ROOT + +%files +%defattr(-,root,root) +%doc CHANGES COPYRIGHT README +%dir %{_mandir}/de +%{_mandir}/de/* + + +%changelog +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Tue Feb 10 2004 Akira TAGOH 0.4-7 +- removed apropos.1, man.1, whatis.1, and man.config.5, because the latest man contains those manpages. + +* Tue Feb 11 2003 Phil Knirsch 0.4-6 +- Convert all manpages to utf-8. + +* Wed Jan 22 2003 Tim Powers 0.4-5 +- rebuilt + +* Wed Dec 11 2002 Tim Powers 0.4-4 +- rebuild + +* Fri Jun 21 2002 Tim Powers +- automated rebuild + +* Thu May 23 2002 Tim Powers +- automated rebuild + +* Wed Mar 13 2002 Trond Eivind Glomsr?d 0.4-1 +- 0.4 + +* Tue Aug 14 2001 Tim Powers +- rebuilt to hopefully fix rpm verify problem + +* Mon Aug 13 2001 Trond Eivind Glomsr?d +- Rebuild (should fix #51677) + +* Thu Aug 2 2001 Trond Eivind Glomsr?d +- Own /usr/share/man/de + +* Thu May 31 2001 Trond Eivind Glomsr?d +- 0.3 +- Added URL, changed location +- Remove --local-file option from the German man(1) (#39211) + +* Sun Apr 8 2001 Trond Eivind Glomsr?d +- Remove hostname.1, it's now part of net-tools + +* Tue Apr 3 2001 Trond Eivind Glomsr?d +- Some fixes to the roff sources (#34183) + +* Wed Jul 12 2000 Prospector +- automatic rebuild + +* Tue Jun 20 2000 Jeff Johnson +- rebuild to compress man pages. + +* Mon Jun 19 2000 Matt Wilson +- defattr root + +* Sun Jun 11 2000 Trond Eivind Glomsr?d +- use %%{_mandir} and %%{_tmppath} + +* Mon May 15 2000 Trond Eivind Glomsr?d +- first build From svn at tinysofa.org Thu Jul 1 15:38:27 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:38:27 +1000 (EST) Subject: [tinysofa-svn] r2595 - in tinysofa/snapshot: . man-pages-fr man-pages-fr/current man-pages-fr/current/sources man-pages-fr/current/specs Message-ID: <20040701153827.C2EFE4E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:38:27 +1000 (Fri, 02 Jul 2004) New Revision: 2595 Added: tinysofa/snapshot/man-pages-fr/ tinysofa/snapshot/man-pages-fr/current/ tinysofa/snapshot/man-pages-fr/current/sources/ tinysofa/snapshot/man-pages-fr/current/sources/man-fr-0.9.7.tar.gz tinysofa/snapshot/man-pages-fr/current/sources/man-fr-0.9.tar.gz tinysofa/snapshot/man-pages-fr/current/sources/mansupfr.tar.bz2 tinysofa/snapshot/man-pages-fr/current/specs/ tinysofa/snapshot/man-pages-fr/current/specs/man-pages-fr.spec Log: - Add man-pages-fr to snapshot from 2.0. Added: tinysofa/snapshot/man-pages-fr/current/sources/man-fr-0.9.7.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/man-pages-fr/current/sources/man-fr-0.9.7.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/man-pages-fr/current/sources/man-fr-0.9.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/man-pages-fr/current/sources/man-fr-0.9.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/man-pages-fr/current/sources/mansupfr.tar.bz2 =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/man-pages-fr/current/sources/mansupfr.tar.bz2 ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/man-pages-fr/current/specs/man-pages-fr.spec =================================================================== --- tinysofa/snapshot/man-pages-fr/current/specs/man-pages-fr.spec 2004-07-01 15:38:21 UTC (rev 2594) +++ tinysofa/snapshot/man-pages-fr/current/specs/man-pages-fr.spec 2004-07-01 15:38:27 UTC (rev 2595) @@ -0,0 +1,150 @@ +Summary: French man pages from the Linux Documentation Project. +Name: man-pages-fr +Version: 0.9.7 +Release: 10ts +License: Distributable +Group: Documentation +Source: ftp://ftp.lip6.fr/pub/linux/french/docs/man-fr-0.9.tar.gz +Source1: http://perso.club-internet.fr/ccb/man/man-fr-%{version}.tar.gz +Source2: http://www.delafond.org/traducmanfr/mansupfr.tar.bz2 +BuildRoot: %{_tmppath}/%{name}-%{version}-root +BuildArchitectures: noarch + +%description +Manual pages from the Linux Documentation Project, translated into French. Also +includes supplemental pages provided by Dr. Patrick Atlas and Dr. Gerard +Delafond + +%prep +# setup original LDP tarball as they have pages not provided by other tarballs +%setup -q -n man-fr-0.9 +mv -f changements changements-0.9 +mv -f LISEZ_MOI LISEZ_MOI-0.9 + +# now include the pages maintained by Christophe Blaess +tar zxf %{SOURCE1} +cp -a man-fr/* . +rm -rf man-fr +mv -f changements changements-0.9.7 +mv -f LISEZ_MOI LISEZ_MOI-0.9.7 + +# and finally pick up the supplemental pages, which overwrites a few files too +tar jxf %{SOURCE2} +cp -a pagesdeman/usr/share/man/fr/* . +mv -f pagesdeman/LISEZ_MOI LISEZ_MOI-mansupfr +rm -rf pagesdeman + +%build +rm -f man1/{dnsdomainname,domainname,hostname}.1 man5/ethers.5 +rm -f man2/core.2149 man2/core.2160 + +%install +rm -fr $RPM_BUILD_ROOT +mkdir -p $RPM_BUILD_ROOT%{_mandir}/fr +for n in 1 2 3 4 5 6 7 8 9 n; do + mkdir $RPM_BUILD_ROOT%{_mandir}/fr/man$n +done +for i in man?/*; do + iconv -f ISO-8859-1 -t UTF-8 < $i > $i.new + mv -f $i.new $i +done +for i in man?; do + install -m 644 $i/* $RPM_BUILD_ROOT%{_mandir}/fr/$i; +done + +# remove these since they conflict with the cups package +rm -f $RPM_BUILD_ROOT%{_mandir}/fr/man1/{backend.1,filter.1,lp.1,lpoptions.1,lppasswd.1,lpstat.1,chage.1,gpasswd.1,xawtv.1,lpq.1,lpr.1,lprm.1,apropos.1,man.1,whatis.1}* +rm -f $RPM_BUILD_ROOT%{_mandir}/fr/man3/cups-config.3* +rm -f $RPM_BUILD_ROOT%{_mandir}/fr/man5/{classes.conf.5,cupsd.conf.5,mime.convs.5,mime.types.5,printers.conf.5,faillog.5,shadow.5,man.config.5}* +rm -f $RPM_BUILD_ROOT%{_mandir}/fr/man8/{accept.8,cups-lpd.8,cups-polld.8,cupsaddsmb.8,cupsd.8,enable.8,lpadmin.8,lpc.8,lpinfo.8,lpmove.8,reject.8,adduser.8,chpasswd.8,useradd.8,userdel.8,usermod.8}* + +%clean +rm -fr $RPM_BUILD_ROOT + +%files +%defattr(-,root,root) +%doc changements-0.9 changements-0.9.7 LISEZ_MOI-0.9 LISEZ_MOI-0.9.7 LISEZ_MOI-mansupfr +%dir %{_mandir}/fr +%{_mandir}/fr/* + +%changelog +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Tue Feb 10 2004 Akira TAGOH 0.9.7-9 +- removed apropos.1, man.1, whatis.1, and man.config.5, because the latest man contains those manpages. + +* Wed Sep 17 2003 Paul Gampe 0.9.7-8 +- Bump + +* Fri Sep 12 2003 Paul Gampe 0.9.7-7 +- Clean out core files included in upstream tarball [#101328] + +* Wed May 28 2003 Phil Knirsch 0.9.7-6.1 +- Bumped release and rebuilt + +* Wed May 28 2003 Phil Knirsch 0.9.7-6 +- Dropped ethers.5 and domainname.1 manpages as they are in net-tools now. + +* Tue Feb 11 2003 Phil Knirsch 0.9.7-5 +- Convert all manpages to utf-8. + +* Wed Jan 22 2003 Tim Powers 0.9.7-4 +- rebuilt + +* Thu Jan 9 2003 Tim Powers 0.9.7-3 +- more pages to remove + +* Thu Jan 9 2003 Tim Powers 0.9.7-2 +- remove pages that conflict with other packages + +* Thu Jan 9 2003 Paul Gampe 0.9.7-1 +- incorporate the three sources of available french manual pages + to increase coverage + +* Thu Nov 7 2002 Tim Powers 0.9-10 +- remove lpq.1, lpr.1, and lprm.1 since they conflict with the mas + mages in the cups package + +* Fri Jun 21 2002 Tim Powers 0.9-9 +- automated rebuild + +* Mon Jun 17 2002 Trond Eivind Glomsr?d 0.9-8 +- Update nm.1 (#66666 - I like bugs with attaced fixes :) + +* Thu May 23 2002 Tim Powers +- automated rebuild + +* Wed Jan 09 2002 Tim Powers +- automated rebuild + +* Mon Aug 13 2001 Trond Eivind Glomsr?d 0.9-5 +- Rebuild. This should fix #51685 + +* Thu Aug 2 2001 Trond Eivind Glomsr?d +- Own %%{_mandir}/fr +- s/Copyright/License/ + +* Sun Apr 8 2001 Trond Eivind Glomsr?d +- Remove dnsdomainname.1 and hostname.1, they're now part of net-tools + +* Tue Apr 3 2001 Trond Eivind Glomsr?d +- fixes to the roff sources + +* Tue Dec 19 2000 Trond Eivind Glomsr?d +- 0.9 + +* Wed Jul 12 2000 Prospector +- automatic rebuild + +* Tue Jun 20 2000 Jeff Johnson +- rebuild to compress man pages. + +* Mon Jun 19 2000 Matt Wilson +- defattr root + +* Sun Jun 12 2000 Trond Eivind Glomsr?d +- use %%{_mandir} and %%{_tmppath} + +* Mon May 15 2000 Trond Eivind Glomsr?d +- first build From svn at tinysofa.org Thu Jul 1 15:38:29 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:38:29 +1000 (EST) Subject: [tinysofa-svn] r2596 - in tinysofa/snapshot: . man-pages-it man-pages-it/current man-pages-it/current/sources man-pages-it/current/specs Message-ID: <20040701153829.DE7204E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:38:29 +1000 (Fri, 02 Jul 2004) New Revision: 2596 Added: tinysofa/snapshot/man-pages-it/ tinysofa/snapshot/man-pages-it/current/ tinysofa/snapshot/man-pages-it/current/sources/ tinysofa/snapshot/man-pages-it/current/sources/man-pages-it-0.3.0-rofffix.patch tinysofa/snapshot/man-pages-it/current/sources/man-pages-it-0.3.0.tar.gz tinysofa/snapshot/man-pages-it/current/specs/ tinysofa/snapshot/man-pages-it/current/specs/man-pages-it.spec Log: - Add man-pages-it to snapshot from 2.0. Added: tinysofa/snapshot/man-pages-it/current/sources/man-pages-it-0.3.0-rofffix.patch =================================================================== --- tinysofa/snapshot/man-pages-it/current/sources/man-pages-it-0.3.0-rofffix.patch 2004-07-01 15:38:27 UTC (rev 2595) +++ tinysofa/snapshot/man-pages-it/current/sources/man-pages-it-0.3.0-rofffix.patch 2004-07-01 15:38:29 UTC (rev 2596) @@ -0,0 +1,129 @@ +--- man-pages-it-0.3.0/man1/chmod.1.rofffix Wed Apr 4 11:29:13 2001 ++++ man-pages-it-0.3.0/man1/chmod.1 Wed Apr 4 11:31:26 2001 +@@ -23,8 +23,7 @@ + .B [\-\-help] [\-\-version] [\-\-] + .SH DESCRIZIONE + .B chmod +-cambia i permessi di ogni +-.file file ++cambia i permessi di ogni file + dato secondo i + .IR permessi + dati, i quali possono essere o una rappresentazione simbolica delle +--- man-pages-it-0.3.0/man1/mv.1.rofffix Wed Apr 4 11:32:21 2001 ++++ man-pages-it-0.3.0/man1/mv.1 Wed Apr 4 11:32:41 2001 +@@ -53,7 +53,7 @@ + Quando sia + .I sorgente + che +-.destinazione ++.I destinazione + sono sulla stesso filesystem, allora sono lo stesso file (viene + semplicemente cambiato il nome: proprietario, permessi e orari non + vengono toccati). Quando sono su filesystem diversi, il file sorgente +--- man-pages-it-0.3.0/man1/talk.1.rofffix Wed Apr 4 11:32:51 2001 ++++ man-pages-it-0.3.0/man1/talk.1 Wed Apr 4 11:33:24 2001 +@@ -130,7 +130,7 @@ + incompatibile con il protocollo usato nella versione rilasciata con + .Bx 4.2 + (SunOS/Solaris usa il protocollo vecchio). +-.PP ++.Pp + Si potrebbe avere un altro problema quando si fa un talk su un + collegamento SLIP o PPP. Per farlo funzionare bisogna scambiare, + fintanto che dura il collegamento, il nome della macchina (hostname) +--- man-pages-it-0.3.0/man7/regex.7.rofffix Wed Apr 4 11:33:45 2001 ++++ man-pages-it-0.3.0/man7/regex.7 Wed Apr 4 11:34:00 2001 +@@ -41,19 +41,19 @@ + ER ?di base? in 1003.2). Le ER obsolete esistono per compatibilit? con + alcuni vecchi programmi, e verranno discusse alla fine. 1003.2 lascia + aperti alcuni aspetti della sintassi o della semantica delle ER: +-`\(dg' denota scelte che potrebbero non essere completamente portabili ++`(*)' denota scelte che potrebbero non essere completamente portabili + ad altre implementazioni di 1003.2. + .PP +-Una ER moderna ? una\(dg diramazione o pi? diramazioni non vuote\(dg, ++Una ER moderna ? una(*) diramazione o pi? diramazioni non vuote(*), + separate da `|': l'ER corrisponde a qualsiasi cosa che corrisponda ad + una delle diramazioni. + .PP +-Una diramazione ? formata da uno\(dg o pi? \fIpezzi\fR ++Una diramazione ? formata da uno(*) o pi? \fIpezzi\fR + concatenati. Corrisponde ad una corrispondenza per il primo pezzo, + seguita da una corrispondenza per il secondo, ecc. + .PP + Un pezzo ? formato da un \fIatomo\fR, eventualmente seguito da un +-singolo\(dg `*', `+', `?' o \fIlimite\fR. ++singolo(*) `*', `+', `?' o \fIlimite\fR. + Un atomo seguito da `*' corrisponde ad una successione di 0 o pi? + corrispondenze dell'atomo. + Un atomo seguito da `+' corrisponde ad una successione di 1 o pi? +@@ -66,7 +66,7 @@ + \fIintervallo\fR] ? formato da `{' seguito da un intero decimale senza + segno, eventualmente seguito da `,' eventualmente seguito da un altro + intero decimale senza segno, obbligatoriamente seguito da `}'. Gli +-interi devono essere compresi fra 0 e ER_DUP_MAX (255\(dg) inclusi, e ++interi devono essere compresi fra 0 e ER_DUP_MAX (255(*)) inclusi, e + se ce ne sono due, il primo non deve essere maggiore del secondo. Un + atomo seguito da un limite contenente un intero \fIi\fR e nessuna + virgola corrisponde ad una successione di esattamente \fIi\fR +@@ -79,17 +79,17 @@ + .PP + Un atomo ? formato da un'ER racchiusa fra `()' (corrispondente ad una + corrispondenza per l'ER), un insieme vuoto di `()' (corrispondente +-alla stringa nulla)\(dg, un'\fIespressione parentetica\fR (vedi ++alla stringa nulla)(*), un'\fIespressione parentetica\fR (vedi + sotto), `.' (corrispondente ad un qualsiasi carattere singolo), `^' + (corrispondente alla stringa nulla a inizio riga), `$' (corrispondente + alla stringa nulla a fine riga), una `\e' seguita da uno dei caratteri + `^.[$()|*+?{\e' (corrispondente a quel carattere interpretato come un + carattere normale), una `\e' seguita da un qualsiasi altro +-carattere\(dg (corrispondente a quel carattere interpretato come un +-carattere normale, come se la `\e' non fosse presente\(dg) oppure un ++carattere(*) (corrispondente a quel carattere interpretato come un ++carattere normale, come se la `\e' non fosse presente(*)) oppure un + singolo carattere privo di ulteriori significati (interpretato come se + stesso). Una `{' seguita da un carattere che non sia una cifra ? un +-carattere normale, non l'inizio di un limite\(dg. ? vietato terminare ++carattere normale, non l'inizio di un limite(*). ? vietato terminare + un'ER con `\e'. + .PP + Un'\fIespressione parentetica\fR ? un elenco di caratteri racchiusi da +@@ -100,7 +100,7 @@ + separati da un `\-' formano un'abbreviazione per l'intera serie di + caratteri compresi nella sequenza di collazione fra i due caratteri + (inclusi). Per es., `[0-9]' corrisponde, in ASCII, ad una qualsiasi +-cifra decimale. Due serie non possono\(dg condividere un estremo, per ++cifra decimale. Due serie non possono(*) condividere un estremo, per + es. `a-c-e'. Le serie dipendono particolarmente dalla sequenza di + collazione, e un programma, per essere portatile, non dovrebbe + dipendere su di loro. +@@ -157,7 +157,7 @@ + Una classe di caratteri non pu? essere usata come estremo di una + serie. + .PP +-Ci sono due casi speciali\(dg di espressioni parentetiche: le ++Ci sono due casi speciali(*) di espressioni parentetiche: le + espressioni `[[:<:]]' e `[[:>:]]' corrispondono alla stringa nulla + rispettivamente all'inizio e alla fine di una parola. Una parola ? + definita come una sequenza di caratteri di parola non seguita n? +@@ -202,7 +202,7 @@ + `[^xX]'. + .PP + Non viene imposto nessun limite particolare alla lunghezza di +-un'ER\(dg. Ma un programma, per essere portatile, non dovrebbe ++un'ER(*). Ma un programma, per essere portatile, non dovrebbe + impiegare ER pi? lunghe di 256 byte, in quanto un'implementazione + potrebbe rifiutare una simile ER e rimanere conforme a POSIX. + .PP +@@ -212,8 +212,8 @@ + mentre `{' e `}' sono caratteri ordinari. Le parentesi delle + sottoespressioni annidate sono `\e(' e `\e)', mentre `(' e `)' sono + caratteri ordinari. `^' ? un carattere normale tranne che all'inizio +-dell'ER o\(dg all'inizio di un'espressione parentetica, `$' ? un +-carattere normale tranne che alla fine dell'ER o\(dg alla fine di ++dell'ER o(*) all'inizio di un'espressione parentetica, `$' ? un ++carattere normale tranne che alla fine dell'ER o(*) alla fine di + un'espressione parentetica, `*' ? un carattere normale se appare + all'inizio dell'ER o all'inizio di un'espressione parentetica + (eventualmente preceduto da un `^' iniziale). Infine, c'? un nuovo Added: tinysofa/snapshot/man-pages-it/current/sources/man-pages-it-0.3.0.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/man-pages-it/current/sources/man-pages-it-0.3.0.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/man-pages-it/current/specs/man-pages-it.spec =================================================================== --- tinysofa/snapshot/man-pages-it/current/specs/man-pages-it.spec 2004-07-01 15:38:27 UTC (rev 2595) +++ tinysofa/snapshot/man-pages-it/current/specs/man-pages-it.spec 2004-07-01 15:38:29 UTC (rev 2596) @@ -0,0 +1,97 @@ +Summary: Italian man (manual) pages from the Linux Documentation Project +Name: man-pages-it +Version: 0.3.0 +Release: 14ts +License: Distributable +Group: Documentation +URL: http://www.pluto.linux.it/ildp/man/ +Source: http://ftp.pluto.linux.it/pub/pluto/ildp/man/man-pages-it-%{version}.tar.gz +Patch0: man-pages-it-0.3.0-rofffix.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-root +BuildArchitectures: noarch + + +%description +Manual pages from the Linux Documentation Project, translated into Italian. + +%prep +%setup -q +%patch0 -p1 + +%build + +%install +rm -fr $RPM_BUILD_ROOT +mkdir -p $RPM_BUILD_ROOT%{_mandir}/it +for n in 1 2 3 4 5 6 7 8 9 n; do + mkdir $RPM_BUILD_ROOT%{_mandir}/it/man$n +done + +for i in man*/*; do + iconv -f ISO-8859-1 -t UTF-8 < $i > $i.new + mv -f $i.new $i +done + +mv LICENZE/* . + +LC_ALL=it_IT make prefix=$RPM_BUILD_ROOT/usr \ + mandir=$RPM_BUILD_ROOT/%{_mandir}/it install + +# remove unpackaged files from the buildroot +rm -rf $RPM_BUILD_ROOT%{_prefix}/X11R6 + +rm -f $RPM_BUILD_ROOT%{_mandir}/it/man1/{apropos.1,man.1,whatis.1}* +rm -f $RPM_BUILD_ROOT%{_mandir}/it/man5/man.config.5* +rm -f $RPM_BUILD_ROOT%{_mandir}/it/man8/makewhatis.8* + +%clean +rm -fr $RPM_BUILD_ROOT + +%files +%defattr(-,root,root) +%doc CONTRIB INSTALL INSTALL.eng NEW README README.eng README.translator TODO LDP.licenza +%{_mandir}/it/* + + +%changelog +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Tue Feb 10 2004 Akira TAGOH 0.3.0-13 +- removed apropos.1, man.1, whatis.1, man.config.5, and makewhatis.8, because the latest man contains those manpages. + +* Tue Feb 11 2003 Phil Knirsch 0.3.0-12 +- Convert all manpages to utf-8. + +* Wed Jan 22 2003 Tim Powers 0.3.0-11 +- rebuilt + +* Fri Nov 29 2002 Tim Powers 0.3.0-10 +- remove unpackaged files from the buildroot + +* Fri Jun 21 2002 Tim Powers +- automated rebuild + +* Thu May 23 2002 Tim Powers +- automated rebuild + +* Wed Mar 13 2002 Trond Eivind Glomsr?d 0.3.0-7 +- Add URL + +* Wed Apr 4 2001 Trond Eivind Glomsr?d +- Add patch to fix roff errors in multiple man pages + +* Wed Jul 12 2000 Prospector +- automatic rebuild + +* Tue Jun 20 2000 Jeff Johnson +- rebuild to compress man pages. + +* Mon Jun 19 2000 Matt Wilson +- defattr root + +* Sun Jun 11 2000 Trond Eivind Glomsr?d +- use %%{_mandir} and %%{_tmppath} + +* Mon May 15 2000 Trond Eivind Glomsr?d +- first build From svn at tinysofa.org Thu Jul 1 15:38:39 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:38:39 +1000 (EST) Subject: [tinysofa-svn] r2600 - in tinysofa/snapshot: . man-pages-ru man-pages-ru/current man-pages-ru/current/sources man-pages-ru/current/specs Message-ID: <20040701153839.E5CBD4E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:38:39 +1000 (Fri, 02 Jul 2004) New Revision: 2600 Added: tinysofa/snapshot/man-pages-ru/ tinysofa/snapshot/man-pages-ru/current/ tinysofa/snapshot/man-pages-ru/current/sources/ tinysofa/snapshot/man-pages-ru/current/sources/man-pages-ru-0.6-rofffix.patch tinysofa/snapshot/man-pages-ru/current/sources/manpages-ru-0.7.tar.gz tinysofa/snapshot/man-pages-ru/current/specs/ tinysofa/snapshot/man-pages-ru/current/specs/man-pages-ru.spec Log: - Add man-pages-ru to snapshot from 2.0. Added: tinysofa/snapshot/man-pages-ru/current/sources/man-pages-ru-0.6-rofffix.patch =================================================================== --- tinysofa/snapshot/man-pages-ru/current/sources/man-pages-ru-0.6-rofffix.patch 2004-07-01 15:38:37 UTC (rev 2599) +++ tinysofa/snapshot/man-pages-ru/current/sources/man-pages-ru-0.6-rofffix.patch 2004-07-01 15:38:39 UTC (rev 2600) @@ -0,0 +1,21 @@ +--- manpages-ru-0.6/man2/getsockname.2.rofffix Wed Apr 4 14:03:02 2001 ++++ manpages-ru-0.6/man2/getsockname.2 Wed Apr 4 14:05:32 2001 +@@ -1,4 +1,3 @@ +-.\ -*- nroff -*- + .\" Copyright (c) 1983, 1991 The Regents of the University of California. + .\" All rights reserved. + .\" +--- manpages-ru-0.6/man5/proc.5.rofffix Wed Apr 4 14:06:26 2001 ++++ manpages-ru-0.6/man5/proc.5 Wed Apr 4 14:12:00 2001 +@@ -804,10 +804,7 @@ + ???????, ??? ?????? ??????, ????? ??? ????????? ? ????????? ??????, + ????????? ?? ?????????? ???????, ??? ????????? ???? ??????????? + ???????? ???????, ??????? ????? ?????????, ??? ??? ?? ?????? ???????? +-???????????? ??????? +-.I od -c +-??? +-.I tr "\\000" "\\n" ++???????????? ??????? \fIod -cf\fP ??? \fItr "\\000" "\\n"\fP. + + ?????? ???????? ??????????? ????????, ????????, ???????? ? ????????? ? + ??????? ??? ???????, ??????? ????????? ? ?????? ??????????. Added: tinysofa/snapshot/man-pages-ru/current/sources/manpages-ru-0.7.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/man-pages-ru/current/sources/manpages-ru-0.7.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/man-pages-ru/current/specs/man-pages-ru.spec =================================================================== --- tinysofa/snapshot/man-pages-ru/current/specs/man-pages-ru.spec 2004-07-01 15:38:37 UTC (rev 2599) +++ tinysofa/snapshot/man-pages-ru/current/specs/man-pages-ru.spec 2004-07-01 15:38:39 UTC (rev 2600) @@ -0,0 +1,82 @@ +Summary: Russian man pages from the Linux Documentation Project. +Name: man-pages-ru +Version: 0.7 +Release: 7ts +License: Distributable +Group: Documentation +URL: http://alexm.here.ru/manpages-ru/ +Source: http://alexm.here.ru/manpages-ru/download/manpages-ru-%{version}.tar.gz +Patch0: man-pages-ru-0.6-rofffix.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-root +BuildArch: noarch + + +%description +Manual pages from the Linux Documentation Project, translated into +Russian. + +%prep +%setup -q -n manpages-ru-%{version} + +%build + +%install +rm -fr $RPM_BUILD_ROOT +for i in man*/*; do + iconv -f koi8-r -t UTF-8 < $i > $i.new + mv -f $i.new $i +done +mkdir -p $RPM_BUILD_ROOT/%{_mandir} +LC_ALL=ru_RU make install INSTALLPATH=$RPM_BUILD_ROOT/%{_mandir} \ + LANG_SUBDIR=ru + + +%clean +rm -fr $RPM_BUILD_ROOT + +%files +%defattr(-,root,root) +%doc NEWS README +%dir %{_mandir}/ru +%{_mandir}/ru/* + +%changelog +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Tue Feb 11 2003 Phil Knirsch 0.7-6 +- Convert all manpages to utf-8. + +* Wed Jan 22 2003 Tim Powers 0.7-5 +- rebuilt + +* Wed Dec 11 2002 Tim Powers 0.7-4 +- rebuild + +* Fri Jun 21 2002 Tim Powers +- automated rebuild + +* Thu May 23 2002 Tim Powers +- automated rebuild + +* Wed Mar 13 2002 Trond Eivind Glomsr?d 0.7-1 +- 0.7 + +* Thu Aug 2 2001 Trond Eivind Glomsr?d +- s/Copyright/License/ +- Own %%{_mandir}/ru + +* Wed Apr 4 2001 Trond Eivind Glomsr?d +- roff fixes + +* Mon Feb 5 2001 Trond Eivind Glomsr?d +- Version 0.6 + +* Wed Jul 12 2000 Prospector +- automatic rebuild + +* Tue Jun 20 2000 Jeff Johnson +- rebuild to compress man pages. + +* Sun Jun 11 2000 Trond Eivind Glomsr?d +- first build From svn at tinysofa.org Thu Jul 1 15:38:37 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:38:37 +1000 (EST) Subject: [tinysofa-svn] r2599 - in tinysofa/snapshot: . man-pages-pl man-pages-pl/current man-pages-pl/current/sources man-pages-pl/current/specs Message-ID: <20040701153837.E9D174E817E@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:38:37 +1000 (Fri, 02 Jul 2004) New Revision: 2599 Added: tinysofa/snapshot/man-pages-pl/ tinysofa/snapshot/man-pages-pl/current/ tinysofa/snapshot/man-pages-pl/current/sources/ tinysofa/snapshot/man-pages-pl/current/sources/man-PL01-04-2004.tar.gz tinysofa/snapshot/man-pages-pl/current/sources/man-pages-pl-0.22-roffix.patch tinysofa/snapshot/man-pages-pl/current/specs/ tinysofa/snapshot/man-pages-pl/current/specs/man-pages-pl.spec Log: - Add man-pages-pl to snapshot from 2.0. Added: tinysofa/snapshot/man-pages-pl/current/sources/man-PL01-04-2004.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/man-pages-pl/current/sources/man-PL01-04-2004.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/man-pages-pl/current/sources/man-pages-pl-0.22-roffix.patch =================================================================== --- tinysofa/snapshot/man-pages-pl/current/sources/man-pages-pl-0.22-roffix.patch 2004-07-01 15:38:34 UTC (rev 2598) +++ tinysofa/snapshot/man-pages-pl/current/sources/man-pages-pl-0.22-roffix.patch 2004-07-01 15:38:37 UTC (rev 2599) @@ -0,0 +1,209 @@ +--- pl_PL/man1/as.1.rofffix Tue Jun 22 17:26:08 1999 ++++ pl_PL/man1/as.1 Wed Apr 4 15:09:53 2001 +@@ -11,7 +11,7 @@ + .na + .B as + .RB "[\|" \-a "[\|" dhlns "\|]" \c +-\&\[\|\=\c ++\&[\|\=\c + .I file\c + \&\|]\|] + .RB "[\|" \-D "\|]" +--- pl_PL/man1/mcedit.1.rofffix Sun Aug 1 13:25:54 1999 ++++ pl_PL/man1/mcedit.1 Wed Apr 4 15:09:53 2001 +@@ -2,7 +2,7 @@ + .TH mcedit 1 "30 stycznia 1997" + .SH NAZWA + mcedit - terminalowy edytor tekstowy dla system?w Unixowych +-.\ "Full featured terminal text editor for Unix-like systems. ++.\" Full featured terminal text editor for Unix-like systems." + .SH SK?ADNIA + .B mcedit + .RI [ plik +@@ -113,7 +113,7 @@ + .PP + \fBF19\fR sformatuje pod?wietlony kod C. W celu w??czenia tej cechy stw?rz + plik wykonywalny +-\fI.cedit/edit.indent.rc\fR w swoim katalogu domowym zawieraj?cy: ++ \fI.cedit/edit.indent.rc\fR w swoim katalogu domowym zawieraj?cy: + .IP + .nf + #!/bin/sh +--- pl_PL/man1/mpartition.1.rofffix Sun Aug 1 13:25:54 1999 ++++ pl_PL/man1/mpartition.1 Wed Apr 4 15:09:53 2001 +@@ -40,7 +40,7 @@ + w systemach, gdzie brak jest polecenia \fBfdisk\fR i ?atwego dost?pu do + urz?dze? SCSI. Polecenie to dzia?a tylko na nap?dach, dla kt?rych ustawiono + zmienn? partycji. +-.\ "This command only works on drives whose partition variable is set. ++.\" This command only works on drives whose partition variable is set. + .SH OPCJE + mpartition obs?uguje nast?puj?ce operacje: + .TP +@@ -146,4 +146,4 @@ + z Textinfo dokumentacji oryginalnej dokonano przesuni?cia sekcji opisuj?cej + konwersj? dokumentacji do \fBmtools\fR(1). Tam te? znajdziesz not? prawn? + dotycz?c? rozpowszechniania, modyfikacji i t?umaczenia dokumentacji pakietu +-mtools. +\ No newline at end of file ++mtools. +--- pl_PL/man1/mtools.1.rofffix Thu Aug 12 06:24:56 1999 ++++ pl_PL/man1/mtools.1 Wed Apr 4 15:09:53 2001 +@@ -269,7 +269,7 @@ + z r??nymi mo?liwo?ciami system?w operacyjnych, formaty te nie s? + obs?ugiwane we wszystkich systemach. Mtools rozpoznaj? te formaty tam, + gdzie s? one obs?ugiwane. +-.\ " Mtools recognizes these formats transparently where supported. ++.\" Mtools recognizes these formats transparently where supported. + .PP + W celu sformatowania takich dyskietek powiniene? u?y? narz?dzia odpowiedniego + do systemu operacyjnego. Dla Linuksa, odpowiednie narz?dzia obs?ugi +--- pl_PL/man1/perlfunc.1.rofffix Thu Sep 2 11:16:26 1999 ++++ pl_PL/man1/perlfunc.1 Wed Apr 4 15:09:53 2001 +@@ -1620,7 +1620,7 @@ + .Ve + .Ip "getpgrp \s-1PID\s0" 8 + .IX Item "getpgrp \s-1PID\s0" +-Zwraca bie??c? grup? procesu dla podanego \s-1PID\s-a. Aby uzyska? ++Zwraca bie??c? grup? procesu dla podanego \s-1PID\s0. Aby uzyska? + grup? bie??cego procesu, u?yj warto?ci \s-1PID\s0 r?wnej zero. + U?ycie tej funkcji na maszynie, nie implementuj?cej \fIgetpgrp\fR\|(2) + podniesie wyj?tek. Je?li parametr \s-1PID\s0 zostanie pomini?ty, to zwracana +@@ -1853,7 +1853,7 @@ + Interpretuje \s-1WYRA?\s0 jako ?a?cuch szesnastkowy i zwraca odpowiadaj?c? mu + warto??. (Dla konwersji ?a?cuch?w, kt?re mog? si? zaczyna? od 0, lub 0x, + zobacz opis \f(CWoct\fR, znajduj?cy si? gdzie? w tym dokumencie.) Je?li +-\s-1WYRA?\s0 zostanie pomini?te, to u?ywane jest \(CW$_\fR. ++\s-1WYRA?\s0 zostanie pomini?te, to u?ywane jest \f(CW$_\fR. + .Sp + .Vb 2 + \& print hex '0xAf'; # drukuje '175' +@@ -2001,7 +2001,7 @@ + .Ve + W przeciwie?stwie do zachowania w pow?oce, w perlu je?li \fI-1SYGNA?\s0\fR + jest ujemny, to killuje grupy proces?w, zamiast proces?w. (W Systemie V, +-ujemny numer \fI\s-1PROCESU\s\fR odnosi si? te? do grup proces?w, lecz nie ++ujemny numer \fI\s-1PROCESU\s0\fR odnosi si? te? do grup proces?w, lecz nie + jest to przeno?ne.) Oznacza to, ?e zazwyczaj chcesz przekazywa? sygna?y + dodatnie. Mo?esz te? u?ywa? nazw sygna??w w cudzys?owach. Zobacz jeszcze sekcj? + \fISignals\fR w podr?czniku \fIperlipc\fR(1). +@@ -2094,7 +2094,7 @@ + .Ve + Zobacz te? modu? Time::Local i funkcje \fIstrftime\fR\|(3) i + \fImktime\fR\|(3), dost?pne przez modu? \s-1POSIX\s0. +-.Ip "log \s-WYRA?\s0" 8 ++.Ip "log \s-0WYRA?\s0" 8 + .IX Item "log \s-1EXPR\s0" + .Ip "log" 8 + .IX Item "log" +@@ -2263,7 +2263,7 @@ + dokumencie. Systemy, wymagaj?ce binmode rozpoznaje si? po ich formacie + pliku tekstowego. Systemy takie, jak Unix i Plan9, kt?re oddzielaj? linie + pojedynczym znakiem i kt?re koduj? go w C jako +-\*(L'\en\*(R', nie potrzebuj? \f(CWbinmode\fR. Reszta tak. ++\f(CW\*(C`"\en"\*(C'\fR, nie potrzebuj? \f(CWbinmode\fR. Reszta tak. + .Sp + Przyk?ady: + .Sp +@@ -2416,7 +2416,7 @@ + \& open(FOO, "< $file\e0"); + .Ve + Je?li chcesz u?y? prawdziwego, znanego z C \fIopen()\fR (zobacz stron? +-\fIopen(2)\fR), to powiniene? u?y? funkcji \sIsysopen()\fR. Jest to inny ++\fIopen(2)\fR), to powiniene? u?y? funkcji \fIsysopen()\fR. Jest to inny + spos?b chronienia nazw plik?w przed interpretacj?. Np: + .Sp + .Vb 7 +@@ -2638,7 +2638,7 @@ + \s-1TRUE\s0. \s-1UCHWYTPLIKU\s0 mo?e by? nazw? zmiennej skalarnej, w kt?rym + wypadku zmienna ta przechowuje nazw? lub referencj? do uchwytu pliku, + wprowadzaj?c tak poziom niebezpo?rednio?ci. +-(\s-1UWAGA\s0: Je?li \s-1UCHYTPLIKU\s) jest zmienn?, a nast?pny token jest ++(\s-1UWAGA\s0: Je?li \s-1UCHYTPLIKU\s0) jest zmienn?, a nast?pny token jest + [term], to mo?e to by? ?le zinterepretowane jako operator, chyba ?e wstawisz +, + lub ujmiesz argumenty w nawiasy.) Je?li \s-1UCHWYTPLIKU\s0 jest pomini?ty, + drukowanie nast?puje na standardowe wyj?cie (lub do ostatnio wybranego +@@ -2707,7 +2707,7 @@ + niealfanumerycznymi znakami. (To znaczy, ?e wszystkie znaki, nie podpadaj?ce + pod \f(CW/[A-Za-z_0-9]/\fR zostan? poprzedzone odwrotnym uko?nikiem, + niezale?nie od ustawie? locale.) +-Jest to wewn?trzna funkcja, implementuj?ca escape \sQ w ?a?cuchach z ++Jest to wewn?trzna funkcja, implementuj?ca escape Q w ?a?cuchach z + podw?jnych cudzys?ow?w. + .Sp + Je?li \s-1WYRA?\s0 jest pomini?te, u?ywane jest \f(CW$_\fR. +@@ -4229,7 +4229,7 @@ + przeciwie?stwie do zwyk?ych modu??w, kt?re importuj? symbole do bie??cego + pakietu. + .Sp +-Istnieje odpowiadaj?ca komenda \((L"no\*(R", kt?ra odimportowuje rzeczy ++Istnieje odpowiadaj?ca komenda \f(CW\*(C`no\*(C'\fR, kt?ra odimportowuje rzeczy + zaimportowane przez use, np. wywo?uje metod? + \f(CWunimport Module LISTA\fR zamiast \f(CWimport\fR. + .Sp +--- pl_PL/man1/sum.1.rofffix Wed Apr 4 15:10:02 2001 ++++ pl_PL/man1/sum.1 Wed Apr 4 15:10:12 2001 +@@ -15,7 +15,7 @@ + .B sum + oblicza 16-bitow? sum? kontroln? dla ka?dego nazwanego pliku, albo + standardowego wej?cia je?li nie podano ?adnego lub podano plik zwany +-'\-'. Wypisuje on sum? kontroln? dla ka?dego pliku, razem z liczb? ++ '\-'. Wypisuje on sum? kontroln? dla ka?dego pliku, razem z liczb? + blok?w w pliku (zaokr?glon? w g?r?). + Domy?lnie wypisywana jest tak?e ka?da odpowiednia nazwa pliku, je?li + podano co najmniej dwa argumenty. +--- pl_PL/man1/perlsyn.1.rofffix Wed Apr 4 15:10:22 2001 ++++ pl_PL/man1/perlsyn.1 Wed Apr 4 15:23:47 2001 +@@ -634,7 +634,7 @@ + \& } + .Ve + (W rzeczywisto?ci nie jest to tak dziwne jak wygl?da. Musisz sobie +-u?wiadomi?, ?e mo?esz korzysta? z \(L"operator?w\*(R" kontroli p?tli ++u?wiadomi?, ?e mo?esz korzysta? z \*(L"operator?w\*(R" kontroli p?tli + wewn?trz wyra?e?. Jest to zwyczajny operator przecinka z C.) + .PP + lub +--- pl_PL/man4/console_codes.4.rofffix Mon Aug 2 14:06:53 1999 ++++ pl_PL/man4/console_codes.4 Wed Apr 4 15:09:53 2001 +@@ -463,8 +463,7 @@ + ESC ] 0 ; txt BEL Ustaw na txt nazw? ikony i tytu? okna. + ESC ] 1 ; txt BEL Ustaw nazw? ikony na txt. + ESC ] 2 ; txt BEL Ustaw tytu? okna na txt. +-ESC ] 4 6 ; name BEL Ustaw plik logu na name (normalnie wy??czone +- przez opcj? czasu kompilacji) ++ESC ] 4 6 ; name BEL Ustaw plik logu na name (normalnie wy??czone przez opcj? czasu kompilacji) + ESC ] 5 0 ; fn BEL Ustaw font na fn. + .TE + +--- pl_PL/man5/mtools.5.rofffix Thu Jul 22 08:17:18 1999 ++++ pl_PL/man5/mtools.5 Wed Apr 4 15:09:53 2001 +@@ -387,7 +387,7 @@ + Wielo?? opis?w jest przydatna przy wykorzystywaniu urz?dze? fizycznych + potrafi?cych obs?ugiwa? tylko jedn? geometri? pojedynczego dysku. + .\" Multiple definitions are useful when using physical devices which are +-.\ "only able to support one single disk geometry. ++.\" only able to support one single disk geometry. + Przyk?ad: + .RS + .B drive a: file="/dev/fd0H1440" 1.44m +@@ -474,7 +474,7 @@ + kraju. Wi?cej szczeg???w znale?? mo?na w pomocy DOS dla "country". Parametry + \fIcodepage\fR i \fIcountry-file\fR s? opcjonalne. Plik \fRcountry-file\fR + dostarczany jest z DOSem, zwykle nazywa si? \fICOUNTRY.SYS\fR i znajduje si? +-w katalogu \fB\C:\DOS\fR. W wi?kszo?ci przypadk?w b?dzie zb?dny, gdy? ++w katalogu \fBC:\\DOS\fR. W wi?kszo?ci przypadk?w b?dzie zb?dny, gdy? + najcz??ciej wyst?puj?ce tablice translacji s? wkompilowane w mtools. Nie ma + zatem problemu, je?li w Uniksie brakuje tego pliku. + .PP +--- pl_PL/man8/pidof.8.rofffix Thu Sep 2 11:16:39 1999 ++++ pl_PL/man8/pidof.8 Wed Apr 4 15:09:53 2001 +@@ -25,7 +25,8 @@ + .IP -x + Skrypty r?wnie? - to powoduje, ?e program zwraca r?wnie? identyfikatory + proces?w pow?ok, pracuj?cych z podanymi skryptami. +-.IP -o \pomi?pid\fP ++.IP -o ++\pomi?pid\fP + M?wi programowi, by omin?? procesy ze wskazany identyfikatorem procesu. + Istnieje specjalny pid \fB%PPID\fP, kt?ry mo?e by? u?ywany do odnoszenia si? + do procesu rodzicielskiego programu \fIpidof\fP, czyli innymi s?owy do Added: tinysofa/snapshot/man-pages-pl/current/specs/man-pages-pl.spec =================================================================== --- tinysofa/snapshot/man-pages-pl/current/specs/man-pages-pl.spec 2004-07-01 15:38:34 UTC (rev 2598) +++ tinysofa/snapshot/man-pages-pl/current/specs/man-pages-pl.spec 2004-07-01 15:38:37 UTC (rev 2599) @@ -0,0 +1,103 @@ +%define releasedate 01-04-2004 +Summary: Polish man pages from the Linux Documentation Project. +Name: man-pages-pl +Version: 0.23 +Release: 1ts +License: Distributable +Group: Documentation +Source: http://ptm.linux.pl/man-PL%{releasedate}.tar.gz +Patch0: man-pages-pl-0.22-roffix.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-root +BuildArch: noarch + + +%description +Manual pages from the Linux Documentation Project, translated into +Polish. + +%prep +%setup -q -n pl_PL +#%patch0 -p1 -b .rofffix + +%build + +%install +rm -fr $RPM_BUILD_ROOT +mkdir -p $RPM_BUILD_ROOT/%{_mandir}/pl/man{1,2,3,4,5,6,7,8,9,n} +for i in FAQ man[1-8]/*.?; do + iconv -f LATIN2 -t UTF-8 < $i > $i.new + mv -f $i.new $i +done +for i in man[1-8] ; do + install -m 644 $i/*.? $RPM_BUILD_ROOT%{_mandir}/pl/$i; +done +rm -f $RPM_BUILD_ROOT/%{_mandir}/pl/man8/rpm* + +# too buggy to ship... not only errors, but also things which +# obviously don't work as the author intended +rm -f $RPM_BUILD_ROOT%{_mandir}/pl/man5/lisp-tut* + +rm -f $RPM_BUILD_ROOT%{_mandir}/pl/man1/{apropos.1,chage.1,gendiff.1,gpasswd.1,man.1,mplayer.1,sg.1,whatis.1}* +rm -f $RPM_BUILD_ROOT%{_mandir}/pl/man5/{faillog.5,shadow.5,man.config.5,qmail-*.5,dot-qmail.5}* +rm -f $RPM_BUILD_ROOT%{_mandir}/pl/man7/qmail.7* +rm -f $RPM_BUILD_ROOT%{_mandir}/pl/man8/{grpunconv.8,faillog.8,newusers.8,rpmcache.8,rpm2cpio.8,rpmdeps.8,rpm.8,rpmbuild.8,rpmgraph.8,pwconv.8,lastlog.8,stunnel.8,pwck.8,grpck.8,chpasswd.8,grpconv.8,adduser.8,pwunconv.8,groupadd.8,groupdel.8,groupmod.8,useradd.8,userdel.8,usermod.8,qmail}* + +%clean +rm -fr $RPM_BUILD_ROOT + +%files +%defattr(-,root,root) +%doc FAQ +%dir %{_mandir}/pl +%{_mandir}/pl/* + +%changelog +* Wed Apr 07 2004 Karsten Hopp +- use new tarball from ptm.linux.pl (#112253) +- disable rofffix patch + +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Tue Feb 10 2004 Akira TAGOH 0.22-14 +- removed apropos.1, man.1, whatis.1, and man.config.5, because the latest man contains those manpages. + +* Tue Feb 11 2003 Phil Knirsch 0.22-13 +- Convert all manpages to utf-8. + +* Wed Jan 22 2003 Tim Powers +- rebuilt + +* Mon Nov 25 2002 Tim Powers +- remove man pages which conflict with shadow-utils + +* Fri Jun 21 2002 Tim Powers +- automated rebuild + +* Thu May 23 2002 Tim Powers +- automated rebuild + +* Wed Jan 09 2002 Tim Powers +- automated rebuild + +* Thu Aug 2 2001 Trond Eivind Glomsr?d +- s/Copyright/License/ +- Own %%{_mandir}/pl + +* Wed Apr 4 2001 Trond Eivind Glomsr?d +- fix roff errors in various man pages (#34189) +- remove lisp-tut.5 - it's beyond repair and needs rewriting + +* Wed Jul 12 2000 Prospector +- automatic rebuild + +* Tue Jun 20 2000 Jeff Johnson +- rebuild to compress man pages. + +* Mon Jun 19 2000 Trond Eivind Glomsr?d +- don't include rpm manpage, it's included with rpm + +* Sun Jun 11 2000 Trond Eivind Glomsr?d +- fixed typo in description +* Sun Jun 11 2000 Trond Eivind Glomsr?d +- first build From svn at tinysofa.org Thu Jul 1 15:38:35 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:38:35 +1000 (EST) Subject: [tinysofa-svn] r2598 - in tinysofa/snapshot: . man-pages-ko man-pages-ko/current man-pages-ko/current/sources man-pages-ko/current/specs Message-ID: <20040701153835.18B9D4E817D@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:38:34 +1000 (Fri, 02 Jul 2004) New Revision: 2598 Added: tinysofa/snapshot/man-pages-ko/ tinysofa/snapshot/man-pages-ko/current/ tinysofa/snapshot/man-pages-ko/current/sources/ tinysofa/snapshot/man-pages-ko/current/sources/man-pages-ko-1.48.tar.gz tinysofa/snapshot/man-pages-ko/current/sources/man-pages-utf8-fixes.patch tinysofa/snapshot/man-pages-ko/current/specs/ tinysofa/snapshot/man-pages-ko/current/specs/man-pages-ko.spec Log: - Add man-pages-ko to snapshot from 2.0. Added: tinysofa/snapshot/man-pages-ko/current/sources/man-pages-ko-1.48.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/man-pages-ko/current/sources/man-pages-ko-1.48.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/man-pages-ko/current/sources/man-pages-utf8-fixes.patch =================================================================== --- tinysofa/snapshot/man-pages-ko/current/sources/man-pages-utf8-fixes.patch 2004-07-01 15:38:32 UTC (rev 2597) +++ tinysofa/snapshot/man-pages-ko/current/sources/man-pages-utf8-fixes.patch 2004-07-01 15:38:34 UTC (rev 2598) @@ -0,0 +1,789 @@ +diff -uNr man-pages-ko-1.48.orig/man2/swapon.2 man-pages-ko-1.48/man2/swapon.2 +--- man-pages-ko-1.48.orig/man2/swapon.2 2000-09-23 23:05:39.000000000 -0400 ++++ man-pages-ko-1.48/man2/swapon.2 2003-10-28 02:04:43.000000000 -0500 +@@ -1,124 +1,124 @@ +-.\" Hey Emacs! This file is -*- nroff -*- source. +-.\" +-.\" Copyright (c) 1992 Drew Eckhardt (drew at cs.colorado.edu), March 28, 1992 +-.\" +-.\" Permission is granted to make and distribute verbatim copies of this +-.\" manual provided the copyright notice and this permission notice are +-.\" preserved on all copies. +-.\" +-.\" Permission is granted to copy and distribute modified versions of this +-.\" manual under the conditions for verbatim copying, provided that the +-.\" entire resulting derived work is distributed under the terms of a +-.\" permission notice identical to this one +-.\" +-.\" Since the Linux kernel and libraries are constantly changing, this +-.\" manual page may be incorrect or out-of-date. The author(s) assume no +-.\" responsibility for errors or omissions, or for damages resulting from +-.\" the use of the information contained herein. The author(s) may not +-.\" have taken the same level of care in the production of this manual, +-.\" which is licensed free of charge, as they might when working +-.\" professionally. +-.\" +-.\" Formatted or processed versions of this manual, if unaccompanied by +-.\" the source, must acknowledge the copyright and authors of this work. +-.\" +-.\" Modified by Michael Haardt +-.\" Modified Sat Jul 24 11:47:53 1993 by Rik Faith +-.\" Modified 22 July 1995 by Michael Chastain : +-.\" Added 'swapflags' argument. +-.\" Added historical remark, aeb, 950723. +-.\" Modified Tue Oct 22 22:23:50 1996 by Eric S. Raymond +-.\" Modified 980908, aeb. +-.\ +-.\" +-.\" ?????? ???? : ASPLINUX 2000?? 7?? 29?? +-.\" " +-.TH SWAPON 2 "22 July 1995" "Linux 1.3.6" "Linux Programmer's Manual" +-.SH ???? +-swapon, swapoff \- ????/?????????? ?????? ????/?????? +-.SH ?????? +-.B #include +-.br +-.B #include /* to find PAGE_SIZE */ +-.br +-.B #include +-.sp +-.BI "int swapon(const char *" path ", int " swapflags ); +-.br +-.BI "int swapoff(const char *" path ); +-.SH ???? +-.B swapon +-?? ???? ???? +-.IR path +-?? ???????? ???? ???????????? ???? ?????? ????????. +-.B swapoff +-???????? ???? +-.IR path . +-?? ???????? ???? ???????????? ???????? ??????. +-.PP +-.B swapon +-?? +-.I swapflags +-?????????? ??????. +-???? +-.I swapflags +-?? ???? +-.I SWAP_FLAG_PREFER +-?????? ??????, ?????? ???? ?????? ?????? ???? ?? ???? ???????? ??????. +-???????? ?????? ???? ??????????: +-.br +-.sp +-.I " (prio << SWAP_FLAG_PRIO_SHIFT) & SWAP_FLAG_PRIO_MASK" +-.br +-.PP +-?????? ?????? ???? ???????? ?????? ?? ????. +-.SH "PRIORITY" +-?????? ???? ?????? ???? ???? ???????? ?????? ????. +-???????? '????'????. +-???? ?????? ???????? +-?? ?????? ???? ???????? ???? ???????? ??????. +-.PP +-.I swapflags +-???? ?????? ???? ???????? ???? ??????????. ?????? ???????? ???? ?????? ?????? ???? ???? ??????. +-???? ?????? ???? ???????? ??????. +-.PP +-???? ???????? ?????? ???????? ???????????? ????????, ???? ???? ???????? ????. +-???? ???? ???????? ?????? ???? ??????, ???? ?????? ?????? ???? ???? ???? ?????? ?????? ????????. +-???? ?????? ?????? ???? ???????? ?????? ????, ???? ???? ???????? ??????????, ???????? ???? ?????? round-robin basis?? ????????. +-.PP +-?????? 1.3.6?? ?????? ???? ?????? ?? ?????? ??????, ?????? ?????? ????. +-.SH ?????? +-?????? 0?? ????????, ?????? \-1?? ????????. +-.I errno +-?? ?????? ????????. +-.SH ???? +-Many other errors can occur if +-.I path +-?? ?????? ??????, +-???? ???? ???????? ???? ?? ????. +-.TP +-.B EPERM +-???????? ?????????? ?????? ???? +-.B MAX_SWAPFILES +-(defined to be 8 in Linux 1.3.6) ?????? ???????? ????. +-.TP +-.B EINVAL +-?? +-.I path +-?? ?????????? ???? ?????? ???? ?????????? ???? ???? ????????. +-.TP +-.B ENOENT +-?? +-.I path +-?? ???? ?? ????????. +-.TP +-.B ENOMEM +-?? ???????? ?????? ?????? ???? ?????????? ???? ?? ????????. +-.SH ???? +-?? ?????? ?????????? ??????????. ?????? ???????? ???? ?????????????? ?????????? ??????. +-?????? `swapflags' ?????????? ?????? 1.3.2???? ??????????. +-.SH ???? +-The partition or path must be prepared with +-.BR mkswap (8). +-.SH ???? ???? +-.BR mkswap "(8), " swapon "(8), " swapoff (8) ++.\" Hey Emacs! This file is -*- nroff -*- source. ++.\" ++.\" Copyright (c) 1992 Drew Eckhardt (drew at cs.colorado.edu), March 28, 1992 ++.\" ++.\" Permission is granted to make and distribute verbatim copies of this ++.\" manual provided the copyright notice and this permission notice are ++.\" preserved on all copies. ++.\" ++.\" Permission is granted to copy and distribute modified versions of this ++.\" manual under the conditions for verbatim copying, provided that the ++.\" entire resulting derived work is distributed under the terms of a ++.\" permission notice identical to this one ++.\" ++.\" Since the Linux kernel and libraries are constantly changing, this ++.\" manual page may be incorrect or out-of-date. The author(s) assume no ++.\" responsibility for errors or omissions, or for damages resulting from ++.\" the use of the information contained herein. The author(s) may not ++.\" have taken the same level of care in the production of this manual, ++.\" which is licensed free of charge, as they might when working ++.\" professionally. ++.\" ++.\" Formatted or processed versions of this manual, if unaccompanied by ++.\" the source, must acknowledge the copyright and authors of this work. ++.\" ++.\" Modified by Michael Haardt ++.\" Modified Sat Jul 24 11:47:53 1993 by Rik Faith ++.\" Modified 22 July 1995 by Michael Chastain : ++.\" Added 'swapflags' argument. ++.\" Added historical remark, aeb, 950723. ++.\" Modified Tue Oct 22 22:23:50 1996 by Eric S. Raymond ++.\" Modified 980908, aeb. ++.\ ++.\" ++.\" ?????? ???? : ASPLINUX 2000?? 7?? 29?? ++.\" " ++.TH SWAPON 2 "22 July 1995" "Linux 1.3.6" "Linux Programmer's Manual" ++.SH ???? ++swapon, swapoff \- ????/?????????? ?????? ????/?????? ++.SH ?????? ++.B #include ++.br ++.B #include /* to find PAGE_SIZE */ ++.br ++.B #include ++.sp ++.BI "int swapon(const char *" path ", int " swapflags ); ++.br ++.BI "int swapoff(const char *" path ); ++.SH ???? ++.B swapon ++?? ???? ???? ++.IR path ++?? ???????? ???? ???????????? ???? ?????? ????????. ++.B swapoff ++???????? ???? ++.IR path . ++?? ???????? ???? ???????????? ???????? ??????. ++.PP ++.B swapon ++?? ++.I swapflags ++?????????? ??????. ++???? ++.I swapflags ++?? ???? ++.I SWAP_FLAG_PREFER ++?????? ??????, ?????? ???? ?????? ?????? ???? ?? ???? ???????? ??????. ++???????? ?????? ???? ??????????: ++.br ++.sp ++.I " (prio << SWAP_FLAG_PRIO_SHIFT) & SWAP_FLAG_PRIO_MASK" ++.br ++.PP ++?????? ?????? ???? ???????? ?????? ?? ????. ++.SH "PRIORITY" ++?????? ???? ?????? ???? ???? ???????? ?????? ????. ++???????? '????'????. ++???? ?????? ???????? ++?? ?????? ???? ???????? ???? ???????? ??????. ++.PP ++.I swapflags ++???? ?????? ???? ???????? ???? ??????????. ?????? ???????? ???? ?????? ?????? ???? ???? ??????. ++???? ?????? ???? ???????? ??????. ++.PP ++???? ???????? ?????? ???????? ???????????? ????????, ???? ???? ???????? ????. ++???? ???? ???????? ?????? ???? ??????, ???? ?????? ?????? ???? ???? ???? ?????? ?????? ????????. ++???? ?????? ?????? ???? ???????? ?????? ????, ???? ???? ???????? ??????????, ???????? ???? ?????? round-robin basis?? ????????. ++.PP ++?????? 1.3.6?? ?????? ???? ?????? ?? ?????? ??????, ?????? ?????? ????. ++.SH ?????? ++?????? 0?? ????????, ?????? \-1?? ????????. ++.I errno ++?? ?????? ????????. ++.SH ???? ++Many other errors can occur if ++.I path ++?? ?????? ??????, ++???? ???? ???????? ???? ?? ????. ++.TP ++.B EPERM ++???????? ?????????? ?????? ???? ++.B MAX_SWAPFILES ++(defined to be 8 in Linux 1.3.6) ?????? ???????? ????. ++.TP ++.B EINVAL ++?? ++.I path ++?? ?????????? ???? ?????? ???? ?????????? ???? ???? ????????. ++.TP ++.B ENOENT ++?? ++.I path ++?? ???? ?? ????????. ++.TP ++.B ENOMEM ++?? ???????? ?????? ?????? ???? ?????????? ???? ?? ????????. ++.SH ???? ++?? ?????? ?????????? ??????????. ?????? ???????? ???? ?????????????? ?????????? ??????. ++???? `swapflags' ?????????? ?????? 1.3.2???? ??????????. ++.SH ???? ++The partition or path must be prepared with ++.BR mkswap (8). ++.SH ???? ???? ++.BR mkswap "(8), " swapon "(8), " swapoff (8) +diff -uNr man-pages-ko-1.48.orig/man2/sysinfo.2 man-pages-ko-1.48/man2/sysinfo.2 +--- man-pages-ko-1.48.orig/man2/sysinfo.2 2000-06-11 02:42:16.000000000 -0400 ++++ man-pages-ko-1.48/man2/sysinfo.2 2003-10-28 02:07:32.000000000 -0500 +@@ -9,7 +9,7 @@ + .\" + .\" Modified Sat Jul 24 12:35:12 1993 by Rik Faith + .\" Modified Tue Oct 22 22:29:51 1996 by Eric S. Raymond +-.\" Modified Mon Aug 25 16:06:11 1997 by Nicol?s Lichtmaier ++.\" Modified Mon Aug 25 16:06:11 1997 by Nicolas Lichtmaier + .\" + .TH SYSINFO 2 "1997?? 8?? 25??" "Linux 2.0" "?????? ?????????? ??????" + .SH ???? +diff -uNr man-pages-ko-1.48.orig/man2/umask.2 man-pages-ko-1.48/man2/umask.2 +--- man-pages-ko-1.48.orig/man2/umask.2 2000-05-14 05:48:41.000000000 -0400 ++++ man-pages-ko-1.48/man2/umask.2 2003-10-28 02:09:43.000000000 -0500 +@@ -25,7 +25,7 @@ + .\" Modified by Michael Haardt + .\" Modified Sat Jul 24 12:51:53 1993 by Rik Faith + .\" Modified Tue Oct 22 22:39:04 1996 by Eric S. Raymond +-.\" Modified Thu May 1 06:05:54 UTC 1997 by Nicol?s Lichtmaier ++.\" Modified Thu May 1 06:05:54 UTC 1997 by Nicolas Lichtmaier + .\" with Lars Wirzenius suggestion + .TH UMASK 2 "1998?? 8?? 9??" "??????" "?????? ?????????? ??????" + .SH ???? +diff -uNr man-pages-ko-1.48.orig/man3/fflush.3 man-pages-ko-1.48/man3/fflush.3 +--- man-pages-ko-1.48.orig/man3/fflush.3 2001-06-05 17:53:19.000000000 -0400 ++++ man-pages-ko-1.48/man3/fflush.3 2003-10-28 02:10:57.000000000 -0500 +@@ -37,7 +37,7 @@ + .\" + .\" Converted for Linux, Mon Nov 29 15:22:01 1993, faith at cs.unc.edu + .\" +-.\" Modified 2000-07-22 by Nicol?s Lichtmaier ++.\" Modified 2000-07-22 by Nicolas Lichtmaier + .\" + .TH FFLUSH 3 "1993?? 11?? 29??" "BSD MANPAGE" "?????? ?????????? ??????" + .SH ???? +diff -uNr man-pages-ko-1.48.orig/man3/strtok.3 man-pages-ko-1.48/man3/strtok.3 +--- man-pages-ko-1.48.orig/man3/strtok.3 2001-03-21 07:40:13.000000000 -0500 ++++ man-pages-ko-1.48/man3/strtok.3 2003-10-28 02:10:35.000000000 -0500 +@@ -21,7 +21,7 @@ + .\" the source, must acknowledge the copyright and authors of this work. + .\" + .\" Rewritten old page, 960210, aeb at cwi.nl +-.\" Updated, added strtok_r. 2000-02-13 Nicol?s Lichtmaier ++.\" Updated, added strtok_r. 2000-02-13 Nicolas Lichtmaier + .TH STRTOK 3 "2000?? 2?? 13??" "GNU" "?????? ?????????? ??????" + .SH ???? + strtok, strtok_r \- ?????????? ???????? ????????. +diff -uNr man-pages-ko-1.48.orig/man3/toupper.3 man-pages-ko-1.48/man3/toupper.3 +--- man-pages-ko-1.48.orig/man3/toupper.3 2001-03-21 07:40:13.000000000 -0500 ++++ man-pages-ko-1.48/man3/toupper.3 2003-10-28 02:10:07.000000000 -0500 +@@ -21,7 +21,7 @@ + .\" the source, must acknowledge the copyright and authors of this work. + .\" License. + .\" Modified Sat Jul 24 17:45:39 1993 by Rik Faith (faith at cs.unc.edu) +-.\" Modified 2000-02-13 by Nicol?s Lichtmaier ++.\" Modified 2000-02-13 by Nicolas Lichtmaier + .TH TOUPPER 3 "1993?? 4?? 4??" "GNU" "?????? ?????????? ??????" + .SH ???? + toupper, tolower \- ?????? ???????? ???????? ??????. +diff -uNr man-pages-ko-1.48.orig/man5/ftpaccess.5 man-pages-ko-1.48/man5/ftpaccess.5 +--- man-pages-ko-1.48.orig/man5/ftpaccess.5 2000-08-28 05:42:27.000000000 -0400 ++++ man-pages-ko-1.48/man5/ftpaccess.5 2003-10-28 02:13:52.000000000 -0500 +@@ -784,7 +784,7 @@ + + FTP ?????? ?????? upload?? ???????? ???? ?????? ???? ???? ??????????????. + ?????? ?????? ???? ???????? ???? ?????? ???????? ????; ?????? ?????? ???????? +-???????? ???? ?? ?????? ?????? ?????? ???????? ????. ???? ?????? ???????? ++???????? ???? ?? ?????? ?????? ?????? ???????? ????. ???? ?????? ???????? + ?????? ???? ???????? ?????? ????. ?? ?????? ???? ???????? ?????? ????????. + (incmail?? ????????) + +@@ -847,7 +847,7 @@ + ?? ?????? ????????. + .nf + none password check?? ???? ??????. +- trivial password?? '@'?? ?????? ???c???? ???????? check????. ++ trivial password?? '@'?? ?????? ?????? ???????? check????. + rfc822 password?? rfc822?? ?????? ?????? ???? ???????? ????????. + warn user???? ?????? ????, login?? ????????. + enforce user???? ?????? ???? login?? ???????? ??????. +@@ -965,7 +965,7 @@ + + ?? ???? remote client???? /e/ftp/sw ?????? file?? ???? ??????, + entry line?? ?????? ???? byte per second?? ?????????? ????(???????? +-0.5)?????? ???? ????????. ?????? remote client?? ?????? ?????? ???? ++0.5)?????? ???? ????????. ?????? remote client?? ????? ?????? ???? + ????, ?????? 512byte/s?? ?????? ???? ?????? ?????????? 254byte/s, + 4???? ?????????? 128byte/s ?????? ?????? ????????. + +diff -uNr man-pages-ko-1.48.orig/man5/nsswitch.conf.5 man-pages-ko-1.48/man5/nsswitch.conf.5 +--- man-pages-ko-1.48.orig/man5/nsswitch.conf.5 2000-09-23 23:05:51.000000000 -0400 ++++ man-pages-ko-1.48/man5/nsswitch.conf.5 2003-10-28 02:12:03.000000000 -0500 +@@ -1,205 +1,205 @@ +-.\" Copyright (c) 1998, 1999 Thorsten Kukuk (kukuk at vt.uni-paderborn.de) +-.\" +-.\" This is free documentation; you can redistribute it and/or +-.\" modify it 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. +-.\" +-.\" The GNU General Public License's references to "object code" +-.\" and "executables" are to be interpreted as the output of any +-.\" document formatting or typesetting system, including +-.\" intermediate and printed output. +-.\" +-.\" This manual is distributed in the hope that it will be useful, +-.\" but WITHOUT ANY WARRANTY; without even the implied warranty of +-.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-.\" GNU General Public License for more details. +-.\" +-.\" You should have received a copy of the GNU General Public +-.\" License along with this manual; if not, write to the Free +-.\" Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, +-.\" USA. +-.\" +-.\" This manual page based on the GNU C Library info pages. +-.\" +-.\" ?????? ???? : ASPLINUX 2000?? 7?? 29?? +-.\" +-.TH NSSWITCH.CONF 5 "1999?? 1?? 17??" "??????" "?????? ?????????? ??????" +-.SH ???? +-nsswitch.conf \- ?????? ?????????????? ?????????? ??????????????. +-.SH ???? +-C???????????? ?????? ???????? ???????????? ???? ???? ???? ???? ?????? ????????. +-?????????? ?????? /etc/passwd?? ???? ?????? ???????????? ??????????. ?????? ?? +-?? ???? ??????(NIS, DNS)???? ??????????, C???????????? ??????????. +-.LP +-NYS?? ???? ?????? libc5?????? GNU C ??????????2.x(libc.so.6)?? ?????? ?????? +-?????? ?????? ????. ?????? ???? ?? ?????????????????? ???????? 2?? C???????????? ???? ?????? +-???? ?????? ??????. +-.LP +-???? ?????? ?????????? NSS?? ??????: +-.TP +-.B aliases +-Mail aliases, used by +-.BR sendmail (8) +-?? ???? ???????? ???? ????????. ?????? ????????. +-.TP +-.B ethers +-?????? ????. +-.TP +-.B group +-.BR getgrent (3) +-?????? ???? ???????? ???????? ????. +-.TP +-.B hosts +-.BR gethostbyname (3) +-?? ???? ?????? ???????? ???? ???????? ?????????? ????. +-.TP +-.B netgroup +-?????? ???? ???? ???????? ?????? ???????? ????????????. +-glibc 2.1???? C ???????????? ???? NIS?? ???? ?????????? ????????. +-.TP +-.B network +-.BR getnetent (3) +-?????? ???? ???????? ?????????? ????. +-.TP +-.B passwd +-.BR getpwent (3) +-?????? ???? ???????? ?????? ????????. +-.TP +-.B protocols +-.BR getprotoent (3) +-?????? ???? ???????? ?????? ????????. +-.TP +-.B publickey +-NFS?? NIS+?? ???? ???????? Secure_RPC?? ???? ??????,?????? ??. +-.TP +-.B rpc +-.BR getrpcbyname (3) +-?? ?????? ???????????? ???????? ???????????????? ????. +-.TP +-.B services +-.BR getservent (3) +-?????? ???? ???????? ?????? ??????. +-.TP +-.B shadow +-.BR getspnam (3) +-?? ???? ???????? ?????? ????????. +-.LP +-???? ???? +-.B /etc/nsswitch.conf +-?????? ?????? ???? ??????: +-.sp 1n +-.PD 0 +-.TP 16 +-passwd: +-compat +-.TP +-group: +-compat +-.TP +-shadow: +-compat +-.sp 1n +-.TP +-hosts: +-dns [!UNAVAIL=return] files +-.TP +-networks: +-nis [NOTFOUND=return] files +-.TP +-ethers: +-nis [NOTFOUND=return] files +-.TP +-protocols: +-nis [NOTFOUND=return] files +-.TP +-rpc: +-nis [NOTFOUND=return] files +-.TP +-services: +-nis [NOTFOUND=return] files +-.PD +-.LP +-?? ???? ?????? ???? ???????? ?????? ?? ???? ???? ????????????????. +-?????? ???? ?????????????? ?????? ???????? ????????. +-.LP +-???? ?????????????? ?????? ?????? ???? ?????? ???? ?? ????: +-.PD 0 +-.TP +-* ?????? ???????? '????','db','nis'????. +-.TP +-* ???? ????, ?????? '[NOTFOUND=return]'?? ????. +-.PD +-.LP +-?????????? ?????? ???????? ???????????????? ?? ?????? ?????? ?????????? ????. +-???? ???????? ?? ???????? ?????? ???????? ???????? ????????. ???? ?????? ???? +-????. +-.LP +-`[' ( `!'? STATUS `=' ACTION )+ `]' +-.LP +-where +-.sp 1n +-.PD 0 +-.TP +-STATUS => success | notfound | unavail | tryagain +-.TP +-ACTION => return | continue +-.PD +-.LP +-???????? ?????? ??????????. ???????? ???????????? ?????? ???????????? ?????? ???? +-????. ???????? ?????? ????????: +-.TP +-.B success +-?????? ?????? ?????? ?????? entry?? ????????. +-.TP +-.B notfound +-?????????????? ?????? ??????????, ?????? ???? ???? ??????. +-.TP +-.B unavail +-???????? ?????? ?????? ?? ????. ?????? ?????? ?????? ???????? ?????? ???? DNS?????? ?????? ???? +-???? ?????? ?????? ???????? ?????? ?????? ?????? ?? ????. +-.TP +-.B tryagain +-???????? ?????????? ?????? ?? ????. ?????? ?????? ?????????? ?????? ???? ???????? ?????? ?????? +-?? ?? ???????? ????????. +-.LP +-.SS Interaction with +/- syntax (compat mode) +-NYS???? ?????? libc5?? ?????????? ???????? ???? ?? ??????, ???? ?????????? ???????? ????????. +-.SH ???? +-???????? SERVICE?? +-.IR /lib +-???? ???????? ???? ???????? ???????????? +-.BI libnss_SERVICE.so. X +-?? ???? ????????. +-.TP 25 +-.PD 0 +-.B /etc/nsswitch.conf +-???? ???? +-.TP +-.BI /lib/libnss_compat.so. X +-glibc2?? ???? 'compat'???? ????. +-.TP +-.BI /lib/libnss_db.so. X +-glibc2?? ???? 'db'???? ????. +-.TP +-.BI /lib/libnss_dns.so. X +-glibc2?? ???? 'dns'???? ????. +-.TP +-.BI /lib/libnss_files.so. X +-glibc2?? ???? 'files'???? ????. +-.TP +-.BI /lib/libnss_hesoid.so. X +-glibc2?? ???? 'hesoid'???? ????. +-.TP +-.BI /lib/libnss_nis.so. X +-glibc2?? ???? 'nis'???? ????. +-.TP +-.B /lib/libnss_nisplus.so.2 +-glibc2.1?? ???? 'nisplus'???? ????. +-.SH ???? +-.BR nsswitch.conf , +-???????? ?? ?????????? ?????? ?????? ?????? ??????; ?????? ???? ????????, ?????????? +-???? ?????? ???? ?????? ??????. +-.LP +-????????????, NSS???????? ???????? ?????????? ?????? ??????????. ???????????? ?????? ?????? ????. +- ++.\" Copyright (c) 1998, 1999 Thorsten Kukuk (kukuk at vt.uni-paderborn.de) ++.\" ++.\" This is free documentation; you can redistribute it and/or ++.\" modify it 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. ++.\" ++.\" The GNU General Public License's references to "object code" ++.\" and "executables" are to be interpreted as the output of any ++.\" document formatting or typesetting system, including ++.\" intermediate and printed output. ++.\" ++.\" This manual is distributed in the hope that it will be useful, ++.\" but WITHOUT ANY WARRANTY; without even the implied warranty of ++.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++.\" GNU General Public License for more details. ++.\" ++.\" You should have received a copy of the GNU General Public ++.\" License along with this manual; if not, write to the Free ++.\" Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, ++.\" USA. ++.\" ++.\" This manual page based on the GNU C Library info pages. ++.\" ++.\" ?????? ???? : ASPLINUX 2000?? 7?? 29?? ++.\" ++.TH NSSWITCH.CONF 5 "1999?? 1?? 17??" "??????" "?????? ?????????? ??????" ++.SH ???? ++nsswitch.conf \- ?????? ?????????????? ?????????? ??????????????. ++.SH ???? ++C???????????? ?????? ???????? ???????????? ???? ???? ???? ???? ?????? ????????. ++?????????? ?????? /etc/passwd?? ???? ?????? ???????????? ??????????. ?????? ?? ++?? ???? ??????(NIS, DNS)???? ??????????, C???????????? ??????????. ++.LP ++NYS?? ???? ?????? libc5?????? GNU C ??????????2.x(libc.so.6)?? ?????? ?????? ++?????? ?????? ????. ?????? ???? ?? ?????????????????? ???????? 2?? C???????????? ???? ?????? ++???? ?????? ??????. ++.LP ++???? ?????? ?????????? NSS?? ??????: ++.TP ++.B aliases ++Mail aliases, used by ++.BR sendmail (8) ++?? ???? ???????? ???? ????????. ?????? ????????. ++.TP ++.B ethers ++?????? ????. ++.TP ++.B group ++.BR getgrent (3) ++?????? ???? ???????? ???????? ????. ++.TP ++.B hosts ++.BR gethostbyname (3) ++?? ???? ?????? ???????? ???? ???????? ?????????? ????. ++.TP ++.B netgroup ++?????? ???? ???? ???????? ???????? ????????????. ++glibc 2.1???? C ???????????? ???? NIS?? ???? ?????????? ????????. ++.TP ++.B network ++.BR getnetent (3) ++?????? ???? ???????? ?????????? ????. ++.TP ++.B passwd ++.BR getpwent (3) ++?????? ???? ???????? ?????? ????????. ++.TP ++.B protocols ++.BR getprotoent (3) ++?????? ???? ???????? ?????? ????????. ++.TP ++.B publickey ++NFS?? NIS+?? ???? ???????? Secure_RPC?? ???? ??????,?????? ??. ++.TP ++.B rpc ++.BR getrpcbyname (3) ++?? ?????? ???????????? ???????? ???????????????? ????. ++.TP ++.B services ++.BR getservent (3) ++?????? ???? ???????? ?????? ??????. ++.TP ++.B shadow ++.BR getspnam (3) ++?? ???? ???????? ?????? ????????. ++.LP ++???? ???? ++.B /etc/nsswitch.conf ++?????? ?????? ???? ??????: ++.sp 1n ++.PD 0 ++.TP 16 ++passwd: ++compat ++.TP ++group: ++compat ++.TP ++shadow: ++compat ++.sp 1n ++.TP ++hosts: ++dns [!UNAVAIL=return] files ++.TP ++networks: ++nis [NOTFOUND=return] files ++.TP ++ethers: ++nis [NOTFOUND=return] files ++.TP ++protocols: ++nis [NOTFOUND=return] files ++.TP ++rpc: ++nis [NOTFOUND=return] files ++.TP ++services: ++nis [NOTFOUND=return] files ++.PD ++.LP ++?? ???? ?????? ???? ???????? ?????? ?? ???? ???? ????????????????. ++?????? ???? ?????????????? ?????? ???????? ????????. ++.LP ++???? ?????????????? ?????? ?????? ???? ?????? ???? ?? ????: ++.PD 0 ++.TP ++* ?????? ???????? '????','db','nis'????. ++.TP ++* ???? ????, ?????? '[NOTFOUND=return]'?? ????. ++.PD ++.LP ++?????????? ?????? ???????? ???????????????? ?? ?????? ?????? ?????????? ????. ++???? ???????? ?? ???????? ?????? ???????? ???????? ????????. ???? ?????? ???? ++????. ++.LP ++`[' ( `!'? STATUS `=' ACTION )+ `]' ++.LP ++where ++.sp 1n ++.PD 0 ++.TP ++STATUS => success | notfound | unavail | tryagain ++.TP ++ACTION => return | continue ++.PD ++.LP ++???????? ?????? ??????????. ???????? ???????????? ?????? ???????????? ?????? ???? ++????. ???????? ?????? ????????: ++.TP ++.B success ++?????? ?????? ?????? ?????? entry?? ????????. ++.TP ++.B notfound ++?????????????? ?????? ??????????, ?????? ???? ???? ??????. ++.TP ++.B unavail ++???????? ?????? ?????? ?? ????. ?????? ?????? ?????? ???????? ?????? ???? DNS?????? ?????? ???? ++???? ?????? ?????? ???????? ?????? ?????? ?????? ?? ????. ++.TP ++.B tryagain ++???????? ?????????? ?????? ?? ????. ?????? ?????? ?????????? ?????? ???? ???????? ?????? ?????? ++?? ?? ???????? ????????. ++.LP ++.SS Interaction with +/- syntax (compat mode) ++NYS???? ?????? libc5?? ?????????? ???????? ???? ?? ??????, ???? ?????????? ???????? ????????. ++.SH ???? ++???????? SERVICE?? ++.IR /lib ++???? ???????? ???? ???????? ???????????? ++.BI libnss_SERVICE.so. X ++?? ???? ????????. ++.TP 25 ++.PD 0 ++.B /etc/nsswitch.conf ++???? ???? ++.TP ++.BI /lib/libnss_compat.so. X ++glibc2?? ???? 'compat'???? ????. ++.TP ++.BI /lib/libnss_db.so. X ++glibc2?? ???? 'db'???? ????. ++.TP ++.BI /lib/libnss_dns.so. X ++glibc2?? ???? 'dns'???? ????. ++.TP ++.BI /lib/libnss_files.so. X ++glibc2?? ???? 'files'???? ????. ++.TP ++.BI /lib/libnss_hesoid.so. X ++glibc2?? ???? 'hesoid'???? ????. ++.TP ++.BI /lib/libnss_nis.so. X ++glibc2?? ???? 'nis'???? ????. ++.TP ++.B /lib/libnss_nisplus.so.2 ++glibc2.1?? ???? 'nisplus'???? ????. ++.SH ???? ++.BR nsswitch.conf , ++???????? ?? ?????????? ?????? ?????? ?????? ??????; ?????? ???? ????????, ?????????? ++???? ?????? ???? ?????? ??????. ++.LP ++????????????, NSS???????? ???????? ?????????? ?????? ??????????. ???????????? ?????? ?????? ????. ++ +diff -uNr man-pages-ko-1.48.orig/man8/hdparm.8 man-pages-ko-1.48/man8/hdparm.8 +--- man-pages-ko-1.48.orig/man8/hdparm.8 2000-08-28 05:42:38.000000000 -0400 ++++ man-pages-ko-1.48/man8/hdparm.8 2003-10-28 02:17:52.000000000 -0500 +@@ -108,8 +108,7 @@ + .I -c + (E)IDE ?????? 32-bit ??????(I/O) ?????? ?????? ???????? ????????. ?? + ???????? ?????? 32-bit ??????(I/O)?? ???????? ????????: +-32-bit ??????(I/O)?? ??????? +-.I 0 ++32-bit ??????(I/O)?? ??????.I 0 + ,32-bit ??????(I/O)?? ?????? + .I 1 + ,?????????? ???? ???????? ???????? ?????? ???? ????(sync sequence)?? +@@ -154,8 +153,7 @@ + CD-ROM?? ?????? ??????????. ?????? CD-ROM?? ?????????? ?????? ?????? + ?????? ?????????? ?????? ?????? ????????. ?????? ???? ?????? ?????? + ???????? ????????, ?????? ?????? ?????? ?????? ????????. ???? ?????? +-2???? 4 ??????.? +-.TP ++2???? 4 ??????.?.TP + .I -f + ?????? ?????? ???? ????(buffer cache)?? ?????? ?????? ????????. ?? + ?????? ???? +@@ -445,8 +443,7 @@ + -B -m sectcount + ?? + -B -u 1 +-?????? ?????? ?????? ???? ???????? ???? ???? ????????????. ??????????? +-read-only ???? ?????????? ?????????? ??????. ???????? ?????????? ?? ++?????? ?????? ?????? ???? ???????? ???? ???? ????????????. ???????????read-only ???? ?????????? ?????????? ??????. ???????? ?????????? ?? + ???? ???? ?? ??????????, ?????? ????????/???????? ?????? 100% ???????? + ???? ????????. ???????????? ???????? ?? ????????. ?????? ???? ???? + ???? ???? ????????????! Added: tinysofa/snapshot/man-pages-ko/current/specs/man-pages-ko.spec =================================================================== --- tinysofa/snapshot/man-pages-ko/current/specs/man-pages-ko.spec 2004-07-01 15:38:32 UTC (rev 2597) +++ tinysofa/snapshot/man-pages-ko/current/specs/man-pages-ko.spec 2004-07-01 15:38:34 UTC (rev 2598) @@ -0,0 +1,136 @@ +%define LANG ko +%define UTF8 1 + +Summary: Korean(Hangul) Man(manual) Pages from the Korean Manpage Project. +Name: man-pages-%{LANG} +Version: 1.48 +Release: 12ts +License: GPL +Epoch: 1 +Group: Documentation +#Vendor: Korean Manpage Project Team. +URL: http://man.kldp.org/ +Requires: man, gzip +Source0: man-pages-%{LANG}-%{version}.tar.gz +Patch0: man-pages-utf8-fixes.patch +Buildroot: %{_tmppath}/%{name}-%{version}-root +Autoreqprov: false +BuildArchitectures: noarch + +%description +Korean translation of the official manpages from LDP and +another useful manpages from various packages. It's done +by the Korean Manpage Project which +is maintained by Korean Manpage Project Team. + +%prep +rm -rf ${RPM_BUILD_ROOT} + +%setup -c %{name}-%{version} +find . -name CVS -exec rm -rf {} \; + +%if %{UTF8} +%patch0 -p 1 + + rm -rf ./man7/iso_8859-1.7 ./man7/iso_8859-7.7 + for i in `find . -type f -name \*.gz`; do + gunzip $i + #gunzip $i | iconv -c -f EUC-KR -t UTF-8 | gzip > $i + done + for i in 1 2 3 4 5 6 7 8 9; do + for j in `find . -type f -name \*.$i`; do + iconv -c -f EUC-KR -t UTF-8 $j -o $j.out + cp -a $j.out $j + rm $j.out + done + done + +%endif + +%install +rm -rf $RPM_BUILD_ROOT + +mkdir -p $RPM_BUILD_ROOT%{_mandir}/ko +cp -a man? $RPM_BUILD_ROOT%{_mandir}/ko/ + +rm -f $RPM_BUILD_ROOT%{_mandir}/ko/man1/man.1* +rm -f $RPM_BUILD_ROOT%{_mandir}/ko/man5/man.config.5* + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(0644, root, root, 0755) +%{_mandir}/ko + +%changelog +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Tue Feb 10 2004 Akira TAGOH 1.48-11 +- removed man.1 and man.config.5, because the latest man contains those manpages. + +* Tue Oct 28 2003 Leon Ho +- convert to utf-8 on build time +- modify logic in install + +* Sun May 04 2003 Florian La Roche +- do not include a Vendor: tag + +* Thu Feb 20 2003 David Joo +- bug #83614 fixed + +* Mon Jan 27 2003 Jeremy Katz 1:1.48-7 +- add an epoch to fix upgrades from 8.0 + +* Wed Jan 22 2003 Tim Powers +- rebuilt + +* Fri Jan 10 2003 David Joo +- Spelling mistakes fixed in specfile +- bug #81420 fixed + +* Fri Dec 20 2002 David Joo +- Updated to New version +- sgid bug fixed <#79965> + +* Tue Nov 19 2002 Tim Powers +- rebuild in current collection instance + +* Mon Aug 12 2002 Bill Nottingham +- fix group + +* Fri Jun 21 2002 Tim Powers +- automated rebuild + +* Thu May 23 2002 Tim Powers +- automated rebuild + +* Fri Feb 1 2002 Bill Nottingham +- remove %post/%preun; they cause errors +- s/%%{prefix}/%%{_mandir}/g + +* Thu Jan 31 2002 David Joo +- Rebuilt against RHL 8.0 + +* Sun Jun 3 2001 Bae, Sunghoon +- removed ftpcount, ftpwho, ftpshut, proftpd man pages + because proftpd has it +- changed man cache directory to /var/cache/man + +* Tue May 23 2000 KIM KyungHeon +- changed name of spec file +- added some contents of spec (for relocatable) +- modified korean description +- fixed using 'makewhatis' command +- fixed expression in %files tag + +* Sun Apr 23 2000 Bae, Sunghoon +- modify .spec + +* Sat Apr 22 2000 Chongkyoon, Rim +- modify .spec + +* Tue Apr 4 2000 Bae, Sunghoon +- First Release + From svn at tinysofa.org Thu Jul 1 15:38:33 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:38:33 +1000 (EST) Subject: [tinysofa-svn] r2597 - in tinysofa/snapshot: . man-pages-ja man-pages-ja/current man-pages-ja/current/sources man-pages-ja/current/specs Message-ID: <20040701153833.371724E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:38:32 +1000 (Fri, 02 Jul 2004) New Revision: 2597 Added: tinysofa/snapshot/man-pages-ja/ tinysofa/snapshot/man-pages-ja/current/ tinysofa/snapshot/man-pages-ja/current/sources/ tinysofa/snapshot/man-pages-ja/current/sources/man-pages-ja-20010515-rh.patch tinysofa/snapshot/man-pages-ja/current/sources/man-pages-ja-20011115-fixpipe.patch tinysofa/snapshot/man-pages-ja/current/sources/man-pages-ja-20030415-utf8.patch tinysofa/snapshot/man-pages-ja/current/sources/man-pages-ja-20040515.tar.gz tinysofa/snapshot/man-pages-ja/current/sources/rh-man-pages-ja.pl tinysofa/snapshot/man-pages-ja/current/specs/ tinysofa/snapshot/man-pages-ja/current/specs/man-pages-ja.spec Log: - Add man-pages-ja to snapshot from 2.0. Added: tinysofa/snapshot/man-pages-ja/current/sources/man-pages-ja-20010515-rh.patch =================================================================== --- tinysofa/snapshot/man-pages-ja/current/sources/man-pages-ja-20010515-rh.patch 2004-07-01 15:38:29 UTC (rev 2596) +++ tinysofa/snapshot/man-pages-ja/current/sources/man-pages-ja-20010515-rh.patch 2004-07-01 15:38:32 UTC (rev 2597) @@ -0,0 +1,22 @@ +--- man-pages-ja-20010515/script/configure.perl.jp Fri Aug 18 20:26:08 2000 ++++ man-pages-ja-20010515/script/configure.perl Sat Jun 2 21:06:31 2001 +@@ -191,10 +191,8 @@ + print ISS "#!/bin/sh\n"; + + print ISS "mkdir -p $MANROOT;"; +-print ISS "chown $OWNER.$GROUP $MANROOT\n"; + for $i (1..9){ + print ISS "mkdir -p $MANROOT/man$i;"; +- print ISS "chown $OWNER.$GROUP $MANROOT/man$i\n"; + } + print ISS "\n"; + +@@ -205,7 +203,7 @@ + my $mandst = "$MANROOT/man$sec"; + + print ISS "echo -n install $pkg: $name.$sec .. \n"; +- print ISS "install -o $OWNER -g $GROUP -m 644 $mansrc $mandst\n"; ++ print ISS "install -m 644 $mansrc $mandst\n"; + + if ($PACK ne "none"){ + print ISS "echo -n $PACK .. \n"; Added: tinysofa/snapshot/man-pages-ja/current/sources/man-pages-ja-20011115-fixpipe.patch =================================================================== --- tinysofa/snapshot/man-pages-ja/current/sources/man-pages-ja-20011115-fixpipe.patch 2004-07-01 15:38:29 UTC (rev 2596) +++ tinysofa/snapshot/man-pages-ja/current/sources/man-pages-ja-20011115-fixpipe.patch 2004-07-01 15:38:32 UTC (rev 2597) @@ -0,0 +1,114 @@ +diff -ruN man-pages-ja-20011115.orig/script/configure.perl man-pages-ja-20011115/script/configure.perl +--- man-pages-ja-20011115.orig/script/configure.perl 2002-06-07 01:51:46.000000000 +0900 ++++ man-pages-ja-20011115/script/configure.perl 2002-06-07 01:52:02.000000000 +0900 +@@ -1,4 +1,5 @@ + #!/usr/bin/perl ++use IO::Handle; + use Env qw (PATH LANG); + use strict 'vars'; + +@@ -11,6 +12,13 @@ + my $PKGLIST = "script/pkgs.list"; + my @pack_method = ("none", "gzip", "bzip2", "compress"); + my $podsec = "1"; ++my @stdin; ++my $pipeflag = 0; ++ ++if ( -p STDIN ) { ++ $pipeflag = 1; ++ @stdin = STDIN->getlines; ++} + + # + # ???????????????? +@@ -21,7 +29,7 @@ + do{ + $MANROOT = "/usr/man/$LANG"; + print " Install directory [$MANROOT] ?: "; +- $ans = ; chomp $ans; ++ $ans = &get_from_stdin; chomp $ans; + if ($ans ne "") {$MANROOT = $ans;} + + print " compress manual with..\n"; +@@ -29,19 +37,19 @@ + print " $i: $pack_method[$i]\n"; + } + print " select [0..$#pack_method] : "; +- $ans = ; chomp $ans; ++ $ans = &get_from_stdin; chomp $ans; + if ($ans eq "") {$ans = 0;} + if ($ans < 0 || $ans > $#pack_method) {$PACK = $pack_method[0]} + else {$PACK = $pack_method[$ans]} + + $OWNER = "root"; + print " uname of page owner [$OWNER] ?: "; +- $ans = ; chomp $ans; ++ $ans = &get_from_stdin; chomp $ans; + if ($ans ne "") {$OWNER = $ans;} + + $GROUP = "root"; + print " group of page owner [$GROUP] ?: "; +- $ans = ; chomp $ans; ++ $ans = &get_from_stdin; chomp $ans; + if ($ans ne "") {$GROUP = $ans;} + + print "\n"; +@@ -51,7 +59,7 @@ + print "\n"; + do { + print "All OK? (Yes, [C]ontinue / No, [R]eselect) : "; +- $ans = ; chomp $ans; ++ $ans = &get_from_stdin; chomp $ans; + } until ($ans =~ /^[yYnNcCrR]/); + + } until ($ans =~ /^[yYcC]/); +@@ -90,14 +98,14 @@ + for $i (0 .. $#pl){ + my $qstr = ($main::pw{$pl[$i]} > -1) ? "[Y/n]" : "[y/N]"; + printf " [%2d/%2d] %-15s %s ?: ", $i, $#pl, $pl[$i], $qstr; +- $ans = ; chomp $ans; ++ $ans = &get_from_stdin; chomp $ans; + if ($ans =~ /[Yy].*/) { $main::pw{$pl[$i]} = $i;} + if ($ans =~ /[Nn].*/) { $main::pw{$pl[$i]} = -1;} + } + + do { + print "All OK? (Yes, [C]ontinue / No, [R]eselect) : "; +- $ans = ; chomp $ans; ++ $ans = &get_from_stdin; chomp $ans; + } until ($ans =~ /[yYnNcCrR].*/); + + } until ($ans =~ /^[yYcC]/); +@@ -161,7 +169,7 @@ + } + print " Which to install? (0..$cf) : "; + +- $ans = ; chomp $ans; ++ $ans = &get_from_stdin; chomp $ans; + if ($ans eq "") {$ans = 0}; + if ($ans < 0 || $ans > $cf) { $ans = 0 }; + +@@ -176,7 +184,7 @@ + + do { + print "All OK? (Yes, [C]ontinue / No, [R]eselect) : "; +- $ans = ; chomp $ans; ++ $ans = &get_from_stdin; chomp $ans; + } until ($ans =~ /^[yYnNcCrR]/); + + } until ($ans =~ /^[yYcC]/); +@@ -229,3 +237,14 @@ + ($af[2] <=> $bf[2]) || ($af[1] cmp $bf[1]); + } + ++sub get_from_stdin { ++ my $retval; ++ ++ if ( $pipeflag ) { ++ $retval = shift (@stdin); ++ } else { ++ $retval = scalar (); ++ } ++ return $retval; ++} ++ Added: tinysofa/snapshot/man-pages-ja/current/sources/man-pages-ja-20030415-utf8.patch =================================================================== --- tinysofa/snapshot/man-pages-ja/current/sources/man-pages-ja-20030415-utf8.patch 2004-07-01 15:38:29 UTC (rev 2596) +++ tinysofa/snapshot/man-pages-ja/current/sources/man-pages-ja-20030415-utf8.patch 2004-07-01 15:38:32 UTC (rev 2597) @@ -0,0 +1,13 @@ +diff -ruN man-pages-ja-20030415.orig/script/configure.perl man-pages-ja-20030415/script/configure.perl +--- man-pages-ja-20030415.orig/script/configure.perl 2003-05-06 18:11:07.000000000 +0900 ++++ man-pages-ja-20030415/script/configure.perl 2003-05-06 18:23:42.000000000 +0900 +@@ -213,6 +213,9 @@ + print ISS "echo -n install $pkg: $name.$sec .. \n"; + print ISS "install -m 644 $mansrc $mandst\n"; + ++ print ISS "echo -n converting to UTF-8 .. \n"; ++ print ISS "iconv -f euc-jp -t utf-8 $mandst/$name.$sec > $mandst/$name.$sec.tmp && mv $mandst/$name.$sec.tmp $mandst/$name.$sec\n"; ++ + if ($PACK ne "none"){ + print ISS "echo -n $PACK .. \n"; + print ISS "$PACK -f $mandst/$name.$sec\n"; Added: tinysofa/snapshot/man-pages-ja/current/sources/man-pages-ja-20040515.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/man-pages-ja/current/sources/man-pages-ja-20040515.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/man-pages-ja/current/sources/rh-man-pages-ja.pl =================================================================== --- tinysofa/snapshot/man-pages-ja/current/sources/rh-man-pages-ja.pl 2004-07-01 15:38:29 UTC (rev 2596) +++ tinysofa/snapshot/man-pages-ja/current/sources/rh-man-pages-ja.pl 2004-07-01 15:38:32 UTC (rev 2597) @@ -0,0 +1,26 @@ +#!/bin/perl +# +# install script for man-pages-ja-0.5-20011115 +# +# Will never work on other man pages!! +# +# By Yukihiro Nakai + +print "$ARGV[0]/usr/share/man/ja\n"; +print "1\n"; +print "root\n"; +print "root\n"; +print "C\n"; + +### +# Maintainer should update these number according to the original Makefile +### +for($i=0; $i<=101; $i++) { + print "\n"; +} +print "C\n"; + +for($i=0; $i<=47; $i++) { + print "0\n"; +} +print "C\n"; Added: tinysofa/snapshot/man-pages-ja/current/specs/man-pages-ja.spec =================================================================== --- tinysofa/snapshot/man-pages-ja/current/specs/man-pages-ja.spec 2004-07-01 15:38:29 UTC (rev 2596) +++ tinysofa/snapshot/man-pages-ja/current/specs/man-pages-ja.spec 2004-07-01 15:38:32 UTC (rev 2597) @@ -0,0 +1,200 @@ +%define manver 20040515 +%define use_utf8 1 + +Summary: Japanese man (manual) pages from the Japanese Manual Project +Name: man-pages-ja +Version: %{manver} +Release: 1ts +License: Distributable +Group: Documentation +BuildRoot: %{_tmppath}/%{name}-%{version}-root +BuildArch: noarch +URL: http://www.linux.or.jp/JM/ + +Source: http://www.linux.or.jp/JM/%{name}-%{manver}.tar.gz +Source1: rh-man-pages-ja.pl +Patch: %{name}-20010515-rh.patch +Patch1: %{name}-20011115-fixpipe.patch +Patch2: %{name}-20030415-utf8.patch + +%description +Japanese Manual pages, translated by JM-Project (Japanese Manual Project). + +%prep +%setup -q -n %{name}-%{manver} +%patch -p1 -b .jp +%patch1 -p1 -b .pipe +%if %{use_utf8} +%patch2 -p1 -b .utf8 +%endif + +%build +perl %{SOURCE1} $RPM_BUILD_ROOT | make + +%install +[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -fr $RPM_BUILD_ROOT + +sh ./installman.sh + +rm -f $RPM_BUILD_ROOT%{_mandir}/ja/man1/{chage.1,gpasswd.1,sg.1,apropos.1,man.1,whatis.1}* +rm -f $RPM_BUILD_ROOT%{_mandir}/ja/man5/{faillog.5,shadow.5}* +rm -f $RPM_BUILD_ROOT%{_mandir}/ja/man8/{adduser.8,chpasswd.8,faillog.8,groupadd.8,groupdel.8,groupmod.8,grpck.8,grpconv.8,grpunconv.8,lastlog.8,newusers.8,pwck.8,pwconv.8,pwunconv.8,useradd.8,userdel.8,usermod.8,rpm2cpio.8}* +rm -f $RPM_BUILD_ROOT%{_mandir}/ja/man8/{rpmgraph,rpmcache,rpmbuild,rpm}.8* + +# fix su(1) man page. +if [ -f $RPM_BUILD_DIR/%{name}-%{version}/manual/GNU_sh-utils/man1/su.1 ]; then + rm -f $RPM_BUILD_ROOT%{_mandir}/ja/man1/su.1* +%if %{use_utf8} + iconv -f euc-jp -t utf-8 $RPM_BUILD_DIR/%{name}-%{version}/manual/GNU_sh-utils/man1/su.1 > $RPM_BUILD_ROOT%{_mandir}/ja/man1/su.1 +%else + cp -a $RPM_BUILD_DIR/%{name}-%{version}/manual/GNU_sh-utils/man1/su.1 $RPM_BUILD_ROOT%{_mandir}/ja/man1/ +%endif +fi +# fix kill(1) man page. +if [ -f $RPM_BUILD_DIR/%{name}-%{version}/manual/util-linux/man1/kill.1 ]; then + rm -f $RPM_BUILD_ROOT%{_mandir}/ja/man1/kill.1* +%if %{use_utf8} + iconv -f euc-jp -t utf-8 $RPM_BUILD_DIR/%{name}-%{version}/manual/util-linux/man1/kill.1 > $RPM_BUILD_ROOT%{_mandir}/ja/man1/kill.1 +%else + cp -a $RPM_BUILD_DIR/%{name}-%{version}/manual/util-linux/man1/kill.1 $RPM_BUILD_ROOT%{_mandir}/ja/man1/ +%endif +fi + +# accumulate translation_lists +mkdir $RPM_BUILD_DIR/%{name}-%{version}/translation_lists +(cd $RPM_BUILD_DIR/%{name}-%{version}/manual +for i in `find -type f -name translation_list`; do + package=`basename \`dirname $i\``; + name=`basename $i`; + cp -a $i $RPM_BUILD_DIR/%{name}-%{version}/translation_lists/$package.$name; +done +) + +%clean +[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -fr $RPM_BUILD_ROOT + +%files +%defattr(-,root,root) +%doc README translation_lists +%{_mandir}/ja/* + + +%changelog +* Wed May 19 2004 Akira TAGOH 20040515-1 +- updates to 20040515. +- fixed wrong manpage for kill(1). we prefers util-linux thing rather than procps. + +* Fri Apr 16 2004 Akira TAGOH 20040415-1 +- updates to 20040415. + +* Tue Mar 16 2004 Akira TAGOH 20040315-1 +- updates to 20040315. + +* Mon Feb 16 2004 Akira TAGOH 20040215-1 +- updates to 20040215. + +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Tue Feb 10 2004 Akira TAGOH 20040115-2 +- removed apropos.1, man.1, and whatis.1. the latest man contains those manpages now. + +* Mon Jan 19 2004 Akira TAGOH 20040115-1 +- updates to 20040115. + +* Thu Dec 18 2003 Akira TAGOH 20031215-1 +- updates to 20031215. + +* Tue Oct 21 2003 Akira TAGOH 20031015-1 +- updates to 20031015. + +* Mon Sep 01 2003 Akira TAGOH 20030815-1 +- updates to 20030815. + +* Mon Jul 28 2003 Akira TAGOH 20030715-1 +- updates to 20030715. + +* Mon Jun 30 2003 Elliot Lee 20030615-2 +- Remove rpm.8 to avoid conflict + +* Wed Jun 18 2003 Akira TAGOH 20030615-1 +- updates to 20030615. + +* Tue Jun 10 2003 Elliot Lee 20030525-3 +- Remove rpm{cache,graph,build}.8 to avoid conflict. + +* Wed May 28 2003 Akira TAGOH 20030525-2 +- remove rpm2cpio.8 to avoid the conflict. + +* Mon May 26 2003 Akira TAGOH 20030525-1 +- updates to 20030525. + +* Wed May 14 2003 Akira TAGOH 20030415-3 +- include README and translation_list files. (#90543) +- use sh-utils's su.1 instead of shadow's one (#90552) +- fix summary and description. (#90548) + +* Tue May 06 2003 Akira TAGOH 20030415-2 +- convert to UTF-8. + +* Tue Apr 15 2003 Akira TAGOH 20030415-1 +- updates to 20030415 + +* Mon Mar 17 2003 Akira TAGOH 20030315-1 +- updates to 20030315 +- bumped Version to release date of man-pages-ja archive. + +* Thu Jan 23 2003 Tim Powers 0.6-20030115.1 +- rebuild + +* Thu Jan 16 2003 Akira TAGOH 0.5-20030115.1 +- updates to 20030115 + +* Tue Dec 24 2002 Akira TAGOH 0.5-12.20021215 +- updates to 20021215 + +* Mon Nov 25 2002 Tim Powers +- remove conflicting man pages that are now included in shadow-utils + +* Fri Nov 22 2002 Akira TAGOH 0.5-11 +- updates to 20021115 + +* Wed Nov 13 2002 Akira TAGOH 0.5-10 +- updates to 20021015 + +* Sun Aug 18 2002 Akira TAGOH 0.5-9 +- updates to 20020816 + +* Mon Aug 05 2002 Akira TAGOH 0.5-8 +- updates to 20020715 + +* Fri Jun 21 2002 Tim Powers +- automated rebuild + +* Fri Jun 07 2002 Akira TAGOH 0.5-6 +- man-pages-ja-20011115-fixpipe.patch: applied to fix pipe issue. +- s/Copyright/License/ + +* Thu May 23 2002 Tim Powers +- automated rebuild + +* Wed Feb 27 2002 Akira TAGOH 0.5-4 +- Build against new environment. + +* Wed Jan 09 2002 Tim Powers +- automated rebuild + +* Thu Dec 6 2001 Yukihiro Nakai +- Update to 20011115 ver. + +* Sat Jun 2 2001 Yukihiro Nakai +- Update to 0.5 + +* Wed Jul 12 2000 Prospector +- automatic rebuild + +* Tue Jun 20 2000 Jeff Johnson +- rebuild to compress man pages. + +* Sun Jun 11 2000 Trond Eivind Glomsr?d +- first build From svn at tinysofa.org Thu Jul 1 15:38:44 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:38:44 +1000 (EST) Subject: [tinysofa-svn] r2602 - in tinysofa/snapshot: . mingetty mingetty/current mingetty/current/sources mingetty/current/specs Message-ID: <20040701153844.9C0744E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:38:42 +1000 (Fri, 02 Jul 2004) New Revision: 2602 Added: tinysofa/snapshot/mingetty/ tinysofa/snapshot/mingetty/current/ tinysofa/snapshot/mingetty/current/sources/ tinysofa/snapshot/mingetty/current/sources/mingetty-1.00-opt.patch tinysofa/snapshot/mingetty/current/sources/mingetty-1.07.tar.gz tinysofa/snapshot/mingetty/current/specs/ tinysofa/snapshot/mingetty/current/specs/mingetty.spec Log: - Add mingetty to snapshot from 2.0. Added: tinysofa/snapshot/mingetty/current/sources/mingetty-1.00-opt.patch =================================================================== --- tinysofa/snapshot/mingetty/current/sources/mingetty-1.00-opt.patch 2004-07-01 15:38:41 UTC (rev 2601) +++ tinysofa/snapshot/mingetty/current/sources/mingetty-1.00-opt.patch 2004-07-01 15:38:42 UTC (rev 2602) @@ -0,0 +1,10 @@ +--- mingetty-1.00/Makefile.rpm Mon Mar 4 15:27:11 2002 ++++ mingetty-1.00/Makefile Mon Mar 4 15:27:34 2002 +@@ -1,6 +1,6 @@ + DESTDIR= + CC=gcc +-CFLAGS=-O2 -Wall -W -pipe -D_GNU_SOURCE ++CFLAGS=$(RPM_OPTS) -Wall -D_GNU_SOURCE + MANDIR=/usr/share/man/man8 + SBINDIR=/sbin + Added: tinysofa/snapshot/mingetty/current/sources/mingetty-1.07.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/mingetty/current/sources/mingetty-1.07.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/mingetty/current/specs/mingetty.spec =================================================================== --- tinysofa/snapshot/mingetty/current/specs/mingetty.spec 2004-07-01 15:38:41 UTC (rev 2601) +++ tinysofa/snapshot/mingetty/current/specs/mingetty.spec 2004-07-01 15:38:42 UTC (rev 2602) @@ -0,0 +1,120 @@ +Summary: A compact getty program for virtual consoles only. +Name: mingetty +Version: 1.07 +Copyright: GPL +Release: 2ts +Group: System Environment/Base +Source: mingetty-%{version}.tar.gz +Patch: mingetty-1.00-opt.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-root + +%description +The mingetty program is a lightweight, minimalist getty program for +use only on virtual consoles. Mingetty is not suitable for serial +lines (you should use the mgetty program in that case). + +%prep +%setup -q +%patch -p1 + +%build +make "RPM_OPTS=$RPM_OPT_FLAGS" + +%install +rm -rf $RPM_BUILD_ROOT +mkdir -p $RPM_BUILD_ROOT/{sbin,%{_mandir}/man8} + +install -m 0755 mingetty $RPM_BUILD_ROOT/sbin/ +install -m 0644 mingetty.8 $RPM_BUILD_ROOT/%{_mandir}/man8/ + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(-,root,root) +%doc COPYING +/sbin/mingetty +%{_mandir}/man8/mingetty.* + +%changelog +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Sat Jan 03 2004 Florian La Roche +- 1.07 + +* Wed Jun 04 2003 Elliot Lee +- rebuilt + +* Sat May 24 2003 Florian La Roche +- update to 1.06 + +* Sat Apr 12 2003 Florian La Roche +- update to 1.05 + +* Sun Mar 30 2003 Florian La Roche +- update to 1.04 + +* Sat Feb 08 2003 Florian La Roche +- small source cleanups + +* Wed Jan 22 2003 Tim Powers +- rebuilt + +* Tue Nov 19 2002 Tim Powers +- rebuild on all arches + +* Fri Jun 21 2002 Tim Powers +- automated rebuild + +* Thu May 23 2002 Tim Powers +- automated rebuild + +* Mon Mar 04 2002 Florian La Roche +- re-release as 1.00 + +* Thu Jul 05 2001 Florian La Roche +- rebuild + +* Wed Apr 11 2001 Bill Nottingham +- rebuild (missing ia64 packages) + +* Fri Apr 06 2001 Florian La Roche +- fix man-page bug #34991 +- fix syslog() call to be more secure #17349 + +* Thu Jan 11 2001 Florian La Roche +- set TERM=dumb for s390 console + +* Mon Nov 13 2000 Oliver Paukstadt +- fgetc returns int not char + +* Wed Jul 12 2000 Prospector +- automatic rebuild + +* Sun Jun 18 2000 Matt Wilson +- use %%{_mandir} for man pages + +* Thu Feb 3 2000 Bill Nottingham +- handle compressed man pages + +* Sun Mar 21 1999 Cristian Gafton +- auto rebuild in the new build environment (release 10) + +* Wed Jan 06 1999 Cristian Gafton +- build for glibc 2.1 + +* Sun Aug 16 1998 Jeff Johnson +- build root + +* Fri May 01 1998 Prospector System +- translations modified for de, fr, tr + +* Thu Apr 30 1998 Cristian Gafton +- fixed build problems on intel and alpha for manhattan + +* Tue Oct 21 1997 Donnie Barnes +- spec file cleanups + +* Mon Jun 02 1997 Erik Troan +~- built against glibc From svn at tinysofa.org Thu Jul 1 15:38:45 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:38:45 +1000 (EST) Subject: [tinysofa-svn] r2603 - in tinysofa/snapshot: . mod_mono mod_mono/current mod_mono/current/sources mod_mono/current/specs Message-ID: <20040701153845.DAF1C4E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:38:45 +1000 (Fri, 02 Jul 2004) New Revision: 2603 Added: tinysofa/snapshot/mod_mono/ tinysofa/snapshot/mod_mono/current/ tinysofa/snapshot/mod_mono/current/sources/ tinysofa/snapshot/mod_mono/current/sources/mod_mono-1.0.tar.gz tinysofa/snapshot/mod_mono/current/sources/mono.conf tinysofa/snapshot/mod_mono/current/sources/xsp-1.0.tar.gz tinysofa/snapshot/mod_mono/current/sources/xsp-tinysofa.tar.bz2 tinysofa/snapshot/mod_mono/current/specs/ tinysofa/snapshot/mod_mono/current/specs/mod_mono.spec Log: - Add mod_mono to snapshot from 2.0. Added: tinysofa/snapshot/mod_mono/current/sources/mod_mono-1.0.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/mod_mono/current/sources/mod_mono-1.0.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/mod_mono/current/sources/mono.conf =================================================================== --- tinysofa/snapshot/mod_mono/current/sources/mono.conf 2004-07-01 15:38:42 UTC (rev 2602) +++ tinysofa/snapshot/mod_mono/current/sources/mono.conf 2004-07-01 15:38:45 UTC (rev 2603) @@ -0,0 +1,10 @@ +# Mono Configuration for Apache + +LoadModule mono_module modules/libmod_mono.so +Alias /asp "/srv/www/html/asp" +MonoApplications "/asp:." +MonoDocumentRootDir /srv/www/html/asp +MonoPath /srv/www/html/asp + + SetHandler mono + Property changes on: tinysofa/snapshot/mod_mono/current/sources/mono.conf ___________________________________________________________________ Name: svn:executable + * Added: tinysofa/snapshot/mod_mono/current/sources/xsp-1.0.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/mod_mono/current/sources/xsp-1.0.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/mod_mono/current/sources/xsp-tinysofa.tar.bz2 =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/mod_mono/current/sources/xsp-tinysofa.tar.bz2 ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/mod_mono/current/specs/mod_mono.spec =================================================================== --- tinysofa/snapshot/mod_mono/current/specs/mod_mono.spec 2004-07-01 15:38:42 UTC (rev 2602) +++ tinysofa/snapshot/mod_mono/current/specs/mod_mono.spec 2004-07-01 15:38:45 UTC (rev 2603) @@ -0,0 +1,98 @@ +%define pkg_version 1.0 +%define xsp_version 1.0 +%define module_path /usr/lib/httpd/modules +%define contentdir /srv/www + +Summary: Mono module for Apache 2 +Name: mod_mono +Version: 1.0 +Release: 1ts +License: The Apache License +Group: System Environment/Daemons +Source0: http://www.apacheworld.org/modmono/%{name}-%{pkg_version}.tar.gz +Source1: xsp-%{xsp_version}.tar.gz +Source2: mono.conf +Source3: xsp-tinysofa.tar.bz2 +BuildRoot: %{_tmppath}/%{name}-%{version}-root +BuildRequires: httpd-devel +BuildRequires: mono +BuildRequires: autoconf +Requires: httpd + +%description +This module allows you to run ASP.NET pages on Unix with Apache and Mono. + +%prep +%setup -n %{name}-%{pkg_version} -a 1 + +pushd xsp-%{xsp_version} +pushd test +tar jxvf %{SOURCE3} +popd + +popd + +%build +# Build sample ASP.NET pages from xsp distribution +pushd xsp-%{xsp_version} +libtoolize --force +aclocal --force +automake -a -c -f +autoconf -f +./configure --prefix=/usr --sysconfdir=/etc --mandir=/usr/share/man --infodir=/usr/share/info --localstatedir=/var +make +##make DESTDIR=%{buildroot} install +popd + +# Build Apache Module +libtoolize --force +aclocal --force +automake -a -c -f +autoconf -f +%configure +make + +# Build Mono DLL +pushd src +make -f makedll.mak +popd + +%install +rm -rf %{buildroot} + +mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/httpd/conf.d +mkdir -p $RPM_BUILD_ROOT/%{module_path} +mkdir -p $RPM_BUILD_ROOT%{contentdir}/html/asp +mkdir -p $RPM_BUILD_ROOT%{contentdir}/.wapi + +cp %{SOURCE2} $RPM_BUILD_ROOT/%{_sysconfdir}/httpd/conf.d +install src/.libs/libmod_mono.so $RPM_BUILD_ROOT/%{module_path} +install src/ModMono.dll $RPM_BUILD_ROOT/%{_libdir} +cp -r xsp-%{xsp_version}/test/* $RPM_BUILD_ROOT%{contentdir}/html/asp + +%clean +rm -rf ${RPM_BUILD_ROOT} + +%files +%defattr(-,root,root) +%doc ChangeLog COPYING INSTALL NEWS README +%attr(644,root,root) %config(noreplace) %{_sysconfdir}/httpd/conf.d/mono.conf +%{_libdir}/ModMono.dll +%{_libdir}/httpd/modules/libmod_mono.so +%defattr(-,apache,apache) +%{contentdir}/html/asp/ +%{contentdir}/.wapi/ + +%changelog +* Mon Feb 03 2003 Daniel Lopez Ridruejo +- Use --with-apxs +- License is Apache-style +- Change ownership to apache user +- Create .wapi directory + +* Mon Feb 03 2003 David Hollis +- 0.3.4 + +* Wed Jan 15 2003 David Hollis +- Initial spec + From svn at tinysofa.org Thu Jul 1 15:38:41 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:38:41 +1000 (EST) Subject: [tinysofa-svn] r2601 - in tinysofa/snapshot: . memtest86+ memtest86+/current memtest86+/current/sources memtest86+/current/specs Message-ID: <20040701153841.C7B144E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:38:41 +1000 (Fri, 02 Jul 2004) New Revision: 2601 Added: tinysofa/snapshot/memtest86+/ tinysofa/snapshot/memtest86+/current/ tinysofa/snapshot/memtest86+/current/sources/ tinysofa/snapshot/memtest86+/current/sources/memtest-setup tinysofa/snapshot/memtest86+/current/sources/memtest86+-1.20.tar.gz tinysofa/snapshot/memtest86+/current/sources/new-memtest-pkg tinysofa/snapshot/memtest86+/current/specs/ tinysofa/snapshot/memtest86+/current/specs/memtest86+.spec Log: - Add memtest86+ to snapshot from 2.0. Added: tinysofa/snapshot/memtest86+/current/sources/memtest-setup =================================================================== --- tinysofa/snapshot/memtest86+/current/sources/memtest-setup 2004-07-01 15:38:39 UTC (rev 2600) +++ tinysofa/snapshot/memtest86+/current/sources/memtest-setup 2004-07-01 15:38:41 UTC (rev 2601) @@ -0,0 +1,25 @@ +#!/bin/bash + +MTVERSION=`rpm -q --qf '%{version}' memtest86+` +MTPATH="/boot/memtest86+-$MTVERSION" + +/sbin/grubby --info=$MTPATH > /dev/null 2> /dev/null +if [ "$?" = 0 ]; then + echo "$MTPATH is already configured. Exiting..." + exit 0 +fi + +if [ ! -f $MTPATH ]; then + echo "ERROR: $MTPATH does not exist." + exit 255 +fi + +/sbin/new-memtest-pkg --install $MTVERSION --banner="Memtest86+" +RETVAL="$?" + +if [ "$RETVAL" != "0" ]; then + echo "ERROR: grubby failed to configure your bootloader for $MTPATH." + exit $RETVAL +fi + +echo "Setup complete." Property changes on: tinysofa/snapshot/memtest86+/current/sources/memtest-setup ___________________________________________________________________ Name: svn:executable + * Added: tinysofa/snapshot/memtest86+/current/sources/memtest86+-1.20.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/memtest86+/current/sources/memtest86+-1.20.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/memtest86+/current/sources/new-memtest-pkg =================================================================== --- tinysofa/snapshot/memtest86+/current/sources/new-memtest-pkg 2004-07-01 15:38:39 UTC (rev 2600) +++ tinysofa/snapshot/memtest86+/current/sources/new-memtest-pkg 2004-07-01 15:38:41 UTC (rev 2601) @@ -0,0 +1,339 @@ +#!/bin/bash +# +# Invoked upon installation or removal of a kernel package, the following +# tasks are/can be done here: +# creation/removal of initrd +# run of depmod/removal of depmod generated files +# addition/removal of kernel images from grub/lilo configuration (via grubby) +# +# Copyright (C) 2002, 2003 Red Hat, Inc. +# + +PATH=/sbin:/bin:$PATH + +lilo=/sbin/lilo + +# some defaults that are sane for most arches +kernelName=memtest86+ + +if [ -x ./grubby ]; then + grubby=./grubby +else + grubby=/sbin/grubby +fi + +cfgGrub="" +cfgLilo="" +runLilo="" +grubConfig="" + +ARCH=$(uname -m) + +if [ $ARCH = 'ia64' ]; then + liloConfig=/boot/efi/EFI/redhat/elilo.conf + bootPrefix=/boot/efi/EFI/redhat + liloFlag=elilo + isx86="" +elif [ $ARCH = 'ppc64' -o $ARCH = 'ppc' ]; then + liloConfig=/etc/yaboot.conf + bootPrefix=/boot + lilo=/sbin/ybin + kernelName=vmlinux + liloFlag=yaboot + runLilo="yes" + isx86="" +elif [ $ARCH = 'sparc' -o $ARCH = 'sparc64' ]; then + liloConfig=/etc/silo.conf + bootPrefix=/boot + liloFlag=silo + lilo=/sbin/silo + isx86="" +elif [ $ARCH = 's390' -o $ARCH = 's390x' ]; then + liloConfig=/etc/zipl.conf + bootPrefix=/boot + liloFlag=zipl + lilo=/sbin/zipl + runLilo="yes" + isx86="" +else + # this leaves i?86 and x86_64 + liloConfig=/etc/lilo.conf + grubConfig=/boot/grub/grub.conf + bootPrefix=/boot + liloFlag=lilo + isx86="yes" +fi + +mode="" +version="" +initrd="" +initrdfile="" +moddep="" +verbose="" + +usage() { + echo "Usage: `basename $0` [-v] [--mkinitrd] [--rminitrd]" >&2 + echo " [--initrdfile=] [--depmod] [--rmmoddep]" >&2 + echo " [--kernel-args=] [--banner=]" >&2 + echo " <--install | --remove> " >&2 + echo " (ex: `basename $0` --mkinitrd --depmod --install 2.4.7-2)" >&2 + exit 1 +} + +install() { + # XXX kernel should be able to be specified also (or work right on ia64) + if [ ! -f $bootPrefix/$kernelName-$version ] ; then + [ -n "$verbose" ] && echo "kernel for $version does not exist, not running grubby" + return + fi + + INITRD="" + if [ -f $initrdfile ]; then + [ -n "$verbose" ] && echo "found $initrdfile and using it with grubby" + INITRD="--initrd $initrdfile" + fi + + # FIXME: is this a good heuristic to find out if we're on iSeries? + if [ -d /proc/iSeries ]; then + [ -n "$verbose" ] && echo "On an iSeries, just making img file" + if [ -z $initrdfile ]; then + [ -n "$verbose" ] && echo "No initrd, just adding system map" + /sbin/addSystemMap $bootPrefix/System.map-$version $bootPrefix/$kernelName-$version $bootPrefix/vmlinitrd-$version + else + /sbin/addSystemMap $bootPrefix/System.map-$version $bootPrefix/$kernelName-$version $bootPrefix/vmlinux.sm-$version + /sbin/addRamDisk $initrdfile $bootPrefix/System.map-$version $bootPrefix/vmlinux.sm-$version $bootPrefix/vmlinitrd-$version 2>/dev/null + rm $bootPrefix/vmlinux.sm-$version + fi + return + fi + + # get the root filesystem to use; if it's on a label make sure it's + # been configured. if not, get the root device from mount + rootdevice=$(awk '{ if ($1 !~ /^[ \t]*#/ && $2 == "/") { print $1; }}' /etc/fstab) + short=$(echo $rootdevice | cut -d= -f1) + if [ "$short" == "LABEL" ]; then + label=$(echo $rootdevice | cut -d= -f2 |head -n 1) + device=$(echo "showlabels" | /sbin/nash --force --quiet | + awk '$2 == "'$label'" {print $1}') + if [ -z "$device" ]; then + rootdevice=$(mount | awk '$3 == "/" { print $1 }') + fi + fi + + if [ -n "$cfgGrub" ]; then + [ -n "$verbose" ] && echo "adding $version to $grubConfig" + + if [ -n "$banner" ]; then + title="$banner ($version)" + elif [ -f /etc/redhat-release ]; then + title="$(sed 's/ release.*$//' < /etc/redhat-release) ($version)" + else + title="Red Hat Linux ($version)" + fi + /sbin/grubby --add-kernel=$bootPrefix/$kernelName-$version $INITRD \ + --copy-default --title "$title" \ + --args="root=$rootdevice $kernargs" \ + --remove-kernel="TITLE=$title" + else + [ -n "$verbose" ] && echo "$grubConfig does not exist, not running grubby" + fi + + if [ -n "$cfgLilo" ]; then + [ -n "$verbose" ] && echo "adding $version to $liloConfig" + + /sbin/grubby --add-kernel=$bootPrefix/$kernelName-$version $INITRD \ + --copy-default --title $version \ + --args="root=$rootdevice $kernargs" \ + --remove-kernel="TITLE=$version" \ + --$liloFlag + + if [ -n "$runLilo" ]; then + [ -n "$verbose" ] && echo "running $lilo" + if [ ! -x $lilo ] ; then + [ -n "$verbose" ] && echo "$lilo does not exist" + else + $lilo > /dev/null + fi + fi + else + [ -n "$verbose" ] && echo "$liloConfig does not exist, not running grubby" + fi + +} + +remove() { + # FIXME: is this a good heuristic to find out if we're on iSeries? + if [ -d /proc/iSeries ]; then + [ -n "$verbose" ] && echo "On an iSeries, remove img file" + rm -f $bootPrefix/$kernelName-$version.img 2>/dev/null + return + fi + + if [ -n "$cfgGrub" ]; then + [ -n "$verbose" ] && echo "removing $version from $grubConfig" + /sbin/grubby --remove-kernel=$bootPrefix/$kernelName-$version + else + [ -n "$verbose" ] && echo "$grubConfig does not exist, not running grubby" + fi + + if [ -n "$cfgLilo" ]; then + [ -n "$verbose" ] && echo "removing $version from $liloConfig" + /sbin/grubby --remove-kernel=$bootPrefix/$kernelName-$version \ + --$liloFlag + + if [ -n "$runLilo" ]; then + [ -n "$verbose" ] && echo "running $lilo" + if [ ! -x $lilo ] ; then + [ -n "$verbose" ] && echo "$lilo does not exist" + else + $lilo > /dev/null + fi + fi + else + [ -n "$verbose" ] && echo "$liloConfig does not exist, not running grubby" + fi +} + +mkinitrd() { + [ -n "$verbose" ] && echo "creating initrd $initrdfile using $version" + /sbin/mkinitrd -f $initrdfile $version + rc=$? + if [ $rc != 0 ]; then + echo "mkinitrd failed" >&2 + exit 1 + fi +} + +rminitrd() { + [ -n "$verbose" ] && echo "removing initrd $initrdfile" + [ -f $initrdfile ] && rm -f $initrdfile +} + +doDepmod() { + [ -n "$verbose" ] && echo "running depmod for $version" + depmod -ae -F /boot/System.map-$version $version +} + +doRmmoddep() { + [ -n "$verbose" ] && echo "removing modules.dep info for $version" + [ -d /lib/modules/$version ] && rm -f /lib/modules/$version/modules.* +} + + +while [ $# -gt 0 ]; do + case $1 in + --mkinitrd) + initrd="make" + ;; + + --rminitrd) + initrd="remove" + ;; + + --initrdfile*) + if echo $1 | grep '=' >/dev/null ; then + initrdfile=`echo $1 | sed 's/^--initrdfile=//'` + else + initrdfile=$2 + shift + fi + ;; + + --kernel-args*) + if echo $1 | grep '=' >/dev/null ; then + kernargs=`echo $1 | sed 's/^--kernel-args=//'` + else + kernargs=$2 + shift + fi + ;; + + --banner*) + if echo $1 | grep '=' >/dev/null ; then + banner=`echo $1 | sed 's/^--banner=//'` + else + banner=$2 + shift + fi + ;; + + --depmod) + moddep="make" + ;; + + --rmmoddep) + moddep="remove" + ;; + + -v) + verbose=-v + ;; + + *) + if [ -z "$mode" ]; then + mode=$1 + elif [ -z "$version" ]; then + version=$1 + else + usage + fi + ;; + esac + + shift +done + +# make sure the mode is valid +if [ "$mode" != "--install" -a "$mode" != "--remove" ] ; then + usage +fi + +if [ -z "$version" ]; then + usage +fi + +# set the initrd file based on arch; ia64 is the only currently known oddball +if [ -z "$initrdfile" ]; then + if [ `uname -m` = "ia64" ]; then + initrdfile="/boot/efi/EFI/redhat/initrd-$version.img" + else + initrdfile="/boot/initrd-$version.img" + fi + +fi +[ -n "$verbose" ] && echo "initrdfile is $initrdfile" + +if [ "$moddep" == "make" ]; then + doDepmod +elif [ "$moddep" == "remove" ]; then + doRmmoddep +fi + +if [ "$initrd" == "make" ]; then + mkinitrd +elif [ "$initrd" == "remove" ]; then + rminitrd +fi + +if [ ! -x $grubby ] ; then + [ -n "$verbose" ] && echo "$grubby does not exist" + exit 0 +fi + + +[ -n "$grubConfig" ] && [ -f "$grubConfig" ] && cfgGrub=1; +[ -n "$liloConfig" ] && [ -f "$liloConfig" ] && cfgLilo=1; + +# if we have a lilo config on an x86 box, see if the default boot loader +# is lilo to determine if it should be run +if [ -n "$cfgLilo" -a -n "$isx86" ]; then + runLilo=$($grubby --bootloader-probe | grep lilo) +fi + +if [ "$mode" == "--install" ]; then + install +elif [ "$mode" == "--remove" ]; then + remove +fi + +exit 0 Property changes on: tinysofa/snapshot/memtest86+/current/sources/new-memtest-pkg ___________________________________________________________________ Name: svn:executable + * Added: tinysofa/snapshot/memtest86+/current/specs/memtest86+.spec =================================================================== --- tinysofa/snapshot/memtest86+/current/specs/memtest86+.spec 2004-07-01 15:38:39 UTC (rev 2600) +++ tinysofa/snapshot/memtest86+/current/specs/memtest86+.spec 2004-07-01 15:38:41 UTC (rev 2601) @@ -0,0 +1,149 @@ +# Prevent stripping +%define __spec_install_post /usr/lib/rpm/brp-compress +# Turn off debuginfo package +%define debug_package %{nil} + +Summary: Stand-alone memory tester for x86 and x86-64 computers +Name: memtest86+ +Version: 1.20 +Release: 1ts +License: GPL +ExclusiveArch: i386 +Group: System Environment/Base +Source0: http://www.memtest.org/download/1.20/memtest86+-1.20.tar.gz +URL: http://www.memtest.org +Source1: new-memtest-pkg +Source2: memtest-setup +BuildRoot: %{_tmppath}/%{name}-%{version}-root +Obsoletes: memtest86 + + +%description +Memtest86+ is a thorough stand-alone memory test for x86 and x86-64 +architecture computers. BIOS based memory tests are only a quick +check and often miss many of the failures that are detected by +Memtest86+. + +Run 'memtest-setup' to add to your GRUB or lilo boot menu. + +%prep +%setup -q +#-n memtest86+_v1.20 + +%build +# Regular build flags not wanted for this binary +# Note: i486 minimum runtime arch +make + +%install +rm -rf $RPM_BUILD_ROOT +mkdir -p $RPM_BUILD_ROOT/boot +mkdir -p $RPM_BUILD_ROOT/sbin +mkdir -p $RPM_BUILD_ROOT%{_sbindir} + +install -m644 memtest.bin $RPM_BUILD_ROOT/boot/memtest86+-1.20 +install -m755 %{SOURCE1} $RPM_BUILD_ROOT/sbin/new-memtest-pkg +install -m755 %{SOURCE2} $RPM_BUILD_ROOT%{_sbindir}/memtest-setup + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(-,root,root,-) +%doc README +/boot/memtest86+-1.20 +/sbin/new-memtest-pkg +%{_sbindir}/memtest-setup + +%preun +/sbin/new-memtest-pkg --remove %{version} + +%changelog +* Mon Jun 28 2004 Warren Togami +- update to 1.20 + +* Tue Jun 15 2004 Elliot Lee +- rebuilt + +* Sun May 16 2004 Warren Togami 1.15-1 +- update to 1.15 + +* Sun Feb 29 2004 Warren Togami 1.11-2 +- switch to memtest86+ 1.11 +- add boot loader setup script + +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Tue Oct 21 2003 Mike A. Harris 3.0-3 +- Pedantic spec file cleanups - s/Copyright/License/ and use _libdir instead of + /usr/lib everywhere (even though it's currently x86 only) + +* Tue Oct 21 2003 Jeremy Katz 3.0-2 +- fix perms (#107610) +- doesn't really require dev86 to build + +* Thu Jul 21 2003 Michael Fulbright +- initial integration into distribution. Removed the scripts to install a + entry in the boot loader for memtest for the moment, and relocated to under + /usr/lib. + +* Thu Apr 17 2003 Joe Szep +- rebuilt for Doolittle final + +* Mon Feb 3 2003 Matthew Miller +- rebuild for doolittle +- patches to make build -- new gcc growing pains, I guess + +* Tue Jul 30 2002 Matthew Miller +- added grubby stuff + +* Tue Jul 30 2002 Dave Heistand +- updated source to v 3 + +* Thu Mar 7 2002 Dave Heistand +- updated source to 2.9, also changed setup -n +- to use %{version}. + +* Thu Nov 1 2001 Matthew Miller +- v 2.8a +- removed lilo-configuring scripts. need to figure out the best way to + work with grub and RH 7.2 / BU Linux 2.5 +- group -> System Environment/Base + +* Mon Aug 20 2001 Matthew Miller +- v 2.7 + +* Wed Feb 14 2001 Matthew Miller +- v 2.5 + +* Fri Oct 06 2000 Matthew Miller +- v 2.4 + +* Thu Mar 23 2000 Matthew Miller +- changed so that lilo.conf isn't written if it already exists. This is + important if you're including memtest86 in a distribution +- GPG key available from http://www.bu.edu/dsgsupport/linux/BULinux-GPG-KEY +- changed name of lilo.conf backup file to something less likely to conflict + with other backups + +* Wed Mar 01 2000 Matthew Miller +- Updated to version 2.2 +- Cosmetic changes to spec file +- updated Source: to reflect actual author's url + +* Fri Dec 25 1998 Peter Soos + +- Corrected the file attributes + +* Mon Aug 17 1998 Peter Soos + +- Moved to 1.4a + +* Mon Jun 22 1998 Peter Soos + +- Moved to 1.4 + +* Wed Dec 31 1997 Peter Soos + +- Initial version From svn at tinysofa.org Thu Jul 1 15:38:55 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:38:55 +1000 (EST) Subject: [tinysofa-svn] r2604 - in tinysofa/snapshot: . mono-core mono-core/current mono-core/current/sources mono-core/current/specs Message-ID: <20040701153855.EF3E44E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:38:55 +1000 (Fri, 02 Jul 2004) New Revision: 2604 Added: tinysofa/snapshot/mono-core/ tinysofa/snapshot/mono-core/current/ tinysofa/snapshot/mono-core/current/sources/ tinysofa/snapshot/mono-core/current/sources/mono-1.0.tar.gz tinysofa/snapshot/mono-core/current/specs/ tinysofa/snapshot/mono-core/current/specs/mono-core.spec Log: - Add mono-core to snapshot from 2.0. Added: tinysofa/snapshot/mono-core/current/sources/mono-1.0.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/mono-core/current/sources/mono-1.0.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/mono-core/current/specs/mono-core.spec =================================================================== --- tinysofa/snapshot/mono-core/current/specs/mono-core.spec 2004-07-01 15:38:45 UTC (rev 2603) +++ tinysofa/snapshot/mono-core/current/specs/mono-core.spec 2004-07-01 15:38:55 UTC (rev 2604) @@ -0,0 +1,721 @@ +Name: mono-core +Version: 1.0 +Release: 1ts +Copyright: LGPL +BuildRoot: %{_tmppath}/%{name}-%{version}-root +URL: http://www.go-mono.com +Source0: http://www.go-mono.org/archive/1.0/mono-%{version}.tar.gz +BuildRequires: bison +BuildRequires: glib2-devel +BuildRequires: pkgconfig +BuildRequires: rsync +#BuildRequires: gcj +BuildRequires: libicu-devel +Summary: The Mono CIL runtime, suitable for running .NET code +Group: Development/Tools +Requires: glib2 +Provides: mono +Obsoletes: mono +Obsoletes: mono-devel + +%description + + The Mono runtime implements a JIT engine for the ECMA CLI + virtual machine (as well as a byte code interpreter, the + class loader, the garbage collector, threading system and + metadata access libraries. + + +%files +%defattr(-, root, root) +%doc AUTHORS COPYING.LIB ChangeLog NEWS README +/usr/bin/mono +/usr/lib/libmono.so* +/usr/share/man/man1/mono.1* +/usr/bin/mint +/usr/lib/libmint.so* +/usr/share/man/man1/mint.1* +/usr/bin/mcs +/usr/lib/mono/1.0/mcs.exe +/usr/share/man/man1/mcs.1* +/usr/bin/certmgr +/usr/bin/certmgr.exe +/usr/share/man/man1/certmgr.1* +/usr/bin/chktrust.exe +/usr/bin/chktrust +/usr/share/man/man1/chktrust.1* +/usr/bin/setreg +/usr/bin/setreg.exe +/usr/share/man/man1/setreg.1* +/usr/bin/gacutil +/usr/bin/gacutil.exe +/usr/share/man/man1/gacutil.1* +/usr/bin/sn +/usr/bin/sn.exe +/usr/share/man/man1/sn.1* +/usr/bin/mono-find-provides +/usr/bin/mono-find-provides.exe +/usr/bin/mono-find-requires +/usr/bin/mono-find-requires.exe +/usr/lib/mono +/usr/lib/mono/gac/ +/usr/lib/mono/1.0/ +/usr/lib/mono/gac/cscompmgd/7.0.5000.0*/* +/usr/lib/mono/1.0/cscompmgd.dll +/usr/lib/mono/gac/I18N.West/1.0.5000.0*/* +/usr/lib/mono/1.0/I18N.West.dll +/usr/lib/mono/gac/I18N/1.0.5000.0*/* +/usr/lib/mono/1.0/I18N.dll +/usr/lib/mono/gac/Mono.CSharp.Debugger/1.0.5000.0*/* +/usr/lib/mono/1.0/Mono.CSharp.Debugger.dll +/usr/lib/mono/gac/Mono.GetOptions/1.0.5000.0*/* +/usr/lib/mono/1.0/Mono.GetOptions.dll +/usr/lib/mono/gac/Mono.Security/1.0.5000.0*/* +/usr/lib/mono/1.0/Mono.Security.dll +/usr/lib/mono/gac/System.Security/1.0.5000.0*/* +/usr/lib/mono/1.0/System.Security.dll +/usr/lib/mono/gac/System.Xml/1.0.5000.0*/* +/usr/lib/mono/1.0/System.Xml.dll +/usr/lib/mono/gac/System/1.0.5000.0*/* +/usr/lib/mono/1.0/System.dll +/usr/lib/mscorlib.dll +/etc/mono/config +/etc/mono/machine.config +/usr/share/man/man5/mono-config.5* + +%exclude /usr/bin/cilc +%exclude /usr/bin/cilc.exe +%exclude /usr/share/man/man1/cilc.1.* + +%exclude /usr/lib/libmint.a +%exclude /usr/lib/libmint.la +%exclude /usr/lib/libmono.a +%exclude /usr/lib/libmono.la + +%exclude /usr/share/libgc-mono + +%exclude /usr/bin/gmcs + +%exclude /usr/share/man/man1/monostyle.1.* +%exclude /usr/share/man/man1/oldmono.1.* + +%exclude /usr/lib/mono/gac/System.Windows.Forms/1.0.5000.0*/* +%exclude /usr/lib/mono/1.0/System.Windows.Forms.dll +%exclude /usr/lib/mono/gac/Accessibility/1.0.5000.0*/* +%exclude /usr/lib/mono/1.0/Accessibility.dll +%exclude /usr/lib/mono/gac/System.Design/1.0.5000.0*/* +%exclude /usr/lib/mono/1.0/System.Design.dll +%exclude /usr/lib/mono/gac/System.Drawing.Design/1.0.5000.0*/* +%exclude /usr/lib/mono/1.0/System.Drawing.Design.dll + + +#%package -n mono-ikvm +#Summary: Support for IKVM +#Group: Development/Tools +#Requires: mono-core = %{version}-%{release} +# +#%description -n mono-ikvm +#Support for IKVM + +#%files -n mono-ikvm +#%defattr(-, root, root) +#/usr/lib/libmono-ikvm-jni.so.0.0.0 +#/usr/lib/libmono-ikvm-jni.so.0 +#/usr/lib/libmono-ikvm-jni.so + + +%package -n mono-locale-other +Summary: Locale info for other countries +Group: Development/Tools +Requires: mono-core = %{version}-%{release} + +%description -n mono-locale-other +Locale info for other countries + +%files -n mono-locale-other +%defattr(-, root, root) +/usr/lib/mono/gac/I18N.Other/1.0.5000.0*/* +/usr/lib/mono/1.0/I18N.Other.dll + + +%package -n mono-directory +Summary: Mono package for accessing Directories +Group: Development/Tools +Requires: mono-core = %{version}-%{release} +Requires: mono-novell-directory + +%description -n mono-directory +Mono package for accessing Directories + +%files -n mono-directory +%defattr(-, root, root) +/usr/lib/mono/gac/System.DirectoryServices/1.0.5000.0*/* +/usr/lib/mono/1.0/System.DirectoryServices.dll + + +%package -n mono-winforms +Summary: Mono's Windows Forms implementation +Group: Development/Tools +Requires: mono-core = %{version}-%{release} +Requires: mono-drawing +#Requires: wine +#Requires: winelib >= 0.2 +Provides: mono-window-forms +Obsoletes: mono-window-forms + +%description -n mono-winforms +Mono's Windows Forms implementation + +%files -n mono-winforms +%defattr(-, root, root) +/usr/lib/mono/gac/System.Windows.Forms/1.0.5000.0*/* +/usr/lib/mono/1.0/System.Windows.Forms.dll +/usr/lib/mono/gac/Accessibility/1.0.5000.0*/* +/usr/lib/mono/1.0/Accessibility.dll +/usr/lib/mono/gac/System.Design/1.0.5000.0*/* +/usr/lib/mono/1.0/System.Design.dll +/usr/lib/mono/gac/System.Drawing.Design/1.0.5000.0*/* +/usr/lib/mono/1.0/System.Drawing.Design.dll + +%package -n mono-locale-cjk +Summary: Locale info for Asian countries +Group: Development/Tools +Requires: mono-core = %{version}-%{release} + +%description -n mono-locale-cjk +Locale info for Asian countries + +%files -n mono-locale-cjk +%defattr(-, root, root) +/usr/lib/mono/gac/I18N.CJK/1.0.5000.0*/* +/usr/lib/mono/1.0/I18N.CJK.dll + + +%package -n mono-locale-rare +Summary: Locale info for the other countries +Group: Development/Tools +Requires: mono-core = %{version}-%{release} + +%description -n mono-locale-rare +Locale info for the other countries + +%files -n mono-locale-rare +%defattr(-, root, root) +/usr/lib/mono/gac/I18N.Rare/1.0.5000.0*/* +/usr/lib/mono/1.0/I18N.Rare.dll + + +%package -n mono-data +Summary: Database connectivity for Mono +Group: Development/Tools +Requires: mono-core = %{version}-%{release} +Requires: mono-ms-enterprise + +%description -n mono-data +Database connectivity for Mono + +%files -n mono-data +%defattr(-, root, root) +/usr/bin/sqlsharp +/usr/bin/sqlsharp.exe +/usr/share/man/man1/sqlsharp.1* +/usr/lib/mono/gac/System.Data/1.0.5000.0*/* +/usr/lib/mono/1.0/System.Data.dll +/usr/lib/mono/gac/Mono.Data.Tds/1.0.5000.0*/* +/usr/lib/mono/1.0/Mono.Data.Tds.dll +/usr/lib/mono/gac/Mono.Data.TdsClient/1.0.5000.0*/* +/usr/lib/mono/1.0/Mono.Data.TdsClient.dll + + +%package -n mono-nunit +Summary: NUnit libraries +Group: Development/Tools +Requires: mono-core = %{version}-%{release} + +%description -n mono-nunit +NUnit libraries + +%files -n mono-nunit +%defattr(-, root, root) +/usr/lib/mono/gac/nunit.framework/2.1.91.0*/* +/usr/lib/mono/1.0/nunit.framework.dll +/usr/lib/mono/gac/nunit.util/2.1.91.0*/* +/usr/lib/mono/1.0/nunit.util.dll + + +%package -n mono-drawing +Summary: System.Drawing API for Mono +Group: Development/Tools +Requires: mono-core = %{version}-%{release} +Requires: libgdiplus >= 0.8 + +%description -n mono-drawing +System.Drawing API for Mono + +%files -n mono-drawing +%defattr(-, root, root) +/usr/lib/mono/gac/System.Drawing/1.0.5000.0*/* +/usr/lib/mono/1.0/System.Drawing.dll + + +%package -n mono-xml-relaxng +Summary: RELAX NG for Mono +Group: Development/Tools +Requires: mono-core = %{version}-%{release} + +%description -n mono-xml-relaxng +RELAX NG for Mono + +%files -n mono-xml-relaxng +%defattr(-, root, root) +/usr/lib/mono/gac/Commons.Xml.Relaxng/1.0.5000*/* +/usr/lib/mono/1.0/Commons.Xml.Relaxng.dll + + +#%package -n mono-preview +#Summary: Preview of .NET 2.0 +#Group: Development/Tools +#Requires: mono-core = %{version}-%{release} +# +#%description -n mono-preview +#Preview of .NET 2.0 +# +#%files -n mono-preview +#%defattr(-, root, root) +#/usr/lib/mono/2.0 +#/usr/lib/mono/2.0/* +#/usr/bin/gmcs +#/usr/lib/mono/gac/*/2.0.3600.0*/* +#/usr/lib/mono/gac/cscompmgd/8.0.3600.0*/* +#/usr/lib/mono/gac/ByteFX.Data/0.7.6.2*/* +#/usr/lib/mono/gac/Microsoft.VisualBasic/8.0.3600*/* +#/usr/lib/mono/gac/Microsoft.VisualC/8.0.3600*/* +#/usr/lib/mono/gac/Microsoft.Vsa/8.0.3600*/* + + +%package -n mono-ms-extras +Summary: Extra packages +Group: Development/Tools +Requires: mono-core = %{version}-%{release} + +%description -n mono-ms-extras +Extra packages + +%files -n mono-ms-extras +%defattr(-, root, root) +/usr/lib/mono/gac/System.Management/1.0.5000.0*/* +/usr/lib/mono/1.0/System.Management.dll +/usr/lib/mono/gac/System.Messaging/1.0.5000.0*/* +/usr/lib/mono/1.0/System.Messaging.dll +/usr/lib/mono/gac/System.ServiceProcess/1.0.5000.0*/* +/usr/lib/mono/1.0/System.ServiceProcess.dll +/usr/lib/mono/gac/System.Configuration.Install/1.0.5000.0*/* +/usr/lib/mono/1.0/System.Configuration.Install.dll +/usr/lib/mono/gac/Microsoft.VisualC/7.0.5000.0*/* +/usr/lib/mono/1.0/Microsoft.VisualC.dll +/usr/lib/mono/gac/Microsoft.Vsa/7.0.5000.0*/* +/usr/lib/mono/1.0/Microsoft.Vsa.dll + + +%package -n mono-data-sqlite +Summary: Database connectivity for Mono +Group: Development/Tools +Requires: mono-core = %{version}-%{release} +Requires: mono-data + +%description -n mono-data-sqlite +Database connectivity for Mono + +%files -n mono-data-sqlite +%defattr(-, root, root) +/usr/lib/mono/gac/Mono.Data.SqliteClient/1.0.5000.0*/* +/usr/lib/mono/1.0/Mono.Data.SqliteClient.dll + + +%package -n mono-data-sybase +Summary: Database connectivity for Mono +Group: Development/Tools +Requires: mono-core = %{version}-%{release} +Requires: mono-ms-enterprise +Requires: mono-data +Requires: mono-ziplib + +%description -n mono-data-sybase +Database connectivity for Mono + +%files -n mono-data-sybase +%defattr(-, root, root) +/usr/lib/mono/gac/Mono.Data.SybaseClient/1.0.5000.0*/* +/usr/lib/mono/1.0/Mono.Data.SybaseClient.dll + + +%package -n mono-posix +Summary: POSIX compatibility for Mono +Group: Development/Tools +Requires: mono-core = %{version}-%{release} + +%description -n mono-posix +POSIX compatibility for Mono + +%files -n mono-posix +%defattr(-, root, root) +/usr/lib/libMonoPosixHelper.so +/usr/lib/libMonoPosixHelper.so.* +/usr/lib/mono/gac/Mono.Posix/1.0.5000.0*/* +/usr/lib/mono/1.0/Mono.Posix.dll + +%exclude /usr/lib/libMonoPosixHelper.a +%exclude /usr/lib/libMonoPosixHelper.la + +%package -n mono-basic +Summary: Mono's VB runtime +Group: Development/Tools +Requires: mono-core = %{version}-%{release} + +%description -n mono-basic +Mono's VB runtime + +%files -n mono-basic +%defattr(-, root, root) +/usr/bin/mbas +/usr/lib/mono/1.0/mbas.exe +/usr/lib/mono/gac/Microsoft.VisualBasic/7.0.5000*/* +/usr/lib/mono/1.0/Microsoft.VisualBasic.dll + + +%package -n mono-peapi +Summary: Mono package for the PEAPI library +Group: Development/Tools +Requires: mono-core = %{version}-%{release} + +%description -n mono-peapi +Mono package for the PEAPI library + +%files -n mono-peapi +%defattr(-, root, root) +/usr/lib/mono/gac/PEAPI/1.0.5000.0*/* +/usr/lib/mono/1.0/PEAPI.dll + + +%package -n mono-locale-mideast +Summary: Locale info for the Middle East +Group: Development/Tools +Requires: mono-core = %{version}-%{release} + +%description -n mono-locale-mideast +Locale info for the Middle East + +%files -n mono-locale-mideast +%defattr(-, root, root) +/usr/lib/mono/gac/I18N.MidEast/1.0.5000.0*/* +/usr/lib/mono/1.0/I18N.MidEast.dll + + +%package -n mono-runtime-devel +Summary: Tools for mono development +Group: Development/Tools +Requires: mono-core = %{version}-%{release} +Requires: libicu-devel +Requires: glib2-devel +Provides: mono-devel + +%description -n mono-runtime-devel +Tools for mono development + +%files -n mono-runtime-devel +%defattr(-, root, root) +/usr/bin/monograph +/usr/include/mono/*/*.h +/usr/include/mono/cil/opcode.def +/usr/lib/libmono-profiler-cov.* +/usr/lib/pkgconfig/* +/usr/share/man/man1/monoburg.* +/usr/share/mono/cil/cil-opcodes.xml + +%package -n mono-web-services +Summary: Web Services related packages +Group: Development/Tools +Requires: mono-core = %{version}-%{release} +Requires: mono-ms-enterprise + +%description -n mono-web-services +Web Services related packages + +%files -n mono-web-services +%defattr(-, root, root) +/usr/lib/mono/gac/System.Web.Services/1.0.5000.0*/* +/usr/lib/mono/1.0/System.Web.Services.dll +/usr/bin/disco +/usr/bin/disco.exe +/usr/share/man/man1/disco.1* +/usr/bin/wsdl +/usr/bin/wsdl.exe +/usr/share/man/man1/wsdl.1* +/usr/bin/xsd +/usr/bin/xsd.exe +/usr/share/man/man1/xsd.1* +/etc/mono/DefaultWsdlHelpGenerator.aspx + + +%package -n mono-web-forms +Summary: Mono implementation of ASP.NET +Group: Development/Tools +Requires: mono-core = %{version}-%{release} +Requires: mono-data +Requires: mono-ms-enterprise +Requires: mono-ziplib + +%description -n mono-web-forms +Mono implementation of ASP.NET + +%files -n mono-web-forms +%defattr(-, root, root) +/usr/lib/mono/gac/System.Web/1.0.5000.0*/* +/usr/lib/mono/1.0/System.Web.dll +/usr/lib/mono/gac/Mono.Http/1.0.5000.0*/* +/usr/lib/mono/1.0/Mono.Http.dll +/etc/mono/browscap.ini + + +%package -n mono-ziplib +Summary: SharpZipLib +Group: Development/Tools +Requires: mono-core = %{version}-%{release} + +%description -n mono-ziplib +SharpZipLib + +%files -n mono-ziplib +%defattr(-, root, root) +/usr/lib/mono/gac/ICSharpCode.SharpZipLib/0.6.0.0*/* +/usr/lib/mono/1.0/ICSharpCode.SharpZipLib.dll + + +%package -n mono-data-oracle +Summary: Database connectivity for Mono +Group: Development/Tools +Requires: mono-core = %{version}-%{release} +Requires: mono-data + +%description -n mono-data-oracle +Database connectivity for Mono + +%files -n mono-data-oracle +%defattr(-, root, root) +/usr/lib/mono/gac/System.Data.OracleClient/1.0.5000.0*/* +/usr/lib/mono/1.0/System.Data.OracleClient.dll + + +%package -n mono-ms-enterprise +Summary: Package with System.EnterpriseServices.dll +Group: Development/Tools +Requires: mono-core = %{version}-%{release} + +%description -n mono-ms-enterprise +Package with System.EnterpriseServices.dll + +%files -n mono-ms-enterprise +%defattr(-, root, root) +/usr/lib/mono/gac/System.EnterpriseServices/1.0.5000.0*/* +/usr/lib/mono/1.0/System.EnterpriseServices.dll + + +%package -n mono-cairo +Summary: .NET bindings for the Cairo library +Group: Development/Tools +Requires: mono-core = %{version}-%{release} +Requires: cairo >= 0.1.22 + +%description -n mono-cairo +.NET bindings for the Cairo library + +%files -n mono-cairo +%defattr(-, root, root) +/usr/lib/mono/gac/Mono.Cairo/1.0.5000.0*/* +/usr/lib/mono/1.0/Mono.Cairo.dll + + +%package -n mono-complete-devel +Summary: This package contains all Mono packages required for development +Group: Development/Tools +Requires: mono-core-devel +Requires: mono-runtime-devel + +%description -n mono-complete-devel +This package contains all Mono packages required for development + +%files -n mono-complete-devel +%defattr(-, root, root) + + +%package -n mono-data-postgresql +Summary: Database connectivity for Mono +Group: Development/Tools +Requires: mono-core = %{version}-%{release} +Requires: mono-data + +%description -n mono-data-postgresql +Database connectivity for Mono + +%files -n mono-data-postgresql +%defattr(-, root, root) +/usr/lib/mono/gac/Npgsql/1.0.5000.0*/* +/usr/lib/mono/1.0/Npgsql.dll + + +%package -n bytefx-data-mysql +Summary: Database connectivity for Mono +Group: Development/Tools +Requires: mono-core = %{version}-%{release} +Requires: mono-ziplib + +%description -n bytefx-data-mysql +Database connectivity for Mono + +%files -n bytefx-data-mysql +%defattr(-, root, root) +/usr/lib/mono/gac/ByteFX.Data/0.7.6.1*/* +/usr/lib/mono/1.0/ByteFX.Data.dll + + +%package -n mono-remoting +Summary: Mono package for Remoting +Group: Development/Tools +Requires: mono-core = %{version}-%{release} +Requires: mono-web-forms + +%description -n mono-remoting +Mono package for Remoting + +%files -n mono-remoting +%defattr(-, root, root) +/usr/lib/mono/gac/System.Runtime.Remoting/1.0.5000.0*/* +/usr/lib/mono/1.0/System.Runtime.Remoting.dll +/usr/lib/mono/gac/System.Runtime.Serialization.Formatters.Soap/1.0.5000.0*/* +/usr/lib/mono/1.0/System.Runtime.Serialization.Formatters.Soap.dll +/usr/bin/soapsuds.exe +/usr/bin/soapsuds +/usr/share/man/man1/soapsuds.1* + + +%package -n mono-complete +Summary: This package contains all runtime Mono packages +Group: Development/Tools +Requires: mono-core +Requires: mono-locale-mideast +Requires: mono-locale-rare +Requires: mono-locale-cjk +Requires: mono-locale-other +Requires: mono-remoting +Requires: mono-novell-directory +Requires: mono-directory +Requires: mono-peapi +Requires: mono-xml-relaxng +Requires: mono-data +Requires: bytefx-data-mysql +Requires: mono-data-sybase +Requires: mono-data-sqlite +Requires: mono-data-oracle +Requires: mono-data-postgresql +Requires: mono-cairo +Requires: mono-ziplib +Requires: mono-nunit +Requires: mono-ms-enterprise +Requires: mono-ms-extras +Requires: mono-drawing +Requires: mono-web-forms +Requires: mono-posix +Requires: mono-web-services +Requires: mono-basic +Requires: mono-winforms +#Requires: mono-ikvm +#Requires: mono-preview + +%description -n mono-complete +This package contains all runtime Mono packages + +%files -n mono-complete +%defattr(-, root, root) + + +%package -n mono-novell-directory +Summary: For accessing LDAP Directories +Group: Development/Tools +Requires: mono-core = %{version}-%{release} + +%description -n mono-novell-directory +For accessing LDAP Directories + +%files -n mono-novell-directory +%defattr(-, root, root) +/usr/lib/mono/gac/Novell.Directory.Ldap/1.0.5000.0*/* +/usr/lib/mono/1.0/Novell.Directory.Ldap.dll + + +%package -n mono-core-devel +Summary: Development tools for Mono +Group: Development/Tools +Requires: mono-core = %{version}-%{release} +Requires: mono-peapi +Requires: pkgconfig + +%description -n mono-core-devel +Development tools for Mono + +%files -n mono-core-devel +%defattr(-, root, root) +/usr/bin/monodis +/usr/share/man/man1/monodis.1* +/usr/bin/ilasm +/usr/bin/ilasm.exe +/usr/share/man/man1/ilasm.1* +/usr/bin/genxs +/usr/bin/genxs.exe +/usr/share/man/man1/genxs.1* +/usr/bin/al +/usr/bin/al.exe +/usr/bin/makecert +/usr/bin/MakeCert.exe +/usr/share/man/man1/makecert.1* +/usr/bin/monop +/usr/bin/monop.exe +/usr/share/man/man1/monop.1* +/usr/bin/cert2spc +/usr/bin/cert2spc.exe +/usr/share/man/man1/cert2spc.1* +/usr/bin/signcode.exe +/usr/bin/signcode +/usr/share/man/man1/signcode.1* +/usr/bin/secutil +/usr/bin/secutil.exe +/usr/share/man/man1/secutil.1* +/usr/bin/pedump +/usr/bin/monoresgen +/usr/bin/monoresgen.exe +/usr/bin/resgen +/usr/lib/libmono-profiler-cov.so +/usr/lib/libmono-profiler-cov.so.* + +%prep +%setup -q -n mono-%{version} + +%build +libtoolize --force +aclocal --force +automake --gnu -a -c -f +autoconf -f + +./configure --prefix=/usr --sysconfdir=/etc --mandir=/usr/share/man --infodir=/usr/share/info --localstatedir=/var --with-preview=no --with-ikvm=no + +make %{_smp_mflags} + +%install +rm -rf %{buildroot} + +make DESTDIR=%{buildroot} install + +%clean +rm -rf %{buildroot} + + +%changelog From svn at tinysofa.org Thu Jul 1 15:38:57 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:38:57 +1000 (EST) Subject: [tinysofa-svn] r2605 - in tinysofa/snapshot: . mtools mtools/current mtools/current/sources mtools/current/specs Message-ID: <20040701153857.E5AC44E817D@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:38:57 +1000 (Fri, 02 Jul 2004) New Revision: 2605 Added: tinysofa/snapshot/mtools/ tinysofa/snapshot/mtools/current/ tinysofa/snapshot/mtools/current/sources/ tinysofa/snapshot/mtools/current/sources/mtools-3.9.6-config.patch tinysofa/snapshot/mtools/current/sources/mtools-3.9.6-paths.patch tinysofa/snapshot/mtools/current/sources/mtools-3.9.7-bigdisk.patch tinysofa/snapshot/mtools/current/sources/mtools-3.9.9-badc.patch tinysofa/snapshot/mtools/current/sources/mtools-3.9.9-noargs.patch tinysofa/snapshot/mtools/current/sources/mtools-3.9.9.tar.bz2 tinysofa/snapshot/mtools/current/specs/ tinysofa/snapshot/mtools/current/specs/mtools.spec Log: - Add mtools to snapshot from 2.0. Added: tinysofa/snapshot/mtools/current/sources/mtools-3.9.6-config.patch =================================================================== --- tinysofa/snapshot/mtools/current/sources/mtools-3.9.6-config.patch 2004-07-01 15:38:55 UTC (rev 2604) +++ tinysofa/snapshot/mtools/current/sources/mtools-3.9.6-config.patch 2004-07-01 15:38:57 UTC (rev 2605) @@ -0,0 +1,38 @@ +--- mtools-3.9.6/mtools.conf.fixes Sun Jan 4 04:29:32 1998 ++++ mtools-3.9.6/mtools.conf Wed Feb 9 11:41:36 2000 +@@ -1,22 +1,25 @@ + # Example mtools.conf files. Uncomment the lines which correspond to + # your architecture and comment out the "SAMPLE FILE" line below +-SAMPLE FILE + +-# # Linux floppy drives +-# drive a: file="/dev/fd0" exclusive +-# drive b: file="/dev/fd1" exclusive ++# Linux floppy drives ++drive a: file="/dev/fd0" exclusive 1.44m mformat_only ++drive b: file="/dev/fd1" exclusive 1.44m mformat_only + +-# # First SCSI hard disk partition +-# drive c: file="/dev/sda1" ++# First SCSI hard disk partition ++#drive c: file="/dev/sda1" + +-# # First IDE hard disk partition +-# drive c: file="/dev/hda1" ++# First IDE hard disk partition ++#drive c: file="/dev/hda1" + + # # dosemu floppy image + # drive m: file="/var/lib/dosemu/diskimage" + +-# # dosemu hdimage +-# drive n: file="/var/lib/dosemu/diskimage" offset=3840 ++# dosemu hdimage ++drive n: file="/var/lib/dosemu/hdimage" offset=8832 ++ ++# # HPOJ (ptal-photod) ++mtools_skip_check=1 ++drive p: file=":0" remote + + # # Atari ramdisk image + # drive o: file="/tmp/atari_rd" offset=136 Added: tinysofa/snapshot/mtools/current/sources/mtools-3.9.6-paths.patch =================================================================== --- tinysofa/snapshot/mtools/current/sources/mtools-3.9.6-paths.patch 2004-07-01 15:38:55 UTC (rev 2604) +++ tinysofa/snapshot/mtools/current/sources/mtools-3.9.6-paths.patch 2004-07-01 15:38:57 UTC (rev 2605) @@ -0,0 +1,129 @@ +--- mtools-3.9.6/mtools.5.paths Wed Feb 9 11:35:43 2000 ++++ mtools-3.9.6/mtools.5 Wed Feb 9 11:36:39 2000 +@@ -20,7 +20,7 @@ + .SS Description + .PP + This manpage describes the configuration files for mtools. They +-are called \fR\&\f(CW\(if/usr/local/etc/mtools.conf\(is\fR and \fR\&\f(CW\(if~/.mtoolsrc\(is\fR. If ++are called \fR\&\f(CW\(if/etc/mtools.conf\(is\fR and \fR\&\f(CW\(if~/.mtoolsrc\(is\fR. If + the environmental variable \fR\&\f(CWMTOOLSRC\fR is set, its contents is used + as the filename for a third configuration file. These configuration + files describe the following items: +@@ -37,7 +37,7 @@ + .iX "c Name of configuration files" + .iX "c Location of configuration files" + .PP +-\&\fR\&\f(CW\(if/usr/local/etc/mtools.conf\(is\fR is the system-wide configuration file, ++\&\fR\&\f(CW\(if/etc/mtools.conf\(is\fR is the system-wide configuration file, + and \fR\&\f(CW\(if~/.mtoolsrc\(is\fR is the user's private configuration file. + .PP + On some systems, the system-wide configuration file is called +@@ -444,7 +444,7 @@ + Mtools uses its root privileges to open the device, and to issue the + actual SCSI I/O calls. Moreover, root privileges are only used for + drives described in a system-wide configuration file such as +-\&\fR\&\f(CW\(if/usr/local/etc/mtools.conf\(is\fR, and not for those described in ++\&\fR\&\f(CW\(if/etc/mtools.conf\(is\fR, and not for those described in + \&\fR\&\f(CW\(if~/.mtoolsrc\(is\fR or \fR\&\f(CW\(if$MTOOLSRC\(is\fR. + .TP + \&\fR\&\f(CWprivileged\fR\ +@@ -453,7 +453,7 @@ + When set to 1, this instructs mtools to use its set-uid and set-gid + privileges for opening the given drive. This option is only valid for + drives described in the system-wide configuration files (such as +-\&\fR\&\f(CW\(if/usr/local/etc/mtools.conf\(is\fR, not \fR\&\f(CW\(if~/.mtoolsrc\(is\fR or ++\&\fR\&\f(CW\(if/etc/mtools.conf\(is\fR, not \fR\&\f(CW\(if~/.mtoolsrc\(is\fR or + \&\fR\&\f(CW\(if$MTOOLSRC\(is\fR). Obviously, this option is also a no op if mtools is + not installed setuid or setgid. This option is implied by 'scsi=1', but + again only for drives defined in system-wide configuration files. +@@ -743,7 +743,7 @@ + compiled-in defaults + .TP + 2.\ +-\&\fR\&\f(CW\(if/usr/local/etc/mtools.conf\(is\fR ++\&\fR\&\f(CW\(if/etc/mtools.conf\(is\fR + .TP + 3.\ + \&\fR\&\f(CW\(if/etc/mtools\(is\fR +@@ -761,10 +761,10 @@ + Options described in the later files override those described in the + earlier files. Drives defined in earlier files persist if they are not + overridden in the later files. For instance, drives A and B may be +-defined in \fR\&\f(CW\(if/usr/local/etc/mtools.conf\(is\fR and drives C and D may be ++defined in \fR\&\f(CW\(if/etc/mtools.conf\(is\fR and drives C and D may be + defined in \fR\&\f(CW\(if~/.mtoolsrc\(is\fR However, if \fR\&\f(CW\(if~/.mtoolsrc\(is\fR also + defines drive A, this new description would override the description of +-drive A in \fR\&\f(CW\(if/usr/local/etc/mtools.conf\(is\fR instead of adding to it. If ++drive A in \fR\&\f(CW\(if/etc/mtools.conf\(is\fR instead of adding to it. If + you want to add a new description to a drive already described in an + earlier file, you need to use either the \fR\&\f(CW+drive\fR or \fR\&\f(CWdrive+\fR + keyword. +--- mtools-3.9.6/mtools.texi.paths Wed Feb 9 11:38:24 2000 ++++ mtools-3.9.6/mtools.texi Wed Feb 9 11:39:03 2000 +@@ -616,7 +616,7 @@ + This sections explains the syntax of the configurations files for + mtools. The configuration files + @c MANend-skip 5 +-are called @file{/usr/local/etc/mtools.conf} and @file{~/.mtoolsrc}. If ++are called @file{/etc/mtools.conf} and @file{~/.mtoolsrc}. If + the environmental variable @code{MTOOLSRC} is set, its contents is used + as the filename for a third configuration file. These configuration + files describe the following items: +@@ -646,7 +646,7 @@ + @cindex Name of configuration files + @cindex Location of configuration files + +- at file{/usr/local/etc/mtools.conf} is the system-wide configuration file, ++ at file{/etc/mtools.conf} is the system-wide configuration file, + and @file{~/.mtoolsrc} is the user's private configuration file. + + On some systems, the system-wide configuration file is called +@@ -1043,7 +1043,7 @@ + Mtools uses its root privileges to open the device, and to issue the + actual SCSI I/O calls. Moreover, root privileges are only used for + drives described in a system-wide configuration file such as +- at file{/usr/local/etc/mtools.conf}, and not for those described in ++ at file{/etc/mtools.conf}, and not for those described in + @file{~/.mtoolsrc} or @file{$MTOOLSRC}. + + @item privileged +@@ -1052,7 +1052,7 @@ + When set to 1, this instructs mtools to use its set-uid and set-gid + privileges for opening the given drive. This option is only valid for + drives described in the system-wide configuration files (such as +- at file{/usr/local/etc/mtools.conf}, not @file{~/.mtoolsrc} or ++ at file{/etc/mtools.conf}, not @file{~/.mtoolsrc} or + @file{$MTOOLSRC}). Obviously, this option is also a no op if mtools is + not installed setuid or setgid. This option is implied by 'scsi=1', but + again only for drives defined in system-wide configuration files. +@@ -1332,7 +1332,7 @@ + @item + compiled-in defaults + @item +- at file{/usr/local/etc/mtools.conf} ++ at file{/etc/mtools.conf} + @item + @file{/etc/mtools} + This is for backwards compatibility only, and is only parsed if +@@ -1348,10 +1348,10 @@ + Options described in the later files override those described in the + earlier files. Drives defined in earlier files persist if they are not + overridden in the later files. For instance, drives A and B may be +-defined in @file{/usr/local/etc/mtools.conf} and drives C and D may be ++defined in @file{/etc/mtools.conf} and drives C and D may be + defined in @file{~/.mtoolsrc} However, if @file{~/.mtoolsrc} also + defines drive A, this new description would override the description of +-drive A in @file{/usr/local/etc/mtools.conf} instead of adding to it. If ++drive A in @file{/etc/mtools.conf} instead of adding to it. If + you want to add a new description to a drive already described in an + earlier file, you need to use either the @code{+drive} or @code{drive+} + keyword. +@@ -2614,7 +2614,7 @@ + same devices are found on a large number of hosts of this type. In that + case, could you also let me know about your new definitions, so that I + can include them into the next release. For purely local file, I +-recommend that you use the @code{/usr/local/etc/mtools.conf} and ++recommend that you use the @code{/etc/mtools.conf} and + @code{~/.mtoolsrc} configuration files. + + However, the devices files also allows to supply geometry setting Added: tinysofa/snapshot/mtools/current/sources/mtools-3.9.7-bigdisk.patch =================================================================== --- tinysofa/snapshot/mtools/current/sources/mtools-3.9.7-bigdisk.patch 2004-07-01 15:38:55 UTC (rev 2604) +++ tinysofa/snapshot/mtools/current/sources/mtools-3.9.7-bigdisk.patch 2004-07-01 15:38:57 UTC (rev 2605) @@ -0,0 +1,13 @@ +--- mtools-3.9.7/mtools.conf.big Wed May 16 19:07:57 2001 ++++ mtools-3.9.7/mtools.conf Wed May 16 19:08:12 2001 +@@ -2,8 +2,8 @@ + # your architecture and comment out the "SAMPLE FILE" line below + + # Linux floppy drives +-drive a: file="/dev/fd0" exclusive 1.44m mformat_only +-drive b: file="/dev/fd1" exclusive 1.44m mformat_only ++drive a: file="/dev/fd0" exclusive mformat_only ++drive b: file="/dev/fd1" exclusive mformat_only + + # First SCSI hard disk partition + #drive c: file="/dev/sda1" Added: tinysofa/snapshot/mtools/current/sources/mtools-3.9.9-badc.patch =================================================================== --- tinysofa/snapshot/mtools/current/sources/mtools-3.9.9-badc.patch 2004-07-01 15:38:55 UTC (rev 2604) +++ tinysofa/snapshot/mtools/current/sources/mtools-3.9.9-badc.patch 2004-07-01 15:38:57 UTC (rev 2605) @@ -0,0 +1,11 @@ +--- mtools-3.9.9/mainloop.c.badc 2004-01-08 10:00:40.329589474 +0000 ++++ mtools-3.9.9/mainloop.c 2004-01-08 10:01:18.862998275 +0000 +@@ -328,7 +328,7 @@ + return ERROR_ONE; + if(got_signal) + return ret | ERROR_ONE; +- if(doing_mcwd & !have_one) ++ if(doing_mcwd && !have_one) + return NO_CWD; + return ret; + } Added: tinysofa/snapshot/mtools/current/sources/mtools-3.9.9-noargs.patch =================================================================== --- tinysofa/snapshot/mtools/current/sources/mtools-3.9.9-noargs.patch 2004-07-01 15:38:55 UTC (rev 2604) +++ tinysofa/snapshot/mtools/current/sources/mtools-3.9.9-noargs.patch 2004-07-01 15:38:57 UTC (rev 2605) @@ -0,0 +1,15 @@ +--- mtools-3.9.9/scripts/mcomp.noargs 2003-05-22 12:22:42.000000000 +0100 ++++ mtools-3.9.9/scripts/mcomp 2003-05-22 13:09:05.000000000 +0100 +@@ -1,5 +1,12 @@ + #!/bin/sh + ++if [ $# -lt 2 ]; then ++ echo "usage: $0 [-bspanvmQT] [-D clash_option] sourcefile targetfile" ++ echo " $0 [-bspanvmQT] [-D clash_option] sourcefile [ sourcefiles... ]" ++ echo " targetdirectoryopy [-tnvm] MSDOSsourcefile" ++ exit 1 ++fi ++ + dosfile=$1 + shift + Added: tinysofa/snapshot/mtools/current/sources/mtools-3.9.9.tar.bz2 =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/mtools/current/sources/mtools-3.9.9.tar.bz2 ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/mtools/current/specs/mtools.spec =================================================================== --- tinysofa/snapshot/mtools/current/specs/mtools.spec 2004-07-01 15:38:55 UTC (rev 2604) +++ tinysofa/snapshot/mtools/current/specs/mtools.spec 2004-07-01 15:38:57 UTC (rev 2605) @@ -0,0 +1,189 @@ +Summary: Programs for accessing MS-DOS disks without mounting the disks. +Name: mtools +Version: 3.9.9 +Release: 8ts +License: GPL +Group: Applications/System +Source: http://mtools.linux.lu/mtools-%{version}.tar.bz2 +Url: http://mtools.linux.lu/ +Buildroot: %{_tmppath}/%{name}-%{version}-root +Patch0: mtools-3.9.6-config.patch +Patch1: mtools-3.9.6-paths.patch +Patch3: mtools-3.9.7-bigdisk.patch +Patch4: mtools-3.9.9-noargs.patch +Patch5: mtools-3.9.9-badc.patch +Prereq: /sbin/install-info + +BuildRequires: texinfo + +%description +Mtools is a collection of utilities for accessing MS-DOS files. +Mtools allow you to read, write and move around MS-DOS filesystem +files (normally on MS-DOS floppy disks). Mtools supports Windows95 +style long file names, OS/2 XDF disks, and 2m disks. + +Mtools should be installed if you need to use MS-DOS disks. + +%prep +%setup -q -n %{name}-%{version} +%patch0 -p1 +%patch1 -p1 +%patch3 -p1 -b .big +%patch4 -p1 -b .noargs +%patch5 -p1 -b .badc + +%build +%configure +make + +%install +rm -rf $RPM_BUILD_ROOT +mkdir -p $RPM_BUILD_ROOT/etc $RPM_BUILD_ROOT/%{_infodir} +%makeinstall +install -m644 mtools.conf $RPM_BUILD_ROOT/etc +gzip -9f $RPM_BUILD_ROOT/%{_infodir}/* + +# We aren't shipping this. +find $RPM_BUILD_ROOT -name "floppyd*" -exec rm {} \; + +%clean +rm -rf $RPM_BUILD_ROOT + +%post +/sbin/install-info %{_infodir}/mtools.info.gz %{_infodir}/dir + +%preun +if [ "$1" = 0 ]; then + /sbin/install-info --delete %{_infodir}/mtools.info.gz %{_infodir}/dir +fi + +%files +%defattr(-,root,root) +%config /etc/mtools.conf +%doc COPYING Changelog README Release.notes +/usr/bin/* +%{_mandir}/*/* +%{_infodir}/* + +%changelog +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Thu Jan 8 2004 Tim Waugh 3.9.9-7 +- Fix mistaken use of '&' instead of '&&'. + +* Tue Dec 9 2003 Tim Waugh 3.9.9-6 +- Remove last (incorrect) change. + +* Tue Dec 9 2003 Tim Waugh 3.9.9-5 +- Fix mistaken variable assignment in comparison (bug #110823). + +* Thu Nov 27 2003 Tim Waugh +- Build requires texinfo (bug #111000). + +* Sat Oct 25 2003 Tim Waugh 3.9.9-4 +- Rebuilt. + +* Wed Jun 04 2003 Elliot Lee +- rebuilt + +* Thu May 22 2003 Tim Waugh 3.9.9-2 +- Fix mcomp with no arguments (bug #91372). + +* Tue Mar 18 2003 Tim Waugh 3.9.9-1 +- 3.9.9. +- Add config lines for hpoj photo-card access on drive P:. + +* Wed Jan 22 2003 Tim Powers +- rebuilt + +* Wed Nov 20 2002 Tim Powers +- rebuilt in current collinst + +* Fri Jun 21 2002 Tim Powers +- automated rebuild + +* Thu May 23 2002 Tim Powers +- automated rebuild + +* Wed Jan 09 2002 Tim Powers +- automated rebuild + +* Sun Jun 24 2001 Bernhard Rosenkraenzer 3.9.8-2 +- Add patch from maintainer + +* Mon May 28 2001 Bernhard Rosenkraenzer 3.9.8-1 +- 3.9.8 final + +* Mon May 21 2001 Bernhard Rosenkraenzer 3.9.8-0.pre1.0 +- 3.9.8pre1 + +* Wed May 16 2001 Bernhard Rosenkraenzer 3.9.7-6 +- Fix support for disks > 1.44 MB (#40857) + +* Tue May 8 2001 Bernhard Rosenkraenzer 3.9.7-5 +- Update to 20010507 + +* Wed Jan 10 2001 Bernhard Rosenkraenzer +- Apply the author's current patches, fixes among other things + ZIP drive support and doesn't crash when trying to access a BSD disk + +* Wed Jul 12 2000 Prospector +- automatic rebuild + +* Sat Jun 17 2000 Trond Eivind Glomsrod +- specify ownership + +* Wed Jun 07 2000 Trond Eivind Glomsr?d +- Version 3.9.7 +- use %%{_mandir}, %%{_makeinstall}, %%configure, %%makeinstall + and %%{_tmppath} + +* Wed Feb 09 2000 Cristian Gafton +- get rid of mtools.texi as a doc file (we have the info file) +- fix config file so mtools work (#9264) +- fix references to the config file to be /etc/mtools.conf + +* Fri Feb 4 2000 Bill Nottingham +- expunge floppyd + +* Thu Feb 03 2000 Cristian Gafton +- man pages are compressed +- fix description +- version 3.9.6 + +* Sun Mar 21 1999 Cristian Gafton +- auto rebuild in the new build environment (release 5) + +* Thu Mar 18 1999 Cristian Gafton +- patch to make the texi sources compile +- fix the spec file group and description +- fixed floppy drive sizes + +* Tue Dec 29 1998 Cristian Gafton +- build for 6.0 +- fixed invalid SAMPLE_FILE configuration file + +* Wed Sep 02 1998 Michael Maher +- Built package for 5.2. +- Updated Source to 3.9.1. +- Cleaned up spec file. + +* Fri Apr 24 1998 Prospector System +- translations modified for de, fr, tr + +* Fri Apr 10 1998 Cristian Gafton +- updated to 3.8 + +* Tue Oct 21 1997 Otto Hammersmith +- changed buildroot to /var/tmp, rather than /tmp +- use install-info + +* Mon Jul 21 1997 Erik Troan +- built against glibc + +* Thu Apr 17 1997 Erik Troan +- Changed sysconfdir to be /etc + +* Mon Apr 14 1997 Michael Fulbright +- Updated to 3.6 From svn at tinysofa.org Thu Jul 1 15:38:59 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:38:59 +1000 (EST) Subject: [tinysofa-svn] r2606 - in tinysofa/snapshot: . mtr mtr/current mtr/current/sources mtr/current/specs Message-ID: <20040701153859.D38BD4E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:38:59 +1000 (Fri, 02 Jul 2004) New Revision: 2606 Added: tinysofa/snapshot/mtr/ tinysofa/snapshot/mtr/current/ tinysofa/snapshot/mtr/current/sources/ tinysofa/snapshot/mtr/current/sources/mtr-0.48-nogtk.patch tinysofa/snapshot/mtr/current/sources/mtr-0.49-s390x.patch tinysofa/snapshot/mtr/current/sources/mtr-0.52-SA_LEN.patch tinysofa/snapshot/mtr/current/sources/mtr-0.54-force-nogtk.patch tinysofa/snapshot/mtr/current/sources/mtr-0.54-ipv6-kame.patch tinysofa/snapshot/mtr/current/sources/mtr-0.54.tar.gz tinysofa/snapshot/mtr/current/sources/xmtr.consolehelper tinysofa/snapshot/mtr/current/sources/xmtr.pam tinysofa/snapshot/mtr/current/specs/ tinysofa/snapshot/mtr/current/specs/mtr.spec Log: - Add mtr to snapshot from 2.0. Added: tinysofa/snapshot/mtr/current/sources/mtr-0.48-nogtk.patch =================================================================== --- tinysofa/snapshot/mtr/current/sources/mtr-0.48-nogtk.patch 2004-07-01 15:38:57 UTC (rev 2605) +++ tinysofa/snapshot/mtr/current/sources/mtr-0.48-nogtk.patch 2004-07-01 15:38:59 UTC (rev 2606) @@ -0,0 +1,39 @@ +diff -ur mtr-0.48/mtr.c mtr-0.48.nogtk/mtr.c +--- mtr-0.48/mtr.c Wed Mar 6 19:37:49 2002 ++++ mtr-0.48.nogtk/mtr.c Wed Mar 6 19:40:18 2002 +@@ -63,7 +63,9 @@ + { "report", 0, 0, 'r' }, + { "report-cycles", 1, 0, 'c' }, + { "curses", 0, 0, 't' }, ++#ifndef NO_GTK + { "gtk", 0, 0, 'g' }, ++#endif + { "interval", 1, 0, 'i' }, + { "psize", 1, 0, 'p' }, + { "no-dns", 0, 0, 'n' }, +@@ -79,7 +81,11 @@ + + opt = 0; + while(1) { ++#ifdef NO_GTK ++ opt = getopt_long(argc, argv, "a:hvrc:tklnsi:p:" ++#else + opt = getopt_long(argc, argv, "a:hvrc:tgklnsi:p:" ++#endif + #ifdef ENABLE_IPV6 + "46" + #endif +@@ -218,8 +224,13 @@ + } + + if(PrintHelp) { ++#ifdef NO_GTK ++ printf("usage: %s [-hvrctlsni46] [--help] [--version] [--report]\n" ++ "\t\t[--report-cycles=COUNT] [--curses]\n" ++#else + printf("usage: %s [-hvrctglsni46] [--help] [--version] [--report]\n" + "\t\t[--report-cycles=COUNT] [--curses] [--gtk]\n" ++#endif + "\t\t[--raw] [--split] [--no-dns] [--address interface]\n" /* BL */ + "\t\t[--psize=bytes/-p=bytes]\n" /* ok */ + "\t\t[--interval=SECONDS] HOSTNAME [PACKETSIZE]\n", argv[0]); Added: tinysofa/snapshot/mtr/current/sources/mtr-0.49-s390x.patch =================================================================== --- tinysofa/snapshot/mtr/current/sources/mtr-0.49-s390x.patch 2004-07-01 15:38:57 UTC (rev 2605) +++ tinysofa/snapshot/mtr/current/sources/mtr-0.49-s390x.patch 2004-07-01 15:38:59 UTC (rev 2606) @@ -0,0 +1,14 @@ +--- mtr-0.49/configure.in.s390x 2002-03-06 12:27:37.000000000 +0100 ++++ mtr-0.49/configure.in 2002-09-24 12:21:55.000000000 +0200 +@@ -69,8 +69,9 @@ + # AC_CHECK_FUNC(setuid, , AC_MSG_ERROR (I Need either seteuid or setuid)) + + AC_CHECK_FUNC(res_mkquery, , +- AC_CHECK_LIB(bind, res_mkquery, , +- AC_CHECK_LIB(resolv, res_mkquery, , AC_MSG_ERROR(No resolver library found)))) ++ AC_CHECK_LIB(bind, res_mkquery, LIBS="$LIBS -lbind", ++ AC_CHECK_LIB(resolv, res_mkquery, LIBS="$LIBS -lresolv", ++ AC_CHECK_LIB(resolv, __res_mkquery, LIBS="$LIBS -lresolv", AC_MSG_ERROR(No resolver library found))))) + + AC_CHECK_FUNC(herror, , AC_DEFINE(NO_HERROR)) + AC_CHECK_FUNC(strerror, , AC_DEFINE(NO_STRERROR)) Added: tinysofa/snapshot/mtr/current/sources/mtr-0.52-SA_LEN.patch =================================================================== --- tinysofa/snapshot/mtr/current/sources/mtr-0.52-SA_LEN.patch 2004-07-01 15:38:57 UTC (rev 2605) +++ tinysofa/snapshot/mtr/current/sources/mtr-0.52-SA_LEN.patch 2004-07-01 15:38:59 UTC (rev 2606) @@ -0,0 +1,23 @@ +--- mtr-0.52/net.h.orig Sun Mar 30 18:54:41 2003 ++++ mtr-0.52/net.h Sun Mar 30 19:15:28 2003 +@@ -68,3 +68,10 @@ + + #define MAXPACKET 4096 + #define MINPACKET 64 ++ ++#ifdef linux ++#ifndef SA_LEN ++#define SA_LEN(x) (((x)->sa_family == AF_INET6) ? sizeof(struct sockaddr_in6) : \ ++ (((x)->sa_family == AF_INET)?sizeof(struct sockaddr_in):sizeof(struct sockaddr))) ++#endif ++#endif +--- mtr-0.52/dns.c.orig Sun Mar 30 18:54:41 2003 ++++ mtr-0.52/dns.c Sun Mar 30 19:17:57 2003 +@@ -44,6 +44,7 @@ + #include + + #include "dns.h" ++#include "net.h" + + #ifdef NO_STRERROR + extern int sys_nerr; Added: tinysofa/snapshot/mtr/current/sources/mtr-0.54-force-nogtk.patch =================================================================== --- tinysofa/snapshot/mtr/current/sources/mtr-0.54-force-nogtk.patch 2004-07-01 15:38:57 UTC (rev 2605) +++ tinysofa/snapshot/mtr/current/sources/mtr-0.54-force-nogtk.patch 2004-07-01 15:38:59 UTC (rev 2606) @@ -0,0 +1,35 @@ +diff -urN mtr-0.54/configure.in mtr-0.54.nogtk/configure.in +--- mtr-0.54/configure.in 2004-06-22 00:38:57.871499840 +1000 ++++ mtr-0.54.nogtk/configure.in 2004-06-22 00:40:15.306727896 +1000 +@@ -4,7 +4,6 @@ + AC_SUBST(GTK_OBJ) + AC_SUBST(CURSES_OBJ) + +-GTK_OBJ=gtk.o + CURSES_OBJ=curses.o + + AC_PROG_CC +@@ -78,21 +77,8 @@ + + AC_CHECK_LIB(m, floor, , AC_MSG_ERROR(No math library found)) + +-dnl Added ability to cleanly disable GTK+ (12 Jan 2000, Joseph Carter) +-AC_ARG_WITH(gtk, +-[ --without-gtk Do not try to use GTK+ at all], +-WANTS_GTK=$withval, WANTS_GTK=yes) +- +-if test "x$WANTS_GTK" = "xyes"; then +- AM_PATH_GTK(1.0.0, CFLAGS="$CFLAGS $GTK_CFLAGS" +- LIBS="$LIBS $GTK_LIBS", +- AC_MSG_WARN(Building without GTK+ display support) +- AC_DEFINE(NO_GTK) +- GTK_OBJ="") +-else +- AC_DEFINE(NO_GTK) +- GTK_OBJ="" +-fi ++AC_DEFINE(NO_GTK) ++GTK_OBJ="" + + AC_CHECK_FUNC(socket, , + AC_CHECK_LIB(socket, socket, , AC_MSG_ERROR(No socket library found))) Added: tinysofa/snapshot/mtr/current/sources/mtr-0.54-ipv6-kame.patch =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/mtr/current/sources/mtr-0.54-ipv6-kame.patch ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/mtr/current/sources/mtr-0.54.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/mtr/current/sources/mtr-0.54.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/mtr/current/sources/xmtr.consolehelper =================================================================== --- tinysofa/snapshot/mtr/current/sources/xmtr.consolehelper 2004-07-01 15:38:57 UTC (rev 2605) +++ tinysofa/snapshot/mtr/current/sources/xmtr.consolehelper 2004-07-01 15:38:59 UTC (rev 2606) @@ -0,0 +1,3 @@ +USER=root +PROGRAM=/usr/X11R6/bin/xmtr +SESSION=true Added: tinysofa/snapshot/mtr/current/sources/xmtr.pam =================================================================== --- tinysofa/snapshot/mtr/current/sources/xmtr.pam 2004-07-01 15:38:57 UTC (rev 2605) +++ tinysofa/snapshot/mtr/current/sources/xmtr.pam 2004-07-01 15:38:59 UTC (rev 2606) @@ -0,0 +1,6 @@ +#%PAM-1.0 +auth sufficient pam_rootok.so +auth required pam_stack.so service=system-auth +session required pam_permit.so +session optional pam_xauth.so +account required pam_permit.so Added: tinysofa/snapshot/mtr/current/specs/mtr.spec =================================================================== --- tinysofa/snapshot/mtr/current/specs/mtr.spec 2004-07-01 15:38:57 UTC (rev 2605) +++ tinysofa/snapshot/mtr/current/specs/mtr.spec 2004-07-01 15:38:59 UTC (rev 2606) @@ -0,0 +1,291 @@ +%define with_gtk 0 + +Summary: A network diagnostic tool. +Name: mtr +Version: 0.54 +Release: 5ts +Epoch: 2 +Group: Applications/Internet +License: GPL +URL: http://www.BitWizard.nl/mtr +Source: ftp://ftp.bitwizard.nl/mtr/%{name}-%{version}.tar.gz +Source1: xmtr.consolehelper +Source2: xmtr.pam +Patch0: mtr-0.49-s390x.patch +Patch1: mtr-0.54-ipv6-kame.patch +Patch2: mtr-0.48-nogtk.patch +Patch3: mtr-0.52-SA_LEN.patch +Patch4: mtr-0.54-force-nogtk.patch +BuildRequires: ncurses-devel + +Buildroot: %{_tmppath}/%{name}-%{version}-root + +%description +Mtr is a network diagnostic tool that combines ping and traceroute +into one program. Mtr provides two interfaces: an ncurses interface, +useful for using Mtr from a telnet session; and a GTK+ interface for X +(provided in the mtr-gtk package). + +%if %{with_gtk} +%package gtk +Summary: The GTK+ interface for mtr. +Epoch: %{epoch} +Group: Applications/Internet +Requires: mtr, usermode >= 1.37 + +%description gtk +The mtr-gtk package provides the GTK+ interface for the mtr network +diagnostic tool. +%endif + +%prep +%setup -q +%patch0 -p1 -b .s390x +%patch1 -p1 -b .ipv6-kame +%patch2 -p1 -b .nogtk +%patch3 -p1 -b .SA_LEN +%if !%{with_gtk} +%patch4 -p1 -b .force-nogtk +%endif + +%build +aclocal +automake -a +autoconf + +%if %{with_gtk} +%configure --with-gtk --enable-ipv6 +make && mv mtr xmtr && make distclean +%endif +%configure --without-gtk --enable-ipv6 +make + +%install +if [ -d $RPM_BUILD_ROOT ]; then rm -rf $RPM_BUILD_ROOT; fi + +%if %{with_gtk} +mkdir -p $RPM_BUILD_ROOT/usr/{X11R6/bin,bin,sbin,share/pixmaps} +%else +mkdir -p $RPM_BUILD_ROOT/usr/{bin,sbin} +%endif + +mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man8 +install -m 4755 mtr $RPM_BUILD_ROOT%{_sbindir}/mtr +make DESTDIR=$RPM_BUILD_ROOT install + +%if %{with_gtk} +install -m 4755 xmtr $RPM_BUILD_ROOT/usr/X11R6/bin +install -m 644 img/mtr_icon.xpm $RPM_BUILD_ROOT/usr/share/pixmaps +mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/security/console.apps +install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/security/console.apps/xmtr +mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/pam.d +install -m 644 %{SOURCE2} $RPM_BUILD_ROOT/etc/pam.d/xmtr +mkdir -p $RPM_BUILD_ROOT/%{_bindir} +ln -fs consolehelper $RPM_BUILD_ROOT/%{_bindir}/xmtr + +mkdir -p %{buildroot}/%{_datadir}/applications +cat > %{buildroot}/%{_datadir}/applications/net-xmtr.desktop < 0.54-5 +- Removed absolute path for Icon in desktop file (#120170) + +* Mon Feb 16 2004 Phil Knirsch +- Added IPv6 patch from ftp://ftp.kame.net/pub/kame/misc/mtr-054-* +- Enabled IPv6 in mtr. +- Included fix from Robert Scheck to make GTK optional in configure. + +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Wed Feb 04 2004 Phil Knirsch 0.54-2 +- Fix to build on current tree. + +* Sat Oct 18 2003 Florian La Roche +- update to 0.54 + +* Wed Jun 04 2003 Elliot Lee +- rebuilt + +* Wed Jan 22 2003 Tim Powers +- rebuilt + +* Fri Nov 29 2002 Phil Knirsch 0.52-1 +- Update to latest upstream version (0.52). + +* Tue Nov 12 2002 Nalin Dahyabhai 0.49-9 +- Remove absolute paths from the PAM configuration, ensuring that the modules + for the right arch get used on multilib systems. +- Remove Icon:. + +* Tue Sep 24 2002 Bernhard Rosenkraenzer 0.49-7a +- Fix build on s390x + +* Mon Aug 19 2002 Phil Knirsch 0.49-7 +- Fixed consolehelper support. + +* Wed Aug 07 2002 Phil Knirsch 0.49-6 +- Desktop file fixes (#69550). + +* Fri Jun 21 2002 Tim Powers 0.49-5 +- automated rebuild + +* Tue Jun 18 2002 Phil Knirsch 0.49-4 +- Added consolehelper support to xmtr. + +* Sun May 26 2002 Tim Powers +- automated rebuild + +* Wed May 22 2002 Phil Knirsch 0.49-2 +- Fixed autoFOO problems. + +* Fri Mar 08 2002 Florian La Roche +- 0.49 update + +* Thu Mar 07 2002 Florian La Roche +- 0.48 update + +* Mon Jun 25 2001 Preston Brown +- 0.44 bugfix release +- fix display of icon in .desktop entry + +* Sun Jun 24 2001 Elliot Lee +- Bump release + rebuild. + +* Mon Feb 12 2001 Preston Brown +- don't advertise gtk support in non-gtk binary (#27172) + +* Fri Oct 20 2000 Bill Nottingham +- fix autoconf check for resolver functions + +* Fri Jul 21 2000 Bill Nottingham +- fix group + +* Wed Jul 12 2000 Prospector +- automatic rebuild + +* Thu Jul 6 2000 Bill Nottingham +- fix setuid bit +- remove symlink +- force build of non-gtk version + +* Mon Jun 19 2000 Preston Brown +- disable SUID bits +- desktop entry + +* Mon Jun 19 2000 Than Ngo +- FHS fixes + +* Fri May 26 2000 Preston Brown +- adopted for Winston + +* Thu Aug 19 1999 Ryan Weaver + [mtr-0.41-1] +- Added afr's patch to allow disabeling of gtk without Robn's hack. +- Made report mode report the newly added extra resolution. + +* Wed Aug 18 1999 Ryan Weaver +- renamed mtr-gtk to xmtr +- added symlink from /usr/bin/mtr to /usr/sbin/mtr + + [mtr-0.40-1] +- Fixed some problems with HPUX and SunOS. +- Included Olav Kvittem's patch to do packetsize option. +- Made the timekeeping in micro seconds. + +* Wed Jun 10 1999 Ryan Weaver + [mtr-0.39-1] +- Updated to version 0.39. + +* Wed Jun 9 1999 Ryan Weaver + [mtr-0.38-1] +- Updated to version 0.38. + +* Thu Apr 15 1999 Ryan Weaver + [mtr-0.37-2] +- Changed RPM headers to conform to Red Hat Contrib|Net specs. + +* Mon Apr 12 1999 Ryan Weaver + [mtr-0.37-1] +- v0.37 +- Added Bill Bogstad's "show the local host & time" patch. +- Added R. Sparks' show-last-ping patch, submitted by Philip Kizer. + +- v0.36 +- Added Craigs change-the-interval-on-the-fly patch. +- Added Moritz Barsnick's "do something sensible if host not found" + patch. +- Some cleanup of both Craigs and Moritz' patches. + +* Wed Apr 7 1999 Ryan Weaver + [mtr-0.35-1] +- v0.35 +- Added Craig Milo Rogers pause/resume for GTK patch. +- Added Craig Milo Rogers cleanup of "reset". (restart at the beginning) +- Net_open used to send a first packet. After that the display-driver + got a chance to distort the timing by taking its time to initialize. + +* Mon Apr 5 1999 Ryan Weaver + [mtr-0.34-1] +- v0.34 +- Added Matt's nifty "use the icmp unreachables to do the timing" patch. +- Added Steve Kann's pause/resume patch. + +* Wed Mar 10 1999 Ryan Weaver + [mtr-0.33-1] +- v0.33 +- Fixed the Linux glibc resolver problems. +- Fixed the off-by-one problem with -c option. + +* Mon Mar 8 1999 Ryan Weaver + [mtr-0.32-1] +- v0.32 +- Fixed the FreeBSD bug detection stuff. + +* Fri Mar 5 1999 Ryan Weaver + [mtr-0.31-1] +- v0.31 +- Fixed a few documentation issues. -- Matt +- Changed the autoconf stuff to find the resolver library on + Solaris. -- REW +- Cleaned up the autoconf.in file a bit. -- Matt. + +* Thu Mar 4 1999 Ryan Weaver + [mtr-0.30-1] +- Build gtk version against gtk+-1.2.0 +- v0.30 +- Fixed a typo in the changelog (NEWS) entry for 0.27. :-) +- added use of "MTR_OPTIONS" environment variable for defaults. From svn at tinysofa.org Thu Jul 1 15:39:03 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:39:03 +1000 (EST) Subject: [tinysofa-svn] r2607 - in tinysofa/snapshot: . mx mx/current mx/current/sources mx/current/specs Message-ID: <20040701153903.795A84E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:39:01 +1000 (Fri, 02 Jul 2004) New Revision: 2607 Added: tinysofa/snapshot/mx/ tinysofa/snapshot/mx/current/ tinysofa/snapshot/mx/current/sources/ tinysofa/snapshot/mx/current/sources/egenix-mx-base-2.0.1-longyear.patch tinysofa/snapshot/mx/current/sources/egenix-mx-base-2.0.2-pyconfig.patch tinysofa/snapshot/mx/current/sources/egenix-mx-base-2.0.5-lib64.patch tinysofa/snapshot/mx/current/sources/egenix-mx-base-2.0.5.tar.gz tinysofa/snapshot/mx/current/specs/ tinysofa/snapshot/mx/current/specs/mx.spec Log: - Add mx to snapshot from 2.0. Added: tinysofa/snapshot/mx/current/sources/egenix-mx-base-2.0.1-longyear.patch =================================================================== --- tinysofa/snapshot/mx/current/sources/egenix-mx-base-2.0.1-longyear.patch 2004-07-01 15:38:59 UTC (rev 2606) +++ tinysofa/snapshot/mx/current/sources/egenix-mx-base-2.0.1-longyear.patch 2004-07-01 15:39:01 UTC (rev 2607) @@ -0,0 +1,84 @@ +--- egenix-mx-base-2.0.1/mx/DateTime/mxDateTime/mxDateTime.c.sopwith Thu Aug 30 21:20:23 2001 ++++ egenix-mx-base-2.0.1/mx/DateTime/mxDateTime/mxDateTime.c Thu Aug 30 21:25:23 2001 +@@ -721,7 +721,7 @@ + + static + int mxDateTime_SetFromDateAndTime(mxDateTimeObject *datetime, +- int year, ++ long year, + int month, + int day, + int hour, +@@ -940,7 +940,7 @@ + /* --- API functions --- */ + + static +-PyObject *mxDateTime_FromDateAndTime(int year, ++PyObject *mxDateTime_FromDateAndTime(long year, + int month, + int day, + int hour, +@@ -968,7 +968,7 @@ + #define mxDateTime_FromGregorianDateAndTime mxDateTime_FromDateAndTime + + static +-PyObject *mxDateTime_FromJulianDateAndTime(int year, ++PyObject *mxDateTime_FromJulianDateAndTime(long year, + int month, + int day, + int hour, +@@ -1127,7 +1127,8 @@ + PyObject *mxDateTime_FromTuple(PyObject *v) + { + mxDateTimeObject *datetime = 0; +- int year,month,day,hour,minute; ++ long year; ++ int month,day,hour,minute; + double second; + + if (!PyTuple_Check(v)) { +@@ -1135,7 +1136,7 @@ + return NULL; + } + if (!PyArg_ParseTuple(v, +- "iiiiid;need a date/time 6-tuple (year,month,day,hour,minute,second)", ++ "liiiid;need a date/time 6-tuple (year,month,day,hour,minute,second)", + &year,&month,&day,&hour,&minute,&second)) + return NULL; + +@@ -3659,14 +3660,15 @@ + "fractions." + ) + { +- int year, ++ long year; ++ int + month = 1, + day = 1; + int hour = 0, + minute = 0; + double second = 0.0; + +- Py_Get6Args("i|iiiid",year,month,day,hour,minute,second); ++ Py_Get6Args("l|iiiid",year,month,day,hour,minute,second); + return mxDateTime_FromDateAndTime(year,month,day,hour,minute,second); + onError: + return NULL; +@@ -3679,14 +3681,14 @@ + "fractions." + ) + { +- int year, +- month = 1, ++ long year; ++ int month = 1, + day = 1; + int hour = 0, + minute = 0; + double second = 0.0; + +- Py_Get6Args("i|iiiid",year,month,day,hour,minute,second); ++ Py_Get6Args("l|iiiid",year,month,day,hour,minute,second); + return mxDateTime_FromJulianDateAndTime(year,month,day,hour,minute,second); + onError: + return NULL; Added: tinysofa/snapshot/mx/current/sources/egenix-mx-base-2.0.2-pyconfig.patch =================================================================== --- tinysofa/snapshot/mx/current/sources/egenix-mx-base-2.0.2-pyconfig.patch 2004-07-01 15:38:59 UTC (rev 2606) +++ tinysofa/snapshot/mx/current/sources/egenix-mx-base-2.0.2-pyconfig.patch 2004-07-01 15:39:01 UTC (rev 2607) @@ -0,0 +1,14 @@ +--- egenix-mx-base-2.0.2/mx/Tools/mxTools/xmap.c.pyconfig.h Fri Sep 14 12:29:29 2001 ++++ egenix-mx-base-2.0.2/mx/Tools/mxTools/xmap.c Fri Sep 14 12:31:06 2001 +@@ -9,7 +9,11 @@ + */ + + #include "Python.h" ++#if defined(PY_MAJOR_VERSION) && PY_MAJOR_VERSION >= 2 && PY_MINOR_VERSION >= 2 ++#include "pyconfig.h" ++#else + #include "config.h" ++#endif + #include "assert.h" + + #include "mx.h" Added: tinysofa/snapshot/mx/current/sources/egenix-mx-base-2.0.5-lib64.patch =================================================================== --- tinysofa/snapshot/mx/current/sources/egenix-mx-base-2.0.5-lib64.patch 2004-07-01 15:38:59 UTC (rev 2606) +++ tinysofa/snapshot/mx/current/sources/egenix-mx-base-2.0.5-lib64.patch 2004-07-01 15:39:01 UTC (rev 2607) @@ -0,0 +1,11 @@ +--- egenix-mx-base-2.0.5/mxSetup.py.lr 2003-11-23 04:50:40.000000000 -0500 ++++ egenix-mx-base-2.0.5/mxSetup.py 2003-11-23 04:52:48.000000000 -0500 +@@ -1419,7 +1419,7 @@ + + if self.install_dir is None: + installobj = self.distribution.get_command_obj('install') +- self.install_dir = installobj.install_data ++ self.install_dir = installobj.install_platlib + if _debug: print 'Installing data files to %s' % self.install_dir + install_data.finalize_options(self) + Added: tinysofa/snapshot/mx/current/sources/egenix-mx-base-2.0.5.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/mx/current/sources/egenix-mx-base-2.0.5.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/mx/current/specs/mx.spec =================================================================== --- tinysofa/snapshot/mx/current/specs/mx.spec 2004-07-01 15:38:59 UTC (rev 2606) +++ tinysofa/snapshot/mx/current/specs/mx.spec 2004-07-01 15:39:01 UTC (rev 2607) @@ -0,0 +1,126 @@ +%define pybasever %{nil} +%define without_pybasever 1 + +Summary: A collection of Python software tools. +Name: mx%{pybasever} +Version: 2.0.5 +Release: 2.1ts +URL: http://www.lemburg.com/files/python/eGenix-mx-Extensions.html +Source0: http://www.lemburg.com/python/egenix-mx-base-%{version}.tar.gz +Patch0: egenix-mx-base-2.0.2-pyconfig.patch +Patch1: egenix-mx-base-2.0.1-longyear.patch +Patch2: egenix-mx-base-2.0.5-lib64.patch +License: eGenix.com Public License (Python) +Group: Development/Libraries +BuildRequires: gcc glibc-devel python python-devel Distutils +Requires: python >= 2.3 +%if %{?without_pybasever} +Provides: mx2 = %{version}-%{release} +Obsoletes: mx2 +%endif +BuildRoot: %{_tmppath}/%{name}-%{version}-root + +%description +The mx extensions for Python are a collection of Python software tools +which enhance Python's usability in many areas. + +%prep +%setup -q -n egenix-mx-base-%{version} +%patch1 -p1 +%patch2 -p1 + +%build +CFLAGS="$RPM_OPT_FLAGS" python setup.py build + +%install +rm -rf $RPM_BUILD_ROOT +python setup.py install --root=$RPM_BUILD_ROOT --record=INSTALLED_FILES + +mkdir -p $RPM_BUILD_ROOT%{_includedir} +for I in `find $RPM_BUILD_ROOT/usr/%{_lib}/python*/site-packages/mx -name '*.h'`; do + mv $I $RPM_BUILD_ROOT%{_includedir} +done +install -m444 mx/BeeBase/mxBeeBase/mxh.h $RPM_BUILD_ROOT%{_includedir} + +# These files are documentation, and are in a bad location +mkdir docs +mv -f $RPM_BUILD_ROOT/usr/%{_lib}/python*/site-packages/mx/{LICENSE,COPYRIGHT} docs/ +rm -fr $RPM_BUILD_ROOT/usr/%{_lib}/python*/site-packages/mx/Doc +DESTDIR=`pwd`/docs +pushd $RPM_BUILD_ROOT/usr/%{_lib}/python*/site-packages/mx/ +cp -r --parents */Doc/* $DESTDIR/ +popd +rm -rf $RPM_BUILD_ROOT/usr/%{_lib}/python*/site-packages/mx/*/Doc/ + +# Don't include the examples +rm -fr $RPM_BUILD_ROOT/usr/%{_lib}/python*/site-packages/mx/*/Examples + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(-,root,root) +%doc README docs/* +%{_includedir}/*.h +%{_prefix}/%{_lib}/python*/site-packages/mx + +%changelog +* Tue Mar 02 2004 Elliot Lee +- rebuilt + +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Sun Nov 23 2003 Florian La Roche +- update to 2.0.5 +- recompile with python 2.3 + +* Wed Jun 04 2003 Elliot Lee +- rebuilt + +* Wed Jan 22 2003 Tim Powers +- rebuilt + +* Wed Dec 11 2002 Tim Powers 2.0.3-7 +- lib64'ize + +* Tue Aug 06 2002 Elliot Lee 2.0.3-6 +- Provide mx2 dep + +* Fri Jun 21 2002 Tim Powers +- automated rebuild + +* Wed May 29 2002 Trond Eivind Glomsr?d 2.0.3-4 +- Make it require python >= 2.2, < 2.3 + +* Sun May 26 2002 Tim Powers +- automated rebuild + +* Thu May 23 2002 Trond Eivind Glomsr?d 2.0.3-2 +- Move to python 2.2 + +* Wed Mar 13 2002 Trond Eivind Glomsr?d 2.0.3-1 +- 2.0.3 + +* Wed Feb 27 2002 Trond Eivind Glomsr?d 2.0.2-5 +- Rebuild (and no, it wasn't broken. It just used /usr/bin/python + as the version to build for) + +* Mon Jan 21 2002 Elliot Lee 2.0.2-4 +- Remove pyver autodetection (it's broken!) and install header files + +* Wed Jan 09 2002 Tim Powers +- automated rebuild + +* Mon Oct 1 2001 Trond Eivind Glomsr?d 2.0.2-2 +- detect python version when building +- 64bit fix mxDateTime + +* Fri Sep 14 2001 Trond Eivind Glomsr?d 2.0.2-1 +- 2.0.2 +- Build for Python 2.2 + +* Tue Jun 19 2001 Trond Eivind Glomsr?d +- Initial build. Needed for python DB API + + From svn at tinysofa.org Thu Jul 1 15:39:07 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:39:07 +1000 (EST) Subject: [tinysofa-svn] r2609 - in tinysofa/snapshot: . neon neon/current neon/current/sources neon/current/specs Message-ID: <20040701153907.1C57B4E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:39:06 +1000 (Fri, 02 Jul 2004) New Revision: 2609 Added: tinysofa/snapshot/neon/ tinysofa/snapshot/neon/current/ tinysofa/snapshot/neon/current/sources/ tinysofa/snapshot/neon/current/sources/neon-0.23.9-config.patch tinysofa/snapshot/neon/current/sources/neon-0.24.6.tar.gz tinysofa/snapshot/neon/current/specs/ tinysofa/snapshot/neon/current/specs/neon.spec Log: - Add neon to snapshot from 2.0. Added: tinysofa/snapshot/neon/current/sources/neon-0.23.9-config.patch =================================================================== --- tinysofa/snapshot/neon/current/sources/neon-0.23.9-config.patch 2004-07-01 15:39:04 UTC (rev 2608) +++ tinysofa/snapshot/neon/current/sources/neon-0.23.9-config.patch 2004-07-01 15:39:06 UTC (rev 2609) @@ -0,0 +1,17 @@ + +Never print libdir in --libs output. + +--- neon-0.23.9/neon-config.in.config ++++ neon-0.23.9/neon-config.in +@@ -74,11 +74,6 @@ + + --libs) + LIBS="-lneon @NEON_LIBS@" +- # Don't add standard library paths +- case "${libdir}" in +- /usr/lib|/lib) ;; +- *) LIBS="-L${libdir} ${LIBS}" ;; +- esac + echo @user_LDFLAGS@ ${LIBS} + ;; + Added: tinysofa/snapshot/neon/current/sources/neon-0.24.6.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/neon/current/sources/neon-0.24.6.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/neon/current/specs/neon.spec =================================================================== --- tinysofa/snapshot/neon/current/specs/neon.spec 2004-07-01 15:39:04 UTC (rev 2608) +++ tinysofa/snapshot/neon/current/specs/neon.spec 2004-07-01 15:39:06 UTC (rev 2609) @@ -0,0 +1,137 @@ +Summary: An HTTP and WebDAV client library +Name: neon +Version: 0.24.6 +Release: 1ts +Copyright: LGPL +Group: Applications/Publishing +Prefix: %{_prefix} +URL: http://www.webdav.org/neon +Source0: http://www.webdav.org/neon/neon-%{version}.tar.gz +Patch0: neon-0.23.9-config.patch +BuildRequires: expat-devel, openssl-devel, zlib-devel, krb5-devel +BuildRequires: pkgconfig +BuildRoot: %{_tmppath}/%{name}-%{version}-root +Conflicts: subversion < 0.22.2-4 + +%description +neon is an HTTP and WebDAV client library, with a C interface; +providing a high-level interface to HTTP and WebDAV methods along +with a low-level interface for HTTP request handling. neon +supports persistent connections, proxy servers, basic, digest and +Kerberos authentication, and has complete SSL support. + +%package devel +Summary: Static libraries and C header files for the neon library. +Group: Development/Libraries +Requires: neon = %{version}, openssl-devel, zlib-devel +Conflicts: subversion-devel < 0.22.2-4 + +%description devel +The development library for the C language HTTP and WebDAV client library. + +%prep +%setup -q +%patch0 -p1 -b .config + +%build +export CFLAGS="-Wall $RPM_OPT_FLAGS" +%configure --with-ssl --with-expat --enable-shared +make %{?_smp_mflags} + +%install +rm -rf $RPM_BUILD_ROOT +%makeinstall + +# test suite uses port 7777 +%ifnarch ppc s390 +%check +make %{?_smp_mflags} check +%endif + +%clean +rm -rf $RPM_BUILD_ROOT + +%post -p /sbin/ldconfig + +%postun -p /sbin/ldconfig + +%files +%defattr(-,root,root) +%doc AUTHORS BUGS TODO ChangeLog src/COPYING.LIB NEWS README THANKS +%{_libdir}/*.so.* + +%files devel +%defattr(-,root,root) +%{_bindir}/* +%{_includedir}/* +%{_libdir}/pkgconfig/neon.pc +%doc doc/html +%{_mandir}/man1/* +%{_mandir}/man3/* +%{_libdir}/*.a +%{_libdir}/*.la +%{_libdir}/*.so + +%changelog +* Wed May 19 2004 Joe Orton 0.24.6-1 +- update to 0.24.6 + +* Wed Apr 14 2004 Joe Orton 0.24.5-2 +- rebuild + +* Wed Apr 14 2004 Joe Orton 0.24.5-1 +- update to 0.24.5 for CVE CAN-2004-0179 fix + +* Thu Mar 25 2004 Joe Orton 0.24.4-4 +- implement the Negotate auth scheme, and only over SSL + +* Tue Mar 02 2004 Elliot Lee +- rebuilt + +* Wed Feb 25 2004 Joe Orton 0.24.4-3 +- use BuildRequires not BuildPrereq, drop autoconf, libtool; + -devel requires {openssl,zlib}-devel (#116744) + +* Fri Feb 13 2004 Elliot Lee 0.24.4-2 +- rebuilt + +* Mon Feb 9 2004 Joe Orton 0.24.4-1 +- update to 0.24.4 + +* Thu Oct 9 2003 Joe Orton 0.24.3-1 +- update to 0.24.3 + +* Wed Sep 24 2003 Joe Orton 0.24.2-1 +- update to 0.24.2 + +* Tue Jul 22 2003 Nalin Dahyabhai 0.23.9-7 +- rebuild + +* Tue Jun 24 2003 Joe Orton 0.23.9-6 +- never print libdir in --libs output + +* Wed Jun 04 2003 Elliot Lee +- rebuilt + +* Tue Jun 3 2003 Joe Orton 0.23.9-4 +- don't regenerate docs; limit conflict with subversion + +* Wed May 28 2003 Jeff Johnson 0.23.9-3 +- build. + +* Sat May 24 2003 Florian La Roche +- add ldconfig to post/postun + +* Tue May 20 2003 Jeff Johnson 0.23.9-2 +- force expat, include neon-config, for subversion build. +- do "make check" (but ignore failure for now) + +* Mon May 19 2003 Jeff Johnson 0.23.9-1 +- upgrade to 0.23.9. +- avoid xmlto breakage generating man pages for now. + +* Mon Nov 11 2002 Jeff Johnson 0.23.5-2 +- avoid subversion-devel until libxml2 vs. expat is resolved. + +* Sat Nov 9 2002 Jeff Johnson 0.23.5-1 +- Create. From svn at tinysofa.org Thu Jul 1 15:39:40 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:39:40 +1000 (EST) Subject: [tinysofa-svn] r2628 - in tinysofa/snapshot: . perl-HTML-Parser perl-HTML-Parser/current perl-HTML-Parser/current/sources perl-HTML-Parser/current/specs Message-ID: <20040701153940.84EF14E8180@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:39:40 +1000 (Fri, 02 Jul 2004) New Revision: 2628 Added: tinysofa/snapshot/perl-HTML-Parser/ tinysofa/snapshot/perl-HTML-Parser/current/ tinysofa/snapshot/perl-HTML-Parser/current/sources/ tinysofa/snapshot/perl-HTML-Parser/current/sources/HTML-Parser-3.35.tar.gz tinysofa/snapshot/perl-HTML-Parser/current/specs/ tinysofa/snapshot/perl-HTML-Parser/current/specs/perl-HTML-Parser.spec Log: - Add perl-HTML-Parser to snapshot from 2.0. Added: tinysofa/snapshot/perl-HTML-Parser/current/sources/HTML-Parser-3.35.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/perl-HTML-Parser/current/sources/HTML-Parser-3.35.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/perl-HTML-Parser/current/specs/perl-HTML-Parser.spec =================================================================== --- tinysofa/snapshot/perl-HTML-Parser/current/specs/perl-HTML-Parser.spec 2004-07-01 15:39:39 UTC (rev 2627) +++ tinysofa/snapshot/perl-HTML-Parser/current/specs/perl-HTML-Parser.spec 2004-07-01 15:39:40 UTC (rev 2628) @@ -0,0 +1,146 @@ +%define _use_internal_dependency_generator 0 + +%define name perl-HTML-Parser +%define real_name HTML-Parser + +Summary: A Perl module for parsing HTML. +Name: %{name} +Version: 3.35 +Release: 5ts +License: GPL or Artistic +Group: System Environment/Libraries +Source: ftp://ftp.cpan.org/pub/perl/CPAN/modules/by-module/HTML/%{real_name}-%{version}.tar.gz +Url: http://search.cpan.org/search?query=HTML%3A%3AParser +BuildRoot: %{_tmppath}/%{name}-%{version}-root +Requires: perl >= 5.6.0, perl-HTML-Tagset >= 3.03 +BuildRequires: perl >= 5.6.0, perl-HTML-Tagset >= 3.03 + +%description +The HTML-Parser module for perl to parse and extract information from +HTML documents, including the HTML::Entities, HTML::HeadParser, +HTML::LinkExtor, HTML::PullParser, and HTML::TokeParser modules. + +%prep +%setup -q -n %{real_name}-%{version} + +%build +CFLAGS="$RPM_OPT_FLAGS" perl Makefile.PL PREFIX=$RPM_BUILD_ROOT/usr INSTALLDIRS=vendor < /dev/null +make +make test + +%install +rm -rf $RPM_BUILD_ROOT +make install + +[ -x /usr/lib/rpm/brp-compress ] && /usr/lib/rpm/brp-compress + +find $RPM_BUILD_ROOT \( -name perllocal.pod -o -name .packlist \) -exec rm -v {} \; + +find $RPM_BUILD_ROOT/usr -type f -print | + sed "s@^$RPM_BUILD_ROOT@@g" | + grep -v perllocal.pod | + grep -v "\.packlist" > perl-HTML-Parser-%{version}-filelist +if [ "$(cat perl-HTML-Parser-%{version}-filelist)X" = "X" ] ; then + echo "ERROR: EMPTY FILE LIST" + exit -1 +fi + +%clean +rm -rf $RPM_BUILD_ROOT + +%files -f perl-HTML-Parser-%{version}-filelist +%defattr(-,root,root) +%dir %{_libdir}/perl5/vendor_perl/%(perl -MConfig -le 'print "$Config{version}/$Config{archname}"')/HTML +%dir %{_libdir}/perl5/vendor_perl/%(perl -MConfig -le 'print "$Config{version}/$Config{archname}"')/auto/HTML + + +%changelog +* Wed Mar 17 2004 Chip Turner 3.35-2 +- rebuild for fc1 update + +* Tue Mar 02 2004 Elliot Lee +- rebuilt + +* Fri Feb 13 2004 Chip Turner 3.35-1 +- update to 3.35 + +* Thu Jun 05 2003 Elliot Lee +- rebuilt + +* Tue Aug 6 2002 Chip Turner +- automated release bump and build + +* Tue Jun 4 2002 Chip Turner +- properly claim directories owned by package so they are removed when package is removed + +* Mon Jun 3 2002 Chip Turner +- fix for Makefile.PL sometimes prompting for input + +* Wed Mar 27 2002 Chip Turner +- update to 3.26, move to vendor_perl + +* Wed Jan 09 2002 Tim Powers +- automated rebuild + +* Thu Jul 18 2001 Crutcher Dunnavant 3.25-2 +- imported from mandrake. tweaked man path. + +* Tue Jul 03 2001 Fran?ois Pons 3.25-1mdk +- 3.25. + +* Wed Jun 20 2001 Christian Belisle 3.18-3mdk +- Fixed distribution tag. +- Updated Requires. +- Added an option to %makeinstall. + +* Sun Jun 17 2001 Geoffrey Lee 3.18-2mdk +- Rebuild against the latest perl. + +* Tue Feb 27 2001 Fran?ois Pons 3.18-1mdk +- 3.18. + +* Tue Jan 30 2001 Fran?ois Pons 3.15-1mdk +- 3.15. + +* Tue Dec 05 2000 Fran?ois Pons 3.14-1mdk +- 3.14. + +* Thu Oct 12 2000 Fran?ois Pons 3.13-1mdk +- 3.13. + +* Tue Aug 29 2000 Fran?ois Pons 3.11-1mdk +- 3.11. + +* Thu Aug 03 2000 Fran?ois Pons 3.10-2mdk +- macroszifications. +- add doc. + +* Tue Jul 18 2000 Fran?ois Pons 3.10-1mdk +- removed perllocal.pod from files. +- 3.10. + +* Tue Jun 27 2000 Jean-Michel Dault 3.08-1mdk +- update to 3.08 + +* Wed May 17 2000 David BAUDENS 3.05-4mdk +- Fix build for i486 +- Use %%{_tmppath} for BuildRoot + +* Fri Mar 31 2000 Pixel 3.05-3mdk +- rebuild, new group, cleanup + +* Tue Feb 29 2000 Jean-Michel Dault 3.0.5-1mdk +- upgrade to 3.05 + +* Mon Jan 3 2000 Jean-Michel Dault +- final cleanup for Mandrake 7 + +* Thu Dec 30 1999 Jean-Michel Dault +-updated to 3.02 + +* Sun Aug 29 1999 Jean-Michel Dault +- bzip2'd sources +- updated to 2.23 + +* Tue May 11 1999 root +- Spec file was autogenerated. From svn at tinysofa.org Thu Jul 1 15:39:49 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:39:49 +1000 (EST) Subject: [tinysofa-svn] r2635 - in tinysofa/snapshot: . perl-libwww-perl perl-libwww-perl/current perl-libwww-perl/current/sources perl-libwww-perl/current/specs Message-ID: <20040701153949.BC3F54E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:39:49 +1000 (Fri, 02 Jul 2004) New Revision: 2635 Added: tinysofa/snapshot/perl-libwww-perl/ tinysofa/snapshot/perl-libwww-perl/current/ tinysofa/snapshot/perl-libwww-perl/current/sources/ tinysofa/snapshot/perl-libwww-perl/current/sources/filter-depends.sh tinysofa/snapshot/perl-libwww-perl/current/sources/libwww-perl-5.79.tar.gz tinysofa/snapshot/perl-libwww-perl/current/specs/ tinysofa/snapshot/perl-libwww-perl/current/specs/perl-libwww-perl.spec Log: - Add perl-libwww-perl to snapshot from 2.0. Added: tinysofa/snapshot/perl-libwww-perl/current/sources/filter-depends.sh =================================================================== --- tinysofa/snapshot/perl-libwww-perl/current/sources/filter-depends.sh 2004-07-01 15:39:48 UTC (rev 2634) +++ tinysofa/snapshot/perl-libwww-perl/current/sources/filter-depends.sh 2004-07-01 15:39:49 UTC (rev 2635) @@ -0,0 +1,3 @@ +#!/bin/sh + +/usr/lib/rpm/find-requires.perl $* | grep -v HTTP::GHTTP | grep -v Win32 | grep -v NTLM Property changes on: tinysofa/snapshot/perl-libwww-perl/current/sources/filter-depends.sh ___________________________________________________________________ Name: svn:executable + * Added: tinysofa/snapshot/perl-libwww-perl/current/sources/libwww-perl-5.79.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/perl-libwww-perl/current/sources/libwww-perl-5.79.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/perl-libwww-perl/current/specs/perl-libwww-perl.spec =================================================================== --- tinysofa/snapshot/perl-libwww-perl/current/specs/perl-libwww-perl.spec 2004-07-01 15:39:48 UTC (rev 2634) +++ tinysofa/snapshot/perl-libwww-perl/current/specs/perl-libwww-perl.spec 2004-07-01 15:39:49 UTC (rev 2635) @@ -0,0 +1,90 @@ +%define _use_internal_dependency_generator 0 + +Summary: A Perl interface to the World-Wide Web. +Name: perl-libwww-perl +Version: 5.79 +Release: 1ts +License: distributable +Group: Applications/CPAN +Source0: libwww-perl-%{version}.tar.gz +Source10: filter-depends.sh +Url: http://search.cpan.org/search?query=libwww&mode=all +BuildRoot: %{_tmppath}/%{name}-%{version}-root +BuildRequires: perl >= 0:5.00503 +Requires: perl >= 0:5.00503 +Requires: perl(URI) perl(Digest::MD5) +Requires: perl(HTML::Parser) +Requires: perl(HTML::Entities) +BuildRequires: perl(MIME::Base64) +BuildRequires: perl(HTML::Entities) +BuildArch: noarch + +%description +The libwww-perl collection is a set of Perl modules which provides a +simple and consistent application programming interface to the +World-Wide Web. The main focus of the library is to provide classes +and functions that allow you to write WWW clients. The library also +contain modules that are of more general use and even classes that +help you implement simple HTTP servers. + + +# Provide perl-specific find-{provides,requires}. +%define __find_provides /usr/lib/rpm/find-provides.perl +%define __find_requires %{SOURCE10} + +%prep +%setup -q -n libwww-perl-%{version} + +%build +CFLAGS="$RPM_OPT_FLAGS" perl Makefile.PL INST_EXE=$RPM_BUILD_ROOT/usr/bin PREFIX=$RPM_BUILD_ROOT/usr INSTALLDIRS=vendor < /dev/null +make + +%clean +rm -rf $RPM_BUILD_ROOT + +%install +rm -rf $RPM_BUILD_ROOT +make install + +[ -x /usr/lib/rpm/brp-compress ] && /usr/lib/rpm/brp-compress + +find $RPM_BUILD_ROOT \( -name perllocal.pod -o -name .packlist \) -exec rm -v {} \; + +find $RPM_BUILD_ROOT/usr -type f -print | + sed "s@^$RPM_BUILD_ROOT@@g" | + grep -v perllocal.pod | + grep -v "\.packlist" > libwww-perl-%{version}-filelist +if [ "$(cat libwww-perl-%{version}-filelist)X" = "X" ] ; then + echo "ERROR: EMPTY FILE LIST" + exit -1 +fi + +%files -f libwww-perl-%{version}-filelist +%defattr(-,root,root) +%dir /usr/lib/perl5/vendor_perl/%(perl -MConfig -e 'print $Config{version}')/LWP +%dir /usr/lib/perl5/vendor_perl/%(perl -MConfig -e 'print $Config{version}')/Net +%dir /usr/lib/perl5/vendor_perl/%(perl -MConfig -e 'print $Config{version}')/WWW +%dir /usr/lib/perl5/vendor_perl/%(perl -MConfig -e 'print $Config{version}')/WWW/RobotRules +%dir /usr/lib/perl5/vendor_perl/%(perl -MConfig -e 'print $Config{version}')/File +%dir /usr/lib/perl5/vendor_perl/%(perl -MConfig -e 'print $Config{version}')/HTML +%dir /usr/lib/perl5/vendor_perl/%(perl -MConfig -e 'print $Config{version}')/HTTP + + +%changelog +* Fri Feb 13 2004 Chip Turner 5.76-1 +- update to 5.76 + +* Tue Aug 6 2002 Chip Turner +- automated release bump and build + +* Tue Jul 16 2002 Chip Turner +- added missing Requires on perl(HTML::Entities) + +* Fri Mar 29 2002 Chip Turner +- added Requires: for perl-URI and perl-Digest-MD5 + +* Wed Jan 09 2002 Tim Powers +- automated rebuild + +* Fri Dec 7 2001 root +- Spec file was autogenerated. From svn at tinysofa.org Thu Jul 1 15:39:46 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:39:46 +1000 (EST) Subject: [tinysofa-svn] r2632 - in tinysofa/snapshot: . perl-Time-HiRes perl-Time-HiRes/current perl-Time-HiRes/current/sources perl-Time-HiRes/current/specs Message-ID: <20040701153946.AEB704E817D@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:39:46 +1000 (Fri, 02 Jul 2004) New Revision: 2632 Added: tinysofa/snapshot/perl-Time-HiRes/ tinysofa/snapshot/perl-Time-HiRes/current/ tinysofa/snapshot/perl-Time-HiRes/current/sources/ tinysofa/snapshot/perl-Time-HiRes/current/sources/Time-HiRes-1.55.tar.gz tinysofa/snapshot/perl-Time-HiRes/current/specs/ tinysofa/snapshot/perl-Time-HiRes/current/specs/perl-Time-HiRes.spec Log: - Add perl-Time-HiRes to snapshot from 2.0. Added: tinysofa/snapshot/perl-Time-HiRes/current/sources/Time-HiRes-1.55.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/perl-Time-HiRes/current/sources/Time-HiRes-1.55.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/perl-Time-HiRes/current/specs/perl-Time-HiRes.spec =================================================================== --- tinysofa/snapshot/perl-Time-HiRes/current/specs/perl-Time-HiRes.spec 2004-07-01 15:39:45 UTC (rev 2631) +++ tinysofa/snapshot/perl-Time-HiRes/current/specs/perl-Time-HiRes.spec 2004-07-01 15:39:46 UTC (rev 2632) @@ -0,0 +1,75 @@ +%define _use_internal_dependency_generator 0 + +Summary: A Perl module for precise time measurements. +Name: perl-Time-HiRes +Version: 1.55 +Release: 2ts +License: distributable +Group: Applications/CPAN +Source0: Time-HiRes-%{version}.tar.gz +Url: http://search.cpan.org/search?query=Time%3A%3AHiRes +BuildRoot: %{_tmppath}/%{name}-%{version}-root +BuildRequires: perl >= 0:5.00503 +Requires: perl >= 0:5.00503 + +%description +The Time::HiRes module implements a Perl interface to the usleep, +ualarm, and gettimeofday system calls. This allows for very +precise timing measurements inside of Perl scripts. + +# Provide perl-specific find-{provides,requires}. +%define __find_provides /usr/lib/rpm/find-provides.perl +%define __find_requires /usr/lib/rpm/find-requires.perl + +%prep +%setup -q -n Time-HiRes-%{version} + +%build +CFLAGS="$RPM_OPT_FLAGS" perl Makefile.PL PREFIX=$RPM_BUILD_ROOT/usr INSTALLDIRS=vendor +make +make test + +%clean +rm -rf $RPM_BUILD_ROOT + +%install +rm -rf $RPM_BUILD_ROOT +make install + +[ -x /usr/lib/rpm/brp-compress ] && /usr/lib/rpm/brp-compress + +find $RPM_BUILD_ROOT \( -name perllocal.pod -o -name .packlist \) -exec rm -v {} \; + +find $RPM_BUILD_ROOT/usr -type f -print | + sed "s@^$RPM_BUILD_ROOT@@g" | + grep -v perllocal.pod | + grep -v "\.packlist" > Time-HiRes-%{version}-filelist +if [ "$(cat Time-HiRes-%{version}-filelist)X" = "X" ] ; then + echo "ERROR: EMPTY FILE LIST" + exit -1 +fi + +%files -f Time-HiRes-%{version}-filelist +%defattr(-,root,root) +%dir %{_libdir}/perl5/vendor_perl/%(perl -MConfig -le 'print "$Config{version}/$Config{archname}"')/Time +%dir %{_libdir}/perl5/vendor_perl/%(perl -MConfig -le 'print "$Config{version}/$Config{archname}"')/auto/Time + +%changelog +* Tue Mar 02 2004 Elliot Lee +- rebuilt + +* Thu Jun 05 2003 Elliot Lee +- rebuilt + +* Tue Dec 10 2002 Chip Turner +- update to latest version from CPAN + +* Wed Nov 20 2002 Chip Turner +- rebuild +- update from 1.20 to 1.38 + +* Tue Aug 6 2002 Chip Turner +- automated release bump and build + +* Mon Apr 30 2001 Chip Turner +- Spec file was autogenerated. From svn at tinysofa.org Thu Jul 1 15:39:44 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:39:44 +1000 (EST) Subject: [tinysofa-svn] r2630 - in tinysofa/snapshot: . perl-Net-DNS perl-Net-DNS/current perl-Net-DNS/current/sources perl-Net-DNS/current/specs Message-ID: <20040701153944.9973A4E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:39:44 +1000 (Fri, 02 Jul 2004) New Revision: 2630 Added: tinysofa/snapshot/perl-Net-DNS/ tinysofa/snapshot/perl-Net-DNS/current/ tinysofa/snapshot/perl-Net-DNS/current/sources/ tinysofa/snapshot/perl-Net-DNS/current/sources/Net-DNS-0.45.tar.gz tinysofa/snapshot/perl-Net-DNS/current/sources/filter-depends.sh tinysofa/snapshot/perl-Net-DNS/current/specs/ tinysofa/snapshot/perl-Net-DNS/current/specs/perl-Net-DNS.spec Log: - Add perl-Net-DNS to snapshot from 2.0. Added: tinysofa/snapshot/perl-Net-DNS/current/sources/Net-DNS-0.45.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/perl-Net-DNS/current/sources/Net-DNS-0.45.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/perl-Net-DNS/current/sources/filter-depends.sh =================================================================== --- tinysofa/snapshot/perl-Net-DNS/current/sources/filter-depends.sh 2004-07-01 15:39:41 UTC (rev 2629) +++ tinysofa/snapshot/perl-Net-DNS/current/sources/filter-depends.sh 2004-07-01 15:39:44 UTC (rev 2630) @@ -0,0 +1,3 @@ +#!/bin/sh + +/usr/lib/rpm/find-requires $* | grep -v Win32 Property changes on: tinysofa/snapshot/perl-Net-DNS/current/sources/filter-depends.sh ___________________________________________________________________ Name: svn:executable + * Added: tinysofa/snapshot/perl-Net-DNS/current/specs/perl-Net-DNS.spec =================================================================== --- tinysofa/snapshot/perl-Net-DNS/current/specs/perl-Net-DNS.spec 2004-07-01 15:39:41 UTC (rev 2629) +++ tinysofa/snapshot/perl-Net-DNS/current/specs/perl-Net-DNS.spec 2004-07-01 15:39:44 UTC (rev 2630) @@ -0,0 +1,90 @@ +%define _use_internal_dependency_generator 0 + +Name: perl-Net-DNS +Version: 0.45 +Release: 3ts +Summary: Net-DNS Perl module +License: distributable +Group: Development/Libraries +URL: http://search.cpan.org/search?mode=module&query=Net%3a%3aDNS +BuildRoot: %{_tmppath}/%{name}-%{version}-root +BuildRequires: perl >= 0:5.00503 +Source0: Net-DNS-%{version}.tar.gz +Source1: filter-depends.sh +BuildRequires: perl-Digest-HMAC + +%define __find_requires %{SOURCE1} + +%description +Net::DNS is a collection of Perl modules that act as a Domain Name +System (DNS) resolver. It allows the programmer to perform DNS queries +that are beyond the capabilities of gethostbyname and gethostbyaddr. + +The programmer should be somewhat familiar with the format of a DNS +packet and its various sections. See RFC 1035 or DNS and BIND (Albitz +& Liu) for details. + +%prep +%setup -q -n Net-DNS-%{version} + +%build +CFLAGS="$RPM_OPT_FLAGS" perl Makefile.PL PREFIX=$RPM_BUILD_ROOT/usr INSTALLDIRS=vendor < /dev/null +make +make test || : + +%clean +rm -rf $RPM_BUILD_ROOT +%install + +rm -rf $RPM_BUILD_ROOT +eval `perl '-V:installarchlib'` +mkdir -p $RPM_BUILD_ROOT/$installarchlib +make install + +[ -x /usr/lib/rpm/brp-compress ] && /usr/lib/rpm/brp-compress + +find $RPM_BUILD_ROOT \( -name perllocal.pod -o -name .packlist \) -exec rm -v {} \; + +find $RPM_BUILD_ROOT/usr -type f -print | \ + sed "s@^$RPM_BUILD_ROOT@@g" | \ + grep -v perllocal.pod | \ + grep -v "\.packlist" > Net-DNS-%{version}-filelist +if [ "$(cat Net-DNS-%{version}-filelist)X" = "X" ] ; then + echo "ERROR: EMPTY FILE LIST" + exit -1 +fi + +%files -f Net-DNS-%{version}-filelist +%defattr(-,root,root) + +%changelog +* Thu Apr 29 2004 Chip Turner 0.45-3 +- fix bug 122039 -- add filter-depends.sh to remove Win32 deps + +* Fri Apr 23 2004 Chip Turner 0.45-1 +- bump, no longer noarch + +* Fri Feb 13 2004 Chip Turner 0.45-1 +- update to 0.45 + +* Mon Oct 20 2003 Chip Turner 0.31-3.2 +- fix interactive build issue + +* Mon Jan 27 2003 Chip Turner +- version bump and rebuild + +* Tue Dec 10 2002 Chip Turner +- update to latest version from CPAN + +* Tue Aug 6 2002 Chip Turner +- automated release bump and build + +* Tue Aug 6 2002 Chip Turner +- update to 0.26 + +* Thu Jun 27 2002 Chip Turner +- description update + +* Sat Jun 15 2002 cturner at redhat.com +- Specfile autogenerated + From svn at tinysofa.org Thu Jul 1 15:39:47 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:39:47 +1000 (EST) Subject: [tinysofa-svn] r2633 - in tinysofa/snapshot: . perl-URI perl-URI/current perl-URI/current/sources perl-URI/current/specs Message-ID: <20040701153947.AF7D64E817E@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:39:47 +1000 (Fri, 02 Jul 2004) New Revision: 2633 Added: tinysofa/snapshot/perl-URI/ tinysofa/snapshot/perl-URI/current/ tinysofa/snapshot/perl-URI/current/sources/ tinysofa/snapshot/perl-URI/current/sources/URI-1.30.tar.gz tinysofa/snapshot/perl-URI/current/sources/filter-requires-perl-URI.sh tinysofa/snapshot/perl-URI/current/specs/ tinysofa/snapshot/perl-URI/current/specs/perl-URI.spec Log: - Add perl-URI to snapshot from 2.0. Added: tinysofa/snapshot/perl-URI/current/sources/URI-1.30.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/perl-URI/current/sources/URI-1.30.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/perl-URI/current/sources/filter-requires-perl-URI.sh =================================================================== --- tinysofa/snapshot/perl-URI/current/sources/filter-requires-perl-URI.sh 2004-07-01 15:39:46 UTC (rev 2632) +++ tinysofa/snapshot/perl-URI/current/sources/filter-requires-perl-URI.sh 2004-07-01 15:39:47 UTC (rev 2633) @@ -0,0 +1,3 @@ +#!/bin/sh + +/usr/lib/rpm/find-requires $* | grep -v 'perl(Business' Property changes on: tinysofa/snapshot/perl-URI/current/sources/filter-requires-perl-URI.sh ___________________________________________________________________ Name: svn:executable + * Added: tinysofa/snapshot/perl-URI/current/specs/perl-URI.spec =================================================================== --- tinysofa/snapshot/perl-URI/current/specs/perl-URI.spec 2004-07-01 15:39:46 UTC (rev 2632) +++ tinysofa/snapshot/perl-URI/current/specs/perl-URI.spec 2004-07-01 15:39:47 UTC (rev 2633) @@ -0,0 +1,75 @@ +%define _use_internal_dependency_generator 0 + +Summary: A Perl module implementing URI parsing and manipulation. +Name: perl-URI +Version: 1.30 +Release: 1ts +License: distributable +Group: Applications/CPAN +Source0: URI-%{version}.tar.gz +Source1: filter-requires-perl-URI.sh +Url: http://search.cpan.org/search?query=URI +BuildRoot: %{_tmppath}/%{name}-%{version}-root +BuildRequires: perl >= 0:5.00503 +BuildRequires: perl(MIME::Base64) +Requires: perl >= 0:5.00503 +Provides: perl-URI +BuildArch: noarch + +%description +This module implements the URI class. Objects of this class represent +"Uniform Resource Identifier references" as specified in RFC 2396 (and +updated by RFC 2732). + +%define __find_requires %{SOURCE1} + +%prep +%setup -q -n URI-%{version} + +%build +CFLAGS="$RPM_OPT_FLAGS" perl Makefile.PL PREFIX=$RPM_BUILD_ROOT/usr INSTALLDIRS=vendor +make +make test + +%clean +rm -rf $RPM_BUILD_ROOT + +%install +rm -rf $RPM_BUILD_ROOT +make install + +[ -x /usr/lib/rpm/brp-compress ] && /usr/lib/rpm/brp-compress + +find $RPM_BUILD_ROOT \( -name perllocal.pod -o -name .packlist \) -exec rm -v {} \; + +find $RPM_BUILD_ROOT/usr -type f -print | + sed "s@^$RPM_BUILD_ROOT@@g" | + grep -v perllocal.pod | + grep -v "\.packlist" > URI-%{version}-filelist +if [ "$(cat URI-%{version}-filelist)X" = "X" ] ; then + echo "ERROR: EMPTY FILE LIST" + exit -1 +fi + +%files -f URI-%{version}-filelist +%defattr(-,root,root) +%dir /usr/lib/perl5/vendor_perl/%(perl -MConfig -e 'print $Config{version}')/URI + +%changelog +* Fri Feb 13 2004 Chip Turner 1.30-1 +- update to 1.30 + +* Tue Aug 6 2002 Chip Turner +- automated release bump and build + +* Tue Aug 6 2002 Chip Turner +- update to 1.21 + +* Tue Jun 4 2002 Chip Turner +- properly claim directories owned by package so they are removed when package is removed + +* Wed Jan 09 2002 Tim Powers +- automated rebuild + +* Fri Dec 7 2001 root +- Spec file was autogenerated. From svn at tinysofa.org Thu Jul 1 15:40:16 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:40:16 +1000 (EST) Subject: [tinysofa-svn] r2648 - in tinysofa/snapshot: . rhpl rhpl/current rhpl/current/sources rhpl/current/specs Message-ID: <20040701154016.E01304E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:40:16 +1000 (Fri, 02 Jul 2004) New Revision: 2648 Added: tinysofa/snapshot/rhpl/ tinysofa/snapshot/rhpl/current/ tinysofa/snapshot/rhpl/current/sources/ tinysofa/snapshot/rhpl/current/sources/rhpl-0.145.tar.gz tinysofa/snapshot/rhpl/current/specs/ tinysofa/snapshot/rhpl/current/specs/rhpl.spec Log: - Add rhpl to snapshot from 2.0. Added: tinysofa/snapshot/rhpl/current/sources/rhpl-0.145.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/rhpl/current/sources/rhpl-0.145.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/rhpl/current/specs/rhpl.spec =================================================================== --- tinysofa/snapshot/rhpl/current/specs/rhpl.spec 2004-07-01 15:40:14 UTC (rev 2647) +++ tinysofa/snapshot/rhpl/current/specs/rhpl.spec 2004-07-01 15:40:16 UTC (rev 2648) @@ -0,0 +1,588 @@ +Summary: Library of python code used by programs in Red Hat Linux +Name: rhpl +Version: 0.145 +Release: 1ts +Source0: %{name}-%{version}.tar.gz +License: GPL +Group: System Environment/Libraries +BuildRoot: %{_tmppath}/%{name}-%{version}-root +BuildRequires: python-devel, gettext +%ifnarch s390 s390x +Requires: pyxf86config >= 0.3.2 +%endif + +%description +The rhpl package contains Python code used by programs in Red Hat Linux. + +%prep +%setup -q +make + +%build + +%install +rm -rf $RPM_BUILD_ROOT +make DESTDIR=${RPM_BUILD_ROOT} install + +%find_lang %name + +%clean +rm -rf $RPM_BUILD_ROOT + +%files -f %{name}.lang +%defattr(-,root,root) +%doc README ChangeLog +%{_libdir}/python?.?/site-packages/rhpl +%{_sbindir}/ddcprobe +%{_datadir}/rhpl + +%changelog +* Fri Jun 18 2004 Jeremy Katz - 0.145-1 +- improved lib64 detection, rebuild with gcc 3.4 + +* Wed May 5 2004 Jeremy Katz - 0.144-1 +- open cd device with O_NONBLOCK so eject ioctl works (#122524) + +* Tue Apr 20 2004 Brent Fox 0.143-1 +- Do not write out XkbRules line to config file, as it is unnecessary to hard + code the rules file, which has a built in default which should always + work. (#120858) + +* Fri Apr 16 2004 Jeremy Katz - 0.142-1 +- more XFree86->xorg + +* Thu Apr 15 2004 Jeremy Katz - 0.141-1 +- xserver.py: workaround libxf86config not writing out the monitor stuff + we tell it to (#120950) + +* Wed Apr 14 2004 Jeremy Katz - 0.140-1 +- translate.py: one more try at string encoding madness (#119391) + +* Tue Apr 13 2004 Jeremy Katz - 0.139-1 +- videocard.py: fixups for VESA handling on x86_64 +- videocard.py, xserver.py: XFree86 -> Xorg changes + +* Wed Mar 17 2004 Bill Nottingham 0.138-1 +- mouse.py cleanups + +* Tue Mar 16 2004 Bill Nottingham 0.135-1 +- remove old default keymap when writing config (#116852) + +* Tue Mar 9 2004 Brent Fox 0.134-1 +- user fr-latin9 for the X keymap too (bug #113672) + +* Tue Mar 9 2004 Jeremy Katz - 0.133-1 +- use vesa for unknown cards on x86_64 + +* Fri Mar 5 2004 Brent Fox 0.132-1 +- use fr-latin9 instead of fr-latin0 (bug #113672) + +* Thu Mar 4 2004 Jeremy Katz - 0.131-1 +- switch some default keyboard layouts (#117007) + +* Thu Mar 4 2004 Brent Fox 0.130-1 +- strip out refresh rate data (bug #117327) + +* Wed Mar 3 2004 Brent Fox 0.129-1 +- enable DRI extentions for all i386, x86_64, and ia64 systems (bug #115672) +- vmware doesn't do 24bpp (#117375) +- fix for savage + lcds (#117079) + +* Thu Feb 26 2004 Brent Fox 0.128-1 +- add some hooks to xhwstate.py to get PCI bus ID info + +* Fri Feb 20 2004 Brent Fox 0.127-2 +- correct a typo + +* Fri Feb 20 2004 Brent Fox 0.127-1 +- changes to mouse handling in xhwstate.py + +* Wed Feb 18 2004 Jeremy Katz 0.126-1 +- minor tweak for mouse stuff + +* Fri Feb 13 2004 Brent Fox 0.125.1-1 +- use hu_qwerty for Hungarian (101 key) (bug #114629) + +* Thu Jan 22 2004 Jeremy Katz 0.124.1-1 +- translate.py: minor tweaks + +* Tue Jan 20 2004 Jeremy Katz 0.124-1 +- translate.py: return UTF-8 encoded strings (#113202) + +* Thu Jan 8 2004 Brent Fox 0.123.1-1 +- add an entry for Korean keyboards (bug #112024) + +* Tue Jan 6 2004 Jeremy Katz +- mark keyboard model names as keyboard|name to make them differ + from language names (#84969) + +* Tue Dec 16 2003 Jeremy Katz +- use EISA if name doesn't exist in ddc data (#112281) + +* Fri Nov 14 2003 Jeremy Katz 0.122.2-1 +- more python2.3 + +* Sat Nov 8 2003 Jeremy Katz 0.122.1-1 +- more python 2.3 fixups + +* Thu Nov 6 2003 Jeremy Katz 0.122-1 +- python 2.3 + +* Tue Oct 21 2003 Jeremy Katz 0.121-1 +- don't try to use 24bpp on old hardware (#105713) + +* Thu Oct 16 2003 Brent Fox 0.120-1 +- mouse.py - add two entries for optical mice + +* Thu Oct 16 2003 Jeremy Katz 0.119-1 +- keyboard_models.py: fix greek keyboard layout (#100773) + +* Wed Oct 15 2003 Jeremy Katz 0.118-1 +- translate.py: assume UTF-8 if we can't figure out the encoding of a mofile + +* Thu Oct 8 2003 Michael Fulbright 0.117-1 +- xhwstate.py - dont write out video ram option to XF86Config + +* Thu Oct 2 2003 Brent Fox 0.116-1 +- videocard.py: added pci busID functions + +* Tue Sep 30 2003 Jeremy Katz 0.115-1 +- mouse.py: add new API and make sane to use for translation + +* Thu Sep 25 2003 Harald Hoyer 0.114-1 +- preserve comments in modules.conf #76640 + +* Tue Sep 23 2003 Michael Fulbright +- fix bug dealing with determining video modes supported by a monitor + +* Mon Sep 8 2003 Jeremy Katz +- use RPM_OPT_FLAGS (#103970) + +* Thu Sep 04 2003 Harald Hoyer 0.112-1 +- fixed ConfPAP.getfields() + +* Thu Sep 04 2003 Michael Fulbright 0.111-1 +- fixes for bugzilla #103353 + +* Tue Sep 02 2003 Michael Fulbright 0.111-1 +- fixes to X setup code + +* Fri Aug 29 2003 Harald Hoyer 0.110-1 +- removed memory leak + +* Wed Jul 16 2003 Jeremy Katz 0.110-1 +- add an interface for adding packages to groups + +* Mon Jul 14 2003 Jeremy Katz 0.109-1 +- multilib on ia64 + +* Wed Jul 09 2003 Harald Hoyer 0.108-3 +- rebuilt with all files updated from cvs + +* Tue Jul 8 2003 Jeremy Katz 0.108-1 +- comps.py: preserve xml doc/nodes +- translate.py: make it so we can use translations from update disks in + anaconda + +* Thu Jun 12 2003 Brent Fox 0.107-1 +- add a get_xconfig() method to xhwstate.py + +* Tue Jun 10 2003 Harald Hoyer 0.106-1 +- better regexp in Conf.py +- strip filename from subject + +* Fri Jun 6 2003 Jeremy Katz 0.105-1 +- more biarch fun + +* Wed Jun 4 2003 Jeremy Katz 0.104-1 +- add ppc64[ip]series + +* Wed Jun 4 2003 Jeremy Katz 0.103.1-1 +- arch.py tweaks + +* Fri May 30 2003 Jeremy Katz 0.103-1 +- comps.py extensions for biarch + +* Fri May 23 2003 Jeremy Katz 0.102.1-1 +- fix tyop + +* Fri May 23 2003 Jeremy Katz 0.102-1 +- add arch.py + +* Wed May 21 2003 Harald Hoyer 0.101.1-1 +- strip quotes from PAP/CHAP server also +- Conf.py, cope with lines at the end of the file, that have no newline +- speedup some things + +* Wed May 07 2003 Michael Fulbright 0.100.1-1 +- fixed simpleconfig.py and how it uppercases keys + +* Tue Apr 29 2003 Harald Hoyer 0.99.1-1 +- genClass and ethtool updates + +* Thu Apr 24 2003 Brent Fox 0.98.1-2 +- strip an invalid char from monitor name (bug #87588) + +* Wed Apr 23 2003 Jeremy Katz 0.98.1-1 +- revert broken part of pseries fb change + +* Mon Apr 21 2003 Jeremy Katz 0.98-1 +- handle headless case better + +* Fri Apr 18 2003 Jeremy Katz 0.97-1 +- fixes so that framebuffer can work for use on ppc machines + +* Thu Apr 3 2003 Brent Fox 0.96-2 +- update the list of dri drivers from mharris + +* Thu Apr 3 2003 Brent Fox 0.96-1 +- add ati and i810 to dri supported list in xhwstate.py + +* Wed Apr 2 2003 Brent Fox 0.95-1 +- allow dialog size to be passed into firstboot_gui_window + +* Thu Feb 27 2003 Bill Nottingham 0.94-1 +- make py_bind_textdomain_codeset not segfault on ia64 (#85334) + +* Mon Feb 24 2003 Jeremy Katz 0.93-1 +- mouse.py (mouseWindow): try to ensure we have a locale that + we can do linedrawing chars for (#84908) + +* Wed Feb 12 2003 Brent Fox 0.92-1 +- add grp_led:scroll to all lines with XkbOptions (bug #82096) + +* Tue Feb 11 2003 Brent Fox 0.91-1 +- convert all toggles to grp:shift_toggle (bug #79287) + +* Fri Feb 7 2003 Brent Fox 0.90-1 +- add grp_led:scroll to all Russian keyboards + +* Fri Feb 7 2003 Brent Fox 0.89-1 +- add translate.textdomain('rhpl') to fix bug #69760 + +* Thu Feb 6 2003 Matt Wilson 0.88-1 +- only reset the mouse if you have to + +* Thu Feb 6 2003 Brent Fox 0.87-1 +- load additional us keymap for all ru keyboards in keyboard_models.py +- make sure the kbd option gets set in keyboard.py + +* Thu Feb 6 2003 Brent Fox 0.86-1 +- use sv-latin1 for swedish keyboards (bug #80508) + +* Wed Feb 5 2003 Matt Wilson 0.85-1 +- autodetect ps/2 wheel mice (#81902) + +* Wed Feb 5 2003 Brent Fox 0.84-1 +- if there are no display Modes in the XF86Config file, create one and default to 800x600 (bug #83314) + +* Tue Feb 04 2003 Harald Hoyer 0.83-1 +- ConfPAP fix for quotation + +* Fri Jan 31 2003 Jeremy Katz 0.81-2 +- fix typo + +* Fri Jan 31 2003 Adrian Likins +- added get_ipaddr, get_netmask, get_broadcast + to ethtool module + +* Fri Jan 31 2003 Harald Hoyer +- added some BuildRequires + +* Thu Jan 30 2003 Jeremy Katz 0.80-1 +- default non-i386 arches to 8 megs of videoram + +* Wed Jan 22 2003 Brent Fox 0.79-1 +- add us keymap and XkbOptions to non-latin keymaps in keyboard_models.py +- change keyboard.py to handle the XkbOptions field + +* Mon Jan 20 2003 Michael Fulbright 0.78-1 +- improved code for LCD guessing + +* Fri Jan 17 2003 Michael Fulbright 0.77-1 +- added code to xserver.py to guess LCD size using guesslcd.py + +* Fri Jan 17 2003 Brent Fox 0.76-1 +- changes to firstbootGuiWindow.py for new firstboot look + +* Tue Jan 14 2003 Michal Fulbright 0.75-1 +- fix xserver.py to include keyboard import + +* Fri Jan 10 2003 Brent Fox 0.74-2 +- change se-latin1 kbd to se-fi-lat6 according to bug #80508 + +* Fri Jan 3 2003 Brent Fox 0.74-1 +- default to pc105 for most keyboards + +* Thu Jan 2 2003 Jeremy Katz 0.73-3 +- make the translate.py change less noisy + +* Thu Jan 2 2003 Jeremy Katz 0.73-2 +- typo fix + +* Wed Jan 1 2003 Jeremy Katz 0.73-1 +- discid.py: add readFromBuffer + +* Sun Dec 29 2002 Jeremy Katz +- translate.py: if we fail, at least gracefully fall back instead of + causing a traceback (#76104) + +* Thu Dec 19 2002 Harald Hoyer 0.72-1 +- added exception.py + +* Tue Dec 17 2002 Jeremy Katz 0.71-2 +- fix silly typo + +* Tue Dec 17 2002 Jeremy Katz 0.71-1 +- simpleconfig.py: gracefully handle non-existent config files + +* Mon Dec 16 2002 Harald Hoyer 0.70-1 +- _setParent() in GenClass::__setitem__ + +* Fri Dec 13 2002 Jeremy Katz 0.69-1 +- only probe for the mouse once to fix mouse probing problems +- make keyboard names more consistent (#79354) + +* Thu Dec 12 2002 Harald Hoyer 0.68-1 +- genClass: slicing of anonymous lists +- executil: dup2 more output redirectors + +* Tue Nov 26 2002 Michael Fulbright 0.67-1 +- Fixed issue related to not defaulting to sane monitor values if monitor + was not probed. + +* Tue Nov 26 2002 Phil Knirsch 0.66-1 +- Fixed -fpic handling for s390 and s390x. + +* Thu Nov 21 2002 Michael Fulbright 0.65-1 +- added some code to handle the no mouse setup better + +* Thu Nov 21 2002 Florian La Roche +- do not require pyxf86config for mainframe + +* Tue Nov 19 2002 Michael Fulbright 0.64-1 +- Added new xserver.py which has code to help get X up and running from scratch + +* Tue Nov 19 2002 Jeremy Katz 0.63-2 +- rebuild for all arches + +* Fri Nov 15 2002 Brent Fox 0.63-1 +- Added Latin American (la-latin1) keyboard + +* Thu Nov 14 2002 Harald Hoyer 0.62-1 +- removed Alchemist dependency from genClass +- executil extended + +* Tue Nov 12 2002 Michael Fulbright 0.61-1 +- big changes as we moved alot of code from redhat-config-xfree86 into xhwstate.py + +* Tue Nov 5 2002 Jeremy Katz 0.59-1 +- access Cards database in /usr/share/hwdata instead of + /usr/X11R6/lib/X11 (#73899) +- excludearch x86_64 until python is fixed + +* Fri Nov 1 2002 Jeremy Katz 0.58-1 +- add macedonian keyboard (#76902) +- find loadkeys for anaconda (#75329) + +* Thu Oct 31 2002 Brent Fox 0.57-1 +- Mark keyboard names for translations + +* Mon Oct 21 2002 Brent Fox 0.56-1 +- Use cz_qwerty keymap for Czech qwerty keyboards + +* Thu Oct 10 2002 Jeremy Katz 0.55-2 +- rebuild so that we actually get object files for the correct architectures + +* Wed Oct 9 2002 Dan Walsh 0.55-1 +- removed chmod from ConfSMB.py file protection should remain the same + +* Tue Oct 8 2002 Harald Hoyer 0.54-1 +- removed fd/socket leaking + +* Tue Oct 08 2002 Phil Knirsch 0.53-2 +- Integreated Karsten Hopp's 64bit bigendian patch for s390x. + +* Fri Oct 4 2002 Brent Fox 0.53-1 +- Allow window icon to be passed into stand_alone in firstboot_gui_window.py + +* Thu Oct 3 2002 Jeremy Katz 0.52-2 +- fixup installation into %%{_libdir}/python2.2/ + +* Thu Oct 3 2002 Jeremy Katz 0.52-1 +- iconvmodule.c: PyObject_asReadBuffer() expects *int while iconv() + expects size_t. + +* Thu Aug 29 2002 Jeremy Katz 0.51-1 +- src/keyboard_models.py: fix romanian console keymap (#72952) + +* Wed Aug 28 2002 Jeremy Katz 0.50-1 +- diskutil.py: update /etc/mtab + +* Fri Aug 23 2002 Michael Fulbright 0.49-1 +- videocard.py: Use unsupported VGA compatible card entry if card unknown + +* Thu Aug 22 2002 Brent Fox 0.48-1 +- translate.py: add ability to set codeset for textdomains not pulled in by us + +* Thu Aug 22 2002 Brent Fox 0.47-1 +- fix another typo in translate.py + +* Thu Aug 22 2002 Jeremy Katz 0.46-1 +- fix a typo in translate.py + +* Thu Aug 22 2002 Jeremy Katz 0.45-1 +- minor mouse fixups (#70289, #71893) + +* Wed Aug 21 2002 Michael Fulbright 0.44-1 +- added sanity check to ddcprobe'd range values + +* Tue Aug 20 2002 Harald Hoyer 0.43-1 +- fixed genClass.py:toContext() +- ValueError -> TypeError in checkType + +* Fri Aug 16 2002 Brent Fox 0.42-1 +- Mark window title for translations in firstboot_gui_window + +* Fri Aug 16 2002 Jeremy Katz 0.41-1 +- translate.py fixes +- "None - None" is back, but as "No mouse" + +* Thu Aug 15 2002 Jeremy Katz 0.40-1 +- comps.py: handle translated category names + +* Wed Aug 14 2002 Harald Hoyer +- added iwconfig-support to ethtool + +* Wed Aug 14 2002 Brent Fox 0.37-1 +- Call destroy() when a firstboot window exits + +* Mon Aug 12 2002 Jeremy Katz 0.36-1 +- add generic wheel mouse types +- add bad hack to handle packages which should only be installed + if another package is installed + +* Sun Aug 11 2002 Brent Fox 0.35-1 +- Create US International keymap line for bug 71105 + +* Sun Aug 11 2002 Brent Fox 0.34-2 +- Fix typo that I made with the last build + +* Sun Aug 11 2002 Brent Fox 0.34-1 +- Fix Brazilian abnt2 keyboard map for bug 70351 + +* Tue Aug 6 2002 Michael Fulbright +- added sanity checks for sync rates + +* Fri Aug 2 2002 Jeremy Katz +- keyboard_models.py: be-latin2 isn't a valid keymap + +* Wed Jul 31 2002 Jeremy Katz 0.32-1 +- add losetup, unlosetup, and getUnusedLoop to diskutil + +* Tue Jul 30 2002 Brent Fox 0.31-1 +- remove some dead code +- make the font big for firstboot_gui_window titles + +* Thu Jul 25 2002 Jeremy Katz 0.30-1 +- mouse.py: don't enable emulate three buttons on the fly (#68129) + +* Thu Jul 25 2002 Jeremy Katz 0.29-1 +- translate.py: set up default langs based on environment + +* Wed Jul 24 2002 Jonathan Blandford 0.28-1 +* add GenericError.py + +* Wed Jul 24 2002 Jeremy Katz 0.27-2 +- actually install _diskutil.so + +* Wed Jul 24 2002 Jeremy Katz 0.27-1 +- diskutil.py, diskutil.c: add some simple disk utility methods (mount, + umount, sync, ejectCdrom) + +* Mon Jul 22 2002 Jeremy Katz 0.26-1 +- comps.py: add support for reading group hierarchy + +* Thu Jul 17 2002 Brent Fox 0.25-1 +- Make firstboot windows use GtkDialog instead of GtkWindow + +* Wed Jul 17 2002 Brent Fox 0.24-3 +- Change Poland keyboard to Polish. Bug #68520 + +* Wed Jul 17 2002 Michael Fulbright 0.24-2 +- minor typo fix + +* Wed Jul 17 2002 Michael Fulbright 0.24-1 +- executil.py: add getfd() function + +* Tue Jul 16 2002 Jeremy Katz 0.23-1 +- comps.py: add metapkg support + +* Tue Jul 16 2002 Brent Fox 0.22-2 +- Call loadkeys if the binary exists when changing keymaps + +* Mon Jul 15 2002 Jeremy Katz 0.21-1 +- fix jp106 entry in keyboard_models +- add method to get list of supported keyboard maps + +* Sat Jul 13 2002 Brent Fox 0.20-1 +- Small change in firstboot_gui_window.py to center popup windows + +* Wed Jul 10 2002 Brent Fox 0.19-1 +- Added a Greek keyboard to keyboard_models.py + +* Wed Jul 10 2002 Alexander Larsson 0.18-1 +- Fixed bug in monitor resoultion support code + +* Mon Jul 1 2002 Harald Hoyer 0.16-1 +- updated Conf*.py +- updated genClass +- added ethtool + +* Fri Jun 28 2002 Jeremy Katz 0.15-1 +- comps.py: use libxml2 for xml parsing instead of expat + +* Fri Jun 28 2002 Jeremy Katz 0.14-1 +- only setxkbmap if $DISPLAY is set + +* Thu Jun 27 2002 Jeremy Katz 0.13-1 +- add parser for new comps file + +* Wed Jun 26 2002 Michael Fulbright 0.12-1 +- Fix bug of uninitialized data in Mouse class + +* Tue Jun 25 2002 Brent Fox 0.11-3 +- Allow a window title to be passed in + +* Wed Jun 19 2002 Brent Fox 0.9-4 +- Fixed line for German keyboards in keyboard_models.py + +* Tue Jun 18 2002 Brent Fox 0.9-3 +- Remove cancel button from firstboot_gui_window + +* Tue Jun 18 2002 Brent Fox 0.9-2 +- Provide a way to pass keymap name back to firstboot +- Fix error in Slovakian keymap line in keyboard_models.py + +* Wed Jun 12 2002 Jeremy Katz +- use cz-lat2 for Czechoslovakian keybaord map (#66354) + +* Tue Jun 04 2002 Michael Fulbright +- fixed bug referencing ddcDevice and videoram in card. + +* Tue May 28 2002 Jeremy Katz +- removed kbd.py, added keyboard.py + +* Fri May 24 2002 Michael Fulbright +- Added kbd.py + +* Thu May 23 2002 Alex Larsson +- Added /usr/share/rhpl to files list + +* Thu May 23 2002 Michael Fulbright +- added log.py, videocard.py, mouse.py, monitor.py, simpleconfig.py + +* Wed May 22 2002 Jeremy Katz +- Initial build. + + From svn at tinysofa.org Thu Jul 1 15:40:18 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:40:18 +1000 (EST) Subject: [tinysofa-svn] r2649 - in tinysofa/snapshot: . schedutils schedutils/current schedutils/current/sources schedutils/current/specs Message-ID: <20040701154018.913464E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:40:18 +1000 (Fri, 02 Jul 2004) New Revision: 2649 Added: tinysofa/snapshot/schedutils/ tinysofa/snapshot/schedutils/current/ tinysofa/snapshot/schedutils/current/sources/ tinysofa/snapshot/schedutils/current/sources/schedutils-1.3.0-amd64.patch tinysofa/snapshot/schedutils/current/sources/schedutils-1.3.0-ia64.patch tinysofa/snapshot/schedutils/current/sources/schedutils-1.3.0.tar.gz tinysofa/snapshot/schedutils/current/specs/ tinysofa/snapshot/schedutils/current/specs/schedutils.spec Log: - Add schedutils to snapshot from 2.0. Added: tinysofa/snapshot/schedutils/current/sources/schedutils-1.3.0-amd64.patch =================================================================== --- tinysofa/snapshot/schedutils/current/sources/schedutils-1.3.0-amd64.patch 2004-07-01 15:40:16 UTC (rev 2648) +++ tinysofa/snapshot/schedutils/current/sources/schedutils-1.3.0-amd64.patch 2004-07-01 15:40:18 UTC (rev 2649) @@ -0,0 +1,14 @@ +--- schedutils-1.3.0/include/taskset.h.orig 2004-01-15 15:40:55.000000000 -0500 ++++ schedutils-1.3.0/include/taskset.h 2004-01-15 15:41:05.000000000 -0500 +@@ -45,11 +45,6 @@ extern int sched_getaffinity(pid_t, unsi + #define __NR_sched_getaffinity 161 + #endif + +-#if defined(__x86_64__) +-#define __NR_sched_setaffinity 241 +-#define __NR_sched_getaffinity 242 +-#endif +- + #if defined(__ia64__) + inline int sched_setaffinity(pid_t pid, unsigned int len, + unsigned long * user_mask_ptr) Added: tinysofa/snapshot/schedutils/current/sources/schedutils-1.3.0-ia64.patch =================================================================== --- tinysofa/snapshot/schedutils/current/sources/schedutils-1.3.0-ia64.patch 2004-07-01 15:40:16 UTC (rev 2648) +++ tinysofa/snapshot/schedutils/current/sources/schedutils-1.3.0-ia64.patch 2004-07-01 15:40:18 UTC (rev 2649) @@ -0,0 +1,27 @@ +--- schedutils-1.3.0/include/taskset.h.ia64 2003-08-08 11:20:19.000000000 -0400 ++++ schedutils-1.3.0/include/taskset.h 2003-08-08 11:19:30.000000000 -0400 +@@ -50,10 +50,24 @@ extern int sched_getaffinity(pid_t, unsi + #define __NR_sched_getaffinity 242 + #endif + ++#if defined(__ia64__) ++inline int sched_setaffinity(pid_t pid, unsigned int len, ++ unsigned long * user_mask_ptr) ++{ ++ return syscall(__NR_sched_setaffinity, pid, len, user_mask_ptr); ++} ++ ++inline int sched_getaffinity(pid_t pid, unsigned int len, ++ unsigned long * user_mask_ptr) ++{ ++ return syscall(__NR_sched_getaffinity, pid, len, user_mask_ptr); ++} ++#else + _syscall3(int, sched_setaffinity, pid_t, pid, unsigned int, len, + unsigned long *, user_mask_ptr) + _syscall3(int, sched_getaffinity, pid_t, pid, unsigned int, len, + unsigned long *, user_mask_ptr) ++#endif + + //#endif /* ! __GNUC_PREREQ(2,3) */ + Added: tinysofa/snapshot/schedutils/current/sources/schedutils-1.3.0.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/schedutils/current/sources/schedutils-1.3.0.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/schedutils/current/specs/schedutils.spec =================================================================== --- tinysofa/snapshot/schedutils/current/specs/schedutils.spec 2004-07-01 15:40:16 UTC (rev 2648) +++ tinysofa/snapshot/schedutils/current/specs/schedutils.spec 2004-07-01 15:40:18 UTC (rev 2649) @@ -0,0 +1,89 @@ +# +# schedutils RPM Spec File - 27 April 2002 +# + +Summary: Utilities for manipulating process scheduler attributes +Name: schedutils +Version: 1.3.0 +Release: 7ts +License: GPL +Group: Applications/System +Source: schedutils-%{version}.tar.gz +Patch0: schedutils-1.3.0-ia64.patch +Patch1: schedutils-1.3.0-amd64.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-root + +%description +schedutils is a set of utilities for retrieving and manipulating process +scheduler-related attributes, such as real-time parameters and CPU affinity. + +This package includes the chrt and taskset utilities. + +Install this package if you need to set or get scheduler-related attributes. + +%prep +%setup -q +%patch0 -p1 +%patch1 -p1 + +%build +make CC="gcc $RPM_OPT_FLAGS" + +%install +rm -rf %{buildroot} +mkdir -p %{buildroot}/usr/bin %{buildroot}%{_mandir}/man1 +make PREFIX=%{buildroot}/usr install + +%clean +rm -rf %{buildroot} + +%files +%defattr(0644, root, root, 755) +%doc ChangeLog COPYING README +%attr(555,root,root) %{_bindir}/chrt +%attr(555,root,root) %{_bindir}/taskset +%attr(0644,root,root) %{_mandir}/man1/chrt.1.gz +%attr(0644,root,root) %{_mandir}/man1/taskset.1.gz + +%changelog +* Tue Jun 15 2004 Elliot Lee +- rebuilt + +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Thu Jan 15 2004 Jim Paradis 1.3.0-5 +- Add patch for amd64 + +* Fri Aug 8 2003 Matt Wilson 1.3.0-4 +- rebuild + +* Fri Aug 8 2003 Matt Wilson 1.3.0-3 +- fix build on ia64 + +* Fri Jun 13 2003 Matt Wilson 1.3.0-2 +- rebuild + +* Fri Jun 13 2003 Matt Wilson 1.3.0-1 +- 1.3.0 + +* Tue May 20 2003 Matt Wilson 1.2.0-2 +- rebuild + +* Wed May 14 2003 Florian La Roche +- fix Group: name + +* Fri May 9 2003 Matt Wilson 1.2.0-1 +- fix non-root builds + +* Sun Jan 19 2003 Robert Love +- remove irqset.sh and irqset.1 as they are no longer in the package + +* Tue Dec 31 2002 Robert Love +- remove lsrt and lsrt.1 as they are no longer in the package + +* Wed Dec 11 2002 Robert Love +- lots of little updates + +* Sun Apr 28 2002 Robert M. Love +- initial packaging of 0.0.1 From svn at tinysofa.org Thu Jul 1 15:40:19 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:40:19 +1000 (EST) Subject: [tinysofa-svn] r2650 - in tinysofa/snapshot: . selinux-doc selinux-doc/current selinux-doc/current/sources selinux-doc/current/specs Message-ID: <20040701154019.C54484E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:40:19 +1000 (Fri, 02 Jul 2004) New Revision: 2650 Added: tinysofa/snapshot/selinux-doc/ tinysofa/snapshot/selinux-doc/current/ tinysofa/snapshot/selinux-doc/current/sources/ tinysofa/snapshot/selinux-doc/current/sources/selinux-doc-1.10.tgz tinysofa/snapshot/selinux-doc/current/specs/ tinysofa/snapshot/selinux-doc/current/specs/selinux-doc.spec Log: - Add selinux-doc to snapshot from 2.0. Added: tinysofa/snapshot/selinux-doc/current/sources/selinux-doc-1.10.tgz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/selinux-doc/current/sources/selinux-doc-1.10.tgz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/selinux-doc/current/specs/selinux-doc.spec =================================================================== --- tinysofa/snapshot/selinux-doc/current/specs/selinux-doc.spec 2004-07-01 15:40:18 UTC (rev 2649) +++ tinysofa/snapshot/selinux-doc/current/specs/selinux-doc.spec 2004-07-01 15:40:19 UTC (rev 2650) @@ -0,0 +1,91 @@ +Summary: SELinux documentation +Name: selinux-doc +Version: 1.10 +Release: 1ts +License: Public Use License v1.0 +Group: System Environment/Base +Source: http://www.nsa.gov/selinux/archives/selinux-doc-%{version}.tgz +Prefix: %{_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-root +BuildArch: noarch + +%description +Security-enhanced Linux is a patch of the Linux? kernel and a number +of utilities with enhanced security functionality designed to add +mandatory access controls to Linux. The Security-enhanced Linux +kernel contains new architectural components originally developed to +improve the security of the Flask operating system. These +architectural components provide general support for the enforcement +of many kinds of mandatory access control policies, including those +based on the concepts of Type Enforcement?, Role-based Access Control, +and Multi-level Security. + +This package contains build instructions, porting information, and a +CREDITS file for SELinux. Some of these files will be split up into +per-package files in the future, and other documentation will be added +to this package (e.g. an updated form of the Configuring the SELinux +Policy report). + +%prep +%setup -q + +%build +(cd module && make all) +(cd policy && make all) + +%install +rm -rf ${RPM_BUILD_ROOT} +mkdir -p ${RPM_BUILD_ROOT}/usr/share/SELinux +install -m644 CREDITS PORTING README README.MLS README.CONDITIONAL ${RPM_BUILD_ROOT}/usr/share/SELinux +cp -a policy ${RPM_BUILD_ROOT}/usr/share/SELinux/ +cp -a module ${RPM_BUILD_ROOT}/usr/share/SELinux/ + +%clean +rm -rf ${RPM_BUILD_ROOT} + +%files +%defattr(-,root,root) +%doc /usr/share/SELinux + +%changelog + +* Thu Apr 08 2004 Dan Walsh 1.8-10 +- Upgrade to match NSA + +* Sat Apr 03 2004 Dan Walsh 1.8-3 +- Add html and ps + +* Mon Mar 15 2004 Dan Walsh 1.8-2 +- Install new docs + +* Mon Mar 15 2004 Dan Walsh 1.8-1 +- Update with NSA final 1.8 release + +* Tue Feb 24 2004 Dan Walsh 1.6-1 +- Update with NSA final 1.6 release + +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Sat Dec 6 2003 Dan Walsh 1.4-1 +- Update with NSA final 1.4 release + +* Wed Oct 1 2003 Dan Walsh 1.2-3 +- Update with NSA final 1.2 release + +* Fri Sep 12 2003 Dan Walsh 1.2-2 +- Update with latest from NSA + +* Mon Jun 2 2003 Dan Walsh 1.2-1 +- Update to 1.2 + +* Mon Jun 2 2003 Dan Walsh 1.0-1 +- Initial version + + + + + + + + From svn at tinysofa.org Thu Jul 1 15:40:21 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:40:21 +1000 (EST) Subject: [tinysofa-svn] r2651 - in tinysofa/snapshot: . selinux-policy-strict selinux-policy-strict/current selinux-policy-strict/current/sources selinux-policy-strict/current/specs Message-ID: <20040701154021.C572E4E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:40:21 +1000 (Fri, 02 Jul 2004) New Revision: 2651 Added: tinysofa/snapshot/selinux-policy-strict/ tinysofa/snapshot/selinux-policy-strict/current/ tinysofa/snapshot/selinux-policy-strict/current/sources/ tinysofa/snapshot/selinux-policy-strict/current/sources/policy-1.13.10.tgz tinysofa/snapshot/selinux-policy-strict/current/sources/policy-20040626.patch tinysofa/snapshot/selinux-policy-strict/current/specs/ tinysofa/snapshot/selinux-policy-strict/current/specs/selinux-policy-strict.spec Log: - Add selinux-policy-strict to snapshot from 2.0. Added: tinysofa/snapshot/selinux-policy-strict/current/sources/policy-1.13.10.tgz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/selinux-policy-strict/current/sources/policy-1.13.10.tgz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/selinux-policy-strict/current/sources/policy-20040626.patch =================================================================== --- tinysofa/snapshot/selinux-policy-strict/current/sources/policy-20040626.patch 2004-07-01 15:40:19 UTC (rev 2650) +++ tinysofa/snapshot/selinux-policy-strict/current/sources/policy-20040626.patch 2004-07-01 15:40:21 UTC (rev 2651) @@ -0,0 +1,126 @@ +diff --exclude-from=exclude -N -u -r nsapolicy/tunables/tunable.te policy-1.13.9/tunables/tunable.te +--- nsapolicy/tunables/tunable.te 2004-06-16 13:33:39.000000000 -0400 ++++ policy-1.13.9/tunables/tunable.te 2004-06-26 06:13:49.328150112 -0400 +@@ -1,33 +1,33 @@ + # uncomment to allow mozilla to read files in the user home directory +-dnl define(`readhome') ++define(`readhome') + + # uncomment to allow mozilla to write files in the user home directory +-dnl define(`writehome') ++define(`writehome') + + # uncomment to allow staff_r users to search the sysadm home dir and read + # files (such as ~/.bashrc) + dnl define(`staff_read_sysadm_file') + + # uncomment to allow sysadm_t to do almost everything +-dnl define(`unrestricted_admin') ++define(`unrestricted_admin') + + # uncomment to make everything other than newrole and su run by a userdomain + # stay in the same userdomain + dnl define(`single_userdomain') + + # uncomment to allow ssh logins as sysadm_r:sysadm_t +-dnl define(`ssh_sysadm_login') ++define(`ssh_sysadm_login') + + # uncomment to allow xdm logins as sysadm_r:sysadm_t +-dnl define(`xdm_sysadm_login') ++define(`xdm_sysadm_login') + + # to allow users to run TCP servers (bind to ports and accept connection from + # the same domain and outside users) disabling this forces FTP passive mode + # and may change other protocols (including IRC if single_userdomain is defined) +-dnl define(`allow_user_tcp_server') ++define(`allow_user_tcp_server') + + # to allow users to run the dmesg command +-dnl define(`allow_user_dmesg') ++define(`allow_user_dmesg') + + # to allow ssh to run from inetd instead of as a daemon + dnl define(`run_ssh_inetd') +@@ -36,22 +36,22 @@ + dnl define(`ftp_home_dir') + + # to have ftpd start from inetd comment this out +-dnl define(`ftpd_is_daemon') ++define(`ftpd_is_daemon') + + # uncomment to allow sysadm_t to directly start daemons +-dnl define(`direct_sysadm_daemon') ++define(`direct_sysadm_daemon') + + # comment if you use nscd and do not want to allow all domains to access it +-dnl define(`nscd_all_connect') ++define(`nscd_all_connect') + + # uncomment to support NFS home directories +-dnl define(`nfs_home_dirs') ++define(`nfs_home_dirs') + + # comment to deny regular users direct mouse access (only allow the X server) +-dnl define(`allow_user_direct_mouse') ++define(`allow_user_direct_mouse') + + # to allow ypbind to run with NIS +-dnl define(`allow_ypbind') ++define(`allow_ypbind') + + dnl define(`secure_levels') + ifdef(`secure_levels', ` +@@ -61,42 +61,42 @@ + ') + + # to allow processes under initrc and xinetd to run with all privs +-dnl define(`unlimitedServices') ++define(`unlimitedServices') + + # to allow normal users can become sysadm +-dnl define(`user_canbe_sysadm') ++define(`user_canbe_sysadm') + + # to allow users to have full access + dnl define(`unlimitedUsers') + + # The xserver wants to check for fonts in ~/.gnome or ~/.kde +-dnl define(`allow_xserver_home_fonts') ++define(`allow_xserver_home_fonts') + + # To put in dontaudit rules for things that we know to be broken but which + # are not security risks + dnl define(`hide_broken_symptoms') + + # To allow the read/write/create on any file system uncomment the following +-dnl define(`nfs_export_all_rw') ++define(`nfs_export_all_rw') + + # To allow the reading on any file system uncomment the following + dnl define(`nfs_export_all_ro') + + # To allow the reading of any default file on the system by users +-dnl define(`read_default_t') ++define(`read_default_t') + + # Allow user to r/w noextattrfile (FAT, CDROM, FLOPPY) +-dnl define(`user_rw_noexattrfile') ++define(`user_rw_noexattrfile') + + # Allow user to execute mount command +-dnl define(`user_can_mount') ++define(`user_can_mount') + + # Allow user to run games +-dnl define(`use_games') ++define(`use_games') + + # Allow user to control network interfaces (also needs USERCTL=true) +-dnl define(`user_net_control') ++define(`user_net_control') + + # Allow user to rw usb devices +-dnl define(`user_rw_usb') ++define(`user_rw_usb') + Added: tinysofa/snapshot/selinux-policy-strict/current/specs/selinux-policy-strict.spec =================================================================== --- tinysofa/snapshot/selinux-policy-strict/current/specs/selinux-policy-strict.spec 2004-07-01 15:40:19 UTC (rev 2650) +++ tinysofa/snapshot/selinux-policy-strict/current/specs/selinux-policy-strict.spec 2004-07-01 15:40:21 UTC (rev 2651) @@ -0,0 +1,262 @@ +%define type strict +Summary: SELinux %{type} policy configuration +Name: selinux-policy-%{type} +Version: 1.13.10 +Release: 1ts +License: GPL +Group: System Environment/Base +Source: http://www.nsa.gov/selinux/archives/policy-%{version}.tgz +Prefix: %{_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-root +Patch1: policy-20040626.patch + +BuildArch: noarch +BuildRequires: checkpolicy >= 1.10 m4 policycoreutils >= 1.6-7 +Requires: kernel >= 2.6.4-1.300 +Obsoletes: policy + +%description +Security-enhanced Linux is a patch of the Linux? kernel and a number +of utilities with enhanced security functionality designed to add +mandatory access controls to Linux. The Security-enhanced Linux +kernel contains new architectural components originally developed to +improve the security of the Flask operating system. These +architectural components provide general support for the enforcement +of many kinds of mandatory access control policies, including those +based on the concepts of Type Enforcement?, Role-based Access +Control, and Multi-level Security. + +This package contains the SELinux example policy configuration along +with the Flask configuration information and the application +configuration files. + +%prep +%setup -q -n policy-%{version} +%patch1 -p1 + +%build +mv domains/misc/unused/* domains/misc +mv domains/program/unused/* domains/program/ +(cd domains/program/; mv uwimapd.te dpk* gatekeeper* qmail* xprint* uml_net* tiny* seuser* unused/) +make policy +rm -rf tmp + +%install +rm -rf ${RPM_BUILD_ROOT} +mkdir -p ${RPM_BUILD_ROOT}/root +mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/selinux/%{type}/contexts/users +mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/selinux/%{type}/contexts/files +make DESTDIR="${RPM_BUILD_ROOT}" install +make clean +make DESTDIR="${RPM_BUILD_ROOT}" install-src +rm -rf "${RPM_BUILD_ROOT}%{_sysconfdir}/selinux/%{type}/src/policy/targeted" + +%clean +rm -rf ${RPM_BUILD_ROOT} + +%files +%defattr(-,root,root) +%dir %{_sysconfdir}/selinux/%{type} +%config(noreplace) %{_sysconfdir}/selinux/%{type}/policy/policy\.* +%config(noreplace) %{_sysconfdir}/selinux/%{type}/contexts/files/file_contexts +%config(noreplace) %{_sysconfdir}/selinux/%{type}/contexts/default_contexts +%config(noreplace) %{_sysconfdir}/selinux/%{type}/contexts/default_type +%config(noreplace) %{_sysconfdir}/selinux/%{type}/contexts/initrc_context +%config(noreplace) %{_sysconfdir}/selinux/%{type}/contexts/failsafe_context +%config(noreplace) %{_sysconfdir}/selinux/%{type}/contexts/userhelper_context +%config(noreplace) %{_sysconfdir}/selinux/%{type}/contexts/users/root + +%post +if [ ! -f /etc/selinux/config ]; then + if [ -f /etc/sysconfig/selinux ]; then + cp /etc/sysconfig/selinux /etc/selinux/config + echo " +# SELINUXTYPE= can take one of these two values: +# targeted - Only targeted network daemons are protected. +# strict - Full SELinux protection. +SELINUXTYPE=strict " >> /etc/selinux/config + rm -f /etc/sysconfig/selinux + else + echo " +# This file controls the state of SELinux on the system. +# SELINUX= can take one of these three values: +# enforcing - SELinux security policy is enforced. +# permissive - SELinux prints warnings instead of enforcing. +# disabled - No SELinux policy is loaded. +SELINUX=enforcing +# SELINUXTYPE= can take one of these two values: +# targeted - Only targeted network daemons are protected. +# strict - Full SELinux protection. +SELINUXTYPE=targeted " > /etc/selinux/config + + fi +fi +ln -sf /etc/selinux/config /etc/sysconfig/selinux +restorecon /etc/selinux/config + +if [ -x /usr/bin/selinuxenabled ] && /usr/bin/selinuxenabled && [ -e /selinux/policyvers ]; then + + SELINUXTYPE=targeted + if [ -f /etc/selinux/config ]; then + . /etc/selinux/config + else + if [ -f /etc/selinux/config ]; then + SELINUXTYPE=strict + . /etc/sysconfig/selinux + fi + fi + if [ "${SELINUXTYPE}" = "%{type}" ]; then + /usr/sbin/load_policy /etc/selinux/%{type}/policy/policy.`cat /selinux/policyvers` + fi +fi +exit 0 + +%package sources +Summary: SELinux example policy configuration source files +Group: System Environment/Base +Requires: m4 make checkpolicy >= 1.10 policycoreutils >= 1.6-7 kernel >= 2.6.4-1.300 +Requires: selinux-policy-%{type} = %{version}-%{release} +Requires: python +BuildRequires: checkpolicy policycoreutils >= 1.6-7 +Obsoletes: policy-sources + +%description sources +This subpackage includes the source files used to build the policy +configuration. Includes policy.conf and the Makefiles, macros and +source files for it. + +%files sources +%defattr(0600,root,root,0700) +%config(noreplace) %{_sysconfdir}/selinux/%{type}/src/policy/users +%config(noreplace) %{_sysconfdir}/selinux/%{type}/src/policy/tunables/\* +%dir %{_sysconfdir}/selinux/%{type}/src +%dir %{_sysconfdir}/selinux/%{type}/src/policy +%config %{_sysconfdir}/selinux/%{type}/src/policy/policy\.* +%config %{_sysconfdir}/selinux/%{type}/src/policy/appconfig +%config %{_sysconfdir}/selinux/%{type}/src/policy/assert.te +%config %{_sysconfdir}/selinux/%{type}/src/policy/attrib.te +%{_sysconfdir}/selinux/%{type}/src/policy/ChangeLog +%config %{_sysconfdir}/selinux/%{type}/src/policy/constraints +%{_sysconfdir}/selinux/%{type}/src/policy/COPYING +%config %{_sysconfdir}/selinux/%{type}/src/policy/domains +%config %{_sysconfdir}/selinux/%{type}/src/policy/file_contexts/types.fc +%config %{_sysconfdir}/selinux/%{type}/src/policy/file_contexts/program +%config %{_sysconfdir}/selinux/%{type}/src/policy/file_contexts/misc +%config %{_sysconfdir}/selinux/%{type}/src/policy/flask +%config %{_sysconfdir}/selinux/%{type}/src/policy/fs_use +%config %{_sysconfdir}/selinux/%{type}/src/policy/genfs_contexts +%config %{_sysconfdir}/selinux/%{type}/src/policy/initial_sid_contexts +%config %{_sysconfdir}/selinux/%{type}/src/policy/macros +%{_sysconfdir}/selinux/%{type}/src/policy/Makefile +%config %{_sysconfdir}/selinux/%{type}/src/policy/mls +%config %{_sysconfdir}/selinux/%{type}/src/policy/net_contexts +%config %{_sysconfdir}/selinux/%{type}/src/policy/rbac +%{_sysconfdir}/selinux/%{type}/src/policy/README +%config %{_sysconfdir}/selinux/%{type}/src/policy/serviceusers +%config %{_sysconfdir}/selinux/%{type}/src/policy/types +%{_sysconfdir}/selinux/%{type}/src/policy/VERSION + +%post sources +if [ -x /usr/bin/selinuxenabled ]; then + make -W /etc/selinux/%{type}/src/policy/users \ + -C /etc/selinux/%{type}/src/policy > /dev/null 2>&1 + SELINUXTYPE=targeted + if [ -f /etc/selinux/config ]; then + . /etc/selinux/config + else + if [ -f /etc/selinux/config ]; then + SELINUXTYPE=strict + . /etc/sysconfig/selinux + fi + fi + if [ "${SELINUXTYPE}" = "%{type}" ]; then + /usr/bin/selinuxenabled && [ -e /selinux/policyvers ] && \ + make -C /etc/selinux/%{type}/src/policy load + fi +fi +exit 0 + +%changelog +* Sat Jun 26 2004 Dan Walsh 1.13.10-1 +- Update with latest NSA + +* Fri Jun 25 2004 Dan Walsh 1.13.9-1 +- Update with latest NSA +- Add more Colin patches + +* Wed Jun 23 2004 Dan Walsh 1.13.8-1 +- Add Kerberos policy +- Update with latest from NSA + +* Fri Jun 18 2004 Dan Walsh 1.13.7-1 +- NSA Update + +* Thu Jun 17 2004 Dan Walsh 1.13.6-1 +- Another NSA update. +- Added Russell's rpm patch +- Added netlink patches + +* Wed Jun 16 2004 Dan Walsh 1.13.5-1 +- Add postfix and mdadm fix from Colin +- Update to match latest from NSA + +* Wed Jun 16 2004 Dan Walsh 1.13.4-8 +- Add nlclass patch + +* Tue Jun 15 2004 Elliot Lee +- rebuilt + +* Mon Jun 14 2004 Dan Walsh 1.13.4-6 +- Keep version with strict policy +- Remove uwimapd patch + +* Wed Jun 9 2004 Dan Walsh 1.13.4-5 +- Fix patch + +* Wed Jun 9 2004 Dan Walsh 1.13.4-4 +- Add Additional Russell fixes + +* Tue Jun 8 2004 Dan Walsh 1.13.4-3 +- Add Hotplug fixes + +* Mon Jun 7 2004 Dan Walsh 1.13.4-2 +- Add most of Russell's mods + +* Mon Jun 7 2004 Dan Walsh 1.13.4-1 +- Handle newrole changes for new design +- Update to latest from NSA + +* Thu Jun 3 2004 Dan Walsh 1.13.3-3 +- Handle updating /etc/selinux/config + +* Wed Jun 2 2004 Dan Walsh 1.13.3-1 +- Update to latest from NSA +- Fix numerous bugs + +* Wed Jun 2 2004 Dan Walsh 1.13.2-7 +- Fix su policy for terminal rename with new pam_selinux. + +* Wed Jun 2 2004 Dan Walsh 1.13.2-6 +- Fix policy for setfiles and restorecon + +* Wed Jun 2 2004 Dan Walsh 1.13.2-5 +- Add tunables subdir + +* Tue Jun 1 2004 Dan Walsh 1.13.2-4 +- Fix hotplug and udev + +* Tue Jun 1 2004 Dan Walsh 1.13.2-3 +- Fix handling of selinux_config_t and default_context_t + +* Fri May 28 2004 Dan Walsh 1.13.2-2 +- Only update policy if this policy is running + +* Fri May 28 2004 Dan Walsh 1.13.2-1 +- Update to match NSA + +* Thu May 27 2004 Dan Walsh 1.13.1-2 +- Change location of file_contexts and add new security contexts + +* Mon May 24 2004 Dan Walsh 1.13.1-1 +- Initial version created from policy.spec + From svn at tinysofa.org Thu Jul 1 15:40:26 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:40:26 +1000 (EST) Subject: [tinysofa-svn] r2652 - in tinysofa/snapshot: . selinux-policy-targeted selinux-policy-targeted/current selinux-policy-targeted/current/sources selinux-policy-targeted/current/specs Message-ID: <20040701154026.639694E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:40:26 +1000 (Fri, 02 Jul 2004) New Revision: 2652 Added: tinysofa/snapshot/selinux-policy-targeted/ tinysofa/snapshot/selinux-policy-targeted/current/ tinysofa/snapshot/selinux-policy-targeted/current/sources/ tinysofa/snapshot/selinux-policy-targeted/current/sources/policy-1.13.10.tgz tinysofa/snapshot/selinux-policy-targeted/current/sources/policy-20040626.patch tinysofa/snapshot/selinux-policy-targeted/current/sources/policy-targeted.patch tinysofa/snapshot/selinux-policy-targeted/current/specs/ tinysofa/snapshot/selinux-policy-targeted/current/specs/selinux-policy-targeted.spec Log: - Add selinux-policy-targeted to snapshot from 2.0. Added: tinysofa/snapshot/selinux-policy-targeted/current/sources/policy-1.13.10.tgz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/selinux-policy-targeted/current/sources/policy-1.13.10.tgz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/selinux-policy-targeted/current/sources/policy-20040626.patch =================================================================== --- tinysofa/snapshot/selinux-policy-targeted/current/sources/policy-20040626.patch 2004-07-01 15:40:21 UTC (rev 2651) +++ tinysofa/snapshot/selinux-policy-targeted/current/sources/policy-20040626.patch 2004-07-01 15:40:26 UTC (rev 2652) @@ -0,0 +1,126 @@ +diff --exclude-from=exclude -N -u -r nsapolicy/tunables/tunable.te policy-1.13.9/tunables/tunable.te +--- nsapolicy/tunables/tunable.te 2004-06-16 13:33:39.000000000 -0400 ++++ policy-1.13.9/tunables/tunable.te 2004-06-26 06:13:49.328150112 -0400 +@@ -1,33 +1,33 @@ + # uncomment to allow mozilla to read files in the user home directory +-dnl define(`readhome') ++define(`readhome') + + # uncomment to allow mozilla to write files in the user home directory +-dnl define(`writehome') ++define(`writehome') + + # uncomment to allow staff_r users to search the sysadm home dir and read + # files (such as ~/.bashrc) + dnl define(`staff_read_sysadm_file') + + # uncomment to allow sysadm_t to do almost everything +-dnl define(`unrestricted_admin') ++define(`unrestricted_admin') + + # uncomment to make everything other than newrole and su run by a userdomain + # stay in the same userdomain + dnl define(`single_userdomain') + + # uncomment to allow ssh logins as sysadm_r:sysadm_t +-dnl define(`ssh_sysadm_login') ++define(`ssh_sysadm_login') + + # uncomment to allow xdm logins as sysadm_r:sysadm_t +-dnl define(`xdm_sysadm_login') ++define(`xdm_sysadm_login') + + # to allow users to run TCP servers (bind to ports and accept connection from + # the same domain and outside users) disabling this forces FTP passive mode + # and may change other protocols (including IRC if single_userdomain is defined) +-dnl define(`allow_user_tcp_server') ++define(`allow_user_tcp_server') + + # to allow users to run the dmesg command +-dnl define(`allow_user_dmesg') ++define(`allow_user_dmesg') + + # to allow ssh to run from inetd instead of as a daemon + dnl define(`run_ssh_inetd') +@@ -36,22 +36,22 @@ + dnl define(`ftp_home_dir') + + # to have ftpd start from inetd comment this out +-dnl define(`ftpd_is_daemon') ++define(`ftpd_is_daemon') + + # uncomment to allow sysadm_t to directly start daemons +-dnl define(`direct_sysadm_daemon') ++define(`direct_sysadm_daemon') + + # comment if you use nscd and do not want to allow all domains to access it +-dnl define(`nscd_all_connect') ++define(`nscd_all_connect') + + # uncomment to support NFS home directories +-dnl define(`nfs_home_dirs') ++define(`nfs_home_dirs') + + # comment to deny regular users direct mouse access (only allow the X server) +-dnl define(`allow_user_direct_mouse') ++define(`allow_user_direct_mouse') + + # to allow ypbind to run with NIS +-dnl define(`allow_ypbind') ++define(`allow_ypbind') + + dnl define(`secure_levels') + ifdef(`secure_levels', ` +@@ -61,42 +61,42 @@ + ') + + # to allow processes under initrc and xinetd to run with all privs +-dnl define(`unlimitedServices') ++define(`unlimitedServices') + + # to allow normal users can become sysadm +-dnl define(`user_canbe_sysadm') ++define(`user_canbe_sysadm') + + # to allow users to have full access + dnl define(`unlimitedUsers') + + # The xserver wants to check for fonts in ~/.gnome or ~/.kde +-dnl define(`allow_xserver_home_fonts') ++define(`allow_xserver_home_fonts') + + # To put in dontaudit rules for things that we know to be broken but which + # are not security risks + dnl define(`hide_broken_symptoms') + + # To allow the read/write/create on any file system uncomment the following +-dnl define(`nfs_export_all_rw') ++define(`nfs_export_all_rw') + + # To allow the reading on any file system uncomment the following + dnl define(`nfs_export_all_ro') + + # To allow the reading of any default file on the system by users +-dnl define(`read_default_t') ++define(`read_default_t') + + # Allow user to r/w noextattrfile (FAT, CDROM, FLOPPY) +-dnl define(`user_rw_noexattrfile') ++define(`user_rw_noexattrfile') + + # Allow user to execute mount command +-dnl define(`user_can_mount') ++define(`user_can_mount') + + # Allow user to run games +-dnl define(`use_games') ++define(`use_games') + + # Allow user to control network interfaces (also needs USERCTL=true) +-dnl define(`user_net_control') ++define(`user_net_control') + + # Allow user to rw usb devices +-dnl define(`user_rw_usb') ++define(`user_rw_usb') + Added: tinysofa/snapshot/selinux-policy-targeted/current/sources/policy-targeted.patch =================================================================== --- tinysofa/snapshot/selinux-policy-targeted/current/sources/policy-targeted.patch 2004-07-01 15:40:21 UTC (rev 2651) +++ tinysofa/snapshot/selinux-policy-targeted/current/sources/policy-targeted.patch 2004-07-01 15:40:26 UTC (rev 2652) @@ -0,0 +1,11 @@ +--- policy-1.13.2/Makefile.targeted 2004-05-28 09:12:47.000000000 -0400 ++++ policy-1.13.2/Makefile 2004-05-28 09:25:47.221033520 -0400 +@@ -23,7 +23,7 @@ + CHECKPOLICY = $(BINDIR)/checkpolicy + SETFILES = $(SBINDIR)/setfiles + POLICYVER := policy.$(shell $(CHECKPOLICY) $(POLICYCOMPAT) -V |cut -f 1 -d ' ') +-INSTALLDIR = $(DESTDIR)/etc/selinux/strict ++INSTALLDIR = $(DESTDIR)/etc/selinux/targeted + POLICYPATH = $(INSTALLDIR)/policy + SRCPATH = $(INSTALLDIR)/src + CONTEXTPATH = $(INSTALLDIR)/contexts Added: tinysofa/snapshot/selinux-policy-targeted/current/specs/selinux-policy-targeted.spec =================================================================== --- tinysofa/snapshot/selinux-policy-targeted/current/specs/selinux-policy-targeted.spec 2004-07-01 15:40:21 UTC (rev 2651) +++ tinysofa/snapshot/selinux-policy-targeted/current/specs/selinux-policy-targeted.spec 2004-07-01 15:40:26 UTC (rev 2652) @@ -0,0 +1,270 @@ +%define type targeted +Summary: SELinux %{type} policy configuration +Name: selinux-policy-%{type} +Version: 1.13.10 +Release: 1ts +License: GPL +Group: System Environment/Base +Source: http://www.nsa.gov/selinux/archives/policy-%{version}.tgz +Prefix: %{_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-root +Patch: policy-%{type}.patch +Patch1: policy-20040626.patch + +BuildArch: noarch +BuildRequires: checkpolicy >= 1.10 m4 policycoreutils >= 1.6-7 +Requires: kernel >= 2.6.4-1.300 +Obsoletes: policy + +%description +Security-enhanced Linux is a patch of the Linux? kernel and a number +of utilities with enhanced security functionality designed to add +mandatory access controls to Linux. The Security-enhanced Linux +kernel contains new architectural components originally developed to +improve the security of the Flask operating system. These +architectural components provide general support for the enforcement +of many kinds of mandatory access control policies, including those +based on the concepts of Type Enforcement?, Role-based Access +Control, and Multi-level Security. + +This package contains the SELinux example policy configuration along +with the Flask configuration information and the application +configuration files. + +%prep +%setup -q -n policy-%{version} +# Change strict to targeted +%patch -p1 +%patch1 -p1 + +%build +mv domains/misc/*.te domains/misc/unused +mv domains/program/*.te domains/program/unused/ +rm domains/*.te +for i in apache.te dhcpd.te named.te ntpd.te portmap.te squid.te syslogd.te; do +mv domains/program/unused/$i domains/program/ +done +cp -R %{type}/* . +echo "define(\`targeted_policy')" >> tunables/tunable.te +make policy +rm -rf tmp + +%install +rm -rf ${RPM_BUILD_ROOT} +mkdir -p ${RPM_BUILD_ROOT}/root +mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/selinux/%{type}/contexts/users +mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/selinux/%{type}/contexts/files +make DESTDIR="${RPM_BUILD_ROOT}" install +make clean +make DESTDIR="${RPM_BUILD_ROOT}" install-src +rm -rf "${RPM_BUILD_ROOT}%{_sysconfdir}/selinux/%{type}/src/policy/targeted" + +%clean +rm -rf ${RPM_BUILD_ROOT} + +%files +%defattr(-,root,root) +%dir %{_sysconfdir}/selinux/%{type} +%config(noreplace) %{_sysconfdir}/selinux/%{type}/policy/policy\.* +%config(noreplace) %{_sysconfdir}/selinux/%{type}/contexts/files/file_contexts +%config(noreplace) %{_sysconfdir}/selinux/%{type}/contexts/default_contexts +%config(noreplace) %{_sysconfdir}/selinux/%{type}/contexts/default_type +%config(noreplace) %{_sysconfdir}/selinux/%{type}/contexts/initrc_context +%config(noreplace) %{_sysconfdir}/selinux/%{type}/contexts/failsafe_context +%config(noreplace) %{_sysconfdir}/selinux/%{type}/contexts/userhelper_context +%config(noreplace) %{_sysconfdir}/selinux/%{type}/contexts/users/root + +%post +if [ ! -f /etc/selinux/config ]; then + if [ -f /etc/sysconfig/selinux ]; then + cp /etc/sysconfig/selinux /etc/selinux/config + echo " +# SELINUXTYPE= can take one of these two values: +# targeted - Only targeted network daemons are protected. +# strict - Full SELinux protection. +SELINUXTYPE=strict " >> /etc/selinux/config + rm -f /etc/sysconfig/selinux + else + echo " +# This file controls the state of SELinux on the system. +# SELINUX= can take one of these three values: +# enforcing - SELinux security policy is enforced. +# permissive - SELinux prints warnings instead of enforcing. +# disabled - No SELinux policy is loaded. +SELINUX=enforcing +# SELINUXTYPE= can take one of these two values: +# targeted - Only targeted network daemons are protected. +# strict - Full SELinux protection. +SELINUXTYPE=targeted " > /etc/selinux/config + + fi +fi +ln -sf /etc/selinux/config /etc/sysconfig/selinux +restorecon /etc/selinux/config + +if [ -x /usr/bin/selinuxenabled ] && /usr/bin/selinuxenabled && [ -e /selinux/policyvers ]; then + + SELINUXTYPE=targeted + if [ -f /etc/selinux/config ]; then + . /etc/selinux/config + else + if [ -f /etc/selinux/config ]; then + SELINUXTYPE=strict + . /etc/sysconfig/selinux + fi + fi + if [ "${SELINUXTYPE}" = "%{type}" ]; then + /usr/sbin/load_policy /etc/selinux/%{type}/policy/policy.`cat /selinux/policyvers` + fi +fi +exit 0 + +%package sources +Summary: SELinux example policy configuration source files +Group: System Environment/Base +Requires: m4 make checkpolicy >= 1.10 policycoreutils >= 1.6-7 kernel >= 2.6.4-1.300 +Requires: selinux-policy-%{type} = %{version}-%{release} +Requires: python +BuildRequires: checkpolicy policycoreutils >= 1.6-7 +Obsoletes: policy-sources + +%description sources +This subpackage includes the source files used to build the policy +configuration. Includes policy.conf and the Makefiles, macros and +source files for it. + +%files sources +%defattr(0600,root,root,0700) +%config(noreplace) %{_sysconfdir}/selinux/%{type}/src/policy/users +%config(noreplace) %{_sysconfdir}/selinux/%{type}/src/policy/tunables/\* +%dir %{_sysconfdir}/selinux/%{type}/src +%dir %{_sysconfdir}/selinux/%{type}/src/policy +%config %{_sysconfdir}/selinux/%{type}/src/policy/policy\.* +%config %{_sysconfdir}/selinux/%{type}/src/policy/appconfig +%config %{_sysconfdir}/selinux/%{type}/src/policy/assert.te +%config %{_sysconfdir}/selinux/%{type}/src/policy/attrib.te +%{_sysconfdir}/selinux/%{type}/src/policy/ChangeLog +%config %{_sysconfdir}/selinux/%{type}/src/policy/constraints +%{_sysconfdir}/selinux/%{type}/src/policy/COPYING +%config %{_sysconfdir}/selinux/%{type}/src/policy/domains +%config %{_sysconfdir}/selinux/%{type}/src/policy/file_contexts/types.fc +%config %{_sysconfdir}/selinux/%{type}/src/policy/file_contexts/program +%config %{_sysconfdir}/selinux/%{type}/src/policy/file_contexts/misc +%config %{_sysconfdir}/selinux/%{type}/src/policy/flask +%config %{_sysconfdir}/selinux/%{type}/src/policy/fs_use +%config %{_sysconfdir}/selinux/%{type}/src/policy/genfs_contexts +%config %{_sysconfdir}/selinux/%{type}/src/policy/initial_sid_contexts +%config %{_sysconfdir}/selinux/%{type}/src/policy/macros +%{_sysconfdir}/selinux/%{type}/src/policy/Makefile +%config %{_sysconfdir}/selinux/%{type}/src/policy/mls +%config %{_sysconfdir}/selinux/%{type}/src/policy/net_contexts +%config %{_sysconfdir}/selinux/%{type}/src/policy/rbac +%{_sysconfdir}/selinux/%{type}/src/policy/README +%config %{_sysconfdir}/selinux/%{type}/src/policy/serviceusers +%config %{_sysconfdir}/selinux/%{type}/src/policy/types +%{_sysconfdir}/selinux/%{type}/src/policy/VERSION + +%post sources +if [ -x /usr/bin/selinuxenabled ]; then + make -W /etc/selinux/%{type}/src/policy/users \ + -C /etc/selinux/%{type}/src/policy > /dev/null 2>&1 + SELINUXTYPE=targeted + if [ -f /etc/selinux/config ]; then + . /etc/selinux/config + else + if [ -f /etc/selinux/config ]; then + SELINUXTYPE=strict + . /etc/sysconfig/selinux + fi + fi + if [ "${SELINUXTYPE}" = "%{type}" ]; then + /usr/bin/selinuxenabled && [ -e /selinux/policyvers ] && \ + make -C /etc/selinux/%{type}/src/policy load + fi +fi +exit 0 + +%changelog +* Sat Jun 26 2004 Dan Walsh 1.13.10-1 +- Update with latest NSA + +* Fri Jun 25 2004 Dan Walsh 1.13.9-1 +- Update with latest NSA +- Add more Colin patches + +* Wed Jun 23 2004 Dan Walsh 1.13.8-1 +- Add Kerberos policy +- Update with latest from NSA + +* Fri Jun 18 2004 Dan Walsh 1.13.7-1 +- NSA Update + +* Thu Jun 17 2004 Dan Walsh 1.13.6-1 +- Another NSA update. +- Added Russell's rpm patch +- Added netlink patches + +* Wed Jun 16 2004 Dan Walsh 1.13.5-1 +- Add postfix and mdadm fix from Colin +- Update to match latest from NSA + +* Wed Jun 16 2004 Dan Walsh 1.13.4-8 +- Add nlclass patch + +* Tue Jun 15 2004 Elliot Lee +- rebuilt + +* Mon Jun 14 2004 Dan Walsh 1.13.4-6 +- Keep version with strict policy +- Remove uwimapd patch + +* Wed Jun 9 2004 Dan Walsh 1.13.4-5 +- Fix patch + +* Wed Jun 9 2004 Dan Walsh 1.13.4-4 +- Add Additional Russell fixes + +* Tue Jun 8 2004 Dan Walsh 1.13.4-3 +- Add Hotplug fixes + +* Mon Jun 7 2004 Dan Walsh 1.13.4-2 +- Add most of Russell's mods + +* Mon Jun 7 2004 Dan Walsh 1.13.4-1 +- Handle newrole changes for new design +- Update to latest from NSA + +* Thu Jun 3 2004 Dan Walsh 1.13.3-3 +- Handle updating /etc/selinux/config + +* Wed Jun 2 2004 Dan Walsh 1.13.3-1 +- Update to latest from NSA +- Fix numerous bugs + +* Wed Jun 2 2004 Dan Walsh 1.13.2-7 +- Fix su policy for terminal rename with new pam_selinux. + +* Wed Jun 2 2004 Dan Walsh 1.13.2-6 +- Fix policy for setfiles and restorecon + +* Wed Jun 2 2004 Dan Walsh 1.13.2-5 +- Add tunables subdir + +* Tue Jun 1 2004 Dan Walsh 1.13.2-4 +- Fix hotplug and udev + +* Tue Jun 1 2004 Dan Walsh 1.13.2-3 +- Fix handling of selinux_config_t and default_context_t + +* Fri May 28 2004 Dan Walsh 1.13.2-2 +- Only update policy if this policy is running + +* Fri May 28 2004 Dan Walsh 1.13.2-1 +- Update to match NSA + +* Thu May 27 2004 Dan Walsh 1.13.1-2 +- Change location of file_contexts and add new security contexts + +* Mon May 24 2004 Dan Walsh 1.13.1-1 +- Initial version created from policy.spec + From svn at tinysofa.org Thu Jul 1 15:40:27 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:40:27 +1000 (EST) Subject: [tinysofa-svn] r2653 - in tinysofa/snapshot: . setarch setarch/current setarch/current/sources setarch/current/specs Message-ID: <20040701154027.9CE944E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:40:27 +1000 (Fri, 02 Jul 2004) New Revision: 2653 Added: tinysofa/snapshot/setarch/ tinysofa/snapshot/setarch/current/ tinysofa/snapshot/setarch/current/sources/ tinysofa/snapshot/setarch/current/sources/setarch-1.4.tar.gz tinysofa/snapshot/setarch/current/specs/ tinysofa/snapshot/setarch/current/specs/setarch.spec Log: - Add setarch to snapshot from 2.0. Added: tinysofa/snapshot/setarch/current/sources/setarch-1.4.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/setarch/current/sources/setarch-1.4.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/setarch/current/specs/setarch.spec =================================================================== --- tinysofa/snapshot/setarch/current/specs/setarch.spec 2004-07-01 15:40:26 UTC (rev 2652) +++ tinysofa/snapshot/setarch/current/specs/setarch.spec 2004-07-01 15:40:27 UTC (rev 2653) @@ -0,0 +1,75 @@ +Summary: Personality setter +Name: setarch +Version: 1.4 +Release: 2ts +Source0: %{name}-%{version}.tar.gz +License: GPL +Group: System Environment/Kernel +BuildRoot: %{_tmppath}/%{name}-%{version}-root + +%description +This utility tells the kernel to report a different architecture than the +current one, then runs a program in that environment. + +%prep +%setup -q + +%build +%{__cc} -o setarch setarch.c $RPM_OPT_FLAGS + +%install +rm -rf $RPM_BUILD_ROOT +mkdir -p $RPM_BUILD_ROOT%{_bindir} $RPM_BUILD_ROOT%{_mandir}/man8 +install -m444 setarch.8 $RPM_BUILD_ROOT%{_mandir}/man8 +install -s -m555 setarch $RPM_BUILD_ROOT%{_bindir} + +LINKS="linux32" +%ifarch s390 s390x +LINKS="$LINKS s390 s390x" +%endif +%ifarch x86_64 i386 +LINKS="$LINKS i386 x86_64" +%endif +%ifarch ppc ppc64 +LINKS="$LINKS ppc ppc64 ppc32" +%endif +%ifarch sparc sparc64 +LINKS="$LINKS sparc sparc64 sparc32" +%endif +%ifarch ia64 +LINKS="$LINKS i386 ia64" +%endif +for I in $LINKS; do + ln $RPM_BUILD_ROOT%{_bindir}/setarch $RPM_BUILD_ROOT%{_bindir}/$I + echo ".so setarch.8" > $RPM_BUILD_ROOT%{_mandir}/man8/$I.8 +done + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(-,root,root) +%{_bindir}/* +%{_mandir}/man8/*.8* + +%changelog +* Tue Jun 15 2004 Elliot Lee +- rebuilt + +* Wed Feb 24 2004 Elliot Lee 1.4-1 +- Fix man page - #115552 + +* Wed Jan 14 2004 Elliot Lee 1.3-2 +- Rebuild + +* Tue Sep 02 2003 Elliot Lee 1.3-1 +- Add linux32 alias + +* Tue Aug 26 2003 Elliot Lee 1.2-1 +- Fix -3 option + +* Wed Aug 13 2003 Elliot Lee 1.1-1 +- Add -3 option + +* Wed Jun 11 2003 Elliot Lee +- Initial build. From svn at tinysofa.org Thu Jul 1 15:40:28 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:40:28 +1000 (EST) Subject: [tinysofa-svn] r2654 - in tinysofa/snapshot: . setools setools/current setools/current/sources setools/current/specs Message-ID: <20040701154028.F38814E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:40:28 +1000 (Fri, 02 Jul 2004) New Revision: 2654 Added: tinysofa/snapshot/setools/ tinysofa/snapshot/setools/current/ tinysofa/snapshot/setools/current/sources/ tinysofa/snapshot/setools/current/sources/setools-1.4.tgz tinysofa/snapshot/setools/current/sources/setools-rhat.patch tinysofa/snapshot/setools/current/specs/ tinysofa/snapshot/setools/current/specs/setools.spec Log: - Add setools to snapshot from 2.0. Added: tinysofa/snapshot/setools/current/sources/setools-1.4.tgz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/setools/current/sources/setools-1.4.tgz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/setools/current/sources/setools-rhat.patch =================================================================== --- tinysofa/snapshot/setools/current/sources/setools-rhat.patch 2004-07-01 15:40:27 UTC (rev 2653) +++ tinysofa/snapshot/setools/current/sources/setools-rhat.patch 2004-07-01 15:40:28 UTC (rev 2654) @@ -0,0 +1,253 @@ +--- setools-1.4/seuser/Makefile.rhat 2004-06-02 13:44:13.000000000 -0400 ++++ setools-1.4/seuser/Makefile 2004-06-02 15:57:20.000000000 -0400 +@@ -22,10 +22,10 @@ + SHELL = /bin/sh + + seuser: $(CMD-OBJ) +- $(CC) -o $@ $(CMD-OBJ) $(LINKFLAGS) $(LIBS) ++ $(CC) -o $@ $(CMD-OBJ) $(LINKFLAGS) $(LIBS) -lselinux + + seuserx: $(GUI-OBJ) se_user.tcl +- $(CC) $(GUI_CFLAGS) $(TCL_LIBINC) -o $@ $(GUI-OBJ) $(LINKFLAGS) $(TCL_LIBS) ++ $(CC) $(GUI_CFLAGS) $(TCL_LIBINC) -o $@ $(GUI-OBJ) $(LINKFLAGS) $(TCL_LIBS) -lselinux + + se_user.tcl: $(TCL-FILES) + cat $(TCL-FILES) | \ +--- setools-1.4/awish/Makefile.rhat 2004-06-02 13:44:13.000000000 -0400 ++++ setools-1.4/awish/Makefile 2004-06-02 15:57:20.000000000 -0400 +@@ -4,7 +4,7 @@ + AWISH_OBJ = awish.o $(LIBSEUSER-TCL) $(LIBAPOL-TCL) + + awish: $(AWISH_OBJ) +- $(CC) $(TCL_LIBINC) -o $@ $(AWISH_OBJ) $(LINKFLAGS) $(TCL_LIBS) ++ $(CC) $(TCL_LIBINC) -o $@ $(AWISH_OBJ) $(LINKFLAGS) $(TCL_LIBS) -lselinux + + + %.o: %.c +@@ -12,16 +12,16 @@ + + ../lib/libapol.a: + cd ../ ; $(MAKE) libapol +- ++ + ../lib/libapol-tcl.a: + cd ../ ; $(MAKE) libapol-tcl + + ../lib/libseuser-tcl.a: + cd ../ ; $(MAKE) libseuser-tcl +- ++ + ../lib/libseuser.a: + cd ../ ; $(MAKE) libseuser +- ++ + install: awish + install -m 755 awish $(BINDIR) + +--- setools-1.4/libseuser/seuser_db.c.rhat 2004-06-02 13:44:13.000000000 -0400 ++++ setools-1.4/libseuser/seuser_db.c 2004-06-02 15:57:20.000000000 -0400 +@@ -17,6 +17,7 @@ + #include + #include + #include ++#include + #include "seuser_db.h" + + /* apol lib */ +@@ -788,8 +789,10 @@ + } + free(full_config); + +- +- db->policy_conf = get_config_var("policy.conf", fp); ++ /* db->policy_conf = get_config_var("policy.conf", fp);*/ ++ db->policy_conf = malloc(PATH_MAX); ++ snprintf(db->policy_conf, PATH_MAX, "%s/src/policy/policy.conf", ++ selinux_policy_root()); + if(db->policy_conf == NULL) { + fclose(fp); + free_conf_info(db); +@@ -804,7 +807,9 @@ + return 4; + } + +- db->policy_dir = get_config_var("policy_dir", fp); ++ /* db->policy_dir = get_config_var("policy_dir", fp);*/ ++ db->policy_dir = malloc(PATH_MAX); ++ snprintf(db->policy_dir, PATH_MAX, "%s/src/policy", selinux_policy_root()); + if(db->policy_dir == NULL) { + fclose(fp); + free_conf_info(db); +@@ -819,7 +824,9 @@ + return 6; + } + +- db->user_file = get_config_var("user_file", fp); ++ /* db->user_file = get_config_var("user_file", fp);*/ ++ db->user_file = malloc(PATH_MAX); ++ snprintf(db->user_file, PATH_MAX, "%s/src/policy/users", selinux_policy_root()); + if(db->user_file == NULL) { + fclose(fp); + free_conf_info(db); +@@ -828,7 +835,8 @@ + } + /* users file may not exist which is ok, so we won't check read access. */ + +- db->file_contexts_file = get_config_var("file_contexts_file", fp); ++ /* db->file_contexts_file = get_config_var("file_contexts_file", fp);*/ ++ db->file_contexts_file = strdup(selinux_file_context_path()); + if(db->file_contexts_file == NULL) { + fclose(fp); + free_conf_info(db); +--- setools-1.4/libseuser/Makefile.rhat 2004-06-02 13:44:12.000000000 -0400 ++++ setools-1.4/libseuser/Makefile 2004-06-02 15:57:20.000000000 -0400 +@@ -11,8 +11,12 @@ + + libseuser-tcl: ../lib/libseuser-tcl.a + ++install: libseuser libseuser-tcl ++ install -m 644 ../lib/libseuser.a $(INSTALL_LIBDIR) ++ install -m 644 *.h $(INCLUDEDIR) ++ + ../lib/libseuser.a: ../lib $(LIB-OBJ) +- ar cr $@ $(LIB-OBJ) ++ ar cr $@ $(LIB-OBJ) -lselinux + + ../lib/libseuser-tcl.a: ../lib $(LIB-OBJ-TCL) + ar cr $@ $(LIB-OBJ-TCL) +@@ -20,7 +24,7 @@ + %.o: %.c + $(CC) $(CFLAGS) -c $< + +- ++ + ../lib: + mkdir -p $@ + +--- setools-1.4/packages/Makefile.rhat 2004-06-02 13:44:12.000000000 -0400 ++++ setools-1.4/packages/Makefile 2004-06-02 16:03:28.000000000 -0400 +@@ -4,9 +4,10 @@ + + # INSTALL_PATH is set based upon your current + # version of tcl using the tcl_vars script. +-INSTALL_PATH=$(shell env tclsh ../tcl_vars tcl_library) ++INSTALL_PATH=$(DESTDIR)/$(shell env tclsh ../tcl_vars tcl_library) + + install: ++ mkdir -p $(INSTALL_PATH) + tar -zxvf BWidget-1.4.1.tar.gz + mv BWidget-1.4.1 $(INSTALL_PATH) + +@@ -19,4 +20,4 @@ + clean: + rm -rf BWidget-1.4.1/ + +-bare: clean +\ No newline at end of file ++bare: clean +--- setools-1.4/Makefile.rhat 2004-06-02 13:44:13.000000000 -0400 ++++ setools-1.4/Makefile 2004-06-10 14:56:04.354591984 -0400 +@@ -21,8 +21,9 @@ + # File location defaults; used in various places in code + # Change these if you want different defaults + SELINUX_DIR = $(DESTDIR)/selinux +-POLICY_INSTALL_DIR = $(DESTDIR)/etc/security/selinux +-POLICY_SRC_DIR = $(DESTDIR)$(POLICY_INSTALL_DIR)/src/policy ++SELINUX_POLICY_DIR = $(DESTDIR)/etc/selinux/strict/ ++POLICY_INSTALL_DIR = $(DESTDIR)$(SELINUX_POLICY_DIR)/policy ++POLICY_SRC_DIR = $(DESTDIR)$(SELINUX_POLICY_DIR)/src/policy + POLICY_SRC_FILE = $(POLICY_SRC_DIR)/policy.conf + DEFAULT_LOG_FILE = /var/log/messages + +@@ -120,7 +121,7 @@ + echo "Could not build awish."; \ + echo "Tcl library is not built or not in expected location(s)."; \ + fi +- ++ + seuser: selinux_tool + cd seuser; $(MAKE) seuser + +@@ -141,9 +142,9 @@ + + secmds: selinux_tool + cd secmds; $(MAKE) all +- ++ + libapol: selinux_tool +- cd libapol; $(MAKE) libapol ++ cd libapol; $(MAKE) libapol + + libapol-tcl: selinux_tool + cd libapol; +@@ -215,17 +216,23 @@ + + install-nogui: $(INSTALL_LIBDIR) install-seuser install-secmds + ++install-bwidget: ++ cd packages; make ++ ++install-docs: docs ++ install -m 755 -d $(INSTALL_HELPDIR) ++ cd docs-src; $(MAKE) install INSTALL_HELPDIR=$(INSTALL_HELPDIR) + +-install: install-apol install-seuserx install-sepcut install-awish install-secmds install-seaudit ++install: install-apol install-seuserx install-sepcut install-awish install-secmds install-seaudit install-bwidget install-docs + + # Install the policy - this is a separate step to better support systems with + # non-standard policies. + install-seuser-policy: $(INSTALL_LIBDIR) + cd seuser; $(MAKE) install-policy +- ++ + install-secmds-policy: $(INSTALL_LIBDIR) + cd secmds; $(MAKE) install-policy +- ++ + install-policy: install-seuser-policy install-secmds-policy + + # Next four targets are to support installation as part of a system +--- setools-1.4/docs-src/Makefile.rhat 2004-06-02 13:44:13.000000000 -0400 ++++ setools-1.4/docs-src/Makefile 2004-06-02 15:57:20.000000000 -0400 +@@ -55,3 +55,14 @@ + for file in $(TOP-DOCS); do \ + rm -f ../$$file; \ + done ++ ++install: ++ for file in KNOWN-BUGS README; do \ ++ cat $$file.in | sed -e 's/RELEASE_VERSION/$(shell cat ../VERSION)/g' | \ ++ sed -e 's/MOD_DATE/$(shell date '+%B %d, %G')/g' > ${INSTALL_HELPDIR}/$$file; \ ++ done ++ install -m 644 ../seaudit/seaudit_help.txt ${INSTALL_HELPDIR} ++ install -m 644 ../seuser/seuser_help.txt ${INSTALL_HELPDIR} ++ install -m 644 ../sepct/sepcut_help.txt ${INSTALL_HELPDIR} ++ install -m 644 ../apol/*.txt ${INSTALL_HELPDIR} ++ +--- setools-1.4/apol/Makefile.rhat 2004-06-02 13:44:12.000000000 -0400 ++++ setools-1.4/apol/Makefile 2004-06-02 15:57:20.000000000 -0400 +@@ -11,14 +11,14 @@ + APOL_HELP_FILES = apol_help.txt dta_help.txt iflow_help.txt obj_perms_help.txt + APOL_PERM_MAPS = apol_perm_mapping_ver12 apol_perm_mapping_ver15 \ + apol_perm_mapping_ver16 apol_perm_mapping_ver17 +- ++ + APOL_DFLT_PMAP = apol_perm_mapping_ver16 + LIBAPOL = ../lib/libapol-tcl.a ../lib/libapol.a + GUI-OBJ = apol_gui.o $(LIBAPOL) + CFLAGS += -DSTARTUP_SCRIPT='"$(APOL_STARTUP_SCRIPT)"' + + apol: $(GUI-OBJ) apol.tcl +- $(CC) $(TCL_LIBINC) -o $@ $(GUI-OBJ) $(LINKFLAGS) $(TCL_LIBS) ++ $(CC) $(TCL_LIBINC) -o $@ $(GUI-OBJ) $(LINKFLAGS) $(TCL_LIBS) -lselinux + + + apol.tcl: $(TCL-FILES) +@@ -55,6 +55,7 @@ + done \ + fi + install -m 644 apol.tcl $(APOL_HELP_FILES) $(APOL_PERM_MAPS) $(INSTALL_LIBDIR) ++ install -m 644 $(APOL_HELP_FILES) $(APOL_PERM_MAPS) ${INSTALL_HELPDIR} + cd $(INSTALL_LIBDIR); ln -sf $(APOL_DFLT_PMAP) apol_perm_mapping + + clean: Added: tinysofa/snapshot/setools/current/specs/setools.spec =================================================================== --- tinysofa/snapshot/setools/current/specs/setools.spec 2004-07-01 15:40:27 UTC (rev 2653) +++ tinysofa/snapshot/setools/current/specs/setools.spec 2004-07-01 15:40:28 UTC (rev 2654) @@ -0,0 +1,213 @@ +Summary: SELinux tools for managing policy +Name: setools +Version: 1.4 +Release: 3ts +License: GPL +Group: System Environment/Base +Source: http://www.tresys.com/Downloads/selinux-tools/setools-%{version}.tgz +Prefix: %{_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-root +Requires: checkpolicy, policycoreutils +Buildrequires: tk-devel tcl-devel libxml2-devel gtk2-devel libglade2-devel +Patch0: setools-rhat.patch +Obsoletes: setools-devel + +%description +Security-enhanced Linux is a patch of the Linux kernel and a number of +utilities with enhanced security functionality designed to add mandatory access +controls to Linux. The Security-enhanced Linux kernel contains new +architectural components originally developed to improve the security of the Flask +operating system. These architectural components provide general support for the +enforcement of many kinds of mandatory access control policies, including those +based on the concepts of Type Enforcement, Role-based Access Control, and +Multi-level Security. + +The tools and libraries in this release include: + +1. seuser: A GUI and command line user manager tool for SELinux. This +is a tool that actually manages a portion of a running policy (i.e., +user accounts). + +2. seuser scripts: A set of shell scripts: seuseradd, seusermod, and +seuserdel. These scripts combine the functions of the associated s* +commands with seuser to provide a single interface to manage users in +SE Linux. + +3. libapol: The main policy.conf analysis library, which is the core +library for all our tools. + +See the help files for apol, sepcut, and seuser for help on using the +tools. + +%package gui +Summary: Graphical tools for handling SETools +Group: System Environment/Base +Requires: %name + +#%package devel +#Summary: Libraries used for manipulation of policy by SETools +#Group: System Environment/Base +#Requires: %name + +#%description devel +#setools libraries used for manipulation and investigation of policy. + +%description gui +Security-enhanced Linux is a patch of the Linux kernel and a number of +utilities with enhanced security functionality designed to add mandatory access +controls to Linux. The Security-enhanced Linux kernel contains new +architectural components originally developed to improve the security of the Flask +operating system. These architectural components provide general support for the +enforcement of many kinds of mandatory access control policies, including those +based on the concepts of Type Enforcement, Role-based Access Control, and +Multi-level Security. + +The tools and libraries in this release include: + +1. apol: The GUI-based policy analysis tool. + +2. sepcut: A basic GUI-based policy configuration, browsing, +editing, and testing tool. This tool is intended to provide a +complete, single user interface for viewing the source files of a +policy, configuring policy program modules, editing policy files, and +making and testing the policy. + +3. awish: A version of the TCL/TK wish interpreter that includes the +setools libraries. We use this to test our GUIs (apol and seuser have the +interpreter compiled within them). One could conceivably write one's own +GUI tools using TCL/TK as extended via awish. + +See the help files for apol, sepcut, and seuser for help on using the +tools. + +%prep +%setup -q +%patch0 -p1 -b .rhat + +%build +make LIBDIR=%{_libdir} all + +%install +rm -rf ${RPM_BUILD_ROOT} +mkdir -p $RPM_BUILD_ROOT/%_bindir +mkdir -p $RPM_BUILD_ROOT/%_libdir +mkdir -p $RPM_BUILD_ROOT/usr/include/selinux/apol +mkdir -p $RPM_BUILD_ROOT/usr/share/doc/setools-%{version} +make DESTDIR="${RPM_BUILD_ROOT}" INSTALL_HELPDIR=$RPM_BUILD_ROOT/usr/share/doc/setools-%{version} install +rm -f ${RPM_BUILD_ROOT}/etc/selinux/strict/src/policy/domains/program/seuser.te +rm -f ${RPM_BUILD_ROOT}/etc/selinux/strict/src/policy/file_contexts/program/seuser.fc +rm -f ${RPM_BUILD_ROOT}/usr/bin/findcon +rm -f ${RPM_BUILD_ROOT}/usr/bin/replcon + +%clean +rm -rf ${RPM_BUILD_ROOT} + +%files gui +%defattr(-,root,root) +%_bindir/apol +%_bindir/seuserx +%_bindir/awish +%_bindir/seaudit +/usr/share/tcl8.4/BWidget-1.4.1/* + +%files +%defattr(-,root,root) +%_bindir/seuser +%_bindir/seuseradd +%_bindir/seuserdel +%_bindir/seusermod +%_bindir/sepcut +%_bindir/seinfo +%_bindir/sesearch +/usr/share/setools/* +/usr/share/doc/setools-%{version}/* + +%changelog +* Tue Jun 15 2004 Elliot Lee +- rebuilt + + +* Thu Jun 10 2004 Dan Walsh 1.4-2 +- Fix install locations of policy_src_dir + +* Wed Jun 2 2004 Dan Walsh 1.4-1 +- Update to latest from TRESYS. + +* Tue Jun 1 2004 Dan Walsh 1.3-3 +- Make changes to work with targeted/strict policy +* Fri Apr 16 2004 Dan Walsh 1.3-2 +- Take out requirement for policy file + +* Fri Apr 16 2004 Dan Walsh 1.3-1 +- Fix doc location + +* Fri Apr 16 2004 Dan Walsh 1.3-1 +- Latest from TRESYS + +* Tue Apr 13 2004 Dan Walsh 1.2.1-8 +- fix location of policy.conf file + +* Tue Apr 6 2004 Dan Walsh 1.2.1-7 +- Obsolete setools-devel +* Tue Apr 6 2004 Dan Walsh 1.2.1-6 +- Fix location of +* Tue Apr 6 2004 Dan Walsh 1.2.1-5 +- Remove devel libraries +- Fix installdir for lib64 + +* Sat Apr 3 2004 Dan Walsh 1.2.1-4 +- Add usr_t file read to policy + +* Thu Mar 25 2004 Dan Walsh 1.2.1-3 +- Use tcl8.4 + +* Tue Mar 02 2004 Elliot Lee +- rebuilt + +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Fri Feb 6 2004 Dan Walsh 1.2.1-1 +- New patch + +* Fri Feb 6 2004 Dan Walsh 1.2-1 +- Latest upstream version + +* Tue Dec 30 2003 Dan Walsh 1.1.1-1 +- New version from upstream +- Remove seuser.te. Now in policy file. + +* Tue Dec 30 2003 Dan Walsh 1.1-2 +- Add Defattr to devel +- move libs to base kit + +* Fri Dec 19 2003 Dan Walsh 1.1-1 +- Update to latest code from tresys +- Break into three separate packages for cmdline, devel and gui +- Incorporate the tcl patch + +* Mon Dec 15 2003 Jens Petersen - 1.0.1-3 +- apply setools-1.0.1-tcltk.patch to build against tcl/tk 8.4 +- buildrequire tk-devel + +* Thu Nov 20 2003 Dan Walsh 1.0.1-2 +- Add Bwidgets to this RPM + +* Tue Nov 4 2003 Dan Walsh 1.0.1-1 +- Upgrade to 1.0.1 + +* Wed Oct 15 2003 Dan Walsh 1.0-6 +- Clean up build + +* Tue Oct 14 2003 Dan Walsh 1.0-5 +- Update with correct seuser.te + +* Wed Oct 1 2003 Dan Walsh 1.0-4 +- Update with final release from Tresys + +* Mon Jun 2 2003 Dan Walsh 1.0-1 +- Initial version + + + + From svn at tinysofa.org Thu Jul 1 15:40:30 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:40:30 +1000 (EST) Subject: [tinysofa-svn] r2655 - in tinysofa/snapshot: . setserial setserial/current setserial/current/sources setserial/current/specs Message-ID: <20040701154030.C83844E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:40:30 +1000 (Fri, 02 Jul 2004) New Revision: 2655 Added: tinysofa/snapshot/setserial/ tinysofa/snapshot/setserial/current/ tinysofa/snapshot/setserial/current/sources/ tinysofa/snapshot/setserial/current/sources/setserial-2.17-fhs.patch tinysofa/snapshot/setserial/current/sources/setserial-2.17-rc.patch tinysofa/snapshot/setserial/current/sources/setserial-2.17-readme.patch tinysofa/snapshot/setserial/current/sources/setserial-2.17-spelling.patch tinysofa/snapshot/setserial/current/sources/setserial-2.17.tar.gz tinysofa/snapshot/setserial/current/specs/ tinysofa/snapshot/setserial/current/specs/setserial.spec Log: - Add setserial to snapshot from 2.0. Added: tinysofa/snapshot/setserial/current/sources/setserial-2.17-fhs.patch =================================================================== --- tinysofa/snapshot/setserial/current/sources/setserial-2.17-fhs.patch 2004-07-01 15:40:28 UTC (rev 2654) +++ tinysofa/snapshot/setserial/current/sources/setserial-2.17-fhs.patch 2004-07-01 15:40:30 UTC (rev 2655) @@ -0,0 +1,24 @@ +--- setserial-2.17/Makefile.in.fhs Wed Jun 14 15:42:39 2000 ++++ setserial-2.17/Makefile.in Wed Jun 14 15:44:25 2000 +@@ -3,6 +3,8 @@ + + srcdir = @srcdir@ + VPATH = @srcdir@ ++bindir = @bindir@ ++mandir = @bindir@ + + VERSION = @RELEASE_VERSION@ + INSTALL = @INSTALL@ +@@ -26,9 +28,9 @@ + nroff -man setserial.8 > setserial.cat + + install: setserial setserial.8 +- $(INSTALL_PROGRAM) setserial $(DESTDIR)/bin +- $(STRIP) $(DESTDIR)/bin/setserial +- $(INSTALL_DATA) setserial.8 $(DESTDIR)/usr/man/man8 ++ $(INSTALL_PROGRAM) setserial $(DESTDIR)$(bindir) ++ $(STRIP) $(DESTDIR)$(bindir)/setserial ++ $(INSTALL_DATA) setserial.8 $(DESTDIR)$(mandir)/man8 + + clean: + $(RM) setserial setserial.o setserial.cat *~ Added: tinysofa/snapshot/setserial/current/sources/setserial-2.17-rc.patch =================================================================== --- tinysofa/snapshot/setserial/current/sources/setserial-2.17-rc.patch 2004-07-01 15:40:28 UTC (rev 2654) +++ tinysofa/snapshot/setserial/current/sources/setserial-2.17-rc.patch 2004-07-01 15:40:30 UTC (rev 2655) @@ -0,0 +1,65 @@ +--- setserial-2.17/rc.serial.rc Thu Jan 27 15:47:30 2000 ++++ setserial-2.17/rc.serial Tue Sep 11 17:54:26 2001 +@@ -19,7 +19,7 @@ + # + + RCLOCKFILE=/var/lock/subsys/serial +-DIRS="/lib/modules/`uname -r`/misc /lib/modules /usr/lib/modules ." ++DIRS="/lib/modules/`uname -r`/kernel/drivers/char /lib/modules/`uname -r`/misc /lib/modules /usr/lib/modules ." + PATH=/bin:/sbin:/usr/bin + DRIVER=serial + DRIVER_NAME=serial +@@ -79,10 +79,11 @@ + + if test $action = stop ; then + if test -n ${SETSERIAL} -a "$LOADED" != "no" -a \ +- `head -1 /etc/serial.conf`X = "###AUTOSAVE###X" ; then ++ "$(head -1 /etc/serial.conf 2>/dev/null)" = "###AUTOSAVE###" ; then + echo -n "Saving state of serial devices... " + grep "^#" /etc/serial.conf > /etc/.serial.conf.new +- ${SETSERIAL} -G -g ${ALLDEVS} >> /etc/.serial.conf.new ++ ${SETSERIAL} -G -g ${ALLDEVS} \ ++ 2>/dev/null >> /etc/.serial.conf.new + mv /etc/serial.conf /etc/.serial.conf.old + mv /etc/.serial.conf.new /etc/serial.conf + echo "done." +@@ -108,22 +109,26 @@ + # If not stop, it must be a start.... + # + +-if test -n $MODULE -a "$LOADED" != "yes" ; then ++if test -n "$MODULE" -a "$LOADED" != "yes" ; then ++ MAPFILE=$(mktemp /tmp/$DRIVER.map.XXXXXX) \ ++ || { echo "Couldn't create secure temporary file"; exit 1; } ++ ERRORS=$(mktemp /tmp/$DRIVER.XXXXXX) \ ++ || { echo "Couldn't create secure temporary file"; exit 1; } + if insmod -fm $MODULE $DRIVER_ARG \ +- > /tmp/$DRIVER.map 2> /tmp/$DRIVER.$$; then :; ++ > "${MAPFILE}" 2> "${ERRORS}"; then :; + else + echo "Couldn't load $DRIVER_NAME driver." +- echo "See error logs in /tmp/$DRIVER.$$" ++ echo "See error logs in ${ERRORS}" + exit 1 + fi +- /bin/rm -f /tmp/$DRIVER.$$ ++ /bin/rm -f "${ERRORS}" + fi + +-if test -f /etc/serial.conf ; then +- if test -n ${SETSERIAL} ; then ++if test -f "/etc/serial.conf" ; then ++ if test -n "${SETSERIAL}" ; then + grep -v ^# < /etc/serial.conf | while read device args + do +- ${SETSERIAL} -z $device $args ++ ${SETSERIAL} -z $device $args 2>/dev/null + done + fi + else +@@ -131,4 +136,4 @@ + fi + + touch ${RCLOCKFILE} +-${SETSERIAL} -bg ${ALLDEVS} ++${SETSERIAL} -bg ${ALLDEVS} 2>/dev/null Added: tinysofa/snapshot/setserial/current/sources/setserial-2.17-readme.patch =================================================================== --- tinysofa/snapshot/setserial/current/sources/setserial-2.17-readme.patch 2004-07-01 15:40:28 UTC (rev 2654) +++ tinysofa/snapshot/setserial/current/sources/setserial-2.17-readme.patch 2004-07-01 15:40:30 UTC (rev 2655) @@ -0,0 +1,11 @@ +--- setserial-2.17/README.readme Tue Sep 11 17:59:52 2001 ++++ setserial-2.17/README Tue Sep 11 18:00:27 2001 +@@ -13,6 +13,6 @@ + + The simplest way to configure the serial ports is to copy the provided + rc.serial file to the appropriate /etc/rc.d directory. For example, +-to install rc.serial on a RedHat system, copy rc.serial to +-/etc/rc.d/init.d/serial, and then run the command "chkconfig -add serial". ++to install rc.serial on a Red Hat Linux system, copy rc.serial to ++/etc/rc.d/init.d/serial, and then run the command "chkconfig --add serial". + Added: tinysofa/snapshot/setserial/current/sources/setserial-2.17-spelling.patch =================================================================== --- tinysofa/snapshot/setserial/current/sources/setserial-2.17-spelling.patch 2004-07-01 15:40:28 UTC (rev 2654) +++ tinysofa/snapshot/setserial/current/sources/setserial-2.17-spelling.patch 2004-07-01 15:40:30 UTC (rev 2655) @@ -0,0 +1,11 @@ +--- setserial-2.17/setserial.c.spelling 2003-01-10 17:21:24.000000000 +0000 ++++ setserial-2.17/setserial.c 2003-01-10 17:21:39.000000000 +0000 +@@ -707,7 +707,7 @@ + fprintf(stderr, "\t spd_warp\tuse 460kb instead of 38.4kb\n"); + fprintf(stderr, "\t spd_cust\tuse the custom divisor to set the speed at 38.4kb\n"); + fprintf(stderr, "\t\t\t\t(baud rate = baud_base / custom_divisor)\n"); +- fprintf(stderr, "\t spd_normal\tuse 38.4kb when a buad rate of 38.4kb is selected\n"); ++ fprintf(stderr, "\t spd_normal\tuse 38.4kb when a baud rate of 38.4kb is selected\n"); + fprintf(stderr, "\n"); + fprintf(stderr, "Use a leading '0x' for hex numbers.\n"); + fprintf(stderr, "CAUTION: Using an invalid port can lock up your machine!\n"); Added: tinysofa/snapshot/setserial/current/sources/setserial-2.17.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/setserial/current/sources/setserial-2.17.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/setserial/current/specs/setserial.spec =================================================================== --- tinysofa/snapshot/setserial/current/specs/setserial.spec 2004-07-01 15:40:28 UTC (rev 2654) +++ tinysofa/snapshot/setserial/current/specs/setserial.spec 2004-07-01 15:40:30 UTC (rev 2655) @@ -0,0 +1,133 @@ +%define _bindir /bin + +Summary: A utility for configuring serial ports. +Name: setserial +Version: 2.17 +Release: 16ts +Source: ftp://tsx-11.mit.edu/pub/linux/sources/sbin/setserial-%{version}.tar.gz +Patch0: setserial-2.17-fhs.patch +Patch1: setserial-2.17-rc.patch +Patch2: setserial-2.17-readme.patch +Patch3: setserial-2.17-spelling.patch +License: GPL +Group: Applications/System +Prefix: %{_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-root +ExcludeArch: s390 s390x + +BuildRequires: groff + +%description +Setserial is a basic system utility for displaying or setting serial +port information. Setserial can reveal and allow you to alter the I/O +port and IRQ that a particular serial device is using, and more. + +%prep +%setup -q +%patch0 -p1 -b .fhs +%patch1 -p1 -b .rc +%patch2 -p1 -b .readme +%patch3 -p1 -b .spelling +rm -f config.cache + +%build + +%configure +make + +%install +rm -rf ${RPM_BUILD_ROOT} +mkdir -p ${RPM_BUILD_ROOT}%{_bindir} +mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man8 + +%makeinstall STRIP=: + +%clean +rm -rf ${RPM_BUILD_ROOT} + +%files +%defattr(-,root,root) +%doc README rc.serial +%{_bindir}/setserial +%{_mandir}/man*/* + +%changelog +* Tue Jun 15 2004 Elliot Lee +- rebuilt + +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Thu Nov 27 2003 Tim Waugh 2.17-14 +- Build requires groff (bug #111088). + +* Wed Jun 04 2003 Elliot Lee +- rebuilt + +* Wed Jan 22 2003 Tim Powers +- rebuilt + +* Fri Jan 10 2003 Tim Waugh 2.17-11 +- Fix spelling mistake (bug #80896). + +* Wed Nov 20 2002 Tim Powers 2.17-10 +- rebuild in current collinst + +* Fri Jun 21 2002 Tim Powers +- automated rebuild + +* Thu May 23 2002 Tim Powers +- automated rebuild + +* Mon Apr 22 2002 Tim Waugh 2.17-7 +- Don't strip binaries explicitly (bug #62566). + +* Wed Jan 09 2002 Tim Powers +- automated rebuild + +* Tue Sep 11 2001 Tim Waugh 2.17-5 +- Fix init script (bug #52862). +- Avoid temporary file vulnerability in init script. +- Update README: it's --add, not -add. + +* Tue Jun 19 2001 Florian La Roche 2.17-4 +- add ExcludeArch: s390 s390x + +* Wed May 30 2001 Tim Waugh 2.17-3 +- Sync description with specspo. + +* Wed Jul 12 2000 Prospector 2.17-2 +- automatic rebuild + +* Wed Jun 14 2000 Jeff Johnson +- update to 2.17. +- FHS packaging. + +* Mon Feb 7 2000 Jeff Johnson +- compress man pages. + +* Sun Mar 21 1999 Cristian Gafton +- auto rebuild in the new build environment (release 2) + +* Thu Feb 11 1999 Michael Maher +- fixed bug #363 + +* Thu Dec 17 1998 Michael Maher +- built package for 6.0 + +* Sat Jun 20 1998 Jeff Johnson +- upgraded to 2.1.14 + +* Thu May 07 1998 Prospector System +- translations modified for de, fr, tr + +* Thu Oct 23 1997 Donnie Barnes +- pulled into distribution +- used setserial-2.12_CTI.tgz instead of setserial-2.12.tar.gz (former is + all that sunsite has) - not sure what the difference is. + +* Thu Sep 25 1997 Christian 'Dr. Disk' Hechelmann +- added %attr's +- added sanity check for RPM_BUILD_ROOT +- setserial is now installed into /bin, where util-linux puts it and all + startup scripts expect it. From svn at tinysofa.org Thu Jul 1 15:40:32 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:40:32 +1000 (EST) Subject: [tinysofa-svn] r2656 - in tinysofa/snapshot: . setuptool setuptool/current setuptool/current/sources setuptool/current/specs Message-ID: <20040701154032.ADB2F4E817D@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:40:32 +1000 (Fri, 02 Jul 2004) New Revision: 2656 Added: tinysofa/snapshot/setuptool/ tinysofa/snapshot/setuptool/current/ tinysofa/snapshot/setuptool/current/sources/ tinysofa/snapshot/setuptool/current/sources/setuptool-1.15.tar.gz tinysofa/snapshot/setuptool/current/specs/ tinysofa/snapshot/setuptool/current/specs/setuptool.spec Log: - Add setuptool to snapshot from 2.0. Added: tinysofa/snapshot/setuptool/current/sources/setuptool-1.15.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/setuptool/current/sources/setuptool-1.15.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/setuptool/current/specs/setuptool.spec =================================================================== --- tinysofa/snapshot/setuptool/current/specs/setuptool.spec 2004-07-01 15:40:30 UTC (rev 2655) +++ tinysofa/snapshot/setuptool/current/specs/setuptool.spec 2004-07-01 15:40:32 UTC (rev 2656) @@ -0,0 +1,158 @@ +# the name is "setuptool" because we already have a package +# named "setup". Oh, well. +Name: setuptool +Version: 1.15 +Release: 2ts +Summary: A text mode system configuration tool. +License: GPL +Group: Applications/System +Source: setuptool-%{version}.tar.gz +BuildRoot: %{_tmppath}/%{name}-%{version}-root +BuildPrereq: newt-devel + +%description +Setuptool is a user-friendly text mode menu utility which allows you +to access all of the text mode configuration programs included in the +Red Hat Linux operating system. + +You should install the setuptool package because you will find +yourself using its features for essential system administration. + +%prep +%setup -q + +%build +%configure +make + +%install +rm -rf $RPM_BUILD_ROOT +make install DESTDIR=$RPM_BUILD_ROOT +%find_lang setup + +%clean +rm -rf $RPM_BUILD_ROOT + +%files -f setup.lang +%defattr(-,root,root) +%attr(0755,root,root) %{_bindir}/* +%attr(0644,root,root) %{_sysconfdir}/pam.d/* +%attr(0644,root,root) %{_sysconfdir}/security/console.apps/* +%attr(0755,root,root) %{_sbindir}/* +%attr(0755,root,root) %dir %{_sysconfdir}/setuptool.d +%attr(0644,root,root) %{_sysconfdir}/setuptool.d/* + +%changelog +* Tue Jun 15 2004 Elliot Lee +- rebuilt + +* Wed May 5 2004 Nalin Dahyabhai 1.15-1 +- prefer system-config-keyboard to kbdconfig (#122575) +- handle tools which require command-line arguments correctly + +* Tue Apr 13 2004 Nalin Dahyabhai 1.14-1 +- use control files to find things so that the source needn't be + revised so often +- determine available translations at build-time (#102082) + +* Fri Feb 13 2004 Elliot Lee 1.13-2.1 +- rebuilt + +* Sat Jul 12 2003 Nalin Dahyabhai 1.13-2 +- rebuild + +* Sat Jul 12 2003 Nalin Dahyabhai 1.13-1 +- call bindtextdomain and textdomain with the right values (#74059) + +* Wed Feb 19 2003 Nalin Dahyabhai 1.12-1 +- setup complains if we're not root, set FALLBACK=false in the userhelper config + +* Mon Jan 27 2003 Nalin Dahyabhai 1.11-2 +- rebuild + +* Mon Nov 11 2002 Bill Nottingham 1.11-1 +- kill hardcoded paths from pam config file + +* Tue Sep 3 2002 Trond Eivind Glomsr?d 1.10-1 +- Update translations + +* Thu Aug 15 2002 Bill Nottingham 1.9-2 +- build against new slang + +* Wed Jul 24 2002 Nalin Dahyabhai 1.9-1 +- nuke the .desktop file +- add usermode bits + +* Wed Jul 24 2002 Nalin Dahyabhai 1.9-1 +- intltoolize, use desktop-file-install, autotools full pull + +* Fri Jun 21 2002 Tim Powers +- automated rebuild + +* Sun May 26 2002 Tim Powers +- automated rebuild + +* Thu May 16 2002 Nalin Dahyabhai 1.8-3 +- rebuild in new environment + +* Mon Aug 6 2001 Nalin Dahyabhai +- add buildrequires on newt-devel (#49696) + +* Sun Aug 5 2001 Nalin Dahyabhai +- add printconf-tui for printer configuration + +* Fri Feb 23 2001 Trond Eivind Glomsr?d +- langify + +* Wed Jan 24 2001 Nalin Dahyabhai +- add lokkit for firewall configuration (#24854) + +* Tue Jan 16 2001 Nalin Dahyabhai +- add netconfig (no, not netconf, and not netcfg, netconfig) (#23444) + +* Wed Dec 20 2000 Bill Nottingham +- ship the translations (oops) + +* Thu Aug 24 2000 Erik Troan +- updated it/es translations + +* Sat Aug 19 2000 Nalin Dahyabhai +- make the .desktop file root-only-readable, because only root can run + setuptool anyway (#16575) + +* Sun Aug 6 2000 Bill Nottingham +- don't bother running if they're not root (#15560) + +* Fri Aug 4 2000 Nalin Dahyabhai +- add sv translations for .desktop file (#15361) + +* Wed Jul 26 2000 Matt Wilson +- new translations for de fr it es + +* Wed Jun 28 2000 Nalin Dahyabhai +- add "archive" make target +- size list box based on length of list + +* Sun Jun 18 2000 Matt Wilson +- rebuild for next release + +* Wed Feb 09 2000 Preston Brown +- wmconfig -> desktop + +* Thu Feb 3 2000 Nalin Dahyabhai +- rebuilt in new environment + +* Mon Aug 2 1999 Matt Wilson +- rebuilt against newt 0.50 + +* Mon Apr 5 1999 Bill Nottingham +- strip binary + +* Fri Mar 26 1999 Bill Nottingham +- port to C, so we can get python out of base component + +* Tue Mar 16 1999 Bill Nottingham +- add support for authconfig, remove cabaret + +* Wed Nov 05 1997 Michael K. Johnson +- initial version From svn at tinysofa.org Thu Jul 1 15:40:33 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:40:33 +1000 (EST) Subject: [tinysofa-svn] r2657 - in tinysofa/snapshot: . sgml-common sgml-common/current sgml-common/current/sources sgml-common/current/specs Message-ID: <20040701154033.DD9524E817E@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:40:33 +1000 (Fri, 02 Jul 2004) New Revision: 2657 Added: tinysofa/snapshot/sgml-common/ tinysofa/snapshot/sgml-common/current/ tinysofa/snapshot/sgml-common/current/sources/ tinysofa/snapshot/sgml-common/current/sources/html.dcl tinysofa/snapshot/sgml-common/current/sources/html.soc tinysofa/snapshot/sgml-common/current/sources/sgml-common-0.6.3-docdir.patch tinysofa/snapshot/sgml-common/current/sources/sgml-common-0.6.3.tgz tinysofa/snapshot/sgml-common/current/sources/sgml-common-CHANGES tinysofa/snapshot/sgml-common/current/sources/sgml-common-automake.patch tinysofa/snapshot/sgml-common/current/sources/sgml-common-automake.tar.gz tinysofa/snapshot/sgml-common/current/sources/sgml-common-quotes.patch tinysofa/snapshot/sgml-common/current/sources/sgml-common-umask.patch tinysofa/snapshot/sgml-common/current/sources/sgml-common-xmldir.patch tinysofa/snapshot/sgml-common/current/sources/xml.dcl tinysofa/snapshot/sgml-common/current/sources/xml.soc tinysofa/snapshot/sgml-common/current/specs/ tinysofa/snapshot/sgml-common/current/specs/sgml-common.spec Log: - Add sgml-common to snapshot from 2.0. Added: tinysofa/snapshot/sgml-common/current/sources/html.dcl =================================================================== --- tinysofa/snapshot/sgml-common/current/sources/html.dcl 2004-07-01 15:40:32 UTC (rev 2656) +++ tinysofa/snapshot/sgml-common/current/sources/html.dcl 2004-07-01 15:40:33 UTC (rev 2657) @@ -0,0 +1,88 @@ + + Added: tinysofa/snapshot/sgml-common/current/sources/html.soc =================================================================== --- tinysofa/snapshot/sgml-common/current/sources/html.soc 2004-07-01 15:40:32 UTC (rev 2656) +++ tinysofa/snapshot/sgml-common/current/sources/html.soc 2004-07-01 15:40:33 UTC (rev 2657) @@ -0,0 +1,31 @@ + -- catalog: SGML Open style entity catalog for HTML -- + -- $Id: html.soc,v 1.1.1.2 1999/05/02 15:41:46 Avi Exp $ -- + -- Hacked by jjc -- + + -- Ways to refer to Level 2: most general to most specific -- +PUBLIC "-//IETF//DTD HTML//EN" html.dtd +PUBLIC "-//IETF//DTD HTML 2.0//EN" html.dtd +PUBLIC "-//IETF//DTD HTML Level 2//EN" html.dtd +PUBLIC "-//IETF//DTD HTML 2.0 Level 2//EN" html.dtd + + -- Ways to refer to Level 1: most general to most specific -- +PUBLIC "-//IETF//DTD HTML Level 1//EN" html-1.dtd +PUBLIC "-//IETF//DTD HTML 2.0 Level 1//EN" html-1.dtd + + -- Ways to refer to + Strict Level 2: most general to most specific -- +PUBLIC "-//IETF//DTD HTML Strict//EN" html-s.dtd +PUBLIC "-//IETF//DTD HTML 2.0 Strict//EN" html-s.dtd +PUBLIC "-//IETF//DTD HTML Strict Level 2//EN" html-s.dtd +PUBLIC "-//IETF//DTD HTML 2.0 Strict Level 2//EN" html-s.dtd + + -- Ways to refer to + Strict Level 1: most general to most specific -- +PUBLIC "-//IETF//DTD HTML Strict Level 1//EN" html-1s.dtd +PUBLIC "-//IETF//DTD HTML 2.0 Strict Level 1//EN" html-1s.dtd + + -- ISO latin 1 entity set for HTML -- +PUBLIC "ISO 8879-1986//ENTITIES Added Latin 1//EN//HTML" ISOlat1.sgm + +SGMLDECL html.dcl +DOCTYPE html html.dtd Added: tinysofa/snapshot/sgml-common/current/sources/sgml-common-0.6.3-docdir.patch =================================================================== --- tinysofa/snapshot/sgml-common/current/sources/sgml-common-0.6.3-docdir.patch 2004-07-01 15:40:32 UTC (rev 2656) +++ tinysofa/snapshot/sgml-common/current/sources/sgml-common-0.6.3-docdir.patch 2004-07-01 15:40:33 UTC (rev 2657) @@ -0,0 +1,11 @@ +--- sgml-common-0.6.3/configure.in.docdir 2002-10-23 12:07:31.000000000 +0100 ++++ sgml-common-0.6.3/configure.in 2002-10-23 12:08:10.000000000 +0100 +@@ -4,6 +4,8 @@ + AM_INIT_AUTOMAKE(sgml-common, 0.6.3) + + docdir='$(prefix)/doc' ++AC_ARG_WITH(docdir, [ -with-docdir=DOCDIR documentation directory], ++ docdir=$withval) + AC_SUBST(docdir) + + dnl Checks for programs. Added: tinysofa/snapshot/sgml-common/current/sources/sgml-common-0.6.3.tgz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/sgml-common/current/sources/sgml-common-0.6.3.tgz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/sgml-common/current/sources/sgml-common-CHANGES =================================================================== --- tinysofa/snapshot/sgml-common/current/sources/sgml-common-CHANGES 2004-07-01 15:40:32 UTC (rev 2656) +++ tinysofa/snapshot/sgml-common/current/sources/sgml-common-CHANGES 2004-07-01 15:40:33 UTC (rev 2657) @@ -0,0 +1,15 @@ + o Linux Standard Base SGML & XML adherence -- DocBook packages + which adhere to the LSB addendum concerning SGML & XML are now + included. This means that catalog files are now located in a + different place than they were in previous releases. + + There is now a super catalog, /etc/sgml/catalog, which contains + entries for a number of centralised catalogs, in /etc/sgml. The + centralised catalogs contain entries for DTD-specific files, + which are located in subdirectories in /usr/share/sgml (instead + of /usr/lib/sgml as in previous releases). + + The utility names for converting DocBook documents to other + formats are now named (for example) docbook2ps instead of db2ps; + the old names are provided for compatibility with previous + releases, but may be removed at a future date. Added: tinysofa/snapshot/sgml-common/current/sources/sgml-common-automake.patch =================================================================== --- tinysofa/snapshot/sgml-common/current/sources/sgml-common-automake.patch 2004-07-01 15:40:32 UTC (rev 2656) +++ tinysofa/snapshot/sgml-common/current/sources/sgml-common-automake.patch 2004-07-01 15:40:33 UTC (rev 2657) @@ -0,0 +1,6 @@ +--- sgml-common-0.6.3/doc/man/Makefile.am.automake Wed Apr 24 11:58:17 2002 ++++ sgml-common-0.6.3/doc/man/Makefile.am Wed Apr 24 11:59:02 2002 +@@ -1,2 +1,2 @@ + man8dir = $(mandir)/man8 +-man8_DATA = *.8 ++man8_MANS = install-catalog.8 Added: tinysofa/snapshot/sgml-common/current/sources/sgml-common-automake.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/sgml-common/current/sources/sgml-common-automake.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/sgml-common/current/sources/sgml-common-quotes.patch =================================================================== --- tinysofa/snapshot/sgml-common/current/sources/sgml-common-quotes.patch 2004-07-01 15:40:32 UTC (rev 2656) +++ tinysofa/snapshot/sgml-common/current/sources/sgml-common-quotes.patch 2004-07-01 15:40:33 UTC (rev 2657) @@ -0,0 +1,94 @@ +--- sgml-common-0.6.3/bin/install-catalog.in.quotes Mon Nov 5 11:19:23 2001 ++++ sgml-common-0.6.3/bin/install-catalog.in Mon Nov 5 11:20:12 2001 +@@ -39,8 +39,8 @@ + # Process actions + case $1 in + -a|--add) SGML_ACTION="addition" +- SGML_CENTRALIZED=$2 +- SGML_ORDINARY=$3 ++ SGML_CENTRALIZED="$2" ++ SGML_ORDINARY="$3" + ;; + -r|--remove) if [ -z "$3" -o "$3" = "--version" ] + then +@@ -48,8 +48,8 @@ + exit 0 + fi + SGML_ACTION="removal" +- SGML_CENTRALIZED=$2 +- SGML_ORDINARY=$3 ++ SGML_CENTRALIZED="$2" ++ SGML_ORDINARY="$3" + ;; + -h|--help) echo -e $SGML_HELP_MESSAGE + exit 0 +@@ -96,14 +96,14 @@ + fi + case $SGML_ACTION in + addition) +- if [ -e $SGML_CENTRALIZED -a ! -w $SGML_CENTRALIZED ] ++ if [ -e "$SGML_CENTRALIZED" -a ! -w "$SGML_CENTRALIZED" ] + then + echo "`basename $0`: can not modify \"$SGML_CENTRALIZED\"." >&2 + exit 2 + fi + ;; + removal) +- if [ ! -w $SGML_CENTRALIZED ] ++ if [ ! -w "$SGML_CENTRALIZED" ] + then + echo "`basename $0`: can not modify \"$SGML_CENTRALIZED\"." >&2 + exit 2 +@@ -119,7 +119,7 @@ + fi + case $SGML_ACTION in + addition) +- if [ ! -s $SGML_ORDINARY ] ++ if [ ! -s "$SGML_ORDINARY" ] + then + echo "`basename $0`: \"$SGML_ORDINARY\" does not exist or is empty." >&2 + exit 2 +@@ -131,33 +131,33 @@ + case $SGML_ACTION in + addition) + echo "`basename $0`: addition of $SGML_ORDINARY in $SGML_CENTRALIZED" +- if grep -q $SGML_ORDINARY $SGML_CENTRALIZED 2>/dev/null ++ if grep -q "$SGML_ORDINARY" "$SGML_CENTRALIZED" 2>/dev/null + then + echo "Warning: $SGML_ORDINARY is already installed in the centralized catalog $SGML_CENTRALIZED" >&2 + else +- echo "$SGML_POINTER $SGML_ORDINARY" >> $SGML_CENTRALIZED ++ echo "$SGML_POINTER \"$SGML_ORDINARY\"" >> "$SGML_CENTRALIZED" + fi +- grep -q $SGML_CENTRALIZED /etc/sgml/catalog 2>/dev/null ++ grep -q "$SGML_CENTRALIZED" /etc/sgml/catalog 2>/dev/null + if [ $? -ne 0 ] + then + echo "`basename $0`: addition of $SGML_CENTRALIZED in /etc/sgml/catalog" +- echo "$SGML_POINTER $SGML_CENTRALIZED" >> /etc/sgml/catalog ++ echo "$SGML_POINTER \"$SGML_CENTRALIZED\"" >> /etc/sgml/catalog + fi + ;; + removal) + echo "`basename $0`: removal of $SGML_ORDINARY from $SGML_CENTRALIZED" +- if grep -q $SGML_ORDINARY $SGML_CENTRALIZED 2>/dev/null ++ if grep -q "$SGML_ORDINARY" "$SGML_CENTRALIZED" 2>/dev/null + then +- sed -e "\:$SGML_POINTER $SGML_ORDINARY:d" < $SGML_CENTRALIZED > ${SGML_CENTRALIZED}.new +- mv ${SGML_CENTRALIZED}.new $SGML_CENTRALIZED ++ sed -e "\:$SGML_POINTER \"\\?$SGML_ORDINARY\"\\?:d" < "$SGML_CENTRALIZED" > "${SGML_CENTRALIZED}.new" ++ mv "${SGML_CENTRALIZED}.new" "$SGML_CENTRALIZED" + else + echo "Warning: $SGML_ORDINARY was not found in the centralized catalog $SGML_CENTRALIZED" >&2 + fi +- if [ ! -s $SGML_CENTRALIZED ] ++ if [ ! -s "$SGML_CENTRALIZED" ] + then +- rm $SGML_CENTRALIZED ++ rm "$SGML_CENTRALIZED" + echo "`basename $0`: removal of $SGML_CENTRALIZED from /etc/sgml/catalog" +- sed -e "\:$SGML_POINTER $SGML_CENTRALIZED:d" < /etc/sgml/catalog > /etc/sgml/catalog.new ++ sed -e "\:$SGML_POINTER \"\\?$SGML_CENTRALIZED\"\\?:d" < /etc/sgml/catalog > /etc/sgml/catalog.new + mv /etc/sgml/catalog.new /etc/sgml/catalog + fi + ;; Added: tinysofa/snapshot/sgml-common/current/sources/sgml-common-umask.patch =================================================================== --- tinysofa/snapshot/sgml-common/current/sources/sgml-common-umask.patch 2004-07-01 15:40:32 UTC (rev 2656) +++ tinysofa/snapshot/sgml-common/current/sources/sgml-common-umask.patch 2004-07-01 15:40:33 UTC (rev 2657) @@ -0,0 +1,12 @@ +--- sgml-common-0.6.3/bin/install-catalog.in.umask Mon May 21 11:48:37 2001 ++++ sgml-common-0.6.3/bin/install-catalog.in Mon May 21 12:00:34 2001 +@@ -13,6 +13,9 @@ + \040 -h, --help: \t\t\t\t Print this help message and exit\n\ + \040 -v, --version: \t\t\t Print the version number and exit\n" + ++# We need the files we create to be world readable ++umask 022 ++ + # Set version message + SGML_VERSION_MESSAGE="sgml-common version 0.2 (install-catalog version 1.0)" + Added: tinysofa/snapshot/sgml-common/current/sources/sgml-common-xmldir.patch =================================================================== --- tinysofa/snapshot/sgml-common/current/sources/sgml-common-xmldir.patch 2004-07-01 15:40:32 UTC (rev 2656) +++ tinysofa/snapshot/sgml-common/current/sources/sgml-common-xmldir.patch 2004-07-01 15:40:33 UTC (rev 2657) @@ -0,0 +1,8 @@ +--- sgml-common-0.6.3/xml-iso-entities/Makefile.am.xmldir Fri Oct 5 16:37:43 2001 ++++ sgml-common-0.6.3/xml-iso-entities/Makefile.am Fri Oct 5 16:37:57 2001 +@@ -1,4 +1,4 @@ +-isoentdir = $(prefix)/share/sgml/xml-iso-entities-8879.1986 ++isoentdir = $(prefix)/share/xml/xml-iso-entities-8879.1986 + isoent_DATA = ISOamsa.ent ISOamsb.ent ISOamsc.ent ISOamsn.ent ISOamso.ent ISOamsr.ent \ + ISObox.ent ISOcyr1.ent ISOcyr2.ent ISOdia.ent ISOgrk1.ent ISOgrk2.ent \ + ISOgrk3.ent ISOgrk4.ent ISOlat1.ent ISOlat2.ent ISOnum.ent ISOpub.ent \ Added: tinysofa/snapshot/sgml-common/current/sources/xml.dcl =================================================================== --- tinysofa/snapshot/sgml-common/current/sources/xml.dcl 2004-07-01 15:40:32 UTC (rev 2656) +++ tinysofa/snapshot/sgml-common/current/sources/xml.dcl 2004-07-01 15:40:33 UTC (rev 2657) @@ -0,0 +1,179 @@ +" + PIC "?>" + SHORTREF NONE + + NAMES + SGMLREF + + QUANTITY NONE + + ENTITIES + "amp" 38 + "lt" 60 + "gt" 62 + "quot" 34 + "apos" 39 + + FEATURES + MINIMIZE + DATATAG NO + OMITTAG NO + RANK NO + SHORTTAG + STARTTAG + EMPTY NO + UNCLOSED NO + NETENABL IMMEDNET + ENDTAG + EMPTY NO + UNCLOSED NO + ATTRIB + DEFAULT YES + OMITNAME NO + VALUE NO + EMPTYNRM YES + IMPLYDEF + ATTLIST NO + DOCTYPE NO + ELEMENT NO + ENTITY NO + NOTATION NO + LINK + SIMPLE NO + IMPLICIT NO + EXPLICIT NO + OTHER + CONCUR NO + SUBDOC NO + FORMAL NO + URN NO + KEEPRSRE YES + VALIDITY TYPE + ENTITIES + REF ANY + INTEGRAL YES + APPINFO NONE + SEEALSO "ISO 8879:1986//NOTATION + Extensible Markup Language (XML) 1.0//EN" +> Added: tinysofa/snapshot/sgml-common/current/sources/xml.soc =================================================================== --- tinysofa/snapshot/sgml-common/current/sources/xml.soc 2004-07-01 15:40:32 UTC (rev 2656) +++ tinysofa/snapshot/sgml-common/current/sources/xml.soc 2004-07-01 15:40:33 UTC (rev 2657) @@ -0,0 +1 @@ +SGMLDECL "xml.dcl" Added: tinysofa/snapshot/sgml-common/current/specs/sgml-common.spec =================================================================== --- tinysofa/snapshot/sgml-common/current/specs/sgml-common.spec 2004-07-01 15:40:32 UTC (rev 2656) +++ tinysofa/snapshot/sgml-common/current/specs/sgml-common.spec 2004-07-01 15:40:33 UTC (rev 2657) @@ -0,0 +1,221 @@ +Name: sgml-common +Version: 0.6.3 +Release: 16ts +Group: Applications/Text + +Summary: Common SGML catalog and DTD files. + +License: GPL +URL: http://www.iso.ch/cate/3524030.html + +BuildArch: noarch +BuildRoot: %{_tmppath}/%{name}-%{version}-root +Source0: ftp://sources.redhat.com/pub/docbook-tools/new-trials/SOURCES/%{name}-%{version}.tgz +Source1: sgml-common-CHANGES +Source2: sgml-common-automake.tar.gz +# From openjade: +Source3: xml.dcl +Source4: xml.soc +Source5: html.dcl +Source6: html.soc +Patch0: sgml-common-umask.patch +Patch1: sgml-common-xmldir.patch +Patch2: sgml-common-quotes.patch +Patch3: sgml-common-automake.patch +Patch4: sgml-common-0.6.3-docdir.patch + +Requires: sh-utils fileutils textutils grep +BuildRequires: libxml2 >= 2.4.8-2 + +%description +The sgml-common package contains a collection of entities and DTDs +that are useful for processing SGML, but that don't need to be +included in multiple packages. Sgml-common also includes an +up-to-date Open Catalog file. + +%package -n xml-common +Group: Applications/Text +Summary: Common XML catalog and DTD files. +License: GPL +URL: http://www.iso.ch/cate/3524030.html +Requires: sh-utils fileutils textutils grep + +%description -n xml-common +The xml-common package contains a collection of entities and DTDs +that are useful for processing XML, but that don't need to be +included in multiple packages. + + +%prep +%setup -q +%patch0 -p1 -b .umask +%patch1 -p1 -b .xmldir +%patch2 -p1 -b .quotes +rm install-sh missing mkinstalldirs +tar zxf %{SOURCE2} +%patch3 -p1 -b .automake +%patch4 -p1 -b .docdir +aclocal +automake --add-missing --copy + + +%build +%configure --with-docdir=%{_docdir} + + +%install +DESTDIR=$RPM_BUILD_ROOT +rm -rf $DESTDIR +%makeinstall docdir=%{buildroot}%{_docdir} +cp %{SOURCE1} CHANGES +mkdir $RPM_BUILD_ROOT/etc/xml +mkdir $RPM_BUILD_ROOT/usr/share/sgml/docbook +# Create an empty XML catalog. +XMLCATALOG=$RPM_BUILD_ROOT/etc/xml/catalog +/usr/bin/xmlcatalog --noout --create $XMLCATALOG +# Now put the common DocBook entries in it +/usr/bin/xmlcatalog --noout --add "delegatePublic" \ + "-//OASIS//ENTITIES DocBook XML" \ + "file:///usr/share/sgml/docbook/xmlcatalog" $XMLCATALOG +/usr/bin/xmlcatalog --noout --add "delegatePublic" \ + "-//OASIS//DTD DocBook XML" \ + "file:///usr/share/sgml/docbook/xmlcatalog" $XMLCATALOG +/usr/bin/xmlcatalog --noout --add "delegatePublic" \ + "ISO 8879:1986" \ + "file:///usr/share/sgml/docbook/xmlcatalog" $XMLCATALOG +/usr/bin/xmlcatalog --noout --add "delegateSystem" \ + "http://www.oasis-open.org/docbook/" \ + "file:///usr/share/sgml/docbook/xmlcatalog" $XMLCATALOG +/usr/bin/xmlcatalog --noout --add "delegateURI" \ + "http://www.oasis-open.org/docbook/" \ + "file:///usr/share/sgml/docbook/xmlcatalog" $XMLCATALOG +# Also create the common DocBook catalog +/usr/bin/xmlcatalog --noout --create \ + $RPM_BUILD_ROOT/usr/share/sgml/docbook/xmlcatalog + +rm -f %{buildroot}/usr/share/sgml/xml.dcl +install -m0644 %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} \ + %{buildroot}/usr/share/sgml +rm -rf %{buildroot}/usr/share/xml/* + + +%clean +DESTDIR=$RPM_BUILD_ROOT +rm -rf $DESTDIR + + +%files +%defattr (-,root,root) +%dir /etc/sgml +%config(noreplace) /etc/sgml/sgml.conf +%dir /usr/share/sgml +%dir /usr/share/sgml/sgml-iso-entities-8879.1986 +/usr/share/sgml/sgml-iso-entities-8879.1986/* +/usr/share/sgml/xml.dcl +/usr/share/sgml/xml.soc +/usr/share/sgml/html.dcl +/usr/share/sgml/html.soc +/usr/bin/sgmlwhich +/usr/bin/install-catalog +%{_mandir}/*/* +%{_docdir}/* + +%files -n xml-common +%defattr (-,root,root) +%dir /etc/xml +%config(noreplace) /etc/xml/catalog +%dir /usr/share/sgml +%dir /usr/share/sgml/docbook +%config(noreplace) /usr/share/sgml/docbook/xmlcatalog +%dir /usr/share/xml + +%changelog +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Mon Dec 8 2003 Tim Waugh 0.6.3-15 +- Patch from Ville Skytt? (bug #111625): + - Include /usr/share/xml in xml-common. + - Own /usr/share/sgml and /usr/share/xml. + +* Wed Jan 22 2003 Tim Powers +- rebuilt + +* Wed Oct 23 2002 Tim Waugh 0.6.3-13 +- Ship the installed documentation. +- Don't install files not packaged. + +* Fri Jun 21 2002 Tim Powers +- automated rebuild + +* Thu May 23 2002 Tim Powers +- automated rebuild + +* Wed Apr 24 2002 Tim Waugh 0.6.3-10 +- Ship {xml,html}.{dcl,soc} (bug #63500, bug #62980). +- Work around broken tarball packaging. + +* Thu Feb 21 2002 Tim Waugh 0.6.3-9 +- Rebuild in new environment. + +* Thu Jan 17 2002 Tim Waugh 0.6.3-8 +- Back to /usr/share/sgml. Now install docbook-dtds. +- Use a real install-sh, not the symlink shipped in the tarball. + +* Wed Jan 09 2002 Tim Powers 0.6.3-7 +- automated rebuild + +* Mon Nov 5 2001 Tim Waugh 0.6.3-6 +- Don't create a useless empty catalog. +- Don't try to put install things outside the build root. +- Build requires a libxml2 that actually works. + +* Mon Nov 5 2001 Tim Waugh 0.6.3-4 +- Use (and handle) catalog files with quotes in install-catalog. + +* Thu Nov 1 2001 Tim Waugh 0.6.3-3 +- Create default XML Catalog at build time, not install time. + +* Fri Oct 5 2001 Tim Waugh 0.6.3-2 +- Move XML things into /usr/share/xml, and split them out into separate + xml-common package. + +* Mon Oct 1 2001 Tim Waugh 0.6.3-1 +- 0.6.3. Incorporates oldsyntax and quiet patches. +- Make /etc/sgml/sgml.conf noreplace. +- Own /etc/sgml, various other directories (bug #47485, bug #54180). + +* Wed May 23 2001 Tim Waugh 0.5-7 +- Remove execute bit from data files. + +* Mon May 21 2001 Tim Waugh 0.5-6 +- install-catalog needs to make sure that it creates world-readable files + (bug #41552). + +* Wed Mar 14 2001 Tim Powers 0.5-5 +- fixed license + +* Wed Jan 24 2001 Tim Waugh +- Make install-catalog quieter during normal operation. + +* Tue Jan 23 2001 Tim Waugh +- Require textutils, fileutils, grep (bug #24719). + +* Wed Jan 17 2001 Tim Waugh +- Require sh-utils. + +* Mon Jan 15 2001 Tim Waugh +- Don't play so many macro games. +- Fix typo in install-catalog patch. + +* Mon Jan 08 2001 Tim Waugh +- Change group. +- Install by hand (man/en/...). Use %%{_mandir}. +- Use %%{_tmppath}. +- Make install-catalog fail silently if given the old syntax. +- Add CHANGES file. +- Change Copyright: to License:. +- Remove Packager: line. + +* Mon Jan 08 2001 Tim Waugh +- Based on Eric Bischoff's new-trials packages. From svn at tinysofa.org Thu Jul 1 15:40:36 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:40:36 +1000 (EST) Subject: [tinysofa-svn] r2658 - in tinysofa/snapshot: . spamassassin spamassassin/current spamassassin/current/sources spamassassin/current/specs Message-ID: <20040701154036.56E5A4E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:40:36 +1000 (Fri, 02 Jul 2004) New Revision: 2658 Added: tinysofa/snapshot/spamassassin/ tinysofa/snapshot/spamassassin/current/ tinysofa/snapshot/spamassassin/current/sources/ tinysofa/snapshot/spamassassin/current/sources/Mail-SpamAssassin-3.000000-pre1.tar.bz2 tinysofa/snapshot/spamassassin/current/sources/filter-requires-spamassassin.sh tinysofa/snapshot/spamassassin/current/sources/redhat_local.cf tinysofa/snapshot/spamassassin/current/sources/spamassassin-3.0-krb5-backcompat.patch tinysofa/snapshot/spamassassin/current/sources/spamassassin-default.rc tinysofa/snapshot/spamassassin/current/sources/spamassassin-helper.sh tinysofa/snapshot/spamassassin/current/sources/spamassassin-spamc.rc tinysofa/snapshot/spamassassin/current/sources/spamassassin.sysconfig tinysofa/snapshot/spamassassin/current/specs/ tinysofa/snapshot/spamassassin/current/specs/spamassassin.spec Log: - Add spamassassin to snapshot from 2.0. Added: tinysofa/snapshot/spamassassin/current/sources/Mail-SpamAssassin-3.000000-pre1.tar.bz2 =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/spamassassin/current/sources/Mail-SpamAssassin-3.000000-pre1.tar.bz2 ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/spamassassin/current/sources/filter-requires-spamassassin.sh =================================================================== --- tinysofa/snapshot/spamassassin/current/sources/filter-requires-spamassassin.sh 2004-07-01 15:40:33 UTC (rev 2657) +++ tinysofa/snapshot/spamassassin/current/sources/filter-requires-spamassassin.sh 2004-07-01 15:40:36 UTC (rev 2658) @@ -0,0 +1,3 @@ +#!/bin/sh + +/usr/lib/rpm/find-requires $* | grep -v 'perl(Net::SMTP::Server' | grep -v 'perl(MIME::Body' Property changes on: tinysofa/snapshot/spamassassin/current/sources/filter-requires-spamassassin.sh ___________________________________________________________________ Name: svn:executable + * Added: tinysofa/snapshot/spamassassin/current/sources/redhat_local.cf =================================================================== --- tinysofa/snapshot/spamassassin/current/sources/redhat_local.cf 2004-07-01 15:40:33 UTC (rev 2657) +++ tinysofa/snapshot/spamassassin/current/sources/redhat_local.cf 2004-07-01 15:40:36 UTC (rev 2658) @@ -0,0 +1,11 @@ +# These values can be overridden by editing ~/.spamassassin/user_prefs.cf +# (see spamassassin(1) for details) + +# These should be safe assumptions and allow for simple visual sifting +# without risking lost emails. + +required_hits 5 +rewrite_subject 1 +subject_tag [SPAM] +report_safe 0 + Added: tinysofa/snapshot/spamassassin/current/sources/spamassassin-3.0-krb5-backcompat.patch =================================================================== --- tinysofa/snapshot/spamassassin/current/sources/spamassassin-3.0-krb5-backcompat.patch 2004-07-01 15:40:33 UTC (rev 2657) +++ tinysofa/snapshot/spamassassin/current/sources/spamassassin-3.0-krb5-backcompat.patch 2004-07-01 15:40:36 UTC (rev 2658) @@ -0,0 +1,12 @@ +diff -urN Mail-SpamAssassin-3.000000.orig/Makefile.PL Mail-SpamAssassin-3.000000/Makefile.PL +--- Mail-SpamAssassin-3.000000.orig/Makefile.PL 2004-06-20 17:10:30.439462000 -1000 ++++ Mail-SpamAssassin-3.000000/Makefile.PL 2004-06-20 17:11:24.716211472 -1000 +@@ -1030,7 +1030,7 @@ + LIBSPAMC_SRC = spamc/libspamc.c spamc/utils.c + + $(SPAMC_MAKEFILE): $(SPAMC_MAKEFILE).in $(SPAMC_MAKEFILE).win +- $(CONFIGURE) --prefix="$(I_PREFIX)" --sysconfdir="$(I_SYSCONFDIR)" --datadir="$(I_DATADIR)" --enable-ssl="$(ENABLE_SSL)" ++ $(CONFIGURE) --prefix="$(I_PREFIX)" --sysconfdir="$(I_SYSCONFDIR)" --datadir="$(I_DATADIR)" --enable-ssl="$(ENABLE_SSL) --includedir=/usr/kerberos/include" + + spamc_has_moved: + $(NOECHO) echo "***" Added: tinysofa/snapshot/spamassassin/current/sources/spamassassin-default.rc =================================================================== --- tinysofa/snapshot/spamassassin/current/sources/spamassassin-default.rc 2004-07-01 15:40:33 UTC (rev 2657) +++ tinysofa/snapshot/spamassassin/current/sources/spamassassin-default.rc 2004-07-01 15:40:36 UTC (rev 2658) @@ -0,0 +1,3 @@ +# send mail through spamassassin +:0fw +| /usr/bin/spamassassin Added: tinysofa/snapshot/spamassassin/current/sources/spamassassin-helper.sh =================================================================== --- tinysofa/snapshot/spamassassin/current/sources/spamassassin-helper.sh 2004-07-01 15:40:33 UTC (rev 2657) +++ tinysofa/snapshot/spamassassin/current/sources/spamassassin-helper.sh 2004-07-01 15:40:36 UTC (rev 2658) @@ -0,0 +1,2 @@ +#!/bin/sh +/usr/bin/spamassassin -e Property changes on: tinysofa/snapshot/spamassassin/current/sources/spamassassin-helper.sh ___________________________________________________________________ Name: svn:executable + * Added: tinysofa/snapshot/spamassassin/current/sources/spamassassin-spamc.rc =================================================================== --- tinysofa/snapshot/spamassassin/current/sources/spamassassin-spamc.rc 2004-07-01 15:40:33 UTC (rev 2657) +++ tinysofa/snapshot/spamassassin/current/sources/spamassassin-spamc.rc 2004-07-01 15:40:36 UTC (rev 2658) @@ -0,0 +1,3 @@ +# send mail through spamassassin +:0fw +| /usr/bin/spamc Added: tinysofa/snapshot/spamassassin/current/sources/spamassassin.sysconfig =================================================================== --- tinysofa/snapshot/spamassassin/current/sources/spamassassin.sysconfig 2004-07-01 15:40:33 UTC (rev 2657) +++ tinysofa/snapshot/spamassassin/current/sources/spamassassin.sysconfig 2004-07-01 15:40:36 UTC (rev 2658) @@ -0,0 +1,2 @@ +# Options to spamd +SPAMDOPTIONS="-d -c -m5 -H" Added: tinysofa/snapshot/spamassassin/current/specs/spamassassin.spec =================================================================== --- tinysofa/snapshot/spamassassin/current/specs/spamassassin.spec 2004-07-01 15:40:33 UTC (rev 2657) +++ tinysofa/snapshot/spamassassin/current/specs/spamassassin.spec 2004-07-01 15:40:36 UTC (rev 2658) @@ -0,0 +1,342 @@ +%define _use_internal_dependency_generator 0 + +%define name spamassassin +%define real_name Mail-SpamAssassin +%define krb5backcompat %([ -a /usr/kerberos/include/krb5.h ] && echo 1 || echo 0) + +%{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)} + +Summary: Spam filter for email which can be invoked from mail delivery agents. +Name: %{name} +Version: 3.0 +Release: 2.pre1ts +License: Apache License +Group: Applications/Internet +URL: http://spamassassin.org/ +# Subversion Snapshot +# http://wiki.apache.org/spamassassin/DownloadFromSvn +Source0: Mail-SpamAssassin-3.000000-pre1.tar.bz2 +Source2: redhat_local.cf +Source3: spamassassin-default.rc +Source4: spamassassin-spamc.rc +Source5: spamassassin.sysconfig +Source10: spamassassin-helper.sh +Source99: filter-requires-spamassassin.sh +Patch3: spamassassin-3.0-krb5-backcompat.patch +# SEND TO UPSTREAM: disable service by default +#Patch4: spamassassin-3.0-disable_service.patch +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +Buildroot: %{_tmppath}/%{name}-%{version}-root +Prefix: %{_prefix} +Requires: /sbin/chkconfig /sbin/service + +BuildRequires: perl-Net-DNS +BuildRequires: perl >= 2:5.8.0 +BuildRequires: perl-Time-HiRes +BuildRequires: openssl-devel + +Requires: perl-Net-DNS +Requires: perl(Time::HiRes) +Requires: procmail + +Obsoletes: perl-Mail-SpamAssassin + +%define __find_requires %{SOURCE99} + +%description +SpamAssassin provides you with a way to reduce if not completely eliminate +Unsolicited Commercial Email (SPAM) from your incoming email. It can +be invoked by a MDA such as sendmail or postfix, or can be called from +a procmail script, .forward file, etc. It uses a genetic-algorithm +evolved scoring system to identify messages which look spammy, then +adds headers to the message so they can be filtered by the user's mail +reading software. This distribution includes the spamd/spamc components +which create a server that considerably speeds processing of mail. + +To enable spamassassin, if you are receiving mail locally, simply add +this line to your ~/.procmailrc: +INCLUDERC=/etc/mail/spamassassin/spamassassin-default.rc + +To filter spam for all users, add that line to /etc/procmailrc +(creating if necessary). + +%prep +%setup -q -n Mail-SpamAssassin-3.000000 +# %%setup -q -n %{real_name}-%{version} + +# Backwards compatibility with older krb5-devel +echo %{krb5backcompat} +%if %{krb5backcompat} +%patch3 -p1 +%endif + +# SEND TO UPSTREAM: disable service by default +#%patch4 -p1 + +%build +export CFLAGS="$RPM_OPT_FLAGS" +%{__perl} Makefile.PL DESTDIR=$RPM_BUILD_ROOT/ SYSCONFDIR=%{_sysconfdir} INSTALLDIRS=vendor ENABLE_SSL=yes < /dev/null + + +%{__make} OPTIMIZE="$RPM_OPT_FLAGS" +#%make test + +%install +rm -rf $RPM_BUILD_ROOT +%makeinstall PREFIX=%buildroot/%{prefix} \ + INSTALLMAN1DIR=%buildroot/%{_mandir}/man1 \ + INSTALLMAN3DIR=%buildroot/%{_mandir}/man3 \ + LOCAL_RULES_DIR=%{buildroot}/etc/mail/spamassassin +chmod 755 %buildroot/%{_bindir}/* # allow stripping +install -d %buildroot/%{_initrddir} +install -m 0755 spamd/redhat-rc-script.sh %buildroot/%{_initrddir}/spamassassin + +mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/mail/spamassassin +mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig +install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/mail/spamassassin/local.cf +install -m644 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/spamassassin + +install -m 0644 %{SOURCE3} %buildroot/etc/mail/spamassassin +install -m 0644 %{SOURCE4} %buildroot/etc/mail/spamassassin +install -m 0755 %{SOURCE10} %buildroot/etc/mail/spamassassin + +mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig + +[ -x /usr/lib/rpm/brp-compress ] && /usr/lib/rpm/brp-compress + +find $RPM_BUILD_ROOT \( -name perllocal.pod -o -name .packlist \) -exec rm -v {} \; +find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' + +find $RPM_BUILD_ROOT/usr -type f -print | + sed "s@^$RPM_BUILD_ROOT@@g" | + grep -v perllocal.pod | + grep -v "\.packlist" > %{name}-%{version}-filelist +if [ "$(cat %{name}-%{version}-filelist)X" = "X" ] ; then + echo "ERROR: EMPTY FILE LIST" + exit -1 +fi +find $RPM_BUILD_ROOT%{perl_vendorlib}/* -type d -print | + sed "s@^$RPM_BUILD_ROOT@%dir @g" >> %{name}-%{version}-filelist + +%files -f %{name}-%{version}-filelist +%defattr(-,root,root) +%doc BUGS COPYRIGHT CREDITS Changes LICENSE README STATUS TRADEMARK UPGRADE +%doc USAGE sample-nonspam.txt sample-spam.txt +%config(noreplace) %{_initrddir}/spamassassin +%config(noreplace) %{_sysconfdir}/mail/spamassassin +%config(noreplace) %{_sysconfdir}/sysconfig/spamassassin + +%clean +rm -rf $RPM_BUILD_ROOT + +%post +/sbin/chkconfig --add spamassassin + +# -a and --auto-whitelist options were removed from 3.0.0 +# prevent service startup failure +perl -p -i -e 's/(["\s]-\w+)a/$1/ ; s/(["\s]-)a(\w+)/$1$2/ ; s/(["\s])-a\b/$1/' /etc/sysconfig/spamassassin +perl -p -i -e 's/ --auto-whitelist//' /etc/sysconfig/spamassassin + +if [ -f /etc/spamassassin.cf ]; then + %{__mv} /etc/spamassassin.cf /etc/mail/spamassassin/migrated.cf +fi +if [ -f /etc/mail/spamassassin.cf ]; then + %{__mv} /etc/mail/spamassassin.cf /etc/mail/spamassassin/migrated.cf +fi + +%postun +if [ "$1" -ge "1" ]; then + /sbin/service spamassassin condrestart > /dev/null 2>&1 +fi + +%preun +if [ $1 = 0 ] ; then + /sbin/service spamassassin stop >/dev/null 2>&1 + /sbin/chkconfig --del spamassassin +fi +exit 0 + +%changelog +* Mon Jun 20 2004 Warren Togami - 3.0-2.pre1 +- 3.0.0 pre1 +- remove unnecessary patches applied upstream +- update krb5 backcompat patch + +* Tue Jun 15 2004 Elliot Lee +- rebuilt + +* Mon May 31 2004 Warren Togami - 3.0-svn20040530 +- svn snapshot 20040530 +- #124870 prevent service startup failure due to old -a option +- #124871 more docs +- #124872 unowned directories + +* Tue May 24 2004 Warren Togami - 3.0-svn20040524 +- #123432 do not start service by default +- #122488 remove CRLF's +- #123706 correct license +- svn snapshot 20040524 +- svn snapshot 20040518 + +* Sun May 2 2004 Ville Skytt? - 2.63-8 +- #122233 +- Require perl(:MODULE_COMPAT_*). +- Use %%{_mandir} and %%{_initrddir}. +- Fix License tag and include License in docs. +- Backslashify multiline init script description. + +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Wed Feb 11 2004 Warren Togami 2.63-6 +- require sitelib instead + +* Wed Jan 21 2004 Warren Togami 2.63-3 +- krb5-backcompat.patch so older krb5-devel does not fail + +* Wed Jan 21 2004 Warren Togami 2.63-2 +- upgrade to 2.63 + +* Mon Jan 19 2004 Warren Togami 2.62-3 +- Ville Skytt?'s fixes from #113596 including: +- Fix buildroot traces +- enable openssl +- Trailing slash to DESTDIR (bug 90202 comment 14). +- export optflags so they're honored, affects spamc only. + +* Mon Jan 19 2004 Warren Togami 2.62-2 +- upgrade to 2.62 +- Prereq -> Requires, former is deprecated +- Require current version of perl +- Remove urban myth clean test +- TODO: Get rid of prefix + +* Wed Dec 31 2003 Dan Walsh 2.61-2 +- Change sysconfdir to not use full path + +* Tue Dec 9 2003 Chip Turner 2.61-1 +- upgrade to 2.61 + +* Fri Sep 26 2003 Chip Turner 2.60-2 +- update to 2.60 + +* Sat Jul 5 2003 Chip Turner 2.55-3 +- change perl dependency to more accurate versions with explicit epochs + +* Wed Jun 04 2003 Elliot Lee +- rebuilt + +* Sat May 31 2003 Chip Turner 2.55-1 +- move to upstream version 2.55 + +* Tue May 13 2003 Chip Turner +- bump for build +- change init.d script to not default to started + +* Sun May 04 2003 Florian La Roche +- remove Distribution: tag in spec file + +* Wed Apr 16 2003 Chip Turner 2.53-5 +- remove SIGCHILD patch to properly return it to SIG_IGN now that + waitpid isn't used on Linux + +* Mon Apr 14 2003 Chip Turner 2.53-4.8.x +- update to 2.53 from upstream + +* Fri Mar 21 2003 Chip Turner 2.50-3.8.x +- update patch for servicename; should fix restarting/runlevel issues (#85975) + +* Thu Mar 13 2003 Chip Turner 2.50-2.8.x +- update to 2.50 + +* Tue Feb 25 2003 Elliot Lee +- rebuilt + +* Fri Feb 21 2003 Chip Turner +- revert double fix for 84774 + +* Mon Feb 17 2003 Bill Nottingham +- fix startup (#84445) + +* Thu Feb 13 2003 Bill Nottingham +- fix paths in initscript (#84216) + +* Thu Feb 13 2003 Chip Turner +- removing -P option since it is the default now, bug 84144 + +* Wed Feb 12 2003 Florian La Roche +- fix SIGCHLD handling + +* Mon Feb 10 2003 Bill Nottingham +- move condrestart to %postun + +* Sun Feb 2 2003 Chip Turner +- update to 2.44 +- add condrestart to service script + +* Thu Jan 30 2003 Chip Turner +- release bump and rebuild + +* Wed Jan 29 2003 Chip Turner +- add upstream bsmtp off-by-one patch + +* Mon Jan 20 2003 Chip Turner +- add wrapper for 'spamassassin -e' for native evolution spam filtering + +* Sat Jan 4 2003 Jeff Johnson 2.43-10 +- use internal dep generator. + +* Wed Jan 1 2003 Chip Turner +- rebuild + +* Tue Dec 17 2002 Bill Nottingham 2.43-7 +- don't run by default + +* Sat Dec 14 2002 Tim Powers 2.43-6 +- don't use rpms internal dep generator +- buildrequire perl-Time-HiRes instead of perl(Time:HiRes) so we can satisfy build deps in the build system + +* Fri Nov 22 2002 Tim Powers +- rebuilt to solve broken perl deps + +* Thu Aug 15 2002 Chip Turner +- speedup patch from upstream + +* Tue Aug 6 2002 Chip Turner +- automated release bump and build + +* Thu Jul 18 2002 Chip Turner +- better control of service level, improvement in %post script. +- (contribs from schirmer at taytron.net) + +* Fri Jun 28 2002 Chip Turner +- added proper BuildRequire + +* Wed Jun 26 2002 Chip Turner +- updated to 2.31, added .rc file for procmail to INCLUDERC to enable + +* Fri Apr 19 2002 Theo Van Dinter +- Updated for 2.20 release +- made /etc/mail/spamassassin a config directory so local.cf doesn't get wiped out +- added a patch to remove findbin stuff + +* Wed Feb 27 2002 Craig Hughes +- Updated for 2.1 release + +* Sat Feb 02 2002 Theo Van Dinter +- Updates for 2.01 release +- Fixed rc file +- RPM now buildable as non-root +- fixed post_service errors +- fixed provides to include perl modules +- use file find instead of manually specifying files + +* Tue Jan 15 2002 Craig Hughes +- Updated for 2.0 release + +* Wed Dec 05 2001 Craig Hughes +- Updated for final 1.5 distribution. + +* Sun Nov 18 2001 Craig Hughes +- first version of rpm. + From svn at tinysofa.org Thu Jul 1 15:40:43 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:40:43 +1000 (EST) Subject: [tinysofa-svn] r2659 - in tinysofa/snapshot: . specspo specspo/current specspo/current/sources specspo/current/specs Message-ID: <20040701154043.342664E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:40:43 +1000 (Fri, 02 Jul 2004) New Revision: 2659 Added: tinysofa/snapshot/specspo/ tinysofa/snapshot/specspo/current/ tinysofa/snapshot/specspo/current/sources/ tinysofa/snapshot/specspo/current/sources/specspo-9.0.92.tar.bz2 tinysofa/snapshot/specspo/current/specs/ tinysofa/snapshot/specspo/current/specs/specspo.spec Log: - Add specspo to snapshot from 2.0. Added: tinysofa/snapshot/specspo/current/sources/specspo-9.0.92.tar.bz2 =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/specspo/current/sources/specspo-9.0.92.tar.bz2 ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/specspo/current/specs/specspo.spec =================================================================== --- tinysofa/snapshot/specspo/current/specs/specspo.spec 2004-07-01 15:40:36 UTC (rev 2658) +++ tinysofa/snapshot/specspo/current/specs/specspo.spec 2004-07-01 15:40:43 UTC (rev 2659) @@ -0,0 +1,237 @@ +%define builtin_release_version @VERSION@ + +Summary: tinysofa package descriptions, summaries, and groups. +Name: specspo +Version: 9.0.92 +Release: 1.1ts +Group: Documentation +Source: specspo-%{version}.tar.bz2 +License: GPL +BuildArch: noarch +BuildRoot: %{_tmppath}/%{name}-%{version}-root + +%description +The specspo package contains the portable object catalogues used to +internationalize tinysofa packages. + +%prep +%setup -q + +%build +make + +%install +rm -rf %{buildroot} + +make LOCALEDIR="%{buildroot}%{_datadir}/locale" install + +mkdir -p %{buildroot}%{_sysconfdir}/rpm +echo '%_i18ndomains tinysofa-dist' > %{buildroot}%{_sysconfdir}/rpm/macros.specspo + +/usr/lib/rpm/find-lang.sh %{buildroot} tinysofa-dist + +%clean +rm -rf %{buildroot} + +%files -f tinysofa-dist.lang +%defattr(-,root,root) +%doc dist/dist.pot +%config(noreplace) %{_sysconfdir}/rpm/macros.specspo + +%changelog +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Thu Jul 03 2003 Paul Gampe 9.0.92 +- Update translations + +* Tue Feb 25 2003 Paul Gampe 9.0-1 +- Update translations + +* Mon Feb 24 2003 Bill Nottingham 8.0.95-1 +- bump + +* Wed Feb 12 2003 Paul Gampe 8.0.94-2 +- group spec and distribution list corrections + +* Mon Feb 10 2003 Paul Gampe 8.0.94-1 +- Bump + +* Tue Dec 17 2002 Paul Gampe 8.0.92-1 +- Bump + +* Thu Sep 5 2002 Trond Eivind Glomsr?d 8.0-3 +- Bump + +* Tue Sep 3 2002 Trond Eivind Glomsr?d 8.0-2 +- Bump + +* Mon Sep 2 2002 Trond Eivind Glomsr?d 8.0-1 +- Update translations + +* Wed Aug 21 2002 Trond Eivind Glomsr?d 7.3.94-2 +- Add new locales (#72106) + +* Thu Aug 8 2002 Trond Eivind Glomsr?d 7.3.93-3 +- Update + +* Thu Jul 25 2002 Trond Eivind Glomsr?d 7.3.93-2 +- Update - most po files are now UTF-8 + +* Wed Jul 24 2002 Trond Eivind Glomsr?d 7.3.93-1 +- Update + +* Thu Jul 18 2002 Trond Eivind Glomsr?d 7.3.92-3 +- Update + +* Fri Jul 12 2002 Trond Eivind Glomsr?d 7.3.92-2 +- Update + +* Thu Jun 27 2002 Trond Eivind Glomsr?d 7.3.92-1 +- Update + +* Wed Jun 12 2002 Trond Eivind Glomsr?d 7.3.91-1 +- Update + +* Wed May 29 2002 Trond Eivind Glomsr?d 7.3.90-1 +- Update + +* Thu Apr 18 2002 Trond Eivind Glomsr?d 7.3-4 +- Update translations + +* Wed Apr 17 2002 Trond Eivind Glomsr?d 7.3-3 +- Update translations + +* Tue Apr 16 2002 Trond Eivind Glomsr?d 7.3-2 +- Update translations + +* Mon Apr 15 2002 Trond Eivind Glomsr?d 7.3-1 +- Update translations + +* Wed Apr 10 2002 Trond Eivind Glomsr?d 7.2.94-1 +- Update translations, add jfsutils + +* Wed Apr 3 2002 Trond Eivind Glomsr?d 7.2.93-3 +- Update translations + +* Thu Mar 28 2002 Trond Eivind Glomsr?d 7.2.93-2 +- Update translations + +* Wed Mar 27 2002 Trond Eivind Glomsr?d 7.2.93-1 +- Update translations + +* Tue Mar 19 2002 Trond Eivind Glomsr?d 7.2.92-3 +- Updated translations + +* Sat Mar 16 2002 Trond Eivind Glomsr?d 7.2.92-2 +- Various fixes, corrections from docs + +* Fri Mar 15 2002 Trond Eivind Glomsr?d 7.2.92-1 +- Rebuild + +* Thu Feb 28 2002 Trond Eivind Glomsr?d 7.2.91-1 +- bump + +* Fri Jan 25 2002 Trond Eivind Glomsr?d 7.2.90-1 +- Rebuild + +* Fri Jan 25 2002 Trond Eivind Glomsr?d 7.2-3 +- Updated translations + +* Wed Dec 5 2001 Trond Eivind Glomsr?d 7.2-2 +- Updated translations + +* Wed Sep 5 2001 Trond Eivind Glomsr?d 7.2-1 +- Updated translations + +* Mon Aug 27 2001 Trond Eivind Glomsr?d 7.1.95-1 +- Updated translations + +* Fri Aug 24 2001 Trond Eivind Glomsr?d 7.1.95-0.1 +- Updated translations +- Include Danish + +* Sat Aug 18 2001 Trond Eivind Glomsr?d 7.1.94-2 +- updated translations + +* Sun Aug 12 2001 Trond Eivind Glomsr?d 7.1.94-1 +- updated translations + +* Fri Aug 10 2001 Trond Eivind Glomsr?d 7.1.94-0.4 +- Updated translations + +* Thu Aug 9 2001 Trond Eivind Glomsr?d 7.1.94-0.3 +- s/X11R6-contrib/XFree86-tools/ (#51330) + +* Wed Aug 8 2001 Trond Eivind Glomsr?d 7.1.94-0.2 +- add cyrus-sasl-md5 + +* Wed Aug 8 2001 Trond Eivind Glomsr?d 7.1.94-0.1 +- refresh-po + +* Tue Jul 31 2001 Trond Eivind Glomsr?d +- new drop, new refresh-po + +* Sun Jul 29 2001 Trond Eivind Glomsr?d +- Updated translations + +* Fri Jul 27 2001 Trond Eivind Glomsr?d +- rebuild, safe iconv + +* Thu Jul 26 2001 Trond Eivind Glomsr?d +- add some missing applications + +* Wed Jul 25 2001 Trond Eivind Glomsr?d +- add some missing applications + +* Tue Jul 24 2001 Trond Eivind Glomsr?d +- 7.1.93 + +* Fri Jul 20 2001 Trond Eivind Glomsr?d +- update from CVS +- exclude powertools + +* Mon May 21 2001 Trond Eivind Glomsr?d +- Add some IA64-specific packages (#40710) + +* Wed May 9 2001 Trond Eivind Glomsr?d +- Add more languages + +* Sat Apr 7 2001 Trond Eivind Glomsr?d +- Updated translations + +* Mon Mar 26 2001 Trond Eivind Glomsr?d +- Updated translations + +* Thu Mar 15 2001 Trond Eivind Glomsr?d +- Fixes to the Spanish translation (#30289) + +* Tue Mar 6 2001 Nalin Dahyabhai +- add msgid strings for openssl095a + +* Fri Mar 02 2001 Trond Eivind Glomsr?d +- fix some redundancies in the Spanish po file + +* Wed Feb 28 2001 Trond Eivind Glomsr?d +- Added ddskk and ddskk-el +- Added tux and kdebindings-* + +* Wed Feb 14 2001 Preston Brown +- merged translations for European languages. + +* Thu Feb 8 2001 Matt Wilson +- updated from CVS + +* Thu Jan 25 2001 Matt Wilson +- updated ja + +* Tue Jan 23 2001 Matt Wilson +- updated de es it fr, updated C.po to current package set +- ran make update-po + +* Mon Jan 22 2001 Preston Brown +- build for 7.1 Public Beta +- langify everything + +* Thu Jan 11 2001 Jeff Johnson +- build for 7.1 From svn at tinysofa.org Thu Jul 1 15:40:47 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:40:47 +1000 (EST) Subject: [tinysofa-svn] r2660 - in tinysofa/snapshot: . subversion subversion/current subversion/current/sources subversion/current/specs Message-ID: <20040701154047.C60064E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:40:47 +1000 (Fri, 02 Jul 2004) New Revision: 2660 Added: tinysofa/snapshot/subversion/ tinysofa/snapshot/subversion/current/ tinysofa/snapshot/subversion/current/sources/ tinysofa/snapshot/subversion/current/sources/filter-requires.sh tinysofa/snapshot/subversion/current/sources/subversion-0.20.1-deplibs.patch tinysofa/snapshot/subversion/current/sources/subversion-0.24.2-swig.patch tinysofa/snapshot/subversion/current/sources/subversion-0.31.0-rpath.patch tinysofa/snapshot/subversion/current/sources/subversion-1.0.2-blame.patch tinysofa/snapshot/subversion/current/sources/subversion-1.0.3-pie.patch tinysofa/snapshot/subversion/current/sources/subversion-1.0.5.tar.gz tinysofa/snapshot/subversion/current/sources/subversion-r8822.patch tinysofa/snapshot/subversion/current/sources/subversion.conf tinysofa/snapshot/subversion/current/specs/ tinysofa/snapshot/subversion/current/specs/subversion.spec Log: - Add subversion to snapshot from 2.0. Added: tinysofa/snapshot/subversion/current/sources/filter-requires.sh =================================================================== --- tinysofa/snapshot/subversion/current/sources/filter-requires.sh 2004-07-01 15:40:43 UTC (rev 2659) +++ tinysofa/snapshot/subversion/current/sources/filter-requires.sh 2004-07-01 15:40:47 UTC (rev 2660) @@ -0,0 +1,3 @@ +#!/bin/sh + +/usr/lib/rpm/perl.req $* | sed -e '/perl(Config::IniFiles)/d' Property changes on: tinysofa/snapshot/subversion/current/sources/filter-requires.sh ___________________________________________________________________ Name: svn:executable + * Added: tinysofa/snapshot/subversion/current/sources/subversion-0.20.1-deplibs.patch =================================================================== --- tinysofa/snapshot/subversion/current/sources/subversion-0.20.1-deplibs.patch 2004-07-01 15:40:43 UTC (rev 2659) +++ tinysofa/snapshot/subversion/current/sources/subversion-0.20.1-deplibs.patch 2004-07-01 15:40:47 UTC (rev 2660) @@ -0,0 +1,33 @@ + +APR and APR-util are patched to store dependencies in the .la file. + +--- subversion-0.20.1/build/ac-macros/aprutil.m4.deplibs 2003-03-26 16:34:47.000000000 +0000 ++++ subversion-0.20.1/build/ac-macros/aprutil.m4 2003-04-29 11:03:54.000000000 +0100 +@@ -64,11 +64,9 @@ + AC_MSG_ERROR([apu-config --includes failed]) + fi + +- dnl When APR stores the dependent libs in the .la file, we don't need +- dnl --libs. +- SVN_APRUTIL_LIBS="`$apu_config --link-libtool --libs`" ++ SVN_APRUTIL_LIBS="`$apu_config --link-libtool`" + if test $? -ne 0; then +- AC_MSG_ERROR([apu-config --link-libtool --libs failed]) ++ AC_MSG_ERROR([apu-config --link-libtool failed]) + fi + + SVN_APRUTIL_EXPORT_LIBS="`$apu_config --link-ld --libs`" +--- subversion-0.20.1/build/ac-macros/apr.m4.deplibs 2003-03-26 16:34:47.000000000 +0000 ++++ subversion-0.20.1/build/ac-macros/apr.m4 2003-04-29 11:03:45.000000000 +0100 +@@ -68,9 +68,9 @@ + + dnl When APR stores the dependent libs in the .la file, we don't need + dnl --libs. +- SVN_APR_LIBS="`$apr_config --link-libtool --libs`" ++ SVN_APR_LIBS="`$apr_config --link-libtool`" + if test $? -ne 0; then +- AC_MSG_ERROR([apr-config --link-libtool --libs failed]) ++ AC_MSG_ERROR([apr-config --link-libtool failed]) + fi + + SVN_APR_EXPORT_LIBS="`$apr_config --link-ld --libs`" Added: tinysofa/snapshot/subversion/current/sources/subversion-0.24.2-swig.patch =================================================================== --- tinysofa/snapshot/subversion/current/sources/subversion-0.24.2-swig.patch 2004-07-01 15:40:43 UTC (rev 2659) +++ tinysofa/snapshot/subversion/current/sources/subversion-0.24.2-swig.patch 2004-07-01 15:40:47 UTC (rev 2660) @@ -0,0 +1,26 @@ + +Remove code to pick up LDFLAGS for swig; breaks for lib64. + +--- subversion-0.24.2/build/ac-macros/swig.m4.swig ++++ subversion-0.24.2/build/ac-macros/swig.m4 +@@ -69,20 +69,6 @@ + ]) + SWIG_LIBSWIG_DIR="$ac_cv_swig_swiglib_dir" + +- AC_CACHE_CHECK([if swig needs -L for its libraries], +- [ac_cv_swig_ldflags],[ +- # The swig libraries are one directory above the +- # `swig -swiglib` directory. +- ac_cv_swig_ldflags="" +- swig_lib_dir="`dirname $ac_cv_swig_swiglib_dir`" +- if test "$swig_lib_dir" && +- test "$swig_lib_dir" != "/lib" && +- test "$swig_lib_dir" != "/usr/lib"; then +- ac_cv_swig_ldflags="-L$swig_lib_dir" +- fi +- ]) +- SWIG_LDFLAGS="$ac_cv_swig_ldflags" +- + AC_CACHE_CHECK([for Python includes], [ac_cv_python_includes],[ + ac_cv_python_includes="`$PYTHON ${abs_srcdir}/build/get-py-info.py --includes`" + ]) Added: tinysofa/snapshot/subversion/current/sources/subversion-0.31.0-rpath.patch =================================================================== --- tinysofa/snapshot/subversion/current/sources/subversion-0.31.0-rpath.patch 2004-07-01 15:40:43 UTC (rev 2659) +++ tinysofa/snapshot/subversion/current/sources/subversion-0.31.0-rpath.patch 2004-07-01 15:40:47 UTC (rev 2660) @@ -0,0 +1,28 @@ + +Only pass -rpath $(libdir) on the link line when linking libraries, +not programs. + +--- subversion-0.31.0/build/generator/gen_base.py.rpath ++++ subversion-0.31.0/build/generator/gen_base.py +@@ -421,6 +421,9 @@ + tfile = '%s-%s%s' % (name, cfg.version, extmap['lib', 'target']) + self.filename = os.path.join(self.path, tfile) + ++ ### hmm. this is Makefile-specific ++ self.link_cmd = '$(LINK_LIB)' ++ + class TargetApacheMod(TargetLib): + + def __init__(self, name, options, cfg, extmap): +--- subversion-0.31.0/Makefile.in.rpath ++++ subversion-0.31.0/Makefile.in +@@ -127,7 +127,8 @@ + COMPILE_SWIG_JAVA = $(LIBTOOL) $(LTFLAGS) --mode=compile $(CC) $(CPPFLAGS) $(CFLAGS) $(SWIG_JAVA_INCLUDES) $(INCLUDES) -o $@ -c + COMPILE_SWIG_PL = $(LIBTOOL) $(LTFLAGS) --mode=compile $(CC) $(CPPFLAGS) $(CFLAGS) $(SWIG_PL_INCLUDES) $(INCLUDES) -o $@ -c + +-LINK = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS) -rpath $(libdir) ++LINK = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS) ++LINK_LIB = $(LINK) -rpath $(libdir) + + # special link rule for mod_dav_svn + LINK_APACHE_MOD = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS) -rpath $(APACHE_LIBEXECDIR) -avoid-version -module Added: tinysofa/snapshot/subversion/current/sources/subversion-1.0.2-blame.patch =================================================================== --- tinysofa/snapshot/subversion/current/sources/subversion-1.0.2-blame.patch 2004-07-01 15:40:43 UTC (rev 2659) +++ tinysofa/snapshot/subversion/current/sources/subversion-1.0.2-blame.patch 2004-07-01 15:40:47 UTC (rev 2660) @@ -0,0 +1,22 @@ + +Author: joe +Date: Sun May 2 17:39:03 2004 +New Revision: 9608 + +Modified: + trunk/subversion/libsvn_client/blame.c +Log: +* subversion/libsvn_client/blame.c: Make global symbol output_fns +static. + +--- subversion-1.0.2/subversion/libsvn_client/blame.c.blame ++++ subversion-1.0.2/subversion/libsvn_client/blame.c +@@ -217,7 +217,7 @@ + apr_pool_t *pool; + }; + +-const svn_diff_output_fns_t output_fns = { ++static const svn_diff_output_fns_t output_fns = { + NULL, + output_diff_modified + }; Added: tinysofa/snapshot/subversion/current/sources/subversion-1.0.3-pie.patch =================================================================== --- tinysofa/snapshot/subversion/current/sources/subversion-1.0.3-pie.patch 2004-07-01 15:40:43 UTC (rev 2659) +++ tinysofa/snapshot/subversion/current/sources/subversion-1.0.3-pie.patch 2004-07-01 15:40:47 UTC (rev 2660) @@ -0,0 +1,60 @@ + +Build subversion executables as PIEs. Requires a slight jig to +ensure that executables in the test suite are *not* build using +-pie, since that doesn't work when main() is not itself an +object built with -pie. + +--- subversion-1.0.4/build/generator/gen_base.py.pie ++++ subversion-1.0.4/build/generator/gen_base.py +@@ -393,6 +393,9 @@ + self.manpages = options.get('manpages', '') + self.testing = options.get('testing') + ++ if self.install == 'test' or self.install == 'fs-test': ++ self.link_cmd = '$(LINK_TEST)' ++ + def add_dependencies(self, graph, cfg, extmap): + TargetLinked.add_dependencies(self, graph, cfg, extmap) + +@@ -429,8 +432,11 @@ + self.msvc_static = options.get('msvc-static') == 'yes' # is a static lib + self.msvc_fake = options.get('msvc-fake') == 'yes' # has fake target + +- ### hmm. this is Makefile-specific +- self.link_cmd = '$(LINK_LIB)' ++ ### more Makefile-specific stuff: ++ if self.install == 'test': ++ self.link_cmd = '$(LINK_TEST_LIB)' ++ else: ++ self.link_cmd = '$(LINK_LIB)' + + class TargetApacheMod(TargetLib): + +--- subversion-1.0.4/Makefile.in.pie ++++ subversion-1.0.4/Makefile.in +@@ -123,8 +123,9 @@ + CPPFLAGS = @CPPFLAGS@ $(EXTRA_CPPFLAGS) + LDFLAGS = @LDFLAGS@ $(EXTRA_LDFLAGS) + +-COMPILE = $(CC) $(CPPFLAGS) $(CFLAGS) $(INCLUDES) +-LT_COMPILE = $(LIBTOOL) $(LTFLAGS) --mode=compile $(COMPILE) ++BASE_COMPILE = $(CC) $(CPPFLAGS) $(CFLAGS) $(INCLUDES) ++COMPILE = $(BASE_COMPILE) -fpie ++LT_COMPILE = $(LIBTOOL) $(LTFLAGS) --mode=compile $(BASE_COMPILE) + + # special compilation for files destined for mod_dav_svn + COMPILE_APACHE_MOD = $(LIBTOOL) $(LTFLAGS) --mode=compile $(CC) $(CPPFLAGS) $(CFLAGS) $(APACHE_INCLUDES) $(INCLUDES) -o $@ -c +@@ -134,8 +135,11 @@ + COMPILE_SWIG_JAVA = $(LIBTOOL) $(LTFLAGS) --mode=compile $(CC) $(CPPFLAGS) $(CFLAGS) $(SWIG_JAVA_INCLUDES) $(INCLUDES) -o $@ -c + COMPILE_SWIG_PL = $(LIBTOOL) $(LTFLAGS) --mode=compile $(CC) $(CPPFLAGS) $(CFLAGS) $(SWIG_PL_INCLUDES) $(INCLUDES) -o $@ -c + +-LINK = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS) +-LINK_LIB = $(LINK) -rpath $(libdir) ++BASE_LINK = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS) ++LINK = $(BASE_LINK) -pie ++LINK_TEST = $(BASE_LINK) -no-install ++LINK_LIB = $(BASE_LINK) -rpath $(libdir) ++LINK_TEST_LIB = $(BASE_LINK) + + # special link rule for mod_dav_svn + LINK_APACHE_MOD = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS) -rpath $(APACHE_LIBEXECDIR) -avoid-version -module Added: tinysofa/snapshot/subversion/current/sources/subversion-1.0.5.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/subversion/current/sources/subversion-1.0.5.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/subversion/current/sources/subversion-r8822.patch =================================================================== --- tinysofa/snapshot/subversion/current/sources/subversion-r8822.patch 2004-07-01 15:40:43 UTC (rev 2659) +++ tinysofa/snapshot/subversion/current/sources/subversion-r8822.patch 2004-07-01 15:40:47 UTC (rev 2660) @@ -0,0 +1,25 @@ + +Author: bliss +Date: Tue Feb 24 14:40:11 2004 +New Revision: 8822 + +Modified: + trunk/subversion/libsvn_ra_dav/session.c +Log: +Enable http compression by default now that mod_deflate is streamy (since +httpd 2.0.48). + +* subversion/libsvn_ra_dav/session.c + (get_server_settings): Enable http compression by default. + +--- subversion-1.0.0/subversion/libsvn_ra_dav/session.c.r8822 ++++ subversion-1.0.0/subversion/libsvn_ra_dav/session.c +@@ -383,7 +383,7 @@ + svn_config_get(cfg, &timeout_str, SVN_CONFIG_SECTION_GLOBAL, + SVN_CONFIG_OPTION_HTTP_TIMEOUT, NULL); + svn_config_get_bool(cfg, compression, SVN_CONFIG_SECTION_GLOBAL, +- SVN_CONFIG_OPTION_HTTP_COMPRESSION, FALSE); ++ SVN_CONFIG_OPTION_HTTP_COMPRESSION, TRUE); + svn_config_get(cfg, &debug_str, SVN_CONFIG_SECTION_GLOBAL, + SVN_CONFIG_OPTION_NEON_DEBUG_MASK, NULL); + } Added: tinysofa/snapshot/subversion/current/sources/subversion.conf =================================================================== --- tinysofa/snapshot/subversion/current/sources/subversion.conf 2004-07-01 15:40:43 UTC (rev 2659) +++ tinysofa/snapshot/subversion/current/sources/subversion.conf 2004-07-01 15:40:47 UTC (rev 2660) @@ -0,0 +1,25 @@ + +LoadModule dav_svn_module modules/mod_dav_svn.so +LoadModule authz_svn_module modules/mod_authz_svn.so + +# +# Example configuration to enable HTTP access for a Subversion +# repository, "/home/svnroot". This repository must be readable +# and writable by the 'apache' user. +# + +# +# DAV svn +# SVNPath /home/svnroot +# +# # Limit write permission to list of valid users. +# +# # Require SSL connection for password protection. +# # SSLRequireSSL +# +# AuthType Basic +# AuthName "Authorization Realm" +# AuthUserFile /path/to/passwdfile +# Require valid-user +# +# Added: tinysofa/snapshot/subversion/current/specs/subversion.spec =================================================================== --- tinysofa/snapshot/subversion/current/specs/subversion.spec 2004-07-01 15:40:43 UTC (rev 2659) +++ tinysofa/snapshot/subversion/current/specs/subversion.spec 2004-07-01 15:40:47 UTC (rev 2660) @@ -0,0 +1,383 @@ +# set to zero to avoid running test suite +%define make_check 0 + +%define perl_vendorarch %(eval "`%{__perl} -V:installvendorarch`"; echo $installvendorarch) + +Summary: Modern Version Control System designed to replace CVS +Name: subversion +Version: 1.0.5 +Release: 2ts +License: BSD +Group: Development/Tools +URL: http://subversion.tigris.org/ +Source0: http://subversion.tigris.org/tarballs/subversion-%{version}.tar.gz +Source1: subversion.conf +Source3: filter-requires.sh +Patch1: subversion-0.24.2-swig.patch +Patch2: subversion-0.20.1-deplibs.patch +Patch3: subversion-0.31.0-rpath.patch +Patch4: subversion-1.0.2-blame.patch +Patch5: subversion-r8822.patch +Patch6: subversion-1.0.3-pie.patch +BuildPreReq: autoconf, libtool, python, python-devel, texinfo +BuildPreReq: db4-devel >= 4.1.25, swig >= 1.3.15, docbook-style-xsl +BuildPreReq: apr-devel, apr-util-devel, neon-devel >= 0:0.24.0-1 +BuildRoot: %{_tmppath}/%{name}-%{version}-root + +%define __perl_requires %{SOURCE3} + +# Put Python bindings in site-packages +%define pydir %(python -c 'from distutils import sysconfig; print sysconfig.get_python_lib()') +%define swigdirs swig_pydir=%{pydir}/libsvn swig_pydir_extra=%{pydir}/svn + +%description +Subversion is a concurrent version control system which enables one +or more users to collaborate in developing and maintaining a +hierarchy of files and directories while keeping a history of all +changes. Subversion only stores the differences between versions, +instead of every complete file. Subversion is intended to be a +compelling replacement for CVS. + +%package devel +Group: Development/Tools +Summary: Development package for Subversion developers. +Requires: subversion = %{version}-%{release}, apr-devel, apr-util-devel + +%description devel +The subversion-devel package includes the static libraries and +include files for developers interacting with the subversion +package. + +%package -n mod_dav_svn +Group: System Environment/Daemons +Summary: Apache server module for Subversion server. +Requires: httpd-mmn = %(cat %{_includedir}/httpd/.mmn || echo missing) +Requires: subversion = %{version}-%{release} +BuildRequires: httpd-devel >= 2.0.45 + +%description -n mod_dav_svn +The mod_dav_svn package allows access to a Subversion repository +using HTTP, via the Apache httpd server. + +%package perl +Group: Development/Libraries +Summary: Perl bindings to the Subversion libraries +BuildRequires: perl >= 2:5.8.0 +Requires: %(eval `perl -V:version`; echo "perl(:MODULE_COMPAT_$version)") +Requires: subversion = %{version}-%{release} + +%description perl +This package includes the Perl bindings to the Subversion libraries. + +%prep +%setup -q +%patch1 -p1 -b .swig +%patch2 -p1 -b .deplibs +%patch3 -p1 -b .rpath +%patch4 -p1 -b .blame +%patch5 -p1 -b .r8822 +%patch6 -p1 -b .pie + +rm -rf neon apr apr-util db4 + +%build +./autogen.sh + +# requirement for apr 0.9.5 seems to be bogus +perl -pi -e 's/\.\[5-9\]/\.\[4-9\]/' configure + +# fix shebang lines, #111498 +perl -pi -e 's|/usr/bin/env perl -w|/usr/bin/perl -w|' tools/hook-scripts/*.pl.in + +export CC=gcc CXX=g++ CPPFLAGS="$CPPFLAGS -I/usr/include/pcre" +%configure --with-apr=%{_prefix} --with-apr-util=%{_prefix} \ + --with-swig --with-neon=%{_prefix} \ + --with-apxs=%{_sbindir}/apxs --disable-mod-activation +make %{?_smp_mflags} all swig-py %{swigdirs} swig-pl-lib + +# build the perl modules +pushd subversion/bindings/swig/perl +CFLAGS="$RPM_OPT_FLAGS" %{__perl} Makefile.PL INSTALLDIRS=vendor +make %{?_smp_mflags} +popd + +%install +rm -rf ${RPM_BUILD_ROOT} +make install install-swig-py install-swig-pl-lib \ + DESTDIR=$RPM_BUILD_ROOT %{swigdirs} + +make pure_install -C subversion/bindings/swig/perl \ + PERL_INSTALL_ROOT=$RPM_BUILD_ROOT + +# Add subversion.conf configuration file into httpd/conf.d directory. +install -m 755 -d ${RPM_BUILD_ROOT}%{_sysconfdir}/httpd/conf.d +install -m 644 $RPM_SOURCE_DIR/subversion.conf ${RPM_BUILD_ROOT}%{_sysconfdir}/httpd/conf.d + +# Remove unpackaged files +rm -rf ${RPM_BUILD_ROOT}%{_includedir}/subversion-*/*.txt \ + ${RPM_BUILD_ROOT}%{pydir}/*/*.{a,la} + +# remove stuff produced with Perl modules +find $RPM_BUILD_ROOT -type f \ + -a \( -name .packlist -o \( -name '*.bs' -a -empty \) \) \ + -print0 | xargs -0 rm -f + +# make Perl modules writable so they get stripped +find $RPM_BUILD_ROOT%{_libdir}/perl5 -type f -perm 555 -print0 | + xargs -0 chmod 755 + +# unnecessary libraries for swig bindings +rm -f ${RPM_BUILD_ROOT}%{_libdir}/libsvn_swig_*.{so,la,a} + +# Trim what goes in docdir +rm -rf tools/*/*.in tools/test-scripts \ + doc/book/book/images/images doc/book/book/images/*.ppt + +# Rename authz_svn INSTALL doc for docdir +ln subversion/mod_authz_svn/INSTALL mod_authz_svn-INSTALL + +%if %{make_check} +%check +make check CLEANUP=yes +make -C subversion/bindings/swig/perl test +%endif + +%clean +rm -rf ${RPM_BUILD_ROOT} + +%post -p /sbin/ldconfig + +%postun -p /sbin/ldconfig + +%post perl -p /sbin/ldconfig + +%postun perl -p /sbin/ldconfig + +%files +%defattr(-,root,root) +%doc BUGS COMMITTERS COPYING HACKING INSTALL README CHANGES +%doc tools subversion/LICENSE mod_authz_svn-INSTALL +%doc doc/book/book/book.html doc/book/book/images +%{_bindir}/* +%{_libdir}/libsvn_*.so.* +%{_mandir}/man*/* +%{pydir}/svn +%{pydir}/libsvn +%exclude %{_libdir}/libsvn_swig_perl* +%exclude %{_mandir}/man*/*::* + +%files devel +%defattr(-,root,root) +%{_includedir}/subversion-1 +%{_libdir}/libsvn*.a +%{_libdir}/libsvn*.la +%{_libdir}/libsvn*.so +%exclude %{_libdir}/libsvn_swig_perl* + +%files -n mod_dav_svn +%defattr(-,root,root) +%config(noreplace) %{_sysconfdir}/httpd/conf.d/subversion.conf +%{_libdir}/httpd/modules/mod_dav_svn.so +%{_libdir}/httpd/modules/mod_authz_svn.so + +%files perl +%defattr(-,root,root,-) +%{perl_vendorarch}/auto/SVN +%{perl_vendorarch}/SVN +%{_libdir}/libsvn_swig_perl* +%{_mandir}/man*/*::* + +%changelog +* Tue Jun 15 2004 Elliot Lee +- rebuilt + +* Thu Jun 10 2004 Joe Orton 1.0.5-1 +- update to 1.0.5 + +* Mon Jun 7 2004 Joe Orton 1.0.4-2 +- add ra_svn security fix for CVE CAN-2004-0413 (Ben Reser) + +* Fri May 28 2004 Joe Orton 1.0.4-1.1 +- rebuild for new swig + +* Sat May 22 2004 Joe Orton 1.0.4-1 +- update to 1.0.4 + +* Fri May 21 2004 Joe Orton 1.0.3-2 +- build /usr/bin/* as PIEs +- add fix for libsvn_client symbol namespace violation (r9608) + +* Wed May 19 2004 Joe Orton 1.0.3-1 +- update to 1.0.3 + +* Sun May 16 2004 Joe Orton 1.0.2-3 +- add ldconfig invocations for -perl post/postun (Ville Skytt?) + +* Tue May 4 2004 Joe Orton 1.0.2-2 +- add perl MODULE_COMPAT requirement for -perl subpackage +- move perl man pages into -perl subpackage +- clean up -perl installation and dependencies (Ville Skytt?, #123045) + +* Mon Apr 19 2004 Joe Orton 1.0.2-1 +- update to 1.0.2 + +* Fri Mar 12 2004 Joe Orton 1.0.1-1 +- update to 1.0.1; cvs2svn no longer included + +* Fri Mar 12 2004 Joe Orton 1.0.0-3 +- add -perl subpackage for Perl bindings (steve at silug.org) +- include mod_authz_svn INSTALL file + +* Tue Mar 02 2004 Elliot Lee 1.0.0-2.1 +- rebuilt + +* Wed Feb 25 2004 Joe Orton 1.0.0-2 +- add fix for lack of apr_dir_read ordering guarantee (Philip Martin) +- enable compression in ra_dav by default (Tobias Ringstr?m) + +* Mon Feb 23 2004 Joe Orton 1.0.0-1 +- update to one-dot-oh + +* Fri Feb 13 2004 Elliot Lee 0.37.0-2 +- rebuilt + +* Sat Jan 24 2004 Joe Orton 0.37.0-1 +- update to 0.37.0 + +* Tue Jan 13 2004 Joe Orton 0.36.0-1 +- update to 0.36.0 + +* Thu Jan 8 2004 Joe Orton 0.35.1-1 +- update to 0.35.1 +- fix shebang lines in hook scripts (#111498) + +* Sat Dec 13 2003 Jeff Johnson 0.34.0-3 +- rebuild against db-4.2.52. + +* Thu Dec 4 2003 Joe Orton 0.34.0-2 +- package all man pages + +* Thu Dec 04 2003 Joe Orton 0.34.0-1 +- update to 0.34.0 + +* Thu Nov 13 2003 Joe Orton 0.32.1-3 +- remove workarounds for #109268 and #109267 + +* Thu Nov 6 2003 Joe Orton 0.32.1-2 +- rebuild for Python 2.3.2 +- remove libtool workaround +- add workarounds for #109268 and #109267 + +* Fri Oct 24 2003 Joe Orton 0.32.1-1 +- update to 0.31.2 +- work around libtool/ppc64/db4 confusion + +* Mon Oct 13 2003 Jeff Johnson 0.31.0-2.1 +- rebuild against db-4.2.42. + +* Fri Oct 10 2003 Joe Orton 0.31.0-2 +- include The Book +- don't add an RPATH for libdir to executables + +* Thu Oct 9 2003 Joe Orton 0.31.0-1 +- update to 0.31.0 + +* Wed Sep 24 2003 Joe Orton 0.30.0-1 +- update to 0.30.0 + +* Sun Sep 7 2003 Joe Orton 0.29.0-1 +- update to 0.29.0 + +* Tue Jul 22 2003 Nalin Dahyabhai 0.25-2 +- rebuild + +* Tue Jul 15 2003 Joe Orton 0.25-1 +- update to 0.25 + +* Mon Jul 14 2003 Joe Orton 0.24.2-4 +- rebuild + +* Tue Jun 24 2003 Joe Orton 0.24.2-3 +- rebuild + +* Tue Jun 24 2003 Joe Orton 0.24.2-2 +- don't use any LDFLAGS when building swig, fix for libdir=lib64 + +* Tue Jun 24 2003 Joe Orton 0.24.2-1 +- update to 0.24.2; fix Python bindings + +* Tue Jun 17 2003 Joe Orton 0.24.1-1 +- update to 0.24.1; include mod_authz_svn +- force use of CC=gcc CXX=g++ + +* Mon Jun 9 2003 Joe Orton 0.23.0-2 +- add cvs2svn man page + +* Mon Jun 9 2003 Joe Orton 0.23.0-1 +- update to 0.23.0 + +* Sun Jun 8 2003 Joe Orton 0.22.2-7 +- package cvs2svn to be usable outside docdir +- remove unnecessary files + +* Thu Jun 5 2003 Joe Orton 0.22.2-6 +- add fix for unhandled deadlock errors in libsvn_fs +- don't package the out-of-date info pages + +* Wed Jun 04 2003 Elliot Lee 0.22.2-5 +- rebuilt + +* Tue Jun 3 2003 Joe Orton 0.22.2-4 +- cleanups + +* Mon Jun 2 2003 Elliot Lee 0.22.2-3 +- Add back in s390x, excludearch bad. + +* Tue May 20 2003 Jeff Johnson 0.22.2-2 +- use external neon-0.23.9-2 (i.e. with neon-config), drop internal neon. +- use db-4.1.25, not db-4.0.14. +- do "make check" (but ignore failure for now). +- s390x knows not of httpd >= 2.0.45. + +* Thu May 8 2003 Joe Orton 0.22.2-1 +- update to 0.22.2; add mod_dav_svn subpackage +- include Python bindings +- neon: force use of expat, enable SSL +- drop check for specific apr version added in -3 + +* Thu May 1 2003 Joe Orton 0.20.1-6 +- filter out perl(Config::IniFiles) requirement + +* Thu May 1 2003 Joe Orton 0.20.1-5 +- fail early if apr-config is not 0.9.3 + +* Wed Apr 30 2003 Joe Orton 0.20.1-4 +- fix workaround for non-lib64 platforms + +* Wed Apr 30 2003 Joe Orton 0.20.1-3 +- add workaround for libtool problem + +* Tue Apr 29 2003 Joe Orton 0.20.1-2 +- require and use system apr, apr-util libraries +- use License not Copyright + +* Fri Apr 04 2003 Florian La Roche +- update to 0.20.1 + +* Wed Jan 22 2003 Jeff Johnson 0.17.1-4503.0 +- upgrade to 0.17.1. + +* Wed Dec 11 2002 Jeff Johnson 0.16-3987.1 +- upgrade to 0.16. + +* Wed Nov 13 2002 Jeff Johnson 0.15-3687.2 +- don't mess with the info handbook install yet. + +* Sun Nov 10 2002 Jeff Johnson 0.15-3687.1 +- use libdir, build on x86_64 too. +- avoid "perl(Config::IniFiles) >= 2.27" dependency. + +* Sat Nov 9 2002 Jeff Johnson 0.15-3687.0 +- first build from adapted spec file, only client and libraries for now. +- internal apr/apr-utils/neon until incompatibilities sort themselves out. +- avoid libdir issues on x86_64 for the moment. From svn at tinysofa.org Thu Jul 1 15:40:50 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:40:50 +1000 (EST) Subject: [tinysofa-svn] r2661 - in tinysofa/snapshot: . swig swig/current swig/current/sources swig/current/specs Message-ID: <20040701154050.77C494E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:40:50 +1000 (Fri, 02 Jul 2004) New Revision: 2661 Added: tinysofa/snapshot/swig/ tinysofa/snapshot/swig/current/ tinysofa/snapshot/swig/current/sources/ tinysofa/snapshot/swig/current/sources/swig-1.3.19-pylib.patch tinysofa/snapshot/swig/current/sources/swig-1.3.21-destdir.patch tinysofa/snapshot/swig/current/sources/swig-1.3.21.tar.gz tinysofa/snapshot/swig/current/specs/ tinysofa/snapshot/swig/current/specs/swig.spec Log: - Add swig to snapshot from 2.0. Added: tinysofa/snapshot/swig/current/sources/swig-1.3.19-pylib.patch =================================================================== --- tinysofa/snapshot/swig/current/sources/swig-1.3.19-pylib.patch 2004-07-01 15:40:47 UTC (rev 2660) +++ tinysofa/snapshot/swig/current/sources/swig-1.3.19-pylib.patch 2004-07-01 15:40:50 UTC (rev 2661) @@ -0,0 +1,29 @@ +--- SWIG-1.3.19/configure.in.pylib 2003-03-23 22:47:23.000000000 +0000 ++++ SWIG-1.3.19/configure.in 2003-05-18 16:49:01.000000000 +0100 +@@ -501,9 +501,11 @@ + + # Set the include directory + ++ PYLIB=`$PYTHON -c "import sys; print sys.path[[1]]"` ++ + AC_MSG_CHECKING(for Python header files) + if test -r $PYPREFIX/include/$PYVERSION/Python.h; then +- PYINCLUDE="-I$PYPREFIX/include/$PYVERSION -I$PYEPREFIX/lib/$PYVERSION/config" ++ PYINCLUDE="-I$PYPREFIX/include/$PYVERSION -I$PYLIB/config" + fi + if test -z "$PYINCLUDE"; then + if test -r $PYPREFIX/include/Py/Python.h; then +@@ -514,13 +516,6 @@ + + # Set the library directory blindly. This probably won't work with older versions + AC_MSG_CHECKING(for Python library) +- dirs="$PYVERSION/config $PYVERSION/lib python/lib" +- for i in $dirs; do +- if test -d $PYEPREFIX/lib/$i; then +- PYLIB="$PYEPREFIX/lib/$i" +- break +- fi +- done + if test -z "$PYLIB"; then + AC_MSG_RESULT(Not found) + else Added: tinysofa/snapshot/swig/current/sources/swig-1.3.21-destdir.patch =================================================================== --- tinysofa/snapshot/swig/current/sources/swig-1.3.21-destdir.patch 2004-07-01 15:40:47 UTC (rev 2660) +++ tinysofa/snapshot/swig/current/sources/swig-1.3.21-destdir.patch 2004-07-01 15:40:50 UTC (rev 2661) @@ -0,0 +1,23 @@ +--- SWIG-1.3.21/Makefile.in.destdir 2004-05-04 15:03:07.651571157 +0200 ++++ SWIG-1.3.21/Makefile.in 2004-05-04 15:03:58.278335334 +0200 +@@ -365,9 +365,9 @@ + + install-m4: + @echo "Installing M4 macros" +- @$(MKINSTDIRS) $(M4_INSTALL_DIR) ++ @$(MKINSTDIRS) $(DESTDIR)$(M4_INSTALL_DIR) + @echo "Installing $(M4_INSTALL_DIR)/swig.m4" +- @$(INSTALL_DATA) $(M4_SOURCE_DIR)/swig.m4 $(M4_INSTALL_DIR)/swig.m4 ++ @$(INSTALL_DATA) $(M4_SOURCE_DIR)/swig.m4 $(DESTDIR)$(M4_INSTALL_DIR)/swig.m4 + + + ##################################################################### +@@ -390,7 +390,7 @@ + + uninstall-m4: + @echo "Uninstalling $(M4_INSTALL_DIR)/swig.m4" +- rm -f $(M4_INSTALL_DIR)/swig.m4; ++ rm -f $(DESTDIR)$(M4_INSTALL_DIR)/swig.m4; + + ############################################################################ + # DIST and other maintenance Added: tinysofa/snapshot/swig/current/sources/swig-1.3.21.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/swig/current/sources/swig-1.3.21.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/swig/current/specs/swig.spec =================================================================== --- tinysofa/snapshot/swig/current/specs/swig.spec 2004-07-01 15:40:47 UTC (rev 2660) +++ tinysofa/snapshot/swig/current/specs/swig.spec 2004-07-01 15:40:50 UTC (rev 2661) @@ -0,0 +1,158 @@ +%{!?tcl:%define tcl 1} +%{!?guile:%define guile 1} + +Summary: Connects C/C++/Objective C to some high-level programming languages. +Name: swig +Version: 1.3.21 +Release: 3ts +License: BSD +Group: Development/Tools +URL: http://swig.sourceforge.net/ +Source: http://download.sourceforge.net/swig/swig-%{version}.tar.gz +Patch1: swig-1.3.19-pylib.patch +Patch2: swig-1.3.21-destdir.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-root +BuildPrereq: perl, python-devel +%if %{tcl} +BuildPrereq: tcl +%endif +%if %{guile} +BuildPrereq: guile-devel +%endif + +%description +Simplified Wrapper and Interface Generator (SWIG) is a software +development tool for connecting C, C++ and Objective C programs with a +variety of high-level programming languages. SWIG is primarily used +with Perl, Python and Tcl/TK, but it has also been extended to Java, +Eiffel and Guile. SWIG is normally used to create high-level +interpreted programming environments, systems integration, and as a +tool for building user interfaces. + +%prep +%setup -q -n SWIG-%{version} +%patch1 -p1 -b .pylib +%patch2 -p1 -b .destdir + +%build +./autogen.sh +%configure +make +make runtime + +%install +rm -rf $RPM_BUILD_ROOT +make DESTDIR=$RPM_BUILD_ROOT install install-runtime + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(-,root,root) +%doc ANNOUNCE CHANGES FUTURE INSTALL LICENSE NEW README TODO +%doc Doc/* +%{_bindir}/* +%{_libdir}/lib*.* +%{_libdir}/swig1.3 +%{_datadir}/aclocal/swig.m4 + +%changelog +* Tue Jun 15 2004 Elliot Lee +- rebuilt + +* Wed May 19 2004 Joe Orton 1.3.21-2 +- restore missing runtime libraries + +* Tue May 04 2004 Phil Knirsch +- Update to swig-1.3.21 + +* Tue Mar 02 2004 Elliot Lee +- rebuilt + +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Tue Sep 23 2003 Florian La Roche +- allow compiling without tcl/guile + +* Wed Jun 04 2003 Elliot Lee +- rebuilt + +* Sun May 18 2003 Joe Orton 1.3.19-3 +- patch to pick up python libdir correctly + +* Sun May 18 2003 Joe Orton 1.3.19-2 +- add BuildPrereqs to ensure all bindings are built + +* Wed May 14 2003 Phil Knirsch 1.3.19-1 +- Update to swig-1.3.19 +- Major cleanup in specfile, too. :-) +- New lib64 fix. + +* Wed Jan 22 2003 Tim Powers +- rebuilt + +* Wed Nov 27 2002 Tim Powers 1.1p5-21 +- lib64'ize + +* Fri Aug 30 2002 Phil Knirsch 1.1p5-20 +- Patch by Lon Hohberger for ia64. + +* Wed Aug 28 2002 Phil Knirsch 1.1p5-19 +- Added multilib safe patch from arjan (#72523) + +* Tue Aug 13 2002 Karsten Hopp +- rebuilt with gcc-3.2 + +* Sat Aug 10 2002 Elliot Lee +- rebuilt with gcc-3.2 (we hope) + +* Mon Jul 22 2002 Tim Powers +- rebuild using gcc-3.2-0.1 + +* Fri Jun 21 2002 Tim Powers +- automated rebuild + +* Thu May 23 2002 Tim Powers +- automated rebuild + +* Fri Feb 8 2002 Bill Nottingham +- rebuild + +* Wed Jan 09 2002 Tim Powers +- automated rebuild + +* Fri Apr 27 2001 Nalin Dahyabhai +- use %%{_tmppath} instead of /var/tmp +- remove the postscript docs (pdftops from the xpdf pkg converts them just fine) + +* Wed Sep 13 2000 Tim Powers +- rebuilt for 7.1 + +* Mon Jul 24 2000 Prospector +- rebuilt + +* Mon Jul 17 2000 Tim Powers +- for some reason defattr wasn't before the docs, fixed + +* Mon Jul 10 2000 Tim Powers +- rebuilt + +* Fri Jun 2 2000 Tim Powers +- spec file cleanups + +* Sat May 20 2000 Tim Powers +- rebuilt for 7.0 +- man pages in /usr/share/man + +* Wed Jan 19 2000 Tim Powers +- bzipped sources to conserve space + +* Thu Jul 22 1999 Tim Powers +- rebuilt for 6.1 + +* Thu Apr 15 1999 Michael Maher +- built package for 6.0 + +* Tue Sep 15 1998 Michael Maher +- built package From svn at tinysofa.org Thu Jul 1 15:40:51 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:40:51 +1000 (EST) Subject: [tinysofa-svn] r2662 - in tinysofa/snapshot: . switchdesk switchdesk/current switchdesk/current/sources switchdesk/current/specs Message-ID: <20040701154051.BC7CF4E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:40:51 +1000 (Fri, 02 Jul 2004) New Revision: 2662 Added: tinysofa/snapshot/switchdesk/ tinysofa/snapshot/switchdesk/current/ tinysofa/snapshot/switchdesk/current/sources/ tinysofa/snapshot/switchdesk/current/sources/switchdesk-4.0.4-tinysofa-automake.patch tinysofa/snapshot/switchdesk/current/sources/switchdesk-4.0.4.tar.bz2 tinysofa/snapshot/switchdesk/current/specs/ tinysofa/snapshot/switchdesk/current/specs/switchdesk.spec Log: - Add switchdesk to snapshot from 2.0. Added: tinysofa/snapshot/switchdesk/current/sources/switchdesk-4.0.4-tinysofa-automake.patch =================================================================== --- tinysofa/snapshot/switchdesk/current/sources/switchdesk-4.0.4-tinysofa-automake.patch 2004-07-01 15:40:50 UTC (rev 2661) +++ tinysofa/snapshot/switchdesk/current/sources/switchdesk-4.0.4-tinysofa-automake.patch 2004-07-01 15:40:51 UTC (rev 2662) @@ -0,0 +1,12 @@ +diff -urN switchdesk-4.0.4/po/Makefile switchdesk-4.0.4.tinysofa-automake/po/Makefile +--- switchdesk-4.0.4/po/Makefile 2004-02-16 20:29:56.000000000 +1100 ++++ switchdesk-4.0.4.tinysofa-automake/po/Makefile 2004-06-11 01:58:33.000000000 +1000 +@@ -31,7 +31,7 @@ + + INSTALL = /usr/bin/install -c + INSTALL_DATA = ${INSTALL} -m 644 +-MKINSTALLDIRS = /usr/share/automake-1.6/mkinstalldirs ++MKINSTALLDIRS = /usr/share/automake-1.8/mkinstalldirs + mkinstalldirs = $(SHELL) `case "$(MKINSTALLDIRS)" in /*) echo "$(MKINSTALLDIRS)" ;; *) echo "$(top_builddir)/$(MKINSTALLDIRS)" ;; esac` + + CC = gcc Added: tinysofa/snapshot/switchdesk/current/sources/switchdesk-4.0.4.tar.bz2 =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/switchdesk/current/sources/switchdesk-4.0.4.tar.bz2 ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/switchdesk/current/specs/switchdesk.spec =================================================================== --- tinysofa/snapshot/switchdesk/current/specs/switchdesk.spec 2004-07-01 15:40:50 UTC (rev 2661) +++ tinysofa/snapshot/switchdesk/current/specs/switchdesk.spec 2004-07-01 15:40:51 UTC (rev 2662) @@ -0,0 +1,321 @@ +%define desktop_file 1 + +Name: switchdesk +Summary: A desktop environment switcher for GNOME, KDE and AnotherLevel. +Version: 4.0.4 +Release: 1ts +Source: %{name}-%{version}.tar.bz2 +Patch: switchdesk-4.0.4-tinysofa-automake.patch +License: GPL +Group: User Interface/Desktops +Buildroot: %{_tmppath}/%{name}-%{version}-root +BuildArch: noarch +BuildRequires: intltool + +%description +The Desktop Switcher is a tool which enables users to easily switch +between various desktop environments that they have installed. The +tool includes support for KDE, GNOME, XFce4 and twm. + +Support for different environments on different computers is available, as +well as support for setting a global default environment. + +Install switchdesk if you need a tool for switching between desktop +environments. + +%package gui +Group: User Interface/Desktops +Summary: A graphical interface for the Desktop Switcher. +Requires: %{name} +Requires: python +Requires: pygtk2 +Obsoletes: %{name}-kde +Obsoletes: %{name}-gnome +Provides: %{name}-kde +Provides: %{name}-gnome + +%description gui +The switchdesk-gui package provides the graphical user interface for +the Desktop Switcher. + +%prep + +%setup -q +%patch -p1 + +%build + +%install +rm -rf $RPM_BUILD_ROOT + +make install DESTDIR=$RPM_BUILD_ROOT + +%if %{desktop_file} + mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications + install -m 644 switchdesk.desktop $RPM_BUILD_ROOT%{_datadir}/applications/ +%else + mkdir $RPM_BUILD_ROOT/etc/X11/applnk/System + install -m 644 switchdesk.desktop $RPM_BUILD_ROOT/etc/X11/applnk/System/ +%endif + +%find_lang %{name} + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(-,root,root) +%{_bindir}/switchdesk +%{_bindir}/switchdesk-helper +%{_datadir}/switchdesk/Xclients* +%{_mandir}/man1/switchdesk.1* + +%files gui -f %{name}.lang +%defattr(-,root,root) +%{_datadir}/%{name}/pixmaps +%{_datadir}/%{name}/*.glade +%{_datadir}/%{name}/*.py* +%if %{desktop_file} +%{_datadir}/applications/* +%else +/etc/X11/applnk/System/* +%endif + +%changelog +* Wed May 26 2004 Than Ngo 4.0.4-1 +- fix wrong RB id of enlightenment which causes switchdesk crashed #124408 +- fix bug in setting default wm, bug #124292, #122260 +- fix bug in creating .Xclients, bug #123545 +- add selection button for System Default #110312 + +* Fri Apr 30 2004 Than Ngo 4.0.3-1 +- fix a invalid syntax bug in python script #121840, #121813 +- update translations + +* Tue Apr 06 2004 Than Ngo 4.0.2-1 +- 4.0.2 release +- translation update +- fix #120143 + +* Tue Feb 03 2004 Than Ngo 4.0.1-1 +- 4.0.1 release + +* Sun Feb 1 2004 Than Ngo 4.0.0-1 +- 4.0.0 release +- fixed #40226, #71711, #71990, #72744, #75751, #78603, #81801, #84043, #85077, #89347, #105880, #108582, #109683, #110312, #114190 + +- Thu Jun 26 2003 Than Ngo 3.9.8-18 +- build with gcc-3.3-12 +- fix desktop file issue +- cleanup specfile +- disable debuginfo + +* Wed Jun 04 2003 Elliot Lee +- rebuilt + +* Wed Jan 22 2003 Mike A. Harris 3.9.8-15 +- Remove multiple .desktop files (#72872) + +* Wed Jan 22 2003 Tim Powers 3.9.8-14 +- rebuilt + +* Tue Jan 21 2003 Paul Gampe 3.9.8-13 +- Ensure .po file encoding is in UTF-8 (#77813) and update translations + +* Tue Jan 21 2003 Paul Gampe 3.9.8-13 +- Ensure .po file encoding is in UTF-8 (#77813) + +* Wed Nov 13 2002 Mike A. Harris 3.9.8-12 +- Removed extraneous desktop file (#81801) + +* Wed Nov 13 2002 Mike A. Harris 3.9.8-11 +- Changed ./configure to rpm %%configure macro so libdir is set right on x86_64 +- More prefix/share -> %{_datadir} fixes, removal of {prefix}, and usage of + {_prefix} instead +- Changed make install to %%makeinstall macro + +* Wed Nov 13 2002 Mike A. Harris 3.9.8-10 +- Changed all occurances of {prefix}/foo to proper RPM macros and other spec + file cleanups +- Fix for unpackaged files in buildroot detected by new rpm policy + +* Sat Aug 10 2002 Elliot Lee +- rebuilt with gcc-3.2 (we hope) + +* Mon Aug 05 2002 Karsten Hopp +- desktop-file (#69506) +- fix wmaker (#65303) +- sync with cvs +- remove acconfig.h from CVS, it creates a config.h + with invalid deklarations +- fix comments in switchdesk-gnome.c +- fix CXXFLAGS in src/Makefile.am + +* Tue Jul 23 2002 Tim Powers 3.9.8-7 +- rebuild using gcc-3.2-0.1 + +* Fri Jul 05 2002 Karsten Hopp 3.9.8-6 +- fix #67326 + +* Wed Jun 26 2002 Karsten Hopp 3.9.8-5 +- fix #66791 (switchdesk doesn't list GNOME) +- use updated message catalogs fom CVS + +* Fri Jun 21 2002 Tim Powers +- automated rebuild + +* Thu May 23 2002 Tim Powers +- automated rebuild + +* Tue Apr 16 2002 Bernhard Rosenkraenzer 3.9.8-2 +- Rebuild + +* Mon Apr 15 2002 Trond Eivind Glomsr?d 3.9.8-1 +- Update translations + +* Tue Aug 28 2001 Bernhard Rosenkraenzer 3.9.7-1 +- Fix i18n (Patch from kmaraas at online.no, #52717) + +* Tue Aug 28 2001 Trond Eivind Glomsr?d 3.9.6-1 +- Translation update + +* Mon Mar 19 2001 Tim Powers +- fixed switchdesk-helper script, and cleaned up manpage so we don't + refer to AnotherLevel etc (#31142) + +* Mon Mar 12 2001 Preston Brown +- Xclients.fvwm was still missing (#31142) + +* Thu Mar 8 2001 Bernhard Rosenkraenzer +- Remove dependency on kdesupport, we don't actually use it + +* Wed Feb 28 2001 Trond Eivind Glomsr?d +- rebuild +- add buildprereqs + +* Fri Feb 16 2001 Yukihiro Nakai +- Add ja.po to Makefile.am +- enable NLS +- Change tar archive to handle bzip2 archive correctly. + +* Wed Feb 14 2001 Preston Brown +- last translation update. + +* Thu Jan 25 2001 Yukihiro Nakai +- Fix between selection and icon. +- Comment out the part that uses Makefile.cvs +- Version update. + +* Wed Jan 24 2001 Preston Brown +- i18n for europe included. + +* Fri Dec 22 2000 Yukihiro Nakai +- Gettextized +- Add Japanese resources + +* Mon Dec 11 2000 Bernhard Rosenkraenzer +- Fix typo in switchdesk-helper +- Don't exclude ia64 anymore, Qt compiles by now. + +* Thu Nov 16 2000 Bernhard Rosenkraenzer +- Handle KDE 2.0 (Bug #20371) +- Make the desktop names for the textmode frontend case insensitive +- Add Swedish translation to Desktop file (RFE #15362) +- Add German translation to Desktop file +- Fix up help text when neither switchdesk-kde nor switchdesk-gnome is + installed +- Fix up %%description - we support WindowMaker, fvwm and twm. +- Add the missing Xclients.fvwm file + +* Thu Aug 24 2000 Bernhard Rosenkraenzer +- Check whether the selected UI actually exists in textmode (Bug #16603) + +* Wed Aug 23 2000 Bernhard Rosenkraenzer +- Add docs for the KDE2 switch on command line (Bug #16743) +- Fix crash in switchdesk-gnome (Bug #16743) +- fix some minor oddities + +* Tue Aug 22 2000 Than Ngo +- fix /usr/share/apps/switchdesk/Xclients.kde2 for starting KDE2 correct + +* Sat Aug 19 2000 Bernhard Rosenkraenzer +- minor fix in spec file + +* Wed Aug 9 2000 Bernhard Rosenkraenzer +- Don't use KDE2 calls in switchdesk-kde; we're Qt only for now. + +* Fri Jul 14 2000 Bill Nottingham +- defattr + +* Thu Jul 13 2000 Bernhard Rosenkraenzer +- fix up the Xclients.* scripts + +* Wed Jul 12 2000 Bernhard Rosenkraenzer +- add enlightenment, twm, windowmaker to gnome version, remove AnotherLevel +- fix build with current KDE 2.0 +- stop using egcs++ +- fix a number of bugs +- ExcludeArch ia64 for now (kdelibs doesn't compile there) + +* Fri Jul 7 2000 Bernhard Rosenkraenzer +- use egcs++ for now + +* Wed Jun 21 2000 Preston Brown +- add enlightenment, twm, windowmaker to kde version, remove AnotherLevel + +* Sun Jun 18 2000 Matt Wilson +- rebuild for next release +- use %%{_mandir} + +* Mon May 22 2000 Bill Nottingham +- update autoconf stuff (ia64) + +* Sun Apr 9 2000 Bernhard Rosenkraenzer +- Port to KDE 2.0 +- some spec file tweaks + +* Mon Feb 28 2000 Preston Brown +- ignore unknown desktop names + +* Mon Feb 14 2000 Preston Brown +- switchdesk works from the console +- minor bugfixes and cleanups +- man page added + +* Mon Oct 04 1999 Preston Brown +- make the startup script a bit more probing/robust. + +* Tue Sep 14 1999 Preston Brown +- convert .kdelnk file to a system-wide .desktop file. + +* Mon Apr 19 1999 Preston Brown +- added back in switchdesk.kdelnk file (kde still doesn't handle + .desktop files) + +* Tue Apr 13 1999 Preston Brown +- fix up X display string handling + +* Wed Mar 24 1999 Preston Brown +- Xclients scripts installed with execute permission. + +* Wed Mar 17 1999 Preston Brown +- hardcode path to pidof (/sbin) because it isn't in default path. + +* Tue Mar 16 1999 Preston Brown +- converted kdelnk file to desktop file, moved location, removed KDEDIR + +* Mon Mar 08 1999 Preston Brown +- broke out separate kde, gnome packages. + +* Wed Feb 24 1999 Preston Brown +- new group. + +* Wed Feb 03 1999 Preston Brown +- initial revision of spec file. + + + + + + + From svn at tinysofa.org Thu Jul 1 15:40:52 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:40:52 +1000 (EST) Subject: [tinysofa-svn] r2663 - in tinysofa/snapshot: . symlinks symlinks/current symlinks/current/sources symlinks/current/specs Message-ID: <20040701154052.985CE4E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:40:52 +1000 (Fri, 02 Jul 2004) New Revision: 2663 Added: tinysofa/snapshot/symlinks/ tinysofa/snapshot/symlinks/current/ tinysofa/snapshot/symlinks/current/sources/ tinysofa/snapshot/symlinks/current/sources/symlinks-1.2-fixman.patch tinysofa/snapshot/symlinks/current/sources/symlinks-1.2-nostatic.patch tinysofa/snapshot/symlinks/current/sources/symlinks-1.2-short.patch tinysofa/snapshot/symlinks/current/sources/symlinks-1.2.tar.gz tinysofa/snapshot/symlinks/current/specs/ tinysofa/snapshot/symlinks/current/specs/symlinks.spec Log: - Add symlinks to snapshot from 2.0. Added: tinysofa/snapshot/symlinks/current/sources/symlinks-1.2-fixman.patch =================================================================== --- tinysofa/snapshot/symlinks/current/sources/symlinks-1.2-fixman.patch 2004-07-01 15:40:51 UTC (rev 2662) +++ tinysofa/snapshot/symlinks/current/sources/symlinks-1.2-fixman.patch 2004-07-01 15:40:52 UTC (rev 2663) @@ -0,0 +1,27 @@ +--- symlinks-1.2/symlinks.8.fixman Tue May 30 14:49:29 2000 ++++ symlinks-1.2/symlinks.8 Tue May 30 14:50:43 2000 +@@ -1,11 +1,11 @@ +-.TH SYMLINKS 8 "November 1994" "Version 1.1" ++.TH SYMLINKS 8 "November 1994" "Version 1.2" + + .SH NAME + symlinks \- symbolic link maintenance utility + .SH SYNOPSIS + .B symlinks + [ +-.B -cdrv ++.B -cdrstv + ] + dirlist + .SH DESCRIPTION +--- symlinks-1.2/symlinks.c.fixman Tue May 30 14:59:59 2000 ++++ symlinks-1.2/symlinks.c Tue May 30 15:00:39 2000 +@@ -289,7 +289,7 @@ + fprintf(stderr, "Flags:\t-c == change absolute/messy links to relative\n" + "\t-d == delete dangling links\n" + "\t-r == recurse into subdirs\n" +- "\t-s == shorten lengthy links\n" ++ "\t-s == shorten lengthy links (only displayed if -c not specified)\n" + "\t-v == verbose (show all symlinks)\n\n"); + exit(1); + } Added: tinysofa/snapshot/symlinks/current/sources/symlinks-1.2-nostatic.patch =================================================================== --- tinysofa/snapshot/symlinks/current/sources/symlinks-1.2-nostatic.patch 2004-07-01 15:40:51 UTC (rev 2662) +++ tinysofa/snapshot/symlinks/current/sources/symlinks-1.2-nostatic.patch 2004-07-01 15:40:52 UTC (rev 2663) @@ -0,0 +1,11 @@ +--- symlinks-1.2/Makefile.nostatic Thu Feb 10 11:35:00 2000 ++++ symlinks-1.2/Makefile Thu Feb 10 11:38:01 2000 +@@ -3,7 +3,7 @@ + all: symlinks + + symlinks: symlinks.c +- gcc -Wall -Wstrict-prototypes -O2 -N -s -o symlinks symlinks.c ++ gcc -Wall -Wstrict-prototypes ${RPM_OPT_FLAGS} -o symlinks symlinks.c + + install: all symlinks.8 + install -m 755 -o root -g root symlinks /usr/local/bin Added: tinysofa/snapshot/symlinks/current/sources/symlinks-1.2-short.patch =================================================================== --- tinysofa/snapshot/symlinks/current/sources/symlinks-1.2-short.patch 2004-07-01 15:40:51 UTC (rev 2662) +++ tinysofa/snapshot/symlinks/current/sources/symlinks-1.2-short.patch 2004-07-01 15:40:52 UTC (rev 2663) @@ -0,0 +1,10 @@ +--- symlinks-1.2/symlinks.c.lr 2003-10-16 14:07:29.000000000 +0200 ++++ symlinks-1.2/symlinks.c 2003-10-16 14:08:16.000000000 +0200 +@@ -235,6 +235,7 @@ + strcpy (np, tail); + (void) tidy_path(new); + } ++ shorten_path(new, path); + if (!testing) { + if (unlink (path)) { + perror(path); Added: tinysofa/snapshot/symlinks/current/sources/symlinks-1.2.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/symlinks/current/sources/symlinks-1.2.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/symlinks/current/specs/symlinks.spec =================================================================== --- tinysofa/snapshot/symlinks/current/specs/symlinks.spec 2004-07-01 15:40:51 UTC (rev 2662) +++ tinysofa/snapshot/symlinks/current/specs/symlinks.spec 2004-07-01 15:40:52 UTC (rev 2663) @@ -0,0 +1,112 @@ +Summary: A utility which maintains a system's symbolic links. +Name: symlinks +Version: 1.2 +Release: 22ts +Group: Applications/System +Copyright: distributable +Source: ftp://metalab.unc.edu/pub/Linux/utils/file/%{name}-%{version}.tar.gz +Patch0: symlinks-1.2-nostatic.patch +Patch1: symlinks-1.2-fixman.patch +Patch2: symlinks-1.2-short.patch +Buildroot: %{_tmppath}/%{name}-%{version}-root + +%description +The symlinks utility performs maintenance on symbolic links. Symlinks +checks for symlink problems, including dangling symlinks which point +to nonexistent files. Symlinks can also automatically convert +absolute symlinks to relative symlinks. + +Install the symlinks package if you need a program for maintaining +symlinks on your system. + +%prep +%setup +%patch -p1 -b .nostatic +%patch1 -p1 -b .fixman +%patch2 -p1 + +%build +make + +%install +mkdir -p $RPM_BUILD_ROOT%{_bindir} +mkdir -p $RPM_BUILD_ROOT%{_mandir}/man8 +install -s -m 755 symlinks $RPM_BUILD_ROOT%{_bindir} +install -m 644 symlinks.8 $RPM_BUILD_ROOT%{_mandir}/man8 + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(-,root,root) +%{_bindir}/symlinks +%{_mandir}/man8/symlinks.8* + +%changelog +* Tue Jun 15 2004 Elliot Lee +- rebuilt + +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Thu Oct 16 2003 Florian La Roche +- add patch from #89655 + +* Wed Jun 04 2003 Elliot Lee +- rebuilt + +* Wed Jan 22 2003 Tim Powers +- rebuilt + +* Wed Dec 11 2002 Tim Powers 1.2-17 +- rebuild on all arches + +* Fri Jun 21 2002 Tim Powers +- automated rebuild + +* Thu May 23 2002 Tim Powers +- automated rebuild + +* Wed Jan 09 2002 Tim Powers +- automated rebuild + +* Sun Jun 24 2001 Elliot Lee +- Bump release + rebuild. + +* Wed Jul 12 2000 Prospector +- automatic rebuild + +* Tue Jun 13 2000 Preston Brown +- FHS paths + +* Tue May 30 2000 Preston Brown +- fix up help output (#10236) + +* Thu Feb 10 2000 Preston Brown +- do not link statically + +* Mon Feb 07 2000 Preston Brown +- rebuild to gzip man page + +* Mon Oct 04 1999 Cristian Gafton +- rebuild against the latest glibc in the sparc tree + +* Sun Mar 21 1999 Cristian Gafton +- auto rebuild in the new build environment (release 5) + +* Wed Feb 24 1999 Preston Brown +- Injected new description and group. + +* Fri Dec 18 1998 Preston Brown +- bumped spec number for initial rh 6.0 build + +* Mon Apr 27 1998 Prospector System +- translations modified for de, fr, tr + +* Mon Oct 20 1997 Otto Hammersmith +- changed build root to /var/tmp, not /var/lib +- updated to version 1.2 + +* Wed Jul 09 1997 Erik Troan +- built against glibc +- build-rooted From svn at tinysofa.org Thu Jul 1 15:40:53 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:40:53 +1000 (EST) Subject: [tinysofa-svn] r2664 - in tinysofa/snapshot: . system-config-mouse system-config-mouse/current system-config-mouse/current/sources system-config-mouse/current/specs Message-ID: <20040701154053.9E6B74E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:40:53 +1000 (Fri, 02 Jul 2004) New Revision: 2664 Added: tinysofa/snapshot/system-config-mouse/ tinysofa/snapshot/system-config-mouse/current/ tinysofa/snapshot/system-config-mouse/current/sources/ tinysofa/snapshot/system-config-mouse/current/sources/system-config-mouse-1.2.7.tar.bz2 tinysofa/snapshot/system-config-mouse/current/specs/ tinysofa/snapshot/system-config-mouse/current/specs/system-config-mouse.spec Log: - Add system-config-mouse to snapshot from 2.0. Added: tinysofa/snapshot/system-config-mouse/current/sources/system-config-mouse-1.2.7.tar.bz2 =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/system-config-mouse/current/sources/system-config-mouse-1.2.7.tar.bz2 ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/system-config-mouse/current/specs/system-config-mouse.spec =================================================================== --- tinysofa/snapshot/system-config-mouse/current/specs/system-config-mouse.spec 2004-07-01 15:40:52 UTC (rev 2663) +++ tinysofa/snapshot/system-config-mouse/current/specs/system-config-mouse.spec 2004-07-01 15:40:53 UTC (rev 2664) @@ -0,0 +1,303 @@ +Summary: A graphical interface for configuring mice +Name: system-config-mouse +Version: 1.2.7 +Release: 1ts +URL: http://fedora.redhat.com/projects/config-tools/ +License: GPL +ExclusiveOS: Linux +Group: System Environment/Base +BuildRoot: %{_tmppath}/%{name}-%{version}-root +BuildArch: noarch +Source0: %{name}-%{version}.tar.bz2 +Obsoletes: mouseconfig +Obsoletes: redhat-config-mouse +BuildRequires: gettext +ExcludeArch: s390 s390x +Requires: python2 +Requires: usermode >= 1.36 +Requires: rhpl >= 0.136 +Requires: pyxf86config +Requires: newt +Requires: kudzu + +%description +system-config-mouse is a graphical user interface that allows +the user to change the default mouse of the system. + +%prep +%setup -q + +%build +make + +%install +make INSTROOT=$RPM_BUILD_ROOT install + +%find_lang %name + +%clean +rm -rf $RPM_BUILD_ROOT + +%preun +if [ -d /usr/share/system-config-mouse ] ; then + rm -rf /usr/share/system-config-mouse/*.pyc +fi + +%files -f %{name}.lang +%defattr(-,root,root) +/usr/bin/system-config-mouse +/usr/sbin/mouseconfig +%dir /usr/share/system-config-mouse +/usr/share/system-config-mouse/* +%dir /usr/share/firstboot/ +%dir /usr/share/firstboot/modules +/usr/share/firstboot/modules/mouse_gui.py +#%attr(0644,root,root) %{_datadir}/applications/system-config-mouse.desktop +%attr(0644,root,root) %config /etc/security/console.apps/system-config-mouse +%attr(0644,root,root) %config /etc/pam.d/system-config-mouse + +%changelog +* Thu Jun 24 2004 Brent Fox - 1.2.7-1 +- remove modifyXconfig function since it isn't needed any more (bug #123565) + +* Wed Apr 21 2004 Brent Fox 1.2.6-2 +- remove duplicate entries from sv.po (bug #121435) + +* Wed Mar 17 2004 Bill Nottingham 1.2.6-1 +- update for new rhpl, don't modify X configs + +* Fri Feb 20 2004 Brent Fox 1.2.4-1 +- don't install desktop file anymore + +* Fri Dec 5 2003 Jeremy Katz 1.2.3-1 +- fix mouseconfig wrapper script for redhat-config -> system-config + +* Wed Nov 19 2003 Brent Fox 1.2.2-2 +- rebuild + +* Wed Nov 12 2003 Brent Fox 1.2.1-1 +- rename from redhat-config-mouse to system-config-mouse +- add Obsoletes for redhat-config-mouse +- update for Python2.3 + +* Tue Oct 14 2003 Brent Fox 1.1.2-1 +- rebuild with latest translations + +* Mon Sep 22 2003 Brent Fox 1.1.1-1 +- make sure "DEVICE" key exists before modifying it (bug #98964) + +* Mon Sep 15 2003 Brent Fox 1.0.12-2 +- bump release num + +* Mon Sep 15 2003 Brent Fox 1.0.12-1 +- add Requires for newt and kudzu (bug #104212) + +* Wed Sep 10 2003 Brent Fox 1.0.11-2 +- bump relnum and rebuild + +* Wed Sep 10 2003 Brent Fox 1.0.11-1 +- make sure the correct serial device is selected in mouse_gui.py (bug #80600) + +* Thu Aug 14 2003 Brent Fox 1.0.10-1 +- tag on every build + +* Wed Aug 13 2003 Brent Fox 1.0.9-1 +- add BuildRequires on gettext + +* Wed Aug 13 2003 Brent Fox 1.0.8-1 +- remove BuildRequires on python-tools + +* Wed Jul 2 2003 Brent Fox 1.0.7-2 +- bump relnum and rebuild + +* Wed Jul 2 2003 Brent Fox 1.0.7-1 +- mark string for translation + +* Tue May 20 2003 Brent Fox 1.0.6-2 +- mark string for translation in redhat-config-mouse.py + +* Wed Apr 2 2003 Brent Fox 1.0.6-1 +- pass window size into rhpl +- handle XEMU3 better + +* Tue Feb 18 2003 Brent Fox 1.0.5-1 +- don't write OPTIONS line to /etc/sysconfig/mouse (bug #76713) + +* Thu Feb 13 2003 Brent Fox 1.0.4-5 +- fix bug with Sun mouse (bug #84244) + +* Wed Feb 12 2003 Jeremy Katz 1.0.4-4 +- fixes for cjk tui (#83518) + +* Tue Feb 4 2003 Brent Fox 1.0.4-3 +- redo packaging order a bit for firstboot reconfig mode + +* Mon Feb 3 2003 Brent Fox 1.0.4-2 +- fix bug #80600 for good this time + +* Thu Jan 30 2003 Brent Fox 1.0.4-1 +- bump and build + +* Mon Jan 20 2003 Brent Fox 1.0.3-4 +- write xprotocol to XMOUSETYPE instead of shortname + +* Sun Jan 19 2003 Brent Fox 1.0.3-3 +- only set the serial device if the DEVICE key exists + +* Wed Jan 15 2003 Brent Fox 1.0.3-2 +- fix traceback with serial mice (bug #80600, again) + +* Tue Jan 14 2003 Brent Fox 1.0.3-1 +- select the current serial mouse device in gui and tui(bug #80600) + +* Tue Jan 7 2003 Brent Fox 1.0.2-13 +- make the restart of gpm conditional + +* Fri Dec 20 2002 Brent Fox 1.0.2-12 +- don't skip the first leaf on each branch in setCurrent() +- check to see if XEMU3 is defined before slicing the list for it + +* Wed Dec 18 2002 Brent Fox 1.0.2-10 +- only modify the XF86Config file if it exists (bug #79754) +- same for /etc/sysconfig/mouse + +* Fri Dec 13 2002 Bill Nottingham 1.0.2-9 +- add a couple of command-line options for kudzu use + +* Thu Dec 12 2002 Brent Fox 1.0.2-8 +- remove requires on pygtk2 since we have a text mode now + +* Thu Dec 12 2002 Brent Fox 1.0.2-7 +- always write out ZAxisMapping (bug #77389) + +* Mon Nov 18 2002 Brent Fox 1.0.2-6 +- make desktop file UTF-8 encoded + +* Fri Nov 15 2002 Brent Fox 1.0.2-5 +- replace obsoletes for mouseconfig +- make a symlink from /usr/sbin/mouseconfig to start r-c-mouse + +* Wed Nov 13 2002 Brent Fox 1.0.2-4 +- fix path problem + +* Tue Nov 12 2002 Brent Fox 1.0.2-3 +- remove obsoletes for mouseconfig for now + +* Tue Nov 12 2002 Brent Fox 1.0.2-2 +- Latest translations + +* Wed Oct 30 2002 Brent Fox +- Add a BuildRequires for python-tools +- Configure /etc/sysconfig/mouse so that gpm can support more than one mouse +- Specify device correctly in /etc/sysconfig/mouse +- Pass device into mouse_backend + +* Thu Oct 24 2002 Brent Fox 1.0.2-1 +- More work on a command line interface + +* Wed Oct 23 2002 Brent Fox +- Start work on a command line interface + +* Wed Oct 09 2002 Brent Fox +- Fixed bug 75563 so that emulate3 choices are remembered + +* Tue Oct 08 2002 Brent Fox 1.0.1-4 +- Created mouse_tui.py for a text interface +- Created mouse_backend.py to handle non-UI specific calls +- Moved non_UI specific calls from mouse_gui.py to mouse_backend.py + +* Fri Oct 03 2002 Brent Fox 1.0.1-3 +- make window icon appear +- disallow selecting tree roots +- check for no mouse selection on apply + +* Fri Aug 30 2002 Brent Fox 1.0.1-2 +- pull in latest translations + +* Wed Aug 28 2002 Brent Fox 1.0.1-1 +- Convert to noarch + +* Thu Aug 22 2002 Brent Fox 1.0.0-2 +- restart gpm when changing mouse + +* Thu Aug 22 2002 Brent Fox 1.0.0-1 +- fix textdomain tag + +* Thu Aug 22 2002 Jeremy Katz 0.9.10-1 +- try to probe the mouse by reading the config file instead of doing a + probe with kudzu. ps/2 probes while in X are unreliable + +* Mon Aug 12 2002 Tammy Fox 0.9.9-3 +- Replace System with SystemSetup in desktop file categories + +* Thu Aug 08 2002 Brent Fox 0.9.9-2 +- Add dialog for serial mice +- Make changes to XF86Config file +- Added Requires for pyxf86config + +* Mon Aug 05 2002 Brent Fox 0.9.9-1 +- Pull in translations into desktop files + +* Fri Aug 02 2002 Brent Fox 0.9.8-1 +- Make changes for new pam timestamp policy + +* Thu Aug 01 2002 Brent Fox 0.9.7-1 +- fix spec file line omission + +* Wed Jul 24 2002 Brent Fox 0.9.6-3 +- fix Makefiles and spec files so that translations get installed + +* Wed Jul 24 2002 Brent Fox 0.9.6-2 +- update spec file for public beta 2 + +* Wed Jul 24 2002 Brent Fox 0.9.6-1 +- Pull mouse info from rhpl + +* Wed Jul 24 2002 Tammy Fox 0.9.5-2 +- Fixed desktop file (bug #69476) + +* Thu Jul 18 2002 Brent Fox 0.9.5-1 +- Change get_iter_root to get_iter_first + +* Thu Jul 18 2002 Karsten Hopp +- prepare for new pygtk2 + +* Tue Jul 16 2002 Brent Fox 0.9.4-2 +- bump rev num and rebuild + +* Thu Jul 11 2002 Brent Fox 0.9.3-2 +- Update changelogs and rebuild + +* Thu Jul 11 2002 Brent Fox 0.9.3-1 +- Update changelogs and rebuild + +* Mon Jul 01 2002 Brent Fox 0.9.2-1 +- Bump rev number + +* Mon Jul 1 2002 Brent Fox 0.9.2-1 +- Wrap the destroy call in a try/except because there is no self.mainWindow in firstboot reconfig mode + +* Thu Jun 27 2002 Brent Fox +- Fix typo in specfile + +* Wed Jun 26 2002 Brent Fox 0.9.1-1 +- Fixed description +- Fixed broken symlink in Makefile from mouse.py to mouse_gui.py + +* Tue Jun 25 2002 Brent Fox 0.9.0-5 +- Create pot file + +* Mon Jun 24 2002 Brent Fox 0.9.0-4 +- Fix spec file + +* Sat Jun 22 2002 Brent Fox +- Pass title back to parent +- Pass doDebug into standalone + +* Fri Jun 21 2002 Brent Fox 0.9.0-3 +- init doDebug in stand_alone + +* Thu Jun 20 2002 Brent Fox 0.9.0-2 +- Initial coding and packaging +- Add snapsrc to Makefile + From svn at tinysofa.org Thu Jul 1 15:42:18 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:42:18 +1000 (EST) Subject: [tinysofa-svn] r2686 - in tinysofa/snapshot: . usbutils usbutils/current usbutils/current/sources usbutils/current/specs Message-ID: <20040701154218.C096B4E817E@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:42:18 +1000 (Fri, 02 Jul 2004) New Revision: 2686 Added: tinysofa/snapshot/usbutils/ tinysofa/snapshot/usbutils/current/ tinysofa/snapshot/usbutils/current/sources/ tinysofa/snapshot/usbutils/current/sources/usbutils-0.11.tar.gz tinysofa/snapshot/usbutils/current/sources/usbutils-0.9-hwdata.patch tinysofa/snapshot/usbutils/current/sources/usbutils-0214.patch tinysofa/snapshot/usbutils/current/specs/ tinysofa/snapshot/usbutils/current/specs/usbutils.spec Log: - Add usbutils to snapshot from 2.0. Added: tinysofa/snapshot/usbutils/current/sources/usbutils-0.11.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/usbutils/current/sources/usbutils-0.11.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/usbutils/current/sources/usbutils-0.9-hwdata.patch =================================================================== --- tinysofa/snapshot/usbutils/current/sources/usbutils-0.9-hwdata.patch 2004-07-01 15:42:17 UTC (rev 2685) +++ tinysofa/snapshot/usbutils/current/sources/usbutils-0.9-hwdata.patch 2004-07-01 15:42:18 UTC (rev 2686) @@ -0,0 +1,59 @@ +--- usbutils-0.9/configure.hwdata Wed Jan 30 19:45:49 2002 ++++ usbutils-0.9/configure Wed Jan 30 19:46:15 2002 +@@ -1761,18 +1761,18 @@ + if test "x${datadir}" = 'x${prefix}/share'; then + if test "x${prefix}" = "xNONE"; then + cat >> confdefs.h <> confdefs.h <> confdefs.h <> confdefs.h <> confdefs.h <> confdefs.h < + +-#define CTRL_RETRIES 50 +-#define CTRL_TIMEOUT 100 /* milliseconds */ ++#define CTRL_RETRIES 2 ++#define CTRL_TIMEOUT (5*1000) /* milliseconds */ + + #define USB_DT_CS_DEVICE 0x21 + #define USB_DT_CS_CONFIG 0x22 +@@ -106,7 +106,6 @@ static int usb_control_msg(int fd, u_int + ctrl.value = value; + ctrl.index = index; + ctrl.length = size; +- ctrl.timeout = 1000; + ctrl.data = data; + ctrl.timeout = CTRL_TIMEOUT; + try = 0; +@@ -119,10 +118,11 @@ static int usb_control_msg(int fd, u_int + + /* ---------------------------------------------------------------------- */ + ++static int dev_has_strings; ++ + static int get_string(int fd, char *buf, size_t size, u_int8_t id, u_int16_t lang) + { + unsigned char b[256]; +- wchar_t w[128]; + unsigned int i; + int ret; + +@@ -133,17 +133,38 @@ static int get_string(int fd, char *buf, + if (!id || fd == -1) + return 0; + +- b[0] = b[1] = 0xbf; +- ret = usb_control_msg(fd, USB_DIR_IN, USB_REQ_GET_DESCRIPTOR, (USB_DT_STRING << 8) | id, 0, sizeof(b), b); ++ b[0] = b[1] = 0; ++ ++ /* try reading all at once ... some devices misbehave here */ ++ ret = usb_control_msg(fd, USB_DIR_IN, USB_REQ_GET_DESCRIPTOR, (USB_DT_STRING << 8) | id, lang, sizeof(b), b); ++ if (ret > 0) ++ goto got_all; ++ ++ /* read string length first ... most devices handle this ok */ ++ ret = usb_control_msg(fd, USB_DIR_IN, USB_REQ_GET_DESCRIPTOR, (USB_DT_STRING << 8) | id, lang, 2, b); ++ if (ret < 0) { ++ if (open_mode == O_RDWR) ++ fprintf(stderr, "cannot peek string descriptor %d, error = %s(%d)\n", id, strerror(errno), errno); ++ return 0; ++ } ++ if (ret < 2 || b[0] < 2 || b[1] != USB_DT_STRING) { ++ fprintf(stderr, "string descriptor %d invalid (%02x %02x; len=%d)\n", id, b[0], b[1], ret); ++ return 0; ++ } ++ ++ ret = usb_control_msg(fd, USB_DIR_IN, USB_REQ_GET_DESCRIPTOR, (USB_DT_STRING << 8) | id, lang, b[0], b); + if (ret < 0) { + if (open_mode == O_RDWR) + fprintf(stderr, "cannot get string descriptor %d, error = %s(%d)\n", id, strerror(errno), errno); + return 0; + } ++ ++got_all: + if (ret < 2 || b[0] < 2 || b[1] != USB_DT_STRING) { + fprintf(stderr, "string descriptor %d invalid (%02x %02x; len=%d)\n", id, b[0], b[1], ret); + return 0; + } ++ dev_has_strings = 1; + #if 0 + for (i = 0; i < ((b[0] - 2) / 2); i++) + w[i] = b[2+2*i] | (b[3+2*i] << 8); +@@ -151,7 +172,9 @@ static int get_string(int fd, char *buf, + return wcstombs(buf, w, size); + #else + for (i = 0; i < ((b[0] - 2) / 2); i++) +- buf[i] = b[2+2*i]; ++ buf[i] = b[3+2*i] ++ ? '?' /* character's not available in iso-8859/1 */ ++ : b[2+2*i]; + buf[i] = 0; + return i; + #endif +@@ -297,21 +320,25 @@ static void dump_device(int fd, unsigned + dump_junk(buf, " ", 18); + } + +-static void dump_config(int fd, unsigned char *buf) ++static void dump_config(int fd, unsigned char *buf, u_int16_t lang) + { ++ char str[128]; ++ + if (buf[1] != USB_DT_CONFIG) + printf(" Warning: Invalid descriptor\n"); + else if (buf[0] < 9) + printf(" Warning: Descriptor too short\n"); ++ get_string(fd, str, sizeof(str), buf[6], lang); + printf(" Configuration Descriptor:\n" + " bLength %5u\n" + " bDescriptorType %5u\n" + " wTotalLength %5u\n" + " bNumInterfaces %5u\n" + " bConfigurationValue %5u\n" +- " iConfiguration %5u\n" ++ " iConfiguration %5u %s\n" + " bmAttributes 0x%02x\n", +- buf[0], buf[1], buf[2] | (buf[3] << 8), buf[4], buf[5], buf[6], buf[7]); ++ buf[0], buf[1], buf[2] | (buf[3] << 8), buf[4], buf[5], ++ buf[6], str, buf[7]); + if (buf[7] & 0x40) + printf(" Self Powered\n"); + if (buf[7] & 0x20) +@@ -352,6 +379,9 @@ static void dump_endpoint(int fd, unsign + { + static const char *typeattr[] = { "Control", "Isochronous", "Bulk", "Interrupt" }; + static const char *syncattr[] = { "none", "Asynchronous", "Adaptive", "Synchronous" }; ++ static const char *usage[] = { "Data", "Feedback", "Implicit feedback Data", "(reserved)" }; ++ static const char *hb[] = { "once", "twice", "three times", "(?)" }; ++ unsigned wMaxPacket = buf[4] | (buf[5] << 8); + + if (buf[1] != USB_DT_ENDPOINT) + printf(" Warning: Invalid descriptor\n"); +@@ -364,15 +394,19 @@ static void dump_endpoint(int fd, unsign + " bmAttributes %5u\n" + " Transfer Type %s\n" + " Synch Type %s\n" +- " wMaxPacketSize %5u\n" ++ " Usage Type %s\n" ++ " wMaxPacketSize 0x%04x bytes %d %s\n" + " bInterval %5u\n", + buf[0], buf[1], buf[2], buf[2] & 15, (buf[2] & 0x80) ? "IN" : "OUT", + buf[3], typeattr[buf[3] & 3], syncattr[(buf[3] >> 2) & 3], +- buf[4] | (buf[5] << 8), buf[6]); ++ usage[(buf[3] >> 4) & 3], ++ wMaxPacket, wMaxPacket & 0x3ff, hb [(wMaxPacket >> 11) & 3], ++ buf[6]); + if (buf[0] < 9) { + dump_junk(buf, " ", 7); + return; + } ++ /* only for audio endpoints */ + printf(" bRefresh %5u\n" + " bSynchAddress %5u\n", + buf[7], buf[8]); +@@ -1017,23 +1051,53 @@ static void dump_midistreaming_endpoint( + dump_junk(buf, " ", 4+buf[3]); + } + +- +-static void dump_hub(char *p) ++static void dump_hub(char *prefix, unsigned char *p, int has_tt) + { + unsigned int l, i, j; ++ unsigned wHubChar = (p[4] << 8) | p[3]; + +- printf(" Hub Descriptor:\n"); +- printf(" bLength %3u\n",p[0]); +- printf(" bDesriptorType %3u\n",p[1]); +- printf(" nNbrPorts %3u\n",p[2]); +- printf(" wHubCharacteristic 0x%02x 0x%02x\n", p[3],p[4]); +- printf(" bPwrOn2PwrGood %3u * 2 milli seconds\n",p[5]); +- printf(" bHubContrCurrent %3u milli Ampere\n",p[6]); ++ printf("%sHub Descriptor:\n", prefix); ++ printf("%s bLength %3u\n", prefix, p[0]); ++ printf("%s bDescriptorType %3u\n", prefix, p[1]); ++ printf("%s nNbrPorts %3u\n", prefix, p[2]); ++ printf("%s wHubCharacteristic 0x%04x\n", prefix, wHubChar); ++ switch (wHubChar & 0x03) { ++ case 0: ++ printf("%s Ganged power switching\n", prefix); ++ break; ++ case 1: ++ printf("%s Per-port power switching\n", prefix); ++ break; ++ default: ++ printf("%s No power switching (usb 1.0)\n", prefix); ++ break; ++ } ++ if (wHubChar & 0x04) ++ printf("%s Compound device\n", prefix); ++ switch ((wHubChar >> 3) & 0x03) { ++ case 0: ++ printf("%s Ganged overcurrent protection\n", prefix); ++ break; ++ case 1: ++ printf("%s Per-port overcurrent protection\n", prefix); ++ break; ++ default: ++ printf("%s No overcurrent protection\n", prefix); ++ break; ++ } ++ if (has_tt) { ++ l = (wHubChar >> 5) & 0x03; ++ printf("%s TT think time %d FS bits\n", prefix, (l + 1) * 8); ++ } ++ if (wHubChar & (1<<7)) ++ printf("%s Port indicators\n", prefix); ++ printf("%s bPwrOn2PwrGood %3u * 2 milli seconds\n", prefix, p[5]); ++ printf("%s bHubContrCurrent %3u milli Ampere\n", prefix, p[6]); + l= (p[2] >> 3) + 1; /* this determines the variable number of bytes following */ +- printf(" DeviceRemovable "); ++ printf("%s DeviceRemovable ", prefix); + for(i = 0; i < l; i++) + printf(" 0x%02x", p[7+i]); +- printf("\n PortPwrCtrlMask "); ++ printf("\n%s PortPwrCtrlMask ", prefix); + for(j = 0; j < l; j++) + printf(" 0x%02x ", p[7+i+j]); + printf("\n"); +@@ -1047,7 +1111,7 @@ static void dump_hub(char *p) + + static void dump_report_desc(unsigned char *b, int l) + { +- unsigned int t, j, bsize, btag, btype, data, hut; ++ unsigned int t, j, bsize, btag, btype, data = 1000, hut = 1000; + int i; + char *types[4] = { "Main", "Global", "Local", "reserved" }; + char indent[] = " "; +@@ -1168,21 +1232,131 @@ static void dump_hid_device(int fd, unsi + } + } + ++static char * ++dump_comm_descriptor(int fd, unsigned char *buf, char *indent, u_int16_t lang) ++{ ++ int tmp; ++ char str [128]; ++ ++ switch (buf[2]) { ++ case 0: ++ if (buf[0] != 5) ++ goto bad; ++ printf( "%sCDC Header:\n" ++ "%s bcdCDC %x.%02x\n", ++ indent, ++ indent, buf[4], buf[3]); ++ break; ++ case 0x01: /* call management functional desc */ ++ if (buf [0] != 5) ++ goto bad; ++ printf( "%sCDC Call Management:\n" ++ "%s bmCapabilities 0x%02x\n", ++ indent, ++ indent, buf[3]); ++ if (buf[3] & 0x01) ++ printf( "%s call management\n", indent); ++ if (buf[3] & 0x02) ++ printf( "%s use DataInterface\n", indent); ++ printf("%s bDataInterface %d\n", indent, buf[4]); ++ break; ++ case 0x02: /* acm functional desc */ ++ if (buf [0] != 4) ++ goto bad; ++ printf( "%sCDC ACM:\n" ++ "%s bmCapabilities %02x\n", ++ indent, ++ indent, buf[3]); ++ if (buf[3] & 0x08) ++ printf( "%s connection notifications\n", indent); ++ if (buf[3] & 0x04) ++ printf( "%s sends break\n", indent); ++ if (buf[3] & 0x02) ++ printf( "%s line coding and serial state\n", indent); ++ if (buf[3] & 0x01) ++ printf( "%s get/set/clear comm features\n", indent); ++ break; ++ case 0x06: /* union desc */ ++ if (buf [0] < 5) ++ goto bad; ++ printf( "%sCDC Union:\n" ++ "%s bMasterInterface %d\n" ++ "%s bSlaveInterface ", ++ indent, ++ indent, buf [3], ++ indent); ++ for (tmp = 4; tmp < buf [0]; tmp++) ++ printf("%d ", buf [tmp]); ++ printf("\n"); ++ break; ++ case 0x0f: /* ethernet functional desc */ ++ if (buf [0] != 13) ++ goto bad; ++ get_string(fd, str, sizeof str, buf[3], lang); ++ tmp = buf [7] << 8; ++ tmp |= buf [6]; tmp <<= 8; ++ tmp |= buf [5]; tmp <<= 8; ++ tmp |= buf [4]; ++ printf( "%sCDC Ethernet:\n" ++ "%s iMacAddress %d %s\n" ++ "%s bmEthernetStatistics 0x%08x\n", ++ indent, ++ indent, buf[3], (buf[3] && *str) ? str : "(?)", ++ indent, tmp); ++ /* FIXME dissect ALL 28 bits */ ++ printf( "%s wMaxSegmentSize %d\n" ++ "%s wNumberMCFilters 0x%04x\n" ++ "%s bNumberPowerFilters %d\n", ++ indent, (buf[9]<<8)|buf[8], ++ indent, (buf[11]<<8)|buf[10], ++ indent, buf[12]); ++ break; ++ /* FIXME there are about a dozen more descriptor types */ ++ default: ++ return "unsupported comm descriptor"; ++ } ++ return 0; ++ ++bad: ++ return "corrupt comm descriptor"; ++} ++ + /* ---------------------------------------------------------------------- */ + ++static void do_hub(int fd, int has_tt) ++{ ++ unsigned char buf [7]; ++ int ret; ++ ++ ret = usb_control_msg(fd, USB_DIR_IN | USB_TYPE_CLASS, ++ USB_REQ_GET_DESCRIPTOR, 0x29 << 8, 0, ++ sizeof buf, buf); ++ if (ret != sizeof buf) { ++ perror ("can't get hub descriptor"); ++ return; ++ } ++ dump_hub("", buf, has_tt); ++} ++ + static void do_config(int fd, unsigned int nr, u_int16_t lang) + { +- unsigned char buf[1024],*p; +- unsigned int sz,curinterface; +- int l; ++ unsigned char buf[1024],*p, *err; ++ unsigned int sz,curinterface = 1000; + u_int8_t curclass = 0xff, cursubclass = 0xff; ++ unsigned retries = 0; + ++ for (;;) { + if (usb_control_msg(fd, USB_DIR_IN, USB_REQ_GET_DESCRIPTOR, (USB_DT_CONFIG << 8) | nr, + 0, USB_DT_CONFIG_SIZE, buf) < 0) { ++ if (retries++ >= 5) { + if (open_mode == O_RDWR) + fprintf(stdout, "cannot get config descriptor %d, %s (%d)\n", nr, strerror(errno), errno); + return; ++ } ++ continue; ++ } else break; + } ++ + if (buf[0] < USB_DT_CONFIG_SIZE || buf[1] != USB_DT_CONFIG) + fprintf(stderr, "Warning: invalid config descriptor\n"); + sz = buf[2] | buf[3] << 8; +@@ -1208,13 +1382,14 @@ static void do_config(int fd, unsigned i + } + switch (p[1]) { + case USB_DT_DEVICE: ++ /* NOTE: should NOT be found here! */ + dump_device(fd, p, lang); + curclass = p[4]; + cursubclass = p[5]; + break; + + case USB_DT_CONFIG: +- dump_config(fd, p); ++ dump_config(fd, p, lang); + break; + + case USB_DT_INTERFACE: +@@ -1229,39 +1404,39 @@ static void do_config(int fd, unsigned i + break; + + case USB_DT_CS_DEVICE: +- if (curclass == 3) { ++ if (curclass == USB_CLASS_HID) { + dump_hid_device(fd, p, curinterface); + break; + } +- printf(" unknown descriptor type:"); +- dump_junk2(p, p[0]); +- break; +- +- case USB_DT_CS_CONFIG: +- printf(" unknown descriptor type:"); +- dump_junk2(p, p[0]); +- break; +- +- case USB_DT_CS_STRING: +- printf(" unknown descriptor type:"); +- dump_junk2(p, p[0]); +- break; ++ err = "unknown device class descriptor"; ++ goto junk; + + case USB_DT_CS_INTERFACE: +- if (curclass == 1 && cursubclass == 1) { +- dump_audiocontrol_interface(fd, p, lang); ++ err = "unknown interface class descriptor"; ++ switch (curclass) { ++ case USB_CLASS_AUDIO: ++ switch (cursubclass) { ++ case 1: ++ dump_audiocontrol_interface(fd, p, lang); ++ break; ++ case 2: ++ dump_audiostreaming_interface(fd, p); ++ break; ++ case 3: ++ dump_midistreaming_interface(fd, p, lang); ++ break; ++ default: ++ goto junk; ++ } + break; +- } +- if (curclass == 1 && cursubclass == 2) { +- dump_audiostreaming_interface(fd, p); +- break; +- } +- if (curclass == 1 && cursubclass == 3) { +- dump_midistreaming_interface(fd, p, lang); ++ case USB_CLASS_COMM: ++ err = dump_comm_descriptor (fd, p, " ", lang); ++ if (err) ++ goto junk; + break; ++ default: ++ goto junk; + } +- printf(" unknown descriptor type:"); +- dump_junk2(p, p[0]); + break; + + case USB_DT_CS_ENDPOINT: +@@ -1273,16 +1448,20 @@ static void do_config(int fd, unsigned i + dump_midistreaming_endpoint(fd, p); + break; + } +- printf(" unknown descriptor type:"); +- dump_junk2(p, p[0]); +- break; ++ err = "unknown endpoint class descriptor"; ++ goto junk; + + case USB_DT_HUB: +- dump_hub(p); ++ /* NOTE only rather ancient hubs will include ++ * this with the config descriptor. ++ */ ++ dump_hub(" ", p, 0); + break; + + default: +- printf(" unknown descriptor type:"); ++ err = "unknown descriptor type"; ++junk: ++ printf(" %s:", err); + dump_junk2(p, p[0]); + } + sz -= p[0]; +@@ -1303,21 +1482,41 @@ static u_int16_t dump_langids(int fd, in + int i, l; + u_int16_t lang; + +- b[0] = b[1] = 0xbf; +- l = usb_control_msg(fd, USB_DIR_IN, USB_REQ_GET_DESCRIPTOR, USB_DT_STRING << 8, 0, sizeof(b), b); ++ /* read string length first, like recent linuxes -- else some devices misbehave */ ++ b[0] = b[1] = 0; ++ l = usb_control_msg(fd, USB_DIR_IN, USB_REQ_GET_DESCRIPTOR, USB_DT_STRING << 8, 0, 4, b); + ++ if (l < 0 && errno == EPIPE) ++ l = 0; + if (l < 0) { +- if (open_mode == O_RDWR) ++ if (open_mode == O_RDWR && !quiet) + printf(" Language IDs: none (cannot get min. string descriptor; got len=%d, error=%d:%s)\n", + l, errno, strerror(errno)); + return 0; + } +- if (l < 4 || b[0] != l) { ++ if (l == 0) { ++ if (!quiet) ++ printf(" Language IDs: none\n"); ++ return 0; ++ } ++ if (l < 4) { ++ if (!quiet) + printf(" Language IDs: none (invalid length string descriptor %02x; len=%d)\n", b[0], l); + return 0; + } + /* save first language ID for further get_string_descriptors */ + lang = b[2] | (b[3] << 8); ++ ++ /* maybe there's more than one */ ++ if (b[0] > 4) { ++ l = usb_control_msg(fd, USB_DIR_IN, USB_REQ_GET_DESCRIPTOR, USB_DT_STRING << 8, 0, b[0], b); ++ if (l < 4 || b[0] != l) { ++ fprintf(stderr, "string 0 broken re-read, l = %d, b[0] = %d \n", l, b[0]); ++ b[0] = 4; ++ b[2] = lang; ++ b[3] = lang >> 8; ++ } ++ } + #if 0 + printf ("dump_langids: ret=%d:%d, lang=0x%x, length=%d\n", l, errno, lang, b[0]); + dump_junk2 (b, 32); +@@ -1342,11 +1541,17 @@ static void dumpdev(unsigned char *devde + maxcfg = devdesc[17]; + if (devdesc[0] < 18 || devdesc[1] != USB_DT_DEVICE) + maxcfg = 1; ++ dev_has_strings = 0; + lang = dump_langids(fd, 1); + dump_device(fd, devdesc, lang); + for (i = 0; i < maxcfg; i++) + do_config(fd, i, lang); +- lang = dump_langids(fd, 0); ++ if (devdesc[4] == USB_CLASS_HUB) ++ do_hub(fd, devdesc [6]); ++ /* FIXME if it's usb 2.0 and there's a device qualifier, ++ * optionally dump it and the other-speed config data ++ */ ++ lang = dump_langids(fd, !dev_has_strings); + } + + /* ---------------------------------------------------------------------- */ +@@ -1560,7 +1765,7 @@ int main(int argc, char *argv[]) + exit(1); + } + if ((err = names_init("./usb.ids")) != 0) +- if(err = names_init(USBIDS_FILE)) { ++ if((err = names_init(USBIDS_FILE)) != 0) { + printf("Error, cannot open USBIDS File \"%s\", %s\n", USBIDS_FILE, strerror(err)); + exit(1); + } Added: tinysofa/snapshot/usbutils/current/specs/usbutils.spec =================================================================== --- tinysofa/snapshot/usbutils/current/specs/usbutils.spec 2004-07-01 15:42:17 UTC (rev 2685) +++ tinysofa/snapshot/usbutils/current/specs/usbutils.spec 2004-07-01 15:42:18 UTC (rev 2686) @@ -0,0 +1,100 @@ +Name: usbutils +Version: 0.11 +Release: 5ts +Source: http://usb.cs.tum.edu/download/%{name}-%{version}.tar.gz +Patch: usbutils-0.9-hwdata.patch +Patch2: usbutils-0214.patch +License: GPL +BuildRoot: %{_tmppath}/%{name}-%{version}-root +Requires: hwdata +Summary: Linux USB utilities. +Group: Applications/System +Conflicts: hotplug < 3:2002_01_14-2 +ExcludeArch: s390 s390x + +%description +This package contains utilities for inspecting devices connected to a +USB bus. + +%prep +%setup -q +%patch -p1 +%patch2 -p1 + +%build +cp /usr/share/libtool/config.{sub,guess} . +%configure --sbindir=/sbin +make + +%install +rm -rf $RPM_BUILD_ROOT +%makeinstall +mkdir -p $RPM_BUILD_ROOT/sbin +mv $RPM_BUILD_ROOT/usr/sbin/* $RPM_BUILD_ROOT/sbin/ + +# remove unpackaged files from the buildroot +rm -rf $RPM_BUILD_ROOT%{_libdir} +rm -rf $RPM_BUILD_ROOT%{_includedir} +rm -f $RPM_BUILD_ROOT%{_datadir}/usb.ids + +%files +%defattr(-,root,root) +%{_mandir}/*/* +/sbin/* +%doc AUTHORS COPYING ChangeLog INSTALL NEWS README + +%clean +rm -rf $RPM_BUILD_ROOT + +%changelog +* Tue Jun 15 2004 Elliot Lee +- rebuilt + +* Tue May 4 2004 Bill Nottingham 0.11-4 +- add patch from USB maintainer to fix various brokenness (#115694, ) + +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Wed Jun 04 2003 Elliot Lee +- rebuilt + +* Tue Jun 3 2003 Jeff Johnson +- add explicit epoch's where needed. + +* Mon May 19 2003 Bill Nottingham 0.11-1 +- update to 0.11, fixes #90640 +- add patch to fix some warnings (#78462, ) + +* Wed Jan 22 2003 Tim Powers +- rebuilt + +* Fri Nov 29 2002 Tim Powers 0.9-9 +- remove unpackaged files from the buildroot + +* Wed Nov 20 2002 Florian La Roche +- exclude mainframe + +* Fri Jun 21 2002 Tim Powers +- automated rebuild + +* Thu May 23 2002 Tim Powers +- automated rebuild + +* Thu Mar 21 2002 Trond Eivind Glomsr?d 0.9-5 +- Fix conflict check + +* Mon Mar 18 2002 Trond Eivind Glomsr?d 0.9-4 +- Conflict with older versions of hotplug which contained + parts of this package (#60615) + +* Fri Feb 22 2002 Trond Eivind Glomsr?d 0.9-3 +- Rebuild + +* Wed Jan 30 2002 Bill Nottingham 0.9-2 +- require hwdata + +* Wed Jan 16 2002 Trond Eivind Glomsr?d 0.9-1 +- Initial RPM +- make it build on ia64 + From svn at tinysofa.org Thu Jul 1 15:42:22 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:42:22 +1000 (EST) Subject: [tinysofa-svn] r2688 - in tinysofa/snapshot: . utempter utempter/current utempter/current/sources utempter/current/specs Message-ID: <20040701154222.B38D34E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:42:22 +1000 (Fri, 02 Jul 2004) New Revision: 2688 Added: tinysofa/snapshot/utempter/ tinysofa/snapshot/utempter/current/ tinysofa/snapshot/utempter/current/sources/ tinysofa/snapshot/utempter/current/sources/utempter-0.5.5.tar.gz tinysofa/snapshot/utempter/current/specs/ tinysofa/snapshot/utempter/current/specs/utempter.spec Log: - Add utempter to snapshot from 2.0. Added: tinysofa/snapshot/utempter/current/sources/utempter-0.5.5.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/utempter/current/sources/utempter-0.5.5.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/utempter/current/specs/utempter.spec =================================================================== --- tinysofa/snapshot/utempter/current/specs/utempter.spec 2004-07-01 15:42:20 UTC (rev 2687) +++ tinysofa/snapshot/utempter/current/specs/utempter.spec 2004-07-01 15:42:22 UTC (rev 2688) @@ -0,0 +1,139 @@ +Summary: A privileged helper for utmp/wtmp updates. +Name: utempter +Version: 0.5.5 +Release: 5ts +License: MIT/LGPL +Group: System Environment/Base +Source: utempter-%{version}.tar.gz +Prereq: /usr/sbin/groupadd, /sbin/ldconfig, fileutils +BuildRoot: %{_tmppath}/%{name}-%{version}-root + +%description +Utempter is a utility which allows some non-privileged programs to +have required root access without compromising system +security. Utempter accomplishes this feat by acting as a buffer +between root and the programs. + +%prep +%setup -q + +%build +make RPM_OPT_FLAGS="$RPM_OPT_FLAGS" + +%install +rm -rf $RPM_BUILD_ROOT +make PREFIX=$RPM_BUILD_ROOT LIBDIR=%{_libdir} install +/sbin/ldconfig -n $RPM_BUILD_ROOT/%{_libdir} + +%clean +rm -rf $RPM_BUILD_ROOT + +%pre +%{_sbindir}/groupadd -g 22 -r -f utmp || : + +%post +{ + /sbin/ldconfig + for file in /var/log/wtmp /var/run/utmp ; do + if [ -f $file ]; then + chown root:utmp $file + chmod 664 $file + fi + done +} + +%postun -p /sbin/ldconfig + +%files +%defattr(-,root,root) +%attr(02755, root, utmp) %{_sbindir}/utempter +%doc COPYING +%{_libdir}/libutempter.so* +%{_includedir}/utempter.h + +%changelog +* Tue Jun 15 2004 Elliot Lee +- rebuilt + +* Tue Apr 20 2004 Mike A. Harris 0.5.5-4 +- Build 0.5.5-1 version as 0.5.5-1.2.1EL.0 for RHEL 2.1 erratum +- Build 0.5.5-1 version as 0.5.5-1.3EL.0 for RHEL 3 erratum +- Build 0.5.5-1 version as 0.5.5-2.RHL9.0 for RHL 9 erratum +- Build 0.5.5-1 version as 0.5.5-3.FC1.0 for Fedora Core 1 erratum +- Build 0.5.5-1 version as 0.5.5-4 for Fedora Core 2 development head + +* Mon Apr 19 2004 Mike A. Harris 0.5.5-1 +- [SECURITY] Fix CAN-2004-0233 utempter directory traversal symlink attack + issue for immediate erratum release. +- Build all-arch test package 0.5.5-1 in dist-fc2-scratch + +* Mon Feb 23 2004 Mike A. Harris 0.5.4-1 +- Rewrote post install script to be a bit cleaner and rebuilt in rawhide to + pick up twaugh's chown change +- Added 'srpm-x' target to Makefile for package maintainer SRPM building + +* Mon Feb 23 2004 Tim Waugh +- Use ':' instead of '.' as separator for chown. + +* Fri May 30 2003 Mike A. Harris 0.5.3-1 +- Bump version and release and rebuild to strip debug info into .debuginfo + package, as the Red Hat Linux 9 package shipped unstripped (#91664) +- Updated license field to reflect dual license MIT style + LGPL +- Changed spec file Copyright tag to proper License tag +- Removed stupid crackrock "version" macro define + +* Tue Feb 18 2003 Matt Wilson 0.5.2-16 +- get the second SIGCHLD SIG_IGN case too (#84571) + +* Tue Feb 11 2003 Bill Nottingham 0.5.2-15 +- don't set SIGCHLD handler to SIG_IGN and then wait + +* Tue Feb 04 2003 Florian La Roche +- add symlink to shared lib +- internal sync + +* Tue Oct 8 2002 Mike A. Harris 0.5.2-12 +- All-arch rebuild +- Removed dumb usage of {version} in Version: tag + +* Thu Sep 5 2002 Mike A. Harris 0.5.2-11hammer +- Updated BuildRoot line to meet Red Hat standards +- Updated filelist to use rpm macros for _libdir, etc. +- Added comment to top of specfile to remind people to check utempter changes + into CVS, since utempter IS managed by CVS afterall... I will fix the + missing bits in CVS soon once the package is reassigned to me +- Added 'LIBDIR=%{_libdir}' to make commandline for proper x86_64 build +- Added libdir patch to Makefile + +* Fri Jun 21 2002 Tim Powers +- automated rebuild + +* Thu Jun 20 2002 Elliot Lee 0.5.2-9 +- Don't strip binary + +* Thu May 23 2002 Tim Powers +- automated rebuild + +* Wed Jan 09 2002 Tim Powers +- automated rebuild + +* Sun Jun 24 2001 Elliot Lee +- Bump release + rebuild. + +* Thu Jul 13 2000 Prospector +- automatic rebuild + +* Sat Jun 17 2000 Matt Wilson +- defattr root + +* Thu Feb 24 2000 Erik Troan +- added LGPL notice + +* Mon Sep 13 1999 Bill Nottingham +- strip utempter + +* Mon Aug 30 1999 Bill Nottingham +- add utmp as group 22 + +* Fri Jun 4 1999 Jeff Johnson +- ignore SIGCHLD while processing utmp. From svn at tinysofa.org Thu Jul 1 15:42:52 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:42:52 +1000 (EST) Subject: [tinysofa-svn] r2692 - in tinysofa/snapshot: . w3c-libwww w3c-libwww/current w3c-libwww/current/sources w3c-libwww/current/specs Message-ID: <20040701154252.3174B4E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:42:51 +1000 (Fri, 02 Jul 2004) New Revision: 2692 Added: tinysofa/snapshot/w3c-libwww/ tinysofa/snapshot/w3c-libwww/current/ tinysofa/snapshot/w3c-libwww/current/sources/ tinysofa/snapshot/w3c-libwww/current/sources/w3c-libwww-5.2.8-destdir.patch tinysofa/snapshot/w3c-libwww/current/sources/w3c-libwww-5.3.2-incdir.patch tinysofa/snapshot/w3c-libwww/current/sources/w3c-libwww-5.4.0.tgz tinysofa/snapshot/w3c-libwww/current/sources/w3c-libwww-autostar.patch tinysofa/snapshot/w3c-libwww/current/sources/w3c-libwww-ppc64.patch tinysofa/snapshot/w3c-libwww/current/specs/ tinysofa/snapshot/w3c-libwww/current/specs/w3c-libwww.spec Log: - Add w3c-libwww to snapshot from 2.0. Added: tinysofa/snapshot/w3c-libwww/current/sources/w3c-libwww-5.2.8-destdir.patch =================================================================== --- tinysofa/snapshot/w3c-libwww/current/sources/w3c-libwww-5.2.8-destdir.patch 2004-07-01 15:42:49 UTC (rev 2691) +++ tinysofa/snapshot/w3c-libwww/current/sources/w3c-libwww-5.2.8-destdir.patch 2004-07-01 15:42:51 UTC (rev 2692) @@ -0,0 +1,13 @@ +--- w3c-libwww-5.2.8/Makefile.am.destdir Sun Jun 18 17:35:53 2000 ++++ w3c-libwww-5.2.8/Makefile.am Sun Jun 18 17:36:19 2000 +@@ -24,8 +24,8 @@ + # We need to install the config.h header file as well + install-exec-local: + @$(NORMAL_INSTALL) +- $(mkinstalldirs) $(pkgincludedir) +- $(INSTALL_DATA) $(top_builddir)/$(CONFIG_HEADER) $(pkgincludedir)/$(CONFIG_HEADER); ++ $(mkinstalldirs) $(DESTDIR)$(pkgincludedir) ++ $(INSTALL_DATA) $(top_builddir)/$(CONFIG_HEADER) $(DESTDIR)$(pkgincludedir)/$(CONFIG_HEADER); + + # This is our install script provided by Soren Sandmann + bin_SCRIPTS = libwww-config Added: tinysofa/snapshot/w3c-libwww/current/sources/w3c-libwww-5.3.2-incdir.patch =================================================================== --- tinysofa/snapshot/w3c-libwww/current/sources/w3c-libwww-5.3.2-incdir.patch 2004-07-01 15:42:49 UTC (rev 2691) +++ tinysofa/snapshot/w3c-libwww/current/sources/w3c-libwww-5.3.2-incdir.patch 2004-07-01 15:42:51 UTC (rev 2692) @@ -0,0 +1,15 @@ +--- w3c-libwww-5.3.2/libwww-config.in.inc Wed Feb 20 11:39:50 2002 ++++ w3c-libwww-5.3.2/libwww-config.in Wed Feb 20 11:42:17 2002 +@@ -45,7 +45,11 @@ + echo @VERSION@ + ;; + --cflags) +- echo -I at includedir@ -I at includedir@/@PACKAGE@ @DEFS@ ++ if [ "@includedir@" != "@prefix@/include" ]; then ++ echo -I at includedir@ -I at includedir@/@PACKAGE@ @DEFS@ ++ else ++ echo -I at includedir@/@PACKAGE@ @DEFS@ ++ fi + ;; + --libs) + echo -L at libdir@ @LWWWXML@ @LWWWZIP@ @LWWWWAIS@ @LWWWSQL@ -lwwwinit -lwwwapp -lwwwhtml -lwwwtelnet -lwwwnews -lwwwhttp -lwwwmime -lwwwgopher -lwwwftp -lwwwfile -lwwwdir -lwwwcache -lwwwstream -lwwwmux -lwwwtrans -lwwwcore -lwwwutils @LWWWMD5@ @LIBS@ Added: tinysofa/snapshot/w3c-libwww/current/sources/w3c-libwww-5.4.0.tgz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/w3c-libwww/current/sources/w3c-libwww-5.4.0.tgz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/w3c-libwww/current/sources/w3c-libwww-autostar.patch =================================================================== --- tinysofa/snapshot/w3c-libwww/current/sources/w3c-libwww-autostar.patch 2004-07-01 15:42:49 UTC (rev 2691) +++ tinysofa/snapshot/w3c-libwww/current/sources/w3c-libwww-autostar.patch 2004-07-01 15:42:51 UTC (rev 2692) @@ -0,0 +1,117 @@ +--- w3c-libwww-5.4.0/modules/expat/xmltok/Makefile.am.sopwith 2003-09-03 12:48:03.000000000 -0400 ++++ w3c-libwww-5.4.0/modules/expat/xmltok/Makefile.am 2003-09-03 12:50:56.000000000 -0400 +@@ -1,8 +1,8 @@ + ## Process this file with Automake to create Makefile.in. + +-LDFLAGS = -version-info "1:0:1" ++AM_LDFLAGS = -version-info "1:0:1" + +-CFLAGS = @CFLAGS@ -DXML_NS ++AM_CFLAGS = @CFLAGS@ -DXML_NS + + lib_LTLIBRARIES = \ + @XMLTOK@ +--- w3c-libwww-5.4.0/modules/expat/xmlparse/Makefile.am.sopwith 2003-09-03 12:47:55.000000000 -0400 ++++ w3c-libwww-5.4.0/modules/expat/xmlparse/Makefile.am 2003-09-03 12:50:38.000000000 -0400 +@@ -1,8 +1,8 @@ + ## Process this file with Automake to create Makefile.in. + +-LDFLAGS = -version-info "1:0:1" ++AM_LDFLAGS = -version-info "1:0:1" + +-CFLAGS = @CFLAGS@ -DXML_NS ++AM_CFLAGS = @CFLAGS@ -DXML_NS + + lib_LTLIBRARIES = \ + @XMLPARSE@ +--- w3c-libwww-5.4.0/Library/src/SSL/Makefile.am.sopwith 2003-09-03 12:49:33.000000000 -0400 ++++ w3c-libwww-5.4.0/Library/src/SSL/Makefile.am 2003-09-03 12:49:43.000000000 -0400 +@@ -1,6 +1,6 @@ + ## Process this file with Automake to create Makefile.in. + +-LDFLAGS = -version-info "1:0:1" ++AM_LDFLAGS = -version-info "1:0:1" + + lib_LTLIBRARIES = @WWWSSL@ + +--- w3c-libwww-5.4.0/Library/src/Makefile.am.sopwith 2003-09-03 12:27:24.000000000 -0400 ++++ w3c-libwww-5.4.0/Library/src/Makefile.am 2003-09-03 12:49:09.000000000 -0400 +@@ -1,6 +1,6 @@ + ## Process this file with Automake to create Makefile.in. + +-LDFLAGS = -version-info "1:0:1" ++AM_LDFLAGS = -version-info "1:0:1" + + lib_LTLIBRARIES = \ + libwwwutils.la \ +@@ -50,7 +50,7 @@ + endif + + icondir = @icondir@ +-CPPFLAGS := $(CPPFLAGS) -DW3C_ICONS=\"$(icondir)\" ++am_CPPFLAGS = $(CPPFLAGS) -DW3C_ICONS=\"$(icondir)\" + + inc: $(BUILT_SOURCES) + @echo Generated built sources +--- w3c-libwww-5.4.0/Makefile.am.sopwith 2003-09-03 12:27:44.000000000 -0400 ++++ w3c-libwww-5.4.0/Makefile.am 2003-09-03 12:28:15.000000000 -0400 +@@ -42,7 +42,6 @@ + chmod -R a+r $(distdir) + zip -rq $(distdir).zip $(distdir) + $(TAR) chofz $(distdir).tgz $(distdir) +- # gzip -f $(distdir).tar + + # Tag before making distribution. Also, don't make a distribution if + # checks fail. +--- w3c-libwww-5.4.0/acinclude.m4.sopwith 2003-09-03 12:46:31.000000000 -0400 ++++ w3c-libwww-5.4.0/acinclude.m4 2003-09-03 12:52:13.000000000 -0400 +@@ -1,3 +1,5 @@ ++AC_DEFINE([_POSIX_SOURCE], [], [Description]) ++ + AC_DEFUN(AC_SYS_AFS_SYSNAME, [ + AC_CHECK_PROG(ac_afsws_fs_found, fs, yes) + AC_MSG_CHECKING(AFS system name) +@@ -251,19 +253,6 @@ + done + ]) + +-dnl AC_C_VOLATILE +-AC_DEFUN(AC_C_VOLATILE, +-[ AC_MSG_CHECKING([for working volatile]) +- AC_CACHE_VAL(ac_cv_c_volatile, +- [ AC_TRY_COMPILE(,[ +-extern volatile int errno; +-], ac_cv_c_volatile=yes, ac_cv_c_volatile=no)])dnl +- AC_MSG_RESULT($ac_cv_c_volatile) +-if test $ac_cv_c_volatile = no; then +- AC_DEFINE(volatile, ) +-fi +-]) +- + dnl AC_C_NOSHARE + AC_DEFUN(AC_C_NOSHARE, + [ AC_MSG_CHECKING([for working noshare]) +@@ -403,23 +392,6 @@ + fi + ]) + +-dnl AC_HEADER_TIOCGWINSZ +-AC_DEFUN(AC_HEADER_TIOCGWINSZ, +-[ AC_MSG_CHECKING([for TIOCGWINSZ get-window-size capability]) +- AC_CACHE_VAL(ac_cv_header_tiocgwinsz, +- [ AC_HEADER_INCLUDE(tmp_inc_termios, sys/termios.h termios.h) +- AC_EGREP_HEADER(yes, [ +-$tmp_inc_termios +-#ifdef TIOCGWINSZ +- yes +-#endif +-], ac_cv_header_tiocgwinsz=yes, ac_cv_header_tiocgwinsz=no)])dnl +- AC_MSG_RESULT($ac_cv_header_tiocgwinsz) +-if test $ac_cv_header_tiocgwinsz = yes; then +- AC_DEFINE(GET_SCREEN_SIZE) +-fi +-]) +- + dnl AC_SYS_NEED_SIGNAL_RESET + dnl If signal handlers need to be reset, define NEED_SIGNAL_RESET + AC_DEFUN(AC_SYS_NEED_SIGNAL_RESET, Added: tinysofa/snapshot/w3c-libwww/current/sources/w3c-libwww-ppc64.patch =================================================================== --- tinysofa/snapshot/w3c-libwww/current/sources/w3c-libwww-ppc64.patch 2004-07-01 15:42:49 UTC (rev 2691) +++ tinysofa/snapshot/w3c-libwww/current/sources/w3c-libwww-ppc64.patch 2004-07-01 15:42:51 UTC (rev 2692) @@ -0,0 +1,10 @@ +--- w3c-libwww-5.4.0/config/ltconfig.sopwith 2002-06-06 10:59:37.000000000 -0400 ++++ w3c-libwww-5.4.0/config/ltconfig 2003-02-11 13:35:44.000000000 -0500 +@@ -1933,7 +1933,6 @@ + else + # Only the GNU ld.so supports shared libraries on MkLinux. + case "$host_cpu" in +- powerpc*) dynamic_linker=no ;; + *) dynamic_linker='Linux ld.so' ;; + esac + fi Added: tinysofa/snapshot/w3c-libwww/current/specs/w3c-libwww.spec =================================================================== --- tinysofa/snapshot/w3c-libwww/current/specs/w3c-libwww.spec 2004-07-01 15:42:49 UTC (rev 2691) +++ tinysofa/snapshot/w3c-libwww/current/specs/w3c-libwww.spec 2004-07-01 15:42:51 UTC (rev 2692) @@ -0,0 +1,193 @@ +# Note that this is NOT a relocatable package +Summary: HTTP library of common code +Name: w3c-libwww +Version: 5.4.0 +Release: 9.1ts +License: W3C (see: http://www.w3.org/Consortium/Legal/copyright-software.html) +Group: System Environment/Libraries +Source: http://www.w3.org/Library/Distribution/w3c-libwww-%{version}.tgz +Patch0: w3c-libwww-5.2.8-destdir.patch +Patch1: w3c-libwww-5.3.2-incdir.patch +Patch2: w3c-libwww-ppc64.patch +Patch3: w3c-libwww-autostar.patch +URL: http://www.w3.org/Library +BuildRoot: %{_tmppath}/%{name}-%{version}-root +BuildRequires: libtool autoconf automake zlib-devel + +%description +Libwww is a general-purpose Web API written in C for Unix and Windows (Win32). +With a highly extensible and layered API, it can accommodate many different +types of applications including clients, robots, etc. The purpose of libwww +is to provide a highly optimized HTTP sample implementation as well as other +Internet protocols and to serve as a testbed for protocol experiments. + +%package devel +Summary: Libraries and header files for programs that use libwww. +Group: Development/Libraries +Requires: w3c-libwww = %{version} zlib-devel + +%description devel +Static libraries and header files for libwww, which are available as public +libraries. + +%package apps +Summary: Applications built using Libwww web library: e.g. Robot, command line tool, etc. +Group: Applications/Internet +Requires: w3c-libwww + +%description apps + +Web applications built using Libwww: Robot, Command line tool, +line mode browser. The Robot can crawl web sites faster, and +with lower load, than any other web walker that we know of, +due to its extensive pipelining and use of HTTP/1.1. + +The command line tool (w3c) is very useful for manipulation of +Web sites that implement more than just HTTP GET (e.g. PUT, + POST, etc.). + +The line mode browser is a minimal line mode web browser; +often useful to convert to ascii text. Currently unavailable +until someone updates it to some new interfaces. (hint, hint...) + +%prep +%setup -q +#%patch0 -p1 -b .destdir +%patch1 -p1 +%patch2 -p1 -b .ppc64 +%patch3 -p1 -b .autostar + +libtoolize -c -f +aclocal +automake --add-missing +autoconf +autoheader +echo timestamp > stamp-h.in +touch Library/User/Extrnals.html + +%build +#CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --with-regex --with-zlib +#make RPM_OPT_FLAGS="$RPM_OPT_FLAGS" + +%configure --enable-shared --with-gnu-ld --with-regex --with-zlib +export tagname=CC +make LIBTOOL=/usr/bin/libtool + +%install +rm -rf $RPM_BUILD_ROOT + +export tagname=CC +make LIBTOOL=/usr/bin/libtool DESTDIR=$RPM_BUILD_ROOT install + +pushd $RPM_BUILD_ROOT + chmod +x .%{_libdir}/lib{www*,xml*,md5}.so.0.* + ln -s w3c-libwww/xmlparse.h ./usr/include/xmlparse.h + mv ./%{_prefix}/include/wwwconf.h ./%{_prefix}/include/w3c-libwww/ +popd + +# remove since for some reason we aren't shipping it +rm -f $RPM_BUILD_ROOT%{_prefix}/bin/www + +%clean +rm -rf $RPM_BUILD_ROOT + +%post -p /sbin/ldconfig + +%postun -p /sbin/ldconfig + +%files +%defattr(-,root,root) +%{_libdir}/libwww*.so.* +%{_libdir}/libxml*.so.* +%{_libdir}/libmd5.so.* +%{_libdir}/libpics.so.* +%{_prefix}/share/w3c-libwww + +%doc *.html Icons/*/*.gif + +%files apps +%defattr(-,root,root) +%{_prefix}/bin/webbot +%{_prefix}/bin/w3c + +%files devel +%defattr(-,root,root) +%{_prefix}/bin/libwww-config +%{_libdir}/lib*.a +%{_libdir}/lib*.la +%{_libdir}/lib*.so + +%{_prefix}/include/w3c-libwww +%{_prefix}/include/xmlparse.h + +%changelog +* Tue Mar 02 2004 Elliot Lee +- rebuilt + +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Thu Jan 29 2004 Harald Hoyer - 5.4.0-8 +- added zlib-devel dependency + +* Thu Aug 7 2003 Elliot Lee 5.4.0-7 +- Fix libtool, auto* + +* Wed Jun 04 2003 Elliot Lee +- rebuilt + +* Mon Feb 17 2003 Elliot Lee 5.4.0-5 +- ppc64 fixes + +* Wed Jan 29 2003 Harald Hoyer 5.4.0-4 +- rebuilt + +* Wed Jan 22 2003 Tim Powers +- rebuilt + +* Mon Nov 18 2002 Tim Powers +- rebuild on all arches +- lib64'ize +- fix broken %%doc file list + +* Tue Jul 23 2002 Harald Hoyer 5.4.0-1 +- removed prestripping + +* Fri Jun 21 2002 Tim Powers +- automated rebuild + +* Thu May 23 2002 Tim Powers +- automated rebuild + +* Wed Feb 20 2002 Harald Hoyer +- fixed --cflags (#59503) + +* Wed Jan 23 2002 Harald Hoyer 5.3.2-4 +- moved wwwconf.h in w3c-libwww subdir #58060 +- added libpics.so.* #58433 + +* Mon Jan 07 2002 Harald Hoyer 5.3.2-2 +- added wwwconf.h (#58060) + +* Thu Dec 13 2001 Harald Hoyer +- fix for #55526 + +* Tue Jul 10 2001 Tim Powers +- make devel package version dependant + +* Sun Jun 24 2001 Elliot Lee +- Bump release + rebuild for 7.2. + +* Thu Jul 13 2000 Prospector +- automatic rebuild + +* Sun Jun 18 2000 Matt Wilson +- rebuilt for next release +- added patch to toplevel Makefile.am to honor DESTDIR +- use "make DESTDIR=$RPM_BUILD_ROOT install" + +* Thu Aug 12 1999 Jeff Johnson +- rebuild for 6.1. + +* Mon Apr 12 1999 Jeff Johnson +- repackage for Red Hat 6.0. From svn at tinysofa.org Thu Jul 1 15:42:53 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:42:53 +1000 (EST) Subject: [tinysofa-svn] r2693 - in tinysofa/snapshot: . xinitrc xinitrc/current xinitrc/current/sources xinitrc/current/specs Message-ID: <20040701154253.9E9994E817D@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:42:53 +1000 (Fri, 02 Jul 2004) New Revision: 2693 Added: tinysofa/snapshot/xinitrc/ tinysofa/snapshot/xinitrc/current/ tinysofa/snapshot/xinitrc/current/sources/ tinysofa/snapshot/xinitrc/current/sources/xinitrc-4.0.0.tar.bz2 tinysofa/snapshot/xinitrc/current/specs/ tinysofa/snapshot/xinitrc/current/specs/xinitrc.spec Log: - Add xinitrc to snapshot from 2.0. Added: tinysofa/snapshot/xinitrc/current/sources/xinitrc-4.0.0.tar.bz2 =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/xinitrc/current/sources/xinitrc-4.0.0.tar.bz2 ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/xinitrc/current/specs/xinitrc.spec =================================================================== --- tinysofa/snapshot/xinitrc/current/specs/xinitrc.spec 2004-07-01 15:42:51 UTC (rev 2692) +++ tinysofa/snapshot/xinitrc/current/specs/xinitrc.spec 2004-07-01 15:42:53 UTC (rev 2693) @@ -0,0 +1,392 @@ +Summary: The default startup script for the X Window System. +Name: xinitrc +Version: 4.0.0 +Release: 1ts +License: GPLv2, MIT/X11 +Group: User Interface/X +Source: xinitrc-%{version}.tar.bz2 +Buildroot: %{_tmppath}/%{name}-%{version}-root +# FIXME: XFree86 dep has been disabled, because that causes the package to +# be dependant on a specific X11 implementation. It isn't clear why this +# dependancy is here, so once we find out what breaks, we can add new +# dependancies here for them in a way that is not dependant on a specific +# implementation. That can be done either by using file/dir dependancies, +# or by using virtual provides/requires. +# Mar 16, 2004 - mharris at redhat.com +#Requires: XFree86 + +# sessreg - is used by "GiveConsole" and "TakeConsole" +Requires: /usr/X11R6/bin/sessreg + +# These are required by Xclients +Requires: which /usr/X11R6/bin/RunWM + +# Xsetup_0 requires pidof and xsetroot +Requires: /sbin/pidof /usr/X11R6/bin/xsetroot + +Requires: /bin/sh, /bin/bash, switchdesk >= 3.7 +BuildArch: noarch + +%description +The xinitrc package contains the xinitrc file, a script which is used +to configure your X Window System session or to start a window +manager. + +%prep +%setup -q + +%install +rm -rf $RPM_BUILD_ROOT +make DESTDIR=$RPM_BUILD_ROOT install + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(-,root,root) +%config(noreplace) /etc/X11/Xmodmap +%config(noreplace) /etc/X11/Xresources +%config /etc/X11/xinit/xinitrc +%config(noreplace) /etc/X11/xinit/Xclients +%dir /etc/X11/xinit/xinitrc.d +/etc/X11/xinit/xinitrc.d/* +%config(noreplace) /etc/X11/xdm/* +# FIXME: This should move to /usr/bin sometime, with a backward compatible +# symlink added back just prior to release, to help people to fix things to +# use /usr/bin instead. Then keep the symlink for a release or so. When +# this changes, X11BINDIR in the Makefile needs to be updated also. +/usr/X11R6/bin/RunWM + +%changelog +* Wed Jun 23 2004 Mike A. Harris 4.0.0-1 +- Created xinitrc-3-stable-branch in CVS for maintaining the 3.x branch of + xinitrc. New development will occur in the 4.x releases, intended for + Fedora Core 3 and Red Hat Enterprise Linux 4. +- Added back changes from 3.40-1 which were reverted in 3.42-1, as these were + intended for development. +- Renamed xinput script to xinput.sh to comply with new *.sh policy of scripts + in xinitrc.d directory +- Do not flag /etc/X11/xinit/xinitrc.d/* as config files, as they are scripts, + not config files. + +* Wed Jun 23 2004 Mike A. Harris 3.42-1 +- Reverted changes from 3.40-1, which were intended to be included in + Fedora Core 3 development, but accidentally made it into Fedora Core 2 + erratum. + +* Tue Jun 1 2004 Mike A. Harris 3.41-1 +- Fixed missing quote in xinput script (#123804) + +* Fri May 7 2004 Mike A. Harris 3.40-1 +- Modified xinitrc and Xsession scripts to only source files with .sh + extensions in /etc/X11/xinit/xinitrc.d/* so that backup files that are + created when hand editing the scripts, aren't executed. (FC2BLOCKER + #119241) + +* Tue Mar 30 2004 Mike A. Harris 3.39-1 +- Fix problem in xinput script caused due to a bit of over-quoting in recent + changes, which result in logged erros (FC2 BLOCKER #119529) + +* Mon Mar 29 2004 Mike A. Harris 3.38-1 +- xinput fixes: + - Fix missing ']' on elif test on line 25 (FC2 BLOCKER #119284) + - Change test for /etc/profile.d/lang.sh to test with -r instead of -f + - Change all non-null string tests to use -n instead of != "" + - Change broken test logic in KDE block to use -o instead of || + - Fixes for iiimf getting turned on even for European languages where it + is not useful. (Jens Petersen, FC2 BLOCKER #119241) +- Xsession cleanups: + - Update Xsession for new switchdesk (Than Ngo, FC2 BLOCKER #116164) + - Change all file existance tests using -f, to -r since we care if it is + readable rather than if it exists or not. + - Use new style $() command substitution rather than `` +- Updated the copyright messages of all script files, and added missing + GPLv2 notices where appropriate. Updated License: tag of spec file to be + "GPLv2, MIT/X11" + +* Tue Mar 16 2004 Mike A. Harris 3.37-1 +- Disable Requires: XFree86 dep, and add comment to spec file with reasoning, + so if anything breaks, we can fix it up in a better way later on +- Xclients cleanups: + - Check for existance of xclock and xterm binaries, both in /usr/bin, and + in /usr/X11R6/bin before trying to execute either in failsafe + - Check for executable existance of mozilla/fvwm/twm with -x, rather than + just checking for existance with -f, and then use the explicit path to + these binaries when executing them +- xinput cleanups: + - Change shebang to use /bin/bash instead of /bin/sh, as our OS is always + guaranteed to have /bin/bash installed on it because many other things + require it anyway. This makes it explicitly legal to use bashisms + everywhere, of which are usually already being used anyway without notice, + because /bin/sh is a link to /bin/bash by default. + - Replace old style usage of "test x$foo" with 'if [ "$foo"' as it is much + more readable. + - Test for the readability of /etc/sysconfig/i18n with -r, rather than + it's mere existance with -e + - Everywhere -e was used to test for the existance of a binary prior to + executing it, has been replaced with -x, which tests for executability +- Added "Requires: /usr/X11R6/bin/sessreg" for GiveConsole and TakeConsole +- Added "Requires: which /usr/X11R6/bin/RunWM" for Xclients +- Added "Requires: /sbin/pidof /usr/X11R6/bin/xsetroot" for Xsetup_0 + +* Tue Mar 16 2004 Jens Petersen 3.36-1 +- default input method to htt (im-iiim for gtk apps and httx for xim apps) + if htt is running when XIM is not set (#118382) +- default kinput2 to use canna if cannaserver running or wnn if jserver + running (Adrian Havill, #112631) when XIM_ARGS is not set +- add support for nabi (sangu, #112521) and uim +- do not set XIM to none (Eric Backus, #57876) +- ami no longer includes applet (Won-kyu Park, #61540) and so delayed-start + code is no longer needed + +* Thu Oct 23 2003 Mike A. Harris 3.35-1 +- Remove limitations forcing xcin to only work in UTF-8 mode (#97331) + +* Mon Oct 20 2003 Mike A. Harris 3.34-1 +- Changed the default background colour argument passed to xsetroot in both + the Xsession and Xsetup_0 scripts from "#5477A0" to "#20305A" + +* Thu Aug 28 2003 Mike A. Harris 3.33-1 +- Added Xsession update for new gdm for Cambridge (#103251) + +* Wed Feb 5 2003 Mike A. Harris 3.32-1 +- Rebuild + +* Tue Sep 10 2002 Bill Nottingham 3.30-1 +- unset TERM to avoid font wackiness when sourcing lang.sh + +* Thu Sep 5 2002 Owen Taylor 3.29-1 +- Add . /etc/profile.d/lang.sh to xinput (#73062) + +* Mon Sep 2 2002 Owen Taylor 3.28-1 +- Change default Xft hinting settings to hintmedium, not hintnone + +* Wed Aug 28 2002 Bill Nottingham 3.27-1 +- don't grep /etc/sysconfig/desktop; actually read it + +* Wed Jul 31 2002 Mike A. Harris 3.26-1 +- Added windowmaker support to Xclients for bug (#66225) + +* Sat Jul 20 2002 Mike A. Harris 3.25-1 +- Fix ssh-agent code added on Jun 27th to not start ssh-agent if it is + already running (#68626) + +* Fri Jun 28 2002 Owen Taylor 3.24-1 +- Add a Xresources file that sets Xft DPI to 96 +- Make Xsetup_0 load /etc/X11/Xresources + +* Thu Jun 27 2002 Preston Brown 3.23-1 +- use ssh-agent to start sessions if available. + +* Mon Apr 8 2002 Mike A. Harris 3.22-1 +- There were 3 different versions of 3.21 from different developers, which + had reverted some of my previous changes. I believe I have now fixed + these problems. +- Added Wnn7 support from Yukihiro Nakai (#61951) +- Made changes for Leon (removed debugging code from xinput, etc) + +* Wed Feb 27 2002 Mike A. Harris 3.21-1 +- Removed glidelink hack, as XFree86 4.2.0 now comes with code to load + the proper glide3 library automatically. + +* Thu Aug 23 2001 Mike A. Harris 3.20-1 +- Removed tempfile vulnerability in xinput writing to /tmp/start.txt + (MF #52304) + +* Tue Aug 21 2001 Leon Ho 3.19-1 +- covers all track from Xclient (ie. gdm to kde, kdm to gnome etc) +- covers if $LANG not exist on this scope yet +- Modified Korean part to work on both gnome and kde + +* Thu Aug 9 2001 Yukihiro Nakai 3.17-1 +- Improve Korean support. +- skkinput support. + +* Wed Aug 8 2001 Crutcher Dunnavant 3.16-1 +- make selection of Xclient smarter + +* Fri Aug 3 2001 Owen Taylor +- Change background color a bit, only run xsri if not running under gdm, + since our gdm config will run it itself. +- Change background for Xsession as well + +* Mon Jul 30 2001 Mike A. Harris 3.13-1 +- Removed '-login' from Xsession script, and changed exec calls to the + form 'exec -l $SHELL -c foo' as discussed with Havoc. +- Added explicit requires on /bin/bash + +* Mon Jul 16 2001 Mike A. Harris 3.12-1 +- Pure hack: Have xinitrc symlink the glide lib using glidelink to fix (#36158) + and numerous other duplicates. Temporary solution until XFree86 4.2.0 is + released. +- xinitrc tested for Netscape and fvwm2 presence with -f instead of -x + +* Sun Jul 8 2001 Yukihiro Nakai +- Add miniChinput entry to xinput. +- Fix the xcin entry for zh_CN.GB2312 + +* Sun May 06 2001 Than Ngo +- fixed tmpfile vulnerability (Bug #39083) + +* Mon Mar 26 2001 Preston Brown +- remove references to afterstep (#32877) + +* Fri Mar 16 2001 Yukihiro Nakai +- Update xinput to enable Omron's Wnn6 + +* Thu Feb 08 2001 Yukihiro Nakai +- More fix for kinput2 + FreeWnn + +* Tue Jan 23 2001 Than Ngo +- changed /bin/sh in Xsession to /bin/bash -login + +* Fri Jan 12 2001 Yukihiro Nakai +- More improvement for Korean and Japanese + +* Wed Jan 10 2001 Yukihiro Nakai +- Change ko_KR* -> ko* + +* Tue Dec 19 2000 Bernhard Rosenkraenzer +- Add xdm-config (used to be in XFree86-xdm) + +* Thu Dec 14 2000 Yukihiro Nakai +- Add zh_TW, and fix + +* Wed Dec 06 2000 Yukihiro Nakai +- Add Japanese fix. Use -canna option for kinput2. +- Add Korean and Chinese support. + +* Thu Nov 16 2000 Bernhard Rosenkraenzer +- adapt to KDE 2.0 (Bug #20409) +- require switchdesk >= 3.7 rather than 3.6 (KDE2) +- The fallback should launch netscape /usr/share/doc/HTML/index.html + rather than /usr/doc/HTML/index.html... +- bzip2 the source rather than gzipping it + +* Wed Oct 11 2000 Than Ngo +- fix Xsetup_0 (Bug #17873) + +* Wed Sep 13 2000 Matt Wilson +- make Xsession start a -login shell + +* Wed Sep 06 2000 Preston Brown +- remove references to anotherlevel + +* Tue Aug 22 2000 Than Ngo +- add KDE2 support + +* Sun Aug 20 2000 Nalin Dahyabhai +- add /usr/X11R6/bin to the PATH if it's not in there already (#16648) +- don't call cp in a subshell when trying to create a log file + +* Wed Aug 2 2000 Bill Nottingham +- more files move in + +* Fri Jul 14 2000 Preston Brown +- more wmaker path fixage + +* Tue Jul 11 2000 Trond Eivind Glomsr?d +- wmaker is now in /usr/bin + +* Thu Jun 22 2000 Bill Nottingham +- import some of the xdm stuff here, it's used by both xdm and gdm + +* Fri Jun 16 2000 Matt Wilson +- import these files into our CVS server + +* Tue May 30 2000 Preston Brown +- commented out mappings in global Xmodmap. Caused problems with many + remote logins from various X devices besides Linux boxes. + +* Tue Mar 14 2000 Matt Wilson +- export XMODIFIERS for japanese + +* Fri Mar 03 2000 Cristian Gafton +- fix windowmaker default initialization (use wmaker.inst for the + first start of WindowMaker) + +* Mon Feb 28 2000 Preston Brown +- process /etc/X11/XF86Config file with the sed script for xkb. + +* Mon Feb 21 2000 Preston Brown +- quote shell variables in xinitrc (#9547) + +* Thu Feb 10 2000 Preston Brown +- change /usr/X11R6/lib/X11 /etc/X11 for some config files. + +* Thu Feb 10 2000 Nalin Dahyabhai +- fix a typo + +* Tue Feb 8 2000 Bill Nottingham +- fix two syntax errors + +* Tue Jan 11 2000 Preston Brown +- added support for scripts a la /etc/profile.d in /etc/X11/xinit/xinitrc.d. +- moved japanese xinput stuff into an xinitrc.d script +- cleaned up duplicate runs of xmodmap (#7839). +- noreplace tag added for most config files. + +* Wed Oct 20 1999 Matt Wilson +- added patch from Owen to start kinput2 by default for all desktops when + running under Japanese + +* Mon Oct 18 1999 Preston Brown +- patched xinitrc to run setxkbmap -symbols on sparc if XkbSymbols variable + is defined (from Jakub) + +* Thu Sep 23 1999 Preston Brown +- enable use of xkb configuration files if they are present (# 4059) + +* Thu Jun 17 1999 Bill Nottingham +- make Xclients/xinitrc executable... + +* Thu Jun 10 1999 Preston Brown +- look for not only .Xmodmap/.Xresources, but also Xmodmap/Xresources +- Xmodmap w/ "keycode 22 = BackSpace" added for non Xkb-extension users + +* Mon Apr 19 1999 Preston Brown +- argh, fixed my changes from yesterday + +* Sun Apr 18 1999 Preston Brown +- added /etc/sysconfig/desktop support + +* Mon Mar 22 1999 Bill Nottingham +- make /etc/X11/xinit/* %config (bug #1051) + +* Sun Mar 21 1999 Cristian Gafton +- auto rebuild in the new build environment (release 2) + +* Tue Feb 02 1999 Preston Brown +- added ability to have KDE recognized if it is all that is installed + +* Wed Jan 27 1999 Preston Brown +- updated so that GNOME is the default, and a few other cleanups + +* Fri Sep 18 1998 Cristian Gafton +- added the RunWM script and modified Xclients to use this new script + +* Sun Sep 13 1998 Cristian Gafton +- included WindowMaker hints + +* Thu May 07 1998 Prospector System +- translations modified for de, fr, tr + +* Wed Apr 22 1998 Cristian Gafton +- handle AfterStep (and possibly other window managers) + +* Tue Nov 11 1997 Michael K. Johnson +- export the BROWSER variable. + +* Fri Nov 08 1997 Cristian Gafton +- added handling for the BROWSER variable + +* Wed Oct 15 1997 Cristian Gaftin +- updated for AnotherLevel + +* Fri Jul 18 1997 Erik Troan +- built for glibc, added dependencies + +* Thu Mar 20 1997 Erik Troan +- Added /etc/X11/xinitrc/Xclients to this file and removed it from rootfiles + and etcskel. + From svn at tinysofa.org Thu Jul 1 15:42:54 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:42:54 +1000 (EST) Subject: [tinysofa-svn] r2694 - in tinysofa/snapshot: . xmltex xmltex/current xmltex/current/sources xmltex/current/specs Message-ID: <20040701154254.B24AA4E817E@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:42:54 +1000 (Fri, 02 Jul 2004) New Revision: 2694 Added: tinysofa/snapshot/xmltex/ tinysofa/snapshot/xmltex/current/ tinysofa/snapshot/xmltex/current/sources/ tinysofa/snapshot/xmltex/current/sources/xmltex-1.9.tar.gz tinysofa/snapshot/xmltex/current/sources/xmltexfmtutil.cnf tinysofa/snapshot/xmltex/current/specs/ tinysofa/snapshot/xmltex/current/specs/xmltex.spec Log: - Add xmltex to snapshot from 2.0. Added: tinysofa/snapshot/xmltex/current/sources/xmltex-1.9.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/xmltex/current/sources/xmltex-1.9.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/xmltex/current/sources/xmltexfmtutil.cnf =================================================================== --- tinysofa/snapshot/xmltex/current/sources/xmltexfmtutil.cnf 2004-07-01 15:42:53 UTC (rev 2693) +++ tinysofa/snapshot/xmltex/current/sources/xmltexfmtutil.cnf 2004-07-01 15:42:54 UTC (rev 2694) @@ -0,0 +1,6 @@ +# configuration file for fmtutil; xmltex flavour. +# invoke with 'fmtutil --cnffile --all' +# +# format engine pattern-file arguments +xmltex tex language.dat &hugelatex xmltex.ini +pdfxmltex pdftex language.dat &pdflatex pdfxmltex.ini Added: tinysofa/snapshot/xmltex/current/specs/xmltex.spec =================================================================== --- tinysofa/snapshot/xmltex/current/specs/xmltex.spec 2004-07-01 15:42:53 UTC (rev 2693) +++ tinysofa/snapshot/xmltex/current/specs/xmltex.spec 2004-07-01 15:42:54 UTC (rev 2694) @@ -0,0 +1,137 @@ +Summary: Namespace-aware XML parser written in TeX. +Name: xmltex +Version: 20020625 +Release: 2ts +License: LaTeX Project Public License (http://www.latex-project.org/lppl.txt) +Group: Applications/Publishing +Source0: ftp://ftp.tex.ac.uk/tex-archive/macros/xmltex-1.9.tar.gz +Source1: xmltexfmtutil.cnf +Requires: tetex-latex +BuildArch: noarch +BuildRoot: %{_tmppath}/%{name}-%{version}-root + +BuildRequires: tetex + +%description +Namespace-aware XML parser written in TeX. + +%prep +%setup -q -c %{name}-%{version} +mv -f xmltex/base/* . + + +%build +pdftex -ini "&pdflatex" pdfxmltex.ini +tex -ini "&hugelatex" xmltex.ini + +%install +rm -rf $RPM_BUILD_ROOT +install -d $RPM_BUILD_ROOT%{_datadir}/texmf/tex/xmltex +install -d $RPM_BUILD_ROOT%{_datadir}/texmf/web2c +install -d $RPM_BUILD_ROOT%{_bindir} + +install *.xmt $RPM_BUILD_ROOT%{_datadir}/texmf/tex/xmltex +install %{name}.cfg $RPM_BUILD_ROOT%{_datadir}/texmf/tex/xmltex +install %{SOURCE1} *.ini *.tex $RPM_BUILD_ROOT%{_datadir}/texmf/tex/xmltex +install pdf%{name}.fmt $RPM_BUILD_ROOT%{_datadir}/texmf/web2c/ +install %{name}.fmt $RPM_BUILD_ROOT%{_datadir}/texmf/web2c/ +ln -s pdftex ${RPM_BUILD_ROOT}%{_bindir}/pdf%{name} +ln -s tex ${RPM_BUILD_ROOT}%{_bindir}/%{name} + +gzip -9nf readme.txt + +%clean +rm -rf $RPM_BUILD_ROOT + +%post +/usr/bin/env - PATH=$PATH:%{_bindir} texhash > /dev/null 2>&1 +/usr/bin/env - PATH=$PATH:%{_bindir} fmtutil --cnffile %{_datadir}/texmf/tex/xmltex/xmltexfmtutil.cnf --all > /dev/null 2>&1 +exit 0 + +%postun +/usr/bin/env - PATH=$PATH:%{_bindir} texhash > /dev/null 2>&1 +exit 0 + +%triggerin -- tetex-latex +/usr/bin/env - PATH=$PATH:%{_bindir} fmtutil --cnffile %{_datadir}/texmf/tex/xmltex/xmltexfmtutil.cnf --all > /dev/null 2>&1 +exit 0 + +%files +%defattr(644,root,root,755) +%doc *.gz *.html +%attr(755,root,root) %{_bindir}/* +%ghost %{_datadir}/texmf/web2c/*.fmt +%{_datadir}/texmf/tex/xmltex + +%changelog +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Fri Jan 16 2004 Tim Waugh 20020625-1 +- Slightly newer upstream version. + +* Thu Nov 27 2003 Tim Waugh 20020118-15 +- Build requires tetex (bug #110736). + +* Fri Sep 12 2003 Tim Waugh 20020118-14.1 +- Rebuilt. + +* Fri Sep 12 2003 Tim Waugh 20020118-14 +- Requires tetex-latex (bug #104307). + +* Wed Jan 22 2003 Tim Powers +- rebuilt + +* Wed Nov 20 2002 Tim Powers +- rebuild in current collinst + +* Tue Jul 23 2002 Tim Powers 20020118-11 +- rebuild using gcc-3.2-0.1 + +* Fri Jun 21 2002 Tim Powers 20020118-10 +- automated rebuild + +* Thu May 23 2002 Tim Powers 20020118-9 +- automated rebuild + +* Thu Feb 21 2002 Tim Waugh 20020118-8 +- Fix group (bug #60177). + +* Thu Feb 21 2002 Tim Waugh 20000118-7 +- Rebuild in new environment. + +* Wed Jan 09 2002 Tim Powers 20000118-6 +- automated rebuild + +* Wed Dec 12 2001 Tim Waugh 20000118-5 +- Trigger recreation of the format file on tetex-latex. + +* Wed Dec 5 2001 Tim Waugh 20000118-4 +- New xmltex.tex (from Sebastian). +- Fmt files should be marked as ghosts so that RPM verification works. + +* Sat Oct 6 2001 Tim Waugh 20000118-3 +- Built for Red Hat Linux. Package from PLD. + +* Sat Oct 6 2001 PLD Team +All persons listed below can be reached at @pld.org.pl + +$Log: xmltex.spec,v $ +Revision 1.6 2001/03/27 16:50:29 wiget +add xmltex.cfg file and one missing dir in %%files; release 3 + +Revision 1.5 2001/03/27 11:10:41 wiget +include xmltex macros; requires tex/pdftex + +Revision 1.4 2001/01/24 14:18:54 klakier +- archive file changed + +Revision 1.3 2001/01/24 13:28:40 klakier +- link fixed + +Revision 1.2 2001/01/24 12:34:27 klakier +- added Version and more doc + +Revision 1.1 2001/01/24 12:03:51 klakier +- initial + From svn at tinysofa.org Thu Jul 1 15:42:55 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:42:55 +1000 (EST) Subject: [tinysofa-svn] r2695 - in tinysofa/snapshot: . xmlto xmlto/current xmlto/current/sources xmlto/current/specs Message-ID: <20040701154255.C8F004E817F@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:42:55 +1000 (Fri, 02 Jul 2004) New Revision: 2695 Added: tinysofa/snapshot/xmlto/ tinysofa/snapshot/xmlto/current/ tinysofa/snapshot/xmlto/current/sources/ tinysofa/snapshot/xmlto/current/sources/xmlto-0.0.12-encoding.patch tinysofa/snapshot/xmlto/current/sources/xmlto-0.0.18.tar.bz2 tinysofa/snapshot/xmlto/current/specs/ tinysofa/snapshot/xmlto/current/specs/xmlto.spec Log: - Add xmlto to snapshot from 2.0. Added: tinysofa/snapshot/xmlto/current/sources/xmlto-0.0.12-encoding.patch =================================================================== --- tinysofa/snapshot/xmlto/current/sources/xmlto-0.0.12-encoding.patch 2004-07-01 15:42:54 UTC (rev 2694) +++ tinysofa/snapshot/xmlto/current/sources/xmlto-0.0.12-encoding.patch 2004-07-01 15:42:55 UTC (rev 2695) @@ -0,0 +1,11 @@ +--- xmlto-0.0.12/xmlto.in.encoding 2003-01-03 23:04:03.000000000 +0000 ++++ xmlto-0.0.12/xmlto.in 2003-01-03 23:04:30.000000000 +0000 +@@ -121,7 +121,7 @@ + fi + + # Magic encoding, based on locale +-if [ -x /usr/bin/locale ] ++if false; + then + charmap=$(locale charmap 2>/dev/null) + Added: tinysofa/snapshot/xmlto/current/sources/xmlto-0.0.18.tar.bz2 =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/xmlto/current/sources/xmlto-0.0.18.tar.bz2 ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/xmlto/current/specs/xmlto.spec =================================================================== --- tinysofa/snapshot/xmlto/current/specs/xmlto.spec 2004-07-01 15:42:54 UTC (rev 2694) +++ tinysofa/snapshot/xmlto/current/specs/xmlto.spec 2004-07-01 15:42:55 UTC (rev 2695) @@ -0,0 +1,167 @@ +%{!?tetex:%define tetex 1} + +Summary: A tool for converting XML files to various formats. +Name: xmlto +Version: 0.0.18 +Release: 2ts +License: GPL +Group: Applications/System +URL: http://cyberelk.net/tim/xmlto/ +Source0: ftp://cyberelk.net/tim/data/xmlto/stable/%{name}-%{version}.tar.bz2 +Patch0: xmlto-0.0.12-encoding.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-root + +BuildRequires: docbook-style-xsl >= 1.56.0 +BuildRequires: libxslt + +# We rely heavily on the DocBook XSL stylesheets! +Requires: docbook-style-xsl >= 1.56.0 + +# For full functionality, we need passivetex. +%if %{tetex} +Requires: passivetex >= 1.11 +%endif +Requires: libxslt +Requires: docbook-dtds + +%description +This is a package for converting XML files to various formats using XSL +stylesheets. + +%prep +%setup -q +%patch0 -p1 -b .encoding + +%build +%configure +make +make check + +%install +rm -rf %{buildroot} +%makeinstall + +%clean +rm -rf %{buildroot} + +%files +%defattr(-,root,root) +%{_bindir}/* +%{_mandir}/*/* +%{_datadir}/xmlto + +%changelog +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Wed Jan 21 2004 Tim Waugh 0.0.18-1 +- 0.0.18. + +* Mon Dec 1 2003 Tim Waugh 0.0.17-1 +- 0.0.17. + +* Tue Nov 18 2003 Tim Waugh 0.0.16-1 +- 0.0.16. + +* Tue Oct 7 2003 Tim Waugh 0.0.15-1 +- 0.0.15. + +* Tue Sep 23 2003 Florian La Roche +- allow compiling without tetex(passivetex) dependency + +* Tue Jun 17 2003 Tim Waugh 0.0.14-3 +- Rebuilt. + +* Wed Jun 04 2003 Elliot Lee +- rebuilt + +* Fri May 23 2003 Tim Waugh 0.0.14-1 +- 0.0.14. + +* Sun May 11 2003 Tim Waugh 0.0.13-1 +- 0.0.13. + +* Wed Jan 22 2003 Tim Powers +- rebuilt + +* Fri Jan 3 2003 Tim Waugh 0.0.12-2 +- Disable magic encoding detection, since the stylesheets don't handle + it well at all (bug #80732). + +* Thu Dec 12 2002 Tim Waugh 0.0.12-1 +- 0.0.12. + +* Wed Oct 16 2002 Tim Waugh 0.0.11-1 +- 0.0.11. +- xmlto.mak no longer needed. +- CVS patch no longer needed. +- Update docbook-xsl requirement. +- Ship xmlif. +- Run tests. +- No longer a noarch package. + +* Tue Jul 9 2002 Tim Waugh 0.0.10-4 +- Ship xmlto.mak. + +* Thu Jun 27 2002 Tim Waugh 0.0.10-3 +- Some db2man improvements from CVS. + +* Fri Jun 21 2002 Tim Powers 0.0.10-2 +- automated rebuild + +* Tue Jun 18 2002 Tim Waugh 0.0.10-1 +- 0.0.10. +- No longer need texinputs patch. + +* Tue Jun 18 2002 Tim Waugh 0.0.9-3 +- Fix TEXINPUTS problem with ps and dvi backends. + +* Thu May 23 2002 Tim Powers 0.0.9-2 +- automated rebuild + +* Wed May 1 2002 Tim Waugh 0.0.9-1 +- 0.0.9. +- The nonet patch is no longer needed. + +* Fri Apr 12 2002 Tim Waugh 0.0.8-3 +- Don't fetch entities over the network. + +* Thu Feb 21 2002 Tim Waugh 0.0.8-2 +- Rebuild in new environment. + +* Tue Feb 12 2002 Tim Waugh 0.0.8-1 +- 0.0.8. + +* Fri Jan 25 2002 Tim Waugh 0.0.7-2 +- Require the DocBook DTDs. + +* Mon Jan 21 2002 Tim Waugh 0.0.7-1 +- 0.0.7 (bug #58624, bug #58625). + +* Wed Jan 16 2002 Tim Waugh 0.0.6-1 +- 0.0.6. + +* Wed Jan 09 2002 Tim Powers 0.0.5-4 +- automated rebuild + +* Wed Jan 9 2002 Tim Waugh 0.0.5-3 +- 0.0.6pre2. + +* Wed Jan 9 2002 Tim Waugh 0.0.5-2 +- 0.0.6pre1. + +* Tue Jan 8 2002 Tim Waugh 0.0.5-1 +- 0.0.5. + +* Mon Dec 17 2001 Tim Waugh 0.0.4-2 +- 0.0.4. +- Apply patch from CVS to fix silly typos. + +* Sat Dec 8 2001 Tim Waugh 0.0.3-1 +- 0.0.3. + +* Wed Dec 5 2001 Tim Waugh +- Built for Red Hat Linux. + +* Fri Nov 23 2001 Tim Waugh +- Initial spec file. From svn at tinysofa.org Thu Jul 1 15:43:31 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:43:31 +1000 (EST) Subject: [tinysofa-svn] r2697 - in tinysofa/snapshot: . xsp xsp/current xsp/current/sources xsp/current/specs Message-ID: <20040701154331.C55554E817D@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:43:31 +1000 (Fri, 02 Jul 2004) New Revision: 2697 Added: tinysofa/snapshot/xsp/ tinysofa/snapshot/xsp/current/ tinysofa/snapshot/xsp/current/sources/ tinysofa/snapshot/xsp/current/sources/xsp-0.16-extension-fix.patch tinysofa/snapshot/xsp/current/sources/xsp-0.16-nunit-asp.patch tinysofa/snapshot/xsp/current/sources/xsp-0.16-nunit-tests.patch tinysofa/snapshot/xsp/current/sources/xsp-1.0.tar.gz tinysofa/snapshot/xsp/current/specs/ tinysofa/snapshot/xsp/current/specs/xsp.spec Log: - Add xsp to snapshot from 2.0. Added: tinysofa/snapshot/xsp/current/sources/xsp-0.16-extension-fix.patch =================================================================== --- tinysofa/snapshot/xsp/current/sources/xsp-0.16-extension-fix.patch 2004-07-01 15:43:26 UTC (rev 2696) +++ tinysofa/snapshot/xsp/current/sources/xsp-0.16-extension-fix.patch 2004-07-01 15:43:31 UTC (rev 2697) @@ -0,0 +1,12 @@ +diff -urN xsp-0.16/test/Makefile.am xsp-0.16.extension-fix/test/Makefile.am +--- xsp-0.16/test/Makefile.am 2004-06-22 17:20:46.000000000 +1000 ++++ xsp-0.16.extension-fix/test/Makefile.am 2004-06-25 02:14:40.372174416 +1000 +@@ -134,7 +134,7 @@ + -out:$@ $^ + + ServiceClient.exe: extensions.dll $(serviceclient_build) +- $(MCS) -r:System.Web.dll -r:System.Web.Services.dll -r:extensions.dll \ ++ $(MCS) -r:System.Web.dll -r:System.Web.Services.dll -r:./extensions.dll \ + -out:$@ \ + $(srcdir)/ServiceClient.cs $(srcdir)/Reference.cs + Added: tinysofa/snapshot/xsp/current/sources/xsp-0.16-nunit-asp.patch =================================================================== --- tinysofa/snapshot/xsp/current/sources/xsp-0.16-nunit-asp.patch 2004-07-01 15:43:26 UTC (rev 2696) +++ tinysofa/snapshot/xsp/current/sources/xsp-0.16-nunit-asp.patch 2004-07-01 15:43:31 UTC (rev 2697) @@ -0,0 +1,12 @@ +diff -urN xsp-0.16/tools/nunitasp/source/NUnitAspTest/Makefile.am xsp-0.16.nunit-asp-fix/tools/nunitasp/source/NUnitAspTest/Makefile.am +--- xsp-0.16/tools/nunitasp/source/NUnitAspTest/Makefile.am 2004-05-28 15:34:32.000000000 +1000 ++++ xsp-0.16.nunit-asp-fix/tools/nunitasp/source/NUnitAspTest/Makefile.am 2004-06-25 02:24:00.407036176 +1000 +@@ -57,7 +57,7 @@ + + NUnitAspTest.dll: $(nunitasptest_sources) + $(MCS) $(MCSFLAGS) -r:System.Web.dll -lib:../AspTest \ +- -r:NUnitAsp.dll -r:nunit.framework.dll \ ++ -r:../NUnitAsp/NUnitAsp.dll -r:nunit.framework.dll \ + -r:System.DirectoryServices.dll \ + -target:library -out:$@ $(files) + Added: tinysofa/snapshot/xsp/current/sources/xsp-0.16-nunit-tests.patch =================================================================== --- tinysofa/snapshot/xsp/current/sources/xsp-0.16-nunit-tests.patch 2004-07-01 15:43:26 UTC (rev 2696) +++ tinysofa/snapshot/xsp/current/sources/xsp-0.16-nunit-tests.patch 2004-07-01 15:43:31 UTC (rev 2697) @@ -0,0 +1,12 @@ +diff -urN xsp-0.16/nunit-tests/standalone/Makefile.am xsp-0.16.nunit-tests/nunit-tests/standalone/Makefile.am +--- xsp-0.16/nunit-tests/standalone/Makefile.am 2004-05-28 15:34:32.000000000 +1000 ++++ xsp-0.16.nunit-tests/nunit-tests/standalone/Makefile.am 2004-06-25 02:27:42.228314216 +1000 +@@ -18,7 +18,7 @@ + + # + REFS= -r:System.Web.dll -r:nunit.framework.dll \ +- -r:NUnitAsp.dll -r:nunit.core.dll -r:nunit.util.dll ++ -r:@top_srcdir@/tools/nunitasp/source/NUnitAsp/NUnitAsp.dll -r:nunit.core.dll -r:nunit.util.dll + + all: $(DLLNAME) + Added: tinysofa/snapshot/xsp/current/sources/xsp-1.0.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/xsp/current/sources/xsp-1.0.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/xsp/current/specs/xsp.spec =================================================================== --- tinysofa/snapshot/xsp/current/specs/xsp.spec 2004-07-01 15:43:26 UTC (rev 2696) +++ tinysofa/snapshot/xsp/current/specs/xsp.spec 2004-07-01 15:43:31 UTC (rev 2697) @@ -0,0 +1,70 @@ +Name: xsp +Version: 1.0 +Release: 1ts +Copyright: GPL +BuildRoot: %{_tmppath}/%{name}-%{version}-root +URL: http://www.go-mono.com +Source0: http://www.go-mono.org/archive/beta3/xsp-%{version}.tar.gz +Patch0: xsp-0.16-extension-fix.patch +Patch1: xsp-0.16-nunit-asp.patch +Patch2: xsp-0.16-nunit-tests.patch +BuildRequires: mono-web-forms +BuildRequires: mono-web-services +BuildRequires: mono-nunit +BuildRequires: mono-directory +Summary: The XSP server is a small web server that hosts ASP.NET. +Group: Development +Requires: mono-remoting +Requires: mono-web-forms +Requires: mono-web-services +Requires: mono-nunit +Requires: mono-directory + +%description +The XSP server is a small web server that hosts the Mono + System.Web classes for running what is commonly known as ASP.NET. + +%files +%defattr(-, root, root) +%doc NEWS README +/usr/share/doc/xsp/test/* +/usr/share/doc/xsp/test/bin/tabcontrol.dll +/usr/share/doc/xsp/test/bin/tabcontrol2.dll +/usr/share/doc/xsp/test/bin/codebehind1.dll +/usr/share/doc/xsp/test/bin/extensions.dll +/usr/lib/NUnitAsp.dll +/usr/bin/xsp.exe +/usr/share/man/man1/xsp.1* +/usr/bin/mod-mono-server.exe +/usr/bin/asp_state.exe +/usr/bin/asp_state.exe.config +/usr/bin/dbsessmgr.exe +/usr/bin/dbsessmgr.exe.config +/usr/share/man/man1/mod-mono-server.1* +/usr/share/man/man1/dbsessmgr.1* +/usr/share/man/man1/asp_state.1* + + +%prep +%setup -q -n xsp-%{version} +#%patch0 -p1 +#%patch1 -p1 +#%patch2 -p1 + +%build +libtoolize --force +aclocal --force +automake -a -c -f +autoconf -f + +./configure --prefix=/usr --sysconfdir=/etc --mandir=/usr/share/man --infodir=/usr/share/info --localstatedir=/var +make + +%install +rm -rf %{buildroot} +make DESTDIR=%{buildroot} install + +%clean +rm -rf %{buildroot} + +%changelog From svn at tinysofa.org Thu Jul 1 15:43:42 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:43:42 +1000 (EST) Subject: [tinysofa-svn] r2702 - tinysofa/snapshot/acl/current/specs Message-ID: <20040701154342.799B04E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:43:42 +1000 (Fri, 02 Jul 2004) New Revision: 2702 Modified: tinysofa/snapshot/acl/current/specs/acl.spec Log: - Sync with 2.0. - Kept: - acl-2.2.23.src.tar.gz: - acl-2.2.3-multilib.patch: Modified: tinysofa/snapshot/acl/current/specs/acl.spec =================================================================== --- tinysofa/snapshot/acl/current/specs/acl.spec 2004-07-01 15:43:38 UTC (rev 2701) +++ tinysofa/snapshot/acl/current/specs/acl.spec 2004-07-01 15:43:42 UTC (rev 2702) @@ -1,14 +1,15 @@ Summary: Access control list utilities. Name: acl Version: 2.2.23 -Release: 4ts +Release: 1ts BuildRoot: %{_tmppath}/%{name}-root -Source: http://mirrors.sunsite.dk/xfs/cmd_tars/%{name}-%{version}.src.tar.gz +BuildRequires: libattr-devel >= 2.4.1 +Source: http://acl.bestbits.at/current/tar/acl-%{version}.src.tar.gz Patch0: acl-2.2.3-multilib.patch +BuildRequires: autoconf License: GPL -Group: tinysofa official +Group: System Environment/Base URL: http://acl.bestbits.at/ -BuildRequires: libattr-devel gettext libtool autoconf %description This package contains the getfacl and setfacl utilities needed for @@ -16,9 +17,9 @@ %package -n libacl Summary: Dynamic library for access control list support. -Group: tinysofa official +Copyright: LGPL +Group: System Environment/Libraries Prereq: /sbin/ldconfig -Requires: libattr %description -n libacl This package contains the libacl.so dynamic library which contains @@ -27,11 +28,9 @@ %package -n libacl-devel Summary: Access control list static libraries and headers. -Group: tinysofa official +Copyright: LGPL +Group: Development/Libraries Requires: libacl -Requires: libattr-devel -Provides: acl-devel -Obsoletes: acl-devel %description -n libacl-devel This package contains static libraries and header files needed to develop @@ -50,7 +49,7 @@ make LIBTOOL="libtool --tag=CC" %install -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != "/" ] && rm -rf "$RPM_BUILD_ROOT" +rm -rf $RPM_BUILD_ROOT DIST_ROOT="$RPM_BUILD_ROOT" DIST_INSTALL=`pwd`/install.manifest DIST_INSTALL_DEV=`pwd`/install-dev.manifest @@ -73,10 +72,7 @@ if (match ($6, "/usr/share/man")) printf ("%%%%attr(%s,%s,%s) %s*\n", $2, $3, $4, $6); else - if (match ($6, "^/lib") || (match ($6, "^/usr/lib") && match ($6, "\.la"))) - printf ("%%%%attr(0755,%s,%s) %s\n", $3, $4, $6); - else - printf ("%%%%attr(%s,%s,%s) %s\n", $2, $3, $4, $6); } + printf ("%%%%attr(%s,%s,%s) %s\n", $2, $3, $4, $6); } $1 == "l" { if (match ($3, "/usr/share/man") || match ($3, "/usr/share/doc/acl")) printf ("%%%%doc "); if (match ($3, "/usr/share/man")) @@ -91,7 +87,7 @@ set -x %clean -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != "/" ] && rm -rf "$RPM_BUILD_ROOT" +rm -rf $RPM_BUILD_ROOT %post -n libacl -p /sbin/ldconfig @@ -106,25 +102,56 @@ /usr/include/acl %files -n libacl -f fileslib.rpm -%defattr(-,root,root) %changelog -* Wed May 19 2004 tsintegrate 2.2.23-4ts -- current (2.2.23-3ts) integrated as 2.2.23-4ts for release 1.0-U1 +* Wed Mar 31 2004 Stephen C. Tweedie 2.2.7-5 +- Add missing %defattr -* Thu May 13 2004 Omar Kilani -- Add BuildRequires autoconf. +* Tue Mar 30 2004 Stephen C. Tweedie 2.2.7-3 +- Add /usr/include/acl to files manifest +- Fix location of doc files, add main doc dir to files manifest -* Mon May 10 2004 Omar Kilani 2.2.23-3ts -- Add BuildRequires libtool, gettext. -- Fix files function to only match on lines starting with /lib. +* Tue Mar 02 2004 Elliot Lee +- rebuilt -* Sun May 09 2004 Omar Kilani 2.2.23-3ts -- Fixed library permissions. -- Add multiple *.la, *.a removal patch. +* Fri Feb 13 2004 Elliot Lee +- rebuilt -* Wed Apr 07 2004 Omar Kilani 2.2.23-1ts -- New upstream. +* Tue Aug 5 2003 Elliot Lee 2.2.7-2 +- Fix libtool invocation -* Mon Jan 26 2004 Erlend Midttun 2.2.22-1tr -- Initial release, based on official SGI rpm. \ No newline at end of file +* Tue Jun 3 2003 Stephen C. Tweedie 2.2.7-1 +- Update to acl-2.2.7 + +* Wed Mar 26 2003 Michael K. Johnson 2.2.3-2 +- include patch from Jay Berkenbilt to print better error messages + +* Tue Jan 28 2003 Michael K. Johnson 2.2.3-1 +- udpate/rebuild + +* Sat Jan 4 2003 Jeff Johnson 2.0.11-7 +- set execute bits on library so that requires are generated. + +* Tue Nov 19 2002 Elliot Lee 2.0.11-5 +- Correct patch in previous fix so that shared libraries go in /lib* + instead of /usr/lib* + +* Tue Nov 19 2002 Elliot Lee 2.0.11-4 +- Fix multilibbing + +* Wed Sep 11 2002 Than Ngo 2.0.11-3 +- Added fix to install libs in correct directory on 64bit machine + +* Thu Aug 08 2002 Michael K. Johnson 2.0.11-2 +- Made the package only own the one directory that is unique to it: + /usr/include/acl + +* Mon Jun 24 2002 Michael K. Johnson 2.0.11-1 +- Initial Red Hat package + Made as few changes as possible relative to upstream packaging to + make it easier to maintain long-term. This means that some of + the techniques used here are definitely not standard Red Hat + techniques. If you are looking for an example package to fit + into Red Hat Linux transparently, this would not be the one to + pick. +- acl-devel -> libacl-devel From svn at tinysofa.org Thu Jul 1 15:44:04 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:44:04 +1000 (EST) Subject: [tinysofa-svn] r2706 - in tinysofa/snapshot/authconfig/current: sources specs Message-ID: <20040701154404.108434E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:44:03 +1000 (Fri, 02 Jul 2004) New Revision: 2706 Added: tinysofa/snapshot/authconfig/current/sources/authconfig-4.6.3-1-tinysofa.patch tinysofa/snapshot/authconfig/current/sources/authconfig-4.6.3-1.tar.gz Removed: tinysofa/snapshot/authconfig/current/sources/authconfig-4.3.7.tar.gz Modified: tinysofa/snapshot/authconfig/current/specs/authconfig.spec Log: - Sync with 2.0. - Added: - authconfig-4.6.3-1-tinysofa.patch: - authconfig-4.6.3-1.tar.gz: - Removed: - authconfig-4.3.7.tar.gz: Deleted: tinysofa/snapshot/authconfig/current/sources/authconfig-4.3.7.tar.gz =================================================================== (Binary files differ) Added: tinysofa/snapshot/authconfig/current/sources/authconfig-4.6.3-1-tinysofa.patch =================================================================== --- tinysofa/snapshot/authconfig/current/sources/authconfig-4.6.3-1-tinysofa.patch 2004-07-01 15:44:00 UTC (rev 2705) +++ tinysofa/snapshot/authconfig/current/sources/authconfig-4.6.3-1-tinysofa.patch 2004-07-01 15:44:03 UTC (rev 2706) @@ -0,0 +1,91 @@ +diff -urN authconfig-4.6.3-1/Makefile.am authconfig-4.6.3-1.tinysofa/Makefile.am +--- authconfig-4.6.3-1/Makefile.am 2004-04-22 08:15:31.000000000 +1000 ++++ authconfig-4.6.3-1.tinysofa/Makefile.am 2004-06-09 15:24:11.000000000 +1000 +@@ -1,66 +1,35 @@ + SUBDIRS = po man + CONFIGURE_DEPENDENCIES = $(top_srcdir)/authconfig.spec + +- at INTLTOOL_DESKTOP_RULE@ +- + PYTHONREV=@PYTHONREV@ + pythonincdir = $(includedir)/python at PYTHONREV@ + pythonsitedir = $(libdir)/python at PYTHONREV@/site-packages + pamdir = $(sysconfdir)/pam.d + consoledir = $(sysconfdir)/security/console.apps + sysconfigdir = $(sysconfdir)/sysconfig +-applnkdir = $(sysconfdir)/X11/applnk/System +-startheredir = $(sysconfdir)/X11/sysconfig + + sbin_PROGRAMS = authconfig +-pkgdata_SCRIPTS = authconfig-gtk.py +-pkgdata_DATA = authconfig.glade + pythonsite_LTLIBRARIES = authconfigmodule.la + noinst_LTLIBRARIES = libauthconfig.la +-pixmapdir = $(datadir)/pixmaps +-pixmap_DATA = user_auth.png + + install-exec-local: + mkdir -p $(DESTDIR)/$(bindir) + ln -sf consolehelper $(DESTDIR)/$(bindir)/authconfig +- ln -sf consolehelper $(DESTDIR)/$(bindir)/authconfig-gtk +- ln -sf consolehelper $(DESTDIR)/$(bindir)/system-config-authentication + +-install-data-local: authconfig.desktop ++install-data-local: + mkdir -p $(DESTDIR)/$(pamdir) + mkdir -p $(DESTDIR)/$(consoledir) + mkdir -p $(DESTDIR)/$(sysconfigdir) +- mkdir -p $(DESTDIR)/$(applnkdir) +- mkdir -p $(DESTDIR)/$(startheredir) + $(INSTALL_DATA) $(srcdir)/authconfig.pamd $(DESTDIR)/$(pamdir)/authconfig +- $(INSTALL_DATA) $(srcdir)/authconfig-gtk.pamd $(DESTDIR)/$(pamdir)/authconfig-gtk +- $(INSTALL_DATA) $(srcdir)/authconfig-gtk.pamd $(DESTDIR)/$(pamdir)/system-config-authentication + $(INSTALL_DATA) $(srcdir)/authconfig.console $(DESTDIR)/$(consoledir)/authconfig +- $(INSTALL_DATA) $(srcdir)/authconfig-gtk.console $(DESTDIR)/$(consoledir)/authconfig-gtk +- $(INSTALL_DATA) $(srcdir)/authconfig-gtk.console $(DESTDIR)/$(consoledir)/system-config-authentication + touch $(DESTDIR)/$(sysconfigdir)/authconfig +- mkdir -p $(DESTDIR)/$(datadir)/applications +- desktop-file-install --vendor redhat \ +- --add-category=X-Red-Hat-Base \ +- --add-category=Application \ +- --add-category=System \ +- --dir=$(DESTDIR)$(datadir)/applications \ +- authconfig.desktop + + uninstall-local: + $(RM) $(DESTDIR)/$(bindir)/authconfig +- $(RM) $(DESTDIR)/$(bindir)/authconfig-gtk +- $(RM) $(DESTDIR)/$(bindir)/system-config-authentication + $(RM) $(DESTDIR)/$(pamdir)/authconfig +- $(RM) $(DESTDIR)/$(pamdir)/authconfig-gtk +- $(RM) $(DESTDIR)/$(pamdir)/system-config-authentication + $(RM) $(DESTDIR)/$(consoledir)/authconfig +- $(RM) $(DESTDIR)/$(consoledir)/authconfig-gtk +- $(RM) $(DESTDIR)/$(consoledir)/system-config-authentication + $(RM) $(DESTDIR)/$(sysconfigdir)/authconfig + $(RM) $(DESTDIR)$(pkgdatadir)/*.pyc +- rmdir $(DESTDIR)/$(applnkdir) +- rmdir $(DESTDIR)/$(startheredir) + rmdir $(DESTDIR)/$(bindir) + rmdir $(DESTDIR)/$(pamdir) + rmdir $(DESTDIR)/$(consoledir) +@@ -84,7 +53,7 @@ + authconfigmodule_la_LIBADD = libauthconfig.la + authconfigmodule_la_LDFLAGS = -module -avoid-version -export-dynamic @GLIB_LIBS@ @LDFLAGS@ + +-EXTRA_DIST = authconfig.spec authconfig.pamd authconfig-gtk.pamd authconfig.console authconfig-gtk.console authconfig.desktop.in authconfig-gtk.py authconfig.glade man/en/authconfig.8 NOTES utf8ify-mo intltool-extract.in intltool-merge.in intltool-update.in user_auth.png README.samba3 mkinstalldirs glade.strings.h ++EXTRA_DIST = authconfig.spec authconfig.pamd authconfig.console man/en/authconfig.8 NOTES utf8ify-mo intltool-extract.in intltool-merge.in intltool-update.in user_auth.png README.samba3 mkinstalldirs glade.strings.h + DISTCLEANFILES = intltool-extract intltool-merge intltool-update authconfig.desktop + + VERSION=$(shell rpm -q --specfile $(top_srcdir)/authconfig.spec --qf '%{version}\n' | head -n1) +diff -urN authconfig-4.6.3-1/configure.in authconfig-4.6.3-1.tinysofa/configure.in +--- authconfig-4.6.3-1/configure.in 2003-11-11 02:41:28.000000000 +1100 ++++ authconfig-4.6.3-1.tinysofa/configure.in 2004-06-09 15:24:18.000000000 +1000 +@@ -5,7 +5,6 @@ + ALL_LINGUAS="bs cs da de el es fi fr gl hr hu id is it ja ko ms nl nn no pl pt_BR pt ro ru sk sl sr sv tr uk vi wa zh_CN zh_TW" + AM_GLIB_GNU_GETTEXT + AM_PROG_LIBTOOL +-AC_PROG_INTLTOOL + PKG_CHECK_MODULES(GLIB,glib-2.0) + + GETTEXT_PACKAGE='$(PACKAGE)' Added: tinysofa/snapshot/authconfig/current/sources/authconfig-4.6.3-1.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/authconfig/current/sources/authconfig-4.6.3-1.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: tinysofa/snapshot/authconfig/current/specs/authconfig.spec =================================================================== --- tinysofa/snapshot/authconfig/current/specs/authconfig.spec 2004-07-01 15:44:00 UTC (rev 2705) +++ tinysofa/snapshot/authconfig/current/specs/authconfig.spec 2004-07-01 15:44:03 UTC (rev 2706) @@ -1,92 +1,522 @@ Summary: Text-mode tool for setting up NIS and shadow passwords. Name: authconfig -Version: 4.3.7 -Release: 2ts +Version: 4.6.3 +Release: 1ts License: GPL ExclusiveOS: Linux -Group: tinysofa official +Group: System Environment/Base BuildRoot: %{_tmppath}/%{name}-root -Source: %{name}-%{version}.tar.gz -Requires: gcc-c++-runtime -BuildRequires: python, newt -BuildRequires: pkgconfig, glib, glib-devel, python-devel, newt-devel -BuildRequires: gcc-c++-devel +Source: %{name}-%{version}-1.tar.gz +# tinysofa: disable gtk and intltool +Patch: authconfig-4.6.3-1-tinysofa.patch +Requires: glibc >= 2.1, pam >= 0.73, glib2, pam >= 0.75-43 +Conflicts: pam_krb5 < 1.49, samba-common < 3.0, samba-client < 3.0 +BuildPrereq: pam-devel >= 0.73, newt-devel, glib2-devel, python, python-devel +Requires: usermode %description -Authconfig is a terminal mode program for setting up Network -Information Service (NIS) and shadow (more secure) passwords -on your system. Authconfig also configures the system to -automatically turn on NIS at system startup. +Authconfig is a terminal mode program which can configure a workstation +to use shadow (more secure) passwords. Authconfig can also configure a +system to be a client for certain networked user information and +authentication schemes. %prep -%setup -q +%setup -q -n %{name}-%{version}-1 +%patch -p1 %build -CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr \ - --mandir=$RPM_BUILD_ROOT/%{_mandir} - +CFLAGS="$RPM_OPT_FLAGS -fPIC"; export CFLAGS +libtoolize --force +aclocal --force +automake -a -c -f +autoconf -f +%configure make %install -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != "/" ] && rm -rf "$RPM_BUILD_ROOT" -make DESTDIR=$RPM_BUILD_ROOT install-exec -pushd man -make install -popd +rm -rf $RPM_BUILD_ROOT +make install DESTDIR=$RPM_BUILD_ROOT +rm $RPM_BUILD_ROOT/%{_libdir}/python*/site-packages/authconfigmodule.a +rm $RPM_BUILD_ROOT/%{_libdir}/python*/site-packages/authconfigmodule.la -mkdir -p $RPM_BUILD_ROOT/etc/pam.d -install -m644 authconfig.pamd $RPM_BUILD_ROOT/etc/pam.d/authconfig +%find_lang %{name} +find $RPM_BUILD_ROOT%{_datadir} -name "*.mo" | xargs ./utf8ify-mo %clean -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT +rm -rf $RPM_BUILD_ROOT -%files +%files -f %{name}.lang %defattr(-,root,root) -%doc NOTES TODO -%config(noreplace) %{_sysconfdir}/pam.d/authconfig +%doc NOTES TODO README.samba3 +%ghost %config(noreplace) %{_sysconfdir}/sysconfig/authconfig +%{_bindir}/authconfig %{_sbindir}/authconfig %{_mandir}/man8/* +%{_libdir}/python*/site-packages/authconfigmodule.so +%config(noreplace) %{_sysconfdir}/pam.d/authconfig +%config(noreplace) %{_sysconfdir}/security/console.apps/authconfig %changelog -* Wed May 19 2004 tsintegrate 4.3.7-2ts -- current (4.3.7-1ts) integrated as 4.3.7-2ts for release 1.0-U1 +* Tue May 11 2004 Nalin Dahyabhai 4.6.3-1 +- omit the "ads" or "rpc" when calling "net join", Samba's smarter now (#122802) +- properly warn about missing "net" (samba-client) and libnss_winbind and + pam_winbind (samba-common) in text mode (#122802) -* Tue May 11 2004 Omar Kilani 4.3.7-1ts -- Add Requires gcc-c++-runtime. -- Add BuildRequires gcc-c++-devel. -- Add BuildRequires python (for SWIG). -- Add BuildRequires newt. +* Wed Apr 21 2004 Nalin Dahyabhai 4.6.2-1 +- learn all about pam_passwdqc +- preserve arguments to pam_cracklib and pam_passwdqc +- short-circuit PAM authorization checks for users with UID < 100 +- remove redhat-config-authentication as a way to invoke the GUI tool (#115977) -* Wed Apr 07 2004 Omar Kilani 4.3.7-1ts -- New upstream from Red Hat Enterprise. +* Fri Feb 6 2004 Nalin Dahyabhai 4.6.1-1 +- fix man page: --enableldapssl should be --enableldaptls +- make --enableldapssl an alias for --enableldaptls -* Wed Dec 3 2003 Erlend Midttun 4.2.12-7tr -- Big rebuild +* Thu Jan 8 2004 Nalin Dahyabhai 4.6-1 +- authconfig-gtk.py: require rhpl, which is required by the script (#104209) +- both: require usermode (authconfig-gtk transitively), else leave a dangling + symlink (#104209) +- the great redhat-config-authentication/system-config-authentication renaming, + as was foretold in the fedora-config-list archives -* Wed Jun 18 2003 Erlend Midttun 4.2.12-6tr -- Big rebuild +* Wed Jan 7 2004 Nalin Dahyabhai +- preserve "compat" if it's used in /etc/nsswitch.conf -* Tue Jun 3 2003 Erlend Midttun 4.2.12-5em -- Cleanup. +* Tue Nov 18 2003 Nalin Dahyabhai 4.4-1 +- add options for toggling krb5's use of DNS -* Mon Mar 24 2003 Erlend Midttun 4.2.12-4em -- Rebuilt against glibc 2.3.2. +* Mon Nov 17 2003 Nalin Dahyabhai +- rework tui to include winbind options. there wasn't enough room in the old + dialog to include the important options, so the whole thing's been reworked -* Wed Nov 13 2002 Roland Kruse 4.2.12-3rk -- Re-applied Gerald's nokrb5 patch +* Thu Nov 13 2003 Nalin Dahyabhai +- conflict with older versions of samba which expect different configuration -* Sun Oct 20 2002 Goetz Bock 4.2.12-2bg -- need some more .*-devel to build +* Mon Nov 10 2003 Nalin Dahyabhai +- initial support for configuring winbind -* Fri Sep 20 2002 Gerald Dachs 4.2.12-1gd -- new upstream version 4.2.12 +* Tue Oct 28 2003 Nalin Dahyabhai +- make pam_cracklib requisite instead of required in generated PAM configs -* Tue Sep 12 2000 Erlend Midttun -- Upgraded to 3.0.3 +* Wed Oct 22 2003 Bill Nottingham 4.3.8-1 +- rebuild with current translations -* Mon Feb 28 2000 Lars Gaarden -- moved man pages to /usr/share/man, FHS +* Thu Aug 21 2003 Nalin Dahyabhai 4.3.7-2 +- make the tarball name include the release number +* Thu Aug 21 2003 Nalin Dahyabhai 4.3.7-1 +- authconfig-gtk: condrestart certain additional services if invoked with + the --firstboot flag (half of #91268, needs cooperating firstboot) +- translation updates + +* Mon Jul 7 2003 Nalin Dahyabhai 4.3.6-1 +- translation updates + +* Mon Jun 30 2003 Nalin Dahyabhai +- add 'redhat-config-authentication' as an alias for authconfig-gtk +- make authconfig-gtk exec authconfig if gui startup fails and it looks like + we're connected to a tty + +* Thu Jun 05 2003 Elliot Lee +- rebuilt + +* Mon May 5 2003 Nalin Dahyabhai 4.3.5-1 +- translation updates +- close unusable file descriptors if locking fails + +* Tue Feb 18 2003 Nalin Dahyabhai 4.3.4-1 +- learn how to toggle defaults/crypt_style in /etc/libuser.conf (#79337) + +* Fri Feb 7 2003 Nalin Dahyabhai 4.3.3-1 +- look in /lib64 for modules for nsswitch and PAM by default on + x86_64, ppc64, and s390x (#83049) + +* Wed Jan 22 2003 Tim Powers +- rebuilt + +* Mon Nov 4 2002 Nalin Dahyabhai 4.3.2-1 +- update translations +- update copyright strings (only took 10 months!) + +* Wed Oct 23 2002 Nalin Dahyabhai 4.3.1-1 +- require a version of PAM (0.75-43) which supports $ISA +- use $ISA in our own PAM config files + +* Tue Oct 22 2002 Nalin Dahyabhai +- add $ISA to the name of the directory in which we expect PAMs to be stored + +* Fri Sep 20 2002 Nalin Dahyabhai 4.3-1 +- build with -fPIC, necessary on some arches + +* Tue Sep 3 2002 Nalin Dahyabhai 4.2.11-3 +- update translations + +* Thu Aug 29 2002 Trond Eivind Glomsr?d 4.2.12-2 +- Update translations + +* Fri Aug 23 2002 Nalin Dahyabhai 4.2.11-1 +- modify spacing and layout in authconfig-gtk + +* Thu Aug 15 2002 Nalin Dahyabhai 4.2.10-4 +- translation updates +- rebuild to pick up dependency changes + +* Mon Jul 29 2002 Nalin Dahyabhai 4.2.10-3 +- include the userhelper configuration file +- require sufficiently-new pam package in the gui subpackage + +* Fri Jul 26 2002 Nalin Dahyabhai 4.2.10-2 +- actually include the icon in the package +- translation updates + +* Tue Jul 23 2002 Nalin Dahyabhai 4.2.10-1 +- use desktop-file-install (#69376) +- include an icon for the menu item (#68577) + +* Wed Jul 17 2002 Nalin Dahyabhai 4.2.9-2 +- own the pkgdatadir +- pull in translation updates + +* Mon Jun 3 2002 Nalin Dahyabhai 4.2.9-1 +- add --enable-experimental to enable some of that experimental code +- add --enable-local to enable local policies +- update translations + +* Thu May 30 2002 Nalin Dahyabhai 4.2.8-7 +- use the current revision of python by default +- get the intltool/gettext situation sorted out + +* Thu May 23 2002 Tim Powers +- automated rebuild + +* Fri May 3 2002 Nalin Dahyabhai 4.2.8-5 +- remove bogus buildrequires left over from when authconfig-gtk was C code +- buildrequires python-devel in addition to python (to build the python module, + but we still need python to byte-compile the python script) + +* Thu Apr 18 2002 Nalin Dahyabhai 4.2.8-4 +- add missing translations back in +- convert .mo files at install-time + +* Mon Apr 15 2002 Nalin Dahyabhai 4.2.8-3 +- refresh translations + +* Wed Apr 10 2002 Nalin Dahyabhai 4.2.8-2 +- actually add the .desktop files + +* Tue Apr 9 2002 Nalin Dahyabhai 4.2.8-1 +- refresh translations +- destroy the python object correctly + +* Tue Mar 26 2002 Nalin Dahyabhai 4.2.7-2 +- add the .desktop file + +* Mon Mar 25 2002 Nalin Dahyabhai 4.2.7-1 +- rework the auth stack logic to require all applicable auth modules + +* Fri Mar 1 2002 Nalin Dahyabhai 4.2.6-1 +- allow pam_krb5afs to be used for account management, too + +* Mon Feb 25 2002 Nalin Dahyabhai 4.2.5-3 +- refresh translations + +* Fri Feb 22 2002 Nalin Dahyabhai 4.2.5-2 +- refresh translations + +* Tue Feb 12 2002 Nalin Dahyabhai 4.2.5-1 +- actually free authInfo structures when asked to +- use pam_krb5's account management facilities +- conflict with versions of pam_krb5 which don't offer account management + +* Mon Feb 4 2002 Nalin Dahyabhai 4.2.4-1 +- add python bindings for the back-end +- redo the gui so that it exercises the python bindings +- take a shot at getting authconfig to work in a firstboot container + +* Thu Jan 31 2002 Nalin Dahyabhai 4.2.3-4 +- rebuild again + +* Wed Jan 30 2002 Tim Powers 4.2.3-3 +- rebuilt against new glib + +* Wed Jan 23 2002 Nalin Dahyabhai 4.2.3-2 +- rebuild in new environment + +* Thu Jan 10 2002 Nalin Dahyabhai 4.2.3-1 +- add some more experimental options +- clean up the glade files a bit +- don't destroy a garbage pointer on main cancel, destroy the main dialog + +* Thu Jan 3 2002 Nalin Dahyabhai 4.2.2-2 +- bump release and rebuild + +* Thu Dec 20 2001 Nalin Dahyabhai 4.2.2-1 +- make setting of experimental options only possible through + /etc/sysconfig/authconfig, to keep accidents from happening +- add some more support for experimental stuff + +* Tue Dec 11 2001 Nalin Dahyabhai 4.2.1-1 +- fix setting of LDAP TLS option in authconfig-gtk +- change Apply to Ok, Close to Cancel, because that's how they work + +* Tue Dec 11 2001 Nalin Dahyabhai 4.2-2 +- add the glade XML file to the -gtk subpackage (fix from katzj) + +* Mon Dec 10 2001 Nalin Dahyabhai 4.2-1 +- port to glib2 +- move post code to the back-end +- add a libglade GUI in a -gtk subpackage +- set up to use userhelper + +* Tue Nov 27 2001 Nalin Dahyabhai +- remove pam_winbind from the list of session modules, because it doesn't + provide a session-management interface + +* Mon Sep 24 2001 Nalin Dahyabhai 4.1.20-1 +- make pam_localuser sufficient after pam_unix in account management, to allow + local users in even if network connections to the LDAP directory are down (the + network users should fail when pam_ldap returns a system error) + +* Thu Sep 6 2001 Nalin Dahyabhai 4.1.19-1 +- translation refresh + +* Tue Aug 28 2001 Nalin Dahyabhai +- fix assertion error hitting glib (#51798) +- allow multiple ldap servers to be specified (#49864) + +* Fri Aug 24 2001 Nalin Dahyabhai 4.1.18-1 +- pam_ldap shouldn't be a mandatory module (#52531) +- refresh translations + +* Thu Aug 23 2001 Nalin Dahyabhai 4.1.17-1 +- make pam_ldap required for account management when ldapauth is enabled + (this requires pam_ldap 114 or later, but simplifies things) +- more translation updates + +* Wed Aug 22 2001 Nalin Dahyabhai 4.1.16-1 +- warn about nscd the same way we do about nss_ldap and pam_krb5 +- reorder some internal code so that it's easier to maintain +- change help string about the --probe option to make it clearer that using + it doesn't actually set any options +- update translations from CVS + +* Tue Aug 21 2001 Nalin Dahyabhai 4.1.15-1 +- set "pam_password md5" instead of "pam_password crypt" in ldap.conf if MD5 + is enabled + +* Mon Aug 20 2001 Nalin Dahyabhai 4.1.14-1 +- right justify labels, and remove padding + +* Fri Aug 17 2001 Nalin Dahyabhai +- update translations from CVS, fixing #51873 + +* Thu Aug 16 2001 Nalin Dahyabhai +- set "pam_password crypt" in ldap.conf if not previously set +- update translations + +* Mon Aug 6 2001 Nalin Dahyabhai +- don't mess with krb4 config files if we have no realm +- update translations + +* Mon Jul 30 2001 Nalin Dahyabhai +- use USESHADOW, USENIS, USEHESIOD, and USESMBAUTH variables to + /etc/sysconfig/authconfig +- update translations + +* Mon Jul 9 2001 Nalin Dahyabhai +- add "type=" to the list of arguments set up for pam_cracklib +- also modify /etc/krb.conf when configuring Kerberos (for compatibility) +- add --enablecache and --disablecache, which duplicates some of ntsysv's + functionality, but it belongs here, too +- bravely try to carry on if bad options are passed in during kickstart + +* Mon Jun 25 2001 Nalin Dahyabhai +- fix man page reference to file (/etc/sysconfig/authconfig, not auth) (#43344) +- own /etc/sysconfig/authconfig (#43344) +- fix spelling errors in Japanese message files (#15984) + +* Tue Jun 12 2001 Nalin Dahyabhai +- rename --{enable,disable}smb to --{enable,disable}smbauth + +* Thu May 31 2001 Nalin Dahyabhai +- add --probe option to guess at LDAP and Kerberos configuration using DNS +- add preliminary support for SMB authentication + +* Wed Feb 14 2001 Preston Brown +- final translation update. +- langify + +* Mon Feb 12 2001 Nalin Dahyabhai +- errors connecting to LDAP also trigger service_err returns, so ignore on + those as well + +* Fri Feb 9 2001 Nalin Dahyabhai +- handle the case where the user doesn't specify a Kerberos realm, but + enables it anyway +- update translations + +* Wed Feb 7 2001 Nalin Dahyabhai +- remove pam_access from the default configuration -- swat, pop, imap, etc. + don't define a tty and pam_access bails if one isn't set + +* Tue Feb 6 2001 Nalin Dahyabhai +- ignore on errors connecting to LDAP servers when doing LDAP account mgmt + (probably less secure, but it allows root to log in when a wrong server + name has been specified or the server is down) + +* Mon Feb 5 2001 Nalin Dahyabhai +- make account management in system-auth be an AND operation, but ignore + user_unknown status for pam_ldap account management so that local root + can log in (#26029) +- add pam_access and pam_env (#16170) to default configuration + +* Tue Jan 24 2001 Preston Brown +- final translation update before Beta + +* Tue Jan 24 2001 Nalin Dahyabhai +- update translations +- make the entry fields on the second screen just a *little* bit smaller + +* Fri Jan 12 2001 Nalin Dahyabhai +- really fix #23016 this time +- add buildprereqs on pam-devel, newt-devel, and glib-devel + +* Wed Jan 10 2001 Nalin Dahyabhai +- match nss_ldap change of flag definitions for "ssl" flag ("on"=>"start_tls") +- change the "nothing-enabled" default so that we don't mistakenly think that + NIS is enabled later on when it isn't supposed to be (#23327) +- only enable LDAP-related entry stuff on the appropriate screens (#23328) + +* Sat Dec 30 2000 Nalin Dahyabhai +- make the copyright message translateable (#23016) + +* Fri Dec 29 2000 Nalin Dahyabhai +- split the one big help message into multiple help messages (#23017) + +* Wed Dec 12 2000 Nalin Dahyabhai +- don't write out configuration files for NIS, LDAP, Kerberos, Hesiod unless + they're enabled when the user quits (we always write NSS, PAM, network) + +* Fri Dec 8 2000 Nalin Dahyabhai +- make the internal code reflect the external use of "tls" instead of "ssl" + +* Thu Dec 7 2000 Nalin Dahyabhai +- add support for toggling TLS on and off in /etc/ldap.conf + +* Wed Nov 29 2000 Nalin Dahyabhai +- don't bother with USESHADOW; testing for /etc/shadow is sufficient +- use newtGrids to make NLS text fit (mostly) +- also edit "hosts:" to make sure it's there if nsswitch.conf is gone or broken +- preserve use of "db" and "nisplus" sources, even though we don't set them up + +* Mon Nov 27 2000 Nalin Dahyabhai +- add the "nis" flag to pam_unix when NIS is enabled + +* Wed Oct 4 2000 Nalin Dahyabhai +- read/write to /etc/syconfig/authconfig for PAM setup information + +* Tue Aug 29 2000 Nalin Dahyabhai +- don't set "shadow" or "md5" for authentication with pam_unix, they're + not needed (remove for clarity) +- add an authInfoCopy() routine to authinfo.c + +* Mon Aug 28 2000 Nalin Dahyabhai +- edit /etc/openldap/ldap.conf in addition to /etc/ldap.conf + +* Thu Aug 24 2000 Erik Troan +- updated it and es translations + +* Sun Aug 20 2000 Matt Wilson +- new translations + +* Wed Aug 9 2000 Nalin Dahyabhai +- merge in new translations + +* Tue Aug 8 2000 Nalin Dahyabhai +- add better error reporting for when Bill runs this on a read-only filesystem + +* Fri Aug 4 2000 Nalin Dahyabhai +- change nss order from (hesiod,ldap,nis) to (nis,ldap,hesiod) in case shadow + is in use +- kick nscd when we quit if it's running (and obey --nostart) + +* Mon Jul 31 2000 Nalin Dahyabhai +- silently support the broken_shadow and bigcrypt flags for pam_unix +- only shut down ypbind if /var/run/ypbind exists + +* Thu Jul 27 2000 Nalin Dahyabhai +- break some translations again + +* Wed Jul 26 2000 Matt Wilson +- new translations for de fr it es + +* Fri Jul 21 2000 Nalin Dahyabhai +- fix bug parsing NIS server names when there aren't any + +* Thu Jul 13 2000 Nalin Dahyabhai +- also modify the services, protocols, and automount in nsswitch.conf +- add netgroups, too (#13824) + +* Tue Jun 27 2000 Nalin Dahyabhai +- add --disable options +- try to not mess with ypbind if it isn't installed + +* Tue Jun 20 2000 Nalin Dahyabhai +- tweak chkconfig magic for ypbind to work better +- turn on portmap when ypbind is enabled + +* Mon Jun 19 2000 Nalin Dahyabhai +- only do chkconfig magic on ypbind if the ypbind init script exists + +* Tue Jun 13 2000 Nalin Dahyabhai +- fix multiple-blank-line problem +- verify that NISDOMAIN is recorded properly in /etc/sysconfig/network + +* Sat Jun 10 2000 Nalin Dahyabhai +- add calls to pam_limits in shared session stack + +* Wed Jun 7 2000 Nalin Dahyabhai +- fix multiple realms section bug +- close all files we open +- bail on errors, even when we can see the file +- use RPM_OPT_FLAGS +- support multiple NIS servers +- warn if needed files aren't there + +* Mon Jun 5 2000 Nalin Dahyabhai +- fix for false-matching beginnings of realm subsections +- FHS fixes + +* Thu Jun 1 2000 Nalin Dahyabhai +- move default system-auth configuration to pam package + +* Wed May 31 2000 Nalin Dahyabhai +- add default system-auth configuration + +* Tue May 30 2000 Nalin Dahyabhai +- fix the uncommented comment problem +- pam_krb5 doesn't provide account management +- base DN can have spaces in it +- use pam_krb5afs for krb5 if /afs is readable +- add the tokens flag to pam_krb5afs +- break (user info and auth setup) into two screens + +* Fri May 26 2000 Nalin Dahyabhai +- finish LDAP support +- add Kerberos 5 support +- add Hesiod support +- migrate PAM config file logic to new method + +* Wed Mar 08 2000 Cristian Gafton +- rebuild for release + +* Wed Feb 16 2000 Preston Brown +- disable LDAP, update man page. + +* Thu Feb 03 2000 Preston Brown +- beginning of /etc/pam.d writing, better man page, broadcast on by default. +- strip man page. + * Tue Jan 11 2000 Preston Brown - support for LDAP authentication added. @@ -147,4 +577,4 @@ - MD5 passwords do not require shadow passwords, so made them independent * Wed Feb 03 1999 Preston Brown -- initial spec file \ No newline at end of file +- initial spec file From svn at tinysofa.org Thu Jul 1 15:43:58 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:43:58 +1000 (EST) Subject: [tinysofa-svn] r2704 - in tinysofa/snapshot/ash/current: sources specs Message-ID: <20040701154358.B3D904E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:43:58 +1000 (Fri, 02 Jul 2004) New Revision: 2704 Added: tinysofa/snapshot/ash/current/sources/ash-0.3.8-for.patch tinysofa/snapshot/ash/current/sources/ash-0.3.8-gnu.patch tinysofa/snapshot/ash/current/sources/ash-0.3.8-history-man.patch tinysofa/snapshot/ash/current/sources/ash-0.3.8-mannewline.patch tinysofa/snapshot/ash/current/sources/ash-0.3.8-segv.patch tinysofa/snapshot/ash/current/sources/ash-0.3.8-tempfile.patch tinysofa/snapshot/ash/current/sources/ash_0.3.8-38.diff.gz tinysofa/snapshot/ash/current/sources/ash_0.3.8.orig.tar.gz Removed: tinysofa/snapshot/ash/current/sources/ash-0.2-make.patch tinysofa/snapshot/ash/current/sources/ash-echo.patch tinysofa/snapshot/ash/current/sources/ash-fd.patch tinysofa/snapshot/ash/current/sources/ash-linux-0.2-glibc21.patch tinysofa/snapshot/ash/current/sources/ash-linux-0.2.tar.gz Modified: tinysofa/snapshot/ash/current/specs/ash.spec Log: - Sync with 2.0. - Added: - ash-0.3.8-for.patch: - ash-0.3.8-gnu.patch: - ash-0.3.8-history-man.patch: - ash-0.3.8-mannewline.patch: - ash-0.3.8-segv.patch: - ash-0.3.8-tempfile.patch: - ash_0.3.8-38.diff.gz: - ash_0.3.8.orig.tar.gz: - Removed: - ash-0.2-make.patch: - ash-echo.patch: - ash-fd.patch: - ash-linux-0.2-glibc21.patch: - ash-linux-0.2.tar.gz: Deleted: tinysofa/snapshot/ash/current/sources/ash-0.2-make.patch =================================================================== --- tinysofa/snapshot/ash/current/sources/ash-0.2-make.patch 2004-07-01 15:43:53 UTC (rev 2703) +++ tinysofa/snapshot/ash/current/sources/ash-0.2-make.patch 2004-07-01 15:43:58 UTC (rev 2704) @@ -1,44 +0,0 @@ ---- ash-linux-0.2/Makefile.orig Mon Oct 4 14:48:13 1993 -+++ ash-linux-0.2/Makefile Mon Aug 25 11:35:21 1997 -@@ -1,5 +1,3 @@ --# Makefile,v 1.7 1993/08/09 04:58:18 mycroft Exp -- - PROG= sh - SRCS= builtins.c cd.c dirent.c bltin/echo.c error.c eval.c exec.c expand.c \ - input.c jobs.c mail.c main.c memalloc.c miscbltin.c \ -@@ -14,15 +12,15 @@ - - OBJS = $(OBJ1) $(OBJ2) - --CFLAGS = -O2 -fomit-frame-pointer -m486 -DSHELL -I/usr/include/bsd -I. --LDFLAGS = -s -lbsd -+CFLAGS = $(RPM_OPT_FLAGS) -DSHELL -I/usr/include/bsd -I. -D__BIT_TYPES_DEFINED__ -+LDFLAGS += -s -lbsd - - CLEANFILES =\ - builtins.c builtins.h init.c mkinit mknodes mksyntax \ - nodes.c nodes.h syntax.c syntax.h token.def - - all: $(OBJS) -- $(CC) -o $(PROG) $(OBJS) $(LDFLAGS) -+ $(CC) $(STATIC) -o $(PROG) $(OBJS) $(LDFLAGS) - - install: all - install sh /bin/ash -@@ -32,7 +30,7 @@ - token.def: mktokens - sh ./mktokens - --builtins.h builtins.c: mkbuiltins builtins -+builtins.h builtins.c: mkbuiltins - sh ./mkbuiltins - - init.c: mkinit $(SRCS) -@@ -56,4 +54,7 @@ - - clean: - rm -f core $(CLEANFILES) $(PROG) $(OBJS) -+ -+.c.o: -+ ${CC} ${CFLAGS} -o $@ -c $< - Added: tinysofa/snapshot/ash/current/sources/ash-0.3.8-for.patch =================================================================== --- tinysofa/snapshot/ash/current/sources/ash-0.3.8-for.patch 2004-07-01 15:43:53 UTC (rev 2703) +++ tinysofa/snapshot/ash/current/sources/ash-0.3.8-for.patch 2004-07-01 15:43:58 UTC (rev 2704) @@ -0,0 +1,41 @@ +diff -ur ash-0.3.8.orig/parser.c ash-0.3.8.lhh/parser.c +--- ash-0.3.8.orig/parser.c 2003-08-14 13:10:57.000000000 -0400 ++++ ash-0.3.8.lhh/parser.c 2003-08-14 13:09:57.000000000 -0400 +@@ -345,7 +345,8 @@ + checkkwd = CHKKWD | CHKALIAS; + break; + } +- case TFOR: ++ case TFOR: { ++ int got, x; + if (readtoken() != TWORD || quoteflag || ! goodname(wordtext)) + synerror("Bad for loop variable"); + n1 = (union node *)stalloc(sizeof (struct nfor)); +@@ -381,13 +382,24 @@ + tokpushback++; + } + checkkwd = CHKNL | CHKKWD | CHKALIAS; +- if (readtoken() != TDO) ++ got = readtoken(); ++ if (got == TDO) ++ x = TDONE; ++ else if (got == TBEGIN) ++ x = TEND; ++ else { ++ checkkwd = CHKKWD | CHKALIAS; + synexpect(TDO); ++ break; ++ } + n1->nfor.body = list(0); +- if (readtoken() != TDONE) +- synexpect(TDONE); ++ if (readtoken() != x) { ++ checkkwd = CHKKWD | CHKALIAS; ++ synexpect(x); ++ } + checkkwd = CHKKWD | CHKALIAS; + break; ++ } + case TCASE: + n1 = (union node *)stalloc(sizeof (struct ncase)); + n1->type = NCASE; Added: tinysofa/snapshot/ash/current/sources/ash-0.3.8-gnu.patch =================================================================== --- tinysofa/snapshot/ash/current/sources/ash-0.3.8-gnu.patch 2004-07-01 15:43:53 UTC (rev 2703) +++ tinysofa/snapshot/ash/current/sources/ash-0.3.8-gnu.patch 2004-07-01 15:43:58 UTC (rev 2704) @@ -0,0 +1,237 @@ +diff -ur ash-0.3.8.clean/arith.y ash-0.3.8.orig/arith.y +--- ash-0.3.8.clean/arith.y 2003-08-06 14:58:38.000000000 -0400 ++++ ash-0.3.8.orig/arith.y 2003-08-06 15:54:27.000000000 -0400 +@@ -77,43 +77,43 @@ + %left ARITH_UNARYMINUS ARITH_UNARYPLUS ARITH_NOT ARITH_BNOT + %% + +-exp: expr = { ++exp: expr { + return ($1); + } + ; + + +-expr: ARITH_LPAREN expr ARITH_RPAREN = { $$ = $2; } +- | expr ARITH_OR expr = { $$ = $1 || $3; } +- | expr ARITH_AND expr = { $$ = $1 && $3; } +- | expr ARITH_BOR expr = { $$ = $1 | $3; } +- | expr ARITH_BXOR expr = { $$ = $1 ^ $3; } +- | expr ARITH_BAND expr = { $$ = $1 & $3; } +- | expr ARITH_EQ expr = { $$ = $1 == $3; } +- | expr ARITH_GT expr = { $$ = $1 > $3; } +- | expr ARITH_GE expr = { $$ = $1 >= $3; } +- | expr ARITH_LT expr = { $$ = $1 < $3; } +- | expr ARITH_LE expr = { $$ = $1 <= $3; } +- | expr ARITH_NE expr = { $$ = $1 != $3; } +- | expr ARITH_LSHIFT expr = { $$ = $1 << $3; } +- | expr ARITH_RSHIFT expr = { $$ = $1 >> $3; } +- | expr ARITH_ADD expr = { $$ = $1 + $3; } +- | expr ARITH_SUB expr = { $$ = $1 - $3; } +- | expr ARITH_MUL expr = { $$ = $1 * $3; } +- | expr ARITH_DIV expr = { ++expr: ARITH_LPAREN expr ARITH_RPAREN { $$ = $2; } ++ | expr ARITH_OR expr { $$ = $1 || $3; } ++ | expr ARITH_AND expr { $$ = $1 && $3; } ++ | expr ARITH_BOR expr { $$ = $1 | $3; } ++ | expr ARITH_BXOR expr { $$ = $1 ^ $3; } ++ | expr ARITH_BAND expr { $$ = $1 & $3; } ++ | expr ARITH_EQ expr { $$ = $1 == $3; } ++ | expr ARITH_GT expr { $$ = $1 > $3; } ++ | expr ARITH_GE expr { $$ = $1 >= $3; } ++ | expr ARITH_LT expr { $$ = $1 < $3; } ++ | expr ARITH_LE expr { $$ = $1 <= $3; } ++ | expr ARITH_NE expr { $$ = $1 != $3; } ++ | expr ARITH_LSHIFT expr { $$ = $1 << $3; } ++ | expr ARITH_RSHIFT expr { $$ = $1 >> $3; } ++ | expr ARITH_ADD expr { $$ = $1 + $3; } ++ | expr ARITH_SUB expr { $$ = $1 - $3; } ++ | expr ARITH_MUL expr { $$ = $1 * $3; } ++ | expr ARITH_DIV expr { + if ($3 == 0) + yyerror("division by zero"); + $$ = $1 / $3; + } +- | expr ARITH_REM expr = { ++ | expr ARITH_REM expr { + if ($3 == 0) + yyerror("division by zero"); + $$ = $1 % $3; + } +- | ARITH_NOT expr = { $$ = !($2); } +- | ARITH_BNOT expr = { $$ = ~($2); } +- | ARITH_SUB expr %prec ARITH_UNARYMINUS = { $$ = -($2); } +- | ARITH_ADD expr %prec ARITH_UNARYPLUS = { $$ = $2; } ++ | ARITH_NOT expr { $$ = !($2); } ++ | ARITH_BNOT expr { $$ = ~($2); } ++ | ARITH_SUB expr %prec ARITH_UNARYMINUS { $$ = -($2); } ++ | ARITH_ADD expr %prec ARITH_UNARYPLUS { $$ = $2; } + | ARITH_NUM + ; + %% +@@ -193,13 +193,11 @@ + yyerror(s) + const char *s; + { +- +- yyerrok; + yyclearin; + error("arithmetic expression: %s: \"%s\"", s, arith_startbuf); +- /* NOTREACHED */ + } + ++/* + int + yylex() + { +@@ -300,7 +298,7 @@ + default: + err: + error("arith: syntax error: \"%s\"\n", arith_startbuf); +- /* NOTREACHED */ ++ // NOTREACHED + } + break; + } +@@ -308,3 +306,4 @@ + arith_buf++; + return value; + } ++*/ +diff -ur ash-0.3.8.clean/Makefile ash-0.3.8.orig/Makefile +--- ash-0.3.8.clean/Makefile 2003-08-06 14:58:38.000000000 -0400 ++++ ash-0.3.8.orig/Makefile 2003-08-06 15:50:00.000000000 -0400 +@@ -1,68 +1,78 @@ ++# + # $NetBSD: Makefile,v 1.51 2000/12/29 16:30:31 bjh21 Exp $ + # @(#)Makefile 8.4 (Berkeley) 5/5/95 ++# Red Hat Makefile for ash so that we can use GNU Make ++# + +-WARNS=2 +-YHEADER=1 +-PROG= sh +-SHSRCS= alias.c cd.c echo.c error.c eval.c exec.c expand.c \ ++CFLAGS+=-DBSD=1 -DSMALL -D_GNU_SOURCE \ ++ -DGLOB_BROKEN -D__COPYRIGHT\(x\)= \ ++ -D__RCSID\(x\)= -D_DIAGASSERT\(x\)= -I. -I./bltin ++LDFLAGS+="-lfl" ++PROG =sh ++SHSRCS =alias.c cd.c bltin/echo.c error.c eval.c exec.c expand.c \ + histedit.c input.c jobs.c mail.c main.c memalloc.c miscbltin.c \ +- mystring.c options.c parser.c printf.c redir.c show.c trap.c output.c \ +- var.c test.c setmode.c times.c +-GENSRCS=arith.c arith.h builtins.c builtins.h init.c nodes.c \ +- signames.c nodes.h syntax.c syntax.h token.h +-SRCS= ${SHSRCS} ${GENSRCS} +- +-YFLAGS= -d +- +-CPPFLAGS+=-DSHELL -I. -I${.CURDIR} +- +-.ifdef HETIO +-SHSRCS+=hetio.c +-CPPFLAGS+=-DHETIO +-.endif ++ mystring.c options.c parser.c bltin/printf.c redir.c show.c \ ++ trap.c output.c var.c bltin/test.c setmode.c bltin/times.c ++GENSRCS=arith.c builtins.c init.c nodes.c \ ++ signames.c syntax.c arith_lex.c ++GENHDRS=arith.h builtins.h nodes.h syntax.h token.h ++SRCS =${SHSRCS} ${GENSRCS} ++OBJS =$(patsubst %.c,%.o,${SRCS}) ++OBJDIR="./" ++ ++all: ${PROG} ++ ++check: ++ @echo ${OBJS} + +-.PATH: ${.CURDIR}/bltin ${.CURDIR}/../../usr.bin/printf ${.CURDIR}/../test + + CLEANFILES+= mkinit mknodes mksyntax + CLEANFILES+= ${GENSRCS} y.tab.h + + BLTINDEFS=specialbltins.def regularbltins.def assignbltins.def + ++arith.h arith.c: arith.y ++ bison -y -d -oarith.c arith.y ++ ++arith_lex.c: arith_lex.l ++ flex -oarith_lex.c arith_lex.l ++ + token.h: mktokens +- sh ${.ALLSRC} ++ sh ./mktokens + + builtins.c builtins.h: mkbuiltins shell.h builtins.def ${BLTINDEFS} +- sh ${.ALLSRC} ${.OBJDIR} '${CFLAGS}' ++ sh ./mkbuiltins sh builtins.def ${BLTINDEFS} ${OBJDIR} '${CFLAGS}' + + init.c: mkinit ${SHSRCS} +- ./${.ALLSRC} ++ ./mkinit ${SHSRCS} + + nodes.c nodes.h: mknodes nodetypes nodes.c.pat +- ./${.ALLSRC} ++ ./mknodes nodetypes nodes.c.pat + + syntax.c syntax.h: mksyntax +- ./${.ALLSRC} ++ ./mksyntax + + signames.c: mksignames +- ./${.ALLSRC} ++ ./mksignames ++ ++mksignames: ++ gcc ${CFLAGS} -o mksignames mksignames.c + + mkinit: mkinit.c +- ${HOST_LINK.c} -o mkinit ${.IMPSRC} ++ gcc ${CFLAGS} -o mkinit mkinit.c + + mknodes: mknodes.c +- ${HOST_LINK.c} -o mknodes ${.IMPSRC} +- +-.if (${MACHINE_ARCH} == "powerpc") || \ +- (${MACHINE_ARCH} == "arm32") || \ +- (${MACHINE_ARCH} == "arm26") +-TARGET_CHARFLAG= -DTARGET_CHAR="u_int8_t" +-.else +-TARGET_CHARFLAG= -DTARGET_CHAR="int8_t" +-.endif ++ gcc ${CFLAGS} -o mknodes mknodes.c + + mksyntax: mksyntax.c +- ${HOST_LINK.c} ${TARGET_CHARFLAG} -o mksyntax ${.IMPSRC} ++ gcc ${CFLAGS} -DTARGET_CHAR="int8_t" -o mksyntax mksyntax.c + +-.include ++%.o: %.c ++ gcc ${CFLAGS} -c -o $@ $^ -DSHELL + +-${OBJS}: builtins.h nodes.h syntax.h token.h ++sh: ${GENHDRS} ${OBJS} ++ gcc ${CFLAGS} -o sh ${OBJS} ${LDFLAGS} ++ ++clean: ++ rm -f ${GENSRCS} ${GENHDRS} *.o ${PROG} mkinit mksignames mknodes \ ++ mksyntax +diff -ur ash-0.3.8.clean/redir.h ash-0.3.8.orig/redir.h +--- ash-0.3.8.clean/redir.h 2003-08-06 14:58:38.000000000 -0400 ++++ ash-0.3.8.orig/redir.h 2003-08-06 15:50:00.000000000 -0400 +@@ -47,12 +47,11 @@ + union node; + void redirect __P((union node *, int)); + void popredir __P((void)); +-int fd0_redirected_p __P((void)); + void clearredir __P((void)); + int copyfd __P((int, int)); + + /* Return true if fd 0 has already been redirected at least once. */ +-extern int inline fd0_redirected_p(void) { ++static inline int fd0_redirected_p(void) { + extern int fd0_redirected; + return fd0_redirected != 0; + } Added: tinysofa/snapshot/ash/current/sources/ash-0.3.8-history-man.patch =================================================================== --- tinysofa/snapshot/ash/current/sources/ash-0.3.8-history-man.patch 2004-07-01 15:43:53 UTC (rev 2703) +++ tinysofa/snapshot/ash/current/sources/ash-0.3.8-history-man.patch 2004-07-01 15:43:58 UTC (rev 2704) @@ -0,0 +1,148 @@ +--- sh.1.orig 2003-02-18 14:34:05.000000000 -0500 ++++ sh.1 2003-02-18 14:34:05.000000000 -0500 +@@ -72,9 +72,8 @@ + .Xr chsh 1 + command). The shell implements a language that has flow control + constructs, a macro facility that provides a variety of features in +-addition to data storage, along with built in history and line editing +-capabilities. It incorporates many features to aid interactive use and +-has the advantage that the interpretative language is common to both ++addition to data storage. It incorporates many features to aid interactive ++use and has the advantage that the interpretative language is common to both + interactive and non-interactive use (shell scripts). That is, commands + can be typed directly to the running shell or can be put into a file and + the file can be executed directly by the shell. +@@ -1084,86 +1083,6 @@ + With the + .Fl p + option specified the output will be formatted suitably for non-interactive use. +-.It Xo fc Op Fl e Ar editor +-.Op Ar first Op Ar last +-.Xc +-.It Xo fc Fl l +-.Op Fl nr +-.Op Ar first Op Ar last +-.Xc +-.It Xo fc Fl s Op Ar old=new +-.Op Ar first +-.Xc +-The +-.Ic fc +-builtin lists, or edits and re-executes, commands previously entered +-to an interactive shell. +-.Bl -tag -width 5n +-.It Fl e No editor +-Use the editor named by editor to edit the commands. The +-editor string is a command name, subject to search via the +-.Ev PATH +-variable. The value in the +-.Ev FCEDIT +-variable is used as a default when +-.Fl e +-is not specified. If +-.Ev FCEDIT +-is null or unset, the value of the +-.Ev EDITOR +-variable is used. If +-.Ev EDITOR +-is null or unset, +-.Xr ed 1 +-is used as the editor. +-.It Fl l No (ell) +-List the commands rather than invoking an editor on them. The commands +-are written in the sequence indicated by the first and last operands, as +-affected by +-.Fl r , +-with each command preceded by the command number. +-.It Fl n +-Suppress command numbers when listing with -l. +-.It Fl r +-Reverse the order of the commands listed (with +-.Fl l ) +-or edited (with neither +-.Fl l +-nor +-.Fl s ) . +-.It Fl s +-Re-execute the command without invoking an editor. +-.It first +-.It last +-Select the commands to list or edit. The number of previous commands that +-can be accessed are determined by the value of the +-.Ev HISTSIZE +-variable. The value of first or last or both are one of the following: +-.Bl -tag -width 5n +-.It [+]number +-A positive number representing a command number; command numbers can be +-displayed with the +-.Fl l +-option. +-.It Fl number +-A negative decimal number representing the command that was executed +-number of commands previously. For example, -1 is the immediately +-previous command. +-.El +-.It string +-A string indicating the most recently entered command that begins with +-that string. If the old=new operand is not also specified with +-.Fl s , +-the string form of the first operand cannot contain an embedded equal sign. +-.El +-.Pp +-The following environment variables affect the execution of fc: +-.Bl -tag -width HISTSIZE +-.It Ev FCEDIT +-Name of the editor to use. +-.It Ev HISTSIZE +-The number of previous commands that are accessible. +-.El + .It fg Op Ar job + Move the specified job or the current job to the foreground. + .It getopts Ar optstring var +@@ -1287,11 +1206,6 @@ + .Fl r + option causes the hash command to delete all the entries in the hash table + except for functions. +-.It jobid Op Ar job +-Print the process id's of the processes in the job. +-If the +-.Ar job +-argument is omitted, the current job is used. + .It jobs + This command lists out all the background processes + which are children of the current shell process. +@@ -1508,27 +1422,6 @@ + Wait for the specified job to complete and return the exit status of the + last process in the job. If the argument is omitted, wait for all jobs to + complete and the return an exit status of zero. +-.El +-.Ss Command Line Editing +-When +-.Nm +-is being used interactively from a terminal, the current command +-and the command history (see +-.Ic fc +-in +-.Sx Builtins ) +-can be edited using vi-mode command-line editing. This mode uses commands, +-described below, similar to a subset of those described in the vi man +-page. The command +-.Ql set -o vi +-enables vi-mode editing and place sh into vi insert mode. With vi-mode +-enabled, sh can be switched between insert mode and command mode. The +-editor is not described in full here, but will be in a later document. +-It's similar to vi: typing +-.Aq ESC +-will throw you into command VI command mode. Hitting +-.Aq return +-while in command mode will pass the line to the shell. + .Sh ENVIRONMENT + .Bl -tag -width MAILCHECK + .It Ev HOME +@@ -1613,4 +1506,4 @@ + argument. + .Sh BUGS + Setuid shell scripts should be avoided at all costs, as they are a +-significant security risk. +\ No newline at end of file ++significant security risk. Added: tinysofa/snapshot/ash/current/sources/ash-0.3.8-mannewline.patch =================================================================== --- tinysofa/snapshot/ash/current/sources/ash-0.3.8-mannewline.patch 2004-07-01 15:43:53 UTC (rev 2703) +++ tinysofa/snapshot/ash/current/sources/ash-0.3.8-mannewline.patch 2004-07-01 15:43:58 UTC (rev 2704) @@ -0,0 +1,9 @@ +--- ash-0.3.8.orig/sh.1.groff 2002-07-17 17:58:15.000000000 -0400 ++++ ash-0.3.8.orig/sh.1 2002-07-17 19:34:33.000000000 -0400 +@@ -1613,4 +1613,4 @@ + argument. + .Sh BUGS + Setuid shell scripts should be avoided at all costs, as they are a +-significant security risk. ++significant security risk. +\ No newline at end of file Added: tinysofa/snapshot/ash/current/sources/ash-0.3.8-segv.patch =================================================================== --- tinysofa/snapshot/ash/current/sources/ash-0.3.8-segv.patch 2004-07-01 15:43:53 UTC (rev 2703) +++ tinysofa/snapshot/ash/current/sources/ash-0.3.8-segv.patch 2004-07-01 15:43:58 UTC (rev 2704) @@ -0,0 +1,12 @@ +--- output.c.orig 2003-02-06 10:15:30.000000000 -0500 ++++ output.c 2003-02-06 10:15:47.000000000 -0500 +@@ -402,6 +402,9 @@ + int size; + int pad; + ++ if (!f) ++ return; ++ + while ((c = *f++) != '\0') { + if (c != '%') { + outc(c, dest); Added: tinysofa/snapshot/ash/current/sources/ash-0.3.8-tempfile.patch =================================================================== --- tinysofa/snapshot/ash/current/sources/ash-0.3.8-tempfile.patch 2004-07-01 15:43:53 UTC (rev 2703) +++ tinysofa/snapshot/ash/current/sources/ash-0.3.8-tempfile.patch 2004-07-01 15:43:58 UTC (rev 2704) @@ -0,0 +1,13 @@ +--- ash-0.3.8.orig/mkbuiltins.tempfile Thu Dec 6 17:20:31 2001 ++++ ash-0.3.8.orig/mkbuiltins Thu Dec 6 17:03:02 2001 +@@ -38,8 +38,8 @@ + # @(#)mkbuiltins 8.2 (Berkeley) 5/4/95 + + trap 'rm -f $temp $temp2' EXIT +-temp=$(tempfile) +-temp2=$(tempfile) ++temp=$(mktemp /tmp/temp.XXXXXX) ++temp2=$(mktemp /tmp/temp.XXXXXX) + + shell=$1 + builtins=$2 Deleted: tinysofa/snapshot/ash/current/sources/ash-echo.patch =================================================================== --- tinysofa/snapshot/ash/current/sources/ash-echo.patch 2004-07-01 15:43:53 UTC (rev 2703) +++ tinysofa/snapshot/ash/current/sources/ash-echo.patch 2004-07-01 15:43:58 UTC (rev 2704) @@ -1,17 +0,0 @@ ---- ash-linux-0.2/bltin/echo.c.foo Sat Sep 11 23:55:02 1999 -+++ ash-linux-0.2/bltin/echo.c Sat Sep 11 23:57:48 1999 -@@ -63,7 +63,13 @@ - if (argc) - ap++; - if ((p = *ap) != NULL) { -- if (equal(p, "-n")) { -+ if (equal(p,"-en") || equal(p,"-ne")) { -+ nflag++; -+#ifndef eflag -+ eflag++; -+#endif -+ ap++; -+ } else if (equal(p, "-n")) { - nflag++; - ap++; - } else if (equal(p, "-e")) { Deleted: tinysofa/snapshot/ash/current/sources/ash-fd.patch =================================================================== --- tinysofa/snapshot/ash/current/sources/ash-fd.patch 2004-07-01 15:43:53 UTC (rev 2703) +++ tinysofa/snapshot/ash/current/sources/ash-fd.patch 2004-07-01 15:43:58 UTC (rev 2704) @@ -1,19 +0,0 @@ ---- ash-linux-0.2/parser.c.foo Sat Sep 11 17:33:40 1999 -+++ ash-linux-0.2/parser.c Sat Sep 11 17:36:02 1999 -@@ -552,15 +552,11 @@ - } - } else if (n->type == NTOFD || n->type == NFROMFD) { - if (is_digit(wordtext[0])) -- n->ndup.dupfd = digit_val(wordtext[0]); -+ n->ndup.dupfd = atoi(wordtext); - else if (wordtext[0] == '-') - n->ndup.dupfd = -1; - else -- goto bad; -- if (wordtext[1] != '\0') { --bad: - synerror("Bad fd number"); -- } - } else { - n->nfile.fname = (union node *)stalloc(sizeof (struct narg)); - n = n->nfile.fname; Deleted: tinysofa/snapshot/ash/current/sources/ash-linux-0.2-glibc21.patch =================================================================== --- tinysofa/snapshot/ash/current/sources/ash-linux-0.2-glibc21.patch 2004-07-01 15:43:53 UTC (rev 2703) +++ tinysofa/snapshot/ash/current/sources/ash-linux-0.2-glibc21.patch 2004-07-01 15:43:58 UTC (rev 2704) @@ -1,21 +0,0 @@ ---- ash-linux-0.2/mknodes.c~ Mon Sep 6 05:04:23 1993 -+++ ash-linux-0.2/mknodes.c Tue Jan 12 17:09:06 1999 -@@ -89,7 +89,7 @@ - struct str *curstr; /* current structure */ - - --FILE *infp = stdin; -+FILE *infp; - char line[1024]; - int linno; - char *linep; -@@ -106,6 +106,9 @@ - error("usage: mknodes file\n"); - return(1); - } -+ -+ infp = stdin; -+ - if ((infp = fopen(argv[1], "r")) == NULL) { - error("Can't open %s", argv[1]); - return(1); Deleted: tinysofa/snapshot/ash/current/sources/ash-linux-0.2.tar.gz =================================================================== (Binary files differ) Added: tinysofa/snapshot/ash/current/sources/ash_0.3.8-38.diff.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/ash/current/sources/ash_0.3.8-38.diff.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/ash/current/sources/ash_0.3.8.orig.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/ash/current/sources/ash_0.3.8.orig.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: tinysofa/snapshot/ash/current/specs/ash.spec =================================================================== --- tinysofa/snapshot/ash/current/specs/ash.spec 2004-07-01 15:43:53 UTC (rev 2703) +++ tinysofa/snapshot/ash/current/specs/ash.spec 2004-07-01 15:43:58 UTC (rev 2704) @@ -1,53 +1,70 @@ -Summary: A smaller version of the Bourne shell. +Summary: A smaller version of the Bourne shell (sh). Name: ash -Version: 0.2 -Release: 28ts +Version: 0.3.8 +Release: 19ts License: BSD -Group: tinysofa official -Source: http://www.ibiblio.org/pub/Linux/system/shells/ash-linux-%{version}.tar.gz -Patch0: ftp://ftp.redhat.com/pub/ash-0.2-make.patch -Patch1: ash-linux-0.2-glibc21.patch -Patch2: ash-fd.patch -Patch3: ash-echo.patch -Prereq: coreutils grep -BuildRoot: %{_tmppath}/%{name}-root +Group: System Environment/Shells +Source: ftp://ftp.debian.org/debian/dists/woody/main/source/shells/%{name}_%{version}.orig.tar.gz +Patch0: ftp://ftp.debian.org/debian/dists/woody/main/source/shells/%{name}_%{version}-38.diff.gz +Patch2: ash-0.3.8-tempfile.patch +#Patch1: ash-0.3.8-build.patch # <-- no longer needed. +Patch3: ash-0.3.8-mannewline.patch +Patch4: ash-0.3.8-segv.patch +Patch5: ash-0.3.8-history-man.patch +Patch6: ash-0.3.8-gnu.patch +Patch7: ash-0.3.8-for.patch +Prereq: fileutils grep +BuildPrereq: bison flex +Buildroot: %{_tmppath}/%{name}-%{version}-root Conflicts: mkinitrd <= 1.7 %description -The ash shell is a clone of Berkeley's Bourne shell. Ash -supports all of the standard sh shell commands, but is considerably -smaller than bash. The ash shell lacks some features (for example, -command-line histories), but needs a lot less memory. +A shell is a basic system program that interprets keyboard and mouse +commands. The ash shell is a clone of Berkeley's Bourne shell +(sh). Ash supports all of the standard sh shell commands, but is +considerably smaller than sh. The ash shell lacks some Bourne shell +features (for example, command-line histories), but it uses a lot less +memory. -You should install ash if you need a lightweight shell with many of the -same capabilities as the bash shell. +You should install ash if you need a lightweight shell with many of +the same capabilities as the sh shell. %prep -%setup -q -n ash-linux-%{version} -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 +%setup -q -n ash-%{version}.orig +%patch0 -p1 -b .linux +%patch2 -p1 -b .tempfile +#%ifarch alpha +#%patch1 -p1 -b .alpha +#%endif %patch3 -p1 +%patch4 -p0 -b .segv +%patch5 -p0 -b .man +%patch6 -p1 -b .gnu +%patch7 -p1 -b .for + +chmod -R a+rX . + %build -make RPM_OPT_FLAGS="$RPM_OPT_FLAGS" -strip sh +CFLAGS="${RPM_OPT_FLAGS}" make +mv sh sh.dynamic +CFLAGS="${RPM_OPT_FLAGS}" LDFLAGS="-static" make +mv sh sh.static + + %install -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != "/" ] && rm -rf "$RPM_BUILD_ROOT" -mkdir -p $RPM_BUILD_ROOT/bin -mkdir -p $RPM_BUILD_ROOT/usr/share/man/man1 +rm -rf %{buildroot} +mkdir -p %{buildroot}/bin +mkdir -p %{buildroot}%{_mandir}/man1 -install -m 755 sh $RPM_BUILD_ROOT/bin/ash -install -m 644 sh.1 $RPM_BUILD_ROOT/usr/share/man/man1/ash.1 -ln -sf ash.1 $RPM_BUILD_ROOT/usr/share/man/man1/bsh.1 -ln -sf ash $RPM_BUILD_ROOT/bin/bsh +install -m 755 sh.dynamic %{buildroot}/bin/ash +install -m 644 sh.1 %{buildroot}%{_mandir}/man1/ash.1 +ln -sf ash.1 %{buildroot}%{_mandir}/man1/bsh.1 +ln -sf ash %{buildroot}/bin/bsh -rm -f sh -make STATIC=-static +install -m 755 sh.static %{buildroot}/bin/ash.static -install -m 755 sh $RPM_BUILD_ROOT/bin/ash.static - %post if [ ! -f /etc/shells ]; then echo "/bin/ash" > /etc/shells @@ -62,8 +79,7 @@ fi %postun - -if [ "$1" = 0 ]; then +if [ "$1" = "0" ]; then grep -v '^/bin/ash' < /etc/shells | grep -v '^/bin/bsh' > /etc/shells.new mv /etc/shells.new /etc/shells fi @@ -81,38 +97,111 @@ done %clean -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} %files %defattr(-,root,root) /bin/ash /bin/ash.static /bin/bsh -/usr/share/man/man1/ash.1* -/usr/share/man/man1/bsh.1* +%{_mandir}/man1/* %changelog -* Wed May 19 2004 tsintegrate 0.2-28ts -- current (0.2-27ts) integrated as 0.2-28ts for release 1.0-U1 +* Mon Jun 07 2004 Lon Hohberger 0.3.8-19 +- Remove alpha-specific hacks; no longer necessary + cause +builds to break. -* Tue Dec 8 2003 Erlend Midttun 0.2-24tr -- Rebuilt. +* Fri Feb 13 2004 Elliot Lee +- rebuilt -* Wed Jun 18 2003 Erlend Midttun 0.2-23tr -- Big rebuild +* Thu Dec 04 2003 Lon Hohberger 0.3.8-17 +- Rebuild -* Mon May 26 2003 Erlend Midttun 0.2-22em -- fileutils -> coreutils. +* Thu Aug 14 2003 Lon Hohberger 0.3.8-16 +- Fix for #102334 -* Mon Mar 24 2003 Erlend Midttun 0.2-21em -- Rebuilt against glibc 2.3.2. +* Wed Aug 06 2003 Lon Hohberger 0.3.8-15 +- Rebuild for Severn -* Tue Jul 2 2002 Christian H. Toldnes -- Rebuilt for TSL 2.0 +* Wed Aug 06 2003 Lon Hohberger 0.3.8-14 +- Fix ash-0.3.8-gnu.patch to fix parsing on ia64 -* Thu Jan 20 2000 Tore Olsen -- Install manpages according to FHS +* Wed Aug 06 2003 Lon Hohberger 0.3.8-13 +- Change build to use GNU tools (flex/bison/gnu-make/gcc), fixes +#101755 +* Wed Jun 04 2003 Elliot Lee +- rebuilt + +* Tue Apr 15 2003 Lon Hohberger 0.3.8-11 +- Bumped & Rebuilt + +* Tue Apr 15 2003 Lon Hohberger 0.3.8-9 +- Fix for #81903: Man page documents commands which do not exist. (fc, jobid) + +* Thu Feb 6 2003 Lon Hohberger 0.3.8-8 +- Fix for #83605 + +* Wed Jan 22 2003 Tim Powers +- rebuilt + +* Thu Dec 19 2002 Tim Powers +- bump and rebuild + +* Wed Jul 17 2002 Trond Eivind Glomsr?d 0.3.8-5 +- Update to -38 diff +- man page fixes (#63528) + +* Fri Jun 21 2002 Tim Powers +- automated rebuild + +* Thu May 23 2002 Tim Powers +- automated rebuild + +* Wed Jan 09 2002 Tim Powers +- automated rebuild + +* Tue Dec 11 2001 Trond Eivind Glomsr?d 0.3.8-1 +- 0.3.8 +- Patch to make it build +- workaround for oddities in the alpha compiler + +* Sun Jun 24 2001 Elliot Lee +- Bump release + rebuild. + +* Mon Jan 08 2001 Preston Brown +- ported much newer version from Debian +- alpha is miscompiling mkinit helper utility; work around w/o optimization + +* Thu Dec 7 2000 Crutcher Dunnavant +- intial rebuild for 7.1 + +* Wed Aug 30 2000 Matt Wilson +- rebuild to cope with glibc locale binary incompatibility, again + +* Wed Jul 19 2000 Jakub Jelinek +- rebuild to cope with glibc locale binary incompatibility + +* Wed Jul 12 2000 Prospector +- automatic rebuild + +* Wed Jun 21 2000 Jakub Jelinek +- mksyntax had undefined behaviour, make it conforming. + +* Mon Jun 12 2000 Preston Brown +- FHS fixes +- had to disable optimization for sparc, was producing a mksyntax binary that + infinitely looped! FIX ME. + +* Wed Mar 29 2000 Bill Nottingham +- fix bug in 'ash -e' handling + +* Thu Feb 03 2000 Preston Brown +- gzipped man pages + +* Mon Oct 04 1999 Cristian Gafton +- rebuild against the lastest glibc in the sparc tree + * Sat Sep 11 1999 Bill Nottingham - fix bogosity with fd's > 0 - fix builtin echo to understand -n & -e at the same time @@ -145,4 +234,4 @@ - statically linked * Wed Apr 16 1997 Erik Troan -- fixed preinstall script to >> /etc/shells for bsh. \ No newline at end of file +- fixed preinstall script to >> /etc/shells for bsh. From svn at tinysofa.org Thu Jul 1 15:44:00 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:44:00 +1000 (EST) Subject: [tinysofa-svn] r2705 - tinysofa/snapshot/attr/current/specs Message-ID: <20040701154400.D2F3E4E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:44:00 +1000 (Fri, 02 Jul 2004) New Revision: 2705 Modified: tinysofa/snapshot/attr/current/specs/attr.spec Log: - Sync with 2.0. - Kept: - attr-2.0.8-docperms.patch: - attr-2.2.0-multilib.patch: - attr-2.4.16.src.tar.gz: Modified: tinysofa/snapshot/attr/current/specs/attr.spec =================================================================== --- tinysofa/snapshot/attr/current/specs/attr.spec 2004-07-01 15:43:58 UTC (rev 2704) +++ tinysofa/snapshot/attr/current/specs/attr.spec 2004-07-01 15:44:00 UTC (rev 2705) @@ -2,17 +2,17 @@ Name: attr Version: 2.4.16 Release: 1ts -BuildRoot: %{_tmppath}/%{name}-root Prereq: /sbin/ldconfig -Source: http://mirrors.sunsite.dk/xfs/cmd_tars/%{name}-%{version}.src.tar.gz +Conflicts: xfsdump < 2.0.0 +BuildRoot: %{_tmppath}/%{name}-%{version}-root +Source: http://acl.bestbits.at/current/tar/attr-%{version}.src.tar.gz Patch1: attr-2.0.8-docperms.patch Patch2: attr-2.2.0-multilib.patch License: GPL -URL: http://oss.sgi.com/projects/xfs/ -Group: tinysofa official +URL: http://acl.bestbits.at/ +Group: System Environment/Base +BuildRequires: autoconf libtool -BuildRequires: autoconf, gettext, libtool - %description A set of tools for manipulating extended attributes on filesystem objects, in particular getfattr(1) and setfattr(1). @@ -21,7 +21,8 @@ %package -n libattr Summary: Dynamic library for extended attribute support. -Group: tinysofa official +Group: System Environment/Libraries +License: LGPL Prereq: /sbin/ldconfig %description -n libattr @@ -30,9 +31,9 @@ %package -n libattr-devel Summary: Extended attribute static libraries and headers. -Group: tinysofa official +Group: Development/Libraries +License: LGPL Requires: libattr -Obsoletes: attr-devel %description -n libattr-devel This package contains the libraries and header files needed to @@ -41,16 +42,20 @@ recommended interface, but an SGI IRIX compatibility interface is also provided. -Currently only ext2, ext3, JFS and XFS support extended attributes. +Currently only ext2, ext3 and XFS support extended attributes. The SGI IRIX compatibility API built above the Linux system calls is used by programs such as xfsdump(8), xfsrestore(8) and xfs_fsr(8). You should install libattr-devel if you want to develop programs -which make use of extended attributes. If you install libattr-devel -then you'll also want to install attr. +which make use of extended attributes. If you install libattr-devel, +you'll also want to install attr. %prep %setup -q +# We need to turn off executable permissions on the script in %doc +# because we don't want to drag perl into the base. Users advanced +# enough to have used ACLs before they were added to the distro can +# figure out how to chmod and how to install perl. :-) %patch1 -p1 -b .perms %patch2 -p1 -b .multilib @@ -86,10 +91,7 @@ if (match ($6, "/usr/share/man")) printf ("%%%%attr(%s,%s,%s) %s*\n", $2, $3, $4, $6); else - if (match ($6, "^/lib") || (match ($6, "^/usr/lib") && match ($6, "\.la"))) - printf ("%%%%attr(0755,%s,%s) %s\n", $3, $4, $6); - else - printf ("%%%%attr(%s,%s,%s) %s\n", $2, $3, $4, $6); } + printf ("%%%%attr(%s,%s,%s) %s\n", $2, $3, $4, $6); } $1 == "l" { if (match ($3, "/usr/share/man") || match ($3, "/usr/share/doc/attr")) printf ("%%%%doc "); if (match ($3, "/usr/share/man")) @@ -119,24 +121,52 @@ /usr/include/attr %files -n libattr -f fileslib.rpm -%defattr(-,root,root) %changelog -* Wed May 19 2004 tsintegrate 2.4.16-1ts -- current (2.4.16-1ok) integrated as 2.4.16-1ts for release 1.0-U1 +* Wed Mar 31 2004 Stephen C. Tweedie 2.4.1-4 +- Add missing %defattr -* Thu May 13 2004 Omar Kilani 2.4.16-1ok -- New Upstream. +* Tue Mar 30 2004 Stephen C. Tweedie 2.4.1-3 +- Add /usr/include/attr to files manifest +- Fix location of doc files, add main doc dir to files manifest -* Mon May 10 2004 Omar Kilani 2.4.15-2ts -- Add BuildRequires autoconf, gettext, libtool. -- Fix files function to only match lines that start with /lib. +* Tue Mar 02 2004 Elliot Lee +- rebuilt -* Sun May 09 2004 Omar Kilani 2.4.15-2ts -- Fix library permissions. +* Fri Feb 13 2004 Elliot Lee +- rebuilt -* Wed Apr 07 2004 Omar Kilani 2.4.15-1ts -- New upstream. +* Tue Aug 5 2003 Elliot Lee 2.4.1-2 +- Fix libtool -* Mon Jan 26 2004 Erlend Midttun -- Initial release, based off official SGI rpm. \ No newline at end of file +* Tue Jun 3 2003 Stephen C. Tweedie 2.4.1-1 +- update to attr-2.4.1 + +* Tue Jan 28 2003 Michael K. Johnson 2.2.0-1 +- update/rebuild + +* Sat Jan 4 2003 Jeff Johnson 2.0.8-6 +- set execute bits on library so that requires are generated. + +* Thu Nov 21 2002 Elliot Lee 2.0.8-5 +- Redo multilib patch to work everywhere + +* Wed Sep 11 2002 Than Ngo 2.0.8-4 +- Added fix to install libs in correct directory on 64bit machine + +* Thu Aug 08 2002 Michael K. Johnson 2.0.8-3 +- Made the package only own the one directory that is unique to it: + /usr/include/attr + +* Wed Jun 26 2002 Michael K. Johnson 2.0.8-2 +- get perl out of base with attr-2.0.8-docperms.patch + +* Mon Jun 24 2002 Michael K. Johnson 2.0.8-1 +- Initial Red Hat package + Made as few changes as possible relative to upstream packaging to + make it easier to maintain long-term. This means that some of + the techniques used here are definitely not standard Red Hat + techniques. If you are looking for an example package to fit + into Red Hat Linux transparently, this would not be the one to + pick. +- attr-devel -> libattr-devel From svn at tinysofa.org Thu Jul 1 15:44:06 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:44:06 +1000 (EST) Subject: [tinysofa-svn] r2707 - tinysofa/snapshot/autoconf/current/specs Message-ID: <20040701154406.A87104E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:44:06 +1000 (Fri, 02 Jul 2004) New Revision: 2707 Modified: tinysofa/snapshot/autoconf/current/specs/autoconf.spec Log: - Sync with 2.0. - Kept: - autoconf-2.59.tar.bz2: Modified: tinysofa/snapshot/autoconf/current/specs/autoconf.spec =================================================================== --- tinysofa/snapshot/autoconf/current/specs/autoconf.spec 2004-07-01 15:44:03 UTC (rev 2706) +++ tinysofa/snapshot/autoconf/current/specs/autoconf.spec 2004-07-01 15:44:06 UTC (rev 2707) @@ -1,15 +1,20 @@ +# tinysofa: exclude emacs files. + +%define with_check 0 + Summary: A GNU tool for automatically configuring source code. Name: autoconf Version: 2.59 -Release: 5ts -License: GPL -Group: tinysofa official -Source: ftp://ftp.gnu.org/pub/gnu/autoconf/autoconf-%{version}.tar.bz2 -Requires: gawk, m4, mktemp, perl -BuildRequires: texinfo, m4 -Prereq: htmlinfo -BuildRoot: %{_tmppath}/%{name}-root -BuildArchitectures: noarch +Release: 3ts +Copyright: GPL +Group: Development/Tools +Source: ftp://prep.ai.mit.edu/pub/gnu/autoconf/autoconf-%{version}.tar.bz2 +URL: http://www.gnu.org/software/autoconf/ +BuildRequires: sed, m4 +Prereq(post,preun): /sbin/install-info +Requires: gawk, m4, mktemp, perl, coreutils +BuildArch: noarch +BuildRoot: %{_tmppath}/%{name}-%{version}-root %description GNU's Autoconf is a tool for configuring source code and Makefiles. @@ -17,116 +22,189 @@ packages, since the person building the package is allowed to specify various configuration options. -You should install Autoconf if you are developing software and you'd -like to use it to create shell scripts which will configure your -source code packages. If you are installing Autoconf, you will also -need to install the GNU m4 package. +You should install Autoconf if you are developing software and +would like to create shell scripts that configure your source code +packages. If you are installing Autoconf, you will also need to +install the GNU m4 package. -Note that the Autoconf package is not required for the end user who -may be configuring software with an Autoconf-generated script; +Note that the Autoconf package is not required for the end-user who +may be configuring software with an Autoconf-generated script; Autoconf is only required for the generation of the scripts, not their use. - %prep -%setup -q +%setup -q -n autoconf-%{version} - %build %configure make -cd doc -makeinfo --html --no-split autoconf.texi +%if %{with_check} + make check +%endif %install -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT/usr/share/html/autoconf +rm -rf ${RPM_BUILD_ROOT} %makeinstall -install -m644 doc/autoconf.html $RPM_BUILD_ROOT/usr/share/html/autoconf/ +rm -f $RPM_BUILD_ROOT%{_infodir}/dir -# nuke info pages -rm -rf $RPM_BUILD_ROOT/usr/share/info +%clean +rm -rf ${RPM_BUILD_ROOT} %post -/usr/sbin/htmlinfo_update.sh +/sbin/install-info %{_infodir}/autoconf.info.gz %{_infodir}/dir -%postun -/usr/sbin/htmlinfo_update.sh +%preun +if [ "$1" = 0 ]; then + /sbin/install-info --del %{_infodir}/autoconf.info.gz %{_infodir}/dir +fi - -%clean -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT - - %files %defattr(-,root,root) -/usr/bin/autoconf -/usr/bin/autoheader -/usr/bin/autom4te -/usr/bin/autoreconf -/usr/bin/autoscan -/usr/bin/autoupdate -/usr/bin/ifnames -/usr/share/autoconf +%{_bindir}/* +%{_infodir}/autoconf.info* +# don't include standards.info, because it comes from binutils... +%exclude %{_infodir}/standards* +%{_datadir}/autoconf %{_mandir}/man1/* -/usr/share/html/autoconf +%doc AUTHORS COPYING ChangeLog NEWS README THANKS TODO %changelog -* Wed May 19 2004 tsintegrate 2.59-5ts -- current (2.59-4ts) integrated as 2.59-5ts for release 1.0-U1 +* Fri Feb 13 2004 Elliot Lee +- rebuilt -* Tue May 11 2004 Omar Kilani 2.59-4ts -- Add BuildRequires m4. +* Thu Dec 18 2003 Jens Petersen - 2.59-2 +- rebuild with perl-5.8.2 [Harald Hoyer] -* Sat Feb 7 2004 Omar Kilani 2.59-1ok -- New upstream. +* Thu Nov 13 2003 Jens Petersen - 2.59-1 +- update to 2.59 bugfix release +- remove autoconf-2.58-fix-ac_abs-109267.patch no longer needed -* Wed Dec 3 2003 Erlend Midttun 2.58-1tr -- New upstream. +* Fri Nov 7 2003 Jens Petersen - 2.58-2 +- fix problem with ac_abs_{build,src}dir (#109267) [reported by Joe Orton, + patch by Alexandre Duret-Lutz] -* Mon Jun 23 2003 Erlend Midttun 2.57-3tr -- Added %defattr. +* Wed Nov 5 2003 Jens Petersen - 2.58-1 +- 2.58 release -* Wed Jun 18 2003 Erlend Midttun 2.57-2tr -- Big rebuild +* Wed Jan 22 2003 Tim Powers +- rebuilt -* Thu May 22 2003 Erlend Midttun 2.57-1em -- New upstream. +* Thu Dec 12 2002 Elliot Lee 2.57-2 +- Fix missing/unpackaged file -* Mon Mar 24 2003 Erlend Midttun 2.53-4em -- Rebuilt against glibc 2.3.2. +* Thu Dec 5 2002 Jens Petersen 2.57-1 +- update to 2.57 bugfix release +- buildrequire emacs (#79031), sed and m4 -* Fri Oct 25 2002 Christian H. Toldnes 2.53-3ct -- Replaced ugly info2man-hack with cute htmlinfo setup +* Sat Nov 23 2002 Jens Petersen 2.56-2 +- add --without check build option to control whether "make check" run +- don't gzip info files explicitly +- use exclude for unwanted info files -* Tue Sep 3 2002 Goetz Bock 2.53-2bg -- removed info stuff +* Thu Nov 21 2002 Jens Petersen +- no longer obsolete autoconf253 -* Thu Jul 18 2002 Nico Erfurth 2.53-1ne -- Updated to 2.53 -- Patches removed, the new package includes them -- Includes automa4te +* Mon Nov 18 2002 Jens Petersen 2.56-1 +- update to 2.56 +- obsolete autoheader-warn patch +- no longer provide autoconf253 +- include site-lisp and man files +- remove info dir which is not in the manifest +- do not version suffix bin files for now -* Thu May 30 2002 Christian H. Toldnes -- Rebuild with -1ct tag. +* Mon Aug 19 2002 Jens Petersen 2.53-8 +- make check -* Fri Feb 01 2002 Erlend Midttun -- New upstream version. +* Fri Jun 28 2002 Jens Petersen 2.53-7 +- update url (#66840) +- added doc files -* Thu Jun 14 2001 Oystein Viggen -- Use %makeinstall macro to make sure exec_prefix and datadir are set +* Fri Jun 21 2002 Tim Powers 2.53-6 +- automated rebuild -* Tue Apr 17 2001 Erlend Midttun -- mkdir a little bit here and there. +* Sun May 26 2002 Tim Powers 2.53-5 +- automated rebuild -* Mon Jan 29 2001 Olaf Trygve Berglihn -- Fixed preun to only delete info files if not upgrading. +* Mon May 20 2002 Bill Nottingham 2.53-4 +- provide autoconf253 -* Mon Feb 28 2000 Lars Gaarden -- moved info file to /usr/share, FHS. +* Thu May 16 2002 Bill Nottingham 2.53-3 +- obsolete autoconf253 +* Wed May 8 2002 Jens Petersen 2.53-2 +- patch autoheader so that --warnings=CATEGORY works (#64566) + [reported with fix by hjl at gnu.org] + +* Tue Apr 23 2002 Jens Petersen 2.53-1 +- update to autoconf-2.53 +- drop mawk patch again +- version suffix bindir files and add symlinks to unversioned names + +* Fri Feb 1 2002 Jens Petersen 2.52-7 +- revert to 2.52 (also fixes #58210!) +- remove relversion variable +- bring back mawk -> gawk patch + +* Wed Jan 09 2002 Tim Powers 2.52-6 +- automated rebuild + +* Thu Dec 20 2001 Jens Petersen 2.52-5 +- update to 2.52f +- add URL +- minor description improvements +- define relversion to carry version number +- mawk.patch no longer needed + +* Sat Nov 17 2001 Florian La Roche 2.52-4 +- rebuild + +* Wed Sep 19 2001 Jens Petersen 2.52-3 +- restore patch to prefer gawk to mawk + +* Tue Sep 18 2001 Florian La Roche 2.52-2 +- update to 2.52d + +* Mon Sep 17 2001 Jens Petersen 2.52-1 +- update to 2.52 +- remove obsolete patches, since already new version +- dont install install-sh + +* Tue Jul 10 2001 Jens Petersen +- add patch to include various standard C headers as needed + by various autoconf tests (#19114) +- add patch to autoscan.pl to get a better choice of init + file (#42071), to test for CPP after CC (#42072) and to + detect C++ source and g++ (#42073). + +* Tue Jun 26 2001 Jens Petersen +- Add a back-port of _AC_PROG_CXX_EXIT_DECLARATION + from version 2.50 to make detection of C++ exit() + declaration prototype platform independent. The check is + done in AC_PROG_CXX with the result stored in "confdefs.h". + The exit() prototype in AC_TRY_RUN_NATIVE is no longer needed. + (fixes #18829) + +* Wed Nov 29 2000 Bernhard Rosenkraenzer +- Fix up interoperability with glibc 2.2 and gcc 2.96: + AC_TRY_RUN_NATIVE in C++ mode added a prototype for exit() to + the test code without throwing an exception, causing a conflict + with stdlib.h --> AC_TRY_RUN_NATIVE for C++ code including stdlib.h + always failed, returning wrong results + +* Fri Jul 21 2000 Nalin Dahyabhai +- add textutils as a dependency (#14439) + +* Wed Jul 12 2000 Prospector +- automatic rebuild + +* Mon Jun 5 2000 Jeff Johnson +- FHS packaging. + +* Sun Mar 26 2000 Florian La Roche +- fix preun + * Fri Mar 26 1999 Cristian Gafton - add patch to help autoconf clean after itself and not leave /tmp clobbered with acin.* and acout.* files (can you say annoying?) @@ -161,3 +239,4 @@ * Thu Jul 17 1997 Erik Troan - built with glibc + From svn at tinysofa.org Thu Jul 1 15:44:52 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:44:52 +1000 (EST) Subject: [tinysofa-svn] r2715 - in tinysofa/snapshot/bison/current: sources specs Message-ID: <20040701154452.600864E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:44:52 +1000 (Fri, 02 Jul 2004) New Revision: 2715 Added: tinysofa/snapshot/bison/current/sources/bison-1.875c.tar.gz Removed: tinysofa/snapshot/bison/current/sources/bison-1.875.tar.bz2 tinysofa/snapshot/bison/current/sources/yacc.c.diff Modified: tinysofa/snapshot/bison/current/specs/bison.spec Log: - Sync with 2.0. - Added: - bison-1.875c.tar.gz: - Removed: - bison-1.875.tar.bz2: - yacc.c.diff: Deleted: tinysofa/snapshot/bison/current/sources/bison-1.875.tar.bz2 =================================================================== (Binary files differ) Added: tinysofa/snapshot/bison/current/sources/bison-1.875c.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/bison/current/sources/bison-1.875c.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: tinysofa/snapshot/bison/current/sources/yacc.c.diff =================================================================== --- tinysofa/snapshot/bison/current/sources/yacc.c.diff 2004-07-01 15:44:48 UTC (rev 2714) +++ tinysofa/snapshot/bison/current/sources/yacc.c.diff 2004-07-01 15:44:52 UTC (rev 2715) @@ -1,82 +0,0 @@ -=================================================================== -RCS file: /cvsroot/bison/bison/data/yacc.c,v -retrieving revision 1.47 -retrieving revision 1.51 -diff -u -r1.47 -r1.51 ---- bison/bison/data/yacc.c 2002/12/28 08:36:02 1.47 -+++ bison/bison/data/yacc.c 2003/01/22 06:38:32 1.51 -@@ -1,7 +1,7 @@ - m4_divert(-1) -*- C -*- - - # Yacc compatible skeleton for Bison --# Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002 -+# Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003 - # Free Software Foundation, Inc. - - # This program is free software; you can redistribute it and/or modify -@@ -134,7 +134,7 @@ - m4_divert(0)dnl - @output @output_parser_name@ - b4_copyright([Skeleton parser for Yacc-like parsing with Bison], -- [1984, 1989, 1990, 2000, 2001, 2002])[ -+ [1984, 1989, 1990, 2000, 2001, 2002, 2003])[ - - /* As a special exception, when this file is copied by Bison into a - Bison output file, you may use that output file without restriction. -@@ -465,7 +465,15 @@ - - #define YYACCEPT goto yyacceptlab - #define YYABORT goto yyabortlab --#define YYERROR goto yyerrlab1 -+#define YYERROR ]b4_location_if([do \ -+ { \ -+ yylerrsp = yylsp; \ -+ *++yylerrsp = yyloc; \ -+ goto yyerrlab1; \ -+ } \ -+ while (0)], -+ [goto yyerrlab1])[ -+ - - /* Like YYERROR except do call yyerror. This remains here temporarily - to ease the transition to the new meaning of YYERROR, for GCC. -@@ -1103,29 +1111,13 @@ - - /* Else will try to reuse lookahead token after shifting the error - token. */ -- goto yyerrlab2; -+ goto yyerrlab1; - - - /*----------------------------------------------------. - | yyerrlab1 -- error raised explicitly by an action. | - `----------------------------------------------------*/ - yyerrlab1: -- -- /* Suppress GCC warning that yyerrlab1 is unused when no action -- invokes YYERROR. */ --#if defined (__GNUC_MINOR__) && 2093 <= (__GNUC__ * 1000 + __GNUC_MINOR__) -- __attribute__ ((__unused__)) --#endif -- --]b4_location_if([ yylerrsp = yylsp; -- *++yylerrsp = yyloc;])[ -- goto yyerrlab2; -- -- --/*---------------------------------------------------------------. --| yyerrlab2 -- pop states until the error token can be shifted. | --`---------------------------------------------------------------*/ --yyerrlab2: - yyerrstatus = 3; /* Each real token shifted decrements this. */ - - for (;;) -@@ -1204,7 +1196,7 @@ - m4_if(b4_defines_flag, 0, [], - [@output @output_header_name@ - b4_copyright([Skeleton parser for Yacc-like parsing with Bison], -- [1984, 1989, 1990, 2000, 2001, 2002]) -+ [1984, 1989, 1990, 2000, 2001, 2002, 2003]) - - /* As a special exception, when this file is copied by Bison into a - Bison output file, you may use that output file without restriction. Modified: tinysofa/snapshot/bison/current/specs/bison.spec =================================================================== --- tinysofa/snapshot/bison/current/specs/bison.spec 2004-07-01 15:44:48 UTC (rev 2714) +++ tinysofa/snapshot/bison/current/specs/bison.spec 2004-07-01 15:44:52 UTC (rev 2715) @@ -1,139 +1,172 @@ Summary: A GNU general-purpose parser generator. Name: bison -Version: 1.875 -Release: 12ts +Version: 1.875c +Release: 2ts License: GPL -Group: tinysofa official -Source: ftp://ftp.gnu.org/gnu/bison/bison-%{version}.tar.bz2 -Requires: m4 -BuildRequires: texinfo m4 -PreReq: htmlinfo -BuildRoot: %{_tmppath}/%{name}-root -Patch0: yacc.c.diff +Group: Development/Tools +#Source: ftp://ftp.gnu.org/pub/gnu/bison/bison-%{version}.tar.bz2 +Source: ftp://alpha.gnu.org/gnu/bison/bison-%{version}.tar.gz +Url: http://www.gnu.org/software/bison/bison.html +Prereq: /sbin/install-info +BuildRoot: %{_tmppath}/%{name}-%{version}-root +Requires: m4 >= 1.4 %description -Bison is a general purpose parser generator which converts a grammar -description for an LALR(1) context-free grammar into a C program to parse -that grammar. Bison can be used to develop a wide range of language -parsers, from ones used in simple desk calculators to complex programming -languages. Bison is upwardly compatible with Yacc, so any correctly -written Yacc grammar should work with Bison without any changes. If -you know Yacc, you shouldn't have any trouble using Bison. You do need -to be very proficient in C programming to be able to use Bison). Bison -is only needed on systems that are used for development. +Bison is a general purpose parser generator that converts a grammar +description for an LALR(1) context-free grammar into a C program to +parse that grammar. Bison can be used to develop a wide range of +language parsers, from ones used in simple desk calculators to complex +programming languages. Bison is upwardly compatible with Yacc, so any +correctly written Yacc grammar should work with Bison without any +changes. If you know Yacc, you shouldn't have any trouble using +Bison. You do need to be very proficient in C programming to be able +to use Bison. Bison is only needed on systems that are used for +development. -If your system will be used for C development, you should install Bison -since it is used to build many C programs. +If your system will be used for C development, you should install +Bison. %prep %setup -q -%patch0 -p2 %build -%configure -make LDFLAGS=-s +%configure +make -# HTMLise info -cd doc -makeinfo --html --no-split bison.texinfo - %install -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT -make DESTDIR=${RPM_BUILD_ROOT} install +rm -rf $RPM_BUILD_ROOT +%makeinstall -strip ${RPM_BUILD_ROOT}%{_prefix}/bin/* || true -mkdir -p $RPM_BUILD_ROOT/usr/share/html/%{name} -install -m 644 doc/%{name}.html $RPM_BUILD_ROOT/usr/share/html/%{name}/ +# Remove unpackaged files. +rm -f $RPM_BUILD_ROOT/%{_bindir}/yacc +rm -f $RPM_BUILD_ROOT/%{_infodir}/dir -# Let byacc provice yacc alone: -rm $RPM_BUILD_ROOT/%{_prefix}/bin/yacc - -# nuke info pages -rm -rf $RPM_BUILD_ROOT/usr/share/info - %find_lang %{name} -%clean -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT +gzip -9nf ${RPM_BUILD_ROOT}%{_infodir}/bison.info* %post -/usr/sbin/htmlinfo_update.sh +/sbin/install-info %{_infodir}/bison.info.gz %{_infodir}/dir --entry="* bison: (bison). The GNU parser generator." -%postun -/usr/sbin/htmlinfo_update.sh +%preun +if [ $1 = 0 ]; then + /sbin/install-info --delete %{_infodir}/bison.info.gz %{_infodir}/dir --entry="* bison: (bison). The GNU parser generator." +fi %files -f %{name}.lang %defattr(-,root,root) +%{_mandir}/*/bison* +%{_datadir}/bison +%{_infodir}/bison.info* +%{_bindir}/bison %{_libdir}/liby.a -%{_mandir}/*/* -%{_prefix}/share/bison -%{_prefix}/share/html/%{name} -%{_prefix}/bin/* +%clean +rm -rf $RPM_BUILD_ROOT + %changelog -* Wed May 19 2004 tsintegrate 1.875-12ts -- current (1.875-11ts) integrated as 1.875-12ts for release 1.0-U1 +* Tue Jun 15 2004 Elliot Lee +- rebuilt -* Tue May 11 2004 Omar Kilani 1.875-11ts -- Remove BuildRequires /usr/bin/makeinfo. -- Add BuildRequires texinfo. -- Add BuildRequires m4. +* Fri Jun 4 2004 Roland McGrath 1.875c-1 +- new upstream version (fixes bug #116823) -* Sun Mar 28 2004 Omar Kilani 1.875-11ts -- initial tinysofa release -- nuke info pages -- find_lang -- add liby.a to files. +* Tue Mar 02 2004 Elliot Lee +- rebuilt -* Fri Dec 12 2003 Erlend Midttun 1.875-8tr -- Big rebuild +* Fri Feb 13 2004 Elliot Lee +- rebuilt -* Wed Jun 18 2003 Erlend Midttun 1.875-7tr -- Big rebuild +* Thu Oct 30 2003 Roland McGrath 1.875-6 +- add dependency on m4 (bug #108655) -* Thu May 22 2003 Erlend Midttun 1.875-6em -- Req: m4 +* Wed Sep 24 2003 Roland McGrath 1.875-5 +- remove problematic __attribute__ use for label (bug #105034) -* Wed Apr 9 2003 Gerald Dachs 1.875-5gd -- Added PreReq on htmlinfo +* Fri Aug 1 2003 Havoc Pennington 1.875-3 +- put #ifndef __cplusplus around attribute(unused) on goto label in yacc.c -* Mon Mar 24 2003 Erlend Midttun 1.875-4em -- Rebuilt against glibc 2.3.2. +* Wed Jun 04 2003 Elliot Lee +- rebuilt -* Wed Mar 12 2003 Ken A. Rederg?rd 1.875-3kr -- Added patch that lets g++3.2 compile bison generated code +* Sat Mar 22 2003 Roland McGrath 1.875-2 +- update specs for new files installed by new version -* Thu Feb 6 2003 Christian H. Toldnes 1.875-2ct -- Let byacc provide /usr/bin/yacc +* Wed Mar 19 2003 Roland McGrath 1.875-1 +- new upstream version 1.875 (bug #83184) -* Sun Jan 12 2003 Goetz Bock 1.875-1bg -- new upstream: 1.875 +* Wed Jan 22 2003 Tim Powers +- rebuilt -* Thu Oct 24 2002 Christian H. Toldnes 1.75-2ct -- introduced htmlinfo. +* Wed Nov 27 2002 Than Ngo 1.35-5 +- rebuild in new build enviroment +- remove unneeded file -* Sun Oct 20 2002 Goetz Bock 1.75-1bg -- new upstream version -- removed info +* Fri Jun 21 2002 Tim Powers +- automated rebuild -* Thu Jul 25 2002 Nico Erfurth 1.35-1ne -- new upstream version -- cleaned specfile -- bison.parsers are in /usr/share/bison now +* Tue Jun 18 2002 Than Ngo 1.35-3 +- don't forcibly strip binaries -* Tue Jul 23 2002 Daniel Meyer 1.28-5dm -- rebuild for Trustix Secure Linux 2.0 +* Thu May 23 2002 Tim Powers +- automated rebuild -* Mon Feb 28 2000 Lars Gaarden -- moved info-files to /usr/share/info +* Wed Mar 27 2002 Than Ngo 1.35-1 +- 1.35 fix incompatible with C++ compilers (bug #62121) -* Thu Feb 03 2000 Preston Brown +* Sun Mar 17 2002 Florian La Roche +- update to 1.34 + +* Sat Feb 09 2002 Florian La Roche +- update to 1.33 + +* Sat Jan 26 2002 Florian La Roche +- update to 1.32 + +* Tue Jan 15 2002 Florian La Roche +- update to 1.31 + +* Wed Jan 09 2002 Tim Powers +- automated rebuild + +* Mon Nov 27 2001 Than Ngo 1.30-4 +- add missing Url + +* Sun Nov 25 2001 Than Ngo 1.30-3 +- fixed coredumps on some input bug #56607i, thanks to Enrico for locating this bug + +* Tue Nov 06 2001 Than Ngo 1.30-2 +- FHS packaging +- use find_lang + +* Sun Nov 04 2001 Florian La Roche +- update to 1.30 + +* Mon Oct 15 2001 Than Ngo 1.29-1 +- update to 1.29 +- update Url (bug #54597) + +* Sun Jun 24 2001 Elliot Lee +- Bump release + rebuild. + +* Wed Jul 12 2000 Prospector +- automatic rebuild + +* Sun Jun 18 2000 Than Ngo +- rebuilt in the new build environment +- FHS packaging + +* Sat May 27 2000 Ngo Than +- rebuild for 7.0 +- put man pages and info files to correct place + +* Thu Feb 03 2000 Preston Brown - rebuild to gzip man page. * Fri Jul 16 1999 Jeff Johnson - update to 1.28. -* Sun Mar 21 1999 Cristian Gafton +* Sun Mar 21 1999 Cristian Gafton - auto rebuild in the new build environment (release 3) * Mon Mar 8 1999 Jeff Johnson From svn at tinysofa.org Thu Jul 1 15:44:58 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:44:58 +1000 (EST) Subject: [tinysofa-svn] r2717 - in tinysofa/snapshot/byacc/current: sources specs Message-ID: <20040701154458.82EB74E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:44:58 +1000 (Fri, 02 Jul 2004) New Revision: 2717 Added: tinysofa/snapshot/byacc/current/sources/bsdyacc-linux.patch tinysofa/snapshot/byacc/current/sources/yacc-1.9-fbsd.tar.gz Removed: tinysofa/snapshot/byacc/current/sources/byacc-1.9-fixmanpage.patch tinysofa/snapshot/byacc/current/sources/byacc.1.9.tar.Z Modified: tinysofa/snapshot/byacc/current/sources/byacc-1.9-security.patch tinysofa/snapshot/byacc/current/specs/byacc.spec Log: - Sync with 2.0. - Kept: - byacc-1.9-security.patch: - Added: - bsdyacc-linux.patch: - yacc-1.9-fbsd.tar.gz: - Removed: - byacc-1.9-fixmanpage.patch: - byacc.1.9.tar.Z: Added: tinysofa/snapshot/byacc/current/sources/bsdyacc-linux.patch =================================================================== --- tinysofa/snapshot/byacc/current/sources/bsdyacc-linux.patch 2004-07-01 15:44:55 UTC (rev 2716) +++ tinysofa/snapshot/byacc/current/sources/bsdyacc-linux.patch 2004-07-01 15:44:58 UTC (rev 2717) @@ -0,0 +1,100 @@ +--- yacc/Makefile.linux Thu Sep 28 12:15:28 2000 ++++ yacc/Makefile Thu Sep 28 12:15:33 2000 +@@ -1,15 +1,84 @@ +-# @(#)Makefile 5.3 (Berkeley) 5/12/90 +-# $FreeBSD: src/usr.bin/yacc/Makefile,v 1.8 1999/08/28 01:07:58 peter Exp $ ++DEST = . + +-PROG= yacc +-SRCS= closure.c error.c lalr.c lr0.c main.c mkpar.c output.c reader.c \ +- skeleton.c symtab.c verbose.c warshall.c +-MAN1= yacc.1 yyfix.1 +-LINKS+= ${BINDIR}/yacc ${BINDIR}/byacc +-MLINKS+=yacc.1 byacc.1 +- +-beforeinstall: +- ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ +- ${.CURDIR}/yyfix.sh ${DESTDIR}${BINDIR}/yyfix ++HDRS = defs.h + +-.include ++CFLAGS = -O -DNDEBUG ++ ++LDFLAGS = ++ ++LIBS = ++ ++LINKER = cc ++ ++MAKEFILE = Makefile ++ ++OBJS = closure.o \ ++ error.o \ ++ lalr.o \ ++ lr0.o \ ++ main.o \ ++ mkpar.o \ ++ output.o \ ++ reader.o \ ++ skeleton.o \ ++ symtab.o \ ++ verbose.o \ ++ warshall.o ++ ++PRINT = pr -f -l88 ++ ++PROGRAM = yacc ++ ++SRCS = closure.c \ ++ error.c \ ++ lalr.c \ ++ lr0.c \ ++ main.c \ ++ mkpar.c \ ++ output.c \ ++ reader.c \ ++ skeleton.c \ ++ symtab.c \ ++ verbose.c \ ++ warshall.c ++ ++all: $(PROGRAM) ++ ++$(PROGRAM): $(OBJS) $(LIBS) ++ @echo -n "Loading $(PROGRAM) ... " ++ @$(LINKER) $(LDFLAGS) -o $(PROGRAM) $(OBJS) $(LIBS) ++ @echo "done" ++ ++clean:; @rm -f $(OBJS) ++ ++clobber:; @rm -f $(OBJS) $(PROGRAM) ++ ++depend:; @mkmf -f $(MAKEFILE) PROGRAM=$(PROGRAM) DEST=$(DEST) ++ ++index:; @ctags -wx $(HDRS) $(SRCS) ++ ++install: $(PROGRAM) ++ @echo Installing $(PROGRAM) in $(DEST) ++ @install -s $(PROGRAM) $(DEST) ++ ++listing:; @$(PRINT) Makefile $(HDRS) $(SRCS) | lpr ++ ++lint:; @lint $(SRCS) ++ ++program: $(PROGRAM) ++ ++tags: $(HDRS) $(SRCS); @ctags $(HDRS) $(SRCS) ++ ++### ++closure.o: defs.h ++error.o: defs.h ++lalr.o: defs.h ++lr0.o: defs.h ++main.o: defs.h ++mkpar.o: defs.h ++output.o: defs.h ++reader.o: defs.h ++skeleton.o: defs.h ++symtab.o: defs.h ++verbose.o: defs.h ++warshall.o: defs.h Deleted: tinysofa/snapshot/byacc/current/sources/byacc-1.9-fixmanpage.patch =================================================================== --- tinysofa/snapshot/byacc/current/sources/byacc-1.9-fixmanpage.patch 2004-07-01 15:44:55 UTC (rev 2716) +++ tinysofa/snapshot/byacc/current/sources/byacc-1.9-fixmanpage.patch 2004-07-01 15:44:58 UTC (rev 2717) @@ -1,20 +0,0 @@ ---- byacc-1.9/yacc.1.fixmanpage Wed Apr 7 18:25:23 1999 -+++ byacc-1.9/yacc.1 Wed Apr 7 18:26:01 1999 -@@ -44,13 +44,13 @@ - .B -l - option is not specified, - .I yacc --will insert \#line directives in the generated code. --The \#line directives let the C compiler relate errors in the -+will insert #line directives in the generated code. -+The #line directives let the C compiler relate errors in the - generated code to the user's original code. - If the \fB-l\fR option is specified, - .I yacc --will not insert the \#line directives. --\&\#line directives specified by the user will be retained. -+will not insert the #line directives. -+\&#line directives specified by the user will be retained. - .TP - \fB-p \fIsymbol_prefix\fR - The Modified: tinysofa/snapshot/byacc/current/sources/byacc-1.9-security.patch =================================================================== --- tinysofa/snapshot/byacc/current/sources/byacc-1.9-security.patch 2004-07-01 15:44:55 UTC (rev 2716) +++ tinysofa/snapshot/byacc/current/sources/byacc-1.9-security.patch 2004-07-01 15:44:58 UTC (rev 2717) @@ -1,7 +1,18 @@ -diff -urN byacc-1.9/main.c byacc-1.9.security/main.c ---- byacc-1.9/main.c 1993-02-22 06:32:46.000000000 +0000 -+++ byacc-1.9.security/main.c 2004-05-17 05:55:25.000000000 +0000 -@@ -64,9 +64,18 @@ +--- yacc/main.c.security Mon Jan 10 15:26:24 2000 ++++ yacc/main.c Fri Jan 5 10:21:29 2001 +@@ -109,6 +109,11 @@ + short **derives; + char *nullable; + ++#ifdef linux ++# define mktemp safe_mktemp ++extern void safe_mktemp(char *tmpl); ++#endif ++ + static void create_file_names __P((void)); + static void getargs __P((int, char **)); + static void onintr __P((int)); +@@ -121,9 +126,18 @@ done(k) int k; { @@ -23,19 +34,7 @@ exit(k); } -@@ -94,6 +103,11 @@ - } - - -+#ifdef linux -+# define mktemp safe_mktemp -+extern void safe_mktemp(char *tmpl); -+#endif -+ - usage() - { - fprintf(stderr, "usage: %s [-dlrtv] [-b file_prefix] [-p symbol_prefix] filename\n", myname); -@@ -355,6 +369,19 @@ +@@ -482,6 +496,19 @@ code_file = output_file; } Deleted: tinysofa/snapshot/byacc/current/sources/byacc.1.9.tar.Z =================================================================== (Binary files differ) Added: tinysofa/snapshot/byacc/current/sources/yacc-1.9-fbsd.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/byacc/current/sources/yacc-1.9-fbsd.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: tinysofa/snapshot/byacc/current/specs/byacc.spec =================================================================== --- tinysofa/snapshot/byacc/current/specs/byacc.spec 2004-07-01 15:44:55 UTC (rev 2716) +++ tinysofa/snapshot/byacc/current/specs/byacc.spec 2004-07-01 15:44:58 UTC (rev 2717) @@ -1,13 +1,14 @@ Summary: A public domain Yacc parser generator. Name: byacc Version: 1.9 -Release: 23ts -License: public domain -Group: tinysofa official -Source: ftp://ftp.cs.berkeley.edu/ucb/4bsd/byacc.1.9.tar.Z -Patch0: byacc-1.9-fixmanpage.patch +Release: 28ts +Copyright: public domain +Group: Development/Tools +# The source is taken from FreeBSD's CVS as of Thu Sep 28 2000 +Source: yacc-1.9-fbsd.tar.gz +Patch: bsdyacc-linux.patch Patch1: byacc-1.9-security.patch -BuildRoot: %{_tmppath}/%{name}-root +BuildRoot: %{_tmppath}/%{name}-%{version}-root %description Byacc (Berkeley Yacc) is a public domain LALR parser generator which @@ -17,60 +18,81 @@ this package. %prep -%setup -q -c -%patch0 -p1 -%patch1 -p1 +%setup -q -n yacc +%patch -p1 -b .lnx +%patch1 -p1 -b .security %build chmod u+w `find .` -make CFLAGS="$RPM_OPT_FLAGS" +make CFLAGS="$RPM_OPT_FLAGS -DNDEBUG" LINKER=%{__cc} %install -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf "$RPM_BUILD_ROOT" -mkdir -p $RPM_BUILD_ROOT/usr/{bin,share/man/man1} +rm -rf $RPM_BUILD_ROOT +mkdir -p $RPM_BUILD_ROOT{/usr/bin,%{_mandir}/man1} install -c -m 755 -s yacc $RPM_BUILD_ROOT/usr/bin/yacc -install -c -m 644 yacc.1 $RPM_BUILD_ROOT/usr/share/man/man1/yacc.1 +install -c -m 644 yacc.1 $RPM_BUILD_ROOT%{_mandir}/man1/yacc.1 ln -sf yacc $RPM_BUILD_ROOT/usr/bin/byacc -ln -sf yacc.1 $RPM_BUILD_ROOT/usr/share/man/man1/byacc.1 +ln -sf yacc.1.gz $RPM_BUILD_ROOT%{_mandir}/man1/byacc.1.gz %clean -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf "$RPM_BUILD_ROOT" +rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) /usr/bin/yacc /usr/bin/byacc -/usr/share/man/man1/yacc.1* -/usr/share/man/man1/byacc.1* +%{_mandir}/man1/yacc.1* +%{_mandir}/man1/byacc.1* %changelog -* Wed May 19 2004 tsintegrate 1.9-23ts -- current (1.9-23ok) integrated as 1.9-23ts for release 1.0-U1 +* Tue Jun 15 2004 Elliot Lee +- rebuilt -* Mon May 17 2004 Omar Kilani 1.9-23ok -- Fix non-root build. -- Add mktemp security patch. +* Fri Feb 13 2004 Elliot Lee +- rebuilt -* Mon Dec 8 2003 Erlend Midttun 1.9-19tr -- Big rebuild +* Wed Jun 04 2003 Elliot Lee +- rebuilt -* Wed Jun 18 2003 Erlend Midttun 1.9-18tr -- Big rebuild +* Wed Jan 22 2003 Tim Powers +- rebuilt -* Mon Mar 24 2003 Erlend Midttun 1.9-17em -- Rebuilt against glibc 2.3.2. +* Thu Dec 05 2002 Elliot Lee 1.9-23 +- Rebuild -* Wed Jul 24 2002 Daniel Meyer 1.9-16dm -- rebuild for Trustix Secure Linux 2.0 +* Fri Jun 21 2002 Tim Powers +- automated rebuild -* Wed Mar 22 2000 Lars Gaarden -- Fixed symlinks, manpages +* Thu May 23 2002 Tim Powers +- automated rebuild -* Tue Feb 15 2000 Erlend Midttun -- Added opts -- Moved man pages +* Wed Jan 09 2002 Tim Powers +- automated rebuild +* Sun Jun 24 2001 Elliot Lee +- Bump release + rebuild. + +* Fri Jan 05 2001 Preston Brown +- security patch for tmpfile creation from Olaf Kirch + +* Fri Sep 29 2000 Bernhard Rosenkraenzer +- Update to the version in FreeBSD CVS - it's actively maintained, unlike + the 1993 4BSD version we used to have + +* Wed Jul 12 2000 Prospector +- automatic rebuild + +* Wed Jun 28 2000 Bill Nottingham +- fix perms in tarball + +* Mon Jun 19 2000 Bernhard Rosenkraenzer +- FHSify +- handle RPM_OPT_FLAGS + +* Sat May 6 2000 Bill Nottingham +- fix yacc for ia64 + * Fri Feb 4 2000 Bernhard Rosenkraenzer - rebuild to compress man pages - fix up manpage symlink @@ -94,4 +116,4 @@ - various spec file cleanups * Mon Jun 02 1997 Erik Troan -- built against glibc \ No newline at end of file +- built against glibc From svn at tinysofa.org Thu Jul 1 15:45:00 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:45:00 +1000 (EST) Subject: [tinysofa-svn] r2718 - tinysofa/snapshot/bzip2/current/specs Message-ID: <20040701154500.B7E3B4E817D@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:45:00 +1000 (Fri, 02 Jul 2004) New Revision: 2718 Modified: tinysofa/snapshot/bzip2/current/specs/bzip2.spec Log: - Sync with 2.0. - Kept: - bzip2-1.0.2-saneso.patch: - bzip2-1.0.2.tar.gz: Modified: tinysofa/snapshot/bzip2/current/specs/bzip2.spec =================================================================== --- tinysofa/snapshot/bzip2/current/specs/bzip2.spec 2004-07-01 15:44:58 UTC (rev 2717) +++ tinysofa/snapshot/bzip2/current/specs/bzip2.spec 2004-07-01 15:45:00 UTC (rev 2718) @@ -1,212 +1,236 @@ -%define libname %{mklibname bz2} -%define libname_devel %{mklibname bz2 -d} - +Summary: A file compression utility. Name: bzip2 Version: 1.0.2 -Release: 15ok -Summary: Extremely powerful file compression utility -Summary(pt_BR): Compactador de arquivo extremamente poderoso -Summary(es): Un compresor de archivos con un nuevo algoritmo -Group: tinysofa/main -Group(pt_BR): tinysofa/main -Group(es): tinysofa/main +Release: 12.1ts License: BSD +Group: Applications/File URL: http://sources.redhat.com/bzip2/ -Source: ftp://sources.redhat.com/pub/bzip2/v102/%{name}-%{version}.tar.gz +Source: ftp://sources.redhat.com/pub/bzip2/v102/bzip2-%{version}.tar.gz Patch: bzip2-1.0.2-saneso.patch -Requires: %{libname} >= 1.0.1 -Provides: %{_bindir}/bzip2 -BuildRequires: binutils -BuildRequires: gcc -BuildRequires: glibc-devel -BuildRequires: make BuildRoot: %{_tmppath}/%{name}-%{version}-root +Requires: bzip2-libs = %{version} %description -bzip2 compresses files using the Burrows-Wheeler block-sorting text compression -algorithm, and Huffman coding. Compression is generally considerably better -than that achieved by more conventional LZ77/LZ78-based compressors, and -approaches the performance of the PPM family of statistical compressors. +Bzip2 is a freely available, patent-free, high quality data compressor. +Bzip2 compresses files to within 10 to 15 percent of the capabilities +of the best techniques available. However, bzip2 has the added benefit +of being approximately two times faster at compression and six times +faster at decompression than those techniques. Bzip2 is not the +fastest compression utility, but it does strike a balance between speed +and compression capability. -The command-line options are deliberately very similar to those of GNU Gzip, -but they are not identical. +Install bzip2 if you need a compression utility. -%description -l pt_BR -O bzip2 ? um programa de compress?o/descompress?o. Tipicamente o arquivo -compactado fica 20 a 30 por cento menor do que se fosse compactado com o gzip. +%package devel +Summary: Header files and libraries for developing apps which will use bzip2. +Group: Development/Libraries +Requires: bzip2 = %{version}, bzip2-libs = %{version} -Note que o bzip2 n?o entende os arquivos do bzip original, nem os arquivos do -gzip. +%description devel -%description -l es -Bzip2 es un programa de compresi?n/descompresi?n. T?picamente el archivo -compactado queda entre 20 la 30 por ciento menor de que se fuera compactado con -gzip. Observa que bzip2 no entiende los archivos del bzip original, ni los -archivos del gzip. +Header files and a static library of bzip2 functions, for developing apps +which will use the library. -%package -n %{libname} -Summary: bzip2 shared libraries -Summary(pt_BR): Bibliotecas compartilhadas do bzip2 -Group: tinysofa/libraries -Group(es): tinysofa/bibliotecas -Group(pt_BR): tinysofa/bibliotecas -Provides: libbz2.a -Provides: libbz2.so -Conflicts: bzip2 < 1.0.1 -%rename bzip2-libs +%package libs +Summary: Libraries for applications using bzip2 +Group: System Environment/Libraries -%description -n %{libname} -Bzip2 compresses files using the Burrows-Wheeler block-sorting text -compression algorithm, and Huffman coding. Compression is generally -considerably better than that achieved by more conventional LZ77/LZ78-based -compressors, and approaches the performance of the PPM family of statistical -compressors. +%description libs -Shared libraries. +Libraries for applications using the bzip2 compression format. -%description -l pt_BR -n %{libname} -A libbz2 ? um biblioteca de compress?o/descompress?o. Tipicamente o arquivo -compactado fica 20 a 30 por cento menor do que se fosse compactado com o gzip. - -%package -n %{libname_devel} -Summary: Header files and libraries needed for bzip2 development -Summary(pt_BR): Arquivos de inclus?o e biblioteca de desenvolvimento para o bzip2 -Group: tinysofa/development -Group(pt_BR): tinysofa/desenvolvimento -Group(es): tinysofa/desarrollo -PreReq: %{libname} = %{version} -Conflicts: bzip2 < 1.0.1 -%rename bzip2-devel - -%description -n %{libname_devel} -This package includes the header files and libraries needed for -developing programs using bzip2 - -%description -l pt_BR -n %{libname_devel} -Este pacote inclui arquivos de inclus?o e biblioteca necess?rio para o -desenvolvimento de programas que usam o bzip2. - -%package doc -Summary: Extra documentation about bzip2 -Summary(pt_BR): Documenta??o adicional sobre o bzip2 -Group: tinysofa/documentation -Group(pt_BR): tinysofa/documenta??o -Group(es): tinysofa/documentaci?n - -%description doc -Extra documentation about bzip2 - -%description -l pt_BR doc -Documenta??o adicional sobre o bzip2 - %prep -%setup -q +%setup -q %patch -p1 %build + make -f Makefile-libbz2_so CC=%{__cc} AR=%{__ar} RANLIB=%{__ranlib} \ - CFLAGS="%{optflags} -D_FILE_OFFSET_BITS=64 -fpic -fPIC" \ - %{?_smp_mflags} all + CFLAGS="$RPM_OPT_FLAGS -D_FILE_OFFSET_BITS=64 -fpic -fPIC" \ + %{?_smp_mflags} all + rm -f *.o make CC=%{__cc} AR=%{__ar} RANLIB=%{__ranlib} \ - CFLAGS="%{optflags} -D_FILE_OFFSET_BITS=64" \ - %{?_smp_mflags} all + CFLAGS="$RPM_OPT_FLAGS -D_FILE_OFFSET_BITS=64" \ + %{?_smp_mflags} all %install -rm -rf %{buildroot} -mkdir -p %{buildroot}/{%{_bindir},%{_mandir}/man1,%{_libdir},%{_includedir}} -install -m 755 bzlib.h %{buildroot}/%{_includedir} -install -m 755 libbz2.so.1.0.2 %{buildroot}/%{_libdir} -install -m 755 libbz2.a %{buildroot}/%{_libdir} -install -m 755 bzip2-shared %{buildroot}/%{_bindir}/bzip2 -install -m 755 bzip2recover bzgrep bzdiff bzmore %{buildroot}/%{_bindir}/ -install -m 644 bzip2.1 bzdiff.1 bzgrep.1 bzmore.1 %{buildroot}/%{_mandir}/man1/ -ln -s bzip2 %{buildroot}/%{_bindir}/bunzip2 -ln -s bzip2 %{buildroot}/%{_bindir}/bzcat -ln -s bzdiff %{buildroot}/%{_bindir}/bzcmp -ln -s bzmore %{buildroot}/%{_bindir}/bzless -ln -s libbz2.so.1.0.2 %{buildroot}/%{_libdir}/libbz2.so.1 -ln -s libbz2.so.1 %{buildroot}/%{_libdir}/libbz2.so -ln -s bzip2.1 %{buildroot}/%{_mandir}/man1/bzip2recover.1 -ln -s bzip2.1 %{buildroot}/%{_mandir}/man1/bunzip2.1 -ln -s bzip2.1 %{buildroot}/%{_mandir}/man1/bzcat.1 -ln -s bzdiff.1 %{buildroot}/%{_mandir}/man1/bzcmp.1 -ln -s bzmore.1 %{buildroot}/%{_mandir}/man1/bzless.1 +rm -rf ${RPM_BUILD_ROOT} -( cd %{buildroot}%{_prefix} - cat > bin/bzless < -- tinysofa. +* Tue Mar 02 2004 Elliot Lee +- rebuilt -* Thu Dec 25 2003 Arnaldo Carvalho de Melo -+ 2003-12-25 20:24:51 (42301) -- Add the bzip2-1.0.2-saneso.patch patch from recent rh +* Fri Feb 13 2004 Elliot Lee +- rebuilt -* Thu Dec 25 2003 Arnaldo Carvalho de Melo -+ 2003-12-25 20:03:17 (42300) -- Obsoletes bzip2-libs -- Use the build process in recent bzip2 rh specs -- Remove "translations" to spanish +* Tue Jun 17 2003 Jeff Johnson 1.0.2-11 +- rebuilt because of crt breakage on ppc64. -* Sun Sep 07 2003 Arnaldo Carvalho de Melo -+ 2003-09-07 11:38:03 (35378) -- Use plain %%configure, not libtoolize, autoconf, etc, etc +* Wed Jun 04 2003 Elliot Lee +- rebuilt -* Sun Sep 07 2003 Arnaldo Carvalho de Melo -+ 2003-09-07 11:25:44 (35377) -- Remove %%{release} from -devel +* Mon Mar 31 2003 Jeff Johnson 1.0.2-9 +- rebuild to get rid of undefined __ctype_b in libbz2.a. -* Thu Apr 10 2003 Arnaldo Carvalho de Melo -+ 2003-04-10 14:01:28 (29670) -- Update Source and URL to new location, sourceware.cygnus is no more. +* Wed Jan 22 2003 Tim Powers +- rebuilt -* Tue Sep 03 2002 Gustavo Niemeyer -+ 2002-09-03 14:20:48 (11231) -- Imported package from snapshot. +* Thu Nov 21 2002 Elliot Lee +- Pass __cc/__ar/__ranlib to makefiles +- Use _smp_mflags -* Thu Aug 29 2002 Gustavo Niemeyer -+ 2002-08-29 17:23:38 (7421) -- Imported package from 8.0. +* Tue Nov 19 2002 Tim Powers +- rebuild on all arches +- fix %%doc file list -* Wed Aug 28 2002 Gustavo Niemeyer -+ 2002-08-28 18:11:54 (3778) -- Imported package from 7.0. +* Fri Jun 21 2002 Tim Powers +- automated rebuild -* Tue Aug 27 2002 Gustavo Niemeyer -+ 2002-08-27 18:43:44 (227) -- Imported package from 6.0. +* Thu May 23 2002 Tim Powers +- automated rebuild + +* Thu Apr 25 2002 Trond Eivind Glomsr?d 1.0.2-3 +- Rebuild in new environment + +* Thu Feb 21 2002 Trond Eivind Glomsr?d 1.0.2-2 +- Rebuild + +* Wed Jan 30 2002 Trond Eivind Glomsr?d 1.0.2-1 +- 1.0.2 +- Total overhaul of build precedure +- Add many small helper programs added to 1.0.2 +- drop old patches + +* Wed Jan 09 2002 Tim Powers +- automated rebuild + +* Mon Nov 26 2001 Trond Eivind Glomsr?d 1.0.1-5 +- Don't segfault when infile is a directory and "-f" is used (#56623) +- Automake is evil. Add workaround + +* Fri Mar 30 2001 Trond Eivind Glomsr?d +- use "License" instead of "Copyright" +- split out libs + +* Fri Jul 21 2000 Trond Eivind Glomsr?d +- new URL and source location + +* Wed Jul 12 2000 Prospector +- automatic rebuild + +* Sat Jul 01 2000 Trond Eivind Glomsr?d +- 1.0.1 +- ported my patch + +* Tue Jun 13 2000 Jeff Johnson +- FHS packaging to build on solaris2.5.1. +- remove config.cache from autoconf patch. +- sparc: use %%configure, but not the m4 macros. + +* Tue Jun 06 2000 Trond Eivind Glomsr?d +- Use %%configure, %%makeinstall, %%{_manpath} and %%{_tmpdir} + +* Wed May 17 2000 Trond Eivind Glomsr?d +- 1.0.0 - ported my 1.0pre8 libtoolizedautoconf patch + +* Tue May 16 2000 Trond Eivind Glomsr?d +- use soft links, not hardlinks, for binaries +- mv .so to devel + +* Mon May 15 2000 Trond Eivind Glomsr?d +- autoconfed and libtoolized package +- fixed Copyright (it's BSD, not GPL) +- dumped bzless (less works fine with bz2-files) +- rewrote build and install parts +- separated main package and devel package + +* Mon May 8 2000 Bernhard Rosenkr?nzer +- 1.0pre8 + +* Fri Apr 14 2000 Bernhard Rosenkr?nzer +- Add bzgrep (a version of zgrep hacked to do bzip2) + +* Mon Feb 7 2000 Bill Nottingham +- handle compressed manpages + +* Fri Dec 31 1999 Bernhard Rosenkr?nzer +- 0.9.5d +- Update download URL, add URL: tag in header + +* Tue Aug 10 1999 Jeff Johnson +- upgrade to 0.9.5c. + +* Mon Aug 9 1999 Bill Nottingham +- install actual bzip2 binary, not libtool cruft. + +* Sun Aug 8 1999 Jeff Johnson +- run ldconfig to get shared library. + +* Mon Aug 2 1999 Jeff Johnson +- create shared libbz1.so.* library. + +* Sun Apr 4 1999 Jeff Johnson +- update to bzip2-0.9.0c. + +* Sun Mar 21 1999 Cristian Gafton +- auto rebuild in the new build environment (release 4) + +* Thu Dec 17 1998 Cristian Gafton +- build against glibc 2.1 + +* Wed Sep 30 1998 Cristian Gafton +- force compilation with egcs to avoid gcc optimization bug (thank God + we haven't been beaten by it) + +* Wed Sep 09 1998 Cristian Gafton +- version 0.9.0b + +* Tue Sep 08 1998 Cristian Gafton +- updated to 0.9.0 + +* Thu Apr 09 1998 Cristian Gafton +- first build for Manhattan From svn at tinysofa.org Thu Jul 1 15:45:13 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:45:13 +1000 (EST) Subject: [tinysofa-svn] r2720 - in tinysofa/snapshot/chkconfig/current: sources specs Message-ID: <20040701154513.ACE714E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:45:13 +1000 (Fri, 02 Jul 2004) New Revision: 2720 Added: tinysofa/snapshot/chkconfig/current/sources/chkconfig-1.3.11.tar.gz Removed: tinysofa/snapshot/chkconfig/current/sources/chkconfig-1.3.8-tinysofa.patch tinysofa/snapshot/chkconfig/current/sources/chkconfig-1.3.8.tar.gz Modified: tinysofa/snapshot/chkconfig/current/specs/chkconfig.spec Log: - Sync with 2.0. - Added: - chkconfig-1.3.11.tar.gz: - Removed: - chkconfig-1.3.8-tinysofa.patch: - chkconfig-1.3.8.tar.gz: Added: tinysofa/snapshot/chkconfig/current/sources/chkconfig-1.3.11.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/chkconfig/current/sources/chkconfig-1.3.11.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: tinysofa/snapshot/chkconfig/current/sources/chkconfig-1.3.8-tinysofa.patch =================================================================== --- tinysofa/snapshot/chkconfig/current/sources/chkconfig-1.3.8-tinysofa.patch 2004-07-01 15:45:10 UTC (rev 2719) +++ tinysofa/snapshot/chkconfig/current/sources/chkconfig-1.3.8-tinysofa.patch 2004-07-01 15:45:13 UTC (rev 2720) @@ -1,419 +0,0 @@ -diff -Nur chkconfig-1.3.8.orig/Makefile chkconfig-1.3.8/Makefile ---- chkconfig-1.3.8.orig/Makefile 2002-12-12 20:34:37.000000000 +0100 -+++ chkconfig-1.3.8/Makefile 2004-01-27 16:38:07.000000000 +0100 -@@ -4,75 +4,55 @@ - - CFLAGS=-g -Wall $(RPM_OPT_FLAGS) -D_GNU_SOURCE - LDFLAGS=-g --MAN=chkconfig.8 ntsysv.8 alternatives.8 -+MAN=chkconfig.8 alternatives.8 - PROG=chkconfig - BINDIR = /sbin - USRSBINDIR = /usr/sbin --MANDIR = /usr/man -+MANDIR = /usr/share/man - ALTDIR = /var/lib/alternatives - ALTDATADIR = /etc/alternatives --SUBDIRS = po - - OBJS=chkconfig.o leveldb.o --NTOBJS=ntsysv.o leveldb.o -+NTOBJS= leveldb.o - --all: subdirs $(PROG) ntsysv alternatives -- --subdirs: -- for d in $(SUBDIRS); do \ -- (cd $$d; $(MAKE)) \ -- || case "$(MFLAGS)" in *k*) fail=yes;; *) exit 1;; esac;\ -- done && test -z "$$fail" -+all: $(PROG) alternatives - - chkconfig: $(OBJS) - $(CC) $(LDFLAGS) -o chkconfig $(OBJS) -Wl,-Bstatic -lpopt -Wl,-Bdynamic - - alternativs: alternatives.o - --ntsysv: $(NTOBJS) -- $(CC) $(LDFLAGS) -o ntsysv $(NTOBJS) -lnewt -lpopt $(LIBMHACK) -- - chkconfig.o: chkconfig.c leveldb.h - $(CC) $(CFLAGS) -DVERSION=\"$(VERSION)\" -c chkconfig.c - - alternatives.o: alternatives.c - $(CC) $(CFLAGS) -DVERSION=\"$(VERSION)\" -c alternatives.c - --ntsysv.o: ntsysv.c leveldb.h -- $(CC) $(CFLAGS) -DVERSION=\"$(VERSION)\" -c ntsysv.c -- - leveldb.o: leveldb.c leveldb.h - - clean: -- rm -f chkconfig ntsysv $(OBJS) $(NTOBJS) -+ rm -f chkconfig $(OBJS) $(NTOBJS) - rm -f alternatives alternatives.o -- make -C po clean - rm -f chkconfig-*.tar.gz *~ *.old - - install: -- [ -d $(instroot)/$(BINDIR) ] || mkdir -p $(instroot)/$(BINDIR) -- [ -d $(instroot)/$(USRSBINDIR) ] || mkdir -p $(instroot)/$(USRSBINDIR) -- [ -d $(instroot)/$(MANDIR) ] || mkdir -p $(instroot)/$(MANDIR) -- [ -d $(instroot)/$(MANDIR)/man8 ] || mkdir -p $(instroot)/$(MANDIR)/man8 -- [ -d $(instroot)/$(MANDIR)/man5 ] || mkdir -p $(instroot)/$(MANDIR)/man5 -- [ -d $(instroot)/$(ALTDIR) ] || mkdir -p -m 755 $(instroot)/$(ALTDIR) -- [ -d $(instroot)/$(ALTDATADIR) ] || mkdir -p -m 755 $(instroot)/$(ALTDATADIR) -- -- install -m 755 $(PROG) $(instroot)/$(BINDIR)/$(PROG) -- install -m 755 ntsysv $(instroot)/$(USRSBINDIR)/ntsysv -- install -m 755 alternatives $(instroot)/$(USRSBINDIR)/alternatives -- ln -s alternatives $(instroot)/$(USRSBINDIR)/update-alternatives -+ [ -d $(DESTDIR)/$(BINDIR) ] || mkdir -p $(DESTDIR)/$(BINDIR) -+ [ -d $(DESTDIR)/$(USRSBINDIR) ] || mkdir -p $(DESTDIR)/$(USRSBINDIR) -+ [ -d $(DESTDIR)/$(MANDIR) ] || mkdir -p $(DESTDIR)/$(MANDIR) -+ [ -d $(DESTDIR)/$(MANDIR)/man8 ] || mkdir -p $(DESTDIR)/$(MANDIR)/man8 -+ [ -d $(DESTDIR)/$(ALTDIR) ] || mkdir -p -m 755 $(DESTDIR)/$(ALTDIR) -+ [ -d $(DESTDIR)/$(ALTDATADIR) ] || mkdir -p -m 755 $(DESTDIR)/$(ALTDATADIR) -+ -+ install -m 755 $(PROG) $(DESTDIR)/$(BINDIR)/$(PROG) -+ install -m 755 alternatives $(DESTDIR)/$(USRSBINDIR)/alternatives -+ ln -s alternatives $(DESTDIR)/$(USRSBINDIR)/update-alternatives - - for i in $(MAN); do \ -- install -m 644 $$i $(instroot)/$(MANDIR)/man`echo $$i | sed "s/.*\.//"`/$$i ; \ -+ install -m 644 $$i $(DESTDIR)/$(MANDIR)/man`echo $$i | sed "s/.*\.//"`/$$i ; \ - done - -- ln -s alternatives.8 $(instroot)/$(MANDIR)/man8/update-alternatives.8 -+ ln -s alternatives.8 $(DESTDIR)/$(MANDIR)/man8/update-alternatives.8 - -- for d in $(SUBDIRS); do \ -- (cd $$d; $(MAKE) install) \ -- || case "$(MFLAGS)" in *k*) fail=yes;; *) exit 1;; esac;\ -- done && test -z "$$fail" - - archive: - cvs tag -F $(CVSTAG) . -diff -Nur chkconfig-1.3.8.orig/chkconfig.8 chkconfig-1.3.8/chkconfig.8 ---- chkconfig-1.3.8.orig/chkconfig.8 2003-01-31 21:51:37.000000000 +0100 -+++ chkconfig-1.3.8/chkconfig.8 2004-01-27 16:36:23.000000000 +0100 -@@ -1,4 +1,4 @@ --.TH CHKCONFIG 8 "Wed Oct 8 1997" -+.TH CHKCONFIG 8 "Tue Jan 27 2004" - .UC 4 - .SH NAME - chkconfig \- updates and queries runlevel information for system services -@@ -28,6 +28,10 @@ - of the configuration information regarding what services \fIinit\fR - starts in a single location. - -+This implementation is modified to fit the need of the -+\fBtinysofa distribution\fR. -+This manual page reflects the modifications. -+ - \fBchkconfig\fR has five distinct functions: adding new services for - management, removing services from management, listing the current - startup information for services, changing the startup information -@@ -40,27 +44,37 @@ - \fB--level\fR option may be used to have \fBchkconfig\fR query an - alternative runlevel rather than the current one. - --If one of \fBon\fR, \fBoff\fR, or \fRreset\fR is specified after the -+If one of \fBon\fR, \fBoff\fR, or \fBreset\fR is specified after the - service name, \fBchkconfig\fR changes the startup information for the - specified service. The \fBon\fR and \fBoff\fR flags cause the service - to be started or stopped, respectively, in the runlevels being changed. --The \fBreset\fR flag resets the startup information for the service to --whatever is specified in the init script in question. -+The \fBreset\fR flag resets the startup information for the service to -+\fBnot\fR start the service in any runlevel. -+ -+If the chkconfig setting, in the initscript of the service, does not define -+any specific runlevel (using '-' in the runlevel location), the \fBon\fR -+option will affect runlevels 2, 3, 4, and 5. -+ -+The \fB--level\fR option will always override any setting in the initscript, -+when using the \fBon\fR option. - --By default, the \fBon\fR and \fBoff\fR options affect only runlevels 2, 3, 4, --and 5, while \fBreset\fR affects all of the runlevels. The \fB--level\fR --option may be used to specify which runlevels are affected. -+The \fBoff\fR option will affects all of the runlevels unless the -+\fB--level\fR option are used to specify which runlevels are affected. - - Note that for every service, each runlevel has either a start script - or a stop script. When switching runlevels, init will not re-start - an already-started service, and will not re-stop a service that is - not running. - -+If using \fBtinysofa\fR, you may use the \fBrestart_maybe\fR script, commonly -+found as \fB/sbin/restart_maybe\fR, to make the current status of the -+service reflect the updated runlevel setup for that service. -+ - .SH OPTIONS - .TP - \fB-\-level \fIlevels\fR - Specifies the run levels an operation should pertain to. It is given as --a string of numbers from 0 to 7. For example, \fB--level 35\fR specifies -+a string of numbers from 0 to 6. For example, \fB--level 35\fR specifies - runlevels 3 and 5. - - .TP -@@ -69,10 +83,8 @@ - This option adds a new service for management by \fBchkconfig\fR. - When a new service is added, \fBchkconfig\fR ensures that the service - has either a start or a kill entry in every runlevel. If any runlevel --is missing such an entry, \fBchkconfig\fR creates the appropriate entry --as specified by the default values in the init script. Note that --default entries in LSB-delimited 'INIT INFO' sections take precedence --over the default runlevels in the initscript. -+is missing such an entry, \fBchkconfig\fR creates a kill entry in that -+runlevel. - - .TP - \fB-\-del\fR \fIname\fR -@@ -92,30 +104,30 @@ - tells \fBchkconfig\fR what runlevels the service should be started in - by default, as well as the start and stop priority levels. If the service - should not, by default, be started in any runlevels, a \fB\-\fR should be --used in place of the runlevels list. The second --line contains a description for the service, and may be extended across --multiple lines with backslash continuation. -+used in place of the runlevels list. The second line contains a description -+for the service, and may be extended across multiple lines with backslash -+continuation. -+ - - For example, random.init has these three lines: - .nf - .fn C --# chkconfig: 2345 20 80 -+# chkconfig: - 20 80 - # description: Saves and restores system entropy pool for \e - # higher quality random number generation. - .fn R - .fi - This says that the random script should be started in levels 2, 3, 4, --and 5, that its start priority should be 20, and that its stop -+and 5 (default), that its start priority should be 20, and that its stop - priority should be 80. You should be able to figure out what the - description says; the \e causes the line to be continued. The - extra space in front of the line is ignored. - - .SH SEE ALSO - .IR init (8) --.IR ntsysv (8) --.IR serviceconf (8) - - .SH AUTHOR - .nf - Erik Troan -+Updated by Christian H. Toldnes - .fi -diff -Nur chkconfig-1.3.8.orig/chkconfig.c chkconfig-1.3.8/chkconfig.c ---- chkconfig-1.3.8.orig/chkconfig.c 2002-08-12 21:53:42.000000000 +0200 -+++ chkconfig-1.3.8/chkconfig.c 2004-01-27 16:36:23.000000000 +0100 -@@ -18,15 +18,16 @@ - #include "leveldb.h" - - static void usage(void) { -- fprintf(stderr, _("%s version %s - Copyright (C) 1997-2000 Red Hat, Inc.\n"), progname, VERSION); -+ fprintf(stderr, _("%s version %s - Modified to fit tinysofa (C) 2004\n"), progname, VERSION); -+ fprintf(stderr, _("Original (C) Red Hat, inc. - 1997-2000 \n")); - fprintf(stderr, _("This may be freely redistributed under the terms of " - "the GNU Public License.\n")); - fprintf(stderr, "\n"); - fprintf(stderr, _("usage: %s --list [name]\n"), progname); - fprintf(stderr, _(" %s --add \n"), progname); - fprintf(stderr, _(" %s --del \n"), progname); -- fprintf(stderr, _(" %s [--level ] %s)\n"), progname, ""); -- -+ fprintf(stderr, _(" %s reset\n"), progname); -+ fprintf(stderr, _(" %s [--level ] \n"), progname); - exit(1); - } - -@@ -82,82 +83,6 @@ - return i; - } - --/* LSB-style dependency frobber. Calculates a usable start priority -- * and stop priority. -- * This algorithm will almost certainly break horribly at some point. */ --static void frobDependencies(struct service *s) { -- DIR * dir; -- struct dirent * ent; -- struct stat sb; -- struct service *servs = NULL; -- int numservs = 0; -- char fn[1024]; -- int i, j, k; -- -- if (!(dir = opendir(RUNLEVELS "/init.d"))) { -- fprintf(stderr, _("failed to open %s/init.d: %s\n"), RUNLEVELS, -- strerror(errno)); -- return; -- } -- -- while ((ent = readdir(dir))) { -- const char *dn; -- -- /* Skip any file starting with a . */ -- if (ent->d_name[0] == '.') continue; -- -- /* Skip files with known bad extensions */ -- if ((dn = strrchr(ent->d_name, '.')) != NULL && -- (!strcmp(dn, ".rpmsave") || !strcmp(dn, ".rpmnew") || !strcmp(dn, ".rpmorig") || !strcmp(dn, ".swp"))) -- continue; -- -- dn = ent->d_name + strlen(ent->d_name) - 1; -- if (*dn == '~' || *dn == ',') -- continue; -- -- sprintf(fn, RUNLEVELS "/init.d/%s", ent->d_name); -- if (stat(fn, &sb)) { -- continue; -- } -- if (!S_ISREG(sb.st_mode)) continue; -- if (!strcmp(ent->d_name, s->name)) continue; -- servs = realloc(servs, (numservs+1) * sizeof(struct service)); -- if (!readServiceInfo(ent->d_name, servs + numservs, 0)) -- numservs++; -- } -- -- /* Sane defaults */ -- s->sPriority = 50; -- s->kPriority = 50; -- -- for (i = 0; i < numservs ; i++) { -- if (s->startDeps) { -- for (j = 0; s->startDeps[j] ; j++) { -- if (!strcmp(s->startDeps[j], servs[i].name)) -- s->sPriority = laterThan(s->sPriority, servs[i].sPriority); -- if (servs[i].provides) { -- for (k = 0; servs[i].provides[k]; k++) { -- if (!strcmp(s->startDeps[j], servs[i].provides[k])) -- s->sPriority = laterThan(s->sPriority, servs[i].sPriority); -- } -- } -- } -- } -- if (s->stopDeps) { -- for (j = 0; s->stopDeps[j] ; j++) { -- if (!strcmp(s->stopDeps[j], servs[i].name)) -- s->kPriority = earlierThan(s->kPriority, servs[i].kPriority); -- if (servs[i].provides) { -- for (k = 0; servs[i].provides[k]; k++) { -- if (!strcmp(s->stopDeps[j], servs[i].provides[k])) -- s->kPriority = earlierThan(s->kPriority, servs[i].kPriority); -- } -- } -- } -- } -- } --} -- - static int addService(char * name) { - int i, rc; - struct service s; -@@ -168,16 +93,29 @@ - } - - if (s.type == TYPE_XINETD) return 0; -- if (s.isLSB && (s.sPriority == s.kPriority == -1)) -- frobDependencies(&s); - -+ /* if service is not yet configured for runlevel i, add K-links */ - for (i = 0; i < 7; i++) { -- if (!isConfigured(name, i)) { -- if ((1 << i) & s.levels) -- doSetService(s, i, 1); -- else -- doSetService(s, i, 0); -- } -+ if (!isConfigured(name, i)) doSetService(s, i, 0); -+ } -+ -+ return 0; -+} -+ -+static int offService(char * name) { -+ int i, rc; -+ struct service s; -+ -+ if ((rc = readServiceInfo(name, &s, 0))) { -+ readServiceError(rc, name); -+ return 1; -+ } -+ -+ if (s.type == TYPE_XINETD) return 0; -+ -+ for (i = 0; i < 7; i++) { -+ doSetService(s, i, 0); -+ - } - - return 0; -@@ -467,14 +405,38 @@ - } - - return isOn(name, level) ? 0 : 1; -- } else if (!strcmp(state, "on")) -- return setService(name, where, 1); -- else if (!strcmp(state, "off")) -- return setService(name, where, 0); -- else if (!strcmp(state, "reset")) -- return setService(name, where, -1); -- else -+ } else if (!strcmp(state, "on")) { -+ if (where){ -+ return setService(name, where, 1); -+ } -+ struct service s; -+ int i, rc; -+ if ((rc = readServiceInfo(name, &s, 0))) { -+ readServiceError(rc, name); -+ return 1; -+ } -+ -+ if (s.type == TYPE_XINETD) return 0; -+ -+ delService(name); -+ for (i = 0; i < 7; i++) { -+ if (!isConfigured(name, i)) { -+ if ((1 << i) & s.levels) doSetService(s, i, 1); -+ else doSetService(s, i, 0); -+ } -+ } -+ return 0; -+ } else if (!strcmp(state, "off")) { -+ if (where) { -+ return setService(name, where, 0); -+ } -+ return offService(name); -+ -+ } else if (!strcmp(state, "reset")) { -+ return offService(name); -+ } else { - usage(); -+ } - } - - usage(); -diff -Nur chkconfig-1.3.8.orig/leveldb.c chkconfig-1.3.8/leveldb.c ---- chkconfig-1.3.8.orig/leveldb.c 2002-03-13 08:09:03.000000000 +0100 -+++ chkconfig-1.3.8/leveldb.c 2004-01-27 16:36:23.000000000 +0100 -@@ -328,10 +328,9 @@ - return 1; - } - -- if (!strcmp(levelbuf, "-")) -- serv.levels = 0; -- else -- serv.levels = parseLevels(levelbuf, 0); -+ /* Setting default runlevels 2,3,4,5 when '-' is found. */ -+ if (!strcmp(levelbuf, "-")) strcpy(levelbuf, "2345"); -+ serv.levels = parseLevels(levelbuf, 0); - if (serv.levels == -1) { - if (serv.desc) free(serv.desc); - free(bufstart); Deleted: tinysofa/snapshot/chkconfig/current/sources/chkconfig-1.3.8.tar.gz =================================================================== (Binary files differ) Modified: tinysofa/snapshot/chkconfig/current/specs/chkconfig.spec =================================================================== --- tinysofa/snapshot/chkconfig/current/specs/chkconfig.spec 2004-07-01 15:45:10 UTC (rev 2719) +++ tinysofa/snapshot/chkconfig/current/specs/chkconfig.spec 2004-07-01 15:45:13 UTC (rev 2720) @@ -1,104 +1,256 @@ -Summary: A system tool for maintaining the /etc/rcN.d hierarchy. +# [for (x)emacs] -*- mode: RPM-SPEC; coding: utf-8 -*- +Summary: A system tool for maintaining the /etc/rc*.d hierarchy. Name: chkconfig -Version: 1.3.8 -Release: 5ts +Version: 1.3.11 +Release: 1ts License: GPL -Group: tinysofa official -Source: ftp://ftp.redhat.com/pub/redhat/code/chkconfig/%{name}-%{version}.tar.gz -Patch1: chkconfig-1.3.8-tinysofa.patch -BuildRequires: autoconf -BuildRoot: %{_tmppath}/%{name}-root -Requires: initscripts -PreReq: filesystem +Group: System Environment/Base +Source: ftp://ftp.redhat.com/pub/redhat/code/chkconfig/%{name}-%{version}.tar.gz +BuildRoot: %{_tmppath}/%{name}-%{version}-root +BuildPrereq: newt newt-devel gettext +Conflicts: initscripts <= 5.30-1 %description Chkconfig is a basic system utility. It updates and queries runlevel information for system services. Chkconfig manipulates the numerous -symbolic links in /etc/rcN.d, to relieve system administrators of some +symbolic links in /etc/rc.d, to relieve system administrators of some of the drudgery of manually editing the symbolic links. +%package -n ntsysv +Summary: A tool to set the stop/start of system services in a runlevel. +Group: System Environment/Base +Requires: chkconfig = %{version} + +%description -n ntsysv +Ntsysv provides a simple interface for setting which system services +are started or stopped in various runlevels (instead of directly +manipulating the numerous symbolic links in /etc/rc.d). Unless you +specify a runlevel or runlevels on the command line (see the man +page), ntsysv configures the current runlevel (5 if you're using X). + %prep %setup -q -%patch1 -p1 %build -make RPM_OPT_FLAGS="$RPM_OPT_FLAGS" +%ifarch sparc +LIBMHACK=-lm +%endif +make RPM_OPT_FLAGS="$RPM_OPT_FLAGS" LIBMHACK=$LIBMHACK + %install -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT -make DESTDIR=$RPM_BUILD_ROOT MANDIR=%{_mandir} install +rm -rf $RPM_BUILD_ROOT +make instroot=$RPM_BUILD_ROOT MANDIR=%{_mandir} install +mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d +ln -s rc.d/init.d $RPM_BUILD_ROOT/etc/init.d +for n in 0 1 2 3 4 5 6; do + mkdir -p $RPM_BUILD_ROOT/etc/rc.d/rc${n}.d + ln -s rc.d/rc${n}.d $RPM_BUILD_ROOT/etc/rc${n}.d +done +%find_lang %{name} + %clean -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT +rm -rf $RPM_BUILD_ROOT -%files +%files -f %{name}.lang %defattr(-,root,root) +%dir /etc/alternatives /sbin/chkconfig +/usr/sbin/update-alternatives /usr/sbin/alternatives -/usr/sbin/update-alternatives -/usr/share/man/man8/* -/var/lib/alternatives -/etc/alternatives +/etc/init.d +/etc/rc.d/init.d +/etc/rc[0-6].d +/etc/rc.d/rc[0-6].d +%dir /var/lib/alternatives +%{_mandir}/*/chkconfig* +%{_mandir}/*/alternatives* +%files -n ntsysv +%defattr(-,root,root) +/usr/sbin/ntsysv +%{_mandir}/*/ntsysv.8* %changelog -* Wed May 19 2004 tsintegrate 1.3.8-5ts -- current (1.3.8-4ts) integrated as 1.3.8-5ts for release 1.0-U1 +* Fri Jun 4 2004 Bill Nottingham 1.3.11-1 +- fix LSB comment parsing (#85678) -* Tue Jan 27 2004 Chr. Toldnes 1.3.8-1tr -- New upstream version: 1.3.8 -- Minor cleanup +* Wed May 29 2004 Bill Nottingham 1.3.10-1 +- mark alternatives help output for translation (#110526) -* Mon Dec 15 2003 Erlend Midttun 1.2.24f-12tr -- Rebuilt. +* Wed Oct 22 2003 Bill Nottingham 1.3.9-1 +- update translations -* Fri Oct 31 2003 Chr. Toldnes 1.2.24f-11tr -- backport +* Mon Jul 28 2003 Bill Nottingham 1.3.8-4 +- rebuild -* Sun Sep 28 2003 Chr. Toldnes 1.2.24f-10tsl -- port to tawie +* Tue May 13 2003 Dan Walsh 1.3.8-3 +- Update for RHEL -* Wed Jun 18 2003 Erlend Midttun 1.2.24f-9tr -- Big rebuild +* Thu May 8 2003 Dan Walsh 1.3.8-2 +- Fix readXinetdServiceInfo to return error on not regular files +- Fix chkconfig to not write messages if readXinetdServiceInfo gets an error -* Tue Jun 17 2003 Erlend Midttun 1.2.24f-8em -- Now PreReq filesystem. +* Fri Jan 31 2003 Bill Nottingham 1.3.8-1 +- fix some wording in alternatives (#76213) +- actually mark alternatives for translation -* Thu Jun 5 2003 Erlend Midttun 1.2.24f-7em -- No longer own the startup directories, we leave that others. +* Thu Dec 12 2002 Elliot Lee 1.3.7-1 +- Link to libpopt in a multilib-safe fashion. -* Wed May 14 2003 Chr. H. Toldnes 1.2.24f-6ct -- Minor doc-fix in the patch. -- Now use CFLAGS in build +* Thu Aug 29 2002 Trond Eivind Glomsr?d 1.3.6-3 +- bump -* Wed May 14 2003 Chr. H. Toldnes 1.2.24f-5ct -- Added patch to change behaviour to fit the TSL way. :) +* Thu Aug 15 2002 Bill Nottingham 1.3.6-2 +- rebuild against new newt -* Mon Mar 24 2003 Erlend Midttun 1.2.24f-4em -- Rebuilt against glibc 2.3.2. +* Mon Aug 12 2002 Bill Nottingham 1.3.6-1 +- make on and off handle runlevel 2 too (#70766) -* Mon Oct 21 2002 Goetz Bock 1.2.24f-3bg -- added autoconf to build requirements +* Mon Apr 15 2002 Trond Eivind Glomsr?d 1.3.5-3 +- Update translations -* Wed Sep 4 2002 Christian H. Toldnes 1.2.24f-2ct -- Added --with-init-dir=/etc/init.d +* Mon Apr 15 2002 Trond Eivind Glomsr?d 1.3.5-2 +- Update translations -* Tue Jul 9 2002 Christian H. Toldnes -- New upstream version: 1.2.24f -- Modified to fit TSL 2.0 -- Removed ntsysv package, it's not present in the source. -- Removed NLS. +* Sun Apr 7 2002 Jeremy Katz 1.3.5-1 +- alternatives: handle default with --config properly (#62009) -* Fri Jun 1 2001 Oystein Viggen -- New upstream version: 1.2.22 -- Make /etc/init.d a symlink to rc.d/init.d +* Thu Mar 14 2002 Bill Nottingham 1.3.4-1 +- don't apply the dependency logic to things that already have + start/stop priorities +- fix silly display bug in --config -* Mon Feb 21 2000 Erlend Midttun -- Moved manpages to comply with FHS 2.0 +* Tue Mar 12 2002 Bill Nottingham 1.3.2-1 +- chkconfig: LSB support +* Fri Mar 8 2002 Bill Nottingham +- alternatives: handle initscripts too; --initscript command-line option +- chkconfig/ntsysv (and serviceconf, indirectly): services with + *no* links in /etc/rc*.d are no longer displayed with --list, or + available for configuration except via chkconfig command-line options +- alternatives: fix trying to enable disable a null service + +* Tue Mar 5 2002 Bill Nottingham +- alternatives: handle things with different numbers of slave links + +* Mon Mar 4 2002 Bill Nottingham +- minor alternatives tweaks: don't install the same thing multiple times + +* Wed Jan 30 2002 Bill Nottingham +- actually, put the alternatives stuff back in /usr/sbin +- ship /etc/alternatives dir +- random alternatives fixes + +* Sun Jan 27 2002 Erik Troan +- reimplemented update-alternatives as just alternatives + +* Thu Jan 25 2002 Bill Nottingham +- add in update-alternatives stuff (perl ATM) + +* Mon Aug 27 2001 Trond Eivind Glomsr?d +- Update translations + +* Tue Jun 12 2001 Bill Nottingham +- don't segfault on files that are exactly the length of a page size + (#44199, ) + +* Sun Mar 4 2001 Bill Nottingham +- don't show xinetd services in ntsysv if xinetd doesn't appear to be + installed (#30565) + +* Wed Feb 14 2001 Preston Brown +- final translation update. + +* Tue Feb 13 2001 Preston Brown +- warn in ntsysv if not running as root. + +* Fri Feb 2 2001 Preston Brown +- use lang finder script + +* Fri Feb 2 2001 Bill Nottingham +- finally fix the bug Nalin keeps complaining about :) + +* Wed Jan 24 2001 Preston Brown +- final i18n update before Beta. + +* Wed Oct 18 2000 Bill Nottingham +- ignore .rpmnew files (#18915) +- fix typo in error message (#17575) + +* Wed Aug 30 2000 Nalin Dahyabhai +- make xinetd config files mode 0644, not 644 + +* Thu Aug 24 2000 Erik Troan +- updated it and es translations + +* Sun Aug 20 2000 Bill Nottingham +- get man pages in proper packages + +* Sun Aug 20 2000 Matt Wilson +- new translations + +* Tue Aug 16 2000 Nalin Dahyabhai +- don't worry about extra whitespace on chkconfig: lines (#16150) + +* Wed Aug 10 2000 Trond Eivind Glomsr?d +- i18n merge + +* Wed Jul 26 2000 Matt Wilson +- new translations for de fr it es + +* Tue Jul 25 2000 Bill Nottingham +- change prereqs + +* Sun Jul 23 2000 Bill Nottingham +- fix ntsysv's handling of xinetd/init files with the same name + +* Fri Jul 21 2000 Bill Nottingham +- fix segv when reading malformed files + +* Wed Jul 19 2000 Bill Nottingham +- put links, rc[0-6].d dirs back, those are necessary + +* Tue Jul 18 2000 Bill Nottingham +- add quick hack support for reading descriptions from xinetd files + +* Mon Jul 17 2000 Bernhard Rosenkraenzer +- don't own the /etc/rc[0-6].d symlinks; they're owned by initscripts + +* Sat Jul 15 2000 Matt Wilson +- move back to old file layout + +* Thu Jul 13 2000 Preston Brown +- bump copyright date + +* Tue Jul 11 2000 Bill Nottingham +- no %pre today. Maybe tomorrow. + +* Thu Jul 6 2000 Bill Nottingham +- put initscripts %pre here too + +* Mon Jul 3 2000 Bill Nottingham +- oops, if we don't prereq initscripts, we *need* to own /etc/rc[0-6].d + +* Sun Jul 2 2000 Bill Nottingham +- add xinetd support + +* Tue Jun 27 2000 Matt Wilson +- changed Prereq: initscripts >= 5.18 to Conflicts: initscripts < 5.18 +- fixed sumary and description where a global string replace nuked them + +* Mon Jun 26 2000 Matt Wilson +- what Bill said, but actually build this version + +* Thu Jun 15 2000 Bill Nottingham +- don't own /etc/rc.* + +* Fri Feb 11 2000 Bill Nottingham +- typo in man page + * Wed Feb 02 2000 Cristian Gafton - fix description @@ -186,4 +338,4 @@ - added i18n support * Sun Mar 22 1998 Erik Troan -- added --back \ No newline at end of file +- added --back From svn at tinysofa.org Thu Jul 1 15:45:25 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:45:25 +1000 (EST) Subject: [tinysofa-svn] r2723 - in tinysofa/snapshot/cracklib/current: sources specs Message-ID: <20040701154525.7962B4E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:45:25 +1000 (Fri, 02 Jul 2004) New Revision: 2723 Added: tinysofa/snapshot/cracklib/current/sources/ASSurnames.gz tinysofa/snapshot/cracklib/current/sources/Congress.gz tinysofa/snapshot/cracklib/current/sources/Domains.gz tinysofa/snapshot/cracklib/current/sources/Dosref.gz tinysofa/snapshot/cracklib/current/sources/Family-Names.gz tinysofa/snapshot/cracklib/current/sources/Ftpsites.gz tinysofa/snapshot/cracklib/current/sources/Given-Names.gz tinysofa/snapshot/cracklib/current/sources/Jargon.gz tinysofa/snapshot/cracklib/current/sources/LCarrol.gz tinysofa/snapshot/cracklib/current/sources/Movies.gz tinysofa/snapshot/cracklib/current/sources/Paradise.Lost.gz tinysofa/snapshot/cracklib/current/sources/Python.gz tinysofa/snapshot/cracklib/current/sources/Trek.gz tinysofa/snapshot/cracklib/current/sources/cartoon.gz tinysofa/snapshot/cracklib/current/sources/common-passwords.txt.gz tinysofa/snapshot/cracklib/current/sources/crack.h tinysofa/snapshot/cracklib/current/sources/cracklib-2.7-nss.patch tinysofa/snapshot/cracklib/current/sources/cracklib-2.7-rh.patch tinysofa/snapshot/cracklib/current/sources/etc-hosts.gz tinysofa/snapshot/cracklib/current/sources/famous.gz tinysofa/snapshot/cracklib/current/sources/fast-names.gz tinysofa/snapshot/cracklib/current/sources/female-names.gz tinysofa/snapshot/cracklib/current/sources/male-names.gz tinysofa/snapshot/cracklib/current/sources/myths-legends.gz tinysofa/snapshot/cracklib/current/sources/names.french.gz tinysofa/snapshot/cracklib/current/sources/names.hp.gz tinysofa/snapshot/cracklib/current/sources/other-names.gz tinysofa/snapshot/cracklib/current/sources/sf.gz tinysofa/snapshot/cracklib/current/sources/shakespeare.gz tinysofa/snapshot/cracklib/current/sources/surnames.finnish.gz Removed: tinysofa/snapshot/cracklib/current/sources/cracklib-2.7-redhat.patch Modified: tinysofa/snapshot/cracklib/current/specs/cracklib.spec Log: - Sync with 2.0. - Kept: - cracklib,2.7.tgz: - Added: - ASSurnames.gz: - Congress.gz: - Domains.gz: - Dosref.gz: - Family-Names.gz: - Ftpsites.gz: - Given-Names.gz: - Jargon.gz: - LCarrol.gz: - Movies.gz: - Paradise.Lost.gz: - Python.gz: - Trek.gz: - cartoon.gz: - common-passwords.txt.gz: - crack.h: - cracklib-2.7-nss.patch: - cracklib-2.7-rh.patch: - etc-hosts.gz: - famous.gz: - fast-names.gz: - female-names.gz: - male-names.gz: - myths-legends.gz: - names.french.gz: - names.hp.gz: - other-names.gz: - sf.gz: - shakespeare.gz: - surnames.finnish.gz: - Removed: - cracklib-2.7-redhat.patch: Added: tinysofa/snapshot/cracklib/current/sources/ASSurnames.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/cracklib/current/sources/ASSurnames.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/cracklib/current/sources/Congress.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/cracklib/current/sources/Congress.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/cracklib/current/sources/Domains.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/cracklib/current/sources/Domains.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/cracklib/current/sources/Dosref.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/cracklib/current/sources/Dosref.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/cracklib/current/sources/Family-Names.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/cracklib/current/sources/Family-Names.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/cracklib/current/sources/Ftpsites.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/cracklib/current/sources/Ftpsites.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/cracklib/current/sources/Given-Names.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/cracklib/current/sources/Given-Names.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/cracklib/current/sources/Jargon.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/cracklib/current/sources/Jargon.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/cracklib/current/sources/LCarrol.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/cracklib/current/sources/LCarrol.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/cracklib/current/sources/Movies.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/cracklib/current/sources/Movies.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/cracklib/current/sources/Paradise.Lost.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/cracklib/current/sources/Paradise.Lost.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/cracklib/current/sources/Python.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/cracklib/current/sources/Python.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/cracklib/current/sources/Trek.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/cracklib/current/sources/Trek.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/cracklib/current/sources/cartoon.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/cracklib/current/sources/cartoon.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/cracklib/current/sources/common-passwords.txt.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/cracklib/current/sources/common-passwords.txt.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/cracklib/current/sources/crack.h =================================================================== --- tinysofa/snapshot/cracklib/current/sources/crack.h 2004-07-01 15:45:20 UTC (rev 2722) +++ tinysofa/snapshot/cracklib/current/sources/crack.h 2004-07-01 15:45:25 UTC (rev 2723) @@ -0,0 +1,22 @@ +#ifndef CRACKLIB_H +#define CRACKLIB_H + +#ifdef __cplusplus +extern "C" { +#endif + +/* Pass this function a password (pw) and a path to the + * dictionaries (/usr/lib/cracklib_dict should be specified) + * and it will either return a NULL string, meaning that the + * password is good, or a pointer to a string that explains the + * problem with the password. + * You must link with -lcrack + */ + +extern char *FascistCheck(char *pw, char *dictpath); + +#ifdef __cplusplus +}; +#endif + +#endif Added: tinysofa/snapshot/cracklib/current/sources/cracklib-2.7-nss.patch =================================================================== --- tinysofa/snapshot/cracklib/current/sources/cracklib-2.7-nss.patch 2004-07-01 15:45:20 UTC (rev 2722) +++ tinysofa/snapshot/cracklib/current/sources/cracklib-2.7-nss.patch 2004-07-01 15:45:25 UTC (rev 2723) @@ -0,0 +1,49 @@ +--- cracklib,2.7/cracklib/fascist.c Tue Oct 2 15:58:43 2001 ++++ cracklib,2.7/cracklib/fascist.c Tue Oct 2 16:06:44 2001 +@@ -10,6 +10,8 @@ + + #include "packer.h" + #include ++#include ++#include + #include + #include + #include +@@ -488,13 +490,35 @@ + int wc; + char *ptr; + int gwords; +- struct passwd *pwp; ++ struct passwd *pwp, passwd; + char gbuffer[STRINGSIZE]; + char tbuffer[STRINGSIZE]; ++ char *sbuffer; ++ size_t sbufferlen; + char *uwords[STRINGSIZE]; + char longbuffer[STRINGSIZE * 2]; + +- if (!(pwp = getpwuid(uid))) ++ sbuffer = malloc(sbufferlen = LINE_MAX); ++ if (sbuffer == NULL) ++ { ++ return ("memory allocation error"); ++ } ++ while ((i = getpwuid_r(uid, &passwd, sbuffer, sbufferlen, &pwp)) != 0) ++ { ++ if (i == ERANGE) ++ { ++ free(sbuffer); ++ sbuffer = malloc(sbufferlen += LINE_MAX); ++ if (sbuffer == NULL) ++ { ++ return ("memory allocation error"); ++ } ++ } else { ++ pwp = NULL; ++ break; ++ } ++ } ++ if (pwp == NULL) + { + return ("you are not registered in the password file"); + } Deleted: tinysofa/snapshot/cracklib/current/sources/cracklib-2.7-redhat.patch =================================================================== --- tinysofa/snapshot/cracklib/current/sources/cracklib-2.7-redhat.patch 2004-07-01 15:45:20 UTC (rev 2722) +++ tinysofa/snapshot/cracklib/current/sources/cracklib-2.7-redhat.patch 2004-07-01 15:45:25 UTC (rev 2723) @@ -1,173 +0,0 @@ ---- cracklib,2.7/cracklib/fascist.c.rh Wed Dec 31 05:26:46 1997 -+++ cracklib,2.7/cracklib/fascist.c Tue Mar 10 18:17:43 1998 -@@ -11,6 +11,7 @@ - #include "packer.h" - #include - #include -+#include - - #define ISSKIP(x) (isspace(x) || ispunct(x)) - -@@ -659,7 +660,7 @@ - return ("it does not contain enough DIFFERENT characters"); - } - -- strcpy(password, Lowercase(password)); -+ strcpy(password, (char *)Lowercase(password)); - - Trim(password); - -@@ -722,7 +723,7 @@ - } - } - -- strcpy(password, Reverse(password)); -+ strcpy(password, (char *)Reverse(password)); - - for (i = 0; r_destructors[i]; i++) - { ---- cracklib,2.7/cracklib/Makefile.rh Sun Dec 14 17:49:21 1997 -+++ cracklib,2.7/cracklib/Makefile Tue Mar 10 18:54:11 1998 -@@ -6,13 +6,21 @@ - # and upwards. - ### - --LIB= libcrack.a --OBJ= fascist.o packlib.o rules.o stringlib.o --CFLAGS= -O -I../cracklib -DIN_CRACKLIB -+LIB = libcrack.so -+OBJ = fascist.o packlib.o rules.o stringlib.o -+CFLAGS = $(RPM_OPT_FLAGS) -g -I../cracklib -DIN_CRACKLIB -fPIC -+LD = ld - --$(LIB): $(OBJ) -- ar rv $(LIB) $? -- -ranlib $(LIB) -+$(LIB): $(OBJ) Makefile -+ $(LD) -shared -soname $(LIB).$(MAJOR) -o $(LIB).$(VERSION) $(OBJ) -lc -+ rm -f $(LIB).$(MAJOR) $(LIB) -+ ln -s $(LIB).$(VERSION) $(LIB).$(MAJOR) -+ ln -s $(LIB).$(MAJOR) $(LIB) - - clean: -- -rm -f $(OBJ) $(LIB) *~ -+ -rm -f $(OBJ) $(LIB) $(LIB).$(VERSION) *~ -+ -+install: $(LIB) crack.h -+ install -m 755 $(LIB).$(VERSION) $(ROOT)/usr/lib -+ ln -sf $(LIB).$(VERSION) $(ROOT)/usr/lib/$(LIB) -+ install -m 644 crack.h $(ROOT)/usr/include ---- cracklib,2.7/cracklib/crack.h.rh Tue Mar 10 18:17:43 1998 -+++ cracklib,2.7/cracklib/crack.h Tue Mar 10 18:17:43 1998 -@@ -0,0 +1,15 @@ -+ -+#ifndef CRACKLIB_H -+#define CRACKLIB_H -+ -+/* Pass this function a password (pw) and a path to the -+ * dictionaries (/usr/lib/cracklib_dict should be specified) -+ * and it will either return a NULL string, meaning that the -+ * password is good, or a pointer to a string that explains the -+ * problem with the password. -+ * You must link with -lcrack -+ */ -+ -+extern char *FascistCheck(char *pw, char *dictpath); -+ -+#endif ---- cracklib,2.7/util/Makefile.rh Sun Dec 14 17:49:34 1997 -+++ cracklib,2.7/util/Makefile Tue Mar 10 18:17:43 1998 -@@ -14,27 +14,31 @@ - #SunOS users (and others?) should consider static linking of their passwd binary - #CFLAGS= -O -I../cracklib '-DCRACKLIB_DICTPATH="$(DICTPATH)"' -Bstatic - --CFLAGS= -O -I../cracklib '-DCRACKLIB_DICTPATH="$(DICTPATH)"' --LIBS= ../cracklib/libcrack.a -+CFLAGS = $(RPM_OPT_FLAGS) -I../cracklib '-DCRACKLIB_DICTPATH="$(DICTPATH)"' -+LDFLAGS = -L../cracklib -lcrack -+LIBS = ../cracklib/libcrack.so - - all: packer unpacker testnum teststr testlib - touch all - - packer: packer.o $(LIBS) -- cc $(CFLAGS) -o $@ $@.o $(LIBS) -+ cc $(CFLAGS) -o $@ $@.o $(LDFLAGS) - - unpacker: unpacker.o $(LIBS) -- cc $(CFLAGS) -o $@ $@.o $(LIBS) -+ cc $(CFLAGS) -o $@ $@.o $(LDFLAGS) - - testnum: testnum.o $(LIBS) -- cc $(CFLAGS) -o $@ $@.o $(LIBS) -+ cc $(CFLAGS) -o $@ $@.o $(LDFLAGS) - - teststr: teststr.o $(LIBS) -- cc $(CFLAGS) -o $@ $@.o $(LIBS) -+ cc $(CFLAGS) -o $@ $@.o $(LDFLAGS) - - testlib: testlib.o $(LIBS) -- cc $(CFLAGS) -o $@ $@.o $(LIBS) -+ cc $(CFLAGS) -o $@ $@.o $(LDFLAGS) - - clean: - -rm *.o *~ all - -rm teststr testnum testlib packer unpacker -+ -+install: all create-cracklib-dict -+ install -m 755 mkdict packer create-cracklib-dict $(ROOT)/usr/sbin ---- cracklib,2.7/util/create-cracklib-dict.rh Tue Mar 10 18:17:43 1998 -+++ cracklib,2.7/util/create-cracklib-dict Tue Mar 10 18:17:43 1998 -@@ -0,0 +1,15 @@ -+#!/bin/sh -+if [ -z "$*" ]; then -+ echo "Usage:" -+ echo " /usr/sbin/create-cracklib-dict wordlist ..." -+ echo -+ echo "This script takes one or more word list files as arguments" -+ echo "and converts them into cracklib dictionaries for use" -+ echo "by password checking programs. The results are placed in" -+ echo "/usr/lib/cracklib_dict.*" -+ echo -+ echo "Example:" -+ echo "/usr/sbin/create-cracklib-dict /usr/dict/words" -+else -+ /usr/sbin/mkdict $* | /usr/sbin/packer /usr/lib/cracklib_dict -+fi ---- cracklib,2.7/Makefile.rh Wed Dec 31 05:33:53 1997 -+++ cracklib,2.7/Makefile Tue Mar 10 18:52:47 1998 -@@ -7,14 +7,21 @@ - ### - - ### -+# cracklib version -+MAJOR=2 -+MINOR=7 -+VERSION=$(MAJOR).$(MINOR) -+export MAJOR MINOR VERSION -+ -+### - # set this to the absolute path (less extn) of compressed dict. - --DICTPATH="/usr/local/lib/pw_dict" -+DICTPATH="/usr/lib/cracklib_dict" - - ### - # Set this to the path of one or more files continaing wordlists. - --SRCDICTS=/usr/dict/words -+SRCDICTS=/usr/dict/words /usr/dict/extra.words - - ### - # If you have installed the cracklib-dicts directory, use this -@@ -36,7 +43,9 @@ - -rm -f all installed Part* *.BAK *.bak *~ - - install: all -+ ( cd cracklib && make install && exit $$? ) -+ ( cd util && make install && exit $$? ) - @echo 'if "sort" dies from lack of space, see "util/mkdict"' -- util/mkdict $(SRCDICTS) | util/packer $(DICTPATH) -+ util/mkdict $(SRCDICTS) | LD_LIBRARY_PATH=cracklib util/packer $(ROOT)$(DICTPATH) - touch installed - ### @echo 'now go install passwd/passwd where you want it' Added: tinysofa/snapshot/cracklib/current/sources/cracklib-2.7-rh.patch =================================================================== --- tinysofa/snapshot/cracklib/current/sources/cracklib-2.7-rh.patch 2004-07-01 15:45:20 UTC (rev 2722) +++ tinysofa/snapshot/cracklib/current/sources/cracklib-2.7-rh.patch 2004-07-01 15:45:25 UTC (rev 2723) @@ -0,0 +1,173 @@ +--- cracklib,2.7/cracklib/Makefile Sun Dec 14 17:49:21 1997 ++++ cracklib,2.7/cracklib/Makefile Fri Aug 3 18:09:36 2001 +@@ -6,13 +6,24 @@ + # and upwards. + ### + +-LIB= libcrack.a +-OBJ= fascist.o packlib.o rules.o stringlib.o +-CFLAGS= -O -I../cracklib -DIN_CRACKLIB ++LIB = libcrack.so ++OBJ = fascist.o packlib.o rules.o stringlib.o ++CFLAGS = $(RPM_OPT_FLAGS) -g -I../cracklib -DIN_CRACKLIB -fPIC ++LD = ld ++includedir = /usr/include ++libdir = /usr/lib + +-$(LIB): $(OBJ) +- ar rv $(LIB) $? +- -ranlib $(LIB) ++$(LIB): $(OBJ) Makefile ++ $(LD) -shared -soname $(LIB).$(MAJOR) -o $(LIB).$(VERSION) $(OBJ) -lc ++ rm -f $(LIB).$(MAJOR) $(LIB) ++ ln -s $(LIB).$(VERSION) $(LIB).$(MAJOR) ++ ln -s $(LIB).$(MAJOR) $(LIB) + + clean: +- -rm -f $(OBJ) $(LIB) *~ ++ -rm -f $(OBJ) $(LIB) $(LIB).$(VERSION) *~ ++ ++install: $(LIB) crack.h ++ install -m 755 $(LIB).$(VERSION) $(ROOT)$(libdir) ++ ln -sf $(LIB).$(VERSION) $(ROOT)$(libdir)/$(LIB) ++ install -m 644 crack.h $(ROOT)$(includedir) ++ install -m 644 packer.h $(ROOT)$(includedir) +--- cracklib,2.7/cracklib/fascist.c Wed Dec 31 05:26:46 1997 ++++ cracklib,2.7/cracklib/fascist.c Fri Aug 3 18:09:36 2001 +@@ -11,6 +11,8 @@ + #include "packer.h" + #include + #include ++#include ++#include + + #define ISSKIP(x) (isspace(x) || ispunct(x)) + +@@ -659,7 +661,7 @@ + return ("it does not contain enough DIFFERENT characters"); + } + +- strcpy(password, Lowercase(password)); ++ strcpy(password, (char *)Lowercase(password)); + + Trim(password); + +@@ -722,7 +724,7 @@ + } + } + +- strcpy(password, Reverse(password)); ++ strcpy(password, (char *)Reverse(password)); + + for (i = 0; r_destructors[i]; i++) + { +--- cracklib,2.7/cracklib/stringlib.c Fri Jul 9 16:23:02 1993 ++++ cracklib,2.7/cracklib/stringlib.c Fri Aug 3 18:09:36 2001 +@@ -7,6 +7,7 @@ + */ + + #include "packer.h" ++#include + + static char vers_id[] = "stringlib.c : v2.3p2 Alec Muffett 18 May 1993"; + +--- cracklib,2.7/cracklib/packlib.c Fri Jul 9 16:22:58 1993 ++++ cracklib,2.7/cracklib/packlib.c Fri Aug 3 18:09:36 2001 +@@ -6,6 +6,7 @@ + * and upwards. + */ + ++#include + #include "packer.h" + + static char vers_id[] = "packlib.c : v2.3p2 Alec Muffett 18 May 1993"; +--- cracklib,2.7/cracklib/rules.c Fri Jul 9 16:22:59 1993 ++++ cracklib,2.7/cracklib/rules.c Fri Aug 3 18:09:36 2001 +@@ -8,6 +8,8 @@ + + static char vers_id[] = "rules.c : v5.0p3 Alec Muffett 20 May 1993"; + ++#include ++ + #ifndef IN_CRACKLIB + + #include "crack.h" +--- cracklib,2.7/util/Makefile Sun Dec 14 17:49:34 1997 ++++ cracklib,2.7/util/Makefile Fri Aug 3 18:09:36 2001 +@@ -14,27 +14,32 @@ + #SunOS users (and others?) should consider static linking of their passwd binary + #CFLAGS= -O -I../cracklib '-DCRACKLIB_DICTPATH="$(DICTPATH)"' -Bstatic + +-CFLAGS= -O -I../cracklib '-DCRACKLIB_DICTPATH="$(DICTPATH)"' +-LIBS= ../cracklib/libcrack.a ++CFLAGS = $(RPM_OPT_FLAGS) -I../cracklib '-DCRACKLIB_DICTPATH="$(DICTPATH)"' ++LDFLAGS = -L../cracklib -lcrack ++LIBS = ../cracklib/libcrack.so ++sbindir = /usr/sbin + + all: packer unpacker testnum teststr testlib + touch all + + packer: packer.o $(LIBS) +- cc $(CFLAGS) -o $@ $@.o $(LIBS) ++ cc $(CFLAGS) -o $@ $@.o $(LDFLAGS) + + unpacker: unpacker.o $(LIBS) +- cc $(CFLAGS) -o $@ $@.o $(LIBS) ++ cc $(CFLAGS) -o $@ $@.o $(LDFLAGS) + + testnum: testnum.o $(LIBS) +- cc $(CFLAGS) -o $@ $@.o $(LIBS) ++ cc $(CFLAGS) -o $@ $@.o $(LDFLAGS) + + teststr: teststr.o $(LIBS) +- cc $(CFLAGS) -o $@ $@.o $(LIBS) ++ cc $(CFLAGS) -o $@ $@.o $(LDFLAGS) + + testlib: testlib.o $(LIBS) +- cc $(CFLAGS) -o $@ $@.o $(LIBS) ++ cc $(CFLAGS) -o $@ $@.o $(LDFLAGS) + + clean: + -rm *.o *~ all + -rm teststr testnum testlib packer unpacker ++ ++install: all ++ install -m 755 mkdict packer $(ROOT)$(sbindir) +--- cracklib,2.7/Makefile Wed Dec 31 05:33:53 1997 ++++ cracklib,2.7/Makefile Fri Aug 3 18:09:36 2001 +@@ -7,14 +7,21 @@ + ### + + ### ++# cracklib version ++MAJOR=2 ++MINOR=7 ++VERSION=$(MAJOR).$(MINOR) ++export MAJOR MINOR VERSION ++ ++### + # set this to the absolute path (less extn) of compressed dict. + +-DICTPATH="/usr/local/lib/pw_dict" ++DICTPATH="/usr/lib/cracklib_dict" + + ### + # Set this to the path of one or more files continaing wordlists. + +-SRCDICTS=/usr/dict/words ++SRCDICTS=/usr/dict/* /usr/share/dict/* cracklib-dicts/* + + ### + # If you have installed the cracklib-dicts directory, use this +@@ -36,7 +43,9 @@ + -rm -f all installed Part* *.BAK *.bak *~ + + install: all ++ ( cd cracklib && make install && exit $$? ) ++ ( cd util && make install && exit $$? ) + @echo 'if "sort" dies from lack of space, see "util/mkdict"' +- util/mkdict $(SRCDICTS) | util/packer $(DICTPATH) ++ util/mkdict $(SRCDICTS) | LD_LIBRARY_PATH=cracklib util/packer $(ROOT)$(DICTPATH) + touch installed + ### @echo 'now go install passwd/passwd where you want it' Added: tinysofa/snapshot/cracklib/current/sources/etc-hosts.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/cracklib/current/sources/etc-hosts.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/cracklib/current/sources/famous.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/cracklib/current/sources/famous.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/cracklib/current/sources/fast-names.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/cracklib/current/sources/fast-names.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/cracklib/current/sources/female-names.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/cracklib/current/sources/female-names.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/cracklib/current/sources/male-names.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/cracklib/current/sources/male-names.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/cracklib/current/sources/myths-legends.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/cracklib/current/sources/myths-legends.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/cracklib/current/sources/names.french.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/cracklib/current/sources/names.french.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/cracklib/current/sources/names.hp.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/cracklib/current/sources/names.hp.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/cracklib/current/sources/other-names.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/cracklib/current/sources/other-names.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/cracklib/current/sources/sf.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/cracklib/current/sources/sf.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/cracklib/current/sources/shakespeare.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/cracklib/current/sources/shakespeare.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/cracklib/current/sources/surnames.finnish.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/cracklib/current/sources/surnames.finnish.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: tinysofa/snapshot/cracklib/current/specs/cracklib.spec =================================================================== --- tinysofa/snapshot/cracklib/current/specs/cracklib.spec 2004-07-01 15:45:20 UTC (rev 2722) +++ tinysofa/snapshot/cracklib/current/specs/cracklib.spec 2004-07-01 15:45:25 UTC (rev 2723) @@ -1,112 +1,209 @@ Summary: A password-checking library. Name: cracklib Version: 2.7 -Release: 18ts -Group: tinysofa official -Source: http://www.users.dircon.co.uk/~crypto/download/cracklib,2.7.tgz -URL: http://www.users.dircon.co.uk/~crypto/ +Release: 27.1ts +Group: System Environment/Libraries +Source0: http://www.crypticide.org/users/alecm/security/cracklib,%{version}.tgz +Source1: crack.h +Source10: ftp://ftp.cerias.purdue.edu/pub/dict/wordlists/computer/Domains.gz +Source11: ftp://ftp.cerias.purdue.edu/pub/dict/wordlists/computer/Dosref.gz +Source12: ftp://ftp.cerias.purdue.edu/pub/dict/wordlists/computer/Ftpsites.gz +Source13: ftp://ftp.cerias.purdue.edu/pub/dict/wordlists/computer/Jargon.gz +Source14: ftp://ftp.cerias.purdue.edu/pub/dict/wordlists/computer/common-passwords.txt.gz +Source15: ftp://ftp.cerias.purdue.edu/pub/dict/wordlists/computer/etc-hosts.gz +Source16: ftp://ftp.cerias.purdue.edu/pub/dict/wordlists/movieTV/Movies.gz +Source17: ftp://ftp.cerias.purdue.edu/pub/dict/wordlists/movieTV/Python.gz +Source18: ftp://ftp.cerias.purdue.edu/pub/dict/wordlists/movieTV/Trek.gz +Source19: ftp://ftp.cerias.purdue.edu/pub/dict/wordlists/literature/LCarrol.gz +Source20: ftp://ftp.cerias.purdue.edu/pub/dict/wordlists/literature/Paradise.Lost.gz +Source21: ftp://ftp.cerias.purdue.edu/pub/dict/wordlists/literature/cartoon.gz +Source22: ftp://ftp.cerias.purdue.edu/pub/dict/wordlists/literature/myths-legends.gz +Source23: ftp://ftp.cerias.purdue.edu/pub/dict/wordlists/literature/sf.gz +Source24: ftp://ftp.cerias.purdue.edu/pub/dict/wordlists/literature/shakespeare.gz +Source25: ftp://ftp.cerias.purdue.edu/pub/dict/wordlists/names/ASSurnames.gz +Source26: ftp://ftp.cerias.purdue.edu/pub/dict/wordlists/names/Congress.gz +Source27: ftp://ftp.cerias.purdue.edu/pub/dict/wordlists/names/Family-Names.gz +Source28: ftp://ftp.cerias.purdue.edu/pub/dict/wordlists/names/Given-Names.gz +Source29: ftp://ftp.cerias.purdue.edu/pub/dict/wordlists/names/famous.gz +Source30: ftp://ftp.cerias.purdue.edu/pub/dict/wordlists/names/fast-names.gz +Source31: ftp://ftp.cerias.purdue.edu/pub/dict/wordlists/names/female-names.gz +Source32: ftp://ftp.cerias.purdue.edu/pub/dict/wordlists/names/male-names.gz +Source33: ftp://ftp.cerias.purdue.edu/pub/dict/wordlists/names/names.french.gz +Source34: ftp://ftp.cerias.purdue.edu/pub/dict/wordlists/names/names.hp.gz +Source35: ftp://ftp.cerias.purdue.edu/pub/dict/wordlists/names/other-names.gz +Source36: ftp://ftp.cerias.purdue.edu/pub/dict/wordlists/names/surnames.finnish.gz +Url: http://www.crypticide.org/users/alecm/ License: Artistic -Patch: cracklib-2.7-redhat.patch -BuildRoot: %{_tmppath}/%{name}-root +Patch0: cracklib-2.7-rh.patch +Patch1: cracklib-2.7-nss.patch +Buildroot: %{_tmppath}/%{name}-root +BuildPrereq: gzip, words %description CrackLib tests passwords to determine whether they match certain -security-oriented characteristics. You can use CrackLib to stop -users from choosing passwords which would be easy to guess. CrackLib -performs certain tests: +security-oriented characteristics, with the purpose of stopping users +from choosing passwords that are easy to guess. CrackLib performs +several tests on passwords: it tries to generate words from a username +and gecos entry and checks those words against the password; it checks +for simplistic patterns in passwords; and it checks for the password +in a dictionary. -* It tries to generate words from a username and gecos entry and - checks those words against the password; -* It checks for simplistic patterns in passwords; -* It checks for the password in a dictionary. +CrackLib is actually a library containing a particular C function +which is used to check the password, as well as other C +functions. CrackLib is not a replacement for a passwd program; it must +be used in conjunction with an existing passwd program. -CrackLib is actually a library containing a particular -C function which is used to check the password, as well as -other C functions. CrackLib is not a replacement for a passwd -program; it must be used in conjunction with an existing passwd -program. - Install the cracklib package if you need a program to check users' -passwords to see if they are at least minimally secure. If you -install CrackLib, you'll also want to install the cracklib-dicts -package. +passwords to see if they are at least minimally secure. If you install +CrackLib, you will also want to install the cracklib-dicts package. %package dicts Summary: The standard CrackLib dictionaries. -Group: tinysofa official -Requires: words +Group: System Environment/Libraries +Requires: words >= 2-13 %description dicts The cracklib-dicts package includes the CrackLib dictionaries. CrackLib will need to use the dictionary appropriate to your system, -which is normally put in /usr/dict/words. Cracklib-dicts also contains -the utilities necessary for the creation of new dictionaries. +which is normally put in /usr/share/dict/words. Cracklib-dicts also +contains the utilities necessary for the creation of new dictionaries. If you are installing CrackLib, you should also install cracklib-dicts. %prep -%setup -q -n cracklib,2.7 -%patch -p1 +%setup -n cracklib,%{version} -q +%patch0 -p1 -b .rh +%patch1 -p1 -b .nss +cp %{SOURCE1} cracklib/crack.h +mkdir cracklib-dicts +for dict in %{SOURCE10} %{SOURCE11} %{SOURCE12} %{SOURCE13} %{SOURCE14} \ + %{SOURCE15} %{SOURCE16} %{SOURCE17} %{SOURCE18} %{SOURCE19} \ + %{SOURCE20} %{SOURCE21} %{SOURCE22} %{SOURCE23} %{SOURCE24} \ + %{SOURCE25} %{SOURCE26} %{SOURCE27} %{SOURCE28} %{SOURCE29} \ + %{SOURCE30} %{SOURCE31} %{SOURCE32} %{SOURCE33} %{SOURCE34} \ + %{SOURCE35} %{SOURCE36} +do + cp -fv ${dict} cracklib-dicts/ +done +gunzip cracklib-dicts/* %build -RPM_OPT_FLAGS="${RPM_OPT_FLAGS} %{?no_stack_protector}" -make all CC=gcc +make all \ + DICTPATH=%{_libdir}/cracklib_dict \ + libdir=%{_libdir} %clean -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf "$RPM_BUILD_ROOT" +[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT +%install +[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT +mkdir -p $RPM_BUILD_ROOT{%{_includedir},%{_libdir},%{_sbindir}} +make install \ + ROOT=$RPM_BUILD_ROOT \ + includedir=%{_includedir} \ + DICTPATH=%{_libdir}/cracklib_dict \ + libdir=%{_libdir} \ + sbindir=%{_sbindir} + %post -p /sbin/ldconfig %postun -p /sbin/ldconfig -%install -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf "$RPM_BUILD_ROOT" -mkdir -p $RPM_BUILD_ROOT/usr/{sbin,lib,include} -make install ROOT=$RPM_BUILD_ROOT -strip $RPM_BUILD_ROOT/usr/sbin/packer +%triggerpostun -- cracklib < 2.7-24 +/sbin/ldconfig %files %defattr(-,root,root) %doc README MANIFEST LICENCE HISTORY POSTER -/usr/include/* -/usr/lib/lib* +%{_includedir}/* +%{_libdir}/lib* %files dicts %defattr(-,root,root) -/usr/sbin/* -/usr/lib/cracklib_dict* +%{_sbindir}/* +%{_libdir}/cracklib_dict* %changelog -* Wed May 19 2004 tsintegrate 2.7-18ts -- current (2.7-17ts) integrated as 2.7-18ts for release 1.0-U1 +* Tue Mar 02 2004 Elliot Lee +- rebuilt -* Fri Jan 23 2004 Oystein Viggen 2.7-14ov -- Does not build with stack protector enabled +* Fri Feb 13 2004 Elliot Lee +- rebuilt -* Tue Dec 9 2003 Erlend Midttun 2.7-13tr -- Big rebuild +* Wed Feb 4 2004 Nalin Dahyabhai 2.7-26 +- update URL (previous page moved) (#114894) -* Wed Jun 18 2003 Erlend Midttun 2.7-12tr -- Big rebuild +* Fri Jan 30 2004 Nalin Dahyabhai 2.7-25 +- fix ldconfig invocation in trigger for older versions which included the + soname symlink (#114620) -* Mon Mar 24 2003 Erlend Midttun 2.7-11em -- Rebuilt against glibc 2.3.2. +* Mon Dec 1 2003 Nalin Dahyabhai 2.7-24 +- include packer.h for reading dictionaries directly, since we already include + packer in the -dicts subpackage (#68339) +- don't include the soname symlink in the package, let ldconfig do its job -* Tue Mar 4 2003 Erlend Midttun 2.7-10em -- Added Requires: words. +* Wed Jun 18 2003 Nalin Dahyabhai 2.7-23 +- rebuild -* Tue Feb 23 2003 Erlend Midttun 2.7-9em -- Fixed setup. +* Mon Jun 16 2003 Nalin Dahyabhai 2.7-22 +- rebuild -* Tue Jul 16 2002 Christian H. Toldnes 2.7-8ct -- Rebuilt to fit TSL 2.0 +* Wed Jun 04 2003 Elliot Lee +- rebuilt -* Tue Jul 17 2001 Erlend Midttun -- Inc serial number before release. +* Wed Apr 30 2003 Nalin Dahyabhai +- update URL -* Sat Mar 18 2000 Michael Tokarev -- added %defattr(-,root,root) +* Tue Feb 04 2003 Florian La Roche +- add symlink to shared libs +* Wed Jan 22 2003 Tim Powers +- rebuilt + +* Wed Sep 25 2002 Nalin Dahyabhai 2.7-19 +- fix for builds on multilib systems (set DICTPATH properly) + +* Fri Jun 21 2002 Tim Powers +- automated rebuild + +* Sun May 26 2002 Tim Powers +- automated rebuild + +* Thu May 9 2002 Nalin Dahyabhai 2.7-16 +- rebuild in new environment + +* Fri Feb 22 2002 Nalin Dahyabhai 2.7-15 +- rebuild + +* Wed Jan 09 2002 Tim Powers +- automated rebuild + +* Tue Oct 2 2001 Nalin Dahyabhai 2.7-13 +- use getpwuid_r instead of getpwuid + +* Fri Aug 3 2001 Nalin Dahyabhai 2.7-12 +- remove cruft that ldconfig already knows how to manage +- don't explicitly strip anything -- the brp setup decides that +- tweak the header so that it can be used in C++ (#46685) +- buildprereq the words package + +* Tue Jun 26 2001 Florian La Roche +- add link from library major version number + +* Sun Jun 24 2001 Elliot Lee +- Bump release + rebuild. + +* Wed Jul 12 2000 Prospector +- automatic rebuild + +* Tue Jun 27 2000 Nalin Dahyabhai +- FHS fixes +- fix undeclared function warnings from the new compiler +- fix URL + +* Fri Apr 07 2000 Trond Eivind Glomsr?d +- switched to use /usr/share/dict/words + * Tue Apr 06 1999 Preston Brown - strip binaries From svn at tinysofa.org Thu Jul 1 15:45:32 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:45:32 +1000 (EST) Subject: [tinysofa-svn] r2724 - in tinysofa/snapshot/crontabs/current: sources specs Message-ID: <20040701154532.2643C4E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:45:27 +1000 (Fri, 02 Jul 2004) New Revision: 2724 Added: tinysofa/snapshot/crontabs/current/sources/crontab Modified: tinysofa/snapshot/crontabs/current/sources/run-parts tinysofa/snapshot/crontabs/current/specs/crontabs.spec Log: - Sync with 2.0. - Kept: - run-parts: - Added: - crontab: Added: tinysofa/snapshot/crontabs/current/sources/crontab =================================================================== --- tinysofa/snapshot/crontabs/current/sources/crontab 2004-07-01 15:45:25 UTC (rev 2723) +++ tinysofa/snapshot/crontabs/current/sources/crontab 2004-07-01 15:45:27 UTC (rev 2724) @@ -0,0 +1,10 @@ +SHELL=/bin/bash +PATH=/sbin:/bin:/usr/sbin:/usr/bin +MAILTO=root +HOME=/ + +# run-parts +01 * * * * root run-parts /etc/cron.hourly +02 4 * * * root run-parts /etc/cron.daily +22 4 * * 0 root run-parts /etc/cron.weekly +42 4 1 * * root run-parts /etc/cron.monthly Modified: tinysofa/snapshot/crontabs/current/sources/run-parts =================================================================== --- tinysofa/snapshot/crontabs/current/sources/run-parts 2004-07-01 15:45:25 UTC (rev 2723) +++ tinysofa/snapshot/crontabs/current/sources/run-parts 2004-07-01 15:45:27 UTC (rev 2724) @@ -23,9 +23,15 @@ [ "${i%.rpmorig}" != "${i}" ] && continue [ "${i%.rpmnew}" != "${i}" ] && continue [ "${i%.swp}" != "${i}" ] && continue + [ "${i%,v}" != "${i}" ] && continue if [ -x $i ]; then - $i + $i 2>&1 | awk -v "progname=$i" \ + 'progname { + print progname ":\n" + progname=""; + } + { print; }' fi done Modified: tinysofa/snapshot/crontabs/current/specs/crontabs.spec =================================================================== --- tinysofa/snapshot/crontabs/current/specs/crontabs.spec 2004-07-01 15:45:25 UTC (rev 2723) +++ tinysofa/snapshot/crontabs/current/specs/crontabs.spec 2004-07-01 15:45:27 UTC (rev 2724) @@ -1,12 +1,12 @@ Summary: Root crontab files used to schedule the execution of programs. Name: crontabs -Version: 1.8 +Version: 1.10 Release: 6ts -License: public domain -Group: tinysofa official +License: Public Domain +Group: System Environment/Base +Source0: crontab Source1: run-parts -Requires: tmpwatch -BuildArch: noarch +BuildArchitectures: noarch BuildRoot: %{_tmppath}/%{name}-root %description @@ -19,21 +19,20 @@ Crontabs handles a basic system function, so it should be installed on your system. -%prep -# satisfy rpm - %install -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf "$RPM_BUILD_ROOT" +rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/etc/cron.{hourly,daily,weekly,monthly} mkdir -p $RPM_BUILD_ROOT/usr/bin -install -m755 %SOURCE1 $RPM_BUILD_ROOT/usr/bin/run-parts +install -m644 $RPM_SOURCE_DIR/crontab $RPM_BUILD_ROOT/etc/crontab +install -m755 $RPM_SOURCE_DIR/run-parts $RPM_BUILD_ROOT/usr/bin/run-parts %clean -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf "$RPM_BUILD_ROOT" +rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) +%config(noreplace) /etc/crontab /usr/bin/run-parts %dir /etc/cron.hourly %dir /etc/cron.daily @@ -41,33 +40,39 @@ %dir /etc/cron.monthly %changelog -* Wed May 19 2004 tsintegrate 1.8-6ts -- current (1.8-5ts) integrated as 1.8-6ts for release 1.0-U1 +* Fri Feb 13 2004 Elliot Lee +- rebuilt -* Wed Mar 31 2004 Omar Kilani 1.8-5ts -- Tinysofaise. +* Fri Feb 7 2003 Bill Nottingham +- not-as-automated rebuild -* Tue Mar 23 2004 Chr. Toldnes 1.8-4tr -- Remove the confusing /etc/fcrontab file +* Fri Jun 21 2002 Tim Powers +- automated rebuild -* Tue Dec 9 2003 Erlend Midttun 1.8-1tr -- Run cron scripts nearer midnight. +* Thu May 23 2002 Tim Powers +- automated rebuild -* Wed Jun 18 2003 Erlend Midttun 1.7-6tr -- Big rebuild +* Wed Jan 09 2002 Tim Powers +- automated rebuild -* Mon Mar 24 2003 Erlend Midttun 1.7-5em -- Rebuilt against glibc 2.3.2. +* Thu Jul 19 2001 Preston Brown +- don't require tmpwatch -* Wed Mar 5 2003 Erlend Midttun 1.7-4em -- Added comment about running fcrontab after changes to /etc/fcrontab. +* Tue Feb 27 2001 Preston Brown +- noreplace crontab file; use tmppath -* Fri Oct 25 2002 Christian H. Toldnes 1.7-3ct -- Converted to fcrontab for use in TSL 2.0 +* Wed Jan 31 2001 Bill Nottingham +- don't process ,v files (#15968) -* Tue Jul 17 2001 Erlend Midttun -- Inc serial number before release. +* Mon Aug 7 2000 Bill Nottingham +- put name of script in output of stuff run by run-parts (#12411) +* Wed Jul 12 2000 Prospector +- automatic rebuild + +* Tue Jun 6 2000 Bill Nottingham +- rebuild + * Fri Aug 27 1999 Jeff Johnson - don't run *~ or *, files (#4740). @@ -94,4 +99,4 @@ - removed tmpwatch and at entries * Thu Jul 31 1997 Erik Troan -- made a noarch package \ No newline at end of file +- made a noarch package From svn at tinysofa.org Thu Jul 1 15:46:16 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:46:16 +1000 (EST) Subject: [tinysofa-svn] r2734 - in tinysofa/snapshot/dosfstools/current: sources specs Message-ID: <20040701154616.ECB764E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:46:16 +1000 (Fri, 02 Jul 2004) New Revision: 2734 Added: tinysofa/snapshot/dosfstools/current/sources/dosfstools-2.7-s390.patch tinysofa/snapshot/dosfstools/current/sources/dosfstools-2.8-autofat32.patch tinysofa/snapshot/dosfstools/current/sources/dosfstools-2.8-endian.patch tinysofa/snapshot/dosfstools/current/sources/dosfstools-2.8-loopsize.patch tinysofa/snapshot/dosfstools/current/sources/dosfstools-2.8.src.tar.gz tinysofa/snapshot/dosfstools/current/sources/dosfstools-llseek.patch Removed: tinysofa/snapshot/dosfstools/current/sources/dosfstools-2.8-errno.patch tinysofa/snapshot/dosfstools/current/sources/dosfstools-2.9.src.tar.gz Modified: tinysofa/snapshot/dosfstools/current/specs/dosfstools.spec Log: - Sync with 2.0. - Kept: - dosfstools-2.7-argfix.patch: - Added: - dosfstools-2.7-s390.patch: - dosfstools-2.8-autofat32.patch: - dosfstools-2.8-endian.patch: - dosfstools-2.8-loopsize.patch: - dosfstools-2.8.src.tar.gz: - dosfstools-llseek.patch: - Removed: - dosfstools-2.8-errno.patch: - dosfstools-2.9.src.tar.gz: Added: tinysofa/snapshot/dosfstools/current/sources/dosfstools-2.7-s390.patch =================================================================== --- tinysofa/snapshot/dosfstools/current/sources/dosfstools-2.7-s390.patch 2004-07-01 15:46:08 UTC (rev 2733) +++ tinysofa/snapshot/dosfstools/current/sources/dosfstools-2.7-s390.patch 2004-07-01 15:46:16 UTC (rev 2734) @@ -0,0 +1,22 @@ +--- dosfstools-2.7/mkdosfs/mkdosfs.c.ia64 Tue Nov 28 11:23:58 2000 ++++ dosfstools-2.7/mkdosfs/mkdosfs.c Fri Jul 6 10:55:53 2001 +@@ -95,7 +95,7 @@ + /* Use the _llseek system call directly, because there (once?) was a bug in + * the glibc implementation of it. */ + #include +-#if defined(__alpha) || defined(__ia64__) ++#if defined(__alpha) || defined(__ia64__) || defined(__s390__) || defined(__s390x__) + /* On alpha, the syscall is simply lseek, because it's a 64 bit system. */ + static loff_t llseek( int fd, loff_t offset, int whence ) + { +--- dosfstools-2.7/dosfsck/io.c.ia64 Tue Nov 28 11:22:42 2000 ++++ dosfstools-2.7/dosfsck/io.c Fri Jul 6 10:56:52 2001 +@@ -42,7 +42,7 @@ + /* Use the _llseek system call directly, because there (once?) was a bug in + * the glibc implementation of it. */ + #include +-#if defined(__alpha) || defined (__ia64__) ++#if defined(__alpha) || defined (__ia64__) || defined(__s390__) || defined(__s390x__) + /* On alpha, the syscall is simply lseek, because it's a 64 bit system. */ + static loff_t llseek( int fd, loff_t offset, int whence ) + { Added: tinysofa/snapshot/dosfstools/current/sources/dosfstools-2.8-autofat32.patch =================================================================== --- tinysofa/snapshot/dosfstools/current/sources/dosfstools-2.8-autofat32.patch 2004-07-01 15:46:08 UTC (rev 2733) +++ tinysofa/snapshot/dosfstools/current/sources/dosfstools-2.8-autofat32.patch 2004-07-01 15:46:16 UTC (rev 2734) @@ -0,0 +1,44 @@ +diff -u --recursive dosfstools-2.8/mkdosfs/mkdosfs.c dosfstools-2.8vb2/mkdosfs/mkdosfs.c +--- dosfstools-2.8/mkdosfs/mkdosfs.c Tue Feb 25 15:25:08 2003 ++++ dosfstools-2.8vb2/mkdosfs/mkdosfs.c Wed Feb 26 15:51:56 2003 +@@ -770,13 +772,33 @@ + bs.media = (char) 0xf8; /* Set up the media descriptor for a hard drive */ + bs.dir_entries[0] = (char) 0; /* Default to 512 entries */ + bs.dir_entries[1] = (char) 2; +- /* For FAT32, use 4k clusters on sufficiently large file systems, +- * otherwise 1 sector per cluster. This is also what M$'s format +- * command does for FAT32. */ +- bs.cluster_size = (char) +- (size_fat == 32 ? +- ((long long)blocks*SECTORS_PER_BLOCK >= 512*1024 ? 8 : 1) : +- 4); /* FAT12 and FAT16: start at 4 sectors per cluster */ ++ /* Check if we should use FAT32 */ ++ if (!size_fat) { ++ if ((blocks*SECTORS_PER_BLOCK) > 1064960) { ++ if (verbose) printf("Selecting FAT32 on large drive\n"); ++ size_fat = 32; ++ } ++ } ++ if (size_fat == 32) { ++ /* Use this table to find FAT32 default cluster size */ ++ int volsize = blocks*SECTORS_PER_BLOCK; ++ if (volsize <= 66600) ++ die("Volume too small for FAT32\n"); ++ else if (volsize <= 532480) ++ bs.cluster_size = 1; ++ else if (volsize <= 16777216) ++ bs.cluster_size = 8; ++ else if (volsize <= 33554432) ++ bs.cluster_size = 16; ++ else if (volsize <= 67108864) ++ bs.cluster_size = 32; ++ else ++ bs.cluster_size = 64; ++ if (verbose) printf("Selecting %i sectors per cluster\n",bs.cluster_size); ++ } else { ++ /* FAT12 and FAT16: start at 4 sectors per cluster */ ++ bs.cluster_size = 4; ++ } + } + } + Added: tinysofa/snapshot/dosfstools/current/sources/dosfstools-2.8-endian.patch =================================================================== --- tinysofa/snapshot/dosfstools/current/sources/dosfstools-2.8-endian.patch 2004-07-01 15:46:08 UTC (rev 2733) +++ tinysofa/snapshot/dosfstools/current/sources/dosfstools-2.8-endian.patch 2004-07-01 15:46:16 UTC (rev 2734) @@ -0,0 +1,33 @@ +--- dosfstools-2.8/dosfsck/dosfsck.h.moo Wed Sep 3 10:38:29 2003 ++++ dosfstools-2.8/dosfsck/dosfsck.h Wed Sep 3 10:38:42 2003 +@@ -14,14 +14,22 @@ + #define _LINUX_STRING_H_ /* hack to avoid inclusion of */ + #include + +-/* 2.1 kernels use le16_to_cpu() type functions for CF_LE_W & Co., but don't +- * export this macros, only __le16_to_cpu(). */ +-#ifndef le16_to_cpu +-#define le16_to_cpu __le16_to_cpu +-#define le32_to_cpu __le32_to_cpu +-#define cpu_to_le16 __cpu_to_le16 +-#define cpu_to_le32 __cpu_to_le32 +-#endif ++#if __BYTE_ORDER == __BIG_ENDIAN ++#include ++ ++#define CF_LE_W(v) bswap_16(v) ++#define CF_LE_L(v) bswap_32(v) ++#define CT_LE_W(v) CF_LE_W(v) ++#define CT_LE_L(v) CF_LE_L(v) ++ ++#else ++ ++#define CF_LE_W(v) (v) ++#define CF_LE_L(v) (v) ++#define CT_LE_W(v) (v) ++#define CT_LE_L(v) (v) ++ ++#endif /* __BIG_ENDIAN */ + + #define VFAT_LN_ATTR (ATTR_RO | ATTR_HIDDEN | ATTR_SYS | ATTR_VOLUME) + Deleted: tinysofa/snapshot/dosfstools/current/sources/dosfstools-2.8-errno.patch =================================================================== --- tinysofa/snapshot/dosfstools/current/sources/dosfstools-2.8-errno.patch 2004-07-01 15:46:08 UTC (rev 2733) +++ tinysofa/snapshot/dosfstools/current/sources/dosfstools-2.8-errno.patch 2004-07-01 15:46:16 UTC (rev 2734) @@ -1,11 +0,0 @@ -diff -Nur dosfstools-2.8/mkdosfs/mkdosfs.c dosfstools-2.8.changed/mkdosfs/mkdosfs.c ---- dosfstools-2.8/mkdosfs/mkdosfs.c 2003-03-26 15:49:48.000000000 +0100 -+++ dosfstools-2.8.changed/mkdosfs/mkdosfs.c 2003-03-26 15:51:35.000000000 +0100 -@@ -64,6 +64,7 @@ - #include - #include - #include -+#include - - #if __BYTE_ORDER == __BIG_ENDIAN - Added: tinysofa/snapshot/dosfstools/current/sources/dosfstools-2.8-loopsize.patch =================================================================== --- tinysofa/snapshot/dosfstools/current/sources/dosfstools-2.8-loopsize.patch 2004-07-01 15:46:08 UTC (rev 2733) +++ tinysofa/snapshot/dosfstools/current/sources/dosfstools-2.8-loopsize.patch 2004-07-01 15:46:16 UTC (rev 2734) @@ -0,0 +1,10 @@ +--- dosfstools-2.8/mkdosfs/mkdosfs.c.loopsize 2003-02-19 00:50:30.000000000 -0500 ++++ dosfstools-2.8/mkdosfs/mkdosfs.c 2003-02-19 00:50:38.000000000 -0500 +@@ -675,7 +675,6 @@ + /* Can we get the loop geometry? This is in 512 byte blocks, always? */ + if (ioctl (dev, BLKGETSIZE, &loop_size)) + die ("unable to get loop geometry for '%s'"); +- loop_size = loop_size >> 1; + + switch (loop_size) /* Assuming the loop device -> floppy later */ + { Added: tinysofa/snapshot/dosfstools/current/sources/dosfstools-2.8.src.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/dosfstools/current/sources/dosfstools-2.8.src.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: tinysofa/snapshot/dosfstools/current/sources/dosfstools-2.9.src.tar.gz =================================================================== (Binary files differ) Added: tinysofa/snapshot/dosfstools/current/sources/dosfstools-llseek.patch =================================================================== --- tinysofa/snapshot/dosfstools/current/sources/dosfstools-llseek.patch 2004-07-01 15:46:08 UTC (rev 2733) +++ tinysofa/snapshot/dosfstools/current/sources/dosfstools-llseek.patch 2004-07-01 15:46:16 UTC (rev 2734) @@ -0,0 +1,70 @@ +--- dosfstools-2.8/mkdosfs/mkdosfs.c.sopwith Thu Dec 12 11:47:44 2002 ++++ dosfstools-2.8/mkdosfs/mkdosfs.c Thu Dec 12 11:47:44 2002 +@@ -92,31 +92,6 @@ + + #endif /* __BIG_ENDIAN */ + +-/* Use the _llseek system call directly, because there (once?) was a bug in +- * the glibc implementation of it. */ +-#include +-#if defined(__alpha) || defined(__ia64__) || defined(__s390__) || defined(__s390x__) +-/* On alpha, the syscall is simply lseek, because it's a 64 bit system. */ +-static loff_t llseek( int fd, loff_t offset, int whence ) +-{ +- return lseek(fd, offset, whence); +-} +-#else +-# ifndef __NR__llseek +-# error _llseek system call not present +-# endif +-static _syscall5( int, _llseek, uint, fd, ulong, hi, ulong, lo, +- loff_t *, res, uint, wh ); +-static loff_t llseek( int fd, loff_t offset, int whence ) +-{ +- loff_t actual; +- +- if (_llseek(fd, offset>>32, offset&0xffffffff, &actual, whence) != 0) +- return (loff_t)-1; +- return actual; +-} +-#endif +- + /* Constant definitions */ + + #define TRUE 1 /* Boolean constants */ +--- dosfstools-2.8/dosfsck/io.c.sopwith Thu Dec 12 11:48:01 2002 ++++ dosfstools-2.8/dosfsck/io.c Thu Dec 12 11:48:15 2002 +@@ -39,33 +39,6 @@ + + unsigned device_no; + +-/* Use the _llseek system call directly, because there (once?) was a bug in +- * the glibc implementation of it. */ +-#include +-#if defined(__alpha) || defined (__ia64__) || defined(__s390__) || defined(__s390x__) +-/* On alpha, the syscall is simply lseek, because it's a 64 bit system. */ +-static loff_t llseek( int fd, loff_t offset, int whence ) +-{ +- return lseek(fd, offset, whence); +-} +-#else +-# ifndef __NR__llseek +-# error _llseek system call not present +-# endif +-static _syscall5( int, _llseek, uint, fd, ulong, hi, ulong, lo, +- loff_t *, res, uint, wh ); +- +-static loff_t llseek( int fd, loff_t offset, int whence ) +-{ +- loff_t actual; +- +- if (_llseek(fd, offset>>32, offset&0xffffffff, &actual, whence) != 0) +- return (loff_t)-1; +- return actual; +-} +-#endif +- +- + void fs_open(char *path,int rw) + { + struct stat stbuf; Modified: tinysofa/snapshot/dosfstools/current/specs/dosfstools.spec =================================================================== --- tinysofa/snapshot/dosfstools/current/specs/dosfstools.spec 2004-07-01 15:46:08 UTC (rev 2733) +++ tinysofa/snapshot/dosfstools/current/specs/dosfstools.spec 2004-07-01 15:46:16 UTC (rev 2734) @@ -1,13 +1,17 @@ Name: dosfstools Summary: Utilities for making and checking MS-DOS FAT filesystems on Linux. -Version: 2.9 -Release: 5ts +Version: 2.8 +Release: 12ts License: GPL -Group: tinysofa official -Source: ftp://ftp.uni-erlangen.de/pub/Linux/LOCAL/dosfstools/dosfstools-%{version}.src.tar.gz -Patch0: dosfstools-2.7-argfix.patch -Patch1: dosfstools-2.8-errno.patch -BuildRoot: %{_tmppath}/%{name}-root +Group: Applications/System +Source: ftp://ibiblio.org/pub/Linux/system/filesystems/dosfs/dosfstools-%{version}.src.tar.gz +Patch0: dosfstools-2.7-s390.patch +Patch1: dosfstools-2.7-argfix.patch +Patch2: dosfstools-llseek.patch +Patch3: dosfstools-2.8-loopsize.patch +Patch4: dosfstools-2.8-autofat32.patch +Patch5: dosfstools-2.8-endian.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-root Obsoletes: mkdosfs-ygg %description @@ -17,14 +21,18 @@ %prep %setup -q -%patch0 -p1 -b .argfix -%patch1 -p1 +%patch0 -p1 -b .s390 +%patch1 -p1 -b .argfix +%patch2 -p1 +%patch3 -p1 -b .loopsize +%patch4 -p1 -b .autofat32 +%patch5 -p1 -b .endian %build -make +make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS -Dllseek=lseek64 -D_LARGEFILE64_SOURCE" %install -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf "$RPM_BUILD_ROOT" +rm -rf %{buildroot} mkdir -p %{buildroot}/sbin mkdir -p %{buildroot}/%{_mandir}/man8 @@ -44,7 +52,7 @@ ln -sf dosfsck.8.gz %{buildroot}%{_mandir}/man8/fsck.vfat.8.gz %clean -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf "$RPM_BUILD_ROOT" +rm -rf %{buildroot} %files %defattr(-,root,root) @@ -52,26 +60,43 @@ %{_mandir}/man8/* %changelog -* Wed May 19 2004 tsintegrate 2.9-5ts -- current (2.9-4ts) integrated as 2.9-5ts for release 1.0-U1 +* Fri Feb 13 2004 Elliot Lee +- rebuilt -* Fri Dec 12 2003 Erlend Midttun 2.9-1tr -- New upstream. +* Wed Sep 3 2003 Bill Nottingham 2.8-11 +- rebuild -* Wed Jun 18 2003 Erlend Midttun 2.8-4tr -- Big rebuild +* Wed Sep 3 2003 Bill Nottingham 2.8-10 +- don't rely on including -* Wed Mar 26 2003 Christian H. Toldnes 2.8-3ct -- Rebuilt against glibc 2.3.2. +* Tue Jun 24 2003 Jeremy Katz 2.8-9 +- rebuild -* Sat Feb 01 2003 Tor Hveem 2.8-2th -- Fixed package Group +* Tue Jun 24 2003 Jeremy Katz 2.8-8 +- add patch from Vince Busam (http://www.sixpak.org/dosfstools/) to do auto + creation of FAT32 on large devices (#97308) -* Tue Jul 9 2002 Nico Erfurth 2.8-1ne -- Upgrade to v2.8 -- Removed the s390 patch, not needed for TSL -- Fixed Source-link, the old one does not have the new version +* Wed Jun 04 2003 Elliot Lee +- rebuilt +* Wed Feb 19 2003 Jeremy Katz 2.8-6 +- handle getting the size of loop devices properly (part of #84351) + +* Wed Jan 22 2003 Tim Powers +- rebuilt + +* Thu Dec 12 2002 Elliot Lee 2.8-4 +- Patch2 for errno + +* Fri Jun 21 2002 Tim Powers +- automated rebuild + +* Thu May 23 2002 Tim Powers +- automated rebuild + +* Thu Mar 07 2002 Florian La Roche +- update to version 2.8 + * Fri Jul 6 2001 Preston Brown - major upgrade to v2.7. - forward port old ia64 patch (now incorporated) s390 additions @@ -127,4 +152,4 @@ - translations modified for de, fr, tr * Thu Jul 10 1997 Erik Troan -- built against glibc \ No newline at end of file +- built against glibc From svn at tinysofa.org Thu Jul 1 15:46:22 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:46:22 +1000 (EST) Subject: [tinysofa-svn] r2736 - in tinysofa/snapshot/e2fsprogs/current: sources specs Message-ID: <20040701154622.ACD4E4E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:46:22 +1000 (Fri, 02 Jul 2004) New Revision: 2736 Added: tinysofa/snapshot/e2fsprogs/current/sources/e2fsprogs-1.27-nostrip.patch tinysofa/snapshot/e2fsprogs/current/sources/e2fsprogs-1.32-nosync.patch tinysofa/snapshot/e2fsprogs/current/sources/e2fsprogs-1.35-next_check.patch Modified: tinysofa/snapshot/e2fsprogs/current/specs/e2fsprogs.spec Log: - Sync with 2.0. - Kept: - e2fsprogs-1.35.tar.gz: - Added: - e2fsprogs-1.27-nostrip.patch: - e2fsprogs-1.32-nosync.patch: - e2fsprogs-1.35-next_check.patch: Added: tinysofa/snapshot/e2fsprogs/current/sources/e2fsprogs-1.27-nostrip.patch =================================================================== --- tinysofa/snapshot/e2fsprogs/current/sources/e2fsprogs-1.27-nostrip.patch 2004-07-01 15:46:19 UTC (rev 2735) +++ tinysofa/snapshot/e2fsprogs/current/sources/e2fsprogs-1.27-nostrip.patch 2004-07-01 15:46:22 UTC (rev 2736) @@ -0,0 +1,63 @@ +--- e2fsprogs-1.27/lib/Makefile.elf-lib.nostrip Wed Jun 19 10:04:09 2002 ++++ e2fsprogs-1.27/lib/Makefile.elf-lib Wed Jun 19 10:04:23 2002 +@@ -40,8 +40,6 @@ + + install-shlibs install:: $(ELF_LIB) installdirs-elf-lib + $(INSTALL_PROGRAM) $(ELF_LIB) $(DESTDIR)$(ELF_INSTALL_DIR)/$(ELF_LIB) +- $(STRIP) --strip-debug \ +- $(DESTDIR)$(ELF_INSTALL_DIR)/$(ELF_LIB) + $(LN_S) -f $(ELF_LIB) $(DESTDIR)$(ELF_INSTALL_DIR)/$(ELF_SONAME) + $(LN_S) -f $(ELF_INSTALL_DIR)/$(ELF_SONAME) \ + $(DESTDIR)$(libdir)/$(ELF_IMAGE).so +--- e2fsprogs-1.32/debugfs/Makefile.in.lrr 2003-07-30 14:21:44.000000000 +0200 ++++ e2fsprogs-1.32/debugfs/Makefile.in 2003-07-30 14:22:08.000000000 +0200 +@@ -48,7 +48,6 @@ + install: $(PROGS) $(MANPAGES) installdirs + for i in $(PROGS); do \ + $(INSTALL_PROGRAM) $$i $(DESTDIR)$(root_sbindir)/$$i; \ +- $(STRIP) $(DESTDIR)$(root_sbindir)/$$i; \ + done + for i in $(MANPAGES); do \ + for j in $(COMPRESS_EXT); do \ +--- e2fsprogs-1.32/e2fsck/Makefile.in.lrr 2003-07-30 14:22:33.000000000 +0200 ++++ e2fsprogs-1.32/e2fsck/Makefile.in 2003-07-30 14:22:48.000000000 +0200 +@@ -142,7 +142,6 @@ + install: $(PROGS) $(MANPAGES) installdirs + for i in $(PROGS); do \ + $(INSTALL_PROGRAM) $$i $(DESTDIR)$(root_sbindir)/$$i; \ +- $(STRIP) $(DESTDIR)$(root_sbindir)/$$i; \ + done + $(LN) -f $(DESTDIR)$(root_sbindir)/e2fsck \ + $(DESTDIR)$(root_sbindir)/fsck.ext2 +--- e2fsprogs-1.32/misc/Makefile.in.lrr 2003-07-30 14:20:48.000000000 +0200 ++++ e2fsprogs-1.32/misc/Makefile.in 2003-07-30 14:21:14.000000000 +0200 +@@ -148,11 +148,9 @@ + install: all $(SMANPAGES) $(UMANPAGES) installdirs + for i in $(SPROGS); do \ + $(INSTALL_PROGRAM) $$i $(DESTDIR)$(root_sbindir)/$$i; \ +- $(STRIP) $(DESTDIR)$(root_sbindir)/$$i; \ + done + for i in $(USPROGS); do \ + $(INSTALL_PROGRAM) $$i $(DESTDIR)$(sbindir)/$$i; \ +- $(STRIP) $(DESTDIR)$(sbindir)/$$i; \ + done + $(LN) -f $(DESTDIR)$(root_sbindir)/mke2fs \ + $(DESTDIR)$(root_sbindir)/mkfs.ext2 +@@ -164,7 +162,6 @@ + $(DESTDIR)$(root_sbindir)/findfs + for i in $(UPROGS); do \ + $(INSTALL_PROGRAM) $$i $(DESTDIR)$(bindir)/$$i; \ +- $(STRIP) $(DESTDIR)$(bindir)/$$i; \ + done + for i in $(SMANPAGES); do \ + for j in $(COMPRESS_EXT); do \ +--- e2fsprogs-1.32/resize/Makefile.in.lrr 2003-07-30 14:23:12.000000000 +0200 ++++ e2fsprogs-1.32/resize/Makefile.in 2003-07-30 14:23:25.000000000 +0200 +@@ -56,7 +56,6 @@ + install: $(PROGS) $(MANPAGES) installdirs + for i in $(PROGS); do \ + $(INSTALL_PROGRAM) $$i $(DESTDIR)$(root_sbindir)/$$i; \ +- $(STRIP) $(DESTDIR)$(root_sbindir)/$$i; \ + done + for i in $(MANPAGES); do \ + for j in $(COMPRESS_EXT); do \ Added: tinysofa/snapshot/e2fsprogs/current/sources/e2fsprogs-1.32-nosync.patch =================================================================== --- tinysofa/snapshot/e2fsprogs/current/sources/e2fsprogs-1.32-nosync.patch 2004-07-01 15:46:19 UTC (rev 2735) +++ tinysofa/snapshot/e2fsprogs/current/sources/e2fsprogs-1.32-nosync.patch 2004-07-01 15:46:22 UTC (rev 2736) @@ -0,0 +1,10 @@ +--- e2fsprogs-1.32/e2fsck/Makefile.in.nosync 2003-03-27 12:49:32.000000000 +0100 ++++ e2fsprogs-1.32/e2fsck/Makefile.in 2003-03-27 12:49:49.000000000 +0100 +@@ -95,7 +95,6 @@ + $(MTRACE_SRC) + + all:: profiled $(PROGS) e2fsck.static e2fsck.shared $(MANPAGES) +- @sync + + @PROFILE_CMT at all:: e2fsck.profiled + Added: tinysofa/snapshot/e2fsprogs/current/sources/e2fsprogs-1.35-next_check.patch =================================================================== --- tinysofa/snapshot/e2fsprogs/current/sources/e2fsprogs-1.35-next_check.patch 2004-07-01 15:46:19 UTC (rev 2735) +++ tinysofa/snapshot/e2fsprogs/current/sources/e2fsprogs-1.35-next_check.patch 2004-07-01 15:46:22 UTC (rev 2736) @@ -0,0 +1,12 @@ +--- e2fsprogs-1.35/e2fsck/unix.c.next_check 2004-04-06 14:18:12.248663991 +0200 ++++ e2fsprogs-1.35/e2fsck/unix.c 2004-04-06 14:18:15.439228453 +0200 +@@ -280,7 +280,8 @@ + if (next_check <= 0) + next_check = 1; + } +- if ((now - fs->super->s_lastcheck) >= fs->super->s_checkinterval) ++ if (fs->super->s_checkinterval && ++ ((now - fs->super->s_lastcheck) >= fs->super->s_checkinterval)) + next_check = 1; + if (next_check <= 5) { + if (next_check == 1) Modified: tinysofa/snapshot/e2fsprogs/current/specs/e2fsprogs.spec =================================================================== --- tinysofa/snapshot/e2fsprogs/current/specs/e2fsprogs.spec 2004-07-01 15:46:19 UTC (rev 2735) +++ tinysofa/snapshot/e2fsprogs/current/specs/e2fsprogs.spec 2004-07-01 15:46:22 UTC (rev 2736) @@ -1,218 +1,487 @@ +%define _root_sbindir /sbin +%define _root_libdir /%{_lib} + Summary: Utilities for managing the second extended (ext2) filesystem. Name: e2fsprogs Version: 1.35 -Release: 7ts +Release: 7.1ts License: GPL -Group: tinysofa official -Source: http://belnet.dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz -Prereq: glibc -Requires: libcom_err +Group: System Environment/Base +Source: ftp://download.sourceforge.net/pub/sourceforge/e2fsprogs/e2fsprogs-%{version}.tar.gz +#Source: ftp://ftp.debian.org/debian/pool/main/e/e2fsprogs/e2fsprogs_1.34+1.35-WIP-2004.01.31.orig.tar.gz +Patch2: e2fsprogs-1.27-nostrip.patch +Patch6: e2fsprogs-1.32-nosync.patch +Patch7: e2fsprogs-1.35-next_check.patch +Url: http://e2fsprogs.sourceforge.net/ +Prereq: /sbin/ldconfig BuildRoot: %{_tmppath}/%{name}-root -BuildRequires: gettext %description The e2fsprogs package contains a number of utilities for creating, -checking, modifying and correcting any inconsistencies in second -extended (ext2) filesystems. E2fsprogs contains e2fsck (used to repair -filesystem inconsistencies after an unclean shutdown), mke2fs (used to -initialize a partition to contain an empty ext2 filesystem), debugfs -(used to examine the internal structure of a filesystem, to manually -repair a corrupted filesystem or to create test cases for e2fsck), tune2fs -(used to modify filesystem parameters) and most of the other core ext2fs -filesystem utilities. +checking, modifying, and correcting any inconsistencies in second +extended (ext2) filesystems. E2fsprogs contains e2fsck (used to +repair filesystem inconsistencies after an unclean shutdown), mke2fs +(used to initialize a partition to contain an empty ext2 filesystem), +debugfs (used to examine the internal structure of a filesystem, to +manually repair a corrupted filesystem, or to create test cases for +e2fsck), tune2fs (used to modify filesystem parameters), and most of +the other core ext2fs filesystem utilities. -You should install the e2fsprogs package if you are using any ext2 -filesystems (if you're not sure, you probably should install this -package). +You should install the e2fsprogs package if you need to manage the +performance of an ext2 filesystem. %package devel Summary: Ext2 filesystem-specific static libraries and headers. -Group: tinysofa official -Requires: e2fsprogs -Requires: libcom_err-devel +Group: Development/Libraries +Requires: e2fsprogs = %{version} +Prereq: /sbin/install-info %description devel E2fsprogs-devel contains the libraries and header files needed to develop second extended (ext2) filesystem-specific programs. You should install e2fsprogs-devel if you want to develop ext2 -filesystem-specific programs. If you install e2fsprogs-devel, you'll -also need to install e2fsprogs. +filesystem-specific programs. If you install e2fsprogs-devel, you'll +also want to install e2fsprogs. -%package -n libcom_err -Group: tinysofa official -Summary: Com_err library - -%description -n libcom_err -Com_err is an error message display library. - -%package -n libcom_err-devel -Group: tinysofa official -Summary: Com_err Development library - -%description -n libcom_err-devel -Com_err is an error message display library, development files. - %prep -%setup -q +%setup -q -n e2fsprogs-1.35 +#%setup -q -n e2fsprogs-1.34+1.35-WIP-2004.01.31 +%patch2 -p1 -b .nostrip +%patch6 -p1 -b .nosync +%patch7 -p1 -b .next_check %build -CFLAGS="$RPM_OPT_FLAGS" \ -%configure \ - --prefix=/ \ - --enable-elf-shlibs \ - --libdir=/lib \ - --sbindir=/sbin +%configure --enable-elf-shlibs --enable-nls +# --enable-dynamic-e2fsck +make -make libs progs - %install -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != "/" ] && rm -rf "$RPM_BUILD_ROOT" +rm -rf $RPM_BUILD_ROOT export PATH=/sbin:$PATH -make install install-libs DESTDIR="$RPM_BUILD_ROOT" - -# Seems there is no easy way of making this split -mkdir -p $RPM_BUILD_ROOT/usr/lib -mv $RPM_BUILD_ROOT/lib/*.a $RPM_BUILD_ROOT/usr/lib/ -mv $RPM_BUILD_ROOT/lib/evms/ $RPM_BUILD_ROOT/usr/lib/ -pushd $RPM_BUILD_ROOT/lib - for i in *.so; do - cp $i.[0-9].[0-9] $RPM_BUILD_ROOT/usr/lib/$i - rm -f $i - done -popd - +make install install-libs DESTDIR="$RPM_BUILD_ROOT" \ + root_sbindir=%{_root_sbindir} root_libdir=%{_root_libdir} +/sbin/ldconfig -n ${RPM_BUILD_ROOT}%{_libdir} %find_lang %{name} %clean -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT +rm -rf $RPM_BUILD_ROOT -%post -/sbin/ldconfig +%post -p /sbin/ldconfig %postun -p /sbin/ldconfig +%post devel +if [ -x /sbin/install-info ]; then + /sbin/install-info %{_infodir}/libext2fs.info.gz %{_infodir}/dir +fi +exit 0 + +%postun devel +if [ $1 = 0 ]; then + /sbin/install-info --delete %{_infodir}/libext2fs.info.gz %{_infodir}/dir +fi +exit 0 + %files -f %{name}.lang %defattr(-,root,root) %doc README RELEASE-NOTES -/sbin/* -/lib/libss.so.* -/lib/libe2p.so.* -/lib/libext2fs.so.* -/lib/libuuid.so.* -/lib/libblkid.so.* + +%{_root_sbindir}/badblocks +%{_root_sbindir}/blkid +%{_root_sbindir}/debugfs +%{_root_sbindir}/dumpe2fs +%{_root_sbindir}/e2fsck +%{_root_sbindir}/e2image +%{_root_sbindir}/e2label +%{_root_sbindir}/findfs +%{_root_sbindir}/fsck +%{_root_sbindir}/fsck.ext2 +%{_root_sbindir}/fsck.ext3 +%{_root_sbindir}/logsave +%{_root_sbindir}/mke2fs +%{_root_sbindir}/mkfs.ext2 +%{_root_sbindir}/mkfs.ext3 +%{_root_sbindir}/resize2fs +%{_root_sbindir}/tune2fs +%{_sbindir}/filefrag +%{_sbindir}/mklost+found + +%{_root_libdir}/libblkid.so.* +%{_root_libdir}/libcom_err.so.* +%{_root_libdir}/libe2p.so.* +%{_root_libdir}/libext2fs.so.* +%{_root_libdir}/libss.so.* +%{_root_libdir}/libuuid.so.* +%dir %{_root_libdir}/evms +%{_root_libdir}/evms/libe2fsim.1.2.1.so + %{_bindir}/chattr %{_bindir}/lsattr %{_bindir}/uuidgen -/usr/share/man/man1/chattr.1* -/usr/share/man/man1/lsattr.1* -/usr/share/man/man1/uuidgen.1* -/usr/share/man/man8/* +%{_mandir}/man1/chattr.1* +%{_mandir}/man1/lsattr.1* +%{_mandir}/man1/uuidgen.1* +%{_mandir}/man8/badblocks.8* +%{_mandir}/man8/blkid.8* +%{_mandir}/man8/debugfs.8* +%{_mandir}/man8/dumpe2fs.8* +%{_mandir}/man8/e2fsck.8* +%{_mandir}/man8/findfs.8* +%{_mandir}/man8/filefrag.8* +%{_mandir}/man8/fsck.ext2.8* +%{_mandir}/man8/fsck.ext3.8* +%{_mandir}/man8/e2image.8* +%{_mandir}/man8/e2label.8* +%{_mandir}/man8/fsck.8* +%{_mandir}/man8/logsave.8* +%{_mandir}/man8/mke2fs.8* +%{_mandir}/man8/mkfs.ext2.8* +%{_mandir}/man8/mkfs.ext3.8* +%{_mandir}/man8/mklost+found.8* +%{_mandir}/man8/resize2fs.8* +%{_mandir}/man8/tune2fs.8* + %files devel %defattr(-,root,root) -/usr/bin/mk_cmds -%attr(644,root,root) /usr/lib/libblkid.a -%attr(644,root,root) /usr/lib/libe2p.a -%attr(644,root,root) /usr/lib/libext2fs.a -%attr(644,root,root) /usr/lib/libss.a -%attr(644,root,root) /usr/lib/libuuid.a -/usr/lib/evms -%attr(755,root,root) /usr/lib/libblkid.so -%attr(755,root,root) /usr/lib/libe2p.so -%attr(755,root,root) /usr/lib/libext2fs.so -%attr(755,root,root) /usr/lib/libss.so -%attr(755,root,root) /usr/lib/libuuid.so -/usr/share/ss -/usr/include/ss -/usr/include/ext2fs -/usr/include/uuid -/usr/include/blkid -/usr/include/e2p -/usr/share/man/man3/* -/usr/share/man/man1/mk_cmds.1* +%{_infodir}/libext2fs.info* +%{_bindir}/compile_et +%{_bindir}/mk_cmds -%files -n libcom_err -%defattr(0755,root,root) -/lib/libcom_err.so.2.1 -/lib/libcom_err.so.2 +%{_libdir}/libblkid.a +%{_libdir}/libcom_err.a +%{_libdir}/libcom_err.so +%{_libdir}/libe2p.a +%{_libdir}/libe2p.so +%{_libdir}/libext2fs.a +%{_libdir}/libext2fs.so +%{_libdir}/libss.a +%{_libdir}/libss.so +%{_libdir}/libuuid.a +%{_libdir}/libuuid.so -%files -n libcom_err-devel -%defattr(-,root,root) -%{_bindir}/compile_et %{_datadir}/et +%{_datadir}/ss +%{_includedir}/blkid +%{_includedir}/e2p +%{_includedir}/et +%{_includedir}/ext2fs +%{_includedir}/ss +%{_includedir}/uuid %{_mandir}/man1/compile_et.1* -%attr(644,root,root) %{_libdir}/libcom_err.a -%attr(755,root,root) %{_libdir}/libcom_err.so -%{_includedir}/et +%{_mandir}/man1/mk_cmds.1* +%{_mandir}/man3/com_err.3* +%{_mandir}/man3/libblkid.3* +%{_mandir}/man3/libuuid.3* +%{_mandir}/man3/uuid_clear.3* +%{_mandir}/man3/uuid_compare.3* +%{_mandir}/man3/uuid_copy.3* +%{_mandir}/man3/uuid_generate.3* +%{_mandir}/man3/uuid_generate_random.3* +%{_mandir}/man3/uuid_generate_time.3* +%{_mandir}/man3/uuid_is_null.3* +%{_mandir}/man3/uuid_parse.3* +%{_mandir}/man3/uuid_time.3* +%{_mandir}/man3/uuid_unparse.3* - %changelog -* Wed May 19 2004 tsintegrate 1.35-7ts -- current (1.35-7jh) integrated as 1.35-7ts for release 1.0-U1 +* Thu Apr 8 2004 Thomas Woerner 1.35-7.1 +- fixed 'check after next mount' for filesystems with maximum mount count -1 + (#117109) -* Tue May 11 2004 Omar Kilani -- Add BuildRequires: gettext -- Add Requires: libcom_err-devel to e2fsprogs-devel. +* Mon Mar 15 2004 Thomas Woerner 1.35-7 +- final 1.35 -* Mon May 10 2004 Jaakko Heinonen 1.35-7jh -- fixed permissions for .a files -- added attributes also for .so files +* Tue Mar 02 2004 Elliot Lee +- rebuilt -* Mon May 03 2004 Omar Kilani 1.35-6ts -- Rebuild. +* Fri Feb 13 2004 Elliot Lee +- rebuilt -* Mon May 03 2004 Jaakko Heinonen 1.35-5jh -- fixed libcom_err-devel permissions +* Thu Feb 5 2004 Thomas Woerner 1.35-5.1 +- C++ header fix for ext2fs.h -* Tue Mar 2 2004 Erlend Midttun 1.35-2tr -- Rebuilt. +* Thu Feb 5 2004 Thomas Woerner 1.35-5 +- newest WIP version (2004.01.31) -* Tue Mar 2 2004 Omar Kilani 1.35-1ok -- New upstream. +* Thu Jan 08 2004 Florian La Roche +- add patch from Dave Jones -* Mon Feb 9 2004 Chr. Toldnes 1.34-2tr -- libcom_err in separate packages. +* Sun Dec 14 2003 Florian La Roche +- update to 1.35-WIP-1207 -* Tue Jan 27 2004 Erlend Midttun 1.34-1tr -- New upstream. +* Fri Nov 14 2003 Phil Knirsch 1.35-2 +- Updated s390 patch. It's not not arch dependant anymore but only changes the + default blocksizes when necessary. -* Wed Nov 26 2003 Erlend Midttun 1.33-3tr -- Big rebuild +* Mon Nov 10 2003 Florian La Roche +- own /lib/evwms directory #109583 +- build new rpm to get feedback on that snapshot -* Wed Jun 18 2003 Erlend Midttun 1.33-2tr -- Big rebuild +* Thu Nov 06 2003 Florian La Roche +- update the mainframe patch to its current version, but disable it + until the change also properly supports SCSI and is usable also + for non-mainframe archs -* Fri May 23 2003 Erlend Midttun 1.33-1em -- New upstream. +* Mon Sep 15 2003 Florian La Roche +- update to 1.35-pre +- use ldconfig to create symlinks to shared libs +- remove some cruft from the spec file +- man3 is now part of the devel rpm -* Mon Mar 24 2003 Erlend Midttun 1.27-3em -- Rebuilt against glibc 2.3.2. +* Fri Aug 01 2003 Florian La Roche +- update to 1.34 +- do not strip some more apps, should probably just change $(STRIP)... -* Thu Aug 29 2002 Christian H. Toldnes 1.27-2ct -- Patched away info generation +* Wed Jun 04 2003 Elliot Lee +- rebuilt -* Thu Jul 4 2002 Christian H. Toldnes 1.27-1ct -- New upstream version -- Spec file cleanup -- Removed info stuff -- Built for TSL 2.0 +* Thu May 08 2003 Florian La Roche +- update to 1.33 +- enable translations -* Mon Jan 14 2002 Christian H. Toldnes -- New upstream version: 1.25 +* Fri Apr 18 2003 Jeremy Katz 1.32-11 +- fix error message, do block size checking on s390 only -* Wed Jul 4 2001 Erlend Midttun -- New upstream version: 1.22 +* Thu Apr 17 2003 Jeremy Katz 1.32-10 +- check the return code of BLKSSZGET ioctl() to avoid breaking with files -* Fri Jun 1 2001 Oystein Viggen -- New upstream version: 1.20 +* Tue Apr 15 2003 Phil Knirsch 1.32-9 +- Improved dasd blocksize patch to make it more generic and work correctly. -* Wed Sep 13 2000 Erlend Midttun -- Updated to 1.19 +* Thu Mar 27 2003 Phil Knirsch 1.32-8 +- Removed sync call from e2fsck target. Not needed anymore. -* Wed Mar 15 2000 Oystein Viggen -- Fixed some bugs with placement of files. +* Wed Mar 26 2003 Phil Knirsch 1.32-7 +- Fixed problem with mke2fs and default blocksize small partitions on dasd +- Disabled Florians patch for now as it's a little incomplete. :-) -* Mon Feb 28 2000 Lars Gaarden -- Moved man and info pages to /usr/share +* Sun Feb 23 2003 Florian La Roche +- add an ugly patch to read full lines of input during e2fsck for /dev/console +* Wed Jan 22 2003 Tim Powers +- rebuilt + +* Tue Jan 14 2003 Bill Nottingham 1.32-2 +- do *not* create htree filesystems by default + +* Mon Nov 11 2002 Florian La Roche +- update to 1.32 + +* Fri Nov 01 2002 Florian La Roche +- update to 1.30, leave out already integrated patches +- clean up spec file +- also package some missing files + +* Tue Sep 24 2002 Florian La Roche +- update to 1.29, adapt patches to current source + +* Sat Aug 10 2002 Florian La Roche +- add missing man-pages to filelist + +* Fri Jun 21 2002 Tim Powers +- automated rebuild + +* Fri Jun 21 2002 Florian La Roche +- add HTree version of e2fsprogs, disable s390 patch +- add e2fsprogs-dir_index.patch + +* Mon Jun 17 2002 Karsten Hopp +- set default blocksize for mke2fs on S/390 and zSeries to 4096 + +* Thu May 23 2002 Tim Powers +- automated rebuild + +* Tue Apr 09 2002 Florian La Roche +- fix further bug in man-page #62995 + +* Thu Apr 04 2002 Florian La Roche +- fix man-pages + +* Thu Mar 21 2002 Florian La Roche +- update to 1.27 +- patch5 should not be needed anymore + +* Fri Mar 08 2002 Elliot Lee +- Make link for mkfs.ext3 (patch5) +- Add man pages for {mkfs,fsck}.{ext2,ext3} + +* Tue Feb 19 2002 Florian La Roche +- update to 1.26 + +* Wed Jan 09 2002 Tim Powers +- automated rebuild + +* Sun Nov 04 2001 Florian La Roche +- update to 1.25 +- patch for BLKGETSIZE64 is not needed anymore +- adapt autoconf-2.50 patch + +* Thu Nov 1 2001 Bernhard Rosenkraenzer 1.23-5 +- Make the C++ patch work even with g++ 3.1 + +* Mon Oct 22 2001 Bernhard Rosenkraenzer 1.23-4 +- Fix headers of libext2fs - it wasn't possible to include them from + C++ code (using private as a variable name isn't a good idea) +- Fix build with autoconf 2.5x + +* Mon Sep 17 2001 Florian La Roche +- add e2image to filelist + +* Wed Aug 29 2001 Bill Nottingham +- disable BLKGETSIZE64 ioctl support for now + +* Sun Aug 26 2001 Florian La Roche +- update to 1.23. This was requested to support the "auto" fstype + to ease ext2 <-> ext3 conversions. + +* Tue Jul 24 2001 Florian La Roche +- add some more man-pages, patch by + +* Tue Jun 26 2001 Florian La Roche +- make sure "configure" is writable + +* Mon Jun 25 2001 Florian La Roche +- update to 1.22 + +* Tue Jun 19 2001 Florian La Roche +- update to 1.21 + +* Mon Jun 11 2001 Florian La Roche +- add endian patch from sct at redhat.com #44104 + +* Tue May 29 2001 Than Ngo +- update to 1.20 +- add Url + +* Tue May 15 2001 Florian La Roche +- make sure ldconfig doesn't have any input and scripts end + with "exit 0" + +* Tue May 15 2001 Florian La Roche +- update to e2fsprogs-1.20-WIP-0514.tar.gz + +* Sun Apr 15 2001 Alan Eldridge +- Added 16K buffer for reading /proc/partitions in + get_label_by_device.c to correct problems with LABEL= in fsck + caused by not reading /proc/partitions in a single read() call; + if somebody has a "partitions" > 16K, it may still fail ... +* Fri Apr 06 2001 Florian La Roche +- add further IDE and SCSI disks to a hardcoded list in fsck #34190 + +* Tue Feb 27 2001 Florian La Roche +- require the main rpm from the devel rpm + +* Thu Feb 22 2001 Helge Deller +- fix fsck -A bug (#21242) + +* Mon Feb 12 2001 Florian La Roche +- fix bug with 16 byte long labels #27071 + +* Mon Sep 11 2000 Jeff Johnson +- build for Red Hat 7.1. + +* Tue Aug 8 2000 Jeff Johnson +- merge LABEL patch. +- update to 1.19. + +* Tue Jul 25 2000 Erik Troan +- fixed LABEL handling + +* Wed Jul 19 2000 Jakub Jelinek +- rebuild to cope with glibc locale binary incompatibility + +* Wed Jul 12 2000 Prospector +- automatic rebuild + +* Mon Jun 26 2000 Matt Wilson +- added resize2fs from the WIP snapshot + +* Thu Jun 15 2000 Matt Wilson +- patched to build against linux 2.4 headers + +* Mon Jun 5 2000 Jeff Johnson +- FHS packaging. + +* Fri Apr 28 2000 Bill Nottingham +- fix for ia64 + +* Sat Feb 5 2000 Bill Nottingham +- add install-info scripts + +* Thu Feb 03 2000 Elliot Lee +- Fix bug #8585 (Y2K problems in debugfs) + +* Wed Feb 02 2000 Jakub Jelinek +- allow multiline errors in et, so that other programs + can use compile_et (from Kerberos) + +* Thu Jan 13 2000 Jeff Johnson +- build 1.18 for 6.2. + +* Tue Oct 26 1999 Bill Nottingham +- update to 1.17 + +* Mon Oct 25 1999 Bill Nottingham +- update to 1.16 + +* Thu Oct 21 1999 Bill Nottingham +- add patch to fix SIGUSR1 kills. + +* Mon Oct 04 1999 Cristian Gafton +- rebuild against new glibc in the sparc tree + +* Thu Sep 23 1999 Jakub Jelinek +- update mke2fs man page so that it reflects changes in mke2fs + netweem 1.14 and 1.15 + +* Thu Aug 5 1999 Bill Nottingham +- fix lsattr on alpha + +* Thu Jul 29 1999 Jeff Johnson +- update to 1.15. + +* Sun Mar 21 1999 Cristian Gafton +- auto rebuild in the new build environment (release 4) + +* Tue Mar 16 1999 Cristian Gafton +- fix fsck segfault + +* Tue Feb 2 1999 Jeff Johnson +- update to 1.14 +- use %configure to generate config.sub on arm + +* Thu Jan 14 1999 Jeff Johnson +- fix /usr/bin/compile_et and doco for com_err.h (#673) + +* Thu Jan 07 1999 Cristian Gafton +- build with prefix=/usr +- add arm patch + +* Mon Dec 28 1998 Jeff Johnson +- update to 1.13. + +* Fri Aug 28 1998 Jeff Johnson +- recompile statically linked binary for 5.2/sparc + +* Mon Jul 13 1998 Jeff Johnson +- upgrade to 1.12. + +* Thu May 07 1998 Prospector System +- translations modified for de, fr, tr + +* Thu Apr 30 1998 Cristian Gafton +- include to match kernel types in utils + +* Tue Oct 14 1997 Donnie Barnes +- spec file cleanups + +* Wed Oct 01 1997 Erik Troan +- fixed broken llseek() prototype + +* Wed Aug 20 1997 Erik Troan +- added patch to prototype llseek + +* Tue Jun 17 1997 Erik Troan +- built against glibc From svn at tinysofa.org Thu Jul 1 15:46:24 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:46:24 +1000 (EST) Subject: [tinysofa-svn] r2737 - in tinysofa/snapshot/ed/current: sources specs Message-ID: <20040701154624.77E5B4E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:46:24 +1000 (Fri, 02 Jul 2004) New Revision: 2737 Added: tinysofa/snapshot/ed/current/sources/ed-0.2-autoconf253.patch tinysofa/snapshot/ed/current/sources/ed-0.2-regex.patch tinysofa/snapshot/ed/current/sources/ed-mkstemp.patch Removed: tinysofa/snapshot/ed/current/sources/ed-security.patch Modified: tinysofa/snapshot/ed/current/specs/ed.spec Log: - Sync with 2.0. - Kept: - ed-0.2.tar.gz: - Added: - ed-0.2-autoconf253.patch: - ed-0.2-regex.patch: - ed-mkstemp.patch: - Removed: - ed-security.patch: Added: tinysofa/snapshot/ed/current/sources/ed-0.2-autoconf253.patch =================================================================== --- tinysofa/snapshot/ed/current/sources/ed-0.2-autoconf253.patch 2004-07-01 15:46:22 UTC (rev 2736) +++ tinysofa/snapshot/ed/current/sources/ed-0.2-autoconf253.patch 2004-07-01 15:46:24 UTC (rev 2737) @@ -0,0 +1,12 @@ +--- ed-0.2/configure.in.suxx Tue Apr 23 22:29:15 2002 ++++ ed-0.2/configure.in Tue Apr 23 22:29:52 2002 +@@ -15,7 +15,8 @@ + AC_FUNC_VPRINTF + AC_FUNC_ALLOCA + if test "$ALLOCA" = alloca.o; then +- AC_SUBST(LIBOBJS)LIBOBJS="$LIBOBJS xmalloc.o error.o" ++ AC_LIBOBJ(xmalloc) ++ AC_LIBOBJ(error) + fi + + AC_OUTPUT(Makefile) Added: tinysofa/snapshot/ed/current/sources/ed-0.2-regex.patch =================================================================== --- tinysofa/snapshot/ed/current/sources/ed-0.2-regex.patch 2004-07-01 15:46:22 UTC (rev 2736) +++ tinysofa/snapshot/ed/current/sources/ed-0.2-regex.patch 2004-07-01 15:46:24 UTC (rev 2737) @@ -0,0 +1,40 @@ +--- ed-0.2/Makefile.in.regex 2002-12-17 13:08:36.000000000 +0100 ++++ ed-0.2/Makefile.in 2002-12-17 13:09:35.000000000 +0100 +@@ -54,9 +54,9 @@ + SOURCES = buf.c glbl.c io.c main.c re.c signal.c sub.c undo.c version.c + OBJECTS = buf.o glbl.o io.o main.o re.o signal.o sub.o undo.o version.o + +-LIBHDRS = pathmax.h getopt.h regex.h +-LIBSRCS = alloca.c error.c getopt.c getopt1.c regex.c xmalloc.c +-LIBOBJS = @ALLOCA@ getopt.o getopt1.o regex.o @LIBOBJS@ ++LIBHDRS = pathmax.h getopt.h ++LIBSRCS = alloca.c error.c getopt.c getopt1.c xmalloc.c ++LIBOBJS = @ALLOCA@ getopt.o getopt1.o @LIBOBJS@ + + DISTFILES = $(HEADERS) $(LIBHDRS) $(LIBSRCS) $(SOURCES) ChangeLog COPYING \ + INSTALL Makefile.in NEWS POSIX README TODO THANKS \ +@@ -68,11 +68,11 @@ + ed: $(OBJECTS) libed.a + $(CC) $(LDFLAGS) -o ed $(OBJECTS) libed.a $(LIBS) + +-buf.o: ed.h config.h regex.h +-ed.o: ed.h config.h regex.h +-main.o: ed.h config.h regex.h getopt.h pathmax.h +-re.o: ed.h config.h regex.h +-signal.o: ed.h config.h regex.h ++buf.o: ed.h config.h ++ed.o: ed.h config.h ++main.o: ed.h config.h getopt.h pathmax.h ++re.o: ed.h config.h ++signal.o: ed.h config.h + + libed.a: $(LIBOBJS) + rm -f libed.a +@@ -80,7 +80,6 @@ + $(RANLIB) libed.a + + getopt.o getopt1.o: getopt.h +-regex.o: regex.h + + check: ed + rootme=`pwd`; srcrootme=`cd $(srcdir); pwd`;\ Added: tinysofa/snapshot/ed/current/sources/ed-mkstemp.patch =================================================================== --- tinysofa/snapshot/ed/current/sources/ed-mkstemp.patch 2004-07-01 15:46:22 UTC (rev 2736) +++ tinysofa/snapshot/ed/current/sources/ed-mkstemp.patch 2004-07-01 15:46:24 UTC (rev 2737) @@ -0,0 +1,31 @@ +--- ed-0.2/buf.c.orig Wed Nov 29 14:45:10 2000 ++++ ed-0.2/buf.c Wed Nov 29 15:13:16 2000 +@@ -200,15 +200,15 @@ + int + open_sbuf () + { +- char *mktemp (); + int u; ++ int filedes; + + isbinary = newline_added = 0; + u = umask(077); + strcpy (sfn, "/tmp/ed.XXXXXX"); +- if (mktemp (sfn) == NULL || (sfp = fopen (sfn, "w+")) == NULL) ++ if ((filedes=mkstemp(sfn)) == -1 || (sfp=fdopen(filedes, "w+")) == NULL) + { +- fprintf (stderr, "%s: %s\n", sfn, strerror (errno)); ++ fprintf (stderr, "%s\n", strerror (errno)); + sprintf (errmsg, "Cannot open temp file"); + umask(u); + return ERR; +@@ -226,7 +226,7 @@ + { + if (fclose (sfp) < 0) + { +- fprintf (stderr, "%s: %s\n", sfn, strerror (errno)); ++ fprintf (stderr, "%s\n", strerror (errno)); + sprintf (errmsg, "Cannot close temp file"); + return ERR; + } + Deleted: tinysofa/snapshot/ed/current/sources/ed-security.patch =================================================================== --- tinysofa/snapshot/ed/current/sources/ed-security.patch 2004-07-01 15:46:22 UTC (rev 2736) +++ tinysofa/snapshot/ed/current/sources/ed-security.patch 2004-07-01 15:46:24 UTC (rev 2737) @@ -1,51 +0,0 @@ ---- org/ed-0.2/buf.c Sat Nov 19 13:37:59 1994 -+++ ed-0.2/buf.c Mon Nov 27 00:06:51 2000 -@@ -194,21 +194,17 @@ - - extern int newline_added; - --char sfn[15] = ""; /* scratch file name */ -- - /* open_sbuf: open scratch file */ - int - open_sbuf () - { -- char *mktemp (); - int u; - - isbinary = newline_added = 0; - u = umask(077); -- strcpy (sfn, "/tmp/ed.XXXXXX"); -- if (mktemp (sfn) == NULL || (sfp = fopen (sfn, "w+")) == NULL) -+ if ((sfp = tmpfile()) == NULL) - { -- fprintf (stderr, "%s: %s\n", sfn, strerror (errno)); -+ fprintf (stderr, "%s\n", strerror (errno)); - sprintf (errmsg, "Cannot open temp file"); - umask(u); - return ERR; -@@ -226,14 +222,14 @@ - { - if (fclose (sfp) < 0) - { -- fprintf (stderr, "%s: %s\n", sfn, strerror (errno)); -+ fprintf (stderr, "Cannot close temp file: %s\n", strerror (errno)); - sprintf (errmsg, "Cannot close temp file"); - return ERR; - } - sfp = NULL; -- unlink (sfn); - } - sfseek = seek_write = 0; -+ - return 0; - } - -@@ -246,7 +242,6 @@ - if (sfp) - { - fclose (sfp); -- unlink (sfn); - } - exit (n); - } Modified: tinysofa/snapshot/ed/current/specs/ed.spec =================================================================== --- tinysofa/snapshot/ed/current/specs/ed.spec 2004-07-01 15:46:22 UTC (rev 2736) +++ tinysofa/snapshot/ed/current/specs/ed.spec 2004-07-01 15:46:24 UTC (rev 2737) @@ -1,19 +1,17 @@ +Summary: The GNU line editor. Name: ed Version: 0.2 -Release: 30jh -Summary: The GNU line editor -Summary(pt_BR): Editor de linhas da GNU -Summary(es): Editor de l?eas de la GNU -Summary(de): GNU-Zeileneditor -Summary(fr): ?iteur ligne de GNU -Summary(tr): GNU sat? d?enleyici -Group: tinysofa/main +Release: 35ts License: GPL -URL: http://www.gnu.org/software/ed -Source: ftp://ftp.gnu.org/gnu/ed/%{name}-%{version}.tar.gz -Patch: ed-security.patch -%info_requires -BuildRoot: %{_tmppath}/%{name}-%{version}-root +Group: Applications/Text +Source: ftp://prep.ai.mit.edu/pub/gnu/%{name}/%{name}-%{version}.tar.gz +URL: ftp://ftp.gnu.org/pub/gnu/ed/ +Patch0: ed-mkstemp.patch +Patch1: ed-0.2-autoconf253.patch +Patch2: ed-0.2-regex.patch +Prereq: /sbin/install-info +Buildroot: %{_tmppath}/%{name}-%{version}-root +BuildRequires: autoconf %description Ed is a line-oriented text editor, used to create, display, and modify @@ -25,94 +23,135 @@ general, however, you probably don't need to install it and you probably won't use it. -%description -l pt_BR -Este ?o GNU editor de linha. ?uma implementa?o de um dos primeiros -editores para *nix. Alguns programas contam com ele, mas no geral -voc?provavelmente n? ir?*precisar* dele. - -%description -l es -Este es GNU editor de l?ea. Es un soporte a uno de los primeros -editores para *nix. Algunos de los programas cuentan con ?, pero -de manera general, es muy probable que no lo *necesites*. - -%description -l de -Dies ist der GNU-Zeileneditor, eine Implementierung einer -der ersten Editoren unter *nix. Manche Programme verlassen sich darauf, -i.a. *brauchen* Sie ihn wahrscheinlich nicht. - -%description -l fr -?iteur ligne de GNU. C'est une implantation de l'un des premiers -?iteurs d'*nix. Certains programmes en ont besoin, mais en -g??al, vous n'en aurez probablement pas l'utilit? - -%description -l tr -yaz??lar hala bu programa gereksinim duymaktad?lar. - %prep %setup -q -%patch -p1 +%patch0 -p1 +%patch1 -p1 -b .ac +%patch2 -p1 -b .regex +rm -f stamp-h.in -rm -f ed.info - %build -CFLAGS="${CFLAGS:-%optflags}" \ -./configure --prefix=%{_prefix} --exec-prefix=/ -%make +chmod 755 configure +autoconf +%configure --exec-prefix=/ +make %{?_smp_mflags} %install -make prefix=%{buildroot}%{_prefix} \ - exec_prefix=%{buildroot}/ \ - mandir=%{buildroot}%{_mandir}/man1 \ - infodir=%{buildroot}%{_infodir} install +%makeinstall bindir=$RPM_BUILD_ROOT/bin \ + mandir=$RPM_BUILD_ROOT%{_mandir}/man1 -%install_info ed.texinfo -%nuke_info +gzip -9qnf $RPM_BUILD_ROOT%{_infodir}/* -chmod 644 NEWS POSIX README THANKS - %post -%info_post +/sbin/install-info %{_infodir}/ed.info.gz %{_infodir}/dir --entry="* ed: (ed). The GNU Line Editor." -%postun -%info_postun +%preun +if [ $1 = 0 ] ; then + /sbin/install-info --delete %{_infodir}/ed.info.gz %{_infodir}/dir --entry="* ed: (ed). The GNU Line Editor." +fi +%clean +rm -rf $RPM_BUILD_ROOT + %files %defattr(-,root,root) %doc NEWS POSIX README THANKS -/bin/ed -/bin/red -%{_htmldir}/%{name} -%{_mandir}/man1/ed.1* -%{_mandir}/man1/red.1* +/bin/* +%{_infodir}/ed.info.gz +%{_mandir}/*/* -%clean -%clean_buildroot - %changelog -* Thu Jun 4 2004 Jaakko Heinonen 0.2-30jh -- new spec file derived from Conectiva -- use more rpm macros +* Fri Feb 13 2004 Elliot Lee +- rebuilt -* Mon Feb 16 2004 Wanderlei Antonio Cavassin -+ 2004-02-16 19:04:55 (49582) -- Allow ed.info to be rebuilt. +* Tue Jun 17 2003 Karsten Hopp 0.2-34 +- rebuild -* Mon Feb 16 2004 Wanderlei Antonio Cavassin -+ 2004-02-16 17:29:09 (49558) -- Add patch to sources. +* Tue Jun 17 2003 Karsten Hopp 0.2-33 +- rebuild to fix crt*.o problems -* Mon Feb 16 2004 Wanderlei Antonio Cavassin -+ 2004-02-16 17:27:51 (49557) -- Using info macros. Got patch from PLD with info entry. +* Wed Jun 04 2003 Elliot Lee +- rebuilt -* Thu Jan 01 2004 Arnaldo Carvalho de Melo -+ 2004-01-01 19:21:14 (42737) -- Added BuildRequires +* Wed Jan 22 2003 Tim Powers +- rebuilt -* Wed Aug 28 2002 Gustavo Niemeyer -+ 2002-08-28 18:23:32 (4064) -- Imported package from 7.0. +* Tue Dec 17 2002 Karsten Hopp ? +- remove regex, use glibc's regex (#79132) -* Tue Aug 27 2002 Gustavo Niemeyer -+ 2002-08-27 18:50:23 (387) -- Imported package from 6.0. +* Thu Dec 12 2002 Tim Powers 0.2-29 +- rebuild on all arches + +* Fri Jun 21 2002 Tim Powers +- automated rebuild + +* Thu May 23 2002 Tim Powers +- automated rebuild + +* Mon May 6 2002 Bernhard Rosenkraenzer 0.2-26 +- Fix build with current toolchain + +* Wed Apr 03 2002 Karsten Hopp +- don't use gcc -s + +* Fri Feb 22 2002 Karsten Hopp +- bump version + +* Wed Jan 09 2002 Tim Powers +- automated rebuild + +* Mon Oct 15 2001 Karsten Hopp +- add home page (#54602) + +* Sat Jul 07 2001 Karsten Hopp +- Copyright -> License +- fix URL + +* Sun Jun 24 2001 Elliot Lee +- Bump release + rebuild. + +* Mon Dec 04 2000 Karsten Hopp +- back out fixes for compiler warnings + +* Wed Nov 29 2000 Karsten Hopp +- Security bugfix (mkstemp instead of mktemp) Bugzilla #21470 + +* Wed Jul 12 2000 Prospector +- automatic rebuild + +* Sun Jun 18 2000 Than Ngo +- fix typo + +* Sat Jun 17 2000 Than Ngo +- add %%defattr +- clean up specfile + +* Sat May 20 2000 Ngo Than +- rebuild for 7.0 +- put man pages and infos in right place + +* Thu Feb 03 2000 Preston Brown +- rebuild to gzip man pages. + +* Tue Mar 23 1999 Jeff Johnson +- fix %post syntax error (#1689). + +* Sun Mar 21 1999 Cristian Gafton +- auto rebuild in the new build environment (release 11) + +* Wed Feb 24 1999 Preston Brown +- Injected new description and group. + +* Fri Dec 18 1998 Preston Brown +- bumped spec number for initial rh 6.0 build + +* Mon Apr 27 1998 Prospector System +- translations modified for de, fr, tr + +* Fri Oct 17 1997 Donnie Barnes +- added install-info support +- added BuildRoot +- correct URL in Source line + +* Mon Jun 02 1997 Erik Troan +- built against glibc From svn at tinysofa.org Thu Jul 1 15:46:27 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:46:27 +1000 (EST) Subject: [tinysofa-svn] r2738 - in tinysofa/snapshot/elfutils/current: sources specs Message-ID: <20040701154627.1EDE84E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:46:26 +1000 (Fri, 02 Jul 2004) New Revision: 2738 Added: tinysofa/snapshot/elfutils/current/sources/elfutils-0.95-ts-gcc34.patch Modified: tinysofa/snapshot/elfutils/current/specs/elfutils.spec Log: - Sync with 2.0. - Kept: - elfutils-0.95.tar.gz: - Added: - elfutils-0.95-ts-gcc34.patch: Added: tinysofa/snapshot/elfutils/current/sources/elfutils-0.95-ts-gcc34.patch =================================================================== --- tinysofa/snapshot/elfutils/current/sources/elfutils-0.95-ts-gcc34.patch 2004-07-01 15:46:24 UTC (rev 2737) +++ tinysofa/snapshot/elfutils/current/sources/elfutils-0.95-ts-gcc34.patch 2004-07-01 15:46:26 UTC (rev 2738) @@ -0,0 +1,59 @@ +diff -urN elfutils-0.95/src/strip.c elfutils-0.95-ts-gcc3.4/src/strip.c +--- elfutils-0.95/src/strip.c 2004-01-21 16:35:27.000000000 +1100 ++++ elfutils-0.95-ts-gcc3.4/src/strip.c 2004-06-18 13:17:52.325900696 +1000 +@@ -444,7 +444,7 @@ + the debug file if the file would not contain any + information. */ + size_t debug_fname_len = strlen (debug_fname); +- tmp_debug_fname = (char *) alloca (debug_fname_len + sizeof (".XXXXXX")); ++ tmp_debug_fname = (char *) malloc (debug_fname_len + sizeof (".XXXXXX")); + strcpy (mempcpy (tmp_debug_fname, debug_fname, debug_fname_len), + ".XXXXXX"); + +@@ -536,15 +536,8 @@ + entries since we unconditionally create a section header string + table. Maybe some weird tool created an ELF file without one. + The other one is used for the debug link section. */ +- if ((shnum + 2) * sizeof (struct shdr_info) > MAX_STACK_ALLOC) +- shdr_info = (struct shdr_info *) xcalloc (shnum + 2, ++ shdr_info = (struct shdr_info *) xcalloc (shnum + 2, + sizeof (struct shdr_info)); +- else +- { +- shdr_info = (struct shdr_info *) alloca ((shnum + 2) +- * sizeof (struct shdr_info)); +- memset (shdr_info, '\0', (shnum + 2) * sizeof (struct shdr_info)); +- } + + /* Prepare section information data structure. */ + scn = NULL; +@@ -907,6 +900,7 @@ + } + + /* The temporary file does not exist anymore. */ ++ free(tmp_debug_fname); + tmp_debug_fname = NULL; + + /* Compute the checksum which we will add to the executable. */ +@@ -1656,8 +1650,7 @@ + free (shdr_info[cnt].newsymidx); + + /* Free the memory. */ +- if ((shnum + 2) * sizeof (struct shdr_info) > MAX_STACK_ALLOC) +- free (shdr_info); ++ free (shdr_info); + } + + /* Free other resources. */ +@@ -1689,8 +1682,10 @@ + /* Close debug file descriptor, if opened */ + if (debug_fd >= 0) + { +- if (tmp_debug_fname != NULL) ++ if (tmp_debug_fname != NULL) { ++ free(tmp_debug_fname); + unlink (tmp_debug_fname); ++ } + close (debug_fd); + } + Modified: tinysofa/snapshot/elfutils/current/specs/elfutils.spec =================================================================== --- tinysofa/snapshot/elfutils/current/specs/elfutils.spec 2004-07-01 15:46:24 UTC (rev 2737) +++ tinysofa/snapshot/elfutils/current/specs/elfutils.spec 2004-07-01 15:46:26 UTC (rev 2738) @@ -1,191 +1,84 @@ -%define _gnu %{nil} -%define _programprefix eu- - -%define libelf %{mklibname %{name}-libelf} -%define libelf_devel %{mklibname %{name}-libelf -d} -%define libelf_static_devel %{mklibname %{name}-libelf -d -s} - +%define gpl 0 +Summary: A collection of utilities and DSOs to handle compiled objects. Name: elfutils Version: 0.95 -Release: 2ok -License: OSL -Summary: Collection of utilities and libraries to handle compiled objects -Summary(pt_BR): Cole??o de utilit?rios e bibliotecas para gerenciar objetos compilados -Group: tinysofa/development -Group(pt_BR): tinysofa/desenvolvimento -Group(es): tinysofa/desarrollo -URL: http://packages.debian.org/unstable/devel/elfutils.html +Release: 2ts +%if %{gpl} +Copyright: GPL +%else +Copyright: OSL +%endif +Group: Development/Tools +#URL: file://home/devel/drepper/ Source: elfutils-%{version}.tar.gz -Requires: %{libelf} = %{version}-%{release} -BuildRequires: autoconf -BuildRequires: automake -BuildRequires: gcc >= 3.2 -BuildRequires: sharutils -BuildRoot: %{_tmppath}/%{name}-root +Patch: elfutils-0.95-ts-gcc34.patch +Obsoletes: libelf libelf-devel +Requires: elfutils-libelf = %{version}-%{release} +%if %{gpl} +Requires: binutils >= 2.14.90.0.4-26.2 +%endif -%description -Elfutils is a collection of utilities, including ld (a linker), -nm (for listing symbols from object files), size (for listing the -section sizes of an object or archive file), strip (for discarding -symbols), readline (to see the raw ELF file structures), and elflint -(to check for well-formed ELF files). Also included are numerous -helper libraries which implement DWARF, ELF, and machine-specific ELF -handling. +# ExcludeArch: xxx -%description -l pt_BR -Elfutils ? uma cole??o de utilit?rios, incluindo ld (um linker), -nm (para listar s?mbolos de arquivos objetos), size (para listar -o tamanho das se??es de um objeto ou archive file), strip (para -descartar s?mbolos), readline (para ver as estruturas do arquivo ELF), -e elflint (para verificar a validade dos arquivos ELF). Tamb?m -incluidas est?o diversas bibliotecas auxiliares que implementam -DWARF, ELF, e manipula??o de arquivos ELF espec?fica da arquitetura. +BuildRoot: %{_tmppath}/%{name}-%{version}-root +BuildRequires: gcc >= 3.2 +BuildRequires: bison >= 1.875 +BuildRequires: flex >= 2.5.4a -%package -n %{libname} -Summary: Shared libraries to handle compiled objects -Summary(pt_BR): Bibliotecas para manipular objetos compilados -Group: tinysofa/libraries -Group(pt_BR): tinysofa/bibliotecas -Group(es): tinysofa/bibliotecas +%define _gnu %{nil} +%define _programprefix eu- -%description -n %{libname} +%description Elfutils is a collection of utilities, including ld (a linker), nm (for listing symbols from object files), size (for listing the section sizes of an object or archive file), strip (for discarding -symbols), readline (to see the raw ELF file structures), and elflint +symbols), readelf (to see the raw ELF file structures), and elflint (to check for well-formed ELF files). Also included are numerous helper libraries which implement DWARF, ELF, and machine-specific ELF handling. -%description -n %{libname} -l pt_BR -Elfutils ? uma cole??o de utilit?rios, incluindo ld (um linker), -nm (para listar s?mbolos de arquivos objetos), size (para listar -o tamanho das se??es de um objeto ou archive file), strip (para -descartar s?mbolos), readline (para ver as estruturas do arquivo ELF), -e elflint (para verificar a validade dos arquivos ELF). Tamb?m -incluidas est?o diversas bibliotecas auxiliares que implementam -DWARF, ELF, e manipula??o de arquivos ELF espec?fica da arquitetura. +%package devel +Summary: Development libraries to handle compiled objects. +Group: Development/Tools +Requires: elfutils = %{version}-%{release} +Requires: elfutils-libelf-devel = %{version}-%{release} -%package -n %{libname_devel} -Summary: Development libraries to handle compiled objects -Summary(pt_BR): Bibliotecas de desenvolvimento para manipular objetos compilados -Group: tinysofa/development -Group(pt_BR): tinysofa/desenvolvimento -Group(es): tinysofa/desarrollo -Requires: %{libname} = %{version}-%{release} -%rename elfutils-devel +%description devel +The elfutils-devel package contains the libraries to create +applications for handling compiled objects. libebl provides some +higher-level ELF access functionality. libdw provides access to +the DWARF debugging information. libasm provides a programmable +assembler interface. -%description -n %{libname_devel} -Elfutils is a collection of utilities, including ld (a linker), -nm (for listing symbols from object files), size (for listing the -section sizes of an object or archive file), strip (for discarding -symbols), readline (to see the raw ELF file structures), and elflint -(to check for well-formed ELF files). Also included are numerous -helper libraries which implement DWARF, ELF, and machine-specific ELF -handling. +%package libelf +Summary: Library to read and write ELF files. +Group: Development/Tools -%description -n %{libname_devel} -l pt_BR -Elfutils ? uma cole??o de utilit?rios, incluindo ld (um linker), -nm (para listar s?mbolos de arquivos objetos), size (para listar -o tamanho das se??es de um objeto ou archive file), strip (para -descartar s?mbolos), readline (para ver as estruturas do arquivo ELF), -e elflint (para verificar a validade dos arquivos ELF). Tamb?m -incluidas est?o diversas bibliotecas auxiliares que implementam -DWARF, ELF, e manipula??o de arquivos ELF espec?fica da arquitetura. - -%package -n %{libname_static_devel} -Summary: Static development libraries to handle compiled objects -Summary(pt_BR): Bibliotecas est?ticas de desenvolvimento para manipular objetos compilados -Group: tinysofa/development -Group(pt_BR): tinysofa/desenvolvimento -Group(es): tinysofa/desarrollo -Requires: %{libname_devel} = %{version}-%{release} - -%description -n %{libname_static_devel} -Elfutils is a collection of utilities, including ld (a linker), -nm (for listing symbols from object files), size (for listing the -section sizes of an object or archive file), strip (for discarding -symbols), readline (to see the raw ELF file structures), and elflint -(to check for well-formed ELF files). Also included are numerous -helper libraries which implement DWARF, ELF, and machine-specific ELF -handling. - -%description -n %{libname_static_devel} -l pt_BR -Elfutils ? uma cole??o de utilit?rios, incluindo ld (um linker), -nm (para listar s?mbolos de arquivos objetos), size (para listar -o tamanho das se??es de um objeto ou archive file), strip (para -descartar s?mbolos), readline (para ver as estruturas do arquivo ELF), -e elflint (para verificar a validade dos arquivos ELF). Tamb?m -incluidas est?o diversas bibliotecas auxiliares que implementam -DWARF, ELF, e manipula??o de arquivos ELF espec?fica da arquitetura. - -%package -n %{libelf} -Summary: Library to read and write ELF files -Summary(pt_BR): Biblioteca para ler e escrever arquivos ELF -Group: tinysofa/libraries -Group(pt_BR): tinysofa/bibliotecas -Group(es): tinysofa/bibliotecas -%rename elfutils-libelf - -%description -n %{libelf} -This package provides a library which allows reading and +%description libelf +The elfutils-libelf package provides a DSO which allows reading and writing ELF files on a high level. Third party programs depend on this package to read internals of ELF files. The programs of the elfutils package use it also to generate new ELF files. -%description -n %{libelf} -l pt_BR -Este pacote prov? uma biblioteca que permite ler e escrever arquivos -ELF em um alto n?vel. Outros programas dependem deste pacote para -acessar as estruturas internas dos arquivos ELF. Os programas do -pacote elfutils principal tamb?m usam ele para gerar novos arquivos ELF. +%package libelf-devel +Summary: Development support for libelf +Group: Development/Tools +Requires: elfutils-libelf = %{version}-%{release} +Conflicts: libelf-devel -%package -n %{libelf_devel} -Summary: Development library to read and write ELF files -Summary(pt_BR): Bibliotecas de desenvolvimento para ler e escrever arquivos ELF -Group: tinysofa/development -Group(pt_BR): tinysofa/desenvolvimento -Group(es): tinysofa/desarrollo -Requires: %{libelf} = %{version}-%{release} -%rename elfutils-libelf-devel +%description libelf-devel +The elfutils-libelf-devel package contains the libraries to create +applications for handling compiled objects. libelf allows you to +access the internals of the ELF object file format, so you can see the +different sections of an ELF file. -%description -n %{libelf_devel} -This package provides a library which allows reading and -writing ELF files on a high level. Third party programs depend on -this package to read internals of ELF files. The programs of the -elfutils package use it also to generate new ELF files. - -%description -n %{libelf_devel} -l pt_BR -Este pacote prov? uma biblioteca que permite ler e escrever arquivos -ELF em um alto n?vel. Outros programas dependem deste pacote para -acessar as estruturas internas dos arquivos ELF. Os programas do -pacote elfutils principal tamb?m usam ele para gerar novos arquivos ELF. - -%package -n %{libelf_static_devel} -Summary: Static development library to read and write ELF files -Summary(pt_BR): Bibliotecas est?ticas de desenvolvimento para ler e escrever arquivos ELF -Group: tinysofa/development -Group(pt_BR): tinysofa/desenvolvimento -Group(es): tinysofa/desarrollo -Requires: %{libelf_devel} = %{version}-%{release} - -%description -n %{libelf_static_devel} -This package provides a library which allows reading and -writing ELF files on a high level. Third party programs depend on -this package to read internals of ELF files. The programs of the -elfutils package use it also to generate new ELF files. - -%description -n %{libelf_static_devel} -l pt_BR -Este pacote prov? uma biblioteca que permite ler e escrever arquivos -ELF em um alto n?vel. Outros programas dependem deste pacote para -acessar as estruturas internas dos arquivos ELF. Os programas do -pacote elfutils principal tamb?m usam ele para gerar novos arquivos ELF. - %prep %setup -q +%patch -p1 %build mkdir build-%{_target_platform} -pushd build-%{_target_platform} +cd build-%{_target_platform} ../configure \ --prefix=%{_prefix} --exec-prefix=%{_exec_prefix} \ --bindir=%{_bindir} --sbindir=%{_sbindir} --sysconfdir=%{_sysconfdir} \ @@ -193,95 +86,254 @@ --libexecdir=%{_libexecdir} --localstatedir=%{_localstatedir} \ --sharedstatedir=%{_sharedstatedir} --mandir=%{_mandir} \ --infodir=%{_infodir} --program-prefix=%{_programprefix} --enable-shared -popd +cd .. %install -rm -rf %{buildroot} -mkdir -p %{buildroot}%{_prefix} +rm -rf ${RPM_BUILD_ROOT} +mkdir -p ${RPM_BUILD_ROOT}%{_prefix} -pushd build-%{_target_platform} +cd build-%{_target_platform} #make check %makeinstall -popd +chmod +x ${RPM_BUILD_ROOT}%{_prefix}/%{_lib}/lib*.so* +%if !%{gpl} +chmod +x ${RPM_BUILD_ROOT}%{_prefix}/%{_lib}/elfutils/lib*.so* +%endif + +cd .. + +%if !%{gpl} +# XXX Nuke unpackaged files +{ cd ${RPM_BUILD_ROOT} + rm -f .%{_bindir}/eu-ld + rm -f .%{_includedir}/elfutils/libasm.h + rm -f .%{_includedir}/elfutils/libdw.h + rm -f .%{_libdir}/libasm-%{version}.so + rm -f .%{_libdir}/libasm.a + rm -f .%{_libdir}/libdw.so + rm -f .%{_libdir}/libdw.a +} +%endif + +%check +cd build-%{_target_platform} +make check + %clean -rm -rf %{buildroot} +rm -rf ${RPM_BUILD_ROOT} %post -p /sbin/ldconfig %postun -p /sbin/ldconfig -%post -n %{libelf} -p /sbin/ldconfig +%post libelf -p /sbin/ldconfig -%postun -n %{libelf} -p /sbin/ldconfig +%postun libelf -p /sbin/ldconfig %files -%defattr(0644,root,root,0755) +%defattr(-,root,root) %doc README TODO -%defattr(0755,root,root) +%if %{gpl} +%doc fake-src/FULL +%endif %{_bindir}/eu-elflint -%{_bindir}/eu-ld %{_bindir}/eu-nm %{_bindir}/eu-readelf %{_bindir}/eu-size %{_bindir}/eu-strip - -%files -n %{libname} -%{_libdir}/libasm-%{version}.so +%if !%{gpl} +#%{_bindir}/eu-ld +#%{_libdir}/libasm-%{version}.so %{_libdir}/libdw-%{version}.so -%{_libdir}/libasm*.so.* +#%{_libdir}/libasm*.so.* %{_libdir}/libdw*.so.* %dir %{_libdir}/elfutils %{_libdir}/elfutils/lib*.so +%endif -%files -n %{libname_devel} -%defattr(0644,root,root,0755) +%files devel +%defattr(-,root,root) %{_includedir}/dwarf.h -%{_includedir}/gelf.h -%{_includedir}/nlist.h -%dir %{_includedir}/elfutils/ -%{_includedir}/elfutils/* -%{_libdir}/libasm.so -%{_libdir}/libdw.so - -%files -n %{libname_static_devel} -%defattr(0644,root,root,0755) -%{_libdir}/libasm.a +%dir %{_includedir}/elfutils +%{_includedir}/elfutils/elf-knowledge.h +%if !%{gpl} +%{_includedir}/elfutils/libebl.h +#%{_libdir}/libasm.a %{_libdir}/libebl.a -%{_libdir}/libelf.a +#%{_libdir}/libdw.a +#%{_libdir}/libasm.so +#%{_libdir}/libdw.so +%endif -%files -n %{libelf} -%defattr(0644,root,root,0755) +%files libelf +%defattr(-,root,root) %{_libdir}/libelf-%{version}.so %{_libdir}/libelf*.so.* -%files -n %{libelf_devel} -%defattr(0644,root,root,0755) +%files libelf-devel +%defattr(-,root,root) +%{_includedir}/libelf.h +%{_includedir}/gelf.h +%{_includedir}/nlist.h +%{_libdir}/libelf.a %{_libdir}/libelf.so -%{_includedir}/libelf.h -%files -n %{libelf_static_devel} -%defattr(0644,root,root,0755) -%{_libdir}/libdw.a - %changelog -* Fri Jun 04 2004 Omar Kilani 0.95-2ok -- tinysofa. +* Fri Apr 2 2004 Jeff Johnson 0.95-2 +- upgrade to 0.95. -* Fri Dec 26 2003 Arnaldo Carvalho de Melo -+ 2003-12-26 09:23:34 (42341) -- Added missing Requires to -devel in -devel-static, the later alone is not - useful as one needs the headers. -- Added libdwarf.a to -devel-static package +* Tue Mar 02 2004 Elliot Lee +- rebuilt -* Fri Nov 28 2003 Gustavo Niemeyer -+ 2003-11-28 10:40:18 (40616) -- Fixing file modes. +* Fri Feb 13 2004 Elliot Lee +- rebuilt -* Fri Nov 28 2003 Gustavo Niemeyer -+ 2003-11-28 10:26:12 (40613) -- Adding elfutils package. +* Fri Jan 16 2004 Jakub Jelinek 0.94-1 +- upgrade to 0.94 -* Fri Nov 28 2003 Gustavo Niemeyer -+ 2003-11-28 08:16:41 (40601) -- Created package structure for elfutils. +* Fri Jan 16 2004 Jakub Jelinek 0.93-1 +- upgrade to 0.93 + +* Thu Jan 8 2004 Jakub Jelinek 0.92-1 +- full version +- macroized spec file for GPL or OSL builds +- include only libelf under GPL plus wrapper scripts + +* Wed Jan 7 2004 Jakub Jelinek 0.91-2 +- macroized spec file for GPL or OSL builds + +* Wed Jan 7 2004 Ulrich Drepper +- split elfutils-devel into two packages. + +* Wed Jan 7 2004 Jakub Jelinek 0.91-1 +- include only libelf under GPL plus wrapper scripts + +* Tue Dec 23 2003 Jeff Johnson 0.89-3 +- readelf, not readline, in %%description (#111214). + +* Fri Sep 26 2003 Bill Nottingham 0.89-1 +- update to 0.89 (fix eu-strip) + +* Tue Sep 23 2003 Jakub Jelinek 0.86-3 +- update to 0.86 (fix eu-strip on s390x/alpha) +- libebl is an archive now; remove references to DSO + +* Mon Jul 14 2003 Jeff Johnson 0.84-3 +- upgrade to 0.84 (readelf/elflint improvements, rawhide bugs fixed). + +* Fri Jul 11 2003 Jeff Johnson 0.83-3 +- upgrade to 0.83 (fix invalid ELf handle on *.so strip, more). + +* Wed Jul 9 2003 Jeff Johnson 0.82-3 +- upgrade to 0.82 (strip tests fixed on big-endian). + +* Tue Jul 8 2003 Jeff Johnson 0.81-3 +- upgrade to 0.81 (strip excludes unused symtable entries, test borked). + +* Thu Jun 26 2003 Jeff Johnson 0.80-3 +- upgrade to 0.80 (debugedit changes for kernel in progress). + +* Wed Jun 04 2003 Elliot Lee +- rebuilt + +* Wed May 21 2003 Jeff Johnson 0.79-2 +- upgrade to 0.79 (correct formats for size_t, more of libdw "works"). + +* Mon May 19 2003 Jeff Johnson 0.78-2 +- upgrade to 0.78 (libdwarf bugfix, libdw additions). + +* Mon Feb 24 2003 Elliot Lee +- debuginfo rebuild + +* Thu Feb 20 2003 Jeff Johnson 0.76-2 +- use the correct way of identifying the section via the sh_info link. + +* Sat Feb 15 2003 Jakub Jelinek 0.75-2 +- update to 0.75 (eu-strip -g fix) + +* Tue Feb 11 2003 Jakub Jelinek 0.74-2 +- update to 0.74 (fix for writing with some non-dirty sections) + +* Thu Feb 6 2003 Jeff Johnson 0.73-3 +- another -0.73 update (with sparc fixes). +- do "make check" in %%check, not %%install, section. + +* Mon Jan 27 2003 Jeff Johnson 0.73-2 +- update to 0.73 (with s390 fixes). + +* Wed Jan 22 2003 Tim Powers +- rebuilt + +* Wed Jan 22 2003 Jakub Jelinek 0.72-4 +- fix arguments to gelf_getsymshndx and elf_getshstrndx +- fix other warnings +- reenable checks on s390x + +* Sat Jan 11 2003 Karsten Hopp 0.72-3 +- temporarily disable checks on s390x, until someone has + time to look at it + +* Thu Dec 12 2002 Jakub Jelinek 0.72-2 +- update to 0.72 + +* Wed Dec 11 2002 Jakub Jelinek 0.71-2 +- update to 0.71 + +* Wed Dec 11 2002 Jeff Johnson 0.69-4 +- update to 0.69. +- add "make check" and segfault avoidance patch. +- elfutils-libelf needs to run ldconfig. + +* Tue Dec 10 2002 Jeff Johnson 0.68-2 +- update to 0.68. + +* Fri Dec 6 2002 Jeff Johnson 0.67-2 +- update to 0.67. + +* Tue Dec 3 2002 Jeff Johnson 0.65-2 +- update to 0.65. + +* Mon Dec 2 2002 Jeff Johnson 0.64-2 +- update to 0.64. + +* Sun Dec 1 2002 Ulrich Drepper 0.64 +- split packages further into elfutils-libelf + +* Sat Nov 30 2002 Jeff Johnson 0.63-2 +- update to 0.63. + +* Fri Nov 29 2002 Ulrich Drepper 0.62 +- Adjust for dropping libtool + +* Sun Nov 24 2002 Jeff Johnson 0.59-2 +- update to 0.59 + +* Thu Nov 14 2002 Jeff Johnson 0.56-2 +- update to 0.56 + +* Thu Nov 7 2002 Jeff Johnson 0.54-2 +- update to 0.54 + +* Sun Oct 27 2002 Jeff Johnson 0.53-2 +- update to 0.53 +- drop x86_64 hack, ICE fixed in gcc-3.2-11. + +* Sat Oct 26 2002 Jeff Johnson 0.52-3 +- get beehive to punch a rhpkg generated package. + +* Wed Oct 23 2002 Jeff Johnson 0.52-2 +- build in 8.0.1. +- x86_64: avoid gcc-3.2 ICE on x86_64 for now. + +* Tue Oct 22 2002 Ulrich Drepper 0.52 +- Add libelf-devel to conflicts for elfutils-devel + +* Mon Oct 21 2002 Ulrich Drepper 0.50 +- Split into runtime and devel package + +* Fri Oct 18 2002 Ulrich Drepper 0.49 +- integrate into official sources + +* Wed Oct 16 2002 Jeff Johnson 0.46-1 +- Swaddle. From svn at tinysofa.org Thu Jul 1 15:46:29 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:46:29 +1000 (EST) Subject: [tinysofa-svn] r2739 - in tinysofa/snapshot/expat/current: sources specs Message-ID: <20040701154629.967F44E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:46:29 +1000 (Fri, 02 Jul 2004) New Revision: 2739 Added: tinysofa/snapshot/expat/current/sources/expat-malloc-failure.diff Modified: tinysofa/snapshot/expat/current/specs/expat.spec Log: - Sync with 2.0. - Kept: - expat-1.95.7-xmlcall.patch: - expat-1.95.7.tar.gz: - Added: - expat-malloc-failure.diff: Added: tinysofa/snapshot/expat/current/sources/expat-malloc-failure.diff =================================================================== --- tinysofa/snapshot/expat/current/sources/expat-malloc-failure.diff 2004-07-01 15:46:26 UTC (rev 2738) +++ tinysofa/snapshot/expat/current/sources/expat-malloc-failure.diff 2004-07-01 15:46:29 UTC (rev 2739) @@ -0,0 +1,19 @@ +Index: lib/xmlparse.c +=================================================================== +RCS file: /cvsroot/expat/expat/lib/xmlparse.c,v +retrieving revision 1.134 +diff -p -u -r1.134 xmlparse.c +--- lib/xmlparse.c 18 May 2004 13:50:13 -0000 1.134 ++++ lib/xmlparse.c 27 May 2004 15:53:18 -0000 +@@ -5758,8 +5758,10 @@ lookup(HASH_TABLE *table, KEY name, size + table->size = (size_t)1 << INIT_POWER; + tsize = table->size * sizeof(NAMED *); + table->v = (NAMED **)table->mem->malloc_fcn(tsize); +- if (!table->v) ++ if (!table->v) { ++ table->size = 0; + return NULL; ++ } + memset(table->v, 0, tsize); + i = hash(name) & ((unsigned long)table->size - 1); + } Modified: tinysofa/snapshot/expat/current/specs/expat.spec =================================================================== --- tinysofa/snapshot/expat/current/specs/expat.spec 2004-07-01 15:46:26 UTC (rev 2738) +++ tinysofa/snapshot/expat/current/specs/expat.spec 2004-07-01 15:46:29 UTC (rev 2739) @@ -1,96 +1,129 @@ -Summary: Expat is an XML 1.0 parser written in C. +Summary: A library for parsing XML. Name: expat Version: 1.95.7 -Release: 13ts -License: MIT -Group: tinysofa official +Release: 4ts +Group: System Environment/Libraries Source: http://download.sourceforge.net/expat/expat-%{version}.tar.gz -Patch: expat-1.95.7-xmlcall.patch +URL: http://sourceforge.net/projects/expat +License: BSD +Patch0: expat-1.95.7-xmlcall.patch +Patch1: http://ridley.csbnet.se/patches/expat-malloc-failure.diff +BuildRoot: %{_tmppath}/%{name}-%{version}-root -BuildRoot: %{_tmppath}/%{name}-root -Requires: %{name}-libs - %description -Expat is an XML 1.0 parser written in C by James Clark. It aims to be -fully conforming. It is not a validating XML parser. +This is expat, the C library for parsing XML, written by James Clark. Expat +is a stream oriented XML parser. This means that you register handlers with +the parser prior to starting the parse. These handlers are called when the +parser discovers the associated structures in the document being parsed. A +start tag is an example of the kind of structures for which you may +register handlers. -%package libs -Summary: XML runtime libraries -Group: tinysofa official -Provides: libexpat.so.1 - -%description libs -The runtime XML libraries for expat - %package devel -Summary: XML development libraries -Group: tinysofa official +Summary: Libraries and include files to develop XML applications with expat. +Group: Development/Libraries +Requires: expat = %{version}-%{release} %description devel -The development XML libraries for expat +The expat-devel package contains the libraries, include files and documentation +to develop XML applications with expat. + %prep - %setup -q -%patch -p1 +%patch0 -p1 -b .xmlcall +%patch1 -p0 -b .malloc %build +export CFLAGS="%{optflags} -fPIC" %configure -make +make %{?_smp_mflags} %install -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT +rm -rf ${RPM_BUILD_ROOT} + %makeinstall mandir=$RPM_BUILD_ROOT/%{_mandir}/man1 -pushd $RPM_BUILD_ROOT/usr/lib - ln -s libexpat.so.0.5.0 libexpat.so.1 -popd - %clean -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT +rm -rf ${RPM_BUILD_ROOT} +%post -p /sbin/ldconfig +%postun -p /sbin/ldconfig + %files %defattr(-,root,root) -%doc COPYING Changes MANIFEST README doc/reference.html doc/style.css doc/valid-xhtml10.png -/usr/bin/xmlwf -/usr/share/man/man1/xmlwf.1* +%doc README COPYING +%{_bindir}/* +%{_libdir}/lib*.so.* +%{_mandir}/*/* -%files libs -%defattr(0755,root,root) -/usr/lib/*.so.* - %files devel %defattr(-,root,root) -/usr/lib/*.so -/usr/lib/*.la -/usr/lib/*.a -/usr/include/expat.h +%doc Changes doc examples +%{_libdir}/lib*.a +%{_libdir}/lib*.la +%{_libdir}/lib*.so +%{_includedir}/*.h %changelog -* Wed May 19 2004 tsintegrate 1.95.7-13ts -- current (1.95.7-12ts) integrated as 1.95.7-13ts for release 1.0-U1 +* Wed Jun 16 2004 Jeff Johnson 1.95.7-4 +- add -fPIC (#125586). -* Wed May 04 2004 Omar Kilani 1.95.7-11ts -- Fix BuildRoot so that the generated .la file contains the proper path. -- Added xmlcall patch. +* Tue Jun 15 2004 Elliot Lee +- rebuilt -* Mon May 03 2004 Omar Kilani 1.95.7-10ts -- Rebuild +* Fri Jun 11 2004 Jeff Johnson 1.95.7-2 +- fix: malloc failure from dbus test suite (#124747). -* Mon May 03 2004 Jaakko Heinonen 1.95.7-9jh -- fixed permissions for documentation and include files +* Tue Mar 02 2004 Elliot Lee +- rebuilt -* Fri Jan 23 2004 Chr. Toldnes 1.95.7-5ct -- Added libexpat.so.1 symlink +* Sun Feb 22 2004 Joe Orton 1.95.7-1 +- update to 1.95.7, include COPYING file in main package -* Wed Dec 3 2003 Erlend Midttun 1.95.7-4tr -- Rebuilt. +* Fri Feb 13 2004 Elliot Lee +- rebuilt -* Wed Dec 3 2003 Chr. Toldnes 1.95.7-3ct -- Split into libs and devel +* Wed Sep 17 2003 Matt Wilson 1.95.5-6 +- rebuild again for #91211 -* Wed Dec 3 2003 Chr. Toldnes 1.95.7-2ct -- no conflict with apache, aoache should be fixed +* Tue Sep 16 2003 Matt Wilson 1.95.5-5 +- rebuild to fix gzip'ed file md5sums (#91211) -* Thu Nov 27 2003 Chr. Toldnes 1.95.7-1ct -- Initial release for TSL -- Based upon work by Fred L. Drake and Sean Reifschneider \ No newline at end of file +* Tue Jun 17 2003 Jeff Johnson 1.95.5-4 +- rebuilt because of crt breakage on ppc64. + +* Wed Jun 04 2003 Elliot Lee +- rebuilt + +* Wed Jan 22 2003 Tim Powers +- rebuilt + +* Mon Nov 11 2002 Jeff Johnson 1.95.5-1 +- update to 1.95.5. + +* Mon Aug 19 2002 Trond Eivind Glomsr?d 1,95.4-1 +- 1.95.4. 1.95.3 was withdrawn by the expat developers. + +* Fri Jun 21 2002 Tim Powers +- automated rebuild + +* Thu Jun 6 2002 Trond Eivind Glomsr?d 1,95.3-1 +- 1.95.3 + +* Thu May 23 2002 Tim Powers +- automated rebuild + +* Fri Mar 22 2002 Trond Eivind Glomsr?d +- Change a prereq in -devel on main package to a req +- License from MIT/X11 to BSD + +* Mon Mar 13 2002 Trond Eivind Glomsr?d +- 1.95.2 + +* Sun Jun 24 2001 Elliot Lee +- Bump release + rebuild. + +* Tue Oct 24 2000 Jeff Johnson +- update to 1.95.1 + +* Sun Oct 8 2000 Jeff Johnson +- Create. From svn at tinysofa.org Thu Jul 1 15:46:31 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:46:31 +1000 (EST) Subject: [tinysofa-svn] r2740 - in tinysofa/snapshot/file/current: sources specs Message-ID: <20040701154631.D099D4E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:46:31 +1000 (Fri, 02 Jul 2004) New Revision: 2740 Added: tinysofa/snapshot/file/current/sources/file-4.07-debian.patch tinysofa/snapshot/file/current/sources/file-4.09-note.patch tinysofa/snapshot/file/current/sources/file-4.09-rh.patch Modified: tinysofa/snapshot/file/current/specs/file.spec Log: - Sync with 2.0. - Kept: - file-4.02-zlib.patch: - file-4.09.tar.gz: - file-selinux.patch: - Added: - file-4.07-debian.patch: - file-4.09-note.patch: - file-4.09-rh.patch: Added: tinysofa/snapshot/file/current/sources/file-4.07-debian.patch =================================================================== --- tinysofa/snapshot/file/current/sources/file-4.07-debian.patch 2004-07-01 15:46:29 UTC (rev 2739) +++ tinysofa/snapshot/file/current/sources/file-4.07-debian.patch 2004-07-01 15:46:31 UTC (rev 2740) @@ -0,0 +1,99 @@ +--- file-4.07/src/names.h.debian 2003-10-14 15:29:55.000000000 -0400 ++++ file-4.07/src/names.h 2004-01-19 14:56:46.615742400 -0500 +@@ -60,6 +60,7 @@ + #define L_HTML 11 /* HTML */ + #define L_BCPL 12 /* BCPL */ + #define L_M4 13 /* M4 */ ++#define L_PO 14 /* PO */ + + static const struct { + const char *human; +@@ -71,7 +72,7 @@ + { "make commands", "text/x-makefile" }, + { "PL/1 program", "text/x-pl1" }, + { "assembler program", "text/x-asm" }, +- { "English", "text/plain, English" }, ++ { "English", "text/plain" }, + { "Pascal program", "text/x-pascal" }, + { "mail", "text/x-mail" }, + { "news", "text/x-news" }, +@@ -79,6 +80,7 @@ + { "HTML document", "text/html", }, + { "BCPL program", "text/x-bcpl" }, + { "M4 macro language pre-processor", "text/x-m4" }, ++ { "PO (gettext message catalogue)", "text/x-po" }, + { "cannot happen error on names.h/types", "error/x-error" }, + { 0, 0} + }; +@@ -125,6 +127,7 @@ + } names[] = { + /* These must be sorted by eye for optimal hit rate */ + /* Add to this list only after substantial meditation */ ++ {"msgid", L_PO}, + {"dnl", L_M4}, + {"import", L_JAVA}, + {"\"libhdr\"", L_BCPL}, +--- file-4.07/src/magic.c.debian 2003-12-23 12:32:30.000000000 -0500 ++++ file-4.07/src/magic.c 2004-01-19 15:13:44.465097506 -0500 +@@ -212,13 +212,13 @@ + { + int fd = 0; + unsigned char buf[HOWMANY+1]; /* one extra for terminating '\0' */ +- struct stat sb; ++ struct stat sb, * st = &sb; + ssize_t nbytes = 0; /* number of bytes read from a datafile */ + + if (file_reset(ms) == -1) + return NULL; + +- switch (file_fsmagic(ms, inname, &sb)) { ++ switch (file_fsmagic(ms, inname, st)) { + case -1: + return NULL; + case 0: +@@ -233,13 +233,19 @@ + if (inname == NULL) + fd = STDIN_FILENO; + else if ((fd = open(inname, O_RDONLY)) < 0) { ++ int ret; + /* We cannot open it, but we were able to stat it. */ +- if (sb.st_mode & 0002) ++ if (st->st_mode & S_IWOTH) + if (file_printf(ms, "writable, ") == -1) + return NULL; +- if (sb.st_mode & 0111) ++ if (st->st_mode & (S_IXUSR|S_IXGRP|S_IXOTH)) + if (file_printf(ms, "executable, ") == -1) + return NULL; ++ if ((st->st_mode & S_IFMT) == S_IFREG) ++ if (file_printf(ms, "regular file, ") == -1) ++ return NULL; ++ if (file_printf(ms, "no read permission") == -1) ++ return NULL; + return file_getbuffer(ms); + } + +@@ -257,6 +263,10 @@ + (void)close(fd); + goto done; + } ++ } else if (nbytes < 4) { ++ file_printf(ms, "very short file (no magic)"); ++ (void)close(fd); ++ return ms->o.buf; + } else { + buf[nbytes] = '\0'; /* null-terminate it */ + #ifdef __EMX__ +@@ -286,10 +296,10 @@ + #endif + } + +- close_and_restore(ms, inname, fd, &sb); ++ close_and_restore(ms, inname, fd, st); + return file_getbuffer(ms); + done: +- close_and_restore(ms, inname, fd, &sb); ++ close_and_restore(ms, inname, fd, st); + return NULL; + } + Added: tinysofa/snapshot/file/current/sources/file-4.09-note.patch =================================================================== --- tinysofa/snapshot/file/current/sources/file-4.09-note.patch 2004-07-01 15:46:29 UTC (rev 2739) +++ tinysofa/snapshot/file/current/sources/file-4.09-note.patch 2004-07-01 15:46:31 UTC (rev 2740) @@ -0,0 +1,54 @@ +--- file-4.07/src/readelf.c.jj 2004-05-10 12:48:16.000000000 +0200 ++++ file-4.07/src/readelf.c 2004-05-10 12:57:34.420368048 +0200 +@@ -139,6 +139,9 @@ getu64(int swap, uint64_t value) + #define ph_type (class == ELFCLASS32 \ + ? getu32(swap, ph32.p_type) \ + : getu32(swap, ph64.p_type)) ++#define ph_filesz (class == ELFCLASS32 \ ++ ? getu32(swap, ph32.p_filesz) \ ++ : getu32(swap, ph64.p_filesz)) + #define ph_offset (class == ELFCLASS32 \ + ? getu32(swap, ph32.p_offset) \ + : getu64(swap, ph64.p_offset)) +@@ -249,7 +252,10 @@ dophn_core(struct magic_set *ms, int cla + file_badseek(ms); + return -1; + } +- bufsize = read(fd, nbuf, sizeof(nbuf)); ++ bufsize = ph_filesz; ++ if (bufsize > sizeof(nbuf)) ++ bufsize = sizeof(nbuf); ++ bufsize = read(fd, nbuf, bufsize); + if (bufsize == -1) { + file_badread(ms); + return -1; +@@ -294,7 +300,7 @@ donote(struct magic_set *ms, unsigned ch + noff = offset; + doff = ELF_ALIGN(offset + namesz); + +- if (offset + namesz >= size) { ++ if (offset + namesz > size) { + /* + * We're past the end of the buffer. + */ +@@ -302,7 +308,7 @@ donote(struct magic_set *ms, unsigned ch + } + + offset = ELF_ALIGN(doff + descsz); +- if (offset + descsz >= size) { ++ if (offset > size) { + return offset; + } + +@@ -622,7 +628,10 @@ dophn_exec(struct magic_set *ms, int cla + file_badseek(ms); + return -1; + } +- bufsize = read(fd, nbuf, sizeof(nbuf)); ++ bufsize = ph_filesz; ++ if (bufsize > sizeof(nbuf)) ++ bufsize = sizeof(nbuf); ++ bufsize = read(fd, nbuf, bufsize); + if (bufsize == -1) { + file_badread(ms); + return -1; Added: tinysofa/snapshot/file/current/sources/file-4.09-rh.patch =================================================================== --- tinysofa/snapshot/file/current/sources/file-4.09-rh.patch 2004-07-01 15:46:29 UTC (rev 2739) +++ tinysofa/snapshot/file/current/sources/file-4.09-rh.patch 2004-07-01 15:46:31 UTC (rev 2740) @@ -0,0 +1,64 @@ +--- file-4.02/src/readelf.c.rh 2003-04-21 12:42:25.000000000 -0400 ++++ file-4.02/src/readelf.c 2003-04-21 12:50:20.000000000 -0400 +@@ -249,7 +249,7 @@ + file_badseek(ms); + return -1; + } +- bufsize = read(fd, nbuf, BUFSIZ); ++ bufsize = read(fd, nbuf, sizeof(nbuf)); + if (bufsize == -1) { + file_badread(ms); + return -1; +@@ -683,7 +683,7 @@ + return 0; + + +- class = buf[4]; ++ class = buf[EI_CLASS]; + + if (class == ELFCLASS32) { + Elf32_Ehdr elfhdr; +@@ -693,7 +693,7 @@ + + u.l = 1; + (void) memcpy(&elfhdr, buf, sizeof elfhdr); +- swap = (u.c[sizeof(int32_t) - 1] + 1) != elfhdr.e_ident[5]; ++ swap = (u.c[sizeof(int32_t) - 1] + 1) != elfhdr.e_ident[EI_DATA]; + + if (getu16(swap, elfhdr.e_type) == ET_CORE) { + #ifdef ELFCORE +--- file-4.02/magic/Magdir/elf.rh 2003-04-21 12:34:44.000000000 -0400 ++++ file-4.02/magic/Magdir/elf 2003-04-21 12:39:00.000000000 -0400 +@@ -91,7 +91,7 @@ + >>18 leshort 47 Hitachi H8/300H, + >>18 leshort 48 Hitachi H8S, + >>18 leshort 49 Hitachi H8/500, +->>18 leshort 50 IA-64 (Intel 64 bit architecture) ++>>18 leshort 50 IA-64, + >>18 leshort 51 Stanford MIPS-X, + >>18 leshort 52 Motorola Coldfire, + >>18 leshort 53 Motorola M68HC12, +@@ -178,7 +178,7 @@ + >>18 beshort 47 Hitachi H8/300H, + >>18 beshort 48 Hitachi H8S, + >>18 beshort 49 Hitachi H8/500, +->>18 beshort 50 Intel Merced Processor, ++>>18 beshort 50 IA-64, + >>18 beshort 51 Stanford MIPS-X, + >>18 beshort 52 Motorola Coldfire, + >>18 beshort 53 Motorola M68HC12, +--- file-4.02/magic/Localstuff.rh 2003-04-21 12:39:11.000000000 -0400 ++++ file-4.02/magic/Localstuff 2003-04-21 12:41:43.000000000 -0400 +@@ -5,3 +5,12 @@ + # $Id: file-4.02-rh.patch,v 1.1.1.1 2003/09/09 12:03:02 jbj Exp $ + # Add any locally observed files here. Remember: + # text if readable, executable if runnable binary, data if unreadable. ++ ++# XXX promoted from tex so that *.tfm is not mis-identified as mc68k file. ++# There is no way to detect TeX Font Metric (*.tfm) files without ++# breaking them apart and reading the data. The following patterns ++# match most *.tfm files generated by METAFONT or afm2tfm. ++2 string \000\021 TeX font metric data ++>33 string >\0 (%s) ++2 string \000\022 TeX font metric data ++>33 string >\0 (%s) Modified: tinysofa/snapshot/file/current/specs/file.spec =================================================================== --- tinysofa/snapshot/file/current/specs/file.spec 2004-07-01 15:46:29 UTC (rev 2739) +++ tinysofa/snapshot/file/current/specs/file.spec 2004-07-01 15:46:31 UTC (rev 2740) @@ -3,12 +3,15 @@ Summary: A utility for determining file types. Name: file Version: 4.09 -Release: 3jh +Release: 1ts License: distributable -Group: tinysofa/main +Group: Applications/File Source0: ftp://ftp.astron.com/pub/file/file-%{version}.tar.gz -Patch0: file-4.02-zlib.patch -Patch1: file-selinux.patch +Patch0: file-4.09-rh.patch +Patch1: file-4.02-zlib.patch +Patch2: file-4.09-note.patch +Patch3: file-4.07-debian.patch +Patch4: file-selinux.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root %description @@ -20,45 +23,35 @@ You should install the file package, since the file command is such a useful utility. -%package devel -Summary: Development libraries for interface to the file(1) command -Group: tinysofa/development -Requires: %{name}-%{version} - -%description devel -This package contains the development libraries for interface to the -file(1) command. - - %prep %setup -q -%patch0 -p1 -b .zlib -%if use_selinux -%patch1 -p1 -b .selinux -%endif +%patch0 -p1 -b .rh +%patch1 -p1 -b .zlib +%patch2 -p1 -b .note +#%patch3 -p1 -b .debian +%patch4 -p1 -b .selinux %build CFLAGS="%{optflags} -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE" \ %configure --enable-fsect-man5 -%make +make %install -%{__mkdir_p} \ - %{buildroot}%{_bindir} \ - %{buildroot}%{_mandir}/man1 \ - %{buildroot}%{_mandir}/man3 \ - %{buildroot}%{_mandir}/man5 \ - %{buildroot}%{_datadir}/misc +rm -rf $RPM_BUILD_ROOT +mkdir -p ${RPM_BUILD_ROOT}%{_bindir} +mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man1 +mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man5 +mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/misc %makeinstall -ln -s file/magic %{buildroot}%{_datadir}/magic -ln -s file/magic.mime %{buildroot}%{_datadir}/magic.mime +ln -s file/magic ${RPM_BUILD_ROOT}%{_datadir}/magic +ln -s file/magic.mime ${RPM_BUILD_ROOT}%{_datadir}/magic.mime -ln -s ../magic %{buildroot}%{_datadir}/misc/magic +ln -s ../magic ${RPM_BUILD_ROOT}%{_datadir}/misc/magic %clean -%clean_buildroot +rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig @@ -72,21 +65,12 @@ %{_datadir}/file/* %{_datadir}/misc/* %{_mandir}/man[15]/* -%{_libdir}/libmagic.so.* -%files devel -%defattr(-,root,root) -%{_mandir}/man3/* %{_includedir}/magic.h -%{_libdir}/*.a -%{_libdir}/*.la -%{_libdir}/*.so +%{_mandir}/man3/* +%{_libdir}/libmagic.* - %changelog -* Tue Jun 15 2004 Elliot Lee -- rebuilt - * Mon May 10 2004 Jakub Jelinek - fix ELF note handling (#109495) From svn at tinysofa.org Thu Jul 1 15:46:34 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:46:34 +1000 (EST) Subject: [tinysofa-svn] r2741 - tinysofa/snapshot/filesystem/current/specs Message-ID: <20040701154634.2839F4E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:46:33 +1000 (Fri, 02 Jul 2004) New Revision: 2741 Modified: tinysofa/snapshot/filesystem/current/specs/filesystem.spec Log: - Sync with 2.0. - Kept: - : Modified: tinysofa/snapshot/filesystem/current/specs/filesystem.spec =================================================================== --- tinysofa/snapshot/filesystem/current/specs/filesystem.spec 2004-07-01 15:46:31 UTC (rev 2740) +++ tinysofa/snapshot/filesystem/current/specs/filesystem.spec 2004-07-01 15:46:33 UTC (rev 2741) @@ -1,260 +1,222 @@ Summary: The basic directory layout for a Linux system. Name: filesystem -Version: 1.0 -Release: 2ts +Version: 2.2.4 +Release: 1ts License: Public Domain -Group: tinysofa official -BuildRoot: %{_tmppath}/%{name}-root -Prereq: setup -BuildArch: noarch -Epoch: 2 +Group: System Environment/Base +Buildroot: %{_tmppath}/%{name}-%{version}-root +Prereq: setup >= 2.5.4-1 %description -The filesystem package is one of the basic packages that is installed on -a tinysofa system. Filesystem contains the basic directory -layout for a Linux operating system, including the correct permissions +The filesystem package is one of the basic packages that is installed +on a tinysofa system. Filesystem contains the basic directory +layout for a Linux operating system, including the correct permissions for the directories. %prep %install -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT/bin -mkdir -p $RPM_BUILD_ROOT/boot -mkdir -p $RPM_BUILD_ROOT/etc -mkdir -p $RPM_BUILD_ROOT/etc/init.d -mkdir -p $RPM_BUILD_ROOT/etc/rc0.d -mkdir -p $RPM_BUILD_ROOT/etc/rc1.d -mkdir -p $RPM_BUILD_ROOT/etc/rc2.d -mkdir -p $RPM_BUILD_ROOT/etc/rc3.d -mkdir -p $RPM_BUILD_ROOT/etc/rc4.d -mkdir -p $RPM_BUILD_ROOT/etc/rc5.d -mkdir -p $RPM_BUILD_ROOT/etc/rc6.d -mkdir -p $RPM_BUILD_ROOT/etc/sysconfig -mkdir -p $RPM_BUILD_ROOT/home -mkdir -p $RPM_BUILD_ROOT/home/users -mkdir -p $RPM_BUILD_ROOT/initrd -mkdir -p $RPM_BUILD_ROOT/lib -mkdir -p $RPM_BUILD_ROOT/lib/modules -mkdir -p $RPM_BUILD_ROOT/mnt -mkdir -p $RPM_BUILD_ROOT/mnt/cdrom -mkdir -p $RPM_BUILD_ROOT/mnt/floppy -mkdir -p $RPM_BUILD_ROOT/opt -mkdir -p $RPM_BUILD_ROOT/proc -mkdir -p $RPM_BUILD_ROOT/root -mkdir -p $RPM_BUILD_ROOT/sbin -mkdir -p $RPM_BUILD_ROOT/tmp -mkdir -p $RPM_BUILD_ROOT/usr -mkdir -p $RPM_BUILD_ROOT/usr/bin -mkdir -p $RPM_BUILD_ROOT/usr/include -mkdir -p $RPM_BUILD_ROOT/usr/lib -mkdir -p $RPM_BUILD_ROOT/usr/libexec -mkdir -p $RPM_BUILD_ROOT/usr/lib/gcc-lib -mkdir -p $RPM_BUILD_ROOT/usr/local -mkdir -p $RPM_BUILD_ROOT/usr/local/bin -mkdir -p $RPM_BUILD_ROOT/usr/local/doc -mkdir -p $RPM_BUILD_ROOT/usr/local/etc -mkdir -p $RPM_BUILD_ROOT/usr/local/games -mkdir -p $RPM_BUILD_ROOT/usr/local/info -mkdir -p $RPM_BUILD_ROOT/usr/local/lib -mkdir -p $RPM_BUILD_ROOT/usr/local/man -mkdir -p $RPM_BUILD_ROOT/usr/local/man/man1 -mkdir -p $RPM_BUILD_ROOT/usr/local/man/man2 -mkdir -p $RPM_BUILD_ROOT/usr/local/man/man3 -mkdir -p $RPM_BUILD_ROOT/usr/local/man/man4 -mkdir -p $RPM_BUILD_ROOT/usr/local/man/man5 -mkdir -p $RPM_BUILD_ROOT/usr/local/man/man6 -mkdir -p $RPM_BUILD_ROOT/usr/local/man/man7 -mkdir -p $RPM_BUILD_ROOT/usr/local/man/man8 -mkdir -p $RPM_BUILD_ROOT/usr/local/sbin -mkdir -p $RPM_BUILD_ROOT/usr/local/src -mkdir -p $RPM_BUILD_ROOT/usr/sbin -mkdir -p $RPM_BUILD_ROOT/usr/share -mkdir -p $RPM_BUILD_ROOT/usr/share/doc -mkdir -p $RPM_BUILD_ROOT/usr/share/fonts -mkdir -p $RPM_BUILD_ROOT/usr/share/man -mkdir -p $RPM_BUILD_ROOT/usr/share/man/man0p -mkdir -p $RPM_BUILD_ROOT/usr/share/man/man1 -mkdir -p $RPM_BUILD_ROOT/usr/share/man/man1p -mkdir -p $RPM_BUILD_ROOT/usr/share/man/man2 -mkdir -p $RPM_BUILD_ROOT/usr/share/man/man3 -mkdir -p $RPM_BUILD_ROOT/usr/share/man/man3p -mkdir -p $RPM_BUILD_ROOT/usr/share/man/man4 -mkdir -p $RPM_BUILD_ROOT/usr/share/man/man5 -mkdir -p $RPM_BUILD_ROOT/usr/share/man/man6 -mkdir -p $RPM_BUILD_ROOT/usr/share/man/man7 -mkdir -p $RPM_BUILD_ROOT/usr/share/man/man8 -mkdir -p $RPM_BUILD_ROOT/usr/share/man/mann -mkdir -p $RPM_BUILD_ROOT/usr/share/misc -mkdir -p $RPM_BUILD_ROOT/usr/share/pixmaps -mkdir -p $RPM_BUILD_ROOT/usr/src -mkdir -p $RPM_BUILD_ROOT/usr/tmp -mkdir -p $RPM_BUILD_ROOT/var -mkdir -p $RPM_BUILD_ROOT/var/cache -mkdir -p $RPM_BUILD_ROOT/var/lib -mkdir -p $RPM_BUILD_ROOT/var/lock -mkdir -p $RPM_BUILD_ROOT/var/lock/subsys -mkdir -p $RPM_BUILD_ROOT/var/log -mkdir -p $RPM_BUILD_ROOT/var/preserve -mkdir -p $RPM_BUILD_ROOT/var/run -mkdir -p $RPM_BUILD_ROOT/var/spool -mkdir -p $RPM_BUILD_ROOT/var/state -mkdir -p $RPM_BUILD_ROOT/var/state/misc -mkdir -p $RPM_BUILD_ROOT/var/tmp +rm -rf %{buildroot} +mkdir %{buildroot} +cd %{buildroot} + +mkdir -p mnt/{floppy,cdrom} \ + bin boot \ + etc/{X11/{applnk,sysconfig,serverconfig,starthere},opt,xinetd.d,skel,sysconfig} \ + home initrd lib/modules %{_lib}/tls mnt opt proc root sbin selinux srv sys tmp \ + usr/{bin,etc,games,include,%{_lib}/{games,gcc-lib,tls},lib/{games,gcc-lib,locale},libexec,local/{bin,etc,games,lib,%{_lib},sbin,src,share/{man/man{1,2,3,4,5,6,7,8,9,n},info},libexec,include,},sbin,share/{applications,doc,dict,info,man/man{1,2,3,4,5,6,7,8,9,n},doc,misc,empty,pixmaps,xsessions},src,X11R6/{bin,include,lib,%{_lib}/tls,man,share}} \ + var/{empty,lib/{games,misc},local,lock/subsys,log,nis,preserve,run,spool/{mail,lpd},tmp,db,cache,opt,games,yp} + +ln -snf ../X11R6/bin usr/bin/X11 +ln -snf ../X11R6/lib/X11 usr/lib/X11 +ln -snf ../X11R6/%{_lib}/X11 usr/%{_lib}/X11 +ln -snf ../var/tmp usr/tmp +ln -snf spool/mail var/mail + %clean -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} %files -%defattr(755,root,root) -%dir / -%dir /bin -%dir /boot -%dir /etc -%dir /etc/init.d -%dir /etc/rc0.d -%dir /etc/rc1.d -%dir /etc/rc2.d -%dir /etc/rc3.d -%dir /etc/rc4.d -%dir /etc/rc5.d -%dir /etc/rc6.d -%dir /etc/sysconfig -%dir /home -%dir /home/users -%dir /initrd -%dir /lib -%dir /lib/modules +%defattr(0755,root,root) +/bin +/boot +/etc +/home +/initrd +/lib +%ifarch x86_64 ppc ppc64 sparc sparc64 s390 s390x +/%{_lib} +%endif %dir /mnt -%dir /mnt/cdrom -%dir /mnt/floppy +%ghost %config(missingok) %verify(not size md5 mode user link rdev group mtime) /mnt/cdrom +%ghost %config(missingok) %verify(not size md5 mode user link rdev group mtime) /mnt/floppy %dir /opt -%dir %attr(555,root,root) /proc -%dir %attr(700,root,root) /root -%dir /sbin -%dir %attr(1777,root,root) /tmp +%attr(555,root,root) /proc +%attr(750,root,root) /root +/sbin +/selinux +/srv +/sys +%attr(1777,root,root) /tmp %dir /usr -%dir /usr/bin -%dir /usr/include -%dir /usr/lib -%dir /usr/libexec -%dir /usr/lib/gcc-lib -%dir /usr/local -%dir /usr/local/bin -%dir /usr/local/doc -%dir /usr/local/etc -%dir /usr/local/games -%dir /usr/local/info -%dir /usr/local/lib -%dir /usr/local/man -%dir /usr/local/man/man1 -%dir /usr/local/man/man2 -%dir /usr/local/man/man3 -%dir /usr/local/man/man4 -%dir /usr/local/man/man5 -%dir /usr/local/man/man6 -%dir /usr/local/man/man7 -%dir /usr/local/man/man8 -%dir /usr/local/sbin -%dir /usr/local/src -%dir /usr/sbin +/usr/[^s]* +/usr/sbin %dir /usr/share -%dir /usr/share/doc -%dir /usr/share/fonts -%dir /usr/share/man -%dir /usr/share/man/man0p -%dir /usr/share/man/man1 -%dir /usr/share/man/man1p -%dir /usr/share/man/man2 -%dir /usr/share/man/man3 -%dir /usr/share/man/man3p -%dir /usr/share/man/man4 -%dir /usr/share/man/man5 -%dir /usr/share/man/man6 -%dir /usr/share/man/man7 -%dir /usr/share/man/man8 -%dir /usr/share/man/mann -%dir /usr/share/misc -%dir /usr/share/pixmaps -%dir /usr/src -%dir /usr/tmp +/usr/share/applications +/usr/share/doc +/usr/share/dict +%attr(555,root,root) %dir /usr/share/empty +/usr/share/info +/usr/share/man +/usr/share/misc +/usr/share/pixmaps +/usr/share/xsessions +/usr/src %dir /var -%dir /var/cache -%dir /var/lib -%dir %attr(775,root,uucp) /var/lock -%dir /var/lock/subsys -%dir /var/log -%dir /var/preserve -%dir /var/run +/var/db +/var/lib +/var/local +%dir %attr(0775,root,lock) /var/lock +%attr(755,root,root) /var/lock/subsys +/var/cache +/var/empty +/var/log +/var/mail +/var/nis +/var/opt +/var/preserve +/var/run %dir /var/spool -%dir /var/state -%dir /var/state/misc -%dir %attr(1777,root,root) /var/tmp +%attr(755,root,root) /var/spool/lpd +%attr(775,root,mail) /var/spool/mail +%attr(1777,root,root) /var/tmp +/var/yp %changelog -* Wed May 19 2004 tsintegrate 1.0-2ts -- current (1.0-2ok) integrated as 1.0-2ts for release 1.0-U1 +* Thu Mar 11 2004 Bill Nottingham 2.2.4-1 +- move /selinux here from SysVinit -* Fri May 14 2004 Omar Kilani 1.0-2ok -- Create and own /usr/libexec. -- Create and own /usr/share/fonts, /usr/share/misc, /usr/share/pixmaps. +* Tue Mar 02 2004 Elliot Lee +- rebuilt -* Wed Mar 25 2004 Omar Kilani 1.0-1ts -- Changed /root to 0700 -- tinysofa 1.0 +* Fri Feb 13 2004 Elliot Lee +- rebuilt -* Sun Jan 25 2004 Erlend Midttun 2.1.0-1tr -- Added POSIX man-pages directories. +* Thu Jan 15 2004 Bill Nottingham 2.2.3-1 +- move /usr/dict to /usr/share/dict (#113645) +- add /usr/lib/locale, /var/empty (#108686,#113036) +- add */%%{_lib}/tls (#113050) -* Wed Dec 10 2003 Erlend Midttun 1.9.2-4tr -- Big rebuild +* Fri Nov 21 2003 Bill Nottingham 2.2.2-1 +- add /sys -* Wed Jun 18 2003 Erlend Midttun 1.9.2-3tr -- Big rebuild +* Tue Oct 07 2003 Than Ngo 2.2.1-5 +- add /usr/share/xsessions -* Tue Jun 17 2003 Erlend Midttun 1.9.2-2em -- Added /etc/init.d and rc?.d. +* Wed Jun 04 2003 Elliot Lee +- rebuilt -* Fri Jun 6 2003 Erlend Midttun 1.9.2-1em -- Removed some directories not in FHS and some supplied by other packages. +* Wed Jan 22 2003 Tim Powers +- rebuilt -* Thu May 22 2003 Erlend Midttun 1.9.1-1em -- Removed .tar.gz file and just mkdir what we want. -- Set permissions in %files list instead. +* Sun Dec 1 2002 Tim Waugh 2.2.1-2 +- Really fix /var/mail -* Mon Mar 24 2003 Erlend Midttun 1.3.5-11em -- Rebuilt against glibc 2.3.2. +* Thu Nov 28 2002 Bill Nottingham 2.2.1-1 +- fix /var/mail -* Thu Feb 6 2003 Christian H. Toldnes 1.3.5-10ct -- Removed /mnt/.lockdev . Should be in initscripts. +* Wed Nov 20 2002 Bill Nottingham +- make arch specific, handle lib/lib64 stuff +- add /usr/libexec, /usr/share/applications -* Fri Nov 1 2002 Christian H. Toldnes 1.3.5-9ct -- Included /var/lock/subsys again. We like to have both. :) +* Fri Jun 21 2002 Tim Powers +- automated rebuild -* Wed Sep 4 2002 Christian H. Toldnes 1.3.5-8ct -- Fixed the chkconfig package, the link should never have existed. +* Thu May 23 2002 Tim Powers +- automated rebuild -* Mon Aug 19 2002 Goetz Bock 1.3.5-7bg -- chkconfig expects the files in /sbin/init.d, the core team wanted - /etc/init.d, so I've made a link now +* Wed Jan 09 2002 Tim Powers +- automated rebuild -* Sat Aug 18 2002 Goetz Bock 1.3.5-6bg -- added support for my new-initscripts (/mnt/.lockdev, and ln - /var/lock/subsys) +* Mon Aug 20 2001 Bill Nottingham +- %%ghost /mnt/cdrom, /mnt/floppy (fixes #52046) -* Sat Jun 8 2002 Gerald Dachs -- added initrd need by pivot_root call in mkinitrd +* Wed Aug 15 2001 Bill Nottingham +- add /usr/X11R6/share (#51830) -* Fri Jun 1 2001 Oystein Viggen -- Minor specfile cleanups +* Mon Aug 13 2001 Bill Nottingham +- prereq a particular version of the setup package -* Mon Feb 28 2000 Lars Gaarden -- remove all traces of X11 +* Thu Aug 9 2001 Bill Nottingham +- remove /mnt/cdrom, /mnt/floppy (updfstab will create them if needed) +- make it noarch again -* Mon Jan 24 2000 Tore Olsen -- moved /usr/man and /usr/info to /usr/share/* for FHS compliance +* Wed Aug 8 2001 Bill Nottingham +- /var/lock needs to be root.lock, not lock.lock +* Mon Aug 6 2001 Jeff Johnson +- lock.lock ownership, 0775 permissions, for /var/lock. + +* Tue Jul 17 2001 Bill Nottingham +- add /etc/sysconfig, /var/yp, /usr/share/pixmaps + +* Tue Jul 10 2001 Bill Nottingham +- add stuff under /etc/X11 +- remove extraneous /usr/X11R6/doc (#47490) + +* Mon Jun 25 2001 Bill Nottingham +- don't conflict with rpm + +* Fri Jun 22 2001 Bill Nottingham +- don't own /var/lib/rpm (#43315) +- add some stuff in /usr/local (#36522) + +* Thu Jun 21 2001 Bill Nottingham +- add /initrd + +* Thu Jun 07 2001 Florian La Roche +- remove noarch +- do not include /mnt/cdrom and /mnt/floppy for s390/s390x + +* Mon Apr 16 2001 Bill Nottingham +- take the group write off of /var/lock + +* Fri Jul 21 2000 Bill Nottingham +- add /usr/share/empty + +* Wed Jul 12 2000 Prospector +- automatic rebuild + +* Wed Jun 28 2000 Preston Brown +- remove /usr/doc + +* Thu Jun 22 2000 Preston Brown +- remove /usr/info + +* Sun Jun 19 2000 Bill Nottingham +- remove /usr/man + +* Sat Jun 17 2000 Bill Nottingham +- /var/spool/lpd should have normal perms (#12272) + +* Tue Jun 6 2000 Bill Nottingham +- add /etc/skel + +* Thu Jun 01 2000 Preston Brown +- add /var/spool/lpd to filesystem, owned by user/group lp, tight permissions + +* Tue May 23 2000 Trond Eivind Glomsr?d +- Added /etc/xinetd.d + +* Mon May 15 2000 Preston Brown +- /etc/opt, /usr/share/{info,man/man*,misc,doc} (FHS 2.1) +- added /var/games. Data should move from /var/lib/games to there (FHS 2.1) +- bump version up to 2.0 already! + +* Thu Apr 13 2000 Jakub Jelinek +- removed /var/state, added /var/opt, /var/mail for FHS 2.1 compliance + * Mon Aug 28 1999 Preston Brown - added /opt, /var/state, /var/cache for FHS compliance (#3966) @@ -294,4 +256,4 @@ * Wed Apr 16 1997 Erik Troan - Changed /proc to 555 -- Removed /var/spool/mqueue (which is owned by sendmail) \ No newline at end of file +- Removed /var/spool/mqueue (which is owned by sendmail) From svn at tinysofa.org Thu Jul 1 15:46:45 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:46:45 +1000 (EST) Subject: [tinysofa-svn] r2743 - in tinysofa/snapshot/finger/current: sources specs Message-ID: <20040701154645.8CD914E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:46:45 +1000 (Fri, 02 Jul 2004) New Revision: 2743 Removed: tinysofa/snapshot/finger/current/sources/bsd-finger-0.16-configure.patch Modified: tinysofa/snapshot/finger/current/specs/finger.spec Log: - Sync with 2.0. - Kept: - bsd-finger-0.16-allocbroken.patch: - bsd-finger-0.16-pts.patch: - bsd-finger-0.17-exact.patch: - bsd-finger-0.17-rfc742.patch: - bsd-finger-0.17-strip.patch: - bsd-finger-0.17-time.patch: - bsd-finger-0.17-typo.patch: - bsd-finger-0.17-usagi-ipv6.patch: - bsd-finger-0.17.tar.gz: - finger-xinetd: - Removed: - bsd-finger-0.16-configure.patch: Deleted: tinysofa/snapshot/finger/current/sources/bsd-finger-0.16-configure.patch =================================================================== --- tinysofa/snapshot/finger/current/sources/bsd-finger-0.16-configure.patch 2004-07-01 15:46:42 UTC (rev 2742) +++ tinysofa/snapshot/finger/current/sources/bsd-finger-0.16-configure.patch 2004-07-01 15:46:45 UTC (rev 2743) @@ -1,11 +0,0 @@ ---- bsd-finger-0.16/configure.old Mon May 29 18:57:38 2000 -+++ bsd-finger-0.16/configure Mon May 29 18:57:56 2000 -@@ -58,7 +58,7 @@ - - BINDIR="$EXECPREFIX/bin" - SBINDIR="$EXECPREFIX/sbin" --MANDIR="$PREFIX/man" -+MANDIR="$PREFIX/share/man" - - echo "Directories: $BINDIR $SBINDIR $MANDIR " - Modified: tinysofa/snapshot/finger/current/specs/finger.spec =================================================================== --- tinysofa/snapshot/finger/current/specs/finger.spec 2004-07-01 15:46:42 UTC (rev 2742) +++ tinysofa/snapshot/finger/current/specs/finger.spec 2004-07-01 15:46:45 UTC (rev 2743) @@ -1,9 +1,9 @@ Summary: The finger client. Name: finger Version: 0.17 -Release: 12jh +Release: 21ts License: BSD -Group: tinysofa/main +Group: Applications/Internet Source: ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/bsd-finger-%{version}.tar.gz Source1: finger-xinetd Patch5: bsd-finger-0.16-pts.patch @@ -34,12 +34,12 @@ Finger is a utility which allows users to see information about system users (login name, home directory, name, how long they've been logged in to the system, etc.). The finger-server package includes a standard -finger server. The server daemon (fingerd) runs from xinetd. +finger server. The server daemon (fingerd) runs from /etc/inetd.conf, +which must be modified to disable finger requests. You should install finger-server if your system is used by multiple users and you'd like finger information to be available. - %prep %setup -q -n bsd-finger-%{version} %patch5 -p1 -b .pts @@ -52,9 +52,8 @@ %patch12 -p1 -b .typo %patch13 -p1 -b .strip - %build -%configure --enable-ipv6 +sh configure --enable-ipv6 perl -pi -e ' s,^CC=.*$,CC=cc,; s,-O2,-fPIC \$(RPM_OPT_FLAGS),; @@ -64,24 +63,22 @@ s,^LDFLAGS=.*$,LDFLAGS=-pie,; ' MCONFIG -%make +make %install -%{__mkdir_p} \ - %{buildroot}%{_bindir} \ - %{buildroot}%{_mandir}/man{1,8} \ - %{buildroot}%{_sbindir} \ - %{buildroot}%{_sysconfdir}/xinetd.d +rm -rf ${RPM_BUILD_ROOT} +mkdir -p ${RPM_BUILD_ROOT}%{_bindir} +mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man{1,8} +mkdir -p ${RPM_BUILD_ROOT}%{_sbindir} -install -m 644 %SOURCE1 %{buildroot}%{_sysconfdir}/xinetd.d/finger +mkdir -p ${RPM_BUILD_ROOT}/etc/xinetd.d +install -m 644 %SOURCE1 ${RPM_BUILD_ROOT}/etc/xinetd.d/finger -make INSTALLROOT=%{buildroot} install +make INSTALLROOT=${RPM_BUILD_ROOT} install - %clean -%clean_buildroot +rm -rf ${RPM_BUILD_ROOT} - %files %defattr(-,root,root) %attr(0711,root,root) %{_bindir}/finger @@ -89,16 +86,12 @@ %files server %defattr(-,root,root) -%config(noreplace) %{_sysconfdir}/xinetd.d/finger +%config(noreplace) /etc/xinetd.d/finger %attr(0711,root,root) %{_sbindir}/in.fingerd %{_mandir}/man8/in.fingerd.8* %{_mandir}/man8/fingerd.8* - %changelog -* Tue Jun 15 2004 Elliot Lee -- rebuilt - * Wed Feb 25 2004 Phil Knirsch 0.17-21 - rebuilt - Made fingerd PIE. From svn at tinysofa.org Thu Jul 1 15:46:47 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:46:47 +1000 (EST) Subject: [tinysofa-svn] r2744 - in tinysofa/snapshot/flex/current: sources specs Message-ID: <20040701154647.AA3254E817D@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:46:47 +1000 (Fri, 02 Jul 2004) New Revision: 2744 Added: tinysofa/snapshot/flex/current/sources/flex-2.5.4a2.patch Modified: tinysofa/snapshot/flex/current/specs/flex.spec Log: - Sync with 2.0. - Kept: - flex-2.5.4-glibc22.patch: - flex-2.5.4a-gcc3.patch: - flex-2.5.4a-gcc31.patch: - flex-2.5.4a-skel.patch: - flex-2.5.4a.tar.gz: - Added: - flex-2.5.4a2.patch: Added: tinysofa/snapshot/flex/current/sources/flex-2.5.4a2.patch =================================================================== --- tinysofa/snapshot/flex/current/sources/flex-2.5.4a2.patch 2004-07-01 15:46:45 UTC (rev 2743) +++ tinysofa/snapshot/flex/current/sources/flex-2.5.4a2.patch 2004-07-01 15:46:47 UTC (rev 2744) @@ -0,0 +1,103 @@ +diff -r -c4 flex-2.5.4/flex.skl flex-2.5.4P/flex.skl +*** flex-2.5.4/flex.skl Wed Sep 11 01:58:54 1996 +--- flex-2.5.4P/flex.skl Thu Oct 24 19:25:30 2002 +*************** +*** 969,976 **** +--- 969,977 ---- + %* + + + %- ++ #ifndef YY_NO_INPUT + #ifdef __cplusplus + static int yyinput() + #else + static int input() +*************** +*** 1044,1052 **** + %% update BOL and yylineno + + return c; + } +! + + %- + #ifdef YY_USE_PROTOS + void yyrestart( FILE *input_file ) +--- 1045,1055 ---- + %% update BOL and yylineno + + return c; + } +! %- +! #endif /* YY_NO_INPUT */ +! %* + + %- + #ifdef YY_USE_PROTOS + void yyrestart( FILE *input_file ) +diff -r -c4 flex-2.5.4/initscan.c flex-2.5.4P/initscan.c +*** flex-2.5.4/initscan.c Sun Jul 27 04:32:18 1997 +--- flex-2.5.4P/initscan.c Tue Oct 15 11:51:22 2002 +*************** +*** 3127,3134 **** +--- 3127,3135 ---- + } + #endif /* ifndef YY_NO_UNPUT */ + + ++ #ifndef YY_NO_INPUT + #ifdef __cplusplus + static int yyinput() + #else + static int input() +*************** +*** 3199,3206 **** +--- 3200,3208 ---- + yy_current_buffer->yy_at_bol = (c == '\n'); + + return c; + } ++ #endif /* ifndef YY_NO_INPUT */ + + + #ifdef YY_USE_PROTOS + void yyrestart( FILE *input_file ) +diff -r -c4 flex-2.5.4/skel.c flex-2.5.4P/skel.c +*** flex-2.5.4/skel.c Wed Sep 11 02:00:38 1996 +--- flex-2.5.4P/skel.c Thu Oct 24 19:25:32 2002 +*************** +*** 974,981 **** +--- 974,982 ---- + "%*", + "", + "", + "%-", ++ "#ifndef YY_NO_INPUT", + "#ifdef __cplusplus", + "static int yyinput()", + "#else", + "static int input()", +*************** +*** 1049,1057 **** + "%% update BOL and yylineno", + "", + " return c;", + " }", +! "", + "", + "%-", + "#ifdef YY_USE_PROTOS", + "void yyrestart( FILE *input_file )", +--- 1050,1060 ---- + "%% update BOL and yylineno", + "", + " return c;", + " }", +! "%-", +! "#endif /* YY_NO_INPUT */", +! "%*", + "", + "%-", + "#ifdef YY_USE_PROTOS", + "void yyrestart( FILE *input_file )", Modified: tinysofa/snapshot/flex/current/specs/flex.spec =================================================================== --- tinysofa/snapshot/flex/current/specs/flex.spec 2004-07-01 15:46:45 UTC (rev 2743) +++ tinysofa/snapshot/flex/current/specs/flex.spec 2004-07-01 15:46:47 UTC (rev 2744) @@ -1,18 +1,22 @@ Summary: A tool for creating scanners (text pattern recognizers). Name: flex Version: 2.5.4a -Release: 20ts -License: GPL -Group: tinysofa official +Release: 32ts +License: BSD +Group: Development/Tools +Prefix: %{_prefix} +BuildRoot: %{_tmppath}/%{name}-root + Source: ftp://ftp.gnu.org/non-gnu/flex/flex-2.5.4a.tar.gz + Patch0: flex-2.5.4a-skel.patch Patch1: flex-2.5.4-glibc22.patch Patch2: flex-2.5.4a-gcc3.patch Patch3: flex-2.5.4a-gcc31.patch -Prefix: %{_prefix} -BuildRoot: %{_tmppath}/%{name}-root -BuildRequires: byacc +Patch4: flex-2.5.4a2.patch +BuildPrereq: autoconf byacc + %description The flex program generates scanners. Scanners are programs which can recognize lexical patterns in text. Flex takes pairs of regular @@ -28,71 +32,113 @@ application development. %prep -%setup -q -n flex-2.5.4 +%setup -q -n %{name}-2.5.4 %patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 +%patch1 -p1 -b .glibc22 +%patch2 -p1 -b .glib3 +%patch3 -p1 -b .gcc31 +%patch4 -p1 -b .yynoinput %build -CFLAGS="$RPM_OPT_FLAGS" LDFLAGS=-s ./configure --prefix=/usr - +autoconf +%configure make %install -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != "/" ] && rm -rf "$RPM_BUILD_ROOT" +rm -rf $RPM_BUILD_ROOT -make prefix=${RPM_BUILD_ROOT}%{_prefix} install +%makeinstall mandir=$RPM_BUILD_ROOT/%{_mandir}/man1 ( cd ${RPM_BUILD_ROOT} - strip .%{_prefix}/bin/flex - ln -sf flex .%{_prefix}/bin/lex - mkdir -p ./usr/share/man - mv ./usr/man/* ./usr/share/man - ln -s flex.1 .%{_prefix}/share/man/man1/lex.1 - ln -s flex.1 .%{_prefix}/share/man/man1/flex++.1 - ln -s libfl.a .%{_prefix}/lib/libl.a + ln -sf flex .%{_bindir}/lex + ln -s flex.1 .%{_mandir}/man1/lex.1 + ln -s flex.1 .%{_mandir}/man1/flex++.1 + ln -s libfl.a .%{_libdir}/libl.a ) %clean -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT +rm -rf ${RPM_BUILD_ROOT} %files %defattr(-,root,root) %doc COPYING NEWS README -%{_prefix}/bin/lex -%{_prefix}/bin/flex -%{_prefix}/bin/flex++ -%{_prefix}/share/man/man1/* -%{_prefix}/lib/libl.a -%{_prefix}/lib/libfl.a -%{_prefix}/include/FlexLexer.h +%{_bindir}/* +%{_mandir}/man1/* +%{_libdir}/*.a +%{_includedir}/FlexLexer.h %changelog -* Wed May 19 2004 tsintegrate 2.5.4a-20ts -- current (2.5.4a-19ts) integrated as 2.5.4a-20ts for release 1.0-U1 +* Tue Jun 15 2004 Elliot Lee +- rebuilt -* Tue May 11 2004 Omar Kilani -- Add BuildRequires byacc. +* Tue Mar 02 2004 Elliot Lee +- rebuilt -* Wed Dec 3 2003 Erlend Midttun 2.5.4a-16tr -- Big rebuild +* Fri Feb 13 2004 Elliot Lee +- rebuilt -* Wed Jun 18 2003 Erlend Midttun 2.5.4a-15tr -- Big rebuild +* Wed Jun 04 2003 Elliot Lee +- rebuilt -* Mon Mar 24 2003 Erlend Midttun 2.5.4a-14em -- Rebuilt against glibc 2.3.2. +* Wed Jan 22 2003 Tim Powers +- rebuilt -* Fri Sep 13 2002 Roland Kruse 2.5.4a-13rk -- Added patches for glibc 2.2 and gcc 3.x (Patch[1-3]) +* Tue Jan 7 2003 Jeff Johnson 2.5.4a-28 +- don't include -debuginfo files in package. -* Wed Jul 24 2002 Daniel Meyer 2.5.4a-12dm -- rebuild for Trustix Secure Linux 2.0 +* Mon Nov 4 2002 Than Ngo 2.5.4a-27 +- YY_NO_INPUT patch from Jean Marie -* Mon Feb 28 2000 Lars Gaarden -- moved man pages to /usr/share, FHS +* Fri Jun 21 2002 Tim Powers +- automated rebuild +* Tue Jun 18 2002 Than Ngo 2.5.4a-25 +- don't forcibly strip binaries + +* Thu May 23 2002 Tim Powers +- automated rebuild + +* Tue Apr 2 2002 Than Ngo 2.5.4a-23 +- More ISO C++ 98 fixes (#59670) + +* Tue Feb 26 2002 Than Ngo 2.5.4a-22 +- rebuild in new enviroment + +* Wed Feb 20 2002 Bernhard Rosenkraenzer 2.5.4a-21 +- More ISO C++ 98 fixes (#59670) + +* Tue Feb 19 2002 Bernhard Rosenkraenzer 2.5.4a-20 +- Fix ISO C++ 98 compliance (#59670) + +* Wed Jan 23 2002 Than Ngo 2.5.4a-19 +- fixed #58643 + +* Wed Jan 09 2002 Tim Powers +- automated rebuild + +* Tue Nov 6 2001 Than Ngo 2.5.4a-17 +- fixed for working with gcc 3 (bug #55778) + +* Sat Oct 13 2001 Than Ngo 2.5.4a-16 +- fix wrong License (bug #54574) + +* Sun Jun 24 2001 Elliot Lee +- Bump release + rebuild. + +* Sat Sep 30 2000 Bernhard Rosenkraenzer +- Fix generation of broken code (conflicting isatty() prototype w/ glibc 2.2) + This broke, among other things, the kdelibs 2.0 build +- Fix source URL + +* Thu Sep 7 2000 Jeff Johnson +- FHS packaging (64bit systems need to use libdir). + +* Wed Jul 12 2000 Prospector +- automatic rebuild + +* Tue Jun 6 2000 Bill Nottingham +- rebuild, FHS stuff. + * Thu Feb 3 2000 Bill Nottingham - handle compressed man pages @@ -121,4 +167,4 @@ - built against glibc * Thu Mar 20 1997 Michael Fulbright -- Updated to v. 2.5.4 \ No newline at end of file +- Updated to v. 2.5.4 From svn at tinysofa.org Thu Jul 1 15:46:49 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:46:49 +1000 (EST) Subject: [tinysofa-svn] r2745 - tinysofa/snapshot/ftp/current/specs Message-ID: <20040701154649.A11384E817E@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:46:49 +1000 (Fri, 02 Jul 2004) New Revision: 2745 Modified: tinysofa/snapshot/ftp/current/specs/ftp.spec Log: - Sync with 2.0. - Kept: - netkit-ftp-0.17-acct.patch: - netkit-ftp-0.17-pre20000412.pasv-security.patch: - netkit-ftp-0.17.tar.bz2: - netkit-ftp.usagi-ipv6.patch: Modified: tinysofa/snapshot/ftp/current/specs/ftp.spec =================================================================== --- tinysofa/snapshot/ftp/current/specs/ftp.spec 2004-07-01 15:46:47 UTC (rev 2744) +++ tinysofa/snapshot/ftp/current/specs/ftp.spec 2004-07-01 15:46:49 UTC (rev 2745) @@ -1,15 +1,15 @@ Summary: The standard UNIX FTP (File Transfer Protocol) client. Name: ftp Version: 0.17 -Release: 12jh +Release: 19ts License: BSD -Group: tinysofa/main +Group: Applications/Internet Source0: ftp://ftp.uk.linux.org/pub/linux/Networking/netkit-devel/netkit-ftp-%{version}.tar.bz2 Patch1: netkit-ftp-0.17-pre20000412.pasv-security.patch Patch2: netkit-ftp-0.17-acct.patch Patch3: netkit-ftp.usagi-ipv6.patch -BuildRoot: /var/tmp/%{name}-%{version}-root -BuildRequires: gcc, glibc-devel, readline-devel, ncurses-devel, perl +BuildRoot: %{_tmppath}/%{name}-%{version}-root +BuildRequires: gcc, glibc-devel, readline-devel, ncurses-devel %description The ftp package provides the standard UNIX command-line FTP (File @@ -19,14 +19,12 @@ If your system is on a network, you should install ftp in order to do file transfers. - %prep %setup -q -n netkit-ftp-%{version} %patch1 -p1 %patch2 -p1 -b .acct %patch3 -p1 -b .ipv6 - %build sh configure --with-c-compiler=gcc --enable-ipv6 perl -pi -e ' @@ -37,22 +35,19 @@ s,^SBINDIR=.*$,SBINDIR=%{_sbindir},; ' MCONFIG -%make +make %{?_smp_mflags} - %install -%{__mkdir_p} \ - %{buildroot}%{_bindir} \ - %{buildroot}%{_mandir}/man1 \ - %{buildroot}%{_mandir}/man5 +rm -rf ${RPM_BUILD_ROOT} +mkdir -p ${RPM_BUILD_ROOT}%{_bindir} +mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man1 +mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man5 -make INSTALLROOT=%{buildroot} install +make INSTALLROOT=${RPM_BUILD_ROOT} install - %clean -%clean_buildroot +rm -rf ${RPM_BUILD_ROOT} - %files %defattr(-,root,root) %{_bindir}/ftp @@ -61,7 +56,6 @@ %{_mandir}/man1/pftp.* %{_mandir}/man5/netrc.* - %changelog * Fri Feb 13 2004 Elliot Lee - rebuilt From svn at tinysofa.org Thu Jul 1 15:46:52 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:46:52 +1000 (EST) Subject: [tinysofa-svn] r2746 - in tinysofa/snapshot/gawk/current: sources specs Message-ID: <20040701154652.25EF84E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:46:51 +1000 (Fri, 02 Jul 2004) New Revision: 2746 Added: tinysofa/snapshot/gawk/current/sources/gawk-3.1.3-fix1.patch tinysofa/snapshot/gawk/current/sources/gawk-3.1.3-fix2.patch tinysofa/snapshot/gawk/current/sources/gawk-3.1.3-fix3.patch tinysofa/snapshot/gawk/current/sources/gawk-3.1.3-fix4.patch tinysofa/snapshot/gawk/current/sources/gawk-3.1.3-fix5.patch tinysofa/snapshot/gawk/current/sources/gawk-3.1.3-getpgrp_void.patch Removed: tinysofa/snapshot/gawk/current/sources/gawk-3.1.3-doc.tar.gz Modified: tinysofa/snapshot/gawk/current/specs/gawk.spec Log: - Sync with 2.0. - Kept: - gawk-3.1.3-ps.tar.gz: - gawk-3.1.3.tar.bz2: - Added: - gawk-3.1.3-fix1.patch: - gawk-3.1.3-fix2.patch: - gawk-3.1.3-fix3.patch: - gawk-3.1.3-fix4.patch: - gawk-3.1.3-fix5.patch: - gawk-3.1.3-getpgrp_void.patch: - Removed: - gawk-3.1.3-doc.tar.gz: Deleted: tinysofa/snapshot/gawk/current/sources/gawk-3.1.3-doc.tar.gz =================================================================== (Binary files differ) Added: tinysofa/snapshot/gawk/current/sources/gawk-3.1.3-fix1.patch =================================================================== --- tinysofa/snapshot/gawk/current/sources/gawk-3.1.3-fix1.patch 2004-07-01 15:46:49 UTC (rev 2745) +++ tinysofa/snapshot/gawk/current/sources/gawk-3.1.3-fix1.patch 2004-07-01 15:46:51 UTC (rev 2746) @@ -0,0 +1,22 @@ +In two places in io.c, gawk's child process exits with status 126 if +execl("/bin/sh") fails with errno != ENOENT, but in the other place +it merely exits with status 127. This is inconsistent with common +POSIX practice. Here is a patch. + +2003-07-10 Paul Eggert + + * io.c (two_way_open): If /bin/sh cannot be executed, exit + with status 126 consistently. + + +--- gawk-3.1.3/io.c.lr 2003-07-04 19:50:58.000000000 +0200 ++++ gawk-3.1.3/io.c 2003-07-15 16:50:39.000000000 +0200 +@@ -1778,7 +1778,7 @@ + signal(SIGPIPE, SIG_DFL); + + execl("/bin/sh", "sh", "-c", str, NULL); +- _exit(127); ++ _exit(errno == ENOENT ? 127 : 126); + + case -1: + save_errno = errno; Added: tinysofa/snapshot/gawk/current/sources/gawk-3.1.3-fix2.patch =================================================================== --- tinysofa/snapshot/gawk/current/sources/gawk-3.1.3-fix2.patch 2004-07-01 15:46:49 UTC (rev 2745) +++ tinysofa/snapshot/gawk/current/sources/gawk-3.1.3-fix2.patch 2004-07-01 15:46:51 UTC (rev 2746) @@ -0,0 +1,38 @@ +This patch incorporates the fix I posted recently. I think this +should do the trick for some of the problems that have been reported +(privately) to me having to do with function parameters coming from +uninitialized global variables. + +GNU/Linux vendors wishing to ship gawk 3.1.3 should (a) keep an eye +on this list in case any more major bugs show up, and (b) incorporate +this fix into what gets shipped. + +Thanks + +Arnold Robbins +--- awkgram.y ++++ awkgram.y +@@ -3006,10 +3006,10 @@ + */ + NODE *n; + +- if (type == Node_var) +- n = node(Nnull_string, type, (NODE *) NULL); +- else ++ if (type == Node_var_array) + n = node((NODE *) NULL, type, (NODE *) NULL); ++ else ++ n = node(Nnull_string, type, (NODE *) NULL); + + return install(name, n); + } +--- eval.c ++++ eval.c +@@ -848,6 +848,7 @@ + fatal(_("attempt to use array `%s' in a scalar context"), + array_vname(tree)); + tree->orig_array->type = Node_var; ++ tree->orig_array->var_value = Nnull_string; + /* fall through */ + case Node_var_new: + tree->type = Node_var; Added: tinysofa/snapshot/gawk/current/sources/gawk-3.1.3-fix3.patch =================================================================== --- tinysofa/snapshot/gawk/current/sources/gawk-3.1.3-fix3.patch 2004-07-01 15:46:49 UTC (rev 2745) +++ tinysofa/snapshot/gawk/current/sources/gawk-3.1.3-fix3.patch 2004-07-01 15:46:51 UTC (rev 2746) @@ -0,0 +1,13 @@ +--- gawk-3.1.3/regcomp.c ++++ gawk-3.1.3/regcomp.c +@@ -2407,8 +2407,8 @@ + ? __btowc (start_ch) : start_elem->opr.wch); + end_wc = ((end_elem->type == SB_CHAR || end_elem->type == COLL_SYM) + ? __btowc (end_ch) : end_elem->opr.wch); +- cmp_buf[0] = start_wc; +- cmp_buf[4] = end_wc; ++ cmp_buf[0] = start_wc != WEOF ? start_wc : start_ch; ++ cmp_buf[4] = end_wc != WEOF ? end_wc : end_ch; + if (wcscoll (cmp_buf, cmp_buf + 4) > 0) + return REG_ERANGE; + Added: tinysofa/snapshot/gawk/current/sources/gawk-3.1.3-fix4.patch =================================================================== --- tinysofa/snapshot/gawk/current/sources/gawk-3.1.3-fix4.patch 2004-07-01 15:46:49 UTC (rev 2745) +++ tinysofa/snapshot/gawk/current/sources/gawk-3.1.3-fix4.patch 2004-07-01 15:46:51 UTC (rev 2746) @@ -0,0 +1,14 @@ +--- gawk-3.1.3/regcomp.c.lr 2003-09-22 09:38:06.000000000 +0200 ++++ gawk-3.1.3/regcomp.c 2003-09-22 09:50:38.000000000 +0200 +@@ -2965,7 +2965,10 @@ + #endif /* RE_ENABLE_I18N */ + start_elem.opr.name, syntax); + if (BE (ret != REG_NOERROR, 0)) +- goto parse_bracket_exp_espace; ++ { ++ *err = ret; ++ goto parse_bracket_exp_free_return; ++ } + break; + default: + assert (0); Added: tinysofa/snapshot/gawk/current/sources/gawk-3.1.3-fix5.patch =================================================================== --- tinysofa/snapshot/gawk/current/sources/gawk-3.1.3-fix5.patch 2004-07-01 15:46:49 UTC (rev 2745) +++ tinysofa/snapshot/gawk/current/sources/gawk-3.1.3-fix5.patch 2004-07-01 15:46:51 UTC (rev 2746) @@ -0,0 +1,45 @@ +--- gawk-3.1.3/awkgram.y.lr 2003-09-22 15:49:36.000000000 +0200 ++++ gawk-3.1.3/awkgram.y 2003-09-22 15:51:46.000000000 +0200 +@@ -1308,21 +1308,21 @@ + int offset; + int linelen; + +- offset = lexptr - lexeme; ++ offset = lexeme - lexptr; + for (scan = lexeme; scan > lexptr_begin; scan--) + if (*scan == '\n') { + scan++; + break; + } + linelen = lexptr - scan; +- if (linelen > SLOP) +- linelen = SLOP; +- thisline = buf + SLOP - linelen; +- memcpy(thisline, scan, linelen); +- lexeme = buf + SLOP - offset; ++ thisline = buf; ++ memmove(thisline, scan, linelen); ++ lexeme = thisline + (lexeme - lexptr_begin); ++ lexptr = thisline + (lexptr - lexptr_begin); ++ lexend = thisline + (lexend - lexptr_begin); + lexptr_begin = thisline; + } +- n = read(fd, buf + SLOP, len); ++ n = read(fd, lexptr_begin, len); + if (n == -1) + fatal(_("can't read sourcefile `%s' (%s)"), + source, strerror(errno)); +@@ -1339,12 +1339,10 @@ + close(fd); + samefile = FALSE; + nextfile++; +- if (lexeme) +- *lexeme = '\0'; + len = 0; + goto again; + } +- lexptr = buf + SLOP; ++ lexptr = lexptr_begin; + lexend = lexptr + n; + return buf; + } Added: tinysofa/snapshot/gawk/current/sources/gawk-3.1.3-getpgrp_void.patch =================================================================== --- tinysofa/snapshot/gawk/current/sources/gawk-3.1.3-getpgrp_void.patch 2004-07-01 15:46:49 UTC (rev 2745) +++ tinysofa/snapshot/gawk/current/sources/gawk-3.1.3-getpgrp_void.patch 2004-07-01 15:46:51 UTC (rev 2746) @@ -0,0 +1,45 @@ +--- gawk-3.1.3/main.c.getpgrp_void 2004-01-26 12:08:26.000000000 +0100 ++++ gawk-3.1.3/main.c 2004-01-26 12:15:22.000000000 +0100 +@@ -874,14 +874,11 @@ + + PROCINFO_node = install("PROCINFO", + node((NODE *) NULL, Node_var_array, (NODE *) NULL)); +- + #ifdef GETPGRP_VOID +-#define getpgrp_arg() /* nothing */ ++ value = getpgrp(); + #else +-#define getpgrp_arg() getpid() ++ value = getpgrp(getpid()); + #endif +- +- value = getpgrp(getpgrp_arg()); + aptr = assoc_lookup(PROCINFO_node, tmp_string("pgrpid", 6), FALSE); + *aptr = make_number(value); + +--- gawk-3.1.3/io.c.getpgrp_void 2004-01-26 12:08:36.000000000 +0100 ++++ gawk-3.1.3/io.c 2004-01-26 12:16:04.000000000 +0100 +@@ -1422,11 +1422,6 @@ + return 0; + } + +-#ifdef GETPGRP_VOID +-#define getpgrp_arg() /* nothing */ +-#else +-#define getpgrp_arg() getpid() +-#endif + + /* pidopen --- "open" /dev/pid, /dev/ppid, and /dev/pgrpid */ + +@@ -1440,7 +1435,11 @@ + warning(_("use `PROCINFO[\"%s\"]' instead of `%s'"), cp, name); + + if (name[6] == 'g') ++#ifdef GETPGRP_VOID ++ sprintf(tbuf, "%d\n", (int) getpgrp()); ++#else + sprintf(tbuf, "%d\n", (int) getpgrp(getpgrp_arg())); ++#endif + else if (name[6] == 'i') + sprintf(tbuf, "%d\n", (int) getpid()); + else Modified: tinysofa/snapshot/gawk/current/specs/gawk.spec =================================================================== --- tinysofa/snapshot/gawk/current/specs/gawk.spec 2004-07-01 15:46:49 UTC (rev 2745) +++ tinysofa/snapshot/gawk/current/specs/gawk.spec 2004-07-01 15:46:51 UTC (rev 2746) @@ -1,149 +1,216 @@ Summary: The GNU version of the awk text processing utility. Name: gawk Version: 3.1.3 -Release: 5ts +Release: 7ts License: GPL -Group: tinysofa official +Group: Applications/Text Source0: ftp://ftp.gnu.org/gnu/gawk/gawk-%{version}.tar.bz2 Source1: ftp://ftp.gnu.org/gnu/gawk/gawk-%{version}-ps.tar.gz -Source2: ftp://ftp.gnu.org/gnu/gawk/gawk-%{version}-doc.tar.gz -BuildRequires: texinfo >= 4.6 -BuildRoot: %{_tmppath}/%{name}-root -Provides: awk +Patch3: gawk-3.1.3-fix1.patch +Patch4: gawk-3.1.3-fix2.patch +Patch5: gawk-3.1.3-fix3.patch +Patch6: gawk-3.1.3-fix4.patch +Patch7: gawk-3.1.3-fix5.patch +Patch8: gawk-3.1.3-getpgrp_void.patch +Prereq: /sbin/install-info +Requires: /bin/mktemp +Buildroot: %{_tmppath}/%{name}-%{version}-root %description The gawk packages contains the GNU version of awk, a text processing -utility. Awk interprets a special-purpose programming language to do -quick and easy text pattern matching and reformatting jobs. Gawk should -be upwardly compatible with the Bell Labs research version of awk and -is almost completely compliant with the 1993 POSIX 1003.2 standard for -awk. +utility. Awk interprets a special-purpose programming language to do +quick and easy text pattern matching and reformatting jobs. Install the gawk package if you need a text processing utility. Gawk is considered to be a standard Linux tool for processing text. -%package doc -Summary: GAWK documents -Group: tinysofa official -Prereq: htmlinfo - -%description doc -The documentation for the gawk package - %prep -%setup -q -b 1 -b 2 +%setup -q -b 1 +%patch3 -p1 -b .fix1 +%patch4 -p0 -b .fix2 +%patch5 -p1 -b .fix3 +%patch6 -p1 -b .fix4 +%patch7 -p1 -b .fix5 +%patch8 -p1 -b .getpgrp_void %build -%configure --bindir=/bin --libexecdir=/usr/lib +%configure make -cd doc -makeinfo --html --force --no-split gawk.texi || exit 0 +make check %install -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != "/" ] && rm -rf "$RPM_BUILD_ROOT" -mkdir -p $RPM_BUILD_ROOT/usr/share/html/{gawk,gawkinet} -make DESTDIR=${RPM_BUILD_ROOT} install -strip ${RPM_BUILD_ROOT}/bin/gawk || : -strip ${RPM_BUILD_ROOT}%{_prefix}/lib/awk/* || : +rm -rf $RPM_BUILD_ROOT +%makeinstall bindir=${RPM_BUILD_ROOT}/bin \ + libexecdir=${RPM_BUILD_ROOT}%{_libexecdir}/awk \ + datadir=${RPM_BUILD_ROOT}%{_datadir}/awk -install -m 644 doc/gawk.html $RPM_BUILD_ROOT/usr/share/html/gawk/ +mkdir -p $RPM_BUILD_ROOT%{_bindir} +ln -sf gawk.1.gz $RPM_BUILD_ROOT%{_mandir}/man1/awk.1.gz +ln -sf ../../bin/gawk $RPM_BUILD_ROOT%{_bindir}/awk +ln -sf ../../bin/gawk $RPM_BUILD_ROOT%{_bindir}/gawk +rm -f $RPM_BUILD_ROOT/bin/{,p}gawk-%{version} -( cd $RPM_BUILD_ROOT - rm -f .%{_infodir}/dir - mkdir -p .%{_prefix}/bin - ln -sf gawk.1 .%{_mandir}/man1/awk.1 -) -( cd $RPM_BUILD_ROOT - mkdir -p usr/bin - cd usr/bin - ln -s ../../bin/gawk awk -) -rm -f $RPM_BUILD_ROOT/bin/*-%{version} || : +rm -f $RPM_BUILD_ROOT%{_infodir}/dir +mv -f $RPM_BUILD_ROOT%{_datadir}/awk/locale $RPM_BUILD_ROOT%{_datadir}/locale -rm -rf $RPM_BUILD_ROOT/usr/share/info +%find_lang %name -%find_lang %{name} - %clean -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT +rm -rf $RPM_BUILD_ROOT -%post doc -/usr/sbin/htmlinfo_update.sh +%post +if [ -f %{_infodir}/gawk.info.gz ]; then + /sbin/install-info %{_infodir}/gawk.info.gz %{_infodir}/dir +fi -%postun doc -/usr/sbin/htmlinfo_update.sh +%preun +if [ $1 = 0 -a -f %{_infodir}/gawk.info.gz ]; then + /sbin/install-info --delete %{_infodir}/gawk.info.gz %{_infodir}/dir +fi %files -f %{name}.lang -%defattr(-,root,root) +%defattr(-,root,root,-) +%doc README COPYING FUTURES INSTALL LIMITATIONS NEWS +%doc README_d POSIX.STD doc/gawk.ps doc/awkcard.ps /bin/* -/usr/bin/awk +%{_bindir}/* %{_mandir}/man1/* -%{_prefix}/lib/awk -%{_prefix}/share/awk +%{_infodir}/gawk.info* +%{_libexecdir}/awk +%{_datadir} -%files doc -%defattr(-,root,root) -%doc README COPYING FUTURES INSTALL LIMITATIONS NEWS -%doc README_d POSIX.STD -/usr/share/html/gawk +%changelog +* Fri Feb 13 2004 Elliot Lee +- rebuilt +* Mon Jan 26 2004 Thomas Woerner 3.1.3-6 +- fixed getpgrp_void problem (#114246) +- removed old patches -%changelog -* Wed May 19 2004 tsintegrate 3.1.3-5ts -- current (3.1.3-4ts) integrated as 3.1.3-5ts for release 1.0-U1 +* Fri Jan 09 2004 Florian La Roche +- add a "make check" -* Tue May 11 2004 Omar Kilani -- Add --force to makeinfo flags. +* Mon Dec 08 2003 Florian La Roche +- disabled "shutup" patch to warn about wrong awk scripts again -* Fri Dec 5 2003 Erlend Midttun 3.1.3-1tr -- New upstream. +* Mon Sep 22 2003 Florian La Roche +- add even more patches from the mailinglist -* Wed Jun 18 2003 Erlend Midttun 3.1.1-7tr -- Big rebuild +* Tue Jul 15 2003 Florian La Roche +- add first bug-fixes from the mailinglist -* Fri May 2 2003 Chr. H. Toldnes 3.1.1-6ct -- Added symlink /usr/bin/awk -> /bin/gawk +* Sun Jul 13 2003 Florian La Roche +- update to 3.1.3 +- pgawk man-page fix and /proc fix are obsolete -* Mon Apr 28 2003 Tore Olsen 3.1.1-5to -- Removed symlinks in /usr/bin -- Moved stuff from /usr/libexec to /usr/lib (FHS compilance) -- Added patch to make grcat work +* Wed Jun 04 2003 Elliot Lee +- rebuilt -* Wed Apr 9 2003 Erlend Midttun 3.1.1-4em -- Moved PreReq htmlinfo to -doc package. +* Wed Jun 04 2003 Florian La Roche +- fix --exclude-docs #92252 -* Mon Mar 24 2003 Erlend Midttun 3.1.1-3em -- Rebuilt against glibc 2.3.2. +* Sun May 04 2003 Florian La Roche +- fix find_lang -* Fri Oct 25 2002 Christian H. Toldnes 3.1.1-2ct -- Replaced info stuff with htmlinfo -- Renamed sub package -docs to -doc +* Tue Apr 15 2003 Florian La Roche +- fix .so pointer in pgawk man-page +- also read files in /proc correctly that have a filesize of 0 -* Thu Jul 25 2002 Nico Erfurth 3.1.1-1ne -- new upstream version -- specfile cleanups -- Fixed %doc statements in %files, many documents where missing -- splitted into gawk and gawk-docs +* Sun Mar 30 2003 Florian La Roche +- update to 3.1.2 -* Tue Jul 23 2002 Daniel Meyer 3.1.0-2dm -- rebuild for Trustix Secure Linux 2.0 +* Wed Jan 22 2003 Tim Powers +- rebuilt -* Tue Jun 5 2001 Oystein Viggen -- New upstream version: 3.1.0 -- "unaligned" and networking patches applied upstream, removed +* Mon Dec 02 2002 Florian La Roche +- add find_lang to specfile -* Wed Sep 13 2000 Erlend Midttun -- Updated to version 3.0.6 +* Wed Nov 20 2002 Elliot Lee 3.1.1-7 +- Add gawk-3.1.1-ngroups.patch, because NGROUPS_MAX comes from +sys/param.h, and awk.h changes behaviour depending on whether NGROUPS_MAX +is defined or not. (For ppc64) -* Wed Mar 22 2000 Lars Gaarden -- Fixed manpages +* Wed Nov 06 2002 Florian La Roche +- remove /usr/share/info/dir -* Sat Mar 18 2000 Michael Tokarev -- added %defattr to %files +* Sun Nov 03 2002 Florian La Roche +- ugly fix to get locale files into the right location #74360 -* Mon Jan 24 2000 Tore Olsen -- moved /usr/man and /usr/info to /usr/share/* for FHS compliance. +* Sun Aug 11 2002 Florian La Roche +- simplify install part of spec file +- do not package /bin/gawk- anymore +* Fri Jun 21 2002 Tim Powers +- automated rebuild + +* Thu May 23 2002 Tim Powers +- automated rebuild + +* Thu May 09 2002 Florian La Roche +- update to 3.1.1 + +* Sun Mar 17 2002 Florian La Roche +- add patch from #61316 to ignore wrong hex numbers and treat them as text + +* Tue Jul 31 2001 Florian La Roche +- do not warn about unnecessary escaping + +* Fri Jun 29 2001 Florian La Roche +- fix path of man-pages + +* Mon Jun 25 2001 Than Ngo 3.1.0-1 +- update to 3.1.0 +- remove a uneeded patch +- adapt a patch for 3.1.0 + +* Fri Jun 1 2001 Preston Brown +- newer version of the mktemp patch from Solar Designer + +* Fri May 11 2001 Preston Brown 3.0.6-2 +- use mktemp in igawk shell script, not shell pid variable + +* Wed Aug 16 2000 Florian La Roche +- update to 3.06 + +* Tue Aug 15 2000 Trond Eivind Glomsr?d +- /usr/bin/gawk can't point at gawk - infinite symlink +- /usr/bin/awk can't point at gawk - infinite symlink + +* Mon Aug 14 2000 Preston Brown +- absolute --> relative symlinks + +* Tue Aug 8 2000 Florian La Roche +- fix paths for "configure" call + +* Thu Jul 13 2000 Florian La Roche +- add another bugfix + +* Thu Jul 13 2000 Florian La Roche +- update to 3.0.5 with bugfix + +* Wed Jul 12 2000 Prospector +- automatic rebuild + +* Fri Jun 30 2000 Matt Wilson +- revert to 3.0.4. 3.0.5 misgenerates e2fsprogs' test cases + +* Wed Jun 28 2000 Florian La Roche +- update to 3.0.5 + +* Mon Jun 19 2000 Florian La Roche +- add defattr + +* Mon Jun 19 2000 Florian La Roche +- FHS + +* Tue Mar 14 2000 Florian La Roche +- add bug-fix + +* Thu Feb 3 2000 Bernhard Rosenkraenzer +- Fix man page symlinks +- Fix description +- Fix download URL + * Wed Jun 30 1999 Jeff Johnson - update to 3.0.4. @@ -169,3 +236,4 @@ * Mon Jun 02 1997 Erik Troan - built against glibc + From svn at tinysofa.org Thu Jul 1 15:48:39 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:48:39 +1000 (EST) Subject: [tinysofa-svn] r2758 - in tinysofa/snapshot/gzip/current: sources specs Message-ID: <20040701154839.2A6254E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:48:38 +1000 (Fri, 02 Jul 2004) New Revision: 2758 Added: tinysofa/snapshot/gzip/current/sources/gzip-1.2.4-zforce.patch tinysofa/snapshot/gzip/current/sources/gzip-1.2.4a-dirinfo.patch tinysofa/snapshot/gzip/current/sources/gzip-1.3-openbsd-owl-tmp.diff tinysofa/snapshot/gzip/current/sources/gzip-1.3-rsync.patch tinysofa/snapshot/gzip/current/sources/gzip-1.3-stderr.patch tinysofa/snapshot/gzip/current/sources/gzip-1.3.1-zgreppipe.patch tinysofa/snapshot/gzip/current/sources/gzip-1.3.3-window-size.patch tinysofa/snapshot/gzip/current/sources/gzip-1.3.3.tar.gz Removed: tinysofa/snapshot/gzip/current/sources/gzip-1.2.4-basename.patch tinysofa/snapshot/gzip/current/sources/gzip-1.2.4-gzexe.patch tinysofa/snapshot/gzip/current/sources/gzip-1.2.4-mktemp.patch tinysofa/snapshot/gzip/current/sources/gzip-1.2.4a.tar.gz tinysofa/snapshot/gzip/current/sources/gzip-1.2.4b.patch Modified: tinysofa/snapshot/gzip/current/specs/gzip.spec Log: - Sync with 2.0. - Added: - gzip-1.2.4-zforce.patch: - gzip-1.2.4a-dirinfo.patch: - gzip-1.3-openbsd-owl-tmp.diff: - gzip-1.3-rsync.patch: - gzip-1.3-stderr.patch: - gzip-1.3.1-zgreppipe.patch: - gzip-1.3.3-window-size.patch: - gzip-1.3.3.tar.gz: - Removed: - gzip-1.2.4-basename.patch: - gzip-1.2.4-gzexe.patch: - gzip-1.2.4-mktemp.patch: - gzip-1.2.4a.tar.gz: - gzip-1.2.4b.patch: Deleted: tinysofa/snapshot/gzip/current/sources/gzip-1.2.4-basename.patch =================================================================== --- tinysofa/snapshot/gzip/current/sources/gzip-1.2.4-basename.patch 2004-07-01 15:48:31 UTC (rev 2757) +++ tinysofa/snapshot/gzip/current/sources/gzip-1.2.4-basename.patch 2004-07-01 15:48:38 UTC (rev 2758) @@ -1,22 +0,0 @@ ---- gzip-1.2.4/gzip.h.orig Wed Nov 1 23:02:14 1995 -+++ gzip-1.2.4/gzip.h Wed Nov 1 23:02:20 1995 -@@ -301,7 +301,7 @@ - extern void flush_window OF((void)); - extern void write_buf OF((int fd, voidp buf, unsigned cnt)); - extern char *strlwr OF((char *s)); --extern char *basename OF((char *fname)); -+extern char *basename OF((const char *fname)); - extern void make_simple_name OF((char *name)); - extern char *add_envopt OF((int *argcp, char ***argvp, char *env)); - extern void error OF((char *m)); ---- gzip-1.2.4/util.c.orig Wed Nov 1 23:03:32 1995 -+++ gzip-1.2.4/util.c Wed Nov 1 23:03:37 1995 -@@ -179,7 +179,7 @@ - * case sensitive, force the base name to lower case. - */ - char *basename(fname) -- char *fname; -+ const char *fname; - { - char *p; - Deleted: tinysofa/snapshot/gzip/current/sources/gzip-1.2.4-gzexe.patch =================================================================== --- tinysofa/snapshot/gzip/current/sources/gzip-1.2.4-gzexe.patch 2004-07-01 15:48:31 UTC (rev 2757) +++ tinysofa/snapshot/gzip/current/sources/gzip-1.2.4-gzexe.patch 2004-07-01 15:48:38 UTC (rev 2758) @@ -1,29 +0,0 @@ ---- gzip-1.2.4/gzexe.in.ewt Sun Sep 14 14:44:55 1997 -+++ gzip-1.2.4/gzexe.in Sun Sep 14 14:45:16 1997 -@@ -91,7 +91,7 @@ - sed 1q $0 > $tmp - sed "s|^if tail|if $tail|" >> $tmp <<'EOF' - skip=18 --if tail +$skip $0 | "BINDIR"/gzip -cd > /tmp/gztmp$$; then -+if tail +$skip $0 | "/bin"/gzip -cd > /tmp/gztmp$$; then - /bin/chmod 700 /tmp/gztmp$$ - prog="`echo $0 | /bin/sed 's|^.*/||'`" - if /bin/ln /tmp/gztmp$$ "/tmp/$prog" 2>/dev/null; then -@@ -107,7 +107,7 @@ - echo Cannot decompress $0; exit 1 - fi; exit $res - EOF -- "BINDIR"/gzip -cv9 "$i" >> $tmp || { -+ "/bin"/gzip -cv9 "$i" >> $tmp || { - /bin/rm -f $tmp - echo ${x}: compression not possible for $i, file unchanged. - res=1 -@@ -120,7 +120,7 @@ - if sed -e 1d -e 2q "$i" | grep "^skip=[0-9]*$" >/dev/null; then - eval `sed -e 1d -e 2q "$i"` - fi -- if tail +$skip "$i" | "BINDIR"/gzip -cd > $tmp; then -+ if tail +$skip "$i" | "/bin"/gzip -cd > $tmp; then - : - else - echo ${x}: $i probably not in gzexe format, file unchanged. Deleted: tinysofa/snapshot/gzip/current/sources/gzip-1.2.4-mktemp.patch =================================================================== --- tinysofa/snapshot/gzip/current/sources/gzip-1.2.4-mktemp.patch 2004-07-01 15:48:31 UTC (rev 2757) +++ tinysofa/snapshot/gzip/current/sources/gzip-1.2.4-mktemp.patch 2004-07-01 15:48:38 UTC (rev 2758) @@ -1,43 +0,0 @@ ---- gzip-1.2.4/gzexe.in.ewt Wed Jan 28 15:30:41 1998 -+++ gzip-1.2.4/gzexe.in Wed Jan 28 15:37:14 1998 -@@ -90,18 +90,22 @@ - if test $decomp -eq 0; then - sed 1q $0 > $tmp - sed "s|^if tail|if $tail|" >> $tmp <<'EOF' --skip=18 --if tail +$skip $0 | "/bin"/gzip -cd > /tmp/gztmp$$; then -- /bin/chmod 700 /tmp/gztmp$$ -+skip=22 -+tmpfile=`mktemp /tmp/gz$$.XXXXXX` || { -+ echo 'cannot create a temporary file' >&2 -+ exit 1 -+} -+if tail +$skip $0 | "/bin"/gzip -cd > $tmpfile; then -+ /bin/chmod 700 $tmpfile - prog="`echo $0 | /bin/sed 's|^.*/||'`" -- if /bin/ln /tmp/gztmp$$ "/tmp/$prog" 2>/dev/null; then -- trap '/bin/rm -f /tmp/gztmp$$ "/tmp/$prog"; exit $res' 0 -- (/bin/sleep 5; /bin/rm -f /tmp/gztmp$$ "/tmp/$prog") 2>/dev/null & -+ if /bin/ln $tmpfile "/tmp/$prog" 2>/dev/null; then -+ trap '/bin/rm -f $tmpfile "/tmp/$prog"; exit $res' 0 -+ (/bin/sleep 5; /bin/rm -f $tmpfile "/tmp/$prog") 2>/dev/null & - /tmp/"$prog" ${1+"$@"}; res=$? - else -- trap '/bin/rm -f /tmp/gztmp$$; exit $res' 0 -- (/bin/sleep 5; /bin/rm -f /tmp/gztmp$$) 2>/dev/null & -- /tmp/gztmp$$ ${1+"$@"}; res=$? -+ trap '/bin/rm -f $tmpfile; exit $res' 0 -+ (/bin/sleep 5; /bin/rm -f $tmpfile) 2>/dev/null & -+ $tmpfile ${1+"$@"}; res=$? - fi - else - echo Cannot decompress $0; exit 1 -@@ -116,7 +120,7 @@ - - else - # decompression -- skip=18 -+ skip=22 - if sed -e 1d -e 2q "$i" | grep "^skip=[0-9]*$" >/dev/null; then - eval `sed -e 1d -e 2q "$i"` - fi Added: tinysofa/snapshot/gzip/current/sources/gzip-1.2.4-zforce.patch =================================================================== --- tinysofa/snapshot/gzip/current/sources/gzip-1.2.4-zforce.patch 2004-07-01 15:48:31 UTC (rev 2757) +++ tinysofa/snapshot/gzip/current/sources/gzip-1.2.4-zforce.patch 2004-07-01 15:48:38 UTC (rev 2758) @@ -0,0 +1,11 @@ +--- gzip-1.2.4/zforce.in.sopwith Thu Feb 3 18:06:30 2000 ++++ gzip-1.2.4/zforce.in Thu Feb 3 18:07:37 2000 +@@ -25,7 +25,7 @@ + test `expr "$i" : '.*[.-]gz$'` -eq 0 || continue + test `expr "$i" : '.*[.]t[ag]z$'` -eq 0 || continue + +- if gzip -l < "$i" 2>/dev/null | grep '^defl' > /dev/null; then ++ if gzip -l < "$i" 2>/dev/null | grep '^compressed' > /dev/null; then + + if test `expr "$i" : '^............'` -eq 12; then + new=`expr "$i" : '\(.*\)...$`.gz Added: tinysofa/snapshot/gzip/current/sources/gzip-1.2.4a-dirinfo.patch =================================================================== --- tinysofa/snapshot/gzip/current/sources/gzip-1.2.4a-dirinfo.patch 2004-07-01 15:48:31 UTC (rev 2757) +++ tinysofa/snapshot/gzip/current/sources/gzip-1.2.4a-dirinfo.patch 2004-07-01 15:48:38 UTC (rev 2758) @@ -0,0 +1,16 @@ +--- gzip-1.2.4a/gzip.texi.dirinfo Tue Feb 8 20:17:42 2000 ++++ gzip-1.2.4a/gzip.texi Tue Feb 8 20:19:13 2000 +@@ -7,6 +7,13 @@ + @c %**end of header + + @ifinfo ++ ++ at format ++START-INFO-DIR-ENTRY ++* gzip: (gzip). The GNU compression utility. ++END-INFO-DIR-ENTRY ++ at end format ++ + This file documents the the GNU @code{gzip} command for compressing files. + + Copyright (C) 1992-1993 Jean-loup Gailly Deleted: tinysofa/snapshot/gzip/current/sources/gzip-1.2.4a.tar.gz =================================================================== (Binary files differ) Deleted: tinysofa/snapshot/gzip/current/sources/gzip-1.2.4b.patch =================================================================== --- tinysofa/snapshot/gzip/current/sources/gzip-1.2.4b.patch 2004-07-01 15:48:31 UTC (rev 2757) +++ tinysofa/snapshot/gzip/current/sources/gzip-1.2.4b.patch 2004-07-01 15:48:38 UTC (rev 2758) @@ -1,17 +0,0 @@ ---- gzip-1.2.4/gzip.c Thu Aug 19 15:39:43 1993 -+++ gzip-1.2.4b/gzip.c Tue Jan 8 21:44:18 2002 -@@ -1005,7 +1005,14 @@ - #ifdef NO_MULTIPLE_DOTS - char *dot; /* pointer to ifname extension, or NULL */ - #endif -+ int max_suffix_len = (z_len > 3 ? z_len : 3); - -+ /* Leave enough room in ifname or ofname for suffix: */ -+ if (strlen(iname) >= sizeof(ifname) - max_suffix_len) { -+ strncpy(ifname, iname, sizeof(ifname) - 1); -+ /* last byte of ifname is already zero and never overwritten */ -+ error("file name too long"); -+ } - strcpy(ifname, iname); - - /* If input file exists, return OK. */ Added: tinysofa/snapshot/gzip/current/sources/gzip-1.3-openbsd-owl-tmp.diff =================================================================== --- tinysofa/snapshot/gzip/current/sources/gzip-1.3-openbsd-owl-tmp.diff 2004-07-01 15:48:31 UTC (rev 2757) +++ tinysofa/snapshot/gzip/current/sources/gzip-1.3-openbsd-owl-tmp.diff 2004-07-01 15:48:38 UTC (rev 2758) @@ -0,0 +1,158 @@ +diff -ur gzip-1.3.orig/gzexe.in gzip-1.3/gzexe.in +--- gzip-1.3.orig/gzexe.in Fri Sep 18 04:43:06 1998 ++++ gzip-1.3/gzexe.in Fri Sep 28 04:35:48 2001 +@@ -13,7 +13,7 @@ + # The : is required for some old versions of csh. + # On Ultrix, /bin/sh is too buggy, change the first line to: #!/bin/sh5 + +-x=`basename $0` ++x=`basename "$0"` + if test $# = 0; then + echo compress executables. original file foo is renamed to foo~ + echo usage: ${x} [-d] files... +@@ -21,8 +21,9 @@ + exit 1 + fi + +-tmp=gz$$ +-trap "rm -f $tmp; exit 1" 1 2 3 5 10 13 15 ++tmp=`/bin/mktemp ${TMPDIR:-/tmp}/gzexe.XXXXXXXXXX` || exit 1 ++trap "rm -f $tmp; exit 1" HUP INT QUIT PIPE TERM ++trap "rm -f $tmp; exit 0" EXIT + + decomp=0 + res=0 +@@ -32,12 +33,10 @@ + shift + fi + +-echo hi > zfoo1$$ +-echo hi > zfoo2$$ +-if test -z "`(${CPMOD-cpmod} zfoo1$$ zfoo2$$) 2>&1`"; then +- cpmod=${CPMOD-cpmod} ++cpmod= ++if type ${CPMOD:-cpmod} 2>/dev/null; then ++ cpmod=${CPMOD:-cpmod} + fi +-rm -f zfoo[12]$$ + + tail="" + IFS="${IFS= }"; saveifs="$IFS"; IFS="${IFS}:" +@@ -75,7 +74,7 @@ + continue + fi + case "`basename $i`" in +- gzip | tail | chmod | ln | sleep | rm) ++ bash | chmod | gzip | ln | mktemp | rm | sed | sh | tail) + echo "${x}: $i would depend on itself"; continue ;; + esac + if test -z "$cpmod"; then +@@ -88,27 +87,19 @@ + fi + fi + if test $decomp -eq 0; then +- sed 1q $0 > $tmp ++ sed 1q "$0" > $tmp + sed "s|^if tail|if $tail|" >> $tmp <<'EOF' +-skip=22 +-set -C +-umask=`umask` +-umask 77 +-if tail +$skip $0 | "BINDIR"/gzip -cd > /tmp/gztmp$$; then +- umask $umask +- /bin/chmod 700 /tmp/gztmp$$ +- prog="`echo $0 | /bin/sed 's|^.*/||'`" +- if /bin/ln /tmp/gztmp$$ "/tmp/$prog" 2>/dev/null; then +- trap '/bin/rm -f /tmp/gztmp$$ "/tmp/$prog"; exit $res' 0 +- (/bin/sleep 5; /bin/rm -f /tmp/gztmp$$ "/tmp/$prog") 2>/dev/null & +- /tmp/"$prog" ${1+"$@"}; res=$? +- else +- trap '/bin/rm -f /tmp/gztmp$$; exit $res' 0 +- (/bin/sleep 5; /bin/rm -f /tmp/gztmp$$) 2>/dev/null & +- /tmp/gztmp$$ ${1+"$@"}; res=$? +- fi ++skip=14 ++tmpdir=`/bin/mktemp -d ${TMPDIR:-/tmp}/gzexe.XXXXXXXXXX` || exit 1 ++prog="${tmpdir}/`echo \"$0\" | sed 's|^.*/||'`" ++if tail +$skip "$0" | "BINDIR"/gzip -cd > "$prog"; then ++ /bin/chmod 700 "$prog" ++ trap '/bin/rm -rf $tmpdir; exit $res' EXIT ++ "$prog" ${1+"$@"}; res=$? + else +- echo Cannot decompress $0; exit 1 ++ echo "Cannot decompress $0" ++ /bin/rm -rf $tmpdir ++ exit 1 + fi; exit $res + EOF + gzip -cv9 "$i" >> $tmp || { +diff -ur gzip-1.3.orig/zdiff.in gzip-1.3/zdiff.in +--- gzip-1.3.orig/zdiff.in Fri Sep 18 06:27:28 1998 ++++ gzip-1.3/zdiff.in Fri Sep 28 04:04:28 2001 +@@ -46,13 +46,13 @@ + case "$2" in + *[-.]gz* | *[-.][zZ] | *.t[ga]z) + F=`echo "$2" | sed 's|.*/||;s|[-.][zZtga]*||'` +- set -C +- trap 'rm -f /tmp/"$F".$$; exit 2' 1 2 13 15 0 +- gzip -cdfq "$2" > /tmp/"$F".$$ || exit +- gzip -cdfq "$1" | $comp $OPTIONS - /tmp/"$F".$$ ++ TF=`/bin/mktemp ${TMPDIR:-/tmp}/"$F".XXXXXXXXXX` || exit 1 ++ trap 'rm -f "$TF"; exit 2' EXIT HUP INT PIPE TERM ++ gzip -cdfq "$2" > "$TF" || exit ++ gzip -cdfq "$1" | $comp $OPTIONS - "$TF" + STAT="$?" +- /bin/rm -f /tmp/"$F".$$ || STAT=2 +- trap 1 2 13 15 0 ++ rm -f "$TF" || STAT=2 ++ trap EXIT HUP INT PIPE TERM + exit $STAT;; + + *) gzip -cdfq "$1" | $comp $OPTIONS - "$2";; +diff -ur gzip-1.3.orig/znew.in gzip-1.3/znew.in +--- gzip-1.3.orig/znew.in Thu Oct 15 03:37:58 1998 ++++ gzip-1.3/znew.in Fri Sep 28 03:58:18 2001 +@@ -14,29 +14,27 @@ + # block is the disk block size (best guess, need not be exact) + + warn="(does not preserve modes and timestamp)" +-tmp=/tmp/zfoo.$$ +-set -C +-echo hi > $tmp.1 +-echo hi > $tmp.2 +-if test -z "`(${CPMOD-cpmod} $tmp.1 $tmp.2) 2>&1`"; then +- cpmod=${CPMOD-cpmod} ++cpmod= ++cpmodarg= ++if type ${CPMOD:-cpmod} 2>/dev/null; then ++ cpmod=${CPMOD:-cpmod} + warn="" + fi + +-if test -z "$cpmod" && ${TOUCH-touch} -r $tmp.1 $tmp.2 2>/dev/null; then +- cpmod="${TOUCH-touch}" ++if test -z "$cpmod"; then ++ cpmod=touch + cpmodarg="-r" + warn="(does not preserve file modes)" + fi + +-# check if GZIP env. variable uses -S or --suffix +-gzip -q $tmp.1 +-ext=`echo $tmp.1* | sed "s|$tmp.1||"` +-rm -f $tmp.[12]* +-if test -z "$ext"; then +- echo znew: error determining gzip extension +- exit 1 +-fi ++case "$GZIP" in ++ *-S*) ext=`echo "$GZIP" | sed 's/^.*-S[[:space:]]*\([^[:space:]]*\).*$/\1/'` ++ ;; ++ *-suffix*) ext=`echo "$GZIP" | sed 's/^.*--suffix=\([^[:space:]]*\).*$/\1/'` ++ ;; ++ *) ext='.gz' ++ ;; ++esac + if test "$ext" = ".Z"; then + echo znew: cannot use .Z as gzip extension. + exit 1 Added: tinysofa/snapshot/gzip/current/sources/gzip-1.3-rsync.patch =================================================================== --- tinysofa/snapshot/gzip/current/sources/gzip-1.3-rsync.patch 2004-07-01 15:48:31 UTC (rev 2757) +++ tinysofa/snapshot/gzip/current/sources/gzip-1.3-rsync.patch 2004-07-01 15:48:38 UTC (rev 2758) @@ -0,0 +1,275 @@ +--- gzip-1.3.2/deflate.c.rsync Fri Oct 8 08:46:28 1999 ++++ gzip-1.3.2/deflate.c Sun Mar 10 12:35:00 2002 +@@ -122,6 +122,14 @@ + #endif + /* Matches of length 3 are discarded if their distance exceeds TOO_FAR */ + ++#ifndef RSYNC_WIN ++# define RSYNC_WIN 4096 ++#endif ++/* Size of rsync window, must be < MAX_DIST */ ++ ++#define RSYNC_SUM_MATCH(sum) ((sum) % RSYNC_WIN == 0) ++/* Whether window sum matches magic value */ ++ + /* =========================================================================== + * Local data used by the "longest match" routines. + */ +@@ -203,6 +211,8 @@ + unsigned near good_match; + /* Use a faster search when the previous match is longer than this */ + ++local ulg rsync_sum; /* rolling sum of rsync window */ ++local ulg rsync_chunk_end; /* next rsync sequence point */ + + /* Values for max_lazy_match, good_match and max_chain_length, depending on + * the desired pack level (0..9). The values given below have been tuned to +@@ -301,6 +311,10 @@ + #endif + /* prev will be initialized on the fly */ + ++ /* rsync params */ ++ rsync_chunk_end = 0xFFFFFFFFUL; ++ rsync_sum = 0; ++ + /* Set the default configuration parameters: + */ + max_lazy_match = configuration_table[pack_level].max_lazy; +@@ -537,6 +551,8 @@ + memcpy((char*)window, (char*)window+WSIZE, (unsigned)WSIZE); + match_start -= WSIZE; + strstart -= WSIZE; /* we now have strstart >= MAX_DIST: */ ++ if (rsync_chunk_end != 0xFFFFFFFFUL) ++ rsync_chunk_end -= WSIZE; + + block_start -= (long) WSIZE; + +@@ -564,13 +580,46 @@ + } + } + ++local void rsync_roll(start, num) ++ unsigned start; ++ unsigned num; ++{ ++ unsigned i; ++ ++ if (start < RSYNC_WIN) { ++ /* before window fills. */ ++ for (i = start; i < RSYNC_WIN; i++) { ++ if (i == start + num) return; ++ rsync_sum += (ulg)window[i]; ++ } ++ num -= (RSYNC_WIN - start); ++ start = RSYNC_WIN; ++ } ++ ++ /* buffer after window full */ ++ for (i = start; i < start+num; i++) { ++ /* New character in */ ++ rsync_sum += (ulg)window[i]; ++ /* Old character out */ ++ rsync_sum -= (ulg)window[i - RSYNC_WIN]; ++ if (rsync_chunk_end == 0xFFFFFFFFUL && RSYNC_SUM_MATCH(rsync_sum)) ++ rsync_chunk_end = i; ++ } ++} ++ ++/* =========================================================================== ++ * Set rsync_chunk_end if window sum matches magic value. ++ */ ++#define RSYNC_ROLL(s, n) \ ++ do { if (rsync) rsync_roll((s), (n)); } while(0) ++ + /* =========================================================================== + * Flush the current block, with given end-of-file flag. + * IN assertion: strstart is set to the end of the current match. + */ + #define FLUSH_BLOCK(eof) \ + flush_block(block_start >= 0L ? (char*)&window[(unsigned)block_start] : \ +- (char*)NULL, (long)strstart - block_start, (eof)) ++ (char*)NULL, (long)strstart - block_start, flush-1, (eof)) + + /* =========================================================================== + * Processes a new input file and return its compressed length. This +@@ -581,7 +630,7 @@ + local off_t deflate_fast() + { + IPos hash_head; /* head of the hash chain */ +- int flush; /* set if current block must be flushed */ ++ int flush; /* set if current block must be flushed, 2=>and padded */ + unsigned match_length = 0; /* length of best match */ + + prev_length = MIN_MATCH-1; +@@ -610,6 +659,7 @@ + + lookahead -= match_length; + ++ RSYNC_ROLL(strstart, match_length); + /* Insert new strings in the hash table only if the match length + * is not too large. This saves time but degrades compression. + */ +@@ -638,9 +688,14 @@ + /* No match, output a literal byte */ + Tracevv((stderr,"%c",window[strstart])); + flush = ct_tally (0, window[strstart]); ++ RSYNC_ROLL(strstart, 1); + lookahead--; + strstart++; + } ++ if (rsync && strstart > rsync_chunk_end) { ++ rsync_chunk_end = 0xFFFFFFFFUL; ++ flush = 2; ++ } + if (flush) FLUSH_BLOCK(0), block_start = strstart; + + /* Make sure that we always have enough lookahead, except +@@ -713,6 +768,7 @@ + */ + lookahead -= prev_length-1; + prev_length -= 2; ++ RSYNC_ROLL(strstart, prev_length+1); + do { + strstart++; + INSERT_STRING(strstart, hash_head); +@@ -725,24 +781,39 @@ + match_available = 0; + match_length = MIN_MATCH-1; + strstart++; +- if (flush) FLUSH_BLOCK(0), block_start = strstart; + ++ if (rsync && strstart > rsync_chunk_end) { ++ rsync_chunk_end = 0xFFFFFFFFUL; ++ flush = 2; ++ } ++ if (flush) FLUSH_BLOCK(0), block_start = strstart; + } else if (match_available) { + /* If there was no match at the previous position, output a + * single literal. If there was a match but the current match + * is longer, truncate the previous match to a single literal. + */ + Tracevv((stderr,"%c",window[strstart-1])); +- if (ct_tally (0, window[strstart-1])) { +- FLUSH_BLOCK(0), block_start = strstart; +- } ++ flush = ct_tally (0, window[strstart-1]); ++ if (rsync && strstart > rsync_chunk_end) { ++ rsync_chunk_end = 0xFFFFFFFFUL; ++ flush = 2; ++ } ++ if (flush) FLUSH_BLOCK(0), block_start = strstart; ++ RSYNC_ROLL(strstart, 1); + strstart++; + lookahead--; + } else { + /* There is no previous match to compare with, wait for + * the next step to decide. + */ ++ if (rsync && strstart > rsync_chunk_end) { ++ /* Reset huffman tree */ ++ rsync_chunk_end = 0xFFFFFFFFUL; ++ flush = 2; ++ FLUSH_BLOCK(0), block_start = strstart; ++ } + match_available = 1; ++ RSYNC_ROLL(strstart, 1); + strstart++; + lookahead--; + } +--- gzip-1.3.2/gzip.c.rsync Mon Oct 1 07:28:16 2001 ++++ gzip-1.3.2/gzip.c Sun Mar 10 12:35:00 2002 +@@ -249,6 +249,7 @@ + unsigned insize; /* valid bytes in inbuf */ + unsigned inptr; /* index of next byte to be processed in inbuf */ + unsigned outcnt; /* bytes in output buffer */ ++int rsync = 0; /* make ryncable chunks */ + + struct option longopts[] = + { +@@ -278,6 +279,7 @@ + {"best", 0, 0, '9'}, /* compress better */ + {"lzw", 0, 0, 'Z'}, /* make output compatible with old compress */ + {"bits", 1, 0, 'b'}, /* max number of bits per code (implies -Z) */ ++ {"rsyncable", 0, 0, 'R'}, /* make rsync-friendly archive */ + { 0, 0, 0, 0 } + }; + +@@ -368,6 +370,7 @@ + " -Z --lzw produce output compatible with old compress", + " -b --bits maxbits max number of bits per code (implies -Z)", + #endif ++ " --rsyncable Make rsync-friendly archive", + " file... files to (de)compress. If none given, use standard input.", + "Report bugs to .", + 0}; +@@ -546,6 +549,9 @@ + #else + recursive = 1; break; + #endif ++ case 'R': ++ rsync = 1; break; ++ + case 'S': + #ifdef NO_MULTIPLE_DOTS + if (*optarg == '.') optarg++; +--- gzip-1.3.2/gzip.h.rsync Mon Oct 1 07:24:52 2001 ++++ gzip-1.3.2/gzip.h Sun Mar 10 12:36:12 2002 +@@ -133,6 +133,7 @@ + extern unsigned insize; /* valid bytes in inbuf */ + extern unsigned inptr; /* index of next byte to be processed in inbuf */ + extern unsigned outcnt; /* bytes in output buffer */ ++extern int rsync; /* deflate into rsyncable chunks */ + + extern off_t bytes_in; /* number of input bytes */ + extern off_t bytes_out; /* number of output bytes */ +@@ -281,7 +282,7 @@ + /* in trees.c */ + void ct_init OF((ush *attr, int *method)); + int ct_tally OF((int dist, int lc)); +-off_t flush_block OF((char *buf, ulg stored_len, int eof)); ++off_t flush_block OF((char *buf, ulg stored_len, int pad, int eof)); + + /* in bits.c */ + void bi_init OF((file_t zipfile)); +--- gzip-1.3.2/gzip.texi.rsync Sun Nov 4 08:39:35 2001 ++++ gzip-1.3.2/gzip.texi Sun Mar 10 12:35:00 2002 +@@ -340,6 +340,14 @@ + into the directory and compress all the files it finds there (or + decompress them in the case of @code{gunzip}). + ++ at item --rsyncable ++While compressing, synchronize the output occasionally based on the ++input. This reduces compression by about 1 percent most cases, but ++means that the @code{rsync} program can take advantage of similarities ++in the uncompressed input when syncronizing two files compressed with ++this flag. @code{gunzip} cannot tell the difference between a ++compressed file created with this option, and one created without it. ++ + @item --suffix @var{suf} + @itemx -S @var{suf} + Use suffix @samp{@var{suf}} instead of @samp{.gz}. Any suffix can be +--- gzip-1.3.2/trees.c.rsync Wed Oct 6 07:00:00 1999 ++++ gzip-1.3.2/trees.c Sun Mar 10 12:37:05 2002 +@@ -847,9 +847,10 @@ + * trees or store, and output the encoded block to the zip file. This function + * returns the total compressed length for the file so far. + */ +-off_t flush_block(buf, stored_len, eof) ++off_t flush_block(buf, stored_len, pad, eof) + char *buf; /* input block, or NULL if too old */ + ulg stored_len; /* length of input block */ ++ int pad; /* pad output to byte boundary */ + int eof; /* true if this is the last block for a file */ + { + ulg opt_lenb, static_lenb; /* opt_len and static_len in bytes */ +@@ -941,6 +942,10 @@ + Assert (input_len == bytes_in, "bad input size"); + bi_windup(); + compressed_len += 7; /* align on byte boundary */ ++ } else if (pad && (compressed_len % 8) != 0) { ++ send_bits((STORED_BLOCK<<1)+eof, 3); /* send block type */ ++ compressed_len = (compressed_len + 3 + 7) & ~7L; ++ copy_block(buf, 0, 1); /* with header */ + } + + return compressed_len >> 3; Added: tinysofa/snapshot/gzip/current/sources/gzip-1.3-stderr.patch =================================================================== --- tinysofa/snapshot/gzip/current/sources/gzip-1.3-stderr.patch 2004-07-01 15:48:31 UTC (rev 2757) +++ tinysofa/snapshot/gzip/current/sources/gzip-1.3-stderr.patch 2004-07-01 15:48:38 UTC (rev 2758) @@ -0,0 +1,95 @@ +--- gzip-1.3/gzexe.in.orig Thu Nov 9 15:08:50 2000 ++++ gzip-1.3/gzexe.in Thu Nov 9 15:09:09 2000 +@@ -15,9 +15,9 @@ + + x=`basename $0` + if test $# = 0; then +- echo compress executables. original file foo is renamed to foo~ +- echo usage: ${x} [-d] files... +- echo " -d decompress the executables" ++ echo compress executables. original file foo is renamed to foo~ 1&>2 ++ echo usage: ${x} [-d] files... 1>&2 ++ echo " -d decompress the executables" 1>&2 + exit 1 + fi + +--- gzip-1.3/zdiff.in.orig Thu Nov 9 15:08:50 2000 ++++ gzip-1.3/zdiff.in Thu Nov 9 15:09:29 2000 +@@ -32,7 +32,7 @@ + esac + done + if test -z "$FILES"; then +- echo "Usage: $prog [${comp}_options] file [file]" ++ echo "Usage: $prog [${comp}_options] file [file]" 1>&2 + exit 2 + fi + set $FILES +@@ -64,6 +64,6 @@ + esac;; + esac + else +- echo "Usage: $prog [${comp}_options] file [file]" ++ echo "Usage: $prog [${comp}_options] file [file]" 1>&2 + exit 2 + fi +--- gzip-1.3/zforce.in.orig Thu Nov 9 15:08:50 2000 ++++ gzip-1.3/zforce.in Thu Nov 9 15:09:47 2000 +@@ -9,8 +9,8 @@ + PATH="BINDIR:$PATH"; export PATH + x=`basename $0` + if test $# = 0; then +- echo "force a '.gz' extension on all gzip files" +- echo usage: $x files... ++ echo "force a '.gz' extension on all gzip files" 1>&2 ++ echo usage: $x files... 1>&2 + exit 1 + fi + +--- gzip-1.3/zgrep.in.orig Thu Nov 9 15:08:50 2000 ++++ gzip-1.3/zgrep.in Thu Nov 9 15:12:21 2000 +@@ -31,8 +31,8 @@ + done + + if test -z "$pat"; then +- echo "grep through gzip files" +- echo "usage: $prog [grep_options] pattern [files]" ++ echo "grep through gzip files" 1>&2 ++ echo "usage: $prog [grep_options] pattern [files]" 1>&2 + exit 1 + fi + +--- gzip-1.3/zmore.in.orig Thu Nov 9 15:08:50 2000 ++++ gzip-1.3/zmore.in Thu Nov 9 15:13:49 2000 +@@ -23,7 +23,8 @@ + + if test $# = 0; then + if test -t 0; then +- echo usage: zmore files... ++ echo usage: zmore files... 1>&2 ++ exit 1 + else + gzip -cdfq | eval ${PAGER-more} + fi +--- gzip-1.3/znew.in.orig Thu Nov 9 15:08:50 2000 ++++ gzip-1.3/znew.in Thu Nov 9 15:14:20 2000 +@@ -51,13 +51,13 @@ + done + + if test $# -eq 0; then +- echo "recompress .Z files into $ext (gzip) files" +- echo usage: `echo $0 | sed 's,^.*/,,'` "[-tv9KP]" file.Z... +- echo " -t tests the new files before deleting originals" +- echo " -v be verbose" +- echo " -9 use the slowest compression method (optimal compression)" +- echo " -K keep a .Z file when it is smaller than the $ext file" +- echo " -P use pipes for the conversion $warn" ++ echo "recompress .Z files into $ext (gzip) files" 1>&2 ++ echo usage: `echo $0 | sed 's,^.*/,,'` "[-tv9KP]" file.Z... 1>&2 ++ echo " -t tests the new files before deleting originals" 1>&2 ++ echo " -v be verbose" 1>&2 ++ echo " -9 use the slowest compression method (optimal compression)" 1>&2 ++ echo " -K keep a .Z file when it is smaller than the $ext file" 1>&2 ++ echo " -P use pipes for the conversion $warn" 1>&2 + exit 1 + fi + Added: tinysofa/snapshot/gzip/current/sources/gzip-1.3.1-zgreppipe.patch =================================================================== --- tinysofa/snapshot/gzip/current/sources/gzip-1.3.1-zgreppipe.patch 2004-07-01 15:48:31 UTC (rev 2757) +++ tinysofa/snapshot/gzip/current/sources/gzip-1.3.1-zgreppipe.patch 2004-07-01 15:48:38 UTC (rev 2758) @@ -0,0 +1,19 @@ +--- gzip-1.3.1/zgrep.in ++++ gzip-1.3.1/zgrep.in +@@ -92,6 +92,7 @@ + fi + + res=0 ++trap break SIGPIPE + for i do + gzip -cdfq "$i" | + if test $files_with_matches -eq 1; then +@@ -110,5 +111,8 @@ + fi + r=$? + test $res -lt $r && res=$r ++ # SIGPIPE + 128 ++ test "$r" -eq 141 && exit $res + done ++trap - SIGPIPE + exit $res Added: tinysofa/snapshot/gzip/current/sources/gzip-1.3.3-window-size.patch =================================================================== --- tinysofa/snapshot/gzip/current/sources/gzip-1.3.3-window-size.patch 2004-07-01 15:48:31 UTC (rev 2757) +++ tinysofa/snapshot/gzip/current/sources/gzip-1.3.3-window-size.patch 2004-07-01 15:48:38 UTC (rev 2758) @@ -0,0 +1,11 @@ +--- gzip-1.3.3/gzip.c.orig Thu Jan 30 21:19:36 2003 ++++ gzip-1.3.3/gzip.c Thu Jan 30 21:09:52 2003 +@@ -198,7 +198,7 @@ + DECLARE(uch, inbuf, INBUFSIZ +INBUF_EXTRA); + DECLARE(uch, outbuf, OUTBUFSIZ+OUTBUF_EXTRA); + DECLARE(ush, d_buf, DIST_BUFSIZE); +-DECLARE(uch, window, 2L*WSIZE); ++DECLARE(uch, window, 2L*WSIZE + 4096); + #ifndef MAXSEG_64K + DECLARE(ush, tab_prefix, 1L< $RPM_BUILD_ROOT/usr/bin/.$i - rm -f $RPM_BUILD_ROOT/usr/bin/$i - mv $RPM_BUILD_ROOT/usr/bin/.$i $RPM_BUILD_ROOT/usr/bin/$i - chmod 755 $RPM_BUILD_ROOT/usr/bin/$i +for i in zcmp zegrep zforce zless znew gzexe zdiff zfgrep zgrep zmore ; do + mv ${RPM_BUILD_ROOT}/bin/$i ${RPM_BUILD_ROOT}%{_bindir}/$i done -cat > $RPM_BUILD_ROOT/usr/bin/zless < ${RPM_BUILD_ROOT}%{_bindir}/zless < 1.2.4a-30ts -- current (1.2.4a-29ts) integrated as 1.2.4a-30ts for release 1.0-U1 +* Fri Feb 13 2004 Elliot Lee +- rebuilt -* Mon Dec 1 2003 Erlend Midttun 1.2.4a-26tr -- Big rebuild +* Tue Oct 28 2003 Jeff Johnson 1.3.3-11 +- rebuilt. -* Mon Oct 20 2003 Michael Scheffler 1.2.4a-25ms -- Added 64bit file support +* Wed Jun 04 2003 Elliot Lee +- rebuilt -* Mon Jun 23 2003 Erlend Midttun 1.2.4a-24tr -- Added %defattr. +* Fri Jan 31 2003 Jeff Johnson 1.3.3-9 +- enlarge window buffer to avoid accessing beyond end-of-buffer (#78413,#83095). +- re-enable rsync ready patch. -* Wed Jun 18 2003 Erlend Midttun 1.2.4a-23tr -- Big rebuild +* Wed Jan 22 2003 Tim Powers +- rebuilt -* Tue Mar 25 2003 Erlend Midttun 1.2.4a-22em -- Fix typo. +* Fri Nov 22 2002 Jeff Johnson 1.3.3-7 +- workaround mis-compilation with gcc-3.2-4 on alpha for now (#78413). -* Mon Mar 24 2003 Erlend Midttun 1.2.4a-21em -- Rebuilt against glibc 2.3.2. +* Mon Nov 18 2002 Tim Powers +- rebuild on all arches +- remove file from buildroot we aren't shipping -* Thu Oct 24 2002 Christian H. Toldnes 1.2.4a-20ct -- Replaced info stuff with htmlinfo +* Fri Jun 21 2002 Tim Powers +- automated rebuild -* Wed Jul 24 2002 Daniel Meyer 1.2.4a-19dm -- rebuild for Trustix Secure Linux 2.0 +* Fri Jun 21 2002 Trond Eivind Glomsr?d 1.3.3-4 +- Fix the reading of unitialized memory problem (#66913) -* Tue Jan 15 2002 Hans Alm?sbakk -- Applied patch that fixes a potential buffer overflow on too long input - filename. +* Thu May 23 2002 Tim Powers +- automated rebuild -* Mon Feb 28 2000 Lars Gaarden -- put the documentation in a separate package +* Thu Apr 25 2002 Trond Eivind Glomsr?d 1.3.3-2 +- Rebuild +* Wed Mar 13 2002 Trond Eivind Glomsr?d 1.3.3-1 +- 1.3.3 + +* Sun Mar 10 2002 Florian La Roche +- add rsyncable patch #58888 + +* Thu Feb 21 2002 Trond Eivind Glomsr?d 1.3.2-3 +- Rebuild + +* Wed Jan 09 2002 Tim Powers +- automated rebuild + +* Mon Nov 19 2001 Bernhard Rosenkraenzer 1.3.2-1 +- 1.3.2: no need for autoconf 2.5x hacks anymore + +* Sat Nov 17 2001 Florian La Roche +- update to 1.3.1: + - disable patch2 + +* Fri Oct 26 2001 Trond Eivind Glomsr?d 1.3.0-16 +- replace tempfile patches with improved ones solar at openwall.com +- Add less to the dependency chain - zless needs it + +* Thu Aug 23 2001 Trond Eivind Glomsr?d 1.3.0-15 +- Fix typo in comment in zgrep (#52465) +- Copyright -> License + +* Tue Jun 5 2001 Trond Eivind Glomsr?d +- Patch various uses of $$ in the bundled scripts + +* Mon Jun 4 2001 Trond Eivind Glomsr?d +- Fix the SIGPIPE patch to avoid blank lines (#43319) + +* Thu Feb 08 2001 Philipp Knirsch +- Fixed buzilla bug #26680. Wrong skip value after mktemp patch and forced + overwrite for output file during decompression. + +* Tue Jan 30 2001 Trond Eivind Glomsr?d +- trap SIGPIPE in zgrep, so "zgrep | less" gets a happy ending + (#24104) + +* Sun Dec 10 2000 Trond Eivind Glomsr?d +- add HAVE_LSTAT define, to avoid it doing weird things to symlinks + instead of ignoring them as the docs say it should (#22045) + +* Fri Dec 01 2000 Trond Eivind Glomsr?d +- rebuild + +* Thu Nov 09 2000 Trond Eivind Glomsr?d +- patch all scripts so usage error messages are written to + stderr (#20597) + +* Mon Oct 30 2000 Trond Eivind Glomsr?d +- disable assembly, as it is faster without it (bug #19910) + +* Thu Jul 13 2000 Prospector +- automatic rebuild + +* Tue Jun 27 2000 Trond Eivind Glomsr?d +- rebuild + +* Wed Jun 07 2000 Trond Eivind Glomsr?d +- Use %%{_mandir}, %%{_infodir}, %%configure, %%makeinstall + and %%{_tmppath} + +* Fri May 12 2000 Trond Eivind Glomsr?d +- Add root as default owner of the files, permits building + as non-root user + +* Wed May 10 2000 Trond Eivind Glomsr?d +- Build system handles stripping +- Don't do thing the system does, like creating directories +- use --bindir /bin +- Added URL +- skip unnecesarry sed step +- Include THANKS, AUTHORS, ChangeLog, TODO + +* Mon Mar 20 2000 Bernhard Rosenkraenzer +- 1.3 +- handle RPM_OPT_FLAGS + +* Tue Feb 15 2000 Cristian Gafton +- handle compressed man pages even better + +* Tue Feb 08 2000 Cristian Gafton +- adopt patch from Paul Eggert to fix detection of the improper tables in + inflate.c(huft_build) +- the latest released version 1.2.4a, which provides documentation updates + only. But it lets us use small revision numbers again +- add an dirinfo entry for gzip.info so we can get rid of the ugly --entry + args to install-info + +* Mon Feb 7 2000 Bill Nottingham +- handle compressed manpages + +* Thu Feb 03 2000 Elliot Lee +- Fix bug #7970 + * Sun Mar 21 1999 Cristian Gafton - auto rebuild in the new build environment (release 14) @@ -154,3 +244,4 @@ * Tue Apr 22 1997 Marc Ewing - (Entry added for Marc by Erik) fixed gzexe to use /bin/gzip + From svn at tinysofa.org Thu Jul 1 15:36:45 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:36:45 +1000 (EST) Subject: [tinysofa-svn] r2555 - in tinysofa/snapshot: . fontconfig fontconfig/current fontconfig/current/sources fontconfig/current/specs Message-ID: <20040701153645.2A12F4E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:36:44 +1000 (Fri, 02 Jul 2004) New Revision: 2555 Added: tinysofa/snapshot/fontconfig/ tinysofa/snapshot/fontconfig/current/ tinysofa/snapshot/fontconfig/current/sources/ tinysofa/snapshot/fontconfig/current/sources/fontconfig-0.0.1.020826.1330-blacklist.patch tinysofa/snapshot/fontconfig/current/sources/fontconfig-2.1-fulldir.patch tinysofa/snapshot/fontconfig/current/sources/fontconfig-2.1-slighthint.patch tinysofa/snapshot/fontconfig/current/sources/fontconfig-2.2.1-cache.patch tinysofa/snapshot/fontconfig/current/sources/fontconfig-2.2.1-ftinclude.patch tinysofa/snapshot/fontconfig/current/sources/fontconfig-2.2.1-notimestamp.patch tinysofa/snapshot/fontconfig/current/sources/fontconfig-2.2.1.tar.gz tinysofa/snapshot/fontconfig/current/sources/fontconfig-defaultconfig.patch tinysofa/snapshot/fontconfig/current/sources/fontconfig-nodocs.patch tinysofa/snapshot/fontconfig/current/specs/ tinysofa/snapshot/fontconfig/current/specs/fontconfig.spec Log: - Add fontconfig to snapshot from 2.0. Added: tinysofa/snapshot/fontconfig/current/sources/fontconfig-0.0.1.020826.1330-blacklist.patch =================================================================== --- tinysofa/snapshot/fontconfig/current/sources/fontconfig-0.0.1.020826.1330-blacklist.patch 2004-07-01 15:36:41 UTC (rev 2554) +++ tinysofa/snapshot/fontconfig/current/sources/fontconfig-0.0.1.020826.1330-blacklist.patch 2004-07-01 15:36:44 UTC (rev 2555) @@ -0,0 +1,53 @@ +--- fontconfig/src/fcdir.c.blacklist Mon Aug 26 15:57:40 2002 ++++ fontconfig/src/fcdir.c Fri Aug 30 14:59:05 2002 +@@ -150,6 +150,40 @@ + return ret; + } + ++static FcBool ++FcBlackListed (const char *name) ++{ ++ static const char * const black_listed_names[] = { ++ "hrger.pfa", ++ "hrgrr.pfa", ++ "hritr.pfa", ++ "hrpld.pfa", ++ "hrpldi.pfa", ++ "hrplt.pfa", ++ "hrplti.pfa", ++ "hrscc.pfa", ++ "hrscs.pfa", ++ "u003043t.gsf", ++ "u004006t.gsf" ++ }; ++ ++ int low = 0; ++ int high = sizeof(black_listed_names) / sizeof(black_listed_names[0]) - 1; ++ ++ while (low <= high) { ++ int mid = (low + high) / 2; ++ int res = strcmp (name, black_listed_names[mid]); ++ if (res == 0) ++ return FcTrue; ++ else if (res < 0) ++ high = mid - 1; ++ else ++ low = mid + 1; ++ } ++ ++ return FcFalse; ++} ++ + #define FC_MAX_FILE_LEN 4096 + + FcBool +@@ -201,7 +235,8 @@ + } + while (ret && (e = readdir (d))) + { +- if (e->d_name[0] != '.' && strlen (e->d_name) < FC_MAX_FILE_LEN) ++ if (e->d_name[0] != '.' && strlen (e->d_name) < FC_MAX_FILE_LEN && ++ !FcBlackListed (e->d_name)) + { + strcpy ((char *) base, (char *) e->d_name); + ret = FcFileScan (set, dirs, cache, blanks, file, force); Added: tinysofa/snapshot/fontconfig/current/sources/fontconfig-2.1-fulldir.patch =================================================================== --- tinysofa/snapshot/fontconfig/current/sources/fontconfig-2.1-fulldir.patch 2004-07-01 15:36:41 UTC (rev 2554) +++ tinysofa/snapshot/fontconfig/current/sources/fontconfig-2.1-fulldir.patch 2004-07-01 15:36:44 UTC (rev 2555) @@ -0,0 +1,15 @@ +--- fontconfig/src/fccache.c.fulldir 2003-02-24 09:21:45.000000000 -0500 ++++ fontconfig/src/fccache.c 2003-02-24 09:22:36.000000000 -0500 +@@ -267,6 +267,12 @@ + printf (" dir cache dir \"%s\"\n", path); + ret = FcStrSetAdd (dirs, path); + } ++ /* GinGin betas wrote .fulldir entries, ignore them ++ */ ++ else if (!FcStrCmp (name, ".fulldir")) ++ { ++ ret = FcTrue; ++ } + else if (!FcStrCmp (name, FC_FONT_FILE_INVALID)) + { + ret = FcTrue; Added: tinysofa/snapshot/fontconfig/current/sources/fontconfig-2.1-slighthint.patch =================================================================== --- tinysofa/snapshot/fontconfig/current/sources/fontconfig-2.1-slighthint.patch 2004-07-01 15:36:41 UTC (rev 2554) +++ tinysofa/snapshot/fontconfig/current/sources/fontconfig-2.1-slighthint.patch 2004-07-01 15:36:44 UTC (rev 2555) @@ -0,0 +1,57 @@ +--- fontconfig/fontconfig/fontconfig.h.slighthint Sun Aug 11 14:10:41 2002 ++++ fontconfig/fontconfig/fontconfig.h Mon Aug 12 16:23:51 2002 +@@ -55,6 +55,7 @@ + #define FC_FOUNDRY "foundry" /* String */ + #define FC_ANTIALIAS "antialias" /* Bool (depends) */ + #define FC_HINTING "hinting" /* Bool (true) */ ++#define FC_HINT_STYLE "hintstyle" /* Int */ + #define FC_VERTICAL_LAYOUT "verticallayout" /* Bool (false) */ + #define FC_AUTOHINT "autohint" /* Bool (false) */ + #define FC_GLOBAL_ADVANCE "globaladvance" /* Bool (true) */ +@@ -102,6 +103,12 @@ + #define FC_RGBA_VRGB 3 + #define FC_RGBA_VBGR 4 + ++/* hinting style */ ++#define FC_HINT_NONE 0 ++#define FC_HINT_SLIGHT 1 ++#define FC_HINT_MEDIUM 2 ++#define FC_HINT_FULL 3 ++ + typedef enum _FcType { + FcTypeVoid, + FcTypeInteger, +--- fontconfig/src/fcdefault.c.slighthint Tue Jul 9 18:08:14 2002 ++++ fontconfig/src/fcdefault.c Mon Aug 12 16:22:01 2002 +@@ -137,4 +137,9 @@ + FcPatternAddString (pattern, FC_LANG, (FcChar8 *) lang); + } + } ++ ++ if (FcPatternGet (pattern, FC_HINT_STYLE, 0, &v) == FcResultNoMatch) ++ { ++ FcPatternAddInteger (pattern, FC_HINT_STYLE, FC_HINT_FULL); ++ } + } +--- fontconfig/src/fcname.c.slighthint Sun Aug 11 14:10:42 2002 ++++ fontconfig/src/fcname.c Mon Aug 12 16:24:28 2002 +@@ -40,6 +40,7 @@ + { FC_FOUNDRY, FcTypeString, }, + /* { FC_CORE, FcTypeBool, }, */ + { FC_ANTIALIAS, FcTypeBool, }, ++ { FC_HINT_STYLE, FcTypeInteger, }, + { FC_HINTING, FcTypeBool, }, + { FC_VERTICAL_LAYOUT, FcTypeBool, }, + { FC_AUTOHINT, FcTypeBool, }, +@@ -153,6 +154,11 @@ + { (FcChar8 *) "vrgb", "rgba", FC_RGBA_VRGB }, + { (FcChar8 *) "vbgr", "rgba", FC_RGBA_VBGR }, + { (FcChar8 *) "none", "rgba", FC_RGBA_NONE }, ++ ++ { (FcChar8 *) "hintnone", "hintstyle", FC_HINT_NONE }, ++ { (FcChar8 *) "hintslight", "hintstyle", FC_HINT_SLIGHT }, ++ { (FcChar8 *) "hintmedium", "hintstyle", FC_HINT_MEDIUM }, ++ { (FcChar8 *) "hintfull", "hintstyle", FC_HINT_FULL }, + }; + + #define NUM_FC_CONSTANTS (sizeof _FcBaseConstants/sizeof _FcBaseConstants[0]) Added: tinysofa/snapshot/fontconfig/current/sources/fontconfig-2.2.1-cache.patch =================================================================== --- tinysofa/snapshot/fontconfig/current/sources/fontconfig-2.2.1-cache.patch 2004-07-01 15:36:41 UTC (rev 2554) +++ tinysofa/snapshot/fontconfig/current/sources/fontconfig-2.2.1-cache.patch 2004-07-01 15:36:44 UTC (rev 2555) @@ -0,0 +1,22 @@ +--- fontconfig-2.2.1/src/fccfg.c.foo 2003-06-17 16:12:35.000000000 -0400 ++++ fontconfig-2.2.1/src/fccfg.c 2003-06-17 16:13:54.000000000 -0400 +@@ -193,7 +193,8 @@ + if (!cache) + goto bail1; + +- FcGlobalCacheLoad (cache, config->cache); ++ if (config->cache) ++ FcGlobalCacheLoad (cache, config->cache); + + list = FcConfigGetFontDirs (config); + if (!list) +@@ -211,7 +212,8 @@ + if (FcDebug () & FC_DBG_FONTSET) + FcFontSetPrint (fonts); + +- FcGlobalCacheSave (cache, config->cache); ++ if (config->cache) ++ FcGlobalCacheSave (cache, config->cache); + FcGlobalCacheDestroy (cache); + + FcConfigSetFonts (config, fonts, FcSetSystem); Added: tinysofa/snapshot/fontconfig/current/sources/fontconfig-2.2.1-ftinclude.patch =================================================================== --- tinysofa/snapshot/fontconfig/current/sources/fontconfig-2.2.1-ftinclude.patch 2004-07-01 15:36:41 UTC (rev 2554) +++ tinysofa/snapshot/fontconfig/current/sources/fontconfig-2.2.1-ftinclude.patch 2004-07-01 15:36:44 UTC (rev 2555) @@ -0,0 +1,40 @@ +--- fontconfig-2.2.1/fontconfig/fcfreetype.h.ftinclude 2004-03-10 11:51:45.000000000 -0500 ++++ fontconfig-2.2.1/fontconfig/fcfreetype.h 2004-03-10 11:52:23.000000000 -0500 +@@ -24,7 +24,8 @@ + + #ifndef _FCFREETYPE_H_ + #define _FCFREETYPE_H_ +-#include ++#include ++#include FT_FREETYPE_H + + FT_UInt + FcFreeTypeCharIndex (FT_Face face, FcChar32 ucs4); +--- fontconfig-2.2.1/src/fcfreetype.c.ftinclude 2004-03-10 11:47:25.000000000 -0500 ++++ fontconfig-2.2.1/src/fcfreetype.c 2004-03-10 11:54:03.000000000 -0500 +@@ -48,16 +48,17 @@ + #include + #include + #include "fcint.h" +-#include +-#include +-#include +-#include +-#include +-#include ++#include ++#include FT_FREETYPE_H ++#include FT_INTERNAL_OBJECTS_H ++#include FT_TRUETYPE_TABLES_H ++#include FT_SFNT_NAMES_H ++#include FT_TRUETYPE_IDS_H ++#include FT_TYPE1_TABLES_H + + #if (FREETYPE_MINOR > 1 || (FREETYPE_MINOR == 1 && FREETYPE_PATCH >= 4)) +-#include +-#include ++#include FT_BDF_H ++#include FT_MODULE_H + #define USE_FTBDF + #define HAS_BDF_PROPERTY(f) ((f) && (f)->driver && \ + (f)->driver->root.clazz->get_interface) Added: tinysofa/snapshot/fontconfig/current/sources/fontconfig-2.2.1-notimestamp.patch =================================================================== --- tinysofa/snapshot/fontconfig/current/sources/fontconfig-2.2.1-notimestamp.patch 2004-07-01 15:36:41 UTC (rev 2554) +++ tinysofa/snapshot/fontconfig/current/sources/fontconfig-2.2.1-notimestamp.patch 2004-07-01 15:36:44 UTC (rev 2555) @@ -0,0 +1,11 @@ +--- fontconfig-2.2.1/fonts.conf.in.notimestamp 2004-04-19 11:28:12.000000000 -0400 ++++ fontconfig-2.2.1/fonts.conf.in 2004-04-19 11:28:29.000000000 -0400 +@@ -21,8 +21,6 @@ + Keith Packard + --> + +- +- + @FC_DEFAULT_FONTS@ + @FC_FONTPATH@ + ~/.fonts Added: tinysofa/snapshot/fontconfig/current/sources/fontconfig-2.2.1.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/fontconfig/current/sources/fontconfig-2.2.1.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/fontconfig/current/sources/fontconfig-defaultconfig.patch =================================================================== --- tinysofa/snapshot/fontconfig/current/sources/fontconfig-defaultconfig.patch 2004-07-01 15:36:41 UTC (rev 2554) +++ tinysofa/snapshot/fontconfig/current/sources/fontconfig-defaultconfig.patch 2004-07-01 15:36:44 UTC (rev 2555) @@ -0,0 +1,243 @@ +--- fontconfig-2.2.1/fonts.conf.in.defaultconfig 2004-04-19 11:34:45.000000000 -0400 ++++ fontconfig-2.2.1/fonts.conf.in 2004-04-19 11:36:45.000000000 -0400 +@@ -209,23 +209,51 @@ + local.conf + + ++ Aliases to try to find the "best" standard document fonts the user has ++ --> ++ ++ Times New Roman ++ ++ Thorndale AMT ++ Nimbus Roman No9 L ++ ++ + + Times +- Times New Roman ++ ++ Nimbus Roman No9 L ++ Thorndale AMT ++ Times New Roman ++ + + + Helvetica +- Verdana ++ ++ Nimbus Sans L ++ Albany AMT ++ Arial ++ + + + Arial +- Verdana ++ ++ Albany AMT ++ Nimbus Sans L ++ Arial ++ + + + Courier +- Courier New ++ ++ Cumberland AMT ++ Courier New ++ ++ ++ ++ Courier New ++ ++ Cumberland AMT ++ + + + ++ ++ ++ ++ Kochi Mincho ++ ++ ++ false ++ ++ ++ ++ false ++ ++ ++ ++ ++ Kochi Gothic ++ ++ ++ false ++ ++ ++ false ++ ++ ++ ++ ++ Baekmuk Batang ++ ++ ++ false ++ ++ ++ ++ ++ Baekmuk Dotum ++ ++ ++ false ++ ++ ++ ++ ++ Baekmuk Gulim ++ ++ ++ false ++ ++ ++ ++ ++ Baekmuk Headline ++ ++ ++ false ++ ++ ++ ++ ++ AR PL Mingti2L Big5 ++ ++ ++ false ++ ++ ++ ++ ++ AR PL KaitiM Big5 ++ ++ ++ false ++ ++ ++ ++ ++ AR PL SungtiL GB ++ ++ ++ false ++ ++ ++ ++ ++ AR PL KaitiM GB ++ ++ ++ false ++ ++ ++ ++ ++ ZYSong18030 ++ ++ ++ false ++ ++ ++ ++ ++ ++ ++ Mukti Narrow ++ ++ ++ false ++ ++ ++ ++ + Added: tinysofa/snapshot/fontconfig/current/sources/fontconfig-nodocs.patch =================================================================== --- tinysofa/snapshot/fontconfig/current/sources/fontconfig-nodocs.patch 2004-07-01 15:36:41 UTC (rev 2554) +++ tinysofa/snapshot/fontconfig/current/sources/fontconfig-nodocs.patch 2004-07-01 15:36:44 UTC (rev 2555) @@ -0,0 +1,11 @@ +--- fontconfig-2.2.1/Makefile.am.nodocs 2003-04-11 18:53:53.000000000 -0400 ++++ fontconfig-2.2.1/Makefile.am 2003-06-10 09:37:08.000000000 -0400 +@@ -21,7 +21,7 @@ + # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR + # PERFORMANCE OF THIS SOFTWARE. + +-SUBDIRS=fontconfig fc-lang src fc-cache fc-list doc test ++SUBDIRS=fontconfig fc-lang src fc-cache fc-list test + + EXTRA_DIST = \ + fontconfig.pc.in \ Added: tinysofa/snapshot/fontconfig/current/specs/fontconfig.spec =================================================================== --- tinysofa/snapshot/fontconfig/current/specs/fontconfig.spec 2004-07-01 15:36:41 UTC (rev 2554) +++ tinysofa/snapshot/fontconfig/current/specs/fontconfig.spec 2004-07-01 15:36:44 UTC (rev 2555) @@ -0,0 +1,334 @@ +%define freetype_version 2.1.7 + +# Workaround for broken jade on s390, remove all disable_docs +# handling once https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=97079 +# is fixed. +%ifarch s390 +%define disable_docs 1 +%else +%define disable_docs 0 +%endif + +Summary: Font configuration and customization library +Name: fontconfig +Version: 2.2.1 +Release: 10ts +License: MIT +Group: System Environment/Libraries +Source: http://fontconfig.org/release/fontconfig-%{version}.tar.gz +URL: http://fontconfig.org +BuildRoot: %{_tmppath}/%{name}-%{version}-root + +Patch1: fontconfig-defaultconfig.patch +Patch4: fontconfig-2.1-slighthint.patch +# Blacklist certain fonts that freetype can't handle +Patch11: fontconfig-0.0.1.020826.1330-blacklist.patch +# Ignore .fulldir entries from earlier versions 'dircache' fix. +Patch13: fontconfig-2.1-fulldir.patch +# Turn off doc generation since it doesn't work on s390 at the moment +Patch14: fontconfig-nodocs.patch +# Don't read from/write to NULL cache files +Patch15: fontconfig-2.2.1-cache.patch +# Fix freetype includes to work with recent FreeType versions +Patch16: fontconfig-2.2.1-ftinclude.patch +# Remove timestamp from fonts.conf +# http://freedesktop.org/cgi-bin/bugzilla/show_bug.cgi?id=505 +Patch17: fontconfig-2.2.1-notimestamp.patch + +BuildRequires: freetype-devel >= %{freetype_version} +BuildRequires: expat-devel +BuildRequires: perl +# For nodocs patch +BuildRequires: /usr/bin/automake + +PreReq: freetype >= %{freetype_version} /dev/null + +%description +Fontconfig is designed to locate fonts within the +system and select them according to requirements specified by +applications. + +%package devel +Summary: Font configuration and customization library +Group: Development/Libraries +Requires: fontconfig = %{PACKAGE_VERSION} +Requires: freetype-devel >= %{freetype_version} + +%description devel +The fontconfig-devel package includes the header files, +and developer docs for the fontconfig package. + +Install fontconfig-devel if you want to develop programs which +will use fontconfig. + +%prep +%setup -q + +# Patch first so we don't affect .defaultconfig regeneration +%patch17 -p1 -b .notimestamp + +%patch1 -p1 -b .defaultconfig +%patch4 -p1 -b .slighthint +%patch11 -p1 -b .blacklist +%patch13 -p1 -b .fulldir + +%if %{disable_docs} +%patch14 -p1 -b .nodocs +%endif + +%patch15 -p1 -b .cache +%patch16 -p1 -b .ftinclude + +%build + +%if %{disable_docs} +automake +%endif + +%configure --with-add-fonts=/usr/X11R6/lib/X11/fonts/Type1,/usr/X11R6/lib/X11/fonts/OTF +make + +%install +rm -rf $RPM_BUILD_ROOT + +# Install man pages +mkdir -p $RPM_BUILD_ROOT%{_mandir}/man{1,3,5} +install -m 0644 fc-cache/fc-cache.man $RPM_BUILD_ROOT%{_mandir}/man1/fc-cache.1 +install -m 0644 fc-list/fc-list.man $RPM_BUILD_ROOT%{_mandir}/man1/fc-list.1 +%if ! %{disable_docs} +( + cd doc; + for i in *.3 ; do + install -m 0644 $i $RPM_BUILD_ROOT%{_mandir}/man3/$i + done + for i in *.5 ; do + install -m 0644 $i $RPM_BUILD_ROOT%{_mandir}/man5/$i + done +) +%endif + +make install DESTDIR=$RPM_BUILD_ROOT + +%if ! %{disable_docs} +# move installed doc files back to build directory to package themm +# in the right place +mv $RPM_BUILD_ROOT%{_docdir}/fontconfig/* . +rmdir $RPM_BUILD_ROOT%{_docdir}/fontconfig/ +%endif + +# Remove unpackaged files +rm $RPM_BUILD_ROOT%{_libdir}/*.la + +%clean +rm -rf $RPM_BUILD_ROOT + +%post +/sbin/ldconfig + +# Force regeneration of all fontconfig cache files. +# The redirect is because fc-cache is giving warnings about ~/fc.cache +# the HOME setting is to avoid problems if HOME hasn't been reset +HOME=/root fc-cache -f 2>/dev/null + +%postun -p /sbin/ldconfig + +%files +%defattr(-, root, root) +%doc README AUTHORS COPYING +%if ! %{disable_docs} +%doc fontconfig-user.txt fontconfig-user.html +%endif +%{_libdir}/libfontconfig.so.* +%{_bindir}/fc-cache +%{_bindir}/fc-list +%dir %{_sysconfdir}/fonts +%{_sysconfdir}/fonts/fonts.dtd +%config %{_sysconfdir}/fonts/fonts.conf +%config(noreplace) %{_sysconfdir}/fonts/local.conf +%{_mandir}/man1/* +%if ! %{disable_docs} +%{_mandir}/man5/* +%endif + +%files devel +%defattr(-, root, root) +%if ! %{disable_docs} +%doc fontconfig-devel.txt fontconfig-devel +%endif +%{_libdir}/libfontconfig.so +%{_libdir}/libfontconfig.a +%{_libdir}/pkgconfig +%{_includedir}/fontconfig +%if ! %{disable_docs} +%{_mandir}/man3/* +%endif + +%changelog +* Mon Apr 19 2004 Owen Taylor 2.2.1-10 +- Require recent freetype (#109592, Peter Oliver) +- Remove fonts.conf timestamp to fix multiarch conflict (#118182) +- Disable hinting for Mukti Narrow (#120915, Sayamindu Dasgupta) + +* Wed Mar 10 2004 Owen Taylor 2.2.1-8.1 +- Rebuild + +* Wed Mar 10 2004 Owen Taylor 2.2.1-8.0 +- Add Albany/Cumberland/Thorndale as fallbacks for Microsoft core fonts and + as non-preferred alternatives for Sans/Serif/Monospace +- Fix FreeType includes for recent FreeType + +* Tue Mar 02 2004 Elliot Lee +- rebuilt + +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Mon Sep 22 2003 Owen Taylor 2.2.1-6.0 +- Should have been passing --with-add-fonts, not --with-add-dirs to + configure ... caused wrong version of Luxi to be used. (#100862) + +* Fri Sep 19 2003 Owen Taylor 2.2.1-5.0 +- Tweak fonts.conf to get right hinting for CJK fonts (#97337) + +* Tue Jun 17 2003 Bill Nottingham 2.2.1-3 +- handle null config->cache correctly + +* Thu Jun 12 2003 Owen Taylor 2.2.1-2 +- Update default config to include Hebrew fonts (#90501, Dov Grobgeld) + +* Tue Jun 10 2003 Owen Taylor 2.2.1-2 +- As a workaround disable doc builds on s390 + +* Mon Jun 9 2003 Owen Taylor 2.2.1-1 +- Version 2.2.1 + +* Wed Jun 04 2003 Elliot Lee +- rebuilt + +* Mon Feb 24 2003 Elliot Lee +- debuginfo rebuild + +* Mon Feb 24 2003 Owen Taylor 2.1-8 +- Fix segfault in fc-cache from .dircache patch + +* Mon Feb 24 2003 Owen Taylor +- Back out patch that wrote fonts.conf entries that crash RH-8.0 + gnome-terminal, go with patch from fontconfig CVS instead. + (#84863) + +* Tue Feb 11 2003 Owen Taylor +- Move fontconfig man page to main package, since it contains non-devel + information (#76189) +- Look in the OTF subdirectory of /usr/X11R6/lib/fonts as well + so we find Syriac fonts (#82627) + +* Thu Feb 6 2003 Matt Wilson 2.1-5 +- modified fontconfig-0.0.1.020626.1517-fontdir.patch to hard code + /usr/X11R6/lib/X11/fonts instead of using $(X_FONT_DIR). This is + because on lib64 machines, fonts are not in /usr/X11R6/lib64/.... + +* Wed Jan 22 2003 Tim Powers +- rebuilt + +* Wed Jan 15 2003 Owen Taylor +- Try a different tack when fixing cache problem + +* Tue Jan 14 2003 Owen Taylor +- Try to fix bug where empty cache entries would be found in + ~/.fonts.cache-1 during scanning (#81335) + +* Thu Nov 21 2002 Mike A. Harris 2.1-1 +- Updated to version 2.1 +- Updated slighthint patch to fontconfig-2.1-slighthint.patch +- Updated freetype version required to 2.1.2-7 + +* Mon Sep 2 2002 Owen Taylor +- Version 2.0 +- Correct capitalization/spacing for ZYSong18030 name (#73272) + +* Fri Aug 30 2002 Owen Taylor +- Blacklist fonts from ghostscript-fonts that don't render correctly + +* Mon Aug 26 2002 Owen Taylor +- Upgrade to fcpackage rc3 +- Fix bug in comparisons for xx_XX language tags +- Compensate for a minor config file change in rc3 + +* Wed Aug 21 2002 Owen Taylor +- Add an explicit PreReq for freetype +- Move fonts we don't ship to the end of the fonts.conf aliases so + installing them doesn't change the look. + +* Wed Aug 21 2002 Owen Taylor +- Memory leak fix when parsing config files +- Set rh_prefer_bitmaps for .ja fonts to key off of in Xft +- Fix some groff warnings for fontconfig.man (#72138) + +* Thu Aug 15 2002 Owen Taylor +- Try once more to get the right default Sans-serif font :-( +- Switch the Sans/Monospace aliases for Korean to Gulim, not Dotum + +* Wed Aug 14 2002 Owen Taylor +- Fix %%post + +* Tue Aug 13 2002 Owen Taylor +- Fix lost Luxi Sans default + +* Mon Aug 12 2002 Owen Taylor +- Upgrade to rc2 +- Turn off hinting for all CJK fonts +- Fix typo in %%post +- Remove the custom language tag stuff in favor of Keith's standard + solution. + +* Mon Jul 15 2002 Owen Taylor +- Prefer Luxi Sans to Nimbus Sans again + +* Fri Jul 12 2002 Owen Taylor +- Add FC_HINT_STYLE to FcBaseObjectTypes +- Switch Chinese fonts to always using Sung-ti / Ming-ti, and never Kai-ti +- Add ZYSong18030 to aliases (#68428) + +* Wed Jul 10 2002 Owen Taylor +- Fix a typo in the langtag patch (caught by Erik van der Poel) + +* Wed Jul 3 2002 Owen Taylor +- Add FC_HINT_STYLE tag + +* Thu Jun 27 2002 Owen Taylor +- New upstream version, with fix for problems with + ghostscript-fonts (Fonts don't work for Qt+CJK, + etc.) + +* Wed Jun 26 2002 Owen Taylor +- New upstream version, fixing locale problem + +* Mon Jun 24 2002 Owen Taylor +- Add a hack where we set the "language" fontconfig property based on the locale, then + we conditionalize base on that in the fonts.conf file. + +* Sun Jun 23 2002 Owen Taylor +- New upstream version + +* Tue Jun 18 2002 Owen Taylor +- Fix crash from FcObjectSetAdd + +* Tue Jun 11 2002 Owen Taylor +- make fonts.conf %%config, not %%config(noreplace) +- Another try at the CJK aliases +- Add some CJK fonts to the config +- Prefer Luxi Mono to Nimbus Mono + +* Mon Jun 10 2002 Owen Taylor +- New upstream version +- Fix matching for bitmap fonts + +* Mon Jun 3 2002 Owen Taylor +- New version, new upstream mega-tarball + +* Tue May 28 2002 Owen Taylor +- Fix problem with FcConfigSort + +* Fri May 24 2002 Owen Taylor +- Initial specfile + From svn at tinysofa.org Thu Jul 1 15:36:55 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:36:55 +1000 (EST) Subject: [tinysofa-svn] r2560 - in tinysofa/snapshot: . glibc-kernheaders glibc-kernheaders/current glibc-kernheaders/current/sources glibc-kernheaders/current/specs Message-ID: <20040701153655.0C3EF4E817D@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:36:54 +1000 (Fri, 02 Jul 2004) New Revision: 2560 Added: tinysofa/snapshot/glibc-kernheaders/ tinysofa/snapshot/glibc-kernheaders/current/ tinysofa/snapshot/glibc-kernheaders/current/sources/ tinysofa/snapshot/glibc-kernheaders/current/sources/glibc-kernheaders.tar.bz2 tinysofa/snapshot/glibc-kernheaders/current/specs/ tinysofa/snapshot/glibc-kernheaders/current/specs/glibc-kernheaders.spec Log: - Add glibc-kernheaders to snapshot from 2.0. Added: tinysofa/snapshot/glibc-kernheaders/current/sources/glibc-kernheaders.tar.bz2 =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/glibc-kernheaders/current/sources/glibc-kernheaders.tar.bz2 ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/glibc-kernheaders/current/specs/glibc-kernheaders.spec =================================================================== --- tinysofa/snapshot/glibc-kernheaders/current/specs/glibc-kernheaders.spec 2004-07-01 15:36:53 UTC (rev 2559) +++ tinysofa/snapshot/glibc-kernheaders/current/specs/glibc-kernheaders.spec 2004-07-01 15:36:54 UTC (rev 2560) @@ -0,0 +1,277 @@ +Summary: Header files for the Linux kernel for use by glibc +Name: glibc-kernheaders +Version: 2.4 +Release: 9.%(R="$Revision: 1.84 $"; RR="${R##: }"; echo ${RR%%?})ts +License: GPL +Group: Development/System +ExclusiveOS: Linux +Obsoletes: kernel-headers +Provides: kernel-headers = 2.4.2 +Prereq: fileutils initscripts >= 5.83 +%undefine _enable_debug_packages + +BuildRoot: %{_tmppath}/%{name}-%{version}-root + +%ifarch i386 i586 i686 athlon +%define _arch i386 +%endif + +Source0: glibc-kernheaders.tar.bz2 + +%description +Kernel-headers includes the C header files that specify the interface +between the Linux kernel and userspace libraries and programs. The +header files define structures and constants that are needed for +building most standard programs and are also needed for rebuilding the +glibc package + + + +%prep +%setup -q -c + +%build + +%install +mkdir -p $RPM_BUILD_ROOT +tar -cf - usr | tar -xf - -C $RPM_BUILD_ROOT +mkdir -p $RPM_BUILD_ROOT/usr/include/asm +pushd $RPM_BUILD_ROOT/usr/include +d1=asm-%{_arch} +d2=asm +%ifarch x86_64 +p1='defined __x86_64__' +d2=asm-i386 +p2='defined __i386__' +%endif +%ifarch sparc sparc64 +d1=asm-sparc +p1='defined __sparc__ && !defined __arch64__' +d2=asm-sparc64 +p2='defined __sparc__ && defined __arch64__' +%endif +%ifarch ppc ppc64 +d1=asm-ppc +p1='defined __powerpc__ && !defined __powerpc64__' +d2=asm-ppc64 +p2='defined __powerpc64__' +%endif +%ifarch s390 s390x +d1=asm-s390 +p1='defined __s390__ && !defined __s390x__' +d2=asm-s390x +p2='defined __s390x__' +%endif +for i in asm-*; do + case $i in $d1|$d2) ;; *) rm -rf $i;; esac +done +if [ "$d2" = "asm" ]; then + rm -rf asm + mv $d1 asm +else + for f in `find $d1 $d2 -name \*.h -exec basename {} \; | sort -u`; do + F=`echo $f | tr a-z. A-Z_` + ( cat <" + else + echo "# error <$d1/$f> does not exist" + fi + echo "# endif" + echo "# if $p2" + if [ -f $d2/$f ]; then + echo "# include <$d2/$f>" + else + echo "# error <$d2/$f> does not exist" + fi + echo "# endif" + echo "#endif" + ) > asm/$f + done +fi +popd + +%clean +rm -rf $RPM_BUILD_ROOT + + +%pre +[ -L /usr/include/linux ] && rm -f /usr/include/linux || : +[ -L /usr/include/asm ] && rm -f /usr/include/asm || : +%ifarch sparc +[ -L /usr/include/asm-sparc ] && rm -f /usr/include/asm-sparc +[ -L /usr/include/asm-sparc64 ] && rm -f /usr/include/asm-sparc64 +%endif +exit 0 + +%post +exit 0 + +### +### file lists +### + +%files +%defattr(-,root,root) +/usr/include/linux +/usr/include/asm* + + +%changelog +* Fri Jun 25 2004 Arjan van de Ven +- fix mtrr header for x86_64 + +* Wed Apr 21 2004 Jakub Jelinek 2.4-8.46 +- ppc/ppc64 mq_* syscall numbers + +* Fri Apr 16 2004 Jakub Jelinek 2.4-8.45 +- update syscall numbers from latest kernel +- remove ia32.h and ia32_unistd.h on x86-64 + +* Mon Mar 15 2004 Bill Nottingham 2.4-8.44 +- update wireless.h + +* Tue Dec 09 2003 Arjan van de Ven 2.4-8.38 +- remove a lot of kernel-only crud + +* Tue Dec 2 2003 Jeremy Katz 2.4-8.37 +- add BLKGETSIZE64 + +* Wed Oct 22 2003 Arjan van de Ven 2.4-8.35 +- fix broken shift_hz +* Wed Sep 24 2003 Jakub Jelinek 2.4-8.34 +- fix ppc64 sigcontext.h (#104915) + +* Mon Sep 8 2003 Bill Nottingham +- oops, bring arp_tables.h back + +* Wed Sep 3 2003 Bill Nottingham +- remove some exports of __constant_hton* + +* Sat Aug 23 2003 Arjan van de Ven +- fix typo in netdevice.h as per #102951 + +* Thu Aug 21 2003 Arjan van de Ven +- update personality.h for the amd64 3Gb 32 bit personality + +* Tue Aug 19 2003 Arjan van de Ven +- add asm/types.h to a few .h files that need it +- remove unistd.h from linux/limits.h; it breaks samba builds + +* Tue Aug 19 2003 Doug Ledford +- Add updated prctl.h file that includes process timing defines + +* Sat Aug 16 2003 Jakub Jelinek 2.4-8.27 +- add tgkill to unistd.h on ppc64, x86_64 and alpha + +* Thu Jul 31 2003 Jakub Jelinek 2.4-8.26 +- update ia64/sigcontext.h from 2.5.73+ (#101344) + +* Wed Jul 30 2003 Arjan van de Ven 2.4-8.25 +- make ppc64/uaccess.h match the upstream ABI + +* Mon Jul 28 2003 Jakub Jelinek 2.4-8.24 +- rebuilt + +* Mon Jul 28 2003 Jakub Jelinek 2.4-8.23 +- add tgkill to unistd.h on i386, ia64 and ppc32 +- remove __KERNEL_SYSCALLS__ cruft on ia64/ppc32 + +* Mon Jul 14 2003 Arjan van de Ven 2.4-8.22 +- add arptables headers + +* Fri Jun 27 2003 Arjan van de Ven 2.4.8.20 +- update ptrace headers for amd64 + +* Wed Jun 18 2003 Arjan van de Ven 2.4-8.19 +- update for new bonding interface + +* Fri Jun 06 2003 Arjan van de Ven 2.4-8.18 +- change syscall stubs to use the glibc ones + +* Thu Jun 5 2003 Jakub Jelinek 2.4-8.17 +- rebuilt + +* Mon Jun 2 2003 Jakub Jelinek 2.4-8.16 +- add new scsi majors to (#91696) + +* Fri May 30 2003 Arjan van de Ven 2.4-8.15 +- add amd64 nptl syscalls + +* Tue May 27 2003 Arjan van de Ven 2.4-8.14 +- unifdef'd a bunch of header files for __KERNEL__ + +* Sun Apr 13 2003 Arjan van de Ven 2.4-8.13 +- remove more kernel private files + +* Fri Apr 11 2003 Jakub Jelinek 2.4-8.12 +- update header +- remove i386 , replace it with a warning and include + (Arjan van de Ven) + +* Mon Feb 10 2003 Jakub Jelinek 2.4-8.11 +- update syscall numbers for all arches from 2.5.64 headers + +* Fri Feb 7 2003 Bill Nottingham 2.4-8.10 +- update more wireless headers + +* Wed Feb 5 2003 Bill Nottingham 2.4-8.9 +- update wireless headers + +* Thu Jan 30 2003 Jakub Jelinek 2.4-8.7 +- make /usr/include/asm during build if it doesn't exist + +* Thu Jan 30 2003 Jakub Jelinek 2.4-8.6 +- remove unpackaged file + +* Thu Jan 30 2003 Bill Nottingham +- update netfilter headers + +* Thu Jan 30 2003 Jakub Jelinek 2.4-8.5 +- don't include etc. in + +* Thu Jan 16 2003 Jakub Jelinek 2.4-8.4 +- updated s390 headers, added s390x headers +- HTB in +- no -debuginfo subpackage + +* Thu Dec 12 2002 Jakub Jelinek 2.4-8.3 +- update version.h from kernel-2.4.20-0.pp.6 + +* Tue Nov 26 2002 Jakub Jelinek 2.4-8.2 +- update unistd.h from kernel-2.4.19-0.pp.19 + +* Thu Oct 10 2002 Jakub Jelinek +- generate stubs automatically +- remove /usr/include/scsi from file list + +* Thu Oct 10 2002 Arjan van de Ven +- fix #warning in and + +* Thu Dec 6 2001 Arjan van de Ven +- fix misplaced #endif + +* Tue Dec 4 2001 Arjan van de Ven +- fix version.h to not include /boot/kernel.h + +* Wed Oct 31 2001 Arjan van de Ven +- Initial packaging From svn at tinysofa.org Thu Jul 1 15:37:04 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:37:04 +1000 (EST) Subject: [tinysofa-svn] r2562 - in tinysofa/snapshot: . gtk2 gtk2/current gtk2/current/sources gtk2/current/specs Message-ID: <20040701153704.E4EED4E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:37:04 +1000 (Fri, 02 Jul 2004) New Revision: 2562 Added: tinysofa/snapshot/gtk2/ tinysofa/snapshot/gtk2/current/ tinysofa/snapshot/gtk2/current/sources/ tinysofa/snapshot/gtk2/current/sources/gtk+-2.2.2-noexecstack.patch tinysofa/snapshot/gtk2/current/sources/gtk+-2.3.2-themename.patch tinysofa/snapshot/gtk2/current/sources/gtk+-2.4.3.tar.bz2 tinysofa/snapshot/gtk2/current/specs/ tinysofa/snapshot/gtk2/current/specs/gtk2.spec Log: - Add gtk2 to snapshot from 2.0. Added: tinysofa/snapshot/gtk2/current/sources/gtk+-2.2.2-noexecstack.patch =================================================================== --- tinysofa/snapshot/gtk2/current/sources/gtk+-2.2.2-noexecstack.patch 2004-07-01 15:36:59 UTC (rev 2561) +++ tinysofa/snapshot/gtk2/current/sources/gtk+-2.2.2-noexecstack.patch 2004-07-01 15:37:04 UTC (rev 2562) @@ -0,0 +1,56 @@ +--- gtk+-2.2.2/gdk-pixbuf/pixops/composite_line_22_4a4_mmx.S.gnustack 2003-06-09 22:47:41.000000000 -0400 ++++ gtk+-2.2.2/gdk-pixbuf/pixops/composite_line_22_4a4_mmx.S 2003-06-09 22:52:44.000000000 -0400 +@@ -5,6 +5,11 @@ + .align 16 + + #if !defined(__MINGW32__) && !defined(__CYGWIN__) ++ ++/* Magic indicating no need for an executable stack */ ++#if !defined __powerpc64__ && !defined __ia64__ ++.section .note.GNU-stack; .previous ++#endif + + .globl pixops_composite_line_22_4a4_mmx + .type pixops_composite_line_22_4a4_mmx, at function +--- gtk+-2.2.2/gdk-pixbuf/pixops/composite_line_color_22_4a4_mmx.S.gnustack 2003-06-09 22:47:41.000000000 -0400 ++++ gtk+-2.2.2/gdk-pixbuf/pixops/composite_line_color_22_4a4_mmx.S 2003-06-09 22:52:42.000000000 -0400 +@@ -6,6 +6,11 @@ + + #if !defined(__MINGW32__) && !defined(__CYGWIN__) + ++/* Magic indicating no need for an executable stack */ ++#if !defined __powerpc64__ && !defined __ia64__ ++.section .note.GNU-stack; .previous ++#endif ++ + .globl pixops_composite_line_color_22_4a4_mmx + .type pixops_composite_line_color_22_4a4_mmx, at function + pixops_composite_line_color_22_4a4_mmx: +--- gtk+-2.2.2/gdk-pixbuf/pixops/have_mmx.S.gnustack 2003-06-09 22:47:41.000000000 -0400 ++++ gtk+-2.2.2/gdk-pixbuf/pixops/have_mmx.S 2003-06-09 22:52:38.000000000 -0400 +@@ -6,6 +6,11 @@ + + #if !defined(__MINGW32__) && !defined(__CYGWIN__) + ++/* Magic indicating no need for an executable stack */ ++#if !defined __powerpc64__ && !defined __ia64__ ++.section .note.GNU-stack; .previous ++#endif ++ + .globl pixops_have_mmx + .type pixops_have_mmx, at function + pixops_have_mmx: +--- gtk+-2.2.2/gdk-pixbuf/pixops/scale_line_22_33_mmx.S.gnustack 2003-06-09 22:47:41.000000000 -0400 ++++ gtk+-2.2.2/gdk-pixbuf/pixops/scale_line_22_33_mmx.S 2003-06-09 22:52:35.000000000 -0400 +@@ -6,6 +6,11 @@ + + #if !defined(__MINGW32__) && !defined(__CYGWIN__) + ++/* Magic indicating no need for an executable stack */ ++#if !defined __powerpc64__ && !defined __ia64__ ++.section .note.GNU-stack; .previous ++#endif ++ + .globl pixops_scale_line_22_33_mmx + .type pixops_scale_line_22_33_mmx, at function + pixops_scale_line_22_33_mmx: Added: tinysofa/snapshot/gtk2/current/sources/gtk+-2.3.2-themename.patch =================================================================== --- tinysofa/snapshot/gtk2/current/sources/gtk+-2.3.2-themename.patch 2004-07-01 15:36:59 UTC (rev 2561) +++ tinysofa/snapshot/gtk2/current/sources/gtk+-2.3.2-themename.patch 2004-07-01 15:37:04 UTC (rev 2562) @@ -0,0 +1,24 @@ +--- gtk+-2.3.2/gtk/gtksettings.c.themename 2004-01-22 15:13:47.000000000 -0500 ++++ gtk+-2.3.2/gtk/gtksettings.c 2004-01-23 02:53:25.000000000 -0500 +@@ -209,7 +299,7 @@ + g_param_spec_string ("gtk-theme-name", + P_("Theme Name"), + P_("Name of theme RC file to load"), +- "Default", ++ "Raleigh", + G_PARAM_READWRITE), + NULL); + g_assert (result == PROP_THEME_NAME); +--- gtk+-2.3.2/gtk/Makefile.am.themename 2003-10-23 00:22:27.000000000 -0400 ++++ gtk+-2.3.2/gtk/Makefile.am 2004-01-23 02:53:25.000000000 -0500 +@@ -637,8 +637,8 @@ + + # Install a RC file for the default GTK+ theme, and key themes + install-data-local: install-ms-lib install-libtool-import-lib +- $(mkinstalldirs) $(DESTDIR)$(datadir)/themes/Default/gtk-2.0 +- $(INSTALL_DATA) $(srcdir)/gtkrc.default $(DESTDIR)$(datadir)/themes/Default/gtk-2.0/gtkrc ++ $(mkinstalldirs) $(DESTDIR)$(datadir)/themes/Raleigh/gtk-2.0 ++ $(INSTALL_DATA) $(srcdir)/gtkrc.default $(DESTDIR)$(datadir)/themes/Raleigh/gtk-2.0/gtkrc + $(mkinstalldirs) $(DESTDIR)$(datadir)/themes/Default/gtk-2.0-key + $(INSTALL_DATA) $(srcdir)/gtkrc.key.default $(DESTDIR)$(datadir)/themes/Default/gtk-2.0-key/gtkrc + $(mkinstalldirs) $(DESTDIR)$(datadir)/themes/Emacs/gtk-2.0-key Added: tinysofa/snapshot/gtk2/current/sources/gtk+-2.4.3.tar.bz2 =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/gtk2/current/sources/gtk+-2.4.3.tar.bz2 ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/gtk2/current/specs/gtk2.spec =================================================================== --- tinysofa/snapshot/gtk2/current/specs/gtk2.spec 2004-07-01 15:36:59 UTC (rev 2561) +++ tinysofa/snapshot/gtk2/current/specs/gtk2.spec 2004-07-01 15:37:04 UTC (rev 2562) @@ -0,0 +1,691 @@ +# Note that this is NOT a relocatable package + +%define glib2_base_version 2.4.0 +%define glib2_version %{glib2_base_version}-1 +%define pango_base_version 1.4.0 +%define pango_version %{pango_base_version}-1 +%define atk_base_version 1.6.0 +%define atk_version %{atk_base_version}-1 +%define libpng_version 2:1.2.2-16 + +%define base_version 2.4.3 +%define bin_version 2.4.0 + +Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X. +Name: gtk2 +Version: %{base_version} +Release: 1ts +License: LGPL +Group: System Environment/Libraries +Source: gtk+-%{version}.tar.bz2 + +# Rename the 'Default' widget theme to 'Raleigh' +Patch3: gtk+-2.3.2-themename.patch +# Mark assembly files as noexec-stack +Patch5: gtk+-2.2.2-noexecstack.patch + +BuildPrereq: atk-devel >= %{atk_version} +BuildPrereq: pango-devel >= %{pango_version} +BuildPrereq: glib2-devel >= %{glib2_version} +BuildPrereq: libtiff-devel +BuildPrereq: libjpeg-devel +BuildPrereq: libpng-devel >= %{libpng_version} +BuildPrereq: /usr/bin/automake +# needed for running aclocal +#BuildPrereq: gtk-doc + +BuildRoot: %{_tmppath}/gtk-%{PACKAGE_VERSION}-root +Obsoletes: gtk+-gtkbeta +Obsoletes: Inti + +URL: http://www.gtk.org + +# We need to prereq these so we can run gtk-query-immodules-2.0 +Prereq: glib2 >= %{glib2_version} +Prereq: atk >= %{atk_version} +Prereq: pango >= %{pango_version} + +%define _unpackaged_files_terminate_build 1 +%define _missing_doc_files_terminate_build 1 + + +%description +GTK+ is a multi-platform toolkit for creating graphical user +interfaces. Offering a complete set of widgets, GTK+ is suitable for +projects ranging from small one-off tools to complete application +suites. + +%package devel +Summary: Development tools for GTK+ applications. +Group: Development/Libraries +Requires: gtk2 = %{version} +Requires: pango-devel >= %{pango_version} +Requires: atk-devel >= %{atk_version} +Requires: glib2-devel >= %{glib2_version} +Requires: XFree86-devel +Obsoletes: gtk+-gtkbeta-devel +Obsoletes: Inti-devel +## avoid header collisions +Conflicts: gtk+-devel <= 1.2.8 +Conflicts: gdk-pixbuf-devel <= 0.11 + +%description devel +The gtk+-devel package contains the header files and developer +docs for the GTK+ widget toolkit. + +%prep +%setup -q -n gtk+-%{version} + +#%patch3 -p1 -b .themename +%patch5 -p1 -b .noexecstack + +for i in config.guess config.sub ; do + test -f %{_datadir}/libtool/$i && cp %{_datadir}/libtool/$i . +done + +%build + + +# Patch3 modifies Makefile.am +#aclocal +#automake +#autoconf + +if ! pkg-config --exists pangoxft ; then + echo "No pangoxft.pc!" + exit 1 +fi + +%configure --with-xinput=xfree --disable-gtk-doc + +## smp_mflags doesn't work for now due to gdk-pixbuf.loaders, may be fixed +## past gtk 2.1.2 +make %{?_smp_mflags} + +%install +rm -rf $RPM_BUILD_ROOT + +%makeinstall RUN_QUERY_IMMODULES_TEST=false RUN_QUERY_LOADER_TEST=false + +%find_lang gtk20 +%find_lang gtk20-properties + +cat gtk20.lang gtk20-properties.lang > all.lang + +./mkinstalldirs $RPM_BUILD_ROOT%{_sysconfdir}/gtk-2.0 +# +# Make cleaned-up versions of tutorials, examples, and faq for installation +# +./mkinstalldirs tmpdocs +cp -aR docs/tutorial/html tmpdocs/tutorial +cp -aR docs/faq/html tmpdocs/faq + +for dir in examples/* ; do + if [ -d $dir ] ; then + ./mkinstalldirs tmpdocs/$dir + for file in $dir/* ; do + install -m 0644 $file tmpdocs/$dir + done + fi +done + +# Install the demo programs +cd tests +../libtool --mode=install install testgtk $RPM_BUILD_ROOT%{_bindir} +../libtool --mode=install install testtext $RPM_BUILD_ROOT%{_bindir} + +# Remove unpackaged files +rm $RPM_BUILD_ROOT%{_libdir}/*.la + +%clean +rm -rf $RPM_BUILD_ROOT + +%post +/sbin/ldconfig +umask 022 +%{_bindir}/gtk-query-immodules-2.0 > %{_sysconfdir}/gtk-2.0/gtk.immodules +%{_bindir}/gdk-pixbuf-query-loaders > %{_sysconfdir}/gtk-2.0/gdk-pixbuf.loaders + +%postun +/sbin/ldconfig +if [ $1 = 0 ] ; then + /bin/rm -f %{_sysconfdir}/gtk-2.0/gtk.immodules + /bin/rm -f %{_sysconfdir}/gtk-2.0/gdk-pixbuf.loaders +fi + +%files -f all.lang +%defattr(-, root, root) + +%doc AUTHORS COPYING ChangeLog NEWS README +%{_bindir}/testtext +%{_bindir}/testgtk +%{_bindir}/gtk-demo +%{_bindir}/gdk-pixbuf-query-loaders +%{_bindir}/gtk-query-immodules-2.0 +%{_libdir}/libgtk-x11-2.0.so.* +%{_libdir}/libgdk-x11-2.0.so.* +%{_libdir}/libgdk_pixbuf-2.0.so.* +%{_libdir}/libgdk_pixbuf_xlib-2.0.so.* +%dir %{_libdir}/gtk-2.0 +%{_libdir}/gtk-2.0/%{bin_version} +%{_datadir}/gtk-2.0 +%{_datadir}/themes/Default +%{_datadir}/themes/Emacs +%dir %{_sysconfdir}/gtk-2.0 + +%files devel +%defattr(-, root, root) + +%{_libdir}/lib*.so +%dir %{_libdir}/gtk-2.0 +%{_libdir}/gtk-2.0/include +%{_datadir}/gtk-doc/ +%{_mandir}/man1/* +%{_includedir}/* +%{_datadir}/aclocal/* +%{_bindir}/gdk-pixbuf-csource +%{_libdir}/pkgconfig/* +%doc tmpdocs/tutorial +%doc tmpdocs/faq +%doc tmpdocs/examples + +%changelog +* Thu May 20 2004 Matthias Clasen - 2.4.1-1 +- Upgrade to 2.4.1 + +* Wed Mar 17 2004 Alex Larsson 2.4.0-1 +- update to 2.4.0 +- update bin_version to 2.4.0 + +* Wed Mar 10 2004 Mark McLoughlin 2.3.6-1 +- Update to 2.3.6 +- Remove 2.3.5 buildfix patch +- Remove gdk-pixbuf-xlib dependancy fix + +* Wed Mar 03 2004 Mark McLoughlin 2.3.5-1 +- Update to 2.3.5 +- Bump the required glib and pango versions +- Make it build on x86_64 + +* Tue Mar 02 2004 Elliot Lee +- rebuilt + +* Wed Feb 25 2004 Mark McLoughlin 2.3.4-1 +- Update to 2.3.4 +- Remove the xft-prefs patch, its upstream now +- Don't kill libtool's hardcode_libdir_flag_spec anymore + +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Fri Jan 23 2004 Alexander Larsson 2.3.2-2 +- Remove old HAVE_XFT2 check +- find_lang gtk20-properties too + +* Fri Jan 23 2004 Jonathan Blandford 2.3.2-1 +- new version +- removed patches that have been applied to 2.3.x branch + +* Mon Dec 1 2003 Thomas Woerner 2.2.4-5.2 +- removed rpath + +* Wed Oct 15 2003 Owen Taylor 2.2.4-5.1 +- Link gdk-pixbuf-xlib against gdk-pixbuf (#106678) + +* Fri Oct 3 2003 Owen Taylor 2.2.4-4.0 +- Fix 64-bit problem in gtkimcontextxim.c (#106124) + +* Tue Sep 16 2003 Owen Taylor 2.2.4-3.0 +- Fix an infinite loop that can occur in the panel (#104524) + +* Fri Sep 5 2003 Owen Taylor 2.2.4-2.1 +- Fix up tutorial in packaging (#90197), add FAQ +- Back out change to make KP_Decimal interpretation dependent on locale + (#101046) + +* Thu Sep 4 2003 Owen Taylor 2.2.4-1.1 +- Version 2.2.4 - fixes a few small problems in 2.2.3 + +* Tue Aug 26 2003 Owen Taylor 2.2.3-1.1 +- Version 2.2.3 + +* Thu Jul 10 2003 Owen Taylor 2.2.2-2.0 +- Change release number for rebuild + +* Wed Jul 9 2003 Owen Taylor 2.2.2-2.1 +- XFlush() rather than XSync() at the end of process_all_updates() + (big remote X anaconda speedup) +- Add patch to fix frequent Red Hat 9 crash + http://bugzilla.gnome.org/show_bug.cgi?id=105745 + +* Mon Jun 9 2003 Owen Taylor +- Version 2.2.2 +- Mark assembly files as noexec-stack + +* Wed Jun 04 2003 Elliot Lee +- rebuilt + +* Mon Feb 24 2003 Jonathan Blandford 2.2.1-2 +- add a libpng dependency to pull in the rebuilt version. + +* Fri Feb 21 2003 Jonathan Blandford 2.2.1-2 +- add a patch to fix broken scrolling in a lot of applications. + +* Sun Feb 2 2003 Owen Taylor +- Version 2.2.1 +- Update xftprefs for gtk+-2.2.1 + +* Wed Jan 22 2003 Tim Powers +- rebuilt + +* Tue Jan 14 2003 Jonathan Blandford +- patch to fix TreeView misdrawing. Remove when 2.2.1 comes out + +* Fri Dec 20 2002 Owen Taylor +- Version 2.2.0 + +* Fri Dec 20 2002 Nalin Dahyabhai +- Fix postun to not try to run a script through ldconfig +- Only remove the gtk.immodules and gdk-pixbuf.loaders files if uninstalling + while not upgrading + +* Wed Dec 11 2002 Owen Taylor +- Version 2.1.5 + +* Wed Dec 11 2002 Owen Taylor +- Version 2.1.4 + +* Wed Dec 4 2002 Owen Taylor +- Fix problem with GtkCombo not setting text to first item + +* Tue Dec 3 2002 Owen Taylor +- Version 2.1.3, re-add xftprefs patch + +* Fri Nov 22 2002 Havoc Pennington +- rebuild with xft support + +* Wed Nov 20 2002 Havoc Pennington +- rebuild to hack around xft.pc being in the wrong place +- buildreq the pango with pangoxft + +* Thu Nov 7 2002 Havoc Pennington +- 2.1.3 +- remove TODO from doc, no longer exists +- remove 64bit patch, now upstream +- comment out scroll_to patch, jrb has to deal with this +- remove keycode patch now upstream +- remove usintl patch now upstream +- remove imenvar patch, now upstream +- remove xftprefs patch now upstream +- remove xftdraw patch now upstream +- remove installdir patch (no longer applies) and do "makeinstall RUN_QUERY_IMMODULES_TEST=false" +- remove extranotify patch, now upstream +- add gdk-pixbuf-query-loaders to file list +- remove gdk-pixbuf.loaders and gtk.immodules in postun as they are + not owned by the package (these should probably live in /var since they + aren't config files and we overwrite them all the time) + +* Thu Oct 3 2002 Owen Taylor +- Add a fix for a 64bit problem in gtktypeutils.h +- Bump in rebuild for RPM configuration problem + +* Sun Aug 25 2002 Jonathan Blandford +- fix gtk_tree_view_scroll_to_cell + +* Fri Aug 23 2002 Owen Taylor +- Fixed Raleigh theme missing from package list + +* Mon Aug 19 2002 Owen Taylor +- Fix a memory leak in xftprefs.patch +- Fix extra settings notifies on startup that were causing significant + performance problems as fonts were reloaded. + +* Tue Aug 13 2002 Owen Taylor +- Fixes to GtkIMContextSimple compose table for us-intl keyboards + (#70995, Alexandre Oliva) +- Fix problem with keycodes passed to GtkIMContextXIM + +* Thu Aug 8 2002 Owen Taylor +- Remove fixed-ltmain.sh, no longer needed +- Fix bug with GTK_IM_MODULE environment variable +- Remove profile.d entries setting GDK_USE_XFT, since we now default to it on +- Backport patch from CVS HEAD to get Xft to work on non-RENDER XServers +- Version 2.0.6 + +* Tue Jul 16 2002 Owen Taylor +- Fix cut and paste error in xftprefs patch pointed out by Anders Carlsson + +* Mon Jul 8 2002 Owen Taylor +- Add patch to hook Xft up to XSETTINGS + +* Tue Jul 2 2002 Jonathan Blandford +- tree-view fixes for anaconda. Already in CVS. + +* Fri Jun 21 2002 Owen Taylor +- Default GDK_USE_XFT to on, not off + +* Sun Jun 16 2002 Havoc Pennington +- 2.0.5 +- remove xft configure.in patch + +* Fri Jun 07 2002 Havoc Pennington +- rebuild in different environment + +* Fri Jun 7 2002 Havoc Pennington +- rebuild + +* Thu Jun 6 2002 Owen Taylor +- Add patch so that configuration works with pango-1.1/fontconfig + +* Tue Jun 4 2002 Havoc Pennington +- 2.0.3 + +* Mon Jun 03 2002 Havoc Pennington +- rebuild in different environment + +* Mon Jun 3 2002 Havoc Pennington +- drop /etc/gtk-2.0/gtkrc from the file list, will now be provided by redhat-artwork + +* Wed May 29 2002 Havoc Pennington +- rebuild in different environment + +* Wed May 29 2002 Havoc Pennington +- add profile.d entries to set GDK_USE_XFT + +* Thu May 23 2002 Tim Powers +- automated rebuild + +* Thu Apr 25 2002 Havoc Pennington +- rebuild in different environment +- hardcode automake 1.4 req + +* Fri Apr 19 2002 Havoc Pennington +- do the prefix/lib -> libdir thing +- include key themes in the package + +* Mon Apr 15 2002 root +- Fix missing .po files (#63336) + +* Thu Apr 11 2002 Owen Taylor +- Add reference docs to -devel package (#61184) +- Use GTK2_RC_FILES, not GTK_RC_FILES, since KDE points GTK_RC_FILES + to gtk-1.2 ~/.gtkrc + +* Wed Apr 3 2002 Alex Larsson +- Change dependency for glib2 since gtk and glib versions mismatch + +* Wed Apr 3 2002 Alex Larsson +- Update to version 2.0.2 + +* Fri Mar 8 2002 Owen Taylor +- Version 2.0.0 + +* Mon Feb 25 2002 Alex Larsson +- Update to 1.3.15 + +* Thu Feb 21 2002 Alex Larsson +- Bump for rebuild + +* Mon Feb 18 2002 Alex Larsson +- Update to 1.3.14 + +* Fri Feb 15 2002 Havoc Pennington +- add horrible buildrequires hack + +* Thu Feb 14 2002 Havoc Pennington +- 1.3.13.91 snapshot + +* Mon Feb 11 2002 Matt Wilson +- build from CVS snapshot +- use setup -q + +* Wed Jan 30 2002 Owen Taylor +- Version 1.3.13 + +* Tue Jan 22 2002 Havoc Pennington +- automake14 + +* Wed Jan 2 2002 Havoc Pennington +- 1.3.12.90 snapshot + +* Sun Nov 25 2001 Havoc Pennington +- Version 1.3.11 +- check atk/pango versions explicitly prior to build, + so that --nodeps tricks don't result in bad binary RPMs + +* Fri Oct 5 2001 Havoc Pennington +- pixbuf loaders were missing from file list +- conflict with gdk-pixbuf-devel <= 0.11 + +* Thu Oct 4 2001 Havoc Pennington +- cvs snap + +* Thu Sep 27 2001 Havoc Pennington +- sync with Owen's version + +* Thu Sep 20 2001 Havoc Pennington +- smp_mflags +- langify + +* Wed Sep 19 2001 Havoc Pennington +- 1.3.8 +- add automake hackarounds + +* Thu Sep 13 2001 Havoc Pennington +- conflict with old GTK with headers not moved +- prereq new version of pango + +* Mon Sep 10 2001 Havoc Pennington +- update to CVS snapshot + +* Wed Sep 5 2001 Havoc Pennington +- build require specific versions of dependencies + +* Tue Sep 4 2001 Owen Taylor +- Version 1.3.7 + +* Thu Jul 26 2001 Havoc Pennington +- Obsolete Inti and Inti-devel, #49967 + +* Sat Jul 21 2001 Owen Taylor +- PreReq specific pango and atk versions (#49434) +- Don't package gtk.immodules (#49584) +- Added BuildPrereq for libtiff-devel, libjpeg-devel, libpng-devel (#49495) +- Configure with --disable-gtk-doc (#48987) +- Package libgdk_pixbuf_xlib (#47753) + +* Sat Jul 7 2001 Tim Powers +- languify to satisfy rpmlint + +* Thu Jun 21 2001 Florian La Roche +- use something better than libtool + +* Wed Jun 13 2001 Havoc Pennington +- 1.3.6 +- libtool hackery +- obsolete gtk+-gtkbeta-devel + +* Fri May 4 2001 Owen Taylor +- Version 1.3.5 +- Rename to gtk2 + +* Fri Nov 17 2000 Owen Taylor +- Final 1.3.2 + +* Tue Nov 14 2000 Owen Taylor +- New snapshot + +* Mon Nov 13 2000 Owen Taylor +- 1.3.2pre1 snapshot version + +* Sun Aug 13 2000 Owen Taylor +- Rename to 1.3.1b to avoid version increment difficulties + +* Thu Aug 10 2000 Havoc Pennington +- Fix .pc files to not contain -I%{_includedir} + +* Thu Aug 10 2000 Havoc Pennington +- Update to a CVS snapshot + +* Fri Jul 14 2000 Owen Taylor +- Removed stray b from %%postun +- Real 1.3.1 tarball fixing stupid omission in gtk-config + +* Fri Jul 07 2000 Owen Taylor +- Version 1.3.1 +- move back to /usr +- Remove gtk-config.1 manpage from build since + it conflicts with gtk+-devel. When we go to + gtk+ gtk+1.2 setup, we should add it back + +* Fri Jun 30 2000 Owen Taylor +- Rename gtkrc-default source so that it GTK+ package can't remove it + +* Thu Jun 8 2000 Owen Taylor +- Rebuild with a prefix of /opt/gtk-beta + +* Wed May 31 2000 Owen Taylor +- New version + +* Tue Apr 25 2000 Owen Taylor +- Snapshot version to install in /opt/pango + +* Mon Feb 21 2000 Owen Taylor +- Fix weird excess problem that somehow turned up in %{_sysconfdir}/gtkrc.LANG + +* Mon Feb 14 2000 Owen Taylor +- More patches from 1.2.7 + +* Fri Feb 04 2000 Owen Taylor +- Set the charset explicitely for the default font to avoid + problems with XFree86-4.0 where the default charset is + iso10646-1, not iso8859-1. +- Fix problems with size requisitions for scrolled windows + that was causing looping. (RH bug #7997) + +* Thu Feb 03 2000 Owen Taylor +- Explicitely set the foreground of the tooltips to black + to avoid bad interactions with themes that set a + light foreground color. + +* Thu Feb 03 2000 Owen Taylor +- Added large patch of bugfixes in stable branch of CVS + +* Tue Oct 12 1999 Owen Taylor +- Added Akira Higuti's patch for line-wrapping in GTK+ + +* Thu Oct 7 1999 Owen Taylor +- version 1.2.6 + +* Thu Sep 23 1999 Owen Taylor +- version 1.2.5 +- install tutorial GIFs + +* Wed Sep 22 1999 Owen Taylor +- Upgrade to real 1.2.5pre2 +- Changed name so upgrade to 1.2.5 will work :-( +- Add extra gtkrc files +- Add examples and English language tutorial to -devel package + +* Fri Sep 17 1999 Owen Taylor +- Upgraded to 1.2.5pre2. (Actually, pre-pre-2) + +* Tue Aug 17 1999 Michael Fulbright +- added threaded patch + +* Mon Jun 7 1999 Owen Taylor +- Update for GTK+-1.2.3 +- Patches that will be in GTK+-1.2.4 +- Patch to keep GTK+ from coredumping on X IO errors +- Patch to improve compatilibity with GTK-1.2.1 (allow + event mask to be set on realized widgets) + +* Mon Apr 19 1999 Michael Fulbright +- fixes memory leak + +* Mon Apr 12 1999 Owen Taylor +- The important bug fixes that will be in GTK+-1.2.2 + +* Thu Apr 01 1999 Michael Fulbright +- patches from owen to handle various gdk bugs + +* Sun Mar 28 1999 Michael Fulbright +- added XFree86-devel requirement for gtk+-devel + +* Thu Mar 25 1999 Michael Fulbright +- version 1.2.1 + +* Wed Mar 17 1999 Michael Fulbright +- removed /usr/info/dir.gz file from package + +* Fri Feb 26 1999 Michael Fulbright +- Version 1.2.0 + +* Thu Feb 25 1999 Michael Fulbright +- version 1.2.0pre2, patched to use --sysconfdir=%{_sysconfdir} + +* Mon Feb 15 1999 Michael Fulbright +- patched in Owen's patch to fix Metal theme + +* Fri Feb 05 1999 Michael Fulbright +- bumped up to 1.1.15 + +* Wed Feb 03 1999 Michael Fulbright +- bumped up to 1.1.14 + +* Mon Jan 18 1999 Michael Fulbright +- bumped up to 1.1.13 + +* Wed Jan 06 1999 Michael Fulbright +- bumped up to 1.1.12 + +* Wed Dec 16 1998 Michael Fulbright +- added Theme directory to file list +- up to 1.1.7 for GNOME freeze + +* Sun Oct 25 1998 Shawn T. Amundson +- Fixed Source: to point to v1.1 + +* Tue Aug 04 1998 Michael Fulbright +- change %postun to %preun + +* Mon Jun 27 1998 Shawn T. Amundson +- Changed version to 1.1.0 + +* Thu Jun 11 1998 Dick Porter +- Removed glib, since it is its own module now + +* Mon Apr 13 1998 Marc Ewing +- Split out glib package + +* Tue Apr 8 1998 Shawn T. Amundson +- Changed version to 1.0.0 + +* Tue Apr 7 1998 Owen Taylor +- Changed version to 0.99.10 + +* Thu Mar 19 1998 Shawn T. Amundson +- Changed version to 0.99.9 +- Changed gtk home page to www.gtk.org + +* Thu Mar 19 1998 Shawn T. Amundson +- Changed version to 0.99.8 + +* Sun Mar 15 1998 Marc Ewing +- Added aclocal and bin stuff to file list. +- Added -k to the SMP make line. +- Added lib/glib to file list. + +* Fri Mar 14 1998 Shawn T. Amundson +- Changed version to 0.99.7 + +* Fri Mar 14 1998 Shawn T. Amundson +- Updated ftp url and changed version to 0.99.6 + +* Thu Mar 12 1998 Marc Ewing +- Reworked to integrate into gtk+ source tree +- Truncated ChangeLog. Previous Authors: + Trond Eivind Glomsrod + Michael K. Johnson + Otto Hammersmith + From svn at tinysofa.org Thu Jul 1 15:37:12 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:37:12 +1000 (EST) Subject: [tinysofa-svn] r2566 - in tinysofa/snapshot: . hotplug hotplug/current hotplug/current/sources hotplug/current/specs Message-ID: <20040701153712.A4FA24E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:37:11 +1000 (Fri, 02 Jul 2004) New Revision: 2566 Added: tinysofa/snapshot/hotplug/ tinysofa/snapshot/hotplug/current/ tinysofa/snapshot/hotplug/current/sources/ tinysofa/snapshot/hotplug/current/sources/dasd-devfs-compat-0.2.tar.bz2 tinysofa/snapshot/hotplug/current/sources/fxload-2002_04_11.tar.gz tinysofa/snapshot/hotplug/current/sources/hotplug-2001_04_24-nousbinit.patch tinysofa/snapshot/hotplug/current/sources/hotplug-2002_04_01-hwaddr.patch tinysofa/snapshot/hotplug/current/sources/hotplug-2003_08_05-initfile.patch tinysofa/snapshot/hotplug/current/sources/hotplug-2004_04_01.tar.bz2 tinysofa/snapshot/hotplug/current/specs/ tinysofa/snapshot/hotplug/current/specs/hotplug.spec Log: - Add hotplug to snapshot from 2.0. Added: tinysofa/snapshot/hotplug/current/sources/dasd-devfs-compat-0.2.tar.bz2 =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/hotplug/current/sources/dasd-devfs-compat-0.2.tar.bz2 ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/hotplug/current/sources/fxload-2002_04_11.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/hotplug/current/sources/fxload-2002_04_11.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/hotplug/current/sources/hotplug-2001_04_24-nousbinit.patch =================================================================== --- tinysofa/snapshot/hotplug/current/sources/hotplug-2001_04_24-nousbinit.patch 2004-07-01 15:37:10 UTC (rev 2565) +++ tinysofa/snapshot/hotplug/current/sources/hotplug-2001_04_24-nousbinit.patch 2004-07-01 15:37:11 UTC (rev 2566) @@ -0,0 +1,12 @@ +--- hotplug-2001_04_24/etc/hotplug/usb.rc.nousbinit Tue Apr 24 14:59:44 2001 ++++ hotplug-2001_04_24/etc/hotplug/usb.rc Mon May 21 14:40:23 2001 +@@ -196,7 +196,8 @@ + # See how we were called. + case "$1" in + start) +- maybe_start_usb ++ usb_boot_events ++# maybe_start_usb + ;; + stop) + maybe_stop_usb Added: tinysofa/snapshot/hotplug/current/sources/hotplug-2002_04_01-hwaddr.patch =================================================================== --- tinysofa/snapshot/hotplug/current/sources/hotplug-2002_04_01-hwaddr.patch 2004-07-01 15:37:10 UTC (rev 2565) +++ tinysofa/snapshot/hotplug/current/sources/hotplug-2002_04_01-hwaddr.patch 2004-07-01 15:37:11 UTC (rev 2566) @@ -0,0 +1,20 @@ +--- hotplug-2002_04_01/etc/hotplug/net.agent.foo 2003-09-03 16:48:06.000000000 -0400 ++++ hotplug-2002_04_01/etc/hotplug/net.agent 2003-09-03 16:51:52.000000000 -0400 +@@ -17,6 +17,7 @@ + # + + cd /etc/hotplug ++. /etc/sysconfig/network-scripts/network-functions + . ./hotplug.functions + # DEBUG=yes export DEBUG + +@@ -47,6 +48,9 @@ + # RedHat and similar + export IN_HOTPLUG=1 + if [ -x /sbin/ifup ]; then ++ addr=`get_hwaddr ${INTERFACE}` ++ nconfig=`fgrep -il "HWADDR=$addr" /etc/sysconfig/network-scripts/ifcfg-*` ++ [ -n "$nconfig" ] && INTERFACE=$nconfig + debug_mesg invoke ifup $INTERFACE + exec /sbin/ifup $INTERFACE + else Added: tinysofa/snapshot/hotplug/current/sources/hotplug-2003_08_05-initfile.patch =================================================================== --- tinysofa/snapshot/hotplug/current/sources/hotplug-2003_08_05-initfile.patch 2004-07-01 15:37:10 UTC (rev 2565) +++ tinysofa/snapshot/hotplug/current/sources/hotplug-2003_08_05-initfile.patch 2004-07-01 15:37:11 UTC (rev 2566) @@ -0,0 +1,33 @@ +--- hotplug-2003_08_05/hotplug.8.p5 2002-08-13 17:59:30.000000000 -0400 ++++ hotplug-2003_08_05/hotplug.8 2003-09-30 17:29:24.000000000 -0400 +@@ -6,9 +6,6 @@ + [ help | --help | + .I NAME + ] +-.P +-.B /etc/init.d/hotplug +-[start|stop|status|restart] + .SH "DESCRIPTION" + .B hotplug + is a program which is used by the kernel to notify user mode software +@@ -39,11 +36,7 @@ + the appropriate drivers to set up. + .P + .B hotplug +-agents aren't necessarily called only by the kernel though. While the OS +-is initializing, the "cold-plugging" case, the hotplug script in +-.I /etc/init.d/hotplug +-is invoked to make sure that all device connected at boot are properly +-configured, applying the same rules as if they were connected later. ++agents aren't necessarily called only by the kernel though. + .P + Hotplug agents should be used to dynamically adapt to system + configuration changes. +@@ -77,7 +70,6 @@ + /etc/hotplug/NAME* subsystem-specific files, for agents + /etc/hotplug/NAME/DRIVER driver setup scripts, invoked by agents + /etc/hotplug/usb/DRIVER.usermap depmod data for user-mode drivers +-/etc/init.d/hotplug hotplug system service script + .fi + .LP + .SH "SEE ALSO" Added: tinysofa/snapshot/hotplug/current/sources/hotplug-2004_04_01.tar.bz2 =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/hotplug/current/sources/hotplug-2004_04_01.tar.bz2 ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/hotplug/current/specs/hotplug.spec =================================================================== --- tinysofa/snapshot/hotplug/current/specs/hotplug.spec 2004-07-01 15:37:10 UTC (rev 2565) +++ tinysofa/snapshot/hotplug/current/specs/hotplug.spec 2004-07-01 15:37:11 UTC (rev 2566) @@ -0,0 +1,322 @@ +Summary: A helper application which loads modules for USB devices. +Name: hotplug +Version: 2004_04_01 +Release: 1ts +Epoch: 3 +Group: System Environment/Kernel +License: GPL +URL: http://linux-hotplug.sourceforge.net/ +# This is incompatible with any current code +Obsoletes: hotplug-gtk +Source0: %{name}-%{version}.tar.bz2 +Source4: fxload-2002_04_11.tar.gz +Source5: dasd-devfs-compat-0.2.tar.bz2 + +%ifnarch s390 s390x +%define with_fxload 1 +%define with_dasd_devfs 0 +Requires: usbutils >= 0.9 + +%else +%define with_fxload 0 +%define with_dasd_devfs 1 +%endif + +# We don't want hotplug to initialize the USB core modules, but we +# want to synthesize boot events +Patch0: hotplug-2001_04_24-nousbinit.patch + +# We don't include initscript, don't reference it in the man page +Patch5: hotplug-2003_08_05-initfile.patch + +# make sure we bring up the right network interface name +Patch11: hotplug-2002_04_01-hwaddr.patch + +BuildRoot: %{_tmppath}/%{name}-%{version}-root +Prereq: chkconfig + +%description +The term "hotplugging" refers to the dynamic reconfiguration performed +after a device has been attached to a running system. This package +contains the application which is called by the kernel when a USB +device is added; hotplug then loads the required modules for that +device. + +%prep +%setup -q -a 4 -a 5 + +%patch0 -p1 +%patch5 -p1 +%patch11 -p1 + +rm -f etc/hotplug/*.orig + +%build +%if %{with_fxload} +pushd fxload-2002_04_11 +make +popd +%endif + +%install +# build directories +rm -rf $RPM_BUILD_ROOT +make prefix=${RPM_BUILD_ROOT} install + + +%if %{with_fxload} +# firmware load utility +pushd fxload-2002_04_11 +install -m 755 fxload $RPM_BUILD_ROOT/sbin +install -m 644 fxload.8 $RPM_BUILD_ROOT/%{_mandir}/man8/ +mv README.txt ../README.txt.fxload +popd +%endif + +%if %{with_dasd_devfs} +pushd dasd-devfs-compat-0.2 +# install the main hotplug script +install -m 755 sbin/* $RPM_BUILD_ROOT/sbin/ + +# install the helper hotplug scripts +cp -a -r etc/hotplug/* ${RPM_BUILD_ROOT}/etc/hotplug/ +popd +%endif + +# We don't use this +rm -f $RPM_BUILD_ROOT/etc/init.d/hotplug + +%clean +rm -fr $RPM_BUILD_ROOT + +%files +%defattr(-,root,root) +%doc README ChangeLog +%if %{with_fxload} + %doc README.txt.fxload +%endif +/sbin/* +%config /etc/hotplug/* +%dir /etc/hotplug +%dir /etc/hotplug.d +%config /etc/hotplug.d/* +%config(noreplace) /etc/hotplug/usb.usermap +%dir /var/run/usb +%{_mandir}/*/* + +%changelog +* Mon May 3 2004 Bill Nottingham 3:2004_04_01-1 +- update to 2004-04-01 release, fixes #116638, #119161, #111956, #115277 + +* Wed Mar 24 2004 Bill Nottingham 3:2004_03_11-1 +- update to 2004_03_11 + +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Fri Jan 09 2004 Than Ngo 3:2004_01_05-1 +- update 2004_01_05, which is needed for loading firware +- remove several patch files, which are included in new upstream + +* Wed Nov 05 2003 Florian La Roche +- add further patch for tape hotplug agent +- add zcrypt plugin + +* Tue Sep 30 2003 Bill Nottingham 2003_08_05-1 +- update to 2003_08_05, adjust patches + +* Wed Sep 3 2003 Bill Nottingham 2002_04_1-20 +- fix bringing up of hotplug network devices that are configured as + something other than their device name (#100622) +- nuke hotplug-gtk package + +* Fri Jun 06 2003 Phil Knirsch 2002_04_1-19 +- Bumped release and rebuilt. + +* Wed Jun 04 2003 Elliot Lee 2002_04_1-18.1 +- rebuilt + +* Thu Feb 20 2003 Phil Knirsch 2002_04_1-17.1 +- Added dasd and tape hotplug support for s390(x) + +* Tue Feb 11 2003 Bill Nottingham 2002_04_1-17 +- add IN_HOTPLUG back (#84045) + +* Wed Jan 22 2003 Tim Powers +- rebuilt + +* Mon Jan 20 2003 Florian La Roche +- add IBM mainframe changes + +* Mon Dec 2 2002 Bill Nottingham 2002_04_01-14 +- devlabel support +- utf8-ify spec file + +* Wed Aug 28 2002 Trond Eivind Glomsr?d 2002_04_01-13 +- Add new device to hotplug list (#72646) + +* Fri Aug 23 2002 Trond Eivind Glomsr?d 2002_04_01-12 +- Merge remove sections (#72362) + +* Wed Aug 14 2002 Trond Eivind Glomsr?d 2002_04_01-11 +- Add fxload (#71495) +- More wacom + +* Wed Aug 7 2002 Trond Eivind Glomsr?d 2002_04_01-10 +- Handle ip tunnel devices properly (#70659) +- Add support for another wacom tablet + +* Wed Jun 26 2002 Preston Brown +- remove wireless patch, should be handled all by ifup. + +* Fri Jun 21 2002 Tim Powers +- automated rebuild + +* Tue Jun 18 2002 Trond Eivind Glomsr?d 2002_04_01-7 +- Minor syntax change in specfile to satisfy new rpm + +* Sun May 26 2002 Tim Powers +- automated rebuild + +* Tue May 21 2002 Trond Eivind Glomsr?d 2002_04_01-5 +- Remove the reference that got away (#65200) + +* Wed May 15 2002 Trond Eivind Glomsr?d 2002_04_01-4 +- Don't reference the initscript in the man page(#64800) + +* Thu Apr 11 2002 Trond Eivind Glomsr?d 2002_04_01-3 +- Make it insert the joydev module for Gravis Gamepad and Saitek + Cyborg 3D USB (#63148) + +* Fri Apr 5 2002 Trond Eivind Glomsr?d 2002_04_01-2 +- Remove the build root after build (#62790) + +* Mon Apr 1 2002 Trond Eivind Glomsr?d 2002_04_01-1 +- 2002_04_01 + +* Thu Feb 21 2002 Trond Eivind Glomsr?d 2002_01_14-2 +- Rebuild + +* Mon Jan 14 2002 Trond Eivind Glomsr?d 2002_01_14-1 +- 2002_01_14 +- usbutils is now a separate package. Require it. + +* Tue Nov 6 2001 Trond Eivind Glomsr?d 2001_09_19-1 +- 2001_09_19 + +* Tue Nov 6 2001 Trond Eivind Glomsr?d 2001_04_24-13 +- Add /etc/hotplug/usb directory (#55775) + +* Tue Sep 18 2001 Trond Eivind Glomsr?d 2001_04_24-12 +- Add patch from mlord at pobox.com to use gt, not ge for one of the comparions + in the usb.agent script(#53435). We use usbmodules for this now, so the + patch isn't in the path of execution. + +* Mon Aug 27 2001 Trond Eivind Glomsr?d 2001_04_24-11 +- Install usbmodules from usbutils to help sove various + module insertion problems (#52630, #52100, #51229, #52546) + +* Sun Aug 19 2001 Bill Nottingham +- revert last change. I was on crack. + +* Wed Aug 8 2001 Bill Nottingham +- handle network unregistration events too + +* Mon Aug 6 2001 Trond Eivind Glomsr?d +- Add extra identifiers for Wacom tablets (#50454) +- Define IN_HOTPLUG before invoking ifup (part of #47483) + +* Mon Jul 16 2001 Bill Nottingham +- own /etc/hotplug +- what dunderhead put that broken code in the wireless stuff? Oh yeah, me. + (#49021) + +* Tue Jul 10 2001 Trond Eivind Glomsr?d +- Add defattr to gtk subpackage +- make the lines in the description shorter + +* Sun Jul 8 2001 Bill Nottingham +- fix namespace collision with initscripts in net.agent (HWADDR), + use ip, not ifconfig + +* Tue Jun 19 2001 Florian La Roche +- Preston is right, ExcludeArch is better + +* Tue Jun 19 2001 Arjan van de Ven +- Added hotplug PCI support + +* Wed Jun 13 2001 Trond Eivind Glomsr?d +- Change for wireless as suggested in #44381 + +* Mon May 21 2001 Trond Eivind Glomsr?d +- 2001-04-24 packages +- redo all patches, drop some, consolidate others +- Include new man page + +* Sun Apr 01 2001 Erik Troan +- devices wouldn't match the upper limit of device id ranges + +* Thu Mar 29 2001 Trond Eivind Glomsr?d +- Make it sleep (20 intervals of 30 seconds) if /tmp is ro + instead of exiting. This should make "hotplugging" + of devices present at boot time work. + +* Tue Mar 20 2001 Trond Eivind Glomsr?d +- run updfstab on remove events +- remove the initscript, usbdevfs is now initialized before the controller + +* Fri Mar 2 2001 Trond Eivind Glomsr?d +- don't ifup interfaces when the network is stopped + (#22978) + +* Fri Mar 2 2001 Bill Nottingham +- move wireless invocations to the right place + +* Thu Mar 1 2001 Trond Eivind Glomsr?d +- Run updfstab when adding usb-storage devices + +* Thu Mar 1 2001 Bill Nottingham +- don't ship backup files + +* Wed Feb 28 2001 Bill Nottingham +- ignore cipe, plip, and loopback devices as well + +* Wed Feb 28 2001 Nalin Dahyabhai +- fire off netreport updates when interfaces get registered/deregistered + +* Tue Feb 27 2001 Bill Nottingham +- invoke the pcmcia wireless script for wireless devices + +* Thu Feb 22 2001 Trond Eivind Glomsr?d +- add pci hotplug scripts (those weren't the ones bringing machines down) +- activate the script +- change initscript so it never tries to load usb controller modules, just synthesize events + +* Fri Feb 16 2001 Trond Eivind Glomsr?d +- Fix ppp/isdn issue (interface up/down/up/down...) + +* Thu Feb 15 2001 Trond Eivind Glomsr?d +- remove init script - it makes some of the Dell servers hang. +- remove chkconfig in post, preun +- only include the usb files in /etc/hotplug - PCI hotplug + doesn't work + +* Wed Feb 14 2001 Trond Eivind Glomsr?d +- Make summary and description match our old package +- sanitize initscript, so it matches the others +- Add Epoch, so we can upgrade older RPMs with Epoch: 2 + +* Wed Feb 14 2001 Greg Kroah-Hartman +- 2001_02_14 release + +* Wed Jan 17 2001 Greg Kroah-Hartman +- changed specfile based on Chmouel Boudjnah's comments. + +* Tue Jan 16 2001 Greg Kroah-Hartman +- tweaked the file locations due to the change in the tarball structure. +- 2001_01_16 release + +* Mon Jan 15 2001 Greg Kroah-Hartman +- First cut at a spec file for the hotplug scripts. +- added patch to usb.rc to allow chkconfig to install and remove it. + From svn at tinysofa.org Thu Jul 1 15:37:08 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:37:08 +1000 (EST) Subject: [tinysofa-svn] r2564 - in tinysofa/snapshot: . guile guile/current guile/current/sources guile/current/specs Message-ID: <20040701153708.02D3B4E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:37:08 +1000 (Fri, 02 Jul 2004) New Revision: 2564 Added: tinysofa/snapshot/guile/ tinysofa/snapshot/guile/current/ tinysofa/snapshot/guile/current/sources/ tinysofa/snapshot/guile/current/sources/guile-1.4.1-rpath.patch tinysofa/snapshot/guile/current/sources/guile-1.6.0-ia64.patch tinysofa/snapshot/guile/current/sources/guile-1.6.0-libtool.patch tinysofa/snapshot/guile/current/sources/guile-1.6.0-ppc64.patch tinysofa/snapshot/guile/current/sources/guile-1.6.0-unknown_arch.patch tinysofa/snapshot/guile/current/sources/guile-1.6.4.tar.gz tinysofa/snapshot/guile/current/specs/ tinysofa/snapshot/guile/current/specs/guile.spec Log: - Add guile to snapshot from 2.0. Added: tinysofa/snapshot/guile/current/sources/guile-1.4.1-rpath.patch =================================================================== --- tinysofa/snapshot/guile/current/sources/guile-1.4.1-rpath.patch 2004-07-01 15:37:06 UTC (rev 2563) +++ tinysofa/snapshot/guile/current/sources/guile-1.4.1-rpath.patch 2004-07-01 15:37:08 UTC (rev 2564) @@ -0,0 +1,26 @@ +--- guile-1.4.1/guile-readline/configure.libtool 2002-05-13 15:12:44.000000000 -0400 ++++ guile-1.4.1/guile-readline/configure 2002-11-11 18:37:43.000000000 -0500 +@@ -5117,8 +5117,8 @@ + esac + + if test "$ld_shlibs" = yes; then +- runpath_var=LD_RUN_PATH +- hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir' ++ runpath_var= ++ hardcode_libdir_flag_spec= + export_dynamic_flag_spec='${wl}--export-dynamic' + case $host_os in + cygwin* | mingw* | pw32*) +--- guile-1.4.1/configure.libtool 2002-05-13 15:11:51.000000000 -0400 ++++ guile-1.4.1/configure 2002-11-11 18:37:05.000000000 -0500 +@@ -6270,8 +6270,8 @@ + esac + + if test "$ld_shlibs" = yes; then +- runpath_var=LD_RUN_PATH +- hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir' ++ runpath_var= ++ hardcode_libdir_flag_spec= + export_dynamic_flag_spec='${wl}--export-dynamic' + case $host_os in + cygwin* | mingw* | pw32*) Added: tinysofa/snapshot/guile/current/sources/guile-1.6.0-ia64.patch =================================================================== --- tinysofa/snapshot/guile/current/sources/guile-1.6.0-ia64.patch 2004-07-01 15:37:06 UTC (rev 2563) +++ tinysofa/snapshot/guile/current/sources/guile-1.6.0-ia64.patch 2004-07-01 15:37:08 UTC (rev 2564) @@ -0,0 +1,165 @@ +--- guile-1.6.0/libguile/continuations.h.ia64 Mon Oct 8 16:17:35 2001 ++++ guile-1.6.0/libguile/continuations.h Tue Dec 3 11:38:29 2002 +@@ -45,10 +45,6 @@ + + #include "libguile/__scm.h" + +-#ifdef __ia64__ +-#include +-extern unsigned long __libc_ia64_register_backing_store_base; +-#endif + + + /* a continuation SCM is a non-immediate pointing to a heap cell with: +@@ -66,11 +62,6 @@ + SCM throw_value; + jmp_buf jmpbuf; + SCM dynenv; +-#ifdef __ia64__ +- ucontext_t ctx; +- void *backing_store; +- unsigned long backing_store_size; +-#endif /* __ia64__ */ + SCM_STACKITEM *base; /* base of the live stack, before it was saved. */ + size_t num_stack_items; /* size of the saved stack. */ + unsigned long seq; /* dynamic root identifier. */ +--- guile-1.6.0/libguile/continuations.c.ia64 Tue Dec 3 11:37:34 2002 ++++ guile-1.6.0/libguile/continuations.c Tue Dec 3 11:38:14 2002 +@@ -73,12 +73,6 @@ + + scm_gc_mark (continuation->throw_value); + scm_mark_locations (continuation->stack, continuation->num_stack_items); +-#ifdef __ia64__ +- if (continuation->backing_store) +- scm_mark_locations (continuation->backing_store, +- continuation->backing_store_size / +- sizeof (SCM_STACKITEM)); +-#endif /* __ia64__ */ + return continuation->dynenv; + } + +@@ -93,10 +87,6 @@ + size_t bytes_free = sizeof (scm_t_contregs) + + extra_items * sizeof (SCM_STACKITEM); + +-#ifdef __ia64__ +- bytes_free += continuation->backing_store_size; +- scm_must_free (continuation->backing_store); +-#endif /* __ia64__ */ + scm_must_free (continuation); + return bytes_free; + } +@@ -114,16 +104,6 @@ + return 1; + } + +-#ifdef __ia64__ +-struct rv +-{ +- long retval; +- long first_return; +-}; +-extern struct rv getcontext (ucontext_t *); +-extern int setcontext (ucontext_t *); +-#endif /* __ia64__ */ +- + /* this may return more than once: the first time with the escape + procedure, then subsequently with the value to be passed to the + continuation. */ +@@ -136,9 +116,6 @@ + scm_t_contregs *rootcont = SCM_CONTREGS (scm_rootcont); + long stack_size; + SCM_STACKITEM * src; +-#ifdef __ia64__ +- struct rv rv; +-#endif + + SCM_ENTER_A_SECTION; + SCM_FLUSH_REGISTER_WINDOWS; +@@ -162,28 +139,6 @@ + #endif + memcpy (continuation->stack, src, sizeof (SCM_STACKITEM) * stack_size); + +-#ifdef __ia64__ +- rv = getcontext (&continuation->ctx); +- if (rv.first_return) +- { +- continuation->backing_store_size = +- continuation->ctx.uc_mcontext.sc_ar_bsp - +- __libc_ia64_register_backing_store_base; +- continuation->backing_store = NULL; +- continuation->backing_store = +- scm_must_malloc (continuation->backing_store_size, FUNC_NAME); +- memcpy (continuation->backing_store, +- (void *) __libc_ia64_register_backing_store_base, +- continuation->backing_store_size); +- *first = 1; +- return cont; +- } +- else +- { +- *first = 0; +- return continuation->throw_value; +- } +-#else /* !__ia64__ */ + if (setjmp (continuation->jmpbuf)) + { + *first = 0; +@@ -194,7 +149,6 @@ + *first = 1; + return cont; + } +-#endif /* !__ia64__ */ + } + #undef FUNC_NAME + +@@ -235,14 +189,7 @@ + #endif + + continuation->throw_value = val; +-#ifdef __ia64__ +- memcpy ((void *) __libc_ia64_register_backing_store_base, +- continuation->backing_store, +- continuation->backing_store_size); +- setcontext (&continuation->ctx); +-#else + longjmp (continuation->jmpbuf, 1); +-#endif + } + + +--- guile-1.6.0/libguile/gc.c.ia64 Tue Dec 3 11:37:37 2002 ++++ guile-1.6.0/libguile/gc.c Tue Dec 3 11:37:54 2002 +@@ -52,11 +52,6 @@ + #include + #include + +-#ifdef __ia64__ +-#include +-extern unsigned long __libc_ia64_register_backing_store_base; +-#endif +- + #include "libguile/_scm.h" + #include "libguile/eval.h" + #include "libguile/stime.h" +@@ -1032,20 +1027,7 @@ + scm_t_c_hook scm_after_sweep_c_hook; + scm_t_c_hook scm_after_gc_c_hook; + +-#ifdef __ia64__ +-# define SCM_MARK_BACKING_STORE() do { \ +- ucontext_t ctx; \ +- SCM_STACKITEM * top, * bot; \ +- getcontext (&ctx); \ +- scm_mark_locations ((SCM_STACKITEM *) &ctx.uc_mcontext, \ +- ((size_t) (sizeof (SCM_STACKITEM) - 1 + sizeof ctx.uc_mcontext) \ +- / sizeof (SCM_STACKITEM))); \ +- bot = (SCM_STACKITEM *) __libc_ia64_register_backing_store_base; \ +- top = (SCM_STACKITEM *) ctx.uc_mcontext.sc_ar_bsp; \ +- scm_mark_locations (bot, top - bot); } while (0) +-#else + # define SCM_MARK_BACKING_STORE() +-#endif + + void + scm_igc (const char *what) Added: tinysofa/snapshot/guile/current/sources/guile-1.6.0-libtool.patch =================================================================== --- tinysofa/snapshot/guile/current/sources/guile-1.6.0-libtool.patch 2004-07-01 15:37:06 UTC (rev 2563) +++ tinysofa/snapshot/guile/current/sources/guile-1.6.0-libtool.patch 2004-07-01 15:37:08 UTC (rev 2564) @@ -0,0 +1,22 @@ +--- guile-1.4.1/guile-readline/configure.libtool 2002-05-13 15:12:44.000000000 -0400 ++++ guile-1.4.1/guile-readline/configure 2002-11-11 18:20:45.000000000 -0500 +@@ -3059,7 +3059,7 @@ + # This must be Linux ELF. + linux-gnu*) + case $host_cpu in +- alpha* | hppa* | i*86 | mips | mipsel | powerpc* | sparc* | ia64*) ++ alpha* | hppa* | i*86 | mips | mipsel | powerpc* | sparc* | ia64* | s390* | x86_64) + lt_cv_deplibs_check_method=pass_all ;; + *) + # glibc up to 2.1.1 does not perform some relocations on ARM +--- guile-1.4.1/configure.libtool 2002-05-13 15:11:51.000000000 -0400 ++++ guile-1.4.1/configure 2002-11-11 18:20:45.000000000 -0500 +@@ -4610,7 +4610,7 @@ + # This must be Linux ELF. + linux-gnu*) + case $host_cpu in +- alpha* | hppa* | i*86 | mips | mipsel | powerpc* | sparc* | ia64*) ++ alpha* | hppa* | i*86 | mips | mipsel | powerpc* | sparc* | ia64* | s390* | x86_64) + lt_cv_deplibs_check_method=pass_all ;; + *) + # glibc up to 2.1.1 does not perform some relocations on ARM Added: tinysofa/snapshot/guile/current/sources/guile-1.6.0-ppc64.patch =================================================================== --- tinysofa/snapshot/guile/current/sources/guile-1.6.0-ppc64.patch 2004-07-01 15:37:06 UTC (rev 2563) +++ tinysofa/snapshot/guile/current/sources/guile-1.6.0-ppc64.patch 2004-07-01 15:37:08 UTC (rev 2564) @@ -0,0 +1,33 @@ +--- guile-1.6.0/libguile/gc_os_dep.c.sopwith 2003-02-11 08:53:15.000000000 -0500 ++++ guile-1.6.0/libguile/gc_os_dep.c 2003-02-11 09:01:43.000000000 -0500 +@@ -203,6 +203,10 @@ + # define POWERPC + # define mach_type_known + # endif ++# if defined(LINUX) && defined(__powerpc64__) ++# define POWERPC64 ++# define mach_type_known ++# endif + # if defined(LINUX) && defined(__mc68000__) + # define M68K + # define mach_type_known +@@ -591,6 +595,19 @@ + # endif + # endif + ++# ifdef POWERPC64 ++# define MACH_TYPE "POWERPC64" ++# define ALIGNMENT 8 ++# define CPP_WORDSZ 64 ++# define HEURISTIC1 ++# define DYNAMIC_LOADING ++# undef STACK_GRAN ++# define STACK_GRAN 0x10000000 ++# define LINUX_DATA_START ++ extern int _end; ++# define DATAEND (&_end) ++# endif ++ + # ifdef POWERPC + # define MACH_TYPE "POWERPC" + # ifdef MACOS Added: tinysofa/snapshot/guile/current/sources/guile-1.6.0-unknown_arch.patch =================================================================== --- tinysofa/snapshot/guile/current/sources/guile-1.6.0-unknown_arch.patch 2004-07-01 15:37:06 UTC (rev 2563) +++ tinysofa/snapshot/guile/current/sources/guile-1.6.0-unknown_arch.patch 2004-07-01 15:37:08 UTC (rev 2564) @@ -0,0 +1,16 @@ +--- guile-1.6.0/libguile/gc_os_dep.c.unknown_arch 2002-07-08 11:09:32.000000000 -0400 ++++ guile-1.6.0/libguile/gc_os_dep.c 2002-12-05 08:58:12.000000000 -0500 +@@ -195,11 +195,11 @@ + # define I386 + # define mach_type_known + # endif +-# if defined(LINUX) && (defined(__ia64__) || defined(__ia64)) ++# if defined(LINUX) && (defined(__ia64__) || defined(__ia64)) || defined(__x86_64__) + # define IA64 + # define mach_type_known + # endif +-# if defined(LINUX) && defined(powerpc) ++# if defined(LINUX) && defined(powerpc) || defined(__s390__) + # define POWERPC + # define mach_type_known + # endif Added: tinysofa/snapshot/guile/current/sources/guile-1.6.4.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/guile/current/sources/guile-1.6.4.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/guile/current/specs/guile.spec =================================================================== --- tinysofa/snapshot/guile/current/specs/guile.spec 2004-07-01 15:37:06 UTC (rev 2563) +++ tinysofa/snapshot/guile/current/specs/guile.spec 2004-07-01 15:37:08 UTC (rev 2564) @@ -0,0 +1,391 @@ +%define qthreads_archs i386 sparc +# Once 'as' is fixed on alpha, that arch should be added to qthreads_archs + +Summary: A GNU implementation of Scheme for application extensibility. +Name: guile +Version: 1.6.4 +Release: 11ts +Source: ftp://ftp.gnu.org/gnu/guile-%{version}.tar.gz +Patch1: guile-1.6.0-libtool.patch +Patch2: guile-1.4.1-rpath.patch +Patch3: guile-1.6.0-unknown_arch.patch +Patch4: guile-1.6.0-ia64.patch +Patch5: guile-1.6.0-ppc64.patch +License: GPL +Group: Development/Languages +Buildroot: %{_tmppath}/%{name}-%{version}-root +BuildPrereq: libtool +Prereq: /sbin/install-info +Prereq: readline +Prereq: umb-scheme >= 3.2-21 +Epoch: 5 + +%description +GUILE (GNU's Ubiquitous Intelligent Language for Extension) is a library +implementation of the Scheme programming language, written in C. GUILE +provides a machine-independent execution platform that can be linked in +as a library during the building of extensible programs. + +Install the guile package if you'd like to add extensibility to programs +that you are developing. + +%package devel +Summary: Libraries and header files for the GUILE extensibility library. +Group: Development/Libraries +Requires: guile = %{epoch}:%{PACKAGE_VERSION} + +%description devel +The guile-devel package includes the libraries, header files, etc., +that you'll need to develop applications that are linked with the +GUILE extensibility library. + +You need to install the guile-devel package if you want to develop +applications that will be linked to GUILE. You'll also need to +install the guile package. + +%prep +%setup -q +%patch1 -p1 -b .libtool +%patch2 -p1 -b .rpath +%patch3 -p1 -b .unknown_arch +%patch4 -p1 -b .ia64 +%patch5 -p1 -b .ppc64 + +%build + +WITH_THREADS=--with-threads +%ifnarch %{qthreads_archs} +WITH_THREADS= +%endif + +%ifarch ia64 s390 +# alpha s390x ppc +export CFLAGS="$RPM_OPT_FLAGS -O0" +%endif +%configure $WITH_THREADS + +make -C libguile scmconfig.h +# Ouch! guile forgets to set it's onw shard lib path to use shared uninstalled +# apps. It ain't pretty, but it works. +LD_LIBRARY_PATH="`pwd`/libguile/.libs:`pwd`/qt/.libs:`pwd`/libguile-ltdl/.libs" \ + make LDFLAGS="-L`pwd`/libguile/.libs" %{?_smp_mflags} + +%install +[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT + +# Convince guile to be packaged. +perl -p -i -e "s|^libdir.*|libdir='$RPM_BUILD_ROOT%{_libdir}'|g" \ + guile-readline/libguilereadline.la + +perl -p -i -e "s|^relink_command.*||g" guile-readline/libguilereadline.la + +%{makeinstall} + +# Fix up libtool libraries. +find $RPM_BUILD_ROOT -name '*.la' | \ + xargs perl -p -i -e "s|$RPM_BUILD_ROOT||g" + +chmod +x ${RPM_BUILD_ROOT}%{_libdir}/libguile.so.* +mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/guile/site +ln -s ../../share/umb-scheme/slib ${RPM_BUILD_ROOT}%{_datadir}/guile/slib +ln -s ../../share/umb-scheme/slibcat ${RPM_BUILD_ROOT}%{_datadir}/guile/slibcat + +# Remove unpackaged files +rm -f ${RPM_BUILD_ROOT}%{_bindir}/guile-doc-snarf +rm -f ${RPM_BUILD_ROOT}%{_bindir}/guile-func-name-check +rm -f ${RPM_BUILD_ROOT}%{_bindir}/guile-snarf.awk +rm -rf ${RPM_BUILD_ROOT}/usr/include/guile-readline +rm -rf ${RPM_BUILD_ROOT}%{_datadir}/info/dir + +# Compress large documentation +bzip2 NEWS + +%clean +rm -rf $RPM_BUILD_ROOT + +%post -p /sbin/ldconfig + +%postun -p /sbin/ldconfig + +%post devel +/sbin/install-info %{_infodir}/guile.info.gz %{_infodir}/dir +/sbin/install-info %{_infodir}/r5rs.info.gz %{_infodir}/dir +/sbin/install-info %{_infodir}/goops.info.gz %{_infodir}/dir + +%preun devel +/sbin/install-info --delete %{_infodir}/guile.info.gz %{_infodir}/dir +/sbin/install-info --delete %{_infodir}/r5rs.info.gz %{_infodir}/dir +/sbin/install-info --delete %{_infodir}/goops.info.gz %{_infodir}/dir + +%files +%defattr(-,root,root,-) +%doc AUTHORS COPYING ChangeLog GUILE-VERSION HACKING NEWS.bz2 README +%doc SNAPSHOTS ANON-CVS THANKS +%{_bindir}/guile +%{_bindir}/guile-tools +%{_libdir}/libguile.so.* +%{_libdir}/libguile-ltdl.so.* +%{_libdir}/libguilereadline-v-12.* +%{_libdir}/libguile-srfi-srfi-* +%ifarch %{qthreads_archs} +%{_libdir}/libqthreads.so.* +%endif +%dir %{_datadir}/guile +%dir %{_datadir}/guile/site +%{_datadir}/aclocal/* +%{_datadir}/guile/slib +%{_datadir}/guile/slibcat +%{_datadir}/guile/1.6 + +%files devel +%defattr(-,root,root,-) +%{_bindir}/guile-config +%{_bindir}/guile-snarf +%{_libdir}/libguile.a +%{_libdir}/libguile.la +%{_libdir}/libguile.so +%{_libdir}/libguile-ltdl.a +%{_libdir}/libguile-ltdl.la +%{_libdir}/libguile-ltdl.so +%ifarch %{qthreads_archs} +%{_libdir}/libqthreads.a +%{_libdir}/libqthreads.la +%{_libdir}/libqthreads.so +%endif +%{_includedir}/guile +%{_includedir}/libguile +%{_includedir}/libguile.h +%{_infodir}/* + +%changelog +* Fri Apr 16 2004 Warren Togami 5:1.6.4-11 +- Fix post failure and duplicate rpm in database +- Compress NEWS +- other minor cleanups + +* Wed Apr 14 2004 Phil Knirsch 5:1.6.4-10 +- Fixed info file stuff (#112487) + +* Tue Mar 02 2004 Elliot Lee +- rebuilt + +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Wed Aug 27 2003 Bill Nottingham 5:1.6.4-8.2 +- rebuild (#103148) + +* Tue Aug 19 2003 Phil Knirsch 5:1.6.4-8.1 +- rebuilt + +* Tue Aug 19 2003 Phil Knirsch 5:1.6.4-8 +- Moved dynamic loadable libraries out file devel into main (#98392). + +* Wed Jul 02 2003 Phil Knirsch 5:1.6.4-7.1 +- rebuilt + +* Wed Jul 02 2003 Phil Knirsch 5:1.6.4-7 +- Added srfi libs (#98392). + +* Sun Jun 8 2003 Tim Powers 5:1.6.4-6.1 +- add epoch for versioned requires +- built for RHEL + +* Wed Jun 04 2003 Elliot Lee +- rebuilt + +* Fri May 16 2003 Phil Knirsch 5:1.6.4-5 +- Bumped release and rebuilt. + +* Fri May 16 2003 Phil Knirsch 5:1.6.4-4 +- Install and package info files, too. + +* Fri May 16 2003 Phil Knirsch 5:1.6.4-3 +- Bumped release and rebuilt. + +* Fri May 16 2003 Phil Knirsch 5:1.6.4-2 +- Fixed .la file problem, moved from devel to normal package. + +* Tue May 06 2003 Phil Knirsch 5:1.6.4-1 +- Update to 1.6.4 + +* Thu Feb 13 2003 Elliot Lee 5:1.6.0-5 +- Patch7 - fix for ppc64 +- Fix qthreads dealie, including actually enabling them + +* Wed Jan 22 2003 Tim Powers +- rebuilt + +* Fri Dec 06 2002 Phil Knirsch 5:1.6.0-3 +- Included s390 as working arch as well, switch to general unknown arch patch + +* Tue Dec 3 2002 Tim Powers 5:1.6.0-2 +- rebuild to fix broken deps +- fix continuations.h on ia64 + +* Tue Dec 03 2002 Phil Knirsch 1.6.0-1 +- Make it build on x86_64. +- Integrated and fixed Than's update to 1.6.0. +- Fixed some things in the %files section. + +* Mon Nov 11 2002 Than Ngo 1.4.1-2 +- fix to build on s390*/x86_64 -> include libguilereadline.so +- fix to link libltdl +- don't use rpath + +* Thu Nov 07 2002 Phil Knirsch 1.4.1-1 +- Updated to guile-1.4.1 +- libguilereadline.so doesn't work on x86_64 yet, so don't package it. + +* Wed Nov 06 2002 Phil Knirsch 1.4-10 +- Fixed unpackaged files. + +* Tue Nov 5 2002 Bill Nottingham 1.4-9 +- Remove qthread from x86_64 as well. + +* Wed Jul 17 2002 Phil Knirsch 1.4-8 +- Remove qthread from ppc as well. + +* Wed Jul 10 2002 Phil Knirsch 1.4-7 +- Fixed some more %file lib related errors (). + +* Fri Jun 21 2002 Tim Powers 1.4-6 +- automated rebuild + +* Wed Jun 19 2002 Phil Knirsch 1.4-5 +- Don't forcibly strip binaries + +* Thu May 23 2002 Tim Powers +- automated rebuild + +* Mon May 06 2002 Florian La Roche +- adjust for mainframe and alpha + +* Fri Jan 25 2002 Bill Nottingham +- ship qthread devel links too + +* Fri Jan 25 2002 Phil Knirsch +- Update again to 1.4. +- Disable --with-threads for IA64 as it doesn't work. + +* Thu Jan 24 2002 Phil Knirsch 1.3.4-17/4 +- Enabled --with-threads and removed --enable-dynamic-linking for configure + (bug #58597) + +* Mon Sep 3 2001 Philipp Knirsch 1.3.4-16/3 +- Fixed problem with read-only /usr pollution of /usr/share/umb-scheme/slibcat + (#52742) + +* Wed Aug 22 2001 Philipp Knirsch 1.3.4-15/2 +- Fixed /tmp buildroot pollution (#50398) + +* Mon Jun 12 2001 Florian La Roche 1.3.4-14/1 +- size_t patch from + +* Fri May 11 2001 Bernhard Rosenkraenzer 1.3.4-13/1 +- Rebuild with new readline + +* Wed Feb 28 2001 Philipp Knirsch +- Fixed missing devel version dependancy. +- Fixed bug #20134 for good this time. + +* Mon Jan 22 2001 Than Ngo +- disable optimization on ia64 (compiler bug) (bug #23186) + +* Tue Dec 12 2000 Philipp Knirsch +- Fixed %files bug #20134 where the /usr/lib/libguilereadline.so didn't get + installed for the non devel version. + +* Fri Jul 14 2000 Nalin Dahyabhai +- Add version number to prereq for umb-scheme to get the post-install to + work properly. + +* Thu Jul 13 2000 Nalin Dahyabhai +- Add an Epoch = 1 in case anyone happened to have 1.4 installed. + +* Thu Jul 13 2000 Prospector +- automatic rebuild + +* Tue Jul 11 2000 Nalin Dahyabhai +- Back down to 1.3.4. +- Fix to actually link against the version of libguile in the package. + +* Sun Jun 4 2000 Nalin Dahyabhai +- FHS fixups using the %%{makeinstall} macro. + +* Sun Mar 26 2000 Florian La Roche +- fix preun-devel +- call ldconfig directly in postun + +* Fri Mar 24 2000 Bernhard Rosenkraenzer +- rebuild with new readline +- update to 1.3.4 + +* Mon Feb 28 2000 Nalin Dahyabhai +- using the same catalog as umb-scheme makes umb-scheme a prereq + +* Thu Feb 17 2000 Florian La Roche +- readline is needed for %post + +* Tue Feb 8 2000 Nalin Dahyabhai +- use the same catalog as umb-scheme + +* Thu Sep 2 1999 Jeff Johnson +- fix broken %postun + +* Sun Mar 21 1999 Cristian Gafton +- auto rebuild in the new build environment (release 6) + +* Wed Mar 17 1999 Michael Johnson +- added .ansi patch to fix #endif + +* Wed Feb 10 1999 Cristian Gafton +- add patch for the scm stuff + +* Sun Jan 17 1999 Jeff Johnson +- integrate changes from rhcn version (#640) + +* Tue Jan 12 1999 Cristian Gafton +- call libtoolize first to get it to compile on the arm + +* Sat Jan 9 1999 Todd Larason +- Added "Requires: guile" at suggestion of Manu Rouat + +* Fri Jan 1 1999 Todd Larason +- guile-devel does depend on guile +- remove devel dependancy on m4 +- move guile-snarf from guile to guile-devel +- Converted to rhcn + +* Wed Oct 21 1998 Jeff Johnson +- update to 1.3. +- don't strip libguile.so.*.0.0. (but set the execute bits). + +* Thu Sep 10 1998 Cristian Gafton +- spec file fixups + +* Wed Sep 2 1998 Michael Fulbright +- Updated for RH 5.2 + +* Mon Jan 26 1998 Marc Ewing +- Started with spec from Tomasz Koczko +- added slib link + +* Thu Sep 18 1997 Tomasz Koczko (1.2-3) +- added %attr(-, root, root) for %doc, +- in %post, %postun ldconfig runed as parameter "-p", +- removed /bin/sh from requires, +- added %description, +- changes in %files. + +* Fri Jul 11 1997 Tomasz Koczko (1.2-2) +- all rewrited for using Buildroot, +- added %postun, +- removed making buid logs, +- removed "--inclededir", added "--enable-dynamic-linking" to configure + parameters, +- added striping shared libs and /usr/bin/guile, +- added "Requires: /bin/sh" (for guile-snarf) in guile package and + "Requires: m4" for guile-devel, +- added macro %{PACKAGE_VERSION} in "Source:" and %files, +- added %attr macros in %files. From svn at tinysofa.org Thu Jul 1 15:39:20 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:39:20 +1000 (EST) Subject: [tinysofa-svn] r2614 - in tinysofa/snapshot: . openjade openjade/current openjade/current/sources openjade/current/specs Message-ID: <20040701153920.B584F4E817D@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:39:20 +1000 (Fri, 02 Jul 2004) New Revision: 2614 Added: tinysofa/snapshot/openjade/ tinysofa/snapshot/openjade/current/ tinysofa/snapshot/openjade/current/sources/ tinysofa/snapshot/openjade/current/sources/OpenSP-1.5.tar.gz tinysofa/snapshot/openjade/current/sources/openjade-1.3.1-manpage.patch tinysofa/snapshot/openjade/current/sources/openjade-1.3.1-nsl.patch tinysofa/snapshot/openjade/current/sources/openjade-1.3.2.tar.gz tinysofa/snapshot/openjade/current/sources/openjade-ppc64.patch tinysofa/snapshot/openjade/current/sources/opensp-1.5-gcc34.patch tinysofa/snapshot/openjade/current/specs/ tinysofa/snapshot/openjade/current/specs/openjade.spec Log: - Add openjade to snapshot from 2.0. Added: tinysofa/snapshot/openjade/current/sources/OpenSP-1.5.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/openjade/current/sources/OpenSP-1.5.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/openjade/current/sources/openjade-1.3.1-manpage.patch =================================================================== --- tinysofa/snapshot/openjade/current/sources/openjade-1.3.1-manpage.patch 2004-07-01 15:39:17 UTC (rev 2613) +++ tinysofa/snapshot/openjade/current/sources/openjade-1.3.1-manpage.patch 2004-07-01 15:39:20 UTC (rev 2614) @@ -0,0 +1,5 @@ +--- openjade-1.3.1/docsrc/sgmlnorm.1.manpage 2002-06-13 17:45:48.000000000 +0100 ++++ openjade-1.3.1/docsrc/sgmlnorm.1 2002-06-13 17:45:58.000000000 +0100 +@@ -1 +1 @@ +-.so man1/sgmlnorm.1 ++.so man1/osgmlnorm.1 Added: tinysofa/snapshot/openjade/current/sources/openjade-1.3.1-nsl.patch =================================================================== --- tinysofa/snapshot/openjade/current/sources/openjade-1.3.1-nsl.patch 2004-07-01 15:39:17 UTC (rev 2613) +++ tinysofa/snapshot/openjade/current/sources/openjade-1.3.1-nsl.patch 2004-07-01 15:39:20 UTC (rev 2614) @@ -0,0 +1,21 @@ +--- openjade-1.3.1/config/configure.in.lr 2003-09-12 08:03:22.000000000 -0600 ++++ openjade-1.3.1/config/configure.in 2003-09-12 08:03:44.000000000 -0600 +@@ -156,7 +156,6 @@ + then + AC_MSG_RESULT(yes) + AC_DEFINE(SP_HAVE_SOCKET) +- AC_CHECK_LIB(nsl,main,LIBS="$LIBS -lnsl") + AC_CHECK_LIB(socket,main,LIBS="$LIBS -lsocket") + AC_MSG_CHECKING(h_errno in netdb.h) + AC_EGREP_HEADER(h_errno,netdb.h, +--- openjade-1.3.1/configure.lr 2003-09-12 08:35:55.000000000 -0600 ++++ openjade-1.3.1/configure 2003-09-12 08:36:07.000000000 -0600 +@@ -5530,7 +5530,7 @@ + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-lnsl $LIBS" ++LIBS="-lXXXnsl $LIBS" + cat >conftest.$ac_ext <<_ACEOF + #line $LINENO "configure" + #include "confdefs.h" Added: tinysofa/snapshot/openjade/current/sources/openjade-1.3.2.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/openjade/current/sources/openjade-1.3.2.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/openjade/current/sources/openjade-ppc64.patch =================================================================== --- tinysofa/snapshot/openjade/current/sources/openjade-ppc64.patch 2004-07-01 15:39:17 UTC (rev 2613) +++ tinysofa/snapshot/openjade/current/sources/openjade-ppc64.patch 2004-07-01 15:39:20 UTC (rev 2614) @@ -0,0 +1,27 @@ +--- openjade-1.3.1/Makefile.prog.in.sopwith 2002-01-22 06:57:53.000000000 -0500 ++++ openjade-1.3.1/Makefile.prog.in 2003-02-11 16:59:44.000000000 -0500 +@@ -1,3 +1,4 @@ ++ + # + # Makefile.prog.in - Makerules for bilding programs + # +@@ -11,15 +12,17 @@ + LINKFLAGS = @LINKFLAGS@ + + ALL_LIBS = $(XLIBS) $(LIBS) ++LT_LIBS = $(shell echo $(XLIBS) | sed 's/\.a/.la/g') ++LT_ALL_LIBS = $(shell echo $(ALL_LIBS) | sed 's/\.a/.la/g') + Makefile.lt: +- echo 'LT_LIBS='`echo $(ALL_LIBS)|sed 's/\.a/.la/g'` >Makefile.lt ++ echo > Makefile.lt + + PROG:=$(shell echo "$(PROG)" | sed '@program_transform_name@') + + all: $(PROG) + + $(PROG): $(OBJS) $(COBJS) $(LT_LIBS) +- $(LIBTOOL) --mode=link $(CXX) $(LINKFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(COBJS) $(LT_LIBS) ++ $(LIBTOOL) --mode=link $(CXX) $(LINKFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(COBJS) $(LT_ALL_LIBS) + + install: $(PROG) + -test -d $(DESTDIR)$(bindir) || \ Added: tinysofa/snapshot/openjade/current/sources/opensp-1.5-gcc34.patch =================================================================== --- tinysofa/snapshot/openjade/current/sources/opensp-1.5-gcc34.patch 2004-07-01 15:39:17 UTC (rev 2613) +++ tinysofa/snapshot/openjade/current/sources/opensp-1.5-gcc34.patch 2004-07-01 15:39:20 UTC (rev 2614) @@ -0,0 +1,74 @@ +--- OpenSP-1.5/include/Attribute.h.gcc33 2003-05-22 17:04:20.000000000 +0100 ++++ OpenSP-1.5/include/Attribute.h 2003-05-22 17:04:48.000000000 +0100 +@@ -25,12 +25,32 @@ + class Entity; + class Notation; + class DeclaredValue; +-class AttributeValue; + class TokenizedAttributeValue; + class AttributeSemantics; + class AttributeContext; + class Syntax; + ++class SP_API AttributeValue : public Resource { ++public: ++ enum Type { ++ implied, ++ cdata, ++ tokenized ++ }; ++ AttributeValue(); ++ virtual ~AttributeValue(); ++ virtual AttributeSemantics *makeSemantics(const DeclaredValue *, ++ AttributeContext &, ++ const StringC &, ++ unsigned &, ++ unsigned &) const; ++ virtual Type info(const Text *&, const StringC *&) const = 0; ++ virtual const Text *text() const; ++ virtual Boolean recoverUnquoted(const StringC &, const Location &, ++ AttributeContext &, const StringC &); ++ static Boolean handleAsUnterminated(const Text &, AttributeContext &); ++}; ++ + class SP_API AttributeDefinitionDesc { + public: + AttributeDefinitionDesc() { } +@@ -380,27 +400,6 @@ + ConstPtr notation_; + }; + +-class SP_API AttributeValue : public Resource { +-public: +- enum Type { +- implied, +- cdata, +- tokenized +- }; +- AttributeValue(); +- virtual ~AttributeValue(); +- virtual AttributeSemantics *makeSemantics(const DeclaredValue *, +- AttributeContext &, +- const StringC &, +- unsigned &, +- unsigned &) const; +- virtual Type info(const Text *&, const StringC *&) const = 0; +- virtual const Text *text() const; +- virtual Boolean recoverUnquoted(const StringC &, const Location &, +- AttributeContext &, const StringC &); +- static Boolean handleAsUnterminated(const Text &, AttributeContext &); +-}; +- + class SP_API ImpliedAttributeValue : public AttributeValue { + public: + ImpliedAttributeValue(); +--- OpenSP-1.5/include/RangeMap.cxx.gcc34 2004-01-31 13:50:50.000000000 +0000 ++++ OpenSP-1.5/include/RangeMap.cxx 2004-01-31 13:51:36.000000000 +0000 +@@ -7,6 +7,7 @@ + #include "RangeMap.h" + #include "ISet.h" + #include "types.h" ++#include "constant.h" + + #ifdef SP_NAMESPACE + namespace SP_NAMESPACE { Added: tinysofa/snapshot/openjade/current/specs/openjade.spec =================================================================== --- tinysofa/snapshot/openjade/current/specs/openjade.spec 2004-07-01 15:39:17 UTC (rev 2613) +++ tinysofa/snapshot/openjade/current/specs/openjade.spec 2004-07-01 15:39:20 UTC (rev 2614) @@ -0,0 +1,335 @@ +%define opensp_ver 1.5 +Summary: A DSSSL implementation. +Name: openjade +Version: 1.3.2 +Release: 11.1ts +Prereq: sgml-common >= 0.5 +Prereq: docbook-dtds +Source0: http://download.sourceforge.net/openjade/openjade-%{version}.tar.gz +Source1: http://download.sourceforge.net/openjade/OpenSP-%{opensp_ver}.tar.gz +Patch0: openjade-1.3.1-manpage.patch +Patch1: openjade-ppc64.patch +Patch3: opensp-1.5-gcc34.patch +Patch4: openjade-1.3.1-nsl.patch +License: Distributable +Group: Applications/Text +BuildRoot: %{_tmppath}/%{name}-%{version}-root +Prefix: /usr +Obsoletes: jade +Provides: jade + +BuildRequires: autoconf, automake, gettext-devel + +%description +OpenJade is an implementation of the ISO/IEC 10179:1996 standard DSSSL +(Document Style Semantics and Specification Language). OpenJade is +based on James Clark's Jade implementation of DSSSL. OpenJade is a +command-line application and a set of components. The DSSSL engine +inputs an SGML or XML document and can output a variety of formats: +XML, RTF, TeX, MIF (FrameMaker), SGML, or XML. + +%package devel +Summary: Files for developing applications that use openjade/OpenSP. +Requires: %{name} = %{version} +Group: Development/Libraries + +%description devel +The header files, static library, libtool library and man pages for +developing applications that use openjade/OpenSP. + +%define openjadetop %{_builddir}/%{name}-%{version} +%prep +%setup -q -c -a1 + +pushd %{openjadetop}/openjade-%{version} +%patch0 -p1 -b .manpage +%patch1 -p1 -b .ppc64 +%patch4 -p1 +popd + +pushd %{openjadetop}/OpenSP-%{opensp_ver} +%patch3 -p1 -b .gcc34 +popd + +%build + +pushd %{openjadetop}/OpenSP-%{opensp_ver} +aclocal +libtoolize --copy --force +automake --add-missing --copy +autoconf --force +%configure --enable-http --datadir=/usr/share/sgml/%{name}-%{version} \ + --enable-default-catalog=/etc/sgml/catalog \ + --enable-default-search-path=/usr/share/sgml +make %{?_smp_mflags} +# This is needed because openjade has an awful hack in its own config.h. +cp config.h include +# This is to catch #include +ln -s . include/OpenSP +popd + +pushd %{openjadetop}/openjade-%{version} +#cp config/configure.in . +#libtoolize --copy --force +%configure --enable-http --datadir=/usr/share/sgml/%{name}-%{version} \ + --enable-spincludedir=%{openjadetop}/OpenSP-%{opensp_ver}/include \ + --enable-splibdir=%{openjadetop}/OpenSP-%{opensp_ver}/lib \ + --enable-default-catalog=/etc/sgml/catalog \ + --enable-default-search-path=/usr/share/sgml +make %{?_smp_mflags} +popd + +%install +rm -rf $RPM_BUILD_ROOT + +pushd %{openjadetop}/OpenSP-%{opensp_ver} +%makeinstall datadir=$RPM_BUILD_ROOT/usr/share/sgml/%{name}-%{version} +make install-man mandir=$RPM_BUILD_ROOT/%{_mandir} +popd + +pushd %{openjadetop}/openjade-%{version} +%makeinstall datadir=$RPM_BUILD_ROOT/usr/share/sgml/%{name}-%{version} +make install-man mandir=$RPM_BUILD_ROOT/%{_mandir} +popd + +# Fix up libtool libraries +find $RPM_BUILD_ROOT -name '*.la' | \ + xargs perl -p -i -e "s|-L$RPM_BUILD_DIR[\w/.-]*||g" + +# oMy, othis ois osilly. +ln -s openjade $RPM_BUILD_ROOT/%{prefix}/bin/jade +echo ".so man1/openjade.1" > $RPM_BUILD_ROOT/%{_mandir}/man1/jade.1 +for file in nsgmls sgmlnorm spam spent sx ; do + ln -s o$file $RPM_BUILD_ROOT/%{prefix}/bin/$file + echo ".so man1/o${file}.1" > $RPM_BUILD_ROOT/%{_mandir}/man1/${file}.1 +done + +mv $RPM_BUILD_ROOT/%{prefix}/bin/sx $RPM_BUILD_ROOT/%{prefix}/bin/sgml2xml +mv $RPM_BUILD_ROOT/%{_mandir}/man1/{sx,sgml2xml}.1 + +# install jade/jade $RPM_BUILD_ROOT/%{prefix}/bin/jade +cp %{openjadetop}/openjade-%{version}/dsssl/catalog $RPM_BUILD_ROOT/%{prefix}/share/sgml/%{name}-%{version}/ +cp %{openjadetop}/openjade-%{version}/dsssl/dsssl.dtd \ + %{openjadetop}/openjade-%{version}/dsssl/style-sheet.dtd \ + %{openjadetop}/openjade-%{version}/dsssl/fot.dtd \ + $RPM_BUILD_ROOT/%{prefix}/share/sgml/%{name}-%{version} + +rm -rf $RPM_BUILD_ROOT/usr/doc/OpenSP +rm -rf $RPM_BUILD_ROOT/%{prefix}/share/sgml/%{name}-%{version}/doc + +%clean +rm -rf $RPM_BUILD_ROOT + +%post -p /sbin/ldconfig + +%postun -p /sbin/ldconfig + +%files +%defattr(-,root,root) +%doc */doc/ openjade-*/jadedoc/ openjade-*/dsssl/ */pubtext/ */unicode/ +%doc --parents */README */COPYING openjade-*/VERSION +%{_bindir}/* +%{_libdir}/*.so.* +%{prefix}/share/sgml +%{_mandir}/*/* + +%files devel +%defattr(-,root,root) +%{_libdir}/*.a +%{_libdir}/*.so +%{_libdir}/*.la +%{_includedir}/* + +%changelog +* Tue Mar 02 2004 Elliot Lee +- rebuilt + +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Sat Jan 31 2004 Tim Waugh 1.3.2-10 +- More C++ fixes (for GCC 3.4). + +* Thu Dec 4 2003 Tim Waugh 1.3.2-9 +- No longer need httphost patch. + +* Mon Oct 20 2003 Tim Waugh 1.3.2-8 +- Rebuilt. + +* Tue Sep 23 2003 Florian La Roche 1.3.2-7 +- do not link against -lnsl + +* Thu Aug 7 2003 Tim Waugh 1.3.2-6 +- Rebootstrap to create a libtool that actually works. + +* Wed Aug 6 2003 Tim Waugh 1.3.2-5 +- Rebuilt. + +* Wed Jun 04 2003 Elliot Lee 1.3.2-4 +- rebuilt + +* Thu May 22 2003 Tim Waugh 1.3.2-3 +- Fixes for GCC 3.3. +- Use --parents for %doc. + +* Tue Mar 18 2003 Tim Waugh 1.3.2-2 +- Provide sgml2xml man page (bug #83759). +- Add devel subpackage. + +* Fri Mar 14 2003 Tim Waugh 1.3.2-1 +- OpenSP 1.5, openjade 1.3.2. +- Renumber patches. + +* Thu Feb 13 2003 Elliot Lee 1.3.1-13 +- Add openjade-ppc64.patch + +* Wed Jan 22 2003 Tim Powers +- rebuilt + +* Tue Jan 7 2003 Jeff Johnson 1.3.1-11 +- don't include -debuginfo files in package. + +* Thu Dec 12 2002 Tim Waugh +- Fix typo in description (bug #79395). + +* Mon Nov 4 2002 Tim Waugh 1.3.1-10 +- Fix DTD retrieval from virtual hosts (bug #77137). + +* Sat Aug 10 2002 Elliot Lee +- rebuilt with gcc-3.2 (we hope) + +* Mon Jul 22 2002 Tim Powers 1.3.1-8 +- rebuild using gcc-3.2-0.1 + +* Fri Jun 21 2002 Tim Powers 1.3.1-7 +- automated rebuild + +* Thu Jun 13 2002 Tim Waugh 1.3.1-6 +- Fix sgmlnorm(1) man page (bug #64136). +- Fix %%files list (bug #64323). + +* Thu May 23 2002 Tim Powers 1.3.1-5 +- automated rebuild + +* Thu Feb 21 2002 Tim Waugh 1.3.1-4 +- Avoid bad triggers. + +* Thu Feb 21 2002 Tim Waugh 1.3.1-3 +- Rebuild in new environment. + +* Mon Jan 28 2002 Tim Waugh 1.3.1-2 +- Ship man pages. + +* Mon Jan 28 2002 Tim Waugh 1.3.1-1 +- 1.3.1. +- Patches no longer needed: decl, strdup, foo, size_t, 31525, indev, + ligature, twosidestartonright. +- Updated lt patch. + +* Mon Jan 14 2002 Tim Waugh 1.3-22 +- Enable build on GCC 3.0 onwards. +- Run libtoolize. + +* Fri Nov 2 2001 Tim Waugh 1.3-21 +- Enable HTTP support. Now a DocBook XML document can be processed by + either xsltproc or openjade. + +* Tue Oct 30 2001 Tim Waugh 1.3-20 +- Apply twosidestartonright patch from Ian Castle. + +* Thu Oct 11 2001 Tim Waugh 1.3-19 +- s/Copyright:/License:/ +- Use %%{_tmppath}. +- Fix up libtool libraries (bug #46212). + +* Wed Sep 12 2001 Tim Powers 1.3-18 +- rebuild with new gcc and binutils + +* Fri Jun 15 2001 Tim Waugh 1.3-17 +- Apply patch from CVS to break up unintentional ligatures (bugs #11497, + #11779) + +* Mon Jun 4 2001 Tim Waugh 1.3-16 +- Apply the iNdev openjade-1.3.patch patch. + +* Tue May 29 2001 Tim Waugh 1.3-15 +- ldconfig (bug #32824). +- Fix up some libtool problems. + +* Fri Apr 27 2001 Bill Nottingham 1.3-14 +- rebuild for C++ exception handling on ia64 +- build with optimization on ia64 + +* Tue Mar 13 2001 Tim Waugh +- Avoid creating bogus TeX output for section headings containing + special characters (#bug 31525). + +* Mon Jan 22 2001 Florian La Roche +- Apply original autoconf patch to s390 s390x only. This patch can + be deleted once s390* uses a current compiler. + +* Thu Jan 19 2001 Tim Waugh +- Don't conflict with stylesheets; require sgml-common >= 0.5 instead. +- Revert autoconf change, as it's still broken. + +* Wed Jan 17 2001 Florian La Roche +- fix this autoconf macro to work on all archs :-) + +* Wed Jan 17 2001 Florian La Roche +- apply patch from Fritz Elfert + - removed explicit stripping + - Added autoconf macro for correctly recognizing if size_t + is unsigned int + +* Tue Jan 16 2001 Tim Waugh +- Default catalog file is /etc/sgml/catalog. + +* Mon Jan 08 2001 Tim Waugh +- Conflict with stylesheets (new-trials location changes). +- /usr/lib/sgml -> /usr/share/sgml/%%{name}-%%{version}. +- Remove %%post and %%postun. + +* Wed Oct 18 2000 Matt Wilson +- rebuilt against g++-2.96-60, fixes jade on alpha + +* Wed Jul 12 2000 Prospector +- automatic rebuild + +* Tue Jul 4 2000 Jakub Jelinek +- Rebuild with new C++ + +* Wed May 31 2000 Matt Wilson +- fix several C++ build problems (declarations) +- build against new libstdc++ + +* Wed May 17 2000 Matt Wilson +- build with -O0 on alpha +- fix -j testing + +* Thu May 5 2000 Bill Nottingham +- openjade is maintained, and actually builds. Let's try that. + +* Thu Mar 9 2000 Bill Nottingham +- this package is way too huge. strip *everything* + +* Mon Feb 21 2000 Matt Wilson +- build with CXXFLAGS="-O2 -ggdb" to work around segfault on alpha + +* Thu Feb 3 2000 Bill Nottingham +- strip binaries + +* Wed Jan 5 2000 Bill Nottingham +- sanitize spec file some + +* Tue Aug 17 1999 Tim Powers +- fixed conflict problem with sgml-tools + +* Sat Jul 17 1999 Tim Powers +- changed buildroot path to /var/tmp +- rebuilt for 6.1 + +* Fri Apr 23 1999 Michael K. Johnson +- quiet scripts + +* Thu Apr 23 1999 Owen Taylor +- Made requires for sgml-common into prereq From svn at tinysofa.org Thu Jul 1 15:39:24 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:39:24 +1000 (EST) Subject: [tinysofa-svn] r2616 - in tinysofa/snapshot: . passivetex passivetex/current passivetex/current/sources passivetex/current/specs Message-ID: <20040701153924.3BB9E4E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:39:23 +1000 (Fri, 02 Jul 2004) New Revision: 2616 Added: tinysofa/snapshot/passivetex/ tinysofa/snapshot/passivetex/current/ tinysofa/snapshot/passivetex/current/sources/ tinysofa/snapshot/passivetex/current/sources/passivetex-1.21-leader.patch tinysofa/snapshot/passivetex/current/sources/passivetex-1.25.zip tinysofa/snapshot/passivetex/current/specs/ tinysofa/snapshot/passivetex/current/specs/passivetex.spec Log: - Add passivetex to snapshot from 2.0. Added: tinysofa/snapshot/passivetex/current/sources/passivetex-1.21-leader.patch =================================================================== --- tinysofa/snapshot/passivetex/current/sources/passivetex-1.21-leader.patch 2004-07-01 15:39:21 UTC (rev 2615) +++ tinysofa/snapshot/passivetex/current/sources/passivetex-1.21-leader.patch 2004-07-01 15:39:23 UTC (rev 2616) @@ -0,0 +1,11 @@ +--- passivetex/fotex.xmt.leader 2002-10-16 16:09:27.000000000 +0100 ++++ passivetex/fotex.xmt 2002-10-16 16:09:43.000000000 +0100 +@@ -656,7 +656,7 @@ + \gdef\FOlanguage{none} + \gdef\FOlastlineendindent{\z@} + \gdef\FOleaderalignment{none} +- \gdef\FOleaderlength{} ++ \gdef\FOleaderlength{\z@} + \gdef\FOleaderpattern{space} + \gdef\FOleaderpatternwidth{} + \gdef\FOletterspacing{normal} Added: tinysofa/snapshot/passivetex/current/sources/passivetex-1.25.zip =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/passivetex/current/sources/passivetex-1.25.zip ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/passivetex/current/specs/passivetex.spec =================================================================== --- tinysofa/snapshot/passivetex/current/specs/passivetex.spec 2004-07-01 15:39:21 UTC (rev 2615) +++ tinysofa/snapshot/passivetex/current/specs/passivetex.spec 2004-07-01 15:39:23 UTC (rev 2616) @@ -0,0 +1,149 @@ +Summary: Macros to process XSL formatting objects. +Name: passivetex +Version: 1.25 +Release: 2ts +License: LaTeX Project Public License (http://www.latex-project.org/lppl.txt) +Group: Applications/Publishing +Source0: http://www.tei-c.org.uk/Software/passivetex/%{name}-%{version}.zip +Patch0: passivetex-1.21-leader.patch +URL: http://www.tei-c.org.uk/Software/passivetex/ +BuildArch: noarch +Prereq: tetex +Requires: xmltex >= 20000118-4 +BuildRequires: xmltex >= 20000118-4 +BuildRoot: %{_tmppath}/%{name}-%{version}-root + +%define mydir %{_datadir}/texmf/tex/xmltex/passivetex + +%description +PassiveTeX is a library of TeX macros which can be used to process an +XML document which results from an XSL transformation to formatting +objects. + + +%prep +%setup -q -n %{name} +%patch0 -p1 -b .leader + +%install +rm -rf $RPM_BUILD_ROOT +install -d $RPM_BUILD_ROOT%{mydir} +install *.sty *.xmt $RPM_BUILD_ROOT%{mydir} + +%clean +rm -rf $RPM_BUILD_ROOT + +%post +/usr/bin/env - PATH=$PATH:%{_bindir} texhash > /dev/null 2>&1 +/usr/bin/env - PATH=$PATH:%{_bindir} fmtutil --cnffile %{_datadir}/texmf/tex/xmltex/xmltexfmtutil.cnf --all > /dev/null 2>&1 +exit 0 + +%postun +/usr/bin/env - PATH=$PATH:%{_bindir} texhash > /dev/null 2>&1 +/usr/bin/env - PATH=$PATH:%{_bindir} fmtutil --cnffile %{_datadir}/texmf/tex/xmltex/xmltexfmtutil.cnf --all > /dev/null 2>&1 +exit 0 + +%triggerin -- tetex-latex +/usr/bin/env - PATH=$PATH:%{_bindir} fmtutil --cnffile %{_datadir}/texmf/tex/xmltex/xmltexfmtutil.cnf --all > /dev/null 2>&1 +exit 0 + +%files +%defattr(644,root,root,755) +%{mydir} + +%changelog +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Fri Jan 16 2004 Tim Waugh 1.25-1 +- 1.25. + +* Fri Jul 4 2003 Tim Waugh 1.24-2.1 +- Rebuilt. + +* Fri Jul 4 2003 Tim Waugh 1.24-2 +- URL changed (bug #97838). + +* Thu May 9 2003 Tim Waugh 1.24-1 +- 1.24. + +* Thu Mar 6 2003 Tim Waugh 1.23-1 +- 1.23. + +* Wed Jan 22 2003 Tim Powers +- rebuilt + +* Wed Oct 16 2002 Tim Waugh 1.21-1 +- 1.21. +- Fix leader length. + +* Fri Jun 21 2002 Tim Powers +- automated rebuild + +* Thu May 23 2002 Tim Powers +- automated rebuild + +* Thu Feb 21 2002 Tim Waugh 1.12-3 +- Fix group (bug #60178). + +* Thu Feb 21 2002 Tim Waugh 1.12-2 +- Rebuild in new environment. + +* Tue Feb 12 2002 Tim Waugh 1.12-1 +- New tarball. +- DEBUg and euro patches no longer required. + +* Thu Jan 10 2002 Tim Waugh 1.11-5 +- New tarball. +- Fix euro support. + +* Wed Jan 09 2002 Tim Powers 1.11-4 +- automated rebuild + +* Thu Dec 13 2001 Tim Waugh 1.11-3 +- Fix a typo in fotex.sty. + +* Wed Dec 12 2001 Tim Waugh 1.11-2 +- Trigger recreation of the format file on tetex-latex. + +* Fri Dec 7 2001 Tim Waugh 1.11-1 +- New upstream release. Incorporates the body-start() fix. + +* Sat Oct 6 2001 Tim Waugh 1.6-2 +- New archive from Sebastian. +- Run fmtutil in %%post and %%postun. +- Require new xmltex. +- Fix body-start(). + +* Sat Oct 6 2001 Tim Waugh 1.6-1 +- Built for Red Hat Linux. Package from PLD. + +* Sat Oct 6 2001 PLD Team +All persons listed below can be reached at @pld.org.pl + +$Log: passivetex.spec,v $ +Revision 1.8 2001/08/21 10:12:42 wrobell +- ver. 1.6 +- stb + +Revision 1.7 2001/03/27 16:55:44 wiget +Requires xmltex + +Revision 1.6 2001/03/27 16:53:29 wiget +changed Source URL, updated to 1.5 version, more files in package; now passivetex is more powerfull and work ;-) + +Revision 1.5 2001/01/27 03:25:36 kloczek +- added tetex to Prerq, +- simplified %post, %postun. + +Revision 1.4 2001/01/27 00:08:39 klakier +- added URL + +Revision 1.3 2001/01/27 00:07:47 klakier +- added URL + +Revision 1.2 2001/01/24 12:41:17 klakier +- small fixes + +Revision 1.1 2001/01/24 12:31:43 klakier +- initial From svn at tinysofa.org Thu Jul 1 15:39:18 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:39:18 +1000 (EST) Subject: [tinysofa-svn] r2613 - in tinysofa/snapshot: . nmap nmap/current nmap/current/sources nmap/current/specs Message-ID: <20040701153918.807C64E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:39:17 +1000 (Fri, 02 Jul 2004) New Revision: 2613 Added: tinysofa/snapshot/nmap/ tinysofa/snapshot/nmap/current/ tinysofa/snapshot/nmap/current/sources/ tinysofa/snapshot/nmap/current/sources/inet_aton.patch tinysofa/snapshot/nmap/current/sources/makefile.patch tinysofa/snapshot/nmap/current/sources/nmap-3.50.tar.bz2 tinysofa/snapshot/nmap/current/specs/ tinysofa/snapshot/nmap/current/specs/nmap.spec Log: - Add nmap to snapshot from 2.0. Added: tinysofa/snapshot/nmap/current/sources/inet_aton.patch =================================================================== --- tinysofa/snapshot/nmap/current/sources/inet_aton.patch 2004-07-01 15:39:13 UTC (rev 2612) +++ tinysofa/snapshot/nmap/current/sources/inet_aton.patch 2004-07-01 15:39:17 UTC (rev 2613) @@ -0,0 +1,28 @@ +--- nmap-2.53/tcpip.h.orig Tue May 16 18:21:58 2000 ++++ nmap-2.53/tcpip.h Tue May 16 18:22:09 2000 +@@ -354,9 +354,9 @@ + /* Hex dump */ + int get_link_offset(char *device); + char *readip_pcap(pcap_t *pd, unsigned int *len, long to_usec); +-#ifndef HAVE_INET_ATON ++/*#ifndef HAVE_INET_ATON + int inet_aton(register const char *, struct in_addr *); +-#endif ++#endif*/ + + + #endif /*TCPIP_H*/ +--- nmap-2.53/nmap.h.orig Tue May 16 18:18:00 2000 ++++ nmap-2.53/nmap.h Tue May 16 18:18:30 2000 +@@ -362,9 +362,9 @@ + void skid_output(unsigned char *s); + + /* From glibc 2.0.6 because Solaris doesn't seem to have this function */ +-#ifndef HAVE_INET_ATON ++/*#ifndef HAVE_INET_ATON + int inet_aton(register const char *, struct in_addr *); +-#endif ++#endif*/ + #ifndef HAVE_SNPRINTF + int snprintf ( char *str, size_t n, const char *format, ... ); + #endif Added: tinysofa/snapshot/nmap/current/sources/makefile.patch =================================================================== --- tinysofa/snapshot/nmap/current/sources/makefile.patch 2004-07-01 15:39:13 UTC (rev 2612) +++ tinysofa/snapshot/nmap/current/sources/makefile.patch 2004-07-01 15:39:17 UTC (rev 2613) @@ -0,0 +1,12 @@ +--- nmap-2.53/Makefile.in.tim Thu Jun 8 17:41:49 2000 ++++ nmap-2.53/Makefile.in Thu Jun 8 17:43:24 2000 +@@ -7,7 +7,8 @@ + sbindir = @sbindir@ + mandir = @mandir@ + srcdir = @srcdir@ +-nmapdatadir = @datadir@/nmap ++datadir = @datadir@ ++nmapdatadir = $(datadir)/nmap + deskdir = $(prefix)/share/gnome/apps/Utilities + + CC = @CC@ Added: tinysofa/snapshot/nmap/current/sources/nmap-3.50.tar.bz2 =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/nmap/current/sources/nmap-3.50.tar.bz2 ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/nmap/current/specs/nmap.spec =================================================================== --- tinysofa/snapshot/nmap/current/specs/nmap.spec 2004-07-01 15:39:13 UTC (rev 2612) +++ tinysofa/snapshot/nmap/current/specs/nmap.spec 2004-07-01 15:39:17 UTC (rev 2613) @@ -0,0 +1,223 @@ +%{!?withgtk1:%define withgtk1 0} + +Summary: Network exploration tool and security scanner +Name: nmap +Version: 3.50 +Release: 4ts +License: GPL +Group: Applications/System +Source0: http://download.insecure.org/nmap/dist/%{name}-%{version}.tar.bz2 +#Source1: nmapfe.desktop +Patch0: inet_aton.patch +Patch1: makefile.patch +URL: http://www.insecure.org/nmap/ +BuildRoot: %{_tmppath}/%{name}-%{version}-root +Epoch: 2 +BuildRequires: openssl-devel, pcre-devel, libpcap + +%description +Nmap is a utility for network exploration or security auditing. It supports +ping scanning (determine which hosts are up), many port scanning techniques +(determine what services the hosts are offering), and TCP/IP fingerprinting +(remote host operating system identification). Nmap also offers flexible target +and port specification, decoy scanning, determination of TCP sequence +predictability characteristics, reverse-identd scanning, and more. + +%if %{withgtk1} +%package frontend +Summary: Gtk+ frontend for nmap +Group: Applications/System +Requires: nmap = %{epoch}:%{version}, gtk+ +BuildRequires: gtk+-devel +%description frontend +This package includes nmapfe, a Gtk+ frontend for nmap. The nmap package must +be installed before installing nmap-frontend. +%endif + +%prep +%setup -q + +%build +%configure --with-libpcap=/usr +make + +%install +rm -rf $RPM_BUILD_ROOT + +%makeinstall nmapdatadir=$RPM_BUILD_ROOT%{_datadir}/nmap + +#mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/X11/applnk/Utilities/ +#install -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/X11/applnk/Utilities/ + +# remove unused files +rm -f $RPM_BUILD_ROOT/usr/share/gnome/apps/Utilities/nmapfe.desktop + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(-,root,root) +%doc COPYING +%doc docs/README docs/copying.html docs/nmap-fingerprinting-article.txt +%doc docs/nmap.deprecated.txt docs/nmap.usage.txt docs/nmap_doc.html +%doc docs/nmap_manpage.html +%{_bindir}/nmap +%{_datadir}/nmap +%{_mandir}/man1/nmap.1.gz + +%if %{withgtk1} +%files frontend +%defattr(-,root,root) +%{_bindir}/nmapfe +%{_bindir}/xnmap +#%{_sysconfdir}/X11/applnk/Utilities/nmapfe.desktop +%{_mandir}/man1/nmapfe.1.gz +%{_mandir}/man1/xnmap.1.gz +%endif + +%changelog +* Tue Jun 15 2004 Elliot Lee +- rebuilt + +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Thu Jan 29 2004 Harald Hoyer - 2:3.50-2 +- added BuildRequires: openssl-devel, gtk+-devel, pcre-devel, libpcap + +* Thu Jan 22 2004 Harald Hoyer - 2:3.50-1 +- version 3.50 + +* Wed Oct 8 2003 Harald Hoyer 2:3.48-1 +- version 3.48 + +* Tue Sep 23 2003 Florian La Roche +- allow disabling frontend if gtk1 is not available + +* Mon Jul 30 2003 Harald Hoyer 2:3.30-1 +- version 3.30 + +* Wed Jun 04 2003 Elliot Lee +- rebuilt + +* Mon May 26 2003 Harald Hoyer 2:3.27-1 +- version 3.27 + +* Mon May 12 2003 Harald Hoyer 2:3.20-2 +- changed macro comments to double %% for changelog entries + +* Mon Apr 14 2003 Harald Hoyer 2:3.20-1 +- version 3.2 + +* Wed Jan 22 2003 Tim Powers +- rebuilt + +* Thu Jan 9 2003 Harald Hoyer 3.0-3 +- nmap-3.00-nowarn.patch added + +* Mon Nov 18 2002 Tim Powers +- rebuild on all arches +- remove old desktop file from $$RPM_BUILD_ROOT so rpm won't complain + +* Thu Aug 1 2002 Harald Hoyer +- version 3.0 + +* Mon Jul 29 2002 Harald Hoyer 2.99.2-1 +- bumped version + +* Fri Jul 26 2002 Harald Hoyer 2.99.1-2 +- bumped version to 2.99RC1 + +* Fri Jul 19 2002 Florian La Roche +- add an epoch + +* Mon Jul 1 2002 Harald Hoyer 2.54.36-1 +- removed desktop file +- removed "BETA" name from version +- update to BETA36 + +* Fri Jun 21 2002 Tim Powers +- automated rebuild + +* Sun May 26 2002 Tim Powers +- automated rebuild + +* Wed May 22 2002 Harald Hoyer 2.54BETA34-1 +- update to 2.54BETA34 + +* Mon Mar 25 2002 Harald Hoyer +- more recent version (#61490) + +* Mon Jul 23 2001 Harald Hoyer +- buildprereq for nmap-frontend (#49644) + +* Sun Jul 22 2001 Heikki Korpela +- buildrequire gtk+ + +* Tue Jul 10 2001 Tim Powers +- fix bugs in desktop file (#48341) + +* Wed May 16 2001 Tim Powers +- updated to 2.54BETA22 + +* Mon Nov 20 2000 Tim Powers +- rebuilt to fix bad dir perms + +* Fri Nov 3 2000 Tim Powers +- fixed nmapdatadir in the install section, forgot lto include + $RPM_BUILD_ROOT in the path + +* Thu Nov 2 2000 Tim Powers +- update to nmap-2.54BETA7 to possibly fix bug #20199 +- use the desktop file provided by the package instead of using my own +- patches in previous version are depreciated. Included in SRPM for + reference only + +* Mon Jul 24 2000 Prospector +- rebuilt + +* Mon Jul 10 2000 Tim Powers +- rebuilt + +* Wed Jun 28 2000 Tim Powers +- rebuilt package + +* Thu Jun 8 2000 Tim Powers +- fixed man pages so that they are in an FHS compliant location +- use %%makeinstall +- use predefined RPM macros wherever possible + +* Tue May 16 2000 Tim Powers +- updated to 2.53 +- using applnk now +- use %%configure, and %%{_prefix} where possible +- removed redundant defines at top of spec file + +* Mon Dec 13 1999 Tim Powers +- based on origional spec file from + http://www.insecure.org/nmap/index.html#download +- general cleanups, removed lots of commenrts since it madethe spec hard to + read +- changed group to Applications/System +- quiet setup +- no need to create dirs in the install section, "make + prefix=$RPM_BUILD_ROOT&{prefix} install" does this. +- using defined %%{prefix}, %%{version} etc. for easier/quicker maint. +- added docs +- gzip man pages +- strip after files have been installed into buildroot +- created separate package for the frontend so that Gtk+ isn't needed for the + CLI nmap +- not using -f in files section anymore, no need for it since there aren't that + many files/dirs +- added desktop entry for gnome + +* Sun Jan 10 1999 Fyodor +- Merged in spec file sent in by Ian Macdonald + +* Tue Dec 29 1998 Fyodor +- Made some changes, and merged in another .spec file sent in + by Oren Tirosh + +* Mon Dec 21 1998 Riku Meskanen +- initial build for RH 5.x From svn at tinysofa.org Thu Jul 1 15:39:26 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:39:26 +1000 (EST) Subject: [tinysofa-svn] r2618 - in tinysofa/snapshot: . pax pax/current pax/current/sources pax/current/specs Message-ID: <20040701153926.B99124E817D@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:39:26 +1000 (Fri, 02 Jul 2004) New Revision: 2618 Added: tinysofa/snapshot/pax/ tinysofa/snapshot/pax/current/ tinysofa/snapshot/pax/current/sources/ tinysofa/snapshot/pax/current/sources/pax-3.0-doc.patch tinysofa/snapshot/pax/current/sources/pax-3.0.tar.bz2 tinysofa/snapshot/pax/current/specs/ tinysofa/snapshot/pax/current/specs/pax.spec Log: - Add pax to snapshot from 2.0. Added: tinysofa/snapshot/pax/current/sources/pax-3.0-doc.patch =================================================================== --- tinysofa/snapshot/pax/current/sources/pax-3.0-doc.patch 2004-07-01 15:39:25 UTC (rev 2617) +++ tinysofa/snapshot/pax/current/sources/pax-3.0-doc.patch 2004-07-01 15:39:26 UTC (rev 2618) @@ -0,0 +1,26 @@ +--- pax-3.0/src/pax.1.rh1 2002-07-03 14:38:19.000000000 +0200 ++++ pax-3.0/src/pax.1 2002-07-03 14:43:08.000000000 +0200 +@@ -720,7 +720,9 @@ + .It Ar tar + The old BSD tar format as found in BSD4.3. + The default blocksize for this format is 10240 bytes. +-Pathnames stored by this format must be 100 characters or less in length. ++Pathnames stored by this format must be 100 characters or less in length ++(including the trailing \0 character, which means that filenames can have ++a maximum length of 99 characters). + Only + .Em regular + files, +@@ -738,7 +740,11 @@ + .St -p1003.2 + standard. + The default blocksize for this format is 10240 bytes. +-Pathnames stored by this format must be 250 characters or less in length. ++Filenames stored by this format must be 100 characters or less in length ++(including the trailing \0 character, which means that filenames can have ++a maximum length of 99 characters). ++Pathnames (directorynames + filenames) stored by this format must be ++250 characters or less in length. + .El + .Pp + .Nm Added: tinysofa/snapshot/pax/current/sources/pax-3.0.tar.bz2 =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/pax/current/sources/pax-3.0.tar.bz2 ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/pax/current/specs/pax.spec =================================================================== --- tinysofa/snapshot/pax/current/specs/pax.spec 2004-07-01 15:39:25 UTC (rev 2617) +++ tinysofa/snapshot/pax/current/specs/pax.spec 2004-07-01 15:39:26 UTC (rev 2618) @@ -0,0 +1,81 @@ +Summary: POSIX File System Archiver +Name: pax +Version: 3.0 +Release: 9ts +License: BSD +Group: Applications/Archiving +Source: %{name}-%{version}.tar.bz2 +Patch0: pax-3.0-doc.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-root + +%description +'pax' is the POSIX standard archive tool. It supports the two most +common forms of standard Unix archive (backup) files - CPIO and TAR. + +%prep +%setup -q +%patch0 -p1 -b .rh1 + +%build +%configure +make + +%install +rm -rf %{buildroot} +%makeinstall + +%clean +rm -rf %{buildroot} + +%files +%defattr(-,root,root) +%{_bindir}/pax +%doc %{_mandir}/man1/* + +%changelog +* Tue Jun 15 2004 Elliot Lee +- rebuilt + +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Wed Jun 04 2003 Elliot Lee +- rebuilt + +* Wed Jan 22 2003 Tim Powers +- rebuilt + +* Thu Dec 12 2002 Tim Powers 3.0-5 +- rebuild on all arches + +* Wed Jul 03 2002 Karsten Hopp +- fix documentation (#63671) + +* Fri Jun 21 2002 Tim Powers +- automated rebuild + +* Thu May 23 2002 Tim Powers +- automated rebuild + +* Tue Mar 5 2002 Matt Wilson +- pull PAX source tarball from the SuSE package (which is based off + this one yet claims copyright on the spec file) + +* Sun Jun 24 2001 Elliot Lee +- Bump release + rebuild. + +* Fri Feb 23 2001 Jakub Jelinek +- make it build under glibc 2.2.2 + +* Wed Jul 12 2000 Prospector +- automatic rebuild + +* Fri Jun 30 2000 Preston Brown +- debian version, which is a port from OpenBSD's latest. + +* Tue Jun 13 2000 Preston Brown +- FHS paths + +* Tue May 30 2000 Preston Brown +- adopted for Winston. + From svn at tinysofa.org Thu Jul 1 15:39:21 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:39:21 +1000 (EST) Subject: [tinysofa-svn] r2615 - in tinysofa/snapshot: . pango pango/current pango/current/sources pango/current/specs Message-ID: <20040701153921.F33794E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:39:21 +1000 (Fri, 02 Jul 2004) New Revision: 2615 Added: tinysofa/snapshot/pango/ tinysofa/snapshot/pango/current/ tinysofa/snapshot/pango/current/sources/ tinysofa/snapshot/pango/current/sources/pango-1.0.99.020606-xfonts.patch tinysofa/snapshot/pango/current/sources/pango-1.2.5-lib64.patch tinysofa/snapshot/pango/current/sources/pango-1.3.2-thai.patch tinysofa/snapshot/pango/current/sources/pango-1.4.0.tar.bz2 tinysofa/snapshot/pango/current/sources/pango-slighthint.patch tinysofa/snapshot/pango/current/specs/ tinysofa/snapshot/pango/current/specs/pango.spec Log: - Add pango to snapshot from 2.0. Added: tinysofa/snapshot/pango/current/sources/pango-1.0.99.020606-xfonts.patch =================================================================== --- tinysofa/snapshot/pango/current/sources/pango-1.0.99.020606-xfonts.patch 2004-07-01 15:39:20 UTC (rev 2614) +++ tinysofa/snapshot/pango/current/sources/pango-1.0.99.020606-xfonts.patch 2004-07-01 15:39:21 UTC (rev 2615) @@ -0,0 +1,98 @@ +--- pango-1.0.99.020606/examples/pangox.aliases.xfonts Mon Jun 24 20:19:34 2002 ++++ pango-1.0.99.020606/examples/pangox.aliases Mon Jun 24 20:26:34 2002 +@@ -4,6 +4,7 @@ + + sans normal normal normal normal \ + "-*-helvetica-medium-r-normal--*-*-*-*-*-*-*-*,\ ++ -*-gulimbdf-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0,\ + -*-gulim-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0,\ + -*-clearlyu-medium-r-normal--*-*-*-*-*-*-iso10646-1,\ + -*-fixed-medium-r-normal--*-*-*-*-*-*-*-*,\ +@@ -22,6 +23,7 @@ + + sans italic normal normal normal \ + "-*-helvetica-medium-o-normal--*-*-*-*-*-*-*-*,\ ++ -*-gulimbdf-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0,\ + -*-gulim-medium-o-normal--*-*-*-*-*-*-ksc5601.1987-0,\ + -*-clearlyu-medium-r-normal--*-*-*-*-*-*-iso10646-1,\ + -*-fixed-medium-r-normal--*-*-*-*-*-*-*-*,\ +@@ -40,6 +42,7 @@ + + sans normal normal bold normal \ + "-*-helvetica-bold-r-normal--*-*-*-*-*-*-*-*,\ ++ -*-gulimbdf-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0,\ + -*-gulim-bold-r-normal--*-*-*-*-*-*-ksc5601.1987-0,\ + -*-clearlyu-medium-r-normal--*-*-*-*-*-*-iso10646-1,\ + -*-fixed-medium-r-normal--*-*-*-*-*-*-*-*,\ +@@ -58,6 +61,7 @@ + + sans italic normal bold normal \ + "-*-helvetica-bold-o-normal--*-*-*-*-*-*-*-*,\ ++ -*-gulimbdf-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0,\ + -*-gulim-bold-o-normal--*-*-*-*-*-*-ksc5601.1987-0,\ + -*-clearlyu-medium-r-normal--*-*-*-*-*-*-iso10646-1,\ + -*-fixed-medium-r-normal--*-*-*-*-*-*-*-*,\ +@@ -78,6 +82,7 @@ + serif normal normal normal normal \ + "-*-times-medium-r-normal--*-*-*-*-*-*-*-*,\ + -*-batang-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0,\ ++ -*-gulimbdf-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0,\ + -*-clearlyu-medium-r-normal--*-*-*-*-*-*-iso10646-1,\ + -*-fixed-medium-r-normal--*-*-*-*-*-*-*-*,\ + -kaist-iyagi-bold-r-normal--*-*-*-*-*-*-johab-1,\ +@@ -96,6 +101,7 @@ + serif italic normal normal normal \ + "-*-times-medium-i-normal--*-*-*-*-*-*-*-*,\ + -*-batang-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0,\ ++ -*-gulimbdf-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0,\ + -*-clearlyu-medium-r-normal--*-*-*-*-*-*-iso10646-1,\ + -*-fixed-medium-r-normal--*-*-*-*-*-*-*-*,\ + -kaist-iyagi-bold-r-normal--*-*-*-*-*-*-johab-1,\ +@@ -114,6 +120,7 @@ + serif normal normal bold normal \ + "-*-times-bold-r-normal--*-*-*-*-*-*-*-*,\ + -*-batang-bold-r-normal--*-*-*-*-*-*-ksc5601.1987-0,\ ++ -*-gulimbdf-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0,\ + -*-clearlyu-medium-r-normal--*-*-*-*-*-*-iso10646-1,\ + -*-fixed-medium-r-normal--*-*-*-*-*-*-*-*,\ + -kaist-iyagi-bold-r-normal--*-*-*-*-*-*-johab-1,\ +@@ -132,6 +139,7 @@ + serif italic normal bold normal \ + "-*-times-bold-i-normal--*-*-*-*-*-*-*-*,\ + -*-batang-bold-r-normal--*-*-*-*-*-*-ksc5601.1987-0,\ ++ -*-gulimbdf-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0,\ + -*-clearlyu-medium-r-normal--*-*-*-*-*-*-iso10646-1,\ + -*-fixed-medium-r-normal--*-*-*-*-*-*-*-*,\ + -kaist-iyagi-bold-r-normal--*-*-*-*-*-*-johab-1,\ +@@ -150,6 +158,7 @@ + monospace normal normal normal normal \ + "-*-fixed-medium-r-normal--*-*-*-*-*-*-*-*,\ + -*-dotum-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0,\ ++ -*-gulimbdf-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0,\ + -*-clearlyu-medium-r-normal--*-*-*-*-*-*-iso10646-1,\ + -*-fixed-medium-r-normal--*-*-*-*-*-*-*-*,\ + -kaist-iyagi-bold-r-normal--*-*-*-*-*-*-johab-1,\ +@@ -168,6 +177,7 @@ + monospace italic normal normal normal \ + "-*-fixed-medium-i-normal--*-*-*-*-*-*-*-*,\ + -*-dotum-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0,\ ++ -*-gulimbdf-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0,\ + -*-clearlyu-medium-r-normal--*-*-*-*-*-*-iso10646-1,\ + -*-fixed-medium-r-normal--*-*-*-*-*-*-*-*,\ + -kaist-iyagi-bold-r-normal--*-*-*-*-*-*-johab-1,\ +@@ -186,6 +196,7 @@ + monospace normal normal bold normal \ + "-*-fixed-bold-r-normal--*-*-*-*-*-*-*-*,\ + -*-dotum-bold-r-normal--*-*-*-*-*-*-ksc5601.1987-0,\ ++ -*-gulimbdf-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0,\ + -*-clearlyu-medium-r-normal--*-*-*-*-*-*-iso10646-1,\ + -*-fixed-medium-r-normal--*-*-*-*-*-*-*-*,\ + -kaist-iyagi-bold-r-normal--*-*-*-*-*-*-johab-1,\ +@@ -204,6 +215,7 @@ + monospace italic normal bold normal \ + "-*-fixed-bold-i-normal--*-*-*-*-*-*-*-*,\ + -*-dotum-bold-r-normal--*-*-*-*-*-*-ksc5601.1987-0,\ ++ -*-gulimbdf-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0,\ + -*-clearlyu-medium-r-normal--*-*-*-*-*-*-iso10646-1,\ + -*-fixed-medium-r-normal--*-*-*-*-*-*-*-*,\ + -kaist-iyagi-bold-r-normal--*-*-*-*-*-*-johab-1,\ Added: tinysofa/snapshot/pango/current/sources/pango-1.2.5-lib64.patch =================================================================== --- tinysofa/snapshot/pango/current/sources/pango-1.2.5-lib64.patch 2004-07-01 15:39:20 UTC (rev 2614) +++ tinysofa/snapshot/pango/current/sources/pango-1.2.5-lib64.patch 2004-07-01 15:39:21 UTC (rev 2615) @@ -0,0 +1,30 @@ +--- pango-1.2.5/pango/Makefile.am.lib64 2003-08-25 10:12:45.000000000 -0400 ++++ pango-1.2.5/pango/Makefile.am 2003-12-08 18:43:51.000000000 -0500 +@@ -16,6 +16,7 @@ + -DPANGO_ENABLE_BACKEND \ + -DPANGO_ENABLE_ENGINE \ + -DSYSCONFDIR=\"$(sysconfdir)\" \ ++ -DHOST=\"$(host_triplet)\" \ + -DLIBDIR=\"$(libdir)\" \ + -DMODULE_VERSION=\"$(PANGO_MODULE_VERSION)\" \ + -DG_DISABLE_DEPRECATED \ +--- pango-1.2.5/pango/modules.c.lib64 2002-12-06 19:54:27.000000000 -0500 ++++ pango-1.2.5/pango/modules.c 2003-12-08 18:43:51.000000000 -0500 +@@ -353,6 +353,7 @@ + + if (!file_str) + file_str = g_build_filename (pango_get_sysconf_subdirectory (), ++ HOST, + "pango.modules", + NULL); + +--- pango-1.2.5/pango/Makefile.in.lib64 2003-12-09 10:48:24.000000000 -0500 ++++ pango-1.2.5/pango/Makefile.in 2003-12-09 10:48:32.000000000 -0500 +@@ -135,6 +135,7 @@ + -DPANGO_ENABLE_BACKEND \ + -DPANGO_ENABLE_ENGINE \ + -DSYSCONFDIR=\"$(sysconfdir)\" \ ++ -DHOST=\"$(host_triplet)\" \ + -DLIBDIR=\"$(libdir)\" \ + -DMODULE_VERSION=\"$(PANGO_MODULE_VERSION)\" \ + -DG_DISABLE_DEPRECATED \ Added: tinysofa/snapshot/pango/current/sources/pango-1.3.2-thai.patch =================================================================== --- tinysofa/snapshot/pango/current/sources/pango-1.3.2-thai.patch 2004-07-01 15:39:20 UTC (rev 2614) +++ tinysofa/snapshot/pango/current/sources/pango-1.3.2-thai.patch 2004-07-01 15:39:21 UTC (rev 2615) @@ -0,0 +1,11 @@ +--- pango-1.3.2/modules/thai/thai-shaper.h.thai 2003-09-23 19:11:56.000000000 -0400 ++++ pango-1.3.2/modules/thai/thai-shaper.h 2004-01-23 02:03:48.000000000 -0500 +@@ -1,6 +1,8 @@ + #ifndef __THAI_SHAPER_H__ + #define __THAI_SHAPER_H__ + ++#include "config.h" ++ + #define isthai(wc) (wc >= 0xE00 && wc < 0xE80) + #define ucs2tis(wc) (unsigned int)((unsigned int)(wc) - 0x0E00 + 0xA0) + #define tis2uni(c) ((gunichar)(c) - 0xA0 + 0x0E00) Added: tinysofa/snapshot/pango/current/sources/pango-1.4.0.tar.bz2 =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/pango/current/sources/pango-1.4.0.tar.bz2 ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/pango/current/sources/pango-slighthint.patch =================================================================== --- tinysofa/snapshot/pango/current/sources/pango-slighthint.patch 2004-07-01 15:39:20 UTC (rev 2614) +++ tinysofa/snapshot/pango/current/sources/pango-slighthint.patch 2004-07-01 15:39:21 UTC (rev 2615) @@ -0,0 +1,34 @@ +--- pango-1.2.2/pango/pangoft2.c.slighthint 2003-05-29 18:34:36.000000000 -0400 ++++ pango-1.2.2/pango/pangoft2.c 2003-05-29 19:39:08.000000000 -0400 +@@ -210,6 +210,7 @@ + FcPattern *pattern; + FcChar8 *filename; + FcBool antialias, hinting, autohint; ++ int hintstyle; + int id; + + pattern = ft2font->font_pattern; +@@ -233,8 +234,21 @@ + FC_HINTING, 0, &hinting) != FcResultMatch) + hinting = FcTrue; + +- if (!hinting) +- ft2font->load_flags |= FT_LOAD_NO_HINTING; ++ if (FcPatternGetInteger (pattern, FC_HINT_STYLE, 0, &hintstyle) != FcResultMatch) ++ hintstyle = FC_HINT_FULL; ++ ++ if (!hinting || hintstyle == FC_HINT_NONE) ++ ft2font->load_flags |= FT_LOAD_NO_HINTING; ++ ++ switch (hintstyle) { ++ case FC_HINT_SLIGHT: ++ case FC_HINT_MEDIUM: ++ ft2font->load_flags |= FT_LOAD_TARGET_LIGHT; ++ break; ++ default: ++ ft2font->load_flags |= FT_LOAD_TARGET_NORMAL; ++ break; ++ } + + /* force autohinting if requested */ + if (FcPatternGetBool (pattern, Added: tinysofa/snapshot/pango/current/specs/pango.spec =================================================================== --- tinysofa/snapshot/pango/current/specs/pango.spec 2004-07-01 15:39:20 UTC (rev 2614) +++ tinysofa/snapshot/pango/current/specs/pango.spec 2004-07-01 15:39:21 UTC (rev 2615) @@ -0,0 +1,490 @@ +%define glib2_base_version 2.4.0 +%define glib2_version %{glib2_base_version}-1 +%define pkgconfig_version 0.12 +%define freetype_version 2.1.3-3 +%define fontconfig_version 2.0 +%define xft_version 1.9.1.020626.1517-1 + +Summary: System for layout and rendering of internationalized text. +Name: pango +Version: 1.4.0 +Release: 2ts +License: LGPL +Group: System Environment/Libraries +Source: http://ftp.gnome.org/pub/gnome/sources/pango/1.4/pango-%{version}.tar.bz2 +URL: http://www.pango.org +BuildRoot: %{_tmppath}/%{name}-%{version}-root + +# We need to prereq this so we can run pango-querymodules +Prereq: glib2 >= %{glib2_version} +Requires: freetype >= %{freetype_version} +BuildRequires: libtool >= 1.4.2-10 +BuildRequires: glib2-devel >= %{glib2_version} +BuildRequires: pkgconfig >= %{pkgconfig_version} +BuildRequires: freetype-devel >= %{freetype_version} +BuildRequires: fontconfig-devel >= %{fontconfig_version} +BuildRequires: xorg-x11-devel >= 6.7.0 +Obsoletes: pango-gtkbeta, fribidi-gtkbeta + +Patch1: pango-slighthint.patch +Patch3: pango-1.0.99.020606-xfonts.patch +# http://bugzilla.gnome.org/show_bug.cgi?id=121488 +Patch4: pango-1.3.2-thai.patch +# Look for pango.modules in an arch-specific directory +Patch5: pango-1.2.5-lib64.patch + +%description +Pango is a system for layout and rendering of internationalized text. + + +%package devel +Summary: System for layout and rendering of internationalized text. +Group: Development/Libraries +Requires: pango = %{PACKAGE_VERSION} +Requires: XFree86-devel >= 4.2.99 +Requires: glib2-devel >= %{glib2_version} +Requires: freetype-devel >= %{freetype_version} +Requires: fontconfig-devel >= %{fontconfig_version} +Obsoletes: fribidi-gtkbeta-devel, pango-gtkbeta-devel + +%description devel +The pango-devel package includes the static libraries, header files, +and developer docs for the pango package. + +Install pango-devel if you want to develop programs which will use +pango. + +%prep +%setup -q -n pango-%{version} + +%patch1 -p1 -b .slighthint +%patch3 -p1 -b .xfonts +%patch4 -p1 -b .thai +%patch5 -p1 -b .lib64 + +%build + +## FIXME remove this hack when X is fixed +export PKG_CONFIG_PATH=/usr/X11R6/lib/pkgconfig:/usr/X11R6/lib64/pkgconfig +if ! pkg-config --exists xft ; then + echo "No xft.pc!" + exit 1 +fi + +%configure --without-qt --disable-gtk-doc +make + +%install +rm -rf $RPM_BUILD_ROOT + +# Deriving /etc/pango/$host location +# NOTE: Duplicated below +# +# autoconf changes linux to linux-gnu +case "%{_host}" in + *linux) host="%{_host}-gnu" + ;; + *) host="%{_host}" + ;; +esac + +# autoconf uses powerpc not ppc +host=`echo $host | sed "s/^ppc/powerpc/"` + +# Make sure that the host value that is passed to the compile +# is the same as the host that we're using in the spec file +# +compile_host=`grep 'host_triplet =' pango/Makefile | sed "s/.* = //"` + +if test "x$compile_host" != "x$host" ; then + echo 1>&2 "Host mismatch: compile='$compile_host', spec file='$host'" && exit 1 +fi + +%makeinstall + +# Remove files that should not be packaged +rm $RPM_BUILD_ROOT%{_libdir}/*.la + +PANGOXFT_SO=$RPM_BUILD_ROOT%{_libdir}/libpangoxft-1.0.so +if ! test -e $PANGOXFT_SO; then + echo "$PANGOXFT_SO not found; did not build with Xft support?" + ls $RPM_BUILD_ROOT%{_libdir} + exit 1 +fi + +# We need to have separate 32-bit and 64-bit pango-querymodules binaries +# for places where we have two copies of the Pango libraries installed. +# (we might have x86_64 and i686 packages on the same system, for example.) +case "$host" in + alpha*|ia64*|ppc64*|s390x*|x86_64*) + mv $RPM_BUILD_ROOT%{_bindir}/pango-querymodules $RPM_BUILD_ROOT%{_bindir}/pango-querymodules-64 + ;; + *) + mv $RPM_BUILD_ROOT%{_bindir}/pango-querymodules $RPM_BUILD_ROOT%{_bindir}/pango-querymodules-32 + ;; +esac + +rm $RPM_BUILD_ROOT%{_sysconfdir}/pango/pango.modules +mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/pango/$host +touch $RPM_BUILD_ROOT%{_sysconfdir}/pango/$host/pango.modules + +# +# We need the substitution of $host so we use an external +# file list +# +echo %dir %{_sysconfdir}/pango/$host > modules.files +echo %ghost %{_sysconfdir}/pango/$host/pango.modules >> modules.files + +%clean +rm -rf $RPM_BUILD_ROOT + +%post +/sbin/ldconfig + +# Deriving /etc/pango/$host location +# +# autoconf changes linux to linux-gnu +case "%{_host}" in + *linux) host="%{_host}-gnu" + ;; + *) host="%{_host}" + ;; +esac + +# autoconf uses powerpc not ppc +host=`echo $host | sed "s/^ppc/powerpc/"` + +case "$host" in + alpha*|ia64*|powerpc64*|s390x*|x86_64*) + %{_bindir}/pango-querymodules-64 > %{_sysconfdir}/pango/$host/pango.modules + ;; + *) + %{_bindir}/pango-querymodules-32 > %{_sysconfdir}/pango/$host/pango.modules + ;; +esac + +%postun -p /sbin/ldconfig + +%files -f modules.files +%defattr(-, root, root) +%doc README AUTHORS COPYING ChangeLog TODO +%doc examples/HELLO.utf8 +%{_libdir}/libpango*-*.so.* +%{_bindir}/pango-querymodules* +%{_libdir}/pango +%{_mandir}/man1/* + +%dir %{_sysconfdir}/pango +%config %{_sysconfdir}/pango/pangox.aliases + + +%files devel +%defattr(-, root, root) +%{_libdir}/libpango*.so +%{_includedir}/* +%{_libdir}/pkgconfig/* +%{_datadir}/gtk-doc/* + + +%changelog +* Wed Mar 17 2004 Owen Taylor 1.4.0-2 +- Fix location for modules file on ppc/ppc64 (#114399) +- Make the spec file check to avoid further mismatches + +* Wed Mar 17 2004 Alex Larsson 1.4.0-1 +- update to 1.4.0 + +* Wed Mar 10 2004 Mark McLoughlin 1.3.6-1 +- Update to 1.3.6 +- Bump required glib2 to 2.3.1 + +* Tue Mar 02 2004 Elliot Lee +- rebuilt + +* Tue Mar 02 2004 Mark McLoughlin 1.3.5-1 +- Update to 1.3.5 + +* Wed Feb 25 2004 Mark McLoughlin 1.3.3-1 +- Update to 1.3.3 + +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Fri Jan 23 2004 Jonathan Blandford 1.3.2-1 +- new version +- add man page + +* Thu Dec 18 2003 Owen Taylor 1.2.5-4 +- Deal with autoconf changing -linux to -linux-gnu (#112387) + +* Mon Dec 8 2003 Owen Taylor 1.2.5-3.0 +- Package pango-querymodules as pango-querymodules-{32,64}; look for + pango.modules in an architecture-specific directory. + (Fixes #111511, Justin M. Forbes) + +* Mon Sep 8 2003 Owen Taylor 1.2.5-2.0 +- Fix problem with corrupt Thai shaper + +* Wed Aug 27 2003 Owen Taylor 1.2.5-1.1 +- Version 1.2.5 + +* Tue Aug 26 2003 Owen Taylor 1.2.4-1.1 +- Version 1.2.4 + +* Tue Jul 8 2003 Owen Taylor 1.2.3-2.0 +- Bump for rebuild + +* Mon Jun 9 2003 Owen Taylor +- Version 1.2.3 + +* Wed Jun 04 2003 Elliot Lee +- rebuilt + +* Mon Jun 2 2003 Owen Taylor +- Use the right version-1.2.2 tarball + +* Thu May 29 2003 Owen Taylor +- Version 1.2.2 + +* Thu Feb 13 2003 Tim Powers 1.2.1-3 +- remove deps on Xft and Xft-devel since XFree86 no longer has the + virtual prvodes. Instead, require XFree86-devel > 4.2.99 + +* Tue Feb 11 2003 Owen Taylor +- Fix problem where language tag wasn't causing relookup of font (#84034) + +* Sun Feb 2 2003 Owen Taylor +- Version 1.2.1 + +* Wed Jan 22 2003 Tim Powers +- rebuilt + +* Tue Jan 14 2003 Owen Taylor +- Patch from CVS to synthesize GDEF tables for fonts + without them, like the Kacst fonts in fonts-arabic + +* Thu Jan 9 2003 Owen Taylor +- Make requires freetype, not freetype-devel (#81423) + +* Tue Jan 7 2003 Owen Taylor +- Update slighthint patch for freetype-2.1.3 (#81125) + +* Fri Dec 20 2002 Owen Taylor +- Version 1.2.0 + +* Mon Dec 16 2002 Owen Taylor +- Version 1.1.6 + +* Wed Dec 11 2002 Owen Taylor +- Version 1.1.5 + +* Tue Dec 3 2002 Owen Taylor +- Version 1.1.4 + +* Thu Nov 21 2002 Havoc Pennington +- change PKG_CONFIG_PATH hack to also search /usr/X11R6/lib64/pkgconfig + +* Wed Nov 20 2002 Havoc Pennington +- explicitly require pangoxft to be built, so we catch situations such + as xft.pc moving to /usr/X11R6 +- also add /usr/X11R6/lib/pkgconfig to PKG_CONFIG_PATH as a temporary + hack + +* Thu Nov 7 2002 Havoc Pennington +- 1.1.3 + +* Thu Oct 31 2002 Owen Taylor 1.1.1-5 +- Require the necessary freetype version, don't just + BuildRequires it (#74744) + +* Thu Oct 31 2002 Owen Taylor 1.1.1-4 +- Own /etc/pango (#73962, Enrico Scholz) +- Remove .la files from the build root + +* Mon Oct 7 2002 Havoc Pennington +- require glib 2.0.6-3, try rebuild on more arches + +* Wed Aug 21 2002 Owen Taylor +- Version 1.1.1 (main change, fixes font selection for FT2 backend, + as in gdmgreeter) + +* Thu Aug 15 2002 Owen Taylor +- Fix linked list manipulation problem that was causing hang for anaconda +- Fix warning from loading mini-fonts with context == NULL + +* Wed Aug 14 2002 Owen Taylor +- Fix major memory leak in the last patch + +* Tue Aug 13 2002 Owen Taylor +- Actually use language tags at the rendering layer (should fix #68211) + +* Mon Jul 15 2002 Owen Taylor +- Remove fixed-ltmain.sh, relibtoolize; to fix relink problems without +- Fix bug causing hex boxes to be misrendered + leaving RPATH (#66005) +- For FT2 backend, supply FT_LOAD_NO_BITMAP to avoid problems with + fonts with embedded bitmaps (#67851) + +* Mon Jul 8 2002 Owen Taylor +- Make basic-x shaper work with our big-5 fonts + +* Wed Jul 3 2002 Owen Taylor +- New upstream tarball with hooks for change-on-the fly font rendering + +* Tue Jun 25 2002 Owen Taylor +- Up FreeType version to deal with FreeType-2.0.x / 2.1.x \ + ABI changes for pango's OpenType code. + +* Mon Jun 24 2002 Owen Taylor +- Add some Korean aliases that the installer wants + +* Fri Jun 21 2002 Tim Powers +- automated rebuild + +* Sat Jun 8 2002 Havoc Pennington +- devel package requires fontconfig/Xft devel packages + +* Fri Jun 07 2002 Havoc Pennington +- rebuild in different environment + +* Thu Jun 6 2002 Owen Taylor +- Snapshot with Xft2/fontconfig support + +* Wed May 29 2002 Owen Taylor +- Version 1.0.2 +- Patch for charmaps problem + +* Sun May 26 2002 Tim Powers +- automated rebuild + +* Wed May 22 2002 Havoc Pennington +- rebuild in different environment + +* Wed May 22 2002 Havoc Pennington +- add patch to adjust to newer version of freetype + +* Wed Apr 3 2002 Alex Larsson +- Update to version 1.0.1, remove patch + +* Tue Mar 19 2002 Owen Taylor +- Patch from CVS for big speedup with FreeType-2.0.9 + +* Mon Mar 11 2002 Owen Taylor +- Rebuild + +* Fri Mar 8 2002 Owen Taylor +- Version 1.0.0 + +* Mon Feb 25 2002 Alex Larsson +- Update to 0.26 + +* Thu Feb 21 2002 Alex Larsson +- Bump for rebuild + +* Mon Feb 18 2002 Alex Larsson +- Update to 0.25 + +* Fri Feb 15 2002 Havoc Pennington +- add horrible buildrequires hack + +* Thu Feb 14 2002 Havoc Pennington +- 0.24.90 cvs snap + +* Tue Jan 29 2002 Owen Taylor +- Version 0.24 + +* Wed Jan 09 2002 Tim Powers +- automated rebuild + +* Wed Jan 2 2002 Havoc Pennington +- new snap 0.23.90 + +* Sun Nov 25 2001 Havoc Pennington +- rebuild with 64-bit-fixed glib + +* Sun Nov 25 2001 Havoc Pennington +- Version 0.22 +- add explicit check for required glib2 version before we do the build, + so we don't end up with bad RPMs on --nodeps builds +- PreReq the glib2_version version, instead of 1.3.8 hardcoded that + no one had updated recently + +* Thu Oct 25 2001 Owen Taylor +- Version 0.21 + +* Thu Oct 4 2001 Havoc Pennington +- cvs snap +- new cvs snap with a bugfix + +* Thu Sep 27 2001 Havoc Pennington +- sync with Owen's changes, fix up dependency versions + +* Wed Sep 19 2001 Havoc Pennington +- 0.19 + +* Mon Sep 10 2001 Havoc Pennington +- build CVS snap + +* Wed Sep 05 2001 Havoc Pennington +- no relinking junk + +* Tue Sep 4 2001 root +- Version 0.18 + +* Fri Jul 20 2001 Owen Taylor +- Configure --disable-gtk-doc +- BuildRequires freetype-devel, XFree86-devel + +* Tue Jun 12 2001 Havoc Pennington +- 0.17 +- libtool hackarounds + +* Fri May 04 2001 Owen Taylor +- 0.16, rename back to pango from pango-gtkbeta + +* Fri Feb 16 2001 Owen Taylor +- Obsolete fribidi-gtkbeta + +* Mon Dec 11 2000 Havoc Pennington +- Remove that patch I just put in + +* Mon Dec 11 2000 Havoc Pennington +- Patch pangox.pc.in to include -Iincludedir + +* Fri Nov 17 2000 Owen Taylor +- final 0.13 + +* Tue Nov 14 2000 Owen Taylor +- New 0.13 tarball + +* Mon Nov 13 2000 Owen Taylor +- 0.13pre1 + +* Sun Aug 13 2000 Owen Taylor +- Rename to 0.12b to avoid versioning problems + +* Thu Aug 10 2000 Havoc Pennington +- Move to a CVS snapshot + +* Fri Jul 07 2000 Owen Taylor +- Move back to /usr +- Version 0.12 + +* Mon Jun 19 2000 Owen Taylor +- Add missing %%defattr + +* Thu Jun 8 2000 Owen Taylor +- Rebuild with a prefix of /opt/gtk-beta + +* Wed May 31 2000 Owen Taylor +- version 0.11 +- add --without-qt + +* Wed Apr 26 2000 Owen Taylor +- Make the devel package require *-gtkbeta-* not the normal packages. + +* Tue Apr 25 2000 Owen Taylor +- GTK+ snapshot version installing in /opt/gtk-beta + +* Fri Feb 11 2000 Owen Taylor +- Created spec file From svn at tinysofa.org Thu Jul 1 15:39:25 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:39:25 +1000 (EST) Subject: [tinysofa-svn] r2617 - in tinysofa/snapshot: . patchutils patchutils/current patchutils/current/sources patchutils/current/specs Message-ID: <20040701153925.C5FC14E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:39:25 +1000 (Fri, 02 Jul 2004) New Revision: 2617 Added: tinysofa/snapshot/patchutils/ tinysofa/snapshot/patchutils/current/ tinysofa/snapshot/patchutils/current/sources/ tinysofa/snapshot/patchutils/current/sources/patchutils-0.2.29.tar.bz2 tinysofa/snapshot/patchutils/current/sources/patchutils-newline.patch tinysofa/snapshot/patchutils/current/specs/ tinysofa/snapshot/patchutils/current/specs/patchutils.spec Log: - Add patchutils to snapshot from 2.0. Added: tinysofa/snapshot/patchutils/current/sources/patchutils-0.2.29.tar.bz2 =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/patchutils/current/sources/patchutils-0.2.29.tar.bz2 ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/patchutils/current/sources/patchutils-newline.patch =================================================================== --- tinysofa/snapshot/patchutils/current/sources/patchutils-newline.patch 2004-07-01 15:39:23 UTC (rev 2616) +++ tinysofa/snapshot/patchutils/current/sources/patchutils-newline.patch 2004-07-01 15:39:25 UTC (rev 2617) @@ -0,0 +1,101 @@ +Index: patchutils/ChangeLog +diff -u patchutils/ChangeLog:1.462 patchutils/ChangeLog:1.464 +--- patchutils/ChangeLog:1.462 Mon Apr 5 12:07:18 2004 ++++ patchutils/ChangeLog Fri Apr 16 11:51:37 2004 +@@ -1,3 +1,11 @@ ++2004-04-16 Tim Waugh ++ ++ * src/filterdiff.c (do_unified): Handle no-newline line counts ++ correctly. ++ ++ * tests/newline5/run-test: New test. ++ * Makefile.am: Run it. ++ + 2004-04-05 Tim Waugh + + * configure.in: Version 0.2.29 (stable). +Index: patchutils/Makefile.am +diff -u patchutils/Makefile.am:1.150 patchutils/Makefile.am:1.151 +--- patchutils/Makefile.am:1.150 Fri Apr 2 17:11:09 2004 ++++ patchutils/Makefile.am Fri Apr 16 11:31:17 2004 +@@ -74,6 +74,7 @@ + tests/newline2/run-test \ + tests/newline3/run-test \ + tests/newline4/run-test \ ++ tests/newline5/run-test \ + tests/create1/run-test \ + tests/broken1/run-test \ + tests/revert1/run-test \ +@@ -207,6 +208,7 @@ + tests/newline2/run-test \ + tests/newline3/run-test \ + tests/newline4/run-test \ ++ tests/newline5/run-test \ + tests/create1/run-test \ + tests/broken1/run-test \ + tests/revert1/run-test \ +Index: patchutils/NEWS +diff -u patchutils/NEWS:1.29 patchutils/NEWS:1.30 +--- patchutils/NEWS:1.29 Wed Mar 10 11:06:42 2004 ++++ patchutils/NEWS Mon Apr 5 12:17:21 2004 +@@ -1,6 +1,10 @@ + Patchutils news + --------------- + ++0.2.29 (stable) ++ ++ Several small bugs were fixed. ++ + 0.2.28 (stable) + + Some format conversion bugs were fixed. +Index: patchutils/src/filterdiff.c +diff -u patchutils/src/filterdiff.c:1.69 patchutils/src/filterdiff.c:1.70 +--- patchutils/src/filterdiff.c:1.69 Fri Apr 2 18:13:38 2004 ++++ patchutils/src/filterdiff.c Fri Apr 16 11:51:37 2004 +@@ -383,10 +383,12 @@ + continue; + } + +- if (orig_count && **line != '+') +- orig_count--; +- if (new_count && **line != '-') +- new_count--; ++ if (**line != '\\') { ++ if (orig_count && **line != '+') ++ orig_count--; ++ if (new_count && **line != '-') ++ new_count--; ++ } + + if (hunk_match && mode == mode_grep && + !regexecs (regex, num_regex, *line + 1, 0, NULL, 0)) { +Index: patchutils/tests/newline5/run-test +diff -u /dev/null patchutils/tests/newline5/run-test:1.1 +--- /dev/null Fri Apr 16 11:54:05 2004 ++++ patchutils/tests/newline5/run-test Fri Apr 16 11:31:17 2004 +@@ -0,0 +1,24 @@ ++#!/bin/sh ++# ++# This is a filterdiff(1) test case. ++# Test: Handle adding newline to EOF ++ ++. ${top_srcdir-.}/tests/common.sh ++ ++cat << EOF > orig ++a ++b ++EOF ++echo -n c >> orig ++cat << EOF > new ++a ++b ++c ++EOF ++ ++${DIFF} -u orig new > patch ++${FILTERDIFF} patch 2>errors > filtered || exit 1 ++[ -s errors ] && exit 1 ++ ++${PATCH} orig -i filtered || exit 1 ++cmp orig new || exit 1 Added: tinysofa/snapshot/patchutils/current/specs/patchutils.spec =================================================================== --- tinysofa/snapshot/patchutils/current/specs/patchutils.spec 2004-07-01 15:39:23 UTC (rev 2616) +++ tinysofa/snapshot/patchutils/current/specs/patchutils.spec 2004-07-01 15:39:25 UTC (rev 2617) @@ -0,0 +1,146 @@ +Summary: A collection of programs for manipulating patch files +Name: patchutils +Version: 0.2.29 +Release: 3ts +License: GPL +Group: Applications/System +URL: http://cyberelk.net/tim/patchutils/ +Source0: http://cyberelk.net/tim/data/patchutils/stable/%{name}-%{version}.tar.bz2 +Patch0: patchutils-newline.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-root +Obsoletes: interdiff +Provides: interdiff + +# We only need xmlto if we are patching the documentation. +#BuildRequires: xmlto + +%description +This is a collection of programs that can manipulate patch files in +a variety of ways, such as interpolating between two pre-patches, +combining two incremental patches, fixing line numbers in hand-edited +patches, and simply listing the files modified by a patch. + +%prep +%setup -q +%patch0 -p1 -b .newline + +%build +%configure +make +make check + +%install +rm -rf %{buildroot} +%makeinstall + +%clean +rm -rf %{buildroot} + +%files +%defattr(-,root,root) +%doc AUTHORS ChangeLog README COPYING BUGS NEWS +%{_bindir}/* +%{_mandir}/*/* + +%changelog +* Tue Jun 15 2004 Elliot Lee +- rebuilt + +* Fri Apr 16 2004 Tim Waugh 0.2.29-2 +- Fix no-newline handling in filterdiff. + +* Mon Apr 5 2004 Tim Waugh 0.2.29-1 +- 0.2.29. + +* Wed Mar 10 2004 Tim Waugh 0.2.28-1 +- 0.2.28. + +* Thu Feb 26 2004 Tim Waugh 0.2.27-1 +- 0.2.27. + +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Mon Jan 12 2004 Tim Waugh 0.2.26-1 +- 0.2.26. + +* Tue Jan 6 2004 Tim Waugh +- Ship AUTHORS and ChangeLog as well (bug #112936). + +* Mon Dec 15 2003 Tim Waugh 0.2.25-1 +- 0.2.25. + +* Wed Sep 3 2003 Tim Waugh +- Remove buildroot before installing. + +* Thu Jul 31 2003 Tim Waugh 0.2.24-2 +- Add support for -H in lsdiff/grepdiff (from CVS). + +* Fri Jul 25 2003 Tim Waugh 0.2.24-1 +- 0.2.24 (fixes bug #100795). + +* Wed Jun 5 2003 Elliot Lee +- rebuilt + +* Thu Jun 5 2003 Tim Waugh 0.2.23-2 +- Added patch from CVS which adds timestamp removal to filterdiff. + +* Thu Jun 5 2003 Tim Waugh 0.2.23-1.1 +- Rebuilt. + +* Thu Jun 5 2003 Tim Waugh 0.2.23-1 +- 0.2.23. Fixes bug #92320. + +* Sat Mar 8 2003 Tim Waugh 0.2.22-1 +- 0.2.22. + +* Thu Jan 23 2003 Tim Waugh 0.2.19-1 +- 0.2.19, incorporating all patches. + +* Wed Jan 22 2003 Tim Powers 0.2.18-3 +- rebuilt + +* Wed Jan 22 2003 Tim Waugh +- Apply editdiff patch from 0.2.19pre2. + +* Wed Jan 22 2003 Tim Waugh 0.2.18-2 +- Bug-fix for rediff. + +* Mon Dec 16 2002 Tim Waugh 0.2.18-1 +- Fix file_exists(). +- 0.2.18. + +* Wed Oct 16 2002 Tim Waugh 0.2.17-1 +- 0.2.17. + +* Fri Jun 21 2002 Tim Powers +- automated rebuild + +* Thu May 23 2002 Tim Powers +- automated rebuild + +* Sat May 18 2002 Tim Waugh 0.2.14-1 +- 0.2.14. + +* Thu May 9 2002 Tim Waugh 0.2.13-1 +- 0.2.13. + +* Tue Apr 23 2002 Tim Waugh 0.2.13-0.pre1.1 +- 0.2.13pre1 (now handles diffutils 2.8.1 output). +- Run tests after build step. + +* Fri Apr 19 2002 Tim Waugh 0.2.12-1 +- 0.2.12. + +* Wed Mar 20 2002 Tim Waugh 0.2.11-2 +- Fix handling of context diffs so that it handles GNU diff's output + style. + +* Mon Mar 14 2002 Tim Waugh 0.2.11-1 +- 0.2.11. + +* Mon Mar 04 2002 Florian La Roche +- I need this. :-) + +* Tue Nov 27 2001 Tim Waugh +- Initial spec file. From svn at tinysofa.org Thu Jul 1 15:39:57 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:39:57 +1000 (EST) Subject: [tinysofa-svn] r2638 - in tinysofa/snapshot: . policycoreutils policycoreutils/current policycoreutils/current/sources policycoreutils/current/specs Message-ID: <20040701153957.AF14B4E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:39:57 +1000 (Fri, 02 Jul 2004) New Revision: 2638 Added: tinysofa/snapshot/policycoreutils/ tinysofa/snapshot/policycoreutils/current/ tinysofa/snapshot/policycoreutils/current/sources/ tinysofa/snapshot/policycoreutils/current/sources/policycoreutils-1.13.3.tgz tinysofa/snapshot/policycoreutils/current/sources/policycoreutils-rhat.patch tinysofa/snapshot/policycoreutils/current/specs/ tinysofa/snapshot/policycoreutils/current/specs/policycoreutils.spec Log: - Add policycoreutils to snapshot from 2.0. Added: tinysofa/snapshot/policycoreutils/current/sources/policycoreutils-1.13.3.tgz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/policycoreutils/current/sources/policycoreutils-1.13.3.tgz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/policycoreutils/current/sources/policycoreutils-rhat.patch =================================================================== --- tinysofa/snapshot/policycoreutils/current/sources/policycoreutils-rhat.patch 2004-07-01 15:39:56 UTC (rev 2637) +++ tinysofa/snapshot/policycoreutils/current/sources/policycoreutils-rhat.patch 2004-07-01 15:39:57 UTC (rev 2638) @@ -0,0 +1,254 @@ +--- policycoreutils-1.13.3/setfiles/setfiles.c.rhat 2004-06-23 09:21:44.000000000 -0400 ++++ policycoreutils-1.13.3/setfiles/setfiles.c 2004-06-23 09:49:12.000000000 -0400 +@@ -12,7 +12,7 @@ + * the user. The program does not cross file system boundaries. + * + * USAGE: +- * setfiles [-dnpqsvW] spec_file pathname... ++ * setfiles [-dnpqsvW] [-o filename ] spec_file pathname... + * + * -d Show what specification matched each file. + * -n Do not change any file labels. +@@ -21,6 +21,7 @@ + * -s Use stdin for a list of files instead of searching a partition. + * -v Show changes in file labels. + * -W Warn about entries that have no matching file. ++ * -o filename write out file names with wrong context. + * + * spec_file The specification file. + * pathname... The file systems to label (omit if using -s). +@@ -68,6 +69,7 @@ + #include + + static int add_assoc = 1; ++static FILE *outfile=NULL; + + /* + * Command-line options. +@@ -480,8 +482,8 @@ + void usage(const char * const name) + { + fprintf(stderr, +- "usage: %s [-dnqvW] spec_file pathname...\n" +- "usage: %s -s [-dnqvW] spec_file\n", name, name); ++ "usage: %s [-dnqvW] [-o filename] spec_file pathname...\n" ++ "usage: %s -s [-dnqvW] [-o filename ] spec_file\n", name, name); + exit(1); + } + +@@ -652,6 +654,9 @@ + + freecon(context); + ++ if (outfile) ++ fprintf(outfile, "%s\n", my_file); ++ + /* + * Do not relabel the file if -n was used. + */ +@@ -705,7 +710,7 @@ + spec_t *spec_copy; + + /* Process any options. */ +- while ((opt = getopt(argc, argv, "dnqrsvW")) > 0) { ++ while ((opt = getopt(argc, argv, "dnqrsvWo:")) > 0) { + switch (opt) { + case 'd': + debug = 1; +@@ -713,6 +718,15 @@ + case 'n': + change = 0; + break; ++ case 'o': ++ outfile = fopen(optarg,"w"); ++ if (!outfile) { ++ fprintf(stderr, "Error opening %s: %s\n", ++ optarg, strerror(errno)); ++ ++ usage(argv[0]); ++ } ++ break; + case 'q': + quiet = 1; + break; +@@ -1039,6 +1053,8 @@ + } + } + } ++ if (outfile) ++ fclose(outfile); + + QPRINTF("%s: Done.\n", argv[0]); + +--- policycoreutils-1.13.3/setfiles/setfiles.8.rhat 2004-06-23 09:21:44.000000000 -0400 ++++ policycoreutils-1.13.3/setfiles/setfiles.8 2004-06-23 09:46:15.000000000 -0400 +@@ -4,8 +4,7 @@ + + .SH "SYNOPSIS" + .B setfiles +-.I [\-d] [\-n] [\-q] [\-s] [\-v] [\-vv] [\-W] spec_file pathname... +- ++.I [\-d] [\-n] [\-o filename ] [\-q] [\-s] [\-v] [\-vv] [\-W] spec_file pathname... + .SH "DESCRIPTION" + This manual page describes the + .BR setfiles +@@ -30,6 +29,9 @@ + .B \-q + suppress non-error output. + .TP ++.B \-o filename ++save list of files with incorrect context in filename. ++.TP + .B \-s + take a list of files from standard input instead of using a pathname on the + command line. +--- policycoreutils-1.13.3/scripts/fixfiles.rhat 2004-06-23 09:21:44.000000000 -0400 ++++ policycoreutils-1.13.3/scripts/fixfiles 2004-06-24 13:11:07.359579384 -0400 +@@ -32,7 +32,7 @@ + + checkLabels () { + echo "logging to $LOGFILE" +-if [ $1 != "" ]; then ++if [ "x$1" != "x" ]; then + for i in `echo $1 | sed 's/,/ /g'`; do + rpm -q -l $i | restorecon -n -v -f - 2>&1 | tee $LOGFILE + done +@@ -43,7 +43,7 @@ + + restoreLabels () { + echo "logging to $LOGFILE" +-if [ $1 != "" ]; then ++if [ "x$1" != "x" ]; then + for i in `echo $1 | sed 's/,/ /g'`; do + rpm -q -l $i | restorecon -v -f - 2>&1 | tee $LOGFILE + done +@@ -56,7 +56,7 @@ + echo "logging to $LOGFILE" + echo "Cleaning out /tmp" + rm -rf /tmp/.??* /tmp/* +-if [ $1 != "" ]; then ++if [ "x$1" != "x" ]; then + for i in `echo $1 | sed 's/,/ /g'`; do + rpm -q -l $i | restorecon -v -f - 2>&1 | tee $LOGFILE + done +@@ -73,9 +73,9 @@ + Do you wish to clean out the /tmp directory [N]? " + read answer + if [ "$answer" = y -o "$answer" = Y ]; then +- relabel $1 ++ relabel "$1" + else +- restoreLabels $1 ++ restoreLabels "$1" + fi + + } +--- policycoreutils-1.13.3/restorecon/restorecon.8.rhat 2004-06-23 09:21:44.000000000 -0400 ++++ policycoreutils-1.13.3/restorecon/restorecon.8 2004-06-23 09:46:48.000000000 -0400 +@@ -4,7 +4,10 @@ + + .SH "SYNOPSIS" + .B restorecon +-.I [\-n] [\-v] pathname... ++.I [\-o outfilename ] [\-n] [\-v] pathname... ++.P ++.B restorecon ++.I \-f infilename [\-o outfilename ] [\-n] [\-v] + + .SH "DESCRIPTION" + This manual page describes the +@@ -20,9 +23,15 @@ + + .SH "OPTIONS" + .TP ++.B \-f infilename ++infilename contains a list of files to be processed by application. Use \- for stdin. ++.TP + .B \-n + don't change any file labels. + .TP ++.B \-o outfilename ++save list of files with incorrect context in outfilename. ++.TP + .B \-v + show changes in file labels. + .TP +--- policycoreutils-1.13.3/restorecon/restorecon.c.rhat 2004-06-23 09:21:44.000000000 -0400 ++++ policycoreutils-1.13.3/restorecon/restorecon.c 2004-06-23 09:48:44.000000000 -0400 +@@ -12,6 +12,7 @@ + * + * -n Do not change any file labels. + * -v Show changes in file labels. ++ * -o filename save list of files with incorrect context + * + * pathname... The file(s) to label + * +@@ -41,7 +42,7 @@ + "usage: %s [-nv] [-f filename | pathname... ]\n", name); + exit(1); + } +-int restore(char *filename, int change, int verbose) { ++int restore(char *filename, int change, int verbose, FILE *outfile) { + int retcontext=0; + int retval=0; + int errors=0; +@@ -72,6 +73,9 @@ + + if (retcontext >= 0 || errno == ENODATA) { + if (retcontext < 0 || strcmp(prev_context,scontext) != 0) { ++ if (outfile) { ++ fprintf(outfile, "%s\n", filename); ++ } + if (change) { + retval=lsetfilecon(filename,scontext); + } +@@ -106,6 +110,7 @@ + int verbose=0; + int file=0; + char opt; ++ FILE *outfile=NULL; + char buf[PATH_MAX]; + + progname=argv[0]; +@@ -114,11 +119,19 @@ + + memset(buf,0, sizeof(buf)); + +- while ((opt = getopt(argc, argv, "nvf:")) > 0) { ++ while ((opt = getopt(argc, argv, "nvf:o:")) > 0) { + switch (opt) { + case 'n': + change = 0; + break; ++ case 'o': ++ outfile = fopen(optarg,"w"); ++ if (!outfile) { ++ fprintf(stderr, "Error opening %s: %s\n", ++ optarg, strerror(errno)); ++ usage(argv[0]); ++ } ++ break; + case 'v': + verbose = 1; + break; +@@ -141,15 +154,18 @@ + } + while(fgets(buf,PATH_MAX,f)) { + buf[strlen(buf)-1]=0; +- errors=errors+restore(buf,change, verbose); ++ errors=errors+restore(buf, change, verbose, outfile); + } + if (strcmp(file_name,"-")!=0) + fclose(f); + } + else { + for (i=optind; i< argc; i++) { +- errors=errors+restore(argv[i],change, verbose); ++ errors=errors+restore(argv[i], change, verbose, outfile); + } + } ++ if (outfile) ++ fclose(outfile); ++ + return errors; + } Added: tinysofa/snapshot/policycoreutils/current/specs/policycoreutils.spec =================================================================== --- tinysofa/snapshot/policycoreutils/current/specs/policycoreutils.spec 2004-07-01 15:39:56 UTC (rev 2637) +++ tinysofa/snapshot/policycoreutils/current/specs/policycoreutils.spec 2004-07-01 15:39:57 UTC (rev 2638) @@ -0,0 +1,296 @@ +Summary: SELinux policy core utilities. +Name: policycoreutils +Version: 1.13.3 +Release: 2ts +License: GPL +Group: System Environment/Base +Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz + +Prefix: %{_prefix} +BuildRequires: libselinux-devel pam-devel +Patch: policycoreutils-rhat.patch + +BuildRoot: %{_tmppath}/%{name}-%{version}-root + +%description +Security-enhanced Linux is a patch of the Linux? kernel and a number +of utilities with enhanced security functionality designed to add +mandatory access controls to Linux. The Security-enhanced Linux +kernel contains new architectural components originally developed to +improve the security of the Flask operating system. These +architectural components provide general support for the enforcement +of many kinds of mandatory access control policies, including those +based on the concepts of Type Enforcement?, Role-based Access +Control, and Multi-level Security. + +policycoreutils contains the policy core utilities that are required +for basic operation of a SELinux system. These utilities include +load_policy to load policies, setfiles to label filesystems, newrole +to switch roles, and run_init to run /etc/init.d scripts in the proper +context. + +%prep +%setup -q +%patch -p1 -b .rhat + +%build +make all + +%install +rm -rf ${RPM_BUILD_ROOT} +mkdir -p ${RPM_BUILD_ROOT}%{_bindir} +mkdir -p ${RPM_BUILD_ROOT}%{_sbindir} +mkdir -p ${RPM_BUILD_ROOT}/sbin +mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man1 +mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man8 +mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/pam.d +make DESTDIR="${RPM_BUILD_ROOT}" install + +%find_lang %{name} + +%clean +rm -rf ${RPM_BUILD_ROOT} + +%files -f %{name}.lang +%defattr(-,root,root) +%{_sbindir}/setfiles +/sbin/fixfiles +/sbin/restorecon +%{_mandir}/man8/restorecon.8.gz +%{_sbindir}/genhomedircon +%{_sbindir}/sestatus +%{_mandir}/man8/sestatus.8.gz +%{_mandir}/man8/setfiles.8.gz +%{_mandir}/man8/fixfiles.8.gz +%{_sbindir}/load_policy +%{_bindir}/newrole +%{_bindir}/audit2allow +%{_mandir}/man1/newrole.1.gz +%config %{_sysconfdir}/pam.d/newrole +%{_sbindir}/run_init +%config %{_sysconfdir}/pam.d/run_init +%{_mandir}/man8/run_init.8.gz +%config(noreplace) %{_sysconfdir}/sestatus.conf + +%changelog +* Thu Jun 24 2004 Dan Walsh 1.13.3-2 +- Fix fixfiles to handle no rpm file on relabel + +* Wed Jun 23 2004 Dan Walsh 1.13.3-1 +- Update latest from NSA +- Add -o option to setfiles to save output of any files with incorrect context. + +* Tue Jun 22 2004 Dan Walsh 1.13.2-2 +- Add rpm support to fixfiles +- Update restorecon to add file input support + +* Fri Jun 18 2004 Dan Walsh 1.13.2-1 +- Update with NSA Latest + +* Tue Jun 15 2004 Elliot Lee +- rebuilt + +* Sat Jun 12 2004 Dan Walsh 1.13.1-2 +- Fix run_init to use policy formats + +* Wed Jun 2 2004 Dan Walsh 1.13.1-1 +- Update from NSA + +* Tue May 25 2004 Dan Walsh 1.13-3 +- Change location of file_context file + +* Tue May 25 2004 Dan Walsh 1.13-2 +- Change to use /etc/sysconfig/selinux to determine location of policy files + +* Fri May 21 2004 Dan Walsh 1.13-1 +- Update to latest from NSA +- Change fixfiles to prompt before deleteing /tmp files + +* Tue May 18 2004 Dan Walsh 1.12-2 +- have restorecon ingnore <> +- Hand matchpathcon the file status + +* Thu May 14 2004 Dan Walsh 1.12-1 +- Update to match NSA + +* Mon May 10 2004 Dan Walsh 1.11-4 +- Move location of log file to /var/tmp + +* Mon May 10 2004 Dan Walsh 1.11-3 +- Better grep command for bind + +* Fri May 7 2004 Dan Walsh 1.11-2 +- Eliminate bind and context mounts + +* Wed May 5 2004 Dan Walsh 1.11-1 +- update to match NSA + +* Wed Apr 28 2004 Dan Walsh 1.10-4 +- Log fixfiles to the /tmp directory + +* Wed Apr 21 2004 Colin Walters 1.10-3 +- Add patch to fall back to authenticating via uid if + the current user's SELinux user identity is the default + identity +- Add BuildRequires pam-devel + +* Mon Apr 12 2004 Dan Walsh 1.10-2 +- Add man page, thanks to Richard Halley + +* Thu Apr 8 2004 Dan Walsh 1.10-1 +- Upgrade to latest from NSA + +* Fri Apr 2 2004 Dan Walsh 1.9.2-1 +- Update with latest from gentoo and NSA + +* Thu Apr 1 2004 Dan Walsh 1.9.1-1 +- Check return codes in sestatus.c + +* Mon Mar 29 2004 Dan Walsh 1.9-19 +- Fix sestatus to not double free +- Fix sestatus.conf to be unix format + +* Mon Mar 29 2004 Dan Walsh 1.9-18 +- Warn on setfiles failure to relabel. + +* Mon Mar 29 2004 Dan Walsh 1.9-17 +- Updated version of sestatus + +* Mon Mar 29 2004 Dan Walsh 1.9-16 +- Fix fixfiles to checklabel properly + +* Fri Mar 26 2004 Dan Walsh 1.9-15 +- add sestatus + +* Thu Mar 25 2004 Dan Walsh 1.9-14 +- Change free call to freecon +- Cleanup + +* Tue Mar 23 2004 Dan Walsh 1.9-12 +- Remove setfiles-assoc patch +- Fix restorecon to not crash on missing dir + +* Thu Mar 17 2004 Dan Walsh 1.9-11 +- Eliminate trailing / in restorecon + +* Thu Mar 17 2004 Dan Walsh 1.9-10 +- Add Verbosity check + +* Thu Mar 17 2004 Dan Walsh 1.9-9 +- Change restorecon to not follow symlinks. It is too difficult and confusing +- to figure out the file context for the file pointed to by a symlink. + +* Wed Mar 17 2004 Dan Walsh 1.9-8 +- Fix restorecon +* Wed Mar 17 2004 Dan Walsh 1.9-7 +- Read restorecon patch + +* Wed Mar 17 2004 Dan Walsh 1.9-6 +- Change genhomedircon to take POLICYSOURCEDIR from command line + +* Wed Mar 17 2004 Dan Walsh 1.9-5 +- Add checkselinux +- move fixfiles and restorecon to /sbin + +* Wed Mar 17 2004 Dan Walsh 1.9-4 +- Restore patch of genhomedircon + +* Mon Mar 15 2004 Dan Walsh 1.9-3 +- Add setfiles-assoc patch to try to freeup memory use + +* Mon Mar 15 2004 Dan Walsh 1.9-2 +- Add fixlabels + +* Mon Mar 15 2004 Dan Walsh 1.9-1 +- Update to latest from NSA + +* Wed Mar 10 2004 Dan Walsh 1.6-8 +- Increase the size of buffer accepted by setfiles to BUFSIZ. + +* Tue Mar 9 2004 Dan Walsh 1.6-7 +- genhomedircon should complete even if it can't read /etc/default/useradd + +* Tue Mar 9 2004 Dan Walsh 1.6-6 +- fix restorecon to relabel unlabled files. + +* Fri Mar 5 2004 Dan Walsh 1.6-5 +- Add genhomedircon from tresys +- Fixed patch for restorecon + +* Thu Feb 26 2004 Dan Walsh 1.6-4 +- exit out when selinux is not enabled + +* Thu Feb 26 2004 Dan Walsh 1.6-3 +- Fix minor bugs in restorecon + +* Thu Feb 26 2004 Dan Walsh 1.6-2 +- Add restorecon c program + +* Tue Feb 24 2004 Dan Walsh 1.6-1 +- Update to latest tarball from NSA + +* Thu Feb 19 2004 Dan Walsh 1.4-9 +- Add sort patch + +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Thu Jan 29 2004 Dan Walsh 1.4-7 +- remove mods to run_init since init scripts don't require it anymore + +* Wed Jan 28 2004 Dan Walsh 1.4-6 +- fix genhomedircon not to return and error + +* Wed Jan 28 2004 Dan Walsh 1.4-5 +- add setfiles quiet patch + +* Tue Jan 27 2004 Dan Walsh 1.4-4 +- add checkcon to verify context match file_context + +* Wed Jan 7 2004 Dan Walsh 1.4-3 +- fix command parsing restorecon + +* Tue Jan 6 2004 Dan Walsh 1.4-2 +- Add restorecon + +* Sat Dec 6 2003 Dan Walsh 1.4-1 +- Update to latest NSA 1.4 + +* Tue Nov 25 2003 Dan Walsh 1.2-9 +- Change run_init.console to run as run_init_t + +* Tue Oct 14 2003 Dan Walsh 1.2-8 +- Remove dietcc since load_policy is not in mkinitrd +- Change to use CONSOLEHELPER flag + +* Tue Oct 14 2003 Dan Walsh 1.2-7 +- Don't authenticate run_init when used with consolehelper + +* Wed Oct 01 2003 Dan Walsh 1.2-6 +- Add run_init consolehelper link + +* Wed Sep 24 2003 Dan Walsh 1.2-5 +- Add russell spead up patch to deal with file path stems + +* Fri Sep 12 2003 Dan Walsh 1.2-4 +- Build load_policy with diet gcc in order to save space on initrd + +* Fri Sep 12 2003 Dan Walsh 1.2-3 +- Update with NSA latest + +* Thu Aug 7 2003 Dan Walsh 1.2-1 +- remove i18n +- Temp remove gtk support + +* Thu Aug 7 2003 Dan Walsh 1.1-4 +- Remove wnck requirement + +* Thu Aug 7 2003 Dan Walsh 1.1-3 +- Add gtk support to run_init + +* Tue Aug 5 2003 Dan Walsh 1.1-2 +- Add internationalization + +* Mon Jun 2 2003 Dan Walsh 1.0-1 +- Initial version + From svn at tinysofa.org Thu Jul 1 15:39:58 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:39:58 +1000 (EST) Subject: [tinysofa-svn] r2639 - in tinysofa/snapshot: . postgresql-odbc postgresql-odbc/current postgresql-odbc/current/sources postgresql-odbc/current/specs Message-ID: <20040701153958.ECCA84E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:39:58 +1000 (Fri, 02 Jul 2004) New Revision: 2639 Added: tinysofa/snapshot/postgresql-odbc/ tinysofa/snapshot/postgresql-odbc/current/ tinysofa/snapshot/postgresql-odbc/current/sources/ tinysofa/snapshot/postgresql-odbc/current/sources/acinclude.m4 tinysofa/snapshot/postgresql-odbc/current/sources/psqlodbc-07.03.0200.tar.gz tinysofa/snapshot/postgresql-odbc/current/specs/ tinysofa/snapshot/postgresql-odbc/current/specs/postgresql-odbc.spec Log: - Add postgresql-odbc to snapshot from 2.0. Added: tinysofa/snapshot/postgresql-odbc/current/sources/acinclude.m4 =================================================================== --- tinysofa/snapshot/postgresql-odbc/current/sources/acinclude.m4 2004-07-01 15:39:57 UTC (rev 2638) +++ tinysofa/snapshot/postgresql-odbc/current/sources/acinclude.m4 2004-07-01 15:39:58 UTC (rev 2639) @@ -0,0 +1,225 @@ +# $Header: /cvs/pkgs/rpms/postgresql-odbc/acinclude.m4,v 1.1 2003/09/15 15:49:06 overholt Exp $ + +# This file defines new macros to process configure command line +# arguments, to replace the brain-dead AC_ARG_WITH and AC_ARG_ENABLE. +# The flaw in these is particularly that they only differentiate +# between "given" and "not given" and do not provide enough help to +# process arguments that only accept "yes/no", that require an +# argument (other than "yes/no"), etc. +# +# The point of this implementation is to reduce code size and +# redundancy in configure.in and to improve robustness and consistency +# in the option evaluation code. + + +# Convert type and name to shell variable name (e.g., "enable_long_strings") +m4_define([pgac_arg_to_variable], + [$1[]_[]patsubst($2, -, _)]) + + +# PGAC_ARG(TYPE, NAME, HELP-STRING, +# [ACTION-IF-YES], [ACTION-IF-NO], [ACTION-IF-ARG], +# [ACTION-IF-OMITTED]) +# ---------------------------------------------------------- +# This is the base layer. TYPE is either "with" or "enable", depending +# on what you like. NAME is the rest of the option name, HELP-STRING +# as usual. ACTION-IF-YES is executed if the option is given without +# and argument (or "yes", which is the same); similar for ACTION-IF-NO. + +AC_DEFUN([PGAC_ARG], +[ +m4_case([$1], + +enable, [ +AC_ARG_ENABLE([$2], [$3], [ + case [$]enableval in + yes) + m4_default([$4], :) + ;; + no) + m4_default([$5], :) + ;; + *) + $6 + ;; + esac +], +[$7])[]dnl AC_ARG_ENABLE +], + +with, [ +AC_ARG_WITH([$2], [$3], [ + case [$]withval in + yes) + m4_default([$4], :) + ;; + no) + m4_default([$5], :) + ;; + *) + $6 + ;; + esac +], +[$7])[]dnl AC_ARG_WITH +], + +[m4_fatal([first argument of $0 must be 'enable' or 'with', not '$1'])] +) +])# PGAC_ARG + + +# PGAC_ARG_BOOL(TYPE, NAME, DEFAULT, HELP-STRING, +# [ACTION-IF-YES], [ACTION-IF-NO]) +# ----------------------------------------------- +# Accept a boolean option, that is, one that only takes yes or no. +# ("no" is equivalent to "disable" or "without"). DEFAULT is what +# should be done if the option is omitted; it should be "yes" or "no". +# (Consequently, one of ACTION-IF-YES and ACTION-IF-NO will always +# execute.) + +AC_DEFUN([PGAC_ARG_BOOL], +[PGAC_ARG([$1], [$2], [$4], [$5], [$6], + [AC_MSG_ERROR([no argument expected for --$1-$2 option])], + [m4_case([$3], + yes, [pgac_arg_to_variable([$1], [$2])=yes +$5], + no, [pgac_arg_to_variable([$1], [$2])=no +$6], + [m4_fatal([third argument of $0 must be 'yes' or 'no', not '$3'])])])[]dnl +])# PGAC_ARG_BOOL + + +# PGAC_ARG_REQ(TYPE, NAME, HELP-STRING, [ACTION-IF-GIVEN], [ACTION-IF-NOT-GIVEN]) +# ------------------------------------------------------------------------------- +# This option will require an argument; "yes" or "no" will not be +# accepted. + +AC_DEFUN([PGAC_ARG_REQ], +[PGAC_ARG([$1], [$2], [$3], + [AC_MSG_ERROR([argument required for --$1-$2 option])], + [AC_MSG_ERROR([argument required for --$1-$2 option])], + [$4], + [$5])])# PGAC_ARG_REQ + + +# PGAC_ARG_OPTARG(TYPE, NAME, HELP-STRING, [DEFAULT-ACTION], [ARG-ACTION] +# [ACTION-ENABLED], [ACTION-DISABLED]) +# ----------------------------------------------------------------------- +# This will create an option that behaves as follows: If omitted, or +# called with "no", then set the enable_variable to "no" and do +# nothing else. If called with "yes", then execute DEFAULT-ACTION. If +# called with argument, set enable_variable to "yes" and execute +# ARG-ACTION. Additionally, execute ACTION-ENABLED if we ended up with +# "yes" either way, else ACTION-DISABLED. +# +# The intent is to allow enabling a feature, and optionally pass an +# additional piece of information. + +AC_DEFUN([PGAC_ARG_OPTARG], +[PGAC_ARG([$1], [$2], [$3], [$4], [], + [pgac_arg_to_variable([$1], [$2])=yes +$5], + [pgac_arg_to_variable([$1], [$2])=no]) +dnl Add this code only if there's a ACTION-ENABLED or ACTION-DISABLED. +m4_ifval([$6[]$7], +[ +if test "[$]pgac_arg_to_variable([$1], [$2])" = yes; then + m4_default([$6], :) +m4_ifval([$7], +[else + $7 +])[]dnl +fi +])[]dnl +])# PGAC_ARG_OPTARG + +# Macros that test various C library quirks +# $Header: /cvs/pkgs/rpms/postgresql-odbc/acinclude.m4,v 1.1 2003/09/15 15:49:06 overholt Exp $ + + +# PGAC_VAR_INT_TIMEZONE +# --------------------- +# Check if the global variable `timezone' exists. If so, define +# HAVE_INT_TIMEZONE. +AC_DEFUN([PGAC_VAR_INT_TIMEZONE], +[AC_CACHE_CHECK(for int timezone, pgac_cv_var_int_timezone, +[AC_TRY_LINK([#include +int res;], + [res = timezone / 60;], + [pgac_cv_var_int_timezone=yes], + [pgac_cv_var_int_timezone=no])]) +if test x"$pgac_cv_var_int_timezone" = xyes ; then + AC_DEFINE(HAVE_INT_TIMEZONE,, [Set to 1 if you have the global variable timezone]) +fi])# PGAC_VAR_INT_TIMEZONE + + +# PGAC_FUNC_GETTIMEOFDAY_1ARG +# --------------------------- +# Check if gettimeofday() has only one arguments. (Normal is two.) +# If so, define GETTIMEOFDAY_1ARG. +AC_DEFUN([PGAC_FUNC_GETTIMEOFDAY_1ARG], +[AC_CACHE_CHECK(whether gettimeofday takes only one argument, +pgac_cv_func_gettimeofday_1arg, +[AC_TRY_COMPILE([#include ], +[struct timeval *tp; +struct timezone *tzp; +gettimeofday(tp,tzp);], +[pgac_cv_func_gettimeofday_1arg=no], +[pgac_cv_func_gettimeofday_1arg=yes])]) +if test x"$pgac_cv_func_gettimeofday_1arg" = xyes ; then + AC_DEFINE(GETTIMEOFDAY_1ARG,, [Set to 1 if gettimeofday() takes only 1 argument]) +fi])# PGAC_FUNC_GETTIMEOFDAY_1ARG + + +# PGAC_UNION_SEMUN +# ---------------- +# Check if `union semun' exists. Define HAVE_UNION_SEMUN if so. +# If it doesn't then one could define it as +# union semun { int val; struct semid_ds *buf; unsigned short *array; } +AC_DEFUN([PGAC_UNION_SEMUN], +[AC_CHECK_TYPES([union semun], [], [], +[#include +#include +#include ])])# PGAC_UNION_SEMUN + + +# PGAC_STRUCT_SOCKADDR_UN +# ----------------------- +# If `struct sockaddr_un' exists, define HAVE_STRUCT_SOCKADDR_UN. If +# it is missing then one could define it as { short int sun_family; +# char sun_path[108]; }. (Requires test for !) +AC_DEFUN([PGAC_STRUCT_SOCKADDR_UN], +[AC_CHECK_TYPES([struct sockaddr_un], [], [], +[#include +#ifdef HAVE_SYS_UN_H +#include +#endif +])])# PGAC_STRUCT_SOCKADDR_UN + + +# PGAC_FUNC_POSIX_SIGNALS +# ----------------------- +# Check to see if the machine has the POSIX signal interface. Define +# HAVE_POSIX_SIGNALS if so. Also set the output variable HAVE_POSIX_SIGNALS +# to yes or no. +# +# Note that this test only compiles a test program, it doesn't check +# whether the routines actually work. If that becomes a problem, make +# a fancier check. +AC_DEFUN([PGAC_FUNC_POSIX_SIGNALS], +[AC_CACHE_CHECK(for POSIX signal interface, pgac_cv_func_posix_signals, +[AC_TRY_LINK([#include +], +[struct sigaction act, oact; +sigemptyset(&act.sa_mask); +act.sa_flags = SA_RESTART; +sigaction(0, &act, &oact);], +[pgac_cv_func_posix_signals=yes], +[pgac_cv_func_posix_signals=no])]) +if test x"$pgac_cv_func_posix_signals" = xyes ; then + AC_DEFINE(HAVE_POSIX_SIGNALS,, [Set to 1 if you have the POSIX signal interface]) +fi +HAVE_POSIX_SIGNALS=$pgac_cv_func_posix_signals +AC_SUBST(HAVE_POSIX_SIGNALS)])# PGAC_FUNC_POSIX_SIGNALS + Added: tinysofa/snapshot/postgresql-odbc/current/sources/psqlodbc-07.03.0200.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/postgresql-odbc/current/sources/psqlodbc-07.03.0200.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/postgresql-odbc/current/specs/postgresql-odbc.spec =================================================================== --- tinysofa/snapshot/postgresql-odbc/current/specs/postgresql-odbc.spec 2004-07-01 15:39:57 UTC (rev 2638) +++ tinysofa/snapshot/postgresql-odbc/current/specs/postgresql-odbc.spec 2004-07-01 15:39:58 UTC (rev 2639) @@ -0,0 +1,90 @@ +Name: postgresql-odbc +Summary: PostgreSQL ODBC driver. +Version: 7.3 +Release: 6.1ts +License: GPL +Group: Applications/Databases +Url: http://gborg.postgresql.org/project/psqlodbc + +Source0: ftp://ftp.us.postgresql.org/odbc/versions/src/psqlodbc-07.03.0200.tar.gz +Source1: acinclude.m4 +BuildRoot: %{_tmppath}/%{name}-%{version}-root +BuildPreReq: unixODBC-devel +BuildRequires: automake autoconf +Requires: postgresql-libs >= 7.3 +Provides: postgresql-odbc + +Buildroot: %{_tmppath}/%{name}-%{version}-root + +# This spec file and ancilliary files are licensed in accordance with +# the psqlodbc license. + +%description +This package includes the driver needed for applications to access a +PostgreSQL system via ODBC (Open Database Connectivity). + +%prep +%setup -q -n psqlodbc-07.03.0200 + +# Some missing macros. Courtesy Owen Taylor . + +cp -p %{SOURCE1} . +aclocal +libtoolize --force +automake +autoconf + +%build +%configure --with-unixodbc --with-odbcinst=%{_sysconfdir} +make + +%install +rm -rf $RPM_BUILD_ROOT + +%makeinstall + +%clean +rm -rf $RPM_BUILD_ROOT + +%post -p /sbin/ldconfig +%postun -p /sbin/ldconfig + +%files +%defattr(-,root,root) +%attr(755,root,root) %{_libdir}/psqlodbc.so +%{_libdir}/psqlodbc.la +%{_datadir}/psqlodbc/odbc-drop.sql +%{_datadir}/psqlodbc/odbc.sql + +%changelog +* Tue Mar 02 2004 Elliot Lee +- rebuilt + +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Fri Nov 21 2003 David Jee 7.3-5 +- rebuild + +* Wed Nov 05 2003 David Jee 7.3-4 +- import new community version 07.03.0200 + +* Mon Sep 15 2003 Andrew Overholt 7.3-3 +- autotools fixes (courtesy Alex Oliva and + Owen Taylor ) + +* Tue Jul 08 2003 Andrew Overholt 7.3-3 +- allow use with unixODBC (courtesy Troels Arvin) [Bug #97998] + +* Wed Jun 04 2003 Elliot Lee +- rebuilt + +* Mon Jun 02 2003 Andrew Overholt 7.3-1 +- sync to new community version (07.03.0100 => v7.3, r1) + +* Thu Jan 23 2003 Tim Powers 1-2 +- rebuild + +* Tue Jan 14 2003 Andrew Overholt +- 1-1 +- initial build (just took old package sections) From svn at tinysofa.org Thu Jul 1 15:40:01 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:40:01 +1000 (EST) Subject: [tinysofa-svn] r2640 - in tinysofa/snapshot: . prelink prelink/current prelink/current/sources prelink/current/specs Message-ID: <20040701154001.073FE4E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:40:00 +1000 (Fri, 02 Jul 2004) New Revision: 2640 Added: tinysofa/snapshot/prelink/ tinysofa/snapshot/prelink/current/ tinysofa/snapshot/prelink/current/sources/ tinysofa/snapshot/prelink/current/sources/prelink-20040520.tar.bz2 tinysofa/snapshot/prelink/current/sources/prelink.conf tinysofa/snapshot/prelink/current/sources/prelink.cron tinysofa/snapshot/prelink/current/sources/prelink.sysconfig tinysofa/snapshot/prelink/current/specs/ tinysofa/snapshot/prelink/current/specs/prelink.spec Log: - Add prelink to snapshot from 2.0. Added: tinysofa/snapshot/prelink/current/sources/prelink-20040520.tar.bz2 =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/prelink/current/sources/prelink-20040520.tar.bz2 ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/prelink/current/sources/prelink.conf =================================================================== --- tinysofa/snapshot/prelink/current/sources/prelink.conf 2004-07-01 15:39:58 UTC (rev 2639) +++ tinysofa/snapshot/prelink/current/sources/prelink.conf 2004-07-01 15:40:00 UTC (rev 2640) @@ -0,0 +1,25 @@ +# This config file contains a list of directories both with binaries +# and libraries prelink should consider by default. +# If a directory name is prefixed with `-l ', the directory hierarchy +# will be walked as long as filesystem boundaries are not crossed. +# If a directory name is prefixed with `-h ', symbolic links in a +# directory hierarchy are followed. +# Directories or files with `-b ' prefix will be blacklisted. +-b /lib/modules +-b /usr/lib/locale +-b /usr/X11R6/lib{,64}/X11/xfig +-l /bin +-l /usr/bin +-l /sbin +-l /usr/sbin +-l /usr/X11R6/bin +-l /usr/kerberos/bin +-l /usr/games +-l /usr/libexec +-l /var/ftp/bin +-l /lib{,64} +-l /usr/lib{,64} +-l /usr/X11R6/lib{,64} +-l /usr/kerberos/lib{,64} +-l /usr/X11R6/LessTif +-l /var/ftp/lib{,64} Added: tinysofa/snapshot/prelink/current/sources/prelink.cron =================================================================== --- tinysofa/snapshot/prelink/current/sources/prelink.cron 2004-07-01 15:39:58 UTC (rev 2639) +++ tinysofa/snapshot/prelink/current/sources/prelink.cron 2004-07-01 15:40:00 UTC (rev 2640) @@ -0,0 +1,42 @@ +#!/bin/sh + +. /etc/sysconfig/prelink + +renice +19 -p $$ >/dev/null 2>&1 + +if [ "$PRELINKING" != yes ]; then + if [ -f /etc/prelink.cache ]; then + echo /usr/sbin/prelink -uav > /var/log/prelink.log + /usr/sbin/prelink -uav >> /var/log/prelink.log 2>&1 \ + || echo Prelink failed with return value $? >> /var/log/prelink.log + rm -f /etc/prelink.cache + # Restart init if needed + [ -n "$(find `ldd /sbin/init | awk '{ print $3 }'` /sbin/init -ctime -1 2>/dev/null )" ] && /sbin/telinit u + fi + exit 0 +fi + +if [ ! -f /etc/prelink.cache -o -f /var/lib/misc/prelink.force ] \ + || grep -q '^prelink-ELF0.[0-2]' /etc/prelink.cache; then + # If cache does not exist or is from older prelink versions or + # if we were asked to explicitely, force full prelinking + rm -f /etc/prelink.cache /var/lib/misc/prelink.force + PRELINK_OPTS="$PRELINK_OPTS -f" + date > /var/lib/misc/prelink.full +elif [ -n "$PRELINK_FULL_TIME_INTERVAL" \ + -a "`find /var/lib/misc/prelink.full -mtime -${PRELINK_FULL_TIME_INTERVAL} 2>/dev/null`" \ + = /var/lib/misc/prelink.full ]; then + # If prelink without -q has been run in the last + # PRELINK_FULL_TIME_INTERVAL days, just use quick mode + PRELINK_OPTS="$PRELINK_OPTS -q" +else + date > /var/lib/misc/prelink.full +fi + +echo /usr/sbin/prelink -av $PRELINK_OPTS > /var/log/prelink.log +/usr/sbin/prelink -av $PRELINK_OPTS >> /var/log/prelink.log 2>&1 \ + || echo Prelink failed with return value $? >> /var/log/prelink.log +# Restart init if needed +[ -n "$(find `ldd /sbin/init | awk '{ print $3 }'` /sbin/init -ctime -1 2>/dev/null )" ] && /sbin/telinit u + +exit 0 Added: tinysofa/snapshot/prelink/current/sources/prelink.sysconfig =================================================================== --- tinysofa/snapshot/prelink/current/sources/prelink.sysconfig 2004-07-01 15:39:58 UTC (rev 2639) +++ tinysofa/snapshot/prelink/current/sources/prelink.sysconfig 2004-07-01 15:40:00 UTC (rev 2640) @@ -0,0 +1,21 @@ +# Set this to no to disable prelinking altogether +# (if you change this from yes to no prelink -ua +# will be run next night to undo prelinking) +PRELINKING=yes + +# Options to pass to prelink +# -m Try to conserve virtual memory by allowing overlapping +# assigned virtual memory slots for libraries which +# never appear together in one binary +# -R Randomize virtual memory slot assignments for libraries. +# This makes it slightly harder for various buffer overflow +# attacks, since library addresses will be different on each +# host using -R. +PRELINK_OPTS=-mR + +# How often should full prelink be run (in days) +# Normally, prelink will be run in quick mode, every +# $PRELINK_FULL_TIME_INTERVAL days it will be run +# in normal mode. Comment it out if it should be run +# in normal mode always. +PRELINK_FULL_TIME_INTERVAL=14 Added: tinysofa/snapshot/prelink/current/specs/prelink.spec =================================================================== --- tinysofa/snapshot/prelink/current/specs/prelink.spec 2004-07-01 15:39:58 UTC (rev 2639) +++ tinysofa/snapshot/prelink/current/specs/prelink.spec 2004-07-01 15:40:00 UTC (rev 2640) @@ -0,0 +1,464 @@ +Summary: An ELF prelinking utility +Name: prelink +Version: 0.3.2 +Release: 3ts +License: GPL +Group: System Environment/Base +%define date 20040520 +Source: ftp://people.redhat.com/jakub/prelink/prelink-%{date}.tar.bz2 +Source2: prelink.conf +Source3: prelink.cron +Source4: prelink.sysconfig +Buildroot: %{_tmppath}/%{name}-%{version}-root +#BuildRequires: libelf-devel >= 0.7.0-5 +BuildRequires: elfutils-devel >= 0.72 +Requires: glibc >= 2.2.4-18, kernel >= 2.4.10, coreutils, findutils +Requires: util-linux, gawk, grep +# For now +ExclusiveArch: %{ix86} alpha sparc sparc64 s390 s390x x86_64 ppc ppc64 + +%description +The prelink package contains a utility which modifies ELF shared libraries +and executables, so that far less relocations need to be resolved at runtime +and thus programs come up faster. + +%prep +%setup -n prelink + +%build +%configure --disable-shared +make %{_smp_mflags} +echo ====================TESTING========================= +#make -C testsuite check-harder +#make -C testsuite check-cycle +echo ====================TESTING END===================== + +%install +%{makeinstall} +mkdir -p %{buildroot}%{_sysconfdir}/rpm +cp -a %{SOURCE2} %{buildroot}%{_sysconfdir} +mkdir -p %{buildroot}%{_sysconfdir}/{sysconfig,cron.daily} +cp -a %{SOURCE3} %{buildroot}%{_sysconfdir}/cron.daily/prelink +# On RHEL3, default to no prelinking +case "`gcc --version | head -1`" in +gcc*\ 3.2.3*) + sed 's/PRELINKING=yes/PRELINKING=no/' %{SOURCE4} > %{buildroot}%{_sysconfdir}/sysconfig/prelink + ;; +*) + cp -a %{SOURCE4} %{buildroot}%{_sysconfdir}/sysconfig/prelink + ;; +esac +chmod 755 %{buildroot}%{_sysconfdir}/cron.daily/prelink +chmod 644 %{buildroot}%{_sysconfdir}/{sysconfig/prelink,prelink.conf} +cat > %{buildroot}%{_sysconfdir}/rpm/macros.prelink <<"EOF" +# rpm-4.1 verifies prelinked libraries using a prelink undo helper. +# Note: The 2nd token is used as argv[0] and "library" is a +# placeholder that will be deleted and replaced with the appropriate +# library file path. +%%__prelink_undo_cmd /usr/sbin/prelink prelink -y library +EOF +chmod 644 %{buildroot}%{_sysconfdir}/rpm/macros.prelink + +mkdir -p %{buildroot}/var/{lib/misc,log} +touch %{buildroot}/var/lib/misc/prelink.full +touch %{buildroot}/var/lib/misc/prelink.force +touch %{buildroot}/var/log/prelink.log + +%post +touch /var/lib/misc/prelink.force + +%clean +rm -rf %{buildroot} + +%files +%defattr(-,root,root) +%doc doc/prelink.pdf +%verify(not md5 size mtime) %config(noreplace) %{_sysconfdir}/prelink.conf +%verify(not md5 size mtime) %config(noreplace) %{_sysconfdir}/sysconfig/prelink +%{_sysconfdir}/rpm/macros.prelink +%{_sysconfdir}/cron.daily/prelink +%{_prefix}/sbin/prelink +%{_prefix}/bin/execstack +%{_mandir}/man8/prelink.8* +%{_mandir}/man8/execstack.8* +%attr(0644,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /var/lib/misc/prelink.full +%attr(0644,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /var/lib/misc/prelink.force +%attr(0644,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /var/log/prelink.log + +%changelog +* Thu May 20 2004 Jakub Jelinek 0.3.2-3 +- 4 SPARC 64-bit fixes +- use $CC instead of gcc when checking for TLS support in tls*.sh + +* Thu May 20 2004 Jakub Jelinek 0.3.2-2 +- add 2 new TLS testcases (one that fails e.g. with glibc < 2.3.3-28 + on IA-32) +- SPARC TLS support + +* Wed May 5 2004 Jakub Jelinek 0.3.2-1 +- fix cxx.c:68: find_cxx_sym: Assertive `n < ndeps' failed problem + on 32-bit architectures (#118522) +- build prelink.cache into temporary file and atomically rename over + (#121109) + +* Wed Mar 17 2004 Jakub Jelinek 0.3.1-2 +- unlink temporary files if renaming to the destination or setting of + security context failed (#118251) +- fix bi-architecture prelinking (#118226) +- if prelink called from the cron script fails, note the exit status + into /var/log/prelink.log + +* Thu Mar 4 2004 Jakub Jelinek 0.3.1-1 +- add prelink documentation (PDF format) +- fix assertion failures on PPC (.sdynbss related, #115925) +- fix prelink --help (#115202) +- avoid free on uninitialized variable in one error path (#117332) +- s/i386/%%{ix86}/ to make mharris happy + +* Mon Feb 16 2004 Jakub Jelinek 0.3.0-21 +- fix prelink abort in certain cases where a new PT_LOAD segment + needs to be added (seen on AMD64) + +* Thu Jan 29 2004 Jakub Jelinek 0.3.0-20 +- clearify message about unlisted dependencies +- don't do SELinux context copying if is_selinux_enabled () < 0 + +* Tue Jan 27 2004 Jakub Jelinek 0.3.0-19 +- refuse to prelink objects whose dependencies as reported by + ldd don't include all dependencies transitively (this can + happen when using RPATH and a shared library with the same + SONAME exists both in that RPATH and either another RPATH + or standard library directories) +- add testcase for this +- rework .dynsym/.symtab STT_SECTION translation, so that it works + with binutils which put only sections not generated by the linker + into .dynsym for shared libraries +- fix make check, so that it is not confused by 2.6.x kernel + VDSOs + +* Thu Jan 15 2004 Jakub Jelinek 0.3.0-18 +- allow R_*_JU?MP_SLOT relocs to point also into .got.plt + sections on IA32/AMD64/ARM/s390/s390x/SH + +* Tue Dec 9 2003 Jakub Jelinek 0.3.0-17 +- set SELinux security context immediately before renaming, + not before + +* Tue Nov 18 2003 Jakub Jelinek 0.3.0-15 +- blacklist support +- use FTW_ACTIONRETVAL if available to avoid even stating of + files in blacklisted directory trees +- SELinux support + +* Tue Oct 28 2003 Jakub Jelinek 0.3.0-13 +- added execstack.8 manpage +- changed order of columns in execstack --query output + +* Tue Oct 28 2003 Jakub Jelinek 0.3.0-12 +- added execstack tool +- added -o option, to be used together with -u +- free temp_filename in close_dso + +* Mon Oct 27 2003 Jakub Jelinek 0.3.0-11 +- fix adjustement of DT_VALRNGLO .. DT_VALRNGHI and + DT_ADDRRNGLO .. DT_ADDRRNGHI dynamic tags when relocating shared + libraries +- never adjust p_vaddr/p_paddr/p_offset of PT_GNU_STACK segment +- allow shell wildcards in %{_sysconfdir}/prelink.conf +- fix REL->RELA conversion of shared libraries if .rel.dyn + or .rel.plt are last sections in readonly PT_LOAD segment +- force full reprelinking on prelink upgrades (well, first time + the cron job is run after the upgrade) +- require coreutils, findutils, util-linux, gawk and grep + +* Fri Oct 24 2003 Jakub Jelinek 0.3.0-10 +- avoid removing PT_GNU_STACK segment if decreasing first PT_LOAD segment's + p_vaddr on IA-32 + +* Mon Oct 13 2003 Jakub Jelinek 0.3.0-9 +- avoid prelink crash if first dependency is to be prelinked because + of address space overlaps + +* Thu Oct 9 2003 Jakub Jelinek 0.3.0-8 +- use /var/lib/misc/prelink.full instead of /var/run/prelink.full for last + full prelink timestamp (#106721) +- warn about UPX compressed binaries or libraries/binaries without section + headers (neither can be prelinked obviously) + +* Mon Oct 6 2003 Jakub Jelinek 0.3.0-7 +- don't rely on malloc/calloc/realloc with size 0 returning a unique pointer +- fix testsuite, so that it works even if installed glibc/libstdc++ + is already prelinked + +* Wed Sep 17 2003 Jakub Jelinek 0.3.0-6 +- fix comment in %{_sysconfdir}/sysconfig/prelink (#106217) + +* Tue Sep 2 2003 Jakub Jelinek 0.3.0-5 +- fix prelink segfault on -z nocombreloc libraries (#103404) +- run one make check round with -Wl,-z,nocombreloc to test handling + of nocombreloc binaries and libraries + +* Fri Aug 15 2003 Jakub Jelinek 0.3.0-4 +- redirect prelink's stderr from the cron job to prelink.log (#102456) + +* Mon Aug 11 2003 Jakub Jelinek 0.3.0-3 +- fix DT_CHECKSUM computation - do STT_LOCAL symbol frobbing and .mdebug + updates write_dso would do also before checksum computation (#89953) + +* Fri Aug 8 2003 Jakub Jelinek 0.3.0-2 +- avoid assertion failures when changing PROGBITS .bss back into + NOBITS .bss (#101813) +- add 2 new tests for it + +* Tue Aug 5 2003 Jakub Jelinek 0.3.0-1 +- run prelink from cron automatically, add %{_sysconfdir}/sysconfig/prelink + to configure it +- update manual page + +* Tue Jul 1 2003 Jakub Jelinek 0.2.1-2 +- fix a thinko in the library path checking code +- change R_386_GLOB_DAT into R_386_32 in .gnu.conflict, similarly + R_X86_64_GLOB_DAT and R_X86_64_64 +- fix a bug in find_free_space which caused + "section file offsets not monotonically increasing" errors on some + IA-32 binaries +- add --md5 and --sha options +- use mmap during --verify if possible +- add */lib64 directories to prelink.conf + +* Mon Jun 30 2003 Jakub Jelinek 0.2.1-1 +- make sure binaries prelinked for the second and later time without + unprelinking in between verify correctly +- make sure DT_CHECKSUM computation is the same for newly prelinked + and second or later time prelinked libraries +- dwarf2 abbrev hash bugfix +- don't allow prelinking libraries outside directories specified + in config file or on the command line +- several new tests for reprelinking +- pack non-alloced sections and section header table tightly after the + last alloced section + +* Wed Jun 18 2003 Jakub Jelinek 0.2.0-28 +- finish and enable ppc64 +- fix ppc BR{,N}TAKEN reloc handling +- fix up sh_offset values of zero-sized or SHT_NOBITS section + if ld messed them up +- issue error about bogus library dependency chains instead of + segfaulting (plus testcases for it) + +* Fri Jun 13 2003 Jakub Jelinek 0.2.0-27 +- add --quick mode +- new test for --quick mode and also reprelinking of binary against + upgraded shared library which needs more conflicts + +* Mon Jun 2 2003 Jakub Jelinek 0.2.0-26 +- don't segfault in C++ optimizations if a conflict from undefined + to defined value is seen +- some more ppc64 work + +* Fri May 30 2003 Jakub Jelinek 0.2.0-25 +- exec-shield support +- with -R, don't randomize just base address from which all libs + are layed out, but also slightly randomize order of libraries + in the layout queue +- add check-harder and check-cycle makefile goals in testsuite/, + use it during rpm building + +* Fri May 23 2003 Jakub Jelinek 0.2.0-24 +- optimize out conflicts in G++ 3+ virtual tables if they are just + because some method has been called from a binary and thus there + is a .plt slot in the binary. This change not only kills lots of conflicts + on some KDE programs, but also should speed up runtime (not just startup + time), since the hop through .plt is bypassed +- added new C++ test +- fix a bug in ppc64 fixup .plt code + +* Thu May 22 2003 Jakub Jelinek 0.2.0-23 +- when updating dynamic tags for executable after section reshuffling, + check section type as well, so that 0 sized sections don't get the + tags attached instead of the proper ones +- when an address space conflict is found between libraries for the same + executable during layouting, check properly for all remaining conflicts + as well + +* Thu May 15 2003 Jakub Jelinek 0.2.0-22 +- don't adjust DT_REL{,A} if it is 0 +- allow prelinking of libraries with no dependencies +- fix handling of libraries with no lazy relocs, no normal relocs or no + relocs at all +- some new tests +- fix SH (Daniel Jacobowitz) + +* Mon May 5 2003 Jakub Jelinek 0.2.0-21 +- fix prelink on AMD64 +- 2 new testcases +- fix for debugging prelink_entry_dump/restore + +* Fri May 2 2003 Jakub Jelinek 0.2.0-20 +- ppc TLS +- some ppc64 work +- avoid using trampolines for nested functions +- fix typo in prelink man page (#89247) + +* Tue Apr 15 2003 Jakub Jelinek 0.2.0-19 +- fix find_readonly_space bug which caused doxygen not to be prelinked + +* Mon Feb 17 2003 Jakub Jelinek 0.2.0-18 +- fix section indices in .symtab if non-alloced sections weren't + originally monotonically increasing +- s390, s390x and Alpha TLS support + +* Mon Feb 10 2003 Jakub Jelinek 0.2.0-17 +- never try to prelink or relocate stripped-to-file debuginfo + +* Tue Jan 21 2003 Jakub Jelinek 0.2.0-16 +- x86-64 TLS support +- added one more tls testcase + +* Fri Dec 13 2002 Jakub Jelinek 0.2.0-15 +- hopefully finished IA-32 TLS support +- require elfutils 0.72 for various data-swapping fixes + +* Wed Dec 11 2002 Jakub Jelinek 0.2.0-14 +- rebuilt against elfutils 0.69 to fix a make check failure on Alpha + +* Mon Dec 9 2002 Jakub Jelinek 0.2.0-13 +- use ELF_F_PERMISSIVE if defined +- be permissive even when doing --reloc-only +- fix up .plt section sh_entsize on Alpha + +* Wed Dec 4 2002 Jakub Jelinek 0.2.0-12 +- some more fixes for elfutils + +* Tue Dec 3 2002 Jakub Jelinek 0.2.0-11 +- make it work with elfutils instead of libelf 0.[78] +- update to newer auto*/libtool +- some more steps towards TLS support, at least --reloc-only should work + +* Thu Oct 3 2002 Jakub Jelinek 0.2.0-10 +- x86-64, s390x and testsuite fixes + +* Sun Sep 29 2002 Jakub Jelinek 0.2.0-9 +- enable on ppc and x86_64 +- fix ppc far PLT slot prelink +- support --undo on ppc +- for bug-compatibility with some unnamed OS changed R_SPARC_RELATIVE + --undo +- tiny steps towards TLS support on IA-32, more will come + +* Tue Aug 27 2002 Jakub Jelinek 0.2.0-8 +- avoid putting garbage into executable's .gnu.liblist sh_link + if we did not have to grow .dynstr +- don't segfault on bogus sh_link and sh_info values (#72705) + +* Mon Aug 26 2002 Jakub Jelinek 0.2.0-7 +- when growing allocated shared lib sections (for REL->RELA + conversion), make sure !PF_W and PF_W segments don't end up + on the same page +- when finding space for sections in an executable, make sure + it is not included in between two reloc sections +- for non-zero SHN_ABS symbols on 32-bit arches mask high + 32-bits of st_value (libelf 0.8.x is strict here) + +* Fri Aug 23 2002 Jakub Jelinek 0.2.0-6 +- make it work with libelf 0.8.2 + +* Fri Jun 21 2002 Tim Powers +- automated rebuild + +* Fri Jun 21 2002 Jakub Jelinek 0.2.0-4 +- add %{_sysconfdir}/rpm/macros.prelink + +* Mon Jun 17 2002 Jakub Jelinek 0.2.0-1 +- added --undo and --verify mode +- new architectures s390, s390x, arm, sh +- handle binaries/shared libraries with non-allocated sections + without monotonically increasing sh_offsets +- handle .sbss and .sdynbss +- fixed a bug in 64-bit LE/BE read routines +- removed .rel{,a}.dyn reloc conversion/sorting, it was duplicating + ld's -z combreloc and complicated lots of things +- fixed STB_LOCAL/STT_SECTION symbol adjusting +- use mkstemp for temporary files, allow --verify for binaries/libs + on read-only filesystems +- added DWARF-2 .debug_ranges adjustement, special case GCC's + "set base to 0 and make things absolute instead of relative" trick +- allow arches to override default layout mechanism (for ppc) +- added some new tests, test --undo and --verify modes in the testsuite +- alpha: adjust what R_ALPHA_GLOB_DAT points to too +- i386: apply _32 and _PC32 REL relocs, as apply_rel can be called + for C++ optimizations before REL->RELA conversion +- ppc: layout strategy to satisfy ppc lib location preferences +- sparc64: handle R_SPARC_DISP64 +- x86-64: adjust what R_X86_64_RELATIVE points to too +- link prelink statically, esp. because of --verify mode +- run make check during build process + +* Mon Oct 1 2001 Jakub Jelinek 0.1.3-7 +- fix layout code so that -R works +- on IA-32, when there are no R_386_PC32 relocs and no R_386_32 relocs + with non-zero addend (= memory content), don't convert REL->RELA, + only switch R_386_32 relocs to R_386_GLOB_DAT +- support creating a new PT_LOAD segment if necessary, if SHT_NOBITS + sections are small, instead of adding new PT_LOAD segment just add file + backing to those NOBITS sections +- added testsuite +- new supported architectures (Alpha including .mdebug section support, + Sparc, Sparc 64-bit, X86_64 (the last one untested)), beginning of PPC + support + +* Thu Sep 6 2001 Jakub Jelinek 0.1.3-6 +- make sure lib base is always ELF page size aligned + +* Wed Aug 29 2001 Jakub Jelinek 0.1.3-5 +- fix sorting of .rel*.dyn sections, so that all RELATIVE relocs really + come first +- when DT_RELCOUNT already exists and conversion REL->RELA is done, + convert it into DT_RELACOUNT +- set conflict lookupent and conflictent to 0 for undefineds +- don't bother with DT_REL*COUNT for apps, they cannot have any RELATIVE + relocs + +* Tue Aug 28 2001 Jakub Jelinek 0.1.3-4 +- brown paper bag time: when determining if conversion from REL to RELA + is needed, check all non-PLT rel sections, including last. + This caused prelinking to fail with -z combreloc compiled libraries. + +* Mon Aug 27 2001 Jakub Jelinek 0.1.3-3 +- don't use .gnu.reloc section, use .rel.dyn or .rela.dyn instead +- put RELATIVE relocs first, not last, so that DT_REL{,A}COUNT + works +- put in updated glibc patch +- no need for special binutils patch - all is done in the -z combreloc + patchset + +* Tue Jul 24 2001 Jakub Jelinek 0.1.3-2 +- use the new DT_GNU_CONFLICT/DT_GNU_LIBLIST/SHT_GNU_LIBLIST constants +- unlink *.#prelink# files if necessary + +* Wed Jul 18 2001 Jakub Jelinek 0.1.3-1 +- fix layout.c +- create .gnu.prelink_undo section, --undo and --verify modes will use that +- some more C++ specific optimizations + +* Fri Jul 13 2001 Jakub Jelinek 0.1.2-1 +- bail out early if ELF object does not have sh_offsets + monotonically increasing +- disallow prelinking if there are conflicts against read-only + segments in shared libraries (ie. non-pic shared libraries + - this is better than bailing out for all non-pic shared libraries) +- add some C++ specific optimizations to reduce number of conflicts, + more to come + +* Tue Jul 10 2001 Jakub Jelinek 0.1.1-2 +- fix incremental prelinking + +* Tue Jul 10 2001 Jakub Jelinek 0.1.1-1 +- relocate stabs and dwarf-2 debugging formats +- support both --all and incremental prelinking +- handle hardlinks +- limit to libraries in %{_sysconfdir}/prelink.conf directories or + directories from command line + +* Tue Jul 3 2001 Jakub Jelinek 0.1.0-1 +- new package From svn at tinysofa.org Thu Jul 1 15:40:05 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:40:05 +1000 (EST) Subject: [tinysofa-svn] r2643 - in tinysofa/snapshot: . pyparted pyparted/current pyparted/current/sources pyparted/current/specs Message-ID: <20040701154005.C71384E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:40:05 +1000 (Fri, 02 Jul 2004) New Revision: 2643 Added: tinysofa/snapshot/pyparted/ tinysofa/snapshot/pyparted/current/ tinysofa/snapshot/pyparted/current/sources/ tinysofa/snapshot/pyparted/current/sources/pyparted-1.6.7.tar.gz tinysofa/snapshot/pyparted/current/specs/ tinysofa/snapshot/pyparted/current/specs/pyparted.spec Log: - Add pyparted to snapshot from 2.0. Added: tinysofa/snapshot/pyparted/current/sources/pyparted-1.6.7.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/pyparted/current/sources/pyparted-1.6.7.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/pyparted/current/specs/pyparted.spec =================================================================== --- tinysofa/snapshot/pyparted/current/specs/pyparted.spec 2004-07-01 15:40:03 UTC (rev 2642) +++ tinysofa/snapshot/pyparted/current/specs/pyparted.spec 2004-07-01 15:40:05 UTC (rev 2643) @@ -0,0 +1,50 @@ +ExcludeArch: ppc64 + +Summary: python module for parted +Name: pyparted +Version: 1.6.7 +Release: 1ts +License: GPL +Group: System Environment/Libraries +Source0: %{name}-%{version}.tar.gz +BuildRoot: %{_tmppath}/%{name}-%{version}-root +Requires: parted >= 1.6 +BuildRequires: parted-devel >= 1.6, python-devel + +%description +Python modules for the parted library. It is used for manipulation +partition tables. + +%prep +%setup -q + +%build +export CFLAGS="-fPIC" +%configure +make + +%install +rm -rf $RPM_BUILD_ROOT +%makeinstall + +%clean +rm -rf $RPM_BUILD_ROOT + + +%files +%defattr(-,root,root,-) +%doc README COPYING +%dir %{_libdir}/python?.?/site-packages/ +%{_libdir}/python?.?/site-packages/*.so + + +%changelog +* Thu May 13 2004 Jeremy Katz - 1.6.7-1 +- fix build for newer versions of gcc (fix from Jeff Law) + +* Tue Mar 16 2004 Jeremy Katz 1.6.6-2 +- fix PARTITION_PROTECTED definition (#118451) + +* Fri Mar 12 2004 Jeremy Katz +- Initial build split out into separate source from the parted package. +- Don't build on ppc64 right now due to parted build problems (#118183) From svn at tinysofa.org Thu Jul 1 15:40:02 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:40:02 +1000 (EST) Subject: [tinysofa-svn] r2641 - in tinysofa/snapshot: . psutils psutils/current psutils/current/sources psutils/current/specs Message-ID: <20040701154002.ABD354E817D@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:40:02 +1000 (Fri, 02 Jul 2004) New Revision: 2641 Added: tinysofa/snapshot/psutils/ tinysofa/snapshot/psutils/current/ tinysofa/snapshot/psutils/current/sources/ tinysofa/snapshot/psutils/current/sources/psutils-p17-Makefile.patch tinysofa/snapshot/psutils/current/sources/psutils-p17-misc.patch tinysofa/snapshot/psutils/current/sources/psutils-p17-paper.patch tinysofa/snapshot/psutils/current/sources/psutils-p17-strip.patch tinysofa/snapshot/psutils/current/sources/psutils-p17.tar.gz tinysofa/snapshot/psutils/current/specs/ tinysofa/snapshot/psutils/current/specs/psutils.spec Log: - Add psutils to snapshot from 2.0. Added: tinysofa/snapshot/psutils/current/sources/psutils-p17-Makefile.patch =================================================================== --- tinysofa/snapshot/psutils/current/sources/psutils-p17-Makefile.patch 2004-07-01 15:40:00 UTC (rev 2640) +++ tinysofa/snapshot/psutils/current/sources/psutils-p17-Makefile.patch 2004-07-01 15:40:02 UTC (rev 2641) @@ -0,0 +1,63 @@ +--- psutils/Makefile.unix.orig Wed Mar 12 00:52:59 1997 ++++ psutils/Makefile.unix Wed Jun 4 10:54:59 1997 +@@ -25,10 +25,10 @@ + + OS = UNIX + +-BINDIR = /usr/local/bin ++BINDIR = $(DESTDIR)/usr/bin + SCRIPTDIR = $(BINDIR) +-INCLUDEDIR = /usr/local/share/psutils +-PERL = /usr/local/bin/perl ++INCLUDEDIR = $(DESTDIR)/usr/lib/psutils ++PERL = /usr/bin/perl + + BINMODE = 0755 + MANMODE = 0644 +@@ -36,10 +36,10 @@ + INSTALL = install -c -m $(BINMODE) + INSTALLMAN = install -c -m $(MANMODE) + MANEXT = 1 +-MANDIR = /usr/local/share/man/man$(MANEXT) ++MANDIR = $(DESTDIR)/usr/man/man$(MANEXT) + + CC = gcc +-CFLAGS = -DPAPER=\"$(PAPER)\" -DUNIX -O -Wall ++CFLAGS = -DPAPER=\"$(PAPER)\" -DUNIX $(RPM_OPT_FLAGS) -Wall + + BIN = psbook psselect pstops epsffit psnup \ + psresize +@@ -219,28 +219,28 @@ + install: install.bin install.script install.man install.include + + install.bin: $(BIN) +- -mkdir $(BINDIR) ++ -mkdir -p $(BINDIR) + @for i in $(BIN); do \ + echo Installing $$i; \ +- $(INSTALL) $$i $(BINDIR); \ ++ $(INSTALL) $$i -s $(BINDIR); \ + done + + install.script: $(PERLSCRIPTS) $(SHELLSCRIPTS) +- -mkdir $(SCRIPTDIR) ++ -mkdir -p $(SCRIPTDIR) + @for i in $(PERLSCRIPTS) $(SHELLSCRIPTS); do \ + echo Installing $$i; \ + $(INSTALL) $$i $(SCRIPTDIR); \ + done + + install.include: $(INCLUDES) +- -mkdir $(INCLUDEDIR) ++ -mkdir -p $(INCLUDEDIR) + @for i in $(INCLUDES); do \ + echo Installing $$i; \ + $(INSTALLMAN) $$i $(INCLUDEDIR); \ + done + + install.man: $(MANPAGES) +- -mkdir $(MANDIR) ++ -mkdir -p $(MANDIR) + @for i in $(MANPAGES); do \ + echo Installing manual page for $$i; \ + $(INSTALLMAN) $$i $(MANDIR)/$$i; \ Added: tinysofa/snapshot/psutils/current/sources/psutils-p17-misc.patch =================================================================== --- tinysofa/snapshot/psutils/current/sources/psutils-p17-misc.patch 2004-07-01 15:40:00 UTC (rev 2640) +++ tinysofa/snapshot/psutils/current/sources/psutils-p17-misc.patch 2004-07-01 15:40:02 UTC (rev 2641) @@ -0,0 +1,60 @@ +--- psutils/epsffit.c.orig Wed Mar 12 00:52:52 1997 ++++ psutils/epsffit.c Wed Jun 4 11:02:36 1997 +@@ -42,12 +42,12 @@ + void main(int argc, char **argv) + { + int bbfound = 0; /* %%BoundingBox: found */ +- int urx, ury, llx, lly; ++ int urx = 0, ury = 0, llx = 0, lly = 0; + int furx, fury, fllx, flly; + int showpage = 0, centre = 0, rotate = 0, aspect = 0, maximise = 0; + char buf[BUFSIZ]; +- FILE *input; +- FILE *output; ++ FILE *input = stdin; ++ FILE *output = stdout; + + program = *argv++; argc--; + +@@ -163,9 +163,14 @@ + yoffset -= lly * yscale; + } + fputs("%%EndComments\n", output); +- if (showpage) +- fputs("save /showpage{}def /copypage{}def /erasepage{}def\n", output); +- else ++ if (showpage) { ++ fputs("/startEpsffit {\n", output); ++ fputs(" /EpsffitSave {save} def\n", output); ++ fputs(" userdict 200 dict begin\n", output); ++ fputs(" /showpage{}def /copypage{}def /erasepage{}def\n", output); ++ fputs("}def\n", output); ++ fputs("startEpsffit\n", output); ++ } else + fputs("%%BeginProcSet: epsffit 1 0\n", output); + fputs("gsave\n", output); + fprintf(output, "%.3f %.3f translate\n", xoffset, yoffset); +@@ -181,7 +186,7 @@ + if (bbfound) { + fputs("grestore\n", output); + if (showpage) +- fputs("restore showpage\n", output); /* just in case */ ++ fputs("end EpsffitSave restore showpage\n", output); /* just in case */ + } else + message(FATAL, "no %%%%BoundingBox:\n"); + +--- psutils/psnup.c.orig Wed Mar 12 00:53:02 1997 ++++ psutils/psnup.c Wed Jun 4 11:02:36 1997 +@@ -68,10 +68,10 @@ + + void main(int argc, char *argv[]) + { +- int horiz, vert, rotate, column, flip, leftright, topbottom; ++ int horiz = 0, vert = 0, rotate = 0, column, flip, leftright, topbottom; + int nup = 1; + double draw = 0; /* draw page borders */ +- double scale; /* page scale */ ++ double scale = 0; /* page scale */ + double uscale = 0; /* user supplied scale */ + double ppwid, pphgt; /* paper dimensions */ + double margin, border; /* paper & page margins */ Added: tinysofa/snapshot/psutils/current/sources/psutils-p17-paper.patch =================================================================== --- tinysofa/snapshot/psutils/current/sources/psutils-p17-paper.patch 2004-07-01 15:40:00 UTC (rev 2640) +++ tinysofa/snapshot/psutils/current/sources/psutils-p17-paper.patch 2004-07-01 15:40:02 UTC (rev 2641) @@ -0,0 +1,202 @@ +--- psutils/pstops.man.paper Tue Mar 11 23:53:04 1997 ++++ psutils/pstops.man Thu Jul 19 15:21:51 2001 +@@ -108,10 +108,11 @@ + The + .I \-p + option can be used as an alternative, to set the paper size to +-.B a3, a4, a5, b5, letter, legal, tabloid, statement, executive, folio, quarto ++.B a3, a4, a5, b5, letter, legal, tabloid, statement, executive, folio, quarto, 10x14 + or +-.B 10x14. +-The default paper size is ++.B _glibc, ++where latter one means the format of the current locale. The default ++paper size is + .B @PAPER at . + .PP + The +@@ -154,6 +155,12 @@ + 4:1L at .7(21cm,0)+-2L at .7(21cm,14.85cm) + .sp + for the reverse sides (or join them with a comma for duplex printing). ++.SH "ENVIRONMENT VARIABLES" ++.TP ++.B LC_ALL, LC_PAPER ++These variables are specifying the papertype when used paper is ++.B _glibc. ++For details see the locale(7) manpage. + .SH AUTHOR + Copyright (C) Angus J. C. Duggan 1991-1995 + .SH "SEE ALSO" +--- psutils/psutil.c.paper Tue Mar 11 23:53:04 1997 ++++ psutils/psutil.c Thu Jul 19 15:21:51 2001 +@@ -21,6 +21,11 @@ + #include + #include + ++#ifdef HAVE_LANGINFO_H ++# include ++# include ++#endif ++ + #define iscomment(x,y) (strncmp(x,y,strlen(y)) == 0) + + extern char *program ; +@@ -31,6 +36,16 @@ + extern char pagelabel[BUFSIZ]; + extern int pageno; + ++#ifdef HAVE_LANGINFO_H ++/* When using papertype _glibc we are comparing floating point values. Therefore ++ * and because values in the papersize table are not exactly we are needing an ++ * epsilon value. */ ++static float PT_EPSILON = 2.0; ++ ++/* The factor needed to convert lengths given in mm to length in pt.*/ ++static float MM_TO_PT_FACTOR = 72/25.4; ++#endif /* HAVE_LANGINFO_H */ ++ + static char buffer[BUFSIZ]; + static long bytes = 0; + static long pagescmt = 0; +@@ -64,16 +79,52 @@ + { NULL, 0, 0 } + }; + ++#ifdef HAVE_LANGINFO_H ++/* Called if papertype is '_glibc'. It uses the current locale to determine the ++ * height and width of the current LC_PAPER and compares it with the items of ++ * the 'papersizes' list. */ ++Paper* findpaperglibc() ++{ ++ float height, width; ++ char *old_locale = setlocale (LC_PAPER, ""); ++ Paper *result = 0, *pp; ++ ++ height = MM_TO_PT_FACTOR * (unsigned int)(nl_langinfo(_NL_PAPER_HEIGHT)); ++ width = MM_TO_PT_FACTOR * (unsigned int)(nl_langinfo(_NL_PAPER_WIDTH)); ++ ++ for (pp = papersizes; PaperName(pp) && result==0; pp++) { ++ if ( abs(PaperWidth(pp)-width) header ++# or does not know nl_langinfo() ++LANGINFO_FLAG = -DHAVE_LANGINFO_H + + # Makefile for PSUtils under Unix + +@@ -39,7 +43,7 @@ + MANDIR = $(DESTDIR)/usr/man/man$(MANEXT) + + CC = gcc +-CFLAGS = -DPAPER=\"$(PAPER)\" -DUNIX $(RPM_OPT_FLAGS) -Wall ++CFLAGS = -DPAPER=\"$(PAPER)\" -DUNIX $(RPM_OPT_FLAGS) $(LANGINFO_FLAG) -Wall + + BIN = psbook psselect pstops epsffit psnup \ + psresize Added: tinysofa/snapshot/psutils/current/sources/psutils-p17-strip.patch =================================================================== --- tinysofa/snapshot/psutils/current/sources/psutils-p17-strip.patch 2004-07-01 15:40:00 UTC (rev 2640) +++ tinysofa/snapshot/psutils/current/sources/psutils-p17-strip.patch 2004-07-01 15:40:02 UTC (rev 2641) @@ -0,0 +1,11 @@ +--- psutils/Makefile.unix.orig 2002-06-20 12:41:54.000000000 +0200 ++++ psutils/Makefile.unix 2002-06-20 12:41:41.000000000 +0200 +@@ -226,7 +226,7 @@ + -mkdir -p $(BINDIR) + @for i in $(BIN); do \ + echo Installing $$i; \ +- $(INSTALL) $$i -s $(BINDIR); \ ++ $(INSTALL) $$i $(BINDIR); \ + done + + install.script: $(PERLSCRIPTS) $(SHELLSCRIPTS) Added: tinysofa/snapshot/psutils/current/sources/psutils-p17.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/psutils/current/sources/psutils-p17.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/psutils/current/specs/psutils.spec =================================================================== --- tinysofa/snapshot/psutils/current/specs/psutils.spec 2004-07-01 15:40:00 UTC (rev 2640) +++ tinysofa/snapshot/psutils/current/specs/psutils.spec 2004-07-01 15:40:02 UTC (rev 2641) @@ -0,0 +1,124 @@ +Summary: PostScript Utilities +Name: psutils +Version: 1.17 +Release: 22ts +License: distributable +Group: Applications/Publishing +Source: ftp://ftp.dcs.ed.ac.uk/pub/ajcd/psutils-p17.tar.gz +Patch0: psutils-p17-Makefile.patch +Patch1: psutils-p17-misc.patch +Patch2: psutils-p17-paper.patch +Patch3: psutils-p17-strip.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-root + +%description +This archive contains some utilities for manipulating PostScript documents. +Page selection and rearrangement are supported, including arrangement into +signatures for booklet printing, and page merging for n-up printing. + +%prep +%setup -q -n psutils +%patch0 -p1 -b .makefile +%patch1 -p1 -b .misc +%patch2 -p1 -b .paper +%patch3 -p1 -b .strip + +%build +make -f Makefile.unix RPM_OPT_FLAGS="$RPM_OPT_FLAGS" + +%install +rm -rf $RPM_BUILD_ROOT + +make -f Makefile.unix \ + MANDIR=$RPM_BUILD_ROOT%{_mandir}/man1 \ + DESTDIR=$RPM_BUILD_ROOT install + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(0644, root, root, 0755) +%doc README LICENSE +%attr(0755, root, root) /usr/bin/* +%{_mandir}/*/* +/usr/lib/psutils + +%changelog +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Tue Jun 17 2003 Tim Waugh 1.17-21 +- Rebuilt. + +* Wed Jun 04 2003 Elliot Lee +- rebuilt + +* Wed Jan 22 2003 Tim Powers +- rebuilt + +* Wed Dec 11 2002 Tim Powers 1.17-18 +- rebuild on all arches + +* Fri Jun 21 2002 Tim Powers +- automated rebuild + +* Thu Jun 20 2002 Than Ngo 1.17-16 +- Don't forcibly strip binaries + +* Thu May 23 2002 Tim Powers +- automated rebuild + +* Wed Jan 09 2002 Tim Powers +- automated rebuild + +* Thu Jul 19 2001 Than Ngo 1.17-13 +- add patch from enrico.scholz at informatik.tu-chemnitz.de + +* Fri Jul 13 2001 Than Ngo 1.17-12 +- media size as letter (Bug #48831) +- Copyright->License +- don't hardcode manpath + +* Sun Jun 24 2001 Elliot Lee +- Bump release + rebuild. + +* Fri Dec 8 2000 Tim Powers +- built for dist-7.1 + +* Mon Jul 24 2000 Prospector +- rebuilt + +* Mon Jul 10 2000 Tim Powers +- rebuilt + +* Mon Jul 03 2000 Prospector +- automatic rebuild + +* Fri May 26 2000 Tim Powers +- man pages in /usr/share/man (FHS compliant location) +- grabbed spec from contrib +- initial build for Powertools + +* Wed May 12 1999 Peter Soos +- Corrected the file and directory attributes to rebuild the package + under RedHat Linux 6.0 + +* Fri Dec 25 1998 Peter Soos +- Corrected the file and directory attributes + +* Tue Jun 23 1998 Peter Soos +- Using %attr for ability to rebuild the package as an ordinary user. + +* Wed Jun 04 1997 Timo Karjalainen +- Reverted back to un-gzipped man-pages (Redhat style) +- Added patch to compile everything cleanly +- Some minor changes to specfile + +* Thu Mar 27 1997 Tomasz K?oczko + - new version: + Patchlevel 17 had some minor bugfixes and improvements + - Trailer information now put before %%EOF comments if no %%Trailer + - psselect can now add blank pages. + - Piped input works in Linux + - spec file rewrited for using Buildroot, + - man pages gziped. From svn at tinysofa.org Thu Jul 1 15:40:09 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:40:09 +1000 (EST) Subject: [tinysofa-svn] r2644 - in tinysofa/snapshot: . pyxf86config pyxf86config/current pyxf86config/current/sources pyxf86config/current/specs Message-ID: <20040701154009.5778B4E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:40:07 +1000 (Fri, 02 Jul 2004) New Revision: 2644 Added: tinysofa/snapshot/pyxf86config/ tinysofa/snapshot/pyxf86config/current/ tinysofa/snapshot/pyxf86config/current/sources/ tinysofa/snapshot/pyxf86config/current/sources/pyxf86config-0.3.18.tar.gz tinysofa/snapshot/pyxf86config/current/specs/ tinysofa/snapshot/pyxf86config/current/specs/pyxf86config.spec Log: - Add pyxf86config to snapshot from 2.0. Added: tinysofa/snapshot/pyxf86config/current/sources/pyxf86config-0.3.18.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/pyxf86config/current/sources/pyxf86config-0.3.18.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/pyxf86config/current/specs/pyxf86config.spec =================================================================== --- tinysofa/snapshot/pyxf86config/current/specs/pyxf86config.spec 2004-07-01 15:40:05 UTC (rev 2643) +++ tinysofa/snapshot/pyxf86config/current/specs/pyxf86config.spec 2004-07-01 15:40:07 UTC (rev 2644) @@ -0,0 +1,130 @@ +Summary: Python wrappers for libxf86config +Name: pyxf86config +Version: 0.3.18 +Release: 3ts +URL: http://www.redhat.com/ +Source0: %{name}-%{version}.tar.gz +License: GPL +Group: System Environment/Libraries +BuildRoot: %{_tmppath}/%{name}-%{version}-root +Requires: glib2 +Requires: python2 +BuildRequires: glib2-devel +BuildRequires: XFree86-devel +BuildRequires: python2 +BuildRequires: python-devel +ExcludeArch: s390 s390x ppc64 + +%description +Python wrappers for the X server config file library libxf86config. +It is used to read and write X server configuration files. + +%prep +%setup -q + +%build +export CFLAGS="$RPM_OPT_FLAGS -fPIC" +%configure --x-libraries=/usr/X11R6/%{_lib} --with-python-version=2.3 +make + +%install +rm -rf $RPM_BUILD_ROOT +%makeinstall + +%clean +rm -rf $RPM_BUILD_ROOT + +%preun +if [ -d %{_libdir}/python2.2/site-packages/xf86config.pyc ] ; then + rm -f {_libdir}/python2.2/site-packages/xf86config.pyc +fi + +%files +%defattr(-,root,root) +%doc README NEWS AUTHORS COPYING ChangeLog +%{_libdir}/python?.?/site-packages/ixf86configmodule.so +%{_libdir}/python?.?/site-packages/xf86config.py + +%changelog +* Tue Jun 15 2004 Elliot Lee +- rebuilt + +* Fri May 7 2004 Mike A. Harris - 0.3.18-2 +- Bumped release number and rebuilt unmodified in dist-fc2 to relink to new + static libxf86config.a to pick up fix for (FC2BLOCKER #120950) + +* Thu Apr 15 2004 Mike A. Harris - 0.3.18-1 +- Do not write out XkbRules line to config file, as it is unnecessary hard + coding the rules file, which has a built in default which should always + work. (#120858) + +* Thu Apr 15 2004 Jeremy Katz - 0.3.17-1 +- xorg for XkbRules + +* Wed Apr 14 2004 Alex Larsson 0.3.16 +- Rebuild for the new libxf86config +- remove references to XFree86 + +* Thu Feb 19 2004 Brent Fox 0.3.15-1 +- remove the setupMice() function createTemplate() +- because the 2.6 kernel puts both PS/2 and USB mice on the same device + +* Mon Feb 9 2004 Alexander Larsson 0.3.14-1 +- fix range array bug + +* Thu Nov 6 2003 Jeremy Katz 0.3.13-2 +- rebuild for python 2.3 +- don't build on ppc64 either since X is missing bits there as well + +* Tue Jul 29 2003 Elliot Lee 0.3.13-1 +- Rebuild + +* Wed Jun 4 2003 Brent Fox 0.3.12-1 +- add a 'scrnum' attribute to the adjacency section + +* Tue Jun 3 2003 Brent Fox 0.3.11-1 +- add a function to xf86config.py called getAllScreens() + +* Tue Jun 3 2003 Brent Fox 0.3.10-1 +- add a BuildRequires for python-devel +- add an options attribute to the server layout section (for Xinerama) + +* Tue Apr 29 2003 Alexander Larsson 0.3.6-1 +- Added laptop resolutions + +* Mon Jan 27 2003 Alexander Larsson 0.3.5-1 +- Rebuild + +* Wed Jan 15 2003 Michael Fulbright 0.3.4-1 +- remove code in xf86config.py:createTemplate() that inserted a Display + section. We want user to supply this and it shouldnt be in template. + +* Sat Jan 11 2003 Florian La Roche +- add ExcludeArch: s390 s390x + +* Thu Dec 12 2002 Mike A. Harris 0.3.3-1 +- Remove Excludearch alpha + +* Tue Nov 12 2002 Michael Fulbright 0.3.2-1 +- Added some convenience functions. + +* Mon Jul 8 2002 Alexander Larsson +- Bump to 0.3.1 + +* Mon Jun 17 2002 Alexander Larsson +- Bump to 0.3.0 + +* Fri May 24 2002 Alex Larsson 0.2.0-3 +- Excludearch alpha for now + +* Fri May 24 2002 Alex Larsson 0.2.0-2 +- Add some doc files + +* Fri May 24 2002 Alex Larsson 0.2.0-1 +- Update version number for new release + +* Thu Apr 11 2002 Alex Larsson 0.1.0-1 +- Initial release + +* Wed Apr 10 2002 Alex Larsson +- Initial specfile From svn at tinysofa.org Thu Jul 1 15:40:03 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:40:03 +1000 (EST) Subject: [tinysofa-svn] r2642 - in tinysofa/snapshot: . pygtk2 pygtk2/current pygtk2/current/sources pygtk2/current/specs Message-ID: <20040701154003.C605A4E817E@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:40:03 +1000 (Fri, 02 Jul 2004) New Revision: 2642 Added: tinysofa/snapshot/pygtk2/ tinysofa/snapshot/pygtk2/current/ tinysofa/snapshot/pygtk2/current/sources/ tinysofa/snapshot/pygtk2/current/sources/pygtk-2.3.92.tar.bz2 tinysofa/snapshot/pygtk2/current/specs/ tinysofa/snapshot/pygtk2/current/specs/pygtk2.spec Log: - Add pygtk2 to snapshot from 2.0. Added: tinysofa/snapshot/pygtk2/current/sources/pygtk-2.3.92.tar.bz2 =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/pygtk2/current/sources/pygtk-2.3.92.tar.bz2 ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/pygtk2/current/specs/pygtk2.spec =================================================================== --- tinysofa/snapshot/pygtk2/current/specs/pygtk2.spec 2004-07-01 15:40:02 UTC (rev 2641) +++ tinysofa/snapshot/pygtk2/current/specs/pygtk2.spec 2004-07-01 15:40:03 UTC (rev 2642) @@ -0,0 +1,246 @@ +%define buildglade %(pkg-config libglade-2.0 && echo 1 || echo 0) + +Summary: Python bindings for the GTK+ widget set. +Name: pygtk2 +Version: 2.3.92 +Release: 1ts +Copyright: LGPL +Group: Development/Languages +Source: ftp://ftp.gtk.org/pub/gtk/python/pygtk-%{version}.tar.bz2 +BuildRoot: %{_tmppath}/%{name}-%{version}-root +Requires: gtk2 >= 2.4.0 +Requires: python2 >= 2.3 +Buildrequires: python-devel >= 2.3 +Buildrequires: libglade2-devel +Buildrequires: gtk2-devel >= 2.4 +# needed for automake/autoconf to work right with multilib python +Buildrequires: automake >= 1.6.3-5 + +%description +PyGTK is an extension module for python that gives you access to the GTK+ +widget set. Just about anything you can write in C with GTK+ you can write +in python with PyGTK (within reason), but with all the benefits of python. + +%package libglade +Summary: A wrapper for the libglade library for use with PyGTK +Group: Development/Languages +Requires: pygtk2 = %{version} + +%description libglade +This module contains a wrapper for the libglade library. Libglade allows +a program to construct its user interface from an XML description, which +allows the programmer to keep the UI and program logic separate. + +%package devel +Summary: files needed to build wrappers for GTK+ addon libraries +Group: Development/Languages +Requires: pygtk2 = %{version} + +%description devel +This package contains files required to build wrappers for GTK+ addon +libraries so that they interoperate with pygtk. + +%prep +%setup -q -n pygtk-%{version} + +%build +#[ -x /usr/bin/python2.2 ] && export PYTHON=/usr/bin/python2.2 +#aclocal && automake && autoconf +%configure --enable-thread +export tagname=CC +make LIBTOOL=/usr/bin/libtool + +%install +rm -rf $RPM_BUILD_ROOT +export tagname=CC +make LIBTOOL=/usr/bin/libtool DESTDIR=$RPM_BUILD_ROOT install +find $RPM_BUILD_ROOT -name '*.la' -or -name '*.a' | xargs rm -f + +%files +%defattr(644, root, root, 755) +%dir %{_libdir}/python?.?/site-packages/gtk-2.0 +%dir %{_libdir}/python?.?/site-packages/gtk-2.0/gtk +%{_libdir}/python?.?/site-packages/gtk-2.0/gtk/*.py* +%{_libdir}/python?.?/site-packages/gtk-2.0/gtk/keysyms.py* +%{_libdir}/python?.?/site-packages/gtk-2.0/gtk/compat.py* +%{_libdir}/python?.?/site-packages/gtk-2.0/dsextras.py* + +%defattr(755, root, root, 755) +%{_libdir}/python?.?/site-packages/pygtk* +%{_libdir}/python?.?/site-packages/gtk-2.0/atk.so +%{_libdir}/python?.?/site-packages/gtk-2.0/gobject.so +%{_libdir}/python?.?/site-packages/gtk-2.0/pango.so +%{_libdir}/python?.?/site-packages/gtk-2.0/gtk/_gtk.so + +%doc AUTHORS NEWS README MAPPING ChangeLog +%doc examples + +%if %{buildglade} +%files libglade +%defattr(755, root, root, 755) +%{_libdir}/python?.?/site-packages/gtk-2.0/gtk/glade.so +%endif + +%files devel +%defattr(755, root, root, 755) +%{_prefix}/bin/pygtk-codegen-2.0 +%defattr(644, root, root, 755) +%dir %{_prefix}/include/pygtk-2.0 +%{_prefix}/include/pygtk-2.0/*.h +%dir %{_prefix}/include/pygtk-2.0/pygtk +%{_prefix}/include/pygtk-2.0/pygtk/*.h +%{_libdir}/pkgconfig/pygtk-2.0.pc +%dir %{_prefix}/share/pygtk +%dir %{_prefix}/share/pygtk/2.0 +%dir %{_prefix}/share/pygtk/2.0/codegen +%dir %{_prefix}/share/pygtk/2.0/defs +%{_prefix}/share/pygtk/2.0/codegen/* +%{_prefix}/share/pygtk/2.0/defs/*.defs + +%changelog +* Thu Jun 17 2004 Jeremy Katz - 2.3.92-1 +- update to 2.3.92 + +* Tue Jun 15 2004 Elliot Lee +- rebuilt + +* Thu Mar 11 2004 Jeremy Katz - 2.2.0-1 +- 2.2.0 + +* Wed Mar 10 2004 Jeremy Katz 2.2.0-0.rc1 +- 2.2.0 RC1 + +* Tue Mar 02 2004 Elliot Lee +- rebuilt + +* Tue Feb 17 2004 Jeremy Katz - 2.0.0-5 +- GtkTextSearchFlags is flags, not enum (#114910) + +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Thu Feb 12 2004 Jeremy Katz - 2.0.0-3 +- own %%{_libdir}/python?.?/site-packages/gtk-2.0/gtk dir (#113048) + +* Thu Nov 6 2003 Jeremy Katz 2.0.0-2 +- rebuild for python 2.3 + +* Thu Sep 4 2003 Jeremy Katz 2.0.0-1 +- 2.0.0 + +* Thu Aug 14 2003 Elliot Lee 1.99.17-1 +- Update to latest version +- Module filenames changed from foomodule.so to foo.so + +* Thu Aug 7 2003 Elliot Lee 1.99.16-10 +- Fix libtool + +* Fri Jul 18 2003 Jeremy Katz 1.99.16-8 +- part of the fixnew patch wasn't applied upstream, apply it (#99400) + +* Wed Jun 04 2003 Elliot Lee +- rebuilt + +* Tue May 27 2003 Jonathan Blandford 1.99.16-5 +- Update compat patch to include gtk_text_buffer_set_text + +* Tue May 27 2003 Matt Wilson 1.99.16-4 +- don't require the deprecated length parameter + +* Fri May 23 2003 Matt Wilson 1.99.16-3 +- add compatibility for deprecated length field in GtkTextBuffer + insert methods (#91519) + +* Thu May 22 2003 Matt Wilson 1.99.16-2 +- apply atom_intern patch again (#91349) + +* Tue May 20 2003 Matt Wilson 1.99.16-1 +- added a compatibility function for gtk.gdk.gc_new() so we won't have + to fix all our code quite yet + +* Mon May 19 2003 Matt Wilson 1.99.16-1 +- enable threads (#83539, #87872) + +* Fri Apr 11 2003 Jonathan Blandford 1.99.16-1 +- new version + +* Thu Mar 13 2003 Jeremy Katz 1.99.14-7 +- and again + +* Thu Mar 13 2003 Jeremy Katz 1.99.14-6 +- rebuild in new environment + +* Wed Mar 5 2003 Thomas Woerner 1.99.14-5 +- fixed new functions for ListStore, TreeStrore and ProgressBar + +* Thu Feb 6 2003 Mihai Ibanescu 1.99.14-4 +- rebuild to use the UCS4-enabled python + +* Tue Jan 28 2003 Jeremy Katz 1.99.14-3 +- rerun auto* to use new python.m4 and work properly with multilib python +- libdir-ize + +* Wed Jan 22 2003 Tim Powers +- rebuilt + +* Fri Dec 27 2002 Jeremy Katz 1.99.14-1 +- bump version to 1.99.14 +- add patch to up the ref on gtkInvisible instantiation (#80283) + +* Thu Dec 12 2002 Jonathan Blandford +- bump version to 1.99.13 +- backport gdk.Pixbuf.save + +* Thu Oct 31 2002 Matt Wilson +- rebuild for multilib +- use %%configure + +* Fri Aug 30 2002 Matt Wilson +- fix pixbuf leaks (#72137) +- five more pixbuf leaks plugged + +* Wed Aug 28 2002 Jonathan Blandford +- remover Packager tag + +* Tue Aug 27 2002 Jonathan Blandford +- add binding for gdk_atom_intern + +* Mon Jul 29 2002 Matt Wilson +- 0.99.12 + +* Wed Jul 17 2002 Matt Wilson +- new version from CVS + +* Thu Jun 27 2002 Tim Waugh +- Fix bug #65770. + +* Fri Jun 21 2002 Tim Powers +- automated rebuild + +* Mon Jun 17 2002 Matt Wilson +- new version from CVS + +* Sun May 26 2002 Tim Powers +- automated rebuild + +* Wed May 22 2002 Jeremy Katz +- 1.99.10 + +* Wed Feb 27 2002 Matt Wilson +- 1.99.8 + +* Mon Jan 28 2002 Matt Wilson +- added atkmodule.so to file list + +* Thu Oct 18 2001 Matt Wilson +- fix devel filelist to match new header location + +* Mon Oct 15 2001 Matt Wilson +- get the headers from their new version-specific location + +* Thu Oct 11 2001 Matt Wilson +- fixed typo in devel filelist +- added macro that tests to see if we have libglade2, make the + filelist a condition of that +- changed name to 'pygtk2' to avoid name conflict with pygtk + From svn at tinysofa.org Thu Jul 1 15:40:11 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:40:11 +1000 (EST) Subject: [tinysofa-svn] r2645 - in tinysofa/snapshot: . quagga quagga/current quagga/current/sources quagga/current/specs Message-ID: <20040701154011.697074E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:40:11 +1000 (Fri, 02 Jul 2004) New Revision: 2645 Added: tinysofa/snapshot/quagga/ tinysofa/snapshot/quagga/current/ tinysofa/snapshot/quagga/current/sources/ tinysofa/snapshot/quagga/current/sources/quagga-0.96.2-lib64.patch tinysofa/snapshot/quagga/current/sources/quagga-0.96.3-netlink.patch tinysofa/snapshot/quagga/current/sources/quagga-0.96.5.tar.gz tinysofa/snapshot/quagga/current/sources/quagga-filter-perl-requires.sh tinysofa/snapshot/quagga/current/specs/ tinysofa/snapshot/quagga/current/specs/quagga.spec Log: - Add quagga to snapshot from 2.0. Added: tinysofa/snapshot/quagga/current/sources/quagga-0.96.2-lib64.patch =================================================================== --- tinysofa/snapshot/quagga/current/sources/quagga-0.96.2-lib64.patch 2004-07-01 15:40:07 UTC (rev 2644) +++ tinysofa/snapshot/quagga/current/sources/quagga-0.96.2-lib64.patch 2004-07-01 15:40:11 UTC (rev 2645) @@ -0,0 +1,40 @@ +Remove the directory component from all paths. This lets libpam search its +default directory for modules, which is needed on multilib systems because +a 64-bit binary can't use the 32-bit modules which are stored in /lib/security. + +--- quagga-0.96.2/redhat/quagga.pam 2003-09-22 10:42:02.000000000 -0400 ++++ quagga-0.96.2/redhat/quagga.pam 2003-09-22 10:41:56.000000000 -0400 +@@ -4,12 +4,12 @@ + ##### if running quagga as root: + # Only allow root (and possibly wheel) to use this because enable access + # is unrestricted. +-auth sufficient /lib/security/pam_rootok.so ++auth sufficient pam_rootok.so + + # Uncomment the following line to implicitly trust users in the "wheel" group. +-#auth sufficient /lib/security/pam_wheel.so trust use_uid ++#auth sufficient pam_wheel.so trust use_uid + # Uncomment the following line to require a user to be in the "wheel" group. +-#auth required /lib/security/pam_wheel.so use_uid ++#auth required pam_wheel.so use_uid + ########################################################### + + # If using quagga privileges and with a seperate group for vty access, then +@@ -17,10 +17,10 @@ + # check for valid user/password, eg: + # + # only allow local users. +-#auth required /lib/security/pam_securetty.so +-#auth required /lib/security/pam_stack.so service=system-auth +-#auth required /lib/security/pam_nologin.so +-#account required /lib/security/pam_stack.so service=system-auth +-#password required /lib/security/pam_stack.so service=system-auth +-#session required /lib/security/pam_stack.so service=system-auth +-#session optional /lib/security/pam_console.so ++#auth required pam_securetty.so ++#auth required pam_stack.so service=system-auth ++#auth required pam_nologin.so ++#account required pam_stack.so service=system-auth ++#password required pam_stack.so service=system-auth ++#session required pam_stack.so service=system-auth ++#session optional pam_console.so Added: tinysofa/snapshot/quagga/current/sources/quagga-0.96.3-netlink.patch =================================================================== --- tinysofa/snapshot/quagga/current/sources/quagga-0.96.3-netlink.patch 2004-07-01 15:40:07 UTC (rev 2644) +++ tinysofa/snapshot/quagga/current/sources/quagga-0.96.3-netlink.patch 2004-07-01 15:40:11 UTC (rev 2645) @@ -0,0 +1,16 @@ +--- quagga-0.96.3/zebra/#rt_netlink.c~ 2003-10-23 16:12:02.000000000 -0400 ++++ quagga-0.96.3/zebra/rt_netlink.c 2003-10-23 16:12:02.000000000 -0400 +@@ -294,6 +294,13 @@ + for (h = (struct nlmsghdr *) buf; NLMSG_OK (h, status); + h = NLMSG_NEXT (h, status)) + { ++ /* JF: Ignore messages that aren't from the kernel */ ++ if ( snl.nl_pid != 0 ) ++ { ++ zlog ( NULL, LOG_ERR, "Ignoring message from pid %u", snl.nl_pid ); ++ continue; ++ } ++ + /* Finish of reading. */ + if (h->nlmsg_type == NLMSG_DONE) + return ret; Added: tinysofa/snapshot/quagga/current/sources/quagga-0.96.5.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/quagga/current/sources/quagga-0.96.5.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/quagga/current/sources/quagga-filter-perl-requires.sh =================================================================== --- tinysofa/snapshot/quagga/current/sources/quagga-filter-perl-requires.sh 2004-07-01 15:40:07 UTC (rev 2644) +++ tinysofa/snapshot/quagga/current/sources/quagga-filter-perl-requires.sh 2004-07-01 15:40:11 UTC (rev 2645) @@ -0,0 +1,3 @@ +#!/bin/sh + +/usr/lib/rpm/perl.req $* | grep -v "Net::Telnet" Property changes on: tinysofa/snapshot/quagga/current/sources/quagga-filter-perl-requires.sh ___________________________________________________________________ Name: svn:executable + * Added: tinysofa/snapshot/quagga/current/specs/quagga.spec =================================================================== --- tinysofa/snapshot/quagga/current/specs/quagga.spec 2004-07-01 15:40:07 UTC (rev 2644) +++ tinysofa/snapshot/quagga/current/specs/quagga.spec 2004-07-01 15:40:11 UTC (rev 2645) @@ -0,0 +1,395 @@ +# configure options +%define with_snmp 0 +%define with_vtysh 1 +%define with_ospf_te 1 +%define with_nssa 1 +%define with_opaque_lsa 1 +%define with_tcp_zebra 0 +%define with_vtysh 1 +%define with_pam 1 +%define with_ipv6 1 +%define with_ospfclient 1 +%define with_ospfapi 1 +%define with_rtadv 1 +%define with_multipath 64 +%define quagga_uid 92 +%define quagga_gid 92 +%define quagga_user quagga +%define vty_group quaggavt + +# path defines +%define _sysconfdir /etc/quagga +%define zeb_src %{_builddir}/%{name}-%{version} +%define zeb_rh_src %{zeb_src}/redhat +%define zeb_docs %{zeb_src}/doc + +# defines for configure +%define _libexecdir %{_exec_prefix}/libexec/quagga +%define _includedir %{_prefix}/include +%define _libdir %{_exec_prefix}/%{_lib}/quagga +%define _localstatedir /var/run/quagga + +Summary: Routing daemon +Name: quagga +Version: 0.96.5 +Release: 1ts +Epoch: 0 +License: GPL +Group: System Environment/Daemons +Source0: http://www.quagga.net/download/%{name}-%{version}.tar.gz +Source1: quagga-filter-perl-requires.sh +Patch0: quagga-0.96.2-lib64.patch +Patch1: quagga-0.96.3-netlink.patch +URL: http://www.quagga.net +%if %with_snmp +BuildRequires: ucd-snmp-devel +Prereq: ucd-snmp +%endif +%if %with_vtysh +BuildRequires: readline readline-devel ncurses ncurses-devel +Prereq: readline ncurses +%endif +BuildRequires: texinfo tetex autoconf pam-devel patch libcap-devel +%define __perl_requires %{SOURCE1} + +# Initscripts > 5.60 is required for IPv6 support +Prereq: initscripts >= 5.60 +Prereq: ncurses readline pam +Prereq: /sbin/install-info +Provides: routingdaemon +BuildRoot: %{_tmppath}/%{name}-%{version}-root +Obsoletes: bird gated mrt zebra + +%description +Quagga is a free software that manages TCP/IP based routing +protocol. It takes multi-server and multi-thread approach to resolve +the current complexity of the Internet. + +Quagga supports BGP4, BGP4+, OSPFv2, OSPFv3, RIPv1, RIPv2, and RIPng. + +Quagga is intended to be used as a Route Server and a Route Reflector. It is +not a toolkit, it provides full routing power under a new architecture. +Quagga by design has a process for each protocol. + +Quagga is a fork of GNU Zebra. + +%package contrib +Summary: contrib tools for quagga +Group: System Environment/Daemons + +%description contrib +Contributed/3rd party tools which may be of use with quagga. + +%package devel +Summary: Header and object files for quagga development +Group: System Environment/Daemons + +%description devel +The quagga-devel package contains the header and object files neccessary for +developing OSPF-API and quagga applications. + +%prep +%setup -q +%patch0 -p1 -b .lib64 +%patch1 -p1 -b .netlink + +%build +CFLAGS=-fPIE ; LDFLAGS=-pie ; %configure \ +%if %with_ipv6 + --enable-ipv6 \ +%endif +%if %with_snmp + --enable-snmp \ +%endif +%if %with_multipath + --enable-multipath=%with_multipath \ +%endif +%if %with_tcp_zebra + --enable-tcp-zebra \ +%endif +%if %with_nssa + --enable-nssa \ +%endif +%if %with_opaque_lsa + --enable-opaque-lsa \ +%endif +%if %with_ospf_te + --enable-ospf-te \ +%endif +%if %with_vtysh + --enable-vtysh \ +%endif +%if %with_ospfclient + --enable-ospfclient=yes \ +%else + --enable-ospfclient=no\ +%endif +%if %with_ospfapi + --enable-ospfapi=yes \ +%else + --enable-ospfapi=no \ +%endif +%if %with_pam + --with-libpam \ +%endif +%if %quagga_user + --enable-user=%quagga_user \ + --enable-group=%quagga_user \ +%endif +%if %vty_group + --enable-vty-group=%vty_group \ +%endif +%if %with_rtadv + --with-rtadv \ +%endif +--with-cflags="-O2" \ +--enable-netlink + +CFLAGS=-fPIE ; LDFLAGS=-pie ; make %{?_smp_mflags} MAKEINFO="makeinfo --no-split" + +pushd doc +texi2html quagga.texi +popd + +%install +rm -rf $RPM_BUILD_ROOT + +install -d $RPM_BUILD_ROOT/etc/{rc.d/init.d,sysconfig,logrotate.d,pam.d} \ + $RPM_BUILD_ROOT/var/log/quagga $RPM_BUILD_ROOT%{_infodir} + +make install \ + DESTDIR=$RPM_BUILD_ROOT + +# Remove this file, as it is uninstalled and causes errors when building on RH9 +rm -rf $RPM_BUILD_ROOT/usr/share/info/dir + +install %{zeb_rh_src}/zebra.init $RPM_BUILD_ROOT/etc/rc.d/init.d/zebra +install %{zeb_rh_src}/bgpd.init $RPM_BUILD_ROOT/etc/rc.d/init.d/bgpd +%if %with_ipv6 +install %{zeb_rh_src}/ospf6d.init $RPM_BUILD_ROOT/etc/rc.d/init.d/ospf6d +install %{zeb_rh_src}/ripngd.init $RPM_BUILD_ROOT/etc/rc.d/init.d/ripngd +%endif +install %{zeb_rh_src}/ospfd.init $RPM_BUILD_ROOT/etc/rc.d/init.d/ospfd +install %{zeb_rh_src}/ripd.init $RPM_BUILD_ROOT/etc/rc.d/init.d/ripd +install -m644 %{zeb_rh_src}/quagga.sysconfig $RPM_BUILD_ROOT/etc/sysconfig/quagga +install -m644 %{zeb_rh_src}/quagga.pam $RPM_BUILD_ROOT/etc/pam.d/quagga +install -m644 %{zeb_rh_src}/quagga.logrotate $RPM_BUILD_ROOT/etc/logrotate.d/quagga +install -d -m750 $RPM_BUILD_ROOT/var/run/quagga + +%pre +# add vty_group +%if %vty_group +groupadd -r %vty_group 2> /dev/null || : +%endif +# add quagga user and group +%if %quagga_user +# Ensure that quagga_gid gets correctly allocated +if getent group %quagga_user >/dev/null 2>&1 ; then : ; else \ + /usr/sbin/groupadd -g %quagga_gid %quagga_user > /dev/null 2>&1 || exit 1 ; fi +if getent passwd %quagga_user >/dev/null 2>&1 ; then : ; else \ + /usr/sbin/useradd -u %quagga_uid -g %quagga_gid -M -r -s /sbin/nologin \ + -c "Quagga routing suite" -d %_localstatedir %quagga_user 2> /dev/null \ + || exit 1 ; fi +%endif + +%post +# /etc/services is already populated, so skip this + +# zebra_spec_add_service +# e.g. zebra_spec_add_service zebrasrv 2600/tcp "zebra service" +# +#zebra_spec_add_service () +#{ +# # Add port /etc/services entry if it isn't already there +# if [ -f /etc/services ] && ! grep -q "^$1[^a-zA-Z0-9]" /etc/services ; then +# echo "$1 $2 # $3" >> /etc/services +# fi +#} +# +#zebra_spec_add_service zebrasrv 2600/tcp "zebra service" +#zebra_spec_add_service zebra 2601/tcp "zebra vty" +#zebra_spec_add_service ripd 2602/tcp "RIPd vty" +#%if %with_ipv6 +#zebra_spec_add_service ripngd 2603/tcp "RIPngd vty" +#%endif +#zebra_spec_add_service ospfd 2604/tcp "OSPFd vty" +#zebra_spec_add_service bgpd 2605/tcp "BGPd vty" +#%if %with_ipv6 +#zebra_spec_add_service ospf6d 2606/tcp "OSPF6d vty" +#%endif +#%if %with_ospfapi +#zebra_spec_add_service ospfapi 2607/tcp "OSPF-API" +#%endif + +/sbin/chkconfig --add zebra +/sbin/chkconfig --add ripd +%if %with_ipv6 +/sbin/chkconfig --add ripngd +/sbin/chkconfig --add ospf6d +%endif +/sbin/chkconfig --add ospfd +/sbin/chkconfig --add bgpd + +/sbin/install-info %{_infodir}/quagga.info.gz %{_infodir}/dir + +# Create dummy files if they don't exist so basic functions can be used. +if [ ! -e %{_sysconfdir}/zebra.conf ]; then + echo "hostname `hostname`" > %{_sysconfdir}/zebra.conf +%if %quagga_user + chown %quagga_user:%quagga_user %{_sysconfdir}/zebra.conf +%endif + chmod 640 %{_sysconfdir}/zebra.conf +fi +if [ ! -e %{_sysconfdir}/vtysh.conf ]; then + touch %{_sysconfdir}/vtysh.conf + chmod 640 %{_sysconfdir}/vtysh.conf +fi + +%postun +if [ "$1" -ge "1" ]; then + /etc/rc.d/init.d/zebra condrestart >/dev/null 2>&1 + /etc/rc.d/init.d/ripd condrestart >/dev/null 2>&1 +%if %with_ipv6 + /etc/rc.d/init.d/ripngd condrestart >/dev/null 2>&1 +%endif + /etc/rc.d/init.d/ospfd condrestart >/dev/null 2>&1 +%if %with_ipv6 + /etc/rc.d/init.d/ospf6d condrestart >/dev/null 2>&1 +%endif + /etc/rc.d/init.d/bgpd condrestart >/dev/null 2>&1 +fi +/sbin/install-info --delete %{_infodir}/quagga.info.gz %{_infodir}/dir + +%preun +if [ "$1" = "0" ]; then + /sbin/chkconfig --del zebra + /sbin/chkconfig --del ripd +%if %with_ipv6 + /sbin/chkconfig --del ripngd +%endif + /sbin/chkconfig --del ospfd +%if %with_ipv6 + /sbin/chkconfig --del ospf6d +%endif + /sbin/chkconfig --del bgpd +fi + +%clean +#rm -rf $RPM_BUILD_ROOT + +%files +%defattr(-,root,root) +%doc */*.sample* AUTHORS COPYING +%doc doc/quagga.html +%doc doc/mpls +%doc ChangeLog INSTALL NEWS README REPORTING-BUGS SERVICES TODO +%if %quagga_user +%dir %attr(751,%quagga_user,%quagga_user) %{_sysconfdir} +%dir %attr(750,%quagga_user,%quagga_user) /var/log/quagga +%dir %attr(751,%quagga_user,%quagga_user) /var/run/quagga +%else +%dir %attr(750,root,root) %{_sysconfdir} +%dir %attr(750,root,root) /var/log/quagga +%dir %attr(755,root,root) /usr/share/info +%dir %attr(750,root,root) /var/run/quagga +%endif +%if %vty_group +%attr(750,%quagga_user,%vty_group) %{_sysconfdir}/vtysh.conf.sample +%endif +%{_infodir}/*info* +%{_mandir}/man*/* +%{_sbindir}/* +%if %with_vtysh +%{_bindir}/* +%endif +%config /etc/quagga/[!v]* +%config /etc/rc.d/init.d/* +%config(noreplace) /etc/pam.d/quagga +%config(noreplace) %attr(640,root,root) /etc/logrotate.d/* +%config(noreplace) /etc/sysconfig/quagga + + +%files contrib +%defattr(-,root,root) +%doc tools + +%files devel +%defattr(-,root,root) +%dir %{_libdir}/* +%dir %{_includedir}/quagga +%{_includedir}/quagga/*.h +%dir %{_includedir}/quagga/ospfd/* +%if %with_ospfapi +%dir %{_includedir}/quagga/ospfapi/* +%endif + +%changelog +* Tue Jun 15 2004 Elliot Lee +- rebuilt + +* Tue May 4 2004 Jay Fenlason 0.96.5-0 +- New upstream version +- Change includedir +- Change the pre scriptlet to fail if the useradd command fails. +- Remove obsolete patches from this .spec file and renumber the two + remaining ones. + +* Tue Mar 02 2004 Elliot Lee +- rebuilt + +* Fri Feb 13 2004 Jay Fenlason +- Add --enable-rtadv, to turn ipv6 router advertisement back on. Closes + bugzilla #114691 + +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Mon Nov 3 2003 Jay Fenlason 0.96.4-0 +- New upstream version +- include .h files in the -devel package. + +* Wed Oct 15 2003 Jay Fenlason 0.96.3-1 +- Patch a remote DoS attack (#107140) +- New upstream version +- Removed the .libcap patch, which was applied upstream +- Renamed the vty group from quaggavty to quaggavt because quaggavty is + too long for NIS. +- Patch the spec file to fix #106857: /etc/quagga/zebra.conf is created with + the wrong owner. +- Removed the "med" part of the 0.96.1-warnings patch for . . . +- Add a new warnings patch with a fix for #106315. This also updates + the "med" part of the previous warnings patch. + +* Mon Sep 22 2003 Jay Fenlason 0.96.2-5 +- merge sysconfig patch from 3E branch. This patch is from Kaj J. Niemi + (kajtzu at basen.net), and puts Quagga configuration options in + /etc/sysconfig/quagga, and defaults Quagga to listening on 127.0.0.1 only. + This closes #104376 +- Use /sbin/nologin for the shell of the quagga user. This closes #103320 +- Update the quagga-0.96.1-warnings.patch patch to kill a couple more + warnings. + +* Mon Sep 22 2003 Nalin Dahyabhai +- Remove the directory part of paths for PAM modules in quagga.pam, allowing + libpam to search its default directory (needed if a 64-bit libpam needs to + look in /lib64/security instead of /lib/security). + +* Tue Aug 26 2003 Jay Fenlason 0.96.2-1 +- New upstream version + +* Tue Aug 19 2003 Jay Fenlason 0.96.1-3 +- Merge from quagga-3E-branch, with a fix for #102673 and a couple + more compiler warnings quashed. + +* Wed Aug 13 2003 Jay Fenlason 0.96-1 +- added a patch (libwrap) to allow the generated Makefiles for zebra/ + and lib/ to work on AMD64 systems. For some reason make there does + not like a dependency on -lcap +- added a patch (warnings) to shut up warnings about an undefined + structure type in some function prototypes and quiet down all the + warnings about assert(ptr) on x86_64. +- Modified the upstream quagga-0.96/readhat/quagga.spec to work as an + official Red Hat package (remove user and group creation and changes + to services) +- Trimmed changelog. See the upstream .spec file for previous + changelog entries. From svn at tinysofa.org Thu Jul 1 15:40:12 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:40:12 +1000 (EST) Subject: [tinysofa-svn] r2646 - in tinysofa/snapshot: . raidtools raidtools/current raidtools/current/sources raidtools/current/specs Message-ID: <20040701154012.D18F64E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:40:12 +1000 (Fri, 02 Jul 2004) New Revision: 2646 Added: tinysofa/snapshot/raidtools/ tinysofa/snapshot/raidtools/current/ tinysofa/snapshot/raidtools/current/sources/ tinysofa/snapshot/raidtools/current/sources/raidtools-1.00.3-gcc33.patch tinysofa/snapshot/raidtools/current/sources/raidtools-1.00.3-mkraid.patch tinysofa/snapshot/raidtools/current/sources/raidtools-1.00.3-raidstop.patch tinysofa/snapshot/raidtools/current/sources/raidtools-1.00.3-s390x.patch tinysofa/snapshot/raidtools/current/sources/raidtools-1.00.3.tar.gz tinysofa/snapshot/raidtools/current/specs/ tinysofa/snapshot/raidtools/current/specs/raidtools.spec Log: - Add raidtools to snapshot from 2.0. Added: tinysofa/snapshot/raidtools/current/sources/raidtools-1.00.3-gcc33.patch =================================================================== --- tinysofa/snapshot/raidtools/current/sources/raidtools-1.00.3-gcc33.patch 2004-07-01 15:40:11 UTC (rev 2645) +++ tinysofa/snapshot/raidtools/current/sources/raidtools-1.00.3-gcc33.patch 2004-07-01 15:40:12 UTC (rev 2646) @@ -0,0 +1,59 @@ +--- raidtools-1.00.3/mkraid.c.gcc33 2003-05-22 15:59:57.000000000 -0400 ++++ raidtools-1.00.3/mkraid.c 2003-05-22 16:00:38.000000000 -0400 +@@ -171,31 +171,31 @@ + if (old_force_flag && (func == mkraid)) { + fprintf(stderr, + +-" +- WARNING! +- +- NOTE: if you are recovering a double-disk error or some other failure mode +- that made your array unrunnable but data is still intact then it's strongly +- recommended to use the lsraid utility and to read the lsraid HOWTO. +- +- If your RAID array holds useful and not yet backed up data then --force +- and the hot-add/hot-remove functionality should be used with extreme care! +- If your /etc/raidtab file is not in sync with the real array configuration, +- then --force might DESTROY ALL YOUR DATA. It's especially dangerous to use +- -f if the array is in degraded mode. +- +- If your /etc/raidtab file matches the real layout of on-disk data then +- recreating the array will not hurt your data, but be aware of the risks +- of doing this anyway: freshly created RAID1 and RAID5 arrays do a full +- resync of their mirror/parity blocks, which, if the raidtab is incorrect, +- the resync will wipe out data irrecoverably. Also, if your array is in +- degraded mode then the raidtab must match the degraded config exactly, +- otherwise you'll get the same kind of data destruction during resync. +- (see the failed-disk raidtab option.) You have been warned! +- +- [ If your array holds no data, or you have it all backed up, or if you +- know precisely what you are doing and you still want to proceed then use +- the --really-force (or -R) flag. ] ++"\n\ ++ WARNING!\n\ ++\n\ ++ NOTE: if you are recovering a double-disk error or some other failure mode\n\ ++ that made your array unrunnable but data is still intact then it's strongly\n\ ++ recommended to use the lsraid utility and to read the lsraid HOWTO.\n\ ++\n\ ++ If your RAID array holds useful and not yet backed up data then --force\n\ ++ and the hot-add/hot-remove functionality should be used with extreme care!\n\ ++ If your /etc/raidtab file is not in sync with the real array configuration,\n\ ++ then --force might DESTROY ALL YOUR DATA. It's especially dangerous to use\n\ ++ -f if the array is in degraded mode.\n\ ++\n\ ++ If your /etc/raidtab file matches the real layout of on-disk data then\n\ ++ recreating the array will not hurt your data, but be aware of the risks\n\ ++ of doing this anyway: freshly created RAID1 and RAID5 arrays do a full\n\ ++ resync of their mirror/parity blocks, which, if the raidtab is incorrect,\n\ ++ the resync will wipe out data irrecoverably. Also, if your array is in\n\ ++ degraded mode then the raidtab must match the degraded config exactly,\n\ ++ otherwise you'll get the same kind of data destruction during resync.\n\ ++ (see the failed-disk raidtab option.) You have been warned!\n\ ++\n\ ++ [ If your array holds no data, or you have it all backed up, or if you\n\ ++ know precisely what you are doing and you still want to proceed then use\n\ ++ the --really-force (or -R) flag. ]\n\ + "); + return EXIT_FAILURE; + } Added: tinysofa/snapshot/raidtools/current/sources/raidtools-1.00.3-mkraid.patch =================================================================== --- tinysofa/snapshot/raidtools/current/sources/raidtools-1.00.3-mkraid.patch 2004-07-01 15:40:11 UTC (rev 2645) +++ tinysofa/snapshot/raidtools/current/sources/raidtools-1.00.3-mkraid.patch 2004-07-01 15:40:12 UTC (rev 2646) @@ -0,0 +1,11 @@ +--- raidtools-1.00.3/mkraid.c.cfg 2003-08-22 18:47:10.000000000 -0400 ++++ raidtools-1.00.3/mkraid.c 2003-08-22 18:47:31.000000000 -0400 +@@ -244,7 +244,7 @@ + while (*args) { + for (p = cfg_head; p; p = p->next) { + if (strcmp(p->md_name, *args)) continue; +- if (check_active(cfg)) ++ if (check_active(p)) + goto abort; + if (force_flag) { + fprintf(stderr, "DESTROYING the contents of %s in 5 seconds, Ctrl-C if unsure!\n", *args); Added: tinysofa/snapshot/raidtools/current/sources/raidtools-1.00.3-raidstop.patch =================================================================== --- tinysofa/snapshot/raidtools/current/sources/raidtools-1.00.3-raidstop.patch 2004-07-01 15:40:11 UTC (rev 2645) +++ tinysofa/snapshot/raidtools/current/sources/raidtools-1.00.3-raidstop.patch 2004-07-01 15:40:12 UTC (rev 2646) @@ -0,0 +1,114 @@ +Index: raidstart.c +=================================================================== +RCS file: /cvs/devel/raidtools/raidstart.c,v +retrieving revision 1.2 +retrieving revision 1.3 +diff -u -r1.2 -r1.3 +--- raidtools-1.00.3/raidstart.c 23 Mar 2002 16:27:05 -0000 1.2 ++++ raidtools-1.00.3/raidstart.c 23 May 2003 00:38:27 -0000 1.3 +@@ -96,34 +96,9 @@ + return (EXIT_VERSION); + } + +- fp = fopen(configFile, "r"); +- if (fp == NULL) { +- fprintf(stderr, "Couldn't open %s -- %s\n", configFile, strerror(errno)); +- exit(EXIT_FAILURE); +- } +- + if (prepare_raidlib()) + return EXIT_FAILURE; + +- if (readwrite) { +- int fd; +- if (func != raidstart) { +- fprintf(stderr, "Can do --readwrite only with raidstart!\n"); +- return EXIT_FAILURE; +- } +- args = (char **)poptGetArgs(optCon); +- if (!args) { +- usage(namestart); +- exit(EXIT_FAILURE); +- } +- +- fd = open_or_die(*args); +- +- if (do_raidstart_rw (fd, *args)) +- exit(EXIT_FAILURE); +- exit(0); +- } +- + if (readonly) { + if (func != raidstop) { + fprintf(stderr, "Can do --readonly only with raidstop!\n"); +@@ -137,8 +112,60 @@ + * without parsing the config + */ + if ((func == raidstop) || (func == raidstop_ro)) { +- int fd; ++ if (!all) { ++ int fd; ++ ++ args = (char **)poptGetArgs(optCon); ++ if (!args) { ++ usage(namestart); ++ exit(EXIT_FAILURE); ++ } ++ ++ fd = open_or_die(*args); ++ ++ if (do_raidstop (fd, *args, func == raidstop ? 0:1)) ++ exit(EXIT_FAILURE); ++ exit(0); ++ } else { ++ char buf[16], *md_dev; ++ int md_num, fd; ++ ++ md_dev = &buf[0]; ++ /* scan all possible md devs we have on our one major */ ++ for(md_num = 0; md_num < 256; md_num++) { ++ sprintf(md_dev, "/dev/md%d", md_num); ++ fd = open(md_dev, O_RDWR); ++ if (fd != -1) { ++ struct stat s; ++ mdu_array_info_t info; ++ ++ fstat (fd, &s); ++ if (major (s.st_rdev) != MD_MAJOR || ++ ioctl(fd, GET_ARRAY_INFO, &info) != 0) { ++ close (fd); ++ continue; ++ } ++ ++ if (do_raidstop (fd, md_dev, func == raidstop ? 0:1) == 0) ++ fprintf (stderr, "%s: successfully stopped.\n", md_dev); ++ close (fd); ++ } ++ } ++ } ++ } ++ ++ fp = fopen(configFile, "r"); ++ if (fp == NULL) { ++ fprintf(stderr, "Couldn't open %s -- %s\n", configFile, strerror(errno)); ++ exit(EXIT_FAILURE); ++ } + ++ if (readwrite) { ++ int fd; ++ if (func != raidstart) { ++ fprintf(stderr, "Can do --readwrite only with raidstart!\n"); ++ return EXIT_FAILURE; ++ } + args = (char **)poptGetArgs(optCon); + if (!args) { + usage(namestart); +@@ -147,7 +174,7 @@ + + fd = open_or_die(*args); + +- if (do_raidstop (fd, *args, func == raidstop ? 0:1)) ++ if (do_raidstart_rw (fd, *args)) + exit(EXIT_FAILURE); + exit(0); + } Added: tinysofa/snapshot/raidtools/current/sources/raidtools-1.00.3-s390x.patch =================================================================== --- tinysofa/snapshot/raidtools/current/sources/raidtools-1.00.3-s390x.patch 2004-07-01 15:40:11 UTC (rev 2645) +++ tinysofa/snapshot/raidtools/current/sources/raidtools-1.00.3-s390x.patch 2004-07-01 15:40:12 UTC (rev 2646) @@ -0,0 +1,37 @@ +--- raidtools-1.00.3/raid_io.c.s390x 2002-12-11 18:35:14.000000000 +0100 ++++ raidtools-1.00.3/raid_io.c 2003-03-25 15:18:50.000000000 +0100 +@@ -363,7 +363,7 @@ + md_raid_info_t *array; + mdu_disk_info_t *disk; + struct stat stat_buf; +- __u32 nr_blocks; ++ unsigned long nr_blocks; + + if (!cfg) + return 1; +@@ -454,14 +454,14 @@ + } + nr_blocks >>= 1; + if (nr_blocks < MD_RESERVED_BLOCKS * 2) { +- fprintf(stderr, "%s: device too small (%dkB)\n", cfg->device_name[i], nr_blocks); ++ fprintf(stderr, "%s: device too small (%ldkB)\n", cfg->device_name[i], nr_blocks); + close(fd); + return 1; + } + + cfg->sb_block_offset[i] = MD_NEW_SIZE_BLOCKS(nr_blocks); + if (!cfg->array.param.not_persistent) { +- printf("disk %d: %s, %ukB, raid superblock at %dkB\n", i, cfg->device_name[i], nr_blocks, cfg->sb_block_offset[i]); ++ printf("disk %d: %s, %lukB, raid superblock at %dkB\n", i, cfg->device_name[i], nr_blocks, cfg->sb_block_offset[i]); + if (sanity_checks(cfg->device_name[i], fd, + cfg->sb_block_offset[i], forceSanity, + upgradeArray, cfg, 0)) { +@@ -495,7 +495,7 @@ + } + nr_blocks >>= 1; + if (nr_blocks < MD_RESERVED_BLOCKS * 2) { +- fprintf(stderr, "%s: device too small (%dkB)\n", cfg->device_name[i], nr_blocks); ++ fprintf(stderr, "%s: device too small (%ldkB)\n", cfg->device_name[i], nr_blocks); + close(fd); + return 1; + } Added: tinysofa/snapshot/raidtools/current/sources/raidtools-1.00.3.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/raidtools/current/sources/raidtools-1.00.3.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/raidtools/current/specs/raidtools.spec =================================================================== --- tinysofa/snapshot/raidtools/current/specs/raidtools.spec 2004-07-01 15:40:11 UTC (rev 2645) +++ tinysofa/snapshot/raidtools/current/specs/raidtools.spec 2004-07-01 15:40:12 UTC (rev 2646) @@ -0,0 +1,158 @@ +Summary: Tools for creating and maintaining software RAID devices. +Name: raidtools +Version: 1.00.3 +Release: 8ts +License: GPL +Group: System Environment/Base +Source: raidtools-%{version}.tar.gz +Patch: raidtools-1.00.3-s390x.patch +Patch1: raidtools-1.00.3-gcc33.patch +Patch2: raidtools-1.00.3-raidstop.patch +Patch3: raidtools-1.00.3-mkraid.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-root +BuildRequires: popt autoconf +Prereq: MAKEDEV >= 3.0 +Obsoletes: md, md-tools +Conflicts: kernel < 2.2 + +%description +The raidtools package includes the tools you need to set up and +maintain a software RAID device (using two or more disk drives in +combination for fault tolerance and improved performance) on a Linux +system. It only works with Linux 2.2 kernels and later, or with a 2.0 +kernel specifically patched with newer RAID support. + +Install raidtools if you need to set up RAID on your system. + +%prep +%setup -q +%patch -p1 -b .s390x +%patch1 -p1 -b .gcc33 +%patch2 -p1 -b .raidstop +%patch3 -p1 -b .mkraid + +%build +autoconf +autoheader +%configure --sbindir=/sbin +make %{?_smp_mflags} + +%install +rm -rf $RPM_BUILD_ROOT +mkdir -p $RPM_BUILD_ROOT/dev +make ROOTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install_bin install_doc + +#for i in 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15; do +# mknod -m 0600 $RPM_BUILD_ROOT/dev/md$i b 9 $i +#done + +%post +cd /dev +./MAKEDEV -m 16 md + +%files +%defattr(-,root,root) +/sbin/* +%{_mandir} +%doc COPYING README *.sample + +%changelog +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Fri Aug 22 2003 Doug Ledford +- Fix mkraid to check the right array before making a new array + +* Wed Jun 04 2003 Elliot Lee +- rebuilt + +* Sat May 24 2003 Doug Ledford 1.00.3-5 +- fix raidstop --all + +* Thu May 22 2003 Jeremy Katz 1.00.3-4 +- fix build with gcc 3.3 + +* Tue Mar 25 2003 Phil Knirsch 1.00.3-3 +- Fixed s390x BLKGETSIZE problem. + +* Wed Dec 11 2002 Elliot Lee 1.00.3-1 +- Use linker flags to link against popt statically, instead of by +specifying the .a filename on the cmdline. + +* Fri Jun 21 2002 Tim Powers +- automated rebuild + +* Thu May 23 2002 Tim Powers +- automated rebuild + +* Sat Mar 23 2002 Ingo Molnar +- tons of updates. + +* Wed Sep 26 2001 Bill Nottingham +- link popt in statically (#53687) + +* Mon Aug 27 2001 Doug Ledford +- Include a pared down version of the scsi_reserve library for use by + the detect_multipath program. This is to avoid a build requirement + on the scsi_reserve-devel package. + +* Tue Aug 14 2001 Doug Ledford +- Add the detect_multipath code. +- Add a buildprereq for the scsi_reserve-devel package and popt package + +* Sun Jun 24 2001 Elliot Lee +- Bump release + rebuild. + +* Thu Mar 22 2001 Erik Troan +- updated to support multipath in 2.4.2 kernel + +* Tue Aug 08 2000 Erik Troan +- removed old HOWTO from package + +* Sat Aug 05 2000 Erik Troan +- parse /etc/mtab correctly + +* Wed Jul 12 2000 Prospector +- automatic rebuild + +* Mon Jun 19 2000 Nalin Dahyabhai +- use MAKEDEV to create md devices + +* Mon Jun 19 2000 Than Ngo +- FHS fixes +- add post and preun to create and delte device + +* Fri Mar 17 2000 Erik Troan +- added patch for ia64 + +* Mon Feb 7 2000 Bill Nottingham +- handle compressed manpages + +* Wed Aug 25 1999 Cristian Gafton +- updated to 0.90 from 080399 + +* Tue Jul 27 1999 Cristian Gafton +- added patch from Jakub for fixing __NR__llseek on sparcs + +* Tue Apr 06 1999 Cristian Gafton +- updated sources from mingo + +* Sun Mar 21 1999 Cristian Gafton +- auto rebuild in the new build environment (release 2) + +* Mon Feb 08 1999 Erik Troan +- updated to 0.90 19980128 + +* Mon Oct 12 1998 Erik Troan +- backrev'd to 0.50beta10 (which works with old md) +- patched to actually work with old level md support + +* Fri Oct 09 1998 Cristian Gafton +- put some real Summary and description fields +- obsoletes the md and md-tools package that are floating around on the net + +* Sat Sep 19 1998 Jeff Johnson +- tweak description/summary for uniqueness. + +* Wed Sep 16 1998 Jeff Johnson +- repackage for RH 5.2. From svn at tinysofa.org Thu Jul 1 15:40:14 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:40:14 +1000 (EST) Subject: [tinysofa-svn] r2647 - in tinysofa/snapshot: . reiserfs-utils reiserfs-utils/current reiserfs-utils/current/sources reiserfs-utils/current/specs Message-ID: <20040701154014.C44444E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:40:14 +1000 (Fri, 02 Jul 2004) New Revision: 2647 Added: tinysofa/snapshot/reiserfs-utils/ tinysofa/snapshot/reiserfs-utils/current/ tinysofa/snapshot/reiserfs-utils/current/sources/ tinysofa/snapshot/reiserfs-utils/current/sources/reiserfsprogs-3.6.17.tar.gz tinysofa/snapshot/reiserfs-utils/current/specs/ tinysofa/snapshot/reiserfs-utils/current/specs/reiserfs-utils.spec Log: - Add reiserfs-utils to snapshot from 2.0. Added: tinysofa/snapshot/reiserfs-utils/current/sources/reiserfsprogs-3.6.17.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/reiserfs-utils/current/sources/reiserfsprogs-3.6.17.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/reiserfs-utils/current/specs/reiserfs-utils.spec =================================================================== --- tinysofa/snapshot/reiserfs-utils/current/specs/reiserfs-utils.spec 2004-07-01 15:40:12 UTC (rev 2646) +++ tinysofa/snapshot/reiserfs-utils/current/specs/reiserfs-utils.spec 2004-07-01 15:40:14 UTC (rev 2647) @@ -0,0 +1,147 @@ +Name: reiserfs-utils +Version: 3.6.17 +Release: 2ts +Summary: Tools for creating, repairing, and debugging ReiserFS filesystems. +URL: http://www.namesys.com/ +Source: ftp://namesys.com/pub/reiserfsprogs/reiserfsprogs-%{version}.tar.gz +License: GPL +Group: System Environment/Base +Prefix: %{_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-root +Epoch: 2 +# Not big-endian safe as of 2002-12-11 -ECL +ExclusiveArch: %{ix86} ia64 alpha x86_64 + +%description +The reiserfs-utils package contains a number of utilities for +creating, checking, modifying, and correcting any inconsistencies in +ReiserFS filesystems, including reiserfsck (used to repair filesystem +inconsistencies), mkreiserfs (used to initialize a partition to +contain an empty ReiserFS filesystem), debugreiserfs (used to examine +the internal structure of a filesystem, to manually repair a corrupted +filesystem, or to create test cases for reiserfsck), and some other +ReiserFS filesystem utilities. + +You should install the reiserfs-utils package if you want to use +ReiserFS on any of your partitions. + +%{name} contains reiserfsck (used to repair filesystem +%prep +%setup -n reiserfsprogs-%{version} + +%build +export CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" +find . -name "config.cache" |xargs rm -f +%configure --prefix=/ +make %{?_smp_mflags} + +%install +rm -rf $RPM_BUILD_ROOT +make install DESTDIR="$RPM_BUILD_ROOT" +mv -f $RPM_BUILD_ROOT/usr/sbin $RPM_BUILD_ROOT/sbin +mkdir -p $RPM_BUILD_ROOT%{_mandir}/man8 +install -m644 debugreiserfs/debugreiserfs.8 $RPM_BUILD_ROOT%{_mandir}/man8 +install -m644 fsck/reiserfsck.8 $RPM_BUILD_ROOT%{_mandir}/man8 +install -m644 mkreiserfs/mkreiserfs.8 $RPM_BUILD_ROOT%{_mandir}/man8 +( cd $RPM_BUILD_ROOT/sbin + ln -fs mkreiserfs mkfs.reiserfs + ln -fs reiserfsck fsck.reiserfs ) + +%files +%defattr(-,root,root) +%doc README +/sbin/debugreiserfs +/sbin/mkreiserfs +/sbin/reiserfsck +/sbin/resize_reiserfs +/sbin/reiserfstune +/sbin/mkfs.reiserfs +/sbin/fsck.reiserfs +%{_mandir}/*/* + +%clean +rm -rf $RPM_BUILD_ROOT $RPM_BUILD_DIR/%{name}-%{version} + +%changelog +* Tue Jun 15 2004 Elliot Lee +- rebuilt + +* Wed Jun 09 2004 Florian La Roche +- 3.6.17 + +* Sat Mar 06 2004 Florian La Roche +- Use %%ix86 macro, this got dropped with my previous update + +* Thu Mar 04 2004 Florian La Roche +- 3.6.13 + +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Thu Aug 28 2003 Florian La Roche +- update to 3.6.11 + +* Sat May 31 2003 Florian La Roche +- update to 3.6.8 + +* Wed Apr 30 2003 Elliot Lee 2:3.6.4-6 +- Change ExcludeArch to ExclusiveArch to better handle the future of computing + +* Thu Feb 06 2003 Phil Knirsch 2:3.6.4-5 +- Bumped release and rebuilt +- Removed s390 and s390x again until i get around fixing the bitops related + stuff (which is borken on big-endian). + +* Wed Jan 22 2003 Tim Powers 2:3.6.4-4 +- rebuilt + +* Sun Dec 01 2002 Elliot Lee 2:3.6.4-3 +- For real + +* Wed Nov 27 2002 Tim Powers 2:3.6.4-2 +- build on all arches + +* Mon Nov 11 2002 Florian La Roche +- update to 3.6.4 + +* Fri Jul 19 2002 Florian La Roche +- also compile on mainframe +- update epoch + +* Mon Jul 15 2002 Florian La Roche +- update to version 3.6.2, all additional patches are not needed anymore + +* Fri Jun 21 2002 Tim Powers +- automated rebuild + +* Thu May 23 2002 Tim Powers +- automated rebuild + +* Tue Jan 15 2002 Tim Powers +- rebuilt with tool toolchain + +* Tue Jan 15 2002 Tim Powers +- rebuilt, for some reason the build date for the binary is not + matching the build date for the SRPM. + +* Wed Apr 25 2001 Bernhard Rosenkraenzer 3.x.0j-1 +- Update to 3.x.0j + +* Mon Mar 5 2001 Bernhard Rosenkraenzer +- Update to 3.x.0f, many important fixes in fsck +- Add missing README (#30556) +- Use -v2 by default in mkreiserfs (#30556) + +* Tue Feb 07 2001 Than Ngo +- added Missing symlinks for mkfs and fsck commands (Bug #26359) + +* Tue Jan 23 2001 Bernhard Rosenkraenzer +- initial RPM +- changes from base package: + - Fix a security problem (yet another tmp file issue) + - Fix an fd leak + - Get rid of the config.cache file, it contains broken settings + - Install man pages + - Fix locations of binaries, installing this stuff to "bin" is + not really a good idea + - Fix build on alpha and ia64 From svn at tinysofa.org Thu Jul 1 15:42:09 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:42:09 +1000 (EST) Subject: [tinysofa-svn] r2682 - in tinysofa/snapshot: . unix2dos unix2dos/current unix2dos/current/sources unix2dos/current/specs Message-ID: <20040701154209.5BF304E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:42:07 +1000 (Fri, 02 Jul 2004) New Revision: 2682 Added: tinysofa/snapshot/unix2dos/ tinysofa/snapshot/unix2dos/current/ tinysofa/snapshot/unix2dos/current/sources/ tinysofa/snapshot/unix2dos/current/sources/unix2dos-2.2-manpage.patch tinysofa/snapshot/unix2dos/current/sources/unix2dos-2.2-segfault.patch tinysofa/snapshot/unix2dos/current/sources/unix2dos-2.2.src.tar.gz tinysofa/snapshot/unix2dos/current/sources/unix2dos-mkstemp.patch tinysofa/snapshot/unix2dos/current/specs/ tinysofa/snapshot/unix2dos/current/specs/unix2dos.spec Log: - Add unix2dos to snapshot from 2.0. Added: tinysofa/snapshot/unix2dos/current/sources/unix2dos-2.2-manpage.patch =================================================================== --- tinysofa/snapshot/unix2dos/current/sources/unix2dos-2.2-manpage.patch 2004-07-01 15:42:06 UTC (rev 2681) +++ tinysofa/snapshot/unix2dos/current/sources/unix2dos-2.2-manpage.patch 2004-07-01 15:42:07 UTC (rev 2682) @@ -0,0 +1,32 @@ +--- unix2dos-2.2/unix2dos.1.man Thu Jan 17 17:25:08 2002 ++++ unix2dos-2.2/unix2dos.1 Thu Jan 17 17:25:35 2002 +@@ -16,7 +16,7 @@ + .SH DESCRIPTION + + .PP +-This manual page documents dos2unix, the program that converts text ++This manual page documents unix2dos, the program that converts text + files in UNIX format to DOS format. + + .SH OPTIONS +@@ -40,7 +40,7 @@ + + .TP + .B \-c --convmode convmode +-Sets conversion mode. Simulates dos2unix under SunOS. ++Sets conversion mode. Simulates unix2dos under SunOS. + + .TP + .B \-o --oldfile file ... +@@ -71,9 +71,9 @@ + Convert and replace a.txt in ASCII conversion mode. + Convert and replace b.txt in ISO conversion mode. + .IP +-.B dos2unix a.txt -c iso b.txt ++.B unix2dos a.txt -c iso b.txt + .IP +-.B dos2unix -c ascii a.txt -c iso b.txt ++.B unix2dos -c ascii a.txt -c iso b.txt + + .LP + Convert and replace a.txt while keeping original date stamp. Added: tinysofa/snapshot/unix2dos/current/sources/unix2dos-2.2-segfault.patch =================================================================== --- tinysofa/snapshot/unix2dos/current/sources/unix2dos-2.2-segfault.patch 2004-07-01 15:42:06 UTC (rev 2681) +++ tinysofa/snapshot/unix2dos/current/sources/unix2dos-2.2-segfault.patch 2004-07-01 15:42:07 UTC (rev 2682) @@ -0,0 +1,94 @@ +--- unix2dos-2.2/unix2dos.c.segf Thu Jan 17 17:09:49 2002 ++++ unix2dos-2.2/unix2dos.c Thu Jan 17 17:12:47 2002 +@@ -131,9 +131,9 @@ + * RetVal: NULL if failure + * file stream otherwise + */ +-FILE* OpenOutFile(char *ipFN) ++FILE* OpenOutFile(int fd) + { +- return (fopen(ipFN, W_CNTRL)); ++ return (fdopen(fd, W_CNTRL)); + } + + +@@ -207,14 +207,17 @@ + char TempPath[16]; + struct stat StatBuf; + struct utimbuf UTimeBuf; ++ int fd; + + /* retrieve ipInFN file date stamp */ + if ((ipFlag->KeepDate) && stat(ipInFN, &StatBuf)) + RetVal = -1; + +- strcpy (TempPath, "./u2dtmp"); +- strcat (TempPath, "XXXXXX"); +- mkstemp (TempPath); ++ strcpy (TempPath, "./u2dtmpXXXXXX"); ++ if((fd=mkstemp (TempPath)) < 0) { ++ perror("Can't open output temp file"); ++ RetVal = -1; ++ } + + #ifdef DEBUG + fprintf(stderr, "unix2dos: using %s as temp file\n", TempPath); +@@ -225,7 +228,7 @@ + RetVal = -1; + + /* can open out file? */ +- if ((!RetVal) && (InF) && ((TempF=OpenOutFile(TempPath)) == NULL)) ++ if ((!RetVal) && (InF) && ((TempF=OpenOutFile(fd)) == NULL)) + { + fclose (InF); + RetVal = -1; +@@ -243,6 +246,9 @@ + if ((TempF) && (fclose(TempF) == EOF)) + RetVal = -1; + ++ if(fd>=0) ++ close(fd); ++ + if ((!RetVal) && (ipFlag->KeepDate)) + { + UTimeBuf.actime = StatBuf.st_atime; +@@ -286,14 +292,17 @@ + char TempPath[16]; + struct stat StatBuf; + struct utimbuf UTimeBuf; ++ int fd; + + /* retrieve ipInFN file date stamp */ + if ((ipFlag->KeepDate) && stat(ipInFN, &StatBuf)) + RetVal = -1; + +- strcpy (TempPath, "./u2dtmp"); +- strcat (TempPath, "XXXXXX"); +- mkstemp (TempPath); ++ strcpy (TempPath, "./u2dtmpXXXXXX"); ++ if((fd=mkstemp (TempPath)) < 0) { ++ perror("Can't open output temp file"); ++ RetVal = -1; ++ } + + #ifdef DEBUG + fprintf(stderr, "unix2dos: using %s as temp file\n", TempPath); +@@ -304,7 +313,7 @@ + RetVal = -1; + + /* can open out file? */ +- if ((!RetVal) && (InF) && ((TempF=OpenOutFile(TempPath)) == NULL)) ++ if ((!RetVal) && (InF) && ((TempF=OpenOutFile(fd)) == NULL)) + { + fclose (InF); + RetVal = -1; +@@ -322,6 +331,9 @@ + if ((TempF) && (fclose(TempF) == EOF)) + RetVal = -1; + ++ if(fd>=0) ++ close(fd); ++ + if ((!RetVal) && (ipFlag->KeepDate)) + { + UTimeBuf.actime = StatBuf.st_atime; Added: tinysofa/snapshot/unix2dos/current/sources/unix2dos-2.2.src.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/unix2dos/current/sources/unix2dos-2.2.src.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/unix2dos/current/sources/unix2dos-mkstemp.patch =================================================================== --- tinysofa/snapshot/unix2dos/current/sources/unix2dos-mkstemp.patch 2004-07-01 15:42:06 UTC (rev 2681) +++ tinysofa/snapshot/unix2dos/current/sources/unix2dos-mkstemp.patch 2004-07-01 15:42:07 UTC (rev 2682) @@ -0,0 +1,20 @@ +--- unix2dos-2.2/unix2dos.c.orig Fri Nov 17 13:29:24 2000 ++++ unix2dos-2.2/unix2dos.c Fri Nov 17 13:30:16 2000 +@@ -214,7 +214,7 @@ + + strcpy (TempPath, "./u2dtmp"); + strcat (TempPath, "XXXXXX"); +- mktemp (TempPath); ++ mkstemp (TempPath); + + #ifdef DEBUG + fprintf(stderr, "unix2dos: using %s as temp file\n", TempPath); +@@ -293,7 +293,7 @@ + + strcpy (TempPath, "./u2dtmp"); + strcat (TempPath, "XXXXXX"); +- mktemp (TempPath); ++ mkstemp (TempPath); + + #ifdef DEBUG + fprintf(stderr, "unix2dos: using %s as temp file\n", TempPath); Added: tinysofa/snapshot/unix2dos/current/specs/unix2dos.spec =================================================================== --- tinysofa/snapshot/unix2dos/current/specs/unix2dos.spec 2004-07-01 15:42:06 UTC (rev 2681) +++ tinysofa/snapshot/unix2dos/current/specs/unix2dos.spec 2004-07-01 15:42:07 UTC (rev 2682) @@ -0,0 +1,103 @@ +Summary: unix2dos - UNIX to DOS text file format converter +Name: unix2dos +Version: 2.2 +Release: 22ts +License: distributable +Group: Applications/Text +Source: unix2dos-2.2.src.tar.gz +Patch0: unix2dos-mkstemp.patch +Patch1: unix2dos-2.2-segfault.patch +Patch2: unix2dos-2.2-manpage.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-root + +%prep +%setup -q -c +%patch -p1 -b .sec +%patch1 -p1 -b .segf +%patch2 -p1 -b .man +perl -pi -e "s,^#endif.*,#endif,g;s,^#else.*,#else,g" *.[ch] + +%description +A utility that converts plain text files in UNIX format to DOS format. + +%build +gcc -Wall $RPM_OPT_FLAGS -ounix2dos unix2dos.c + +%install +rm -rf ${RPM_BUILD_ROOT} +mkdir -p $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man1} +install -m755 unix2dos $RPM_BUILD_ROOT%{_bindir} +install -m444 unix2dos.1 $RPM_BUILD_ROOT%{_mandir}/man1 + +%clean +rm -rf ${RPM_BUILD_ROOT} + +%files +%defattr(-,root,root,0755) +%doc COPYRIGHT +%{_bindir}/unix2dos +%{_mandir}/*/* + + +%changelog +* Tue Jun 15 2004 Elliot Lee +- rebuilt + +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Wed Jun 04 2003 Elliot Lee +- rebuilt + +* Wed Jan 22 2003 Tim Powers +- rebuilt + +* Mon Oct 7 2002 Mike A. Harris 2.2-18 +- All-arch rebuild + +* Fri Jun 21 2002 Tim Powers +- automated rebuild + +* Thu May 23 2002 Tim Powers +- automated rebuild + +* Tue Mar 5 2002 Bernhard Rosenkraenzer 2.2-15 +- rebuild + +* Thu Jan 17 2002 Bernhard Rosenkraenzer 2.2-14 +- Fix up the mkstemp patch, don't segfault with lacking write permissions + (#57700) +- Fix up man page (part 2 of #57700) +- Fix compiler warnings + +* Wed Jan 09 2002 Tim Powers +- automated rebuild + +* Sun Jun 24 2001 Elliot Lee +- Bump release + rebuild. + +* Fri Nov 17 2000 Tim Powers +- patched to use mkstemp, not much had to be done. + +* Thu Nov 16 2000 Tim Powers +- minor spec file cleanups +- built for 7.1 +- use predefined RPM macros whenever possible +- use RPM_OPT_FLAGS when building + +* Tue Jul 07 1999 Peter Soos +- Added Hungarian "Summary:" and "%description" +- Corrected the file and directory attributes to rebuild the package + under RedHat Linux 6.0 + +* Thu Jul 09 1998 Arkadiusz Mikkkkkkiewicz +- Recompiled under RedHat Linux 5.1 +- Small changes in %build and %files +- Added "Vendor:" +- Added Polish "Summary:" and "%description" + +* Thu Jun 18 1998 Peter Soos +- Corrected the spec file for rpm 2.5 + +* Fri Dec 5 1997 Peter Soos +- Recompiled under RedHat Linux 5.0 From svn at tinysofa.org Thu Jul 1 15:42:20 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:42:20 +1000 (EST) Subject: [tinysofa-svn] r2687 - in tinysofa/snapshot: . usermode usermode/current usermode/current/sources usermode/current/specs Message-ID: <20040701154220.BFD1E4E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:42:20 +1000 (Fri, 02 Jul 2004) New Revision: 2687 Added: tinysofa/snapshot/usermode/ tinysofa/snapshot/usermode/current/ tinysofa/snapshot/usermode/current/sources/ tinysofa/snapshot/usermode/current/sources/usermode-1.70-4-nodfu.patch tinysofa/snapshot/usermode/current/sources/usermode-1.70-4.tar.gz tinysofa/snapshot/usermode/current/specs/ tinysofa/snapshot/usermode/current/specs/usermode.spec Log: - Add usermode to snapshot from 2.0. Added: tinysofa/snapshot/usermode/current/sources/usermode-1.70-4-nodfu.patch =================================================================== --- tinysofa/snapshot/usermode/current/sources/usermode-1.70-4-nodfu.patch 2004-07-01 15:42:18 UTC (rev 2686) +++ tinysofa/snapshot/usermode/current/sources/usermode-1.70-4-nodfu.patch 2004-07-01 15:42:20 UTC (rev 2687) @@ -0,0 +1,25 @@ +diff -urN usermode-1.70-4/Makefile.am usermode-1.70-4.no-desktop-file-utils/Makefile.am +--- usermode-1.70-4/Makefile.am 2004-04-01 06:46:32.000000000 +1000 ++++ usermode-1.70-4.no-desktop-file-utils/Makefile.am 2004-06-22 17:52:29.752442456 +1000 +@@ -44,21 +44,6 @@ + pixmapdir = $(datadir)/pixmaps + pixmap_DATA = keys.xpm status_lock.png status_unlocked.png user_icon.png password.png disks.png keyring.png keyring-small.png + +-install-data-local: userinfo.desktop usermount.desktop userpasswd.desktop +- mkdir -p $(DESTDIR)/$(datadir)/applications +- desktop-file-install --vendor=redhat \ +- --add-category X-Red-Hat-Base \ +- --add-category Settings \ +- --add-category Application \ +- --dir=$(DESTDIR)/$(datadir)/applications \ +- userinfo.desktop userpasswd.desktop +- desktop-file-install --vendor=redhat \ +- --add-category X-Red-Hat-Base \ +- --add-category System \ +- --add-category Application \ +- --dir=$(DESTDIR)/$(datadir)/applications \ +- usermount.desktop +- + consoleappdir = $(sysconfdir)/security/console.apps + WRAPPED_APPS = halt poweroff reboot + INIT_APPS = pam_timestamp_init Added: tinysofa/snapshot/usermode/current/sources/usermode-1.70-4.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/usermode/current/sources/usermode-1.70-4.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/usermode/current/specs/usermode.spec =================================================================== --- tinysofa/snapshot/usermode/current/specs/usermode.spec 2004-07-01 15:42:18 UTC (rev 2686) +++ tinysofa/snapshot/usermode/current/specs/usermode.spec 2004-07-01 15:42:20 UTC (rev 2687) @@ -0,0 +1,597 @@ +%if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} +%define WITH_SELINUX 1 +%endif + +%define build6x 0 +Summary: Tools for certain user account management tasks. +Name: usermode +Version: 1.70 +Release: 4ts +License: GPL +Group: Applications/System +Source: usermode-%{version}-4.tar.gz +Patch: usermode-1.70-4-nodfu.patch +%if %{build6x} +Requires: util-linux, pam >= 0.66-5 +%else +Requires: util-linux, pam >= 0.75-37, /etc/pam.d/system-auth +%endif +Conflicts: SysVinit < 2.74-14 +BuildPrereq: glib2-devel, gtk2-devel +BuildPrereq: libglade2-devel, libuser-devel, pam-devel, util-linux +%if %{WITH_SELINUX} +BuildPrereq: libselinux-devel +%endif +BuildRoot: %{_tmppath}/%{name}-%{version}-root + +%package gtk +Summary: Graphical tools for certain user account management tasks. +Group: Applications/System +Requires: %{name} = %{version}-%{release} + +%description +The usermode package contains the userhelper program, which can be +used to allow configured programs to be run with superuser privileges +by ordinary users. + +%description gtk +The usermode-gtk package contains several graphical tools for users: +userinfo, usermount and userpasswd. Userinfo allows users to change +their finger information. Usermount lets users mount, unmount, and +format filesystems. Userpasswd allows users to change their +passwords. + +Install the usermode-gtk package if you would like to provide users with +graphical tools for certain account management tasks. + +%prep +%setup -q -n %{name}-%{version}-4 +%patch -p1 + +%build +libtoolize --force +aclocal --force +automake -a -c -f +autoconf -f +%configure \ +%if %{WITH_SELINUX} + --with-selinux +%endif + +make + +%install +rm -rf $RPM_BUILD_ROOT +make install DESTDIR=$RPM_BUILD_ROOT + +# We set up the shutdown programs to be wrapped in this package. Other +# packages are on their own.... +mkdir -p $RPM_BUILD_ROOT/etc/pam.d $RPM_BUILD_ROOT/etc/security/console.apps +for wrappedapp in halt reboot poweroff ; do + ln -s consolehelper $RPM_BUILD_ROOT%{_bindir}/${wrappedapp} + install -m644 $wrappedapp $RPM_BUILD_ROOT/etc/security/console.apps/${wrappedapp} +%if %{build6x} + cp shutdown.pamd.6x $RPM_BUILD_ROOT/etc/pam.d/${wrappedapp} +%else + cp shutdown.pamd $RPM_BUILD_ROOT/etc/pam.d/${wrappedapp} +%endif +done +%if ! %{build6x} +rm -f $RPM_BUILD_ROOT/%{_bindir}/shutdown +%endif + +%find_lang %{name} + +%clean +rm -rf $RPM_BUILD_ROOT + +%files -f %{name}.lang +%defattr(-,root,root) +%attr(4711,root,root) /usr/sbin/userhelper +%{_bindir}/consolehelper +%{_mandir}/man8/userhelper.8* +%{_mandir}/man8/consolehelper.8* +# PAM console wrappers +%{_bindir}/halt +%{_bindir}/reboot +%{_bindir}/poweroff +%if %{build6x} +%{_bindir}/shutdown +%endif +%config(noreplace) /etc/pam.d/halt +%config(noreplace) /etc/pam.d/reboot +%config(noreplace) /etc/pam.d/poweroff +%config /etc/security/console.apps/halt +%config /etc/security/console.apps/reboot +%config /etc/security/console.apps/poweroff + +%files gtk +%defattr(-,root,root) +%{_bindir}/usermount +%{_mandir}/man1/usermount.1* +%{_bindir}/userinfo +%{_mandir}/man1/userinfo.1* +%{_bindir}/userpasswd +%{_mandir}/man1/userpasswd.1* +%{_bindir}/consolehelper-gtk +%{_bindir}/pam-panel-icon +%{_datadir}/%{name} +%{_datadir}/pixmaps/* + +%changelog +* Tue May 25 2004 Dan Walsh 1.70-4 +- Support new policy files + +* Thu May 20 2004 Dan Walsh 1.70-3 +- Change user context to default name if username context not in passwd file + +* Thu Apr 1 2004 Dan Walsh 1.70-1 +- Change user context to "root" if username context "user_t" not in passwd file + +* Wed Mar 31 2004 Nalin Dahyabhai 1.70-1 +- fix accidental mixup of role and type setting up new selinux context +- log the new selinux context if we're running an app in a new selinux context + +* Sat Feb 21 2004 Dan Walsh 1.69-5 +- Change to fall back to root auth if selinux user does not exist + +* Tue Jan 27 2004 Dan Walsh 1.69-4 +- fix call to is_selinux_enabled + +* Mon Dec 8 2003 Nalin Dahyabhai +- fix warning in userinfo which would cause random early exit (#111409) +- clean up warnings + +* Tue Nov 25 2003 Dan Walsh 1.69-3.sel +- Fix handling of roles from console file + +* Fri Nov 14 2003 Nalin Dahyabhai +- don't disable use of deprecated GLib and GTK+ APIs, reported by the + mysterious Pierre-with-no-last-name + +* Thu Oct 30 2003 Dan Walsh 1.69-2.sel +- Turn on sleinux + +* Thu Oct 23 2003 Nalin Dahyabhai 1.69-1 +- all around: cleanups +- consolehelper: coalesce multiple messages from PAM again +- usermount: handle user-not-allowed-to-control-mounts error correctly (#100457) +- userhelper: trim off terminating commas when changing chfn info + +* Mon Oct 6 2003 Dan Walsh 1.68-8 + +* Wed Oct 1 2003 Dan Walsh 1.68-7.sel +- Fix to use /etc instead of /usr/etc + +* Thu Sep 25 2003 Dan Walsh 1.68-6.sel +- turn on selinux +- add default userhelper context file + +* Thu Sep 25 2003 Nalin Dahyabhai 1.68-6 +- make selinux a configure option to avoid screwing with makefiles + +* Thu Sep 25 2003 Nalin Dahyabhai 1.68-5 +- rebuild + +* Mon Sep 8 2003 Dan Walsh 1.68-4 +- turn off selinux + +* Fri Sep 5 2003 Dan Walsh 1.68-3.sel +- turn on selinux + +* Tue Jul 29 2003 Dan Walsh 1.68-2 +- Add SELinux support + +* Wed Apr 16 2003 Nalin Dahyabhai 1.68-1 +- update translations +- suppress the error dialog from user cancel + +* Mon Feb 24 2003 Elliot Lee +- rebuilt + +* Thu Feb 20 2003 Nalin Dahyabhai 1.67-1 +- work around GTK+ clearing DESKTOP_STARTUP_ID at gtk_init() time, so that + startup notification actually works (#84684) + +* Wed Feb 19 2003 Nalin Dahyabhai 1.66-1 +- consolehelper-gtk: complete startup notification at startup +- userhelper: pass startup notification data to consolehelper-gtk +- consolehelper-gtk: setup startup notification for children if userhelper + requests it + +* Mon Jan 27 2003 Nalin Dahyabhai 1.65-2 +- rebuild + +* Mon Jan 20 2003 Nalin Dahyabhai 1.65-1 +- pass-through DESKTOP_STARTUP_ID + +* Mon Jan 6 2003 Nalin Dahyabhai 1.64-1 +- set the requesting user PAM item to the invoking user's name (#81255) + +* Mon Nov 11 2002 Nalin Dahyabhai 1.63-2 +- remove directory names from PAM config files, allowing the same config + files to work for both arches on multilib boxes +- translation updates + +* Wed Sep 4 2002 Nalin Dahyabhai 1.63-1 +- userhelper: swallow the exec'd program's exit status, which would be + misinterpreted by consolehelper anyway + +* Tue Sep 3 2002 Nalin Dahyabhai 1.62-1 +- consolehelper: suppress dialog on successful execution +- userhelper: return 0 on success, not 1 (what was I *thinking*?) + +* Mon Sep 2 2002 Nalin Dahyabhai 1.61-1 +- userinfo: exit properly on escape. handle site_info field properly. go + insensitive while running child process. +- userpasswd: exit properly on cancel. +- all of the above: reap the child instead of checking for pipe close -- this + way is more robust (#68578,72684). +- usermount: run mount/umount synchronously. capture stderr and display in a + dialog. desensitize action buttons when no filesystems are selected. +- consolehelper: display errors if we're attempting to run bogus programs + (#72127) +- translation updates (#70278) + +* Wed Aug 14 2002 Nalin Dahyabhai 1.60-1 +- reconnect the "cancel" and "ok" buttons in userinfo +- heed the cancel button when prompting for passwords in userinfo (#68578) +- translation update + +* Wed Aug 14 2002 Nalin Dahyabhai 1.59-2 +- change "forget password" to "forget authorization", because we don't actually + remember the password (that would be scary, #71476) +- translation update + +* Tue Aug 13 2002 Nalin Dahyabhai 1.59-1 +- pam-panel-icon: overhaul, change the 'locked' icon to keyring-small, nix the + 'unlocked' icon +- consolehelper-gtk: properly set up the dialog buttons (should be 'cancel/ok' + when we're asking questions, was always 'close') +- disappear pam_timestamp_init + +* Wed Aug 7 2002 Nalin Dahyabhai 1.58-2 +- install the new 'unlocked' icon + +* Tue Aug 6 2002 Jonathan Blandford +- New version. + +* Mon Aug 5 2002 Nalin Dahyabhai 1.57-1 +- add support for BANNER and BANNER_DOMAIN in the userhelper configuration + +* Mon Aug 5 2002 Nalin Dahyabhai 1.56-4 +- mark strings in the .glade file as translatable (#70278) +- translation updates + +* Wed Jul 31 2002 Nalin Dahyabhai 1.56-3 +- add icons for userpasswd and usermount + +* Wed Jul 24 2002 Nalin Dahyabhai 1.56-2 +- actually include the icons +- translation updates + +* Tue Jul 23 2002 Nalin Dahyabhai 1.56-1 +- userinfo: prevent users from selecting "nologin" as a shell (#68579) +- don't strip binaries by default; leave that to the buildroot policy +- use desktop-file-install + +* Wed Jun 19 2002 Havoc Pennington +- put pam-panel-icon in file list + +* Mon May 20 2002 Nalin Dahyabhai 1.55-2 +- don't strip binaries which have no special privileges + +* Wed May 15 2002 Nalin Dahyabhai 1.55-1 +- remove the pixmap we don't use any more (we use stock pixmaps now) +- update translations + +* Thu Apr 16 2002 Nalin Dahyabhai 1.54-1 +- suppress even error messages from Xlib when consolehelper calls + gtk_init_check() to see if the display is available + +* Mon Apr 15 2002 Nalin Dahyabhai 1.53-2 +- refresh translations + +* Thu Apr 11 2002 Nalin Dahyabhai 1.53-1 +- refresh shell variable code from authconfig (#63175) + +* Tue Apr 9 2002 Nalin Dahyabhai 1.52-2 +- refresh translations + +* Mon Apr 1 2002 Nalin Dahyabhai 1.52-1 +- attempt to make prompts at the console more meaningful +- when falling back, reset the entire environment to the user's + +* Thu Mar 28 2002 Nalin Dahyabhai +- stop giving the user chances to enter the right password if we get a + conversation error reading a response (appears to be masked by libpam) + (#62195) +- always center consolehelper dialog windows + +* Wed Mar 27 2002 Nalin Dahyabhai 1.51-1 +- patch to make gettext give us UTF-8 strings (which GTK needs) from ynakai + +* Fri Mar 22 2002 Nalin Dahyabhai 1.50-6 +- update translations +- actually include the glade files (#61665) + +* Mon Mar 11 2002 Nalin Dahyabhai 1.50-5 +- update translations + +* Mon Feb 25 2002 Nalin Dahyabhai 1.50-4 +- rebuild + +* Fri Feb 22 2002 Nalin Dahyabhai 1.50-3 +- update translations + +* Thu Jan 31 2002 Nalin Dahyabhai 1.50-2 +- rebuild to fix dependencies + +* Thu Jan 31 2002 Nalin Dahyabhai 1.50-1 +- fix userpasswd dialog message being incorrect for password changes +- use a dumb conversation function when text mode is invoked without a tty -- if + the service's configuration doesn't call for prompts, then it'll still work +- port from pwdb to libuser +- catch child-exit errors correctly again +- fix keyboard-grabbing + +* Wed Jan 23 2002 Nalin Dahyabhai 1.49-3 +- add default locations for certain binaries to configure.in + +* Thu Jan 3 2002 Nalin Dahyabhai 1.49-2 +- munge glade file to use stock items for buttons where possible + +* Mon Dec 10 2001 Nalin Dahyabhai 1.49-1 +- the console.apps configs shouldn't be missingok +- fix buildprereqs for gtk2/libglade2 + +* Tue Dec 4 2001 Nalin Dahyabhai +- more gtk2 changes +- split off a -gtk subpackage with all of the gtk-specific functionality + +* Wed Nov 28 2001 Nalin Dahyabhai +- the grand libglade/gtk2 overhaul +- allow disabling display of GUI windows by setting "GUI=false" in the + console.apps configuration file (default: TRUE) +- allow disabling display of GUI windows by recognizing a magic option + on the command-line of the program being wrapped (NOXOPTION, no default) + +* Fri Nov 9 2001 Nalin Dahyabhai 1.46-1 +- restore the previous XAUTHORITY setting before opening PAM sessions + +* Fri Nov 2 2001 Nalin Dahyabhai 1.45-1 +- propagate environment variables from libpam to applications + +* Fri Oct 3 2001 Nalin Dahyabhai 1.44-1 +- only try to call gtk_main_quit() if we've got a loop to get out of (#54109) +- obey RPM_OPT_FLAGS, obey + +* Tue Aug 28 2001 Trond Eivind Glomsr?d 1.43-1 +- Update translations + +* Mon Aug 6 2001 Nalin Dahyabhai +- add build requirements on glib-devel, gtk+-devel, pam-devel (#49726) + +* Sun Jun 24 2001 Elliot Lee +- Bump release + rebuild. + +* Wed Feb 14 2001 Preston Brown +- final translation merge. + +* Wed Feb 14 2001 Nalin Dahyabhai +- clear the supplemental groups list before running binaries as root (#26851) + +* Wed Feb 7 2001 Nalin Dahyabhai +- set XAUTHORITY if we fall back to regular behavior (#26343) +- make the suid helper 04711 instead of 04755 + +* Mon Feb 5 2001 Nalin Dahyabhai +- refresh translations + +* Mon Jan 29 2001 Preston Brown +- use lang finding script. + +* Thu Jan 25 2001 Yukihiro Nakai +- Some fix for Japanese environment. +- Use gtk_set_locale() instead of setlocale() +- Copyright update. + +* Sun Jan 7 2001 Yukihiro Nakai +- Add gettextized + +* Thu Nov 2 2000 Nalin Dahyabhai +- fix segfault in userhelper (#20027) + +* Tue Oct 24 2000 Nalin Dahyabhai +- /sbin/shutdown, not /usr/sbin/shutdown (#19034) + +* Fri Oct 6 2000 Nalin Dahyabhai +- don't pass on arguments to halt and reboot, because they error out + +* Thu Oct 5 2000 Nalin Dahyabhai +- fix the /usr/bin/shutdown wrapper so that root can call shutdown +- only include the /usr/bin/shutdown wrapper on 6.x +- also sanitize LC_MESSAGES +- tweak sanitizing checks (from mkj) + +* Wed Oct 4 2000 Jakub Jelinek +- fix a security bug with LC_ALL/LANG variables (#18046) + +* Mon Aug 28 2000 Nalin Dahyabhai +- mark defined strings translateable (#17006) + +* Thu Aug 24 2000 Nalin Dahyabhai +- fix incorrect user name +- add a shell wrapper version of /usr/bin/shutdown +- build for 6.x errata +- bump revision to upgrade the errata + +* Wed Aug 23 2000 Nalin Dahyabhai +- fix stdin/stdout redirection shenanigans (#11706) +- fix authentication and execution as users other than root +- make sure the right descriptors are terminals before dup2()ing them +- cut out an extra-large CPU waster that breaks GUI apps + +* Mon Aug 21 2000 Nalin Dahyabhai +- fix typo (#16664) + +* Sun Aug 20 2000 Nalin Dahyabhai +- previous fix, part two + +* Sat Aug 19 2000 Nalin Dahyabhai +- fix inadvertent breakage of the shell-changing code + +* Fri Aug 18 2000 Nalin Dahyabhai +- fix the "run unprivileged" option + +* Mon Aug 14 2000 Nalin Dahyabhai +- actually use the right set of translations + +* Fri Aug 11 2000 Nalin Dahyabhai +- remove the shutdown command from the list of honored commands + +* Wed Aug 9 2000 Nalin Dahyabhai +- merge in updated translations +- set XAUTHORITY after successful authentication (#11006) + +* Wed Aug 2 2000 Nalin Dahyabhai +- install translations +- fixup a messy text string +- make "Mount"/"Unmount" translatable +- stop prompting for passwords to shut down -- we can hit ctrl-alt-del anyway, + and gdm users can just shut down without logging in + +* Mon Jul 31 2000 Nalin Dahyabhai +- attempt to add i18n support + +* Wed Jul 12 2000 Nalin Dahyabhai +- attempt to get a usable icon for userhelper-wrap (#13616, #13768) + +* Wed Jul 5 2000 Nalin Dahyabhai +- fix them right this time + +* Mon Jul 3 2000 Nalin Dahyabhai +- fix verbosity problems + +* Mon Jun 19 2000 Nalin Dahyabhai +- strip all binaries by default +- add the name of the program being run to the userhelper dialog +- add a graphic to the userhelper-wrap package +- add a button to jump straight to nonprivileged operation when supported + +* Sun Jun 18 2000 Matt Wilson +- rebuilt to see if we get stripped binaries + +* Mon Jun 5 2000 Nalin Dahyabhai +- move man pages to %%{_mandir} + +* Thu Jun 1 2000 Nalin Dahyabhai +- modify PAM setup to use system-auth +- bzip2 compress tarball + +* Fri Mar 17 2000 Ngo Than +- fix problem with LANG and LC_ALL +- compress source with bzip2 + +* Thu Mar 09 2000 Nalin Dahyabhai +- fix problem parsing userhelper's -w flag with other args + +* Wed Mar 08 2000 Nalin Dahyabhai +- ignore read() == 0 because the child exits + +* Tue Mar 07 2000 Nalin Dahyabhai +- queue notice messages until we get prompts in userhelper to fix bug #8745 + +* Fri Feb 03 2000 Nalin Dahyabhai +- free trip through the build system + +* Tue Jan 11 2000 Nalin Dahyabhai +- grab keyboard input focus for dialogs + +* Fri Jan 07 2000 Michael K. Johnson +- The root exploit fix created a bug that only showed up in certain + circumstances. Unfortunately, we didn't test in those circumstances... + +* Mon Jan 03 2000 Michael K. Johnson +- fixed local root exploit + +* Thu Sep 30 1999 Michael K. Johnson +- fixed old complex broken gecos parsing, replaced with simple working parsing +- can now blank fields (was broken by previous fix for something else...) + +* Tue Sep 21 1999 Michael K. Johnson +- FALLBACK/RETRY in consolehelper/userhelper +- session management fixed for consolehelper/userhelper SESSION=true +- fix memory leak and failure to close in error condition (#3614) +- fix various bugs where not all elements in userinfo got set + +* Mon Sep 20 1999 Michael K. Johnson +- set $HOME when acting as consolehelper +- rebuild against new pwdb + +* Tue Sep 14 1999 Michael K. Johnson +- honor "owner" flag to mount +- ask for passwords with username + +* Tue Jul 06 1999 Bill Nottingham +- import pam_console wrappers from SysVinit, since they require usermode + +* Mon Apr 12 1999 Michael K. Johnson +- even better check for X availability + +* Wed Apr 07 1999 Michael K. Johnson +- better check for X availability +- center windows to make authentication easier (improve later with + transients and embedded windows where possible) +- applink -> applnk +- added a little padding, especially important when running without + a window manager, as happens when running from session manager at + logout time + +* Wed Mar 31 1999 Michael K. Johnson +- hm, need to be root... + +* Fri Mar 19 1999 Michael K. Johnson +- updated userhelper.8 man page for consolehelper capabilities +- moved from wmconfig to desktop entries + +* Thu Mar 18 1999 Michael K. Johnson +- added consolehelper +- Changed conversation architecture to follow PAM spec + +* Wed Mar 17 1999 Bill Nottingham +- remove gdk_input_remove (causing segfaults) + +* Tue Jan 12 1999 Michael K. Johnson +- fix missing include files + +* Mon Oct 12 1998 Cristian Gafton +- strip binaries +- use defattr +- fix spec file ( rm -rf $(RPM_BUILD_ROOT) is a stupid thing to do ! ) + +* Tue Oct 06 1998 Preston Brown +- fixed so that the close button on window managers quits the program properly + +* Thu Apr 16 1998 Erik Troan +- use gtk-config during build +- added make archive rule to Makefile +- uses a build root + +* Fri Nov 7 1997 Otto Hammersmith +- new version that fixed memory leak bug. + +* Mon Nov 3 1997 Otto Hammersmith +- updated version to fix bugs + +* Fri Oct 17 1997 Otto Hammersmith +- Wrote man pages for userpasswd and userhelper. + +* Tue Oct 14 1997 Otto Hammersmith +- Updated the packages... now includes userpasswd for changing passwords + and newer versions of usermount and userinfo. No known bugs or + misfeatures. +- Fixed the file list... + +* Mon Oct 6 1997 Otto Hammersmith +- Created the spec file. From svn at tinysofa.org Thu Jul 1 15:42:14 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:42:14 +1000 (EST) Subject: [tinysofa-svn] r2684 - in tinysofa/snapshot: . unzip unzip/current unzip/current/sources unzip/current/specs Message-ID: <20040701154214.217254E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:42:13 +1000 (Fri, 02 Jul 2004) New Revision: 2684 Added: tinysofa/snapshot/unzip/ tinysofa/snapshot/unzip/current/ tinysofa/snapshot/unzip/current/sources/ tinysofa/snapshot/unzip/current/sources/unzip-5.51-near-4GB.patch tinysofa/snapshot/unzip/current/sources/unzip542-rpmoptflags.patch tinysofa/snapshot/unzip/current/sources/unzip551.tar.gz tinysofa/snapshot/unzip/current/specs/ tinysofa/snapshot/unzip/current/specs/unzip.spec Log: - Add unzip to snapshot from 2.0. Added: tinysofa/snapshot/unzip/current/sources/unzip-5.51-near-4GB.patch =================================================================== --- tinysofa/snapshot/unzip/current/sources/unzip-5.51-near-4GB.patch 2004-07-01 15:42:11 UTC (rev 2683) +++ tinysofa/snapshot/unzip/current/sources/unzip-5.51-near-4GB.patch 2004-07-01 15:42:13 UTC (rev 2684) @@ -0,0 +1,344 @@ +diff -ur unzip-5.51/extract.c unzip-5.51-lhh/extract.c +--- unzip-5.51/extract.c 2004-04-15 20:58:00.000000000 -0400 ++++ unzip-5.51-lhh/extract.c 2004-06-18 16:26:57.000000000 -0400 +@@ -299,16 +299,16 @@ + __GDEF + { + unsigned i, j; +- long cd_bufstart; ++ ulg cd_bufstart; + uch *cd_inptr; + int cd_incnt; + ulg filnum=0L, blknum=0L; + int reached_end, no_endsig_found; + int error, error_in_archive=PK_COOL; + int *fn_matched=NULL, *xn_matched=NULL; +- unsigned members_processed; ++ ulg members_processed; + ulg num_skipped=0L, num_bad_pwd=0L; +- LONGINT old_extra_bytes = 0L; ++ ulg old_extra_bytes = 0L; + #ifdef SET_DIR_ATTRIB + unsigned num_dirs=0; + direntry *dirlist=(direntry *)NULL, **sorted_dirlist=(direntry **)NULL; +@@ -539,7 +539,7 @@ + G.cur_zipfile_bufstart = ftell((FILE *)G.zipfd); + #else /* !USE_STRM_INPUT */ + G.cur_zipfile_bufstart = +- lseek(G.zipfd, (LONGINT)cd_bufstart, SEEK_SET); ++ lseek64(G.zipfd, (ulg)cd_bufstart, SEEK_SET); + #endif /* ?USE_STRM_INPUT */ + read(G.zipfd, (char *)G.inbuf, INBUFSIZ); /* been here before... */ + G.inptr = cd_inptr; +@@ -902,7 +902,7 @@ + unsigned i; + int renamed, query; + int skip_entry; +- long bufstart, inbuf_offset, request; ++ ulg bufstart, inbuf_offset, request; + int error, errcode; + + /* possible values for local skip_entry flag: */ +@@ -936,7 +936,8 @@ + Trace((stderr, + "debug: bufstart = %ld, cur_zipfile_bufstart = %ld\n", + bufstart, G.cur_zipfile_bufstart)); +- if (request < 0) { ++ if (request > MAX_ZIP_SIZE) { /* > 2^32 - 8193 */ ++ printf("request = 0x%lu\n", (ulg)request); + Info(slide, 0x401, ((char *)slide, LoadFarStringSmall(SeekMsg), + G.zipfn, LoadFarString(ReportMsg))); + error_in_archive = PK_ERR; +@@ -954,7 +955,8 @@ + "debug: bufstart = %ld, cur_zipfile_bufstart = %ld\n", + bufstart, G.cur_zipfile_bufstart)); + /* try again */ +- if (request < 0) { ++ if (request > MAX_ZIP_SIZE) { /* > 2^32 - 8193 */ ++ printf("retry - request = 0x%lu\n", (ulg)request); + Trace((stderr, + "debug: recompensated request still < 0\n")); + Info(slide, 0x401, ((char *)slide, +@@ -976,7 +978,7 @@ + G.cur_zipfile_bufstart = ftell((FILE *)G.zipfd); + #else /* !USE_STRM_INPUT */ + G.cur_zipfile_bufstart = +- lseek(G.zipfd, (LONGINT)bufstart, SEEK_SET); ++ lseek64(G.zipfd, (ulg)bufstart, SEEK_SET); + #endif /* ?USE_STRM_INPUT */ + if ((G.incnt = read(G.zipfd,(char *)G.inbuf,INBUFSIZ)) <= 0) + { +diff -ur unzip-5.51/fileio.c unzip-5.51-lhh/fileio.c +--- unzip-5.51/fileio.c 2004-05-22 21:01:20.000000000 -0400 ++++ unzip-5.51-lhh/fileio.c 2004-06-18 16:26:57.000000000 -0400 +@@ -112,6 +112,8 @@ + /****************************/ + /* Strings used in fileio.c */ + /****************************/ ++static ZCONST char Far ZipFileTooBig[] = ++ "error: Zip file too big (greater than %lu bytes)\n"; + + static ZCONST char Far CannotOpenZipfile[] = + "error: cannot open zipfile [ %s ]\n %s"; +@@ -183,6 +185,7 @@ + int open_input_file(__G) /* return 1 if open failed */ + __GDEF + { ++ struct stat64 sb; + /* + * open the zipfile for reading and in BINARY mode to prevent cr/lf + * translation, which would corrupt the bitstreams +@@ -201,9 +204,9 @@ + G.zipfd = fopen(G.zipfn, FOPR); + #else /* !USE_STRM_INPUT */ + # ifdef O_BINARY +- G.zipfd = open(G.zipfn, O_RDONLY | O_BINARY); ++ G.zipfd = open(G.zipfn, O_RDONLY | O_BINARY | O_LARGEFILE); + # else +- G.zipfd = open(G.zipfn, O_RDONLY); ++ G.zipfd = open(G.zipfn, O_RDONLY | O_LARGEFILE); + # endif + #endif /* ?USE_STRM_INPUT */ + #endif /* ?CMS_MVS */ +@@ -221,6 +224,13 @@ + G.zipfn, strerror(errno))); + return 1; + } ++ ++ fstat64(G.zipfd, &sb); ++ if (sb.st_size > MAX_ZIP_SIZE) { ++ Info(slide, 0x401, ((char *)slide, ++ LoadFarString(ZipFileTooBig), ++ ((ulg)MAX_ZIP_SIZE))); ++ } + return 0; + + } /* end function open_input_file() */ +@@ -238,6 +248,7 @@ + int open_outfile(__G) /* return 1 if fail */ + __GDEF + { ++ int fd; + #ifdef DLL + if (G.redirect_data) + return (redirect_outfile(__G) == FALSE); +@@ -259,7 +270,7 @@ + } + #endif /* BORLAND_STAT_BUG */ + #ifdef SYMLINKS +- if (SSTAT(G.filename, &G.statbuf) == 0 || lstat(G.filename,&G.statbuf) == 0) ++ if (SSTAT(G.filename, &G.statbuf) == 0 || lstat64(G.filename,&G.statbuf) == 0) + #else + if (SSTAT(G.filename, &G.statbuf) == 0) + #endif /* ?SYMLINKS */ +@@ -413,7 +424,9 @@ + #endif /* NOVELL_BUG_FAILSAFE */ + Trace((stderr, "open_outfile: doing fopen(%s) for writing\n", + FnFilter1(G.filename))); +- if ((G.outfile = fopen(G.filename, FOPW)) == (FILE *)NULL) { ++ ++ fd = open(G.filename, O_WRONLY | O_LARGEFILE | O_CREAT); ++ if ((G.outfile = fdopen(fd, FOPW)) == (FILE *)NULL) { + Info(slide, 0x401, ((char *)slide, LoadFarString(CannotCreateFile), + FnFilter1(G.filename))); + return 1; +@@ -657,7 +670,7 @@ + + int seek_zipf(__G__ abs_offset) + __GDEF +- LONGINT abs_offset; ++ ulg abs_offset; + { + /* + * Seek to the block boundary of the block which includes abs_offset, +@@ -678,11 +691,11 @@ + * PK_EOF if seeking past end of zipfile + * PK_OK when seek was successful + */ +- LONGINT request = abs_offset + G.extra_bytes; +- LONGINT inbuf_offset = request % INBUFSIZ; +- LONGINT bufstart = request - inbuf_offset; ++ ulg request = abs_offset + G.extra_bytes; ++ ulg inbuf_offset = request % INBUFSIZ; ++ ulg bufstart = request - inbuf_offset; + +- if (request < 0) { ++ if (request > (ulg)MAX_ZIP_SIZE) { + Info(slide, 1, ((char *)slide, LoadFarStringSmall(SeekMsg), + G.zipfn, LoadFarString(ReportMsg))); + return(PK_BADERR); +@@ -694,7 +707,7 @@ + fseek(G.zipfd, (LONGINT)bufstart, SEEK_SET); + G.cur_zipfile_bufstart = ftell(G.zipfd); + #else /* !USE_STRM_INPUT */ +- G.cur_zipfile_bufstart = lseek(G.zipfd, (LONGINT)bufstart, SEEK_SET); ++ G.cur_zipfile_bufstart = lseek64(G.zipfd, bufstart, SEEK_SET); + #endif /* ?USE_STRM_INPUT */ + Trace((stderr, + " request = %ld, (abs+extra) = %ld, inbuf_offset = %ld\n", +@@ -1850,7 +1863,7 @@ + Trace((stderr, "check_for_newer: doing lstat(%s)\n", + FnFilter1(filename))); + /* GRR OPTION: could instead do this test ONLY if G.symlnk is true */ +- if (lstat(filename, &G.statbuf) == 0) { ++ if (lstat64(filename, &G.statbuf) == 0) { + Trace((stderr, + "check_for_newer: lstat(%s) returns 0: symlink does exist\n", + FnFilter1(filename))); +@@ -1867,7 +1880,7 @@ + + #ifdef SYMLINKS + /* GRR OPTION: could instead do this test ONLY if G.symlnk is true */ +- if (lstat(filename, &G.statbuf) == 0 && S_ISLNK(G.statbuf.st_mode)) { ++ if (lstat64(filename, &G.statbuf) == 0 && S_ISLNK(G.statbuf.st_mode)) { + Trace((stderr, "check_for_newer: %s is a symbolic link\n", + FnFilter1(filename))); + if (QCOND2 && !IS_OVERWRT_ALL) +diff -ur unzip-5.51/globals.h unzip-5.51-lhh/globals.h +--- unzip-5.51/globals.h 2004-02-25 20:23:18.000000000 -0500 ++++ unzip-5.51-lhh/globals.h 2004-06-18 16:26:57.000000000 -0400 +@@ -247,16 +247,20 @@ + #else + int zipfd; /* zipfile file handle */ + #endif +- LONGINT ziplen; +- LONGINT cur_zipfile_bufstart; /* extract_or_test, readbuf, ReadByte */ +- LONGINT extra_bytes; /* used in unzip.c, misc.c */ ++ ulg ziplen; ++ ulg cur_zipfile_bufstart; /* extract_or_test, readbuf, ReadByte */ ++ ulg extra_bytes; /* used in unzip.c, misc.c */ + uch *extra_field; /* Unix, VMS, Mac, OS/2, Acorn, ... */ + uch *hold; + + local_file_hdr lrec; /* used in unzip.c, extract.c */ + cdir_file_hdr crec; /* used in unzip.c, extract.c, misc.c */ + ecdir_rec ecrec; /* used in unzip.c, extract.c */ +- struct stat statbuf; /* used by main, mapname, check_for_newer */ ++#ifdef _LARGEFILE64_SOURCE ++ struct stat64 statbuf; /* used by main, mapname, check_for_newer */ ++#else ++ struct stat statbuf; /* used by main, mapname, check_for_newer */ ++#endif + + int mem_mode; + uch *outbufptr; /* extract.c static */ +diff -ur unzip-5.51/list.c unzip-5.51-lhh/list.c +--- unzip-5.51/list.c 2004-03-01 14:03:02.000000000 -0500 ++++ unzip-5.51-lhh/list.c 2004-06-21 12:57:05.000000000 -0400 +@@ -62,7 +62,7 @@ + "%8lu %-7s%8lu %4s %02u%c%02u%c%02u %02u:%02u %08lx %c"; + static ZCONST char Far LongFileTrailer[] = + "-------- ------- --- \ +- -------\n%8lu %8lu %4s %lu file%s\n"; ++ -------\n%8llu %8llu %4s %lu file%s\n"; + #ifdef OS2_EAS + static ZCONST char Far ShortHdrStats[] = + "%9lu %6lu %6lu %02u%c%02u%c%02u %02u:%02u %c"; +@@ -76,7 +76,7 @@ + static ZCONST char Far ShortHdrStats[] = + "%9lu %02u%c%02u%c%02u %02u:%02u %c"; + static ZCONST char Far ShortFileTrailer[] = " -------- \ +- -------\n%9lu %lu file%s\n"; ++ -------\n%9llu %lu file%s\n"; + #endif /* ?OS2_EAS */ + #endif /* !WINDLL */ + +@@ -105,7 +105,8 @@ + struct tm *t; + #endif + unsigned yr, mo, dy, hh, mm; +- ulg csiz, tot_csize=0L, tot_ucsize=0L; ++ ulg csiz; ++ unsigned long long tot_csize=0, tot_ucsize=0; + #ifdef OS2_EAS + ulg ea_size, tot_easize=0L, tot_eafiles=0L; + ulg acl_size, tot_aclsize=0L, tot_aclfiles=0L; +diff -ur unzip-5.51/process.c unzip-5.51-lhh/process.c +--- unzip-5.51/process.c 2003-10-19 18:52:04.000000000 -0400 ++++ unzip-5.51-lhh/process.c 2004-06-18 16:26:57.000000000 -0400 +@@ -915,7 +915,7 @@ + long searchlen; + { + int i, numblks, found=FALSE; +- LONGINT tail_len; ++ ulg tail_len; + ec_byte_rec byterec; + + +@@ -923,8 +923,8 @@ + Treat case of short zipfile separately. + ---------------------------------------------------------------------------*/ + +- if (G.ziplen <= INBUFSIZ) { +- lseek(G.zipfd, 0L, SEEK_SET); ++ if ((unsigned long)G.ziplen <= (unsigned long)INBUFSIZ) { ++ lseek64(G.zipfd, 0L, SEEK_SET); + if ((G.incnt = read(G.zipfd,(char *)G.inbuf,(unsigned int)G.ziplen)) + == (int)G.ziplen) + +@@ -951,7 +951,7 @@ + fseek((FILE *)G.zipfd, G.ziplen-tail_len, SEEK_SET); + G.cur_zipfile_bufstart = ftell((FILE *)G.zipfd); + #else /* !USE_STRM_INPUT */ +- G.cur_zipfile_bufstart = lseek(G.zipfd, G.ziplen-tail_len, ++ G.cur_zipfile_bufstart = lseek64(G.zipfd, G.ziplen-tail_len, + SEEK_SET); + #endif /* ?USE_STRM_INPUT */ + if ((G.incnt = read(G.zipfd, (char *)G.inbuf, +@@ -985,7 +985,7 @@ + + for (i = 1; !found && (i <= numblks); ++i) { + G.cur_zipfile_bufstart -= INBUFSIZ; +- lseek(G.zipfd, G.cur_zipfile_bufstart, SEEK_SET); ++ lseek64(G.zipfd, G.cur_zipfile_bufstart, SEEK_SET); + if ((G.incnt = read(G.zipfd,(char *)G.inbuf,INBUFSIZ)) + != INBUFSIZ) + break; /* fall through and fail */ +diff -ur unzip-5.51/unix/Makefile unzip-5.51-lhh/unix/Makefile +--- unzip-5.51/unix/Makefile 2004-06-21 15:07:16.936126502 -0400 ++++ unzip-5.51-lhh/unix/Makefile 2004-06-18 16:26:57.000000000 -0400 +@@ -783,7 +783,7 @@ + # Linux (Posix, approximately SysV): virtually any version since before 0.96, + # for any platform. Change "-O" to "-O3" or whatever, as desired... + linux_noasm: unix_make +- $(MAKE) unzips CC=gcc LD=gcc CF="$(RPM_OPT_FLAGS) -D_GNU_SOURCE -Wall -I. $(LOC)" ++ $(MAKE) unzips CC=gcc LD=gcc CF="$(RPM_OPT_FLAGS) -D_LARGEFILE64_SOURCE -D_GNU_SOURCE -Wall -I. $(LOC)" + + # Linux with lcc compiler: __inline__ (stat.h) not recognized, and must edit + # /usr/include/gnu/types.h to get rid of "long long" if __LCC__ defined. -O3 +diff -ur unzip-5.51/unzip.h unzip-5.51-lhh/unzip.h +--- unzip-5.51/unzip.h 2004-05-22 21:04:23.000000000 -0400 ++++ unzip-5.51-lhh/unzip.h 2004-06-18 16:26:57.000000000 -0400 +@@ -591,6 +591,8 @@ + #define UZ_ST_CONTINUE 0 + #define UZ_ST_BREAK 1 + ++#define MAX_ZIP_SIZE 0xffffdffe ++ + + /*--------------------------------------------------------------------------- + Prototypes for public UnZip API (DLL) functions. +diff -ur unzip-5.51/unzpriv.h unzip-5.51-lhh/unzpriv.h +--- unzip-5.51/unzpriv.h 2004-03-01 13:09:04.000000000 -0500 ++++ unzip-5.51-lhh/unzpriv.h 2004-06-18 16:26:57.000000000 -0400 +@@ -775,9 +775,9 @@ + #endif + #ifndef SSTAT + # ifdef WILD_STAT_BUG +-# define SSTAT(path,pbuf) (iswild(path) || stat(path,pbuf)) ++# define SSTAT(path,pbuf) (iswild(path) || stat64(path,pbuf)) + # else +-# define SSTAT stat ++# define SSTAT stat64 + # endif + #endif + #ifndef STRNICMP +@@ -1860,7 +1860,7 @@ + unsigned readbuf OF((__GPRO__ char *buf, register unsigned len)); + int readbyte OF((__GPRO)); + int fillinbuf OF((__GPRO)); +-int seek_zipf OF((__GPRO__ LONGINT abs_offset)); ++int seek_zipf OF((__GPRO__ ulg abs_offset)); + #ifdef FUNZIP + int flush OF((__GPRO__ ulg size)); /* actually funzip.c */ + #else Added: tinysofa/snapshot/unzip/current/sources/unzip542-rpmoptflags.patch =================================================================== --- tinysofa/snapshot/unzip/current/sources/unzip542-rpmoptflags.patch 2004-07-01 15:42:11 UTC (rev 2683) +++ tinysofa/snapshot/unzip/current/sources/unzip542-rpmoptflags.patch 2004-07-01 15:42:13 UTC (rev 2684) @@ -0,0 +1,11 @@ +--- unzip-5.42/unix/Makefile.rpmoptflags Mon May 21 10:57:51 2001 ++++ unzip-5.42/unix/Makefile Mon May 21 10:58:22 2001 +@@ -735,7 +735,7 @@ + # Linux (Posix, approximately SysV): virtually any version since before 0.96, + # for any platform. Change "-O" to "-O3" or whatever, as desired... + linux_noasm: unix_make +- $(MAKE) unzips CC=gcc LD=gcc CF="-O -Wall -I. $(LOC)" ++ $(MAKE) unzips CC=gcc LD=gcc CF="$(RPM_OPT_FLAGS) -D_GNU_SOURCE -Wall -I. $(LOC)" + + # Linux with lcc compiler: __inline__ (stat.h) not recognized, and must edit + # /usr/include/gnu/types.h to get rid of "long long" if __LCC__ defined. -O3 Added: tinysofa/snapshot/unzip/current/sources/unzip551.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/unzip/current/sources/unzip551.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/unzip/current/specs/unzip.spec =================================================================== --- tinysofa/snapshot/unzip/current/specs/unzip.spec 2004-07-01 15:42:11 UTC (rev 2683) +++ tinysofa/snapshot/unzip/current/specs/unzip.spec 2004-07-01 15:42:13 UTC (rev 2684) @@ -0,0 +1,223 @@ +Summary: A utility for unpacking zip files. +Name: unzip +Version: 5.51 +Release: 4ts +License: BSD +Group: Applications/Archiving +Source: ftp://ftp.info-zip.org/pub/infozip/src/unzip551.tar.gz +Patch0: unzip542-rpmoptflags.patch +Patch1: unzip-5.51-near-4GB.patch +URL: http://www.info-zip.org/pub/infozip/UnZip.html +BuildRoot: %{_tmppath}/%{name}-%{version}-root + +%description +The unzip utility is used to list, test, or extract files from a zip +archive. Zip archives are commonly found on MS-DOS systems. The zip +utility, included in the zip package, creates zip archives. Zip and +unzip are both compatible with archives created by PKWARE(R)'s PKZIP +for MS-DOS, but the programs' options and default behaviors do differ +in some respects. + +Install the unzip package if you need to list, test or extract files from +a zip archive. + +%prep +%setup -q +%patch0 -p1 +%patch1 -p1 +ln -s unix/Makefile Makefile + +%build +make CFLAGS="-D_LARGEFILE64_SOURCE" linux_noasm LF2="" + +%install +rm -rf $RPM_BUILD_ROOT + +make prefix=$RPM_BUILD_ROOT/usr MANDIR=$RPM_BUILD_ROOT/%{_mandir}/man1 install LF2="" + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(-,root,root) +%doc README BUGS LICENSE INSTALL +/usr/bin/* +%{_mandir}/*/* + +%changelog +* Mon Jun 21 2004 Lon Hohberger 5.51-4 +- Extend max file/archive size to 2^32-8193 (4294959103) bytes + +* Tue Jun 15 2004 Elliot Lee +- rebuilt + +* Tue Jun 08 2004 Lon Hohberger 5.51-2 +- Rebuild + +* Tue Jun 08 2004 Lon Hohberger 5.51-1.1 +- Update to 5.51; remove dotdot patch. + +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Mon Nov 17 2003 Lon Hohberger 5.50-36 +- Rebuild for FC-next + +* Fri Aug 01 2003 Lon Hohberger 5.50-35 +- Rebuild for Severn + +* Fri Aug 01 2003 Lon Hohberger 5.50-34 +- Rebuild for Taroon + +* Fri Aug 01 2003 Lon Hohberger 5.50-33 +- Rebuild for 9 errata + +* Fri Aug 01 2003 Lon Hohberger 5.50-32 +- Rebuild for 8.0 errata + +* Fri Aug 01 2003 Lon Hohberger 5.50-31 +- Rebuild for 7.3 errata + +* Wed Jul 30 2003 Lon Hohberger 5.50-30 +- SECURITY Round 3: Fix up original patch (from 5.50-9) to fix +^V/ exploit, but still allow '-:', which the other patch (5.50-18) +does not allow. Never allow explicit writing to the root +directory; force users to change there and extract it manually. + +* Wed Jul 30 2003 Lon Hohberger 5.50-29 +- Rebuild for Severn + +* Wed Jul 30 2003 Lon Hohberger 5.50-28 +- Rebuild + +* Wed Jul 30 2003 Lon Hohberger 5.50-27 +- Rebuild for 9 + +* Wed Jul 30 2003 Lon Hohberger 5.50-26 +- Rebuild for 8.0 + +* Tue Jul 22 2003 Lon Hohberger 5.50-23 +- Rebuild for 7.3 + +* Mon Jul 21 2003 Lon Hohberger 5.50-22 +- Rebuild for Severn + +* Mon Jul 21 2003 Lon Hohberger 5.50-21 +- Rebuild + +* Mon Jul 21 2003 Lon Hohberger 5.50-20 +- Rebuild for 9 + +* Mon Jul 21 2003 Lon Hohberger 5.50-19 +- Rebuild for 8.0 + +* Mon Jul 21 2003 Lon Hohberger 5.50-18 +- SECURITY: Incorporate far cleaner patch from Ben Laurie + which also fixes ^V/ (quote-slash). +Patch checks post-decode as opposed to inline as previous +patch does. + +* Mon Jun 16 2003 Lon Hohberger 5.50-17 +- Rebuilt per request + +* Thu Jun 12 2003 Lon Hohberger 5.50-16 +- Rebuilt + +* Thu Jun 12 2003 Lon Hohberger 5.50-15 +- Rebuilt + +* Thu Jun 12 2003 Lon Hohberger 5.50-14 +- Rebuilt: Red Hat Linux 9 + +* Thu Jun 12 2003 Lon Hohberger 5.50-13 +- Rebuilt: Red Hat Enterprise Linux 2.1 + +* Thu Jun 12 2003 Lon Hohberger 5.50-12 +- Rebuilt Red Hat Linux 8.0 + +* Thu Jun 12 2003 Lon Hohberger 5.50-11 +- Rebuilt Red Hat Linux 7.3 + +* Wed Jun 11 2003 Lon Hohberger 5.50-10 +- Rebuilt + +* Wed Jun 11 2003 Lon Hohberger 5.50-9 +- SECURITY: Scour start of filename for ../ patterns which +include quote and/or control characters. + +* Wed Jun 04 2003 Elliot Lee +- rebuilt + +* Wed Jan 22 2003 Tim Powers +- rebuilt + +* Thu Dec 19 2002 Tim Powers +- bump and rebuild + +* Fri Jun 21 2002 Tim Powers +- automated rebuild + +* Thu May 23 2002 Tim Powers +- automated rebuild + +* Thu Apr 25 2002 Trond Eivind Glomsr?d 5.50-3 +- Rebuild + +* Tue Apr 2 2002 Trond Eivind Glomsr?d 5.50-2 +- Make it not strip + +* Wed Mar 13 2002 Trond Eivind Glomsr?d 5.50-1 +- 5.50 + +* Thu Feb 21 2002 Trond Eivind Glomsr?d 5.42-3 +- Rebuild + +* Wed Jan 09 2002 Tim Powers +- automated rebuild + +* Mon May 21 2001 Trond Eivind Glomsr?d +- 5.42 +- Don't strip binaries explicitly +- build without assembly, it doesn't seem to increase performance +- make it respect RPM_OPT_FLAGS, define _GNU_SOURCE +- use %%{_tmppath} +- "License:" replaces "Copyright:" +- Update URL +- include zipgrep +- COPYING doesn't exist anymore, include LICENSE instead + +* Thu Jul 13 2000 Prospector +- automatic rebuild + +* Sun Jun 11 2000 BIll Nottingham +- rebuild in new env.; FHS fixes. + +* Tue Apr 18 2000 Bernhard Rosenkraenzer +- 4.51 (an acceptable license at last...) + +* Thu Feb 3 2000 Bill Nottingham +- handle compressed man pages + +* Fri Jul 30 1999 Bill Nottingham +- update to 5.40 + +* Sun Mar 21 1999 Cristian Gafton +- auto rebuild in the new build environment (release 5) + +* Thu Dec 17 1998 Michael Maher +- built for 6.0 + +* Tue Aug 11 1998 Jeff Johnson +- build root + +* Mon Apr 27 1998 Prospector System +- translations modified for de, fr, tr + +* Tue Oct 21 1997 Erik Troan +- builds on non i386 platforms + +* Mon Oct 20 1997 Otto Hammersmith +- updated the version + +* Thu Jul 10 1997 Erik Troan +- built against glibc From svn at tinysofa.org Thu Jul 1 15:42:25 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:42:25 +1000 (EST) Subject: [tinysofa-svn] r2689 - in tinysofa/snapshot: . vconfig vconfig/current vconfig/current/sources vconfig/current/specs Message-ID: <20040701154225.E7D494E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:42:25 +1000 (Fri, 02 Jul 2004) New Revision: 2689 Added: tinysofa/snapshot/vconfig/ tinysofa/snapshot/vconfig/current/ tinysofa/snapshot/vconfig/current/sources/ tinysofa/snapshot/vconfig/current/sources/vlan.1.8.tar.gz tinysofa/snapshot/vconfig/current/specs/ tinysofa/snapshot/vconfig/current/specs/vconfig.spec Log: - Add vconfig to snapshot from 2.0. Added: tinysofa/snapshot/vconfig/current/sources/vlan.1.8.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/vconfig/current/sources/vlan.1.8.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/vconfig/current/specs/vconfig.spec =================================================================== --- tinysofa/snapshot/vconfig/current/specs/vconfig.spec 2004-07-01 15:42:22 UTC (rev 2688) +++ tinysofa/snapshot/vconfig/current/specs/vconfig.spec 2004-07-01 15:42:25 UTC (rev 2689) @@ -0,0 +1,85 @@ +Summary: Linux 802.1q VLAN configuration utility +Name: vconfig +Version: 1.8 +Release: 3ts +License: LGPL +Group: System Environment/Base +Source: http://www.candelatech.com/~greear/vlan/vlan.%{version}.tar.gz +URL: http://www.candelatech.com/~greear/vlan.html +BuildRoot: %{_tmppath}/%{name}-%{version}-root +Requires: kernel >= 2.4.14 +%define _sbin /sbin + +%description +The vconfig program configures and adjusts 802.1q VLAN parameters. + +%prep +%setup -q -n vlan + +%build +make CCFLAGS="%{optflags}" + +%install +[ "%{buildroot}" != "/" ] && rm -rf %{buildroot} + +%{__mkdir_p} %{buildroot}%{_sbin} +%{__mkdir_p} %{buildroot}%{_mandir}/man8 +%{__install} -m755 vconfig %{buildroot}%{_sbin}/vconfig +%{__install} -m644 vconfig.8 %{buildroot}%{_mandir}/man8 + +%clean +[ "%{buildroot}" != "/" ] && rm -rf %{buildroot} + +%files +%defattr(-,root,root) +%doc CHANGELOG contrib README vlan.html vlan_test.pl +%{_sbin}/vconfig +%{_mandir}/man8/vconfig.8* + +%changelog +* Tue Jun 15 2004 Elliot Lee +- rebuilt + +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Wed Oct 22 2003 Bill Nottingham 1.8-1 +- update to 1.8 (#107761) + +* Wed Jun 04 2003 Elliot Lee +- rebuilt + +* Thu May 22 2003 Jeremy Katz 1.6-3 +- fix to build with gcc 3.3 + +* Fri Jan 31 2003 Bill Nottingham 1.6-2 +- adapt upstream package +- add patch for license + +* Thu Jan 23 2003 Tuomo Soini 1.6-6foo +- changes for new initscripts package + +* Sun Sep 15 2002 Tuomo Soini 1.6-5foo +- foobarize + +* Tue Aug 06 2002 Tuomo Soini 1.6-t4 +- fix ifup-vlan to be able to set default route + +* Tue Jun 25 2002 Tuomo Soini 1.6-t3 +- pgp sign, foobarize spec-file + +* Thu May 30 2002 Tuomo Soini 1.6-t2 +- fix typo in ifup-vlan + +* Thu May 30 2002 Tuomo Soini 1.6-t1 +- updated for redhat 7.3 +- build doesn't require kernel-sources + +* Fri Apr 05 2002 Dale Bewley +- update to 1.6 +- add ifup scripts + +* Tue Dec 11 2001 Dale Bewley +- initial specfile + +# EOF From svn at tinysofa.org Thu Jul 1 15:43:36 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:43:36 +1000 (EST) Subject: [tinysofa-svn] r2700 - in tinysofa/snapshot: . ypbind ypbind/current ypbind/current/sources ypbind/current/specs Message-ID: <20040701154336.C4BB94E817F@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:43:36 +1000 (Fri, 02 Jul 2004) New Revision: 2700 Added: tinysofa/snapshot/ypbind/ tinysofa/snapshot/ypbind/current/ tinysofa/snapshot/ypbind/current/sources/ tinysofa/snapshot/ypbind/current/sources/ypbind-1.11-broadcast.patch tinysofa/snapshot/ypbind/current/sources/ypbind-1.11-gettextdomain.patch tinysofa/snapshot/ypbind/current/sources/ypbind-mt-1.16-bindingrace.patch tinysofa/snapshot/ypbind/current/sources/ypbind-mt-1.16-nullhandle.patch tinysofa/snapshot/ypbind/current/sources/ypbind-mt-1.17.2.tar.bz2 tinysofa/snapshot/ypbind/current/sources/ypbind.init tinysofa/snapshot/ypbind/current/specs/ tinysofa/snapshot/ypbind/current/specs/ypbind.spec Log: - Add ypbind to snapshot from 2.0. Added: tinysofa/snapshot/ypbind/current/sources/ypbind-1.11-broadcast.patch =================================================================== --- tinysofa/snapshot/ypbind/current/sources/ypbind-1.11-broadcast.patch 2004-07-01 15:43:34 UTC (rev 2699) +++ tinysofa/snapshot/ypbind/current/sources/ypbind-1.11-broadcast.patch 2004-07-01 15:43:36 UTC (rev 2700) @@ -0,0 +1,25 @@ +--- ypbind-mt-1.11/src/ypbind-mt.c.broadcast Tue Jun 11 06:50:48 2002 ++++ ypbind-mt-1.11/src/ypbind-mt.c Tue Jun 11 06:54:34 2002 +@@ -545,19 +545,9 @@ + exit (1); + } + +- if (!use_broadcast) +- { +- if (load_config (0) != 0) +- { +- fputs (_("No NIS server and no -broadcast option specified.\n"), stderr); +- fprintf (stderr, +- _("Add a NIS server to the %s configuration file,\n"), +- configfile); +- fputs (_("or start ypbind with the -broadcast option.\n"), stderr); +- exit (1); +- } +- } +- else ++ if (!use_broadcast && (load_config (0) != 0)) ++ use_broadcast = 1; ++ if (use_broadcast) + add_server (domain, NULL, 0); + + unlink_bindingdir (); Added: tinysofa/snapshot/ypbind/current/sources/ypbind-1.11-gettextdomain.patch =================================================================== --- tinysofa/snapshot/ypbind/current/sources/ypbind-1.11-gettextdomain.patch 2004-07-01 15:43:34 UTC (rev 2699) +++ tinysofa/snapshot/ypbind/current/sources/ypbind-1.11-gettextdomain.patch 2004-07-01 15:43:36 UTC (rev 2700) @@ -0,0 +1,11 @@ +--- ypbind-mt-1.11/po/Makevars.fixit Tue Jun 11 07:19:05 2002 ++++ ypbind-mt-1.11/po/Makevars Tue Jun 11 07:19:07 2002 +@@ -1,7 +1,7 @@ + # Makefile variables for PO directory in any package using GNU gettext. + + # Usually the message domain is the same as the package name. +-DOMAIN = $(PACKAGE) ++DOMAIN = ypbind + + # These two variables depend on the location of this directory. + subdir = po Added: tinysofa/snapshot/ypbind/current/sources/ypbind-mt-1.16-bindingrace.patch =================================================================== --- tinysofa/snapshot/ypbind/current/sources/ypbind-mt-1.16-bindingrace.patch 2004-07-01 15:43:34 UTC (rev 2699) +++ tinysofa/snapshot/ypbind/current/sources/ypbind-mt-1.16-bindingrace.patch 2004-07-01 15:43:36 UTC (rev 2700) @@ -0,0 +1,144 @@ +--- ypbind-mt-1.16/src/serv_list.c.race 2004-01-14 20:20:04.000000000 +0100 ++++ ypbind-mt-1.16/src/serv_list.c 2004-01-19 15:31:32.086601053 +0100 +@@ -512,6 +512,7 @@ + } + + static struct binding *in_use = NULL; ++static int found_one; + + static bool_t + eachresult (bool_t *out, struct sockaddr_in *addr) +@@ -589,7 +590,10 @@ + if (in_use->client_handle == NULL) + return 0; + ++ pthread_rdwr_wlock_np (&domainlock); + in_use->active = 0; ++ found_one++; ++ pthread_rdwr_wunlock_np (&domainlock); + + return 1; + } +@@ -617,19 +621,7 @@ + log_msg (LOG_DEBUG, _("do_broadcast() for domain '%s' is called"), + domain); + +- /* Get a writer lock for the domain list, since we modify one +- entry. */ +- pthread_rdwr_wlock_np (&domainlock); +- list->active = -1; +- pthread_rdwr_wunlock_np (&domainlock); +- +- /* Get a reader lock while we do the broadcast. Normally we would +- need the writer lock, since we modify the data. But in this case, +- the broadcast timeout is too long and we would block all queries. +- Since we don't change pointers and all data is always valid, we +- only acquire the reader lock. */ +- pthread_rdwr_rlock_np (&domainlock); +- ++ found_one = 0; + in_use = list; /* global variable for eachresult */ + + status = clnt_broadcast (YPPROG, YPVERS, YPPROC_DOMAIN_NONACK, +@@ -640,13 +632,24 @@ + + if (status != RPC_SUCCESS) + { ++ pthread_rdwr_wlock_np (&domainlock); ++ list->active = -1; ++ pthread_rdwr_wunlock_np (&domainlock); + remove_bindingfile (domain); + log_msg (LOG_ERR, "broadcast: %s.", clnt_sperrno (status)); + } + else +- update_bindingfile (list); +- +- pthread_rdwr_runlock_np (&domainlock); ++ { ++ if (found_one) { ++ pthread_rdwr_rlock_np (&domainlock); ++ update_bindingfile (list); ++ pthread_rdwr_runlock_np (&domainlock); ++ } else { ++ pthread_rdwr_wlock_np (&domainlock); ++ list->active = -1; ++ pthread_rdwr_wunlock_np (&domainlock); ++ } ++ } + + if (debug_flag) + log_msg (LOG_DEBUG, _("leave do_broadcast() for domain '%s'"), +@@ -750,10 +753,6 @@ + if (list->server[0].host == NULL) /* There is no known server */ + return 0; + +- pthread_rdwr_wlock_np (&domainlock); +- list->active = -1; +- pthread_rdwr_wunlock_np (&domainlock); +- + pings = malloc (sizeof (struct findserv_req *) * _MAXSERVER); + if (pings == NULL) + return 0; +@@ -793,6 +792,9 @@ + if (pings_count == 0) + { + free (pings); ++ pthread_rdwr_wlock_np (&domainlock); ++ list->active = -1; ++ pthread_rdwr_wunlock_np (&domainlock); + return 0; + } + +@@ -805,6 +807,9 @@ + for (i = 0; i < pings_count; ++i) + free (pings[i]); + free (pings); ++ pthread_rdwr_wlock_np (&domainlock); ++ list->active = -1; ++ pthread_rdwr_wunlock_np (&domainlock); + return 0; + } + clnt->cl_auth = authunix_create_default (); +@@ -863,9 +868,12 @@ + free (pings[i]); + free (pings); + +- if (!found) ++ if (!found) { ++ pthread_rdwr_wlock_np (&domainlock); ++ list->active = -1; ++ pthread_rdwr_wunlock_np (&domainlock); + remove_bindingfile(list->domain); +- ++ } + return found; + } + +@@ -886,10 +894,6 @@ + if (list->server[0].host == NULL) /* There is no known server */ + return 0; + +- pthread_rdwr_wlock_np (&domainlock); +- list->active = -1; +- pthread_rdwr_wunlock_np (&domainlock); +- + while (list->server[i].host != NULL && i < _MAXSERVER) + { + +@@ -957,10 +961,16 @@ + ++i; + if (i == _MAXSERVER) + { ++ pthread_rdwr_wlock_np (&domainlock); ++ list->active = -1; ++ pthread_rdwr_wunlock_np (&domainlock); + remove_bindingfile(list->domain); + return 0; + } + } ++ pthread_rdwr_wlock_np (&domainlock); ++ list->active = -1; ++ pthread_rdwr_wunlock_np (&domainlock); + return 0; + } + Added: tinysofa/snapshot/ypbind/current/sources/ypbind-mt-1.16-nullhandle.patch =================================================================== --- tinysofa/snapshot/ypbind/current/sources/ypbind-mt-1.16-nullhandle.patch 2004-07-01 15:43:34 UTC (rev 2699) +++ tinysofa/snapshot/ypbind/current/sources/ypbind-mt-1.16-nullhandle.patch 2004-07-01 15:43:36 UTC (rev 2700) @@ -0,0 +1,12 @@ +--- ypbind-mt-1.16/src/serv_list.c.nullhandle 2004-01-19 15:32:48.548451921 +0100 ++++ ypbind-mt-1.16/src/serv_list.c 2004-01-19 15:34:18.693485270 +0100 +@@ -1043,6 +1043,9 @@ + bool_t out = TRUE; + enum clnt_stat status = RPC_SUCCESS; + ++ if (domainlist[i].client_handle == NULL) ++ domainlist[i].active = -1; ++ + if (domainlist[i].active != -1) + { + /* The binding is in use, check if it is still valid and Added: tinysofa/snapshot/ypbind/current/sources/ypbind-mt-1.17.2.tar.bz2 =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/ypbind/current/sources/ypbind-mt-1.17.2.tar.bz2 ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/ypbind/current/sources/ypbind.init =================================================================== --- tinysofa/snapshot/ypbind/current/sources/ypbind.init 2004-07-01 15:43:34 UTC (rev 2699) +++ tinysofa/snapshot/ypbind/current/sources/ypbind.init 2004-07-01 15:43:36 UTC (rev 2700) @@ -0,0 +1,113 @@ +#!/bin/bash +# +# ypbind: Starts the ypbind Daemon +# +# Version: @(#) /etc/init.d/ypbind.init 1.3 +# +# chkconfig: - 27 73 +# description: This is a daemon which runs on NIS/YP clients and binds them \ +# to a NIS domain. It must be running for systems based on glibc \ +# to work as NIS clients, but it should not be enabled on systems \ +# which are not using NIS. +# processname: ypbind +# config: /etc/yp.conf + +OTHER_YPBIND_OPTS="" + +# Source function library. +. /etc/init.d/functions + +. /etc/sysconfig/network + +# Check that networking is configured. +[ ${NETWORKING} = "no" ] && exit 0 + +start() { + DOMAINNAME=`domainname` + if [ "$DOMAINNAME" = "(none)" -o "$DOMAINNAME" = "" ]; then + if [ -n "$NISDOMAIN" ]; then + action $"Setting NIS domain name $NISDOMAIN: " domainname $NISDOMAIN + else + exit 1 + fi + fi + echo -n $"Binding to the NIS domain: " + daemon ypbind $OTHER_YPBIND_OPTS + RETVAL=$? + echo + if [ $RETVAL -ne 0 ]; then + return $RETVAL + fi + # the following fixes problems with the init scripts continuing + # even when we are really not bound yet to a server, and then things + # that need NIS fail. + echo -n $"Listening for an NIS domain server." + for (( times = 1; times < 20; times++ )); do + /usr/sbin/rpcinfo -p | grep ypbind > /dev/null 2>&1 && ypwhich > /dev/null 2>&1 + RETVAL=$? + if [ $RETVAL -eq 0 ]; then + break; + fi + sleep 1 + echo -n "." + done + if [ $RETVAL -eq 0 ]; then + initlog -n ypbind -s "bound to NIS server `ypwhich 2> /dev/null`" + touch /var/lock/subsys/ypbind + else + killproc ypbind + # if we used brute force (like kill -9) we don't want those around + if [ x$(domainname) != x ] ; then + rm -f /var/yp/binding/$(domainname)* + fi + failure "attempting to contact yp server" + fi + echo + return $RETVAL +} + +stop() { + echo -n $"Shutting down NIS services: " + killproc ypbind + RETVAL=$? + if [ $RETVAL -eq 0 ] ; then + rm -f /var/lock/subsys/ypbind + # if we used brute force (like kill -9) we don't want those around + if [ x$(domainname) != x ] ; then + rm -f /var/yp/binding/$(domainname)* + fi + fi + echo + return $RETVAL +} + +restart() { + stop + start +} + +RETVAL=0 + +# See how we were called. +case "$1" in + start) + start + ;; + stop) + stop + ;; + status) + status ypbind + ;; + restart|reload) + restart + ;; + condrestart) + [ -f /var/lock/subsys/ypbind ] && restart || : + ;; + *) + echo $"Usage: $0 {start|stop|status|restart|condrestart}" + exit 1 +esac + +exit $? Property changes on: tinysofa/snapshot/ypbind/current/sources/ypbind.init ___________________________________________________________________ Name: svn:executable + * Added: tinysofa/snapshot/ypbind/current/specs/ypbind.spec =================================================================== --- tinysofa/snapshot/ypbind/current/specs/ypbind.spec 2004-07-01 15:43:34 UTC (rev 2699) +++ tinysofa/snapshot/ypbind/current/specs/ypbind.spec 2004-07-01 15:43:36 UTC (rev 2700) @@ -0,0 +1,231 @@ +Summary: The NIS daemon which binds NIS clients to an NIS domain. +Name: ypbind +Version: 1.17.2 +Release: 2ts +License: GPL +Group: System Environment/Daemons +Source0: ftp://ftp.us.kernel.org/pub/linux/utils/net/NIS/ypbind-mt-%{PACKAGE_VERSION}.tar.bz2 +Url: http://www.linux-nis.org/nis/ypbind-mt/index.html +Source1: ypbind.init +Patch1: ypbind-1.11-broadcast.patch +Patch2: ypbind-1.11-gettextdomain.patch +Patch3: ypbind-mt-1.16-bindingrace.patch +Patch4: ypbind-mt-1.16-nullhandle.patch +Prereq: /sbin/chkconfig +Requires: portmap, yp-tools, bash >= 2.0 +Epoch: 3 +Buildroot: %{_tmppath}/%{name}-%{version}-root + +%description +The Network Information Service (NIS) is a system that provides +network information (login names, passwords, home directories, group +information) to all of the machines on a network. NIS can allow users +to log in on any machine on the network, as long as the machine has +the NIS client programs running and the user's password is recorded in +the NIS passwd database. NIS was formerly known as Sun Yellow Pages +(YP). + +This package provides the ypbind daemon. The ypbind daemon binds NIS +clients to an NIS domain. Ypbind must be running on any machines +running NIS client programs. + +Install the ypbind package on any machines running NIS client programs +(included in the yp-tools package). If you need an NIS server, you +also need to install the ypserv package to a machine on your network. + +%prep +%setup -q -n ypbind-mt-%{version} +%patch1 -p1 -b .broadcast +%patch2 -p1 -b .fixit +%patch3 -p1 -b .race +%patch4 -p1 -b .nullhandle + +%build +%configure --sbindir=/sbin +make + +%install +rm -rf $RPM_BUILD_ROOT +%makeinstall sbindir=$RPM_BUILD_ROOT/sbin + +mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d $RPM_BUILD_ROOT/var/yp/binding +install -m 644 etc/yp.conf $RPM_BUILD_ROOT/etc/yp.conf +install -m 755 %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/ypbind + +%{find_lang} %{name} + +%clean +rm -rf $RPM_BUILD_ROOT + +%post +/sbin/chkconfig --add ypbind + +%preun +if [ "$1" = 0 ] ; then + /sbin/service ypbind stop > /dev/null 2>&1 + /sbin/chkconfig --del ypbind +fi +exit 0 + +%postun +if [ "$1" -ge 1 ]; then + /sbin/service ypbind condrestart > /dev/null 2>&1 +fi +exit 0 + +%files -f %{name}.lang +%defattr(-,root,root) +/sbin/ypbind +%{_mandir}/*/* +%config /etc/rc.d/init.d/* +%config(noreplace) /etc/yp.conf +%dir /var/yp +%dir /var/yp/binding +%doc README NEWS + +%changelog +* Tue Jun 15 2004 Elliot Lee +- rebuilt + +* Tue Feb 24 2004 Phil Knirsch 1.17.2-1 +- Another updated to latest upstream version. + +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Mon Jan 19 2004 Phil Knirsch 1.16-1 +- Updated to latest upstream version. + +* Thu Nov 20 2003 Steve Dickson +- Added a NULL check to test_bindings() to make sure + clnt_call() is not called with a NULL pointer. + +* Sat Oct 4 2003 Steve Dickson +- Updated Release number for RHEL3 QU1 + +* Tue Sep 9 2003 Steve Dickson +- Fixed a binding race where the wrong results were being returned. + +* Wed Jun 04 2003 Elliot Lee +- rebuilt + +* Wed May 21 2003 Bill Nottingham 1.12-1.10 +- make yp.conf %config(noreplace) + +* Thu Apr 24 2003 Steve Dickson +- Updated to 1.12 from upstream. +- Removed ypbind-1.8-dos.patch since it + was already commented out +- Updated broadcast patch + +* Wed Jan 22 2003 Tim Powers +- rebuilt + +* Mon Nov 18 2002 Tim Powers +- build on all arches + +* Fri Jun 21 2002 Tim Powers +- automated rebuild + +* Tue Jun 11 2002 Alex Larsson 1.11-1 +- Updated to 1.11 from upstream. +- Removed patche that went in upstream. +- Updated broadcast patch + +* Thu May 23 2002 Tim Powers +- automated rebuild + +* Mon Mar 25 2002 Alex Larsson 1.10-7 +- Get failure message right in init script (#37463 again) + +* Mon Mar 25 2002 Alex Larsson 1.10-6 +- Fix bugs in initscript. Should fix #37463 and #61857 + +* Mon Mar 25 2002 Alex Larsson 1.10-5 +- New config patch that handles failing gethostbynames even better + +* Thu Mar 21 2002 Alex Larsson 1.10-4 +- Added patch to avoid hanging if gethostbyname fails. (#56322) + +* Sun Mar 10 2002 Florian La Roche +- fixed #57393 + +* Wed Jan 09 2002 Tim Powers +- automated rebuild + +* Sat Nov 17 2001 Florian La Roche +- update to version 1.10 + +* Mon Aug 13 2001 Preston Brown +- eliminate potential DOS attack via ypwhich (#38637) +- install PO files + +* Tue Jul 17 2001 Karsten Hopp +- own /var/yp + +* Fri Jun 29 2001 Florian La Roche +- update to 1.8 + +* Sun Jun 24 2001 Elliot Lee +- Bump release + rebuild. + +* Fri Jun 4 2001 Preston Brown +- small fixes for initscript. Sometimes had trouble on slower systems (#37463) + +* Sat Mar 3 2001 Preston Brown +- much more sane ypbind init script for when networking is down. + +* Wed Feb 7 2001 Trond Eivind Glomsr?d +- fix "usage" string (use $0) + +* Wed Jan 24 2001 Florian La Roche +- prepare for initscript translation +- do not prereq /etc/init.d + +* Thu Jan 11 2001 Bernhard Rosenkraenzer +- Start after netfs (#23526) + +* Wed Nov 29 2000 Bill Nottingham +- set NIS domain name if it's not already set + +* Mon Oct 02 2000 Florian La Roche +- update to 1.7 + +* Thu Aug 31 2000 Florian La Roche +- add again automatic fallback to broadcast + +* Sun Aug 20 2000 Florian La Roche +- fix condrestart #16615 +- security fix for syslog() call + +* Sun Aug 6 2000 Florian La Roche +- do not include broadcast fallback until it is more tested + +* Sun Aug 6 2000 Florian La Roche +- add automatic fallback to broadcast +- add "exit 0" to the scripts + +* Wed Aug 2 2000 Bill Nottingham +- turn off broadcast; authconfig will enable this... +- put the pid that's actually listening to signals in the pidfile + +* Thu Jul 20 2000 Bill Nottingham +- move initscript back + +* Thu Jul 13 2000 Prospector +- automatic rebuild + +* Fri Jul 7 2000 Florian La Roche +- prereq init.d + +* Wed Jul 5 2000 Florian La Roche +- re-enable broadcasts + +* Tue Jul 4 2000 Florian La Roche +- fix scripts + +* Mon Jul 3 2000 Nalin Dahyabhai +- bump epoch + +* Mon Jul 3 2000 Florian La Roche +- switch from ypbind to ypbind-mt From svn at tinysofa.org Thu Jul 1 15:43:33 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:43:33 +1000 (EST) Subject: [tinysofa-svn] r2698 - in tinysofa/snapshot: . xsri xsri/current xsri/current/sources xsri/current/specs Message-ID: <20040701154333.B61CB4E817D@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:43:33 +1000 (Fri, 02 Jul 2004) New Revision: 2698 Added: tinysofa/snapshot/xsri/ tinysofa/snapshot/xsri/current/ tinysofa/snapshot/xsri/current/sources/ tinysofa/snapshot/xsri/current/sources/xsri-2.1.0.tar.gz tinysofa/snapshot/xsri/current/specs/ tinysofa/snapshot/xsri/current/specs/xsri.spec Log: - Add xsri to snapshot from 2.0. Added: tinysofa/snapshot/xsri/current/sources/xsri-2.1.0.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/xsri/current/sources/xsri-2.1.0.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/xsri/current/specs/xsri.spec =================================================================== --- tinysofa/snapshot/xsri/current/specs/xsri.spec 2004-07-01 15:43:31 UTC (rev 2697) +++ tinysofa/snapshot/xsri/current/specs/xsri.spec 2004-07-01 15:43:33 UTC (rev 2698) @@ -0,0 +1,81 @@ +# Note that this is NOT a relocatable package +Summary: X Set Root Image +Name: xsri +Version: 2.1.0 +Release: 8ts +Epoch: 1 +License: GPL +Group: System Environment/Base +Source0: %{name}-%{PACKAGE_VERSION}.tar.gz + +BuildRoot: %{_tmppath}/%{name}-%{version}-root +BuildPrereq: gtk2-devel >= 1.3.13 +BuildPrereq: popt + +%description +X Set Root Image - displays images on the root window with +parameters. Does nothing much more. + +%prep +%setup + +%build +%configure +make + +%install +make DESTDIR=$RPM_BUILD_ROOT install + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(-, root, root) +%doc README +%{_bindir}/* + +%changelog +* Tue Jun 15 2004 Elliot Lee +- rebuilt + +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Wed Jun 04 2003 Elliot Lee +- rebuilt + +* Wed Jan 22 2003 Tim Powers +- rebuilt + +* Wed Dec 11 2002 Tim Powers 1:2.1.0-4 +- rebuild on all arches + +* Fri Jun 21 2002 Tim Powers +- automated rebuild + +* Thu May 23 2002 Tim Powers +- automated rebuild + +* Mon Feb 11 2002 Owen Taylor +- Version 2.1.0 + +* Wed Aug 15 2001 Owen Taylor +- Version 2.0.3 + +* Fri Aug 03 2001 Owen Taylor +- Version 2.0.2 + +* Sun Jul 08 2001 Owen Taylor +- Version 2.0.1 + +* Sun Jul 08 2001 Owen Taylor +- Epoch is 1 + +* Sun Jul 08 2001 Owen Taylor +- Version 2.0.0 + +* Sun Jul 8 2001 Owen Taylor +- Completely new version + +* Tue Apr 6 1999 The Rasterman +- made rpm From svn at tinysofa.org Thu Jul 1 15:49:07 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:49:07 +1000 (EST) Subject: [tinysofa-svn] r2765 - tinysofa/snapshot/jfsutils/current/specs Message-ID: <20040701154907.793114E817D@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:49:07 +1000 (Fri, 02 Jul 2004) New Revision: 2765 Modified: tinysofa/snapshot/jfsutils/current/specs/jfsutils.spec Log: - Sync with 2.0. - Kept: - jfsutils-1.1.6.tar.gz: Modified: tinysofa/snapshot/jfsutils/current/specs/jfsutils.spec =================================================================== --- tinysofa/snapshot/jfsutils/current/specs/jfsutils.spec 2004-07-01 15:49:04 UTC (rev 2764) +++ tinysofa/snapshot/jfsutils/current/specs/jfsutils.spec 2004-07-01 15:49:07 UTC (rev 2765) @@ -1,23 +1,23 @@ -Summary: IBM JFS utility programs +Summary: Utilities for managing the JFS filesystem. Name: jfsutils Version: 1.1.6 Release: 1ts -Group: tinysofa official +Source0: http://www10.software.ibm.com/developer/opensource/jfs/project/pub/jfsutils-%{version}.tar.gz +URL: http://oss.software.ibm.com/jfs +Group: System Environment/Base License: GPL -Source: http://www10.software.ibm.com/developer/opensource/jfs/project/pub/%{name}-%{version}.tar.gz -URL: http://oss.software.ibm.com/jfs -BuildRoot: %{_tmppath}/%{name}-root -BuildRequires: e2fsprogs-devel +Buildroot: %{_tmppath}/%{name}-%{version}-root %description -Utilities for managing IBM's Journaled File System (JFS) under Linux. The -following utilities are available: fsck.jfs - initiate replay of the JFS -transaction log, and check and repair a JFS formatted device. logdump - -dump a JFS formatted device's journal log. logredo - "replay" a JFS -formatted device's journal log. mkfs.jfs - create a JFS formatted -partition. xchkdmp - dump the contents of a JFS fsck log file created with -xchklog. xchklog - extract a log from the JFS fsck workspace into a -file. xpeek - shell-type JFS file system editor. +The jfsutils package contains a number of utilities for creating, +checking, modifying, and correcting any inconsistencies in JFS +filesystems. The following utilities are available: fsck.jfs - initiate +replay of the JFS transaction log, and check and repair a JFS formatted +device; logdump - dump a JFS formatted device's journal log; logredo - +"replay" a JFS formatted device's journal log; mkfs.jfs - create a JFS +formatted partition; xchkdmp - dump the contents of a JFS fsck log file +created with xchklog; xchklog - extract a log from the JFS fsck workspace +into a file; xpeek - shell-type JFS file system editor. %prep @@ -28,38 +28,56 @@ make %install -make install DESTDIR=${RPM_BUILD_ROOT} +[ "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT +make install DESTDIR=$RPM_BUILD_ROOT +# let brp-compress handle this policy +rm -f $RPM_BUILD_ROOT/%{_mandir}/*/*.gz %clean -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT +[ "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) /sbin/* -%{_mandir}/man8/* +%{_mandir}/*/* %doc AUTHORS COPYING INSTALL NEWS README ChangeLog %changelog -* Wed May 19 2004 tsintegrate 1.1.6-1ts -- current (1.1.6-1ok) integrated as 1.1.6-1ts for release 1.0-U1 +* Thu Feb 26 2004 Jeff Garzik +- Version 1.1.4 -* Thu May 13 2004 Omar Kilani 1.1.6-1ok -- New Upstream. +* Fri Feb 13 2004 Elliot Lee +- rebuilt -* Tue May 11 2004 Omar Kilani 1.0.24-4ts. -- Add BuildRequires e2fsprogs-devel. +* Sat Oct 25 2003 Florian La Roche +- 1.1.3 -* Mon Dec 8 2003 Erlend Midttun 1.0.24-1tr -- New upstream. +* Sun Aug 10 2003 Florian La Roche +- 1.1.2 -* Wed Jun 18 2003 Erlend Midttun 1.0.21-3tr -- Big rebuild +* Wed Jun 04 2003 Elliot Lee +- rebuilt -* Mon Mar 24 2003 Erlend Midttun 1.0.21-2em -- Rebuilt against glibc 2.3.2. +* Wed Jan 22 2003 Tim Powers +- rebuilt -* Thu Aug 15 2002 Christian H. Toldnes 1.0.21-1ct -- Added changelog. -- .spec is based on work of the jfs development team. -- .spec follows TSL policy -- New upstream version: 1.0.21-1ct \ No newline at end of file +* Wed Jan 15 2003 Matt Wilson 1.0.17-5 +- use #include , not extern int errno; + +* Mon Nov 18 2002 Tim Powers +- rebuild on all arches + +* Fri Jun 21 2002 Tim Powers +- automated rebuild + +* Thu May 23 2002 Tim Powers +- automated rebuild + +* Tue Apr 09 2002 Michael K. Johnson +- updated to jfsutils 1.0.17 + +* Fri Feb 08 2002 Michael K. Johnson +- typo fixed + +* Tue Jan 29 2002 Michael K. Johnson +- Initial packaging From svn at tinysofa.org Thu Jul 1 15:49:04 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:49:04 +1000 (EST) Subject: [tinysofa-svn] r2764 - tinysofa/snapshot/iputils/current/specs Message-ID: <20040701154904.E1B4D4E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:49:04 +1000 (Fri, 02 Jul 2004) New Revision: 2764 Modified: tinysofa/snapshot/iputils/current/specs/iputils.spec Log: - Sync with 2.0. - Kept: - README.bonding: - ifenslave.c: - iputils-20020124-countermeasures.patch: - iputils-20020124-ping_sparcfix.patch: - iputils-20020124-rdisc-server.patch: - iputils-20020927-addrcache.patch: - iputils-20020927-headers.patch: - iputils-20020927-icmp_seq.patch: - iputils-20020927-inet_pton.patch: - iputils-20020927-ping-subint.patch: - iputils-20020927-rh.patch: - iputils-20020927-unaligned.patch: - iputils-glibckernheaders.patch: - iputils-ss020927.tar.gz: Modified: tinysofa/snapshot/iputils/current/specs/iputils.spec =================================================================== --- tinysofa/snapshot/iputils/current/specs/iputils.spec 2004-07-01 15:49:01 UTC (rev 2763) +++ tinysofa/snapshot/iputils/current/specs/iputils.spec 2004-07-01 15:49:04 UTC (rev 2764) @@ -1,9 +1,9 @@ Summary: Network monitoring tools including ping. Name: iputils Version: 20020927 -Release: 15jh +Release: 15ts License: BSD -Group: tinysofa/main +Group: System Environment/Daemons Source0: http://ftp.sunet.se/pub/os/Linux/ip-routing/iputils-ss020927.tar.gz Source1: ifenslave.c Source2: README.bonding @@ -20,6 +20,7 @@ Patch10: iputils-20020927-inet_pton.patch Prefix: %{_prefix} BuildRoot: %{_tmppath}/%{name}-%{version}-root +BuildPreReq: docbook-utils perl-SGMLSpm BuildPreReq: glibc-kernheaders >= 2.4-8.19 %description @@ -28,7 +29,6 @@ ECHO_REQUEST packets to a specified network host to discover whether the target machine is alive and receiving network traffic. - %prep %setup -q -n %{name} cp %{SOURCE1} . @@ -46,61 +46,58 @@ %patch9 -p1 -b .unaligned %patch10 -p1 -b .inet_pton - %build %ifarch s390 s390x -export CFLAGS="$RPM_OPT_FLAGS" +export CFLAGS="$RPM_OPT_FLAGS -fPIE" %else -export CFLAGS="$RPM_OPT_FLAGS" +export CFLAGS="$RPM_OPT_FLAGS -fpie" %endif -export LDFLAGS="" +export LDFLAGS="-pie" +make +gcc -Wall -Wstrict-prototypes -O2 ifenslave.c -o ifenslave +make -C doc man -%make -gcc $CFLAGS -Wall -Wstrict-prototypes ifenslave.c -o ifenslave -%make -C doc man - %install -%{__mkdir_p} \ - %{buildroot}%{_sbindir} \ - %{buildroot}/{bin,sbin} \ - %{buildroot}%{_bindir} \ - %{buildroot}%{_mandir}/man8 +rm -rf ${RPM_BUILD_ROOT} -install -c clockdiff %{buildroot}%{_sbindir}/ +mkdir -p ${RPM_BUILD_ROOT}%{_sbindir} +mkdir -p ${RPM_BUILD_ROOT}/{bin,sbin} +install -c clockdiff ${RPM_BUILD_ROOT}%{_sbindir}/ %ifos linux -install -c arping %{buildroot}/sbin/ -ln -s /sbin/arping %{buildroot}%{_sbindir}/arping -install -c ping %{buildroot}/bin/ -install -c ifenslave %{buildroot}/sbin/ +install -c arping ${RPM_BUILD_ROOT}/sbin/ +ln -s /sbin/arping ${RPM_BUILD_ROOT}%{_sbindir}/arping +install -c ping ${RPM_BUILD_ROOT}/bin/ +install -c ifenslave ${RPM_BUILD_ROOT}/sbin/ %else -install -c arping %{buildroot}%{_sbindir}/ -install -c ping %{buildroot}%{_sbindir}/ -install -c ifenslave %{buildroot}%{_sbindir}/ +install -c arping ${RPM_BUILD_ROOT}%{_sbindir}/ +install -c ping ${RPM_BUILD_ROOT}%{_sbindir}/ +install -c ifenslave ${RPM_BUILD_ROOT}%{_sbindir}/ %endif -install -c rdisc %{buildroot}/sbin/ -install -c ping6 %{buildroot}/bin/ -install -c tracepath %{buildroot}/bin/ -install -c tracepath6 %{buildroot}/bin/ -install -c traceroute6 %{buildroot}/bin/ +install -c rdisc ${RPM_BUILD_ROOT}/sbin/ +install -c ping6 ${RPM_BUILD_ROOT}/bin/ +install -c tracepath ${RPM_BUILD_ROOT}/bin/ +install -c tracepath6 ${RPM_BUILD_ROOT}/bin/ +install -c traceroute6 ${RPM_BUILD_ROOT}/bin/ -ln -sf /bin/ping6 %{buildroot}%{_sbindir} -ln -sf /bin/tracepath %{buildroot}%{_sbindir} -ln -sf /bin/tracepath6 %{buildroot}%{_sbindir} -ln -sf /bin/traceroute6 %{buildroot}%{_sbindir} +mkdir -p ${RPM_BUILD_ROOT}%{_bindir} +ln -sf /bin/ping6 ${RPM_BUILD_ROOT}%{_sbindir} +ln -sf /bin/tracepath ${RPM_BUILD_ROOT}%{_sbindir} +ln -sf /bin/tracepath6 ${RPM_BUILD_ROOT}%{_sbindir} +ln -sf /bin/traceroute6 ${RPM_BUILD_ROOT}%{_sbindir} -install -c doc/clockdiff.8 %{buildroot}%{_mandir}/man8/ -install -c doc/arping.8 %{buildroot}%{_mandir}/man8/ -install -c doc/ping.8 %{buildroot}%{_mandir}/man8/ -install -c doc/rdisc.8 %{buildroot}%{_mandir}/man8/ -install -c doc/tracepath.8 %{buildroot}%{_mandir}/man8/ +mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man8 +install -c doc/clockdiff.8 ${RPM_BUILD_ROOT}%{_mandir}/man8/ +install -c doc/arping.8 ${RPM_BUILD_ROOT}%{_mandir}/man8/ +install -c doc/ping.8 ${RPM_BUILD_ROOT}%{_mandir}/man8/ +install -c doc/rdisc.8 ${RPM_BUILD_ROOT}%{_mandir}/man8/ +install -c doc/tracepath.8 ${RPM_BUILD_ROOT}%{_mandir}/man8/ - %clean -%clean_buildroot +rm -rf ${RPM_BUILD_ROOT} - %files %defattr(-,root,root) +%doc RELNOTES README.bonding %{_sbindir}/clockdiff %ifos linux /sbin/arping @@ -121,11 +118,8 @@ %{_sbindir}/tracepath %{_sbindir}/tracepath6 %{_sbindir}/traceroute6 -%defattr(644,root,root,755) %{_mandir}/man8/* -%doc RELNOTES README.bonding - %changelog * Wed May 12 2004 Phil Knirsch 20020927-15 - Updated rh patch to enable PIE build of binaries. From svn at tinysofa.org Thu Jul 1 15:49:09 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:49:09 +1000 (EST) Subject: [tinysofa-svn] r2766 - in tinysofa/snapshot/jwhois/current: sources specs Message-ID: <20040701154909.76CF24E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:49:09 +1000 (Fri, 02 Jul 2004) New Revision: 2766 Added: tinysofa/snapshot/jwhois/current/sources/jwhois-3.2.2-typos.patch Modified: tinysofa/snapshot/jwhois/current/specs/jwhois.spec Log: - Sync with 2.0. - Kept: - jwhois-3.2.2.tar.gz: - Added: - jwhois-3.2.2-typos.patch: Added: tinysofa/snapshot/jwhois/current/sources/jwhois-3.2.2-typos.patch =================================================================== --- tinysofa/snapshot/jwhois/current/sources/jwhois-3.2.2-typos.patch 2004-07-01 15:49:07 UTC (rev 2765) +++ tinysofa/snapshot/jwhois/current/sources/jwhois-3.2.2-typos.patch 2004-07-01 15:49:09 UTC (rev 2766) @@ -0,0 +1,20 @@ +--- jwhois-3.2.2/example/jwhois.conf 2004-01-06 14:16:29.000000000 -0500 ++++ jwhois-3.2.2/example/jwhois.conf 2004-01-06 14:16:22.000000000 -0500 +@@ -191,7 +191,7 @@ + "\\.lv$" = "whois.nic.lv"; + "\\.ma$" = "whois.ripe.net"; + "\\.mil$" = "whois.nic.mil"; +- "\\.mk$" = "whios.ripe.net"; ++ "\\.mk$" = "whois.ripe.net"; + "\\.mm$" = "whois.nic.mm"; + "\\.ms$" = "whois.adamsnames.tc"; + "\\.mt$" = "www.um.edu.mt"; +@@ -346,7 +346,7 @@ + "203.178.0.0/15" = "whois.nic.ad.jp"; # APNIC JPNIC-NET-JP + "203.180.0.0/14" = "whois.nic.ad.jp"; # APNIC JPNIC-NET-JP + "210.128.0.0/11" = "whois.nic.ad.jp"; # APNIC JPNIC-NET-JP +- "210.136.0.0/13" = "whios.nic.ad.jp"; ++ "210.136.0.0/13" = "whois.nic.ad.jp"; + "210.160.0.0/12" = "whois.nic.ad.jp"; # APNIC JPNIC-NET-JP + "210.188.0.0/14" = "whois.nic.ad.jp"; # APNIC JPNIC-NET-JP + "210.196.0.0/14" = "whois.nic.ad.jp"; # APNIC JPNIC-NET-JP Modified: tinysofa/snapshot/jwhois/current/specs/jwhois.spec =================================================================== --- tinysofa/snapshot/jwhois/current/specs/jwhois.spec 2004-07-01 15:49:07 UTC (rev 2765) +++ tinysofa/snapshot/jwhois/current/specs/jwhois.spec 2004-07-01 15:49:09 UTC (rev 2766) @@ -1,138 +1,90 @@ -Summary: The GNU Whois client Name: jwhois Version: 3.2.2 -Release: 5ts -License: GPL -Group: tinysofa official -URL: http://www.gnu.org/software/jwhois -Source: ftp://ftp.gnu.org/gnu/jwhois/%{name}-%{version}.tar.gz -BuildRequires: gdbm-devel -BuildRoot: %{_tmppath}/%{name}-root +Release: 3ts +URL: http://www.gnu.org/software/jwhois/ +Source0: ftp://ftp.gnu.org/gnu/jwhois/jwhois-%{version}.tar.gz +Patch0: jwhois-3.2.2-typos.patch +License: GPL +Group: Applications/Internet +Summary: Internet whois/nicname client. +Buildroot: %{_tmppath}/%{name}-%{version}-root +Obsoletes: fwhois, whois +Prereq: /sbin/install-info %description -JWHOIS is an Internet Whois client that queries hosts for information -according to RFC 954 - NICNAME/WHOIS. JWHOIS is configured via a -configuration file that contains information about all known Whois servers. -Upon execution, the host to query is selected based on the information -in the configuration file. +A whois client that accepts both traditional and finger-style queries. -The configuration file is highly customizable and makes heavy use of -regular expressions. - %prep %setup -q +%patch0 -p1 -b .typos %build -CFLAGS="${RPM_OPT_FLAGS}" \ -./configure --prefix=%{_prefix} \ - --sysconfdir=/etc \ - --without-cache +%configure --without-cache make %install +[ "$RPM_BUILD_ROOT" != "/" ] && rm -fr $RPM_BUILD_ROOT +%makeinstall +# Force compression of the info page so that the %%post knows its name. +gzip $RPM_BUILD_ROOT/%{_infodir}/*.info* +rm -f $RPM_BUILD_ROOT/%{_infodir}/dir +%find_lang jwhois -make prefix=${RPM_BUILD_ROOT}%{_prefix} \ - mandir=${RPM_BUILD_ROOT}%{_mandir} \ - sysconfdir=${RPM_BUILD_ROOT}/etc install-strip +# Make "whois" jwhois. +ln -sf jwhois $RPM_BUILD_ROOT/%{_bindir}/whois +echo .so man1/jwhois.1 > $RPM_BUILD_ROOT/%{_mandir}/man1/whois.1 -install -d -m 755 ${RPM_BUILD_ROOT}/etc +%files -f %{name}.lang +%defattr(-,root,root) +%doc COPYING NEWS README TODO +%{_bindir}/* +%{_mandir}/man1/* +%{_mandir}/*/man1/jwhois.1* +%{_infodir}/jwhois.info.gz +%config(noreplace) %{_sysconfdir}/jwhois.conf -install -m 644 example/jwhois.conf ${RPM_BUILD_ROOT}/etc +%post +/sbin/install-info %{_infodir}/jwhois.info.gz %{_infodir}/dir -ln -s jwhois ${RPM_BUILD_ROOT}%{_prefix}/bin/whois -ln -s jwhois.1 ${RPM_BUILD_ROOT}%{_mandir}/man1/whois.1 +%preun +if [ $1 = 0 ]; then + /sbin/install-info --delete %{_infodir}/jwhois.info.gz %{_infodir}/dir +fi -rm -rf $RPM_BUILD_ROOT/usr/info - -%find_lang %{name} - %clean -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT +[ "$RPM_BUILD_ROOT" != "/" ] && rm -fr $RPM_BUILD_ROOT -%pre -( [ -f /var/cache/jwhois/jwhois.db ] && \ - rm -f /var/cache/jwhois/jwhois.db ) || true; - -%preun -( [ -f /var/cache/jwhois/jwhois.db ] && \ - rm -f /var/cache/jwhois/jwhois.db ) || true; - -%files -f %{name}.lang -%defattr(-,root,root) -%doc AUTHORS COPYING ChangeLog NEWS README -%config(noreplace) /etc/jwhois.conf -%attr(0755,root,root) %{_prefix}/bin/jwhois -%{_mandir}/man1/jwhois.1* -%{_prefix}/share/locale/*/LC_MESSAGES/jwhois.mo - -%{_prefix}/bin/whois -%{_mandir}/man1/whois.1* -%exclude %{_mandir}/sv/man1/* - %changelog -* Wed May 19 2004 tsintegrate 3.2.2-5ts -- current (3.2.2-4ts) integrated as 3.2.2-5ts for release 1.0-U1 +* Fri Feb 13 2004 Elliot Lee +- rebuilt -* Sun Dec 7 2003 Erlend Midttun 3.2.2-1tr -- New upstream. +* Wed Jan 7 2004 Nalin Dahyabhai 3.2.2-2 +- fix typos in jwhois.conf (#113012) -* Wed Jun 18 2003 Erlend Midttun 3.2.0-3tr -- Big rebuild +* Fri Jul 04 2003 Florian La Roche +- new upstream version 3.2.2 -* Mon Mar 24 2003 Erlend Midttun 3.2.0-2em -- Rebuilt against glibc 2.3.2. +* Wed Jun 04 2003 Elliot Lee +- rebuilt -* Thu Aug 15 2002 Christian H. Toldnes 3.2.0-1ct -- New upstream version: 3.2.0 -- Huge .spec cleanups! +* Sun Feb 02 2003 Florian La Roche +- update to 3.2.1 -* Tue Jul 23 2002 Daniel Meyer 2.4.2-4dm -- rebuild for Trustix Secure Linux 2.0 +* Thu Jan 30 2003 Nalin Dahyabhai 3.2.0-6 +- search whois.publicinternetregistry.net instead of whois.internic.net for + all '.org$' domains (#82802). -* Tue Jun 5 2001 Oystein Viggen -- Disable caching, as it wasn't that useful anyway, had problems and gives us - one less setxid binary in our filesystem. +* Wed Jan 22 2003 Tim Powers 3.2.0-5 +- rebuilt -* Thu Feb 22 2001 Oren Tirosh -- FHS path compliance +* Thu Dec 12 2002 Karsten Hopp 3.2.0-4 +- Requires(post,preun) doesn't seem to work properly -* Wed Jan 10 2001 Ryan Weaver - [jwhois-2.4.2-1] -- src/lookup.c (find_cidr): Fix for big endian machines -- src/jwhois.c (main): Better handling of cache errors (P?l L?berg) -- example/jwhois.conf: Added .in, .nu (Kandra Nyg?rds), .hk (Patrick Liu), - .as (P?l L?berg), .gov.uk (Michael Stevens), .at (Alexander Lehmann) -- src/lookup.c (find_cidr): Match n bits in an /n block instead - of 32-n (Tom Hughes, Emil LAURENTIU) -- po/ru.po: Added (from Dmitry G. Mastrukov) +* Wed Nov 20 2002 Florian La Roche 3.2.0-3 +- require install-info -* Mon Feb 14 2000 Ryan Weaver - [jwhois-2.4.1-2] -- jwhois now runs as user nobody aswell as group nobody so that the - cached database isn't owned by 'the first user to run jwhois', thus - affecting their quota. (Thanks to Oren Tirosh ) -- Oren Tirosh also informed me that since he was the - first one to make a rpm for jwhois, it was unkind of me to rewrite and - maintain the rpm for jwhois without as least leaving his rpm changelog - entries. Sorry Oren, I can no longer locate the old rpms to replace - your entries. +* Thu Nov 14 2002 Nalin Dahyabhai 3.2.0-2 +- don't bail out of %%install if make install doesn't create an info top node -* Thu Jan 27 2000 Ryan Weaver - [jwhois-2.4.1-1] -- example/jwhois.conf: Added more CIDR blocks - Changed registry for .no and added -NORID handles (from P?l L?berg) -- configure.in: Added generation of jwhois.spec -- Makefile.am (EXTRA_DIST): Added distribution of jwhois.spec -- jwhois.spec.in: Added (from Ryan Weaver) -- src/jwhois.c (make_connect): Output [host]\n -before- doing a - resolver query (speeds up output so the user doesn't think it's hung) -- src/utils.c (fdread): Check return value from read correctly -- example/jwhois.conf: corrected \. to be \\. - -* Mon Jan 24 2000 Ryan Weaver - [jwhois-2.4-2] -- Made package relocatable. -- Including available locales now. -- Rewrote spec file. -- Made patch against source to include spec it distribution and sent it - to the author. +* Mon Sep 30 2002 Nalin Dahyabhai 3.2.0-1 +- initial package From svn at tinysofa.org Thu Jul 1 15:49:11 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:49:11 +1000 (EST) Subject: [tinysofa-svn] r2767 - in tinysofa/snapshot/kbd/current: sources specs Message-ID: <20040701154911.EC5434E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:49:11 +1000 (Fri, 02 Jul 2004) New Revision: 2767 Modified: tinysofa/snapshot/kbd/current/sources/keytable.init tinysofa/snapshot/kbd/current/specs/kbd.spec Log: - Sync with 2.0. - Kept: - kbd-1.08-compose.patch: - kbd-1.08-rukbd.patch: - kbd-1.08-sparc.patch: - kbd-1.08-terminal.patch: - kbd-1.12.tar.bz2: - kbd-1.12.tar.bz2.sign: - kbd-latsun-fonts.tar.bz2: - kbdrate.apps: - kbdrate.pam: - keytable.init: Modified: tinysofa/snapshot/kbd/current/sources/keytable.init =================================================================== --- tinysofa/snapshot/kbd/current/sources/keytable.init 2004-07-01 15:49:09 UTC (rev 2766) +++ tinysofa/snapshot/kbd/current/sources/keytable.init 2004-07-01 15:49:11 UTC (rev 2767) @@ -38,11 +38,11 @@ [ $RES -ne 0 ] && echo_failure echo fi - [ $RETVAL -eq 0 ] && touch ${INITLOCK:-/mnt/lockdev}/keytable + [ $RETVAL -eq 0 ] && touch /var/lock/subsys/keytable } stop() { - rm -f ${INITLOCK:-/mnt/lockdev}/keytable + rm -f /var/lock/subsys/keytable } restart() { Modified: tinysofa/snapshot/kbd/current/specs/kbd.spec =================================================================== --- tinysofa/snapshot/kbd/current/specs/kbd.spec 2004-07-01 15:49:09 UTC (rev 2766) +++ tinysofa/snapshot/kbd/current/specs/kbd.spec 2004-07-01 15:49:11 UTC (rev 2767) @@ -3,16 +3,15 @@ Version: 1.12 Release: 1ts License: GPL -Group: tinysofa official +Group: System Environment/Base Source0: ftp://ftp.kernel.org/pub/linux/utils/kbd/kbd-%{version}.tar.bz2 Source1: ftp://ftp.kernel.org/pub/linux/utils/kbd/kbd-%{version}.tar.bz2.sign Source2: kbdrate.apps Source3: kbdrate.pam Source4: keytable.init Source5: kbd-latsun-fonts.tar.bz2 -Requires: pam >= 0.66-4, /etc/pam.d/system-auth -BuildRequires: bison gettext flex byacc -BuildRoot: %{_tmppath}/%{name}-root +Requires: pam >= 0.66-4, /etc/pam.d/system-auth, usermode +BuildRoot: %{_tmppath}/%{name}-%{version}-root Patch0: kbd-1.08-sparc.patch Patch1: kbd-1.08-compose.patch Patch4: kbd-1.08-terminal.patch @@ -73,7 +72,6 @@ # Basic install. make install \ - DESTDIR=$RPM_BUILD_ROOT \ BINDIR=$RPM_BUILD_ROOT/%{_bindir} \ LOADKEYS_BINDIR=$RPM_BUILD_ROOT/bin \ MANDIR=$RPM_BUILD_ROOT/%{_mandir} \ @@ -92,6 +90,9 @@ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/security/console.apps mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/pam.d mv $RPM_BUILD_ROOT%{_bindir}/kbdrate $RPM_BUILD_ROOT%{_sbindir} +ln -s consolehelper $RPM_BUILD_ROOT%{_bindir}/kbdrate +install -c -m644 $RPM_SOURCE_DIR/kbdrate.apps \ + $RPM_BUILD_ROOT%{_sysconfdir}/security/console.apps/kbdrate install -c -m644 $RPM_SOURCE_DIR/kbdrate.pam \ $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/kbdrate @@ -115,17 +116,10 @@ %{_sbindir}/* %{_mandir}/*/* /lib/kbd +%config %{_sysconfdir}/security/console.apps/* %config %{_sysconfdir}/pam.d/* %changelog -* Wed May 19 2004 tsintegrate 1.12-1ts -- current (1.12-1ok) integrated as 1.12-1ts for release 1.0-U1 - -* Fri May 14 2004 Omar Kilani 1.12-1ok -- Fix non-root build. -- Import from Fedora. -- Replace console-tools. - * Thu Feb 26 2004 Adrian Havill - update to 1.12 @@ -279,4 +273,4 @@ - Add triggerpostun -- console-tools magic to get sane fonts and mappings * Tue Apr 17 2001 Erik Troan -- initial packaging for kbdrate \ No newline at end of file +- initial packaging for kbdrate From svn at tinysofa.org Thu Jul 1 15:49:44 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:49:44 +1000 (EST) Subject: [tinysofa-svn] r2769 - in tinysofa/snapshot/kudzu/current: sources specs Message-ID: <20040701154944.B45BE4E817D@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:49:44 +1000 (Fri, 02 Jul 2004) New Revision: 2769 Added: tinysofa/snapshot/kudzu/current/sources/kudzu-1.1.71.tar.gz Removed: tinysofa/snapshot/kudzu/current/sources/kudzu-1.1.22-link-slang.patch tinysofa/snapshot/kudzu/current/sources/kudzu-1.1.22.tar.gz tinysofa/snapshot/kudzu/current/sources/kudzu-1.1.22.tinysofa.patch tinysofa/snapshot/kudzu/current/sources/kudzu.init tinysofa/snapshot/kudzu/current/sources/mkdtemp.tar.gz Modified: tinysofa/snapshot/kudzu/current/specs/kudzu.spec Log: - Sync with 2.0. - Added: - kudzu-1.1.71.tar.gz: - Removed: - kudzu-1.1.22-link-slang.patch: - kudzu-1.1.22.tar.gz: - kudzu-1.1.22.tinysofa.patch: - kudzu.init: - mkdtemp.tar.gz: Deleted: tinysofa/snapshot/kudzu/current/sources/kudzu-1.1.22-link-slang.patch =================================================================== --- tinysofa/snapshot/kudzu/current/sources/kudzu-1.1.22-link-slang.patch 2004-07-01 15:49:37 UTC (rev 2768) +++ tinysofa/snapshot/kudzu/current/sources/kudzu-1.1.22-link-slang.patch 2004-07-01 15:49:44 UTC (rev 2769) @@ -1,12 +0,0 @@ -diff -urN kudzu-1.1.22/Makefile kudzu-1.1.22.slang/Makefile ---- kudzu-1.1.22/Makefile 2004-05-19 10:45:01.000000000 +1000 -+++ kudzu-1.1.22.slang/Makefile 2004-05-19 10:46:10.000000000 +1000 -@@ -82,7 +82,7 @@ - $(RANLIB) libkudzu.a - - kudzu: libkudzu.a $(KUDOBJS) po -- $(CC) $(CFLAGS) $(LDFLAGS) $(KUDOBJS) -o kudzu -L. -lkudzu -L. -lpci -lnewt -lpopt -+ $(CC) $(CFLAGS) $(LDFLAGS) $(KUDOBJS) -o kudzu -L. -lkudzu -L. -lpci -lnewt -lpopt -lslang - - updfstab: libkudzu.a updfstab.o po - $(CC) $(CFLAGS) $(LDFLAGS) updfstab.o -o updfstab -L. -lkudzu -lpci -lpopt Deleted: tinysofa/snapshot/kudzu/current/sources/kudzu-1.1.22.tar.gz =================================================================== (Binary files differ) Deleted: tinysofa/snapshot/kudzu/current/sources/kudzu-1.1.22.tinysofa.patch =================================================================== --- tinysofa/snapshot/kudzu/current/sources/kudzu-1.1.22.tinysofa.patch 2004-07-01 15:49:37 UTC (rev 2768) +++ tinysofa/snapshot/kudzu/current/sources/kudzu-1.1.22.tinysofa.patch 2004-07-01 15:49:44 UTC (rev 2769) @@ -1,37 +0,0 @@ -diff -urN kudzu-1.1.22/Makefile kudzu-1.1.22.tinysofa/Makefile ---- kudzu-1.1.22/Makefile 2003-08-02 05:50:53.000000000 +1000 -+++ kudzu-1.1.22.tinysofa/Makefile 2004-05-13 16:03:43.000000000 +1000 -@@ -115,12 +115,12 @@ - install -m 755 -d $(mandir)/man8 - install -m 644 updfstab.8 $(mandir)/man8/updfstab.8 - install -m 755 module_upgrade $(sbindir)/module_upgrade -- install -m 755 -d $(sysconfdir)/rc.d/init.d -+ install -m 755 -d $(sysconfdir)/init.d - install -m 755 -d $(sysconfdir)/sysconfig - install -m 644 kudzu.8 $(mandir)/man8/kudzu.8 - install -m 644 module_upgrade.8 $(mandir)/man8/module_upgrade.8 - install -m 644 updfstab.8 $(mandir)/man8/updfstab.8 -- install -m 755 kudzu.init $(sysconfdir)/rc.d/init.d/kudzu -+ install -m 755 kudzu.init $(sysconfdir)/init.d/kudzu - install -m 644 kudzu.sysconfig $(sysconfdir)/sysconfig/kudzu - install -m 755 -d $(libdir) - install -m 644 libkudzu.a $(libdir)/libkudzu.a -diff -urN kudzu-1.1.22/hwconf.c kudzu-1.1.22.tinysofa/hwconf.c ---- kudzu-1.1.22/hwconf.c 2003-09-25 09:37:15.000000000 +1000 -+++ kudzu-1.1.22.tinysofa/hwconf.c 2004-05-13 16:04:55.000000000 +1000 -@@ -1017,6 +1017,7 @@ - } - break; - case CLASS_MOUSE: -+#if 0 // no mouse in tinysofa - makeLink(dev,"mouse"); - if (!quiet) { - newtSuspend(); -@@ -1037,6 +1038,7 @@ - openlog("kudzu",0,LOG_USER); - syslog(LOG_NOTICE,_("ran mouseconfig for %s"),dev->device); - closelog(); -+#endif - break; - case CLASS_KEYBOARD: - if (!rewriteInittab(dev)) Added: tinysofa/snapshot/kudzu/current/sources/kudzu-1.1.71.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/kudzu/current/sources/kudzu-1.1.71.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: tinysofa/snapshot/kudzu/current/sources/kudzu.init =================================================================== --- tinysofa/snapshot/kudzu/current/sources/kudzu.init 2004-07-01 15:49:37 UTC (rev 2768) +++ tinysofa/snapshot/kudzu/current/sources/kudzu.init 2004-07-01 15:49:44 UTC (rev 2769) @@ -1,99 +0,0 @@ -#!/bin/bash -# -# kudzu This scripts runs the kudzu hardware probe. -# -# chkconfig: 345 05 95 -# description: This runs the hardware probe, and optionally configures \ -# changed hardware. - -# This is an interactive program, we need the current locale - -[ -f /etc/profile.d/lang.sh ] && . /etc/profile.d/lang.sh -[ -z "${CONSOLETYPE:-}" ] && CONSOLETYPE="`/sbin/consoletype`" - -if [ "$CONSOLETYPE" != "pty" ]; then - case "${LANG:-}" in - ja_JP*|ko_KR*|zh_CN*|zh_TW*) - export LANG=en_US - ;; - *) - export LANG - ;; - esac -fi - -if [ "$CONSOLETYPE" = "serial" ]; then - export TERM=vt100 -fi - -# Source function library. -. /etc/init.d/functions - -KUDZU_ARGS= - -# Do we want to do a safe probe? -. /etc/sysconfig/kudzu - -if [ "$SAFE" != "no" ]; then - KUDZU_ARGS="-s" -fi - -RETVAL=$? - -case "$1" in - start) - echo -n $"Checking for new hardware" - rm -f /var/run/Xconfig - rm -f /var/run/Xconfig-failed - - # Have a 30 second timeout. - /usr/sbin/kudzu $KUDZU_ARGS -t 30 - RETVAL=$? - if [ "$RETVAL" -eq 0 ]; then - action "" /bin/true - else - action "" /bin/false - if [ "$RETVAL" -eq 5 ]; then - echo -n $"Hardware configuration timed out." - echo -n $"Run '/usr/sbin/kudzu' from the command line to re-detect." - initlog -n kudzu -s $"Hardware configuration timed out." - initlog -n kudzu -s $"Run '/usr/sbin/kudzu' from the command line to re-detect." - fi - fi - - # we can now update the file system table w/o a hardware refresh. - action $"Updating /etc/fstab" /usr/sbin/updfstab --skipprobe - - # We don't want to run this on random runlevel changes. - touch ${INITLOCK:-/mnt/lockdev}/kudzu - # However, if they did configure X and want runlevel 5, let's - # switch to it... - if [ -f /var/run/Xconfig ]; then - grep -q "^id:5:initdefault:" /etc/inittab && telinit 5 - rm -f /var/run/Xconfig - fi - # If X configuration failed, give them a sane default. - if [ -f /var/run/Xconfig-failed ]; then - telinit 3 - rm -f /var/run/Xconfig-failed - fi - ;; - status) - base=kudzu - if [ -f ${INITLOCK:-/mnt/lockdev}/kudzu ]; then - echo $"${base} has run" - exit 0 - fi - echo $"${base} is stopped" - exit 3 - ;; - stop) - rm -f ${INITLOCK:-/mnt/lockdev}/kudzu - ;; - *) - echo $"Usage: $0 {start|stop}" - exit 1 - ;; -esac - -exit $RETVAL Deleted: tinysofa/snapshot/kudzu/current/sources/mkdtemp.tar.gz =================================================================== (Binary files differ) Modified: tinysofa/snapshot/kudzu/current/specs/kudzu.spec =================================================================== --- tinysofa/snapshot/kudzu/current/specs/kudzu.spec 2004-07-01 15:49:37 UTC (rev 2768) +++ tinysofa/snapshot/kudzu/current/specs/kudzu.spec 2004-07-01 15:49:44 UTC (rev 2769) @@ -1,20 +1,23 @@ Name: kudzu -Version: 1.1.22 +Version: 1.1.71 Release: 1ts -License: GPL -Summary: The Red Hat Linux hardware probing tool. -Group: tinysofa official -Source: kudzu-%{version}.tar.gz -Source1: mkdtemp.tar.gz -Source2: kudzu.init -Patch0: kudzu-1.1.22.tinysofa.patch -Patch1: kudzu-1.1.22-link-slang.patch -Requires: hwdata +Copyright: GPL +Summary: The tinysofa hardware probing tool. +Group: Applications/System +URL: http://rhlinux.redhat.com/kudzu/ +Source: kudzu-%{PACKAGE_VERSION}.tar.gz Obsoletes: rhs-hwdiag setconsole -Prereq: chkconfig, modutils >= 2.3.11-5, tinysofa-utils -BuildPrereq: pciutils-devel python-devel newt-devel -BuildRequires: gettext python slang-devel dietlibc -BuildRoot: %{_tmppath}/%{name}-root +Prereq: chkconfig, modutils >= 2.3.11-5, /etc/init.d +Requires: pam >= 0.74-17, hwdata +Conflicts: netconfig < 0.8.18 +Conflicts: Xconfigurator <= 4.9 +Conflicts: mouseconfig < 4.18 +Requires: hwdata >= 0.116-1 +BuildPrereq: pciutils-devel >= 2.1.11-1, python-devel python newt-devel gettext +%ifarch i386 +BuildPrereq: dietlibc +%endif +BuildRoot: %{_tmppath}/%{name}-%{version}-root %description Kudzu is a hardware probing tool run at system boot time to determine @@ -22,7 +25,7 @@ %package devel Summary: Development files needed for hardware probing using kudzu. -Group: tinysofa official +Group: Development/Libraries Requires: pciutils-devel %description devel @@ -31,34 +34,32 @@ %prep -%setup -q -a 1 -%patch0 -p1 -%patch1 -p1 +%setup +# hack: do not start kudzu on s390/s390x on bootup +%ifarch s390 s390x +perl -pi -e "s/345/-/g" kudzu.init +%endif + %build ln -s `pwd` kudzu -RPM_OPT_FLAGS="`echo $RPM_OPT_FLAGS | sed -e 's/-D_FILE_OFFSET_BITS=64//'`" -export RPM_OPT_FLAGS -make RPM_OPT_FLAGS="$RPM_OPT_FLAGS %{?no_stack_protector}" all kudzu +make RPM_OPT_FLAGS="%{optflags} -I." all kudzu + %install -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT -make install install-program DESTDIR=$RPM_BUILD_ROOT -python -c 'from compileall import *; compile_dir("'$RPM_BUILD_ROOT'/usr/lib/python2.3",10,"/usr/lib/python2.3")' +rm -rf $RPM_BUILD_ROOT +make install install-program DESTDIR=$RPM_BUILD_ROOT libdir=$RPM_BUILD_ROOT/%{_libdir} -install -m 755 %{SOURCE2} $RPM_BUILD_ROOT/etc/init.d/kudzu +install -m 755 fix-mouse-psaux $RPM_BUILD_ROOT/%{_sbindir} %find_lang %{name} %clean -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT +rm -rf $RPM_BUILD_ROOT %post chkconfig --add kudzu -(/usr/sbin/kudzu -q -s; /usr/sbin/updfstab) >/dev/null 2>&1 -/sbin/restart_maybe kudzu - %preun if [ $1 = 0 ]; then chkconfig --del kudzu @@ -67,92 +68,421 @@ %files -f %{name}.lang %defattr(-,root,root) %doc README hwconf-description -%{_sbindir}/* +%{_sbindir}/kudzu +%{_sbindir}/module_upgrade +%{_sbindir}/updfstab +%{_sbindir}/fix-mouse-psaux %{_mandir}/man8/* %config(noreplace) /etc/sysconfig/kudzu -%config /etc/init.d/kudzu -%config(noreplace) /etc/updfstab.conf -%config /etc/updfstab.conf.default +%config /etc/rc.d/init.d/kudzu %{_libdir}/python*/site-packages/* -%files devel +%Files devel %defattr(-,root,root) %{_libdir}/libkudzu.a %{_libdir}/libkudzu_loader.a %{_includedir}/kudzu %changelog -* Wed May 19 2004 tsintegrate 1.1.22-1ts -- current (1.1.22-1ok) integrated as 1.1.22-1ts for release 1.0-U1 +* Wed Jun 23 2004 Jeremy Katz - 1.1.71-1 +- use new sysfs bits for vio probing on iSeries -* Wed May 19 2004 Omar Kilani -- Add link-slang patch. +* Fri Jun 18 2004 Jeremy Katz - 1.1.70-1 +- fix build with gcc 3.4 -* Tue May 18 2004 Omar Kilani -- Add BuildRequires dietlibc. +* Thu Jun 3 2004 Bill Nottingham - 1.1.69-1 +- look for the right X server (#125169, ) +- configure X even in non-interactive mode -* Thu May 13 2004 Omar Kilani 1.1.22-1ok -- New Upstream. +* Mon May 24 2004 Bill Nottingham - 1.1.68-1 +- fix checking of modules loaded which have a - in their name as + /proc/modules will contain an _ instead, this time for the !loader + case (#122983, at least) -* Tue May 11 2004 Omar Kilani -- Add BuildRequires: gettext python slang-devel +* Fri May 21 2004 Jeremy Katz - 1.1.67-1 +- look for module.usbmap under /modules also for anaconda usage -* Tue Mar 30 2004 Omar Kilani 0.99.23-25ts -- Python 2.3. +* Wed May 19 2004 Bill Nottingham 1.1.66-1 +- MacIO fixes (#115286, ) -* Tue Feb 17 2004 Chr. Toldnes 0.99.23-21tr -- built with -fno-stack-protector +* Thu May 13 2004 Karsten Hopp 1.1.65-1 +- add CTC and Escon detection (mainframe) -* Wed Dec 17 2003 Erlend Midttun 0.99.23-20tr -- Try new RPM_OPT_FLAGS +* Tue May 11 2004 Karsten Hopp 1.1.64-1 +- change QETH module name back, newer kernels have reverted the + name change -* Thu Dec 11 2003 Erlend Midttun 0.99.23-19tr -- Big rebuild +* Mon May 10 2004 Jeremy Katz - 1.1.63-1 +- minor fix for viodasd probing -* Fri Nov 7 2003 Chr. Toldnes 0.99.23-18tr -- Make %%post truly silent +* Fri May 7 2004 Jeremy Katz - 1.1.62-1 +- add i2o probing code from Markus Lidel -* Fri Oct 31 2003 Chr. Toldnes 0.99.23-17tr -- backport +* Thu May 6 2004 Karsten Hopp 1.1.61-1 +- fix QETH module name +- add HiperSockets +- fix DASD detection -* Sun Sep 28 2003 Chr. Toldnes 0.99.23-16tsl -- port to tawie +* Wed May 5 2004 Jeremy Katz 1.1.60-1 +- fix checking of modules loaded which have a - in their name as + /proc/modules will contain an _ instead (#121955, #120289, #120360) -* Wed Jun 18 2003 Erlend Midttun 0.99.23-15tr -- Big rebuild +* Mon May 3 2004 Bill Nottingham - 1.1.59-1 +- shut up modprobe (#120410) +- re-enable the mouse config code (#121139, #121487) -* Thu Jun 5 2003 Tore Olsen 0.99.23-14to -- drop locales +* Thu Apr 29 2004 Jeremy Katz - 1.1.58-1 +- fix libkudzu_loader for ppc -* Mon Mar 24 2003 Erlend Midttun 0.99.23-13em -- Rebuilt against glibc 2.3.2. +* Mon Apr 19 2004 Jeremy Katz - 1.1.57-1 +- add probing for VIO bus for iSeries +- add probing for S390 bus for s390 -* Fri Feb 21 2003 Roland Kruse 0.99.23-12rk -- Fix bug 178: run kudzu & updfstab in %post to create symlinks etc. +* Thu Apr 15 2004 Bill Nottingham - 1.1.56-1 +- move updfstab.conf to hwdata +- fix sound aliases to be snd-card-X -* Wed Feb 19 2003 Erlend Midttun 0.99.23-11em -- Fix Group setting. +* Thu Apr 1 2004 Bill Nottingham - 1.1.54-1 +- fix overrun in usb code (#119654) +- fix use-after-free in network code (#119655, ) -* Thu Nov 21 2002 Christian H. Toldnes 0.99.23-10ct -- kudzu initscript now uses $INITLOCK +* Wed Mar 24 2004 Bill Nottingham +- mouse configuration fixes -* Fri Sep 6 2002 Roland Kruse 0.99.23-9rk -- Moved data files /usr/share/kudzu/* to package hwdata - /usr/share/hwdata (Patch4) +* Wed Mar 17 2004 Bill Nottingham - 1.1.53-1 +- hack: add mouse-cleaner-upper here -* Wed Sep 4 2002 Roland Kruse 0.99.23-8rk -- Updated pcitable. +* Fri Mar 12 2004 Bill Nottingham - 1.1.52-1 +- fix libkudzu_loader -* Wed Jul 17 2002 Roland Kruse 0.99.23-7rk -- Initscripts moved to /etc/init.d. Fixed group. +* Thu Mar 11 2004 Bill Nottingham - 1.1.51-1 +- add a PROBE_LOADED for installer use +- remove ide-scsi cdwriter hacks from updfstab -* Mon Jun 10 2002 Christian H. Toldnes 0.99.23-5ct -- Fixed chkconfig issue. Added restrt_maybe +* Wed Mar 10 2004 Jeremy Katz - 1.1.50-1 +- fix loader segfault -* Fri Jun 7 2002 Christian H. Toldnes -- Rebuid og GD's package. Copyright changed to License -- Built against python 2.2 +* Wed Mar 10 2004 Bill Nottingham 1.1.49-1 +- do some more munging in the loader-specific code, for cards + without ethtool support +- minimal port of the ieee1394 sbp2 probe to 2.6 +* Thu Mar 4 2004 Bill Nottingham 1.1.48-1 +- fix module_upgrade + +* Mon Mar 1 2004 Bill Nottingham 1.1.47-1 +- fix dac960 probe (#116126, ) + +* Wed Feb 25 2004 Bill Nottingham 1.1.46-1 +- write more correct audio lines for 2.6 +- fix pcmcia probe to only report the class you asked for + +* Fri Feb 20 2004 Bill Nottingham 1.1.45-1 +- fix various bogosities in new and improved PS/2 probe + +* Wed Feb 11 2004 Bill Nottingham 1.1.44-1 +- new and improved PS/2 probe - requires a 2.6 kernel + +* Fri Feb 6 2004 Bill Nottingham 1.1.43-1 +- add patch for smartarray/dac960 devices () + +* Wed Feb 4 2004 Bill Nottingham 1.1.42-1 +- fix segfault on CLASS_NETWORK devices with no device set (#106332) +- fix various network device naming snafus (#114611, #113418) + +* Thu Jan 29 2004 Bill Nottingham 1.1.41-1 +- switch some behaviors on 2.4 vs 2.6 + +* Fri Dec 5 2003 Jeremy Katz 1.1.40-1 +- write out install/remove instead of post-install/pre-remove for modprobe.conf + +* Fri Nov 21 2003 Bill Nottingham 1.1.39-1 +- pci domain support + +* Mon Nov 17 2003 Jeremy Katz 1.1.38-1 +- fix scsi probing for 2.6 kernel + +* Thu Nov 6 2003 Jeremy Katz 1.1.37-1 +- rebuild for python 2.3 + +* Fri Oct 31 2003 Bill Nottingham 1.1.36-1 +- only reset rhgb details screen if we turned it on (#108712) + +* Wed Oct 22 2003 Bill Nottingham 1.1.35-1 +- take out the check for local X display (#107679) +- a couple of rhgb interaction tweaks + +* Fri Oct 17 2003 Bill Nottingham 1.1.34-1 +- switch to new scsi device id code (#102136, 107350) +- fix scsi tape enumeration (#107361) + +* Fri Oct 10 2003 Bill Nottingham 1.1.33-1 +- add a diskonkey device (#105939, ) + +* Wed Oct 8 2003 Bill Nottingham 1.1.32-1 +- ignoremulti option and corresponding iPod support (#98881, ) +- add a NEC USB floppy (#97681, ) +- add another flash entry (#101990, +- don't probe PS/2 mice if rhgb appears to be running + +* Fri Oct 3 2003 Bill Nottingham 1.1.31-1 +- tweak RadeonIGP exclude list to be less exclusive + +* Thu Oct 2 2003 Bill Nottingham 1.1.30-1 +- resurrect PCI disabled probe for video cards (#91265, #106030) +- don't probe PS/2 mice if we appear to be running on a local X display + +* Wed Sep 24 2003 Bill Nottingham 1.1.21-1 +- fix clashing 'serial' consoles (#104851) + +* Wed Aug 27 2003 Bill Nottingham 1.1.20-1 +- export CLASS_IDE in the python module + +* Mon Aug 25 2003 Bill Nottingham 1.1.19-1 +- fix a bug that could misorder ethernet devices + +* Fri Aug 22 2003 Bill Nottingham 1.1.18-1 +- set up hvc0 on pSeries (#98007) + +* Mon Aug 18 2003 Bill Nottingham 1.1.17-1 +- fix segfault, and don't call matchNetDevices() so often (#102617) + +* Fri Aug 15 2003 Bill Nottingham 1.1.16-1 +- more changes/fixes to guarantee uniqueness of network device names +- use this for configuration/deconfiguration (#61169) +- various other networking-related fixes (#101488, #99269) + +* Tue Aug 5 2003 Bill Nottingham 1.1.15-1 +- viocd probing (#89232) +- read /etc/sysconfig/network-scripts/ifcfg-* for device names (#99269) + +* Thu Jul 17 2003 Jeremy Katz 1.1.13-1 +- fix another segfault (#99317) + +* Tue Jul 15 2003 Bill Nottingham 1.1.12-1 +- fix segfault (#99176) + +* Fri Jul 11 2003 Bill Nottingham 1.1.11-1 +- remove debugging code. duh. + +* Thu Jul 10 2003 Bill Nottingham 1.1.10-1 +- fix bug that would cause us to lose track of some network devices + +* Thu Jul 3 2003 Bill Nottingham 1.1.9-1 +- associate ethernet hardware address with PCI, PCMCIA, USB ethernet + devices + +* Tue Jun 24 2003 Bill Nottingham 1.1.7-1 +- fix updfstab to not do bizarre things when called in parallel (#89229) + +* Thu Jun 19 2003 Bill Nottingham 1.1.6-1 +- fix some of the python bindings + +* Mon Jun 9 2003 Bill Nottingham 1.1.5-1 +- probe IDE controllers, for those driven by separate modules (SATA) + +* Wed May 21 2003 Brent Fox 1.1.4-1.1 +- replace call to kbdconfig with redhat-config-keyboard (bug #87919) + +* Thu Apr 17 2003 Bill Nottingham 1.1.3-1 +- fix severe blowing of the stack + +* Wed Apr 16 2003 Bill Nottingham 1.1.2-1 +- fix module_upgrade + +* Wed Mar 26 2003 Bill Nottingham 1.1.1-1 +- fix asignment of class in readDevice() + +* Mon Mar 17 2003 Bill Nottingham 1.1.0-1 +- change semantics of class enumeration; now treated bitwise, like bus +- make BUS_UNSPEC and CLASS_UNSPEC ~0 instead of 0 +- change field name from 'class' to 'type' for C++ happiness (#26463) + +* Tue Feb 25 2003 Bill Nottingham 0.99.99-1 +- fix syntax error (#85127) + +* Thu Feb 20 2003 Bill Nottingham 0.99.98-1 +- fix segfault in updfstab --skipprobe by weeding out non + ide/scsi/misc/firewire devices + +* Wed Feb 19 2003 Bill Nottingham 0.99.97-1 +- don't say PS/2 mice are removed in safe mode (#80662) +- don't configure USB mice; they're always configured (#84047) +- fix PCMCIA ranges () +- set LANG, not LC_MESSAGES, for CJK in init script + +* Thu Feb 13 2003 Bill Nottingham 0.99.96-1 +- add support for another USB floppy drive to updfstab (#70282) +- fix removal of wrong device in updfstab on USB device removal (#77382) + +* Thu Feb 13 2003 Elliot Lee 0.99.95-1 +- Add ppc64 to Makefile + +* Tue Feb 11 2003 Bill Nottingham 0.99.94-1 +- MacIO, ADB, and ppc DDC probing () +- tweak serial probe +- fix silly initscript typo + +* Fri Jan 31 2003 Bill Nottingham 0.99.92-1 +- fix segfault (#83255) + +* Wed Jan 29 2003 Bill Nottingham 0.99.91-1 +- support in updfstab for linking /dev/cdwriter to /dev/sg* + +* Thu Jan 23 2003 Bill Nottingham 0.99.90-1 +- don't show CJK on console (#82537) +- fix handling of null strings in kudzumodule + +* Mon Jan 20 2003 Bill Nottingham 0.99.89-1 +- really fix the broken ps2 probe + +* Thu Jan 16 2003 Bill Nottingham 0.99.88-1 +- ps2 probe fixing + +* Fri Jan 10 2003 Bill Nottingham 0.99.87-1 +- add -k to specify kernel version to look for modules for +- usb class -> kudzu class mapping tweaks + +* Mon Jan 6 2003 Bill Nottingham 0.99.86-1 +- PCMCIA probing support +- PCMCIA fixes + +* Tue Dec 3 2002 Bill Nottingham 0.99.83-1 +- switch floppy probing back + +* Tue Nov 26 2002 Bill Nottingham 0.99.82-1 +- write "udf,iso9660" in updfstab + +* Fri Nov 22 2002 Bill Nottingham 0.99.81-1 +- handle compressed modules + +* Thu Nov 14 2002 Preston Brown 0.99.80-1 +- speed up floppy probe. + +* Wed Nov 13 2002 Bill Nottingham 0.99.79-1 +- fix broken ps2 probe +- remove check for X in ps2 code + +* Wed Nov 13 2002 Preston Brown 0.99.77-1 +- boot-time optimizations and speedups + +* Tue Nov 12 2002 Bill Nottingham 0.99.76-1 +- mouse driver tweakage + +* Mon Nov 4 2002 Bill Nottingham 0.99.75-1 +- deal with switched network driver mappings + +* Tue Sep 3 2002 Bill Nottingham 0.99.69-1 +- don't have mouseconfig modify X configs for USB mice (#69581) + +* Mon Sep 2 2002 Bill Nottingham 0.99.68-1 +- fix parallel device naming +- fix printer config () + +* Fri Aug 23 2002 Jeremy Katz 0.99.66-1 +- build libkudzu_loader with diet on x86 to avoid conflicting ideas about + dirent in the loader + +* Wed Aug 21 2002 Bill Nottingham 0.99.65-1 +- fix duplicate modules.conf entries, and other weirdness (#68905, #68044) + +* Thu Aug 15 2002 Bill Nottingham 0.99.64-2 +- rebuild against new newt + +* Tue Aug 13 2002 Bill Nottingham 0.99.64-1 +- fix firewire probe +- fix firewire mapping in python module + +* Mon Jul 29 2002 Bill Nottingham 0.99.63-4 +- add missing header + +* Wed Jul 24 2002 Bill Nottingham 0.99.63-1 +- USB printer config support + +* Tue Jul 23 2002 Bill Nottingham 0.99.62-1 +- printer config support + +* Mon Jul 22 2002 Bill Nottingham 0.99.61-1 +- kill Xconfigurator support, add redhat-config-xfree86 support + +* Sun Jul 21 2002 Bill Nottingham 0.99.60-1 +- firewire controller support (#65386, ) +- minimal firewire bus probing + +* Wed Jul 17 2002 Bill Nottingham 0.99.59-1 +- fix fix for #66652 +- fix serial console support + +* Thu Jul 11 2002 Bill Nottingham 0.99.57-1 +- fix assorted brokenness in the DDC probing + +* Thu Jul 11 2002 Erik Troan 0.99.56-1 +- collapsed jaz/zip entries into consistent /mnt/jaz, /mnt/zip mount points + +* Sun Jul 07 2002 Erik Troan +- added CAMERA search string for updfstab (Minolta S304, at least) + +* Thu Jun 27 2002 Bill Nottingham 0.99.55-1 +- don't initialize full device lists on all probes () + +* Wed Jun 19 2002 Bill Nottingham 0.99.54-1 +- more modules.pcimap blacklisting (#66652) + +* Mon Jun 17 2002 Bill Nottingham +- rebuild against new slang + +* Wed Apr 17 2002 Bill Nottingham +- fix uninitialized variable (#63664) + +* Mon Apr 15 2002 Bill Nottingham +- fix segfault in pciserial code + +* Sat Apr 6 2002 Bill Nottingham +- set buffering for reading /proc/partitions (#61617, #56815) + +* Tue Apr 2 2002 Bill Nottingham +- add support for USB2 (ehci-hcd) +- add device entries for *all* usb interfaces, not just the first (#52758) + +* Thu Mar 21 2002 Bill Nottingham +- fix various ethernet device removal bugs (#61169) + +* Fri Feb 22 2002 Bill Nottingham +- rebuild + +* Thu Jan 31 2002 Bill Nottingham +- quick hack + +* Wed Jan 30 2002 Bill Nottingham +- require hwdata, tweak paths accordingly +- require eepro100-diag on ia64 + +* Tue Jan 15 2002 Bill Nottingham +- rename config file to updfstab.conf + +* Mon Jan 07 2002 Erik Troan +- updated updfstab to use a config file + +* Mon Jan 7 2002 Bill Nottingham +- don't print out VBE videocards when asked for DDC monitors, and vice + versa + +* Fri Jan 4 2002 Bill Nottingham +- fix LRMI to work with pthreads + +* Thu Jan 3 2002 Bill Nottingham +- split vbe-probed memory into its own video device +- fix a segfault in pci.c on bad pcitable data + +* Thu Oct 11 2001 Bill Nottingham +- go to the head of the tree. mmm, python 2.2 + +* Tue Sep 25 2001 Bill Nottingham +- dink with eepro100 eeproms + +* Sat Sep 8 2001 Bill Nottingham +- add G550 pci id + * Thu Sep 6 2001 Bill Nottingham - fix enabling of bcm5820 in boot environment @@ -679,4 +1009,4 @@ * Wed Sep 8 1999 Bill Nottingham - get geometry for ide drives -- enumerate buses (jj at ultra.linux.cz) \ No newline at end of file +- enumerate buses (jj at ultra.linux.cz) From svn at tinysofa.org Thu Jul 1 15:50:14 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:50:14 +1000 (EST) Subject: [tinysofa-svn] r2778 - in tinysofa/snapshot/libxml2/current: sources specs Message-ID: <20040701155014.C13004E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:50:14 +1000 (Fri, 02 Jul 2004) New Revision: 2778 Added: tinysofa/snapshot/libxml2/current/sources/libxml2-2.6.10.tar.gz Removed: tinysofa/snapshot/libxml2/current/sources/libxml2-2.6.9.tar.gz Modified: tinysofa/snapshot/libxml2/current/specs/libxml2.spec Log: - Sync with 2.0. - Added: - libxml2-2.6.10.tar.gz: - Removed: - libxml2-2.6.9.tar.gz: Added: tinysofa/snapshot/libxml2/current/sources/libxml2-2.6.10.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/libxml2/current/sources/libxml2-2.6.10.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: tinysofa/snapshot/libxml2/current/sources/libxml2-2.6.9.tar.gz =================================================================== (Binary files differ) Modified: tinysofa/snapshot/libxml2/current/specs/libxml2.spec =================================================================== --- tinysofa/snapshot/libxml2/current/specs/libxml2.spec 2004-07-01 15:50:10 UTC (rev 2777) +++ tinysofa/snapshot/libxml2/current/specs/libxml2.spec 2004-07-01 15:50:14 UTC (rev 2778) @@ -1,13 +1,15 @@ Summary: Library providing XML and HTML support Name: libxml2 -Version: 2.6.9 -Release: 1ts +Version: 2.6.10 +Release: 2ts License: MIT -Group: tinysofa official +Group: Development/Libraries Source: ftp://xmlsoft.org/libxml2-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-root -BuildRequires: python python-devel libtool gcc-c++-devel +BuildRoot: %{_tmppath}/%{name}-%{version}-root +BuildRequires: python python-devel URL: http://xmlsoft.org/ +Prefix: %{_prefix} +Docdir: %{_docdir} %description This library allows to manipulate XML files. It includes support @@ -22,7 +24,7 @@ %package devel Summary: Libraries, includes, etc. to develop XML and HTML applications -Group: tinysofa official +Group: Development/Libraries Requires: libxml2 = %{version} Requires: zlib-devel @@ -40,9 +42,9 @@ %package python Summary: Python bindings for the libxml2 library -Group: tinysofa official +Group: Development/Libraries Requires: libxml2 = %{version} -Requires: python +Requires: %{_libdir}/python%(echo `python -c "import sys; print sys.version[0:3]"`) %description python The libxml2-python package contains a module that permits applications @@ -60,33 +62,14 @@ %build %configure make -# LIBTOOL=/usr/bin/libtool +(cd doc/examples ; make clean) +gzip -9 ChangeLog %install rm -fr %{buildroot} %makeinstall -# -# this is a bit ugly but tries to generate the bindings for all versions -# of python installed -# -for i in %{_prefix}/include/python* -do - py_version=`echo $i | sed "s+%{_prefix}/include/python++"` - if test -x %{_prefix}/bin/python$py_version - then - echo generating bindings for Python $py_version - (cd python ; make clean ; \ - make PYTHON="%{_prefix}/bin/python$py_version" \ - PYTHON_INCLUDES="%{_prefix}/include/python$py_version" \ - PYTHON_VERSION="$py_version"; \ -%makeinstall PYTHON="%{_prefix}/bin/python$py_version" \ - PYTHON_INCLUDES="%{_prefix}/include/python$py_version" \ - PYTHON_VERSION="$py_version" ) - fi -done - %clean rm -fr %{buildroot} @@ -99,34 +82,35 @@ %files %defattr(-, root, root) -%doc AUTHORS ChangeLog NEWS README Copyright TODO +%doc AUTHORS ChangeLog.gz NEWS README Copyright TODO %doc %{_mandir}/man1/xmllint.1* %doc %{_mandir}/man1/xmlcatalog.1* %doc %{_mandir}/man3/libxml.3* -%attr(755,root,root) %{_libdir}/lib*.so.* -%{_prefix}/bin/xmllint -%{_prefix}/bin/xmlcatalog +%{_libdir}/lib*.so.* +%{prefix}/bin/xmllint +%{prefix}/bin/xmlcatalog %files devel %defattr(-, root, root) %doc %{_mandir}/man1/xml2-config.1* -%doc AUTHORS ChangeLog NEWS README Copyright TODO +%doc AUTHORS ChangeLog.gz NEWS README Copyright TODO %doc doc/*.html doc/html doc/*.gif doc/*.png %doc doc/tutorial doc/libxml2-api.xml +%doc doc/examples -%attr(755,root,root) %{_libdir}/lib*.so -%attr(644,root,root) %{_libdir}/*a +%{_libdir}/lib*.so +%{_libdir}/*a %{_libdir}/*.sh -%{_prefix}/include/* -%{_prefix}/bin/xml2-config -%{_prefix}/share/aclocal/libxml.m4 +%{prefix}/include/* +%{prefix}/bin/xml2-config +%{prefix}/share/aclocal/libxml.m4 %{_libdir}/pkgconfig/libxml-2.0.pc %files python %defattr(-, root, root) -%doc AUTHORS ChangeLog NEWS README Copyright +%doc AUTHORS ChangeLog.gz NEWS README Copyright %{_libdir}/python*/site-packages/libxml2.py %{_libdir}/python*/site-packages/drv_libxml2.py %{_libdir}/python*/site-packages/libxml2mod* @@ -137,31 +121,59 @@ %doc doc/python.html %changelog -* Wed May 19 2004 tsintegrate 2.6.9-1ts -- current (2.6.9-1ok) integrated as 2.6.9-1ts for release 1.0-U1 +* Tue Jun 15 2004 Elliot Lee +- rebuilt -* Fri May 14 2004 Omar Kilani 2.6.9-1ok -- New upstream. +* Mon May 17 2004 Daniel Veillard +- upstream release 2.6.10 see http://xmlsoft.org/news.html -* Tue May 11 2004 Omar Kilani 2.6.7-4ts -- Add BuildRequires: gcc-c++-devel -- Fix permissions. +* Thu Jan 2 2003 Daniel Veillard +- integrated drv_libxml2 xml.sax driver from St?phane Bidoul +- provides the new XmlTextReader interfaces based on C# XML APIs -* Tue Feb 24 2004 Erlend Midttun 2.6.7-1tr -- New upstream. +* Wed Oct 23 2002 Daniel Veillard +- revamped the spec file, cleaned up some rpm building problems -* Tue Feb 17 2004 Erlend Midttun 2.6.6-2tr -- Did not rebuild with "LIBTOOL=/usr/bin/libtool" +* Fri Oct 4 2002 Jeremy Katz +- build with 'make LIBTOOL=/usr/bin/libtool' to use system libtool -* Thu Feb 13 2004 Gerald Dachs 2.6.6-1gd -- New upstream -- buildrequires libtool +* Wed Sep 4 2002 Daniel Veillard -* Wed Dec 10 2003 Erlend Midttun 2.6.3-2tr -- New upstream. +- library paths fixed for x86-64 -* Wed Jun 18 2003 Erlend Midttun 2.5.7-2tr -- Big rebuild +* Fri Feb 1 2002 Daniel Veillard -* Wed May 28 2003 Gerald Dachs -- new package for domxml support in php \ No newline at end of file +- Added the python package + +* Sun Nov 4 2001 Daniel Veillard + +- cleaned up the specfile +- 2.4.7 broke SGML catalogs badly. this fixes it. + +* Thu Apr 26 2001 Toshio Kuratomi + +[2.3.7] +- Added libxml.m4 to the distribution file list +- Moved the man pages from /usr/man to /usr/share/man to conform to FHS2.0 +- Moved programmer documentation into the devel package + +* Thu Sep 23 1999 Daniel Veillard + +- corrected the spec file alpha stuff +- switched to version 1.7.1 +- Added validation, XPath, nanohttp, removed memory leaks +- Renamed CHAR to xmlChar + +* Wed Jun 2 1999 Daniel Veillard + +- Switched to version 1.1: SAX extensions, better entities support, lots of + bug fixes. + +* Sun Oct 4 1998 Daniel Veillard + +- Added xml-config to the package + +* Thu Sep 24 1998 Michael Fulbright + +- Built release 0.30 + From svn at tinysofa.org Thu Jul 1 15:50:17 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:50:17 +1000 (EST) Subject: [tinysofa-svn] r2779 - tinysofa/snapshot/links/current/specs Message-ID: <20040701155017.1ADB84E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:50:16 +1000 (Fri, 02 Jul 2004) New Revision: 2779 Modified: tinysofa/snapshot/links/current/specs/links.spec Log: - Sync with 2.0. - Kept: - links-2.1pre15.tar.bz2: - links.cfg: Modified: tinysofa/snapshot/links/current/specs/links.spec =================================================================== --- tinysofa/snapshot/links/current/specs/links.spec 2004-07-01 15:50:14 UTC (rev 2778) +++ tinysofa/snapshot/links/current/specs/links.spec 2004-07-01 15:50:16 UTC (rev 2779) @@ -2,36 +2,24 @@ Name: links Version: 2.1pre15 -Release: 1ok +Release: 2ts License: GPL Summary: Links is a text-only browser very similar to lynx. -Summary(pt_BR): O links ? um browser para modo texto, similar ao lynx. -Summary(es): El links es un browser para modo texto, similar a lynx. -Group: tinysofa/main -Group(pt_BR): tinysofa/main -Group(es): tinysofa/main +Group: Applications/Internet URL: http://atrey.karlin.mff.cuni.cz/~clock/twibright/links Source: ftp://atrey.karlin.mff.cuni.cz/pub/local/clock/links/%{name}-%{version}.tar.bz2 Source1: %{ename}.cfg BuildRequires: openssl-devel >= 0.9.7 -BuildRequires: %{mklibname z -d} +BuildRequires: zlib-devel BuildRoot: %{_tmppath}/%{name}-%{version}-root Conflicts: elinks -%rename lynx +Provides: lynx +Obsoletes: lynx %description Links is a text WWW browser, similar to Lynx. Links displays tables, downloads on background and uses HTTP/1.1 keepalive connections. -%description -l pt_BR -Links ? um browser WWW modo texto, similar ao Lynx. -O Links exibe tabelas, baixa arquivos em segundo plano, -e usa as conex?es HTTP/1.1 keepalive. - -%description -l es -Links es un browser WWW modo texto, similar al Lynx. El links muestra tablas, -hace baja archivos en segundo plano, y usa conexiones HTTP/1.1 keepalive. - %prep %setup -q @@ -59,6 +47,9 @@ %changelog +* Fri Jun 18 2004 tsintegrate 2.1pre15-2ts +- current (2.1pre15-1ok) integrated as 2.1pre15-2ts for release 1.0-U2 + * Fri Apr 16 2004 Wanderlei Antonio Cavassin + 2004-04-16 20:31:20 (57230) - Oops, removed just menu dir creation, not /etc. From svn at tinysofa.org Thu Jul 1 15:50:19 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:50:19 +1000 (EST) Subject: [tinysofa-svn] r2780 - in tinysofa/snapshot/logrotate/current: sources specs Message-ID: <20040701155019.5370E4E817D@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:50:19 +1000 (Fri, 02 Jul 2004) New Revision: 2780 Removed: tinysofa/snapshot/logrotate/current/sources/logrotate-3.7-compressowner.patch tinysofa/snapshot/logrotate/current/sources/logrotate.conf Modified: tinysofa/snapshot/logrotate/current/specs/logrotate.spec Log: - Sync with 2.0. - Kept: - logrotate-3.7.tar.gz: - Removed: - logrotate-3.7-compressowner.patch: - logrotate.conf: Deleted: tinysofa/snapshot/logrotate/current/sources/logrotate-3.7-compressowner.patch =================================================================== --- tinysofa/snapshot/logrotate/current/sources/logrotate-3.7-compressowner.patch 2004-07-01 15:50:16 UTC (rev 2779) +++ tinysofa/snapshot/logrotate/current/sources/logrotate-3.7-compressowner.patch 2004-07-01 15:50:19 UTC (rev 2780) @@ -1,35 +0,0 @@ -diff -urNp logrotate-3.7/logrotate.c logrotate-3.7.new/logrotate.c ---- logrotate-3.7/logrotate.c 2004-01-26 21:08:04.000000000 +0100 -+++ logrotate-3.7.new/logrotate.c 2004-04-01 13:03:23.000000000 +0200 -@@ -128,6 +128,7 @@ static int compressLogFile(char * name, - int outFile; - int i; - int status; -+ struct stat sb; - - fullCommand = alloca(sizeof(*fullCommand) * - (log->compress_options_count + 2)); -@@ -145,12 +146,22 @@ static int compressLogFile(char * name, - return 1; - } - -- if ((outFile = open(compressedName, O_RDWR | O_CREAT | O_TRUNC, 0666)) < 0) { -+ fstat(inFile, &sb); -+ -+ if ((outFile = open(compressedName, O_RDWR | O_CREAT | O_TRUNC, sb.st_mode)) < 0) { - message(MESS_ERROR, "unable to open %s for compressed output\n", - compressedName); - close(inFile); - return 1; - } -+ -+ if (fchown(outFile, sb.st_uid, sb.st_gid)) { -+ message(MESS_ERROR, "unable to change owner of output file %s\n", -+ compressedName); -+ close(inFile); -+ close(outFile); -+ return 1; -+ } - - message(MESS_DEBUG, "compressing log with: %s\n", fullCommand[0]); - Deleted: tinysofa/snapshot/logrotate/current/sources/logrotate.conf =================================================================== --- tinysofa/snapshot/logrotate/current/sources/logrotate.conf 2004-07-01 15:50:16 UTC (rev 2779) +++ tinysofa/snapshot/logrotate/current/sources/logrotate.conf 2004-07-01 15:50:19 UTC (rev 2780) @@ -1,29 +0,0 @@ -# see "man logrotate" for details -# rotate log files monthly -monthly - -# keep 12 months worth of backlogs -rotate 12 - -# create new (empty) log files after rotating old ones -create - -# uncomment this if you want your log files compressed -compress - -# RPM packages drop log rotation information into this directory -include /etc/logrotate.d - -# no packages own lastlog or wtmp -- we'll rotate them here -/var/log/wtmp { - monthly - create 0664 root utmp - rotate 1 -} - -/var/log/lastlog { - monthly - rotate 1 -} - -# system-specific logs may be configured here Modified: tinysofa/snapshot/logrotate/current/specs/logrotate.spec =================================================================== --- tinysofa/snapshot/logrotate/current/specs/logrotate.spec 2004-07-01 15:50:16 UTC (rev 2779) +++ tinysofa/snapshot/logrotate/current/specs/logrotate.spec 2004-07-01 15:50:19 UTC (rev 2780) @@ -1,115 +1,171 @@ -%if %{?with_selinux:0}%{!?with_selinux:1} -%define with_selinux 0 +%if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} +%define WITH_SELINUX 1 %endif Summary: Rotates, compresses, removes and mails system log files. Name: logrotate Version: 3.7 -Release: 7jh +Release: 4.1ts License: GPL -Group: tinysofa/main -Source: ftp://ftp.redhat.com/pub/redhat/code/logrotate/logrotate-%{version}.tar.gz -Source1: logrotate.conf -Patch0: logrotate-3.7-compressowner.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-root +Group: System Environment/Base +Source: logrotate-%{PACKAGE_VERSION}.tar.gz +BuildRoot: %{_tmppath}/%{name}-%{version}.root %description The logrotate utility is designed to simplify the administration of log files on a system which generates a lot of log files. Logrotate allows for the automatic rotation compression, removal and mailing of log files. Logrotate can be set to handle a log file daily, weekly, -monthly or when the log file gets to a certain size. Normally, logrotate -runs as a daily cron job. +monthly or when the log file gets to a certain size. Normally, +logrotate runs as a daily cron job. -Install the logrotate package if you need a utility to deal with the log -files on your system. +Install the logrotate package if you need a utility to deal with the +log files on your system. - %prep -%setup -q -%patch0 -p1 +%setup - %build -%make RPM_OPT_FLAGS="$RPM_OPT_FLAGS" \ -%if %{with_selinux} +make RPM_OPT_FLAGS="$RPM_OPT_FLAGS" \ +%if %{WITH_SELINUX} WITH_SELINUX=yes %endif - %install -make PREFIX=%{buildroot} MANDIR=%{_mandir} install +rm -rf $RPM_BUILD_ROOT +make PREFIX=$RPM_BUILD_ROOT MANDIR=%{_mandir} install +mkdir -p $RPM_BUILD_ROOT/etc/logrotate.d +mkdir -p $RPM_BUILD_ROOT/etc/cron.daily +mkdir -p $RPM_BUILD_ROOT/var/lib -%{__mkdir_p} \ - %{buildroot}%{_sysconfdir}/logrotate.d \ - %{buildroot}%{_sysconfdir}/cron.daily \ - %{buildroot}%{_localstatedir}/lib +install -m 644 examples/logrotate-default $RPM_BUILD_ROOT/etc/logrotate.conf +install -m 755 examples/logrotate.cron $RPM_BUILD_ROOT/etc/cron.daily/logrotate +touch $RPM_BUILD_ROOT/var/lib/logrotate.status -install -m 644 $RPM_SOURCE_DIR/logrotate.conf %{buildroot}%{_sysconfdir}/logrotate.conf -install -m 755 examples/logrotate.cron %{buildroot}%{_sysconfdir}/cron.daily/logrotate -touch %{buildroot}%{_localstatedir}/lib/logrotate.status - - %clean -%clean_buildroot +rm -rf $RPM_BUILD_ROOT - %files %defattr(-,root,root) %doc CHANGES -%attr(0755, root, root) %{_sbindir}/logrotate +%attr(0755, root, root) /usr/sbin/logrotate %attr(0644, root, root) %{_mandir}/man8/logrotate.8* -%attr(0755, root, root) %{_sysconfdir}/cron.daily/logrotate -%attr(0644, root, root) %config(noreplace) %{_sysconfdir}/logrotate.conf -%attr(0755, root, root) %dir %{_sysconfdir}/logrotate.d -%attr(0644, root, root) %verify(not size md5 mtime) %config(noreplace) %{_localstatedir}/lib/logrotate.status +%attr(0755, root, root) /etc/cron.daily/logrotate +%attr(0644, root, root) %config(noreplace) /etc/logrotate.conf +%attr(0755, root, root) %dir /etc/logrotate.d +%attr(0644, root, root) %verify(not size md5 mtime) %config(noreplace) /var/lib/logrotate.status - %changelog -* Wed May 19 2004 tsintegrate 3.7-6ts -- current (3.7-5ts) integrated as 3.7-6ts for release 1.0-U1 +* Fri Feb 13 2004 Elliot Lee +- rebuilt -* Thu Apr 1 2004 Erlend Midttun 3.7-4tr (5ts) -- Added patch to fix permissions on compressed logfiles. +* Mon Jan 26 2004 Dan Walsh 3.6.10-4 +- fix is_selinux_enabled call -* Wed Feb 11 2004 Oystein Viggen 3.7-1tr -- New upstream with optional selinux support -- Conditionally enable selinux support +* Fri Sep 5 2003 Dan Walsh 3.6.10-3 +- Turn off selinux -* Tue Dec 8 2003 Erlend Midttun 3.6.9-1tr -- New upstream. +* Fri Sep 5 2003 Dan Walsh 3.6.10-2.sel +- Turn on selinux -* Mon Jun 23 2003 Erlend Midttun 3.6.8-6tr -- Make %%setup quiet. +* Wed Aug 06 2003 Erik Troan +- always use compressext for the extension for compressed + files; before compresscmd and compressext had to agree +- moved all compression to one code block +- compression, scripts don't use system() anymore +- compress and maillast didn't work together properly +- delaycompress and mailfirst didn't work properly +- don't use system() for mailing (or uncompressing) logs anymore +- use "-s" for speciying the subjected of mailed logs -* Mon Jun 23 2003 Erlend Midttun 3.6.8-5tr -- Added %defattr. +* Thu Jul 24 2003 Elliot Lee 3.6.10-1 +- Fix #100546, change selinux port. -* Wed Jun 18 2003 Erlend Midttun 3.6.8-4tr -- Big rebuild +* Wed Jul 18 2003 Dan Walsh 3.6.9-2 +- Port to SELinux 2.5 -* Tue Jun 10 2003 Erlend Midttun 3.6.8-3em -- Added lastlog again. +* Wed Jul 09 2003 Elliot Lee 3.6.9-1 +- Fix #90229, #90274, #89458, #91408 -* Tue Jun 10 2003 Erlend Midttun 3.6.8-2em -- Seems error is no longer used in logrotate.conf. +* Mon Jan 20 2003 Elliot Lee 3.6.8-1 +- Old patch from pm at debian.org -* Fri May 16 2003 Erlend Midttun 3.6.8-1em -- Added Req: mailx as it used /bin/mail for mails. -- New upstream. +* Tue Jan 14 2003 Elliot Lee 3.6.7-1 +- Fixes from bugzilla -* Mon Mar 24 2003 Erlend Midttun 3.5.4-2em -- Rebuilt against glibc 2.3.2. +* Fri Nov 15 2002 Elliot Lee 3.6.6-1 +- Commit patch from Fidelis Assis -* Fri Jan 19 2001 Erlend Midttun -- New upstream version. -- Added new config file. +* Thu Jun 20 2002 Elliot Lee 3.6.5-1 +- Commit fix for #65299 -* Fri Jan 19 2001 Erlend Midttun -- Added noreplace and verify on config file. +* Mon Apr 15 2002 Elliot Lee 3.6.4-1 +- Commit fix for #62560 -* Thu Nov 16 2000 Erlend Midttun -- Updated to version 3.5. +* Wed Mar 13 2002 Elliot Lee 3.6.3-1 +- Apply various bugfix patches from the openwall people -* Mon Jan 24 2000 Tore Olsen -- moved man page to /usr/share/man for FHS compliance +* Tue Jan 29 2002 Elliot Lee 3.6.2-1 +- Fix bug #55809 (include logrotate.status in %files) +- Fix bug #58328 (incorrect error detection when reading state file) +- Allow 'G' size specifier from bug #57242 + +* Mon Dec 10 2001 Preston Brown +- noreplace config file + +* Wed Nov 28 2001 Preston Brown 3.6-1 +- patch from Alexander Kourakos to stop the shared + postrotate/prerotate scripts from running if none of the log(s) need + rotating. All log files are now checked for rotation in one batch, + rather than sequentially. +- more fixes from Paul Martin + +* Thu Nov 8 2001 Preston Brown 3.5.10-1 +- fix from paul martin for zero-length state files + +* Tue Sep 4 2001 Preston Brown +- fix segfault when logfile is in current directory. + +* Tue Aug 21 2001 Preston Brown +- fix URL for source location + +* Thu Aug 2 2001 Preston Brown +- man page cleanups, check for negative rotation counts + +* Mon Jul 2 2001 Preston Brown +- more minor manpage updates (#45625) + +* Thu Jun 21 2001 Preston Brown 3.5.6-1 +- enable LFS support (debian bug #100810) +- quote filenames for running compress commands or pre/postrotate cmds (#21348) +- deprecate "errors" directive (see bug #16544 for explanation) +- update man page +- configurable compression command by Colm Buckley + +* Fri Jun 1 2001 Preston Brown 3.5.5-1 +- be less strict about whitespace near filenames. Patch from Paul Martin . + +* Thu Jan 4 2001 Bill Nottingham +- %%defattr + +* Wed Jan 03 2001 Preston Brown +- see CHANGES + +* Tue Aug 15 2000 Erik Troan +- see CHANGES + +* Sun Jul 23 2000 Erik Troan +- see CHANGES + +* Tue Jul 11 2000 Erik Troan +- support spaces in filenames +- added sharedscripts + +* Sun Jun 18 2000 Matt Wilson +- use %%{_mandir} for man pages + +* Thu Feb 24 2000 Erik Troan +- don't rotate lastlog + +* Thu Feb 03 2000 Erik Troan +- gzipped manpages From svn at tinysofa.org Thu Jul 1 15:50:26 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:50:26 +1000 (EST) Subject: [tinysofa-svn] r2781 - in tinysofa/snapshot/lsof/current: sources specs Message-ID: <20040701155026.72A444E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:50:26 +1000 (Fri, 02 Jul 2004) New Revision: 2781 Added: tinysofa/snapshot/lsof/current/sources/lsof_4.68.tar.gz Removed: tinysofa/snapshot/lsof/current/sources/lsof_4.71.tar.bz2 Modified: tinysofa/snapshot/lsof/current/specs/lsof.spec Log: - Sync with 2.0. - Added: - lsof_4.68.tar.gz: - Removed: - lsof_4.71.tar.bz2: Added: tinysofa/snapshot/lsof/current/sources/lsof_4.68.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/lsof/current/sources/lsof_4.68.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: tinysofa/snapshot/lsof/current/sources/lsof_4.71.tar.bz2 =================================================================== (Binary files differ) Modified: tinysofa/snapshot/lsof/current/specs/lsof.spec =================================================================== --- tinysofa/snapshot/lsof/current/specs/lsof.spec 2004-07-01 15:50:19 UTC (rev 2780) +++ tinysofa/snapshot/lsof/current/specs/lsof.spec 2004-07-01 15:50:26 UTC (rev 2781) @@ -1,111 +1,122 @@ -Summary: Lists files open by processes +Summary: A utility which lists open files on a Linux/UNIX system. Name: lsof -Version: 4.71 -Release: 3ts -License: Free -Group: tinysofa official -Source0: ftp://vic.cc.purdue.edu/pub/tools/unix/lsof/lsof_%{version}.tar.bz2 +Version: 4.68 +Release: 2ts +Copyright: Free +Group: Development/Debuggers +Source0: ftp://vic.cc.purdue.edu/pub/tools/unix/lsof/lsof_%{version}.tar.gz Prefix: %{_prefix} -BuildRoot: %{_tmppath}/%{name}-root -PreReq: setup +BuildRoot: %{_tmppath}/%{name}-%{version}-root %description -Lsof's name stands for LiSt Open Files, and it does just that. It lists -information about files that are open by the processes running on a UNIX -system. +Lsof stands for LiSt Open Files, and it does just that: it lists +information about files that are open by the processes running on a +UNIX system. %prep -%setup -q -n lsof_%{version} +%setup -q #-c -n lsof_%{version} +# add -a 1 above +#tar xzf %SOURCE1 + # # Sort out whether this is the wrapped or linux specific tar ball. # +[ -f lsof_%{version}.tar ] && tar xf lsof_%{version}.tar [ -f lsof_%{version}_src.tar ] && tar xf lsof_%{version}_src.tar [ -d lsof_%{version}.linux -a ! -d lsof_%{version} ] && \ mv lsof_%{version}.linux lsof_%{version} +[ -d lsof_%{version} ] && cd lsof_%{version} [ -d lsof_%{version}_src ] && cd lsof_%{version}_src %build -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != "/" ] && rm -rf "$RPM_BUILD_ROOT" + # # ### Sort out whether this is the wrapped or linux specific tar ball. # +[ -d lsof_%{version} ] && cd lsof_%{version} [ -d lsof_%{version}_src ] && cd lsof_%{version}_src #LINUX_KERNEL=`pwd`/../linux LSOF_INCLUDE=`pwd`/../linux/include \ #LSOF_VERS=20036 LSOF_VSTR=2.0.36 LINUX_BASE=/dev/kmem \ -#LSOF_VERS=22010 LSOF_VSTR=2.2.10 LINUX_BASE=/proc \ - +LSOF_VERS=24018 LSOF_VSTR=2.4.18 LINUX_BASE=/proc \ ./Configure -n linux -make +make DEBUG="$RPM_OPT_FLAGS" %install -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != "/" ] && rm -rf "$RPM_BUILD_ROOT" +rm -rf ${RPM_BUILD_ROOT} + # # ### Sort out whether this is the wrapped or linux specific tar ball. # +[ -d lsof_%{version} ] && cd lsof_%{version} [ -d lsof_%{version}_src ] && cd lsof_%{version}_src -install -d ${RPM_BUILD_ROOT}%{_prefix}/{sbin,share/man/man8} +mkdir -p ${RPM_BUILD_ROOT}%{_sbindir} install -s lsof ${RPM_BUILD_ROOT}%{_prefix}/sbin +mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man8 install lsof.8 ${RPM_BUILD_ROOT}%{_mandir}/man8/ %clean -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT +rm -rf ${RPM_BUILD_ROOT} %files -%defattr(-,root,root) +%defattr(644,root,root,755) %doc lsof_%{version}_src/00* -%attr(0755,root,kmem) %{_prefix}/sbin/lsof -%attr(644,root,root) %{_mandir}/man8/lsof.8* +%attr(0755,root,root) %{_sbindir}/* +%{_mandir}/man*/* %changelog -* Mon May 24 2004 tsintegrate 4.71-3ts -- current (4.71-3jh) integrated as 4.71-3ts for release 1.0-U1 +* Fri Feb 13 2004 Elliot Lee +- rebuilt -* Thu May 20 2004 Jaakko Heinonen 4.71-3jh -- fix manual page permissions +* Fri Jul 18 2003 Jakub Jelinek 4.68-1 +- update to 4.68 (#99064) -* Wed May 19 2004 tsintegrate 4.71-2ts -- current (4.71-1ts) integrated as 4.71-2ts for release 1.0-U1 +* Wed Jun 04 2003 Elliot Lee +- rebuilt -* Wed Apr 07 2004 Omar Kilani 4.71-1ts -- New upstream. +* Wed Jan 22 2003 Tim Powers +- rebuilt -* Mon Jun 23 2003 Erlend Midttun 4.56-7tr -- Fixed %defattr. +* Thu Dec 12 2002 Tim Powers 4.63-3 +- rebuild on all arches -* Wed Jun 18 2003 Erlend Midttun 4.56-6tr -- Big rebuild +* Fri Jun 21 2002 Tim Powers +- automated rebuild -* Thu May 29 2003 Tore Olsen 4.56-5to -- Readded prereq on setup, need /etc/group +* Fri Jun 21 2002 Jakub Jelinek 4.63-1 +- update to 4.63 (#66333). -* Tue May 27 2003 Erlend Midttun 4.56-4em -- Removed PreReq, fixed %defattr. +* Thu May 23 2002 Tim Powers +- automated rebuild -* Fri May 2 2003 Chr. H. Toldnes 4.56-3ct -- Added PreReq on setup in main package +* Wed Jan 09 2002 Tim Powers +- automated rebuild -* Mon Mar 24 2003 Erlend Midttun 4.56-2em -- Rebuilt against glibc 2.3.2. +* Sun Jun 24 2001 Elliot Lee +- Bump release + rebuild. -* Wed Jun 6 2001 Oystein Viggen -- New upstream version: 4.56 +* Thu Sep 7 2000 Jeff Johnson +- update to 4.51. -* Tue Mar 6 2001 Alexander Reelsen -- Picked up 4.55 +* Wed Jul 12 2000 Prospector +- automatic rebuild -* Thu Nov 16 2000 Erlend Midttun -- Updated to 4.52 +* Wed Jun 14 2000 Jeff Johnson +- FHS packaging. -* Thu Sep 14 2000 Per Ivar Paulsen -- picked up 4.51 +* Sun Mar 26 2000 Florian La Roche +- change to root:root perms -* Mon Feb 28 2000 Lars Gaarden -- moved manpage to /usr/share/man, FHS +* Wed Feb 02 2000 Cristian Gafton +- fix description +- man pages are compressed +* Wed Dec 22 1999 Jeff Johnson +- update to 4.47. + * Tue Aug 3 1999 Jeff Johnson - update to 4.45. From svn at tinysofa.org Thu Jul 1 15:50:31 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:50:31 +1000 (EST) Subject: [tinysofa-svn] r2783 - in tinysofa/snapshot/m4/current: sources specs Message-ID: <20040701155031.EE55D4E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:50:31 +1000 (Fri, 02 Jul 2004) New Revision: 2783 Added: tinysofa/snapshot/m4/current/sources/m4-1.4.1-configure.patch tinysofa/snapshot/m4/current/sources/m4-1.4.1-sec.patch tinysofa/snapshot/m4/current/sources/m4-1.4.1.tar.gz Removed: tinysofa/snapshot/m4/current/sources/m4-1.4-glibc.patch tinysofa/snapshot/m4/current/sources/m4-1.4.tar.gz Modified: tinysofa/snapshot/m4/current/specs/m4.spec Log: - Sync with 2.0. - Added: - m4-1.4.1-configure.patch: - m4-1.4.1-sec.patch: - m4-1.4.1.tar.gz: - Removed: - m4-1.4-glibc.patch: - m4-1.4.tar.gz: Deleted: tinysofa/snapshot/m4/current/sources/m4-1.4-glibc.patch =================================================================== --- tinysofa/snapshot/m4/current/sources/m4-1.4-glibc.patch 2004-07-01 15:50:29 UTC (rev 2782) +++ tinysofa/snapshot/m4/current/sources/m4-1.4-glibc.patch 2004-07-01 15:50:31 UTC (rev 2783) @@ -1,11 +0,0 @@ ---- m4-1.4/src/m4.c.ewt Mon Jun 2 21:22:37 1997 -+++ m4-1.4/src/m4.c Mon Jun 2 21:22:41 1997 -@@ -19,7 +19,7 @@ - #include "m4.h" - - #include --#include -+#include - - static void usage _((int)); - Added: tinysofa/snapshot/m4/current/sources/m4-1.4.1-configure.patch =================================================================== --- tinysofa/snapshot/m4/current/sources/m4-1.4.1-configure.patch 2004-07-01 15:50:29 UTC (rev 2782) +++ tinysofa/snapshot/m4/current/sources/m4-1.4.1-configure.patch 2004-07-01 15:50:31 UTC (rev 2783) @@ -0,0 +1,11 @@ +--- m4-1.4.1/configure.in.fix Sun Jan 20 04:20:24 2002 ++++ m4-1.4.1/configure.in Sun Jan 20 04:20:33 2002 +@@ -2,8 +2,6 @@ + # Copyright (C) 1991, 1993, 1994 Free Software Foundation, Inc. + # Process this file with autoconf to produce a configure script. + +-undefine([changeword]) +- + AC_INIT(src/m4.c) + AC_CONFIG_HEADER(config.h) + AC_ARG_PROGRAM Added: tinysofa/snapshot/m4/current/sources/m4-1.4.1-sec.patch =================================================================== --- tinysofa/snapshot/m4/current/sources/m4-1.4.1-sec.patch 2004-07-01 15:50:29 UTC (rev 2782) +++ tinysofa/snapshot/m4/current/sources/m4-1.4.1-sec.patch 2004-07-01 15:50:31 UTC (rev 2783) @@ -0,0 +1,20 @@ +--- m4-1.4.1/src/m4.c.sec Tue Feb 13 13:27:07 2001 ++++ m4-1.4.1/src/m4.c Tue Feb 13 13:35:49 2001 +@@ -369,7 +369,7 @@ + + case 'o': + if (!debug_set_output (optarg)) +- error (0, errno, optarg); ++ error (0, errno, "%s", optarg); + break; + + case 's': +@@ -466,7 +466,7 @@ + fp = path_search (argv[optind]); + if (fp == NULL) + { +- error (0, errno, argv[optind]); ++ error (0, errno, "%s", argv[optind]); + continue; + } + else Added: tinysofa/snapshot/m4/current/sources/m4-1.4.1.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/m4/current/sources/m4-1.4.1.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: tinysofa/snapshot/m4/current/sources/m4-1.4.tar.gz =================================================================== (Binary files differ) Modified: tinysofa/snapshot/m4/current/specs/m4.spec =================================================================== --- tinysofa/snapshot/m4/current/specs/m4.spec 2004-07-01 15:50:29 UTC (rev 2782) +++ tinysofa/snapshot/m4/current/specs/m4.spec 2004-07-01 15:50:31 UTC (rev 2783) @@ -1,14 +1,15 @@ Summary: The GNU macro processor. Name: m4 -Version: 1.4 -Release: 26ts -License: GPL -Group: tinysofa official -Source: ftp://ftp.gnu.org/pub/gnu/m4/m4-%{version}.tar.gz -Patch: m4-1.4-glibc.patch -BuildRequires: texinfo -Prereq: htmlinfo -BuildRoot: %{_tmppath}/%{name}-root +Version: 1.4.1 +Release: 15ts +Copyright: GPL +Group: Applications/Text +Source: ftp://ftp.gnu.org/gnu/m4/m4-1.4.1.tar.gz +URL: ftp://ftp.gnu.org/gnu/m4/ +Patch0: m4-1.4.1-sec.patch +Patch1: m4-1.4.1-configure.patch +Buildroot: %{_tmppath}/%{name}-%{version}-root +Prereq: /sbin/install-info %description A GNU implementation of the traditional UNIX macro processor. M4 is @@ -20,77 +21,92 @@ Install m4 if you need a macro processor. - %prep -%setup -q -%patch -p1 +rm -rf $RPM_BUILD_ROOT +%setup +%patch0 -p1 +%patch1 -p1 %build -./configure --prefix=%{_prefix} -make CFLAGS="$RPM_OPT_FLAGS" LDFLAGS=-s -cd doc -makeinfo --html --no-split --force m4.texinfo || : +autoreconf -f +test -f /usr/share/libtool/config.guess && cp /usr/share/libtool/config.guess . +test -f /usr/share/libtool/config.sub && cp /usr/share/libtool/config.sub . +%configure +make CFLAGS="$RPM_OPT_FLAGS" - %install -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT -%makeinstall -strip $RPM_BUILD_ROOT/usr/bin/m4 -mkdir -p $RPM_BUILD_ROOT/usr/share/html/m4 -install -m644 doc/m4.html $RPM_BUILD_ROOT/usr/share/html/m4/ +%makeinstall INSTALL_DATA="install -c -m644" -rm -rf $RPM_BUILD_ROOT/usr/share/info +%files +%defattr(-,root,root) +%doc NEWS README +/usr/bin/m4 +%{_infodir}/* +/usr/share/locale/fr/m4.msg +%post +/sbin/install-info %{_infodir}/m4.info.gz %{_infodir}/dir + +%preun +if [ "$1" = 0 ]; then + /sbin/install-info --delete %{_infodir}/m4.info.gz %{_infodir}/dir +fi + %clean -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT +rm -rf $RPM_BUILD_ROOT -%post -/usr/sbin/htmlinfo_update.sh +%changelog +* Fri Feb 13 2004 Elliot Lee +- rebuilt -%postun -/usr/sbin/htmlinfo_update.sh +* Wed Jun 04 2003 Elliot Lee +- rebuilt +* Wed Jan 22 2003 Tim Powers +- rebuilt -%files -%defattr(-,root,root) -%doc NEWS README -/usr/bin/m4 -%dir /usr/share/html/m4 -/usr/share/html/m4/m4.html +* Mon Nov 11 2002 Florian La Roche +- add french translation file +* Fri Jun 21 2002 Tim Powers +- automated rebuild -%changelog -* Wed May 19 2004 tsintegrate 1.4-26ts -- current (1.4-25ts) integrated as 1.4-26ts for release 1.0-U1 +* Wed Jun 19 2002 Florian La Roche +- do not strip apps -* Tue Dec 9 2003 Erlend Midttun 1.4-22tr -- Big rebuild +* Fri Jun 14 2002 Florian La Roche +- rebuild -* Mon Jun 23 2003 Erlend Midttun 1.4-21tr -- Added %defattr. +* Thu May 23 2002 Tim Powers +- automated rebuild -* Wed Jun 18 2003 Erlend Midttun 1.4-20tr -- Big rebuild +* Thu Mar 07 2002 Florian La Roche +- use _infodir on popular request #47465 -* Mon Mar 24 2003 Erlend Midttun 1.4-19em -- Rebuilt against glibc 2.3.2. +* Sat Jan 05 2002 Florian La Roche +- add URL tag +- improved spec file +- add hack to update config.guess config.sub +- fix to build with newer autoconf versions -* Fri Oct 25 2002 Christian H. Toldnes 1.4-18ct -- Replaced ugly info2man-hack with cute htmlinfo setup. +* Sun Jun 24 2001 Elliot Lee +- Bump release + rebuild. -* Tue Sep 3 2002 Goetz Bock 1.4-17bg -- removed info stuff -- cleaned up spec file +* Tue Feb 13 2001 Florian La Roche +- signal patch is not necessary anymore +- fix printf buffer overflow problem -* Wed Jul 24 2002 Daniel Meyer 1.4-16dm -- rebuild for Trustix Secure Linux 2.0 +* Wed Jul 12 2000 Prospector +- automatic rebuild -* Tue Jul 17 2001 Erlend Midttun -- Inc serial number before release. +* Sat Jun 17 2000 Matt Wilson +- added defattr -* Mon Feb 28 2000 Lars Gaarden -- Moved info files to /usr/share/info, FHS +* Mon Jun 5 2000 Bernhard Rosenkraenzer +- FHS compliance +- 1.4.1 +- some fixes to spec file * Sun Mar 21 1999 Cristian Gafton - auto rebuild in the new build environment (release 12) @@ -109,3 +125,4 @@ * Mon Jun 02 1997 Erik Troan - built against glibc + From svn at tinysofa.org Thu Jul 1 15:50:34 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:50:34 +1000 (EST) Subject: [tinysofa-svn] r2784 - in tinysofa/snapshot/mailcap/current: sources specs Message-ID: <20040701155034.47F6A4E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:50:34 +1000 (Fri, 02 Jul 2004) New Revision: 2784 Added: tinysofa/snapshot/mailcap/current/sources/mailcap-2.1.15.tar.gz Removed: tinysofa/snapshot/mailcap/current/sources/mailcap-2.0.5.tar.gz Modified: tinysofa/snapshot/mailcap/current/specs/mailcap.spec Log: - Sync with 2.0. - Added: - mailcap-2.1.15.tar.gz: - Removed: - mailcap-2.0.5.tar.gz: Deleted: tinysofa/snapshot/mailcap/current/sources/mailcap-2.0.5.tar.gz =================================================================== (Binary files differ) Added: tinysofa/snapshot/mailcap/current/sources/mailcap-2.1.15.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/mailcap/current/sources/mailcap-2.1.15.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: tinysofa/snapshot/mailcap/current/specs/mailcap.spec =================================================================== --- tinysofa/snapshot/mailcap/current/specs/mailcap.spec 2004-07-01 15:50:31 UTC (rev 2783) +++ tinysofa/snapshot/mailcap/current/specs/mailcap.spec 2004-07-01 15:50:34 UTC (rev 2784) @@ -1,12 +1,12 @@ Summary: Associates helper applications with particular file types. Name: mailcap -Version: 2.0.5 -Release: 10ts +Version: 2.1.15 +Release: 1ts License: public domain -Group: tinysofa official +Group: System Environment/Base Source0: %{name}-%{version}.tar.gz -BuildArchitectures: noarch -BuildRoot: %{_tmppath}/%{name}-root +BuildArch: noarch +BuildRoot: %{_tmppath}/%{name}-%{version}-root %description The mailcap file is used by the metamail program. Metamail reads the @@ -24,40 +24,83 @@ %build %install -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != "/" ] && rm -rf "$RPM_BUILD_ROOT" +rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/etc install -m 644 mailcap $RPM_BUILD_ROOT/etc -install -m 644 mailcap.vga $RPM_BUILD_ROOT/etc install -m 644 mime.types $RPM_BUILD_ROOT/etc mkdir -p $RPM_BUILD_ROOT%{_mandir}/man4 install -m 644 mailcap.4 $RPM_BUILD_ROOT%{_mandir}/man4 %clean -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT +rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) %config /etc/mailcap -%config /etc/mailcap.vga %config /etc/mime.types -%{_mandir}/man4/mailcap.4* +%{_mandir}/man4/mailcap.* %changelog -* Wed May 19 2004 tsintegrate 2.0.5-10ts -- current (2.0.5-9ts) integrated as 2.0.5-10ts for release 1.0-U1 +* Mon May 3 2004 Bill Nottingham 2.1.15-1 +- xpdf/gv -> ggv (#118401) +- add application/x-bittorrent (#118752) -* Thu Dec 11 2003 Erlend Midttun 2.0.5-6tr -- Big rebuild +* Fri Jul 11 2003 Bill Nottingham 2.1.14-1 +- add application/ogg and OpenOffice.org mime.types -* Wed Jun 18 2003 Erlend Midttun 2.0.5-5tr -- Big rebuild +* Fri Feb 7 2003 Bill Nottingham 2.1.13-1 +- resync mime.types with apache +- clean out mailcap some -* Wed May 15 2003 Erlend Midttun 2.0.5-4em -- Fixed mandir. +* Tue Sep 3 2002 Bill Nottingham 2.1.12-1 +- add application/x-ogg to mime.types -* Mon Mar 24 2003 Erlend Midttun 2.0.5-3em -- Rebuilt against glibc 2.3.2. +* Fri Jul 19 2002 Jens Petersen 2.1.11-1 +- use eog instead of ee +* Tue Jun 18 2002 Nalin Dahyabhai 2.1.10-1 +- resync mime.types with apache 1.3.26 + +* Thu Dec 24 2001 Bill Nottingham 2.1.9-1 +- fix Sep. 17 changes (#57362) + +* Tue Oct 23 2001 Nalin Dahyabhai 2.1.8-1 +- resync mime.types with apache 1.3.22 + +* Mon Sep 17 2001 Bill Nottingham 2.1.7-1 +- associate PS files with gv (#53734) + +* Fri Aug 10 2001 Bill Nottingham +- switch gtv & xanim order (#51408) + +* Wed Jul 17 2001 Bill Nottingham +- use htmlview for text/html (#48141) + +* Wed Mar 21 2001 Tim Waugh 2.1.4-2 +- Use gtv not xanim for video/mpeg, since we no longer ship the codecs. + +* Thu Jan 18 2001 Bill Nottingham +- use gpg, not pgp (#13816, others) + +* Sat Jan 6 2001 Bill Nottingham +- fix typo (#23409) + +* Thu Dec 28 2000 Bill Nottingham +- reintegrate stuff into the package so it doesn't get lost + +* Thu Dec 28 2000 Than Ngo +- add ms(TM) word document entry (Bug #17474) +- bzip2 sources + +* Mon Jun 12 2000 Preston Brown +- add wap entries + +* Fri Jun 9 2000 Bill Nottingham +- remove mailcap.vga + +* Thu Feb 3 2000 Bill Nottingham +- handle compressed man pages + * Tue Jan 18 2000 Bill Nottingham - add .bz2 @@ -99,4 +142,4 @@ - added /etc/mime.types from mutt to this package to make it universal * Tue Sep 09 1997 Erik Troan -- made a noarch package \ No newline at end of file +- made a noarch package From svn at tinysofa.org Thu Jul 1 15:50:40 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:50:40 +1000 (EST) Subject: [tinysofa-svn] r2786 - in tinysofa/snapshot/make/current: sources specs Message-ID: <20040701155040.197DE4E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:50:39 +1000 (Fri, 02 Jul 2004) New Revision: 2786 Added: tinysofa/snapshot/make/current/sources/make-3.79.1-noclock_gettime.patch tinysofa/snapshot/make/current/sources/make-3.79.1-siglist.patch tinysofa/snapshot/make/current/sources/make-3.80-cvs.patch tinysofa/snapshot/make/current/sources/make-3.80.tar.bz2 Removed: tinysofa/snapshot/make/current/sources/make-3.80.tar.gz Modified: tinysofa/snapshot/make/current/specs/make.spec Log: - Sync with 2.0. - Added: - make-3.79.1-noclock_gettime.patch: - make-3.79.1-siglist.patch: - make-3.80-cvs.patch: - make-3.80.tar.bz2: - Removed: - make-3.80.tar.gz: Added: tinysofa/snapshot/make/current/sources/make-3.79.1-noclock_gettime.patch =================================================================== --- tinysofa/snapshot/make/current/sources/make-3.79.1-noclock_gettime.patch 2004-07-01 15:50:37 UTC (rev 2785) +++ tinysofa/snapshot/make/current/sources/make-3.79.1-noclock_gettime.patch 2004-07-01 15:50:39 UTC (rev 2786) @@ -0,0 +1,22 @@ +--- make-3.80/configure.in ++++ make-3.80/configure.in +@@ -91,7 +91,7 @@ + if test "$make_cv_file_timestamp_hi_res" = yes; then + # Solaris 2.5.1 needs -lposix4 to get the clock_gettime function. + # Solaris 7 prefers the library name -lrt to the obsolescent name -lposix4. +- AC_SEARCH_LIBS(clock_gettime, [rt posix4]) ++ AC_SEARCH_LIBS(clock_gettime, [posix4]) + if test "$ac_cv_search_clock_gettime" != no; then + AC_DEFINE(HAVE_CLOCK_GETTIME, 1, + [Define if you have the clock_gettime function.]) +--- make-3.80/configure ++++ make-3.80/configure +@@ -6794,7 +6794,7 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + if test "$ac_cv_search_clock_gettime" = no; then +- for ac_lib in rt posix4; do ++ for ac_lib in posix4; do + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + cat >conftest.$ac_ext <<_ACEOF + #line $LINENO "configure" Added: tinysofa/snapshot/make/current/sources/make-3.79.1-siglist.patch =================================================================== --- tinysofa/snapshot/make/current/sources/make-3.79.1-siglist.patch 2004-07-01 15:50:37 UTC (rev 2785) +++ tinysofa/snapshot/make/current/sources/make-3.79.1-siglist.patch 2004-07-01 15:50:39 UTC (rev 2786) @@ -0,0 +1,36 @@ +--- make-3.79.1/configure.in.sopwith 2002-12-03 09:51:07.000000000 -0500 ++++ make-3.79.1/configure.in 2002-12-03 09:51:07.000000000 -0500 +@@ -32,7 +32,7 @@ + AC_TYPE_PID_T + AC_TYPE_SIGNAL + AC_CHECK_HEADERS(stdlib.h unistd.h limits.h sys/param.h fcntl.h string.h \ +- memory.h sys/time.h sys/timeb.h) ++ memory.h sys/time.h sys/timeb.h signal.h) + AC_PROG_CC_C_O + AM_PROG_CC_STDC + AC_C_CONST dnl getopt needs this. +@@ -144,7 +144,12 @@ + fi + AC_MSG_RESULT($make_cv_union_wait) + +-AC_DECL_SYS_SIGLIST ++ac_includes_default="$ac_includes_default ++#ifdef HAVE_SIGNAL_H ++#include ++#endif ++" ++AC_SYS_SIGLIST_DECLARED + + # The presence of the following is not meant to imply + # that make necessarily works on those systems. +--- make-3.79.1/signame.c.sopwith 2002-12-03 09:53:15.000000000 -0500 ++++ make-3.79.1/signame.c 2002-12-03 09:54:28.000000000 -0500 +@@ -47,7 +47,7 @@ + + #else /* HAVE_SYS_SIGLIST. */ + +-#ifndef SYS_SIGLIST_DECLARED ++#if !defined(SYS_SIGLIST_DECLARED) && !defined(HAVE_DECL_SYS_SIGLIST) + extern char *sys_siglist[]; + #endif /* Not SYS_SIGLIST_DECLARED. */ + Added: tinysofa/snapshot/make/current/sources/make-3.80-cvs.patch =================================================================== --- tinysofa/snapshot/make/current/sources/make-3.80-cvs.patch 2004-07-01 15:50:37 UTC (rev 2785) +++ tinysofa/snapshot/make/current/sources/make-3.80-cvs.patch 2004-07-01 15:50:39 UTC (rev 2786) @@ -0,0 +1,247 @@ +--- read.c 14 Oct 2002 21:54:04 -0000 1.124 ++++ read.c 25 Oct 2002 21:17:42 -0000 +@@ -272,6 +272,34 @@ + return read_makefiles; + } + ++/* Install a new conditional and return the previous one. */ ++ ++static struct conditionals * ++install_conditionals (struct conditionals *new) ++{ ++ struct conditionals *save = conditionals; ++ ++ bzero ((char *) new, sizeof (*new)); ++ conditionals = new; ++ ++ return save; ++} ++ ++/* Free the current conditionals and reinstate a saved one. */ ++ ++static void ++restore_conditionals (struct conditionals *saved) ++{ ++ /* Free any space allocated by conditional_line. */ ++ if (conditionals->ignoring) ++ free (conditionals->ignoring); ++ if (conditionals->seen_else) ++ free (conditionals->seen_else); ++ ++ /* Restore state. */ ++ conditionals = saved; ++} ++ + static int + eval_makefile (char *filename, int flags) + { +@@ -388,6 +416,8 @@ + eval_buffer (char *buffer) + { + struct ebuffer ebuf; ++ struct conditionals *saved; ++ struct conditionals new; + const struct floc *curfile; + int r; + +@@ -402,8 +432,12 @@ + curfile = reading_file; + reading_file = &ebuf.floc; + ++ saved = install_conditionals (&new); ++ + r = eval (&ebuf, 1); + ++ restore_conditionals (saved); ++ + reading_file = curfile; + + return r; +@@ -412,13 +446,8 @@ + + /* Read file FILENAME as a makefile and add its contents to the data base. + +- SET_DEFAULT is true if we are allowed to set the default goal. +- +- FILENAME is added to the `read_makefiles' chain. ++ SET_DEFAULT is true if we are allowed to set the default goal. */ + +- Returns 0 if a file was not found or not read. +- Returns 1 if FILENAME was found and read. +- Returns 2 if FILENAME was read, and we kept a reference (don't free it). */ + + static int + eval (struct ebuffer *ebuf, int set_default) +@@ -782,9 +811,7 @@ + + /* Save the state of conditionals and start + the included makefile with a clean slate. */ +- save = conditionals; +- bzero ((char *) &new_conditionals, sizeof new_conditionals); +- conditionals = &new_conditionals; ++ save = install_conditionals (&new_conditionals); + + /* Record the rules that are waiting so they will determine + the default goal before those in the included makefile. */ +@@ -810,14 +837,8 @@ + } + } + +- /* Free any space allocated by conditional_line. */ +- if (conditionals->ignoring) +- free (conditionals->ignoring); +- if (conditionals->seen_else) +- free (conditionals->seen_else); +- +- /* Restore state. */ +- conditionals = save; ++ /* Restore conditional state. */ ++ restore_conditionals (save); + + goto rule_complete; + } +--- tests/scripts/functions/eval 8 Jul 2002 02:26:48 -0000 1.1 ++++ tests/scripts/functions/eval 25 Oct 2002 21:17:42 -0000 +@@ -57,4 +57,35 @@ + + &compare_output($answer,&get_logfile(1)); + ++# Test to make sure eval'ing inside conditionals works properly ++ ++$makefile3 = &get_tmpfile; ++ ++open(MAKEFILE,"> $makefile3"); ++ ++print MAKEFILE <<'EOF'; ++FOO = foo ++ ++all:: ; @echo it ++ ++define Y ++ all:: ; @echo worked ++endef ++ ++ifdef BAR ++$(eval $(Y)) ++endif ++ ++EOF ++ ++close(MAKEFILE); ++ ++&run_make_with_options($makefile3, "", &get_logfile); ++$answer = "it\n"; ++&compare_output($answer,&get_logfile(1)); ++ ++&run_make_with_options($makefile3, "BAR=1", &get_logfile); ++$answer = "it\nworked\n"; ++&compare_output($answer,&get_logfile(1)); ++ + 1; +--- variable.h 8 Aug 2002 00:11:19 -0000 1.24 ++++ variable.h 25 Oct 2002 21:37:32 -0000 +@@ -107,6 +107,8 @@ + extern char *expand_argument PARAMS ((char *str, char *end)); + extern char *variable_expand_string PARAMS ((char *line, char *string, + long length)); ++extern void install_variable_buffer PARAMS ((char **bufp, unsigned int *lenp)); ++extern void restore_variable_buffer PARAMS ((char *buf, unsigned int len)); + + /* function.c */ + extern int handle_function PARAMS ((char **op, char **stringp)); +--- expand.c 14 Oct 2002 21:54:04 -0000 1.33 ++++ expand.c 25 Oct 2002 21:37:32 -0000 +@@ -545,3 +545,28 @@ + + return value; + } ++ ++/* Install a new variable_buffer context, returning the current one for ++ safe-keeping. */ ++ ++void ++install_variable_buffer (char **bufp, unsigned int *lenp) ++{ ++ *bufp = variable_buffer; ++ *lenp = variable_buffer_length; ++ ++ variable_buffer = 0; ++ initialize_variable_output (); ++} ++ ++/* Restore a previously-saved variable_buffer setting (free the current one). ++ */ ++ ++void ++restore_variable_buffer (char *buf, unsigned int len) ++{ ++ free (variable_buffer); ++ ++ variable_buffer = buf; ++ variable_buffer_length = len; ++} +--- function.c 14 Oct 2002 21:54:04 -0000 1.71 ++++ function.c 25 Oct 2002 21:37:32 -0000 +@@ -1196,7 +1196,17 @@ + static char * + func_eval (char *o, char **argv, const char *funcname) + { ++ char *buf; ++ unsigned int len; ++ ++ /* Eval the buffer. Pop the current variable buffer setting so that the ++ eval'd code can use its own without conflicting. */ ++ ++ install_variable_buffer (&buf, &len); ++ + eval_buffer (argv[0]); ++ ++ restore_variable_buffer (buf, len); + + return o; + } +--- read.c 30 Jan 2003 05:22:52 -0000 1.126 ++++ read.c 30 Jan 2003 07:26:40 -0000 +@@ -452,8 +452,8 @@ + static int + eval (struct ebuffer *ebuf, int set_default) + { +- static char *collapsed = 0; +- static unsigned int collapsed_length = 0; ++ char *collapsed = 0; ++ unsigned int collapsed_length = 0; + unsigned int commands_len = 200; + char *commands; + unsigned int commands_idx = 0; +@@ -566,9 +566,7 @@ + if (collapsed_length < linelen+1) + { + collapsed_length = linelen+1; +- if (collapsed != 0) +- free (collapsed); +- collapsed = (char *) xmalloc (collapsed_length); ++ collapsed = (char *) xrealloc (collapsed, collapsed_length); + } + strcpy (collapsed, line); + /* Collapse continuation lines. */ +@@ -1234,6 +1236,8 @@ + /* At eof, record the last rule. */ + record_waiting_files (); + ++ if (collapsed) ++ free ((char *) collapsed); + free ((char *) commands); + + return 1; +--- remake.c 8 Aug 2002 00:11:19 -0000 1.106 ++++ remake.c 15 Oct 2002 01:52:31 -0000 +@@ -755,7 +755,8 @@ + have_nonrecursing: + if (file->phony) + file->update_status = 0; +- else ++ /* According to POSIX, -t doesn't affect targets with no cmds. */ ++ else if (file->cmds != 0) + { + /* Should set file's modification date and do nothing else. */ + file->update_status = touch_file (file); Added: tinysofa/snapshot/make/current/sources/make-3.80.tar.bz2 =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/make/current/sources/make-3.80.tar.bz2 ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: tinysofa/snapshot/make/current/sources/make-3.80.tar.gz =================================================================== (Binary files differ) Modified: tinysofa/snapshot/make/current/specs/make.spec =================================================================== --- tinysofa/snapshot/make/current/specs/make.spec 2004-07-01 15:50:37 UTC (rev 2785) +++ tinysofa/snapshot/make/current/specs/make.spec 2004-07-01 15:50:39 UTC (rev 2786) @@ -1,19 +1,23 @@ Summary: A GNU tool which simplifies the build process for users. Name: make +Epoch: 1 Version: 3.80 -Release: 9ts +Release: 3ts License: GPL -Group: tinysofa official -Source: ftp://ftp.gnu.org/gnu/make/make-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-root -BuildRequires: texinfo -Prereq: htmlinfo +Group: Development/Tools +Source: ftp://ftp.gnu.org/gnu/make/make-%{version}.tar.bz2 +Patch: make-3.79.1-noclock_gettime.patch +Patch2: make-3.79.1-siglist.patch +Patch3: make-3.80-cvs.patch +Prereq: /sbin/install-info /dev/null +Prefix: %{_prefix} +Buildroot: %{_tmppath}/%{name}-%{version}-root %description A GNU tool for controlling the generation of executables and other -non-source files of a program from the program's source files. Make +non-source files of a program from the program's source files. Make allows users to build and install packages without any significant -knowledge about the details of the build process. The details about +knowledge about the details of the build process. The details about how the program should be built are provided for make in the program's makefile. @@ -22,94 +26,133 @@ %prep %setup -q +%patch -p1 +#%patch2 -p1 +%patch3 -p0 %build +#autoreconf -f --install %configure -CFLAGS="$RPM_OPT_FLAGS" ./configure i586-tinysofa-linux \ - --prefix=/usr \ - --mandir=/usr/share/man -make -cd doc -makeinfo --html --no-split --force make.texi || : +#touch .deps/remote-stub.Po # Workaround for broken automake files +make %{?_smp_mflags} +make check %install -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != "/" ] && rm -rf "$RPM_BUILD_ROOT" -mkdir -p $RPM_BUILD_ROOT/usr/share/html/make -make prefix=$RPM_BUILD_ROOT/%{_prefix} \ - mandir="$RPM_BUILD_ROOT"/usr/share/man install -install -m644 doc/make.html $RPM_BUILD_ROOT/usr/share/html/make/ +rm -rf ${RPM_BUILD_ROOT} -pushd $RPM_BUILD_ROOT/%{_prefix}; { - rm -rf ./share/info - strip ./bin/make - ln -sf make ./bin/gmake -} ; popd +%makeinstall -rm -rf $RPM_BUILD_ROOT/usr/info +pushd ${RPM_BUILD_ROOT} + ln -sf make .%{_bindir}/gmake + #gzip -9nf .%{_infodir}/make.info* + rm -f .%{_infodir}/dir + chmod ug-s .%{_bindir}/* +popd -%find_lang %{name} +%find_lang %name %clean -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT +rm -rf ${RPM_BUILD_ROOT} %post -/usr/sbin/htmlinfo_update.sh +/sbin/install-info %{_infodir}/make.info.gz %{_infodir}/dir --entry="* Make: (make). The GNU make utility." -%postun -/usr/sbin/htmlinfo_update.sh +%preun +if [ $1 = 0 ]; then + /sbin/install-info --delete %{_infodir}/make.info.gz %{_infodir}/dir --entry="* Make: (make). The GNU make utility." +fi -%files -f %{name}.lang +%files -f %{name}.lang %defattr(-,root,root) -%doc NEWS README COPYING ABOUT-NLS AUTHORS ChangeLog -%{_prefix}/bin/* -%{_prefix}/share/man/man1/make.1* -%dir /usr/share/html/make -/usr/share/html/make/make.html +%doc NEWS README +%{_bindir}/* +%{_mandir}/man*/* +%{_infodir}/*.info* %changelog -* Wed May 19 2004 tsintegrate 3.80-9ts -- current (3.80-8ts) integrated as 3.80-9ts for release 1.0-U1 +* Fri Feb 13 2004 Elliot Lee +- rebuilt -* Tue Dec 9 2003 Erlend Midttun 3.80-5tr -- Rebuilt +* Tue Dec 02 2003 Florian La Roche +- add important bug-fixes from make home-page -* Tue Sep 16 2003 Chr. H. Toldnes 3.80-4tr -- Rebuilt and retagged for release. +* Sun Nov 30 2003 Florian La Roche +- update to 3.80 -* Fri Sep 5 2003 Goetz Bock 3.80-3bg -- readded html page generated from make.texi +* Wed Jun 04 2003 Elliot Lee +- rebuilt -* Wed Jun 18 2003 Erlend Midttun 3.80-2tr -- Big rebuild +* Wed Jan 22 2003 Tim Powers +- rebuilt -* Tue May 21 2003 Roland Kruse 3.80-1rk -- Update to 3.80. (Previous version bailed out trying to build valgrind.) - note: make.texinfo missing, hence no make.html is built for now. +* Sun Dec 29 2002 Tim Powers +- fix references to %%install in the changelog so that the package will build -* Mon Mar 24 2003 Erlend Midttun 3.79.1-7em -- Rebuilt against glibc 2.3.2. +* Tue Dec 03 2002 Elliot Lee 3.79.1-15 +- _smp_mflags +- Fix ppc build (sys_siglist issues in patch2) -* Fri Oct 25 2002 Christian H. Toldnes 3.79.1-6ct -- Replaces ugly info2man-hack with cute htmlinfo setup +* Fri Jun 21 2002 Tim Powers +- automated rebuild -* Mon Aug 26 2002 Christian H. Toldnes 3.79.1-5ct -- Converted info pages to make_info.1 man page. +* Thu May 23 2002 Tim Powers +- automated rebuild -* Wed Jul 24 2002 Daniel Meyer 3.79.1-4dm -- rebuild for Trustix Secure Linux 2.0 +* Thu May 23 2002 Jakub Jelinek +- Run make check during build -* Thu Sep 15 2000 Erlend Midttun -- update to 3.79.1 +* Thu May 23 2002 Bernhard Rosenkraenzer +- Fix build with current auto* tools -* Thu May 11 2000 Oystein Viggen +* Fri Jan 25 2002 Jakub Jelinek +- rebuilt with gcc 3.1 + +* Fri Jul 6 2001 Trond Eivind Glomsr?d +- s/Copyright/License/ +- langify +- Make sure it isn't setgid if built as root + +* Sun Jun 24 2001 Elliot Lee +- Bump release + rebuild. + +* Mon Aug 7 2000 Tim Waugh +- change info-dir entry so that 'info make' works (#15029). + +* Tue Aug 1 2000 Jakub Jelinek +- assume we don't have clock_gettime in configure, so that + make is not linked against -lpthread (and thus does not + limit stack to 2MB). + +* Sat Jul 22 2000 Jeff Johnson +- add locale files (#14362). + +* Wed Jul 12 2000 Prospector +- automatic rebuild + +* Sat Jun 24 2000 Preston Brown +- 3.79.1 bugfix release + +* Mon Jun 5 2000 Jeff Johnson +- FHS packaging. + +* Sun May 7 2000 Bernhard Rosenkraenzer +- Fix build for some odd situations, such as + - previously installed make != GNU make + - /bin/sh != bash + +* Mon Apr 17 2000 Florian La Roche - update to 3.79 -* Fri Jan 28 2000 Erlend Midttun -- Changed man and info paths +* Thu Feb 24 2000 Cristian Gafton +- add patch from Andreas Jaeger to fix dtype lookups (for glibc 2.1.3 + builds) +* Mon Feb 7 2000 Jeff Johnson +- compress man page. + * Fri Jan 21 2000 Cristian Gafton -- apply patch to fiox a /tmp race condition from Thomas Biege -- simplify %install +- apply patch to fix a /tmp race condition from Thomas Biege +- simplify %%install * Sat Nov 27 1999 Jeff Johnson - update to 3.78.1. @@ -135,4 +178,4 @@ - added install-info support * Mon Jun 02 1997 Erik Troan -- built against glibc \ No newline at end of file +- built against glibc From svn at tinysofa.org Thu Jul 1 15:50:47 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:50:47 +1000 (EST) Subject: [tinysofa-svn] r2787 - in tinysofa/snapshot/man/current: sources specs Message-ID: <20040701155047.DC2554E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:50:47 +1000 (Fri, 02 Jul 2004) New Revision: 2787 Added: tinysofa/snapshot/man/current/sources/man-1.5h1-make.patch tinysofa/snapshot/man/current/sources/man-1.5m2-confpath.patch Modified: tinysofa/snapshot/man/current/sources/makewhatis.crondaily tinysofa/snapshot/man/current/sources/makewhatis.cronweekly tinysofa/snapshot/man/current/specs/man.spec Log: - Sync with 2.0. - Kept: - makewhatis.crondaily: - makewhatis.cronweekly: - man-1.5k-localshare.patch: - man-1.5m2-apropos.patch: - man-1.5m2-exitcode.patch: - man-1.5m2-i18n_makewhatis.patch: - man-1.5m2-i18n_nroff.patch: - man-1.5m2-lc_all.patch: - man-1.5m2-lookon.patch: - man-1.5m2-nlspath.patch: - man-1.5m2-posix.patch: - man-1.5m2-segv.patch: - man-1.5m2.tar.bz2: - Added: - man-1.5h1-make.patch: - man-1.5m2-confpath.patch: Modified: tinysofa/snapshot/man/current/sources/makewhatis.crondaily =================================================================== --- tinysofa/snapshot/man/current/sources/makewhatis.crondaily 2004-07-01 15:50:39 UTC (rev 2786) +++ tinysofa/snapshot/man/current/sources/makewhatis.crondaily 2004-07-01 15:50:47 UTC (rev 2787) @@ -1,7 +1,5 @@ #!/bin/bash -renice +19 -p $$ > /dev/null 2>&1 - LOCKFILE=/var/lock/makewhatis.lock # the lockfile is not meant to be perfect, it's just in case the Modified: tinysofa/snapshot/man/current/sources/makewhatis.cronweekly =================================================================== --- tinysofa/snapshot/man/current/sources/makewhatis.cronweekly 2004-07-01 15:50:39 UTC (rev 2786) +++ tinysofa/snapshot/man/current/sources/makewhatis.cronweekly 2004-07-01 15:50:47 UTC (rev 2787) @@ -1,7 +1,5 @@ #!/bin/bash -renice +19 -p $$ > /dev/null 2>&1 - LOCKFILE=/var/lock/makewhatis.lock # the lockfile is not meant to be perfect, it's just in case the Added: tinysofa/snapshot/man/current/sources/man-1.5h1-make.patch =================================================================== --- tinysofa/snapshot/man/current/sources/man-1.5h1-make.patch 2004-07-01 15:50:39 UTC (rev 2786) +++ tinysofa/snapshot/man/current/sources/man-1.5h1-make.patch 2004-07-01 15:50:47 UTC (rev 2787) @@ -0,0 +1,13 @@ +--- man-1.5g/man/Makefile.in.mike Fri Apr 9 13:35:54 1999 ++++ man-1.5g/man/Makefile.in Fri Apr 9 13:36:45 1999 +@@ -1,8 +1,8 @@ + # only executed from a subdir + MAN1 = man whatis apropos +-MAN5 = man.conf ++MAN5 = man.config + MAN8 = makewhatis +-ALL = man.1 whatis.1 apropos.1 man.conf.5 ++ALL = man.1 whatis.1 apropos.1 man.config.5 + MAYBE8 = makewhatis + + .SUFFIXES: .man .1 .5 .8 Added: tinysofa/snapshot/man/current/sources/man-1.5m2-confpath.patch =================================================================== --- tinysofa/snapshot/man/current/sources/man-1.5m2-confpath.patch 2004-07-01 15:50:39 UTC (rev 2786) +++ tinysofa/snapshot/man/current/sources/man-1.5m2-confpath.patch 2004-07-01 15:50:47 UTC (rev 2787) @@ -0,0 +1,11 @@ +--- man-1.5m2/configure.orig 2003-09-05 05:48:13.000000000 -0400 ++++ man-1.5m2/configure 2004-01-23 16:59:04.000000000 -0500 +@@ -198,7 +198,7 @@ + confdir="${confprefix}/share/misc" + fi + fi +-conffilename="man.conf" ++conffilename="man.config" + + if test "$RANDOM" = "$RANDOM"; then + # Plain old Bourne shell. Modified: tinysofa/snapshot/man/current/specs/man.spec =================================================================== --- tinysofa/snapshot/man/current/specs/man.spec 2004-07-01 15:50:39 UTC (rev 2786) +++ tinysofa/snapshot/man/current/specs/man.spec 2004-07-01 15:50:47 UTC (rev 2787) @@ -1,15 +1,17 @@ %define usecache 0 -%define cache %{_localstatedir}/cache/man +%define cache /var/cache/man Summary: A set of documentation tools: man, apropos and whatis. Name: man Version: 1.5m2 -Release: 8jh +Release: 6ts License: GPL -Group: tinysofa/main +Group: System Environment/Base Source0: ftp://ftp.win.tue.nl/pub/linux-local/utils/man/man-%{version}.tar.bz2 Source1: makewhatis.cronweekly Source2: makewhatis.crondaily +Patch1: man-1.5m2-confpath.patch +Patch2: man-1.5h1-make.patch Patch3: man-1.5m2-lookon.patch Patch4: man-1.5m2-segv.patch Patch5: man-1.5k-localshare.patch @@ -22,9 +24,8 @@ Patch12: man-1.5m2-posix.patch Buildroot: %{_tmppath}/%{name}-%{version}-root -PreReq: coreutils +PreReq: fileutils Requires: less, groff >= 1.18, nroff-i18n, findutils, mktemp >= 1.5-2.1.5x -BuildRequires: perl %description The man package includes three tools for finding information and/or @@ -37,9 +38,10 @@ The man package should be installed on your system because it is the primary way to find documentation on a Linux system. - %prep %setup -q +%patch1 -p1 -b .confpath +%patch2 -p1 -b .make %patch3 -p1 -b .lookon %patch4 -p1 -b .segv %patch5 -p1 -b .localshare @@ -51,34 +53,103 @@ %patch11 -p1 -b .nlspath %patch12 -p1 -b .posix +for src in $(find msgs -type f -name 'mess.[a-z][a-z]'); do + lang=$(echo ${src} | sed -r 's;.*([a-z]{2})$;\1;') + if [ ${lang} = ja ]; then charset=euc-jp + elif [ ${lang} = ko ]; then charset=euc-kr + elif [ ${lang} = ru ]; then charset=koi8-r + elif [ ${lang} = da ]; then charset=iso-8859-1 + elif [ ${lang} = de ]; then charset=iso-8859-1 + elif [ ${lang} = en ]; then charset=iso-8859-1 + elif [ ${lang} = es ]; then charset=iso-8859-1 + elif [ ${lang} = fi ]; then charset=iso-8859-1 + elif [ ${lang} = fr ]; then charset=iso-8859-1 + elif [ ${lang} = it ]; then charset=iso-8859-1 + elif [ ${lang} = pt ]; then charset=iso-8859-1 + elif [ ${lang} = nl ]; then charset=iso-8859-1 + elif [ ${lang} = cs ]; then charset=iso-8859-2 + elif [ ${lang} = hr ]; then charset=iso-8859-2 + elif [ ${lang} = pl ]; then charset=iso-8859-2 + elif [ ${lang} = ro ]; then charset=iso-8859-2 + elif [ ${lang} = sl ]; then charset=iso-8859-2 + elif [ ${lang} = bg ]; then charset=iso-8859-5 + elif [ ${lang} = el ]; then charset=iso-8859-7 + else + echo === LANGUAGE ${lang}: MUST SPECIFY CHARSET/ENCODING + exit 1 + fi + iconv -t utf-8 -f ${charset} -o ${src}.utf ${src} && mv ${src}.utf ${src} +done %build -./configure -default -confdir %{_sysconfdir} +fhs +find . -type f|xargs perl -pi -e 's,man\.conf \(5\),man.config (5),g' +for i in $(find man -name man.conf.man); do + mv $i ${i%man.conf.man}man.config.5 +done + +./configure -default -confdir /etc +fhs +lang all # HACK: Make output default to using -c; otherwise it appears broken. perl -pi -e "s/nroff /nroff -c /" conf_script -%make CC="gcc $RPM_OPT_FLAGS -D_GNU_SOURCE" +make CC="gcc $RPM_OPT_FLAGS" %if %{usecache} perl -pi -e "s,^NOCACHE,# NOCACHE,g" src/man.conf %endif - %install -mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/cron.{daily,weekly} +rm -rf $RPM_BUILD_ROOT +mkdir -p $RPM_BUILD_ROOT/etc/cron.{daily,weekly} mkdir -p $RPM_BUILD_ROOT%{_bindir} $RPM_BUILD_ROOT%{_sbindir} make install PREFIX=$RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1 mkdir -p $RPM_BUILD_ROOT%{_mandir}/man5 mkdir -p $RPM_BUILD_ROOT%{_mandir}/man8 -mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir} +mkdir -p $RPM_BUILD_ROOT/etc -install -m 644 src/man.conf $RPM_BUILD_ROOT/%{_sysconfdir}/man.conf +for src in $(find man -type f -name '*.[1-9n]'); do + lang=$(echo ${src} | sed -r 's;.*/([a-z]{2})/.*;\1;') + page=$(basename ${src}) + sect=$(echo ${page} | sed -r 's;.*([1-9n])$;man\1;') + dir=${RPM_BUILD_ROOT}%{_mandir} + if [ ${lang} = ja ]; then charset=euc-jp + elif [ ${lang} = ko ]; then charset=euc-kr + elif [ ${lang} = da ]; then charset=iso-8859-1 + elif [ ${lang} = de ]; then charset=iso-8859-1 + elif [ ${lang} = en ]; then charset=iso-8859-1 + elif [ ${lang} = es ]; then charset=iso-8859-1 + elif [ ${lang} = fi ]; then charset=iso-8859-1 + elif [ ${lang} = fr ]; then charset=iso-8859-1 + elif [ ${lang} = it ]; then charset=iso-8859-1 + elif [ ${lang} = pt ]; then charset=iso-8859-1 + elif [ ${lang} = nl ]; then charset=iso-8859-1 + elif [ ${lang} = cs ]; then charset=iso-8859-2 + elif [ ${lang} = hr ]; then charset=iso-8859-2 + elif [ ${lang} = pl ]; then charset=iso-8859-2 + elif [ ${lang} = ro ]; then charset=iso-8859-2 + elif [ ${lang} = sl ]; then charset=iso-8859-2 + elif [ ${lang} = bg ]; then charset=iso-8859-5 + elif [ ${lang} = el ]; then charset=iso-8859-7 + else + echo === LANGUAGE ${lang}: MUST SPECIFY CHARSET/ENCODING + exit 1 + fi + mkdir -p ${dir}/${lang}/${sect} + iconv -t utf-8 -f ${charset} -o ${dir}/${lang}/${sect}/${page} ${src} -install -m755 $RPM_SOURCE_DIR/makewhatis.cronweekly $RPM_BUILD_ROOT/%{_sysconfdir}/cron.weekly/makewhatis.cron -install -m755 $RPM_SOURCE_DIR/makewhatis.crondaily $RPM_BUILD_ROOT/%{_sysconfdir}/cron.daily/makewhatis.cron + # ensure POSIX/C locale only has ASCII subset and no latin-1 + if [ ${lang} = en ]; then + mkdir -p ${dir}/${sect} + iconv -t ascii//translit -f ${charset} -o ${dir}/${sect}/${page} ${src} + fi +done +install -m 644 src/man.conf $RPM_BUILD_ROOT/etc/man.config + +install -m755 $RPM_SOURCE_DIR/makewhatis.cronweekly $RPM_BUILD_ROOT/etc/cron.weekly/makewhatis.cron +install -m755 $RPM_SOURCE_DIR/makewhatis.crondaily $RPM_BUILD_ROOT/etc/cron.daily/makewhatis.cron + mkdir -p $RPM_BUILD_ROOT/%{cache} mkdir -p $RPM_BUILD_ROOT/%{cache}/local @@ -89,7 +160,7 @@ mkdir -p $RPM_BUILD_ROOT/%{cache}/X11R6/cat$i done -strip $RPM_BUILD_ROOT/${_bindir}/man +strip $RPM_BUILD_ROOT/usr/bin/man # added man2html stuff cd man2html @@ -129,43 +200,111 @@ %clean -%clean_buildroot +rm -rf $RPM_BUILD_ROOT - %files %defattr(-,root,root) -%config %{_sysconfdir}/cron.weekly/makewhatis.cron -%config %{_sysconfdir}/cron.daily/makewhatis.cron +%config /etc/cron.weekly/makewhatis.cron +%config /etc/cron.daily/makewhatis.cron %if %{usecache} -%attr(2755,root,man) %{_bindir}/man +%attr(2755,root,man) /usr/bin/man %else -%attr(0755,root,root) %{_bindir}/man +%attr(0755,root,root) /usr/bin/man %endif -%{_bindir}/manpath -%{_bindir}/apropos -%{_bindir}/whatis -%{_bindir}/makewhatis -%config(noreplace) %{_sysconfdir}/man.conf -%{_mandir}/man5/man.conf.5* +/usr/bin/manpath +/usr/bin/apropos +/usr/bin/whatis +/usr/bin/makewhatis +%config(noreplace) /etc/man.config +%{_mandir}/man5/man.config.5* %{_mandir}/man1/whatis.1* %{_mandir}/man1/man.1* %{_mandir}/man1/manpath.1* %{_mandir}/man1/apropos.1* %{_mandir}/man1/man2html.1* %{_mandir}/man8/makewhatis.8* -%{_bindir}/man2html -%if %{usecache} +/usr/bin/man2html +%lang(bg) %dir /usr/share/locale/bg +%lang(bg) /usr/share/locale/bg/man +%lang(bg) %dir /usr/share/man/bg +%lang(bg) /usr/share/man/bg/man?/* +%lang(cs) %dir /usr/share/locale/cs +%lang(cs) /usr/share/locale/cs/man +%lang(cs) %dir /usr/share/man/cs +%lang(cs) /usr/share/man/cs/man?/* +%lang(da) %dir /usr/share/locale/da +%lang(da) /usr/share/locale/da/man +%lang(da) %dir /usr/share/man/da +%lang(da) /usr/share/man/da/man?/* +%lang(de) %dir /usr/share/locale/de +%lang(de) /usr/share/locale/de/man +%lang(de) %dir /usr/share/man/de +%lang(de) /usr/share/man/de/man?/* +%lang(el) %dir /usr/share/locale/el +%lang(el) /usr/share/locale/el/man +%lang(el) %dir /usr/share/man/el +%lang(el) /usr/share/man/el/man?/* +%lang(en) %dir /usr/share/locale/en +%lang(en) /usr/share/locale/en/man +%lang(en) %dir /usr/share/man/en +%lang(en) /usr/share/man/en/man?/* +%lang(es) %dir /usr/share/locale/es +%lang(es) /usr/share/locale/es/man +%lang(es) %dir /usr/share/man/es +%lang(es) /usr/share/man/es/man?/* +%lang(fi) %dir /usr/share/locale/fi +%lang(fi) /usr/share/locale/fi/man +%lang(fi) %dir /usr/share/man/fi +%lang(fi) /usr/share/man/fi/man?/* +%lang(fr) %dir /usr/share/locale/fr +%lang(fr) /usr/share/locale/fr/man +%lang(fr) %dir /usr/share/man/fr +%lang(fr) /usr/share/man/fr/man?/* +%lang(hr) %dir /usr/share/locale/hr +%lang(hr) /usr/share/locale/hr/man +%lang(hr) %dir /usr/share/man/hr +%lang(hr) /usr/share/man/hr/man?/* +%lang(it) %dir /usr/share/locale/it +%lang(it) /usr/share/locale/it/man +%lang(it) %dir /usr/share/man/it +%lang(it) /usr/share/man/it/man?/* +%lang(ja) %dir /usr/share/locale/ja +%lang(ja) /usr/share/locale/ja/man +%lang(ja) %dir /usr/share/man/ja +%lang(ja) /usr/share/man/ja/man?/* +%lang(ko) %dir /usr/share/locale/ko +%lang(ko) /usr/share/locale/ko/man +%lang(ko) %dir /usr/share/man/ko +%lang(ko) /usr/share/man/ko/man?/* +%lang(nl) %dir /usr/share/locale/nl +%lang(nl) /usr/share/locale/nl/man +%lang(nl) %dir /usr/share/man/nl +%lang(nl) /usr/share/man/nl/man?/* +%lang(pl) %dir /usr/share/locale/pl +%lang(pl) /usr/share/locale/pl/man +%lang(pl) %dir /usr/share/man/pl +%lang(pl) /usr/share/man/pl/man?/* +%lang(pt) %dir /usr/share/locale/pt +%lang(pt) /usr/share/locale/pt/man +%lang(pt) %dir /usr/share/man/pt +%lang(pt) /usr/share/man/pt/man?/* +%lang(ro) %dir /usr/share/locale/ro +%lang(ro) /usr/share/locale/ro/man +%lang(ro) %dir /usr/share/man/ro +%lang(ro) /usr/share/man/ro/man?/* +%lang(sl) %dir /usr/share/locale/sl +%lang(sl) /usr/share/locale/sl/man +%lang(sl) %dir /usr/share/man/sl +%lang(sl) /usr/share/man/sl/man?/* +%lang(ru) %dir /usr/share/locale/ru +%lang(ru) /usr/share/locale/ru/man %attr(0755,root,root) %dir %{cache} %attr(0775,root,man) %dir %{cache}/cat[123456789n] %attr(0775,root,man) %dir %{cache}/local %attr(0775,root,man) %dir %{cache}/local/cat[123456789n] %attr(0775,root,man) %dir %{cache}/X11R6 %attr(0775,root,man) %dir %{cache}/X11R6/cat[123456789n] -%else -%exclude %{cache} -%endif - %changelog * Wed Mar 31 2004 Adrian Havill 1.5m2-6 - reorder MANSECT so that normal pages (with translations) take From svn at tinysofa.org Thu Jul 1 15:50:51 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:50:51 +1000 (EST) Subject: [tinysofa-svn] r2788 - in tinysofa/snapshot/man-pages/current: sources specs Message-ID: <20040701155051.F32234E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:50:51 +1000 (Fri, 02 Jul 2004) New Revision: 2788 Added: tinysofa/snapshot/man-pages/current/sources/man-pages-1.44-ext3.patch tinysofa/snapshot/man-pages/current/sources/man-pages-1.51-blank.patch tinysofa/snapshot/man-pages/current/sources/man-pages-1.51-iconv.patch tinysofa/snapshot/man-pages/current/sources/man-pages-1.51-nopent.patch tinysofa/snapshot/man-pages/current/sources/man-pages-1.53-langinfo.patch tinysofa/snapshot/man-pages/current/sources/man-pages-1.53-mlock.patch tinysofa/snapshot/man-pages/current/sources/man-pages-1.60-fopen.patch tinysofa/snapshot/man-pages/current/sources/man-pages-1.60-fs.patch tinysofa/snapshot/man-pages/current/sources/man-pages-1.60-issue.patch tinysofa/snapshot/man-pages/current/sources/man-pages-1.60-re_comp.patch tinysofa/snapshot/man-pages/current/sources/man-pages-1.60-shmget.patch tinysofa/snapshot/man-pages/current/sources/man-pages-1.60-strftime.patch tinysofa/snapshot/man-pages/current/sources/man-pages-1.60-wait.patch tinysofa/snapshot/man-pages/current/sources/man-pages-1.66.tar.bz2 tinysofa/snapshot/man-pages/current/sources/man-pages-extralocale.tar.bz2 tinysofa/snapshot/man-pages/current/sources/man2.tar.gz Removed: tinysofa/snapshot/man-pages/current/sources/manpages_1.66.orig.tar.gz tinysofa/snapshot/man-pages/current/sources/netman-cvs.tar.gz Modified: tinysofa/snapshot/man-pages/current/sources/rpcgen.1 tinysofa/snapshot/man-pages/current/specs/man-pages.spec Log: - Sync with 2.0. - Kept: - rpcgen.1: - Added: - man-pages-1.44-ext3.patch: - man-pages-1.51-blank.patch: - man-pages-1.51-iconv.patch: - man-pages-1.51-nopent.patch: - man-pages-1.53-langinfo.patch: - man-pages-1.53-mlock.patch: - man-pages-1.60-fopen.patch: - man-pages-1.60-fs.patch: - man-pages-1.60-issue.patch: - man-pages-1.60-re_comp.patch: - man-pages-1.60-shmget.patch: - man-pages-1.60-strftime.patch: - man-pages-1.60-wait.patch: - man-pages-1.66.tar.bz2: - man-pages-extralocale.tar.bz2: - man2.tar.gz: - Removed: - manpages_1.66.orig.tar.gz: - netman-cvs.tar.gz: Added: tinysofa/snapshot/man-pages/current/sources/man-pages-1.44-ext3.patch =================================================================== --- tinysofa/snapshot/man-pages/current/sources/man-pages-1.44-ext3.patch 2004-07-01 15:50:47 UTC (rev 2787) +++ tinysofa/snapshot/man-pages/current/sources/man-pages-1.44-ext3.patch 2004-07-01 15:50:51 UTC (rev 2788) @@ -0,0 +1,15 @@ +--- man-pages-1.44/man5/fs.5.ext3 Thu Dec 6 15:17:19 2001 ++++ man-pages-1.44/man5/fs.5 Thu Dec 6 15:20:12 2001 +@@ -65,6 +65,12 @@ + the filesystems supported under Linux. + .\"---------------------------------------------------------------------- + .TP ++.B ext3 ++is a journaling version of the ext2 filesystem. ext3 offers the most ++complete set of journaling options available among journaling ++filesystems. ++.\"---------------------------------------------------------------------- ++.TP + .B xiafs + was designed and implemented to be a stable, safe filesystem by + extending the Minix filesystem code. It provides the basic most Added: tinysofa/snapshot/man-pages/current/sources/man-pages-1.51-blank.patch =================================================================== --- tinysofa/snapshot/man-pages/current/sources/man-pages-1.51-blank.patch 2004-07-01 15:50:47 UTC (rev 2787) +++ tinysofa/snapshot/man-pages/current/sources/man-pages-1.51-blank.patch 2004-07-01 15:50:51 UTC (rev 2788) @@ -0,0 +1,7 @@ +--- man-pages-1.51/man3/rcmd.3.manfix 2002-07-18 12:02:33.000000000 -0400 ++++ man-pages-1.51/man3/rcmd.3 2002-07-18 12:03:01.000000000 -0400 +@@ -204,4 +204,3 @@ + These + functions appeared in + .Bx 4.2 . +- Added: tinysofa/snapshot/man-pages/current/sources/man-pages-1.51-iconv.patch =================================================================== --- tinysofa/snapshot/man-pages/current/sources/man-pages-1.51-iconv.patch 2004-07-01 15:50:47 UTC (rev 2787) +++ tinysofa/snapshot/man-pages/current/sources/man-pages-1.51-iconv.patch 2004-07-01 15:50:51 UTC (rev 2788) @@ -0,0 +1,11 @@ +--- man-pages-1.51/man1/iconv.1.stdin 2002-06-12 14:44:12.000000000 -0400 ++++ man-pages-1.51/man1/iconv.1 2002-06-12 14:44:26.000000000 -0400 +@@ -211,7 +211,7 @@ + .PP + \fB--output\fR, \fB\-o\fR \fIfile\fR + .PP +-Specify output file (instead of stdin) ++Specify output file (instead of stdout) + .PP + \fB--verbose\fR + .PP Added: tinysofa/snapshot/man-pages/current/sources/man-pages-1.51-nopent.patch =================================================================== --- tinysofa/snapshot/man-pages/current/sources/man-pages-1.51-nopent.patch 2004-07-01 15:50:47 UTC (rev 2787) +++ tinysofa/snapshot/man-pages/current/sources/man-pages-1.51-nopent.patch 2004-07-01 15:50:51 UTC (rev 2788) @@ -0,0 +1,13 @@ +--- man-pages-1.51/man7/bootparam.7.nopentium 2002-07-09 18:44:06.000000000 -0400 ++++ man-pages-1.51/man7/bootparam.7 2002-07-09 18:45:56.000000000 -0400 +@@ -252,6 +252,10 @@ + it actually does have, bad things will happen: maybe not at once, but + surely eventually.'' + ++You can also use the boot argument `mem=nopentium' to turn off 4 MB ++pagetables on kernels configured for IA32 systems with a pentium or newer ++CPU. ++ + .SS "`panic=N'" + By default the kernel will not reboot after a panic, but this option + will cause a kernel reboot after N seconds (if N > 0). Added: tinysofa/snapshot/man-pages/current/sources/man-pages-1.53-langinfo.patch =================================================================== --- tinysofa/snapshot/man-pages/current/sources/man-pages-1.53-langinfo.patch 2004-07-01 15:50:47 UTC (rev 2787) +++ tinysofa/snapshot/man-pages/current/sources/man-pages-1.53-langinfo.patch 2004-07-01 15:50:51 UTC (rev 2788) @@ -0,0 +1,9 @@ +--- man-pages-1.53/man3/setlocale.3.nl 2002-08-27 12:38:38.000000000 -0400 ++++ man-pages-1.53/man3/setlocale.3 2002-08-27 12:39:01.000000000 -0400 +@@ -186,4 +186,5 @@ + .BR localeconv (3), + .BR strftime (3), + .BR charsets (4), +-.BR locale (7) ++.BR locale (7), ++.BR nl_langinfo (3) Added: tinysofa/snapshot/man-pages/current/sources/man-pages-1.53-mlock.patch =================================================================== --- tinysofa/snapshot/man-pages/current/sources/man-pages-1.53-mlock.patch 2004-07-01 15:50:47 UTC (rev 2787) +++ tinysofa/snapshot/man-pages/current/sources/man-pages-1.53-mlock.patch 2004-07-01 15:50:51 UTC (rev 2788) @@ -0,0 +1,100 @@ +--- man-pages-1.53/man2/mlock.2.orig ++++ man-pages-1.53/man2/mlock.2 +@@ -25,7 +25,7 @@ + .\" 1995-11-26 Markus Kuhn + .\" First version written + .\" +-.TH MLOCK 2 1995-11-26 "Linux 1.3.43" "Linux Programmer's Manual" ++.TH MLOCK 2 2003-07-11 "Linux 2.4" "Linux Programmer's Manual" + .SH NAME + mlock \- disable paging for some parts of memory + .SH SYNOPSIS +@@ -109,10 +109,17 @@ address space of the process. + Some of the specified address range does not correspond to mapped + pages in the address space of the process or the process tried to + exceed the maximum number of allowed locked pages. ++Non-root processes are allowed to lock up to their current ++.B RLIMIT_MEMLOCK ++resource limit. + .TP + .B EPERM +-The calling process does not have appropriate privileges. Only root +-processes are allowed to lock pages. ++The calling process does not have appropriate privileges. ++Processes are permitted to lock pages if they running with the ++.B CAP_IPC_LOCK ++capability (normally only true for root) or if their current ++.B RLIMIT_MEMLOCK ++resource limit is non-zero. + .TP + .B EINVAL + .I len +--- man-pages-1.53/man2/mlockall.2.orig ++++ man-pages-1.53/man2/mlockall.2 +@@ -25,7 +25,7 @@ + .\" 1995-11-26 Markus Kuhn + .\" First version written + .\" +-.TH MLOCKALL 2 1995-11-26 "Linux 1.3.43" "Linux Programmer's Manual" ++.TH MLOCKALL 2 2003-07-11 "Linux 2.4" "Linux Programmer's Manual" + .SH NAME + mlockall \- disable paging for calling process + .SH SYNOPSIS +@@ -130,10 +130,17 @@ is set appropriately. + .B ENOMEM + The process tried to exceed the maximum number of allowed locked + pages. ++Non-root processes are allowed to lock up to their current ++.B RLIMIT_MEMLOCK ++resource limit. + .TP + .B EPERM +-The calling process does not have appropriate privileges. Only root +-processes are allowed to lock pages. ++The calling process does not have appropriate privileges. ++Processes are permitted to lock pages if they running with the ++.B CAP_IPC_LOCK ++capability (normally only true for root) or if their current ++.B RLIMIT_MEMLOCK ++resource limit is non-zero. + .TP + .B EINVAL + Unknown flags were specified. +--- man-pages-1.53/man2/shmctl.2.orig ++++ man-pages-1.53/man2/shmctl.2 +@@ -28,7 +28,7 @@ + .\" Modified Sun Feb 18 01:59:29 2001 by Andries Brouwer + .\" Modified 5 Jan 2002 Michael Kerrisk + .\" +-.TH SHMCTL 2 2002-01-05 "Linux 2.4.1" "Linux Programmer's Manual" ++.TH SHMCTL 2 2003-07-11 "Linux 2.4" "Linux Programmer's Manual" + .SH NAME + shmctl \- shared memory control + .SH SYNOPSIS +@@ -106,7 +106,8 @@ is zero.) The user must be the owner, c + The user \fImust\fP ensure that a segment is eventually destroyed; otherwise + its pages that were faulted in will remain in memory or swap. + .PP +-In addition, the \fBsuper-user\fP can prevent or allow swapping of a shared ++In addition, processes with appropriate privileges ++can prevent or allow swapping of a shared + memory segment with the following \fIcmds\fP: (Linux only) + .br + .TP 12 +@@ -117,6 +118,16 @@ any pages that are required to be presen + .B SHM_UNLOCK + allows the shared memory segment to be swapped out. + .PP ++Processes are permitted to use ++.B SHM_LOCK ++and ++.B SHM_UNLOCK ++if they running with the ++.B CAP_IPC_LOCK ++capability (normally only true for root) or if their current ++.B RLIMIT_MEMLOCK ++resource limit is non-zero. ++.PP + The + .BR IPC_INFO , + .BR SHM_STAT Added: tinysofa/snapshot/man-pages/current/sources/man-pages-1.60-fopen.patch =================================================================== --- tinysofa/snapshot/man-pages/current/sources/man-pages-1.60-fopen.patch 2004-07-01 15:50:47 UTC (rev 2787) +++ tinysofa/snapshot/man-pages/current/sources/man-pages-1.60-fopen.patch 2004-07-01 15:50:51 UTC (rev 2788) @@ -0,0 +1,12 @@ +--- man-pages-1.60/man3/fopen.3.orig 2003-08-28 16:28:06.000000000 -0400 ++++ man-pages-1.60/man3/fopen.3 2003-08-28 16:29:30.000000000 -0400 +@@ -86,7 +86,8 @@ + .B a+ + Open for reading and appending (writing at end of file). The file + is created if it does not exist. +-The stream is positioned at the end of the file. ++The initial file position for reading is at the beginning of the file, ++but output is always appended to the end of the file. + .PP + The + .I mode Added: tinysofa/snapshot/man-pages/current/sources/man-pages-1.60-fs.patch =================================================================== --- tinysofa/snapshot/man-pages/current/sources/man-pages-1.60-fs.patch 2004-07-01 15:50:47 UTC (rev 2787) +++ tinysofa/snapshot/man-pages/current/sources/man-pages-1.60-fs.patch 2004-07-01 15:50:51 UTC (rev 2788) @@ -0,0 +1,14 @@ +--- man-pages-1.60/man5/fs.5.orig 2003-08-28 16:59:42.000000000 -0400 ++++ man-pages-1.60/man5/fs.5 2003-08-28 17:00:31.000000000 -0400 +@@ -71,10 +71,7 @@ + .TP + .B ext3 + is a journaling version of the ext2 filesystem. It is easy to +-switch back and forth between ext2 and ext3. +-.TP +-.B ext3 +-is a journaling version of the ext2 filesystem. ext3 offers the most ++switch back and forth between ext2 and ext3. ext3 offers the most + complete set of journaling options available among journaling + filesystems. + .\"---------------------------------------------------------------------- Added: tinysofa/snapshot/man-pages/current/sources/man-pages-1.60-issue.patch =================================================================== --- tinysofa/snapshot/man-pages/current/sources/man-pages-1.60-issue.patch 2004-07-01 15:50:47 UTC (rev 2787) +++ tinysofa/snapshot/man-pages/current/sources/man-pages-1.60-issue.patch 2004-07-01 15:50:51 UTC (rev 2788) @@ -0,0 +1,14 @@ +--- man-pages-1.60/man5/issue.5.orig 2003-08-28 17:05:14.000000000 -0400 ++++ man-pages-1.60/man5/issue.5 2003-08-28 17:05:47.000000000 -0400 +@@ -30,9 +30,9 @@ + system identification to be printed before the login prompt. It may + contain various \fB@\fP\fIchar\fP and \fB\e\fP\fIchar\fP sequences, if + supported by +-.BR getty (1). ++.BR mingetty (1). + .SH FILES + /etc/issue + .SH "SEE ALSO" +-.BR getty (1), ++.BR mingetty (1), + .BR motd (5) Added: tinysofa/snapshot/man-pages/current/sources/man-pages-1.60-re_comp.patch =================================================================== --- tinysofa/snapshot/man-pages/current/sources/man-pages-1.60-re_comp.patch 2004-07-01 15:50:47 UTC (rev 2787) +++ tinysofa/snapshot/man-pages/current/sources/man-pages-1.60-re_comp.patch 2004-07-01 15:50:51 UTC (rev 2788) @@ -0,0 +1,11 @@ +--- man-pages-1.60/man3/re_comp.3.orig 2003-08-28 16:15:37.000000000 -0400 ++++ man-pages-1.60/man3/re_comp.3 2003-08-28 16:16:22.000000000 -0400 +@@ -26,6 +26,8 @@ + .SH NAME + re_comp, re_exec \- BSD regex functions + .SH SYNOPSIS ++.B #define _REGEX_RE_COMP ++.br + .B #include + .br + .B #include Added: tinysofa/snapshot/man-pages/current/sources/man-pages-1.60-shmget.patch =================================================================== --- tinysofa/snapshot/man-pages/current/sources/man-pages-1.60-shmget.patch 2004-07-01 15:50:47 UTC (rev 2787) +++ tinysofa/snapshot/man-pages/current/sources/man-pages-1.60-shmget.patch 2004-07-01 15:50:51 UTC (rev 2788) @@ -0,0 +1,11 @@ +--- man-pages-1.60/man2/shmget.2.orig 2003-08-28 16:33:59.000000000 -0400 ++++ man-pages-1.60/man2/shmget.2 2003-08-28 16:35:19.000000000 -0400 +@@ -37,7 +37,7 @@ + .sp + .B #include + .sp +-.BI "int shmget(key_t " key ", int " size ", int " shmflg ); ++.BI "int shmget(key_t " key ", size_t " size ", int " shmflg ); + .ad b + .SH DESCRIPTION + .B shmget() Added: tinysofa/snapshot/man-pages/current/sources/man-pages-1.60-strftime.patch =================================================================== --- tinysofa/snapshot/man-pages/current/sources/man-pages-1.60-strftime.patch 2004-07-01 15:50:47 UTC (rev 2787) +++ tinysofa/snapshot/man-pages/current/sources/man-pages-1.60-strftime.patch 2004-07-01 15:50:51 UTC (rev 2788) @@ -0,0 +1,11 @@ +--- man-pages-1.60/man3/strftime.3.orig 2003-08-28 16:21:23.000000000 -0400 ++++ man-pages-1.60/man3/strftime.3 2003-08-28 16:21:59.000000000 -0400 +@@ -214,7 +214,7 @@ + the current locale, the behaviour will be as if the unmodified + conversion specification were used. (SU) + The Single Unix Specification mentions %Ec, %EC, %Ex, %EX, +-%Ry, %EY, %Od, %Oe, %OH, %OI, %Om, %OM, %OS, %Ou, %OU, %OV, ++%Ey, %EY, %Od, %Oe, %OH, %OI, %Om, %OM, %OS, %Ou, %OU, %OV, + %Ow, %OW, %Oy, where the effect of the O modifier is to use + alternative numeric symbols (say, roman numerals), and that of the + E modifier is to use a locale-dependent alternative representation. Added: tinysofa/snapshot/man-pages/current/sources/man-pages-1.60-wait.patch =================================================================== --- tinysofa/snapshot/man-pages/current/sources/man-pages-1.60-wait.patch 2004-07-01 15:50:47 UTC (rev 2787) +++ tinysofa/snapshot/man-pages/current/sources/man-pages-1.60-wait.patch 2004-07-01 15:50:51 UTC (rev 2788) @@ -0,0 +1,11 @@ +--- man-pages-1.60/man2/wait.2.orig 2003-08-28 16:38:05.000000000 -0400 ++++ man-pages-1.60/man2/wait.2 2003-08-28 16:38:34.000000000 -0400 +@@ -208,7 +208,7 @@ + if a + .BR wait "() or " waitpid () + call is made while SIGCHLD is being ignored, +-the call behaves just as though SIGCHLD were not being igored, that is, ++the call behaves just as though SIGCHLD were not being ignored, that is, + the call blocks until the next child terminates and then returns the + PID and status of that child. + .SH "LINUX NOTES" Added: tinysofa/snapshot/man-pages/current/sources/man-pages-1.66.tar.bz2 =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/man-pages/current/sources/man-pages-1.66.tar.bz2 ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/man-pages/current/sources/man-pages-extralocale.tar.bz2 =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/man-pages/current/sources/man-pages-extralocale.tar.bz2 ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/man-pages/current/sources/man2.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/man-pages/current/sources/man2.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: tinysofa/snapshot/man-pages/current/sources/manpages_1.66.orig.tar.gz =================================================================== (Binary files differ) Deleted: tinysofa/snapshot/man-pages/current/sources/netman-cvs.tar.gz =================================================================== (Binary files differ) Modified: tinysofa/snapshot/man-pages/current/sources/rpcgen.1 =================================================================== --- tinysofa/snapshot/man-pages/current/sources/rpcgen.1 2004-07-01 15:50:47 UTC (rev 2787) +++ tinysofa/snapshot/man-pages/current/sources/rpcgen.1 2004-07-01 15:50:51 UTC (rev 2788) @@ -431,4 +431,4 @@ $ rpcgen \-n tcp \-o prot_svc.c prot.x .ft 1 .SH "SEE ALSO" -\f4cc\fP(1). +\f4gcc\fP(1). Modified: tinysofa/snapshot/man-pages/current/specs/man-pages.spec =================================================================== --- tinysofa/snapshot/man-pages/current/specs/man-pages.spec 2004-07-01 15:50:47 UTC (rev 2787) +++ tinysofa/snapshot/man-pages/current/specs/man-pages.spec 2004-07-01 15:50:51 UTC (rev 2788) @@ -1,144 +1,410 @@ Summary: Man (manual) pages from the Linux Documentation Project. Name: man-pages Version: 1.66 -Release: 6ts +Release: 2ts License: distributable -Group: tinysofa official -#Source0: ftp://ftp.win.tue.nl/pub/linux-local/manpages/man-pages-%{version}.tar.bz2 -Source0: http://ftp.debian.org/debian/pool/main/m/manpages/manpages_1.66.orig.tar.gz +Group: Documentation +Source0: http://www.kernel.org/pub/linux/docs/manpages/man-pages-%{version}.tar.bz2 Source1: rpcgen.1 -Source2: netman-cvs.tar.gz -BuildRoot: %{_tmppath}/%{name}-root +Source6: man-pages-extralocale.tar.bz2 +Source9: man2.tar.gz +Patch0: man-pages-1.44-ext3.patch +Patch1: man-pages-1.51-iconv.patch +Patch2: man-pages-1.51-nopent.patch +Patch3: man-pages-1.51-blank.patch +Patch5: man-pages-1.53-langinfo.patch +Patch7: man-pages-1.53-mlock.patch +Patch8: man-pages-1.60-re_comp.patch +Patch9: man-pages-1.60-strftime.patch +Patch10: man-pages-1.60-fopen.patch +Patch11: man-pages-1.60-shmget.patch +Patch12: man-pages-1.60-wait.patch +Patch14: man-pages-1.60-fs.patch +Patch15: man-pages-1.60-issue.patch +Buildroot: %{_tmppath}/%{name}-%{version}-root +Autoreq: false BuildArch: noarch -Requires: man %description A large collection of man pages (documentation) from the Linux -Documentation Project (LDP). The man pages are organized into the -following sections: Section 1, user commands (intro only); Section 2, -system calls; Section 3, libc calls; Section 4, devices (e.g., hd, -sd); Section 5, file formats and protocols (e.g., wtmp, /etc/passwd, -nfs); Section 6, games (intro only); Section 7, conventions, macro -packages, etc. (e.g., nroff, ascii); and Section 8, system -administration (intro only). +Documentation Project (LDP). %prep -%setup -q +%setup -q -a 9 -# I left the .b off of this to keep from having old versions in file lists +tar jxf %{SOURCE6} cp -a %{SOURCE1} man1 +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 +%patch5 -p1 +%patch7 -p1 +%patch8 -p1 +%patch9 -p1 +%patch10 -p1 +%patch11 -p1 +%patch12 -p1 +%patch14 -p1 +%patch15 -p1 + %build + rm -fv man1/README + +# These are parts of fileutils rm -fv man1/{chgrp,chmod,chown,cp,dd,df,dircolors,du,install}.1 rm -fv man1/{ln,ls,mkdir,mkfifo,mknod,mv,rm,rmdir,touch}.1 -rm -fv man1/{dir,vdir,diff}.1 -rm -fv man2/modules.2 man2/quotactl.2 man2/get_kernel_syms.2 +rm -fv man1/{dir,vdir}.1 + +# Part of diffutils +rm -fv man1/diff.1 + +# Part of quota +rm -fv man2/quotactl.2 + +# Part of modutils +rm -fv man2/get_kernel_syms.2 rm -fv man2/{create,delete,init,query}_module.2 -rm -fv man2/cap{g,s}et.2 -rm -rf man2/*xattr.2 -rm -fv man3/rand.3 -rm -fv man3/resolver.3 -rm -fv man3/getnetent.3 -rm -fv man3/getaddrinfo.3 -rm -fv man3/err.3 + +# Part of console-tools rm -fv man4/console.4 + +# Part of shadow-utils +rm -fv man3/getspnam.3 + +# part of nfs-utils rm -fv man5/exports.5 rm -fv man5/nfs.5 -rm -fv man5/passwd.5 + +# Part of bind-utils +rm -fv man5/resolver.5 +#rm -fv man5/resolv.conf.5 - kept anyway, as it makes sense to have available + +# Obsolete +rm -f man3/infnan.3 + +# Part of mount rm -fv man5/fstab.5 -rm -fv man5/resolver.5 -rm -fv man5/resolv.conf.5* -rm -fv man8/lilo.8 + +# Only briefly part of a devel version of glibc +rm -f man3/getipnodebyname.3 +rm -f man3/getipnodebyaddr.3 +rm -f man3/freehostent.3 + +# Part of libcap +rm -fv man2/capget.2 +rm -fv man2/capset.2 + +# Part of libattr-devel +rm -f man2/{fgetxattr,flistxattr,fremovexattr,fsetxattr,getxattr,lgetxattr,listxattr,llistxattr,lremovexattr,lsetxattr,removexattr,setxattr}.2* + find . -name "*sudo*" -exec rm {} \; -%install -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT - -mkdir -p $RPM_BUILD_ROOT/usr/share/man -for n in 0p 1 1p 2 3 3p 4 5 6 7 8; do - mkdir $RPM_BUILD_ROOT/usr/share/man/man$n +for l1 in man[1-8]*/* +do mkdir -p $(dirname en/$l1) + LANG=en iconv -f latin1 -t utf-8 -o en/$l1 $l1 + rm -f $l1 + LANG=en iconv -f latin1 -t ascii//translit -o $l1 en/$l1 done -# Do the source 2 manpages first so they will be overwritten with the newer -# if both exist. -mkdir tmp -pushd tmp - tar -zxf %{SOURCE2} - for n in 2 3 4; do - cp *.$n $RPM_BUILD_ROOT/usr/share/man/man$n/ - done -popd +%install +rm -rf $RPM_BUILD_ROOT -# Then do the official -for n in man?/* man?p/*; do - test -e "$n" && cp -a "$n" $RPM_BUILD_ROOT/usr/share/man/$n +for n in 0p 1 1p 2 3 3p 4 5 6 7 8 +do mkdir -p $RPM_BUILD_ROOT%{_mandir}/man$n + mkdir -p $RPM_BUILD_ROOT%{_mandir}/en/man$n done +for n in man*/* +do cp -a $n $RPM_BUILD_ROOT%{_mandir}/$n + if diff -q en/$n $n + then rm -f en/$n + elif [ $? -eq 1 ] + then cp -a en/$n $RPM_BUILD_ROOT%{_mandir}/en/$n + fi +done %clean -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT +rm -rf $RPM_BUILD_ROOT %files -%defattr(0644,root,root) -%doc README man-pages-%{version}.Announce -/usr/share/man/man*/* +%defattr(0644,root,root,0755) +%doc README man-pages-%{version}.Announce POSIX-COPYRIGHT +%{_mandir}/man*/* +%{_mandir}/en/man*/* %changelog -* Wed May 19 2004 tsintegrate 1.66-6ts -- current (1.66-5ts) integrated as 1.66-6ts for release 1.0-U1 +* Fri Feb 13 2004 Elliot Lee +- rebuilt -* Tue Mar 16 2004 Oystein Viggen 1.66-4tr -- Use upstream package without non-free POSIX documents - (provided by Martin Schulze ) +* Wed Feb 11 2004 Adrian Havill 1.66-1 +- update to 1.66 +- add posix section processing for sections 0p, 1p, 3p (#114584) -* Wed Feb 11 2004 Omar Kilani 1.66-1ok -- New upstream. +* Mon Dec 15 2003 Adrian Havill 1.64-2 +- update to 1.64 +- convert iso-8859-1 en locale pages to UTF-8 for fc2 (#108991) -* Mon Jan 26 2004 Erlend Midttun 1.65-2tr -- man2/*xattr.2 now comes from libattr-devel. +* Wed Sep 24 2003 Adrian Havill 1.60-4.1 +- bump n-v-r -* Sun Jan 25 2004 Erlend Midttun 1.65-1tr -- New upstream. Now with POSIX 1003.1-2003 man pages as well. +* Wed Sep 24 2003 Adrian Havill 1.60-4 +- transliterated ALL pages with latin-1 characters that would be + displayed as either a fallback from a ascii-superset locale or + from the POSIX locale into ascii (according to glibc transliteration + data for locale "en"). pages with non-ascii are moved into the "en" + locale. (#103214) -* Wed Dec 10 2003 Erlend Midttun 1.64-1tr -- New upstream. +* Thu Aug 28 2003 Adrian Havill 1.60-2 +- transliterated Lichtmaier's first name for the sake of iconv (#103214) -* Mon Jun 23 2003 Erlend Midttun 1.52-7tr -- Moved %defattr. +* Thu Aug 28 2003 Adrian Havill 1.60-1.1 +- bumped n-v-r -* Wed Jun 18 2003 Erlend Midttun 1.52-6tr -- Big rebuild +* Thu Aug 28 2003 Adrian Havill 1.60-1 +- bumped version, removed no longer needed patches +- added #define for re_comp() and re_exec() (#79703) +- fixed typo in Era format specifier (#80025) +- fixed ftell info for fopen with mode "a+" (#81359) +- fixed prototype for shmget() (#86258) +- fixed spelling in wait.2 (#86450) +- obsoleted _init and _fini in dlopen() (#88408) +- fixed and merged double ext3 descriptions (#103198) +- issue to refer to mingetty (#86248) +- synced man page with actual ld params (#97176) -* Tue May 27 2003 Erlend Midttun 1.52-5em -- PreReq -> Requires. +* Fri Aug 01 2003 Elliot Lee 1.58-2 +- Remove libattr conflicts -* Wed Apr 9 2003 Gerald Dachs 1.52-4gd -- Added PreReq on man +* Wed Jul 30 2003 Adrian Havill 1.58-1 +- Bumped version (which also solves n-v-r conflict with RHEL) -* Mon Mar 24 2003 Erlend Midttun 1.52-3em -- Rebuilt against glibc 2.3.2. +* Fri Jul 11 2003 Ernie Petrides +- Modify mlock.2, mlockall.2, and shmctl.2 for change to locking + permission semantics made in kernel's linux-2.4.21-mlock.patch. -* Wed Jan 22 2003 Tor Hveem 1.52-2th -- Removed passwd.5 manpage (it is in the shadow-utils package) +* Tue Apr 29 2003 Ernie Petrides +- Modify semop.2 for new semtimedop(2) and add semtimedop.2 link. -* Tue Aug 13 2002 Christian H. Toldnes 1.52-1ct -- Removed resolv.conf man page. -- New upstream version: 1.52 -- Removed alle the other languages.... :) +* Wed Jan 22 2003 Tim Powers +- rebuilt -* Wed Jun 6 2001 Oystein Viggen -- New upstream version: 1.37 +* Wed Dec 11 2002 Tim Powers 1.53-2 +- rebuild -* Wed Nov 29 2000 Erlend Midttun -- Removed resolver(5) man pages as it conflicted with bind-utils. - Thanks to Jan?ke Ronnblom . +* Tue Aug 27 2002 Trond Eivind Glomsr?d 1.53-1 +- 1.53 +- Fix #71750, #72754 -* Thu Sep 14 2000 Per Ivar Paulsen -- Picked up 1.31. Removed some patches. Cleaned up. +* Thu Jul 25 2002 Trond Eivind Glomsr?d 1.52-2 +- Fix reference in rpcgen(1) - #69740 -* Mon Feb 21 2000 Erlend Midttun -- Moved man pages to comply with FHS 2.0 +* Wed Jul 24 2002 Trond Eivind Glomsr?d 1.52-1 +- 1.52 +* Thu Jul 18 2002 Trond Eivind Glomsr?d 1.51-5 +- Fix #63547 + +* Tue Jul 9 2002 Trond Eivind Glomsr?d 1.51-4 +- Mentium mem=nopentium in bootparam(7) - #60487 + +* Fri Jun 21 2002 Tim Powers +- automated rebuild + +* Wed Jun 12 2002 Trond Eivind Glomsr?d 1.51-2 +- Fix to iconv(1) - #66441 + +* Tue Jun 11 2002 Trond Eivind Glomsr?d 1.51-1 +- 1.51 + +* Thu Jun 6 2002 Trond Eivind Glomsr?d 1.50-1 +- 1.50 + +* Wed May 29 2002 Trond Eivind Glomsr?d 1.48-4 +- Bump + +* Thu May 23 2002 Trond Eivind Glomsr?d 1.48-3 +- Ret value of iconv(3) was wrong (#65375) + +* Thu Apr 4 2002 Trond Eivind Glomsr?d 1.48-2 +- Remove getipnodebyname, getipnodebyname, freehostent - they were + only briefly part of a glibc devel version (#62646) + +* Wed Mar 13 2002 Trond Eivind Glomsr?d 1.48-1 +- 1.48 + +* Thu Feb 21 2002 Trond Eivind Glomsr?d 1.47-2 +- Rebuild + +* Tue Jan 15 2002 Trond Eivind Glomsr?d 1.47-1 +- 1.47 + +* Wed Jan 09 2002 Tim Powers +- automated rebuild + +* Thu Dec 6 2001 Trond Eivind Glomsr?d 1.44-2 +- Add entry on ext3 in fs.5 (#55945) + +* Tue Dec 4 2001 Trond Eivind Glomsr?d 1.44-1 +- 1.44 +- No patches required anymore - get rid of them. + +* Thu Nov 15 2001 Trond Eivind Glomsr?d 1.43-2 +- Fix docs for setresuid/setresgid (#56038) + +* Thu Nov 8 2001 Trond Eivind Glomsr?d 1.43-1 +- 1.43 + +* Tue Oct 23 2001 Trond Eivind Glomsr?d 1.42-1 +- 1.42 + +* Mon Oct 15 2001 Trond Eivind Glomsr?d 1.41-1 +- 1.41 +- Remove bug section in llseek.2, which claimed ext2 don't support + files bigger than 2 GB (#54569) + +* Tue Sep 25 2001 Trond Eivind Glomsr?d 1.40-1 +- 1.40. Remove now included patches. + +* Tue Sep 4 2001 Trond Eivind Glomsr?d 1.39-2 +- New strptime.3, from the ftp site. Matches glibc better. +- Fix missing .br in netdevices.7 (#53091) + +* Tue Aug 7 2001 Trond Eivind Glomsr?d +- 1.39 +- Drop obsolete patches + +* Tue Jul 24 2001 Trond Eivind Glomsr?d +- s/NSF/NFS/ in initrd.4 - (#48322) + +* Mon Jul 2 2001 Trond Eivind Glomsr?d +- regcomp and friends support collating elements now (#46939) + +* Thu Jun 21 2001 Trond Eivind Glomsr?d +- 1.38 + +* Fri Jun 8 2001 Trond Eivind Glomsr?d +- 1.37 + +* Thu Jun 7 2001 Trond Eivind Glomsr?d +- Remove capset(2) - part of libcap (#43828) + +* Fri Jun 1 2001 Trond Eivind Glomsr?d +- Remove diff.1 - let diffutils include it instead +- Remove capget.2 - it's included in libcap +- Keep resolv.conf.5 - it's useful on systems without bind packages +- Fix bootparam.7 (patch from Tim Waugh (twaugh at redhat.com) + +* Tue May 22 2001 Trond Eivind Glomsr?d +- 1.36 +- drop some old patches, redo others + +* Thu May 17 2001 Trond Eivind Glomsr?d +- Work around bug in groff for latin1.7 (#41118) + +* Wed Apr 4 2001 Trond Eivind Glomsr?d +- use MS_SYNCHRONOUS instead of MS_SYNC in mount(2) (#34665) + +* Tue Apr 3 2001 Trond Eivind Glomsr?d +- roff fixes to multiple man pages + +* Mon Apr 2 2001 Trond Eivind Glomsr?d +- correct the URL for unicode in the charset manpage (#34291) +- roff fixes +- redo iconv patch, so we don't get a .orig from patch because of + a two line offset + +* Fri Mar 30 2001 Trond Eivind Glomsr?d +- remove resolv.conf (bind-utils) and infnan (obsolete - #34171) + +* Wed Mar 28 2001 Trond Eivind Glomsr?d +- resurrect getnetent(3) + +* Sun Mar 25 2001 Trond Eivind Glomsr?d +- 1.35, obsoletes patch for strsep +- move rpcinfo to section 8 (#33114) + +* Fri Mar 9 2001 Trond Eivind Glomsr?d +- Include man-pages on locales (#29713) + +* Tue Feb 13 2001 Trond Eivind Glomsr?d +- fix return value of strsep(3) call (#24789) + +* Mon Jan 15 2001 Trond Eivind Glomsr?d +- 1.34 + +* Fri Dec 15 2000 Trond Eivind Glomsr?d +- 1.33 +- obsolete some old, now included patches +- remove netman-cvs, it's now older than the mainstream + +* Tue Nov 21 2000 Trond Eivind Glomsr?d +- Identify two of the macros in stat(2) as GNU, not POSIX. (#21169) + +* Wed Nov 08 2000 Trond Eivind Glomsr?d +- don't delete the man pages for dlopen() and friends, + they are no longer part of another package +- include man pages for ld* + +* Thu Oct 24 2000 Trond Eivind Glomsr?d +- remove const from iconv function prototype (#19486) + +* Tue Aug 29 2000 Trond Eivind Glomsr?d +- reference wctype(3) instead of non-existing ctype(3) + from regex(7) (#17037) +- 1.31 + +* Sun Aug 27 2000 Trond Eivind Glomsr?d +- remove lilo man pages (now included in package) + (#16984) + +* Fri Aug 04 2000 Trond Eivind Glomsr?d +- fixed bad header specification (#15364) +- removed obsolete patches from package +- updated the rest + +* Wed Jul 12 2000 Prospector +- automatic rebuild + +* Mon Jun 19 2000 Matt Wilson +- defattr before docs in filelist + +* Sun Jun 17 2000 Trond Eivind Glomsr?d +- updated to 1.30 + +* Tue Jun 06 2000 Trond Eivind Glomsr?d +- use %%{_tmppath} + +* Wed May 31 2000 Trond Eivind Glomsr?d +- remove resolv.conf(5) - part of bind-utils + +* Tue May 30 2000 Trond Eivind Glomsr?d +- Remove resolver, dlclose, dlerror, dlopen, dlsym as these + are included in other packages. + +* Tue May 30 2000 Trond Eivind Glomsr?d +- use %%{_mandir) instead of /usr/man +- verify and fix bug in mmap man page (#7382) +- verify and fix missing data in recvfrom man page (#1736) +- verify and fix missing data in putw man page (#10104) +- fixed sendfile(2) man page (#5599) +- fixed tzset man page (#11623) + +* Mon May 15 2000 Trond Eivind Glomsr?d +- updated to 1.29 +- split off other languages into separate RPMS + +* Thu Mar 16 2000 Florian La Roche +- do not use group "man" + +* Fri Mar 03 2000 Cristian Gafton +- don't apply the netman-cvs man pages anymore, as they seem to be really + out of date + +* Sat Feb 05 2000 Cristian Gafton +- put back man3/resolver.3 + * Fri Feb 04 2000 Cristian Gafton - remove non-man pages (#7814) @@ -152,7 +418,7 @@ - Fixed SIGILL, SIGQUIT in signals.7 * Wed Oct 06 1999 Cristian Gafton -- fox man page for getcwd +- fix man page for getcwd * Wed Sep 22 1999 Cristian Gafton - added man pages for set/getcontext @@ -221,4 +487,4 @@ - moved build root to /var * Thu Jul 31 1997 Erik Troan -- made a noarch package \ No newline at end of file +- made a noarch package From svn at tinysofa.org Thu Jul 1 15:50:54 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:50:54 +1000 (EST) Subject: [tinysofa-svn] r2789 - in tinysofa/snapshot/mdadm/current: sources specs Message-ID: <20040701155054.BE84B4E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:50:54 +1000 (Fri, 02 Jul 2004) New Revision: 2789 Added: tinysofa/snapshot/mdadm/current/sources/mdadm-1.5.0-file-leak.patch tinysofa/snapshot/mdadm/current/sources/mdmpd-0.3.tgz tinysofa/snapshot/mdadm/current/sources/mdmpd.init Modified: tinysofa/snapshot/mdadm/current/sources/mdmonitor.init tinysofa/snapshot/mdadm/current/specs/mdadm.spec Log: - Sync with 2.0. - Kept: - mdadm-1.5.0-email.patch: - mdadm-1.5.0.tgz: - mdmonitor.init: - Added: - mdadm-1.5.0-file-leak.patch: - mdmpd-0.3.tgz: - mdmpd.init: Added: tinysofa/snapshot/mdadm/current/sources/mdadm-1.5.0-file-leak.patch =================================================================== --- tinysofa/snapshot/mdadm/current/sources/mdadm-1.5.0-file-leak.patch 2004-07-01 15:50:51 UTC (rev 2788) +++ tinysofa/snapshot/mdadm/current/sources/mdadm-1.5.0-file-leak.patch 2004-07-01 15:50:54 UTC (rev 2789) @@ -0,0 +1,10 @@ +--- mdadm-1.5.0/Monitor.c.file-leak 2004-05-22 16:52:46.000000000 -0400 ++++ mdadm-1.5.0/Monitor.c 2004-05-22 16:52:49.000000000 -0400 +@@ -349,6 +349,7 @@ int Monitor(mddev_dev_t devlist, + free(st); + continue; + } ++ close(fd); + st->utime = 0; + st->next = statelist; + st->err = 1; Modified: tinysofa/snapshot/mdadm/current/sources/mdmonitor.init =================================================================== --- tinysofa/snapshot/mdadm/current/sources/mdmonitor.init 2004-07-01 15:50:51 UTC (rev 2788) +++ tinysofa/snapshot/mdadm/current/sources/mdmonitor.init 2004-07-01 15:50:54 UTC (rev 2789) @@ -3,13 +3,12 @@ # mdmonitor This starts, stops, and reloads the mdadm-based # software RAID monitoring and management facility # -# chkconfig: 2345 99 99 +# chkconfig: 2345 15 85 # description: software RAID monitoring and management # config: /etc/mdadm.conf # -# + # Copyright 2002 Red Hat, Inc. -# Modified for tinysofa enterprise server PATH=/sbin:/usr/sbin:$PATH RETVAL=0 @@ -17,7 +16,7 @@ prog=mdmonitor # Source function library. -. /etc/init.d/functions +. /etc/rc.d/init.d/functions # Make sure configuration file exists and has information we can use # MAILADDR or PROGRAM or both must be set in order to run mdadm --monitor @@ -27,7 +26,7 @@ usage () { - echo "Usage: service $prog {start|stop|status|restart|try-restart}" + echo "Usage: service $prog {start|stop|status|restart|condrestart}" RETVAL=1 } @@ -36,29 +35,30 @@ { ulimit -S -c 0 >/dev/null 2>&1 echo -n $"Starting $prog: " - mdadm --monitor --scan & - echo $! > /var/run/mdadm.pid + daemon --check mdadm \ + "/bin/bash -c \"mdadm --monitor --scan -f > /var/run/mdadm.pid\"" # hack: wait for mdadm to die, assume success if it doesn't die quickly usleep 100000 - if [ -d /proc/$(cat /var/run/mdadm.pid) ] ; then + if [ -s /var/run/mdadm.pid -a -d /proc/$(cat /var/run/mdadm.pid) ] ; then success $"mdadm" - echo RETVAL=0 + touch /var/lock/subsys/$prog else failure $"mdadm" - echo + rm -f /var/run/mdadm.pid + rm -f /var/lock/subsys/$prog RETVAL=1 fi - touch ${INITLOCK:-/mnt/lockdev}/${prog} + echo } stop () { - echo -n $"Stopping $prog: " + echo -n "Killing $prog: " killproc mdadm echo rm -f /var/run/mdadm.pid - rm -f ${INITLOCK:-/mnt/lockdev}/${prog} + rm -f /var/lock/subsys/$prog } restart () @@ -69,7 +69,7 @@ condrestart () { - [ -e ${INITLOCK:-/mnt/lockdev}/${prog} ] && restart + [ -e /var/lock/subsys/$prog ] && restart } @@ -78,7 +78,7 @@ stop) stop ;; status) status mdadm ;; restart|reload) restart ;; - condrestart|try-restart) condrestart ;; + condrestart) condrestart ;; *) usage ;; esac Added: tinysofa/snapshot/mdadm/current/sources/mdmpd-0.3.tgz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/mdadm/current/sources/mdmpd-0.3.tgz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/mdadm/current/sources/mdmpd.init =================================================================== --- tinysofa/snapshot/mdadm/current/sources/mdmpd.init 2004-07-01 15:50:51 UTC (rev 2788) +++ tinysofa/snapshot/mdadm/current/sources/mdmpd.init 2004-07-01 15:50:54 UTC (rev 2789) @@ -0,0 +1,85 @@ +#!/bin/bash +# +# mdmdp This starts, stops, and reloads the mdmpd-based +# multipath device monitoring and management facility +# +# chkconfig: - 15 85 +# description: multipath device monitoring and management +# + +# Copyright 2002 Red Hat, Inc. + +PATH=/sbin:/usr/sbin:$PATH +RETVAL=0 + +prog=mdmpd + +# Source function library. +. /etc/rc.d/init.d/functions + +# Make sure configuration file exists and has information we can use +# MAILADDR or PROGRAM or both must be set in order to run mdadm --monitor +#[ -f /etc/mdadm.conf ] || exit 0 +#grep '^\(MAILADDR\|PROGRAM\) .' /etc/mdadm.conf >/dev/null 2>&1 || exit 0 + + +usage () +{ + echo "Usage: service $prog {start|stop|status|restart|condrestart}" + RETVAL=1 +} + + +start () +{ + ulimit -S -c 0 >/dev/null 2>&1 + # clean up in case we went down unexpectedly + rm -f /var/run/$prog/* + echo -n $"Starting $prog: " + daemon mdmpd + # hack: wait for mdadm to die, assume success if it doesn't die quickly + usleep 100000 + pid=`pidof -o $$ -o $PPID -o %PPID -x $prog` + if [ -n "$pid" ] ; then + success $"mdmpd" + touch /var/lock/subsys/$prog + echo "$pid" > /var/run/$prog.pid + RETVAL=0 + else + failure $"mdmpd" + RETVAL=1 + fi + echo +} + +stop () +{ + echo -n $"Stopping $prog: " + killproc $prog + echo + rm -f /var/run/$prog.pid + rm -f /var/lock/subsys/$prog +} + +restart () +{ + stop + start +} + +condrestart () +{ + [ -e /var/lock/subsys/$prog ] && restart +} + + +case "$1" in + start) start ;; + stop) stop ;; + status) status $prog ;; + restart|reload) restart ;; + condrestart) condrestart ;; + *) usage ;; +esac + +exit $RETVAL Property changes on: tinysofa/snapshot/mdadm/current/sources/mdmpd.init ___________________________________________________________________ Name: svn:executable + * Modified: tinysofa/snapshot/mdadm/current/specs/mdadm.spec =================================================================== --- tinysofa/snapshot/mdadm/current/specs/mdadm.spec 2004-07-01 15:50:51 UTC (rev 2788) +++ tinysofa/snapshot/mdadm/current/specs/mdadm.spec 2004-07-01 15:50:54 UTC (rev 2789) @@ -1,130 +1,154 @@ -Summary: mdadm is used for controlling Linux md devices (aka RAID arrays) -Name: mdadm -Version: 1.5.0 -Release: 6jh -Source: http://www.cse.unsw.edu.au/~neilb/source/mdadm/mdadm-%{version}.tgz -Source1: mdmonitor.init -Patch0: mdadm-1.5.0-email.patch -URL: http://www.cse.unsw.edu.au/~neilb/source/mdadm/ -License: GPL -Group: tinysofa/main -BuildRoot: %{_tmppath}/%{name}-%{version}-root -Obsoletes: mdctl -BuildRequires: groff -Requires: smtpdaemon -%service_requires +Summary: mdadm controls Linux md devices (software RAID arrays) +Name: mdadm +Version: 1.5.0 +Release: 9ts +Source: http://www.cse.unsw.edu.au/~neilb/source/mdadm/mdadm-%{version}.tgz +Source1: mdmonitor.init +Source2: mdmpd-0.3.tgz +Source3: mdmpd.init +Patch: mdadm-1.5.0-email.patch +Patch1: mdadm-1.5.0-file-leak.patch +URL: http://www.cse.unsw.edu.au/~neilb/source/mdadm/ +License: GPL +Group: System Environment/Base +BuildRoot: %{_tmppath}/%{name}-%{version}-root +Obsoletes: mdctl +Requires: smtpdaemon %description -mdadm is a program that can be used to create, manage, and monitor -Linux MD (Software RAID) devices. -As such is provides similar functionality to the raidtools packages. -The particular differences to raidtools is that mdadm is a single -program, and it can perform (almost) all functions without a -configuration file (that a config file can be used to help with -some common tasks). +mdadm is used to create, manage, and monitor Linux MD (software RAID) +devices. As such, it provides similar functionality to the raidtools +package. However, mdadm is a single program, and it can perform +almost all functions without a configuration file, though a configuration +file can be used to help with some common tasks. - %prep -%setup -q -%patch0 -p1 -b .email -# we want to install in /sbin, not /usr/sbin... -%define _exec_prefix %{nil} +%setup -q -a 2 +%patch -p1 -b .email +%patch1 -p1 -b .file-leak - %build -make CXFLAGS="$RPM_OPT_FLAGS" SYSCONFDIR="%{_sysconfdir}" +make CXFLAGS="$RPM_OPT_FLAGS" SYSCONFDIR="%{_sysconfdir}" mdadm +make CXFLAGS="$RPM_OPT_FLAGS" SYSCONFDIR="%{_sysconfdir}" -C mdmpd mdmpd - %install -%makeinstall_std MANDIR=%{_mandir} BINDIR=%{_sbindir} +make DESTDIR=$RPM_BUILD_ROOT MANDIR=%{_mandir} BINDIR=/sbin install +make DESTDIR=$RPM_BUILD_ROOT MANDIR=%{_mandir} BINDIR=/sbin -C mdmpd install +install -D -m644 mdadm.conf-example $RPM_BUILD_ROOT/%{_sysconfdir}/mdadm.conf +install -D -m755 %{SOURCE1} $RPM_BUILD_ROOT/%{_initrddir}/mdmonitor +install -D -m755 %{SOURCE3} $RPM_BUILD_ROOT/%{_initrddir}/mdmpd -install -D -m 600 mdadm.conf-example $RPM_BUILD_ROOT/%{_sysconfdir}/mdadm.conf -install -D -m 755 %{SOURCE1} $RPM_BUILD_ROOT/%{_initrddir}/mdmonitor +mkdir -p -m 700 $RPM_BUILD_ROOT/var/run/mdmpd - %clean -%clean_buildroot +[ $RPM_BUILD_ROOT != / ] && rm -rf $RPM_BUILD_ROOT +%post +/sbin/chkconfig --add mdmonitor +/sbin/chkconfig --add mdmpd +%preun +if [ "$1" = 0 ]; then + service mdmonitor stop > /dev/null 2>&1 ||: + /sbin/chkconfig --del mdmonitor + if [ -e %{_initrddir}/mdmpd ]; then + service mdmpd stop > /dev/null 2>&1 ||: + /sbin/chkconfig --del mdmpd + fi +fi + +%postun +if [ "$1" -ge "1" ]; then + service mdmonitor condrestart > /dev/null 2>&1 + if [ -e %{_initrddir}/mdmpd ]; then + service mdmpd condrestart > /dev/null 2>&1 + fi +fi + %files %defattr(-,root,root) %doc TODO ChangeLog mdadm.conf-example COPYING -%{_sbindir}/mdadm -%{_initrddir}/mdmonitor -%config(noreplace,missingok) %attr(600,root,root) %{_sysconfdir}/mdadm.conf +/sbin/* +%{_initrddir}/* +%config(noreplace,missingok)/%{_sysconfdir}/mdadm.conf %{_mandir}/man*/md* +%attr(0700,root,root) %dir /var/run/mdmpd +%changelog +* Sat May 22 2004 Doug Ledford - 1.5.0-9 +- Fix Makefile and build method to satisfy bz #123769 +- Add mdmpd man page, update mdmpd version to 0.3 - bz #117160 +- Make sure mdadm --monitor closes all md device files so that md devices + can be stopped while mdadm is still running - bz #119532 -%post -%service_post mdmonitor +* Thu May 20 2004 Jeremy Katz - 1.5.0-8 +- remove unneeded patch, can use --run instead -%preun -%service_preun mdmonitor +* Wed May 19 2004 Jeremy Katz - 1.5.0-7 +- add patch with reallyforce mode on creation to be used by anaconda -%postun -%service_postun mdmonitor +* Wed May 12 2004 Doug Ledford 2.5.0-6 +- Fix a bug in the %postun scriptlet related to downgrading to a version + of mdadm that doesn't include the mdmpd daemon. +* Fri May 07 2004 Doug Ledford 1.5.0-5 +- Disable service mdmpd by default to avoid [Failed] messages on + current 2.6 kernels. Possibly re-enable it by default once the + 2.6 kernels have the md event interface. -%changelog -* Wed May 19 2004 tsintegrate 1.5.0-5ts -- current (1.5.0-5jh) integrated as 1.5.0-5ts for release 1.0-U1 +* Thu Apr 22 2004 Doug Ledford 1.5.0-4 +- Update mdmonitor script to start daemon more cleanly +- Repackage mdmpd tarball to include gcc-3.4 changes and to make + mdmpd properly daemonize at startup instead of forking and leaving + the child attached to the terminal. -* Tue May 18 2004 Jaakko Heinonen 1.5.0-5jh -- add mdmonitor service -- install mdadm.conf again -- require smtpdaemon -- fix sendmail location +* Thu Mar 4 2004 Bill Nottingham 1.5.0-3 +- ship /var/run/mpmpd (#117497) -* Tue May 11 2004 Omar Kilani 1.5.0-4ts -- Add BuildRequires groff. +* Thu Feb 26 2004 Doug Ledford 1.5.0-2 +- Add a default MAILADDR line to the mdadm.conf file installed by default + (Bugzilla #92447) +- Make it build with gcc-3.4 -* Wed Feb 11 2004 Omar Kilani 1.5.0-1ok -- New upstream. +* Mon Feb 23 2004 Doug Ledford 1.5.0-1 +- Update to 1.5.0 (from Matthew J. Galgoci ) -* Tue Dec 9 2003 Erlend Midttun 1.4.0-1tr -- New upstream. +* Sun Nov 16 2003 Doug Ledford 1.4.0-1 +- fix problem with recovery thread sleeping in mdmpd -* Tue Aug 19 2003 Chr. Toldnes 1.3.0-2tr -- Rebuilt and retagged +* Fri Nov 14 2003 Doug Ledford +- sync upstream +- add mdmpd package into mdadm package -* Mon Aug 18 2003 Omar Kilani 1.3.0-1ok -- new upstream: 1.3.0, allows creation of very large md devices. +* Wed Sep 10 2003 Michael K. Johnson 1.3.0-1 +- sync upstream -* Wed Jun 18 2003 Erlend Midttun 1.2.0-5tr -- Big rebuild +* Tue Mar 11 2003 Michael K. Johnson 1.1.0-1 +- sync upstream -* Wed May 28 2003 Tore Olsen mdadm1.2.0-4to -- Removed init script, it's done in rc.sysinit now. +* Tue Jan 28 2003 Michael K. Johnson 1.0.1-1 +- update for rebuild -* Wed May 28 2003 Roland Kruse mdadm-1.2.0-3rk -- Don't provide /etc/sysconfig/md; set up by anaconda +* Wed Dec 25 2002 Tim Powers 1.0.0-8 +- fix references to %%install in the changelog so that it will build -* Thu May 22 2003 Goetz Bock mdadm-1.2.0-2bg -- moved init scripts to this package -- updated Group +* Fri Dec 13 2002 Elliot Lee 1.0.0-7 +- Rebuild -* Mon May 19 2003 Goetz Bock mdadm-1.2.0-1bg -- new upstream: 1.2.0 -- no longer copy the config example as actual config +* Fri Jul 12 2002 Michael K. Johnson +- Changed RPM Group to System Environment/Base -* Mon Mar 24 2003 Erlend Midttun 1.0.1-3em -- Rebuilt against glibc 2.3.2. +* Wed May 15 2002 Michael K. Johnson +- minor cleanups to the text, conditionalize rm -rf +- added mdmonitor init script -* Sat Feb 01 2003 Tor Hveem 1.0.1-2h -- Fixed package Group +* Fri May 10 2002 +- update to 1.0.0 +- Set CXFLAGS instead of CFLAGS -* Thu Jun 06 2002 Goetz Bock 1.0.1-1bg -- new upstream version: 1.0.1 -- cleaned up %install, as makefile now has install target +* Sat Apr 6 2002 +- change %%install to use "make install" -* Thu Mar 21 2002 Goetz Bock 0.7.2-2bn -- moved mdadm to /sbin, it is required to boot - -* Thu Mar 21 2002 Goetz Bock 0.7.2-1bn -- updated to 0.7.2 -- sanitycheck for %clean and %install -- fixed type in $RPM_BUILD_ROOT, and some other mixups of % and $ - * Fri Mar 15 2002 - beautification - made mdadm.conf non-replaceable config From svn at tinysofa.org Thu Jul 1 15:50:57 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:50:57 +1000 (EST) Subject: [tinysofa-svn] r2790 - in tinysofa/snapshot/mkbootdisk/current: sources specs Message-ID: <20040701155057.731FE4E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:50:57 +1000 (Fri, 02 Jul 2004) New Revision: 2790 Added: tinysofa/snapshot/mkbootdisk/current/sources/mkbootdisk-1.5.1.tar.gz Removed: tinysofa/snapshot/mkbootdisk/current/sources/mkbootdisk-1.2.8-boot.patch tinysofa/snapshot/mkbootdisk/current/sources/mkbootdisk-1.2.8-tinysofa.patch tinysofa/snapshot/mkbootdisk/current/sources/mkbootdisk-1.2.8.tar.gz Modified: tinysofa/snapshot/mkbootdisk/current/specs/mkbootdisk.spec Log: - Sync with 2.0. - Added: - mkbootdisk-1.5.1.tar.gz: - Removed: - mkbootdisk-1.2.8-boot.patch: - mkbootdisk-1.2.8-tinysofa.patch: - mkbootdisk-1.2.8.tar.gz: Deleted: tinysofa/snapshot/mkbootdisk/current/sources/mkbootdisk-1.2.8-boot.patch =================================================================== --- tinysofa/snapshot/mkbootdisk/current/sources/mkbootdisk-1.2.8-boot.patch 2004-07-01 15:50:54 UTC (rev 2789) +++ tinysofa/snapshot/mkbootdisk/current/sources/mkbootdisk-1.2.8-boot.patch 2004-07-01 15:50:57 UTC (rev 2790) @@ -1,17 +0,0 @@ -diff -Nru mkbootdisk-1.2.8.orig/mkbootdisk mkbootdisk-1.2.8/mkbootdisk ---- mkbootdisk-1.2.8.orig/mkbootdisk 2003-05-28 10:10:54.000000000 +0200 -+++ mkbootdisk-1.2.8/mkbootdisk 2003-05-28 10:11:59.000000000 +0200 -@@ -171,9 +171,10 @@ - mkdir $MOUNTDIR/etc - mkdir $MOUNTDIR/dev - mkdir $MOUNTDIR/boot --cp -Pa $device $MOUNTDIR --cp -Pa $rootdev $MOUNTDIR --cp -a /boot/boot.b $MOUNTDIR/boot/boot.b -+cp -Pa $device $MOUNTDIR/dev -+cp -Pa $rootdev $MOUNTDIR/dev -+# This will fail unless lilo is configured as boot loader -+cp -a /boot/boot*.b $MOUNTDIR/boot/ > /dev/null 2>&1 || : - - cat > $MOUNTDIR/etc/lilo.conf <> $MOUNTDIR/boot/message < (or wait 10 seconds) to boot your Red Hat Linux system from --$rootdev. You may override the default linux kernel parameters by typing -+Press (or wait 10 seconds) to boot your tinysofa system -+from $rootdev. You may override the default linux kernel parameters by typing - "linux ", followed by if you like. - - EOF Deleted: tinysofa/snapshot/mkbootdisk/current/sources/mkbootdisk-1.2.8.tar.gz =================================================================== (Binary files differ) Added: tinysofa/snapshot/mkbootdisk/current/sources/mkbootdisk-1.5.1.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/mkbootdisk/current/sources/mkbootdisk-1.5.1.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: tinysofa/snapshot/mkbootdisk/current/specs/mkbootdisk.spec =================================================================== --- tinysofa/snapshot/mkbootdisk/current/specs/mkbootdisk.spec 2004-07-01 15:50:54 UTC (rev 2789) +++ tinysofa/snapshot/mkbootdisk/current/specs/mkbootdisk.spec 2004-07-01 15:50:57 UTC (rev 2790) @@ -1,19 +1,22 @@ -Summary: Creates an initial ramdisk image for preloading modules. +Summary: Creates a boot floppy disk for booting a system. Name: mkbootdisk -Version: 1.2.8 -Release: 14ts +Version: 1.5.1 +Release: 1.1ts License: GPL -Group: tinysofa official +Group: System Environment/Base Source: mkbootdisk-%{version}.tar.gz -Patch: mkbootdisk-1.2.8-tinysofa.patch -Patch1: mkbootdisk-1.2.8-boot.patch -ExclusiveArch: i386 i586 i686 sparc +ExclusiveArch: i386 sparc ExclusiveOs: Linux -Requires: mkinitrd +Requires: mkinitrd dosfstools +%ifnarch sparc +Requires: syslinux +%endif +Conflicts: modutils < 2.3.11-5 %ifarch sparc Requires: silo genromfs %endif -BuildRoot: %{_tmppath}/%{name}-root +Conflicts: mkinitrd <= 3.4.2 +BuildRoot: %{_tmppath}/%{name}-%{version}-root %description The mkbootdisk program creates a standalone boot floppy disk for @@ -24,61 +27,93 @@ %prep %setup -q -%patch -p1 -%patch1 -p1 %install -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != "/" ] && rm -rf "$RPM_BUILD_ROOT" -make BUILDROOT=$RPM_BUILD_ROOT install +rm -rf $RPM_BUILD_ROOT +make BUILDROOT=$RPM_BUILD_ROOT mandir=%{_mandir} install %clean -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT +rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) %attr(755,root,root) /sbin/mkbootdisk -%attr(644,root,root) /usr/share/man/man8/mkbootdisk.8* +%attr(644,root,root) %{_mandir}/man8/mkbootdisk.8.gz %changelog -* Wed May 19 2004 tsintegrate 1.2.8-14ts -- current (1.2.8-13ts) integrated as 1.2.8-14ts for release 1.0-U1 +* Fri Feb 13 2004 Elliot Lee +- rebuilt -* Mon Dec 15 2003 Erlend Midttun 1.2.8-10tr -- Rebuilt. +* Wed Feb 19 2003 Jeremy Katz 1.5.1-1 +- apply mikem's patch so that we handle loop devices better (#84351) +- switch to making a loopback img and then dd'ing that to the floppy (#84351) +- man page updates (#77262) -* Fri Oct 31 2003 Chr. Toldnes 1.2.8-9tr -- backport +* Wed Feb 19 2003 Jeremy Katz 1.5.0-1 +- use copy instead of mkinitrd to get the initrd +- don't get default kernel args if grubby can't figure out the default kernel +- exit with an exit status of 1 if things fail -* Sun Sep 28 2003 Chr. Toldnes 1.2.8-8tsl -- port to tawie +* Mon Dec 23 2002 Matt Wilson +- rebuild in new collection -* Wed Jun 18 2003 Erlend Midttun 1.2.8-7tr -- Big rebuild +* Mon Aug 08 2002 Michael Fulbright +- fix creation of boot iso image -* Wed May 28 2003 Tore Olsen 1.2.8-6to -- Fixed patch so /boot/boot*.b actually is copied. +* Mon Aug 08 2002 Michael Fulbright +- fix small bug with temp files -* Wed May 28 2003 Erlend Midttun 1.2.8-5em -- Correct the path where the devices are written. +* Mon Aug 08 2002 Michael Fulbright +- add option when we make dos fs to save more space -* Mon Mar 24 2003 Erlend Midttun 1.2.8-4em -- Rebuilt against glibc 2.3.2. +* Mon Jun 03 2002 Erik Troan +- only run grubby if /boot/grub/grub.conf exists -* Tue Jul 23 2002 Daniel Meyer 1.2.8-3dm -- rebuild for Trustix Secure Linux 2.0 +* Mon Jun 03 2002 Erik Troan +- if --kernelargs isn't specified and grubby is available use it to get + the arguments to use; this only works with mkinitrd (grubby) >= 3.4.3 + (8591) +- fixed some typos in man page (11297) +- use cp -p rather then cp -a (as we want to follow symlinks) (13480) +- create image files if appropriate (53818) +- compact option removed (syslinux doesn't use it anyway) (58989) -* Tue Jul 17 2001 Erlend Midttun -- Inc serial number before release. +* Tue Mar 26 2002 Jeremy Katz +- add --kernelargs command line option -* Mon Mar 12 2001 Alexander Reelsen -- Picked up 1.2.8 +* Sun Jan 06 2002 Florian La Roche +- do not require syslinux for sparc -* Wed Mar 29 2000 Lars Gaarden -- Moved man page to /usr/share, FHS. +* Mon Nov 05 2001 Erik Troan +- fixed minor typo in man page -* Wed Feb 9 2000 Tore Olsen -- replaced Red Hat with Trustix in boot message +* Wed Aug 15 2001 Matt Wilson +- changed Summary:, it's no longer a bad copy and paste job from the + mkinitrd spec file (MF #50193) +* Sun Jun 24 2001 Elliot Lee +- Bump release + rebuild. + +* Tue Feb 08 2001 Michael Fulbright +- return error code when we cant format the floppy. Helps anaconda out. + +* Tue Jan 23 2001 Erik Troan +- switched to use syslinux rather then lilo +- requires dosfstools +- put version in only one place, mkbootdisk + +* Thu Jul 06 2000 Erik Troan +- wasn't including ethernet devices properly + +* Thu Jun 1 2000 Bill Nottingham +- conf.modules -> modules.conf, fhs stuff + +* Mon May 01 2000 Erik Troan +- patched to work with disk labels + +* Thu Feb 3 2000 Matt Wilson +- gzip manpage + * Mon Jan 10 2000 Erik Troan - removed rescue stuff @@ -123,4 +158,4 @@ * Sat Aug 29 1998 Erik Troan - wasn't including nfs, isofs, or fat modules properly -- mkinitrd args weren't passed right due to a typo \ No newline at end of file +- mkinitrd args weren't passed right due to a typo From svn at tinysofa.org Thu Jul 1 15:51:04 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:51:04 +1000 (EST) Subject: [tinysofa-svn] r2791 - in tinysofa/snapshot/mkinitrd/current: sources specs Message-ID: <20040701155104.CC7DA4E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:51:03 +1000 (Fri, 02 Jul 2004) New Revision: 2791 Added: tinysofa/snapshot/mkinitrd/current/sources/mkinitrd-3.5.2-tinysofa.patch tinysofa/snapshot/mkinitrd/current/sources/mkinitrd-3.5.24.tar.bz2 Removed: tinysofa/snapshot/mkinitrd/current/sources/mkinitrd-3.4.43-ttyS.patch tinysofa/snapshot/mkinitrd/current/sources/mkinitrd-3.5.21-insmod.patch tinysofa/snapshot/mkinitrd/current/sources/mkinitrd-3.5.21-tinysofa-backwards-compat.patch tinysofa/snapshot/mkinitrd/current/sources/mkinitrd-3.5.21-tinysofa-titles.patch tinysofa/snapshot/mkinitrd/current/sources/mkinitrd-3.5.21.tar.bz2 Modified: tinysofa/snapshot/mkinitrd/current/specs/mkinitrd.spec Log: - Sync with 2.0. - Added: - mkinitrd-3.5.2-tinysofa.patch: - mkinitrd-3.5.24.tar.bz2: - Removed: - mkinitrd-3.4.43-ttyS.patch: - mkinitrd-3.5.21-insmod.patch: - mkinitrd-3.5.21-tinysofa-backwards-compat.patch: - mkinitrd-3.5.21-tinysofa-titles.patch: - mkinitrd-3.5.21.tar.bz2: Deleted: tinysofa/snapshot/mkinitrd/current/sources/mkinitrd-3.4.43-ttyS.patch =================================================================== --- tinysofa/snapshot/mkinitrd/current/sources/mkinitrd-3.4.43-ttyS.patch 2004-07-01 15:50:57 UTC (rev 2790) +++ tinysofa/snapshot/mkinitrd/current/sources/mkinitrd-3.4.43-ttyS.patch 2004-07-01 15:51:03 UTC (rev 2791) @@ -1,14 +0,0 @@ -diff -Nru mkinitrd-3.4.43.orig/mkinitrd mkinitrd-3.4.43/mkinitrd ---- mkinitrd-3.4.43.orig/mkinitrd 2003-07-10 13:45:48.000000000 +0200 -+++ mkinitrd-3.4.43/mkinitrd 2003-07-10 13:48:20.000000000 +0200 -@@ -530,6 +530,10 @@ - for i in 1 2 3 4; do - mknod $MNTIMAGE/dev/tty$i c 4 $i - done -+mknod $MNTIMAGE/dev/ttyS0 c 4 64 -+mknod $MNTIMAGE/dev/ttyS1 c 4 65 -+mknod $MNTIMAGE/dev/ttyS2 c 4 66 -+mknod $MNTIMAGE/dev/ttyS3 c 4 67 - - # FIXME -- this won't work if you're using devfs - if [ -n "$root_lvm" ]; then Added: tinysofa/snapshot/mkinitrd/current/sources/mkinitrd-3.5.2-tinysofa.patch =================================================================== --- tinysofa/snapshot/mkinitrd/current/sources/mkinitrd-3.5.2-tinysofa.patch 2004-07-01 15:50:57 UTC (rev 2790) +++ tinysofa/snapshot/mkinitrd/current/sources/mkinitrd-3.5.2-tinysofa.patch 2004-07-01 15:51:03 UTC (rev 2791) @@ -0,0 +1,17 @@ +diff -urN mkinitrd-3.5.24/grubby/new-kernel-pkg mkinitrd-3.5.24.tinysofa/grubby/new-kernel-pkg +--- mkinitrd-3.5.24/grubby/new-kernel-pkg 2004-04-15 13:21:58.000000000 +1000 ++++ mkinitrd-3.5.24.tinysofa/grubby/new-kernel-pkg 2004-06-29 00:26:04.687504136 +1000 +@@ -125,10 +125,10 @@ + + if [ -n "$banner" ]; then + title="$banner ($version)" +- elif [ -f /etc/redhat-release ]; then +- title="$(sed 's/ release.*$//' < /etc/redhat-release) ($version)" ++ elif [ -f /etc/tinysofa-release ]; then ++ title="$(sed 's/ release.*$//' < /etc/tinysofa-release) ($version)" + else +- title="Red Hat Linux ($version)" ++ title="tinysofa enterprise server ($version)" + fi + /sbin/grubby --add-kernel=$bootPrefix/$kernelName-$version $INITRD \ + --copy-default $makedefault --title "$title" \ Deleted: tinysofa/snapshot/mkinitrd/current/sources/mkinitrd-3.5.21-insmod.patch =================================================================== --- tinysofa/snapshot/mkinitrd/current/sources/mkinitrd-3.5.21-insmod.patch 2004-07-01 15:50:57 UTC (rev 2790) +++ tinysofa/snapshot/mkinitrd/current/sources/mkinitrd-3.5.21-insmod.patch 2004-07-01 15:51:03 UTC (rev 2791) @@ -1,16 +0,0 @@ -diff -urN mkinitrd-3.5.21/mkinitrd mkinitrd-3.5.21.insmod/mkinitrd ---- mkinitrd-3.5.21/mkinitrd 2004-05-05 12:36:31.000000000 +1000 -+++ mkinitrd-3.5.21.insmod/mkinitrd 2004-05-05 12:39:49.000000000 +1000 -@@ -534,7 +534,11 @@ - rm -rf $MNTPOINT/lost+found - - inst /sbin/nash "$MNTIMAGE/bin/nash" --inst /sbin/insmod.static "$MNTIMAGE/bin/insmod" -+if [ "$kernelmajor" == "2.4" ]; then -+ inst /sbin/insmod.static.old "$MNTIMAGE/bin/insmod" -+else -+ inst /sbin/insmod.static "$MNTIMAGE/bin/insmod" -+fi - ln -s /sbin/nash $MNTIMAGE/sbin/modprobe - - for MODULE in $MODULES; do Deleted: tinysofa/snapshot/mkinitrd/current/sources/mkinitrd-3.5.21-tinysofa-backwards-compat.patch =================================================================== --- tinysofa/snapshot/mkinitrd/current/sources/mkinitrd-3.5.21-tinysofa-backwards-compat.patch 2004-07-01 15:50:57 UTC (rev 2790) +++ tinysofa/snapshot/mkinitrd/current/sources/mkinitrd-3.5.21-tinysofa-backwards-compat.patch 2004-07-01 15:51:03 UTC (rev 2791) @@ -1,109 +0,0 @@ -diff -urN mkinitrd-3.5.21/grubby/new-kernel-pkg mkinitrd-3.5.21.backwards-compat/grubby/new-kernel-pkg ---- mkinitrd-3.5.21/grubby/new-kernel-pkg 2004-04-15 13:21:58.000000000 +1000 -+++ mkinitrd-3.5.21.backwards-compat/grubby/new-kernel-pkg 2004-05-12 21:18:21.000000000 +1000 -@@ -13,6 +13,83 @@ - - lilo=/sbin/lilo - -+# === START BACKWARDS COMPAT === -+# backwards compatiblity with old tinysofa fixboot.sh -+# -+# A file to add content of possible mail: -+ -+MAILFILE=$(mktemp /tmp/kernmail.XXXXXX) -+ -+reboot_or_mailto() { -+ # backwards compatibility reboot / mailing stuff -+ if [ "$REBOOT" = "yes" -a ! -z "$REBOOTAT" ]; then -+ # shutdown only if $REBOOTAT != [now,0] inn background -+ if [ "$REBOOTAT" != "now" -a "$REBOOTAT" != "+0" ]; then -+ shutdown -r $REBOOTAT "Rebooting due to kernel upgrade." & \ -+ > /dev/null 2>&1 -+ echo "" | tee -a $MAILFILE -+ echo "Rebooting due to kernel upgrade. " \ -+ | tee -a $MAILFILE -+ echo "New kernel version is: '$version'" \ -+ | tee -a $MAILFILE -+ echo "" | tee -a $MAILFILE -+ echo "The time argument given to shutdown was: '$REBOOTAT'" \ -+ | tee -a $MAILFILE -+ echo "Use 'shutdown -c' to cancel shutdown." \ -+ | tee -a $MAILFILE -+ else -+ echo "To reboot _now_ (during upgrade) is probably not a good idea.."\ -+ | tee -a $MAILFILE -+ echo "Please re-evaluate your 'REBOOTAT' setting."\ -+ | tee -a $MAILFILE -+ fi -+ else -+ echo "Will not reboot." \ -+ | tee -a $MAILFILE -+ fi -+ mailto -+} -+ -+mailto(){ -+if [ "$MAILTO" != "" ]; then -+ if [ -f "$MAILFILE" ]; then -+ if [ -x /bin/hostname ]; then -+ HOSTNAME=$(/bin/hostname) -+ SUBJ="Kernel upgrade on '$HOSTNAME'" -+ else -+ SUBJ='Kernel upgrade' -+ fi -+ cat $MAILFILE | mail -s "$SUBJ" $MAILTO > /dev/null 2>&1 -+ else -+ echo "Could not find mail content: $MAILFILE" -+ fi -+fi -+rm -f $MAILFILE >/dev/null 2>&1 || : -+} -+ -+ -+# We only care about AUTOACTIVATE, REBOOT, REBOOTAT and MAILTO -+ -+CONFIG='/etc/sysconfig/bootloader' -+BOOTLOADER=none -+AUTOACTIVATE=no -+REBOOT=no -+REBOOTAT=+60 -+MAILTO= -+ -+# -+# Get values from configuration file: -+# -+if [ -f "$CONFIG" ]; then -+ . $CONFIG -+else -+ echo "File '$CONFIG' not found, using defaults." \ -+ | tee -a $MAILFILE -+fi -+ -+ -+# === END BACKWARDS COMPAT === -+ - # some defaults that are sane for most arches - kernelName=vmlinuz - -@@ -338,6 +415,12 @@ - exit 0 - fi - -+# backwards compatibility. -+ -+if [ "$AUTOACTIVATE" == "yes" ]; then -+ makedefault="--make-default" -+fi -+ - - [ -n "$grubConfig" ] && [ -f "$grubConfig" ] && cfgGrub=1; - [ -n "$liloConfig" ] && [ -f "$liloConfig" ] && cfgLilo=1; -@@ -350,6 +433,8 @@ - - if [ "$mode" == "--install" ]; then - install -+ -+ reboot_or_mailto - elif [ "$mode" == "--remove" ]; then - remove - fi Deleted: tinysofa/snapshot/mkinitrd/current/sources/mkinitrd-3.5.21-tinysofa-titles.patch =================================================================== --- tinysofa/snapshot/mkinitrd/current/sources/mkinitrd-3.5.21-tinysofa-titles.patch 2004-07-01 15:50:57 UTC (rev 2790) +++ tinysofa/snapshot/mkinitrd/current/sources/mkinitrd-3.5.21-tinysofa-titles.patch 2004-07-01 15:51:03 UTC (rev 2791) @@ -1,48 +0,0 @@ -diff -urN mkinitrd-3.5.21/grubby/new-kernel-pkg mkinitrd-3.5.21.tinysofa/grubby/new-kernel-pkg ---- mkinitrd-3.5.21/grubby/new-kernel-pkg 2004-04-15 13:21:58.000000000 +1000 -+++ mkinitrd-3.5.21.tinysofa/grubby/new-kernel-pkg 2004-05-12 21:23:15.000000000 +1000 -@@ -74,7 +74,7 @@ - usage() { - echo "Usage: `basename $0` [-v] [--mkinitrd] [--rminitrd]" >&2 - echo " [--initrdfile=] [--depmod] [--rmmoddep]" >&2 -- echo " [--kernel-args=] [--banner=]" >&2 -+ echo " [--kernel-args=] [--banner=] [--ext_title=]" >&2 - echo " [--make-default] <--install | --remove> " >&2 - echo " (ex: `basename $0` --mkinitrd --depmod --install 2.4.7-2)" >&2 - exit 1 -@@ -125,11 +125,16 @@ - - if [ -n "$banner" ]; then - title="$banner ($version)" -- elif [ -f /etc/redhat-release ]; then -- title="$(sed 's/ release.*$//' < /etc/redhat-release) ($version)" -+ elif [ -f /etc/release ]; then -+ title="$(sed 's/ release.*$//' < /etc/release) ($version)" - else -- title="Red Hat Linux ($version)" -+ title="tinysofa enterprise server ($version)" - fi -+ -+ if [ -n "$ext_title" ]; then -+ title="$title [$ext_title]" -+ fi -+ - /sbin/grubby --add-kernel=$bootPrefix/$kernelName-$version $INITRD \ - --copy-default $makedefault --title "$title" \ - --args="root=$rootdevice $kernargs" \ -@@ -257,6 +262,15 @@ - fi - ;; - -+ --ext_title*) -+ if echo $1 | grep '=' >/dev/null ; then -+ ext_title=`echo $1 | sed 's/^--ext_title=//'` -+ else -+ ext_title=$2 -+ shift -+ fi -+ ;; -+ - --depmod) - moddep="make" - ;; Deleted: tinysofa/snapshot/mkinitrd/current/sources/mkinitrd-3.5.21.tar.bz2 =================================================================== (Binary files differ) Added: tinysofa/snapshot/mkinitrd/current/sources/mkinitrd-3.5.24.tar.bz2 =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/mkinitrd/current/sources/mkinitrd-3.5.24.tar.bz2 ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: tinysofa/snapshot/mkinitrd/current/specs/mkinitrd.spec =================================================================== --- tinysofa/snapshot/mkinitrd/current/specs/mkinitrd.spec 2004-07-01 15:50:57 UTC (rev 2790) +++ tinysofa/snapshot/mkinitrd/current/specs/mkinitrd.spec 2004-07-01 15:51:03 UTC (rev 2791) @@ -1,24 +1,24 @@ Summary: Creates an initial ramdisk image for preloading modules. Name: mkinitrd -Version: 3.5.21 -Release: 4ts +Version: 3.5.24 +Release: 1ts License: GPL -Group: tinysofa official +Group: System Environment/Base Source: mkinitrd-%{version}.tar.bz2 -Patch1: mkinitrd-3.4.43-ttyS.patch -Patch2: mkinitrd-3.5.21-insmod.patch -Patch3: mkinitrd-3.5.21-tinysofa-titles.patch -Patch4: mkinitrd-3.5.21-tinysofa-backwards-compat.patch -# This needs to be PreReq'ed or system install will fail -PreReq: losetup, e2fsprogs, coreutils, grep, mount, gzip, tar -PreReq: mktemp >= 1.5-5tr, findutils, sed -PreReq: filesystem >= 1.0, dev -# depmod required by new-kernel-pkg -Requires: module-init-tools, modutils -BuildRequires: dietlibc, perl +Patch: mkinitrd-3.5.2-tinysofa.patch +ExclusiveOs: Linux +Prereq: dev +Requires: e2fsprogs, /bin/sh, fileutils, grep, mount, gzip, tar, /sbin/insmod.static, /sbin/losetup, mktemp >= 1.5-5, findutils, lvm2 +Requires: filesystem >= 2.1.0 +BuildRequires: popt +%ifarch i386 +BuildRequires: dietlibc +%endif +%ifarch ppc +Requires: ppc64-utils >= 0.3-1 +%endif +BuildRoot: %{_tmppath}/%{name}-%{version}-root -BuildRoot: %{_tmppath}/%{name}-root - %description Mkinitrd creates filesystem images for use as initial ramdisk (initrd) images. These ramdisk images are often used to preload the block @@ -35,104 +35,662 @@ ramdisk using information found in the /etc/modules.conf file. %prep -%setup -q -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 +%setup -q +%patch -p1 %build -export CC="gcc %{?no_stack_protector}" make +make test +if [ $? != 0 ]; then exit 1; fi %install -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != "/" ] && rm -rf "$RPM_BUILD_ROOT" +rm -rf $RPM_BUILD_ROOT make BUILDROOT=$RPM_BUILD_ROOT mandir=%{_mandir} install %clean -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT +rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) -/sbin/* -%{_mandir}/man8/* +%attr(755,root,root) /sbin/mkinitrd +%attr(644,root,root) %{_mandir}/man8/mkinitrd.8* +%attr(755,root,root) /sbin/nash +%attr(644,root,root) %{_mandir}/man8/nash.8* +%config %attr(755,root,root) /sbin/installkernel +%attr(755,root,root) /sbin/new-kernel-pkg +%attr(755,root,root) /sbin/grubby +%attr(644,root,root) %{_mandir}/man8/grubby.8* %changelog -* Mon May 24 2004 tsintegrate 3.5.21-4ts -- current (3.5.21-5ok) integrated as 3.5.21-4ts for release 1.0-U1 +* Fri Jun 18 2004 Jeremy Katz - 3.5.24-1 +- fix usb-storage detection with 2.6 (#126309) -* Mon May 24 2004 Omar Kilani 3.5.21-5ok -- Change Requires to module-init-tools, modutils. +* Tue May 18 2004 Jeremy Katz - 3.5.23-1 +- add support for RAID6 -* Sun May 23 2004 Jaakko Heinonen 3.5.21-4jh -- add Requires: /sbin/insmod.static, /sbin/depmod +* Wed May 12 2004 Jeremy Katz +- add support for multipath personality from Tom Callaway (#120379) -* Wed May 19 2004 tsintegrate 3.5.21-3ts -- current (3.5.21-3ts) integrated as 3.5.21-3ts for release 1.0-U1 +* Thu May 6 2004 Jeremy Katz - 3.5.22-1 +- bump initrd size (#122325) -* Wed May 12 2004 Omar Kilani 3.5.21-3ts -- We want grubby, installkernel and new-kernel-pkg. -- We also want to call it tinysofa, and... -- We want backwards compatibility with fixboot. -- Done. +* Wed Apr 14 2004 Jeremy Katz - 3.5.21-1 +- new-kernel-package: add patch from Ryan Tilder to allow setting new + kernel as default (#117605) +- mkinitrd: i2o_pci isn't in 2.6 (#120827) +- new-kernel-pkg: conditionalize kernel binary name for 2.6 vs 2.4 + on ppc/ppc64 (as it's vmlinuz in 2.6 instead of the + vmlinux from 2.4) (#120868) -* Wed May 05 2004 Omar Kilani 3.5.21-1ts -- Updated to latest upstream. -- Get rid of all the patches. -- Add ttyS and insmod patches. +* Tue Apr 13 2004 Jeremy Katz - 3.5.20-1 +- mkinitrd: minor regex fix for some kernel names (#120624) -* Fri Feb 27 2004 Erlend Midttun 3.4.43-9tr -- Added CC to get no-stack-protector going. +* Mon Feb 9 2004 Jeremy Katz - 3.5.19-1 +- nash/mkinitrd: quiet mode for nash and necessary mkinitrd changes + to work with it +- mkinitrd: add lxo's patch for copying lvm.conf (#112099) +- new-kernel-pkg: allow specifying the banner used in the boot loader config + on the command line (#114809) -* Fri Jan 30 2004 Oystein Viggen 3.4.43-8tr -- Won't build with stack protection +* Tue Jan 13 2004 Jeremy Katz +- mkinitrd: add patch from Alex Kiernan for modules with multiple + deps in 2.6 (#113306) -* Mon Dec 15 2003 Erlend Midttun 3.4.43-7tr -- Rebuilt. +* Thu Jan 8 2004 Jeremy Katz 3.5.18-1 +- new-kernel-pkg: add a --kernel-arguments option (#113125) -* Thu Jul 10 2003 Erlend Midttun 3.4.43-6tr -- Added ttyS0-3. +* Tue Jan 6 2004 Jeremy Katz +- fix ybin path (#112939) -* Wed Jun 18 2003 Erlend Midttun 3.4.43-5tr -- Big rebuild +* Sun Jan 4 2004 Jeremy Katz 3.5.17-1 +- mkinitrd: handle multiple spaces in modules.conf (from Lubomir Bulej) +- nash: rebuild against new dietlibc fixing problems with root=LABEL= (#112623) +- mkinitrd: determine kernel version and adjust modulefile appropriately + so that we look at /etc/modprobe.conf for 2.6 kernels +- mkinitrd: first pass at getting lvm working on 2.4 -> 2.6 upgrade -* Wed May 28 2003 Erlend Midttun 3.4.43-4em -- Now actually use the insmod we compiled. +* Wed Dec 24 2003 Jeremy Katz +- mkinitrd: quiet strip by default -* Mon May 26 2003 Erlend Midttun 3.4.43-3em -- fileutils, sh-utils, textutils -> coreutils. +* Mon Dec 22 2003 Jeremy Katz 3.5.16.1-1 +- make stripping less aggressive -* Tue May 6 2003 Erlend Midttun 3.4.43-2em -- Try without the Mandrake patch. +* Mon Dec 22 2003 Jeremy Katz 3.5.16-1 +- fixing handling of non-lvm case when /dev/mapper/control isn't present +- add patch from Al Viro to get root dev in numeric form by grokking sysfs -* Wed Apr 9 2003 Erlend Midttun 3.4.43-1em -- New upstream. -- Added patch from Mandrake to take care of module dependencies. +* Tue Dec 9 2003 Jeremy Katz +- strip modules if /usr/bin/strip exists (#111756) -* Mon Mar 24 2003 Erlend Midttun 3.3.10-6em -- Rebuilt against glibc 2.3.2. +* Fri Dec 5 2003 Jeremy Katz 3.5.15-2 +- require lvm2 so that it gets installed early enough -* Mon Jan 13 2003 Erlend Midttun 3.3.10-5em -- mknod the raid bootup device. +* Fri Dec 5 2003 Jeremy Katz 3.5.15-1 +- mkinitrd: add support for lvm2 (note: will not currently handle being + on a running 2.4 kernel and installing 2.6 with lvm rootfs) -* Mon Dec 9 2002 Erlend Midttun 3.3.10-4em -- Make it say Trustix when used to add a new boot option. +* Wed Dec 3 2003 Jeremy Katz +- nash: add mkdmnod for creating the device-mapper control node -* Thu Jul 18 2002 Roland Kruse -- Requires: dev +* Thu Oct 2 2003 Jeremy Katz 3.5.14-1 +- fix dependency on /usr/bin/tail and /usr/bin/id -* Mon Jun 3 2002 Gerald Dachs -- New version is need by the 2.4.x kernels, - uses the pivot_root system call to change / from - initrd to real /. +* Tue Sep 30 2003 Florian La Roche +- remove one more mktemp dir for "all loopback devices in use" case -* Tue Jun 12 2001 Erlend Midttun -- New upstream version. -- Now requires a few more, including mktemp -d. +* Tue Sep 23 2003 Jeremy Katz 3.5.13-1 +- fix getting modules from /lib/modules/$(uname -r)/updates -* Mon Jan 24 2000 Tore Olsen -- moved /usr/man to /usr/share/man for FHS compliance +* Mon Sep 22 2003 Jeremy Katz 3.5.12-1 +- argument checking and usage for /sbin/installkernel (#103109) +* Wed Sep 3 2003 Jeremy Katz 3.5.11-1 +- really only do grub configs on grub arches +- some usb mkinitrd fixes + +* Fri Aug 29 2003 Jeremy Katz 3.5.10-1 +- clean up bogus warning in installkernel +- only try to do grub configs on arches which support grub (#103261) + +* Thu Aug 7 2003 Matt Wilson 3.5.9-1 +- add \n to error messages in grubby +- NUL terminate buffer returned from readlink properly +- symlinks are most likely relative, chdir to / before trying to + follow them +- yaboot needs boot prefix +- silo needs boot prefix too + +* Wed Jul 30 2003 Jeremy Katz +- grubby: don't segfault on label=\n (reported by dburcaw) + +* Thu Jul 24 2003 Jeremy Katz +- grubby: patch from zaitcev for uninitialized variable that can get + hit in the zipl case + +* Mon Jul 21 2003 Jeremy Katz 3.5.8-1 +- bump initrd size (#99525) + +* Wed Jul 9 2003 Jeremy Katz 3.5.7-1 +- pick modules from /lib/modules/$(uname -r)/updates first +- be less confused by more than one module of a name + +* Wed Jun 25 2003 Jeremy Katz 3.5.6-1 +- unbreak reading module options from modules.conf again (#97982) + +* Fri Jun 20 2003 Bill Nottingham 3.5.5-1 +- fix modules.dep usage for 2.5/2.6 + +* Fri Jun 20 2003 Jeremy Katz 3.5.4-1 +- handle more bizarre modules.conf constructs (notting) + +* Thu Jun 12 2003 Jeremy Katz 3.5.3-1 +- mkinitrd: fix copying of pvs (#97314, #97289) +- mkinitrd: use pvscan instead of lvmdiskscan to find PVs to work + better on other arches +- mkinitrd: better check for dasd existence +- mkinitrd: make certain lvm-mod is included if root on lvm + +* Wed Jun 11 2003 Jeremy Katz 3.5.2-1 +- mkinitrd: revert use of modprobe -c. it breaks in the installer when we + don't have a modules.dep for the BOOT kernel +- nash: return pivot_root call correctly (#97753) + +* Wed Jun 11 2003 Jeremy Katz 3.5.1-1 +- nash: fix syscall bits with gcc 3.3 on s390 +- new-kernel-pkg: do depmod before mkinitrd (#97218) + +* Tue Jun 10 2003 Jeremy Katz 3.5.0-1 +- mkinitrd: add patch from gc at mandrakesoft.com to determine module + deps from modules.dep (#87873) +- tweak patch to not break weird cases where module deps aren't all + you need :/ +- grubby: don't remove the last kernel (#60041) +- mkinitrd: use modprobe -c to find module options (#89794) + +* Tue May 20 2003 Matt Wilson 3.4.52-1 +- use addSystemMap to build the image for iSeries (#91187) + +* Fri May 16 2003 Jeremy Katz 3.4.51-1 +- grubby: error out gracefully if we run out of space (#85424) +- mkinitrd: copy parent dirs for pvs (#88962) +- mkinitrd: exit with an exit status if tar fails (#90123) +- new-kernel-pkg: only use the first entry for / (#90155) +- grubby: fix a buffer overflow (#90444) + +* Wed Apr 30 2003 Jeremy Katz 3.4.50-1 +- fix typo in new-kernel-pkg for iSeries + +* Wed Apr 30 2003 Elliot Lee +- BuildRequires: popt +- Change grubby Makefile to static-link popt a bit more cleanly + +* Thu Apr 24 2003 Jeremy Katz 3.4.49.1-1 +- use Arjan's suggestion of vmlinitrd for the kernel + initrd combo file + +* Thu Apr 24 2003 Jeremy Katz 3.4.49-2 +- fix description referencing /etc/conf.modules (#89558) + +* Thu Apr 24 2003 Jeremy Katz 3.4.49-2 +- require ppc64-utils on ppc + +* Fri Apr 18 2003 Jeremy Katz 3.4.49-1 +- new-kernel-pkg: on iSeries, we don't have a boot loader, just make the + kernel + initrd combo file (/boot/vmlinux-version.img) + +* Mon Apr 07 2003 Karsten Hopp 3.4.48-1 +- Fix segfault on mainframe + +* Wed Mar 26 2003 Jeremy Katz 3.4.47-1 +- mkinitrd: fix using options for loading modules +- mkinitrd: don't use kernel parameters for dasd at mkinitrd time, + use what's in modules.conf + +* Mon Mar 24 2003 Jeremy Katz 3.4.46-1 +- new-kernel-pkg: add necessary bits for s390, some logic cleanups +- grubby: fix root detection for s390{,x} + +* Sun Mar 23 2003 Jeremy Katz 3.4.45-1 +- grubby: add silo support (sparc) +- grubby: add zipl support (s390{,x}) +- add grubby test cases for zipl support + +* Wed Mar 19 2003 Jeremy Katz 3.4.44.1-1 +- fix dasd option reading + +* Fri Mar 14 2003 Phil Knirsch 3.4.44 +- Added automatic dasd= parameters for kernel parameter on s390(x). + +* Tue Mar 4 2003 Jeremy Katz 3.4.43-1 +- apply ppc patches for new-kernel-pkg and installkernel from Dan + Burcaw +- man page tweak (#85471) + +* Tue Feb 18 2003 Jeremy Katz 3.4.42-1 +- grubby: fix segfault from uninitialized variable (#84128) + +* Tue Feb 11 2003 Jeremy Katz 3.4.41-1 +- nash: add readlink +- use readlink for rootdev to handle symlinks to root devs (#83391) + +* Tue Feb 4 2003 Jeremy Katz 3.4.40-1 +- fix i2o module ordering (#83447) +- ifarch'd build requires of dietlibc now that the build system has a way to + handle these + +* Sat Feb 01 2003 Florian La Roche +- change one test from a number to a string test that could otherwise + fail in not properly setup chroot environments + +* Fri Jan 31 2003 +- added support for yaboot +- test script runs tests for all platforms +- separated elilo configuration from lilo mode, allowing elilo specific + tests to be run on any platform + +* Sun Jan 26 2003 +- grubby now shortens lilo titles to ensure they are less then 16 characters + long (76236) +- mkinitrd would only turn on /dev/md0 if raid was needed; now it enables + all raid devices listed in /proc/mdstat (82209) +- use product name from /etc/redhat-release to generate label in grub.conf + (82352) + +* Mon Jan 20 2003 Bill Nottingham 3.4.36-1 +- don't error out running awk on /proc/mdstat if /proc/mdstat isn't + there + +* Tue Jan 14 2003 +- all mkdev() actions will create directories as needed (some code in + mkdevices is now obsolete; I'll remove it later) (#73317) +- added mkdev command to test the above +- support diratime/nodiratime mount options (#78738) +- grubby will follow symlinks when writing new config file (#78713) +- don't depend on raidtab, use /proc/mdstat instead (#80424) this covers + both mkinitrd and grubby + +* Sun Jan 5 2003 Jeremy Katz 3.4.34-1 +- grubby: fix segfault finding default if default doesn't have a root= (#66000) +- don't include usb modules by default. pass --with-usb to get usb modules +- make sure kudzu exists before trying to exec it +- handle multiple scsi hosts being present (#77422) +- add /usr/sbin to default path (#79581) +- fix using --builtin= (#80448) +- grubby: preserve the mode on config files (#80776) + +* Mon Dec 16 2002 Jeremy Katz +- errno fixes + +* Tue Dec 03 2002 Florian La Roche +- /sbin/new-kernel-pkg: fix a test to have correct "" + +* Fri Nov 22 2002 Jeremy Katz +- mkinitrd: more gzipped module fixes + +* Thu Nov 21 2002 Jeremy Katz +- mkinitrd: add support for finding gzipped modules +- mkinitrd: don't be noisy if we don't have lvm-mod loaded + +* Wed Nov 6 2002 Jeremy Katz +- grubby: don't bail when looking for root in appends of lilo-style configs +- include grubby on x86_64 + +* Thu Sep 26 2002 Nalin Dahyabhai +- fix some syntax errors +- use grep's -q flag to save a redirect in places where we're not redirecting + stderr + +* Thu Sep 5 2002 Jeremy Katz +- grubby could segfault by going into its lilo checking if it couldn't find + a default to copy (default had no root= and --bad-image-okay wasn't + being used) + +* Mon Sep 2 2002 Jeremy Katz +- nash: create directories if needed in mkdevices command (#73090) +- grubby: handle lilo case of non-linux default (#72202) + +* Sat Aug 31 2002 Jeremy Katz +- grubby: fix for case like 'append = " hdc=ide-scsi "' (#68802) + +* Fri Aug 30 2002 Bill Nottingham +- fix firewire stuff (#72916) + +* Fri Aug 23 2002 Bill Nottingham +- fix mpt fusion stuff + +* Tue Aug 13 2002 Jeremy Katz +- /boot/efi/redhat -> /boot/efi/EFI/redhat on ia64 + +* Sun Aug 11 2002 Jeremy Katz +- fix grubby to work correctly on ia64 + +* Thu Aug 08 2002 Michael Fulbright +- added sleep command to nash and fixed creating initrd with / or /boot on usb + +* Tue Jul 30 2002 Jeremy Katz +- grubby: adding kernels to lilo.conf when not using root=LABEL will work + now too + +* Fri Jul 26 2002 Erik Troan +- didn't close /proc/partitions in mkdevices + +* Thu Jul 25 2002 Jeremy Katz +- grubby: fix adding kernels to lilo when using root=LABEL + +* Wed Jul 24 2002 Erik Troan +- added and used mkdevices command (68959) + +* Wed Jul 17 2002 Erik Troan +- do proper probing to check root=LABEL +- --bootloader-probe didn't support /etc/sysconfig/grub + +* Fri Jul 12 2002 Erik Troan +- don't sanity check root=LABEL right now; probing might make sense? + +* Wed Jul 10 2002 Erik Troan +- --ifneeded is obsolete; we always need initrds +- grubby lets you specify multiple indexes for --info +- grubby lets you select kernels by title +- added showlabels to nash +- new-kernel-pkg sets the root device from /etc/fstab rather then inheriting it +- new-kernel-pkg removes all entries w/ a duplicate label (67459) + +* Mon Jul 08 2002 Erik Troan +- usb root device code could fail, causing no initrd to be made + +* Thu Jun 27 2002 Erik Troan +- grubby didn't add new kernels properly + +* Thu Jun 27 2002 Erik Troan +- support root on usb devices + +* Wed Jun 26 2002 Erik Troan +- other= in lilo.conf wasn't being parsed out properly + +* Mon Jun 24 2002 Erik Troan +- changed --add-kernel implementation so that --args gets handled properly + +* Sun Jun 23 2002 Erik Troan +- added loadinitrd (used by mkbootdisk) on ia32 and sparc +- modules "off" and "null" should be ignored (67086) +- mkrootdev looks for root=LABEL=/ in /proc/cmdline, so root by label + works again (fully determined by root= kernel parameter) +- added --update-kernel and --remove-args arguments to grubby +- kernel specification of ALL supported by grubby +- DEFAULT accepted much more consistently +- grubby --info displays info on all kernels specified, not just the first +- ext3 need mbcache now (67354) +- grubby allows config file entry numbers to be used as kernel paths +- support /etc/sysconfig/grub.conf +- display lba info from lilo.conf file in --info + +* Thu Jun 13 2002 Jeremy Katz +- don't run lilo twice on kernel removal in new-kernel-pkg +- don't run grubby to add/remove kernels from new-kernel-pkg if + bootloader config doesn't + +* Tue Jun 11 2002 Erik Troan +- added --bootloader-probe to grubby +- wrote a man page for grubby +- include grubby on ia64 +- updated new-kernel-pkg to work with lilo/elilo +- added --info=DEFAULT option + +* Mon Jun 10 2002 Jeremy Katz +- start raid before lvm so that you can have root on lvm on raid (#66175) + +* Tue Jun 04 2002 Erik Troan +- failed to initialize a variable in grubby + +* Fri May 31 2002 Erik Troan +- added --grub option so grub tests could run on ia64 +- added some basic tests of lilo default directive handling + +* Wed May 29 2002 Jeremy Katz +- require lvm + +* Tue May 28 2002 Bill Nottingham +- fix umounting of /initrd when pivoting + +* Tue May 28 2002 Erik Troan +- marked /sbin/installkernel as %config (53006) +- run make test during build + +* Wed May 22 2002 Erik Troan +- added --nopivot (53679) +- honor INSTALL_PATH in installkernel (32833) +- installkernel versions old kernels as well (52756) +- lilo support added to grubby + +* Tue May 21 2002 Erik Troan +- cleaned up usage message +- added --omit-lvm-modules to man page +- added --builtin option (65250) +- skip comments in fstab (65249) +- added findlodev to nash, use that to pick block device (63421) +- support -o option in nash's mount (59185) +- look for xfs_dmapi (60066) +- added > support for executed commands (61180) +- grubby copies permissions from old config file (59227) +- use options from fstab for root filesystem (56071) +- try and be better about returning nonzero on error (60203) +- make modprobe symlink properly to avoid kernel message (62145) +- support linear raid (12775) +- support fallback option in grub config (54794) +- comments in template entries not handled quite right (65198) + +* Sat Apr 20 2002 Erik Troan +- grubby does a better job of not adding superfluous default= lines + +* Wed Apr 17 2002 Erik Troan +- preload works again + +* Wed Apr 10 2002 Jeremy Katz +- revert to not mounting by label + +* Fri Apr 5 2002 Jeremy Katz +- include pbrown's changes to load parport_pc when needing ppa.o (#35360) + +* Thu Apr 4 2002 Jeremy Katz +- fix redirection bug (#62623) +- create proper link of /sbin->/bin in initrd (#62199) + +* Thu Mar 28 2002 Jeremy Katz +- prereq dev package so that we always have the dev package before we get run + +* Fri Mar 22 2002 Jeremy Katz +- duh, that won't work. fix it +- don't require lvm tools right now + +* Thu Mar 21 2002 Jeremy Katz +- fix nash to create directories for devices like cciss and ida + +* Tue Feb 5 2002 Bill Nottingham +- run mkinitrd with -f in new-kernel-pkg +- don't run lilo in /sbin/installkernel + +* Fri Feb 1 2002 Jeremy Katz +- require lvm + +* Thu Jan 31 2002 Jeremy Katz +- clean up warnings for when /proc isn't mounted + +* Tue Jan 29 2002 Jeremy Katz +- fix probing for LVM usage to require a volume group to exist before adding + the module +- --omit-lvm-modules will omit LVM modules +- add support for root device being LVM + +* Wed Jan 16 2002 Erik Troan +- look for a non /tmpfs directory +- added support for xfs +- use with raid md.o if it exists +- fixed bug in echo +- use find form nash rather then /usr (mkinitrd shouldn't need /usr + mounted) + +* Fri Jan 11 2002 Erik Troan +- added support for mounting root filesystem by label +- switched to dietlibc from minilibc +- fix so --preload= works [33675,57560,44377] +- added info on --image-version and --nocompress to man page [57560] +- set fileystem check interval to 0 in case the system clock + is borked [51454] +- give a proper error when run by a user other then root [27218,53159] +- grubby statically linked against popt [55305] +- cleaned up verbose output a bit [21791] + +* Tue Dec 18 2001 Trond Eivind Glomsr?d +- Add LVM module when LVM is used + +* Wed Sep 5 2001 Jeremy Katz +- grubby shouldn't blow away default=saved lines (#52981) + +* Fri Aug 31 2001 Jeremy Katz +- fix new-kernel-pkg --mkinitrd for ia64 + +* Thu Aug 30 2001 Erik Troan +- fixed bug handling invalid default (MF #52889) +- in some cases we would set the default to point at a removed image + +* Wed Aug 29 2001 Erik Troan +- minor grubby fixes + +* Tue Aug 28 2001 Jeremy Katz +- let new-kernel-pkg be able to do more (initrds, modules.*) +- include grubby only on x86 + +* Mon Aug 27 2001 Jeremy Katz +- more grubby fixups for having a /boot +- added new-kernel-pkg + +* Sun Aug 26 2001 Erik Troan +- added grubby +- added installkernel + +* Fri Aug 3 2001 Matt Wilson +- make consoles with the correct minor numbers +- applied patch from hjl to fix fstab parsing (#50819) + +* Fri Jul 20 2001 Jeremy Katz +- skip errors finding jbd as a module if we're skipping them trying to find + ext3 so that you can build a kernel with ext3 built-in and still use an + initrd + +* Wed Jul 11 2001 Bill Nottingham +- don't print errors if /etc/raidtab doesn't exist +- or /etc/{modules.conf,conf.modules}, for that matter + +* Fri Jul 6 2001 Matt Wilson +- don't dig through /etc/fstab to find out if we have a filesystem on + a RAID device, it's usually mounted by label so /dev/mdN isn't there + at all (#46525) + +* Tue Jun 26 2001 Bill Nottingham +- require filesystem >= 2.1.0, otherwise we don't boot + +* Thu Jun 21 2001 Erik Troan +- added a bunch of commands to nash +- use pivot_root +- support ext3 + +* Fri Jun 08 2001 Florian La Roche +- delete the exclusivearch line completely + +* Fri Mar 23 2001 Matt Wilson +- reset the state of findmodule after getting the modules we need + +* Wed Feb 28 2001 Matt Wilson +- changed the Requires on mktemp from >= 1.5 to >= 1.5-5 (which included + -d support) (#30127) + +* Fri Feb 23 2001 Erik Troan +- let nash be invoked as modprobe to avoid a modprobe failure to exec +- nash will try to run arbitrary commands now (removing insmod as a special + case) + +* Mon Feb 12 2001 Matt Wilson +- add findutils to Requires line (#27269) + +* Thu Feb 8 2001 Matt Wilson +- added checks to load the modules i2o_block needs + +* Wed Feb 7 2001 Bill Nottingham +- fix utterly broken build + +* Wed Jan 31 2001 Helge Deller +- added mandir to nash Makefile (RH 6.x compatibility) + +* Tue Jan 30 2001 Erik Troan +- added dependency on mktemp + +* Thu Jan 25 2001 Erik Troan +- we need to insert xor.o before raid5.o + +* Wed Jan 24 2001 Matt Wilson +- code in RAID_AUTORUN ioctl fallback +- fixed raidstart check flag from -z to -n + +* Tue Jan 23 2001 Erik Troan +- switched to using nash from sash + +* Tue Jan 23 2001 Matt Wilson +- added patch from twaugh to avoid blindly adding scsi_mod + and sd_mod to initrd if they are not needed (#24114) + +* Thu Jan 11 2001 Bernhard Rosenkraenzer +- Enlarge initrds, needed for systems with both IDE and SCSI + (Bug #23846) +- Version 2.[6789] probably shouldn't identify itself as 2.6 + with --version. ;) +- bzip2 source + +* Wed Dec 20 2000 Erik Troan +- let the kernel autoload ide-cd + +* Fri Dec 08 2000 Erik Troan +- added modular ide support + +* Wed Aug 30 2000 Nalin Dahyabhai +- use mktemp to create temporary files and directories + +* Sat Aug 05 2000 Erik Troan +- changes from Keith Owens for 2.4 + +* Tue Jul 4 2000 Matt Wilson +- build on alpha + +* Mon Jun 26 2000 Bill Nottingham +- ignore 'unknown' aliases (they shouldn't be there anyways) + +* Thu Jun 1 2000 Bill Nottingham +- build on ia64 +- bump up initrd size on ia64 +- modules.confiscation, /usr/man -> /usr/share/man + +* Tue May 2 2000 Nalin Dahyabhai +- make RPM pick up man page, regardless of compression + +* Tue Feb 29 2000 Matt Wilson +- add requirement for /sbin/losetup + +* Mon Feb 7 2000 Matt Wilson +- gzip manpage + +* Thu Feb 3 2000 Matt Wilson +- gzip manpage + +* Mon Jan 10 2000 Erik Troan +- use sash, not ash + +* Mon Jan 3 2000 Matt Wilson +- use ash.static for /bin/sh, not sash + +* Sat Jan 1 2000 Erik Troan +- configure loopback devices + +* Tue Sep 28 1999 Bill Nottingham +- sparc fixup from jakub + * Wed Sep 22 1999 Michael K. Johnson - fix cleanup (blush!) From svn at tinysofa.org Thu Jul 1 15:51:07 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:51:07 +1000 (EST) Subject: [tinysofa-svn] r2792 - in tinysofa/snapshot/mktemp/current: sources specs Message-ID: <20040701155107.AD0DF4E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:51:07 +1000 (Fri, 02 Jul 2004) New Revision: 2792 Added: tinysofa/snapshot/mktemp/current/sources/mktemp-1.5.tar.gz Removed: tinysofa/snapshot/mktemp/current/sources/mktemp-1.13-linux.patch tinysofa/snapshot/mktemp/current/sources/mktemp-1.13.tar.gz Modified: tinysofa/snapshot/mktemp/current/specs/mktemp.spec Log: - Sync with 2.0. - Added: - mktemp-1.5.tar.gz: - Removed: - mktemp-1.13-linux.patch: - mktemp-1.13.tar.gz: Deleted: tinysofa/snapshot/mktemp/current/sources/mktemp-1.13-linux.patch =================================================================== --- tinysofa/snapshot/mktemp/current/sources/mktemp-1.13-linux.patch 2004-07-01 15:51:03 UTC (rev 2791) +++ tinysofa/snapshot/mktemp/current/sources/mktemp-1.13-linux.patch 2004-07-01 15:51:07 UTC (rev 2792) @@ -1,110 +0,0 @@ -diff -Nru mktemp-1.13.orig/Makefile mktemp-1.13.new/Makefile ---- mktemp-1.13.orig/Makefile 1996-11-21 00:59:31.000000000 +0000 -+++ mktemp-1.13.new/Makefile 2003-12-05 20:47:15.000000000 +0000 -@@ -1,5 +1,16 @@ --# $OpenBSD: Makefile,v 1.1 1996/11/21 07:59:31 millert Exp $ -+CFLAGS+=$(RPM_OPT_FLAGS) -D_GNU_SOURCE - --PROG= mktemp -+CC=gcc -+PROG=mktemp -+mandir=/usr/share/man -+ -+all: $(PROG) -+ -+clean: -+ rm -f $(PROG) *.o -+ -+install: -+ mkdir -p $(ROOT)/bin $(ROOT)/$(mandir)/man1 -+ install -o 0 -g 0 -s -m 755 mktemp $(ROOT)/bin/mktemp -+ install -m 644 mktemp.1 $(ROOT)/$(mandir)/man1 - --.include -diff -Nru mktemp-1.13.orig/mktemp.c mktemp-1.13.new/mktemp.c ---- mktemp-1.13.orig/mktemp.c 2003-06-17 21:10:36.000000000 +0000 -+++ mktemp-1.13.new/mktemp.c 2003-12-05 20:45:58.000000000 +0000 -@@ -25,9 +25,26 @@ - #include - #include - #include --#include -+#include -+#include - --__dead void usage(void); -+void -+warn(char * message, ...) { -+ va_list arglist; -+ -+ va_start(arglist, message); -+ vfprintf(stderr, message, arglist); -+ fprintf(stderr, "\n"); -+ va_end(arglist); -+} -+ -+void -+warnx(char * message) { -+ warn(message); -+} -+ -+void -+usage(void); - - int - main(int argc, char *argv[]) -@@ -123,7 +140,7 @@ - exit(0); - } - --__dead void -+void - usage(void) - { - extern char *__progname; -@@ -132,3 +149,45 @@ - "Usage: %s [-dqtu] [-p prefix] [template]\n", __progname); - exit(1); - } -+ -+/* -+ glibc 2.1 compat-patch, -+ needed for updating RH 6.x (EE) - systems to kernel 2.4, -+ mkdtemp() was introduced with glibc 2.2 -+*/ -+#include -+#if ( __GLIBC__ < 2 ) || ( __GLIBC__ == 2 && __GLIBC_MINOR__ < 2 ) -+ -+// #include -+// #include -+// #include -+// #include -+ -+static char * mkdtemp (char *template) -+{ -+ char temp[strlen(template) + 1]; -+ int ret; -+ -+ while (1) { -+ strcpy(temp, template); -+ if (mktemp(temp) == NULL) { -+ return NULL; -+ } -+ ret = mkdir(temp, 0700); -+ /* success, return the name of the new directory */ -+ if (ret == 0) { -+ strcpy(template, temp); -+ return template; -+ } -+ /* failed because directory existed already -- just try again */ -+ if ((ret == -1) && (errno == EEXIST)) -+ continue; -+ /* failed for any other reason, return the name of the directory we tried to create */ -+ strcpy(template, temp); -+ return NULL; -+ } -+} -+ -+#endif -+ -+ Deleted: tinysofa/snapshot/mktemp/current/sources/mktemp-1.13.tar.gz =================================================================== (Binary files differ) Added: tinysofa/snapshot/mktemp/current/sources/mktemp-1.5.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/mktemp/current/sources/mktemp-1.5.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: tinysofa/snapshot/mktemp/current/specs/mktemp.spec =================================================================== --- tinysofa/snapshot/mktemp/current/specs/mktemp.spec 2004-07-01 15:51:03 UTC (rev 2791) +++ tinysofa/snapshot/mktemp/current/specs/mktemp.spec 2004-07-01 15:51:07 UTC (rev 2792) @@ -1,70 +1,115 @@ Summary: A small utility for safely making /tmp files. Name: mktemp -Version: 1.13 -Release: 5ts +Version: 1.5 +Release: 7ts +Epoch: 2 License: BSD -Group: tinysofa official -Source: ftp://ftp.openbsd.org/pub/OpenBSD/src/usr.bin/mktemp-%{version}.tar.gz -Patch0: mktemp-1.13-linux.patch -Url: http://www.openbsd.org -BuildRoot: %{_tmppath}/%{name}-root +Group: System Environment/Base +Source: ftp://ftp.cs.colorado.edu/pub/mktemp/%{name}-%{version}.tar.gz +Url: http://www.mktemp.org +Buildroot: %{_tmppath}/%{name}-%{version}-root %description -The mktemp utility takes a given file name template and overwrites -a portion of it to create a unique file name. This allows shell -scripts and other programs to safely create and use /tmp files. +The mktemp utility takes a given file name template and overwrites a +portion of it to create a unique file name. This allows shell scripts +and other programs to safely create and use /tmp files. Install the mktemp package if you need to use shell scripts or other programs which will create and use unique /tmp files. %prep -%setup -q -%patch0 -p1 +%setup -q -n mktemp-1.5 %build +%configure make %install -mkdir -p ${RPM_BUILD_ROOT}/bin ${RPM_BUILD_ROOT}/usr/share/man/man1 -install -m 755 mktemp ${RPM_BUILD_ROOT}/bin -install -m 644 mktemp.1 ${RPM_BUILD_ROOT}/usr/share/man/man1 +rm -rf $RPM_BUILD_ROOT +%makeinstall +mkdir -p ${RPM_BUILD_ROOT}/bin +mv $RPM_BUILD_ROOT%{_bindir}/mktemp $RPM_BUILD_ROOT/bin %clean -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT +rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) /bin/mktemp -/usr/share/man/man1/mktemp.1* +%{_mandir}/man1/mktemp.* %changelog -* Wed May 19 2004 tsintegrate 1.13-5ts -- current (1.13-4ts) integrated as 1.13-5ts for release 1.0-U1 +* Fri Feb 13 2004 Elliot Lee +- rebuilt -* Fri May 14 2004 Omar Kilani 1.13-4ts -- Make it build as non-root. +* Fri Nov 28 2003 Phil Knirsch 2:1.5-6 +- Bumped release and rebuilt. -* Fri Dec 5 2003 Erlend Midttun 1.13-1tr -- New upstream. +* Tue Nov 18 2003 Phil Knirsch 2:1.5-1 +- Fix tarball name and use Epoch instead for versioning. -* Mon Jun 23 2003 Erlend Midttun 1.5-9tr -- Added %defattr. +* Wed Oct 01 2003 Phil Knirsch 1.5.1-1 +- Update to latest version from www.mktemp.org. -* Wed Jun 18 2003 Erlend Midttun 1.5-8tr -- Big rebuild +* Wed Jun 04 2003 Elliot Lee +- rebuilt -* Mon Mar 24 2003 Erlend Midttun 1.5-7em -- Rebuilt against glibc 2.3.2. +* Wed Jan 22 2003 Tim Powers +- rebuilt -* Tue Jul 23 2002 Daniel Meyer 1.5-6dm -- rebuild for Trustix Secure Linux 2.0 +* Thu Nov 21 2002 Elliot Lee +- Pass __cc macro to make for cross-compilation -* Wed Jun 6 2001 Oystein Viggen -- Snarf RH updates +* Fri Jun 21 2002 Tim Powers +- automated rebuild -* Sun Nov 26 2000 Oystein Viggen -- Update from openbsd current cvs, and correct some stuff in the man page. +* Wed Jun 19 2002 Than Ngo 1.5-16 +- don't forcibly strip binaries +- clean up a patch file +* Thu May 23 2002 Tim Powers +- automated rebuild + +* Sun Mar 31 2002 Than Ngo 1.5-14 +- fix bug #62326 + +* Tue Feb 26 2002 Than Ngo 1.5-13 +- rebuild +- Copyrigh->License + +* Wed Jan 09 2002 Tim Powers +- automated rebuild + +* Tue May 8 2001 Than Ngo +- fix typo in mkdtemp, thanks to sagami at mbc.nifty.com (bug #39713) + +* Mon May 7 2001 Than Ngo +- fix manpage (bug #39392) +- cleanup specfile + +* Mon Apr 2 2001 Nalin Dahyabhai +- rework locally-supplied mkdtemp() to handle EEXIST better + +* Mon Feb 5 2001 Preston Brown +- -d option is now supported, remove manpage patch (#25969) + +* Thu Dec 14 2000 Helge Deller +- rewrite mkdtemp() from glibc2.2 for usage under glibc2.1 + +* Wed Jul 12 2000 Prospector +- automatic rebuild + +* Sat Jul 1 2000 Nalin Dahyabhai +- re-enable the -d option, because glibc provides a mkdtemp() function now + (except for ia64) + +* Sun Jun 18 2000 Matt Wilson +- FHS packaging +- fixed non root build + +* Mon Feb 7 2000 Bill Nottingham +- handle compressed manpages + * Mon Mar 22 1999 Erik Troan - sync'd man page with openbsd latest, and updated it for some Linux-specific changes @@ -80,3 +125,4 @@ * Wed Oct 01 1997 Erik Troan - moved to /bin + From svn at tinysofa.org Thu Jul 1 15:51:12 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:51:12 +1000 (EST) Subject: [tinysofa-svn] r2794 - in tinysofa/snapshot/mt-st/current: sources specs Message-ID: <20040701155112.9161B4E817D@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:51:12 +1000 (Fri, 02 Jul 2004) New Revision: 2794 Added: tinysofa/snapshot/mt-st/current/sources/mt-st-0.7-SDLT.patch tinysofa/snapshot/mt-st/current/sources/mt-st-0.7-config-files.patch Removed: tinysofa/snapshot/mt-st/current/sources/mt-st-0.7-SDLT220.patch Modified: tinysofa/snapshot/mt-st/current/specs/mt-st.spec Log: - Sync with 2.0. - Kept: - mt-st-0.6-redhat.patch: - mt-st-0.7.tar.gz: - Added: - mt-st-0.7-SDLT.patch: - mt-st-0.7-config-files.patch: - Removed: - mt-st-0.7-SDLT220.patch: Added: tinysofa/snapshot/mt-st/current/sources/mt-st-0.7-SDLT.patch =================================================================== --- tinysofa/snapshot/mt-st/current/sources/mt-st-0.7-SDLT.patch 2004-07-01 15:51:10 UTC (rev 2793) +++ tinysofa/snapshot/mt-st/current/sources/mt-st-0.7-SDLT.patch 2004-07-01 15:51:12 UTC (rev 2794) @@ -0,0 +1,11 @@ +--- mt-st-0.7/mt.c.orig Sat Feb 22 14:48:09 2003 ++++ mt-st-0.7/mt.c Sat Feb 22 14:50:21 2003 +@@ -220,6 +220,8 @@ + {0x41, "DLT 40GB"}, + {0x45, "QIC-3095-MC (TR-4)"}, + {0x47, "TR-5"}, ++ {0x48, "Quantum SDLT220"}, ++ {0x49, "Quantum SDLT320"}, + {0x80, "DLT 15GB uncomp. or Ecrix"}, + {0x81, "DLT 15GB compressed"}, + {0x82, "DLT 20GB uncompressed"}, Deleted: tinysofa/snapshot/mt-st/current/sources/mt-st-0.7-SDLT220.patch =================================================================== --- tinysofa/snapshot/mt-st/current/sources/mt-st-0.7-SDLT220.patch 2004-07-01 15:51:10 UTC (rev 2793) +++ tinysofa/snapshot/mt-st/current/sources/mt-st-0.7-SDLT220.patch 2004-07-01 15:51:12 UTC (rev 2794) @@ -1,10 +0,0 @@ ---- mt-st-0.7/mt.c.foo Wed Feb 20 12:26:35 2002 -+++ mt-st-0.7/mt.c Wed Feb 20 12:27:01 2002 -@@ -220,6 +220,7 @@ - {0x41, "DLT 40GB"}, - {0x45, "QIC-3095-MC (TR-4)"}, - {0x47, "TR-5"}, -+ {0x48, "Quantum SDLT220"}, - {0x80, "DLT 15GB uncomp. or Ecrix"}, - {0x81, "DLT 15GB compressed"}, - {0x82, "DLT 20GB uncompressed"}, Added: tinysofa/snapshot/mt-st/current/sources/mt-st-0.7-config-files.patch =================================================================== --- tinysofa/snapshot/mt-st/current/sources/mt-st-0.7-config-files.patch 2004-07-01 15:51:10 UTC (rev 2793) +++ tinysofa/snapshot/mt-st/current/sources/mt-st-0.7-config-files.patch 2004-07-01 15:51:12 UTC (rev 2794) @@ -0,0 +1,148 @@ +--- mt-st-0.7/stinit.def.examples.orig 2003-05-26 18:35:28.000000000 +0200 ++++ mt-st-0.7/stinit.def.examples 2003-05-26 18:36:33.000000000 +0200 +@@ -56,3 +56,145 @@ + mode3 blocksize=0 density=1 # 800 bpi + } + ++# DLT2000 / 2000XT ++manufacturer="QUANTUM" model = "DLT2000" { ++scsi2logical=1 ++can-bsr ++auto-lock=0 ++two-fms=0 ++drive-buffering=1 ++buffer-writes ++read-ahead=1 ++async-writes=1 ++can-partitions=0 ++fast-mteom=1 ++# ++# If your stinit supports the timeouts: ++timeout=3600 # 1 hour ++long-timeout=14400 # 4 hours ++# ++mode1 blocksize=0 density=0x81 # 10GB + compression on DLTtape III, 15+ with DLTtape IIIXT in 2000XT ++mode2 blocksize=0 density=0x80 # 10GB, no compression on DLTtape III, 15 with DLTtape IIIXT in 2000XT ++mode3 blocksize=0 density=0x18 # 6GB, compression not available, on DLTtape III ++mode4 blocksize=0 density=0x17 #2.6GB, compression not available, on DLTtape III ++} ++ ++# DLT4000 ++manufacturer="QUANTUM" model = "DLT4000" { ++scsi2logical=1 ++can-bsr ++auto-lock=0 ++two-fms=0 ++drive-buffering=1 ++buffer-writes ++read-ahead=1 ++async-writes=1 ++can-partitions=0 ++fast-mteom=1 ++# ++# If your stinit supports the timeouts: ++timeout=3600 # 1 hour ++long-timeout=14400 # 4 hours ++# ++# Drive is backwards compatible, use older modes (e.g. from above) as required ++mode1 blocksize=0 density=0x83 # 20GB + compression ++mode2 blocksize=0 density=0x82 # 20GB, no compression ++mode3 blocksize=0 density=0x81 # 10GB + compression (DLT2000 mode) with DLTtape III, 15+ with DLTtape IIIXT in 2000XT ++mode4 blocksize=0 density=0x80 # 10GB, no compression (DLT2000 mode) with DLTtape III, 15 with DLTtape IIIXT in 2000XT ++} ++ ++# DLT7000 ++manufacturer="QUANTUM" model = "DLT7000" { ++scsi2logical=1 ++can-bsr ++auto-lock=0 ++two-fms=0 ++drive-buffering=1 ++buffer-writes ++read-ahead=1 ++async-writes=1 ++can-partitions=0 ++fast-mteom=1 ++# ++# If your stinit supports the timeouts: ++timeout=3600 # 1 hour ++long-timeout=14400 # 4 hours ++# ++# Drive is backwards compatible, use older modes (e.g. from above) as required. ++mode1 blocksize=0 density=0x85 # 35GB + compression ++mode2 blocksize=0 density=0x84 # 35GB, no compression ++mode3 blocksize=0 density=0x83 # 20GB + compression (DLT4000 mode) ++mode4 blocksize=0 density=0x82 # 20GB, no compression (DLT4000 mode) ++} ++ ++# DLT8000 ++manufacturer="QUANTUM" model = "DLT8000" { ++scsi2logical=1 ++can-bsr=1 ++auto-lock=0 ++two-fms=0 ++drive-buffering=1 ++buffer-writes ++read-ahead=1 ++async-writes=1 ++can-partitions=0 ++fast-mteom=1 ++# ++# If your stinit supports the timeouts: ++timeout=3600 # 1 hour ++long-timeout=14400 # 4 hours ++# ++# Drive is backwards compatible to DLT7000, use older modes (e.g. from above) as required. Modes <10GB (<0x19) not supported! ++mode1 blocksize=0 density=0x89 # 40GB + compression ++mode2 blocksize=0 density=0x88 # 40GB, no compression ++mode3 blocksize=0 density=0x85 # 35GB + compression (DLT7000 mode) ++mode4 blocksize=0 density=0x84 # 35GB, no compression (DLT7000 mode) ++} ++ ++ ++# SDLT220 ++manufacturer="QUANTUM" model = "SuperDLT1" { ++scsi2logical=1 ++can-bsr=1 ++auto-lock=0 ++two-fms=0 ++drive-buffering=1 ++buffer-writes ++read-ahead=1 ++async-writes=1 ++can-partitions=0 ++fast-mteom=1 ++# ++# If your stinit supports the timeouts: ++timeout=3600 # 1 hour ++long-timeout=14400 # 4 hours ++# ++# Drive is backwards read compatible to DLT4000/7000/8000. Mode settings are only required for writing, so no need to define any other modes here. ++mode1 blocksize=0 density=0x48 compression=1 # 110 GB + compression ++mode2 blocksize=0 density=0x48 compression=0 # 110 GB, no ompression ++} ++ ++# SDLT320 ++manufacturer="QUANTUM" model = "SDLT320" { ++scsi2logical=1 ++can-bsr=1 ++auto-lock=0 ++two-fms=0 ++drive-buffering=1 ++buffer-writes ++read-ahead=1 ++async-writes=1 ++can-partitions=0 ++fast-mteom=1 ++# ++# If your stinit supports the timeouts: ++timeout=3600 # 1 hour ++long-timeout=14400 # 4 hours ++# ++# Drive is backwards write compatible to SDLT220 and read compatible to DLT4000/7000/8000. Mode settings are only required for writing, so we need only the SDL220/320 modes here ++mode1 blocksize=0 density=0x49 compression=1 # 160 GB + compression ++mode2 blocksize=0 density=0x49 compression=0 # 160 GB, no ompression ++mode3 blocksize=0 density=0x48 compression=1 # 110 GB + compression ++mode4 blocksize=0 density=0x48 compression=0 # 110 GB, no ompression ++} ++ Modified: tinysofa/snapshot/mt-st/current/specs/mt-st.spec =================================================================== --- tinysofa/snapshot/mt-st/current/specs/mt-st.spec 2004-07-01 15:51:10 UTC (rev 2793) +++ tinysofa/snapshot/mt-st/current/specs/mt-st.spec 2004-07-01 15:51:12 UTC (rev 2794) @@ -1,13 +1,14 @@ Summary: Install mt-st if you need a tool to control tape drives. Name: mt-st Version: 0.7 -Release: 8ts +Release: 13.1ts License: BSD -Group: tinysofa official +Group: Applications/System Source: ftp://metalab.unc.edu/pub/Linux/system/backup/mt-st-%{version}.tar.gz Patch0: mt-st-0.6-redhat.patch -Patch1: mt-st-0.7-SDLT220.patch -BuildRoot: %{_tmppath}/%{name}-root +Patch1: mt-st-0.7-SDLT.patch +Patch2: mt-st-0.7-config-files.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-root %description The mt-st package contains the mt and st tape drive management @@ -18,19 +19,20 @@ %prep %setup -q -%patch0 -p1 -%patch1 -p1 +%patch0 -p1 -b .redhat +%patch1 -p1 -b .sdlt +%patch2 -p1 -b .configfiles %build make CFLAGS="$RPM_OPT_FLAGS -Wall" %install -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf "$RPM_BUILD_ROOT" +rm -rf ${RPM_BUILD_ROOT} make install mandir=%{_mandir} %clean -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf "$RPM_BUILD_ROOT" +rm -rf ${RPM_BUILD_ROOT} %files %defattr(-,root,root) @@ -40,17 +42,94 @@ %{_mandir}/man[18]/* %changelog -* Wed May 19 2004 tsintegrate 0.7-8ts -- current (0.7-7ts) integrated as 0.7-8ts for release 1.0-U1 +* Fri Feb 13 2004 Elliot Lee +- rebuilt -* Fri Dec 12 2003 Erlend Midttun 0.7-4tr -- Big rebuild +* Wed Jun 04 2003 Elliot Lee +- rebuilt -* Wed Jun 18 2003 Erlend Midttun 0.7-3tr -- Big rebuild +* Mon May 26 2003 Than Ngo 0.7-11.1 +- add config file for Quantum DLT drive bug #91550 -* Mon Mar 24 2003 Erlend Midttun 0.7-2em -- Rebuilt against glibc 2.3.2. +* Mon Feb 24 2003 Elliot Lee +- rebuilt -* Mon Aug 19 2002 Gerald Dachs 0.7-1gd -- .spec is based on RawHide .spec +* Sat Feb 22 2003 Than Ngo 0.7-9 +- add density code for Quantum SDLT320 from tibbs at math.uh.edu (#84843) + +* Wed Jan 22 2003 Tim Powers +- rebuilt + +* Wed Dec 11 2002 Tim Powers 0.7-7 +- rebuild on all arches + +* Fri Jun 21 2002 Tim Powers +- automated rebuild + +* Wed Jun 19 2002 Than Ngo 0.7-5 +- don't forcibly strip binaries +- clean up a patch file + +* Thu May 23 2002 Tim Powers +- automated rebuild + +* Tue Feb 26 2002 Than Ngo 0.7-3 +- rebuild + +* Wed Feb 20 2002 Bernhard Rosenkraenzer 0.7-2 +- Add density code 0x48 for Quantum SDLT220 tape drive (#59442) + +* Tue Feb 19 2002 Bernhard Rosenkraenzer 0.7-1 +- Update to 0.7 + +* Wed Jan 09 2002 Tim Powers +- automated rebuild + +* Tue Apr 24 2001 Than Ngo +- update to 0.6, supports all ioctls up to kernel 2.4.0 + +* Thu Aug 17 2000 Jeff Johnson +- summaries from specspo. + +* Wed Jul 12 2000 Prospector +- automatic rebuild + +* Wed Jun 14 2000 Jeff Johnson +- FHS packaging. + +* Sat Apr 15 2000 Jeff Johnson +- permit leading whitespace in config file. +- cortrect spelling error. + +* Mon Feb 7 2000 Bill Nottingham +- handle compressed manpages + +* Fri Jan 14 2000 Jeff Johnson +- rebuild for Red Hat 6.2. + +* Sun Sep 5 1999 Jeff Johnson +- enable "datcompression" command (#3654). + +* Sun Mar 21 1999 Cristian Gafton +- auto rebuild in the new build environment (release 3) + +* Wed Feb 10 1999 Preston Brown +- upgrade to .5b, which fixes some cmd. line arg issues (bugzilla #18) + +* Thu Jul 23 1998 Jeff Johnson +- package for 5.2. + +* Sun Jul 19 1998 Andrea Borgia +- updated to version 0.5 +- removed the touch to force the build: no binaries are included! +- added to the docs: README.stinit, stinit.def.examples +- made buildroot capable + +* Mon Apr 27 1998 Prospector System +- translations modified for de, fr, tr + +* Mon Oct 20 1997 Donnie Barnes +- spec file cleanups + +* Thu Jun 19 1997 Erik Troan +- built against glibc From svn at tinysofa.org Thu Jul 1 15:51:10 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:51:10 +1000 (EST) Subject: [tinysofa-svn] r2793 - in tinysofa/snapshot/module-init-tools/current: sources specs Message-ID: <20040701155110.86C564E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:51:10 +1000 (Fri, 02 Jul 2004) New Revision: 2793 Added: tinysofa/snapshot/module-init-tools/current/sources/modprobe.conf.dist tinysofa/snapshot/module-init-tools/current/sources/module-init-tools-defconfig.patch Removed: tinysofa/snapshot/module-init-tools/current/sources/kmod.crond Modified: tinysofa/snapshot/module-init-tools/current/specs/module-init-tools.spec Log: - Sync with 2.0. - Kept: - module-init-tools-3.0.tar.bz2: - Added: - modprobe.conf.dist: - module-init-tools-defconfig.patch: - Removed: - kmod.crond: Deleted: tinysofa/snapshot/module-init-tools/current/sources/kmod.crond =================================================================== --- tinysofa/snapshot/module-init-tools/current/sources/kmod.crond 2004-07-01 15:51:07 UTC (rev 2792) +++ tinysofa/snapshot/module-init-tools/current/sources/kmod.crond 2004-07-01 15:51:10 UTC (rev 2793) @@ -1 +0,0 @@ -#!/sbin/rmmod -as Added: tinysofa/snapshot/module-init-tools/current/sources/modprobe.conf.dist =================================================================== --- tinysofa/snapshot/module-init-tools/current/sources/modprobe.conf.dist 2004-07-01 15:51:07 UTC (rev 2792) +++ tinysofa/snapshot/module-init-tools/current/sources/modprobe.conf.dist 2004-07-01 15:51:10 UTC (rev 2793) @@ -0,0 +1,161 @@ +# default modutils aliases +alias binfmt-204 binfmt_aout +alias binfmt-263 binfmt_aout +alias binfmt-264 binfmt_aout +alias binfmt-267 binfmt_aout +alias binfmt-387 binfmt_aout +alias block-major-1-* rd +alias block-major-3-* ide-probe-mod +alias block-major-8-* sd_mod +alias block-major-9-* md +alias block-major-11-* sr_mod +alias block-major-13-* xd +alias block-major-15-* cdu31a +alias block-major-16-* gscd +alias block-major-17-* optcd +alias block-major-18-* sjcd +alias block-major-20-* mcdx +alias block-major-22-* ide-probe-mod +alias block-major-23-* mcd +alias block-major-24-* sonycd535 +alias block-major-25-* sbpcd +alias block-major-26-* sbpcd +alias block-major-27-* sbpcd +alias block-major-29-* aztcd +alias block-major-32-* cm206 +alias block-major-33-* ide-probe-mod +alias block-major-34-* ide-probe-mod +alias block-major-37-* ide-tape +alias block-major-44-* ftl +alias block-major-46-* pcd +alias block-major-47-* pf +alias block-major-56-* ide-probe-mod +alias block-major-57-* ide-probe-mod +alias block-major-88-* ide-probe-mod +alias block-major-89-* ide-probe-mod +alias block-major-90-* ide-probe-mod +alias block-major-91-* ide-probe-mod +alias block-major-93-* nftl +alias block-major-97-* pg +alias block-major-113-* viocd +alias char-major-4-* serial +alias char-major-5-* serial +alias char-major-9-* st +alias char-major-10-2 msbusmouse +alias char-major-10-3 atixlmouse +alias char-major-10-135 rtc +alias char-major-10-139 openprom +alias char-major-10-157 applicom +alias char-major-10-175 agpgart +alias char-major-10-250 hci_vhci +alias char-major-13-* input +alias char-major-13-0 joydev +alias char-major-13-32 mousedev +alias char-major-19-* cyclades +alias char-major-20-* cyclades +alias char-major-22-* pcxx +alias char-major-23-* pcxx +alias char-major-27-* zftape +alias char-major-34-* scc +alias char-major-35-* tclmidi +alias char-major-36-* netlink +alias char-major-48-* riscom8 +alias char-major-49-* riscom8 +alias char-major-57-* esp +alias char-major-58-* esp +alias char-major-63-* kdebug +alias char-major-90-* mtdchar +alias char-major-96-* pt +alias char-major-107-* 3dfx +alias char-major-109-* lvm-mod +alias char-major-195-* NVdriver +alias char-major-188-* usbserial +alias char-major-200-* vxspec +alias char-major-206-* osst +alias char-major-216-* rfcomm +alias dos msdos +alias dummy0 dummy +alias dummy1 dummy +alias iso9660 isofs +alias net-pf-1 unix +alias net-pf-2 ipv4 +alias net-pf-17 af_packet +alias netalias-2 ip_alias +alias irlan0 irlan +alias irda-dongle-0 tekram +alias irda-dongle-1 esi +alias irda-dongle-2 actisys +alias irda-dongle-3 actisys +alias irda-dongle-4 girbil +alias irda-dongle-5 litelink +alias irda-dongle-6 airport +alias irda-dongle-7 old_belkin +alias plip0 plip +alias plip1 plip +alias tunl0 ipip +alias cipcb0 cipcb +alias cipcb1 cipcb +alias cipcb2 cipcb +alias cipcb3 cipcb +alias slip0 slip +alias slip1 slip +alias tty-ldisc-1 slip +alias tty-ldisc-3 ppp_async +alias tty-ldisc-11 irtty-sir +alias tty-ldisc-14 ppp_synctty +alias tty-ldisc-15 hci_uart +alias ppp-compress-18 ppp_mppe +install ppp-compress-21 /bin/true +alias ppp-compress-24 ppp_deflate +alias ppp-compress-26 ppp_deflate +alias parport_lowlevel parport_pc +alias usbdevfs usbcore +alias xfrm-type-2-50 esp4 +alias xfrm-type-2-51 ah4 +alias xfrm-type-2-108 ipcomp +alias xfrm-type-10-50 esp6 +alias xfrm-type-10-51 ah6 +alias xfrm-type-10-108 ipcomp6 +alias cipher_null crypto_null +alias digest_null crypto_null +alias compress_null crypto_null +alias sha384 sha512 +install binfmt-0000 /bin/true +install binfmt_misc /sbin/modprobe --first-time --ignore-install binfmt_misc && { /bin/mount -t binfmt_misc none /proc/sys/fs/binfmt_misc > /dev/null 2>&1 || :; } +install nfsd /sbin/modprobe --first-time --ignore-install nfsd && { /bin/mount -t nfsd nfsd /proc/fs/nfsd > /dev/null 2>&1 || :; } +install sunrpc /sbin/modprobe --first-time --ignore-install sunrpc && { /bin/mount -t rpc_pipefs sunrpc /var/lib/nfs/rpc_pipefs > /dev/null 2>&1 || :; } +install char-major-10 /bin/true +install char-major-10-1 /bin/true +install dummy0 /sbin/modprobe -o dummy0 --ignore-install dummy +install dummy1 /sbin/modprobe -o dummy1 --ignore-install dummy +install net-pf-19 /bin/true +install net-pf-3 /bin/true +install net-pf-6 /bin/true +install ov518_decomp { /sbin/modprobe ov511; } ; /sbin/modprobe --first-time --ignore-install ov518_decomp +install scsi_hostadapter /bin/true +install usbmouse /sbin/modprobe --first-time --ignore-install usbmouse && { /sbin/modprobe hid; /bin/true; } +remove binfmt_misc { /bin/umount /proc/sys/fs/binfmt_misc > /dev/null 2>&1 || :; } ; /sbin/modprobe -r --first-time --ignore-remove binfmt_misc +remove ov518_decomp /sbin/modprobe -r --first-time --ignore-remove ov518_decomp && { /sbin/modprobe -r ov511; /bin/true; } +remove usbmouse { /sbin/modprobe -r hid; } ; /sbin/modprobe -r --first-time --ignore-remove usbmouse +remove sunrpc { /bin/umount /var/lib/nfs/rpc_pipefs > /dev/null 2>&1 || :; } ; /sbin/modprobe -r --ignore-remove sunrpc +remove nfsd { /bin/umount /proc/fs/nfsd > /dev/null 2>&1 || :; } ; /sbin/modprobe -r --first-time --ignore-remove nfsd + + +alias usb-uhci uhci-hcd +alias usb-ohci ohci-hcd +alias uhci uhci-hcd + +alias char-major-116-* snd +alias sound-service-*-0 snd-mixer-oss +alias sound-service-*-1 snd-seq-oss +alias sound-service-*-3 snd-pcm-oss +alias sound-service-*-8 snd-seq-oss +alias sound-service-*-12 snd-pcm-oss + +install sound-slot-* /sbin/modprobe snd-card-${MODPROBE_MODULE##sound[_-]slot[_-]} + +alias nfs4 nfs +alias rpc_pipefs sunrpc +alias rpc_svc_gss_pipefs sunrpc + +install eth1394 /bin/true Added: tinysofa/snapshot/module-init-tools/current/sources/module-init-tools-defconfig.patch =================================================================== --- tinysofa/snapshot/module-init-tools/current/sources/module-init-tools-defconfig.patch 2004-07-01 15:51:07 UTC (rev 2792) +++ tinysofa/snapshot/module-init-tools/current/sources/module-init-tools-defconfig.patch 2004-07-01 15:51:10 UTC (rev 2793) @@ -0,0 +1,33 @@ +--- module-init-tools-3.0-pre10/modprobe.c.orig 2004-02-12 01:56:34.000000000 -0500 ++++ module-init-tools-3.0-pre10/modprobe.c 2004-02-24 00:11:15.097495564 -0500 +@@ -58,6 +61,10 @@ + #define MODULE_DIR "/lib/modules" + #endif + ++#define DEFAULT_CONFIG "/etc/modprobe.conf" ++#define DIST_CONFIG "/etc/modprobe.conf.dist" ++#define MODPROBE_DEVFSD_CONF "/etc/modprobe.devfs" ++ + typedef void (*errfn_t)(const char *fmt, ...); + + /* Do we use syslog or stderr for messages? */ +@@ -919,6 +927,10 @@ + char *result = NULL; + unsigned int linenum = 0; + ++ if (!strcmp(filename, DEFAULT_CONFIG)) ++ result = read_config(DIST_CONFIG, 1, name, ++ dump_only, removing, ++ options, commands); + cfile = fopen(filename, "r"); + if (!cfile) { + if (mustload) +@@ -1084,8 +1096,6 @@ + { "first-time", 0, NULL, 3 }, + { NULL, 0, NULL, 0 } }; + +-#define DEFAULT_CONFIG "/etc/modprobe.conf" +-#define MODPROBE_DEVFSD_CONF "/etc/modprobe.devfs" + + /* This is a horrible hack to allow devfsd, which calls modprobe with + -C /etc/modules.conf or /etc/modules.devfs, to work. FIXME. */ Modified: tinysofa/snapshot/module-init-tools/current/specs/module-init-tools.spec =================================================================== --- tinysofa/snapshot/module-init-tools/current/specs/module-init-tools.spec 2004-07-01 15:51:07 UTC (rev 2792) +++ tinysofa/snapshot/module-init-tools/current/specs/module-init-tools.spec 2004-07-01 15:51:10 UTC (rev 2793) @@ -1,102 +1,593 @@ -Summary: The kernel module init tools. +%define mitver 3.0 + +Summary: Kernel module management utilities. Name: module-init-tools Version: 3.0 -Release: 4ts -License: GPL -Group: tinysofa official -Source: http://kernel.us.themoes.org/pub/linux/utils/kernel/module-init-tools/%{name}-%{version}.tar.bz2 -Source2: kmod.crond -BuildRoot: %{_tmppath}/%{name}-root -Prereq: /sbin/chkconfig -Requires: crond -PreReq: modutils >= 2.4.26-2tr -PreReq: coreutils, bash, mktemp, grep, sed, awk +Release: 1ts +Copyright: GPL +Group: System Environment/Kernel +Source: http://ftp.kernel.org/pub/linux/utils/kernel/module-init-tools/module-init-tools-%{mitver}.tar.bz2 +Source1: modprobe.conf.dist +Patch1: module-init-tools-defconfig.patch +Exclusiveos: Linux +Prereq: /sbin/chkconfig sh-utils +Obsoletes: modules modutils-devel modutils +Provides: modutils = %{version} +BuildPrereq: zlib-devel +BuildRoot: %{_tmppath}/%{name}-%{version}-root %description -The module-init-tools package includes programs for managing automatic -loading and unloading of modules under 2.6 kernels, with support for older -kenrnels using the old modutils package, as well as other module management -programs. Examples of loaded and unloaded modules are device drivers and -filesystems, as well as some other things. +The modutils package includes various programs needed for automatic +loading and unloading of modules under 2.2 and later kernels, as well +as other module management programs. Device drivers and filesystems +are two examples of loaded and unloaded modules. %prep -%setup -q +%setup -q -n module-init-tools-%{mitver} +%patch1 -p1 %build -CFLAGS="$RPM_OPT_FLAGS" ./configure \ - --disable-combined \ - --enable-insmod-static \ - --mandir=%{_mandir} \ - --prefix=%{_prefix} \ - --exec-prefix=/ -make +# insmod.static (diet) +%ifarch i386 +if [ -x /usr/bin/diet ]; then + export CC="diet gcc" +fi +%endif +export CFLAGS="-Os -g -DCONFIG_NO_BACKWARDS_COMPAT=1" +%configure --enable-zlib +make insmod.static +cp insmod.static insmod-static + + +export CC=gcc +export CFLAGS="$RPM_OPT_FLAGS -DCONFIG_NO_BACKWARDS_COMPAT=1" + +make distclean + +%configure --enable-zlib +make + %install -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT/etc/cron.hourly -mkdir -p $RPM_BUILD_ROOT/{%{_mandir}/man{1,2,8},sbin} -make mandir=%{_mandir} DESTDIR=$RPM_BUILD_ROOT install install-man -mv $RPM_BUILD_ROOT/bin/lsmod $RPM_BUILD_ROOT/sbin/ +rm -rf $RPM_BUILD_ROOT +%makeinstall sbindir=$RPM_BUILD_ROOT/sbin -install -m 755 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/cron.hourly/kmod -touch $RPM_BUILD_ROOT%{_sysconfdir}/modprobe.conf +install -m 755 generate-modprobe.conf \ + $RPM_BUILD_ROOT/sbin +mkdir -p $RPM_BUILD_ROOT/etc +install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/etc/modprobe.conf.dist + +find $RPM_BUILD_ROOT/sbin/ -name '*.static' -exec rm {} \; + +mv $RPM_BUILD_ROOT/%{_bindir}/lsmod $RPM_BUILD_ROOT/sbin + +install -m 755 insmod-static $RPM_BUILD_ROOT/sbin/insmod.static + %clean -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT +rm -rf $RPM_BUILD_ROOT %post -if [ ! -s /etc/modprobe.conf ]; then - MODPROBE_CONF=/etc/modprobe.conf -elif [ -e /etc/modprobe.conf.rpmnew ]; then - MODPROBE_CONF=/etc/modprobe.conf.rpmnew +# get rid of the old installations on upgrade +if [ -x /etc/rc.d/init.d/kerneld ] ; then + /sbin/chkconfig --del kerneld fi - -if [ -s /etc/modules.conf -a -n "$MODPROBE_CONF" ]; then - echo '# This file is autogenerated from /etc/modules.conf using generate-modprobe.conf comma -nd' >> $MODPROBE_CONF - echo >> $MODPROBE_CONF - /sbin/generate-modprobe.conf >> $MODPROBE_CONF 2> /dev/null +if [ -f /etc/conf.modules -a ! -f /etc/modules.conf ] ; then + mv -f /etc/conf.modules /etc/modules.conf fi -exit 0 +if [ -f /etc/modules.conf -a ! -f /etc/modprobe.conf ] ; then + echo "# Note: for use under 2.4, changes must also be made to modules.conf!" >/etc/modprobe.conf + /sbin/generate-modprobe.conf --stdin < /etc/modules.conf >> /etc/modprobe.conf 2>/dev/null + chmod 644 /etc/modprobe.conf + echo "# Note: for use under 2.6, changes must also be made to modprobe.conf!" >> /etc/modules.conf +fi %files %defattr(-,root,root) +/etc/modprobe.conf.dist /sbin/* %{_mandir}/*/* -%{_sysconfdir}/cron.hourly/kmod -%ghost %{_sysconfdir}/modprobe.conf %changelog -* Wed May 19 2004 tsintegrate 3.0-4ts -- current (3.0-4jh) integrated as 3.0-4ts for release 1.0-U1 +* Fri Jun 4 2004 Bill Nottingham 3.0-0.pre10.1 +- remove back compat, rename to module-init-tools -* Tue May 11 2004 Jaakko Heinonen 3.0-4jh -- fixed the location of the cron script (fcron doesn't support cron.d) +* Wed May 5 2004 Bill Nottingham 2.4.26-16 +- fix sound restoring on module load when done via OSS compat -* Fri Apr 02 2004 Omar Kilani 3.0-3ts -- Add exit 0 to post to fix error during anaconda install. +* Thu Apr 15 2004 Bill Nottingham 2.4.26-15 +- don't buildreq autoconf-2.13 (#116770) +- sound-slot-0/snd-card-0 hacking-around -* Mon Mar 15 2004 Chr. Toldnes 3.0-1tr -- cleanup and rebuild +* Mon Mar 29 2004 Bill Nottingham 2.4.26-14 +- modinfo: use new modinfo if passed .ko -* Tue Mar 9 2004 Omar Kilani 3.0-1ok -- New upstream. -- Fixed the spec file for pre / non-pre releases. +* Tue Mar 23 2004 Steve Dickson +- Added the mounting of /proc/fs/nfsd to modprobe.conf.dist + so it gets mounted when nfsd is loaded. -* Tue Feb 10 2004 Chr. Toldnes 3.0-pre5-2ct -- Added a whole lot of PreReqs to make %post modprobe.conf generation work - also during install. +* Tue Mar 16 2004 Steve Dickson +- /var/lib/nfs/rpc_pipefs not /var/lib/rpc_pipes should be + mounted when sunrpc is loaded. -* Tue Jan 20 2004 Tor Hveem 3.0-pre5-1th -- New upstream version -- Generate modprobe.conf in %post if not -- Include missing lsmod binary +* Fri Mar 12 2004 Steve Dickson +- umount rpc_pipefs when sunrpc is unloaded -* Tue Jan 20 2004 Chr. Toldnes 0.9.14-3ct -- package cleanups +* Thu Mar 11 2004 Bill Nottingham 2.4.26-9 +- add nfsv4 aliases to modprobe.conf.dist +- clean out upstreamed aliases in modprobe.conf.dist +- mount rpc_pipefs when sunrpc is loaded -* Wed Dec 10 2003 Gerald Dachs 0.9.14-2gd -- updated modutils to version 2.4.26 +* Fri Mar 5 2004 Bill Nottingham 2.4.26-7 +- blacklist eth1394 (#117383) -* Tue Dec 9 2003 Gerald Dachs 0.9.14-1gd -- initial build +* Mon Feb 23 2004 Bill Nottingham 2.4.26-6 +- update module-init-tools to 3.0pre10 +- fix modinfo (#116305) +- always include /etc/modprobe.conf.dist (don't require the line in modprobe.conf) +- ship a static modprobe.conf.dist, don't generate it at build time +- clean up modprobe.conf.dist a little (#113772, #113768) + +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Wed Feb 11 2004 Bill Nottingham +- don't use trampolines in insmod, working around #106005 + +* Thu Jan 29 2004 Bill Nottingham 2.4.26-3 +- fix irda (#114268), bluetooth (#114019) and alsa aliases + +* Tue Dec 16 2003 Bill Nottingham 2.4.26-2 +- add OSS compat ALSA module aliases for 2.6 + +* Mon Dec 15 2003 Bill Nottingham 2.4.26-1 +- update to 2.4.26 +- switch around man pages; the module-init-tools man pages are now + the default +- add backwards compat usb aliases for the simple case +- add some commentary to modules.conf/modprobe.conf on conversion +- modutils-devel goes away + +* Tue Oct 7 2003 Bill Nottingham 2.4.25-13 +- fix handling of updates path (#106482) + +* Tue Sep 30 2003 Bill Nottingham 2.4.25-12 +- add modprobe.conf(5) (#105760, ) + +* Tue Sep 30 2003 Bill Nottingham 2.4.25-11 +- update to module-init-tools-0.9.14, enable zlib, adjust patches + +* Thu Sep 25 2003 Bill Nottingham 2.4.25-10 +- provide module-init-tools + +* Mon Sep 8 2003 Bill Nottingham 2.4.25-9 +- fix bluetooth typo (#88859) +- add viocd alias (#89232) + +* Mon Jul 7 2003 Bill Nottingham 2.4.25-8 +- fix leak in module-init-tools-depmod () +- look in /lib/modules/`uname -r`/updates for modules + +* Fri Jun 20 2003 Bill Nottingham 2.4.25-6 +- fix modprobe -C when there is no modules.dep file + +* Mon Jun 9 2003 Bill Nottingham 2.4.25-5 +- add IPSEC encryption & auth aliases +- fix alias + +* Wed Jun 04 2003 Elliot Lee +- rebuilt + +* Wed May 28 2003 Bill Nottingham 2.4.25-2 +- add joystick alias (#91309) +- add alias for af_key for IPSEC +- update module-init-tools to 0.9.12 +- ship a modprobe.conf.dist with the aliases that are built into 2.4 + modutils +- generate a modprobe.conf if needed on install + +* Fri Apr 25 2003 Bill Nottingham 2.4.25-1 +- update to 2.4.25 +- add floppy alias back (#89097) +- add bluetooth aliases (#88859) + +* Tue Apr 3 2003 Bill Nottingham 2.4.22-10 +- quick hack fix for depmod so the installer will work + +* Wed Apr 2 2003 Bill Nottingham 2.4.22-9 +- include support for 2.5/2.6 kernels + +* Tue Feb 11 2003 Bill Nottingham 2.4.22-8 +- alias block-major-2 off, we never ship it as a module (#71036) + +* Mon Feb 3 2003 Bill Nottingham 2.4.22-7 +- make sure we don't use diet anywhere but x86, even if it's lying around +- fix zlib linkage, for real +- switch ftape alias (#7674) + +* Fri Jan 31 2003 Florian La Roche +- add patch for genksyms to not segfault in drivers/char/joystick + for mainframe kernel builds + +* Wed Jan 22 2003 Tim Powers +- rebuilt + +* Thu Jan 16 2003 Bill Nottingham 2.4.22-4 +- fix zlib static linkage patch + +* Tue Dec 31 2002 Bill Nottingham 2.4.22-3 +- add alias for tun/tap (#80491) + +* Mon Dec 30 2002 Florian La Roche +- add an IBM patch to also load 64bit kernel modules via a 31bit compiled app + +* Mon Nov 25 2002 Bill Nottingham 2.4.22-1 +- update to 2.4.22 +- don't link zlib dynamically + +* Tue Nov 19 2002 Bill Nottingham 2.4.21-1 +- update to 2.4.21 +- enable zlib for insmod.static, normal + +* Fri Aug 16 2002 Bill Nottingham 2.4.18-2 +- add check for gcc version mismatch between kernel/modules + () + +* Tue Jul 23 2002 Bill Nottingham 2.4.18-1 +- update to 2.4.18 +- add some more default aliases +- fix checking of kernel version + +* Mon Jun 24 2002 Bill Nottingham 2.4.16-1 +- update to 2.4.16 + +* Fri Jun 21 2002 Tim Powers +- automated rebuild + +* Thu May 23 2002 Tim Powers +- automated rebuild + +* Tue Apr 16 2002 Bill Nottingham 2.4.14-3 +- force kallsyms on modules + +* Mon Apr 1 2002 Bill Nottingham 2.4.14-2 +- fix support for symbols that contain _R () + +* Sat Mar 2 2002 Bill Nottingham 2.4.14-1 +- update to 2.4.14 +- take out genksyms.old, no more buildprereq for gperf + +* Thu Feb 28 2002 Bill Nottingham 2.4.13-7/8 +- rebuild against diet +- reenable rmmod in the library version, shrink it too + +* Wed Feb 27 2002 Bill Nottingham 2.4.13-5 +- rebuild in earlier environments + +* Sun Feb 10 2002 Bill Nottingham 2.4.13-4 +- various space shavings in -devel + +* Fri Feb 8 2002 Bill Nottingham 2.4.13-3 +- bump rev +- buildprereq gperf + +* Mon Feb 4 2002 Bill Nottingham 2.4.13-1 +- update to 2.4.13 +- fix GPL symbol export + +* Wed Jan 30 2002 Bill Nottingham 2.4.12-9 +- shrink insmod.static + +* Thu Jan 24 2002 Bill Nottingham 2.4.12-8 +- fix installation of extra libraries (#58427) + +* Thu Jan 17 2002 Bill Nottingham 2.4.12-7 +- hack to allow depmod of 64bit kernels on 32bit PPC + +* Tue Jan 15 2002 Bill Nottingham 2.4.12-6 +- more ppc64 fixes + +* Thu Jan 10 2002 Bill Nottingham 2.4.12-5 +- fix build on combined 32/64 targets (ppc/sparc) + +* Tue Dec 11 2001 Matt Wilson +- added a -devel subpackage that contains libraries that apps can use + to implement insmod and rmmod + +* Tue Dec 4 2001 Bill Nottingham +- get rid of some obsolete patches, other tweaks + +* Thu Nov 29 2001 Florian La Roche +- update to 2.4.12 + +* Sat Nov 17 2001 Florian La Roche +- update to 2.4.11 + +* Tue Oct 2 2001 Bill Nottingham +- update to 2.4.10 +- deprecate -i, -m arguments to depmod + +* Tue Sep 25 2001 Bill Nottingham +- update to 2.4.9 + +* Wed Aug 29 2001 Bill Nottingham +- replace modutils-2.4.6-error patch with version that was integrated + upstream + +* Sat Aug 18 2001 Florian La Roche +- disable char-major-4 for s390/s390x + +* Mon Jul 8 2001 Bill Nottingham +- remove /etc/cron.d/kmod + +* Fri Jul 6 2001 Bill Nottingham +- update to 2.4.6 +- alias binfmt-0000 off (#9709) +- turn off 'modules.conf is more recent than modules.dep' message (#14276, + others) +- return nonzero from depmod if there are errors (#40935) +- fix manpage typo (#33123) + +* Thu Jul 05 2001 Karsten Hopp +- new S390 patch from IBM + +* Tue Jun 26 2001 Elliot Lee 2.4.5-3 +- Add modutils-2.4.5-stblocal.patch from Jakub. See the e-mail message + inside the patch file for details. +- Use smp_mflags macro + +* Thu Jun 21 2001 Florian La Roche +- add s390/s390x support + +* Tue Apr 24 2001 Bill Nottingham +- update to 2.4.5 + +* Tue Mar 6 2001 Bill Nottingham +- add default post/preun for binfmt_misc + +* Mon Feb 19 2001 Bill Nottingham +- change ipv6 alias to 'alias net-pf-10 off' + +* Tue Feb 13 2001 Bill Nottingham +- add 'net-pf-10 ipv6' alias (#25405) + +* Sun Jan 28 2001 Florian La Roche +- change "#ifdef s390" -> "#if defined(__s390__) || defined(__s390x__)" + +* Tue Jan 23 2001 Bill Nottingham +- update to 2.4.2 +- ship a genksyms.old + +* Fri Jan 19 2001 Bill Nottingham +- fix ppp aliases + +* Tue Jan 9 2001 Bill Nottingham +- oops, I blew away other people's changes. Fix that. +- only have tty-ldisc-11 in the aliases once + +* Mon Jan 8 2001 Bill Nottingham +- update to 2.4.0 +- tweak irda aliases +- remove vixie-cron dependency (it's not *required*) +- add missing %build (where did that go?) + +* Sun Jan 7 2001 Bernhard Rosenkraenzer +- 2.4.0 +- Get rid of obsolete char-major-60==ircom-tty patch + (moved to 161) + +* Sat Jan 06 2001 Florian La Roche +- add "ctc{0,1,2} -> ctc" alias for s390 + +* Sat Dec 23 2000 Bill Nottingham +- add missing comma in alias list +- add irda aliases + +* Tue Dec 12 2000 Bill Nottingham +- add char-major-108 ppp_async alias + +* Mon Dec 11 2000 Bill Nottingham +- fix ide-probe aliases (now ide-probe-mod) + +* Wed Nov 22 2000 Matt Wilson +- 2.3.21, fixes more security problems. + +* Thu Nov 16 2000 Bernhard Rosenkraenzer +- 2.3.20, fixes security holes + +* Tue Oct 31 2000 Bernhard Rosenkraenzer +- 2.3.19 +- add IrDA devices to alias patch +- update source URL + +* Thu Oct 26 2000 Bill Nottingham +- fix ia64 module loading + +* Mon Oct 2 2000 Bill Nottingham +- stupid ia64 tricks + +* Fri Sep 29 2000 Jeff Johnson +- upgrade to 2.3.17. +- sparc64 ELF hacks. + +* Mon Aug 21 2000 Michael K. Johnson +- Use %{_mandir} for removing kerneld-related man pages. + +* Wed Aug 9 2000 Jakub Jelinek +- fix build on SPARC + +* Tue Aug 8 2000 Jakub Jelinek +- update to 2.3.14 + +* Tue Jul 25 2000 Bill Nottingham +- update to 2.3.13 +- turn psaux off again +- remove sound patch; it's obsolete + +* Wed Jul 19 2000 Jakub Jelinek +- rebuild to cope with glibc locale binary incompatibility + +* Thu Jul 13 2000 Bernhard Rosenkraenzer +- 2.3.12 +- fix up ia64 + +* Wed Jul 12 2000 Prospector +- automatic rebuild + +* Sat Jul 1 2000 Florian La Roche +- add aliases for cipcb[0-3] + +* Wed Jun 14 2000 Matt Wilson +- fix build on combined 32/64 bit sparc + +* Thu Jun 1 2000 Bill Nottingham +- modules.confiscation + +* Wed May 17 2000 Bill Nottingham +- add ia64 patch from Intel + +* Wed May 17 2000 Jakub Jelinek +- fix build with glibc 2.2 + +* Tue May 09 2000 Doug Ledford +- Correct %description to reflect that we don't build kerneld by default + +* Fri Apr 21 2000 Bernhard Rosenkraenzer +- 2.3.11 + +* Mon Apr 3 2000 Bill Nottingham +- fix net-pf-* aliases for ipx, appletalk + +* Fri Mar 17 2000 Bernhard Rosenkraenzer +- 2.3.10 + +* Thu Feb 17 2000 Matt Wilson +- added alias for agpgart + +* Mon Feb 14 2000 Bill Nottingham +- hardcode psaux alias to off everywhere + +* Thu Feb 3 2000 Bill Nottingham +- add a symlink from conf.modules.5 to modules.conf.5 + +* Fri Jan 29 2000 Bill Nottingham +- fix breakage *correctly* + +* Sat Jan 22 2000 Bill Nottingham +- fix breakage of our own cause w.r.t sound modules + +* Thu Jan 06 2000 Jakub Jelinek +- update to 2.3.9. +- port RH patches from 2.1.121 to 2.3.9 where needed. +- disable warning about conf.modules for now, in 7.0 + we should move to modules.conf. + +* Wed Oct 13 1999 Jakub Jelinek +- hardcode psaux alias on sparc to off. + +* Tue Oct 05 1999 Bill Nottingham +- hardcode parport aliases.... + +* Mon Oct 04 1999 Cristian Gafton +- rebuild against new glibc in the sparc tree + +* Wed Sep 15 1999 Jakub Jelinek +- rewrite sparckludge so that separate *64 binaries + are not needed anymore. + +* Sat Sep 11 1999 Cristian Gafton +- apply the last patch in the %%prep section (doh!) + +* Mon Apr 19 1999 Cristian Gafton +- add support for the ppp compression modules by default + +* Tue Apr 13 1999 Michael K. Johnson +- add cron.d file to run rmmod -as + +* Fri Apr 09 1999 Cristian Gafton +- take out kerneld + +* Mon Apr 05 1999 Cristian Gafton +- add patch to make all raid personalities recognized + +* Sun Mar 21 1999 Cristian Gafton +- auto rebuild in the new build environment (release 7) + +* Thu Mar 18 1999 Cristian Gafton +- obsoletes modules +- get rid of the /lib/modules/preferred hack + +* Mon Mar 15 1999 Bill Nottingham +- added support for /lib/modules/foo/pcmcia +- make kerneld initscript not start by default + +* Tue Feb 23 1999 Matt Wilson +- added sparc64 support from UltraPenguin + +* Tue Jan 12 1999 Cristian Gafton +- call libtoolize to allow it to compile on the arm + +* Wed Dec 23 1998 Jeff Johnson +- search /lib/modules/preferred before defaults but after specified paths. + +* Tue Nov 17 1998 Cristian Gafton +- upgraded to version 2.1.121 + +* Thu Nov 05 1998 Erik Troan +- added -m, -i options + +* Thu Oct 01 1998 Michael K. Johnson +- fix syntax error I introduced when enhancing initscript + +* Wed Sep 30 1998 Michael K. Johnson +- enhance initscript + +* Fri Aug 28 1998 Jeff Johnson +- recompile statically linked binary for 5.2/sparc + +* Tue Jul 28 1998 Jeff Johnson +- pick up ultrapenguin patches (not applied for now). +- pre-generate keyword.c so gperf doesn't have to be present (not applied). +- util/sys_cm.c: fix create_module syscall (signed return on sparc too) + +* Wed Jul 15 1998 Jeff Johnson +- correct %postun typos + +* Fri May 01 1998 Erik Troan +- added /lib/modules/preferred to search path + +* Fri Apr 24 1998 Prospector System +- translations modified for de, fr, tr + +* Tue Apr 07 1998 Cristian Gafton +- updated to 2.1.85 +- actually make use of the BuildRoot + +* Fri Apr 3 1998 Jakub Jelinek +- Fix sparc64, add modinfo64 on sparc. + +* Wed Mar 23 1998 Jakub Jelinek +- Handle EM_SPARCV9, kludge to support both 32bit and 64bit kernels + from the same package on sparc/sparc64. + +* Fri Nov 7 1997 Michael Fulbright +- removed warning message when conf.modules exists and is a empty + +* Tue Oct 28 1997 Erik Troan +- patched to honor -k in options +- added modprobe.1 +- added init script + +* Thu Oct 23 1997 Erik Troan +- removed bogus strip of lsmod (which is a script) + +* Mon Oct 20 1997 Erik Troan +- updated to 2.1.55 +- builds in a buildroot + +* Mon Aug 25 1997 Erik Troan +- added insmod.static + +* Sun Aug 24 1997 Erik Troan +- built on Intel +- combined rmmod and insmod From svn at tinysofa.org Thu Jul 1 15:51:15 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:51:15 +1000 (EST) Subject: [tinysofa-svn] r2795 - in tinysofa/snapshot/mutt/current: sources specs Message-ID: <20040701155115.7450A4E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:51:15 +1000 (Fri, 02 Jul 2004) New Revision: 2795 Added: tinysofa/snapshot/mutt/current/sources/mutt-1.2.5-muttbug-tmp.patch tinysofa/snapshot/mutt/current/sources/mutt-1.2.5.1-autosplat.patch tinysofa/snapshot/mutt/current/sources/mutt-1.4-nosetgid.patch tinysofa/snapshot/mutt/current/sources/mutt-1.4-sasl2.patch tinysofa/snapshot/mutt/current/sources/mutt-1.4.1-menu.patch tinysofa/snapshot/mutt/current/sources/mutt-1.4.1-muttrc.patch tinysofa/snapshot/mutt/current/sources/mutt-colors tinysofa/snapshot/mutt/current/sources/mutt-default.patch tinysofa/snapshot/mutt/current/sources/mutt-sasl.patch tinysofa/snapshot/mutt/current/sources/mutt_ldap_query Removed: tinysofa/snapshot/mutt/current/sources/mutt-1.2.2.sgid.patch.bz2 Modified: tinysofa/snapshot/mutt/current/specs/mutt.spec Log: - Sync with 2.0. - Kept: - mutt-1.4.2.1i.tar.gz: - Added: - mutt-1.2.5-muttbug-tmp.patch: - mutt-1.2.5.1-autosplat.patch: - mutt-1.4-nosetgid.patch: - mutt-1.4-sasl2.patch: - mutt-1.4.1-menu.patch: - mutt-1.4.1-muttrc.patch: - mutt-colors: - mutt-default.patch: - mutt-sasl.patch: - mutt_ldap_query: - Removed: - mutt-1.2.2.sgid.patch.bz2: Deleted: tinysofa/snapshot/mutt/current/sources/mutt-1.2.2.sgid.patch.bz2 =================================================================== (Binary files differ) Added: tinysofa/snapshot/mutt/current/sources/mutt-1.2.5-muttbug-tmp.patch =================================================================== --- tinysofa/snapshot/mutt/current/sources/mutt-1.2.5-muttbug-tmp.patch 2004-07-01 15:51:12 UTC (rev 2794) +++ tinysofa/snapshot/mutt/current/sources/mutt-1.2.5-muttbug-tmp.patch 2004-07-01 15:51:15 UTC (rev 2795) @@ -0,0 +1,18 @@ +--- mutt-1.2.5/muttbug.sh.in.foo Mon May 14 10:09:57 2001 ++++ mutt-1.2.5/muttbug.sh.in Mon May 14 10:12:41 2001 +@@ -85,13 +85,8 @@ + exec > /dev/tty + exec < /dev/tty + +-SCRATCH=${TMPDIR-/tmp}/`basename $0`.`hostname`.$$ +- +-mkdir ${SCRATCH} || \ +-{ +- echo "`basename $0`: Can't create temporary directory." >& 2 ; +- exit 1 ; +-} ++TMP=${TMPDIR-/tmp}/`basename $0`.`hostname` ++SCRATCH=`mktemp -d $TMP.XXXXXX || exit 1` + + trap "rm -r -f ${SCRATCH} ; trap '' 0 ; exit" 0 1 2 + Added: tinysofa/snapshot/mutt/current/sources/mutt-1.2.5.1-autosplat.patch =================================================================== --- tinysofa/snapshot/mutt/current/sources/mutt-1.2.5.1-autosplat.patch 2004-07-01 15:51:12 UTC (rev 2794) +++ tinysofa/snapshot/mutt/current/sources/mutt-1.2.5.1-autosplat.patch 2004-07-01 15:51:15 UTC (rev 2795) @@ -0,0 +1,13 @@ +--- mutt-1.2.5.1/prepare.foo Thu May 16 14:51:35 2002 ++++ mutt-1.2.5.1/prepare Thu May 16 14:51:50 2002 +@@ -7,8 +7,8 @@ + include_deps="-i" + fi + +-if aclocal -I m4 && autoheader && (cd m4 && make -f Makefile.am.in ) \ +- && automake $include_deps && autoconf && ./configure $@ ++if aclocal-1.4 -I m4 && autoheader-2.13 && (cd m4 && make -f Makefile.am.in ) \ ++ && automake-1.4 $include_deps && autoconf-2.13 && ./configure $@ + then + echo + echo "The mutt source code was successfully prepared." Added: tinysofa/snapshot/mutt/current/sources/mutt-1.4-nosetgid.patch =================================================================== --- tinysofa/snapshot/mutt/current/sources/mutt-1.4-nosetgid.patch 2004-07-01 15:51:12 UTC (rev 2794) +++ tinysofa/snapshot/mutt/current/sources/mutt-1.4-nosetgid.patch 2004-07-01 15:51:15 UTC (rev 2795) @@ -0,0 +1,62 @@ +--- mutt-1.4/configure.nosetgid Wed May 29 22:37:59 2002 ++++ mutt-1.4/configure Wed May 29 22:38:46 2002 +@@ -4584,59 +4582,7 @@ + #define USE_DOTLOCK 1 + EOF + +- else +- +- echo $ac_n "checking if $mutt_cv_mailpath is group writable""... $ac_c" 1>&6 +-echo "configure:4594: checking if $mutt_cv_mailpath is group writable" >&5 +-if eval "test \"`echo '$''{'mutt_cv_groupwrite'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 +-else +- if test "$cross_compiling" = yes; then +- mutt_cv_groupwrite=no +-else +- cat > conftest.$ac_ext < +-#include +- +-int main (int argc, char **argv) +-{ +- struct stat s; +- +- stat ("$mutt_cv_mailpath", &s); +- if (s.st_mode & S_IWGRP) exit (0); +- exit (1); +-} +-EOF +-if { (eval echo configure:4616: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-then +- mutt_cv_groupwrite=yes +-else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -fr conftest* +- mutt_cv_groupwrite=no +-fi +-rm -fr conftest* +-fi +- +-fi +- +-echo "$ac_t""$mutt_cv_groupwrite" 1>&6 +- +- if test $mutt_cv_groupwrite = yes; then +- cat >> confdefs.h <<\EOF +-#define USE_DOTLOCK 1 +-EOF +- +- cat >> confdefs.h <<\EOF +-#define USE_SETGID 1 +-EOF +- +- mutt_cv_setgid=yes +- fi + fi + fi + + # Check whether --enable-external_dotlock or --disable-external_dotlock was given. Added: tinysofa/snapshot/mutt/current/sources/mutt-1.4-sasl2.patch =================================================================== --- tinysofa/snapshot/mutt/current/sources/mutt-1.4-sasl2.patch 2004-07-01 15:51:12 UTC (rev 2794) +++ tinysofa/snapshot/mutt/current/sources/mutt-1.4-sasl2.patch 2004-07-01 15:51:15 UTC (rev 2795) @@ -0,0 +1,233 @@ +diff -durN mutt-1.4.orig/configure.in mutt-1.4/configure.in +--- mutt-1.4.orig/configure.in Fri Jan 10 11:50:30 2003 ++++ mutt-1.4/configure.in Fri Jan 10 11:50:41 2003 +@@ -570,22 +570,24 @@ + then + if test "$with_sasl" != "yes" + then +- CPPFLAGS="$CPPFLAGS -I$with_sasl/include" ++ CPPFLAGS="$CPPFLAGS -I$with_sasl/include/sasl" + LDFLAGS="$LDFLAGS -L$with_sasl/lib" ++ else ++ CPPFLAGS="$CPPFLAGS -I/usr/include/sasl" + fi + + saved_LIBS="$LIBS" + +- AC_CHECK_LIB(sasl, sasl_client_init,, +- AC_MSG_ERROR([could not find libsasl]),) ++ AC_CHECK_LIB(sasl2, sasl_client_init,, ++ AC_MSG_ERROR([could not find libsasl2]),) + + MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS mutt_sasl.o" +- MUTTLIBS="$MUTTLIBS -lsasl" ++ MUTTLIBS="$MUTTLIBS -lsasl2" + LIBS="$saved_LIBS" + AC_DEFINE(USE_SASL,1, + [ Define if want to use the Cyrus SASL library for POP/IMAP authentication. ]) + need_sasl=yes +- need_md5=no ++ need_md5=yes + fi + ]) + AM_CONDITIONAL(USE_SASL, test x$need_sasl = xyes) +diff -durN mutt-1.4.orig/imap/auth_sasl.c mutt-1.4/imap/auth_sasl.c +--- mutt-1.4.orig/imap/auth_sasl.c Sun Jan 13 22:16:34 2002 ++++ mutt-1.4/imap/auth_sasl.c Fri Jan 10 11:51:38 2003 +@@ -34,7 +34,7 @@ + int rc, irc; + char buf[LONG_STRING]; + const char* mech; +- char* pc = NULL; ++ const char* pc = NULL; + unsigned int len, olen; + unsigned char client_start; + +@@ -63,15 +63,13 @@ + if (mutt_bit_isset (idata->capabilities, AUTH_ANON) && + (!idata->conn->account.user[0] || + !ascii_strncmp (idata->conn->account.user, "anonymous", 9))) +- rc = sasl_client_start (saslconn, "AUTH=ANONYMOUS", NULL, NULL, &pc, &olen, +- &mech); ++ rc = sasl_client_start (saslconn, "AUTH=ANONYMOUS", NULL, &pc, &olen, &mech); + } + + if (rc != SASL_OK && rc != SASL_CONTINUE) + do + { +- rc = sasl_client_start (saslconn, method, NULL, &interaction, +- &pc, &olen, &mech); ++ rc = sasl_client_start (saslconn, method, &interaction, &pc, &olen, &mech); + if (rc == SASL_INTERACT) + mutt_sasl_interact (interaction); + } +@@ -109,7 +107,7 @@ + if (irc == IMAP_CMD_RESPOND) + { + if (sasl_decode64 (idata->cmd.buf+2, strlen (idata->cmd.buf+2), buf, +- &len) != SASL_OK) ++ LONG_STRING,&len) != SASL_OK) + { + dprint (1, (debugfile, "imap_auth_sasl: error base64-decoding server response.\n")); + goto bail; +@@ -137,10 +135,6 @@ + dprint (1, (debugfile, "imap_auth_sasl: error base64-encoding client response.\n")); + goto bail; + } +- +- /* sasl_client_st(art|ep) allocate pc with malloc, expect me to +- * free it */ +- FREE (&pc); + } + + if (olen || rc == SASL_CONTINUE) +diff -durN mutt-1.4.orig/mutt_sasl.c mutt-1.4/mutt_sasl.c +--- mutt-1.4.orig/mutt_sasl.c Tue Feb 26 11:38:27 2002 ++++ mutt-1.4/mutt_sasl.c Fri Jan 10 11:50:41 2003 +@@ -92,10 +92,13 @@ + * probably stop exporting mutt_sasl_get_callbacks(). */ + int mutt_sasl_client_new (CONNECTION* conn, sasl_conn_t** saslconn) + { +- sasl_security_properties_t secprops; +- sasl_external_properties_t extprops; + const char* service; + int rc; ++ struct sockaddr_in local, remote; ++ char buf[LONG_STRING]; ++ char localip[LONG_STRING], remoteip[LONG_STRING]; ++ socklen_t size; ++ sasl_security_properties_t secprops; + + if (mutt_sasl_start () != SASL_OK) + return -1; +@@ -112,9 +115,21 @@ + dprint (1, (debugfile, "mutt_sasl_client_new: account type unset\n")); + return -1; + } +- +- rc = sasl_client_new (service, conn->account.host, +- mutt_sasl_get_callbacks (&conn->account), SASL_SECURITY_LAYER, saslconn); ++ ++ size = sizeof (local); ++ if (getsockname (conn->fd, (struct sockaddr*) &local, &size)) ++ return -1; ++ inet_ntop(local.sin_family, &local.sin_addr,buf,LONG_STRING); ++ sprintf(localip,"%s;%i",buf,local.sin_port); ++ ++ size = sizeof(remote); ++ if (getpeername(conn->fd, (struct sockaddr*) &remote, &size)) ++ return -1; ++ inet_ntop(remote.sin_family, &remote.sin_addr,buf,LONG_STRING); ++ sprintf(remoteip,"%s;%i",buf,local.sin_port); ++ ++ rc = sasl_client_new (service, conn->account.host, localip, remoteip, ++ mutt_sasl_get_callbacks (&conn->account), 0, saslconn); + + if (rc != SASL_OK) + { +@@ -123,40 +138,6 @@ + return -1; + } + +- /*** set sasl IP properties, necessary for use with krb4 ***/ +- /* Do we need to fail if this fails? I would assume having these unset +- * would just disable KRB4. Who wrote this code? I'm not sure how this +- * interacts with the NSS code either, since that mucks with the fd. */ +- { +- struct sockaddr_in local, remote; +- socklen_t size; +- +- size = sizeof (local); +- if (getsockname (conn->fd, (struct sockaddr*) &local, &size)) +- return -1; +- +- size = sizeof(remote); +- if (getpeername(conn->fd, (struct sockaddr*) &remote, &size)) +- return -1; +- +-#ifdef SASL_IP_LOCAL +- if (sasl_setprop(*saslconn, SASL_IP_LOCAL, &local) != SASL_OK) +- { +- dprint (1, (debugfile, +- "mutt_sasl_client_new: Error setting local IP address\n")); +- return -1; +- } +-#endif +- +-#ifdef SASL_IP_REMOTE +- if (sasl_setprop(*saslconn, SASL_IP_REMOTE, &remote) != SASL_OK) +- { +- dprint (1, (debugfile, +- "mutt_sasl_client_new: Error setting remote IP address\n")); +- return -1; +- } +-#endif +- } + + /* set security properties. We use NOPLAINTEXT globally, since we can + * just fall back to LOGIN in the IMAP case anyway. If that doesn't +@@ -181,10 +162,9 @@ + #if defined(USE_SSL) && !defined(USE_NSS) + if (conn->account.flags & M_ACCT_SSL) + { +- memset (&extprops, 0, sizeof (extprops)); +- extprops.ssf = conn->ssf; +- dprint (2, (debugfile, "External SSF: %d\n", extprops.ssf)); +- if (sasl_setprop (*saslconn, SASL_SSF_EXTERNAL, &extprops) != SASL_OK) ++ sasl_ssf_t ssf=conn->ssf; ++ dprint (2, (debugfile, "External SSF: %d\n", ssf)); ++ if (sasl_setprop (*saslconn, SASL_SSF_EXTERNAL, &ssf) != SASL_OK) + { + dprint (1, (debugfile, "mutt_sasl_client_new: Error setting external properties\n")); + return -1; +@@ -274,7 +254,7 @@ + + sasldata->saslconn = saslconn; + /* get ssf so we know whether we have to (en|de)code read/write */ +- sasl_getprop (saslconn, SASL_SSF, (void**) &sasldata->ssf); ++ sasl_getprop (saslconn, SASL_SSF, (const void**) &sasldata->ssf); + dprint (3, (debugfile, "SASL protection strength: %u\n", *sasldata->ssf)); + /* Add SASL SSF to transport SSF */ + conn->ssf += *sasldata->ssf; +diff -durN mutt-1.4.orig/pop_auth.c mutt-1.4/pop_auth.c +--- mutt-1.4.orig/pop_auth.c Thu Aug 30 10:11:06 2001 ++++ mutt-1.4/pop_auth.c Fri Jan 10 11:51:26 2003 +@@ -41,7 +41,7 @@ + char buf[LONG_STRING]; + char inbuf[LONG_STRING]; + const char* mech; +- char* pc = NULL; ++ const char* pc = NULL; + unsigned int len, olen; + unsigned char client_start; + +@@ -56,8 +56,7 @@ + + FOREVER + { +- rc = sasl_client_start (saslconn, method, NULL, +- &interaction, &pc, &olen, &mech); ++ rc = sasl_client_start (saslconn, method, &interaction, &pc, &olen, &mech); + if (rc != SASL_INTERACT) + break; + mutt_sasl_interact (interaction); +@@ -96,7 +95,7 @@ + if (mutt_strncmp (inbuf, "+ ", 2)) + goto bail; + +- if (sasl_decode64 (inbuf, strlen (inbuf), buf, &len) != SASL_OK) ++ if (sasl_decode64 (inbuf, strlen (inbuf), buf, LONG_STRING, &len) != SASL_OK) + { + dprint (1, (debugfile, "pop_auth_sasl: error base64-decoding server response.\n")); + goto bail; +@@ -124,10 +123,6 @@ + dprint (1, (debugfile, "pop_auth_sasl: error base64-encoding client response.\n")); + goto bail; + } +- +- /* sasl_client_st(art|ep) allocate pc with malloc, expect me to +- * free it */ +- safe_free ((void *) &pc); + } + } + Added: tinysofa/snapshot/mutt/current/sources/mutt-1.4.1-menu.patch =================================================================== --- tinysofa/snapshot/mutt/current/sources/mutt-1.4.1-menu.patch 2004-07-01 15:51:12 UTC (rev 2794) +++ tinysofa/snapshot/mutt/current/sources/mutt-1.4.1-menu.patch 2004-07-01 15:51:15 UTC (rev 2795) @@ -0,0 +1,43 @@ +Index: menu.c +=================================================================== +RCS file: /home/roessler/cvs/mutt/menu.c,v +retrieving revision 3.2 +retrieving revision 3.3 +diff -u -r3.2 -r3.3 +--- menu.c 28 Jan 2002 22:30:09 -0000 3.2 ++++ menu.c 13 Feb 2002 09:53:33 -0000 3.3 +@@ -148,30 +148,13 @@ + menu->make_entry (s, l, menu, i); + } + +-void menu_pad_string (char *s, size_t l) ++void menu_pad_string (char *s, size_t n) + { +- size_t n = mutt_strlen (s); + int shift = option (OPTARROWCURSOR) ? 3 : 0; +- +- l--; /* save room for the terminal \0 */ +- if (l > COLS - shift) +- l = COLS - shift; ++ int cols = COLS - shift; + +- /* Let's just pad the string anyway ... */ +- mutt_format_string (s, INT_MAX, l, l, 0, ' ', s, n, 1); +- return; +- +-#if !defined (HAVE_BKGDSET) && !defined (USE_SLANG_CURSES) +- /* we have to pad the string with blanks to the end of line */ +- if (n < l) +- { +- while (n < l) +- s[n++] = ' '; +- s[n] = 0; +- } +- else +-#endif +- s[l] = 0; ++ mutt_format_string (s, n, cols, cols, 0, ' ', s, strlen (s), 1); ++ s[n - 1] = 0; + } + + void menu_redraw_full (MUTTMENU *menu) Added: tinysofa/snapshot/mutt/current/sources/mutt-1.4.1-muttrc.patch =================================================================== --- tinysofa/snapshot/mutt/current/sources/mutt-1.4.1-muttrc.patch 2004-07-01 15:51:12 UTC (rev 2794) +++ tinysofa/snapshot/mutt/current/sources/mutt-1.4.1-muttrc.patch 2004-07-01 15:51:15 UTC (rev 2795) @@ -0,0 +1,11 @@ +--- mutt-1.4.1/contrib/sample.muttrc.foo 2003-03-19 21:09:41.000000000 -0500 ++++ mutt-1.4.1/contrib/sample.muttrc 2003-03-19 21:10:00.000000000 -0500 +@@ -142,7 +142,7 @@ + color search default green # how to hilite search patterns in the pager + + color header brightred default ^(From|Subject): +-color body magenta default "(ftp|http)://[^ ]+" # point out URLs ++color body magenta default "(ftp|http|https)://[^ ]+" # point out URLs + color body magenta default [-a-z_0-9.]+@[-a-z_0-9.]+ # e-mail addresses + color underline brightgreen default + Added: tinysofa/snapshot/mutt/current/sources/mutt-colors =================================================================== --- tinysofa/snapshot/mutt/current/sources/mutt-colors 2004-07-01 15:51:12 UTC (rev 2794) +++ tinysofa/snapshot/mutt/current/sources/mutt-colors 2004-07-01 15:51:15 UTC (rev 2795) @@ -0,0 +1,29 @@ + +# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +# +# Color definitions +# + +#color normal white default +color hdrdefault red default +color quoted brightblue default +color signature red default +color indicator brightyellow red +color error brightred default +color status yellow blue +color tree magenta default # the thread tree in the index menu +color tilde magenta default +color message brightcyan default +color markers brightcyan default +color attachment brightmagenta default +color search default green # how to hilite search patterns in the pager + +color header brightred default ^(From|Subject): +color body magenta default "(ftp|http)://[^ ]+" # point out URLs +color body magenta default [-a-z_0-9.]+@[-a-z_0-9.]+ # e-mail addresses +color underline brightgreen default + +# attributes when using a mono terminal +#mono header underline ^(From|Subject): +mono quoted bold + Added: tinysofa/snapshot/mutt/current/sources/mutt-default.patch =================================================================== --- tinysofa/snapshot/mutt/current/sources/mutt-default.patch 2004-07-01 15:51:12 UTC (rev 2794) +++ tinysofa/snapshot/mutt/current/sources/mutt-default.patch 2004-07-01 15:51:15 UTC (rev 2795) @@ -0,0 +1,23 @@ +diff -ru cow/mutt-0.95.6-us/color.c mutt-0.95.6-us/color.c +--- cow/mutt-0.95.6-us/color.c Thu Jun 3 16:43:01 1999 ++++ mutt-0.95.6-us/color.c Tue Jun 22 16:28:24 1999 +@@ -155,7 +155,7 @@ + #ifdef USE_SLANG_CURSES + static char * get_color_name (int val) + { +- static char * missing[3] = {"brown", "lightgray", ""}; ++ static char * missing[3] = {"brown", "lightgray", "default"}; + int i; + + switch (val) +diff -ru cow/mutt-0.95.6-us/main.c mutt-0.95.6-us/main.c +--- cow/mutt-0.95.6-us/main.c Thu Jun 3 16:43:19 1999 ++++ mutt-0.95.6-us/main.c Tue Jun 22 16:29:29 1999 +@@ -256,6 +256,7 @@ + #ifdef USE_SLANG_CURSES + SLtt_Ignore_Beep = 1; /* don't do that #*$@^! annoying visual beep! */ + SLsmg_Display_Eight_Bit = 128; /* characters above this are printable */ ++ SLtt_set_color(0, NULL, "default", "default"); + #else + /* should come before initscr() so that ncurses 4.2 doesn't try to install + its own SIGWINCH handler */ Added: tinysofa/snapshot/mutt/current/sources/mutt-sasl.patch =================================================================== --- tinysofa/snapshot/mutt/current/sources/mutt-sasl.patch 2004-07-01 15:51:12 UTC (rev 2794) +++ tinysofa/snapshot/mutt/current/sources/mutt-sasl.patch 2004-07-01 15:51:15 UTC (rev 2795) @@ -0,0 +1,11 @@ +--- mutt-1.4.1/imap/auth_sasl.c 12 Nov 2002 08:20:11 -0000 3.1 ++++ mutt-1.4.1/imap/auth_sasl.c 4 Jul 2003 17:15:34 -0000 3.2 +@@ -37,7 +37,7 @@ + sasl_conn_t* saslconn; + sasl_interact_t* interaction = NULL; + int rc, irc; +- char buf[LONG_STRING]; ++ char buf[HUGE_STRING]; + const char* mech; + #ifdef USE_SASL2 + const char *pc = NULL; Added: tinysofa/snapshot/mutt/current/sources/mutt_ldap_query =================================================================== --- tinysofa/snapshot/mutt/current/sources/mutt_ldap_query 2004-07-01 15:51:12 UTC (rev 2794) +++ tinysofa/snapshot/mutt/current/sources/mutt_ldap_query 2004-07-01 15:51:15 UTC (rev 2795) @@ -0,0 +1,45 @@ +#!/bin/sh +# +# Last modified: 30 October 2000 +# + +FLAGS= + +# Create two temporary files. +umask 077 +TMPFILE=`mktemp /tmp/mutt.ldap.XXXXXX` +RESULTS=`mktemp /tmp/mutt.ldap.XXXXXX` + +if [ -n "$LDAPSERVER" ]; then + FLAGS="$FLAGS -h $LDAPSERVER" +fi +if [ -n "$LDAPBASEDN" ]; then + FLAGS="$FLAGS -b $LDAPBASEDN" +fi + +# Search. +ldapsearch $FLAGS '(&(objectclass=inetorgperson)(|(cn='"$1"'*)(givenname='"$1"'*)(surname='"$1"'*)(mail='"$1"'*)))' mail cn roomNumber 2> /dev/null >> $TMPFILE +ldapsearch -x $FLAGS '(&(objectclass=inetorgperson)(|(cn='"$1"'*)(givenname='"$1"'*)(surname='"$1"'*)(mail='"$1"'*)))' mail cn roomNumber 2> /dev/null >> $TMPFILE + +# Parse. +cat $TMPFILE | awk ' + /^mail:/ {MAIL=substr($0,6)} + /^cn:/ {NAME=substr($0,4)} + /^roomNumber:/ {ROOM=substr($0,12)} + /^$/ { MAIL=gensub("^ ","",g,MAIL) } + /^$/ { MAIL=gensub(" $","",g,MAIL) } + /^$/ { NAME=gensub("^ ","",g,NAME) } + /^$/ { NAME=gensub(" $","",g,NAME) } + /^$/ { ROOM=gensub("^ ","",g,ROOM) } + /^$/ { ROOM=gensub(" $","",g,ROOM) } + /^$/ { if(length(NAME) > 0) print MAIL "\t" NAME "\t" ROOM} + /^$/ { NAME = "" } +' > $RESULTS + +# Sort and present results. +sort -u $RESULTS > $TMPFILE +echo Querying ${LDAPSERVER}.... `cat $TMPFILE | wc -l` entries found. +cat $TMPFILE + +# Clean up. +rm -f $TMPFILE $RESULTS Modified: tinysofa/snapshot/mutt/current/specs/mutt.spec =================================================================== --- tinysofa/snapshot/mutt/current/specs/mutt.spec 2004-07-01 15:51:12 UTC (rev 2794) +++ tinysofa/snapshot/mutt/current/specs/mutt.spec 2004-07-01 15:51:15 UTC (rev 2795) @@ -1,211 +1,355 @@ +Summary: A text mode mail user agent. Name: mutt -Summary: A text mode mail user agent. Version: 1.4.2.1 -Release: 5ts +Release: 1ts +Serial: 5 License: GPL -Group: tinysofa official -URL: http://www.mutt.org/ -Source: ftp://ftp.mutt.org/pub/mutt/%{name}-%{version}i.tar.gz -Patch1: mutt-1.2.2.sgid.patch.bz2 -Requires: ncurses >= 5.0, smtpdaemon -BuildRequires: ncurses-devel >= 5.0, openssl-devel -BuildRoot: %{_tmppath}/%{name}-root +Group: Applications/Internet +Source: ftp://ftp.mutt.org/pub/mutt/mutt-%{version}i.tar.gz +Source1: mutt_ldap_query +Source3: mutt-colors +Patch0: mutt-1.4-nosetgid.patch +Patch1: mutt-default.patch +Patch2: mutt-1.2.5-muttbug-tmp.patch +Patch3: mutt-1.2.5.1-autosplat.patch +Patch4: mutt-1.4.1-muttrc.patch +Patch5: mutt-sasl.patch +Patch6: mutt-1.4.1-menu.patch +Patch7: mutt-1.4-sasl2.patch +Url: http://www.mutt.org/ +Requires: smtpdaemon, mailcap, gettext +Buildroot: %{_tmppath}/%{name}-%{version}-root +Conflicts: mutt-us +Provides: mutt-i +%{!?nossl:BuildPrereq: openssl-devel} +%{!?nokerberos:BuildPrereq: krb5-devel} +BuildPrereq: cyrus-sasl-devel +BuildPrereq: /usr/sbin/sendmail +BuildPrereq: ncurses-devel >= 5.3-5 %description -Mutt is a text mode mail user agent. Mutt supports color, threading, +Mutt is a text-mode mail user agent. Mutt supports color, threading, arbitrary key remapping, and a lot of customization. +You should install mutt if you have used it in the past and you prefer +it, or if you are new to mail programs and have not decided which one +you are going to use. %prep -%setup -q -n %{name}-%{version} -%patch1 -p1 +%setup -n mutt-%{version} -q +# Thou shalt use fcntl, and only fcntl +#%patch0 -p1 -b .nosetgid +# Something to make default colors work right. +# fixme: make sure this is still needed +%patch1 -p1 -b .default +# use mktemp -d in muttbug +%patch2 -p1 -b .tmp +# versioned automake/autoconf +%patch3 -p1 -b .autosplat +# make it recognize https urls too +%patch4 -p1 -b .https +# fix auth to windows KDCs (#98662) +%patch5 -p1 -b .sasl +# fix menu padding code (CAN-2004-0078) +#%patch6 -p0 -b .menu +# use sasl2 +%patch7 -p1 -b .sasl2 + +install -m644 %{SOURCE1} mutt_ldap_query + %build -CFLAGS="$RPM_OPT_FLAGS" LDFLAGS=-s ./configure \ - --prefix=%{_prefix} \ - --with-sharedir=/etc \ - --sysconfdir=/etc \ - --with-docdir=%{_prefix}/share/doc/mutt-%{version} \ - --enable-pop \ - --enable-imap \ - --mandir=%{_mandir} \ - --disable-warnings \ - --with-ncurses \ - --enable-nfs-fix \ - --with-charmaps \ - --with-ssl \ - --with-homespool \ - --disable-nls +%{__aclocal} -I m4 +%{__autoconf} +%{__autoheader} +%{__automake} + +export -n LINGUAS +CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%{_prefix} \ + --with-sharedir=/etc --sysconfdir=/etc \ + --with-docdir=%{_docdir}/mutt-%{version} \ + --with-mandir=%{_mandir} \ + --with-infodir=%{_infodir} \ + --enable-pop --enable-imap \ + --with-sasl \ +%{!?nossl:--with-ssl} \ +%{!?nokerberos:--with-gss} \ + --disable-warnings --with-ncursesw --disable-domain \ + --disable-flock --enable-fcntl make - %install -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf "$RPM_BUILD_ROOT" -mkdir -p $RPM_BUILD_ROOT - -make prefix=$RPM_BUILD_ROOT%{_prefix} sharedir=$RPM_BUILD_ROOT/etc \ +rm -rf $RPM_BUILD_ROOT +%makeinstall sharedir=$RPM_BUILD_ROOT/etc \ sysconfdir=$RPM_BUILD_ROOT/etc \ - docdir=$RPM_BUILD_ROOT%{_prefix}/doc/mutt-%{version} \ - mandir=$RPM_BUILD_ROOT/usr/share/man install + docdir=$RPM_BUILD_ROOT%{_docdir}/mutt-%{version} \ + install +mkdir -p $RPM_BUILD_ROOT/etc/X11/applnk/Internet -rm $RPM_BUILD_ROOT/usr/share/man/man1/mutt_dotlock.1 +# we like GPG here +cat contrib/gpg.rc >> \ + $RPM_BUILD_ROOT/etc/Muttrc +grep -5 "^color" contrib/sample.muttrc >> \ + $RPM_BUILD_ROOT/etc/Muttrc +# and we use aspell +cat >> $RPM_BUILD_ROOT/etc/Muttrc < 5:1.4.1-7 +- link urlview against ncursesw (fixes #125530, indirectly) -%exclude /etc/mime.types -%exclude /usr/doc +* Fri Feb 13 2004 Elliot Lee +- rebuilt -%changelog -* Wed May 19 2004 tsintegrate 1.4.2.1-5ts -- current (1.4.2.1-4ts) integrated as 1.4.2.1-5ts for release 1.0-U1 +* Tue Jan 27 2004 Bill Nottingham 5:1.4.1-5 +- add patch to fix menu padding (CAN-2004-0078, #109317) -* Wed Feb 18 2004 Omar Kilani 1.4.2.1-1ok -- New upstream. +* Mon Aug 18 2003 Bill Nottingham 5:1.4.1-4 +- rebuild against ncursesw -* Sat Dec 7 2003 Erlend Midttun 1.4.1-5tr -- Big rebuild +* Tue Jul 22 2003 Nalin Dahyabhai 5:1.4.1-3.2 +- rebuild -* Wed Jun 18 2003 Erlend Midttun 1.4.1-4tr -- Big rebuild +* Mon Jul 7 2003 Bill Nottingham 5:1.4.1-3 +- fix auth to windows KDCs (#98662) -* Thu Jun 5 2003 Tore Olsen 1.4.1-3to -- Don't configure with --without-domain (it's the same as - --with-domain=no) +* Wed Jun 04 2003 Elliot Lee +- rebuilt -* Fri May 23 2003 Tore Olsen 1.4.1i-2to -- removed locales -- added buildrequires openssl-devel +* Wed Mar 19 2003 Bill Nottingham 5:1.4.1-1 +- update to 1.4.1, fixes buffer overflow in IMAP code -* Mon May 12 2003 Erlend Midttun 1.4.1i-1em -- New upstream. +* Wed Jan 22 2003 Tim Powers +- rebuilt -* Mon Mar 24 2003 Erlend Midttun 1.4i-3em -- Rebuilt against glibc 2.3.2. +* Mon Jan 20 2003 Bill Nottingham 5:1.4-9 +- add mailcap requires +- change urlview to htmlview as default browser -* Sun Jan 19 2003 Gerald Dachs 1.41-2gd -- rebuilt against openssl 0.9.7 +* Fri Jan 17 2003 Florian La Roche +- change urlview to mozilla as default browser -* Tue Aug 13 2002 Christian H. Toldnes 1.4i-1ct -- New upstream version +* Tue Jan 7 2003 Nalin Dahyabhai 5:1.4-7 +- rebuild -* Wed Jul 24 2002 Daniel Meyer 1.2.5i.1-3dm -- rebuild for Trustix Secure Linux 2.0 +* Mon Dec 2 2002 Bill Nottingham 5:1.4-6 +- ship flea -* Mon Jun 3 2002 Erlend Midttun -- Now even use the %doc macro. +* Fri Nov 29 2002 Tim Powers 5:1.4-5 +- remove unpackaged files from the buildroot -* Wed Jan 3 2002 Erlend Midttun -- Picked up 1.2.5.1 to fix security hole. +* Fri Jun 21 2002 Tim Powers +- automated rebuild -* Tue Jul 17 2001 Erlend Midttun -- Inc serial number before release. +* Fri Jun 14 2002 Bill Nottingham 1.4-3 +- rebuild against new slang -* Tue Mar 6 2001 Oystein Viggen -- Upgrade to v1.2.5i +* Wed May 29 2002 Nalin Dahyabhai 1.4-2 +- forcibly enable SSL and GSSAPI support -* Fri Nov 17 2000 Oystein Viggen -- Enable ssl support +* Wed May 29 2002 Bill Nottingham 1.4-1 +- whoa, 1.4. -* Tue Jul 18 2000 Oystein Viggen -- Move man-pages to /usr/share/man +* Sun May 26 2002 Tim Powers +- automated rebuild -* Fri Jul 07 2000 DindinX 1.2.4i-2mdk -- merge Geoffrey Lee's spec changes -- remove /etc/mimes.types from %files which caused a conflit w/ mailcap +* Thu May 16 2002 Bill Nottingham +- autoconf fun -* Fri Jul 07 2000 Thierry Vignaud 1.2.4i-1mdk -- new release (This version fixes a couple of problems present in 1.2.2, and - one problem leading to crashes whose fix was missing from 1.2.3.) +* Wed Jan 09 2002 Tim Powers +- automated rebuild -* Mon Jun 26 2000 DindinX 1.2.2i-3mdk -- put the Serial: tag back +* Tue Jan 1 2002 Bill Nottingham +- update to 1.2.5.1 -* Fri Jun 23 2000 DindinX 1.2.2i-2mdk -- fix the build as user the right way :) +* Mon Jul 23 2001 Bill Nottingham +- don't explictly require krb5-libs, etc.; that's what find-requires is for + (#49780, sort of) -* Thu Jun 22 2000 Vincent Danen 1.2.2i-1mdk -- 1.2.2i -- removed %defattr which was causing readonly inboxes -- build with ncurses instead of slang to get colors working properly -- removed SSL support (won't compile due to keymaps bug) -- fixed build +* Sat Jul 21 2001 Tim Powers +- no more applnk entries, it's cluttering our menus -* Tue Jun 20 2000 Vincent Danen 1.2i-2mdk -- enable charmaps in configure -- removed --enable-compressed (no patch) +* Fri Jul 20 2001 Bill Nottingham +- add slang-devel to buildprereqs (#49531) -* Mon Jun 19 2000 Vincent Danen 1.2i-1mdk -- 1.2i -- enable SSL and NFS fixes in configure +* Mon Jun 11 2001 Bill Nottingham +- add some sample color definitions (#19471) -* Wed Apr 27 2000 DindinX 1.0.1i-7mdk -- Recompile fix. -- fix the color scheme. +* Thu May 24 2001 Bill Nottingham +- fix typo in muttrc.man (#41610) -* Wed Apr 5 2000 Chmouel Boudjnah 1.0.1i-6mdk -- By default active colors. -- Believe me or not, fix menu and %post. -- Use find_lang macros for locales. +* Mon May 14 2001 Bill Nottingham +- use mktemp in muttbug -* Tue Apr 4 2000 Chmouel Boudjnah 1.0.1i-5mdk -- Fix another chmousucks in menu (yes me too i can believe it). +* Wed May 2 2001 Nalin Dahyabhai +- require webclient, not weclient -* Mon Apr 3 2000 Chmouel Boudjnah 1.0.1i-4mdk -- Fix chmousucks in menu. -- Add icons in menu. +* Wed May 2 2001 Bill Nottingham +- build urlview here -* Fri Mar 31 2000 Chmouel Boudjnah 1.0.1i-3mdk -- Fix menu entry (don't only cp the meny entry from your debian box - dindin ;)). +* Fri Mar 2 2001 Nalin Dahyabhai +- rebuild in new environment -* Fri Mar 24 2000 DindinX 1.0.1i-2mdk -- Specs and group fixes -- Added menu support +* Tue Feb 13 2001 Bill Nottingham +- change buildprereq to /usr/sbin/sendmail (it's what it should have been + originally) +- %langify -* Sun Feb 06 2000 Andre Steden +* Tue Feb 13 2001 Michael Stefaniuc +- changed buildprereq to smtpdaemon + +* Tue Dec 19 2000 Bill Nottingham +- rebuild; it's just broken +- fix #13196 +- buildprereq sendmail + +* Fri Dec 01 2000 Bill Nottingham +- rebuild because of broken fileutils + +* Fri Nov 10 2000 Nalin Dahyabhai +- include a sample LDAP query script as a doc file + +* Mon Nov 6 2000 Nalin Dahyabhai +- patch for imap servers that like to volunteer information after AUTHENTICATE + +* Thu Aug 24 2000 Nalin Dahyabhai +- rebuild in new environment +- force flock() off and fcntl() on in case defaults change + +* Tue Aug 8 2000 Nalin Dahyabhai +- enable SSL support + +* Fri Aug 4 2000 Bill Nottingham +- add translation to desktop entry + +* Fri Jul 28 2000 Bill Nottingham +- update to 1.2.5i - fixes IMAP bugs + +* Wed Jul 12 2000 Prospector +- automatic rebuild + +* Fri Jul 7 2000 Bill Nottingham +- 1.2.4i + +* Tue Jun 27 2000 Nalin Dahyabhai +- rebuild in new environment (release 3) +- adjust GSSAPI build logic + +* Thu Jun 22 2000 Bill Nottingham +- fix MD5 code + +* Wed Jun 21 2000 Bill Nottingham +- update to 1.2.2i + +* Mon Jun 19 2000 Trond Eivind Glomsr?d +- use aspell + +* Sat Jun 10 2000 Bill Nottingham +- FHS fixes + +* Wed May 10 2000 Bill Nottingham +- add some files + +* Tue May 9 2000 Bill Nottingham +- update to 1.2i + +* Tue Apr 4 2000 Bill Nottingham +- eliminate explicit krb5-configs dependency + +* Wed Mar 22 2000 Bill Nottingham +- auto is so much fun. + +* Wed Mar 01 2000 Nalin Dahyabhai +- make kerberos support conditional at compile-time + +* Mon Feb 07 2000 Preston Brown +- wmconfig -> desktop + +* Fri Feb 4 2000 Bill Nottingham +- keep the makefiles from re-running autoheader, automake, etc. + +* Thu Feb 3 2000 Nalin Dahyabhai +- add forward-ported sasl patch + +* Thu Feb 3 2000 Bill Nottingham +- handle compressed man pages, other cleanups + +* Wed Jan 19 2000 Bill Nottingham - 1.0.1 -- add compressed folders patch -- add colour patch -* Sat Nov 06 1999 John Buswell -- Build Release +* Mon Jan 3 2000 Bill Nottingham +- add the sample mime.types to /usr/doc -* Thu Oct 28 1999 Chmouel Boudjnah -- 1.0. +* Sat Jan 1 2000 Bill Nottingham +- fix an odd y2k issue on receiving mail from ancient clients -* Wed Oct 6 1999 Chmouel Boudjnah +* Fri Oct 21 1999 Bill Nottingham +- one-point-oh. -- 1.0pre3. +* Fri Sep 25 1999 Bill Nottingham +- add a buffer overflow patch -* Mon Aug 09 1999 Daouda LO - -0.95.7 - -added manual.sgml in documents. +* Tue Aug 31 1999 Bill Nottingham +- update to 1.0pre2 -* Sun May 09 1999 Chmouel Boudjnah +* Tue Aug 17 1999 Bill Nottingham +- update to 0.95.7 +- require urlview since the default muttrc uses it -- Fix bug of locales. +* Mon Jun 21 1999 Bill Nottingham +- get correct manual path the Right Way(tm) +- make it so it uses default colors even if COLORFGBG isn't set -* Wed Apr 28 1999 Chmouel Boudjnah +* Mon Jun 14 1999 Bill Nottingham +- update to 0.95.6 -- Mandrake adaptations. -- update to 0.99.5. +* Mon Apr 26 1999 Bill Nottingham +- try and make sure $RPM_OPT_FLAGS gets passed through +* Fri Apr 23 1999 Bill Nottingham +- update to 0.95.5 + +* Mon Mar 29 1999 Bill Nottingham +- sed correct doc path into /etc/Muttrc for viewing manual + +* Sun Mar 21 1999 Cristian Gafton +- auto rebuild in the new build environment (release 3) + +* Thu Mar 18 1999 Bill Nottingham +- strip binary + * Mon Mar 8 1999 Bill Nottingham - update to 0.95.4 - fixes a /tmp race @@ -249,4 +393,4 @@ - Rebuilt to insure all sources were fresh and patches were clean. * Wed Aug 6 1997 Manoj Kasichainula - - Initial version for 0.81(e) \ No newline at end of file +- Initial version for 0.81(e) From svn at tinysofa.org Thu Jul 1 15:51:32 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:51:32 +1000 (EST) Subject: [tinysofa-svn] r2797 - in tinysofa/snapshot/nasm/current: sources specs Message-ID: <20040701155132.A48E44E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:51:32 +1000 (Fri, 02 Jul 2004) New Revision: 2797 Added: tinysofa/snapshot/nasm/current/sources/nasm-0.98-boguself2.patch Removed: tinysofa/snapshot/nasm/current/sources/nasm-0.98.34-fixdoc.patch tinysofa/snapshot/nasm/current/sources/nasm-0.98.34-noinfo.patch Modified: tinysofa/snapshot/nasm/current/specs/nasm.spec Log: - Sync with 2.0. - Kept: - nasm-0.98.38.tar.bz2: - Added: - nasm-0.98-boguself2.patch: - Removed: - nasm-0.98.34-fixdoc.patch: - nasm-0.98.34-noinfo.patch: Added: tinysofa/snapshot/nasm/current/sources/nasm-0.98-boguself2.patch =================================================================== --- tinysofa/snapshot/nasm/current/sources/nasm-0.98-boguself2.patch 2004-07-01 15:51:28 UTC (rev 2796) +++ tinysofa/snapshot/nasm/current/sources/nasm-0.98-boguself2.patch 2004-07-01 15:51:32 UTC (rev 2797) @@ -0,0 +1,36 @@ +--- nasm-0.98/outelf.c.boguself Sun May 20 01:25:35 2001 ++++ nasm-0.98/outelf.c Sun May 20 02:01:59 2001 +@@ -548,7 +548,7 @@ static void elf_add_reloc (struct Sectio + r->symbol = 0; + for (i=0; iindex) +- r->symbol = i+3; ++ r->symbol = i+2; + if (!r->symbol) + r->symbol = GLOBAL_TEMP_BASE + raa_read(bsym, segment); + } +@@ -922,13 +922,13 @@ static struct SAA *elf_build_symtab (lon + * Now some standard symbols defining the segments, for relocation + * purposes. + */ +- for (i = 1; i <= nsects+1; i++) { ++ for (i = 1; i <= nsects; i++) { + p = entry; + WRITELONG (p, 0); /* no symbol name */ + WRITELONG (p, 0); /* offset zero */ + WRITELONG (p, 0); /* size zero */ + WRITESHORT (p, 3); /* local section-type thing */ +- WRITESHORT (p, (i==1 ? SHN_ABS : i-1)); /* the section id */ ++ WRITESHORT (p, i); /* the section id */ + saa_wbytes (s, entry, 16L); + *len += 16; + (*local)++; +@@ -986,7 +986,7 @@ static struct SAA *elf_build_reltab (lon + long sym = r->symbol; + + if (sym >= GLOBAL_TEMP_BASE) +- sym += -GLOBAL_TEMP_BASE + (nsects+3) + nlocals; ++ sym += -GLOBAL_TEMP_BASE + (nsects+2) + nlocals; + + p = entry; + WRITELONG (p, r->address); Deleted: tinysofa/snapshot/nasm/current/sources/nasm-0.98.34-fixdoc.patch =================================================================== --- tinysofa/snapshot/nasm/current/sources/nasm-0.98.34-fixdoc.patch 2004-07-01 15:51:28 UTC (rev 2796) +++ tinysofa/snapshot/nasm/current/sources/nasm-0.98.34-fixdoc.patch 2004-07-01 15:51:32 UTC (rev 2797) @@ -1,75 +0,0 @@ -diff -Nur nasm-0.98.34/doc/Makefile.in nasm-0.98.34.changed/doc/Makefile.in ---- nasm-0.98.34/doc/Makefile.in 2002-05-19 00:17:28.000000000 +0200 -+++ nasm-0.98.34.changed/doc/Makefile.in 2002-08-16 20:16:50.000000000 +0200 -@@ -18,15 +18,15 @@ - - PERL = perl - MAKEINFO = makeinfo --TEXI2DVI = texi2dvi --PS2PDF = ps2pdf -dOptimize=true # Part of GhostScript -+#TEXI2DVI = texi2dvi -+#PS2PDF = ps2pdf -dOptimize=true # Part of GhostScript - - SRCS = nasmdoc.src --OUT = nasm.info nasmdoc.ps nasmdoc.pdf -+OUT = nasm.info #nasmdoc.ps nasmdoc.pdf - - all: $(OUT) - --os2: nasm.inf -+#os2: nasm.inf - - # Consider html, txt and ps output a side effect - nasmdoc.dip: nasmdoc.src rdsrc.pl -@@ -37,12 +37,12 @@ - nasmdoc.texi: nasmdoc.dip - : Generated by side effect - --nasmdoc.ps: nasmdoc.dip nasmlogo.eps ../version genpsdriver.pl \ -+#nasmdoc.ps: nasmdoc.dip nasmlogo.eps ../version genpsdriver.pl \ - genps.pl psfonts.ph pswidth.ph head.ps -- $(PERL) $(srcdir)/genpsdriver.pl > nasmdoc.ps -+# $(PERL) $(srcdir)/genpsdriver.pl > nasmdoc.ps - --nasmdoc.pdf: nasmdoc.ps -- $(PS2PDF) nasmdoc.ps nasmdoc.pdf -+#nasmdoc.pdf: nasmdoc.ps -+# $(PS2PDF) nasmdoc.ps nasmdoc.pdf - - nasm.info: info/nasm.info - -@@ -52,15 +52,15 @@ - mv -f *.info *.info-* info - - # DVI output from texinfo (optional) --nasmdoc.dvi: nasmdoc.texi -- $(TEXI2DVI) nasmdoc.texi -+#nasmdoc.dvi: nasmdoc.texi -+# $(TEXI2DVI) nasmdoc.texi - - # Rules for building an OS/2 book --nasmdoc.ipf: nasmdoc.texi -- texi2ipf $< >$@ -- --nasm.inf: nasmdoc.ipf -- ipfc -i -s $< $@ -+#nasmdoc.ipf: nasmdoc.texi -+# texi2ipf $< >$@ -+# -+#nasm.inf: nasmdoc.ipf -+# ipfc -i -s $< $@ - - clean: - -rm -f *.rtf *.hpj *.texi *.gid *.ipf *.dip -@@ -72,7 +72,7 @@ - -rm -f nasmdoc*.ps - - install: all -- $(INSTALL_DATA) info/* $(INSTALLROOT)$(infodir) -- mkdir -p $(INSTALLROOT)$(docdir)/html -- $(INSTALL_DATA) html/* $(INSTALLROOT)$(docdir)/html -- $(INSTALL_DATA) nasmdoc.ps nasmdoc.pdf nasmdoc.txt $(INSTALLROOT)$(docdir) -+# $(INSTALL_DATA) info/* $(INSTALLROOT)$(infodir) -+# mkdir -p $(INSTALLROOT)$(docdir)/html -+# $(INSTALL_DATA) html/* $(INSTALLROOT)$(docdir)/html -+# $(INSTALL_DATA) nasmdoc.ps nasmdoc.pdf nasmdoc.txt $(INSTALLROOT)$(docdir) Deleted: tinysofa/snapshot/nasm/current/sources/nasm-0.98.34-noinfo.patch =================================================================== --- tinysofa/snapshot/nasm/current/sources/nasm-0.98.34-noinfo.patch 2004-07-01 15:51:28 UTC (rev 2796) +++ tinysofa/snapshot/nasm/current/sources/nasm-0.98.34-noinfo.patch 2004-07-01 15:51:32 UTC (rev 2797) @@ -1,35 +0,0 @@ -diff -Nur nasm-0.98.34/doc/Makefile.in nasm-0.98.34.changed/doc/Makefile.in ---- nasm-0.98.34/doc/Makefile.in 2002-08-30 21:52:09.000000000 +0200 -+++ nasm-0.98.34.changed/doc/Makefile.in 2002-08-30 21:53:35.000000000 +0200 -@@ -17,12 +17,12 @@ - INSTALL_DATA = @INSTALL_DATA@ - - PERL = perl --MAKEINFO = makeinfo -+#MAKEINFO = makeinfo - #TEXI2DVI = texi2dvi - #PS2PDF = ps2pdf -dOptimize=true # Part of GhostScript - - SRCS = nasmdoc.src --OUT = nasm.info #nasmdoc.ps nasmdoc.pdf -+OUT = #nasm.info #nasmdoc.ps nasmdoc.pdf - - all: $(OUT) - -@@ -44,12 +44,12 @@ - #nasmdoc.pdf: nasmdoc.ps - # $(PS2PDF) nasmdoc.ps nasmdoc.pdf - --nasm.info: info/nasm.info -+nasm.info:# info/nasm.info - - info/nasm.info: nasmdoc.texi -- mkdir -p info -- $(MAKEINFO) $< -- mv -f *.info *.info-* info -+# mkdir -p info -+# $(MAKEINFO) $< -+# mv -f *.info *.info-* info - - # DVI output from texinfo (optional) - #nasmdoc.dvi: nasmdoc.texi Modified: tinysofa/snapshot/nasm/current/specs/nasm.spec =================================================================== --- tinysofa/snapshot/nasm/current/specs/nasm.spec 2004-07-01 15:51:28 UTC (rev 2796) +++ tinysofa/snapshot/nasm/current/specs/nasm.spec 2004-07-01 15:51:32 UTC (rev 2797) @@ -1,95 +1,165 @@ -Summary: The Netwide Assembler, a portable x86 assembler with Intel-like syntax +Summary: A portable x86 assembler which uses Intel-like syntax. Name: nasm Version: 0.98.38 -Release: 5ts +Release: 2ts +Patch0: nasm-0.98-boguself2.patch License: LGPL -Group: tinysofa official -Source: http://unc.dl.sourceforge.net/sourceforge/nasm/nasm-%{version}.tar.bz2 -Patch0: nasm-0.98.34-fixdoc.patch -Patch1: nasm-0.98.34-noinfo.patch -URL: http://www.cryogen.com/Nasm/ -BuildRoot: %{_tmppath}/%{name}-root +Group: Development/Languages +Source: http://prdownloads.sourceforge.net/nasm/nasm-%{version}.tar.bz2 +URL: http://nasm.sourceforge.net/ +BuildRequires: perl texinfo ghostscript +BuildRoot: %{_tmppath}/%{name}-%{version}-root +Prereq: /sbin/install-info +%package doc +Summary: Documentation for NASM. +Group: Development/Languages + +%package rdoff +Summary: Tools for the RDOFF binary format, sometimes used with NASM. +Group: Development/Tools + %description NASM is the Netwide Assembler, a free portable assembler for the Intel 80x86 microprocessor series, using primarily the traditional Intel instruction mnemonics and syntax. -%package rdoff -Summary: Tools for the RDOFF binary format, sometimes used with NASM. -Group: tinysofa official +%description doc +This package contains documentation for the Netwide Assembler (NASM), +in HTML, info, PostScript, and text formats. %description rdoff Tools for the operating-system independent RDOFF binary format, which -is sometimes used with the Netwide Assembler (NASM). These tools +is sometimes used with the Netwide Assembler (NASM). These tools include linker, library manager, loader, and information dump. %prep -%setup -q -%patch0 -p1 -%patch1 -p1 +%setup +#patch0 -p1 -b .boguself %build -CFLAGS="$RPM_OPT_FLAGS" LDFLAGS=-s ./configure \ - --prefix=%{_prefix} \ - --mandir=%{_mandir} -make everything +%configure +make everything CFLAGS="$RPM_OPT_FLAGS -I. -I`pwd` -ansi -pedantic -Wall" %install -mkdir -p "$RPM_BUILD_ROOT"/usr/{bin,share/man/man1} +rm -fr $RPM_BUILD_ROOT +mkdir -p $RPM_BUILD_ROOT%{_bindir} +mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man1 +mkdir -p $RPM_BUILD_ROOT/%{_infodir} +mkdir -p $RPM_BUILD_ROOT/usr/tempdoc +%makeinstall install_everything docdir=$RPM_BUILD_ROOT/usr/tempdoc +cp -a $RPM_BUILD_ROOT/usr/tempdoc/html $RPM_BUILD_ROOT/usr/tempdoc/nasmdoc.{ps,txt} . +gzip -9f nasmdoc.{ps,txt} +# remove unpackaged filed from the buildroot +rm -rf $RPM_BUILD_ROOT%{_prefix}/tempdoc +rm -f $RPM_BUILD_ROOT%{_bindir}/rdf2ihx -make INSTALLROOT="$RPM_BUILD_ROOT" install_everything +%clean +rm -rf "$RPM_BUILD_ROOT" -rm -f $RPM_BUILD_ROOT%{_mandir}/man1/*.gz || : +%post +/sbin/install-info %{_infodir}/nasm.info.gz %{_infodir}/dir -%clean -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT +%preun +if [ $1 = 0 ]; then + /sbin/install-info --delete %{_infodir}/nasm.info.gz %{_infodir}/dir +fi %files %defattr(-,root,root) -%doc CHANGES COPYING ChangeLog README TODO -/usr/bin/nasm -/usr/bin/ndisasm -/usr/share/man/man1/* +%doc AUTHORS CHANGES README TODO +%{_bindir}/nasm +%{_bindir}/ndisasm +%{_mandir}/*/* +%{_infodir}/nasm.info*.gz +%files doc +%defattr(-,root,root) +%doc html nasmdoc.txt.gz nasmdoc.ps.gz + %files rdoff %defattr(-,root,root) -/usr/bin/ldrdf -/usr/bin/rdf2bin -/usr/bin/rdf2com -/usr/bin/rdf2ihx -/usr/bin/rdfdump -/usr/bin/rdflib -/usr/bin/rdx -%doc rdoff/README +%{_bindir}/ldrdf +%{_bindir}/rdf2bin +%{_bindir}/rdf2com +%{_bindir}/rdfdump +%{_bindir}/rdflib +%{_bindir}/rdx %changelog -* Wed May 19 2004 tsintegrate 0.98.38-5ts -- current (0.98.38-4ts) integrated as 0.98.38-5ts for release 1.0-U1 +* Fri Feb 13 2004 Elliot Lee +- rebuilt -* Tue Dec 9 2003 Erlend Midttun 0.98.38-1tr -- New upstream. +* Fri Sep 26 2003 Florian La Roche +- update to 0.98.38 and specfile cleanup -* Mon Jun 23 2003 Erlend Midttun 0.98.34-5tr -- Added %defattr. +* Wed Jun 04 2003 Elliot Lee +- rebuilt -* Wed Jun 18 2003 Erlend Midttun 0.98.34-4tr -- Big rebuild +* Wed Jan 22 2003 Tim Powers +- rebuilt -* Mon Mar 24 2003 Erlend Midttun 0.98.34-3em -- Rebuilt against glibc 2.3.2. +* Tue Dec 17 2002 Phil Knirsch 0.98.35-2 +- Removed ExclusiveArch tag. +- Fixed typo in homepage URL. -* Fri Aug 30 2002 Christian H. Toldnes 0.98.34-2ct -- Patched away the info generation (Patch1) -- This means no nasm_info.1 +* Wed Dec 11 2002 Thomas Woerner 0.98.35-1 +- new version 0.98.35 +- nasm has new homepage (#77323) -* Thu Aug 15 2002 Christian H. Toldnes 0.98.34-1ct -- Removed info pages. -- Added man page generated from info page. nasm_info.1 -- Removed separated doc package, it was soooo small... -- .spec cleanups -- Correct license -- New upstream version: 0.98.34 +* Fri Nov 29 2002 Tim Powers 0.98.34-2 +- fix %%doc list +- remove unpackaged files from the buildroot -* Mon Mar 26 2001 Alexander Reelsen -- Fixed install-info problem \ No newline at end of file +* Mon Sep 16 2002 Jeremy Katz 0.98.34-1hammer +- add x86_64 to ExclusiveArch list + +* Tue Jul 23 2002 Trond Eivind Glomsr?d 0.98.34-1 +- 0.98.34 + +* Fri Jun 21 2002 Tim Powers +- automated rebuild + +* Sun May 26 2002 Tim Powers +- automated rebuild + +* Tue May 21 2002 Trond Eivind Glomsr?d 0.98.32-1 +- 0.98.32 +- Various doc files have changed names/been removed/added +- New download location (after the license change, it's at sourceforge) +- The new version is LGPL +- Only build on x86 (#65255) + +* Tue Feb 26 2002 Trond Eivind Glomsr?d 0.98.22-2 +- Rebuild + +* Mon Jan 21 2002 Bernhard Rosenkraenzer +- Update to 0.98.22 to fix bogus code generation in SDL +- Fix spec file, handle RPM_OPT_FLAGS + +* Wed Jan 09 2002 Tim Powers +- automated rebuild + +* Tue Aug 7 2001 Trond Eivind Glomsr?d +- Updated patch from H.J. Lu for bogus elf generation (#45986, + verified by reporter) + +* Thu Apr 26 2001 Trond Eivind Glomsr?d +- Updated patch for bogus elf generation from hjl at gnu.org + +* Tue Feb 13 2001 Trond Eivind Glomsr?d +- Add patch from H.J. Lu to avoid creating bogus elf objects (#27489) + +* Wed Jul 12 2000 Prospector +- automatic rebuild + +* Tue Jun 13 2000 Trond Eivind Glomsr?d +- rewrote almost everything. The old specfile was bad, bad, bad. + Really Bad. + +* Tue Apr 04 2000 Erik Troan +- moved to distribution (syslinux needs it) +- gzipped man pages + +* Thu Dec 02 1999 Preston Brown +- adopted from one of the best .spec files I have seen in a long time. :) From svn at tinysofa.org Thu Jul 1 15:51:35 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:51:35 +1000 (EST) Subject: [tinysofa-svn] r2798 - in tinysofa/snapshot/nc/current: sources specs Message-ID: <20040701155135.75EDE4E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:51:35 +1000 (Fri, 02 Jul 2004) New Revision: 2798 Added: tinysofa/snapshot/nc/current/sources/nc-1.10-timeout.patch tinysofa/snapshot/nc/current/sources/netcat-1.10-ranges05.patch Modified: tinysofa/snapshot/nc/current/sources/nc.1 tinysofa/snapshot/nc/current/sources/nc110.tgz tinysofa/snapshot/nc/current/specs/nc.spec Log: - Sync with 2.0. - Kept: - nc-1.10-halfclose.patch: - nc-arm.patch: - nc-proto.patch: - nc.1: - nc110.tgz: - Added: - nc-1.10-timeout.patch: - netcat-1.10-ranges05.patch: Added: tinysofa/snapshot/nc/current/sources/nc-1.10-timeout.patch =================================================================== --- tinysofa/snapshot/nc/current/sources/nc-1.10-timeout.patch 2004-07-01 15:51:32 UTC (rev 2797) +++ tinysofa/snapshot/nc/current/sources/nc-1.10-timeout.patch 2004-07-01 15:51:35 UTC (rev 2798) @@ -0,0 +1,118 @@ +--- nc/netcat.c.orig Wed May 2 15:45:17 2001 ++++ nc/netcat.c Mon May 14 14:27:25 2001 +@@ -59,6 +59,14 @@ + #define RAND rand + #endif /* HAVE_RANDOM */ + ++/* #define POSIX_SETJMP /* If you want timeouts to work under the */ ++ /* posixly correct, yet non-standard glibc-2.x*/ ++ /* then define this- you may also need it for */ ++ /* IRIX, and maybe some others */ ++#ifdef LINUX ++#define POSIX_SETJMP ++#endif ++ + /* includes: */ + #include /* timeval, time_t */ + #include /* jmp_buf et al */ +@@ -106,7 +117,11 @@ + #define PINF struct port_poop + + /* globals: */ ++#ifdef POSIX_SETJMP ++sigjmp_buf jbuf; /* timer crud */ ++#else + jmp_buf jbuf; /* timer crud */ ++#endif + int jval = 0; /* timer crud */ + int netfd = -1; + int ofd = 0; /* hexdump output fd */ +@@ -232,7 +247,11 @@ + alarm (0); + if (jval == 0) + bail ("spurious timer interrupt!"); ++#ifdef POSIX_SETJMP ++ siglongjmp (jbuf, jval); ++#else + longjmp (jbuf, jval); ++#endif + } + + /* arm : +@@ -744,12 +763,21 @@ + + /* wrap connect inside a timer, and hit it */ + arm (1, o_wait); ++#ifdef POSIX_SETJMP ++ if (sigsetjmp (jbuf,1) == 0) { ++ rr = connect (nnetfd, (SA *)remend, sizeof (SA)); ++ } else { /* setjmp: connect failed... */ ++ rr = -1; ++ errno = ETIMEDOUT; /* fake it */ ++ } ++#else + if (setjmp (jbuf) == 0) { + rr = connect (nnetfd, (SA *)remend, sizeof (SA)); + } else { /* setjmp: connect failed... */ + rr = -1; + errno = ETIMEDOUT; /* fake it */ + } ++#endif + arm (0, 0); + if (rr == 0) + return (nnetfd); +@@ -821,7 +849,8 @@ + if (o_udpmode) { + x = sizeof (SA); /* retval for recvfrom */ + arm (2, o_wait); /* might as well timeout this, too */ +- if (setjmp (jbuf) == 0) { /* do timeout for initial connect */ ++#ifdef POSIX_SETJMP ++ if (sigsetjmp (jbuf,1) == 0) { /* do timeout for initial connect */ + rr = recvfrom /* and here we block... */ + (nnetfd, bigbuf_net, BIGSIZ, MSG_PEEK, (SA *) remend, &x); + Debug (("dolisten/recvfrom ding, rr = %d, netbuf %s ", rr, bigbuf_net)) +@@ -842,14 +871,44 @@ + rr = connect (nnetfd, (SA *)remend, sizeof (SA)); + goto whoisit; + } /* o_udpmode */ ++#else ++ if (setjmp (jbuf) == 0) { /* do timeout for initial connect */ ++ rr = recvfrom /* and here we block... */ ++ (nnetfd, bigbuf_net, BIGSIZ, MSG_PEEK, (SA *) remend, &x); ++Debug (("dolisten/recvfrom ding, rr = %d, netbuf %s ", rr, bigbuf_net)) ++ } else ++ goto dol_tmo; /* timeout */ ++ arm (0, 0); ++/* I'm not completely clear on how this works -- BSD seems to make UDP ++ just magically work in a connect()ed context, but we'll undoubtedly run ++ into systems this deal doesn't work on. For now, we apparently have to ++ issue a connect() on our just-tickled socket so we can write() back. ++ Again, why the fuck doesn't it just get filled in and taken care of?! ++ This hack is anything but optimal. Basically, if you want your listener ++ to also be able to send data back, you need this connect() line, which ++ also has the side effect that now anything from a different source or even a ++ different port on the other end won't show up and will cause ICMP errors. ++ I guess that's what they meant by "connect". ++ Let's try to remember what the "U" is *really* for, eh? */ ++ rr = connect (nnetfd, (SA *)remend, sizeof (SA)); ++ goto whoisit; ++ } /* o_udpmode */ ++#endif + + /* fall here for TCP */ + x = sizeof (SA); /* retval for accept */ + arm (2, o_wait); /* wrap this in a timer, too; 0 = forever */ ++#ifdef POSIX_SETJMP ++ if (sigsetjmp (jbuf,1) == 0) { ++ rr = accept (nnetfd, (SA *)remend, &x); ++ } else ++ goto dol_tmo; /* timeout */ ++#else + if (setjmp (jbuf) == 0) { + rr = accept (nnetfd, (SA *)remend, &x); + } else + goto dol_tmo; /* timeout */ ++#endif + arm (0, 0); + close (nnetfd); /* dump the old socket */ + nnetfd = rr; /* here's our new one */ Modified: tinysofa/snapshot/nc/current/sources/nc.1 =================================================================== --- tinysofa/snapshot/nc/current/sources/nc.1 2004-07-01 15:51:32 UTC (rev 2797) +++ tinysofa/snapshot/nc/current/sources/nc.1 2004-07-01 15:51:35 UTC (rev 2798) @@ -162,6 +162,7 @@ displayed unless .Fl v is specified twice. +.El .Sh EXAMPLES .Bl -tag -width x .It Li "nc" Modified: tinysofa/snapshot/nc/current/sources/nc110.tgz =================================================================== (Binary files differ) Added: tinysofa/snapshot/nc/current/sources/netcat-1.10-ranges05.patch =================================================================== --- tinysofa/snapshot/nc/current/sources/netcat-1.10-ranges05.patch 2004-07-01 15:51:32 UTC (rev 2797) +++ tinysofa/snapshot/nc/current/sources/netcat-1.10-ranges05.patch 2004-07-01 15:51:35 UTC (rev 2798) @@ -0,0 +1,26 @@ +diff -ur nc-1.10/netcat.c nc-1.10-ranges/netcat.c +--- nc-1.10/netcat.c 1996-03-21 01:38:04.000000000 +0100 ++++ nc-1.10-ranges/netcat.c 2002-06-10 16:10:28.000000000 +0200 +@@ -1552,8 +1552,9 @@ + argument, so we can control the pattern somewhat. */ + while (argv[optind]) { + hiport = loport = 0; +- cp = strchr (argv[optind], '-'); /* nn-mm range? */ +- if (cp) { ++ cp = strchr (argv[optind], '-'); /* nn-mm range? (dash in arg) */ ++ if (cp && (argv[optind][0] >= '0') && (argv[optind][0] <= '9')) { ++ /* have dash and arg is numeric */ + *cp = '\0'; + cp++; + hiport = getportpoop (cp, 0); +--- nc/Makefile.foo 2002-07-18 19:42:16.000000000 -0400 ++++ nc/Makefile 2002-07-18 19:42:34.000000000 -0400 +@@ -15,7 +15,7 @@ + # -Bstatic for sunos, -static for gcc, etc. You want this, trust me. + STATIC = + CC = cc $(CFLAGS) +-LD = $(CC) -s # linker; defaults to stripped executables ++LD = $(CC) # linker; defaults to stripped executables + o = o # object extension + + ALL = nc Modified: tinysofa/snapshot/nc/current/specs/nc.spec =================================================================== --- tinysofa/snapshot/nc/current/specs/nc.spec 2004-07-01 15:51:32 UTC (rev 2797) +++ tinysofa/snapshot/nc/current/specs/nc.spec 2004-07-01 15:51:35 UTC (rev 2798) @@ -1,15 +1,17 @@ Summary: Reads and writes data across network connections using TCP or UDP. Name: nc Version: 1.10 -Release: 10ts -Source0: http://www.atstake.com/research/tools/network_utilities/nc110.tgz +Release: 20ts +Source0: ftp://ftp.avian.org/src/hacks/nc110.tgz Source1: http://www.openbsd.org/src/usr.bin/nc/nc.1 Patch0: nc-arm.patch Patch1: nc-1.10-halfclose.patch Patch2: nc-proto.patch -License: GPL -Group: tinysofa official -BuildRoot: %{_tmppath}/%{name}-root +Patch3: nc-1.10-timeout.patch +Patch4: netcat-1.10-ranges05.patch +Copyright: GPL +Group: Applications/Internet +BuildRoot: %{_tmppath}/%{name}-%{version}-root %description The nc package contains Netcat (the program is actually nc), a simple @@ -29,6 +31,9 @@ %patch0 -p1 %patch1 -p1 -b .halfclose %patch2 -p1 -b .proto +%patch3 -p1 -b .timeout +%patch4 -p1 -b .range + cp %{SOURCE1} . %build @@ -36,40 +41,54 @@ make CFLAGS="$RPM_OPT_FLAGS" generic %install -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != "/" ] && rm -rf "$RPM_BUILD_ROOT" -install -d ${RPM_BUILD_ROOT}/usr/bin -install -d ${RPM_BUILD_ROOT}/usr/share/man/man1 -install -m 755 nc ${RPM_BUILD_ROOT}/usr/bin -install -m 644 nc.1 ${RPM_BUILD_ROOT}/usr/share/man/man1 +rm -rf ${RPM_BUILD_ROOT} +install -d ${RPM_BUILD_ROOT}%{_bindir} +install -m 755 nc ${RPM_BUILD_ROOT}%{_bindir} +install -d ${RPM_BUILD_ROOT}%{_mandir}/man1 +install -m 644 nc.1 ${RPM_BUILD_ROOT}%{_mandir}/man1 %clean -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != "/" ] && rm -rf "$RPM_BUILD_ROOT" +rm -rf ${RPM_BUILD_ROOT} %files %defattr(-,root,root) %doc README Changelog scripts -/usr/bin/nc -/usr/share/man/man1/nc.1* +%{_bindir}/nc +%{_mandir}/man1/nc.1* %changelog -* Wed May 19 2004 tsintegrate 1.10-10ts -- current (1.10-9ts) integrated as 1.10-10ts for release 1.0-U1 +* Fri Feb 13 2004 Elliot Lee +- rebuilt -* Sat Dec 6 2003 Erlend Midttun 1.10-6tr -- Big rebuild +* Wed Jun 04 2003 Elliot Lee +- rebuilt -* Wed Jun 18 2003 Erlend Midttun 1.10-5tr -- Big rebuild +* Wed Jan 22 2003 Tim Powers +- rebuilt -* Mon Mar 24 2003 Erlend Midttun 1.10-4em -- Rebuilt against glibc 2.3.2. +* Wed Dec 11 2002 Tim Powers 1.10-17 +- rebuild on all arches -* Wed Jul 24 2002 Daniel Meyer 1.10-3dm -- rebuild for Trustix Secure Linux 2.0 +* Tue Jul 23 2002 Bill Nottingham 1.10-16 +- fix for the parsing patch () -* Wed Feb 21 2001 Oren Tirosh -- Updated man path to /usr/share/man +* Thu Jul 18 2002 Bill Nottingham 1.10-15 +- don't strip binaries +- fix parsing of some services (#52874) () +- fix man page (#63544) +* Fri Jun 21 2002 Tim Powers +- automated rebuild + +* Thu May 23 2002 Tim Powers +- automated rebuild + +* Wed Jan 09 2002 Tim Powers +- automated rebuild + +* Tue May 15 2001 Bill Nottingham +- add patch to fix timeouts (#40689, ) + * Fri Oct 20 2000 Bill Nottingham - include reslov.h for res_init prototype @@ -93,4 +112,4 @@ - make it build on the arm * Tue Dec 29 1998 Cristian Gafton -- build for 6.0 \ No newline at end of file +- build for 6.0 From svn at tinysofa.org Thu Jul 1 15:51:40 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:51:40 +1000 (EST) Subject: [tinysofa-svn] r2799 - in tinysofa/snapshot/ncurses/current: sources specs Message-ID: <20040701155140.BD99E4E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:51:38 +1000 (Fri, 02 Jul 2004) New Revision: 2799 Added: tinysofa/snapshot/ncurses/current/sources/ncurses-5.2-nocbt.patch tinysofa/snapshot/ncurses/current/sources/ncurses-5.2-rxvt.patch tinysofa/snapshot/ncurses/current/sources/ncurses-5.4.tar.bz2 tinysofa/snapshot/ncurses/current/sources/ncurses-linux tinysofa/snapshot/ncurses/current/sources/ncurses-linux-m Removed: tinysofa/snapshot/ncurses/current/sources/ncurses-5.4.tar.gz Modified: tinysofa/snapshot/ncurses/current/sources/ncurses-5.4-color_xterm.patch tinysofa/snapshot/ncurses/current/specs/ncurses.spec Log: - Sync with 2.0. - Kept: - ncurses-5.4-color_xterm.patch: - ncurses-resetall.sh: - Added: - ncurses-5.2-nocbt.patch: - ncurses-5.2-rxvt.patch: - ncurses-5.4.tar.bz2: - ncurses-linux: - ncurses-linux-m: - Removed: - ncurses-5.4.tar.gz: Added: tinysofa/snapshot/ncurses/current/sources/ncurses-5.2-nocbt.patch =================================================================== --- tinysofa/snapshot/ncurses/current/sources/ncurses-5.2-nocbt.patch 2004-07-01 15:51:35 UTC (rev 2798) +++ tinysofa/snapshot/ncurses/current/sources/ncurses-5.2-nocbt.patch 2004-07-01 15:51:38 UTC (rev 2799) @@ -0,0 +1,10 @@ +--- ncurses-5.2/misc/terminfo.src.cbt Mon Apr 8 16:02:17 2002 ++++ ncurses-5.2/misc/terminfo.src Mon Apr 8 16:03:09 2002 +@@ -2669,7 +2669,6 @@ + bel=^G, + blink=\E[5m, + bold=\E[1m, +- cbt=\E[Z, + civis=\E[?25l, + clear=\E[H\E[2J, + cnorm=\E[?25h, Added: tinysofa/snapshot/ncurses/current/sources/ncurses-5.2-rxvt.patch =================================================================== --- tinysofa/snapshot/ncurses/current/sources/ncurses-5.2-rxvt.patch 2004-07-01 15:51:35 UTC (rev 2798) +++ tinysofa/snapshot/ncurses/current/sources/ncurses-5.2-rxvt.patch 2004-07-01 15:51:38 UTC (rev 2799) @@ -0,0 +1,11 @@ +--- ncurses-5.2/misc/terminfo.src.rxvt Thu Feb 22 12:14:11 2001 ++++ ncurses-5.2/misc/terminfo.src Thu Feb 22 12:14:20 2001 +@@ -3248,7 +3248,7 @@ + il=\E[%p1%dL, il1=\E[L, ind=^J, is1=\E[?47l\E=\E[?1l, + is2=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l\E[4l, + kDC=\E[3$, kEND=\E[8$, kHOM=\E[7$, kLFT=\E[d, kNXT=\E[6$, +- kPRV=\E[5$, kRIT=\E[c, ka1=\EOw, ka3=\EOy, kb2=\EOu, kbs=^H, ++ kPRV=\E[5$, kRIT=\E[c, ka1=\EOw, ka3=\EOy, kb2=\EOu, kbs=^?, + kc1=\EOq, kc3=\EOs, kcbt=\E[Z, kcub1=\E[D, kcud1=\E[B, + kcuf1=\E[C, kcuu1=\E[A, kdch1=\E[3~, kel=\E[8\^, + kend=\E[8~, kent=\EOM, kf1=\E[11~, kf10=\E[21~, Modified: tinysofa/snapshot/ncurses/current/sources/ncurses-5.4-color_xterm.patch =================================================================== --- tinysofa/snapshot/ncurses/current/sources/ncurses-5.4-color_xterm.patch 2004-07-01 15:51:35 UTC (rev 2798) +++ tinysofa/snapshot/ncurses/current/sources/ncurses-5.4-color_xterm.patch 2004-07-01 15:51:38 UTC (rev 2799) @@ -1,12 +1,17 @@ ---- ncurses-5.4/misc/terminfo.src.color_xterm 2004-01-17 20:37:18.000000000 -0500 -+++ ncurses-5.4/misc/terminfo.src 2004-02-26 14:44:33.000000000 -0500 -@@ -3023,8 +3023,7 @@ +--- ncurses-5.4/misc/terminfo.src.rh-xterm 2004-01-18 02:37:18.000000000 +0100 ++++ ncurses-5.4/misc/terminfo.src 2004-05-26 21:34:43.447721168 +0200 +@@ -3021,10 +3021,12 @@ + xterm-24|vs100|xterms|xterm terminal emulator (X Window System), + lines#24, use=xterm-r6, ++xterm-redhat|RedHat xterm, ++ kbs=\177, khome=\E[1~, kend=\E[4~, use=xterm-xfree86, ++ # This is xterm for ncurses. xterm|xterm terminal emulator (X Window System), - use=xterm-r6, -# use=xterm-xfree86, -+ bce, msgr, use=gnome-rh80, ++ use=xterm-redhat, # These entries allow access to the X titlebar and icon name as a status line. # Note that twm (and possibly window managers descended from it such as tvtwm, Added: tinysofa/snapshot/ncurses/current/sources/ncurses-5.4.tar.bz2 =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/ncurses/current/sources/ncurses-5.4.tar.bz2 ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: tinysofa/snapshot/ncurses/current/sources/ncurses-5.4.tar.gz =================================================================== (Binary files differ) Added: tinysofa/snapshot/ncurses/current/sources/ncurses-linux =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/ncurses/current/sources/ncurses-linux ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/ncurses/current/sources/ncurses-linux-m =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/ncurses/current/sources/ncurses-linux-m ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: tinysofa/snapshot/ncurses/current/specs/ncurses.spec =================================================================== --- tinysofa/snapshot/ncurses/current/specs/ncurses.spec 2004-07-01 15:51:35 UTC (rev 2798) +++ tinysofa/snapshot/ncurses/current/specs/ncurses.spec 2004-07-01 15:51:38 UTC (rev 2799) @@ -1,25 +1,32 @@ Summary: A CRT screen handling and optimization package. Name: ncurses Version: 5.4 -Release: 3ts +%define includedirw %{_includedir}/ncursesw +Release: 7ts License: distributable -Group: tinysofa official -Source0: ftp://ftp.gnu.org/gnu/ncurses/ncurses-%{version}.tar.gz -Source1: ncurses-resetall.sh -Patch1: ncurses-5.4-color_xterm.patch +Group: System Environment/Libraries +URL: http://dickey.his.com/ncurses/ncurses.html +Source0: ftp://dickey.his.com/ncurses/ncurses-%{version}.tar.bz2 +Source2: ncurses-linux +Source3: ncurses-linux-m +Source4: ncurses-resetall.sh +Patch10: ncurses-5.4-color_xterm.patch +Patch11: ncurses-5.2-rxvt.patch +Patch12: ncurses-5.2-nocbt.patch +BuildRequires: sharutils +BuildRoot: %{_tmppath}/%{name}-%{version}-root -BuildRoot: %{_tmppath}/%{name}-root - %description The curses library routines are a terminal-independent method of updating character screens with reasonable optimization. The ncurses (new curses) library is a freely distributable replacement for the -discontinued 4.4BSD classic curses library. +discontinued 4.4 BSD classic curses library. %package devel -Summary: The development files for applications which use ncurses. -Group: tinysofa official +Summary: The development files for applications that use ncurses. +Group: Development/Libraries Requires: ncurses = %{PACKAGE_VERSION} +Obsoletes: ncurses-c++-devel %description devel The header files and libraries for developing applications that use @@ -28,138 +35,345 @@ Install the ncurses-devel package if you want to develop applications which will use ncurses. +Use the following compiler flags to build against the ncurses library: + +-lncurses +(compile and link against the regular ncurses library) + +-I %{includedirw} -lncursesw +(compile and link against the wide-character, UTF-8, library) + %prep %setup -q -%patch1 -p1 -b .color_xterm -find . -name "*.orig" -exec rm -f {} \; +%patch10 -p1 -b .color_xterm %build -CFLAGS="$RPM_OPT_FLAGS -DPURE_TERMINFO -DSVR4_CURSES" ./configure \ - --with-install-prefix=$RPM_BUILD_ROOT \ - --libdir=/lib \ - --with-normal \ - --with-shared \ - --without-debug \ - --without-profile \ - --without-cxx \ - --without-ada \ - --enable-sigwinch \ - --enable-hard-tabs \ - --enable-colorfgbg \ - --mandir=%{_mandir} +CFLAGS="%{optflags} -DPURE_TERMINFO -DSVR4_CURSES" +%define optflags $CFLAGS + +#WITH_GPM="--with-gpm" + +mkdir narrowc widec +cd narrowc +ln -s ../configure . +%configure --with-shared --with-cxx --without-ada --with-ospeed=unsigned \ + $WITH_GPM --enable-sigwinch --enable-hard-tabs --enable-xmc-glitch \ + --enable-colorfgbg \ + --with-install-prefix=${RPM_BUILD_ROOT} make +cd ../widec +ln -s ../configure . +%configure --with-shared --with-cxx --without-ada --with-ospeed=unsigned \ + $WITH_GPM --enable-sigwinch --enable-hard-tabs --enable-xmc-glitch \ + --enable-colorfgbg --enable-widec \ + --with-install-prefix=${RPM_BUILD_ROOT} +make +cd .. %install -rm -rf $RPM_BUILD_ROOT -make install includedir=/usr/include/ncurses -ln -s ../l/linux $RPM_BUILD_ROOT/usr/share/terminfo/c/console -ln -s ncurses/curses.h $RPM_BUILD_ROOT/usr/include/ncurses.h -for I in curses unctrl eti form menu panel term; do - ln -sf ncurses/$I.h $RPM_BUILD_ROOT/usr/include/$I.h +rm -rf ${RPM_BUILD_ROOT} +mkdir -p ${RPM_BUILD_ROOT}%{_libdir} +mkdir -p ${RPM_BUILD_ROOT}%{_datadir} +mkdir -p ${RPM_BUILD_ROOT}%{_includedir} + +cd widec +make install includedir=%{_includedir}/ncurses +mkdir -p ${RPM_BUILD_ROOT}%{includedirw} +mv ${RPM_BUILD_ROOT}%{_includedir}/ncurses/* ${RPM_BUILD_ROOT}%{includedirw} +cd ../narrowc +make install includedir=%{_includedir}/ncurses +cd .. + +ln -s %{_datadir}/terminfo/l/linux ${RPM_BUILD_ROOT}%{_datadir}/terminfo/c/console +ln -s %{_includedir}/ncurses/curses.h ${RPM_BUILD_ROOT}%{_includedir}/ncurses.h + +for header in curses.h unctrl.h eti.h form.h menu.h panel.h term.h + do ln -sf ncurses/${header} ${RPM_BUILD_ROOT}%{_includedir}/${header} done -# We want to link stuff in /bin against ncurses, but we do not need to compile -# things without /usr mounted. -[ -d $RPM_BUILD_ROOT/usr/lib/ ] || mkdir $RPM_BUILD_ROOT/usr/lib/ -ln -sf /lib/libform.so.5 $RPM_BUILD_ROOT/usr/lib/libform.so -ln -sf /lib/libmenu.so.5 $RPM_BUILD_ROOT/usr/lib/libmenu.so -ln -sf /lib/libncurses.so.5 $RPM_BUILD_ROOT/usr/lib/libncurses.so -ln -sf /lib/libpanel.so.5 $RPM_BUILD_ROOT/usr/lib/libpanel.so -ln -sf /lib/libncurses.so.5 $RPM_BUILD_ROOT/usr/lib/libcurses.so +ln -sf libncurses.a ${RPM_BUILD_ROOT}%{_libdir}/libcurses.a +ln -sf libncursesw.a ${RPM_BUILD_ROOT}%{_libdir}/libcursesw.a -mv $RPM_BUILD_ROOT/lib/*.a $RPM_BUILD_ROOT/usr/lib/ +%ifarch sparc +install -c -m644 %SOURCE2 ${RPM_BUILD_ROOT}%{_datadir}/terminfo/l/linux +install -c -m644 %SOURCE3 ${RPM_BUILD_ROOT}%{_datadir}/terminfo/l/linux-m +%endif -strip $RPM_BUILD_ROOT/usr/bin/* || : -make clean -C test +install -c -m 755 %SOURCE4 ${RPM_BUILD_ROOT}%{_bindir}/resetall -# the resetall script -install -m 755 %{SOURCE1} $RPM_BUILD_ROOT/usr/bin/resetall +rm -f ${RPM_BUILD_ROOT}%{_datadir}/man/man2/key_defined.3x.20030517* +rm -f ${RPM_BUILD_ROOT}%{_datadir}/man/man2/panel.3x.20030517* %post -p /sbin/ldconfig %postun -p /sbin/ldconfig -%clean -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT - %files %defattr(-,root,root) -%doc README ANNOUNCE -%attr(755,root,root) /lib/lib*.so.* -/usr/share/terminfo -/usr/share/tabset -/usr/bin/* -/usr/share/man/man1/* -/usr/share/man/man5/* -/usr/share/man/man7/* +%doc README ANNOUNCE doc/html/announce.html +%attr(755,root,root) %{_libdir}/lib*.so.* +%{_datadir}/terminfo +%{_datadir}/tabset +%{_libdir}/lib*.so +%{_bindir}/* +%{_mandir}/man1/* +%{_mandir}/man5/* +%{_mandir}/man7/* %files devel %defattr(-,root,root) -%doc c++ test +%doc test %doc doc/html/hackguide.html %doc doc/html/ncurses-intro.html -/usr/lib/lib*.so -/usr/lib/lib*.a -%dir /usr/include/ncurses/ -/usr/include/ncurses/*.h -/usr/include/*.h -/usr/share/man/man3/* +%doc c++/README* +%{_libdir}/lib*.a +%dir %{_includedir}/ncurses +%dir %{_includedir}/ncursesw +%{_includedir}/ncurses/*.h +%{_includedir}/ncursesw/*.h +%{_includedir}/curses.h +%{_includedir}/ncurses.h +%{_includedir}/eti.h +%{_includedir}/form.h +%{_includedir}/menu.h +%{_includedir}/panel.h +%{_includedir}/term.h +%{_includedir}/unctrl.h +%{_mandir}/man3/* + +%clean +rm -rf ${RPM_BUILD_ROOT} + %changelog -* Wed May 19 2004 tsintegrate 5.4-3ts -- current (5.4-2ts) integrated as 5.4-3ts for release 1.0-U1 +* Sun May 30 2004 Florian La Roche +- remove ncurses-c++-devel rpm, all files are also part of ncurses-devel -* Thu Mar 25 2004 Omar Kilani 5.4-2ts -- Retag. -- Add color_xterm patch. This fixes all issues with tr..tix/tinysofa -- terminal emulation. Del works as it should, Home/End work. Colour -- works. A proper terminfo for tinysofa. Finally. +* Sat May 29 2004 Joe Orton 5.4-6 +- fix xterm terminfo entry (Hans de Geode, #122815) -* Wed Feb 18 2004 Omar Kilani 5.4-1ok -- New upstream. -- Get rid of all the patches. +* Thu May 06 2004 Adrian Havill 5.4-5 +- remove --with-gpm from configure, as it adds a pkg + dependency (#122336) and causes too many problems vs its benefits -* Wed Dec 6 2003 Erlend Midttun 5.3-7tr -- Big rebuild +* Tue Mar 02 2004 Elliot Lee +- rebuilt -* Tue Sep 16 2003 Chr. H. Toldnes 5.3-6tr -- Rebuilt and retagged for release. +* Thu Feb 26 2004 Adrian Havill 5.4-3 +- xterm-color is wrong for rh; inverted bs/del (#115499) -* Wed Sep 3 2003 Goetz Bock 5.3-5bg -- own /usr/include/ncurses, to get permissions right - (reported by Malpa) +* Wed Feb 25 2004 Adrian Havill 5.4-3 +- link "xterm" to "xterm-color" as temp fix for escape problem (#115448) +- remove old zcat for PATCH1 -* Wed Jun 18 2003 Erlend Midttun 5.3-4tr -- Big rebuild +* Fri Feb 13 2004 Elliot Lee +- rebuilt -* Mon Mar 24 2003 Erlend Midttun 5.3-3em -- Rebuilt against glibc 2.3.2. +* Tue Feb 10 2004 Adrian Havill 5.4-1 +- version update to 5.4 -* Tue Dec 19 2002 Goetz Bock 5.3-2bg -- the ncurses devel was broken, I've integrated a lot of patches from dickey -- hopefully it works now +* Thu Jan 29 2004 Adrian Havill 5.3-10 +- add /usr/include/ncursesw (#112979) +- allow for non-gzipped man pages during the build process -* Tue Dec 10 2002 Goetz Bock 5.3-1bg -- new upstream 5.3 -- removed all patches -- removed sparc specific sections/files +* Sun Sep 21 2003 Matt Wilson 5.3-9.3 +- remove the elf32/elf64 provides/obsoletes -* Thu Aug 15 2002 Christian H. Toldnes 5.2.6ct -- Minor .spec cleanup +* Wed Sep 17 2003 Matt Wilson 5.3-9.2 +- rebuild to fix gzipped file md5sums (#91211) -* Wed Jul 24 2002 Daniel Meyer 5.2-5dm -- rebuild for Trustix Secure Linux 2.0 +* Thu Sep 11 2003 Adrian Havill 5.3-9.1 +- RHEL bump -* Fri Jan 25 2002 Christian H. Toldnes -- Updated the curses compability symlinks. +* Thu Sep 11 2003 Adrian Havill 5.3-9 +- remove not-so safe-sprintf configure option because the code does + not appear to be stable enough for some apps. (#103790) -* Sun Nov 26 2000 Oystein Viggen 5.3-8.1 +- RHEL bump -* Tue Feb 15 2000 Erlend Midttun -- Made Ncurses 5 actually install as Ncurses 5 +* Wed Aug 20 2003 Adrian Havill 5.3-8 +- multilib patch (#91211) +* Mon Aug 11 2003 Adrian Havill 5.3-7 +- fixed the safe sprintf code that was enabled in the previous release + by the configure parameter. (#101486) + +* Mon Jun 16 2003 Elliot Lee 5.3-6.1 +- Fix ac25 patch, make it easy to turn off GPM support + +* Wed Jun 04 2003 Elliot Lee +- rebuilt + +* Thu May 22 2003 Adrian Havill 5.3-5 +- added latest rollup patch with widec/UTF8 centric weekly (20030517) +- added --enable-widec to configure (#86311) + original work done by Mr. Sam +- require sharutils (#86605) +- add gpm, xmc support +- add debug syms back into package +- updated autoconf/configure patch + +* Thu Feb 6 2003 Bill Nottingham 5.3-4 +- fix debuginfo package + +* Fri Jan 31 2003 Adrian Havill 5.3-3 +- remunged xterm changes from 5.2 patch for 5.3 +- updated screen entry (#82951) +- fixed ka3, kb2 and kf0 entries (#77506) + +* Wed Jan 22 2003 Tim Powers +- rebuilt + +* Wed Jan 22 2003 Adrian Havill 5.3-1 +- upgrade to 5.3 for sake of utf-8, wide chars (#77585 ...) +- spec file summary/desc grammar (#73583) +- add Requires: for c++ devel subpkg (#74002) +- terminfo.src patches no longer needed +- adjust autoconf patch + +* Thu Dec 05 2002 Elliot Lee 5.2-29 +- Merge in multilib fixes + +* Fri Jun 21 2002 Tim Powers +- automated rebuild + +* Thu May 23 2002 Tim Powers +- automated rebuild + +* Mon Apr 8 2002 Bernhard Rosenkraenzer 5.2-26 +- Remove duplicated files (#62752) +- Don't strip libraries (#60398) +- Remove cbt capability from xterm description (#61077) + +* Mon Feb 25 2002 Bernhard Rosenkraenzer 5.2-25 +- Remove bogus man pages +- Remove bool hack, it breaks make menuconfig + +* Fri Feb 22 2002 Bernhard Rosenkraenzer 5.2-24 +- Rebuild for glibc 2.3/gcc 3.1 + +* Fri Feb 22 2002 Bernhard Rosenkraenzer 5.2-23 +- Put the bool type back in for !c++, but leave TRUE/FALSE out + +* Thu Feb 21 2002 Bernhard Rosenkraenzer 5.2-21 +- Don't define TRUE/FALSE etc., we don't care about SVR4 compliance and + it breaks building gdb + +* Thu Feb 21 2002 Bernhard Rosenkraenzer 5.2-20 +- Rebuild for glibc 2.3/gcc 3.1 + +* Thu Feb 21 2002 Bernhard Rosenkraenzer 5.2-19 +- Patchlevel 20020218 +- Re-add %{_includedir}/ncurses.h (#60169) + +* Tue Feb 12 2002 Bernhard Rosenkraenzer 5.2-18 +- Add C++ bindings (#59751) + +* Tue Feb 12 2002 Bernhard Rosenkraenzer 5.2-17 +- Patchlevel 20020209 +- Fix zero-substitution of cf_cv_type_of_bool (#59450) +- Fix rebuilding of configure script with autoconf 2.5x + +* Thu Jan 31 2002 Bernhard Rosenkraenzer 5.2-16 +- Patchlevel 20020127 + +* Tue Nov 27 2001 Bernhard Rosenkraenzer 5.2-14 +- Patchlevel 20011124 + +* Thu Sep 13 2001 Bernhard Rosenkraenzer 5.2-13 +- Sync with patchlevel 20010908 + +* Fri Jul 20 2001 Bernhard Rosenkraenzer 5.2-12 +- Sync terminfo with termcap 11.0.1-10 + +* Sun Jun 24 2001 Bernhard Rosenkraenzer 5.2-11 +- Update to patchlevel 20010623, fixes some lynx issues + +* Mon Jun 18 2001 Helge Deller +- fixed tput -S segfaulting bug (#44669) +- use _tmppath for BuildRoot: +- Copyright -> License + +* Sun Apr 15 2001 Bernhard Rosenkraenzer +- Update to patchlevel 20010407 + +* Tue Mar 6 2001 Bernhard Rosenkraenzer +- Fix up some terminfo entries containing includes to + "/var/tmp/ncurses-root/something" (#30771) + +* Wed Feb 22 2001 Harald Hoyer +- fixed rxvt backspace setting + +* Fri Feb 9 2001 Yukihiro Nakai +- Update Japanese kterm patch + +* Mon Jan 15 2001 Bernhard Rosenkraenzer +- Update +- Add japanese patch from termcap +- Fix ospeed handling + +* Mon Jan 1 2001 Bernhard Rosenkraenzer +- Add libcurses.a -> libncurses.a symlink (RFE #23023) + +* Tue Dec 12 2000 Bernhard Rosenkraenzer +- Use --with-ospeed='unsigned int' + +* Fri Nov 17 2000 Bernhard Rosenkraenzer +- Fix alpha and ia64 +- Rebuild with gcc 2.96-64 + +* Thu Nov 2 2000 Bernhard Rosenkraenzer +- 5.2 +- Fix typo in man page (Bug #20205) +- update the "screen" terminfo entries to the version supplied with + screen 3.9.8 + +* Mon Oct 9 2000 Bernhard Rosenkraenzer +- Update (fixes the "make menuconfig" bug introduced by the security fix) + +* Tue Oct 3 2000 Bernhard Rosenkraenzer +- Fix security problem (possible buffer overrun) + +* Fri Aug 4 2000 Bernhard Rosenkraenzer +- Add the bugfix patches from the ncurses maintainer + +* Thu Jul 13 2000 Bernhard Rosenkraenzer +- 5.1 + +* Wed Jul 12 2000 Prospector +- automatic rebuild + +* Mon Jun 5 2000 Matt Wilson +- *don't ship symlinks from lib*.so.5 to lib*.so.4! +- use FHS macros + +* Fri Jun 2 2000 Bernhard Rosenkraenzer +- rebuild for 7.0 +- /usr/share/man +- update URL for patches +- misc. fixes to spec file + +* Mon Mar 20 2000 Bernhard Rosenkraenzer +- use the real library version number +- update to 20000319 + +* Tue Mar 7 2000 Jeff Johnson +- rebuild for sparc baud rates > 38400. + +* Fri Feb 18 2000 Preston Brown +- xterm terminfo entries from XFree86 3.3.6 +- final round of xterm fixes, follow debian policy. + +* Sat Feb 5 2000 Bernhard Rosenkr?nzer +- strip libraries + +* Thu Feb 3 2000 Bernhard Rosenkr?nzer +- More xterm fixes (Bug #9087) + +* Thu Jan 27 2000 Bernhard Rosenkr?nzer +- More xterm fixes from Hans de Goede (Bug #8633) + * Sat Jan 15 2000 Bernhard Rosenkr?nzer - remove some broken symlinks (leftovers from libncurses.so.5) - Use %configure (Bug #8484) @@ -270,3 +484,4 @@ * Tue Jul 08 1997 Erik Troan - built against glibc, linked shared libs against -lc + From svn at tinysofa.org Thu Jul 1 15:51:44 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:51:44 +1000 (EST) Subject: [tinysofa-svn] r2800 - in tinysofa/snapshot/net-tools/current: sources specs Message-ID: <20040701155144.5A3084E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:51:44 +1000 (Fri, 02 Jul 2004) New Revision: 2800 Added: tinysofa/snapshot/net-tools/current/sources/ether-wake.c tinysofa/snapshot/net-tools/current/sources/net-tools-1.60-execshield.patch tinysofa/snapshot/net-tools/current/sources/netplug-1.2.1-init.patch tinysofa/snapshot/net-tools/current/sources/netplug-1.2.6-compiler.patch tinysofa/snapshot/net-tools/current/sources/netplug-1.2.6.tar.bz2 Removed: tinysofa/snapshot/net-tools/current/sources/net-tools-1.57-ipvs.patch Modified: tinysofa/snapshot/net-tools/current/specs/net-tools.spec Log: - Sync with 2.0. - Kept: - net-tools-1.57-bug22040.patch: - net-tools-1.60-config.h: - net-tools-1.60-config.make: - net-tools-1.60-cycle.patch: - net-tools-1.60-gcc33.patch: - net-tools-1.60-gcc34.patch: - net-tools-1.60-inet6-lookup.patch: - net-tools-1.60-interface.patch: - net-tools-1.60-ipx.patch: - net-tools-1.60-man.patch: - net-tools-1.60-manydevs.patch: - net-tools-1.60-miiioctl.patch: - net-tools-1.60-nameif.patch: - net-tools-1.60-overflow.patch: - net-tools-1.60-trailingblank.patch: - net-tools-1.60-virtualname.patch: - net-tools-1.60.tar.bz2: - Added: - ether-wake.c: - net-tools-1.60-execshield.patch: - netplug-1.2.1-init.patch: - netplug-1.2.6-compiler.patch: - netplug-1.2.6.tar.bz2: - Removed: - net-tools-1.57-ipvs.patch: Added: tinysofa/snapshot/net-tools/current/sources/ether-wake.c =================================================================== --- tinysofa/snapshot/net-tools/current/sources/ether-wake.c 2004-07-01 15:51:38 UTC (rev 2799) +++ tinysofa/snapshot/net-tools/current/sources/ether-wake.c 2004-07-01 15:51:44 UTC (rev 2800) @@ -0,0 +1,340 @@ +/* ether-wake.c: Send a magic packet to wake up sleeping machines. */ + +static char version_msg[] = +"ether-wake.c: v1.05 12/28/2000 Donald Becker, http://www.scyld.com/"; +static char brief_usage_msg[] = +"usage: ether-wake [-i ] [-p aa:bb:cc:dd[:ee:ff]] 00:11:22:33:44:55\n\ + Use '-u' to see the complete set of options.\n"; +static char usage_msg[] = +"usage: ether-wake [-i ] [-p aa:bb:cc:dd[:ee:ff]] 00:11:22:33:44:55\n\ +\n\ +This program generates and transmits a Wake-On-LAN (WOL) \"Magic Packet\",\n\ +used for restarting machines that have been soft-powered-down\n\ +(ACPI D3-warm state). It currently generates the standard AMD Magic Packet\n\ +format, with an optional password appended.\n\ +\n\ +The single required parameter is the Ethernet MAC (station) address\n\ +of the machine to wake. This is typically retrieved with the 'arp'\n\ +program while the target machine is awake.\n\ +\n\ +Options:\n\ + -b Send wake-up packet to the broadcast address.\n\ + -D Increase the debug level.\n\ + -i ifname Use interface IFNAME instead of the default 'eth0'.\n\ + -p Append the four or six byte password PW to the packet.\n\ + A password is only required for a few adapter types.\n\ + The password may be specified in ethernet hex format\n\ + or dotted decimal (Internet address)\n\ + -p 00:22:44:66:88:aa\n\ + -p 192.168.1.1\n\ +"; + +/* + This program generates and transmits a Wake-On-LAN (WOL) "Magic Packet", + used for restarting machines that have been soft-powered-down + (ACPI D3-warm state). It currently generates the standard AMD Magic Packet + format, with an optional password appended. + + This software may be used and distributed according to the terms + of the GNU Public License, incorporated herein by reference. + Contact the author for use under other terms. + + This source file is part of the network tricks package. + + The author may be reached as becker at scyld, or C/O + Scyld Computing Corporation + 410 Severn Ave., Suite 210 + Annapolis MD 21403 + + The single required parameter is the Ethernet MAC (station) address + of the machine to wake. This is typically retrieved with the 'arp' + program while the target machine is awake. + + Options: + -b Send wake-up packet to the broadcast address. + -D Increase the debug level. + -i ifname Use interface IFNAME instead of the default "eth0". + -p Append the four or six byte password PW to the packet. + A password is only required for a few adapter types. + The password may be specified in ethernet hex format + or dotted decimal (Internet address) + -p 00:22:44:66:88:aa + -p 192.168.1.1 + + Note: On some systems dropping root capability allows the process to be + dumped, traced or debugged. + If someone traces this program, they get control of a raw socket. + Linux handles this safely, but beware when porting this program. + +*/ + +#include +#include +#include +#include +#include +#include + +#if 0 /* Only exists on some versions. */ +#include +#endif + +#include + +#include +#include +#include + +#ifdef UIO_MAXIOV +/*extern int setsockopt __P ((int __fd, int __level, int __optname, + __ptr_t __optval, int __optlen));*/ +#else /* New, correct head files. */ +#include +#endif +#ifdef USE_SENDMSG +#include +#endif + +u_char outpack[1000]; +int outpack_sz = 0; +int debug = 0; +u_char wol_passwd[6]; +int wol_passwd_sz = 0; + +static int opt_no_src_addr = 0, opt_broadcast = 0; + +static int get_fill(unsigned char *pkt, char *arg); +static int get_wol_pw(const char *optarg); + +int main(int argc, char *argv[]) +{ + struct sockaddr whereto; /* who to wake up */ + char *ifname = "eth0"; + int one = 1; /* True, for socket options. */ + int s; /* Raw socket */ + int errflag = 0, verbose = 0, do_version = 0; + int i, c, pktsize; + + while ((c = getopt(argc, argv, "bDi:p:uvV")) != -1) + switch (c) { + case 'b': opt_broadcast++; break; + case 'D': debug++; break; + case 'i': ifname = optarg; break; + case 'p': get_wol_pw(optarg); break; + case 'u': printf(usage_msg); return 0; + case 'v': verbose++; break; + case 'V': do_version++; break; + case '?': + errflag++; + } + if (verbose || do_version) + printf("%s\n", version_msg); + if (errflag) { + fprintf(stderr, brief_usage_msg); + return 3; + } + + if (optind == argc) { + fprintf(stderr, "Specify the Ethernet address as 00:11:22:33:44:55.\n"); + return 3; + } + + /* Note: PF_INET, SOCK_DGRAM, IPPROTO_UDP would allow SIOCGIFHWADDR to + work as non-root, but we need SOCK_PACKET to specify the Ethernet + destination address. */ + if ((s = socket(AF_INET, SOCK_PACKET, SOCK_PACKET)) < 0) { + if (errno == EPERM) + fprintf(stderr, "ether-wake must run as root\n"); + else + perror("ether-wake: socket"); + if (! debug) + return 2; + } + /* Don't revert if debugging allows a normal user to get the raw socket. */ + setuid(getuid()); + + pktsize = get_fill(outpack, argv[optind]); + + /* Fill in the source address, if possible. + The code to retrieve the local station address is Linux specific. */ + if (! opt_no_src_addr){ + struct ifreq if_hwaddr; + unsigned char *hwaddr = if_hwaddr.ifr_hwaddr.sa_data; + + strcpy(if_hwaddr.ifr_name, ifname); + if (ioctl(s, SIOCGIFHWADDR, &if_hwaddr) < 0) { + fprintf(stderr, "SIOCGIFHWADDR on %s failed: %s\n", ifname, + strerror(errno)); + return 1; + } + memcpy(outpack+6, if_hwaddr.ifr_hwaddr.sa_data, 6); + + if (verbose) { + printf("The hardware address (SIOCGIFHWADDR) of %s is type %d " + "%2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x.\n", ifname, + if_hwaddr.ifr_hwaddr.sa_family, hwaddr[0], hwaddr[1], + hwaddr[2], hwaddr[3], hwaddr[4], hwaddr[5]); + } + } + + if (wol_passwd_sz > 0) { + memcpy(outpack+pktsize, wol_passwd, wol_passwd_sz); + pktsize += wol_passwd_sz; + } + + if (verbose > 1) { + printf("The final packet is: "); + for (i = 0; i < pktsize; i++) + printf(" %2.2x", outpack[i]); + printf(".\n"); + } + + /* This is necessary for broadcasts to work */ + if (setsockopt(s, SOL_SOCKET, SO_BROADCAST, (char *)&one, sizeof(one)) < 0) + perror("setsockopt: SO_BROADCAST"); + + whereto.sa_family = 0; + strcpy(whereto.sa_data, ifname); + + if ((i = sendto(s, outpack, pktsize, 0, &whereto, sizeof(whereto))) < 0) + perror("sendto"); + else if (debug) + printf("Sendto worked ! %d.\n", i); + +#ifdef USE_SEND + if (bind(s, &whereto, sizeof(whereto)) < 0) + perror("bind"); + else if (send(s, outpack, 100, 0) < 0) + perror("send"); +#endif +#ifdef USE_SENDMSG + { + struct msghdr msghdr; + struct iovec iovector[1]; + msghdr.msg_name = &whereto; + msghdr.msg_namelen = sizeof(whereto); + msghdr.msg_iov = iovector; + msghdr.msg_iovlen = 1; + iovector[0].iov_base = outpack; + iovector[0].iov_len = pktsize; + if ((i = sendmsg(s, &msghdr, 0)) < 0) + perror("sendmsg"); + else if (debug) + printf("sendmsg worked, %d (%d).\n", i, errno); + } +#endif + + return 0; +} + +static int get_fill(unsigned char *pkt, char *arg) +{ + int sa[6]; + unsigned char station_addr[6]; + int byte_cnt; + int offset, i; + char *cp; + + for (cp = arg; *cp; cp++) + if (*cp != ':' && !isxdigit(*cp)) { + (void)fprintf(stderr, + "ping: patterns must be specified as hex digits.\n"); + exit(2); + } + + byte_cnt = sscanf(arg, "%2x:%2x:%2x:%2x:%2x:%2x", + &sa[0], &sa[1], &sa[2], &sa[3], &sa[4], &sa[5]); + for (i = 0; i < 6; i++) + station_addr[i] = sa[i]; + if (debug) + fprintf(stderr, "Command line stations address is " + "%2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x.\n", + sa[0], sa[1], sa[2], sa[3], sa[4], sa[5]); + + if (byte_cnt != 6) { + (void)fprintf(stderr, + "ping: The Magic Packet address must be specified as " + "00:11:22:33:44:55.\n"); + exit(2); + } + + if (opt_broadcast) + memset(pkt+0, 0xff, 6); + else + memcpy(pkt, station_addr, 6); + memcpy(pkt+6, station_addr, 6); + pkt[12] = 0x08; /* Or 0x0806 for ARP, 0x8035 for RARP */ + pkt[13] = 0x42; + offset = 14; + + memset(pkt+offset, 0xff, 6); + offset += 6; + + for (i = 0; i < 16; i++) { + memcpy(pkt+offset, station_addr, 6); + offset += 6; + } + if (debug) { + fprintf(stderr, "Packet is "); + for (i = 0; i < offset; i++) + fprintf(stderr, " %2.2x", pkt[i]); + fprintf(stderr, ".\n"); + } + return offset; +} + +static int get_wol_pw(const char *optarg) +{ + int passwd[6]; + int byte_cnt; + int i; + + byte_cnt = sscanf(optarg, "%2x:%2x:%2x:%2x:%2x:%2x", + &passwd[0], &passwd[1], &passwd[2], + &passwd[3], &passwd[4], &passwd[5]); + if (byte_cnt < 4) + byte_cnt = sscanf(optarg, "%d.%d.%d.%d", + &passwd[0], &passwd[1], &passwd[2], &passwd[3]); + if (byte_cnt < 4) { + fprintf(stderr, "Unable to read the Wake-On-LAN password.\n"); + return 0; + } + printf(" The Magic packet password is %2.2x %2.2x %2.2x %2.2x (%d).\n", + passwd[0], passwd[1], passwd[2], passwd[3], byte_cnt); + for (i = 0; i < byte_cnt; i++) + wol_passwd[i] = passwd[i]; + return wol_passwd_sz = byte_cnt; +} + +#if 0 +{ + to = (struct sockaddr_in *)&whereto; + to->sin_family = AF_INET; + if (inet_aton(target, &to->sin_addr)) { + hostname = target; + } + memset (&sa, 0, sizeof sa); + sa.sa_family = AF_INET; + strncpy (sa.sa_data, interface, sizeof sa.sa_data); + sendto (sock, buf, bufix + len, 0, &sa, sizeof sa); + strncpy (sa.sa_data, interface, sizeof sa.sa_data); +#if 1 + sendto (sock, buf, bufix + len, 0, &sa, sizeof sa); +#else + bind (sock, &sa, sizeof sa); + connect(); + send (sock, buf, bufix + len, 0); +#endif +} +#endif + + +/* + * Local variables: + * compile-command: "gcc -O -Wall -o ether-wake ether-wake.c" + * c-indent-level: 4 + * c-basic-offset: 4 + * c-indent-level: 4 + * tab-width: 4 + * End: + */ Deleted: tinysofa/snapshot/net-tools/current/sources/net-tools-1.57-ipvs.patch =================================================================== --- tinysofa/snapshot/net-tools/current/sources/net-tools-1.57-ipvs.patch 2004-07-01 15:51:38 UTC (rev 2799) +++ tinysofa/snapshot/net-tools/current/sources/net-tools-1.57-ipvs.patch 2004-07-01 15:51:44 UTC (rev 2800) @@ -1,14 +0,0 @@ -diff -Nru net-tools-1.57.prepatch/lib/masq_info.c net-tools-1.57/lib/masq_info.c ---- net-tools-1.57.prepatch/lib/masq_info.c Sun Jun 13 01:04:49 1999 -+++ net-tools-1.57/lib/masq_info.c Thu Nov 16 15:47:43 2000 -@@ -118,7 +118,9 @@ - ms->src.sin_family = AF_INET; - ms->dst.sin_family = AF_INET; - -- if (strcmp("TCP", buf) == 0) -+ if (strcmp("IP", buf) == 0) -+ ms->proto = "ip"; -+ else if (strcmp("TCP", buf) == 0) - ms->proto = "tcp"; - else if (strcmp("UDP", buf) == 0) - ms->proto = "udp"; Added: tinysofa/snapshot/net-tools/current/sources/net-tools-1.60-execshield.patch =================================================================== --- tinysofa/snapshot/net-tools/current/sources/net-tools-1.60-execshield.patch 2004-07-01 15:51:38 UTC (rev 2799) +++ tinysofa/snapshot/net-tools/current/sources/net-tools-1.60-execshield.patch 2004-07-01 15:51:44 UTC (rev 2800) @@ -0,0 +1,51 @@ +diff -urN net-tools-1.60/netplug-1.2.6/main.c net-tools-1.60.new/netplug-1.2.6/main.c +--- net-tools-1.60/netplug-1.2.6/main.c 2004-02-22 06:52:14.000000000 +0100 ++++ net-tools-1.60.new/netplug-1.2.6/main.c 2004-05-06 18:28:22.845977718 +0200 +@@ -149,10 +149,10 @@ + + /* Poll the existing interface state, so we can catch any state + changes for which we may not have neen a netlink message. */ ++static int sockfd = -1; + static void + poll_interfaces(void) + { +- static int sockfd = -1; + + if (sockfd == -1) { + sockfd = socket(PF_INET, SOCK_DGRAM, IPPROTO_IP); +@@ -182,6 +182,12 @@ + for_each_iface(pollflags); + } + ++int poll_flags(struct if_info *i) { ++ if (if_match(i->name)) ++ ifsm_flagpoll(i); ++ return 0; ++} ++ + int debug = 0; + + int +@@ -287,17 +293,11 @@ + { child_handler_pipe[0], POLLIN, 0 }, + }; + +- { +- /* Run over each of the interfaces we know and care about, and +- make sure the state machine has done the appropriate thing +- for their current state. */ +- int poll_flags(struct if_info *i) { +- if (if_match(i->name)) +- ifsm_flagpoll(i); +- return 0; +- } +- for_each_iface(poll_flags); +- } ++ /* Run over each of the interfaces we know and care about, and ++ make sure the state machine has done the appropriate thing ++ for their current state. */ ++ for_each_iface(poll_flags); ++ + + for(;;) { + int ret; Added: tinysofa/snapshot/net-tools/current/sources/netplug-1.2.1-init.patch =================================================================== --- tinysofa/snapshot/net-tools/current/sources/netplug-1.2.1-init.patch 2004-07-01 15:51:38 UTC (rev 2799) +++ tinysofa/snapshot/net-tools/current/sources/netplug-1.2.1-init.patch 2004-07-01 15:51:44 UTC (rev 2800) @@ -0,0 +1,26 @@ +--- net-tools-1.60/netplug-1.2.6/scripts/rc.netplugd.init 2003-09-08 20:20:19.000000000 +0200 ++++ net-tools-1.60/netplug-1.2.6/scripts/rc.netplugd 2004-03-23 15:41:41.319783975 +0100 +@@ -3,7 +3,7 @@ + # netplugd This shell script takes care of starting and stopping + # the network plug management daemon. + # +-# chkconfig: 2345 11 89 ++# chkconfig: - 11 89 + # description: netplugd is a daemon for managing non-static network \ + # interfaces. + # processname: netplugd +@@ -49,9 +49,12 @@ + RETVAL=$? + ;; + restart|reload) +- $0 stop +- $0 start ++ stop ++ start + ;; ++ condrestart) ++ [ -f /var/lock/subsys/netplugd ] && restart || : ++ ;; + *) + echo $"Usage: $0 {start|stop|status|restart}" + RETVAL=1 Added: tinysofa/snapshot/net-tools/current/sources/netplug-1.2.6-compiler.patch =================================================================== --- tinysofa/snapshot/net-tools/current/sources/netplug-1.2.6-compiler.patch 2004-07-01 15:51:38 UTC (rev 2799) +++ tinysofa/snapshot/net-tools/current/sources/netplug-1.2.6-compiler.patch 2004-07-01 15:51:44 UTC (rev 2800) @@ -0,0 +1,11 @@ +--- net-tools-1.60/netplug-1.2.6/netlink.c.compiler 2004-05-08 23:21:21.000000000 +0200 ++++ net-tools-1.60/netplug-1.2.6/netlink.c 2004-05-14 17:23:59.729190738 +0200 +@@ -93,7 +93,7 @@ + + if (msg->msg_namelen != sizeof(struct sockaddr_nl)) { + do_log(LOG_ERR, "Unexpected sender address length: got %d, expected %d", +- msg->msg_namelen, sizeof(struct sockaddr_nl)); ++ msg->msg_namelen, (int)sizeof(struct sockaddr_nl)); + return done; + } + Added: tinysofa/snapshot/net-tools/current/sources/netplug-1.2.6.tar.bz2 =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/net-tools/current/sources/netplug-1.2.6.tar.bz2 ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: tinysofa/snapshot/net-tools/current/specs/net-tools.spec =================================================================== --- tinysofa/snapshot/net-tools/current/specs/net-tools.spec 2004-07-01 15:51:38 UTC (rev 2799) +++ tinysofa/snapshot/net-tools/current/specs/net-tools.spec 2004-07-01 15:51:44 UTC (rev 2800) @@ -1,12 +1,16 @@ -Summary: The basic tools for setting up networking. +%define npversion 1.2.6 + +Summary: Basic networking tools. Name: net-tools Version: 1.60 -Release: 10ts +Release: 27ts License: GPL -Group: tinysofa official +Group: System Environment/Base Source0: http://www.tazenda.demon.co.uk/phil/net-tools/net-tools-%{version}.tar.bz2 -Source1: net-tools-%{version}-config.h -Source2: net-tools-%{version}-config.make +Source1: netplug-%{npversion}.tar.bz2 +Source2: net-tools-%{version}-config.h +Source3: net-tools-%{version}-config.make +Source4: ether-wake.c Patch1: net-tools-1.57-bug22040.patch Patch2: net-tools-1.60-miiioctl.patch Patch3: net-tools-1.60-manydevs.patch @@ -19,130 +23,255 @@ Patch10: net-tools-1.60-gcc33.patch Patch11: net-tools-1.60-trailingblank.patch Patch12: net-tools-1.60-interface.patch -Patch13: net-tools-1.60-gcc34.patch -Patch14: net-tools-1.60-overflow.patch -Patch15: net-tools-1.57-ipvs.patch -BuildRoot: %{_tmppath}/%{name}-root -BuildRequires: gettext +Patch13: netplug-1.2.1-init.patch +Patch14: net-tools-1.60-gcc34.patch +Patch15: net-tools-1.60-overflow.patch +Patch16: net-tools-1.60-execshield.patch +Patch17: netplug-1.2.6-compiler.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-root +Requires(post,preun): chkconfig %description -The net-tools package contains the basic tools needed for setting up -networking: ethers, route and others. +The net-tools package contains basic networking tools, including +ifconfig, netstat, route, and others. %prep -%setup -q -%patch1 -p1 -%patch2 -p1 -%patch3 -p0 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 -%patch7 -p1 -%patch8 -p1 -%patch9 -p1 -%patch10 -p1 -%patch11 -p1 -%patch12 -p1 -%patch13 -p1 -%patch14 -p1 -%patch15 -p1 +%setup -q -a 1 +%patch1 -p 1 -b .bug22040 +%patch2 -p 1 -b .miiioctl +%patch3 -p 0 -b .manydevs +%patch4 -p 1 -b .virtualname +%patch5 -p 1 -b .cycle +%patch6 -p 1 -b .nameif +%patch7 -p 1 -b .ipx +%patch8 -p 1 -b .inet6-lookup +%patch9 -p 1 -b .man +%patch10 -p1 -b .gcc33 +%patch11 -p1 -b .trailingblank +%patch12 -p1 -b .interface +%patch13 -p1 -b .init +%patch14 -p1 -b .gcc34 +%patch15 -p1 -b .overflow +%patch16 -p1 -b .execshield +%patch17 -p1 -b .compiler -cp %SOURCE1 ./config.h -cp %SOURCE2 ./config.make +cp %SOURCE2 ./config.h +cp %SOURCE3 ./config.make +cp %SOURCE4 . +%ifarch alpha +perl -pi -e "s|-O2||" Makefile +%endif + %build -RPM_OPT_FLAGS="$RPM_OPT_FLAGS" -export RPM_OPT_FLAGS make +gcc $RPM_OPT_FLAGS -o ether-wake ether-wake.c +pushd netplug-%{npversion} +make +popd %install -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != "/" ] && rm -rf "$RPM_BUILD_ROOT" -mkdir -p $RPM_BUILD_ROOT/{bin,sbin,usr/share/man/man{1,5,8}} +rm -rf $RPM_BUILD_ROOT mv man/de_DE man/de mv man/fr_FR man/fr mv man/pt_BR man/pt -make BASEDIR=$RPM_BUILD_ROOT install -# Workaround due to Makefile bug -cp nameif $RPM_BUILD_ROOT/sbin +make BASEDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install +install -m 755 ether-wake %{buildroot}/sbin + +pushd netplug-%{npversion} +make install prefix=$RPM_BUILD_ROOT \ + initdir=$RPM_BUILD_ROOT/%{_initrddir} \ + mandir=$RPM_BUILD_ROOT/%{_mandir} +mv README README.netplugd +mv TODO TODO.netplugd +popd + +rm %{buildroot}/sbin/rarp +rm %{buildroot}%{_mandir}/man8/rarp.8* + %find_lang %{name} %clean -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT +rm -rf $RPM_BUILD_ROOT +%post + /sbin/chkconfig --add netplugd + exit 0 + +%preun +if [ "$1" = "0" ]; then + /sbin/chkconfig --del netplugd || : + /sbin/service netplugd stop &> /dev/null || : +fi +exit 0 + +%postun + /sbin/service netplugd condrestart >/dev/null 2>&1 || : + exit 0 + %files -f %{name}.lang %defattr(-,root,root) -/bin/dnsdomainname -/bin/domainname -/bin/hostname -/bin/netstat -/bin/nisdomainname -/bin/ypdomainname -/sbin/arp -/sbin/ifconfig -/sbin/ipmaddr -/sbin/iptunnel -/sbin/mii-tool -/sbin/nameif -/sbin/plipconfig -/sbin/rarp -/sbin/route -/sbin/slattach +%doc netplug-%{npversion}/TODO.netplugd netplug-%{npversion}/README.netplugd COPYING +/bin/* +/sbin/* %{_mandir}/man[158]/* -%lang(de) %{_mandir}/de/man[158]/* -%lang(fr) %{_mandir}/fr/man[158]/* -%lang(pt) %{_mandir}/pt/man[158]/* +%lang(de) %{_mandir}/de/man[158]/* +%lang(fr) %{_mandir}/fr/man[158]/* +%lang(pt) %{_mandir}/pt/man[158]/* +%config %{_sysconfdir}/netplug/netplugd.conf +%{_sysconfdir}/netplug.d +%{_sysconfdir}/rc.d/init.d/netplugd %changelog -* Wed May 19 2004 tsintegrate 1.60-10ts -- current (1.60-10ok) integrated as 1.60-10ts for release 1.0-U1 +* Fri May 14 2004 Phil Knirsch 1.60-27 +- Fixed compiler warning/error in netplug. +- Updated to netplug-1.2.6 for security update and fixes. -* Tue May 18 2004 Omar Kilani -- BuildRequires gettext. +* Thu May 06 2004 Phil Knirsch 1.60-26 +- Updated netplugd to latest upstream version. +- Fixed execshield problem in main.c of netplugd. -* Fri May 14 2004 Omar Kilani 1.60-10ok -- Add a bunch of patches (buffer overflow fixes) from Fedora. -- Package gettext files. -- Package de /fr / pt man pages. -- Get rid of strip. +* Thu Apr 15 2004 Phil Knirsch 1.60-25 +- Fixed several possible buffer overflows (#120343) -* Mon Dec 8 2003 Erlend Midttun 1.60-6tr -- Big rebuild +* Tue Mar 30 2004 Harald Hoyer - 1.60-24 +- fixed compilation with gcc34 -* Wed Jun 18 2003 Erlend Midttun 1.60-5tr -- Big rebuild +* Tue Mar 23 2004 Karsten Hopp 1.60-23 +- add chkconfig call in post and preun, fix init script (#116555) -* Mon May 19 2003 Erlend Midttun 1.60-4em -- Fixed multiline to compile with GCC 3.3 +* Thu Feb 19 2004 Phil Knirsch +- Added netplug-1.2.1 to net-tools (FR #103419). -* Mon Mar 24 2003 Erlend Midttun 1.60-3em -- Rebuilt against glibc 2.3.2. +* Fri Feb 13 2004 Elliot Lee +- rebuilt -* Mon Jun 24 2002 Christian H. Toldnes 1.60-2ct -- Rebuild for TSL-2.0 +* Mon Aug 25 2003 Phil Knirsch 1.60-20.1 +-rebuilt -* Fri Jun 8 2001 Oystein Viggen -- New upstream version: 1.60 +* Mon Aug 25 2003 Phil Knirsch 1.60-20 +- interface option now works as described in the man page (#61113). -* Tue Mar 6 2001 Alexander Reelsen -- Picked up 1.59 -- enabled mii-tool/nameif commands +* Tue Aug 19 2003 Phil Knirsch 1.60-19.1 +- rebuilt -* Thu Nov 16 2000 Erlend Midttun -- Added ipvs patch +* Tue Aug 19 2003 Phil Knirsch 1.60-19 +- Fixed trailing blank bug in hostname output (#101263). +- Remove -O2 fir alpha (#78955). +- Updated netstat statistic output, was still broken. -* Thu Sep 14 2000 Per Ivar Paulsen -- update to 1.57 +* Tue Jun 17 2003 Phil Knirsch 1.60-18.1 +- rebuilt -* Thu May 11 2000 Oystein Viggen -- update to 1.55 +* Tue Jun 17 2003 Phil Knirsch 1.60-18 +- fix ether-wake.c build with gcc 3.3 +- rebuilt -* Thu Feb 17 2000 Erlend Midttun -- Moved man pages to comply with FHS -- Removed locales +* Wed Jun 04 2003 Elliot Lee +- rebuilt +* Wed Jun 04 2003 Phil Knirsch 1.60-16.1 +- Bumped release and rebuilt + +* Fri May 23 2003 Phil Knirsch 1.60-16 +- Fixed ether-wake usage output (#55801). + +* Thu May 22 2003 Jeremy Katz 1.60-15 +- fix build with gcc 3.3 + +* Thu May 22 2003 Phil Knirsch 1.60-14 +- Fixed wrong manpage (#55473). + +* Wed May 21 2003 Phil Knirsch +- Added inet6-lookup patch from John van Krieken (#84108). +- Fixed outdated link in ifconfig manpage (#91287). + +* Tue May 20 2003 Phil Knirsch +- Fixed incorrect address display for ipx (#46434). +- Fixed wrongly installed manpage dirs (#50664). + +* Wed Mar 19 2003 Phil Knirsch 1.60-13 +- Fixed nameif problem (#85748). + +* Fri Feb 07 2003 Phil Knirsch 1.60-12 +- Fixed -s parameter. +- Fix /proc statistics for -nic operation. +- Fixed -i operation in general. + +* Mon Jan 27 2003 Phil Knirsch 1.60-11 +- Disable smp build. + +* Wed Jan 22 2003 Tim Powers 1.60-10 +- rebuilt + +* Tue Dec 17 2002 Phil Knirsch 1.60-9 +- Rebuild +- Copyright -> License. + +* Thu Dec 05 2002 Elliot Lee 1.60-8 +- Rebuild + +* Tue Aug 06 2002 Phil Knirsch +- Added patch from Norm for a corrected output. + +* Fri Jun 21 2002 Tim Powers +- automated rebuild + +* Thu May 23 2002 Tim Powers +- automated rebuild + +* Fri Apr 12 2002 Jeremy Katz +- fix nstrcmp() to be correct in the case where there are many devices + of the same type, eg, "eth10" > "eth1" (#61436) + +* Tue Jul 31 2001 Bill Nottingham +- do *not* use SIOCDEVPRIVATE for MII ioctls + +* Fri Jun 1 2001 Preston Brown +- include wake-on-lan wakeup utility, ether-wake by Donald Becker + +* Wed Apr 18 2001 Crutcher Dunnavant +- itterate to 1.60 + +* Sun Apr 8 2001 Preston Brown +- use find_lang macro +- less specific locale dirs for man pages + +* Mon Apr 2 2001 Preston Brown +- don't use this version of rarp, doesn't work with our 2.4. + +* Tue Feb 6 2001 Crutcher Dunnavant +- fixed man page typo, closing bug #25921 + +* Fri Feb 1 2001 Crutcher Dunnavant +- applied twaugh's patch to close bug #25474 +- which was a buffer length bug. + +* Wed Dec 27 2000 Jeff Johnson +- locales not initialized correctly (#20570). +- arp: document -e option (#22040). + +* Sat Oct 7 2000 Jeff Johnson +- update to 1.57. +- MTU (and other) option(s) not parsed correctly (#9215). +- allow more granularity iwth --numeric (#9129). + +* Wed Jul 12 2000 Prospector +- automatic rebuild + +* Tue Jun 6 2000 Jeff Johnson +- update to 1.56. +- FHS packaging. + +* Sat Apr 15 2000 Jeff Johnson +- update to 1.55. + +* Tue Mar 7 2000 Jeff Johnson +- rebuild for sparc baud rates > 38400. + * Wed Feb 02 2000 Cristian Gafton - fix description @@ -227,4 +356,4 @@ * Thu Jun 19 1997 Erik Troan - built against glibc -- updated to 1.33 \ No newline at end of file +- updated to 1.33 From svn at tinysofa.org Thu Jul 1 15:51:46 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:51:46 +1000 (EST) Subject: [tinysofa-svn] r2801 - in tinysofa/snapshot/netatalk/current: sources specs Message-ID: <20040701155146.91B284E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:51:46 +1000 (Fri, 02 Jul 2004) New Revision: 2801 Added: tinysofa/snapshot/netatalk/current/sources/ICDumpSuffixMap tinysofa/snapshot/netatalk/current/sources/atalk.init tinysofa/snapshot/netatalk/current/sources/netatalk-1.6.3-norc.patch Removed: tinysofa/snapshot/netatalk/current/sources/netatalk.init Modified: tinysofa/snapshot/netatalk/current/specs/netatalk.spec Log: - Sync with 2.0. - Kept: - netatalk-1.6.4.tar.bz2: - Added: - ICDumpSuffixMap: - atalk.init: - netatalk-1.6.3-norc.patch: - Removed: - netatalk.init: Added: tinysofa/snapshot/netatalk/current/sources/ICDumpSuffixMap =================================================================== --- tinysofa/snapshot/netatalk/current/sources/ICDumpSuffixMap 2004-07-01 15:51:44 UTC (rev 2800) +++ tinysofa/snapshot/netatalk/current/sources/ICDumpSuffixMap 2004-07-01 15:51:46 UTC (rev 2801) @@ -0,0 +1 @@ +#!perl # # ICDumpMap # --- Dump suffix mappings from your Internet Config extension. # # iNOUE Koich! # use Mac::InternetConfig; open MAP, ">AppleVolumes"; printf MAP "%-9s \"%4s\" \"%4s\" %-30s %-25s %-15s\n\n", ".", "TEXT", "ttxt", "ASCII Text", "SimpleText", "text/plain"; print MAP "\# The following lines are extracted from Internet Config Preference.\n\n"; for my $entry (keys %InternetConfigMap) { next unless $entry->extension =~ /^\./; $_ = sprintf "%-9s \"%4s\" \"%4s\" %-30s %-25s %-15s", $entry->extension, $entry->file_type, $entry->file_creator, $entry->entry_name, $entry->creator_app_name, $entry->MIME_type; s/\s*$/\n/; print MAP; } close MAP; \ No newline at end of file Added: tinysofa/snapshot/netatalk/current/sources/atalk.init =================================================================== --- tinysofa/snapshot/netatalk/current/sources/atalk.init 2004-07-01 15:51:44 UTC (rev 2800) +++ tinysofa/snapshot/netatalk/current/sources/atalk.init 2004-07-01 15:51:46 UTC (rev 2801) @@ -0,0 +1,95 @@ +#!/bin/sh +# chkconfig: - 91 35 +# description: This package enables Linux to talk to Macintosh computers via the \ +# AppleTalk networking protocol. It includes a daemon to allow Linux \ +# to act as a file server over EtherTalk or IP for Mac's. +# processname: atalkd +# pidfile: /var/run/atalkd.pid +# config: /etc/atalk/* + +# Source function library. +. /etc/init.d/functions + +# Source networking configuration. +. /etc/sysconfig/network + +# Source Appletalk configuration +. /etc/atalk/netatalk.conf + +# Check that networking is up. +[ ${NETWORKING} = "no" ] && exit 0 + +start() { + echo -n $"Starting AppleTalk services: " + if [ ${ATALK_BGROUND} = yes ] ; then + echo -n "(backgrounded)" + { + daemon atalkd -f /etc/atalk/atalkd.conf + nbprgstr -p 4 "${ATALK_NAME}:Workstation" + nbprgstr -p 4 "${ATALK_NAME}:netatalk" + if [ ${PAPD_RUN} = yes ] ; then + daemon papd -f /etc/atalk/papd.conf + fi + if [ ${AFPD_RUN} = yes ] ; then + daemon afpd -c ${AFPD_MAX_CLIENTS} -n \"${ATALK_NAME}\" -f /etc/atalk/AppleVolumes.default -s /etc/atalk/AppleVolumes.system + fi + } >/dev/null & + else + daemon atalkd -f /etc/atalk/atalkd.conf + nbprgstr -p 4 "${ATALK_NAME}:Workstation" + nbprgstr -p 4 "${ATALK_NAME}:netatalk" + if [ ${PAPD_RUN} = yes ] ; then + daemon papd -f /etc/atalk/papd.conf + fi + if [ ${AFPD_RUN} = yes ] ; then + daemon afpd -c ${AFPD_MAX_CLIENTS} -n \"${ATALK_NAME}\" -f /etc/atalk/AppleVolumes.default -s /etc/atalk/AppleVolumes.system + fi + fi + echo + touch /var/lock/subsys/atalk +} + +stop() { + echo -n $"Shutting down AppleTalk services: " + killproc afpd + killproc papd + nbpunrgstr "${ATALK_NAME}:Workstation@*" + nbpunrgstr "${ATALK_NAME}:netatalk@*" + killproc atalkd + # Attempt to zap the module, so that we can restart the + # Appletalk daemons cleanly + if [ -e /proc/modules ] && [ -x /sbin/modprobe ] ; then + modprobe -r appletalk + fi + rm -f /var/lock/subsys/atalk + echo "" +} + + +restart() { + stop + start +} + +case "$1" in + start) + start + ;; + stop) + stop + ;; + restart|reload) + restart + ;; + condrestart) + [ -f /var/lock/subsys/atalk ] && restart || : + ;; + status) + status atalkd + ;; + *) + echo $"Usage: $0 {start|stop|restart|status|condrestart}" + exit 1 +esac + +exit 0 Added: tinysofa/snapshot/netatalk/current/sources/netatalk-1.6.3-norc.patch =================================================================== --- tinysofa/snapshot/netatalk/current/sources/netatalk-1.6.3-norc.patch 2004-07-01 15:51:44 UTC (rev 2800) +++ tinysofa/snapshot/netatalk/current/sources/netatalk-1.6.3-norc.patch 2004-07-01 15:51:46 UTC (rev 2801) @@ -0,0 +1,20 @@ +--- netatalk-1.6.3/bin/afile/Makefile.in.norc 2003-06-12 19:07:40.000000000 -0400 ++++ netatalk-1.6.3/bin/afile/Makefile.in 2003-07-08 14:22:28.000000000 -0400 +@@ -184,7 +184,6 @@ + INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/sys + + bin_PROGRAMS = afile achfile +-bin_SCRIPTS = acleandir.rc + + afile_SOURCES = afile.c common.c common.h + achfile_SOURCES = achfile.c common.c common.h +--- netatalk-1.6.3/man/man1/Makefile.in.norc 2003-06-09 11:59:12.000000000 -0400 ++++ netatalk-1.6.3/man/man1/Makefile.in 2003-07-08 14:22:28.000000000 -0400 +@@ -188,7 +188,6 @@ + GENERATED_MANS = apple_cp.1 apple_mv.1 apple_rm.1 + TEMPLATE_FILES = $(foreach f,$(GENERATED_MANS),$(f).tmpl) + NONGENERATED_MANS = achfile.1 \ +- acleandir.1 \ + aecho.1 \ + afile.1 \ + afppasswd.1 \ Deleted: tinysofa/snapshot/netatalk/current/sources/netatalk.init =================================================================== --- tinysofa/snapshot/netatalk/current/sources/netatalk.init 2004-07-01 15:51:44 UTC (rev 2800) +++ tinysofa/snapshot/netatalk/current/sources/netatalk.init 2004-07-01 15:51:46 UTC (rev 2801) @@ -1,150 +0,0 @@ -#! /bin/sh -# chkconfig: - 91 35 -# description: This package enables Linux to talk to Macintosh -# computers via the AppleTalk networking protocol and -# provides printer, file sharing, and AppleTalk routing -# services. -# -# AppleTalk daemons. Make sure not to start atalkd in the background: -# its data structures must have time to stablize before running the -# other processes. - -# Source function library. -. /etc/init.d/functions - -# Source networking configuration. -. /etc/sysconfig/network - -if [ ! -x /usr/sbin/atalkd ]; then - echo "$0: Could not find the atalk executable" - failure "Could not find the atalk executable" - echo - exit 1 -fi - -if [ ! -f /etc/atalk/netatalk/netatalk.conf ]; then - echo "$0: Could not find the atalk config file" - failure "Could not find the atalk config file" - echo - exit 1 -fi - - -# read in netatalk configuration -. /etc/atalk/netatalk/netatalk.conf - -# Check that networking is up. -[ ${NETWORKING} = "no" ] && exit 0 - -# initialize return values -RETVAL=1 -RETVAL_ATALKD=0 -RETVAL_PAPD=0 -RETVAL_AFPD=0 - -# startup code for everything -atalk_startup() { - if [ x"${ATALKD_RUN}" != x"no" ]; then - daemon /usr/sbin/atalkd - RETVAL_ATALKD=$? - - if [ -x /usr/bin/nbprgstr ]; then - /usr/bin/nbprgstr -p 4 "${ATALK_NAME}:Workstation${ATALK_ZONE}" - /usr/bin/nbprgstr -p 4 "${ATALK_NAME}:netatalk${ATALK_ZONE}" - fi - - if [ x"${PAPD_RUN}" = x"yes" -a -x /usr/sbin/papd ]; then - daemon /usr/sbin/papd - RETVAL_PAPD=$? - fi - - # check for timelord in bin directory - if [ -x /usr/bin/timelord ]; then - daemon /usr/bin/timelord - fi - - # check for timelord in sbin directory - if [ -x /usr/sbin/timelord ]; then - daemon /usr/sbin/timelord - fi - - fi - - if [ x"${AFPD_RUN}" = x"yes" -a -x /usr/sbin/afpd ] ; then - daemon /usr/sbin/afpd ${AFPD_UAMLIST} -g ${AFPD_GUEST} \ - -c ${AFPD_MAX_CLIENTS} -n "${ATALK_NAME}${ATALK_ZONE}" - RETVAL_AFPD=$? - fi - - if [ $RETVAL_ATALKD -eq 0 -a $RETVAL_PAPD -eq 0 -a $RETVAL_AFPD -eq 0 ]; then - RETVAL=0 - touch ${INITLOCK:-/mnt/lockdev}/atalk || RETVAL=1 - fi -} - -case "$1" in -'start') - echo -n 'Starting AppleTalk services: ' - if [ x"${ATALK_BGROUND}" = x"yes" ]; then - echo -n "(backgrounded)" - atalk_startup >& /dev/null & - else - atalk_startup - fi - echo - ;; -'stop') - echo -n 'Shutting down AppleTalk services: ' - if [ x"${ATALKD_RUN}" != x"no" ]; then - if [ x"${PAPD_RUN}" = x"yes" -a -x /usr/sbin/papd ]; then - killproc papd - RETVAL_PAPD=$? - fi - - # checking for timelord in bin directory - if [ -x /usr/bin/timelord ]; then - killproc timelord - fi - - # checking for timelord in sbin directory - if [ -x /usr/sbin/timelord ]; then - killproc timelord - fi - - /usr/bin/nbpunrgstr "${ATALK_NAME}:Workstation${ATALK_ZONE}" - /usr/bin/nbpunrgstr "${ATALK_NAME}:netatalk${ATALK_ZONE}" - - # kill atalkd last, since without it the plumbing goes away. - if [ -x /usr/sbin/atalkd ]; then - killproc atalkd - RETVAL_ATALKD=$? - fi - fi - - # kill this separately as we also do AFP/tcp - if [ x"${AFPD_RUN}" = x"yes" -a -x /usr/sbin/afpd ]; then - killproc afpd - RETVAL_AFPD=$? - fi - - if [ $RETVAL_ATALKD -eq 0 -a $RETVAL_PAPD -eq 0 -a $RETVAL_AFPD -eq 0 ] ; then - RETVAL=0 - rm -f ${INITLOCK:-/mnt/lockdev}/atalk || RETVAL=1 - fi - echo "" - ;; - 'restart'|'reload') - $0 stop - $0 start - RETVAL=$? - ;; - 'status') - status atalkd - RETVAL=$? - ;; - *) - echo "Usage: atalk {start|stop|restart|status}" - exit 1 -esac - -exit $RETVAL Modified: tinysofa/snapshot/netatalk/current/specs/netatalk.spec =================================================================== --- tinysofa/snapshot/netatalk/current/specs/netatalk.spec 2004-07-01 15:51:44 UTC (rev 2800) +++ tinysofa/snapshot/netatalk/current/specs/netatalk.spec 2004-07-01 15:51:46 UTC (rev 2801) @@ -1,211 +1,374 @@ -Summary: Appletalk and Appleshare/IP services for Linux + %define initdir /etc/rc.d/init.d + +Summary: AppleTalk networking programs Name: netatalk Version: 1.6.4 -Release: 5ts -License: BSD -Group: tinysofa official -Source0: http://prdownloads.sourceforge.net/netatalk/%{name}-%{version}.tar.bz2 -Source1: netatalk.init -URL: http://netatalk.sourceforge.net/ -Requires: cracklib, openssl, tcp_wrappers, pam, tinysofa-utils -BuildRequires: openssl-devel -BuildRequires: gcc-c++-devel db4-devel kerberos5-devel libcom_err-devel -BuildRequires: pam-devel -Prefix: %{_prefix} -BuildRoot: %{_tmppath}/%{name}-root +Release: 3ts +License: GPL +Group: System Environment/Daemons +Source0: http://download.sourceforge.net/netatalk/netatalk-%{version}.tar.bz2 +Source1: atalk.init +#Source2: netatalk.config +#Source3: AppleVolumes.system +Source4: ICDumpSuffixMap +Patch0: netatalk-1.6.3-norc.patch +#Patch1: netatalk-1.5.5-openssl097.patch +#Patch2: netatalk-1.5.5-pathcat.patch +Epoch: 2 +Obsoletes: netatalk-1.5.5 +Url: http://netatalk.sourceforge.net/ +Prereq: /sbin/chkconfig, /sbin/service +Requires: pam >= 0.56, /etc/pam.d/system-auth, tcp_wrappers, openssl, cracklib +BuildRequires: cracklib openssl-devel pam quota libtool automake autoconf +BuildRoot: %{_tmppath}/%{name}-%{version}-root %description -netatalk is an implementation of the AppleTalk Protocol Suite for Unix/Linux -systems. The current release contains support for Ethertalk Phase I and II, -DDP, RTMP, NBP, ZIP, AEP, ATP, PAP, ASP, and AFP. It provides Appletalk file -printing and routing services on Solaris 2.5, Linux, FreeBSD, SunOS 4.1 and -Ultrix 4. It also supports AFP 2.1 and 2.2 (Appleshare IP). +This package enables Linux to talk to Macintosh computers via the +AppleTalk networking protocol. It includes a daemon to allow Linux +to act as a file server over EtherTalk or IP for Mac's. %package devel -Group: tinysofa official -Summary: Appletalk and Appleshare/IP services for Linux development files -Requires: glibc-devel +Summary: Headers and static libraries for Appletalk development +Group: Development/Libraries %description devel -netatalk is an implementation of the AppleTalk Protocol Suite for Unix/Linux -systems. The current release contains support for Ethertalk Phase I and II, -DDP, RTMP, NBP, ZIP, AEP, ATP, PAP, ASP, and AFP. It provides Appletalk file -printing and routing services on Solaris 2.5, Linux, FreeBSD, SunOS 4.1 and -Ultrix 4. It also supports AFP 2.1 and 2.2 (Appleshare IP). +This package contains the header files, and static libraries for building +Appletalk networking programs. -This package is required for developing appletalk-based applications. - %prep -%setup -q +%setup -q +%patch0 -p 1 -b .norc +#%patch1 -p 1 -b .openssl097 +#%patch2 -p1 -b .pathcat %build -#./autogen.sh -CFLAGS="$(echo $RPM_OPT_FLAGS | sed "s|-D_FILE_OFFSET_BITS=64 -D_LARGE_FILES=1 -D_LARGEFILE64_SOURCE=1||") -fomit-frame-pointer -fsigned-char" ./configure \ - --prefix=%{prefix} \ - --with-cracklib \ - --with-pam \ - --sysconfdir=/etc/atalk \ - --with-tcp-wrappers \ - --mandir=%{_mandir} \ - --with-uams-path=/etc/atalk/uams \ - --with-nls-path=/etc/atalk/nls \ - --with-ssl -make CONFIG_DIR=/etc/atalk +touch AUTHORS +libtoolize --force +aclocal -I macros +automake --add-missing +autoconf +autoheader +CFLAGS="$RPM_OPT_FLAGS -fsigned-char" %configure \ + --with-pkgconfdir=/etc/atalk/ --with-cracklib --with-pam \ + --with-shadow --with-tcp-wrappers --with-ssl --with-flock-locksi \ + --with-uams-path=%{_libdir} +# Grrrr. Fix broken libtool/autoFOO Makefiles. +if [ "%{_lib}" != lib ]; then + find . -name Makefile | xargs perl -pi \ + -e 's,-L/usr/lib,-L%{_libdir},g' + find . -name Makefile | xargs perl -pi \ + -e 's,-L/lib,-L/%{_lib},g' +fi + +make all + %install -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != "/" ] && rm -rf "$RPM_BUILD_ROOT" -### INSTALL (USING "make install") ### -mkdir -p $RPM_BUILD_ROOT/{usr,etc/atalk/uams} -make DESTDIR=$RPM_BUILD_ROOT CONFIG_DIR=/etc/atalk install +rm -rf $RPM_BUILD_ROOT -# install /etc/init.d/atalk -mkdir -p $RPM_BUILD_ROOT%{_initdir} -install -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_initdir}/atalk +mkdir -p $RPM_BUILD_ROOT/etc/atalk/{uams,nls} +mkdir -p $RPM_BUILD_ROOT/etc/pam.d +mkdir -p $RPM_BUILD_ROOT%{initdir} +mkdir -p $RPM_BUILD_ROOT/usr/include/{netatalk,atalk} -# make NLS -( \ - mkdir -p $RPM_BUILD_ROOT/etc/atalk/nls/; \ - cd $RPM_BUILD_ROOT/etc/atalk/nls; \ - $RPM_BUILD_ROOT/usr/bin/makecode \ -) +make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install -# install pam file -mkdir -p $RPM_BUILD_ROOT/etc/pam.d/ -install -m 644 config/netatalk.pamd \ - $RPM_BUILD_ROOT/etc/pam.d/netatalk +install -m644 config/AppleVolumes.default $RPM_BUILD_ROOT/etc/atalk/AppleVolumes.default +install -m644 config/afpd.conf $RPM_BUILD_ROOT/etc/atalk/afpd.conf +install -m644 config/atalkd.conf $RPM_BUILD_ROOT/etc/atalk/atalkd.conf +install -m644 config/papd.conf $RPM_BUILD_ROOT/etc/atalk/papd.conf +install -m644 config/netatalk.pamd $RPM_BUILD_ROOT/etc/pam.d/netatalk +install -m644 %{SOURCE4} . +#install -m644 %{SOURCE3} $RPM_BUILD_ROOT/etc/atalk/AppleVolumes.system +#install -m644 %{SOURCE2} $RPM_BUILD_ROOT/etc/atalk/netatalk.conf +install -m755 %{SOURCE1} $RPM_BUILD_ROOT%{initdir}/atalk +cp include/atalk/*.h $RPM_BUILD_ROOT/usr/include/atalk/ +cp sys/netatalk/*.h $RPM_BUILD_ROOT/usr/include/netatalk/ -# We don't have /usr/bin/rc -rm $RPM_BUILD_ROOT/usr/bin/acleandir.rc +rm -f $RPM_BUILD_ROOT/usr/include/netatalk/at.h || : -%pre -service atalk stop 2> /dev/null > /dev/null || : +cd $RPM_BUILD_ROOT/etc/atalk/nls +$RPM_BUILD_ROOT/usr/bin/makecode || true +# Remove .la files in buildroot +rm -rf $RPM_BUILD_ROOT%{_libdir}/*.la +rm -f $RPM_BUILD_ROOT%{_bindir}/acleandir.rc \ + $RPM_BUILD_ROOT%{_mandir}/man1/acleandir.1* + +%clean +rm -rf $RPM_BUILD_ROOT + %post /sbin/chkconfig --add atalk -/sbin/ldconfig -/sbin/restart_maybe atalk %preun -if [ $1 = 0 ]; then - service atalk stop 2> /dev/null > /dev/null || : - /sbin/chkconfig --del atalk +if [ "$1" = "0" ] ; then + /sbin/service atalk stop > /dev/null 2>&1 + /sbin/chkconfig --del atalk fi -%clean -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT +%postun +if [ "$1" -ge "1" ]; then + /sbin/service atalk condrestart > /dev/null 2>&1 || : +fi %files %defattr(-,root,root) -%doc CONTRIBUTORS doc/DEVELOPER doc/README.hidden-items COPYING -%doc NEWS doc/FAQ doc/README.platforms COPYRIGHT README doc/INSTALL -%doc doc/README.veto ChangeLog TODO VERSION doc/CONFIGURE +%doc COPYRIGHT ChangeLog README* TODO VERSION NEWS +%doc ICDumpSuffixMap doc %dir /etc/atalk -%dir /etc/atalk/netatalk %dir /etc/atalk/nls -%dir /etc/atalk/uams -%config /etc/atalk/netatalk/Apple* -%config /etc/atalk/netatalk/*.conf -%config /etc/pam.d/netatalk -/etc/atalk/netatalk/nls/* -/etc/atalk/nls/* -/etc/atalk/uams/*.so -%{_initdir}/atalk -%{prefix}/bin/* -%{prefix}/sbin/* +%config /etc/atalk/nls/* +%{_libdir}/*.so +%config(noreplace) /etc/atalk/AppleVolumes.default +%config(noreplace) /etc/atalk/AppleVolumes.system +%config(noreplace) /etc/atalk/netatalk.conf +%config(noreplace) /etc/atalk/afpd.conf +%config(noreplace) /etc/atalk/atalkd.conf +%config(noreplace) /etc/atalk/papd.conf +%attr(755,root,root) %config %{initdir}/atalk +%config(noreplace) /etc/pam.d/netatalk +%{_sbindir}/* +%{_bindir}/* %{_mandir}/man*/* +%{_datadir}/netatalk -%exclude /usr/share/netatalk/pagecount.ps - %files devel %defattr(-,root,root) -%{prefix}/lib/* -%dir %{prefix}/include/atalk -%{prefix}/include/atalk/*.h -%{prefix}/include/netatalk/aarp.h -%{prefix}/include/netatalk/at_var.h -%{prefix}/include/netatalk/ddp*.h -%{prefix}/include/netatalk/endian.h -%{prefix}/include/netatalk/phase2.h -%{prefix}/share/aclocal/netatalk.m4 +%dir %{_includedir}/atalk +%{_libdir}/*.a +%attr(0644,root,root) %{_includedir}/atalk/* +%attr(0644,root,root) %{_includedir}/netatalk/* +%{_datadir}/aclocal/netatalk.m4 -%exclude /etc/atalk/uams/*.a -%exclude /etc/atalk/uams/*.la -%exclude %{_includedir}/netatalk/*.c +%changelog +* Tue Jun 15 2004 Elliot Lee +- rebuilt -# glibc wins! -%exclude %{prefix}/include/netatalk/at.h +* Tue Mar 02 2004 Elliot Lee +- rebuilt -%changelog -* Wed May 19 2004 tsintegrate 1.6.4-5ts -- current (1.6.4-4ts) integrated as 1.6.4-5ts for release 1.0-U1 +* Fri Feb 13 2004 Elliot Lee +- rebuilt -* Sat May 15 2004 Jaakko Heinonen -- fix non-root build +* Wed Jan 07 2004 Florian La Roche +- 1.6.4 -* Wed May 12 2004 Omar Kilani -- Add BuildRequires: gcc-c++-devel db4-devel kerberos5-devel libcom_err-devel -- Add BuildRequires: pam-devel +* Fri Aug 1 2003 Charlie Bennett +- Update with 1.6.3 upstream sources -* Wed Jan 14 2004 Chr. Toldnes 1.6.4-1tr -- New upstream. -- Built with no LFS. +* Tue Jul 29 2003 Elliot Lee +- Rebuild +- Fix perl multilib path editing +- Add pathcat patch -* Wed Dec 3 2003 Erlend Midttun 1.6.3-1tr -- New upstream. +* Thu May 1 2003 Elliot Lee 1.5.5-7 +- Make multilib generic +- Add builddep on quota (for rpcsvc/rquota.h) -* Wed Jun 18 2003 Erlend Midttun 1.6.1-3tr -- Big rebuild +* Wed Feb 18 2003 Bill Nottingham 1.5.5-5 +- fix initscript error (#82118) -* Tue May 27 2003 Erlend Midttun 1.6.0-5em -- PreReq in devel -> Requires +* Wed Jan 22 2003 Tim Powers +- rebuilt -* Mon Mar 24 2003 Erlend Midttun 1.6.0-4em -- Rebuilt against glibc 2.3.2. +* Tue Jan 7 2003 Nalin Dahyabhai 1.5.5-3 +- patch for compile errors with new ssl libs +- rebuild -* Tue Feb 25 2003 Erlend Midttun 1.6.0-3em -- Fix init script. +* Mon Dec 02 2002 Florian La Roche +- postun should never fail -* Mon Jan 27 2003 Erlend Midttun 1.6.0-2em -- Fix file conflict with glibc-devel. +* Thu Nov 28 2002 Phil Knirsch 1.5.5-1 +- Updated to 1.5.5 -* Thu Jan 23 2003 Erlend Midttun 1.6.0-1em -- New version. -- Cleanup. +* Tue Jun 25 2002 Phil Knirsch 1.5.3.1-4 +- Fixed dependancy problem on /usr/bin/rc by removing acleandir.[1|rc] (#67243) +- Fixed missing /usr/share/netatalk dir (#67222) -* Thu Nov 21 2002 Christian H. Toldnes 1.5.3.1-3ct -- Initscript now uses $INITLOCK +* Fri Jun 21 2002 Tim Powers 1.5.3.1-2 +- automated rebuild -* Fri Oct 4 2002 Gerald Dachs 1.5.3.1-2gd -- removed /usr/bin/acleandir.rc, because we have no rc +* Tue Jun 18 2002 Phil Knirsch 1.5.3.1-1 +- Updated to latest version 1.5.3.1. +- Fixed bug for nls file lookup (#66300). -* Mon Aug 26 2002 Gerald Dachs 1.5.3.1-1gd -- New upstream version: 1.5.3.1 -- fixed start script location +* Mon May 27 2002 Phil Knirsch 1.5.2-4 +- Fixed initscript bug where you can't use blanks inside of names (#64926). -* Wed Sep 26 2001 Erlend Midttun -- Moving the shared object files. +* Wed Apr 10 2002 Phil Knirsch 1.5.2-3 +- Fixed initscript to use correct config files from /etc/atalk (#62803) +- Changed initscript to use $0 instead of direct string (#61734) +- Change Copyright to Licencse and switch from BSD to GPL (#61746) -* Thu Aug 23 2001 Erlend Midttun -- New upstream version +* Thu Mar 14 2002 Bill Nottingham +- don't run by default -* Wed Jun 13 2001 Oystein Viggen -- Fix build problems with newer strip +* Wed Mar 13 2002 Bill Nottingham +- it's back -* Tue Mar 13 2001 Alexander Reelsen -- Picked up 1.5pre5 +* Fri Mar 2 2001 Tim Powers +- rebuilt against openssl-0.9.6-1 -* Thu Jan 09 2001 Olaf Trygve Berglihn -- Removed dependency on pam-devel and cracklib-devel, as these are - included in the main packages in TSL. -- Fixed initscript to comply with TSL standards. -- Removed additions to /etc/services as the TSL /etc/services already - has the necessary entries. -- Added conditional restart with /sbin/restart_maybe. +* Sun Feb 25 2001 Tim Powers +- fixed bug 29370. This package is trying to include a file glibc already includes -* Wed Nov 08 2000 rufus t firefly - - v1.4.99-0.20001108mdk - - pre-release for sourceforge +* Tue Jan 23 2001 Tim Powers +- updated initscript -* Wed Sep 27 2000 rufus t firefly - - v1.4.99-0.20000927mdk - - pre-release for sourceforge \ No newline at end of file +* Thu Jan 04 2001 Than Ngo +- fixed uams-path +- added noreplace to %config + +* Mon Nov 20 2000 Tim Powers +- rebuilt to fix bad dir perms + +* Fri Nov 10 2000 Than Ngo +- update to 1.5pre2 (bug #19737, #20397) +- update Url and ftp site +- clean up specfile +- netatalk-1.4b2+asun obsolete + +* Mon Aug 07 2000 Than Ngo +- fix dependency with glibc-devel (Bug #15589) +- fix typo in description (Bug #15479) + +* Wed Aug 2 2000 Tim Powers +- fix symlinks not being relative. + +* Fri Jul 28 2000 Than Ngo +- add missing restart function in startup script + +* Fri Jul 28 2000 Tim Powers +- fixed initscripts so that condrestart doesn't return 1 when the test fails + +* Mon Jul 24 2000 Prospector +- rebuilt + +* Sun Jul 23 2000 Tim Powers +- rebuilt + +* Mon Jul 17 2000 Tim Powers +- inits back to rc.d/init.d, using service to start inits + +* Wed Jul 12 2000 Than Ngo +- rebuilt + +* Thu Jul 06 2000 Tim Powers +- fixed broken PreReq, now PreReq's /etc/init.d + +* Tue Jun 27 2000 Than Ngo +- remove prereq initscripts, add requires initscripts +- clean up specfile + +* Mon Jun 26 2000 Than Ngo +- /etc/rc.d/init.d -> /etc/init.d +- add condrestart directive +- fix post/preun/postun scripts +- prereq initscripts >= 5.20 + +* Tue Jun 20 2000 Tim Powers +- fixed bug 11420 concerning the building with -O2. + +* Thu Jun 8 2000 Tim Powers +- fix bug #11978 +- fix man page locations to be FHS compliant + +* Thu Jun 1 2000 Nalin Dahyabhai +- modify PAM setup to use system-auth + +* Thu Dec 16 1999 Tim Powers +- renewed source so it is pristine, delete the problematic files in spec file + instead +- general spec file cleanups, create buildroot and dirs in the %%install + section +- strip binaries +- gzip man pages +- fixed netatalk-asun.librpcsvc.patch, -lnss_nis too +- changed group +- added %defattr to %files section + +* Tue Aug 3 1999 iNOUE Koich! +- rpm-3.0 needs to remove vogus files from source. + Removed files: etc/papd/.#magics.c, etc/.#diff +* Fri Jul 30 1999 iNOUE Koich! +- Change Copyright tag to BSD. + Add /usr/bin/adv1tov2. +* Thu Apr 22 1999 iNOUE Koich! +- Correct librpcsvc.patch. Move %changelog section last. + Uncomment again -DNEED_QUOTA_WRAPPER in sys/linux/Makefile since + LinuxPPC may need. +* Wed Mar 31 1999 iNOUE Koich! +- Comment out -DNEED_QUOTA_WRAPPER in sys/linux/Makefile. +* Sat Mar 20 1999 iNOUE Koich! +- Correct symbolic links to psf. + Remove asciize function from nbplkup so as to display Japanese hostname. +* Thu Mar 11 1999 iNOUE Koich! +- Included MacPerl 5 script ICDumpSuffixMap which dumps suffix mapping + containd in Internet Config Preference. +* Tue Mar 2 1999 iNOUE Koich! +- [asun2.1.3] +* Mon Feb 15 1999 iNOUE Koich! +- [pre-asun2.1.2-8] +* Sun Feb 7 1999 iNOUE Koich! +- [pre-asun2.1.2-6] +* Mon Jan 25 1999 iNOUE Koichi +- [pre-asun2.1.2-3] +* Thu Dec 17 1998 INOUE Koichi +- [pre-asun2.1.2] + Remove crlf patch. It is now a server's option. +* Thu Dec 3 1998 INOUE Koichi +- Use stable version source netatalk-1.4b2+asun2.1.1.tar.gz + Add uams directory +* Sat Nov 28 1998 INOUE Koichi +- Use pre-asun2.1.1-3 source. +* Mon Nov 23 1998 INOUE Koichi +- Use pre-asun2.1.1-2 source. +* Mon Nov 16 1998 INOUE Koichi +- Fix rcX.d's symbolic links. +* Wed Oct 28 1998 INOUE Koichi +- Use pre-asun2.1.0a-2 source. Remove '%exclusiveos linux' line. +* Sat Oct 24 1998 INOUE Koichi +- Use stable version source netatalk-1.4b2+asun2.1.0.tar.gz. +* Mon Oct 5 1998 INOUE Koichi +- Use pre-asun2.1.0-10a source. +* Thu Sep 19 1998 INOUE Koichi +- Use pre-asun2.1.0-8 source. Add chkconfig support. +* Sat Sep 12 1998 INOUE Koichi +- Comment out -DCRLF. Use RPM_OPT_FLAGS. +* Mon Sep 8 1998 INOUE Koichi +- Use pre-asun2.1.0-7 source. Rename atalk.init to atalk. +* Mon Aug 22 1998 INOUE Koichi +- Use pre-asun2.1.0-6 source. +* Mon Jul 27 1998 INOUE Koichi +- Use pre-asun2.1.0-5 source. +* Tue Jul 21 1998 INOUE Koichi +- Use pre-asun2.1.0-3 source. +* Tue Jul 7 1998 INOUE Koichi +- Add afpovertcp entries to /etc/services +- Remove BuildRoot in man8 pages +* Mon Jun 29 1998 INOUE Koichi +- Use modified sources 1.4b2+asun2.1.0 produced by Adrian Sun + to provide an AppleShareIP file server +- Included AppleVolumes.system file maintained by Johnson + +* Mon Aug 25 1997 David Gibson +- Used a buildroot +- Use RPM_OPT_FLAGS +- Moved configuration parameters/files from atalk.init to /etc/atalk +- Separated devel package +- Built with shared libraries +* Sun Jul 13 1997 Paul H. Hargrove +- Updated sources from 1.3.3 to 1.4b2 +- Included endian patch for Linux/SPARC +- Use all the configuration files supplied in the source. This has the + following advantages over the ones in the previous rpm release: + + The printer 'lp' isn't automatically placed in papd.conf + + The default file conversion is binary rather than text. +- Automatically add and remove DDP services from /etc/services +- Placed the recommended /etc/services in the documentation +- Changed atalk.init to give daemons a soft kill +- Changed atalk.init to make configuration easier + +* Wed May 28 1997 Mark Cornick +Updated for /etc/pam.d From svn at tinysofa.org Thu Jul 1 15:51:48 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:51:48 +1000 (EST) Subject: [tinysofa-svn] r2802 - in tinysofa/snapshot/newt/current: sources specs Message-ID: <20040701155148.AD8F94E817D@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:51:48 +1000 (Fri, 02 Jul 2004) New Revision: 2802 Added: tinysofa/snapshot/newt/current/sources/newt-0.51.6.tar.gz Removed: tinysofa/snapshot/newt/current/sources/newt-0.50.33-notcl.patch tinysofa/snapshot/newt/current/sources/newt-0.50.33-passwd-bug.patch tinysofa/snapshot/newt/current/sources/newt-0.50.33.tar.gz tinysofa/snapshot/newt/current/sources/newt-python2.3.patch Modified: tinysofa/snapshot/newt/current/specs/newt.spec Log: - Sync with 2.0. - Added: - newt-0.51.6.tar.gz: - Removed: - newt-0.50.33-notcl.patch: - newt-0.50.33-passwd-bug.patch: - newt-0.50.33.tar.gz: - newt-python2.3.patch: Deleted: tinysofa/snapshot/newt/current/sources/newt-0.50.33-notcl.patch =================================================================== --- tinysofa/snapshot/newt/current/sources/newt-0.50.33-notcl.patch 2004-07-01 15:51:46 UTC (rev 2801) +++ tinysofa/snapshot/newt/current/sources/newt-0.50.33-notcl.patch 2004-07-01 15:51:48 UTC (rev 2802) @@ -1,339 +0,0 @@ -diff -Nur newt-0.50.33.orig/Makefile.in newt-0.50.33/Makefile.in ---- newt-0.50.33.orig/Makefile.in 2004-02-17 13:49:16.000000000 +0100 -+++ newt-0.50.33/Makefile.in 2004-02-17 13:52:32.000000000 +0100 -@@ -12,10 +12,10 @@ - CVSTAG = r$(subst .,-,$(VERSION)) - SONAME = @SONAME@ - --PROGS = test whiptail whiptcl.so testgrid testtree -+PROGS = test whiptail testgrid testtree - TESTOBJS = test.o - NDIALOGOBJS = whiptail.o dialogboxes.o --WHIPTCLOBJS = whiptcl.o dialogboxes.o -+WHIPTCLOBJS = dialogboxes.o - LIBNEWT = libnewt.a - LIBNEWTSH = libnewt.so.$(VERSION) - LIBNEWTSONAME = libnewt.so.$(SONAME) -@@ -66,9 +66,6 @@ - whiptail: $(NDIALOGOBJS) $(LIBNEWTSH) - gcc -g -o whiptail $(NDIALOGOBJS) -L . $(LIBNEWTSH) $(LIBS) -lpopt - --whiptcl.so: $(WHIPTCLOBJS) $(LIBNEWTSH) -- gcc -shared $(SHCFLAGS) -o whiptcl.so $(WHIPTCLOBJS) -L . $(LIBNEWTSH) -ltcl -lslang -lpopt -lm -- - $(LIBNEWT): $(LIBNEWT)($(LIBOBJS)) - - newt.o: newt.c Makefile -@@ -107,11 +104,10 @@ - install -m 644 $(LIBNEWT) $(instroot)/$(libdir) - install -s -m 755 whiptail $(instroot)/$(bindir) - --install-sh: sharedlib whiptcl.so _snackmodule.so -+install-sh: sharedlib _snackmodule.so - [ -d $(instroot)/$(libdir) ] || install -m 755 -d $(instroot)/$(libdir) - install -s -m 755 $(LIBNEWTSH) $(instroot)/$(libdir) - ln -sf $(LIBNEWTSH) $(instroot)/$(libdir)/libnewt.so -- install -s -m 755 whiptcl.so $(instroot)/$(libdir) - [ -d $(instroot)/$(pythonbindir) ] || install -m 755 -d $(instroot)/$(pythonbindir) - install -s -m 755 _snackmodule.so $(instroot)/$(pythonbindir) - install -m 755 snack.py $(instroot)/$(pythondir) -diff -Nur newt-0.50.33.orig/whiptcl.c newt-0.50.33/whiptcl.c ---- newt-0.50.33.orig/whiptcl.c 2000-02-16 12:34:40.000000000 +0100 -+++ newt-0.50.33/whiptcl.c 1970-01-01 01:00:00.000000000 +0100 -@@ -1,296 +0,0 @@ --#include --#include -- --#include "dialogboxes.h" --#include "newt.h" --#include "popt.h" --#include "tcl.h" -- --enum mode { MODE_NONE, MODE_MSGBOX, MODE_YESNO, MODE_CHECKLIST, MODE_INPUTBOX, -- MODE_RADIOLIST, MODE_MENU }; -- --#define OPT_MSGBOX 1000 --#define OPT_CHECKLIST 1001 --#define OPT_YESNO 1002 --#define OPT_INPUTBOX 1003 --#define OPT_MENU 1005 --#define OPT_RADIOLIST 1006 -- --static char * setBacktext(ClientData data, Tcl_Interp * interp, -- char * name1, char * name2, int flags); --static char * setHelptext(ClientData data, Tcl_Interp * interp, -- char * name1, char * name2, int flags); --static char * setFullButtons(ClientData data, Tcl_Interp * interp, -- char * name1, char * name2, int flags); -- --static int wtFinish(ClientData clientData, Tcl_Interp * interp, int argc, -- char ** argv) { -- newtFinished(); -- -- return TCL_OK; --} -- --static int wtInit(ClientData clientData, Tcl_Interp * interp, int argc, -- char ** argv) { -- newtInit(); -- newtCls(); -- -- newtPushHelpLine(""); -- -- Tcl_TraceVar(interp, "whiptcl_backtext", -- TCL_TRACE_WRITES | TCL_GLOBAL_ONLY, setBacktext, NULL); -- Tcl_TraceVar(interp, "whiptcl_helpline", -- TCL_TRACE_WRITES | TCL_TRACE_UNSETS | TCL_GLOBAL_ONLY, -- setHelptext, NULL); -- Tcl_TraceVar(interp, "whiptcl_fullbuttons", -- TCL_TRACE_WRITES | TCL_TRACE_UNSETS | TCL_GLOBAL_ONLY, -- setFullButtons, NULL); -- -- Tcl_SetVar(interp, "whiptcl_helpline", "", TCL_GLOBAL_ONLY); -- Tcl_SetVar(interp, "whiptcl_fullbuttons", "1", TCL_GLOBAL_ONLY); -- -- return TCL_OK; --} -- --static int wtCmd(ClientData clientData, Tcl_Interp * interp, int argc, -- char ** argv) { -- enum mode mode = MODE_NONE; -- poptContext optCon; -- int arg; -- const char * optArg; -- const char * text; -- const char * nextArg; -- char * end; -- int height; -- int width; -- int noCancel = 0; -- int noItem = 0; -- int scrollText = 0; -- int rc = 0; -- int flags = 0; -- int defaultNo = 0; -- char * result; -- char ** selections, ** next; -- char * title = NULL; -- struct poptOption optionsTable[] = { -- { "checklist", '\0', 0, 0, OPT_CHECKLIST }, -- { "defaultno", '\0', 0, &defaultNo, 0 }, -- { "inputbox", '\0', 0, 0, OPT_INPUTBOX }, -- { "menu", '\0', 0, 0, OPT_MENU }, -- { "msgbox", '\0', 0, 0, OPT_MSGBOX }, -- { "nocancel", '\0', 0, &noCancel, 0 }, -- { "noitem", '\0', 0, &noItem, 0 }, -- { "radiolist", '\0', 0, 0, OPT_RADIOLIST }, -- { "scrolltext", '\0', 0, &scrollText, 0 }, -- { "title", '\0', POPT_ARG_STRING, &title, 0 }, -- { "yesno", '\0', 0, 0, OPT_YESNO }, -- { 0, 0, 0, 0, 0 } -- }; -- -- optCon = poptGetContext("whiptcl", argc, argv, optionsTable, 0); -- -- while ((arg = poptGetNextOpt(optCon)) > 0) { -- optArg = poptGetOptArg(optCon); -- -- switch (arg) { -- case OPT_MENU: -- if (mode != MODE_NONE) rc = -1; -- mode = MODE_MENU; -- break; -- -- case OPT_MSGBOX: -- if (mode != MODE_NONE) rc = -1; -- mode = MODE_MSGBOX; -- break; -- -- case OPT_RADIOLIST: -- if (mode != MODE_NONE) rc = -1; -- mode = MODE_RADIOLIST; -- break; -- -- case OPT_CHECKLIST: -- if (mode != MODE_NONE) rc = -1; -- mode = MODE_CHECKLIST; -- break; -- -- case OPT_YESNO: -- if (mode != MODE_NONE) rc = -1; -- mode = MODE_YESNO; -- break; -- -- case OPT_INPUTBOX: -- if (mode != MODE_NONE) rc = -1; -- mode = MODE_INPUTBOX; -- break; -- } -- } -- -- if (arg < -1) { -- /* this could buffer oveflow, bug we're not setuid so I don't care */ -- interp->result = malloc(200); -- interp->freeProc = TCL_DYNAMIC; -- sprintf(interp->result, "%s: %s\n", -- poptBadOption(optCon, POPT_BADOPTION_NOALIAS), -- poptStrerror(arg)); -- -- return TCL_ERROR; -- } -- -- if (mode == MODE_NONE) { -- interp->result = "no dialog mode was specified"; -- return TCL_ERROR; -- } else if (rc) { -- interp->result = "multiple modes were specified"; -- return TCL_ERROR; -- } -- -- if (!(text = poptGetArg(optCon))) { -- interp->result = "missing text parameter"; -- return TCL_ERROR; -- } -- -- if (!(nextArg = poptGetArg(optCon))) { -- interp->result = "height missing"; -- return TCL_ERROR; -- } -- height = strtoul(nextArg, &end, 10); -- if (*end) { -- interp->result = "height is not a number"; -- return TCL_ERROR; -- } -- -- if (!(nextArg = poptGetArg(optCon))) { -- interp->result = "width missing"; -- return TCL_ERROR; -- } -- width = strtoul(nextArg, &end, 10); -- if (*end) { -- interp->result = "width is not a number"; -- return TCL_ERROR; -- } -- -- width -= 2; -- height -= 2; -- newtOpenWindow((80 - width) / 2, (24 - height) / 2, width, height, title); -- -- if (noCancel) flags |= FLAG_NOCANCEL; -- if (noItem) flags |= FLAG_NOITEM; -- if (scrollText) flags |= FLAG_SCROLL_TEXT; -- if (defaultNo) flags |= FLAG_DEFAULT_NO; -- -- switch (mode) { -- case MODE_MSGBOX: -- rc = messageBox(text, height, width, MSGBOX_MSG, flags); -- break; -- -- case MODE_YESNO: -- rc = messageBox(text, height, width, MSGBOX_YESNO, flags); -- if (rc == DLG_OKAY) -- interp->result = "yes"; -- else -- interp->result = "no"; -- if (rc == DLG_ERROR) rc = 0; -- break; -- -- case MODE_INPUTBOX: -- rc = inputBox(text, height, width, optCon, flags, &result); -- if (!rc) { -- interp->result = strdup(result); -- interp->freeProc = TCL_DYNAMIC; -- } -- break; -- -- case MODE_MENU: -- rc = listBox(text, height, width, optCon, flags, &result); -- if (!rc) { -- interp->result = strdup(result); -- interp->freeProc = TCL_DYNAMIC; -- } -- break; -- -- case MODE_RADIOLIST: -- rc = checkList(text, height, width, optCon, 1, flags, &selections); -- if (!rc) { -- interp->result = strdup(selections[0]); -- interp->freeProc = TCL_DYNAMIC; -- } -- break; -- -- case MODE_CHECKLIST: -- rc = checkList(text, height, width, optCon, 0, flags, &selections); -- -- if (!rc) { -- for (next = selections; *next; next++) -- Tcl_AppendElement(interp, *next); -- -- free(selections); -- } -- break; -- -- case MODE_NONE: -- /* this can't happen */ -- } -- -- newtPopWindow(); -- -- if (rc == DLG_ERROR) { -- interp->result = "bad paramter for whiptcl dialog box"; -- return TCL_ERROR; -- } -- -- Tcl_SetVar(interp, "whiptcl_canceled", (rc == DLG_CANCEL) ? "1" : "0", -- 0); -- -- return TCL_OK; --} -- --static char * setBacktext(ClientData data, Tcl_Interp * interp, -- char * name1, char * name2, int flags) { -- static char blankLine[81] = " " -- " "; -- -- newtDrawRootText(0, 0, blankLine); -- newtDrawRootText(0, 0, Tcl_GetVar(interp, "whiptcl_backtext", -- TCL_GLOBAL_ONLY)); -- -- return NULL; --} -- --static char * setHelptext(ClientData data, Tcl_Interp * interp, -- char * name1, char * name2, int flags) { -- char * text = Tcl_GetVar(interp, "whiptcl_helpline", TCL_GLOBAL_ONLY); -- -- if (!text) -- text = ""; -- else if (!strlen(text)) -- text = NULL; -- -- newtPopHelpLine(); -- newtPushHelpLine(text); -- -- return NULL; --} -- --static char * setFullButtons(ClientData data, Tcl_Interp * interp, -- char * name1, char * name2, int flags) { -- char * val = Tcl_GetVar(interp, "whiptcl_fullbuttons", TCL_GLOBAL_ONLY); -- int rc; -- int state; -- -- if ((rc = Tcl_ExprBoolean(interp, val, &state))) { -- Tcl_FreeResult(interp); -- return "whiptcl_fullbuttons may only contain a boolean value"; -- } -- -- useFullButtons(state); -- -- return NULL; --} -- --int Whiptcl_Init(Tcl_Interp * interp) { -- Tcl_CreateCommand(interp, "whiptcl_finish", wtFinish, NULL, NULL); -- Tcl_CreateCommand(interp, "whiptcl_init", wtInit, NULL, NULL); -- Tcl_CreateCommand(interp, "whiptcl_cmd", wtCmd, NULL, NULL); -- -- return TCL_OK; --} Deleted: tinysofa/snapshot/newt/current/sources/newt-0.50.33-passwd-bug.patch =================================================================== --- tinysofa/snapshot/newt/current/sources/newt-0.50.33-passwd-bug.patch 2004-07-01 15:51:46 UTC (rev 2801) +++ tinysofa/snapshot/newt/current/sources/newt-0.50.33-passwd-bug.patch 2004-07-01 15:51:48 UTC (rev 2802) @@ -1,12 +0,0 @@ -diff -Nur newt-0.50.33/entry.c newt-0.50.33.changed/entry.c ---- newt-0.50.33/entry.c Tue Jan 23 07:27:38 2001 -+++ newt-0.50.33.changed/entry.c Sat Jun 15 22:45:57 2002 -@@ -142,7 +142,7 @@ - if (en->flags & NEWT_FLAG_PASSWORD) { - char *tmpptr, *p; - -- tmpptr = alloca(strlen(chptr+2)); -+ tmpptr = alloca(strlen(chptr)+2); - strcpy(tmpptr, chptr); - for (p = tmpptr; *p; p++) - *p = '*'; Deleted: tinysofa/snapshot/newt/current/sources/newt-0.50.33.tar.gz =================================================================== (Binary files differ) Added: tinysofa/snapshot/newt/current/sources/newt-0.51.6.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/newt/current/sources/newt-0.51.6.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: tinysofa/snapshot/newt/current/sources/newt-python2.3.patch =================================================================== --- tinysofa/snapshot/newt/current/sources/newt-python2.3.patch 2004-07-01 15:51:46 UTC (rev 2801) +++ tinysofa/snapshot/newt/current/sources/newt-python2.3.patch 2004-07-01 15:51:48 UTC (rev 2802) @@ -1,23 +0,0 @@ -diff -Nur newt-0.50.33/Makefile.in newt-0.50.33.changed/Makefile.in ---- newt-0.50.33/Makefile.in Tue Jan 23 07:27:38 2001 -+++ newt-0.50.33.changed/Makefile.in Fri Jun 7 13:11:31 2002 -@@ -30,8 +30,8 @@ - libdir = $(prefix)/lib - bindir = $(prefix)/bin - ARCHNAME = $(shell uname -m | sed 's/i.86/i386/') --pythondir = $(prefix)/lib/python1.5 --pythonbindir = $(prefix)/lib/python1.5/lib-dynload -+pythondir = $(prefix)/lib/python2.3 -+pythonbindir = $(pythondir)/lib-dynload - - #-------------------------------------- - -@@ -61,7 +61,7 @@ - gcc --shared $(SHCFLAGS) -o _snackmodule.so snackmodule.o -L . $(LIBNEWTSH) - - snackmodule.o: snackmodule.c -- gcc -I/usr/include/python1.5 -fPIC $(CFLAGS) -c snackmodule.c -+ gcc -I/usr/include/python2.3 -fPIC $(CFLAGS) -c snackmodule.c - - whiptail: $(NDIALOGOBJS) $(LIBNEWTSH) - gcc -g -o whiptail $(NDIALOGOBJS) -L . $(LIBNEWTSH) $(LIBS) -lpopt Modified: tinysofa/snapshot/newt/current/specs/newt.spec =================================================================== --- tinysofa/snapshot/newt/current/specs/newt.spec 2004-07-01 15:51:46 UTC (rev 2801) +++ tinysofa/snapshot/newt/current/specs/newt.spec 2004-07-01 15:51:48 UTC (rev 2802) @@ -1,24 +1,24 @@ +%define pythonver 2.3 + Summary: A development library for text mode user interfaces. Name: newt -Version: 0.50.33 -Release: 14ts +%define version 0.51.6 +Version: %{version} +Release: 2.1.1ts License: LGPL -Group: tinysofa official -Source: ftp://ftp.redhat.com/pub/redhat/code/newt/newt-%{version}.tar.gz -Patch: newt-python2.3.patch -Patch1: newt-0.50.33-passwd-bug.patch -Patch2: newt-0.50.33-notcl.patch -Requires: slang popt +Group: System Environment/Libraries +Source: newt-%{version}.tar.gz +BuildRequires: python,python-devel,perl, slang-devel +Requires: slang Provides: snack -BuildRequires: slang-devel python python-devel gcc-c++-devel popt +BuildRoot: %{_tmppath}/%{name}-%{version}-root %package devel Summary: Newt windowing toolkit development files. -Requires: slang-devel -Group: tinysofa official -BuildRoot: %{_tmppath}/%{name}-root +Requires: slang-devel %{name} = %{version} +Group: Development/Libraries -%description +%Description Newt is a programming library for color text mode, widget based user interfaces. Newt can be used to add stacked windows, entry widgets, checkboxes, radio buttons, labels, plain text fields, scrollbars, @@ -36,95 +36,262 @@ Install newt-devel if you want to develop applications which will use newt. + %prep %setup -q -%patch -p1 -%patch1 -p1 -%patch2 -p1 %build -export RPM_OPT_FLAGS="`echo $RPM_OPT_FLAGS | sed -e 's/-D_FILE_OFFSET_BITS=64//' |\ - sed -e 's/-D_LARGE_FILES=1//' |\ - sed -e 's/-D_LARGEFILE64_SOURCE=1//'` %{?no_stack_protector}" -export CFLAGS="$RPM_OPT_FLAGS" -export CXXFLAGS="$RPM_OPT_FLAGS" -export FFLAGS="$RPM_OPT_FLAGS" -%configure --with-gpm-support -make -make shared +# gpm support seems to smash the stack w/ we use help in anaconda?? +#./configure --with-gpm-support +%configure +make %{?_smp_mflags} all +chmod 0644 peanuts.py popcorn.py %install -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT -export RPM_OPT_FLAGS="`echo $RPM_OPT_FLAGS | sed -e 's/-D_FILE_OFFSET_BITS=64//' |\ - sed -e 's/-D_LARGE_FILES=1//' |\ - sed -e 's/-D_LARGEFILE64_SOURCE=1//'` %{?no_stack_protector}" -export CFLAGS="$RPM_OPT_FLAGS" -export CXXFLAGS="$RPM_OPT_FLAGS" -export FFLAGS="$RPM_OPT_FLAGS" +rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT -make instroot=$RPM_BUILD_ROOT install -make instroot=$RPM_BUILD_ROOT install-sh +%makeinstall +/sbin/ldconfig -n $RPM_BUILD_ROOT/%{_libdir} + +python -c 'from compileall import *; compile_dir("'$RPM_BUILD_ROOT'%{_libdir}/python%{pythonver}",10,"%{_libdir}/python%{pythonver}")' + +%clean +rm -rf $RPM_BUILD_ROOT + %post -p /sbin/ldconfig %postun -p /sbin/ldconfig -%clean -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT +%post devel -p /sbin/ldconfig +%postun devel -p /sbin/ldconfig + %files %defattr (-,root,root) %doc CHANGES COPYING -/usr/lib/libnewt.so.* -/usr/bin/whiptail -/usr/lib/python2.3/snack.py -/usr/lib/python2.3/lib-dynload/_snackmodule.so +%{_bindir}/whiptail +%{_libdir}/libnewt.so.* +%{_libdir}/python%{pythonver}/site-packages/* %files devel %defattr (-,root,root) -%doc tutorial.sgml -/usr/include/newt.h -/usr/lib/libnewt.a -/usr/lib/libnewt.so +%doc tutorial.sgml peanuts.py popcorn.py +%{_includedir}/newt.h +%{_libdir}/libnewt.a +%{_libdir}/libnewt.so %changelog -* Wed May 19 2004 tsintegrate 0.50.33-14ts -- current (0.50.33-13ts) integrated as 0.50.33-14ts for release 1.0-U1 +* Tue Mar 02 2004 Elliot Lee +- rebuilt -* Tue May 11 2004 Omar Kilani -- Add BuildRequires: slang-devel python python-devel gcc-c++-devel popt -- Add Requires: popt +* Fri Feb 13 2004 Elliot Lee +- rebuilt -* Tue Mar 30 2004 Omar Kilani 0.50.33-13ts -- Python 2.3. +* Thu Nov 6 2003 Jeremy Katz 0.51.6-2 +- rebuild for python 2.3 -* Tue Feb 17 2004 Chr. Toldnes 0.50.33-9tr -- Built without stack protector -- Built without tcl +* Tue Aug 19 2003 Michael K. Johnson 0.51.6-1 +- rebuild -* Wed Dec 17 2003 Erlend Midttun 0.50.33-7tr -- New cflags. +* Tue Aug 19 2003 Michael K. Johnson 0.51.5-1 +- incorporated listbox cursor location patch (#69903) -* Mon Jun 23 2003 Erlend Midttun 0.50.33-5tr -- Make %%setup quiet. +* Wed Feb 5 2003 Matt Wilson 0.51.4-1 +- fixed help line drawing in UTF-8 (#81718) +- calculate the width of text in entries using wstrlen +- always set component width to the new label width in newtLabelSetText +- fixed snack.CListbox to work properly with UTF-8 (#81718) -* Wed Jun 18 2003 Erlend Midttun 0.50.33-4tr -- Big rebuild +* Tue Feb 04 2003 Florian La Roche +- add symlink to shared lib -* Mon Mar 24 2003 Erlend Midttun 0.50.33-3em -- Rebuilt against glibc 2.3.2. +* Sun Jan 5 2003 Adrian Havill 0.51.3-1 +- cleaned up const qualifiers in interfaces +- added Ctrl-L screen refresh +- fixed segfault in test.c when listbox items are selected +- accessibility: made newt useable with monochrome terms (#60931) +- leave the symbols in the libs (#60400) +- fixed grammar in tutorial (#63496) +- error checking (curcomp exists) for formEvent, newtFormGetCurrent, + removed fifty button limit (#59027) -* Sat Jun 15 2002 Gerald Dachs -- stupid passwd bug fixed +* Tue Dec 17 2002 Matt Wilson 0.51.2-1 +- fixed wstrlen() it was calculating wcwidth(first wide char in + string) * strlen(str) instead of the actual width of the whole + string +- fixed newtRedrawHelpLine() to copy all the bytes from a multibyte + string -* Fri Jun 7 2002 Christian H. Toldnes -- Upgrade to 0.50.33 for now. -- patched to build against python2.2 +* Fri Dec 13 2002 Elliot Lee 0.51.1-1 +- Merge multilib changes -* Tue Jul 17 2001 Erlend Midttun -- Inc serial number before release. +* Thu Aug 15 2002 Bill Nottingham 0.51.0-1 +- changes for element width calculation for UTF-8 +- fix textwrap for UTF-8 in general +- bump soname to avoid shared library collisions with slang +* Wed Jul 01 2002 Michael Fulbright 0.50.39-1 +- Changed a test to check for 'None' the correct way + +* Wed Jun 26 2002 Bill Nottingham 0.50.38-1 +- don't hardcode linedrawing characters in the scrollbar code + +* Mon Jun 24 2002 Bill Nottingham 0.50.37-1 +- minor tweaks for use with UTF-8 slang + +* Tue Jun 11 2002 Joe Orton 0.50.36-1 +- add newtListboxGetItemCount() API call +- include numeric percentage in scale widget appearace +- add support for ESC key using NEWT_KEY_ESCAPE + +* Mon Mar 18 2002 Bill Nottingham 0.50.35-1 +- build for whatever version of python happens to be installed + +* Fri Sep 15 2001 Trond Eivind Glomsr?d 0.50.34-1 +- remove python2 subpackage +- compile package for python 2.2 + +* Wed Aug 29 2001 Trond Eivind Glomsr?d 0.50.33-1 +- s/Copyright/License/ +- Add slang-devel to build dependencies (#49542) + +* Wed Aug 22 2001 Crutcher Dunnavant 0.50.32-1 +- re-ordered the width key of CheckboxTree.__init__; #52319 + +* Wed Aug 8 2001 Crutcher Dunnavant 0.50.31-1 +- right anchor the internal Listbox of CListboxes, so that empty +- scrollable CListboxes do not look like crape. + +* Thu Jul 05 2001 Crutcher Dunnavant +- padded hidden checkboxes on CheckboxTrees + +* Thu Jul 05 2001 Crutcher Dunnavant +- taught CheckboxTrees about width. Whohoo! 2-D!!! + +* Thu Jul 05 2001 Crutcher Dunnavant +- added 'hide_checkbox' and 'unselectable' options to CheckboxTrees + +* Mon Jun 25 2001 Jeremy Katz +- CListBox -> CListbox for API consistency +- fixup replace() method of CListbox + +* Fri Jun 8 2001 Jeremy Katz +- few bugfixes to the CListBox + +* Fri Jun 8 2001 Jeremy Katz +- added python binding for newtListboxClear() for Listbox and CListBox +- let ButtonBars optionally be made of CompactButtons + +* Wed Jun 6 2001 Crutcher Dunnavant +- added CListBox python convenience class + +* Tue May 15 2001 Michael Fulbright +- added python binding for CompactButton() + +* Tue Apr 3 2001 Matt Wilson +- change from using SLsmg_touch_screen to SLsmg_touch_lines to prevent + excessive flashing due to screen clears when using touch_screen (more + Japanese handling) + +* Mon Apr 2 2001 Matt Wilson +- redraw the screen in certain situations when LANG=ja_JP.eucJP to + prevent corrupting kanji characters (#34362) + +* Mon Apr 2 2001 Elloit Lee +- Allow python scripts to watch file handles +- Fix 64-bit warnings in snackmodule +- Misc snack.py cleanups +- Add NEWT_FD_EXCEPT to allow watching for fd exceptions +- In newtExitStruct, return the first file descriptor that an event occurred on + +* Fri Mar 30 2001 Matt Wilson +- don't blow the stack if we push a help line that is longer than the + curret number of columns +- clip window to screen bounds so that if we get a window that is + larger than the screen we can still redraw the windows behind it + when we pop + +* Sun Feb 11 2001 Than Ngo +- disable building new-python2 sub package again + +* Thu Feb 01 2001 Erik Troan +- gave up on separate CHANGES file +- added newtCheckboxTreeSetCurrent() and snack binding +- don't require python2 anymore + +* Mon Jan 22 2001 Than Ngo +- don't build newt-python2 sub package. + +* Fri Dec 15 2000 Trond Eivind Glomsr?d +- use %%{_tmppath} +- add python2 subpackage, with such support +- fix use of append in snack.py + +* Fri Sep 08 2000 Trond Eivind Glomsr?d +- bytecompile the snack python module +- move the libnewt.so symlink to the devel package +- include popcorn.py and peanuts.py in the devel package, + so we have some documentation of the snack module + +* Tue Aug 22 2000 Erik Troan +- fixed cursor disappearing in suspend (again) + +* Sat Aug 19 2000 Preston Brown +- explicit requirement of devel subpackage on same version of main package + so that .so file link doesn't break + +* Wed Aug 16 2000 Erik Troan +- fixed cursor disappearing in suspend +- moved libnewt.so to main package from -devel + +* Thu Aug 3 2000 Matt Wilson +- added setValue method for checkboxes in snack + +* Wed Jul 05 2000 Michael Fulbright +- added NEWT_FLAG_PASSWORD for entering passwords and having asterix echo'd + +* Fri Jun 16 2000 Matt Wilson +- build for new release + +* Fri Apr 28 2000 Jakub Jelinek +- see CHANGES + +* Mon Mar 13 2000 Matt Wilson +- revert mblen patch, go back to our own wide char detection + +* Fri Feb 25 2000 Bill Nottingham +- fix doReflow to handle mblen returning 0 + +* Wed Feb 23 2000 Preston Brown +- fix critical bug in fkey 1-4 recognition on xterms + +* Wed Feb 9 2000 Matt Wilson +- fixed snack widget setcallback function + +* Thu Feb 03 2000 Erik Troan +- strip shared libs + +* Mon Jan 31 2000 Matt Wilson +- added patch from Toru Hoshina to improve multibyte + character wrapping + +* Thu Jan 20 2000 Erik Troan +- see CHANGES + +* Thu Jan 20 2000 Preston Brown +- fix segfault in newtRadioGetCurrent + +* Mon Jan 17 2000 Erik Troan +- added numerous bug fixes (see CHANGES) + +* Mon Dec 20 1999 Matt Wilson +- rebuild with fix for listbox from Nalin + +* Wed Oct 20 1999 Matt Wilson +- added patch to correctly wrap euc kanji + * Wed Sep 01 1999 Erik Troan - added suspend/resume to snack @@ -240,4 +407,4 @@ - Added newtTextboxGetNumLines() and newtTextboxSetHeight() * Tue Feb 25 1997 Erik Troan -- Added changes from sopwith for C++ cleanliness and some listbox fixes. \ No newline at end of file +- Added changes from sopwith for C++ cleanliness and some listbox fixes. From svn at tinysofa.org Thu Jul 1 15:52:37 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:52:37 +1000 (EST) Subject: [tinysofa-svn] r2811 - tinysofa/snapshot/pam_smb/current/specs Message-ID: <20040701155237.688984E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:52:37 +1000 (Fri, 02 Jul 2004) New Revision: 2811 Modified: tinysofa/snapshot/pam_smb/current/specs/pam_smb.spec Log: - Sync with 2.0. - Kept: - pam_smb-1.1.7.tar.gz: - pam_smb.conf: Modified: tinysofa/snapshot/pam_smb/current/specs/pam_smb.spec =================================================================== --- tinysofa/snapshot/pam_smb/current/specs/pam_smb.spec 2004-07-01 15:52:34 UTC (rev 2810) +++ tinysofa/snapshot/pam_smb/current/specs/pam_smb.spec 2004-07-01 15:52:37 UTC (rev 2811) @@ -1,13 +1,13 @@ Name: pam_smb Version: 1.1.7 -Release: 5ts +Release: 4ts Summary: A Pluggable Authentication Module (PAM) for use with SMB servers. -Group: tinysofa official +Group: System Environment/Base URL: http://www.sourceforge.net/projects/pamsmb/ License: GPL Source: ftp://ftp.samba.org/pub/samba/pam_smb/pam_smb-%{version}.tar.gz Source1: pam_smb.conf -BuildRoot: %{_tmppath}/%{name}-root +BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildPrereq: pam-devel %description @@ -38,13 +38,9 @@ /%{_lib}/security/pam_smb_auth.so %changelog -* Wed May 19 2004 tsintegrate 1.1.7-5ts -- current (1.1.7-4ts) integrated as 1.1.7-5ts for release 1.0-U1 +* Tue Jun 15 2004 Elliot Lee +- rebuilt -* Wed Apr 07 2004 Omar Kilani 1.1.7-4ts -- tinysofa! -- Thanks, redhat. - * Tue Mar 02 2004 Elliot Lee - rebuilt @@ -97,4 +93,4 @@ - add buildprereq on pam-devel (#49547) * Thu May 31 2001 Nalin Dahyabhai -- initial package \ No newline at end of file +- initial package From svn at tinysofa.org Thu Jul 1 15:56:17 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:56:17 +1000 (EST) Subject: [tinysofa-svn] r2860 - in tinysofa/snapshot/vsftpd/current: sources specs Message-ID: <20040701155617.1EB1A4E817F@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:56:16 +1000 (Fri, 02 Jul 2004) New Revision: 2860 Added: tinysofa/snapshot/vsftpd/current/sources/vsftpd-1.0.1-missingok.patch tinysofa/snapshot/vsftpd/current/sources/vsftpd-1.1.3-rh.patch tinysofa/snapshot/vsftpd/current/sources/vsftpd-1.2.1-conffile.patch tinysofa/snapshot/vsftpd/current/sources/vsftpd-1.2.2-signal.patch tinysofa/snapshot/vsftpd/current/sources/vsftpd-1.5.1-libs.patch tinysofa/snapshot/vsftpd/current/sources/vsftpd.ftpusers Removed: tinysofa/snapshot/vsftpd/current/sources/vsftpd.conf tinysofa/snapshot/vsftpd/current/sources/vsftpd.logrotate Modified: tinysofa/snapshot/vsftpd/current/sources/vsftpd.init tinysofa/snapshot/vsftpd/current/sources/vsftpd.pam tinysofa/snapshot/vsftpd/current/sources/vsftpd.user_list tinysofa/snapshot/vsftpd/current/sources/vsftpd.xinetd tinysofa/snapshot/vsftpd/current/specs/vsftpd.spec Log: - Sync with 2.0. - Kept: - vsftpd-1.2.0-tcp_wrappers.patch: - vsftpd-1.2.2.tar.gz: - vsftpd.init: - vsftpd.pam: - vsftpd.user_list: - vsftpd.xinetd: - Added: - vsftpd-1.0.1-missingok.patch: - vsftpd-1.1.3-rh.patch: - vsftpd-1.2.1-conffile.patch: - vsftpd-1.2.2-signal.patch: - vsftpd-1.5.1-libs.patch: - vsftpd.ftpusers: - Removed: - vsftpd.conf: - vsftpd.logrotate: Added: tinysofa/snapshot/vsftpd/current/sources/vsftpd-1.0.1-missingok.patch =================================================================== --- tinysofa/snapshot/vsftpd/current/sources/vsftpd-1.0.1-missingok.patch 2004-07-01 15:56:09 UTC (rev 2859) +++ tinysofa/snapshot/vsftpd/current/sources/vsftpd-1.0.1-missingok.patch 2004-07-01 15:56:16 UTC (rev 2860) @@ -0,0 +1,8 @@ +--- vsftpd-1.0.1/RedHat/vsftpd.log.checkfile Thu Feb 28 12:34:34 2002 ++++ vsftpd-1.0.1/RedHat/vsftpd.log Thu Feb 28 12:35:03 2002 +@@ -1,4 +1,5 @@ + /var/log/vsftpd.log { + # ftpd doesn't handle SIGHUP properly + nocompress ++ missingok + } Added: tinysofa/snapshot/vsftpd/current/sources/vsftpd-1.1.3-rh.patch =================================================================== --- tinysofa/snapshot/vsftpd/current/sources/vsftpd-1.1.3-rh.patch 2004-07-01 15:56:09 UTC (rev 2859) +++ tinysofa/snapshot/vsftpd/current/sources/vsftpd-1.1.3-rh.patch 2004-07-01 15:56:16 UTC (rev 2860) @@ -0,0 +1,46 @@ +--- vsftpd-1.0.1/vsftpd.conf.rh Mon Jul 30 17:51:07 2001 ++++ vsftpd-1.0.1/vsftpd.conf Wed Nov 28 14:38:36 2001 +@@ -7,14 +7,14 @@ + anonymous_enable=YES + # + # Uncomment this to allow local users to log in. +-#local_enable=YES ++local_enable=YES + # + # Uncomment this to enable any form of FTP write command. +-#write_enable=YES ++write_enable=YES + # + # Default umask for local users is 077. You may wish to change this to 022, + # if your users expect that (022 is used by most other ftpd's) +-#local_umask=022 ++local_umask=022 + # + # Uncomment this to allow the anonymous FTP user to upload files. This only + # has an effect if the above global write enable is activated. Also, you will +@@ -46,7 +46,7 @@ + #xferlog_file=/var/log/vsftpd.log + # + # If you want, you can have your log file in standard ftpd xferlog format +-#xferlog_std_format=YES ++xferlog_std_format=YES + # + # You may change the default value for timing out an idle session. + #idle_session_timeout=600 +@@ -98,3 +98,8 @@ + # the presence of the "-R" option, so there is a strong case for enabling it. + #ls_recurse_enable=YES + ++pam_service_name=vsftpd ++userlist_enable=YES ++#enable for standalone mode ++listen=YES ++tcp_wrappers=YES +--- vsftpd-1.2.1/RedHat/vsftpd.log.rh 2004-05-19 17:17:21.000000000 -0400 ++++ vsftpd-1.2.1/RedHat/vsftpd.log 2004-05-19 17:17:27.000000000 -0400 +@@ -1,4 +1,4 @@ +-/var/log/vsftpd.log { ++/var/log/xferlog { + # ftpd doesn't handle SIGHUP properly + nocompress + missingok Added: tinysofa/snapshot/vsftpd/current/sources/vsftpd-1.2.1-conffile.patch =================================================================== --- tinysofa/snapshot/vsftpd/current/sources/vsftpd-1.2.1-conffile.patch 2004-07-01 15:56:09 UTC (rev 2859) +++ tinysofa/snapshot/vsftpd/current/sources/vsftpd-1.2.1-conffile.patch 2004-07-01 15:56:16 UTC (rev 2860) @@ -0,0 +1,110 @@ +--- vsftpd-1.2.1/FAQ.foo 2004-05-03 18:06:26.051315979 -0400 ++++ vsftpd-1.2.1/FAQ 2004-05-03 18:08:27.168746928 -0400 +@@ -33,7 +33,7 @@ + Q) Help! Local users cannot log in. + A) There are various possible problems. + A1) By default, vsftpd disables any logins other than anonymous logins. Put +-local_enable=YES in your /etc/vsftpd.conf to allow local users to log in. ++local_enable=YES in your /etc/vsftpd/vsftpd.conf to allow local users to log in. + A2) vsftpd tries to link with PAM. (Run "ldd vsftpd" and look for libpam to + find out whether this has happened or not). If vsftpd links with PAM, then + you will need to have a PAM file installed for the vsftpd service. There is +@@ -45,12 +45,12 @@ + A4) If you are not using PAM, then vsftpd will do its own check for a valid + user shell in /etc/shells. You may need to disable this if you use an invalid + shell to disable logins other than FTP logins. Put check_shell=NO in your +-/etc/vsftpd.conf. ++/etc/vsftpd/vsftpd.conf. + + Q) Help! Uploads or other write commands give me "500 Unknown command.". + A) By default, write commands, including uploads and new directories, are + disabled. This is a security measure. To enable writes, put write_enable=YES +-in your /etc/vsftpd.conf. ++in your /etc/vsftpd/vsftpd.conf. + + Q) Help! What are the security implications referred to in the + "chroot_local_user" option? +@@ -86,7 +86,7 @@ + mode. Use "listen_address=x.x.x.x" to set the virtual IP. + + Q) Help! Does vsftpd support virtual users? +-A) Yes, via PAM integration. Set "guest_enable=YES" in /etc/vsftpd.conf. This ++A) Yes, via PAM integration. Set "guest_enable=YES" in /etc/vsftpd/vsftpd.conf. This + has the effect of mapping every non-anonymous successful login to the local + username specified in "guest_username". Then, use PAM and (e.g.) its pam_userdb + module to provide authentication against an external (i.e. non-/etc/passwd) +--- vsftpd-1.2.1/defs.h.foo 2004-05-03 18:06:29.771837724 -0400 ++++ vsftpd-1.2.1/defs.h 2004-05-03 18:07:51.356350436 -0400 +@@ -1,7 +1,7 @@ + #ifndef VSF_DEFS_H + #define VSF_DEFS_H + +-#define VSFTP_DEFAULT_CONFIG "/etc/vsftpd.conf" ++#define VSFTP_DEFAULT_CONFIG "/etc/vsftpd/vsftpd.conf" + + #define VSFTP_COMMAND_FD 0 + +--- vsftpd-1.2.1/INSTALL.foo 2004-05-03 18:06:33.061414865 -0400 ++++ vsftpd-1.2.1/INSTALL 2004-05-03 18:08:57.133895056 -0400 +@@ -63,7 +63,7 @@ + vsftpd can run standalone or via an inetd (such as inetd or xinetd). You will + typically get more control running vsftpd from an inetd. But first we will run + it without, so we can check things are going well so far. +-Edit /etc/vsftpd.conf, and add this line at the bottom: ++Edit /etc/vsftpd/vsftpd.conf, and add this line at the bottom: + + listen=YES + +@@ -135,11 +135,11 @@ + Step 7) Customize your configuration + + As well as the above three pre-requisites, you are recommended to install a +-config file. The default location for the config file is /etc/vsftpd.conf. ++config file. The default location for the config file is /etc/vsftpd/vsftpd.conf. + There is a sample vsftpd.conf in the distribution tarball. You probably want +-to copy that to /etc/vsftpd.conf as a basis for modification, i.e.: ++to copy that to /etc/vsftpd/vsftpd.conf as a basis for modification, i.e.: + +-cp vsftpd.conf /etc ++cp vsftpd.conf /etc/vsftpd/ + + The default configuration allows neither local user logins nor anonymous + uploads. You may wish to change these defaults. +--- vsftpd-1.2.1/vsftpd.8.foo 2004-05-03 18:06:40.593446659 -0400 ++++ vsftpd-1.2.1/vsftpd.8 2004-05-03 18:09:04.438956026 -0400 +@@ -21,7 +21,7 @@ + recommended. It is activated by setting + .Pa listen=YES + in +-.Pa /etc/vsftpd.conf . ++.Pa /etc/vsftpd/vsftpd.conf . + Direct execution of the + .Nm vsftpd + binary will then launch the FTP service ready for immediate client connections. +@@ -29,6 +29,6 @@ + An optional + .Op configuration file + may be given on the command line. The default configuration file is +-.Pa /etc/vsftpd.conf . ++.Pa /etc/vsftpd/vsftpd.conf . + .Sh SEE ALSO + .Xr vsftpd.conf 5 +--- vsftpd-1.2.1/vsftpd.conf.foo 2004-05-03 18:06:55.217566800 -0400 ++++ vsftpd-1.2.1/vsftpd.conf 2004-05-03 18:09:28.049920952 -0400 +@@ -1,4 +1,4 @@ +-# Example config file /etc/vsftpd.conf ++# Example config file /etc/vsftpd/vsftpd.conf + # + # The default compiled in settings are fairly paranoid. This sample file + # loosens things up a bit, to make the ftp daemon more usable. +--- vsftpd-1.2.1/vsftpd.conf.5.foo 2004-05-03 18:07:06.184157099 -0400 ++++ vsftpd-1.2.1/vsftpd.conf.5 2004-05-03 18:09:20.649872192 -0400 +@@ -4,7 +4,7 @@ + .SH DESCRIPTION + vsftpd.conf may be used to control various aspects of vsftpd's behaviour. By + default, vsftpd looks for this file at the location +-.BR /etc/vsftpd.conf . ++.BR /etc/vsftpd/vsftpd.conf . + However, you may override this by specifying a command line argument to + vsftpd. The command line argument is the pathname of the configuration file + for vsftpd. This behaviour is useful because you may wish to use an advanced Added: tinysofa/snapshot/vsftpd/current/sources/vsftpd-1.2.2-signal.patch =================================================================== --- tinysofa/snapshot/vsftpd/current/sources/vsftpd-1.2.2-signal.patch 2004-07-01 15:56:09 UTC (rev 2859) +++ tinysofa/snapshot/vsftpd/current/sources/vsftpd-1.2.2-signal.patch 2004-07-01 15:56:16 UTC (rev 2860) @@ -0,0 +1,42 @@ +--- vsftpd-1.2.1/standalone.c 2003-04-08 01:56:57.000000000 +0200 ++++ vsftpd-1.2.1/standalone.c 2004-03-25 12:53:32.000000000 +0100 +@@ -133,12 +133,8 @@ + void* p_raw_addr; + int new_child; + int new_client_sock; +- vsf_sysutil_unblock_sig(kVSFSysUtilSigCHLD); +- vsf_sysutil_unblock_sig(kVSFSysUtilSigHUP); + new_client_sock = vsf_sysutil_accept_timeout( + listen_sock, p_accept_addr, 0); +- vsf_sysutil_block_sig(kVSFSysUtilSigCHLD); +- vsf_sysutil_block_sig(kVSFSysUtilSigHUP); + if (vsf_sysutil_retval_is_error(new_client_sock)) + { + continue; + +--- vsftpd-1.2.1/sysutil.c 2003-11-11 02:37:16.000000000 +0100 ++++ vsftpd-1.2.1/sysutil.c 2004-03-25 14:27:33.000000000 +0100 +@@ -1606,7 +1606,11 @@ + timeout.tv_usec = 0; + do + { ++ vsf_sysutil_unblock_sig(kVSFSysUtilSigCHLD); ++ vsf_sysutil_unblock_sig(kVSFSysUtilSigHUP); + retval = select(fd + 1, &accept_fdset, NULL, NULL, &timeout); ++ vsf_sysutil_block_sig(kVSFSysUtilSigCHLD); ++ vsf_sysutil_block_sig(kVSFSysUtilSigHUP); + vsf_sysutil_check_pending_actions(kVSFSysUtilUnknown, 0, 0); + } while (retval < 0 && errno == EINTR); + if (retval == 0) +@@ -1615,7 +1619,11 @@ + return -1; + } + } ++ vsf_sysutil_unblock_sig(kVSFSysUtilSigCHLD); ++ vsf_sysutil_unblock_sig(kVSFSysUtilSigHUP); + retval = accept(fd, &remote_addr.u.u_sockaddr, &socklen); ++ vsf_sysutil_block_sig(kVSFSysUtilSigCHLD); ++ vsf_sysutil_block_sig(kVSFSysUtilSigHUP); + vsf_sysutil_check_pending_actions(kVSFSysUtilUnknown, 0, 0); + if (retval < 0) + { Added: tinysofa/snapshot/vsftpd/current/sources/vsftpd-1.5.1-libs.patch =================================================================== --- tinysofa/snapshot/vsftpd/current/sources/vsftpd-1.5.1-libs.patch 2004-07-01 15:56:09 UTC (rev 2859) +++ tinysofa/snapshot/vsftpd/current/sources/vsftpd-1.5.1-libs.patch 2004-07-01 15:56:16 UTC (rev 2860) @@ -0,0 +1,12 @@ +--- vsftpd-1.2.1/Makefile.rh1 2003-11-25 15:58:11.000000000 +0100 ++++ vsftpd-1.2.1/Makefile 2003-11-25 15:58:33.000000000 +0100 +@@ -5,7 +5,8 @@ + #CFLAGS = -g + CFLAGS = -O2 -Wall -W -Wshadow #-pedantic -Werror -Wconversion + +-LIBS = `./vsf_findlibs.sh` ++#LIBS = `./vsf_findlibs.sh` ++LIBS = -lwrap -lnsl -lpam -lcap -ldl + LINK = -Wl,-s + + OBJS = main.o utility.o prelogin.o ftpcmdio.o postlogin.o privsock.o \ Deleted: tinysofa/snapshot/vsftpd/current/sources/vsftpd.conf =================================================================== --- tinysofa/snapshot/vsftpd/current/sources/vsftpd.conf 2004-07-01 15:56:09 UTC (rev 2859) +++ tinysofa/snapshot/vsftpd/current/sources/vsftpd.conf 2004-07-01 15:56:16 UTC (rev 2860) @@ -1,111 +0,0 @@ -# Example config file /etc/vsftpd/vsftpd.conf -# -# The default compiled in settings are fairly paranoid. This sample file -# loosens things up a bit, to make the ftp daemon more usable. -# Please see vsftpd.conf.5 for all compiled in defaults. -# -# READ THIS: This example file is NOT an exhaustive list of vsftpd options. -# Please read the vsftpd.conf.5 manual page to get a full idea of vsftpd's -# capabilities. -# -# Allow anonymous FTP? (Beware - allowed by default if you comment this out). -anonymous_enable=YES -# -# Uncomment this to allow local users to log in. -#local_enable=YES -# -# Uncomment this to enable any form of FTP write command. -#write_enable=YES -# -# Default umask for local users is 077. You may wish to change this to 022, -# if your users expect that (022 is used by most other ftpd's) -#local_umask=022 -# -# Uncomment this to allow the anonymous FTP user to upload files. This only -# has an effect if the above global write enable is activated. Also, you will -# obviously need to create a directory writable by the FTP user. -#anon_upload_enable=YES -# -# Uncomment this if you want the anonymous FTP user to be able to create -# new directories. -#anon_mkdir_write_enable=YES -# -# Activate directory messages - messages given to remote users when they -# go into a certain directory. -dirmessage_enable=YES -# -# Activate logging of uploads/downloads. -xferlog_enable=YES -# -# Make sure PORT transfer connections originate from port 20 (ftp-data). -connect_from_port_20=YES -# -# If you want, you can arrange for uploaded anonymous files to be owned by -# a different user. Note! Using "root" for uploaded files is not -# recommended! -#chown_uploads=YES -#chown_username=whoever -# -# You may override where the log file goes if you like. -xferlog_file=/var/log/vsftpd -# -# If you want, you can have your log file in standard ftpd xferlog format -xferlog_std_format=YES -# -# You may change the default value for timing out an idle session. -#idle_session_timeout=600 -# -# You may change the default value for timing out a data connection. -#data_connection_timeout=120 -# -# It is recommended that you define on your system a unique user which the -# ftp server can use as a totally isolated and unprivileged user. -nopriv_user=ftp -# -# Enable this and the server will recognise asynchronous ABOR requests. Not -# recommended for security (the code is non-trivial). Not enabling it, -# however, may confuse older FTP clients. -#async_abor_enable=YES -# -# By default the server will pretend to allow ASCII mode but in fact ignore -# the request. Turn on the below options to have the server actually do ASCII -# mangling on files when in ASCII mode. -# Beware that turning on ascii_download_enable enables malicious remote parties -# to consume your I/O resources, by issuing the command "SIZE /big/file" in -# ASCII mode. -# These ASCII options are split into upload and download because you may wish -# to enable ASCII uploads (to prevent uploaded scripts etc. from breaking), -# without the DoS risk of SIZE and ASCII downloads. ASCII mangling should be -# on the client anyway.. -#ascii_upload_enable=YES -#ascii_download_enable=YES -# -# You may fully customise the login banner string: -#ftpd_banner=Welcome to blah FTP service. -# -# You may specify a file of disallowed anonymous e-mail addresses. Apparently -# useful for combatting certain DoS attacks. -#deny_email_enable=YES -# (default follows) -#banned_email_file=/etc/vsftpd.banned_emails -# -# You may specify an explicit list of local users to chroot() to their home -# directory. If chroot_local_user is YES, then this list becomes a list of -# users to NOT chroot(). -#chroot_list_enable=YES -# (default follows) -#chroot_list_file=/etc/vsftpd.chroot_list -# -# You may activate the "-R" option to the builtin ls. This is disabled by -# default to avoid remote users being able to cause excessive I/O on large -# sites. However, some broken FTP clients such as "ncftp" and "mirror" assume -# the presence of the "-R" option, so there is a strong case for enabling it. -#ls_recurse_enable=YES - -pam_service_name=vsftpd -userlist_enable=YES -#enable for standalone mode -listen=YES -tcp_wrappers=YES -# XXX:tinysofa -- Use /var/lib/vsftp/chroot as secure_chroot_dir. -secure_chroot_dir=/var/lib/vsftp/chroot Added: tinysofa/snapshot/vsftpd/current/sources/vsftpd.ftpusers =================================================================== --- tinysofa/snapshot/vsftpd/current/sources/vsftpd.ftpusers 2004-07-01 15:56:09 UTC (rev 2859) +++ tinysofa/snapshot/vsftpd/current/sources/vsftpd.ftpusers 2004-07-01 15:56:16 UTC (rev 2860) @@ -0,0 +1,15 @@ +# Users that are not allowed to login via ftp +root +bin +daemon +adm +lp +sync +shutdown +halt +mail +news +uucp +operator +games +nobody Modified: tinysofa/snapshot/vsftpd/current/sources/vsftpd.init =================================================================== --- tinysofa/snapshot/vsftpd/current/sources/vsftpd.init 2004-07-01 15:56:09 UTC (rev 2859) +++ tinysofa/snapshot/vsftpd/current/sources/vsftpd.init 2004-07-01 15:56:16 UTC (rev 2860) @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # # vsftpd This shell script takes care of starting and stopping # standalone vsftpd. @@ -10,70 +10,48 @@ # config: /etc/vsftpd/vsftpd.conf # Source function library. -. /etc/init.d/functions +. /etc/rc.d/init.d/functions # Source networking configuration. . /etc/sysconfig/network # Check that networking is up. -if [ " ${NETWORKING}" = " no" ] ; then - STRING=$"vsftpd: networking disabled" - echo -n "$STRING" - failure "$STRING" - echo - exit 6 -fi +[ ${NETWORKING} = "no" ] && exit 0 -if [ ! -x /usr/sbin/vsftpd ] ; then - STRING=$"vsftpd: binary missing" - echo -n "$STRING" - failure "$STRING" - echo - exit 5 -fi +[ -x /usr/sbin/vsftpd ] || exit 0 RETVAL=0 prog="vsftpd" -# Start daemons. start() { - if [ -d /etc/vsftpd ] ; then - ls /etc/vsftpd/*.conf | \ - while read site ; do - name=`basename $site .conf` - STRING=$"Starting $prog for $name:" - echo -n "$STRING" - /usr/sbin/vsftpd $site & - RETVAL=$? - if [ $RETVAL -eq 0 ] ; then - touch ${INITLOCK:-/mnt/lockdev}/${prog} - success "$STRING" - else - failure "$STRING" - fi - echo - done - else - RETVAL=1 - fi - return $RETVAL + # Start daemons. + + if [ -d /etc/vsftpd ] ; then + for i in `ls /etc/vsftpd/*.conf`; do + site=`basename $i .conf` + echo -n $"Starting $prog for $site: " + /usr/sbin/vsftpd $i & + RETVAL=$? + [ $RETVAL -eq 0 ] && { + touch /var/lock/subsys/$prog + success $"$prog $site" + } + echo + done + else + RETVAL=1 + fi + return $RETVAL } stop() { - # Stop daemons. - STRING=$"Shutting down $prog:" - echo -n "$STRING" - killproc $prog - RETVAL=$? - if [ $RETVAL -eq 0 ] ; then - rm -f ${INITLOCK:-/mnt/lockdev}/${prog} - rm -f /var/run/vsftpd.pid - success "$STRING" - else - failure "$STRING" - fi - echo - return $RETVAL + # Stop daemons. + echo -n $"Shutting down $prog: " + killproc $prog + RETVAL=$? + echo + [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/$prog + return $RETVAL } # See how we were called. @@ -90,7 +68,7 @@ RETVAL=$? ;; condrestart) - if [ -f ${INITLOCK:-/mnt/lockdev}/${prog} ]; then + if [ -f /var/lock/subsys/$prog ]; then stop start RETVAL=$? @@ -102,7 +80,7 @@ ;; *) echo $"Usage: $0 {start|stop|restart|condrestart|status}" - exit 3 + exit 1 esac exit $RETVAL Deleted: tinysofa/snapshot/vsftpd/current/sources/vsftpd.logrotate =================================================================== --- tinysofa/snapshot/vsftpd/current/sources/vsftpd.logrotate 2004-07-01 15:56:09 UTC (rev 2859) +++ tinysofa/snapshot/vsftpd/current/sources/vsftpd.logrotate 2004-07-01 15:56:16 UTC (rev 2860) @@ -1,7 +0,0 @@ -/var/log/vsftpd { - # ftpd doesn't handle SIGHUP properly - notifempty - create - delaycompress - missingok -} Modified: tinysofa/snapshot/vsftpd/current/sources/vsftpd.pam =================================================================== --- tinysofa/snapshot/vsftpd/current/sources/vsftpd.pam 2004-07-01 15:56:09 UTC (rev 2859) +++ tinysofa/snapshot/vsftpd/current/sources/vsftpd.pam 2004-07-01 15:56:16 UTC (rev 2860) @@ -1,6 +1,6 @@ #%PAM-1.0 -auth required pam_listfile.so item=user sense=deny file=/etc/vsftpd.user_list onerr=succeed -auth required pam_stack.so service=system-auth -auth required pam_shells.so -account required pam_stack.so service=system-auth -session required pam_stack.so service=system-auth +auth required pam_listfile.so item=user sense=deny file=/etc/vsftpd.ftpusers onerr=succeed +auth required pam_stack.so service=system-auth +auth required pam_shells.so +account required pam_stack.so service=system-auth +session required pam_stack.so service=system-auth Modified: tinysofa/snapshot/vsftpd/current/sources/vsftpd.user_list =================================================================== --- tinysofa/snapshot/vsftpd/current/sources/vsftpd.user_list 2004-07-01 15:56:09 UTC (rev 2859) +++ tinysofa/snapshot/vsftpd/current/sources/vsftpd.user_list 2004-07-01 15:56:16 UTC (rev 2860) @@ -2,7 +2,7 @@ # If userlist_deny=NO, only allow users in this file # If userlist_deny=YES (default), never allow users in this file, and # do not even prompt for a password. -# Note that the default vsftpd pam config also checks /etc/ftpusers +# Note that the default vsftpd pam config also checks /etc/vsftpd.ftpusers # for users that are denied. root bin Modified: tinysofa/snapshot/vsftpd/current/sources/vsftpd.xinetd =================================================================== --- tinysofa/snapshot/vsftpd/current/sources/vsftpd.xinetd 2004-07-01 15:56:09 UTC (rev 2859) +++ tinysofa/snapshot/vsftpd/current/sources/vsftpd.xinetd 2004-07-01 15:56:16 UTC (rev 2860) @@ -3,11 +3,11 @@ # normal, unencrypted usernames and passwords for authentication. service ftp { - socket_type = stream - wait = no - user = root - server = /usr/sbin/vsftpd - nice = 10 - disable = yes - flags = IPv4 + socket_type = stream + wait = no + user = root + server = /usr/sbin/vsftpd + nice = 10 + disable = yes + flags = IPv4 } Modified: tinysofa/snapshot/vsftpd/current/specs/vsftpd.spec =================================================================== --- tinysofa/snapshot/vsftpd/current/specs/vsftpd.spec 2004-07-01 15:56:09 UTC (rev 2859) +++ tinysofa/snapshot/vsftpd/current/specs/vsftpd.spec 2004-07-01 15:56:16 UTC (rev 2860) @@ -1,139 +1,231 @@ +%{!?tcp_wrappers:%define tcp_wrappers 1} + Summary: vsftpd - Very Secure Ftp Daemon Name: vsftpd Version: 1.2.2 -Release: 3jh +Release: 1ts License: GPL -Group: tinysofa official +Group: System Environment/Daemons URL: http://vsftpd.beasts.org/ Source: ftp://vsftpd.beasts.org/users/cevans/%{name}-%{version}.tar.gz Source1: vsftpd.xinetd Source2: vsftpd.pam -Source3: vsftpd.user_list -Source4: vsftpd.init -Source5: vsftpd.logrotate -Source6: vsftpd.conf -Patch1: vsftpd-1.2.0-tcp_wrappers.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-root +Source3: vsftpd.ftpusers +Source4: vsftpd.user_list +Source5: vsftpd.init +Patch1: vsftpd-1.1.3-rh.patch +Patch2: vsftpd-1.0.1-missingok.patch +Patch3: vsftpd-1.2.0-tcp_wrappers.patch +Patch4: vsftpd-1.5.1-libs.patch +Patch5: vsftpd-1.2.2-signal.patch +Patch6: vsftpd-1.2.1-conffile.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root +%if %{tcp_wrappers} BuildPrereq: tcp_wrappers -Requires: anonftp, logrotate -%service_requires +%endif +# for -fpie +BuildPrereq: gcc > gcc-3.2.3-13, binutils > binutils-2.14.90.0.4-24, glibc-devel >= 2.3.2-45, pam-devel +Requires: logrotate +Prereq: /sbin/chkconfig, /sbin/service, /usr/sbin/usermod +Obsoletes: anonftp Provides: ftpserver - %description vsftpd is a Very Secure FTP daemon. It was written completely from scratch. -It is configured to not allow write access or non-anonymous user -login. - - %prep -%setup -q -%patch1 -p1 +%setup -q -n %{name}-%{version} +%patch1 -p1 -b .rh +%patch2 -p1 -b .mok +%if %{tcp_wrappers} +%patch3 -p1 -b .tcp_wrappers +%endif +%patch4 -p1 -b .libs cp %{SOURCE1} . +%patch5 -p1 -b .signal +%patch6 -p1 - %build -%make CFLAGS="$RPM_OPT_FLAGS -pipe" LINK="" +%ifarch s390x +make CFLAGS="$RPM_OPT_FLAGS -fPIE -pipe" \ +%else +make CFLAGS="$RPM_OPT_FLAGS -fpie -pipe" \ +%endif + LINK="-pie" \ + %{?_smp_mflags} - %install -install -d -m 755 $RPM_BUILD_ROOT/%{_sbindir} -install -d -m 755 $RPM_BUILD_ROOT/%{_initdir} -install -d -m 755 $RPM_BUILD_ROOT/%{_sysconfdir}/{vsftpd,pam.d} -install -d -m 755 $RPM_BUILD_ROOT/%{_sysconfdir}/{logrotate.d,xinetd.d} -install -d -m 755 $RPM_BUILD_ROOT/%{_mandir}/man{5,8} -install -d -m 755 $RPM_BUILD_ROOT/%{_localstatedir}/log -install -d -m 755 $RPM_BUILD_ROOT/%{_localstatedir}/lib/vsftp -install -d -m 700 $RPM_BUILD_ROOT/%{_localstatedir}/lib/vsftp/chroot -install -m 755 vsftpd $RPM_BUILD_ROOT/%{_sbindir}/vsftpd +[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT +mkdir -p $RPM_BUILD_ROOT/usr/sbin +mkdir -p $RPM_BUILD_ROOT/etc +mkdir -p $RPM_BUILD_ROOT/etc/{vsftpd,pam.d,logrotate.d,rc.d/init.d} +mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man{5,8} +install -m 755 vsftpd $RPM_BUILD_ROOT/usr/sbin/vsftpd +install -m 600 vsftpd.conf $RPM_BUILD_ROOT/etc/vsftpd/vsftpd.conf install -m 644 vsftpd.conf.5 $RPM_BUILD_ROOT/%{_mandir}/man5/ install -m 644 vsftpd.8 $RPM_BUILD_ROOT/%{_mandir}/man8/ -install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/xinetd.d/vsftpd -install -m 644 %{SOURCE2} $RPM_BUILD_ROOT/%{_sysconfdir}/pam.d/vsftpd -install -m 600 %{SOURCE3} $RPM_BUILD_ROOT/%{_sysconfdir}/vsftpd.user_list -install -m 755 %{SOURCE4} $RPM_BUILD_ROOT/%{_initdir}/vsftpd -install -m 644 %{SOURCE5} $RPM_BUILD_ROOT/%{_sysconfdir}/logrotate.d/vsftpd -install -m 600 %{SOURCE6} $RPM_BUILD_ROOT/%{_sysconfdir}/vsftpd/vsftpd.conf -touch -m 600 $RPM_BUILD_ROOT/%{_localstatedir}/log/vsftpd +install -m 644 RedHat/vsftpd.log $RPM_BUILD_ROOT/etc/logrotate.d/vsftpd.log +install -m 644 %{SOURCE2} $RPM_BUILD_ROOT/etc/pam.d/vsftpd +install -m 600 %{SOURCE3} $RPM_BUILD_ROOT/etc/vsftpd.ftpusers +install -m 600 %{SOURCE4} $RPM_BUILD_ROOT/etc/vsftpd.user_list +install -m 755 %{SOURCE5} $RPM_BUILD_ROOT/etc/rc.d/init.d/vsftpd + +mkdir -p $RPM_BUILD_ROOT/srv/ftp/pub - %clean -%clean_buildroot +[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT - %post -%service_post vsftpd +/sbin/chkconfig --add vsftpd +/usr/sbin/usermod -d /srv/ftp ftp >/dev/null 2>&1 || : %preun -%service_preun vsftpd +if [ $1 = 0 ]; then + /sbin/service vsftpd stop > /dev/null 2>&1 + /sbin/chkconfig --del vsftpd +fi + -%postun -%service_postun vsftpd - - %files %defattr(-,root,root) -%doc FAQ BUGS AUDIT Changelog LICENSE README README.security -%doc REWARD SPEED TODO SECURITY/ TUNING SIZE vsftpd.xinetd -%doc EXAMPLE/ -%{_sbindir}/vsftpd -%{_initdir}/vsftpd -%config(noreplace) %{_sysconfdir}/vsftpd.* -%dir %{_sysconfdir}/vsftpd -%config(noreplace) %{_sysconfdir}/vsftpd/* -%config(noreplace) %{_sysconfdir}/pam.d/vsftpd -%config(noreplace) %{_sysconfdir}/logrotate.d/vsftpd -%config(noreplace) %{_sysconfdir}/xinetd.d/vsftpd -%dir %attr(755,root,root) %{_localstatedir}/lib/vsftp -%dir %attr(700,root,root) %{_localstatedir}/lib/vsftp/chroot +/usr/sbin/vsftpd +/etc/rc.d/init.d/vsftpd +%config(noreplace) /etc/vsftpd.* +%dir /etc/vsftpd +%config(noreplace) /etc/vsftpd/* +%config(noreplace) /etc/pam.d/vsftpd +%config(noreplace) /etc/logrotate.d/vsftpd.log +%doc FAQ INSTALL BUGS AUDIT Changelog LICENSE README README.security REWARD SPEED TODO SECURITY/ TUNING SIZE vsftpd.xinetd %{_mandir}/man5/vsftpd.conf.* %{_mandir}/man8/vsftpd.* -%{_localstatedir}/log/vsftpd +/srv/ftp - %changelog -* Sun Jun 6 2004 Jaakko Heinonen 1.2.2-3jh -- use new rpm macros -- use INITLOCK variable in init script +* Tue Jun 15 2004 Elliot Lee +- rebuilt -* Wed May 19 2004 tsintegrate 1.2.2-2ts -- current (1.2.2-1ts) integrated as 1.2.2-2ts for release 1.0-U1 +* Wed May 19 2004 Bill Nottingham 1.2.1-6 +- fix the logrotate config (#116253) -* Tue Apr 27 2004 Omar Kilani 1.2.2-1ts -- New upstream: 1.2.2. +* Mon May 3 2004 Bill Nottingham 1.2.1-5 +- fix all references to vsftpd.conf to be /etc/vsftpd/vsftpd.conf, + including in the binary (#121199, #104075) -* Sun Jan 25 2004 Erlend Midttun 1.2.1-1tr -- New upstream. -- Now have config file as source. -- logrotate now with notifempty, create, delaycompress and missingok. +* Thu Mar 25 2004 Bill Nottingham 1.2.1-4 +- don't call malloc()/free() in signal handlers (#119136, + ) -* Mon Aug 18 2003 Goetz Bock 1.2.0-8bg -- build for Cloud (aka Trustix 2.0) - Contrib -- require anonftp, as it has a correct setup for /home/ftp -- changed patch1 to be more secure -- rewrote initscript, tuned specfile +* Fri Feb 13 2004 Elliot Lee +- rebuilt -* Mon Aug 18 2003 Omar Kilani 1.2.0-7ok -- Changed secure_chroot_dir to /var/empty, openssh-server uses it as well. +* Mon Nov 24 2003 Karsten Hopp 1.2.1-1 +- update to 1.2.1, which fixes #89765 and lot of other issues +- remove manpage patch, it isn't required anymore +- clean up init script +- don't use script to find libs to link with (lib64 issues) -* Mon Aug 18 2003 Omar Kilani 1.2.0-6ok -- Changed anonymous ftp directory from /var/ftp to /home/ftp as per Trustix. +* Sun Oct 12 2003 Florian La Roche +- allow compiling without tcp_wrappers support -* Thu Aug 14 2003 Omar Kilani 1.2.0-5ok -- Changed release suffix from tr to ok. +* Mon Sep 15 2003 Bill Nottingham 1.2.0-4 +- fix errant newline (#104443) -* Tue Aug 05 2003 Omar Kilani 1.2.0-4tr -- Confirm to packaging policy -- Changed BuildRoot to match TSL Packaging Policy -- Change vsftpd-1.2.0-trustix.patch to vsftpd-1.2.0-trustix-vsftpd-conf.patch +* Fri Aug 8 2003 Bill Nottingham 1.2.0-3 +- tweak man page (#84584, #72798) +- buildprereqs for pie (#99336) +- free ride through the build system to fix (#101582) -* Tue Aug 05 2003 Omar Kilani 1.2.0-3tr -- Split out the logrotate config, make it a source file -- Force /var/log/xferlog to be the logfile by modifying -- vsftpd-1.1.3-rh.patch, renamed it vsftpd-1.2.0-trustix.patch +* Thu Jun 26 2003 Bill Nottingham 1.2.0-2 +- update to 1.2.0 -* Tue Aug 05 2003 Omar Kilani 1.2.0-1tr -- Modify spec, PAM, init, to suit TSL 2.0 -- based on redhat's 1.2.0-2 +* Wed Jun 04 2003 Elliot Lee +- rebuilt + +* Mon Apr 28 2003 Bill Nottingham 1.1.3-9 +- fix tcp_wrappers usage (#89765, ) + +* Fri Feb 28 2003 Nalin Dahyabhai 1.1.3-8 +- enable use of tcp_wrappers + +* Tue Feb 11 2003 Bill Nottingham 1.1.3-7 +- provide /srv/ftp & /srv/ftp/pub. obsolete anonftp. + +* Mon Feb 10 2003 Bill Nottingham 1.1.3-6 +- clean up comments in init script (#83962) + +* Wed Jan 22 2003 Tim Powers +- rebuilt + +* Mon Dec 30 2002 Florian La Roche +- change to /etc/rc.d/init.d for better compatibility + +* Mon Dec 16 2002 Bill Nottingham 1.1.3-3 +- fix initscript perms +- fix typo in initscript (#76587) + +* Fri Dec 13 2002 Bill Nottingham 1.1.3-2 +- update to 1.1.3 +- run standalone, don't run by default +- fix reqs + +* Fri Nov 22 2002 Joe Orton 1.1.0-3 +- fix use with xinetd-ipv6; add flags=IPv4 in xinetd file (#78410) + +* Tue Nov 12 2002 Nalin Dahyabhai 1.0.1-9 +- remove absolute paths from PAM configuration so that the right modules get + used for whichever arch we're built for on multilib systems + +* Thu Aug 15 2002 Elliot Lee 1.0.1-8 +- -D_FILE_OFFSET_BITS=64 +- smp make +- remove forced optflags=-g for lack of supporting documentation + +* Fri Jun 21 2002 Tim Powers +- automated rebuild + +* Thu May 23 2002 Tim Powers +- automated rebuild + +* Wed Apr 10 2002 Bill Nottingham 1.0.1-5 +- don't spit out ugly errors if anonftp isn't installed (#62987) +- fix horribly broken userlist setup (#62321) + +* Thu Feb 28 2002 Trond Eivind Glomsr?d 1.0.1-4 +- s/Copyright/License/ +- add "missingok" to the logrotate script, so we don't get errors + when nothing has happened + +* Wed Jan 09 2002 Tim Powers +- automated rebuild + +* Wed Nov 28 2001 Bill Nottingham +- initial packaging for RHL, munge included specfile + +* Thu Mar 22 2001 Seth Vidal +- updated to 0.0.15 +- added entry for vsftpd.8 man page +- added entry for vsftpd.log logrotate file +- added TUNING file to docs list + +* Wed Mar 7 2001 Seth Vidal +- Updated to 0.0.14 +- made %files entry for man page + +* Wed Feb 21 2001 Seth Vidal +- Updated to 0.0.13 + +* Mon Feb 12 2001 Seth Vidal +- Updated to 0.0.12 + +* Wed Feb 7 2001 Seth Vidal +- updated to 0.0.11 + +* Fri Feb 1 2001 Seth Vidal +- Update to 0.0.10 + +* Fri Feb 1 2001 Seth Vidal +- First RPM packaging +- Stolen items from wu-ftpd's pam setup +- Separated rh 7 and rh 6.X's packages +- Built for Rh6 From svn at tinysofa.org Thu Jul 1 15:56:19 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:56:19 +1000 (EST) Subject: [tinysofa-svn] r2861 - in tinysofa/snapshot/wget/current: sources specs Message-ID: <20040701155619.26B1E4E817E@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:56:19 +1000 (Fri, 02 Jul 2004) New Revision: 2861 Added: tinysofa/snapshot/wget/current/sources/wget-1.5.3-ko.po Modified: tinysofa/snapshot/wget/current/specs/wget.spec Log: - Sync with 2.0. - Kept: - wget-1.8.2-ctype.patch: - wget-1.9.1-cvs20040122.patch: - wget-1.9.1-passive.patch: - wget-1.9.1-path.patch: - wget-1.9.1-rh1.patch: - wget-1.9.1.tar.gz: - Added: - wget-1.5.3-ko.po: Added: tinysofa/snapshot/wget/current/sources/wget-1.5.3-ko.po =================================================================== --- tinysofa/snapshot/wget/current/sources/wget-1.5.3-ko.po 2004-07-01 15:56:16 UTC (rev 2860) +++ tinysofa/snapshot/wget/current/sources/wget-1.5.3-ko.po 2004-07-01 15:56:19 UTC (rev 2861) @@ -0,0 +1,997 @@ +# Korean messages for wget. +# Copyright (C) 1997 Free Software Foundation, Inc. +# Sang-Jin Hwang, , 1998. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: wget 1.5.3\n" +"POT-Creation-Date: 1998-09-21 19:08+0200\n" +"PO-Revision-Date: 1999-04-07 02:46+0900\n" +"Last-Translator: Sang-Jin Hwang, \n" +"Language-Team: Korean\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=EUC-KR\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Login to the server: +#. First: Establish the control connection. +#: src/ftp.c:147 src/http.c:346 +#, c-format +msgid "Connecting to %s:%hu... " +msgstr "%s:%hu?? ???????? ????????..." + +#: src/ftp.c:169 src/ftp.c:411 src/http.c:363 +#, c-format +msgid "Connection to %s:%hu refused.\n" +msgstr "%s:%hu?????? ?????? ???? ??????????\n" + +#. Second: Login with proper USER/PASS sequence. +#: src/ftp.c:190 src/http.c:374 +msgid "connected!\n" +msgstr "????????????!\n" + +#: src/ftp.c:191 +#, c-format +msgid "Logging in as %s ... " +msgstr "%s???? ?????????? ????????..." + +#: src/ftp.c:200 src/ftp.c:253 src/ftp.c:301 src/ftp.c:353 src/ftp.c:447 +#: src/ftp.c:520 src/ftp.c:568 src/ftp.c:616 +msgid "Error in server response, closing control connection.\n" +msgstr "?????? ?????? ?????? ???? ?????? ??????????.\n" + +#: src/ftp.c:208 +msgid "Error in server greeting.\n" +msgstr "?????? greeting?? ?????? ????????.\n" + +#: src/ftp.c:216 src/ftp.c:262 src/ftp.c:310 src/ftp.c:362 src/ftp.c:457 +#: src/ftp.c:530 src/ftp.c:578 src/ftp.c:626 +msgid "Write failed, closing control connection.\n" +msgstr "?????? ????????????, ?????? ??????????.\n" + +#: src/ftp.c:223 +msgid "The server refuses login.\n" +msgstr "???????? ??????????????.\n" + +#: src/ftp.c:230 +msgid "Login incorrect.\n" +msgstr "???????? ??????????????.\n" + +#: src/ftp.c:237 +msgid "Logged in!\n" +msgstr "?????? ????????!\n" + +#: src/ftp.c:270 +#, c-format +msgid "Unknown type `%c', closing control connection.\n" +msgstr "`%c'?? ?? ?? ???? ??????????, ?????? ??????????.\n" + +#: src/ftp.c:283 +msgid "done. " +msgstr "????. " + +#: src/ftp.c:289 +msgid "==> CWD not needed.\n" +msgstr "==> CWD?? ???????? ????????.\n" + +#: src/ftp.c:317 +#, c-format +msgid "" +"No such directory `%s'.\n" +"\n" +msgstr "???????? `%s'?? ???????? ????????\n\n" + +#: src/ftp.c:331 src/ftp.c:599 src/ftp.c:647 src/url.c:1431 +msgid "done.\n" +msgstr "????.\n" + +#. do not CWD +#: src/ftp.c:335 +msgid "==> CWD not required.\n" +msgstr "==> CWD?? ???????? ????????.\n" + +#: src/ftp.c:369 +msgid "Cannot initiate PASV transfer.\n" +msgstr "PASV???????? ?????? ?? ?? ????????.\n" + +#: src/ftp.c:373 +msgid "Cannot parse PASV response.\n" +msgstr "PASV?? ?????? parse?? ?? ????????.\n" + +#: src/ftp.c:387 +#, c-format +msgid "Will try connecting to %s:%hu.\n" +msgstr "%s:%hu?????? ?????? ??????????.\n" + +#: src/ftp.c:432 src/ftp.c:504 src/ftp.c:548 +msgid "done. " +msgstr "????. " + +#: src/ftp.c:474 +#, c-format +msgid "Bind error (%s).\n" +msgstr "Bind ???? (%s)\n" + +#: src/ftp.c:490 +msgid "Invalid PORT.\n" +msgstr "?????? ??????????????.\n" + +#: src/ftp.c:537 +msgid "" +"\n" +"REST failed, starting from scratch.\n" +msgstr "\nREST?? ????????????. ???????? ???? ????????.\n" + +#: src/ftp.c:586 +#, c-format +msgid "" +"No such file `%s'.\n" +"\n" +msgstr "???? `%s'?? ???????? ????????.\n" + +#: src/ftp.c:634 +#, c-format +msgid "" +"No such file or directory `%s'.\n" +"\n" +msgstr "???? ???? ???????? `%s'?? ???????? ????????.\n" + +#: src/ftp.c:692 src/ftp.c:699 +#, c-format +msgid "Length: %s" +msgstr "????: %s" + +#: src/ftp.c:694 src/ftp.c:701 +#, c-format +msgid " [%s to go]" +msgstr "" + +#: src/ftp.c:703 +msgid " (unauthoritative)\n" +msgstr "" + +#: src/ftp.c:721 +#, c-format +msgid "%s: %s, closing control connection.\n" +msgstr "%s: %s ?????? ??????????.\n" + +#: src/ftp.c:729 +#, c-format +msgid "%s (%s) - Data connection: %s; " +msgstr "%s (%s) - ?????? ????: %s; " + +#: src/ftp.c:746 +msgid "Control connection closed.\n" +msgstr "???? ?????? ??????????.\n" + +#: src/ftp.c:764 +msgid "Data transfer aborted.\n" +msgstr "?????? ?????? ??????????????.\n" + +#: src/ftp.c:830 +#, c-format +msgid "File `%s' already there, not retrieving.\n" +msgstr "???? `%s'?? ??????????, ?? ?????? ?? ?? ????????.\n" + +#: src/ftp.c:896 src/http.c:922 +#, c-format +msgid "(try:%2d)" +msgstr "" + +#: src/ftp.c:955 src/http.c:1116 +#, c-format +msgid "" +"%s (%s) - `%s' saved [%ld]\n" +"\n" +msgstr "%s (%s) - `%s'?? ?????????????? [%ld]\n\n" + +#: src/ftp.c:1001 +#, c-format +msgid "Using `%s' as listing tmp file.\n" +msgstr "tmp ???? ?????? `%s'???? ???????? ????????.\n" + +#: src/ftp.c:1013 +#, c-format +msgid "Removed `%s'.\n" +msgstr "`%s'?? ??????????.\n" + +#: src/ftp.c:1049 +#, c-format +msgid "Recursion depth %d exceeded max. depth %d.\n" +msgstr "???????? ?????? ???? %d?? ???? ????????, %d?? ??????????.\n" + +#: src/ftp.c:1096 src/http.c:1054 +#, c-format +msgid "" +"Local file `%s' is more recent, not retrieving.\n" +"\n" +msgstr "???? ???? `%s'?? ?????? ??????, ?? ?????? ?? ?? ????????.\n" + +#: src/ftp.c:1102 src/http.c:1060 +#, c-format +msgid "The sizes do not match (local %ld), retrieving.\n" +msgstr "???? ?????? ??????(%ld)?? ?????? ??????, ?? ?????? ?? ?? ????????.\n" + +#: src/ftp.c:1119 +msgid "Invalid name of the symlink, skipping.\n" +msgstr "???????????? ?????? ??????????????, ??????????.\n" + +#: src/ftp.c:1136 +#, c-format +msgid "" +"Already have correct symlink %s -> %s\n" +"\n" +msgstr "%s -> %s???? ?????? ?????? ???? ??????????\n\n" + +#: src/ftp.c:1144 +#, c-format +msgid "Creating symlink %s -> %s\n" +msgstr "?????????? %s -> %s?? ??????????\n" + +#: src/ftp.c:1155 +#, c-format +msgid "Symlinks not supported, skipping symlink `%s'.\n" +msgstr "???????????? ???????? ????????, `%s' ???????????? ??????????.\n" + +#: src/ftp.c:1167 +#, c-format +msgid "Skipping directory `%s'.\n" +msgstr "`%s'?????????? ??????????.\n" + +#: src/ftp.c:1176 +#, c-format +msgid "%s: unknown/unsupported file type.\n" +msgstr "???? ???? %s?? ???????? ????????.\n" + +#: src/ftp.c:1193 +#, c-format +msgid "%s: corrupt time-stamp.\n" +msgstr "" + +#: src/ftp.c:1213 +#, c-format +msgid "Will not retrieve dirs since depth is %d (max %d).\n" +msgstr "?????? %d(???? %d)???? ?????? ?????????? ?????? ?? ????????.\n" + +#: src/ftp.c:1252 +#, c-format +msgid "Not descending to `%s' as it is excluded/not-included.\n" +msgstr "" + +#: src/ftp.c:1297 +#, c-format +msgid "Rejecting `%s'.\n" +msgstr "`%s'?? ??????????.\n" + +#. No luck. +#. #### This message SUCKS. We should see what was the +#. reason that nothing was retrieved. +#: src/ftp.c:1344 +#, c-format +msgid "No matches on pattern `%s'.\n" +msgstr "???? `%s'?? ???????? ????????.\n" + +#: src/ftp.c:1404 +#, c-format +msgid "Wrote HTML-ized index to `%s' [%ld].\n" +msgstr "`%s' [%ld]?? ???? HTML?? ???????? ????????????.\n" + +#: src/ftp.c:1409 +#, c-format +msgid "Wrote HTML-ized index to `%s'.\n" +msgstr "`%s'?? ???? HTML???????? ????????????.\n" + +#: src/getopt.c:454 +#, c-format +msgid "%s: option `%s' is ambiguous\n" +msgstr "%s: ???? `%s'?? ??????????????\n" + +#: src/getopt.c:478 +#, c-format +msgid "%s: option `--%s' doesn't allow an argument\n" +msgstr "%s: ???? `--%s'?? ???????? ???????? ????????\n" + +#: src/getopt.c:483 +#, c-format +msgid "%s: option `%c%s' doesn't allow an argument\n" +msgstr "%s: ???? `%c%s'?? ???????? ???????? ????????\n" + +#: src/getopt.c:498 +#, c-format +msgid "%s: option `%s' requires an argument\n" +msgstr "%s: ???? `%s'?? ?????? ?????? ??????\n" + +#. --option +#: src/getopt.c:528 +#, c-format +msgid "%s: unrecognized option `--%s'\n" +msgstr "%s: ???? `--%s'?? ?? ???? ????????\n" + +#. +option or -option +#: src/getopt.c:532 +#, c-format +msgid "%s: unrecognized option `%c%s'\n" +msgstr "%s: ???? `%c%s'?? ?? ???? ????????\n" + +#. 1003.2 specifies the format of this message. +#: src/getopt.c:563 +#, c-format +msgid "%s: illegal option -- %c\n" +msgstr "%s: ???? -- %c?? ??????????????\n" + +#. 1003.2 specifies the format of this message. +#: src/getopt.c:602 +#, c-format +msgid "%s: option requires an argument -- %c\n" +msgstr "%s: ???????? ?????? ?????? ?????? -- %c\n" + +#: src/host.c:432 +#, c-format +msgid "%s: Cannot determine user-id.\n" +msgstr "%s: ??????ID?? ?? ???? ????????.\n" + +#: src/host.c:444 +#, c-format +msgid "%s: Warning: uname failed: %s\n" +msgstr "%s: ????: uname?? ????????????: %s\n" + +#: src/host.c:456 +#, c-format +msgid "%s: Warning: gethostname failed\n" +msgstr "%s: ????: gethostname?? ????????????\n" + +#: src/host.c:484 +#, c-format +msgid "%s: Warning: cannot determine local IP address.\n" +msgstr "%s: ????: ???? ?????? ?????? ?? ???? ????????.\n" + +#: src/host.c:498 +#, c-format +msgid "%s: Warning: cannot reverse-lookup local IP address.\n" +msgstr "%s: ????: ???? ?????? ?????? ?? ???? ?? ???? ????????\n" + +#. This gets ticked pretty often. Karl Berry reports +#. that there can be valid reasons for the local host +#. name not to be an FQDN, so I've decided to remove the +#. annoying warning. +#: src/host.c:511 +#, c-format +msgid "%s: Warning: reverse-lookup of local address did not yield FQDN!\n" +msgstr "%s: ????: ???? ?????? ?????? ?? ?????? FQDN?? ????????!\n" + +#: src/host.c:539 +msgid "Host not found" +msgstr "???????? ?????? ?? ????????" + +#: src/host.c:541 +msgid "Unknown error" +msgstr "???????? ????" + +#: src/html.c:439 src/html.c:441 +#, c-format +msgid "Index of /%s on %s:%d" +msgstr "/%s?? ??????(%s:%d)" + +#: src/html.c:463 +msgid "time unknown " +msgstr "?????? ?? ?? ???????? " + +#: src/html.c:467 +msgid "File " +msgstr "???? " + +#: src/html.c:470 +msgid "Directory " +msgstr "???????? " + +#: src/html.c:473 +msgid "Link " +msgstr "???? " + +#: src/html.c:476 +msgid "Not sure " +msgstr "" + +#: src/html.c:494 +#, c-format +msgid " (%s bytes)" +msgstr " (%s ??????)" + +#: src/http.c:492 +msgid "Failed writing HTTP request.\n" +msgstr "HTTP?????? ???? ?????? ????????????.\n" + +#: src/http.c:497 +#, c-format +msgid "%s request sent, awaiting response... " +msgstr "%s ?????? ????????, ???????????? ?????? ??????..." + +#: src/http.c:536 +msgid "End of file while parsing headers.\n" +msgstr "?????????? ?????????????? ?????? ??????????.\n" + +#: src/http.c:547 +#, c-format +msgid "Read error (%s) in headers.\n" +msgstr "???????????? (%s) ???? ????.\n" + +#: src/http.c:587 +msgid "No data received" +msgstr "?????? ???????? ????????" + +#: src/http.c:589 +msgid "Malformed status line" +msgstr "status line?? ???? ?????? ???? ????????" + +#: src/http.c:594 +msgid "(no description)" +msgstr "" + +#. If we have tried it already, then there is not point +#. retrying it. +#: src/http.c:678 +msgid "Authorization failed.\n" +msgstr "?????? ????????????.\n" + +#: src/http.c:685 +msgid "Unknown authentication scheme.\n" +msgstr "?? ?? ???? ???? ??????????.\n" + +#: src/http.c:748 +#, c-format +msgid "Location: %s%s\n" +msgstr "????: %s%s\n" + +#: src/http.c:749 src/http.c:774 +msgid "unspecified" +msgstr "" + +#: src/http.c:750 +msgid " [following]" +msgstr "" + +#. No need to print this output if the body won't be +#. downloaded at all, or if the original server response is +#. printed. +#: src/http.c:764 +msgid "Length: " +msgstr "????: " + +#: src/http.c:769 +#, c-format +msgid " (%s to go)" +msgstr "" + +#: src/http.c:774 +msgid "ignored" +msgstr "??????????????" + +#: src/http.c:857 +msgid "Warning: wildcards not supported in HTTP.\n" +msgstr "????: HTTP?????? ???????????? ???????? ???? ????????.\n" + +#. If opt.noclobber is turned on and file already exists, do not +#. retrieve the file +#: src/http.c:872 +#, c-format +msgid "File `%s' already there, will not retrieve.\n" +msgstr "???? `%s'?? ???? ???????? ??????, ?????? ?? ????????.\n" + +#: src/http.c:978 +#, c-format +msgid "Cannot write to `%s' (%s).\n" +msgstr "`%s'?????? ?????? ?? ?? ????????(%s).\n" + +#: src/http.c:988 +#, c-format +msgid "ERROR: Redirection (%d) without location.\n" +msgstr "????: ?????? ???????? ???? ???? ?????? ????????(%d)??\n" + +#: src/http.c:1011 +#, c-format +msgid "%s ERROR %d: %s.\n" +msgstr "%s ???? %d: %s??\n" + +#: src/http.c:1023 +msgid "Last-modified header missing -- time-stamps turned off.\n" +msgstr "?????? ???? ?????? ?????? ?????????? -- ???? ???????? ???? ????????.\n" + +#: src/http.c:1031 +msgid "Last-modified header invalid -- time-stamp ignored.\n" +msgstr "?????? ???? ?????? ?????? ?????????????? -- ???? ???????? ??????????.\n" + +#: src/http.c:1064 +msgid "Remote file is newer, retrieving.\n" +msgstr "" + +#: src/http.c:1098 +#, c-format +msgid "" +"%s (%s) - `%s' saved [%ld/%ld]\n" +"\n" +msgstr "%s (%s) - `%s'?? ?????????????? [%ld/%ld]\n\n" + +#: src/http.c:1130 +#, c-format +msgid "%s (%s) - Connection closed at byte %ld. " +msgstr "%s (%s) - %ld ?????????? ?????? ??????????????." + +#: src/http.c:1138 +#, c-format +msgid "" +"%s (%s) - `%s' saved [%ld/%ld])\n" +"\n" +msgstr "%s (%s) - `%s'?? ?????????????? [%ld/%ld]\n\n" + +#: src/http.c:1150 +#, c-format +msgid "%s (%s) - Connection closed at byte %ld/%ld. " +msgstr "%s (%s) - %ld/%ld ?????????? ?????? ??????????????. " + +#: src/http.c:1161 +#, c-format +msgid "%s (%s) - Read error at byte %ld (%s)." +msgstr "%s (%s) - %ld (%s)?????????? ???? ????." + +#: src/http.c:1169 +#, c-format +msgid "%s (%s) - Read error at byte %ld/%ld (%s). " +msgstr "%s (%s) - %ld/%ld ??????(%s)???? ???? ????. " + +#: src/init.c:312 src/netrc.c:250 +#, c-format +msgid "%s: Cannot read %s (%s).\n" +msgstr "%s: %s?? ???? ???? ????????(%s).\n" + +#: src/init.c:333 src/init.c:339 +#, c-format +msgid "%s: Error in %s at line %d.\n" +msgstr "%s: %s?? %d?????? ???? ????.\n" + +#: src/init.c:370 +#, c-format +msgid "%s: Warning: Both system and user wgetrc point to `%s'.\n" +msgstr "%s: ????: ?????????? wgetrc?? ?????? wgetrc ?????? `%s'?? ??????????.\n" + +#: src/init.c:458 +#, c-format +msgid "%s: BUG: unknown command `%s', value `%s'.\n" +msgstr "%s: ????: ?????? `%s', ?? `%s'?? ?? ???? ????????.\n" + +#: src/init.c:485 +#, c-format +msgid "%s: %s: Please specify on or off.\n" +msgstr "%s: %s: on ???? off?? ?????? ????????.\n" + +#: src/init.c:503 src/init.c:760 src/init.c:782 src/init.c:855 +#, c-format +msgid "%s: %s: Invalid specification `%s'.\n" +msgstr "%s: %s: `%s'?? ?????? ??????????.\n" + +#: src/init.c:616 src/init.c:638 src/init.c:660 src/init.c:686 +#, c-format +msgid "%s: Invalid specification `%s'\n" +msgstr "%s: `%s'?? ?????? ??????????\n" + +#: src/main.c:101 +#, c-format +msgid "Usage: %s [OPTION]... [URL]...\n" +msgstr "??????: %s [????]... [URL(????????????)]...\n" + +#: src/main.c:109 +#, c-format +msgid "GNU Wget %s, a non-interactive network retriever.\n" +msgstr "GNU Wget %s, ?? ?????? ???????? ???? ???? ??????????????.\n" + +#. Had to split this in parts, so the #@@#%# Ultrix compiler and cpp +#. don't bitch. Also, it makes translation much easier. +#: src/main.c:114 +msgid "" +"\n" +"Mandatory arguments to long options are mandatory for short options too.\n" +"\n" +msgstr "" + +#: src/main.c:117 +msgid "" +"Startup:\n" +" -V, --version display the version of Wget and exit.\n" +" -h, --help print this help.\n" +" -b, --background go to background after startup.\n" +" -e, --execute=COMMAND execute a `.wgetrc' command.\n" +"\n" +msgstr "" +"????:\n" +" -V, --version ???? ?????? ?????? ???????? ??????????.\n" +" -h, --help ???????? ?????? ???????? ??????????.\n" +" -b, --background ?????????????? ??????????.\n" +" -e, --execute=COMMAND .wgetrc ???????? ??????????\n" +"\n" + +#: src/main.c:123 +msgid "" +"Logging and input file:\n" +" -o, --output-file=FILE log messages to FILE.\n" +" -a, --append-output=FILE append messages to FILE.\n" +" -d, --debug print debug output.\n" +" -q, --quiet quiet (no output).\n" +" -v, --verbose be verbose (this is the default).\n" +" -nv, --non-verbose turn off verboseness, without being quiet.\n" +" -i, --input-file=FILE read URL-s from file.\n" +" -F, --force-html treat input file as HTML.\n" +"\n" +msgstr "" +"?????? ???? ????:\n" +" -o, --output-file=FILE ???? ???????? ?????? ????????.\n" +" -a, --append-output=FILE ???????? ?????? ??????????.\n" +" -d, --debug ?????? ?????? ?????? ??????????.\n" +" -q, --quiet ?????? ???? ????????(???? ???? ????).\n" +" -v, --verbose ?????? ??????(?????????? ????????????).\n" +" -nv, --non-verbose ?????? ???? ???????? ????????.\n" +" -i, --input-file=FILE URL?? ?????????? ???? ????????.\n" +" -F, --force-html ???? ?????? HTML?????? ??????????.\n" +"\n" + +#: src/main.c:133 +msgid "" +"Download:\n" +" -t, --tries=NUMBER set number of retries to NUMBER (0 " +"unlimits).\n" +" -O --output-document=FILE write documents to FILE.\n" +" -nc, --no-clobber don't clobber existing files.\n" +" -c, --continue restart getting an existing file.\n" +" --dot-style=STYLE set retrieval display style.\n" +" -N, --timestamping don't retrieve files if older than local.\n" +" -S, --server-response print server response.\n" +" --spider don't download anything.\n" +" -T, --timeout=SECONDS set the read timeout to SECONDS.\n" +" -w, --wait=SECONDS wait SECONDS between retrievals.\n" +" -Y, --proxy=on/off turn proxy on or off.\n" +" -Q, --quota=NUMBER set retrieval quota to NUMBER.\n" +"\n" +msgstr "" +"???? ????:\n" +" -t, --tres=NUMBER ?????????? ?????? ?????????? (0 ?? ????)\n" +" -O, --output-document=FILE ?????? ?????? ?????? ??????.\n" +" -nc, --no-clobber ???????? ?????? ???????? ????????.\n" +" -c, --continue ???????? ?????? ?????? ????????????.\n" +" --dot-style=STYLE ???? ???? ?????? ???????? ??????????.\n" +" -N, --timestamping ???????? ?????? ?????? ???????? ????????.\n" +" -S, --server-response ?????? ?????? ??????????.\n" +" -T, --timeout=SECONDS ???? ?????????? ??(SECOND)?????? ???????????? ??????????.\n" +" -w, --wait=SECONS ?????????? ??(SECOND)?????? ??????????.\n" +" -Y, --proxy=on/off ?????? ???? on/off\n" +" -Q, --quota=NUMBER ???????? ?????? ?????? NUMBER?? ??????????.\n" +"\n" + +#: src/main.c:147 +msgid "" +"Directories:\n" +" -nd --no-directories don't create directories.\n" +" -x, --force-directories force creation of directories.\n" +" -nH, --no-host-directories don't create host directories.\n" +" -P, --directory-prefix=PREFIX save files to PREFIX/...\n" +" --cut-dirs=NUMBER ignore NUMBER remote directory " +"components.\n" +"\n" +msgstr "" +"????????:\n" +" -nd, --no-directories ?????????? ???????? ????????.\n" +" -x, --force-directories ?????????? ?????????? ??????????.\n" +" -nH, --no-host-directories ?????? ?????????? ???????? ????????.\n" +" -P, --directory-prefix=PREFIX ?????? PREFIX/...?? ?????? ??????.\n" +" --cut-dires=NUMBER ?????? ?????????? NUMBER?? ??????????.\n" +"\n" + +#: src/main.c:154 +msgid "" +"HTTP options:\n" +" --http-user=USER set http user to USER.\n" +" --http-passwd=PASS set http password to PASS.\n" +" -C, --cache=on/off (dis)allow server-cached data (normally " +"allowed).\n" +" --ignore-length ignore `Content-Length' header field.\n" +" --header=STRING insert STRING among the headers.\n" +" --proxy-user=USER set USER as proxy username.\n" +" --proxy-passwd=PASS set PASS as proxy password.\n" +" -s, --save-headers save the HTTP headers to file.\n" +" -U, --user-agent=AGENT identify as AGENT instead of Wget/VERSION.\n" +"\n" +msgstr "" +"HTTP ????:\n" +" --http-user=USER HTTP ?????? ??????????.\n" +" --http-passwd=PASS HTTP ?????????? ??????????.\n" +" -C, --cache=on/off ?????? on/off ????(???????? on)\n" +" --ignore-length ?????????? `Content-Length'?????? ??????????.\n" +" --header=STRING ?????????? STRING(??????)?? ??????????.\n" +" --proxy-user=USER ?????? ?????????? ??????????.\n" +" --proxy-passwd=PASS ?????? ?????????? ??????????.\n" +" -s, --save-headers HTTP ?????? ?????? ??????????.\n" +" -U, --user-agent=AGENT Wget/VERSION ???? AGENT???? ?????? ??????.\n" +"\n" + +#: src/main.c:165 +msgid "" +"FTP options:\n" +" --retr-symlinks retrieve FTP symbolic links.\n" +" -g, --glob=on/off turn file name globbing on or off.\n" +" --passive-ftp use the \"passive\" transfer mode.\n" +"\n" +msgstr "" +"FTP ????:\n" +" --retr-symlinks FTP ?? ?????? ?????? ??????????.\n" +" -g, --glob=on/off ???????? globon?? on/off?? ??????????.\n" +" --passive-ftp PASV (??????)?????? ??????????.\n" +"\n" + +#: src/main.c:170 +msgid "" +"Recursive retrieval:\n" +" -r, --recursive recursive web-suck -- use with care!.\n" +" -l, --level=NUMBER maximum recursion depth (0 to unlimit).\n" +" --delete-after delete downloaded files.\n" +" -k, --convert-links convert non-relative links to relative.\n" +" -m, --mirror turn on options suitable for mirroring.\n" +" -nr, --dont-remove-listing don't remove `.listing' files.\n" +"\n" +msgstr "" +"???????? ??????:\n" +" -r, -recursve ?????????? ?????? ?????? -- ???????? ??????????!\n" +" -l, --level=NUMBER ???????? ???? ????(0?? ????)\n" +" --delete-after ???????? ?????? ??????????.\n" +" -k, --convert-links ???? ?????? ?????????? ?????? ??????.\n" +" -m, --mirror ?????? ???? ?????? ??????????.\n" +" -nr, --dont-remove-listing `.listing' ?????? ???????? ????????.\n" +"\n" + +#: src/main.c:178 +msgid "" +"Recursive accept/reject:\n" +" -A, --accept=LIST list of accepted extensions.\n" +" -R, --reject=LIST list of rejected extensions.\n" +" -D, --domains=LIST list of accepted domains.\n" +" --exclude-domains=LIST comma-separated list of rejected " +"domains.\n" +" -L, --relative follow relative links only.\n" +" --follow-ftp follow FTP links from HTML documents.\n" +" -H, --span-hosts go to foreign hosts when recursive.\n" +" -I, --include-directories=LIST list of allowed directories.\n" +" -X, --exclude-directories=LIST list of excluded directories.\n" +" -nh, --no-host-lookup don't DNS-lookup hosts.\n" +" -np, --no-parent don't ascend to the parent directory.\n" +"\n" +msgstr "" +"???? ????:\n" +" -A, --accept=LIST ???? ?????? ???? ????.\n" +" -R, --reject=LIST ???? ?? ?? ???? ???? ????.\n" +" -D, --domains=LIST ???????? ?????? ????.\n" +" --exclude-domains=LIST ???????? ???? ???????? ?????? ?????? ????????.\n" +" -L, --relative ???? ???????? ??????????.\n" +" --follow-ftp HTML?????? FTP ?????? ??????????\n" +" -H, --span-hosts ???? ?????????????? ?????? ??????????.\n" +" -I, --include-directories=LIST ???????? ?????????? ????.\n" +" -X, --exclude-directories=LIST ???????? ???? ?????????? ????.\n" +" -nh, --no-host-lookup DNS-lookup ???????? ???? ????????.\n" +" -np, --no-parent dont't ascend to the parent directory.\n" +"\n" + +#: src/main.c:191 +msgid "Mail bug reports and suggestions to .\n" +msgstr "???? ???????? ?? ???????? ????????.\n" + +#: src/main.c:347 +#, c-format +msgid "%s: debug support not compiled in.\n" +msgstr "%s: ?????? ???????? ???????? ????????.\n" + +#: src/main.c:395 +msgid "" +"Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc.\n" +"This program is distributed in the hope that it will be useful,\n" +"but WITHOUT ANY WARRANTY; without even the implied warranty of\n" +"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" +"GNU General Public License for more details.\n" +msgstr "" + +#: src/main.c:401 +msgid "" +"\n" +"Written by Hrvoje Niksic .\n" +msgstr "" + +#: src/main.c:465 +#, c-format +msgid "%s: %s: invalid command\n" +msgstr "%s: %s: ?????? ??????\n" + +#: src/main.c:515 +#, c-format +msgid "%s: illegal option -- `-n%c'\n" +msgstr "%s: `-n%c' -- ?????? ??????????????.\n" + +#. #### Something nicer should be printed here -- similar to the +#. pre-1.5 `--help' page. +#: src/main.c:518 src/main.c:560 src/main.c:591 +#, c-format +msgid "Try `%s --help' for more options.\n" +msgstr "?? ?????? ?????? ???????? `%s --help'?? ????????.\n" + +#: src/main.c:571 +msgid "Can't be verbose and quiet at the same time.\n" +msgstr "verbose?? quiet?? ?????? ?????? ?? ????????.\n" + +#: src/main.c:577 +msgid "Can't timestamp and not clobber old files at the same time.\n" +msgstr "timestamp ?? clobber old files?? ?????? ?????? ?? ????????.\n" + +#. No URL specified. +#: src/main.c:586 +#, c-format +msgid "%s: missing URL\n" +msgstr "%s: URL?? ??????????????\n" + +#: src/main.c:674 +#, c-format +msgid "No URLs found in %s.\n" +msgstr "%s?? URL?? ??????????????.\n" + +#: src/main.c:683 +#, c-format +msgid "" +"\n" +"FINISHED --%s--\n" +"Downloaded: %s bytes in %d files\n" +msgstr "" +"\n" +"???? --%s--\n" +"????????: %s ??????, %d???? ????\n" + +#: src/main.c:688 +#, c-format +msgid "Download quota (%s bytes) EXCEEDED!\n" +msgstr "???? ?????? ???? (%s ??????)?? ???? ??????????!\n" + +#. Please note that the double `%' in `%%s' is intentional, because +#. redirect_output passes tmp through printf. +#: src/main.c:715 +msgid "%s received, redirecting output to `%%s'.\n" +msgstr "%s?? ??????????, `%%s'???? ???? ?????? ??????????\n" + +#: src/mswindows.c:118 +#, c-format +msgid "" +"\n" +"CTRL+Break received, redirecting output to `%s'.\n" +"Execution continued in background.\n" +"You may stop Wget by pressing CTRL+ALT+DELETE.\n" +msgstr "" + +#. parent, no error +#: src/mswindows.c:135 src/utils.c:268 +msgid "Continuing in background.\n" +msgstr "???????????????? ?????? ??????????.\n" + +#: src/mswindows.c:137 src/utils.c:270 +#, c-format +msgid "Output will be written to `%s'.\n" +msgstr "" + +#: src/mswindows.c:227 +#, c-format +msgid "Starting WinHelp %s\n" +msgstr "" + +#: src/mswindows.c:254 src/mswindows.c:262 +#, c-format +msgid "%s: Couldn't find usable socket driver.\n" +msgstr "%s: ???? ?????? ???? ?????????? ???????? ????????.\n" + +#: src/netrc.c:334 +#, c-format +msgid "%s: %s:%d: warning: \"%s\" token appears before any machine name\n" +msgstr "%s: %s:%d: ????: ???? \"%s\"?? ???????? ???? ????????.\n" + +#: src/netrc.c:365 +#, c-format +msgid "%s: %s:%d: unknown token \"%s\"\n" +msgstr "%s: %s:%d: ????(token) \"%s\"?? ?? ???? ????????\n" + +#: src/netrc.c:429 +#, c-format +msgid "Usage: %s NETRC [HOSTNAME]\n" +msgstr "??????: %s NETRC [????????]\n" + +#: src/netrc.c:439 +#, c-format +msgid "%s: cannot stat %s: %s\n" +msgstr "" + +#: src/recur.c:449 src/retr.c:462 +#, c-format +msgid "Removing %s.\n" +msgstr "%s?? ??????????.\n" + +#: src/recur.c:450 +#, c-format +msgid "Removing %s since it should be rejected.\n" +msgstr "%s?? reject???? ???? ?????? ?? ???? ?????? ??????????.\n" + +#: src/recur.c:609 +msgid "Loading robots.txt; please ignore errors.\n" +msgstr "robots.txt?? ?????????? ????????; ?????? ?????? ??????.\n" + +#: src/retr.c:193 +#, c-format +msgid "" +"\n" +" [ skipping %dK ]" +msgstr "\n [ %dK ???????? ?????????? ]" + +#: src/retr.c:344 +msgid "Could not find proxy host.\n" +msgstr "?????? ???????? ???????? ????????.\n" + +#: src/retr.c:355 +#, c-format +msgid "Proxy %s: Must be HTTP.\n" +msgstr "?????? %s: HTTP?? ??????????.\n" + +#: src/retr.c:398 +#, c-format +msgid "%s: Redirection to itself.\n" +msgstr "%s: Redirection to itself.\n" + +#: src/retr.c:483 +msgid "" +"Giving up.\n" +"\n" +msgstr "??????????????.\n" + +#: src/retr.c:483 +msgid "" +"Retrying.\n" +"\n" +msgstr "??????????????.\n" + +#: src/url.c:940 +#, c-format +msgid "Error (%s): Link %s without a base provided.\n" +msgstr "???? (%s): ???? %s???? ?????????? ???????????? ????????.\n" + +#: src/url.c:955 +#, c-format +msgid "Error (%s): Base %s relative, without referer URL.\n" +msgstr "???? (%s): ???? %s???? ???????? ???? URL?? ????????.\n" + +#: src/url.c:1373 +#, c-format +msgid "Converting %s... " +msgstr "%s?? ???????? ????????... " + +#: src/url.c:1378 src/url.c:1389 +#, c-format +msgid "Cannot convert links in %s: %s\n" +msgstr "%s (??)???? ?????? ?????? ?? ????????: %s\n" + +#: src/utils.c:71 +#, c-format +msgid "%s: %s: Not enough memory.\n" +msgstr "%s: %s: ???????? ?????? ????????.\n" + +#: src/utils.c:203 +msgid "Unknown/unsupported protocol" +msgstr "?? ?? ?????? ???????? ???? ??????????????" + +#: src/utils.c:206 +msgid "Invalid port specification" +msgstr "???? ?????? ??????????????" + +#: src/utils.c:209 +msgid "Invalid host name" +msgstr "?????? ?????? ????" + +#: src/utils.c:430 +#, c-format +msgid "Failed to unlink symlink `%s': %s\n" +msgstr "?????? ???? `%s'?? ?????? ????????????: %s\n" Modified: tinysofa/snapshot/wget/current/specs/wget.spec =================================================================== --- tinysofa/snapshot/wget/current/specs/wget.spec 2004-07-01 15:56:16 UTC (rev 2860) +++ tinysofa/snapshot/wget/current/specs/wget.spec 2004-07-01 15:56:19 UTC (rev 2861) @@ -1,10 +1,10 @@ Summary: A utility for retrieving files using the HTTP or FTP protocols. Name: wget Version: 1.9.1 -Release: 7jh +Release: 6ts License: GPL -Group: tinysofa/main -URL: http://wget.sunsite.dk/ +Group: Applications/Internet +Url: http://wget.sunsite.dk/ Source: ftp://ftp.gnu.org/gnu/wget/wget-%{version}.tar.gz Source2: wget-1.5.3-ko.po # The symlink patch no longer seems to be necesarry... at least @@ -16,9 +16,9 @@ Patch4: wget-1.9.1-rh1.patch Patch5: wget-1.9.1-path.patch Provides: webclient -%info_requires +Prereq: /sbin/install-info BuildRequires: perl, openssl-devel, pkgconfig -BuildRoot: %{_tmppath}/%{name}-root +BuildRoot: %{_tmppath}/%{name}-%{version}-root %description GNU Wget is a file retrieval utility which can use either the HTTP or @@ -29,7 +29,6 @@ HTTP servers to retrieve files over slow or unstable connections, support for Proxy servers, and configurability. - %prep %setup -q %patch1 -p1 -b .ctype @@ -40,45 +39,43 @@ cp %{SOURCE2} $RPM_BUILD_DIR/wget-%{version}/po/ko.po - %build if pkg-config openssl ; then CPPFLAGS=`pkg-config --cflags openssl`; export CPPFLAGS LDFLAGS=`pkg-config --libs openssl`; export LDFLAGS fi %configure --with-ssl -%make +make - %install +rm -rf $RPM_BUILD_ROOT %makeinstall -%i18n_pkgs %{name} +%find_lang %name -%install_info doc/wget.texi -%nuke_info - %post -%info_post +/sbin/install-info %{_infodir}/wget.info.gz %{_infodir}/dir -%postun -%info_postun +%preun +if [ "$1" = 0 ]; then + /sbin/install-info --delete %{_infodir}/wget.info.gz %{_infodir}/dir +fi - %clean -%clean_buildroot +rm -rf $RPM_BUILD_ROOT - -%files +%files -f %{name}.lang %defattr(-,root,root) %doc AUTHORS MAILING-LIST NEWS README PATCHES README.cvs TODO %config(noreplace) /etc/wgetrc %{_mandir}/man1/wget.* %{_bindir}/wget -%{_htmldir}/* +%{_infodir}/* - %changelog +* Tue Jun 15 2004 Elliot Lee +- rebuilt + * Thu Mar 11 2004 Karsten Hopp 1.9.1-3 - fix documentation (#117517) From svn at tinysofa.org Thu Jul 1 15:56:24 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:56:24 +1000 (EST) Subject: [tinysofa-svn] r2862 - in tinysofa/snapshot/which/current: sources specs Message-ID: <20040701155624.9936C4E817E@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:56:24 +1000 (Fri, 02 Jul 2004) New Revision: 2862 Added: tinysofa/snapshot/which/current/sources/which-2.13-afs.patch tinysofa/snapshot/which/current/sources/which-2.14-broken.patch Removed: tinysofa/snapshot/which/current/sources/which-2.csh Modified: tinysofa/snapshot/which/current/sources/which-2.sh tinysofa/snapshot/which/current/specs/which.spec Log: - Sync with 2.0. - Kept: - which-2.16.tar.gz: - which-2.sh: - Added: - which-2.13-afs.patch: - which-2.14-broken.patch: - Removed: - which-2.csh: Added: tinysofa/snapshot/which/current/sources/which-2.13-afs.patch =================================================================== --- tinysofa/snapshot/which/current/sources/which-2.13-afs.patch 2004-07-01 15:56:19 UTC (rev 2861) +++ tinysofa/snapshot/which/current/sources/which-2.13-afs.patch 2004-07-01 15:56:24 UTC (rev 2862) @@ -0,0 +1,40 @@ +--- which-2.16/bash.c.afs 2003-09-15 03:58:55.000000000 +0200 ++++ which-2.16/bash.c 2003-09-24 23:40:25.000000000 +0200 +@@ -33,7 +33,6 @@ + */ + #define HAVE_GETGROUPS + #undef SHELL +-#undef AFS + #undef NOGROUP + + /* +@@ -253,7 +252,7 @@ + if (S_ISDIR (finfo.st_mode)) + return (FS_EXISTS|FS_DIRECTORY); + +-#if defined (AFS) ++ if (getenv("AFS")) { + /* We have to use access(2) to determine access because AFS does not + support Unix file system semantics. This may produce wrong + answers for non-AFS files when ruid != euid. I hate AFS. */ +@@ -261,8 +260,9 @@ + return (FS_EXISTS | FS_EXECABLE); + else + return (FS_EXISTS); +-#else /* !AFS */ +- ++ } ++ else /* !AFS */ ++ { + /* Find out if the file is actually executable. By definition, the + only other criteria is that the file has an execute bit set that + we can use. */ +@@ -298,7 +298,7 @@ + return (FS_EXISTS | FS_EXECABLE); + + return (FS_EXISTS); +-#endif /* !AFS */ ++ } /* !AFS */ + } + + /* From bash-2.05b / general.c / line 501 ; Changes: Using 'strchr' instead of 'xstrchr'. */ Added: tinysofa/snapshot/which/current/sources/which-2.14-broken.patch =================================================================== --- tinysofa/snapshot/which/current/sources/which-2.14-broken.patch 2004-07-01 15:56:19 UTC (rev 2861) +++ tinysofa/snapshot/which/current/sources/which-2.14-broken.patch 2004-07-01 15:56:24 UTC (rev 2862) @@ -0,0 +1,33 @@ +--- which-2.14/tilde/tilde.c.orig Mon Dec 9 18:52:19 2002 ++++ which-2.14/tilde/tilde.c Mon Dec 9 18:58:09 2002 +@@ -182,7 +182,10 @@ + int result_size, result_index; + + result_index = result_size = 0; +- if (result = strchr (string, '~')) ++ ++ result = strchr (string, '~'); ++ ++ if (!result) + result = xmalloc (result_size = (strlen (string) + 16)); + else + result = xmalloc (result_size = (strlen (string) + 1)); +--- which-2.14/which.c.orig Mon Dec 9 18:58:28 2002 ++++ which-2.14/which.c Mon Dec 9 18:59:52 2002 +@@ -22,6 +22,7 @@ + #include "getopt.h" + #include "tilde/tilde.h" + #include "bash.h" ++#include + + static const char *progname; + +@@ -536,7 +537,7 @@ + while (fgets(buf, sizeof(buf), stdin)) + { + int looks_like_function_start = 0; +- int function_start_version_205b; ++ int function_start_version_205b = 0; + if (read_functions) + { + // bash version 2.0.5a and older output a pattern for `str' like Deleted: tinysofa/snapshot/which/current/sources/which-2.csh =================================================================== --- tinysofa/snapshot/which/current/sources/which-2.csh 2004-07-01 15:56:19 UTC (rev 2861) +++ tinysofa/snapshot/which/current/sources/which-2.csh 2004-07-01 15:56:24 UTC (rev 2862) @@ -1,2 +0,0 @@ -# Initialization script for tcsh and csh -alias which 'alias | /usr/bin/which --tty-only --read-alias --show-dot --show-tilde' Modified: tinysofa/snapshot/which/current/sources/which-2.sh =================================================================== --- tinysofa/snapshot/which/current/sources/which-2.sh 2004-07-01 15:56:19 UTC (rev 2861) +++ tinysofa/snapshot/which/current/sources/which-2.sh 2004-07-01 15:56:24 UTC (rev 2862) @@ -1,2 +1,4 @@ # Initialization script for bash and sh -alias which='(alias;declare -f) | /usr/bin/which --tty-only --read-functions --read-alias --show-dot --show-tilde' + +# export AFS, if you are in AFS environment +alias which='alias | /usr/bin/which --tty-only --read-alias --show-dot --show-tilde' Modified: tinysofa/snapshot/which/current/specs/which.spec =================================================================== --- tinysofa/snapshot/which/current/specs/which.spec 2004-07-01 15:56:19 UTC (rev 2861) +++ tinysofa/snapshot/which/current/specs/which.spec 2004-07-01 15:56:24 UTC (rev 2862) @@ -1,98 +1,168 @@ Summary: Displays where a particular program in your path is located. -Summary(pt_BR): Localiza um programa que est?em um dos diret?ios de seu PATH. Mostra rota completa. -Summary(es): Localiza un programa que est?en uno de los directorios de su PATH. Ense? ruta completa. Name: which Version: 2.16 -Release: 5ts +Release: 3ts License: GPL -Group: tinysofa/main +Group: Applications/System Source0: ftp://ftp.gnu.org/gnu/which/%{name}-%{version}.tar.gz Source1: which-2.sh -Source2: which-2.csh -%info_requires -BuildRoot: %{_tmppath}/%{name}-root +Patch: which-2.13-afs.patch +Patch1: which-2.14-broken.patch +Prefix: %{_prefix} +Buildroot: %{_tmppath}/%{name}-%{version}-root +Prereq: /sbin/install-info, dev - %description The which command shows the full pathname of a specified program, if the specified program is in your PATH. -%description -l pt_BR -D?a ele um nome de programa, e ele lhe dir?se est?no seu 'PATH'. -Por exemplo, 'which ls' poderia imprimir '/bin/ls', porque o programa -ls, que est?em um dos diret?ios listados na vari?el de ambiente -PATH, est?localizado no diret?io /bin. - -%description -l es -Tu le das un nombre de programa, y el te dir?si est?en su 'PATH'. -Por ejemplo, 'which ls' podr? imprimir '/bin/ls', porque el programa -ls, que est?en uno de los directorios listados en la variable de -ambiente PATH, est?localizado en el directorio /bin. - - %prep %setup -q +%patch -p1 -b .afs +%patch1 -p1 -b .broken - %build %configure -%make +make - %install -%{__mkdir_p} %{buildroot}%{_mandir} \ - %{buildroot}%{_sysconfdir}/profile.d +rm -rf $RPM_BUILD_ROOT -%makeinstall_std +%makeinstall +mkdir -p $RPM_BUILD_ROOT/etc/profile.d +install -m 755 %{SOURCE1} $RPM_BUILD_ROOT/etc/profile.d -%install_info which.texinfo -%nuke_info +%post +/sbin/install-info --quiet --info-dir=%{_infodir} %{_infodir}/which.info.gz > /dev/null 2>&1 -install -m 755 %{_sourcedir}/which-2.sh %{_sourcedir}/which-2.csh \ - %{buildroot}%{_sysconfdir}/profile.d +%preun +if [ $1 = 0 ]; then + /sbin/install-info --quiet --info-dir=%{_infodir} --delete %{_infodir}/which.info.gz > /dev/null 2>&1 +fi +%clean +rm -rf $RPM_BUILD_ROOT +%files +%defattr(-,root,root) +%doc EXAMPLES README +%{_bindir}/* +%config /etc/profile.d/which-2.* +%{_infodir}/which.info.gz +%{_mandir}/*/* -%clean -%clean_buildroot +%changelog +* Tue Jun 15 2004 Elliot Lee +- rebuilt +* Fri Feb 13 2004 Elliot Lee +- rebuilt -%post -%info_post - -%postun -%info_postun +* Wed Sep 24 2003 Florian La Roche +- update to 2.16 +- fix %%preun +* Thu Jul 17 2003 Than Ngo 2.14-8 +- rebuild -%files -%defattr(-,root,root) -%doc EXAMPLES README README.alias -%{_bindir}/which -%config(noreplace) %{_sysconfdir}/profile.d/which-2.* -%{_mandir}/man1/which.1* -%{_htmldir}/%{name} +* Thu Jul 17 2003 Than Ngo 2.14-7 +- added Prereq: dev (bug #99275) +* Wed Jun 04 2003 Elliot Lee +- rebuilt -%changelog -* Sun Jun 6 2004 Jaakko Heinonen -- use tinysofa rpm macros +* Wed Jan 22 2003 Tim Powers +- rebuilt -* Tue Dec 30 2003 Arnaldo Carvalho de Melo -+ 2003-12-30 18:14:37 (42619) -- New upstream release: 2.16 +* Tue Dec 10 2002 Than Ngo 2.14-4 +- cleanup code (bug #78478) -* Tue Sep 03 2002 Gustavo Niemeyer -+ 2002-09-03 16:32:04 (13947) -- Imported package from snapshot. +* Thu Nov 14 2002 Tim Powers 2.14-3 +- redirect info dir warnings to /dev/null -* Thu Aug 29 2002 Gustavo Niemeyer -+ 2002-08-29 19:23:40 (10183) -- Imported package from 8.0. +* Thu Nov 7 2002 Than Ngo 2.14-1 +- add missing info file -* Wed Aug 28 2002 Gustavo Niemeyer -+ 2002-08-28 21:31:39 (6768) -- Imported package from 7.0. +* Mon Jul 29 2002 Florian La Roche +- update to 2.14 wih better support for current bash -* Tue Aug 27 2002 Gustavo Niemeyer -+ 2002-08-27 20:04:58 (2091) -- Imported package from 6.0. +* Fri Jun 21 2002 Tim Powers +- automated rebuild + +* Thu May 23 2002 Tim Powers +- automated rebuild + +* Wed Feb 27 2002 Than Ngo 2.13-3 +- use access instead stat in AFS environment (bug #60353) + +* Wed Jan 09 2002 Tim Powers +- automated rebuild + +* Wed Dec 05 2001 Florian La Roche +- update to 2.13 + +* Sat Aug 4 2001 Than Ngo +- fix bug 50844 + +* Sun Jun 24 2001 Elliot Lee +- Bump release + rebuild. + +* Sun Sep 10 2000 Florian La Roche +- 2.12 (only man-page fix) + +* Thu Jul 13 2000 Prospector +- automatic rebuild + +* Sun Jun 18 2000 Than Ngo +- FHS packaging. + +* Sun May 21 2000 Ngo Than +- put man pages in /usr/share/man/* + +* Thu Apr 20 2000 Florian La Roche +- update to 2.11 +- change from root:bin -> root:root + +* Mon Feb 07 2000 Preston Brown +- rebuild to gzip man page + +* Sun Jan 16 2000 Preston Brown +- newer stuff rom Carlo (2.10). Author's email: carlo at gnu.org + +* Thu Jan 13 2000 Preston Brown +- adopted Carlo's specfile. + +* Fri Sep 24 1999 Carlo Wood +- There should not be a reason anymore to include README.alias in the rpm docs. +- Don't install as root.root in RPM_BUILD_ROOT, in order to allow to build + rpm as non-root. +- Bug fix +- Added /etc/profile.d for automatic alias inclusion. + +* Wed Aug 25 1999 Carlo Wood +- Added README.alias. + +* Wed Aug 11 1999 Carlo Wood +- Typo in comment. + +* Thu May 27 1999 Carlo Wood +- Typo fix +- Moved maintainer targets from makefile to Makefile.am. + +* Tue May 18 1999 Carlo Wood +- Typo in appended changelog. +- Appended the old change log of `which-2.0.spec' to (this) changelog, + which is generated from the CVS log of `which-2.0.spec.in'. +- Generate which-2.spec from which-2.spec.in with automatic VERSION + and CHANGELOG substitution. + +* Tue May 14 1999 Carlo Wood +- Moved assignment of CFLAGS to the configure line, using RPM_OPT_FLAGS now. +- Corrected Source: line to point to ftp.gnu.org. + +* Sat Apr 17 1999 Carlo Wood +- Started to use automake and autoconf + +* Fri Apr 09 1999 Carlo Wood +- Renamed which-2.0.spec to which-2.spec + From svn at tinysofa.org Thu Jul 1 15:39:11 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:39:11 +1000 (EST) Subject: [tinysofa-svn] r2611 - in tinysofa/snapshot: . netdump netdump/current netdump/current/sources netdump/current/specs Message-ID: <20040701153911.980754E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:39:11 +1000 (Fri, 02 Jul 2004) New Revision: 2611 Added: tinysofa/snapshot/netdump/ tinysofa/snapshot/netdump/current/ tinysofa/snapshot/netdump/current/sources/ tinysofa/snapshot/netdump/current/sources/netdump-0.6.9-glib2.patch tinysofa/snapshot/netdump/current/sources/netdump-0.6.9.tar.gz tinysofa/snapshot/netdump/current/specs/ tinysofa/snapshot/netdump/current/specs/netdump.spec Log: - Add netdump to snapshot from 2.0. Added: tinysofa/snapshot/netdump/current/sources/netdump-0.6.9-glib2.patch =================================================================== --- tinysofa/snapshot/netdump/current/sources/netdump-0.6.9-glib2.patch 2004-07-01 15:39:10 UTC (rev 2610) +++ tinysofa/snapshot/netdump/current/sources/netdump-0.6.9-glib2.patch 2004-07-01 15:39:11 UTC (rev 2611) @@ -0,0 +1,13 @@ +diff -urN netdump-0.6.9/Makefile netdump-0.6.9.glib2/Makefile +--- netdump-0.6.9/Makefile 2002-03-20 06:49:58.000000000 +1100 ++++ netdump-0.6.9.glib2/Makefile 2004-06-22 01:09:23.500961976 +1000 +@@ -1,7 +1,7 @@ + DEBUG_FLAGS=-Wall -g + +-CFLAGS=`glib-config --cflags` $(DEBUG_FLAGS) -D_FILE_OFFSET_BITS=64 +-LDFLAGS=`glib-config --libs` -lpopt ++CFLAGS=`pkg-config --cflags glib-2.0` $(DEBUG_FLAGS) -D_FILE_OFFSET_BITS=64 ++LDFLAGS=`pkg-config --libs glib-2.0` -lpopt + + VERSION=$(shell awk '/Version:/ { print $$2 }' netdump.spec) + RELEASE=$(shell awk '/Release:/ { print $$2 }' netdump.spec) Added: tinysofa/snapshot/netdump/current/sources/netdump-0.6.9.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/netdump/current/sources/netdump-0.6.9.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/netdump/current/specs/netdump.spec =================================================================== --- tinysofa/snapshot/netdump/current/specs/netdump.spec 2004-07-01 15:39:10 UTC (rev 2610) +++ tinysofa/snapshot/netdump/current/specs/netdump.spec 2004-07-01 15:39:11 UTC (rev 2611) @@ -0,0 +1,153 @@ +Summary: Client setup for network kernel message logging and crash dumps +Name: netdump +Version: 0.6.9 +Release: 3.1ts +Source0: %{name}-%{version}.tar.gz +# tinysofa: uh, why don't fedora do this? +Patch: netdump-0.6.9-glib2.patch +License: GPL +Group: System Environment/Daemons +BuildRoot: %{_tmppath}/%{name}-%{version}-root +Requires: /usr/bin/ssh-keygen /usr/bin/ssh fileutils textutils gawk /sbin/ifconfig +BuildRequires: glib2-devel +Requires: glib2 + +%package server +Summary: Server for network kernel crash dumps +Group: System Environment/Daemons +Requires: /usr/sbin/useradd /usr/sbin/sshd + +%description server +The netdump server listens to the network for crashed kernels to +contact it and then writes the oops log and a memory dump to +/var/crash before asking the crashed machine to reboot. + +%description +The netdump client sets up the kernel to send crash dumps and/or +console messages as syslog packets to a remote system. Some manual +setup is required as documented in the netdump (8) man page. + +%prep +%setup -q +%patch -p1 + +%build +make %{?_smp_mflags} + +%install +rm -rf $RPM_BUILD_ROOT +mkdir -p $RPM_BUILD_ROOT +DESTDIR=$RPM_BUILD_ROOT make install + +%clean +rm -rf $RPM_BUILD_ROOT + +%post +/sbin/chkconfig --add netdump +# initialize the required bits for negotiating shared secrets, if necessary +if [ ! -f /etc/sysconfig/netdump_id_dsa ] ; then + ssh-keygen -q -t dsa -f /etc/sysconfig/netdump_id_dsa -N '' /dev/null 2>&1 +fi + +%preun +if [ $1 = 0 ]; then + /sbin/service netdump stop > /dev/null 2>&1 + /sbin/chkconfig --del netdump +fi + + +%pre server +/usr/sbin/groupadd -g 34 -r -f netdump 2>/dev/null 1>&2 || : +/usr/sbin/useradd -c "Network Crash Dump user" -r -u 34 -g netdump \ + -s /bin/bash -r -d /var/crash netdump 2>/dev/null || : + +%post server +/sbin/chkconfig --add netdump-server +if [ $1 -ge 1 ]; then + service netdump-server condrestart > /dev/null 2>&1 +fi + + +%preun server +if [ $1 = 0 ]; then + /sbin/service netdump-server stop > /dev/null 2>&1 + /sbin/chkconfig --del netdump-server +fi + + +%files +%defattr(-,root,root) +%config %attr(0644,root,root)/etc/sysconfig/netdump +/etc/rc.d/init.d/netdump +%{_mandir}/man8/netdump.8* +%doc README.client crash.c + +%files server +%defattr(-,root,root) +/usr/sbin/netdump-server +%dir %attr(-,netdump,netdump)/var/crash +%dir %attr(0700,netdump,netdump)/var/crash/.ssh +%config(noreplace) %attr(0600,netdump,netdump)/var/crash/.ssh/authorized_keys2 +%dir %attr(0700,netdump,netdump)/var/crash/magic +%dir %attr(-,netdump,netdump)/var/crash/scripts +/etc/rc.d/init.d/netdump-server +%{_mandir}/man8/netdump-server.8* +%doc README +%doc example_scripts + +%changelog +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Mon Aug 04 2003 Michael K. Johnson 0.6.9-3 +- rebuild + +* Mon Jul 07 2003 Dave Anderson 0.6.9-2 +- memory_packet(): cast lseek() offset argument as off_t to avoid wrap-around. +- memory_remove_outstanding_timeouts(): remove return arg to avoid warning. + +* Mon Mar 17 2003 Michael K. Johnson 0.6.9-1 +- fixed references to ttywatch instead of netdump-server in man page + +* Wed Feb 26 2003 Dave Anderson 0.6.8-3 +- built 0.6.7-1.1 for AS2.1 errata; bumped to 0.6.8-3 for future builds + +* Tue Jan 28 2003 Michael K. Johnson 0.6.8-2 +- rebuild + +* Fri Dec 13 2002 Elliot Lee +- Rebuild + +* Fri Apr 12 2002 Michael K. Johnson +- added call to condrestart + +* Tue Apr 02 2002 Michael K. Johnson +- mhz separated from IDLETIMEOUT + +* Thu Mar 21 2002 Michael K. Johnson +- netdump and syslog disassociated + +* Thu Mar 21 2002 Michael K. Johnson +- added IDLETIMEOUT + +* Tue Mar 19 2002 Michael K. Johnson +- netconsole module now does arp, netdump-arphelper no longer needed + +* Mon Mar 18 2002 Michael K. Johnson +- special netdump dsa key + +* Fri Mar 15 2002 Michael K. Johnson +- added syslog setup + +* Thu Mar 14 2002 Michael K. Johnson +- netdump-client -> netdump +- finish ssh setup in netdump package + +* Tue Feb 19 2002 Alex Larsson +- shut up post scripts + +* Tue Dec 18 2001 Alex Larsson +- Update version to 0.2 + +* Thu Dec 6 2001 Alex Larsson +- Initial build. From svn at tinysofa.org Thu Jul 1 15:39:28 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:39:28 +1000 (EST) Subject: [tinysofa-svn] r2619 - in tinysofa/snapshot: . pcmcia-cs pcmcia-cs/current pcmcia-cs/current/sources pcmcia-cs/current/specs Message-ID: <20040701153928.8AF544E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:39:28 +1000 (Fri, 02 Jul 2004) New Revision: 2619 Added: tinysofa/snapshot/pcmcia-cs/ tinysofa/snapshot/pcmcia-cs/current/ tinysofa/snapshot/pcmcia-cs/current/sources/ tinysofa/snapshot/pcmcia-cs/current/sources/pcmcia-cs-2.8.8-network.script tinysofa/snapshot/pcmcia-cs/current/sources/pcmcia-cs-3.1.18-config.patch tinysofa/snapshot/pcmcia-cs/current/sources/pcmcia-cs-3.1.23-updfstab.patch tinysofa/snapshot/pcmcia-cs/current/sources/pcmcia-cs-3.1.24-isdn.script tinysofa/snapshot/pcmcia-cs/current/sources/pcmcia-cs-3.1.24-portrange.patch tinysofa/snapshot/pcmcia-cs/current/sources/pcmcia-cs-3.1.27-initorder.patch tinysofa/snapshot/pcmcia-cs/current/sources/pcmcia-cs-3.2.7-cardmgr.patch tinysofa/snapshot/pcmcia-cs/current/sources/pcmcia-cs-3.2.7-makefile.patch tinysofa/snapshot/pcmcia-cs/current/sources/pcmcia-cs-3.2.7.tar.gz tinysofa/snapshot/pcmcia-cs/current/specs/ tinysofa/snapshot/pcmcia-cs/current/specs/pcmcia-cs.spec Log: - Add pcmcia-cs to snapshot from 2.0. Added: tinysofa/snapshot/pcmcia-cs/current/sources/pcmcia-cs-2.8.8-network.script =================================================================== --- tinysofa/snapshot/pcmcia-cs/current/sources/pcmcia-cs-2.8.8-network.script 2004-07-01 15:39:26 UTC (rev 2618) +++ tinysofa/snapshot/pcmcia-cs/current/sources/pcmcia-cs-2.8.8-network.script 2004-07-01 15:39:28 UTC (rev 2619) @@ -0,0 +1,29 @@ +#! /bin/sh +# +# network.sample $Revision: 1.1 $ $Date: 1995/05/25 04:30:06 $ (David Hinds) +# +# Initialize or shutdown a PCMCIA ethernet adapter +# +# This script should be invoked with two arguments. The first is the +# action to be taken, either "start", "stop", or "restart". The +# second is the network interface name. + +action=$1 +device=$2 + +case "${action:?}" in +'start') + # + # We don't do *anything* here. We get a hotplug event when the ethX device + # is registered, and we bring the device up there + # + ;; +'stop') + # + [ -f /etc/sysconfig/network-scripts/ifcfg-${device} ] && \ + /etc/sysconfig/network-scripts/ifdown ifcfg-${device} + ;; +'restart') + /sbin/ifconfig ${device:?} down up + ;; +esac Property changes on: tinysofa/snapshot/pcmcia-cs/current/sources/pcmcia-cs-2.8.8-network.script ___________________________________________________________________ Name: svn:executable + * Added: tinysofa/snapshot/pcmcia-cs/current/sources/pcmcia-cs-3.1.18-config.patch =================================================================== --- tinysofa/snapshot/pcmcia-cs/current/sources/pcmcia-cs-3.1.18-config.patch 2004-07-01 15:39:26 UTC (rev 2618) +++ tinysofa/snapshot/pcmcia-cs/current/sources/pcmcia-cs-3.1.18-config.patch 2004-07-01 15:39:28 UTC (rev 2619) @@ -0,0 +1,14 @@ +--- linux/pcmcia-cs-3.1.14/etc/config.opts.pcmciacfg Tue Jan 25 23:27:08 2000 ++++ linux/pcmcia-cs-3.1.14/etc/config.opts Fri Mar 17 14:56:58 2000 +@@ -23,6 +23,11 @@ + #exclude irq 3 + # First built-in parallel port + exclude irq 7 ++# PS/2 Mouse controller port, comment this out if you don't have a PS/2 ++# based mouse ++exclude irq 12 ++# Radeon ICP MCE's if you touch ports 380 to 3ff ++exclude port 0x380-0x3ff + + #---------------------------------------------------------------------- + Added: tinysofa/snapshot/pcmcia-cs/current/sources/pcmcia-cs-3.1.23-updfstab.patch =================================================================== --- tinysofa/snapshot/pcmcia-cs/current/sources/pcmcia-cs-3.1.23-updfstab.patch 2004-07-01 15:39:26 UTC (rev 2618) +++ tinysofa/snapshot/pcmcia-cs/current/sources/pcmcia-cs-3.1.23-updfstab.patch 2004-07-01 15:39:28 UTC (rev 2619) @@ -0,0 +1,49 @@ +--- pcmcia-cs-3.1.23/etc/scsi.updfstab Thu Feb 8 15:58:00 2001 ++++ pcmcia-cs-3.1.23/etc/scsi Thu Feb 8 15:58:35 2001 +@@ -42,6 +42,7 @@ + 'start') + [ "$VERBOSE" -a "$INFO" ] && echo "$INFO" + add_parts $ADDRESS "$PARTS" || exit 1 ++ /usr/sbin/updfstab + ;; + + 'stop') +@@ -50,6 +51,7 @@ + else + do_fuser -k /dev/$DEVICE > /dev/null + fi ++ /usr/sbin/updfstab + exit $? + ;; + +--- pcmcia-cs-3.1.23/etc/ide.updfstab Thu Feb 8 15:58:14 2001 ++++ pcmcia-cs-3.1.23/etc/ide Thu Feb 8 15:58:28 2001 +@@ -41,6 +41,7 @@ + 'start') + [ "$VERBOSE" -a "$INFO" ] && echo "$INFO" + add_parts "$ADDRESS" "$PARTS" || exit 1 ++ /usr/sbin/updfstab + ;; + + 'check') +@@ -54,6 +55,7 @@ + + 'stop') + rm_parts "$ADDRESS" "$PARTS" || exit 1 ++ /usr/sbin/updfstab + ;; + + 'cksum') +--- pcmcia-cs-3.1.23/etc/rc.pcmcia.updfstab Thu Feb 8 16:10:44 2001 ++++ pcmcia-cs-3.1.23/etc/rc.pcmcia Thu Feb 8 16:11:10 2001 +@@ -147,6 +147,10 @@ + fi + echo $"." + rm -f /var/lock/subsys/pcmcia ++ ++ # we do this because when we stop the service, the ide stop script ++ # gets run before the card disappears ++ /usr/sbin/updfstab + EXITCODE=0 + ;; + Added: tinysofa/snapshot/pcmcia-cs/current/sources/pcmcia-cs-3.1.24-isdn.script =================================================================== --- tinysofa/snapshot/pcmcia-cs/current/sources/pcmcia-cs-3.1.24-isdn.script 2004-07-01 15:39:26 UTC (rev 2618) +++ tinysofa/snapshot/pcmcia-cs/current/sources/pcmcia-cs-3.1.24-isdn.script 2004-07-01 15:39:28 UTC (rev 2619) @@ -0,0 +1,16 @@ +#! /bin/sh + +[ -x /etc/rc.d/init.d/isdn ] || exit 0 + +. /etc/pcmcia/shared + +case "$ACTION" in + +'start' ) +# /etc/rc.d/init.d/isdn start + ;; +'stop' ) + /etc/rc.d/init.d/isdn stop + ;; +esac +exit 0 Property changes on: tinysofa/snapshot/pcmcia-cs/current/sources/pcmcia-cs-3.1.24-isdn.script ___________________________________________________________________ Name: svn:executable + * Added: tinysofa/snapshot/pcmcia-cs/current/sources/pcmcia-cs-3.1.24-portrange.patch =================================================================== --- tinysofa/snapshot/pcmcia-cs/current/sources/pcmcia-cs-3.1.24-portrange.patch 2004-07-01 15:39:26 UTC (rev 2618) +++ tinysofa/snapshot/pcmcia-cs/current/sources/pcmcia-cs-3.1.24-portrange.patch 2004-07-01 15:39:28 UTC (rev 2619) @@ -0,0 +1,13 @@ +This patch fixes bug 25222. + +--- pcmcia-cs-3.1.24/etc/config.opts.25222 Mon Feb 12 17:09:23 2001 ++++ pcmcia-cs-3.1.24/etc/config.opts Mon Feb 12 17:09:40 2001 +@@ -5,7 +5,7 @@ + + # System resources available for PCMCIA devices + +-include port 0x100-0x4ff, port 0x800-0x8ff, port 0xc00-0xcff ++include port 0x100-0x4ff, port 0xc00-0xcff + include memory 0xc0000-0xfffff + include memory 0xa0000000-0xa0ffffff, memory 0x60000000-0x60ffffff + Added: tinysofa/snapshot/pcmcia-cs/current/sources/pcmcia-cs-3.1.27-initorder.patch =================================================================== --- tinysofa/snapshot/pcmcia-cs/current/sources/pcmcia-cs-3.1.27-initorder.patch 2004-07-01 15:39:26 UTC (rev 2618) +++ tinysofa/snapshot/pcmcia-cs/current/sources/pcmcia-cs-3.1.27-initorder.patch 2004-07-01 15:39:28 UTC (rev 2619) @@ -0,0 +1,11 @@ +--- pcmcia-cs-3.1.27/etc/rc.pcmcia~ Thu Mar 28 11:33:01 2002 ++++ pcmcia-cs-3.1.27/etc/rc.pcmcia Thu Mar 28 11:41:05 2002 +@@ -7,7 +7,7 @@ + + # Tags for Red Hat init configuration tools + # +-# chkconfig: 2345 45 96 ++# chkconfig: 2345 24 96 + # processname: cardmgr + # pidfile: /var/run/cardmgr.pid + # config: /etc/pcmcia/config Added: tinysofa/snapshot/pcmcia-cs/current/sources/pcmcia-cs-3.2.7-cardmgr.patch =================================================================== --- tinysofa/snapshot/pcmcia-cs/current/sources/pcmcia-cs-3.2.7-cardmgr.patch 2004-07-01 15:39:26 UTC (rev 2618) +++ tinysofa/snapshot/pcmcia-cs/current/sources/pcmcia-cs-3.2.7-cardmgr.patch 2004-07-01 15:39:28 UTC (rev 2619) @@ -0,0 +1,10 @@ +--- pcmcia-cs-3.2.7/cardmgr/cardmgr.c~ 2004-02-18 13:19:32.922798245 -0500 ++++ pcmcia-cs-3.2.7/cardmgr/cardmgr.c 2004-02-18 13:17:20.456944553 -0500 +@@ -171,6 +171,7 @@ + if (fd < 0) + fd = open(fn, O_NONBLOCK|o_mode); + unlink(fn); ++ fcntl(fd,F_SETFL,FD_CLOEXEC); + if (fd >= 0) + return fd; + if (errno == ENODEV) Added: tinysofa/snapshot/pcmcia-cs/current/sources/pcmcia-cs-3.2.7-makefile.patch =================================================================== --- tinysofa/snapshot/pcmcia-cs/current/sources/pcmcia-cs-3.2.7-makefile.patch 2004-07-01 15:39:26 UTC (rev 2618) +++ tinysofa/snapshot/pcmcia-cs/current/sources/pcmcia-cs-3.2.7-makefile.patch 2004-07-01 15:39:28 UTC (rev 2619) @@ -0,0 +1,272 @@ +diff -urN pcmcia-cs-3.2.7.orig/etc/install-etc pcmcia-cs-3.2.7/etc/install-etc +--- pcmcia-cs-3.2.7.orig/etc/install-etc 2002-07-17 02:41:49.000000000 -0400 ++++ pcmcia-cs-3.2.7/etc/install-etc 2004-01-24 05:51:38.460767446 -0500 +@@ -7,7 +7,7 @@ + # more of a shell scripty thing. + + # Get configuration settings +-. ../config.out ++. ../config.mk + + if [ $1 ] ; then PREFIX=$1 ; fi + PROBE=../cardmgr/pcic_probe +diff -urN pcmcia-cs-3.2.7.orig/etc/install-etc.orig pcmcia-cs-3.2.7/etc/install-etc.orig +--- pcmcia-cs-3.2.7.orig/etc/install-etc.orig 1969-12-31 19:00:00.000000000 -0500 ++++ pcmcia-cs-3.2.7/etc/install-etc.orig 2002-07-17 02:41:49.000000000 -0400 +@@ -0,0 +1,151 @@ ++#!/bin/sh ++# ++# etc/install-etc 1.19 2002/07/17 06:41:49 (David Hinds) ++# ++# This handles updating the PCMCIA startup and device configuration ++# scripts. I used to do this in the Makefile, but it is really much ++# more of a shell scripty thing. ++ ++# Get configuration settings ++. ../config.out ++ ++if [ $1 ] ; then PREFIX=$1 ; fi ++PROBE=../cardmgr/pcic_probe ++if [ "CONFIG_PCMCIA" = "y" ] ; then PK=-k ; else PK= ; fi ++ETC=$PREFIX/etc/pcmcia ++ ++install_clients () ++{ ++ echo "-> Updating client scripts in $ETC" ++ mkdir -p $ETC ++ CONF=`echo *.conf` ++ if [ "$CONF" != "*.conf" ] ; then ++ cp *.conf $ETC ++ fi ++ for f in *.opts ; do ++ [ -r $ETC/$f ] || cp $f $ETC/$f ++ b=`basename $f .opts` ++ cmp -s $b $ETC/$b && continue ++ [ -r $ETC/$b ] && mv $ETC/$b $ETC/$b.O ++ cp $b $ETC/$b ++ done ++ for f in shared ; do ++ cmp -s $f $ETC/$f && continue ++ [ -r $ETC/$f ] && mv $ETC/$f $ETC/$f.O ++ cp $f $ETC/$f ++ done ++ # Tweak network.opts for Red Hat ++ if [ -f /etc/redhat-release ] && \ ++ cmp -s network.opts $ETC/network.opts ; then ++ echo "-> Configuring /etc/pcmcia/network.opts for Red Hat" ++ cat network.rh >> $ETC/network.opts ++ fi ++ # Tweak network.opts for Debian ++ if [ -f /etc/debian_version ] && \ ++ cmp -s network.opts $ETC/network.opts ; then ++ echo "-> Configuring /etc/pcmcia/network.opts for Debian" ++ cat network.deb >> $ETC/network.opts ++ fi ++} ++ ++install_sysv () ++{ ++ SYSV=$PREFIX$RC_DIR/init.d/pcmcia ++ ++ if [ -d /etc/sysconfig ] ; then ++ mkdir -p $PREFIX/etc/sysconfig ++ CFG=$PREFIX/etc/sysconfig/pcmcia ++ if [ -f $CFG ] ; then . $CFG ; fi ++ if [ "$PCMCIA" != "yes" ] ; then ++ echo "-> Creating PCMCIA options file $CFG" ++ echo PCMCIA=yes > $CFG ++ PCIC=i82365 ++ if [ -x $PROBE ] ; then PCIC=`$PROBE -m $PK` ; fi ++ echo "PCIC=$PCIC" >> $CFG ++ echo "PCIC_OPTS=" >> $CFG ++ echo "CORE_OPTS=" >> $CFG ++ echo "CARDMGR_OPTS=" >> $CFG ++ fi ++ fi ++ ++ cmp -s rc.pcmcia $SYSV ++ if [ $? -ne 0 ] ; then ++ # Just clobber old startup script on RedHat-ish systems ++ if [ $RC_DIR = "/etc/rc.d" ] ; then ++ rm -f $SYSV.N ++ elif [ -e $SYSV ] ; then ++ SYSV=$SYSV.N ++ fi ++ echo "-> Installing PCMCIA startup script as $SYSV" ++ mkdir -p $PREFIX$RC_DIR/init.d ++ cp rc.pcmcia $SYSV ++ chmod +x $SYSV ++ fi ++ ++ if [ $RC_DIR = "/sbin/init.d" ] ; then ++ START=03 ; STOP=42 # SuSE init sequence ++ else ++ START=45 ; STOP=96 # Red Hat, etc ++ fi ++ # Set up PCMCIA links to mirror network init/shutdown ++ for RUN in 0 1 2 3 4 5 6 ; do ++ RC=$PREFIX$RC_DIR/rc$RUN.d ++ mkdir -p $RC ++ if [ -r $RC/S*pcmcia -o -r $RC/K*pcmcia ] ; then continue ; fi ++ if [ -r $RC_DIR/rc$RUN.d/S*network ] ; then ++ ln -vsf ../init.d/pcmcia $RC/S${START}pcmcia ++ fi ++ if [ -r $RC_DIR/rc$RUN.d/K*network ] ; then ++ ln -vsf ../init.d/pcmcia $RC/K${STOP}pcmcia ++ fi ++ done ++} ++ ++install_bsd () ++{ ++ BSD=$PREFIX/etc/rc.d/rc.pcmcia ++ if [ -e $BSD ] ; then BSD=$BSD.N ; fi ++ ++ echo "-> Installing PCMCIA startup script as $BSD" ++ mkdir -p $PREFIX/etc/rc.d ++ if [ -x $PROBE ] ; then ++ PCIC=`$PROBE -m $PK` ++ sed -e "s/=i82365/=$PCIC/" rc.pcmcia > $BSD ++ else ++ cp rc.pcmcia $BSD ++ fi ++ chmod +x $BSD ++} ++ ++install_depmod () ++{ ++ CONF=$PREFIX/etc/modules.conf ++ if [ ! -r $CONF -a -r $PREFIX/etc/conf.modules ] ; then ++ CONF=$PREFIX/etc/conf.modules ++ fi ++ /sbin/modprobe -c | grep 'path\[pcmcia\]' >/dev/null ++ if [ $? -ne 0 ] ; then ++ echo "-> Updating $CONF" ++ grep ^path $CONF >/dev/null 2>&1 || grep ^keep $CONF >/dev/null 2>&1 || ++ echo keep >> $CONF ++ /sbin/modprobe -c | sed -ne '/path[net]/s/\bnet\b/pcmcia/gp' >> $CONF ++ fi ++ if [ -x /sbin/depmod -a "$PREFIX" = "" -a "$CONF_SRC" != 2 ] ; then ++ echo "-> Running depmod..." ++ /sbin/depmod -a ++ else ++ echo "-> *NOT* running depmod. Run depmod by hand if necessary." ++ fi ++} ++ ++if [ "$SYSV_INIT" = "y" ] ; then ++ install_sysv ++else ++ install_bsd ++fi ++ ++install_clients ++install_depmod ++ ++# Directory to receive cardmgr's 'stab' socket status file ++mkdir -p $PREFIX/var/lib/pcmcia +diff -urN pcmcia-cs-3.2.7.orig/Makefile pcmcia-cs-3.2.7/Makefile +--- pcmcia-cs-3.2.7.orig/Makefile 2003-05-16 01:59:44.000000000 -0400 ++++ pcmcia-cs-3.2.7/Makefile 2004-01-24 05:51:55.644884547 -0500 +@@ -6,11 +6,8 @@ + include config.mk + endif + +-ALL = modules clients wireless cardmgr flash debug-tools man etc +-DIRS = cardmgr flash debug-tools man etc +-ifndef CONFIG_PCMCIA +-DIRS := modules clients wireless $(DIRS) +-endif ++ALL = cardmgr debug-tools man etc ++DIRS = cardmgr debug-tools man etc + + help: + @echo "Pick one of the following targets:" +@@ -31,7 +28,7 @@ + @$(MAKE) -s clean + @./Configure -n + +-all: .prereq.ok kcheck ++all: + @set -e ; for d in $(DIRS) ; do $(MAKE) -C $$d ; done + @for f in *.mk ; do \ + if [ $$f != config.mk -a $$f != rules.mk ] ; then \ +@@ -48,7 +45,7 @@ + rm -f config.out + @$(MAKE) clean + +-install: .prereq.ok kcheck ++install: + @set -e ; for d in $(DIRS) ; do $(MAKE) -C $$d install ; done + @for f in *.mk ; do \ + if [ $$f != config.mk -a $$f != rules.mk ] ; then \ +diff -urN pcmcia-cs-3.2.7.orig/Makefile.orig pcmcia-cs-3.2.7/Makefile.orig +--- pcmcia-cs-3.2.7.orig/Makefile.orig 1969-12-31 19:00:00.000000000 -0500 ++++ pcmcia-cs-3.2.7/Makefile.orig 2004-01-24 05:51:38.459767613 -0500 +@@ -0,0 +1,66 @@ ++# ++# Makefile 1.41 2003/05/16 05:59:44 (David Hinds) ++# ++ ++ifeq (config.mk, $(wildcard config.mk)) ++include config.mk ++endif ++ ++ALL = modules clients wireless cardmgr flash debug-tools man etc ++DIRS = cardmgr flash debug-tools man etc ++ifndef CONFIG_PCMCIA ++DIRS := modules clients wireless $(DIRS) ++endif ++ ++help: ++ @echo "Pick one of the following targets:" ++ @echo -e "\tmake config\t\t- configure and check system setup" ++ @echo -e "\tmake oldconfig\t\t- reconfigure without prompting" ++ @echo -e "\tmake all\t\t- build modules and programs" ++ @echo -e "\tmake install\t\t- install modules and programs" ++ @echo -e "\tmake clean\t\t- remove old binaries and dependency files" ++ @echo -e "\tmake realclean\t\t- start from scratch" ++ ++config .prereq.ok: ++ @touch config.mk ++ @$(MAKE) -s clean ++ @./Configure ++ ++oldconfig: ++ @touch config.mk ++ @$(MAKE) -s clean ++ @./Configure -n ++ ++all: ++ @set -e ; for d in $(DIRS) ; do $(MAKE) -C $$d ; done ++ @for f in *.mk ; do \ ++ if [ $$f != config.mk -a $$f != rules.mk ] ; then \ ++ $(MAKE) -f $$f all ; \ ++ fi ; done ++ ++clean: ++ @touch config.mk ++ @set -e ; for d in $(ALL) ; do $(MAKE) -C $$d clean ; done ++ rm -f .prereq.ok config.mk include/pcmcia/autoconf.h ++ rm -f include/linux/modversions.h ++ ++realclean: ++ rm -f config.out ++ @$(MAKE) clean ++ ++install: .prereq.ok kcheck ++ @set -e ; for d in $(DIRS) ; do $(MAKE) -C $$d install ; done ++ @for f in *.mk ; do \ ++ if [ $$f != config.mk -a $$f != rules.mk ] ; then \ ++ $(MAKE) -f $$f install ; \ ++ fi ; done ++ ++kcheck: ++ @. ./config.out ; \ ++ if [ "$$CHECK" != "" ] ; then \ ++ if [ "`cksum < $$CHECK`" != "$$CKSUM" ] ; then \ ++ /bin/echo -n "Kernel configuration has changed." ; \ ++ /bin/echo " Please re-run 'make config'." ; \ ++ exit 1 ; \ ++ fi ; \ ++ fi Added: tinysofa/snapshot/pcmcia-cs/current/sources/pcmcia-cs-3.2.7.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/pcmcia-cs/current/sources/pcmcia-cs-3.2.7.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/pcmcia-cs/current/specs/pcmcia-cs.spec =================================================================== --- tinysofa/snapshot/pcmcia-cs/current/specs/pcmcia-cs.spec 2004-07-01 15:39:26 UTC (rev 2618) +++ tinysofa/snapshot/pcmcia-cs/current/specs/pcmcia-cs.spec 2004-07-01 15:39:28 UTC (rev 2619) @@ -0,0 +1,291 @@ +Name: pcmcia-cs +Version: 3.2.7 +Release: %(R="$Revision: 1.7 $"; RR="${R##: }"; echo ${RR%%?})ts +Summary: Utilities for handling PCMCIA devices +Group: System Environment/Daemons +Obsoletes: kernel-pcmcia-cs +Copyright: GPL +BuildRoot: %{_tmppath}/%{name}-%{version}-root +Source0: http://prdownloads.sourceforge.net/pcmcia-cs/%{name}-%{version}.tar.gz +Source1: pcmcia-cs-2.8.8-network.script +Source2: pcmcia-cs-3.1.24-isdn.script +Patch1: pcmcia-cs-3.1.18-config.patch +Patch2: pcmcia-cs-3.1.23-updfstab.patch +Patch3: pcmcia-cs-3.1.24-portrange.patch +Patch4: pcmcia-cs-3.2.7-makefile.patch +Patch6: pcmcia-cs-3.1.27-initorder.patch +Patch7: pcmcia-cs-3.2.7-cardmgr.patch +ExcludeArch: s390 s390x + +Requires: kernel >= 2.4.3, chkconfig, kudzu >= 0.95, hotplug >= 2001_04_24-9 +Requires: hwdata >= 0.60 + +%description +User-level daemon and utilities for using PCMCIA devices on Linux. + +%prep +%setup -q + +%patch1 -p2 -b .config +%patch2 -p1 -b .fstab +%patch3 -p1 -b .portrange +%patch4 -p1 -b .makefile +%patch6 -p1 -b .initorder +%patch7 -p1 -b .cardmgr +chmod -R u+rw . + +%build + +cat < config.mk +LINUX=/usr +PREFIX=/ +UCC=gcc +LD=ld +UFLAGS= +CPPFLAGS=-I/usr/include -I../include +SYSV_INIT=y +RC_DIR=%{_sysconfdir}/rc.d +MANDIR=%{_mandir} +EOF + +cat < include/pcmcia/config.h +#ifndef _PCMCIA_CONFIG_H +#define _PCMCIA_CONFIG_H +#define AUTOCONF_INCLUDED +#define __IN_PCMCIA_PACKAGE__ +#define LINUX "/usr/include" +#define PREFIX "" +#define KCC "gcc" +#define UCC "cc" +#define LD "ld" +#define UFLAGS "" +#define SYSV_INIT 1 +#define RC_DIR "%{_sysconfdir}/rc.d" +#define MANDIR "%{_mandir}" +#endif /* _PCMCIA_CONFIG_H */ +EOF + +make all + +%install +rm -rf $RPM_BUILD_ROOT + +%makeinstall PREFIX=$RPM_BUILD_ROOT + +install -m755 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/pcmcia/network +install -m755 %{SOURCE2} $RPM_BUILD_ROOT/%{_sysconfdir}/pcmcia/isdn + +# We need our own default /etc/sysconfig/pcmcia +cat > $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/pcmcia </dev/null 2>&1 + /sbin/chkconfig --del pcmcia +fi + +%triggerpostun -- kernel-pcmcia-cs +/sbin/chkconfig --add pcmcia + +%files +%defattr(-,root,root) +%doc doc/* BUGS CHANGES COPYING LICENSE +%doc MAINTAINERS README README-2.4 SUPPORTED.CARDS +%attr(0755,root,root) /sbin/* +%{_mandir}/man5/*.gz +%{_mandir}/man8/*.gz +%config(noreplace) %{_sysconfdir}/sysconfig/pcmcia +%dir %{_sysconfdir}/pcmcia +%config(noreplace) %{_sysconfdir}/pcmcia/*.opts +%{_sysconfdir}/pcmcia/cis +%{_sysconfdir}/pcmcia/ide +%{_sysconfdir}/pcmcia/network +%{_sysconfdir}/pcmcia/isdn +%{_sysconfdir}/pcmcia/parport +%{_sysconfdir}/pcmcia/scsi +%{_sysconfdir}/pcmcia/serial +%{_sysconfdir}/pcmcia/wireless +%{_sysconfdir}/pcmcia/ieee1394 +%{_sysconfdir}/pcmcia/shared +%{_sysconfdir}/rc.d/init.d/pcmcia +%dir %{_var}/lib/pcmcia + +%changelog +* Tue Jun 15 2004 Elliot Lee +- rebuilt + +* Mon Feb 16 2004 Bill Nottingham +- add %%triggerpostun on kernel-pcmcia-cs to recreate chkconfig links + (#115732) + +* Wed Feb 11 2004 Bill Nottingham +- don't build on s390* + +* Wed Jan 28 2004 Arjan van de Ven +- merge mgalgoci's cleanups + +* Mon Dec 2 2002 Bill Nottingham 3.1.31-11 +- fix exclusion of /etc/pcmcia/config + +* Tue Nov 26 2002 Arjan van de Ven +- exclude range for Radeon ICP chipsets +- use modprobe not insmod + +* Mon Nov 4 2002 Bill Nottingham +- move config to hwdata package, require it + +* Fri Aug 30 2002 Preston Brown +- fix buffalo driver entry again + +* Tue Aug 27 2002 Arjan van de Ven +- added some device ID's + +* Mon May 13 2002 Jeremy Katz +- merge changes from later 3.1.27 packages + - add loader libs for cardmgr and probe to avoid sucking copy into anaconda + - specify full path to kudzu in the initscript + - config fixups for various wireless cards + +* Mon Feb 11 2002 Arjan van de Ven +- upgrade to 3.1.31 upstream version + +* Sun Aug 19 2001 Bill Nottingham +- strike that. I was on crack. + +* Wed Aug 8 2001 Bill Nottingham +- don't run network script on device removal; hotplug will take care + of it + +* Mon Jul 16 2001 Bill Nottingham +- .opts should be %config(noreplace) +- the initscript should *not* be %config + +* Mon Jul 09 2001 Arjan van de Ven +- make it build; fixed a few loose ends in the config file + +* Sun Jul 8 2001 Bill Nottingham +- re-add the wireless patch + +* Fri Jul 06 2001 Arjan van de Ven +- Updated to upstream 3.1.27 +- fixed Compaq wavlan mapping to orinoco_cs + +* Wed May 9 2001 Bill Nottingham +- add an entry for orinoco_cs, but don't map anything to it yet +- require kernel >= 2.4.3 + +* Thu Apr 26 2001 Bill Nottingham +- fix some screwed up driver mappings (apa1480_cb -> aic7xxx_mod, ieee1394 + stuff) (#37217) +- don't call ifdown with bogus parameters (#37353) + +* Wed Apr 16 2001 Arjan van de Ven +- fix for bug 33169 + +* Sun Mar 11 2001 Than Ngo +- add missing isdn script + +* Sat Mar 10 2001 Preston Brown +- ad-hoc mode by default for wavelans + +* Tue Feb 27 2001 Bill Nottingham +- require hotplug +- actually install the stubbed network script +- fix wireless script so it works when not called from the + network script +- use xircom_cb, not tulip + +* Tue Feb 27 2001 Erik Troan +- don't bring network devices up or down, let hotplug take care of it + +* Fri Feb 23 2001 Erik Troan +- changed airo to aironet4500 in the config files +- combined some patches as it was a complete mess +- removed patch for 26955 which was just wrong -- it tried to source in + /etc/pcmcia/wireless, which is a script that expects arguments + +* Tue Feb 13 2001 Bernhard Rosenkraenzer +- Add condrestart to init script, move start and stop to functions + the way we do everywhere else +- start pcmcia earlier on in the boot process - needs to be started + before netfs if we want to mount nfs filesystems using pcmcia network + cards. + +* Mon Feb 12 2001 Bernhard Rosenkraenzer +- Make tulip cards use "tulip" rather than "xircom_tulip_cb" + (Request from Arjan) +- remove 0x800-0x8ff range from ports (#25222) +- network script sources wireless script (#26955) + +* Mon Feb 12 2001 Bernhard Rosenkraenzer +- Actually apply Erik's fstab patch +- Add support for various PCMCIA ISDN cards to /etc/pcmcia/config + (Sedlbauer SpeedStar/SpeedStar II, AVM M1/M2/B1/A1, Elsa MicroLink) +- Update to 3.1.24 while at it: + - Fixes buffer overrun in cardmgr + - Fixes config scripts + - Fixes wvlan_cs man page + - Fixes script logging for DHCP + All other 3.1.24 changes don't affect us because we aren't using + the modules from this package + +* Sun Feb 11 2001 Bill Nottingham +- take suid bit off of cardctl (#27098) + +* Thu Feb 08 2001 Erik Troan +- transparently use yenta_socket instead of i82365 when appropriate +- call updfstab here and there + +* Tue Jan 23 2001 Erik Troan +- switched to echo $"string" for translations + +* Tue Jan 16 2001 Erik Troan +- switched to gprintf for translations + +* Tue Jan 16 2001 Erik Troan +- changed xircom_tulip to xircom_tulip_cb in /etc/pcmcia/config + +* Thu Jan 11 2001 Bernhard Rosenkraenzer +- 3.1.23 + +* Mon Jan 08 2001 Erik Troan +- split kernel-pcmcia-cs into separate package as all of the pcmcia modules + are from the main kernel now, and this just contributes cardmgr and config + stuff From svn at tinysofa.org Thu Jul 1 15:39:38 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:39:38 +1000 (EST) Subject: [tinysofa-svn] r2626 - in tinysofa/snapshot: . perl-Digest-SHA1 perl-Digest-SHA1/current perl-Digest-SHA1/current/sources perl-Digest-SHA1/current/specs Message-ID: <20040701153938.B23754E817E@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:39:38 +1000 (Fri, 02 Jul 2004) New Revision: 2626 Added: tinysofa/snapshot/perl-Digest-SHA1/ tinysofa/snapshot/perl-Digest-SHA1/current/ tinysofa/snapshot/perl-Digest-SHA1/current/sources/ tinysofa/snapshot/perl-Digest-SHA1/current/sources/Digest-SHA1-2.07.tar.gz tinysofa/snapshot/perl-Digest-SHA1/current/specs/ tinysofa/snapshot/perl-Digest-SHA1/current/specs/perl-Digest-SHA1.spec Log: - Add perl-Digest-SHA1 to snapshot from 2.0. Added: tinysofa/snapshot/perl-Digest-SHA1/current/sources/Digest-SHA1-2.07.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/perl-Digest-SHA1/current/sources/Digest-SHA1-2.07.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/perl-Digest-SHA1/current/specs/perl-Digest-SHA1.spec =================================================================== --- tinysofa/snapshot/perl-Digest-SHA1/current/specs/perl-Digest-SHA1.spec 2004-07-01 15:39:37 UTC (rev 2625) +++ tinysofa/snapshot/perl-Digest-SHA1/current/specs/perl-Digest-SHA1.spec 2004-07-01 15:39:38 UTC (rev 2626) @@ -0,0 +1,91 @@ +%define _use_internal_dependency_generator 0 + +Name: perl-Digest-SHA1 +Version: 2.07 +Release: 5ts +Summary: Digest-SHA1 Perl module +License: distributable +Group: Development/Libraries +URL: http://search.cpan.org/search?mode=module&query=Digest%3a%3aSHA1 +BuildRoot: %{_tmppath}/%{name}-%{version}-root +BuildRequires: perl >= 0:5.00503 +Source0: Digest-SHA1-%{version}.tar.gz + +%description +The Digest::SHA1 module allows you to use the NIST SHA-1 message +digest algorithm from within Perl programs. The algorithm takes as +input a message of arbitrary length and produces as output a 160-bit +"fingerprint" or "message digest" of the input. + +The Digest::SHA1 module provide a procedural interface for simple use, +as well as an object oriented interface that can handle messages of +arbitrary length and which can read files directly. + +A binary digest will be 20 bytes long. A hex digest will be 40 +characters long. A base64 digest will be 27 characters long. + +%prep +%setup -q -n Digest-SHA1-%{version} + +%build +CFLAGS="$RPM_OPT_FLAGS" perl Makefile.PL PREFIX=$RPM_BUILD_ROOT/usr INSTALLDIRS=vendor +make +make test + + +%clean +rm -rf $RPM_BUILD_ROOT +%install + +rm -rf $RPM_BUILD_ROOT +eval `perl '-V:installarchlib'` +mkdir -p $RPM_BUILD_ROOT/$installarchlib +make install + +[ -x /usr/lib/rpm/brp-compress ] && /usr/lib/rpm/brp-compress + +find $RPM_BUILD_ROOT \( -name perllocal.pod -o -name .packlist \) -exec rm -v {} \; + +find $RPM_BUILD_ROOT/usr -type f -print | \ + sed "s@^$RPM_BUILD_ROOT@@g" | \ + grep -v perllocal.pod | \ + grep -v "\.packlist" > Digest-SHA1-%{version}-filelist +if [ "$(cat Digest-SHA1-%{version}-filelist)X" = "X" ] ; then + echo "ERROR: EMPTY FILE LIST" + exit -1 +fi + +%files -f Digest-SHA1-%{version}-filelist +%defattr(-,root,root) + +%changelog +* Tue Jun 15 2004 Elliot Lee +- rebuilt + +* Tue Mar 02 2004 Elliot Lee +- rebuilt + +* Thu Feb 19 2004 Chip Turner 2.07-2 +- rebuild + +* Fri Feb 13 2004 Chip Turner 2.07-1 +- move to 2.07, remove now-unnecessary utf8 patch + +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Tue Jun 17 2003 Chip Turner 2.01-15 +- rebuild + +* Mon Jan 27 2003 Chip Turner +- version bump and rebuild + +* Tue Aug 6 2002 Chip Turner +- automated release bump and build + +* Thu Jun 27 2002 Chip Turner +- description update + +* Sat Mar 16 2002 cturner at redhat.com +- Specfile autogenerated + From svn at tinysofa.org Thu Jul 1 15:39:32 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:39:32 +1000 (EST) Subject: [tinysofa-svn] r2621 - in tinysofa/snapshot: . perl-DBD-MySQL perl-DBD-MySQL/current perl-DBD-MySQL/current/sources perl-DBD-MySQL/current/specs Message-ID: <20040701153932.AA36C4E817D@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:39:32 +1000 (Fri, 02 Jul 2004) New Revision: 2621 Added: tinysofa/snapshot/perl-DBD-MySQL/ tinysofa/snapshot/perl-DBD-MySQL/current/ tinysofa/snapshot/perl-DBD-MySQL/current/sources/ tinysofa/snapshot/perl-DBD-MySQL/current/sources/DBD-mysql-2.9003.tar.gz tinysofa/snapshot/perl-DBD-MySQL/current/sources/filter-requires-dbdmysql.sh tinysofa/snapshot/perl-DBD-MySQL/current/specs/ tinysofa/snapshot/perl-DBD-MySQL/current/specs/perl-DBD-MySQL.spec Log: - Add perl-DBD-MySQL to snapshot from 2.0. Added: tinysofa/snapshot/perl-DBD-MySQL/current/sources/DBD-mysql-2.9003.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/perl-DBD-MySQL/current/sources/DBD-mysql-2.9003.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/perl-DBD-MySQL/current/sources/filter-requires-dbdmysql.sh =================================================================== --- tinysofa/snapshot/perl-DBD-MySQL/current/sources/filter-requires-dbdmysql.sh 2004-07-01 15:39:29 UTC (rev 2620) +++ tinysofa/snapshot/perl-DBD-MySQL/current/sources/filter-requires-dbdmysql.sh 2004-07-01 15:39:32 UTC (rev 2621) @@ -0,0 +1,3 @@ +#!/bin/sh + +/usr/lib/rpm/find-requires $* | grep -v 'perl(Data::ShowTable' Property changes on: tinysofa/snapshot/perl-DBD-MySQL/current/sources/filter-requires-dbdmysql.sh ___________________________________________________________________ Name: svn:executable + * Added: tinysofa/snapshot/perl-DBD-MySQL/current/specs/perl-DBD-MySQL.spec =================================================================== --- tinysofa/snapshot/perl-DBD-MySQL/current/specs/perl-DBD-MySQL.spec 2004-07-01 15:39:29 UTC (rev 2620) +++ tinysofa/snapshot/perl-DBD-MySQL/current/specs/perl-DBD-MySQL.spec 2004-07-01 15:39:32 UTC (rev 2621) @@ -0,0 +1,126 @@ +%define _use_internal_dependency_generator 0 + +Summary: A MySQL interface for perl +Name: perl-DBD-MySQL +Version: 2.9003 +Release: 4 +License: distributable +Group: Applications/Databases +Source: DBD-mysql-%{version}.tar.gz +Source2: filter-requires-dbdmysql.sh +Url: http://search.cpan.org/search?query=DBD%3A%3AMySQL +BuildRoot: %{_tmppath}/%{name}-%{version}-root +Requires: perl, perl-DBI +BuildRequires: mysql-devel, mysql, perl, perl-DBI, zlib-devel + +%description +An implementation of DBI for MySQL for Perl. + +# Provide perl-specific find-{provides,requires}. +%define __find_provides /usr/lib/rpm/find-provides.perl +# %%define __find_requires /usr/lib/rpm/find-requires.perl +%define __find_requires %{SOURCE2} + +%prep +%setup -q -n DBD-mysql-%{version} + +%build +CFLAGS="$RPM_OPT_FLAGS" perl Makefile.PL PREFIX=$RPM_BUILD_ROOT/usr INSTALLDIRS=vendor --ssl +make + +%clean +rm -rf $RPM_BUILD_ROOT + +%install +rm -rf $RPM_BUILD_ROOT +make install + +[ -x /usr/lib/rpm/brp-compress ] && /usr/lib/rpm/brp-compress + +find $RPM_BUILD_ROOT \( -name perllocal.pod -o -name .packlist \) -exec rm -v {} \; + +find $RPM_BUILD_ROOT/usr -type f -print | \ + sed "s@^$RPM_BUILD_ROOT@@g" | \ + grep -v perllocal.pod | \ + grep -v "\.packlist" > %{name}-%{version}-filelist +if [ "$(cat %{name}-%{version}-filelist)X" = "X" ] ; then + echo "ERROR: EMPTY FILE LIST" + exit -1 +fi + +%files -f %{name}-%{version}-filelist +%defattr(-,root,root) + + +%changelog +* Tue Mar 02 2004 Elliot Lee +- rebuilt + +* Fri Feb 13 2004 Chip Turner 2.9003-1 +- update to 2.9003 + +* Mon Jul 7 2003 Chip Turner 2.9002-1 +- move to 2.9002 + +* Thu Jul 3 2003 Chip Turner 2.1021-5 +- rebuild + +* Mon Jan 27 2003 Chip Turner +- version bump and rebuild + +* Wed Jan 1 2003 Chip Turner +- turn ssl on and allow Makefile.PL to yse mysql_config to find proper link flags +- update to 2.1021 + +* Sat Dec 14 2002 Chip Turner +- don't use internal rpm dep generator + +* Wed Nov 20 2002 Chip Turner +- rebuild + +* Wed Aug 7 2002 Trond Eivind Glomsr?d 2.1017-3 +- Rebuild + +* Tue Jun 25 2002 Trond Eivind Glomsr?d 2.1017-2 +- Rebuild, to fix #66304 + +* Wed Jun 5 2002 Trond Eivind Glomsr?d 2.1017-1 +- New version - no longer integrated into msql-mysql modules + +* Thu May 23 2002 Tim Powers +- automated rebuild + +* Fri Feb 22 2002 Trond Eivind Glomsr?d 1.2219-6 +- Rebuild + +* Fri Feb 8 2002 Chip Turner +- filter out "soft" dependencies: perl(Data::ShowTable) + +* Thu Feb 7 2002 Trond Eivind Glomsr?d 1.2219-4 +- Rebuild + +* Tue Jan 22 2002 Trond Eivind Glomsr?d 1.2219-3 +- Rebuild + +* Wed Jan 09 2002 Tim Powers +- automated rebuild + +* Tue Jan 8 2002 Trond Eivind Glomsr?d 1.2219-1 +- 1.2219 + +* Fri Jul 20 2001 Trond Eivind Glomsr?d +- Add zlib-devel to buildrequires (#49536) + +* Sun Jul 1 2001 Trond Eivind Glomsr?d +- Add perl and perl-DBI to BuildRequires + +* Wed May 30 2001 Trond Eivind Glomsr?d +- Change Group to Applications/Databases + +* Tue May 1 2001 Trond Eivind Glomsr?d +- 1.2216 +- Add doc files +- Minor cleanups + +* Thu Nov 30 2000 Trond Eivind Glomsr?d +- First cut From svn at tinysofa.org Thu Jul 1 15:39:43 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:39:43 +1000 (EST) Subject: [tinysofa-svn] r2629 - in tinysofa/snapshot: . perl-HTML-Tagset perl-HTML-Tagset/current perl-HTML-Tagset/current/sources perl-HTML-Tagset/current/specs Message-ID: <20040701153943.32E0E4E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:39:41 +1000 (Fri, 02 Jul 2004) New Revision: 2629 Added: tinysofa/snapshot/perl-HTML-Tagset/ tinysofa/snapshot/perl-HTML-Tagset/current/ tinysofa/snapshot/perl-HTML-Tagset/current/sources/ tinysofa/snapshot/perl-HTML-Tagset/current/sources/HTML-Tagset-3.03.tar.gz tinysofa/snapshot/perl-HTML-Tagset/current/specs/ tinysofa/snapshot/perl-HTML-Tagset/current/specs/perl-HTML-Tagset.spec Log: - Add perl-HTML-Tagset to snapshot from 2.0. Added: tinysofa/snapshot/perl-HTML-Tagset/current/sources/HTML-Tagset-3.03.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/perl-HTML-Tagset/current/sources/HTML-Tagset-3.03.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/perl-HTML-Tagset/current/specs/perl-HTML-Tagset.spec =================================================================== --- tinysofa/snapshot/perl-HTML-Tagset/current/specs/perl-HTML-Tagset.spec 2004-07-01 15:39:40 UTC (rev 2628) +++ tinysofa/snapshot/perl-HTML-Tagset/current/specs/perl-HTML-Tagset.spec 2004-07-01 15:39:41 UTC (rev 2629) @@ -0,0 +1,69 @@ +%define _use_internal_dependency_generator 0 + +Summary: HTML::Tagset - data tables useful in parsing HTML. +Name: perl-HTML-Tagset +Version: 3.03 +Release: 29ts +License: distributable +Group: Applications/CPAN +Source0: HTML-Tagset-%{version}.tar.gz +Url: http://www.cpan.org +BuildRoot: %{_tmppath}/%{name}-%{version}-root +BuildRequires: perl >= 0:5.00503 +Requires: perl >= 0:5.00503 +BuildArch: noarch + +%description +This module contains several data tables useful in various kinds of +HTML parsing operations, such as tag and entity names. + +# Provide perl-specific find-{provides,requires}. +%define __find_provides /usr/lib/rpm/find-provides.perl +%define __find_requires /usr/lib/rpm/find-requires.perl + +%prep +%setup -q -n HTML-Tagset-%{version} + +%build +CFLAGS="$RPM_OPT_FLAGS" perl Makefile.PL PREFIX=$RPM_BUILD_ROOT/usr INSTALLDIRS=vendor +make +make test + +%clean +rm -rf $RPM_BUILD_ROOT + +%install +rm -rf $RPM_BUILD_ROOT +make install + +[ -x /usr/lib/rpm/brp-compress ] && /usr/lib/rpm/brp-compress + +find $RPM_BUILD_ROOT \( -name perllocal.pod -o -name .packlist \) -exec rm -v {} \; + +find $RPM_BUILD_ROOT/usr -type f -print | + sed "s@^$RPM_BUILD_ROOT@@g" | + grep -v perllocal.pod | + grep -v "\.packlist" > HTML-Tagset-%{version}-filelist +if [ "$(cat HTML-Tagset-%{version}-filelist)X" = "X" ] ; then + echo "ERROR: EMPTY FILE LIST" + exit -1 +fi + +%files -f HTML-Tagset-%{version}-filelist +%defattr(-,root,root) + +%changelog +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Thu Jan 23 2003 Tim Powers 3.03-28 +- rebuild + +* Tue Aug 6 2002 Chip Turner +- automated release bump and build + +* Wed Jan 09 2002 Tim Powers +- automated rebuild + +* Mon Apr 30 2001 Chip Turner +- Spec file was autogenerated. From svn at tinysofa.org Thu Jul 1 15:39:34 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:39:34 +1000 (EST) Subject: [tinysofa-svn] r2623 - in tinysofa/snapshot: . perl-DBI perl-DBI/current perl-DBI/current/sources perl-DBI/current/specs Message-ID: <20040701153934.CAA5B4E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:39:34 +1000 (Fri, 02 Jul 2004) New Revision: 2623 Added: tinysofa/snapshot/perl-DBI/ tinysofa/snapshot/perl-DBI/current/ tinysofa/snapshot/perl-DBI/current/sources/ tinysofa/snapshot/perl-DBI/current/sources/DBI-1.40.tar.gz tinysofa/snapshot/perl-DBI/current/sources/filter-requires-dbi.sh tinysofa/snapshot/perl-DBI/current/sources/perl-DBI-1.37-prever.patch tinysofa/snapshot/perl-DBI/current/specs/ tinysofa/snapshot/perl-DBI/current/specs/perl-DBI.spec Log: - Add perl-DBI to snapshot from 2.0. Added: tinysofa/snapshot/perl-DBI/current/sources/DBI-1.40.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/perl-DBI/current/sources/DBI-1.40.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/perl-DBI/current/sources/filter-requires-dbi.sh =================================================================== --- tinysofa/snapshot/perl-DBI/current/sources/filter-requires-dbi.sh 2004-07-01 15:39:33 UTC (rev 2622) +++ tinysofa/snapshot/perl-DBI/current/sources/filter-requires-dbi.sh 2004-07-01 15:39:34 UTC (rev 2623) @@ -0,0 +1,4 @@ +#!/bin/sh + +/usr/lib/rpm/find-requires $* | grep -v 'perl(Win32::ODBC' | grep -v 'perl(RPC::PlClient' | grep -v 'perl(DBD::)' | grep -v 'perl(RPC::PlServer)' | grep -v 'perl(Apache' + Property changes on: tinysofa/snapshot/perl-DBI/current/sources/filter-requires-dbi.sh ___________________________________________________________________ Name: svn:executable + * Added: tinysofa/snapshot/perl-DBI/current/sources/perl-DBI-1.37-prever.patch =================================================================== --- tinysofa/snapshot/perl-DBI/current/sources/perl-DBI-1.37-prever.patch 2004-07-01 15:39:33 UTC (rev 2622) +++ tinysofa/snapshot/perl-DBI/current/sources/perl-DBI-1.37-prever.patch 2004-07-01 15:39:34 UTC (rev 2623) @@ -0,0 +1,16 @@ +This diff is to remove a version check that is causing trouble with +RH's perl 5.8.1 prerelease. Since we mark it as 5.8.0, this confuses +modules that do checks. +--- DBI-1.37/DBI.xs.prever 2003-07-07 08:42:08.000000000 -0400 ++++ DBI-1.37/DBI.xs 2003-07-07 08:42:31.000000000 -0400 +@@ -54,10 +54,6 @@ + #define aTHXo_ + #endif + +-#if (PERL_VERSION < 8) || ((PERL_VERSION == 8) && (PERL_SUBVERSION == 0)) +-#define DBI_save_hv_fetch_ent +-#endif +- + + static imp_xxh_t *dbih_getcom _((SV *h)); + static imp_xxh_t *dbih_getcom2 _((SV *h, MAGIC **mgp)); Added: tinysofa/snapshot/perl-DBI/current/specs/perl-DBI.spec =================================================================== --- tinysofa/snapshot/perl-DBI/current/specs/perl-DBI.spec 2004-07-01 15:39:33 UTC (rev 2622) +++ tinysofa/snapshot/perl-DBI/current/specs/perl-DBI.spec 2004-07-01 15:39:34 UTC (rev 2623) @@ -0,0 +1,157 @@ +%define _use_internal_dependency_generator 0 + +Summary: A database access API for perl +Name: perl-DBI +Version: 1.40 +Release: 4ts +URL: http://dbi.perl.org/ +License: Artistic +Group: Applications/Databases +Source: DBI-%{version}.tar.gz +Source2: filter-requires-dbi.sh +Patch0: perl-DBI-1.37-prever.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-root +Requires: perl >= 5.6.1 +BuildRequires: perl-Time-HiRes + +%description + +DBI is a database access Application Programming Interface (API) for +the Perl Language. The DBI API Specification defines a set of +functions, variables and conventions that provide a consistent +database interface independent of the actual database being used. + +# %%define __find_requires /usr/lib/rpm/find-requires.perl +%define __find_requires %{SOURCE2} + +%prep +%setup -q -n DBI-%{version} +%patch0 -p1 + +%build +CFLAGS="$RPM_OPT_FLAGS" perl Makefile.PL PREFIX=$RPM_BUILD_ROOT/usr INSTALLDIRS=vendor +make + +%clean +rm -rf $RPM_BUILD_ROOT + +%install +rm -rf $RPM_BUILD_ROOT +make install + +[ -x /usr/lib/rpm/brp-compress ] && /usr/lib/rpm/brp-compress + +find $RPM_BUILD_ROOT \( -name perllocal.pod -o -name .packlist \) -exec rm -v {} \; + +find $RPM_BUILD_ROOT/usr -type f -print | \ + sed "s@^$RPM_BUILD_ROOT@@g" | \ + grep -v perllocal.pod | \ + grep -v "\.packlist" > %{name}-%{version}-filelist +if [ "$(cat %{name}-%{version}-filelist)X" = "X" ] ; then + echo "ERROR: EMPTY FILE LIST" + exit -1 +fi + +%files -f %{name}-%{version}-filelist +%defattr(-,root,root) +%dir %{_libdir}/perl5/vendor_perl/%(perl -MConfig -le 'print "$Config{version}/$Config{archname}"')/DBI +%dir %{_libdir}/perl5/vendor_perl/%(perl -MConfig -le 'print "$Config{version}/$Config{archname}"')/auto/DBI + + +%changelog +* Tue Mar 02 2004 Elliot Lee +- rebuilt + +* Fri Feb 13 2004 Chip Turner 1.40-1 +- update to 1.40 + +* Fri Dec 19 2003 Chip Turner 1.39-1 +- update to 1.39 + +* Mon Jul 7 2003 Chip Turner 1.37-1 +- upgrade to 1.37 + +* Wed Apr 2 2003 Chip Turner 1.32-6 +- add buildrequires on perl-Time-HiRes + +* Tue Feb 18 2003 Chip Turner +- update dependency filter to remove dependency on perl(Apache) that +- crept in (#82927) + +* Mon Jan 27 2003 Chip Turner +- version bump and rebuild + +* Sat Dec 14 2002 Chip Turner +- don't use rpm internal dep generator + +* Wed Nov 20 2002 Chip Turner +- rebuild + +* Wed Aug 7 2002 Trond Eivind Glomsr?d 1.30-1 +- 1.30. + +* Tue Jun 25 2002 Trond Eivind Glomsr?d 1.28-1 +- 1.28 +- Building it also fixes #66304 + +* Fri Jun 21 2002 Tim Powers +- automated rebuild + +* Wed Jun 5 2002 Trond Eivind Glomsr?d 1.23-2 +- Tweak dependency finder - filter out a dependency found within the + doc section of a module + +* Tue Jun 4 2002 Trond Eivind Glomsr?d 1.23-1 +- 1.23 +- Some changes to integrate with new Perl +- Update URL + +* Thu May 23 2002 Tim Powers +- automated rebuild + +* Tue May 7 2002 Trond Eivind Glomsr?d 1.21-2 +- Rebuild + +* Fri Feb 22 2002 Trond Eivind Glomsr?d 1.21-1 +- 1.21 + +* Fri Feb 8 2002 Chip Turner +- filter out "soft" dependencies: perl(RPC::PlClient) and perl(Win32::ODBC) + +* Thu Feb 7 2002 Trond Eivind Glomsr?d 1.201-2 +- Rebuild + +* Tue Jan 22 2002 Trond Eivind Glomsr?d 1.201-1 +- 1.201 + +* Wed Jan 09 2002 Tim Powers +- automated rebuild + +* Tue Jan 8 2002 Trond Eivind Glomsr?d 1.20-1 +- 1.20 +- Proper URL + +* Sat Jun 23 2001 Trond Eivind Glomsr?d +- 1.18 + +* Wed May 30 2001 Trond Eivind Glomsr?d +- 1.16 +- change group to Applications/Databases from Applications/CPAN + +* Tue May 1 2001 Trond Eivind Glomsr?d +- 1.15 + +* Tue Feb 27 2001 Trond Eivind Glomsr?d +- Cleanups + +* Thu Nov 30 2000 Trond Eivind Glomsr?d +- build for main distribution +- use %%{_tmppath} +- change name of specfile +- don't use a find script to generate file lists +- general cleanup +- add descriptive summary and description + + +* Mon Aug 14 2000 Tim Powers +- Spec file was autogenerated. From svn at tinysofa.org Thu Jul 1 15:39:31 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:39:31 +1000 (EST) Subject: [tinysofa-svn] r2620 - in tinysofa/snapshot: . perl-Bit-Vector perl-Bit-Vector/current perl-Bit-Vector/current/sources perl-Bit-Vector/current/specs Message-ID: <20040701153931.6E2A64E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:39:29 +1000 (Fri, 02 Jul 2004) New Revision: 2620 Added: tinysofa/snapshot/perl-Bit-Vector/ tinysofa/snapshot/perl-Bit-Vector/current/ tinysofa/snapshot/perl-Bit-Vector/current/sources/ tinysofa/snapshot/perl-Bit-Vector/current/sources/Bit-Vector-6.3.tar.gz tinysofa/snapshot/perl-Bit-Vector/current/specs/ tinysofa/snapshot/perl-Bit-Vector/current/specs/perl-Bit-Vector.spec Log: - Add perl-Bit-Vector to snapshot from 2.0. Added: tinysofa/snapshot/perl-Bit-Vector/current/sources/Bit-Vector-6.3.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/perl-Bit-Vector/current/sources/Bit-Vector-6.3.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/perl-Bit-Vector/current/specs/perl-Bit-Vector.spec =================================================================== --- tinysofa/snapshot/perl-Bit-Vector/current/specs/perl-Bit-Vector.spec 2004-07-01 15:39:28 UTC (rev 2619) +++ tinysofa/snapshot/perl-Bit-Vector/current/specs/perl-Bit-Vector.spec 2004-07-01 15:39:29 UTC (rev 2620) @@ -0,0 +1,77 @@ +Name: perl-Bit-Vector +Version: 6.3 +Release: 2ts +Summary: A module for high-performance Perl manipulation of bit vectors. +License: distributable +Group: Development/Libraries +URL: http://search.cpan.org/search?mode=module&query=Bit%3a%3aVector +BuildRoot: %{_tmppath}/%{name}-%{version}-root +BuildRequires: perl >= 0:5.00503 +Source0: Bit-Vector-%{version}.tar.gz + +%description +Bit::Vector is an efficient C library which allows you to handle bit +vectors, sets (of integers), "big integer arithmetic" and boolean +matrices, all of arbitrary sizes. + +The library is efficient (in terms of algorithmical complexity) and +therefore fast (in terms of execution speed) for instance through the +widespread use of divide-and-conquer algorithms. + +%prep +%setup -q -n Bit-Vector-%{version} + +%build +CFLAGS="$RPM_OPT_FLAGS" perl Makefile.PL PREFIX=$RPM_BUILD_ROOT/usr INSTALLDIRS=vendor +make +make test + + +%clean +rm -rf $RPM_BUILD_ROOT +%install + +rm -rf $RPM_BUILD_ROOT +make install + +[ -x /usr/lib/rpm/brp-compress ] && /usr/lib/rpm/brp-compress + +find $RPM_BUILD_ROOT/usr -type f -print | \ + sed "s@^$RPM_BUILD_ROOT@@g" | \ + grep -v perllocal.pod | \ + grep -v Carp::Clan.3pm.gz | \ + grep -v Carp/Clan | \ + grep -v "\.packlist" > Bit-Vector-%{version}-filelist +if [ "$(cat Bit-Vector-%{version}-filelist)X" = "X" ] ; then + echo "ERROR: EMPTY FILE LIST" + exit -1 +fi + +find $RPM_BUILD_ROOT/usr -name perllocal.pod -o -name 'Carp::Clan.3pm*' \ + -o -path '*Carp/Clan*' -o -name .packlist | xargs rm -f + +%files -f Bit-Vector-%{version}-filelist +%defattr(-,root,root) + +%changelog +* Tue Mar 02 2004 Elliot Lee +- rebuilt + +* Fri Feb 13 2004 Chip Turner 6.3-1 +- update to 6.3 + +* Wed Jul 16 2003 Elliot Lee +- Rebuild, remove unpackaged files + +* Wed Jan 22 2003 Tim Powers +- rebuilt + +* Thu Aug 15 2002 Chip Turner +- file list fix for Clan stuff + +* Tue Aug 6 2002 Chip Turner +- automated release bump and build + +* Wed Jan 30 2002 cturner at redhat.com +- Specfile autogenerated + From svn at tinysofa.org Thu Jul 1 15:39:39 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:39:39 +1000 (EST) Subject: [tinysofa-svn] r2627 - in tinysofa/snapshot: . perl-Filter perl-Filter/current perl-Filter/current/sources perl-Filter/current/specs Message-ID: <20040701153939.9D4324E817F@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:39:39 +1000 (Fri, 02 Jul 2004) New Revision: 2627 Added: tinysofa/snapshot/perl-Filter/ tinysofa/snapshot/perl-Filter/current/ tinysofa/snapshot/perl-Filter/current/sources/ tinysofa/snapshot/perl-Filter/current/sources/Filter-1.30.tar.gz tinysofa/snapshot/perl-Filter/current/specs/ tinysofa/snapshot/perl-Filter/current/specs/perl-Filter.spec Log: - Add perl-Filter to snapshot from 2.0. Added: tinysofa/snapshot/perl-Filter/current/sources/Filter-1.30.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/perl-Filter/current/sources/Filter-1.30.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/perl-Filter/current/specs/perl-Filter.spec =================================================================== --- tinysofa/snapshot/perl-Filter/current/specs/perl-Filter.spec 2004-07-01 15:39:38 UTC (rev 2626) +++ tinysofa/snapshot/perl-Filter/current/specs/perl-Filter.spec 2004-07-01 15:39:39 UTC (rev 2627) @@ -0,0 +1,84 @@ +%define _use_internal_dependency_generator 0 + +Name: perl-Filter +Version: 1.30 +Release: 6ts +Summary: Filter Perl module +License: distributable +Group: Development/Libraries +URL: http://search.cpan.org/search?mode=module&query=Filter +BuildRoot: %{_tmppath}/%{name}-%{version}-root +BuildRequires: perl >= 0:5.00503 +Source0: Filter-%{version}.tar.gz +Provides: perl(Filter) + +%description +This package provides source-level filters for Perl modules. Source +filters alter the program text of a module before Perl sees it, much +as a C preprocessor alters the source text of a C program before the +compiler sees it. + +%prep +%setup -q -n Filter-%{version} + +%build +CFLAGS="$RPM_OPT_FLAGS" perl Makefile.PL PREFIX=$RPM_BUILD_ROOT/usr INSTALLDIRS=vendor +make +make test || : + +%clean +rm -rf $RPM_BUILD_ROOT +%install + +rm -rf $RPM_BUILD_ROOT +eval `perl '-V:installarchlib'` +mkdir -p $RPM_BUILD_ROOT/$installarchlib +make install + +[ -x /usr/lib/rpm/brp-compress ] && /usr/lib/rpm/brp-compress + +find $RPM_BUILD_ROOT \( -name perllocal.pod -o -name .packlist \) -exec rm -v {} \; + +find $RPM_BUILD_ROOT/usr -type f -print | \ + sed "s@^$RPM_BUILD_ROOT@@g" | \ + grep -v perllocal.pod | \ + grep -v "\.packlist" > Filter-%{version}-filelist +if [ "$(cat Filter-%{version}-filelist)X" = "X" ] ; then + echo "ERROR: EMPTY FILE LIST" + exit -1 +fi + +%files -f Filter-%{version}-filelist +%defattr(-,root,root) + +%changelog +* Tue Jun 15 2004 Elliot Lee +- rebuilt + +* Tue Mar 02 2004 Elliot Lee +- rebuilt + +* Tue Jun 17 2003 Chip Turner 1.29-8 +- rebuild + +* Mon Jan 27 2003 Chip Turner +- version bump and rebuild + +* Tue Dec 10 2002 Chip Turner +- update to latest version from CPAN + +* Wed Nov 20 2002 Chip Turner +- rebuild + +* Tue Aug 6 2002 Chip Turner +- automated release bump and build + +* Tue Jul 16 2002 Chip Turner +- updated %description + +* Thu Jun 27 2002 Chip Turner +- description update + +* Fri Jun 07 2002 cturner at redhat.com +- Specfile autogenerated + From svn at tinysofa.org Thu Jul 1 15:39:33 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:39:33 +1000 (EST) Subject: [tinysofa-svn] r2622 - in tinysofa/snapshot: . perl-DBD-Pg perl-DBD-Pg/current perl-DBD-Pg/current/sources perl-DBD-Pg/current/specs Message-ID: <20040701153933.994DE4E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:39:33 +1000 (Fri, 02 Jul 2004) New Revision: 2622 Added: tinysofa/snapshot/perl-DBD-Pg/ tinysofa/snapshot/perl-DBD-Pg/current/ tinysofa/snapshot/perl-DBD-Pg/current/sources/ tinysofa/snapshot/perl-DBD-Pg/current/sources/DBD-Pg-1.31.tar.gz tinysofa/snapshot/perl-DBD-Pg/current/sources/perl-DBD-1.31-fixver.patch tinysofa/snapshot/perl-DBD-Pg/current/specs/ tinysofa/snapshot/perl-DBD-Pg/current/specs/perl-DBD-Pg.spec Log: - Add perl-DBD-Pg to snapshot from 2.0. Added: tinysofa/snapshot/perl-DBD-Pg/current/sources/DBD-Pg-1.31.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/perl-DBD-Pg/current/sources/DBD-Pg-1.31.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/perl-DBD-Pg/current/sources/perl-DBD-1.31-fixver.patch =================================================================== --- tinysofa/snapshot/perl-DBD-Pg/current/sources/perl-DBD-1.31-fixver.patch 2004-07-01 15:39:32 UTC (rev 2621) +++ tinysofa/snapshot/perl-DBD-Pg/current/sources/perl-DBD-1.31-fixver.patch 2004-07-01 15:39:33 UTC (rev 2622) @@ -0,0 +1,12 @@ +--- DBD-Pg-1.31/t/lib/App/Info/RDBMS/PostgreSQL.pm.fixver 2003-12-19 09:48:23.000000000 -0500 ++++ DBD-Pg-1.31/t/lib/App/Info/RDBMS/PostgreSQL.pm 2003-12-19 09:48:47.000000000 -0500 +@@ -254,6 +254,9 @@ + } elsif ($version =~ /(\d+)\.(\d+)\w+\d+/) { + @{$self}{qw(version major minor patch)} = + ($version, $1, $2, 0); ++ } elsif ($version =~ /(\d+)\.(\d+)/) { ++ @{$self}{qw(version major minor patch)} = ++ ($version, $1, $2, 0); + } else { + $self->error("Failed to parse PostgreSQL version parts from " . + "string '$version'"); Added: tinysofa/snapshot/perl-DBD-Pg/current/specs/perl-DBD-Pg.spec =================================================================== --- tinysofa/snapshot/perl-DBD-Pg/current/specs/perl-DBD-Pg.spec 2004-07-01 15:39:32 UTC (rev 2621) +++ tinysofa/snapshot/perl-DBD-Pg/current/specs/perl-DBD-Pg.spec 2004-07-01 15:39:33 UTC (rev 2622) @@ -0,0 +1,131 @@ +%define _use_internal_dependency_generator 0 + +Summary: A PostgresSQL interface for perl +Name: perl-DBD-Pg +Version: 1.31 +Release: 5ts +License: distributable +Group: Applications/Databases +Source: DBD-Pg-%{version}.tar.gz +Patch: perl-DBD-1.31-fixver.patch +Url: http://search.cpan.org/search?query=dbd%3A%3Apg +BuildRoot: %{_tmppath}/%{name}-%{version}-root +Requires: perl >= 5.6.0-3, perl-DBI +BuildRequires: postgresql-devel >= 7.1, perl >= 5.6.0-3, perl-DBI + +%description +An implementation of DBI for PostgreSQL for Perl. + +# Provide perl-specific find-{provides,requires}. +%define __find_provides /usr/lib/rpm/find-provides.perl +%define __find_requires /usr/lib/rpm/find-requires.perl + +%prep +%setup -q -n DBD-Pg-%{version} +%patch0 -p1 + +%build +export POSTGRES_INCLUDE=/usr/include/pgsql +export POSTGRES_LIB=%{_libdir} +CFLAGS="$RPM_OPT_FLAGS" perl Makefile.PL PREFIX=$RPM_BUILD_ROOT/usr INSTALLDIRS=vendor +make + +%clean +rm -rf $RPM_BUILD_ROOT + +%install +rm -rf $RPM_BUILD_ROOT +make install + +[ -x /usr/lib/rpm/brp-compress ] && /usr/lib/rpm/brp-compress + +find $RPM_BUILD_ROOT \( -name perllocal.pod -o -name .packlist \) -exec rm -v {} \; + +find $RPM_BUILD_ROOT/usr -type f -print | \ + sed "s@^$RPM_BUILD_ROOT@@g" | \ + grep -v perllocal.pod | \ + grep -v "\.packlist" > %{name}-%{version}-filelist +if [ "$(cat %{name}-%{version}-filelist)X" = "X" ] ; then + echo "ERROR: EMPTY FILE LIST" + exit -1 +fi + +%files -f %{name}-%{version}-filelist +%defattr(-,root,root) + +%changelog +* Tue Mar 02 2004 Elliot Lee +- rebuilt + +* Fri Feb 13 2004 Chip Turner 1.31-2 +- rebuild + +* Thu Dec 11 2003 Chip Turner 1.31-1 +- update to 1.31 + +* Mon Jul 7 2003 Chip Turner 1.22-1 +- move to upstream 1.22 + +* Mon Jan 27 2003 Chip Turner +- version bump and rebuild + +* Mon Jan 13 2003 Chip Turner +- update to 1.21 + +* Sat Dec 14 2002 Chip Turner +- don't use internal rpm dep generator + +* Wed Nov 20 2002 Chip Turner +- rebuild + +* Wed Aug 7 2002 Trond Eivind Glomsr?d 1.13-5 +- Rebuild + +* Tue Jun 25 2002 Trond Eivind Glomsr?d 1.13-4 +- Rebuild, to fix #66304 + +* Wed Jun 5 2002 Trond Eivind Glomsr?d 1.13-3 +- Integrate with newer perl + +* Thu May 23 2002 Tim Powers +- automated rebuild + +* Tue May 7 2002 Trond Eivind Glomsr?d 1.13-1 +- 1.13 + +* Fri Feb 22 2002 Trond Eivind Glomsr?d 1.01-8 +- Rebuild + +* Thu Feb 7 2002 Trond Eivind Glomsr?d 1.01-7 +- Rebuild + +* Thu Jan 31 2002 Tim Powers +- rebuild to solve more deps + +* Tue Jan 29 2002 Bill Nottingham 1.01-5 +- rebuild (dependencies) + +* Tue Jan 22 2002 Trond Eivind Glomsr?d 1.01-4 +- Rebuild + +* Wed Jan 09 2002 Tim Powers +- automated rebuild + +* Tue Jan 8 2002 Trond Eivind Glomsr?d 1.01-2 +- Rebuild + +* Sun Jul 1 2001 Trond Eivind Glomsr?d +- 1.01 bugfix release ("bytea" coredumped with values outside 0...127) +- Add perl-DBI and perl to BuildRequires (they were just in Requires: previously) + +* Wed May 30 2001 Trond Eivind Glomsr?d +- 1.00 +- change group to Applications/Databases from Applications/CPAN + +* Tue May 1 2001 Trond Eivind Glomsr?d +- 0.98, for postgresql-7.1 +- add doc files +- cleanups + +* Thu Nov 30 2000 Trond Eivind Glomsr?d +- First cut From svn at tinysofa.org Thu Jul 1 15:39:48 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:39:48 +1000 (EST) Subject: [tinysofa-svn] r2634 - in tinysofa/snapshot: . perl-XML-Parser perl-XML-Parser/current perl-XML-Parser/current/sources perl-XML-Parser/current/specs Message-ID: <20040701153948.A92234E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:39:48 +1000 (Fri, 02 Jul 2004) New Revision: 2634 Added: tinysofa/snapshot/perl-XML-Parser/ tinysofa/snapshot/perl-XML-Parser/current/ tinysofa/snapshot/perl-XML-Parser/current/sources/ tinysofa/snapshot/perl-XML-Parser/current/sources/XML-Parser-2.34.tar.gz tinysofa/snapshot/perl-XML-Parser/current/specs/ tinysofa/snapshot/perl-XML-Parser/current/specs/perl-XML-Parser.spec Log: - Add perl-XML-Parser to snapshot from 2.0. Added: tinysofa/snapshot/perl-XML-Parser/current/sources/XML-Parser-2.34.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/perl-XML-Parser/current/sources/XML-Parser-2.34.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/perl-XML-Parser/current/specs/perl-XML-Parser.spec =================================================================== --- tinysofa/snapshot/perl-XML-Parser/current/specs/perl-XML-Parser.spec 2004-07-01 15:39:47 UTC (rev 2633) +++ tinysofa/snapshot/perl-XML-Parser/current/specs/perl-XML-Parser.spec 2004-07-01 15:39:48 UTC (rev 2634) @@ -0,0 +1,93 @@ +%define _use_internal_dependency_generator 0 + +Summary: A low level Perl module for parsing XML either via trees or streaming. +Name: perl-XML-Parser +Version: 2.34 +Release: 2ts +License: distributable +Group: Applications/CPAN +Source0: XML-Parser-%{version}.tar.gz +Url: http://search.cpan.org/search?query=XML%3A%3AParser +BuildRoot: %{_tmppath}/%{name}-%{version}-root +BuildRequires: perl >= 2:5.8.0 +BuildRequires: perl-libwww-perl +BuildRequires: perl-URI +Requires: perl >= 2:5.8.0 +Requires: perl-libwww-perl +Requires: perl-URI + +%description +This module provides ways to parse XML documents. It is built on top +of XML::Parser::Expat, which is a lower level interface to James +Clark's expat library. Each call to one of the parsing methods creates +a new instance of XML::Parser::Expat which is then used to parse the +document. Expat options may be provided when the XML::Parser object is +created. These options are then passed on to the Expat object on each +parse call. They can also be given as extra arguments to the parse +methods, in which case they override options given at XML::Parser +creation time. + +%prep +%setup -q -n XML-Parser-%{version} + +%build +CFLAGS="$RPM_OPT_FLAGS" perl Makefile.PL PREFIX=$RPM_BUILD_ROOT/usr INSTALLDIRS=vendor +make +# XXX: expedite to get build moving. run the test, but accept it may have failures +make test || : + +%clean +rm -rf $RPM_BUILD_ROOT + +%install +rm -rf $RPM_BUILD_ROOT +make install + +[ -x /usr/lib/rpm/brp-compress ] && /usr/lib/rpm/brp-compress + +find $RPM_BUILD_ROOT \( -name perllocal.pod -o -name .packlist \) -exec rm -v {} \; + +find $RPM_BUILD_ROOT/usr -type f -print | + sed "s@^$RPM_BUILD_ROOT@@g" | + grep -v perllocal.pod | + grep -v "\.packlist" > XML-Parser-%{version}-filelist +if [ "$(cat XML-Parser-%{version}-filelist)X" = "X" ] ; then + echo "ERROR: EMPTY FILE LIST" + exit -1 +fi + +%files -f XML-Parser-%{version}-filelist +%defattr(-,root,root) +%dir %{_libdir}/perl5/vendor_perl/%(perl -MConfig -le 'print "$Config{version}/$Config{archname}"')/XML/Parser +%dir %{_libdir}/perl5/vendor_perl/%(perl -MConfig -le 'print "$Config{version}/$Config{archname}"')/auto/XML/Parser + +%changelog +* Tue Mar 02 2004 Elliot Lee +- rebuilt + +* Fri Feb 13 2004 Chip Turner 2.34-1 +- update to 2.34 + +* Mon Jan 26 2004 Jeremy Katz 2.31-17 +- more rebuilding + +* Mon Jan 19 2004 Chip Turner 2.31-16 +- rebuild for newer perl + +* Mon Jan 27 2003 Chip Turner +- version bump and rebuild + +* Tue Aug 6 2002 Chip Turner +- automated release bump and build + +* Thu Jun 27 2002 Chip Turner +- description update + +* Tue Jun 4 2002 Chip Turner +- properly claim directories owned by package so they are removed when package is removed + +* Wed Jan 09 2002 Tim Powers +- automated rebuild + +* Fri Dec 7 2001 root +- Spec file was autogenerated. From svn at tinysofa.org Thu Jul 1 15:39:45 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:39:45 +1000 (EST) Subject: [tinysofa-svn] r2631 - in tinysofa/snapshot: . perl-SGMLSpm perl-SGMLSpm/current perl-SGMLSpm/current/sources perl-SGMLSpm/current/specs Message-ID: <20040701153945.A90004E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:39:45 +1000 (Fri, 02 Jul 2004) New Revision: 2631 Added: tinysofa/snapshot/perl-SGMLSpm/ tinysofa/snapshot/perl-SGMLSpm/current/ tinysofa/snapshot/perl-SGMLSpm/current/sources/ tinysofa/snapshot/perl-SGMLSpm/current/sources/SGMLSpm-1.03ii.tar.gz tinysofa/snapshot/perl-SGMLSpm/current/specs/ tinysofa/snapshot/perl-SGMLSpm/current/specs/perl-SGMLSpm.spec Log: - Add perl-SGMLSpm to snapshot from 2.0. Added: tinysofa/snapshot/perl-SGMLSpm/current/sources/SGMLSpm-1.03ii.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/perl-SGMLSpm/current/sources/SGMLSpm-1.03ii.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/perl-SGMLSpm/current/specs/perl-SGMLSpm.spec =================================================================== --- tinysofa/snapshot/perl-SGMLSpm/current/specs/perl-SGMLSpm.spec 2004-07-01 15:39:44 UTC (rev 2630) +++ tinysofa/snapshot/perl-SGMLSpm/current/specs/perl-SGMLSpm.spec 2004-07-01 15:39:45 UTC (rev 2631) @@ -0,0 +1,97 @@ +%define _use_internal_dependency_generator 0 + +%define Name perl-SGMLSpm +%define Version 1.03ii +%define perldir %(perl -V:installvendorlib | sed 's/^installvendorlib=.\\(.*\\).;$/\\1/') + +Name : %{Name} +Version : %{Version} +Release : 13ts +Group : Applications/Text + +Summary : Perl library for parsing the output of nsgmls. + +License : GPL +URL : http://www.megginson.com/Software/ + +Requires : openjade +Requires : perl >= 5 + +BuildRoot : %{_tmppath}/%{name}-%{version}-root + +BuildArch : noarch +Source0 : ftp://cpan.perl.org/pub/perl/CPAN/modules/by-module/SGMLS/SGMLSpm-%{Version}.tar.gz + + +%Description +Perl programs can use the SGMLSpm module to help convert SGML, HTML or XML +documents into new formats. + + +%Prep +%setup -n SGMLSpm + + +%Build + + +%Install +DESTDIR=$RPM_BUILD_ROOT +rm -rf $DESTDIR +mkdir -p $DESTDIR/usr/bin +mkdir -p $DESTDIR/%{perldir} +make install_system BINDIR=${DESTDIR}/usr/bin PERL5DIR=${DESTDIR}/%{perldir} + + +%Clean +DESTDIR=$RPM_BUILD_ROOT +rm -rf $DESTDIR + + +%Files +%defattr (-,root,root) +%doc BUGS COPYING ChangeLog DOC/ README TODO elisp +/usr/bin/sgmlspl +%{perldir} + + +%changelog +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Wed May 28 2003 Tim Waugh 1.03ii-12 +- Use vendorlib not sitelib (bug #73493). +- Own %%{perldir}/SGMLS (bug #73922). + +* Tue Jan 28 2003 Tim Waugh 1.03ii-11 +- Rebuilt. + +* Wed Jan 22 2003 Tim Powers +- rebuilt + +* Sat Dec 14 2002 Tim Powers +- don't use rpms internal dep generator + +* Mon Nov 25 2002 Tim Waugh 1.03ii-9 +- Fix URL (bug #71895). + +* Mon Nov 25 2002 Tim Waugh 1.03ii-8 +- Rebuild to get automatic provides: right. + +* Wed Nov 20 2002 Tim Powers 1.03ii-7 +- rebuild in current collinst + +* Mon Jun 17 2002 Tim Waugh 1.03ii-6 +- Rebuild in new environment. + +* Sun Jan 14 2001 Tim Waugh 1.03ii-5 +- Add defattr to files section. + +* Mon Jan 08 2001 Tim Waugh +- Change group. +- rm before install. +- Change Copyright: to License:. +- Remove Packager: line. + +* Mon Jan 08 2001 Tim Waugh +- Based on Eric Bischoff's new-trials packages. From svn at tinysofa.org Thu Jul 1 15:45:56 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:45:56 +1000 (EST) Subject: [tinysofa-svn] r2729 - tinysofa/snapshot/dev86/current/specs Message-ID: <20040701154556.B934C4E817D@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:45:56 +1000 (Fri, 02 Jul 2004) New Revision: 2729 Modified: tinysofa/snapshot/dev86/current/specs/dev86.spec Log: - Sync with 2.0. - Kept: - Dev86src-0.16.15.tar.gz: Modified: tinysofa/snapshot/dev86/current/specs/dev86.spec =================================================================== --- tinysofa/snapshot/dev86/current/specs/dev86.spec 2004-07-01 15:45:54 UTC (rev 2728) +++ tinysofa/snapshot/dev86/current/specs/dev86.spec 2004-07-01 15:45:56 UTC (rev 2729) @@ -1,15 +1,15 @@ Summary: A real mode 80x86 assembler and linker. Name: dev86 Version: 0.16.15 -Release: 1jh -License: GPL -Group: tinysofa official +Release: 1ts +Copyright: GPL +Group: Development/Languages Source: http://www.cix.co.uk/~mayday/Dev86src-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-root +Buildroot: %{_tmppath}/%{name}-%{version}-root Obsoletes: bin86 -ExclusiveArch: i386 i586 +ExclusiveArch: i386 -%define __os_install_post /usr/lib/rpm/brp-compress /usr/lib/rpm/brp-strip %{__strip} /usr/lib/rpm/brp-strip-comment-note %{__strip} %{__objdump} %{nil} +%define __os_install_post /usr/lib/rpm/tinysofa/brp-compress /usr/lib/rpm/tinysofa/brp-strip %{__strip} /usr/lib/rpm/tinysofa/brp-strip-comment-note %{__strip} %{__objdump} %{nil} %description The dev86 package provides an assembler and linker for real mode 80x86 @@ -24,22 +24,18 @@ %setup -q %build -make config CFLAGS="$RPM_OPT_FLAGS" << __EOF__ +make < 0.16.5-1jh -- new upstream -- spec file cleanup -- include more README files to documentation -- remove source files from doc directory +* Fri Feb 20 2004 Thomas Woerner 0.16.15-1 +- new version 0.16.15 -* Wed May 19 2004 tsintegrate 0.16.0-13ts -- current (0.16.0-12ts) integrated as 0.16.0-13ts for release 1.0-U1 +* Wed Feb 18 2004 Jeremy Katz - 0.16.3-10 +- rebuild -* Thu May 13 2004 Jaakko Heinonen -- added dev86-nonroot.patch to make it build as non-root +* Thu May 22 2003 Jeremy Katz 0.16.3-9 +- preserve README files with separate names -* Mon Dec 15 2003 Erlend Midttun 0.16.0-9tr -- Big rebuild +* Fri Jan 31 2003 Florian La Roche +- do not strip static archive to get rebuild working again -* Wed Jun 18 2003 Erlend Midttun 0.16.0-8tr -- Big rebuild +* Wed Jan 22 2003 Tim Powers +- rebuilt -* Thu Jun 5 2003 Erlend Midttun 0.16.0-7em -- Fixed file/directory ownership conflict. +* Thu Dec 12 2002 Tim Powers 0.16.3-6 +- rebuild -* Mon May 26 2003 Erlend Midttun 0.16.0-6em -- fileutils -> coreutils. +* Thu Nov 14 2002 Jakub Jelinek +- fix ar86 to include errno.h before using errno. -* Wed Apr 9 2003 Gerald Dachs 0.16.0-5gd -- Added PreReq on fileutils +* Sat Aug 10 2002 Florian La Roche +- add ar86 to filelist -* Wed Mar 26 2003 Christian H. Toldnes 0.16.0-4ct -- Rebuilt against glibc 2.3.2. +* Fri Jun 21 2002 Tim Powers +- automated rebuild -* Thu Jun 12 2001 Erlend Midttun -- Cleaned up a little. +* Wed Jun 19 2002 Florian La Roche +- do not strip apps -* Fri Jun 1 2001 Oystein Viggen -- New upstream version: 0.16.0 +* Mon May 27 2002 Florian La Roche +- update to 0.16.3 +- fix include paths +- clean up spec file -* Mon Mar 5 2001 Alexander Reelsen -- Picked up 0.15.4 +* Thu May 23 2002 Tim Powers +- automated rebuild -* Fri Sep 15 2000 Oystein Viggen -- Use optflags and build .i586.rpm +* Wed Jan 09 2002 Tim Powers +- automated rebuild +* Mon May 7 2001 Bernhard Rosenkraenzer 0.15.5-1 +- Update to 0.15.5, lots of fixes + * Wed Jul 12 2000 Prospector - automatic rebuild @@ -145,3 +143,4 @@ double. E.g. /usr/bcc/include/arch is also installed under /usr/bcc/include/arch/arch. This doesn't hinder operation, just eats a tiny bit of diskspace. + From svn at tinysofa.org Thu Jul 1 15:46:06 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:46:06 +1000 (EST) Subject: [tinysofa-svn] r2732 - in tinysofa/snapshot/dietlibc/current: sources specs Message-ID: <20040701154606.3EAFD4E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:46:05 +1000 (Fri, 02 Jul 2004) New Revision: 2732 Added: tinysofa/snapshot/dietlibc/current/sources/dietlibc-0.21-features.patch tinysofa/snapshot/dietlibc/current/sources/dietlibc-0.21-ppc64asppc.patch tinysofa/snapshot/dietlibc/current/sources/dietlibc-0.24-gnuokay.patch tinysofa/snapshot/dietlibc/current/sources/dietlibc-0.25-old-qsort.patch tinysofa/snapshot/dietlibc/current/sources/dietlibc-0.26-config.patch tinysofa/snapshot/dietlibc/current/sources/dietlibc-0.26.tar.bz2 Removed: tinysofa/snapshot/dietlibc/current/sources/dietlibc-0.20-features.patch tinysofa/snapshot/dietlibc/current/sources/dietlibc-0.21-permission.patch tinysofa/snapshot/dietlibc/current/sources/dietlibc-0.25-config.patch tinysofa/snapshot/dietlibc/current/sources/dietlibc-0.25.tar.bz2 Modified: tinysofa/snapshot/dietlibc/current/specs/dietlibc.spec Log: - Sync with 2.0. - Added: - dietlibc-0.21-features.patch: - dietlibc-0.21-ppc64asppc.patch: - dietlibc-0.24-gnuokay.patch: - dietlibc-0.25-old-qsort.patch: - dietlibc-0.26-config.patch: - dietlibc-0.26.tar.bz2: - Removed: - dietlibc-0.20-features.patch: - dietlibc-0.21-permission.patch: - dietlibc-0.25-config.patch: - dietlibc-0.25.tar.bz2: Deleted: tinysofa/snapshot/dietlibc/current/sources/dietlibc-0.20-features.patch =================================================================== --- tinysofa/snapshot/dietlibc/current/sources/dietlibc-0.20-features.patch 2004-07-01 15:46:02 UTC (rev 2731) +++ tinysofa/snapshot/dietlibc/current/sources/dietlibc-0.20-features.patch 2004-07-01 15:46:05 UTC (rev 2732) @@ -1,20 +0,0 @@ ---- dietlibc-0.20/dietfeatures.h.features Wed Jul 3 00:04:14 2002 -+++ dietlibc-0.20/dietfeatures.h Fri Aug 30 17:06:42 2002 -@@ -37,7 +37,7 @@ - /* read the comment in lib/strncat.c for an explanation */ - /* #define WANT_NON_COMPLIANT_STRNCAT */ - --#define WANT_LINKER_WARNINGS -+#undef WANT_LINKER_WARNINGS - - /* you need to define this if you want to run your programs with large - * file support on kernel 2.2 or 2.0 */ -@@ -69,7 +69,7 @@ - - /* do you want diet to include a safeguard dependency to make linking - * against glibc fail? This may fail with older binutils. */ --#define WANT_SAFEGUARD -+#undef WANT_SAFEGUARD - - /* dy you want that malloc(0) return a pointer to a "zero-length" object - * that is realloc-able; means realloc(..,size) gives a NEW object (like a Added: tinysofa/snapshot/dietlibc/current/sources/dietlibc-0.21-features.patch =================================================================== --- tinysofa/snapshot/dietlibc/current/sources/dietlibc-0.21-features.patch 2004-07-01 15:46:02 UTC (rev 2731) +++ tinysofa/snapshot/dietlibc/current/sources/dietlibc-0.21-features.patch 2004-07-01 15:46:05 UTC (rev 2732) @@ -0,0 +1,43 @@ +--- dietlibc-0.21/dietfeatures.h.features 2002-08-19 05:01:50.000000000 -0400 ++++ dietlibc-0.21/dietfeatures.h 2002-11-01 16:19:42.000000000 -0500 +@@ -37,11 +37,11 @@ + /* read the comment in lib/strncat.c for an explanation */ + /* #define WANT_NON_COMPLIANT_STRNCAT */ + +-#define WANT_LINKER_WARNINGS ++#undef WANT_LINKER_WARNINGS + + /* you need to define this if you want to run your programs with large + * file support on kernel 2.2 or 2.0 */ +-#define WANT_LARGEFILE_BACKCOMPAT ++#undef WANT_LARGEFILE_BACKCOMPAT + + /* do you want localtime(3) to read /etc/localtime? + * Needed for daylight saving time etc. */ +@@ -53,7 +53,7 @@ + #define WANT_FULL_RESOLV_CONF + + /* do you want IPv6 transport support in the DNS resolver? */ +-#define WANT_IPV6_DNS ++#undef WANT_IPV6_DNS + + /* do you want gethostbyname and friends to consult /etc/hosts? */ + #define WANT_ETC_HOSTS +@@ -63,7 +63,7 @@ + #define WANT_INET_ADDR_DNS + + /* do you want math functions high precision rather than fast/small? */ +-#define WANT_HIGH_PRECISION_MATH ++#undef WANT_HIGH_PRECISION_MATH + + /* do you want support for matherr? */ + #define WANT_MATHERR +@@ -73,7 +73,7 @@ + + /* do you want diet to include a safeguard dependency to make linking + * against glibc fail? This may fail with older binutils. */ +-#define WANT_SAFEGUARD ++#undef WANT_SAFEGUARD + + /* dy you want that malloc(0) return a pointer to a "zero-length" object + * that is realloc-able; means realloc(..,size) gives a NEW object (like a Deleted: tinysofa/snapshot/dietlibc/current/sources/dietlibc-0.21-permission.patch =================================================================== --- tinysofa/snapshot/dietlibc/current/sources/dietlibc-0.21-permission.patch 2004-07-01 15:46:02 UTC (rev 2731) +++ tinysofa/snapshot/dietlibc/current/sources/dietlibc-0.21-permission.patch 2004-07-01 15:46:05 UTC (rev 2732) @@ -1,20 +0,0 @@ ---- dietlibc-0.21/Makefile.permission 2002-10-05 14:19:14.000000000 +0200 -+++ dietlibc-0.21/Makefile 2002-10-05 14:22:19.000000000 +0200 -@@ -315,7 +315,7 @@ - - install: $(OBJDIR)/start.o $(OBJDIR)/dietlibc.a $(OBJDIR)/librpc.a $(OBJDIR)/liblatin1.a $(OBJDIR)/libcompat.a $(OBJDIR)/elftrunc $(OBJDIR)/diet-i - $(INSTALL) -d $(DESTDIR)$(ILIBDIR) $(DESTDIR)$(MAN1DIR) $(DESTDIR)$(BINDIR) -- $(INSTALL) $(OBJDIR)/start.o $(DESTDIR)$(ILIBDIR)/start.o -+ $(INSTALL) -m 644 $(OBJDIR)/start.o $(DESTDIR)$(ILIBDIR)/start.o - $(INSTALL) -m 644 $(OBJDIR)/libm.a $(OBJDIR)/libpthread.a $(OBJDIR)/librpc.a \ - $(OBJDIR)/liblatin1.a $(OBJDIR)/libcompat.a $(DESTDIR)$(ILIBDIR) - $(INSTALL) -m 644 $(OBJDIR)/dietlibc.a $(DESTDIR)$(ILIBDIR)/libc.a -@@ -323,7 +323,7 @@ - $(INSTALL) $(OBJDIR)/diet-i $(DESTDIR)$(BINDIR)/diet - -$(INSTALL) $(PICODIR)/diet-dyn-i $(DESTDIR)$(BINDIR)/diet-dyn - endif -- -$(INSTALL) $(OBJDIR)/pstart.o $(OBJDIR)/libgmon.a $(OBJDIR)/dyn_start.o $(OBJDIR)/dyn_stop.o $(DESTDIR)$(ILIBDIR) -+ -$(INSTALL) -m 644 $(OBJDIR)/pstart.o $(OBJDIR)/libgmon.a $(OBJDIR)/dyn_start.o $(OBJDIR)/dyn_stop.o $(DESTDIR)$(ILIBDIR) - -$(INSTALL) $(PICODIR)/libc.so $(DESTDIR)$(ILIBDIR)/libc.so - -$(INSTALL) $(PICODIR)/libpthread.so $(DESTDIR)$(ILIBDIR)/libpthread.so - -$(INSTALL) $(PICODIR)/libdl.so $(DESTDIR)$(ILIBDIR)/libdl.so Added: tinysofa/snapshot/dietlibc/current/sources/dietlibc-0.21-ppc64asppc.patch =================================================================== --- tinysofa/snapshot/dietlibc/current/sources/dietlibc-0.21-ppc64asppc.patch 2004-07-01 15:46:02 UTC (rev 2731) +++ tinysofa/snapshot/dietlibc/current/sources/dietlibc-0.21-ppc64asppc.patch 2004-07-01 15:46:05 UTC (rev 2732) @@ -0,0 +1,11 @@ +--- dietlibc-0.21/Makefile.ppc 2002-11-01 16:24:26.000000000 -0500 ++++ dietlibc-0.21/Makefile 2002-11-01 16:25:06.000000000 -0500 +@@ -9,7 +9,7 @@ + MAN1DIR=${prefix}/share/man/man1 + INSTALLHOME=$(prefix)/lib/dietlibc + +-MYARCH:=$(shell uname -m | sed -e 's/i[4-9]86/i386/' -e 's/armv[3-6][lb]/arm/') ++MYARCH:=$(shell uname -m | sed -e 's/i[4-9]86/i386/' -e 's/armv[3-6][lb]/arm/' -e 's/ppc64/ppc/') + + # This extra-ugly cruft is here so make will not run uname and sed each + # time it looks at $(OBJDIR). This alone sped up running make when Added: tinysofa/snapshot/dietlibc/current/sources/dietlibc-0.24-gnuokay.patch =================================================================== --- tinysofa/snapshot/dietlibc/current/sources/dietlibc-0.24-gnuokay.patch 2004-07-01 15:46:02 UTC (rev 2731) +++ tinysofa/snapshot/dietlibc/current/sources/dietlibc-0.24-gnuokay.patch 2004-07-01 15:46:05 UTC (rev 2732) @@ -0,0 +1,12 @@ +--- dietlibc-0.24/include/byteswap.h.gnu 2003-12-22 18:19:49.205504491 -0500 ++++ dietlibc-0.24/include/byteswap.h 2003-12-22 18:19:59.997994713 -0500 +@@ -1,7 +1,9 @@ + #ifndef _BYTESWAP_H + #define _BYTESWAP_H + ++#if 0 + #warning "byteswap.h is an unportable GNU extension! Don't use!" ++#endif + + static inline unsigned short bswap_16(unsigned short x) { + return (x>>8) | (x<<8); Deleted: tinysofa/snapshot/dietlibc/current/sources/dietlibc-0.25-config.patch =================================================================== --- tinysofa/snapshot/dietlibc/current/sources/dietlibc-0.25-config.patch 2004-07-01 15:46:02 UTC (rev 2731) +++ tinysofa/snapshot/dietlibc/current/sources/dietlibc-0.25-config.patch 2004-07-01 15:46:05 UTC (rev 2732) @@ -1,55 +0,0 @@ -diff -urN dietlibc-0.25/Makefile dietlibc-0.25.tinysofa/Makefile ---- dietlibc-0.25/Makefile 2004-03-27 02:28:44.000000000 +1100 -+++ dietlibc-0.25.tinysofa/Makefile 2004-03-29 10:36:07.000000000 +1000 -@@ -1,12 +1,13 @@ - INSTALL=install --prefix?=/opt/diet -+prefix?=/usr - # Set the following to install to a different root - #DESTDIR=/tmp/fefix - # Use "make DEBUG=1" to compile a debug version. - - LIBDIR=${prefix}/lib - BINDIR=${prefix}/bin --MAN1DIR=${prefix}/man/man1 -+MAN1DIR=${prefix}/share/man/man1 -+INSTALLHOME=$(prefix)/lib/dietlibc - - MYARCH:=$(shell uname -m | sed -e 's/i[4-9]86/i386/' -e 's/armv[3-6][lb]/arm/') - -@@ -80,7 +81,7 @@ - # ARCH=$(MYARCH) - - OBJDIR=bin-$(ARCH) --ILIBDIR=$(LIBDIR)-$(ARCH) -+ILIBDIR=$(INSTALLHOME)/lib-$(ARCH) - - HOME=$(shell pwd) - -@@ -264,7 +265,7 @@ - $(CROSS)strip -R .comment -R .note $@ - - $(OBJDIR)/diet-i: $(OBJDIR)/start.o $(OBJDIR)/dyn_start.o diet.c $(OBJDIR)/dietlibc.a $(OBJDIR)/dyn_stop.o -- $(CROSS)$(CC) -Iinclude $(CFLAGS) -nostdlib -o $@ $^ -DDIETHOME=\"$(prefix)\" -DVERSION=\"$(VERSION)\" -DINSTALLVERSION -lgcc -+ $(CROSS)$(CC) -Iinclude $(CFLAGS) -nostdlib -o $@ $^ -DDIETHOME=\"$(INSTALLHOME)\" -DVERSION=\"$(VERSION)\" -DINSTALLVERSION -lgcc - $(CROSS)strip -R .comment -R .note $@ - - $(PICODIR)/diet-dyn: $(PICODIR)/start.o $(PICODIR)/dyn_start.o diet.c -@@ -272,7 +273,7 @@ - $(CROSS)strip -R .command -R .note $@ - - $(PICODIR)/diet-dyn-i: $(PICODIR)/start.o $(PICODIR)/dyn_start.o diet.c -- $(CROSS)$(CC) -Iinclude $(CFLAGS) -fPIC -nostdlib -o $@ $^ -DDIETHOME=\"$(prefix)\" -D__DYN_LIB -DVERSION=\"$(VERSION)\" -L$(PICODIR) -lc -lgcc $(PICODIR)/dyn_stop.o -Wl,-dynamic-linker=$(ILIBDIR)/libdl.so -DINSTALLVERSION -+ $(CROSS)$(CC) -Iinclude $(CFLAGS) -fPIC -nostdlib -o $@ $^ -DDIETHOME=\"$(INSTALLHOME)\" -D__DYN_LIB -DVERSION=\"$(VERSION)\" -L$(PICODIR) -lc -lgcc $(PICODIR)/dyn_stop.o -Wl,-dynamic-linker=$(ILIBDIR)/libdl.so -DINSTALLVERSION - $(CROSS)strip -R .command -R .note $@ - - $(OBJDIR)/djb: $(OBJDIR)/compile $(OBJDIR)/load -@@ -328,7 +329,7 @@ - -$(INSTALL) $(PICODIR)/dstart.o $(PICODIR)/dyn_so_start.o $(DESTDIR)$(ILIBDIR) - $(INSTALL) -m 644 diet.1 $(DESTDIR)$(MAN1DIR)/diet.1 - if test -f $(PICODIR)/libc.so -a ! -f $(DESTDIR)/etc/diet.ld.conf; then echo "$(ILIBDIR)" > $(DESTDIR)/etc/diet.ld.conf; fi -- for i in `find include -name \*.h`; do install -m 644 -D $$i $(DESTDIR)$(prefix)/$$i; done -+ for i in `find include -name \*.h`; do install -m 644 -D $$i $(DESTDIR)$(prefix)/lib/dietlibc/$$i; done - - .PHONY: sparc ppc mips arm alpha i386 parisc mipsel powerpc s390 sparc64 - .PHONY: x86_64 ia64 Added: tinysofa/snapshot/dietlibc/current/sources/dietlibc-0.25-old-qsort.patch =================================================================== --- tinysofa/snapshot/dietlibc/current/sources/dietlibc-0.25-old-qsort.patch 2004-07-01 15:46:02 UTC (rev 2731) +++ tinysofa/snapshot/dietlibc/current/sources/dietlibc-0.25-old-qsort.patch 2004-07-01 15:46:05 UTC (rev 2732) @@ -0,0 +1,11 @@ +--- dietlibc-0.25/lib/qsort.c.slow 2004-06-07 16:31:13.748893968 -0400 ++++ dietlibc-0.25/lib/qsort.c 2004-06-07 16:31:19.963949136 -0400 +@@ -48,7 +48,7 @@ + } + } + +-#if OLD_AND_SLOW_FOR_MAKE ++#if 1 + void qsort(void *base, size_t nmemb, size_t size, int (*compar)(const void *, const void *)) { + #ifdef DEBUG + char *dbase=base; Deleted: tinysofa/snapshot/dietlibc/current/sources/dietlibc-0.25.tar.bz2 =================================================================== (Binary files differ) Added: tinysofa/snapshot/dietlibc/current/sources/dietlibc-0.26-config.patch =================================================================== --- tinysofa/snapshot/dietlibc/current/sources/dietlibc-0.26-config.patch 2004-07-01 15:46:02 UTC (rev 2731) +++ tinysofa/snapshot/dietlibc/current/sources/dietlibc-0.26-config.patch 2004-07-01 15:46:05 UTC (rev 2732) @@ -0,0 +1,45 @@ +--- dietlibc-0.26/Makefile.config 2004-05-11 08:48:16.000000000 -0400 ++++ dietlibc-0.26/Makefile 2004-06-18 17:02:29.320497272 -0400 +@@ -1,12 +1,13 @@ + INSTALL=install +-prefix?=/opt/diet ++prefix?=/usr + # Set the following to install to a different root + #DESTDIR=/tmp/fefix + # Use "make DEBUG=1" to compile a debug version. + + LIBDIR=${prefix}/lib + BINDIR=${prefix}/bin +-MAN1DIR=${prefix}/man/man1 ++MAN1DIR=${prefix}/share/man/man1 ++INSTALLHOME=$(prefix)/lib/dietlibc + + MYARCH:=$(shell uname -m | sed -e 's/i[4-9]86/i386/' -e 's/armv[3-6][lb]/arm/') + +@@ -80,7 +81,7 @@ + # ARCH=$(MYARCH) + + OBJDIR=bin-$(ARCH) +-ILIBDIR=$(LIBDIR)-$(ARCH) ++ILIBDIR=$(INSTALLHOME)/lib-$(ARCH) + + HOME=$(shell pwd) + +@@ -273,7 +274,7 @@ + $(CROSS)strip -R .comment -R .note $@ + + $(OBJDIR)/diet-i: $(OBJDIR)/start.o $(OBJDIR)/dyn_start.o diet.c $(OBJDIR)/dietlibc.a $(OBJDIR)/dyn_stop.o +- $(CROSS)$(CC) -isystem include $(CFLAGS) -nostdlib -o $@ $^ -DDIETHOME=\"$(prefix)\" -DVERSION=\"$(VERSION)\" -DINSTALLVERSION -lgcc ++ $(CROSS)$(CC) -isystem include $(CFLAGS) -nostdlib -o $@ $^ -DDIETHOME=\"$(INSTALLHOME)\" -DVERSION=\"$(VERSION)\" -DINSTALLVERSION -lgcc + $(CROSS)strip -R .comment -R .note $@ + + $(PICODIR)/diet-dyn: $(PICODIR)/start.o $(PICODIR)/dyn_start.o diet.c +@@ -337,7 +338,7 @@ + -$(INSTALL) $(PICODIR)/dstart.o $(PICODIR)/dyn_so_start.o $(DESTDIR)$(ILIBDIR) + $(INSTALL) -m 644 diet.1 $(DESTDIR)$(MAN1DIR)/diet.1 + if test -f $(PICODIR)/libc.so -a ! -f $(DESTDIR)/etc/diet.ld.conf; then echo "$(ILIBDIR)" > $(DESTDIR)/etc/diet.ld.conf; fi +- for i in `find include -name \*.h`; do install -m 644 -D $$i $(DESTDIR)$(prefix)/$$i; done ++ for i in `find include -name \*.h`; do install -m 644 -D $$i $(DESTDIR)$(prefix)/lib/dietlibc/$$i; done + + uninstall: + for i in start.o libm.a libpthread.a librpc.a liblatin1.a libcompat.a libcrypt.a libc.a; do rm -f $(DESTDIR)$(ILIBDIR)/$$i; done Added: tinysofa/snapshot/dietlibc/current/sources/dietlibc-0.26.tar.bz2 =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/dietlibc/current/sources/dietlibc-0.26.tar.bz2 ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: tinysofa/snapshot/dietlibc/current/specs/dietlibc.spec =================================================================== --- tinysofa/snapshot/dietlibc/current/specs/dietlibc.spec 2004-07-01 15:46:02 UTC (rev 2731) +++ tinysofa/snapshot/dietlibc/current/specs/dietlibc.spec 2004-07-01 15:46:05 UTC (rev 2732) @@ -1,15 +1,20 @@ +%define __os_install_post /usr/lib/rpm/brp-compress + +ExclusiveArch: i386 Summary: A small libc implementation Name: dietlibc -Version: 0.25 +Version: 0.26 Release: 2ts -Group: tinysofa official +Group: Development/Libraries License: GPL Url: http://www.fefe.de/dietlibc/ -Source: http://www.kernel.org/pub/linux/libs/dietlibc/%{name}-%{version}.tar.bz2 -BuildRoot: %{_tmppath}/%{name}-root -Patch0: dietlibc-0.20-features.patch -Patch1: dietlibc-0.25-config.patch -Patch2: dietlibc-0.21-permission.patch +Source0: %{name}-%{version}.tar.bz2 +BuildRoot: %{_tmppath}/%{name}-%{version}-root +Patch0: dietlibc-0.21-features.patch +Patch1: dietlibc-0.26-config.patch +Patch2: dietlibc-0.21-ppc64asppc.patch +Patch3: dietlibc-0.24-gnuokay.patch +Patch4: dietlibc-0.25-old-qsort.patch %description A small libc implementation @@ -19,59 +24,102 @@ %setup -q %patch0 -p1 -b .features %patch1 -p1 -b .config -%patch2 -p1 -b .permission +%patch2 -p1 -b .ppc +%patch3 -p1 -b .gnuokay +%patch4 -p1 -b .oldqsort %build -# bleah, the asm version is broken -rm -f i386/getenv.S +make -make CFLAGS="-pipe -nostdinc -fomit-frame-pointer -falign-functions=0 -falign-jumps=0 -falign-loops=0 -mpreferred-stack-boundary=2 %{?no_stack_protector}" - %install -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf "$RPM_BUILD_ROOT" +rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install %clean -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf "$RPM_BUILD_ROOT" +rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) %doc AUTHOR BUGS CAVEAT CHANGES README THANKS TODO /usr/bin/diet -/usr/lib/dietlibc/ +/usr/lib/dietlibc %{_mandir}/man*/* %changelog -* Wed May 19 2004 tsintegrate 0.25-2ts -- current (0.25-1ts) integrated as 0.25-2ts for release 1.0-U1 +* Fri Jun 18 2004 Jeremy Katz - 0.26-2 +- fix up config patch for 0.26 -* Mon Mar 29 2004 Omar Kilani 0.25-1ts -- new upstream. +* Fri Jun 18 2004 Jeremy Katz - 0.26-1 +- update to 0.26, fixes build with gcc 3.4 -* Mon Jan 26 2004 Oystein Viggen 0.21-6ov -- does not build with the stack protector enabled +* Tue Jun 15 2004 Elliot Lee +- rebuilt -* Mon Dec 15 2003 Erlend Midttun 0.21-5tr -- Big rebuild +* Mon Jun 7 2004 Jeremy Katz - 0.25-2 +- use old qsort implementation, it was faster for our purposes -* Wed Jun 18 2003 Erlend Midttun 0.21-4tr -- Big rebuild +* Wed May 26 2004 Jeremy Katz - 0.25-1 +- update to 0.25 -* Mon Mar 24 2003 Erlend Midttun 0.21-3em -- Rebuilt against glibc 2.3.2. +* Thu Mar 4 2004 Jeremy Katz - 0.24-4 +- don't strip to avoid segfaulting binaries (#117006) -* Sat Feb 01 2003 Tor Hveem 0.21-2th -- Fixed package Group +* Fri Feb 13 2004 Elliot Lee +- rebuilt -* Sat Oct 5 2002 Gerald Dachs 0.21-1gd -- new upstream version +* Sun Jan 4 2004 Jeremy Katz 0.24-2 +- snprintf fix from cvs -* Fri Aug 30 2002 Gerald Dachs 0.20-1gd -- new upstream version +* Mon Dec 22 2003 Jeremy Katz 0.24-1 +- update to 0.24 +- clean up patch list +- add patch to not have a warning on "#include " since, eg, + linux/cdrom.h includes it -* Mon Jun 3 2002 Gerald Dachs -- new for trustix, need by mkinitrd +* Tue Sep 16 2003 Jeremy Katz 0.21-8 +- rebuild +* Tue Sep 16 2003 Jeremy Katz 0.21-7 +- add patch to fix udp timeouts (#104345) + +* Mon Jul 7 2003 Jeremy Katz 0.21-6 +- rebuild + +* Mon Jul 7 2003 Jeremy Katz 0.21-5 +- pull back patch to not ifdef string.h prototypes to clean up warnings + +* Mon Feb 3 2003 Jeremy Katz 0.21-4 +- i386 only + +* Wed Jan 22 2003 Tim Powers +- rebuilt + +* Tue Nov 19 2002 Bill Nottingham +- use the right elf definition for hammer + +* Fri Nov 1 2002 Jeremy Katz +- update to 0.21 +- stop applying patches already upstream +- i386 optimized getenv should work now + +* Tue Oct 22 2002 Jeremy Katz +- also build on alpha, x86_64, and ppc +- add a patch so that the ppc64 kernel still builds for ppc + +* Tue Aug 13 2002 Jeremy Katz +- apply patch to fix fwrite with empty strings from upstream cvs + +* Fri Aug 9 2002 Jeremy Katz +- apply patch to fix calloc from upstream cvs + +* Fri Aug 9 2002 Jeremy Katz +- update to 0.19 +- __thread patch is present, so don't apply anymore + +* Wed Jul 10 2002 Erik Troan +- upgraded to 0.18 +- added patch to work around __thread being a gcc 3.1 keyword + * Thu May 23 2002 Tim Powers - automated rebuild @@ -101,4 +149,4 @@ - added fnmatch() fix * Fri Nov 09 2001 Erik Troan -- initial packaging \ No newline at end of file +- initial packaging From svn at tinysofa.org Thu Jul 1 15:46:03 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:46:03 +1000 (EST) Subject: [tinysofa-svn] r2731 - in tinysofa/snapshot/dialog/current: sources specs Message-ID: <20040701154603.11D674E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:46:02 +1000 (Fri, 02 Jul 2004) New Revision: 2731 Added: tinysofa/snapshot/dialog/current/sources/dialog-0.9b-20040606.tgz Removed: tinysofa/snapshot/dialog/current/sources/dialog-0.7-opt.patch tinysofa/snapshot/dialog/current/sources/dialog-0.7.tar.gz Modified: tinysofa/snapshot/dialog/current/specs/dialog.spec Log: - Sync with 2.0. - Added: - dialog-0.9b-20040606.tgz: - Removed: - dialog-0.7-opt.patch: - dialog-0.7.tar.gz: Deleted: tinysofa/snapshot/dialog/current/sources/dialog-0.7-opt.patch =================================================================== --- tinysofa/snapshot/dialog/current/sources/dialog-0.7-opt.patch 2004-07-01 15:46:00 UTC (rev 2730) +++ tinysofa/snapshot/dialog/current/sources/dialog-0.7-opt.patch 2004-07-01 15:46:02 UTC (rev 2731) @@ -1,12 +0,0 @@ -diff -urN dialog-0.7.orig/Makefile dialog-0.7/Makefile ---- dialog-0.7.orig/Makefile Fri Mar 16 10:15:06 2001 -+++ dialog-0.7/Makefile Fri Jun 1 15:35:10 2001 -@@ -24,7 +24,7 @@ - - CC = gcc - CPP = gcc -E --OPTIM = -O2 -Wall -Wstrict-prototypes -fomit-frame-pointer -pipe -g3 -+OPTIM = $(RPM_OPT_FLAGS) - #OPTIM = -O -Wall -Wstrict-prototypes -g -pipe - - # end of the configuration part Deleted: tinysofa/snapshot/dialog/current/sources/dialog-0.7.tar.gz =================================================================== (Binary files differ) Added: tinysofa/snapshot/dialog/current/sources/dialog-0.9b-20040606.tgz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/dialog/current/sources/dialog-0.9b-20040606.tgz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: tinysofa/snapshot/dialog/current/specs/dialog.spec =================================================================== --- tinysofa/snapshot/dialog/current/specs/dialog.spec 2004-07-01 15:46:00 UTC (rev 2730) +++ tinysofa/snapshot/dialog/current/specs/dialog.spec 2004-07-01 15:46:02 UTC (rev 2731) @@ -1,13 +1,14 @@ Summary: A utility for creating TTY dialog boxes. Name: dialog -Version: 0.7 -Release: 8ts +%define SubVersion 20040606 +Version: 0.9b.%{SubVersion} +Release: 1ts License: GPL -Group: tinysofa official -Source: ftp://AdvancedResearch.org/pub/vstemen/dialog-%{version}.tar.gz -Patch1: dialog-0.7-opt.patch -BuildRoot: %{_tmppath}/%{name}-root -BuildRequires: ncurses ncurses-devel +Group: Applications/System +URL: http://invisible-island.net/dialog/dialog.html +Source: ftp://invisible-island.net/dialog/dialog-0.9b-%{SubVersion}.tgz +BuildRoot: /var/tmp/dialog-root +BuildPreReq: ncurses-devel, gettext %description Dialog is a utility that allows you to show dialog boxes (containing @@ -19,57 +20,102 @@ Install dialog if you would like to create TTY dialog boxes. %prep -%setup -q -%patch1 -p1 -b .opt -#cd src -#make depend +%setup -q -n dialog-0.9b-%{SubVersion} %build -make RPM_OPT_FLAGS="$RPM_OPT_FLAGS" +%configure --enable-nls --with-ncursesw +make %install -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf "$RPM_BUILD_ROOT" -mkdir -p $RPM_BUILD_ROOT/usr/{bin,man/man1} -mkdir -p $RPM_BUILD_ROOT/usr/share/man/man1 +rm -rf $RPM_BUILD_ROOT +fgrep -l -r perl samples|xargs rm -f -make DESTDIR=$RPM_BUILD_ROOT install +%makeinstall +rm -f -cp -a $RPM_BUILD_ROOT/usr/man/* $RPM_BUILD_ROOT/usr/share/man -rm -rf $RPM_BUILD_ROOT/usr/man +%find_lang %name -strip $RPM_BUILD_ROOT/usr/bin/dialog - %clean -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf "$RPM_BUILD_ROOT" +rm -rf $RPM_BUILD_ROOT -%files +%files -f %{name}.lang %defattr(-,root,root) -%doc AUTHORS COPYING ChangeLog README samples -/usr/bin/dialog -%{_mandir}/man1/dialog* +%doc COPYING dialog.lsm README samples +%{_prefix}/bin/dialog +%{_mandir}/man1/dialog.* +#%{_datadir}/locale/*/LC_MESSAGES/dialog.mo %changelog -* Wed May 19 2004 tsintegrate 0.7-8ts -- current (0.7-7ts) integrated as 0.7-8ts for release 1.0-U1 +* Wed Jun 23 2004 Harald Hoyer 0.9b.20040606-1 +- new version 0.9b-20040606 +- new Version scheme -* Tue May 11 2004 Omar Kilani 0.7-7ts -- Add BuildRequires ncurses, ncurses-devel. +* Tue Jun 15 2004 Elliot Lee +- rebuilt -* Fri Dec 5 2003 Erlend Midttun 0.7-4tr -- Big rebuild +* Fri Feb 13 2004 Elliot Lee +- rebuilt -* Wed Jun 18 2003 Erlend Midttun 0.7-3tr -- Big rebuild +* Mon Dec 08 2003 Harald Hoyer 0.9b-20031207.1 +- version 20031207 -* Mon Mar 24 2003 Erlend Midttun 0.7-2em -- Rebuilt against glibc 2.3.2. +* Thu Nov 27 2003 Harald Hoyer 0.9b-20031126.1 +- version 20031126 -* Fri Jun 1 2001 Oystein Viggen -- New upstream version: 0.7 +* Mon Nov 24 2003 Harald Hoyer 0.9b-20031002.2 +- added gettext BuildReq (#109192) -* Mon Feb 28 2000 Lars Gaarden -- moved man pages to /usr/share/man, FHS +* Wed Oct 8 2003 Harald Hoyer 0.9b-20031002.1 +- version 20031002 +* Thu Sep 11 2003 Harald Hoyer 0.9b-20030910.1 +- new version 20030910 which also fixes #104236 + +* Tue Aug 12 2003 Harald Hoyer 0.9b-20020814.5 +- --with-ncursesw + +* Fri Aug 8 2003 Elliot Lee 0.9b-20020814.4 +- Rebuilt + +* Tue Jun 17 2003 Harald Hoyer 0.9b-20020814.3 +- rebuilt + +* Wed Jun 04 2003 Elliot Lee +- rebuilt + +* Thu Jan 23 2003 Tim Powers 0.9b-20020814.2 +- rebuild + +* Tue Nov 05 2002 Harald Hoyer 0.9b-20020814.1 +* Fri Jun 21 2002 Tim Powers +- automated rebuild + +* Sun May 26 2002 Tim Powers +- automated rebuild + +* Wed May 22 2002 Harald Hoyer 0.9b-20020519.1 +- update to dialog-0.9b-20020519 + +* Wed Jan 09 2002 Tim Powers +- automated rebuild + +* Mon Jun 18 2001 Harald Hoyer +- update to 20010527 +- added ncurses-devel dependency (#44733) +- removed perl dependency + +* Tue Jan 09 2001 Harald Hoyer +- update to 20001217 + +* Mon Aug 7 2000 Bill Nottingham +- fix one of the examples (#14073) + +* Wed Jul 12 2000 Prospector +- automatic rebuild + +* Wed Apr 5 2000 Bill Nottingham +- rebuild against current ncurses/readline + * Thu Feb 3 2000 Bill Nottingham - handle compressed man pages @@ -96,4 +142,4 @@ - built against new ncurses * Thu Jul 10 1997 Erik Troan -- built against glibc \ No newline at end of file +- built against glibc From svn at tinysofa.org Thu Jul 1 15:46:19 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:46:19 +1000 (EST) Subject: [tinysofa-svn] r2735 - in tinysofa/snapshot/dump/current: sources specs Message-ID: <20040701154619.AFE7D4E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:46:19 +1000 (Fri, 02 Jul 2004) New Revision: 2735 Added: tinysofa/snapshot/dump/current/sources/dump-0.4b33.tar.bz2 Removed: tinysofa/snapshot/dump/current/sources/dump-0.4b36.tar.gz Modified: tinysofa/snapshot/dump/current/specs/dump.spec Log: - Sync with 2.0. - Added: - dump-0.4b33.tar.bz2: - Removed: - dump-0.4b36.tar.gz: Added: tinysofa/snapshot/dump/current/sources/dump-0.4b33.tar.bz2 =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/dump/current/sources/dump-0.4b33.tar.bz2 ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: tinysofa/snapshot/dump/current/sources/dump-0.4b36.tar.gz =================================================================== (Binary files differ) Modified: tinysofa/snapshot/dump/current/specs/dump.spec =================================================================== --- tinysofa/snapshot/dump/current/specs/dump.spec 2004-07-01 15:46:16 UTC (rev 2734) +++ tinysofa/snapshot/dump/current/specs/dump.spec 2004-07-01 15:46:19 UTC (rev 2735) @@ -1,144 +1,324 @@ -Summary: Programs for backing up and restoring filesystems. +#!/bin/bash +%define _sbindir /sbin +# XXX --enable-kerberos needs krcmd +%define myoptions --enable-largefile --with-binmode=6755 --with-manowner=root --with-mangrp=root --with-manmode=0644 --with-dumpdates="%{_sysconfdir}/dumpdates" --enable-readline + +Summary: Programs for backing up and restoring ext2/ext3 filesystems. Name: dump -Version: 0.4b36 -Release: 1ts +Version: 0.4b33 +Release: 3ts License: BSD -Group: tinysofa official -Source: http://download.sourceforge.net/dump/dump-%{version}.tar.gz +Group: Applications/Archiving +URL: http://dump.sourceforge.net +Source: dump-%{version}.tar.bz2 + +BuildRoot: %{_tmppath}/%{name}-%{version}-root + +BuildPrereq: libtermcap-devel +BuildPrereq: e2fsprogs-devel >= 1.18, readline-devel >= 4.2 +BuildPrereq: zlib-devel +# This Prereq is now required because we only ship static binaries, and +# need to ensure the "disk" group is created before installation (#60461) +Prereq: setup Requires: rmt -BuildRequires: e2fsprogs >= 1.15, e2fsprogs-devel >= 1.15 -BuildRequires: libtermcap-devel, readline-devel -BuildRoot: %{_tmppath}/%{name}-root +Obsoletes: dump-static +Provides: dump-static %description -The dump package contains both dump and restore. Dump examines files in -a filesystem, determines which ones need to be backed up, and copies -those files to a specified disk, tape or other storage medium. The -restore command performs the inverse function of dump; it can restore a -full backup of a filesystem. Subsequent incremental backups can then be -layered on top of the full backup. Single files and directory subtrees -may also be restored from full or partial backups. +The dump package contains both dump and restore. Dump examines files +in a filesystem, determines which ones need to be backed up, and +copies those files to a specified disk, tape, or other storage medium. +The restore command performs the inverse function of dump; it can +restore a full backup of a filesystem. Subsequent incremental backups +can then be layered on top of the full backup. Single files and +directory subtrees may also be restored from full or partial backups. Install dump if you need a system for both backing up filesystems and restoring filesystems after backups. %package -n rmt Summary: Provides certain programs with access to remote tape devices. -Group: tinysofa official +Group: Applications/Archiving %description -n rmt The rmt utility provides remote access to tape devices for programs like dump (a filesystem backup program), restore (a program for -restoring files from a backup) and tar (an archiving program). +restoring files from a backup), and tar (an archiving program). %prep %setup -q +#%patch0 -p0 -b .dump-atomic-read-write - %build -%configure --with-binmode=0755 \ - --with-manowner=root \ - --with-mangrp=root \ - --with-manmode=0644 \ - --enable-rmt +%configure %{myoptions} --enable-static --enable-rmt --enable-qfa +#* Mon Aug 21 2000 Matt Wilson +#- don't use -O2 on alpha because of compiler ICE +%ifarch alpha +RPM_OPT_FLAGS=${RPM_OPT_FLAGS//-O2/} +%endif +make OPT="$RPM_OPT_FLAGS -Wall -Wpointer-arith -Wstrict-prototypes \ + -Wmissing-prototypes -Wno-char-subscripts" -make OPT="$RPM_OPT_FLAGS -Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes -Wno-char-subscripts" %install -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != "/" ] && rm -rf "$RPM_BUILD_ROOT" -mkdir -p $RPM_BUILD_ROOT/sbin -mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man8 +rm -rf %{buildroot} +mkdir -p %{buildroot}%{_sbindir} +mkdir -p %{buildroot}%{_mandir}/man8 -make install \ - SBINDIR=$RPM_BUILD_ROOT/sbin \ - MANDIR=${RPM_BUILD_ROOT}%{_mandir}/man8 \ - BINOWNER=$(id -un) \ - BINGRP=$(id -gn) \ - MANOWNER=$(id -un) \ - MANGRP=$(id -gn) +%makeinstall SBINDIR=%{buildroot}%{_sbindir} BINDIR=%{buildroot}%{_sbindir} MANDIR=%{buildroot}%{_mandir}/man8 BINOWNER=$(id -un) BINGRP=$(id -gn) MANOWNER=$(id -un) MANGRP=$(id -gn) -{ cd $RPM_BUILD_ROOT - strip ./sbin/* || : - ln -sf dump ./sbin/rdump - ln -sf restore ./sbin/rrestore - chmod ug-s ./sbin/rmt - mkdir -p ./etc - > ./etc/dumpdates - ln -sf ../sbin/rmt ./etc/rmt -} +pushd %{buildroot} + ln -sf dump .%{_sbindir}/rdump + ln -sf dump .%{_sbindir}/rdump.static + ln -sf dump .%{_sbindir}/dump.static + ln -sf restore .%{_sbindir}/rrestore + ln -sf restore .%{_sbindir}/rrestore.static + ln -sf restore .%{_sbindir}/restore.static + chmod ug-s .%{_sbindir}/rmt + mkdir -p .%{_sysconfdir} + > .%{_sysconfdir}/dumpdates + ln -sf ..%{_sbindir}/rmt .%{_sysconfdir}/rmt + strip %{buildroot}/sbin/* %{buildroot}/usr/sbin/* || : +popd %clean -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} %files %defattr(-,root,root) -%doc CHANGES COPYRIGHT KNOWNBUGS README THANKS TODO INSTALL dump.lsm -%attr(0664,root,disk) %config(noreplace) /etc/dumpdates -%attr(0755,root,tty) /sbin/dump +%doc CHANGES COPYRIGHT KNOWNBUGS MAINTAINERS README REPORTING-BUGS THANKS TODO +%doc dump.lsm +%attr(0664,root,disk) %config(noreplace) %{_sysconfdir}/dumpdates +%attr(0755,root,root) /sbin/dump /sbin/rdump -%attr(0755,root,tty) /sbin/restore +%attr(0755,root,root) /sbin/restore /sbin/rrestore -%{_mandir}/man8/dump.8* -%{_mandir}/man8/rdump.8* -%{_mandir}/man8/restore.8* -%{_mandir}/man8/rrestore.8* +/sbin/*.static +%{_mandir}/man8/dump.* +%{_mandir}/man8/rdump.* +%{_mandir}/man8/restore.* +%{_mandir}/man8/rrestore.* %files -n rmt %defattr(-,root,root) -%attr(0755,root,root) /sbin/rmt -/etc/rmt -%{_mandir}/man8/rmt.8* +%attr(0755,root,root) %{_sbindir}/rmt +%{_sysconfdir}/rmt +%{_mandir}/man8/rmt.* %changelog -* Wed May 19 2004 tsintegrate 0.4b36-1ts -- current (0.4b36-1ok) integrated as 0.4b36-1ts for release 1.0-U1 +* Fri Feb 13 2004 Elliot Lee +- rebuilt -* Sat May 15 2004 Jaakko Heinonen -- fix non-root build +* Wed Jun 04 2003 Elliot Lee +- rebuilt -* Thu May 13 2004 Omar Kilani 0.4b36-1ok -- New Upstream. +* Sat May 17 2003 Mike A. Harris 0.4b33-1 +- Updated to dump 0.4b33, fixes (#89835) -* Wed Dec 3 2003 Erlend Midttun 0.4b34-3tr -- Big rebuild +* Fri Jan 24 2003 Mike A. Harris 0.4b28-7 +- Added --enable-qfa to configure macro for RFE: (#77608) -* Wed Jun 18 2003 Erlend Midttun 0.4b34-2tr -- Big rebuild +* Wed Jan 22 2003 Tim Powers 0.4b28-6 +- rebuilt -* Fri May 16 2003 Tore Olsen 0.4b34-1to -- New upstream version +* Mon Oct 7 2002 Mike A. Harris 0.4b28-5 +- All-arch rebuild -* Mon Mar 24 2003 Erlend Midttun 0.4b31-1em -- Rebuilt against glibc 2.3.2. +* Fri Jun 21 2002 Tim Powers +- automated rebuild -* Tue Aug 13 2002 Christian H. Toldnes 0.4b31-1ct -- New upstream version -- .spec cleanup +* Sun May 26 2002 Tim Powers +- automated rebuild -* Wed Jul 24 2002 Daniel Meyer 0.4b22-2dm -- rebuild for Trustix Secure Linux 2.0 +* Tue May 21 2002 Mike A. Harris 0.4b28-2 +- Updated to dump 0.4b28 +- Removed atomic_read/write patch, not needed anymore -* Fri Jun 1 2001 Oystein Viggen -- New upstream version +* Fri Mar 1 2002 Mike A. Harris 0.4b27-3 +- BuildRequires readline-devel >= 4.2 for the rl_completion_matches function +- Added dump-0.4b27-dump-atomic-read-write.patch to avoid namespace conflict + with included kernel headers. atomic_read is a function on s390 and as + such, cannot be #undef'd -* Mon Mar 5 2001 Alexander Reelsen -- Picked up 0.4b21 -- Bigfile patch is now upstream +* Thu Feb 28 2002 Mike A. Harris 0.4b27-2 +- Added prereq on "setup" to ensure disk group is created prior to this + package being installed +- Somehow the dump package changelog got hosed, and part of the spec file + regressed. I believe it is fixed now. -* Fri Nov 3 2000 Erlend Midttun -- Removed (sg)uid bits on dump. -- Added RH's bigfile patch. +* Tue Feb 26 2002 Mike A. Harris 0.4b27-1 +- Updated to dump 0.4b27-1 -* Fri Sep 15 2000 Oystein Viggen -- 4b19 - latest and greatest +* Fri Feb 22 2002 Mike A. Harris 0.4b25-5 +- Bumped release up a couple notches to rebuild in rawhide + +* Thu Feb 21 2002 Mike A. Harris 0.4b25-1.72.0 +- Rebuilt 0.4b25 for erratum release. Fixes various bugs that have been + reported in bugzilla which are logged below. Also fixes a bug caused by + linking statically to a faulty system library. +- Added Provides dump-static line + +* Mon Feb 11 2002 Mike A. Harris 0.4b25-3 +- Added missing zlib buildprereq +- Rebuild in new environment -* Tue Jan 25 2000 Tore Olsen -- moved /usr/man to /usr/share/man for FHS compliance +* Wed Jan 09 2002 Tim Powers +- automated rebuild -* Fri Sep 24 1999 Jeff Johnson -- bump the dump version release to match e2fs hack. +* Wed Nov 21 2001 Mike A. Harris 0.4b25-1 +- Updated to version 0.4b25-1 +- Added homepage URL for RFE (#54601) +- Also fixed in this release are (#21272, #52663, #56616) +- Dropped time.h patch as it is unneeded now +* Tue Nov 6 2001 Mike A. Harris 0.4b22-7 +- Updated BuildPreReq to e2fsprogs-devel >= 1.18, readline-devel >= 4.1 to + explicitly state the minimum required deps and fix (#51900) + +* Sat Sep 8 2001 Trond Eivind Glomsr?d 0.4b22-6 +- Kill the static subpackage - the standard binaries are now static + This removes /usb/sbin/*. The static versions are now in /sbin + (#53433) +- Obsolete dump-static + +* Tue Aug 14 2001 Trond Eivind Glomsr?d 0.4b22-5 +- Move non-static binaries to /usr/sbin (#49520) + +* Fri Jun 29 2001 Mike A. Harris 0.4b22-4 +- Added BuildPrereq: readline-devel (#44734 - which was reopened and changed) + +* Sat Jun 16 2001 Mike A. Harris 0.4b22-3 +- Added BuildPrereq: libtermcap-devel (#44734) + +* Tue Jun 12 2001 Mike A. Harris 0.4b22-2 +- Removed release tag from buildroot dirname - messy. +- Broke all lines over multiple lines for readability in specfile. +- Added --enable-largefile configure flags + +* Mon Jun 11 2001 Florian La Roche 0.4b22-1 +- 0.4b22 + +* Mon May 7 2001 Mike A. Harris 0.4b21-5 +- Added BuildPrereq: e2fsprogs-devel (#27428) + +* Mon Apr 9 2001 Bill Nottingham +- fix ia64 + +* Wed Feb 14 2001 Bill Nottingham +- fix build with current glibc + +* Mon Jan 29 2001 Nalin Dahyabhai +- change copyright: UCB to License: BSD + +* Fri Jan 26 2001 Nalin Dahyabhai +- update to 0.4b21. + +* Sun Nov 26 2000 Jeff Johnson +- update to 0.4b20. + +* Fri Nov 10 2000 Stelian Pop +- dump 0.4b20 released, first packaging. + +* Tue Oct 31 2000 Jeff Johnson +- remove setuid bits for Red Hat 5.x errata. + +* Wed Aug 30 2000 Matt Wilson +- rebuild to cope with glibc locale binary incompatibility, again + +* Wed Aug 30 2000 Preston Brown +- fix for dumping files between 2 and 4 gigs (#16466) + +* Mon Aug 21 2000 Matt Wilson +- don't use -O2 on alpha because of compiler ICE + +* Sun Aug 20 2000 Jeff Johnson +- update to 0.4b19. + +* Thu Aug 17 2000 Jeff Johnson +- summaries from specspo. + +* Wed Aug 16 2000 Erik Troan +- support LABEL= in fstab + +* Sat Jul 22 2000 Bill Nottingham +- if dump/restore aren't set(u|g)id, they don't need group tty (#12670) + +* Wed Jul 19 2000 Jakub Jelinek +- rebuild to cope with glibc locale binary incompatibility + +* Wed Jul 12 2000 Prospector +- automatic rebuild + +* Tue Jun 27 2000 Preston Brown +- whoops I had dump commented out of the file list. fixed. +- dropped suid bits on the static binaries. +- fix char buffer size issue (#11880) + +* Mon Jun 19 2000 Preston Brown +- dropped SUID bits + +* Tue Jun 6 2000 Jeff Johnson +- update to 0.4b17. +- FHS packaging. + +* Thu Jun 1 2000 Stelian Pop +- dump 0.4b17 released, first packaging. + +* Sat Mar 11 2000 Stelian Pop +- dump 0.4b16 released, first packaging. + +* Tue Mar 7 2000 Jeff Johnson +- use posix signal handling to preserve dump functionality with libc5. + +* Thu Mar 2 2000 Bill Nottingham +- update to 0.4b15 + +* Thu Feb 10 2000 Jeff Johnson +- dump -0ufB /dev/ftape 1638000 /mnt2 fails to use /mnt2 as tape device (#8036) + +* Thu Feb 10 2000 Stelian Pop +- dump 0.4b14 released, first packaging. + +* Wed Feb 9 2000 Jeff Johnson +- compress man pages. + +* Thu Jan 27 2000 Jeff Johnson +- update to 0.4b13. + +* Fri Jan 21 2000 Stelian Pop +- dump 0.4b13 released, first packaging. + +* Mon Jan 10 2000 Jeff Johnson +- dump 0.4b12 released, first packaging. + +* Sun Dec 5 1999 Stelian Pop +- dump 0.4b11 released, first packaging. + +* Sat Nov 27 1999 Jeff Johnson +- intergrate Stelian's fixes (Thanks!). + +* Sun Nov 21 1999 Stelian Pop +- dump 0.4b10 released, first packaging. + +* Thu Nov 11 1999 Stelian Pop +- make static versions also for rescue purposes. + +* Wed Nov 5 1999 Stelian Pop +- dump 0.4b9 released, first packaging. + +* Wed Nov 3 1999 Stelian Pop +- dump 0.4b8 released, first packaging. + +* Thu Oct 8 1999 Stelian Pop +- dump 0.4b7 released, first packaging. + +* Thu Sep 30 1999 Stelian Pop +- dump 0.4b6 released, first packaging. + * Fri Sep 10 1999 Jeff Johnson - recompile with e2fsprogs = 1.15 (#4962). @@ -201,4 +381,4 @@ - Added endian cleanups for SPARC * Fri Feb 07 1997 Michael K. Johnson -- Made /etc/dumpdates writeable by group disk. \ No newline at end of file +- Made /etc/dumpdates writeable by group disk. From svn at tinysofa.org Thu Jul 1 15:47:25 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:47:25 +1000 (EST) Subject: [tinysofa-svn] r2749 - in tinysofa/snapshot/gdbm/current: sources specs Message-ID: <20040701154725.F22B84E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:47:25 +1000 (Fri, 02 Jul 2004) New Revision: 2749 Added: tinysofa/snapshot/gdbm/current/sources/gdbm-1.8.0-64offset.patch tinysofa/snapshot/gdbm/current/sources/gdbm-1.8.0-cflags.patch tinysofa/snapshot/gdbm/current/sources/gdbm-1.8.0-fhs.patch tinysofa/snapshot/gdbm/current/sources/gdbm-1.8.0.tar.gz Removed: tinysofa/snapshot/gdbm/current/sources/gdbm-1.8.3-Makefile.in.patch tinysofa/snapshot/gdbm/current/sources/gdbm-1.8.3.tar.gz Modified: tinysofa/snapshot/gdbm/current/specs/gdbm.spec Log: - Sync with 2.0. - Kept: - gdbm-1.8.0-jbj.patch: - Added: - gdbm-1.8.0-64offset.patch: - gdbm-1.8.0-cflags.patch: - gdbm-1.8.0-fhs.patch: - gdbm-1.8.0.tar.gz: - Removed: - gdbm-1.8.3-Makefile.in.patch: - gdbm-1.8.3.tar.gz: Added: tinysofa/snapshot/gdbm/current/sources/gdbm-1.8.0-64offset.patch =================================================================== --- tinysofa/snapshot/gdbm/current/sources/gdbm-1.8.0-64offset.patch 2004-07-01 15:47:22 UTC (rev 2748) +++ tinysofa/snapshot/gdbm/current/sources/gdbm-1.8.0-64offset.patch 2004-07-01 15:47:25 UTC (rev 2749) @@ -0,0 +1,64 @@ +diff -buNr gdbm-1.8.0.orig/falloc.c gdbm-1.8.0/falloc.c +--- gdbm-1.8.0.orig/falloc.c Tue May 18 20:16:06 1999 ++++ gdbm-1.8.0/falloc.c Thu Apr 25 18:20:45 2002 +@@ -180,6 +180,13 @@ + avail_block *new_blk; + int index; + ++ if (dbf->header->avail.count == dbf->header->avail.size) ++ { ++ /* We're kind of stuck here, so we re-split the header in order to ++ avoid crashing. Sigh. */ ++ push_avail_block(dbf); ++ } ++ + /* Set up variables. */ + new_el.av_adr = dbf->header->avail.next_block; + new_el.av_size = ( ( (dbf->header->avail.size * sizeof (avail_elem)) >> 1) +@@ -196,12 +203,24 @@ + if (num_bytes != new_el.av_size) _gdbm_fatal (dbf, "read error"); + + /* Add the elements from the new block to the header. */ +- for (index = 0; index < new_blk->count; index++) ++ index = 0; ++ while (index < new_blk->count) ++ { ++ while(index < new_blk->count ++ && dbf->header->avail.count < dbf->header->avail.size) + { + /* With luck, this will merge a lot of blocks! */ + _gdbm_put_av_elem(new_blk->av_table[index], + dbf->header->avail.av_table, +- &dbf->header->avail.count, dbf->coalesce_blocks); ++ &dbf->header->avail.count, TRUE); ++ index++; ++ } ++ if (dbf->header->avail.count == dbf->header->avail.size) ++ { ++ /* We're kind of stuck here, so we re-split the header in order to ++ avoid crashing. Sigh. */ ++ push_avail_block(dbf); ++ } + } + + /* Fix next_block, as well. */ +@@ -210,9 +229,17 @@ + /* We changed the header. */ + dbf->header_changed = TRUE; + +- /* Free the previous avail block. */ ++ /* Free the previous avail block. It is possible that the header table ++ is now FULL, which will cause us to overflow it! */ ++ if (dbf->header->avail.count == dbf->header->avail.size) ++ { ++ /* We're kind of stuck here, so we re-split the header in order to ++ avoid crashing. Sigh. */ ++ push_avail_block(dbf); ++ } ++ + _gdbm_put_av_elem (new_el, dbf->header->avail.av_table, +- &dbf->header->avail.count, dbf->coalesce_blocks); ++ &dbf->header->avail.count, TRUE); + free (new_blk); + } + Added: tinysofa/snapshot/gdbm/current/sources/gdbm-1.8.0-cflags.patch =================================================================== --- tinysofa/snapshot/gdbm/current/sources/gdbm-1.8.0-cflags.patch 2004-07-01 15:47:22 UTC (rev 2748) +++ tinysofa/snapshot/gdbm/current/sources/gdbm-1.8.0-cflags.patch 2004-07-01 15:47:25 UTC (rev 2749) @@ -0,0 +1,31 @@ +--- gdbm-1.8.0/Makefile.in.cflags Tue Jun 12 19:50:21 2001 ++++ gdbm-1.8.0/Makefile.in Tue Jun 12 19:57:45 2001 +@@ -17,22 +17,23 @@ + MAKEINFO = makeinfo + TEXI2DVI = texi2dvi + +-DEFS = ++DEFS = @DEFS@ + + # Where the system [n]dbm routines are... + LIBS = @LIBS@ -lc + + # SunOS 4 users might wish to add '-fpcc-struct-return' to CFLAGS. see INSTALL. +-CFLAGS = -O +-LDFLAGS = ++CPPFLAGS = @CPPFLAGS@ ++CFLAGS = @CFLAGS@ ++LDFLAGS = @LDFLAGS@ + + # Common prefix for installation directories +-prefix = /usr/local ++prefix = /usr + exec_prefix = $(prefix) + mandir = $(prefix)/man + + # Directory in which to put libgdbm.a. +-libdir = $(exec_prefix)/lib ++libdir = $(prefix)/lib + # The include directory for gdbm.h and dbm.h. + includedir = $(prefix)/include + # Info and man directories. Added: tinysofa/snapshot/gdbm/current/sources/gdbm-1.8.0-fhs.patch =================================================================== --- tinysofa/snapshot/gdbm/current/sources/gdbm-1.8.0-fhs.patch 2004-07-01 15:47:22 UTC (rev 2748) +++ tinysofa/snapshot/gdbm/current/sources/gdbm-1.8.0-fhs.patch 2004-07-01 15:47:25 UTC (rev 2749) @@ -0,0 +1,56 @@ +--- gdbm-1.8.0/Makefile.in.fhs Mon Jun 5 15:12:15 2000 ++++ gdbm-1.8.0/Makefile.in Mon Jun 5 15:16:34 2000 +@@ -14,10 +14,6 @@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_DATA = @INSTALL_DATA@ + +-# File ownership and group +-BINOWN = bin +-BINGRP = bin +- + MAKEINFO = makeinfo + TEXI2DVI = texi2dvi + +@@ -33,8 +29,7 @@ + # Common prefix for installation directories + prefix = /usr/local + exec_prefix = $(prefix) +-binprefix = $(exec_prefix) +-manprefix = $(prefix) ++mandir = $(prefix)/man + + # Directory in which to put libgdbm.a. + libdir = $(exec_prefix)/lib +@@ -42,7 +37,7 @@ + includedir = $(prefix)/include + # Info and man directories. + infodir = $(prefix)/info +-man3dir = $(prefix)/man/man3 ++man3dir = $(mandir)/man3 + manext = 3 + + #### End of system configuration section. #### +@@ -122,18 +117,14 @@ + install: libgdbm.la gdbm.h gdbm.info + $(srcdir)/mkinstalldirs $(libdir) $(includedir) $(man3dir) $(infodir) + $(LIBTOOL) install -c libgdbm.la $(libdir)/libgdbm.la +- $(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) gdbm.h $(includedir)/gdbm.h +- $(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) $(srcdir)/gdbm.3 \ +- $(man3dir)/gdbm.3 +- $(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) $(srcdir)/gdbm.info \ +- $(infodir)/gdbm.info ++ $(INSTALL_DATA) gdbm.h $(includedir)/gdbm.h ++ $(INSTALL_DATA) $(srcdir)/gdbm.3 $(man3dir)/gdbm.3 ++ $(INSTALL_DATA) $(srcdir)/gdbm.info $(infodir)/gdbm.info + + install-compat: + $(srcdir)/mkinstalldirs $(includedir) +- $(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) $(srcdir)/dbm.h \ +- $(includedir)/dbm.h +- $(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) $(srcdir)/ndbm.h \ +- $(includedir)/ndbm.h ++ $(INSTALL_DATA) $(srcdir)/dbm.h $(includedir)/dbm.h ++ $(INSTALL_DATA) $(srcdir)/ndbm.h $(includedir)/ndbm.h + + #libgdbm.a: $(OBJS) gdbm.h + # rm -f libgdbm.a Added: tinysofa/snapshot/gdbm/current/sources/gdbm-1.8.0.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/gdbm/current/sources/gdbm-1.8.0.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: tinysofa/snapshot/gdbm/current/sources/gdbm-1.8.3-Makefile.in.patch =================================================================== --- tinysofa/snapshot/gdbm/current/sources/gdbm-1.8.3-Makefile.in.patch 2004-07-01 15:47:22 UTC (rev 2748) +++ tinysofa/snapshot/gdbm/current/sources/gdbm-1.8.3-Makefile.in.patch 2004-07-01 15:47:25 UTC (rev 2749) @@ -1,60 +0,0 @@ ---- gdbm-1.8.3.orig/Makefile.in 2002-10-08 19:09:12.000000000 +0300 -+++ gdbm-1.8.3/Makefile.in 2004-05-14 05:19:01.000000000 +0300 -@@ -14,10 +14,6 @@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_DATA = @INSTALL_DATA@ - --# File ownership and group --BINOWN = bin --BINGRP = bin -- - MAKEINFO = makeinfo - TEXI2DVI = texi2dvi - -@@ -32,8 +28,7 @@ - # Common prefix for installation directories - prefix = @prefix@ - exec_prefix = @exec_prefix@ --binprefix = $(exec_prefix) --manprefix = $(prefix) -+mandir = $(prefix)/man - - # Directory in which to put libgdbm.a. - libdir = @libdir@ -@@ -41,7 +36,7 @@ - includedir = @includedir@ - # Info and man directories. - infodir = @infodir@ --man3dir = @mandir@/man3 -+man3dir = $(mandir)/man3 - manext = 3 - - #### End of system configuration section. #### -@@ -131,22 +126,17 @@ - $(INSTALL_ROOT)$(includedir) $(INSTALL_ROOT)$(man3dir) \ - $(INSTALL_ROOT)$(infodir) - $(LIBTOOL) $(INSTALL) -c libgdbm.la $(INSTALL_ROOT)$(libdir)/libgdbm.la -- $(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) gdbm.h \ -- $(INSTALL_ROOT)$(includedir)/gdbm.h -- $(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) $(srcdir)/gdbm.3 \ -- $(INSTALL_ROOT)$(man3dir)/gdbm.3 -- $(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) $(srcdir)/gdbm.info \ -- $(INSTALL_ROOT)$(infodir)/gdbm.info -+ $(INSTALL_DATA) gdbm.h $(INSTALL_ROOT)$(includedir)/gdbm.h -+ $(INSTALL_DATA) $(srcdir)/gdbm.3 $(INSTALL_ROOT)$(man3dir)/gdbm.3 -+ $(INSTALL_DATA) $(srcdir)/gdbm.info $(INSTALL_ROOT)$(infodir)/gdbm.info - - install-compat: - $(srcdir)/mkinstalldirs $(INSTALL_ROOT)$(libdir) \ - $(INSTALL_ROOT)$(includedir) - $(LIBTOOL) $(INSTALL) -c libgdbm_compat.la \ - $(INSTALL_ROOT)$(libdir)/libgdbm_compat.la -- $(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) $(srcdir)/dbm.h \ -- $(INSTALL_ROOT)$(includedir)/dbm.h -- $(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) $(srcdir)/ndbm.h \ -- $(INSTALL_ROOT)$(includedir)/ndbm.h -+ $(INSTALL_DATA) $(srcdir)/dbm.h $(INSTALL_ROOT)$(includedir)/dbm.h -+ $(INSTALL_DATA) $(srcdir)/ndbm.h $(INSTALL_ROOT)$(includedir)/ndbm.h - - #libgdbm.a: $(OBJS) gdbm.h - # rm -f libgdbm.a Deleted: tinysofa/snapshot/gdbm/current/sources/gdbm-1.8.3.tar.gz =================================================================== (Binary files differ) Modified: tinysofa/snapshot/gdbm/current/specs/gdbm.spec =================================================================== --- tinysofa/snapshot/gdbm/current/specs/gdbm.spec 2004-07-01 15:47:22 UTC (rev 2748) +++ tinysofa/snapshot/gdbm/current/specs/gdbm.spec 2004-07-01 15:47:25 UTC (rev 2749) @@ -1,217 +1,187 @@ +%{expand: %%global _includedir %{_includedir}/gdbm} + +Summary: A GNU set of database routines which use extensible hashing. Name: gdbm -Version: 1.8.3 -Release: 8ok -Summary: A GNU set of database routines which use extensible hashing -Summary(pt_BR): Biblioteca de banco de dados GNU para C -Summary(es): Biblioteca de banco de datos GNU para C -Group: tinysofa/libraries -Group(pt_BR): tinysofa/libraries -Group(es): tinysofa/libraries +Version: 1.8.0 +Release: 22.1ts +Source: ftp://ftp.gnu.org/gnu/gdbm-%{version}.tar.gz +Patch0: gdbm-1.8.0-jbj.patch +Patch1: gdbm-1.8.0-fhs.patch +Patch2: gdbm-1.8.0-cflags.patch +Patch3: gdbm-1.8.0-64offset.patch License: GPL -URL: http://www.gnu.org/software/gdbm -Source: ftp://ftp.gnu.org/gnu/gdbm/%{name}-%{version}.tar.gz -Patch0: %{name}-1.8.0-jbj.patch -Patch1: %{name}-1.8.3-Makefile.in.patch -BuildRequires: autoconf -BuildRequires: automake -BuildRequires: binutils -BuildRequires: gcc -BuildRequires: glibc-devel -BuildRequires: libtool -BuildRequires: make -%info_requires -%rename gdbm - +URL: http://www.gnu.org/software/gdbm/ +Group: System Environment/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-root %description -Gdbm is a GNU database indexing library, including routines -which use extensible hashing. Gdbm works in a similar way to standard UNIX -dbm routines. Gdbm is useful for developers who write C applications and +Gdbm is a GNU database indexing library, including routines which use +extensible hashing. Gdbm works in a similar way to standard UNIX dbm +routines. Gdbm is useful for developers who write C applications and need access to a simple and efficient database or who are building C applications which will use such a database. -If you're a C developer and your programs need access to simple database -routines, you should install gdbm. You'll also need to install gdbm-devel. +If you're a C developer and your programs need access to simple +database routines, you should install gdbm. You'll also need to +install gdbm-devel. -%description -l pt_BR -Esta ? uma biblioteca para banco de dados indexados. ? ?til para aqueles que -desenvolvem aplica??es em C que tenham que fazer acesso a banco de dados de -forma simples e eficiente. - -%description -l es -Esta es una biblioteca para banco de datos indexados. Es ?til para aquellos que -desarrollan aplicaciones en C, que tienen de hacer acceso a banco de datos de -forma simple y eficiente. - -%package -n %{libname} -Summary: A GNU set of database routines which use extensible hashing -Summary(pt_BR): Biblioteca de banco de dados GNU para C -Summary(es): Biblioteca de banco de datos GNU para C -Group: tinysofa/libraries -Group(pt_BR): tinysofa/libraries -Group(es): tinysofa/libraries -%rename gdbm - -%description -n %{libname} -Gdbm is a GNU database indexing library, including routines -which use extensible hashing. Gdbm works in a similar way to standard UNIX -dbm routines. Gdbm is useful for developers who write C applications and -need access to a simple and efficient database or who are building C -applications which will use such a database. - -If you're a C developer and your programs need access to simple database -routines, you should install gdbm. You'll also need to install gdbm-devel. - -%description -n %{libname} -l pt_BR -Esta ? uma biblioteca para banco de dados indexados. ? ?til para aqueles que -desenvolvem aplica??es em C que tenham que fazer acesso a banco de dados de -forma simples e eficiente. - -%description -n %{libname} -l es -Esta es una biblioteca para banco de datos indexados. Es ?til para aquellos que -desarrollan aplicaciones en C, que tienen de hacer acceso a banco de datos de -forma simple y eficiente. - -%package -n %{libname_devel} +%package devel Summary: Development libraries and header files for the gdbm library. -Summary(pt_BR): Bibliotecas e arquivos de inclus?o para desenvolvimento utilizando gdbm -Summary(es): Bibliotecas y archivos de inclusi?n para desarrollo utilizando gdbm -Group: tinysofa/development -Group(pt_BR): tinysofa/desenvolvimento -Group(es): tinysofa/desarrollo -%rename gdbm-devel -PreReq: %{libname} = %{version} +Group: Development/Libraries +Requires: gdbm = %{version} +Prereq: /sbin/install-info -%description -n %{libname_devel} -Gdbm-devel contains the development libraries and header files -for gdbm, the GNU database system. These libraries and header files are +%description devel +Gdbm-devel contains the development libraries and header files for +gdbm, the GNU database system. These libraries and header files are necessary if you plan to do development using the gdbm database. Install gdbm-devel if you are developing C programs which will use the -gdbm database library. You'll also need to install the gdbm package. +gdbm database library. You'll also need to install the gdbm package. -%description -l pt_BR -n %{libname_devel} -Estas s?o as bibliotecas e arquivos de inclus?o para desenvolvimento gdbm, que ? -o sistema de banco de dados GNU. S?o necess?rias se voc? pretende desenvolver -usando o banco de dados gdbm. - -%description -l es -n %{libname_devel} -Estas son las bibliotecas y archivos de inclusi?n para desarrollo gdbm, que es -el sistema de banco de datos GNU. Son necesarias si pretendes desarrollar usando -el banco de datos gdbm. - %prep %setup -q -%patch0 -p1 -b .jbj -%patch1 -p1 -b .noowngrp +%patch0 -p 1 -b .jbj +%patch1 -p 1 -b .fhs +%patch2 -p 1 -b .cflags +%patch3 -p1 -b .offset %build -libtoolize --copy --force + +libtoolize --force --copy aclocal -autoconf -# XXX --includedir doesn't work -./configure --prefix=%{_prefix} --infodir=%{_infodir} --libdir=%{_libdir} -make includedir=%{_includedir}/gdbm libdir=%{_libdir} +autoreconf +%configure +# We need to override libdir, which for whatever reason is set to $(prefix)/lib +# instead of the value passed to configure above. +make libdir=%{_libdir} %install -# XXX --includedir dinna work -make prefix=%{buildroot}%{_prefix} \ - infodir=%{buildroot}%{_infodir} \ - man3dir=%{buildroot}%{_mandir}/man3 \ - libdir=%{buildroot}%{_libdir} \ - includedir=%{buildroot}%{_includedir}/gdbm install install-compat +rm -rf ${RPM_BUILD_ROOT} -( cd %{buildroot} - ln -sf gdbm/gdbm.h .%{_includedir}/gdbm.h -# ln -sf libgdbm.so.2.0.0 .%{_libdir}/libgdbm.so -# gzip -9nf .%{_infodir}/gdbm*info* -) +%makeinstall install-compat -# remove unwanted unpackaged files -rm -f %{buildroot}%{_libdir}/libgdbm_compat.* +ln -sf gdbm/gdbm.h $RPM_BUILD_ROOT/%{_oldincludedir}/gdbm.h +ln -sf libgdbm.so.2.0.0 $RPM_BUILD_ROOT/%{_libdir}/libgdbm.so -%install_info gdbm.texinfo -%nuke_info +%post -p /sbin/ldconfig -%clean -rm -rf %{buildroot} +%postun -p /sbin/ldconfig -%post -n %{libname} -p /sbin/ldconfig +%post devel +/sbin/install-info %{_infodir}/gdbm.info.gz %{_infodir}/dir --entry="* gdbm: (gdbm). The GNU Database." -%postun -n %{libname} -p /sbin/ldconfig - -%post -n %{libname_devel} -%info_post - -%postun -n %{libname_devel} +%preun devel if [ $1 = 0 ]; then - %info_postun + /sbin/install-info --delete %{_infodir}/gdbm.info.gz %{_infodir}/dir --entry="* gdbm: (gdbm). The GNU Database." fi -%files -n %{libname} -%defattr(0644,root,root,0755) +%files +%defattr(-,root,root) %doc COPYING NEWS README %{_libdir}/libgdbm.so.* -%files -n %{libname_devel} -%defattr(0644,root,root,0755) -%doc ChangeLog -%{_includedir}/gdbm -%{_includedir}/gdbm.h -%{_libdir}/libgdbm.la +%files devel +%defattr(-,root,root) %{_libdir}/libgdbm.so -%{_htmldir}/%{name} -%{_mandir}/man3/gdbm.3* +%{_libdir}/libgdbm.la %{_libdir}/libgdbm.a +%{_oldincludedir}/gdbm.h +%{_includedir} +%{_infodir}/*.info* +%{_mandir}/man3/* +%clean +rm -rf ${RPM_BUILD_ROOT} - %changelog -* Tue Jan 20 2004 Arnaldo Carvalho de Melo -+ 2004-01-20 15:04:49 (45888) -- Complete the rename +* Tue Mar 02 2004 Elliot Lee +- rebuilt -* Tue Jan 20 2004 Arnaldo Carvalho de Melo -+ 2004-01-20 14:58:58 (45886) -- Rename the specfile +* Fri Feb 13 2004 Elliot Lee +- rebuilt -* Tue Jan 20 2004 Arnaldo Carvalho de Melo -+ 2004-01-20 14:58:17 (45885) -- Follow the Conectiva Linux guidelines for package naming. +* Wed Jun 04 2003 Elliot Lee +- rebuilt -* Fri Jan 02 2004 Arnaldo Carvalho de Melo -+ 2004-01-02 20:07:06 (42844) -- %%soname must be equal to 3, libgdbm2 package created for transition period. +* Wed Jan 22 2003 Tim Powers +- rebuilt -* Fri Jan 02 2004 Arnaldo Carvalho de Melo -+ 2004-01-02 14:14:02 (42833) -- Added some Provides gdbm{-devel{-static}} to ease migration to new naming +* Fri Oct 4 2002 Nalin Dahyabhai 1.8.0-19 +- rebuild -* Fri Jan 02 2004 Arnaldo Carvalho de Melo -+ 2004-01-02 14:08:46 (42831) -- Ooops, fix cut'n'paste error in the summaries for the libgdbm2 package -- Added missing Obsoletes gdbm < %%{version}-%%{release} in the libgdbm2 package +* Fri Sep 13 2002 Nalin Dahyabhai 1.8.0-18.1 +- run make with libdir overridden so that it has the value passed to configure + instead of $(prefix)/lib -* Fri Jan 02 2004 Arnaldo Carvalho de Melo -+ 2004-01-02 14:05:45 (42829) -- New upstream release: 1.8.3 -- Follow Conectiva Linux library naming guidelines -- redo the no_own_grp patch -- Use -p in scriptlets where possible +* Wed Jul 24 2002 Trond Eivind Glomsr?d 1.8.0-18 +- Remove cflags for large database support - not compatible + with databases without it -* Tue Sep 03 2002 Gustavo Niemeyer -+ 2002-09-03 14:39:54 (11596) -- Imported package from snapshot. +* Fri Jun 21 2002 Tim Powers +- automated rebuild -* Thu Aug 29 2002 Gustavo Niemeyer -+ 2002-08-29 17:44:50 (7902) -- Imported package from 8.0. +* Thu May 23 2002 Tim Powers +- automated rebuild -* Wed Aug 28 2002 Gustavo Niemeyer -+ 2002-08-28 18:33:43 (4300) -- Imported package from 7.0. +* Thu Apr 25 2002 Trond Eivind Glomsr?d 1.8.0-15 +- Use 64bit offset +- Patch to make the above not break from downsj at downsj.com (#63980) -* Tue Aug 27 2002 Gustavo Niemeyer -+ 2002-08-27 18:58:11 (551) -- Imported package from 6.0. +* Tue Feb 26 2002 Trond Eivind Glomsr?d 1.8.0-14 +- Rebuild + +* Fri Jan 25 2002 Trond Eivind Glomsr?d 1.8.0-13 +- Update location +- auto* changes to make it build + +* Wed Oct 17 2001 Trond Eivind Glomsr?d 1.8.0-11 +- Add URL (# 54607) + +* Mon Jun 25 2001 Nalin Dahyabhai +- s/Copyright:/License:/g +- include text docs in binary package + +* Tue Jun 12 2001 Than Ngo +- fix to build against new libtool + +* Mon Mar 19 2001 Trond Eivind Glomsr?d +- Make it respect RPM_OPT_FLAGS/CFLAGS - #32242. + Patch from dan at D00M.cmc.msu.ru + +* Thu Jul 13 2000 Prospector +- automatic rebuild + +* Mon Jun 5 2000 Jeff Johnson +- FHS packaging. + +* Mon Feb 7 2000 Bill Nottingham +- handle compressed manpages + +* Tue Aug 10 1999 Jeff Johnson +- make sure created database header is initialized (#4457). + +* Tue Jun 1 1999 Jeff Johnson +- update to 1.8.0. +- repackage to include /usr/include/gdbm/*dbm.h compatibility includes. + +* Sun Mar 21 1999 Cristian Gafton +- auto rebuild in the new build environment (release 19) + +* Thu Dec 17 1998 Cristian Gafton +- build against glibc 2.1 + +* Thu May 07 1998 Prospector System +- translations modified for de, fr, tr + +* Thu Apr 30 1998 Cristian Gafton +- gdbm-devel moved to Development/Libraries + +* Wed Apr 08 1998 Cristian Gafton +- buildroot and built for Manhattan + +* Tue Oct 14 1997 Donnie Barnes +- spec file cleanups + +* Thu Jun 12 1997 Erik Troan +- built against glibc From svn at tinysofa.org Thu Jul 1 15:47:29 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:47:29 +1000 (EST) Subject: [tinysofa-svn] r2750 - in tinysofa/snapshot/gettext/current: sources specs Message-ID: <20040701154729.91C0D4E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:47:29 +1000 (Fri, 02 Jul 2004) New Revision: 2750 Added: tinysofa/snapshot/gettext/current/sources/gettext-0.14.1-amd64-libtool.patch tinysofa/snapshot/gettext/current/sources/msghack.py tinysofa/snapshot/gettext/current/sources/po-mode-init.el Modified: tinysofa/snapshot/gettext/current/specs/gettext.spec Log: - Sync with 2.0. - Kept: - gettext-0.14.1.tar.gz: - Added: - gettext-0.14.1-amd64-libtool.patch: - msghack.py: - po-mode-init.el: Added: tinysofa/snapshot/gettext/current/sources/gettext-0.14.1-amd64-libtool.patch =================================================================== --- tinysofa/snapshot/gettext/current/sources/gettext-0.14.1-amd64-libtool.patch 2004-07-01 15:47:25 UTC (rev 2749) +++ tinysofa/snapshot/gettext/current/sources/gettext-0.14.1-amd64-libtool.patch 2004-07-01 15:47:29 UTC (rev 2750) @@ -0,0 +1,50 @@ +--- gettext-0.13.1/config/m4/libtool.m4.amd64-libtool 2003-04-24 03:18:52.000000000 +0200 ++++ gettext-0.13.1/config/m4/libtool.m4 2004-03-09 10:19:16.000000000 +0100 +@@ -1092,6 +1092,29 @@ shlibpath_overrides_runpath=unknown + version_type=none + dynamic_linker="$host_os ld.so" + sys_lib_dlsearch_path_spec="/lib /usr/lib" ++ ++case $host in ++*-*-linux*) ++ # Test if the compiler is 64bit ++ echo 'int i;' > conftest.$ac_ext ++ lt_cv_cc_64bit_output=no ++ if AC_TRY_EVAL(ac_compile); then ++ case "`/usr/bin/file conftest.$ac_objext`" in ++ *64-bit*) ++ lt_cv_cc_64bit_output=yes ++ ;; ++ esac ++ fi ++ rm -rf conftest* ++ ;; ++esac ++ ++case $host_cpu:$lt_cv_cc_64bit_output in ++powerpc64:yes | s390x:yes | sparc64:yes | x86_64:yes) ++ sys_lib_dlsearch_path_spec="/lib64 /usr/lib64" ++ ;; ++esac ++ + if test "$GCC" = yes; then + sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` + if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then +@@ -2031,7 +2054,7 @@ AC_DEFUN([AC_PROG_LD_GNU], + [AC_REQUIRE([AC_PROG_EGREP])dnl + AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld, + [# I'd rather use --version here, but apparently some GNU ld's only accept -v. +-case `"$LD" -v 2>&1 &1 + +## v0.2 - 2001-08-21 + +## This program is free software; you can redistribute it and/or modify +## it 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. + +## This program is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## GNU General Public License for more details. + +## You should have received a copy of the GNU General Public License +## along with this program; if not, write to the Free Software +## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +""" +A msghack replacement +""" + +import string +import sys + +class GTMessage: + """ + A class containing a message, its msgid and various references pointing at it + """ + + def __init__(self,id=None,message=None,refs=[]): + """ + The constructor for the GTMessage class + @self The object instance + @message The message + @id The messageid associated with the object + """ + self._message=string.strip(message) + self._id=string.strip(id) + self._refs=[] + for ref in refs: + self._refs.append(ref) + + def __str__(self): + """ + Return a string representation of the object + @self The object instance + """ + res="" + for ref in self._refs: + res=res+ref+"\n" + res=res+"msgid %s\nmsgstr %s\n" % (self._id,self._message) + return res + + def invertedStrings(self): + """ + Returns a string representation, but with msgid and msgstr inverted. + Note: Don't invert the "" string + @self The object instance + """ + res="" + for ref in self._refs: + res=res+ref+"\n" + if not self._id=="\"\"": + res=res+"msgid %s\nmsgstr %s\n" % (self._message,self._id) + else: + res=res+"msgid %s\nmsgstr %s\n" % (self._id,self._message) + return res + + def emptyMsgStrings(self): + """ + Return a string representation of the object, but leave the msgstr + empty - create a pot file from a po file + Note: Won't remove the "" string + @self The object instance + """ + res="" + for ref in self._refs: + res=res+ref+"\n" + if not self._id=="\"\"": + res=res+"msgid %s\nmsgstr \"\"\n" % (self._id) + else: + res=res+"msgid %s\nmsgstr %s\n" % (self._id,self._message) + return res + + def compareMessage(self,msg): + """ + Return if the messages have identical msgids, 0 otherwise + @self The object instance + @msg The message to compare to + """ + + if self._id == msg._id: + return 1 + return 0 + + +class GTMasterMessage: + """ + A class containing a message, its msgid and various references pointing at it + The difference between GTMessage and GTMasterMessage is that this class + can do less operations, but is able to store multiple msgstrs with identifiers + (usually language, like 'msgst(no)' + """ + + def __init__(self,id=None,refs=[]): + """ + The constructor for the GTMessage class + @self The object instance + @id The messageid associated with the object + """ + self._id=id + self._refs=[] + self._messages=[] + for ref in refs: + self._refs.append(ref) + + def addMessage(self,message,identifier): + """ + Add a new message and identifier to the GTMasterMessage object + @self The object instance + @message The message to append + @identifier The identifier of the message + """ + self._messages.append((identifier,message)) + + def __str__(self): + """ + Return a string representation of the object + @self The object instance + """ + res="" + for ref in self._refs: + res=res+ref+"\n" + res=res+"msgid %s\n" % self._id + for message in self._messages: + res=res+"msgstr(%s) %s\n" %(message[0],message[1]) + res=res+"\n" + return res + +class GTFile: + """ + A class containing the GTMessages contained in a file + """ + + def __init__(self,filename): + """ + The constructor of the GTMFile class + @self The object instance + @filename The file to initialize from + """ + self._filename=filename + self._messages=[] + self.readFile(filename) + + def __str__(self): + """ + Return a string representation of the object + @self The object instance + """ + res="" + for message in self._messages: + res=res+str(message)+"\n" + return res + + def invertedStrings(self): + """ + Return a string representation of the object, with msgid and msgstr + swapped. Will remove duplicates... + @self The object instance + """ + + msght={} + msgar=[] + + for message in self._messages: + if message._id=='""' and len(msgar)==0: + msgar.append(GTMessage(message._id,message._message,message._refs)) + continue + msg=GTMessage(message._message,message._id,message._refs) + if not msght.has_key(msg._id): + msght[msg._id]=msg + msgar.append(msg) + else: + msg2=msght[msg._id] + for ref in msg._refs: + msg2._refs.append(ref) + res="" + for message in msgar: + res=res+str(message)+"\n" + return res + + def msgidDupes(self): + """ + Search for duplicates in the msgids. + @self The object instance + """ + msgids={} + res="" + for message in self._messages: + msgid=message._id + if msgids.has_key(msgid): + res=res+"Duplicate: %s\n" % (msgid) + else: + msgids[msgid]=1 + return res + + def getMsgstr(self,msgid): + """ + Return the msgstr matching the given id. 'None' if missing + @self The object instance + @msgid The msgid key + """ + + for message in self._messages: + if msgid == message._id: + return message._message + return None + + def emptyMsgStrings(self): + """ + Return a string representation of the object, but leave the msgstr + empty - create a pot file from a po file + @self The object instance + """ + + res="" + for message in self._messages: + res=res+message.emptyMsgStrings()+"\n" + return res + + + def append(self,B): + """ + Append entries from dictionary B which aren't + already present in this dictionary + @self The object instance + @B the dictionary to append messages from + """ + + for message in B._messages: + if not self.getMsgstr(message._id): + self._messages.append(message) + + + def readFile(self,filename): + """ + Read the contents of a file into the GTFile object + @self The object instance + @filename The name of the file to read + """ + + file=open(filename,"r") + msgid="" + msgstr="" + refs=[] + lines=[] + inmsgid=0 + inmsgstr=0 + templines=file.readlines() + for line in templines: + lines.append(string.strip(line)) + for line in lines: + pos=string.find(line,'"') + pos2=string.rfind(line,'"') + if line and line[0]=="#": + refs.append(string.strip(line)) + if inmsgstr==0 and line[:6]=="msgstr": + msgstr="" + inmsgstr=1 + inmsgid=0 + if inmsgstr==1: + if pos==-1: + inmsgstr=0 + #Handle entries with and without "" consistently + if msgid[:2]=='""' and len(msgid)>4: + msgid=msgid[2:] + if msgstr[:2]=='""' and len(msgstr)>4: + msgstr=msgstr[2:] + message=GTMessage(msgid,msgstr,refs) + self._messages.append(message) + msgstr="" + msgid="" + refs=[] + else: + msgstr=msgstr+line[pos:pos2+1]+"\n" + if inmsgid==0 and line[:5]=="msgid": + msgid="" + inmsgid=1 + if inmsgid==1: + if pos==-1: + inmsgid=0 + else: + msgid=msgid+line[pos:pos2+1]+"\n" + if msgstr and msgid: + message=GTMessage(msgid,msgstr,refs) + self._messages.append(message) + + +class GTMaster: + """ + A class containing a master catalogue of gettext dictionaries + """ + + def __init__(self,dicts): + """ + The constructor for the GTMaster class + @self The object instance + @dicts An array of dictionaries to merge + """ + self._messages=[] + self.createMaster(dicts) + + def createMaster(self,dicts): + """ + Create the master catalogue + @self The object instance + @dicts An array of dictionaries to merge + """ + + self._master=dicts[0] + self._dicts=dicts[1:] + + for message in self._master._messages: + gtm=GTMasterMessage(message._id,message._refs) + gtm.addMessage(message._message,self._master._filename[:-3]) + for dict in self._dicts: + res=dict.getMsgstr(message._id) + if(res): + gtm.addMessage(res,dict._filename[:-3]) + self._messages.append(gtm) + + def __str__(self): + """ + Return a string representation of the object + @self The object instance + """ + res="" + for message in self._messages: + res=res+str(message)+"\n" + return res + + +if __name__=="__main__": + output=None + res=None + if("-o") in sys.argv: + output=sys.argv[sys.argv.index("-o")+1] + sys.argv.remove("-o") + sys.argv.remove(output) + if("--invert") in sys.argv: + file=sys.argv[sys.argv.index("--invert")+1] + gtf=GTFile(file) + res1=gtf.msgidDupes() + if res1: + sys.stderr.write(res1) + sys.exit(1) + res=str(gtf.invertedStrings()) + elif("--empty") in sys.argv: + file=sys.argv[sys.argv.index("--empty")+1] + gtf=GTFile(file) + res=str(gtf.emptyMsgStrings()) + elif("--master") in sys.argv: + loc=sys.argv.index("--master")+1 + gtfs=[] + for file in sys.argv[loc:]: + gtfs.append(GTFile(file)) + master=GTMaster(gtfs) + res=str(master) + elif("--append") in sys.argv: + file=sys.argv[sys.argv.index("--append")+1] + file2=sys.argv[sys.argv.index("--append")+2] + gtf=GTFile(file) + gtf2=GTFile(file2) + gtf.append(gtf2) + res=str(gtf) + else: + #print "Not implemented: "+str(sys.argv) + print "\ +Usage: ", str(sys.argv[0])," [OPTION] file.po [ref.po]\n\ +This program can be used to alter .po files in ways no sane mind would think about.\n\ + -o result will be written to FILE\n\ + --invert invert a po file by switching msgid and msgstr\n\ + --master join any number of files in a master-formatted catalog\n\ + --empty empty the contents of the .po file, creating a .pot\n\ + --append append entries from ref.po that don't exist in file.po\n\ +\n\ +Note: It is just a replacement of msghack for backward support.\n\ +" + sys.exit(1) + if not output: + print res + else: + file=open(output,"w") + file.write(res) + sys.exit(0) Property changes on: tinysofa/snapshot/gettext/current/sources/msghack.py ___________________________________________________________________ Name: svn:executable + * Added: tinysofa/snapshot/gettext/current/sources/po-mode-init.el =================================================================== --- tinysofa/snapshot/gettext/current/sources/po-mode-init.el 2004-07-01 15:47:25 UTC (rev 2749) +++ tinysofa/snapshot/gettext/current/sources/po-mode-init.el 2004-07-01 15:47:29 UTC (rev 2750) @@ -0,0 +1,12 @@ +;; Use po-mode for translation files + +(autoload 'po-mode "po-mode") +(setq auto-mode-alist (cons '("\\.po[tx]?\\'\\|\\.po\\." . po-mode) + auto-mode-alist)) + +;;; To automatically use proper fonts under Emacs 20, also add: + +(autoload 'po-find-file-coding-system "po-mode") +(modify-coding-system-alist 'file "\\.po[tx]?\\'\\|\\.po\\." + 'po-find-file-coding-system) + Modified: tinysofa/snapshot/gettext/current/specs/gettext.spec =================================================================== --- tinysofa/snapshot/gettext/current/specs/gettext.spec 2004-07-01 15:47:25 UTC (rev 2749) +++ tinysofa/snapshot/gettext/current/specs/gettext.spec 2004-07-01 15:47:29 UTC (rev 2750) @@ -1,270 +1,401 @@ -%ifarch ia64 -%define optflags -O1 -%endif +%define libtoolize : -%define makeinfo_flags --no-validate --force -I gettext-runtime/doc - +Summary: GNU libraries and utilities for producing multi-lingual messages. Name: gettext Version: 0.14.1 -Release: 8ok -Summary: Libraries and utilties for program national language support -Summary(pt_BR): Bibliotecas e utilit?rios para o programa de suporte de l?nguas locais. -Summary(es): Bibliotecas y utilitarios para el programa de soporte a lenguas locales. -Group: tinysofa/main -Group(pt_BR): tinysofa/main -Group(es): tinysofa/main -License: GPL -URL: http://www.gnu.org/software/gettext -Source0: ftp://ftp.gnu.org/gnu/gettext/%{name}-%{version}.tar.gz -BuildRequires: autoconf -BuildRequires: automake >= 1.5 -BuildRequires: binutils -BuildRequires: bison -BuildRequires: byacc -BuildRequires: coreutils -BuildRequires: diffutils -BuildRequires: flex -BuildRequires: gawk -BuildRequires: gcc -BuildRequires: glibc-devel -BuildRequires: grep -BuildRequires: groff -BuildRequires: gzip -BuildRequires: libtool -BuildRequires: make -BuildRequires: gawk -BuildRequires: mktemp -BuildRequires: patch -BuildRequires: sed -BuildRequires: tar -BuildRequires: texinfo -BuildRoot: %{_tmppath}/%{name}-%{version}-root +Release: 6ts +License: GPL/LGPL +Group: Development/Tools +Source: ftp://ftp.gnu.org/gnu/gettext/%{name}-%{version}.tar.gz +URL: http://www.gnu.org/software/gettext/ +Source1: po-mode-init.el +Source2: msghack.py +Patch0: gettext-0.14.1-amd64-libtool.patch +Prereq: /sbin/install-info +%ifarch x86_64 ppc64 s390x +BuildRequires: automake >= 1.8, autoconf >= 2.5 +%endif +BuildRequires: libtool, bison +Buildroot: %{_tmppath}/%{name}-%{version}-root %description -The gettext library provides an easy to use library and tools for creating, -using, and modifying natural language catalogs. It is a powerfull and simple -method for internationalizing programs. +The GNU gettext package provides a set of tools and documentation for +producing multi-lingual messages in programs. Tools include a set of +conventions about how programs should be written to support message +catalogs, a directory and file naming organization for the message +catalogs, a runtime library which supports the retrieval of translated +messages, and stand-alone programs for handling the translatable and +the already translated strings. Gettext provides an easy to use +library and tools for creating, using, and modifying natural language +catalogs and is a powerful and simple method for internationalizing +programs. -%description -l pt_BR -A biblioteca gettext oferece uma biblioteca f?cil de usar e ferramentas para -cria??o, uso e modifica??o de cat?logos de linguagem natural. Ele ? um poderoso -e simples m?todo de internacionaliza??o de programas. +%package devel +Summary: Development files for %{name} +Group: Development/C +License: LGPL +Requires: %{name} = %{version}-%{release} +Provides: devel(libintl) +Prereq: /sbin/install-info -%description -l es -La biblioteca gettext nos ofrece una biblioteca f?cil de usar y herramientas -para creaci?n, uso y modificaci?n de cat?logos de lenguaje natural. Es un -potente y sencillo m?todo de internacionalizaci?n de programas. +%description devel +This package contains all development related files necessary for +developing or compiling applications/libraries that needs +internationalization capability. You also need this package if you +want to add gettext support for your project. -%package devel -Summary: Tools and libraries for development with gettext -Summary(pt_BR): Utilit?rios e bibliotecas para desenvolvimento com gettext -Group: tinysofa/development -Group(pt_BR): tinysofa/desenvolvimento -Group(es): tinysofa/desarrollo -PreReq: %{name} = %{version} - -%description devel -This package provides the tools needed for developing with gettext library. It -also contains headers and libraries for it. - -%description -l pt_BR devel -Este pacote cont?m as ferramentas necess?rias para o desenvolvimento com a -biblioteca gettext. Cont?m tamb?m os cabe?alhos e as bibliotecas para isto. - -%package doc -Summary: Documentation for the gettext. -Summary(pt_BR): Documenta??o para o gettext. -Group: tinysofa/documentation -Group(pt_BR): tinysofa/documenta??o -Group(es): tinysofa/documentaci?n - -%description doc -This package provides documentation for gettext. - -%description doc -l pt_BR -Este pacote cont?m a documenta??o do getext. - %prep +rm -rf %{buildroot} %setup -q +%ifarch x86_64 ppc64 s390x +%patch0 -p1 -b .x86_64 +%endif %build -export EMACS=%{_bindir}/emacs -%configure --disable-shared --with-included-gettext --with-pic-=yes -make -j ${NRPROC:-1} +[ -f /usr/share/automake/depcomp ] && cp -f /usr/share/automake/{depcomp,ylwrap} . || : +%configure --without-included-gettext --enable-nls \ + --enable-shared --with-pic-=yes +make %install rm -rf %{buildroot} -%makeinstall lispdir=%{buildroot}%{_datadir}/emacs/site-lisp \ - aclocaldir=%{buildroot}%{_datadir}/aclocal +# Fix busted no-emacs install for $lispdir/po-mode.el +%makeinstall lispdir=%{buildroot}/usr/share/emacs/site-lisp \ + aclocaldir=%{buildroot}/usr/share/aclocal + +mkdir -p %{buildroot}/bin +mv %{buildroot}/%{_bindir}/gettext %{buildroot}/bin +ln -s ../../bin/gettext %{buildroot}/%{_bindir}/gettext +install -m 755 %SOURCE2 $RPM_BUILD_ROOT/%{_bindir}/msghack + pushd %{buildroot} -mkdir -p %{buildroot}/bin -mv %{buildroot}%{_bindir}/gettext %{buildroot}/bin -ln -sf /bin/gettext %{buildroot}%{_bindir}/gettext +rm -f .%{_infodir}/dir .%{_includedir}/libintl.h popd -# Check procedures -# 1 of 180 tests failed (version 0.12.1) -#make check +pushd %{buildroot}/%{_datadir}/locale +for foo in `find . -maxdepth 1 -mindepth 1 -type d` ; do + lang=`echo $foo | cut -c 3-` + echo "%lang($lang) %{_datadir}/locale/$foo/*/*" >> \ + $RPM_BUILD_DIR/%{name}-%{version}/trans.list +done +popd -# remove unwanted unpackaged files -rm -f %{buildroot}%{_libdir}/*.a -rm -f %{buildroot}%{_libdir}/libintl.la -rm -f %{buildroot}%{_includedir}/{libintl,libgettext,autosprintf,gettext-po}.h -rm -f %{buildroot}%{_datadir}/locale/locale.alias -rm -f %{buildroot}%{_infodir}/dir -# Avaialable in the emacs-el package -rm -rf %{buildroot}%{_datadir}/emacs/site-lisp/ +mkdir -p $RPM_BUILD_ROOT/usr/share/emacs/site-lisp/site-start.d +install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/usr/share/emacs/site-lisp/site-start.d -%install_info gettext-tools/doc/gettext.texi -%nuke_info +# doc relocations +for i in gettext-runtime/man/*.html; do + rm -f $RPM_BUILD_ROOT%{_datadir}/doc/gettext/`basename $i` +done +rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/gettext/javadoc* -%i18n_pkgs gettext +rm -rf htmldoc examples +mkdir htmldoc +mv $RPM_BUILD_ROOT%{_datadir}/doc/gettext/examples examples +mv $RPM_BUILD_ROOT%{_datadir}/doc/gettext/* $RPM_BUILD_ROOT/%{_datadir}/doc/libasprintf/* htmldoc +rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/libasprintf -%post doc -%info_post -%postun doc -%info_postun +# remove unpackaged files from the buildroot +rm -rf $RPM_BUILD_ROOT/usr/doc +rm -rf $RPM_BUILD_ROOT%{_datadir}/emacs +rm -f $RPM_BUILD_ROOT%{_datadir}/locale/locale.alias +rm -rf $RPM_BUILD_ROOT%{_libdir}/preloadable_libintl.so %clean rm -rf %{buildroot} -%files -%defattr(0755,root,root,0755) -/bin/gettext -%{_bindir}/gettext -%{_bindir}/ngettext +%post +/sbin/install-info %{_infodir}/gettext.info.gz %{_infodir}/dir +%preun +if [ "$1" = 0 ]; then + /sbin/install-info --delete %{_infodir}/gettext.info.gz %{_infodir}/dir +fi +exit 0 + +%files -f trans.list +%defattr(-,root,root) +%doc gettext-runtime/ABOUT-NLS AUTHORS gettext-runtime/BUGS +%doc COPYING gettext-tools/misc/DISCLAIM README +%doc NEWS THANKS gettext-tools/TODO +%doc gettext-runtime/man/*.1.html +%doc gettext-runtime/intl/COPYING* +/bin/* +/usr/bin/* +/usr/share/doc/* + +# These aren't in glibc... +%dir /usr/share/locale/en at boldquot +%dir /usr/share/locale/en at boldquot/LC_MESSAGES +%dir /usr/share/locale/en at quot +%dir /usr/share/locale/en at quot/LC_MESSAGES + +%{_libdir}/libgettextlib*.so +%{_libdir}/libgettextsrc*.so +%{_infodir}/gettext* +%{_mandir}/*/* +#%config %{_libdir}/charset.alias +%{_libdir}/%{name} + + %files devel -%defattr(0755,root,root,0755) -%{_bindir}/autopoint +%defattr(-,root,root) +%doc gettext-runtime/man/*.3.html examples %{_bindir}/gettextize -%{_bindir}/envsubst -%{_bindir}/gettext.sh -%{_bindir}/msg* -%{_bindir}/xgettext -%defattr(0644,root,root,0755) -%{_libdir}/libasprintf.la -%{_libdir}/libgettextlib.la -%{_libdir}/libgettextpo.la -%{_libdir}/libgettextsrc.la -%dir %{_datadir}/gettext -%{_datadir}/gettext/* -%{_datadir}/aclocal/*.m4 -%dir %{_libdir}/gettext/ -%{_libdir}/gettext/* +%{_datadir}/%{name}/ABOUT-NLS +%{_datadir}/%{name}/projects/* +%{_datadir}/%{name}/archive.tar.gz +%{_datadir}/%{name}/config.rpath +%{_datadir}/%{name}/*.h +%{_datadir}/%{name}/intl +%{_datadir}/%{name}/mkinstalldirs +%{_datadir}/%{name}/po +%{_datadir}/%{name}/msgunfmt.tcl +%{_datadir}/aclocal/* +%{_includedir}/* +%{_infodir}/autosprintf* +%{_libdir}/lib*.a +%{_libdir}/lib*.la +%{_libdir}/libasprintf.so* +%{_libdir}/libgettextpo.so* +%{_mandir}/man3/* -%files doc -%defattr(0644,root,root,0755) -%dir %{_defaultdocdir}/gettext/ -%{_defaultdocdir}/gettext/* -%dir %{_defaultdocdir}/libasprintf/ -%{_defaultdocdir}/libasprintf/* -%{_mandir}/man1/*1* -%{_mandir}/man3/*3* -%{_htmldir}/%{name} - %changelog -* Thu Jan 22 2004 Arnaldo Carvalho de Melo -+ 2004-01-22 18:59:31 (46285) -- Removed the i18n-all package, now its one package per lang, using %%i18n_pkgs -- %%remove_info already checks $1 +* Tue Jun 08 2004 Leon Ho +- use --without-included-gettext to avoid the need of libintl.so (#125497) +- remove preloadable_libintl.so -* Sun Jan 18 2004 Arnaldo Carvalho de Melo -+ 2004-01-18 21:37:17 (45700) -- Remove unwanted unpackaged %%{_infodir}/dir -- Ad to %%files devel %%{_libdir}/gettext/* +* Sun Jun 06 2004 Leon Ho +- moved some of the shared lib to main pkg +- added more build requires -* Sun Jan 18 2004 Arnaldo Carvalho de Melo -+ 2004-01-18 21:28:02 (45699) -- Revert to the old style: --disable-shared, to make a long story short the - complications generated by trying to move the libs to /lib that made it - non-trivial to build packages such as rpm4.2.1 give me the willies about - doing this at this point, so if somebody wants to mrlify this, please first - test it will all packages, i.e. do it very early in a next devel cycle. +* Thu Jun 03 2004 Leon Ho +- add conditionals for patch and requires auto* (#125216) -* Sun Jan 18 2004 Arnaldo Carvalho de Melo -+ 2004-01-18 12:21:53 (45593) -- Left only the bare minimum in the base package -- Move the base package libs to /lib, to be able to use gettext before /usr - is mounted (Closes: #10254) +* Wed Jun 02 2004 Leon Ho +- packaged lib files for devel +- moved some of the files to different sub-pkg +- fix problem on x86_64 build -* Sun Jan 18 2004 Arnaldo Carvalho de Melo -+ 2004-01-18 09:55:46 (45547) -- Move libgettextlib-0.12.1.so and libgettextsrc-0.12.1.so to the main package +* Tue Mar 02 2004 Elliot Lee +- rebuilt -* Thu Jan 15 2004 Arnaldo Carvalho de Melo -+ 2004-01-15 08:50:04 (44753) -- Moved %%{_libdir}/libgettextpo*.so.* to the main package (we need a libintl2 - package...) to the main package, so as not to make gettext depend on - gettext-devel +* Fri Feb 13 2004 Elliot Lee +- rebuilt -* Wed Jan 14 2004 Arnaldo Carvalho de Melo -+ 2004-01-14 22:45:39 (44733) -- If %%{build_emacs_po_mode} is not enabled, remove its files +* Mon Feb 02 2004 Leon Ho +- rebuilt to 0.14.1 -* Wed Jan 14 2004 Arnaldo Carvalho de Melo -+ 2004-01-14 22:27:51 (44727) -- Disable the build of the emacs-po-mode, this is already provided my emacs +* Fri Sep 19 2003 Leon Ho +- rebuilt 0.12.1 +- fix including files and excludes some patches -* Wed Jan 14 2004 Arnaldo Carvalho de Melo -+ 2004-01-14 21:49:35 (44720) -- Removed unwanted unpackaged files +* Wed Jun 04 2003 Elliot Lee +- rebuilt -* Wed Jan 14 2004 Arnaldo Carvalho de Melo -+ 2004-01-14 20:47:57 (44710) -- Created the i18n-all package -- BuildRequires: s/emacs-nox/emacs/g, I have to teach maragato about - apt-cache whatdepends the-packages-to-be-happily-killed... ;) +* Wed May 14 2003 Leon Ho +- 0.11.5 -* Tue Nov 11 2003 Ricardo Erbano -+ 2003-11-11 09:46:51 (39528) -- Fixed group description +* Wed Jan 22 2003 Tim Powers +- rebuilt -* Wed Oct 01 2003 Arnaldo Carvalho de Melo -+ 2003-10-01 12:27:12 (36926) -- s/claims/complains/g +* Thu Jan 16 2003 Leon Ho 0.11.4-6 +- add online help for msghack replacement -* Wed Oct 01 2003 Marcelo Ricardo Leitner -+ 2003-10-01 12:23:30 (36925) -- Split into -devel and -devel-static -- Re-enabled shared libraries -- Added work-around for lib recompiling at make install -- Use cp to join the docs, not mv +* Thu Dec 5 2002 Leon Ho 0.11.4-5 +- add patch to fix gettextize (#78720) -* Tue Sep 30 2003 Marcelo Ricardo Leitner -+ 2003-09-30 15:05:37 (36909) -- New upstream: 0.12.1 Closes: #9388 -- Removed all already in code patches. +* Wed Nov 27 2002 Tim Powers 0.11.4-4 +- remove unpackaged files from the buildroot -* Fri Sep 12 2003 Arnaldo Carvalho de Melo -+ 2003-09-12 12:57:39 (35714) -- BuildRequires coreutils, not fileutils +* Wed Aug 28 2002 Trond Eivind Glomsr?d 0.11.4-3 +- Use %%{_libdir} instead of /usr/lib (#72524) -* Sat Sep 06 2003 Arnaldo Carvalho de Melo -+ 2003-09-06 00:07:30 (35324) -- o minor spec cleanups: one line per BuildRequires, sorted +* Fri Aug 2 2002 Nalin Dahyabhai 0.11.4-2 +- install ulonglong.m4, which is required by uintmax_t.m4, which is already + being installed -* Fri Dec 27 2002 Ricardo Erbano -+ 2002-12-27 19:46:29 (20874) -- Now all files need to build are in BuildRequires -- Created sub-package gettext-doc and put missing manpage files into -- Closes: #7289, gettext: not building on Alpha and Sparc +* Sun Jul 28 2002 Trond Eivind Glomsr?d 0.11.4-1 +- 0.11.4 -* Tue Sep 03 2002 Gustavo Niemeyer -+ 2002-09-03 14:40:41 (11615) -- Imported package from snapshot. +* Fri Jun 21 2002 Tim Powers +- automated rebuild -* Thu Aug 29 2002 Gustavo Niemeyer -+ 2002-08-29 17:45:45 (7925) -- Imported package from 8.0. +* Thu May 23 2002 Tim Powers +- automated rebuild -* Wed Aug 28 2002 Gustavo Niemeyer -+ 2002-08-28 18:34:39 (4324) -- Imported package from 7.0. +* Tue May 14 2002 Trond Eivind Glomsr?d 0.11.2-1 +- 0.11.2 +- include some new files -* Tue Aug 27 2002 Gustavo Niemeyer -+ 2002-08-27 18:59:03 (567) -- Imported package from 6.0. +* Fri Apr 5 2002 Trond Eivind Glomsr?d 0.11.1-2 +- Add patch to make it compile with C99 compilers (#62313) + +* Wed Mar 13 2002 Trond Eivind Glomsr?d 0.11.1-1 +- 0.11.1 + +* Sun Feb 17 2002 Florian La Roche +- update gettext to 0.11 +- disable patch4 + +* Wed Jan 09 2002 Tim Powers +- automated rebuild + +* Wed Dec 5 2001 Trond Eivind Glomsr?d 0.10.40-3 +- improve automake handling + +* Wed Nov 14 2001 Trond Eivind Glomsr?d 0.10.40-2 +- Add URL +- Add automake workaround (#56081) + +* Sun Sep 16 2001 Trond Eivind Glomsr?d 0.10.40-1 +- 0.10.40 - libintl is now LGPLed (it was GPLed). Note that RHL + uses the glibc version, and don't include libintl from gettext. +- include new man pages +- don't include the elisp mode - bundle it into the main emacs package, + like we do for XEmacs. +- README-alpha no longer exists, so don't list it as a doc file + +* Fri Aug 24 2001 Trond Eivind Glomsr?d 0.10.38-7 +- Rebuild - this should fix #52463 + +* Wed Aug 22 2001 Trond Eivind Glomsr?d 0.10.38-6 +- Fix handling of multiline entries (rest of #50065) +- don't use the references of the last entry in a po file +- remove duplicates when inverting +- Own the en at quot and en at boldquot locale dirs (#52164) +- Handle entries with a first line of "" as identical to those + without + +* Thu Aug 9 2001 Trond Eivind Glomsr?d +- Added "--append" and "-o" to msghack, which should address + initial concerns in #50065 + +* Thu Jul 19 2001 Trond Eivind Glomsr?d +- New msghack - from scratch, in python + +* Tue Jul 17 2001 Trond Eivind Glomsr?d +- msghack is back + +* Mon Jun 4 2001 Trond Eivind Glomsr?d +- Include some docfiles + +* Sun Jun 03 2001 Florian La Roche +- 0.10.38 +- do not include charset.alias + +* Wed May 2 2001 Nalin Dahyabhai +- Build statically. + +* Mon Apr 30 2001 Trond Eivind Glomsr?d +- 0.10.37 +- Disable all but two patches + +* Sun Feb 25 2001 Trond Eivind Glomsr?d +- Initialize proper fonts when entering po-mode (#29152) + +* Mon Feb 12 2001 Yukihiro Nakai +- More fix about msgmerge. + +* Mon Feb 12 2001 Yukihiro Nakai +- Fix for msgmerge not to break multibyte strings + at Japanese locale. + +* Wed Jan 24 2001 Matt Wilson +- fixed the %lang generator to not have "./" in the lang + +* Sun Jan 14 2001 Trond Eivind Glomsr?d +- add an init file for the emacs po-mode +- update source URL + +* Thu Jan 11 2001 Bill Nottingham +- put gettext in /bin for initscripts use +- %langify + +* Fri Dec 29 2000 Bill Nottingham +- prereq /sbin/install-info + +* Wed Aug 23 2000 Trond Eivind Glomsr?d +- Added patch from Ulrich Drepper + +* Fri Aug 04 2000 Trond Eivind Glomsr?d +- update DESTDIR patch (#12072) + +* Thu Jul 13 2000 Prospector +- automatic rebuild + +* Mon Jul 10 2000 Trond Eivind Glomsr?d +- fix problems wrt to DESTDIR (#12072) + +* Thu Jun 22 2000 Preston Brown +- use FHS paths +- add buildroot patch for .../intl/Makefile.in, was using abs. install path + +* Fri Apr 28 2000 Bill Nottingham +- minor configure tweaks for ia64 + +* Sun Feb 27 2000 Cristian Gafton +- add --comments to msghack + +* Thu Feb 10 2000 Cristian Gafton +- fix bug #9240 - gettextize has the right aclocal patch + +* Wed Jan 12 2000 Cristian Gafton +- add the --diff and --dummy options + +* Wed Oct 06 1999 Cristian Gafton +- add the --missing option to msghack + +* Wed Sep 22 1999 Cristian Gafton +- updated msghack not to merge in fuzzies in the master catalogs + +* Thu Aug 26 1999 Cristian Gafton +- updated msghack to understand --append + +* Wed Aug 11 1999 Cristian Gafton +- updated msghack to correctly deal with sorting files + +* Thu May 06 1999 Cristian Gafton +- msghack updates + +* Sun Mar 21 1999 Cristian Gafton +- auto rebuild in the new build environment (release 8) + +* Mon Mar 08 1999 Cristian Gafton +- added patch for misc hacks to facilitate rpm translations + +* Thu Dec 03 1998 Cristian Gafton +- patch to allow to build on ARM + +* Wed Sep 30 1998 Jeff Johnson +- add Emacs po-mode.el files. + +* Sun Sep 13 1998 Cristian Gafton +- include the aclocal support files + +* Fri Sep 3 1998 Bill Nottingham +- remove devel package (functionality is in glibc) + +* Tue Sep 1 1998 Jeff Johnson +- update to 0.10.35. + +* Mon Jun 29 1998 Jeff Johnson +- add gettextize. +- create devel package for libintl.a and libgettext.h. + +* Mon Apr 27 1998 Prospector System +- translations modified for de, fr, tr + +* Sun Nov 02 1997 Cristian Gafton +- added info handling +- added misc-patch (skip emacs-lisp modofications) + +* Sat Nov 01 1997 Erik Troan +- removed locale.aliases as we get it from glibc now +- uses a buildroot + +* Mon Jun 02 1997 Erik Troan +- Built against glibc From svn at tinysofa.org Thu Jul 1 15:48:23 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:48:23 +1000 (EST) Subject: [tinysofa-svn] r2755 - tinysofa/snapshot/grep/current/specs Message-ID: <20040701154823.426624E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:48:22 +1000 (Fri, 02 Jul 2004) New Revision: 2755 Modified: tinysofa/snapshot/grep/current/specs/grep.spec Log: - Sync with 2.0. - Kept: - grep-2.5-i18n.patch: - grep-2.5.1-bracket.patch: - grep-2.5.1-fgrep.patch: - grep-2.5.1-gofast.patch: - grep-2.5.1-manpage.patch: - grep-2.5.1-oi.patch: - grep-2.5.1.tar.bz2: Modified: tinysofa/snapshot/grep/current/specs/grep.spec =================================================================== --- tinysofa/snapshot/grep/current/specs/grep.spec 2004-07-01 15:48:19 UTC (rev 2754) +++ tinysofa/snapshot/grep/current/specs/grep.spec 2004-07-01 15:48:22 UTC (rev 2755) @@ -1,9 +1,9 @@ Summary: The GNU versions of grep pattern matching utilities. Name: grep Version: 2.5.1 -Release: 3ts +Release: 28ts License: GPL -Group: tinysofa official +Group: Applications/Text Source: ftp://ftp.gnu.org/pub/gnu/grep/grep-%{version}.tar.bz2 Patch0: grep-2.5.1-fgrep.patch Patch1: grep-2.5.1-bracket.patch @@ -12,9 +12,10 @@ Patch4: grep-2.5.1-manpage.patch Patch5: grep-2.5.1-gofast.patch Prefix: %{_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-root +Prereq: /sbin/install-info +Buildroot: %{_tmppath}/%{name}-%{version}-root Requires: pcre -Buildrequires: pcre-devel gettext texinfo +Buildrequires: pcre-devel %description The GNU versions of commonly used grep utilities. Grep searches @@ -47,7 +48,8 @@ mv $RPM_BUILD_ROOT%{_prefix}/bin/* $RPM_BUILD_ROOT/bin rm -rf $RPM_BUILD_ROOT%{_prefix}/bin %endif -rm -rf $RPM_BUILD_ROOT%{_infodir} +gzip -9f $RPM_BUILD_ROOT%{_infodir}/grep* +rm -f $RPM_BUILD_ROOT%{_infodir}/dir # Use symlinks for egrep and fgrep ln -sf grep $RPM_BUILD_ROOT/bin/egrep @@ -58,6 +60,14 @@ %clean rm -rf ${RPM_BUILD_ROOT} +%post +[ -e %{_infodir}/grep.info.gz ] && /sbin/install-info --quiet --info-dir=%{_infodir} %{_infodir}/grep.info.gz || : + +%preun +if [ $1 = 0 ]; then + [ -e %{_infodir}/grep.info.gz ] && /sbin/install-info --quiet --info-dir=%{_infodir} --delete %{_infodir}/grep.info.gz +fi + %files -f %{name}.lang %defattr(-,root,root) %doc ABOUT-NLS AUTHORS THANKS TODO NEWS README ChangeLog @@ -67,15 +77,10 @@ %else %{_prefix}/bin/* %endif +%{_infodir}/*.info*.gz %{_mandir}/*/* %changelog -* Thu May 20 2004 tsintegrate 2.5.1-3ts -- current (2.5.1-2ok) integrated as 2.5.1-3ts for release 1.0-U1 - -* Thu May 20 2004 Omar Kilani 2.5.1-2ok -- Third attempt at a working grep package. - * Tue May 18 2004 Jeremy Katz 2.5.1-28 - rebuild From svn at tinysofa.org Thu Jul 1 15:48:19 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:48:19 +1000 (EST) Subject: [tinysofa-svn] r2754 - in tinysofa/snapshot/gnupg/current: sources specs Message-ID: <20040701154819.EACAC4E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:48:19 +1000 (Fri, 02 Jul 2004) New Revision: 2754 Added: tinysofa/snapshot/gnupg/current/sources/57548DCD.gpg tinysofa/snapshot/gnupg/current/sources/gnupg-1.2.4.tar.bz2.sig tinysofa/snapshot/gnupg/current/sources/gnupg-shm-coprocessing.expect Removed: tinysofa/snapshot/gnupg/current/sources/gnupg-index.html tinysofa/snapshot/gnupg/current/sources/tinysofa.pub.gpg Modified: tinysofa/snapshot/gnupg/current/specs/gnupg.spec Log: - Sync with 2.0. - Kept: - gnupg-1.2.4.tar.bz2: - Added: - 57548DCD.gpg: - gnupg-1.2.4.tar.bz2.sig: - gnupg-shm-coprocessing.expect: - Removed: - gnupg-index.html: - tinysofa.pub.gpg: Added: tinysofa/snapshot/gnupg/current/sources/57548DCD.gpg =================================================================== --- tinysofa/snapshot/gnupg/current/sources/57548DCD.gpg 2004-07-01 15:48:16 UTC (rev 2753) +++ tinysofa/snapshot/gnupg/current/sources/57548DCD.gpg 2004-07-01 15:48:19 UTC (rev 2754) @@ -0,0 +1,82 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1.2.0 (GNU/Linux) + +mQGiBDWiHh4RBAD+l0rg5p9rW4M3sKvmeyzhs2mDxhRKDTVVUnTwpMIR2kIA9pT4 +3No/coPajDvhZTaDM/vSz25IZDZWJ7gEu86RpoEdtr/eK8GuDcgsWvFs5+YpCDwW +G2dx39ME7DN+SRvEE1xUm4E9G2Nnd2UNtLgg82wgi/ZK4Ih9CYDyo0a9awCgisn3 +RvZ/MREJmQq1+SjJgDx+c2sEAOEnxGYisqIKcOTdPOTTie7o7x+nem2uac7uOW68 +N+wRWxhGPIxsOdueMIa7U94Wg/Ydn4f2WngJpBvKNaHYmW8j1Q5zvZXXpIWRXSvy +TR641BceGHNdYiR/PiDBJsGQ3ac7n7pwhV4qex3IViRDJWz5Dzr88x+Oju63KtxY +urUIBACi7d1rUlHr4ok7iBRlWHYXU2hpUIQ8C+UOE1XXT+HB7mZLSRONQnWMyXnq +bAAW+EUUX2xpb54CevAg4eOilt0es8GZMmU6c0wdUsnMWWqOKHBFFlDIvyI27aZ9 +quf0yvby63kFCanQKc0QnqGXQKzuXbFqBYW2UQrYgjXji8rd8bQnV2VybmVyIEtv +Y2ggKGdudXBnIHNpZykgPGRkOWpuQGdudS5vcmc+iEYEEBECAAYFAjlMzZYACgkQ +AnHoI6r8H7iNNgCeM4yUpzm26qykeABSABWYF1rlc0YAoIipncW7fey4vJEAEZn6 +03e0nVBniQFfAwUQNaIeQwNvEbj/PqoLEANjMgUdHoj1KL2DM9A1FwWzbOetOnml +XkyTp/VqpGBnEvcTipRnfF49CHACjd9LLeQLAuYUaq/Nq61IwefwrlXW75PkJIeo +sVgqqPkUa24H/HCgoNcfpQ4/T6Xkg/wfVFOOZ7cWGpqF5z7M8bc1Pnu9zZG7a3o+ +a4DCvLYEy5IUwGzvDNeTILcNsjngxX4go+Mcw5GK8ry4jyOadr2F01XIGJ8KTUZz +GQcFIIW9TzEl4+wD9D//MJ6W+uesiIx9jgJBOYrOR70xLNsBlAhF12CsYCyJfW0T +xndgx3yUOm66MctUR1Zmjqzng4m7Kceu0UU5t1qm7S4itP50RdIBIxRsS40Isvdo +KesS0YkLDEHZM9C8IK9HYErOiXowZbED6eZ115CJvav4Zegpct2cdymwCMDuWReT +cgXInswsUrq4OuMZsYmzYUpJ25SNL8hviEYEEBECAAYFAjWnKxYACgkQBDXF0kXc +pml4ygCbBkS85L3mMQqP8edsUEMOnkLh3DQAniexmAOcYMAbsUIQkjr4ugghSK3j +iEYEEBECAAYFAjbo+t0ACgkQBwMqlokEyOISmACgzciKys3tdd2Gc/2WbHRQkoTt +KwUAnAxYgGcYr3eiO5ZeH1iANHJJkpmoiEYEMBECAAYFAjiejvAACgkQJKG+zCtp +Pr/DygCfRcs+fQXiz3BDikZc08KbswnoTnMAn0JtqdGVooBegPUs/luYAMaREGp9 +iEYEEBECAAYFAji+32kACgkQLkCsy2RwqyYcOQCgvdMiLOiYi4Qo7q/AcwVwWd2x +oBoAoIkCSr4jaaNiKYUTtqOVovSPJ5waiEYEEBECAAYFAjnMDzwACgkQMsNbgEe6 +k1f2/ACfVlFRjIhZXlehFQirsSnPWJ36ENUAoMxlKjXmH298YCOvK2nE6zlyVb4b +iEYEEBECAAYFAjlt52AACgkQMsaTO6jtIB/GMwCfYjsJJHITPyaRoPd6ZozVZjG9 +tvkAoIU6U2OjE2a7dJJZ+CtbUQRJg9BjiQB1AwUwOJ8tOTsiq2M8byjxAQGA4QMA +kRoWcnXUYmUylIiTFPiRTUOlckZz7Dm+FfzGOqNOWRsJLUB6vIzYUbP/A8oOMe0b +3thum2Z6KCvHlln07/Cn3qxNikqIqT3dhHLM860ngaFqExHjwsG7picemkmfELKD +iEYEEBECAAYFAjhdSr4ACgkQQ8zQb92p23ap6QCg3Ue9hlDoDG81UvHczTqz/K2T +bU0AoM2fRGAbIIGLJB4u5XcaS6rGR7uQiEYEEBECAAYFAjlmzQwACgkQRxYpGYKV +e2a48QCgl7uyIRc1hV+U/4aV/vUzbG+RJrcAoJ6t3R3C+GaLgCji6MGe5kjhhQiE +iQEVAwUQN9kDZE3DETE4/ubDAQHKEQf/bNtM+Je5p9/TZePtCpIjCOjQ7juyDE0d +u5QwkHum8PSryD9P6NfS7HoKLXqbjZo5SOnbngbfdE3rv0F2OIcbjsM6uJxO90ur +25a2qD6KtCiwl6f57SkiwVN+aPXMDUbyutsAOpUITPhKmJsMsHnBcOFV2ppHewC1 +4gBm2LXGhOIVzXYqtquQuf4FpZS28FuL3duwP7JJMT+Qh54IYtb0gQeiTx2J3VAx +Zc0zZW7NJ0pKjFqK4k6S5nYC6LQcB0TJxjl+E6oijgH+u3Eal0FcEELE2L5VFqrQ +JafXcGIgjYG806YKfzv1Hz2ozG6PXRfdGdFAgeCPiaD9fvOeLrzgU4hGBBARAgAG +BQI5DSiPAAoJEFL+72cgfnGZx5UAn1UiUx9sLoaeLeMtdmztURfk1ZAJAKCJ3juG +6XKBMjLl4+SmCM47VkM/9ohGBBARAgAGBQI27U5sAAoJEF3iSZZbA1iiarYAn35q +U3ZOlVECELE/3V6q98Q30eAaAKCtO+lacH0Qq1E6v4BP/9y6MoLIhohGBBARAgAG +BQI4mP1QAAoJEGXcQrfU5YAmi8wAnihZi/5OG9CnzMx1UKdtBAvvt4t2AJ9lX+jC +eoO3TF8QykdMXSFIdDHL3ohdBBMRAgAdBQI2VaCmBQkIbQyIAwsEAwUVAwIGAQMW +AgECF4AACgkQaLeriVdUjc0uPgCgh3XmBzJikFfZgu0RBOVc+nea0QYAn1THMkT+ +3cQcIcrZsAg6QHAhbwi0iEYEEBECAAYFAjWiJzwACgkQbH7huGIcwBN+1gCfV85o +oNQ6351LfysH4InZD6ISVYkAoNE+mnyrkbKVszwM+UykKVY3dNipiEYEEBECAAYF +AjhYzxoACgkQcS0LF9A9ik9tnACdGvudfTb16rUTQ+/0XBCuCzdm76cAnizblEqL +Tz39q+xVWqebzt6ADMHZiEYEEBECAAYFAjhgw+gACgkQcUbw4zBwKUilvQCfUf2z +HAkXn/ZsovQdmwtc7jdqrWwAn3PtTRw4Zg0itE2keUnrtk8lfS3HiEYEEBECAAYF +AjlGzSkACgkQf+LtXvUUOyouSgCeK+HTUje5C6tZzludvt9PUYg6Z/IAnA4T8oKs +lXz1GSjrVcL7bR2XMrMaiEYEEBECAAYFAjjzeicACgkQhD9X16y1jU+ElgCfSESA +hJjzXYaGFlHO4T+xzlFYR34An1LEeG0fSgk2spwZirwCgP3IkwYeiEYEEBECAAYF +AjWnK3EACgkQhOT4lAHlmWgY6ACeNVyqilcTIxgRl8X3xJMqa60o+IoAn3EebFlb +cq1VJNF/8hNI1Kz/SAKUiQEVAwUQNtZqGI5fAwcrqd1pAQGdLQf/b+ZDinYe68A2 +jxxS8bxu35bA/FzrzDPyx9LgMbJlHm12MCEVg84mag5hR6Z807eSzO58mjyY4IH0 +gppSyrceWYCIFzPQ+1q8D0YHF4N0h27im103okkET/IKDHgA5UBXfrF/JeNJsChf +ZJUF0e/9Ngk/izOQPyp1zOJqkNXIxS4gsIcdhvkbMeDxA0w6AS91ujBP6cSM59DS +boafaA1byrlpircCj1kh0Y/AkeejgcXmRvrDyt1MkjP2RHRC9IhGb4GEcKX/7fL5 +0vPy4vzOqXpuhZ8C2pUML/7zBRULwYhyakSdVcbHR1QzG2qdSzuwNkBoIT5Hg5wD +eI8grKl1bYhGBBARAgAGBQI21moBAAoJEJKyepXkBBOquBcAoNljEbSHXMLH54/J +4HitAsiI18amAKDrDLnxCzmC+8m/OTNu4mZamePP3ohGBBARAgAGBQI5zzSCAAoJ +EKZZdW0/TbZp0ssAn1qZ7PJCIHf6ErUG111c5bWjCbW3AKC/3Cf/ZNZK2mKZOmfC +CRn9sBBlRYhGBBARAgAGBQI6Gfa2AAoJEL4aU+syO97mR7kAnjSX4QP7gR6x1BYT +CC89u2gSXAQtAJ9nReACgNU/D+TLqimlMS9TqnTyZIhGBBARAgAGBQI5kqZcAAoJ +EMfg9pSiTYtOVeUAoMTgBNUjD+AYQEzIU1zYkiW1NgZhAKDW3GzsDPqzs3nF+mkM +nggYPFnEnohGBBARAgAGBQI32QNDAAoJEM024CF+PI6rjjkAoKo8mBja4lOGW+mi +luBh3LiTaDNJAKDQrqc4kkfaQcVlXjDVYVael74oJohGBBARAgAGBQI5tN9hAAoJ +ENGODw57qpD6cEkAoLm4o/nqc2SDZ2eKr5hYDTUfWBlCAJ9g8KJvMM6+/1tEPaol +M/hVWKBx6ohGBBARAgAGBQI4JoPuAAoJENXoh0OUdhKzCAMAnRfk1mf0+yiUdMuS +ENhKMXyysZ2sAKCvMSdEEmGomWCgsQfLWMzCLR7+5YhGBBARAgAGBQI314yyAAoJ +ENa2+kuMjp8j2KwAoK9+TObp3jf+TwnPVIfXGkmHSbcMAKDo8zs+isKynXOMF2g5 +0STZwaWTHYhGBBARAgAGBQI58yQiAAoJEOY1PDi4UosBhq8AoN9OP59IYJ+NQYJm +pdoyPFgJitPfAJ4tlu7qDh0lpQUBJKIrCjG0od4yIYhGBBARAgAGBQI5zQ+XAAoJ +EPd9ddcOjOSBz8YAn2a5jCk052U+frr+sFRQ1MqKmrxKAJ9J71OdRNZLefkD7ihJ +2Ymco8Gsp4hGBBARAgAGBQI6P43CAAoJECNvPhUlN7VRiawAnAmf5v4tHh5QrLL7 +86cZv31dH22LAJ4lPx6vbQNJr5LZ60e0eJ3mjcFWLA== +=az5I +-----END PGP PUBLIC KEY BLOCK----- Added: tinysofa/snapshot/gnupg/current/sources/gnupg-1.2.4.tar.bz2.sig =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/gnupg/current/sources/gnupg-1.2.4.tar.bz2.sig ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: tinysofa/snapshot/gnupg/current/sources/gnupg-index.html =================================================================== --- tinysofa/snapshot/gnupg/current/sources/gnupg-index.html 2004-07-01 15:48:16 UTC (rev 2753) +++ tinysofa/snapshot/gnupg/current/sources/gnupg-index.html 2004-07-01 15:48:19 UTC (rev 2754) @@ -1,57 +0,0 @@ - - - - - - - - - -tinysofa enterprise server htmlinfo documentation for gnuPG - - - - -
- -
-

-tinysofa enterprise server htmlinfo documentation for gnuPG -

-
-
-

-

-
-
-

- - - -
gpg
gpgv
- -

-
-

- [Learn more about tinysofa] -

-
-
- - -

- tinysofa is a trademark of tinysofa development team. Linux is a trademark - of Linus Torvalds. -
-

- - -
-
- - Added: tinysofa/snapshot/gnupg/current/sources/gnupg-shm-coprocessing.expect =================================================================== --- tinysofa/snapshot/gnupg/current/sources/gnupg-shm-coprocessing.expect 2004-07-01 15:48:16 UTC (rev 2753) +++ tinysofa/snapshot/gnupg/current/sources/gnupg-shm-coprocessing.expect 2004-07-01 15:48:19 UTC (rev 2754) @@ -0,0 +1,5 @@ +spawn -noecho ./g10/gpg --homedir . --run-as-shm-coprocess 0 +while {1} { expect { + "shared memory coprocessing is not available" {exit 1} + "Go ahead and type your message" {exit 0} +} } Deleted: tinysofa/snapshot/gnupg/current/sources/tinysofa.pub.gpg =================================================================== --- tinysofa/snapshot/gnupg/current/sources/tinysofa.pub.gpg 2004-07-01 15:48:16 UTC (rev 2753) +++ tinysofa/snapshot/gnupg/current/sources/tinysofa.pub.gpg 2004-07-01 15:48:19 UTC (rev 2754) @@ -1,30 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v1.2.4 (GNU/Linux) - -mQGiBEBg+fkRBADdUZf+uoKQLXwzji65VNd75SG0+3yKQNFvL+dpAvz9wtZJhNaf -GWCt5Uhljq+P/K9V9DCAC8IFYXikXJF5tHa6lO60nyKTCZKWcA3iImGQHTeTnD7w -Wi32eGlj9bESdEcrHIAvCIQkQx/G621m8PskB6uhqHpqhNn5OQjFsdZE+wCgqS/b -M9PFKUlK0MPdWlTf+RREPLcEAKmiW3ajJbYQa/Vzt1MH37hPM6bB81hnFmtId0Qm -p8b/pGccXzY9lp1CxVGVqHkD8Ka1GESVHpuayxqF0/9PwmB6eoUjF7XJPb3JL4uF -Srls5qkIwN2ANaQhdtErZttNRkeOUc6EYcUST24wdAiWkEWSGawCKgTZ58pVaUvZ -NxYAA/4/Mb3/b4Zs5i/sxL0o6pM1Ea5hwhxhLlKRr4vILxdaaNx+r4aPkJPqYIN2 -iMbReJDXv6zDoXAJK8j7uWPxlwGIBhrKuCzJ2bsjqvWFVb6o1tQTdk9xNRkmdE7F -mFFnXzTq+kfpFcq+Olnz3G+wJeGDIK0zWajOW5LF8oIKf5wysbQtdGlueXNvZmEg -KHN0YWJsZSBzaWduIGtleSkgPHBraUB0aW55c29mYS5vcmc+iF4EExECAB4FAkBg -+fkCGwMGCwkIBwMCAxUCAwMWAgECHgECF4AACgkQ2sCtNw8SQKJGdgCgh5Y1Qj7X -bR7pysIX0VGKijZgO3oAoI+spVymBYNQT4VAvdv75eNox0vyuQINBEBg+gAQCADI -V/5HlbmD8IoHuKzV7bLRc+x26JKM+GALLKpnj3pwPxXf2zy2aO+gYYdK9sSYeRRk -ChNoAa/gtWT9+UhqOoZDc29xHblPWBDeiAUhKMA+GkokcI2BQAjCYUwEqAgOVgdY -S3eQrbf3o3SHvTxA5N6b8eaEF5YsIlMBhU+5eu52FepcpQRTj/uV7pMGV8e65rkv -wPJRMpWlpHsF9KKeNjJHFueMPt4ciSUsNA8VwryZ6mkRCn7OXgkvOwPsSGjgmIn4 -iqGNPjJUk17ZILLWAuQ4zxXIWcT7SjQchEOFahMYCQg7WcbtCLazoecRIjWcGk0R -5TnxFSZGGwenaEjIlkIDAAMFB/sGUFPjevobF6lRQpB2/oEZ92bdA3/QFtcuH1PH -hpyEvAs6csR90DH8o+/Uoa8QL7BVhCLAUPyebASE4aJ80wuCKI4+nlpjIo80K4F4 -opgI+JyDv7+5vz6dGmsI3GuLj6WhlxjQ2qKtZoTbFgAfEK7Goj9GiMKzGaHApwVa -zYWjr4121ZvVGwb5xVjCJl4qaf8EW6FiGhLo5Drz7HJwPBMmXTkAgpnZDQ2orL2M -XIIj3UVNUbbCpvIq+JvJ6FxI7d5ALVnGdl3WO6ASznK1hOM5uE+lasRhV/Sbv9AH -RKhAOR4UDzwh4re3+oKOfX3/dsZ7hlzainRtc73yjhXL4L65iEkEGBECAAkFAkBg -+gACGwwACgkQ2sCtNw8SQKL0EACfbv/aqmeljjRdJJFUcu/I2Lt8nkgAn1/ZeFmQ -wWLJ/2fDr/t2agFUVoMv -=8brC ------END PGP PUBLIC KEY BLOCK----- Modified: tinysofa/snapshot/gnupg/current/specs/gnupg.spec =================================================================== --- tinysofa/snapshot/gnupg/current/specs/gnupg.spec 2004-07-01 15:48:16 UTC (rev 2753) +++ tinysofa/snapshot/gnupg/current/specs/gnupg.spec 2004-07-01 15:48:19 UTC (rev 2754) @@ -1,223 +1,247 @@ -Summary: GPL public key crypto +Summary: A GNU utility for secure communication and data storage. Name: gnupg Version: 1.2.4 -Release: 5ts +Release: 2.1ts License: GPL -Group: tinysofa official -Source: http://ftp.gnupg.org/gcrypt/%{name}/%{name}-%{version}.tar.bz2 -Source1: tinysofa.pub.gpg -Source2: gnupg-index.html -URL: http://www.gnupg.org -Provides: gpg openpgp gnupg -Prereq: zlib, htmlinfo -BuildRequires: texinfo -BuildRequires: openldap-devel -BuildRoot: %{_tmppath}/%{name}-root +Group: Applications/System +Source0: ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-%{version}.tar.bz2 +Source1: ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-%{version}.tar.bz2.sig +Source2: gnupg-shm-coprocessing.expect +Source3: 57548DCD.gpg +URL: http://www.gnupg.org/ +BuildPrereq: autoconf, expect +Provides: gpg, openpgp +Prereq: /sbin/install-info +BuildRoot: %{_tmppath}/%{name}-%{version}-root %description -GnuPG is a complete and free replacement for PGP. Because it does not -use IDEA it can be used without any restrictions. GnuPG is in compliance -with the OpenPGP specification (RFC2440). +GnuPG (GNU Privacy Guard) is a GNU utility for encrypting data and +creating digital signatures. GnuPG has advanced key management +capabilities and is compliant with the proposed OpenPGP Internet +standard described in RFC2440. Since GnuPG doesn't use any patented +algorithm, it is not compatible with any version of PGP2 (PGP2.x uses +only IDEA for symmetric-key encryption, which is patented worldwide). +%prep +%setup -q -%package utils -Summary: some utilities to get gpg-keys -Group: tinysofa official -Requires: gnupg = %{version}-%{release} -Requires: openldap-libs -Requires: perl +%build +configure_flags= -%description utils -Helper utilities for gnuPG to get keys from a keyserver, either with -LDAP or by email. +%ifarch ppc64 +configure_flags=--disable-asm +RPM_OPT_FLAGS="$RPM_OPT_FLAGS -O0" +%endif +CFLAGS="$RPM_OPT_FLAGS -fPIE" ; export CFLAGS +LDFLAGS="$RPM_OPT_FLAGS -pie" ; export LDFLAGS +%configure --disable-rpath --libexecdir=%{_libdir} --with-zlib $configure_flags -%prep -%setup -q +make %{?_smp_mflags} +make check +expect -f $RPM_SOURCE_DIR/gnupg-shm-coprocessing.expect +%clean +rm -rf $RPM_BUILD_ROOT -%build -[ -n "$LINGUAS" ] && unset LINGUAS +%install +rm -rf $RPM_BUILD_ROOT +%makeinstall libexecdir=$RPM_BUILD_ROOT/%{_libdir}/%{name} +install -m644 doc/gpg.info doc/gpgv.info $RPM_BUILD_ROOT/%{_infodir} +sed 's^\.\./g[0-9\.]*/^^g' tools/lspgpot > lspgpot +install -m755 lspgpot $RPM_BUILD_ROOT%{_bindir}/lspgpot +rm -f $RPM_BUILD_ROOT/%{_infodir}/dir +%find_lang %name -%configure \ - --program-prefix='' \ - --libexecdir="/usr/lib/%{name}" \ - --with-mailprog=/usr/sbin/sendmail \ - --disable-nls - -make +%post +/sbin/install-info --entry="* gpg: (gpg). encryption and signing tool" %{_infodir}/gpg.info.gz %{_infodir}/dir +/sbin/install-info --entry="* gpgv: (gpgv). signature verification tool" %{_infodir}/gpgv.info.gz %{_infodir}/dir -cd doc -makeinfo --html --no-split gpg.texi -makeinfo --html --no-split gpgv.texi +%preun +if [ $1 = 0 ]; then + /sbin/install-info --delete %{_infodir}/gpgv.info.gz %{_infodir}/dir + /sbin/install-info --delete %{_infodir}/gpg.info.gz %{_infodir}/dir +fi +%files -f %{name}.lang +%defattr(-,root,root) +%doc AUTHORS BUGS COPYING ChangeLog INSTALL NEWS PROJECTS README THANKS TODO +%doc doc/DETAILS doc/HACKING doc/OpenPGP doc/samplekeys.asc +%{_bindir}/* +%dir %{_datadir}/%{name} +%{_datadir}/%{name}/FAQ +%{_datadir}/%{name}/faq.html +%{_datadir}/%{name}/options.skel +%{_infodir}/* +%{_libdir}/%{name} +%{_mandir}/man1/* +%{_mandir}/man7/* -%install -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT -%makeinstall install-strip libexecdir="$RPM_BUILD_ROOT/usr/lib/%{name}" +%changelog +* Tue Mar 02 2004 Elliot Lee +- rebuilt -install -m755 -d $RPM_BUILD_ROOT/usr/lib/%{name} -install -m644 %SOURCE1 $RPM_BUILD_ROOT/usr/lib/%{name}/tinysofa.pub.gpg -install -m755 -d $RPM_BUILD_ROOT/usr/share/html/%{name} -install -m644 %SOURCE2 $RPM_BUILD_ROOT/usr/share/html/%{name}/ -install -m644 doc/gpg.html $RPM_BUILD_ROOT/usr/share/html/%{name}/ -install -m644 doc/gpgv.html $RPM_BUILD_ROOT/usr/share/html/%{name}/ +* Fri Feb 13 2004 Elliot Lee +- rebuilt -mv $RPM_BUILD_ROOT/usr/share/gnupg/faq.html $RPM_BUILD_ROOT/usr/share/html/%{name}/ -rm -rf $RPM_BUILD_ROOT/usr/share/gnupg/FAQ -rm -rf $RPM_BUILD_ROOT/usr/share/info +* Fri Feb 6 2004 Nalin Dahyabhai 1.2.4-1 +- update to 1.2.4, dropping separate ElGamal disabling patch +* Fri Dec 12 2003 Nalin Dahyabhai 1.2.3-3 +- rebuild -%post -# Dummy gpg-run to create directory if new install... Silly but nessecary. -/usr/bin/gpg >/dev/null &1 +* Mon Dec 1 2003 Nalin Dahyabhai 1.2.3-2 +- incorporate patch from gnupg-announce which removes the ability to create + ElGamal encrypt+sign keys or to sign messages with such keys -# Import the tinysofa-sign-key -/usr/bin/gpg --import /usr/lib/gnupg/tinysofa.pub.gpg >/dev/null 2>&1 1.2.3-1 +- use -fPIE instead of -fpie because some arches need it -# Need to take care of a leftover during install where HOME == / -if [ -d /.gnupg -a ! -d /root/.gnupg ]; then - mv /.gnupg /root -fi +* Mon Oct 27 2003 Nalin Dahyabhai +- build gnupg as a position-independent executable (Arjan van de Ven) -# Update the HTML documentation -/usr/sbin/htmlinfo_update.sh +* Mon Aug 25 2003 Nalin Dahyabhai +- add Werner's key as a source file +* Fri Aug 22 2003 Nalin Dahyabhai +- update to 1.2.3 -%postun -# Update the HTML documentation -/usr/sbin/htmlinfo_update.sh +* Thu Jun 19 2003 Nalin Dahyabhai 1.2.2-3 +- disable asm and optimization on ppc64 +* Fri Jun 13 2003 Nalin Dahyabhai +- add a build-time check to ensure that shm coprocessing was enabled -%clean -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT +* Wed Jun 04 2003 Elliot Lee +- rebuilt +* Mon May 5 2003 Nalin Dahyabhai 1.2.2-1 +- update to 1.2.2, fixing CAN-2003-0255 -%files -%defattr(-,root,root) -%doc INSTALL AUTHORS COPYING ChangeLog NEWS README THANKS TODO PROJECTS -%doc doc/DETAILS doc/FAQ doc/HACKING doc/OpenPGP doc/samplekeys.asc -%doc doc/faq.html -%attr (0755,root,root) %{_bindir}/gpg -%attr (0755,root,root) %{_bindir}/gpgv -%attr (0755,root,root) %{_bindir}/gpgsplit +* Thu May 1 2003 Elliot Lee 1.2.1-5 +- Add ppc64 patch to fix up global symbol names in assembly -%{_mandir}/man1/* -%{_mandir}/man7/* -%dir %{_libdir}/%{name} -%{_libdir}/%{name}/tinysofa.pub.gpg -%dir %{_datadir}/%{name} -%{_datadir}/%{name}/options.skel -/usr/share/html/%{name} +* Fri Feb 28 2003 Kevin Sonney 1.2.1-4 +- remove autoconf call on sparc -%files utils -%defattr(-,root,root) -/usr/lib/%{name}/gpgkeys_ldap -/usr/lib/%{name}/gpgkeys_mailto +* Fri Feb 7 2003 Nalin Dahyabhai 1.2.1-3 +- modify g10defs to look for helpers in libexecdir, because that's where they + get installed, per gnupg-users +- actually drop updates for 1.0.7 which are no longer needed for 1.2.1 + +* Wed Jan 22 2003 Tim Powers +- rebuilt +* Mon Oct 28 2002 Nalin Dahyabhai 1.2.1-1 +- update to 1.2.1 -%changelog -* Wed May 19 2004 tsintegrate 1.2.4-5ts -- current (1.2.4-4ts) integrated as 1.2.4-5ts for release 1.0-U1 +* Tue Sep 24 2002 Nalin Dahyabhai 1.2.0-1 +- update to 1.2.0 +- stop stripping files manually, let the buildroot policies handle it +- add translations updates ca and fr -* Tue May 11 2004 Omar Kilani 1.2.4-4ts -- Add --with-mailprog=/usr/sbin/sendmail to configure so gpgkeys_mailto builds. +* Tue Aug 27 2002 Nalin Dahyabhai 1.0.7-6 +- rebuild -* Tue Jan 27 2004 Erlend Midttun 1.2.4-1tr -- New upstream. +* Fri Jul 24 2002 Nalin Dahyabhai 1.0.7-5 +- specify a menu entry when installing info pages -* Wed Nov 26 2003 Erlend Midttun 1.2.3-1em -- New upstream. +* Thu Jul 24 2002 Nalin Dahyabhai 1.0.7-4 +- add and install info pages (#67931) +- don't include two copies of the faq, add new doc files (#67931) -* Fri Oct 31 2003 Chr. Toldnes 1.2.2-6tr -- Backport (new gpg key) +* Fri Jun 21 2002 Tim Powers +- automated rebuild -* Sun Sep 28 2003 Chr. Toldnes 1.2.2-5tsl -- Port to tawie +* Sun May 26 2002 Tim Powers +- automated rebuild -* Mon Jun 23 2003 Erlend Midttun 1.2.2-4tr -- Added %defattr. +* Tue Apr 30 2002 Nalin Dahyabhai 1.0.7-1 +- update to 1.0.7 -* Wed Jun 18 2003 Erlend Midttun 1.2.2-3tr -- Big rebuild +* Fri Feb 22 2002 Nalin Dahyabhai 1.0.6-5 +- rebuild -* Mon Jun 2 2003 Erlend Midttun 1.2.2-2em -- Fixed filelist. +* Wed Jan 23 2002 Nalin Dahyabhai 1.0.6-4 +- make the codeset patch unconditional -* Wed May 28 2003 Erlend Midttun 1.2.2-1em -- New upstream. +* Thu Aug 9 2001 Nalin Dahyabhai 1.0.6-3 +- set message output encoding to match the message encoding, based on a + patch by goeran at uddeborg.pp.se (#49182) -* Mon Mar 24 2003 Erlend Midttun 1.2.1-4em -- Rebuilt against glibc 2.3.2. +* Sun Jun 24 2001 Elliot Lee 1.0.6-2 +- Bump release + rebuild. -* Mon Mar 24 2003 Goetz Bock 1.2.1-3bg -- removed locals -- splitted additional key-fetchers into own package -- little specfile cleanups +* Wed May 30 2001 Nalin Dahyabhai 1.0.6-1 +- update to 1.0.6, fixes format string exploit -* Tue Mar 11 2003 Erlend Midttun 1.2.1-2em -- Cleaned up %doc +* Mon Apr 30 2001 Nalin Dahyabhai +- update to 1.0.5, dropping various patches -* Tue Feb 25 2003 Erlend Midttun 1.2.1-1em -- New upstream version. +* Tue Feb 27 2001 Trond Eivind Glomsr?d +- langify +- strip binaries in /usr/lib/gnupg -* Mon Jun 3 2002 Erlend Midttun -- New upstream version. +* Tue Feb 27 2001 Nalin Dahyabhai +- fix the group -* Fri Mar 1 2002 Christian H. Toldnes -- gpg-trustix-sign update. -- Package cleanup. +* Tue Dec 18 2000 Nalin Dahyabhai +- go with this version -- 1.0.4c includes a lot of changes beyond just the + two security fixes -* Tue Jun 5 2001 Erlend Midttun -- As pointed out by Bruno Postle, RSA is now supported. +* Thu Dec 14 2000 Nalin Dahyabhai +- add the --allow-secret-key-import patch from CVS in case we don't get a 1.0.5 -* Thu May 31 2001 Erlend Midttun -- Upgraded to 1.0.6 to fix format string bug. +* Fri Dec 8 2000 Nalin Dahyabhai +- build as an errata for 7 -* Wed Dec 20 2000 Oystein Viggen -- Import two patches from RH to fix bugs with importing private keys and - checking detached signatures. +* Fri Dec 1 2000 Nalin Dahyabhai +- add a security patch for a problem with detached signature verification... + might hold off for an impending 1.0.5, though -* Fri Oct 27 2000 Erlend Midttun -- Some mv error in spec file breaking upgrade. +* Thu Oct 19 2000 Nalin Dahyabhai +- fix a bug preventing creation of .gnupg directories -* Wed Oct 18 2000 Erlend Midttun -- Picked up 1.0.4 which fixes a bug with regards to serveral signatures - in the same file. Bugtraq. +* Wed Oct 18 2000 Nalin Dahyabhai +- add patch to recognize AES signatures properly (#19312) +- add gpgv to the package -* Fri Sep 15 2000 Per Ivar Paulsen -- Picked up 1.02 +* Tue Oct 17 2000 Nalin Dahyabhai +- update to 1.0.4 to get security fix -* Fri Jun 16 2000 Oystein Viggen -- fix a slight bug in adding the public key to the chain -- hack around bogosity with roots homedir being / during install +* Tue Oct 10 2000 Nalin Dahyabhai +- fix man page typos (#18797) -* Thu May 03 2000 Lars Gaarden -- added the Trustix public signature key +* Thu Sep 21 2000 Nalin Dahyabhai +- update to 1.0.3 +- switch to bundled copy of the man page -* Sat May 29 1999 Fabio Coatti -- Some corrections in French description, thanks to - Ga?l Qu?ri +* Wed Aug 30 2000 Matt Wilson +- rebuild to cope with glibc locale binary incompatibility, again -* Mon May 17 1999 Fabio Coatti -- Added French description, provided by - Christophe Labouisse +* Wed Aug 16 2000 Nalin Dahyabhai +- revert locale patch (#16222) -* Thu May 06 1999 Fabio Coatti -- Upgraded for 0.9.6 (removed gpgm) +* Tue Aug 15 2000 Nalin Dahyabhai +- set all locale data instead of LC_MESSAGES and LC_TIME (#16222) -* Tue Jan 12 1999 Fabio Coatti -- LINGUAS variable is now unset in configure to ensure that all - languages will be built. (Thanks to Luca Olivetti ) - -* Sat Jan 02 1999 Fabio Coatti -- Added pl language file. -- Included g10/pubring.asc in documentation files. +* Sun Jul 23 2000 Nalin Dahyabhai +- update to 1.0.2 -* Sat Dec 19 1998 Fabio Coatti -- Modified the spec file provided by Caskey L. Dickson - -- Now it can be built also by non-root. Installation has to be done as - root, gpg is suid. -- Added some changes by Ross Golder -- Updates for version 0.4.5 of GnuPG (.mo files) +* Wed Jul 19 2000 Jakub Jelinek +- rebuild to cope with glibc locale binary incompatibility + +* Thu Jul 13 2000 Prospector +- automatic rebuild + +* Wed Jul 12 2000 Nalin Dahyabhai +- include lspgpot (#13772) + +* Mon Jun 5 2000 Nalin Dahyabhai +- rebuild in new build environment + +* Fri Feb 18 2000 Bill Nottingham +- build of 1.0.1 + +* Fri Sep 10 1999 Cristian Gafton +- version 1.0.0 build for 6.1us From svn at tinysofa.org Thu Jul 1 15:52:35 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:52:35 +1000 (EST) Subject: [tinysofa-svn] r2810 - in tinysofa/snapshot/pam_krb5/current: sources specs Message-ID: <20040701155235.1DEC94E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:52:34 +1000 (Fri, 02 Jul 2004) New Revision: 2810 Added: tinysofa/snapshot/pam_krb5/current/sources/pam_krb5-2.1.1-1.tar.gz Removed: tinysofa/snapshot/pam_krb5/current/sources/pam_krb5-2.0.10.tar.gz Modified: tinysofa/snapshot/pam_krb5/current/specs/pam_krb5.spec Log: - Sync with 2.0. - Added: - pam_krb5-2.1.1-1.tar.gz: - Removed: - pam_krb5-2.0.10.tar.gz: Deleted: tinysofa/snapshot/pam_krb5/current/sources/pam_krb5-2.0.10.tar.gz =================================================================== (Binary files differ) Added: tinysofa/snapshot/pam_krb5/current/sources/pam_krb5-2.1.1-1.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/pam_krb5/current/sources/pam_krb5-2.1.1-1.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: tinysofa/snapshot/pam_krb5/current/specs/pam_krb5.spec =================================================================== --- tinysofa/snapshot/pam_krb5/current/specs/pam_krb5.spec 2004-07-01 15:52:32 UTC (rev 2809) +++ tinysofa/snapshot/pam_krb5/current/specs/pam_krb5.spec 2004-07-01 15:52:34 UTC (rev 2810) @@ -1,24 +1,21 @@ Summary: A Pluggable Authentication Module for Kerberos 5. Name: pam_krb5 -Version: 2.0.10 -Release: 5ts -Source0: pam_krb5-%{version}.tar.gz +Version: 2.1.1 +Release: 1ts +Source0: pam_krb5-%{version}-1.tar.gz License: LGPL -Group: tinysofa official -BuildPrereq: byacc, flex, kerberos5-devel, kerberosafs-devel, pam-devel -BuildRequires: gcc-c++-devel kerberos5 kerberosafs libcom_err-devel -BuildRoot: %{_tmppath}/%{name}-root -Requires: kerberosafs >= 1.0 +Group: System Environment/Base +BuildPrereq: byacc, flex, krb5-devel, pam-devel +BuildRoot: %{_tmppath}/%{name}-%{version}-root %description This is pam_krb5, a pluggable authentication module that can be used with Linux-PAM and Kerberos 5. This module supports password checking, ticket creation, and optional TGT verification and conversion to Kerberos IV tickets. - The included pam_krb5afs module also gets AFS tokens if so configured. %prep -%setup -q -n pam_krb5-%{version} +%setup -q -n pam_krb5-%{version}-1 %build CFLAGS="$RPM_OPT_FLAGS -fPIC"; export CFLAGS @@ -43,22 +40,17 @@ %{_mandir}/man8/* %doc README COPYING* ChangeLog +# $Id: pam_krb5.spec,v 1.124 2004/06/21 20:03:26 nalin Exp $ %changelog -* Thu May 20 2004 tsintegrate 2.0.10-5ts -- current (2.0.10-4ts) integrated as 2.0.10-5ts for release 1.0-U1 +* Mon Jun 21 2004 Nalin Dahyabhai - 2.1.1-1 +- update to 2.1.1 -* Thu May 20 2004 tsintegrate 2.0.10-4ts -- current (2.0.10-3ts) integrated as 2.0.10-4ts for release 1.0-U1 +* Wed Apr 21 2004 Nalin Dahyabhai - 2.1.0-1 +- update to 2.1.0 -* Wed May 19 2004 tsintegrate 2.0.10-3ts -- current (2.0.10-2ts) integrated as 2.0.10-3ts for release 1.0-U1 +* Tue Mar 23 2004 Nalin Dahyabhai - 2.0.11-1 +- update to 2.0.11 -* Wed May 12 2004 Omar Kilani -- Add BuildRequires: gcc-c++-devel kerberos5 kerberosafs libcom_err-devel - -* Wed Apr 07 2004 Omar Kilani - 2.0.10-2ts -- Tinysofa - * Tue Mar 16 2004 Nalin Dahyabhai - 2.0.10-1 - update to 2.0.10 From svn at tinysofa.org Thu Jul 1 15:52:50 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:52:50 +1000 (EST) Subject: [tinysofa-svn] r2814 - in tinysofa/snapshot/patch/current: sources specs Message-ID: <20040701155250.BF0B04E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:52:50 +1000 (Fri, 02 Jul 2004) New Revision: 2814 Added: tinysofa/snapshot/patch/current/sources/patch-2.5-stderr.patch tinysofa/snapshot/patch/current/sources/patch-2.5.4-ifdef.patch tinysofa/snapshot/patch/current/sources/patch-2.5.4-program_name.patch tinysofa/snapshot/patch/current/sources/patch-2.5.4-sigsegv.patch tinysofa/snapshot/patch/current/sources/patch-2.5.4-suffix.patch Modified: tinysofa/snapshot/patch/current/specs/patch.spec Log: - Sync with 2.0. - Kept: - patch-2.5.4.tar.gz: - Added: - patch-2.5-stderr.patch: - patch-2.5.4-ifdef.patch: - patch-2.5.4-program_name.patch: - patch-2.5.4-sigsegv.patch: - patch-2.5.4-suffix.patch: Added: tinysofa/snapshot/patch/current/sources/patch-2.5-stderr.patch =================================================================== --- tinysofa/snapshot/patch/current/sources/patch-2.5-stderr.patch 2004-07-01 15:52:43 UTC (rev 2813) +++ tinysofa/snapshot/patch/current/sources/patch-2.5-stderr.patch 2004-07-01 15:52:50 UTC (rev 2814) @@ -0,0 +1,11 @@ +--- patch-2.5/util.c~ Thu Jul 10 09:16:12 1997 ++++ patch-2.5/util.c Sun Jun 6 18:16:30 1999 +@@ -568,6 +568,8 @@ + int r; + va_list args; + ++ fflush(stderr); /* Ensure pending errors are written before the question */ ++ + vararg_start (args, format); + vfprintf (stdout, format, args); + va_end (args); Added: tinysofa/snapshot/patch/current/sources/patch-2.5.4-ifdef.patch =================================================================== --- tinysofa/snapshot/patch/current/sources/patch-2.5.4-ifdef.patch 2004-07-01 15:52:43 UTC (rev 2813) +++ tinysofa/snapshot/patch/current/sources/patch-2.5.4-ifdef.patch 2004-07-01 15:52:50 UTC (rev 2814) @@ -0,0 +1,70 @@ +--- patch-2.5.4/patch.c.ifdef Tue Mar 5 09:42:45 2002 ++++ patch-2.5.4/patch.c Tue Mar 5 09:42:47 2002 +@@ -88,8 +88,9 @@ + + static char const *do_defines; /* symbol to patch using ifdef, ifndef, etc. */ + static char const if_defined[] = "\n#ifdef %s\n"; +-static char const not_defined[] = "#ifndef %s\n"; +-static char const else_defined[] = "\n#else\n"; ++static char const not_defined[] = "\n#ifndef %s\n"; ++static char const elseis_defined[] = "\n#else /* %s */\n"; ++static char const elsenot_defined[] = "\n#else /* not %s */\n"; + static char const end_defined[] = "\n#endif /* %s */\n"; + + static int Argc; +@@ -1014,12 +1015,13 @@ + return FALSE; + if (R_do_defines) { + if (def_state == OUTSIDE) { +- fprintf (fp, outstate->after_newline + if_defined, ++ fprintf (fp, outstate->after_newline + not_defined, + R_do_defines); + def_state = IN_IFNDEF; + } + else if (def_state == IN_IFDEF) { +- fprintf (fp, outstate->after_newline + else_defined); ++ fprintf (fp, outstate->after_newline + elsenot_defined, ++ R_do_defines); + def_state = IN_ELSE; + } + if (ferror (fp)) +@@ -1038,7 +1040,8 @@ + return FALSE; + if (R_do_defines) { + if (def_state == IN_IFNDEF) { +- fprintf (fp, outstate->after_newline + else_defined); ++ fprintf (fp, outstate->after_newline + elseis_defined, ++ R_do_defines); + def_state = IN_ELSE; + } + else if (def_state == OUTSIDE) { +@@ -1069,7 +1072,8 @@ + return FALSE; + assert (outstate->after_newline); + if (R_do_defines) { +- fprintf (fp, not_defined, R_do_defines); ++ fprintf (fp, outstate->after_newline + not_defined, ++ R_do_defines); + if (ferror (fp)) + write_fatal (); + def_state = IN_IFNDEF; +@@ -1086,7 +1090,8 @@ + while (pch_char (old) == '!'); + + if (R_do_defines) { +- fprintf (fp, outstate->after_newline + else_defined); ++ fprintf (fp, outstate->after_newline + elseis_defined, ++ R_do_defines); + if (ferror (fp)) + write_fatal (); + def_state = IN_ELSE; +@@ -1124,7 +1129,8 @@ + def_state = IN_IFDEF; + } + else if (def_state == IN_IFNDEF) { +- fprintf (fp, outstate->after_newline + else_defined); ++ fprintf (fp, outstate->after_newline + elseis_defined, ++ R_do_defines); + def_state = IN_ELSE; + } + if (ferror (fp)) Added: tinysofa/snapshot/patch/current/sources/patch-2.5.4-program_name.patch =================================================================== --- tinysofa/snapshot/patch/current/sources/patch-2.5.4-program_name.patch 2004-07-01 15:52:43 UTC (rev 2813) +++ tinysofa/snapshot/patch/current/sources/patch-2.5.4-program_name.patch 2004-07-01 15:52:50 UTC (rev 2814) @@ -0,0 +1,11 @@ +--- patch-2.5.4/error.c.program_name Tue Apr 9 14:38:27 2002 ++++ patch-2.5.4/error.c Tue Apr 9 14:38:43 2002 +@@ -80,7 +80,7 @@ + + /* The calling program should define program_name and set it to the + name of the executing program. */ +-extern char *program_name; ++extern char const program_name[]; + + # ifdef HAVE_STRERROR_R + # define __strerror_r strerror_r Added: tinysofa/snapshot/patch/current/sources/patch-2.5.4-sigsegv.patch =================================================================== --- tinysofa/snapshot/patch/current/sources/patch-2.5.4-sigsegv.patch 2004-07-01 15:52:43 UTC (rev 2813) +++ tinysofa/snapshot/patch/current/sources/patch-2.5.4-sigsegv.patch 2004-07-01 15:52:50 UTC (rev 2814) @@ -0,0 +1,44 @@ +Bug report: #14693 +Reported by: Vincent Renardias +Patch: jdassen at wi.leidenuniv.nl (J.H.M.Dassen) +Since Version: 2.5-2 + +--- patch-2.5.orig/inp.c ++++ patch-2.5/inp.c +@@ -71,6 +71,14 @@ + } + } + ++void ++reset_scan_input_vars() ++{ ++ using_plan_a = 1; ++ i_buffer = NULL; ++ i_ptr = NULL; ++} ++ + /* Construct the line index, somehow or other. */ + + void +--- patch-2.5.orig/patch.c ++++ patch-2.5/patch.c +@@ -210,7 +210,10 @@ + + /* find out where all the lines are */ + if (!skip_rest_of_patch) +- scan_input (inname); ++ scan_input (inname); ++ else ++ reset_scan_input_vars (); ++ + + /* from here on, open no standard i/o files, because malloc */ + /* might misfire and we can't catch it easily */ +--- patch-2.5.orig/inp.h ++++ patch-2.5/inp.h +@@ -7,4 +7,5 @@ + char const *ifetch PARAMS ((LINENUM, int, size_t *)); + void get_input_file PARAMS ((char const *, char const *)); + void re_input PARAMS ((void)); ++void reset_scan_input_vars PARAMS (()); + void scan_input PARAMS ((char *)); Added: tinysofa/snapshot/patch/current/sources/patch-2.5.4-suffix.patch =================================================================== --- tinysofa/snapshot/patch/current/sources/patch-2.5.4-suffix.patch 2004-07-01 15:52:43 UTC (rev 2813) +++ tinysofa/snapshot/patch/current/sources/patch-2.5.4-suffix.patch 2004-07-01 15:52:50 UTC (rev 2814) @@ -0,0 +1,12 @@ +--- patch-2.5.4/patch.c.suffix Thu Nov 2 17:57:46 2000 ++++ patch-2.5.4/patch.c Thu Nov 2 17:58:25 2000 +@@ -145,8 +145,7 @@ + : posixly_correct - 1); + + val = getenv ("SIMPLE_BACKUP_SUFFIX"); +- if (val && *val) +- simple_backup_suffix = val; ++ simple_backup_suffix = val && *val ? val : ".orig"; + + if ((version_control = getenv ("PATCH_VERSION_CONTROL"))) + version_control_context = "$PATCH_VERSION_CONTROL"; Modified: tinysofa/snapshot/patch/current/specs/patch.spec =================================================================== --- tinysofa/snapshot/patch/current/specs/patch.spec 2004-07-01 15:52:43 UTC (rev 2813) +++ tinysofa/snapshot/patch/current/specs/patch.spec 2004-07-01 15:52:50 UTC (rev 2814) @@ -1,11 +1,17 @@ Summary: The GNU patch command, for modifying/upgrading files. Name: patch Version: 2.5.4 -Release: 11ts +Release: 20ts License: GPL -Group: tinysofa official +URL: http://www.gnu.org/software/patch/patch.html +Group: Development/Tools Source: ftp://ftp.gnu.org/gnu/patch/patch-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-root +Patch1: patch-2.5-stderr.patch +Patch2: patch-2.5.4-suffix.patch +Patch3: patch-2.5.4-sigsegv.patch +Patch4: patch-2.5.4-ifdef.patch +Patch5: patch-2.5.4-program_name.patch +Buildroot: %{_tmppath}/%{name}-%{version}-root %description The patch program applies diff files to originals. The diff command @@ -19,14 +25,16 @@ %prep %setup -q +%patch1 -p1 -b .stderr +%patch2 -p1 -b .suffix +%patch3 -p1 -b .sigsegv +%patch4 -p1 -b .ifdef +%patch5 -p1 -b .program_name +%build +CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE" %configure -#CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --mandir=/usr/share/man - -%build -make "CFLAGS=$RPM_OPT_FLAGS" LDFLAGS=-s - # XXX unset CPPFLAGS on (ultra?)sparc to avoid large file system support %ifarch sparc sparc64 make CPPFLAGS="" @@ -35,39 +43,81 @@ %endif %install -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT -#make install prefix=$RPM_BUILD_ROOT/usr mandir="$RPM_BUILD_ROOT"/usr/share/man +rm -rf $RPM_BUILD_ROOT %makeinstall -strip $RPM_BUILD_ROOT/usr/bin/* %clean -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT +rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) %doc NEWS README /usr/bin/* -/usr/share/man/*/* +%{_mandir}/*/* %changelog -* Wed May 19 2004 tsintegrate 2.5.4-11ts -- current (2.5.4-10ts) integrated as 2.5.4-11ts for release 1.0-U1 +* Tue Jun 15 2004 Elliot Lee +- rebuilt -* Sun Dec 7 2003 Erlend Midttun 2.5.4-7tr -- Big rebuild +* Fri Feb 13 2004 Elliot Lee +- rebuilt -* Wed Jun 18 2003 Erlend Midttun 2.5.4-6tr -- Big rebuild +* Sat Oct 25 2003 Tim Waugh 2.5.4-18 +- Rebuilt. -* Mon Mar 24 2003 Erlend Midttun 2.5.4-5em -- Rebuilt against glibc 2.3.2. +* Wed Jun 04 2003 Elliot Lee +- rebuilt -* Tue Jul 23 2002 Daniel Meyer 2.5.4-4dm -- rebuild for Trustix Secure Linux 2.0 +* Wed Jan 22 2003 Tim Powers +- rebuilt -* Fri Jan 29 2000 Erlend Midttun -- Moved man pages to comply with FHS +* Wed Nov 20 2002 Tim Powers +- rebuilt in current collinst +* Fri Jun 21 2002 Tim Powers +- automated rebuild + +* Thu May 23 2002 Tim Powers +- automated rebuild + +* Tue Apr 9 2002 Tim Waugh 2.5.4-12 +- Fix error reporting when given bad options (bug #62981). + +* Tue Mar 5 2002 Tim Waugh 2.5.4-11 +- s/Copyright:/License:/. +- Fix -D behaviour (bug #60688). + +* Tue May 29 2001 Tim Waugh 2.5.4-10 +- Merge Mandrake patch: + - fix possible segfault + +* Fri Dec 1 2000 Tim Waugh +- Rebuild because of fileutils bug. + +* Thu Nov 2 2000 Tim Waugh +- use .orig as default suffix, as per man page and previous behaviour + (bug #20202). +- use better patch for this, from maintainer. + +* Wed Oct 4 2000 Tim Waugh +- actually use the RPM_OPT_FLAGS + +* Wed Jul 12 2000 Prospector +- automatic rebuild + +* Tue Jun 13 2000 Trond Eivind Glomsr?d +- Use %%makeinstall, %%{_tmppath} and %%{_mandir} + +* Fri May 12 2000 Trond Eivind Glomsr?d +- added URL + +* Wed Feb 16 2000 Bernhard Rosenkraenzer +- 2.5.4 +- Fix up LFS support on Alpha (Bug #5732) + +* Mon Feb 7 2000 Bill Nottingham +- handle compressed manpages + * Sun Jun 06 1999 Alan Cox - Fix the case where stderr isnt flushed for ask(). Now the 'no such file' appears before the skip patch question, not at the very end, Doh! @@ -100,4 +150,4 @@ - updated to 2.5 * Mon Jun 02 1997 Erik Troan -- built against glibc \ No newline at end of file +- built against glibc From svn at tinysofa.org Thu Jul 1 15:53:44 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:53:44 +1000 (EST) Subject: [tinysofa-svn] r2824 - in tinysofa/snapshot/procps/current: sources specs Message-ID: <20040701155344.927FB4E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:53:44 +1000 (Fri, 02 Jul 2004) New Revision: 2824 Added: tinysofa/snapshot/procps/current/sources/FAQ tinysofa/snapshot/procps/current/sources/procps-3.2.1-FAQ.patch tinysofa/snapshot/procps/current/sources/procps-3.2.1-selinux-workaround.patch tinysofa/snapshot/procps/current/sources/procps-3.2.1-top-vmsize-env.patch Modified: tinysofa/snapshot/procps/current/sources/procps-3.1.15-misc.patch tinysofa/snapshot/procps/current/sources/procps-selinux.patch tinysofa/snapshot/procps/current/specs/procps.spec Log: - Sync with 2.0. - Kept: - procps-3.1.15-misc.patch: - procps-3.1.15-nostrip.patch: - procps-3.2.1.tar.gz: - procps-selinux.patch: - Added: - FAQ: - procps-3.2.1-FAQ.patch: - procps-3.2.1-selinux-workaround.patch: - procps-3.2.1-top-vmsize-env.patch: Added: tinysofa/snapshot/procps/current/sources/FAQ =================================================================== --- tinysofa/snapshot/procps/current/sources/FAQ 2004-07-01 15:53:41 UTC (rev 2823) +++ tinysofa/snapshot/procps/current/sources/FAQ 2004-07-01 15:53:44 UTC (rev 2824) @@ -0,0 +1,50 @@ +Frequently Asked Questions about procps + +Why does "ps -aux" complain? + +According to the POSIX and UNIX standards, the above command asks to display +all processes with a TTY (generally the commands users are running) plus all +processes owned by a user named "x". If that user doesn't exist, then ps will +assume you really meant "ps aux". The warning is given to gently break you +of a habit that will cause you trouble if a user named "x" were created. + +What systems are supported? + +Linux 2.2.xx, 2.4.xx, and 2.6.xx are commonly tested and expected to work well. +SMP is well supported. Multi-node cluster views require a multi-node /proc +filesystem; without that you will see a single-node view. + +Where to I send bug reports? + +You may use the Debian bug tracking system or send your report to +procps-feedback at lists.sf.net instead. + +Why are there so many procps projects? + +The original maintainer seems to have had little time for procps. Whatever his +reasons, the project didn't get maintained. Starting in 1997, Albert Cahalan +wrote a new ps program for the package. For the next few years, Albert quietly +helped the Debian package maintainer fix bugs. In 2001, Rik van Riel decided +to do something about what appeared to be the lack of a maintainer. He picked +up the buggy old code in Red Hat's CVS and started adding patches. Meanwhile, +other people have patched procps in a great many ways. In 2002, Albert moved +procps to this site. This was done to ensure that years of testing and bug +fixes would not be lost. The major version number was changed to 3, partly to +avoid confusing users and partly because the top program has been redone. + +Why does ps get signal 17? + +No ps release has ever had this problem. Most likely your system has been +broken into. You might want to install a more recent version of the OS. If +you'd rather take your chances, simply upgrade procps. + +Why do ps and top show threads individually? + +The 2.4.xx kernel does not provide proper support for grouping threads by +process. Hacks exist to group them anyway, but such hacks will falsely group +similar tasks and will fail to group tasks due to race conditions. The hacks +are also slow. As none of this is acceptable in a critical system tool, task +grouping is not currently available for the 2.4.xx kernel. The 2.6.xx kernel +allows for proper thread grouping and reporting. To take advantage of this, +your programs must use a threading library that features the CLONE_THREAD flag. +The NPTL pthreads provided by recent glibc releases use CLONE_THREAD. Modified: tinysofa/snapshot/procps/current/sources/procps-3.1.15-misc.patch =================================================================== --- tinysofa/snapshot/procps/current/sources/procps-3.1.15-misc.patch 2004-07-01 15:53:41 UTC (rev 2823) +++ tinysofa/snapshot/procps/current/sources/procps-3.1.15-misc.patch 2004-07-01 15:53:44 UTC (rev 2824) @@ -1,39 +1,3 @@ ---- procps-3.1.15/ps/global.c.misc 2003-09-20 01:13:27.000000000 -0400 -+++ procps-3.1.15/ps/global.c 2004-02-11 08:15:58.038149656 -0500 -@@ -16,6 +16,8 @@ - #include - #include - #include -+#include -+#include - - #include "common.h" - -@@ -105,12 +107,21 @@ - struct winsize ws; - char *columns; /* Unix98 environment variable */ - char *lines; /* Unix98 environment variable */ -+ - if(ioctl(1, TIOCGWINSZ, &ws) != -1 && ws.ws_col>0 && ws.ws_row>0){ - screen_cols = ws.ws_col; - screen_rows = ws.ws_row; -- }else{ /* TODO: ought to do tgetnum("co") and tgetnum("li") now */ -- screen_cols = 80; -- screen_rows = 24; -+ }else{ -+ struct stat sb; -+ fstat(1, &sb); -+ if (!S_ISFIFO(sb.st_mode)) { -+ /* TODO: ought to do tgetnum("co") and tgetnum("li") now */ -+ screen_cols = 80; -+ screen_rows = 24; -+ } else { -+ screen_cols = 80 * 4; /* arbitrary */ -+ screen_rows = 24; -+ } - } - if(!isatty(STDOUT_FILENO)) screen_cols = OUTBUF_SIZE; - columns = getenv("COLUMNS"); --- procps-3.1.15/sysctl.c.misc 2002-12-28 18:26:50.000000000 -0500 +++ procps-3.1.15/sysctl.c 2004-02-11 08:15:58.035150001 -0500 @@ -287,9 +287,16 @@ Added: tinysofa/snapshot/procps/current/sources/procps-3.2.1-FAQ.patch =================================================================== --- tinysofa/snapshot/procps/current/sources/procps-3.2.1-FAQ.patch 2004-07-01 15:53:41 UTC (rev 2823) +++ tinysofa/snapshot/procps/current/sources/procps-3.2.1-FAQ.patch 2004-07-01 15:53:44 UTC (rev 2824) @@ -0,0 +1,46 @@ +--- procps-3.2.1/proc/version.h.FAQ 2004-06-14 16:19:57.744770904 -0400 ++++ procps-3.2.1/proc/version.h 2004-06-14 16:35:15.121308472 -0400 +@@ -16,6 +16,7 @@ + + extern void display_version(void); /* display suite version */ + extern const char procps_version[]; /* global buf for suite version */ ++extern const char procps_number_version[]; /* global buf for suite number version */ + + extern int linux_version_code; /* runtime version of LINUX_VERSION_CODE + in /usr/include/linux/version.h */ +--- procps-3.2.1/proc/library.map.FAQ 2004-01-29 21:07:05.000000000 -0500 ++++ procps-3.2.1/proc/library.map 2004-06-14 16:34:57.455994008 -0400 +@@ -6,7 +6,7 @@ + escape_str; escape_strlist; + openproc; closeproc; + tty_to_dev; dev_to_tty; open_psdb_message; open_psdb; wchan; +- display_version; procps_version; linux_version_code; ++ display_version; procps_version; procps_number_version; linux_version_code; + Hertz; smp_num_cpus; + sprint_uptime; uptime; user_from_uid; print_uptime; loadavg; + pretty_print_signals; print_given_signals; unix_print_signals; signal_name_to_number; signal_number_to_name; +--- procps-3.2.1/proc/version.c.FAQ 2004-06-14 16:19:41.192287264 -0400 ++++ procps-3.2.1/proc/version.c 2004-06-14 16:38:58.382367632 -0400 +@@ -16,8 +16,10 @@ + + #ifdef MINORVERSION + const char procps_version[] = "procps version " VERSION "." SUBVERSION "." MINORVERSION; ++const char procps_number_version[] = VERSION "." SUBVERSION "." MINORVERSION; + #else +-const char procps_version[] = "procps version " VERSION "." SUBVERSION; ++const char procps__version[] = "procps version " VERSION "." SUBVERSION; ++const char procps_number_version[] = VERSION "." SUBVERSION; + #endif + + void display_version(void) { +--- procps-3.2.1/ps/parser.c.FAQ 2004-06-14 15:56:19.362397800 -0400 ++++ procps-3.2.1/ps/parser.c 2004-06-14 16:45:47.191219240 -0400 +@@ -1175,7 +1175,7 @@ + // about "ps -aux" suddenly changing behavior if a user "x" were + // added to the system. + if(!(personality & PER_FORCE_BSD)) +- fprintf(stderr, "Warning: bad syntax, perhaps a bogus '-'? See http://procps.sf.net/faq.html\n"); ++ fprintf(stderr, "Warning: bad syntax, perhaps a bogus '-'? See /usr/share/doc/procps-%s/FAQ\n",procps_number_version); + // Remember: contact albert at users.sf.net or procps-feedback at lists.sf.net + // if you should feel tempted. Be damn sure you understand all + // the issues. The same goes for other stuff too, BTW. Please ask. Added: tinysofa/snapshot/procps/current/sources/procps-3.2.1-selinux-workaround.patch =================================================================== --- tinysofa/snapshot/procps/current/sources/procps-3.2.1-selinux-workaround.patch 2004-07-01 15:53:41 UTC (rev 2823) +++ tinysofa/snapshot/procps/current/sources/procps-3.2.1-selinux-workaround.patch 2004-07-01 15:53:44 UTC (rev 2824) @@ -0,0 +1,13 @@ +--- procps-3.2.1/w.c.selinux-workaround 2003-09-20 02:42:26.000000000 -0400 ++++ procps-3.2.1/w.c 2004-06-15 10:45:53.000000000 -0400 +@@ -162,6 +162,10 @@ + if(best && tmp->start_time <= best->start_time) continue; + best = tmp; + } ++ /* It is there but SELinux wouldn't allow us to know the detail. Really ++ w should just be given rights */ ++ if(!kill(u->ut_pid, 0) || errno != ESRCH) ++ *found_utpid = 1; + return best ? best : secondbest; + } + Added: tinysofa/snapshot/procps/current/sources/procps-3.2.1-top-vmsize-env.patch =================================================================== --- tinysofa/snapshot/procps/current/sources/procps-3.2.1-top-vmsize-env.patch 2004-07-01 15:53:41 UTC (rev 2823) +++ tinysofa/snapshot/procps/current/sources/procps-3.2.1-top-vmsize-env.patch 2004-07-01 15:53:44 UTC (rev 2824) @@ -0,0 +1,23 @@ +--- procps-3.2.1/top.c.top-vmsize-env 2004-02-23 12:18:11.000000000 -0500 ++++ procps-3.2.1/top.c 2004-06-26 08:30:25.750104576 -0400 +@@ -2130,6 +2130,8 @@ + } + if (!Frames_libflags) Frames_libflags = L_DEFAULT; + if (selection_type=='p') Frames_libflags |= PROC_PID; ++ if (( getenv("STATSIZE")) && ( atoi(getenv("STATSIZE")) == 1 )) ++ Frames_libflags |= L_status; + } + + +@@ -3064,7 +3066,10 @@ + MKCOL(p->ruser); + break; + case P_VRT: +- MKCOL(scale_num(PAGES_2K(p->size), w, s)); ++ if (( getenv("STATSIZE")) && ( atoi(getenv("STATSIZE")) == 1 )) ++ MKCOL(scale_num(PAGES_2K(p->vm_size), w, s)); ++ else ++ MKCOL(scale_num(PAGES_2K(p->size), w, s)); + break; + case P_WCH: + if (No_ksyms) { Modified: tinysofa/snapshot/procps/current/sources/procps-selinux.patch =================================================================== --- tinysofa/snapshot/procps/current/sources/procps-selinux.patch 2004-07-01 15:53:41 UTC (rev 2823) +++ tinysofa/snapshot/procps/current/sources/procps-selinux.patch 2004-07-01 15:53:44 UTC (rev 2824) @@ -48,14 +48,3 @@ case '-': return "Embedded '-' among SysV options makes no sense."; break; -@@ -568,6 +564,10 @@ - trace("X Old Linux i386 register format\n"); - format_flags |= FF_LX; - break; -+ case 'Z': -+ trace("SElinux Security Context format\n"); -+ format_flags |= FF_Fc; -+ break; - case 'a': - trace("a Select all w/tty, including other users\n"); - simple_select |= SS_B_a; Modified: tinysofa/snapshot/procps/current/specs/procps.spec =================================================================== --- tinysofa/snapshot/procps/current/specs/procps.spec 2004-07-01 15:53:41 UTC (rev 2823) +++ tinysofa/snapshot/procps/current/specs/procps.spec 2004-07-01 15:53:44 UTC (rev 2824) @@ -1,173 +1,355 @@ -Summary: Utilities for monitoring your system and processes on your system. +Summary: System and process monitoring utilities. Name: procps Version: 3.2.1 -Release: 1ts +Release: 7ts License: GPL -Group: tinysofa official +Group: Applications/System Source: http://procps.sourceforge.net/procps-%{version}.tar.gz -Patch1: procps-3.1.15-misc.patch -Patch2: procps-3.1.15-nostrip.patch +Source1: FAQ +BuildRoot: %{_tmppath}/%{name}-%{version}-root +Prereq: /bin/rm /sbin/ldconfig +Patch1: procps-3.1.15-nostrip.patch Patch3: procps-selinux.patch -BuildRoot: %{_tmppath}/%{name}-root -PreReq: coreutils -Requires: ncurses +Patch4: procps-3.1.15-misc.patch +Patch5: procps-3.2.1-FAQ.patch +Patch6: procps-3.2.1-selinux-workaround.patch +Patch7: procps-3.2.1-top-vmsize-env.patch + BuildRequires: ncurses-devel %description -The procps package contains a set of system utilities which provide -system information. Procps includes ps, free, sessreg, skill, snice, -tload, top, uptime, vmstat, w, and watch. The ps command displays a -snapshot of running processes. The top command provides a repetitive -update of the statuses of running processes. The free command -displays the amounts of free and used memory on your system. Sessreg -is a simple program for managing utmp/wtmp entries for xdm sessions. -The skill command sends a terminate command (or another specified -signal) to a specified set of processes. The snice command is used to -change the scheduling priority of specified processes. The tload -command prints a graph of the current system load average to a -specified tty. The uptime command displays the current time, how long -the system has been running, how many users are logged on and system -load averages for the past one, five and fifteen minutes. The w -command displays a list of the users who are currently logged on and -what they're running. The watch program watches a running program. -The vmstat command displays virtual memory statistics about processes, -memory, paging, block I/O, traps and CPU activity. +The procps package contains a set of system utilities that provide +system information. Procps includes ps, free, skill, snice, tload, +top, uptime, vmstat, w, and watch. The ps command displays a snapshot +of running processes. The top command provides a repetitive update of +the statuses of running processes. The free command displays the +amounts of free and used memory on your system. The skill command +sends a terminate command (or another specified signal) to a specified +set of processes. The snice command is used to change the scheduling +priority of specified processes. The tload command prints a graph of +the current system load average to a specified tty. The uptime command +displays the current time, how long the system has been running, how +many users are logged on, and system load averages for the past one, +five, and fifteen minutes. The w command displays a list of the users +who are currently logged on and what they are running. The watch +program watches a running program. The vmstat command displays virtual +memory statistics about processes, memory, paging, block I/O, traps, +and CPU activity. %prep %setup -q -%patch1 -p1 -%patch2 -p1 -%if %{use_selinux} -%patch3 -p1 -%endif +%patch1 -p1 -b .nostrip +%patch3 -p1 -b .selinux +%patch4 -p1 -b .misc +%patch5 -p1 -b .FAQ +%patch6 -p1 -b .selinux-workaround +%patch7 -p1 -b .top-vmsize-env +cp %SOURCE1 . + %build -PATH=/usr/X11R6/bin:$PATH +make CC="gcc $RPM_OPT_FLAGS" MANDIR=%{_mandir} W_SHOWFROM=-DW_SHOWFROM lib64=%{_lib} -make CC="gcc $RPM_OPT_FLAGS -DW_SHOWFROM=1" LDFLAGS=-s - %install -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != "/" ] && rm -rf "$RPM_BUILD_ROOT" -mkdir -p $RPM_BUILD_ROOT/bin $RPM_BUILD_ROOT/usr/bin $RPM_BUILD_ROOT/sbin -mkdir -p $RPM_BUILD_ROOT/usr/share/man/man1 $RPM_BUILD_ROOT/usr/share/man/man8 -mkdir -p $RPM_BUILD_ROOT/usr/share/man/man5 -mkdir -p $RPM_BUILD_ROOT/lib +rm -rf %{buildroot} +make ldconfig="/bin/true" DESTDIR=%{buildroot} SHLIBDIR=%{buildroot}/%{_lib} OWNERGROUP= MANDIR=%{_mandir} lib64=%{_lib} install SKIP="/bin/kill /usr/share/man/man1/kill.1" +mkdir -p %{buildroot}/%{_docdir}/procps-%{version} -make install \ - DESTDIR=$RPM_BUILD_ROOT \ - install="install -D" \ - ldconfig=true - %clean -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} %post # add libproc to the cache /sbin/ldconfig -# remove obsolete files -rm -f /etc/psdevtab /etc/psdatabase +%postun -p /sbin/ldconfig + %files -%defattr(-,root,root) -%doc NEWS BUGS TODO +%defattr(0644,root,root,755) +%doc NEWS BUGS TODO FAQ +%attr(755,root,root) /%{_lib}/* %attr(555,root,root) /bin/ps %attr(555,root,root) /sbin/sysctl -%attr(555,root,root) /usr/bin/free -%attr(555,root,root) /usr/bin/pgrep -%attr(555,root,root) /usr/bin/pkill -%attr(555,root,root) /usr/bin/pmap -%attr(555,root,root) /usr/bin/skill -%attr(555,root,root) /usr/bin/slabtop -%attr(555,root,root) /usr/bin/snice -%attr(555,root,root) /usr/bin/tload -%attr(555,root,root) /usr/bin/top -%attr(555,root,root) /usr/bin/uptime -%attr(555,root,root) /usr/bin/vmstat -%attr(555,root,root) /usr/bin/w -%attr(555,root,root) /usr/bin/watch -%attr(755,root,root) /lib/libproc.so -%attr(755,root,root) /lib/libproc.so.%{version} +%attr(555,root,root) /usr/bin/* -%attr(0644,root,root) /usr/share/man/man1/free.1* -%attr(0644,root,root) /usr/share/man/man1/pgrep.1* -%attr(0644,root,root) /usr/share/man/man1/pkill.1* -%attr(0644,root,root) /usr/share/man/man1/pmap.1* -%attr(0644,root,root) /usr/share/man/man1/ps.1* -%attr(0644,root,root) /usr/share/man/man1/skill.1* -%attr(0644,root,root) /usr/share/man/man1/slabtop.1.* -%attr(0644,root,root) /usr/share/man/man1/snice.1* -%attr(0644,root,root) /usr/share/man/man1/tload.1* -%attr(0644,root,root) /usr/share/man/man1/top.1* -%attr(0644,root,root) /usr/share/man/man1/uptime.1* -%attr(0644,root,root) /usr/share/man/man1/w.1* -%attr(0644,root,root) /usr/share/man/man1/watch.1* -%attr(0644,root,root) /usr/share/man/man5/sysctl.conf.5* -%attr(0644,root,root) /usr/share/man/man8/sysctl.8* -%attr(0644,root,root) /usr/share/man/man8/vmstat.8* +%attr(0644,root,root) %{_mandir}/man1/* +%attr(0644,root,root) %{_mandir}/man8/* +%attr(0644,root,root) %{_mandir}/man5/* -%exclude /bin/kill -%exclude /usr/share/man/man1/kill.1* - %changelog -* Wed May 19 2004 tsintegrate 3.2.1-1ts -- current (3.2.1-1ok) integrated as 3.2.1-1ts for release 1.0-U1 +* Sat Jun 26 2004 Dan Walsh 3.2.1-7 +- Add patch to display vm_size when STATSIZE env set -* Sun May 16 2004 Jaakko Heinonen -- fix non-root build +* Tue Jun 15 2004 Alan Cox 3.2.1-6 +- Removed broken SELinux patch to w +- Added a better alternative whereby we get less data but don't fall for + vanished processes when SELinux is running -* Fri May 14 2004 Omar Kilani 3.2.1-1ok -- New Upstream. -- New program: slabtop. +* Tue Jun 15 2004 Elliot Lee +- rebuilt -* Wed May 12 2004 Omar Kilani 3.1.15-4ts -- Add BuildRequires ncurses-devel. -- Add Requires ncurses. +* Mon Jun 14 2004 Dan Walsh 3.2.1-5 +- Fix FAQ Line -* Thu Feb 12 2004 Oystein Viggen 3.1.15-1tr -- New upstream version +* Mon Apr 09 2004 Colin Walters 3.2.1-4 +- Add little patch to make w/who work when getattr access + to /proc/ for the user's login process is denied -* Mon Dec 1 2003 Erlend Midttun 3.1.14-2tr -- Big rebuild +* Sun Mar 28 2004 Dan Walsh 3.2.1-3 +- bump for rhel3 -* Thu Nov 27 2003 Tor Hveem 3.1.14-1th -- New upstream +* Sun Mar 28 2004 Dan Walsh 3.2.1-2 +- Removed addtask patch, very buggy, +- Added FAQ to docdir -* Wed Sep 24 2003 Tor Hveem 3.1.13-1th -- New upstream +* Sun Mar 28 2004 Dan Walsh 3.2.1-1 +- Update to latest from upstream -* Wed Jun 18 2003 Erlend Midttun 3.1.8-6tr -- Big rebuild +* Thu Mar 25 2004 Dan Walsh 3.2.0-3 +- Add addtask patch to total all threads times. -* Tue Jun 16 2003 Erlend Midttun 3.1.8-5em -- Now with correct %defattr. Take II. +* Wed Mar 17 2004 Dan Walsh +- Clean up spec file. -* Tue May 27 2003 Erlend Midttun 3.1.8-4em -- Now with correct %defattr. +* Tue Mar 02 2004 Elliot Lee +- rebuilt -* Tue May 27 2003 Erlend Midttun 3.1.8-3em -- Now also show host in "w". +* Tue Feb 24 2004 Dan Walsh 3.2.0-1 +- New version from upstream -* Mon May 26 2003 Erlend Midttun 3.1.8-2em -- fileutils -> coreutils. +* Fri Feb 13 2004 Elliot Lee +- rebuilt -* Mon May 19 2003 Erlend Midttun 3.1.8-1em -- New upstream +* Thu Jan 22 2004 Dan Walsh 3.1.15-3 +- Match -Z to --context -* Mon Mar 24 2003 Erlend Midttun 2.0.7-5em -- Rebuilt against glibc 2.3.2. +* Wed Jan 21 2004 Dan Walsh 3.1.15-2 +- Add back in -Z support -* Fri Nov 8 2002 Gerald Dachs 2.0.7-4gd -- prerequires now fileutils +* Wed Jan 21 2004 Alexander Larsson 3.1.15-1 +- upgrade to procps3 +- Some regressions, see bug #114012 -* Thu Sep 14 2000 Per Ivar Paulsen -- Picked up 2.07 +* Tue Jan 20 2004 Dan Walsh 2.0.17-7 +- Remove LIBCURSES from skill and sysctl -* Thu May 04 2000 Oystein Viggen -- Update to 2.0.6 -- Create a workaround a conflict between glibc and ncurses5 +* Wed Dec 10 2003 Dan Walsh 2.0.17-6 +- Turn on SELinux -* Fri Feb 25 2000 Lars Gaarden -- Removed X11/wmconfig/top -- Removed procps-X11 -- Added procps-2.0.4-noX.patch +* Mon Dec 8 2003 Alexander Larsson 2.0.17-5 +- Fix top total percentages (#109484) +* Wed Oct 15 2003 Dan Walsh 2.0.17-4 +- Turn off selinux + +* Wed Oct 15 2003 Dan Walsh 2.0.17-3.sel +- Fix help message + +* Thu Oct 9 2003 Dan Walsh 2.0.17-2.sel +- Turn on selinux + +* Fri Oct 3 2003 Alexander Larsson 2.0.17-1 +- Update to 2.0.17, drop upstream patches, forward port remaining patches + +* Fri Sep 5 2003 Dan Walsh 2.0.13-11 +- Turn off selinux + +* Thu Aug 28 2003 Dan Walsh 2.0.13-10.sel +- Add -Z switch for SELinux + +* Sun Aug 17 2003 Doug Ledford 2.0.13-9E +- Add patch to recognize irq and softirq time accounting in kernels that + support this feature + +* Mon Aug 11 2003 Alexander Larsson 2.0.13-8 +- rebuild + +* Mon Aug 11 2003 Alexander Larsson 2.0.13-7E +- Add swapped patch from rik van riel + +* Wed Aug 6 2003 Alexander Larsson 2.0.13-6 +- rebuild + +* Wed Aug 6 2003 Alexander Larsson 2.0.13-5E +- Update iowait patch (#101657) +- Add wchan 64bit patch from Mark DeWandel + +* Mon Jul 28 2003 Dan Walsh 2.0.13-4E +- Add SELinux patch + +* Wed Jul 16 2003 Matt Wilson 2.0.13-3E +- display iowait with procps-2.0.13-iowait.patch (#99061) + +* Fri Jul 11 2003 Alexander Larsson 2.0.13-2E +- Disable linuxthreads thread hack + +* Mon Jul 7 2003 Alexander Larsson 2.0.13-1E +- rebuild + +* Fri Jul 4 2003 Alexander Larsson 2.0.13-1 +- update to 2.0.13 +- Re-merged ntpl patch +- Add hertz fix from Ernie Petrides + +* Wed Jun 04 2003 Elliot Lee +- rebuilt + +* Fri May 23 2003 Alexander Larsson 2.0.12-1 +- Update to 2.0.12 +- Add patch to fix segfault on ps axl (#91453) + +* Fri Mar 14 2003 Alexander Larsson 2.0.11-7 +- Add patch that fixes negative priorities in top. + +* Thu Feb 20 2003 Alexander Larsson 2.0.11-6 +- New NPTL patch: +- Added skipthreads optimization to top +- Don't read threads in 'w' + +* Thu Feb 20 2003 Alexander Larsson 2.0.11-5 +- Update the NPTL patch since the kernel /proc was fixed +- For kernels >= 2.4.20-2.50 + +* Mon Feb 17 2003 Alexander Larsson 2.0.11-4 +- Update nptl patch to new /proc layout. + +* Wed Jan 22 2003 Tim Powers 2.0.11-3 +- rebuilt + +* Wed Jan 22 2003 Alexander Larsson 2.0.11-2 +- Created nptl patch after discussion with ingo and arjan + +* Tue Jan 21 2003 Alexander Larsson 2.0.11-1 +- Update to 2.0.11 + +* Mon Dec 16 2002 Elliot Lee 2.0.10-4 +- Fix %%install in changelog + +* Tue Nov 19 2002 Jakub Jelinek 2.0.10-3 +- Fix for Hammer + +* Wed Oct 23 2002 Alexander Larsson 2.0.10-2 +- Remove uninstalled files in %%install. Add pmap to %%files + +* Tue Oct 8 2002 Alexander Larsson 2.0.10-1 +- Update to 2.0.10 +- Removed applied patches. + +* Mon Aug 12 2002 Alexander Larsson 2.0.7-25 +- Add patch to protect against idle ticks going backwards. Fixes #71237 + +* Thu Aug 8 2002 Alexander Larsson 2.0.7-24 +- Fix saving of sort, fixes #32757 +- Fix printing size, fixes #48224 +- Fix float decimal point input #58163 + +* Thu Aug 8 2002 Alexander Larsson 2.0.7-23 +- Fix unsigned/signed bug. Closes #60998. +- Update threadbadhack to correctly propagate process time to the main thread. + +* Wed Aug 7 2002 Alexander Larsson 2.0.7-22 +- Don't strip binaries + +* Fri Jul 12 2002 Alexander Larsson 2.0.7-21 +- Remove the X11 subpackage + +* Mon Jul 1 2002 Alexander Larsson 2.0.7-19 +- Added patch that fixes #35174 + +* Wed Jun 26 2002 Alexander Larsson 2.0.7-18 +- New thread badhack patch. Fixes a segfault. + +* Mon Jun 24 2002 Alexander Larsson 2.0.7-16 +- New thread badhack. Now enabled by default. + +* Fri Jun 21 2002 Tim Powers +- automated rebuild + +* Thu Jun 20 2002 Alexander Larsson 2.0.7-14 +- Added badhack to support hiding threads + +* Thu May 23 2002 Tim Powers +- automated rebuild + +* Mon Apr 15 2002 Bill Nottingham 2.0.7-12 +- add ldconfig in %postun + +* Mon Aug 27 2001 Trond Eivind Glomsr?d 2.0.7-11 +- Add ncurses-devel as a build dependency (#49562) + +* Sat Jul 21 2001 Tim Powers +- removed applnk entry, one of the things that's cluttering our menus + +* Sun Jun 24 2001 Elliot Lee +- Bump release + rebuild. + +* Thu Apr 5 2001 Jakub Jelinek +- fix AIX style user defined formats (#34833) + +* Thu Mar 22 2001 Bill Nottingham +- add a '-e' to sysctl to ignore errors (#31852) + +* Mon Mar 5 2001 Preston Brown +- bigger buffer for reading /proc/stat fixes segfault (#27840) + +* Thu Feb 1 2001 Preston Brown +- make sysctl return a value when errors occur (#18820). +- support big UIDs (#22683) + +* Mon Jan 22 2001 Helge Deller +- work-around for negative CPU output (Bug #18380) + +* Thu Aug 17 2000 Than Ngo +- fix failing in RPM post script (Bug #16226) + +* Wed Jul 26 2000 Michael K. Johnson +- Added Jakub's locale patch + +* Fri Jul 14 2000 Michael K. Johnson +- procps-2.0.7 +- integrated all patches except for signames patch, which is broken + and unnecessary +- See NEWS for changes between 2.0.6 and 2.0.7 +- Added patch to correctly install desktop file. Oops. + +* Wed Jul 12 2000 Prospector +- automatic rebuild + +* Tue Jul 03 2000 Preston Brown +- larger buffers for reading /proc/stat + +* Tue Jun 13 2000 Preston Brown +- FHS paths + +* Tue May 30 2000 Preston Brown +- add smp, signal name patches from VA Linux. Thanks guys. + +* Mon May 22 2000 Harald Hoyer +- added sysctl.conf (5) man page + +* Wed May 10 2000 Bill Nottingham +- fix PAGE_SIZE mismatch on ia64 + +* Sun May 7 2000 Bill Nottingham +- rebuild with different optimizations for ia64 + +* Fri Mar 24 2000 Bernhard Rosenkraenzer +- rebuild with current ncurses + +* Tue Mar 7 2000 Bill Nottingham +- fix end-of-file behavior in sysctl + +* Mon Feb 07 2000 Preston Brown +- wmconfig -> desktop + +* Mon Feb 7 2000 Jakub Jelinek +- don't try to load System.map (and spit error messages if it does not + exist) if ps or top are not going to use it, both to speed things up + and remove the ugly messages when they don't make sense. +- in top, print the possible error messages using standard top SHOWMESSAGE + (because it will be now printed out when already in terminal mode). + +* Thu Feb 3 2000 Matt Wilson +- added patch to prevent divide by zero on UltraSparc +- gzip man pages + From svn at tinysofa.org Thu Jul 1 15:53:55 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:53:55 +1000 (EST) Subject: [tinysofa-svn] r2828 - in tinysofa/snapshot/python/current: sources specs Message-ID: <20040701155355.3A2764E817E@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:53:54 +1000 (Fri, 02 Jul 2004) New Revision: 2828 Added: tinysofa/snapshot/python/current/sources/html-2.3.4.tar.bz2 tinysofa/snapshot/python/current/sources/python-2.3.4-distutils-bdist-rpm.patch tinysofa/snapshot/python/current/sources/python-2.3.4-optik.py Removed: tinysofa/snapshot/python/current/sources/python-2.2.2-urllib2-nonanonftp.patch tinysofa/snapshot/python/current/sources/python-2.3.3-cache_ftp.patch tinysofa/snapshot/python/current/sources/python-2.3.3-tinysofa-distutils.patch tinysofa/snapshot/python/current/sources/python-doc-html-2.3.4.tar.bz2 Modified: tinysofa/snapshot/python/current/sources/python-2.3-config.patch tinysofa/snapshot/python/current/specs/python.spec Log: - Sync with 2.0. - Kept: - JapaneseCodecs-1.4.9.tar.gz: - Python-2.2.1-pydocnogui.patch: - Python-2.3.4.tar.bz2: - japanese-codecs-lib64.patch: - modulator: - pynche: - python-2.3-config.patch: - python-2.3-nowhatsnew.patch: - python-2.3.2-lib64.patch: - python-2.3.2-nomkhowto.patch: - python-2.3.4-lib64-regex.patch: - shmmodule.c: - Added: - html-2.3.4.tar.bz2: - python-2.3.4-distutils-bdist-rpm.patch: - python-2.3.4-optik.py: - Removed: - python-2.2.2-urllib2-nonanonftp.patch: - python-2.3.3-cache_ftp.patch: - python-2.3.3-tinysofa-distutils.patch: - python-doc-html-2.3.4.tar.bz2: Added: tinysofa/snapshot/python/current/sources/html-2.3.4.tar.bz2 =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/python/current/sources/html-2.3.4.tar.bz2 ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: tinysofa/snapshot/python/current/sources/python-2.2.2-urllib2-nonanonftp.patch =================================================================== --- tinysofa/snapshot/python/current/sources/python-2.2.2-urllib2-nonanonftp.patch 2004-07-01 15:53:50 UTC (rev 2827) +++ tinysofa/snapshot/python/current/sources/python-2.2.2-urllib2-nonanonftp.patch 2004-07-01 15:53:54 UTC (rev 2828) @@ -1,47 +0,0 @@ ---- Python-2.2.2/Lib/urllib2.py.ftp 2003-01-02 16:58:12.000000000 -0500 -+++ Python-2.2.2/Lib/urllib2.py 2003-01-02 16:58:48.000000000 -0500 -@@ -120,7 +120,7 @@ - # not sure how many of these need to be gotten rid of - from urllib import unwrap, unquote, splittype, splithost, \ - addinfourl, splitport, splitgophertype, splitquery, \ -- splitattr, ftpwrapper, noheaders -+ splitattr, ftpwrapper, noheaders, splituser, splitpasswd - - # support for proxies via environment variables - from urllib import getproxies -@@ -902,21 +902,30 @@ - host = req.get_host() - if not host: - raise IOError, ('ftp error', 'no host given') -- # XXX handle custom username & password -+ host, port = splitport(host) -+ if port is None: -+ port = ftplib.FTP_PORT -+ -+ # username/password handling -+ user, host = splituser(host) -+ if user: -+ user, passwd = splitpasswd(user) -+ else: -+ passwd = None -+ host = unquote(host) -+ user = unquote(user or '') -+ passwd = unquote(passwd or '') -+ - try: - host = socket.gethostbyname(host) - except socket.error, msg: - raise URLError(msg) -- host, port = splitport(host) -- if port is None: -- port = ftplib.FTP_PORT - path, attrs = splitattr(req.get_selector()) - path = unquote(path) - dirs = path.split('/') - dirs, file = dirs[:-1], dirs[-1] - if dirs and not dirs[0]: - dirs = dirs[1:] -- user = passwd = '' # XXX - try: - fw = self.connect_ftp(user, passwd, host, port, dirs) - type = file and 'I' or 'D' Modified: tinysofa/snapshot/python/current/sources/python-2.3-config.patch =================================================================== --- tinysofa/snapshot/python/current/sources/python-2.3-config.patch 2004-07-01 15:53:50 UTC (rev 2827) +++ tinysofa/snapshot/python/current/sources/python-2.3-config.patch 2004-07-01 15:53:54 UTC (rev 2828) @@ -163,19 +163,19 @@ # *** Always uncomment this (leave the leading underscore in!): -# _tkinter _tkinter.c tkappinit.c -DWITH_APPINIT \ -+#_tkinter _tkinter.c tkappinit.c -DWITH_APPINIT \ ++_tkinter _tkinter.c tkappinit.c -DWITH_APPINIT \ # *** Uncomment and edit to reflect where your Tcl/Tk libraries are: # -L/usr/local/lib \ # *** Uncomment and edit to reflect where your Tcl/Tk headers are: # -I/usr/local/include \ # *** Uncomment and edit to reflect where your X11 header files are: -# -I/usr/X11R6/include \ -+# -I/usr/X11R6/include \ ++ -I/usr/X11R6/include \ # *** Or uncomment this for Solaris: # -I/usr/openwin/include \ # *** Uncomment and edit for Tix extension only: -# -DWITH_TIX -ltix8.1.8.2 \ -+# -DWITH_TIX -ltix \ ++ -DWITH_TIX -ltix \ # *** Uncomment and edit for BLT extension only: # -DWITH_BLT -I/usr/local/blt/blt8.0-unoff/include -lBLT8.0 \ # *** Uncomment and edit for PIL (TkImaging) extension only: @@ -184,10 +184,10 @@ # -DWITH_TOGL togl.c \ # *** Uncomment and edit to reflect your Tcl/Tk versions: -# -ltk8.2 -ltcl8.2 \ -+# -ltk -ltcl \ ++ -ltk -ltcl \ # *** Uncomment and edit to reflect where your X11 libraries are: -# -L/usr/X11R6/lib \ -+# -L/usr/X11R6/lib \ ++ -L/usr/X11R6/lib \ # *** Or uncomment this for Solaris: # -L/usr/openwin/lib \ # *** Uncomment these for TOGL extension only: @@ -196,7 +196,7 @@ # -lld \ # *** Always uncomment this; X11 libraries to link with: -# -lX11 -+# -lX11 ++ -lX11 # Lance Ellinghaus's modules: Deleted: tinysofa/snapshot/python/current/sources/python-2.3.3-cache_ftp.patch =================================================================== --- tinysofa/snapshot/python/current/sources/python-2.3.3-cache_ftp.patch 2004-07-01 15:53:50 UTC (rev 2827) +++ tinysofa/snapshot/python/current/sources/python-2.3.3-cache_ftp.patch 2004-07-01 15:53:54 UTC (rev 2828) @@ -1,12 +0,0 @@ -diff -urN Python-2.3.3/Lib/urllib2.py Python-2.3.3.cache-ftp/Lib/urllib2.py ---- Python-2.3.3/Lib/urllib2.py 2004-04-01 14:34:18.000000000 +1000 -+++ Python-2.3.3.cache-ftp/Lib/urllib2.py 2004-04-01 14:35:12.000000000 +1000 -@@ -1079,7 +1079,7 @@ - self.max_conns = m - - def connect_ftp(self, user, passwd, host, port, dirs): -- key = user, passwd, host, port -+ key = user, host, port, '/'.join(dirs) - if key in self.cache: - self.timeout[key] = time.time() + self.delay - else: Deleted: tinysofa/snapshot/python/current/sources/python-2.3.3-tinysofa-distutils.patch =================================================================== --- tinysofa/snapshot/python/current/sources/python-2.3.3-tinysofa-distutils.patch 2004-07-01 15:53:50 UTC (rev 2827) +++ tinysofa/snapshot/python/current/sources/python-2.3.3-tinysofa-distutils.patch 2004-07-01 15:53:54 UTC (rev 2828) @@ -1,59 +0,0 @@ -diff -urN Python-2.3.3/Lib/distutils/command/bdist_rpm.py Python-2.3.3.distutils.tinysofa/Lib/distutils/command/bdist_rpm.py ---- Python-2.3.3/Lib/distutils/command/bdist_rpm.py 2002-11-20 00:12:28.000000000 +1100 -+++ Python-2.3.3.distutils.tinysofa/Lib/distutils/command/bdist_rpm.py 2004-04-15 23:05:24.000000000 +1000 -@@ -54,7 +54,7 @@ - "name of the (Linux) distribution to which this " - "RPM applies (*not* the name of the module distribution!)"), - ('group=', None, -- "package classification [default: \"Development/Libraries\"]"), -+ "package classification [default: \"tinysofa python\"]"), - ('release=', None, - "RPM release number"), - ('serial=', None, -@@ -183,7 +183,7 @@ - # finalize_options() - - def finalize_package_data (self): -- self.ensure_string('group', "Development/Libraries") -+ self.ensure_string('group', "tinysofa python") - self.ensure_string('vendor', - "%s <%s>" % (self.distribution.get_contact(), - self.distribution.get_contact_email())) -@@ -243,10 +243,10 @@ - self.mkpath(spec_dir) - else: - rpm_dir = {} -- for d in ('SOURCES', 'SPECS', 'BUILD', 'RPMS', 'SRPMS'): -+ for d in ('sources', 'specs', 'build', 'rpms', 'srpms'): - rpm_dir[d] = os.path.join(self.rpm_base, d) - self.mkpath(rpm_dir[d]) -- spec_dir = rpm_dir['SPECS'] -+ spec_dir = rpm_dir['specs'] - - # Spec file goes into 'dist_dir' if '--spec-only specified', - # build/rpm. otherwise. -@@ -270,7 +270,7 @@ - self.run_command('sdist') - - source = sdist.get_archive_files()[0] -- source_dir = rpm_dir['SOURCES'] -+ source_dir = rpm_dir['sources'] - self.copy_file(source, source_dir) - - if self.icon: -@@ -306,13 +306,13 @@ - # that RPM creates exactly one source and one binary RPM. - if not self.dry_run: - if not self.binary_only: -- srpms = glob.glob(os.path.join(rpm_dir['SRPMS'], "*.rpm")) -+ srpms = glob.glob(os.path.join(rpm_dir['srpms'], "*.rpm")) - assert len(srpms) == 1, \ - "unexpected number of SRPM files found: %s" % srpms - self.move_file(srpms[0], self.dist_dir) - - if not self.source_only: -- rpms = glob.glob(os.path.join(rpm_dir['RPMS'], "*/*.rpm")) -+ rpms = glob.glob(os.path.join(rpm_dir['rpms'], "*/*.rpm")) - assert len(rpms) == 1, \ - "unexpected number of RPM files found: %s" % rpms - self.move_file(rpms[0], self.dist_dir) Added: tinysofa/snapshot/python/current/sources/python-2.3.4-distutils-bdist-rpm.patch =================================================================== --- tinysofa/snapshot/python/current/sources/python-2.3.4-distutils-bdist-rpm.patch 2004-07-01 15:53:50 UTC (rev 2827) +++ tinysofa/snapshot/python/current/sources/python-2.3.4-distutils-bdist-rpm.patch 2004-07-01 15:53:54 UTC (rev 2828) @@ -0,0 +1,61 @@ +--- Python-2.3.4/Lib/distutils/command/bdist_rpm.py 2004-05-07 10:53:05.000000000 -0400 ++++ Python-2.3.4/Lib/distutils/command/bdist_rpm.py 2004-06-06 16:01:37.000000000 -0400 +@@ -299,23 +299,47 @@ + if not self.keep_temp: + rpm_cmd.append('--clean') + rpm_cmd.append(spec_path) ++ # Determine the binary rpm names that should be built out of this spec ++ # file ++ # Note that some of these may not be really built (if the file ++ # list is empty) ++ nvr_string = "%{name}-%{version}-%{release}" ++ src_rpm = nvr_string + ".src.rpm" ++ non_src_rpm = "%{arch}/" + nvr_string + ".%{arch}.rpm" ++ q_cmd = r"rpm -q --qf '%s %s\n' --specfile '%s'" % ( ++ src_rpm, non_src_rpm, spec_path) ++ ++ out = os.popen(q_cmd) ++ binary_rpms = [] ++ source_rpm = None ++ while 1: ++ line = out.readline() ++ if not line: ++ break ++ l = string.split(string.strip(line)) ++ assert(len(l) == 2) ++ binary_rpms.append(l[1]) ++ # The source rpm is named after the first entry in the spec file ++ if source_rpm is None: ++ source_rpm = l[0] ++ ++ status = out.close() ++ if status: ++ raise DistutilsExecError("Failed to execute: %s" % repr(q_cmd)) ++ + self.spawn(rpm_cmd) + +- # XXX this is a nasty hack -- we really should have a proper way to +- # find out the names of the RPM files created; also, this assumes +- # that RPM creates exactly one source and one binary RPM. + if not self.dry_run: + if not self.binary_only: +- srpms = glob.glob(os.path.join(rpm_dir['SRPMS'], "*.rpm")) +- assert len(srpms) == 1, \ +- "unexpected number of SRPM files found: %s" % srpms +- self.move_file(srpms[0], self.dist_dir) ++ srpm = os.path.join(rpm_dir['SRPMS'], source_rpm) ++ assert(os.path.exists(srpm)) ++ self.move_file(srpm, self.dist_dir) + + if not self.source_only: +- rpms = glob.glob(os.path.join(rpm_dir['RPMS'], "*/*.rpm")) +- assert len(rpms) == 1, \ +- "unexpected number of RPM files found: %s" % rpms +- self.move_file(rpms[0], self.dist_dir) ++ for rpm in binary_rpms: ++ rpm = os.path.join(rpm_dir['RPMS'], rpm) ++ if os.path.exists(rpm): ++ self.move_file(rpm, self.dist_dir) + + # run() + Added: tinysofa/snapshot/python/current/sources/python-2.3.4-optik.py =================================================================== --- tinysofa/snapshot/python/current/sources/python-2.3.4-optik.py 2004-07-01 15:53:50 UTC (rev 2827) +++ tinysofa/snapshot/python/current/sources/python-2.3.4-optik.py 2004-07-01 15:53:54 UTC (rev 2828) @@ -0,0 +1,17 @@ +"""Backward-compatibility version of optparse + +Export optparse under the name of optik, and issue a deprecation warning +""" + +import warnings +warnings.warn("the optik interface is deprecated; please use optparse instead", + DeprecationWarning) + +import optparse +for s in dir(optparse): + globals()[s] = getattr(optparse, s) + +# Only export what optparse exports +__all__ = [ getattr(optparse, s) for s in dir(optparse) ] +del s +del optparse Deleted: tinysofa/snapshot/python/current/sources/python-doc-html-2.3.4.tar.bz2 =================================================================== (Binary files differ) Modified: tinysofa/snapshot/python/current/specs/python.spec =================================================================== --- tinysofa/snapshot/python/current/specs/python.spec 2004-07-01 15:53:50 UTC (rev 2827) +++ tinysofa/snapshot/python/current/specs/python.spec 2004-07-01 15:53:54 UTC (rev 2828) @@ -1,5 +1,11 @@ +%define aspython2 0 %define unicode ucs4 + +%if %{aspython2} +%define python python2 +%else %define python python +%endif %define pybasever 2.3 %define jp_codecs 1.4.9 @@ -7,16 +13,20 @@ Summary: An interpreted, interactive, object-oriented programming language. Name: %{python} Version: %{pybasever}.4 -Release: 1jh +Release: 4ts License: PSF - see LICENSE -Group: tinysofa/python +Group: Development/Languages Provides: python-abi = %{pybasever} +# optik is part of python 2.3 as optparse +Provides: python-optik = 1.4.1 +Obsoletes: python-optik Source: http://www.python.org/ftp/python/%{version}/Python-%{version}.tar.bz2 -Source2: python-doc-html-2.3.4.tar.bz2 +Source1: http://www.python.org/ftp/python/doc/%{version}/html-%{version}.tar.bz2 Source3: modulator Source4: pynche Source5: http://www.python.jp/pub/JapaneseCodecs/JapaneseCodecs-%{jp_codecs}.tar.gz Source6: http://gigue.peabody.jhu.edu/~mdboom/omi/source/shm_source/shmmodule.c +Source7: python-2.3.4-optik.py Patch0: python-2.3-config.patch Patch3: Python-2.2.1-pydocnogui.patch @@ -25,24 +35,28 @@ Patch8: python-2.3.2-lib64.patch Patch9: japanese-codecs-lib64.patch Patch12: python-2.3.2-nomkhowto.patch -Patch100: python-2.3.3-tinysofa-distutils.patch +Patch13: python-2.3.4-distutils-bdist-rpm.patch -Obsoletes: python2 python-modules python-gdbm python-dbm +%if !%{aspython2} +Obsoletes: python2 Provides: python2 = %{version} -Provides: python-modules = %{version} -Provides: python-gdbm = %{version} BuildPrereq: db4-devel +%else +BuildPrereq: db3-devel +%endif +%if !%{aspython2} Obsoletes: Distutils Provides: Distutils +%endif BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildPrereq: readline-devel, libtermcap-devel, openssl-devel, gmp-devel BuildPrereq: ncurses-devel, gdbm-devel, zlib-devel, expat-devel -BuildPrereq: glibc-devel gcc-c++-devel -BuildPrereq: gzip tar findutils pkgconfig +BuildPrereq: Mesa-devel tk tix gcc-c++ XFree86-devel glibc-devel +BuildPrereq: gzip tar /usr/bin/find pkgconfig tcl-devel tk-devel +BuildPrereq: tix-devel URL: http://www.python.org/ - %description Python is an interpreted, interactive, object-oriented programming language often compared to Tcl, Perl, Scheme or Java. Python includes @@ -60,24 +74,13 @@ Note that documentation for Python is provided in the python-docs package. -%package jp-codecs -Summary: Japanese Codecs for Python Unicode Support -Group: tinysofa/python -Requires: %{name} = %{version}-%{release} -License: a variant of the BSD license - -%description jp-codecs -This package provides Unicode codecs that make Python aware of Japanese -character encodings such as EUC-JP, Shift_JIS and ISO-2022-JP. By using this -package, Japanese characters can be treated as a character string instead of a -byte sequence. - %package devel Summary: The libraries and header files needed for Python development. -Group: tinysofa/development -Requires: %{name} = %{version}-%{release} +Group: Development/Libraries +%if !%{aspython2} Obsoletes: python2-devel Provides: python2-devel = %{version} +%endif %description devel The Python programming language's interpreter can be extended with @@ -92,24 +95,27 @@ %package tools Summary: A collection of development tools included with Python. -Group: tinysofa/development -Requires: %{name} = %{version}-%{release} +Group: Development/Tools +Requires: %{name} = %{version} +Requires: tkinter = %{version} +%if !%{aspython2} Obsoletes: python2-tools Provides: python2-tools = %{version} +%endif %description tools The Python package includes several development tools that are used to build python programs. -%package doc +%package docs Summary: Documentation for the Python programming language. -Group: tinysofa/documentation -Requires: %{name} = %{version} +Group: Documentation +%if !%{aspython2} Obsoletes: python2-docs Provides: python2-docs = %{version} -%rename python-docs +%endif -%description doc +%description docs The python-docs package contains documentation on the Python programming language and interpreter. The documentation is provided in ASCII text files and in LaTeX source files. @@ -117,9 +123,34 @@ Install the python-docs package if you'd like to use the documentation for the Python language. +%if !%{aspython2} +%package -n tkinter +%else +%package -n tkinter2 +%endif +Summary: A graphical user interface for the Python scripting language. +Group: Development/Languages +BuildPrereq: tcl, tk +Requires: %{name} = %{version} +%if !%{aspython2} +Obsoletes: tkinter2 +Provides: tkinter2 = %{version} +%endif +%if !%{aspython2} +%description -n tkinter +%else +%description -n tkinter2 +%endif + +The Tkinter (Tk interface) program is an graphical user interface for +the Python scripting language. + +You should install the tkinter package if you'd like to use a graphical +user interface for Python programming. + %prep -%setup -q -n Python-%{version} -a 2 -a 5 +%setup -q -n Python-%{version} -a 1 -a 5 %patch0 -p1 -b .rhconfig %patch3 -p1 -b .no_gui @@ -130,7 +161,7 @@ %patch9 -p0 -b .lib64-j %endif %patch12 -p1 -b .nomkhowto -%patch100 -p1 +%patch13 -p1 -b .bdist-rpm # This shouldn't be necesarry, but is right now (2.2a3) find -name "*~" |xargs rm -f @@ -147,12 +178,11 @@ shm shmmodule.c EOF -mv Python-Docs-%{version} html/ +# Backwards compatible optik +install -m 0644 %{SOURCE7} Lib/optik.py - %build topdir=`pwd` -export RPM_OPT_FLAGS="$RPM_OPT_FLAGS %{?no_stack_protector}" export CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -fPIC" export CXXFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -fPIC" export OPT="$RPM_OPT_FLAGS -D_GNU_SOURCE -fPIC" @@ -165,102 +195,121 @@ export CC=gcc %configure --enable-ipv6 --enable-unicode=%{unicode} -%make OPT="$CFLAGS" +make OPT="$CFLAGS" %{?_smp_mflags} $topdir/python Tools/scripts/pathfix.py -i "/usr/bin/env python%{pybasever}" . -%make OPT="$CFLAGS" +make OPT="$CFLAGS" %{?_smp_mflags} %ifarch i386 -pushd Doc -make PYTHON=$topdir/python -rm html/index.html.in Makefile* info/Makefile tools/sgmlconv/Makefile -popd +mv Python-Docs-%{version} html/ %endif %install -%{__mkdir_p} %{buildroot}/usr %{buildroot}%{_mandir} +[ -d $RPM_BUILD_ROOT ] && rm -fr $RPM_BUILD_ROOT +mkdir -p $RPM_BUILD_ROOT/usr $RPM_BUILD_ROOT%{_mandir} # Clean up patched .py files that are saved as .lib64 for f in distutils/command/install distutils/sysconfig; do rm -f Lib/$f.py.lib64 done -%makeinstall \ - DESTDIR=/ \ - MANDIR=%{buildroot}%{_mandir} \ - INCLUDEDIR=%{buildroot}%{_includedir} \ - LIBDIR=%{buildroot}%{_libdir} \ - SCRIPTDIR=%{buildroot}%{_libdir} \ - build_root=%{buildroot} - +%makeinstall DESTDIR=/ MANDIR=$RPM_BUILD_ROOT%{_mandir} INCLUDEDIR=$RPM_BUILD_ROOT%{_includedir} LIBDIR=$RPM_BUILD_ROOT%{_libdir} SCRIPTDIR=$RPM_BUILD_ROOT%{_libdir} build_root=$RPM_BUILD_ROOT # Fix the interpreter path in binaries installed by distutils # (which changes them by itself) # Make sure we preserve the file permissions -for fixed in %{buildroot}/usr/bin/pydoc; do +for fixed in $RPM_BUILD_ROOT/usr/bin/pydoc; do sed 's,#!.*/python$,#!/usr/bin/env python%{pybasever},' $fixed > $fixed- \ && cat $fixed- > $fixed && rm -f $fixed- done -ln -s python %{buildroot}%{_bindir}/python2 +%if %{aspython2} +mv $RPM_BUILD_ROOT/usr/bin/python $RPM_BUILD_ROOT/usr/bin/python2 +mv $RPM_BUILD_ROOT/%{_mandir}/man1/python.1 $RPM_BUILD_ROOT/%{_mandir}/man1/python%{pybasever}.1 +%else +ln -s python $RPM_BUILD_ROOT/usr/bin/python2 +%endif # tools -mkdir -p %{buildroot}%{_libdir}/python%{pybasever}/site-packages +mkdir -p ${RPM_BUILD_ROOT}%{_libdir}/python%{pybasever}/site-packages #modulator -install -m 755 $RPM_SOURCE_DIR/modulator %{buildroot}%{_bindir}/modulator +install -m 755 $RPM_SOURCE_DIR/modulator ${RPM_BUILD_ROOT}/usr/bin/modulator cp -r Tools/modulator \ - %{buildroot}%{_libdir}/python%{pybasever}/site-packages/ + ${RPM_BUILD_ROOT}%{_libdir}/python%{pybasever}/site-packages/ #pynche -install -m 755 $RPM_SOURCE_DIR/pynche %{buildroot}%{_bindir}/pynche +install -m 755 $RPM_SOURCE_DIR/pynche ${RPM_BUILD_ROOT}/usr/bin/pynche rm -f Tools/pynche/*.pyw cp -r Tools/pynche \ - %{buildroot}%{_libdir}/python%{pybasever}/site-packages/ + ${RPM_BUILD_ROOT}%{_libdir}/python%{pybasever}/site-packages/ mv Tools/modulator/README Tools/modulator/README.modulator mv Tools/pynche/README Tools/pynche/README.pynche #gettext -install -m755 Tools/i18n/pygettext.py %{buildroot}%{_bindir} -install -m755 Tools/i18n/msgfmt.py %{buildroot}%{_bindir} +install -m755 Tools/i18n/pygettext.py $RPM_BUILD_ROOT/usr/bin/ +install -m755 Tools/i18n/msgfmt.py $RPM_BUILD_ROOT/usr/bin/ # Get rid of crap -find %{buildroot}/ -name "*~"|xargs rm -f -find %{buildroot}/ -name ".cvsignore"|xargs rm -f +find $RPM_BUILD_ROOT/ -name "*~"|xargs rm -f +find $RPM_BUILD_ROOT/ -name ".cvsignore"|xargs rm -f find . -name "*~"|xargs rm -f find . -name ".cvsignore"|xargs rm -f #zero length -rm -f %{buildroot}%{_libdir}/python%{pybasever}/site-packages/modulator/Templates/copyright +rm -f $RPM_BUILD_ROOT%{_libdir}/python%{pybasever}/site-packages/modulator/Templates/copyright # Clean up the testsuite - we don't need compiled files for it -find %{buildroot}%{_libdir}/python%{pybasever}/test \ +find $RPM_BUILD_ROOT%{_libdir}/python%{pybasever}/test \ -name "*.pyc" -o -name "*.pyo" | xargs rm -f -rm -f %{buildroot}%{_libdir}/python2.2/LICENSE.txt +rm -f $RPM_BUILD_ROOT%{_libdir}/python2.2/LICENSE.txt +#make the binaries install side by side with python 1 +%if %{aspython2} +pushd $RPM_BUILD_ROOT/usr/bin +mv idle idle2 +mv modulator modulator2 +mv pynche pynche2 +mv pygettext.py pygettext2.py +mv msgfmt.py msgfmt2.py +mv pydoc pydoc2 +popd +%endif + # Japanese codecs pushd JapaneseCodecs-%{jp_codecs} -PYTHONHOME=$RPM_BUILD_ROOT/usr $RPM_BUILD_ROOT/%{_bindir}/%{python} setup.py \ +PYTHONHOME=$RPM_BUILD_ROOT/usr $RPM_BUILD_ROOT/usr/bin/%{python} setup.py \ install \ ---install-scripts=%{buildroot}%{_prefix}/bin \ ---install-purelib=%{buildroot}%{_libdir}/python%{pybasever}/site-packages \ ---install-platlib=%{buildroot}%{_libdir}/python%{pybasever}/lib-dynload \ ---install-data=%{buildroot}%{_exec_prefix} \ +--install-scripts=$RPM_BUILD_ROOT/%{_prefix}/bin \ +--install-purelib=$RPM_BUILD_ROOT/%{_libdir}/python%{pybasever}/site-packages \ +--install-platlib=$RPM_BUILD_ROOT/%{_libdir}/python%{pybasever}/lib-dynload \ +--install-data=$RPM_BUILD_ROOT/%{_exec_prefix} \ --root=/ popd +find $RPM_BUILD_ROOT%{_libdir}/python%{pybasever}/lib-dynload -type f | grep -v _tkinter.so | sed "s|$RPM_BUILD_ROOT||" > dynfiles %clean -%clean_buildroot +rm -fr $RPM_BUILD_ROOT - -%files +%files -f dynfiles %defattr(-, root, root) %doc LICENSE README -%{_bindir}/python* +/usr/bin/python* +%if %{aspython2} +/usr/bin/idle2 +/usr/bin/modulator2 +/usr/bin/msgfmt2.py +/usr/bin/pydoc2 +/usr/bin/pygettext2.py +/usr/bin/pynche2 +%endif %{_mandir}/*/* %dir %{_libdir}/python%{pybasever} +%dir %{_libdir}/python%{pybasever}/lib-dynload +%dir %{_libdir}/python%{pybasever}/lib-dynload/japanese +%{_libdir}/python%{pybasever}/site-packages/japanese.pth %dir %{_libdir}/python%{pybasever}/site-packages %{_libdir}/python%{pybasever}/site-packages/README %{_libdir}/python%{pybasever}/LICENSE.txt @@ -280,52 +329,53 @@ %{_libdir}/python%{pybasever}/compiler %{_libdir}/python%{pybasever}/plat-linux2 %{_libdir}/python%{pybasever}/hotshot -%dir %{_libdir}/python%{pybasever}/lib-dynload -%attr(755,root,root) %{_libdir}/python%{pybasever}/lib-dynload/*.so -%exclude %{_libdir}/python%{pybasever}/lib-tk -%files jp-codecs -%defattr(644,root,root,755) -%{_libdir}/python%{pybasever}/site-packages/japanese.pth -%{_libdir}/python%{pybasever}/lib-dynload/japanese - %files devel %defattr(-,root,root) /usr/include/* %{_libdir}/python%{pybasever}/config %{_libdir}/python%{pybasever}/test +%if !%{aspython2} %files tools %defattr(-,root,root,755) %doc Tools/modulator/README.modulator %doc Tools/pynche/README.pynche %{_libdir}/python%{pybasever}/site-packages/modulator %{_libdir}/python%{pybasever}/site-packages/pynche -%{_bindir}/idle* -%{_bindir}/modulator* -%{_bindir}/pynche* -%{_bindir}/pygettext*.py -%{_bindir}/msgfmt*.py -%{_bindir}/pydoc +/usr/bin/idle* +/usr/bin/modulator* +/usr/bin/pynche* +/usr/bin/pygettext*.py +/usr/bin/msgfmt*.py +/usr/bin/pydoc +%endif -%files doc -%defattr(644,root,root,755) -%doc Misc/NEWS Misc/README Misc/cheatsheet Misc/HISTORY -%doc Misc/ACKS -%doc Misc/RFD -%doc Misc/find_recursionlimit.py -%doc Misc/python-mode.el -%doc Misc/setuid-prog.c -%doc Misc/indent.pro -%doc Misc/cheatsheet -%doc Misc/vgrindefs -%doc Misc/gdbinit -%doc LICENSE -%doc Demo -%doc html/ +%files docs +%defattr(-,root,root,755) +%doc Misc/NEWS Misc/README Misc/cheatsheet +%doc Misc/HISTORY html +%if !%{aspython2} +%files -n tkinter +%else +%files -n tkinter2 +%endif +%defattr(-,root,root,755) +%{_libdir}/python%{pybasever}/lib-tk +%{_libdir}/python%{pybasever}/lib-dynload/_tkinter.so %changelog +* Tue Jun 15 2004 Elliot Lee +- rebuilt + +* Tue Jun 8 2004 Mihai Ibanescu 2.3.4-3 +- Added an optik.py that provides the same interface from optparse for + backward compatibility; obsoleting python-optik + +* Mon Jun 7 2004 Mihai Ibanescu 2.3.4-2 +- Patched bdist_rpm to allow for builds of multiple binary rpms (bug #123598) + * Fri Jun 4 2004 Mihai Ibanescu 2.3.4-1 - Updated to 2.3.4-1 with Robert Scheck's help (bug #124764) - Added BuildRequires: tix-devel (bug #124918) From svn at tinysofa.org Thu Jul 1 15:54:05 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:54:05 +1000 (EST) Subject: [tinysofa-svn] r2830 - in tinysofa/snapshot/readline/current: sources specs Message-ID: <20040701155405.58C394E817E@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:54:05 +1000 (Fri, 02 Jul 2004) New Revision: 2830 Added: tinysofa/snapshot/readline/current/sources/readline-4.3-no_rpath.patch tinysofa/snapshot/readline/current/sources/readline-4.3.tar.bz2 Removed: tinysofa/snapshot/readline/current/sources/readline-4.2-outdated.patch tinysofa/snapshot/readline/current/sources/readline-4.2-resize.patch tinysofa/snapshot/readline/current/sources/readline-4.3-fixendkey.patch tinysofa/snapshot/readline/current/sources/readline-4.3-guard.patch tinysofa/snapshot/readline/current/sources/readline-4.3.tar.gz Modified: tinysofa/snapshot/readline/current/specs/readline.spec Log: - Sync with 2.0. - Kept: - readline-4.1-outdated.patch: - readline43-001: - readline43-002: - readline43-003: - readline43-004: - readline43-005: - Added: - readline-4.3-no_rpath.patch: - readline-4.3.tar.bz2: - Removed: - readline-4.2-outdated.patch: - readline-4.2-resize.patch: - readline-4.3-fixendkey.patch: - readline-4.3-guard.patch: - readline-4.3.tar.gz: Deleted: tinysofa/snapshot/readline/current/sources/readline-4.2-outdated.patch =================================================================== --- tinysofa/snapshot/readline/current/sources/readline-4.2-outdated.patch 2004-07-01 15:53:57 UTC (rev 2829) +++ tinysofa/snapshot/readline/current/sources/readline-4.2-outdated.patch 2004-07-01 15:54:05 UTC (rev 2830) @@ -1,10 +0,0 @@ ---- readline-4.1/doc/readline.3.outdated Tue Jan 30 15:48:32 2001 -+++ readline-4.1/doc/readline.3 Tue Jan 30 15:51:52 2001 -@@ -1203,3 +1204,7 @@ - .SH BUGS - .PP - It's too big and too slow. -+.PP -+The info file is much more up-to-date. This man page conflicts with it in -+a few places, but the conflicts will be resolved in a future release of -+readline. Deleted: tinysofa/snapshot/readline/current/sources/readline-4.2-resize.patch =================================================================== --- tinysofa/snapshot/readline/current/sources/readline-4.2-resize.patch 2004-07-01 15:53:57 UTC (rev 2829) +++ tinysofa/snapshot/readline/current/sources/readline-4.2-resize.patch 2004-07-01 15:54:05 UTC (rev 2830) @@ -1,10 +0,0 @@ ---- readline-4.1/readline.c.orig Thu Mar 22 00:17:35 2018 -+++ readline-4.1/readline.c Tue Mar 20 00:04:46 2018 -@@ -372,6 +372,7 @@ - while (rl_done == 0) - { - #endif -+ rl_resize_terminal(); - lk = _rl_last_command_was_kill; - - code = setjmp (readline_top_level); Deleted: tinysofa/snapshot/readline/current/sources/readline-4.3-fixendkey.patch =================================================================== --- tinysofa/snapshot/readline/current/sources/readline-4.3-fixendkey.patch 2004-07-01 15:53:57 UTC (rev 2829) +++ tinysofa/snapshot/readline/current/sources/readline-4.3-fixendkey.patch 2004-07-01 15:54:05 UTC (rev 2830) @@ -1,11 +0,0 @@ ---- ./terminal.c.fixendkey 2002-03-04 18:23:09.000000000 +0100 -+++ ./terminal.c 2002-07-23 21:45:01.000000000 +0200 -@@ -313,7 +313,7 @@ - { "ei", &_rl_term_ei }, - { "ic", &_rl_term_ic }, - { "im", &_rl_term_im }, -- { "kH", &_rl_term_kH }, /* home down ?? */ -+ { "@", &_rl_term_kH }, /* home down ?? */ - { "kI", &_rl_term_kI }, /* insert */ - { "kd", &_rl_term_kd }, - { "ke", &_rl_term_ke }, /* end keypad mode */ Deleted: tinysofa/snapshot/readline/current/sources/readline-4.3-guard.patch =================================================================== --- tinysofa/snapshot/readline/current/sources/readline-4.3-guard.patch 2004-07-01 15:53:57 UTC (rev 2829) +++ tinysofa/snapshot/readline/current/sources/readline-4.3-guard.patch 2004-07-01 15:54:05 UTC (rev 2830) @@ -1,12 +0,0 @@ ---- readline-2.2.1/text.c.guard Thu Apr 2 11:16:12 1998 -+++ readline-2.2.1/text.c Fri Apr 9 20:50:55 1999 -@@ -1100,6 +1100,9 @@ - else - rl_point = end; - } -+ /* check for arithmetic overflow */ -+ if (rl_point < 0) -+ rl_point = 0; - return 0; - } - Added: tinysofa/snapshot/readline/current/sources/readline-4.3-no_rpath.patch =================================================================== --- tinysofa/snapshot/readline/current/sources/readline-4.3-no_rpath.patch 2004-07-01 15:53:57 UTC (rev 2829) +++ tinysofa/snapshot/readline/current/sources/readline-4.3-no_rpath.patch 2004-07-01 15:54:05 UTC (rev 2830) @@ -0,0 +1,11 @@ +--- readline-4.3/support/shobj-conf.no_rpath 2002-04-17 19:27:46.000000000 +0200 ++++ readline-4.3/support/shobj-conf 2003-11-28 14:48:22.000000000 +0100 +@@ -102,7 +102,7 @@ + SHOBJ_LD='${CC}' + SHOBJ_LDFLAGS='-shared -Wl,-soname,$@' + +- SHLIB_XLDFLAGS='-Wl,-rpath,$(libdir) -Wl,-soname,`basename $@ $(SHLIB_MINOR)`' ++ SHLIB_XLDFLAGS='-Wl,-soname,`basename $@ $(SHLIB_MINOR)`' + SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)$(SHLIB_MINOR)' + ;; + Added: tinysofa/snapshot/readline/current/sources/readline-4.3.tar.bz2 =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/readline/current/sources/readline-4.3.tar.bz2 ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: tinysofa/snapshot/readline/current/sources/readline-4.3.tar.gz =================================================================== (Binary files differ) Modified: tinysofa/snapshot/readline/current/specs/readline.spec =================================================================== --- tinysofa/snapshot/readline/current/specs/readline.spec 2004-07-01 15:53:57 UTC (rev 2829) +++ tinysofa/snapshot/readline/current/specs/readline.spec 2004-07-01 15:54:05 UTC (rev 2830) @@ -1,218 +1,238 @@ -%define with_devel 1 - +Summary: A library for editing typed command lines. Name: readline Version: 4.3 -Release: 8ok -Summary: A library for reading and returning lines from a terminal -Summary(pt_BR): Biblioteca para leitura de linhas de um terminal -Summary(es): Biblioteca para lectura de l?neas de un terminal -Group: tinysofa/libraries -Group(pt_BR): tinysofa/bibliotecas -Group(es): tinysofa/bibliotecas +Release: 11ts License: GPL -Source: ftp://ftp.gnu.org/gnu/%{name}-%{version}.tar.gz -Patch0: ftp://ftp.gnu.org/gnu/readline/readline-4.3-patches/readline43-001 -Patch1: ftp://ftp.gnu.org/gnu/readline/readline-4.3-patches/readline43-002 -Patch2: ftp://ftp.gnu.org/gnu/readline/readline-4.3-patches/readline43-003 -Patch3: ftp://ftp.gnu.org/gnu/readline/readline-4.3-patches/readline43-004 -Patch4: ftp://ftp.gnu.org/gnu/readline/readline-4.3-patches/readline43-005 -Patch5: %{name}-4.2-outdated.patch -Patch6: %{name}-4.2-resize.patch -Patch7: %{name}-4.3-fixendkey.patch -Patch8: %{name}-4.3-guard.patch -PreReq: /sbin/ldconfig -%info_requires -BuildRequires: binutils -BuildRequires: coreutils -BuildRequires: gcc -BuildRequires: glibc-devel -BuildRequires: make -BuildRoot: %{_tmppath}/%{name}-%{version}-root +Group: System Environment/Libraries +Source: ftp://ftp.gnu.org/gnu/readline-%{version}.tar.bz2 +Patch0: readline-4.1-outdated.patch +Patch1: ftp://ftp.cwru.edu/pub/bash/readline-4.3-patches/readline43-001 +Patch2: ftp://ftp.cwru.edu/pub/bash/readline-4.3-patches/readline43-002 +Patch3: ftp://ftp.cwru.edu/pub/bash/readline-4.3-patches/readline43-003 +Patch4: ftp://ftp.cwru.edu/pub/bash/readline-4.3-patches/readline43-004 +Patch5: ftp://ftp.cwru.edu/pub/bash/readline-4.3-patches/readline43-005 +Patch6: readline-4.3-no_rpath.patch +Prereq: /sbin/install-info /sbin/ldconfig +Buildroot: %{_tmppath}/%{name}-%{version}-root +BuildRequires: sed autoconf %description -The readline library reads a line from the terminal and returns it, allowing -the user to edit the line with standard emacs editing keys. The readline -library allows programmers to provide an easy to use and more intuitive -interface for users. +The Readline library provides a set of functions that allow users to +edit command lines. Both Emacs and vi editing modes are available. The +Readline library includes additional functions for maintaining a list +of previously-entered command lines for recalling or editing those +lines, and for performing csh-like history expansion on previous +commands. -If you want to develop programs that will use the readline library, you'll also -need to install the readline-devel package. +%package devel +Summary: Files needed to develop programs which use the readline library. +Group: Development/Libraries +Requires: readline = %{version} +Requires: libtermcap-devel -%description -l pt_BR -A biblioteca "readline" ler? uma linha do terminal e ir? retorn?-la, permitindo -ao usu?rio editar a linha com as teclas de edi??o padr?o emacs. Ele permite ao -programador dar ao usu?rio uma interface mais f?cil de usar e mais intuitiva. +%description devel +The Readline library provides a set of functions that allow users to +edit typed command lines. If you want to develop programs that will +use the readline library, you need to have the readline-devel package +installed. You also need to have the readline package installed. -%description -l es -La biblioteca "readline" leer? una l?nea del terminal y la recuperar?, -permitiendo al usuario editar la l?nea con las teclas de edici?n padr?n emacs. -Permite al programador dar al usuario una interface m?s f?cil de usar y m?s -intuitiva. +%prep +%setup -q +%patch0 -p1 -b .outdated +%patch1 -p0 -b .readline43-001 +%patch2 -p0 -b .readline43-002 +%patch3 -p0 -b .readline43-003 +%patch4 -p0 -b .readline43-004 +%patch5 -p0 -b .readline43-005 +%patch6 -p1 -b .no_rpath -%package -n %{libname} -Summary: A library for reading and returning lines from a terminal -Summary(pt_BR): Biblioteca para leitura de linhas de um terminal -Summary(es): Biblioteca para lectura de l?neas de un terminal -Group: tinysofa/libraries -Group(pt_BR): tinysofa/bibliotecas -Group(es): tinysofa/bibliotecas -%rename readline +libtoolize --copy --force +autoconf || autoconf-2.53 -%description -n %{libname} -The readline library reads a line from the terminal and returns it, allowing -the user to edit the line with standard emacs editing keys. The readline -library allows programmers to provide an easy to use and more intuitive -interface for users. +%build +%configure +make all shared -If you want to develop programs that will use the readline library, you'll also -need to install the readline-devel package. +%install +[ "${RPM_BUILD_ROOT}" != "/" ] && rm -rf ${RPM_BUILD_ROOT} +mkdir -p ${RPM_BUILD_ROOT}%{_libdir} -%description -n %{libname} -l pt_BR -A biblioteca "readline" ler? uma linha do terminal e ir? retorn?-la, permitindo -ao usu?rio editar a linha com as teclas de edi??o padr?o emacs. Ele permite ao -programador dar ao usu?rio uma interface mais f?cil de usar e mais intuitiva. +%makeinstall -%description -n %{libname} -l es -La biblioteca "readline" leer? una l?nea del terminal y la recuperar?, -permitiendo al usuario editar la l?nea con las teclas de edici?n padr?n emacs. -Permite al programador dar al usuario una interface m?s f?cil de usar y m?s -intuitiva. +chmod 755 ${RPM_BUILD_ROOT}%{_libdir}/*.so* -%if %{with_devel} -%package -n %{libname_devel} -Summary: Development files for programs which will use the readline library -Summary(pt_BR): Arquivo para desenvolver programas que utilizam a readline -Summary(es): Archivo para desarrollar programas que utilicen la biblioteca readline -Group: tinysofa/development -Group(pt_BR): tinysofa/desenvolvimento -Group(es): tinysofa/desarrollo -PreReq: %{libname} = %{version} -%rename readline-devel +{ cd ${RPM_BUILD_ROOT} + gzip -9nf .%{_infodir}/*.info* + rm -f .%{_infodir}/dir +} + +%clean +[ "${RPM_BUILD_ROOT}" != "/" ] && rm -rf ${RPM_BUILD_ROOT} -%description -n %{libname_devel} -The readline library will read a line from the terminal and return it. Use of -the readline library allows programmers to provide an easy to use and more -intuitive interface for users. +%post +/sbin/ldconfig +/sbin/install-info %{_infodir}/history.info.gz %{_infodir}/dir +/sbin/install-info %{_infodir}/readline.info.gz %{_infodir}/dir -If you want to develop programs which will use the readline library, you'll -need to have the readline-devel package installed. You'll also need to have the -readline package installed. +%postun -p /sbin/ldconfig -%description -n %{libname_devel} -l pt_BR -A biblioteca readline ler? uma linha do terminal e a retornar?, usando prompt -como prompt. Se prompt ? nulo, nenhum prompt ? mostrado. A linha retornada ? -alocada com malloc(3), devendo o chamador liber?-la quando terminar. A linha -retornada tem o salto de linha final removido, desta forma somente o texto da -linha ? disponibilizado. +%preun +if [ $1 = 0 ]; then + /sbin/install-info --delete %{_infodir}/history.info.gz %{_infodir}/dir + /sbin/install-info --delete %{_infodir}/readline.info.gz %{_infodir}/dir +fi -%description -n %{libname_devel} -l es -La biblioteca readline leer? una l?nea del terminal y la recuperar?, usando -prompt como prompt. Si prompt es nulo, ning?n prompt se ense?a. La l?nea -recuperada es alocada con malloc(3), debiendo el llamador liberarla cuando -terminar. La l?nea recuperada tiene el salto de l?nea final quitado, de esta -forma solamente el texto de la l?nea se pone a disposici?n. -%endif +%files +%defattr(-,root,root) +%{_mandir}/man*/* +%{_infodir}/*.info* +%{_libdir}/lib*.so.* -%prep -%setup -q -%patch0 -p0 -b .001 -%patch1 -p0 -b .002 -%patch2 -p0 -b .003 -%patch3 -p0 -b .004 -%patch4 -p0 -b .005 -%patch5 -p1 -b .outdated -%patch6 -p1 -b .resize -%patch7 -p1 -b .fixendkey -%patch8 -p1 -b .guard +%files devel +%defattr(-,root,root) +%{_includedir}/readline +%{_libdir}/lib*.a +%{_libdir}/lib*.so -%build -autoconf -%configure --with-curses=ncurses -%make static shared +%changelog +* Tue Jun 15 2004 Elliot Lee +- rebuilt -%install -%clean_buildroot -%makeinstall +* Tue Mar 02 2004 Elliot Lee +- rebuilt -%{__mkdir_p} "%{buildroot}%{_htmldir}/%{name}" -install -m 644 doc/readline.html "%{buildroot}%{_htmldir}/%{name}/readline.html" -install -m 644 doc/history.html "%{buildroot}%{_htmldir}/%{name}/history.html" -install -m 644 doc/rluserman.html "%{buildroot}%{_htmldir}/%{name}/rluserman.html" -%nuke_info +* Fri Feb 13 2004 Elliot Lee +- rebuilt -%if ! %{with_devel} -rm -rf %{buildroot}%{_includedir}/readline/ -rm -f %{buildroot}%{_libdir}/libhistory.a -rm -f %{buildroot}%{_libdir}/libreadline.a -rm -f %{buildroot}%{_mandir}/man3/history* -rm -f %{buildroot}%{_mandir}/man3/readline* -%endif +* Fri Nov 28 2003 Thomas Woerner 4.3-9 +- removed rpath -%clean -%clean_buildroot +* Thu Nov 6 2003 Tim Waugh 4.3-8 +- Apply upstream patches (bug #109240 among others). -%post -n %{libname} -/sbin/ldconfig -%info_post +* Wed Jun 25 2003 Tim Waugh +- devel package requires libtermcap-devel (bug #98015). -%postun -n %{libname} -/sbin/ldconfig -%info_postun +* Wed Jun 25 2003 Tim Waugh 4.3-7 +- Fixed recursion loop (bug #92372). -%files -n %{libname} -%defattr(0644,root,root,0755) -%{_libdir}/lib*.so.* -%{_htmldir}/%{name} +* Wed Jun 04 2003 Elliot Lee +- rebuilt -%if %{with_devel} -%files -n %{libname_devel} -%defattr(0644,root,root,0755) -%dir %{_includedir}/%{name} -%{_mandir}/man3/history.3* -%{_mandir}/man3/readline.3* -%{_includedir}/%{name}/*.h -%{_libdir}/lib*.so -%{_libdir}/lib*.a -%endif +* Wed Jan 22 2003 Tim Powers +- rebuilt +* Wed Nov 20 2002 Tim Powers +- rebuild in current collinst +- BuildRequires autoconf only -%changelog -* Thu Jan 22 2004 Arnaldo Carvalho de Melo -+ 2004-01-22 17:39:25 (46234) -- %%remove_info already checks $1 -- Added missing BuildRequires +* Wed Aug 07 2002 Phil Knirsch 4.3-3 +- Fixed Esc-O-M stack overflow bug. -* Wed Jan 14 2004 Arnaldo Carvalho de Melo -+ 2004-01-14 12:04:05 (44507) -- Devel packages shouldn't have %%{release} in its PreReq +* Mon Jul 22 2002 Phil Knirsch 4.3-1 +- Updated to latest readline release 4.3 -* Wed Jan 14 2004 Arnaldo Carvalho de Melo -+ 2004-01-14 11:41:01 (44503) -- Enable the devel package build +* Thu Jul 11 2002 Phil Knirsch 4.2a-7 +- Fixed problem with alpha build. -* Wed Jan 14 2004 Arnaldo Carvalho de Melo -+ 2004-01-14 11:39:34 (44502) -- Added upstream patches -- Removed the segfault-fix patch, it is one of the newly added upstream patches -- Made the devel packages be selectable at build time -- Removed unwanted unpackaged files -- Added BuildRequires -- Use info macros for installing/removing info pages -- Use -p in scriptlets -- Removed misfiled "spanish" translations +* Wed Jul 10 2002 Phil Knirsch +- Fixed utf8 problem (originally observed in bash). -* Tue Jan 13 2004 Ricardo Erbano -+ 2004-01-13 15:46:30 (44399) -- Removed unpackaged file to fix rpm build error +* Fri Jun 21 2002 Tim Powers 4.2a-6 +- automated rebuild -* Tue Sep 03 2002 Gustavo Niemeyer -+ 2002-09-03 16:03:51 (13428) -- Imported package from snapshot. +* Thu May 23 2002 Tim Powers 4.2a-5 +- automated rebuild -* Wed Aug 28 2002 Gustavo Niemeyer -+ 2002-08-28 21:06:59 (6150) -- Imported package from 7.0. +* Wed Mar 20 2002 Trond Eivind Glomsr?d 4.2a-4 +- Use autoconf 2.53, not 2.52 -* Tue Aug 27 2002 Gustavo Niemeyer -+ 2002-08-27 19:48:39 (1647) -- Imported package from 6.0. +* Mon Mar 4 2002 Bernhard Rosenkraenzer 4.2a-3 +- Rebuild + +* Mon Nov 26 2001 Matt Wilson 4.2a-2 +- removed the manual symlinking of .so, readline handles this by itself +- call only %%makeinstall, not %%makeinstall install install-shared as + this makes bogus .old files in the buildroot + +* Tue Nov 20 2001 Bernhard Rosenkraenzer 4.2a-1 +- 4.2a + +* Tue Oct 2 2001 Bernhard Rosenkraenzer 4.2-4 +- Work around autoconf bug + +* Mon Oct 1 2001 Bernhard Rosenkraenzer 4.2-3 +- Don't use readline's internal re-implementation of strpbrk on systems + that have strpbrk - the system implementation is faster and better maintained. + +* Tue Aug 7 2001 Bernhard Rosenkraenzer 4.2-2 +- Make sure headers can be included from C++ applications (#51131) + (Patch based on Debian's with the bugs removed ;) ) + +* Wed May 09 2001 Florian La Roche +- update to 4.2 and adapt patches + +* Fri Apr 6 2001 Nalin Dahyabhai +- change the paths listed for the header files in the man page to reflect + the location changes from previous versions (#35073) +- note that "on" is acceptable instead of "On" in the man page (#21327) + +* Thu Mar 8 2001 Preston Brown +- fix reading of end key termcap value (@7 is correct, was kH) (#30884) + +* Tue Jan 30 2001 Nalin Dahyabhai +- mark the man page as currently out-of-date (#25294) + +* Thu Sep 7 2000 Jeff Johnson +- FHS packaging (64bit systems need to use libdir). + +* Thu Aug 17 2000 Jeff Johnson +- summaries from specspo. + +* Wed Aug 2 2000 Florian La Roche +- use "rm -f" in specfile + +* Wed Jul 12 2000 Prospector +- automatic rebuild + +* Mon Jun 5 2000 Jeff Johnson +- FHS packaging. + +* Tue Mar 21 2000 Bernhard Rosenkraenzer +- 4.1 + +* Thu Feb 03 2000 Nalin Dahyabhai +- update to 4.0 + +* Fri Apr 09 1999 Michael K. Johnson +- added guard patch from Taneli Huuskonen + +* Sun Mar 21 1999 Cristian Gafton +- auto rebuild in the new build environment (release 4) + +* Sun Jul 26 1998 Jeff Johnson +- updated to 2.2.1 + +* Wed May 06 1998 Prospector System +- translations modified for de, fr, tr + +* Wed May 06 1998 Cristian Gafton +- don't package /usr/info/dir + +* Thu Apr 30 1998 Cristian Gafton +- devel package moved to Development/Libraries + +* Tue Apr 21 1998 Cristian Gafton +- updated to 2.2 + +* Tue Oct 14 1997 Donnie Barnes +- spec file cleanups + +* Fri Oct 10 1997 Erik Troan +- added proper sonames + +* Tue Jul 08 1997 Erik Troan +- updated to readline 2.1 + +* Tue Jun 03 1997 Erik Troan +- built against glibc From svn at tinysofa.org Thu Jul 1 15:54:02 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:54:02 +1000 (EST) Subject: [tinysofa-svn] r2829 - in tinysofa/snapshot/quota/current: sources specs Message-ID: <20040701155402.4BE454E817E@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:53:57 +1000 (Fri, 02 Jul 2004) New Revision: 2829 Added: tinysofa/snapshot/quota/current/sources/quota-3.06-man-page.patch tinysofa/snapshot/quota/current/sources/quota-3.06-no-stripping.patch tinysofa/snapshot/quota/current/sources/quota-3.06-pie.patch tinysofa/snapshot/quota/current/sources/quota-3.06-warnquota.patch tinysofa/snapshot/quota/current/sources/quota-3.09-root_sbindir.patch Modified: tinysofa/snapshot/quota/current/specs/quota.spec Log: - Sync with 2.0. - Kept: - quota-3.10.tar.gz: - Added: - quota-3.06-man-page.patch: - quota-3.06-no-stripping.patch: - quota-3.06-pie.patch: - quota-3.06-warnquota.patch: - quota-3.09-root_sbindir.patch: Added: tinysofa/snapshot/quota/current/sources/quota-3.06-man-page.patch =================================================================== --- tinysofa/snapshot/quota/current/sources/quota-3.06-man-page.patch 2004-07-01 15:53:54 UTC (rev 2828) +++ tinysofa/snapshot/quota/current/sources/quota-3.06-man-page.patch 2004-07-01 15:53:57 UTC (rev 2829) @@ -0,0 +1,38 @@ +--- quota-tools/quotaon.8.orig Wed Aug 7 15:14:52 2002 ++++ quota-tools/quotaon.8 Wed Aug 7 15:15:40 2002 +@@ -3,7 +3,7 @@ + .SH NAME + quotaon, quotaoff \- turn filesystem quotas on and off + .SH SYNOPSIS +-.B /usr/sbin/quotaon ++.B /sbin/quotaon + [ + .B \-vugfp + ] [ +@@ -12,7 +12,7 @@ + ] + .IR filesystem .\|.\|. + .br +-.B /usr/sbin/quotaon ++.B /sbin/quotaon + [ + .B \-avugfp + ] [ +@@ -20,7 +20,7 @@ + .I format-name + ] + .LP +-.B /usr/sbin/quotaoff ++.B /sbin/quotaoff + [ + .B \-vugp + ] +@@ -30,7 +30,7 @@ + ] + .IR filesystem .\|.\|. + .br +-.B /usr/sbin/quotaoff ++.B /sbin/quotaoff + [ + .B \-avugp + ] Added: tinysofa/snapshot/quota/current/sources/quota-3.06-no-stripping.patch =================================================================== --- tinysofa/snapshot/quota/current/sources/quota-3.06-no-stripping.patch 2004-07-01 15:53:54 UTC (rev 2828) +++ tinysofa/snapshot/quota/current/sources/quota-3.06-no-stripping.patch 2004-07-01 15:53:57 UTC (rev 2829) @@ -0,0 +1,13 @@ +--- quota-tools/Makefile.in.orig 2002-07-17 17:07:14.000000000 -0400 ++++ quota-tools/Makefile.in 2002-07-17 18:08:39.000000000 -0400 +@@ -90,8 +90,8 @@ + -mkdir -p $(ROOTDIR)$(mandir)/man8 + -$(INSTALL) -m 755 -d $(ROOTDIR)$(includedir)/rpcsvc + -$(INSTALL) -m 644 rquota.h rquota.x $(ROOTDIR)$(includedir)/rpcsvc +- -$(INSTALL) -s -m $(DEF_SBIN_MODE) quota $(ROOTDIR)$(bindir) +- -$(INSTALL) -s -m $(DEF_SBIN_MODE) rpc.rquotad $(ROOTDIR)$(sbindir) ++ -$(INSTALL) -m $(DEF_SBIN_MODE) quota $(ROOTDIR)$(bindir) ++ -$(INSTALL) -m $(DEF_SBIN_MODE) rpc.rquotad $(ROOTDIR)$(sbindir) + -$(INSTALL) -m $(DEF_MAN_MODE) *.1 $(ROOTDIR)$(mandir)/man1 + -$(INSTALL) -m $(DEF_MAN_MODE) *.2 $(ROOTDIR)$(mandir)/man2 + -$(INSTALL) -m $(DEF_MAN_MODE) *.3 $(ROOTDIR)$(mandir)/man3 Added: tinysofa/snapshot/quota/current/sources/quota-3.06-pie.patch =================================================================== --- tinysofa/snapshot/quota/current/sources/quota-3.06-pie.patch 2004-07-01 15:53:54 UTC (rev 2828) +++ tinysofa/snapshot/quota/current/sources/quota-3.06-pie.patch 2004-07-01 15:53:57 UTC (rev 2829) @@ -0,0 +1,35 @@ +--- quota-tools/Makefile.in.lr 2004-01-27 15:20:18.000000000 +0100 ++++ quota-tools/Makefile.in 2004-01-27 15:21:48.000000000 +0100 +@@ -49,6 +49,10 @@ + + all: $(PROGS) + ++ ++svc_socket.o rquota_server.o rquota_svc.o $(filter-out rquota_xdr.o,$(LIBOBJS)): %.o: %.c ++ $(CC) $(CFLAGS) -fpie -c $< ++ + clean: + -rm -f core *.o .*.d + +@@ -125,10 +129,10 @@ + convertquota: convertquota.o $(LIBOBJS) + + rpc.rquotad: rquota_server.o rquota_svc.o svc_socket.o $(LIBOBJS) +- $(CC) $(LDFLAGS) -o $@ $^ $(LIBS) ++ $(CC) $(LDFLAGS) -pie -o $@ $^ $(LIBS) ++ @if readelf -d $@|fgrep -q TEXTREL; then echo "*** Text relocation"; false; else true; fi + + pot.o: pot.c pot.h +- $(CC) $(CFLAGS) -c $< + + rquota.h: rquota.x + $(RPCGEN) -h -o $@ $< +@@ -137,7 +141,7 @@ + $(RPCGEN) -c -o $@ $< + + rquota_xdr.o: rquota_xdr.c rquota.h +- $(CC) $(CFLAGS) -Wno-unused -c $< ++ $(CC) $(CFLAGS) -Wno-unused -fpie -c $< + + rquota_clnt.c: rquota.x + $(RPCGEN) -l -o $@ $< Added: tinysofa/snapshot/quota/current/sources/quota-3.06-warnquota.patch =================================================================== --- tinysofa/snapshot/quota/current/sources/quota-3.06-warnquota.patch 2004-07-01 15:53:54 UTC (rev 2828) +++ tinysofa/snapshot/quota/current/sources/quota-3.06-warnquota.patch 2004-07-01 15:53:57 UTC (rev 2829) @@ -0,0 +1,36 @@ +--- quota-tools/warnquota.conf.orig Sat Aug 16 00:54:17 2003 ++++ quota-tools/warnquota.conf Sat Aug 16 01:00:02 2003 +@@ -4,21 +4,25 @@ + # and even blank lines + + # values can be quoted: +-MAIL_CMD = "/usr/my/sendmail/instead/sendmail -t" +-FROM = "bas at localhost" ++MAIL_CMD = "/usr/sbin/sendmail -t" ++FROM = + # but they don't have to be: +-SUBJECT = Hey, user, clean up your account! +-CC_TO = "sysadm at localhost" +-SUPPORT = "support at myhost.com" ++# ++SUBJECT = NOTE: You are exceeding your allocatted disk space limits ++CC_TO = "root at localhost" ++SUPPORT = "root at myhost.com" + PHONE = "(123) 456-1111 or (222) 333-4444" + # Text in the beginning of the mail (if not specified, default text is used) + # This way text can be split to more lines + # Line breaks are done by '|' character +-MESSAGE = Hello, I've noticed you use too much space\ +- on my disk|Delete your files on following filesystems:| ++# ++MESSAGE = Your disk usage has exceeded the agreeded limits\ ++ on this server|Please delete any unnecessary files on following filesystems:| ++ + # Text in the end of the mail (if not specified, default text using SUPPORT and PHONE + # is created) +-SIGNATURE = See you!| Your admin| ++SIGNATURE = root at localhost ++ + # Following text is used for mails about group exceeding quotas + # It should contain string %s exactly once - it will be substituted for a group name + GROUP_MESSAGE = Hello, a group '%s' you're member of use too much space.|\ Added: tinysofa/snapshot/quota/current/sources/quota-3.09-root_sbindir.patch =================================================================== --- tinysofa/snapshot/quota/current/sources/quota-3.09-root_sbindir.patch 2004-07-01 15:53:54 UTC (rev 2828) +++ tinysofa/snapshot/quota/current/sources/quota-3.09-root_sbindir.patch 2004-07-01 15:53:57 UTC (rev 2829) @@ -0,0 +1,21 @@ +--- quota-tools/Makefile.in.orig Tue Apr 8 09:04:25 2003 ++++ quota-tools/Makefile.in Sat Aug 16 01:53:05 2003 +@@ -30,6 +30,7 @@ + sbindir = $(prefix)/sbin + mandir = @mandir@ + includedir = $(prefix)/include ++root_sbindir = /sbin + locale_dir = $(prefix)/share/locale + sysconfdir = @sysconfdir@ + +@@ -78,8 +79,8 @@ + -mkdir -p $(ROOTDIR)$(sbindir) + -mkdir -p $(ROOTDIR)$(bindir) + -$(INSTALL) -m $(DEF_SBIN_MODE) \ +- quotacheck quotaon convertquota $(ROOTDIR)$(sbindir) +- $(LN) quotaon $(ROOTDIR)$(sbindir)/quotaoff ++ quotacheck quotaon convertquota $(ROOTDIR)$(root_sbindir) ++ $(LN) quotaon $(ROOTDIR)$(root_sbindir)/quotaoff + -$(INSTALL) -m $(DEF_SBIN_MODE) \ + edquota repquota warnquota quotastats setquota quot xqmstats \ + $(ROOTDIR)$(sbindir) Modified: tinysofa/snapshot/quota/current/specs/quota.spec =================================================================== --- tinysofa/snapshot/quota/current/specs/quota.spec 2004-07-01 15:53:54 UTC (rev 2828) +++ tinysofa/snapshot/quota/current/specs/quota.spec 2004-07-01 15:53:57 UTC (rev 2829) @@ -1,95 +1,225 @@ Name: quota Summary: System administration tools for monitoring users' disk usage. +Epoch: 1 Version: 3.10 -Release: 5ts -Source0: http://umn.dl.sourceforge.net/sourceforge/linuxquota/quota-%{version}.tar.gz +Release: 3ts License: BSD -Group: tinysofa official -BuildRoot: %{_tmppath}/%{name}-root -BuildRequires: e2fsprogs-devel gettext +Group: System Environment/Base +BuildRoot: %{_tmppath}/%{name}-%{version}-root +Requires: kernel >= 2.4 initscripts >= 6.38 +BuildPreReq: e2fsprogs-devel gettext tcp_wrappers +Source0: http://prdownloads.sourceforge.net/linuxquota/quota-%{version}.tar.gz +Patch0: quota-3.06-warnquota.patch +Patch1: quota-3.06-no-stripping.patch +Patch2: quota-3.06-man-page.patch +Patch3: quota-3.09-root_sbindir.patch +Patch4: quota-3.06-pie.patch + %description The quota package contains system administration tools for monitoring -and limiting users' and or groups' disk usage, per filesystem. +and limiting user and or group disk usage per filesystem. -Install quota if you want to monitor and/or limit user/group disk -usage. %prep -%setup -q -n %{name}-tools +%setup -q -n quota-tools +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 +%ifnarch ppc ppc64 +%patch4 -p1 +%endif + %build -%configure +%configure \ + --with-ext2direct=no make + %install -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != "/" ] && rm -rf "$RPM_BUILD_ROOT" -mkdir -p $RPM_BUILD_ROOT/{etc,sbin} -mkdir -p $RPM_BUILD_ROOT%{_initdir} -make ROOTDIR=$RPM_BUILD_ROOT install +rm -fr %{buildroot} +mkdir -p %{buildroot}/sbin +mkdir -p %{buildroot}%{_sysconfdir} +mkdir -p %{buildroot}%{_sbindir} +mkdir -p %{buildroot}%{_bindir} +mkdir -p %{buildroot}%{_mandir}/{man1,man2,man3,man8} +make install ROOTDIR=%{buildroot} +install -m 644 warnquota.conf %{buildroot}%{_sysconfdir} +# +# we don't support XFS yet +# +rm -f %{buildroot}%{_sbindir}/quot +rm -f %{buildroot}%{_sbindir}/xqmstats +rm -f %{buildroot}%{_mandir}/man8/quot.* -# Some binaries have to be available before /usr is mounted -for i in convertquota quotacheck quotaoff quotaon; do - mv $RPM_BUILD_ROOT/usr/sbin/$i $RPM_BUILD_ROOT/sbin/ -done +%find_lang %{name} -# This one is provided by nfs-utils -rm -f $RPM_BUILD_ROOT/usr/sbin/rpc.rquotad -rm -f $RPM_BUILD_ROOT%{_mandir}/*/*rquotad* -%find_lang %{name} - %clean -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} + %files -f %{name}.lang %defattr(-,root,root) -%doc doc/quotas.preformated -/etc/*quota* -/usr/bin/* -/usr/sbin/* -/sbin/* -%{_mandir}/*/* +%config(noreplace) %{_sysconfdir}/warnquota.conf +%attr(0644,root,root) %{_sysconfdir}/* +%attr(0755,root,root) /sbin/* +%attr(0755,root,root) %{_bindir}/* +%attr(0755,root,root) %{_sbindir}/* +%{_includedir}/rpcsvc/* +%attr(0644,root,root) %{_mandir}/man1/* +%attr(0644,root,root) %{_mandir}/man2/* +%attr(0644,root,root) %{_mandir}/man3/* +%attr(0644,root,root) %{_mandir}/man8/* -%exclude /usr/include/rpcsvc %changelog -* Wed May 19 2004 tsintegrate 3.10-5ts -- current (3.10-4ts) integrated as 3.10-5ts for release 1.0-U1 +* Tue Jun 15 2004 Elliot Lee +- rebuilt -* Wed May 12 2004 Omar Kilani 3.10-4ts -- Add BuildRequires gettext +* Fri Feb 13 2004 Elliot Lee +- rebuilt -* Tue Dec 9 2003 Chr. Toldnes 3.10-1tr -- New upstream version: 3.10 +* Tue Jan 27 2004 Florian La Roche +- add -pie support +- update to 3.10 -* Wed Jun 18 2003 Erlend Midttun 3.08-4tr -- Big rebuild +* Sat Aug 16 2003 Steve Dickson +- upgraded to 3.0.9 +- added quota-3.09-root_sbindir.patch -* Tue Jun 3 2003 Tore Olsen 3.08-3to -- Moved some binaries to /sbin, needed before /usr is mounted. -- Removed init script, it's all done by rc.sysinit. +* Sun Aug 10 2003 Elliot Lee 3.06-11 +- Rebuild -* Fri May 16 2003 Erlend Midttun 3.08-2em -- Fixed awk part of init script. +* Wed Jun 04 2003 Elliot Lee +- rebuilt -* Wed Mar 26 2003 Erlend Midttun 3.08-1em -- New upstream +* Tue May 27 2003 Steve Dickson +- rebuilt for 7.3 errata -* Mon Mar 24 2003 Erlend Midttun 2.00release-3em -- Rebuilt against glibc 2.3.2. +* Tue Feb 25 2003 Elliot Lee +- rebuilt -* Wed Jul 24 2002 Daniel Meyer 2.00release-2dm -- rebuild for Trustix Secure Linux 2.0 +* Sun Feb 23 2003 Tim Powers +- add buildprereq on tcp_wrappers -* Tue Jun 12 2001 Oystein Viggen -- New upstream version: 2.00 +* Wed Jan 22 2003 Tim Powers +- rebuilt -* Sun Jul 16 2000 Per Ivar Paulsen -- Initial release for the Trustix Secure Linux distribution. -- Moved man and info pages to /usr/share adhering to FHS -- Upgrade to 2.0pre4 +* Mon Nov 18 2002 Tim Powers +- rebuild on all arches + +* Fri Sep 6 2002 Philip Copeland 3.06-5 +- added --with-ext2direct=no to fix #73244 + without this users with UID's > 65535 will not + be able to exist on a quota enabled FS + +* Wed Aug 7 2002 Philip Copeland 3.06-4 +- Man page change. #60108 + +* Tue Aug 6 2002 Philip Copeland 3.06-3 +- Bah, I'd dropped epoch from the spec file but seems + we need this if you want to upgrade as the epoch + number has precedence over the version/release + numbers. + +* Wed Jul 17 2002 Philip Copeland 3.06-2 +- Lets stop the makefile from stripping the + binaries as thats rpms job (apparently) + +* Mon Jul 01 2002 Philip Copeland 3.06-1 +- Ditched the 3.01-pre9 src base for 3.06 + Rebuilt without any patchs + +============================================================ + +* Fri Jun 21 2002 Tim Powers +- automated rebuild + +* Thu May 23 2002 Tim Powers +- automated rebuild + +* Mon Feb 25 2002 Elliot Lee +- IfArch the badkernelinclude patch for ppc-only. +- Update to 3.03 + +* Wed Dec 12 2001 Guy Streeter +- Make #include of kernel header file work on non-x86 + +* Wed Sep 5 2001 Preston Brown +- require new initscripts + +* Thu Aug 30 2001 Preston Brown +- fixed bug #52075 (problem with ext2 labels) +- backup data files off by default in quotacheck, optional backup flag added +- fix bug where giving a bad directory or device would cause + quotaon/quotacheck to simulate "-a" behaviour +- if a device name (i.e /dev/hda1) is passed, look up the corresponding mount + point + +* Wed Aug 29 2001 Preston Brown +- return an error code in more cases in convertquota + +* Tue Aug 28 2001 Preston Brown +- 3.01pre9 + +* Fri Jul 20 2001 Preston Brown +- more cleanups on 3.01pre8 + +* Mon Jul 2 2001 Preston Brown +- 3.01 version, everything has changed again. :( + +* Sun Jun 24 2001 Elliot Lee +- Bump release + rebuild. + +* Fri Mar 30 2001 Preston Brown +- use rpc.rquotad from here again (#33738) + +* Thu Mar 15 2001 Preston Brown +- enable ALT_FORMAT for edquota + +* Tue Mar 13 2001 Preston Brown +- I broke passing devices on the cmd line. Fixed. + +* Fri Mar 09 2001 Preston Brown +- quota 3.00 is required by recent kernel 2.4 changes +- no warnquota included this time, not yet ported +- quite a bit of work on quotacheck to make is backwards compatible +- we will likely go back to "quota 2.00" as these projects merge... + +* Fri Feb 09 2001 Florian La Roche +- use "rm -f" instead of only "rm" + +* Wed Feb 7 2001 Preston Brown +- fix quotacheck man page for -a option (#26380) + +* Thu Feb 1 2001 Preston Brown +- 2.00 final, rolls in pretty much all our patches. :) +- fix reporting of in use dquot entries from quotastats +- change repquota man page to fix documentation of -v (#10330) +- include warnquota.conf + +* Mon Nov 20 2000 Bill Nottingham +- fix ia64 build + +* Mon Aug 21 2000 Jeff Johnson +- add LABEL=foo support (#16390). + +* Thu Jul 27 2000 Jeff Johnson +- remote NFS quotas with different blocksize converted incorrectly (#11932). + +* Wed Jul 12 2000 Prospector +- automatic rebuild + +* Thu Jun 15 2000 Jeff Johnson +- FHS packaging. + +* Wed May 10 2000 Jeff Johnson +- apply patch5 (H.J. Lu) + * Wed Feb 02 2000 Cristian Gafton - fix description - man pages are compressed @@ -138,4 +268,4 @@ - built against glibc * Tue Mar 25 1997 Erik Troan -- Moved /usr/sbin/quota to /usr/bin/quota \ No newline at end of file +- Moved /usr/sbin/quota to /usr/bin/quota From svn at tinysofa.org Thu Jul 1 15:54:07 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:54:07 +1000 (EST) Subject: [tinysofa-svn] r2831 - in tinysofa/snapshot/rootfiles/current: sources specs Message-ID: <20040701155407.61F504E817E@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:54:07 +1000 (Fri, 02 Jul 2004) New Revision: 2831 Modified: tinysofa/snapshot/rootfiles/current/sources/rootfiles.tar.gz tinysofa/snapshot/rootfiles/current/specs/rootfiles.spec Log: - Sync with 2.0. - Kept: - rootfiles.tar.gz: Modified: tinysofa/snapshot/rootfiles/current/sources/rootfiles.tar.gz =================================================================== (Binary files differ) Modified: tinysofa/snapshot/rootfiles/current/specs/rootfiles.spec =================================================================== --- tinysofa/snapshot/rootfiles/current/specs/rootfiles.spec 2004-07-01 15:54:05 UTC (rev 2830) +++ tinysofa/snapshot/rootfiles/current/specs/rootfiles.spec 2004-07-01 15:54:07 UTC (rev 2831) @@ -1,55 +1,86 @@ Summary: The basic required files for the root user's directory. Name: rootfiles -Version: 5.4 -Release: 5ts -License: public domain -Group: tinysofa official +Version: 7.2 +Release: 7ts +License: Public Domain +Group: System Environment/Base Source: rootfiles.tar.gz -BuildRoot: %{_tmppath}/%{name}-root +BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildArchitectures: noarch %description The rootfiles package contains basic required files that are placed in the root user's account. These files are basically the same -as the files found in the etcskel package, which are placed in regular +as those in /etc/skel, which are placed in regular users' home directories. %prep %setup -q -n rootfiles %install -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT +rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/root tar -cvSpf- . | (cd $RPM_BUILD_ROOT/root ; tar -xSpf-) +cd $RPM_BUILD_ROOT/root +mv .Xdefaults .Xresources + %clean -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT +rm -rf $RPM_BUILD_ROOT +%pre +# we used to put .Xclients in this package -- back it up if it's been +# customized +cd /root +if [ -f .Xclients -a -x /bin/awk ]; then + m=`md5sum .Xclients | awk '{ print $1 }'` + if [ $m != "506b9496f2853fc9fee6c6b1c5f3ee48" ]; then + mv .Xclients .Xclients.rpmsave + fi +fi + %files %defattr(-,root,root) -%config /root/.[A-z]* +%config /root/.[A-Za-z]* %changelog -* Wed May 19 2004 tsintegrate 5.4-5ts -- current (5.4-4ts) integrated as 5.4-5ts for release 1.0-U1 +* Fri Feb 13 2004 Elliot Lee +- rebuilt -* Tue Dec 9 2003 Erlend Midttun 5.4-1tr -- Added Maildir +* Wed Jan 22 2003 Tim Powers +- rebuilt -* Wed Jun 18 2003 Erlend Midttun 5.3-10tr -- Big rebuild +* Wed Dec 11 2002 Tim Powers 7.2-5 +- rebuild -* Tue Jul 16 2002 Christian H. Toldnes 5.3-9ct -- Rebuild to fit TSL 2.0 +* Fri Jun 21 2002 Tim Powers +- automated rebuild -* Tue Jul 17 2001 Erlend Midttun -- Inc serial number before release. +* Thu May 23 2002 Tim Powers +- automated rebuild -* Mon Feb 14 2000 Erlend Midttun -- Removed .Xdefaults -- Removed "user-friendly" aliases -- Changed prompt +* Wed Jan 09 2002 Tim Powers +- automated rebuild +* Thu Jul 5 2001 Preston Brown 7.2-1 +- /sbin stuff out of PATH, moved into /etc/profile + +* Wed Jul 12 2000 Prospector +- automatic rebuild + +* Tue Jul 11 2000 Preston Brown +- fix .tcshrc + +* Mon Jul 3 2000 Jakub Jelinek +- don't assume ASCII ordering in glob pattern + +* Sat Jun 10 2000 Bill Nottingham +- rebuild +- fix some path stuff (#11191) + +* Tue Apr 18 2000 Bill Nottingham +- mv .Xdefaults -> .Xresources (#10623) + * Sun Mar 21 1999 Cristian Gafton - auto rebuild in the new build environment (release 5) @@ -71,4 +102,4 @@ * Thu Mar 20 1997 Erik Troan - Removed .Xclients and .Xsession from package, added %pre to back up old - .Xclients if necessary. \ No newline at end of file + .Xclients if necessary. From svn at tinysofa.org Thu Jul 1 15:55:04 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:55:04 +1000 (EST) Subject: [tinysofa-svn] r2844 - in tinysofa/snapshot/strace/current: sources specs Message-ID: <20040701155504.A9E244E817E@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:55:04 +1000 (Fri, 02 Jul 2004) New Revision: 2844 Added: tinysofa/snapshot/strace/current/sources/strace-4.5.4.tar.bz2 Removed: tinysofa/snapshot/strace/current/sources/strace-4.5.2.tar.bz2 Modified: tinysofa/snapshot/strace/current/specs/strace.spec Log: - Sync with 2.0. - Added: - strace-4.5.4.tar.bz2: - Removed: - strace-4.5.2.tar.bz2: Deleted: tinysofa/snapshot/strace/current/sources/strace-4.5.2.tar.bz2 =================================================================== (Binary files differ) Added: tinysofa/snapshot/strace/current/sources/strace-4.5.4.tar.bz2 =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/strace/current/sources/strace-4.5.4.tar.bz2 ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: tinysofa/snapshot/strace/current/specs/strace.spec =================================================================== --- tinysofa/snapshot/strace/current/specs/strace.spec 2004-07-01 15:55:02 UTC (rev 2843) +++ tinysofa/snapshot/strace/current/specs/strace.spec 2004-07-01 15:55:04 UTC (rev 2844) @@ -1,13 +1,15 @@ Summary: Tracks and displays system calls associated with a running process. Name: strace -Version: 4.5.2 +Version: 4.5.4 Release: 2ts -License: distributable -Group: tinysofa official -URL: http://www.wi.leidenuniv.nl/~wichert/strace -Source0: http://belnet.dl.sourceforge.net/sourceforge/strace/strace-%{version}.tar.bz2 +License: BSD +Group: Development/Debuggers +URL: http://sourceforge.net/projects/strace/ +Source0: %{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-root +%define strace64_arches ppc64 + %description The strace program intercepts and records the system calls called and received by a running process. Strace can print a record of each @@ -18,60 +20,238 @@ Install strace if you need a tool to track the system calls made and received by a process. +%ifarch %{strace64_arches} +%package -n strace64 +Summary: Tracks and displays system calls associated with a running process. +Group: Development/Debuggers + +%description -n strace64 +The strace program intercepts and records the system calls called and +received by a running process. Strace can print a record of each +system call, its arguments and its return value. Strace is useful for +diagnosing problems and debugging, as well as for instructional +purposes. + +Install strace if you need a tool to track the system calls made and +received by a process. + +This package provides the `strace64' program to trace 64-bit processes. +The `strace' program in the `strace' package is for 32-bit processes. +%endif + %prep %setup -q %build - -CFLAGS="-O3 -fomit-frame-pointer -fno-exceptions -pipe -s -mpentium -mcpu=pentium -march=pentium -ffast-math -fexpensive-optimizations -D_GNU_SOURCE" %configure --exec-prefix=%{_prefix} --bindir=%{_prefix}/bin +%configure make %install -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != "/" ] && rm -rf "$RPM_BUILD_ROOT" -mkdir -p ${RPM_BUILD_ROOT}%{_prefix}/{bin,share/man/man1} -make bindir=${RPM_BUILD_ROOT}%{_prefix}/bin mandir=$RPM_BUILD_ROOT%{_mandir} \ - install +rm -rf %{buildroot} +mkdir -p %{buildroot}%{_mandir}/man1 +mkdir -p %{buildroot}%{_bindir} +%makeinstall man1dir=%{buildroot}%{_mandir}/man1 -strip ${RPM_BUILD_ROOT}%{_prefix}/bin/strace +# remove unpackaged files from the buildroot +rm -f %{buildroot}%{_bindir}/strace-graph +%ifarch %{strace64_arches} +ln %{buildroot}%{_bindir}/strace %{buildroot}%{_bindir}/strace64 +%endif + %clean -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} %files %defattr(-,root,root) -%{_prefix}/bin/strace* -%{_prefix}/share/man/man1/strace.1* +%{_bindir}/strace +%{_mandir}/man1/* +%ifarch %{strace64_arches} +%files -n strace64 +%defattr(-,root,root) +%{_bindir}/strace64 +%endif + + %changelog -* Wed May 19 2004 tsintegrate 4.5.2-2ts -- current (4.5.2-1ts) integrated as 4.5.2-2ts for release 1.0-U1 +* Tue Jun 15 2004 Elliot Lee 4.5.4-2 +- rebuilt -* Wed Apr 07 2004 Omar Kilani 4.5.2-1ts -- New upstream. +* Thu Jun 3 2004 Roland McGrath 4.5.4-0.FC1 +- rebuilt for FC1 update -* Tue Dec 9 2003 Erlend Midttun 4.5.1-1tr -- New upstream. +* Thu Jun 3 2004 Roland McGrath 4.5.4-1 +- new upstream version, more ioctls (#122257), minor fixes -* Wed Jun 18 2003 Erlend Midttun 4.4.94-2tr -- Big rebuild +* Fri Apr 16 2004 Roland McGrath 4.5.3-1 +- new upstream version, mq_* calls (#120701), -p vs NPTL (#120462), more fixes (#118694, #120541, #118685) -* Mon Mar 24 2003 Erlend Midttun 4.4-2em -- Rebuilt against glibc 2.3.2. +* Tue Mar 02 2004 Elliot Lee 4.5.2-1.1 +- rebuilt -* Fri Aug 23 2002 Christian H. Toldnes 4.4-1ct -- New upstream version: 4.4 -- Built for TSL 2.0 +* Mon Mar 1 2004 Roland McGrath 4.5.2-1 +- new upstream version, sched_* calls (#116990), show core flag (#112117) -* Tue Jul 17 2001 Erlend Midttun -- Inc serial number before release. +* Fri Feb 13 2004 Elliot Lee +- rebuilt -* Thu Jun 08 2000 Oystein Viggen -- With timex.h from linux-2.2.15, it will build even on 2.2.16 +* Thu Nov 13 2003 Roland McGrath 4.5.1-1 +- new upstream version, more fixes (#108012, #105366, #105359, #105358) -* Tue Jan 25 2000 Tore Olsen -- upgraded to 4.2 -- moved /usr/man to /usr/share/man for FHS compliance +* Tue Sep 30 2003 Roland McGrath 4.5-3 +- revert bogus s390 fix +* Thu Sep 25 2003 Roland McGrath 4.5-1.2.1AS +- rebuilt for 2.1AS erratum + +* Wed Sep 24 2003 Roland McGrath 4.5-2 +- rebuilt + +* Wed Sep 24 2003 Roland McGrath 4.5-1 +- new upstream version, more fixes (#101499, #104365) + +* Thu Jul 17 2003 Roland McGrath 4.4.99-2 +- rebuilt + +* Thu Jul 17 2003 Roland McGrath 4.4.99-1 +- new upstream version, groks more new system calls, PF_INET6 sockets + +* Mon Jun 10 2003 Roland McGrath 4.4.98-1 +- new upstream version, more fixes (#90754, #91085) + +* Wed Jun 04 2003 Elliot Lee +- rebuilt + +* Sun Mar 30 2003 Roland McGrath 4.4.96-1 +- new upstream version, handles yet more 2.5 syscalls, x86_64 & ia64 fixes + +* Mon Feb 24 2003 Elliot Lee 4.4.95-2 +- rebuilt + +* Mon Feb 24 2003 Roland McGrath 4.4.95-1 +- new upstream version, fixed getresuid/getresgid (#84959) + +* Wed Feb 19 2003 Roland McGrath 4.4.94-1 +- new upstream version, new option -E to set environment variables (#82392) + +* Wed Jan 22 2003 Tim Powers 4.4.93-2 +- rebuilt + +* Tue Jan 21 2003 Roland McGrath 4.4.93-1 +- new upstream version, fixes ppc and s390 bugs, adds missing ptrace requests + +* Fri Jan 10 2003 Roland McGrath 4.4.91-1 +- new upstream version, fixes -f on x86-64 + +* Fri Jan 10 2003 Roland McGrath 4.4.90-1 +- new upstream version, fixes all known bugs modulo ia64 and s390 issues + +* Fri Jan 03 2003 Florian La Roche 4.4-11 +- add further s390 patch from IBM + +* Wed Nov 27 2002 Tim Powers 4.4-10 +- remove unpackaged files from the buildroot + +* Mon Oct 07 2002 Phil Knirsch 4.4-9.1 +- Added latest s390(x) patch. + +* Fri Sep 06 2002 Karsten Hopp 4.4-9 +- preliminary x86_64 support with an ugly patch to help + debugging. Needs cleanup! + +* Mon Sep 2 2002 Jakub Jelinek 4.4-8 +- newer version of the clone fixing patch (Roland McGrath) +- aio syscalls for i386/ia64/ppc (Ben LaHaise) + +* Wed Aug 28 2002 Jakub Jelinek 4.4-7 +- fix strace -f (Roland McGrath, #68994) +- handle ?et_thread_area, SA_RESTORER (Ulrich Drepper) + +* Fri Jun 21 2002 Jakub Jelinek 4.4-6 +- handle futexes, *xattr, sendfile64, etc. (Ulrich Drepper) +- handle modify_ldt (#66894) + +* Thu May 23 2002 Tim Powers +- automated rebuild + +* Tue Apr 16 2002 Jakub Jelinek 4.4-4 +- fix for the last patch by Jeff Law (#62591) + +* Mon Mar 4 2002 Preston Brown 4.4-3 +- integrate patch from Jeff Law to eliminate hang tracing threads + +* Sat Feb 23 2002 Florian La Roche +- minor update from debian tar-ball + +* Wed Jan 02 2002 Florian La Roche +- update to 4.4 + +* Sun Jul 22 2001 Florian La Roche +- disable s390 patches, they are already included + +* Wed Jul 18 2001 Preston Brown 4.3-1 +- new upstream version. Seems to have integrated most new syscalls +- tracing threaded programs is now functional. + +* Mon Jun 11 2001 Than Ngo +- port s390 patches from IBM + +* Wed May 16 2001 Nalin Dahyabhai +- modify new syscall patch to allocate enough heap space in setgroups32() + +* Wed Feb 14 2001 Jakub Jelinek +- #include in addition to + +* Fri Jan 26 2001 Karsten Hopp +- clean up conflicting patches. This happened only + when building on S390 + +* Fri Jan 19 2001 Bill Nottingham +- update to CVS, reintegrate ia64 support + +* Sat Dec 8 2000 Bernhard Rosenkraenzer +- Get S/390 support into the normal package + +* Sat Nov 18 2000 Florian La Roche +- added S/390 patch from IBM, adapting it to not conflict with + IA64 patch + +* Sat Aug 19 2000 Jakub Jelinek +- doh, actually apply the 2.4 syscalls patch +- make it compile with 2.4.0-test7-pre4+ headers, add + getdents64 and fcntl64 + +* Thu Aug 3 2000 Jakub Jelinek +- add a bunch of new 2.4 syscalls (#14036) + +* Wed Jul 12 2000 Prospector +- automatic rebuild +- excludearch ia64 + +* Fri Jun 2 2000 Matt Wilson +- use buildinstall for FHS + +* Wed May 24 2000 Jakub Jelinek +- make things compile on sparc +- fix sigreturn on sparc + +* Fri Mar 31 2000 Bill Nottingham +- fix stat64 misdef (#10485) + +* Tue Mar 21 2000 Michael K. Johnson +- added ia64 patch + +* Thu Feb 03 2000 Cristian Gafton +- man pages are compressed +- version 4.2 (why are we keeping all these patches around?) + +* Sat Nov 27 1999 Jeff Johnson +- update to 4.1 (with sparc socketcall patch). + +* Fri Nov 12 1999 Jakub Jelinek +- fix socketcall on sparc. + * Thu Sep 02 1999 Cristian Gafton - fix KERN_SECURELVL compile problem @@ -96,7 +276,7 @@ * Tue Apr 06 1999 Preston Brown - strip binary -* Sun Mar 21 1999 Cristian Gafton +* Sun Mar 21 1999 Cristian Gafton - auto rebuild in the new build environment (release 16) * Tue Feb 9 1999 Jeff Johnson @@ -125,4 +305,4 @@ - fixed build problems on newer glibc releases * Mon Jun 08 1998 Prospector System -- translations modified for de, fr, tr \ No newline at end of file +- translations modified for de, fr, tr From svn at tinysofa.org Thu Jul 1 15:55:07 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:55:07 +1000 (EST) Subject: [tinysofa-svn] r2845 - in tinysofa/snapshot/stunnel/current: sources specs Message-ID: <20040701155507.E6E6C4E817E@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:55:07 +1000 (Fri, 02 Jul 2004) New Revision: 2845 Added: tinysofa/snapshot/stunnel/current/sources/Certificate-Creation tinysofa/snapshot/stunnel/current/sources/pop3-redirect.xinetd tinysofa/snapshot/stunnel/current/sources/sfinger.xinetd tinysofa/snapshot/stunnel/current/sources/stunnel-4.02-authpriv.patch tinysofa/snapshot/stunnel/current/sources/stunnel-4.05-nopem.patch tinysofa/snapshot/stunnel/current/sources/stunnel-4.05-sample.patch tinysofa/snapshot/stunnel/current/sources/stunnel-4.05.tar.gz.asc tinysofa/snapshot/stunnel/current/sources/stunnel-pop3s-client.conf tinysofa/snapshot/stunnel/current/sources/stunnel-sfinger.conf tinysofa/snapshot/stunnel/current/sources/stunnel.cnf Removed: tinysofa/snapshot/stunnel/current/sources/stunnel.conf tinysofa/snapshot/stunnel/current/sources/stunnel.init Modified: tinysofa/snapshot/stunnel/current/specs/stunnel.spec Log: - Sync with 2.0. - Kept: - stunnel-4.05.tar.gz: - Added: - Certificate-Creation: - pop3-redirect.xinetd: - sfinger.xinetd: - stunnel-4.02-authpriv.patch: - stunnel-4.05-nopem.patch: - stunnel-4.05-sample.patch: - stunnel-4.05.tar.gz.asc: - stunnel-pop3s-client.conf: - stunnel-sfinger.conf: - stunnel.cnf: - Removed: - stunnel.conf: - stunnel.init: Added: tinysofa/snapshot/stunnel/current/sources/Certificate-Creation =================================================================== --- tinysofa/snapshot/stunnel/current/sources/Certificate-Creation 2004-07-01 15:55:04 UTC (rev 2844) +++ tinysofa/snapshot/stunnel/current/sources/Certificate-Creation 2004-07-01 15:55:07 UTC (rev 2845) @@ -0,0 +1,9 @@ +To generate a key and self signed certificate, execute the following commands: + +cd /usr/share/ssl/certs +make stunnel.pem + +Note that by default, the file containing the key and certificate has its +permissions set to 0600, which means that any service using it needs to be +started as root in order to read it. Such a service should be configured +to switch UIDs using stunnel's "-s" flag. Added: tinysofa/snapshot/stunnel/current/sources/pop3-redirect.xinetd =================================================================== --- tinysofa/snapshot/stunnel/current/sources/pop3-redirect.xinetd 2004-07-01 15:55:04 UTC (rev 2844) +++ tinysofa/snapshot/stunnel/current/sources/pop3-redirect.xinetd 2004-07-01 15:55:07 UTC (rev 2845) @@ -0,0 +1,17 @@ +# default: off +# description: The POP3 redirector allows client software which does not have \ +# native support for SSL to connect to the local machine's POP3 \ +# port and have the connection forwarded over the network using \ +# SSL. You will need to modify stunnel-pop3s-client.conf to \ +# specify the server to connect to in order for this to be useful. +service pop3 +{ + disable = yes + socket_type = stream + wait = no + user = root + server = /usr/sbin/stunnel + server_args = /etc/stunnel/stunnel-pop3s-client.conf + log_on_success += USERID + log_on_failure += USERID +} Added: tinysofa/snapshot/stunnel/current/sources/sfinger.xinetd =================================================================== --- tinysofa/snapshot/stunnel/current/sources/sfinger.xinetd 2004-07-01 15:55:04 UTC (rev 2844) +++ tinysofa/snapshot/stunnel/current/sources/sfinger.xinetd 2004-07-01 15:55:07 UTC (rev 2845) @@ -0,0 +1,11 @@ +# Not that anyone in their right mind would tunnel the finger protocol over +# SSL, but here's how to do it using xinetd.... +service sfinger +{ + disable = yes + socket_type = stream + wait = no + user = root + server = /usr/sbin/stunnel + server_args = /etc/stunnel/stunnel-sfinger.conf +} Added: tinysofa/snapshot/stunnel/current/sources/stunnel-4.02-authpriv.patch =================================================================== --- tinysofa/snapshot/stunnel/current/sources/stunnel-4.02-authpriv.patch 2004-07-01 15:55:04 UTC (rev 2844) +++ tinysofa/snapshot/stunnel/current/sources/stunnel-4.02-authpriv.patch 2004-07-01 15:55:07 UTC (rev 2845) @@ -0,0 +1,50 @@ +Change the default log facility to AUTHPRIV instead of DAEMON. + +--- stunnel-4.02/src/options.c 2002-10-20 15:29:33.000000000 -0400 ++++ stunnel-4.02/src/options.c 2002-10-21 18:56:36.000000000 -0400 +@@ -211,8 +211,12 @@ + case CMD_INIT: + options.debug_level=5; + #if !defined (USE_WIN32) && !defined (__vms) ++#if defined(LOG_AUTHPRIV) ++ options.facility=LOG_AUTHPRIV; ++#else + options.facility=LOG_DAEMON; + #endif ++#endif + break; + case CMD_EXEC: + if(strcasecmp(opt, "debug")) +--- stunnel-4.02/doc/stunnel.pod 2002-10-10 03:07:56.000000000 -0400 ++++ stunnel-4.02/doc/stunnel.pod 2002-10-21 18:02:34.000000000 -0400 +@@ -135,7 +135,7 @@ + all levels numerically less than it will be shown. Use B or + B for greatest debugging output. The default is notice (5). + +-The syslog facility 'daemon' will be used unless a facility name is supplied. ++The syslog facility 'authpriv' will be used unless a facility name is supplied. + (Facilities are not supported on Win32.) + + Case is ignored for both facilities and levels. +--- stunnel-4.02/doc/stunnel.8 2002-10-10 03:08:27.000000000 -0400 ++++ stunnel-4.02/doc/stunnel.8 2002-10-21 18:02:34.000000000 -0400 +@@ -232,7 +232,7 @@ + all levels numerically less than it will be shown. Use \fBdebug = debug\fR or + \&\fBdebug = 7\fR for greatest debugging output. The default is notice (5). + .Sp +-The syslog facility 'daemon' will be used unless a facility name is supplied. ++The syslog facility 'authpriv' will be used unless a facility name is supplied. + (Facilities are not supported on Win32.) + .Sp + Case is ignored for both facilities and levels. +--- stunnel-4.02/doc/stunnel.html 2002-10-10 03:08:31.000000000 -0400 ++++ stunnel-4.02/doc/stunnel.html 2002-10-21 18:02:34.000000000 -0400 +@@ -151,7 +151,7 @@ + info (6), or debug (7). All logs for the specified level and + all levels numerically less than it will be shown. Use debug = debug or + debug = 7 for greatest debugging output. The default is notice (5).

+-

The syslog facility 'daemon' will be used unless a facility name is supplied. ++

The syslog facility 'authpriv' will be used unless a facility name is supplied. + (Facilities are not supported on Win32.)

+

Case is ignored for both facilities and levels.

+

Added: tinysofa/snapshot/stunnel/current/sources/stunnel-4.05-nopem.patch =================================================================== --- tinysofa/snapshot/stunnel/current/sources/stunnel-4.05-nopem.patch 2004-07-01 15:55:04 UTC (rev 2844) +++ tinysofa/snapshot/stunnel/current/sources/stunnel-4.05-nopem.patch 2004-07-01 15:55:07 UTC (rev 2845) @@ -0,0 +1,24 @@ +No need to create a cert we don't ship, and this avoids problems when openssl +decides to ask the user for information to include in the cert. +--- stunnel-4.05/tools/Makefile.am 2004-02-24 16:51:36.183434624 -0500 ++++ stunnel-4.05/tools/Makefile.am 2004-02-24 16:52:08.377540376 -0500 +@@ -3,7 +3,7 @@ + stunnel.spec stunnel.mak stunnel.cnf + + confdir = $(sysconfdir)/stunnel +-conf_DATA = stunnel.conf-sample stunnel.pem ++conf_DATA = stunnel.conf-sample + + docdir = $(datadir)/doc/stunnel + examplesdir = $(docdir)/examples +@@ -22,8 +22,8 @@ + $(openssl) x509 -subject -dates -fingerprint -noout \ + -in stunnel.pem + +-install-data-hook: +- chmod 0600 $(DESTDIR)$(confdir)/stunnel.pem ++# install-data-hook: ++# chmod 0600 $(DESTDIR)$(confdir)/stunnel.pem + + clean-local: + -rm -f stunnel.rnd Added: tinysofa/snapshot/stunnel/current/sources/stunnel-4.05-sample.patch =================================================================== --- tinysofa/snapshot/stunnel/current/sources/stunnel-4.05-sample.patch 2004-07-01 15:55:04 UTC (rev 2844) +++ tinysofa/snapshot/stunnel/current/sources/stunnel-4.05-sample.patch 2004-07-01 15:55:07 UTC (rev 2845) @@ -0,0 +1,20 @@ +You shouldn't use the sample as-is, but people do. + +--- stunnel-4.05/tools/stunnel.conf-sample.in 2004-05-27 14:30:30.000000000 -0400 ++++ stunnel-4.05/tools/stunnel.conf-sample.in 2004-05-27 14:30:21.000000000 -0400 +@@ -2,12 +2,12 @@ + # Copyright by Michal Trojnara 2002 + + # Comment it out on Win32 +-cert = @prefix@/etc/stunnel/mail.pem +-chroot = @prefix@/var/run/stunnel/ ++cert = @sysconfdir@/stunnel/mail.pem ++chroot = @localstatedir@/run/stunnel/ + # PID is created inside chroot jail + pid = /stunnel.pid + setuid = nobody +-setgid = nogroup ++setgid = nobody + + # Workaround for Eudora bug + #options = DONT_INSERT_EMPTY_FRAGMENTS Added: tinysofa/snapshot/stunnel/current/sources/stunnel-4.05.tar.gz.asc =================================================================== --- tinysofa/snapshot/stunnel/current/sources/stunnel-4.05.tar.gz.asc 2004-07-01 15:55:04 UTC (rev 2844) +++ tinysofa/snapshot/stunnel/current/sources/stunnel-4.05.tar.gz.asc 2004-07-01 15:55:07 UTC (rev 2845) @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.2.2 (GNU/Linux) + +iD8DBQBALjFL/NU+nXTHMtERAtBlAJ4rNlKYHDXMVnIQ/I2giSQBiuqtfQCg8fad +bFucqe7SbrJpilsW9HFWBfg= +=A3yJ +-----END PGP SIGNATURE----- Added: tinysofa/snapshot/stunnel/current/sources/stunnel-pop3s-client.conf =================================================================== --- tinysofa/snapshot/stunnel/current/sources/stunnel-pop3s-client.conf 2004-07-01 15:55:04 UTC (rev 2844) +++ tinysofa/snapshot/stunnel/current/sources/stunnel-pop3s-client.conf 2004-07-01 15:55:07 UTC (rev 2845) @@ -0,0 +1,8 @@ +# Sample configuration for stunnel, tunnelling cleartext connections on the +# default port (without an "accept" setting, stunnel uses stdio) over an +# encrypted channel to pop3s-server.example.com:pop3s. See stunnel(8) for +# more information. +client = yes +connect = pop3s-server.example.com:pop3s +CAfile = /usr/share/ssl/certs/ca-bundle.crt +verify = 2 Added: tinysofa/snapshot/stunnel/current/sources/stunnel-sfinger.conf =================================================================== --- tinysofa/snapshot/stunnel/current/sources/stunnel-sfinger.conf 2004-07-01 15:55:04 UTC (rev 2844) +++ tinysofa/snapshot/stunnel/current/sources/stunnel-sfinger.conf 2004-07-01 15:55:07 UTC (rev 2845) @@ -0,0 +1,8 @@ +# Sample configuration for stunnel, forwarding data from encrypted connections +# on the default port (without an "accept" setting, stunnel uses stdio) over +# an unencrypted set of pipes which are used for stdio by in.fingerd. See +# stunnel(8) for more information. +exec = /usr/sbin/in.fingerd +execargs = in.fingerd +key = /etc/stunnel/stunnel.pem +cert = /etc/stunnel/stunnel.pem Added: tinysofa/snapshot/stunnel/current/sources/stunnel.cnf =================================================================== --- tinysofa/snapshot/stunnel/current/sources/stunnel.cnf 2004-07-01 15:55:04 UTC (rev 2844) +++ tinysofa/snapshot/stunnel/current/sources/stunnel.cnf 2004-07-01 15:55:07 UTC (rev 2845) @@ -0,0 +1,47 @@ +[ v3_ca ] + +[ req ] +default_bits = 1024 +default_keyfile = stunnel.pem +distinguished_name = req_distinguished_name +attributes = req_attributes +x509_extensions = v3_ca # The extentions to add to the self signed cert + +[ req_distinguished_name ] +countryName = Country Name (2 letter code) +countryName_default = US +countryName_min = 2 +countryName_max = 2 + +stateOrProvinceName = State or Province Name (full name) +stateOrProvinceName_default = Some-State + +localityName = Locality Name (eg, city) +localityName_default = Some-Locality + +0.organizationName = Organization Name (eg, company) +0.organizationName_default = Red Hat Linux User + +organizationalUnitName = Organizational Unit Name (eg, section) +organizationalUnitName_default = Organizational Unit + +commonName = Common Name (eg, YOUR name) +commonName_max = 64 +commonName_default = System Administrator + +emailAddress = Email Address +emailAddress_max = 40 +emailAddress_default = root at localhost + +# SET-ex3 = SET extension number 3 + +[ req_attributes ] +challengePassword = A challenge password +challengePassword_min = 4 +challengePassword_max = 20 + +unstructuredName = An optional company name + +[ usr_cert ] +nsCertType = server +nsComment = "OpenSSL Generated Certificate" Deleted: tinysofa/snapshot/stunnel/current/sources/stunnel.conf =================================================================== --- tinysofa/snapshot/stunnel/current/sources/stunnel.conf 2004-07-01 15:55:04 UTC (rev 2844) +++ tinysofa/snapshot/stunnel/current/sources/stunnel.conf 2004-07-01 15:55:07 UTC (rev 2845) @@ -1,30 +0,0 @@ -# Stunnel configuration file - -cert = /etc/ssl/certs/server.pem -chroot = /var/run/stunnel/ -pid = /stunnel.pid -setuid = nobody -setgid = nobody - -# Are we a client? -#client = yes - -# Service-level configuration, all off by default - -#[pop3s] -#accept = 995 -#connect = 110 - -#[imaps] -#accept = 993 -#connect = 143 - -#[ssmtp] -#accept = 465 -#connect = 25 - -#[https] -#accept = 443 -#connect = 80 -#TIMEOUTclose = 0 - Deleted: tinysofa/snapshot/stunnel/current/sources/stunnel.init =================================================================== --- tinysofa/snapshot/stunnel/current/sources/stunnel.init 2004-07-01 15:55:04 UTC (rev 2844) +++ tinysofa/snapshot/stunnel/current/sources/stunnel.init 2004-07-01 15:55:07 UTC (rev 2845) @@ -1,77 +0,0 @@ -#!/bin/sh -# -# stunnel: Starts the universal SSL daemon -# -# chkconfig: - 15 85 -# description: This is a daemon allows for SSL tunneling of most services. -# processname: stunnel -# config: /etc/stunnel/stunnel.conf -# - -# Source function library. -if [ -f /etc/init.d/functions ] ; then - . /etc/init.d/functions -elif [ -f /etc/rc.d/init.d/functions ] ; then - . /etc/rc.d/init.d/functions -else - echo "Could not find a functions file. The system seems broken." - exit 1 -fi - -# Sanity checks. -if [ -f /etc/stunnel/stunnel.conf ]; then - STRING="stunnel: Config file not found" - echo -n "$STRING" - failure "$STRING" - echo - exit 1 -fi -if [ -x /usr/sbin/stunnel ]; then - STRING="stunnel: Executable binary not found" - echo -n "$STRING" - failure "$STRING" - echo - exit 1 -fi - -RETVAL=0 - -# See how we were called. -case "$1" in - start) - echo -n "Starting the universal SSL tunnel: " - daemon stunnel - RETVAL=$? - echo - [ $RETVAL -eq 0 ] && touch ${INITLOCK:-/mnt/lockdev}/stunnel - ;; - stop) - echo -n "Stopping the universal SSL tunnel: " - killproc stunnel - RETVAL=$? - if [ $RETVAL -eq 0 ]; then - rm -f ${INITLOCK:-/mnt/lockdev}/stunnel - echo nscd - else - echo - fi - ;; - status) - status stunnel - RETVAL=$? - ;; - restart) - $0 stop - $0 start - RETVAL=$? - ;; - reload) - killproc -HUP stunnel - RETVAL=$? - ;; - *) - echo "Usage: $0 {start|stop|status|restart}" - ;; -esac -exit $RETVAL - Modified: tinysofa/snapshot/stunnel/current/specs/stunnel.spec =================================================================== --- tinysofa/snapshot/stunnel/current/specs/stunnel.spec 2004-07-01 15:55:04 UTC (rev 2844) +++ tinysofa/snapshot/stunnel/current/specs/stunnel.spec 2004-07-01 15:55:07 UTC (rev 2845) @@ -1,166 +1,238 @@ -Summary: SSL-encrypting socket wrapper +Summary: An SSL-encrypting socket wrapper. Name: stunnel Version: 4.05 -Release: 8ts +Release: 2ts License: GPL -Group: tinysofa official -Source0: http://www.stunnel.org/download/stunnel/src/stunnel-%{version}.tar.gz -Source1: stunnel.init -Source2: stunnel.conf -BuildRoot: %{_tmppath}/%{name}-root -BuildRequires: openssl-devel -PreReq: tinysofa-utils, chkconfig +Group: Applications/Internet +URL: http://stunnel.mirt.net/ +Source0: ftp://stunnel.mirt.net/stunnel/stunnel-%{version}.tar.gz +Source1: ftp://stunnel.mirt.net/stunnel/stunnel-%{version}.tar.gz.asc +Source2: stunnel.cnf +Source3: Certificate-Creation +Source4: sfinger.xinetd +Source5: stunnel-sfinger.conf +Source6: pop3-redirect.xinetd +Source7: stunnel-pop3s-client.conf +Patch0: stunnel-4.02-authpriv.patch +Patch1: stunnel-4.05-nopem.patch +Patch2: stunnel-4.05-sample.patch +Buildroot: %{_tmppath}/%{name}-%{version}-root +BuildPrereq: automake, autoconf, openssl-devel, perl, pkgconfig, +BuildPrereq: tcp_wrappers, /usr/share/dict/words +Prereq: textutils, fileutils, /bin/mktemp, /sbin/ldconfig +Prereq: /usr/share/dict/words, /bin/hostname, /usr/bin/id, /usr/bin/getent +Requires: make %description -stunnel is a socket wrapper which can be used to give ordinary -applications SSL (secure sockets layer) support. For example, it -can be used in conjunction with a imapd to create a SSL secure IMAP -server. +Stunnel is a socket wrapper which can provide SSL (Secure Sockets +Layer) support to ordinary applications. For example, it can be used +in conjunction with imapd to create an SSL secure IMAP server. %prep - %setup -q +%patch0 -p1 -b .authpriv +%patch1 -p1 -b .nopem +%patch2 -p1 -b .sample %build -#autoconf -%configure --with-pem-dir=/etc/ssl/certs -make <<__EOF__ -BW -Southern Island -Cliff -Penguins Cooperated -Cliffhangers -penguins.sample.tinysofa.org -localhost -__EOF__ +aclocal --force +autoconf -f +automake -a -c -f +if pkg-config openssl ; then + CFLAGS="$RPM_OPT_FLAGS `pkg-config --cflags openssl`"; export CFLAGS + LDFLAGS="`pkg-config --libs-only-L openssl`"; export LDFLAGS +fi +%configure --with-tcp-wrappers +export tagname=CC +make LIBTOOL=%{_bindir}/libtool + %install -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != "/" ] && rm -rf "$RPM_BUILD_ROOT" -mkdir -p $RPM_BUILD_ROOT/usr/sbin -mkdir -p $RPM_BUILD_ROOT/usr/lib -mkdir -p $RPM_BUILD_ROOT%{_mandir}/man8 -mkdir -p $RPM_BUILD_ROOT%{_initdir} -mkdir -p $RPM_BUILD_ROOT/etc/stunnel -mkdir -p $RPM_BUILD_ROOT/var/run/stunnel -install -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_initdir}/stunnel -install -m 644 %{SOURCE2} $RPM_BUILD_ROOT/etc/stunnel/stunnel.conf -%makeinstall -cat > README-generate-cert << __EOF__ -To generate a self signed certificate, execute the following commands: +rm -rf $RPM_BUILD_ROOT +export tagname=CC +%makeinstall docdir=`pwd`/installed-docs LIBTOOL=%{_bindir}/libtool +rm -f $RPM_BUILD_ROOT/%{_libdir}/*.a +rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la +rm -f $RPM_BUILD_ROOT/%{_libdir}/*.so.? +rm -f $RPM_BUILD_ROOT/%{_sysconfdir}/stunnel/*sample* +# Move the translated man pages to the right subdirectories, and strip off the +# language suffixes. +for lang in fr pl ; do + mkdir -p $RPM_BUILD_ROOT/%{_mandir}/${lang}/man8 + mv $RPM_BUILD_ROOT/%{_mandir}/man8/*.${lang}.8* $RPM_BUILD_ROOT/%{_mandir}/${lang}/man8/ + rename ".${lang}" "" $RPM_BUILD_ROOT/%{_mandir}/${lang}/man8/* +done +%post -p /sbin/ldconfig -cd /etc/ssl/certs -openssl req -new -x509 -nodes -days 365 -out server.pem -keyout server.pem -ln -s server.pem \`openssl x509 -noout -hash < server.pem\`.0 -chmod 644 server.pem -__EOF__ +%postun -p /sbin/ldconfig -cat > README-remove-cert << __EOF__ -You may wish to remove the stunnel certificate. -If so, execute the following commands: +%clean +rm -rf $RPM_BUILD_ROOT -rm -f /etc/ssl/certs/`openssl x509 -noout -hash < /etc/ssl/certs/server.pem`.0 -rm -f /etc/ssl/certs/server.pem -__EOF__ +%files +%defattr(-,root,root) +%doc BUGS ChangeLog COPY* CREDITS NEWS PORTS README TODO doc/*.html +%doc $RPM_SOURCE_DIR/Certificate-Creation +%doc $RPM_SOURCE_DIR/sfinger.xinetd +%doc $RPM_SOURCE_DIR/pop3-redirect.xinetd +%doc $RPM_SOURCE_DIR/stunnel-pop3s-client.conf +%doc $RPM_SOURCE_DIR/stunnel-sfinger.conf +%doc tools/stunnel.conf-sample +%lang(en) %doc doc/en/* +%lang(po) %doc doc/pl/* +%{_libdir}/libstunnel.so +%{_mandir}/man8/stunnel.8* +%{_mandir}/*/man8/stunnel.8* +%{_sbindir}/stunnel +%dir %{_sysconfdir}/%{name} -rm -rf $RPM_BUILD_ROOT/usr/share/doc +%changelog +* Thu May 27 2004 Nalin Dahyabhai 4.05-2 +- move the sample configuration to %%doc, it shouldn't be used as-is (#124373) -%post -chkconfig --add stunnel -/sbin/restart_maybe stunnel +* Thu Mar 11 2004 Nalin Dahyabhai 4.05-1 +- update to 4.05 -%preun -if [ "$1" == 0 ]; then - %{_initdir}/stunnel stop 2>&1 - chkconfig --del stunnel -fi +* Tue Mar 02 2004 Elliot Lee +- rebuilt -%clean -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT +* Fri Feb 13 2004 Elliot Lee +- rebuilt -%files -%defattr(-,root,root) -%doc README-* -%dir /etc/stunnel -%config(noreplace) /etc/stunnel/stunnel.conf -/etc/stunnel/stunnel.conf-sample -%config(noreplace) /etc/stunnel/stunnel.pem -%{_initdir}/stunnel -/var/run/stunnel -%attr(0644,root,root) %doc AUTHORS BUGS COPYING COPYRIGHT.GPL CREDITS -%attr(0644,root,root) %doc ChangeLog INSTALL NEWS PORTS README TODO -%attr(0644,root,root) %doc doc/stunnel.html -%attr(0711,root,root) /usr/sbin/stunnel -%attr(0755,root,root) /usr/lib/libstunnel.* -%attr(0644,root,root) %{_mandir}/man8/stunnel.8* +* Thu Aug 7 2003 Elliot Lee 4.04-6 +- Fix libtool -%exclude %{_mandir}/man8/stunnel.fr.8* -%exclude %{_mandir}/man8/stunnel.pl.8* +* Wed Jun 04 2003 Elliot Lee +- rebuilt -%changelog -* Wed May 19 2004 tsintegrate 4.05-8ts -- current (4.05-8jh) integrated as 4.05-8ts for release 1.0-U1 +* Fri Mar 21 2003 Nalin Dahyabhai 4.04-4 +- fix xinetd configuration samples -* Tue May 11 2004 Jaakko Heinonen 4.05-8jh -- fixed broken sanity checks in init script +* Mon Feb 10 2003 Nalin Dahyabhai 4.04-3 +- rebuild -* Mon May 03 2004 Omar Kilani 4.05-7ts -- Rebuild +* Wed Jan 22 2003 Tim Powers +- rebuilt -* Mon May 03 2004 Jaakko Heinonen 4.05-6jh -- fixed file permissions +* Wed Jan 15 2003 Nalin Dahyabhai 4.04-1 +- update to 4.04 -* Wed Mar 31 2004 Omar Kilani 4.05-5ts -- Tinysofaise. +* Tue Jan 7 2003 Nalin Dahyabhai 4.03-1 +- use pkgconfig for information about openssl, if available -* Tue Mar 23 2004 Chr. Toldnes 4.05-4tr -- cleanup in %post and %postun -- correct output in initscript +* Fri Jan 3 2003 Nalin Dahyabhai +- update to 4.03 -* Sun Feb 15 2004 Gerald Dachs 4.05-1gd -- New upstream -- buildrequires openssl-devel +* Mon Oct 21 2002 Nalin Dahyabhai 4.02-1 +- update to 4.02 -* Tue Aug 26 2003 Erlend Midttun 4.04-5tr -- Now create /var/run/stunnel. +* Fri Oct 4 2002 Nalin Dahyabhai 4.00-1 +- don't create a dummy cert -* Wed Jun 18 2003 Erlend Midttun 4.04-4tr -- Big rebuild +* Wed Sep 25 2002 Nalin Dahyabhai +- update to 4.00 +- remove textutils and fileutils as buildreqs, add automake/autoconf -* Wed Apr 9 2003 Gerald Dachs 4.04-3gd -- Added PreReq on tsl-utils +* Fri Jun 21 2002 Tim Powers +- automated rebuild -* Mon Mar 24 2003 Erlend Midttun 4.04-2em -- Rebuilt against glibc 2.3.2. +* Sun May 26 2002 Tim Powers +- automated rebuild -* Thu Jan 23 2003 Erlend Midttun 4.04-1em -- Updated to 4.04. +* Fri May 17 2002 Nalin Dahyabhai 3.22-2 +- rebuild in new environment -* Sun Jan 19 2003 Gerald Dachs 3.22-2gd -- rebuilt against openssl 0.9.7 +* Wed Jan 2 2002 Nalin Dahyabhai 3.22-1 +- update to 3.22, correcting a format-string vulnerability -* Wed Jan 2 2002 Erlend Midttun -- Picked up 3.22 to fix security hole. +* Wed Oct 31 2001 Nalin Dahyabhai 3.21a-1 +- update to 3.21a -* Thu Jun 14 2001 Erlend Midttun -- Now generate dummy certificate so it won't stop the autobuild. +* Tue Aug 28 2001 Nalin Dahyabhai 3.20-1 +- log using LOG_AUTHPRIV facility by default (#47289) +- make permissions on stunnel binary 0755 +- implicitly trust certificates in %%{_datadir}/ssl/trusted (#24034) -* Tue Mar 5 2001 Alexander Reelsen -- Picked up 3.14 +* Fri Aug 10 2001 Nalin Dahyabhai 3.19-1 +- update to 3.19 to avoid problems with stunnel being multithreaded, but + tcp wrappers not being thrad-safe -* Tue Dec 19 2000 Oystein Viggen -- Fix a format string exploit in log.c +* Mon Jul 30 2001 Nalin Dahyabhai +- update to 3.17 -* Wed Nov 22 2000 Olaf Trygve Berglihn -- Updated to version 3.8p4 -- Moved piddir to /var/run -- Moved manpages to /usr/share/man -- Moved pemdir to /usr/ssl/certs +* Mon Jul 23 2001 Nalin Dahyabhai +- update to 3.16 -* Mon Feb 18 2000 Erlend Midttun -- Updated to version 2.8 -- Moved manpages to comply with FHS +* Mon Jul 16 2001 Nalin Dahyabhai +- update to 3.15 +- enable tcp-wrappers support +* Tue May 29 2001 Nalin Dahyabhai +- remove explicit requirement on openssl (specific version isn't enough, + we have to depend on shared library version anyway) + +* Fri Apr 27 2001 Nalin Dahyabhai +- update to 3.14 + +* Mon Mar 26 2001 Preston Brown +- depend on make (#33148) + +* Fri Mar 2 2001 Nalin Dahyabhai +- rebuild in new environment + +* Tue Feb 6 2001 Nalin Dahyabhai +- update to 3.13 to get pthread, OOB, 64-bit fixes +- don't need sdf any more + +* Thu Dec 28 2000 Nalin Dahyabhai +- pull in sdf to build the man page (#22892) + +* Fri Dec 22 2000 Nalin Dahyabhai +- update to 3.11 +- chuck the SIGHUP patch (went upstream) +- chuck parts of the 64-bit clean patch (went upstream) + +* Thu Dec 21 2000 Nalin Dahyabhai +- update to 3.10 +- more 64-bit clean changes, hopefully the last bunch + +* Wed Dec 20 2000 Nalin Dahyabhai +- change piddir from the default /var/stunnel to /var/run +- clean out pid file on SIGHUP + +* Fri Dec 15 2000 Nalin Dahyabhai +- update to 3.9 to get a security fix + +* Wed Oct 25 2000 Matt Wilson +- change all unsigned longs to u_int32_t when dealing with network + addresses + +* Fri Aug 18 2000 Nalin Dahyabhai +- make stunnel.pem also be (missingok) + +* Thu Jun 29 2000 Nalin Dahyabhai +- move to Applications/Internet group +- clean up %post script +- make stunnel.pem %ghost %config(noreplace) +- provide a sample file for use with xinetd + +* Thu Jun 8 2000 Nalin Dahyabhai +- FHS compliance fixes +- modify defaults + +* Tue Mar 14 2000 Florian La Roche +- update to 3.8 +- do not create certificate if one already exists + +* Mon Feb 21 2000 Florian La Roche +- update to 3.7 +- add patch to find /usr/share/ssl +- change some perms + +* Sat Oct 30 1999 Bernhard Rosenkraenzer +- Modify spec file to match Red Hat standards + * Fri Aug 12 1999 Damien Miller - Updated to 3.4a - Patched for OpenSSL 0.9.4 @@ -171,4 +243,3 @@ * Sat Nov 28 1998 Damien Miller - Initial RPMification - From svn at tinysofa.org Thu Jul 1 15:55:16 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:55:16 +1000 (EST) Subject: [tinysofa-svn] r2846 - in tinysofa/snapshot/sudo/current: sources specs Message-ID: <20040701155516.10ED74E817E@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:55:10 +1000 (Fri, 02 Jul 2004) New Revision: 2846 Added: tinysofa/snapshot/sudo/current/sources/sudo-selinux.patch Modified: tinysofa/snapshot/sudo/current/specs/sudo.spec Log: - Sync with 2.0. - Kept: - sudo-1.6.7p5.tar.gz: - Added: - sudo-selinux.patch: Added: tinysofa/snapshot/sudo/current/sources/sudo-selinux.patch =================================================================== --- tinysofa/snapshot/sudo/current/sources/sudo-selinux.patch 2004-07-01 15:55:07 UTC (rev 2845) +++ tinysofa/snapshot/sudo/current/sources/sudo-selinux.patch 2004-07-01 15:55:10 UTC (rev 2846) @@ -0,0 +1,470 @@ +--- /dev/null 2004-02-23 16:02:56.000000000 -0500 ++++ sudo-1.6.7p5/sesh.c 2004-04-13 08:52:19.000000000 -0400 +@@ -0,0 +1,50 @@ ++#include ++#include ++#include ++#include ++#include ++#include ++ ++main (int argc, char **argv) { ++ char buf[PATH_MAX]; ++ pid_t pid; ++ if ( argc < 2 ) { ++ fprintf(stderr,"%s: Requires at least one argument\n", argv[0]); ++ exit(-1); ++ } ++ if ( argv[1][0] != '/' ) { ++ fprintf(stderr,"%s: First argument must have a full path\n", argv[0]); ++ exit(-1); ++ } ++ ++ if ((pid = fork()) < 0) { ++ snprintf(buf, sizeof(buf), "%s: Couldn't fork"); ++ perror(buf); ++ exit(-1); ++ } else if (pid > 0) { ++ /* Parent */ ++ int status; ++ int ret; ++ ++ do { ++ if ((ret = waitpid(pid, &status, 0)) < 0 && errno == EINTR) ++ continue; ++ else if (ret < 0) { ++ perror("waitpid failed"); ++ exit(1); ++ } ++ } while (0); ++ ++ if (WIFEXITED(status)) ++ exit(WEXITSTATUS(status)); ++ else ++ exit(1); ++ } else { ++ /* Child */ ++ execv(argv[1], &argv[1]); ++ ++ snprintf(buf, sizeof(buf), "%s: Error execing %s", argv[0], argv[1]); ++ perror(buf); ++ exit(-1); ++ } ++} +--- sudo-1.6.7p5/configure.in.selinux 2003-05-06 11:22:36.000000000 -0400 ++++ sudo-1.6.7p5/configure.in 2004-04-13 08:52:19.000000000 -0400 +@@ -90,7 +90,7 @@ + dnl Initial values for Makefile variables listed above + dnl May be overridden by environment variables.. + dnl +-PROGS="sudo visudo" ++PROGS="sudo visudo sesh" + test -n "$MANTYPE" || MANTYPE="man" + test -n "$mansrcdir" || mansrcdir="." + test -n "$SUDOERS_MODE" || SUDOERS_MODE=0440 +--- sudo-1.6.7p5/sudo.c.selinux 2003-04-15 20:39:14.000000000 -0400 ++++ sudo-1.6.7p5/sudo.c 2004-04-13 14:50:35.000000000 -0400 +@@ -101,6 +101,17 @@ + #include "interfaces.h" + #include "version.h" + ++#ifdef WITH_SELINUX ++#include /* for SECCLASS_CHR_FILE */ ++#include /* for is_selinux_enabled() */ ++#include /* for context-mangling functions */ ++#include ++char *role_s = NULL; /* role spec'd by user in argv[] */ ++char *type_s = NULL; /* type spec'd by user in argv[] */ ++security_context_t new_tty_context=NULL; /* security context to change to while running command*/ ++security_context_t tty_context=NULL; /* current security context of tty */ ++#endif ++ + #ifndef lint + static const char rcsid[] = "$Sudo: sudo.c,v 1.334 2003/04/01 15:02:49 millert Exp $"; + #endif /* lint */ +@@ -148,7 +159,148 @@ + #endif /* HAVE_BSD_AUTH_H */ + void (*set_perms) __P((int)); + ++#ifdef WITH_SELINUX ++security_context_t setup_tty_context(int fd, char *ttyn, security_context_t new_context) { ++ security_context_t tty_context=NULL; /* current sid of tty */ ++ ++ tty_context = NULL; ++ if (fgetfilecon(fd,&tty_context) <0 ) ++ fprintf(stderr, "Warning! Could not get current context for %s, not relabeling.\n", ttyn); ++ ++#ifdef CANTSPELLGDB ++ if (tty_context) ++ printf("Your tty %s was labeled with context %s\n", ttyn, tty_context); ++#endif ++ ++ new_tty_context = NULL; ++ if (tty_context && security_compute_relabel(new_context,tty_context,SECCLASS_CHR_FILE,&new_tty_context) < 0) ++ fprintf(stderr, "Warning! Could not get new context for %s, not relabeling.\n", ttyn); ++ ++#ifdef CANTSPELLGDB ++ if (new_tty_context) ++ printf("Relabeling tty %s to context %s\n", ttyn, new_tty_context); ++#endif ++ ++ if (new_tty_context) { ++ if( fsetfilecon(fd,new_tty_context)!=0 ) { ++ fprintf(stderr,"sudo: error: setfilecon on %s to %s",ttyn,new_tty_context); ++ } ++ } ++ return tty_context; ++} ++security_context_t get_exec_context(char *role_s, char *type_s) { ++ ++ security_context_t old_context=NULL; /* our original securiy ID ("old_context") */ ++ security_context_t new_context=NULL; /* our target security ID ("sid") */ ++ ++ /* ++ * ++ * Step 1: Handle command-line arguments. ++ * ++ */ ++ ++ security_context_t context_s; /* our security context as a string */ ++ int context_length; ++ context_t context; /* manipulatable form of context_s */ ++ ++ ++ /* ++ * Get the SID and context of the caller, and extract ++ * the username from the context. Don't rely on the Linux ++ * uid information - it isn't trustworthy. ++ */ ++ ++ /* Put the caller's SID into `old_context'. */ ++ if( 0!=(getprevcon(&old_context)) ) { ++ fprintf(stderr,"failed to get old_context.\n"); ++ exit(-1); ++ } ++ ++#ifdef CANTSPELLGDB ++ printf( "Your old context was %s\n", old_context ); ++#endif ++ /* ++ * Create a context structure so that we extract and modify ++ * components easily. ++ */ ++ context=context_new(old_context); ++ ++ /* ++ * ++ * Step 3: Construct a new SID based on our old SID and the ++ * arguments specified on the command line. ++ * ++ */ ++ ++ /* The first step in constructing a new SID for the new shell we * ++ * plan to exec is to take our old context in `context' as a * ++ * starting point, and modify it according to the options the user * ++ * specified on the command line. */ ++ ++ /* If the user specified a new role on the command line (if `role_s' * ++ * is set), then replace the old role in `context' with this new role. */ ++ if( role_s ) { ++ if( !type_s ) { ++ if( get_default_type(role_s,&type_s) ) ++ { ++ fprintf(stderr,"Couldn't get default type.\n"); ++ exit(-1); ++ } ++#ifdef CANTSPELLGDB ++ printf( "Your type will be %s.\n", type_s ); ++#endif ++ } ++ ++ if( context_role_set(context,role_s)) { ++ fprintf(stderr,"failed to set new role %s\n",role_s); ++ exit(-1); ++ } ++#ifdef CANTSPELLGDB ++ printf("Your new role is %s\n",context_role_get(context)); ++#endif ++ ++ /* If the user specified a new type on the command line (if `type_s' * ++ * is set), then replace the old type in `context' with this new type. */ ++ if( type_s ) { ++ if( context_type_set(context,type_s)) { ++ fprintf(stderr,"failed to set new type %s\n",type_s); ++ exit(-1); ++ } ++#ifdef CANTSPELLGDB ++ printf("Your new type is %s\n",context_type_get(context)); ++#endif ++ } /* if user specified new type */ ++ ++ /* The second step in creating the new SID is to convert our modified * ++ * `context' structure back to a context string and then to a SID. */ ++ ++ /* Make `context_s' point to a string version of the new `context'. */ ++ if( !(new_context=strdup(context_str(context)))) { ++ fprintf(stderr,"failed to convert new context to string\n" ); ++ exit(-1); ++ } ++ ++ } /* if user specified new role */ ++ else { ++ if (get_default_context(context_user_get(context), ++ NULL, ++ &new_context)) { ++ fprintf(stderr,"failed to get default context\n" ); ++ exit(-1); ++ } ++ } ++ context_free(context); ++ freecon(old_context); ++ ++ if (security_check_context(new_context) < 0) { ++ fprintf(stderr, "%s is not a valid context\n", new_context); ++ exit(-1); ++ } ++ ++ return new_context; ++} + ++#endif + int + main(argc, argv, envp) + int argc; +@@ -156,10 +308,10 @@ + char **envp; + { + int validated; +- int fd; + int cmnd_status; + int sudo_mode; + int pwflag; ++ int fd; + char **new_environ; + sigaction_t sa, saved_sa_int, saved_sa_quit, saved_sa_tstp, saved_sa_chld; + extern int printmatches; +@@ -211,9 +363,6 @@ + /* Setup defaults data structures. */ + init_defaults(); + +- /* Load the list of local ip addresses and netmasks. */ +- load_interfaces(); +- + pwflag = 0; + if (sudo_mode & MODE_SHELL) + user_cmnd = "shell"; +@@ -225,6 +374,8 @@ + putchar('\n'); + dump_auth_methods(); + dump_defaults(); ++ /* Load the list of local ip addresses and netmasks. */ ++ load_interfaces(); + dump_interfaces(); + } + exit(0); +@@ -414,10 +565,47 @@ + (void) sigaction(SIGCHLD, &saved_sa_chld, NULL); + + #ifndef PROFILING +- if ((sudo_mode & MODE_BACKGROUND) && fork() > 0) +- exit(0); +- else +- EXEC(safe_cmnd, NewArgv); /* run the command */ ++ if ((sudo_mode & MODE_BACKGROUND) && fork() > 0) { ++ exit(0); ++ } ++#ifdef WITH_SELINUX ++ if( is_selinux_enabled() >0) { ++ int fd; ++ char *ttyn = NULL; /* tty path */ ++ security_context_t new_context=NULL; /* our target security ID ("sid") */ ++ security_context_t chk_tty_context= NULL; ++ ++ new_context=get_exec_context(role_s,type_s); ++#ifdef CANTSPELLGDB ++ printf("Your new context is %s\n",new_context); ++#endif ++ ++ if (setexeccon(new_context) < 0) { ++ fprintf(stderr, "Could not set exec context to %s.\n", new_context); ++ exit(-1); ++ } ++ freecon(new_context); ++ { ++ /* ++ SELinux will only not transition properly with the following ++ code. Basically if the user chooses to use a different security ++ context. We need to start the selinux shell, before executing ++ the command. This way the process transition will happen ++ correctly. For example if they user wants to run rpm from ++ sysadm_r. Sudo will exec the /usr/sbin/sesh followed by the ++ specified command.*/ ++ char **dst, **src = NewArgv+1; ++ NewArgv = (char **) emalloc2((++NewArgc + 1), sizeof(char *)); ++ NewArgv[0] = estrdup("sesh"); ++ NewArgv[1] = safe_cmnd; ++ safe_cmnd = estrdup("/usr/sbin/sesh"); ++ /* copy the args from Argv */ ++ for (dst = NewArgv + 2; (*dst = *src) != NULL; ++src, ++dst) ++ ; ++ } ++ } ++#endif ++ EXEC(safe_cmnd, NewArgv); /* run the command */ + #else + exit(0); + #endif /* PROFILING */ +@@ -693,6 +881,30 @@ + NewArgv++; + break; + #endif ++#ifdef WITH_SELINUX ++ case 'r': ++ /* Must have an associated SELinux role. */ ++ if (NewArgv[1] == NULL) ++ usage(1); ++ ++ role_s = NewArgv[1]; ++ ++ /* Shift Argv over and adjust Argc. */ ++ NewArgc--; ++ NewArgv++; ++ break; ++ case 't': ++ /* Must have an associated SELinux type. */ ++ if (NewArgv[1] == NULL) ++ usage(1); ++ ++ type_s = NewArgv[1]; ++ ++ /* Shift Argv over and adjust Argc. */ ++ NewArgc--; ++ NewArgv++; ++ break; ++#endif + #ifdef HAVE_LOGIN_CAP_H + case 'c': + /* Must have an associated login class. */ +@@ -1063,6 +1275,9 @@ + #ifdef HAVE_BSD_AUTH_H + (void) fprintf(stderr, "[-a auth_type] "); + #endif ++#ifdef WITH_SELINUX ++ (void) fprintf(stderr, "[-r role] [-t type] "); ++#endif + (void) fprintf(stderr, "-s | \n"); + exit(exit_val); + } +--- sudo-1.6.7p5/sudo.man.in.selinux 2003-04-15 20:39:14.000000000 -0400 ++++ sudo-1.6.7p5/sudo.man.in 2004-04-13 08:52:19.000000000 -0400 +@@ -174,7 +174,7 @@ + .IX Header "SYNOPSIS" + \&\fBsudo\fR \fB\-V\fR | \fB\-h\fR | \fB\-l\fR | \fB\-L\fR | \fB\-v\fR | \fB\-k\fR | \fB\-K\fR | \fB\-s\fR | + [ \fB\-H\fR ] [\fB\-P\fR ] [\fB\-S\fR ] [ \fB\-b\fR ] | [ \fB\-p\fR \fIprompt\fR ] +-[ \fB\-c\fR \fIclass\fR|\fI\-\fR ] [ \fB\-a\fR \fIauth_type\fR ] ++[ \fB\-c\fR \fIclass\fR|\fI\-\fR ] [ \fB\-a\fR \fIauth_type\fR ] [\fB\-r\fR \fIrole\fR ] [\fB\-t\fR \fItype\fR ] + [ \fB\-u\fR \fIusername\fR|\fI#uid\fR ] \fIcommand\fR + .SH "DESCRIPTION" + .IX Header "DESCRIPTION" +@@ -327,6 +327,16 @@ + the group vector to the list of groups the target user is in. + The real and effective group IDs, however, are still set to match + the target user. ++.IP "\-r" 4 ++.IX Item "-r" ++The \fB\-r\fR (\fRrole\fR) option causes the new (SELinux) security context to have the role specified by ++\fIROLE\fR. ++.IP "\-t" 4 ++.IX Item "-t" ++The \fB\-t\fR (\fRtype\fR) option causes the new (SELinux) security context to have the have the type (domain) ++specified by ++\fITYPE\fR. ++If no type is specified, the default type is derived from the specified role. + .IP "\-S" 4 + .IX Item "-S" + The \fB\-S\fR (\fIstdin\fR) option causes \fBsudo\fR to read the password from +--- sudo-1.6.7p5/configure.selinux 2003-05-06 11:22:27.000000000 -0400 ++++ sudo-1.6.7p5/configure 2004-04-13 08:52:19.000000000 -0400 +@@ -1409,7 +1409,7 @@ + passwd_tries=3 + tty_tickets=off + insults=off +-PROGS="sudo visudo" ++PROGS="sudo visudo sesh" + test -n "$MANTYPE" || MANTYPE="man" + test -n "$mansrcdir" || mansrcdir="." + test -n "$SUDOERS_MODE" || SUDOERS_MODE=0440 +--- sudo-1.6.7p5/Makefile.in.selinux 2003-04-15 20:39:10.000000000 -0400 ++++ sudo-1.6.7p5/Makefile.in 2004-04-13 08:52:19.000000000 -0400 +@@ -59,7 +59,8 @@ + # Libraries + LIBS = @LIBS@ + NET_LIBS = @NET_LIBS@ +-SUDO_LIBS = @SUDO_LIBS@ @AFS_LIBS@ $(LIBS) $(NET_LIBS) ++SELINUX_LIBS = -lselinux ++SUDO_LIBS = @SUDO_LIBS@ @AFS_LIBS@ $(LIBS) $(NET_LIBS) $(SELINUX_LIBS) + + # C preprocessor flags + CPPFLAGS = -I. -I$(srcdir) @CPPFLAGS@ +@@ -105,7 +106,7 @@ + sudoers_mode = @SUDOERS_MODE@ + + # Pass in paths and uid/gid + OS dependent defined +-DEFS = @OSDEFS@ -D_PATH_SUDOERS=\"$(sudoersdir)/sudoers\" -D_PATH_SUDOERS_TMP=\"$(sudoersdir)/sudoers.tmp\" -DSUDOERS_UID=$(sudoers_uid) -DSUDOERS_GID=$(sudoers_gid) -DSUDOERS_MODE=$(sudoers_mode) ++DEFS = @OSDEFS@ -D_PATH_SUDOERS=\"$(sudoersdir)/sudoers\" -D_PATH_SUDOERS_TMP=\"$(sudoersdir)/sudoers.tmp\" -DSUDOERS_UID=$(sudoers_uid) -DSUDOERS_GID=$(sudoers_gid) -DSUDOERS_MODE=$(sudoers_mode) -DWITH_SELINUX + + #### End of system configuration section. #### + +@@ -118,7 +119,7 @@ + interfaces.c lex.yy.c lsearch.c logging.c parse.c parse.lex \ + parse.yacc set_perms.c sigaction.c snprintf.c strcasecmp.c strerror.c \ + strlcat.c strlcpy.c sudo.c sudo.tab.c testsudoers.c tgetpass.c utime.c \ +- visudo.c $(AUTH_SRCS) ++ visudo.c $(AUTH_SRCS) sesh.c + + AUTH_SRCS = auth/afs.c auth/aix_auth.c auth/bsdauth.c auth/dce.c auth/fwtk.c \ + auth/kerb4.c auth/kerb5.c auth/pam.c auth/passwd.c auth/rfc1938.c \ +@@ -139,6 +140,8 @@ + + VISUDOBJS = visudo.o fileops.o goodpath.o find_path.o $(PARSEOBJS) + ++SESH_OBJS = sesh.o ++ + TESTOBJS = interfaces.o testsudoers.o $(PARSEOBJS) + + LIBOBJS = @LIBOBJS@ @ALLOCA@ +@@ -157,7 +160,7 @@ + BINFILES= BUGS CHANGES HISTORY LICENSE README TODO TROUBLESHOOTING \ + UPGRADE install-sh mkinstalldirs sample.syslog.conf sample.sudoers \ + sudo sudo.cat sudo.man sudo.pod sudoers sudoers.cat sudoers.man \ +- sudoers.pod visudo visudo.cat visudo.man visudo.pod ++ sudoers.pod visudo visudo.cat visudo.man visudo.pod sesh + + BINSPECIAL= INSTALL.binary Makefile.binary + +@@ -186,6 +189,9 @@ + visudo: $(VISUDOBJS) $(LIBOBJS) + $(CC) -o $@ $(VISUDOBJS) $(LIBOBJS) $(LDFLAGS) $(LIBS) $(NET_LIBS) + ++sesh: $(SESH_OBJS) ++ $(CC) -o $@ $(SESH_OBJS) $(LDFLAGS) $(LIBS) ++ + testsudoers: $(TESTOBJS) $(LIBOBJS) + $(CC) -o $@ $(TESTOBJS) $(LIBOBJS) $(LDFLAGS) $(LIBS) $(NET_LIBS) + +@@ -218,6 +224,7 @@ + set_perms.o: set_perms.c $(SUDODEP) + tgetpass.o: tgetpass.c $(SUDODEP) + visudo.o: visudo.c $(SUDODEP) version.h ++sesh.o: sesh.c + sudo.o: sudo.c $(SUDODEP) interfaces.h version.h + interfaces.o: interfaces.c $(SUDODEP) interfaces.h + testsudoers.o: testsudoers.c $(SUDODEP) parse.h interfaces.h +@@ -304,6 +311,7 @@ + install-binaries: $(PROGS) + $(INSTALL) -O $(install_uid) -G $(install_gid) -M 4111 -s sudo $(DESTDIR)$(sudodir)/sudo + $(INSTALL) -O $(install_uid) -G $(install_gid) -M 0111 -s visudo $(DESTDIR)$(visudodir)/visudo ++ $(INSTALL) -O $(install_uid) -G $(install_gid) -M 0111 -s sesh $(DESTDIR)$(visudodir)/sesh + + install-sudoers: + test -f $(DESTDIR)$(sudoersdir)/sudoers || \ Modified: tinysofa/snapshot/sudo/current/specs/sudo.spec =================================================================== --- tinysofa/snapshot/sudo/current/specs/sudo.spec 2004-07-01 15:55:07 UTC (rev 2845) +++ tinysofa/snapshot/sudo/current/specs/sudo.spec 2004-07-01 15:55:10 UTC (rev 2846) @@ -1,14 +1,20 @@ +%if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} +%define WITH_SELINUX 1 +%endif Summary: Allows restricted root access for specified users. Name: sudo Version: 1.6.7p5 -Release: 6ts +Release: 27ts License: BSD -Group: tinysofa official +Group: Applications/System Source: http://www.courtesan.com/sudo/dist/sudo-%{version}.tar.gz +Patch1: sudo-selinux.patch URL: http://www.courtesan.com/sudo/ -BuildRoot: %{_tmppath}/%{name}-root -BuildRequires: pam-devel groff +BuildRoot: %{_tmppath}/%{name}-%{version}-root +Requires: /etc/pam.d/system-auth, vim-minimal +BuildRequires: pam-devel, groff + %description Sudo (superuser do) allows a system administrator to give certain users (or groups of users) the ability to run some (or all) commands @@ -22,100 +28,228 @@ %prep %setup -q +%if %{WITH_SELINUX} +#SELinux +%patch1 -p1 -b .selinux +%endif %build +%ifarch s390 s390x +F_PIE=-fPIE +%else +F_PIE=-fpie +%endif + +export CFLAGS="$RPM_OPT_FLAGS $F_PIE" LDFLAGS="-pie" + %configure \ + --prefix=%{_prefix} \ + --sbindir=%{_sbindir} \ --with-logging=syslog \ --with-logfac=authpriv \ --with-pam \ --with-editor=/bin/vi \ --with-env-editor \ --with-ignore-dot \ - --with-tty-tickets + --with-tty-tickets \ + --without-interfaces make %install -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != "/" ] && rm -rf "$RPM_BUILD_ROOT" +rm -rf $RPM_BUILD_ROOT mkdir $RPM_BUILD_ROOT - -%makeinstall - +%{makeinstall} install_uid=`id -u` install_gid=`id -g` sudoers_uid=`id -u` sudoers_gid=`id -g` +chmod 755 $RPM_BUILD_ROOT%{_bindir}/* $RPM_BUILD_ROOT%{_sbindir}/* install -d -m 700 $RPM_BUILD_ROOT/var/run/sudo mkdir -p $RPM_BUILD_ROOT/etc/pam.d cat > $RPM_BUILD_ROOT/etc/pam.d/sudo << EOF #%PAM-1.0 -auth required pam_stack.so service=system-auth -account required pam_stack.so service=system-auth -password required pam_stack.so service=system-auth -session required pam_stack.so service=system-auth +auth required pam_stack.so service=system-auth +account required pam_stack.so service=system-auth +password required pam_stack.so service=system-auth +session required pam_stack.so service=system-auth EOF + %clean -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT +rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) -%doc BUGS CHANGES HISTORY LICENSE README RUNSON TODO TROUBLESHOOTING *.pod -%config(noreplace) %attr(0440,root,root) /etc/sudoers +%doc BUGS CHANGES HISTORY LICENSE README RUNSON TODO TROUBLESHOOTING UPGRADE *.pod +%attr(0440,root,root) %config(noreplace) /etc/sudoers %config(noreplace) /etc/pam.d/sudo -%dir %attr(0700,root,root) /var/run/sudo -%attr(4111,root,root) /usr/bin/sudo -%attr(0111,root,root) /usr/sbin/visudo -%attr(0644,root,root) /usr/share/man/man5/sudoers.5* -%attr(0644,root,root) /usr/share/man/man8/sudo.8* -%attr(0644,root,root) /usr/share/man/man8/visudo.8* +%dir /var/run/sudo +%attr(4111,root,root) %{_bindir}/sudo +%attr(0755,root,root) %{_sbindir}/visudo +%if %{WITH_SELINUX} +%attr(0755,root,root) %{_sbindir}/sesh +%endif +%{_mandir}/man5/sudoers.5* +%{_mandir}/man8/sudo.8* +%{_mandir}/man8/visudo.8* +# Make sure permissions are ok even if we're updating +%post +/bin/chmod 0440 /etc/sudoers || : + %changelog -* Mon May 24 2004 tsintegrate 1.6.7p5-6ts -- current (1.6.7p5-6jh) integrated as 1.6.7p5-6ts for release 1.0-U1 +* Tue Jun 15 2004 Elliot Lee +- rebuilt -* Thu May 20 2004 Jaakko Heinonen 1.6.7p5-6jh -- change manual page permissions from 444 to 644 +* Tue Apr 13 2004 Dan Walsh 1.6.7p5-26 +- Eliminate tty handling from selinux -* Wed May 19 2004 tsintegrate 1.6.7p5-5ts -- current (1.6.7p5-4ts) integrated as 1.6.7p5-5ts for release 1.0-U1 +* Thu Apr 1 2004 Thomas Woerner 1.6.7p5-25 +- fixed spec file: sesh in file section with selinux flag (#119682) -* Wed May 12 2004 Omar Kilani 1.6.7p5-4ts -- Add BuildRequires pam-devel, groff. +* Thu Mar 30 2004 Colin Walters 1.6.7p5-24 +- Enhance sesh.c to fork/exec children itself, to avoid + having sudo reap all domains. +- Only reinstall default signal handlers immediately before + exec of child with SELinux patch -* Mon Dec 8 2003 Erlend Midttun 1.6.7p5-1tr -- New upstream. +* Thu Mar 18 2004 Dan Walsh 1.6.7p5-23 +- change to default to sysadm_r +- Fix tty handling -* Wed Jun 18 2003 Erlend Midttun 1.6.6-4tr -- Big rebuild +* Thu Mar 18 2004 Dan Walsh 1.6.7p5-22 +- Add /bin/sesh to run selinux code. +- replace /bin/bash -c with /bin/sesh -* Mon Mar 24 2003 Erlend Midttun 1.6.6-3em -- Rebuilt against glibc 2.3.2. +* Tue Mar 16 2004 Dan Walsh 1.6.7p5-21 +- Hard code to use "/bin/bash -c" for selinux -* Tue Aug 13 2002 Christian H. Toldnes 1.6.6-2ct -- Minor .spec cleanup. +* Tue Mar 16 2004 Dan Walsh 1.6.7p5-20 +- Eliminate closing and reopening of terminals, to match su. -* Fri Apr 26 2002 Christian H. Toldnes -- Update to upstream 1.6.6 to fix security issue. +* Mon Mar 15 2004 Dan Walsh 1.6.7p5-19 +- SELinux fixes to make transitions work properly -* Fri Jan 18 2002 Christian H. Toldnes -- Specfile cleanup. "nullok" removed. Thanks to Goetz Bock. +* Fri Mar 5 2004 Thomas Woerner 1.6.7p5-18 +- pied sudo -* Fri Jan 18 2002 Hans Alm?sbakk -- New upstream version: 1.6.5p1 +* Fri Feb 13 2004 Elliot Lee +- rebuilt -* Tue Jan 15 2002 Erlend Midttun -- Upgraded to 1.6.4p1 to fix a few security issues. +* Tue Jan 27 2004 Dan Walsh 1.6.7p5-16 +- Eliminate interfaces call, since this requires big SELinux privs +- and it seems to be useless. -* Mon Jun 11 2001 Oystein Viggen -- New upstream version: 1.6.3p7 +* Tue Jan 27 2004 Karsten Hopp 1.6.7p5-15 +- visudo requires vim-minimal or setting EDITOR to something useful (#68605) -* Mon Feb 26 2001 Oystein Viggen -- picked up 1.6.3p6 which fixes a buffer overflow +* Mon Jan 26 2004 Dan Walsh 1.6.7p5-14 +- Fix is_selinux_enabled call -* Wed Sep 13 2000 Per Ivar Paulsen -- picked up 1.6.3p5 +* Tue Jan 13 2004 Dan Walsh 1.6.7p5-13 +- Clean up patch on failure -* Mon May 22 2000 Per Ivar Paulsen -- picked up 1.6.3p3 -- Moved man and info pages to /usr/share adhering to FHS +* Tue Jan 6 2004 Dan Walsh 1.6.7p5-12 +- Remove sudo.te for now. +* Fri Jan 2 2004 Dan Walsh 1.6.7p5-11 +- Fix usage message + +* Mon Dec 22 2003 Dan Walsh 1.6.7p5-10 +- Clean up sudo.te to not blow up if pam.te not present + +* Thu Dec 18 2003 Thomas Woerner +- added missing BuildRequires for groff + +* Tue Dec 16 2003 Jeremy Katz 1.6.7p5-9 +- remove left-over debugging code + +* Tue Dec 16 2003 Dan Walsh 1.6.7p5-8 +- Fix terminal handling that caused Sudo to exit on non selinux machines. + +* Mon Dec 15 2003 Dan Walsh 1.6.7p5-7 +- Remove sudo_var_run_t which is now pam_var_run_t + +* Fri Dec 12 2003 Dan Walsh 1.6.7p5-6 +- Fix terminal handling and policy + +* Thu Dec 11 2003 Dan Walsh 1.6.7p5-5 +- Fix policy + +* Thu Nov 13 2003 Dan Walsh 1.6.7p5-4.sel +- Turn on SELinux support + +* Tue Jul 29 2003 Dan Walsh 1.6.7p5-3 +- Add support for SELinux + +* Wed Jun 04 2003 Elliot Lee +- rebuilt + +* Mon May 19 2003 Thomas Woerner 1.6.7p5-1 + +* Wed Jan 22 2003 Tim Powers +- rebuilt + +* Tue Nov 12 2002 Nalin Dahyabhai 1.6.6-2 +- remove absolute path names from the PAM configuration, ensuring that the + right modules get used for whichever arch we're built for +- don't try to install the FAQ, which isn't there any more + +* Thu Jun 27 2002 Bill Nottingham 1.6.6-1 +- update to 1.6.6 + +* Fri Jun 21 2002 Tim Powers +- automated rebuild + +* Thu May 23 2002 Tim Powers +- automated rebuild + +* Thu Apr 18 2002 Bernhard Rosenkraenzer 1.6.5p2-2 +- Fix bug #63768 + +* Thu Mar 14 2002 Bernhard Rosenkraenzer 1.6.5p2-1 +- 1.6.5p2 + +* Fri Jan 18 2002 Bernhard Rosenkraenzer 1.6.5p1-1 +- 1.6.5p1 +- Hope this "a new release per day" madness stops ;) + +* Thu Jan 17 2002 Bernhard Rosenkraenzer 1.6.5-1 +- 1.6.5 + +* Tue Jan 15 2002 Bernhard Rosenkraenzer 1.6.4p1-1 +- 1.6.4p1 + +* Mon Jan 14 2002 Bernhard Rosenkraenzer 1.6.4-1 +- Update to 1.6.4 + +* Mon Jul 23 2001 Bernhard Rosenkraenzer 1.6.3p7-2 +- Add build requirements (#49706) +- s/Copyright/License/ +- bzip2 source + +* Sat Jun 16 2001 Than Ngo +- update to 1.6.3p7 +- use %%{_tmppath} + +* Fri Feb 23 2001 Bernhard Rosenkraenzer +- 1.6.3p6, fixes buffer overrun + +* Tue Oct 10 2000 Bernhard Rosenkraenzer +- 1.6.3p5 + +* Wed Jul 12 2000 Prospector +- automatic rebuild + +* Tue Jun 06 2000 Karsten Hopp +- fixed owner of sudo and visudo + +* Thu Jun 1 2000 Nalin Dahyabhai +- modify PAM setup to use system-auth +- clean up buildrooting by using the makeinstall macro + +* Tue Apr 11 2000 Bernhard Rosenkraenzer +- initial build in main distrib +- update to 1.6.3 +- deal with compressed man pages + * Tue Dec 14 1999 Preston Brown - updated to 1.6.1 for Powertools 6.2 - config files are now noreplace. @@ -151,3 +285,4 @@ * Mon Feb 17 1997 Michael Fulbright - First version for PowerCD. + From svn at tinysofa.org Thu Jul 1 15:55:18 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:55:18 +1000 (EST) Subject: [tinysofa-svn] r2847 - in tinysofa/snapshot/sysklogd/current: sources specs Message-ID: <20040701155518.C57544E817E@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:55:18 +1000 (Fri, 02 Jul 2004) New Revision: 2847 Removed: tinysofa/snapshot/sysklogd/current/sources/sysklogd-1.4.1-security.patch tinysofa/snapshot/sysklogd/current/sources/sysklogd-1.4.1rh-security.patch tinysofa/snapshot/sysklogd/current/sources/syslog.init tinysofa/snapshot/sysklogd/current/sources/syslog.sysconfig Modified: tinysofa/snapshot/sysklogd/current/sources/sysklogd-1.4.1rh.tar.gz tinysofa/snapshot/sysklogd/current/specs/sysklogd.spec Log: - Sync with 2.0. - Kept: - sysklogd-1.4.1rh.tar.gz: - Removed: - sysklogd-1.4.1-security.patch: - sysklogd-1.4.1rh-security.patch: - syslog.init: - syslog.sysconfig: Deleted: tinysofa/snapshot/sysklogd/current/sources/sysklogd-1.4.1-security.patch =================================================================== --- tinysofa/snapshot/sysklogd/current/sources/sysklogd-1.4.1-security.patch 2004-07-01 15:55:10 UTC (rev 2846) +++ tinysofa/snapshot/sysklogd/current/sources/sysklogd-1.4.1-security.patch 2004-07-01 15:55:18 UTC (rev 2847) @@ -1,248 +0,0 @@ -diff -Nur sysklogd-1.4.1.orig/klogd.8 sysklogd-1.4.1/klogd.8 ---- sysklogd-1.4.1.orig/klogd.8 Sun Mar 11 20:35:51 2001 -+++ sysklogd-1.4.1/klogd.8 Fri Mar 16 14:11:38 2001 -@@ -3,6 +3,7 @@ - .\" Sun Jul 30 01:35:55 MET: Martin Schulze: Updates - .\" Sun Nov 19 23:22:21 MET: Martin Schulze: Updates - .\" Mon Aug 19 09:42:08 CDT 1996: Dr. G.W. Wettstein: Updates -+.\" Thu Feb 17 2000: Chris Wing: Unprivileged klogd feature - .\" - .TH KLOGD 8 "21 August, 1999" "Version 1.4" "Linux System Administration" - .SH NAME -@@ -17,7 +18,11 @@ - .RB [ " \-f " - .I fname - ] -+.RB [ " \-u " -+.I username -+] - .RB [ " \-iI " ] -+.RB [ " \-r " ] - .RB [ " \-n " ] - .RB [ " \-o " ] - .RB [ " \-p " ] -@@ -46,11 +51,24 @@ - .BI "\-f " file - Log messages to the specified filename rather than to the syslog facility. - .TP -+.BI "\-u " username -+Tells klogd to become the specified user and drop root privileges before -+starting logging. This is useful if you are paranoid about how well we wrote -+this program. -+.TP - .BI "\-i \-I" - Signal the currently executing klogd daemon. Both of these switches control - the loading/reloading of symbol information. The \-i switch signals the - daemon to reload the kernel module symbols. The \-I switch signals for a - reload of both the static kernel symbols and the kernel module symbols. -+.TP -+.B "\-r" -+Reset kernel logging. You should run -+.B klogd -+with this argument after killing the daemon, if you run the daemon as a non- -+privileged user. This is because -+.B klogd -+will be unable to reset kernel logging automatically in that case. - .TP - .B "\-n" - Avoid auto-backgrounding. This is needed especially if the -diff -Nur sysklogd-1.4.1.orig/klogd.c sysklogd-1.4.1/klogd.c ---- sysklogd-1.4.1.orig/klogd.c Sun Mar 11 20:40:10 2001 -+++ sysklogd-1.4.1/klogd.c Fri Mar 16 14:38:52 2001 -@@ -275,6 +275,10 @@ - #define ksyslog klogctl - #endif - -+/* Support for running as an unprivileged user */ -+#include -+#include -+ - #define LOG_BUFFER_SIZE 4096 - #define LOG_LINE_LENGTH 1000 - -@@ -308,6 +312,9 @@ - int debugging = 0; - int symbols_twice = 0; - -+int drop_privileges = 0; -+uid_t server_uid = 0; -+gid_t server_gid = 0; - - /* Function prototypes. */ - extern int ksyslog(int type, char *buf, int len); -@@ -994,7 +1001,7 @@ - chdir ("/"); - #endif - /* Parse the command-line. */ -- while ((ch = getopt(argc, argv, "c:df:iIk:nopsvx2")) != EOF) -+ while ((ch = getopt(argc, argv, "c:df:u:iIk:noprsvx2")) != EOF) - switch((char)ch) - { - case '2': /* Print lines with symbols twice. */ -@@ -1010,6 +1017,31 @@ - output = optarg; - use_output++; - break; -+ case 'u': /* Run as this user */ -+ if (optarg) { -+ struct passwd *pwd; -+ -+ pwd = getpwnam(optarg); -+ if (!pwd) { -+ fprintf(stderr, "Failed to look up user %s " \ -+ "to switch to. Terminating.\n", optarg); -+ exit(1); -+ } -+ -+ drop_privileges = 1; -+ server_uid = pwd->pw_uid; -+ server_gid = pwd->pw_gid; -+ } else { -+ fprintf(stderr, "Must specify user name along " \ -+ "with -u option.\n"); -+ exit(1); -+ } -+ break; -+ case 'r': /* Reset logging */ -+ Syslog(LOG_INFO, "Resetting kernel logging."); -+ CloseLogSrc(); -+ exit(0); -+ break; - case 'i': /* Reload module symbols. */ - SignalDaemon(SIGUSR1); - return(0); -@@ -1161,6 +1193,13 @@ - if (symbol_lookup) { - InitKsyms(symfile); - InitMsyms(); -+ } -+ -+ /* Drop privileges if a user name was specified on the command line */ -+ if (drop_privileges) { -+ setgroups(0, NULL); -+ setgid(server_gid); -+ setuid(server_uid); - } - - /* The main loop. */ -diff -Nur sysklogd-1.4.1.orig/sysklogd.8 sysklogd-1.4.1/sysklogd.8 ---- sysklogd-1.4.1.orig/sysklogd.8 Sun Mar 11 20:35:51 2001 -+++ sysklogd-1.4.1/sysklogd.8 Fri Mar 16 14:40:16 2001 -@@ -29,6 +29,9 @@ - .RB [ " \-s " - .I domainlist - ] -+.RB [ " \-u" -+.IB username -+] - .RB [ " \-v " ] - .LP - .SH DESCRIPTION -@@ -149,6 +152,22 @@ - is specified and the host logging resolves to satu.infodrom.north.de - no domain would be cut, you will have to specify two domains like: - .BR "\-s north.de:infodrom.north.de" . -+.TP -+.BI "\-u " "username" -+This causes the -+.B syslogd -+daemon to become the named user before starting up logging. This -+option is useful if you are paranoid about how well we wrote this -+program. -+ -+Note that when this option is in use, -+.B syslogd -+will open all log files as root when the daemon is first started; -+however, after a -+.B SIGHUP -+the files will be reopened as the non-privileged user. You should -+take this into account when deciding the ownership of the log -+files. - .TP - .B "\-v" - Print version and exit. -diff -Nur sysklogd-1.4.1.orig/syslogd.c sysklogd-1.4.1/syslogd.c ---- sysklogd-1.4.1.orig/syslogd.c Sun Mar 11 20:40:10 2001 -+++ sysklogd-1.4.1/syslogd.c Fri Mar 16 14:44:02 2001 -@@ -500,6 +500,10 @@ - #include - #endif - -+/* Support for running syslogd as non-root user */ -+#include -+#include -+ - #ifndef UTMP_FILE - #ifdef UTMP_FILENAME - #define UTMP_FILE UTMP_FILENAME -@@ -735,6 +739,7 @@ - char **LocalHosts = NULL; /* these hosts are logged with their hostname */ - int NoHops = 1; /* Can we bounce syslog messages through an - intermediate host. */ -+char *server_user = NULL; /* user name to run server as, instead of root */ - - extern int errno; - -@@ -829,7 +834,7 @@ - funix[i] = -1; - } - -- while ((ch = getopt(argc, argv, "a:dhf:l:m:np:rs:v")) != EOF) -+ while ((ch = getopt(argc, argv, "a:dhf:l:m:np:rs:u:v")) != EOF) - switch((char)ch) { - case 'a': - if (nfunix < MAXFUNIX) -@@ -874,6 +879,15 @@ - } - StripDomains = crunch_list(optarg); - break; -+ case 'u': -+ if (optarg) -+ server_user = strdup(optarg); -+ else { -+ fprintf (stderr, "Must specify user name " \ -+ "along with -u option.\n"); -+ exit (1); -+ } -+ break; - case 'v': - printf("syslogd %s.%s\n", VERSION, PATCHLEVEL); - exit (0); -@@ -1020,6 +1034,28 @@ - if (getpid() != ppid) - kill (ppid, SIGTERM); - #endif -+ /* -+ * Drop privileges if a user name was specified on -+ * the command line. -+ */ -+ if (server_user) { -+ struct passwd *pwd; -+ -+ pwd = getpwnam(server_user); -+ if (!pwd) { -+ dprintf("Failed to look up user %s.\n", server_user); -+ exit(1); -+ } -+ -+ /* initgroups should not require the stupid "extra group" thingy */ -+ if (initgroups(server_user, pwd->pw_gid)) { -+ dprintf("Failed to set groups for user %s.\n", server_user); -+ exit(1); -+ } -+ -+ setgid(pwd->pw_gid); -+ setuid(pwd->pw_uid); -+ } - - /* Main loop begins here. */ - for (;;) { -@@ -1175,7 +1211,7 @@ - int usage() - { - fprintf(stderr, "usage: syslogd [-drvh] [-l hostlist] [-m markinterval] [-n] [-p path]\n" \ -- " [-s domainlist] [-f conffile]\n"); -+ " [-s domainlist] [-f conffile] [-u username]\n"); - exit(1); - } - Deleted: tinysofa/snapshot/sysklogd/current/sources/sysklogd-1.4.1rh-security.patch =================================================================== --- tinysofa/snapshot/sysklogd/current/sources/sysklogd-1.4.1rh-security.patch 2004-07-01 15:55:10 UTC (rev 2846) +++ tinysofa/snapshot/sysklogd/current/sources/sysklogd-1.4.1rh-security.patch 2004-07-01 15:55:18 UTC (rev 2847) @@ -1,249 +0,0 @@ -diff -urN sysklogd-1.4.1rh.orig/klogd.8 sysklogd-1.4.1rh/klogd.8 ---- sysklogd-1.4.1rh.orig/klogd.8 2001-07-09 07:13:11.000000000 +0300 -+++ sysklogd-1.4.1rh/klogd.8 2004-06-08 22:45:42.000000000 +0300 -@@ -3,6 +3,7 @@ - .\" Sun Jul 30 01:35:55 MET: Martin Schulze: Updates - .\" Sun Nov 19 23:22:21 MET: Martin Schulze: Updates - .\" Mon Aug 19 09:42:08 CDT 1996: Dr. G.W. Wettstein: Updates -+.\" Thu Feb 17 2000: Chris Wing: Unprivileged klogd feature - .\" - .TH KLOGD 8 "21 August, 1999" "Version 1.4" "Linux System Administration" - .SH NAME -@@ -17,7 +18,11 @@ - .RB [ " \-f " - .I fname - ] -+.RB [ " \-u " -+.I username -+] - .RB [ " \-iI " ] -+.RB [ " \-r " ] - .RB [ " \-n " ] - .RB [ " \-o " ] - .RB [ " \-p " ] -@@ -46,12 +51,25 @@ - .BI "\-f " file - Log messages to the specified filename rather than to the syslog facility. - .TP -+.BI "\-u " username -+Tells klogd to become the specified user and drop root privileges before -+starting logging. This is useful if you are paranoid about how well we wrote -+this program. -+.TP - .BI "\-i \-I" - Signal the currently executing klogd daemon. Both of these switches control - the loading/reloading of symbol information. The \-i switch signals the - daemon to reload the kernel module symbols. The \-I switch signals for a - reload of both the static kernel symbols and the kernel module symbols. - .TP -+.B "\-r" -+Reset kernel logging. You should run -+.B klogd -+with this argument after killing the daemon, if you run the daemon as a non- -+privileged user. This is because -+.B klogd -+will be unable to reset kernel logging automatically in that case. -+.TP - .B "\-n" - Avoid auto-backgrounding. This is needed especially if the - .B klogd -diff -urN sysklogd-1.4.1rh.orig/klogd.c sysklogd-1.4.1rh/klogd.c ---- sysklogd-1.4.1rh.orig/klogd.c 2002-04-17 17:49:34.000000000 +0300 -+++ sysklogd-1.4.1rh/klogd.c 2004-06-08 22:49:31.000000000 +0300 -@@ -279,6 +279,10 @@ - #define _PATH_KLOG "/proc/kmsg" - #endif - -+/* Support for running as an unprivileged user */ -+#include -+#include -+ - #define LOG_BUFFER_SIZE 4096 - #define LOG_LINE_LENGTH 1000 - -@@ -312,6 +316,9 @@ - int debugging = 0; - int symbols_twice = 0; - -+int drop_privileges = 0; -+uid_t server_uid = 0; -+gid_t server_gid = 0; - - /* Function prototypes. */ - extern int ksyslog(int type, char *buf, int len); -@@ -996,7 +1003,7 @@ - chdir ("/"); - #endif - /* Parse the command-line. */ -- while ((ch = getopt(argc, argv, "c:df:iIk:nopsvx2")) != EOF) -+ while ((ch = getopt(argc, argv, "c:df:u:iIk:noprsvx2")) != EOF) - switch((char)ch) - { - case '2': /* Print lines with symbols twice. */ -@@ -1012,6 +1019,31 @@ - output = optarg; - use_output++; - break; -+ case 'u': /* Run as this user */ -+ if (optarg) { -+ struct passwd *pwd; -+ -+ pwd = getpwnam(optarg); -+ if (!pwd) { -+ fprintf(stderr, "Failed to look up user %s " \ -+ "to switch to. Terminating.\n", optarg); -+ exit(1); -+ } -+ -+ drop_privileges = 1; -+ server_uid = pwd->pw_uid; -+ server_gid = pwd->pw_gid; -+ } else { -+ fprintf(stderr, "Must specify user name along " \ -+ "with -u option.\n"); -+ exit(1); -+ } -+ break; -+ case 'r': /* Reset logging */ -+ Syslog(LOG_INFO, "Resetting kernel logging."); -+ CloseLogSrc(); -+ exit(0); -+ break; - case 'i': /* Reload module symbols. */ - SignalDaemon(SIGUSR1); - return(0); -@@ -1171,6 +1203,13 @@ - } - } - -+ /* Drop privileges if a user name was specified on the command line */ -+ if (drop_privileges) { -+ setgroups(0, NULL); -+ setgid(server_gid); -+ setuid(server_uid); -+ } -+ - /* The main loop. */ - while (1) - { -diff -urN sysklogd-1.4.1rh.orig/sysklogd.8 sysklogd-1.4.1rh/sysklogd.8 ---- sysklogd-1.4.1rh.orig/sysklogd.8 2001-07-09 07:17:22.000000000 +0300 -+++ sysklogd-1.4.1rh/sysklogd.8 2004-06-08 22:45:42.000000000 +0300 -@@ -29,6 +29,9 @@ - .RB [ " \-s " - .I domainlist - ] -+.RB [ " \-u" -+.IB username -+] - .RB [ " \-v " ] - .RB [ " \-x " ] - .LP -@@ -151,6 +154,22 @@ - no domain would be cut, you will have to specify two domains like: - .BR "\-s north.de:infodrom.north.de" . - .TP -+.BI "\-u " "username" -+This causes the -+.B syslogd -+daemon to become the named user before starting up logging. This -+option is useful if you are paranoid about how well we wrote this -+program. -+ -+Note that when this option is in use, -+.B syslogd -+will open all log files as root when the daemon is first started; -+however, after a -+.B SIGHUP -+the files will be reopened as the non-privileged user. You should -+take this into account when deciding the ownership of the log -+files. -+.TP - .B "\-v" - Print version and exit. - .TP -diff -urN sysklogd-1.4.1rh.orig/syslogd.c sysklogd-1.4.1rh/syslogd.c ---- sysklogd-1.4.1rh.orig/syslogd.c 2004-05-04 01:00:45.000000000 +0300 -+++ sysklogd-1.4.1rh/syslogd.c 2004-06-08 22:52:28.000000000 +0300 -@@ -500,6 +500,10 @@ - #include - #endif - -+/* Support for running syslogd as non-root user */ -+#include -+#include -+ - #ifndef UTMP_FILE - #ifdef UTMP_FILENAME - #define UTMP_FILE UTMP_FILENAME -@@ -736,6 +740,7 @@ - char **LocalHosts = NULL; /* these hosts are logged with their hostname */ - int NoHops = 1; /* Can we bounce syslog messages through an - intermediate host. */ -+char *server_user = NULL; /* user name to run server as, instead of root */ - - extern int errno; - -@@ -830,7 +835,7 @@ - funix[i] = -1; - } - -- while ((ch = getopt(argc, argv, "a:dhf:l:m:np:rs:vx")) != EOF) -+ while ((ch = getopt(argc, argv, "a:dhf:l:m:np:rs:u:vx")) != EOF) - switch((char)ch) { - case 'a': - if (nfunix < MAXFUNIX) -@@ -875,6 +880,15 @@ - } - StripDomains = crunch_list(optarg); - break; -+ case 'u': -+ if (optarg) -+ server_user = strdup(optarg); -+ else { -+ fprintf (stderr, "Must specify user name " \ -+ "along with -u option.\n"); -+ exit (1); -+ } -+ break; - case 'v': - printf("syslogd %s.%s\n", VERSION, PATCHLEVEL); - exit (0); -@@ -1024,6 +1038,28 @@ - if (getpid() != ppid) - kill (ppid, SIGTERM); - #endif -+ /* -+ * Drop privileges if a user name was specified on -+ * the command line. -+ */ -+ if (server_user) { -+ struct passwd *pwd; -+ -+ pwd = getpwnam(server_user); -+ if (!pwd) { -+ dprintf("Failed to look up user %s.\n", server_user); -+ exit(1); -+ } -+ -+ /* initgroups should not require the stupid "extra group" thingy */ -+ if (initgroups(server_user, pwd->pw_gid)) { -+ dprintf("Failed to set groups for user %s.\n", server_user); -+ exit(1); -+ } -+ -+ setgid(pwd->pw_gid); -+ setuid(pwd->pw_uid); -+ } - - /* Main loop begins here. */ - for (;;) { -@@ -1179,7 +1215,7 @@ - int usage() - { - fprintf(stderr, "usage: syslogd [-drvxh] [-l hostlist] [-m markinterval] [-n] [-p path]\n" \ -- " [-s domainlist] [-f conffile]\n"); -+ " [-s domainlist] [-f conffile] [-u username]\n"); - exit(1); - } - Modified: tinysofa/snapshot/sysklogd/current/sources/sysklogd-1.4.1rh.tar.gz =================================================================== (Binary files differ) Deleted: tinysofa/snapshot/sysklogd/current/sources/syslog.init =================================================================== --- tinysofa/snapshot/sysklogd/current/sources/syslog.init 2004-07-01 15:55:10 UTC (rev 2846) +++ tinysofa/snapshot/sysklogd/current/sources/syslog.init 2004-07-01 15:55:18 UTC (rev 2847) @@ -1,124 +0,0 @@ -#!/bin/bash -# -# syslog Starts syslogd/klogd. -# -# -# chkconfig: 2345 12 88 -# description: Syslog is the facility by which many daemons use to log \ -# messages to various system log files. It is a good idea to always \ -# run syslog. -### BEGIN INIT INFO -# Provides: $syslog -### END INIT INFO - -# Source function library. -. /etc/init.d/functions - -[ -f /sbin/syslogd ] || exit 0 -[ -f /sbin/klogd ] || exit 0 - -# Source config -if [ -f /etc/sysconfig/syslog ] ; then - . /etc/sysconfig/syslog -else - SYSLOGD_OPTIONS="-m 0" - KLOGD_OPTIONS="-2" -fi - -case "$LOGSERVER" in - yes|YES|sim|SIM) - LOGSERVER=-r - ;; - *) - LOGSERVER= - ;; -esac - -# avoid resolving hostnames when we are are logserver and also -# a nameserver -if [ -n "$LOGSERVER" ]; then - case "$DNSSERVER" in - yes|YES|sim|SIM) - DNSSERVER=-x - ;; - *) - DNSSERVER= - ;; - esac -else - DNSSERVER= -fi - -# additional sockets for chrooted daemons -if [ -n "$ADD_SOCKET" ]; then - for n in $ADD_SOCKET; do - SOCKETS="$SOCKETS -a $n" - done -fi - -if [ -n "$SYSLOGDUSER" ]; then - USER="-u $SYSLOGDUSER" -else - USER="" -fi - -SYSLOGD_OPTIONS="$SYSLOGD_OPTIONS $USER $LOGSERVER $DNSSERVER $SOCKETS" - -RETVAL=0 - -umask 077 - -start() { - echo -n $"Starting system logger: " - daemon syslogd $SYSLOGD_OPTIONS - RETVAL=$? - echo - echo -n $"Starting kernel logger: " - daemon klogd $KLOGD_OPTIONS - echo - [ $RETVAL -eq 0 ] && touch ${INITLOCK:-/mnt/lockdev}/syslog - return $RETVAL -} -stop() { - echo -n $"Shutting down kernel logger: " - killproc klogd - echo - echo -n $"Shutting down system logger: " - killproc syslogd - RETVAL=$? - echo - [ $RETVAL -eq 0 ] && rm -f ${INITLOCK:-/mnt/lockdev}/syslog - return $RETVAL -} -rhstatus() { - status syslogd - status klogd -} -restart() { - stop - start -} - -case "$1" in - start) - start - ;; - stop) - stop - ;; - status) - rhstatus - ;; - restart|reload) - restart - ;; - condrestart|try-restart) - [ -f ${INITLOCK:-/mnt/lockdev}/syslog ] && restart || : - ;; - *) - echo $"Usage: $0 {start|stop|status|restart|try-restart}" - exit 1 -esac - -exit $? - Deleted: tinysofa/snapshot/sysklogd/current/sources/syslog.sysconfig =================================================================== --- tinysofa/snapshot/sysklogd/current/sources/syslog.sysconfig 2004-07-01 15:55:10 UTC (rev 2846) +++ tinysofa/snapshot/sysklogd/current/sources/syslog.sysconfig 2004-07-01 15:55:18 UTC (rev 2847) @@ -1,32 +0,0 @@ -# syslog startup script configuration file - -# Should syslog behave like a log server? yes/no -# 'yes' will start syslog with the '-r' parameter, -# anything else will start syslog without that parameter - -LOGSERVER=no - -# Are we also a nameserver? If yes, be sure this to be -# enabled or you can get deadlocks between the two servers. - -DNSSERVER=no - -# Additional sockets syslogd should listen to. -# Used by, for example, a chrooted daemon. -# Please use double quotes. For example: -# ADD_SOCKET="/var/named/dev/log /var/myserver/dev/log" - -ADD_SOCKET="" - -# Specify a user to run syslogd as -SYSLOGDUSER="syslog" - -# Additional options for syslogd -# -m 0 disables 'MARK' messages -SYSLOGD_OPTIONS="-m 0" - -# Options to pass to the klogd daemon -# "-c 4" changes the printk level so that its messages don't -# show up in the console. For example, firewall messages -KLOGD_OPTS="-x" - Modified: tinysofa/snapshot/sysklogd/current/specs/sysklogd.spec =================================================================== --- tinysofa/snapshot/sysklogd/current/specs/sysklogd.spec 2004-07-01 15:55:10 UTC (rev 2846) +++ tinysofa/snapshot/sysklogd/current/specs/sysklogd.spec 2004-07-01 15:55:18 UTC (rev 2847) @@ -1,20 +1,14 @@ Summary: System logging and kernel message trapping daemons. Name: sysklogd Version: 1.4.1 -Release: 36jh +Release: 20ts Copyright: GPL -Group: tinysofa/main +Group: System Environment/Daemons Source: sysklogd-%{version}rh.tar.gz -Source1: syslog.init -Source2: syslog.sysconfig -Patch: sysklogd-1.4.1rh-security.patch -Prereq: coreutils initscripts -%service_requires +Prereq: fileutils /sbin/chkconfig /etc/init.d Conflicts: logrotate < 3.5.2 Requires: bash >= 2.0 -%rename sysklogd-conf BuildRoot: %{_tmppath}/%{name}-%{version}-root -BuildRequires: perl %description The sysklogd package contains two system utilities (syslogd and klogd) @@ -22,83 +16,84 @@ daemons (background processes) and log system messages to different places, like sendmail logs, security logs, error logs, etc. - %prep %setup -q -n sysklogd-%{version}rh -%patch -p1 -b .security +%ifarch s390 s390x +perl -pi -e 's/-fpie/-fPIE/' Makefile +%endif - %build -%make \ - CFLAGS="%{optflags} -DSYSV -D_GNU_SOURCE -Wall" \ - LDFLAGS="" +make %{?_smp_mflags} - %install -%{__mkdir_p} \ - %{buildroot}%{_bindir} \ - %{buildroot}%{_mandir}/man{5,8} \ - %{buildroot}%{_sbindir} \ - %{buildroot}/sbin \ - %{buildroot}%{_initrddir} \ - %{buildroot}%{_sysconfdir}/logrotate.d \ - %{buildroot}%{_sysconfdir}/sysconfig +rm -rf $RPM_BUILD_ROOT +mkdir -p $RPM_BUILD_ROOT{/etc,%{_bindir},%{_mandir}/man{5,8},/usr/sbin} +mkdir -p $RPM_BUILD_ROOT/sbin -make install \ - TOPDIR=%{buildroot} \ - MANDIR=%{buildroot}%{_mandir} \ +make install TOPDIR=$RPM_BUILD_ROOT MANDIR=$RPM_BUILD_ROOT%{_mandir} \ MAN_OWNER=`id -nu` -install -m644 redhat/syslog.conf.rhs %{buildroot}%{_sysconfdir}/syslog.conf +install -m644 redhat/syslog.conf.rhs $RPM_BUILD_ROOT/etc/syslog.conf -install -m755 %{SOURCE1} %{buildroot}%{_initrddir}/syslog -install -m644 redhat/syslog.log %{buildroot}%{_sysconfdir}/logrotate.d/syslog -install -m644 %{SOURCE2} %{buildroot}%{_sysconfdir}/sysconfig/syslog +mkdir -p $RPM_BUILD_ROOT/etc/{rc.d/init.d,logrotate.d,sysconfig} +install -m755 redhat/syslog.init $RPM_BUILD_ROOT/etc/rc.d/init.d/syslog +install -m644 redhat/syslog.log $RPM_BUILD_ROOT/etc/logrotate.d/syslog +install -m644 redhat/syslog $RPM_BUILD_ROOT/etc/sysconfig/syslog -%{__chmod} 0755 %{buildroot}/sbin/syslogd %{buildroot}/sbin/klogd +chmod 755 $RPM_BUILD_ROOT/sbin/syslogd +chmod 755 $RPM_BUILD_ROOT/sbin/klogd %clean -%clean_buildroot +rm -rf $RPM_BUILD_ROOT - %post -%groupadd syslog 60 -%useradd syslog 60 syslog -d /var/log -s /bin/false -%service_post -o syslog -for n in /var/log/{messages,secure,maillog,spooler}; do +for n in /var/log/{messages,secure,maillog,spooler} +do [ -f $n ] && continue touch $n - %{__chmod} 640 $n - %{__chown} syslog.syslog $n + chmod 600 $n done +/sbin/chkconfig --add syslog - %preun -%service_preun syslog +if [ $1 = 0 ]; then + service syslog stop >/dev/null 2>&1 + /sbin/chkconfig --del syslog +fi %postun -%service_postun syslog +if [ "$1" -ge "1" ]; then + service syslog condrestart > /dev/null 2>&1 +fi -%triggerpostun -- sysklogd < 1.4.1-36 -if [ -d /var/log/cron ] && [ ! -e /var/log/cron.old ]; then - %{__mv} -f /var/log/cron /var/log/cron.old -fi -%service_postun syslog +%triggerpostun -- sysklogd < 1.3.31-17 +/sbin/chkconfig --add syslog +%triggerpostun -- sysklogd < 1.3.33-5 +/sbin/chkconfig syslog reset %files %defattr(-,root,root) %doc ANNOUNCE CHANGES README* NEWS INSTALL redhat/ChangeLog -%config(noreplace) %{_sysconfdir}/syslog.conf -%config(noreplace) %{_sysconfdir}/sysconfig/syslog -%config %{_sysconfdir}/logrotate.d/syslog -%config %{_initrddir}/syslog +%config(noreplace) /etc/syslog.conf +%config(noreplace) /etc/sysconfig/syslog +%config /etc/logrotate.d/syslog +%config /etc/rc.d/init.d/syslog /sbin/* %{_mandir}/*/* - %changelog +* Sun Jun 20 2004 Florian La Roche +- do not set bsd compat on sockets #123912 +- fix empty log lines #125679 + +* Fri Jun 11 2004 Florian La Roche 1.4.1rh-18 +- make the race for -HUP a little bit smaller + +* Wed Jun 9 2004 Bill Nottingham 1.4.1rh-17 +- don't escape UTF-8 (#89292, #71170, #112519) + * Mon May 3 2004 Bill Nottingham 1.4.1rh-16 - add Owl patch for crunch_list function, fixes potential crashes (#120453) From svn at tinysofa.org Thu Jul 1 15:55:21 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:55:21 +1000 (EST) Subject: [tinysofa-svn] r2848 - in tinysofa/snapshot/syslinux/current: sources specs Message-ID: <20040701155521.637E44E817E@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:55:21 +1000 (Fri, 02 Jul 2004) New Revision: 2848 Added: tinysofa/snapshot/syslinux/current/sources/syslinux-2.08-x86_64.patch Removed: tinysofa/snapshot/syslinux/current/sources/syslinux-2.08-png2pnm.patch Modified: tinysofa/snapshot/syslinux/current/specs/syslinux.spec Log: - Sync with 2.0. - Kept: - syslinux-2.08.tar.bz2: - Added: - syslinux-2.08-x86_64.patch: - Removed: - syslinux-2.08-png2pnm.patch: Deleted: tinysofa/snapshot/syslinux/current/sources/syslinux-2.08-png2pnm.patch =================================================================== --- tinysofa/snapshot/syslinux/current/sources/syslinux-2.08-png2pnm.patch 2004-07-01 15:55:18 UTC (rev 2847) +++ tinysofa/snapshot/syslinux/current/sources/syslinux-2.08-png2pnm.patch 2004-07-01 15:55:21 UTC (rev 2848) @@ -1,11 +0,0 @@ ---- syslinux-2.08/sample/Makefile 2003-12-10 21:44:57.000000000 +0100 -+++ syslinux-2.08-tsl/sample/Makefile 2004-01-10 03:53:36.000000000 +0100 -@@ -54,7 +54,7 @@ - $(RANLIB) $@ - - syslogo.lss: syslogo.png $(PPMTOLSS16) -- pngtopnm syslogo.png | \ -+ png2pnm syslogo.png | \ - $(PPMTOLSS16) \#000000=0 \#d0d0d0=7 \#f6f6f6=15 \ - > syslogo.lss - Added: tinysofa/snapshot/syslinux/current/sources/syslinux-2.08-x86_64.patch =================================================================== --- tinysofa/snapshot/syslinux/current/sources/syslinux-2.08-x86_64.patch 2004-07-01 15:55:18 UTC (rev 2847) +++ tinysofa/snapshot/syslinux/current/sources/syslinux-2.08-x86_64.patch 2004-07-01 15:55:21 UTC (rev 2848) @@ -0,0 +1,25 @@ +--- syslinux-2.08/sample/Makefile.x86_64 2003-12-10 15:44:57.000000000 -0500 ++++ syslinux-2.08/sample/Makefile 2003-12-14 17:26:35.142040434 -0500 +@@ -29,6 +29,13 @@ + + LIBOBJS = conio.o atou.o skipatou.o printf.o + ++ARCH := $(shell uname -m) ++ifneq (x86_64, $ARCH) ++CFLAGS += -m32 ++SFLAGS += -m32 ++LDFLAGS += -m elf_i386 ++endif ++ + .SUFFIXES: .lss .c .o .elf .c32 + + all: syslogo.lss comecho.com hello.c32 hello2.c32 filetest.c32 c32echo.c32 fd.c32 chain.c32 +@@ -40,7 +47,7 @@ + $(CC) $(CFLAGS) -c -o $@ $< + + %.elf: c32entry.o %.o $(LIB) +- $(LD) -Ttext 0x101000 -e _start -o $@ $^ ++ $(LD) $(LDFLAGS) -Ttext 0x101000 -e _start -o $@ $^ + + %.c32: %.elf + $(OBJCOPY) -O binary $< $@ Modified: tinysofa/snapshot/syslinux/current/specs/syslinux.spec =================================================================== --- tinysofa/snapshot/syslinux/current/specs/syslinux.spec 2004-07-01 15:55:18 UTC (rev 2847) +++ tinysofa/snapshot/syslinux/current/specs/syslinux.spec 2004-07-01 15:55:21 UTC (rev 2848) @@ -1,110 +1,137 @@ -Summary: Kernel loader which uses a FAT or iso9660 filesystem or a PXE network -Name: syslinux +Summary: Simple kernel loader which boots from a FAT filesystem +Name: syslinux Version: 2.08 -Release: 6ts +Release: 4ts License: GPL -Group: tinysofa official +Group: Applications/System Source0: ftp://ftp.kernel.org/pub/linux/utils/boot/syslinux/%{name}-%{version}.tar.bz2 -Patch: syslinux-2.08-png2pnm.patch -ExclusiveArch: i386 i586 x86_64 -BuildRoot: %{_tmppath}/%{name}-root -BuildPrereq: nasm >= 0.98.35, perl, libpng-tools +Patch0: syslinux-2.08-x86_64.patch +ExclusiveArch: i386 x86_64 +Buildroot: %{_tmppath}/%{name}-%{version}-root +BuildPrereq: nasm, perl, netpbm-progs +%ifarch i386 +Autoreq: 0 +Requires: libc.so.6 +Requires: mtools +%endif +%ifarch x86_64 +Autoreq: 0 +Requires: libc.so.6()(64bit) +Requires: mtools +%endif %description Syslinux is a simple kernel loader. It normally loads the kernel (and an optional initrd image) from a FAT filesystem. It can also be used as a -PXE bootloader during network boots (PXELINUX), or for booting from -ISO 9660 CD-ROMs (ISOLINUX). +PXE bootloader during network boots. -%package tools -Summary: additional components for syslinux -Group: tinysofa official -Requires: %{name} = %{version} - -%description tools -Some additional tools you sometimes need for syslinux. - - %prep %setup -q -n syslinux-%{version} -%patch -p1 +%patch0 -p1 -b .x86_64 %build -make DATE="$(echo `date +%%m-%%d-%%Y` tinysofa build)" \ - CC="gcc %{?no_stack_protector}" clean -make DATE="$(echo `date +%%m-%%d-%%Y` tinysofa build)" \ - CC="gcc %{?no_stack_protector}" installer -mv syslinux syslinux-mtools -mv syslinux-nomtools syslinux +make clean +make installer %install -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} -mkdir -p $RPM_BUILD_ROOT%{_bindir} -mkdir -p $RPM_BUILD_ROOT%{_libdir}/syslinux -mkdir -p $RPM_BUILD_ROOT%{_includedir} -make install install-lib \ - INSTALLROOT=%{buildroot} BINDIR=%{_bindir} \ - LIBDIR=%{_libdir} INCDIR=%{_includedir} -install -m 644 sample/mdiskchk.com $RPM_BUILD_ROOT%{_libdir}/syslinux/ +mkdir -p %{buildroot}%{_bindir} +mkdir -p %{buildroot}%{_libdir}/syslinux +mkdir -p %{buildroot}%{_includedir} +make INSTALLROOT=%{buildroot} install install-lib \ + INSTALLROOT=%{buildroot} BINDIR=%{_bindir} \ + LIBDIR=%{_prefix}/lib INCDIR=%{_includedir} +cp mkdiskimage sys2ansi.pl keytab-lilo.pl %{buildroot}%{_prefix}/lib/syslinux +install -m 755 syslinux-nomtools %{buildroot}%{_prefix}/lib/syslinux +mkdir -p %{buildroot}/%{_docdir}/%{name}-%{version}/sample +install -m 644 sample/sample.* %{buildroot}/%{_docdir}/%{name}-%{version}/sample/ + +# don't ship libsyslinux, at least, not for now +rm -f %{buildroot}%{_prefix}/lib/libsyslinux* +rm -f %{buildroot}%{_includedir}/syslinux.h + %clean -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT +rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) -%doc NEWS README *.doc memdisk/*.doc COPYING -%doc sample/sample.msg sample/syslogo.lss sample/syslogo.png +%doc NEWS README TODO COPYING +%doc distrib.doc isolinux.doc pxelinux.doc syslinux.doc memdisk/memdisk.doc +%{_bindir}/lss16toppm +%{_bindir}/ppmtolss16 %{_bindir}/syslinux -%{_libdir}/syslinux/pxelinux.0 -%{_libdir}/syslinux/isolinux.bin - -%files tools -%defattr(-,root,root) +%{_prefix}/lib/syslinux %{_bindir}/gethostip -%{_bindir}/ppmtolss16 -%{_bindir}/lss16toppm -%{_libdir}/syslinux/isolinux-debug.bin -%{_libdir}/syslinux/syslinux.com -%{_libdir}/syslinux/syslinux.exe -%{_libdir}/syslinux/copybs.com -%{_libdir}/syslinux/memdisk -%{_libdir}/syslinux/mdiskchk.com -%exclude %{_includedir}/syslinux.h -%exclude %{_libdir}/libsyslinux.a -%exclude %{_libdir}/libsyslinux.so* - %changelog -* Wed May 19 2004 tsintegrate 2.08-6ts -- current (2.08-5ts) integrated as 2.08-6ts for release 1.0-U1 +* Tue Jun 15 2004 Elliot Lee +- rebuilt -* Fri Jan 30 2004 Oystein Viggen 2.08-2tr -- Won't build with stack protector +* Sat Apr 17 2004 Jeremy Katz 2.0.8-3 +- add syslinux-nomtools binary to be used for creating some installer images -* Sat Jan 10 2004 Goetz Bock 2.08-1bg -- new upstream: 2.08 -- include isolinux, and add tools subpackage +* Tue Feb 17 2004 Jeremy Katz +- add netpbm-progs BuildRequires (#110255) -* Wed Dec 10 2003 Erlend Midttun 1.67-7tr -- Big rebuild +* Fri Feb 13 2004 Elliot Lee +- rebuilt -* Sat Jul 5 2003 Gerald Dachs 1.67-6gd -- Added pxelinux.0 to %files -- fixed bug that installs files to /usr/lib/syslinux during rpm build! +* Sun Dec 14 2003 Jeremy Katz 2.08-1 +- 2.08 -* Wed Jun 18 2003 Erlend Midttun 1.67-5tr -- Big rebuild +* Fri Aug 22 2003 Jeremy Katz 2.06-1 +- 2.06 -* Mon May 19 2003 Erlend Midttun 1.67-4em -- Now even compiles with GCC 3.3 +* Thu Aug 14 2003 Jeremy Katz 2.05-1 +- update to 2.05 -* Mon Mar 24 2003 Erlend Midttun 1.67-3em -- Rebuilt against glibc 2.3.2. +* Mon Apr 21 2003 Jeremy Katz 2.04-2 +- add patch for samples to build on x86_64 +- integrate some changes from upstream specfile (#88593) -* Sat Feb 01 2003 Tor Hveem 1.67-2th -- fixed package Group +* Fri Apr 18 2003 Jeremy Katz 2.04-1 +- update to 2.04 +* Mon Feb 3 2003 Jeremy Katz 2.01-1 +- update to 2.01 + +* Wed Jan 22 2003 Tim Powers +- rebuilt + +* Tue Jan 14 2003 Jeremy Katz 2.00-3 +- fix deps for x86_64 + +* Wed Nov 27 2002 Tim Powers 2.00-2 +- build on both x86_64 and i386 + +* Fri Nov 1 2002 Jeremy Katz +- update to 2.00 +- add additional files as requested by hpa (#68073) + +* Fri Jun 21 2002 Tim Powers +- automated rebuild + +* Tue Jun 18 2002 Jeremy Katz +- lss16toppm and ppmtolss16 are both perl scripts... turn off find-requires + so we don't suck in perl as a dependency for syslinux + +* Mon Jun 17 2002 Jeremy Katz +- update to 1.75 +- include tools to create graphical image format needed by syslinux +- include isolinux +- include pxelinux (#64942) + +* Fri Jun 14 2002 Preston Brown +- upgrade to latest version w/graphical screen support + +* Thu May 23 2002 Tim Powers +- automated rebuild + +* Wed Jan 09 2002 Tim Powers +- automated rebuild + * Sun Jun 24 2001 Elliot Lee - Bump release + rebuild. @@ -142,4 +169,4 @@ - added BuildRequires * Tue Apr 04 2000 Erik Troan -- initial packaging \ No newline at end of file +- initial packaging From svn at tinysofa.org Thu Jul 1 15:55:39 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:55:39 +1000 (EST) Subject: [tinysofa-svn] r2852 - in tinysofa/snapshot/tcsh/current: sources specs Message-ID: <20040701155539.239B44E817E@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:55:38 +1000 (Fri, 02 Jul 2004) New Revision: 2852 Added: tinysofa/snapshot/tcsh/current/sources/tcsh-6.08.00-pathmax.patch tinysofa/snapshot/tcsh/current/sources/tcsh-6.08.00-security.patch tinysofa/snapshot/tcsh/current/sources/tcsh-6.09.00-locale.patch tinysofa/snapshot/tcsh/current/sources/tcsh-6.09.00-strcoll.patch tinysofa/snapshot/tcsh/current/sources/tcsh-6.09.00-termios.patch tinysofa/snapshot/tcsh/current/sources/tcsh-6.10.00-dspmbyte.patch tinysofa/snapshot/tcsh/current/sources/tcsh-6.10.00-glibc_compat.patch tinysofa/snapshot/tcsh/current/sources/tcsh-6.10.00-utmp.patch tinysofa/snapshot/tcsh/current/sources/tcsh-6.11.00-termcap.patch tinysofa/snapshot/tcsh/current/sources/tcsh-6.12.00-setpgrp.patch Removed: tinysofa/snapshot/tcsh/current/sources/tcsh-6.10-pathmax.patch tinysofa/snapshot/tcsh/current/sources/tcsh-6.10-termios.patch tinysofa/snapshot/tcsh/current/sources/tcsh-6.10-utmp.patch Modified: tinysofa/snapshot/tcsh/current/specs/tcsh.spec Log: - Sync with 2.0. - Kept: - tcsh-6.12.00.tar.gz: - Added: - tcsh-6.08.00-pathmax.patch: - tcsh-6.08.00-security.patch: - tcsh-6.09.00-locale.patch: - tcsh-6.09.00-strcoll.patch: - tcsh-6.09.00-termios.patch: - tcsh-6.10.00-dspmbyte.patch: - tcsh-6.10.00-glibc_compat.patch: - tcsh-6.10.00-utmp.patch: - tcsh-6.11.00-termcap.patch: - tcsh-6.12.00-setpgrp.patch: - Removed: - tcsh-6.10-pathmax.patch: - tcsh-6.10-termios.patch: - tcsh-6.10-utmp.patch: Added: tinysofa/snapshot/tcsh/current/sources/tcsh-6.08.00-pathmax.patch =================================================================== --- tinysofa/snapshot/tcsh/current/sources/tcsh-6.08.00-pathmax.patch 2004-07-01 15:55:30 UTC (rev 2851) +++ tinysofa/snapshot/tcsh/current/sources/tcsh-6.08.00-pathmax.patch 2004-07-01 15:55:38 UTC (rev 2852) @@ -0,0 +1,25 @@ +--- tcsh-6.08.00/tw.h~ Thu Oct 2 12:36:35 1997 ++++ tcsh-6.08.00/tw.h Wed Feb 24 21:36:01 1999 +@@ -77,7 +77,7 @@ + #endif + #define ON 1 + #define OFF 0 +-#define FILSIZ 512 /* Max reasonable file name length */ ++#define FILSIZ MAXPATHLEN /* Max reasonable file name length */ + #define ESC CTL_ESC('\033') + #define equal(a, b) (strcmp(a, b) == 0) + +--- tcsh-6.08.00/sh.h~ Wed Feb 24 21:32:40 1999 ++++ tcsh-6.08.00/sh.h Wed Feb 24 21:42:48 1999 +@@ -507,6 +507,11 @@ + * April, 1980 + */ + ++#if !defined(MAXNAMLEN) && defined(PATH_MAX) ++# error "Sucker" ++# define MAXNAMLEN PATH_MAX ++#endif /* MAXNAMLEN */ ++ + #if !defined(MAXNAMLEN) && defined(_D_NAME_MAX) + # define MAXNAMLEN _D_NAME_MAX + #endif /* MAXNAMLEN */ Added: tinysofa/snapshot/tcsh/current/sources/tcsh-6.08.00-security.patch =================================================================== --- tinysofa/snapshot/tcsh/current/sources/tcsh-6.08.00-security.patch 2004-07-01 15:55:30 UTC (rev 2851) +++ tinysofa/snapshot/tcsh/current/sources/tcsh-6.08.00-security.patch 2004-07-01 15:55:38 UTC (rev 2852) @@ -0,0 +1,21 @@ +--- tcsh-6.08.00/sh.dir.c.security Sat Sep 26 08:28:29 1998 ++++ tcsh-6.08.00/sh.dir.c Wed Feb 24 22:16:14 1999 +@@ -35,6 +35,7 @@ + * SUCH DAMAGE. + */ + #include "sh.h" ++#include "tw.h" + + RCSID("$Id: sh.dir.c,v 3.51 1998/09/26 12:28:29 christos Exp $") + +@@ -1268,7 +1269,9 @@ + return (0); + } + } +- (void) Strcpy(s, dp->di_name); ++ ++ (void) Strncpy(s, dp->di_name, FILSIZ); ++ s[FILSIZ-1]=0; + return (1); + } + Added: tinysofa/snapshot/tcsh/current/sources/tcsh-6.09.00-locale.patch =================================================================== --- tinysofa/snapshot/tcsh/current/sources/tcsh-6.09.00-locale.patch 2004-07-01 15:55:30 UTC (rev 2851) +++ tinysofa/snapshot/tcsh/current/sources/tcsh-6.09.00-locale.patch 2004-07-01 15:55:38 UTC (rev 2852) @@ -0,0 +1,19 @@ +--- tcsh-6.09.00/config_f.h.locale Thu Jun 15 10:19:21 2000 ++++ tcsh-6.09.00/config_f.h Thu Jun 15 10:20:49 2000 +@@ -117,14 +117,14 @@ + * be used with SHORT_STRINGS + * + */ +-#undef KANJI ++#define KANJI + + /* + * DSPMBYTE add variable "dspmbyte" and display multi-byte string at + * only output, when "dspmbyte" is set. Should be used with + * KANJI + */ +-#undef DSPMBYTE ++#define DSPMBYTE + + /* + * MBYTEDEBUG when "dspmbyte" is changed, set multi-byte checktable to Added: tinysofa/snapshot/tcsh/current/sources/tcsh-6.09.00-strcoll.patch =================================================================== --- tinysofa/snapshot/tcsh/current/sources/tcsh-6.09.00-strcoll.patch 2004-07-01 15:55:30 UTC (rev 2851) +++ tinysofa/snapshot/tcsh/current/sources/tcsh-6.09.00-strcoll.patch 2004-07-01 15:55:38 UTC (rev 2852) @@ -0,0 +1,11 @@ +--- tcsh-6.09.00/glob.c.strcoll Mon Jan 10 15:45:11 2000 ++++ tcsh-6.09.00/glob.c Mon Jan 10 15:46:18 2000 +@@ -158,6 +158,8 @@ + + if (c1 == c2) + return (0); ++ if (islower(c1) && isupper(c2)) ++ return (1); + s1[0] = c1; + s2[0] = c2; + s1[1] = s2[1] = '\0'; Added: tinysofa/snapshot/tcsh/current/sources/tcsh-6.09.00-termios.patch =================================================================== --- tinysofa/snapshot/tcsh/current/sources/tcsh-6.09.00-termios.patch 2004-07-01 15:55:30 UTC (rev 2851) +++ tinysofa/snapshot/tcsh/current/sources/tcsh-6.09.00-termios.patch 2004-07-01 15:55:38 UTC (rev 2852) @@ -0,0 +1,33 @@ +--- tcsh-6.09.00/sh.h.termios Sun Oct 25 10:10:16 1998 ++++ tcsh-6.09.00/sh.h Mon Jan 10 15:38:40 2000 +@@ -204,6 +204,8 @@ + # define DEV_DEV_COMPARE(x,y) ((x) == (y)) + #endif /* DEV_DEV_COMPARE */ + ++#define POSIX ++ + #ifdef _SEQUENT_ + # include + #endif /* _SEQUENT_ */ +@@ -249,12 +251,10 @@ + # else + # include + # endif /* _UWIN */ +-# if SYSVREL > 3 + # undef TIOCGLTC /* we don't need those, since POSIX has them */ + # undef TIOCSLTC + # undef CSWTCH + # define CSWTCH _POSIX_VDISABLE /* So job control works */ +-# endif /* SYSVREL > 3 */ + # endif /* POSIX */ + #endif /* WINNT */ + +@@ -312,6 +312,8 @@ + #if !((defined(SUNOS4) || defined(_MINIX) /* || defined(DECOSF1) */) && defined(TERMIO)) + # if !defined(COHERENT) && !defined(_VMS_POSIX) && !defined(WINNT) + # include ++# undef TIOCGLTC /* we don't need those, since POSIX has them */ ++# undef TIOCSLTC + # endif + #endif + Deleted: tinysofa/snapshot/tcsh/current/sources/tcsh-6.10-pathmax.patch =================================================================== --- tinysofa/snapshot/tcsh/current/sources/tcsh-6.10-pathmax.patch 2004-07-01 15:55:30 UTC (rev 2851) +++ tinysofa/snapshot/tcsh/current/sources/tcsh-6.10-pathmax.patch 2004-07-01 15:55:38 UTC (rev 2852) @@ -1,27 +0,0 @@ -diff -Nur tcsh-6.10.00.orig/sh.h tcsh-6.10.00/sh.h ---- tcsh-6.10.00.orig/sh.h Sun Nov 19 21:50:43 2000 -+++ tcsh-6.10.00/sh.h Tue Mar 13 15:19:10 2001 -@@ -528,6 +528,11 @@ - * April, 1980 - */ - -+#if !defined(MAXNAMLEN) && defined(PATH_MAX) -+# error "Sucker" -+# define MAXNAMLEN PATH_MAX -+#endif /* MAXNAMLEN */ -+ - #if !defined(MAXNAMLEN) && defined(_D_NAME_MAX) - # define MAXNAMLEN _D_NAME_MAX - #endif /* MAXNAMLEN */ -diff -Nur tcsh-6.10.00.orig/tw.h tcsh-6.10.00/tw.h ---- tcsh-6.10.00.orig/tw.h Tue Jul 4 21:45:02 2000 -+++ tcsh-6.10.00/tw.h Tue Mar 13 15:18:39 2001 -@@ -77,7 +77,7 @@ - #endif - #define ON 1 - #define OFF 0 --#define FILSIZ BUFSIZE /* Max reasonable file name length */ -+#define FILSIZ MAXPATHLEN /* Max reasonable file name length */ - #define ESC CTL_ESC('\033') - #define equal(a, b) (strcmp(a, b) == 0) - Deleted: tinysofa/snapshot/tcsh/current/sources/tcsh-6.10-termios.patch =================================================================== --- tinysofa/snapshot/tcsh/current/sources/tcsh-6.10-termios.patch 2004-07-01 15:55:30 UTC (rev 2851) +++ tinysofa/snapshot/tcsh/current/sources/tcsh-6.10-termios.patch 2004-07-01 15:55:38 UTC (rev 2852) @@ -1,34 +0,0 @@ -diff -Nur tcsh-6.10.00.orig/sh.h tcsh-6.10.00/sh.h ---- tcsh-6.10.00.orig/sh.h Sun Nov 19 21:50:43 2000 -+++ tcsh-6.10.00/sh.h Tue Mar 13 15:00:36 2001 -@@ -204,6 +204,8 @@ - # define DEV_DEV_COMPARE(x,y) ((x) == (y)) - #endif /* DEV_DEV_COMPARE */ - -+#define POSIX -+ - #ifdef _SEQUENT_ - # include - #endif /* _SEQUENT_ */ -@@ -249,12 +251,10 @@ - # else - # include - # endif /* _UWIN */ --# if SYSVREL > 3 - # undef TIOCGLTC /* we don't need those, since POSIX has them */ - # undef TIOCSLTC - # undef CSWTCH - # define CSWTCH _POSIX_VDISABLE /* So job control works */ --# endif /* SYSVREL > 3 */ - # endif /* POSIX */ - #endif /* WINNT_NATIVE */ - -@@ -312,6 +312,8 @@ - #if !((defined(SUNOS4) || defined(_MINIX) /* || defined(DECOSF1) */) && defined(TERMIO)) - # if !defined(COHERENT) && !defined(_VMS_POSIX) && !defined(WINNT_NATIVE) - # include -+# undef TIOCGLTC /* we don't need those, since POSIX has them */ -+# undef TIOCSLTC - # endif - #endif - Deleted: tinysofa/snapshot/tcsh/current/sources/tcsh-6.10-utmp.patch =================================================================== --- tinysofa/snapshot/tcsh/current/sources/tcsh-6.10-utmp.patch 2004-07-01 15:55:30 UTC (rev 2851) +++ tinysofa/snapshot/tcsh/current/sources/tcsh-6.10-utmp.patch 2004-07-01 15:55:38 UTC (rev 2852) @@ -1,61 +0,0 @@ -diff -Nur tcsh-6.10.00.orig/tc.who.c tcsh-6.10.00/tc.who.c ---- tcsh-6.10.00.orig/tc.who.c Sun Nov 12 03:18:07 2000 -+++ tcsh-6.10.00/tc.who.c Tue Mar 13 14:56:59 2001 -@@ -167,12 +167,13 @@ - watch_login(force) - int force; - { -- int utmpfd, comp = -1, alldone; -+ int comp = -1, alldone; - int firsttime = stlast == 1; - #ifdef BSDSIGS - sigmask_t omask; - #endif /* BSDSIGS */ - struct utmp utmp; -+ struct utmp *uptr; - struct who *wp, *wpnew; - struct varent *v; - Char **vp = NULL; -@@ -265,18 +266,9 @@ - return; - } - stlast = sta.st_mtime; -- if ((utmpfd = open(_PATH_UTMP, O_RDONLY)) < 0) { -- if (!force) -- xprintf(CGETS(26, 2, -- "%s cannot be opened. Please \"unset watch\".\n"), -- _PATH_UTMP); --# ifdef BSDSIGS -- (void) sigsetmask(omask); --# else -- (void) sigrelse(SIGINT); --# endif -- return; -- } -+ -+ utmpname( _PATH_UTMP ); -+ setutent(); - - /* - * xterm clears the entire utmp entry - mark everyone on the status list -@@ -291,7 +283,10 @@ - * Read in the utmp file, sort the entries, and update existing entries or - * add new entries to the status list. - */ -- while (read(utmpfd, (char *) &utmp, sizeof utmp) == sizeof utmp) { -+ -+ -+ while ((uptr = getutent())) { -+ memcpy(&utmp, uptr, sizeof(utmp)); - - # ifdef DEAD_PROCESS - # ifndef IRIS4D -@@ -387,7 +382,7 @@ - wp->who_prev = wpnew; /* linked in now */ - } - } -- (void) close(utmpfd); -+ endutent(); - # if defined(UTHOST) && defined(_SEQUENT_) - endutent(); - # endif Added: tinysofa/snapshot/tcsh/current/sources/tcsh-6.10.00-dspmbyte.patch =================================================================== --- tinysofa/snapshot/tcsh/current/sources/tcsh-6.10.00-dspmbyte.patch 2004-07-01 15:55:30 UTC (rev 2851) +++ tinysofa/snapshot/tcsh/current/sources/tcsh-6.10.00-dspmbyte.patch 2004-07-01 15:55:38 UTC (rev 2852) @@ -0,0 +1,21 @@ +diff -ruN tcsh-6.10.00.orig/sh.set.c tcsh-6.10.00/sh.set.c +--- tcsh-6.10.00.orig/sh.set.c Wed Mar 28 16:44:53 2001 ++++ tcsh-6.10.00/sh.set.c Wed Mar 28 16:53:23 2001 +@@ -41,6 +41,8 @@ + #include "ed.h" + #include "tw.h" + ++#include ++ + extern Char HistLit; + extern bool GotTermCaps; + +@@ -1211,7 +1213,7 @@ + return; + + for (i = 0; dspmt[i].n; i++) { +- if (eq(pcp, dspmt[i].n)) { ++ if (strncasecmp (pcp, dspmt[i].n, strlen (dspmt[i].n))) { + set(CHECK_MBYTEVAR, Strsave(dspmt[i].v), VAR_READWRITE); + update_dspmbyte_vars(); + break; Added: tinysofa/snapshot/tcsh/current/sources/tcsh-6.10.00-glibc_compat.patch =================================================================== --- tinysofa/snapshot/tcsh/current/sources/tcsh-6.10.00-glibc_compat.patch 2004-07-01 15:55:30 UTC (rev 2851) +++ tinysofa/snapshot/tcsh/current/sources/tcsh-6.10.00-glibc_compat.patch 2004-07-01 15:55:38 UTC (rev 2852) @@ -0,0 +1,11 @@ +--- tcsh-6.10.00/sh.h Sun Nov 19 15:50:43 2000 ++++ tcsh-6.10.00/sh.h.new Tue Feb 6 15:11:33 2001 +@@ -208,7 +208,7 @@ + # include + #endif /* _SEQUENT_ */ + #if (defined(POSIX) || SYSVREL > 0) && !defined(WINNT_NATIVE) +-# include ++# include + #endif /* (POSIX || SYSVREL > 0) && !WINNT_NATIVE */ + + #ifdef NLS Added: tinysofa/snapshot/tcsh/current/sources/tcsh-6.10.00-utmp.patch =================================================================== --- tinysofa/snapshot/tcsh/current/sources/tcsh-6.10.00-utmp.patch 2004-07-01 15:55:30 UTC (rev 2851) +++ tinysofa/snapshot/tcsh/current/sources/tcsh-6.10.00-utmp.patch 2004-07-01 15:55:38 UTC (rev 2852) @@ -0,0 +1,61 @@ +Use libc's built-in getutXXX() functions for manipulating the file. + +--- tcsh-6.10.00/tc.who.c.utmp Sat Nov 11 21:18:07 2000 ++++ tcsh-6.10.00/tc.who.c Thu Nov 30 15:03:23 2000 +@@ -167,12 +167,13 @@ + watch_login(force) + int force; + { +- int utmpfd, comp = -1, alldone; ++ int comp = -1, alldone; + int firsttime = stlast == 1; + #ifdef BSDSIGS + sigmask_t omask; + #endif /* BSDSIGS */ + struct utmp utmp; ++ struct utmp *uptr; + struct who *wp, *wpnew; + struct varent *v; + Char **vp = NULL; +@@ -265,18 +266,9 @@ + return; + } + stlast = sta.st_mtime; +- if ((utmpfd = open(_PATH_UTMP, O_RDONLY)) < 0) { +- if (!force) +- xprintf(CGETS(26, 2, +- "%s cannot be opened. Please \"unset watch\".\n"), +- _PATH_UTMP); +-# ifdef BSDSIGS +- (void) sigsetmask(omask); +-# else +- (void) sigrelse(SIGINT); +-# endif +- return; +- } ++ ++ utmpname( _PATH_UTMP ); ++ setutent(); + + /* + * xterm clears the entire utmp entry - mark everyone on the status list +@@ -291,7 +283,9 @@ + * Read in the utmp file, sort the entries, and update existing entries or + * add new entries to the status list. + */ +- while (read(utmpfd, (char *) &utmp, sizeof utmp) == sizeof utmp) { ++ ++ while ((uptr = getutent())) { ++ memcpy(&utmp, uptr, sizeof(utmp)); + + # ifdef DEAD_PROCESS + # ifndef IRIS4D +@@ -387,7 +381,7 @@ + wp->who_prev = wpnew; /* linked in now */ + } + } +- (void) close(utmpfd); ++ endutent(); + # if defined(UTHOST) && defined(_SEQUENT_) + endutent(); + # endif Added: tinysofa/snapshot/tcsh/current/sources/tcsh-6.11.00-termcap.patch =================================================================== --- tinysofa/snapshot/tcsh/current/sources/tcsh-6.11.00-termcap.patch 2004-07-01 15:55:30 UTC (rev 2851) +++ tinysofa/snapshot/tcsh/current/sources/tcsh-6.11.00-termcap.patch 2004-07-01 15:55:38 UTC (rev 2852) @@ -0,0 +1,12 @@ +Prefer libtermcap to libncurses for the shell. +--- tcsh-6.11.00/configure.in 2002-06-05 10:50:07.000000000 -0400 ++++ tcsh-6.11.00/configure.in 2002-06-05 10:50:03.000000000 -0400 +@@ -253,7 +253,7 @@ + esac + + AC_SEARCH_LIBS(crypt, crypt) +-AC_SEARCH_LIBS(tgetent, termlib curses termcap) ++AC_SEARCH_LIBS(tgetent, termlib termcap curses) + AC_SEARCH_LIBS(gethostbyname, nsl) + AC_SEARCH_LIBS(connect, socket) + Added: tinysofa/snapshot/tcsh/current/sources/tcsh-6.12.00-setpgrp.patch =================================================================== --- tinysofa/snapshot/tcsh/current/sources/tcsh-6.12.00-setpgrp.patch 2004-07-01 15:55:30 UTC (rev 2851) +++ tinysofa/snapshot/tcsh/current/sources/tcsh-6.12.00-setpgrp.patch 2004-07-01 15:55:38 UTC (rev 2852) @@ -0,0 +1,14 @@ +Don't include our own declaration of setpgrp if the system defines prototypes +for SysV functions (like setpgrp()). Not sure if this is the Right fix or not. +--- tcsh-6.12.00/sh.h 2004-02-10 11:35:44.000000000 -0500 ++++ tcsh-6.12.00/sh.h 2004-02-10 11:35:40.000000000 -0500 +@@ -474,7 +474,9 @@ + extern pid_t getpgrp __P((void)); + # endif /* BSD || SUNOS4 || IRISD || DGUX */ + # endif /* POSIX */ ++#ifndef _SVID_SOURCE + extern pid_t setpgrp __P((pid_t, pid_t)); ++#endif + #endif /* !WINNT_NATIVE */ + + typedef sigret_t (*signalfun_t) __P((int)); Modified: tinysofa/snapshot/tcsh/current/specs/tcsh.spec =================================================================== --- tinysofa/snapshot/tcsh/current/specs/tcsh.spec 2004-07-01 15:55:30 UTC (rev 2851) +++ tinysofa/snapshot/tcsh/current/specs/tcsh.spec 2004-07-01 15:55:38 UTC (rev 2852) @@ -1,23 +1,27 @@ -#ugly hack -%define _noVersionedDependencies 1 +%define _bindir /bin Summary: An enhanced version of csh, the C shell. Name: tcsh Version: 6.12 Release: 9ts License: distributable -Group: tinysofa official +Group: System Environment/Shells Source: ftp://ftp.astron.com/pub/tcsh/tcsh-%{version}.00.tar.gz -Patch0: tcsh-6.10-utmp.patch -Patch1: tcsh-6.10-termios.patch -Patch2: tcsh-6.10-pathmax.patch +Patch0: tcsh-6.10.00-utmp.patch +Patch1: tcsh-6.09.00-termios.patch +Patch2: tcsh-6.08.00-security.patch +Patch3: tcsh-6.08.00-pathmax.patch +Patch4: tcsh-6.09.00-strcoll.patch +Patch5: tcsh-6.09.00-locale.patch +Patch6: tcsh-6.10.00-glibc_compat.patch +Patch7: tcsh-6.10.00-dspmbyte.patch +Patch8: tcsh-6.11.00-termcap.patch +Patch9: tcsh-6.12.00-setpgrp.patch Provides: csh = %{version} -Requires: rpm >= 3.0.6 -Requires: libtermcap -Prereq: coreutils grep -URL: http://www.primate.wisc.edu/software/csh-tcsh-book/ -BuildRoot: %{_tmppath}/%{name}-root -BuildRequires: libtermcap-devel groff +Prereq: fileutils, grep +URL: http://www.tcsh.org/ +Buildroot: %{_tmppath}/%{name}-%{version}-root +BuildPrereq: groff, libtermcap-devel %description Tcsh is an enhanced but completely compatible version of csh, the C @@ -29,77 +33,175 @@ %prep %setup -q -n %{name}-%{version}.00 -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 +%patch0 -p1 -b .utmp +%patch1 -p1 -b .termios +# upstreamed in 6.10.00 +#%patch2 -p1 -b .security +# XXX not applied +#%patch3 -p1 -b .pathmax +# upstreamed in 6.10.00 +#%patch4 -p1 -b .strcoll +%patch5 -p1 -b .locale +%patch6 -p1 -b .glibc_compat +%patch7 -p1 -b .mbyte +%patch8 -p1 -b .termcap +%patch9 -p1 -b .setpgrp +nroff -me eight-bit.me > eight-bit.txt +autoreconf +cat > catalogs << _EOF +de ISO-8859-1 german +el ISO-8859-7 greek +en ISO-8859-1 C +es ISO-8859-1 spanish +et ISO-8859-1 et +fi ISO-8859-1 finnish +fr ISO-8859-1 french +it ISO-8859-1 italian +ja eucJP ja +pl ISO-8859-2 pl +ru ISO-8859-5 russian +uk ISO-8859-1 ukrainian +_EOF + +cat catalogs | while read lang charset language ; do + if ! grep -q '^$ codeset=' nls/$language/set1 ; then + echo '$ codeset='$charset > nls/$language/set1.codeset + cat nls/$language/set1 >> nls/$language/set1.codeset + cat nls/$language/set1.codeset > nls/$language/set1 + rm nls/$language/set1.codeset + fi +done + %build -%configure --bindir=/bin -make LIBES="-lnsl -ltermcap -lcrypt" +cp /usr/share/libtool/config.{sub,guess} . +%ifarch x86_64 +# Workaround for problem with gcc-3.2.1-1 as of 2002-12-05 -ECL +export CFLAGS="-O1 -fPIC" +%endif +%configure --without-hesiod +make all +%{__perl} tcsh.man2html +make -C nls catalogs %install -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != "/" ] && rm -rf "$RPM_BUILD_ROOT" -mkdir -p $RPM_BUILD_ROOT/usr/share/man/man1 $RPM_BUILD_ROOT/bin -install -m 755 -s tcsh $RPM_BUILD_ROOT/bin/tcsh -install -m 644 tcsh.man $RPM_BUILD_ROOT/usr/share/man/man1/tcsh.1 -ln -sf tcsh $RPM_BUILD_ROOT/bin/csh -nroff -me eight-bit.me > eight-bit.txt +[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf ${RPM_BUILD_ROOT} +mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man1 ${RPM_BUILD_ROOT}%{_bindir} +install -m 755 tcsh ${RPM_BUILD_ROOT}%{_bindir}/tcsh +install -m 644 tcsh.man ${RPM_BUILD_ROOT}%{_mandir}/man1/tcsh.1 +ln -sf tcsh ${RPM_BUILD_ROOT}%{_bindir}/csh +ln -sf tcsh.1 ${RPM_BUILD_ROOT}%{_mandir}/man1/csh.1 +cat catalogs | while read lang charset language ; do + dest=${RPM_BUILD_ROOT}%{_datadir}/locale/$lang/LC_MESSAGES + if test -f tcsh.$language.cat ; then + mkdir -p $dest + install -m644 tcsh.$language.cat $dest/tcsh + fi +done %clean -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT +[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf ${RPM_BUILD_ROOT} %post if [ ! -f /etc/shells ]; then - echo "/bin/tcsh" >> /etc/shells - echo "/bin/csh" >> /etc/shells + echo "%{_bindir}/tcsh" >> /etc/shells + echo "%{_bindir}/csh" >> /etc/shells else - grep '^/bin/tcsh$' /etc/shells > /dev/null || echo "/bin/tcsh" >> /etc/shells - grep '^/bin/csh$' /etc/shells > /dev/null || echo "/bin/csh" >> /etc/shells + grep -q '^%{_bindir}/tcsh$' /etc/shells || \ + echo "%{_bindir}/tcsh" >> /etc/shells + grep -q '^%{_bindir}/csh$' /etc/shells || \ + echo "%{_bindir}/csh" >> /etc/shells fi %postun -if [ ! -x /bin/tcsh ]; then - grep -v '^/bin/tcsh$' /etc/shells | grep -v '^/bin/csh$'> /etc/shells.rpm - mv /etc/shells.rpm /etc/shells +if [ ! -x %{_bindir}/tcsh ]; then + grep -v '^%{_bindir}/tcsh$' /etc/shells | \ + grep -v '^%{_bindir}/csh$' > /etc/shells.rpm + cat /etc/shells.rpm > /etc/shells && rm /etc/shells.rpm fi %files %defattr(-,root,root) -%doc NewThings FAQ eight-bit.txt complete.tcsh -/bin/tcsh -/bin/csh -/usr/share/man/man1/tcsh.* +%doc FAQ Fixes NewThings complete.tcsh eight-bit.txt tcsh.html +%{_bindir}/tcsh +%{_bindir}/csh +%{_mandir}/*/* +%lang(de) %{_datadir}/locale/de/LC_MESSAGES/tcsh* +%lang(el) %{_datadir}/locale/el/LC_MESSAGES/tcsh* +%lang(en) %{_datadir}/locale/en/LC_MESSAGES/tcsh* +%lang(es) %{_datadir}/locale/es/LC_MESSAGES/tcsh* +%lang(et) %{_datadir}/locale/et/LC_MESSAGES/tcsh* +%lang(fi) %{_datadir}/locale/fi/LC_MESSAGES/tcsh* +%lang(fr) %{_datadir}/locale/fr/LC_MESSAGES/tcsh* +%lang(it) %{_datadir}/locale/it/LC_MESSAGES/tcsh* +%lang(ja) %{_datadir}/locale/ja/LC_MESSAGES/tcsh* +%lang(pl) %{_datadir}/locale/pl/LC_MESSAGES/tcsh* +%lang(ru) %{_datadir}/locale/ru/LC_MESSAGES/tcsh* +%lang(uk) %{_datadir}/locale/uk/LC_MESSAGES/tcsh* %changelog -* Wed May 19 2004 tsintegrate 6.12-9ts -- current (6.12-8ts) integrated as 6.12-9ts for release 1.0-U1 +* Tue Jun 15 2004 Elliot Lee +- rebuilt -* Wed May 12 2004 Omar Kilani 6.12-8ts -- Add BuildRequires: libtermcap-devel groff -- Add RequireS: libtermcap +* Fri Feb 13 2004 Elliot Lee +- rebuilt -* Mon Dec 8 2003 Erlend Midttun 6.12-5tr -- Rebuilt. +* Tue Feb 10 2004 Nalin Dahyabhai 6.12-7 +- remove declaration of setpgrp() which conflicts with libc's (#115185) -* Wed Jun 18 2003 Erlend Midttun 6.12-4tr -- Big rebuild +* Fri Nov 21 2003 Nalin Dahyabhai 6.12-6 +- add missing buildprereqs on groff, libtermcap-devel (#110599) -* Mon May 26 2003 Erlend Midttun 6.12-3em -- fileutils -> coreutils. +* Tue Jul 8 2003 Nalin Dahyabhai +- update URL -* Mon Mar 24 2003 Erlend Midttun 6.12-2em -- Rebuilt against glibc 2.3.2. +* Wed Jun 04 2003 Elliot Lee +- rebuilt -* Fri Aug 23 2002 Christian H. Toldnes 6.12-1ct -- New upstream version: 6.12 -- Built for TSL 2.0 +* Wed Jan 22 2003 Tim Powers +- rebuilt -* Tue Jul 3 2001 Oystein Viggen -- define _noVersionedDependencies +* Thu Dec 05 2002 Elliot Lee 6.12-3 +- Merge changes from 8.0-hammer -* Tue Feb 29 2000 Lars Gaarden -- moved man page to /usr/share/man, FHS +* Tue Nov 19 2002 Nalin Dahyabhai 6.12-3 +- rebuild +* Thu Aug 08 2002 Phil Knirsch 6.12-2 +- Added csh.1 symlink to manpages. + +* Tue Jun 4 2002 Nalin Dahyabhai 6.11-1 +- update to 6.11 + +* Thu May 23 2002 Tim Powers +- automated rebuild + +* Thu Jan 31 2002 Bill Nottingham +- rebuild in new env + +* Sun Jun 24 2001 Elliot Lee +- Bump release + rebuild. + +* Wed Mar 28 2001 Akira TAGOH 6.10-5 +- Fixed check locale. + +* Tue Feb 6 2001 Adrian Havill +- use instead of for pickier lib (#25935) +- allow arguments for login shells (#19926) + +* Thu Nov 30 2000 Nalin Dahyabhai +- update to 6.10.00 to fix here-script vulnerability + +* Wed Sep 18 2000 Adrian Havill +- fix catalog locale dirname for Japanese + +* Thu Jun 15 2000 Jeff Johnson +- FHS packaging. +- add locale support (#10345). + +* Tue Mar 7 2000 Jeff Johnson +- rebuild for sparc baud rates > 38400. + * Mon Jan 31 2000 Cristian Gafton - rebuild to fix dependencies @@ -147,4 +249,4 @@ * Fri Feb 07 1997 Erik Troan - Provides csh, adds and removes /bin/csh from /etc/shells if csh package -isn't installed. \ No newline at end of file +isn't installed. From svn at tinysofa.org Thu Jul 1 15:37:56 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:37:56 +1000 (EST) Subject: [tinysofa-svn] r2579 - in tinysofa/snapshot: . libgdiplus libgdiplus/current libgdiplus/current/sources libgdiplus/current/specs Message-ID: <20040701153756.9B3044E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:37:55 +1000 (Fri, 02 Jul 2004) New Revision: 2579 Added: tinysofa/snapshot/libgdiplus/ tinysofa/snapshot/libgdiplus/current/ tinysofa/snapshot/libgdiplus/current/sources/ tinysofa/snapshot/libgdiplus/current/sources/libgdiplus-1.0.tar.gz tinysofa/snapshot/libgdiplus/current/specs/ tinysofa/snapshot/libgdiplus/current/specs/libgdiplus.spec Log: - Add libgdiplus to snapshot from 2.0. Added: tinysofa/snapshot/libgdiplus/current/sources/libgdiplus-1.0.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/libgdiplus/current/sources/libgdiplus-1.0.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/libgdiplus/current/specs/libgdiplus.spec =================================================================== --- tinysofa/snapshot/libgdiplus/current/specs/libgdiplus.spec 2004-07-01 15:37:52 UTC (rev 2578) +++ tinysofa/snapshot/libgdiplus/current/specs/libgdiplus.spec 2004-07-01 15:37:55 UTC (rev 2579) @@ -0,0 +1,64 @@ +Name: libgdiplus +Version: 1.0 +Release: 1ts +Copyright: MIT X11 +BuildRoot: %{_tmppath}/%{name}-%{version}-root +URL: http:/www.go-mono.com +Source0: libgdiplus-%{version}.tar.gz +BuildRequires: freetype-devel +BuildRequires: libungif-devel +BuildRequires: libjpeg-devel +BuildRequires: libtiff-devel +BuildRequires: cairo-devel >= 0.1.23 +BuildRequires: glib2-devel >= 2.2.3 +BuildRequires: pkgconfig +BuildRequires: zlib-devel +Summary: libgdiplus: An Open Source implementation of the GDI+ API. +Group: Development/Libraries +Requires: glib2 +Requires: cairo >= 0.1.23 +Requires: libtiff +Requires: libungif +Requires: libjpeg + +%description +libgdiplus: An Open Source implementation of the GDI+ + API, it is part of the Mono Project + +%files +%defattr(-, root, root) +/usr/lib/libgdiplus.so.0.0.0 +/usr/lib/libgdiplus.so.0 + + +%package -n libgdiplus-devel +Summary: Development-related files for libgdiplus +Group: Development/Libraries +Requires: libgdiplus >= 0.8 + +%description -n libgdiplus-devel +Development-related files for libgdiplus, an Open Source + implementation of the GDI+ API + +%files -n libgdiplus-devel +%defattr(-, root, root) +/usr/lib/libgdiplus.so +/usr/lib/libgdiplus.la +/usr/lib/libgdiplus.a +/usr/lib/pkgconfig/libgdiplus.pc + +%prep +%setup -q -n libgdiplus-%{version} + +%build +./configure --prefix=/usr --sysconfdir=/etc --mandir=/usr/share/man --infodir=/usr/share/info --localstatedir=/var +make + +%install +rm -rf %{buildroot} +make DESTDIR=%{buildroot} install + +%clean +rm -rf %{buildroot} + +%changelog From svn at tinysofa.org Thu Jul 1 15:37:59 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:37:59 +1000 (EST) Subject: [tinysofa-svn] r2582 - in tinysofa/snapshot: . libselinux libselinux/current libselinux/current/sources libselinux/current/specs Message-ID: <20040701153759.F33F34E817D@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:37:59 +1000 (Fri, 02 Jul 2004) New Revision: 2582 Added: tinysofa/snapshot/libselinux/ tinysofa/snapshot/libselinux/current/ tinysofa/snapshot/libselinux/current/sources/ tinysofa/snapshot/libselinux/current/sources/libselinux-1.13.4.tgz tinysofa/snapshot/libselinux/current/sources/libselinux-nlclass.patch tinysofa/snapshot/libselinux/current/specs/ tinysofa/snapshot/libselinux/current/specs/libselinux.spec Log: - Add libselinux to snapshot from 2.0. Added: tinysofa/snapshot/libselinux/current/sources/libselinux-1.13.4.tgz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/libselinux/current/sources/libselinux-1.13.4.tgz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/libselinux/current/sources/libselinux-nlclass.patch =================================================================== --- tinysofa/snapshot/libselinux/current/sources/libselinux-nlclass.patch 2004-07-01 15:37:58 UTC (rev 2581) +++ tinysofa/snapshot/libselinux/current/sources/libselinux-nlclass.patch 2004-07-01 15:37:59 UTC (rev 2582) @@ -0,0 +1,312 @@ +diff -urN libselinux-1.13.2.o/include/selinux/av_inherit.h libselinux-1.13.2.w/include/selinux/av_inherit.h +--- libselinux-1.13.2.o/include/selinux/av_inherit.h 2004-05-28 09:46:15.000000000 -0400 ++++ libselinux-1.13.2.w/include/selinux/av_inherit.h 2004-06-09 14:40:50.737396344 -0400 +@@ -29,6 +29,15 @@ + { SECCLASS_SEM, common_ipc_perm_to_string, 0x00000200UL }, + { SECCLASS_MSGQ, common_ipc_perm_to_string, 0x00000200UL }, + { SECCLASS_SHM, common_ipc_perm_to_string, 0x00000200UL }, ++ { SECCLASS_NETLINK_ROUTE_SOCKET, common_socket_perm_to_string, 0x00400000UL }, ++ { SECCLASS_NETLINK_FIREWALL_SOCKET, common_socket_perm_to_string, 0x00400000UL }, ++ { SECCLASS_NETLINK_TCPDIAG_SOCKET, common_socket_perm_to_string, 0x00400000UL }, ++ { SECCLASS_NETLINK_NFLOG_SOCKET, common_socket_perm_to_string, 0x00400000UL }, ++ { SECCLASS_NETLINK_XFRM_SOCKET, common_socket_perm_to_string, 0x00400000UL }, ++ { SECCLASS_NETLINK_SELINUX_SOCKET, common_socket_perm_to_string, 0x00400000UL }, ++ { SECCLASS_NETLINK_AUDIT_SOCKET, common_socket_perm_to_string, 0x00400000UL }, ++ { SECCLASS_NETLINK_IP6FW_SOCKET, common_socket_perm_to_string, 0x00400000UL }, ++ { SECCLASS_NETLINK_DNRT_SOCKET, common_socket_perm_to_string, 0x00400000UL }, + }; + + +diff -urN libselinux-1.13.2.o/include/selinux/av_permissions.h libselinux-1.13.2.w/include/selinux/av_permissions.h +--- libselinux-1.13.2.o/include/selinux/av_permissions.h 2004-05-28 09:46:15.000000000 -0400 ++++ libselinux-1.13.2.w/include/selinux/av_permissions.h 2004-06-09 14:41:29.094565168 -0400 +@@ -653,5 +653,230 @@ + #define PAX__RANDEXEC 0x00000010UL + #define PAX__SEGMEXEC 0x00000020UL + ++#define NETLINK_ROUTE_SOCKET__IOCTL 0x00000001UL ++#define NETLINK_ROUTE_SOCKET__READ 0x00000002UL ++#define NETLINK_ROUTE_SOCKET__WRITE 0x00000004UL ++#define NETLINK_ROUTE_SOCKET__CREATE 0x00000008UL ++#define NETLINK_ROUTE_SOCKET__GETATTR 0x00000010UL ++#define NETLINK_ROUTE_SOCKET__SETATTR 0x00000020UL ++#define NETLINK_ROUTE_SOCKET__LOCK 0x00000040UL ++#define NETLINK_ROUTE_SOCKET__RELABELFROM 0x00000080UL ++#define NETLINK_ROUTE_SOCKET__RELABELTO 0x00000100UL ++#define NETLINK_ROUTE_SOCKET__APPEND 0x00000200UL ++#define NETLINK_ROUTE_SOCKET__BIND 0x00000400UL ++#define NETLINK_ROUTE_SOCKET__CONNECT 0x00000800UL ++#define NETLINK_ROUTE_SOCKET__LISTEN 0x00001000UL ++#define NETLINK_ROUTE_SOCKET__ACCEPT 0x00002000UL ++#define NETLINK_ROUTE_SOCKET__GETOPT 0x00004000UL ++#define NETLINK_ROUTE_SOCKET__SETOPT 0x00008000UL ++#define NETLINK_ROUTE_SOCKET__SHUTDOWN 0x00010000UL ++#define NETLINK_ROUTE_SOCKET__RECVFROM 0x00020000UL ++#define NETLINK_ROUTE_SOCKET__SENDTO 0x00040000UL ++#define NETLINK_ROUTE_SOCKET__RECV_MSG 0x00080000UL ++#define NETLINK_ROUTE_SOCKET__SEND_MSG 0x00100000UL ++#define NETLINK_ROUTE_SOCKET__NAME_BIND 0x00200000UL ++ ++#define NETLINK_ROUTE_SOCKET__NLMSG_READ 0x00400000UL ++#define NETLINK_ROUTE_SOCKET__NLMSG_WRITE 0x00800000UL ++ ++#define NETLINK_FIREWALL_SOCKET__IOCTL 0x00000001UL ++#define NETLINK_FIREWALL_SOCKET__READ 0x00000002UL ++#define NETLINK_FIREWALL_SOCKET__WRITE 0x00000004UL ++#define NETLINK_FIREWALL_SOCKET__CREATE 0x00000008UL ++#define NETLINK_FIREWALL_SOCKET__GETATTR 0x00000010UL ++#define NETLINK_FIREWALL_SOCKET__SETATTR 0x00000020UL ++#define NETLINK_FIREWALL_SOCKET__LOCK 0x00000040UL ++#define NETLINK_FIREWALL_SOCKET__RELABELFROM 0x00000080UL ++#define NETLINK_FIREWALL_SOCKET__RELABELTO 0x00000100UL ++#define NETLINK_FIREWALL_SOCKET__APPEND 0x00000200UL ++#define NETLINK_FIREWALL_SOCKET__BIND 0x00000400UL ++#define NETLINK_FIREWALL_SOCKET__CONNECT 0x00000800UL ++#define NETLINK_FIREWALL_SOCKET__LISTEN 0x00001000UL ++#define NETLINK_FIREWALL_SOCKET__ACCEPT 0x00002000UL ++#define NETLINK_FIREWALL_SOCKET__GETOPT 0x00004000UL ++#define NETLINK_FIREWALL_SOCKET__SETOPT 0x00008000UL ++#define NETLINK_FIREWALL_SOCKET__SHUTDOWN 0x00010000UL ++#define NETLINK_FIREWALL_SOCKET__RECVFROM 0x00020000UL ++#define NETLINK_FIREWALL_SOCKET__SENDTO 0x00040000UL ++#define NETLINK_FIREWALL_SOCKET__RECV_MSG 0x00080000UL ++#define NETLINK_FIREWALL_SOCKET__SEND_MSG 0x00100000UL ++#define NETLINK_FIREWALL_SOCKET__NAME_BIND 0x00200000UL ++ ++#define NETLINK_FIREWALL_SOCKET__NLMSG_READ 0x00400000UL ++#define NETLINK_FIREWALL_SOCKET__NLMSG_WRITE 0x00800000UL ++ ++#define NETLINK_TCPDIAG_SOCKET__IOCTL 0x00000001UL ++#define NETLINK_TCPDIAG_SOCKET__READ 0x00000002UL ++#define NETLINK_TCPDIAG_SOCKET__WRITE 0x00000004UL ++#define NETLINK_TCPDIAG_SOCKET__CREATE 0x00000008UL ++#define NETLINK_TCPDIAG_SOCKET__GETATTR 0x00000010UL ++#define NETLINK_TCPDIAG_SOCKET__SETATTR 0x00000020UL ++#define NETLINK_TCPDIAG_SOCKET__LOCK 0x00000040UL ++#define NETLINK_TCPDIAG_SOCKET__RELABELFROM 0x00000080UL ++#define NETLINK_TCPDIAG_SOCKET__RELABELTO 0x00000100UL ++#define NETLINK_TCPDIAG_SOCKET__APPEND 0x00000200UL ++#define NETLINK_TCPDIAG_SOCKET__BIND 0x00000400UL ++#define NETLINK_TCPDIAG_SOCKET__CONNECT 0x00000800UL ++#define NETLINK_TCPDIAG_SOCKET__LISTEN 0x00001000UL ++#define NETLINK_TCPDIAG_SOCKET__ACCEPT 0x00002000UL ++#define NETLINK_TCPDIAG_SOCKET__GETOPT 0x00004000UL ++#define NETLINK_TCPDIAG_SOCKET__SETOPT 0x00008000UL ++#define NETLINK_TCPDIAG_SOCKET__SHUTDOWN 0x00010000UL ++#define NETLINK_TCPDIAG_SOCKET__RECVFROM 0x00020000UL ++#define NETLINK_TCPDIAG_SOCKET__SENDTO 0x00040000UL ++#define NETLINK_TCPDIAG_SOCKET__RECV_MSG 0x00080000UL ++#define NETLINK_TCPDIAG_SOCKET__SEND_MSG 0x00100000UL ++#define NETLINK_TCPDIAG_SOCKET__NAME_BIND 0x00200000UL ++ ++#define NETLINK_TCPDIAG_SOCKET__NLMSG_READ 0x00400000UL ++#define NETLINK_TCPDIAG_SOCKET__NLMSG_WRITE 0x00800000UL ++ ++#define NETLINK_NFLOG_SOCKET__IOCTL 0x00000001UL ++#define NETLINK_NFLOG_SOCKET__READ 0x00000002UL ++#define NETLINK_NFLOG_SOCKET__WRITE 0x00000004UL ++#define NETLINK_NFLOG_SOCKET__CREATE 0x00000008UL ++#define NETLINK_NFLOG_SOCKET__GETATTR 0x00000010UL ++#define NETLINK_NFLOG_SOCKET__SETATTR 0x00000020UL ++#define NETLINK_NFLOG_SOCKET__LOCK 0x00000040UL ++#define NETLINK_NFLOG_SOCKET__RELABELFROM 0x00000080UL ++#define NETLINK_NFLOG_SOCKET__RELABELTO 0x00000100UL ++#define NETLINK_NFLOG_SOCKET__APPEND 0x00000200UL ++#define NETLINK_NFLOG_SOCKET__BIND 0x00000400UL ++#define NETLINK_NFLOG_SOCKET__CONNECT 0x00000800UL ++#define NETLINK_NFLOG_SOCKET__LISTEN 0x00001000UL ++#define NETLINK_NFLOG_SOCKET__ACCEPT 0x00002000UL ++#define NETLINK_NFLOG_SOCKET__GETOPT 0x00004000UL ++#define NETLINK_NFLOG_SOCKET__SETOPT 0x00008000UL ++#define NETLINK_NFLOG_SOCKET__SHUTDOWN 0x00010000UL ++#define NETLINK_NFLOG_SOCKET__RECVFROM 0x00020000UL ++#define NETLINK_NFLOG_SOCKET__SENDTO 0x00040000UL ++#define NETLINK_NFLOG_SOCKET__RECV_MSG 0x00080000UL ++#define NETLINK_NFLOG_SOCKET__SEND_MSG 0x00100000UL ++#define NETLINK_NFLOG_SOCKET__NAME_BIND 0x00200000UL ++ ++#define NETLINK_XFRM_SOCKET__IOCTL 0x00000001UL ++#define NETLINK_XFRM_SOCKET__READ 0x00000002UL ++#define NETLINK_XFRM_SOCKET__WRITE 0x00000004UL ++#define NETLINK_XFRM_SOCKET__CREATE 0x00000008UL ++#define NETLINK_XFRM_SOCKET__GETATTR 0x00000010UL ++#define NETLINK_XFRM_SOCKET__SETATTR 0x00000020UL ++#define NETLINK_XFRM_SOCKET__LOCK 0x00000040UL ++#define NETLINK_XFRM_SOCKET__RELABELFROM 0x00000080UL ++#define NETLINK_XFRM_SOCKET__RELABELTO 0x00000100UL ++#define NETLINK_XFRM_SOCKET__APPEND 0x00000200UL ++#define NETLINK_XFRM_SOCKET__BIND 0x00000400UL ++#define NETLINK_XFRM_SOCKET__CONNECT 0x00000800UL ++#define NETLINK_XFRM_SOCKET__LISTEN 0x00001000UL ++#define NETLINK_XFRM_SOCKET__ACCEPT 0x00002000UL ++#define NETLINK_XFRM_SOCKET__GETOPT 0x00004000UL ++#define NETLINK_XFRM_SOCKET__SETOPT 0x00008000UL ++#define NETLINK_XFRM_SOCKET__SHUTDOWN 0x00010000UL ++#define NETLINK_XFRM_SOCKET__RECVFROM 0x00020000UL ++#define NETLINK_XFRM_SOCKET__SENDTO 0x00040000UL ++#define NETLINK_XFRM_SOCKET__RECV_MSG 0x00080000UL ++#define NETLINK_XFRM_SOCKET__SEND_MSG 0x00100000UL ++#define NETLINK_XFRM_SOCKET__NAME_BIND 0x00200000UL ++ ++#define NETLINK_XFRM_SOCKET__NLMSG_READ 0x00400000UL ++#define NETLINK_XFRM_SOCKET__NLMSG_WRITE 0x00800000UL ++ ++#define NETLINK_SELINUX_SOCKET__IOCTL 0x00000001UL ++#define NETLINK_SELINUX_SOCKET__READ 0x00000002UL ++#define NETLINK_SELINUX_SOCKET__WRITE 0x00000004UL ++#define NETLINK_SELINUX_SOCKET__CREATE 0x00000008UL ++#define NETLINK_SELINUX_SOCKET__GETATTR 0x00000010UL ++#define NETLINK_SELINUX_SOCKET__SETATTR 0x00000020UL ++#define NETLINK_SELINUX_SOCKET__LOCK 0x00000040UL ++#define NETLINK_SELINUX_SOCKET__RELABELFROM 0x00000080UL ++#define NETLINK_SELINUX_SOCKET__RELABELTO 0x00000100UL ++#define NETLINK_SELINUX_SOCKET__APPEND 0x00000200UL ++#define NETLINK_SELINUX_SOCKET__BIND 0x00000400UL ++#define NETLINK_SELINUX_SOCKET__CONNECT 0x00000800UL ++#define NETLINK_SELINUX_SOCKET__LISTEN 0x00001000UL ++#define NETLINK_SELINUX_SOCKET__ACCEPT 0x00002000UL ++#define NETLINK_SELINUX_SOCKET__GETOPT 0x00004000UL ++#define NETLINK_SELINUX_SOCKET__SETOPT 0x00008000UL ++#define NETLINK_SELINUX_SOCKET__SHUTDOWN 0x00010000UL ++#define NETLINK_SELINUX_SOCKET__RECVFROM 0x00020000UL ++#define NETLINK_SELINUX_SOCKET__SENDTO 0x00040000UL ++#define NETLINK_SELINUX_SOCKET__RECV_MSG 0x00080000UL ++#define NETLINK_SELINUX_SOCKET__SEND_MSG 0x00100000UL ++#define NETLINK_SELINUX_SOCKET__NAME_BIND 0x00200000UL ++ ++#define NETLINK_AUDIT_SOCKET__IOCTL 0x00000001UL ++#define NETLINK_AUDIT_SOCKET__READ 0x00000002UL ++#define NETLINK_AUDIT_SOCKET__WRITE 0x00000004UL ++#define NETLINK_AUDIT_SOCKET__CREATE 0x00000008UL ++#define NETLINK_AUDIT_SOCKET__GETATTR 0x00000010UL ++#define NETLINK_AUDIT_SOCKET__SETATTR 0x00000020UL ++#define NETLINK_AUDIT_SOCKET__LOCK 0x00000040UL ++#define NETLINK_AUDIT_SOCKET__RELABELFROM 0x00000080UL ++#define NETLINK_AUDIT_SOCKET__RELABELTO 0x00000100UL ++#define NETLINK_AUDIT_SOCKET__APPEND 0x00000200UL ++#define NETLINK_AUDIT_SOCKET__BIND 0x00000400UL ++#define NETLINK_AUDIT_SOCKET__CONNECT 0x00000800UL ++#define NETLINK_AUDIT_SOCKET__LISTEN 0x00001000UL ++#define NETLINK_AUDIT_SOCKET__ACCEPT 0x00002000UL ++#define NETLINK_AUDIT_SOCKET__GETOPT 0x00004000UL ++#define NETLINK_AUDIT_SOCKET__SETOPT 0x00008000UL ++#define NETLINK_AUDIT_SOCKET__SHUTDOWN 0x00010000UL ++#define NETLINK_AUDIT_SOCKET__RECVFROM 0x00020000UL ++#define NETLINK_AUDIT_SOCKET__SENDTO 0x00040000UL ++#define NETLINK_AUDIT_SOCKET__RECV_MSG 0x00080000UL ++#define NETLINK_AUDIT_SOCKET__SEND_MSG 0x00100000UL ++#define NETLINK_AUDIT_SOCKET__NAME_BIND 0x00200000UL ++ ++#define NETLINK_AUDIT_SOCKET__NLMSG_READ 0x00400000UL ++#define NETLINK_AUDIT_SOCKET__NLMSG_WRITE 0x00800000UL ++ ++#define NETLINK_IP6FW_SOCKET__IOCTL 0x00000001UL ++#define NETLINK_IP6FW_SOCKET__READ 0x00000002UL ++#define NETLINK_IP6FW_SOCKET__WRITE 0x00000004UL ++#define NETLINK_IP6FW_SOCKET__CREATE 0x00000008UL ++#define NETLINK_IP6FW_SOCKET__GETATTR 0x00000010UL ++#define NETLINK_IP6FW_SOCKET__SETATTR 0x00000020UL ++#define NETLINK_IP6FW_SOCKET__LOCK 0x00000040UL ++#define NETLINK_IP6FW_SOCKET__RELABELFROM 0x00000080UL ++#define NETLINK_IP6FW_SOCKET__RELABELTO 0x00000100UL ++#define NETLINK_IP6FW_SOCKET__APPEND 0x00000200UL ++#define NETLINK_IP6FW_SOCKET__BIND 0x00000400UL ++#define NETLINK_IP6FW_SOCKET__CONNECT 0x00000800UL ++#define NETLINK_IP6FW_SOCKET__LISTEN 0x00001000UL ++#define NETLINK_IP6FW_SOCKET__ACCEPT 0x00002000UL ++#define NETLINK_IP6FW_SOCKET__GETOPT 0x00004000UL ++#define NETLINK_IP6FW_SOCKET__SETOPT 0x00008000UL ++#define NETLINK_IP6FW_SOCKET__SHUTDOWN 0x00010000UL ++#define NETLINK_IP6FW_SOCKET__RECVFROM 0x00020000UL ++#define NETLINK_IP6FW_SOCKET__SENDTO 0x00040000UL ++#define NETLINK_IP6FW_SOCKET__RECV_MSG 0x00080000UL ++#define NETLINK_IP6FW_SOCKET__SEND_MSG 0x00100000UL ++#define NETLINK_IP6FW_SOCKET__NAME_BIND 0x00200000UL ++ ++#define NETLINK_IP6FW_SOCKET__NLMSG_READ 0x00400000UL ++#define NETLINK_IP6FW_SOCKET__NLMSG_WRITE 0x00800000UL ++ ++#define NETLINK_DNRT_SOCKET__IOCTL 0x00000001UL ++#define NETLINK_DNRT_SOCKET__READ 0x00000002UL ++#define NETLINK_DNRT_SOCKET__WRITE 0x00000004UL ++#define NETLINK_DNRT_SOCKET__CREATE 0x00000008UL ++#define NETLINK_DNRT_SOCKET__GETATTR 0x00000010UL ++#define NETLINK_DNRT_SOCKET__SETATTR 0x00000020UL ++#define NETLINK_DNRT_SOCKET__LOCK 0x00000040UL ++#define NETLINK_DNRT_SOCKET__RELABELFROM 0x00000080UL ++#define NETLINK_DNRT_SOCKET__RELABELTO 0x00000100UL ++#define NETLINK_DNRT_SOCKET__APPEND 0x00000200UL ++#define NETLINK_DNRT_SOCKET__BIND 0x00000400UL ++#define NETLINK_DNRT_SOCKET__CONNECT 0x00000800UL ++#define NETLINK_DNRT_SOCKET__LISTEN 0x00001000UL ++#define NETLINK_DNRT_SOCKET__ACCEPT 0x00002000UL ++#define NETLINK_DNRT_SOCKET__GETOPT 0x00004000UL ++#define NETLINK_DNRT_SOCKET__SETOPT 0x00008000UL ++#define NETLINK_DNRT_SOCKET__SHUTDOWN 0x00010000UL ++#define NETLINK_DNRT_SOCKET__RECVFROM 0x00020000UL ++#define NETLINK_DNRT_SOCKET__SENDTO 0x00040000UL ++#define NETLINK_DNRT_SOCKET__RECV_MSG 0x00080000UL ++#define NETLINK_DNRT_SOCKET__SEND_MSG 0x00100000UL ++#define NETLINK_DNRT_SOCKET__NAME_BIND 0x00200000UL ++ + + /* FLASK */ +diff -urN libselinux-1.13.2.o/include/selinux/av_perm_to_string.h libselinux-1.13.2.w/include/selinux/av_perm_to_string.h +--- libselinux-1.13.2.o/include/selinux/av_perm_to_string.h 2004-05-28 09:46:15.000000000 -0400 ++++ libselinux-1.13.2.w/include/selinux/av_perm_to_string.h 2004-06-09 14:42:11.910056224 -0400 +@@ -207,6 +207,18 @@ + { SECCLASS_PAX, PAX__RANDMMAP, "randmmap" }, + { SECCLASS_PAX, PAX__RANDEXEC, "randexec" }, + { SECCLASS_PAX, PAX__SEGMEXEC, "segmexec" }, ++ { SECCLASS_NETLINK_ROUTE_SOCKET, NETLINK_ROUTE_SOCKET__NLMSG_READ, "nlmsg_read" }, ++ { SECCLASS_NETLINK_ROUTE_SOCKET, NETLINK_ROUTE_SOCKET__NLMSG_WRITE, "nlmsg_write" }, ++ { SECCLASS_NETLINK_FIREWALL_SOCKET, NETLINK_FIREWALL_SOCKET__NLMSG_READ, "nlmsg_read" }, ++ { SECCLASS_NETLINK_FIREWALL_SOCKET, NETLINK_FIREWALL_SOCKET__NLMSG_WRITE, "nlmsg_write" }, ++ { SECCLASS_NETLINK_TCPDIAG_SOCKET, NETLINK_TCPDIAG_SOCKET__NLMSG_READ, "nlmsg_read" }, ++ { SECCLASS_NETLINK_TCPDIAG_SOCKET, NETLINK_TCPDIAG_SOCKET__NLMSG_WRITE, "nlmsg_write" }, ++ { SECCLASS_NETLINK_XFRM_SOCKET, NETLINK_XFRM_SOCKET__NLMSG_READ, "nlmsg_read" }, ++ { SECCLASS_NETLINK_XFRM_SOCKET, NETLINK_XFRM_SOCKET__NLMSG_WRITE, "nlmsg_write" }, ++ { SECCLASS_NETLINK_AUDIT_SOCKET, NETLINK_AUDIT_SOCKET__NLMSG_READ, "nlmsg_read" }, ++ { SECCLASS_NETLINK_AUDIT_SOCKET, NETLINK_AUDIT_SOCKET__NLMSG_WRITE, "nlmsg_write" }, ++ { SECCLASS_NETLINK_IP6FW_SOCKET, NETLINK_IP6FW_SOCKET__NLMSG_READ, "nlmsg_read" }, ++ { SECCLASS_NETLINK_IP6FW_SOCKET, NETLINK_IP6FW_SOCKET__NLMSG_WRITE, "nlmsg_write" }, + }; + + +diff -urN libselinux-1.13.2.o/include/selinux/class_to_string.h libselinux-1.13.2.w/include/selinux/class_to_string.h +--- libselinux-1.13.2.o/include/selinux/class_to_string.h 2004-05-28 09:46:15.000000000 -0400 ++++ libselinux-1.13.2.w/include/selinux/class_to_string.h 2004-06-09 14:44:17.808916688 -0400 +@@ -47,5 +47,14 @@ + "xserver", + "xextension", + "pax", ++ "netlink_route_socket", ++ "netlink_firewall_socket", ++ "netlink_tcpdiag_socket", ++ "netlink_nflog_socket", ++ "netlink_xfrm_socket", ++ "netlink_selinux_socket", ++ "netlink_audit_socket", ++ "netlink_ip6fw_socket", ++ "netlink_dnrt_socket", + }; + +diff -urN libselinux-1.13.2.o/include/selinux/flask.h libselinux-1.13.2.w/include/selinux/flask.h +--- libselinux-1.13.2.o/include/selinux/flask.h 2004-05-28 09:46:15.000000000 -0400 ++++ libselinux-1.13.2.w/include/selinux/flask.h 2004-06-09 14:46:50.361725136 -0400 +@@ -47,6 +47,15 @@ + #define SECCLASS_XSERVER 40 + #define SECCLASS_XEXTENSION 41 + #define SECCLASS_PAX 42 ++#define SECCLASS_NETLINK_ROUTE_SOCKET 43 ++#define SECCLASS_NETLINK_FIREWALL_SOCKET 44 ++#define SECCLASS_NETLINK_TCPDIAG_SOCKET 45 ++#define SECCLASS_NETLINK_NFLOG_SOCKET 46 ++#define SECCLASS_NETLINK_XFRM_SOCKET 47 ++#define SECCLASS_NETLINK_SELINUX_SOCKET 48 ++#define SECCLASS_NETLINK_AUDIT_SOCKET 49 ++#define SECCLASS_NETLINK_IP6FW_SOCKET 50 ++#define SECCLASS_NETLINK_DNRT_SOCKET 51 + + /* + * Security identifier indices for initial entities Added: tinysofa/snapshot/libselinux/current/specs/libselinux.spec =================================================================== --- tinysofa/snapshot/libselinux/current/specs/libselinux.spec 2004-07-01 15:37:58 UTC (rev 2581) +++ tinysofa/snapshot/libselinux/current/specs/libselinux.spec 2004-07-01 15:37:59 UTC (rev 2582) @@ -0,0 +1,217 @@ +Summary: SELinux library and simple utilities +Name: libselinux +Version: 1.13.4 +Release: 1ts +License: Public domain (uncopyrighted) +Group: System Environment/Libraries +Source: http://www.nsa.gov/selinux/archives/libselinux-%{version}.tgz +Prefix: %{_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-root +Provides: libselinux.so +Patch1: libselinux-nlclass.patch + +%description +Security-enhanced Linux is a patch of the Linux? kernel and a number +of utilities with enhanced security functionality designed to add +mandatory access controls to Linux. The Security-enhanced Linux +kernel contains new architectural components originally developed to +improve the security of the Flask operating system. These +architectural components provide general support for the enforcement +of many kinds of mandatory access control policies, including those +based on the concepts of Type Enforcement?, Role-based Access +Control, and Multi-level Security. + +libselinux provides an API for SELinux applications to get and set +process and file security contexts and to obtain security policy +decisions. Required for any applications that use the SELinux API. + +%package devel +Summary: Header files and libraries used to build SELinux +Group: Development/Libraries +Requires: libselinux = %{version} + +%description devel +The selinux-devel package contains the static libraries and header files +needed for developing SELinux applications. + +%prep +%setup -q +%patch1 -p1 -b .nlclass + +%build +make + +%install +rm -rf ${RPM_BUILD_ROOT} +mkdir -p ${RPM_BUILD_ROOT}/%{_lib} +mkdir -p ${RPM_BUILD_ROOT}/%{_libdir} +mkdir -p ${RPM_BUILD_ROOT}%{_includedir} +mkdir -p ${RPM_BUILD_ROOT}%{_bindir} +make DESTDIR="${RPM_BUILD_ROOT}" LIBDIR="${RPM_BUILD_ROOT}%{_libdir}" SHLIBDIR="${RPM_BUILD_ROOT}/%{_lib}" install + +%clean +rm -rf ${RPM_BUILD_ROOT} + +%post +# add libselinux to the cache +/sbin/ldconfig + +%files devel +%defattr(-,root,root) +%{_libdir}/libselinux.a +%{_libdir}/libselinux.so +%dir %{_includedir}/selinux +%{_includedir}/selinux/*.h +%{_mandir}/man3/* + +%files +%defattr(-,root,root) +/%{_lib}/libselinux.so.1 +%{_bindir}/* +%{_mandir}/man8/* + +%changelog +* Wed Jun 16 2004 Dan Walsh 1.13.4-1 +- add nlclass patch +- Update to latest from NSA + +* Tue Jun 15 2004 Elliot Lee +- rebuilt + +* Sat Jun 13 2004 Dan Walsh 1.13.3-2 +- Fix selinux_config to break once it finds SELINUXTYPE. + +* Fri May 28 2004 Dan Walsh 1.13.2-1 +-Update with latest from NSA + +* Thu May 27 2004 Dan Walsh 1.13.1-1 +- Change to use new policy mechanism + +* Mon May 17 2004 Dan Walsh 1.12-2 +- add man patch + +* Thu May 14 2004 Dan Walsh 1.12-1 +- Update with latest from NSA + +* Wed May 5 2004 Dan Walsh 1.11.4-1 +- Update with latest from NSA + +* Thu Apr 22 2004 Dan Walsh 1.11.3-1 +- Add changes for relaxed policy +- Update to match NSA + +* Thu Apr 15 2004 Dan Walsh 1.11.2-1 +- Add relaxed policy changes + +* Thu Apr 15 2004 Dan Walsh 1.11-4 +- Sync with NSA + +* Thu Apr 15 2004 Dan Walsh 1.11-3 +- Remove requires glibc>2.3.4 + +* Wed Apr 14 2004 Dan Walsh 1.11-2 +- Fix selinuxenabled man page. + +* Wed Apr 7 2004 Dan Walsh 1.11-1 +- Upgrade to 1.11 + +* Wed Apr 7 2004 Dan Walsh 1.10-2 +- Add memleaks patch + +* Wed Apr 7 2004 Dan Walsh 1.10-1 +- Upgrade to latest from NSA and add more man pages + +* Thu Apr 1 2004 Dan Walsh 1.9-1 +- Update to match NSA +- Cleanup some man pages + +* Tue Mar 30 2004 Dan Walsh 1.8-1 +- Upgrade to latest from NSA + +* Thu Mar 25 2004 Dan Walsh 1.6-6 +- Add Russell's Man pages + +* Thu Mar 25 2004 Dan Walsh 1.6-5 +- Change getenforce to also check is_selinux_enabled + +* Thu Mar 25 2004 Dan Walsh 1.6-4 +- Add ownership to /usr/include/selinux + +* Wed Mar 10 2004 Dan Walsh 1.6-3 +- fix location of file_contexts file. + +* Wed Mar 10 2004 Dan Walsh 1.6-2 +- Fix matchpathcon to use BUFSIZ + +* Tue Mar 02 2004 Elliot Lee +- rebuilt + +* Mon Feb 23 2004 Dan Walsh 1.4-11 +- add matchpathcon + +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Fri Jan 23 2004 Dan Walsh 1.4-9 +- Add rootok patch + +* Wed Jan 14 2004 Dan Walsh 1.4-8 +- Updated getpeernam patch + +* Tue Jan 13 2004 Dan Walsh 1.4-7 +- Add getpeernam patch + +* Thu Dec 18 2003 Dan Walsh 1.4-6 +- Add getpeercon patch + +* Thu Dec 18 2003 Dan Walsh 1.4-5 +- Put mntpoint patch, because found fix for SysVinit + +* Wed Dec 17 2003 Dan Walsh 1.4-4 +- Add remove mntpoint patch, because it breaks SysVinit + +* Wed Dec 17 2003 Dan Walsh 1.4-3 +- Add mntpoint patch for SysVinit + +* Fri Dec 12 2003 Dan Walsh 1.4-2 +- Add -r -u -t to getcon + +* Sat Dec 6 2003 Dan Walsh 1.4-1 +- Upgrade to latest from NSA + +* Mon Oct 27 2003 Dan Walsh 1.3-2 +- Fix x86_64 build + +* Wed Oct 21 2003 Dan Walsh 1.3-1 +- Latest tarball from NSA. + +* Tue Oct 21 2003 Dan Walsh 1.2-9 +- Update with latest changes from NSA + +* Mon Oct 20 2003 Dan Walsh 1.2-8 +- Change location of .so file + +* Wed Oct 8 2003 Dan Walsh 1.2-7 +- Break out into development library + +* Wed Oct 8 2003 Dan Walsh 1.2-6 +- Move location of libselinux.so to /lib + +* Fri Oct 3 2003 Dan Walsh 1.2-5 +- Add selinuxenabled patch + +* Wed Oct 1 2003 Dan Walsh 1.2-4 +- Update with final NSA 1.2 sources. + +* Fri Sep 12 2003 Dan Walsh 1.2-3 +- Update with latest from NSA. + +* Fri Aug 28 2003 Dan Walsh 1.2-2 +- Fix to build on x86_64 + +* Thu Aug 21 2003 Dan Walsh 1.2-1 +- update for version 1.2 + +* Wed May 27 2003 Dan Walsh 1.0-1 +- Initial version + From svn at tinysofa.org Thu Jul 1 15:37:58 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:37:58 +1000 (EST) Subject: [tinysofa-svn] r2581 - in tinysofa/snapshot: . libpixman libpixman/current libpixman/current/sources libpixman/current/specs Message-ID: <20040701153758.C93794E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:37:58 +1000 (Fri, 02 Jul 2004) New Revision: 2581 Added: tinysofa/snapshot/libpixman/ tinysofa/snapshot/libpixman/current/ tinysofa/snapshot/libpixman/current/sources/ tinysofa/snapshot/libpixman/current/sources/libpixman-0.1.1.tar.gz tinysofa/snapshot/libpixman/current/sources/libpixman-icimage.patch tinysofa/snapshot/libpixman/current/specs/ tinysofa/snapshot/libpixman/current/specs/libpixman.spec Log: - Add libpixman to snapshot from 2.0. Added: tinysofa/snapshot/libpixman/current/sources/libpixman-0.1.1.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/libpixman/current/sources/libpixman-0.1.1.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/libpixman/current/sources/libpixman-icimage.patch =================================================================== --- tinysofa/snapshot/libpixman/current/sources/libpixman-icimage.patch 2004-07-01 15:37:57 UTC (rev 2580) +++ tinysofa/snapshot/libpixman/current/sources/libpixman-icimage.patch 2004-07-01 15:37:58 UTC (rev 2581) @@ -0,0 +1,35 @@ +diff -Nru -x '*~' -x '*.o' -x '*.orig' -x '*.rej' libpixman-0.1.1.orig/src/icimage.c libpixman-0.1.1/src/icimage.c +--- libpixman-0.1.1.orig/src/icimage.c 2004-04-15 17:10:42.000000000 -0400 ++++ libpixman-0.1.1/src/icimage.c 2004-05-14 17:19:32.000000000 -0400 +@@ -248,10 +248,14 @@ + case CT_NONE: + return; + case CT_PIXMAP: +- pixman_image_destroy (image->clientClip); ++ if (image->clientClip) { ++ pixman_image_destroy (image->clientClip); ++ } + break; + default: +- pixman_region_destroy (image->clientClip); ++ if (image->clientClip) { ++ pixman_region_destroy (image->clientClip); ++ } + break; + } + image->clientClip = NULL; +@@ -263,8 +267,12 @@ + pixman_region16_t *region) + { + pixman_image_destroyClip (image); +- image->clientClip = region; +- image->clientClipType = CT_REGION; ++ if (region != NULL) { ++ // image->clientClip = region; ++ pixman_region_copy (image->clientClip, region); ++ image->clientClipType = CT_REGION; ++ } ++ + image->stateChanges |= CPClipMask; + return 0; + } Added: tinysofa/snapshot/libpixman/current/specs/libpixman.spec =================================================================== --- tinysofa/snapshot/libpixman/current/specs/libpixman.spec 2004-07-01 15:37:57 UTC (rev 2580) +++ tinysofa/snapshot/libpixman/current/specs/libpixman.spec 2004-07-01 15:37:58 UTC (rev 2581) @@ -0,0 +1,55 @@ +Name: libpixman +Version: 0.1.1 +Release: 1ts +Copyright: MIT license +BuildRoot: %{_tmppath}/%{name}-%{version}-root +URL: http://www.cairographics.org +Source0: libpixman-0.1.1.tar.gz +Patch0: libpixman-icimage.patch +BuildRequires: pkgconfig +Summary: libpixman is a merge of libpixregion and libic +Group: Development/Libraries + +%description +libpixman is a merge of libpixregion and libic + +%files +%defattr(-, root, root) +%doc AUTHORS COPYING NEWS README +/usr/lib/libpixman.so.1.0.0 +/usr/lib/libpixman.so.1 + + +%package -n libpixman-devel +Summary: Header files for libpixman +Group: Development/Libraries +Requires: libpixman = 0.1.1 + +%description -n libpixman-devel +Header files for libpixman + +%files -n libpixman-devel +%defattr(-, root, root) +/usr/include/pixman.h +/usr/lib/libpixman.a +/usr/lib/libpixman.la +/usr/lib/libpixman.so +/usr/lib/pkgconfig/libpixman.pc + + +%prep +%setup -q -n libpixman-0.1.1 +%patch -p1 -P 0 + +%build +./configure --prefix=/usr --sysconfdir=/etc --mandir=/usr/share/man --infodir=/usr/share/info --localstatedir=/var +make + +%install +rm -rf %{buildroot} +make DESTDIR=%{buildroot} install + +%clean +rm -rf %{buildroot} + +%changelog From svn at tinysofa.org Thu Jul 1 15:39:36 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:39:36 +1000 (EST) Subject: [tinysofa-svn] r2624 - in tinysofa/snapshot: . perl-Date-Calc perl-Date-Calc/current perl-Date-Calc/current/sources perl-Date-Calc/current/specs Message-ID: <20040701153936.B12764E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:39:36 +1000 (Fri, 02 Jul 2004) New Revision: 2624 Added: tinysofa/snapshot/perl-Date-Calc/ tinysofa/snapshot/perl-Date-Calc/current/ tinysofa/snapshot/perl-Date-Calc/current/sources/ tinysofa/snapshot/perl-Date-Calc/current/sources/Date-Calc-5.3.tar.gz tinysofa/snapshot/perl-Date-Calc/current/specs/ tinysofa/snapshot/perl-Date-Calc/current/specs/perl-Date-Calc.spec Log: - Add perl-Date-Calc to snapshot from 2.0. Added: tinysofa/snapshot/perl-Date-Calc/current/sources/Date-Calc-5.3.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/perl-Date-Calc/current/sources/Date-Calc-5.3.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/perl-Date-Calc/current/specs/perl-Date-Calc.spec =================================================================== --- tinysofa/snapshot/perl-Date-Calc/current/specs/perl-Date-Calc.spec 2004-07-01 15:39:34 UTC (rev 2623) +++ tinysofa/snapshot/perl-Date-Calc/current/specs/perl-Date-Calc.spec 2004-07-01 15:39:36 UTC (rev 2624) @@ -0,0 +1,70 @@ +%define _use_internal_dependency_generator 0 + +Name: perl-Date-Calc +Version: 5.3 +Release: 8ts +Summary: A module for extended and efficient date calculations in Perl. +License: distributable +Group: Development/Libraries +URL: http://search.cpan.org/search?mode=module&query=Date%3a%3aCalc +BuildRoot: %{_tmppath}/%{name}-%{version}-root +BuildRequires: perl >= 0:5.00503 +Source0: Date-Calc-%{version}.tar.gz + +%description +The library provides all sorts of date calculations based on the +Gregorian calendar (the one used in all western countries today), +thereby complying with all relevant norms and standards: ISO/R +2015-1971, DIN 1355 and, to some extent, ISO 8601 (where applicable). + +%prep +%setup -q -n Date-Calc-%{version} + +%build +CFLAGS="$RPM_OPT_FLAGS" perl Makefile.PL PREFIX=$RPM_BUILD_ROOT/usr INSTALLDIRS=vendor +make +make test + + +%clean +rm -rf $RPM_BUILD_ROOT +%install + +rm -rf $RPM_BUILD_ROOT +make install + +[ -x /usr/lib/rpm/brp-compress ] && /usr/lib/rpm/brp-compress + +find $RPM_BUILD_ROOT \( -name perllocal.pod -o -name .packlist \) -exec rm -v {} \; + +find $RPM_BUILD_ROOT/usr -type f -print | \ + sed "s@^$RPM_BUILD_ROOT@@g" | \ + grep -v perllocal.pod | \ + grep -v "\.packlist" > Date-Calc-%{version}-filelist +if [ "$(cat Date-Calc-%{version}-filelist)X" = "X" ] ; then + echo "ERROR: EMPTY FILE LIST" + exit -1 +fi + +%files -f Date-Calc-%{version}-filelist +%defattr(-,root,root) + +%changelog +* Tue Mar 02 2004 Elliot Lee +- rebuilt + +* Fri Feb 13 2004 Chip Turner 5.3-5 +- rebuilt + +* Thu Jun 05 2003 Elliot Lee +- rebuilt + +* Tue Dec 10 2002 Chip Turner +- update to latest version from CPAN + +* Tue Aug 6 2002 Chip Turner +- automated release bump and build + +* Wed Jan 30 2002 cturner at redhat.com +- Specfile autogenerated + From svn at tinysofa.org Thu Jul 1 15:39:37 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:39:37 +1000 (EST) Subject: [tinysofa-svn] r2625 - in tinysofa/snapshot: . perl-Digest-HMAC perl-Digest-HMAC/current perl-Digest-HMAC/current/sources perl-Digest-HMAC/current/specs Message-ID: <20040701153937.7C7A24E817D@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:39:37 +1000 (Fri, 02 Jul 2004) New Revision: 2625 Added: tinysofa/snapshot/perl-Digest-HMAC/ tinysofa/snapshot/perl-Digest-HMAC/current/ tinysofa/snapshot/perl-Digest-HMAC/current/sources/ tinysofa/snapshot/perl-Digest-HMAC/current/sources/Digest-HMAC-1.01.tar.gz tinysofa/snapshot/perl-Digest-HMAC/current/specs/ tinysofa/snapshot/perl-Digest-HMAC/current/specs/perl-Digest-HMAC.spec Log: - Add perl-Digest-HMAC to snapshot from 2.0. Added: tinysofa/snapshot/perl-Digest-HMAC/current/sources/Digest-HMAC-1.01.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/perl-Digest-HMAC/current/sources/Digest-HMAC-1.01.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/perl-Digest-HMAC/current/specs/perl-Digest-HMAC.spec =================================================================== --- tinysofa/snapshot/perl-Digest-HMAC/current/specs/perl-Digest-HMAC.spec 2004-07-01 15:39:36 UTC (rev 2624) +++ tinysofa/snapshot/perl-Digest-HMAC/current/specs/perl-Digest-HMAC.spec 2004-07-01 15:39:37 UTC (rev 2625) @@ -0,0 +1,76 @@ +%define _use_internal_dependency_generator 0 + +Name: perl-Digest-HMAC +Version: 1.01 +Release: 12ts +Summary: Digest-HMAC Perl module +License: distributable +Group: Development/Libraries +URL: http://search.cpan.org/search?mode=module&query=Digest%3a%3aHMAC +BuildRoot: %{_tmppath}/%{name}-%{version}-root +BuildRequires: perl >= 0:5.00503 +Source0: Digest-HMAC-%{version}.tar.gz +BuildArch: noarch + +BuildRequires: perl-Digest-SHA1 +BuildRequires: perl(Digest::MD5) +Requires: perl(Digest::SHA1) perl(Digest::MD5) + +%description +HMAC is used for message integrity checks between two parties that +share a secret key, and works in combination with some other Digest +algorithm, usually MD5 or SHA-1. The HMAC mechanism is described in +RFC 2104. + +HMAC follow the common Digest:: interface, but the constructor takes +the secret key and the name of some other simple Digest:: as argument. + +%prep +%setup -q -n Digest-HMAC-%{version} + +%build +CFLAGS="$RPM_OPT_FLAGS" perl Makefile.PL PREFIX=$RPM_BUILD_ROOT/usr INSTALLDIRS=vendor +make +make test + +%clean +rm -rf $RPM_BUILD_ROOT +%install + +rm -rf $RPM_BUILD_ROOT +eval `perl '-V:installarchlib'` +mkdir -p $RPM_BUILD_ROOT/$installarchlib +make install + +[ -x /usr/lib/rpm/brp-compress ] && /usr/lib/rpm/brp-compress + +find $RPM_BUILD_ROOT \( -name perllocal.pod -o -name .packlist \) -exec rm -v {} \; + +find $RPM_BUILD_ROOT/usr -type f -print | \ + sed "s@^$RPM_BUILD_ROOT@@g" | \ + grep -v perllocal.pod | \ + grep -v "\.packlist" > Digest-HMAC-%{version}-filelist +if [ "$(cat Digest-HMAC-%{version}-filelist)X" = "X" ] ; then + echo "ERROR: EMPTY FILE LIST" + exit -1 +fi + +%files -f Digest-HMAC-%{version}-filelist +%defattr(-,root,root) + +%changelog +* Fri Apr 23 2004 Chip Turner 1.01-12 +- bump + +* Mon Jan 27 2003 Chip Turner +- version bump and rebuild + +* Tue Aug 6 2002 Chip Turner +- automated release bump and build + +* Thu Jun 27 2002 Chip Turner +- description update + +* Wed Jun 26 2002 cturner at redhat.com +- Specfile autogenerated + From svn at tinysofa.org Thu Jul 1 15:39:56 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:39:56 +1000 (EST) Subject: [tinysofa-svn] r2637 - in tinysofa/snapshot: . pinfo pinfo/current pinfo/current/sources pinfo/current/specs Message-ID: <20040701153956.C19EA4E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:39:56 +1000 (Fri, 02 Jul 2004) New Revision: 2637 Added: tinysofa/snapshot/pinfo/ tinysofa/snapshot/pinfo/current/ tinysofa/snapshot/pinfo/current/sources/ tinysofa/snapshot/pinfo/current/sources/pinfo-0.6.0-mkstemp.patch tinysofa/snapshot/pinfo/current/sources/pinfo-0.6.8.tar.bz2 tinysofa/snapshot/pinfo/current/specs/ tinysofa/snapshot/pinfo/current/specs/pinfo.spec Log: - Add pinfo to snapshot from 2.0. Added: tinysofa/snapshot/pinfo/current/sources/pinfo-0.6.0-mkstemp.patch =================================================================== --- tinysofa/snapshot/pinfo/current/sources/pinfo-0.6.0-mkstemp.patch 2004-07-01 15:39:52 UTC (rev 2636) +++ tinysofa/snapshot/pinfo/current/sources/pinfo-0.6.0-mkstemp.patch 2004-07-01 15:39:56 UTC (rev 2637) @@ -0,0 +1,131 @@ +--- pinfo-0.6.0/src/manual.c.mkstemp Wed Aug 2 14:14:21 2000 ++++ pinfo-0.6.0/src/manual.c Wed Aug 2 14:25:11 2000 +@@ -168,13 +168,18 @@ + size_t macroline_size; + int ignored_items = 0, i = 0; + char zipped = 0; ++ char tempbuf[PATH_MAX] = "/tmp/pinfoXXXXXX"; ++ int fd; + + if (tmpfilename1) + { + unlink (tmpfilename1); + xfree (tmpfilename1); + } +- tmpfilename1 = tempnam ("/tmp", NULL); ++ fd = mkstemp(tempbuf); ++ fchmod(fd, S_IRUSR | S_IWUSR); ++ close(fd); ++ tmpfilename1 = strdup(tempbuf); + + #ifdef getmaxyx + init_curses (); +@@ -199,6 +204,8 @@ + if (ignoredmacros) /* if the pointer is non-null */ + if (*ignoredmacros && strlen (ignoredmacros)) /* if there are some macros */ + { /* that should be ignored */ ++ char tempbuf[PATH_MAX] = "/tmp/pinfoXXXXXX"; ++ int fd; + *location = '\0'; + snprintf (cmd, 255, "man -W %s %s", /* we need to know the path */ + ManOptions, +@@ -268,9 +275,11 @@ + } + else + source = fopen (location, "r"); /* from cmd output */ +- name = tempnam ("/tmp", NULL); ++ fd = mkstemp(tempbuf); ++ fchmod(fd, S_IRUSR | S_IWUSR); ++ name = strdup(tempbuf); + raw_tempfilename = name; +- id = fopen (name, "w"); ++ id = fdopen (fd, "w"); + + while (!feof (source)) /* we read until eof */ + { +@@ -370,12 +379,17 @@ + manual_aftersearch = 0; + if (return_value != -1) /* -1 is quit key */ + { ++ char tempbuf[PATH_MAX] = "/tmp/pinfoXXXXXX"; ++ int fd; + if (tmpfilename2) + { + unlink (tmpfilename2); + xfree (tmpfilename2); + } +- tmpfilename2 = tempnam ("/tmp", NULL); ++ fd = mkstemp(tempbuf); ++ fchmod(fd, S_IRUSR | S_IWUSR); ++ close(fd); ++ tmpfilename2 = strdup(tempbuf); + if (return_value != -2) /* key_back is not pressed; + and return_value is an + offset to manuallinks */ +--- pinfo-0.6.0/src/filehandling_functions.c.mkstemp Wed Aug 2 14:14:26 2000 ++++ pinfo-0.6.0/src/filehandling_functions.c Wed Aug 2 14:25:42 2000 +@@ -452,12 +452,17 @@ + + if (number == 0) /* initialize tmp filename for file 1 */ + { ++ char tmpbuf[PATH_MAX] = "/tmp/pinfoXXXXXX"; ++ int fd; + if (tmpfilename1) + { + unlink (tmpfilename1); /* erase old tmpfile */ + free (tmpfilename1); + } +- tmpfilename1 = tempnam ("/tmp", NULL); ++ fd = mkstemp(tmpbuf); ++ fchmod(fd, S_IRUSR | S_IWUSR); ++ close(fd); ++ tmpfilename1 = strdup(tmpbuf); + tmpfilename = tmpfilename1; /* later we will refere only to tmp1 */ + } + for (i = 0; i < infopathcount; i++) /* go through all paths */ +@@ -601,23 +606,33 @@ + + if (number == 0) /* initialize tmp filename for file 1 */ + { ++ char tmpbuf[PATH_MAX] = "/tmp/pinfoXXXXXX"; ++ int fd; + if (tmpfilename1) + { + unlink (tmpfilename1); /* erase old tmpfile */ + free (tmpfilename1); + } +- tmpfilename1 = tempnam ("/tmp", NULL); ++ fd = mkstemp(tmpbuf); ++ fchmod(fd, S_IRUSR | S_IWUSR); ++ close(fd); ++ tmpfilename1 = strdup(tmpbuf); + tmpfilename = tmpfilename1; /* later we will refere only to tmp1 */ + } + else + /* initialize tmp filename for file 2 */ + { ++ char tmpbuf[PATH_MAX] = "/tmp/pinfoXXXXXX"; ++ int fd; + if (tmpfilename2) + { + unlink (tmpfilename2); /* erase old tmpfile */ + free (tmpfilename2); + } +- tmpfilename2 = tempnam ("/tmp", NULL); ++ fd = mkstemp(tmpbuf); ++ fchmod(fd, S_IRUSR | S_IWUSR); ++ close(fd); ++ tmpfilename2 = strdup(tmpbuf); + tmpfilename = tmpfilename2; /* later we will refere only to tmp2 */ + } + +--- pinfo-0.6.0/src/common_includes.h.mkstemp Wed Aug 2 14:22:04 2000 ++++ pinfo-0.6.0/src/common_includes.h Wed Aug 2 14:22:15 2000 +@@ -14,6 +14,7 @@ + #include + #include + #include ++#include + #include + #include + #include Added: tinysofa/snapshot/pinfo/current/sources/pinfo-0.6.8.tar.bz2 =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/pinfo/current/sources/pinfo-0.6.8.tar.bz2 ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/pinfo/current/specs/pinfo.spec =================================================================== --- tinysofa/snapshot/pinfo/current/specs/pinfo.spec 2004-07-01 15:39:52 UTC (rev 2636) +++ tinysofa/snapshot/pinfo/current/specs/pinfo.spec 2004-07-01 15:39:56 UTC (rev 2637) @@ -0,0 +1,166 @@ +Summary: An info file viewer. +Name: pinfo +Version: 0.6.8 +Release: 4ts +Group: System Environment/Base +License: GPL +URL: http://dione.ids.pl/~pborys/software/pinfo +# Actual source is .gz'd so I put the URL here, but convert to bz2 +#Source: http://dione.ids.pl/~pborys/software/pinfo/pinfo-%{version}.tar.gz +Source: pinfo-%{version}.tar.bz2 +Patch0: pinfo-0.6.0-mkstemp.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-root +BuildRequires: ncurses-devel +Prereq: /sbin/install-info + +%description +Pinfo is an info file (or man page) viewer with a user interface +similar to the Lynx Web browser's interface. Pinfo supports searching +using regular expressions, and is based on the ncurses library. + +%prep +%setup -q +%patch -p1 -b .mkstemp + +%build +export CFLAGS="-ggdb $RPM_OPT_FLAGS" +%configure --sysconfdir=/etc --disable-nls +make + +%install +[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT + +mkdir -p $RPM_BUILD_ROOT{%{_bindir},%{_sysconfdir}} +%{makeinstall} +ln -sf pinfo $RPM_BUILD_ROOT%{_bindir}/pman +ln -sf pinfo.1 $RPM_BUILD_ROOT%{_mandir}/man1/pman.1 + +# This file should not be packaged +rm -f $RPM_BUILD_ROOT%{_infodir}/dir + +%files +%defattr(-,root,root) +%doc AUTHORS COPYING ChangeLog INSTALL NEWS README TECHSTUFF TODO +# Purposefully not flagged noreplace to ensure new versions have working config +%config %{_sysconfdir}/pinforc +%{_bindir}/pinfo +%{_bindir}/pman +%{_infodir}/pinfo.info* +%{_mandir}/man1/pinfo.1* +%{_mandir}/man1/pman.1* + +%post +/sbin/install-info %{_infodir}/pinfo.info.gz %{_infodir}/dir + +%preun +if [ $1 = 0 ]; then + /sbin/install-info --delete %{_infodir}/pinfo.info.gz %{_infodir}/dir +fi + +%clean +rm -rf $RPM_BUILD_ROOT + +%changelog +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Sat Jan 10 2004 Mike A. Harris 0.6.8-3 +- Added RPM_OPT_FLAGS to CFLAGS as it wasn't being used (#109197) + +* Fri Oct 31 2003 Mike A. Harris 0.6.8-2 +- Updated package URL to current project homepage (#101214) + +* Sat Oct 25 2003 Florian La Roche 0.6.8-1 +- Updated to 0.6.8 + +* Wed Jun 04 2003 Elliot Lee +- rebuilt + +* Sun May 18 2003 Mike A. Harris 0.6.7-1 +- Updated to 0.6.7 +- Dropped already included patch pinfo-0.6.6-0.6.6p1.patch + +* Wed Jan 22 2003 Mike A. Harris 0.6.6-4 +- Added pinfo-0.6.6-0.6.6p1.patch to fix bug (#78504) + +* Wed Jan 22 2003 Tim Powers +- rebuilt + +* Wed Dec 11 2002 Karsten Hopp 0.6.6-2 +- add missing Prereq + +* Tue Nov 12 2002 Mike A. Harris 0.6.6-1 +- Updated to 0.6.6 +- Corrected typos in description field + +* Tue Nov 12 2002 Mike A. Harris 0.6.4-9 +- Now how ironic is *this* one?... The info documentation on pinfo has been + missing from our packages. Mass rebuild tests caught this. Fixed now. +- Added post/preun scripts for updating info dir db with install-info + +* Sat Oct 5 2002 Mike A. Harris 0.6.4-8 +- All-arch rebuild +- Added _sysconfdir where appropriate + +* Fri Jun 21 2002 Tim Powers 0.6.4-7 +- automated rebuild + +* Sun May 26 2002 Tim Powers 0.6.4-6 +- automated rebuild + +* Wed May 22 2002 Mike A. Harris 0.6.4-5 +- Bumped release to rebuild in rawhide + +* Tue Feb 26 2002 Mike A. Harris 0.6.4-4 +- Bumped release to rebuild in rawhide + +* Wed Jan 09 2002 Tim Powers 0.6.4-3 +- automated rebuild + +* Sun Dec 23 2001 Mike A. Harris 0.6.4-2 +- Bumped release to rebuild in rawhide + +* Sun Dec 23 2001 Mike A. Harris 0.6.4-1 +- Updated to 0.6.4 + +* Wed Nov 21 2001 Mike A. Harris 0.6.3-1 +- Updated to 0.6.3 + +* Sat Jul 21 2001 Mike A. Harris 0.6.1-2 +- Add buildprereq on ncurses-devel + +* Thu Jun 21 2001 Mike A. Harris 0.6.1-1 +- Updated to 0.6.1 +- s/Copyright/License/ spec tag + +* Wed Aug 16 2000 Nalin Dahyabhai +- move to the same group as the info and man packages + +* Mon Aug 7 2000 Nalin Dahyabhai +- add pman(1) links, per documentation + +* Wed Aug 2 2000 Nalin Dahyabhai +- fix possible crash due to use of tempnam() + +* Wed Jul 19 2000 Nalin Dahyabhai +- update to 0.6.0 + +* Wed Jul 12 2000 Prospector +- automatic rebuild + +* Tue Jun 27 2000 Nalin Dahyabhai +- spec file cleanups + +* Thu Jun 8 2000 Nalin Dahyabhai +- rebuild for main distribution +- use %%makeinstall + +* Wed May 17 2000 Tim Powers +- updated to 0.5.9 +- use %%configure and %%{_prefix} where possible + +* Mon Aug 30 1999 Tim Powers +- changed group + +* Sun Aug 8 1999 Tim Powers +- rebuilt to be included in Powertools From svn at tinysofa.org Thu Jul 1 15:40:57 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:40:57 +1000 (EST) Subject: [tinysofa-svn] r2665 - in tinysofa/snapshot: . system-config-network system-config-network/current system-config-network/current/sources system-config-network/current/specs Message-ID: <20040701154057.71B654E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:40:57 +1000 (Fri, 02 Jul 2004) New Revision: 2665 Added: tinysofa/snapshot/system-config-network/ tinysofa/snapshot/system-config-network/current/ tinysofa/snapshot/system-config-network/current/sources/ tinysofa/snapshot/system-config-network/current/sources/system-config-network-1.3.16.tar.gz tinysofa/snapshot/system-config-network/current/specs/ tinysofa/snapshot/system-config-network/current/specs/system-config-network.spec Log: - Add system-config-network to snapshot from 2.0. Added: tinysofa/snapshot/system-config-network/current/sources/system-config-network-1.3.16.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/system-config-network/current/sources/system-config-network-1.3.16.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/system-config-network/current/specs/system-config-network.spec =================================================================== --- tinysofa/snapshot/system-config-network/current/specs/system-config-network.spec 2004-07-01 15:40:53 UTC (rev 2664) +++ tinysofa/snapshot/system-config-network/current/specs/system-config-network.spec 2004-07-01 15:40:57 UTC (rev 2665) @@ -0,0 +1,657 @@ +# -*- RPM-SPEC -*- +Summary: The GUI of the NEtwork Adminstration Tool for Red Hat Linux +Name: system-config-network +Version: 1.3.16 +Release: 1ts +URL: http://fedora.redhat.com/projects/config-tools/redhat-config-network.html +Source0: %{name}-%{version}.tar.gz +License: GPL +Group: Applications/System +BuildArch: noarch +Obsoletes: isdn-config internet-config rp3 redhat-config-network +Provides: redhat-config-network = %{version} +BuildRequires: python >= 0:2.2, openjade, docbook-style-dsssl, perl, gettext, glibc-devel, gcc, intltool +Requires: %{name}-tui = %{version}-%{release} +Requires: libglade2, pygtk2-libglade, pygtk2 +BuildRoot: %{_tmppath}/%{name}-%{version}-root + +%description +This is the GUI of the network configuration tool for Red Hat Linux, +supporting Ethernet, Wireless, TokenRing, ADSL, ISDN and PPP. + +%package tui +Summary: The NEtwork Adminstration Tool for Red Hat Linux +Group: Applications/System +Obsoletes: netcfg, redhat-config-network-tui +Provides: redhat-config-network-tui +Requires: initscripts >= 0:5.99, usermode , kudzu, python, rhpl >= 0:0.93.2, rpm-python, newt, pciutils + +%description tui +This is the network configuration tool for Red Hat Linux, +supporting Ethernet, Wireless, TokenRing, ADSL, ISDN and PPP. + +%prep +%setup + +%configure + +%build + +%install +rm -rf $RPM_BUILD_ROOT +%makeinstall + +rm -rf %{buildroot}//usr/share/system-config-network/*.desktop + +%find_lang %name + +%clean +rm -rf $RPM_BUILD_ROOT + + +%files +%defattr(-,root,root) +%{_datadir}/system-config-network/pixmaps +%{_datadir}/system-config-network/netconfpkg/gui +%{_sbindir}/system-config-network-gui +%{_sbindir}/internet-druid +%{_bindir}/neat-control +%{_bindir}/internet-druid +%{_bindir}/system-control-network + +%files -f %{name}.lang tui +%defattr(-,root,root) +%{_datadir}/system-config-network/help +%{_datadir}/system-config-network/*.py* +%dir %{_datadir}/system-config-network +%dir %{_datadir}/system-config-network/netconfpkg +%{_datadir}/system-config-network/netconfpkg/plugins +%{_datadir}/system-config-network/netconfpkg/*.py* +%{_datadir}/system-config-network/netconfpkg/*.idl +%{_datadir}/system-config-network/module-info +%{_datadir}/system-config-network/providerdb +%{_datadir}/pixmaps/* +%config(noreplace) %{_sysconfdir}/pam.d/* +%config(noreplace) %{_sysconfdir}/security/console.apps/* +%{_sbindir}/neat +%{_sbindir}/neat-tui +%{_sbindir}/system-config-network +%{_sbindir}/system-config-network-tui +%{_sbindir}/system-config-network-cmd +%{_sbindir}/system-config-network-druid +%{_bindir}/neat +%{_bindir}/system-config-network +%{_bindir}/system-config-network-cmd +%{_bindir}/system-config-network-druid + +%changelog +* Thu Mar 4 2004 Harald Hoyer - 1.3.16 +- be more relaxed, when parsing the kernel version (115917) +- fixed removing of Hostname (115795) +- fixed "DevEthernet instance has no attribute 'IPv6Init'" (116375) +- removed save dialog, when switching profiles (107399) +- added generic Initstrings (115768) +- added secure.png logo +- added "-c" parameter for activate/deactivate +- changed hotkeys to avoid double entries +- use new pixmap loading code (only take local paths, if debugging is active) +- moved updateNetworkScripts() to NC_functions.py +- fallback on /etc/sysconfig/network-scripts +- removed /usr/lib/rhs/python from sys.path +- added -? as a command line option +- corrected --root= option for gui +- activate/deactivate buttons always sensitive +- check for ipsec-tools and dynamically display ipsec tab +- no second dialog while activating in system-control-network +- change hosts file on hostname change + +* Thu Jan 29 2004 Harald Hoyer - 1.3.15 +- added IPv6 support per device (111377) + +* Wed Jan 28 2004 Harald Hoyer - 1.3.14 +- modules.conf -> modprobe.conf + +* Thu Dec 18 2003 Harald Hoyer 1.3.13-2 +- added mkinstalldirs to EXTRA_DIST +- added version to provides + +* Wed Dec 17 2003 Harald Hoyer 1.3.13 +- fixed T-Online dialog #110911 +- default flow control to CTSRTS #110347 +- only clear login/pw on provider select, if provider has its own number +- fixed cancel of dialup process #103421 +- default to "/" for chrooted configuration +- default to "default" profile if none active +- fixed "activate button not active" #110193 +- scn-tui requires newt #104213 +- fixed #107816, by recognizing /var/run/ppp-ppp.pid +- fixed a bug in ISDN activate #100677 + +* Tue Dec 16 2003 Harald Hoyer 1.3.12 +- renamed redhat-config-network -> system-config-network +- added pciutils requirement +- added utf-8 encoding comments +- corrected some translation strings +- added redhat-config-network provides + +* Tue Oct 28 2003 Harald Hoyer 1.3.10 +- removed restriction on t-online password entry #105970 +- failsafe changing the error image #108094 +- corrected indention #108151 + +* Mon Oct 27 2003 Harald Hoyer 1.3.9 +- fixed 107501, 107387, 106751, 104213 +- fallback to no logfile, if opening the logfile fails +- test, if /etc/{hosts,resolv.conf} exists +- removed ipsec tab + +* Thu Oct 23 2003 Than Ngo 1.3.8 +- fix a bug in ISDN activate + +* Wed Oct 22 2003 Than Ngo 1.3.7-2 +- fix a bug in saving of ISDN config file +- add support nickname for ISDN + +* Wed Oct 8 2003 Harald Hoyer 1.3.7 +- merged in changes from Taroon + +* Thu Aug 14 2003 Harald Hoyer 1.3.6 +- fixed #100471 + +* Wed Aug 6 2003 Harald Hoyer 1.3.5 +- fixed #98251 + +* Fri Aug 1 2003 Harald Hoyer 1.3.4 +- fixed #101386 +- save wireless keys in keys file + +* Thu Jul 31 2003 Harald Hoyer 1.3.3 +- fixed #85365 +- fixed glade file loading +- more ipsec stuff +- neat can use a "chrooted" environment now (-r) +- .rpmsave will not be loaded +- no interrupt/io settings for PNP cards +- HIGIfied labels +- double click for hardware and ipsec + +* Wed Jul 2 2003 Than Ngo 1.3.2-2 +- upgrade provide database + +* Wed Jun 18 2003 Harald Hoyer 1.2.12-2 +- fixed #97562 + +* Thu Jun 17 2003 Harald Hoyer 1.2.12-1 +- wlan0 handling +- splash screen bug fixed +- improvements in HW list handling +- isdncard handling #91607 + +* Thu Jun 12 2003 Harald Hoyer 1.2.11 +- fixed #97027 +- fixed subs of - + +* Wed Jun 11 2003 Harald Hoyer 1.2.10 +- fixed #97027 #96994 +- fixed fedora bugzilla issues #326 +- update of some translations + +* Wed Jun 4 2003 Harald Hoyer 1.2.8 +- lazy file unlinking +- fixed #91620 #91583 +- ConfEHosts -> ConfFHosts + +* Mon May 19 2003 Harald Hoyer 1.2.7 +- make PAP/CHAP work again +- route files chmod(0644) +- added local variables to traceback + +* Thu May 01 2003 Harald Hoyer 1.2.6 +- use unsernetctl instead of ifdown/ifup + +* Thu May 01 2003 Harald Hoyer 1.2.5 +- fixed early import of plugins + +* Wed Apr 30 2003 Harald Hoyer 1.2.4-3 +- fixed #89915 and #89916 + +* Tue Apr 29 2003 Harald Hoyer 1.2.4-1 +- 1.2.4 bugfix release + +* Wed Apr 2 2003 Harald Hoyer 1.2.3-3 +- Bugfix release for 9 +- fixed #85011, #85703, #85653, #84956, #83640, #68169, #86476, #78043, #77763 + +* Fri Feb 21 2003 Harald Hoyer 1.2.0-2 +- bump to 1.2.0 +- fixed #84725 +- warning for #84752 + +* Fri Feb 12 2003 Harald Hoyer 1.1.97-1 +- fixed #83692 +- updated documentation + +* Mon Feb 3 2003 Harald Hoyer 1.1.94-1 +- base -> tui, gui -> base + +* Thu Jan 30 2003 Harald Hoyer 1.1.93-1 +- 1.1.93 + +* Wed Jan 29 2003 Harald Hoyer 1.1.92-1 +- 1.1.92 + +* Tue Jan 14 2003 Harald Hoyer 1.1.90-1 +- 1.1.90 + +* Thu Dec 19 2002 Than Ngo +- import ConfDevice + +* Mon Dec 16 2002 Harald Hoyer +- 1.1.86 + +* Fri Dec 13 2002 Harald Hoyer +- 1.1.85 + +* Wed Dec 11 2002 Elliot Lee 1.1.80-1 +- Remove unpackaged files + +* Mon Sep 2 2002 Than Ngo 1.1.20-1 +- don't crash by selecting provider +- Set correct HangupTimeout for ISDN connection + +* Sat Aug 31 2002 Preston Brown +- fix typo in error dialog function + +* Thu Aug 22 2002 Trond Eivind Glomsr?d 1.1.17-1 +- Make it use the gnome help system, add yelp as a dependency (#71857) +- Traceback fix: # 72581 +- translation updates + +* Wed Aug 14 2002 Harald Hoyer +- #71448 +- #71265 +- #70988 + +* Tue Aug 13 2002 Harald Hoyer 1.1.15-1 +- many bugfixes, including #71062 #69333 #68793 #69133 + +* Thu Aug 1 2002 Than Ngo 1.1.14-1 +- set correct device type for rawip ISDN connections (bug #69568) +- add some ISPs for Austria + +* Tue Jul 30 2002 Trond Eivind Glomsr?d 1.1.13-1 +- Fixes to the traceback dialog (fix "save to floppy" (we don't do that), + add i18n.) +- Fix traceback with malformed /etc/hosts (#69320) +- Fix dependencies (#69990) +- Some minor userhelper fixes + +* Thu Jul 25 2002 Trond Eivind Glomsr?d 1.1.12-1 +- doc loc fixes (images) +- add pam_timestamp support (#69869) + +* Wed Jul 24 2002 Harald Hoyer +- renamed "default" profile in GUI +- fixed device renaming in profiles + +* Wed Jul 24 2002 Trond Eivind Glomsr?d 1.1.10-1 +- More bugfixes, including #69635 #69636 +- Updated docs + +* Tue Jul 23 2002 Harald Hoyer 1.1.9-1 +- lots of bugfixes again :) + +* Wed Jul 17 2002 Harald Hoyer +- lots of bugfixes +- reactivated profile gui + +* Mon Jul 8 2002 Harald Hoyer +- lots of bugfixes, new .desktop stuff +- added desktop-file-utils BuildRequires + +* Tue Jul 2 2002 Harald Hoyer 1.1.7-1 +- cleanup, usability + +* Mon Jul 01 2002 Than Ngo 1.1.6-1 +- get rid of isdnup userisdnctl, both are now part of isdn4k-utils + +* Thu Jun 27 2002 Harald Hoyer 1.1.5-1 +- many bug fixes due to gtk2 conversion +- fixed #67273 #66200 #65185 #65073 #63963 + +* Wed Jun 26 2002 Preston Brown +- ethtool, pcmcia, wireless improvements + +* Sat Jun 22 2002 Than Ngo 1.1.4-1 +- fixed traceback bug in activate +- some fixes in glade file + +* Sun Jun 16 2002 Than Ngo 1.1.3-1 +- get_pixbuf: if no icon was not found, looks the icons + in standard icon directory +- bug fixes in wireless + +* Wed Jun 12 2002 Harald Hoyer 1.1.2-1 +- lots of i18n and migration changes +- wireless reactivated + +* Fri Jun 07 2002 Than Ngo 1.1.1-1 +- set PPPOE_TIMEOUT=80 as default, it should be about 4 times + the LCP_INTERVAL (bug #64903) + +* Wed May 29 2002 Harald Hoyer +- ported to python2, gtk2, gnome2 + +* Wed Apr 17 2002 Trond Eivind Glomsr?d +- Turn off wireless. It doesn't work with all modes, all cards + and you can't edit IP settings after the initial attempt + +* Wed Apr 17 2002 Harald Hoyer 1.0.0-1 +- moved ethmodule.so to /usr/lib +- call it 1.0.0 + +* Tue Apr 16 2002 Trond Eivind Glomsr?d 0.9.30-1 +- Updated translations +- Updated docs + +* Tue Apr 16 2002 Trond Eivind Glomsr?d 0.9.28-1 +- more fixes + +* Mon Apr 15 2002 Trond Eivind Glomsr?d 0.9.27-1 +- Update translations, more fixes + +* Mon Apr 15 2002 Harald Hoyer 0.9.26-1 +- The Most Fixes (tm) + +* Sat Apr 13 2002 Than Ngo 0.9.25-1 +- More fixes + +* Thu Apr 11 2002 Trond Eivind Glomsr?d 0.9.24-1 +- More fixes (#63177,#57064,#63207) + +* Tue Apr 09 2002 Trond Eivind Glomsr?d 0.9.23-1 +- more fixes +- updated translations + +* Thu Apr 04 2002 Trond Eivind Glomsr?d 0.9.22-1 +- more fixes, including #62697, + +* Sat Mar 30 2002 Than Ngo 0.9.21-1 +- add Token Ring/Wireless/Cipe Druids +- more fixes + +* Wed Mar 26 2002 Trond Eivind Glomsr?d 0.9.20-1 +- Rebuild... it should have more fixes + +* Wed Mar 26 2002 Than Ngo 0.9.19-1 +- add functions for status/activate/deactivate in neat +- more fixes + +* Sat Mar 16 2002 Than Ngo 0.9.18-1 +- add userisdnctl for ISDN +- more fixes + +* Thu Mar 14 2002 Trond Eivind Glomsr?d 0.9.17-1 +- Even more fixes + +* Thu Mar 14 2002 Than Ngo 0.9.16-1 +- various fixes + +* Thu Mar 14 2002 Than Ngo 0.9.15-1 +- add desktop file for neat-control +- various fixes, additions + +* Wed Mar 13 2002 Trond Eivind Glomsr?d 0.9.14-1 +- Require gnome-core, buildrequire gnome-core-devel + +* Mon Mar 11 2002 Trond Eivind Glomsr?d 0.9.13-1 +- New build +- No longer noarch + +* Thu Feb 28 2002 Trond Eivind Glomsr?d 0.9.12-1 +- Various fixes, additions + +* Tue Jan 29 2002 Trond Eivind Glomsr?d 0.9.11-1 +- build in new environment + +* Mon Jan 07 2002 Than Ngo 0.9.10.1-1 +- fixed bug #57853 + +* Tue Dec 03 2001 Trond Eivind Glomsr?d 0.9.10-1 +- minor fixes, more translations + +* Mon Nov 26 2001 Trond Eivind Glomsr?d 0.9.9-0.1 +- Trying again, with more fixes :) + +* Fri Nov 25 2001 Than Ngo 0.9.8-0.6 +- fixed bug #56145, #56146, #56147 + +* Tue Nov 20 2001 Trond Eivind Glomsr?d 0.9.8-0.5 +- prepare for errata + +* Fri Nov 02 2001 Than Ngo 0.9.7-1 +- fixed 'AVM PnP'/'Sedlbauer Speed Fax+ PnP'/'ASUS Com ISDNLink ISA PnP' +- update provider DB + +* Tue Oct 30 2001 Than Ngo 0.9.7-1 +- allow setting AVM PCI (Fritz!PCI v2) if kernel supports it +- fixed some typo bugs + +* Wed Oct 24 2001 Harald Hoyer 0.9.6-1 +- seperated gui from data layer +- make .pyc ghost files +- fixed profile/alias problem +- modem probing only once + +* Mon Oct 22 2001 Harald Hoyer 0.9.5-1 +- fixed consolehelper +- added chars [_-] ro nickname pattern +- added traceback catching dialog + +* Wed Oct 17 2001 Harald Hoyer 0.9.4-1 +- fixed /etc/hosts +- fixed pap/chap +- fixed 'save changes?' + +* Tue Oct 16 2001 Than Ngo 0.9.3-1 +- fix internet-druid fails (bug #54192) +- fix dial on demand problem from some ISDN Provider in German +- don't trace back if length of Login name is 2 (bug #54322) + +* Thu Sep 27 2001 Than Ngo 0.9.2-1 +- enable TCPIP for CIPE +- show device Tab as default if devices exist + +* Wed Sep 12 2001 Than Ngo 0.9.1-1 +- add CTC and IUCV support for s390/s390x +- disable Dialup on s390/s390x + +* Thu Sep 5 2001 Trond Eivind Glomsr?d 0.9-1 +- Add Russian + +* Wed Sep 4 2001 Phil Knirsch 0.8.4-1 +- Fixed problem with unwanted removal of entries in /etc/modules.conf (#53042) + +* Mon Sep 3 2001 Than Ngo 0.8.3-1 +- fix a bug in setting Authentication +- fix some critical typo bugs + +* Fri Aug 31 2001 Than Ngo 0.8.2-1 +- fix backtrace bug in CIPE +- fix traceback bug if self.device.Dialup is None +- if hardware is deleted, remove all devices used this hardware +- de.po: fix bad translation + +* Fri Aug 31 2001 Trond Eivind Glomsr?d 0.8.1-1 +- Add support for Czech + +* Fri Aug 31 2001 Than Ngo +- fix #52920, #52922, #52914, #52916, #52917 + +* Fri Aug 31 2001 Phil Knirsch 0.8.0-2 +- Fixed wrong option handling in /etc/modules.conf (#52853, #52923) +- Fixed empty search entry in /etc/resolv.conf (#52926) +- Fixed empty domain entry in /etc/resolv.conf (#52924) +- Fixed ethernet hardware probing traceback (#52921) + +* Tue Aug 28 2001 Than Ngo 0.8.0-1 +- fix some typo bugs + +* Tue Aug 28 2001 Trond Eivind Glomsr?d 0.7.10-1 +- minor fixes, including bootprotocol for CIPE (don't say it will use DHCP...) + +* Tue Aug 28 2001 Trond Eivind Glomsr?d 0.7.9-1 +- Not everything was marked for translation (#52650) + +* Tue Aug 28 2001 Than Ngo 0.7.8-1 +- fix some typo bugs +- fix wrong Modem entry (Bug #52601) + +* Mon Aug 27 2001 Than Ngo 0.7.7-1 +- fix wrong type CBHUP + +* Mon Aug 27 2001 Phil Knirsch 0.7.6-2 +- Fixed use of /etc/sysconfig/network (#52359) + +* Fri Aug 24 2001 Trond Eivind Glomsr?d 0.7.6-1 +- Reordered tabs, added descriptions on each of the tabs + +* Fri Aug 24 2001 Bill Nottingham 0.7.5-1 +- tokenring support + +* Thu Aug 23 2001 Phil Knirsch 0.7.4-2 +- Fixed recalculation of BROADCAST and NETWORK values if IP and netmask are + present (#51462) + +* Mon Aug 20 2001 Trond Eivind Glomsr?d 0.7.4-1 +- More bugfixes, among them #51929, #51991, #51721, #51722, + partial #52044, #51720. +- Updated translations, include more languages + +* Thu Aug 16 2001 Phil Knirsch 0.7.3-2 +- Fixed major bug in device renaming (#50885) + +* Tue Aug 14 2001 Trond Eivind Glomsr?d 0.7.3-1 +- more bugfixes, more docs, GUI fixes + +* Fri Aug 10 2001 Than Ngo 0.7.2-1 +- more bugfixes + +* Fri Aug 10 2001 Trond Eivind Glomsr?d 0.7.1-1 +- more bugfixes, more docs + +* Wed Aug 8 2001 Alexander Larsson 0.7-2 +- Install desktop files in sysconfig instead of serverconf. + +* Wed Aug 8 2001 Phil Knirsch 0.7-1 +- Added a lot of documentation +- Final changes to the Modem druid dialog and code to look just like the + hardware add dialog for modems. + +* Wed Aug 8 2001 Phil Knirsch 0.6.8-3 +- Added the modem detection for the ModemDruid. +- Added kudzu as requirement as it is needed for modem detection. +- For compatibility still check for symlinks, too. Otherwise older setups will + break. + +* Tue Aug 7 2001 Phil Knirsch 0.6.7-2 +- Fixed various important bugzilla bugs +- Added and implemented the add Hardware dialog. +- Added a working Apply button. +- Switched to using hardlinks instead of symlinks for config files. + +* Tue Aug 7 2001 Trond Eivind Glomsr?d 0.6.7-1 +- Add online help capability (#50739) + +* Mon Aug 6 2001 Trond Eivind Glomsr?d 0.6.6-1 +- Disable profiles in GUI and as necesarry in code + +* Mon Aug 6 2001 Trond Eivind Glomsr?d 0.6.5-1 +- more bugfixes +- add Conf.py from pythonlib, which has gone to the great bitbucket + in the sky + +* Sun Aug 5 2001 Than Ngo +- fix bug 50740 +- wvdial.conf readonly for root + +* Fri Aug 3 2001 Than Ngo +- fix pap/chap Login name for T-online +- fix InitStrings +- use gettext function in NC_functions +- fix loading DEFROUTE/PERSIST/DEMAND/IDLETIMEOUT for Modem dialup +- don't backtrace if 'SetVolume' and 'Dial Command' are not defined + +* Thu Aug 02 2001 Phil Knirsch 0.6.1-2 +- Fixed buggous removal of ifcfg-lo (#50478) +- Fixed problems with modem volume in hardware dialog +- Fixed missing /dev/modem for modem setup (#50673) + +* Wed Aug 2 2001 Yukihiro Nakai +- POTFILES.in list up fix +- Add Japanese translation + +* Wed Aug 02 2001 Trond Eivind Glomsr?d 0.6.2-1 +- More bugfixes + +* Tue Jul 24 2001 Than Ngo 0.6.1-1 +- Some more bugfixes... + +* Tue Jul 24 2001 Phil Knirsch 0.6-2 +- Some more bugfixes... + +* Tue Jul 24 2001 Phil Knirsch 0.6-1 +- Bumped version to 0.6 + +* Tue Jul 24 2001 Than Ngo +- add Druid for dialup connection (ISDN/ADSL/Modem) + +* Thu Jul 19 2001 Trond Eivind Glomsr?d +- Obsolete netcfg - rp3 is next, when gnome-lokkit doesn't require + it anymore +- More fixes... + +* Tue Jul 17 2001 Trond Eivind Glomsr?d +- CIPE and wireless added + +* Mon Jul 16 2001 Trond Eivind Glomsr?d +- Add i18n +- Many minor fixes... + +* Wed Jul 11 2001 Trond Eivind Glomsr?d +- Don't run autogen.sh +- Mark files in /etc as configuration files +- Multiple fixes to automake files +- Add Norwegian translation to desktop files +- install into the configuration tool desktop directory + +* Wed Jul 11 2001 Than Ngo 0.3.1-1 +- obsolete isdn-config internet-config +- requires consolehelper, alchemist +- add icon and desktop file +- use bzip2 + +* Wed Jul 11 2001 Phil Knirsch 0.3.0-2 +- Fixed critical problem during profile saving. + +* Wed Jul 10 2001 Phil Knirsch 0.3.0-1 +- 0.3.0-1 +- Final touches for beta2. Most stuff should work now. + +* Thu Jul 10 2001 Phil Knirsch 0.2.2-2 +- Added some missing files. + +* Tue Jul 10 2001 Trond Eivind Glomsr?d +- 0.2.2 + +* Tue Jul 10 2001 Trond Eivind Glomsr?d +- 0.2.1 + +* Mon Jul 9 2001 Trond Eivind Glomsr?d +- 0.2 +- New name - system-config-network. + Shortcut: neat (NEtwork Administration Tool) + +* Fri Jul 06 2001 Trond Eivind Glomsr?d +- Require a recent version of initscripts +- Initial build. Don't obsolete older tools just yet... From svn at tinysofa.org Thu Jul 1 15:40:58 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:40:58 +1000 (EST) Subject: [tinysofa-svn] r2666 - in tinysofa/snapshot: . system-config-securitylevel system-config-securitylevel/current system-config-securitylevel/current/sources system-config-securitylevel/current/specs Message-ID: <20040701154058.9A91C4E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:40:58 +1000 (Fri, 02 Jul 2004) New Revision: 2666 Added: tinysofa/snapshot/system-config-securitylevel/ tinysofa/snapshot/system-config-securitylevel/current/ tinysofa/snapshot/system-config-securitylevel/current/sources/ tinysofa/snapshot/system-config-securitylevel/current/sources/system-config-securitylevel-1.3.13.tar.bz2 tinysofa/snapshot/system-config-securitylevel/current/specs/ tinysofa/snapshot/system-config-securitylevel/current/specs/system-config-securitylevel.spec Log: - Add system-config-securitylevel to snapshot from 2.0. Added: tinysofa/snapshot/system-config-securitylevel/current/sources/system-config-securitylevel-1.3.13.tar.bz2 =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/system-config-securitylevel/current/sources/system-config-securitylevel-1.3.13.tar.bz2 ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/system-config-securitylevel/current/specs/system-config-securitylevel.spec =================================================================== --- tinysofa/snapshot/system-config-securitylevel/current/specs/system-config-securitylevel.spec 2004-07-01 15:40:57 UTC (rev 2665) +++ tinysofa/snapshot/system-config-securitylevel/current/specs/system-config-securitylevel.spec 2004-07-01 15:40:58 UTC (rev 2666) @@ -0,0 +1,313 @@ +Summary: A graphical interface for modifying the system security level +Name: system-config-securitylevel +Version: 1.3.13 +Release: 3ts +URL: http://fedora.redhat.com/projects/config-tools/ +License: GPL +ExclusiveOS: Linux +Group: System Environment/Base +Obsoletes: gnome-lokkit +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root +Source0: %{name}-%{version}.tar.bz2 +BuildRequires: newt-devel slang-devel popt +BuildRequires: gettext +Obsoletes: redhat-config-securitylevel +Requires: pygtk2 +Requires: python2 +Requires: usermode >= 1.36 +Requires: rhpl +Requires: system-config-securitylevel-tui +#Re-enable when SELinux is in better shape +#Requires: policy-sources + +%description +system-config-securitylevel is a graphical user interface for +setting basic firewall rules. + +%package tui +Summary: A text interface for modifying the system security level +Group: System Environment/Base +Obsoletes: lokkit +Obsoletes: redhat-config-securitylevel-tui +Requires: iptables >= 1.2.8 + +%description tui +system-config-securitylevel-tui is a text and commandline user +interface for setting basic firewall rules. + +%prep +%setup -q + +%build +make + +%install +make INSTROOT=$RPM_BUILD_ROOT install + +rm -rf %{buildroot}/usr/share/applications/*.desktop +rm -rf %{buildroot}/usr/share/system-config-security-level/*.desktop + +%find_lang %name + +%clean +rm -rf $RPM_BUILD_ROOT + +%preun +if [ -d /usr/share/system-config-securitylevel ] ; then + rm -rf /usr/share/system-config-securitylevel/*.pyc +fi + +%files -f %{name}.lang +%defattr(-,root,root) +%doc COPYING +#%doc doc/* +/usr/bin/system-config-securitylevel +%dir /usr/share/system-config-securitylevel +/usr/share/system-config-securitylevel/* +%dir /usr/share/firstboot/ +%dir /usr/share/firstboot/modules +/usr/share/firstboot/modules/securitylevel.py +%attr(0644,root,root) %{_datadir}/icons/hicolor/48x48/apps/system-config-securitylevel.png +%attr(0644,root,root) %config /etc/security/console.apps/system-config-securitylevel +%attr(0644,root,root) %config /etc/pam.d/system-config-securitylevel +%attr(0644,root,root) %config /etc/sysconfig/system-config-securitylevel + +%files -f %{name}.lang tui +%defattr(-,root,root) +%doc COPYING-lokkit +/usr/sbin/lokkit +/usr/bin/system-config-securitylevel-tui + +%changelog +* Tue Jun 15 2004 Elliot Lee +- rebuilt + +* Thu May 27 2004 Dan Walsh 1.3.13-2 +- Change lokkit to support new SELinux mode + +* Fri May 21 2004 Bill Nottingham 1.3.13-1 +- fix typo (#122907) + +* Fri Apr 30 2004 Brent Fox 1.3.12-1 +- turn off SELinux widgets for FC2 (bug #122046) + +* Thu Apr 15 2004 Brent Fox 1.3.11-1 +- comment out SELinux tunable widgets for now + +* Thu Apr 15 2004 Brent Fox 1.3.10-6 +- test if self.doc is None in read_tunable_file, not read_selinux_file + +* Tue Apr 13 2004 Brent Fox 1.3.10-5 +- don't write out xml file if it doesn't exist + +* Tue Apr 13 2004 Brent Fox 1.3.10-4 +- don't try to write tunable.xml if the file doesn't exist + +* Mon Apr 12 2004 Brent Fox 1.3.10-3 +- fix icon path (bug #120183) + +* Mon Apr 5 2004 Brent Fox 1.3.10-2 +- more work on SELinux code + +* Thu Apr 1 2004 Brent Fox 1.3.10-1 +- add SELinux widgets and restructure UI accordingly + +* Thu Mar 25 2004 Brent Fox 1.3.9-1 +- replace the other ports widgets (bug #111930) + +* Wed Mar 24 2004 Bill Nottingham 1.3.8-1 +- fix writing of config file if neither of --disabled or --enabled are + passed (#118667, redux) + +* Fri Mar 19 2004 Bill Nottingham 1.3.7-1 +- prefer commandline arguments to config file arguments (#118667) + +* Tue Mar 16 2004 Jeremy Katz 1.3.6-1 +- fix segfault in config reading if config files don't exist +- don't flush iptables chains if run with --nostart + +* Thu Mar 11 2004 Bill Nottingham 1.3.5-1 +- read in old config in the TUI (#25510) +- have https tag along with http (#61958) +- fix segfault (#88533) + +* Fri Mar 5 2004 Brent Fox 1.3.4-1 +- don't do strlen() on random pointer (bug #117183) + +* Thu Mar 4 2004 Brent Fox 1.3.3-1 +- fix tab ordering bug (bug #116913) + +* Tue Feb 3 2004 Brent Fox 1.3.2-1 +- F12 functionality fixed + +* Mon Jan 12 2004 Brent Fox 1.3.1-1 +- break up really long strings (bug #102455) + +* Tue Nov 18 2003 Brent Fox 1.3.0-1 +- rename to system-config-securitylevel +- obsoletes redhat-config-securitylevel +- convert to Python2.3 + +* Thu Oct 16 2003 Brent Fox 1.2.11-1 +- require iptables >=1.2.8 (bug #104777) + +* Fri Oct 3 2003 Bill Nottingham 1.2.10-1 +- minor code cleanup + +* Fri Oct 3 2003 Bill Nottingham 1.2.9-1 +- fix interactive disabling of firewall in TUI (#106243) + +* Wed Sep 17 2003 Bill Nottingham 1.2.8-2 +- rebuild + +* Wed Sep 17 2003 Bill Nottingham 1.2.8-1 +- allow ICMP in general (#104561) + +* Mon Sep 15 2003 Brent Fox 1.2.7-2 +- bump release number + +* Mon Sep 15 2003 Brent Fox 1.2.7-1 +- add Requires for rhpl + +* Thu Aug 14 2003 Brent Fox 1.2.6-1 +- fix typo (bug #101802) + +* Thu Aug 14 2003 Brent Fox 1.2.5-1 +- tag on every build + +* Tue Aug 12 2003 Brent Fox 1.2.3-2 +- bump relnum and rebuild + +* Tue Aug 12 2003 Brent Fox 1.2.3-1 +- some string changes + +* Mon Aug 11 2003 Brent Fox 1.2.2-2 +- bump relnum and rebuild + +* Mon Aug 11 2003 Brent Fox 1.2.2-1 +- reorder some UI elements + +* Thu Aug 7 2003 Bill Nottingham 1.2.1-1 +- fix rules (#101841) + +* Tue Aug 5 2003 Bill Nottingham 1.2.0-2 +- woops, RPM 101 (#101708) + +* Mon Aug 4 2003 Bill Nottingham 1.2.0-1 +- add patch for stateful firewalling (#87585, ) +- tweak tools appropriately (katzj at redhat.com), obsolete lokkit/gnome-lokkit + +* Wed Jul 2 2003 Brent Fox 1.1.3-2 +- bump relnum and rebuild + +* Wed Jul 2 2003 Brent Fox 1.1.3-1 +- use rhpl translation module + +* Tue May 27 2003 Brent Fox 1.1.2-1 +- bump rev and rebuild + +* Tue Feb 4 2003 Brent Fox 1.1.1-3 +- fix return codes for firstboot reconfig mode +- read config file in launch mode + +* Thu Jan 30 2003 Brent Fox 1.1.1-1 +- bump and build + +* Mon Jan 27 2003 Brent Fox 1.1.0-4 +- remove typo + +* Wed Jan 22 2003 Jeremy Katz 1.1.0-3 +- match dhcp handling of anaconda and lokkit + +* Tue Dec 10 2002 Brent Fox 1.1.0-2 +- fix bug 74913 + +* Tue Dec 10 2002 Brent Fox 1.1.0-1 +- save configuration in a config file in /etc/sysconfig/ so we remember settings + +* Mon Nov 18 2002 Brent Fox +- add a Requires for gnome-lokkit (bug #78057) + +* Tue Nov 12 2002 Brent Fox 1.0.1-4 +- Latest translations + +* Thu Oct 10 2002 Brent Fox 1.0.1-3 +- Mark the word Mail for translation. Fixes bug 75592 + +* Wed Aug 28 2002 Brent Fox 1.0.1-1 +- Convert to noarch + +* Wed Aug 28 2002 Brent Fox 1.0.0-3 +- pull in latest German translations + +* Tue Aug 27 2002 Brent Fox 1.0.0-2 +- Rebuild for translations + +* Mon Aug 26 2002 Brent Fox 1.0.0-1 +- connect window to destroy signal + +* Tue Aug 13 2002 Brent Fox 0.9.9-4 +- pull translations into desktop file + +* Mon Aug 12 2002 Tammy Fox 0.9.9-3 +- replace System with SystemSetup in desktop file categories + +* Sun Aug 11 2002 Brent Fox 0.9.9-2 +- fix bug 71187 + +* Tue Aug 06 2002 Brent Fox +- Mark strings for translation + +* Mon Aug 05 2002 Brent Fox 0.9.9-1 +- convert combo widget into an OptionMenu + +* Fri Aug 02 2002 Brent Fox 0.9.8-1 +- Make changes for new pam timestamp policy + +* Wed Jul 24 2002 Brent Fox 0.9.6-3 +- fix Makefiles and spec files so that translations get installed + +* Wed Jul 24 2002 Brent Fox 0.9.6-2 +- update spec file for public beta 2 + +* Wed Jul 24 2002 Tammy Fox 0.9.4-3 +- Fix desktop file (bug #69484) + +* Tue Jul 16 2002 Brent Fox 0.9.4-2 +- bump rev num and rebuild + +* Thu Jul 11 2002 Brent Fox 0.9.3-2 +- Update changelogs and rebuild + +* Thu Jul 11 2002 Brent Fox 0.9.3-1 +- Update changelogs and rebuild + +* Mon Jul 01 2002 Brent Fox 0.9.2-1 +- Bump rev number + +* Thu Jun 27 2002 Brent Fox 0.9.1-2 +- Changed window title + +* Wed Jun 26 2002 Brent Fox 0.9.1-1 +- Fixed description + +* Tue Jun 25 2002 Brent Fox 0.9.0-5 +- Create pot file + +* Mon Jun 24 2002 Brent Fox 0.9.0-4 +- Fix spec file + +* Fri Jun 21 2002 Brent Fox 0.9.0-3 +- init doDebug +- reverse ok/cancel buttons + +* Thu Jun 20 2002 Brent Fox 0.9.0-2 +- Pass doDebug into launch, not init +- Add snapsrc to Makefile + +* Sun May 26 2002 Brent Fox 0.1.0-7 +- Add debug flag + +* Tue Nov 27 2001 Brent Fox +- initial coding and packaging + From svn at tinysofa.org Thu Jul 1 15:48:16 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:48:16 +1000 (EST) Subject: [tinysofa-svn] r2753 - in tinysofa/snapshot/gmp/current: sources specs Message-ID: <20040701154816.B22624E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:48:16 +1000 (Fri, 02 Jul 2004) New Revision: 2753 Added: tinysofa/snapshot/gmp/current/sources/gmp-4.0.1-s390.patch tinysofa/snapshot/gmp/current/sources/gmp-4.1.2-autoconf.patch tinysofa/snapshot/gmp/current/sources/gmp-4.1.2-ppc64.patch tinysofa/snapshot/gmp/current/sources/gmp-4.1.3-pld-ac_fixes.patch tinysofa/snapshot/gmp/current/sources/gmp-4.1.3-pld-am_fixes.patch tinysofa/snapshot/gmp/current/sources/gmp-4.1.3-pld-x86_64.patch tinysofa/snapshot/gmp/current/sources/gmp-4.1.3.tar.bz2 Removed: tinysofa/snapshot/gmp/current/sources/gmp-4.1.2.tar.bz2 Modified: tinysofa/snapshot/gmp/current/specs/gmp.spec Log: - Sync with 2.0. - Added: - gmp-4.0.1-s390.patch: - gmp-4.1.2-autoconf.patch: - gmp-4.1.2-ppc64.patch: - gmp-4.1.3-pld-ac_fixes.patch: - gmp-4.1.3-pld-am_fixes.patch: - gmp-4.1.3-pld-x86_64.patch: - gmp-4.1.3.tar.bz2: - Removed: - gmp-4.1.2.tar.bz2: Added: tinysofa/snapshot/gmp/current/sources/gmp-4.0.1-s390.patch =================================================================== --- tinysofa/snapshot/gmp/current/sources/gmp-4.0.1-s390.patch 2004-07-01 15:48:07 UTC (rev 2752) +++ tinysofa/snapshot/gmp/current/sources/gmp-4.0.1-s390.patch 2004-07-01 15:48:16 UTC (rev 2753) @@ -0,0 +1,56 @@ +--- gmp-4.0.1/mpn/s390/gmp-mparam.h.s390 Wed May 15 21:32:57 2002 ++++ gmp-4.0.1/mpn/s390/gmp-mparam.h Wed May 15 21:33:21 2002 +@@ -20,7 +20,8 @@ + MA 02111-1307, USA. */ + + +-/* BITS_PER_MP_LIMB etc generated by configure */ ++#define BITS_PER_MP_LIMB 32 ++#define BYTES_PER_MP_LIMB 4 + + + /* Generated by tuneup.c, 2001-09-26, gcc 2.95 */ +--- ./mpn/s390x/gmp-mparam.h ++++ ./mpn/s390x/gmp-mparam.h +@@ -0,0 +1,27 @@ ++/* gmp-mparam.h -- Compiler/machine parameter header file. ++ ++Copyright (C) 1991, 1993, 1994, 1995 Free Software Foundation, Inc. ++ ++This file is part of the GNU MP Library. ++ ++The GNU MP Library is free software; you can redistribute it and/or modify ++it under the terms of the GNU Library General Public License as published by ++the Free Software Foundation; either version 2 of the License, or (at your ++option) any later version. ++ ++The GNU MP Library is distributed in the hope that it will be useful, but ++WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY ++or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public ++License for more details. ++ ++You should have received a copy of the GNU Library General Public License ++along with the GNU MP Library; see the file COPYING.LIB. If not, write to ++the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, ++MA 02111-1307, USA. */ ++ ++#define BITS_PER_MP_LIMB 64 ++#define BYTES_PER_MP_LIMB 8 ++#define BITS_PER_LONGINT 64 ++#define BITS_PER_INT 32 ++#define BITS_PER_SHORTINT 16 ++#define BITS_PER_CHAR 8 +--- ./configure.in ++++ ./configure.in +@@ -620,6 +620,11 @@ + ;; + + ++ s390x-*-*) ++ gcc_cflags="-g -O2 $fomit_frame_pointer" ++ path="s390x" ++ #extra_functions="udiv_w_sdiv" ++ ;; + # IBM s/370 and similar + [s3[6-9]0*-*-*]) + gcc_cflags="-g -O2 $fomit_frame_pointer" Added: tinysofa/snapshot/gmp/current/sources/gmp-4.1.2-autoconf.patch =================================================================== --- tinysofa/snapshot/gmp/current/sources/gmp-4.1.2-autoconf.patch 2004-07-01 15:48:07 UTC (rev 2752) +++ tinysofa/snapshot/gmp/current/sources/gmp-4.1.2-autoconf.patch 2004-07-01 15:48:16 UTC (rev 2753) @@ -0,0 +1,17 @@ +--- gmp-4.1.2/configure.in.lr 2003-06-03 09:48:52.000000000 +0200 ++++ gmp-4.1.2/configure.in 2003-06-03 09:49:39.000000000 +0200 +@@ -1338,11 +1338,11 @@ + + + # The C++ compiler, if desired. ++test_CXXFLAGS=${CXXFLAGS+set} ++AC_PROG_CXX ++ + want_cxx=no + if test $enable_cxx != no; then +- test_CXXFLAGS=${CXXFLAGS+set} +- AC_PROG_CXX +- + echo "CXXFLAGS chosen by autoconf: $CXXFLAGS" >&AC_FD_CC + cxxflags_ac_prog_cxx=$CXXFLAGS + cxxflags_list=ac_prog_cxx Added: tinysofa/snapshot/gmp/current/sources/gmp-4.1.2-ppc64.patch =================================================================== --- tinysofa/snapshot/gmp/current/sources/gmp-4.1.2-ppc64.patch 2004-07-01 15:48:07 UTC (rev 2752) +++ tinysofa/snapshot/gmp/current/sources/gmp-4.1.2-ppc64.patch 2004-07-01 15:48:16 UTC (rev 2753) @@ -0,0 +1,34 @@ +--- gmp-4.1.2/acinclude.m4.sopwith 2002-09-07 20:02:19.000000000 -0400 ++++ gmp-4.1.2/acinclude.m4 2003-02-11 10:48:30.000000000 -0500 +@@ -1003,7 +1003,7 @@ + ${tmp_underscore}underscore_test$gmp_cv_asm_label_suffix + EOF + case $host in +- *-*-aix*) ++ *-*-aix*|powerpc64-*) + cat >>conftes2.s < 4.1.2-5ts -- current (4.1.2-4ts) integrated as 4.1.2-5ts for release 1.0-U1 +* Mon May 24 2004 Thomas Woerner 4.1.3-1 +- new version 4.1.3 -* Tue May 11 2004 Omar Kilani -- Add Buildrequires m4. -- Fix permissions. +* Wed Mar 31 2004 Thomas Woerner 4.1.2-14 +- dropped RPATH (#118506) -* Sun Dec 14 2003 Erlend Midttun 4.1.2-1tr -- New upstream. +* Sat Mar 06 2004 Florian La Roche +- also build SSE2 DSOs, patch from Ulrich Drepper -* Mon Jun 23 2003 Erlend Midttun 4.1-7tr -- Added %defattr. +* Tue Mar 02 2004 Elliot Lee +- rebuilt -* Wed Jun 18 2003 Erlend Midttun 4.1-6tr -- Big rebuild +* Fri Feb 13 2004 Elliot Lee +- rebuilt -* Wed May 14 2003 Tore Olsen 4.1-5to -- only devel package should prereq on htmlinfo. -- package now buildable as user. -- devel package requires gmp 4.1. +* Thu Jan 29 2004 Thomas Woerner 4.1.2-11 +- BuildRequires for automake16 -* Wed Apr 9 2003 Gerald Dachs 4.1-4gd -- Added PreReq on htmlinfo +* Mon Dec 01 2003 Florian La Roche +- fix symlink to libgmpxx.so.3 #111135 +- add patch to factorize.c from gmp homepage -* Mon Mar 24 2003 Erlend Midttun 4.1-3em -- Rebuilt against glibc 2.3.2. +* Thu Oct 23 2003 Joe Orton 4.1.2-9 +- build with -Wa,--noexecstack -* Fri Oct 25 2002 Christian H. Toldnes 4.1-2ct -- Reintroduced info documantation using htmlinfo +* Thu Oct 23 2003 Joe Orton 4.1.2-8 +- build assembly code with -Wa,--execstack +- use parallel make +- run tests, and fix C++ therein -* Thu Aug 15 2002 Christian H. Toldnes 4.1-1ct -- New upstream version: 4.1 -- Removed info stuff. -- .spec cleanup +* Thu Oct 02 2003 Florian La Roche +- enable mpfr #104395 +- enable cxx #80195 +- add COPYING.LIB +- add fixes from gmp web-site +- remove some cruft patches for older libtool releases -* Tue Mar 27 2001 Alexander Reelsen -- Fixed a shared library/symlink problem +* Wed Jun 04 2003 Elliot Lee +- rebuilt -* Tue Mar 06 2001 Oystein Viggen -- Upgrade to v3.1.1 +* Tue Jun 03 2003 Florian La Roche +- make configure.in work with newer autoconf -* Mon Jan 24 2000 Tore Olsen -- moved info directory to /usr/share for FHS compliance +* Sun Jun 01 2003 Florian La Roche +- do not set extra_functions for s390x #92001 +* Thu Feb 13 2003 Elliot Lee 4.1.2-3 +- Add ppc64 patch, accompanied by running auto* + +* Wed Jan 22 2003 Tim Powers +- rebuilt + +* Wed Jan 01 2003 Florian La Roche +- update to 4.1.2 + +* Tue Dec 03 2002 Florian La Roche +- update to 4.1.1 +- remove un-necessary patches +- adjust s390/x86_64 patch + +* Sun Oct 06 2002 Florian La Roche +- add s390x patch +- disable current x86-64 support in longlong.h + +* Mon Jul 8 2002 Trond Eivind Glomsr?d 4.1-4 +- Add 4 patches, among them one for #67918 +- Update URL +- s/Copyright/License/ + +* Mon Jul 8 2002 Trond Eivind Glomsr?d 4.1-3 +- Redefine the configure macro, the included configure + script isn't happy about the rpm default one (#68190). Also, make + sure the included libtool isn't replaced, + +* Fri Jun 21 2002 Tim Powers +- automated rebuild + +* Sat May 25 2002 Florian La Roche +- update to version 4.1 +- patch s390 gmp-mparam.h to match other archs. + +* Thu May 23 2002 Tim Powers +- automated rebuild + +* Mon Mar 11 2002 Trond Eivind Glomsr?d 4.0.1-3 +- Use standard %%configure macro and edit %%{_tmppath} + +* Tue Feb 26 2002 Trond Eivind Glomsr?d 4.0.1-2 +- Rebuild + +* Tue Jan 22 2002 Florian La Roche +- update to 4.0.1 +- bzip2 src + +* Wed Jan 09 2002 Tim Powers +- automated rebuild + +* Sun Jun 24 2001 Elliot Lee +- Bump release + rebuild. + +* Mon Feb 05 2001 Philipp Knirsch +- Fixed bugzilla bug #25515 where GMP wouldn't work on IA64 as IA64 is not +correctly identified as a 64 bit platform. + +* Mon Dec 18 2000 Preston Brown +- include bsd mp library + +* Tue Oct 17 2000 Florian La Roche +- update to 3.1.1 + +* Sun Sep 3 2000 Florian La Roche +- update to 3.1 + +* Sat Aug 19 2000 Preston Brown +- devel subpackage depends on main package so that .so symlink is OK. + +* Thu Jul 13 2000 Prospector +- automatic rebuild + +* Sat Jun 3 2000 Nalin Dahyabhai +- switch to the configure and makeinstall macros +- FHS-compliance fixing +- move docs to non-devel package + +* Fri Apr 28 2000 Bill Nottingham +- libtoolize for ia64 + +* Fri Apr 28 2000 Florian La Roche +- update to 3.0.1 + +* Thu Apr 27 2000 Jakub Jelinek +- sparc64 fixes for 3.0 + +* Wed Apr 26 2000 Florian La Roche +- update to 3.0 + +* Mon Feb 14 2000 Matt Wilson +- #include in files that use string functions + +* Wed Feb 02 2000 Cristian Gafton +- fix description and summary + +* Mon Dec 06 1999 Michael K. Johnson +- s/GPL/LGPL/ +- build as non-root (#7604) + * Mon Sep 06 1999 Jakub Jelinek - merge in some debian gmp fixes - Ulrich Drepper's __gmp_scale2 fix @@ -166,3 +351,4 @@ - started with package from Toshio Kuratomi - cleaned up file list - fixed up install-info support + From svn at tinysofa.org Thu Jul 1 15:48:41 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:48:41 +1000 (EST) Subject: [tinysofa-svn] r2759 - in tinysofa/snapshot/hdparm/current: sources specs Message-ID: <20040701154841.BFE5F4E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:48:41 +1000 (Fri, 02 Jul 2004) New Revision: 2759 Added: tinysofa/snapshot/hdparm/current/sources/hdparm-5.5-renamevar.patch tinysofa/snapshot/hdparm/current/sources/hdparm-sysconfig Removed: tinysofa/snapshot/hdparm/current/sources/hdparm.init tinysofa/snapshot/hdparm/current/sources/hdparm.sysconfig Modified: tinysofa/snapshot/hdparm/current/specs/hdparm.spec Log: - Sync with 2.0. - Kept: - hdparm-5.5.tar.gz: - Added: - hdparm-5.5-renamevar.patch: - hdparm-sysconfig: - Removed: - hdparm.init: - hdparm.sysconfig: Added: tinysofa/snapshot/hdparm/current/sources/hdparm-5.5-renamevar.patch =================================================================== --- tinysofa/snapshot/hdparm/current/sources/hdparm-5.5-renamevar.patch 2004-07-01 15:48:38 UTC (rev 2758) +++ tinysofa/snapshot/hdparm/current/sources/hdparm-5.5-renamevar.patch 2004-07-01 15:48:41 UTC (rev 2759) @@ -0,0 +1,31 @@ +--- hdparm-5.4/hdparm.c.var 2004-02-19 10:30:54.466718170 +0100 ++++ hdparm-5.4/hdparm.c 2004-02-19 10:25:15.036986627 +0100 +@@ -52,7 +52,7 @@ + static int flagcount = 0, do_flush = 0, is_scsi_hd = 0, is_xt_hd = 0; + static int do_ctimings, do_timings = 0; + +-static unsigned long set_readahead= 0, get_readahead= 0, readahead= 0; ++static unsigned long set_readahead= 0, get_readahead= 0, hdreadahead= 0; + static unsigned long set_readonly = 0, get_readonly = 0, readonly = 0; + static unsigned long set_unmask = 0, get_unmask = 0, unmask = 0; + static unsigned long set_mult = 0, get_mult = 0, mult = 0; +@@ -785,8 +785,8 @@ + + if (set_readahead) { + if (get_readahead) +- printf(" setting fs readahead to %ld\n", readahead); +- if (ioctl(fd, BLKRASET, readahead)) ++ printf(" setting fs readahead to %ld\n", hdreadahead); ++ if (ioctl(fd, BLKRASET, hdreadahead)) + perror(" BLKRASET failed"); + } + #ifdef HDIO_UNREGISTER_HWIF +@@ -1830,7 +1830,7 @@ + case 'a': + get_readahead = noisy; + noisy = 1; +- GET_NUMBER(set_readahead,readahead); ++ GET_NUMBER(set_readahead,hdreadahead); + break; + case 'B': + get_apmmode = noisy; Added: tinysofa/snapshot/hdparm/current/sources/hdparm-sysconfig =================================================================== --- tinysofa/snapshot/hdparm/current/sources/hdparm-sysconfig 2004-07-01 15:48:38 UTC (rev 2758) +++ tinysofa/snapshot/hdparm/current/sources/hdparm-sysconfig 2004-07-01 15:48:41 UTC (rev 2759) @@ -0,0 +1,46 @@ +# +# WARNING !!! +# +# The kernel will autodetect the correct settings for most drives. +# Overriding these settings with hdparm can cause data corruption and/or +# data loss. +# Leave this file as it is unless you know exactly what you're doing !! +# +# +# +# These options are used to tune the hard drives - +# read the hdparm man page for more information + +# Set this to 1 to enable DMA. This might cause some +# data corruption on certain chipset / hard drive +# combinations. This is used with the "-d" option + +# USE_DMA=1 + +# Multiple sector I/O. a feature of most modern IDE hard drives, +# permitting the transfer of multiple sectors per I/O interrupt, +# rather than the usual one sector per interrupt. When this feature +# is enabled, it typically reduces operating system overhead for disk +# I/O by 30-50%. On many systems, it also provides increased data +# throughput of anywhere from 5% to 50%. Some drives, however (most +# notably the WD Caviar series), seem to run slower with multiple mode +# enabled. Under rare circumstances, such failures can result in +# massive filesystem corruption. USE WITH CAUTION AND BACKUP. +# This is the sector count for multiple sector I/O - the "-m" option +# +# MULTIPLE_IO=16 + +# (E)IDE 32-bit I/O support (to interface card) +# +# EIDE_32BIT=3 + +# Enable drive read-lookahead +# +# LOOKAHEAD=1 + +# Add extra parameters here if wanted +# On reasonably new hardware, you may want to try -X66, -X67 or -X68 +# Other flags you might want to experiment with are -u1, -a and -m +# See the hdparm manpage (man hdparm) for details and more options. +# +EXTRA_PARAMS= Deleted: tinysofa/snapshot/hdparm/current/sources/hdparm.init =================================================================== --- tinysofa/snapshot/hdparm/current/sources/hdparm.init 2004-07-01 15:48:38 UTC (rev 2758) +++ tinysofa/snapshot/hdparm/current/sources/hdparm.init 2004-07-01 15:48:41 UTC (rev 2759) @@ -1,57 +0,0 @@ -#!/bin/sh -# -# hdparm Sets up hard disk parameters. -# -# chkconfig: - 07 93 -# description: sets up hard disk parameters. - -# Source functions script -if [ -f /etc/init.d/functions ]; then - . /etc/init.d/functions -elif [ -f /etc/rc.d/init.d/functions ]; then - . /etc/rc.d/init.d/functions -else - exit 1 -fi - -if [ ! -f /etc/sysconfig/hdparm ]; then - STRING=$"hdparm: Could not find config file (/etc/sysconfig/hdparm)" - echo -n "$STRING" - failure "$STRING" - echo - exit 6 -fi - -if [ ! -x /sbin/hdparm ]; then - STRING=$"hdparm: Could not find binary file" - echo -n "$STRING" - failure "$STRING" - echo - exit 5 -fi - -case "$1" in - *start) - # Bare bone - echo "Setting disk parameters: " - (cat /etc/sysconfig/hdparm) | - while read device args; do - case "$device" in - /dev/hd*) - action $"$device" hdparm $args $device - ;; - *) - ;; - esac - done - ;; - stop) - ;; - *) - echo "Usage: $0 {start|stop}" - exit 2 - ;; -esac - -exit 0 - Deleted: tinysofa/snapshot/hdparm/current/sources/hdparm.sysconfig =================================================================== --- tinysofa/snapshot/hdparm/current/sources/hdparm.sysconfig 2004-07-01 15:48:38 UTC (rev 2758) +++ tinysofa/snapshot/hdparm/current/sources/hdparm.sysconfig 2004-07-01 15:48:41 UTC (rev 2759) @@ -1,8 +0,0 @@ -## Please see the hdparm(8) man page for the options in this file -## Do note that giving the wrong options here may break your system. -## -## Format is -## device -## -## Sample -# /dev/hda -W0 -d1 -c1 -m16 Modified: tinysofa/snapshot/hdparm/current/specs/hdparm.spec =================================================================== --- tinysofa/snapshot/hdparm/current/specs/hdparm.spec 2004-07-01 15:48:38 UTC (rev 2758) +++ tinysofa/snapshot/hdparm/current/specs/hdparm.spec 2004-07-01 15:48:41 UTC (rev 2759) @@ -3,13 +3,12 @@ Version: 5.5 Release: 1ts License: BSD -Group: tinysofa official +Group: Applications/System Source: http://www.ibiblio.org/pub/Linux/system/hardware/hdparm-%{version}.tar.gz -Source1: hdparm.sysconfig -Source2: hdparm.init -BuildRoot: %{_tmppath}/%{name}-root +Source1: hdparm-sysconfig +Patch0: hdparm-5.5-renamevar.patch +Buildroot: %{_tmppath}/%{name}-%{version}-root ExcludeArch: s390 s390x -PreReq: chkconfig %description Hdparm is a useful system utility for setting (E)IDE hard drive @@ -18,82 +17,65 @@ %prep %setup -q +%patch0 -p1 -b .renamevar %build perl -pi -e "s,-O2,$RPM_OPT_FLAGS,g" Makefile make %install -mkdir -p $RPM_BUILD_ROOT%{_initdir} mkdir -p $RPM_BUILD_ROOT/sbin mkdir -p $RPM_BUILD_ROOT/usr/doc mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man8 install -c -s -m 755 hdparm $RPM_BUILD_ROOT/sbin/hdparm install -c -m 644 hdparm.8 $RPM_BUILD_ROOT/%{_mandir}/man8 mkdir -p $RPM_BUILD_ROOT/etc/sysconfig -install -m 644 %SOURCE1 $RPM_BUILD_ROOT/etc/sysconfig/hdparm -install -m 755 %SOURCE2 $RPM_BUILD_ROOT%{_initdir}/hdparm +install -m 644 %SOURCE1 $RPM_BUILD_ROOT/etc/sysconfig/harddisks %clean -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT +rm -rf $RPM_BUILD_ROOT -%post -chkconfig --add hdparm - -%preun -if [ $1 == 0 ]; then - chkconfig --del hdparm -fi - %files %defattr(-,root,root) %doc hdparm.lsm Changelog -%config(noreplace) /etc/sysconfig/hdparm -%{_initdir}/hdparm +%config(noreplace) /etc/sysconfig/harddisks /sbin/hdparm %{_mandir}/man8/hdparm.8* %changelog -* Wed May 19 2004 tsintegrate 5.5-1ts -- current (5.5-1ok) integrated as 5.5-1ts for release 1.0-U1 +* Thu Feb 19 2004 Karsten Hopp 5.5-1 +- update to latest stable version +- rename variable to avoid name clash with readahead function -* Thu May 13 2004 Omar Kilani 5.5-1ok -- New Upstream. +* Fri Feb 13 2004 Elliot Lee +- rebuilt -* Wed Dec 3 2003 Erlend Midttun 5.4-8tr -- Big rebuild +* Wed Jun 04 2003 Elliot Lee +- rebuilt -* Wed Nov 19 2003 Erlend Midttun 5.4-4tr -- Can't really see how disabling write caching can be dangerous, - but I've added a warning to the sysconfig file. +* Wed Jun 04 2003 Karsten Hopp 5.4-2 +- rebuild -* Mon Jul 07 2003 Goetz Bock 5.4-3bg -- removed suggestion of (DANGEROUS) parameter in sysconfig file +* Wed Jun 04 2003 Karsten Hopp 5.4-1 +- update +- #92057 -* Fri Jul 4 2003 Erlend Midttun 5.4-2tr -- Rebuilt with -tr. +* Wed Apr 23 2003 Karsten Hopp 5.3-2 +- rebuild -* Thu Jul 3 2003 Goetz Bock 5.4-1bg -- new upstream: 5.4 -- small changes to the init script -- fixed %postun to %preun +* Wed Apr 23 2003 Karsten Hopp 5.3-1 +- update to 5.3 +- add comment to /etc/sysconfig/harddisks -* Wed Jun 18 2003 Erlend Midttun 5.2-7tr -- Big rebuild +* Wed Jan 22 2003 Tim Powers +- rebuilt -* Tue Apr 29 2003 Erlend Midttun 5.2-6em -- Fixed init script. +* Thu Dec 12 2002 Tim Powers 5.2-3 +- rebuild on all arches -* Wed Apr 9 2003 Gerald Dachs 5.2-5gd -- Added PreReq on chkconfig +* Tue Nov 19 2002 Tim Powers +- rebuild on all arches -* Mon Mar 24 2003 Erlend Midttun 5.2-4em -- Rebuilt against glibc 2.3.2. - -* Tue Sep 3 2002 Roland Kruse -- Initial version for TSL: -- fixed group - * Wed Jun 26 2002 Karsten Hopp - update to 5.2 with the following fixes: - v5.2 compile fixes for 2.5.xx @@ -102,4 +84,92 @@ - v4.9 fixed compile error with 2.5.xx kernels - v4.8 changed -Q to allow specifying queue depth - v4.7 added -z, -Q, -M flags; expanded parm range for -p -[ Rest of Red Hat changelog stripped for readability. ] \ No newline at end of file + +* Fri Jun 21 2002 Tim Powers +- automated rebuild + +* Thu May 23 2002 Tim Powers +- automated rebuild + +* Fri Feb 22 2002 Karsten Hopp +- bump version for 8.0 + +* Fri Feb 22 2002 Karsten Hopp +- rebuild in new environment + +* Wed Jan 23 2002 Karsten Hopp (4.6-1) +- Update to 4.6 + +* Mon Oct 01 2001 Karsten Hopp +- fix name of doc file (#54137) + +* Fri Jul 20 2001 Florian La Roche +- exclude s390,s390x + +* Mon Jun 25 2001 Karsten Hopp +- update to version 4.1 +- update URL + +* Wed Jul 19 2000 Bernhard Rosenkr?nzer +- disable readahead (#14268) +- add comment in /etc/sysconfig/harddisks about possible extra parameters + +* Thu Jul 13 2000 Prospector +- automatic rebuild + +* Wed Jul 12 2000 Trond Eivind Glomsr?d +- disable 32 bit interfacing (#13730) + +* Tue Jun 27 2000 Trond Eivind Glomsr?d +- use %%{_tmppath} +- add /etc/sysconfig/harddisks, a new file for hardisk + optimization parameters + +* Mon Jun 18 2000 Bernhard Rosenkr?nzer +- FHSify + +* Sun Apr 9 2000 Bernhard Rosenkr?nzer +- Fix compilation with kernel 2.3.* + +* Thu Feb 17 2000 Bernhard Rosenkr?nzer +- 3.9 +- handle RPM_OPT_FLAGS + +* Thu Feb 17 2000 Bernhard Rosenkr?nzer +- Use O_NONBLOCK when opening devices so we can manipulate CD-ROM drives + with no media inserted, even when running a current kernel (Bug #6457) + +* Sat Feb 5 2000 Bill Nottingham +- build as non-root user (#6458) + +* Fri Feb 4 2000 Bernhard Rosenkr?nzer +- deal with RPM compressing man pages + +* Fri Nov 19 1999 Bernhard Rosenkraenzer +- 3.6 + +* Thu Aug 12 1999 Cristian Gafton +- version 3.5 + +* Wed Mar 24 1999 Cristian Gafton +- added patches from UP + +* Sun Mar 21 1999 Cristian Gafton +- auto rebuild in the new build environment (release 4) + +* Tue Dec 29 1998 Cristian Gafton +- build for 6.0 + +* Fri Apr 24 1998 Prospector System +- translations modified for de, fr, tr + +* Wed Apr 08 1998 Erik Troan +- updated to 3.3 +- build rooted + +* Fri Oct 31 1997 Donnie Barnes +- fixed spelling error in summary + +* Mon Jun 02 1997 Erik Troan +- built against glibc + From svn at tinysofa.org Thu Jul 1 15:49:47 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:49:47 +1000 (EST) Subject: [tinysofa-svn] r2770 - in tinysofa/snapshot/less/current: sources specs Message-ID: <20040701154947.DBD324E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:49:47 +1000 (Fri, 02 Jul 2004) New Revision: 2770 Added: tinysofa/snapshot/less/current/sources/less-382-ncursesw.patch Modified: tinysofa/snapshot/less/current/sources/less.csh tinysofa/snapshot/less/current/sources/less.sh tinysofa/snapshot/less/current/sources/lesspipe.sh tinysofa/snapshot/less/current/specs/less.spec Log: - Sync with 2.0. - Kept: - less-382.tar.gz: - less.csh: - less.sh: - lesspipe.sh: - Added: - less-382-ncursesw.patch: Added: tinysofa/snapshot/less/current/sources/less-382-ncursesw.patch =================================================================== --- tinysofa/snapshot/less/current/sources/less-382-ncursesw.patch 2004-07-01 15:49:44 UTC (rev 2769) +++ tinysofa/snapshot/less/current/sources/less-382-ncursesw.patch 2004-07-01 15:49:47 UTC (rev 2770) @@ -0,0 +1,30 @@ +--- less-382/configure.ac.ncursesw 2004-03-02 11:54:04.497369060 +0100 ++++ less-382/configure.ac 2004-03-02 11:56:08.311247569 +0100 +@@ -24,6 +24,7 @@ + + # Checks for general libraries. + AC_CHECK_LIB(xcurses, initscr, [have_xcurses=yes], [have_xcurses=no]) ++AC_CHECK_LIB(ncursesw, initscr, [have_ncursesw=yes], [have_ncursesw=no]) + AC_CHECK_LIB(ncurses, initscr, [have_ncurses=yes], [have_ncurses=no]) + AC_CHECK_LIB(curses, initscr, [have_curses=yes], [have_curses=no]) + AC_CHECK_LIB(termcap, tgetent, [have_termcap=yes], [have_termcap=no]) +@@ -63,6 +64,19 @@ + fi + fi + ++dnl -- Try ncursesw. ++if test "x$TERMLIBS" = x; then ++ if test $have_ncursesw = yes; then ++ TERMLIBS="-lncursesw" ++ SAVE_LIBS=$LIBS ++ LIBS="$LIBS $TERMLIBS" ++ AC_TRY_LINK(, [tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0);], ++ [termok=yes], [termok=no]) ++ LIBS=$SAVE_LIBS ++ if test $termok = no; then TERMLIBS=""; fi ++ fi ++fi ++ + # -- Try ncurses. + if test "x$TERMLIBS" = x; then + if test $have_ncurses = yes; then Modified: tinysofa/snapshot/less/current/sources/less.csh =================================================================== --- tinysofa/snapshot/less/current/sources/less.csh 2004-07-01 15:49:44 UTC (rev 2769) +++ tinysofa/snapshot/less/current/sources/less.csh 2004-07-01 15:49:47 UTC (rev 2770) @@ -1,3 +1,4 @@ # less initialization script (csh) -setenv LESSCHARSET iso8859 -test -x /usr/bin/lesspipe.sh && setenv LESSOPEN "|/usr/bin/lesspipe.sh %s" +if ( -x /usr/bin/lesspipe.sh ) then + setenv LESSOPEN "|/usr/bin/lesspipe.sh %s" +endif Modified: tinysofa/snapshot/less/current/sources/less.sh =================================================================== --- tinysofa/snapshot/less/current/sources/less.sh 2004-07-01 15:49:44 UTC (rev 2769) +++ tinysofa/snapshot/less/current/sources/less.sh 2004-07-01 15:49:47 UTC (rev 2770) @@ -1,6 +1,2 @@ # less initialization script (sh) -LESSCHARSET="iso8859" -export LESSCHARSET -if [ -x /usr/bin/lesspipe.sh ] ; then - export LESSOPEN="|/usr/bin/lesspipe.sh %s" -fi +[ -x /usr/bin/lesspipe.sh ] && export LESSOPEN="|/usr/bin/lesspipe.sh %s" Modified: tinysofa/snapshot/less/current/sources/lesspipe.sh =================================================================== --- tinysofa/snapshot/less/current/sources/lesspipe.sh 2004-07-01 15:49:44 UTC (rev 2769) +++ tinysofa/snapshot/less/current/sources/lesspipe.sh 2004-07-01 15:49:47 UTC (rev 2770) @@ -1,29 +1,51 @@ -#!/bin/sh +#!/bin/sh - # # To use this filter with less, define LESSOPEN: -# export LESSOPEN="|/usr/local/bin/lesspipe.sh %s" +# export LESSOPEN="|/usr/bin/lesspipe.sh %s" lesspipe() { case "$1" in - *.tar) tar tvvf $1 2>/dev/null ;; # View contents of .tar and .tgz files - *.tgz) tar tzvvf $1 2>/dev/null ;; - *.tar.gz) tar tzvvf $1 2>/dev/null ;; - *.tar.bz2) bzip2 -dc $1 | tar tvvf - 2>/dev/null ;; - *.tar.Z) tar tzvvf $1 2>/dev/null ;; - *.tar.z) tar tzvvf $1 2>/dev/null ;; - *.Z) gzip -dc $1 2>/dev/null ;; # View compressed files correctly - *.z) gzip -dc $1 2>/dev/null ;; - *.gz) gzip -dc $1 2>/dev/null ;; - *.bz2) bzip2 -dc $1 2>/dev/null ;; - *.zip) unzip -l $1 2>/dev/null ;; - *.rpm) rpm -qpivl $1 2>/dev/null ;; # view contents of .rpm files - *.1|*.2|*.3|*.4|*.5|*.6|*.7|*.8|*.9|*.n|*.man) FILE=`file -L $1` ; # groff src - FILE=`echo $FILE | cut -d ' ' -f 2` - if [ "$FILE" = "troff" ]; then - groff -s -p -t -e -Tascii -mandoc $1 - fi ;; + *.[1-9n]|*.man|*.[1-9n].bz2|*.man.bz2|*.[1-9].gz|*.[1-9]x.gz|*.[1-9].man.gz) + case "$1" in + *.gz) DECOMPRESSOR="gunzip -c" ;; + *.bz2) DECOMPRESSOR="bunzip2 -c" ;; + *) DECOMPRESSOR="cat" ;; + esac + if $DECOMPRESSOR -- "$1" | file - | grep -q troff; then + if echo "$1" | grep -q ^/; then #absolute path + man -- "$1" | cat -s + else + man -- "./$1" | cat -s + fi + else + $DECOMPRESSOR -- "$1" + fi ;; + *.tar) tar tvvf "$1" ;; + *.tgz|*.tar.gz|*.tar.[zZ]) tar tzvvf "$1" ;; + *.tar.bz2|*.tbz2) bzip2 -dc "$1" | tar tvvf - ;; + *.[zZ]|*.gz) gzip -dc -- "$1" ;; + *.bz2) bzip2 -dc -- "$1" ;; + *.zip) zipinfo -- "$1" ;; + *.rpm) rpm -qpivl --changelog -- "$1" ;; + *.cpi|*.cpio) cpio -itv < "$1" ;; + *.gif|*.jpeg|*.jpg|*.pcd|*.png|*.tga|*.tiff|*.tif) + if [ -x "`which identify`" ]; then + identify "$1" + else + echo "No identify available" + echo "Install ImageMagick to browse images" + fi ;; + *) + case "$1" in + *.gz) DECOMPRESSOR="gunzip -c" ;; + *.bz2) DECOMPRESSOR="bunzip2 -c" ;; + esac + $DECOMPRESSOR -- "$1" ;; esac } -lesspipe $1 - +if [ -d "$1" ] ; then + /bin/ls -alF -- "$1" +else + lesspipe "$1" 2> /dev/null +fi Modified: tinysofa/snapshot/less/current/specs/less.spec =================================================================== --- tinysofa/snapshot/less/current/specs/less.spec 2004-07-01 15:49:44 UTC (rev 2769) +++ tinysofa/snapshot/less/current/specs/less.spec 2004-07-01 15:49:47 UTC (rev 2770) @@ -1,17 +1,20 @@ Summary: A text file browser similar to more, but better. Name: less Version: 382 -Release: 5ts +Release: 3ts License: GPL -Group: tinysofa official -Source: http://www.greenwoodsoftware.com/less/less-%{version}.tar.gz +Group: Applications/Text +Source: http://www.greenwoodsoftware.com/less/%{name}-%{version}.tar.gz Source1: lesspipe.sh Source2: less.sh Source3: less.csh -BuildRoot: %{_tmppath}/%{name}-root -BuildRequires: libtermcap-devel, ncurses-devel +Patch0: less-382-ncursesw.patch +URL: http://www.greenwoodsoftware.com/less/ +Buildroot: %{_tmppath}/%{name}-%{version}-root +BuildRequires: ncurses-devel + %description The less utility is a text file browser that resembles more, but has more capabilities. Less allows you to move backwards in the file as @@ -23,21 +26,19 @@ files, and you'll use it frequently. %prep -%setup -q -n %{name}-%{version} +%setup -q +%patch0 -p1 -b .ncursesw +chmod -R a+w * %build %configure -make CFLAGS="$RPM_OPT_FLAGS -D_FILE_OFFSET_BITS=64" +make CC="gcc $RPM_OPT_FLAGS -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64" datadir=%{_docdir} %install -mkdir -p $RPM_BUILD_ROOT -make prefix=$RPM_BUILD_ROOT/usr \ - bindir=$RPM_BUILD_ROOT/usr/bin \ - mandir=$RPM_BUILD_ROOT/%{_mandir} install - -strip -R .comments $RPM_BUILD_ROOT/usr/bin/less +rm -rf $RPM_BUILD_ROOT +%makeinstall +strip -R .comment $RPM_BUILD_ROOT/usr/bin/less mkdir -p $RPM_BUILD_ROOT/etc/profile.d -mkdir -p $RPM_BUILD_ROOT/usr/share install -c -m 755 %{SOURCE1} $RPM_BUILD_ROOT/usr/bin/ install -c -m 755 %{SOURCE2} $RPM_BUILD_ROOT/etc/profile.d install -c -m 755 %{SOURCE3} $RPM_BUILD_ROOT/etc/profile.d @@ -46,57 +47,154 @@ %defattr(-,root,root) /etc/profile.d/* /usr/bin/* -/usr/share/man/man1/* +%{_mandir}/man1/* %clean -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT +rm -rf $RPM_BUILD_ROOT %changelog -* Wed May 19 2004 tsintegrate 382-5ts -- current (382-4ts) integrated as 382-5ts for release 1.0-U1 +* Mon Mar 29 2004 Karsten Hopp 382-3 +- remove old stuff from /etc/profile.d/less.*, fixes #109011 -* Mon May 10 2004 Omar Kilani -- Add BuildRequires libtermcap-devel, ncurses-devel +* Tue Mar 02 2004 Karsten Hopp 382-1.1 +- build for FC1 -* Wed Feb 18 2004 Omar Kilani 382-1ok -- New upstream. +* Sat Feb 14 2004 Karsten Hopp 382-1 +- new upstream version -* Fri Dec 5 2003 Erlend Midttun 381-1tr -- New upstream. +* Fri Feb 13 2004 Elliot Lee +- rebuilt -* Mon Oct 20 2003 Michael Scheffler 376-6ms -- Added $RPM_OPT_FLAGS -- Added 64bit file support +* Thu Jan 15 2004 Karsten Hopp 381-2 +- drop iso247 patch, doesn't work -* Mon Jun 23 2003 Erlend Midttun 376-5tr -- Added %defattr. +* Wed Jun 11 2003 Karsten Hopp 381-1 +- new version with rewritten iso247 patch -* Wed Jun 18 2003 Erlend Midttun 376-4tr -- Big rebuild +* Wed Jun 04 2003 Elliot Lee +- rebuilt -* Thu May 15 2003 Erlend Midttun 376-3em -- Added LESSCHARSET -> iso8859 +* Wed May 28 2003 Florian La Roche +- fix korean #79977 +- add new less.sh from #89780, s/ko/korean/ and write .csh script +- add patch from #91661: /japanses/japanese-euc/ -* Mon Mar 24 2003 Erlend Midttun 376-2em -- Rebuilt against glibc 2.3.2. +* Tue Feb 4 2003 Tim Waugh 378-7 +- Part of multibyte patch was missing; fixed. -* Wed Jul 24 2002 Christian H. Toldnes 376-1ct -- New upstream version: 376 -- Changed back to original version numbers, as this is what the author wants. +* Mon Feb 3 2003 Tim Waugh 378-6 +- Fix underlining multibyte characters (bug #83377). -* Wed Jul 3 2002 Christian H. Toldnes 0.0.374-1ct -- Update to 374, called it 0.0.374 since this is for TSL 2.0 -- spec file cleanup +* Thu Jan 30 2003 Karsten Hopp 378-5 +- removed older, unused patches +- add patch from Yukihiro Nakai to fix display of japanese text + (#79977) -* Wed Sep 13 2000 Erlend Midttun -- version 358 +* Wed Jan 22 2003 Tim Powers +- rebuilt -* Thu May 11 2000 Oystein Viggen -- version 354 +* Wed Dec 18 2002 Karsten Hopp ? +- removed default 'cat' from lesspipe.sh as it breaks 'v' and 'F' keys + (#79921) -* Wed Mar 29 2000 Lars Gaarden -- Moved man pages to /usr/share, FHS. +* Fri Dec 6 2002 Nalin Dahyabhai 378-2 +- add a default case to lesspipe so that it shows other kinds of files +* Mon Nov 04 2002 Karsten Hopp +- less-378 +- added some debian patches +- show image info instead of binary garbage when viewing images + +* Fri Oct 05 2001 Karsten Hopp +- fix line numbering (less -N filename), caused by + a broken i18n patch + +* Tue Sep 04 2001 Karsten Hopp +- recompile with large file support (#52945) + +* Tue Jul 24 2001 Karsten Hopp +- fix #49506 (BuildRequires) + +* Mon Jun 25 2001 Nalin Dahyabhai +- fixup eline patch to initialize result correctly + +* Mon Jun 25 2001 Karsten Hopp +- update URLs +- Copyright -> License +- fix #43348 (crashes when searching for /<) +- fix #39849 ( + _ ignores LESSCHARDEF in displaying characters, + _ prefaces sequences of one or "high" characters with a capital "A") + +* Mon Feb 5 2001 Yukihiro Nakai +- Update less.sh, less.csh to set JLESSCHARSET=japanese + when LANG=ja?? + +* Mon Feb 5 2001 Matt Wilson +- changed the less-358+iso247-20001210.diff patch to use strcasecmp when + comparing locale names + +* Thu Feb 01 2001 Karsten Hopp +- fixed character translations (bugzilla #24463) + +* Wed Jan 31 2001 Karsten Hopp +- fixed lesspipe (bugzilla #17456 #25324) + +* Tue Dec 12 2000 Bernhard Rosenkraenzer +- rebuild with new ncurses + +* Mon Dec 11 2000 Yukihiro Nakai +- Add Japanese patch with ia64 support. + +* Mon Nov 27 2000 Karsten Hopp +- rebuild with new ncurses +- fix Bug #21288 + +* Mon Nov 13 2000 Karsten Hopp +- fixed handling of manpages of type *.1x.gz +- added support for cpio packages + +* Thu Sep 14 2000 Than Ngo +- added new lesspipe.sh (Bug #17456) + +* Wed Aug 23 2000 Bernhard Rosenkraenzer +- support files with spaces in their names (Bug #16777) + +* Tue Aug 8 2000 Bernhard Rosenkraenzer +- Support gzipped man pages in lesspipe.sh (Bug #15610) + +* Thu Aug 3 2000 Bernhard Rosenkraenzer +- Tweak init script (Bug #14622) + +* Thu Jul 27 2000 Bernhard Rosenkraenzer +- Oops, actually apply the patch for 9443. ;) + +* Wed Jul 26 2000 Bernhard Rosenkraenzer +- Fix up messed output if a user outputs anything in ~/.bashrc or the + likes (Bug #9443) +- handle RPM_OPT_FLAGS + +* Thu Jul 13 2000 Prospector +- automatic rebuild + +* Thu Jul 13 2000 Bernhard Rosenkraenzer +- 358 + +* Mon Jun 26 2000 Matt Wilson +- defattr root + +* Mon Jun 19 2000 Bernhard Rosenkraenzer +- FHSify + +* Fri Apr 14 2000 Bernhard Rosenkraenzer +- 354 + +* Mon Mar 20 2000 Bernhard Rosenkraenzer +- Update to v352 + +* Tue Mar 7 2000 Jeff Johnson +- rebuild for sparc baud rates > 38400. + * Tue Jan 25 2000 Bernhard Rosenkraenzer - Update to v346 - Update download URL @@ -133,4 +231,4 @@ - added buildroot * Mon Jun 02 1997 Erik Troan -- built against glibc \ No newline at end of file +- built against glibc From svn at tinysofa.org Thu Jul 1 15:53:16 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:53:16 +1000 (EST) Subject: [tinysofa-svn] r2819 - in tinysofa/snapshot/portmap/current: sources specs Message-ID: <20040701155316.22AC54E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:53:15 +1000 (Fri, 02 Jul 2004) New Revision: 2819 Added: tinysofa/snapshot/portmap/current/sources/portmap-4.0-cleanup.patch tinysofa/snapshot/portmap/current/sources/portmap-4.0-pie.patch tinysofa/snapshot/portmap/current/sources/portmap-4.0-rpc_user.patch tinysofa/snapshot/portmap/current/sources/portmap-4.0-sigpipe.patch Modified: tinysofa/snapshot/portmap/current/sources/portmap-4.0-errno.patch tinysofa/snapshot/portmap/current/sources/portmap-4.0-linux.patch tinysofa/snapshot/portmap/current/sources/portmap.8 tinysofa/snapshot/portmap/current/sources/portmap.init tinysofa/snapshot/portmap/current/specs/portmap.spec Log: - Sync with 2.0. - Kept: - pmap_dump.8: - pmap_set.8: - portmap-4.0-errno.patch: - portmap-4.0-linux.patch: - portmap-malloc.patch: - portmap.8: - portmap.init: - portmap_4.tar.gz: - Added: - portmap-4.0-cleanup.patch: - portmap-4.0-pie.patch: - portmap-4.0-rpc_user.patch: - portmap-4.0-sigpipe.patch: Added: tinysofa/snapshot/portmap/current/sources/portmap-4.0-cleanup.patch =================================================================== --- tinysofa/snapshot/portmap/current/sources/portmap-4.0-cleanup.patch 2004-07-01 15:53:09 UTC (rev 2818) +++ tinysofa/snapshot/portmap/current/sources/portmap-4.0-cleanup.patch 2004-07-01 15:53:15 UTC (rev 2819) @@ -0,0 +1,85 @@ +Some cleanup for my last patch. + + +-- +H.J. Lu (hjl at gnu.org) +-- +--- portmap_4/pmap_check.c.hostname Wed May 10 10:23:35 2000 ++++ portmap_4/pmap_check.c Wed May 10 11:03:22 2000 +@@ -35,6 +35,7 @@ + static char sccsid[] = "@(#) pmap_check.c 1.6 93/11/21 20:58:59"; + #endif + #include ++#include + #include + #include + #include +@@ -69,8 +70,6 @@ int deny_severity = LOG_WARNING; + /* coming from libwrap.a (tcp_wrappers) */ + extern int hosts_ctl(char *daemon, char *name, char *addr, char *user); + +-#define good_client(a) hosts_ctl("portmap", "", inet_ntoa(a->sin_addr), "") +- + #define legal_port(a,p) \ + (ntohs((a)->sin_port) < IPPORT_RESERVED || (p) >= IPPORT_RESERVED) + +@@ -88,6 +87,59 @@ extern int hosts_ctl(char *daemon, char + + #define log_client(addr, proc, prog) \ + logit(allow_severity, addr, proc, prog, "") ++ ++#ifdef HOSTS_ACCESS ++static int ++good_client(addr) ++struct sockaddr_in *addr; ++{ ++ struct hostent *hp; ++ char **sp; ++ char *tmpname; ++ ++ /* Check the IP address first. */ ++ if (hosts_ctl("portmap", "", inet_ntoa(addr->sin_addr), "")) ++ return 1; ++ ++ /* Check the hostname. */ ++ hp = gethostbyaddr ((const char *) &(addr->sin_addr), ++ sizeof (addr->sin_addr), AF_INET); ++ ++ if (!hp) ++ return 0; ++ ++ /* must make sure the hostent is authorative. */ ++ tmpname = alloca (strlen (hp->h_name) + 1); ++ strcpy (tmpname, hp->h_name); ++ hp = gethostbyname(tmpname); ++ if (hp) { ++ /* now make sure the "addr->sin_addr" is on the list */ ++ for (sp = hp->h_addr_list ; *sp ; sp++) { ++ if (memcmp(*sp, &(addr->sin_addr), hp->h_length)==0) ++ break; ++ } ++ if (!*sp) ++ /* it was a FAKE. */ ++ return 0; ++ } ++ else ++ /* never heard of it. misconfigured DNS? */ ++ return 0; ++ ++ /* Check the official name first. */ ++ if (hosts_ctl("portmap", "", hp->h_name, "")) ++ return 1; ++ ++ /* Check aliases. */ ++ for (sp = hp->h_aliases; *sp ; sp++) { ++ if (hosts_ctl("portmap", "", *sp, "")) ++ return 1; ++ } ++ ++ /* No match */ ++ return 0; ++} ++#endif + + /* check_startup - additional startup code */ + Modified: tinysofa/snapshot/portmap/current/sources/portmap-4.0-errno.patch =================================================================== --- tinysofa/snapshot/portmap/current/sources/portmap-4.0-errno.patch 2004-07-01 15:53:09 UTC (rev 2818) +++ tinysofa/snapshot/portmap/current/sources/portmap-4.0-errno.patch 2004-07-01 15:53:15 UTC (rev 2819) @@ -1,23 +1,18 @@ -diff -Nru portmap_4.orig/Makefile portmap_4/Makefile ---- portmap_4.orig/Makefile 2003-03-26 15:17:32.000000000 +0100 -+++ portmap_4/Makefile 2003-03-26 15:19:19.000000000 +0100 -@@ -50,7 +50,7 @@ +--- portmap_4/portmap.c.old 1996-05-31 09:52:59.000000000 -0400 ++++ portmap_4/portmap.c 2002-12-13 11:44:16.000000000 -0500 +@@ -94,6 +94,7 @@ + #ifdef SYSV40 + #include + #endif ++#include - # Auxiliary object files that may be missing from your C library. - # --AUX = daemon.o strerror.o -+AUX = daemon.o # strerror.o + extern char *strerror(); + #include +@@ -124,7 +125,6 @@ + static void callit(); + struct pmaplist *pmaplist; + int debugging = 0; +-extern int errno; - # NEXTSTEP is a little different. The following seems to work with NS 3.2 - # -diff -Nru portmap_4.orig/portmap.c portmap_4/portmap.c ---- portmap_4.orig/portmap.c 2003-03-26 15:17:32.000000000 +0100 -+++ portmap_4/portmap.c 2003-03-26 15:20:01.000000000 +0100 -@@ -85,6 +85,7 @@ - #include - #include - #include -+#include - #include - #include - #include + #include "pmap_check.h" + Modified: tinysofa/snapshot/portmap/current/sources/portmap-4.0-linux.patch =================================================================== --- tinysofa/snapshot/portmap/current/sources/portmap-4.0-linux.patch 2004-07-01 15:53:09 UTC (rev 2818) +++ tinysofa/snapshot/portmap/current/sources/portmap-4.0-linux.patch 2004-07-01 15:53:15 UTC (rev 2819) @@ -1,14 +1,5 @@ --- portmap_4/Makefile.orig Fri May 31 09:50:40 1996 +++ portmap_4/Makefile Fri Aug 9 17:40:43 1996 -@@ -46,7 +46,7 @@ - # libwrap.a object library. WRAP_DIR should specify the directory with - # that library. - --WRAP_DIR= ../tcp_wrappers -+WRAP_DIR= /usr/lib - - # Auxiliary object files that may be missing from your C library. - # @@ -67,9 +67,9 @@ SHELL = /bin/sh @@ -21,3 +12,16 @@ OBJECTS = portmap.o pmap_check.o from_local.o $(AUX) all: portmap pmap_dump pmap_set +--- portmap_4/Makefile.bad 1996-05-31 09:50:40.000000000 -0400 ++++ portmap_4/Makefile 2002-12-12 09:54:00.000000000 -0500 +@@ -74,8 +74,8 @@ + + all: portmap pmap_dump pmap_set + +-portmap: $(OBJECTS) $(WRAP_DIR)/libwrap.a +- $(CC) $(CFLAGS) -o $@ $(OBJECTS) $(WRAP_DIR)/libwrap.a $(LIBS) ++portmap: $(OBJECTS) ++ $(CC) $(CFLAGS) -o $@ $(OBJECTS) $(LIBS) + + pmap_dump: pmap_dump.c + $(CC) $(CFLAGS) -o $@ $? $(LIBS) Added: tinysofa/snapshot/portmap/current/sources/portmap-4.0-pie.patch =================================================================== --- tinysofa/snapshot/portmap/current/sources/portmap-4.0-pie.patch 2004-07-01 15:53:09 UTC (rev 2818) +++ tinysofa/snapshot/portmap/current/sources/portmap-4.0-pie.patch 2004-07-01 15:53:15 UTC (rev 2819) @@ -0,0 +1,42 @@ +--- portmap_4/Makefile.pie 2003-10-28 20:18:32.000000000 -0800 ++++ portmap_4/Makefile 2003-10-28 20:18:32.000000000 -0800 +@@ -74,8 +74,11 @@ + + all: portmap pmap_dump pmap_set + ++$(OBJECTS): %.o: %.c ++ $(CC) $(CFLAGS) -fpie -c $< ++ + portmap: $(OBJECTS) +- $(CC) $(CFLAGS) -o $@ $(OBJECTS) $(LIBS) ++ $(CC) $(CFLAGS) -o $@ -pie $(OBJECTS) $(LIBS) + + pmap_dump: pmap_dump.c + $(CC) $(CFLAGS) -o $@ $? $(LIBS) +--- portmap_4/pmap_check.h.pie 2003-10-28 20:26:34.000000000 -0800 ++++ portmap_4/pmap_check.h 2003-10-28 20:26:49.000000000 -0800 +@@ -6,6 +6,6 @@ + extern int check_setunset(); + extern int check_privileged_port(); + extern int check_callit(); +-extern int verboselog; +-extern int allow_severity; +-extern int deny_severity; ++extern int verboselog __attribute__ ((visibility ("hidden"))); ++extern int allow_severity __attribute__ ((visibility ("hidden"))); ++extern int deny_severity __attribute__ ((visibility ("hidden"))); +--- portmap_4/pmap_check.c.pie 2003-10-28 20:27:38.000000000 -0800 ++++ portmap_4/pmap_check.c 2003-10-28 20:27:40.000000000 -0800 +@@ -63,9 +63,9 @@ + + static void logit(); + static void toggle_verboselog(); +-int verboselog = 0; +-int allow_severity = LOG_INFO; +-int deny_severity = LOG_WARNING; ++int verboselog __attribute ((visibility ("hidden"))) = 0; ++int allow_severity __attribute ((visibility ("hidden"))) = LOG_INFO; ++int deny_severity __attribute ((visibility ("hidden"))) = LOG_WARNING; + + /* A handful of macros for "readability". */ + Added: tinysofa/snapshot/portmap/current/sources/portmap-4.0-rpc_user.patch =================================================================== --- tinysofa/snapshot/portmap/current/sources/portmap-4.0-rpc_user.patch 2004-07-01 15:53:09 UTC (rev 2818) +++ tinysofa/snapshot/portmap/current/sources/portmap-4.0-rpc_user.patch 2004-07-01 15:53:15 UTC (rev 2819) @@ -0,0 +1,72 @@ +--- portmap_4/daemon.c.rpcuser Wed Feb 28 18:42:17 2001 ++++ portmap_4/daemon.c Wed Feb 28 18:42:17 2001 +@@ -35,6 +35,7 @@ + static char sccsid[] = "@(#)daemon.c 5.3 (Berkeley) 12/28/90"; + #endif /* LIBC_SCCS and not lint */ + ++#include + #include + #include + #include +--- portmap_4/pmap_check.c.rpcuser Wed Feb 28 18:42:17 2001 ++++ portmap_4/pmap_check.c Wed Feb 28 18:50:28 2001 +@@ -40,6 +40,8 @@ + #include + #include + #include ++#include ++#include + #include + #ifdef SYSV40 + #include +@@ -149,11 +151,47 @@ + /* + * Give up root privileges so that we can never allocate a privileged + * port when forwarding an rpc request. ++ * ++ * Fix 8/3/00 Philipp Knirsch: First lookup our rpc user. If we find it, ++ * switch to that uid, otherwise simply resue the old bin user and print ++ * out a warning in syslog. + */ +- if (setuid(1) == -1) { +- syslog(LOG_ERR, "setuid(1) failed: %m"); +- exit(1); ++ ++ struct passwd *pwent; ++ ++ pwent = getpwnam("rpc"); ++ if (pwent == NULL) { ++ syslog(LOG_WARNING, "user rpc not found, reverting to user bin"); ++ if (setgid(1) == -1) { ++ syslog(LOG_ERR, "setgid(1) failed: %m"); ++ exit(1); ++ } ++ if (setuid(1) == -1) { ++ syslog(LOG_ERR, "setuid(1) failed: %m"); ++ exit(1); ++ } + } ++ else { ++ if (setgroups(0,NULL) == -1) { ++ syslog(LOG_WARNING,"setgroups() to clear group memberships failed: %m"); ++ } ++ ++ if (setgid(pwent->pw_gid) == -1) { ++ syslog(LOG_WARNING, "setgid() to rpc group failed: %m"); ++ if (setgid(1) == -1) { ++ syslog(LOG_ERR, "setgid(1) failed: %m"); ++ exit(1); ++ } ++ } ++ if (setuid(pwent->pw_uid) == -1) { ++ syslog(LOG_WARNING, "setuid() to rpc user failed: %m"); ++ if (setuid(1) == -1) { ++ syslog(LOG_ERR, "setuid(1) failed: %m"); ++ exit(1); ++ } ++ } ++ } ++ + (void) signal(SIGINT, toggle_verboselog); + } + Added: tinysofa/snapshot/portmap/current/sources/portmap-4.0-sigpipe.patch =================================================================== --- tinysofa/snapshot/portmap/current/sources/portmap-4.0-sigpipe.patch 2004-07-01 15:53:09 UTC (rev 2818) +++ tinysofa/snapshot/portmap/current/sources/portmap-4.0-sigpipe.patch 2004-07-01 15:53:15 UTC (rev 2819) @@ -0,0 +1,12 @@ +--- portmap_4/portmap.c.sigpipe Sun Feb 11 17:45:11 2001 ++++ portmap_4/portmap.c Sun Feb 11 17:45:51 2001 +@@ -228,6 +228,9 @@ + #else + (void)signal(SIGCHLD, reap); + #endif ++ /* Dying on SIGPIPE doesn't help anyone */ ++ (void)signal(SIGPIPE, SIG_IGN); ++ + svc_run(); + syslog(LOG_ERR, "run_svc returned unexpectedly"); + abort(); Modified: tinysofa/snapshot/portmap/current/sources/portmap.8 =================================================================== --- tinysofa/snapshot/portmap/current/sources/portmap.8 2004-07-01 15:53:09 UTC (rev 2818) +++ tinysofa/snapshot/portmap/current/sources/portmap.8 2004-07-01 15:53:15 UTC (rev 2819) @@ -101,7 +101,7 @@ .Nm portmap in verbose mode. .El - +.Pp This .Nm portmap version is protected by the @@ -110,28 +110,28 @@ .Nm portmap if they should be allowed to use it. To allow connects from clients of the .bar.com domain you could use the following line in /etc/hosts.allow: - +.Pp portmap: .bar.com - +.Pp You have to use the daemon name .Nm portmap for the daemon name (even if the binary has a different name). For the -client names you can only use the keyword ALL or IP addresses (NOT -host or domain names). - +client names you can use the keyword ALL, IP addresses, hostnames or domain +names. +.Pp For further information please have a look at the .Xr tcpd (8) , .Xr hosts_allow (5) and .Xr hosts_access (5) manual pages. - +.Pp .Sh SEE ALSO -.Xr inetd.conf (5) , +.Xr xinetd.conf (5) , .Xr rpcinfo (8) , .Xr pmap_set (8) , .Xr pmap_dump (8) , -.Xr inetd (8) +.Xr xinetd (8) .Xr tcpd (8) .Xr hosts_access (5) .Xr hosts_options (5) @@ -143,4 +143,4 @@ The .Nm command appeared in -.Bx BSD 4.3. \ No newline at end of file +.Bx BSD 4.3. Modified: tinysofa/snapshot/portmap/current/sources/portmap.init =================================================================== --- tinysofa/snapshot/portmap/current/sources/portmap.init 2004-07-01 15:53:09 UTC (rev 2818) +++ tinysofa/snapshot/portmap/current/sources/portmap.init 2004-07-01 15:53:15 UTC (rev 2819) @@ -2,22 +2,38 @@ # # portmap Start/Stop RPC portmapper # -# chkconfig: - 11 89 +# chkconfig: 345 13 87 # description: The portmapper manages RPC connections, which are used by \ # protocols such as NFS and NIS. The portmap server must be \ # running on machines which act as servers for protocols which \ # make use of the RPC mechanism. # processname: portmap + +# This is an interactive program, we need the current locale +[ -f /etc/profile.d/lang.sh ] && . /etc/profile.d/lang.sh +# We can't Japanese on normal console at boot time, so force LANG=C. +if [ "$LANG" = "ja" -o "$LANG" = "ja_JP.eucJP" ]; then + if [ "$TERM" = "linux" ] ; then + LANG=C + fi +fi + # Source function library. . /etc/init.d/functions # Get config. -. /etc/sysconfig/network +if [ -f /etc/sysconfig/network ]; then + . /etc/sysconfig/network +else + echo $"Networking not configured - exiting" + exit 1 +fi +prog="portmapper" + # Check that networking is up. -if [ ${NETWORKING} = "no" ] -then +if [ "$NETWORKING" = "no" ]; then exit 0 fi @@ -25,34 +41,53 @@ RETVAL=0 +start() { + echo -n $"Starting $prog: " + daemon portmap + RETVAL=$? + echo + [ $RETVAL -eq 0 ] && touch /var/lock/subsys/portmap + return $RETVAL +} + + +stop() { + echo -n $"Stopping $prog: " + killproc portmap + RETVAL=$? + echo + [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/portmap + return $RETVAL +} + +restart() { + pmap_dump > /var/run/portmap.state + stop + start + pmap_set < /var/run/portmap.state + rm -f /var/run/portmap.state +} + # See how we were called. case "$1" in start) - echo -n "Starting portmapper: " - daemon portmap - RETVAL=$? - echo - [ $RETVAL -eq 0 ] && touch ${INITLOCK:-/mnt/lockdev}/portmap + start ;; stop) - echo -n "Stopping portmap services: " - killproc portmap - RETVAL=$? - echo - [ $RETVAL -eq 0 ] && rm -f ${INITLOCK:-/mnt/lockdev}/portmap + stop ;; status) status portmap - RETVAL=$? ;; restart|reload) - $0 stop - $0 start - RETVAL=$? + restart ;; + condrestart) + [ -f /var/lock/subsys/portmap ] && restart || : + ;; *) - echo "Usage: portmap {start|stop|status|restart|reload}" + echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}" exit 1 esac -exit $RETVAL +exit $? Modified: tinysofa/snapshot/portmap/current/specs/portmap.spec =================================================================== --- tinysofa/snapshot/portmap/current/specs/portmap.spec 2004-07-01 15:53:09 UTC (rev 2818) +++ tinysofa/snapshot/portmap/current/specs/portmap.spec 2004-07-01 15:53:15 UTC (rev 2819) @@ -1,21 +1,30 @@ +%define initdir /etc/rc.d/init.d +%{!?tcp_wrappers:%define tcp_wrappers 1} + Summary: A program which manages RPC connections. Name: portmap Version: 4.0 -Release: 33ts -Group: tinysofa official +Release: 60ts +Group: System Environment/Daemons License: BSD -Source0: ftp://ftp.porcupine.org/pub/security/portmap_4.tar.gz +Source0: ftp://coast.cs.purdue.edu/pub/tools/unix/netutils/portmap/portmap_4.tar.gz Source1: portmap.init Source2: pmap_set.8 Source3: pmap_dump.8 Source4: portmap.8 Patch0: portmap-4.0-linux.patch Patch1: portmap-malloc.patch -Patch2: portmap-4.0-errno.patch -BuildRoot: %{_tmppath}/%{name}-root -PreReq: /sbin/chkconfig /sbin/restart_maybe -Requires: tcp_wrappers -BuildRequires: tcp_wrappers +Patch2: portmap-4.0-cleanup.patch +Patch3: portmap-4.0-rpc_user.patch +Patch4: portmap-4.0-sigpipe.patch +Patch5: portmap-4.0-errno.patch +Patch6: portmap-4.0-pie.patch +Prereq: /sbin/chkconfig /etc/init.d +%if %{tcp_wrappers} +BuildPreReq: tcp_wrappers +%endif +BuildRoot: %{_tmppath}/%{name}-%{version}-root +Requires: initscripts >= 5.54, util-linux >= 2.11b %description The portmapper program is a security tool which prevents theft of NIS @@ -31,95 +40,207 @@ %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 -b .rpcuser +%patch4 -p1 -b .sigpipe +%patch5 -p1 -b .errno +%patch6 -p1 -b .pie +%ifarch s390 s390x +perl -pi -e 's/-fpie/-fPIE/' Makefile +%endif %build -make FACILITY=LOG_AUTH ZOMBIES='-DIGNORE_SIGCHLD -Dlint' LIBS="-lnsl" RPM_OPT_FLAGS="$RPM_OPT_FLAGS" +%if %{tcp_wrappers} +make FACILITY=LOG_AUTH ZOMBIES='-DIGNORE_SIGCHLD -Dlint' LIBS="-Wl,-Bstatic -lwrap -Wl,-Bdynamic -lnsl" RPM_OPT_FLAGS="$RPM_OPT_FLAGS" AUX="" +%else +make FACILITY=LOG_AUTH ZOMBIES='-DIGNORE_SIGCHLD -Dlint' LIBS="-lnsl" RPM_OPT_FLAGS="$RPM_OPT_FLAGS" AUX="" HOSTS_ACCESS= +%endif %install -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != "/" ] && rm -rf "$RPM_BUILD_ROOT" -mkdir -p $RPM_BUILD_ROOT/sbin -mkdir -p $RPM_BUILD_ROOT/usr/sbin -mkdir -p $RPM_BUILD_ROOT/etc/init.d +rm -rf ${RPM_BUILD_ROOT} -install -m 755 -s portmap $RPM_BUILD_ROOT/sbin -install -m 755 -s pmap_set $RPM_BUILD_ROOT/usr/sbin -install -m 755 -s pmap_dump $RPM_BUILD_ROOT/usr/sbin -# Fix initscripts location -sed <$RPM_SOURCE_DIR/portmap.init >/tmp/portmap.init.$$ \ - 's!/etc/rc.d/init.d!/etc/init.d!' -install -m 755 /tmp/portmap.init.$$ $RPM_BUILD_ROOT/etc/init.d/portmap +mkdir -p ${RPM_BUILD_ROOT}/sbin +install -m 755 portmap ${RPM_BUILD_ROOT}/sbin +mkdir -p ${RPM_BUILD_ROOT}%{_sbindir} +install -m 755 pmap_set ${RPM_BUILD_ROOT}%{_sbindir} +install -m 755 pmap_dump ${RPM_BUILD_ROOT}%{_sbindir} +mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man8 +install -m 644 $RPM_SOURCE_DIR/pmap_set.8 ${RPM_BUILD_ROOT}%{_mandir}/man8 +install -m 644 $RPM_SOURCE_DIR/pmap_dump.8 ${RPM_BUILD_ROOT}%{_mandir}/man8 +install -m 644 $RPM_SOURCE_DIR/portmap.8 ${RPM_BUILD_ROOT}%{_mandir}/man8 -mkdir -p $RPM_BUILD_ROOT/usr/share/man/man8 -install -m 644 $RPM_SOURCE_DIR/pmap_set.8 $RPM_BUILD_ROOT/usr/share/man/man8 -install -m 644 $RPM_SOURCE_DIR/pmap_dump.8 $RPM_BUILD_ROOT/usr/share/man/man8 -install -m 644 $RPM_SOURCE_DIR/portmap.8 $RPM_BUILD_ROOT/usr/share/man/man8 +mkdir -p ${RPM_BUILD_ROOT}%{initdir} +install -m 755 $RPM_SOURCE_DIR/portmap.init ${RPM_BUILD_ROOT}%{initdir}/portmap %clean -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT +rm -rf ${RPM_BUILD_ROOT} %post -# Restart service after upgrade. /sbin/chkconfig --add portmap -/sbin/restart_maybe portmap +/usr/sbin/groupadd -g 32 rpc > /dev/null 2>&1 +/usr/sbin/useradd -c "Portmapper RPC user" -d / -g 32 -M -s /sbin/nologin -u 32 rpc > /dev/null 2>&1 +exit 0 +%triggerpostun -- portmap <= portmap-4.0-22 +/sbin/chkconfig --add portmap + %preun -if [ $1 = 0 ] ; then +if [ $1 = 0 ]; then + service portmap stop > /dev/null 2>&1 /sbin/chkconfig --del portmap fi +%postun +if [ "$1" -ge "1" ]; then + service portmap condrestart > /dev/null 2>&1 +fi + %files %defattr(-,root,root) %doc README CHANGES BLURB - /sbin/portmap -/usr/sbin/pmap_dump -/usr/sbin/pmap_set +%{_sbindir}/pmap_dump +%{_sbindir}/pmap_set +%{_mandir}/man8/* +%config %{initdir}/portmap -/usr/share/man/man8/* +%changelog +* Tue Jun 15 2004 Elliot Lee +- rebuilt -%config /etc/init.d/portmap +* Fri Feb 13 2004 Elliot Lee +- rebuilt -%changelog -* Wed May 19 2004 tsintegrate 4.0-33ts -- current (4.0-32ts) integrated as 4.0-33ts for release 1.0-U1 +* Thu Feb 12 2004 Thomas Woerner 4.0-58 +- added PIE patch from Ulrich Drepper -* Wed May 12 2004 Omar Kilani 4.0-32ts -- Add BuildRequires tcp_wrappers. -- Add Requires tcp_wrappers. +* Tue Sep 23 2003 Florian La Roche +- allow to compile without tcp_wrappers -* Wed Nov 26 2003 Erlend Midttun 4.0-29tr -- Big rebuild +* Wed Aug 13 2003 Florian La Roche +- do not check with "id" if running as root (/usr/bin/id) +- link statically against -lwrap (from /usr/lib) -* Wed Jun 18 2003 Erlend Midttun 4.0-28tr -- Big rebuild +* Wed Jun 04 2003 Elliot Lee +- rebuilt -* Tue May 27 2003 Erlend Midttun 4.0-27em -- No longer PreReq coreutils. +* Mon Feb 24 2003 Elliot Lee +- rebuilt -* Mon May 26 2003 Erlend Midttun 4.0-26em -- textutils -> coreutils. +* Sun Feb 23 2003 Tim Powers +- add buildprereq on tcp_wrappers -* Mon Mar 24 2003 Erlend Midttun 4.0-25em -- Rebuilt against glibc 2.3.2. +* Wed Jan 22 2003 Tim Powers +- rebuilt -* Thu Nov 21 2002 Christian H. Toldnes 4.0-24ct -- portmap initscript now uses $INITLOCK +* Fri Dec 13 2002 Daniel J Walsh 4.0-51 +- Replace extern int errno with include +* Thu Dec 12 2002 Daniel J Walsh 4.0-50 +- Change spec file to stop building auxilliary files +- Fix Makefile to build correctly on x86-64 +- Fix strerror.c to build correctly on x86-64 -* Fri Nov 8 2002 Gerald Dachs 4.0-23gd -- prerequires now textutils +* Tue Dec 10 2002 Daniel J Walsh 4.0-47 +- Fix mechanism for checking if root -* Thu Jul 18 2002 Roland Kruse 4.0-22rk -- New initscripts location. +* Tue Aug 6 2002 Trond Eivind Glomsr?d 4.0-46 +- initscript tweaks (#70717) -* Fri Jan 4 2002 Christian H. Toldens -- Correct chkconfig line in startup script. +* Thu Jul 18 2002 Trond Eivind Glomsr?d 4.0-45 +- Fix #63556 +- Don't strip binaries explicitly -* Fri Feb 25 2000 Erlend Midttun -- Removed autostart -- Moved manpages to comply with FHS +* Wed Jul 17 2002 Trond Eivind Glomsr?d 4.0-44 +- Change the references in the man page from inetd/inetd.conf + to xinetd equivalents (#60861) +* Fri Jun 21 2002 Tim Powers +- automated rebuild + +* Thu May 23 2002 Tim Powers +- automated rebuild + +* Wed Feb 27 2002 Trond Eivind Glomsr?d 4.0-41 +- Rebuild + +* Wed Jan 09 2002 Tim Powers +- automated rebuild + +* Wed Sep 12 2001 Trond Eivind Glomsr?d 4.0-39 +- Use /sbin/nologin as shell (#53087) +- s/Copyright/License/ + +* Sun Jun 24 2001 Elliot Lee +- Bump release + rebuild. + +* Sun Apr 29 2001 Bill Nottingham +- fix condrestart + +* Fri Apr 20 2001 Trond Eivind Glomsr?d +- Remove "\n" from echo statement (#36721) + +* Wed Feb 28 2001 Trond Eivind Glomsr?d +- clear group memberships (#23195) + +* Sun Feb 11 2001 Trond Eivind Glomsr?d +- don't die on SIGPIPE (#21748) +- Fix condrestart so it maintains portmap state + +* Wed Feb 7 2001 Trond Eivind Glomsr?d +- improve i18n + +* Wed Jan 24 2001 Matt Wilson +- new style i18n init script + +* Fri Jan 19 2001 Trond Eivind Glomsr?d +- fix manpage (#13218) +- gettextize +- exit if /etc/sysconfig/network doesn't exist + and make sure it works when networking is off (#23757) + +* Tue Jan 2 2001 Bill Nottingham +- setgid too, not just setuid (#23195) + +* Thu Aug 10 2000 Jeff Johnson +- add restart shell function (#15914). + +* Sun Aug 6 2000 Philipp Knirsch +- Changed the uid/gid of the rpc user to be 32/32 + +* Fri Aug 4 2000 Philipp Knirsch +- Fixed a build warning for daemon.c (missing include) +- Portmap now running under user rpc if possible (#12427) + +* Wed Aug 2 2000 Bill Nottingham +- start a little later (after syslog) +- do dump/reload on restart (#14612) + +* Thu Jul 20 2000 Bill Nottingham +- move initscript back + +* Wed Jul 12 2000 Prospector +- automatic rebuild + +* Sat Jul 8 2000 Bill Nottingham +- make trigger work on a few later versions + +* Tue Jun 27 2000 Than Ngo +- /etc/rc.d/init.d -> /etc/init.d +- condrestart in %postun +- fix initscript +- add requires initscript +- remove links from packaging + +* Tue Jun 6 2000 Jeff Johnson +- FHS packaging. + +* Wed May 10 2000 Jeff Johnson +- apply cleanup patch (H.J. Lu) + +* Mon Feb 7 2000 Jeff Johnson +- compress man pages. + * Wed Dec 1 1999 Bill Nottingham - add patch to fix some malloc issues from HP @@ -168,4 +289,4 @@ - uses a buildroot and %attr tags * Fri Jul 18 1997 Erik Troan -- built against glibc \ No newline at end of file +- built against glibc From svn at tinysofa.org Thu Jul 1 15:54:43 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:54:43 +1000 (EST) Subject: [tinysofa-svn] r2838 - in tinysofa/snapshot/setup/current: sources specs Message-ID: <20040701155443.6BE454E817E@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:54:43 +1000 (Fri, 02 Jul 2004) New Revision: 2838 Added: tinysofa/snapshot/setup/current/sources/setup-2.5.33.tar.bz2 Removed: tinysofa/snapshot/setup/current/sources/setup-2.2.5.tar.gz Modified: tinysofa/snapshot/setup/current/specs/setup.spec Log: - Sync with 2.0. - Added: - setup-2.5.33.tar.bz2: - Removed: - setup-2.2.5.tar.gz: Deleted: tinysofa/snapshot/setup/current/sources/setup-2.2.5.tar.gz =================================================================== (Binary files differ) Added: tinysofa/snapshot/setup/current/sources/setup-2.5.33.tar.bz2 =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/setup/current/sources/setup-2.5.33.tar.bz2 ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: tinysofa/snapshot/setup/current/specs/setup.spec =================================================================== --- tinysofa/snapshot/setup/current/specs/setup.spec 2004-07-01 15:54:40 UTC (rev 2837) +++ tinysofa/snapshot/setup/current/specs/setup.spec 2004-07-01 15:54:43 UTC (rev 2838) @@ -1,15 +1,13 @@ Summary: A set of system configuration and setup files. Name: setup -Version: 2.2.5 -Release: 5ts +Version: 2.5.33 +Release: 1ts License: public domain -Group: tinysofa official -Source: setup-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-root -BuildArch: noarch -Conflicts: initscripts < 4.26 -BuildRequires: coreutils, awk -Prereq: bash-static +Group: System Environment/Base +Source: setup-%{version}.tar.bz2 +Buildroot: %{_tmppath}/%{name}-%{version}-root +BuildArchitectures: noarch +Conflicts: initscripts < 4.26, bash <= 2.0.4-21 %description The setup package contains a set of important system configuration and @@ -18,134 +16,399 @@ %prep %setup -q +%build +# Run any sanity checks. +make check + %install -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != "/" ] && rm -rf "$RPM_BUILD_ROOT" -mkdir -p $RPM_BUILD_ROOT/etc/profile.d -cp -ar * $RPM_BUILD_ROOT/etc -mkdir -p $RPM_BUILD_ROOT/var/log -cp /dev/null $RPM_BUILD_ROOT/var/log/lastlog +rm -rf %{buildroot} +mkdir -p %{buildroot}/etc/profile.d +cp -ar * %{buildroot}/etc +rm -f %{buildroot}/etc/uidgid +mkdir -p %{buildroot}/var/log +touch %{buildroot}/etc/{shadow,gshadow} +touch %{buildroot}/var/log/lastlog +chmod 0400 %{buildroot}/etc/{shadow,gshadow} +chmod 0400 %{buildroot}/var/log/lastlog +# remove unpackaged files from the buildroot +rm -f %{buildroot}/etc/Makefile +rm -f %{buildroot}/etc/serviceslint +rm -f %{buildroot}/etc/uidgidlint +rm -f %{buildroot}/etc/setup.spec + %clean -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != "/" ] && rm -rf "$RPM_BUILD_ROOT" +rm -rf %{buildroot} %files %defattr(-,root,root) -%attr(644,root,root) %verify(not md5 size mtime) %config(noreplace) /etc/passwd -%attr(644,root,root) %verify(not md5 size mtime) %config(noreplace) /etc/group -%attr(644,root,root) %verify(not md5 size mtime) %config(noreplace) /etc/services -%attr(644,root,root) %verify(not md5 size mtime) %config(noreplace) /etc/exports -%attr(644,root,root) %verify(not md5 size mtime) %config(noreplace) /etc/filesystems -%attr(644,root,root) %verify(not md5 size mtime) %config(noreplace) /etc/host.conf -%attr(644,root,root) %verify(not md5 size mtime) %config(noreplace) /etc/hosts.allow -%attr(644,root,root) %verify(not md5 size mtime) %config(noreplace) /etc/hosts.deny -%attr(644,root,root) %verify(not md5 size mtime) %config(noreplace) /etc/motd -%attr(644,root,root) %verify(not md5 size mtime) %config(noreplace) /etc/printcap -%attr(644,root,root) %verify(not md5 size mtime) %config(noreplace) /etc/inputrc -%attr(644,root,root) %verify(not md5 size mtime) %config(noreplace) /etc/profile -%attr(600,root,root) %verify(not md5 size mtime) %config(noreplace missingok) /etc/shadow -%attr(644,root,root) %config /etc/protocols -%attr(600,root,root) %config(missingok) /etc/securetty -%attr(644,root,root) %config(noreplace) /etc/csh.login -%attr(644,root,root) %config(noreplace) /etc/csh.cshrc -%attr(644,root,root) %config(noreplace) /etc/sysconfig/proxy -%attr(755,root,root) /etc/profile.d -%attr(644,root,root) %verify(not md5 size mtime) /var/log/lastlog +%doc uidgid +%verify(not md5 size mtime) %config(noreplace) /etc/passwd +%verify(not md5 size mtime) %config(noreplace) /etc/group +%ghost %verify(not md5 size mtime) %config(noreplace,missingok) /etc/shadow +%ghost %verify(not md5 size mtime) %config(noreplace,missingok) /etc/gshadow +%verify(not md5 size mtime) %config /etc/services +%verify(not md5 size mtime) %config(noreplace) /etc/exports +%config(noreplace) /etc/aliases +%config(noreplace) /etc/filesystems +%config(noreplace) /etc/host.conf +%verify(not md5 size mtime) %config(noreplace) /etc/hosts.allow +%verify(not md5 size mtime) %config(noreplace) /etc/hosts.deny +%verify(not md5 size mtime) %config /etc/motd +%config(noreplace) /etc/printcap +%config /etc/inputrc +%config(noreplace) /etc/bashrc +%config(noreplace) /etc/profile +%config /etc/protocols +%attr(0600,root,root) %config(noreplace,missingok) /etc/securetty +%config(noreplace) /etc/csh.login +%config(noreplace) /etc/csh.cshrc +%dir /etc/profile.d +%config(noreplace) %verify(not md5 size mtime) /etc/shells +%config(noreplace) %verify(not md5 size mtime) /var/log/lastlog -%exclude /etc/Makefile -%exclude /etc/shells -%exclude /etc/setup.spec - %changelog -* Wed May 19 2004 tsintegrate 2.2.5-5ts -- current (2.2.5-4ts) integrated as 2.2.5-5ts for release 1.0-U1 +* Wed May 5 2004 Nalin Dahyabhai 2.5.33-1 +- fix syntax error in csh.cshrc -* Tue Jan 27 2004 Erlend Midttun 2.2.5-1tr -- Now even source the proxy file. +* Tue May 4 2004 Bill Nottingham 2.5.32-1 +- set MAIL in csh.cshrc (#115376) +- fix inputrc check in csh.login (#115073) -* Thu Dec 11 2003 Erlend Midttun 2.2.4-1tr -- Added /etc/sysconfig/proxy with the variables used by urllib (swup) - and wget. +* Mon Jan 26 2004 Bill Nottingham 2.5.31-1 +- move /etc/aliases here -* Tue Dec 9 2003 Erlend Midttun 2.2.3-4tr -- Now unset $LANG before running the profile.d's. +* Mon Dec 8 2003 Bill Nottingham 2.5.30-1 +- remove stty `tput kbs` section (#91357) -* Fri Sep 5 2003 Chr. Toldnes 2.2.3-3tr -- Updated /etc/services (gnatsd) +* Tue Sep 2 2003 Bill Nottingham 2.5.27-1 +- securetty should be noreplace (#103585) -* Tue Jul 1 2003 Roland Kruse 2.2.3-2tr -- Updated /etc/protocols, /etc/services. +* Fri Mar 14 2003 Bill Nottingham 2.5.26-1 +- clean up some typos in /etc/services (#86129) -* Sat Jun 28 2003 Goetz Bock 2.2.3-1bg -- passwd and group were inconsistent for slapd -- added tftp user / group -- removed patches, as they had been integraded +* Mon Feb 17 2003 Florian La Roche +- add "console" to /etc/securetty for mainframe -* Wed Jun 18 2003 Erlend Midttun 2.2.2-2tr -- Big rebuild +* Mon Jan 20 2003 Nalin Dahyabhai 2.5.24-1 +- allocate uid/gid for mgetty -* Fri Jun 6 2003 Tore Olsen 2.2.2-1to -- Don't recreate shadow each time package is built -- Added user for openldap (slapd) +* Thu Jan 9 2003 Dan Walsh 2.5.23-1 +- added PXE to /etc/services -* Mon Jun 2 2003 Roland Kruse 2.2.1-3rk -- Added isakmp service at port 500 (patch1) +* Wed Jan 1 2003 Bill Nottingham 2.5.22-1 +- remove bogus entries from inputrc (#80652) -* Mon May 26 2003 Erlend Midttun 2.2.1-2em -- fileutils -> coreutils. +* Fri Nov 29 2002 Tim Powers 2.5.21-1 +- remove unpackaged files from the buildroot -* Fri May 23 2003 Erlend Midttun 2.2.1-1em -- Now use ~/Maildir also with tcsh. +* Thu Aug 29 2002 Bill Nottingham 2.5.20-1 +- shopt -s checkwinsize everywhere -* Fri May 16 2003 Erlend Midttun 2.2.0-7em -- Now use ~/Maildir +* Wed Aug 28 2002 Preston Brown 2.5.19-1 +- fix bug #61129 (~ substitution) -* Mon Apr 28 2003 Erlend Midttun 2.2.0-6em -- More passwd stuff +* Wed Aug 15 2002 Jens Petersen 2.5.18-1 +- bring back the screen case in /etc/bashrc, since /etc/screenrc no + longer sets defhstatus (#60596, #60597) -* Mon Apr 28 2003 Erlend Midttun 2.2.0-5em -- More passwd stuff +* Sun Aug 11 2002 Florian La Roche 2.5.17-1 +- add "set mark-symlinked-directories on" to /etc/inputrc -* Wed Apr 23 2003 Erlend Midttun 2.2.0-4em -- Wrong home directory on a few users. +* Mon Jul 22 2002 Phil Knirsch 2.5.16-2 +- Added shopt -s checkwinsize to /etc/bashrc for xterm resizing -* Tue Apr 22 2003 Erlend Midttun 2.2.0-3em -- Rearranged the uid and gid in passwd and group to make them cleaner. +* Fri Jul 19 2002 Jens Petersen 2.5.16-1 +- dont special case screen in /etc/bashrc, since it overrides the user's + screenrc title setting (#60596) -* Tue Apr 22 2003 Erlend Midttun 2.2.0-2em -- Stripped all but the last Red Hat changelog entry. -- Added %attr to make build independent of umask on build box. -- Autocreate shadow file from passwd. +* Thu Jul 18 2002 Florian La Roche 2.5.14-1 +- move home dir of "news" to /etc/news -* Mon Apr 21 2003 Erlend Midttun 2.2.0-1em -- Repackaged. -- Removed root as member of various groups in /etc/group. +* Tue May 28 2002 Nalin Dahyabhai 2.5.13-1 +- allocate uid/gid for privilege-separated sshd -* Mon Feb 10 2003 Erlend Midttun 2.1.8-11em -- New inputrc. -- New services. +* Thu May 23 2002 Tim Powers 2.5.12-2 +- automated rebuild -* Thu Jan 16 2003 Goetz Bock 2.1.8-10bg -- added some secure TTYs to patch1 +* Wed Apr 3 2002 Bill Nottingham 2.5.12-1 +- fix misformatted comment in /etc/services, allocate uid/gid for + frontpage -* Thu Jul 18 2002 Christian H. Toldnes 2.1.8-9ct -- Added LANG setting in /etc/profile +* Thu Mar 28 2002 Bill Nottingham 2.5.11-1 +- add newline in /etc/shells (#62271) -* Tue Jul 16 2002 Christian H. Toldnes 2.1.8-8ct -- Rebuild for TSL 2.0 +* Thu Mar 28 2002 Nalin Dahyabhai 2.5.10-1 +- allocate uid for the vcsa user -* Fri Jul 12 2002 Christian H. Toldnes 2.1.8-7tr -- Correct simap/pop3s entries in /etc/services +* Tue Mar 12 2002 Bill Nottingham 2.5.9-1 +- re-add ext3 to /etc/filesystems -* Tue Jul 17 2001 Erlend Midttun -- Inc serial number before release. +* Mon Mar 11 2002 Bill Nottingham 2.5.8-1 +- add nologin to /etc/shells (#53963) +- fix some quoting issues (#59627) +- fix screen status line (#60596) +- fix path regexps (#59624) +- move profile.d stuff to csh.cshrc (#59946) -* Wed Nov 29 2000 Erlend Midttun -- Visible bell -- Changed prompt -- Changed path -- Umask 077 -- More norplace -- Removed references to printtool in printcap. +* Fri Mar 8 2002 Nalin Dahyabhai +- add bprd, bpdbm, bpjava-msvc, vnetd, bpcd, and vopied to /etc/services +* Tue Sep 25 2001 Nalin Dahyabhai +- change rmtcfg to an alias for bvcontrol, which is a registered name + +* Mon Sep 17 2001 Nalin Dahyabhai 2.5.7-1 +- add entries to services (ipp, wnn4, and so on) +- try to remove duplicates in services (remove nameserver as alias for domain, + and readnews as alias for netnews) + +* Mon Aug 20 2001 Bill Nottingham +- change FTP user's home dir to /var/ftp (#52091) +- %%ghost /etc/shadow, /etc/gshadow + +* Fri Aug 17 2001 Bill Nottingham +- add /etc/shells to filelist (#51813) + +* Mon Aug 13 2001 Bill Nottingham +- put lock in /etc/group (#51654) + +* Wed Aug 8 2001 Bill Nottingham +- lock only needs to be a gid +- don't set dspmbyte=euc here; do it in lang.csh, and only if necessary (#50318) + +* Mon Aug 6 2001 Jeff Johnson +- add lock.lock uid/gid 54 to own /var/lock directory. + +* Thu Jul 19 2001 Bill Nottingham +- add forward/backward-word mappings (#48783) +- add pgpkeyserver port to /etc/services (#49407) + +* Thu Jul 19 2001 Preston Brown +- core files disabled by default. Developers can enable them. + +* Fri Jul 13 2001 Bill Nottingham 2.5.1-1 +- revert news user back to no shell (#48701) + +* Tue Jul 10 2001 Bill Nottingham 2.5.0-1 +- move profile.d parsing from csh.cshrc to csh.login (#47417) + +* Sat Jul 7 2001 Nalin Dahyabhai 2.4.15-1 +- reorder /etc/services to match comments again +- protocol 118 is stp, not st +- update URLs in /etc/protocols and /etc/services + +* Thu Jul 5 2001 Preston Brown 2.4.14-1 +- put */sbin in path if user ID is 0. + +* Mon Jun 25 2001 Bill Nottingham +- add an entry to /etc/services for ssh X11 forwarding (#44944) + +* Wed Jun 13 2001 Bill Nottingham +- take ttyS0 out of securetty on main tree + +* Tue Jun 12 2001 Philip Copeland +- added ttyS0 to securetty for serial console usage + +* Tue Jun 12 2001 Bill Nottingham +- add rndc to /etc/services (#40265) +- test for read bit, not execute bit, for profile.d (#35714) + +* Sun Jun 03 2001 Florian La Roche +- add "canna" entry to /etc/services + +* Mon May 21 2001 Bernhard Rosenkraenzer 2.4.10-1 +- Fix bugs #24159 and #30634 again; whoever moved bashrc from bash + to setup used an old version. :(( + +* Wed May 2 2001 Preston Brown 2.4.9-1 +- bashrc moved here from bash package +- set umask in bashrc, so it applies for ALL shells. + +* Fri Apr 27 2001 Preston Brown 2.4.8-1 +- /sbin/nologin for accounts that aren't "real." + +* Sat Apr 7 2001 Preston Brown +- revert control-arrow forward/backward word (broken) + +* Tue Mar 27 2001 Preston Brown +- fix japanese input with tcsh (#33211) + +* Tue Mar 6 2001 Bill Nottingham +- fix some weirdness with rxvt (#30799) + +* Wed Feb 28 2001 Bill Nottingham +- add SKK input method (#29759) + +* Fri Feb 23 2001 Preston Brown + +* Wed Feb 21 2001 Bill Nottingham +- fix inputrc, Yet Again. (#28617) + +* Thu Feb 15 2001 Bill Nottingham +- add in uidgid file, put it in %doc + +* Wed Feb 7 2001 Adrian Havill +- bindkey for delete in the case of tcsh + +* Wed Feb 7 2001 Bill Nottingham +- add some more stuff to /etc/services (#25396, patch from + ) + +* Tue Feb 6 2001 Nalin Dahyabhai +- add gii/tcp = 616 for gated + +* Tue Jan 30 2001 Bill Nottingham +- wrap some inputrc settings with tests for mode, term (#24117) + +* Mon Jan 29 2001 Bill Nottingham +- overhaul /etc/protocols (#18530) +- add port 587 to /etc/services (#25001) +- add corbaloc (#19581) +- don't set /usr/X11R6/bin in $PATH if it's already set (#19968) + +* Fri Dec 1 2000 Nalin Dahyabhai +- Clean up /etc/services, separating registered numbers from unregistered + ("squatted") numbers, and adding some. + +* Mon Nov 20 2000 Bernhard Rosenkraenzer +- Add smtps (465/tcp) and submission (587/tcp) to /etc/services for TLS + support (postfix >= 20001030-2) + +* Sun Aug 6 2000 Bill Nottingham +- /var/log/lastlog is %config(noreplace) (#15412) +- some of the various %verify changes (#14819) + +* Thu Aug 3 2000 Nalin Dahyabhai +- linuxconf should be 98, not 99 + +* Tue Jul 25 2000 Bill Nottingham +- fix some of the csh stuff (#14622) + +* Sun Jul 23 2000 Nalin Dahyabhai +- stop setting "multi on" in /etc/host.conf + +* Wed Jul 12 2000 Prospector +- automatic rebuild + +* Tue Jun 27 2000 Bill Nottingham +- add hfs filesystem + +* Wed Jun 21 2000 Preston Brown +- printcap is a noreplace file now + +* Sun Jun 18 2000 Bill Nottingham +- fix typo + +* Tue Jun 13 2000 Nalin Dahyabhai +- add linuxconf/tcp = 99 to /etc/services + +* Sat Jun 10 2000 Bill Nottingham +- add some stuff to /etc/services +- tweak ulimit call again + +* Tue Jun 6 2000 Bernhard Rosenkraenzer +- homedir of ftp is now /var/ftp + +* Sun May 14 2000 Nalin Dahyabhai +- move profile.d logic in csh.login to csh.cshrc + +* Tue Apr 18 2000 Nalin Dahyabhai +- redirect ulimit -S -c to /dev/null to avoid clutter + +* Thu Apr 13 2000 Bernhard Rosenkraenzer +- s/ulimit -c/ulimit -S -c/ - bash 2.x adaption + +* Mon Apr 03 2000 Nalin Dahyabhai +- Add more of the kerberos-related services from IANA's registry and krb5 + +* Wed Mar 29 2000 Bernhard Rosenkraenzer +- Add 2.4'ish vc/* devices to securetty + * Thu Feb 17 2000 Preston Brown - add /etc/filesystems with sane defaults + +* Wed Feb 16 2000 Bill Nottingham +- don't set prompt in /etc/profile (it's done in /etc/bashrc) + +* Fri Feb 5 2000 Bill Nottingham +- yet more inputrc tweaks from Hans de Goede (hans at highrise.nl) + +* Sun Jan 30 2000 Bill Nottingham +- yet more inputrc tweaks from Hans de Goede (hans at highrise.nl) + +* Sun Jan 23 2000 Bill Nottingham +- fix mailq line. (#7140) + +* Fri Jan 21 2000 Bill Nottingham +- add ldap to /etc/services + +* Tue Jan 18 2000 Bill Nottingham +- kill HISTFILESIZE, it's broken + +* Tue Jan 18 2000 Preston Brown +- some inputrc tweaks + +* Wed Jan 12 2000 Bill Nottingham +- make some more stuff noreplace + +* Fri Nov 19 1999 Bill Nottingham +- fix mailq line. (#7140) + +* Fri Oct 29 1999 Bill Nottingham +- split csh.login into csh.login and csh.cshrc (#various) +- fix pop service names (#6206) +- fix ipv6 protocols entries (#6219) + +* Thu Sep 2 1999 Jeff Johnson +- rename /etc/csh.cshrc to /etc/csh.login (#2931). +- (note: modified /etc/csh.cshrc should end up in /etc/csh.cshrc.rpmsave) + +* Fri Aug 20 1999 Jeff Johnson +- add defattr. +- fix limit command in /etc/csh.cshrc (#4582). + +* Thu Jul 8 1999 Bill Nottingham +- move /etc/inputrc here. + +* Mon Apr 19 1999 Bill Nottingham +- always use /etc/inputrc + +* Wed Mar 31 1999 Preston Brown +- added alias pointing to imap from imap2 + +* Tue Mar 23 1999 Preston Brown +- updated protocols/services from debian to comply with more modern +- IETF/RFC standards + +* Sun Mar 21 1999 Cristian Gafton +- auto rebuild in the new build environment (release 4) + +* Thu Feb 18 1999 Jeff Johnson +- unset variables used in /etc/csh.cshrc (#1212) + +* Mon Jan 18 1999 Jeff Johnson +- compile for Raw Hide. + +* Tue Oct 13 1998 Cristian Gafton +- fix the csh.cshrc re: ${PATH} undefined + +* Mon Apr 27 1998 Prospector System +- translations modified for de, fr, tr + +* Fri Dec 05 1997 Erik Troan +- /etc/profile uses $i, which needs to be unset + +* Mon Nov 03 1997 Donnie Barnes +- made /etc/passwd and /etc/group %config(noreplace) + +* Mon Oct 20 1997 Erik Troan +- removed /etc/inetd.conf, /etc/rpc +- flagged /etc/securetty as missingok +- fixed buildroot stuff in spec file + +* Thu Jul 31 1997 Erik Troan +- made a noarch package + +* Wed Apr 16 1997 Erik Troan +- Don't verify md5sum, size, or timestamp of /var/log/lastlog, /etc/passwd, + or /etc/group. From svn at tinysofa.org Thu Jul 1 15:54:50 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:54:50 +1000 (EST) Subject: [tinysofa-svn] r2839 - in tinysofa/snapshot/shadow-utils/current: sources specs Message-ID: <20040701155450.702BD4E817E@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:54:46 +1000 (Fri, 02 Jul 2004) New Revision: 2839 Added: tinysofa/snapshot/shadow-utils/current/sources/shadow-4.0.3-removemalloc.patch tinysofa/snapshot/shadow-utils/current/sources/shadow-970616.login.defs Removed: tinysofa/snapshot/shadow-utils/current/sources/shadow-4.0.3.login.defs Modified: tinysofa/snapshot/shadow-utils/current/sources/shadow-4.0.3-mailspool.patch tinysofa/snapshot/shadow-utils/current/sources/shadow-4.0.3-noinst.patch tinysofa/snapshot/shadow-utils/current/sources/shadow-4.0.3-redhat.patch tinysofa/snapshot/shadow-utils/current/sources/shadow-970616.useradd tinysofa/snapshot/shadow-utils/current/sources/shadow-utils-selinux.patch tinysofa/snapshot/shadow-utils/current/specs/shadow-utils.spec Log: - Sync with 2.0. - Kept: - adduser.8: - grpconv.8: - grpunconv.8: - pwunconv.8: - shadow-19990827-group.patch: - shadow-20000902-usg.patch: - shadow-4.0.3-fixref.patch: - shadow-4.0.3-largefile.patch: - shadow-4.0.3-lastlog-size.patch: - shadow-4.0.3-mailspool.patch: - shadow-4.0.3-noinst.patch: - shadow-4.0.3-nscd.patch: - shadow-4.0.3-redhat.patch: - shadow-4.0.3-shadow-man.patch: - shadow-4.0.3-uninitialized.patch: - shadow-4.0.3-vipw.patch: - shadow-4.0.3.tar.bz2: - shadow-970616.useradd: - shadow-utils-selinux.patch: - Added: - shadow-4.0.3-removemalloc.patch: - shadow-970616.login.defs: - Removed: - shadow-4.0.3.login.defs: Modified: tinysofa/snapshot/shadow-utils/current/sources/shadow-4.0.3-mailspool.patch =================================================================== --- tinysofa/snapshot/shadow-utils/current/sources/shadow-4.0.3-mailspool.patch 2004-07-01 15:54:43 UTC (rev 2838) +++ tinysofa/snapshot/shadow-utils/current/sources/shadow-4.0.3-mailspool.patch 2004-07-01 15:54:46 UTC (rev 2839) @@ -37,9 +37,9 @@ + mail_gid = mail->gr_gid; + } + -+ ms = malloc(strlen(user_name) + 18); ++ ms = malloc(strlen(user_name) + 11); + if (ms != NULL) { -+ sprintf(ms, "/var/spool/mail/%s", user_name); ++ sprintf(ms, "/var/mail/%s", user_name); + if (access(ms, R_OK) != 0) { + fd = open(ms, O_CREAT|O_EXCL|O_WRONLY|O_TRUNC); + if (fd != -1) { Modified: tinysofa/snapshot/shadow-utils/current/sources/shadow-4.0.3-noinst.patch =================================================================== --- tinysofa/snapshot/shadow-utils/current/sources/shadow-4.0.3-noinst.patch 2004-07-01 15:54:43 UTC (rev 2838) +++ tinysofa/snapshot/shadow-utils/current/sources/shadow-4.0.3-noinst.patch 2004-07-01 15:54:46 UTC (rev 2839) @@ -1,4 +1,4 @@ -These libraries aren't meant to be installed. +These libraries aren't meant to be installed. Not without headers, at least. --- shadow-4.0.3/libmisc/Makefile.am 2002-11-21 23:19:50.000000000 -0500 +++ shadow-4.0.3/libmisc/Makefile.am 2002-11-21 23:19:45.000000000 -0500 Modified: tinysofa/snapshot/shadow-utils/current/sources/shadow-4.0.3-redhat.patch =================================================================== --- tinysofa/snapshot/shadow-utils/current/sources/shadow-4.0.3-redhat.patch 2004-07-01 15:54:43 UTC (rev 2838) +++ tinysofa/snapshot/shadow-utils/current/sources/shadow-4.0.3-redhat.patch 2004-07-01 15:54:46 UTC (rev 2839) @@ -1,50 +1,12 @@ -diff -Nru shadow-4.0.3.orig/man/groupadd.8 shadow-4.0.3/man/groupadd.8 ---- shadow-4.0.3.orig/man/groupadd.8 2002-03-09 15:37:43.000000000 +0100 -+++ shadow-4.0.3/man/groupadd.8 2003-04-22 14:52:07.000000000 +0200 -@@ -29,7 +29,7 @@ - .SH NAME - groupadd \- Create a new group - .SH SYNOPSIS --\fBgroupadd\fR [\fB-g\fI gid \fR[\fB-o\fR]] \fIgroup\fR -+\fBgroupadd\fR [\fB-g\fI gid \fR[\fB-o\fR]] [\fB-r\fR] [\fB-f\fR] \fIgroup\fR - .SH DESCRIPTION - The \fBgroupadd\fR command - creates a new group account using the values specified on the -@@ -40,9 +40,29 @@ - The numerical value of the group's ID. - This value must be unique, unless the \fB-o\fR option is used. - The value must be non-negative. --The default is to use the smallest ID value greater than 99 and -+The default is to use the smallest ID value greater than 500 and - greater than every other group. --Values between 0 and 99 are typically reserved for system accounts. -+Values between 0 and 499 are typically reserved for \fIsystem accounts\fR. -+.IP \fB-r\fR -+This flag instructs \fBgroupadd\fR to add a \fIsystem -+account\fR. The first available \fIgid\fR lower than 499 will be -+automatically selected unless the \fB-g\fR option is also given on the -+command line. -+.br -+This is an option added by Red Hat. -+.IP \fB-f\fR -+This is the \fIforce\fR flag. This will cause \fBgroupadd\fR to exit with an -+error when the group about to be added already exists on the -+system. If that is the case, the group won't be altered (or added -+again). -+.br -+This option also modifies the way \fB-g\fR option works. When you -+request a \fIgid\fR that it is not unique and you don't specify the \fB-o\fR -+option too, the group creation will fall back to the standard behavior -+(adding a group as if neither \fB-g\fR or \fB-o\fR options were -+specified). -+.br -+This is an option added by Red Hat. - .SH FILES - /etc/group \- group account information - .br -diff -Nru shadow-4.0.3.orig/man/shadowconfig.8 shadow-4.0.3/man/shadowconfig.8 ---- shadow-4.0.3.orig/man/shadowconfig.8 2001-08-24 01:10:48.000000000 +0200 -+++ shadow-4.0.3/man/shadowconfig.8 2003-04-22 14:52:07.000000000 +0200 +Add the -M, -n, and -r flags to useradd, setting the default shell to +/sbin/nologin instead of "" (which is treated as "/bin/sh"), and the default +crypted password to "!!" instead of "!". +Add the -r flag to groupadd. +Remove references to the not-packaged README.debian file from the not-packaged +shadowconfig man page. + +--- shadow-4.0.3/man/shadowconfig.8 2001-08-23 19:10:48.000000000 -0400 ++++ shadow-4.0.3/man/shadowconfig.8 2002-11-25 17:10:09.000000000 -0500 @@ -18,7 +18,3 @@ Turning shadow passwords on when they are already on, or off when they @@ -53,25 +15,37 @@ -Read -.I /usr/share/doc/passwd/README.debian.gz -for a brief introduction to shadow passwords and related features. -diff -Nru shadow-4.0.3.orig/man/useradd.8 shadow-4.0.3/man/useradd.8 ---- shadow-4.0.3.orig/man/useradd.8 2002-03-08 05:39:12.000000000 +0100 -+++ shadow-4.0.3/man/useradd.8 2003-04-22 14:59:28.000000000 +0200 +--- shadow-4.0.3/man/useradd.8 2002-03-07 23:39:12.000000000 -0500 ++++ shadow-4.0.3/man/useradd.8 2002-11-25 17:10:09.000000000 -0500 @@ -36,7 +36,7 @@ .br [\fB-g\fR \fIinitial_group\fR] [\fB-G\fR \fIgroup\fR[,...]] .br -[\fB-m\fR [\fB-k\fR \fIskeleton_dir\fR]] [\fB-o\fR] [\fB-p\fR \fIpasswd\fR] -+[\fB-m\fR [\fB-k\fR \fIskeleton_dir\fR] | \fB-M\fR] [\fB-o\fR] [\fB-p\fR \fIpasswd\fR] [\fB-r\fP] ++[\fB-m\fR [\fB-k\fR \fIskeleton_dir\fR] | \fB-M\fR] [\fB-n\fR] [\fB-o\fR] [\fB-p\fR \fIpasswd\fR] [\fB-r\fP] .br [\fB-s\fR \fIshell\fR] [\fB-u\fR \fIuid\fR] \fIlogin\fR .TP 8 -@@ -95,11 +95,23 @@ +@@ -53,6 +53,8 @@ + The new user account will be entered into the system files as needed, + the home directory will be created, and initial files copied, depending + on the command line options. ++The version provided with Red Hat Linux will create a group for each ++user added to the system, unless the \fB-n\fR option is given. + The options which apply to the \fBuseradd\fR command are: + .IP "\fB-c \fIcomment\fR" + The new user's password file comment field. +@@ -95,11 +97,27 @@ option. The default is to not create the directory and to not copy any files. +.IP \fB-M\fR +The user home directory will not be created, even if the system +wide settings from \fI/etc/login.defs\fR is to create home dirs. ++.IP \fB-n\fR ++A group having the same name as the user being added to the system ++will be created by default. This option will turn off this Red Hat ++Linux specific behavior. .IP "\fB-o\fR" Allow create user with duplicate (non-unique) UID. .IP "\fB-p \fIpasswd\fR" @@ -89,98 +63,83 @@ .IP "\fB-s \fIshell\fR" The name of the user's login shell. The default is to leave this field blank, which causes the system -@@ -143,15 +155,19 @@ +@@ -139,19 +157,26 @@ + .SH NOTES + The system administrator is responsible for placing the default + user files in the \fI/etc/skel\fR directory. ++.br ++This version of useradd was modified by Red Hat to suit Red Hat ++user/group conventions. + .SH CAVEATS You may not add a user to an NIS group. This must be performed on the NIS server. .SH FILES -/etc/passwd \- user account information +\fB/etc/passwd\fR \- user account information ++.br ++\fB/etc/shadow\fR \- secure user account information ++.br ++\fB/etc/group\fR \- group information .br -/etc/shadow \- secure user account information -+\fB/etc/shadow\fR \- secure user account information ++\fB/etc/gshadow\fR \- secure group information .br -/etc/group \- group information -+\fB/etc/group\fR \- group information ++\fB/etc/default/useradd\fR \- default information .br -/etc/default/useradd \- default information -+\fB/etc/gshadow\fR \- secure group information ++\fB/etc/login.defs\fR \- system-wide settings .br -/etc/skel \- directory containing default files -+\fB/etc/default/useradd\fR \- default information -+.br -+\fB/etc/login.defs\fR \- system-wide settings -+.br +\fB/etc/skel\fR \- directory containing default files .SH SEE ALSO .BR chfn (1), .BR chsh (1), -diff -Nru shadow-4.0.3.orig/src/groupadd.c shadow-4.0.3/src/groupadd.c ---- shadow-4.0.3.orig/src/groupadd.c 2002-01-06 15:09:07.000000000 +0100 -+++ shadow-4.0.3/src/groupadd.c 2003-04-22 14:52:07.000000000 +0200 -@@ -71,6 +71,7 @@ - static int oflg = 0; /* permit non-unique group ID to be specified with -g */ - static int gflg = 0; /* ID value for the new group */ - static int fflg = 0; /* if group already exists, do nothing and exit(0) */ -+static int rflg = 0; /* for adding system accounts (Red Hat) */ - - #ifdef NDBM - extern int gr_dbm_mode; -@@ -98,7 +99,7 @@ - - static void usage (void) - { -- fprintf (stderr, _("usage: groupadd [-g gid [-o]] group\n")); -+ fprintf (stderr, _("usage: groupadd [-g gid [-o]] [-r] [-f] group\n")); - exit (E_USAGE); - } - -@@ -224,8 +225,13 @@ - const struct group *grp; - gid_t gid_min, gid_max; - -- gid_min = getdef_unum ("GID_MIN", 100); -- gid_max = getdef_unum ("GID_MAX", 60000); -+ if (!rflg) { -+ gid_min = getdef_unum ("GID_MIN", 500); -+ gid_max = getdef_unum ("GID_MAX", 60000); -+ } else { -+ gid_min = 1; -+ gid_max = getdef_unum ("GID_MIN", 500) - 1; -+ } - - /* - * Start with some GID value if the user didn't provide us with -@@ -333,7 +339,7 @@ - char *cp; - int arg; - -- while ((arg = getopt (argc, argv, "og:O:f")) != EOF) { -+ while ((arg = getopt (argc, argv, "og:O:fr")) != EOF) { - switch (arg) { - case 'g': - gflg++; -@@ -374,11 +380,17 @@ - * "force" - do nothing, just exit(0), if the - * specified group already exists. With -g, if - * specified gid already exists, choose another -- * (unique) gid (turn off -g). Based on the RedHat's -+ * (unique) gid (turn off -g). Based on the Red Hat's - * patch from shadow-utils-970616-9. - */ - fflg++; - break; -+ case 'r': -+ /* -+ * create a system group -+ */ -+ rflg++; -+ break; - default: - usage (); - } -diff -Nru shadow-4.0.3.orig/src/useradd.c shadow-4.0.3/src/useradd.c ---- shadow-4.0.3.orig/src/useradd.c 2002-01-10 14:01:28.000000000 +0100 -+++ shadow-4.0.3/src/useradd.c 2003-04-22 15:07:27.000000000 +0200 +--- shadow-4.0.3/man/groupadd.8 2002-03-09 09:37:43.000000000 -0500 ++++ shadow-4.0.3/man/groupadd.8 2002-11-25 17:10:09.000000000 -0500 +@@ -29,7 +29,7 @@ + .SH NAME + groupadd \- Create a new group + .SH SYNOPSIS +-\fBgroupadd\fR [\fB-g\fI gid \fR[\fB-o\fR]] \fIgroup\fR ++\fBgroupadd\fR [\fB-g\fI gid \fR[\fB-o\fR]] [\fB-r\fR] [\fB-f\fR] \fIgroup\fR + .SH DESCRIPTION + The \fBgroupadd\fR command + creates a new group account using the values specified on the +@@ -40,9 +40,29 @@ + The numerical value of the group's ID. + This value must be unique, unless the \fB-o\fR option is used. + The value must be non-negative. +-The default is to use the smallest ID value greater than 99 and ++The default is to use the smallest ID value greater than 500 and + greater than every other group. +-Values between 0 and 99 are typically reserved for system accounts. ++Values between 0 and 499 are typically reserved for \fIsystem accounts\fR. ++.IP \fB-r\fR ++This flag instructs \fBgroupadd\fR to add a \fIsystem ++account\fR. The first available \fIgid\fR lower than 499 will be ++automatically selected unless the \fB-g\fR option is also given on the ++command line. ++.br ++This is an option added by Red Hat. ++.IP \fB-f\fR ++This is the \fIforce\fR flag. This will cause \fBgroupadd\fR to exit with an ++error when the group about to be added already exists on the ++system. If that is the case, the group won't be altered (or added ++again). ++.br ++This option also modifies the way \fB-g\fR option works. When you ++request a \fIgid\fR that it is not unique and you don't specify the \fB-o\fR ++option too, the group creation will fall back to the standard behavior ++(adding a group as if neither \fB-g\fR or \fB-o\fR options were ++specified). ++.br ++This is an option added by Red Hat. + .SH FILES + /etc/group \- group account information + .br +--- shadow-4.0.3/src/useradd.c 2002-01-10 08:01:28.000000000 -0500 ++++ shadow-4.0.3/src/useradd.c 2002-11-25 17:11:37.000000000 -0500 @@ -74,7 +74,7 @@ static gid_t def_group = 100; static const char *def_gname = "other"; @@ -199,11 +158,13 @@ static uid_t user_id; static gid_t user_gid; static const char *user_comment = ""; -@@ -119,7 +119,9 @@ +@@ -118,8 +118,10 @@ + Gflg = 0, /* secondary group set for new account */ kflg = 0, /* specify a directory to fill new user directory */ mflg = 0, /* create user's home directory if it doesn't exist */ - nflg = 0, /* create a group having the same name as the user */ +- nflg = 0, /* create a group having the same name as the user */ + Mflg = 0, /* do NOT create user's home directory no matter what */ ++ nflg = 0, /* do NOT create a group having the same name as the user */ oflg = 0, /* permit non-unique user ID to be specified with -u */ + rflg = 0, /* create a system account */ sflg = 0, /* shell program for new account */ @@ -214,7 +175,7 @@ fprintf (stderr, _("[-A program] ")); #endif - fprintf (stderr, _("[-p passwd] name\n")); -+ fprintf (stderr, _("[-p passwd] [-M] [-r] name\n")); ++ fprintf (stderr, _("[-p passwd] [-M] [-n] [-r] name\n")); fprintf (stderr, _(" %s\t-D [-g group] [-b base] [-s shell]\n"), @@ -396,10 +357,10 @@ #ifdef SHADOWPWD -#define FLAGS "A:Du:og:G:d:s:c:mk:p:f:e:b:O:M" -+#define FLAGS "A:Du:og:G:d:s:c:mk:p:f:e:b:O:Mr" ++#define FLAGS "A:Du:og:G:d:s:c:mk:p:f:e:b:O:Mnr" #else -#define FLAGS "A:Du:og:G:d:s:c:mk:p:b:O:M" -+#define FLAGS "A:Du:og:G:d:s:c:mk:p:b:O:Mr" ++#define FLAGS "A:Du:og:G:d:s:c:mk:p:b:O:Mnr" #endif while ((arg = getopt (argc, argv, FLAGS)) != EOF) { #undef FLAGS @@ -416,10 +377,13 @@ case 'o': oflg++; break; -@@ -1345,12 +1409,21 @@ +@@ -1345,12 +1409,24 @@ user_id = get_uid (optarg); uflg++; break; ++ case 'n': ++ nflg++; ++ break; + case 'r': + rflg++; + break; @@ -438,7 +402,7 @@ /* * Certain options are only valid in combination with others. * Check it here so that they can be specified in any order. -@@ -1429,7 +1502,6 @@ +@@ -1429,7 +1505,6 @@ Prog); fail_exit (E_GRP_UPDATE); } @@ -446,7 +410,7 @@ #ifdef SHADOWGRP if (is_shadow_grp && !sgr_close ()) { fprintf (stderr, -@@ -1438,15 +1510,8 @@ +@@ -1438,15 +1513,8 @@ Prog); fail_exit (E_GRP_UPDATE); } @@ -462,7 +426,7 @@ } /* -@@ -1485,6 +1550,31 @@ +@@ -1485,6 +1553,31 @@ exit (E_PW_UPDATE); } #endif @@ -494,7 +458,7 @@ } -@@ -1665,6 +1755,118 @@ +@@ -1665,6 +1758,118 @@ grp_update (); } @@ -613,7 +577,7 @@ /* * create_home - create the user's home directory * -@@ -1785,6 +1987,14 @@ +@@ -1785,6 +1990,14 @@ process_flags (argc, argv); @@ -628,7 +592,7 @@ /* * See if we are messing with the defaults file, or creating * a new user. -@@ -1831,29 +2041,28 @@ +@@ -1831,29 +2044,35 @@ open_files (); @@ -637,6 +601,13 @@ + * gid too ... --gafton */ + find_new_uid (); + ++ /* do we have to add a group for that user? This is why we need to ++ * open the group files in the open_files() function --gafton */ ++ if (! (nflg || gflg)) { ++ find_new_gid(); ++ grp_add(); ++ } ++ usr_update (); if (mflg) { @@ -674,9 +645,71 @@ close_files (); -diff -Nru shadow-4.0.3.orig/src/userdel.c shadow-4.0.3/src/userdel.c ---- shadow-4.0.3.orig/src/userdel.c 2002-01-05 16:41:44.000000000 +0100 -+++ shadow-4.0.3/src/userdel.c 2003-04-22 14:52:07.000000000 +0200 +--- shadow-4.0.3/src/groupadd.c 2002-01-06 09:09:07.000000000 -0500 ++++ shadow-4.0.3/src/groupadd.c 2002-11-25 17:10:10.000000000 -0500 +@@ -71,6 +71,7 @@ + static int oflg = 0; /* permit non-unique group ID to be specified with -g */ + static int gflg = 0; /* ID value for the new group */ + static int fflg = 0; /* if group already exists, do nothing and exit(0) */ ++static int rflg = 0; /* for adding system accounts (Red Hat) */ + + #ifdef NDBM + extern int gr_dbm_mode; +@@ -98,7 +99,7 @@ + + static void usage (void) + { +- fprintf (stderr, _("usage: groupadd [-g gid [-o]] group\n")); ++ fprintf (stderr, _("usage: groupadd [-g gid [-o]] [-r] [-f] group\n")); + exit (E_USAGE); + } + +@@ -224,8 +225,13 @@ + const struct group *grp; + gid_t gid_min, gid_max; + +- gid_min = getdef_unum ("GID_MIN", 100); +- gid_max = getdef_unum ("GID_MAX", 60000); ++ if (!rflg) { ++ gid_min = getdef_unum ("GID_MIN", 500); ++ gid_max = getdef_unum ("GID_MAX", 60000); ++ } else { ++ gid_min = 1; ++ gid_max = getdef_unum ("GID_MIN", 500) - 1; ++ } + + /* + * Start with some GID value if the user didn't provide us with +@@ -333,7 +339,7 @@ + char *cp; + int arg; + +- while ((arg = getopt (argc, argv, "og:O:f")) != EOF) { ++ while ((arg = getopt (argc, argv, "og:O:fr")) != EOF) { + switch (arg) { + case 'g': + gflg++; +@@ -374,11 +380,17 @@ + * "force" - do nothing, just exit(0), if the + * specified group already exists. With -g, if + * specified gid already exists, choose another +- * (unique) gid (turn off -g). Based on the RedHat's ++ * (unique) gid (turn off -g). Based on the Red Hat's + * patch from shadow-utils-970616-9. + */ + fflg++; + break; ++ case 'r': ++ /* ++ * create a system group ++ */ ++ rflg++; ++ break; + default: + usage (); + } +--- shadow-4.0.3/src/userdel.c 2002-01-05 10:41:44.000000000 -0500 ++++ shadow-4.0.3/src/userdel.c 2002-11-25 17:10:10.000000000 -0500 @@ -60,7 +60,9 @@ #define E_HOMEDIR 12 /* can't remove home directory */ static char *user_name; Added: tinysofa/snapshot/shadow-utils/current/sources/shadow-4.0.3-removemalloc.patch =================================================================== --- tinysofa/snapshot/shadow-utils/current/sources/shadow-4.0.3-removemalloc.patch 2004-07-01 15:54:43 UTC (rev 2838) +++ tinysofa/snapshot/shadow-utils/current/sources/shadow-4.0.3-removemalloc.patch 2004-07-01 15:54:46 UTC (rev 2839) @@ -0,0 +1,11 @@ +--- shadow-4.0.3/libmisc/xmalloc.c.removemalloc 1998-12-28 15:34:56.000000000 -0500 ++++ shadow-4.0.3/libmisc/xmalloc.c 2004-06-17 07:32:31.112400832 -0400 +@@ -16,8 +16,6 @@ + + #include "defines.h" + +-extern char *malloc(); +- + char * + xmalloc(size_t size) + { Deleted: tinysofa/snapshot/shadow-utils/current/sources/shadow-4.0.3.login.defs =================================================================== --- tinysofa/snapshot/shadow-utils/current/sources/shadow-4.0.3.login.defs 2004-07-01 15:54:43 UTC (rev 2838) +++ tinysofa/snapshot/shadow-utils/current/sources/shadow-4.0.3.login.defs 2004-07-01 15:54:46 UTC (rev 2839) @@ -1,377 +0,0 @@ -# -# /etc/login.defs - Configuration control definitions for the login package. -# -# $Id: login.defs.linux,v 1.12 2000/08/26 18:27:10 marekm Exp $ -# -# Three items must be defined: MAIL_DIR, ENV_SUPATH, and ENV_PATH. -# If unspecified, some arbitrary (and possibly incorrect) value will -# be assumed. All other items are optional - if not specified then -# the described action or option will be inhibited. -# -# Comment lines (lines beginning with "#") and blank lines are ignored. -# -# Modified for Linux. --marekm - -# -# Delay in seconds before being allowed another attempt after a login failure -# -FAIL_DELAY 3 - -# -# Enable additional passwords upon dialup lines specified in /etc/dialups. -# -DIALUPS_CHECK_ENAB yes - -# -# Enable logging and display of /var/log/faillog login failure info. -# -FAILLOG_ENAB yes - -# -# Enable display of unknown usernames when login failures are recorded. -# -LOG_UNKFAIL_ENAB no - -# -# Enable logging of successful logins -# -LOG_OK_LOGINS no - -# -# Enable logging and display of /var/log/lastlog login time info. -# -LASTLOG_ENAB yes - -# -# Enable checking and display of mailbox status upon login. -# -# Disable if the shell startup files already check for mail -# ("mailx -e" or equivalent). -# -MAIL_CHECK_ENAB yes - -# -# Enable additional checks upon password changes. -# -OBSCURE_CHECKS_ENAB yes - -# -# Enable checking of time restrictions specified in /etc/porttime. -# -PORTTIME_CHECKS_ENAB yes - -# -# Enable setting of ulimit, umask, and niceness from passwd gecos field. -# -QUOTAS_ENAB yes - -# -# Enable "syslog" logging of su activity - in addition to sulog file logging. -# SYSLOG_SG_ENAB does the same for newgrp and sg. -# -SYSLOG_SU_ENAB yes -SYSLOG_SG_ENAB yes - -# -# If defined, either full pathname of a file containing device names or -# a ":" delimited list of device names. Root logins will be allowed only -# upon these devices. -# -CONSOLE /etc/securetty -#CONSOLE console:tty01:tty02:tty03:tty04 - -# -# If defined, all su activity is logged to this file. -# -#SULOG_FILE /var/log/sulog - -# -# If defined, ":" delimited list of "message of the day" files to -# be displayed upon login. -# -MOTD_FILE /etc/motd -#MOTD_FILE /etc/motd:/usr/lib/news/news-motd - -# -# If defined, this file will be output before each login prompt. -# -#ISSUE_FILE /etc/issue - -# -# If defined, file which maps tty line to TERM environment parameter. -# Each line of the file is in a format something like "vt100 tty01". -# -#TTYTYPE_FILE /etc/ttytype - -# -# If defined, login failures will be logged here in a utmp format. -# last, when invoked as lastb, will read /var/log/btmp, so... -# -FTMP_FILE /var/log/btmp - -# -# If defined, name of file whose presence which will inhibit non-root -# logins. The contents of this file should be a message indicating -# why logins are inhibited. -# -NOLOGINS_FILE /etc/nologin - -# -# If defined, the command name to display when running "su -". For -# example, if this is defined as "su" then a "ps" will display the -# command is "-su". If not defined, then "ps" would display the -# name of the shell actually being run, e.g. something like "-sh". -# -SU_NAME su - -# -# *REQUIRED* -# Directory where mailboxes reside, _or_ name of file, relative to the -# home directory. If you _do_ define both, MAIL_DIR takes precedence. -# QMAIL_DIR is for Qmail -# -QMAIL_DIR Maildir -#MAIL_DIR /var/spool/mail -#MAIL_FILE .mail - -# -# If defined, file which inhibits all the usual chatter during the login -# sequence. If a full pathname, then hushed mode will be enabled if the -# user's name or shell are found in the file. If not a full pathname, then -# hushed mode will be enabled if the file exists in the user's home directory. -# -HUSHLOGIN_FILE .hushlogin -#HUSHLOGIN_FILE /etc/hushlogins - -# -# If defined, the presence of this value in an /etc/passwd "shell" field will -# disable logins for that user, although "su" will still be allowed. -# -# XXX this does not seem to be implemented yet... --marekm -# no, it was implemented but I ripped it out ;-) -- jfh -NOLOGIN_STR NOLOGIN - -# -# If defined, either a TZ environment parameter spec or the -# fully-rooted pathname of a file containing such a spec. -# -#ENV_TZ TZ=CST6CDT -#ENV_TZ /etc/tzname - -# -# If defined, an HZ environment parameter spec. -# -# for Linux/x86 -ENV_HZ HZ=100 -# For Linux/Alpha... -#ENV_HZ HZ=1024 - -# -# *REQUIRED* The default PATH settings, for superuser and normal users. -# -# (they are minimal, add the rest in the shell startup files) -ENV_SUPATH PATH=/sbin:/bin:/usr/sbin:/usr/bin -ENV_PATH PATH=/bin:/usr/bin - -# -# Terminal permissions -# -# TTYGROUP Login tty will be assigned this group ownership. -# TTYPERM Login tty will be set to this permission. -# -# If you have a "write" program which is "setgid" to a special group -# which owns the terminals, define TTYGROUP to the group number and -# TTYPERM to 0620. Otherwise leave TTYGROUP commented out and assign -# TTYPERM to either 622 or 600. -# -TTYGROUP tty -TTYPERM 0600 - -# -# Login configuration initializations: -# -# ERASECHAR Terminal ERASE character ('\010' = backspace). -# KILLCHAR Terminal KILL character ('\025' = CTRL/U). -# UMASK Default "umask" value. -# ULIMIT Default "ulimit" value. -# -# The ERASECHAR and KILLCHAR are used only on System V machines. -# The ULIMIT is used only if the system supports it. -# (now it works with setrlimit too; ulimit is in 512-byte units) -# -# Prefix these values with "0" to get octal, "0x" to get hexadecimal. -# -ERASECHAR 0177 -KILLCHAR 025 -UMASK 076 -#ULIMIT 2097152 - -# -# Password aging controls: -# -# PASS_MAX_DAYS Maximum number of days a password may be used. -# PASS_MIN_DAYS Minimum number of days allowed between password changes. -# PASS_MIN_LEN Minimum acceptable password length. -# PASS_WARN_AGE Number of days warning given before a password expires. -# -PASS_MAX_DAYS 99999 -PASS_MIN_DAYS 0 -PASS_MIN_LEN 5 -PASS_WARN_AGE 7 - -# -# If "yes", the user must be listed as a member of the first gid 0 group -# in /etc/group (called "root" on most Linux systems) to be able to "su" -# to uid 0 accounts. If the group doesn't exist or is empty, no one -# will be able to "su" to uid 0. -# -SU_WHEEL_ONLY yes - -# -# If compiled with cracklib support, where are the dictionaries -# -#CRACKLIB_DICTPATH /var/cache/cracklib/cracklib_dict - -# -# Min/max values for automatic uid selection in useradd -# -UID_MIN 500 -UID_MAX 60000 - -# -# Min/max values for automatic gid selection in groupadd -# -GID_MIN 500 -GID_MAX 60000 - -# -# Max number of login retries if password is bad -# -LOGIN_RETRIES 5 - -# -# Max time in seconds for login -# -LOGIN_TIMEOUT 60 - -# -# Maximum number of attempts to change password if rejected (too easy) -# -PASS_CHANGE_TRIES 5 - -# -# Warn about weak passwords (but still allow them) if you are root. -# -PASS_ALWAYS_WARN yes - -# -# Number of significant characters in the password for crypt(). -# Default is 8, don't change unless your crypt() is better. -# Ignored if MD5_CRYPT_ENAB set to "yes". -# -#PASS_MAX_LEN 8 - -# -# Require password before chfn/chsh can make any changes. -# -CHFN_AUTH yes - -# -# Which fields may be changed by regular users using chfn - use -# any combination of letters "frwh" (full name, room number, work -# phone, home phone). If not defined, no changes are allowed. -# For backward compatibility, "yes" = "rwh" and "no" = "frwh". -# -CHFN_RESTRICT rwh - -# -# Password prompt (%s will be replaced by user name). -# -# XXX - it doesn't work correctly yet, for now leave it commented out -# to use the default which is just "Password: ". -#LOGIN_STRING "%s's Password: " - -# -# Only works if compiled with MD5_CRYPT defined: -# If set to "yes", new passwords will be encrypted using the MD5-based -# algorithm compatible with the one used by recent releases of FreeBSD. -# It supports passwords of unlimited length and longer salt strings. -# Set to "no" if you need to copy encrypted passwords to other systems -# which don't understand the new algorithm. Default is "no". -# -MD5_CRYPT_ENAB yes - -# -# List of groups to add to the user's supplementary group set -# when logging in on the console (as determined by the CONSOLE -# setting). Default is none. -# -# Use with caution - it is possible for users to gain permanent -# access to these groups, even when not logged in on the console. -# How to do it is left as an exercise for the reader... -# -#CONSOLE_GROUPS floppy:audio:cdrom - -# -# Should login be allowed if we can't cd to the home directory? -# Default in no. -# -DEFAULT_HOME yes - -# -# If this file exists and is readable, login environment will be -# read from it. Every line should be in the form name=value. -# -ENVIRON_FILE /etc/environment - -# -# If defined, this command is run when removing a user. -# It should remove any at/cron/print jobs etc. owned by -# the user to be removed (passed as the first argument). -# -#USERDEL_CMD /usr/sbin/userdel_local - -# -# If defined, either full pathname of a file containing device names or -# a ":" delimited list of device names. No password is required to log in -# as a non-root user on these devices. -# -#NO_PASSWORD_CONSOLE tty1:tty2:tty3:tty4:tty5:tty6 - -# -# When prompting for password without echo, getpass() can optionally -# display a random number (in the range 1 to GETPASS_ASTERISKS) of '*' -# characters for each character typed. This feature is designed to -# confuse people looking over your shoulder when you enter a password :-). -# Also, the new getpass() accepts both Backspace (8) and Delete (127) -# keys to delete previous character (to cope with different terminal -# types), Control-U to delete all characters, and beeps when there are -# no more characters to delete, or too many characters entered. -# -# Setting GETPASS_ASTERISKS to 1 results in more traditional behaviour - -# exactly one '*' displayed for each character typed. -# -# Setting GETPASS_ASTERISKS to 0 disables the '*' characters (Backspace, -# Delete, Control-U and beep continue to work as described above). -# -# Setting GETPASS_ASTERISKS to -1 reverts to the traditional getpass() -# without any new features. This is the default. -# -#GETPASS_ASTERISKS 1 - -# -# Enable setting of the umask group bits to be the same as owner bits -# (examples: 022 -> 002, 077 -> 007) for non-root users, if the uid is -# the same as gid, and username is the same as the primary group name. -# -# This also enables userdel to remove user groups if no members exist. -# -USERGROUPS_ENAB no - -# -# If useradd should create home directories for users by default -# On tinysofa systems, we do. This option is ORed with the -m flag on -# useradd command line. -# -CREATE_HOME yes - Added: tinysofa/snapshot/shadow-utils/current/sources/shadow-970616.login.defs =================================================================== --- tinysofa/snapshot/shadow-utils/current/sources/shadow-970616.login.defs 2004-07-01 15:54:43 UTC (rev 2838) +++ tinysofa/snapshot/shadow-utils/current/sources/shadow-970616.login.defs 2004-07-01 15:54:46 UTC (rev 2839) @@ -0,0 +1,47 @@ +# *REQUIRED* +# Directory where mailboxes reside, _or_ name of file, relative to the +# home directory. If you _do_ define both, MAIL_DIR takes precedence. +# QMAIL_DIR is for Qmail +# +#QMAIL_DIR Maildir +MAIL_DIR /var/spool/mail +#MAIL_FILE .mail + +# Password aging controls: +# +# PASS_MAX_DAYS Maximum number of days a password may be used. +# PASS_MIN_DAYS Minimum number of days allowed between password changes. +# PASS_MIN_LEN Minimum acceptable password length. +# PASS_WARN_AGE Number of days warning given before a password expires. +# +PASS_MAX_DAYS 99999 +PASS_MIN_DAYS 0 +PASS_MIN_LEN 5 +PASS_WARN_AGE 7 + +# +# Min/max values for automatic uid selection in useradd +# +UID_MIN 500 +UID_MAX 60000 + +# +# Min/max values for automatic gid selection in groupadd +# +GID_MIN 500 +GID_MAX 60000 + +# +# If defined, this command is run when removing a user. +# It should remove any at/cron/print jobs etc. owned by +# the user to be removed (passed as the first argument). +# +#USERDEL_CMD /usr/sbin/userdel_local + +# +# If useradd should create home directories for users by default +# On RH systems, we do. This option is ORed with the -m flag on +# useradd command line. +# +CREATE_HOME yes + Modified: tinysofa/snapshot/shadow-utils/current/sources/shadow-970616.useradd =================================================================== --- tinysofa/snapshot/shadow-utils/current/sources/shadow-970616.useradd 2004-07-01 15:54:43 UTC (rev 2838) +++ tinysofa/snapshot/shadow-utils/current/sources/shadow-970616.useradd 2004-07-01 15:54:46 UTC (rev 2839) @@ -1,6 +1,6 @@ # useradd defaults file GROUP=100 -HOME=/home/users +HOME=/home INACTIVE=-1 EXPIRE= SHELL=/bin/bash Modified: tinysofa/snapshot/shadow-utils/current/sources/shadow-utils-selinux.patch =================================================================== --- tinysofa/snapshot/shadow-utils/current/sources/shadow-utils-selinux.patch 2004-07-01 15:54:43 UTC (rev 2838) +++ tinysofa/snapshot/shadow-utils/current/sources/shadow-utils-selinux.patch 2004-07-01 15:54:46 UTC (rev 2839) @@ -1,16 +1,19 @@ ---- shadow-4.0.3/lib/Makefile.am.selinux 2004-01-21 16:12:54.342392154 -0500 -+++ shadow-4.0.3/lib/Makefile.am 2004-01-21 16:59:56.718109817 -0500 -@@ -1,7 +1,7 @@ +--- shadow-4.0.3/configure.in.selinux 2002-03-13 03:36:40.000000000 -0500 ++++ shadow-4.0.3/configure.in 2004-06-17 07:09:22.249540080 -0400 +@@ -238,6 +239,11 @@ + AC_CHECK_LIB(crypt, crypt, [AC_DEFINE(HAVE_LIBCRYPT) LIBCRYPT=-lcrypt]) + fi - AUTOMAKE_OPTIONS = 1.0 foreign - --DEFS = -+DEFS = -DWITH_SELINUX - INCLUDES = -I$(top_srcdir) - - noinst_LTLIBRARIES = libshadow.la ++AC_SUBST(LIBSELINUX) ++if test "$with_selinux" != "no"; then ++ AC_CHECK_LIB(selinux, is_selinux_enabled, [AC_DEFINE(WITH_SELINUX) LIBSELINUX=-lselinux]) ++fi ++ + AC_SUBST(LIBCRACK) + if test "$with_libcrack" != "no"; then + echo "checking cracklib flavour, don't be surprised by the results" --- shadow-4.0.3/lib/commonio.c.selinux 2001-11-17 08:15:52.000000000 -0500 -+++ shadow-4.0.3/lib/commonio.c 2004-01-21 16:55:13.952746340 -0500 ++++ shadow-4.0.3/lib/commonio.c 2004-06-17 07:09:22.216545096 -0400 @@ -15,7 +15,9 @@ #ifdef HAVE_SHADOW_H #include @@ -33,30 +36,27 @@ if (!db->isopen) { errno = EINVAL; -@@ -627,6 +633,22 @@ +@@ -627,6 +633,19 @@ goto fail; } +#ifdef WITH_SELINUX + if (is_selinux_enabled()>0) { -+ if (getfscreatecon(&old_context) < 0) { -+ errors++; -+ goto fail; -+ } -+ if (fgetfilecon(fileno(db->fp),&scontext) < 0) { -+ errors++; -+ goto fail; -+ } -+ if (setfscreatecon(scontext)<0) { -+ errors++; -+ goto fail; -+ } ++ if (getfscreatecon(&old_context) < 0) ++ if (security_getenforce()) ++ goto fail; ++ if (fgetfilecon(fileno(db->fp),&scontext) < 0) ++ if (security_getenforce()) ++ goto fail; ++ if (setfscreatecon(scontext)<0) ++ if (security_getenforce()) ++ goto fail; + } +#endif /* * Create backup file. */ -@@ -683,14 +705,26 @@ +@@ -683,14 +702,26 @@ goto fail; nscd_need_reload = 1; @@ -71,15 +71,15 @@ -fail: +#ifdef WITH_SELINUX + if (scontext != NULL) { -+ if (setfscreatecon(old_context)<0) { -+ errors++; -+ } -+ if (old_context != NULL) { -+ freecon(old_context); -+ old_context=NULL; -+ } -+ freecon(scontext); -+ scontext=NULL; ++ if (setfscreatecon(old_context)<0) ++ if (security_getenforce()) ++ errors++; ++ if (old_context != NULL) { ++ freecon(old_context); ++ old_context=NULL; ++ } ++ freecon(scontext); ++ scontext=NULL; + } +#endif free_linked_list(db); @@ -89,22 +89,25 @@ --- shadow-4.0.3/src/Makefile.am.selinux 2002-03-10 02:12:52.000000000 -0500 -+++ shadow-4.0.3/src/Makefile.am 2004-01-21 16:12:54.592405425 -0500 -@@ -4,7 +4,7 @@ - ubindir = ${prefix}/bin - usbindir = ${prefix}/sbin - --DEFS = -D_HAVE_CONFIG_H -DLOCALEDIR=\"$(datadir)/locale\" -+DEFS = -D_HAVE_CONFIG_H -DLOCALEDIR=\"$(datadir)/locale\" -DWITH_SELINUX - - INCLUDES = -I${top_srcdir} \ - -I${top_srcdir}/lib \ ++++ shadow-4.0.3/src/Makefile.am 2004-06-17 07:10:21.307561896 -0400 @@ -35,7 +35,7 @@ suidubins = chage chfn chsh expiry gpasswd newgrp passwd LDADD = $(top_builddir)/libmisc/libmisc.la \ - $(top_builddir)/lib/libshadow.la -+ $(top_builddir)/lib/libshadow.la -lselinux ++ $(top_builddir)/lib/libshadow.la $(LIBSELINUX) chpasswd_LDADD = $(LDADD) $(LIBPAM) chage_LDADD = $(LDADD) $(LIBPAM) +--- shadow-4.0.3/config.h.in.selinux 2002-01-06 09:46:07.000000000 -0500 ++++ shadow-4.0.3/config.h.in 2004-06-17 07:09:22.217544944 -0400 +@@ -51,6 +51,9 @@ + /* Defined if you have libcrack. */ + #undef HAVE_LIBCRACK + ++/* Defined if you have libselinux. */ ++#undef WITH_SELINUX ++ + /* Defined if you have the ts&szs cracklib. */ + #undef HAVE_LIBCRACK_HIST + Modified: tinysofa/snapshot/shadow-utils/current/specs/shadow-utils.spec =================================================================== --- tinysofa/snapshot/shadow-utils/current/specs/shadow-utils.spec 2004-07-01 15:54:43 UTC (rev 2838) +++ tinysofa/snapshot/shadow-utils/current/specs/shadow-utils.spec 2004-07-01 15:54:46 UTC (rev 2839) @@ -1,3 +1,7 @@ +%if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} +%define WITH_SELINUX 1 +%endif + %define utf8_man_pages 1 Summary: Utilities for managing accounts and shadow password files. @@ -3,8 +7,9 @@ Name: shadow-utils Version: 4.0.3 -Release: 24ts +Release: 23ts +Epoch: 2 URL: http://shadow.pld.org.pl/ Source0: ftp://ftp.pld.org.pl/software/shadow/shadow-%{version}.tar.bz2 -Source1: shadow-4.0.3.login.defs +Source1: shadow-970616.login.defs Source2: shadow-970616.useradd Source3: adduser.8 @@ -25,11 +30,11 @@ Patch10: shadow-4.0.3-largefile.patch Patch11: shadow-4.0.3-fixref.patch Patch12: shadow-4.0.3-uninitialized.patch +Patch13: shadow-4.0.3-removemalloc.patch License: BSD -Group: tinysofa official -BuildPrereq: autoconf, automake, libtool -BuildRequires: gettext gcc-c++-devel -BuildRoot: %{_tmppath}/%{name}-root +Group: System Environment/Base +BuildPrereq: autoconf, automake, libtool, gettext-devel +Buildroot: %{_tmppath}/%{name}-%{version}-root Obsoletes: adduser %description @@ -54,14 +59,12 @@ %patch5 -p1 -b .mailspool %patch6 -p1 -b .usg %patch7 -p1 -b .shadow-man -%if %{use_selinux} -#SELinux %patch8 -p1 -b .selinux -%endif %patch9 -p1 -b .lastlog-size %patch10 -p1 -b .largefile %patch11 -p1 -b .fixref %patch12 -p1 -b .uninitialized +%patch13 -p1 -b .removemalloc rm po/*.gmo # Recode man pages from euc-jp to UTF-8. @@ -96,6 +99,9 @@ --enable-shadowgrp \ --without-libcrack \ --with-libcrypt \ +%if %{WITH_SELINUX} + --with-selinux \ +%endif --without-libpam \ --disable-shared make @@ -247,19 +253,14 @@ %{_mandir}/*/man8/faillog.8* %changelog -* Wed May 19 2004 tsintegrate 4.0.3-24ts -- current (4.0.3-23ts) integrated as 4.0.3-24ts for release 1.0-U1 +* Thu Jun 17 2004 Dan Walsh 4.0.3-23 +- Add get_enforce checks +- Clean up patch for potential upstream submission +- Add removemalloc patch to get it to build on 3.4 -* Wed May 12 2004 Omar Kilani -- Add BuildRequires gettext, gcc-c++-devel. +* Tue Jun 15 2004 Elliot Lee +- rebuilt -* Tue Apr 12 2004 Omar Kilani 4.0.3-23ts -- Fix SOURCE1 so that it uses the tinysofa login.defs instead of the RH one. -- Oops. This broke things... and I'm wondering how no one noticed it. - -* Wed Apr 07 2004 Omar Kilani 4.0.3-22ts -- I'll take this over the Trustix one, thanks. - * Tue Mar 30 2004 Nalin Dahyabhai 4.0.3-21 - rebuild @@ -536,4 +537,4 @@ - fixed some bugs * Tue Jun 17 1997 Erik Troan -- built against glibc \ No newline at end of file +- built against glibc From svn at tinysofa.org Thu Jul 1 15:56:26 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:56:26 +1000 (EST) Subject: [tinysofa-svn] r2863 - in tinysofa/snapshot/wireless-tools/current: sources specs Message-ID: <20040701155626.8D2E94E817E@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:56:26 +1000 (Fri, 02 Jul 2004) New Revision: 2863 Added: tinysofa/snapshot/wireless-tools/current/sources/wireless-tools-25-makefile.patch tinysofa/snapshot/wireless-tools/current/sources/wireless_tools.27.pre23.tar.gz Removed: tinysofa/snapshot/wireless-tools/current/sources/wireless-tools-26-makefile.patch tinysofa/snapshot/wireless-tools/current/sources/wireless_tools.26.tar.gz Modified: tinysofa/snapshot/wireless-tools/current/specs/wireless-tools.spec Log: - Sync with 2.0. - Added: - wireless-tools-25-makefile.patch: - wireless_tools.27.pre23.tar.gz: - Removed: - wireless-tools-26-makefile.patch: - wireless_tools.26.tar.gz: Added: tinysofa/snapshot/wireless-tools/current/sources/wireless-tools-25-makefile.patch =================================================================== --- tinysofa/snapshot/wireless-tools/current/sources/wireless-tools-25-makefile.patch 2004-07-01 15:56:24 UTC (rev 2862) +++ tinysofa/snapshot/wireless-tools/current/sources/wireless-tools-25-makefile.patch 2004-07-01 15:56:26 UTC (rev 2863) @@ -0,0 +1,10 @@ +--- wireless_tools.26/Makefile.orig 2003-06-18 03:38:58.000000000 +0200 ++++ wireless_tools.26/Makefile 2003-08-10 01:40:55.000000000 +0200 +@@ -117,6 +117,7 @@ + # Compilation of the dynamic library + $(DYNAMIC): $(OBJS:.o=.so) + $(CC) -shared -o $@ -Wl,-soname,$@ $(LIBS) -lc $^ ++ ln -s $@ $(DYNAMIC_LINK) + + # Compilation of the static library + $(STATIC): $(OBJS) Deleted: tinysofa/snapshot/wireless-tools/current/sources/wireless-tools-26-makefile.patch =================================================================== --- tinysofa/snapshot/wireless-tools/current/sources/wireless-tools-26-makefile.patch 2004-07-01 15:56:24 UTC (rev 2862) +++ tinysofa/snapshot/wireless-tools/current/sources/wireless-tools-26-makefile.patch 2004-07-01 15:56:26 UTC (rev 2863) @@ -1,42 +0,0 @@ -diff -Nru wireless_tools.26.orig/Makefile wireless_tools.26/Makefile ---- wireless_tools.26.orig/Makefile 2003-06-18 01:38:58.000000000 +0000 -+++ wireless_tools.26/Makefile 2003-12-11 10:38:33.000000000 +0000 -@@ -5,7 +5,7 @@ - ## Installation directory. By default, go in /usr/local - ## Distributions should probably use /usr, but they probably know better... - ifndef PREFIX -- PREFIX = /usr/local -+ PREFIX = /usr - endif - - ## Compiler to use -@@ -78,10 +78,10 @@ - - # Do we want to build with or without libm ? - ifdef BUILD_NOLIBM -- LIBS= -+ LIBS=-L. -liw - WELIB_FLAG = -DWE_NOLIBM=y - else -- LIBS= -lm -+ LIBS=-L. -liw -lm - endif - - #CFLAGS=-O2 -W -Wall -Wstrict-prototypes -Wmissing-prototypes -Werror -@@ -92,7 +92,7 @@ - all:: $(STATIC) $(DYNAMIC) $(PROGS) - - %: %.o -- $(CC) $(LDFLAGS) $(XCFLAGS) -o $@ $^ $(LIBS) -+ $(CC) $(LDFLAGS) $(XCFLAGS) -o $@ $< $(LIBS) - %.o: %.c - $(CC) $(XCFLAGS) -c $< - %.so: %.c -@@ -117,6 +117,7 @@ - # Compilation of the dynamic library - $(DYNAMIC): $(OBJS:.o=.so) - $(CC) -shared -o $@ -Wl,-soname,$@ $(LIBS) -lc $^ -+ ln -s $@ $(DYNAMIC_LINK) - - # Compilation of the static library - $(STATIC): $(OBJS) Deleted: tinysofa/snapshot/wireless-tools/current/sources/wireless_tools.26.tar.gz =================================================================== (Binary files differ) Added: tinysofa/snapshot/wireless-tools/current/sources/wireless_tools.27.pre23.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/wireless-tools/current/sources/wireless_tools.27.pre23.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: tinysofa/snapshot/wireless-tools/current/specs/wireless-tools.spec =================================================================== --- tinysofa/snapshot/wireless-tools/current/specs/wireless-tools.spec 2004-07-01 15:56:24 UTC (rev 2862) +++ tinysofa/snapshot/wireless-tools/current/specs/wireless-tools.spec 2004-07-01 15:56:26 UTC (rev 2863) @@ -1,13 +1,14 @@ Summary: Wireless ethernet configuration tools -Group: tinysofa official +Group: System Environment/Base License: GPL Name: wireless-tools -Version: 26 -Release: 4ts +Version: 27 +Release: 1ts URL: http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html -Source: http://pcmcia-cs.sourceforge.net/ftp/contrib/wireless_tools.%{version}.tar.gz -Patch1: wireless-tools-26-makefile.patch -BuildRoot: %{_tmppath}/%{name}-root +Source: http://pcmcia-cs.sourceforge.net/ftp/contrib/wireless_tools.%{version}.pre23.tar.gz +Patch1: wireless-tools-25-makefile.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-root +ExcludeArch: s390 s390x %description This package contain the Wireless tools, used to manipulate @@ -16,12 +17,12 @@ specific stats for wireless networking equipment. %prep -%setup -n wireless_tools.%{version} -q -%patch1 -p1 +%setup -n wireless_tools.%{version} +%patch1 -p1 -b .makefile %build make clean -make OPT_FLAGS="$RPM_OPT_FLAGS" BUILD_SHARED=1 +make OPT_FLAGS="$RPM_OPT_FLAGS" BUILD_SHARED=1 FORCE_WEXT_VERSION=16 %install rm -rf $RPM_BUILD_ROOT @@ -33,7 +34,7 @@ INSTALL_INC=$RPM_BUILD_ROOT%{_includedir} \ INSTALL_MAN=$RPM_BUILD_ROOT%{_mandir} rm -f $RPM_BUILD_ROOT/%{_lib}/libiw.a -ln -sf ../../lib/libiw.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libiw.so +ln -sf /%{_lib}/libiw.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libiw.so %clean rm -rf $RPM_BUILD_ROOT @@ -46,22 +47,97 @@ %doc INSTALL README DISTRIBUTIONS.txt /sbin/* %{_mandir}/man*/* -/%{_lib}/*.so.* %{_includedir}/* %{_libdir}/*.so +/%{_lib}/*.so.* %changelog -* Wed May 19 2004 tsintegrate 26-4ts -- current (26-3ts) integrated as 26-4ts for release 1.0-U1 +* Wed Jun 23 2004 Dan Williams +- Upgrade to 27.pre23 to get new wireless scanning API -* Thu Dec 11 2003 Erlend Midttun 26-1tr -- New upstream. +* Tue Jun 15 2004 Elliot Lee +- rebuilt -* Mon Jun 23 2003 Erlend Midttun 25-3tr -- Make %%setup quiet. +* Mon Mar 15 2004 Bill Nottingham +- force wireless extensions to current (#115707) -* Wed Jun 18 2003 Erlend Midttun 25-2tr -- Big rebuild +* Tue Mar 02 2004 Elliot Lee +- rebuilt -* Thu Jun 5 2003 Gerald Dachs 25-1gd -- new TSL package \ No newline at end of file +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Sun Aug 31 2003 Bill Nottingham 26-2 +- rebuild in different environment (#103475) + +* Sun Aug 10 2003 Florian La Roche +- release 26 + +* Wed Jun 04 2003 Elliot Lee +- rebuilt + +* Sun Mar 09 2003 Florian La Roche +- also change destination of the symlink + +* Mon Feb 17 2003 Bill Nottingham 25-8 +- fix symlink (#84021) + +* Mon Feb 10 2003 Bill Nottingham 25-7 +- fix symlink (#84021) + +* Fri Feb 7 2003 Bill Nottingham 25-6 +- remove broken specfile defines, fix makefile (#82423) + +* Wed Feb 5 2003 Bill Nottingham 25-5 +- rebuild against new glibc-kernheaders (#82423) + +* Fri Jan 31 2003 Elliot Lee 25-4 +- Fix for multilib, and fix the .so symlink location. + +* Wed Jan 22 2003 Tim Powers +- rebuilt + +* Wed Dec 11 2002 Tim Powers 25-2 +- rebuild on all arches + +* Mon Aug 26 2002 Trond Eivind Glomsr?d 25-1 +- v25 - fixes encryption usage display, eternal loops for unknown + events and matches the v13 wireless extensions as shipped in + kernel (#72582) + +* Fri Jun 21 2002 Tim Powers +- automated rebuild + +* Thu Jun 20 2002 Trond Eivind Glomsr?d 24-1 +- v24 + +* Thu May 23 2002 Tim Powers +- automated rebuild + +* Thu Mar 21 2002 Bill Nottingham 23-2 +- rebuild against new headers + +* Thu Feb 28 2002 Elliot Lee 23-1 +- Update to version 23, with associated fixes. + +* Sun Jul 8 2001 Bill Nottingham +- rebuild against new kernel + +* Tue Jun 19 2001 Florian La Roche +- add ExcludeArch: s390 s390x + +* Sun Apr 22 2001 Bill Nottingham +- update to version 21 + +* Wed Feb 14 2001 Bill Nottingham +- fix build with glibc-2.2 +- also, rebuild so it no longer dumps core. :) + +* Tue Dec 05 2000 Florian La Roche +- added a clean section in the spec file + +* Thu Jul 13 2000 Prospector +- automatic rebuild + +* Fri Mar 10 2000 Bill Nottingham +- initial build From svn at tinysofa.org Thu Jul 1 15:56:28 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:56:28 +1000 (EST) Subject: [tinysofa-svn] r2864 - in tinysofa/snapshot/words/current: sources specs Message-ID: <20040701155628.888754E817E@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:56:28 +1000 (Fri, 02 Jul 2004) New Revision: 2864 Added: tinysofa/snapshot/words/current/sources/linux.words.2-gullible.patch tinysofa/snapshot/words/current/sources/linux.words.2-meat.patch tinysofa/snapshot/words/current/sources/linux.words.2-mmm.patch Modified: tinysofa/snapshot/words/current/specs/words.spec Log: - Sync with 2.0. - Kept: - linux.words.2-jbj.patch: - linux.words.2.tar.gz: - Added: - linux.words.2-gullible.patch: - linux.words.2-meat.patch: - linux.words.2-mmm.patch: Added: tinysofa/snapshot/words/current/sources/linux.words.2-gullible.patch =================================================================== --- tinysofa/snapshot/words/current/sources/linux.words.2-gullible.patch 2004-07-01 15:56:26 UTC (rev 2863) +++ tinysofa/snapshot/words/current/sources/linux.words.2-gullible.patch 2004-07-01 15:56:28 UTC (rev 2864) @@ -0,0 +1,18 @@ +--- words-2/usr/dict/linux.words.foo Mon Mar 18 18:49:01 2002 ++++ words-2/usr/dict/linux.words Mon Mar 18 18:56:31 2002 +@@ -15986,6 +15986,7 @@ + faces + facet + faceted ++facetious + facets + facial + facile +@@ -19150,6 +19151,7 @@ + gull + Gullah + gulled ++gullible + gullies + gulling + gulls Added: tinysofa/snapshot/words/current/sources/linux.words.2-meat.patch =================================================================== --- tinysofa/snapshot/words/current/sources/linux.words.2-meat.patch 2004-07-01 15:56:26 UTC (rev 2863) +++ tinysofa/snapshot/words/current/sources/linux.words.2-meat.patch 2004-07-01 15:56:28 UTC (rev 2864) @@ -0,0 +1,10 @@ +--- words-2/usr/dict/linux.words.meat Fri Apr 6 15:23:15 2001 ++++ words-2/usr/dict/linux.words Fri Apr 6 15:23:41 2001 +@@ -7272,6 +7272,7 @@ + Carnegie + carnival + carnivals ++carnivore + carnivorous + carnivorously + carol Added: tinysofa/snapshot/words/current/sources/linux.words.2-mmm.patch =================================================================== --- tinysofa/snapshot/words/current/sources/linux.words.2-mmm.patch 2004-07-01 15:56:26 UTC (rev 2863) +++ tinysofa/snapshot/words/current/sources/linux.words.2-mmm.patch 2004-07-01 15:56:28 UTC (rev 2864) @@ -0,0 +1,151 @@ +diff -uNr words-2/usr/dict/linux.words words-2/usr/dict/linux.words +--- words-2/usr/dict/linux.words Thu Apr 13 17:57:01 2000 ++++ words-2/usr/dict/linux.words Thu Apr 13 17:56:48 2000 +@@ -1436,6 +1436,8 @@ + allot + allotment + allotments ++allotrope ++allotropic + allots + allotted + allotter +@@ -2187,6 +2189,7 @@ + apartments + apathetic + apathy ++Apatosaurus + ape + aped + aperiodic +@@ -2491,6 +2494,7 @@ + arcane + arced + arch ++Archaeopteryx + archaic + archaically + archaicness +@@ -6628,6 +6632,7 @@ + burrows + burrs + bursa ++bursar + bursitis + burst + burstiness +@@ -6818,6 +6823,9 @@ + cafe + cafes + cafeteria ++caffein ++caffeinated ++caffeine + cage + caged + cager +@@ -7177,6 +7185,7 @@ + Carboloy + carbon + carbonate ++carbonated + carbonates + carbonation + Carbondale +@@ -12650,6 +12659,7 @@ + dimensioning + dimensions + dimes ++dimetrodon + diminish + diminished + diminishes +@@ -12698,6 +12708,7 @@ + dip + diphtheria + diphthong ++Diplodocus + diploma + diplomacy + diplomas +@@ -17685,6 +17696,7 @@ + froze + frozen + frozenly ++fructose + Fruehauf + frugal + frugally +@@ -17876,6 +17888,7 @@ + gaiters + Gaithersburg + galactic ++galactose + Galahad + Galapagos + Galatea +@@ -18477,6 +18490,7 @@ + glowing + glowingly + glows ++glucose + glue + glued + glues +@@ -23608,6 +23622,7 @@ + lacquered + lacquers + lacrosse ++lactose + lacy + lad + ladder +@@ -26035,6 +26050,7 @@ + mesh + meson + Mesopotamia ++mesosphere + Mesozoic + mesquite + mess +@@ -27084,6 +27100,7 @@ + muck + mucker + mucking ++mucilage + mucus + mud + Mudd +@@ -32345,6 +32362,8 @@ + psychotherapist + psychotherapy + psychotic ++Pteranodon ++Pterodactyl + Ptolemaic + Ptolemaists + Ptolemy +@@ -40043,6 +40062,7 @@ + suckle + suckling + sucks ++sucrose + suction + Sudan + Sudanese +@@ -41369,6 +41389,7 @@ + Thermofax + thermometer + thermometers ++thermosphere + thermostat + thermostats + these +@@ -43668,6 +43689,7 @@ + Vela + Velasquez + Vella ++Velociraptor + velocities + velocity + velvet Modified: tinysofa/snapshot/words/current/specs/words.spec =================================================================== --- tinysofa/snapshot/words/current/specs/words.spec 2004-07-01 15:56:26 UTC (rev 2863) +++ tinysofa/snapshot/words/current/specs/words.spec 2004-07-01 15:56:28 UTC (rev 2864) @@ -1,68 +1,86 @@ -Summary: A dictionary of English words for the /usr/dict directory. +Summary: A dictionary of English words for the /usr/share/dict directory. Name: words Version: 2 Release: 22ts -License: Free/freeware -Group: tinysofa official -Source: ftp://sunsite.unc.edu/pub/Linux/libs/linux.words.2.tar.gz +License: freeware +Group: System Environment/Libraries +Source: ftp://metalab.unc.edu/pub/Linux/libs/linux.words.2.tar.gz Patch0: linux.words.2-jbj.patch -BuildArch: noarch -BuildRoot: %{_tmppath}/%{name}-root +Patch1: linux.words.2-mmm.patch +Patch2: linux.words.2-meat.patch +Patch3: linux.words.2-gullible.patch +BuildArchitectures: noarch +BuildRoot: %{_tmppath}/%{name}-%{version}-root %description -The words file is a dictionary of English words for the /usr/dict -directory. Programs like ispell use this database of words to check -spelling. +The words file is a dictionary of English words for the +/usr/share/dict directory. Programs like Ispell use this database of +words to check spelling. Password checkers use it to look for bad +passwords. %prep %setup -q -c %patch0 -p1 +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 %build %install -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT/usr/dict +rm -rf $RPM_BUILD_ROOT +mkdir -p $RPM_BUILD_ROOT/usr/share/dict -cp usr/dict/linux.words $RPM_BUILD_ROOT/usr/dict -ln -sf linux.words $RPM_BUILD_ROOT/usr/dict/words +cp usr/dict/linux.words $RPM_BUILD_ROOT/usr/share/dict +ln -sf linux.words $RPM_BUILD_ROOT/usr/share/dict/words %clean -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT +rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) %doc usr/dict/README.linux.words %doc usr/dict/README2.linux.words -%dir /usr/dict -/usr/dict/linux.words -/usr/dict/words +/usr/share/dict/linux.words +/usr/share/dict/words %changelog -* Wed May 19 2004 tsintegrate 2-22ts -- current (2-22ok) integrated as 2-22ts for release 1.0-U1 +* Fri Feb 13 2004 Elliot Lee +- rebuilt -* Fri May 14 2004 Omar Kilani 2-22ok -- Own /usr/dict. +* Wed Feb 5 2003 Nalin Dahyabhai 2-21 +- rebuild -* Mon Dec 8 2003 Erlend Midttun 2-18tr -- Big rebuild +* Fri Jun 21 2002 Tim Powers +- automated rebuild -* Wed Jun 18 2003 Erlend Midttun 2-17tr -- Big rebuild +* Thu May 23 2002 Tim Powers +- automated rebuild -* Mon Mar 24 2003 Erlend Midttun 2-16em -- Rebuilt against glibc 2.3.2. +* Wed Apr 3 2002 Trond Eivind Glomsr?d 2-18 +- Bump. -* Thu Feb 27 2003 Christian H. Toldnes 2-15ct -- Minor cleanup +* Mon Mar 18 2002 Trond Eivind Glomsr?d 2-17 +- s/Copyright/License/ +- add gullible and facetious (#60166, #60173) -* Wed Jul 24 2002 Daniel Meyer 2-14dm -- rebuild for Trustix Secure Linux 2.0 +* Fri Apr 6 2001 Trond Eivind Glomsr?d +- Add carnivore (#35031) -* Tue Jul 17 2001 Erlend Midttun -- Inc serial number before release. +* Thu Jul 13 2000 Prospector +- automatic rebuild +* Tue Jun 13 2000 Trond Eivind Glomsr?d +- use %%{_tmppath} + +* Thu Apr 13 2000 Nalin Dahyabhai +- add some words: some food additives, dinosaurs, atmospheric terms + +* Fri Apr 07 2000 Trond Eivind Glomsr?d +- update description +- moved it to /usr/share/dict +- updated URL + * Sun Mar 21 1999 Cristian Gafton - auto rebuild in the new build environment (release 12) @@ -82,4 +100,4 @@ - spec file cleanups * Tue Sep 23 1997 Erik Troan -- made a noarch package \ No newline at end of file +- made a noarch package From svn at tinysofa.org Thu Jul 1 15:36:39 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:36:39 +1000 (EST) Subject: [tinysofa-svn] r2553 - in tinysofa/snapshot: . expect expect/current expect/current/sources expect/current/specs Message-ID: <20040701153639.EF8AE4E817D@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:36:39 +1000 (Fri, 02 Jul 2004) New Revision: 2553 Added: tinysofa/snapshot/expect/ tinysofa/snapshot/expect/current/ tinysofa/snapshot/expect/current/sources/ tinysofa/snapshot/expect/current/sources/expect-5.32.2-fixcat.patch tinysofa/snapshot/expect/current/sources/expect-5.32.2-kibitz.patch tinysofa/snapshot/expect/current/sources/expect-5.32.2-random.patch tinysofa/snapshot/expect/current/sources/expect-5.32.2-setpgrp.patch tinysofa/snapshot/expect/current/sources/expect-5.38.0-autopasswd-9917.patch tinysofa/snapshot/expect/current/sources/expect-5.38.0-lib-spec.patch tinysofa/snapshot/expect/current/sources/expect-5.38.0-spawn-43310.patch tinysofa/snapshot/expect/current/sources/expect-5.39.0-64bit-82547.patch tinysofa/snapshot/expect/current/sources/expect-5.39.0-libdir.patch tinysofa/snapshot/expect/current/sources/expect-5.39.0.tar.gz tinysofa/snapshot/expect/current/specs/ tinysofa/snapshot/expect/current/specs/expect.spec Log: - Add expect to snapshot from 2.0. Added: tinysofa/snapshot/expect/current/sources/expect-5.32.2-fixcat.patch =================================================================== --- tinysofa/snapshot/expect/current/sources/expect-5.32.2-fixcat.patch 2004-07-01 15:36:38 UTC (rev 2552) +++ tinysofa/snapshot/expect/current/sources/expect-5.32.2-fixcat.patch 2004-07-01 15:36:39 UTC (rev 2553) @@ -0,0 +1,21 @@ +--- expect5.32/fixcat.fixcat Fri Jun 2 13:35:51 2000 ++++ expect5.32/fixcat Fri Jun 2 13:36:56 2000 +@@ -8,11 +8,14 @@ + # If this file is sitting in an architecture-specific library directory, + # then it serves as a marker that your /bin/cat buffers by default. + ++# XXX Red Hat linux has unbuffered cat ++exit 0 ++ + # test for when catting to/from files +-log_user 0 +-spawn -open [open "|cat" "r+"] +-send "\r" +-expect "\r" {exit 1} ++#log_user 0 ++#spawn -open [open "|cat" "r+"] ++#send "\r" ++#expect "\r" {exit 1} + + # test for when catting to real tty + #log_user 0 Added: tinysofa/snapshot/expect/current/sources/expect-5.32.2-kibitz.patch =================================================================== --- tinysofa/snapshot/expect/current/sources/expect-5.32.2-kibitz.patch 2004-07-01 15:36:38 UTC (rev 2552) +++ tinysofa/snapshot/expect/current/sources/expect-5.32.2-kibitz.patch 2004-07-01 15:36:39 UTC (rev 2553) @@ -0,0 +1,11 @@ +--- expect5.32/example/kibitz.kibitz Mon Aug 28 23:58:00 2000 ++++ expect5.32/example/kibitz Fri Jul 6 11:18:52 2001 +@@ -352,7 +352,7 @@ + # can't use exec since write insists on being run from a tty! + set rc [catch { + system echo "Can we talk? Run: \"kibitz -$pid\"" | \ +- /bin/write $user $tty ++ /usr/bin/write $user $tty + } + ] + if {$rc} {rmfifos;abort} Added: tinysofa/snapshot/expect/current/sources/expect-5.32.2-random.patch =================================================================== --- tinysofa/snapshot/expect/current/sources/expect-5.32.2-random.patch 2004-07-01 15:36:38 UTC (rev 2552) +++ tinysofa/snapshot/expect/current/sources/expect-5.32.2-random.patch 2004-07-01 15:36:39 UTC (rev 2553) @@ -0,0 +1,18 @@ +--- expect5.32/example/mkpasswd.random Mon Jul 23 10:42:04 2001 ++++ expect5.32/example/mkpasswd Mon Jul 23 11:50:56 2001 +@@ -92,7 +92,14 @@ + } + + proc rand {m} { +- expr {int($m*rand())} ++ set device /dev/urandom ;# /dev/random can block ++ set fileId [open $device r] ++ binary scan [read $fileId 4] i1 number ++ set clipped [expr $number % $m] ++# puts "number is $number" ++# puts "clipped is $clipped" ++ close $fileId ++ return $clipped + } + + # choose left or right starting hand Added: tinysofa/snapshot/expect/current/sources/expect-5.32.2-setpgrp.patch =================================================================== --- tinysofa/snapshot/expect/current/sources/expect-5.32.2-setpgrp.patch 2004-07-01 15:36:38 UTC (rev 2552) +++ tinysofa/snapshot/expect/current/sources/expect-5.32.2-setpgrp.patch 2004-07-01 15:36:39 UTC (rev 2553) @@ -0,0 +1,14 @@ +--- tcltk-8.3.3/expect5.32/exp_command.c.fixit Mon Jan 7 15:13:14 2002 ++++ tcltk-8.3.3/expect5.32/exp_command.c Mon Jan 7 15:13:52 2002 +@@ -513,11 +513,7 @@ + syscall(SYS_setpgrp); + #endif + +-#ifdef SETPGRP_VOID + (void) setpgrp(); +-#else +- (void) setpgrp(0,0); +-#endif + } + + Added: tinysofa/snapshot/expect/current/sources/expect-5.38.0-autopasswd-9917.patch =================================================================== --- tinysofa/snapshot/expect/current/sources/expect-5.38.0-autopasswd-9917.patch 2004-07-01 15:36:38 UTC (rev 2552) +++ tinysofa/snapshot/expect/current/sources/expect-5.38.0-autopasswd-9917.patch 2004-07-01 15:36:39 UTC (rev 2553) @@ -0,0 +1,12 @@ +--- expect-5.38/example/autopasswd~ 2002-10-21 23:03:47.000000000 +0900 ++++ expect-5.38/example/autopasswd 2002-10-21 23:03:47.000000000 +0900 +@@ -5,7 +5,7 @@ + set password [lindex $argv 1] + spawn passwd [lindex $argv 0] + expect "password:" +-send "$password\r" ++send -- "$password\r" + expect "password:" +-send "$password\r" ++send -- "$password\r" + expect eof Added: tinysofa/snapshot/expect/current/sources/expect-5.38.0-lib-spec.patch =================================================================== --- tinysofa/snapshot/expect/current/sources/expect-5.38.0-lib-spec.patch 2004-07-01 15:36:38 UTC (rev 2552) +++ tinysofa/snapshot/expect/current/sources/expect-5.38.0-lib-spec.patch 2004-07-01 15:36:39 UTC (rev 2553) @@ -0,0 +1,11 @@ +--- expect-5.38/configure.in.orig 2002-07-19 00:51:06.000000000 +0900 ++++ expect-5.38/configure.in 2002-12-05 18:28:05.000000000 +0900 +@@ -1132,7 +1132,7 @@ + fi + + EXP_BUILD_LIB_SPEC="-L`pwd` -lexpect${EXP_LIB_VERSION}${DBGX}" +-EXP_LIB_SPEC="-L\${INSTALL_ROOT}\${exec_prefix}/lib -lexpect${EXP_LIB_VERSION}${DBGX}" ++EXP_LIB_SPEC="-L\${libdir}/.. -lexpect${EXP_LIB_VERSION}${DBGX}" + EXP_UNSHARED_LIB_FILE=libexpect${EXP_LIB_VERSION}${DBGX}.a + + # The TCL_SHARED_LIB_SUFFIX macro below relies on the DBGX macro, Added: tinysofa/snapshot/expect/current/sources/expect-5.38.0-spawn-43310.patch =================================================================== --- tinysofa/snapshot/expect/current/sources/expect-5.38.0-spawn-43310.patch 2004-07-01 15:36:38 UTC (rev 2552) +++ tinysofa/snapshot/expect/current/sources/expect-5.38.0-spawn-43310.patch 2004-07-01 15:36:39 UTC (rev 2553) @@ -0,0 +1,209 @@ +--- tcltk-8.3.1/expect5.31/exp_chan.c.read Fri Nov 16 00:14:15 2001 ++++ tcltk-8.3.1/expect5.31/exp_chan.c Fri Nov 16 00:14:15 2001 +@@ -519,6 +519,7 @@ expCreateChannel(interp,fdin,fdout,pid) + esPtr->buffer = Tcl_NewStringObj("",0); + Tcl_IncrRefCount(esPtr->buffer); + esPtr->umsize = exp_default_match_max; ++ esPtr->umsize_changed = exp_default_match_max_changed; + /* this will reallocate object with an appropriate sized buffer */ + expAdjust(esPtr); + +--- tcltk-8.3.1/expect5.31/exp_command.h.read Fri Nov 16 00:14:15 2001 ++++ tcltk-8.3.1/expect5.31/exp_command.h Fri Nov 16 00:14:15 2001 +@@ -25,6 +25,7 @@ would appreciate credit if this program + EXTERN char * exp_get_var _ANSI_ARGS_((Tcl_Interp *,char *)); + + EXTERN int exp_default_match_max; ++EXTERN int exp_default_match_max_changed; + EXTERN int exp_default_parity; + EXTERN int exp_default_rm_nulls; + +@@ -97,6 +98,7 @@ typedef struct ExpState { + int msize; /* # of bytes that buffer can hold (max) */ + int umsize; /* # of bytes (min) that is guaranteed to match */ + /* this comes from match_max command */ ++ int umsize_changed; /* is umsize changed by user? */ + int printed; /* # of bytes written to stdout (if logging on) */ + /* but not actually returned via a match yet */ + int echoed; /* additional # of bytes (beyond "printed" above) */ +--- tcltk-8.3.1/expect5.31/expect.c.read Fri Nov 16 00:14:15 2001 ++++ tcltk-8.3.1/expect5.31/expect.c Fri Nov 16 11:09:59 2001 +@@ -41,8 +41,17 @@ would appreciate credit if this program + #include "tcldbg.h" + #endif + ++/* The initial length is 2000. We increment it by 2000. The maximum ++ is 8MB (0x800000). */ ++#define EXP_MATCH_MAX 2000 ++#define EXP_MATCH_INC 2000 ++#define EXP_MATCH_STEP_LIMIT 0x700000 ++#define EXP_MATCH_LIMIT 0x800000 ++#define EXP_MATCH_LIMIT_QUOTE "0x800000" ++ + /* initial length of strings that we can guarantee patterns can match */ +-int exp_default_match_max = 2000; ++int exp_default_match_max = EXP_MATCH_MAX; ++int exp_default_match_max_changed = 0; + #define INIT_EXPECT_TIMEOUT_LIT "10" /* seconds */ + #define INIT_EXPECT_TIMEOUT 10 /* seconds */ + int exp_default_parity = TRUE; +@@ -1557,6 +1566,76 @@ expNullStrip(obj,offsetBytes) + Tcl_SetObjLength(obj,offsetBytes + (dest - src2)); + } + ++/* returns # of bytes until we see a newline at the end or EOF. */ ++/*ARGSUSED*/ ++static int ++expReadNewLine(interp,esPtr,save_flags) /* INTL */ ++Tcl_Interp *interp; ++ExpState *esPtr; ++int save_flags; ++{ ++ int size; ++ int exp_size; ++ int full_size; ++ int count; ++ char *str; ++ ++ count = 0; ++ for (;;) { ++ exp_size = expSizeGet(esPtr); ++ ++ /* When we reach the limit, we will only read one char at a ++ time. */ ++ if (esPtr->umsize >= EXP_MATCH_STEP_LIMIT) ++ size = TCL_UTF_MAX; ++ else ++ size = exp_size; ++ ++ if (exp_size + TCL_UTF_MAX >= esPtr->msize) { ++ if (esPtr->umsize >= EXP_MATCH_LIMIT) { ++ expDiagLogU("WARNING: interact buffer is full. probably your program\r\n"); ++ expDiagLogU("is not interactive or has a very long output line. The\r\n"); ++ expDiagLogU("current limit is " EXP_MATCH_LIMIT_QUOTE ".\r\n"); ++ expDiagLogU("Dumping first half of buffer in order to continue\r\n"); ++ expDiagLogU("Recommend you enlarge the buffer.\r\n"); ++ exp_buffer_shuffle(interp,esPtr,save_flags,EXPECT_OUT,"expect"); ++ return count; ++ } ++ else { ++ esPtr->umsize += EXP_MATCH_INC; ++ expAdjust(esPtr); ++ } ++ } ++ ++ full_size = esPtr->msize - (size / TCL_UTF_MAX); ++ size = Tcl_ReadChars(esPtr->channel, ++ esPtr->buffer, ++ full_size, ++ 1 /* append */); ++ if (size > 0) { ++ count += size; ++ /* We try again if there are more to read and we haven't ++ seen a newline at the end. */ ++ if (size == full_size) { ++ str = Tcl_GetStringFromObj(esPtr->buffer, &size); ++ if (str[size - 1] != '\n') ++ continue; ++ } ++ } ++ else { ++ /* It is even trickier. We got an error from read. We have ++ to recover from it. Let's make sure the size of ++ buffer is correct. It can be corrupted. */ ++ str = Tcl_GetString(esPtr->buffer); ++ Tcl_SetObjLength(esPtr->buffer, strlen(str)); ++ } ++ ++ break; ++ } ++ ++ return count; ++} ++ + /* returns # of bytes read or (non-positive) error of form EXP_XXX */ + /* returns 0 for end of file */ + /* If timeout is non-zero, set an alarm before doing the read, else assume */ +@@ -1571,6 +1650,8 @@ int save_flags; + { + int cc = EXP_TIMEOUT; + int size = expSizeGet(esPtr); ++ int full_size; ++ int count; + + if (size + TCL_UTF_MAX >= esPtr->msize) + exp_buffer_shuffle(interp,esPtr,save_flags,EXPECT_OUT,"expect"); +@@ -1587,11 +1668,43 @@ int save_flags; + } + #endif + +- ++ /* FIXME: If we ask less than what is available in the tcl buffer ++ when tcl has seen EOF, we will throw away the remaining data ++ since the next read will get EOF. Since expect is line-oriented, ++ we exand our buffer to get EOF or the next newline at the end of ++ the input buffer. I don't know if it is the right fix. H.J. */ ++ count = 0; ++ full_size = esPtr->msize - (size / TCL_UTF_MAX); + cc = Tcl_ReadChars(esPtr->channel, +- esPtr->buffer, +- esPtr->msize - (size / TCL_UTF_MAX), +- 1 /* append */); ++ esPtr->buffer, ++ full_size, ++ 1 /* append */); ++ if (cc > 0) { ++ count += cc; ++ /* It gets very tricky. There are more to read. We will expand ++ our buffer and get EOF or a newline at the end unless the ++ buffer length has been changed. */ ++ if (cc == full_size) { ++ char *str; ++ str = Tcl_GetStringFromObj(esPtr->buffer, &size); ++ if (str[size - 1] != '\n') { ++ if (esPtr->umsize_changed) { ++ char buf[20]; /* big enough for 64bit int in hex. */ ++ snprintf(buf,sizeof(buf),"0x%x", esPtr->umsize); ++ expDiagLogU("WARNING: interact buffer is not large enough to hold\r\n"); ++ expDiagLogU("all output. probably your program is not interactive or\r\n"); ++ expDiagLogU("has a very long output line. The current limit is "); ++ expDiagLogU(buf); ++ expDiagLogU(".\r\n"); ++ } ++ else { ++ cc = expReadNewLine(interp,esPtr,save_flags); ++ if (cc > 0) ++ count += cc; ++ } ++ } ++ } ++ } + i_read_errno = errno; + + #ifdef SIMPLE_EVENT +@@ -1612,7 +1725,7 @@ int save_flags; + } + } + #endif +- return cc; ++ return count > 0 ? count : cc; + } + + /* +@@ -2667,8 +2780,14 @@ char **argv; + return(TCL_ERROR); + } + +- if (Default) exp_default_match_max = size; +- else esPtr->umsize = size; ++ if (Default) { ++ exp_default_match_max = size; ++ exp_default_match_max_changed = 1; ++ } ++ else { ++ esPtr->umsize = size; ++ esPtr->umsize_changed = 1; ++ } + + return(TCL_OK); + } Added: tinysofa/snapshot/expect/current/sources/expect-5.39.0-64bit-82547.patch =================================================================== --- tinysofa/snapshot/expect/current/sources/expect-5.39.0-64bit-82547.patch 2004-07-01 15:36:38 UTC (rev 2552) +++ tinysofa/snapshot/expect/current/sources/expect-5.39.0-64bit-82547.patch 2004-07-01 15:36:39 UTC (rev 2553) @@ -0,0 +1,29 @@ +--- expect5.32/exp_command.c.alpha Mon Aug 28 23:58:00 2000 ++++ expect5.32/exp_command.c Thu Jul 12 13:52:00 2001 +@@ -1215,7 +1219,7 @@ + Tcl_DStringFree(&dstring); + if (esPtr) { + exp_close(interp,esPtr); +- waitpid(esPtr->pid,&esPtr->wait,0); ++ waitpid(esPtr->pid,(int *) &esPtr->wait,0); + if (esPtr->registered) { + Tcl_UnregisterChannel(interp,esPtr->channel); + } +@@ -2555,7 +2559,7 @@ + if (rc != TCL_OK) return(rc); + } + +- result = waitpid(esPtr->pid,&esPtr->wait,0); ++ result = waitpid(esPtr->pid,(int *) &esPtr->wait,0); + if (result == esPtr->pid) break; + if (result == -1) { + if (errno == EINTR) continue; +@@ -2589,7 +2593,7 @@ + for (fp=forked_proc_base;fp;fp=fp->next) { + if (fp->link_status == not_in_use) continue; + restart: +- result = waitpid(fp->pid,&fp->wait_status,WNOHANG); ++ result = waitpid(fp->pid,(int *) &fp->wait_status,WNOHANG); + if (result == fp->pid) { + waited_on_forked_process = 1; + break; Added: tinysofa/snapshot/expect/current/sources/expect-5.39.0-libdir.patch =================================================================== --- tinysofa/snapshot/expect/current/sources/expect-5.39.0-libdir.patch 2004-07-01 15:36:38 UTC (rev 2552) +++ tinysofa/snapshot/expect/current/sources/expect-5.39.0-libdir.patch 2004-07-01 15:36:39 UTC (rev 2553) @@ -0,0 +1,11 @@ +--- expect-5.39/Makefile.in.libdir 2003-07-30 00:46:51.000000000 +0200 ++++ expect-5.39/Makefile.in 2003-11-17 17:54:52.000000000 +0100 +@@ -316,7 +316,7 @@ + CFLAGS_INT = $(MH_CFLAGS) $(CPPFLAGS) $(XCFLAGS) + + LIB_INSTALL_DIR = $(tcl_libdir) +-LIB_RUNTIME_DIR = $(tcl_libdir) ++LIB_RUNTIME_DIR = $(subst $(INSTALL_ROOT),,$(tcl_libdir)) + # I don't understand why Tcl splits these up, but it does. LIB_RUNTIME_DIR + # can appear as part of the LD_SEARCH_FLAGS inherited by configure. + Added: tinysofa/snapshot/expect/current/sources/expect-5.39.0.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/expect/current/sources/expect-5.39.0.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/expect/current/specs/expect.spec =================================================================== --- tinysofa/snapshot/expect/current/specs/expect.spec 2004-07-01 15:36:38 UTC (rev 2552) +++ tinysofa/snapshot/expect/current/specs/expect.spec 2004-07-01 15:36:39 UTC (rev 2553) @@ -0,0 +1,376 @@ +%define majorver 5.39 + +Summary: A program-script interaction and testing utility +Name: expect +Version: %{majorver}.0 +Release: 98ts +License: Public Domain +Group: Development/Languages +URL: http://expect.nist.gov/ +Source: http://expect.nist.gov/src/%{name}-%{version}.tar.gz +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root +Requires: tcl +Buildrequires: tcl-devel tk-devel autoconf automake +Patch0: expect-5.32.2-random.patch +Patch1: expect-5.39.0-64bit-82547.patch +Patch2: expect-5.32.2-kibitz.patch +Patch3: expect-5.32.2-fixcat.patch +Patch6: expect-5.38.0-spawn-43310.patch +Patch8: expect-5.32.2-setpgrp.patch +Patch9: expect-5.38.0-autopasswd-9917.patch +Patch10: expect-5.38.0-lib-spec.patch +Patch11: expect-5.39.0-libdir.patch + +%description +Expect is a tcl application for automating and testing +interactive applications such as telnet, ftp, passwd, fsck, +rlogin, tip, etc. Expect makes it easy for a script to +control another program and interact with it. + +This package contains expect and some scripts that use it. + +%package devel +Summary: A program-script interaction and testing utility +Group: Development/Languages +Requires: expect = %{version}-%{release} + +%description devel +Expect is a tcl application for automating and testing +interactive applications such as telnet, ftp, passwd, fsck, +rlogin, tip, etc. Expect makes it easy for a script to +control another program and interact with it. + +This package contains development files for the expect library. + +%package -n expectk +Summary: A program-script interaction and testing utility +Group: Development/Languages +Requires: expect = %{version}, tcl, tk + +%description -n expectk +Expect is a tcl application for automating and testing +interactive applications such as telnet, ftp, passwd, fsck, +rlogin, tip, etc. Expect makes it easy for a script to +control another program and interact with it. + +This package contains expectk and some scripts that use it. + +%prep +%setup -q -n expect-%{majorver} +%patch0 -p1 -b .random +%patch1 -p1 -b .64bit +%patch2 -p1 -b .kibitz +%patch3 -p1 -b .fixcat +%patch6 -p2 -b .spawn +%patch8 -p2 -b .pgrp +%patch9 -p1 -b .hyphen +%patch10 -p1 -b .libspec +%patch11 -p1 -b .libdir +# patch10 touch configure.in + +chmod +w {.,testsuite}/configure + +%build +%{__autoconf} +cd testsuite +# aclocal doesn't work +cp ../aclocal.m4 . +%{__autoconf} +cd - + +%configure --with-tcl=%{_libdir} --with-tk=%{_libdir} --enable-shared --with-tclinclude=%{_includedir}/tcl-private +make %{?_smp_mflags} + +%install +rm -rf $RPM_BUILD_ROOT +make install INSTALL_ROOT=%{buildroot} + +# for linking with -lexpect +ln -s libexpect%{majorver}.so %{buildroot}%{_libdir}/libexpect.so + +# remove cryptdir/decryptdir, as Linux has no crypt command (bug 6668). +rm -f %{buildroot}%{_bindir}/{cryptdir,decryptdir} +rm -f %{buildroot}%{_mandir}/man1/{cryptdir,decryptdir}.1* +rm -f %{buildroot}%{_bindir}/autopasswd + +%clean +rm -rf $RPM_BUILD_ROOT + + +%files +%defattr(-,root,root,-) +%doc +%{_bindir}/expect +%{_bindir}/autoexpect +%{_bindir}/dislocate +%{_bindir}/ftp-rfc +%{_bindir}/kibitz +%{_bindir}/lpunlock +%{_bindir}/mkpasswd +%{_bindir}/passmass +%{_bindir}/rftp +%{_bindir}/rlogin-cwd +%{_bindir}/timed-read +%{_bindir}/timed-run +%{_bindir}/unbuffer +%{_bindir}/weather +%{_bindir}/xkibitz +%dir %{_libdir}/expect%{majorver} +%{_libdir}/expect%{majorver}/cat-buffers +%{_libdir}/expect%{majorver}/pkgIndex.tcl +%{_libdir}/libexpect%{majorver}.so +/usr/share/man/man1/autoexpect.1.gz +/usr/share/man/man1/dislocate.1.gz +/usr/share/man/man1/expect.1.gz +/usr/share/man/man1/kibitz.1.gz +/usr/share/man/man1/mkpasswd.1.gz +/usr/share/man/man1/passmass.1.gz +/usr/share/man/man1/tknewsbiff.1.gz +/usr/share/man/man1/unbuffer.1.gz +/usr/share/man/man1/xkibitz.1.gz + +%files devel +%defattr(-,root,root,-) +%{_libdir}/expect%{majorver}/libexpect%{majorver}.a +%{_libdir}/libexpect%{majorver}.a +%{_libdir}/libexpect.so +%{_mandir}/man3/libexpect.3* +%{_includedir}/* + +%files -n expectk +%defattr(-,root,root,-) +%{_bindir}/expectk +%{_bindir}/multixterm +%{_bindir}/tknewsbiff +%{_bindir}/tkpasswd +%{_bindir}/xpstat +%{_mandir}/man1/expectk.1* +%{_mandir}/man1/multixterm.1* +%{_mandir}/man1/tknewsbiff.1* + +%changelog +* Mon Jun 21 2004 Alan Cox +- Autopasswd doesnt work and isnt ever going to work with pam around + since password setting depends on the modules in use (think "fingerprint" + or "smartcard"..). Remove it. + +* Tue Jun 15 2004 Elliot Lee +- rebuilt + +* Tue Mar 02 2004 Elliot Lee +- rebuilt + +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Fri Nov 28 2003 Jens Petersen - 5.39.0-95 +- new package split out from tcltk +- build against installed tcl and tk +- filtered changelog for expect +- buildrequire autoconf213 (#110583) [mvd at mylinux.com.ua] + +* Mon Nov 17 2003 Thomas Woerner 8.3.5-94 +- fixed RPATH for expect and expectk: expect-5.39.0-libdir.patch + +* Wed Oct 15 2003 Jens Petersen - 8.3.5-93 +- update expect to 5.39.0 (fixes #58317) +- drop first hunk of 64bit patch and rename to expect-5.39.0-64bit-82547.patch +- expect-5.32.2-weather.patch and expect-5.32.2-expectk.patch no longer needed + +* Wed Sep 17 2003 Matt Wilson 8.3.5-92 +- rebuild again for #91211 + +* Wed Sep 17 2003 Matt Wilson 8.3.5-91 +- rebuild to fix gzipped file md5sums (#91211) + +* Fri Jul 04 2003 Jens Petersen - 8.3.5-90 +- make sure expect and itcl are linked against buildroot not installroot libs + +* Tue Jan 28 2003 Jens Petersen - 8.3.5-87 +- bring back expect alpha patch, renamed to 64bit patch (#82547) + +* Fri Jan 17 2003 Jens Petersen - 8.3.5-85 +- add some requires + +* Tue Jan 14 2003 Jens Petersen - 8.3.5-84 +- drop synthetic lib provides +- remove obsolete patches from srpm +- update buildrequires +- use buildroot instead of RPM_BUILD_ROOT +- install all man pages under mandir, instead of moving some from /usr/man +- introduce _genfilelist macro for clean single-sweep find filelist generation + for each package +- use perl to remove buildroot prefix from filelists + +* Tue Jan 7 2003 Jeff Johnson 8.3.5-80 +- rebuild to generate deps for4 DSO's w/o DT_SONAME correctly. + +* Sat Jan 4 2003 Jeff Johnson 8.3.5-79 +- set execute bits on library so that requires are generated. + +* Tue Dec 10 2002 Jens Petersen 8.3.5-78 +- make lib symlinks to .so not .so.0 + +* Mon Dec 9 2002 Jens Petersen 8.3.5-76 +- make it build on x86_64 (details below) +- add 100 to expect patches +- patch expect configure to get EXP_LIB_SPEC to use libdir +- don't explicitly update config.{guess,sub} since %%configure does it for us +- added "--without check" rpmbuild option to disable running tests in future +- generate filelists from datadir and not from mandir from now on + +* Tue Dec 3 2002 Jens Petersen +- build without all makecfg patches for now + - in particular use upstream versioned library name convention +- add backward compatible lib symlinks for now +- add unversioned symlinks for versioned bindir files +- use make's -C option rather than jumping in and out of source dirs + during install +- use INSTALL_ROOT destdir-like make variable instead of makeinstall + for all subpackages except tix and itcl + +* Mon Oct 21 2002 Jens Petersen +- move expectk and expect-devel files out of expect into separate packages + (#9832) +- drop the crud compat dir symlinks in libdir +- correct expect license +- don't explicitly provide 64bit libs on ia64 and sparc64 + +* Tue Aug 20 2002 Jens Petersen 8.3.3-74 +- fix compat symlink from /usr/lib/expect (#71606) + +* Wed Aug 14 2002 Jens Petersen 8.3.3-73 +- update to expect spawn patch from hjl at gnu.org (bug 43310) + +* Tue Aug 13 2002 Jens Petersen 8.3.3-72 +- update expect to 5.38.0 +- fixes #71113 (reported by yarnall at lvc.edu) + +* Mon Jan 07 2002 Florian La Roche +- quick hack to have a correct setpgrp() call in expect +- fix config.guess and config.sub to newer versions + +* Mon Aug 28 2001 Adrian Havill +- expect's fixline1 busted for expectk scripts (tkpasswd/tknewsbiff/tkterm) + +* Mon Aug 8 2001 Adrian Havill +- re-enable glibc string and math inlines; recent gcc is a-ok. +- optimize at -O2 instead of -O +- rename "soname" patches related to makefile/autoconf changes + +* Wed Jul 25 2001 Adrian Havill +- fixed 64 bit RPM provides for dependencies + +* Thu Jul 19 2001 Adrian Havill +- used %%makeinstall to brute force fix any remaining unflexible makefile dirs +- improved randomness of expect's mkpasswd script via /dev/random (bug 9507) +- revert --enable-threads, linux is (still) not ready (yet) (bug 49251) + +* Sun Jul 8 2001 Adrian Havill +- refresh all sources to latest stable (TODO: separate expect/expectk) +- massage out some build stuff to patches (TODO: libtoolize hacked constants) +- remove patches already rolled into the upstream +- removed RPATH (bugs 45569, 46085, 46086), added SONAMEs to ELFs +- changed shared object filenames to something less gross +- reenable threads which seem to work now +- fixed spawn/eof read problem with expect (bug 43310) +- made compile-friendly for IA64 + +* Fri Mar 23 2001 Bill Nottingham +- bzip2 sources + +* Mon Mar 19 2001 Bill Nottingham +- build with -D_GNU_SOURCE - fixes expect on ia64 + +* Mon Mar 19 2001 Preston Brown +- build fix from ahavill. + +* Wed Feb 21 2001 Tim Powers +- fixed weather expect script using wrong server (#28505) + +* Tue Feb 13 2001 Adrian Havill +- rebuild so make check passes + +* Fri Oct 20 2000 Than Ngo +- rebuild with -O0 on alpha (bug #19461) + +* Thu Aug 17 2000 Jeff Johnson +- summaries from specspo. + +* Thu Jul 27 2000 Jeff Johnson +- rebuild against "working" util-linux col. + +* Fri Jun 16 2000 Jeff Johnson +- don't mess with %%{_libdir}, it's gonna be a FHS pita. + +* Fri Jun 2 2000 Jeff Johnson +- FHS packaging changes. +- revert --enable-threads, linux is not ready (yet) (#11789). +- expect: update to 5.31.7+ (#11595). + +* Sat Mar 18 2000 Jeff Johnson +- update to (tcl,tk}-8.2.3, expect-5.31, and itcl-3.1.0, URL's as well. +- use perl to drill out pre-pended RPM_BUILD_ROOT. +- configure with --enable-threads (experimental). +- autopasswd needs to handle password starting with hyphen (#9917). +- handle 553 ftp status in rftp expect script (#7869). +- remove cryptdir/decryptdir, as Linux has not crypt command (#6668). +- correct hierarchy spelling (#7082). +- fix "expect -d ...", format string had int printed as string (#7775). + +* Tue Mar 7 2000 Jeff Johnson +- rebuild for sparc baud rates > 38400. + +* Mon Feb 7 2000 Bill Nottingham +- handle compressed manpages + +* Thu Feb 03 2000 Elliot Lee +- Make changes from bug number 7602 +- Apply patch from bug number 7537 +- Apply fix from bug number 7157 +- Add fixes from bug #7601 to the runtcl patch + +* Wed Feb 02 2000 Cristian Gafton +- fix descriptions +- man pages are compressed (whatapain) + +* Tue Nov 30 1999 Jakub Jelinek +- compile on systems where SIGPWR == SIGLOST. + +* Thu Apr 8 1999 Jeff Johnson +- use /usr/bin/write in kibitz (#1320). +- use cirrus.sprl.umich.edu in weather (#1926). + +* Tue Feb 16 1999 Jeff Johnson +- expect does unaligned access on alpha (#989) +- upgrade expect to 5.28. + +* Tue Jan 12 1999 Cristian Gafton +- call libtoolize to allow building on the arm +- build for glibc 2.1 +- strip binaries + +* Thu Sep 10 1998 Jeff Johnson +- update tcl/tk/tclX to 8.0.3, expect is updated also. + +* Mon Jun 29 1998 Jeff Johnson +- expect: mkpasswd needs delay before sending password (problem #576) + +* Thu May 07 1998 Prospector System +- translations modified for de, fr, tr + +* Sat May 02 1998 Cristian Gafton +- fixed expect binaries exec permissions + +* Wed Oct 22 1997 Otto Hammersmith +- fixed src urls + +* Mon Oct 06 1997 Erik Troan +- removed version numbers from descriptions + +* Mon Sep 22 1997 Erik Troan +- updated to tcl/tk 8.0 and related versions of packages + +* Tue Jun 17 1997 Erik Troan +- built against glibc +- fixed dangling tclx/tkx symlinks From svn at tinysofa.org Thu Jul 1 15:37:10 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:37:10 +1000 (EST) Subject: [tinysofa-svn] r2565 - in tinysofa/snapshot: . hesiod hesiod/current hesiod/current/sources hesiod/current/specs Message-ID: <20040701153710.A595B4E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:37:10 +1000 (Fri, 02 Jul 2004) New Revision: 2565 Added: tinysofa/snapshot/hesiod/ tinysofa/snapshot/hesiod/current/ tinysofa/snapshot/hesiod/current/sources/ tinysofa/snapshot/hesiod/current/sources/hesiod-3.0.2-dnsparse.patch tinysofa/snapshot/hesiod/current/sources/hesiod-3.0.2-env.patch tinysofa/snapshot/hesiod/current/sources/hesiod-3.0.2-libresolv.patch tinysofa/snapshot/hesiod/current/sources/hesiod-3.0.2-shlib.patch tinysofa/snapshot/hesiod/current/sources/hesiod-3.0.2-str.patch tinysofa/snapshot/hesiod/current/sources/hesiod-3.0.2.tar.gz tinysofa/snapshot/hesiod/current/specs/ tinysofa/snapshot/hesiod/current/specs/hesiod.spec Log: - Add hesiod to snapshot from 2.0. Added: tinysofa/snapshot/hesiod/current/sources/hesiod-3.0.2-dnsparse.patch =================================================================== --- tinysofa/snapshot/hesiod/current/sources/hesiod-3.0.2-dnsparse.patch 2004-07-01 15:37:08 UTC (rev 2564) +++ tinysofa/snapshot/hesiod/current/sources/hesiod-3.0.2-dnsparse.patch 2004-07-01 15:37:10 UTC (rev 2565) @@ -0,0 +1,60 @@ +Don't choke on responses larger than MAX_HESRESP in size. + +--- hesiod-3.0.2/hesiod.c 2002-10-02 16:40:35.000000000 -0400 ++++ hesiod-3.0.2/hesiod.c 2002-10-02 16:40:35.000000000 -0400 +@@ -336,7 +336,7 @@ + const char *name) + { + HEADER *hp; +- unsigned char qbuf[PACKETSZ], abuf[MAX_HESRESP], *p, *eom, *eor; ++ unsigned char qbuf[PACKETSZ], *abuf, *p, *eom, *eor; + char *dst, **list; + int ancount, qdcount, i, j, n, skip, type, class, len; + +@@ -351,8 +351,20 @@ + return NULL; + + /* Send the query. */ +- n = res_send(qbuf, n, abuf, MAX_HESRESP); +- if (n < 0) ++ abuf = NULL; ++ len = 1024; ++ i = n; ++ do ++ { ++ abuf = realloc(abuf, len); ++ n = res_send(qbuf, i, abuf, len); ++ if (n < len) ++ { ++ break; ++ } ++ len = n + 1024; ++ } while(1); ++ if (n < sizeof(HEADER)) + { + errno = ECONNREFUSED; + return NULL; +@@ -372,6 +384,7 @@ + if (skip < 0 || p + skip + QFIXEDSZ > eom) + { + errno = EMSGSIZE; ++ free(abuf); + return NULL; + } + p += skip + QFIXEDSZ; +@@ -382,6 +395,7 @@ + if (!list) + { + errno = ENOMEM; ++ free(abuf); + return NULL; + } + +@@ -440,6 +454,7 @@ + } + *dst = 0; + } ++ free(abuf); + + /* If we didn't terminate the loop normally, something went wrong. */ + if (i < ancount) Added: tinysofa/snapshot/hesiod/current/sources/hesiod-3.0.2-env.patch =================================================================== --- tinysofa/snapshot/hesiod/current/sources/hesiod-3.0.2-env.patch 2004-07-01 15:37:08 UTC (rev 2564) +++ tinysofa/snapshot/hesiod/current/sources/hesiod-3.0.2-env.patch 2004-07-01 15:37:10 UTC (rev 2565) @@ -0,0 +1,27 @@ +Ignore environment variables in setuid or setgid programs. +--- hesiod-3.0.2/hesiod.c Wed Oct 3 14:53:37 2001 ++++ hesiod-3.0.2/hesiod.c Wed Oct 3 14:55:02 2001 +@@ -52,6 +52,7 @@ + #include + #include + #include ++#include + #include + #include "hesiod.h" + #include "hesiod_p.h" +@@ -79,13 +80,13 @@ + if (ctx) + { + *context = ctx; +- configname = getenv("HESIOD_CONFIG"); ++ configname = ((getuid() == geteuid()) && (getgid() == getegid())) ? getenv("HESIOD_CONFIG") : NULL; + if (!configname) + configname = SYSCONFDIR "/hesiod.conf"; + if (read_config_file(ctx, configname) >= 0) + { + /* The default rhs can be overridden by an environment variable. */ +- p = getenv("HES_DOMAIN"); ++ p = ((getuid() == geteuid()) && (getgid() == getegid())) ? getenv("HES_DOMAIN") : NULL; + if (p) + { + if (ctx->rhs) Added: tinysofa/snapshot/hesiod/current/sources/hesiod-3.0.2-libresolv.patch =================================================================== --- tinysofa/snapshot/hesiod/current/sources/hesiod-3.0.2-libresolv.patch 2004-07-01 15:37:08 UTC (rev 2564) +++ tinysofa/snapshot/hesiod/current/sources/hesiod-3.0.2-libresolv.patch 2004-07-01 15:37:10 UTC (rev 2565) @@ -0,0 +1,18 @@ +Try to correctly find res_mkquery in libresolv, even in cases where a +preprocessor-based rename in may screw us up. + +--- hesiod-3.0.2/configure.in 2002-09-25 17:21:41.000000000 -0400 ++++ hesiod-3.0.2/configure.in 2002-09-25 17:24:58.000000000 -0400 +@@ -14,7 +14,11 @@ + AC_EGREP_HEADER(pw_change, pwd.h, AC_DEFINE(HAVE_PW_CHANGE)) + AC_EGREP_HEADER(pw_expire, pwd.h, AC_DEFINE(HAVE_PW_EXPIRE)) + +-AC_CHECK_FUNC(res_mkquery, :, [AC_CHECK_LIB(resolv, res_mkquery)]) ++AC_CHECK_FUNC(res_mkquery, :, [AC_CHECK_LIB(resolv, res_mkquery,,[ ++saveLIBS="$LIBS" ++LIBS="-lresolv $LIBS" ++AC_TRY_LINK([#include ],[res_mkquery(0,NULL,0,0,NULL,0,NULL,NULL,0);],[AC_DEFINE(HAVE_RES_MKQUERY,1,[Define if your libresolv provides res_mkquery.])],[LIBS="$saveLIBS"]) ++])]) + AC_CHECK_FUNCS(strerror_r) + + AC_CONFIG_HEADER(config.h) Added: tinysofa/snapshot/hesiod/current/sources/hesiod-3.0.2-shlib.patch =================================================================== --- tinysofa/snapshot/hesiod/current/sources/hesiod-3.0.2-shlib.patch 2004-07-01 15:37:08 UTC (rev 2564) +++ tinysofa/snapshot/hesiod/current/sources/hesiod-3.0.2-shlib.patch 2004-07-01 15:37:10 UTC (rev 2565) @@ -0,0 +1,50 @@ +--- hesiod-3.0.2/Makefile.in Fri Oct 5 15:43:35 2001 ++++ hesiod-3.0.2/Makefile.in Fri Oct 5 15:47:42 2001 +@@ -21,20 +21,24 @@ + CFLAGS=@CFLAGS@ + LDFLAGS=@LDFLAGS@ + LIBS=@LIBS@ +-ALL_CFLAGS=-I. -DSYSCONFDIR=\"${sysconfdir}\" ${CPPFLAGS} ${CFLAGS} ++ALL_CFLAGS=-I. -DSYSCONFDIR=\"${sysconfdir}\" ${CPPFLAGS} ${CFLAGS} -fPIC + OBJS=hesiod.o hesmailhost.o hespwnam.o hesservbyname.o hescompat.o ++SOVERSION=0 + +-all: libhesiod.a hesinfo hestest ++all: libhesiod.a hesinfo hestest libhesiod.so.$(SOVERSION) ++ ++libhesiod.so.$(SOVERSION): ${OBJS} ++ ${CC} -shared -fPIC -o $@ -Wl,-soname=$@ ${OBJS} ${LIBS} + + libhesiod.a: ${OBJS} + ar cru $@ ${OBJS} + ${RANLIB} $@ + +-hesinfo: hesinfo.o libhesiod.a +- ${CC} ${LDFLAGS} -o $@ hesinfo.o libhesiod.a ${LIBS} ++hesinfo: hesinfo.o libhesiod.so.$(SOVERSION) ++ ${CC} ${LDFLAGS} -o $@ hesinfo.o libhesiod.so.$(SOVERSION) ${LIBS} + +-hestest: hestest.o libhesiod.a +- ${CC} ${LDFLAGS} -o $@ hestest.o libhesiod.a ${LIBS} ++hestest: hestest.o libhesiod.so.$(SOVERSION) ++ ${CC} ${LDFLAGS} -o $@ hestest.o libhesiod.so.$(SOVERSION) ${LIBS} + + ${OBJS}: hesiod.h resscan.h + +@@ -42,6 +46,7 @@ + ${CC} -c ${ALL_CFLAGS} $< + + check: ++ LD_LIBRARY_PATH="`pwd`":"$(LD_LIBRARY_PATH)" \ + HESIOD_CONFIG=${srcdir}/hesiod.config.sample \ + ./hestest ${srcdir}/hestest.conf + +@@ -55,6 +60,8 @@ + ${INSTALL} -c -m 644 libhesiod.a ${DESTDIR}${libdir} + ${RANLIB} ${DESTDIR}${libdir}/libhesiod.a + chmod u-w ${DESTDIR}${libdir}/libhesiod.a ++ ${INSTALL} -c -m 755 libhesiod.so.$(SOVERSION) ${DESTDIR}${libdir} ++ ln -s libhesiod.so.$(SOVERSION) ${DESTDIR}${libdir}/libhesiod.so + ${INSTALL_PROGRAM} -c -m 555 hesinfo ${DESTDIR}${lbindir} + ${INSTALL} -c -m 444 ${srcdir}/hesiod.h ${DESTDIR}${includedir} + ${INSTALL} -c -m 444 ${srcdir}/hesinfo.1 ${DESTDIR}${mandir}/man1 Added: tinysofa/snapshot/hesiod/current/sources/hesiod-3.0.2-str.patch =================================================================== --- tinysofa/snapshot/hesiod/current/sources/hesiod-3.0.2-str.patch 2004-07-01 15:37:08 UTC (rev 2564) +++ tinysofa/snapshot/hesiod/current/sources/hesiod-3.0.2-str.patch 2004-07-01 15:37:10 UTC (rev 2565) @@ -0,0 +1,68 @@ +There are a few places where untrusted information could cause problems. +There's a bug in the configuration file parser that might result in an +LHS= modifying the rhs setting. +The case-insensitive comparison routine is probably called safely (with the +second argument at least as long as the first), but it looks weird. +--- hesiod-3.0.2/hesiod.c Wed Oct 3 15:16:17 2001 ++++ hesiod-3.0.2/hesiod.c Wed Oct 3 15:33:41 2001 +@@ -138,7 +138,8 @@ + const char *rhs; + int len; + +- strcpy(bindname, name); ++ strncpy(bindname, name, sizeof(bindname) - 1); ++ bindname[sizeof(bindname) - 1] = 0; + + /* Find the right right hand side to use, possibly truncating bindname. */ + p = strchr(bindname, '@'); +@@ -288,7 +289,7 @@ + + if (cistrcmp(key, "lhs") == 0 || cistrcmp(key, "rhs") == 0) + { +- which = (strcmp(key, "lhs") == 0) ? &ctx->lhs : &ctx->rhs; ++ which = (cistrcmp(key, "lhs") == 0) ? &ctx->lhs : &ctx->rhs; + *which = malloc(strlen(data) + 1); + if (!*which) + { +@@ -462,7 +463,7 @@ + + static int cistrcmp(const char *s1, const char *s2) + { +- while (*s1 && tolower(*s1) == tolower(*s2)) ++ while (*s1 && *s2 && tolower(*s1) == tolower(*s2)) + { + s1++; + s2++; +--- hesiod-3.0.2/hespwnam.c Wed Oct 3 15:29:40 2001 ++++ hesiod-3.0.2/hespwnam.c Wed Oct 3 15:29:43 2001 +@@ -39,9 +39,16 @@ + + struct passwd *hesiod_getpwuid(void *context, uid_t uid) + { +- char uidstr[16]; ++ char uidstr[32]; + +- sprintf(uidstr, "%d", uid); +- return getpwcommon(context, uidstr, 1); ++ if (snprintf(uidstr, sizeof(uidstr), "%ld", (long)uid) < sizeof(uidstr)) ++ { ++ return getpwcommon(context, uidstr, 1); ++ } ++ else ++ { ++ errno = ERANGE; ++ return NULL; ++ } + } + +--- hesiod-3.0.2/hesservbyname.c Wed Oct 3 15:33:25 2001 ++++ hesiod-3.0.2/hesservbyname.c Wed Oct 3 15:33:22 2001 +@@ -188,7 +188,7 @@ + + static int cistrcmp(const char *s1, const char *s2) + { +- while (*s1 && tolower(*s1) == tolower(*s2)) ++ while (*s1 && *s2 && tolower(*s1) == tolower(*s2)) + { + s1++; + s2++; Added: tinysofa/snapshot/hesiod/current/sources/hesiod-3.0.2.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/hesiod/current/sources/hesiod-3.0.2.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/hesiod/current/specs/hesiod.spec =================================================================== --- tinysofa/snapshot/hesiod/current/specs/hesiod.spec 2004-07-01 15:37:08 UTC (rev 2564) +++ tinysofa/snapshot/hesiod/current/specs/hesiod.spec 2004-07-01 15:37:10 UTC (rev 2565) @@ -0,0 +1,183 @@ +Name: hesiod +Version: 3.0.2 +Release: 29.1ts +Source: ftp://athena-dist.mit.edu/pub/ATHENA/hesiod/hesiod-%{version}.tar.gz +Patch0: hesiod-3.0.2-shlib.patch +Patch1: hesiod-3.0.2-env.patch +Patch2: hesiod-3.0.2-str.patch +Patch3: hesiod-3.0.2-dnsparse.patch +Patch4: hesiod-3.0.2-libresolv.patch +Summary: Hesiod libraries and sample programs. +Group: System Environment/Libraries +License: MIT +Buildroot: %{_tmppath}/%{name}-%{version}-root +BuildPrereq: autoconf + +%description +Hesiod is a system which uses existing DNS functionality to provide access +to databases of information that changes infrequently. It is often used to +distribute information kept in the /etc/passwd, /etc/group, and /etc/printcap +files, among others. + +%package devel +Summary: Development libraries and headers for Hesiod +Group: Development/Libraries +Requires: hesiod = %{version}-%{release} + +%description devel +Hesiod is a system which uses existing DNS functionality to provide access +to databases of information that changes infrequently. It is often used to +distribute information which might otherwise kept in the /etc/passwd, +/etc/group, and /etc/printcap files over a network, eliminating the need to +ensure synchronize the files among multiple hosts. This package contains +the header files and libraries required for building programs which use Hesiod. + +%changelog +* Tue Mar 02 2004 Elliot Lee +- rebuilt + +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Sun Oct 19 2003 Florian La Roche +- add a %%clean specfile target + +* Mon Jun 16 2003 Nalin Dahyabhai 3.0.2-28 +- rebuild + +* Wed Jun 04 2003 Elliot Lee +- rebuilt + +* Mon Jan 27 2003 Nalin Dahyabhai 3.0.2-26 +- link libhesiod with libresolv on all platforms + +* Wed Jan 22 2003 Tim Powers 3.0.2-25 +- rebuilt + +* Fri Jan 10 2003 Phil Knirsch 3.0.2-24 +- Fixed wrong .so name for s390/s390x. + +* Fri Jan 10 2003 Phil Knirsch 3.0.2-23 +- Build shared lib correctly on s390 and s390x (with gcc -shared -fPIC). + +* Wed Sep 24 2002 Nalin Dahyabhai 3.0.2-22 +- look harder for res_mkquery() in libresolv + +* Wed Aug 21 2002 Nalin Dahyabhai +- don't choke on large response packets + +* Fri Jun 21 2002 Tim Powers +- automated rebuild + +* Sun May 26 2002 Tim Powers +- automated rebuild + +* Thu May 16 2002 Nalin Dahyabhai 3.0.2-19 +- rebuild in new environment + +* Mon Apr 15 2002 Nalin Dahyabhai 3.0.2-18 +- add missing post/postun calls to ldconfig + +* Wed Feb 20 2002 Nalin Dahyabhai 3.0.2-17 +- rebuild in new environment + +* Wed Jan 09 2002 Tim Powers +- automated rebuild + +* Fri Oct 26 2001 Nalin Dahyabhai 3.0.2-15 +- actually set the soname in the shared library (ld doesn't automatically + set the soname to the output file's name, oops) + +* Fri Oct 5 2001 Nalin Dahyabhai 3.0.2-14 +- on second thought, put the shared library back in, using a soversion of 0 + to have a chance at providing compatibility with apps linked dynamically + on other distributions +- make -devel depend on the same version of the main package + +* Wed Oct 3 2001 Nalin Dahyabhai +- remove the shared library patch -- different packages with shared libraries + tend to use different sonames, so we'd run inevitably run into problems + +* Thu Aug 21 2001 Nalin Dahyabhai +- remove pre and post scripts -- authconfig handles that stuff now +- add the hesiod man page back in, as bind-devel doesn't provide it any more + +* Wed Jan 17 2001 Jeremy Katz +- hesiod-devel requires hesiod (bug #128) + +* Thu Sep 14 2000 Jeremy Katz +- remove hesiod man page from hesiod-devel as it conflicts with the one + from bind-devel + +* Thu Sep 14 2000 Jeremy Katz +- use rpm macros where possible and FHS-ify +- split into main and devel packages +- add back requires for nscd + +* Fri Jul 28 2000 Jeremy Katz +- rebuild in new environment + +* Thu Mar 16 2000 Jeremy Katz +- rebuild in new environment + +* Thu Sep 2 1999 Nalin Dahyabhai +- removed dependency on nscd +- changed requires: nscd back to caching-nameserver + +* Mon May 17 1999 Nalin Dahyabhai +- started changelog +- moved addition of hesiod to nsswitch.conf to this package because we + no longer use a separate libnss_hesiod.so +- changed requires: caching-nameserver to nscd +- added post-install script snippet to activate nscd on install + +%prep +%setup -q +%patch0 -p1 -b .shlib +%patch1 -p1 -b .env +%patch2 -p1 -b .str +%patch3 -p1 -b .dnsparse +%patch4 -p1 -b .libresolv + +autoconf +for manpage in *.3; do + if grep -q '^\.so man3/hesiod.3' $manpage ; then + echo .so hesiod.3 > $manpage + elif grep -q '^\.so man3/hesiod_getmailhost.3' $manpage ; then + echo .so hesiod_getmailhost.3 > $manpage + elif grep -q '^\.so man3/hesiod_getpwnam.3' $manpage ; then + echo .so hesiod_getpwnam.3 > $manpage + elif grep -q '^\.so man3/hesiod_getservbyname.3' $manpage ; then + echo .so hesiod_getservbyname.3 > $manpage + fi +done + +%build +%configure +make + +%install +[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT +%makeinstall + +%clean +rm -rf $RPM_BUILD_ROOT + +%post -p /sbin/ldconfig + +%postun -p /sbin/ldconfig + +%files +%defattr(-,root,root) +%doc README NEWS +%{_bindir}/hesinfo +%{_libdir}/libhesiod.so.* +%{_mandir}/man1/* +%{_mandir}/man5/* + +%files devel +%defattr(-,root,root) +%{_libdir}/libhesiod.a +%{_libdir}/libhesiod.so +%{_includedir}/hesiod.h +%{_mandir}/man3/* From svn at tinysofa.org Thu Jul 1 15:56:30 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:56:30 +1000 (EST) Subject: [tinysofa-svn] r2865 - in tinysofa/snapshot/xfsprogs/current: sources specs Message-ID: <20040701155630.8AFFB4E817E@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:56:30 +1000 (Fri, 02 Jul 2004) New Revision: 2865 Removed: tinysofa/snapshot/xfsprogs/current/sources/xfsprogs-2.6.10-multilib.patch Modified: tinysofa/snapshot/xfsprogs/current/specs/xfsprogs.spec Log: - Sync with 2.0. - Kept: - xfsprogs-2.6.13.src.tar.gz: - Removed: - xfsprogs-2.6.10-multilib.patch: Deleted: tinysofa/snapshot/xfsprogs/current/sources/xfsprogs-2.6.10-multilib.patch =================================================================== --- tinysofa/snapshot/xfsprogs/current/sources/xfsprogs-2.6.10-multilib.patch 2004-07-01 15:56:28 UTC (rev 2864) +++ tinysofa/snapshot/xfsprogs/current/sources/xfsprogs-2.6.10-multilib.patch 2004-07-01 15:56:30 UTC (rev 2865) @@ -1,12 +0,0 @@ -diff -urN xfsprogs-2.6.10/include/buildmacros xfsprogs-2.6.10.multilib/include/buildmacros ---- xfsprogs-2.6.10/include/buildmacros 2004-04-05 13:12:56.000000000 +1000 -+++ xfsprogs-2.6.10.multilib/include/buildmacros 2004-05-12 16:30:28.000000000 +1000 -@@ -101,8 +101,6 @@ - ../$(INSTALL) -m 644 $(LIBNAME).lai $(PKG_DEVLIB_DIR)/$(LIBNAME).la ; \ - ../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \ - ../$(INSTALL) -T so_base $(LIBNAME).lai $(PKG_LIB_DIR); \ -- ../$(INSTALL) -S $(PKG_DEVLIB_DIR)/$(LIBNAME).a $(PKG_LIB_DIR)/$(LIBNAME).a; \ -- ../$(INSTALL) -S $(PKG_DEVLIB_DIR)/$(LIBNAME).la $(PKG_LIB_DIR)/$(LIBNAME).la; \ - ../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).so $(PKG_DEVLIB_DIR)/$(LIBNAME).so - else - INSTALL_LTLIB_DEV = $(INSTALL_LTLIB_STATIC) Modified: tinysofa/snapshot/xfsprogs/current/specs/xfsprogs.spec =================================================================== --- tinysofa/snapshot/xfsprogs/current/specs/xfsprogs.spec 2004-07-01 15:56:28 UTC (rev 2864) +++ tinysofa/snapshot/xfsprogs/current/specs/xfsprogs.spec 2004-07-01 15:56:30 UTC (rev 2865) @@ -1,17 +1,18 @@ Summary: Utilities for managing the XFS filesystem. Name: xfsprogs Version: 2.6.13 -Release: 1ts -Prereq: /sbin/ldconfig -Conflicts: xfsdump < 2.0.0 -Source: http://mirrors.sunsite.dk/xfs/cmd_tars/%{name}-%{version}.src.tar.gz -Patch: xfsprogs-2.6.10-multilib.patch +Release: 2ts License: GPL +Group: System Environment/Base URL: http://oss.sgi.com/projects/xfs/ -Group: tinysofa official -BuildRoot: %{_tmppath}/%{name}-root -BuildRequires: autoconf automake libtool gettext -BuildRequires: e2fsprogs-devel +Source: http://oss.sgi.com/projects/xfs/download/cmd_tars/xfsprogs-%{version}.src.tar.gz +BuildRoot: %{_tmppath}/%{name}-%{version}-root +BuildRequires: autoconf, libtool, gettext +BuildRequires: readline-devel, libtermcap-devel +BuildRequires: /usr/include/uuid/uuid.h +Provides: xfs-cmds = %{evr} +Obsoletes: xfs-cmds <= %{version} +Conflicts: xfsdump < 2.0.0 %description A set of commands to use the XFS filesystem, including mkfs.xfs. @@ -29,9 +30,8 @@ %package devel Summary: XFS filesystem-specific static libraries and headers. -Group: tinysofa official -Requires: xfsprogs >= 2.0.0 -Conflicts: xfsprogs < 2.0.0 +Group: Development/Libraries +Requires: xfsprogs = %{version} %description devel xfsprogs-devel contains the libraries and header files needed to @@ -43,77 +43,90 @@ %prep %setup -q -%patch -p1 -make configure %build +# xfsprogs abuses libexecdir +export tagname=CC +%configure --libdir=/%{_lib} --libexecdir=%{_libdir} \ + --sbindir=/sbin --bindir=%{_sbindir} \ + --enable-shared=yes \ + --enable-gettext=yes \ + --enable-readline=yes \ + --enable-editline=no \ + --enable-shared-uuid=yes make %install -DIST_ROOT="$RPM_BUILD_ROOT" -DIST_INSTALL=`pwd`/install.manifest -DIST_INSTALL_DEV=`pwd`/install-dev.manifest -export DIST_ROOT DIST_INSTALL DIST_INSTALL_DEV -/usr/bin/make install DIST_MANIFEST="$DIST_INSTALL" -/usr/bin/make -C build/rpm rpmfiles DIST_MANIFEST="$DIST_INSTALL" -/usr/bin/make install-dev DIST_MANIFEST="$DIST_INSTALL_DEV" -/usr/bin/make -C build/rpm rpmfiles-dev DIST_MANIFEST="$DIST_INSTALL_DEV" +rm -rf $RPM_BUILD_ROOT +make DIST_ROOT=$RPM_BUILD_ROOT install +make DIST_ROOT=$RPM_BUILD_ROOT install-dev -chmod +x ${RPM_BUILD_ROOT}/%{_lib}/libhandle.so.* +# nuke .la files, etc +rm -f $RPM_BUILD_ROOT/%{_lib}/*.la $RPM_BUILD_ROOT/{_lib}/*.a $RPM_BUILD_ROOT%{_lib}/*.so +rm -rf $RPM_BUILD_ROOT%{_libdir}/*.la +# fix up symlink to be correct +rm -f $RPM_BUILD_ROOT/%{_libdir}/libhandle.so +ln -s ../../%{_lib}/libhandle.so.1 $RPM_BUILD_ROOT/%{_libdir}/libhandle.so +# remove non-versioned docs location +rm -rf $RPM_BUILD_ROOT/%{_datadir}/doc/xfsprogs/ -files() -{ - sort | uniq | awk ' -$1 == "d" { - if (match ($5, "/usr/include/xfs") || match ($5, "/usr/include/disk")) - printf ("%%%%dir %%%%attr(%s,%s,%s) %s\n", $2, $3, $4, $5); } -$1 == "f" { if (match ($6, "/usr/share/man") || match ($6, "/usr/share/doc/xfsprogs")) - printf ("%%%%doc "); - if (match ($6, "/usr/share/man")) - printf ("%%%%attr(%s,%s,%s) %s*\n", $2, $3, $4, $6); - else - if (match ($6, "^/lib") || (match ($6, "^/usr/lib") && match ($6, "\.la"))) - printf ("%%%%attr(0755,%s,%s) %s\n", $3, $4, $6); - else - printf ("%%%%attr(%s,%s,%s) %s\n", $2, $3, $4, $6); } -$1 == "l" { if (match ($3, "/usr/share/man") || match ($3, "/usr/share/doc/xfsprogs")) - printf ("%%%%doc "); - if (match ($3, "/usr/share/man")) - printf ("%%%%attr(0777,root,root) %s*\n", $3); - else - printf ("%%%%attr(0777,root,root) %s\n", $3); }' -} -set +x -files < "$DIST_INSTALL" > files.rpm -files < "$DIST_INSTALL_DEV" > filesdevel.rpm - %clean -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != "/" ] && rm -rf "$RPM_BUILD_ROOT" +rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig -%files -f files.rpm +%files %defattr(-,root,root) +%doc doc/CHANGES doc/COPYING doc/CREDITS doc/PORTING README doc/README.LVM doc/README.quota +/sbin/fsck.xfs +/sbin/mkfs.xfs +/sbin/xfs_repair +/%{_lib}/*.so.* +%{_mandir}/man8/* +%{_mandir}/man5/* +/usr/sbin/* -%files devel -f filesdevel.rpm +%files devel %defattr(-,root,root) +%{_mandir}/man3/* +%{_includedir}/disk +%{_includedir}/xfs +%{_libdir}/*.a +%{_libdir}/*.so %changelog -* Wed May 19 2004 tsintegrate 2.6.13-1ts -- current (2.6.13-1ok) integrated as 2.6.13-1ts for release 1.0-U1 +* Tue Jun 15 2004 Elliot Lee +- rebuilt -* Fri May 14 2004 Omar Kilani 2.6.13-1ok -- New Upstream. -- Fix permissions on include directories. +* Wed May 5 2004 Jeremy Katz - 2.6.13-1 +- update to 2.6.13 per request of upstream +- fixes mount by label of xfs on former raid partition (#122043) -* Wed May 12 2004 Omar Kilani -- Add BuildRequires: autoconf automake libtool gettext -- Add BuildRequires: e2fsprogs-devel +* Tue Mar 02 2004 Elliot Lee +- rebuilt -* Wed Apr 07 2004 Omar Kilani 2.6.10-1ts -- New upstream. +* Fri Feb 13 2004 Elliot Lee +- rebuilt -* Fri Jan 23 2004 Erlend Midttun 2.6.2-1tr -- Initial release for Trustix, based off official SGI rpms. +* Thu Jan 8 2004 Jeremy Katz 2.6.0-2 +- add defattr (reported by Matthias) + +* Tue Dec 23 2003 Elliot Lee 2.6.0-3 +- Fix tyops in dependencies + +* Mon Dec 22 2003 Jeremy Katz 2.6.0-1 +- build for Fedora Core +- switch to more explicit file lists, nuke .la files + +* Tue Dec 16 2003 Axel Thimm 2.6.0 +- Update to 2.6.0. + +* Sat Sep 13 2003 Axel Thimm +- Sync with XFS 1.3.0. +- Update to 2.5.6. + +* Thu Apr 10 2003 Axel Thimm 2.3.9-0_2.90at +- Rebuilt for Red Hat 9. + From svn at tinysofa.org Thu Jul 1 15:56:36 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:56:36 +1000 (EST) Subject: [tinysofa-svn] r2867 - in tinysofa/snapshot/yp-tools/current: sources specs Message-ID: <20040701155636.5C9D64E817E@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:56:36 +1000 (Fri, 02 Jul 2004) New Revision: 2867 Added: tinysofa/snapshot/yp-tools/current/sources/yp-tools-2.7-md5.patch tinysofa/snapshot/yp-tools/current/sources/yp-tools-2.8-overrun.patch tinysofa/snapshot/yp-tools/current/sources/yp-tools-2.8.tar.bz2 Removed: tinysofa/snapshot/yp-tools/current/sources/yp-tools-2.8.tar.gz Modified: tinysofa/snapshot/yp-tools/current/specs/yp-tools.spec Log: - Sync with 2.0. - Added: - yp-tools-2.7-md5.patch: - yp-tools-2.8-overrun.patch: - yp-tools-2.8.tar.bz2: - Removed: - yp-tools-2.8.tar.gz: Added: tinysofa/snapshot/yp-tools/current/sources/yp-tools-2.7-md5.patch =================================================================== --- tinysofa/snapshot/yp-tools/current/sources/yp-tools-2.7-md5.patch 2004-07-01 15:56:33 UTC (rev 2866) +++ tinysofa/snapshot/yp-tools/current/sources/yp-tools-2.7-md5.patch 2004-07-01 15:56:36 UTC (rev 2867) @@ -0,0 +1,109 @@ +--- yp-tools-2.8/src/yppasswd.c.orig 2002-12-05 08:49:20.000000000 -0500 ++++ yp-tools-2.8/src/yppasswd.c 2003-04-23 14:58:13.000000000 -0400 +@@ -49,6 +49,8 @@ + #include + #include + #include ++#include ++#include + #include + #include + #include +@@ -436,11 +438,44 @@ verifypassword (struct passwd *pwd, char + + #endif + ++#define bin_to_ascii(c) ((c)>=38?((c)-38+'a'):(c)>=12?((c)-12+'A'):(c)+'.') ++ ++static void ++create_random_salt (char *salt, int num_chars) ++{ ++ int fd; ++ unsigned char c; ++ int i; ++ int res; ++ ++ fd = open("/dev/urandom", O_RDONLY); ++ ++ for (i = 0; i < num_chars; i++) ++ { ++ res = 0; ++ ++ if (fd != 0) ++ res = read (fd, &c, 1); ++ ++ if (res != 1) ++ c = random(); ++ ++ salt[i] = bin_to_ascii(c & 0x3f); ++ } ++ ++ salt[num_chars] = 0; ++ ++ if (fd != 0) ++ close (fd); ++} ++ ++ + int + main (int argc, char **argv) + { + char *s, *progname, *domainname = NULL, *user = NULL, *master = NULL; + int f_flag = 0, l_flag = 0, p_flag = 0, error, status; ++ int has_md5_passwd = 0; + struct yppasswd yppwd; + struct passwd *pwd; + CLIENT *clnt; +@@ -451,6 +486,8 @@ main (int argc, char **argv) + bindtextdomain (PACKAGE, LOCALEDIR); + textdomain (PACKAGE); + ++ srandom (time (NULL)); ++ + if ((s = strrchr (argv[0], '/')) != NULL) + progname = s + 1; + else +@@ -642,6 +679,9 @@ main (int argc, char **argv) + cp = stpcpy (hashpass, "##"); + strcpy (cp, pwd->pw_name); + ++ if (strncmp(pwd->pw_passwd, "$1$", 3) == 0) ++ has_md5_passwd = 1; ++ + /* We can't check the password with shadow passwords enabled. We + * leave the checking to yppasswdd */ + if (uid != 0 && strcmp (pwd->pw_passwd, "x") != 0 && +@@ -676,13 +716,11 @@ main (int argc, char **argv) + + if (p_flag) + { +-#define bin_to_ascii(c) ((c)>=38?((c)-38+'a'):(c)>=12?((c)-12+'A'):(c)+'.') + #ifdef USE_CRACKLIB + char *error_msg; + #endif /* USE_CRACKLIB */ +- char *buf, salt[2], *p = NULL; ++ char *buf, salt[12], *p = NULL; + int tries = 0; +- time_t tm; + + buf = (char *) malloc (129); + +@@ -733,9 +771,15 @@ main (int argc, char **argv) + } + } + +- time (&tm); +- salt[0] = bin_to_ascii (tm & 0x3f); +- salt[1] = bin_to_ascii ((tm >> 6) & 0x3f); ++ if (!has_md5_passwd) ++ create_random_salt (salt, 2); ++ else ++ { ++ /* The user already had a MD5 password, so it's safe to ++ * use a MD5 password again */ ++ strcpy (salt, "$1$"); ++ create_random_salt (salt+3, 8); ++ } + + yppwd.newpw.pw_passwd = strdup (crypt (buf, salt)); + } Added: tinysofa/snapshot/yp-tools/current/sources/yp-tools-2.8-overrun.patch =================================================================== --- tinysofa/snapshot/yp-tools/current/sources/yp-tools-2.8-overrun.patch 2004-07-01 15:56:33 UTC (rev 2866) +++ tinysofa/snapshot/yp-tools/current/sources/yp-tools-2.8-overrun.patch 2004-07-01 15:56:36 UTC (rev 2867) @@ -0,0 +1,11 @@ +--- yp-tools-2.8/src/yppasswd.c.overflow 2004-06-18 20:05:03.000000000 -0400 ++++ yp-tools-2.8/src/yppasswd.c 2004-06-18 20:05:03.000000000 -0400 +@@ -796,7 +796,7 @@ + pwd->pw_name, master); + + strncpy (gecos, pwd->pw_gecos, sizeof (gecos)); +- gecos[sizeof (gecos)] = '\0'; ++ gecos[sizeof (gecos) -1] = '\0'; + sp = getfield (gecos, oname, sizeof (oname)); + if (newfield (progname, _("Name"), oname, name, + sizeof (name))) Added: tinysofa/snapshot/yp-tools/current/sources/yp-tools-2.8.tar.bz2 =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/yp-tools/current/sources/yp-tools-2.8.tar.bz2 ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: tinysofa/snapshot/yp-tools/current/sources/yp-tools-2.8.tar.gz =================================================================== (Binary files differ) Modified: tinysofa/snapshot/yp-tools/current/specs/yp-tools.spec =================================================================== --- tinysofa/snapshot/yp-tools/current/specs/yp-tools.spec 2004-07-01 15:56:33 UTC (rev 2866) +++ tinysofa/snapshot/yp-tools/current/specs/yp-tools.spec 2004-07-01 15:56:36 UTC (rev 2867) @@ -1,14 +1,16 @@ Summary: NIS (or YP) client programs. Name: yp-tools Version: 2.8 -Release: 7ts -License: GNU -Group: tinysofa official -Source: ftp://ftp.kernel.org/pub/linux/utils/net/NIS/yp-tools-%{version}.tar.gz -Url: http://www-vt.uni-paderborn.de/~kukuk/linux/nis.html +Release: 5ts +License: GPL +Group: System Environment/Base +Source: ftp://ftp.kernel.org/pub/linux/utils/net/NIS/yp-tools-%{version}.tar.bz2 +Url: http://www.linux-nis.org/nis/yp-tools/index.html +Patch1: yp-tools-2.7-md5.patch +Patch2: yp-tools-2.8-overrun.patch Obsoletes: yppasswd, yp-clients -Requires: ypbind-mt -BuildRoot: %{_tmppath}/%{name}-root +Requires: ypbind +Buildroot: %{_tmppath}/%{name}-%{version}-root %description The Network Information Service (NIS) is a system which provides @@ -32,60 +34,104 @@ %prep %setup -q +%patch1 -p1 -b .md5 +%patch2 -p1 -b .overflow %build -%configure --prefix=%{_prefix} \ - --mandir=%{_mandir} \ - --disable-domainname +%configure --disable-domainname make %install -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT -make DESTDIR="$RPM_BUILD_ROOT" MANDIR="$RPM_BUILD_ROOT"/${_mandir} install +rm -rf $RPM_BUILD_ROOT +make DESTDIR="$RPM_BUILD_ROOT" install -%find_lang %{name} +%find_lang %name %clean -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT +rm -rf $RPM_BUILD_ROOT %files -f %{name}.lang %defattr(-,root,root) %doc AUTHORS COPYING README ChangeLog NEWS etc/nsswitch.conf %doc THANKS TODO /usr/bin/* -/usr/share/man/*/* +%{_mandir}/*/* /usr/sbin/* /var/yp/nicknames +%dir /var/yp %changelog -* Wed May 19 2004 tsintegrate 2.8-7ts -- current (2.8-6ts) integrated as 2.8-7ts for release 1.0-U1 +* Fri Jun 18 2004 Alan Cox +- Fix buffer overflow (non security) thanks to D Binderman -* Mon Dec 8 2003 Erlend Midttun 2.8-3tr -- Big rebuild +* Tue Jun 15 2004 Elliot Lee +- rebuilt -* Wed Jun 18 2003 Erlend Midttun 2.8-2tr -- Big rebuild +* Fri Feb 13 2004 Elliot Lee +- rebuilt -* Thu Jun 5 2003 Tore Olsen 2.8-1to -- new upstream version -- removed locales +* Wed Jun 04 2003 Elliot Lee +- rebuilt -* Mon Mar 24 2003 Erlend Midttun 2.7-4em -- Rebuilt against glibc 2.3.2. +* Wed Apr 23 2003 Steve Dickson +- Update to 2.7 from upstream +- Updated yppasswd md5 patch -* Thu Feb 27 2003 Christian H. Toldnes 2.7-3ct -- Added better removel of $RPM_BUILD_ROOT +* Wed Jan 22 2003 Tim Powers +- rebuilt -* Thu Sep 26 2002 Erlend Midttun 2.7-2em -- Changed requires ypbind to ypbind-mt. +* Mon Nov 18 2002 Tim Powers +- rebuild on all arches -* Mon Jul 22 2002 Christian H. Toldnes 2.7-1ct -- New upstream version. Built for tsl2.0 +* Wed Aug 28 2002 Nalin Dahyabhai 2.7-3 +- properly terminate an alloca'ed string in yppasswd which would lead to + improper rejection of the request if the user's pw_passwd was visible -* Wed Mar 29 2000 Lars Gaarden -- Moved man pages to /usr/share, FHS +* Fri Jun 21 2002 Tim Powers +- automated rebuild +* Tue Jun 11 2002 Alexander Larsson +- Update to 2.7 from upstream +- Updated yppasswd md5 patch + +* Thu May 23 2002 Tim Powers +- automated rebuild + +* Mon Mar 25 2002 Alex Larsson 2.6-4 +- Updated passwd patch with Nalins comments + +* Fri Mar 22 2002 Alex Larsson 2.6-3 +- Add patch that handles MD5 passwords and HPU/X password aging. +- This should hopefully fix #19045 and #22667 + +* Wed Jan 09 2002 Tim Powers +- automated rebuild + +* Tue Jul 24 2001 Florian La Roche +- own /var/yp + +* Sun Jun 24 2001 Elliot Lee +- Bump release + rebuild. + +* Mon Feb 26 2001 Trond Eivind Glomsr?d +- langify + +* Wed Sep 27 2000 Florian La Roche +- add another security patch + +* Sun Aug 20 2000 Florian La Roche +- allow passwords up to 128 characters + +* Tue Aug 15 2000 Nalin Dahyabhai +- change License from GNU to GPL +- fix handling of defaults in ypchfn (#13830) + +* Thu Jul 13 2000 Prospector +- automatic rebuild + +* Sun Jun 18 2000 Matt Wilson +- use %%{_mandir} + * Thu Feb 03 2000 Cristian Gafton - man pages are compressed - version 2.4 @@ -132,4 +178,4 @@ * Fri Oct 31 1997 Donnie Barnes - pulled from contrib into distribution (got fresh sources). Thanks to Thorsten Kukuk for the original. -- used fresh sources \ No newline at end of file +- used fresh sources From svn at tinysofa.org Thu Jul 1 15:56:46 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:56:46 +1000 (EST) Subject: [tinysofa-svn] r2869 - in tinysofa/snapshot/zlib/current: sources specs Message-ID: <20040701155646.084304E817E@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:56:45 +1000 (Fri, 02 Jul 2004) New Revision: 2869 Added: tinysofa/snapshot/zlib/current/sources/zlib-1.1.4-make-test.patch tinysofa/snapshot/zlib/current/sources/zlib-1.2.1.1.tar.gz Removed: tinysofa/snapshot/zlib/current/sources/zlib-1.2.1.tar.bz2 Modified: tinysofa/snapshot/zlib/current/specs/zlib.spec Log: - Sync with 2.0. - Added: - zlib-1.1.4-make-test.patch: - zlib-1.2.1.1.tar.gz: - Removed: - zlib-1.2.1.tar.bz2: Added: tinysofa/snapshot/zlib/current/sources/zlib-1.1.4-make-test.patch =================================================================== --- tinysofa/snapshot/zlib/current/sources/zlib-1.1.4-make-test.patch 2004-07-01 15:56:42 UTC (rev 2868) +++ tinysofa/snapshot/zlib/current/sources/zlib-1.1.4-make-test.patch 2004-07-01 15:56:45 UTC (rev 2869) @@ -0,0 +1,23 @@ +--- zlib-1.1.4/Makefile.in.jj Mon Mar 11 08:58:30 2002 ++++ zlib-1.1.4/Makefile.in Fri Apr 26 06:53:12 2002 +@@ -62,13 +62,16 @@ all: example minigzip + + test: all + @LD_LIBRARY_PATH=.:$(LD_LIBRARY_PATH) ; export LD_LIBRARY_PATH; \ +- echo hello world | ./minigzip | ./minigzip -d || \ +- echo ' *** minigzip test FAILED ***' ; \ ++ ret=0; \ ++ if ! echo hello world | ./minigzip | ./minigzip -d; then \ ++ echo ' *** minigzip test FAILED ***'; ret=1; \ ++ fi; \ + if ./example; then \ + echo ' *** zlib test OK ***'; \ + else \ +- echo ' *** zlib test FAILED ***'; \ +- fi ++ echo ' *** zlib test FAILED ***'; ret=1; \ ++ fi; \ ++ exit $$ret + + libz.a: $(OBJS) $(OBJA) + $(AR) $@ $(OBJS) $(OBJA) Added: tinysofa/snapshot/zlib/current/sources/zlib-1.2.1.1.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/zlib/current/sources/zlib-1.2.1.1.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: tinysofa/snapshot/zlib/current/sources/zlib-1.2.1.tar.bz2 =================================================================== (Binary files differ) Modified: tinysofa/snapshot/zlib/current/specs/zlib.spec =================================================================== --- tinysofa/snapshot/zlib/current/specs/zlib.spec 2004-07-01 15:56:42 UTC (rev 2868) +++ tinysofa/snapshot/zlib/current/specs/zlib.spec 2004-07-01 15:56:45 UTC (rev 2869) @@ -1,216 +1,205 @@ -%define with_devel 1 - -%define libname %{mklibname z} -%define libname_devel %{mklibname z -d} - -Name: zlib -Version: 1.2.1 -Release: 6ok Summary: The zlib compression and decompression library. -Summary(pt_BR): Biblioteca para compress?o e descompress?o -Summary(es): Biblioteca para compresi?n y descompresi?n -Group: tinysofa/libraries -Group(pt_BR): tinysofa/bibliotecas -Group(es): tinysofa/bibliotecas -License: BSD +Name: zlib +Version: 1.2.1.1 +Release: 3ts +Group: System Environment/Libraries +Source: ftp://ftp.info-zip.org/pub/infozip/zlib/zlib-%{version}.tar.gz +Patch0: zlib-1.1.4-make-test.patch URL: http://www.gzip.org/zlib/ -Source: ftp://ftp.info-zip.org/pub/infozip/zlib/%{name}-%{version}.tar.bz2 -BuildRequires: binutils -BuildRequires: gcc -BuildRequires: glibc-devel -BuildRequires: make -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release} +License: BSD +Prefix: %{_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-root %description -The zlib compression library provides in-memory compression and -decompression functions, including integrity checks of the uncompressed -data. This version of the library supports only one compression method -(deflation), but other algorithms may be added later, which will have -the same stream interface. The zlib library is used by many different -system programs. +Zlib is a general-purpose, patent-free, lossless data compression +library which is used by many different programs. -%description -l pt_BR -A biblioteca de compress?o 'zlib' oferece fun??es de compress?o e descompress?o -em mem?ria, incluindo checagem da integridade de dados n?o comprimidos. Essa -vers?o da biblioteca suporta somente um m?todo de compress?o (defla??o) mas -outros algoritmos podem ser adicionados mais tarde e ter?o a mesma interface. -Essa biblioteca ? usada por v?rios programas de sistema. +%package devel +Summary: Header files and libraries for Zlib development. +Group: Development/Libraries +Requires: zlib = %{version} -%description -l es -La biblioteca de compresi?n 'zlib' nos ofrece funciones de compresi?n y -descompresi?n en memoria, incluyendo chequeo de la integridad de datos no -comprimidos. Esta versi?n de la biblioteca soporta solamente un m?todo de -compresi?n (deflaci?n) pero otros algoritmos pueden ser a?adidos m?s tarde y -tendr?n la misma interface. Esta biblioteca se usa por varios programas de -sistema. - -%package -n %{libname} -Summary: The zlib compression and decompression library. -Summary(pt_BR): Biblioteca para compress?o e descompress?o -Summary(es): Biblioteca para compresi?n y descompresi?n -Group: tinysofa/libraries -Group(pt_BR): tinysofa/bibliotecas -Group(es): tinysofa/bibliotecas -%rename zlib - -%description -n %{libname} -The zlib compression library provides in-memory compression and -decompression functions, including integrity checks of the uncompressed -data. This version of the library supports only one compression method -(deflation), but other algorithms may be added later, which will have -the same stream interface. The zlib library is used by many different -system programs. - -%description -n %{libname} -l pt_BR -A biblioteca de compress?o 'zlib' oferece fun??es de compress?o e descompress?o -em mem?ria, incluindo checagem da integridade de dados n?o comprimidos. Essa -vers?o da biblioteca suporta somente um m?todo de compress?o (defla??o) mas -outros algoritmos podem ser adicionados mais tarde e ter?o a mesma interface. -Essa biblioteca ? usada por v?rios programas de sistema. - -%description -n %{libname} -l es -La biblioteca de compresi?n 'zlib' nos ofrece funciones de compresi?n y -descompresi?n en memoria, incluyendo chequeo de la integridad de datos no -comprimidos. Esta versi?n de la biblioteca soporta solamente un m?todo de -compresi?n (deflaci?n) pero otros algoritmos pueden ser a?adidos m?s tarde y -tendr?n la misma interface. Esta biblioteca se usa por varios programas de -sistema. - -%if %{with_devel} -%package -n %{libname_devel} -Summary: Header files and libraries for developing apps which will use zlib. -Summary(pt_BR): Bibliotecas e arquivos de inclus?o para desenvolvimento zlib -Summary(es): Bibliotecas y archivos de inclusi?n para desarrollo zlib -Group: tinysofa/development -Group(pt_BR): tinysofa/desenvolvimento -Group(es): tinysofa/desarrollo -PreReq: %{libname} = %{version} -%rename zlib-devel - -%description -n %{libname_devel} -The libzlib-devel package contains the header files and libraries needed +%description devel +The zlib-devel package contains the header files and libraries needed to develop programs that use the zlib compression and decompression library. -Install the libzlib-devel package if you want to develop applications that -will use the zlib library. - -%description -l pt_BR -n %{libname_devel} -A biblioteca de compress?o zlib prov? fun??es de compress?o e descompress?o em -mem?ria, incluindo checagens de integridade para os dados descomprimidos. Esta -vers?o da biblioteca suporta somente um m?todo de compress?o (deflation) mas -outros algoritmos podem ser adicionados no futuro e ter?o a mesma interface -stream. - -Este pacote cont?m os arquivos de inclus?o e bibliotecas necess?rios ao -desenvolvimento de programas que usam zlib. - -%description -l es -n %{libname_devel} -La biblioteca de compresi?n zlib provee funciones de compresi?n y descompresi?n -en memoria, incluye chequeos de integridad para los datos descomprimidos. Esta -versi?n de la biblioteca soporta solamente un m?todo de compresi?n (deflation) -pero otros algoritmos pueden ser a?adidos en el futuro y tendr?n la misma -interface stream. Este paquete contiene los archivos de inclusi?n y -bibliotecas necesarios al desarrollo de programas que usan zlib. - %prep -%setup -q -n %{name}-%{version} +%setup -q +%patch0 -p1 -b .make-test %build -export CFLAGS="%{optflags} -fPIC -O3 -funroll-loops" -./configure --shared --prefix=%{_prefix} --libdir=%{_libdir} -%make + +CFLAGS="$RPM_OPT_FLAGS -fPIC" ./configure --shared --prefix=%{_prefix} + # now build the static lib -./configure --prefix=%{_prefix} --libdir=%{_libdir} -%make +CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%{_prefix} %install -mkdir -p %{buildroot}%{_prefix} +rm -rf ${RPM_BUILD_ROOT} +mkdir -p ${RPM_BUILD_ROOT}%{_prefix} +mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man3 -./configure --shared --prefix=%{_prefix} --libdir=%{_libdir} -make install prefix=%{buildroot}%{_prefix} libdir=%{buildroot}%{_libdir} +CFLAGS="$RPM_OPT_FLAGS -fPIC" ./configure --shared --prefix=%{_prefix} +make install prefix=${RPM_BUILD_ROOT}%{_prefix} -./configure --prefix=%{_prefix} --libdir=%{_libdir} -make install prefix=%{buildroot}%{_prefix} libdir=%{buildroot}%{_libdir} +CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%{_prefix} +make install prefix=${RPM_BUILD_ROOT}%{_prefix} -install -m644 zutil.h %{buildroot}%{_includedir}/zutil.h -mkdir -p %{buildroot}%{_mandir}/man3 -install -m644 zlib.3 %{buildroot}%{_mandir}/man3 +install -m644 zutil.h ${RPM_BUILD_ROOT}%{_includedir}/zutil.h +if [ "%{_prefix}/lib" != "%{_libdir}" ]; then + mkdir -p ${RPM_BUILD_ROOT}%{_libdir} + mv ${RPM_BUILD_ROOT}%{_prefix}/lib/* ${RPM_BUILD_ROOT}%{_libdir} + rmdir ${RPM_BUILD_ROOT}%{_prefix}/lib +fi + +%check +make %{?_smp_mflags} test + %clean -rm -rf %{buildroot} +rm -rf ${RPM_BUILD_ROOT} -%post -n %{libname} -p /sbin/ldconfig +%post -p /sbin/ldconfig -%postun -n %{libname} -p /sbin/ldconfig +%postun -p /sbin/ldconfig -%files -n %{libname} -%defattr(0644,root,root) +%files +%defattr(-,root,root) +%doc README %{_libdir}/libz.so.* -%if %{with_devel} -%files -n %{libname_devel} -%defattr(0644,root,root,0755) -%doc algorithm.txt ChangeLog FAQ README -%{_libdir}/libz.so +%files devel +%defattr(-,root,root) +%doc ChangeLog algorithm.txt minigzip.c example.c +%{_libdir}/*.a +%{_libdir}/*.so %{_includedir}/* %{_mandir}/man3/zlib.3* -%{_libdir}/libz.a %changelog -* Thu Jun 03 2004 Omar Kilani 1.2.1-8ok -- tinysofa. +* Tue Jun 15 2004 Elliot Lee +- rebuilt -* Fri Jan 09 2004 Arnaldo Carvalho de Melo -+ 2004-01-09 21:40:42 (43990) -- Complete the rename to libz1 +* Tue Mar 02 2004 Elliot Lee +- rebuilt -* Fri Jan 09 2004 Arnaldo Carvalho de Melo -+ 2004-01-09 21:36:15 (43989) -- Rename the spec +* Fri Feb 13 2004 Elliot Lee +- rebuilt -* Fri Jan 09 2004 Arnaldo Carvalho de Melo -+ 2004-01-09 21:35:27 (43988) -- Follow the Conectiva Linux guidelines for library naming. +* Sun Jan 18 2004 Jeff Johnson 1.2.1.1-1 +- upgrade to zlib-1.2.1.1. -* Fri Jan 09 2004 Arnaldo Carvalho de Melo -+ 2004-01-09 21:23:03 (43980) -- New upstream release: 1.2.1 +* Sun Nov 30 2003 Florian La Roche +- update to 1.2.1 release -* Fri Jan 09 2004 Arnaldo Carvalho de Melo -+ 2004-01-09 21:14:56 (43979) -- Made the devel packages be selectable at build time +* Mon Oct 13 2003 Jeff Johnson 1.2.0.7-3 +- unrevert zlib.h include constants (#106291), rejected upstream. -* Fri Jan 09 2004 Arnaldo Carvalho de Melo -+ 2004-01-09 21:12:37 (43978) -- Added BuildRequires -- -devel packages shouldn't have %%{release} in its PreReq -- use make -j -- Removed misfiled "spanish" translations +* Wed Oct 8 2003 Jeff Johnson 1.2.0.7-2 +- fix: gzeof not set when reading compressed file (#106424). +- fix: revert zlib.h include constants for now (#106291). -* Wed Jul 30 2003 Claudio Matsuoka -+ 2003-07-30 15:50:59 (33576) -- fixed configuration to honour optflags +* Tue Sep 23 2003 Jeff Johnson 1.2.0.7-1 +- update to 1.2.0.7, penultimate 1.2.1 release candidate. -* Fri Feb 28 2003 Ademar de Souza Reis Jr. -+ 2003-02-28 15:47:32 (26074) -- Added a patch for a vsnprintf() buffer overflow vulnerability. - Patch made by Kelledin and modified by - the OpenPKG project. -- Minor spec cleanup +* Tue Jul 22 2003 Jeff Johnson 1.2.0.3-0.1 +- update to release candidate. -* Tue Sep 03 2002 Gustavo Niemeyer -+ 2002-09-03 16:43:05 (14148) -- Imported package from snapshot. +* Wed Jun 04 2003 Elliot Lee +- rebuilt -* Thu Aug 29 2002 Gustavo Niemeyer -+ 2002-08-29 19:31:43 (10362) -- Imported package from 8.0. +* Mon May 19 2003 Jeff Johnson 1.1.4-9 +- rebuild, revert from 1.2.0.1. -* Wed Aug 28 2002 Gustavo Niemeyer -+ 2002-08-28 21:42:57 (7046) -- Imported package from 7.0. +* Mon Feb 24 2003 Jeff Johnson 1.1.4-8 +- fix gzprintf buffer overrun (#84961). -* Tue Aug 27 2002 Gustavo Niemeyer -+ 2002-08-27 20:08:58 (2195) -- Imported package from 6.0. +* Wed Jan 22 2003 Tim Powers 1.1.4-7 +- rebuilt + +* Thu Nov 21 2002 Elliot Lee 1.1.4-6 +- Make ./configure use $CC to ease cross-compilation + +* Tue Nov 12 2002 Jeff Johnson 1.1.4-5 +- rebuild from cvs. + +* Fri Jun 21 2002 Tim Powers +- automated rebuild + +* Thu May 23 2002 Tim Powers +- automated rebuild + +* Fri Apr 26 2002 Jakub Jelinek 1.1.4-2 +- remove glibc patch, it is no longer needed (zlib uses gcc -shared + as it should) +- run tests and only build the package if they succeed + +* Thu Apr 25 2002 Trond Eivind Glomsr?d 1.1.4-1 +- 1.1.4 + +* Wed Jan 30 2002 Trond Eivind Glomsr?d 1.1.3-25.7 +- Fix double free + +* Sun Aug 26 2001 Trond Eivind Glomsr?d 1.1.3-24 +- Add example.c and minigzip.c to the doc files, as + they are listed as examples in the README (#52574) + +* Mon Jun 18 2001 Trond Eivind Glomsr?d +- Updated URL +- Add version dependency for zlib-devel +- s/Copyright/License/ + +* Wed Feb 14 2001 Trond Eivind Glomsr?d +- bumped version number - this is the old version without the performance enhancements + +* Fri Sep 15 2000 Florian La Roche +- add -fPIC for shared libs (patch by Fritz Elfert) + +* Thu Sep 7 2000 Jeff Johnson +- on 64bit systems, make sure libraries are located correctly. + +* Thu Aug 17 2000 Jeff Johnson +- summaries from specspo. + +* Thu Jul 13 2000 Prospector +- automatic rebuild + +* Sun Jul 02 2000 Trond Eivind Glomsr?d +- rebuild + +* Tue Jun 13 2000 Jeff Johnson +- FHS packaging to build on solaris2.5.1. + +* Wed Jun 07 2000 Trond Eivind Glomsr?d +- use %%{_mandir} and %%{_tmppath} + +* Fri May 12 2000 Trond Eivind Glomsr?d +- updated URL and source location +- moved README to main package + +* Mon Feb 7 2000 Jeff Johnson +- compress man page. + +* Sun Mar 21 1999 Cristian Gafton +- auto rebuild in the new build environment (release 5) + +* Wed Sep 09 1998 Cristian Gafton +- link against glibc + +* Mon Jul 27 1998 Jeff Johnson +- upgrade to 1.1.3 + +* Fri May 08 1998 Prospector System +- translations modified for de, fr, tr + +* Wed Apr 08 1998 Cristian Gafton +- upgraded to 1.1.2 +- buildroot + +* Tue Oct 07 1997 Donnie Barnes +- added URL tag (down at the moment so it may not be correct) +- made zlib-devel require zlib + +* Thu Jun 19 1997 Erik Troan +- built against glibc From svn at tinysofa.org Thu Jul 1 15:52:04 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:52:04 +1000 (EST) Subject: [tinysofa-svn] r2805 - in tinysofa/snapshot/ntp/current: sources specs Message-ID: <20040701155204.8E2464E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:52:00 +1000 (Fri, 02 Jul 2004) New Revision: 2805 Removed: tinysofa/snapshot/ntp/current/sources/ntp-4.2.0-vsnprintf.patch Modified: tinysofa/snapshot/ntp/current/sources/ntpd.init tinysofa/snapshot/ntp/current/specs/ntp.spec Log: - Sync with 2.0. - Kept: - filter-requires-ntp.sh: - ntp-4.0.99j-vsnprintf.patch: - ntp-4.0.99m-usegethost.patch: - ntp-4.1.1c-rc3-authkey.patch: - ntp-4.1.2-rh-manpages.tar.gz: - ntp-4.2.0-autofoo.patch: - ntp-4.2.0-droproot.patch: - ntp-4.2.0-genkey3.patch: - ntp-4.2.0-limit.patch: - ntp-4.2.0-loopfilter.patch: - ntp-4.2.0-md5.patch: - ntp-4.2.0.tar.gz: - ntp.conf: - ntp.keys: - ntpd.init: - ntpd.sysconfig: - ntpstat-0.2.tgz: - Removed: - ntp-4.2.0-vsnprintf.patch: Deleted: tinysofa/snapshot/ntp/current/sources/ntp-4.2.0-vsnprintf.patch =================================================================== --- tinysofa/snapshot/ntp/current/sources/ntp-4.2.0-vsnprintf.patch 2004-07-01 15:51:56 UTC (rev 2804) +++ tinysofa/snapshot/ntp/current/sources/ntp-4.2.0-vsnprintf.patch 2004-07-01 15:52:00 UTC (rev 2805) @@ -1,19 +0,0 @@ -diff -Nru ntp-4.2.0.orig/libntp/msyslog.c ntp-4.2.0/libntp/msyslog.c ---- ntp-4.2.0.orig/libntp/msyslog.c 2003-07-17 10:27:22.000000000 +0000 -+++ ntp-4.2.0/libntp/msyslog.c 2003-11-26 08:48:16.000000000 +0000 -@@ -163,6 +163,7 @@ - format_errmsg(nfmt, sizeof(nfmt), fmt, errval); - - vsnprintf(buf, sizeof(buf), nfmt, ap); -+ buf[sizeof(buf)-1] = '\0'; - addto_syslog(level, buf); - va_end(ap); - } -@@ -202,6 +203,7 @@ - format_errmsg(nfmt, sizeof(nfmt), fmt, errval); - - vsnprintf(buf, sizeof(buf), nfmt, ap); -+ buf[sizeof(buf)-1] = '\0'; - addto_syslog(level, buf); - va_end(ap); - } Modified: tinysofa/snapshot/ntp/current/sources/ntpd.init =================================================================== --- tinysofa/snapshot/ntp/current/sources/ntpd.init 2004-07-01 15:51:56 UTC (rev 2804) +++ tinysofa/snapshot/ntp/current/sources/ntpd.init 2004-07-01 15:52:00 UTC (rev 2805) @@ -10,13 +10,7 @@ # such as a radio or satellite receiver or modem. # Source function library. -if [ -f /etc/init.d/functions ] ; then - . /etc/init.d/functions -elif [ -f /etc/rc.d/init.d/functions ] ; then - . /etc/rc.d/init.d/functions -else - exit 0 -fi +. /etc/init.d/functions # Source networking configuration. . /etc/sysconfig/network @@ -29,38 +23,111 @@ [ ${NETWORKING} = "no" ] && exit 0 ntpconf=/etc/ntp.conf +ntpstep=/etc/ntp/step-tickers [ -x /usr/sbin/ntpd -a -f $ntpconf ] || exit 0 RETVAL=0 prog="ntpd" +FWCHAIN="RH-Firewall-1-INPUT" +# Is there a firewall running, and does it look like one we configured? +FWACTIVE='' +if [ -f /proc/net/ip_tables_names ]; then + if iptables -L -n 2>/dev/null | grep -q $FWCHAIN ; then + FWACTIVE=1 + fi +fi + start() { - # Synchronize with servers - echo -n $"$prog: Synchronizing with time server: " - # Should take the username somewhere - ntpd -U ntp -gqx > /dev/null - RETVAL=$? - [ $RETVAL -eq 0 ] && success || failure - echo + # get the servers from step-ticker + tickers='' + if [ -s "$ntpstep" ]; then + tickers=`/bin/sed -e 's/\#.*$//g' $ntpstep` + fi + timeservers=`/bin/awk '$1=="peer"||$1=="server"{print $2}' $ntpconf` + # check for -x + OPTIND=0 + dostep='' + dropstr='' + while getopts ":aAbc:dD:f:gk:l:LmnN:p:P:qr:s:t:v:V:xU:T:" args $OPTIONS; + do + if [ "$args" = "x" ]; then + dostep='yes' + fi + if [ "$args" = "U" ]; then + dropstr="-U $OPTARG" + fi + + done + OPTIND=0 + + # Open the firewall for ntp + if [ -n "$FWACTIVE" -a "$FIREWALL_MODS" != "no" ]; then + for server in `echo $tickers $timeservers | tr ' ' '\n' | sort -u`; do + echo -n $"$prog: Opening firewall for input from $server port 123" + iptables -I $FWCHAIN -m udp -p udp -s $server/32 \ + --sport 123 -d 0/0 --dport 123 -j ACCEPT \ + && success || failure + echo + done + fi + + if [ -z "$tickers" ]; then + tickers=$timeservers + fi + + if [ -s "$ntpstep" -o -n "$dostep" ]; then + # Synchronize with servers if step-tickers exists + # or the -x option is used + echo -n $"$prog: Synchronizing with time server: " + /usr/sbin/ntpdate $dropstr -s -b -p 8 $tickers 2>/dev/null >/dev/null + RETVAL=$? + [ $RETVAL -eq 0 ] && success || failure + echo + if [ $RETVAL -ne 0 ]; then + OPTIONS="$OPTIONS -g" + fi + else + # -g can replace the grep for time servers + # as it permits ntpd to violate its 1000s limit once. + OPTIONS="$OPTIONS -g" + fi # Start daemons. echo -n $"Starting $prog: " daemon ntpd $OPTIONS RETVAL=$? echo - [ $RETVAL -eq 0 ] && touch ${INITLOCK:-/var/log/subsys}/${prog} + [ $RETVAL -eq 0 ] && touch /var/lock/subsys/ntpd return $RETVAL } stop() { # Stop daemons. + + # get the servers from step-ticker + tickers='' + if [ -s "$ntpstep" ]; then + tickers=`/bin/sed -e 's/\#.*$//g' $ntpstep` + fi + timeservers=`/usr/bin/awk '$1=="peer"||$1=="server"{print $2}' $ntpconf` + + # Remove the firewall opening for ntp + if [ -n "$FWACTIVE" -a "$FIREWALL_MODS" != "no" ]; then + for server in `echo $tickers $timeservers | tr ' ' '\n' | sort -u`; do + echo -n $"$prog: Removing firewall opening for $server port 123" + iptables -D $FWCHAIN -m udp -p udp -s $server/32 --sport 123 -d 0/0 --dport 123 -j ACCEPT \ + && success || failure + echo + done + fi echo -n $"Shutting down $prog: " killproc ntpd RETVAL=$? echo - [ $RETVAL -eq 0 ] && rm -f ${INITLOCK:-/var/log/subsys}/${prog} + [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/ntpd return $RETVAL } @@ -81,17 +148,16 @@ start RETVAL=$? ;; - condrestart|try-restart) - if [ -f ${INITLOCK:-/var/log/subsys}/${prog} ]; then + condrestart) + if [ -f /var/lock/subsys/ntpd ]; then stop start RETVAL=$? fi ;; *) - echo $"Usage: $0 {start|stop|restart|try-restart|status}" + echo $"Usage: $0 {start|stop|restart|condrestart|status}" exit 1 esac exit $RETVAL - Modified: tinysofa/snapshot/ntp/current/specs/ntp.spec =================================================================== --- tinysofa/snapshot/ntp/current/specs/ntp.spec 2004-07-01 15:51:56 UTC (rev 2804) +++ tinysofa/snapshot/ntp/current/specs/ntp.spec 2004-07-01 15:52:00 UTC (rev 2805) @@ -1,11 +1,14 @@ %define _use_internal_dependency_generator 0 +%define glibc_version %(rpm -q glibc | cut -d . -f 1-2 ) +%define glibc21 %([ "%glibc_version" = glibc-2.1 ] && echo 1 || echo 0) +%define glibc22 %([ "%glibc_version" = glibc-2.2 ] && echo 1 || echo 0) Summary: Synchronizes system time using the Network Time Protocol (NTP). Name: ntp Version: 4.2.0 -Release: 13jh +Release: 8ts License: distributable -Group: tinysofa/main +Group: System Environment/Daemons Source0: http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2.0.tar.gz Source1: ntp.conf Source2: ntp.keys @@ -33,15 +36,14 @@ Patch15: ntp-4.1.1c-rc3-authkey.patch Patch16: ntp-4.2.0-md5.patch Patch17: ntp-4.2.0-genkey3.patch -Patch18: ntp-4.2.0-vsnprintf.patch Patch99: ntp-4.2.0-autofoo.patch URL: http://www.ntp.org +PreReq: /sbin/chkconfig +Prereq: /usr/sbin/groupadd /usr/sbin/useradd +PreReq: /bin/awk, sed Requires: libcap -BuildRequires: libcap-devel, autoconf, automake, openssl-devel, perl -BuildRequires: ncurses-devel -%service_requires -%accountman_requires +BuildPreReq: libcap-devel, autoconf, automake, openssl-devel Obsoletes: xntp3 ntpstat BuildRoot: %{_tmppath}/%{name}-%{version}-root @@ -57,7 +59,6 @@ Install the ntp package if you need tools for keeping your system's time synchronized via the NTP protocol. - %prep %setup -q -a 5 -a 6 @@ -75,101 +76,122 @@ %patch15 -p1 -b .authkey %patch16 -p1 -b .nomd5lib %patch17 -p1 -b .md5key -%patch18 -p1 -b .vsnprintf #autoreconf -fi %patch99 -p1 -b .autofoo +%build -%build perl -pi -e 's|INSTALL_STRIP_PROGRAM="\\\$\{SHELL\} \\\$\(install_sh\) -c -s|INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c|g' configure # XXX work around for anal ntp configure %define _target_platform %{nil} - export CFLAGS="$RPM_OPT_FLAGS -g -DDEBUG" if echo 'int main () { return 0; }' | gcc -pie -fPIE -O2 -xc - -o pietest 2>/dev/null; then ./pietest && export CFLAGS="$CFLAGS -pie -fPIE" rm -f pietest fi - -%configure \ - --sysconfdir=%{_sysconfdir}/ntp \ - --bindir=%{_sbindir} \ - --enable-all-clocks \ - --enable-parse-clocks \ - --with-openssl-libdir=%{_libdir} - +%configure --sysconfdir=%{_sysconfdir}/ntp --bindir=%{_sbindir} --enable-all-clocks --enable-parse-clocks --with-openssl-libdir=%{_libdir} unset CFLAGS %undefine _target_platform -%make Makefile +# XXX workaround glibc-2.1.90 lossage for now. +# XXX still broken with glibc-2.1.94-2 and glibc-2.1.95-1 +%if ! %{glibc21} && ! %{glibc22} +( echo '#undef HAVE_CLOCK_SETTIME'; +echo '#undef HAVE_TIMER_CREATE'; +echo '#undef HAVE_TIMER_SETTIME'; +)>>config.h +%endif + +make Makefile for dir in *; do - [ -d $dir ] && %make -C $dir Makefile || : + [ -d $dir ] && make -C $dir Makefile || : done # Remove -lreadline and -lrt from ntpd/Makefile # I don't see them used... perl -pi -e "s|LIBS = -lrt -lreadline|LIBS = |" ntpd/Makefile + perl -pi -e "s|-lelf||" */Makefile perl -pi -e "s|-Wcast-qual||" */Makefile perl -pi -e "s|-Wconversion||" */Makefile -%make - +make pushd ntpstat-0.2 -%make +make popd %install -%makeinstall \ - sysconfdir=%{_sysconfdir}/ntp \ - bindir=${RPM_BUILD_ROOT}%{_sbindir} +rm -rf $RPM_BUILD_ROOT +%makeinstall sysconfdir=%{_sysconfdir}/ntp bindir=${RPM_BUILD_ROOT}%{_sbindir} + pushd ntpstat-0.2 -mkdir -p %{buildroot}%{_mandir}/man1 %{buildroot}%{_bindir} +mkdir -p ${RPM_BUILD_ROOT}/%{_mandir}/man1 +mkdir -p ${RPM_BUILD_ROOT}/%{_bindir} -install -m 755 ntpstat %{buildroot}%{_bindir}/ -install -m 644 ntpstat.1 %{buildroot}%{_mandir}/man1/ +install -m 755 ntpstat ${RPM_BUILD_ROOT}/%{_bindir}/ +install -m 644 ntpstat.1 ${RPM_BUILD_ROOT}/%{_mandir}/man1/ popd pushd man for i in *.1; do - install -m 644 $i %{buildroot}%{_mandir}/man1/ + install -m 644 $i ${RPM_BUILD_ROOT}/%{_mandir}/man1/ done -{ cd %{buildroot} +{ cd $RPM_BUILD_ROOT - mkdir -p .%{_sysconfdir}/ntp .%{_initrddir} + mkdir -p .%{_sysconfdir}/{ntp,rc.d/init.d} install -m644 $RPM_SOURCE_DIR/ntp.conf .%{_sysconfdir}/ntp.conf mkdir -p .%{_var}/lib/ntp echo '0.0' >.%{_var}/lib/ntp/drift install -m600 $RPM_SOURCE_DIR/ntp.keys .%{_sysconfdir}/ntp/keys + touch .%{_sysconfdir}/ntp/step-tickers + install -m755 $RPM_SOURCE_DIR/ntpd.init .%{_sysconfdir}/rc.d/init.d/ntpd - install -m755 $RPM_SOURCE_DIR/ntpd.init .%{_initrddir}/ntpd - mkdir -p .%{_sysconfdir}/sysconfig install -m644 %{SOURCE4} .%{_sysconfdir}/sysconfig/ntpd } %clean -%clean_buildroot +rm -rf $RPM_BUILD_ROOT - %pre -%groupadd ntp 38 -%useradd ntp 38 ntp -s /sbin/nologin -d %{_sysconfdir}/ntp +/usr/sbin/groupadd -g 38 ntp 2> /dev/null || : +/usr/sbin/useradd -u 38 -g 38 -s /sbin/nologin -M -r -d %{_sysconfdir}/ntp ntp 2>/dev/null || : %post -%service_post ntpd +/sbin/chkconfig --add ntpd +grep %{_sysconfdir}/ntp/drift %{_sysconfdir}/ntp.conf > /dev/null 2>&1 +olddrift=$? +if [ "$1" -ge "1" -a $olddrift -eq 0 ]; then + service ntpd status > /dev/null 2>&1 + wasrunning=$? + # let ntp save the actual drift + [ $wasrunning -eq 0 ] && service ntpd stop > /dev/null 2>&1 + # copy the driftfile to the new location + [ -f %{_sysconfdir}/ntp/drift ] && cp %{_sysconfdir}/ntp/drift %{_var}/lib/ntp/drift + # change the path in the config file + sed -e 's#%{_sysconfdir}/ntp/drift#%{_var}/lib/ntp/drift#g' %{_sysconfdir}/ntp.conf > %{_sysconfdir}/ntp.conf.rpmupdate \ + && mv %{_sysconfdir}/ntp.conf.rpmupdate %{_sysconfdir}/ntp.conf + # remove the temp file + rm -f %{_sysconfdir}/ntp.conf.rpmupdate + # start ntp if it was running previously + [ $wasrunning -eq 0 ] && service ntpd start > /dev/null 2>&1 +fi %preun -%service_preun ntpd +if [ $1 = 0 ]; then + service ntpd stop > /dev/null 2>&1 + /sbin/chkconfig --del ntpd +fi %postun -%service_postun ntpd +if [ "$1" -ge "1" ]; then + service ntpd condrestart > /dev/null 2>&1 +fi - %files %defattr(-,root,root) %doc html/* NEWS TODO @@ -182,10 +204,11 @@ %{_sbindir}/ntpq %{_sbindir}/ntptime %{_sbindir}/tickadj -%config %{_initrddir}/ntpd +%config %{_sysconfdir}/rc.d/init.d/ntpd %config(noreplace) %{_sysconfdir}/sysconfig/ntpd %config(noreplace) %{_sysconfdir}/ntp.conf %dir %{_sysconfdir}/ntp +%config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/ntp/step-tickers %config(noreplace) %{_sysconfdir}/ntp/keys %dir %attr(-,ntp,ntp) %{_var}/lib/ntp %config(noreplace) %attr(644,ntp,ntp) %verify(not md5 size mtime) %{_var}/lib/ntp/drift @@ -194,6 +217,9 @@ %changelog +* Tue Jun 15 2004 Elliot Lee +- rebuilt + * Thu Mar 11 2004 Harald Hoyer - 4.2.0-7 - ntpgenkey fixed (117378) - fixed initscript to call ntpdate with -U (117894) From svn at tinysofa.org Thu Jul 1 15:53:46 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:53:46 +1000 (EST) Subject: [tinysofa-svn] r2825 - in tinysofa/snapshot/psacct/current: sources specs Message-ID: <20040701155346.62D2A4E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:53:46 +1000 (Fri, 02 Jul 2004) New Revision: 2825 Added: tinysofa/snapshot/psacct/current/sources/acct-6.3.2-config.patch tinysofa/snapshot/psacct/current/sources/acct-6.3.2-exit.patch tinysofa/snapshot/psacct/current/sources/psacct-6.3.2-64bit-fixes.patch tinysofa/snapshot/psacct/current/sources/psacct.init Removed: tinysofa/snapshot/psacct/current/sources/psacct.logrotate Modified: tinysofa/snapshot/psacct/current/specs/psacct.spec Log: - Sync with 2.0. - Kept: - acct-6.3.2.tar.gz: - Added: - acct-6.3.2-config.patch: - acct-6.3.2-exit.patch: - psacct-6.3.2-64bit-fixes.patch: - psacct.init: - Removed: - psacct.logrotate: Added: tinysofa/snapshot/psacct/current/sources/acct-6.3.2-config.patch =================================================================== --- tinysofa/snapshot/psacct/current/sources/acct-6.3.2-config.patch 2004-07-01 15:53:44 UTC (rev 2824) +++ tinysofa/snapshot/psacct/current/sources/acct-6.3.2-config.patch 2004-07-01 15:53:46 UTC (rev 2825) @@ -0,0 +1,29 @@ +--- configure.in.sopwith Tue Mar 10 13:09:45 1998 ++++ configure.in Thu Feb 3 13:50:40 2000 +@@ -167,7 +167,7 @@ + + #ifndef ACCT_FILE + # if defined(__FreeBSD__) || defined(__linux__) +-# define ACCT_FILE "/var/account/pacct" ++# define ACCT_FILE "/var/log/pacct" + # else + # if defined(__NetBSD__) + # define ACCT_FILE "/var/account/acct" +@@ -187,7 +187,7 @@ + + #ifndef SAVACCT_FILE + # if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__linux__) +-# define SAVACCT_FILE "/var/account/savacct" ++# define SAVACCT_FILE "/var/log/savacct" + # else + # if defined(sun) || defined(AMIX) + # define SAVACCT_FILE "/var/adm/savacct" +@@ -203,7 +203,7 @@ + + #ifndef USRACCT_FILE + # if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__linux__) +-# define USRACCT_FILE "/var/account/usracct" ++# define USRACCT_FILE "/var/log/usracct" + # else + # if defined(sun) || defined(AMIX) + # define USRACCT_FILE "/var/adm/usracct" Added: tinysofa/snapshot/psacct/current/sources/acct-6.3.2-exit.patch =================================================================== --- tinysofa/snapshot/psacct/current/sources/acct-6.3.2-exit.patch 2004-07-01 15:53:44 UTC (rev 2824) +++ tinysofa/snapshot/psacct/current/sources/acct-6.3.2-exit.patch 2004-07-01 15:53:46 UTC (rev 2825) @@ -0,0 +1,11 @@ +--- acct-6.3.2/accton.c.exit Sat Sep 1 22:21:41 2001 ++++ acct-6.3.2/accton.c Sat Sep 1 22:23:36 2001 +@@ -108,7 +108,7 @@ + acct_file = argv[optind]; + } + +- if (acct (acct_file) == -1) ++ if (acct (acct_file) == -1 && errno != ENOSYS) + { + int err; + extern int errno; Added: tinysofa/snapshot/psacct/current/sources/psacct-6.3.2-64bit-fixes.patch =================================================================== --- tinysofa/snapshot/psacct/current/sources/psacct-6.3.2-64bit-fixes.patch 2004-07-01 15:53:44 UTC (rev 2824) +++ tinysofa/snapshot/psacct/current/sources/psacct-6.3.2-64bit-fixes.patch 2004-07-01 15:53:46 UTC (rev 2825) @@ -0,0 +1,46 @@ +--- ./lastcomm.c.64bit-fixes Mon Oct 13 20:28:36 1997 ++++ ./lastcomm.c Thu Mar 7 06:56:00 2002 +@@ -238,6 +238,7 @@ + parse_entries (void) + { + struct acct *rec; /* the current record */ ++ time_t btime; /* Fix for call to ctime for 64bit architectures */ + + /* loop while there are entries to be had */ + +@@ -313,11 +314,12 @@ + else + #endif + putchar (' '); +- ++ ++ btime = (time_t) rec->ac_btime; + printf (" %-8.8s %-8.8s %6.2f secs %-16.16s\n", + this_uid, this_dev, + ((ut + st) / (double) AHZ), +- ctime (&rec->ac_btime)); ++ ctime (&btime)); + } + } + } +--- ./pacct_rd.c.64bit-fixes Mon Oct 13 20:28:36 1997 ++++ ./pacct_rd.c Thu Mar 7 06:54:34 2002 +@@ -61,6 +61,9 @@ + void + print_pacct_record (struct acct *rec, FILE *out) + { ++ /* Fix for call to ctime for 64bit architectures */ ++ time_t btime = (time_t)rec->ac_btime; ++ + fprintf (stddebug, "%-*.*s|", COMM_LEN, COMM_LEN, rec->ac_comm); + + #define NUM_FORMAT "%6.1f" +@@ -117,7 +120,7 @@ + ); + #endif + +- fprintf (stddebug, "%s", ctime ((time_t *) &(rec->ac_btime))); ++ fprintf (stddebug, "%s", ctime (&btime)); + } + + Added: tinysofa/snapshot/psacct/current/sources/psacct.init =================================================================== --- tinysofa/snapshot/psacct/current/sources/psacct.init 2004-07-01 15:53:44 UTC (rev 2824) +++ tinysofa/snapshot/psacct/current/sources/psacct.init 2004-07-01 15:53:46 UTC (rev 2825) @@ -0,0 +1,53 @@ +#!/bin/bash +# +# psacct Script to control kernel process accounting +# +# Author: Mike A. Harris +# +# chkconfig: - 90 10 +# description: Starts and stops process accounting + +# Source function library. +. /etc/init.d/functions + +# The location of the accounting file +ACCTFILE=/var/account/pacct + +start() { + [ ! -r $ACCTFILE ] && touch $ACCTFILE && chmod 600 $ACCTFILE + action $"Starting process accounting: " /sbin/accton $ACCTFILE + touch /var/lock/subsys/psacct +} + +stop() { + action $"Shutting down process accounting: " /sbin/accton + rm -f /var/lock/subsys/psacct +} +# See how we were called. +case "$1" in + start) + start + ;; + stop) + stop + ;; + status) + if [ -e /var/lock/subsys/psacct ]; then + echo $"Process accounting is enabled." + else + echo $"Process accounting is disabled." + fi + ;; + restart|reload) + stop + start + ;; + *) + # do not advertise unreasonable commands that there is no reason + # to use with this device + echo $"Usage: $0 {start|stop|status|restart|reload}" + exit 1 +esac + +exit 0 + Property changes on: tinysofa/snapshot/psacct/current/sources/psacct.init ___________________________________________________________________ Name: svn:executable + * Deleted: tinysofa/snapshot/psacct/current/sources/psacct.logrotate =================================================================== --- tinysofa/snapshot/psacct/current/sources/psacct.logrotate 2004-07-01 15:53:44 UTC (rev 2824) +++ tinysofa/snapshot/psacct/current/sources/psacct.logrotate 2004-07-01 15:53:46 UTC (rev 2825) @@ -1,24 +0,0 @@ -/var/log/pacct { - weekly - delaycompress - notifempty - missingok - postrotate - /sbin/accton /var/log/pacct - endscript -} - -/var/log/usracct { - weekly - delaycompress - notifempty - missingok -} - -/var/log/savacct { - weekly - delaycompress - notifempty - missingok -} - Modified: tinysofa/snapshot/psacct/current/specs/psacct.spec =================================================================== --- tinysofa/snapshot/psacct/current/specs/psacct.spec 2004-07-01 15:53:44 UTC (rev 2824) +++ tinysofa/snapshot/psacct/current/specs/psacct.spec 2004-07-01 15:53:46 UTC (rev 2825) @@ -1,108 +1,263 @@ +# Our /usr/bin/last is in the SysVInit packae +%define with_last 0 + +%define FHS_compliant 1 + +%if %{FHS_compliant} +%define accounting_logdir /var/account +%else +%define accounting_logdir /var/log +%endif + Summary: Utilities for monitoring process activities. Name: psacct Version: 6.3.2 -Release: 8ts +Release: 29ts License: GPL -Group: tinysofa official -Source: ftp://ftp.gnu.org/gnu/acct/acct-%{version}.tar.gz -Source1: psacct.logrotate -BuildRoot: %{_tmppath}/%{name}-root -Requires: logrotate +Group: Applications/System +Source: ftp://ftp.gnu.org/pub/gnu/acct-6.3.2.tar.gz +Source1: psacct.init +# This dumb patch breaks FHS 2.2 compliance, so it is disabled now except +# in 7.x builds. Do not use it in new products. +Patch0: acct-6.3.2-config.patch +Patch1: acct-6.3.2-exit.patch +# Fixes some broken calls to ctime() on 64bit arch's +Patch2: psacct-6.3.2-64bit-fixes.patch +Buildroot: %{_tmppath}/%{name}-%{version}-root +Prereq: /sbin/install-info +BuildRequires: autoconf + +# This conflict is to avoid psacct being forced on by old initscripts now that +# we have a proper initscript in place. initscripts 6.55 and later are fixed. +Conflicts: initscripts < 6.55 + %description The psacct package contains several utilities for monitoring process -activities, including ac, lastcomm, accton and sa. The ac command -displays statistics about how long users have been logged on. The -lastcomm command displays information about previous executed commands. -The accton command turns process accounting on or off. The sa command -summarizes information about previously executed commmands. +activities, including ac, lastcomm, accton and sa. The ac command +displays statistics about how long users have been logged on. The +lastcomm command displays information about previous executed +commands. The accton command turns process accounting on or off. The +sa command summarizes information about previously executed +commmands. -Install the psacct package if you'd like to use its utilities for -monitoring process activities on your system. - %prep %setup -q -n acct-%{version} +%if ! %{FHS_compliant} +%patch0 -p0 -b .config +%endif +%patch1 -p1 -b .psacct-exit +%patch2 -p0 -b .64bit-fixes + %build -./configure --prefix=%{_prefix} \ - --mandir=%{_mandir} +%if ! %{FHS_compliant} +autoconf +%endif + +%configure sed -e "s/\/\* #undef HAVE_LINUX_ACCT_H \*\//#define HAVE_LINUX_ACCT_H/" config.h > config.h.new mv -f config.h.new config.h - +touch texinfo.tex make %install -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != "/" ] && rm -rf "$RPM_BUILD_ROOT" -mkdir -p $RPM_BUILD_ROOT/{sbin,usr/share/man/man{1,8},var/log,etc/logrotate.d} +[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT +mkdir -p $RPM_BUILD_ROOT{/sbin,%{_bindir},%{_mandir},%{_sbindir}} +%{makeinstall} -make prefix=$RPM_BUILD_ROOT/usr mandir=$RPM_BUILD_ROOT%{_mandir} install -install -m 644 $RPM_SOURCE_DIR/psacct.logrotate $RPM_BUILD_ROOT/etc/logrotate.d/psacct - -( cd $RPM_BUILD_ROOT # move accton to /sbin -- leave historical symlink - mv ./usr/sbin/accton ./sbin/accton - ln -s ../../sbin/accton ./usr/sbin/accton +mv $RPM_BUILD_ROOT%{_sbindir}/accton $RPM_BUILD_ROOT/sbin/accton +ln -s ../../sbin/accton $RPM_BUILD_ROOT%{_sbindir}/accton - :> ./var/log/pacct - :> ./var/log/usracct - :> ./var/log/savacct -) +gzip -9f $RPM_BUILD_ROOT%{_infodir}/* +mkdir -p $RPM_BUILD_ROOT%{accounting_logdir} +touch $RPM_BUILD_ROOT%{accounting_logdir}/pacct -rm -rf $RPM_BUILD_ROOT/usr/info +# Create logrotate config file +mkdir -p $RPM_BUILD_ROOT/etc/logrotate.d +cat > $RPM_BUILD_ROOT/etc/logrotate.d/psacct < /etc/info-dir.new + mv -f /etc/info-dir.new /etc/info-dir + } + /sbin/install-info %{_infodir}/accounting.info.gz %{_infodir}/dir --entry="* accounting: (accounting). The GNU Process Accounting Suite." +fi + +%preun +if [ $1 = 0 ]; then + /sbin/install-info --delete %{_infodir}/accounting.info.gz %{_infodir}/dir --entry="* accounting: (accounting). The GNU Process Accounting Suite." 2>/dev/null + /sbin/chkconfig --del psacct +fi + %files %defattr(-,root,root) -%attr(0600,root,root) %config /var/log/pacct -%attr(0600,root,root) %config /var/log/usracct -%attr(0600,root,root) %config /var/log/savacct -%attr(0644,root,root) %config /etc/logrotate.d/psacct +%if %{FHS_compliant} +%dir /var/account +%endif +/etc/rc.d/init.d/psacct +%attr(0600,root,root) %config %{accounting_logdir}/pacct +%attr(0644,root,root) %config(noreplace) /etc/logrotate.d/* /sbin/accton -/usr/sbin/accton -/usr/sbin/sa -/usr/sbin/dump-utmp -/usr/sbin/dump-acct -/usr/bin/ac -/usr/bin/lastcomm -/usr/share/man/man1/ac.1* -/usr/share/man/man1/lastcomm.1* -/usr/share/man/man8/sa.8* -/usr/share/man/man8/accton.8* +%{_sbindir}/accton +%{_sbindir}/sa +%{_sbindir}/dump-utmp +%{_sbindir}/dump-acct +%{_bindir}/ac +%if %{with_last} +%{_bindir}/last +%endif +%{_bindir}/lastcomm +%{_mandir}/man1/ac.1* +%if %{with_last} +%{_mandir}/man1/last.1* +%endif +%{_mandir}/man1/lastcomm.1* +%{_mandir}/man8/sa.8* +%{_mandir}/man8/accton.8* +%{_infodir}/accounting.info.gz -%exclude /usr/bin/last -%exclude %{_mandir}/man1/last.1* +%changelog +* Fri Feb 13 2004 Elliot Lee +- rebuilt +* Wed Jun 04 2003 Elliot Lee +- rebuilt -%changelog -* Wed May 19 2004 tsintegrate 6.3.2-8ts -- current (6.3.2-7ts) integrated as 6.3.2-8ts for release 1.0-U1 +* Wed Jan 22 2003 Tim Powers +- rebuilt -* Mon Dec 15 2003 Erlend Midttun 6.3.2-4tr -- Big rebuild +* Thu Dec 26 2002 Florian La Roche +- make /etc/info-dir an optional file -* Wed Jun 18 2003 Erlend Midttun 6.3.2-3tr -- Big rebuild +* Wed Nov 13 2002 Mike A. Harris 6.3.2-25 +- Added with_last conditional to disable /usr/bin/last because ours is in + the SysVInit package. This fixes unpackaged files terminate build prob. -* Mon Mar 24 2003 Erlend Midttun 6.3.2-2em -- Rebuilt against glibc 2.3.2. +* Thu Aug 22 2002 Mike A. Harris 6.3.2-24 +- Fixed initscript reload/restart by creating start/stop functions and + making everything use them (#72261) -* Tue Aug 13 2002 Christian H. Toldnes 6.3.2-1ct -- New upstream version -- Removed info stuff. -- Removed patch 0 (obsolete) -- No autoconf usage. +* Tue Aug 6 2002 Mike A. Harris 6.3.2-23 +- Fixed chkconfig issue in rpm scripts (#61191) +- Excludearch ia64, not taking the time to debug/troubleshoot random + buildsystem failure due to higher priorities. -* Wed Jul 24 2002 Daniel Meyer 6.3-15dm -- rebuild for Trustix Secure Linux 2.0 +* Mon Jul 08 2002 Elliot Lee +- Take the time to make sure things get through on all archs, by simply + running it through the build system. -* Wed Dec 20 2000 Oystein Viggen -- Fixed the logrotate script +* Fri Jun 21 2002 Tim Powers +- automated rebuild -* Tue Jan 25 2000 Tore Olsen -- moved /usr/man and /usr/info to /usr/share/* for FHS compliance +* Thu May 23 2002 Tim Powers +- automated rebuild +* Tue Mar 27 2002 Mike A. Harris 6.3.2-19 +- Made initscript touch/chmod accounting file if it is not present during + startup, to ensure accounting works properly when enabled. + +* Mon Mar 26 2002 Mike A. Harris 6.3.2-18 +- Fixed duh in initscript pointing to wrong accounting file (#61939) + +* Sun Mar 17 2002 Mike A. Harris 6.3.2-17 +- Removed the files usracct and savacct, which are not used by psacct + utilities at all, but by the sa program. Our sa uses files in a different + location, and so these files are unused and unnecessary. + +* Sat Mar 16 2002 Mike A. Harris 6.3.2-16 +- Added chkconfig to post and preun scripts for bug (#61191) + +* Tue Mar 12 2002 Mike A. Harris 6.3.2-15 +- Added new feature - psacct initscript now controls process accounting so + that it is not just forced on if installed as was the previous behaviour +- Modified the initscripts package to not force psacct on anymore and made + the new psacct-6.3.2-15 conflict with previous initscripts packages. +- Fixed logrotate config to set perms/owner of new log files, and closed + bug (#54165) + +* Thu Mar 7 2002 Mike A. Harris 6.3.2-14 +- Fixed 64bit bug in calls to ctime() in lastcomm and dump-utmp (#60712) + +* Wed Mar 6 2002 Mike A. Harris 6.3.2-13 +- Removed Build_7x flag, added FHS_compliant flag, reworked specfile to use new + flag, and fixed bug (#60716) + +* Thu Feb 28 2002 Bill Nottingham 6.3.2-12 +- rebuild in new environment for FHS correctness + +* Thu Jan 31 2002 Mike A. Harris 6.3.2-11 +- Conditionalized acct-6.3.2-config.patch to only be applied for RHL 7.x + builds, as it breaks FHS compliance by putting files in nonstandard + locations. Also fixed up other places in specfile for FHS 2.2. +- Added acct-6.3.2-I-HATE-GNU-AUTOCONK.patch because I hate GNU autoconk + really really badly. + +- Bumped to -11 to avoid buildsystem stupidness + +* Thu Sep 06 2001 Mike A. Harris 6.3.2-9 +- Fixed bug (#53307) psacct is enabled by default, and the log files + are huge, and will fill the disk up very quickly. logrotate will + now compress them daily. + +* Sat Sep 01 2001 Florian La Roche 6.3.2-8 +- do not fail for ENOSYS to silently support kernels without + process accounting + +* Sun Aug 26 2001 Mike A. Harris 6.3.2-7 +- Change spec tag Copyright -> License +- change logrotate to rotate daily, and keep 1 month (31 days) of data + +* Sun Jun 24 2001 Elliot Lee +- Bump release + rebuild. + +* Mon Feb 02 2001 Helge Deller +- added logrotate file for /var/log/pacct (#24900) + +* Wed Jul 12 2000 Prospector +- automatic rebuild + +* Mon Jun 5 2000 Nalin Dahyabhai +- FHS fixes + +* Sat May 6 2000 Bill Nottingham +- fix for new patch + +* Thu Feb 03 2000 Nalin Dahyabhai +- update to 6.3.2 + * Mon Apr 05 1999 Preston Brown - wrap post script with reference count. @@ -128,4 +283,4 @@ - updated from 6.2 to 6.3 * Mon Jul 21 1997 Erik Troan -- built against glibc \ No newline at end of file +- built against glibc From svn at tinysofa.org Thu Jul 1 15:54:38 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:54:38 +1000 (EST) Subject: [tinysofa-svn] r2836 - in tinysofa/snapshot/screen/current: sources specs Message-ID: <20040701155438.44E4B4E817E@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:54:38 +1000 (Fri, 02 Jul 2004) New Revision: 2836 Added: tinysofa/snapshot/screen/current/sources/screen-4.0.2-logname.patch tinysofa/snapshot/screen/current/sources/screen.pam Removed: tinysofa/snapshot/screen/current/sources/screen.pamd Modified: tinysofa/snapshot/screen/current/sources/screen-4.0.1-etcscreenrc.patch tinysofa/snapshot/screen/current/specs/screen.spec Log: - Sync with 2.0. - Kept: - screen-3.9.11-no-stripping-or-elf.patch: - screen-3.9.11-utf8-install.patch: - screen-3.9.13-ia64.patch: - screen-3.9.15-home-screendir.patch: - screen-4.0.1-args.patch: - screen-4.0.1-etcscreenrc.patch: - screen-4.0.1-screenrc.patch: - screen-4.0.2.tar.gz: - Added: - screen-4.0.2-logname.patch: - screen.pam: - Removed: - screen.pamd: Modified: tinysofa/snapshot/screen/current/sources/screen-4.0.1-etcscreenrc.patch =================================================================== --- tinysofa/snapshot/screen/current/sources/screen-4.0.1-etcscreenrc.patch 2004-07-01 15:54:34 UTC (rev 2835) +++ tinysofa/snapshot/screen/current/sources/screen-4.0.1-etcscreenrc.patch 2004-07-01 15:54:38 UTC (rev 2836) @@ -1,19 +1,26 @@ -diff -urN screen-4.0.2/etc/etcscreenrc screen-4.0.2.etcscreenrc/etc/etcscreenrc ---- screen-4.0.2/etc/etcscreenrc 2003-12-06 00:46:13.000000000 +1100 -+++ screen-4.0.2.etcscreenrc/etc/etcscreenrc 2004-04-05 03:30:52.000000000 +1000 -@@ -82,11 +82,11 @@ +--- screen-4.0.1/etc/etcscreenrc 2001-04-28 11:25:34.000000000 -0400 ++++ screen-4.0.1-lhh/etc/etcscreenrc 2003-12-04 21:27:34.000000000 -0500 +@@ -81,14 +81,17 @@ + termcap wy75-42 nx:xo:Z0=\E[?3h\E[31h:Z1=\E[?3l\E[31h terminfo wy75-42 nx:xo:Z0=\E[?3h\E[31h:Z1=\E[?3l\E[31h - #remove some stupid / dangerous key bindings --bind ^k --#bind L --bind ^\ -+#bind ^k -+bind L -+#bind ^\ - #make them better --bind \\ quit -+#bind \\ quit - bind K kill - bind I login on - bind O login off +-#remove some stupid / dangerous key bindings +-bind '^k' +-#bind 'L' +-bind '^\' +-#make them better +-bind '\\' quit ++# remove some stupid / dangerous key bindings ++# ++#bind '^k' # lhh - causes error when screen 4.0.1 starts ++bind 'L' ++#bind '^\' # lhh - causes error when screen 4.0.1 starts ++ ++# make them better ++# ++#bind '\\' quit # lhh - causes error when screen 4.0.1 starts + bind 'K' kill + bind 'I' login on + bind 'O' login off + bind '}' history + Added: tinysofa/snapshot/screen/current/sources/screen-4.0.2-logname.patch =================================================================== --- tinysofa/snapshot/screen/current/sources/screen-4.0.2-logname.patch 2004-07-01 15:54:34 UTC (rev 2835) +++ tinysofa/snapshot/screen/current/sources/screen-4.0.2-logname.patch 2004-07-01 15:54:38 UTC (rev 2836) @@ -0,0 +1,20 @@ +diff -rcN screen-4.0.2,orig/etc/screenrc screen-4.0.2/etc/screenrc +*** screen-4.0.2,orig/etc/screenrc Fri Dec 5 08:59:39 2003 +--- screen-4.0.2/etc/screenrc Wed Apr 28 18:38:58 2004 +*************** +*** 15,21 **** + startup_message off + + # emulate .logout message +! pow_detach_msg "Screen session of \$LOGNAME \$:cr:\$:nl:ended." + + # advertise hardstatus support to $TERMCAP + # termcapinfo * '' 'hs:ts=\E_:fs=\E\\:ds=\E_\E\\' +--- 15,21 ---- + startup_message off + + # emulate .logout message +! pow_detach_msg "Screen session of $LOGNAME $:cr:$:nl:ended." + + # advertise hardstatus support to $TERMCAP + # termcapinfo * '' 'hs:ts=\E_:fs=\E\\:ds=\E_\E\\' Added: tinysofa/snapshot/screen/current/sources/screen.pam =================================================================== --- tinysofa/snapshot/screen/current/sources/screen.pam 2004-07-01 15:54:34 UTC (rev 2835) +++ tinysofa/snapshot/screen/current/sources/screen.pam 2004-07-01 15:54:38 UTC (rev 2836) @@ -0,0 +1,2 @@ +#%PAM-1.0 +auth required pam_stack.so service=system-auth Deleted: tinysofa/snapshot/screen/current/sources/screen.pamd =================================================================== --- tinysofa/snapshot/screen/current/sources/screen.pamd 2004-07-01 15:54:34 UTC (rev 2835) +++ tinysofa/snapshot/screen/current/sources/screen.pamd 2004-07-01 15:54:38 UTC (rev 2836) @@ -1,2 +0,0 @@ -#%PAM-1.0 -auth required pam_stack.so service=system-auth Modified: tinysofa/snapshot/screen/current/specs/screen.spec =================================================================== --- tinysofa/snapshot/screen/current/specs/screen.spec 2004-07-01 15:54:34 UTC (rev 2835) +++ tinysofa/snapshot/screen/current/specs/screen.spec 2004-07-01 15:54:38 UTC (rev 2836) @@ -3,12 +3,11 @@ Version: 4.0.2 Release: 3ts License: GPL2 -Group: tinysofa official +Group: Applications/System URL: http://www.gnu.org/software/screen -Prereq: htmlinfo -BuildRoot: %{_tmppath}/%{name}-root -BuildRequires: ncurses-devel texinfo pam-devel -BuildRequires: autoconf libtool +Prereq: /sbin/install-info +BuildRoot: %{_tmppath}/%{name}-%{version}-root +BuildRequires: ncurses-devel texinfo Requires: ncurses # @@ -17,7 +16,7 @@ Source0: ftp://ftp.uni-erlangen.de/pub/utilities/screen/screen-%{version}.tar.gz # Except for the PAM configuration, that is. -Source1: screen.pamd +Source1: screen.pam # Small tweak for ia64 # @@ -49,6 +48,7 @@ # Fixes potential buffer overflow when > 2^31 semicolons are passed. # Patch7: screen-4.0.1-args.patch +Patch8: screen-4.0.2-logname.patch %description The screen utility allows you to have multiple logins on just one @@ -66,9 +66,10 @@ %setup -q %patch1 -p1 -b .ia64 %patch2 -p1 -b .screenrc -%patch3 -p1 -b .etcscreenrc +#%patch3 -p1 -b .etcscreenrc %patch4 -p1 -b .utf8-install %patch5 -p1 -b .no-stripping-or-elf +%patch8 -p1 -b .logname # Uncomment if you want screen to first try to use $HOME/.screens # and subsequently try to use /tmp/S- @@ -79,12 +80,12 @@ # %patch7 -p0 -b .args - -%build libtoolize --copy --force autoconf +%build + %configure \ --enable-pam \ --enable-colors256 \ @@ -117,9 +118,6 @@ CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE" make -# generate HTML docu -cd doc && makeinfo --html --no-split --force %{name}.texinfo || true - %install rm -rf $RPM_BUILD_ROOT @@ -137,55 +135,46 @@ # Better not forget to copy the pam file around # mkdir -p $RPM_BUILD_ROOT/etc/pam.d -install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT/etc/pam.d/screen +install -m 0644 $RPM_SOURCE_DIR/screen.pam $RPM_BUILD_ROOT/etc/pam.d/screen # Remove files from the buildroot which we don't want packaged # rm -f $RPM_BUILD_ROOT/%{_infodir}/dir -cd doc -mkdir -p $RPM_BUILD_ROOT/%{_datadir}/html/%{name} -install %{name}.html $RPM_BUILD_ROOT/%{_datadir}/html/%{name}/ - %clean rm -rf $RPM_BUILD_ROOT %post -/usr/sbin/htmlinfo_update.sh +/sbin/install-info %{_infodir}/screen.info.gz %{_infodir}/dir --entry="* screen: (screen). Terminal multiplexer." -%postun -/usr/sbin/htmlinfo_update.sh +%preun +if [ $1 = 0 ]; then + /sbin/install-info --delete %{_infodir}/screen.info.gz %{_infodir}/dir --entry="* screen: (screen). Terminal multiplexer." +fi + + %files %defattr(-,root,root) %doc NEWS README doc/FAQ doc/README.DOTSCREEN %attr(755,root,root) %{_bindir}/screen %{_mandir}/man1/screen.* +%{_infodir}/screen.info* %{_datadir}/screen/utf8encodings/* %config /etc/screenrc %config /etc/pam.d/screen -%{_datadir}/html/%{name} - -%exclude %{_infodir}/screen.info* - %changelog -* Tue May 25 2004 tsintegrate 4.0.2-3ts -- current (4.0.2-3jh) integrated as 4.0.2-3ts for release 1.0-U1 +* Tue Jun 15 2004 Elliot Lee +- rebuilt -* Tue May 25 2004 Jaakko Heinonen 4.0.2-3jh -- add BuildRequires: pam-devel to fix pam support +* Wed Apr 28 2004 Daniel Reed 4.0.2-2 +- Add patch -logname to correct #121875 -* Wed May 19 2004 tsintegrate 4.0.2-2ts -- current (4.0.2-1ts) integrated as 4.0.2-2ts for release 1.0-U1 +* Mon Apr 05 2004 Daniel Reed 4.0.2-1 +- Version bump (4.0.2) -* Wed May 12 2004 Omar Kilani -- Add BuildRequires: autoconf libtool - -* Mon Apr 05 2004 Omar Kilani 4.0.2-1ts -- Import! - * Fri Feb 13 2004 Elliot Lee - rebuilt From svn at tinysofa.org Thu Jul 1 15:54:40 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:54:40 +1000 (EST) Subject: [tinysofa-svn] r2837 - in tinysofa/snapshot/sed/current: sources specs Message-ID: <20040701155440.C02D74E817F@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:54:40 +1000 (Fri, 02 Jul 2004) New Revision: 2837 Added: tinysofa/snapshot/sed/current/sources/sed-4.1.tar.gz Removed: tinysofa/snapshot/sed/current/sources/sed-4.0.9.tar.gz Modified: tinysofa/snapshot/sed/current/specs/sed.spec Log: - Sync with 2.0. - Added: - sed-4.1.tar.gz: - Removed: - sed-4.0.9.tar.gz: Deleted: tinysofa/snapshot/sed/current/sources/sed-4.0.9.tar.gz =================================================================== (Binary files differ) Added: tinysofa/snapshot/sed/current/sources/sed-4.1.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/sed/current/sources/sed-4.1.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: tinysofa/snapshot/sed/current/specs/sed.spec =================================================================== --- tinysofa/snapshot/sed/current/specs/sed.spec 2004-07-01 15:54:38 UTC (rev 2836) +++ tinysofa/snapshot/sed/current/specs/sed.spec 2004-07-01 15:54:40 UTC (rev 2837) @@ -1,14 +1,19 @@ +%ifos linux +%define _bindir /bin +%endif + Summary: A GNU stream text editor. Name: sed -Version: 4.0.9 -Release: 5ts -License: GPL -Group: tinysofa official -Source0: ftp://ftp.gnu.org/gnu/sed/sed-%{version}.tar.gz -Prereq: htmlinfo -BuildRequires: texinfo +Version: 4.1 +Release: 1ts +Copyright: GPL +Group: Applications/Text +Source0: ftp://ftp.gnu.org/pub/gnu/sed/sed-%{version}.tar.gz +Prereq: /sbin/install-info Prefix: %{_prefix} -BuildRoot: %{_tmppath}/%{name}-root +Buildroot: %{_tmppath}/%{name}-%{version}-root +# Make sure glibc regex has all fixes we need +BuildRequires: glibc >= 2.3.3-27, glibc-devel >= 2.3.3-27 %description The sed (Stream EDitor) editor is a stream or batch (non-interactive) @@ -21,75 +26,111 @@ %setup -q %build -%configure --exec-prefix=%{_prefix} \ - --mandir='%{_mandir}' \ - --bindir=/bin -make LDFLAGS=-s -cd doc -makeinfo --html --no-split sed.texi +%configure --without-included-regex +make %{_smp_mflags} +echo ====================TESTING========================= +make check +echo ====================TESTING END===================== + %install -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != "/" ] && rm -rf "$RPM_BUILD_ROOT" -mkdir -p $RPM_BUILD_ROOT/usr/share/html/sed +rm -rf ${RPM_BUILD_ROOT} -make prefix=$RPM_BUILD_ROOT/%{_prefix} \ - exec_prefix=$RPM_BUILD_ROOT/%{_prefix} \ - DESTDIR=$RPM_BUILD_ROOT install +%makeinstall +rm -f ${RPM_BUILD_ROOT}/%{_infodir}/dir -install -m644 doc/sed.html $RPM_BUILD_ROOT/usr/share/html/sed/ - -( cd $RPM_BUILD_ROOT - mkdir ./bin - mv ./usr/bin/sed ./bin/sed - rmdir ./usr/bin - rm -f ./usr/share/info/dir -) - -rm -rf $RPM_BUILD_ROOT/usr/share/info - %find_lang %{name} %post -/usr/sbin/htmlinfo_update.sh +/sbin/install-info %{_infodir}/sed.info.gz %{_infodir}/dir -%postun -/usr/sbin/htmlinfo_update.sh +%preun +if [ $1 = 0 ]; then + /sbin/install-info --delete %{_infodir}/sed.info.gz %{_infodir}/dir +fi %clean -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT +rm -rf ${RPM_BUILD_ROOT} %files -f %{name}.lang %defattr(-,root,root) -%doc BUGS NEWS README THANKS -/bin/sed -/usr/share/html/sed -/usr/share/man/man1/sed.1* +%doc BUGS NEWS THANKS README AUTHORS +%{_bindir}/sed +%{_infodir}/*.info* +%{_mandir}/man*/* %changelog -* Wed May 19 2004 tsintegrate 4.0.9-5ts -- current (4.0.9-4ts) integrated as 4.0.9-5ts for release 1.0-U1 +* Tue Jun 15 2004 Elliot Lee +- rebuilt -* Sat Feb 7 2004 Omar Kilani 4.0.9-1ok -- New upstream. +* Tue May 25 2004 Jakub Jelinek 4.0.9-1 +- update to 4.0.9 +- BuildRequire recent glibc and glibc-devel (#123043) -* Mon Dec 8 2003 Erlend Midttun 4.0.8-1tr -- New upstream. +* Fri Feb 13 2004 Elliot Lee +- rebuilt -* Wed Jun 18 2003 Erlend Midttun 3.02-10tr -- Big rebuild +* Wed Jan 7 2004 Jakub Jelinek 4.0.8-3 +- if not -n, print current buffer after N command on the last line + unless POSIXLY_CORRECT (#112952) +- adjust XFAIL_TESTS for the improved glibc regex implementation + (#112642) -* Mon Mar 24 2003 Erlend Midttun 3.02-9em -- Rebuilt against glibc 2.3.2. +* Fri Nov 14 2003 Jakub Jelinek 4.0.8-2 +- enable --without-included-regex again +- use fastmap for regex searching -* Fri Oct 25 2002 Christian H. Toldnes 3.02-8ct -- Replaced info with htmlinfo +* Sat Oct 25 2003 Florian La Roche +- update to 4.0.8 +- simplify specfile +- disable --without-included-regex to pass the testsuite -* Wed Jul 24 2002 Daniel Meyer 3.02-7dm -- rebuild for Trustix Secure Linux 2.0 +* Thu Jun 26 2003 Jakub Jelinek 4.0.7-3 +- rebuilt -* Tue Jan 25 2000 Tore Olsen -- moved /usr/{man,info} to /usr/share/{man,info} for FHS compliance +* Wed Jun 04 2003 Elliot Lee +- rebuilt +* Sat Apr 12 2003 Florian La Roche +- update to 4.0.7 +- use "--without-included-regex" +- do not gzip info pages in spec file, "TODO" is not present anymore + +* Thu Jan 23 2003 Jakub Jelinek 4.0.5-1 +- update to 4.0.5 + +* Tue Oct 22 2002 Jakub Jelinek +- rebuilt to fix x86-64 miscompilation +- run make check in %%build + +* Fri Jun 21 2002 Tim Powers +- automated rebuild + +* Thu May 23 2002 Tim Powers +- automated rebuild + +* Fri Apr 5 2002 Jakub Jelinek +- Remove stale URLs from documentation (#62519) + +* Sun Jun 24 2001 Elliot Lee +- Bump release + rebuild. + +* Mon Dec 18 2000 Yukihiro Nakai +- Update to 2000.11.28 patch +- Rebuild for 7.1 tree + +* Wed Jul 12 2000 Prospector +- automatic rebuild + +* Mon Jun 5 2000 Jeff Johnson +- FHS packaging. + +* Mon Feb 7 2000 Jeff Johnson +- compress man pages. + +* Tue Jan 18 2000 Jakub Jelinek +- rebuild with glibc 2.1.3 to fix an mmap64 bug in sys/mman.h + * Sun Mar 21 1999 Cristian Gafton - auto rebuild in the new build environment (release 4) @@ -110,4 +151,4 @@ - added BuildRoot * Mon Jun 02 1997 Erik Troan -- built against glibc \ No newline at end of file +- built against glibc From svn at tinysofa.org Thu Jul 1 15:54:53 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:54:53 +1000 (EST) Subject: [tinysofa-svn] r2840 - in tinysofa/snapshot/sharutils/current: sources specs Message-ID: <20040701155453.0BCF94E817E@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:54:52 +1000 (Fri, 02 Jul 2004) New Revision: 2840 Added: tinysofa/snapshot/sharutils/current/sources/sharutils-opto.dif Modified: tinysofa/snapshot/sharutils/current/specs/sharutils.spec Log: - Sync with 2.0. - Kept: - sharutils-4.2-gmo.patch: - sharutils-4.2-man.patch: - sharutils-4.2-po.patch: - sharutils-4.2-share.patch: - sharutils-4.2-uudecode.patch: - sharutils-4.2.1-mktemp.patch: - sharutils-4.2.1-uudecode.patch: - sharutils-4.2.1.tar.gz: - Added: - sharutils-opto.dif: Added: tinysofa/snapshot/sharutils/current/sources/sharutils-opto.dif =================================================================== --- tinysofa/snapshot/sharutils/current/sources/sharutils-opto.dif 2004-07-01 15:54:46 UTC (rev 2839) +++ tinysofa/snapshot/sharutils/current/sources/sharutils-opto.dif 2004-07-01 15:54:52 UTC (rev 2840) @@ -0,0 +1,93 @@ +--- ./src/shar.c.orig 2004-04-28 09:33:52.941273149 +0000 ++++ ./src/shar.c 2004-04-28 10:24:16.042020998 +0000 +@@ -211,11 +211,11 @@ + /* Position for first file in the shar file. */ + static long first_file_position; + +-/* Base for output filename. FIXME: No fix limit in GNU... */ +-static char output_base_name[50]; ++/* Base for output filename. */ ++static char *output_base_name; + +-/* Actual output filename. FIXME: No fix limit in GNU... */ +-static char output_filename[50]; ++/* Actual output filename. */ ++static char *output_filename; + + static char *submitter_address = NULL; + +@@ -1651,7 +1651,12 @@ + static void + open_output () + { +- sprintf (output_filename, output_base_name, ++part_number); ++ size_t l; ++ l = strlen(output_base_name) + 128; ++ if (output_filename) ++ free(output_filename); ++ output_filename = xmalloc(l); ++ snprintf(output_filename, l, output_base_name, ++part_number); + output = fopen (output_filename, "w"); + if (!output) + error (EXIT_FAILURE, errno, _("Opening `%s'"), output_filename); +@@ -1789,6 +1794,42 @@ + { NULL, 0, NULL, 0 }, + }; + ++ ++char *parse_output_base_name(char *arg) ++{ ++ int c; ++ int hadarg = 0; ++ char *fmt, *p; ++ ++ for (p = arg ; (c = *p++) != 0; ) ++ { ++ if (c != '%') ++ continue; ++ c = *p++; ++ if (c == '%') ++ continue; ++ if (hadarg) ++ return 0; ++ while (c != 0 && strchr("#0+- 'I", c) != 0) ++ c = *p++; ++ while (c != 0 && c >= '0' && c <= '9') ++ c = *p++; ++ if (c == '.') ++ c = *p++; ++ while (c != 0 && c >= '0' && c <= '9') ++ c = *p++; ++ if (c == 0 || strchr("diouxX", c) == 0) ++ return 0; ++ hadarg = 1; ++ } ++ fmt = xmalloc(strlen(arg) + (hadarg ? 1 : 6)); ++ strcpy(fmt, arg); ++ if (!hadarg) ++ strcat(fmt, ".%02d"); ++ return fmt; ++} ++ ++ + /*---. + | ? | + `---*/ +@@ -1923,9 +1964,14 @@ + break; + + case 'o': +- strcpy (output_base_name, optarg); +- if (!strchr (output_base_name, '%')) +- strcat (output_base_name, ".%02d"); ++ if (output_base_name) ++ free (output_base_name); ++ output_base_name = parse_output_base_name(optarg); ++ if (!output_base_name) ++ { ++ fprintf (stderr, _("illegal output prefix\n")); ++ exit (EXIT_FAILURE); ++ } + part_number = 0; + open_output (); + break; Modified: tinysofa/snapshot/sharutils/current/specs/sharutils.spec =================================================================== --- tinysofa/snapshot/sharutils/current/specs/sharutils.spec 2004-07-01 15:54:46 UTC (rev 2839) +++ tinysofa/snapshot/sharutils/current/specs/sharutils.spec 2004-07-01 15:54:52 UTC (rev 2840) @@ -1,9 +1,9 @@ Summary: The GNU shar utilities for packaging and unpackaging shell archives. Name: sharutils Version: 4.2.1 -Release: 20ts +Release: 19ts License: GPL -Group: tinysofa official +Group: Applications/Archiving Source: ftp://prep.ai.mit.edu/pub/gnu/sharutils/sharutils-%{version}.tar.gz Patch1: sharutils-4.2-gmo.patch Patch2: sharutils-4.2-man.patch @@ -12,10 +12,10 @@ Patch5: sharutils-4.2-uudecode.patch Patch6: sharutils-4.2.1-mktemp.patch Patch7: sharutils-4.2.1-uudecode.patch -BuildRoot: %{_tmppath}/%{name}-root +Patch8: sharutils-opto.dif +Prereq: /sbin/install-info +Buildroot: %{_tmppath}/%{name}-%{version}-root -BuildRequires: gettext - %description The sharutils package contains the GNU shar utilities, a set of tools for encoding and decoding packages of files (in binary or text format) @@ -40,6 +40,7 @@ %patch5 -p1 %patch6 -p1 %patch7 -p1 +%patch8 -p0 -b .ooption %build %configure @@ -49,23 +50,21 @@ rm -rf ${RPM_BUILD_ROOT} %makeinstall install-man -#gzip -9nf ${RPM_BUILD_ROOT}%{_infodir}/{sharutils*,remsync*} +gzip -9nf ${RPM_BUILD_ROOT}%{_infodir}/{sharutils*,remsync*} # fix jp location mv ${RPM_BUILD_ROOT}%{_datadir}/locale/ja_JP.EUC \ ${RPM_BUILD_ROOT}%{_datadir}/locale/ja -rm -rf $RPM_BUILD_ROOT/usr/share/info - %find_lang %{name} %post -#/sbin/install-info %{_infodir}/sharutils.info.gz %{_infodir}/dir ||: +/sbin/install-info %{_infodir}/sharutils.info.gz %{_infodir}/dir ||: %preun -#if [ $1 = 0 ]; then -# /sbin/install-info --delete %{_infodir}/sharutils.info.gz %{_infodir}/dir ||: -#fi +if [ $1 = 0 ]; then + /sbin/install-info --delete %{_infodir}/sharutils.info.gz %{_infodir}/dir ||: +fi %clean rm -rf ${RPM_BUILD_ROOT} @@ -73,20 +72,13 @@ %files -f %{name}.lang %defattr(-,root,root) %{_bindir}/* -#%{_infodir}/*info* +%{_infodir}/*info* %{_mandir}/*/* %changelog -* Wed May 19 2004 tsintegrate 4.2.1-20ts -- current (4.2.1-19ts) integrated as 4.2.1-20ts for release 1.0-U1 +* Fri May 21 2004 Than Ngo 4.2.1-19 +- add suse patch, which fixes buffer overflow in handling of -o option, #123230 -* Wed May 12 2004 Omar Kilani -- Add BuildRequires gettext - -* Fri Mar 26 2004 Omar Kilani 4.2.1-19ts -- tinysofaise. -- nuke info pages. - * Fri Feb 13 2004 Elliot Lee - rebuilt @@ -171,3 +163,4 @@ * Fri Jul 18 1997 Erik Troan - built against glibc + From svn at tinysofa.org Thu Jul 1 15:54:58 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:54:58 +1000 (EST) Subject: [tinysofa-svn] r2842 - in tinysofa/snapshot/slocate/current: sources specs Message-ID: <20040701155458.C8CAC4E817E@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:54:58 +1000 (Fri, 02 Jul 2004) New Revision: 2842 Added: tinysofa/snapshot/slocate/current/sources/slocate.cron tinysofa/snapshot/slocate/current/sources/updatedb.conf Removed: tinysofa/snapshot/slocate/current/sources/slocate-nicecron.patch tinysofa/snapshot/slocate/current/sources/slocate-updatedb.conf tinysofa/snapshot/slocate/current/sources/slocate-updatedb.sh Modified: tinysofa/snapshot/slocate/current/specs/slocate.spec Log: - Sync with 2.0. - Kept: - slocate-2.5-info.patch: - slocate-2.5-segfault.patch: - slocate-2.6-can-2003-0848.patch: - slocate-2.6-manpage.patch: - slocate-2.6-uchar.patch: - slocate-2.7-fts.patch: - slocate-2.7.tar.gz: - slocate-wht.patch: - Added: - slocate.cron: - updatedb.conf: - Removed: - slocate-nicecron.patch: - slocate-updatedb.conf: - slocate-updatedb.sh: Deleted: tinysofa/snapshot/slocate/current/sources/slocate-nicecron.patch =================================================================== --- tinysofa/snapshot/slocate/current/sources/slocate-nicecron.patch 2004-07-01 15:54:55 UTC (rev 2841) +++ tinysofa/snapshot/slocate/current/sources/slocate-nicecron.patch 2004-07-01 15:54:58 UTC (rev 2842) @@ -1,10 +0,0 @@ ---- slocate.cron.orig 2004-05-18 12:07:40.000000000 +0300 -+++ slocate.cron 2004-05-18 12:08:22.000000000 +0300 -@@ -1,5 +1,7 @@ - #! /bin/sh - -+renice +19 -p $$ > /dev/null 2>&1 -+ - if [ -x /usr/bin/updatedb ] - then - if [ -f /etc/updatedb.conf ] Deleted: tinysofa/snapshot/slocate/current/sources/slocate-updatedb.conf =================================================================== --- tinysofa/snapshot/slocate/current/sources/slocate-updatedb.conf 2004-07-01 15:54:55 UTC (rev 2841) +++ tinysofa/snapshot/slocate/current/sources/slocate-updatedb.conf 2004-07-01 15:54:58 UTC (rev 2842) @@ -1,22 +0,0 @@ -## tinysofa configuration. - -# Where database begin to search. -FROM="/" - -# Which Directory to exclude. -EXCLUDE="/proc,/tmp/,/var/tmp,/usr/tmp,/net,/afs,/mnt" - -# Security level : -# 0 turns security checks off. This will make searchs faster. -# 1 turns security checks on. This is the default. -SECURITY="1" - -# Be verbose or no. -VERBOSE="NO" - -# Where the database is based. -DATABASE="/var/lib/slocate/slocate.db" - - -# Which Filesystem to exclude -FSEXCLUDE="nfs,smbfs,ncpfs,proc,devpts,devfs,supermount" Deleted: tinysofa/snapshot/slocate/current/sources/slocate-updatedb.sh =================================================================== --- tinysofa/snapshot/slocate/current/sources/slocate-updatedb.sh 2004-07-01 15:54:55 UTC (rev 2841) +++ tinysofa/snapshot/slocate/current/sources/slocate-updatedb.sh 2004-07-01 15:54:58 UTC (rev 2842) @@ -1,31 +0,0 @@ -#!/bin/sh -# (c) MandrakeSoft. -# Chmouel Boudjnah -# -# Some small mods by Oystein Viggen - -# -[ -f /etc/updatedb.conf ] && . /etc/updatedb.conf || { - FROM="/" - EXCLUDE="/proc,/tmp/,/var/tmp,/usr/tmp,/net,/afs,/mnt" - SECURITY="1" - VERBOSE="NO" - DATABASE="/var/lib/slocate/slocate.db" - FSEXCLUDE="nfs,smbfs,ncpfs,proc,devpts,devfs,supermount" -} - -/usr/bin/which slocate &> /dev/null || exit 1 - -# -[ "$FROM" = "/" ] && FROM="-u" || FROM="-U $FROM" -[ "$VERBOSE" = "YES" ] && VERBOSE="-v" || VERBOSE="" -[ -n "$LOCATE_PATH" ] && $DATABASE=$LOCATE_PATH -[ -f $DATABASE ] && touch $DATABASE - -# -if [ -f $DATABASE ] -then - slocate $FROM $VERBOSE -l $SECURITY -d $DATABASE -f "$FSEXCLUDE" -e "$EXCLUDE" -else - slocate $FROM $VERBOSE -l $SECURITY -f "$FSEXCLUDE" -e "$EXCLUDE" -fi Added: tinysofa/snapshot/slocate/current/sources/slocate.cron =================================================================== --- tinysofa/snapshot/slocate/current/sources/slocate.cron 2004-07-01 15:54:55 UTC (rev 2841) +++ tinysofa/snapshot/slocate/current/sources/slocate.cron 2004-07-01 15:54:58 UTC (rev 2842) @@ -0,0 +1,4 @@ +#!/bin/sh +. /etc/updatedb.conf +renice +19 -p $$ >/dev/null 2>&1 +/usr/bin/updatedb Property changes on: tinysofa/snapshot/slocate/current/sources/slocate.cron ___________________________________________________________________ Name: svn:executable + * Added: tinysofa/snapshot/slocate/current/sources/updatedb.conf =================================================================== --- tinysofa/snapshot/slocate/current/sources/updatedb.conf 2004-07-01 15:54:55 UTC (rev 2841) +++ tinysofa/snapshot/slocate/current/sources/updatedb.conf 2004-07-01 15:54:58 UTC (rev 2842) @@ -0,0 +1,4 @@ +PRUNEFS="sysfs selinuxfs usbdevfs devpts NFS nfs afs sfs proc smbfs cifs autofs auto iso9660 udf" +PRUNEPATHS="/tmp /usr/tmp /var/tmp /afs /net /sfs /selinux /udev" +export PRUNEFS +export PRUNEPATHS Modified: tinysofa/snapshot/slocate/current/specs/slocate.spec =================================================================== --- tinysofa/snapshot/slocate/current/specs/slocate.spec 2004-07-01 15:54:55 UTC (rev 2841) +++ tinysofa/snapshot/slocate/current/specs/slocate.spec 2004-07-01 15:54:58 UTC (rev 2842) @@ -1,22 +1,22 @@ Summary: Finds files on a system via a central database. Name: slocate Version: 2.7 -Release: 9jh -License: GPL -Group: tinysofa/main -Source: ftp://ftp.geekreview.org/slocate/src/%{name}-%{version}.tar.gz -Source3: slocate-updatedb.conf -Source4: slocate-updatedb.sh -Patch0: slocate-nicecron.patch +Release: 11ts +Copyright: GPL +Group: Applications/File +Source: ftp://ftp.geekreview.org/slocate/slocate-%{version}.tar.gz +Source1: slocate.cron +Source2: updatedb.conf +Patch0: slocate-2.5-info.patch Patch1: slocate-wht.patch -Patch2: slocate-2.5-info.patch -Patch3: slocate-2.6-can-2003-0848.patch -Patch4: slocate-2.6-manpage.patch +Patch2: slocate-2.5-segfault.patch +Patch3: slocate-2.6-manpage.patch +#Patch4: slocate-2.6-segfault.patch Patch5: slocate-2.6-uchar.patch -Patch6: slocate-2.7-fts.patch -%accoutman_requires -BuildRoot: %{_tmppath}/%{name}-%{version}-root -BuildRequires: autoconf automake libtool +Patch6: slocate-2.6-can-2003-0848.patch +Patch7: slocate-2.7-fts.patch +Prereq: shadow-utils +Buildroot: %{_tmppath}/%{name}-%{version}-root %description Slocate is a security-enhanced version of locate. Just like locate, @@ -26,222 +26,212 @@ %prep %setup -q - +%patch0 -p1 -b .info +%patch1 -p1 -b .wht +%patch2 -p1 -b .segv +#%patch4 -p1 -b .segv2 +%patch5 -p1 -b .uchar +%patch6 -p1 -b .dropit +%patch7 -p1 -b .fts +# *sigh* gunzip doc/*.gz +%patch3 -p1 -b .manpage -%patch0 -p0 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 - %build autoreconf -f -i -CFLAGS="$RPM_OPT_FLAGS -fsigned-char -D_GNU_SOURCE=1 -D_FILE_OFFSET_BITS=64" \ -%configure -%make +CFLAGS="$RPM_OPT_FLAGS -fsigned-char -D_GNU_SOURCE=1 -D_FILE_OFFSET_BITS=64" %configure +make %install -%{__mkdir_p} %{buildroot}%{_bindir} \ - %{buildroot}%{_mandir}/man1 \ - %{buildroot}%{_sysconfdir}/cron.daily \ - %{buildroot}%{_localstatedir}/lib/slocate +mkdir -p $RPM_BUILD_ROOT/usr/bin +mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1 +mkdir -p $RPM_BUILD_ROOT/etc/cron.daily +mkdir -p $RPM_BUILD_ROOT/var/lib/slocate +install slocate $RPM_BUILD_ROOT/usr/bin +ln -sf slocate $RPM_BUILD_ROOT/usr/bin/locate +install doc/slocate.1.linux $RPM_BUILD_ROOT%{_mandir}/man1/slocate.1 +install doc/updatedb.1 $RPM_BUILD_ROOT%{_mandir}/man1 +ln -sf slocate.1 $RPM_BUILD_ROOT%{_mandir}/man1/locate.1 +install %{SOURCE1} $RPM_BUILD_ROOT/etc/cron.daily +ln -sf slocate $RPM_BUILD_ROOT/usr/bin/updatedb -install -m 755 slocate %{buildroot}%{_bindir} -ln -sf slocate %{buildroot}%{_bindir}/locate -install doc/slocate.1.linux %{buildroot}%{_mandir}/man1/slocate.1 -install doc/updatedb.1 %{buildroot}%{_mandir}/man1 -ln -sf slocate.1 %{buildroot}%{_mandir}/man1/locate.1 -ln -sf slocate %{buildroot}%{_bindir}/updatedb -install -m 755 slocate.cron %{buildroot}%{_sysconfdir}/cron.daily +install %{SOURCE2} $RPM_BUILD_ROOT/etc/ -# our wonderful updatedb wrapper script -install -m644 %{SOURCE3} %{buildroot}%{_sysconfdir}/updatedb.conf -rm -f %{buildroot}%{_bindir}/updatedb -install -m755 %{SOURCE4} %{buildroot}%{_bindir}/updatedb - %clean -%clean_buildroot +rm -rf $RPM_BUILD_ROOT %pre -%groupadd slocate 16 +/usr/sbin/groupadd -g 21 -r -f slocate %preun if [ "$1" = "0" ]; then - db=%{_localstatedir}/lib/slocate/slocate.db - if [ -f "$db" ]; then - rm -f "$db" - fi + /usr/sbin/groupdel slocate + rm -f /var/lib/slocate/slocate.db fi + %files -%defattr(644,root,root,755) -%doc AUTHORS COPYING ChangeLog INSTALL README LICENSE MIRRORS NEWS -%attr(2755,root,slocate) %{_bindir}/*locate -%attr(-,root,root) %{_bindir}/updatedb -%dir %attr(750,root,slocate) %{_localstatedir}/lib/slocate -%config %attr(755,root,root) %{_sysconfdir}/cron.daily/* -%config(noreplace) %{_sysconfdir}/updatedb.conf +%defattr(-,root,root) +%doc ChangeLog INSTALL README LICENSE MIRRORS +%attr(2755,root,slocate) /usr/bin/slocate +%attr(-,root,slocate) /usr/bin/locate +%attr(-,root,slocate) /usr/bin/updatedb %attr(644,root,root) %{_mandir}/man1/* +%attr(755,root,root) /etc/cron.daily/slocate.cron +%attr(644,root,root) %config /etc/updatedb.conf +%dir %attr(750,root,slocate) /var/lib/slocate %changelog -* Sat Jun 5 2004 Jaakko Heinonen 2.7-8jh -- use correct CFLAGS -- integrate changes from Conectiva and Fedora spec files -- use tinysofa macros -- get patches from Fedora +* Tue Jun 15 2004 Elliot Lee +- rebuilt -* Thu May 20 2004 Jaakko Heinonen 2.7-7jh -- fix manual page permissions +* Fri May 21 2004 Bill Nottingham 2.7-10 +- exclude cifs (#122499) -* Thu May 20 2004 tsintegrate 2.7-6ts -- current (2.7-6jh) integrated as 2.7-6ts for release 1.0-U1 +* Fri Apr 16 2004 Karsten Hopp 2.7-9 +- exlude usbdevfs (#113816) -* Wed May 19 2004 Jaakko Heinonen 2.7-6jh -- run updatedb cronjob at high nice level +* Mon Mar 29 2004 Karsten Hopp 2.7-8 +- use included sl_fts.h, fix handling of large files (#105950) +- use one single file to configure updatedb (#112964) -* Wed May 19 2004 tsintegrate 2.7-5ts -- current (2.7-4ts) integrated as 2.7-5ts for release 1.0-U1 +* Fri Feb 13 2004 Elliot Lee +- rebuilt -* Mon May 17 2004 Jaakko Heinonen -- fix non-root build +* Mon Feb 2 2004 Dan Walsh +- Eliminate selinux file systems reads -* Wed May 12 2004 Omar Kilani 2.7-4ts -- Add BuildRequires: autoconf automake libtool +* Wed Jan 21 2004 Mark Cox +- drop privs for non slocate gid databases (CAN-2003-0848) +- update to 2.7 -* Wed Jan 21 2004 Oystein Viggen 2.7-1tr -- New upstream version fixes CAN-2003-0848 -- Corrected ftp url in Source -- Need to rerun autogen.sh, as configure wanted to run "automake-1.4" +* Wed Jun 04 2003 Elliot Lee +- rebuilt -* Thu Jan 15 2004 Chr. Toldnes 2.6-5tr -- Stripped LFS enabling in CFLAGS +* Thu Apr 3 2003 Bill Nottingham 2.6-9 +- initial fix for machines with unsigned char (#86257) -* Wed Jun 18 2003 Erlend Midttun 2.6-4tr -- Big rebuild +* Wed Feb 19 2003 Bill Nottingham 2.6-8 +- add sfs to excludes in updatedb.conf (#54864) -* Mon Mar 24 2003 Erlend Midttun 2.6-3em -- Rebuilt against glibc 2.3.2. +* Fri Jan 24 2003 Bill Nottingham 2.6-7 +- fix another segfault -* Thu Sep 26 2002 Nico Erfurth -- Changed Copyright: to License: -- The new groupadd does not allow the -r option anymore (why?) - changed groupadd to use a fixed GID(16) -- use slocates cronscript instead of our own +* Wed Jan 22 2003 Tim Powers +- rebuilt -* Mon Jun 11 2001 Erlend Midttun -- New upstream version. +* Wed Dec 11 2002 Tim Powers 2.6-5 +- rebuild on all arches -* Tue Mar 6 2001 Oystein Viggen -- update to v2.5 -- removed segv.patch as a similar fix was included upstream. +* Fri Jun 21 2002 Tim Powers +- automated rebuild -* Tue Nov 28 2000 Oystein Viggen -- Update to v2.3 +* Thu May 23 2002 Tim Powers +- automated rebuild -* Wed Jul 19 2000 Oystein Viggen -- Made slocate.cron call updatedb instead of ignoring the nice - config file. -- Made the %pre add a group for slocate, as this is not in the - default group setup of TSL -- Some minor config changes +* Wed Jan 09 2002 Tim Powers +- automated rebuild -* Tue Jul 18 2000 Francis Galiegue 2.2-3mdk +* Mon Jun 11 2001 Bill Nottingham +- update to 2.6 +- fix spelling, etc. in man page (#43251) -- Oops... Really commented out %post this time... -- made %preun always succeed +* Mon Feb 26 2001 Bill Nottingham +- fix another segfault (#29186) +- put the -info patch back in -* Tue Jul 18 2000 Francis Galiegue 2.2-2mdk +* Wed Feb 14 2001 Bill Nottingham +- fix doubly gzipped manpage (#27632) -- 2.2 doesn't like empty databases - touch not prereq'ed anymore -- /etc/updatedb.conf is %config(noreplace) +* Tue Feb 06 2001 Karsten Hopp +- fix bugzilla #26316 (updatedb segfault with large mtab) -* Sat Jul 1 2000 Chmouel Boudjnah 2.2-1mdk -- Remove add/remove/group stuff (move them to the default group from - setup package). -- Macroszification. -- Correct source url. -- 2.2. +* Wed Jan 31 2001 Bill Nottingham +- add renice to cron process (#16317) +- fix slocate-2.5-info.patch (#24519) -* Fri Apr 28 2000 Pixel 2.1-6mdk -- add symlink slocate -> locate (make it be there as it should, aka fix bug in spec) +* Fri Jan 6 2001 Bill Nottingham +- update to 2.5 -* Thu Apr 20 2000 Guillaume Cottenceau 2.1-5mdk -- fixed release tag +* Mon Dec 18 2000 Bill Nottingham +- update to the mysterious 2.4 release -* Mon Jan 3 2000 Chmouel Boudjnah 2.1-4mdk -- Exclude dangerous filesystems by default with updatedb. +* Mon Nov 27 2000 Bill Nottingham +- update to 2.3; fixes database reading problem -* Sun Nov 7 1999 Chmouel Boudjnah +* Wed Aug 23 2000 Than Ngo +- add a default updatedb.conf (Bug #13475) -- Prereq of /bit/touch. +* Wed Aug 23 2000 Jakub Jelinek +- fix build with glibc defining DT_WHT but not defining S_IFWHT. -* Tue Nov 2 1999 Chmouel Boudjnah -- 2.1. +* Sun Jul 23 2000 Nalin Dahyabhai +- don't print a message telling how to rebuild the database if we're + rebuilding the database -* Tue Oct 26 1999 Chmouel Boudjnah -- Build release. +* Wed Jul 12 2000 Prospector +- automatic rebuild -* Tue Sep 28 1999 Chmouel Boudjnah -- Add filesystem to updatedb script to fix loop update.(#76) +* Thu Jun 22 2000 Bill Nottingham +- update to 2.2 +- fix it to not have debugging (oops) -* Fri Aug 20 1999 Chmouel Boudjnah +* Sat Jun 10 2000 Bill Nottingham +- rebuild, FHS manpages, etc. -- Yet another typo fix in updatedb. +* Sun Mar 26 2000 Florian La Roche +- simplify preun -* Mon Aug 16 1999 Chmouel Boudjnah +* Fri Mar 17 2000 Bill Nottingham +- fix a segfault -- Add fix for updatedb from Randall W. Hron . +* Thu Feb 3 2000 Bill Nottingham +- handle compressed man pages -* Wed Jul 21 1999 Gregus -- fr locale +* Tue Oct 21 1999 Bill Nottingham +- update to 2.1 -* Thu Jul 01 1999 Chmouel Boudjnah +* Mon Oct 18 1999 Bill Nottingham +- fix a bug that was causing segfaults. -- 2.0: - - Converted the original recursive file tree walking code over to the - newly supported fts() function. This is the main reason for pushing - the version to 2.0. This is much more stable and has fixed a few - bugs that didn't allow the whole file system to be scanned. I took - the fts() code right from glibc so that it may be used on libc5 - systems. - - Added File System Exclusion option. ( -f "fstype1,fstype2,..." ). - Now you can exclude NFS, proc, ext2, etc without listing each path. - - If 'updatedb' is used to update the database, GNU Locate's original - '/etc/updatedb.conf' will be used to exclude file systems and paths. - When using 'slocate' to update the database, the '-c' option may now - be used to parse the '/etc/updatedb.conf' file. - *NOTE* - This only works under Linux. +* Mon Sep 20 1999 Bill Nottingham +- remove group database on final uninstall -* Mon Jun 21 1999 Chmouel Boudjnah +* Fri Sep 10 1999 Bill Nottingham +- add a note about creating the database if opening of it fails. -- 1.6 versions. -- Remove obsolete patch. +* Tue Jul 6 1999 Bill Nottingham +- update to 2.0 +- use new -f (filesystem type) option to simplify cron script +- link updatedb back to slocate to allow parsing of updatedb.conf + config files -* Mon May 24 1999 Bernhard Rosenkr?nzer -- 1.5 -- add fix from bugtraq list -- Fix slocate.cron compatibility with bash2 +* Mon Jun 14 1999 Bill Nottingham +- don't exclude VFAT partitions +- add some docs -* Sat May 22 1999 Bernhard Rosenkr?nzer -- Add /var/lib/slocate/slocate.db, if it doesn't exist (required to work) -- Prereq fileutils (we need touch) +* Tue Jun 1 1999 Jeff Johnson +- update to 1.6. +- use /etc/cron.daily as /usr/bin/updatedb to more perfectly imitate the + findutils updatedb. +- exclude vfat partitions too (#3164). -* Thu May 20 1999 Chmouel Boudjnah -- Fix slocate.cron bugs. +* Tue May 11 1999 Bill Nottingham +- update to 1.5 +- make database dir 0750 -* Tue May 11 1999 Chmouel Boudjnah -- Add a updatedb and a updatedb.conf. +* Mon Apr 19 1999 Bill Nottingham +- fix updatedb cron script -* Tue Apr 13 1999 Chmouel Boudjnah -- Update man-pages. +* Mon Apr 12 1999 Bill Nottingham +- add updatedb as a link to slocate +- add an updatedb man page -* Sat Apr 10 1999 Bernhard Rosenkraenzer -- Mandrake adaptions -- bzip2 man/info pages -- add de locale +* Fri Mar 26 1999 Michael Maher +- added man page +* Sun Mar 21 1999 Cristian Gafton +- auto rebuild in the new build environment (release 3) + * Mon Feb 15 1999 Bill Nottingham - %post groupadd changed to %pre From svn at tinysofa.org Thu Jul 1 15:55:43 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:55:43 +1000 (EST) Subject: [tinysofa-svn] r2854 - in tinysofa/snapshot/termcap/current: sources specs Message-ID: <20040701155543.C9DA54E817E@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:55:43 +1000 (Fri, 02 Jul 2004) New Revision: 2854 Added: tinysofa/snapshot/termcap/current/sources/termcap-kon2.patch tinysofa/snapshot/termcap/current/sources/termcap-kterm.patch tinysofa/snapshot/termcap/current/sources/termcap-rxvt.patch tinysofa/snapshot/termcap/current/sources/terminfo.src.bz2 Removed: tinysofa/snapshot/termcap/current/sources/termtypes.tc.gz Modified: tinysofa/snapshot/termcap/current/specs/termcap.spec Log: - Sync with 2.0. - Added: - termcap-kon2.patch: - termcap-kterm.patch: - termcap-rxvt.patch: - terminfo.src.bz2: - Removed: - termtypes.tc.gz: Added: tinysofa/snapshot/termcap/current/sources/termcap-kon2.patch =================================================================== --- tinysofa/snapshot/termcap/current/sources/termcap-kon2.patch 2004-07-01 15:55:41 UTC (rev 2853) +++ tinysofa/snapshot/termcap/current/sources/termcap-kon2.patch 2004-07-01 15:55:43 UTC (rev 2854) @@ -0,0 +1,29 @@ +--- termcap Tue Jun 26 13:35:30 2001 ++++ termcap Tue Jun 26 13:36:07 2001 +@@ -727,6 +727,26 @@ + :ac=+\020,\021-\030.^Y0\333`\004a\013f\370g\361h\260i\316j\211k\214l\206m\203n\305o~p\304q\212r\304s_t\207u\215v\301w\302x\205y\363z\362{\343|\330}\234~\376:\ + :tc=linux: + ++kon|kanji on console:\ ++ :am:eo:mi:ms:ut:xn:xo:\ ++ :co#80:it#8:li#25:\ ++ :&7=^Z:@7=\E[4~:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:\ ++ :F1=\E[23~:F2=\E[24~:F3=\E[25~:F4=\E[26~:F5=\E[28~:\ ++ :F6=\E[29~:F7=\E[31~:F8=\E[32~:F9=\E[33~:FA=\E[34~:\ ++ :IC=\E[%d@:K2=\E[G:al=\E[L:bl=^G:cd=\E[J:ce=\E[K:\ ++ :ch=\E[%i%dG:cl=\E[H\E[J:cm=\E[%i%d;%dH:cr=^M:\ ++ :cs=\E[%i%d;%dr:ct=\E[3g:cv=\E[%i%dd:dc=\E[P:dl=\E[M:\ ++ :do=^J:ei=\E[4l:ho=\E[H:ic=\E[@:im=\E[4h:k1=\E[[A:\ ++ :k2=\E[[B:k3=\E[[C:k4=\E[[D:k5=\E[[E:k6=\E[17~:\ ++ :k7=\E[18~:k8=\E[19~:k9=\E[20~:k;=\E[21~:kB=\E[Z:\ ++ :kD=\E[3~:kI=\E[2~:kN=\E[6~:kP=\E[5~:kb=^H:kd=\E[B:\ ++ :kh=\E[1~:kl=\E[D:kr=\E[C:ku=\E[A:le=^H:mr=\E[7m:\ ++ :nd=\E[C:nw=^M^J:r1=\Ec:rc=\E8:sc=\E7:sf=^J:sr=\EM:\ ++ :st=\EH:ta=^I:u6=\E[%i%d;%dR:u7=\E[6n:u8=\E[?6c:\ ++ :u9=\E[c:up=\E[A:vb=200\E[?5h\E[?5l:ve=\E[?25h:\ ++ :vi=\E[?25l:tc=klone+sgr:tc=klone+color:\ ++ :hs:es:ts=\E[?T:fs=\E[?F:ds=\E[?H\E[?E: ++ + #### Mach + # + Added: tinysofa/snapshot/termcap/current/sources/termcap-kterm.patch =================================================================== --- tinysofa/snapshot/termcap/current/sources/termcap-kterm.patch 2004-07-01 15:55:41 UTC (rev 2853) +++ tinysofa/snapshot/termcap/current/sources/termcap-kterm.patch 2004-07-01 15:55:43 UTC (rev 2854) @@ -0,0 +1,19 @@ +--- termcap.kterm Wed Dec 20 19:11:54 2000 ++++ termcap Wed Dec 20 19:17:36 2000 +@@ -2553,10 +2553,14 @@ + # (kterm: this had extension capabilities ":KJ:TY=ascii:" -- esr) + # (kterm should not invoke DEC Graphics as the alternate character set + # -- Kenji Rikitake) ++# (proper setting of enacs, smacs, rmacs makes kterm to use DEC Graphics ++# -- MATSUMOTO Shoji) + kterm|kterm kanji terminal emulator (X window system):\ + :es:hs:\ +- :Km=\E[M:ac@:ae@:as@:cs=\E[%i%d;%dr:ds=\E[?H:eA@:fs=\E[?F:\ +- :rc=\E8:sc=\E7:ts=\E[?E\E[?%i%dT:tc=xterm-r6:\ ++ :Km=\E[M:\ ++ :ac=++\054\054--..00II``aaffgghhjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~:\ ++ :ae=\E(B:as=\E(0:cs=\E[%i%d;%dr:ds=\E[?H:eA=:fs=\E[?F:\ ++ :rc=\E8:sc=\E7:ts=\E[?E\E[?%i%dT:tc=xterm:\ + :tc=ecma+color: + kterm-color|kterm-co|kterm with ANSI colors:\ + :NC@:tc=kterm:tc=ecma+color: Added: tinysofa/snapshot/termcap/current/sources/termcap-rxvt.patch =================================================================== --- tinysofa/snapshot/termcap/current/sources/termcap-rxvt.patch 2004-07-01 15:55:41 UTC (rev 2853) +++ tinysofa/snapshot/termcap/current/sources/termcap-rxvt.patch 2004-07-01 15:55:43 UTC (rev 2854) @@ -0,0 +1,26 @@ +--- termcap.rxvt Thu Feb 22 12:22:40 2001 ++++ termcap Thu Feb 22 12:25:56 2001 +@@ -2643,12 +2643,12 @@ + :is=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l\E[4l:\ + :k1=\E[11~:k2=\E[12~:k3=\E[13~:k4=\E[14~:k5=\E[15~:\ + :k6=\E[17~:k7=\E[18~:k8=\E[19~:k9=\E[20~:kD=\E[3~:\ +- :kI=\E[2~:kN=\E[6~:kP=\E[5~:kb=^H:kd=\E[B:ke=\E>:kh=\E[7~:\ ++ :kI=\E[2~:kN=\E[6~:kP=\E[5~:kb=^?:kd=\E[B:ke=\E>:kh=\E[7~:\ + :kl=\E[D:kr=\E[C:ks=\E=:ku=\E[A:le=^H:mb=\E[5m:md=\E[1m:\ + :me=\E[0m\017:mr=\E[7m:nd=\E[C:rc=\E8:sc=\E7:se=\E[27m:\ + :sf=^J:so=\E[7m:sr=\EM:st=\EH:ta=^I:te=\E[2J\E[?47l\E8:\ + :ti=\E7\E[?47h:ue=\E[24m:up=\E[A:us=\E[4m:\ +- :vb=\E[?5h\E[?5l:ve=\E[?25h:vi=\E[?25l: ++ :vb=\E[?5h\E[?5l:ve=\E[?25h:vi=\E[?25l:@7=\E[8~: + rxvt|rxvt terminal emulator (X Window System):\ + :NC@:\ + :me=\E[m\017:tc=rxvt-basic:tc=ecma+color: +@@ -2673,7 +2673,7 @@ + :im=\E[4h:is=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l\E[4l:\ + :k1=\E[11~:k2=\E[12~:k3=\E[13~:k4=\E[14~:k5=\E[15~:\ + :k6=\E[17~:k7=\E[18~:k8=\E[19~:k9=\E[20~:kD=\E[3~:\ +- :kI=\E[2~:kN=\E[6~:kP=\E[5~:kb=^H:kd=\E[B:ke=:kh=\E[7~:\ ++ :kI=\E[2~:kN=\E[6~:kP=\E[5~:kb=^?:kd=\E[B:ke=:kh=\E[7~:\ + :kl=\E[D:kr=\E[C:ks=:ku=\E[A:le=^H:mb=\E[5m:md=\E[1m:\ + :me=\E[m\017:mr=\E[7m:nd=\E[C:rc=\E8:sc=\E7:se=\E[27m:\ + :sf=^J:so=\E[7m:sr=\EM:st=\EH:ta=^I:te=\E[2J\E[?47l\E8:\ Added: tinysofa/snapshot/termcap/current/sources/terminfo.src.bz2 =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/termcap/current/sources/terminfo.src.bz2 ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: tinysofa/snapshot/termcap/current/sources/termtypes.tc.gz =================================================================== (Binary files differ) Modified: tinysofa/snapshot/termcap/current/specs/termcap.spec =================================================================== --- tinysofa/snapshot/termcap/current/specs/termcap.spec 2004-07-01 15:55:41 UTC (rev 2853) +++ tinysofa/snapshot/termcap/current/specs/termcap.spec 2004-07-01 15:55:43 UTC (rev 2854) @@ -1,56 +1,140 @@ Summary: The terminal feature database used by certain applications. Name: termcap Version: 11.0.1 -Release: 9ts -License: none -Group: tinysofa official -Source0: http://www.tuxedo.org/terminfo/termtypes.tc.gz +Release: 18.1ts +Copyright: Public Domain +Group: System Environment/Base +#Source0: http://www.tuxedo.org/~esr/terminfo/termtypes.tc.gz +#Patch0: termcap-linuxlat.patch +#Patch1: termcap-xtermchanges.patch +Source: terminfo.src.bz2 +Patch2: termcap-kterm.patch +Patch3: termcap-rxvt.patch +Patch4: termcap-kon2.patch +BuildArch: noarch +BuildRoot: %{_tmppath}/%{name}-%{version}-root -BuildRoot: %{_tmppath}/%{name}-root - %description -The termcap package provides the /etc/termcap file. /etc/termcap is -a database which defines the capabilities of various terminals and +The termcap package provides the /etc/termcap file. /etc/termcap is a +database which defines the capabilities of various terminals and terminal emulators. Certain programs use the /etc/termcap file to access various features of terminals (the bell, colors, and graphics, etc.). %prep mkdir -p $RPM_BUILD_ROOT/etc -zcat $RPM_SOURCE_DIR/termtypes.tc.gz > $RPM_BUILD_ROOT/etc/termcap +bzcat %{SOURCE0} > $RPM_BUILD_ROOT/etc/termcap.src +tic -C $RPM_BUILD_ROOT/etc/termcap.src > $RPM_BUILD_ROOT/etc/termcap +pushd $RPM_BUILD_ROOT/etc +%patch4 -p0 +popd +rm -f $RPM_BUILD_ROOT/etc/termcap.* chmod 644 $RPM_BUILD_ROOT/etc/termcap +perl -pi -e "s,\\E\[\^,\\E[\^,g" $RPM_BUILD_ROOT/etc/termcap %clean -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT +rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) %config /etc/termcap %changelog -* Wed May 19 2004 tsintegrate 11.0.1-9ts -- current (11.0.1-8ts) integrated as 11.0.1-9ts for release 1.0-U1 +* Fri Feb 13 2004 Elliot Lee +- rebuilt -* Thu Dec 11 2003 Erlend Midttun 11.0.1-5tr -- Big rebuild +* Wed Sep 3 2003 Bill Nottingham 11.0.1-17.1 +- rebuild in different environment -* Mon Jun 23 2003 Erlend Midttun 11.0.1-4tr -- Added %%defattr. +* Thu Aug 7 2003 Elliot Lee +- Remove unpackaged files (/etc/termcap.orig) -* Wed Jun 18 2003 Erlend Midttun 11.0.1-3tr -- Big rebuild +* Wed Jan 22 2003 Tim Powers +- rebuilt -* Mon Mar 24 2003 Erlend Midttun 11.0.1-2em -- Rebuilt against glibc 2.3.2. +* Thu Dec 26 2002 Florian La Roche +- Patches to /etc/termcap have not been properly applied. Disabled + Patch2:kterm (already applied) and Patch3:rxvt (not needed anymore) +- Why are patches only applied to /etc/termcap and not the terminfo/termcap + source file?? -* Wed Sep 10 2002 Erlend Midttun 11.0.1-1em -- Removed obsolete patches. -- Fixed URL. -- Make version number reflect the file itself. +* Wed Nov 27 2002 Tim Powers 11.0.1-14 +- remove unpackaged files from the buildroot -* Tue Jul 17 2001 Erlend Midttun -- Inc serial number before release. +* Fri Jun 21 2002 Tim Powers +- automated rebuild +* Thu May 23 2002 Tim Powers +- automated rebuild + +* Wed Jan 09 2002 Tim Powers +- automated rebuild + +* Fri Jul 20 2001 Bernhard Rosenkraenzer +- Fix scoansi + +* Tue Jun 26 2001 Florian La Roche +- add termcap entry from the kon2 rpm + +* Wed Mar 14 2001 Tim Powers +- fixed license + +* Wed Feb 22 2001 Harald Hoyer +- fixed end key for rxvt + +* Fri Feb 9 2001 Yukihiro Nakai +- Add rxvt entry fix patch + +* Wed Dec 20 2000 Yukihiro Nakai +- Add kterm entry fix patch + +* Mon Oct 16 2000 Bernhard Rosenkraenzer +- Build termcap from the terminfo source file in ncurses, so they're + finally in sync (Bug #13090) + +* Wed Jul 12 2000 Prospector +- automatic rebuild + +* Thu Jun 29 2000 Bill Nottingham +- defattr + +* Mon Mar 20 2000 Bernhard Rosenkraenzer +- 11.0.1 + +* Mon Mar 06 2000 Preston Brown +- add end key mappings for linux console (fix /bin/vi) + +* Sat Mar 04 2000 Preston Brown +- remove typo + +* Tue Feb 29 2000 Preston Brown +- shifted fkey 3-20 added for xterm + +* Fri Feb 18 2000 Preston Brown +- xterm entries from XFree86 3.3.6. +- completely apply debian policy for backspace and delete. + +* Sun Feb 5 2000 Bernhard Rosenkraenzer +- Fix xterm (#9141) + +* Tue Feb 01 2000 Preston Brown +- small patch from Hans for xterm (#8634), revert HJ fix. + +* Tue Feb 01 2000 Cristian Gafton +- sync the xterm entry with the XFree86 3.3.6 one + +* Tue Jan 18 2000 Bernhard Rosenkraenzer +- Add patch form Hans de Goede to get the termcap + descriptions in sync with the terminfo (ncurses) ones +- make it a noarch package + +* Sun Nov 21 1999 Bernhard Rosenkraenzer +- 10.2.7 - this should finally fix the "telnet from FreeBSD to Linux" + problem + +* Mon Oct 18 1999 Preston Brown +- xterm termcap patch from H.J. Lu; claims fixes xterm under 6.1 + * Mon Mar 29 1999 Jeff Johnson - termcap used to be noarch but that is impossible with per-arch patches @@ -72,3 +156,4 @@ * Thu Oct 23 1997 Erik Troan - made a noarch package + From svn at tinysofa.org Thu Jul 1 15:55:47 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:55:47 +1000 (EST) Subject: [tinysofa-svn] r2855 - in tinysofa/snapshot/texinfo/current: sources specs Message-ID: <20040701155547.33D334E817E@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:55:46 +1000 (Fri, 02 Jul 2004) New Revision: 2855 Added: tinysofa/snapshot/texinfo/current/sources/info-dir tinysofa/snapshot/texinfo/current/sources/texinfo-4.3-zlib.patch tinysofa/snapshot/texinfo/current/sources/texinfo-4.6.tar.bz2 tinysofa/snapshot/texinfo/current/sources/texinfo-badc.patch Removed: tinysofa/snapshot/texinfo/current/sources/texinfo-3.12h-fix.patch tinysofa/snapshot/texinfo/current/sources/texinfo-4.1-zlib.patch tinysofa/snapshot/texinfo/current/sources/texinfo-4.7.tar.gz Modified: tinysofa/snapshot/texinfo/current/specs/texinfo.spec Log: - Sync with 2.0. - Added: - info-dir: - texinfo-4.3-zlib.patch: - texinfo-4.6.tar.bz2: - texinfo-badc.patch: - Removed: - texinfo-3.12h-fix.patch: - texinfo-4.1-zlib.patch: - texinfo-4.7.tar.gz: Added: tinysofa/snapshot/texinfo/current/sources/info-dir =================================================================== --- tinysofa/snapshot/texinfo/current/sources/info-dir 2004-07-01 15:55:43 UTC (rev 2854) +++ tinysofa/snapshot/texinfo/current/sources/info-dir 2004-07-01 15:55:46 UTC (rev 2855) @@ -0,0 +1,22 @@ +$Id: dir,v 1.2 1996/09/24 18:43:01 karl Exp $ +This is the file .../info/dir, which contains the topmost node of the +Info hierarchy. The first time you invoke Info you start off +looking at that node, which is (dir)Top. + +File: dir Node: Top This is the top of the INFO tree + + This (the Directory node) gives a menu of major topics. + Typing "q" exits, "?" lists all Info commands, "d" returns here, + "h" gives a primer for first-timers, + "mEmacs" visits the Emacs topic, etc. + + In Emacs, you can click mouse button 2 on a menu item or cross reference + to select it. + +* Menu: + +Texinfo documentation system +* Info: (info). Documentation browsing system. + +Miscellaneous +* bash: (bash). The Bourne Again Shell. Deleted: tinysofa/snapshot/texinfo/current/sources/texinfo-3.12h-fix.patch =================================================================== --- tinysofa/snapshot/texinfo/current/sources/texinfo-3.12h-fix.patch 2004-07-01 15:55:43 UTC (rev 2854) +++ tinysofa/snapshot/texinfo/current/sources/texinfo-3.12h-fix.patch 2004-07-01 15:55:46 UTC (rev 2855) @@ -1,11 +0,0 @@ ---- texinfo-3.12h/util/install-info.c.orig Thu May 13 11:58:19 1999 -+++ texinfo-3.12h/util/install-info.c Thu May 13 11:59:44 1999 -@@ -629,7 +629,7 @@ readfile (filename, sizep, create_callba - break; - - filled += nread; -- if (filled == data_size) -+ if (data_size - filled < 8192) - { - data_size += 65536; - data = xrealloc (data, data_size); Deleted: tinysofa/snapshot/texinfo/current/sources/texinfo-4.1-zlib.patch =================================================================== --- tinysofa/snapshot/texinfo/current/sources/texinfo-4.1-zlib.patch 2004-07-01 15:55:43 UTC (rev 2854) +++ tinysofa/snapshot/texinfo/current/sources/texinfo-4.1-zlib.patch 2004-07-01 15:55:46 UTC (rev 2855) @@ -1,171 +0,0 @@ ---- texinfo-4.1/util/Makefile.in.zlib Mon Mar 4 17:53:59 2002 -+++ texinfo-4.1/util/Makefile.in Tue Mar 5 11:54:01 2002 -@@ -134,7 +134,7 @@ - DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) - CPPFLAGS = @CPPFLAGS@ - LDFLAGS = @LDFLAGS@ --LIBS = @LIBS@ -+LIBS = @LIBS@ -lz - depcomp = $(SHELL) $(top_srcdir)/depcomp - @AMDEP_TRUE at DEP_FILES = $(DEPDIR)/install-info.Po $(DEPDIR)/texindex.Po - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ ---- texinfo-4.1/util/install-info.c.zlib Tue Mar 5 11:52:03 2002 -+++ texinfo-4.1/util/install-info.c Tue Mar 5 11:57:06 2002 -@@ -19,6 +19,7 @@ - - #include "system.h" - #include -+#include - - static char *progname = "install-info"; - -@@ -481,7 +482,7 @@ - COMPRESSION_PROGRAM. The compression program is determined by the - magic number, not the filename. */ - --FILE * -+gzFile - open_possibly_compressed_file (filename, create_callback, - opened_filename, compression_program, is_pipe) - char *filename; -@@ -493,7 +494,7 @@ - char *local_opened_filename, *local_compression_program; - int nread; - char data[4]; -- FILE *f; -+ gzFile *f; - - /* We let them pass NULL if they don't want this info, but it's easier - to always determine it. */ -@@ -501,23 +502,23 @@ - opened_filename = &local_opened_filename; - - *opened_filename = filename; -- f = fopen (*opened_filename, FOPEN_RBIN); -+ f = gzopen (*opened_filename, FOPEN_RBIN); - if (!f) - { - *opened_filename = concat (filename, ".gz", ""); -- f = fopen (*opened_filename, FOPEN_RBIN); -+ f = gzopen (*opened_filename, FOPEN_RBIN); - #ifdef __MSDOS__ - if (!f) - { - free (*opened_filename); - *opened_filename = concat (filename, ".igz", ""); -- f = fopen (*opened_filename, FOPEN_RBIN); -+ f = gzopen (*opened_filename, FOPEN_RBIN); - } - if (!f) - { - free (*opened_filename); - *opened_filename = concat (filename, ".inz", ""); -- f = fopen (*opened_filename, FOPEN_RBIN); -+ f = gzopen (*opened_filename, FOPEN_RBIN); - } - #endif - if (!f) -@@ -529,7 +530,7 @@ - /* And try opening it again. */ - free (*opened_filename); - *opened_filename = filename; -- f = fopen (*opened_filename, FOPEN_RBIN); -+ f = gzopen (*opened_filename, FOPEN_RBIN); - if (!f) - pfatal_with_name (filename); - } -@@ -538,54 +539,7 @@ - } - } - -- /* Read first few bytes of file rather than relying on the filename. -- If the file is shorter than this it can't be usable anyway. */ -- nread = fread (data, sizeof (data), 1, f); -- if (nread != 1) -- { -- /* Empty files don't set errno, so we get something like -- "install-info: No error for foo", which is confusing. */ -- if (nread == 0) -- fatal (_("%s: empty file"), *opened_filename, 0); -- pfatal_with_name (*opened_filename); -- } -- -- if (!compression_program) -- compression_program = &local_compression_program; -- -- if (data[0] == '\x1f' && data[1] == '\x8b') --#if STRIP_DOT_EXE -- /* An explicit .exe yields a better diagnostics from popen below -- if they don't have gzip installed. */ -- *compression_program = "gzip.exe"; --#else -- *compression_program = "gzip"; --#endif -- else -- *compression_program = NULL; -- -- if (*compression_program) -- { /* It's compressed, so fclose the file and then open a pipe. */ -- char *command = concat (*compression_program," -cd <", *opened_filename); -- if (fclose (f) < 0) -- pfatal_with_name (*opened_filename); -- f = popen (command, "r"); -- if (f) -- *is_pipe = 1; -- else -- pfatal_with_name (command); -- } -- else -- { /* It's a plain file, seek back over the magic bytes. */ -- if (fseek (f, 0, 0) < 0) -- pfatal_with_name (*opened_filename); --#if O_BINARY -- /* Since this is a text file, and we opened it in binary mode, -- switch back to text mode. */ -- f = freopen (*opened_filename, "r", f); --#endif -- *is_pipe = 0; -- } -+ *is_pipe = 0; - - return f; - } -@@ -608,7 +562,7 @@ - char **compression_program; - { - char *real_name; -- FILE *f; -+ gzFile *f; - int pipe_p; - int filled = 0; - int data_size = 8192; -@@ -622,7 +576,7 @@ - - for (;;) - { -- int nread = fread (data + filled, 1, data_size - filled, f); -+ int nread = gzread (f, data + filled, data_size - filled); - if (nread < 0) - pfatal_with_name (real_name); - if (nread == 0) -@@ -641,10 +595,7 @@ - /* We need to close the stream, since on some systems the pipe created - by popen is simulated by a temporary file which only gets removed - inside pclose. */ -- if (pipe_p) -- pclose (f); -- else -- fclose (f); -+ gzclose(f); - - *sizep = filled; - return data; -@@ -1409,7 +1360,7 @@ - warning (_("no entries found for `%s'; nothing deleted"), infile, 0); - - output_dirfile (opened_dirfilename, dir_nlines, dir_lines, n_entries_to_add, -- entries_to_add, input_sections, compression_program); -+ entries_to_add, input_sections, NULL); - - xexit (0); - } Added: tinysofa/snapshot/texinfo/current/sources/texinfo-4.3-zlib.patch =================================================================== --- tinysofa/snapshot/texinfo/current/sources/texinfo-4.3-zlib.patch 2004-07-01 15:55:43 UTC (rev 2854) +++ tinysofa/snapshot/texinfo/current/sources/texinfo-4.3-zlib.patch 2004-07-01 15:55:46 UTC (rev 2855) @@ -0,0 +1,185 @@ +--- texinfo-4.5/util/Makefile.in.zlib 2003-02-05 00:44:39.000000000 +0000 ++++ texinfo-4.5/util/Makefile.in 2003-04-29 15:32:52.000000000 +0100 +@@ -92,7 +92,7 @@ + LIBICONV = @LIBICONV@ + LIBINTL = @LIBINTL@ + LIBOBJS = @LIBOBJS@ +-LIBS = @LIBS@ ++LIBS = @LIBS@ -lz + LTLIBICONV = @LTLIBICONV@ + LTLIBINTL = @LTLIBINTL@ + LTLIBOBJS = @LTLIBOBJS@ +--- texinfo-4.5/util/install-info.c.zlib 2003-04-29 15:32:26.000000000 +0100 ++++ texinfo-4.5/util/install-info.c 2003-04-29 15:32:26.000000000 +0100 +@@ -20,6 +20,7 @@ + + #include "system.h" + #include ++#include + + static char *progname = "install-info"; + +@@ -492,7 +493,7 @@ + COMPRESSION_PROGRAM. The compression program is determined by the + magic number, not the filename. */ + +-FILE * ++gzFile + open_possibly_compressed_file (filename, create_callback, + opened_filename, compression_program, is_pipe) + char *filename; +@@ -504,7 +505,7 @@ + char *local_opened_filename, *local_compression_program; + int nread; + char data[4]; +- FILE *f; ++ gzFile *f; + + /* We let them pass NULL if they don't want this info, but it's easier + to always determine it. */ +@@ -512,11 +513,11 @@ + opened_filename = &local_opened_filename; + + *opened_filename = filename; +- f = fopen (*opened_filename, FOPEN_RBIN); ++ f = gzopen (*opened_filename, FOPEN_RBIN); + if (!f) + { + *opened_filename = concat (filename, ".gz", ""); +- f = fopen (*opened_filename, FOPEN_RBIN); ++ f = gzopen (*opened_filename, FOPEN_RBIN); + if (!f) + { + free (*opened_filename); +@@ -529,13 +530,13 @@ + { + free (*opened_filename); + *opened_filename = concat (filename, ".igz", ""); +- f = fopen (*opened_filename, FOPEN_RBIN); ++ f = gzopen (*opened_filename, FOPEN_RBIN); + } + if (!f) + { + free (*opened_filename); + *opened_filename = concat (filename, ".inz", ""); +- f = fopen (*opened_filename, FOPEN_RBIN); ++ f = gzopen (*opened_filename, FOPEN_RBIN); + } + #endif + if (!f) +@@ -547,7 +548,7 @@ + /* And try opening it again. */ + free (*opened_filename); + *opened_filename = filename; +- f = fopen (*opened_filename, FOPEN_RBIN); ++ f = gzopen (*opened_filename, FOPEN_RBIN); + if (!f) + pfatal_with_name (filename); + } +@@ -556,66 +557,7 @@ + } + } + +- /* Read first few bytes of file rather than relying on the filename. +- If the file is shorter than this it can't be usable anyway. */ +- nread = fread (data, sizeof (data), 1, f); +- if (nread != 1) +- { +- /* Empty files don't set errno, so we get something like +- "install-info: No error for foo", which is confusing. */ +- if (nread == 0) +- fatal (_("%s: empty file"), *opened_filename, 0); +- pfatal_with_name (*opened_filename); +- } +- +- if (!compression_program) +- compression_program = &local_compression_program; +- +- if (data[0] == '\x1f' && data[1] == '\x8b') +-#if STRIP_DOT_EXE +- /* An explicit .exe yields a better diagnostics from popen below +- if they don't have gzip installed. */ +- *compression_program = "gzip.exe"; +-#else +- *compression_program = "gzip"; +-#endif +- else if(data[0] == 'B' && data[1] == 'Z' && data[2] == 'h') +-#ifndef STRIP_DOT_EXE +- *compression_program = "bzip2.exe"; +-#else +- *compression_program = "bzip2"; +-#endif +- else if(data[0] == 'B' && data[1] == 'Z' && data[2] == '0') +-#ifndef STRIP_DOT_EXE +- *compression_program = "bzip.exe"; +-#else +- *compression_program = "bzip"; +-#endif +- else +- *compression_program = NULL; +- +- if (*compression_program) +- { /* It's compressed, so fclose the file and then open a pipe. */ +- char *command = concat (*compression_program," -cd <", *opened_filename); +- if (fclose (f) < 0) +- pfatal_with_name (*opened_filename); +- f = popen (command, "r"); +- if (f) +- *is_pipe = 1; +- else +- pfatal_with_name (command); +- } +- else +- { /* It's a plain file, seek back over the magic bytes. */ +- if (fseek (f, 0, 0) < 0) +- pfatal_with_name (*opened_filename); +-#if O_BINARY +- /* Since this is a text file, and we opened it in binary mode, +- switch back to text mode. */ +- f = freopen (*opened_filename, "r", f); +-#endif +- *is_pipe = 0; +- } ++ *is_pipe = 0; + + return f; + } +@@ -638,7 +580,7 @@ + char **compression_program; + { + char *real_name; +- FILE *f; ++ gzFile *f; + int pipe_p; + int filled = 0; + int data_size = 8192; +@@ -652,7 +594,7 @@ + + for (;;) + { +- int nread = fread (data + filled, 1, data_size - filled, f); ++ int nread = gzread (f, data + filled, data_size - filled); + if (nread < 0) + pfatal_with_name (real_name); + if (nread == 0) +@@ -671,10 +613,7 @@ + /* We need to close the stream, since on some systems the pipe created + by popen is simulated by a temporary file which only gets removed + inside pclose. */ +- if (pipe_p) +- pclose (f); +- else +- fclose (f); ++ gzclose(f); + + *sizep = filled; + return data; +@@ -1439,7 +1378,7 @@ + warning (_("no entries found for `%s'; nothing deleted"), infile, 0); + + output_dirfile (opened_dirfilename, dir_nlines, dir_lines, n_entries_to_add, +- entries_to_add, input_sections, compression_program); ++ entries_to_add, input_sections, NULL); + + xexit (0); + } Added: tinysofa/snapshot/texinfo/current/sources/texinfo-4.6.tar.bz2 =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/texinfo/current/sources/texinfo-4.6.tar.bz2 ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: tinysofa/snapshot/texinfo/current/sources/texinfo-4.7.tar.gz =================================================================== (Binary files differ) Added: tinysofa/snapshot/texinfo/current/sources/texinfo-badc.patch =================================================================== --- tinysofa/snapshot/texinfo/current/sources/texinfo-badc.patch 2004-07-01 15:55:43 UTC (rev 2854) +++ tinysofa/snapshot/texinfo/current/sources/texinfo-badc.patch 2004-07-01 15:55:46 UTC (rev 2855) @@ -0,0 +1,19 @@ +--- texinfo-4.6/info/infomap.c.badc 2003-05-13 17:27:04.000000000 +0100 ++++ texinfo-4.6/info/infomap.c 2004-03-02 16:08:46.000000000 +0000 +@@ -158,14 +158,14 @@ + case ISFUNC: + keymap[i].function = map[i].function; + #if defined(INFOKEY) +- ks = find_function_keyseq (map, i, rootmap, NULL); ++ ks = find_function_keyseq (map, i, rootmap); + if (ks) + add_function_keyseq(map[i].function, ks->keyseq, newroot); + #endif /* INFOKEY */ + break; + case ISKMAP: + keymap[i].function = (InfoCommand *)keymap_copy_keymap ( +- (Keymap)map[i].function, rootmap); ++ (Keymap)map[i].function, rootmap, NULL); + break; + } + } Modified: tinysofa/snapshot/texinfo/current/specs/texinfo.spec =================================================================== --- tinysofa/snapshot/texinfo/current/specs/texinfo.spec 2004-07-01 15:55:43 UTC (rev 2854) +++ tinysofa/snapshot/texinfo/current/specs/texinfo.spec 2004-07-01 15:55:46 UTC (rev 2855) @@ -1,144 +1,273 @@ Summary: Tools needed to create Texinfo format documentation files. Name: texinfo -Version: 4.7 -Release: 2ts +Version: 4.6 +Release: 4ts License: GPL -Group: tinysofa official -Source0: ftp://ftp.gnu.org/pub/gnu/texinfo/texinfo-%{version}.tar.gz -Patch1: texinfo-3.12h-fix.patch -# Not used -Patch3: texinfo-4.1-zlib.patch -Prereq: htmlinfo -BuildRoot: %{_tmppath}/%{name}-root -BuildRequires: zlib-devel, libtermcap-devel +Group: Applications/Publishing +Url: ftp://ftp.gnu.org/pub/gnu/texinfo/ +Source0: ftp://ftp.gnu.org/gnu/texinfo/texinfo-%{version}.tar.bz2 +Source1: info-dir +Patch1: texinfo-4.3-zlib.patch +Patch2: texinfo-badc.patch +Prereq: /sbin/install-info +Prefix: %{_prefix} +Buildroot: %{_tmppath}/%{name}-%{version}-root +BuildRequires: zlib-devel + # Redifine this to "dir" in the info directory isn't compressed -%define __spec_install_post /usr/lib/rpm/brp-strip \; /usr/lib/rpm/brp-strip-comment-note \; rm -f +%define __spec_install_post %{?__debug_package:%{__debug_install_post}} /usr/lib/rpm/brp-strip \; /usr/lib/rpm/brp-strip-comment-note \; rm -f %description Texinfo is a documentation system that can produce both online -information and printed output from a single source file. Normally, -you'd have to write two separate documents: one for online help or -other online information and the other for a typeset manual or other -printed work. Using Texinfo, you only need to write one source -document. Then when the work needs revision, you only have to revise -one source document. The GNU Project uses the Texinfo file format for -most of its documentation. +information and printed output from a single source file. The GNU +Project uses the Texinfo file format for most of its documentation. Install texinfo if you want a documentation system for producing both online and print documentation from the same source file and/or if you are going to write documentation for the GNU Project. +%package -n info +Summary: A stand-alone TTY-based reader for GNU texinfo documentation. +Group: System Environment/Base +# By making info prereq bash, other packages which have triggers based on +# info don't run those triggers until bash is in place as well. This is an +# ugly method of doing it (triggers which fire on set intersection would +# be better), but it's the best we can do for now. Talk to Erik before +# removing this. +Prereq: bash + +%description -n info +The GNU project uses the texinfo file format for much of its +documentation. The info package provides a standalone TTY-based +browser program for viewing texinfo files. + %prep %setup -q -%patch1 -p1 +%patch1 -p1 -b .zlib +%patch2 -p1 -b .badc +%build -%build %configure -make -rm -f util/install-info ||: +make %{?_smp_mflags} + make -C util LIBS=%{_libdir}/libz.a -cd doc -../makeinfo/makeinfo --html --no-split texinfo.txi %install -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT/{usr/share/html/texinfo} +rm -rf ${RPM_BUILD_ROOT} +mkdir -p ${RPM_BUILD_ROOT}/sbin %makeinstall -install -m755 -d $RPM_BUILD_ROOT/usr/share/html/texinfo/ -install -m644 doc/texinfo.html $RPM_BUILD_ROOT/usr/share/html/texinfo/ +pushd ${RPM_BUILD_ROOT} + gzip -n -9f .%{_infodir}/*info* + gzip -n -9f .%{_mandir}/*/* + install -m644 $RPM_SOURCE_DIR/info-dir .%{_infodir}/dir + mv -f .%{_bindir}/install-info ./sbin +popd -rm -rf $RPM_BUILD_ROOT/usr/share/info +rm -f $RPM_BUILD_ROOT%{_datadir}/texinfo/texinfo.{xsl,dtd} +%find_lang %name -%find_lang %{name} - %clean -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT +rm -rf ${RPM_BUILD_ROOT} %post -/usr/sbin/htmlinfo_update.sh +/sbin/install-info %{_infodir}/texinfo.gz %{_infodir}/dir -%postun -/usr/sbin/htmlinfo_update.sh +%preun +if [ $1 = 0 ]; then + /sbin/install-info --delete %{_infodir}/texinfo.gz %{_infodir}/dir +fi +%post -n info +/sbin/install-info %{_infodir}/info-stnd.info.gz %{_infodir}/dir + +%preun -n info +if [ $1 = 0 ]; then + /sbin/install-info --delete %{_infodir}/info-stnd.info.gz %{_infodir}/dir +fi + %files -f %{name}.lang %defattr(-,root,root) %doc AUTHORS ChangeLog INSTALL INTRODUCTION NEWS README TODO -%doc info/README -%{_prefix}/share/html/texinfo +%doc --parents info/README %{_bindir}/makeinfo %{_bindir}/texindex %{_bindir}/texi2dvi +%{_infodir}/texinfo* %{_mandir}/man1/makeinfo.1* %{_mandir}/man1/texindex.1* %{_mandir}/man1/texi2dvi.1* %{_mandir}/man5/texinfo.5* -%exclude %{_bindir}/info -%exclude %{_bindir}/infokey -%exclude %{_bindir}/install-info +%files -n info +%defattr(-,root,root) +#%config(missingok) /etc/X11/applnk/Utilities/info.desktop +%config(noreplace) %verify(not md5 size mtime) %{_infodir}/dir +%{_bindir}/info +%{_bindir}/infokey +%{_infodir}/info.info* +%{_infodir}/info-stnd.info* +/sbin/install-info +%{_mandir}/man1/info.1* +%{_mandir}/man1/install-info.1* +%{_mandir}/man5/info.5* -%exclude %{_mandir}/man1/info.1* -%exclude %{_mandir}/man1/infokey.1* -%exclude %{_mandir}/man1/install-info.1* -%exclude %{_mandir}/man5/info.5* +%changelog +* Tue Jun 15 2004 Elliot Lee +- rebuilt -%exclude %{_datadir}/texinfo/texinfo.dtd -%exclude %{_datadir}/texinfo/texinfo.xsl -%exclude %{_datadir}/texinfo/texinfo.cat +* Tue Mar 2 2004 Tim Waugh +- Fixed compiler warning (bug #117097). -%changelog -* Wed May 19 2004 tsintegrate 4.7-2ts -- current (4.7-1ts) integrated as 4.7-2ts for release 1.0-U1 +* Sat Feb 21 2004 Tim Waugh 4.6-3 +- Build requires zlib-devel (bug #116436). -* Mon Apr 12 2004 Omar Kilani 4.7-1ts -- New upstream: 4.7. +* Fri Feb 13 2004 Elliot Lee +- rebuilt -* Fri Dec 5 2003 Erlend Midttun 4.6-1tr -- New upstream. +* Tue Dec 2 2003 Tim Waugh 4.6-1 +- Fixed compiler warning (bug #111279). +- 4.6. -* Wed Jun 18 2003 Erlend Midttun 4.2-5tr -- Big rebuild +* Tue Jun 17 2003 Tim Waugh 4.5-3 +- Rebuilt. -* Fri Jun 13 2003 Erlend Midttun 4.2-4em -- Now even own /usr/share/html/textinfo -- Removed the rest of info including something under /usr/share/html/info-stnd +* Wed Jun 04 2003 Elliot Lee +- rebuilt -* Mon Mar 24 2003 Erlend Midttun 4.2-3em -- Rebuilt against glibc 2.3.2. +* Tue May 6 2003 Tim Waugh +- No longer need 3.12h-fix patch. -* Fri Oct 25 2002 Christian H. Toldnes 4.2-2ct -- New uses the new htmlinfo setup. -- removed the info package. +* Tue Apr 29 2003 Tim Waugh 4.5-1 +- 4.5 (bug #88428). Update zlib patch. +- Add URL tag (bug #54613). -* Sun Oct 20 2002 Goetz Bock 4.2-1bg -- tried to learn from redhat, why it did not compile, but redhat's SPEC - does net tell me -- libtermcap-devel is needed to build +* Wed Jan 22 2003 Tim Powers 4.3-5 +- rebuilt -* Tue Oct 15 2002 Goetz Bock -- new upstream: 4.2, but does not compile +* Tue Jan 7 2003 Tim Waugh 4.3-4 +- Fix up spec_install_post to strip debug info out to separate package + (bug #81226). -* Tue Jul 17 2001 Erlend Midttun -- Inc serial number before release. +* Thu Dec 26 2002 Florian La Roche 4.3-3 +- Make /usr/share/info/dir a real file and remove /etc/info-dir, that + file should be unused for a long time. -* Mon Feb 28 2000 Lars Gaarden -- wrong symlink to /etc/info-dir +* Thu Nov 21 2002 Elliot Lee 4.3-2 +- Don't strip files here (rpm takes care of it) +- Use pushd/popd instead of enclosing things in (), to make + error detection easier +- Use _smp_mflags -* Mon Feb 28 2000 Lars Gaarden -- info now prereqs gzip +* Tue Nov 19 2002 Tim Waugh 4.3-1 +- 4.3. +- No longer need fileextension or malloccheck patches. +- Update zlib patch. -* Fri Feb 25 2000 Lars Gaarden -- removed /etc/X11/wmconfig/info +* Wed Oct 23 2002 Tim Waugh 4.2-6 +- Don't install files not packaged. +- Fix file list (bug #55816). -* Mon Jan 24 2000 Tore Olsen -- upgraded to 4.0 -- moved /usr/man and /usr/info to /usr/share for FHS compliance. +* Mon Sep 2 2002 Bernhard Rosenkraenzer 4.2-5 +- Fix crash w/ MALLOC_CHECK_ == 2 (#72831) +* Tue Jul 2 2002 Bernhard Rosenkraenzer 4.2-4 +- Add infokey (#67728) + +* Fri Jun 21 2002 Tim Powers +- automated rebuild + +* Thu May 23 2002 Tim Powers +- automated rebuild + +* Tue Apr 23 2002 Florian La Roche +- 4.2 + +* Tue Mar 5 2002 Bernhard Rosenkraenzer 4.1-1 +- 4.1 (#60714) + +* Wed Jan 09 2002 Tim Powers +- automated rebuild + +* Tue Aug 7 2001 Bernhard Rosenkraenzer 4.0b-3 +- Don't create the desktop file - we don't install it anyway. + +* Sat Jul 21 2001 Tim Powers +- remove the info viewer from the menus, it's cluttering things + +* Wed May 09 2001 Florian La Roche +- 4.0b + +* Tue Apr 24 2001 Bernhard Rosenkraenzer 4.0a-1 +- Update to 4.0a, the patch looks sane + +* Fri Feb 23 2001 Trond Eivind Glomsr?d +- langify +- don't create desktop file in spec file + +* Tue Jan 23 2001 Preston Brown +- danish translation added + +* Tue Dec 12 2000 Bernhard Rosenkraenzer +- Rebuild to get rid of 0777 dirs + +* Wed Nov 8 2000 Bernhard Rosenkraenzer +- Fix recognition of .?o extensions in texi2dvi, Bug #20498 + +* Thu Sep 7 2000 Jeff Johnson +- FHS packaging (64bit systems need to use %%_libdir not /usr/lib). + +* Sat Aug 19 2000 Trond Eivind Glomsr?d +- really do it - #16120 + +* Mon Aug 14 2000 Helge Deller +- gzip man-pages, #16120 + +* Mon Aug 7 2000 Tim Waugh +- List man-pages in %%files. + +* Fri Aug 4 2000 Bernhard Rosenkraenzer +- Add Swedish and German translations to desktop file, Bug #15366 + +* Thu Aug 3 2000 Bernhard Rosenkraenzer +- mark /etc/info-dir %%verify(not md5 size mime), Bug #14826 + +* Wed Jul 12 2000 Prospector +- automatic rebuild + +* Wed Jun 28 2000 Bill Nottingham +- fix build wackiness with info page compressing + +* Fri Jun 16 2000 Bill Nottingham +- fix info-dir symlink + +* Thu May 18 2000 Preston Brown +- use FHS paths for info. + +* Fri Mar 24 2000 Bernhard Rosenkraenzer +- rebuild with current ncurses + +* Wed Feb 09 2000 Preston Brown +- wmconfig -> desktop + +* Wed Feb 02 2000 Cristian Gafton +- fix descriptions + +* Wed Jan 26 2000 Bernhard Rosenkraenzer +- move info-stnd.info* to the info package, /sbin/install-info it + in %post (Bug #6632) + +* Thu Jan 13 2000 Jeff Johnson +- recompile to eliminate ncurses foul-up. + +* Tue Nov 9 1999 Bernhard Rosenkr?nzer +- 4.0 +- handle RPM_OPT_FLAGS + * Tue Sep 07 1999 Cristian Gafton - import version 3.12h into 6.1 tree from HJLu @@ -212,4 +341,4 @@ - added /usr/bin/install-info to the filelist * Tue Feb 18 1997 Michael Fulbright -- upgraded to version 3.9. \ No newline at end of file +- upgraded to version 3.9. From svn at tinysofa.org Thu Jul 1 15:55:49 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:55:49 +1000 (EST) Subject: [tinysofa-svn] r2856 - tinysofa/snapshot/tmpwatch/current/specs Message-ID: <20040701155549.385DC4E817E@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:55:49 +1000 (Fri, 02 Jul 2004) New Revision: 2856 Modified: tinysofa/snapshot/tmpwatch/current/specs/tmpwatch.spec Log: - Sync with 2.0. - Kept: - tmpwatch-2.9.0.tar.gz: Modified: tinysofa/snapshot/tmpwatch/current/specs/tmpwatch.spec =================================================================== --- tinysofa/snapshot/tmpwatch/current/specs/tmpwatch.spec 2004-07-01 15:55:46 UTC (rev 2855) +++ tinysofa/snapshot/tmpwatch/current/specs/tmpwatch.spec 2004-07-01 15:55:49 UTC (rev 2856) @@ -1,11 +1,12 @@ Summary: A utility for removing files based on when they were last accessed. Name: tmpwatch Version: 2.9.0 -Release: 5ts -Source: tmpwatch-%{version}.tar.gz +Release: 3ts +Source: %{name}-%{version}.tar.gz License: GPL -Group: tinysofa official -BuildRoot: %{_tmppath}/%{name}-root +Group: System Environment/Base +BuildRoot: %{_tmppath}/%{name}-%{version}-root +Requires: psmisc %description The tmpwatch utility recursively searches through specified @@ -19,25 +20,26 @@ %setup -q %build -make RPM_OPT_FLAGS="$RPM_OPT_FLAGS" +make %install -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != "/" ] && rm -rf "$RPM_BUILD_ROOT" -make ROOT=$RPM_BUILD_ROOT SBINDIR=%{_sbindir} MANDIR=%{_mandir} install +rm -rf %{buildroot} +make ROOT=%{buildroot} SBINDIR=%{_sbindir} MANDIR=%{_mandir} install -( cd $RPM_BUILD_ROOT - mkdir -p ./etc/cron.daily - echo '/usr/sbin/tmpwatch 240 /tmp' \ - >> ./etc/cron.daily/tmpwatch - echo '/usr/sbin/tmpwatch 720 /var/tmp' \ - >> ./etc/cron.daily/tmpwatch - echo '[ -d /var/catman ] && /usr/sbin/tmpwatch -f 240 /var/catman/{cat?,local/cat?}' \ - >> ./etc/cron.daily/tmpwatch - chmod +x ./etc/cron.daily/tmpwatch -) +mkdir -p %{buildroot}/etc/cron.daily +cat > %{buildroot}/etc/cron.daily/tmpwatch < 2.9.0-5ts -- current (2.9.0-4ts) integrated as 2.9.0-5ts for release 1.0-U1 +* Tue Jun 15 2004 Elliot Lee +- rebuilt -* Thu Dec 05 2003 Nico Erfurth 2.9.0-1ne -- New upstream version: 2.9.0 +* Fri Feb 13 2004 Elliot Lee +- rebuilt -* Wed Jun 18 2003 Erlend Midttun 2.8.4-3tr -- Big rebuild +* Thu Jun 05 2003 Elliot Lee +- rebuilt -* Sat Jul 27 2002 Gerald Dachs 2.8.4-1gd -- New upstream version: 2.8.4 +* Fri May 30 2003 Mike A. Harris 2.9.0-1 +- Added Solaris/HPUX support to tmpwatch via patch from Paul Gear (#71288) +- Rebuild in rawhide as 2.9.0-1 -* Tue Jul 16 2002 Christian H. Toldnes 2.7.1-2ct -- rebuild for tsl 2.0 +* Mon Feb 10 2003 Nalin Dahyabhai 2.8.4-5 +- rebuild -* Tue Jun 12 2001 Oystein Viggen -- New upstream version: 2.7.1 +* Fri Feb 7 2003 Nalin Dahyabhai 2.8.4-2 +- rebuild -* Wed Dec 20 2000 Oystein Viggen -- Don't attempt to clean X11-stuff, as we don't have any. +* Tue Oct 8 2002 Mike A. Harris 2.8.4-4 +- All-arch rebuild -* Thu Oct 26 2000 Tore Olsen -- tmpwatch cron script checks if /var/catman exists before trying to run. -- improved the way man pages are installed to /usr/share/man. +* Fri Jun 21 2002 Tim Powers +- automated rebuild -* Mon Oct 09 2000 Oystein Viggen -- Update to version 2.6.2 +* Sun May 26 2002 Tim Powers +- automated rebuild -* Tue Feb 29 2000 Lars Gaarden -- moved man page to /usr/share/man, FHS +* Tue May 21 2002 Mike A. Harris 2.8.4-1 +- Bump release and rebuild in new environment +* Fri Apr 13 2002 Mike A. Harris 2.8.3-1 +- Added support for large files with 64bit offsets by adding to CFLAGS + -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 bug (#56961) + +* Sun Jan 27 2002 Mike A. Harris 2.8.2-1 +- Added newlines to logfile messages as per bug #58912 + +* Thu Nov 8 2001 Preston Brown +- define default SBINDIR in Makefile +- incorrect boolean comparison fix + +* Wed Aug 29 2001 Preston Brown +- cron script fix (#52785) + +* Tue Aug 28 2001 Preston Brown +- rebuild for 5.x, 6.x, 7.x errata + +* Mon Aug 27 2001 Preston Brown +- noreplace /etc/cron.daily/tmpwatch + +* Mon Aug 6 2001 Preston Brown 2.8-1 +- added a "nodirs" option which inhibits removal of empty directories. +- Integrated race condition fixes from Martin Macok (#50148) +- do not try to remove ext3 journal files (#50522) + +* Tue Jul 3 2001 Preston Brown 2.7.4-1 +- fix typo in cron script + +* Mon Jul 2 2001 Preston Brown +- better checking for directory existence cleaning man cache dirs (#44117) + +* Fri May 11 2001 Trond Eivind Glomsr?d +- Handle directories with large files +- fix some warnings during compilation + +* Thu Mar 29 2001 Preston Brown +- fixed longstanding bug where directories removed while in test mode. + +* Fri Mar 9 2001 Preston Brown +- Patch from enrico.scholz at informatik.tu-chemnitz.de allows concurrent + usage of mtime, ctime, and atime checking (#19550). + +* Fri Jan 05 2001 Preston Brown +- increased interval for removal to 30 days for /var/tmp per FHS (#19951) + +* Tue Sep 12 2000 Nalin Dahyabhai +- use execle() instead of system() to get the correct return code, fixes from + Jeremy Katz + +* Thu Sep 7 2000 Nalin Dahyabhai +- rework to not have to fork() (#17286) +- set utime() after we're done reading a directory + +* Sat Jun 17 2000 Matt Wilson +- defattr + +* Tue Jun 13 2000 Preston Brown +- FHS compliance + +* Thu May 18 2000 Preston Brown +- don't complain about failure to remove non-empty directories. +- fix man page path + +* Wed May 17 2000 Preston Brown +- support /var/cache/man and /var/catman (FHS 2.1 compliance). + +* Fri May 05 2000 Preston Brown +- support for CTIME from jik at kamens.brookline.ma.us +- fixes for fuser checks from Ian Burrell . +- remove directories when empty without --all flag, to be consistent w/docs. + +* Mon Feb 14 2000 Preston Brown +- option to use fuser to see if file in use before removing + * Wed Feb 02 2000 Cristian Gafton - fix description - man pages are compressed @@ -127,4 +203,4 @@ * Sun Mar 09 1997 Erik Troan - Rebuilt to get right permissions on the Alpha (though I have no idea - how they ended up wrong). \ No newline at end of file + how they ended up wrong). From svn at tinysofa.org Thu Jul 1 15:49:51 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:49:51 +1000 (EST) Subject: [tinysofa-svn] r2771 - in tinysofa/snapshot/lftp/current: sources specs Message-ID: <20040701154951.23CB04E817D@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:49:50 +1000 (Fri, 02 Jul 2004) New Revision: 2771 Added: tinysofa/snapshot/lftp/current/sources/lftp-3.0.6.tar.bz2 tinysofa/snapshot/lftp/current/sources/lftp-3.0.6.tar.bz2.asc Removed: tinysofa/snapshot/lftp/current/sources/lftp-3.0.5.tar.bz2 tinysofa/snapshot/lftp/current/sources/lftp-3.0.5.tar.bz2.asc Modified: tinysofa/snapshot/lftp/current/specs/lftp.spec Log: - Sync with 2.0. - Added: - lftp-3.0.6.tar.bz2: - lftp-3.0.6.tar.bz2.asc: - Removed: - lftp-3.0.5.tar.bz2: - lftp-3.0.5.tar.bz2.asc: Deleted: tinysofa/snapshot/lftp/current/sources/lftp-3.0.5.tar.bz2 =================================================================== (Binary files differ) Deleted: tinysofa/snapshot/lftp/current/sources/lftp-3.0.5.tar.bz2.asc =================================================================== --- tinysofa/snapshot/lftp/current/sources/lftp-3.0.5.tar.bz2.asc 2004-07-01 15:49:47 UTC (rev 2770) +++ tinysofa/snapshot/lftp/current/sources/lftp-3.0.5.tar.bz2.asc 2004-07-01 15:49:50 UTC (rev 2771) @@ -1,7 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.2.1 (SunOS) - -iD8DBQBAuzdPqCS7afKpmhgRAgx4AJ4nAIoN11apXe7mBPQq8iC7PlY0RQCbBjk8 -m67fPsF8V8xcTfpO74XENag= -=+fov ------END PGP SIGNATURE----- Added: tinysofa/snapshot/lftp/current/sources/lftp-3.0.6.tar.bz2 =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/lftp/current/sources/lftp-3.0.6.tar.bz2 ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/lftp/current/sources/lftp-3.0.6.tar.bz2.asc =================================================================== --- tinysofa/snapshot/lftp/current/sources/lftp-3.0.6.tar.bz2.asc 2004-07-01 15:49:47 UTC (rev 2770) +++ tinysofa/snapshot/lftp/current/sources/lftp-3.0.6.tar.bz2.asc 2004-07-01 15:49:50 UTC (rev 2771) @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.2.1 (SunOS) + +iD8DBQBAysBMqCS7afKpmhgRAtHeAJoDL+7g5/HEyLCswC3mhLifLgZSjwCcCI0Z +wZrrQJOcROZQaNuTbKCjE3Q= +=PHya +-----END PGP SIGNATURE----- Modified: tinysofa/snapshot/lftp/current/specs/lftp.spec =================================================================== --- tinysofa/snapshot/lftp/current/specs/lftp.spec 2004-07-01 15:49:47 UTC (rev 2770) +++ tinysofa/snapshot/lftp/current/specs/lftp.spec 2004-07-01 15:49:50 UTC (rev 2771) @@ -1,19 +1,15 @@ Summary: A sophisticated file transfer program Name: lftp -Version: 3.0.5 -Release: 1jh +Version: 3.0.6 +Release: 1ts License: GPL -Group: tinysofa/main +Group: Applications/Internet Source0: http://ftp.yars.free.net/pub/software/unix/net/ftp/client/lftp/lftp-%{version}.tar.bz2 Source1: http://ftp.yars.free.net/pub/software/unix/net/ftp/client/lftp/lftp-%{version}.tar.bz2.asc URL: http://lftp.yar.ru/ BuildRoot: %{_tmppath}/%{name}-%{version}-root -BuildRequires: ncurses-devel, openssl-devel, pkgconfig, readline-devel -BuildRequires: gcc-c++-devel -BuildRequires: libtool +BuildPrereq: ncurses-devel, openssl-devel, pkgconfig, readline-devel -Requires: gcc-c++-runtime openssl ncurses readline - %description LFTP is a sophisticated ftp/http file transfer program. Like bash, it has job control and uses the readline library for input. It has bookmarks, built-in @@ -21,7 +17,7 @@ reliability in mind. %prep -%setup -q +%setup -q %build if pkg-config openssl ; then @@ -29,26 +25,28 @@ LDFLAGS=`pkg-config --libs-only-L openssl`; export LDFLAGS fi LDFLAGS="-L`pwd`/src/.libs $LDFLAGS"; export LDFLAGS -%configure --with-modules --disable-static --with-ssl -make +%configure --with-modules --disable-static --with-ssl --with-debug +export tagname=CC +make LIBTOOL=%{_bindir}/libtool %install -%makeinstall +rm -rf $RPM_BUILD_ROOT +export tagname=CC +%makeinstall LIBTOOL=%{_bindir}/libtool +rm -f $RPM_BUILD_ROOT%{_libdir}/lftp/%{version}/*.la +chmod 0755 $RPM_BUILD_ROOT%{_libdir}/lftp/* +chmod 0755 $RPM_BUILD_ROOT%{_libdir}/lftp/%{version}/*.so -rm -f %{buildroot}%{_libdir}/lftp/%{version}/*.la -chmod 0755 %{buildroot}%{_libdir}/lftp/* -chmod 0755 %{buildroot}%{_libdir}/lftp/%{version}/*.so +# Remove files from $RPM_BUILD_ROOT that we aren't shipping. +rm -f $RPM_BUILD_ROOT%{_libdir}/lftp/%{version}/*.a -# Remove files from %{buildroot} that we aren't shipping. -rm -f %{buildroot}%{_libdir}/lftp/%{version}/*.a +%find_lang %{name} -%i18n_pkgs lftp - %clean -%clean_buildroot +rm -rf $RPM_BUILD_ROOT -%files -%defattr(-,root,root,-) +%files -f %{name}.lang +%defattr(-,root,root) %doc BUGS COPYING ChangeLog FAQ FEATURES README* NEWS THANKS TODO %config %{_sysconfdir}/lftp.conf %{_bindir}/* @@ -67,57 +65,42 @@ %{_libdir}/lftp/%{version}/proto-sftp.so %changelog -* Sat Jun 5 2004 Jaakko Heinonen 3.0.5-1jh -- 3.0.5 -- separate i18n package -- use new rpm macros +* Fri Mar 12 2004 Nalin Dahyabhai 2.6.12-1 +- update to 2.6.12 -* Thu May 27 2004 Jaakko Heinonen 3.0.4-1jh -- 3.0.4 +* Tue Mar 02 2004 Elliot Lee +- rebuilt -* Wed May 19 2004 tsintegrate 3.0.3-2ts -- current (3.0.3-1ts) integrated as 3.0.3-2ts for release 1.0-U1 +* Fri Feb 13 2004 Elliot Lee +- rebuilt -* Tue May 11 2004 Omar Kilani -- Add BuildRequires gcc-c++-devel. -- Add Requires gcc-c++-runtime, openssl, readline, ncurses. +* Tue Dec 16 2003 Nalin Dahyabhai 2.6.10-3 +- add patch to avoid DoS when connecting to HTTP servers (or "HTTP" "servers") + which don't provide status headers, or provide empty lines instead of status + headers -* Mon Apr 26 2004 Omar Kilani 3.0.3-1ts -- New upstream: 3.0.3. +* Fri Dec 12 2003 Nalin Dahyabhai 2.6.10-2 +- rebuild -* Fri Apr 16 2004 Omar Kilani 3.0.2-1ts -- New upstream: 3.0.2. +* Fri Dec 12 2003 Nalin Dahyabhai 2.6.10-1 +- update to 2.6.10, which folds in the previous patches +- configure with --with-debug so that we get useful debug info -* Wed Apr 07 2004 Omar Kilani 3.0.1-1ts -- New upstream: 3.0.1. +* Tue Dec 9 2003 Nalin Dahyabhai 2.6.9-1 +- include patch based on patch from Ulf H?rnhammar to fix unsafe use of + sscanf when reading http directory listings (CAN-2003-0963) +- include patch based on patch from Ulf H?rnhammar to fix compile warnings + modified based on input from Solar Designer -* Fri Apr 02 2004 Omar Kilani 3.0-1ts -- tinysofaise. -- New upstream: 3.0. -- Add proto-sftp, liblftp-pty, liblftp-network. New in 3.0. -- This package replaces ncftp. +* Mon Dec 8 2003 Nalin Dahyabhai +- update to 2.6.9 -* Tue Jan 27 2004 Axel Thimm -- Update to 2.6.12. +* Wed Aug 6 2003 Elliot Lee +- Fix libtool -* Mon Dec 22 2003 Axel Thimm -- Update to 2.6.11. +* Wed Jun 04 2003 Elliot Lee +- rebuilt -* Sat Dec 13 2003 Axel Thimm -- Update to 2.6.10. - -* Tue Oct 14 2003 Axel Thimm -- Updated to 2.6.8. - -* Wed Oct 8 2003 Axel Thimm -- Updated to 2.6.7. - -* Sat Jun 28 2003 Axel Thimm -- Updated to 2.6.6. - -* Fri May 2 2003 Axel Thimm -- Updated to 2.6.5. - * Wed Jan 22 2003 Tim Powers - rebuilt From svn at tinysofa.org Thu Jul 1 15:49:53 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:49:53 +1000 (EST) Subject: [tinysofa-svn] r2772 - tinysofa/snapshot/libcap/current/specs Message-ID: <20040701154953.2E7044E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:49:52 +1000 (Fri, 02 Jul 2004) New Revision: 2772 Modified: tinysofa/snapshot/libcap/current/specs/libcap.spec Log: - Sync with 2.0. - Kept: - libcap-1.10-alpha.patch: - libcap-1.10-ia64.patch: - libcap-1.10-shared.patch: - libcap-1.10-userland.patch: - libcap-1.10.tar.bz2: Modified: tinysofa/snapshot/libcap/current/specs/libcap.spec =================================================================== --- tinysofa/snapshot/libcap/current/specs/libcap.spec 2004-07-01 15:49:50 UTC (rev 2771) +++ tinysofa/snapshot/libcap/current/specs/libcap.spec 2004-07-01 15:49:52 UTC (rev 2772) @@ -1,6 +1,6 @@ Name: libcap Version: 1.10 -Release: 11jh +Release: 18.1ts Summary: Library for getting and setting POSIX.1e capabilities Source: ftp://ftp.kernel.org/pub/linux/libs/security/linux-privs/kernel-2.4/%{name}-%{version}.tar.bz2 License: BSD-like and LGPL @@ -8,14 +8,13 @@ Patch1: libcap-1.10-userland.patch Patch2: libcap-1.10-shared.patch Patch3: libcap-1.10-alpha.patch -Group: tinysofa/main +Group: System Environment/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-root %description libcap is a library for getting and setting POSIX.1e (formerly POSIX 6) draft 15 capabilities. - %package devel Summary: Development files for libcap Group: Development/Libraries @@ -30,7 +29,6 @@ Install libcap-devel if you want to develop or compile applications using libcap. - %prep %setup -q # FIXME: Is this really required still? @@ -42,13 +40,12 @@ %patch1 -p1 -b .userland %patch2 -p1 -b .shared - %build -%make PREFIX=%{_prefix} LIBDIR=%{_libdir} +make PREFIX=%{_prefix} LIBDIR=%{_libdir} - %install -%makeinstall FAKEROOT=${RPM_BUILD_ROOT} \ +rm -rf ${RPM_BUILD_ROOT} +make install FAKEROOT=${RPM_BUILD_ROOT} \ LIBDIR=${RPM_BUILD_ROOT}/%{_lib} \ SBINDIR=${RPM_BUILD_ROOT}/%{_sbindir} \ INCDIR=${RPM_BUILD_ROOT}/%{_includedir} \ @@ -57,28 +54,24 @@ chmod +x ${RPM_BUILD_ROOT}/%{_lib}/*.so.* - %post -p /sbin/ldconfig %postun -p /sbin/ldconfig - %files -%defattr(755,root,root) +%defattr(-,root,root) /%{_lib}/*.so.* %{_sbindir}/* %files devel -%defattr(644,root,root) +%defattr(-,root,root) %{_includedir}/* /%{_lib}/*.so %{_mandir}/man2/* %{_mandir}/man3/* - %clean -%clean_buildroot +rm -rf ${RPM_BUILD_ROOT} - %changelog * Tue Mar 02 2004 Elliot Lee - rebuilt From svn at tinysofa.org Thu Jul 1 15:50:02 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:50:02 +1000 (EST) Subject: [tinysofa-svn] r2774 - in tinysofa/snapshot/libpng/current: sources specs Message-ID: <20040701155002.8547F4E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:50:02 +1000 (Fri, 02 Jul 2004) New Revision: 2774 Added: tinysofa/snapshot/libpng/current/sources/libpng-1.2.2-libdirfix.patch tinysofa/snapshot/libpng/current/sources/libpng-1.2.5-misc.patch tinysofa/snapshot/libpng/current/sources/libpng-1.2.5-oob_error_message.patch tinysofa/snapshot/libpng/current/sources/libpng-1.2.5-rhconf.patch Removed: tinysofa/snapshot/libpng/current/sources/libpng-1.2.5-can-2004-0421.patch Modified: tinysofa/snapshot/libpng/current/specs/libpng.spec Log: - Sync with 2.0. - Kept: - libpng-1.2.5.tar.bz2: - Added: - libpng-1.2.2-libdirfix.patch: - libpng-1.2.5-misc.patch: - libpng-1.2.5-oob_error_message.patch: - libpng-1.2.5-rhconf.patch: - Removed: - libpng-1.2.5-can-2004-0421.patch: Added: tinysofa/snapshot/libpng/current/sources/libpng-1.2.2-libdirfix.patch =================================================================== --- tinysofa/snapshot/libpng/current/sources/libpng-1.2.2-libdirfix.patch 2004-07-01 15:49:55 UTC (rev 2773) +++ tinysofa/snapshot/libpng/current/sources/libpng-1.2.2-libdirfix.patch 2004-07-01 15:50:02 UTC (rev 2774) @@ -0,0 +1,22 @@ +--- libpng-1.2.2/scripts/makefile.linux.libdirfix 2003-02-24 19:32:51.000000000 -0500 ++++ libpng-1.2.2/scripts/makefile.linux 2003-02-24 19:33:26.000000000 -0500 +@@ -60,7 +60,7 @@ + $(RANLIB) $@ + + libpng.pc: +- cat scripts/libpng.pc.in | sed -e s\!@PREFIX@!$(prefix)! > libpng.pc ++ cat scripts/libpng.pc.in | sed -e s\!@PREFIX@!$(prefix)! -e s\!@LIBPATH@!$(LIBPATH)! > libpng.pc + + $(LIBNAME).so: $(LIBNAME).so.$(PNGMAJ) + ln -sf $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so +--- libpng-1.2.2/scripts/libpng.pc.in.libdirfix 2003-02-24 19:31:45.000000000 -0500 ++++ libpng-1.2.2/scripts/libpng.pc.in 2003-02-24 19:31:53.000000000 -0500 +@@ -1,7 +1,7 @@ + + prefix=@PREFIX@ + exec_prefix=${prefix} +-libdir=${exec_prefix}/lib ++libdir=@LIBPATH@ + includedir=${exec_prefix}/include + + Name: libpng12 Deleted: tinysofa/snapshot/libpng/current/sources/libpng-1.2.5-can-2004-0421.patch =================================================================== --- tinysofa/snapshot/libpng/current/sources/libpng-1.2.5-can-2004-0421.patch 2004-07-01 15:49:55 UTC (rev 2773) +++ tinysofa/snapshot/libpng/current/sources/libpng-1.2.5-can-2004-0421.patch 2004-07-01 15:50:02 UTC (rev 2774) @@ -1,17 +0,0 @@ ---- libpng-1.2.5/pngerror.c.can-2004-0421 2002-10-03 05:32:27.000000000 -0600 -+++ libpng-1.2.5/pngerror.c 2004-04-29 09:26:18.000000000 -0600 -@@ -135,10 +135,12 @@ - buffer[iout] = 0; - else - { -+ png_size_t len = strnlen(error_message, 63); -+ - buffer[iout++] = ':'; - buffer[iout++] = ' '; -- png_memcpy(buffer+iout, error_message, 64); -- buffer[iout+63] = 0; -+ png_memcpy(buffer+iout, error_message, len); -+ buffer[iout+len] = 0; - } - } - Added: tinysofa/snapshot/libpng/current/sources/libpng-1.2.5-misc.patch =================================================================== --- tinysofa/snapshot/libpng/current/sources/libpng-1.2.5-misc.patch 2004-07-01 15:49:55 UTC (rev 2773) +++ tinysofa/snapshot/libpng/current/sources/libpng-1.2.5-misc.patch 2004-07-01 15:50:02 UTC (rev 2774) @@ -0,0 +1,36 @@ +--- libpng-1.2.5/scripts/makefile.linux.misc 2004-05-25 09:59:43.534234567 +0200 ++++ libpng-1.2.5/scripts/makefile.linux 2004-05-25 10:06:29.914098463 +0200 +@@ -83,8 +83,7 @@ + echo prefix=\"$(prefix)\"; \ + echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \ + echo L_opts=\"-L$(LIBPATH)\"; \ +- echo R_opts=\"-Wl,-rpath,$(LIBPATH)\"; \ +- echo libs=\"-lpng12 -lz -lm\"; \ ++ echo libs=\"-lpng12\"; \ + cat scripts/libpng-config-body.in ) > libpng-config + chmod +x libpng-config + +@@ -95,12 +94,12 @@ + ln -sf $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ) + + $(LIBNAME).so.$(PNGVER): $(OBJSDLL) +- $(CC) -shared -Wl,-soname,$(LIBNAME).so.$(PNGMAJ) -lz \ ++ $(CC) -shared -Wl,-soname,$(LIBNAME).so.$(PNGMAJ) -lz -lm \ + -o $(LIBNAME).so.$(PNGVER) \ + $(OBJSDLL) + + libpng.so.3.$(PNGMIN): $(OBJSDLL) +- $(CC) -shared -Wl,-soname,libpng.so.3 -lz \ ++ $(CC) -shared -Wl,-soname,libpng.so.3 -lz -lm \ + -o libpng.so.3.$(PNGMIN) \ + $(OBJSDLL) + +--- libpng-1.2.5/scripts/libpng.pc.in.orig 2004-05-25 10:06:58.127923416 +0200 ++++ libpng-1.2.5/scripts/libpng.pc.in 2004-05-25 10:07:22.459322888 +0200 +@@ -7,5 +7,5 @@ + Name: libpng12 + Description: Loads and saves PNG files + Version: 1.2.5 +-Libs: -L${libdir} -lpng12 -lz -lm ++Libs: -L${libdir} -lpng12 + Cflags: -I${includedir}/libpng12 Added: tinysofa/snapshot/libpng/current/sources/libpng-1.2.5-oob_error_message.patch =================================================================== --- tinysofa/snapshot/libpng/current/sources/libpng-1.2.5-oob_error_message.patch 2004-07-01 15:49:55 UTC (rev 2773) +++ tinysofa/snapshot/libpng/current/sources/libpng-1.2.5-oob_error_message.patch 2004-07-01 15:50:02 UTC (rev 2774) @@ -0,0 +1,27 @@ +A remote user can create a malformed PNG image that, when processed by +an application using libpng, may cause the application to crash. The +specific impact depends on the application using libpng. + +For further information, take a look to CAN-2004-0421 + +Adapted patch by Robert Scheck for libpng >= 1.2.5 + +--- libpng-1.2.5/pngerror.c 2002-10-03 13:32:27.000000000 +0200 ++++ libpng-1.2.5/pngerror.c.oob_error_message 2004-05-03 11:23:07.000000000 +0200 +@@ -135,10 +135,14 @@ + buffer[iout] = 0; + else + { ++ int len = strlen(error_message); ++ ++ if (len > 63) ++ len = 63; + buffer[iout++] = ':'; + buffer[iout++] = ' '; +- png_memcpy(buffer+iout, error_message, 64); +- buffer[iout+63] = 0; ++ png_memcpy(buffer+iout, error_message, len); ++ buffer[iout+len] = 0; + } + } + Added: tinysofa/snapshot/libpng/current/sources/libpng-1.2.5-rhconf.patch =================================================================== --- tinysofa/snapshot/libpng/current/sources/libpng-1.2.5-rhconf.patch 2004-07-01 15:49:55 UTC (rev 2773) +++ tinysofa/snapshot/libpng/current/sources/libpng-1.2.5-rhconf.patch 2004-07-01 15:50:02 UTC (rev 2774) @@ -0,0 +1,102 @@ +Patch by Robert Scheck for fixing libpng compiling problems on Red Hat Linux/Fedora Core + +--- libpng-1.2.5/scripts/makefile.linux 2002-10-03 13:32:34.000000000 +0200 ++++ libpng-1.2.5/scripts/makefile.linux.rhconf 2004-05-15 13:24:01.000000000 +0200 +@@ -13,13 +13,11 @@ + # where "make install" puts libpng12.a, libpng12.so*, + # libpng12/png.h and libpng12/pngconf.h + # Prefix must be a full pathname. +-prefix=/usr/local ++prefix=/usr + + # Where the zlib library and include files are located. +-#ZLIBLIB=/usr/local/lib +-#ZLIBINC=/usr/local/include +-ZLIBLIB=../zlib +-ZLIBINC=../zlib ++ZLIBLIB=/usr/lib ++ZLIBINC=/usr/include + + ALIGN= + # for i386: +@@ -31,7 +29,7 @@ + + # for pgcc version 2.95.1, -O3 is buggy; don't use it. + +-CFLAGS=-I$(ZLIBINC) -Wall -O3 -funroll-loops \ ++CFLAGS=-Wall $(RPM_OPT_FLAGS) \ + $(ALIGN) # $(WARNMORE) -g -DPNG_DEBUG=5 + + LDFLAGS=-L. -Wl,-rpath,. -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) -lpng12 -lz -lm +@@ -42,7 +40,7 @@ + + INCPATH=$(prefix)/include + LIBPATH=$(prefix)/lib +-MANPATH=$(prefix)/man ++MANPATH=$(prefix)/share/man + BINPATH=$(prefix)/bin + + # override DESTDIR= on the make install command line to easily support +@@ -97,12 +95,12 @@ + ln -sf $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ) + + $(LIBNAME).so.$(PNGVER): $(OBJSDLL) +- $(CC) -shared -Wl,-soname,$(LIBNAME).so.$(PNGMAJ) \ ++ $(CC) -shared -Wl,-soname,$(LIBNAME).so.$(PNGMAJ) -lz \ + -o $(LIBNAME).so.$(PNGVER) \ + $(OBJSDLL) + + libpng.so.3.$(PNGMIN): $(OBJSDLL) +- $(CC) -shared -Wl,-soname,libpng.so.3 \ ++ $(CC) -shared -Wl,-soname,libpng.so.3 -lz \ + -o libpng.so.3.$(PNGMIN) \ + $(OBJSDLL) + +@@ -123,8 +121,8 @@ + ./pngtest-static + + install-headers: png.h pngconf.h +- - at if [ ! -d $(DI) ]; then mkdir $(DI); fi +- - at if [ ! -d $(DI)/$(LIBNAME) ]; then mkdir $(DI)/$(LIBNAME); fi ++ - at if [ ! -d $(DI) ]; then mkdir -p $(DI); fi ++ - at if [ ! -d $(DI)/$(LIBNAME) ]; then mkdir -p $(DI)/$(LIBNAME); fi + cp png.h pngconf.h $(DI)/$(LIBNAME) + chmod 644 $(DI)/$(LIBNAME)/png.h $(DI)/$(LIBNAME)/pngconf.h + -@/bin/rm -f $(DI)/png.h $(DI)/pngconf.h +@@ -132,7 +130,7 @@ + (cd $(DI); ln -sf $(LIBNAME) libpng; ln -sf $(LIBNAME)/* .) + + install-static: install-headers libpng.a +- - at if [ ! -d $(DL) ]; then mkdir $(DL); fi ++ - at if [ ! -d $(DL) ]; then mkdir -p $(DL); fi + cp libpng.a $(DL)/$(LIBNAME).a + chmod 644 $(DL)/$(LIBNAME).a + -@/bin/rm -f $(DL)/libpng.a +@@ -146,14 +144,13 @@ + -@/bin/rm -f $(DL)/libpng.so.3 + -@/bin/rm -f $(DL)/libpng.so.3.$(PNGMIN)* + cp $(LIBNAME).so.$(PNGVER) $(DL) +- cp libpng.so.3.$(PNGMIN) $(DL) + chmod 755 $(DL)/$(LIBNAME).so.$(PNGVER) +- chmod 755 $(DL)/libpng.so.3.$(PNGMIN) + (cd $(DL); \ + ln -sf libpng.so.3.$(PNGMIN) libpng.so.3; \ + ln -sf libpng.so.3 libpng.so; \ + ln -sf $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ); \ +- ln -sf $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so) ++ ln -sf $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so; \ ++ ln -sf $(LIBNAME).so.$(PNGVER) libpng.so.3.$(PNGMIN)) + - at if [ ! -d $(DL)/pkgconfig ]; then mkdir $(DL)/pkgconfig; fi + -@/bin/rm -f $(DL)/pkgconfig/$(LIBNAME).pc + -@/bin/rm -f $(DL)/pkgconfig/libpng.pc +@@ -162,8 +159,8 @@ + (cd $(DL)/pkgconfig; ln -sf $(LIBNAME).pc libpng.pc) + + install-man: libpng.3 libpngpf.3 png.5 +- - at if [ ! -d $(DM) ]; then mkdir $(DM); fi +- - at if [ ! -d $(DM)/man3 ]; then mkdir $(DM)/man3; fi ++ - at if [ ! -d $(DM) ]; then mkdir -p $(DM); fi ++ - at if [ ! -d $(DM)/man3 ]; then mkdir -p $(DM)/man3; fi + -@/bin/rm -f $(DM)/man3/libpng.3 + -@/bin/rm -f $(DM)/man3/libpngpf.3 + cp libpng.3 $(DM)/man3 Modified: tinysofa/snapshot/libpng/current/specs/libpng.spec =================================================================== --- tinysofa/snapshot/libpng/current/specs/libpng.spec 2004-07-01 15:49:55 UTC (rev 2773) +++ tinysofa/snapshot/libpng/current/specs/libpng.spec 2004-07-01 15:50:02 UTC (rev 2774) @@ -1,144 +1,268 @@ -Summary: libpng, library for working with PNG files +Summary: A library of functions for manipulating PNG image format files. Name: libpng Version: 1.2.5 -Release: 11ts -License: OSI -Group: tinysofa official -Source: http://www.libpng.org/pub/png/src/libpng-1.2.5.tar.bz2 -Patch: libpng-1.2.5-can-2004-0421.patch -BuildRoot: %{_tmppath}/%{name}-root +Release: 2ts +License: OSI certified +Group: System Environment/Libraries +Source: ftp://swrinde.nde.swri.edu/pub/png/src/libpng-%{version}.tar.bz2 +Patch0: libpng-1.2.5-rhconf.patch +Patch1: libpng-1.2.2-libdirfix.patch +Patch2: libpng-1.2.5-oob_error_message.patch +Patch3: libpng-1.2.5-misc.patch +Buildroot: %{_tmppath}/%{name}-%{version}-root BuildPrereq: zlib-devel -Provides: libpng12 -Obsoletes: libpng12 +Provides: libpng.so.3 URL: http://www.libpng.org/pub/png/ +%define LIBVER 3.%{version} +Epoch: 2 +Conflicts: qt < 0:2.2.2 %description -libpng is a library of functions for creating and manipulating PNG -(Portable Network Graphics) image format files. +The libpng package contains a library of functions for creating and +manipulating PNG (Portable Network Graphics) image format files. PNG +is a bit-mapped graphics format similar to the GIF format. PNG was +created to replace the GIF format, since GIF uses a patented data +compression algorithm. -This package is needed if you want to run binaries that are linked dynamically -with libpng. +Libpng should be installed if you need to manipulate PNG format image +files. %package devel -Group: tinysofa official -Summary: Development tools for version 1.2 of libpng -Provides: libpng12-devel -Obsoletes: libpng12-devel -Requires: %{name} = %{version}, zlib-devel +Summary: Development tools for programs to manipulate PNG image format files. +Group: Development/Libraries +Requires: libpng = %{epoch}:%{version}, zlib-devel %description devel The libpng-devel package contains the header files and static -libraries necessary for developing programs using the PNG -(Portable Network Graphics) library. +libraries necessary for developing programs using the PNG (Portable +Network Graphics) library. -If you want to develop programs tha which will manipulate PNG image -format files, while still running on previous Red Hat Linux releases, -you should install libpng-devel. You'll also need to install the -libpng package. +If you want to develop programs which will manipulate PNG image format +files, you should install libpng-devel. You'll also need to install +the libpng package. -%package tools -Group: tinysofa official -Summary: two utilities to convert pnm to png and back -Requires: %{name} = %{version} +%prep +%setup -q -%description tools -The two utilities png2pnm and pnm2png can be used to convert PNG files -into pnm files and pnm to PNG. - -%prep -%setup -q -n libpng-%{version} -%patch -p1 ln -s scripts/makefile.linux Makefile +%patch0 -p1 -b .rhconf +%patch1 -p1 -b .libdirfix +%patch2 -p1 -b .oob_error_message +%patch3 -p1 -b .misc %build -make prefix=/usr \ - MANPATH=%{_mandir} \ - PNGMAJ=3 \ - ZLIBINC=/usr/include \ - ZLIBLIB=/usr/lib \ - CFLAGS="$RPM_OPT_FLAGS" -cd contrib/pngminus -mv makefile.std Makefile -make prefix=/usr \ - MANPATH=%{_mandir} \ - PNGMAJ=3 \ - ZLIBINC=/usr/include \ - ZLIBLIB=/usr/lib \ - CFLAGS="$RPM_OPT_FLAGS -I../.. -L../.." png2pnm pnm2png +make ZLIBLIB=%{_libdir} RPM_OPT_FLAGS="$RPM_OPT_FLAGS" LIBPATH=%{_libdir} - %install -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != "/" ] && rm -rf "$RPM_BUILD_ROOT" +rm -rf $RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT/usr/share +make install prefix=$RPM_BUILD_ROOT/usr LIBPATH=$RPM_BUILD_ROOT%{_libdir} -make install DESTDIR=$RPM_BUILD_ROOT \ - prefix=/usr \ - MANPATH=%{_mandir} \ - PNGMAJ=3 \ - ZLIBINC=/usr/include \ - ZLIBLIB=/usr/lib -install -s -m 755 contrib/pngminus/png2pnm $RPM_BUILD_ROOT/%{_bindir}/ -install -s -m 755 contrib/pngminus/pnm2png $RPM_BUILD_ROOT/%{_bindir}/ - %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root) -%doc *.txt example.c ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO +%doc *.txt example.c README TODO CHANGES %{_libdir}/libpng*.so.* -%{_mandir}/man3/* %{_mandir}/man5/* %files devel %defattr(-,root,root) -%{_bindir}/libpng* -%{_includedir}/libpng* -%{_includedir}/*.h +%{_bindir}/* +%{_includedir}/* +%{_libdir}/libpng*.a %{_libdir}/libpng*.so -%{_libdir}/libpng*a %{_libdir}/pkgconfig/* +%{_mandir}/man3/* -%files tools -%defattr(-,root,root) -%doc contrib/pngminus/README -%{_bindir}/png2pnm -%{_bindir}/pnm2png - %clean -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT +rm -rf $RPM_BUILD_ROOT %changelog -* Wed May 19 2004 tsintegrate 1.2.5-11ts -- current (1.2.5-10ts) integrated as 1.2.5-11ts for release 1.0-U1 +* Mon May 24 2004 Than Ngo 2:1.2.5-2 +- add patch to link libm automatically +- get rid of rpath -* Mon May 3 2004 Omar Kilani 1.2.5-10ts -- Got patch from Trustix. +* Wed May 19 2004 Matthias Clasen 2:1.2.5-1 +- 1.2.5 -* Fri Apr 30 2004 Oystein Viggen 1.2.5-9tr -- Patch for error message crash, CAN-2004-0421 +* Mon May 3 2004 Matthias Clasen 2:1.2.2-22 +- Redo the out-of-bounds fix in a slightly better way. -* Sat Jan 10 2004 Goetz Bock 1.2.5-6bg -- added pngminus tools as -tools subpackage +* Wed Apr 21 2004 Matthias Clasen +- Bump release number to disambiguate n-v-rs. -* Tue Dec 9 2003 Erlend Midttun 1.2.5-5tr -- Rebuilt +* Mon Apr 19 2004 Matthias Clasen +- fix a possible out-of-bounds read in the error message + handler. #121229 -* Wed Nov 19 2003 Tor Hveem 1.2.5-4th -- Renamed package to libpng, also Provides: the old name -- Added som missing Reqs -- Added proper CFLAGS +* Tue Mar 02 2004 Elliot Lee +- rebuilt -* Thu Jul 3 2003 Erlend Midttun 1.2.5-3tr -- Added include directory. +* Fri Feb 27 2004 Mark McLoughlin 2:1.2.2-19 +- rebuild with changed bits/setjmp.h on ppc -* Wed Jun 18 2003 Erlend Midttun 1.2.5-2tr -- Big rebuild +* Fri Feb 13 2004 Elliot Lee +- rebuilt -* Wed Apr 30 2003 Erlend Midttun 1.2.5-1em -- New version. +* Wed Jun 04 2003 Elliot Lee +- rebuilt -* Mon Apr 14 2003 Gerald Dachs 1.0.15-1gd -- initital release \ No newline at end of file +* Tue Jun 3 2003 Jeff Johnson +- add explicit epoch's where needed. + +* Mon Feb 24 2003 Jonathan Blandford 2:1.2.2-15 +- change pkg-config to use libdir instead of hardcoding /usr/lib + +* Mon Feb 24 2003 Elliot Lee +- rebuilt + +* Thu Feb 20 2003 Jonathan Blandford 2:1.2.2-12 +- add Provides: libpng.so.3, #67007 + +* Fri Jan 24 2003 Jonathan Blandford +- change requires to include the Epoch + +* Thu Jan 23 2003 Karsten Hopp 2:1.2.2-11 +- Bump & rebuild + +* Wed Jan 22 2003 Tim Powers +- rebuilt + +* Wed Jan 15 2003 Elliot Lee 2:1.2.2-9 +- Bump & rebuild + +* Thu Dec 12 2002 Tim Powers 2:1.2.2-7 +- merge changes in from -6hammer + +* Fri Jun 21 2002 Tim Powers +- automated rebuild + +* Thu May 23 2002 Tim Powers +- automated rebuild + +* Tue May 7 2002 Bernhard Rosenkraenzer 1.2.2-4 +- Don't own %{_libdir}/pkgconfig +- Don't strip library, that's up to rpm + +* Tue May 7 2002 Bernhard Rosenkraenzer 1.2.2-3 +- Forgot png.h + +* Mon May 6 2002 Bernhard Rosenkraenzer 1.2.2-2 +- Fix compatibility with everyone else. + +* Thu May 2 2002 Havoc Pennington +- 1.2.2 plus makefile patches tarball +- update file list to contain versioned libpng only + +* Wed Jan 09 2002 Tim Powers +- automated rebuild + +* Mon Dec 17 2001 Bernhard Rosenkraenzer 1.2.1-1 +- 1.2.1 + +* Wed Sep 19 2001 Bernhard Rosenkraenzer 1.2.0-1 +- 1.2.0 + +* Mon Jul 16 2001 Trond Eivind Glomsr?d +- s/Copyright/License/ +- fix weird versioning system (epoch was set to "2" in the main + package, serial to "1" in the devel package. Huh?) + +* Wed Jun 20 2001 Than Ngo 1.0.12-1 +- update to 1.0.12 +- add missing libpng symlink + +* Thu May 3 2001 Bernhard Rosenkraenzer 1.0.11-2 +- libpng-devel requires zlib-devel (since png.h includes zlib.h) + (#38883) + +* Wed May 2 2001 Bernhard Rosenkraenzer 1.0.11-1 +- 1.0.11 + +* Sun Apr 15 2001 Bernhard Rosenkraenzer +- 1.0.10 + +* Tue Feb 6 2001 Bernhard Rosenkraenzer +- 1.0.9, fixes Mozilla problems + +* Tue Dec 12 2000 Bernhard Rosenkraenzer +- Rebuild to get rid of 0777 dirs + +* Wed Nov 15 2000 Bernhard Rosenkraenzer +- Remove the workaround for Bug #20018 (from Oct 30). + Qt 2.2.2 fixes the problem the workaround addressed. + +* Mon Oct 30 2000 Bernhard Rosenkraenzer +- Work around a problem causing konqueror to segfault in image preview + mode (Bug #20018) +- Copy SuSE 7.0's patch to handle bad chunks + +* Sun Sep 3 2000 Florian La Roche +- only include the man5 man-pages once in the main rpm + +* Thu Jul 28 2000 Preston Brown +- upgrade to 1.0.8 - fixes small memory leak, other bugs + +* Thu Jul 13 2000 Prospector +- automatic rebuild + +* Mon Jun 19 2000 Bernhard Rosenkraenzer +- patchlevel c +- FHSify + +* Tue Mar 21 2000 Nalin Dahyabhai +- update to 1.0.6 + +* Mon Mar 13 2000 Nalin Dahyabhai +- change serial to Epoch to get dependencies working correctly + +* Fri Feb 11 2000 Nalin Dahyabhai +- move buildroot and add URL + +* Sat Feb 5 2000 Bernhard Rosenkr?nzer +- strip library +- rebuild to compress man pages + +* Sun Nov 21 1999 Bernhard Rosenkr?nzer +- 1.0.5 +- some tweaks to spec file to make updating easier +- handle RPM_OPT_FLAGS + +* Mon Sep 20 1999 Matt Wilson +- changed requires in libpng-devel to include serial +- corrected typo + +* Sun Mar 21 1999 Cristian Gafton +- auto rebuild in the new build environment (release 2) + +* Sun Feb 07 1999 Michael Johnson +- rev to 1.0.3 + +* Thu Dec 17 1998 Cristian Gafton +- build for 6.0 + +* Wed Sep 23 1998 Cristian Gafton +- we are Serial: 1 now because we are reverting the 1.0.2 version from 5.2 + beta to this prior one +- install man pages; set defattr defaults + +* Thu May 07 1998 Prospector System +- translations modified for de, fr, tr + +* Thu Apr 30 1998 Cristian Gafton +- devel subpackage moved to Development/Libraries + +* Wed Apr 08 1998 Cristian Gafton +- upgraded to 1.0.1 +- added buildroot + +* Tue Oct 14 1997 Donnie Barnes +- updated to new version +- spec file cleanups + +* Thu Jul 10 1997 Erik Troan +- built against glibc + From svn at tinysofa.org Thu Jul 1 15:50:04 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:50:04 +1000 (EST) Subject: [tinysofa-svn] r2775 - in tinysofa/snapshot/libtermcap/current: sources specs Message-ID: <20040701155004.F08CB4E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:50:04 +1000 (Fri, 02 Jul 2004) New Revision: 2775 Added: tinysofa/snapshot/libtermcap/current/sources/libtermcap-2.0.8-ia64.patch tinysofa/snapshot/libtermcap/current/sources/termcap-116934.patch tinysofa/snapshot/libtermcap/current/sources/termcap-2.0.8.tar.bz2 Removed: tinysofa/snapshot/libtermcap/current/sources/termcap-2.0.8-infopath.patch tinysofa/snapshot/libtermcap/current/sources/termcap-2.0.8-noinfo.patch tinysofa/snapshot/libtermcap/current/sources/termcap-2.0.8.tar.gz Modified: tinysofa/snapshot/libtermcap/current/specs/libtermcap.spec Log: - Sync with 2.0. - Kept: - libtermcap-aaargh.patch: - termcap-2.0.8-bufsize.patch: - termcap-2.0.8-colon.patch: - termcap-2.0.8-compat21.patch: - termcap-2.0.8-fix-tc.patch: - termcap-2.0.8-glibc22.patch: - termcap-2.0.8-ignore-p.patch: - termcap-2.0.8-instnoroot.patch: - termcap-2.0.8-setuid.patch: - termcap-2.0.8-shared.patch: - termcap-2.0.8-xref.patch: - termcap-buffer.patch: - Added: - libtermcap-2.0.8-ia64.patch: - termcap-116934.patch: - termcap-2.0.8.tar.bz2: - Removed: - termcap-2.0.8-infopath.patch: - termcap-2.0.8-noinfo.patch: - termcap-2.0.8.tar.gz: Added: tinysofa/snapshot/libtermcap/current/sources/libtermcap-2.0.8-ia64.patch =================================================================== --- tinysofa/snapshot/libtermcap/current/sources/libtermcap-2.0.8-ia64.patch 2004-07-01 15:50:02 UTC (rev 2774) +++ tinysofa/snapshot/libtermcap/current/sources/libtermcap-2.0.8-ia64.patch 2004-07-01 15:50:04 UTC (rev 2775) @@ -0,0 +1,13 @@ +--- termcap-2.0.8/termcap.c.ia64sux Mon Jan 14 17:59:19 2002 ++++ termcap-2.0.8/termcap.c Mon Jan 14 18:00:01 2002 +@@ -694,6 +694,10 @@ + (*outfun) (PC); + } + ++static long foo(long x, long y) ++{ ++ return x / y; ++} + + #ifdef TEST + /*ARGSUSED*/ Added: tinysofa/snapshot/libtermcap/current/sources/termcap-116934.patch =================================================================== --- tinysofa/snapshot/libtermcap/current/sources/termcap-116934.patch 2004-07-01 15:50:02 UTC (rev 2774) +++ tinysofa/snapshot/libtermcap/current/sources/termcap-116934.patch 2004-07-01 15:50:04 UTC (rev 2775) @@ -0,0 +1,12 @@ +--- termcap-2.0.8/termcap.c.116934 2004-04-21 14:02:57.000000000 +0100 ++++ termcap-2.0.8/termcap.c 2004-04-21 14:03:57.000000000 +0100 +@@ -457,6 +457,9 @@ + put data in the termcap buffer themselves as a fallback. */ + if (buffer) + { ++ /* Free old buffer if possible. */ ++ if (is_malloced && term_entry) free(term_entry); ++ is_malloced = 0; + term_entry = buffer; + } + return(0); Deleted: tinysofa/snapshot/libtermcap/current/sources/termcap-2.0.8-infopath.patch =================================================================== --- tinysofa/snapshot/libtermcap/current/sources/termcap-2.0.8-infopath.patch 2004-07-01 15:50:02 UTC (rev 2774) +++ tinysofa/snapshot/libtermcap/current/sources/termcap-2.0.8-infopath.patch 2004-07-01 15:50:04 UTC (rev 2775) @@ -1,23 +0,0 @@ ---- termcap-2.0.8/Makefile.orig Mon Jan 24 13:52:12 2000 -+++ termcap-2.0.8/Makefile Mon Jan 24 13:52:27 2000 -@@ -62,9 +62,9 @@ - rm -f /usr/lib/libtermcap.so; \ - ln -s /lib/$(SHARED_LIB) /usr/lib/libtermcap.so; \ - cp -f termcap.h /usr/include; \ -- cp termcap.info* /usr/info; \ -+ cp termcap.info* /usr/share/info; \ - chown $(OWNER) \ -- /usr/info/termcap.info* \ -+ /usr/share/info/termcap.info* \ - /usr/lib/$(STATIC_LIB) \ - /usr/lib/libtermcap.so \ - /usr/include/termcap.h; \ -@@ -78,7 +78,7 @@ - - install-dirs: - -if [ $(prefix) = "/" ]; then \ -- mkdir -p /usr/lib /usr/info /usr/include /etc /lib; \ -+ mkdir -p /usr/lib /usr/share/info /usr/include /etc /lib; \ - fi - - install-data: Deleted: tinysofa/snapshot/libtermcap/current/sources/termcap-2.0.8-noinfo.patch =================================================================== --- tinysofa/snapshot/libtermcap/current/sources/termcap-2.0.8-noinfo.patch 2004-07-01 15:50:02 UTC (rev 2774) +++ tinysofa/snapshot/libtermcap/current/sources/termcap-2.0.8-noinfo.patch 2004-07-01 15:50:04 UTC (rev 2775) @@ -1,53 +0,0 @@ -diff -Nur termcap-2.0.8/Makefile termcap-2.0.8.changed/Makefile ---- termcap-2.0.8/Makefile 2002-08-29 21:56:15.000000000 +0200 -+++ termcap-2.0.8.changed/Makefile 2002-08-29 21:57:56.000000000 +0200 -@@ -14,7 +14,7 @@ - AR=ar - ARFLAGS=ucvr - --MAKEINFO=makeinfo -+#MAKEINFO=makeinfo - - OWNER=bin.bin - -@@ -34,7 +34,7 @@ - SRCS = termcap.c tparam.c version.c - OBJS= $(SRCS:.c=.o) - --all lib: pic .depend $(TARGETS) info -+all lib: pic .depend $(TARGETS) #info - - $(STATIC_LIB): $(OBJS) - $(AR) $(ARFLAGS) $@ $(OBJS) -@@ -62,7 +62,7 @@ - rm -f /usr/lib/libtermcap.so; \ - ln -s /lib/$(SHARED_LIB) /usr/lib/libtermcap.so; \ - cp -f termcap.h /usr/include; \ -- cp termcap.info* /usr/info; \ -+ cp \ - chown $(OWNER) \ - /usr/info/termcap.info* \ - /usr/lib/$(STATIC_LIB) \ -@@ -78,7 +78,7 @@ - - install-dirs: - -if [ $(prefix) = "/" ]; then \ -- mkdir -p /usr/lib /usr/info /usr/include /etc /lib; \ -+ mkdir -p /usr/lib /usr/include /etc /lib; \ - fi - - install-data: -@@ -87,10 +87,10 @@ - #chown $(OWNER) /etc/termcap; \ - fi - --info: termcap.info -+info: #termcap.info - --termcap.info: termcap.texi -- $(MAKEINFO) termcap.texi --output=$@ -+termcap.info: #termcap.texi -+ #$(MAKEINFO) termcap.texi --output=$@ - - clean: - -rm -fr core a.out *.o pic $(TARGETS) Added: tinysofa/snapshot/libtermcap/current/sources/termcap-2.0.8.tar.bz2 =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/libtermcap/current/sources/termcap-2.0.8.tar.bz2 ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: tinysofa/snapshot/libtermcap/current/sources/termcap-2.0.8.tar.gz =================================================================== (Binary files differ) Modified: tinysofa/snapshot/libtermcap/current/specs/libtermcap.spec =================================================================== --- tinysofa/snapshot/libtermcap/current/specs/libtermcap.spec 2004-07-01 15:50:02 UTC (rev 2774) +++ tinysofa/snapshot/libtermcap/current/specs/libtermcap.spec 2004-07-01 15:50:04 UTC (rev 2775) @@ -1,11 +1,11 @@ Summary: A basic system library for accessing the termcap database. Name: libtermcap Version: 2.0.8 -Release: 29ts +Release: 38ts +Source: ftp://metalab.unc.edu/pub/Linux/GCC/termcap-2.0.8.tar.bz2 +Url: ftp://metalab.unc.edu/pub/Linux/GCC/ License: LGPL -Group: tinysofa official -Source: ftp://sunsite.unc.edu/pub/Linux/GCC/termcap-2.0.8.tar.gz -Url: ftp://sunsite.unc.edu/pub/Linux/GCC/ +Group: System Environment/Libraries Patch0: termcap-2.0.8-shared.patch Patch1: termcap-2.0.8-setuid.patch Patch2: termcap-2.0.8-instnoroot.patch @@ -18,12 +18,12 @@ Patch8: termcap-2.0.8-bufsize.patch Patch9: termcap-2.0.8-colon.patch Patch10: libtermcap-aaargh.patch -Patch11: termcap-2.0.8-infopath.patch -Patch12: termcap-2.0.8-glibc22.patch -Patch13: termcap-2.0.8-noinfo.patch -BuildRequires: termcap -Requires: termcap -BuildRoot: %{_tmppath}/%{name}-root +Patch11: termcap-2.0.8-glibc22.patch +Patch12: libtermcap-2.0.8-ia64.patch +Patch13: termcap-116934.patch +Requires: /etc/termcap +BuildPrereq: texinfo +BuildRoot: %{_tmppath}/%{name}-%{version}-root %description The libtermcap package contains a basic system library needed to @@ -33,8 +33,8 @@ %package devel Summary: Development tools for programs which will access the termcap database. -Group: tinysofa official -Requires: libtermcap +Group: Development/Libraries +Requires: libtermcap = %{version} %description devel This package includes the libraries and header files necessary for @@ -57,73 +57,145 @@ %patch8 -p1 -b .bufsize %patch9 -p1 -b .colon %patch10 -p1 -b .aaargh -#%patch11 -p1 -%patch12 -p1 -%patch13 -p1 -b .noinfo +%patch11 -p1 -b .glibc22 +%ifarch ia64 +%patch12 -p1 -b .ia64 +%endif +%patch13 -p1 -b .116934 %build -make RPM_OPT_FLAGS="$RPM_OPT_FLAGS" +make AR=%{__ar} CC=%{__cc} CFLAGS="$RPM_OPT_FLAGS -I." %install -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != "/" ] && rm -rf "$RPM_BUILD_ROOT" -mkdir -p $RPM_BUILD_ROOT/{usr/lib,usr/include,etc,lib} +rm -rf $RPM_BUILD_ROOT +mkdir -p $RPM_BUILD_ROOT/{usr/lib,%{_infodir},usr/include,etc,lib} export PATH=/sbin:$PATH make prefix=$RPM_BUILD_ROOT/usr install -install -m644 termcap.src $RPM_BUILD_ROOT/etc/termcap +install -c -m644 termcap.src $RPM_BUILD_ROOT/etc/termcap +cp termcap.info* $RPM_BUILD_ROOT/%{_infodir} -( cd $RPM_BUILD_ROOT - rm -f ./etc/termcap - mv ./usr/lib/libtermcap.so* ./lib - ln -sf libtermcap.so.2.0.8 ./lib/libtermcap.so - ln -sf ../../lib/libtermcap.so.2.0.8 ./usr/lib/libtermcap.so -) +rm -f $RPM_BUILD_ROOT/etc/termcap +mkdir -p $RPM_BUILD_ROOT/%{_lib} $RPM_BUILD_ROOT/%{_libdir} +mv $RPM_BUILD_ROOT/usr/lib/libtermcap.so* $RPM_BUILD_ROOT/%{_lib}/ +ln -sf libtermcap.so.2.0.8 $RPM_BUILD_ROOT/%{_lib}/libtermcap.so.2 +ln -sf ../../%{_lib}/libtermcap.so.2.0.8 $RPM_BUILD_ROOT/%{_libdir}/libtermcap.so +gzip -9nf $RPM_BUILD_ROOT/%{_infodir}/termcap.info* +chmod 644 $RPM_BUILD_ROOT/%{_infodir}/termcap.info* +if [ %{_libdir} != /usr/lib ] ; then + mv $RPM_BUILD_ROOT/usr/lib/libtermcap.a $RPM_BUILD_ROOT/%{_libdir}/libtermcap.a +fi %clean -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT +rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig -%postun -/sbin/ldconfig +%trigger devel -- info >= 3.12 +/sbin/install-info \ + --section="Libraries" --entry="* Termcap: (termcap). The GNU termcap library." \ + --info-dir=%{_infodir} %{_infodir}/termcap.info.gz +%postun -p /sbin/ldconfig + +%postun devel +if [ $1 = 0 ]; then + /sbin/install-info --delete \ + --section="Libraries" --entry="* Termcap: (termcap). The GNU termcap library." \ + --info-dir=%{_infodir} %{_infodir}/termcap.info.gz +fi + %files %defattr(-,root,root) -/lib/libtermcap.so.2.0.8 +/%{_lib}/libtermcap.so.2* %files devel %defattr(-,root,root) -/usr/lib/libtermcap.a -/usr/include/termcap.h -/usr/lib/libtermcap.so +%{_libdir}/libtermcap.a +%{_libdir}/libtermcap.so +%{_includedir}/termcap.h +%{_infodir}/termcap.info* %changelog -* Wed May 19 2004 tsintegrate 2.0.8-29ts -- current (2.0.8-28ts) integrated as 2.0.8-29ts for release 1.0-U1 +* Fri May 7 2004 Tim Waugh 2.0.8-38 +- Fix tgetent() (bug #116934). -* Thu Dec 11 2003 Erlend Midttun 2.0.8-25tr -- Big rebuild +* Tue Mar 02 2004 Elliot Lee +- rebuilt -* Wed Jun 18 2003 Erlend Midttun 2.0.8-24tr -- Big rebuild +* Fri Feb 13 2004 Elliot Lee +- rebuilt -* Mon Mar 24 2003 Erlend Midttun 2.0.8-23em -- Rebuilt against glibc 2.3.2. +* Wed Jun 04 2003 Elliot Lee +- rebuilt -* Thu Aug 29 2002 Christian H. Toldnes 2.0.8-22ct -- Patched away info generation. +* Tue Feb 04 2003 Florian La Roche +- add symlink to shared lib -* Tue Aug 6 2002 Christian H. Toldnes 2.0.8-21ct -- Patched to build against new glibc (Patch 12) -- Removed info stuff. +* Mon Jan 27 2003 Nalin Dahyabhai 2.0.8-34 +- don't strip libraries directly, that's the job of the buildroot policy +- rework part of %%install to handle cases where %%{_libdir} = /usr/lib -* Tue Jul 17 2001 Erlend Midttun -- Inc serial number before release. +* Wed Jan 22 2003 Tim Powers +- rebuilt -* Mon Jan 24 2000 Tore Olsen -- moved /usr/info to /usr/share/info for FHS compliance +* Thu Nov 21 2002 Elliot Lee 2.0.8-33 +- Cross-compile changes +* Thu Nov 21 2002 Elliot Lee +- Pull in hammer changes, rebuild + +* Tue Sep 24 2002 Jeremy Katz +- libdir fun + +* Fri Jun 21 2002 Tim Powers +- automated rebuild + +* Thu May 23 2002 Tim Powers +- automated rebuild + +* Mon Jan 14 2002 Bernhard Rosenkraenzer 2.0.8-29 +- Add workaround for libgcc/glibc breakage on ia64 +- s/Copyright/License/ in spec file +- bzip2 source to save space + +* Mon Jul 9 2001 Tim Powers +- make libtermcap-devel require the same version as the main package + +* Thu Jun 21 2001 Than Ngo +- add missing libtermcap symlink + +* Sat Oct 7 2000 Bernhard Rosenkraenzer +- Uninstall info pages in %%postun devel rather than %%postun + (Bug #18545) + +* Wed Aug 16 2000 Nalin Dahyabhai +- fix broken symlink (#16285) + +* Mon Aug 14 2000 Preston Brown +- absolute --> relative symlink (#16131) + +* Thu Jul 13 2000 Prospector +- automatic rebuild + +* Tue Jul 4 2000 Matt Wilson +- move the trigger to the devel package, that's where the info pages + live now + +* Sun Jun 18 2000 Matt Wilson +- rebuild for next release +- move info pages to the development package +- use %%{_infodir} +- patched to build against new glibc (patch11) + +* Sun Feb 6 2000 Bernhard Rosenkr?nzer +- BuildPrereq: texinfo (#8927) + +* Sat Feb 5 2000 Bernhard Rosenkr?nzer +- strip library +- fix up handling of RPM_OPT_FLAGS + * Tue Aug 30 1999 Bill Nottingham - ignore the first argument to tgetent, so the last change doesn't keep blowing up programs. @@ -173,4 +245,4 @@ - spec file cleanups * Tue Jun 03 1997 Erik Troan -- built against glibc \ No newline at end of file +- built against glibc From svn at tinysofa.org Thu Jul 1 15:50:08 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:50:08 +1000 (EST) Subject: [tinysofa-svn] r2776 - in tinysofa/snapshot/libtiff/current: sources specs Message-ID: <20040701155008.90BBD4E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:50:08 +1000 (Fri, 02 Jul 2004) New Revision: 2776 Added: tinysofa/snapshot/libtiff/current/sources/libtiff-v3.6-shlib.patch tinysofa/snapshot/libtiff/current/sources/libtiff-v3.6.1-64bit.patch tinysofa/snapshot/libtiff/current/sources/libtiff-v3.6.1-codecs.patch tinysofa/snapshot/libtiff/current/sources/libtiff-v3.6.1-makeflags.patch tinysofa/snapshot/libtiff/current/sources/tiff-v3.6.1.tar.gz Removed: tinysofa/snapshot/libtiff/current/sources/libtiff-v3.5.4-codecs.patch tinysofa/snapshot/libtiff/current/sources/libtiff-v3.5.7-exit.patch tinysofa/snapshot/libtiff/current/sources/libtiff-v3.5.7-makeflags.patch tinysofa/snapshot/libtiff/current/sources/libtiff-v3.5.7-seek.patch tinysofa/snapshot/libtiff/current/sources/tiff-v3.6-shlib.patch tinysofa/snapshot/libtiff/current/sources/tiff-v3.6.0.tar.gz Modified: tinysofa/snapshot/libtiff/current/specs/libtiff.spec Log: - Sync with 2.0. - Kept: - libtiff-v3.5.4-mandir.patch: - libtiff-v3.5.5-buildroot.patch: - libtiff-v3.5.7-largefile.patch: - Added: - libtiff-v3.6-shlib.patch: - libtiff-v3.6.1-64bit.patch: - libtiff-v3.6.1-codecs.patch: - libtiff-v3.6.1-makeflags.patch: - tiff-v3.6.1.tar.gz: - Removed: - libtiff-v3.5.4-codecs.patch: - libtiff-v3.5.7-exit.patch: - libtiff-v3.5.7-makeflags.patch: - libtiff-v3.5.7-seek.patch: - tiff-v3.6-shlib.patch: - tiff-v3.6.0.tar.gz: Deleted: tinysofa/snapshot/libtiff/current/sources/libtiff-v3.5.4-codecs.patch =================================================================== --- tinysofa/snapshot/libtiff/current/sources/libtiff-v3.5.4-codecs.patch 2004-07-01 15:50:04 UTC (rev 2775) +++ tinysofa/snapshot/libtiff/current/sources/libtiff-v3.5.4-codecs.patch 2004-07-01 15:50:08 UTC (rev 2776) @@ -1,40 +0,0 @@ ---- tiff-v3.5.4/config.site Sun Sep 26 18:03:46 1999 -+++ tiff-v3.5.4/config.site Tue Jan 18 10:33:09 2000 -@@ -41,8 +41,8 @@ - # Package controls. - # - #DSO="auto" # auto|IRIX|IRIX52 enable DSO support for system --#JPEG="no" # yes|no configure JPEG support (see below) --#ZIP="no" # yes|no configure Deflate support (see below) -+JPEG="yes" # yes|no configure JPEG support (see below) -+ZIP="yes" # yes|no configure Deflate support (see below) - #LIBGL="auto" # yes|no|auto configure IRIS GL-based tools - #LIBIMAGE="auto" # yes|no|auto configure SGI RGB image tools - #HTML="no" # yes|no install HTML documentation -@@ -96,6 +96,7 @@ - # - #DIRS_LIBINC="$DIRS_LIBINC ../src/jpeg-6b" # directory for jpeg include files - #DIR_JPEGLIB=../src/jpeg-6b # directory for libjpeg -+DIR_JPEGLIB="/usr/lib" - - # - # Deflate-specific parameters; used when Deflate support is enabled (see above). -@@ -111,6 +112,7 @@ - # - #DIRS_LIBINC="$DIRS_LIBINC ../zlib" # directory for zlib include files - #DIR_GZLIB="../zlib" # directory for libz -+DIR_GZLIB="/usr/lib" - - # - # Miscellaneous parameters. ---- tiff-v3.5.4/libtiff/Makefile.in Sat Jan 29 00:46:31 2000 -+++ tiff-v3.5.4/libtiff/Makefile.in Sat Jan 29 00:46:11 2000 -@@ -152,7 +152,7 @@ - ${RANLIB} libtiff.a - - $(SHLIB): $(SHOBJS) -- gcc -o $(SHLIB) -Wl,-soname,$(SONAME) -shared $(SHOBJS) -+ gcc -o $(SHLIB) -Wl,-soname,$(SONAME) -shared $(SHOBJS) -ljpeg -lz - - # - # NB: The configure script verifies that the configured Deleted: tinysofa/snapshot/libtiff/current/sources/libtiff-v3.5.7-exit.patch =================================================================== --- tinysofa/snapshot/libtiff/current/sources/libtiff-v3.5.7-exit.patch 2004-07-01 15:50:04 UTC (rev 2775) +++ tinysofa/snapshot/libtiff/current/sources/libtiff-v3.5.7-exit.patch 2004-07-01 15:50:08 UTC (rev 2776) @@ -1,10 +0,0 @@ ---- tiff-v3.5.7/tools/tiffcp.c~ Thu Jun 7 10:38:40 2001 -+++ tiff-v3.5.7/tools/tiffcp.c Fri Jun 21 10:29:31 2002 -@@ -281,6 +281,7 @@ - } - TIFFClose(in); - } -+ return 0; - } - - Deleted: tinysofa/snapshot/libtiff/current/sources/libtiff-v3.5.7-makeflags.patch =================================================================== --- tinysofa/snapshot/libtiff/current/sources/libtiff-v3.5.7-makeflags.patch 2004-07-01 15:50:04 UTC (rev 2775) +++ tinysofa/snapshot/libtiff/current/sources/libtiff-v3.5.7-makeflags.patch 2004-07-01 15:50:08 UTC (rev 2776) @@ -1,76 +0,0 @@ ---- tiff-v3.5.7/Makefile.in.makeflags 2001-11-28 18:00:35.000000000 +0100 -+++ tiff-v3.5.7/Makefile.in 2003-02-11 17:57:57.000000000 +0100 -@@ -46,36 +46,36 @@ - - all default: - @if [ "@PORT@" = yes ]; then \ -- ${ECHO} "= "port; cd port; ${MAKE} -${MAKEFLAGS}; \ -+ ${ECHO} "= "port; cd port; ${MAKE} ${MAKEFLAGS}; \ - else \ - true; \ - fi -- @${ECHO} "= "libtiff; cd libtiff; ${MAKE} -${MAKEFLAGS} -- @${ECHO} "= "tools; cd tools; ${MAKE} -${MAKEFLAGS} -- @${ECHO} "= "man; cd man; ${MAKE} -${MAKEFLAGS} -+ @${ECHO} "= "libtiff; cd libtiff; ${MAKE} ${MAKEFLAGS} -+ @${ECHO} "= "tools; cd tools; ${MAKE} ${MAKEFLAGS} -+ @${ECHO} "= "man; cd man; ${MAKE} ${MAKEFLAGS} - - install: -- @${ECHO} "= "libtiff; cd libtiff; ${MAKE} -${MAKEFLAGS} install -- @${ECHO} "= "tools; cd tools; ${MAKE} -${MAKEFLAGS} install -- @${ECHO} "= "man; cd man; ${MAKE} -${MAKEFLAGS} install -+ @${ECHO} "= "libtiff; cd libtiff; ${MAKE} ${MAKEFLAGS} install -+ @${ECHO} "= "tools; cd tools; ${MAKE} ${MAKEFLAGS} install -+ @${ECHO} "= "man; cd man; ${MAKE} ${MAKEFLAGS} install - @if [ "@HTML@" = yes ]; then \ -- ${ECHO} "= "html; cd html; ${MAKE} -${MAKEFLAGS} install; \ -+ ${ECHO} "= "html; cd html; ${MAKE} ${MAKEFLAGS} install; \ - else \ - true; \ - fi - - install-private: install -- @${ECHO} "= "libtiff; cd libtiff; ${MAKE} -${MAKEFLAGS} installPrivateHdrs -+ @${ECHO} "= "libtiff; cd libtiff; ${MAKE} ${MAKEFLAGS} installPrivateHdrs - - clean: - @if [ "@PORT@" = yes ]; then \ -- ${ECHO} "= "port; cd port; ${MAKE} -${MAKEFLAGS} clean; \ -+ ${ECHO} "= "port; cd port; ${MAKE} ${MAKEFLAGS} clean; \ - else \ - true; \ - fi -- @${ECHO} "= "libtiff; cd libtiff; ${MAKE} -${MAKEFLAGS} clean -- @${ECHO} "= "tools; cd tools; ${MAKE} -${MAKEFLAGS} clean -- @${ECHO} "= "man; cd man; ${MAKE} -${MAKEFLAGS} clean -+ @${ECHO} "= "libtiff; cd libtiff; ${MAKE} ${MAKEFLAGS} clean -+ @${ECHO} "= "tools; cd tools; ${MAKE} ${MAKEFLAGS} clean -+ @${ECHO} "= "man; cd man; ${MAKE} ${MAKEFLAGS} clean - # -cd contrib/dbs; ${MAKE} -${MAKEFLAGS} clean - # -cd contrib/dbs/xtiff; ${MAKE} -${MAKEFLAGS} clean - -@@ -100,7 +100,7 @@ - product:: - test -d dist || mkdir dist - rm -f dist/rawidb -- SRC=`pwd` RAWIDB=`pwd`/dist/rawidb ${MAKE} -${MAKEFLAGS} install installLink -+ SRC=`pwd` RAWIDB=`pwd`/dist/rawidb ${MAKE} ${MAKEFLAGS} install installLink - rm -f dist/idb - sort -u +4 dist/rawidb > dist/idb - ${GENDIST} -v -dist dist -idb dist/idb \ -@@ -498,11 +498,11 @@ - - release: - (cd ${SRCDIR}/dist; sh newversion) -- ${MAKE} -${MAKEFLAGS} release.stamp -- (cd ${SRCDIR}/libtiff; ${MAKE} -${MAKEFLAGS} tiffvers.h) -+ ${MAKE} ${MAKEFLAGS} release.stamp -+ (cd ${SRCDIR}/libtiff; ${MAKE} ${MAKEFLAGS} tiffvers.h) - # ${SRCDIR}/configure ${CONFIG} - # ${MAKE} -${MAKEFLAGS} product -- ${MAKE} -${MAKEFLAGS} release.tar.zip -+ ${MAKE} ${MAKEFLAGS} release.tar.zip - - - # stamp relevant files according to current alpha Deleted: tinysofa/snapshot/libtiff/current/sources/libtiff-v3.5.7-seek.patch =================================================================== --- tinysofa/snapshot/libtiff/current/sources/libtiff-v3.5.7-seek.patch 2004-07-01 15:50:04 UTC (rev 2775) +++ tinysofa/snapshot/libtiff/current/sources/libtiff-v3.5.7-seek.patch 2004-07-01 15:50:08 UTC (rev 2776) @@ -1,11 +0,0 @@ ---- tiff-v3.5.7/libtiff/tiffiop.h.seek Fri Jan 28 21:56:59 2000 -+++ tiff-v3.5.7/libtiff/tiffiop.h Wed May 15 11:43:12 2002 -@@ -165,7 +165,7 @@ - #define TIFFWriteFile(tif, buf, size) \ - ((*(tif)->tif_writeproc)((tif)->tif_clientdata,buf,size)) - #define TIFFSeekFile(tif, off, whence) \ -- ((*(tif)->tif_seekproc)((tif)->tif_clientdata,(toff_t)(off),whence)) -+ ((tif)->tif_seekproc?((*(tif)->tif_seekproc)((tif)->tif_clientdata,(toff_t)(off),whence)):0) - #define TIFFCloseFile(tif) \ - ((*(tif)->tif_closeproc)((tif)->tif_clientdata)) - #define TIFFGetFileSize(tif) \ Added: tinysofa/snapshot/libtiff/current/sources/libtiff-v3.6-shlib.patch =================================================================== --- tinysofa/snapshot/libtiff/current/sources/libtiff-v3.6-shlib.patch 2004-07-01 15:50:04 UTC (rev 2775) +++ tinysofa/snapshot/libtiff/current/sources/libtiff-v3.6-shlib.patch 2004-07-01 15:50:08 UTC (rev 2776) @@ -0,0 +1,53 @@ +--- tiff-v3.6.1/libtiff/Makefile.in.shlib 2003-11-17 04:24:41.000000000 -0500 ++++ tiff-v3.6.1/libtiff/Makefile.in 2004-05-19 15:01:48.000000000 -0400 +@@ -66,6 +66,8 @@ + OPTIMIZER=@OPTIMIZER@ + LFSOPTS=@LFSOPTS@ + CFLAGS = @ENVOPTS@ @LIBCOPTS@ ${COPTS} ${OPTIMIZER} ${LFSOPTS} ${IPATH} ${CONF_LIBRARY} ++SONAME = libtiff.so.3 ++SHLIB = libtiff.so.3.6 + # + SRCS = \ + tif_aux.c \ +@@ -143,7 +145,8 @@ + tif_write.o \ + tif_zip.o \ + ${NULL} +-TARGETS = libtiff.a ++TARGETS = libtiff.a $(SHLIB) ++SHOBJS= $(OBJS:%.o=%.so) + + all: ${TARGETS} + if [ @DSO at dso != nodso ]; then \ +@@ -156,6 +159,9 @@ + ${AR} ${AROPTS} libtiff.a $? + ${RANLIB} libtiff.a + ++$(SHLIB): $(SHOBJS) ++ gcc -o $(SHLIB) -Wl,-soname,$(SONAME) -shared $(SHOBJS) -ljpeg -lz -lm ++ + # + # NB: The configure script verifies that the configured + # tools are capable of producing a DSO before enabling +@@ -412,3 +418,6 @@ + mkg3states tif_fax3sm.c \ + mkversion ${SRCDIR}/tiffvers.h \ + libtiff.a libtiff. at DSOSUF@ libtiff. at DSOSUF_VERSION@ *dso ++ ++%.so : %.c ++ $(CC) -c -fPIC $(CFLAGS) $(CPPFLAGS) $< -o $@ +--- tiff-v3.6.1/tools/Makefile.in.shlib 2003-11-27 10:08:12.000000000 -0500 ++++ tiff-v3.6.1/tools/Makefile.in 2004-05-19 15:04:44.000000000 -0400 +@@ -48,10 +48,10 @@ + IPATH = -I. -I${SRCDIR} -I${LIBDIR} + CFLAGS = @ENVOPTS@ ${COPTS} ${OPTIMIZER} ${IPATH} + # +-TIFFLIB = ${DEPTH}/libtiff/libtiff. at DSOSUF@ ++TIFFLIB = ${DEPTH}/libtiff/libtiff.so.3.6 + LIBJPEG = @LIBJPEG@ + LIBGZ = @LIBGZ@ +-LIBTIFF = @TIFFLIBREF@ ++LIBTIFF = -L${DEPTH}/libtiff -ltiff + LIBPORT = @LIBPORT@ + MACHLIBS= @MACHDEPLIBS@ + LIBS = ${LIBTIFF} ${LIBJPEG} ${LIBGZ} ${LIBPORT} ${MACHLIBS} Added: tinysofa/snapshot/libtiff/current/sources/libtiff-v3.6.1-64bit.patch =================================================================== --- tinysofa/snapshot/libtiff/current/sources/libtiff-v3.6.1-64bit.patch 2004-07-01 15:50:04 UTC (rev 2775) +++ tinysofa/snapshot/libtiff/current/sources/libtiff-v3.6.1-64bit.patch 2004-07-01 15:50:08 UTC (rev 2776) @@ -0,0 +1,11 @@ +--- tiff-v3.6.1/libtiff/tiff.h.64bit 2003-12-22 03:22:15.000000000 -0500 ++++ tiff-v3.6.1/libtiff/tiff.h 2004-05-19 13:53:35.000000000 -0400 +@@ -79,7 +79,7 @@ + typedef unsigned char uint8; + typedef short int16; + typedef unsigned short uint16; /* sizeof (uint16) must == 2 */ +-#if defined(__alpha) || (defined(_MIPS_SZLONG) && _MIPS_SZLONG == 64) || defined(__LP64__) || defined(__arch64__) ++#if defined(__s390x__) || defined(__ia64__) || defined(__alpha) || (defined(_MIPS_SZLONG) && _MIPS_SZLONG == 64) || defined(__LP64__) || defined(__arch64__) + typedef int int32; + typedef unsigned int uint32; /* sizeof (uint32) must == 4 */ + #else Added: tinysofa/snapshot/libtiff/current/sources/libtiff-v3.6.1-codecs.patch =================================================================== --- tinysofa/snapshot/libtiff/current/sources/libtiff-v3.6.1-codecs.patch 2004-07-01 15:50:04 UTC (rev 2775) +++ tinysofa/snapshot/libtiff/current/sources/libtiff-v3.6.1-codecs.patch 2004-07-01 15:50:08 UTC (rev 2776) @@ -0,0 +1,31 @@ + # + # NB: The configure script verifies that the configured +--- tiff-v3.6.1/config.site.codecs 2002-10-12 08:52:46.000000000 -0400 ++++ tiff-v3.6.1/config.site 2004-05-19 13:46:37.000000000 -0400 +@@ -41,8 +41,8 @@ + # Package controls. + # + #DSO="auto" # auto|IRIX|IRIX52 enable DSO support for system +-#JPEG="yes" # yes|no configure JPEG support (see below) +-#ZIP="yes" # yes|no configure Deflate support (see below) ++JPEG="yes" # yes|no configure JPEG support (see below) ++ZIP="yes" # yes|no configure Deflate support (see below) + #LIBGL="auto" # yes|no|auto configure IRIS GL-based tools + #LIBIMAGE="auto" # yes|no|auto configure SGI RGB image tools + #HTML="yes" # yes|no install HTML documentation +@@ -98,6 +98,7 @@ + # + #DIRS_LIBINC="$DIRS_LIBINC ../src/jpeg-6b" # directory for jpeg include files + #DIR_JPEGLIB=../src/jpeg-6b # directory for libjpeg ++DIR_JPEGLIB="/usr/lib" + + # The following will enable OJPEG support. Note that a patch libjpeg is + # required before this can be enabled. It is also only supported if JPEG is +@@ -119,6 +120,7 @@ + # + #DIRS_LIBINC="$DIRS_LIBINC ../zlib" # directory for zlib include files + #DIR_GZLIB="../zlib" # directory for libz ++DIR_GZLIB="/usr/lib" + + # + # Miscellaneous parameters. Added: tinysofa/snapshot/libtiff/current/sources/libtiff-v3.6.1-makeflags.patch =================================================================== --- tinysofa/snapshot/libtiff/current/sources/libtiff-v3.6.1-makeflags.patch 2004-07-01 15:50:04 UTC (rev 2775) +++ tinysofa/snapshot/libtiff/current/sources/libtiff-v3.6.1-makeflags.patch 2004-07-01 15:50:08 UTC (rev 2776) @@ -0,0 +1,72 @@ +--- tiff-v3.6.1/Makefile.in.makeflags 2003-12-23 15:11:32.000000000 -0500 ++++ tiff-v3.6.1/Makefile.in 2004-05-20 15:09:00.000000000 -0400 +@@ -46,13 +46,13 @@ + + all default: + @if [ "@PORT@" = yes ]; then \ +- ${ECHO} "= "port; cd port; ${MAKE} -${MAKEFLAGS}; \ ++ ${ECHO} "= "port; cd port; ${MAKE} ; \ + else \ + true; \ + fi +- @${ECHO} "= "libtiff; cd libtiff; ${MAKE} -${MAKEFLAGS} +- @${ECHO} "= "tools; cd tools; ${MAKE} -${MAKEFLAGS} +- @${ECHO} "= "man; cd man; ${MAKE} -${MAKEFLAGS} ++ @${ECHO} "= "libtiff; cd libtiff; ${MAKE} ++ @${ECHO} "= "tools; cd tools; ${MAKE} ++ @${ECHO} "= "man; cd man; ${MAKE} + + install: + @${ECHO} "= "libtiff; cd libtiff; ${MAKE} install +@@ -65,19 +65,19 @@ + fi + + install-private: install +- @${ECHO} "= "libtiff; cd libtiff; ${MAKE} -${MAKEFLAGS} installPrivateHdrs ++ @${ECHO} "= "libtiff; cd libtiff; ${MAKE} installPrivateHdrs + + clean: + @if [ "@PORT@" = yes ]; then \ +- ${ECHO} "= "port; cd port; ${MAKE} -${MAKEFLAGS} clean; \ ++ ${ECHO} "= "port; cd port; ${MAKE} clean; \ + else \ + true; \ + fi +- @${ECHO} "= "libtiff; cd libtiff; ${MAKE} -${MAKEFLAGS} clean +- @${ECHO} "= "tools; cd tools; ${MAKE} -${MAKEFLAGS} clean +- @${ECHO} "= "man; cd man; ${MAKE} -${MAKEFLAGS} clean +-# -cd contrib/dbs; ${MAKE} -${MAKEFLAGS} clean +-# -cd contrib/dbs/xtiff; ${MAKE} -${MAKEFLAGS} clean ++ @${ECHO} "= "libtiff; cd libtiff; ${MAKE} clean ++ @${ECHO} "= "tools; cd tools; ${MAKE} clean ++ @${ECHO} "= "man; cd man; ${MAKE} clean ++# -cd contrib/dbs; ${MAKE} clean ++# -cd contrib/dbs/xtiff; ${MAKE} clean + + clobber distclean: clean + rm -f Makefile libtiff/port.h config.log +@@ -100,7 +100,7 @@ + product:: + test -d dist || mkdir dist + rm -f dist/rawidb +- SRC=`pwd` RAWIDB=`pwd`/dist/rawidb ${MAKE} -${MAKEFLAGS} install installLink ++ SRC=`pwd` RAWIDB=`pwd`/dist/rawidb ${MAKE} install installLink + rm -f dist/idb + sort -u +4 dist/rawidb > dist/idb + ${GENDIST} -v -dist dist -idb dist/idb \ +@@ -518,11 +518,11 @@ + + release: + (cd ${SRCDIR}/dist; sh newversion) +- ${MAKE} -${MAKEFLAGS} release.stamp +- (cd ${SRCDIR}/libtiff; ${MAKE} -${MAKEFLAGS} tiffvers.h) ++ ${MAKE} release.stamp ++ (cd ${SRCDIR}/libtiff; ${MAKE} tiffvers.h) + # ${SRCDIR}/configure ${CONFIG} +-# ${MAKE} -${MAKEFLAGS} product +- ${MAKE} -${MAKEFLAGS} release.tar.zip ++# ${MAKE} product ++ ${MAKE} release.tar.zip + + + # stamp relevant files according to current alpha Deleted: tinysofa/snapshot/libtiff/current/sources/tiff-v3.6-shlib.patch =================================================================== --- tinysofa/snapshot/libtiff/current/sources/tiff-v3.6-shlib.patch 2004-07-01 15:50:04 UTC (rev 2775) +++ tinysofa/snapshot/libtiff/current/sources/tiff-v3.6-shlib.patch 2004-07-01 15:50:08 UTC (rev 2776) @@ -1,60 +0,0 @@ -diff -Nru tiff-v3.6.0.orig/libtiff/Makefile.in tiff-v3.6.0/libtiff/Makefile.in ---- tiff-v3.6.0.orig/libtiff/Makefile.in 2003-08-20 10:42:17.000000000 +0000 -+++ tiff-v3.6.0/libtiff/Makefile.in 2003-12-15 07:14:02.000000000 +0000 -@@ -66,6 +66,9 @@ - OPTIMIZER=@OPTIMIZER@ - LFSOPTS=@LFSOPTS@ - CFLAGS = @ENVOPTS@ @LIBCOPTS@ ${COPTS} ${OPTIMIZER} ${LFSOPTS} ${IPATH} ${CONF_LIBRARY} -+SONAME = libtiff.so.3 -+SHLIB = libtiff.so.3.6 -+ - # - SRCS = \ - tif_aux.c \ -@@ -141,7 +144,8 @@ - tif_write.o \ - tif_zip.o \ - ${NULL} --TARGETS = libtiff.a -+TARGETS = libtiff.a $(SHLIB) -+SHOBJS= $(OBJS:%.o=%.so) - - all: ${TARGETS} - if [ @DSO at dso != nodso ]; then \ -@@ -154,6 +158,10 @@ - ${AR} ${AROPTS} libtiff.a $? - ${RANLIB} libtiff.a - -+$(SHLIB): $(SHOBJS) -+ gcc -o $(SHLIB) -Wl,-soname,$(SONAME) -shared $(SHOBJS) -+ -+ - # - # NB: The configure script verifies that the configured - # tools are capable of producing a DSO before enabling -@@ -277,6 +285,9 @@ - ${CC} -o mkg3states ${CFLAGS} ${SRCDIR}/mkg3states.c - rm -f tif_fax3sm.c; ./mkg3states -c const tif_fax3sm.c - -+%.so : %.c -+ $(CC) -c -fPIC $(CFLAGS) $(CPPFLAGS) $< -o $@ -+ - tif_aux.o: ${SRCDIR}/tif_aux.c - ${CC} -c ${CFLAGS} ${SRCDIR}/tif_aux.c - tif_close.o: ${SRCDIR}/tif_close.c -diff -Nru tiff-v3.6.0.orig/tools/Makefile.in tiff-v3.6.0/tools/Makefile.in ---- tiff-v3.6.0.orig/tools/Makefile.in 2002-08-11 15:01:46.000000000 +0000 -+++ tiff-v3.6.0/tools/Makefile.in 2003-12-15 07:14:52.000000000 +0000 -@@ -48,10 +48,10 @@ - IPATH = -I. -I${SRCDIR} -I${LIBDIR} - CFLAGS = @ENVOPTS@ ${COPTS} ${OPTIMIZER} ${IPATH} - # --TIFFLIB = ${DEPTH}/libtiff/libtiff. at DSOSUF@ -+TIFFLIB = ${DEPTH}/libtiff/libtiff.so.3.6 - LIBJPEG = @LIBJPEG@ - LIBGZ = @LIBGZ@ --LIBTIFF = @TIFFLIBREF@ -+LIBTIFF = -L${DEPTH}/libtiff -ltiff - LIBPORT = @LIBPORT@ - MACHLIBS= @MACHDEPLIBS@ - LIBS = ${LIBTIFF} ${LIBJPEG} ${LIBGZ} ${LIBPORT} ${MACHLIBS} Deleted: tinysofa/snapshot/libtiff/current/sources/tiff-v3.6.0.tar.gz =================================================================== (Binary files differ) Added: tinysofa/snapshot/libtiff/current/sources/tiff-v3.6.1.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/libtiff/current/sources/tiff-v3.6.1.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: tinysofa/snapshot/libtiff/current/specs/libtiff.spec =================================================================== --- tinysofa/snapshot/libtiff/current/specs/libtiff.spec 2004-07-01 15:50:04 UTC (rev 2775) +++ tinysofa/snapshot/libtiff/current/specs/libtiff.spec 2004-07-01 15:50:08 UTC (rev 2776) @@ -1,20 +1,19 @@ Summary: A library of functions for manipulating TIFF format image files. Name: libtiff -Version: 3.6.0 -Release: 5ts -License: distributable -Group: tinysofa official -Source0: ftp://ftp.remotesensing.org/pub/libtiff/tiff-v%{version}.tar.gz -Patch0: tiff-v3.6-shlib.patch -Patch2: libtiff-v3.5.4-codecs.patch -Patch3: libtiff-v3.5.4-mandir.patch -Patch4: libtiff-v3.5.5-buildroot.patch -Patch6: libtiff-v3.5.7-seek.patch -Patch7: libtiff-v3.5.7-exit.patch -Patch8: libtiff-v3.5.7-largefile.patch -Patch9: libtiff-v3.5.7-makeflags.patch +Version: 3.6.1 +Release: 2ts +Copyright: distributable +Group: System Environment/Libraries +Source0: http://www.libtiff.org/tiff-v%{version}.tar.gz +Patch0: libtiff-v3.6-shlib.patch +Patch1: libtiff-v3.6.1-codecs.patch +Patch2: libtiff-v3.5.4-mandir.patch +Patch3: libtiff-v3.5.5-buildroot.patch +Patch4: libtiff-v3.6.1-64bit.patch +Patch5: libtiff-v3.5.7-largefile.patch +Patch6: libtiff-v3.6.1-makeflags.patch URL: http://www.libtiff.org/ -BuildRoot: %{_tmppath}/%{name}-root +BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRequires: zlib-devel zlib libjpeg-devel libjpeg Requires: zlib libjpeg %define LIBVER %(echo %{version} | cut -f-2 -d.) @@ -30,7 +29,7 @@ %package devel Summary: Development tools for programs which will use the libtiff library. -Group: tinysofa official +Group: Development/Libraries Requires: libtiff = %{version} %description devel @@ -44,14 +43,13 @@ %prep %setup -q -n tiff-v%{version} -%patch0 -p1 -#%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch6 -p1 -%patch7 -p1 -%patch8 -p1 -%patch9 -p1 +%patch0 -p1 -b .shlib +%patch1 -p1 -b .codecs +%patch2 -p1 -b .mandir +%patch3 -p1 -b .buildroot +%patch4 -p1 -b .64bit +%patch5 -p1 -b .largefile +%patch6 -p1 -b .makeflags find . -type d -name CVS | xargs -r rm -frv %build @@ -59,7 +57,7 @@ # Fixes problem with newer bash versions and doesn't hurt older ones. CDPATH="" unset CDPATH -./configure --prefix=/usr --target=%{_target_platform} << EOF +./configure --target=%{_target_platform} << EOF no %{_bindir} %{_libdir} @@ -82,40 +80,182 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libtiff.so* install -m755 libtiff/libtiff.so.%{LIBVER} $RPM_BUILD_ROOT%{_libdir} ln -sf libtiff.so.%{LIBVER} $RPM_BUILD_ROOT%{_libdir}/libtiff.so -/sbin/ldconfig -n $RPM_BUILD_ROOT/%{_lib} +/sbin/ldconfig -n $RPM_BUILD_ROOT/%{_libdir} +rm -f $RPM_BUILD_ROOT%{_mandir}/man1/tiffgt.1 %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %clean -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != "/" ] && rm -rf "$RPM_BUILD_ROOT" +rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) %doc COPYRIGHT README VERSION %{_bindir}/* -%attr(755,root,root) %{_libdir}/libtiff.so.* +%{_libdir}/libtiff.so.* %{_mandir}/man1/* %files devel %defattr(-,root,root) %doc TODO html %{_includedir}/* -%attr(755,root,root) %{_libdir}/libtiff.so -%attr(644,root,root) %{_libdir}/libtiff.a +%{_libdir}/libtiff.so +%{_libdir}/libtiff.a %{_mandir}/man3/* %changelog -* Wed May 19 2004 tsintegrate 3.6.0-5ts -- current (3.6.0-5jh) integrated as 3.6.0-5ts for release 1.0-U1 +* Thu May 20 2004 Matthias Clasen 3.6.1-2 +- Fix and use the makeflags patch -* Mon May 10 2004 Jaakko Heinonen 3.5.7-5jh -- fixed library permissions +* Wed May 19 2004 Matthias Clasen 3.6.1-1 +- Upgrade to 3.6.1 +- Adjust patches +- Don't install tiffgt man page (#104864) -* Wed Jun 18 2003 Erlend Midttun 3.5.7-2tr -- Big rebuild +* Tue Mar 02 2004 Elliot Lee +- rebuilt -* Mon Apr 14 2003 Gerald Dachs 3.5.7-1gd -- initial release \ No newline at end of file +* Sat Feb 21 2004 Florian La Roche +- really add symlink to shared lib by running ldconfig at compile time + +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Thu Oct 09 2003 Florian La Roche +- link shared lib against -lm (Jakub Jelinek) + +* Thu Sep 25 2003 Jeremy Katz 3.5.7-13 +- rebuild to fix gzipped file md5sum (#91281) + +* Wed Jun 04 2003 Elliot Lee +- rebuilt + +* Tue Feb 11 2003 Phil Knirsch 3.5.7-11 +- Fixed rebuild problems. + +* Tue Feb 04 2003 Florian La Roche +- add symlink to shared lib + +* Wed Jan 22 2003 Tim Powers +- rebuilt + +* Thu Dec 12 2002 Tim Powers 3.5.7-8 +- rebuild on all arches + +* Mon Aug 19 2002 Phil Knirsch 3.5.7-7 +- Added LFS support (#71593) + +* Tue Jun 25 2002 Phil Knirsch 3.5.7-6 +- Fixed wrong exit code of tiffcp app (#67240) + +* Fri Jun 21 2002 Tim Powers +- automated rebuild + +* Thu May 23 2002 Tim Powers +- automated rebuild + +* Wed May 15 2002 Phil Knirsch +- Fixed segfault in fax2tiff tool (#64708). + +* Mon Feb 25 2002 Phil Knirsch +- Fixed problem with newer bash versions setting CDPATH (#59741) + +* Tue Feb 19 2002 Phil Knirsch +- Update to current release 3.5.7 + +* Wed Jan 09 2002 Tim Powers +- automated rebuild + +* Tue Aug 28 2001 Phil Knirsch +- Fixed ia64 problem with tiffinfo. Was general 64 bit arch problem where s390x + and ia64 were missing (#52129). + +* Tue Jun 26 2001 Philipp Knirsch +- Hopefully final symlink fix + +* Thu Jun 21 2001 Than Ngo +- add missing libtiff symlink + +* Fri Mar 16 2001 Crutcher Dunnavant +- killed tiff-to-ps.fpi filter + +* Wed Feb 28 2001 Philipp Knirsch +- Fixed missing devel version dependancy. + +* Tue Dec 19 2000 Philipp Knirsch +- rebuild + +* Tue Aug 7 2000 Crutcher Dunnavant +- added a tiff-to-ps.fpi filter for printing + +* Thu Jul 13 2000 Prospector +- automatic rebuild + +* Thu Jul 13 2000 Nalin Dahyabhai +- apply Peter Skarpetis's fix for the 32-bit conversion + +* Mon Jul 3 2000 Nalin Dahyabhai +- make man pages non-executable (#12811) + +* Mon Jun 12 2000 Nalin Dahyabhai +- remove CVS repo info from data directories + +* Thu May 18 2000 Nalin Dahyabhai +- fix build rooting +- fix syntax error in configure script +- move man pages to %{_mandir} + +* Wed May 17 2000 Nalin Dahyabhai +- rebuild for an errata release + +* Wed Mar 29 2000 Nalin Dahyabhai +- update to 3.5.5, which integrates our fax2ps fixes and the glibc fix + +* Tue Mar 28 2000 Nalin Dahyabhai +- fix fax2ps swapping height and width in the bounding box + +* Mon Mar 27 2000 Nalin Dahyabhai +- move man pages from devel package to the regular one +- integrate Frank Warmerdam's fixed .fax handling code (keep until next release + of libtiff) +- fix fax2ps breakage (bug #8345) + +* Sat Feb 05 2000 Nalin Dahyabhai +- set MANDIR=man3 to make multifunction man pages friendlier + +* Mon Jan 31 2000 Nalin Dahyabhai +- fix URLs + +* Fri Jan 28 2000 Nalin Dahyabhai +- link shared library against libjpeg and libz + +* Tue Jan 18 2000 Nalin Dahyabhai +- enable zip and jpeg codecs +- change defattr in normal package to 0755 +- add defattr to -devel package + +* Wed Dec 22 1999 Bill Nottingham +- update to 3.5.4 + +* Sun Mar 21 1999 Cristian Gafton +- auto rebuild in the new build environment (release 6) + +* Wed Jan 13 1999 Cristian Gafton +- build for glibc 2.1 + +* Wed Jun 10 1998 Prospector System +- translations modified for de + +* Wed Jun 10 1998 Michael Fulbright +- rebuilt against fixed jpeg libs (libjpeg-6b) + +* Thu May 07 1998 Prospector System +- translations modified for de, fr, tr + +* Mon Oct 13 1997 Donnie Barnes +- new version to replace the one from libgr +- patched for glibc +- added shlib support From svn at tinysofa.org Thu Jul 1 15:50:10 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:50:10 +1000 (EST) Subject: [tinysofa-svn] r2777 - in tinysofa/snapshot/libtool/current: sources specs Message-ID: <20040701155010.B8FB54E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:50:10 +1000 (Fri, 02 Jul 2004) New Revision: 2777 Added: tinysofa/snapshot/libtool/current/sources/libtool-1.4-nonneg.patch tinysofa/snapshot/libtool/current/sources/libtool-1.4.2-demo.patch tinysofa/snapshot/libtool/current/sources/libtool-1.4.2-multilib.patch tinysofa/snapshot/libtool/current/sources/libtool-1.5-libtool.m4-x86_64.patch tinysofa/snapshot/libtool/current/sources/libtool-1.5-testfailure.patch tinysofa/snapshot/libtool/current/sources/libtool-1.5.4-ltmain-SED.patch Modified: tinysofa/snapshot/libtool/current/specs/libtool.spec Log: - Sync with 2.0. - Kept: - libtool-1.5.6.tar.gz: - Added: - libtool-1.4-nonneg.patch: - libtool-1.4.2-demo.patch: - libtool-1.4.2-multilib.patch: - libtool-1.5-libtool.m4-x86_64.patch: - libtool-1.5-testfailure.patch: - libtool-1.5.4-ltmain-SED.patch: Added: tinysofa/snapshot/libtool/current/sources/libtool-1.4-nonneg.patch =================================================================== --- tinysofa/snapshot/libtool/current/sources/libtool-1.4-nonneg.patch 2004-07-01 15:50:08 UTC (rev 2776) +++ tinysofa/snapshot/libtool/current/sources/libtool-1.4-nonneg.patch 2004-07-01 15:50:10 UTC (rev 2777) @@ -0,0 +1,29 @@ +--- libtool-1.4/ltmain.in.nonneg Wed May 9 10:29:55 2001 ++++ libtool-1.4/ltmain.in Wed May 9 10:30:48 2001 +@@ -2191,7 +2191,7 @@ + + # Check that each of the things are valid numbers. + case $current in +- 0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;; ++ [0-9]*) ;; + *) + $echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2 + $echo "$modename: \`$vinfo' is not valid version information" 1>&2 +@@ -2200,7 +2200,7 @@ + esac + + case $revision in +- 0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;; ++ [0-9]*) ;; + *) + $echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2 + $echo "$modename: \`$vinfo' is not valid version information" 1>&2 +@@ -2209,7 +2209,7 @@ + esac + + case $age in +- 0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;; ++ [0-9]*) ;; + *) + $echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2 + $echo "$modename: \`$vinfo' is not valid version information" 1>&2 Added: tinysofa/snapshot/libtool/current/sources/libtool-1.4.2-demo.patch =================================================================== --- tinysofa/snapshot/libtool/current/sources/libtool-1.4.2-demo.patch 2004-07-01 15:50:08 UTC (rev 2776) +++ tinysofa/snapshot/libtool/current/sources/libtool-1.4.2-demo.patch 2004-07-01 15:50:10 UTC (rev 2777) @@ -0,0 +1,10 @@ +--- libtool-1.4.2/tests/Makefile.am.orig 2002-09-16 21:33:44.000000000 -0400 ++++ libtool-1.4.2/tests/Makefile.am 2002-09-16 21:34:19.000000000 -0400 +@@ -19,7 +19,6 @@ + demo-nofast.test demo-make.test demo-exec.test \ + demo-inst.test demo-unst.test \ + demo-pic.test demo-make.test demo-exec.test \ +- demo-nopic.test demo-make.test demo-exec.test \ + depdemo-nofast.test depdemo-make.test \ + depdemo-exec.test depdemo-inst.test depdemo-unst.test \ + cdemo-shared.test cdemo-make.test cdemo-exec.test \ Added: tinysofa/snapshot/libtool/current/sources/libtool-1.4.2-multilib.patch =================================================================== --- tinysofa/snapshot/libtool/current/sources/libtool-1.4.2-multilib.patch 2004-07-01 15:50:08 UTC (rev 2776) +++ tinysofa/snapshot/libtool/current/sources/libtool-1.4.2-multilib.patch 2004-07-01 15:50:10 UTC (rev 2777) @@ -0,0 +1,31 @@ +--- libtool-1.5.4/libtool.m4.multilib 2004-04-05 21:09:54.000000000 +0900 ++++ libtool-1.5.4/libtool.m4 2004-04-05 22:00:20.000000000 +0900 +@@ -1441,10 +1441,27 @@ + # before this can be enabled. + hardcode_into_libs=yes + ++ # find out which ABI we are using ++ libsuff= ++ case "$host_cpu" in ++ x86_64*|s390x*|powerpc64*) ++ echo '[#]line __oline__ "configure"' > conftest.$ac_ext ++ if AC_TRY_EVAL(ac_compile); then ++ case `/usr/bin/file conftest.$ac_objext` in ++ *64-bit*) ++ libsuff=64 ++ sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" ++ ;; ++ esac ++ fi ++ rm -rf conftest* ++ ;; ++ esac ++ + # Append ld.so.conf contents to the search path + if test -f /etc/ld.so.conf; then + lt_ld_extra=`$SED -e 's/[:,\t]/ /g;s/=[^=]*$//;s/=[^= ]* / /g' /etc/ld.so.conf | tr '\n' ' '` +- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" ++ sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" + fi + + # We used to test for /lib/ld.so.1 and disable shared libraries on Added: tinysofa/snapshot/libtool/current/sources/libtool-1.5-libtool.m4-x86_64.patch =================================================================== --- tinysofa/snapshot/libtool/current/sources/libtool-1.5-libtool.m4-x86_64.patch 2004-07-01 15:50:08 UTC (rev 2776) +++ tinysofa/snapshot/libtool/current/sources/libtool-1.5-libtool.m4-x86_64.patch 2004-07-01 15:50:10 UTC (rev 2777) @@ -0,0 +1,11 @@ +--- libtool-1.5/libtool.m4.x86_64 2003-04-14 17:58:23.000000000 -0400 ++++ libtool-1.5/libtool.m4 2003-04-24 16:38:34.000000000 -0400 +@@ -2167,7 +2167,7 @@ + # This must be Linux ELF. + linux*) + case $host_cpu in +- alpha*|hppa*|i*86|ia64*|m68*|mips*|powerpc*|sparc*|s390*|sh*) ++ alpha*|hppa*|i*86|ia64*|m68*|mips*|powerpc*|sparc*|s390*|sh*|x86_64*) + lt_cv_deplibs_check_method=pass_all ;; + *) + # glibc up to 2.1.1 does not perform some relocations on ARM Added: tinysofa/snapshot/libtool/current/sources/libtool-1.5-testfailure.patch =================================================================== --- tinysofa/snapshot/libtool/current/sources/libtool-1.5-testfailure.patch 2004-07-01 15:50:08 UTC (rev 2776) +++ tinysofa/snapshot/libtool/current/sources/libtool-1.5-testfailure.patch 2004-07-01 15:50:10 UTC (rev 2777) @@ -0,0 +1,176 @@ +--- libtool-1.5/pdemo/longer_file_name_hell0.c.testfailure 2003-04-24 19:19:09.000000000 -0400 ++++ libtool-1.5/pdemo/longer_file_name_hell0.c 2003-04-24 19:19:04.000000000 -0400 +@@ -0,0 +1,32 @@ ++/* hello.c -- trivial test function for libfoo ++ Copyright (C) 1996-1999 Free Software Foundation, Inc. ++ This file is part of GNU Libtool. ++ ++This program is free software; you can redistribute it and/or modify ++it 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. ++ ++This program is distributed in the hope that it will be useful, ++but WITHOUT ANY WARRANTY; without even the implied warranty of ++MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++GNU General Public License for more details. ++ ++You should have received a copy of the GNU General Public License ++along with this program; if not, write to the Free Software ++Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 ++USA. */ ++ ++/* Written by Gordon Matzigkeit */ ++#define _LIBFOO_COMPILATION ++#include "foo.h" ++#undef _LIBFOO_COMPILATION ++ ++#include ++ ++int ++hello () ++{ ++ printf ("** This is not GNU Hello. There is no built-in mail reader. **\n"); ++ return HELLO_RET; ++} +--- libtool-1.5/pdemo/longer_file_name_foo0.c.testfailure 2003-04-24 19:19:51.000000000 -0400 ++++ libtool-1.5/pdemo/longer_file_name_foo0.c 2003-04-24 19:19:43.000000000 -0400 +@@ -0,0 +1,39 @@ ++/* foo.c -- trivial test function for libfoo ++ Copyright (C) 1996-1999 Free Software Foundation, Inc. ++ Gordon Matzigkeit , 1996 ++ This file is part of GNU Libtool. ++ ++This program is free software; you can redistribute it and/or modify ++it 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. ++ ++This program is distributed in the hope that it will be useful, ++but WITHOUT ANY WARRANTY; without even the implied warranty of ++MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++GNU General Public License for more details. ++ ++You should have received a copy of the GNU General Public License ++along with this program; if not, write to the Free Software ++Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 ++USA. */ ++ ++#define _LIBFOO_COMPILATION_ ++#include "foo.h" ++#undef _LIBFOO_COMPILATION_ ++ ++#include ++ ++#ifdef HAVE_MATH_H ++#include ++#endif ++ ++/* Give a global variable definition. */ ++int nothing = FOO_RET; ++ ++int ++foo () ++{ ++ printf ("cos (0.0) = %g\n", (double) cos ((double) 0.0)); ++ return FOO_RET; ++} +--- libtool-1.5/pdemo/Makefile.am.testfailure 2003-04-24 19:20:08.000000000 -0400 ++++ libtool-1.5/pdemo/Makefile.am 2003-04-24 19:20:17.000000000 -0400 +@@ -122,7 +122,7 @@ + # This is one of the essential tests for deplibs_check_method=pass_all. + # If this one passes with pass_all, it is likely that pass_all works + EXTRA_LIBRARIES = libhell0.a +-libhell0_a_SOURCES = longer_file_name_hello.c longer_file_name_foo.c ++libhell0_a_SOURCES = longer_file_name_hell0.c longer_file_name_foo0.c + EXTRA_LTLIBRARIES = libhell1.la libhell2.la + libhell1_la_SOURCES = longer_file_name_hell1.c + libhell1_la_LIBADD = -L. -lhell0 +--- /dev/null 2002-04-11 10:25:15.000000000 -0400 ++++ libtool-1.5/demo/hell0.c 2003-04-24 19:11:46.000000000 -0400 +@@ -0,0 +1,32 @@ ++/* hello.c -- trivial test function for libfoo ++ Copyright (C) 1996-1999 Free Software Foundation, Inc. ++ This file is part of GNU Libtool. ++ ++This program is free software; you can redistribute it and/or modify ++it 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. ++ ++This program is distributed in the hope that it will be useful, ++but WITHOUT ANY WARRANTY; without even the implied warranty of ++MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++GNU General Public License for more details. ++ ++You should have received a copy of the GNU General Public License ++along with this program; if not, write to the Free Software ++Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 ++USA. */ ++ ++/* Written by Gordon Matzigkeit */ ++#define _LIBFOO_COMPILATION ++#include "foo.h" ++#undef _LIBFOO_COMPILATION ++ ++#include ++ ++int ++hello () ++{ ++ printf ("** This is not GNU Hello. There is no built-in mail reader. **\n"); ++ return HELLO_RET; ++} +--- /dev/null 2002-04-11 10:25:15.000000000 -0400 ++++ libtool-1.5/demo/foo0.c 2003-04-24 19:11:46.000000000 -0400 +@@ -0,0 +1,39 @@ ++/* foo.c -- trivial test function for libfoo ++ Copyright (C) 1996-1999 Free Software Foundation, Inc. ++ Gordon Matzigkeit , 1996 ++ This file is part of GNU Libtool. ++ ++This program is free software; you can redistribute it and/or modify ++it 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. ++ ++This program is distributed in the hope that it will be useful, ++but WITHOUT ANY WARRANTY; without even the implied warranty of ++MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++GNU General Public License for more details. ++ ++You should have received a copy of the GNU General Public License ++along with this program; if not, write to the Free Software ++Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 ++USA. */ ++ ++#define _LIBFOO_COMPILATION_ ++#include "foo.h" ++#undef _LIBFOO_COMPILATION_ ++ ++#include ++ ++#ifdef HAVE_MATH_H ++#include ++#endif ++ ++/* Give a global variable definition. */ ++int nothing = FOO_RET; ++ ++int ++foo () ++{ ++ printf ("cos (0.0) = %g\n", (double) cos ((double) 0.0)); ++ return FOO_RET; ++} +--- libtool-1.5/demo/Makefile.am.testfailure 2002-11-19 04:42:39.000000000 -0500 ++++ libtool-1.5/demo/Makefile.am 2003-04-24 19:11:46.000000000 -0400 +@@ -122,7 +122,7 @@ + # This is one of the essential tests for deplibs_check_method=pass_all. + # If this one passes with pass_all, it is likely that pass_all works + EXTRA_LIBRARIES = libhell0.a +-libhell0_a_SOURCES = hello.c foo.c ++libhell0_a_SOURCES = hell0.c foo0.c + EXTRA_LTLIBRARIES = libhell1.la libhell2.la + libhell1_la_SOURCES = hell1.c + libhell1_la_LIBADD = -L. -lhell0 Added: tinysofa/snapshot/libtool/current/sources/libtool-1.5.4-ltmain-SED.patch =================================================================== --- tinysofa/snapshot/libtool/current/sources/libtool-1.5.4-ltmain-SED.patch 2004-07-01 15:50:08 UTC (rev 2776) +++ tinysofa/snapshot/libtool/current/sources/libtool-1.5.4-ltmain-SED.patch 2004-07-01 15:50:10 UTC (rev 2777) @@ -0,0 +1,12 @@ +--- libtool/ltmain.sh~ 2004-04-04 17:27:17.000000000 +0900 ++++ libtool/ltmain.sh 2004-04-04 19:36:02.000000000 +0900 +@@ -33,6 +33,9 @@ + # function. + progpath="$0" + ++# RH: define SED for historic ltconfig's generated by Libtool 1.3 ++[ -z "$SED" ] && SED=sed ++ + # The name of this program: + progname=`echo "$progpath" | $SED $basename` + modename="$progname" Modified: tinysofa/snapshot/libtool/current/specs/libtool.spec =================================================================== --- tinysofa/snapshot/libtool/current/specs/libtool.spec 2004-07-01 15:50:08 UTC (rev 2776) +++ tinysofa/snapshot/libtool/current/specs/libtool.spec 2004-07-01 15:50:10 UTC (rev 2777) @@ -3,13 +3,37 @@ Version: 1.5.6 Release: 2ts License: GPL -Group: tinysofa official -Source: ftp://alpha.gnu.org/gnu/libtool-%{version}.tar.gz -Prefix: %{_prefix} -PreReq: htmlinfo -BuildRequires: texinfo gcc-c++-devel -BuildRoot: %{_tmppath}/%{name}-root +Group: Development/Tools +Source: ftp://ftp.gnu.org/gnu/libtool/libtool-%{version}.tar.gz +Source1: libtool-1.5.4-ltmain-SED.patch +URL: http://www.gnu.org/software/libtool/ +#Patch1: libtool-1.5-mktemp.patch +Patch2: libtool-1.4-nonneg.patch +Patch4: libtool-1.5-libtool.m4-x86_64.patch +Patch9: libtool-1.4.2-multilib.patch +Patch10: libtool-1.4.2-demo.patch +## Patch from James Henstridge making restricted symbol exports work on Linux +#Patch11: libtool-1.5-expsym-linux.patch +## http://mail.gnu.org/pipermail/bug-libtool/2002-October/004272.html +#Patch12: libtool-1.5-readonlysym.patch +# Fix automake related test failure +Patch14: libtool-1.5-testfailure.patch +#Patch15: libtool-1.5-relink-libdir-order-91110.patch +#Patch16: libtool-1.5-AC_PROG_LD_GNU-quote-v-97608.patch +#Patch17: libtool-1.5-nostdlib.patch +PreReq: /sbin/install-info, autoconf, automake >= 1.4p1, m4, perl +BuildRequires: autoconf automake +Requires: libtool-libs = %{version}-%{release}, mktemp +BuildRoot: %{_tmppath}/%{name}-%{version}-root +# run "make check" by default +%{?_without_check: %define _without_check 1} +%{!?_without_check: %define _without_check 0} +# except ia64 where currently 16/83 tests fail (see #55176) +%ifarch ia64 + %define _without_check 1 +%endif + %description The libtool package contains the GNU libtool, a set of shell scripts which automatically configure UNIX and UNIX-like architectures to @@ -20,101 +44,317 @@ If you are developing programs which will use shared libraries, you should install libtool. +%package libs +Summary: Runtime libraries for GNU libtool. +Group: System Environment/Libraries + +%description libs +The libtool-libs package contains the runtime libraries from GNU +libtool. GNU libtool uses these libraries to provide portable dynamic +loading of shared libraries. + +If you are using some programs that provide shared libraries built +with GNU libtool, you should install the libtool-libs package to +provide the dynamic loading library + %prep %setup -q +#%%patch1 -p1 -b .mktemp +%patch2 -p1 -b .nonneg +%patch4 -p1 -b .x86_64 +%patch9 -p1 -b .multilib +%ifarch x86_64 s390 s390x +%patch10 -p1 -b .demo +%endif +#%%patch11 -p1 -b .expsym-linux +#%%patch12 -p1 -b .readonlysym +%patch14 -p1 -b .testfailure +#%%patch15 -p1 -b .libdir-order +#%%patch16 -p1 -b .ldquote +#%%patch17 -p1 -b .nostdlib +# patch10 and patch14 change a Makefile.am +# patch9 touches libtool.m4 +./bootstrap + %build -./configure --prefix=%{_prefix} -make -k -C doc +export CC=gcc +export CXX=g++ +export CFLAGS="$RPM_OPT_FLAGS -fPIC" +%configure make -make -C tests -cd doc -makeinfo --html --no-split --force libtool.texi || : +%if ! %{_without_check} + make check # VERBOSE=yes +%endif + %install -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != "/" ] && rm -rf "$RPM_BUILD_ROOT" -mkdir -p ${RPM_BUILD_ROOT}%{_prefix}/share/html/libtool -make prefix=${RPM_BUILD_ROOT}%{_prefix} install -install -m 644 doc/libtool.html $RPM_BUILD_ROOT/usr/share/html/libtool/ +rm -rf %{buildroot} +%makeinstall -cd $RPM_BUILD_ROOT -# XXX remove zero length file - rm -f .%{_prefix}/share/libtool/libltdl/stamp-h.in -# XXX forcibly break hardlinks -# mv .%{_prefix}/share/libtool/libltdl .%{_prefix}/share/libtool/libltdl-X -# mkdir .%{_prefix}/share/libtool/libltdl -# cp .%{_prefix}/share/libtool/libltdl-X/* .%{_prefix}/share/libtool/libltdl -# rm -rf .%{_prefix}/share/libtool/libltdl-X +# add SED definition to ltmain.sh for legacy ltconfig's +patch -d %{buildroot}%{_datadir}/libtool -z .sed < %{SOURCE1} -rm -rf $RPM_BUILD_ROOT/usr/info +rm -f %{buildroot}%{_infodir}/dir %clean -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} %post -/usr/sbin/htmlinfo_update.sh +/sbin/install-info %{_infodir}/libtool.info.gz %{_infodir}/dir -%postun -/usr/sbin/htmlinfo_update.sh +%preun +if [ "$1" = 0 ]; then + /sbin/install-info --delete %{_infodir}/libtool.info.gz %{_infodir}/dir +fi + +%post libs -p /sbin/ldconfig + +%postun libs -p /sbin/ldconfig + %files %defattr(-,root,root) -%doc AUTHORS COPYING INSTALL NEWS README -%doc THANKS TODO ChangeLog demo -%doc doc/* -%{_prefix}/bin/* -%{_prefix}/share/html/libtool -%{_prefix}/include/ltdl.h -%{_prefix}/lib/libltdl.* -%{_prefix}/share/libtool -%{_prefix}/share/aclocal/* +%doc AUTHORS COPYING INSTALL NEWS README THANKS TODO ChangeLog +%{_bindir}/* +%{_includedir}/* +%{_infodir}/libtool.info* +%{_datadir}/libtool +%{_libdir}/libltdl.so +%{_libdir}/libltdl.*a +%{_datadir}/aclocal/* +%files libs +%defattr(-,root,root) +%{_libdir}/libltdl.so.* + %changelog -* Wed May 19 2004 tsintegrate 1.5.6-2ts -- current (1.5.6-1ts) integrated as 1.5.6-2ts for release 1.0-U1 +* Thu May 13 2004 Thomas Woerner - 1.5.6-2 +- compile libltdl.a PIC -* Tue May 11 2004 Omar Kilani -- Add BuildRequires gcc-c++-devel. +* Mon Apr 12 2004 Jens Petersen - 1.5.6-1 +- update to 1.5.6 bugfix release -* Mon Apr 12 2004 Omar Kilani 1.5.6-1ts -- New upstream: 1.5.6. +* Sun Apr 4 2004 Jens Petersen - 1.5.4-1 +- 1.5.4 bugfix release +- improve libtool-1.4.2-multilib.patch (Albert Chin) and only apply to + libtool.m4 +- use bootstrap instead of autoreconf to update configuration +- update libtool-1.4.3-ltmain-SED.patch to libtool-1.5.4-ltmain-SED.patch -* Mon Apr 5 2004 Omar Kilani 1.5.4-1ts -- New upstream: 1.5.4. +* Tue Mar 02 2004 Elliot Lee +- rebuilt -* Fri Feb 7 2004 Omar Kilani 1.5.2-1ok -- New upstream. +* Fri Feb 13 2004 Elliot Lee +- rebuilt -* Wed Jun 18 2003 Erlend Midttun 1.4.3-2tr -- Big rebuild +* Mon Jan 26 2004 Jens Petersen - 1.5.2-1 +- update to 1.5.2 bugfix release +- update libtool-1.5-libtool.m4-x86_64.patch +- nolonger need libtool-1.5-mktemp.patch, libtool-1.5-expsym-linux.patch, + libtool-1.5-readonlysym.patch, libtool-1.5-relink-libdir-order-91110.patch, + libtool-1.5-AC_PROG_LD_GNU-quote-v-97608.patch and libtool-1.5-nostdlib.patch -* Thu May 22 2003 Erlend Midttun 1.4.3-1em -- New upstream. +* Tue Oct 28 2003 Jens Petersen - 1.5-8 +- update libtool-1.4.2-multilib.patch to also deal with powerpc64 (#103316) + [Joe Orton] -* Mon Mar 24 2003 Erlend Midttun 1.4.2-4em -- Rebuilt against glibc 2.3.2. +* Sun Oct 26 2003 Florian La Roche +- rebuild again, Jakub has done a new compiler version number -* Fri Oct 25 2002 Christian H. Toldnes 1.4.2-3ct -- Replaced info stuff with htmlinfo +* Thu Oct 02 2003 Florian La Roche +- rebuild -* Thu May 30 2002 Christian H. Toldnes -- Rebuild with -2ct +* Thu Jul 17 2003 Jens Petersen - 1.5-5 +- bring back libtool-1.4.2-demo.patch to disable nopic tests on amd64 + and s390x again -* Fri Feb 01 2002 Erlend Midttun -- New upstream version. +* Tue Jul 15 2003 Owen Taylor +- Fix misapplied chunk for expsym-linux patch -* Tue Jul 17 2001 Erlend Midttun -- Inc serial number before release. +* Tue Jul 8 2003 Jens Petersen - 1.5-4 +- remove the quotes around LD in AC_PROG_LD_GNU (#97608) + [reported by twaugh] +- use -nostdlib also when linking with g++ and non-GNU ld in + _LT_AC_LANG_CXX_CONFIG [reported by fnasser, patch by aoliva] +- use %%configure with CC and CXX set -* Thu Sep 14 2000 Per Ivar Paulsen -- Picked up 1.3.5 +* Thu Jun 12 2003 Jens Petersen - 1.5-3 +- don't use %%configure since target options caused libtool to assume + i386-redhat-linux-gcc instead of gcc for CC (reported by Joe Orton) +- add libtool-1.5-relink-libdir-order-91110.patch to fix order of lib dirs + searched when relinking (#91110) [patch from Joe Orton] -* Sun Feb 27 2000 Lars Gaarden -- Moved info-file to /usr/share/info +* Wed Jun 04 2003 Elliot Lee +- rebuilt -* Mon Feb 14 2000 Erlend Midttun -- Repackaged for Trustix +* Thu May 1 2003 Jens Petersen - 1.5-1 +- update to 1.5 +- no longer override config.{guess,sub} for rpmbuild %%configure, + redhat-rpm-config owns those now +- update and rename libtool-1.4.2-s390_x86_64.patch to + libtool-1.5-libtool.m4-x86_64.patch since s390 now included +- buildrequire autoconf and automake, no longer automake14 +- skip make check on s390 temporarily +- no longer skip demo-nopic.test on x86_64, s390 and s390x +- from Owen Taylor + - add libtool-1.4.2-expsym-linux.patch (#55607) [from James Henstridge] + - add quoting in mktemp patch + - add libtool-1.5-readonlysym.patch + - add libtool-1.5-testfailure.patch workaround + - no longer need libtool-1.4.2-relink-58664.patch +* Sat Feb 08 2003 Florian La Roche - 1.4.3-5 +- add config.guess and config.sub, otherwise old versions of + these files can creep into /usr/share/libtool/ + +* Wed Jan 22 2003 Tim Powers +- rebuilt + +* Mon Jan 13 2003 Jens Petersen 1.4.3-3 +- fix mktemp to work when running mktemp fails (#76602) + [reported by (Oron Peled)] +- remove info dir file, don't exclude it +- fix typo in -libs description (#79619) +- use buildroot instead of RPM_BUILD_ROOT + +* Tue Jan 07 2003 Karsten Hopp 1.4.3-2.2 +- use lib64 on s390x, too. + +* Thu Dec 5 2002 Jens Petersen +- add comment to explain why we use an old Automake for building +- buildrequire automake14 + +* Sat Nov 23 2002 Jens Petersen +- add --without check build option to allow disabling of "make check" +- exclude info dir file rather than removing + +* Sat Nov 23 2002 Jens Petersen 1.4.3-2 +- define SED in ltmain.sh for historic ltconfig files +- define macro AUTOTOOLS to hold automake-1.4 and aclocal-1.4, and use it +- leave old missing file for now +- general spec file cleanup + - don't copy install files to demo nor mess with installed ltdl files + - don't need to run make in doc + - force removal of info dir file + - don't need to create install prefix dir + - don't bother gzipping info files ourselves + +* Mon Nov 18 2002 Jens Petersen 1.4.3-1 +- update to 1.4.3 +- remove obsolete patches (test-quote, dup-deps, libtoolize-configure.ac) +- apply the multilib patch to just the original config files +- update x86_64/s390 patch and just apply to original config files +- use automake-1.4 in "make check" for demo-make.test to pass! +- remove info dir file that is not installed +- make autoreconf update missing + +* Mon Oct 07 2002 Phil Knirsch 1.4.2-12.2 +- Added s390x and x64_64 support. + +* Fri Oct 4 2002 Nalin Dahyabhai 1.4.2-12.1 +- rebuild + +* Fri Sep 13 2002 Nalin Dahyabhai +- patch to find the proper libdir on multilib boxes + +* Mon Aug 19 2002 Jens Petersen 1.4.2-12 +- don't include demo in doc, specially now that we "make check" (#71609) + +* Tue Aug 13 2002 Jens Petersen 1.4.2-11 +- don't hardcode "configure.in" in libtoolize (#70864) + [reported by bastiaan at webcriminals.com] +- make check, but not on ia64 + +* Fri Jun 21 2002 Tim Powers 1.4.2-10 +- automated rebuild + +* Thu May 23 2002 Tim Powers 1.4.2-9 +- automated rebuild + +* Fri Apr 26 2002 Jens Petersen 1.4.2-8 +- add old patch from aoliva to fix relinking when installing into a buildroot +- backport dup-deps fix from cvs stable branch + +* Wed Mar 27 2002 Jens Petersen 1.4.2-7 +- run ldconfig in postin and postun + +* Thu Feb 28 2002 Jens Petersen 1.4.2-6 +- rebuild in new environment + +* Tue Feb 12 2002 Jens Petersen 1.4.2-5 +- revert filemagic and archive-shared patches following cvs (#54887) +- don't change "&& test" to "-a" in ltmain.in + +* Wed Jan 09 2002 Tim Powers 1.4.2-4 +- automated rebuild + +* Mon Dec 3 2001 Jens Petersen 1.4.2-3 +- test quoting patch should be on ltmain.in not ltmain.sh (#53276) +- use file_magic for Linux ELF (#54887) +- allow link against an archive when building a shared library (#54887) +- include ltdl.m4 in manifest (#56671) + +* Wed Oct 24 2001 Jens Petersen 1.4.2-2 +- added URL to spec + +* Tue Sep 18 2001 Bernhard Rosenkraenzer 1.4.2-1 +- 1.4.2 - sync up with autoconf... + +* Thu Jul 5 2001 Bernhard Rosenkraenzer 1.4-8 +- extend s390 patch to 2 more files +- s/Copyright/License/ + +* Wed Jul 04 2001 Karsten Hopp +- add s390 patch for deplibs_check_method=pass_all + +* Tue Jun 12 2001 Florian La Roche +- add patches from Tim Waugh #42724 + +* Mon Jun 11 2001 Florian La Roche +- add patches from cvs mainline + +* Thu Jun 07 2001 Florian La Roche +- fix a "test" bug in ltmain.sh + +* Sun Jun 03 2001 Florian La Roche +- disable the post commands to modify /usr/share/doc/ + +* Sat May 12 2001 Owen Taylor +- Require automake 1.4p1 + +* Wed May 09 2001 Florian La Roche +- update to libtool 1.4 +- adjust or remove patches + +* Thu Jul 13 2000 Elliot Lee +- Fix recognition of ^0[0-9]+$ as a non-negative integer. + +* Thu Jul 13 2000 Prospector +- automatic rebuild + +* Fri Jul 7 2000 Nalin Dahyabhai +- patch to use mktemp to create the tempdir +- use %%configure after defining __libtoolize to /bin/true + +* Mon Jul 3 2000 Matt Wilson +- subpackage libltdl into libtool-libs + +* Sun Jun 18 2000 Bill Nottingham +- running libtoolize on the libtool source tree ain't right :) + +* Mon Jun 5 2000 Jeff Johnson +- FHS packaging. + +* Thu Jun 1 2000 Nalin Dahyabhai +- update to 1.3.5. + +* Fri Mar 3 2000 Jeff Johnson +- add prereqs for m4 and perl inorder to run autoconf/automake. + +* Mon Feb 28 2000 Jeff Johnson +- functional /usr/doc/libtool-*/demo by end-user %post procedure (#9719). + * Wed Dec 22 1999 Jeff Johnson - update to 1.3.4. @@ -159,4 +399,4 @@ * Tue Nov 25 1997 Elliot Lee - Update to 1.0f - BuildRoot it -- Make it a noarch package \ No newline at end of file +- Make it a noarch package From svn at tinysofa.org Thu Jul 1 15:54:21 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:54:21 +1000 (EST) Subject: [tinysofa-svn] r2834 - in tinysofa/snapshot/rsync/current: sources specs Message-ID: <20040701155421.96E954E817E@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:54:21 +1000 (Fri, 02 Jul 2004) New Revision: 2834 Added: tinysofa/snapshot/rsync/current/sources/rsync.xinetd Removed: tinysofa/snapshot/rsync/current/sources/rsyncd.conf tinysofa/snapshot/rsync/current/sources/rsyncd.logrotate tinysofa/snapshot/rsync/current/sources/rsyncd.xinetd Modified: tinysofa/snapshot/rsync/current/specs/rsync.spec Log: - Sync with 2.0. - Kept: - rsync-2.6.2-lastdir-corruption.patch: - rsync-2.6.2.tar.gz: - Added: - rsync.xinetd: - Removed: - rsyncd.conf: - rsyncd.logrotate: - rsyncd.xinetd: Added: tinysofa/snapshot/rsync/current/sources/rsync.xinetd =================================================================== --- tinysofa/snapshot/rsync/current/sources/rsync.xinetd 2004-07-01 15:54:17 UTC (rev 2833) +++ tinysofa/snapshot/rsync/current/sources/rsync.xinetd 2004-07-01 15:54:21 UTC (rev 2834) @@ -0,0 +1,13 @@ +# default: off +# description: The rsync server is a good addition to an ftp server, as it \ +# allows crc checksumming etc. +service rsync +{ + disable = yes + socket_type = stream + wait = no + user = root + server = /usr/bin/rsync + server_args = --daemon + log_on_failure += USERID +} Deleted: tinysofa/snapshot/rsync/current/sources/rsyncd.conf =================================================================== --- tinysofa/snapshot/rsync/current/sources/rsyncd.conf 2004-07-01 15:54:17 UTC (rev 2833) +++ tinysofa/snapshot/rsync/current/sources/rsyncd.conf 2004-07-01 15:54:21 UTC (rev 2834) @@ -1,15 +0,0 @@ -transfer logging = yes -log file = /var/log/rsync -pid file = /var/run/rsyncd.pid -timeout = 600 - - -#[pub] -# path = /home/ftp/pub -# uid = nobody -# gid = nobody -# use chroot = yes -# read only = yes -# comment = Public file area -# - Deleted: tinysofa/snapshot/rsync/current/sources/rsyncd.logrotate =================================================================== --- tinysofa/snapshot/rsync/current/sources/rsyncd.logrotate 2004-07-01 15:54:17 UTC (rev 2833) +++ tinysofa/snapshot/rsync/current/sources/rsyncd.logrotate 2004-07-01 15:54:21 UTC (rev 2834) @@ -1,4 +0,0 @@ -/var/log/rsync/rsync { - notifempty - missingok -} Deleted: tinysofa/snapshot/rsync/current/sources/rsyncd.xinetd =================================================================== --- tinysofa/snapshot/rsync/current/sources/rsyncd.xinetd 2004-07-01 15:54:17 UTC (rev 2833) +++ tinysofa/snapshot/rsync/current/sources/rsyncd.xinetd 2004-07-01 15:54:21 UTC (rev 2834) @@ -1,13 +0,0 @@ -# default: off -# description: The rsync server is a good addition to an ftp server, as it \ -# allows crc checksumming etc. -service rsync -{ - disable = yes - socket_type = stream - wait = no - user = root - server = /usr/bin/rsync - server_args = --daemon - log_on_failure += USERID -} Modified: tinysofa/snapshot/rsync/current/specs/rsync.spec =================================================================== --- tinysofa/snapshot/rsync/current/specs/rsync.spec 2004-07-01 15:54:17 UTC (rev 2833) +++ tinysofa/snapshot/rsync/current/specs/rsync.spec 2004-07-01 15:54:21 UTC (rev 2834) @@ -1,14 +1,12 @@ Summary: A program for synchronizing files over a network. Name: rsync Version: 2.6.2 -Release: 3jh -Group: tinysofa/main +Release: 1ts +Group: Applications/Internet # TAG: for pre versions use #Source: ftp://rsync.samba.org/pub/rsync/rsync-%{version}pre-2.tar.gz Source: ftp://rsync.samba.org/pub/rsync/rsync-%{version}.tar.gz -Source1: rsyncd.xinetd -Source2: rsyncd.logrotate -Source3: rsyncd.conf +Source1: rsync.xinetd Prefix: %{_prefix} BuildRoot: %{_tmppath}/%{name}-%{version}-root @@ -25,17 +23,6 @@ report which describes the rsync algorithm is included in this package. -%package server -Summary: The server part of rsync -Group: tinysofa/main -Requires: rsync xinetd - -%description server -This is the server part of the rsync package. - -Install this package if you want to provide a rsync server. - - %prep # TAG: for pre versions use # % setup -q -n %{version}pre-2 @@ -43,46 +30,29 @@ %patch1 -p1 -b .lastdir-corruption - %build %configure -%make +make - %install +rm -rf $RPM_BUILD_ROOT + %makeinstall +mkdir -p $RPM_BUILD_ROOT/etc/xinetd.d +install -m 644 %SOURCE1 $RPM_BUILD_ROOT/etc/xinetd.d/rsync -%{__mkdir_p} \ - %{buildroot}%{_sysconfdir}/xinetd.d \ - %{buildroot}%{_localstatedir}/log \ - %{buildroot}%{_sysconfdir}/logrotate.d - -install -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/xinetd.d/rsync -install -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/logrotate.d/rsync -install -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/rsyncd.conf -touch %{buildroot}%{_localstatedir}/log/rsync - - %clean -%clean_buildroot +rm -rf $RPM_BUILD_ROOT - %files %defattr(-,root,root) %doc COPYING README tech_report.tex -%{_bindir}/rsync +%config(noreplace) /etc/xinetd.d/rsync +%{_prefix}/bin/rsync %{_mandir}/man1/rsync.1* - -%files server -%defattr(-,root,root) -%config(noreplace) %{_sysconfdir}/xinetd.d/rsync -%config(noreplace) %{_sysconfdir}/logrotate.d/rsync -%config(noreplace) %{_sysconfdir}/rsyncd.conf -%dir %attr(750,root,root) %{_localstatedir}/log/rsync %{_mandir}/man5/rsyncd.conf.5* - %changelog * Tue May 25 2004 Mark McLoughlin - 2.6.2-1 - Backport fix for crasher when passing multiple directories of the same @@ -301,7 +271,7 @@ showing no packager nor signature but giving "Source RPM: rsync-1.6.3-1.src.rpm". - Changes from 1.6.2-1 packaging: added '$RPM_OPT_FLAGS' to make, strip - to 'build', removed 'prefix'. + to '%build', removed '%prefix'. * Thu Apr 10 1997 Michael De La Rue - rsync-1.6.2-1 packaged. (This entry by jam to credit Michael for the From svn at tinysofa.org Thu Jul 1 15:54:34 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:54:34 +1000 (EST) Subject: [tinysofa-svn] r2835 - in tinysofa/snapshot/samba/current: sources specs Message-ID: <20040701155434.CED804E817E@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:54:34 +1000 (Fri, 02 Jul 2004) New Revision: 2835 Added: tinysofa/snapshot/samba/current/sources/filter-requires-samba.sh tinysofa/snapshot/samba/current/sources/samba-3.0.3-bug1302.patch tinysofa/snapshot/samba/current/sources/samba-3.0.3-bug1309.patch tinysofa/snapshot/samba/current/sources/samba-3.0.3-password.patch tinysofa/snapshot/samba/current/sources/samba-3.0.3.tar.bz2 tinysofa/snapshot/samba/current/sources/swat.desktop Removed: tinysofa/snapshot/samba/current/sources/samba-3.0.4-man.patch tinysofa/snapshot/samba/current/sources/samba-3.0.4-smb.conf.patch tinysofa/snapshot/samba/current/sources/samba-3.0.4-unixpath.patch tinysofa/snapshot/samba/current/sources/samba-3.0.4-warning.patch tinysofa/snapshot/samba/current/sources/samba-3.0.4.tar.gz Modified: tinysofa/snapshot/samba/current/sources/smb.init tinysofa/snapshot/samba/current/sources/winbind.init tinysofa/snapshot/samba/current/specs/samba.spec Log: - Sync with 2.0. - Kept: - samba-2.2.0-smbw.patch: - samba-3.0.0beta1-pipedir.patch: - samba-3.0.0rc3-nmbd-netbiosname.patch: - samba-3.0.3-logfiles.patch: - samba-3.0.3pre1-pie.patch: - samba.log: - samba.pamd: - samba.sysconfig: - samba.xinetd: - smb.init: - smbprint: - winbind.init: - Added: - filter-requires-samba.sh: - samba-3.0.3-bug1302.patch: - samba-3.0.3-bug1309.patch: - samba-3.0.3-password.patch: - samba-3.0.3.tar.bz2: - swat.desktop: - Removed: - samba-3.0.4-man.patch: - samba-3.0.4-smb.conf.patch: - samba-3.0.4-unixpath.patch: - samba-3.0.4-warning.patch: - samba-3.0.4.tar.gz: Added: tinysofa/snapshot/samba/current/sources/filter-requires-samba.sh =================================================================== --- tinysofa/snapshot/samba/current/sources/filter-requires-samba.sh 2004-07-01 15:54:21 UTC (rev 2834) +++ tinysofa/snapshot/samba/current/sources/filter-requires-samba.sh 2004-07-01 15:54:34 UTC (rev 2835) @@ -0,0 +1,3 @@ +#!/bin/sh + +/usr/lib/rpm/perl.req $* | grep -v "Net::LDAP" Property changes on: tinysofa/snapshot/samba/current/sources/filter-requires-samba.sh ___________________________________________________________________ Name: svn:executable + * Added: tinysofa/snapshot/samba/current/sources/samba-3.0.3-bug1302.patch =================================================================== --- tinysofa/snapshot/samba/current/sources/samba-3.0.3-bug1302.patch 2004-07-01 15:54:21 UTC (rev 2834) +++ tinysofa/snapshot/samba/current/sources/samba-3.0.3-bug1302.patch 2004-07-01 15:54:34 UTC (rev 2835) @@ -0,0 +1,27 @@ +Index: lib/system_smbd.c +=================================================================== +--- samba-3.0.3/source/lib/system_smbd.c (revision 395) ++++ samba-3.0.3/source/lib/system_smbd.c (working copy) +@@ -88,6 +88,10 @@ + groups[0] = gid; + *grpcnt = ret + 1; + } ++ ++ /* remove any duplicates gids in the list */ ++ ++ remove_duplicate_gids( grpcnt, groups ); + } + + restore_re_gid(); +@@ -100,11 +104,6 @@ + return -1; + } + +- /* this will remove any duplicates gids in the list and +- update the group counter */ +- +- remove_duplicate_gids( grpcnt, groups ); +- + free(gids_saved); + return ret; + } Added: tinysofa/snapshot/samba/current/sources/samba-3.0.3-bug1309.patch =================================================================== --- tinysofa/snapshot/samba/current/sources/samba-3.0.3-bug1309.patch 2004-07-01 15:54:21 UTC (rev 2834) +++ tinysofa/snapshot/samba/current/sources/samba-3.0.3-bug1309.patch 2004-07-01 15:54:34 UTC (rev 2835) @@ -0,0 +1,17 @@ +Index: smbd/password.c +=================================================================== +--- samba-3.0.3/source/smbd/password.c (revision 484) ++++ samba-3.0.3/source/smbd/password.c (working copy) +@@ -488,7 +488,11 @@ + /* now check the list of session users */ + if (!ok) { + char *auser; +- char *user_list = strdup(session_userlist); ++ char *user_list = NULL; ++ ++ if ( session_userlist ) ++ user_list = strdup(session_userlist); ++ + if (!user_list) + return(False); + Added: tinysofa/snapshot/samba/current/sources/samba-3.0.3-password.patch =================================================================== --- tinysofa/snapshot/samba/current/sources/samba-3.0.3-password.patch 2004-07-01 15:54:21 UTC (rev 2834) +++ tinysofa/snapshot/samba/current/sources/samba-3.0.3-password.patch 2004-07-01 15:54:34 UTC (rev 2835) @@ -0,0 +1,178 @@ +Index: rpc_server/srv_pipe.c +=================================================================== +--- samba-3.0.3/source/rpc_server/srv_pipe.c (revision 459) ++++ samba-3.0.3/source/rpc_server/srv_pipe.c (working copy) +@@ -87,6 +87,7 @@ + RPC_HDR_RESP hdr_resp; + BOOL auth_verify = ((p->ntlmssp_chal_flags & NTLMSSP_NEGOTIATE_SIGN) != 0); + BOOL auth_seal = ((p->ntlmssp_chal_flags & NTLMSSP_NEGOTIATE_SEAL) != 0); ++ uint32 ss_padding_len = 0; + uint32 data_len; + uint32 data_space_available; + uint32 data_len_left; +@@ -109,21 +110,22 @@ + p->hdr.pkt_type = RPC_RESPONSE; + + /* Set up rpc header flags. */ +- if (p->out_data.data_sent_length == 0) ++ if (p->out_data.data_sent_length == 0) { + p->hdr.flags = RPC_FLG_FIRST; +- else ++ } else { + p->hdr.flags = 0; ++ } + + /* + * Work out how much we can fit in a single PDU. + */ + + data_space_available = sizeof(p->out_data.current_pdu) - RPC_HEADER_LEN - RPC_HDR_RESP_LEN; +- if(p->ntlmssp_auth_validated) ++ if(p->ntlmssp_auth_validated) { + data_space_available -= (RPC_HDR_AUTH_LEN + RPC_AUTH_NTLMSSP_CHK_LEN); +- +- if(p->netsec_auth_validated) ++ } else if(p->netsec_auth_validated) { + data_space_available -= (RPC_HDR_AUTH_LEN + RPC_AUTH_NETSEC_CHK_LEN); ++ } + + /* + * The amount we send is the minimum of the available +@@ -151,15 +153,30 @@ + hdr_resp.alloc_hint = data_len_left; + + /* ++ * Work out if this PDU will be the last. ++ */ ++ ++ if(p->out_data.data_sent_length + data_len >= prs_offset(&p->out_data.rdata)) { ++ p->hdr.flags |= RPC_FLG_LAST; ++ if ((auth_seal || auth_verify) && (data_len_left % 8)) { ++ ss_padding_len = 8 - (data_len_left % 8); ++ DEBUG(10,("create_next_pdu: adding sign/seal padding of %u\n", ++ ss_padding_len )); ++ } ++ } ++ ++ /* + * Set up the header lengths. + */ + + if (p->ntlmssp_auth_validated) { +- p->hdr.frag_len = RPC_HEADER_LEN + RPC_HDR_RESP_LEN + data_len + +- RPC_HDR_AUTH_LEN + RPC_AUTH_NTLMSSP_CHK_LEN; ++ p->hdr.frag_len = RPC_HEADER_LEN + RPC_HDR_RESP_LEN + ++ data_len + ss_padding_len + ++ RPC_HDR_AUTH_LEN + RPC_AUTH_NTLMSSP_CHK_LEN; + p->hdr.auth_len = RPC_AUTH_NTLMSSP_CHK_LEN; + } else if (p->netsec_auth_validated) { +- p->hdr.frag_len = RPC_HEADER_LEN + RPC_HDR_RESP_LEN + data_len + ++ p->hdr.frag_len = RPC_HEADER_LEN + RPC_HDR_RESP_LEN + ++ data_len + ss_padding_len + + RPC_HDR_AUTH_LEN + RPC_AUTH_NETSEC_CHK_LEN; + p->hdr.auth_len = RPC_AUTH_NETSEC_CHK_LEN; + } else { +@@ -168,13 +185,6 @@ + } + + /* +- * Work out if this PDU will be the last. +- */ +- +- if(p->out_data.data_sent_length + data_len >= prs_offset(&p->out_data.rdata)) +- p->hdr.flags |= RPC_FLG_LAST; +- +- /* + * Init the parse struct to point at the outgoing + * data. + */ +@@ -206,12 +216,26 @@ + return False; + } + ++ /* Copy the sign/seal padding data. */ ++ if (ss_padding_len) { ++ char pad[8]; ++ memset(pad, '\0', 8); ++ if (!prs_copy_data_in(&outgoing_pdu, pad, ss_padding_len)) { ++ DEBUG(0,("create_next_pdu: failed to add %u bytes of pad data.\n", (unsigned int)ss_padding_len)); ++ prs_mem_free(&outgoing_pdu); ++ return False; ++ } ++ } ++ + if (p->ntlmssp_auth_validated) { ++ /* ++ * NTLMSSP processing. Mutually exclusive with Schannel. ++ */ + uint32 crc32 = 0; + char *data; + + DEBUG(5,("create_next_pdu: sign: %s seal: %s data %d auth %d\n", +- BOOLSTR(auth_verify), BOOLSTR(auth_seal), data_len, p->hdr.auth_len)); ++ BOOLSTR(auth_verify), BOOLSTR(auth_seal), data_len + ss_padding_len, p->hdr.auth_len)); + + /* + * Set data to point to where we copied the data into. +@@ -220,15 +244,16 @@ + data = prs_data_p(&outgoing_pdu) + data_pos; + + if (auth_seal) { +- crc32 = crc32_calc_buffer(data, data_len); +- NTLMSSPcalc_p(p, (uchar*)data, data_len); ++ crc32 = crc32_calc_buffer(data, data_len + ss_padding_len); ++ NTLMSSPcalc_p(p, (uchar*)data, data_len + ss_padding_len); + } + + if (auth_seal || auth_verify) { + RPC_HDR_AUTH auth_info; + +- init_rpc_hdr_auth(&auth_info, NTLMSSP_AUTH_TYPE, auth_info.auth_level, +- (auth_verify ? RPC_HDR_AUTH_LEN : 0), (auth_verify ? 1 : 0)); ++ init_rpc_hdr_auth(&auth_info, NTLMSSP_AUTH_TYPE, ++ auth_seal ? RPC_PIPE_AUTH_SEAL_LEVEL : RPC_PIPE_AUTH_SIGN_LEVEL, ++ (auth_verify ? ss_padding_len : 0), (auth_verify ? 1 : 0)); + if(!smb_io_rpc_hdr_auth("hdr_auth", &auth_info, &outgoing_pdu, 0)) { + DEBUG(0,("create_next_pdu: failed to marshall RPC_HDR_AUTH.\n")); + prs_mem_free(&outgoing_pdu); +@@ -251,9 +276,10 @@ + } + NTLMSSPcalc_p(p, (uchar*)auth_data, RPC_AUTH_NTLMSSP_CHK_LEN - 4); + } +- } +- +- if (p->netsec_auth_validated) { ++ } else if (p->netsec_auth_validated) { ++ /* ++ * Schannel processing. Mutually exclusive with NTLMSSP. ++ */ + int auth_type, auth_level; + char *data; + RPC_HDR_AUTH auth_info; +@@ -267,7 +293,7 @@ + + get_auth_type_level(p->netsec_auth.auth_flags, &auth_type, &auth_level); + init_rpc_hdr_auth(&auth_info, auth_type, auth_level, +- RPC_HDR_AUTH_LEN, 1); ++ ss_padding_len, 1); + + if(!smb_io_rpc_hdr_auth("hdr_auth", &auth_info, &outgoing_pdu, 0)) { + DEBUG(0,("create_next_pdu: failed to marshall RPC_HDR_AUTH.\n")); +@@ -281,7 +307,7 @@ + netsec_encode(&p->netsec_auth, + p->netsec_auth.auth_flags, + SENDER_IS_ACCEPTOR, +- &verf, data, data_len); ++ &verf, data, data_len + ss_padding_len); + + smb_io_rpc_auth_netsec_chk("", &verf, &outgoing_pdu, 0); + +@@ -292,7 +318,7 @@ + * Setup the counts for this PDU. + */ + +- p->out_data.data_sent_length += data_len; ++ p->out_data.data_sent_length += (data_len + ss_padding_len); + p->out_data.current_pdu_len = p->hdr.frag_len; + p->out_data.current_pdu_sent = 0; + Added: tinysofa/snapshot/samba/current/sources/samba-3.0.3.tar.bz2 =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/samba/current/sources/samba-3.0.3.tar.bz2 ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: tinysofa/snapshot/samba/current/sources/samba-3.0.4-man.patch =================================================================== --- tinysofa/snapshot/samba/current/sources/samba-3.0.4-man.patch 2004-07-01 15:54:21 UTC (rev 2834) +++ tinysofa/snapshot/samba/current/sources/samba-3.0.4-man.patch 2004-07-01 15:54:34 UTC (rev 2835) @@ -1,95 +0,0 @@ ---- samba-3.0.4/docs/manpages/smb.conf.5.orig 2004-05-05 10:23:15.000000000 -0400 -+++ samba-3.0.4/docs/manpages/smb.conf.5 2004-05-10 15:48:12.000000000 -0400 -@@ -76,22 +76,32 @@ - - .PP - The following sample section defines a file space share\&. The user has write access to the path \fI/home/bar\fR\&. The share is accessed via the share name ``\fBfoo\fR'': --Example?1.? \fI[foo]\fR\fI -- -- path = /home/bar\fR\fI -- -- read only = read only = no\fR -+.LP -+Example 1. -+.PD .1v -+.RS -+.nf -+\fI[foo]\fR\fI -+ path = /home/bar\fR\fI -+ read only = read only = no\fR -+.fi -+.RE -+.PD - .PP - The following sample section defines a printable share\&. The share is read\-only, but printable\&. That is, the only write access permitted is via calls to open, write to and close a spool file\&. The \fBguest ok\fR parameter means access will be permitted as the default guest user (specified elsewhere): --Example?2.? \fI[aprinter]\fR\fI -- -- path = /usr/spool/public\fR\fI -- -- read only = yes\fR\fI -- -- printable = yes\fR\fI -- -- guest ok = yes\fR -+.LP -+Example 2. -+.PD .1v -+.RS -+.nf -+\fI[aprinter]\fR\fI -+ path = /usr/spool/public\fR\fI -+ read only = yes\fR\fI -+ printable = yes\fR\fI -+ guest ok = yes\fR -+.fi -+.RE -+.PD - .SH "SPECIAL SECTIONS" - - .SS "The [global] section" -@@ -135,9 +145,16 @@ - - .PP - The [homes] section can specify all the parameters a normal service section can specify, though some make more sense than others\&. The following is a typical and suitable [homes] section: --Example?3.? \fI[homes]\fR\fI -- -- read only = no\fR -+.LP -+Example 3. -+.PD .1v -+.RS -+.nf -+\fI[homes]\fR\fI -+ read only = no\fR -+.fi -+.RE -+.PD - .PP - An important point is that if guest access is specified in the [homes] section, all home directories will be visible to all clients \fBwithout a password\fR\&. In the very unlikely event that this is actually desirable, it is wise to also specify \fBread only access\fR\&. - -@@ -174,13 +191,18 @@ - - .PP - Typically the path specified is that of a world\-writeable spool directory with the sticky bit set on it\&. A typical [printers] entry looks like this: --Example?4.? \fI[printers]\fR\fI -- -- path = /usr/spool/public\fR\fI -- -- guest ok = yes\fR\fI -- -- printable = yes\fR -+.LP -+Example 4. -+.PD .1v -+.RS -+.nf -+\fI[printers]\fR\fI -+ path = /usr/spool/public\fR\fI -+ guest ok = yes\fR\fI -+ printable = yes\fR -+.fi -+.RE -+.PD - .PP - All aliases given for a printer in the printcap file are legitimate printer names as far as the server is concerned\&. If your printing subsystem doesn't work like that, you will have to set up a pseudo\-printcap\&. This is a file consisting of one or more lines like this: - .nf Deleted: tinysofa/snapshot/samba/current/sources/samba-3.0.4-smb.conf.patch =================================================================== --- tinysofa/snapshot/samba/current/sources/samba-3.0.4-smb.conf.patch 2004-07-01 15:54:21 UTC (rev 2834) +++ tinysofa/snapshot/samba/current/sources/samba-3.0.4-smb.conf.patch 2004-07-01 15:54:34 UTC (rev 2835) @@ -1,14 +0,0 @@ ---- samba-3.0.4/packaging/RedHat/smb.conf.upstream 2004-04-04 03:37:44.000000000 -0400 -+++ samba-3.0.4/packaging/RedHat/smb.conf 2004-05-10 15:24:45.000000000 -0400 -@@ -35,7 +35,10 @@ - # It should not be necessary to spell out the print system type unless - # yours is non-standard. Currently supported print systems include: - # bsd, sysv, plp, lprng, aix, hpux, qnx --; printing = bsd -+; printing = cups -+ -+# This option tells cups that the data has already been rasterized -+cups options = raw - - # Uncomment this if you want a guest account, you must add this to /etc/passwd - # otherwise the user "nobody" is used Deleted: tinysofa/snapshot/samba/current/sources/samba-3.0.4-unixpath.patch =================================================================== --- tinysofa/snapshot/samba/current/sources/samba-3.0.4-unixpath.patch 2004-07-01 15:54:21 UTC (rev 2834) +++ tinysofa/snapshot/samba/current/sources/samba-3.0.4-unixpath.patch 2004-07-01 15:54:34 UTC (rev 2835) @@ -1,14 +0,0 @@ -diff -urN samba-3.0.4/source/smbd/filename.c samba-3.0.4.unixpath/source/smbd/filename.c ---- samba-3.0.4/source/smbd/filename.c 2004-04-04 17:37:31.000000000 +1000 -+++ samba-3.0.4.unixpath/source/smbd/filename.c 2004-05-18 22:45:24.000000000 +1000 -@@ -137,6 +137,10 @@ - if (!*name) { - name[0] = '.'; - name[1] = '\0'; -+ if (SMB_VFS_STAT(conn,name,&st) == 0) { -+ *pst = st; -+ } -+ DEBUG(5,("conversion finished %s -> %s\n",orig_path, name)); - return(True); - } - Deleted: tinysofa/snapshot/samba/current/sources/samba-3.0.4-warning.patch =================================================================== --- tinysofa/snapshot/samba/current/sources/samba-3.0.4-warning.patch 2004-07-01 15:54:21 UTC (rev 2834) +++ tinysofa/snapshot/samba/current/sources/samba-3.0.4-warning.patch 2004-07-01 15:54:34 UTC (rev 2835) @@ -1,10 +0,0 @@ ---- samba-3.0.4/source/utils/#ntlm_auth.c~ 2004-05-10 15:56:37.000000000 -0400 -+++ samba-3.0.4/source/utils/ntlm_auth.c 2004-05-10 15:56:37.000000000 -0400 -@@ -473,6 +473,7 @@ - { - NTSTATUS status; - if ( (opt_username == NULL) || (opt_domain == NULL) ) { -+ status = NT_STATUS_UNSUCCESSFUL; - DEBUG(1, ("Need username and domain for NTLMSSP\n")); - return status; - } Deleted: tinysofa/snapshot/samba/current/sources/samba-3.0.4.tar.gz =================================================================== (Binary files differ) Modified: tinysofa/snapshot/samba/current/sources/smb.init =================================================================== --- tinysofa/snapshot/samba/current/sources/smb.init 2004-07-01 15:54:21 UTC (rev 2834) +++ tinysofa/snapshot/samba/current/sources/smb.init 2004-07-01 15:54:34 UTC (rev 2835) @@ -114,11 +114,11 @@ status) rhstatus ;; - condrestart|try-restart) + condrestart) [ -f /var/lock/subsys/smb ] && restart || : ;; *) - echo $"Usage: $0 {start|stop|restart|reload|status|try-restart}" + echo $"Usage: $0 {start|stop|restart|reload|status|condrestart}" exit 1 esac Added: tinysofa/snapshot/samba/current/sources/swat.desktop =================================================================== --- tinysofa/snapshot/samba/current/sources/swat.desktop 2004-07-01 15:54:21 UTC (rev 2834) +++ tinysofa/snapshot/samba/current/sources/swat.desktop 2004-07-01 15:54:34 UTC (rev 2835) @@ -0,0 +1,8 @@ +[Desktop Entry] +Name=Samba Configuration +Name[de]=Samba Konfiguration +Type=Application +Comment=Configure Samba with a web based interface +Exec=htmlview http://127.0.0.1:901/ +Terminal=false +Categories=X-Red-Hat-Extra;Application;System;X-Red-Hat-ServerConfig; Modified: tinysofa/snapshot/samba/current/sources/winbind.init =================================================================== --- tinysofa/snapshot/samba/current/sources/winbind.init 2004-07-01 15:54:21 UTC (rev 2834) +++ tinysofa/snapshot/samba/current/sources/winbind.init 2004-07-01 15:54:34 UTC (rev 2835) @@ -89,11 +89,11 @@ status) rhstatus ;; - condrestart|try-restart) + condrestart) [ -f /var/lock/subsys/winbindd ] && restart || : ;; *) - echo $"Usage: $0 {start|stop|restart|reload|status|try-restart}" + echo $"Usage: $0 {start|stop|restart|reload|status|condrestart}" exit 1 esac Modified: tinysofa/snapshot/samba/current/specs/samba.spec =================================================================== --- tinysofa/snapshot/samba/current/specs/samba.spec 2004-07-01 15:54:21 UTC (rev 2834) +++ tinysofa/snapshot/samba/current/specs/samba.spec 2004-07-01 15:54:34 UTC (rev 2835) @@ -1,3 +1,4 @@ +%define initdir %{_sysconfdir}/rc.d/init.d %define auth %(test -f /etc/pam.d/system-auth && echo /etc/pam.d/system-auth || echo) Summary: The Samba SMB server. @@ -2,15 +3,17 @@ Name: samba -Version: 3.0.4 -Release: 3jh +Version: 3.0.3 +Release: 6ts Epoch: 0 License: GNU GPL Version 2 -Group: tinysofa/extra +Group: System Environment/Daemons URL: http://www.samba.org/ -Source: ftp://us2.samba.org/pub/samba/%{name}-%{version}.tar.gz +#TAG: change for non-pre +#Source: ftp://us2.samba.org/pub/samba/%{name}-%{version}rc1.tar.bz2 +Source: ftp://us2.samba.org/pub/samba/%{name}-%{version}.tar.bz2 -# replacement-files +# Red Hat specific replacement-files Source1: samba.log Source2: samba.xinetd -#Source3: swat.desktop +Source3: swat.desktop Source4: samba.sysconfig @@ -21,30 +24,30 @@ Source7: smbprint Source8: winbind.init +# Don't depend on Net::LDAP +Source999: filter-requires-samba.sh + # generic patches Patch1: samba-2.2.0-smbw.patch -Patch2: samba-3.0.0beta1-pipedir.patch -Patch3: samba-3.0.3-logfiles.patch -Patch4: samba-3.0.3pre1-pie.patch -Patch5: samba-3.0.0rc3-nmbd-netbiosname.patch -Patch6: samba-3.0.4-smb.conf.patch -Patch7: samba-3.0.4-man.patch -Patch8: samba-3.0.4-warning.patch -Patch9: samba-3.0.4-unixpath.patch +# Not used, but it have some patches which might be needed later... +Patch20: samba-3.0.0beta1-pipedir.patch +Patch24: samba-3.0.3-logfiles.patch +Patch25: samba-3.0.3pre1-pie.patch +Patch26: samba-3.0.0rc3-nmbd-netbiosname.patch +Patch27: samba-3.0.3-password.patch +Patch28: samba-3.0.3-bug1302.patch +Patch29: samba-3.0.3-bug1309.patch Requires: pam >= 0:0.64 %{auth} samba-common = %{epoch}:%{version} Requires: logrotate >= 0:3.4 initscripts >= 0:5.54-1 BuildRoot: %{_tmppath}/%{name}-%{version}-root -Prereq: sed mktemp /usr/bin/killall coreutils initscripts -%service_requires -BuildRequires: cups-devel, readline-devel, pam-devel -BuildRequires: kerberos5-devel, kerberos5-libs, libcom_err-devel -BuildRequires: openldap-devel, mysql-devel, cyrus-sasl-devel, openssl-devel -BuildRequires: autoconf kerberos5 zlib-devel ncurses-devel coreutils -BuildRequires: libacl-devel +Prereq: /sbin/chkconfig /bin/mktemp /usr/bin/killall +Prereq: fileutils sed /etc/init.d +BuildRequires: pam-devel, readline-devel, ncurses-devel, fileutils, libacl-devel krb5-devel -%define __perl_requires %{nil} +# Working around perl dependency problem from docs +%define __perl_requires %{SOURCE999} %description Samba is the protocol by which a lot of PC-related machines share @@ -59,7 +62,7 @@ %package client Summary: Samba (SMB) client programs. -Group: tinysofa/extra +Group: Applications/System Requires: samba-common = %{epoch}:%{version} Obsoletes: smbfs @@ -70,25 +73,15 @@ %package common Summary: Files used by both Samba servers and clients. -Group: tinysofa/extra -PreReq: /sbin/ldconfig +Group: Applications/System %description common Samba-common provides files necessary for both the server and client packages of Samba. -%package mysql -Summary: Samba (SMB) MySQL password backend -Group: tinysofa/extra -Requires: samba = %{version} -Requires: mysql-libs - -%description mysql -A dynamic module that lets youe store user accounts in a SQL backend. - %package swat Summary: The Samba SMB server configuration program. -Group: tinysofa/extra +Group: Applications/System Requires: samba = %{epoch}:%{version} xinetd %description swat @@ -97,6 +90,8 @@ Web browser. %prep +# TAG: change for non-pre +# % setup -q -n samba-3.0.3rc1 %setup -q # copy Red Hat specific scripts @@ -106,14 +101,13 @@ cp %{SOURCE8} packaging/RedHat/winbind.init %patch1 -p1 -b .smbw -%patch2 -p1 -b .pipedir -%patch3 -p1 -b .logfiles -#%patch4 -p1 -b .pie -%patch5 -p1 -b .nmbd-netbiosname -%patch6 -p1 -b .upstream -%patch7 -p1 -b .man -%patch8 -p1 -b .warning -%patch9 -p1 -b .unixpath +%patch20 -p1 -b .pipedir +%patch24 -p1 -b .logfiles +%patch25 -p1 -b .pie +%patch26 -p1 -b .nmbd-netbiosname +%patch27 -p1 -b .password +%patch28 -p1 -b .bug1302 +%patch29 -p1 -b .bug1309 # crap rm -f examples/VFS/.cvsignore @@ -148,144 +142,161 @@ --with-utmp \ --with-vfs \ --without-smbwrapper \ - --without-smbwrapper \ - --with-lockdir=%{_localstatedir}/cache/samba \ - --with-piddir=%{_localstatedir}/run \ + --with-lockdir=/var/cache/samba \ + --with-piddir=/var/run \ --with-mandir=%{_mandir} \ --with-privatedir=%{_sysconfdir}/samba \ - --with-logfilebase=%{_localstatedir}/log/samba \ - --with-libdir=%{_libdir}/samba \ - --with-configdir=%{_sysconfdir}/samba \ + --with-logfilebase=/var/log/samba \ + --with-libdir=%{_libdir}/samba \ + --with-configdir=%{_sysconfdir}/samba \ --with-swatdir=%{_datadir}/swat \ - --with-expsam=mysql -%make CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE" \ +make CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE" \ proto -%make CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE" \ +make CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE" %{?_smp_mflags} \ all nsswitch/libnss_wins.so modules -%make CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE" \ +make CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE" \ debug2html -%make CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE" \ +make CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE" \ smbfilter ( cd client ; gcc -o mount.cifs $RPM_OPT_FLAGS -Wall -O -D_GNU_SOURCE -D_LARGEFILE64_SOURCE mount.cifs.c ) %install -%{__mkdir_p} \ - %{buildroot}/sbin \ - %{buildroot}%{_sbindir} \ - %{buildroot}%{_bindir} \ - %{buildroot}%{_initrddir} \ - %{buildroot}%{_sysconfdir}/{pam.d,logrotate.d} \ - %{buildroot}%{_localstatedir}/{log,spool}/samba \ - %{buildroot}%{_localstatedir}/cache/samba \ - %{buildroot}%{_localstatedir}/cache/samba/winbindd_privileged \ - %{buildroot}%{_datadir}/swat/using_samba \ - %{buildroot}%{_datadir}/samba/codepages \ - %{buildroot}/%{_lib}/security \ - %{buildroot}%{_libdir} +rm -rf $RPM_BUILD_ROOT +mkdir -p $RPM_BUILD_ROOT/sbin +mkdir -p $RPM_BUILD_ROOT/usr/{sbin,bin} +mkdir -p $RPM_BUILD_ROOT/%{initdir} +mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/{pam.d,logrotate.d} +mkdir -p $RPM_BUILD_ROOT/var/{log,spool}/samba +mkdir -p $RPM_BUILD_ROOT/var/cache/samba +mkdir -p $RPM_BUILD_ROOT/var/cache/samba/winbindd_privileged +mkdir -p $RPM_BUILD_ROOT/%{_datadir}/swat/using_samba +mkdir -p $RPM_BUILD_ROOT/%{_datadir}/samba/codepages + cd source %makeinstall \ - BINDIR=%{buildroot}%{_bindir} \ - BASEDIR=%{buildroot}%{_prefix} \ - SBINDIR=%{buildroot}%{_sbindir} \ - DATADIR=%{buildroot}%{_datadir} \ - LOCKDIR=%{buildroot}%{_localstatedir}/cache/samba \ - PRIVATEDIR=%{buildroot}%{_sysconfdir}/samba \ - LIBDIR=%{buildroot}%{_libdir}/samba \ - CONFIGDIR=%{buildroot}%{_sysconfdir}/samba \ - MANDIR=%{buildroot}%{_mandir} \ - VARDIR=%{buildroot}%{_localstatedir}/log/samba \ - CODEPAGEDIR=%{buildroot}%{_datadir}/samba/codepages \ - SWATDIR=%{buildroot}%{_datadir}/swat \ - SAMBABOOK=%{buildroot}%{_datadir}/swat/using_samba \ - PIDDIR=%{buildroot}%{_localstatedir}/run + BINDIR=$RPM_BUILD_ROOT%{_bindir} \ + BASEDIR=$RPM_BUILD_ROOT%{_prefix} \ + SBINDIR=$RPM_BUILD_ROOT%{_sbindir} \ + DATADIR=$RPM_BUILD_ROOT%{_datadir} \ + LOCKDIR=$RPM_BUILD_ROOT/var/cache/samba \ + PRIVATEDIR=$RPM_BUILD_ROOT%{_sysconfdir}/samba \ + LIBDIR=$RPM_BUILD_ROOT%{_libdir}/samba \ + CONFIGDIR=$RPM_BUILD_ROOT%{_sysconfdir}/samba \ + MANDIR=$RPM_BUILD_ROOT%{_mandir} \ + VARDIR=$RPM_BUILD_ROOT/var/log/samba \ + CODEPAGEDIR=$RPM_BUILD_ROOT%{_datadir}/samba/codepages \ + SWATDIR=$RPM_BUILD_ROOT%{_datadir}/swat \ + SAMBABOOK=$RPM_BUILD_ROOT%{_datadir}/swat/using_samba \ + PIDDIR=$RPM_BUILD_ROOT/var/run cd .. # Install other stuff -install -m644 packaging/RedHat/smb.conf %{buildroot}%{_sysconfdir}/samba/smb.conf -install -m755 source/script/mksmbpasswd.sh %{buildroot}%{_bindir} -install -m644 packaging/RedHat/smbusers %{buildroot}%{_sysconfdir}/samba/smbusers -install -m755 packaging/RedHat/smbprint %{buildroot}%{_bindir} -install -m755 packaging/RedHat/smb.init %{buildroot}%{_initrddir}/smb -install -m755 packaging/RedHat/winbind.init %{buildroot}%{_initrddir}/winbind -ln -s ../..%{_initrddir}/smb %{buildroot}%{_sbindir}/samba -install -m644 packaging/RedHat/samba.pamd.stack %{buildroot}%{_sysconfdir}/pam.d/samba -install -m644 $RPM_SOURCE_DIR/samba.log %{buildroot}%{_sysconfdir}/logrotate.d/samba -ln -s ../usr/bin/smbmount %{buildroot}/sbin/mount.smb -ln -s ../usr/bin/smbmount %{buildroot}/sbin/mount.smbfs -echo 127.0.0.1 localhost > %{buildroot}%{_sysconfdir}/samba/lmhosts +install -m644 packaging/RedHat/smb.conf $RPM_BUILD_ROOT%{_sysconfdir}/samba/smb.conf +install -m755 source/script/mksmbpasswd.sh $RPM_BUILD_ROOT%{_bindir} +install -m644 packaging/RedHat/smbusers $RPM_BUILD_ROOT/etc/samba/smbusers +install -m755 packaging/RedHat/smbprint $RPM_BUILD_ROOT%{_bindir} +install -m755 packaging/RedHat/smb.init $RPM_BUILD_ROOT%{initdir}/smb +install -m755 packaging/RedHat/winbind.init $RPM_BUILD_ROOT%{initdir}/winbind +ln -s ../..%{initdir}/smb $RPM_BUILD_ROOT%{_sbindir}/samba +install -m644 packaging/RedHat/samba.pamd.stack $RPM_BUILD_ROOT/etc/pam.d/samba +install -m644 $RPM_SOURCE_DIR/samba.log $RPM_BUILD_ROOT/etc/logrotate.d/samba +ln -s ../usr/bin/smbmount $RPM_BUILD_ROOT/sbin/mount.smb +ln -s ../usr/bin/smbmount $RPM_BUILD_ROOT/sbin/mount.smbfs +echo 127.0.0.1 localhost > $RPM_BUILD_ROOT%{_sysconfdir}/samba/lmhosts # pam_smbpass -mv source/bin/pam_smbpass.so %{buildroot}/%{_lib}/security/pam_smbpass.so +mkdir -p $RPM_BUILD_ROOT/%{_lib}/security +mv source/bin/pam_smbpass.so $RPM_BUILD_ROOT/%{_lib}/security/pam_smbpass.so # winbind -install -m 755 source/nsswitch/pam_winbind.so %{buildroot}/%{_lib}/security/pam_winbind.so -install -m 755 source/nsswitch/libnss_winbind.so %{buildroot}/%{_lib}/libnss_winbind.so.2 -ln -sf /%{_lib}/libnss_winbind.so.2 %{buildroot}%{_libdir}/libnss_winbind.so -install -m 755 source/nsswitch/libnss_wins.so %{buildroot}/%{_lib}/libnss_wins.so.2 -ln -sf /%{_lib}/libnss_wins.so.2 %{buildroot}%{_libdir}/libnss_wins.so +mkdir -p $RPM_BUILD_ROOT/%{_lib}/security +install -m 755 source/nsswitch/pam_winbind.so $RPM_BUILD_ROOT/%{_lib}/security/pam_winbind.so +mkdir -p $RPM_BUILD_ROOT%{_libdir} +install -m 755 source/nsswitch/libnss_winbind.so $RPM_BUILD_ROOT/%{_lib}/libnss_winbind.so.2 +ln -sf /%{_lib}/libnss_winbind.so.2 $RPM_BUILD_ROOT%{_libdir}/libnss_winbind.so +install -m 755 source/nsswitch/libnss_wins.so $RPM_BUILD_ROOT/%{_lib}/libnss_wins.so.2 +ln -sf /%{_lib}/libnss_wins.so.2 $RPM_BUILD_ROOT%{_libdir}/libnss_wins.so # libsmbclient # make install puts libsmbclient.so in the wrong place on x86_64 -rm -f %{buildroot}/usr/lib/libsmbclient.so %{buildroot}/usr/lib/libsmbclient.a %{buildroot}/usr/lib || true -mkdir -p %{buildroot}%{_libdir} %{buildroot}%{_includedir} -install -m 755 source/bin/libsmbclient.so %{buildroot}%{_libdir}/libsmbclient.so -install -m 644 source/bin/libsmbclient.a %{buildroot}%{_libdir}/libsmbclient.a -install -m 644 source/include/libsmbclient.h %{buildroot}%{_includedir} +rm -f $RPM_BUILD_ROOT/usr/lib/libsmbclient.so $RPM_BUILD_ROOT/usr/lib/libsmbclient.a $RPM_BUILD_ROOT/usr/lib || true +mkdir -p $RPM_BUILD_ROOT%{_libdir} $RPM_BUILD_ROOT%{_includedir} +install -m 755 source/bin/libsmbclient.so $RPM_BUILD_ROOT%{_libdir}/libsmbclient.so +install -m 644 source/bin/libsmbclient.a $RPM_BUILD_ROOT%{_libdir}/libsmbclient.a +install -m 644 source/include/libsmbclient.h $RPM_BUILD_ROOT%{_includedir} -mkdir -p %{buildroot}%{_sysconfdir}/xinetd.d -install -m644 %{SOURCE2} %{buildroot}%{_sysconfdir}/xinetd.d/swat +mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d +install -m644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/swat -mkdir -p %{buildroot}%{_sysconfdir}/sysconfig -install -m644 %{SOURCE4} %{buildroot}%{_sysconfdir}/sysconfig/samba -install -m755 source/client/mount.cifs %{buildroot}/sbin/mount.cifs +mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig +install -m644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/samba +install -m755 source/client/mount.cifs $RPM_BUILD_ROOT/sbin/mount.cifs -rm -f %{buildroot}%{_mandir}/man1/editreg.1* -rm -f %{buildroot}%{_mandir}/man1/log2pcap.1* -rm -f %{buildroot}%{_mandir}/man1/smbsh.1* -rm -f %{buildroot}%{_mandir}/man1/smbget.1* -rm -f %{buildroot}%{_mandir}/man5/smbgetrc.5* +rm -f $RPM_BUILD_ROOT/%{_mandir}/man1/editreg.1* +rm -f $RPM_BUILD_ROOT%{_mandir}/man1/log2pcap.1* +rm -f $RPM_BUILD_ROOT%{_mandir}/man1/smbsh.1* +rm -f $RPM_BUILD_ROOT%{_mandir}/man1/smbget.1* #rm -f $RPM_BUILD_ROOT/%{_mandir}/man8/mount.cifs.8* - %clean -%clean_buildroot +rm -rf $RPM_BUILD_ROOT - %post -%service_post smb +/sbin/chkconfig --add smb %preun -%service_preun smb if [ $1 = 0 ] ; then - %{_rm} -rf /var/log/samba/* /var/cache/samba/* + /sbin/chkconfig --del smb + rm -rf /var/log/samba/* /var/cache/samba/* + /sbin/service smb stop >/dev/null 2>&1 fi exit 0 %postun -%service_postun smb +if [ "$1" -ge "1" ]; then + %{initdir}/smb condrestart >/dev/null 2>&1 +fi %post common -%service_post winbind +/sbin/chkconfig --add winbind /sbin/ldconfig %preun common -%service_preun winbind +if [ $1 = 0 ] ; then + /sbin/chkconfig --del winbind + /sbin/service winbind stop >/dev/null 2>&1 +fi +exit 0 %postun common -%service_postun winbind +if [ "$1" -ge "1" ]; then + %{initdir}/winbind condrestart >/dev/null 2>&1 +fi /sbin/ldconfig +%triggerpostun -- samba < 1.9.18p7 +if [ $1 != 0 ]; then + /sbin/chkconfig --add smb +fi +%triggerpostun -- samba < 2.0.5a-3 +if [ $1 != 0 ]; then + [ ! -d /var/lock/samba ] && mkdir -m 0755 /var/lock/samba + [ ! -d /var/spool/samba ] && mkdir -m 1777 /var/spool/samba + chmod 644 /etc/services + [ -f /etc/inetd.conf ] && chmod 644 /etc/inetd.conf +fi + %files %defattr(-,root,root) %doc README COPYING Manifest @@ -306,7 +317,7 @@ %{_bindir}/tdbdump %config(noreplace) %{_sysconfdir}/sysconfig/samba %config(noreplace) %{_sysconfdir}/samba/smbusers -%attr(755,root,root) %{_initrddir}/smb +%attr(755,root,root) %config %{initdir}/smb %config(noreplace) %{_sysconfdir}/logrotate.d/samba %config(noreplace) %{_sysconfdir}/pam.d/samba # %{_mandir}/man1/make_unicodemap.1* @@ -336,13 +347,16 @@ %{_sbindir}/swat %{_mandir}/man8/swat.8* #%{_mandir}/ja/man8/swat.8* -%{_libdir}/samba/*.msg +%attr(755,root,root) %{_libdir}/samba/*.msg %files client %defattr(-,root,root) /sbin/mount.smb /sbin/mount.smbfs /sbin/mount.cifs +%{_libdir}/samba/lowcase.dat +%{_libdir}/samba/upcase.dat +%{_libdir}/samba/valid.dat %{_bindir}/rpcclient %{_bindir}/smbcacls %{_bindir}/smbmount @@ -377,9 +391,6 @@ %defattr(-,root,root) %dir %{_libdir}/samba %dir %{_libdir}/samba/charset -%{_libdir}/samba/lowcase.dat -%{_libdir}/samba/upcase.dat -%{_libdir}/samba/valid.dat %{_libdir}/libnss_wins.so /%{_lib}/libnss_wins.so.2 %{_libdir}/libnss_winbind.so @@ -408,7 +419,7 @@ %dir %{_datadir}/samba %dir %{_datadir}/samba/codepages %dir %{_sysconfdir}/samba -%{_initrddir}/winbind +%{initdir}/winbind # %{_datadir}/samba/codepages/* # %{_mandir}/man1/make_smbcodepage.1* %{_mandir}/man1/ntlm_auth.1* @@ -430,42 +441,54 @@ #%lang(ja) %{_mandir}/ja/man5/lmhosts.5* #%lang(ja) %{_mandir}/ja/man8/smbpasswd.8* -%files mysql -%defattr(755,root,root) -%{_libdir}/samba/pdb/mysql.so +%changelog +* Tue Jun 15 2004 Elliot Lee +- rebuilt +* Tue May 4 2004 Jay Fenlason 3.0.3-5 +- Patch to allow password changes from machines patched with + Microsoft hotfix MS04-011. +- Include patches for https://bugzilla.samba.org/show_bug.cgi?id=1302 + and https://bugzilla.samba.org/show_bug.cgi?id=1309 -%changelog -* Thu May 13 2004 Jay Fenlason 3.0.4-1.FC1 -- New upstream version 3.0.4 -- Merge many fixes from other branches as described below: -- Upgrade to samba-3.0.4, which includes upstream fixes for - bugzilla #114436, (probably also #116936) -- Move locase.dat, upcase.dat and valid.dat from -client to -common - Closes bugzilla #122749 -- Added samba-3.0.4-smb.conf patch to make printing work better ootb. - Closes bugzilla #122527 -- Change all requires lines to include an explicit epoch. This closes - bugzilla #102715 -- Remove smbgetrc.5 man page, since we don't ship smbget. +* Thu Apr 29 2004 Jay Fenlason 3.0.3-4 +- Samba 3.0.3 released. + +* Wed Apr 21 2004 jay Fenlason 3.0.3-3.rc1 +- New upstream version - updated spec file to make libsmbclient.so executable. This closes bugzilla #121356 + +* Mon Apr 5 2004 Jay Fenlason 3.0.3-2.pre2 +- New upstream version - Updated configure line to remove --with-fhs and to explicitly set all the directories that --with-fhs was setting. We were overriding most of them anyway. This closes #118598 + +* Mon Mar 15 2004 Jay Fenlason 3.0.3-1.pre1 +- New upstream version. +- Updated -pie and -logfiles patches for 3.0.3pre1 - add krb5-devel to buildrequires, fixes #116560 - Add patch from Miloslav Trmac (mitr at volny.cz) to allow non-root to run "service smb status". This fixes #116559 + +* Tue Mar 02 2004 Elliot Lee +- rebuilt + +* Mon Feb 16 2004 Jay Fenlason 3.0.2a-1 +- Upgrade to 3.0.2a + +* Mon Feb 16 2004 Karsten Hopp 3.0.2-7 +- fix ownership in -common package + +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Fri Feb 13 2004 Jay Fenlason - Change all requires lines to list an explicit epoch. Closes #102715 - Add an explicit Epoch so that %{epoch} is defined. -- Changed all requires lines to include an explicit epoch. This closes - bugzilla #102715 -* Thu Feb 12 2004 Jay Fenlason 3.0.2-7.FC1 -- Fix the ownership on %{_libdir}/samba and %{_libdir}/samba/charset - -* Mon Feb 9 2004 Jay Fenlason 3.0.2-5.FC1 -- Merge from HEAD to build 3.0.2 for Fedora Core 1 erratum. +* Mon Feb 9 2004 Jay Fenlason 3.0.2-5 - New upstream version: 3.0.2 final includes security fix for #114995 (CAN-2004-0082) - Edit postun script for the -common package to restart winbind when @@ -515,7 +538,6 @@ - rebuilt * Wed May 28 2003 Jay Fenlason 2.2.8a-2 ->>>>>>> 1.39 - add libsmbclient.so for gnome-vfs-extras - Edit specfile to specify /var/run for pid files - Move /tmp/.winbindd/socket to /var/run/winbindd/socket From svn at tinysofa.org Thu Jul 1 15:42:06 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:42:06 +1000 (EST) Subject: [tinysofa-svn] r2681 - in tinysofa/snapshot: . umb-scheme umb-scheme/current umb-scheme/current/sources umb-scheme/current/specs Message-ID: <20040701154206.6A8164E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:42:06 +1000 (Fri, 02 Jul 2004) New Revision: 2681 Added: tinysofa/snapshot/umb-scheme/ tinysofa/snapshot/umb-scheme/current/ tinysofa/snapshot/umb-scheme/current/sources/ tinysofa/snapshot/umb-scheme/current/sources/slib2d5.zip tinysofa/snapshot/umb-scheme/current/sources/slibcat tinysofa/snapshot/umb-scheme/current/sources/umb-scheme-3.2-chapter.patch tinysofa/snapshot/umb-scheme/current/sources/umb-scheme-3.2-config.patch tinysofa/snapshot/umb-scheme/current/sources/umb-scheme-3.2-man.patch tinysofa/snapshot/umb-scheme/current/sources/umb-scheme-3.2-misc.patch tinysofa/snapshot/umb-scheme/current/sources/umb-scheme-3.2-share.patch tinysofa/snapshot/umb-scheme/current/sources/umb-scheme-3.2-slib2c7.patch tinysofa/snapshot/umb-scheme/current/sources/umb-scheme-3.2-texinfo.patch tinysofa/snapshot/umb-scheme/current/sources/umb-scheme-3.2-vi.patch tinysofa/snapshot/umb-scheme/current/sources/umb-scheme-3.2.tar.gz tinysofa/snapshot/umb-scheme/current/specs/ tinysofa/snapshot/umb-scheme/current/specs/umb-scheme.spec Log: - Add umb-scheme to snapshot from 2.0. Added: tinysofa/snapshot/umb-scheme/current/sources/slib2d5.zip =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/umb-scheme/current/sources/slib2d5.zip ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/umb-scheme/current/sources/slibcat =================================================================== --- tinysofa/snapshot/umb-scheme/current/sources/slibcat 2004-07-01 15:42:04 UTC (rev 2680) +++ tinysofa/snapshot/umb-scheme/current/sources/slibcat 2004-07-01 15:42:06 UTC (rev 2681) @@ -0,0 +1,149 @@ +;"slibcat" SLIB catalog for umb-scheme3.2. -*-scheme-*- +; +; DO NOT EDIT THIS FILE -- it is automagically generated + +( + (schelog . "/usr/share/umb-scheme/slib/schelog/schelog") + (portable-scheme-debugger . "/usr/share/umb-scheme/slib/psd/psd-slib") + (jfilter . "/usr/share/umb-scheme/slib/jfilter/jfilter") + (r2rs aggregate rev3-procedures rev2-procedures) + (r3rs aggregate rev3-procedures) + (r4rs aggregate rev4-optional-procedures) + (r5rs aggregate values macro eval) + (null . "/usr/share/umb-scheme/slib/null") + (aggregate . "/usr/share/umb-scheme/slib/null") + (rev4-optional-procedures . "/usr/share/umb-scheme/slib/sc4opt") + (rev3-procedures . "/usr/share/umb-scheme/slib/null") + (rev2-procedures . "/usr/share/umb-scheme/slib/sc2") + (multiarg/and- . "/usr/share/umb-scheme/slib/mularg") + (multiarg-apply . "/usr/share/umb-scheme/slib/mulapply") + (rationalize . "/usr/share/umb-scheme/slib/ratize") + (transcript . "/usr/share/umb-scheme/slib/trnscrpt") + (with-file . "/usr/share/umb-scheme/slib/withfile") + (dynamic-wind . "/usr/share/umb-scheme/slib/dynwind") + (dynamic . "/usr/share/umb-scheme/slib/dynamic") + (fluid-let defmacro . "/usr/share/umb-scheme/slib/fluidlet") + (alist . "/usr/share/umb-scheme/slib/alist") + (hash . "/usr/share/umb-scheme/slib/hash") + (sierpinski . "/usr/share/umb-scheme/slib/sierpinski") + (soundex . "/usr/share/umb-scheme/slib/soundex") + (hash-table . "/usr/share/umb-scheme/slib/hashtab") + (logical . "/usr/share/umb-scheme/slib/logical") + (random . "/usr/share/umb-scheme/slib/random") + (random-inexact . "/usr/share/umb-scheme/slib/randinex") + (modular . "/usr/share/umb-scheme/slib/modular") + (factor . "/usr/share/umb-scheme/slib/factor") + (primes . factor) + (charplot . "/usr/share/umb-scheme/slib/charplot") + (sort . "/usr/share/umb-scheme/slib/sort") + (tsort . topological-sort) + (topological-sort . "/usr/share/umb-scheme/slib/tsort") + (common-list-functions . "/usr/share/umb-scheme/slib/comlist") + (tree . "/usr/share/umb-scheme/slib/tree") + (coerce . "/usr/share/umb-scheme/slib/coerce") + (format . "/usr/share/umb-scheme/slib/format") + (generic-write . "/usr/share/umb-scheme/slib/genwrite") + (pretty-print . "/usr/share/umb-scheme/slib/pp") + (pprint-file . "/usr/share/umb-scheme/slib/ppfile") + (object->string . "/usr/share/umb-scheme/slib/obj2str") + (string-case . "/usr/share/umb-scheme/slib/strcase") + (stdio . "/usr/share/umb-scheme/slib/stdio") + (printf . "/usr/share/umb-scheme/slib/printf") + (scanf . "/usr/share/umb-scheme/slib/scanf") + (line-i/o . "/usr/share/umb-scheme/slib/lineio") + (string-port . "/usr/share/umb-scheme/slib/strport") + (getopt . "/usr/share/umb-scheme/slib/getopt") + (debug . "/usr/share/umb-scheme/slib/debug") + (qp . "/usr/share/umb-scheme/slib/qp") + (break defmacro . "/usr/share/umb-scheme/slib/break") + (trace defmacro . "/usr/share/umb-scheme/slib/trace") + (eval . "/usr/share/umb-scheme/slib/eval") + (record . "/usr/share/umb-scheme/slib/record") + (promise . "/usr/share/umb-scheme/slib/promise") + (synchk . "/usr/share/umb-scheme/slib/synchk") + (defmacroexpand . "/usr/share/umb-scheme/slib/defmacex") + (macro-by-example defmacro . "/usr/share/umb-scheme/slib/mbe") + (syntax-case . "/usr/share/umb-scheme/slib/scainit") + (syntactic-closures . "/usr/share/umb-scheme/slib/scmacro") + (macros-that-work . "/usr/share/umb-scheme/slib/macwork") + (macro . macro-by-example) + (object . "/usr/share/umb-scheme/slib/object") + (yasos macro . "/usr/share/umb-scheme/slib/yasyn") + (oop . yasos) + (collect macro . "/usr/share/umb-scheme/slib/collect") + (structure syntax-case . "/usr/share/umb-scheme/slib/structure") + (values . "/usr/share/umb-scheme/slib/values") + (queue . "/usr/share/umb-scheme/slib/queue") + (priority-queue . "/usr/share/umb-scheme/slib/priorque") + (array . "/usr/share/umb-scheme/slib/array") + (subarray . "/usr/share/umb-scheme/slib/subarray") + (array-for-each . "/usr/share/umb-scheme/slib/arraymap") + (repl . "/usr/share/umb-scheme/slib/repl") + (process . "/usr/share/umb-scheme/slib/process") + (chapter-order . "/usr/share/umb-scheme/slib/chap") + (posix-time . "/usr/share/umb-scheme/slib/psxtime") + (common-lisp-time . "/usr/share/umb-scheme/slib/cltime") + (time-zone . "/usr/share/umb-scheme/slib/timezone") + (relational-database . "/usr/share/umb-scheme/slib/rdms") + (databases . "/usr/share/umb-scheme/slib/dbutil") + (database-utilities . databases) + (database-commands . "/usr/share/umb-scheme/slib/dbcom") + (database-browse . "/usr/share/umb-scheme/slib/dbrowse") + (within-database macro . "/usr/share/umb-scheme/slib/dbsyn") + (html-form . "/usr/share/umb-scheme/slib/htmlform") + (alist-table . "/usr/share/umb-scheme/slib/alistab") + (parameters . "/usr/share/umb-scheme/slib/paramlst") + (getopt-parameters . "/usr/share/umb-scheme/slib/getparam") + (read-command . "/usr/share/umb-scheme/slib/comparse") + (batch . "/usr/share/umb-scheme/slib/batch") + (glob . "/usr/share/umb-scheme/slib/glob") + (filename . glob) + (crc . "/usr/share/umb-scheme/slib/crc") + (fft . "/usr/share/umb-scheme/slib/fft") + (wt-tree . "/usr/share/umb-scheme/slib/wttree") + (string-search . "/usr/share/umb-scheme/slib/strsrch") + (root . "/usr/share/umb-scheme/slib/root") + (minimize . "/usr/share/umb-scheme/slib/minimize") + (precedence-parse . "/usr/share/umb-scheme/slib/prec") + (parse . precedence-parse) + (commutative-ring . "/usr/share/umb-scheme/slib/cring") + (self-set . "/usr/share/umb-scheme/slib/selfset") + (determinant . "/usr/share/umb-scheme/slib/determ") + (byte . "/usr/share/umb-scheme/slib/byte") + (tzfile . "/usr/share/umb-scheme/slib/tzfile") + (schmooz . "/usr/share/umb-scheme/slib/schmooz") + (transact . "/usr/share/umb-scheme/slib/transact") + (net-clients . transact) + (db->html . "/usr/share/umb-scheme/slib/db2html") + (http . "/usr/share/umb-scheme/slib/http-cgi") + (cgi . http) + (uri . "/usr/share/umb-scheme/slib/uri") + (uniform-resource-identifier . uri) + (pnm . "/usr/share/umb-scheme/slib/pnm") + (metric-units . "/usr/share/umb-scheme/slib/simetrix") + (diff . "/usr/share/umb-scheme/slib/differ") + (solid . "/usr/share/umb-scheme/slib/solid") + (vrml97 . solid) + (vrml . vrml97) + (color . "/usr/share/umb-scheme/slib/color") + (color-space . "/usr/share/umb-scheme/slib/colorspc") + (cie . color-space) + (color-names . "/usr/share/umb-scheme/slib/colornam") + (resene color-names . "/usr/share/umb-scheme/slib/clrnamdb.scm") + (saturate color-names . "/usr/share/umb-scheme/slib/clrnamdb.scm") + (daylight . "/usr/share/umb-scheme/slib/daylight") + (matfile . "/usr/share/umb-scheme/slib/matfile") + (mat-file . matfile) + (spectral-tristimulus-values . color-space) + (cie1964 spectral-tristimulus-values . "/usr/share/umb-scheme/slib/cie1964.xyz") + (cie1931 spectral-tristimulus-values . "/usr/share/umb-scheme/slib/cie1931.xyz") + (ciexyz . cie1931) + (cvs . "/usr/share/umb-scheme/slib/cvs") + (html-for-each . "/usr/share/umb-scheme/slib/html4each") + (directory . "/usr/share/umb-scheme/slib/dirs") + (srfi-0 . srfi) + (srfi defmacro . "/usr/share/umb-scheme/slib/srfi") + (srfi-1 . "/usr/share/umb-scheme/slib/srfi-1") + (new-catalog . "/usr/share/umb-scheme/slib/mklibcat") + (*SLIB-VERSION* . "2d5") +) Added: tinysofa/snapshot/umb-scheme/current/sources/umb-scheme-3.2-chapter.patch =================================================================== --- tinysofa/snapshot/umb-scheme/current/sources/umb-scheme-3.2-chapter.patch 2004-07-01 15:42:04 UTC (rev 2680) +++ tinysofa/snapshot/umb-scheme/current/sources/umb-scheme-3.2-chapter.patch 2004-07-01 15:42:06 UTC (rev 2681) @@ -0,0 +1,11 @@ +--- scheme-3.2/scheme.texinfo Tue Feb 8 19:01:55 2000 ++++ scheme-3.2/scheme.texinfo Tue Feb 8 19:02:36 2000 +@@ -64,7 +64,7 @@ + + @ifinfo + @node Top, Copying, Files, (DIR) +- at ichapter Introduction ++ at chapter Introduction + + This manual documents how to install and use UMB Scheme as + well as its new features and incompatibilities, and how to report bugs. Added: tinysofa/snapshot/umb-scheme/current/sources/umb-scheme-3.2-config.patch =================================================================== --- tinysofa/snapshot/umb-scheme/current/sources/umb-scheme-3.2-config.patch 2004-07-01 15:42:04 UTC (rev 2680) +++ tinysofa/snapshot/umb-scheme/current/sources/umb-scheme-3.2-config.patch 2004-07-01 15:42:06 UTC (rev 2681) @@ -0,0 +1,42 @@ +--- scheme-3.2/SLIB-for-umb-scheme.init~ Sun Jan 21 17:15:47 1996 ++++ scheme-3.2/SLIB-for-umb-scheme.init Fri Dec 13 17:33:24 1996 +@@ -40,7 +40,7 @@ + + (define (implementation-vicinity) + (case (software-type) +- ((UNIX) "/usr/local/src/scheme/") ++ ((UNIX) "/usr/share/umb-scheme/") + ((VMS) "scheme$src:") + ((MS-DOS) "C:\\scheme\\"))) + +@@ -55,7 +55,7 @@ + ;; Use this path if your scheme does not support GETENV + ;; or if SCHEME_LIBRARY_PATH is not set. + (case (software-type) +- ((UNIX) "/usr/local/lib/slib/") ++ ((UNIX) "/usr/share/umb-scheme/slib/") + ((VMS) "lib$scheme:") + ((MS-DOS) "C:\\SLIB\\") + (else ""))))) +--- scheme-3.2/steering.c~ Sun Jan 21 17:15:53 1996 ++++ scheme-3.2/steering.c Fri Dec 13 17:38:45 1996 +@@ -62,7 +62,7 @@ + + #define TOP_LEVEL_PROMPT "\n==> " + +-#define STANDARD_PRELUDE_PATHNAME "/usr/local/lib/scheme/prelude.scheme" ++#define STANDARD_PRELUDE_PATHNAME "/usr/share/umb-scheme/prelude.scheme" + + Private String OPENING = + "Welcome to UMB Scheme, version Copyright (c) 1988,1996 William R Campbell.\n\ +--- scheme-3.2/prelude.scheme~ Sun Jan 21 17:15:51 1996 ++++ scheme-3.2/prelude.scheme Fri Dec 13 17:43:21 1996 +@@ -708,7 +708,7 @@ + ; + ; Comment this out if you don't want to use SLIB + +-(load "/usr/local/lib/scheme/SLIB-for-umb-scheme.init") ++(load "/usr/share/umb-scheme/SLIB-for-umb-scheme.init") + + ; MAINTENANCE PROCEDURES + Added: tinysofa/snapshot/umb-scheme/current/sources/umb-scheme-3.2-man.patch =================================================================== --- tinysofa/snapshot/umb-scheme/current/sources/umb-scheme-3.2-man.patch 2004-07-01 15:42:04 UTC (rev 2680) +++ tinysofa/snapshot/umb-scheme/current/sources/umb-scheme-3.2-man.patch 2004-07-01 15:42:06 UTC (rev 2681) @@ -0,0 +1,14 @@ +--- scheme-3.2/scheme.1~ Sun Jan 21 17:15:52 1996 ++++ scheme-3.2/scheme.1 Fri Dec 13 17:37:04 1996 +@@ -345,9 +345,9 @@ + UMB Scheme does not support nested debugging sessions. (Keep it simple.) + .fi + .SH FILES +-/usr/local/lib/scheme/prelude.scheme ++/usr/share/ubm-scheme/prelude.scheme + .br +-/usr/local/lib/scheme/SLIB-for-umb-scheme.init ++/usr/share/umb-scheme/SLIB-for-umb-scheme.init + .br + /usr/local/lib/slib/* + Added: tinysofa/snapshot/umb-scheme/current/sources/umb-scheme-3.2-misc.patch =================================================================== --- tinysofa/snapshot/umb-scheme/current/sources/umb-scheme-3.2-misc.patch 2004-07-01 15:42:04 UTC (rev 2680) +++ tinysofa/snapshot/umb-scheme/current/sources/umb-scheme-3.2-misc.patch 2004-07-01 15:42:06 UTC (rev 2681) @@ -0,0 +1,21 @@ +--- scheme-3.2/Makefile.marc Wed Aug 28 13:09:27 1996 ++++ scheme-3.2/Makefile Wed Aug 28 13:10:01 1996 +@@ -1,6 +1,6 @@ + # Makefile for the UMB Scheme interpreter. + CC = gcc +-CFLAGS = -g -O -pedantic -Wall ++CFLAGS = $(RPM_OPT_FLAGS) -pedantic -Wall + + #CC = cc + #CFLAGS = -O +--- scheme-3.2/portable.h.marc Wed Aug 28 13:09:31 1996 ++++ scheme-3.2/portable.h Wed Aug 28 13:09:47 1996 +@@ -94,7 +94,7 @@ + a float.h defns file then replace the definition of DBL_MIN with + an #include */ + +-#define DBL_MIN 10e-307 ++#include + + #ifdef sun + extern int fclose( /* FILE *stream */ ); Added: tinysofa/snapshot/umb-scheme/current/sources/umb-scheme-3.2-share.patch =================================================================== --- tinysofa/snapshot/umb-scheme/current/sources/umb-scheme-3.2-share.patch 2004-07-01 15:42:04 UTC (rev 2680) +++ tinysofa/snapshot/umb-scheme/current/sources/umb-scheme-3.2-share.patch 2004-07-01 15:42:06 UTC (rev 2681) @@ -0,0 +1,20 @@ +--- scheme-3.2/slib/umbscheme.init Sun Jun 4 16:09:20 2000 ++++ scheme-3.2/slib/umbscheme.init Sun Jun 4 16:09:56 2000 +@@ -35,7 +35,7 @@ + + (define (implementation-vicinity) + (case (software-type) +- ((UNIX) "/usr/lib/umb-scheme/") ++ ((UNIX) "/usr/share/umb-scheme/") + ((VMS) "scheme$src:") + ((MS-DOS) "C:\\scheme\\"))) + +@@ -50,7 +50,7 @@ + ;; Use this path if your scheme does not support GETENV + ;; or if SCHEME_LIBRARY_PATH is not set. + (case (software-type) +- ((UNIX) "/usr/lib/umb-scheme/slib/") ++ ((UNIX) "/usr/share/umb-scheme/slib/") + ((VMS) "lib$scheme:") + ((MS-DOS) "C:\\SLIB\\") + (else ""))))) Added: tinysofa/snapshot/umb-scheme/current/sources/umb-scheme-3.2-slib2c7.patch =================================================================== --- tinysofa/snapshot/umb-scheme/current/sources/umb-scheme-3.2-slib2c7.patch 2004-07-01 15:42:04 UTC (rev 2680) +++ tinysofa/snapshot/umb-scheme/current/sources/umb-scheme-3.2-slib2c7.patch 2004-07-01 15:42:06 UTC (rev 2681) @@ -0,0 +1,11 @@ +--- scheme-3.2/prelude.scheme Tue Feb 8 19:06:54 2000 ++++ scheme-3.2/prelude.scheme Tue Feb 8 19:10:38 2000 +@@ -708,7 +708,7 @@ + ; + ; Comment this out if you don't want to use SLIB + +-(load "/usr/share/umb-scheme/SLIB-for-umb-scheme.init") ++(load "/usr/share/umb-scheme/slib/umbscheme.init") + + ; MAINTENANCE PROCEDURES + Added: tinysofa/snapshot/umb-scheme/current/sources/umb-scheme-3.2-texinfo.patch =================================================================== --- tinysofa/snapshot/umb-scheme/current/sources/umb-scheme-3.2-texinfo.patch 2004-07-01 15:42:04 UTC (rev 2680) +++ tinysofa/snapshot/umb-scheme/current/sources/umb-scheme-3.2-texinfo.patch 2004-07-01 15:42:06 UTC (rev 2681) @@ -0,0 +1,11 @@ +--- scheme-3.2/scheme.texinfo.marc Wed Aug 28 15:26:34 1996 ++++ scheme-3.2/scheme.texinfo Wed Aug 28 15:27:01 1996 +@@ -63,7 +63,7 @@ + @page + + @ifinfo +- at node Top, Copying,, (DIR) ++ at node Top, Copying, Files, (DIR) + @ichapter Introduction + + This manual documents how to install and use UMB Scheme as Added: tinysofa/snapshot/umb-scheme/current/sources/umb-scheme-3.2-vi.patch =================================================================== --- tinysofa/snapshot/umb-scheme/current/sources/umb-scheme-3.2-vi.patch 2004-07-01 15:42:04 UTC (rev 2680) +++ tinysofa/snapshot/umb-scheme/current/sources/umb-scheme-3.2-vi.patch 2004-07-01 15:42:06 UTC (rev 2681) @@ -0,0 +1,20 @@ +--- scheme-3.2/primitive.c.vi 1996-01-21 23:15:51.000000000 +0100 ++++ scheme-3.2/primitive.c 2002-11-29 15:51:02.000000000 +0100 +@@ -1741,7 +1741,7 @@ + String editor; + String command; + +- editor = (ed == NULL) ? "/usr/ucb/vi" : Copy_String( ed ); ++ editor = (ed == NULL) ? "/bin/vi" : Copy_String( ed ); + + command = (String) malloc(strlen(editor)+1 + + Get_String_Length(Top(1))+10); +@@ -1772,7 +1772,7 @@ + String editor; + String command; + +- editor = (ed == NULL) ? "/usr/ucb/vi" : Copy_String( ed ); ++ editor = (ed == NULL) ? "/bin/vi" : Copy_String( ed ); + + command = (String) malloc(strlen(editor)+1 + + Get_String_Length(Top(1))+1); Added: tinysofa/snapshot/umb-scheme/current/sources/umb-scheme-3.2.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/umb-scheme/current/sources/umb-scheme-3.2.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/umb-scheme/current/specs/umb-scheme.spec =================================================================== --- tinysofa/snapshot/umb-scheme/current/specs/umb-scheme.spec 2004-07-01 15:42:04 UTC (rev 2680) +++ tinysofa/snapshot/umb-scheme/current/specs/umb-scheme.spec 2004-07-01 15:42:06 UTC (rev 2681) @@ -0,0 +1,173 @@ +Summary: An implementation of the Scheme programming language. +Name: umb-scheme +Version: 3.2 +Release: 32ts +License: GPL +Group: Development/Languages +Source: ftp://ftp.cs.umb.edu/pub/scheme/umb-scheme-3.2.tar.gz +Source1: http://swissnet.ai.mit.edu/ftpdir/scm/slib2d5.zip +Source2: slibcat +Patch0: umb-scheme-3.2-misc.patch +Patch1: umb-scheme-3.2-texinfo.patch +Patch2: umb-scheme-3.2-config.patch +Patch3: umb-scheme-3.2-man.patch +Patch4: umb-scheme-3.2-chapter.patch +Patch5: umb-scheme-3.2-slib2c7.patch +Patch6: umb-scheme-3.2-share.patch +Patch7: umb-scheme-3.2-vi.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-root +Prereq: /sbin/install-info +BuildRequires: texinfo + +%description +UMB Scheme is a public domain implementation of the Scheme programming +language. Scheme is a statically scoped and properly tail-recursive +dialect of the Lisp programming language, designed with clear and +simple semantics and a minimal number of ways to form expressions. + +%prep +%setup -q -n scheme-3.2 +rm -fr slib +unzip -q -o %{SOURCE1} +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 +%patch4 -p1 +%patch5 -p1 +%patch6 -p1 +%patch7 -p1 + +%build +make "RPM_OPT_FLAGS=$RPM_OPT_FLAGS" +makeinfo scheme.texinfo + +%install +[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT +mkdir -p $RPM_BUILD_ROOT{%{_bindir},%{_infodir},%{_datadir}/umb-scheme,%{_mandir}/man1} + +install -m755 scheme $RPM_BUILD_ROOT%{_bindir}/umb-scheme +install -m755 scheme.1 $RPM_BUILD_ROOT%{_mandir}/man1/umb-scheme.1 +install -m644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/umb-scheme/slibcat + +find slib | cpio -pdm $RPM_BUILD_ROOT%{_datadir}/umb-scheme +install -m644 prelude.scheme $RPM_BUILD_ROOT%{_datadir}/umb-scheme + +install -m644 scheme.info $RPM_BUILD_ROOT%{_infodir}/umb-scheme.info +gzip -9nf $RPM_BUILD_ROOT%{_infodir}/umb-scheme.info + +chmod -x $RPM_BUILD_ROOT%{_mandir}/*/* + +%clean +[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT + +%post +/sbin/install-info %{_infodir}/umb-scheme.info.gz %{_infodir}/dir \ + --entry="* umb-scheme: (umb-scheme). UMB Scheme Interpreter." + +%preun +if [ "$1" = 0 ]; then + /sbin/install-info --delete %{_infodir}/umb-scheme.info.gz %{_infodir}/dir \ + --entry="* umb-scheme: (umb-scheme). UMB Scheme Interpreter." +fi + +%files +%defattr(-,root,root) +%doc slib/ANNOUNCE slib/FAQ slib/README +%attr(0755,root,root) %{_bindir}/umb-scheme +%attr(0755,root,root) %dir %{_datadir}/umb-scheme +%attr(0644,root,root) %{_datadir}/umb-scheme/prelude.scheme +%attr(0644,root,root) %{_datadir}/umb-scheme/slibcat +%attr(0755,root,root) %dir %{_datadir}/umb-scheme/slib +%attr(0644,root,root) %{_datadir}/umb-scheme/slib/* +%{_mandir}/man1/umb-scheme.1* +%{_infodir}/umb-scheme.info.gz + +%changelog +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Tue Jun 17 2003 Phil Knirsch 3.2-31 +- rebuilt + +* Wed Jun 04 2003 Elliot Lee +- rebuilt + +* Wed Jan 22 2003 Tim Powers +- rebuilt + +* Tue Dec 3 2002 Bill Nottingham 3.2-28 +- fix slibcat so guile-1.6 stops trying to rebuild it + +* Fri Nov 29 2002 Phil Knirsch 3.2-27 +- Added new slib library (#76693). +- Updated slibcat as well. +- Fixed unset EDITOR vi location (#76692). +- Fixed Copyright: to License:. + +* Wed Nov 6 2002 Bill Nottingham 3.2-26 +- rebuild + +* Fri Jun 21 2002 Tim Powers +- automated rebuild + +* Wed Jun 19 2002 Phil Knirsch 3.2-24 +- Don't forcibly strip binaries + +* Thu May 23 2002 Tim Powers 3.2-23 +- automated rebuild + +* Wed Jan 09 2002 Tim Powers 3.2-22 +- automated rebuild + +* Mon Sep 3 2001 Philipp Knirsch 3.2-21 +- Fixed problem with read-only /usr pollution of /usr/share/umb-scheme/slibcat + (#52742) + +* Tue Jun 26 2001 Philipp Knirsch +- Fixed wrong slibcat version (#40395) + +* Sun Jun 24 2001 Elliot Lee +- Bump release + rebuild. + +* Mon Jan 29 2001 Philipp Knirsch +- Fixed buzilla bug #24717 where the Prereq: for /sbin/install-info was missing + +* Tue Dec 19 2000 Philipp Knirsch +- rebuild + +* Wed Jul 12 2000 Prospector +- automatic rebuild + +* Tue Jun 27 2000 Nalin Dahyabhai +- update to slib 2c8 + +* Sat Jun 10 2000 Nalin Dahyabhai +- fix wacky permissions in slib directory (bug #11871) + +* Sun Jun 4 2000 Nalin Dahyabhai +- FHS fixes +- move slib to %%{_datadir} + +* Tue Feb 8 2000 Nalin Dahyabhai +- update slib to version 2c7 +- generate new catalog for slib and include it + +* Thu Feb 3 2000 Bernhard Rosenkraenzer +- remove executable bit from man page (Bug #9035) +- deal with RPM compressing man pages + +* Sun Mar 21 1999 Cristian Gafton +- auto rebuild in the new build environment (release 9) + +* Tue Aug 11 1998 Jeff Johnson +- build root + +* Mon Apr 27 1998 Prospector System +- translations modified for de, fr, tr + +* Fri Oct 24 1997 Marc Ewing +- install-info + +* Fri Jul 18 1997 Erik Troan +- built against glibc From svn at tinysofa.org Thu Jul 1 15:52:43 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:52:43 +1000 (EST) Subject: [tinysofa-svn] r2813 - in tinysofa/snapshot/passwd/current: sources specs Message-ID: <20040701155243.9AE404E817D@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:52:43 +1000 (Fri, 02 Jul 2004) New Revision: 2813 Added: tinysofa/snapshot/passwd/current/sources/passwd-0.68-8.tar.gz Removed: tinysofa/snapshot/passwd/current/sources/passwd-0.68-3-pamonly.patch tinysofa/snapshot/passwd/current/sources/passwd-0.68-3.tar.gz tinysofa/snapshot/passwd/current/sources/passwd-0.68-selinux.patch tinysofa/snapshot/passwd/current/sources/passwd-0.68-sysauth.patch Modified: tinysofa/snapshot/passwd/current/specs/passwd.spec Log: - Sync with 2.0. - Added: - passwd-0.68-8.tar.gz: - Removed: - passwd-0.68-3-pamonly.patch: - passwd-0.68-3.tar.gz: - passwd-0.68-selinux.patch: - passwd-0.68-sysauth.patch: Deleted: tinysofa/snapshot/passwd/current/sources/passwd-0.68-3-pamonly.patch =================================================================== --- tinysofa/snapshot/passwd/current/sources/passwd-0.68-3-pamonly.patch 2004-07-01 15:52:40 UTC (rev 2812) +++ tinysofa/snapshot/passwd/current/sources/passwd-0.68-3-pamonly.patch 2004-07-01 15:52:43 UTC (rev 2813) @@ -1,21 +0,0 @@ -diff -Nur passwd-0.68/Makefile passwd-0.68.changed/Makefile ---- passwd-0.68/Makefile 2002-12-10 02:51:12.000000000 +0100 -+++ passwd-0.68.changed/Makefile 2003-04-22 14:33:46.000000000 +0200 -@@ -2,7 +2,7 @@ - # $Id: Makefile,v 1.19 2002/12/10 01:51:12 nalin Exp $ - # - --BACKLIB=libuser -+BACKLIB=pwdb - - ifeq (libuser,$(BACKLIB)) - CFLAGS = $(shell pkg-config --cflags libuser) -@@ -19,7 +19,7 @@ - CC = gcc - DEBUG = -g - CFLAGS += $(RPM_OPT_FLAGS) -Wall -D_GNU_SOURCE $(DEBUG) $(DEFS) --LDFLAGS += -ldl -lpam -lpam_misc -+LDFLAGS += -lpam -ldl -lpam_misc -lnsl - PROGS = passwd chfn chsh - POPT = -lpopt - Deleted: tinysofa/snapshot/passwd/current/sources/passwd-0.68-3.tar.gz =================================================================== (Binary files differ) Added: tinysofa/snapshot/passwd/current/sources/passwd-0.68-8.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/passwd/current/sources/passwd-0.68-8.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: tinysofa/snapshot/passwd/current/sources/passwd-0.68-selinux.patch =================================================================== --- tinysofa/snapshot/passwd/current/sources/passwd-0.68-selinux.patch 2004-07-01 15:52:40 UTC (rev 2812) +++ tinysofa/snapshot/passwd/current/sources/passwd-0.68-selinux.patch 2004-07-01 15:52:43 UTC (rev 2813) @@ -1,204 +0,0 @@ -diff -upNr passwd-0.68/Makefile passwd-0.68/Makefile ---- passwd-0.68/Makefile 2002-12-10 01:51:12.000000000 +0000 -+++ passwd-0.68/Makefile 2003-07-28 21:19:07.000000000 +0000 -@@ -1,5 +1,5 @@ - # --# $Id: Makefile,v 1.19 2002/12/10 01:51:12 nalin Exp $ -+# $Id: Makefile,v 1.20 2003/07/28 21:19:07 dwalsh Exp $ - # - - BACKLIB=libuser -@@ -22,6 +22,11 @@ CFLAGS += $(RPM_OPT_FLAGS) -Wall -D_GNU_ - LDFLAGS += -ldl -lpam -lpam_misc - PROGS = passwd chfn chsh - POPT = -lpopt -+ifeq ($(WITH_SELINUX),yes) -+CFLAGS += -DWITH_SELINUX -+LDFLAGS += -lselinux -lattr -+SELINUX_UTILS=selinux_utils.o -+endif - - PROJECT = passwd - -@@ -38,7 +43,7 @@ all: date.h $(PROGS) pwdstat - %.o : %.c Makefile - $(CC) $(CFLAGS) -c -o $@ $< - --passwd: passwd.o libuser.o pwdb.o -+passwd: passwd.o libuser.o pwdb.o ${SELINUX_UTILS} - $(CC) -o $@ $^ $(LDFLAGS) $(POPT) - - chfn: chfn.o libuser.o pwdb.o version.o -diff -upNr passwd-0.68/passwd.c passwd-0.68/passwd.c ---- passwd-0.68/passwd.c 2002-12-09 21:34:26.000000000 +0000 -+++ passwd-0.68/passwd.c 2003-07-28 21:12:16.000000000 +0000 -@@ -35,7 +35,7 @@ - - /* Written by Cristian Gafton */ - --#ident "$Id: passwd.c,v 1.14 2002/12/09 21:34:26 nalin Exp $" -+#ident "$Id: passwd.c,v 1.15 2003/07/28 21:12:16 dwalsh Exp $" - - #include - -@@ -51,6 +51,13 @@ - #include - #include "pwdb.h" - -+#ifdef WITH_SELINUX -+#include -+#include -+#include -+#include "selinux_utils.h" -+#endif -+ - #define _(String) String - #define N_(String) String - -@@ -313,6 +320,23 @@ main(int argc, const char **argv) - progname = basename(argv[0]); - parse_args(argc, argv, &min, &max, &warn, &inact); - -+#ifdef WITH_SELINUX -+ if (is_selinux_enabled()) { -+ if ((getuid() == 0) && -+ (checkAccess((char *) username,PASSWD__PASSWD)!=0)) { -+ security_context_t user_context; -+ if (getprevcon(&user_context) < 0) -+ user_context=(security_context_t) strdup(_("Unknown user context")); -+ syslog(LOG_ALERT, _("%s is not authorized to change the password of %s\n"), -+ user_context, username); -+ fprintf(stderr, _("%s: %s is not authorized to change the password of %s\n"), -+ progname, user_context, username); -+ freecon(user_context); -+ exit(1); -+ } -+ } -+#endif -+ - /* Handle account locking request. */ - if (passwd_flags & PASSWD_LOCK) { - printf(_("Locking password for user %s.\n"), username); -diff -upNr passwd-0.68/passwd.spec passwd-0.68/passwd.spec ---- passwd-0.68/passwd.spec 2003-02-13 21:18:28.000000000 +0000 -+++ passwd-0.68/passwd.spec 2003-09-05 14:59:47.000000000 +0000 -@@ -1,7 +1,10 @@ -+%if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} -+%define WITH_SELINUX 1 -+%endif - Summary: The passwd utility for setting/changing passwords using PAM. - Name: passwd - Version: 0.68 --Release: 3 -+Release: 5.sel - License: BSD - Group: System Environment/Base - Source: passwd-%{version}-%{release}.tar.gz -@@ -20,7 +23,10 @@ To use passwd, you should have PAM insta - %setup -q - - %build --make DEBUG= RPM_OPT_FLAGS="$RPM_OPT_FLAGS" -+make DEBUG= RPM_OPT_FLAGS="$RPM_OPT_FLAGS" \ -+%if %{WITH_SELINUX} -+ WITH_SELINUX=yes -+%endif - - %install - make install DESTDIR=$RPM_BUILD_ROOT bindir=%{_bindir} mandir=%{_mandir} -@@ -41,6 +47,12 @@ rm -rf $RPM_BUILD_ROOT - %{_mandir}/man1/passwd.1* - - %changelog -+* Fri Sep 5 2003 Dan Walsh 0.68-5.sel -+- Add SELinux support -+ -+* Mon Jul 28 2003 Dan Walsh 0.68-4 -+- Add SELinux support -+ - * Thu Feb 13 2003 Nalin Dahyabhai 0.68-3 - - add aging adjustment flags to passwd(1)'s synopsis, were just in the - reference section before -diff -upNr passwd-0.68/selinux_utils.c passwd-0.68/selinux_utils.c ---- passwd-0.68/selinux_utils.c 1970-01-01 00:00:00.000000000 +0000 -+++ passwd-0.68/selinux_utils.c 2003-07-29 14:40:40.000000000 +0000 -@@ -0,0 +1,74 @@ -+/* -+ * Copyright Red Hat, Inc., 2003. -+ * -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions -+ * are met: -+ * 1. Redistributions of source code must retain the above copyright -+ * notice, and the entire permission notice in its entirety, -+ * including the disclaimer of warranties. -+ * 2. Redistributions in binary form must reproduce the above copyright -+ * notice, this list of conditions and the following disclaimer in the -+ * documentation and/or other materials provided with the distribution. -+ * 3. The name of the author may not be used to endorse or promote -+ * products derived from this software without specific prior -+ * written permission. -+ * -+ * ALTERNATIVELY, this product may be distributed under the terms of -+ * the GNU Public License, in which case the provisions of the GPL are -+ * required INSTEAD OF the above restrictions. (This clause is -+ * necessary due to a potential bad interaction between the GPL and -+ * the restrictions contained in a BSD-style copyright.) -+ * -+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED -+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -+ * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, -+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -+ * OF THE POSSIBILITY OF SUCH DAMAGE. -+ */ -+ -+/* Written by Daniel Walsh */ -+ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include "selinux_utils.h" -+ -+int checkAccess(char *chuser, int access) { -+ int status=-1; -+ security_context_t user_context; -+ char *user=NULL; -+ if( getprevcon(&user_context)==0 ) { -+ context_t c=context_new(user_context); -+ user=context_user_get(c); -+ if (strcmp(chuser, user) == 0) { -+ status=0; -+ } else { -+ struct av_decision avd; -+ int retval = security_compute_av(user_context, -+ user_context, -+ SECCLASS_PASSWD, -+ access, -+ &avd); -+ -+ if ((retval == 0) && -+ ((access & avd.allowed) == access)) { -+ status=0; -+ } -+ } -+ context_free(c); -+ freecon(user_context); -+ } -+ return status; -+} -+ -diff -upNr passwd-0.68/selinux_utils.h passwd-0.68/selinux_utils.h ---- passwd-0.68/selinux_utils.h 1970-01-01 00:00:00.000000000 +0000 -+++ passwd-0.68/selinux_utils.h 2003-07-29 14:40:40.000000000 +0000 -@@ -0,0 +1 @@ -+extern int checkAccess(char *name,int access); Deleted: tinysofa/snapshot/passwd/current/sources/passwd-0.68-sysauth.patch =================================================================== --- tinysofa/snapshot/passwd/current/sources/passwd-0.68-sysauth.patch 2004-07-01 15:52:40 UTC (rev 2812) +++ tinysofa/snapshot/passwd/current/sources/passwd-0.68-sysauth.patch 2004-07-01 15:52:43 UTC (rev 2813) @@ -1,24 +0,0 @@ -diff -Nru passwd-0.68.orig/passwd.c passwd-0.68/passwd.c ---- passwd-0.68.orig/passwd.c 2002-12-09 22:34:26.000000000 +0100 -+++ passwd-0.68/passwd.c 2003-06-03 10:39:13.000000000 +0200 -@@ -375,7 +375,7 @@ - } - - /* Start up PAM. */ -- retval = pam_start("passwd", username, &conv, &pamh); -+ retval = pam_start("system-auth", username, &conv, &pamh); - - #ifdef HAVE_PAM_FAIL_DELAY - /* We have to pause on failure, so tell libpam the minimum amount -diff -Nru passwd-0.68.orig/pwdstat.c passwd-0.68/pwdstat.c ---- passwd-0.68.orig/pwdstat.c 2002-12-09 22:34:26.000000000 +0100 -+++ passwd-0.68/pwdstat.c 2003-06-03 10:39:19.000000000 +0200 -@@ -85,7 +85,7 @@ - assert(username != NULL); - assert(password != NULL); - -- retval = pam_start("passwd", username, &conv, &pamh); -+ retval = pam_start("system-auth", username, &conv, &pamh); - while (retval == PAM_SUCCESS) { /* use loop to avoid goto... */ - - retval = pam_chauthtok(pamh, 0); Modified: tinysofa/snapshot/passwd/current/specs/passwd.spec =================================================================== --- tinysofa/snapshot/passwd/current/specs/passwd.spec 2004-07-01 15:52:40 UTC (rev 2812) +++ tinysofa/snapshot/passwd/current/specs/passwd.spec 2004-07-01 15:52:43 UTC (rev 2813) @@ -1,19 +1,16 @@ +%if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} +%define WITH_SELINUX 1 +%endif Summary: The passwd utility for setting/changing passwords using PAM. Name: passwd Version: 0.68 -Release: 10ts +Release: 9ts License: BSD -Group: tinysofa official -Source: passwd-%{version}-3.tar.gz -Patch0: passwd-0.68-3-pamonly.patch -Patch1: passwd-0.68-sysauth.patch -Patch2: passwd-0.68-selinux.patch -BuildRoot: %{_tmppath}/%{name}-root -Requires: pam >= 0.59 -Requires: pwdb -Requires: /etc/pam.d/system-auth -Buildprereq: pam-devel -BuildRequires: pwdb-devel +Group: System Environment/Base +Source: passwd-%{version}-8.tar.gz +Buildroot: %{_tmppath}/%{name}-%{version}-root +Requires: pam >= 0.59, /etc/pam.d/system-auth +BuildPrereq: glib2-devel, libuser-devel, pam-devel %description The passwd package contains a system utility (passwd) which sets @@ -24,59 +21,50 @@ %prep %setup -q -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 %build -%if %{use_selinux} -make DEBUG= RPM_OPT_FLAGS="$RPM_OPT_FLAGS" WITH_SELINUX=yes -%else -make DEBUG= RPM_OPT_FLAGS="$RPM_OPT_FLAGS" +make DEBUG= RPM_OPT_FLAGS="$RPM_OPT_FLAGS" \ +%if %{WITH_SELINUX} + WITH_SELINUX=yes %endif %install make install DESTDIR=$RPM_BUILD_ROOT bindir=%{_bindir} mandir=%{_mandir} strip $RPM_BUILD_ROOT%{_bindir}/passwd +install -m 755 -d $RPM_BUILD_ROOT/etc/pam.d/ +install -m 644 passwd.pamd $RPM_BUILD_ROOT/etc/pam.d/passwd rm -f $RPM_BUILD_ROOT/%{_bindir}/{chfn,chsh} rm -f $RPM_BUILD_ROOT/%{_mandir}/man1/{chfn,chsh}.* %clean -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != "/" ] && rm -rf "$RPM_BUILD_ROOT" +rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) +%config /etc/pam.d/passwd %attr(4511,root,root) %{_bindir}/passwd %{_mandir}/man1/passwd.1* %changelog -* Wed May 19 2004 tsintegrate 0.68-10ts -- current (0.68-9ts) integrated as 0.68-10ts for release 1.0-U1 +* Tue Jun 15 2004 Elliot Lee +- rebuilt -* Wed May 12 2004 Omar Kilani 0.68-9ts -- Add BuildRequires pwdb-devel. -- Add Requires pwdb. +* Wed Feb 4 2004 Dan Walsh 0.68-8 +- add check for enforcing mode -* Tue Feb 3 2004 Oystein Viggen 0.68-6tr -- Add selinux patch and conditional enabler on make invocation +* Mon Jan 26 2004 Dan Walsh 0.68-7 +- fix is_selinux_enabled -* Tue Dec 9 2003 Chr. Toldnes 0.68-5tr -- Big rebuild +* Fri Sep 5 2003 Dan Walsh 0.68-6 +- turn off selinux -* Wed Jun 18 2003 Erlend Midttun 0.68-4tr -- Big rebuild +* Fri Sep 5 2003 Dan Walsh 0.68-5.sel +- Add SELinux support -* Tue Jun 3 2003 Erlend Midttun 0.68-3em -- Now use system-auth instead of passwd pam module. +* Mon Jul 28 2003 Dan Walsh 0.68-4 +- Add SELinux support -* Wed Apr 23 2003 Christian H. Toldnes 0.68-2ct -- Added usable pam module, ripped from TSL 1.2 :) - -* Tue Apr 22 2003 Christian H. Toldnes 0.68-1ct -- Initial release in solo src.rpm for TSL 2.0 -- Patched to only use pam. - * Thu Feb 13 2003 Nalin Dahyabhai 0.68-3 - add aging adjustment flags to passwd(1)'s synopsis, were just in the reference section before @@ -149,4 +137,4 @@ - fix for gzipped man pages * Sat Apr 10 1999 Cristian Gafton -- first build from the new source code base. \ No newline at end of file +- first build from the new source code base. From svn at tinysofa.org Thu Jul 1 15:53:50 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:53:50 +1000 (EST) Subject: [tinysofa-svn] r2827 - in tinysofa/snapshot/pump/current: sources specs Message-ID: <20040701155350.65AE44E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:53:50 +1000 (Fri, 02 Jul 2004) New Revision: 2827 Removed: tinysofa/snapshot/pump/current/sources/pump-0.8.19-slang.patch Modified: tinysofa/snapshot/pump/current/specs/pump.spec Log: - Sync with 2.0. - Kept: - pump-0.8.20.tar.gz: - Removed: - pump-0.8.19-slang.patch: Deleted: tinysofa/snapshot/pump/current/sources/pump-0.8.19-slang.patch =================================================================== --- tinysofa/snapshot/pump/current/sources/pump-0.8.19-slang.patch 2004-07-01 15:53:48 UTC (rev 2826) +++ tinysofa/snapshot/pump/current/sources/pump-0.8.19-slang.patch 2004-07-01 15:53:50 UTC (rev 2827) @@ -1,11 +0,0 @@ -diff -urN pump-0.8.19/Makefile pump-0.8.19.slang/Makefile ---- pump-0.8.19/Makefile 2003-08-15 03:54:02.000000000 +0000 -+++ pump-0.8.19.slang/Makefile 2004-05-12 01:58:39.000000000 +0000 -@@ -21,7 +21,7 @@ - pump: pump.o config.o libpump.a(dhcp.o) - - netconfig: net.o libpump.a(dhcp.o) po -- $(CC) -o netconfig net.o libpump.a $(LOADLIBES) -lnewt -+ $(CC) -o netconfig net.o libpump.a $(LOADLIBES) -lnewt -lslang - - pump.o: pump.c pump.h Modified: tinysofa/snapshot/pump/current/specs/pump.spec =================================================================== --- tinysofa/snapshot/pump/current/specs/pump.spec 2004-07-01 15:53:48 UTC (rev 2826) +++ tinysofa/snapshot/pump/current/specs/pump.spec 2004-07-01 15:53:50 UTC (rev 2827) @@ -1,99 +1,179 @@ Summary: A Bootp and DHCP client for automatic IP configuration. Name: pump Version: 0.8.20 -Release: 1ts -Group: tinysofa official +Release: 2ts +Group: System Environment/Daemons License: MIT -BuildRoot: %{_tmppath}/%{name}-root +BuildRoot: %{_tmppath}/%{name}-%{version}-root Source: pump-%{version}.tar.gz -Patch: pump-0.8.19-slang.patch -Obsoletes: bootpc netconfig +Obsoletes: bootpc +BuildRequires: newt-devel Requires: initscripts >= 3.92 -BuildRequires: newt-devel slang-devel gettext - %description DHCP (Dynamic Host Configuration Protocol) and BOOTP (Boot Protocol) are protocols which allow individual devices on an IP network to get their own network configuration information (IP address, subnetmask, -broadcast address, etc.) from network servers. The overall purpose of +broadcast address, etc.) from network servers. The overall purpose of DHCP and BOOTP is to make it easier to administer a large network. Pump is a combined BOOTP and DHCP client daemon, which allows your -machine to retrieve configuration information from a server. You +machine to retrieve configuration information from a server. You should install this package if you are on a network which uses BOOTP or DHCP. %package devel -Summary: Development tools for sending dhcp requests -Group: tinysofa official +Summary: Development tools for sending DHCP and BOOTP requests. +Group: Development/Libraries %description devel The pump-devel package provides system developers the ability to send -bootp and dhcp requests from their programs. +BOOTP and DHCP requests from their programs. BOOTP and DHCP are +protocols used to provide network configuration information to +networked machines. +%package -n netconfig +Group: Applications/System +Summary: A text-based tool for simple configuration of ethernet devices. + +%description -n netconfig +A text-based tool for simple configuration of ethernet devices. + + %prep %setup -q -%patch -p1 %build -export RPM_OPT_FLAGS="`echo $RPM_OPT_FLAGS | sed -e 's/-D_FILE_OFFSET_BITS=64//' |\ - sed -e 's/-D_LARGE_FILES=1//' |\ - sed -e 's/-D_LARGEFILE64_SOURCE=1//'` %{?no_stack_protector}" -LDFLAGS="-lslang" make +make %{?_smp_mflags} %install -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT -export RPM_OPT_FLAGS="`echo $RPM_OPT_FLAGS | sed -e 's/-D_FILE_OFFSET_BITS=64//' |\ - sed -e 's/-D_LARGE_FILES=1//' |\ - sed -e 's/-D_LARGEFILE64_SOURCE=1//'` %{?no_stack_protector}" +rm -rf $RPM_BUILD_ROOT %makeinstall RPM_BUILD_ROOT=$RPM_BUILD_ROOT +rm -f $RPM_BUILD_ROOT/sbin/pump $RPM_BUILD_ROOT%{_mandir}/man8/pump.8* + %find_lang %{name} %clean -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT +rm -rf $RPM_BUILD_ROOT -%files -f %{name}.lang -%defattr(-,root,root) -%{_sbindir}/* -/sbin/pump -%{_mandir}/*/* - %files devel %defattr(-,root,root) -%attr(644,root,root) %{_libdir}/libpump.a +%{_libdir}/libpump.a %{_includedir}/pump.h +%files -n netconfig -f %{name}.lang +%defattr(-,root,root) +%{_sbindir}/netconfig + %changelog -* Wed May 19 2004 tsintegrate 0.8.20-1ts -- current (0.8.20-1ok) integrated as 0.8.20-1ts for release 1.0-U1 +* Tue Jun 15 2004 Elliot Lee +- rebuilt -* Wed May 12 2004 Omar Kilani 0.8.19-4ts -- Add BuildRequres newt-devel gettext. -- Add Patch to link slang. -- Fix perms on libpump.a +* Tue Mar 02 2004 Elliot Lee +- rebuilt -* Tue Feb 17 2004 Chr. Toldnes 0.8.19-3tr -- build without stack protector +* Fri Feb 13 2004 Elliot Lee +- rebuilt -* Wed Dec 17 2003 Erlend Midttun 0.8.19-2tr -- New optflags. +* Tue Jan 6 2004 Jeremy Katz 0.8.20-1 +- rebuild with vendor class id patch (#78843) -* Wed Jun 18 2003 Erlend Midttun 0.8.11-3tr -- Big rebuild +* Thu Aug 14 2003 Bill Nottingham 0.8.19-1 +- translations -* Mon Mar 24 2003 Erlend Midttun 0.8.11-2em -- Rebuilt against glibc 2.3.2. +* Wed Aug 13 2003 Bill Nottingham 0.8.18-1 +- add --hwaddr and --desc options to netconfig -* Tue Jun 5 2001 Oystein Viggen -- New upstream version: 0.8.11 -- Fix Group for -devel package +* Fri Aug 01 2003 Florian La Roche +- set hopcount (ip_ttl) from 0 to 16 -* Mon Feb 26 2001 Oystein Viggen -- Add to TSL +* Tue Mar 11 2003 Jeremy Katz 0.8.15-2 +- rebuild +* Tue Mar 11 2003 Jeremy Katz 0.8.15-1 +- add mtu and ptpaddr fields for s390 + +* Tue Feb 11 2003 Bill Nottingham 0.8.14-2 +- rebuild + +* Wed Dec 11 2002 Elliot Lee 0.8.14-1 +- Remove unpackaged files + +* Fri Oct 4 2002 Jeremy Katz +- build with -fPIC + +* Fri Oct 4 2002 Jeremy Katz +- link against libpopt.a in %%{_libdir} + +* Thu Aug 15 2002 Bill Nottingham +- rebuild against new newt + +* Thu Jun 27 2002 Bill Nottingham +- don't ship main package + +* Tue Jun 18 2002 Bill Nottingham +- sync patches and CVS +- rebuild against new slang +- don't strip binaries + +* Thu May 23 2002 Tim Powers +- automated rebuild + +* Wed Jan 09 2002 Tim Powers +- automated rebuild + +* Sun Aug 26 2001 Elliot Lee +- Fix one half #17724 + +* Wed Jul 25 2001 Trond Eivind Glomsr?d +- Don't obsolete netconfig, it's now separate again + +* Tue Jul 24 2001 Elliot Lee +- Fix installer segfaults with nobootp patch. + +* Mon Jul 23 2001 Trond Eivind Glomsr?d +- split out netconfig to a package of its own + +* Thu Jul 19 2001 Elliot Lee +- Patch from bugs #19501, #19502, #21088, etc. + +* Sun Jun 24 2001 Elliot Lee +- Bump release + rebuild. + +* Thu Mar 1 2001 Bill Nottingham +- make netconfig much more sane (#30008, in essence) + +* Tue Feb 27 2001 Erik Troan +- applied patch to use SO_BINDTODEVICE properly (weejock at ferret.lmh.ox.ac.uk) + +* Mon Feb 12 2001 Bill Nottingham +- run ifup-post on lease renewal + +* Thu Feb 01 2001 Erik Troan +- update secs field properly +- don't reset interface flags we don't understand +- added --win-client-id flag +- cleaned up packet creation a bit +- added --no-gateway + +* Tue Jan 9 2001 Matt Wilson +- always set the src address of the broadcast to 0.0.0.0 + +* Mon Nov 20 2000 Erik Troan +- lo device needs to have it's network route added + +* Fri Nov 10 2000 Bill Nottingham +- don't pass a random length to accept() + +* Mon Oct 23 2000 Erik Troan +- up scripts called for first interface information, and called even if pump + failed + +* Wed Aug 30 2000 Bernhard Rosenkraenzer +- Fix up the "search" entry scan so it works in Europe... + * Wed Aug 16 2000 Matt Wilson - added a strerror(errno) to the "unable to set default route" syslog @@ -131,6 +211,7 @@ * Wed Feb 23 2000 Erik Troan - fixed # parsing (aaron at schrab.com) + * Tue Feb 15 2000 Erik Troan - added script argument (Guy Delamarter ) - fixed bug in hostname passing (H.J. Lu) @@ -210,4 +291,4 @@ - it was always requesting a 20 second lease * Mon Mar 22 1999 Michael K. Johnson -- added minimal man page /usr/man/man8/pump.8 \ No newline at end of file +- added minimal man page /usr/man/man8/pump.8 From svn at tinysofa.org Thu Jul 1 15:37:28 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:37:28 +1000 (EST) Subject: [tinysofa-svn] r2568 - in tinysofa/snapshot: . icu icu/current icu/current/sources icu/current/specs Message-ID: <20040701153728.B37CF4E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:37:27 +1000 (Fri, 02 Jul 2004) New Revision: 2568 Added: tinysofa/snapshot/icu/ tinysofa/snapshot/icu/current/ tinysofa/snapshot/icu/current/sources/ tinysofa/snapshot/icu/current/sources/icu-2.6.2.tgz tinysofa/snapshot/icu/current/specs/ tinysofa/snapshot/icu/current/specs/icu.spec Log: - Add icu to snapshot from 2.0. Added: tinysofa/snapshot/icu/current/sources/icu-2.6.2.tgz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/icu/current/sources/icu-2.6.2.tgz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/icu/current/specs/icu.spec =================================================================== --- tinysofa/snapshot/icu/current/specs/icu.spec 2004-07-01 15:37:21 UTC (rev 2567) +++ tinysofa/snapshot/icu/current/specs/icu.spec 2004-07-01 15:37:27 UTC (rev 2568) @@ -0,0 +1,126 @@ +Name: icu +Version: 2.6.2 +Release: 1ts +Copyright: X License +Buildroot: %{_tmppath}/%{name}-%{version}-root +URL: http://oss.software.ibm.com/icu +Source0: icu-2.6.2.tgz +Summary: International Components for Unicode +Group: System Environment/Libraries +Requires: libicu = %{version}-%{release} + +%description + ICU is a C++ and C library that provides robust and + full-featured Unicode support. This package contains the + runtime libraries for ICU. It does not contain any of the + data files needed at runtime and present in the `icu' and + `icu-locales` packages. + +%files +%defattr(-, root, root) +%doc license.html readme.html +%{_sysconfdir}/%{name}/convrtrs.txt +%{_bindir}/derb +%{_bindir}/gencnval +%{_bindir}/genbrk +%{_bindir}/genrb +%{_bindir}/makeconv +%{_bindir}/pkgdata +%{_bindir}/uconv +%{_sbindir}/decmn +%{_sbindir}/genccode +%{_sbindir}/gencmn +%{_sbindir}/genpname +%{_sbindir}/gennames +%{_sbindir}/gennorm +%{_sbindir}/genprops +%{_sbindir}/gentz +%{_sbindir}/genuca +%{_sbindir}/genidna +%{_datadir}/%{name}/%{version}/mkinstalldirs +%{_datadir}/%{name}/%{version}/license.html +%{_mandir}/man1/* +%{_mandir}/man5/* +%{_mandir}/man8/* + + +%package -n libicu-devel +Summary: International Components for Unicode (development files) +Group: Development/Libraries +Requires: libicu = %{version}-%{release} + +%description -n libicu-devel + + ICU is a C++ and C library that provides robust and + full-featured Unicode support. This package contains the + development files for ICU. + + +%files -n libicu-devel +%defattr(-, root, root) +%doc %{_datadir}/%{name}/%{version}/README +%{_bindir}/icu-config +%{_includedir}/layout/*.h +%{_includedir}/unicode/*.h +%{_libdir}/icu/2.6.2/Makefile.inc +%{_libdir}/icu/Makefile.inc +%{_libdir}/libicudata.so +%{_libdir}/libicui18n.so +%{_libdir}/libicuio.so +%{_libdir}/libicule.so +%{_libdir}/libiculx.so +%{_libdir}/libicutoolutil.so +%{_libdir}/libicuuc.so +%{_datadir}/%{name}/%{version}/config/mh-linux + +%package -n libicu +Summary: International Components for Unicode (libraries) +Group: Development/Libraries + +%description -n libicu + + ICU is a C++ and C library that provides robust and + full-featured Unicode support. This package contains the + runtime libraries for ICU. It does not contain any of the + data files needed at runtime and present in the `icu' and + `icu-locales` packages. + + +%files -n libicu +%defattr(-, root, root) +%doc license.html +%{_libdir}/libicui18n.so.26 +%{_libdir}/libicui18n.so.26.2 +%{_libdir}/libicutoolutil.so.26 +%{_libdir}/libicutoolutil.so.26.2 +%{_libdir}/libicuuc.so.26 +%{_libdir}/libicuuc.so.26.2 +%{_libdir}/libicudata.so.26 +%{_libdir}/libicudata.so.26.2 +%{_libdir}/libicuio.so.26 +%{_libdir}/libicuio.so.26.2 +%{_libdir}/libiculx.so.26 +%{_libdir}/libiculx.so.26.2 +%{_libdir}/libicule.so.26 +%{_libdir}/libicule.so.26.2 + + +%prep +%setup -q -n icu + +%build +cd source +export CFLAGS="-O3" CXXFLAGS="-O" +%configure --disable-samples +make + +%install +rm -rf %{buildroot} +cd source +%makeinstall + +%clean +rm -rf %{buildroot} + + +%changelog From svn at tinysofa.org Thu Jul 1 15:42:02 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:42:02 +1000 (EST) Subject: [tinysofa-svn] r2679 - in tinysofa/snapshot: . tzdata tzdata/current tzdata/current/sources tzdata/current/specs Message-ID: <20040701154202.A09784E817E@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:42:02 +1000 (Fri, 02 Jul 2004) New Revision: 2679 Added: tinysofa/snapshot/tzdata/ tinysofa/snapshot/tzdata/current/ tinysofa/snapshot/tzdata/current/sources/ tinysofa/snapshot/tzdata/current/sources/tzdata.tar.bz2 tinysofa/snapshot/tzdata/current/sources/tzdata2003d.tar.gz tinysofa/snapshot/tzdata/current/specs/ tinysofa/snapshot/tzdata/current/specs/tzdata.spec Log: - Add tzdata to snapshot from 2.0. Added: tinysofa/snapshot/tzdata/current/sources/tzdata.tar.bz2 =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/tzdata/current/sources/tzdata.tar.bz2 ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/tzdata/current/sources/tzdata2003d.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/tzdata/current/sources/tzdata2003d.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/tzdata/current/specs/tzdata.spec =================================================================== --- tinysofa/snapshot/tzdata/current/specs/tzdata.spec 2004-07-01 15:42:01 UTC (rev 2678) +++ tinysofa/snapshot/tzdata/current/specs/tzdata.spec 2004-07-01 15:42:02 UTC (rev 2679) @@ -0,0 +1,58 @@ +Summary: Timezone data +Name: tzdata +Version: 2003d +Release: 2ts +Copyright: GPL +Group: System Environment/Base +Source0: %{name}.tar.bz2 +Source1: ftp://elsie.nci.nih.gov/pub/%{name}%{version}.tar.gz +Buildroot: %{_tmppath}/%{name}-%{version}-root +BuildRequires: gawk, glibc, glibc-common, perl +Conflicts: glibc-common <= 2.3.2-63 +BuildArchitectures: noarch + +%description +This package contains data files with rules for various timezones around +the world. + +%prep +%setup -n tzdata +mkdir %{name}%{version} +tar xzf %{SOURCE1} -C %{name}%{version} + +%build +sed -e 's|@objpfx@|'`pwd`'/obj/|' \ + -e 's|@datadir@|%{_datadir}|' \ + -e 's|@install_root@|%{buildroot}|' \ + Makeconfig.in > Makeconfig +make + +%install +make install +echo ====================TESTING========================= +make check +echo ====================TESTING END===================== + +%clean +rm -rf %{buildroot} + +%files +%defattr(-,root,root) +%{_datadir}/zoneinfo + +%changelog +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Mon Oct 6 2003 Jakub Jelinek 2003d-1 +- 2003d + +* Thu Sep 25 2003 Jakub Jelinek 2003c-1 +- 2003c +- updates for Brasil (#104840) + +* Mon Jul 28 2003 Jakub Jelinek 2003a-2 +- rebuilt + +* Mon Jul 28 2003 Jakub Jelinek 2003a-1 +- initial package From svn at tinysofa.org Thu Jul 1 15:44:27 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:44:27 +1000 (EST) Subject: [tinysofa-svn] r2711 - in tinysofa/snapshot/beecrypt/current: sources specs Message-ID: <20040701154427.1CE344E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:44:26 +1000 (Fri, 02 Jul 2004) New Revision: 2711 Added: tinysofa/snapshot/beecrypt/current/sources/beecrypt-20040324.patch tinysofa/snapshot/beecrypt/current/sources/beecrypt-3.1.0-rh.patch Removed: tinysofa/snapshot/beecrypt/current/sources/beecrypt-3.1.0-tinysofa.patch Modified: tinysofa/snapshot/beecrypt/current/specs/beecrypt.spec Log: - Sync with 2.0. - Kept: - beecrypt-3.1.0.tar.gz: - Added: - beecrypt-20040324.patch: - beecrypt-3.1.0-rh.patch: - Removed: - beecrypt-3.1.0-tinysofa.patch: Added: tinysofa/snapshot/beecrypt/current/sources/beecrypt-20040324.patch =================================================================== --- tinysofa/snapshot/beecrypt/current/sources/beecrypt-20040324.patch 2004-07-01 15:44:23 UTC (rev 2710) +++ tinysofa/snapshot/beecrypt/current/sources/beecrypt-20040324.patch 2004-07-01 15:44:26 UTC (rev 2711) @@ -0,0 +1,577 @@ +diff -ru beecrypt-3.1.0/CONTRIBUTORS beecrypt-20040324/CONTRIBUTORS +--- beecrypt-3.1.0/CONTRIBUTORS 2003-05-17 14:11:06.000000000 +0000 ++++ beecrypt-20040324/CONTRIBUTORS 2003-08-23 06:36:39.000000000 +0000 +@@ -1,5 +1,6 @@ + I would like to thank the following people (in alphabetical order): + ++- Seth Arnold, for contributing to the documentation. + - Jan-Rudolph B?hrmann, for helping me get started on the 64-bit multi- + precision integer library. + - Luca Filipozzi, maintainer/packager of BeeCrypt for Debian GNU/Linux. +diff -ru beecrypt-3.1.0/gas/mpopt.x86.m4 beecrypt-20040324/gas/mpopt.x86.m4 +--- beecrypt-3.1.0/gas/mpopt.x86.m4 2003-06-04 17:39:58.000000000 +0000 ++++ beecrypt-20040324/gas/mpopt.x86.m4 2003-09-02 10:36:05.000000000 +0000 +@@ -29,7 +29,7 @@ + movl 12(%esp),%edi + + xorl %eax,%eax +- repz stosl ++ repz; stosl + + popl %edi + ret +@@ -43,7 +43,7 @@ + movl 12(%esp),%edi + movl 16(%esp),%eax + +- repz stosl ++ repz; stosl + + popl %edi + ret +diff -ru beecrypt-3.1.0/gas/sha1opt.x86.m4 beecrypt-20040324/gas/sha1opt.x86.m4 +--- beecrypt-3.1.0/gas/sha1opt.x86.m4 2003-05-08 17:52:54.000000000 +0000 ++++ beecrypt-20040324/gas/sha1opt.x86.m4 2003-09-02 10:38:22.000000000 +0000 +@@ -21,13 +21,13 @@ + include(config.m4) + include(ASM_SRCDIR/x86.m4) + +- .equ K00, 0x5a827999 +- .equ K20, 0x6ed9eba1 +- .equ K40, 0x8f1bbcdc +- .equ K60, 0xca62c1d6 ++ .set K00, 0x5a827999 ++ .set K20, 0x6ed9eba1 ++ .set K40, 0x8f1bbcdc ++ .set K60, 0xca62c1d6 + +- .equ PARAM_H, 0 +- .equ PARAM_DATA, 20 ++ .set PARAM_H, 0 ++ .set PARAM_DATA, 20 + + define(`subround1',` + movl $2,%ecx +diff -ru beecrypt-3.1.0/mp.c beecrypt-20040324/mp.c +--- beecrypt-3.1.0/mp.c 2003-06-25 19:25:41.000000000 +0000 ++++ beecrypt-20040324/mp.c 2004-03-18 20:00:04.000000000 +0000 +@@ -1219,6 +1219,14 @@ + /* keep adding the modulus until we get a carry */ + while (!mpaddx(sizep, ddata, size, ndata)); + } ++ else ++ { ++ /* in some computations, d ends up > n, hence: ++ * keep subtracting n from d until d < n ++ */ ++ while (mpgtx(sizep, ddata, size, ndata)) ++ mpsubx(sizep, ddata, size, ndata); ++ } + mpsetx(size, result, sizep, ddata); + } + return 1; +@@ -1400,34 +1408,39 @@ + + int i2osp(byte *osdata, size_t ossize, const mpw* idata, size_t isize) + { +- size_t required = MP_WORDS_TO_BYTES(isize); ++ size_t max_bytes = MP_WORDS_TO_BYTES(isize); ++ size_t significant_bytes = (mpbits(isize, idata) + 7) >> 3; ++ size_t zero_bytes = max_bytes - significant_bytes; + +- /* check if size is large enough */ +- if (ossize >= required) ++ /* verify that ossize is large enough to contain the significant bytes */ ++ if (ossize >= significant_bytes) + { +- /* yes, we can proceed */ +- if (ossize > required) +- { /* fill initial bytes with zero */ +- memset(osdata, 0, ossize-required); +- osdata += ossize-required; ++ /* looking good; check if we have more space than significant bytes */ ++ if (ossize > significant_bytes) ++ { /* fill most significant bytes with zero */ ++ memset(osdata, 0, ossize - significant_bytes); ++ osdata += ossize - significant_bytes; + } +- if (required) ++ if (significant_bytes) + { /* fill remaining bytes with endian-adjusted data */ + #if !WORDS_BIGENDIAN +- while (required) +- { +- mpw w = *(idata++); +- byte shift = MP_WBITS; ++ mpw w = idata[--isize]; ++ byte shift = 0; + +- while (shift) ++ /* fill right-to-left; much easier than left-to-right */ ++ do ++ { ++ osdata[--significant_bytes] = (byte)(w >> shift); ++ shift += 8; ++ if (shift == MP_WBITS) + { +- shift -= 8; +- *(osdata++) = (byte)(w >> shift); ++ shift == 0; ++ w = idata[--isize]; + } +- required -= MP_WBYTES; +- } ++ } while (significant_bytes); + #else +- memcpy(osdata, idata, required); ++ /* just copy */ ++ memcpy(osdata, ((byte*) idata) + zero_bytes, significant_bytes); + #endif + } + return 0; +@@ -1437,7 +1450,7 @@ + + int os2ip(mpw* idata, size_t isize, const byte* osdata, size_t ossize) + { +- size_t required = MP_BYTES_TO_WORDS(isize + MP_WBYTES - 1); ++ size_t required = MP_BYTES_TO_WORDS(ossize + MP_WBYTES - 1); + + if (isize >= required) + { +diff -ru beecrypt-3.1.0/mp.h beecrypt-20040324/mp.h +--- beecrypt-3.1.0/mp.h 2003-06-04 17:39:56.000000000 +0000 ++++ beecrypt-20040324/mp.h 2003-08-23 06:34:34.000000000 +0000 +@@ -407,14 +407,35 @@ + BEECRYPTAPI + void mpclrlsb(size_t size, mpw* data); + ++/*!\fn mpand(size_t size, mpw* xdata, const mpw* ydata) ++ * \brief This function computes the bit-wise AND of two multi-precision ++ * integers. Modifies xdata. ++ * \param size The size of the multi-precision integers. ++ * \param xdata The multi-precision integer data. ++ * \param ydata The multi-precision integer data. ++ */ + BEECRYPTAPI +-void mpand(size_t, mpw*, const mpw*); ++void mpand(size_t size, mpw* xdata, const mpw* ydata); + ++/*!\fn void mpor(size_t size, mpw* xdata, const mpw* ydata) ++ * \brief This function computes the bit-wise OR of two multi-precision ++ * integers. Modifies xdata. ++ * \param size The size of the multi-precision integer. ++ * \param xdata The multi-precision integer data. ++ * \param ydata The multi-precision integer data. ++ */ + BEECRYPTAPI +-void mpor(size_t, mpw*, const mpw*); ++void mpor(size_t size, mpw* xdata, const mpw* ydata); + ++/*!\fn void mpxor(size_t size, mpw* xdata, const mpw* ydata) ++ * \brief This function computes the bit-wise XOR of two multi-precision ++ * integers. Modifies xdata. ++ * \param size The size of the multi-precision integer. ++ * \param xdata The multi-precision integer data. ++ * \param ydata The multi-precision integer data. ++ */ + BEECRYPTAPI +-void mpxor(size_t, mpw*, const mpw*); ++void mpxor(size_t size, mpw* xdata, const mpw* ydata); + + /*!\fn mpnot(size_t size, mpw* data) + * \brief This function flips all bits of a multi-precision integer. +@@ -502,7 +523,7 @@ + BEECRYPTAPI + int mpsub (size_t size, mpw* xdata, const mpw* ydata); + +-/*!\fn int mpaddx(size_t xsize, mpw* xdata, size_t ysize, const mpw* ydata) ++/*!\fn int mpsubx(size_t xsize, mpw* xdata, size_t ysize, const mpw* ydata) + * \brief This function subtracts two multi-precision integers of different + * size. The performed operation in pseudocode: x -= y. + * \param xsize The size of the first multi-precision integer. +@@ -517,12 +538,29 @@ + BEECRYPTAPI + int mpmultwo(size_t size, mpw* data); + ++/*!\fn void mpneg(size_t size, mpw* data) ++ * \brief This function negates a multi-precision integer. ++ * \param size The size of the multi-precision integer. ++ * \param data The multi-precision integer data. ++ */ + BEECRYPTAPI + void mpneg(size_t size, mpw* data); + ++/*!\fn size_t mpsize(size_t size, const mpw* data) ++ * \brief This function returns the true size of a multi-precision ++ * integer, after stripping leading zero words. ++ * \param size The size of the multi-precision integer. ++ * \param data The multi-precision integer data. ++ */ + BEECRYPTAPI + size_t mpsize(size_t size, const mpw* data); + ++/*!\fn size_t mpbits(size_t size, const mpw* data) ++ * \brief This function returns the number of significant bits ++ * in a multi-precision integer. ++ * \param size The size of the multi-precision integer. ++ * \param data The multi-precision integer data. ++ */ + BEECRYPTAPI + size_t mpbits(size_t size, const mpw* data); + +@@ -588,35 +626,34 @@ + * squaring. + */ + BEECRYPTAPI +-void mpaddsqrtrc(size_t, mpw*, const mpw*); ++void mpaddsqrtrc(size_t size, mpw* result, const mpw* data); + + /*!\fn void mpmul(mpw* result, size_t xsize, const mpw* xdata, size_t ysize, const mpw* ydata) + * \brief This function computes a full multi-precision product. + */ + BEECRYPTAPI +-void mpmul(mpw*, size_t, const mpw*, size_t, const mpw*); ++void mpmul(mpw* result, size_t xsize, const mpw* xdata, size_t ysize, const mpw* ydata); ++ + /*!\fn void mpsqr(mpw* result, size_t size, const mpw* data) + * \brief This function computes a full multi-precision square. + */ + BEECRYPTAPI +-void mpsqr(mpw*, size_t, const mpw*); ++void mpsqr(mpw* result, size_t size, const mpw* data); + + BEECRYPTAPI +-void mpgcd_w(size_t, const mpw*, const mpw*, mpw*, mpw*); +-BEECRYPTAPI +-int mpextgcd_w(size_t, const mpw*, const mpw*, mpw*, mpw*); ++void mpgcd_w(size_t size, const mpw* xdata, const mpw* ydata, mpw* result, mpw* wksp); + + BEECRYPTAPI +-mpw mppndiv(mpw, mpw, mpw); ++int mpextgcd_w(size_t size, const mpw* xdata, const mpw* ydata, mpw* result, mpw* wksp); + + BEECRYPTAPI +-void mpnmod(mpw*, size_t, const mpw*, size_t, const mpw*, mpw*); ++mpw mppndiv(mpw xhi, mpw xlo, mpw y); + + BEECRYPTAPI +-void mpmod (mpw*, size_t, const mpw*, size_t, const mpw*, mpw*); ++void mpmod (mpw* result, size_t xsize, const mpw* xdata, size_t ysize, const mpw*ydata, mpw* wksp); + + BEECRYPTAPI +-void mpndivmod(mpw*, size_t, const mpw*, size_t, const mpw*, mpw*); ++void mpndivmod(mpw* result, size_t xsize, const mpw* xdata, size_t ysize, const mpw* ydata, mpw* wksp); + + /* + * Output Routines +@@ -639,13 +676,13 @@ + */ + + BEECRYPTAPI +-int os2ip(mpw*, size_t, const byte*, size_t); ++int os2ip(mpw* idata, size_t isize, const byte* osdata, size_t ossize); + + BEECRYPTAPI +-int i2osp(byte*, size_t, const mpw*, size_t); ++int i2osp(byte* osdata, size_t ossize, const mpw* idata, size_t isize); + + BEECRYPTAPI +-int hs2ip(mpw*, size_t, const char*, size_t); ++int hs2ip(mpw* idata, size_t isize, const char* hsdata, size_t hssize); + + #ifdef __cplusplus + } +diff -ru beecrypt-3.1.0/mpprime.c beecrypt-20040324/mpprime.c +--- beecrypt-3.1.0/mpprime.c 2003-05-31 10:05:41.000000000 +0000 ++++ beecrypt-20040324/mpprime.c 2003-11-29 10:55:14.000000000 +0000 +@@ -706,16 +706,47 @@ + return 35; + } + +-static void mpprndbits(mpbarrett* p, size_t msbclr, size_t lsbset, randomGeneratorContext* rc) ++/* ++ * needs workspace of (size*2) words ++ */ ++static void mpprndbits(mpbarrett* p, size_t bits, size_t lsbset, const mpnumber* min, const mpnumber* max, randomGeneratorContext* rc, mpw* wksp) + { + register size_t size = p->size; ++ register size_t msbclr = MP_WORDS_TO_BITS(size) - bits; ++ ++ /* assume that mpbits(max) == bits */ ++ /* calculate k=max-min; generate q such that 0 <= q <= k; then set p = q + min */ ++ /* for the second step, set the appropriate number of bits */ ++ ++ if (max) ++ { ++ mpsetx(size, wksp, max->size, max->data); ++ } ++ else ++ { ++ mpfill(size, wksp, MP_ALLMASK); ++ wksp[0] &= (MP_ALLMASK >> msbclr); ++ } ++ if (min) ++ { ++ mpsetx(size, wksp+size, min->size, min->data); ++ } ++ else ++ { ++ mpzero(size, wksp+size); ++ wksp[size] |= (MP_MSBMASK >> msbclr); ++ } ++ ++ mpsub(size, wksp, wksp+size); + + rc->rng->next(rc->param, (byte*) p->modl, MP_WORDS_TO_BYTES(size)); + +- if (msbclr) +- p->modl[0] &= (MP_ALLMASK >> msbclr); ++ p->modl[0] &= (MP_ALLMASK >> msbclr); ++ ++ while (mpgt(size, p->modl, wksp)) ++ mpsub(size, p->modl, wksp); + +- p->modl[0] |= (MP_MSBMASK >> msbclr); ++ mpadd(size, p->modl, wksp+size); + + if (lsbset) + p->modl[size-1] |= (MP_ALLMASK >> (MP_WBITS - lsbset)); +@@ -851,16 +882,49 @@ + */ + void mpprnd_w(mpbarrett* p, randomGeneratorContext* rc, size_t bits, int t, const mpnumber* f, mpw* wksp) + { ++ mpprndr_w(p, rc, bits, t, (const mpnumber*) 0, (const mpnumber*) 0, f, wksp); ++} ++ ++/* ++ * implements IEEE P1363 A.15.6 ++ * ++ * f, min, max are optional ++ */ ++int mpprndr_w(mpbarrett* p, randomGeneratorContext* rc, size_t bits, int t, const mpnumber* min, const mpnumber* max, const mpnumber* f, mpw* wksp) ++{ + /* + * Generate a prime into p with the requested number of bits + * + * Conditions: size(f) <= size(p) + * ++ * Optional input min: if min is not null, then search p so that min <= p ++ * Optional input max: if max is not null, then search p so that p <= max + * Optional input f: if f is not null, then search p so that GCD(p-1,f) = 1 + */ + + size_t size = MP_BITS_TO_WORDS(bits + MP_WBITS - 1); + ++ /* if min has more bits than what was requested for p, bail out */ ++ if (min && (mpbits(min->size, min->data) > bits)) ++ { ++ printf("bail out 1\n"); ++ return -1; ++ } ++ ++ /* if max has a different number of bits than what was requested for p, bail out */ ++ if (max && (mpbits(max->size, max->data) != bits)) ++ { ++ printf("bail out 1\n"); ++ return -2; ++ } ++ ++ /* if min is not less than max, bail out */ ++ if (min && max && mpgex(min->size, min->data, max->size, max->data)) ++ { ++ printf("bail out 1\n"); ++ return -2; ++ } ++ + mpbinit(p, size); + + if (p->modl) +@@ -871,7 +935,7 @@ + * Generate a random appropriate candidate prime, and test + * it with small prime divisor test BEFORE computing mu + */ +- mpprndbits(p, MP_WORDS_TO_BITS(size) - bits, 1, rc); ++ mpprndbits(p, bits, 1, min, max, rc, wksp); + + /* do a small prime product trial division test on p */ + if (!mppsppdiv_w(p, wksp)) +@@ -893,7 +957,7 @@ + mpbmu_w(p, wksp); + + if (mppmilrab_w(p, rc, t, wksp)) +- return; ++ return 0; + } + } + } +@@ -930,7 +994,7 @@ + + while (1) + { +- mpprndbits(&s, MP_WORDS_TO_BITS(s.size) - sbits, 0, rc); ++ mpprndbits(&s, sbits, 0, (mpnumber*) 0, (mpnumber*) 0, rc, wksp); + + if (cofactor == 1) + { +@@ -1035,7 +1099,7 @@ + * it with small prime divisor test BEFORE computing mu + */ + +- mpprndbits(p, 0, 2, rc); ++ mpprndbits(p, bits, 2, (mpnumber*) 0, (mpnumber*) 0, rc, wksp); + + mpcopy(size, q.modl, p->modl); + mpdivtwo(size, q.modl); +diff -ru beecrypt-3.1.0/mpprime.h beecrypt-20040324/mpprime.h +--- beecrypt-3.1.0/mpprime.h 2003-04-16 11:05:44.000000000 +0000 ++++ beecrypt-20040324/mpprime.h 2003-11-23 08:27:07.000000000 +0000 +@@ -44,6 +44,8 @@ + BEECRYPTAPI + void mpprnd_w (mpbarrett*, randomGeneratorContext*, size_t, int, const mpnumber*, mpw*); + BEECRYPTAPI ++int mpprndr_w (mpbarrett*, randomGeneratorContext*, size_t, int, const mpnumber*, const mpnumber*, const mpnumber*, mpw*); ++BEECRYPTAPI + void mpprndsafe_w (mpbarrett*, randomGeneratorContext*, size_t, int, mpw*); + BEECRYPTAPI + void mpprndcon_w (mpbarrett*, randomGeneratorContext*, size_t, int, const mpnumber*, const mpnumber*, const mpnumber*, mpnumber*, mpw*); +diff -ru beecrypt-3.1.0/rsakp.c beecrypt-20040324/rsakp.c +--- beecrypt-3.1.0/rsakp.c 2003-08-17 06:46:57.000000000 +0000 ++++ beecrypt-20040324/rsakp.c 2003-11-23 08:32:19.000000000 +0000 +@@ -36,77 +36,64 @@ + * \{ + */ + +-int rsakpMake(rsakp* kp, randomGeneratorContext* rgc, int nsize) ++int rsakpMake(rsakp* kp, randomGeneratorContext* rgc, size_t bits) + { + /* + * Generates an RSA Keypair for use with the Chinese Remainder Theorem + */ + +- register size_t pqsize = (nsize+1) >> 1; +- register mpw* temp = (mpw*) malloc((16*pqsize+6)*sizeof(mpw)); +- register int newn = 1; ++ size_t pbits = (bits+1) >> 1; ++ size_t qbits = (bits - pbits); ++ size_t nsize = MP_BITS_TO_WORDS(bits+MP_WBITS-1); ++ size_t psize = MP_BITS_TO_WORDS(pbits+MP_WBITS-1); ++ size_t qsize = MP_BITS_TO_WORDS(qbits+MP_WBITS-1); ++ size_t pqsize = psize+qsize; ++ mpw* temp = (mpw*) malloc((16*pqsize+6)*sizeof(mpw)); + + if (temp) + { +- mpbarrett r, psubone, qsubone; +- mpnumber phi; +- +- nsize = pqsize << 1; ++ mpbarrett psubone, qsubone; ++ mpnumber phi, min; ++ mpw* divmod = temp; ++ mpw* dividend = divmod+nsize+1; ++ mpw* workspace = dividend+nsize+1; ++ int shift; + + /* set e */ +- mpnsetw(&kp->e, 65535); ++ mpnsetw(&kp->e, 65537); ++ ++ /* generate a random prime p */ ++ mpprnd_w(&kp->p, rgc, pbits, mpptrials(pbits), &kp->e, temp); ++ ++ /* find out how big q should be */ ++ shift = MP_WORDS_TO_BITS(nsize) - bits; ++ mpzero(nsize, dividend); ++ dividend[0] |= MP_MSBMASK; ++ dividend[nsize-1] |= MP_LSBMASK; ++ mpndivmod(divmod, nsize+1, dividend, psize, kp->p.modl, workspace); ++ mprshift(nsize+1, divmod, shift); + +- /* generate a random prime p and q */ +- mpprnd_w(&kp->p, rgc, pqsize, mpptrials(MP_WORDS_TO_BITS(pqsize)), &kp->e, temp); +- mpprnd_w(&kp->q, rgc, pqsize, mpptrials(MP_WORDS_TO_BITS(pqsize)), &kp->e, temp); ++ mpnzero(&min); ++ mpnset(&min, nsize+1-psize, divmod); + +- /* if p <= q, perform a swap to make p larger than q */ +- if (mple(pqsize, kp->p.modl, kp->q.modl)) ++ /* generate a random prime q, with min/max constraints */ ++ if (mpprndr_w(&kp->q, rgc, qbits, mpptrials(qbits), &min, (mpnumber*) 0, &kp->e, temp)) + { +- memcpy(&r, &kp->q, sizeof(mpbarrett)); +- memcpy(&kp->q, &kp->p, sizeof(mpbarrett)); +- memcpy(&kp->p, &r, sizeof(mpbarrett)); ++ /* shouldn't happen */ ++ mpnfree(&min); ++ free(temp); ++ return -1; + } + +- mpbzero(&r); ++ mpnfree(&min); ++ + mpbzero(&psubone); + mpbzero(&qsubone); + mpnzero(&phi); + +- while (1) +- { +- mpmul(temp, pqsize, kp->p.modl, pqsize, kp->q.modl); +- +- if (newn && mpmsbset(nsize, temp)) +- break; +- +- /* product of p and q doesn't have the required size (one bit short) */ +- +- mpprnd_w(&r, rgc, pqsize, mpptrials(MP_WORDS_TO_BITS(pqsize)), &kp->e, temp); +- +- if (mple(pqsize, kp->p.modl, r.modl)) +- { +- mpbfree(&kp->q); +- memcpy(&kp->q, &kp->p, sizeof(mpbarrett)); +- memcpy(&kp->p, &r, sizeof(mpbarrett)); +- mpbzero(&r); +- newn = 1; +- } +- else if (mple(pqsize, kp->q.modl, r.modl)) +- { +- mpbfree(&kp->q); +- memcpy(&kp->q, &r, sizeof(mpbarrett)); +- mpbzero(&r); +- newn = 1; +- } +- else +- { +- mpbfree(&r); +- newn = 0; +- } +- } +- +- mpbset(&kp->n, nsize, temp); ++ /* set n = p*q, with appropriate size (pqsize may be > nsize) */ ++ mpmul(temp, psize, kp->p.modl, qsize, kp->q.modl); ++ mpbset(&kp->n, nsize, temp+pqsize-nsize); + + /* compute p-1 */ + mpbsubone(&kp->p, temp); +@@ -132,7 +119,7 @@ + mpbmod_w(&qsubone, kp->d.data, kp->d2.data, temp); + + /* compute c = inv(q) mod p */ +- mpninv(&kp->c, (const mpnumber*) &kp->q, (const mpnumber*) &kp->p); ++ mpninv(&kp->c, (mpnumber*) &kp->q, (mpnumber*) &kp->p); + + free(temp); + +diff -ru beecrypt-3.1.0/rsakp.h beecrypt-20040324/rsakp.h +--- beecrypt-3.1.0/rsakp.h 2003-04-16 12:08:03.000000000 +0000 ++++ beecrypt-20040324/rsakp.h 2003-11-23 08:32:19.000000000 +0000 +@@ -77,7 +77,7 @@ + #endif + + BEECRYPTAPI +-int rsakpMake(rsakp*, randomGeneratorContext*, int); ++int rsakpMake(rsakp*, randomGeneratorContext*, size_t); + BEECRYPTAPI + int rsakpInit(rsakp*); + BEECRYPTAPI Added: tinysofa/snapshot/beecrypt/current/sources/beecrypt-3.1.0-rh.patch =================================================================== --- tinysofa/snapshot/beecrypt/current/sources/beecrypt-3.1.0-rh.patch 2004-07-01 15:44:23 UTC (rev 2710) +++ tinysofa/snapshot/beecrypt/current/sources/beecrypt-3.1.0-rh.patch 2004-07-01 15:44:26 UTC (rev 2711) @@ -0,0 +1,19 @@ +--- beecrypt-3.1.0/python/Makefile.am.rh 2003-08-17 02:46:57.000000000 -0400 ++++ beecrypt-3.1.0/python/Makefile.am 2003-12-22 21:56:47.764588621 -0500 +@@ -1,14 +1,12 @@ +-# Makefile for rpm library. +- + AUTOMAKE_OPTIONS = 1.4 foreign + + LINT = splint + +-PYVER= 2.2 ++PYVER= 2.3 + + SUBDIRS = test + +-pylibdir = $(shell python -c 'import sys; print sys.path[1]') ++pylibdir = $(shell python -c 'import sys; print sys.path[2]') + pyincdir = $(prefix)/include/python${PYVER} + + EXTRA_DIST = debug-py.c Deleted: tinysofa/snapshot/beecrypt/current/sources/beecrypt-3.1.0-tinysofa.patch =================================================================== --- tinysofa/snapshot/beecrypt/current/sources/beecrypt-3.1.0-tinysofa.patch 2004-07-01 15:44:23 UTC (rev 2710) +++ tinysofa/snapshot/beecrypt/current/sources/beecrypt-3.1.0-tinysofa.patch 2004-07-01 15:44:26 UTC (rev 2711) @@ -1,20 +0,0 @@ ---- beecrypt-3.1.0/python/Makefile.am.rh 2003-08-17 02:46:57.000000000 -0400 -+++ beecrypt-3.1.0/python/Makefile.am 2003-12-22 21:56:47.764588621 -0500 -@@ -1,14 +1,12 @@ --# Makefile for rpm library. -- - AUTOMAKE_OPTIONS = 1.4 foreign - - LINT = splint - --PYVER= 2.2 -+PYVER= 2.3 - - SUBDIRS = test - --pylibdir = $(shell python -c 'import sys; print sys.path[1]') -+pylibdir = $(libdir)/python${PYVER} --pyincdir = $(prefix)/include/python${PYVER} -+pyincdir = $(includedir)/python${PYVER} - - EXTRA_DIST = debug-py.c Modified: tinysofa/snapshot/beecrypt/current/specs/beecrypt.spec =================================================================== --- tinysofa/snapshot/beecrypt/current/specs/beecrypt.spec 2004-07-01 15:44:23 UTC (rev 2710) +++ tinysofa/snapshot/beecrypt/current/specs/beecrypt.spec 2004-07-01 15:44:26 UTC (rev 2711) @@ -1,163 +1,198 @@ -%define with_python 1 +%define with_python --with-python +%define with_python_version 2.3%{nil} -%define beecrypt_pyname %{mkpyname %{name}} - +Summary: An open source cryptography library. Name: beecrypt Version: 3.1.0 -Release: 6ok -Group: tinysofa/libraries -Group(pt_BR): tinysofa/bibliotecas -Group(es): tinysofa/bibliotecas -Summary: Open source cryptography library -Summary(pt_BR): Biblioteca open source para criptografia +Release: 3ts +Group: System Environment/Libraries License: LGPL URL: http://sourceforge.net/projects/beecrypt -Source0: http://prdownloads.sourceforge.net/beecrypt/beecrypt-%{version}.tar.gz -Patch0: beecrypt-3.1.0-tinysofa.patch +Source0: http://prdownloads.sourceforge.net/beecrypt/%{name}-3.1.0.tar.gz +Patch0: beecrypt-3.1.0-rh.patch +Patch1: beecrypt-20040324.patch +BuildPreReq: doxygen +%if %{?with_python:1}0 +BuildPreReq: python-devel >= %{with_python_version} +BuildRequires: autoconf automake libtool +%endif BuildRoot: %{_tmppath}/%{name}-%{version}-root %description Beecrypt is a general-purpose cryptography library. -%description -l pt_BR -Beecrypt ? uma biblioteca de criptografia de prop?sito geral. +%package devel +Summary: Files needed for developing applications with beecrypt. +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} -%package -n %{libname} -Group: tinysofa/libraries -Group(pt_BR): tinysofa/bibliotecas -Group(es): tinysofa/bibliotecas -Summary: Open source cryptography library -Summary(pt_BR): Biblioteca open source para criptografia -%rename beecrypt - -%description -n %{libname} -Beecrypt is a general-purpose cryptography library. - -%description -n %{libname} -l pt_BR -Beecrypt ? uma biblioteca de criptografia de prop?sito geral. - -%package -n %{libname_devel} -Summary: Files needed for developing applications with beecrypt -Summary(pt_BR): Arquivos necess?rios para desenvolver aplica??es com o beecrypt -Group: tinysofa/development -Group(pt_BR): tinysofa/desenvolvimento -Group(es): tinysofa/desarrollo -Requires: %{libname} = %{version}-%{release} -%rename beecrypt-devel - -%description -n %{libname_devel} +%description devel Beecrypt is a general-purpose cryptography library. This package contains files needed for developing applications with beecrypt. -%description -n %{libname_devel} -l pt_BR -Beecrypt ? uma biblioteca de criptografia de prop?sito geral. Esse pacote -cont?m os arquivos necess?rios para desenvolver aplica??es com o beecrypt. +%if %{?with_python:1}0 +%package python +Summary: Files needed for python applications using beecrypt. +Group: Development/Libraries +Requires: python >= %{with_python_version} +Requires: %{name} = %{version}-%{release} -%package -n %{libname_static_devel} -Summary: Files needed for developing applications with beecrypt statically -Summary(pt_BR): Arquivos necess?rios para desenvolver aplica??es est?ticas com o beecrypt -Group: tinysofa/development -Group(pt_BR): tinysofa/desenvolvimento -Group(es): tinysofa/desarrollo -Requires: %{libname_devel} = %{version}-%{release} - -%description -n %{libname_static_devel} -Beecrypt is a general-purpose cryptography library. This package contains -files needed for developing applications with beecrypt statically. - -%description -n %{libname_static_devel} -l pt_BR -Beecrypt ? uma biblioteca de criptografia de prop?sito geral. Esse pacote -cont?m os arquivos necess?rios para desenvolver aplica??es com o beecrypt -estaticamente. - -%if %{with_python} -%package -n %{beecrypt_pyname} -Summary: Files needed for python applications using beecrypt -Summary(pt_BR): Arquivos necess?rios para aplica??es python usando o beecrypt -Group: tinysofa/python -Group(pt_BR): tinysofa/python -Group(es): tinysofa/python -Requires: %{libname} = %{version}-%{release} -%py_requires -d - -%description -n %{beecrypt_pyname} +%description python Beecrypt is a general-purpose cryptography library. This package contains files needed for using python with beecrypt. - -%description -n %{beecrypt_pyname} -l pt_BR -Beecrypt ? uma biblioteca de criptografia de prop?sito geral. Esse pacote -cont?m os arquivos necess?rios para desenvolver aplica??es em Python -com o beecrypt. %endif %prep -%setup -q -n beecrypt-%{version} -%patch0 -p1 -b .tinysofa +%setup -q +%patch0 -p1 -b .rh +%patch1 -p1 -b .20040324 -%build ./autogen.sh -%configure --enable-shared --enable-static %{?with_python:--with-python} \ +%build + +%configure --enable-shared --enable-static %{?with_python} + make +doxygen %install -rm -fr %{buildroot} -make install DESTDIR=%{buildroot} +rm -fr $RPM_BUILD_ROOT +make install DESTDIR=$RPM_BUILD_ROOT -# Nuke unpackaged files, artifacts from using libtool to produce module -rm -f %{buildroot}%{py_sitedir}/_bc.*a +# XXX nuke unpackaged files, artifacts from using libtool to produce module +rm -f ${RPM_BUILD_ROOT}%{_libdir}/python%{with_python_version}/site-packages/_bc.*a -#%%check -#make check || : -#cat /proc/cpuinfo -#make bench || : +# XXX delete next line to build with legacy, non-check aware, rpmbuild. +%check +make check || : +cat /proc/cpuinfo +make bench || : %clean -rm -fr %{buildroot} +rm -fr $RPM_BUILD_ROOT -%post -n %{libname} -p /sbin/ldconfig +%post -p /sbin/ldconfig -%postun -n %{libname} -p /sbin/ldconfig +%postun -p /sbin/ldconfig -%files -n %{libname} -%defattr(0644,root,root,0755) +%files +%defattr(-,root,root) %doc README BENCHMARKS %{_libdir}/*.so.* -%files -n %{libname_devel} -%defattr(0644,root,root,0755) -%doc BUGS -%{_includedir}/beecrypt +%files devel +%defattr(-,root,root) +%doc BUGS docs/html docs/latex +%{_includedir}/%{name} +%{_libdir}/*.a %{_libdir}/*.la %{_libdir}/*.so -%files -n %{libname_static_devel} -%defattr(0644,root,root,0755) -%{_libdir}/*.a - -%if %{with_python} -%files -n %{beecrypt_pyname} -%defattr(0644,root,root,0755) -%{py_sitedir}/_bc.so +%if %{?with_python:1}0 +%files python +%defattr(-,root,root) +%{_libdir}/python%{with_python_version}/site-packages/_bc.so %endif - %changelog -* Fri Jun 04 2004 Omar Kilani 3.1.0-6ok -- tinysofa. +* Wed Mar 24 2004 Jeff Johnson 3.1.0-3 +- fix: extgcd_w problem fixed by upgrading from CVS. -* Fri Nov 28 2003 Gustavo Niemeyer -+ 2003-11-28 10:41:52 (40617) -- Fixing requires from %%{name} to libbeecrypt%%{libver}. +* Tue Mar 02 2004 Elliot Lee +- rebuilt -* Fri Nov 28 2003 Gustavo Niemeyer -+ 2003-11-28 10:29:51 (40614) -- Adjusting file modes. +* Fri Feb 13 2004 Elliot Lee +- rebuilt -* Fri Nov 28 2003 Gustavo Niemeyer -+ 2003-11-28 10:23:55 (40612) -- Adding beecrypt package to distribution. +* Mon Dec 22 2003 Jeff Johnson 3.1.0-1 +- upgrade to 3.1.0. +- recompile against python-2.3.3. -* Wed Nov 26 2003 Gustavo Niemeyer -+ 2003-11-26 16:17:23 (40557) -- Created package structure for beecrypt. +* Mon Jun 30 2003 Jeff Johnson 3.0.1-0.20030630 +- upstream fixes for DSA and ppc64. + +* Mon Jun 23 2003 Jeff Johnson 3.0.0-2 +- upgrade to 3.0.0 final. +- fix for DSA (actually, modulo inverse) sometimes failing. + +* Fri Jun 20 2003 Jeff Johnson 3.0.0-1.20030619 +- avoid asm borkage on ppc64. + +* Thu Jun 19 2003 Jeff Johnson 3.0.0-1.20030618 +- rebuild for release bump. + +* Tue Jun 17 2003 Jeff Johnson 3.0.0-1.20030616 +- try to out smart libtool a different way. +- use $bc_target_cpu, not $bc_target_arch, to detect /usr/lib64. + +* Mon Jun 16 2003 Jeff Johnson 3.0.0-1.20030615 +- use -mcpu=powerpc64 on ppc64. + +* Fri Jun 13 2003 Jeff Johnson 3.0.0-1.20030613 +- upgrade to latest snapshot. + +* Fri Jun 6 2003 Jeff Johnson 3.0.0-1.20030605 +- rebuild into another tree. + +* Wed Jun 04 2003 Elliot Lee +- rebuilt + +* Tue Jun 3 2003 Jeff Johnson 3.0.0-0.20030603 +- update to 3.0.0 snapshot, fix mpmod (and DSA) on 64b platforms. + +* Mon Jun 2 2003 Jeff Johnson 3.0.0-0.20030602 +- update to 3.0.0 snapshot, merge patches, fix gcd rshift and ppc problems. + +* Thu May 29 2003 Jeff Johnson 3.0.0-0.20030529 +- update to 3.0.0 snapshot, fix ia64/x86_64 build problems. + +* Wed May 28 2003 Jeff Johnson 3.0.0-0.20030528 +- upgrade to 3.0.0 snapshot, adding rpm specific base64.[ch] changes. +- add PYTHONPATH=.. so that "make check" can test the just built _bc.so module. +- grab cpuinfo and run "make bench". +- continue ignoring "make check" failures, LD_LIBRARY_PATH needed for _bc.so. +- skip asm build failure on ia64 for now. +- ignore "make bench" exit codes too, x86_64 has AES segfault. + +* Wed May 21 2003 Jeff Johnson 3.0.0-0.20030521 +- upgrade to 3.0.0 snapshot, including python subpackage. +- ignore "make check" failure for now. + +* Fri May 16 2003 Jeff Johnson 3.0.0-0.20030516 +- upgrade to 3.0.0 snapshot, including ia64 and x86_64 fixes. +- add %%check. +- ignore "make check" failure on ia64 for now. + +* Mon May 12 2003 Jeff Johnson 3.0.0-0.20030512 +- upgrade to 3.0.0 snapshot. +- add doxygen doco. +- use /dev/urandom as default entropy source. +- avoid known broken compilation for now. + +* Wed Jan 22 2003 Tim Powers +- rebuilt + +* Tue Nov 19 2002 Tim Powers +- rebuild on all arches + +* Fri Aug 2 2002 Jeff Johnson 2.2.0-6 +- install types.h (#68999). + +* Fri Jun 21 2002 Tim Powers +- automated rebuild + +* Wed Jun 5 2002 Jeff Johnson +- run ldconfig when installing/erasing (#65974). + +* Thu May 23 2002 Tim Powers +- automated rebuild + +* Mon May 13 2002 Jeff Johnson +- upgrade to latest 2.2.0 (from cvs.rpm.org). + +* Mon Jan 21 2002 Jeff Johnson +- use the same beecrypt-2.2.0 that rpm is using internally. + +* Thu Jan 10 2002 Nalin Dahyabhai 2.1.0-1 +- initial package From svn at tinysofa.org Thu Jul 1 15:37:52 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:37:52 +1000 (EST) Subject: [tinysofa-svn] r2578 - in tinysofa/snapshot: . libc-client libc-client/current libc-client/current/sources libc-client/current/specs Message-ID: <20040701153752.DCB8E4E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:37:52 +1000 (Fri, 02 Jul 2004) New Revision: 2578 Added: tinysofa/snapshot/libc-client/ tinysofa/snapshot/libc-client/current/ tinysofa/snapshot/libc-client/current/sources/ tinysofa/snapshot/libc-client/current/sources/flock.c tinysofa/snapshot/libc-client/current/sources/imap-2000-linux.patch tinysofa/snapshot/libc-client/current/sources/imap-2000c-redhat-flock.patch tinysofa/snapshot/libc-client/current/sources/imap-2001a-mbox-disable.patch tinysofa/snapshot/libc-client/current/sources/imap-2001a-overflow.patch tinysofa/snapshot/libc-client/current/sources/imap-2002b-krbpath.patch tinysofa/snapshot/libc-client/current/sources/imap-2002d-ssltype.patch tinysofa/snapshot/libc-client/current/sources/imap-2002e-authmd5.patch tinysofa/snapshot/libc-client/current/sources/imap-2002e-cclient-only.patch tinysofa/snapshot/libc-client/current/sources/imap-2002e-redhat-ssl.patch tinysofa/snapshot/libc-client/current/sources/imap-2002e-redhat-version.patch tinysofa/snapshot/libc-client/current/sources/imap-2002e-shared.patch tinysofa/snapshot/libc-client/current/sources/imap-2002e.tar.Z tinysofa/snapshot/libc-client/current/specs/ tinysofa/snapshot/libc-client/current/specs/libc-client.spec Log: - Add libc-client to snapshot from 2.0. Added: tinysofa/snapshot/libc-client/current/sources/flock.c =================================================================== --- tinysofa/snapshot/libc-client/current/sources/flock.c 2004-07-01 15:37:50 UTC (rev 2577) +++ tinysofa/snapshot/libc-client/current/sources/flock.c 2004-07-01 15:37:52 UTC (rev 2578) @@ -0,0 +1,63 @@ +/* One of many ways to emulate flock() on top of real (good) POSIX locks. */ + +#ident "$RH: flock.c,v 1.2 2000/08/23 17:07:00 nalin Exp $" + +#include +#include +#include +#include + +int flock(int fd, int operation) +{ + int i, cmd; + struct flock l = {0, 0, 0, 0, 0}; + if(operation & LOCK_NB) { + cmd = F_SETLK; + } else { + cmd = F_SETLKW; + } + l.l_whence = SEEK_SET; + switch(operation & (~LOCK_NB)) { + case LOCK_EX: + l.l_type = F_WRLCK; + i = fcntl(fd, cmd, &l); + if(i == -1) { + if((errno == EAGAIN) || (errno == EACCES)) { + errno = EWOULDBLOCK; + } + } + break; + case LOCK_SH: + l.l_type = F_RDLCK; + i = fcntl(fd, cmd, &l); + if(i == -1) { + if((errno == EAGAIN) || (errno == EACCES)) { + errno = EWOULDBLOCK; + } + } + break; + case LOCK_UN: + l.l_type = F_UNLCK; + i = fcntl(fd, cmd, &l); + if(i == -1) { + if((errno == EAGAIN) || (errno == EACCES)) { + errno = EWOULDBLOCK; + } + } + break; + default: + i = -1; + errno = EINVAL; + break; + } + return i; +} + +#ifdef FLOCK_EMULATE_IS_MAIN +int main(int argc, char **argv) +{ + int fd = open(argv[1], O_WRONLY); + flock(fd, LOCK_EX); + return 0; +} +#endif Added: tinysofa/snapshot/libc-client/current/sources/imap-2000-linux.patch =================================================================== --- tinysofa/snapshot/libc-client/current/sources/imap-2000-linux.patch 2004-07-01 15:37:50 UTC (rev 2577) +++ tinysofa/snapshot/libc-client/current/sources/imap-2000-linux.patch 2004-07-01 15:37:52 UTC (rev 2578) @@ -0,0 +1,29 @@ +--- imap-2000.RELEASE-CANDIDATE.7/src/osdep/unix/Makefile.linux Wed Sep 20 19:59:13 2000 ++++ imap-2000.RELEASE-CANDIDATE.7/src/osdep/unix/Makefile Wed Oct 4 17:53:58 2000 +@@ -59,13 +59,12 @@ + LOGINPW=std + SIGTYPE=bsd + CRXTYPE=std +-ACTIVEFILE=/usr/lib/news/active +-SPOOLDIR=/usr/spool ++ACTIVEFILE=/var/lib/news/active ++SPOOLDIR=/var/spool + MAILSPOOL=$(SPOOLDIR)/mail + NEWSSPOOL=$(SPOOLDIR)/news +-RSHPATH=/usr/ucb/rsh +-LOCKPGM=/etc/mlock +- ++RSHPATH=/usr/bin/rsh ++#LOCKPGM=/etc/mlock + + # Default formats for creating new mailboxes and for empty mailboxes in the + # default namespace; must be set to the associated driver's prototype. +@@ -393,7 +392,7 @@ + SPOOLDIR=/var/spool \ + ACTIVEFILE=/var/lib/news/active \ + RSHPATH=/usr/bin/rsh \ +- BASECFLAGS="-g -fno-omit-frame-pointer -O6" \ ++ BASECFLAGS="-g ${RPM_OPT_FLAGS}" \ + BASELDFLAGS="-lpam -ldl" + + lnx: # Linux non-shadow passwords Added: tinysofa/snapshot/libc-client/current/sources/imap-2000c-redhat-flock.patch =================================================================== --- tinysofa/snapshot/libc-client/current/sources/imap-2000c-redhat-flock.patch 2004-07-01 15:37:50 UTC (rev 2577) +++ tinysofa/snapshot/libc-client/current/sources/imap-2000c-redhat-flock.patch 2004-07-01 15:37:52 UTC (rev 2578) @@ -0,0 +1,11 @@ +--- imap-2000c/src/osdep/unix/Makefile.redhat-flock Fri May 18 01:25:48 2001 ++++ imap-2000c/src/osdep/unix/Makefile Fri May 18 01:29:49 2001 +@@ -90,7 +90,7 @@ + BINARIES=mail.o misc.o newsrc.o smanager.o osdep.o utf8.o siglocal.o \ + dummy.o pseudo.o netmsg.o flstring.o fdstring.o \ + rfc822.o nntp.o smtp.o imap4r1.o pop3.o \ +- unix.o mbox.o mbx.o mmdf.o tenex.o mtx.o news.o phile.o mh.o mx.o ++ unix.o mbox.o mbx.o mmdf.o tenex.o mtx.o news.o phile.o mh.o mx.o flock.o + CFLAGS=-g + + CAT=cat Added: tinysofa/snapshot/libc-client/current/sources/imap-2001a-mbox-disable.patch =================================================================== --- tinysofa/snapshot/libc-client/current/sources/imap-2001a-mbox-disable.patch 2004-07-01 15:37:50 UTC (rev 2577) +++ tinysofa/snapshot/libc-client/current/sources/imap-2001a-mbox-disable.patch 2004-07-01 15:37:52 UTC (rev 2578) @@ -0,0 +1,22 @@ +--- src/osdep/unix/Makefile.mbox-disable-patch Wed Apr 17 18:22:25 2002 ++++ src/osdep/unix/Makefile Wed Apr 17 18:22:25 2002 +@@ -21,7 +21,7 @@ + # Command line build parameters + + EXTRAAUTHENTICATORS= +-EXTRADRIVERS=mbox ++EXTRADRIVERS= + PASSWDTYPE=std + SSLTYPE=none + +--- ./Makefile.mbox-disable-patch Wed Apr 17 18:24:27 2002 ++++ ./Makefile Wed Apr 17 18:25:08 2002 +@@ -128,7 +128,7 @@ + # mbox if file "mbox" exists on the home directory, automatically moves mail + # from the spool directory to "mbox" and uses "mbox" as INBOX. + +-EXTRADRIVERS=mbox ++#EXTRADRIVERS=mbox + + + # Plaintext password type. Defines how plaintext password authentication is Added: tinysofa/snapshot/libc-client/current/sources/imap-2001a-overflow.patch =================================================================== --- tinysofa/snapshot/libc-client/current/sources/imap-2001a-overflow.patch 2004-07-01 15:37:50 UTC (rev 2577) +++ tinysofa/snapshot/libc-client/current/sources/imap-2001a-overflow.patch 2004-07-01 15:37:52 UTC (rev 2578) @@ -0,0 +1,12 @@ +--- imap-2001a/src/c-client/rfc822.c.overflow Wed Apr 17 22:39:13 2002 ++++ imap-2001a/src/c-client/rfc822.c Wed Apr 17 22:40:25 2002 +@@ -610,6 +610,9 @@ + if (CHR (bs) == '\012'){/* following LF? */ + c = SNX (bs); i--; /* yes, slurp it */ + } ++ if (!i) /* Make sure we don't get an overflow for */ ++ break; /* messages ending on \015 (or the following */ ++ /* i-- will cause i to be MAXINT. Not good.) */ + case '\012': /* at start of a line, start with -- ? */ + if (i-- && ((c = SNX (bs)) == '-') && i-- && ((c = SNX (bs)) == '-')) { + /* see if cookie matches */ Added: tinysofa/snapshot/libc-client/current/sources/imap-2002b-krbpath.patch =================================================================== --- tinysofa/snapshot/libc-client/current/sources/imap-2002b-krbpath.patch 2004-07-01 15:37:50 UTC (rev 2577) +++ tinysofa/snapshot/libc-client/current/sources/imap-2002b-krbpath.patch 2004-07-01 15:37:52 UTC (rev 2578) @@ -0,0 +1,11 @@ +--- imap-2002b/src/osdep/unix/Makefile.gss.gssapi-patch 2001-11-21 13:13:49.000000000 -0500 ++++ imap-2002b/src/osdep/unix/Makefile.gss 2003-03-06 00:13:26.000000000 -0500 +@@ -20,7 +20,7 @@ + + # Extended flags needed for additional authenticators. You may need to modify. + +-GSSDIR=/usr/local ++GSSDIR=/usr/kerberos + GSSCFLAGS= -I$(GSSDIR)/include -DGSS_C_NT_HOSTBASED_SERVICE=gss_nt_service_name + GSSOLDLDFLAGS= -L$(GSSDIR)/lib -lgssapi_krb5 -lkrb5 -lcrypto -lcom_err + GSSNEWLDFLAGS= -L$(GSSDIR)/lib -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err Added: tinysofa/snapshot/libc-client/current/sources/imap-2002d-ssltype.patch =================================================================== --- tinysofa/snapshot/libc-client/current/sources/imap-2002d-ssltype.patch 2004-07-01 15:37:50 UTC (rev 2577) +++ tinysofa/snapshot/libc-client/current/sources/imap-2002d-ssltype.patch 2004-07-01 15:37:52 UTC (rev 2578) @@ -0,0 +1,26 @@ +*** imap-2002d.orig/Makefile 2003-04-16 20:32:42.000000000 -0400 +--- imap-2002d/Makefile 2003-07-11 15:47:30.000000000 -0400 +*************** +*** 419,427 **** + @echo + In order to rectify this problem, you MUST build with: + @echo ++ SSLTYPE=$(SSLTYPE).nopwd + @echo +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +- @echo +- @echo Do you want to continue this build anyway? Type y or n please: +- @$(SH) -c 'read x; case "$$x" in y) exit 0;; *) exit 1;; esac' + + sslnone: + @echo +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +--- 419,424 ---- +*************** +*** 434,442 **** + @echo ++ SSLTYPE=nopwd + @echo + You must also have OpenSSL or equivalent installed. + @echo +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +- @echo +- @echo Do you want to continue this build anyway? Type y or n please: +- @$(SH) -c 'read x; case "$$x" in y) exit 0;; *) exit 1;; esac' + + + # C compiler types +--- 431,436 ---- Added: tinysofa/snapshot/libc-client/current/sources/imap-2002e-authmd5.patch =================================================================== --- tinysofa/snapshot/libc-client/current/sources/imap-2002e-authmd5.patch 2004-07-01 15:37:50 UTC (rev 2577) +++ tinysofa/snapshot/libc-client/current/sources/imap-2002e-authmd5.patch 2004-07-01 15:37:52 UTC (rev 2578) @@ -0,0 +1,32 @@ + +Make some more functions static to prevent such horrible namespace +pollution. + +--- imap-2002e/src/c-client/auth_md5.c.authmd5 2004-03-02 17:25:43.000000000 +0000 ++++ imap-2002e/src/c-client/auth_md5.c 2004-03-02 17:25:51.000000000 +0000 +@@ -34,17 +34,17 @@ + + /* Prototypes */ + +-long auth_md5_valid (void); +-long auth_md5_client (authchallenge_t challenger,authrespond_t responder, ++static long auth_md5_valid (void); ++static long auth_md5_client (authchallenge_t challenger,authrespond_t responder, + char *service,NETMBX *mb,void *stream, + unsigned long *trial,char *user); +-char *auth_md5_server (authresponse_t responder,int argc,char *argv[]); +-char *auth_md5_pwd (char *user); ++static char *auth_md5_server (authresponse_t responder,int argc,char *argv[]); ++static char *auth_md5_pwd (char *user); + char *apop_login (char *chal,char *user,char *md5,int argc,char *argv[]); +-char *hmac_md5 (char *text,unsigned long tl,char *key,unsigned long kl); +-void md5_init (MD5CONTEXT *ctx); +-void md5_update (MD5CONTEXT *ctx,unsigned char *data,unsigned long len); +-void md5_final (unsigned char *digest,MD5CONTEXT *ctx); ++static char *hmac_md5 (char *text,unsigned long tl,char *key,unsigned long kl); ++static void md5_init (MD5CONTEXT *ctx); ++static void md5_update (MD5CONTEXT *ctx,unsigned char *data,unsigned long len); ++static void md5_final (unsigned char *digest,MD5CONTEXT *ctx); + static void md5_transform (unsigned long *state,unsigned char *block); + static void md5_encode (unsigned char *dst,unsigned long *src,int len); + static void md5_decode (unsigned long *dst,unsigned char *src,int len); Added: tinysofa/snapshot/libc-client/current/sources/imap-2002e-cclient-only.patch =================================================================== --- tinysofa/snapshot/libc-client/current/sources/imap-2002e-cclient-only.patch 2004-07-01 15:37:50 UTC (rev 2577) +++ tinysofa/snapshot/libc-client/current/sources/imap-2002e-cclient-only.patch 2004-07-01 15:37:52 UTC (rev 2578) @@ -0,0 +1,20 @@ +--- imap-2002e/Makefile.orig 2004-02-14 04:05:40.793098626 +0200 ++++ imap-2002e/Makefile 2004-02-14 04:06:19.616277107 +0200 +@@ -257,7 +257,7 @@ + + # Make the IMAP Toolkit + +-all: SPECIALS c-client rebuild bundled ++all: SPECIALS c-client rebuild + + c-client: + @echo Not processed yet. In a first-time build, you must specify +@@ -456,7 +456,7 @@ + $(TOOLS)/$@ "$(LN)" src/tmail tmail + $(LN) $(TOOLS)/$@ . + +-build: OSTYPE rebuild rebuildclean bundled ++build: OSTYPE rebuild rebuildclean + + OSTYPE: + @echo Building c-client for $(BUILDTYPE)... Added: tinysofa/snapshot/libc-client/current/sources/imap-2002e-redhat-ssl.patch =================================================================== --- tinysofa/snapshot/libc-client/current/sources/imap-2002e-redhat-ssl.patch 2004-07-01 15:37:50 UTC (rev 2577) +++ tinysofa/snapshot/libc-client/current/sources/imap-2002e-redhat-ssl.patch 2004-07-01 15:37:52 UTC (rev 2578) @@ -0,0 +1,17 @@ +--- imap-2002e/src/osdep/unix/Makefile.redhat-ssl-patch 2003-07-15 04:24:24.000000000 +0300 ++++ imap-2002e/src/osdep/unix/Makefile 2004-02-14 03:46:51.785826763 +0200 +@@ -28,11 +28,11 @@ + + # Extended flags needed for SSL. You may need to modify. + +-SSLDIR=/usr/local/ssl ++SSLDIR=/usr/share/ssl + SSLCERTS=$(SSLDIR)/certs + SSLKEYS=$(SSLCERTS) +-SSLINCLUDE=$(SSLDIR)/include +-SSLLIB=$(SSLDIR)/lib ++SSLINCLUDE=$(SSLDIR)/../../include/openssl ++SSLLIB=$(SSLDIR)/../../lib + + SSLCRYPTO=-lcrypto + Added: tinysofa/snapshot/libc-client/current/sources/imap-2002e-redhat-version.patch =================================================================== --- tinysofa/snapshot/libc-client/current/sources/imap-2002e-redhat-version.patch 2004-07-01 15:37:50 UTC (rev 2577) +++ tinysofa/snapshot/libc-client/current/sources/imap-2002e-redhat-version.patch 2004-07-01 15:37:52 UTC (rev 2578) @@ -0,0 +1,11 @@ +--- imap-2002e/src/imapd/imapd.c.redhat-version 2003-07-08 06:21:50.000000000 +0300 ++++ imap-2002e/src/imapd/imapd.c 2004-02-14 03:48:15.256557554 +0200 +@@ -178,7 +178,7 @@ + + /* Global storage */ + +-char *version = "2003.339"; /* version number of this server */ ++char *version = "2003.339rh"; /* version number of this server */ + time_t alerttime = 0; /* time of last alert */ + time_t sysalerttime = 0; /* time of last system alert */ + time_t useralerttime = 0; /* time of last user alert */ Added: tinysofa/snapshot/libc-client/current/sources/imap-2002e-shared.patch =================================================================== --- tinysofa/snapshot/libc-client/current/sources/imap-2002e-shared.patch 2004-07-01 15:37:50 UTC (rev 2577) +++ tinysofa/snapshot/libc-client/current/sources/imap-2002e-shared.patch 2004-07-01 15:37:52 UTC (rev 2578) @@ -0,0 +1,72 @@ +--- imap-2002e/src/osdep/unix/Makefile.shared 2004-04-07 00:16:48.370334040 +0300 ++++ imap-2002e/src/osdep/unix/Makefile 2004-04-07 00:18:31.458379840 +0300 +@@ -131,6 +131,10 @@ + EXTRADRIVERS='$(EXTRADRIVERS)' EXTRAAUTHENTICATORS='$(EXTRAAUTHENTICATORS)'\ + PASSWDTYPE=$(PASSWDTYPE) SSLTYPE=$(SSLTYPE) + ++# Need this for the shared library rule to work correctly ++.SUFFIXES: .o .so ++SOFILES=${BINARIES:.o=.so} ++ + + # Here if no make argument established + +@@ -762,18 +766,24 @@ + + # Build it! + +-build: clean once $(ARCHIVE) ++build: clean once $(ARCHIVE) $(SHLIBNAME) + +-all: $(ARCHIVE) ++all: $(ARCHIVE) $(SHLIBNAME) + + $(ARCHIVE): $(BINARIES) + sh -c '$(RM) $(ARCHIVE) || true' + @$(CAT) ARCHIVE + @$(SH) ARCHIVE + +-.c.o: +- `$(CAT) CCTYPE` -c `$(CAT) CFLAGS` $*.c ++$(SHLIBNAME): $(SOFILES) ++ gcc -shared -Wl,-soname,$(SHLIBNAME) -o $(SHLIBNAME) $(SOFILES) `cat LDFLAGS` ++ ln -s $(SHLIBNAME) lib$(SHLIBBASE).so ++ ++.c.so: osdep.h ++ $(CC) -fPIC -DPIC -c `$(CAT) CFLAGS` ${@:.so=.c} -o $@ + ++.c.o: ++ $(CC) -c `$(CAT) CFLAGS` $*.c + + # Cleanup + +@@ -812,7 +822,7 @@ + + # OS-dependent + +-osdep.o:mail.h misc.h env.h fs.h ftl.h nl.h tcp.h \ ++OSDEPS= mail.h misc.h env.h fs.h ftl.h nl.h tcp.h \ + osdep.h env_unix.h tcp_unix.h \ + osdep.c env_unix.c fs_unix.c ftl_unix.c nl_unix.c tcp_unix.c \ + auths.c crexcl.c flocksim.c nfstest.c flcksafe.c fsync.c gethstid.c \ +@@ -825,12 +835,19 @@ + write.c sslstdio.c \ + strerror.c strpbrk.c strstr.c strtok.c strtoul.c \ + OSCFLAGS ++ ++osdep.o: $(OSDEPS) ++ $(CC) $(CFLAGS) `$(CAT) OSCFLAGS` -c osdep.c ++ @echo ======================================================================== + @echo Building OS-dependent module + @echo If you get No such file error messages for files x509.h, ssl.h, + @echo pem.h, buffer.h, bio.h, and crypto.h, that means that OpenSSL + @echo is not installed on your system. Either install OpenSSL first + @echo or build with command: make `$(CAT) OSTYPE` SSLTYPE=none +- `$(CAT) CCTYPE` -c `$(CAT) CFLAGS` `$(CAT) OSCFLAGS` -c osdep.c ++ @echo ======================================================================== ++ ++osdep.so: $(OSDEPS) ++ $(CC) -fPIC -DPIC -c $(CFLAGS) `cat OSCFLAGS` osdep.c -o $@ + + osdep.c: osdepbas.c osdepckp.c osdeplog.c osdepssl.c + $(CAT) osdepbas.c osdepckp.c osdeplog.c osdepssl.c > osdep.c Added: tinysofa/snapshot/libc-client/current/sources/imap-2002e.tar.Z =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/libc-client/current/sources/imap-2002e.tar.Z ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/libc-client/current/specs/libc-client.spec =================================================================== --- tinysofa/snapshot/libc-client/current/specs/libc-client.spec 2004-07-01 15:37:50 UTC (rev 2577) +++ tinysofa/snapshot/libc-client/current/specs/libc-client.spec 2004-07-01 15:37:52 UTC (rev 2578) @@ -0,0 +1,154 @@ +%define soname c-client +%define somajver 0 +%define shlibname lib%{soname}.so.%{somajver} + +Summary: C-client mail access routines for IMAP and POP protocols +Name: libc-client +Version: 2002e +Release: 5ts +License: University of Washington Free-Fork License +Group: System Environment/Daemons +URL: http://www.washington.edu/imap/ + +Source0: imap-%{version}.tar.Z +Source1: flock.c + +Patch0: imap-2002e-redhat-ssl.patch +Patch1: imap-2000-linux.patch +Patch2: imap-2001a-mbox-disable.patch +Patch3: imap-2002b-krbpath.patch +Patch4: imap-2000c-redhat-flock.patch +Patch5: imap-2001a-overflow.patch +Patch6: imap-2002e-redhat-version.patch +Patch7: imap-2002d-ssltype.patch +Patch8: imap-2002e-cclient-only.patch +Patch9: imap-2002e-shared.patch +Patch10: imap-2002e-authmd5.patch + +Buildroot: %{_tmppath}/%{name}-%{version}-root + +BuildPrereq: krb5-devel, openssl-devel +# DO NOT REMOVE THIS PAM HEADER DEPENDANCY OR FACE THE WRATH +BuildPreReq: /usr/include/security/pam_modules.h +Requires: pam >= 0.59 +Conflicts: imap + +%description +C-client is a common API for accessing mailboxes. It is used internally by +the popular PINE mail reader, the University of Washington's IMAP server +and PHP. + +%package devel +Summary: Development tools for programs which will use the IMAP library. +Group: Development/Libraries +Conflicts: imap-devel + +%description devel +The c-client-devel package contains the header files and static libraries +for developing programs which will use the C-client common API. + +%prep +%setup -q -n imap-%{version} +chmod -R u+w . + +%patch0 -p1 -b .redhat-ssl-patch +%patch1 -p1 -b .linux-patch +%patch2 -p0 -b .mbox-disable-patch + +%patch3 -p1 -b .gssapi-patch + +%patch4 -p1 -b .redhat-flock +%patch5 -p1 -b .overflow +%patch6 -p1 -b .redhat-version + +%patch7 -p1 -b .ssltype +%patch8 -p1 -b .cclient-only +%patch9 -p1 -b .shared +%patch10 -p1 -b .authmd5 + +cp %{SOURCE1} src/osdep/unix/ + +%build +# Set EXTRACFLAGS here instead of in imap-2000-redhat.patch (#20760) +EXTRACFLAGS="$EXTRACFLAGS -DDISABLE_POP_PROXY=1 -DIGNORE_LOCK_EACCES_ERRORS=1" +EXTRACFLAGS="$EXTRACFLAGS -I/usr/include/openssl" +EXTRACFLAGS="$EXTRACFLAGS -fPIC" + +make lnp \ +EXTRACFLAGS="$EXTRACFLAGS" \ +EXTRALDFLAGS="$EXTRALDFLAGS" \ +EXTRAAUTHENTICATORS=gss \ +SSLTYPE=unix \ +SHLIBBASE=%{soname} \ +SHLIBNAME=%{shlibname} +# This line needs to be here. + +%install +rm -rf $RPM_BUILD_ROOT + +mkdir -p $RPM_BUILD_ROOT%{_libdir} +install -m 644 ./c-client/c-client.a $RPM_BUILD_ROOT%{_libdir}/ +ln -s c-client.a $RPM_BUILD_ROOT%{_libdir}/libc-client.a + +install -m 755 ./c-client/%{shlibname} $RPM_BUILD_ROOT%{_libdir}/ +ln -s %{shlibname} $RPM_BUILD_ROOT%{_libdir}/lib%{soname}.so + +mkdir -p $RPM_BUILD_ROOT%{_includedir}/imap +install -m 644 ./c-client/*.h $RPM_BUILD_ROOT%{_includedir}/imap +# Added linkage.c to fix (#34658) +install -m 644 ./c-client/linkage.c $RPM_BUILD_ROOT%{_includedir}/imap +install -m 644 ./src/osdep/tops-20/shortsym.h $RPM_BUILD_ROOT%{_includedir}/imap + +#mkdir -p $RPM_BUILD_ROOT/%{_datadir}/ssl/certs + +# don't ship quite so many docs +rm -rf docs/rfc docs/FAQ.txt + +%post -p /sbin/ldconfig + +%postun -p /sbin/ldconfig + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(-,root,root) +%doc CPYRIGHT README WARNING docs/RELNOTES docs/*.txt +%doc docs/CONFIG docs/SSLBUILD +%{_libdir}/lib%{soname}.so.* + +%files devel +%defattr(-,root,root) +%doc docs/* +%{_includedir}/imap +%{_libdir}/c-client.a +%{_libdir}/libc-client.a +%{_libdir}/lib%{soname}.so + +%changelog +* Wed Apr 7 2004 Joe Orton 2002e-5 +- rebuild + +* Wed Apr 07 2004 Kaj J. Niemi 2002e-4 +- Use CFLAGS (and RPM_OPT_FLAGS) during the compilation +- Build the .so through gcc instead of directly calling ld + +* Fri Mar 5 2004 Joe Orton 2002e-3 +- install .so with permissions 0755 +- make auth_md5.c functions static to avoid symbol conflicts +- remove Epoch: 0 + +* Tue Mar 02 2004 Kaj J. Niemi 0:2002e-2 +- "lnp" already uses RPM_OPT_FLAGS +- have us conflict with imap, imap-devel + +* Tue Mar 2 2004 Joe Orton 0:2002e-1 +- add post/postun, always use -fPIC + +* Tue Feb 24 2004 Kaj J. Niemi +- Name change from c-client to libc-client + +* Sat Feb 14 2004 Kaj J. Niemi 0:2002e-0.1 +- c-client 2002e is based on imap-2002d +- Build shared version, build logic is copied from FreeBSD net/cclient + From svn at tinysofa.org Thu Jul 1 15:40:59 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:40:59 +1000 (EST) Subject: [tinysofa-svn] r2667 - in tinysofa/snapshot: . talk talk/current talk/current/sources talk/current/specs Message-ID: <20040701154059.B3A384E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:40:59 +1000 (Fri, 02 Jul 2004) New Revision: 2667 Added: tinysofa/snapshot/talk/ tinysofa/snapshot/talk/current/ tinysofa/snapshot/talk/current/sources/ tinysofa/snapshot/talk/current/sources/netkit-ntalk-0.17-pre20000412-time.patch tinysofa/snapshot/talk/current/sources/netkit-ntalk-0.17-strip.patch tinysofa/snapshot/talk/current/sources/netkit-ntalk-0.17.tar.gz tinysofa/snapshot/talk/current/sources/ntalk-xinetd tinysofa/snapshot/talk/current/sources/talk-xinetd tinysofa/snapshot/talk/current/specs/ tinysofa/snapshot/talk/current/specs/talk.spec Log: - Add talk to snapshot from 2.0. Added: tinysofa/snapshot/talk/current/sources/netkit-ntalk-0.17-pre20000412-time.patch =================================================================== --- tinysofa/snapshot/talk/current/sources/netkit-ntalk-0.17-pre20000412-time.patch 2004-07-01 15:40:58 UTC (rev 2666) +++ tinysofa/snapshot/talk/current/sources/netkit-ntalk-0.17-pre20000412-time.patch 2004-07-01 15:40:59 UTC (rev 2667) @@ -0,0 +1,20 @@ +--- netkit-ntalk-0.17-pre20000412/talkd/announce.c.jj Fri Nov 27 02:08:22 1998 ++++ netkit-ntalk-0.17-pre20000412/talkd/announce.c Fri Feb 23 06:25:31 2001 +@@ -40,6 +40,7 @@ char ann_rcsid[] = + #include + #include + #include ++#include + #include + #include + #include +--- netkit-ntalk-0.17-pre20000412/talkd/table.c.jj Fri Nov 27 02:58:47 1998 ++++ netkit-ntalk-0.17-pre20000412/talkd/table.c Fri Feb 23 06:25:56 2001 +@@ -47,6 +47,7 @@ char table_rcsid[] = + */ + #include + #include ++#include + #include + #include + #include Added: tinysofa/snapshot/talk/current/sources/netkit-ntalk-0.17-strip.patch =================================================================== --- tinysofa/snapshot/talk/current/sources/netkit-ntalk-0.17-strip.patch 2004-07-01 15:40:58 UTC (rev 2666) +++ tinysofa/snapshot/talk/current/sources/netkit-ntalk-0.17-strip.patch 2004-07-01 15:40:59 UTC (rev 2667) @@ -0,0 +1,22 @@ +--- netkit-ntalk-0.17/talk/Makefile.strip Sun Aug 1 05:20:44 1999 ++++ netkit-ntalk-0.17/talk/Makefile Wed Jun 19 17:38:12 2002 +@@ -16,7 +16,7 @@ + $(OBJS): talk.h ../include/prot_talkd.h ../version.h + + install: talk +- install -s -m$(BINMODE) talk $(INSTALLROOT)$(BINDIR) ++ install -m$(BINMODE) talk $(INSTALLROOT)$(BINDIR) + install -m$(MANMODE) talk.1 $(INSTALLROOT)$(MANDIR)/man1/ + + clean: +--- netkit-ntalk-0.17/talkd/Makefile.strip Sun Aug 1 05:20:44 1999 ++++ netkit-ntalk-0.17/talkd/Makefile Wed Jun 19 17:38:40 2002 +@@ -13,7 +13,7 @@ + $(OBJS): proto.h ../include/prot_talkd.h ../version.h + + install: talkd +- install -s -m$(DAEMONMODE) talkd $(INSTALLROOT)$(SBINDIR)/in.ntalkd ++ install -m$(DAEMONMODE) talkd $(INSTALLROOT)$(SBINDIR)/in.ntalkd + ln -sf in.ntalkd $(INSTALLROOT)$(SBINDIR)/in.talkd + install -m$(MANMODE) talkd.8 $(INSTALLROOT)$(MANDIR)/man8/in.ntalkd.8 + ln -sf in.ntalkd.8 $(INSTALLROOT)$(MANDIR)/man8/in.talkd.8 Added: tinysofa/snapshot/talk/current/sources/netkit-ntalk-0.17.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/talk/current/sources/netkit-ntalk-0.17.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/talk/current/sources/ntalk-xinetd =================================================================== --- tinysofa/snapshot/talk/current/sources/ntalk-xinetd 2004-07-01 15:40:58 UTC (rev 2666) +++ tinysofa/snapshot/talk/current/sources/ntalk-xinetd 2004-07-01 15:40:59 UTC (rev 2667) @@ -0,0 +1,13 @@ +# default: off +# description: The ntalk server accepts ntalk connections, for chatting \ +# with users on different systems. +service ntalk +{ + flags = IPv4 + disable = yes + socket_type = dgram + wait = yes + user = nobody + group = tty + server = /usr/sbin/in.ntalkd +} Added: tinysofa/snapshot/talk/current/sources/talk-xinetd =================================================================== --- tinysofa/snapshot/talk/current/sources/talk-xinetd 2004-07-01 15:40:58 UTC (rev 2666) +++ tinysofa/snapshot/talk/current/sources/talk-xinetd 2004-07-01 15:40:59 UTC (rev 2667) @@ -0,0 +1,13 @@ +# default: off +# description: The talk server accepts talk requests for chatting with users \ +# on other systems. +service talk +{ + flags = IPv4 + disable = yes + socket_type = dgram + wait = yes + user = nobody + group = tty + server = /usr/sbin/in.talkd +} Added: tinysofa/snapshot/talk/current/specs/talk.spec =================================================================== --- tinysofa/snapshot/talk/current/specs/talk.spec 2004-07-01 15:40:58 UTC (rev 2666) +++ tinysofa/snapshot/talk/current/specs/talk.spec 2004-07-01 15:40:59 UTC (rev 2667) @@ -0,0 +1,208 @@ +Summary: Talk client for one-on-one Internet chatting. +Name: talk +Version: 0.17 +Release: 25ts +License: BSD +Group: Applications/Internet +Source: ftp://ftp.uk.linux.org/pub/linux/Networking/netkit-devel/netkit-ntalk-%{version}.tar.gz +Source1: talk-xinetd +Source2: ntalk-xinetd +Patch0: netkit-ntalk-0.17-pre20000412-time.patch +Patch1: netkit-ntalk-0.17-strip.patch +BuildRequires: ncurses-devel +BuildRoot: %{_tmppath}/%{name}-%{version}-root + +%description +The talk package provides client programs for the Internet talk +protocol, which allows you to chat with other users on different +systems. Talk is a communication program which copies lines from one +terminal to the terminal of another user. + +Install talk if you'd like to use talk for chatting with users on +different systems. + +%package server +Group: System Environment/Daemons +Requires: xinetd +Obsoletes: ntalk +Provides: ntalk +Summary: The talk server for one-on-one Internet chatting. + +%description server +The talk-server package provides daemon programs for the Internet talk +protocol, which allows you to chat with other users on different +machines. Talk is a communication program which copies lines from one +terminal to the terminal of another user. + +%prep +%setup -q -n netkit-ntalk-%{version} +%patch0 -p1 -b .time +%patch1 -p1 -b .strip + +%build +sh configure --with-c-compiler=gcc +%ifarch s390 s390x +%{__perl} -pi -e ' + s,^CC=.*$,CC=cc,; + s,-O2,\$(RPM_OPT_FLAGS) -D_GNU_SOURCE -fPIC,; + s,^LDFLAGS=,LDFLAGS=-pie,; + s,^BINDIR=.*$,BINDIR=%{_bindir},; + s,^MANDIR=.*$,MANDIR=%{_mandir},; + s,^SBINDIR=.*$,SBINDIR=%{_sbindir},; + ' MCONFIG +%else +%{__perl} -pi -e ' + s,^CC=.*$,CC=cc,; + s,-O2,\$(RPM_OPT_FLAGS) -D_GNU_SOURCE -fpic,; + s,^LDFLAGS=,LDFLAGS=-pie,; + s,^BINDIR=.*$,BINDIR=%{_bindir},; + s,^MANDIR=.*$,MANDIR=%{_mandir},; + s,^SBINDIR=.*$,SBINDIR=%{_sbindir},; + ' MCONFIG +%endif +make + +%install +rm -rf ${RPM_BUILD_ROOT} +mkdir -p ${RPM_BUILD_ROOT}%{_bindir} +mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man{1,8} +mkdir -p ${RPM_BUILD_ROOT}%{_sbindir} + +make INSTALLROOT=${RPM_BUILD_ROOT} install + +mkdir -p ${RPM_BUILD_ROOT}/etc/xinetd.d +install -m644 %SOURCE1 ${RPM_BUILD_ROOT}/etc/xinetd.d/talk +install -m644 %SOURCE2 ${RPM_BUILD_ROOT}/etc/xinetd.d/ntalk + +%clean +rm -rf ${RPM_BUILD_ROOT} + +%files +%defattr(-,root,root) +%{_bindir}/talk +%{_mandir}/man1/* + +%files server +%defattr(-,root,root) +%attr(0711,root,root)%{_sbindir}/in.ntalkd +%{_sbindir}/in.talkd +%{_mandir}/man8/* +%config(noreplace) /etc/xinetd.d/* + +%changelog +* Tue Jun 15 2004 Elliot Lee +- rebuilt + +* Wed May 12 2004 Phil Knirsch 0.17-24 +- Enables PIE for server and application. + +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Wed Feb 04 2004 Phil Knirsch 0.17-22 +- Fixed copyright to license. +- Fixed description for main package (#114683). + +* Wed Jun 04 2003 Elliot Lee +- rebuilt + +* Tue Feb 4 2003 Tim Waugh 0.17-20 +- Only one of the built packages should obsolete/provide ntalk. + +* Wed Jan 22 2003 Tim Powers +- rebuilt + +* Wed Dec 11 2002 Tim Powers 0.17-18 +- rebuild on all arches + +* Fri Jul 05 2002 Phil Knirsch 0.17-17 +- Fixed problem in IPv6 environment (#67769). + +* Fri Jun 21 2002 Tim Powers 0.17-16 +- automated rebuild + +* Wed Jun 19 2002 Phil Knirsch 0.17-15 +- Don't forcibly strip binaries + +* Thu May 23 2002 Tim Powers +- automated rebuild + +* Wed Jan 09 2002 Tim Powers +- automated rebuild + +* Tue Jul 24 2001 Philipp Knirsch +- Fixed missing BuildRequires: ncurses-devel (#49711) + +* Fri Jun 22 2001 Philipp Knirsch +- Update to latest stable netkit package (0.17) + +* Wed Apr 4 2001 Jakub Jelinek +- don't let configure to guess compiler, it can pick up egcs + +* Tue Feb 27 2001 Preston Brown +- %%config(noreplace) xinetd.d files + +* Fri Feb 23 2001 Jakub Jelinek +- make it build under glibc 2.2.2 + +* Wed Aug 23 2000 Nalin Dahyabhai +- default to being disabled + +* Tue Jul 18 2000 Bill Nottingham +- add description & default to xinetd file + +* Wed Jul 12 2000 Prospector +- automatic rebuild + +* Sun Jun 18 2000 Jeff Johnson +- FHS packaging. +- update to 0.17-pre20000412. + +* Tue May 23 2000 Trond Eivind Glomsr?d +- switch to xinetd + +* Tue May 16 2000 Chris Evans +- make daemons mode -rwx--x--x as a security hardening measure + +* Fri Mar 24 2000 Bernhard Rosenkraenzer +- 0.17 + +* Wed Feb 9 2000 Jeff Johnson +- compress man pages (again). + +* Wed Feb 02 2000 Cristian Gafton +- fix descriptions +- man pages are compressed + +* Tue Jan 4 2000 Bill Nottingham +- split client and server + +* Wed Dec 22 1999 Jeff Johnson +- update to 0.16. + +* Sat Aug 21 1999 Jeff Johnson +- build for 6.1. + +* Sun Jun 20 1999 Jeff Johnson +- handle both talk and otalk packets (#2799). + +* Fri Apr 9 1999 Jeff Johnson +- update to multi-homed 0.11 version. + +* Sun Mar 21 1999 Cristian Gafton +- auto rebuild in the new build environment (release 22) + +* Mon Mar 15 1999 Jeff Johnson +- compile for 6.0. + +* Tue Aug 11 1998 Jeff Johnson +- build root + +* Fri Apr 24 1998 Prospector System +- translations modified for de, fr, tr + +* Tue Apr 14 1998 Erik Troan +- built against new ncurses + +* Tue Jul 15 1997 Erik Troan +- initial build From svn at tinysofa.org Thu Jul 1 15:41:02 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:41:02 +1000 (EST) Subject: [tinysofa-svn] r2668 - in tinysofa/snapshot: . tcl tcl/current tcl/current/sources tcl/current/specs Message-ID: <20040701154102.9B8BD4E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:41:02 +1000 (Fri, 02 Jul 2004) New Revision: 2668 Added: tinysofa/snapshot/tcl/ tinysofa/snapshot/tcl/current/ tinysofa/snapshot/tcl/current/sources/ tinysofa/snapshot/tcl/current/sources/tcl-8.3.5-tclm4-soname.patch tinysofa/snapshot/tcl/current/sources/tcl-8.4.5-autoconf.patch tinysofa/snapshot/tcl/current/sources/tcl-8.4.5-lib-perm.patch tinysofa/snapshot/tcl/current/sources/tcl-8.4.5-no_rpath.patch tinysofa/snapshot/tcl/current/sources/tcl8.3.5-tclConfig-package-path-90160.patch tinysofa/snapshot/tcl/current/sources/tcl8.4.6-html.tar.gz tinysofa/snapshot/tcl/current/sources/tcl8.4.6-src.tar.gz tinysofa/snapshot/tcl/current/specs/ tinysofa/snapshot/tcl/current/specs/tcl.spec Log: - Add tcl to snapshot from 2.0. Added: tinysofa/snapshot/tcl/current/sources/tcl-8.3.5-tclm4-soname.patch =================================================================== --- tinysofa/snapshot/tcl/current/sources/tcl-8.3.5-tclm4-soname.patch 2004-07-01 15:40:59 UTC (rev 2667) +++ tinysofa/snapshot/tcl/current/sources/tcl-8.3.5-tclm4-soname.patch 2004-07-01 15:41:02 UTC (rev 2668) @@ -0,0 +1,12 @@ +diff -u tcl8.3.5/unix/tcl.m4~ tcl8.3.5/unix/tcl.m4 +--- tcl8.3.5/unix/tcl.m4~ 2003-01-14 20:42:53.000000000 +0900 ++++ tcl8.3.5/unix/tcl.m4 2003-01-14 20:42:53.000000000 +0900 +@@ -954,7 +954,7 @@ + CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES" + + if test "$have_dl" = yes; then +- SHLIB_LD="${CC} -shared" ++ SHLIB_LD='${CC} -shared -Wl,-soname,${@}' + DL_OBJS="tclLoadDl.o" + DL_LIBS="-ldl" + LDFLAGS="-rdynamic" Added: tinysofa/snapshot/tcl/current/sources/tcl-8.4.5-autoconf.patch =================================================================== --- tinysofa/snapshot/tcl/current/sources/tcl-8.4.5-autoconf.patch 2004-07-01 15:40:59 UTC (rev 2667) +++ tinysofa/snapshot/tcl/current/sources/tcl-8.4.5-autoconf.patch 2004-07-01 15:41:02 UTC (rev 2668) @@ -0,0 +1,69 @@ +Gives the compatibility to use autoconf-2.52 or higher... :) + +--- tcl8.4.5/unix/configure.in 2004-02-25 01:46:01.000000000 +0100 ++++ tcl8.4.5/unix/configure.in.autoconf 2004-02-25 01:48:21.000000000 +0100 +@@ -196,7 +196,7 @@ + AC_MSG_RESULT(yes) + else + AC_MSG_RESULT([broken, using substitute]) +- LIBOBJS="$LIBOBJS strstr.o" ++ AC_LIBOBJ(strstr) + fi + + #-------------------------------------------------------------------- +@@ -221,7 +221,7 @@ + }], , tcl_ok=0, tcl_ok=0) + if test "$tcl_ok" = 0; then + test -n "$verbose" && echo " Adding strtoul.o." +- LIBOBJS="$LIBOBJS strtoul.o" ++ AC_LIBOBJ(strtoul) + fi + + #-------------------------------------------------------------------- +@@ -245,7 +245,7 @@ + }], , tcl_ok=0, tcl_ok=0) + if test "$tcl_ok" = 0; then + test -n "$verbose" && echo " Adding strtod.o." +- LIBOBJS="$LIBOBJS strtod.o" ++ AC_LIBOBJ(strtod) + fi + + #-------------------------------------------------------------------- +@@ -327,7 +327,7 @@ + AC_CHECK_LIB(inet, strncasecmp, tcl_ok=1, tcl_ok=0) + fi + if test "$tcl_ok" = 0; then +- LIBOBJS="$LIBOBJS strncasecmp.o" ++ AC_LIBOBJ(strncasecmp) + fi + + #-------------------------------------------------------------------- +--- tcl8.4.5/unix/tcl.m4 2004-02-25 01:58:15.000000000 +0100 ++++ tcl8.4.5/unix/tcl.m4.autoconf 2004-02-25 02:00:18.000000000 +0100 +@@ -899,7 +899,7 @@ + + # AIX v<=4.1 has some different flags than 4.2+ + if test "$system" = "AIX-4.1" -o "`uname -v`" -lt "4" ; then +- LIBOBJS="$LIBOBJS tclLoadAix.o" ++ AC_LIBOBJ(tclLoadAix) + DL_LIBS="-lld" + fi + +@@ -1147,7 +1147,7 @@ + # is kind of overkill but it works. + # Disable inlining only when one of the + # files in compat/*.c is being linked in. +- if test x"${LIBOBJS}" != x ; then ++ if test x"${LIB@&t at OBJS}" != x ; then + EXTRA_CFLAGS="${EXTRA_CFLAGS} -fno-inline" + fi + +@@ -2261,7 +2261,7 @@ + AC_MSG_RESULT(ok) + else + AC_MSG_RESULT(buggy) +- LIBOBJS="$LIBOBJS fixstrtod.o" ++ AC_LIBOBJ(fixstrtod) + AC_DEFINE(strtod, fixstrtod) + fi + fi Added: tinysofa/snapshot/tcl/current/sources/tcl-8.4.5-lib-perm.patch =================================================================== --- tinysofa/snapshot/tcl/current/sources/tcl-8.4.5-lib-perm.patch 2004-07-01 15:40:59 UTC (rev 2667) +++ tinysofa/snapshot/tcl/current/sources/tcl-8.4.5-lib-perm.patch 2004-07-01 15:41:02 UTC (rev 2668) @@ -0,0 +1,12 @@ +diff -u tcl8.4.5/unix/Makefile.in~ tcl8.4.5/unix/Makefile.in +--- tcl8.4.5/unix/Makefile.in~ 2003-11-25 16:47:51.000000000 +0900 ++++ tcl8.4.5/unix/Makefile.in 2003-11-25 16:47:51.000000000 +0900 +@@ -601,7 +601,7 @@ + fi + @echo "Installing $(LIB_FILE) to $(LIB_INSTALL_DIR)/" + @@INSTALL_LIB@ +- @chmod 555 $(LIB_INSTALL_DIR)/$(LIB_FILE) ++ @chmod 755 $(LIB_INSTALL_DIR)/$(LIB_FILE) + @if test "$(TCL_BUILD_EXP_FILE)" != ""; then \ + echo "Installing $(TCL_EXP_FILE) to $(LIB_INSTALL_DIR)/"; \ + $(INSTALL_DATA) $(TCL_BUILD_EXP_FILE) \ Added: tinysofa/snapshot/tcl/current/sources/tcl-8.4.5-no_rpath.patch =================================================================== --- tinysofa/snapshot/tcl/current/sources/tcl-8.4.5-no_rpath.patch 2004-07-01 15:40:59 UTC (rev 2667) +++ tinysofa/snapshot/tcl/current/sources/tcl-8.4.5-no_rpath.patch 2004-07-01 15:41:02 UTC (rev 2668) @@ -0,0 +1,11 @@ +--- tcl8.4.5/unix/tcl.m4.no_rpath 2003-12-01 14:50:28.000000000 +0100 ++++ tcl8.4.5/unix/tcl.m4 2003-12-01 14:50:31.000000000 +0100 +@@ -1125,7 +1125,7 @@ + DL_OBJS="tclLoadDl.o" + DL_LIBS="-ldl" + LDFLAGS="-rdynamic" +- CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}' ++ CC_SEARCH_FLAGS='' + LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS} + else + AC_CHECK_HEADER(dld.h, [ Added: tinysofa/snapshot/tcl/current/sources/tcl8.3.5-tclConfig-package-path-90160.patch =================================================================== --- tinysofa/snapshot/tcl/current/sources/tcl8.3.5-tclConfig-package-path-90160.patch 2004-07-01 15:40:59 UTC (rev 2667) +++ tinysofa/snapshot/tcl/current/sources/tcl8.3.5-tclConfig-package-path-90160.patch 2004-07-01 15:41:02 UTC (rev 2668) @@ -0,0 +1,12 @@ +diff -u tcl8.3.5/unix/configure.in~ tcl8.3.5/unix/configure.in +--- tcl8.3.5/unix/configure.in~ 2003-07-04 12:32:44.000000000 +0900 ++++ tcl8.3.5/unix/configure.in 2003-07-04 12:32:44.000000000 +0900 +@@ -455,7 +455,7 @@ + if test "$prefix" != "$exec_prefix"; then + TCL_PACKAGE_PATH="${libdir} ${prefix}/lib" + else +- TCL_PACKAGE_PATH="${prefix}/lib" ++ TCL_PACKAGE_PATH="${prefix}/share" + fi + + #-------------------------------------------------------------------- Added: tinysofa/snapshot/tcl/current/sources/tcl8.4.6-html.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/tcl/current/sources/tcl8.4.6-html.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/tcl/current/sources/tcl8.4.6-src.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/tcl/current/sources/tcl8.4.6-src.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/tcl/current/specs/tcl.spec =================================================================== --- tinysofa/snapshot/tcl/current/specs/tcl.spec 2004-07-01 15:40:59 UTC (rev 2667) +++ tinysofa/snapshot/tcl/current/specs/tcl.spec 2004-07-01 15:41:02 UTC (rev 2668) @@ -0,0 +1,393 @@ +%define majorver 8.4 + +Summary: Tcl scripting language development environment +Name: tcl +Version: %{majorver}.6 +Release: 1ts +License: BSD +Group: Development/Languages +URL: http://tcl.sourceforge.net/ +Source0: http://prdownloads.sourceforge.net/tcl/%{name}%{version}-src.tar.gz +Source1: http://prdownloads.sourceforge.net/tcl/%{name}%{version}-html.tar.gz +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root +Buildrequires: autoconf +Patch1: tcl-8.3.5-tclm4-soname.patch +Patch2: tcl-8.4.5-lib-perm.patch +Patch3: tcl8.3.5-tclConfig-package-path-90160.patch +Patch4: tcl-8.4.5-no_rpath.patch +Patch5: tcl-8.4.5-autoconf.patch +# remove old FC1 itcl subpackage +Obsoletes: itcl <= 3.2 + +%description +The Tcl (Tool Command Language) provides a powerful platform for +creating integration applications that tie together diverse +applications, protocols, devices, and frameworks. When paired with the +Tk toolkit, Tcl provides a fastest and powerful way to create +cross-platform GUI applications. Tcl can also be used for a variety +of web-related tasks and for creating powerful command languages for +applications. + +%package devel +Version: %{version} +Summary: Tcl scripting language development environment +Group: Development/Languages +URL: http://tcl.sourceforge.net/ +Requires: %{name} = %{version}-%{release} + +%description devel +The Tcl (Tool Command Language) provides a powerful platform for +creating integration applications that tie together diverse +applications, protocols, devices, and frameworks. When paired with the +Tk toolkit, Tcl provides a fastest and powerful way to create +cross-platform GUI applications. Tcl can also be used for a variety +of web-related tasks and for creating powerful command languages for +applications. + +The package contains the development files and man pages for tcl. + +%package html +Version: %{version} +Summary: Tcl/Tk manual in html format +Group: Development/Libraries +URL: http://tcl.sourceforge.net/ + +%description html +Tcl/Tk is a powerful scripting language and GUI toolkit. + +This package contains the html manual. + +%prep +%setup -n %{name}%{version} -q -b1 + +# define DT SONAME in shared lib +%patch1 -p1 -b .soname +%patch2 -p1 -b .ro-lib +%patch3 -p1 -b .pkgpath +%patch4 -p1 -b .no_rpath +%patch5 -p1 -b .ac213 + +# patch1 touches tcl.m4, and patch3 touches configure.in +cd unix +autoconf + +%build +cd unix +%configure +make %{?_smp_mflags} TCL_LIBRARY=%{_datadir}/%{name}%{majorver} + +# run "make test" by default +%{?_without_check: %define _without_check 1} +%{!?_without_check: %define _without_check 0} + +%if ! %{_without_check} + make test +%endif + +%install +rm -rf $RPM_BUILD_ROOT +make install -C unix INSTALL_ROOT=%{buildroot} TCL_LIBRARY=%{_datadir}/%{name}%{majorver} + +ln -s tclsh%{majorver} %{buildroot}%{_bindir}/tclsh + +# for linking with -l%{name} +ln -s lib%{name}%{majorver}.so %{buildroot}%{_libdir}/lib%{name}.so + +# backward compatible symlink for legacy tcl packages that hardcode lib path +# to prefix/lib/%{name}%{majorver} +## make /usr/lib for multilib archs +mkdir -p %{buildroot}%{_prefix}/lib +ln -s %{_datadir}/%{name}%{majorver} %{buildroot}%{_prefix}/lib/%{name}%{majorver} + +mkdir -p %buildroot/%{_includedir}/%{name}-private/{generic,unix} +find generic unix -name "*.h" -exec cp -p '{}' %buildroot/%{_includedir}/%{name}-private/'{}' ';' +( cd %buildroot/%{_includedir} + for i in *.h ; do + [ -f %buildroot/%{_includedir}/%{name}-private/generic/$i ] && ln -sf ../../$i %buildroot/%{_includedir}/%{name}-private/generic ; + done +) + +# remove buildroot traces +perl -pi -e "s|$PWD/unix|%{_libdir}|; s|$PWD|%{_includedir}/%{name}-private|" %buildroot/%{_libdir}/%{name}Config.sh + +%clean +rm -rf $RPM_BUILD_ROOT + +%post +/sbin/ldconfig + +%postun +/sbin/ldconfig + +%files +%defattr(-,root,root,-) +%{_bindir}/tclsh* +%{_datadir}/%{name}%{majorver} +%{_libdir}/lib%{name}%{majorver}.so +%{_libdir}/%{name}Config.sh +%{_mandir}/man1/* +# this should be prefix/lib +%{_prefix}/lib/%{name}%{majorver} +%doc README changes license.terms + +%files devel +%defattr(-,root,root) +%{_includedir}/* +%{_libdir}/lib%{name}stub%{majorver}.a +%{_libdir}/lib%{name}.so +%{_mandir}/man3/* +%{_mandir}/mann/* + +%files html +%defattr(-,root,root) +%doc html/* + +%changelog +* Thu May 13 2004 Jens Petersen - 8.4.6-1 +- update to 8.4.6 + +* Wed Apr 21 2004 Warren Togami - 8.4.5-7 +- obsolete former itcl package (#121414) + +* Wed Mar 10 2004 Jens Petersen - 8.4.5-6 +- apply tcl-8.4.5-autoconf.patch to build with autoconf 2.5x + (Robert Scheck, #116773) +- use %%{name} more extensively for script portability +- run "make test" by default when building (can be disabled with + "--without check") +- add a backwards compatible symlink %{_prefix}/lib/tk8.4 -> + %{_datadir}/tk8.4 (Michal Jaegermann, part of #90160) +- use "mkdir -p" instead of "mkdirhier" (Robert Scheck, #116771) +- include some doc files + +* Tue Mar 02 2004 Elliot Lee - 8.4.5-5.1 +- rebuilt + +* Fri Feb 13 2004 Elliot Lee - 8.4.5-5 +- rebuilt + +* Mon Feb 2 2004 Jens Petersen - 8.4.5-4 +- include all private .h files under %{_includedir}/tcl-private + +* Mon Dec 1 2003 Thomas Woerner 8.4.5-3 +- removed rpath (patch 4) + +* Fri Nov 28 2003 Jens Petersen - 8.4.5-2 +- put private header files under generic and unix subdirs +- include real generic/tclPort.h not just a symlink to tclUnixPort.h +- add tclMath.h to %{_includedir}/tcl-private/generic for building tk +- remove build remnants from tclConfig.sh + +* Thu Nov 27 2003 Jens Petersen - 8.4.5-1 +- new package split out from tcltk +- update to tcl 8.4.5 (#88429) + - drop tcl-8.3.3-heiierarchy.patch, tcl-8.3.3-dlopen.patch + and tcl8.3.5-koi8-u.enc-88806.patch +- include private include headers under %{_includedir}/tcl-private +- filtered changelog for tcl +- buildrequire autoconf213 (#110583) [mvd at mylinux.com.ua] + +* Wed Sep 17 2003 Matt Wilson 8.3.5-92 +- rebuild again for #91211 + +* Wed Sep 17 2003 Matt Wilson 8.3.5-91 +- rebuild to fix gzipped file md5sums (#91211) + +* Fri Jul 04 2003 Jens Petersen - 8.3.5-90 +- split out devel files from tcl and tk into -devel subpackages (#90087) +- fix tcl package path in tclConfig.sh to point to datadir (#90160) + [reported by Michal Jaegermann] +- remove gratuitous whitespace in koi8-u.enc (#88806) + [reported with fix by Victor Cheburkin] +- update ucs4 patch to also change regcustom.h, but disable it for now (#89098) + +* Thu Feb 6 2003 Jens Petersen - 8.3.5-88 +- use ucs4 wide chars since python now does (tkinter) + +* Fri Jan 17 2003 Jens Petersen - 8.3.5-85 +- add some requires + +* Tue Jan 14 2003 Jens Petersen - 8.3.5-84 +- link all libs with DT_SONAME using tcl.m4 patch (#81297) +- drop synthetic lib provides +- remove obsolete patches from srpm +- update buildrequires +- use buildroot instead of RPM_BUILD_ROOT +- install all man pages under mandir, instead of moving some from /usr/man +- install libtcl and libtk mode 755 +- introduce _genfilelist macro for clean single-sweep find filelist generation + for each package +- use perl to remove buildroot prefix from filelists + +* Tue Jan 7 2003 Jeff Johnson 8.3.5-80 +- rebuild to generate deps for4 DSO's w/o DT_SONAME correctly. + +* Sat Jan 4 2003 Jeff Johnson 8.3.5-79 +- set execute bits on library so that requires are generated. + +* Tue Dec 10 2002 Jens Petersen 8.3.5-78 +- make lib symlinks to .so not .so.0 + +* Tue Dec 10 2002 Jens Petersen 8.3.5-77 +- fix summary-not-capitalized for tclx, tcllib, tcl-html + +* Mon Dec 9 2002 Jens Petersen 8.3.5-76 +- make it build on x86_64 (details below) +- don't explicitly update config.{guess,sub} since %%configure does it for us +- added "--without check" rpmbuild option to disable running tests in future +- build and install tcl and tk with script files under datadir (not libdir) +- generate filelists from datadir and not from mandir from now on + +* Tue Dec 3 2002 Jens Petersen +- update to tcl-8.3.5, tk-8.3.5, tcl-html-8.3.5 +- update url for tcl, tk, tclx, itcl, tcllib +- build without all makecfg patches for now + - in particular use upstream versioned library name convention +- add backward compatible lib symlinks for now +- add unversioned symlinks for versioned bindir files +- use make's -C option rather than jumping in and out of source dirs + during install +- use INSTALL_ROOT destdir-like make variable instead of makeinstall + for all subpackages except tix and itcl + +* Mon Oct 21 2002 Jens Petersen +- update to tcl-8.3.4, tk-8.3.4 (#75600), tcllib-1.3, itcl-3.2.1, + tix-8.1.3 (#59098) +- drop obsolete tcl cruft, tcl refcount, tix perf patches +- added tcltk html manual +- drop the crud compat dir symlinks in libdir +- package now builds without tcl or tk installed (partly #52606) + - replace all relative paths by absolutes ones, using new tcltktop + - give absolute paths to tcl and tk when configuring + - give buildroot bindir path to tcllib make + - export buildroot libdir in LD_LIBRARY_PATH when installing +- replace tclvers and tkvers by tcltkvers and use it +- replace tcl_major and tk_major by tcltk_major and use it +- don't explicitly provide 64bit libs on ia64 and sparc64 + +* Mon Jan 07 2002 Florian La Roche +- fix config.guess and config.sub to newer versions + +* Mon Aug 29 2001 Adrian Havill + +* Mon Aug 8 2001 Adrian Havill +- re-enable glibc string and math inlines; recent gcc is a-ok. +- optimize at -O2 instead of -O +- rename "soname" patches related to makefile/autoconf changes +- added elf "needed" for tk, tclx, tix, itk + +* Thu Jul 19 2001 Adrian Havill +- used %%makeinstall to brute force fix any remaining unflexible makefile dirs +- fixed bad ref count release in tcl (bug 49406) +- revert --enable-threads, linux is (still) not ready (yet) (bug 49251) + +* Sun Jul 8 2001 Adrian Havill +- refresh all sources to latest stable (TODO: separate expect/expectk) +- massage out some build stuff to patches (TODO: libtoolize hacked constants) +- remove patches already rolled into the upstream +- removed RPATH (bugs 45569, 46085, 46086), added SONAMEs to ELFs +- changed shared object filenames to something less gross +- reenable threads which seem to work now +- made compile-friendly for IA64 + +* Sun Jun 24 2001 Elliot Lee +- Bump release + rebuild for 7.2. + +* Fri Mar 23 2001 Bill Nottingham +- bzip2 sources + +* Mon Mar 19 2001 Preston Brown +- build fix from ahavill. + +* Tue Feb 13 2001 Adrian Havill +- added "ja_JP.eucJP" to locale list for tcl + +* Tue Feb 13 2001 Adrian Havill +- rebuild so make check passes + +* Fri Oct 20 2000 Than Ngo +- rebuild with -O0 on alpha (bug #19461) + +* Thu Aug 17 2000 Jeff Johnson +- summaries from specspo. + +* Thu Aug 3 2000 Jeff Johnson +- merge "best known" patches from searching, stubs were broken. + +* Thu Jul 27 2000 Jeff Johnson +- rebuild against "working" util-linux col. + +* Wed Jul 12 2000 Prospector +- automatic rebuild + +* Fri Jun 16 2000 Jeff Johnson +- don't mess with %%{_libdir}, it's gonna be a FHS pita. + +* Fri Jun 2 2000 Jeff Johnson +- FHS packaging changes. +- revert --enable-threads, linux is not ready (yet) (#11789). +- tcl/tk: update to 8.3.1 (#10779). +- abstract major tcltk version for soname expansion etc. + +* Sat Mar 18 2000 Jeff Johnson +- update to (tcl,tk}-8.2.3, expect-5.31, and itcl-3.1.0, URL's as well. +- use perl to drill out pre-pended RPM_BUILD_ROOT. +- configure with --enable-threads (experimental). +- correct hierarchy spelling (#7082). + +* Tue Mar 7 2000 Jeff Johnson +- rebuild for sparc baud rates > 38400. + +* Mon Feb 7 2000 Bill Nottingham +- handle compressed manpages + +* Thu Feb 03 2000 Elliot Lee +- Make changes from bug number 7602 +- Apply patch from bug number 7537 +- Apply fix from bug number 7157 +- Add fixes from bug #7601 to the runtcl patch + +* Wed Feb 02 2000 Cristian Gafton +- fix descriptions +- man pages are compressed (whatapain) + +* Tue Nov 30 1999 Jakub Jelinek +- compile on systems where SIGPWR == SIGLOST. + +* Sat May 1 1999 Jeff Johnson +- update tcl/tk to 8.0.5. + +* Tue Feb 16 1999 Jeff Johnson +- upgrade tcl/tk/tclX to 8.0.4 + +* Tue Jan 12 1999 Cristian Gafton +- call libtoolize to allow building on the arm +- build for glibc 2.1 +- strip binaries + +* Thu Sep 10 1998 Jeff Johnson +- update tcl/tk/tclX to 8.0.3, expect is updated also. + +* Thu May 07 1998 Prospector System +- translations modified for de, fr, tr + +* Thu Apr 09 1998 Erik Troan +- updated version numbers of tcl/tk to relflect inclusion of p2 + +* Wed Mar 25 1998 Cristian Gafton +- updated tcl/tk to patch level 2 + +* Wed Oct 22 1997 Otto Hammersmith +- added patch to remove libieee test in configure.in for tcl and tk. + Shouldn't be needed anymore for glibc systems, but this isn't the "proper" + solution for all systems +- fixed src urls + +* Mon Oct 06 1997 Erik Troan +- removed version numbers from descriptions + +* Mon Sep 22 1997 Erik Troan +- updated to tcl/tk 8.0 and related versions of packages + +* Tue Jun 17 1997 Erik Troan +- built against glibc From svn at tinysofa.org Thu Jul 1 15:41:42 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:41:42 +1000 (EST) Subject: [tinysofa-svn] r2670 - in tinysofa/snapshot: . time time/current time/current/sources time/current/specs Message-ID: <20040701154142.C4ACB4E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:41:42 +1000 (Fri, 02 Jul 2004) New Revision: 2670 Added: tinysofa/snapshot/time/ tinysofa/snapshot/time/current/ tinysofa/snapshot/time/current/sources/ tinysofa/snapshot/time/current/sources/time-1.7.tar.gz tinysofa/snapshot/time/current/specs/ tinysofa/snapshot/time/current/specs/time.spec Log: - Add time to snapshot from 2.0. Added: tinysofa/snapshot/time/current/sources/time-1.7.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/time/current/sources/time-1.7.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/time/current/specs/time.spec =================================================================== --- tinysofa/snapshot/time/current/specs/time.spec 2004-07-01 15:41:39 UTC (rev 2669) +++ tinysofa/snapshot/time/current/specs/time.spec 2004-07-01 15:41:42 UTC (rev 2670) @@ -0,0 +1,115 @@ +Summary: A GNU utility for monitoring a program's use of system resources. +Name: time +Version: 1.7 +Release: 25ts +License: GPL +Group: Applications/System +Source: ftp://prep.ai.mit.edu/pub/gnu/%{name}-%{version}.tar.gz +Prefix: %{_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-root +Prereq: /sbin/install-info + +%description +The GNU time utility runs another program, collects information about +the resources used by that program while it is running, and displays +the results. + +%prep +%setup -q + +%build +echo "ac_cv_func_wait3=\${ac_cv_func_wait3='yes'}" >> config.cache +%configure +make + +%install +rm -rf %{buildroot} +%makeinstall + +%clean +rm -rf %{buildroot} + +%post +/sbin/install-info %{_infodir}/time.info.gz %{_infodir}/dir \ + --entry="* time: (time). GNU time Utility" + +%preun +if [ "$1" = 0 ]; then + /sbin/install-info --delete %{_infodir}/time.info.gz %{_infodir}/dir \ + --entry="* time: (time). GNU time Utility" +fi + +%files +%defattr(-,root,root) +%doc NEWS README +%{_bindir}/time +%{_infodir}/time.info* + +%changelog +* Tue Jun 15 2004 Elliot Lee +- rebuilt + +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Tue Jun 17 2003 Florian La Roche +- rebuild + +* Wed Jun 04 2003 Elliot Lee +- rebuilt + +* Wed Jan 22 2003 Tim Powers +- rebuilt + +* Tue Nov 19 2002 Tim Powers +- rebuild on all arches + +* Fri Jun 21 2002 Tim Powers +- automated rebuild + +* Wed Jun 19 2002 Florian La Roche +- do not strip apps, do not compress info page + +* Thu May 23 2002 Tim Powers +- automated rebuild + +* Mon Feb 25 2002 Elliot Lee +- Remove HAVE_WAIT3 hack, tried to replace it with a requirement for an +autoconf with the fixed test, didn't work, put in another less-bad hack +instead. + +* Wed Dec 05 2001 Tom Tromey +- Bump release, force HAVE_WAIT3 to be defined at build time + +* Sun Jun 24 2001 Elliot Lee +- Bump release + rebuild. + +* Wed Jan 31 2001 Preston Brown +- prereq install-info (#24715) + +* Wed Jul 12 2000 Prospector +- automatic rebuild + +* Thu Jun 29 2000 Preston Brown +- using / as the file manifesto has weird results. + +* Sun Jun 4 2000 Jeff Johnson +- FHS packaging. + +* Sun Mar 21 1999 Cristian Gafton +- auto rebuild in the new build environment (release 9) + +* Mon Aug 10 1998 Erik Troan +- buildrooted and defattr'd + +* Mon Apr 27 1998 Prospector System +- translations modified for de, fr, tr + +* Mon Oct 27 1997 Cristian Gafton +- fixed info handling + +* Thu Oct 23 1997 Cristian Gafton +- updated the spec file; added info file handling + +* Mon Jun 02 1997 Erik Troan +- built against glibc From svn at tinysofa.org Thu Jul 1 15:44:46 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:44:46 +1000 (EST) Subject: [tinysofa-svn] r2713 - in tinysofa/releases/1.1: authconfig/current/specs beecrypt/current/specs bind/current/specs courier-imap/current/specs cups/current/specs db4/current/specs gdbm/current/specs gettext/current/specs ghostscript/current/specs glib/current/specs groff/current/specs lftp/current/specs libtool/current/specs libxml2/current/specs mysql/current/specs netatalk/current/specs openssl/current/specs pam_krb5/current/specs parted/current/specs pcre/current/specs psmisc/current/specs rpm/current/specs shadow-utils/current/specs telnet/current/specs Message-ID: <20040701154446.31EDF4E817B@minbar.tinysofa.org> Author: jh Date: 2004-07-02 01:44:44 +1000 (Fri, 02 Jul 2004) New Revision: 2713 Modified: tinysofa/releases/1.1/authconfig/current/specs/authconfig.spec tinysofa/releases/1.1/beecrypt/current/specs/beecrypt.spec tinysofa/releases/1.1/bind/current/specs/bind.spec tinysofa/releases/1.1/courier-imap/current/specs/courier-imap.spec tinysofa/releases/1.1/cups/current/specs/cups.spec tinysofa/releases/1.1/db4/current/specs/db4.spec tinysofa/releases/1.1/gdbm/current/specs/gdbm.spec tinysofa/releases/1.1/gettext/current/specs/gettext.spec tinysofa/releases/1.1/ghostscript/current/specs/ghostscript.spec tinysofa/releases/1.1/glib/current/specs/glib.spec tinysofa/releases/1.1/groff/current/specs/groff.spec tinysofa/releases/1.1/lftp/current/specs/lftp.spec tinysofa/releases/1.1/libtool/current/specs/libtool.spec tinysofa/releases/1.1/libxml2/current/specs/libxml2.spec tinysofa/releases/1.1/mysql/current/specs/mysql.spec tinysofa/releases/1.1/netatalk/current/specs/netatalk.spec tinysofa/releases/1.1/openssl/current/specs/openssl.spec tinysofa/releases/1.1/pam_krb5/current/specs/pam_krb5.spec tinysofa/releases/1.1/parted/current/specs/parted.spec tinysofa/releases/1.1/pcre/current/specs/pcre.spec tinysofa/releases/1.1/psmisc/current/specs/psmisc.spec tinysofa/releases/1.1/rpm/current/specs/rpm.spec tinysofa/releases/1.1/shadow-utils/current/specs/shadow-utils.spec tinysofa/releases/1.1/telnet/current/specs/telnet.spec Log: - change Requires and BuildRequires as follows gcc-c++-runtime -> libstdc++ gcc-c++-devel -> libstdc++-devel Modified: tinysofa/releases/1.1/authconfig/current/specs/authconfig.spec =================================================================== --- tinysofa/releases/1.1/authconfig/current/specs/authconfig.spec 2004-07-01 15:44:33 UTC (rev 2712) +++ tinysofa/releases/1.1/authconfig/current/specs/authconfig.spec 2004-07-01 15:44:44 UTC (rev 2713) @@ -7,10 +7,10 @@ Group: tinysofa official BuildRoot: %{_tmppath}/%{name}-root Source: %{name}-%{version}.tar.gz -Requires: gcc-c++-runtime +Requires: libstdcc++ BuildRequires: python, newt BuildRequires: pkgconfig, glib, glib-devel, python-devel, newt-devel -BuildRequires: gcc-c++-devel +BuildRequires: libstdcc++-devel %description Authconfig is a terminal mode program for setting up Network Modified: tinysofa/releases/1.1/beecrypt/current/specs/beecrypt.spec =================================================================== --- tinysofa/releases/1.1/beecrypt/current/specs/beecrypt.spec 2004-07-01 15:44:33 UTC (rev 2712) +++ tinysofa/releases/1.1/beecrypt/current/specs/beecrypt.spec 2004-07-01 15:44:44 UTC (rev 2713) @@ -15,10 +15,10 @@ BuildPreReq: python-devel >= %{with_python_version} %endif BuildRoot: %{_tmppath}/%{name}-root -Requires: gcc-c++-runtime +Requires: libstdcc++ BuildRequires: autoconf automake libtool -BuildRequires: gcc-c++-devel +BuildRequires: libstdcc++-devel %description Beecrypt is a general-purpose cryptography library. Modified: tinysofa/releases/1.1/bind/current/specs/bind.spec =================================================================== --- tinysofa/releases/1.1/bind/current/specs/bind.spec 2004-07-01 15:44:33 UTC (rev 2712) +++ tinysofa/releases/1.1/bind/current/specs/bind.spec 2004-07-01 15:44:44 UTC (rev 2713) @@ -42,7 +42,7 @@ Prereq: bind-libs = %{epoch}:%{version} %accountman_requires %service_requires -BuildRequires: /usr/bin/perl binutils gcc glibc-devel automake gcc-c++-runtime +BuildRequires: /usr/bin/perl binutils gcc glibc-devel automake libstdcc++-devel BuildRequires: openssl-devel >= 0.9.7 make libtool autoconf #BuildRequires: glibc-iconv Buildroot: %{_tmppath}/%{name}-%{version}-root Modified: tinysofa/releases/1.1/courier-imap/current/specs/courier-imap.spec =================================================================== --- tinysofa/releases/1.1/courier-imap/current/specs/courier-imap.spec 2004-07-01 15:44:33 UTC (rev 2712) +++ tinysofa/releases/1.1/courier-imap/current/specs/courier-imap.spec 2004-07-01 15:44:44 UTC (rev 2713) @@ -22,7 +22,7 @@ BuildRoot: %{_tmppath}/%{name}-root Requires: /sbin/chkconfig, coreutils, sed Requires: /sbin/restart_maybe, db4, openssl, imapd-pam -BuildRequires: coreutils, rpm >= 4.0.2, sed, gcc-c++-devel +BuildRequires: coreutils, rpm >= 4.0.2, sed, libstdcc++-devel BuildRequires: perl, db4-devel, openssl-devel BuildRequires: pam-devel openldap-devel mysql-devel postgresql-devel Buildrequires: mysql-devel mysql-shared mysql-libs Modified: tinysofa/releases/1.1/cups/current/specs/cups.spec =================================================================== --- tinysofa/releases/1.1/cups/current/specs/cups.spec 2004-07-01 15:44:33 UTC (rev 2712) +++ tinysofa/releases/1.1/cups/current/specs/cups.spec 2004-07-01 15:44:44 UTC (rev 2713) @@ -21,14 +21,14 @@ PreReq: /sbin/chkconfig /sbin/service /sbin/restart_maybe Requires: %{name}-libs = %{version} xinetd libjpeg libtiff libpng zlib openssl Requires: ghostscript-cups -Requires: gcc-c++-runtime +Requires: libstdcc++ Provides: lpd lpr lprng BuildPrereq: pam-devel openssl-devel BuildRequires: autoconf BuildRequires: libpng libpng-devel BuildRequires: libjpeg libpng-devel BuildRequires: libtiff libtiff-devel -BuildRequires: zlib-devel pam gcc-c++-devel +BuildRequires: zlib-devel pam libstdcc++-devel %package devel Summary: Common Unix Printing System - development environment @@ -213,12 +213,12 @@ - current (1.1.20-5jh) integrated as 1.1.20-5ts for release 1.0-U1 * Tue May 11 2004 Omar Kilani -- Add Requires: gcc-c++-runtime +- Add Requires: libstdcc++ - Add BuildRequires: autoconf - Add BuildRequires: libpng libpng-devel - Add BuildRequires: libjpeg libpng-devel - Add BuildRequires: libtiff libtiff-devel -- Add BuildRequires: zlib-devel pam gcc-c++-devel +- Add BuildRequires: zlib-devel pam libstdcc++-devel - Add Requires: libpng, openssl to devel subpackage. - Add Requires: libjpeg-devel libtiff-devel libpng-devel to devel. - Add Requires: openssl-devel to devel. Modified: tinysofa/releases/1.1/db4/current/specs/db4.spec =================================================================== --- tinysofa/releases/1.1/db4/current/specs/db4.spec 2004-07-01 15:44:33 UTC (rev 2712) +++ tinysofa/releases/1.1/db4/current/specs/db4.spec 2004-07-01 15:44:44 UTC (rev 2713) @@ -18,8 +18,8 @@ License: GPL Group: tinysofa official BuildPreReq: perl db1-devel -BuildRequires: autoconf gcc-c++-devel ed -Requires: gcc-c++-runtime +BuildRequires: autoconf libstdcc++-devel ed +Requires: libstdcc++ # Seems RPM needs a special invitation to understand this Provides: libdb.so.%{__major} BuildRoot: %{_tmppath}/%{name}-root Modified: tinysofa/releases/1.1/gdbm/current/specs/gdbm.spec =================================================================== --- tinysofa/releases/1.1/gdbm/current/specs/gdbm.spec 2004-07-01 15:44:33 UTC (rev 2712) +++ tinysofa/releases/1.1/gdbm/current/specs/gdbm.spec 2004-07-01 15:44:44 UTC (rev 2713) @@ -10,7 +10,7 @@ License: GPL Group: tinysofa official Prefix: %{_prefix} -BuildRequires: texinfo libtool autoconf automake gcc-c++-devel +BuildRequires: texinfo libtool autoconf automake libstdcc++-devel BuildRoot: %{_tmppath}/%{name}-root %description Modified: tinysofa/releases/1.1/gettext/current/specs/gettext.spec =================================================================== --- tinysofa/releases/1.1/gettext/current/specs/gettext.spec 2004-07-01 15:44:33 UTC (rev 2712) +++ tinysofa/releases/1.1/gettext/current/specs/gettext.spec 2004-07-01 15:44:44 UTC (rev 2713) @@ -6,8 +6,8 @@ Group: tinysofa official Source: ftp://ftp.gnu.org/gnu/gettext-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-root -BuildRequires: gcc-c++-devel -Requires: gcc-c++-runtime +BuildRequires: libstdcc++-devel +Requires: libstdcc++ %description The GNU gettext package provides a set of tools and documentation for Modified: tinysofa/releases/1.1/ghostscript/current/specs/ghostscript.spec =================================================================== --- tinysofa/releases/1.1/ghostscript/current/specs/ghostscript.spec 2004-07-01 15:44:33 UTC (rev 2712) +++ tinysofa/releases/1.1/ghostscript/current/specs/ghostscript.spec 2004-07-01 15:44:44 UTC (rev 2713) @@ -8,10 +8,10 @@ Source2: http://heanet.dl.sourceforge.net/sourceforge/gs-fonts/gnu-gs-fonts-std-6.0.tar.gz Url: http://www.cups.org/ghostscript.html BuildRoot: %{_tmppath}/%{name}-root -BuildRequires: libjpeg libjpeg-devel libtiff libtiff-devel gcc-c++-devel +BuildRequires: libjpeg libjpeg-devel libtiff libtiff-devel libstdcc++-devel BuildRequires: zlib zlib-devel cups cups-devel libpng libpng-devel Buildrequires: openssl openssl-devel -Requires: gcc-c++-runtime +Requires: libstdcc++ Requires: zlib %package cups @@ -80,9 +80,9 @@ - Own /usr/share/fonts/default. * Tue May 11 2004 Omar Kilani -- Add BuildRequires: libjpeg libjpeg-devel libtiff libtiff-devel gcc-c++-devel +- Add BuildRequires: libjpeg libjpeg-devel libtiff libtiff-devel libstdcc++-devel - Add BuildRequires: zlib zlib-devel cups cups-devel libpng libpng-devel. -- Add Requires: gcc-c++-runtime +- Add Requires: libstdcc++ - Add Requires: zlib - Add BuildRequires: openssl, openssl-devel. Modified: tinysofa/releases/1.1/glib/current/specs/glib.spec =================================================================== --- tinysofa/releases/1.1/glib/current/specs/glib.spec 2004-07-01 15:44:33 UTC (rev 2712) +++ tinysofa/releases/1.1/glib/current/specs/glib.spec 2004-07-01 15:44:44 UTC (rev 2713) @@ -7,7 +7,7 @@ Source: ftp://ftp.gtk.org/pub/gtk/v2.4/glib-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-root URL: http://www.gtk.org -BuildRequires: pkgconfig gettext gcc-c++-devel +BuildRequires: pkgconfig gettext libstdcc++-devel %description GLib is a handy library of utility functions. This C library is Modified: tinysofa/releases/1.1/groff/current/specs/groff.spec =================================================================== --- tinysofa/releases/1.1/groff/current/specs/groff.spec 2004-07-01 15:44:33 UTC (rev 2712) +++ tinysofa/releases/1.1/groff/current/specs/groff.spec 2004-07-01 15:44:44 UTC (rev 2713) @@ -7,9 +7,9 @@ Source0: ftp://ftp.gnu.org/gnu/groff/groff-%{version}.tar.gz Source1: troff-to-ps.fpi Source2: nroff -Requires: mktemp gcc-c++-runtime +Requires: mktemp libstdcc++ Requires: /usr/bin/iconv -BuildRequires: byacc gcc-c++-devel +BuildRequires: byacc libstdcc++-devel BuildRoot: %{_tmppath}/%{name}-%{version}-root Provides: nroff-i18n Obsoletes: groff-tools Modified: tinysofa/releases/1.1/lftp/current/specs/lftp.spec =================================================================== --- tinysofa/releases/1.1/lftp/current/specs/lftp.spec 2004-07-01 15:44:33 UTC (rev 2712) +++ tinysofa/releases/1.1/lftp/current/specs/lftp.spec 2004-07-01 15:44:44 UTC (rev 2713) @@ -9,10 +9,10 @@ URL: http://lftp.yar.ru/ BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRequires: ncurses-devel, openssl-devel, pkgconfig, readline-devel -BuildRequires: gcc-c++-devel +BuildRequires: libstdcc++-devel BuildRequires: libtool -Requires: gcc-c++-runtime openssl ncurses readline +Requires: libstdcc++ openssl ncurses readline %description LFTP is a sophisticated ftp/http file transfer program. Like bash, it has job Modified: tinysofa/releases/1.1/libtool/current/specs/libtool.spec =================================================================== --- tinysofa/releases/1.1/libtool/current/specs/libtool.spec 2004-07-01 15:44:33 UTC (rev 2712) +++ tinysofa/releases/1.1/libtool/current/specs/libtool.spec 2004-07-01 15:44:44 UTC (rev 2713) @@ -7,7 +7,7 @@ Source: ftp://alpha.gnu.org/gnu/libtool-%{version}.tar.gz Prefix: %{_prefix} PreReq: htmlinfo -BuildRequires: texinfo gcc-c++-devel +BuildRequires: texinfo libstdcc++-devel BuildRoot: %{_tmppath}/%{name}-root %description Modified: tinysofa/releases/1.1/libxml2/current/specs/libxml2.spec =================================================================== --- tinysofa/releases/1.1/libxml2/current/specs/libxml2.spec 2004-07-01 15:44:33 UTC (rev 2712) +++ tinysofa/releases/1.1/libxml2/current/specs/libxml2.spec 2004-07-01 15:44:44 UTC (rev 2713) @@ -6,7 +6,7 @@ Group: tinysofa official Source: ftp://xmlsoft.org/libxml2-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-root -BuildRequires: python python-devel libtool gcc-c++-devel +BuildRequires: python python-devel libtool libstdcc++-devel URL: http://xmlsoft.org/ %description @@ -144,7 +144,7 @@ - New upstream. * Tue May 11 2004 Omar Kilani 2.6.7-4ts -- Add BuildRequires: gcc-c++-devel +- Add BuildRequires: libstdcc++-devel - Fix permissions. * Tue Feb 24 2004 Erlend Midttun 2.6.7-1tr Modified: tinysofa/releases/1.1/mysql/current/specs/mysql.spec =================================================================== --- tinysofa/releases/1.1/mysql/current/specs/mysql.spec 2004-07-01 15:44:33 UTC (rev 2712) +++ tinysofa/releases/1.1/mysql/current/specs/mysql.spec 2004-07-01 15:44:44 UTC (rev 2713) @@ -12,7 +12,7 @@ URL: http://www.mysql.com/ Provides: msqlormysql MySQL-server BuildRoot: %{_tmppath}/%{name}-root -BuildRequires: bison, texinfo, python, gcc-c++-devel, zlib-devel +BuildRequires: bison, texinfo, python, libstdcc++-devel, zlib-devel BuildREquires: db4-devel, libtermcap-devel, openssl-devel, ncurses-devel Requires: mysql-shared mysql-libs Prereq: /bin/hostname /bin/sleep /sbin/chkconfig /sbin/restart_maybe htmlinfo Modified: tinysofa/releases/1.1/netatalk/current/specs/netatalk.spec =================================================================== --- tinysofa/releases/1.1/netatalk/current/specs/netatalk.spec 2004-07-01 15:44:33 UTC (rev 2712) +++ tinysofa/releases/1.1/netatalk/current/specs/netatalk.spec 2004-07-01 15:44:44 UTC (rev 2713) @@ -16,7 +16,7 @@ %service_requires Requires: pam >= 0.56, /etc/pam.d/system-auth, tcp_wrappers, openssl, cracklib BuildRequires: cracklib openssl-devel pam quota libtool automake autoconf -BuildRequires: gcc-c++-devel db4-devel kerberos5-devel libcom_err-devel +BuildRequires: libstdcc++-devel db4-devel kerberos5-devel libcom_err-devel BuildRequires: perl BuildRoot: %{_tmppath}/%{name}-%{version}-root Modified: tinysofa/releases/1.1/openssl/current/specs/openssl.spec =================================================================== --- tinysofa/releases/1.1/openssl/current/specs/openssl.spec 2004-07-01 15:44:33 UTC (rev 2712) +++ tinysofa/releases/1.1/openssl/current/specs/openssl.spec 2004-07-01 15:44:44 UTC (rev 2713) @@ -47,8 +47,8 @@ %package python Summary: Support for using OpenSSL in python scripts. Group: tinysofa official -Requires: python, openssl = %{version}, gcc-c++-runtime -BuildRequires: gcc-c++-devel +Requires: python, openssl = %{version}, libstdcc++ +BuildRequires: libstdcc++-devel %description python This package allows you to call OpenSSL functions from python scripts. Modified: tinysofa/releases/1.1/pam_krb5/current/specs/pam_krb5.spec =================================================================== --- tinysofa/releases/1.1/pam_krb5/current/specs/pam_krb5.spec 2004-07-01 15:44:33 UTC (rev 2712) +++ tinysofa/releases/1.1/pam_krb5/current/specs/pam_krb5.spec 2004-07-01 15:44:44 UTC (rev 2713) @@ -6,7 +6,7 @@ License: LGPL Group: tinysofa official BuildPrereq: byacc, flex, kerberos5-devel, kerberosafs-devel, pam-devel -BuildRequires: gcc-c++-devel kerberos5 kerberosafs libcom_err-devel +BuildRequires: libstdcc++-devel kerberos5 kerberosafs libcom_err-devel BuildRoot: %{_tmppath}/%{name}-root Requires: kerberosafs >= 1.0 @@ -54,7 +54,7 @@ - current (2.0.10-2ts) integrated as 2.0.10-3ts for release 1.0-U1 * Wed May 12 2004 Omar Kilani -- Add BuildRequires: gcc-c++-devel kerberos5 kerberosafs libcom_err-devel +- Add BuildRequires: libstdcc++-devel kerberos5 kerberosafs libcom_err-devel * Wed Apr 07 2004 Omar Kilani - 2.0.10-2ts - Tinysofa Modified: tinysofa/releases/1.1/parted/current/specs/parted.spec =================================================================== --- tinysofa/releases/1.1/parted/current/specs/parted.spec 2004-07-01 15:44:33 UTC (rev 2712) +++ tinysofa/releases/1.1/parted/current/specs/parted.spec 2004-07-01 15:44:44 UTC (rev 2713) @@ -9,7 +9,7 @@ Patch0: parted-1.4.24-python2.3.patch BuildRequires: e2fsprogs-devel libcom_err-devel libtermcap-devel readline-devel BuildRequires: python python-devel autoconf libtool automake gettext -BuildRequires: gcc-c++-devel +BuildRequires: libstdcc++-devel %description The GNU Parted program allows you to create, destroy, resize, move, Modified: tinysofa/releases/1.1/pcre/current/specs/pcre.spec =================================================================== --- tinysofa/releases/1.1/pcre/current/specs/pcre.spec 2004-07-01 15:44:33 UTC (rev 2712) +++ tinysofa/releases/1.1/pcre/current/specs/pcre.spec 2004-07-01 15:44:44 UTC (rev 2713) @@ -9,7 +9,7 @@ Group: tinysofa official Prefix: %{_prefix} BuildRoot: %{_tmppath}/%{name}-root -BuildRequires: autoconf automake libtool gcc-c++-devel +BuildRequires: autoconf automake libtool libstdcc++-devel %description Perl-compatible regular expression library. Modified: tinysofa/releases/1.1/psmisc/current/specs/psmisc.spec =================================================================== --- tinysofa/releases/1.1/psmisc/current/specs/psmisc.spec 2004-07-01 15:44:33 UTC (rev 2712) +++ tinysofa/releases/1.1/psmisc/current/specs/psmisc.spec 2004-07-01 15:44:44 UTC (rev 2713) @@ -8,7 +8,7 @@ BuildRoot: %{_tmppath}/%{name}-root Requires: ncurses libtermcap -BuildRequires: gcc-c++-devel ncurses-devel libtermcap-devel +BuildRequires: libstdcc++-devel ncurses-devel libtermcap-devel %description The psmisc package contains utilities for managing processes on your Modified: tinysofa/releases/1.1/rpm/current/specs/rpm.spec =================================================================== --- tinysofa/releases/1.1/rpm/current/specs/rpm.spec 2004-07-01 15:44:33 UTC (rev 2712) +++ tinysofa/releases/1.1/rpm/current/specs/rpm.spec 2004-07-01 15:44:44 UTC (rev 2713) @@ -44,7 +44,7 @@ BuildRequires: beecrypt-devel >= 3.0.0 Requires: beecrypt >= 3.0.0 -BuildRequires: gcc-c++-devel +BuildRequires: libstdcc++-devel # XXX Red Hat 5.2 has not bzip2 or python %if %{with_bzip2} Modified: tinysofa/releases/1.1/shadow-utils/current/specs/shadow-utils.spec =================================================================== --- tinysofa/releases/1.1/shadow-utils/current/specs/shadow-utils.spec 2004-07-01 15:44:33 UTC (rev 2712) +++ tinysofa/releases/1.1/shadow-utils/current/specs/shadow-utils.spec 2004-07-01 15:44:44 UTC (rev 2713) @@ -28,7 +28,7 @@ License: BSD Group: tinysofa official BuildPrereq: autoconf, automake, libtool -BuildRequires: gettext gcc-c++-devel +BuildRequires: gettext libstdcc++-devel BuildRoot: %{_tmppath}/%{name}-root Obsoletes: adduser Modified: tinysofa/releases/1.1/telnet/current/specs/telnet.spec =================================================================== --- tinysofa/releases/1.1/telnet/current/specs/telnet.spec 2004-07-01 15:44:33 UTC (rev 2712) +++ tinysofa/releases/1.1/telnet/current/specs/telnet.spec 2004-07-01 15:44:44 UTC (rev 2713) @@ -9,7 +9,7 @@ Source1: telnet-client.tar.gz Patch1: telnet-0.10-escapechar.patch BuildRoot: %{_tmppath}/%{name}-root -BuildRequires: gcc-c++-devel ncurses-devel libtermcap-devel +BuildRequires: libstdcc++-devel ncurses-devel libtermcap-devel %description Telnet is a popular protocol for logging into remote systems over the From svn at tinysofa.org Thu Jul 1 15:52:53 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:52:53 +1000 (EST) Subject: [tinysofa-svn] r2815 - in tinysofa/snapshot/pciutils/current: sources specs Message-ID: <20040701155253.9A3584E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:52:53 +1000 (Fri, 02 Jul 2004) New Revision: 2815 Added: tinysofa/snapshot/pciutils/current/sources/pciutils-2.1.10-scan.patch tinysofa/snapshot/pciutils/current/sources/pciutils-2.1.99-test3.tar.bz2 tinysofa/snapshot/pciutils/current/sources/pciutils-havepread.patch tinysofa/snapshot/pciutils/current/sources/pciutils-pciids.patch tinysofa/snapshot/pciutils/current/sources/pciutils-strip.patch Removed: tinysofa/snapshot/pciutils/current/sources/pciutils-2.1.11.tar.gz tinysofa/snapshot/pciutils/current/sources/pciutils-bufsiz.patch tinysofa/snapshot/pciutils/current/sources/pciutils-hwdata.patch Modified: tinysofa/snapshot/pciutils/current/specs/pciutils.spec Log: - Sync with 2.0. - Added: - pciutils-2.1.10-scan.patch: - pciutils-2.1.99-test3.tar.bz2: - pciutils-havepread.patch: - pciutils-pciids.patch: - pciutils-strip.patch: - Removed: - pciutils-2.1.11.tar.gz: - pciutils-bufsiz.patch: - pciutils-hwdata.patch: Added: tinysofa/snapshot/pciutils/current/sources/pciutils-2.1.10-scan.patch =================================================================== --- tinysofa/snapshot/pciutils/current/sources/pciutils-2.1.10-scan.patch 2004-07-01 15:52:50 UTC (rev 2814) +++ tinysofa/snapshot/pciutils/current/sources/pciutils-2.1.10-scan.patch 2004-07-01 15:52:53 UTC (rev 2815) @@ -0,0 +1,12 @@ +--- pciutils-2.1.10/lib/access.c.foo Wed Feb 12 15:44:05 2003 ++++ pciutils-2.1.10/lib/access.c Wed Feb 12 15:44:33 2003 +@@ -180,7 +180,8 @@ + void + pci_scan_bus(struct pci_access *a) + { +- a->methods->scan(a); ++ if (a->methods) ++ a->methods->scan(a); + } + + struct pci_dev * Deleted: tinysofa/snapshot/pciutils/current/sources/pciutils-2.1.11.tar.gz =================================================================== (Binary files differ) Added: tinysofa/snapshot/pciutils/current/sources/pciutils-2.1.99-test3.tar.bz2 =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/pciutils/current/sources/pciutils-2.1.99-test3.tar.bz2 ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: tinysofa/snapshot/pciutils/current/sources/pciutils-bufsiz.patch =================================================================== --- tinysofa/snapshot/pciutils/current/sources/pciutils-bufsiz.patch 2004-07-01 15:52:50 UTC (rev 2814) +++ tinysofa/snapshot/pciutils/current/sources/pciutils-bufsiz.patch 2004-07-01 15:52:53 UTC (rev 2815) @@ -1,11 +0,0 @@ ---- pciutils-2.1.3/lib/proc.c.foo Thu Jan 20 16:19:27 2000 -+++ pciutils-2.1.3/lib/proc.c Thu Jan 20 16:19:43 2000 -@@ -179,7 +179,7 @@ - - if (a->cached_dev != d || a->fd_rw < rw) - { -- char buf[256]; -+ char buf[512]; - if (a->fd >= 0) - close(a->fd); - if (snprintf(buf, sizeof(buf), "%s/%02x/%02x.%d", a->method_params[PCI_ACCESS_PROC_BUS_PCI], Added: tinysofa/snapshot/pciutils/current/sources/pciutils-havepread.patch =================================================================== --- tinysofa/snapshot/pciutils/current/sources/pciutils-havepread.patch 2004-07-01 15:52:50 UTC (rev 2814) +++ tinysofa/snapshot/pciutils/current/sources/pciutils-havepread.patch 2004-07-01 15:52:53 UTC (rev 2815) @@ -0,0 +1,63 @@ +--- pciutils-2.1.99-test3/lib/pread.h.pread 2004-02-25 01:51:55.369843832 -0500 ++++ pciutils-2.1.99-test3/lib/pread.h 2004-02-25 01:52:01.405065807 -0500 +@@ -6,60 +6,6 @@ + * Can be freely distributed and used under the terms of the GNU GPL. + */ + +-/* +- * We'd like to use pread/pwrite for configuration space accesses, but +- * unfortunately it isn't simple at all since all libc's until glibc 2.1 +- * don't define it. +- */ +- +-#if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ > 0 +-/* glibc 2.1 or newer -> pread/pwrite supported automatically */ +- +-#elif defined(i386) && defined(__GLIBC__) +-/* glibc 2.0 on i386 -> call syscalls directly */ +-#include +-#include +-#ifndef SYS_pread +-#define SYS_pread 180 +-#endif +-static int pread(unsigned int fd, void *buf, size_t size, loff_t where) +-{ return syscall(SYS_pread, fd, buf, size, where); } +-#ifndef SYS_pwrite +-#define SYS_pwrite 181 +-#endif +-static int pwrite(unsigned int fd, void *buf, size_t size, loff_t where) +-{ return syscall(SYS_pwrite, fd, buf, size, where); } +- +-#elif defined(i386) +-/* old libc on i386 -> call syscalls directly the old way */ +-#include +-static _syscall5(int, pread, unsigned int, fd, void *, buf, size_t, size, u32, where_lo, u32, where_hi); +-static _syscall5(int, pwrite, unsigned int, fd, void *, buf, size_t, size, u32, where_lo, u32, where_hi); +-static int do_read(struct pci_dev *d UNUSED, int fd, void *buf, size_t size, int where) { return pread(fd, buf, size, where, 0); } +-static int do_write(struct pci_dev *d UNUSED, int fd, void *buf, size_t size, int where) { return pwrite(fd, buf, size, where, 0); } +-#define HAVE_DO_READ +- +-#else +-/* In all other cases we use lseek/read/write instead to be safe */ +-#define make_rw_glue(op) \ +- static int do_##op(struct pci_dev *d, int fd, void *buf, size_t size, int where) \ +- { \ +- struct pci_access *a = d->access; \ +- int r; \ +- if (a->fd_pos != where && lseek(fd, where, SEEK_SET) < 0) \ +- return -1; \ +- r = op(fd, buf, size); \ +- if (r < 0) \ +- a->fd_pos = -1; \ +- else \ +- a->fd_pos = where + r; \ +- return r; \ +- } +-make_rw_glue(read) +-make_rw_glue(write) +-#define HAVE_DO_READ +-#endif +- + #ifndef HAVE_DO_READ + #define do_read(d,f,b,l,p) pread(f,b,l,p) + #define do_write(d,f,b,l,p) pwrite(f,b,l,p) Deleted: tinysofa/snapshot/pciutils/current/sources/pciutils-hwdata.patch =================================================================== --- tinysofa/snapshot/pciutils/current/sources/pciutils-hwdata.patch 2004-07-01 15:52:50 UTC (rev 2814) +++ tinysofa/snapshot/pciutils/current/sources/pciutils-hwdata.patch 2004-07-01 15:52:53 UTC (rev 2815) @@ -1,11 +0,0 @@ -diff -urN pciutils-2.1.11/lib/configure pciutils-2.1.11.hwdata/lib/configure ---- pciutils-2.1.11/lib/configure 2003-01-04 23:29:23.000000000 +1100 -+++ pciutils-2.1.11.hwdata/lib/configure 2004-04-13 16:43:52.000000000 +1000 -@@ -80,6 +80,6 @@ - if [ -z "$ok" ] ; then - echo "WARNING: No real configuration access method is available." - fi --echo >>$c "#define PATH_PCI_IDS \"$sharedir/pci.ids\"" -+echo >>$c "#define PATH_PCI_IDS \"$sharedir/hwdata/pci.ids\"" - echo >>$c "#define PCILIB_VERSION \"$version\"" - sed '/^#define [^ ]*$/!d;s/^#define \(.*\)/\1=1/' <$c >config.mk Added: tinysofa/snapshot/pciutils/current/sources/pciutils-pciids.patch =================================================================== --- tinysofa/snapshot/pciutils/current/sources/pciutils-pciids.patch 2004-07-01 15:52:50 UTC (rev 2814) +++ tinysofa/snapshot/pciutils/current/sources/pciutils-pciids.patch 2004-07-01 15:52:53 UTC (rev 2815) @@ -0,0 +1,30 @@ +--- pciutils-2.1.99-test3/lib/configure.pciids 2003-12-27 13:34:03.000000000 -0500 ++++ pciutils-2.1.99-test3/lib/configure 2004-02-25 01:48:34.524727735 -0500 +@@ -98,6 +98,6 @@ + if [ -z "$ok" ] ; then + echo "WARNING: No real configuration access method is available." + fi +-echo >>$c "#define PATH_PCI_IDS \"$sharedir/pci.ids\"" ++echo >>$c "#define PATH_PCI_IDS \"$sharedir/hwdata/pci.ids\"" + echo >>$c "#define PCILIB_VERSION \"$version\"" + sed '/^#define [^ ]*$/!d;s/^#define \(.*\)/\1=1/' <$c >config.mk +--- pciutils-2.1.99-test3/lspci.man.pciids 2003-12-27 17:13:47.000000000 -0500 ++++ pciutils-2.1.99-test3/lspci.man 2004-02-25 01:49:09.187261705 -0500 +@@ -72,7 +72,7 @@ + Use + .B + +-as PCI ID database instead of @SHAREDIR@/pci.ids. ++as PCI ID database instead of @SHAREDIR@/hwdata/pci.ids. + .TP + .B -p + Use +@@ -128,7 +128,7 @@ + + .SH FILES + .TP +-.B @SHAREDIR@/pci.ids ++.B @SHAREDIR@/hwdata/pci.ids + A list of all known PCI ID's (vendors, devices, classes and subclasses). + .TP + .B /proc/bus/pci Added: tinysofa/snapshot/pciutils/current/sources/pciutils-strip.patch =================================================================== --- tinysofa/snapshot/pciutils/current/sources/pciutils-strip.patch 2004-07-01 15:52:50 UTC (rev 2814) +++ tinysofa/snapshot/pciutils/current/sources/pciutils-strip.patch 2004-07-01 15:52:53 UTC (rev 2815) @@ -0,0 +1,20 @@ +--- pciutils-2.1.99-test3/Makefile.strip 2004-02-25 01:46:14.315787866 -0500 ++++ pciutils-2.1.99-test3/Makefile 2004-02-25 01:47:45.478046260 -0500 +@@ -1,7 +1,7 @@ + # Makefile for The PCI Utilities + # (c) 1998--2003 Martin Mares + +-OPT=-O2 -fomit-frame-pointer ++OPT=-O2 + CFLAGS=$(OPT) -Wall -W -Wno-parentheses -Wstrict-prototypes -Wmissing-prototypes -Winline + + VERSION=2.1.99-test3 +@@ -32,7 +32,7 @@ + all: $(PCILIB) lspci setpci lspci.8 setpci.8 update-pciids update-pciids.8 pci.ids + + $(PCILIB): $(PCIINC) force +- $(MAKE) -C lib all ++ CFLAGS="$(CFLAGS) -fPIC" $(MAKE) -C lib all + + force: + Modified: tinysofa/snapshot/pciutils/current/specs/pciutils.spec =================================================================== --- tinysofa/snapshot/pciutils/current/specs/pciutils.spec 2004-07-01 15:52:50 UTC (rev 2814) +++ tinysofa/snapshot/pciutils/current/specs/pciutils.spec 2004-07-01 15:52:53 UTC (rev 2815) @@ -1,118 +1,245 @@ -Name: pciutils -Version: 2.1.11 -Release: 14ts -Source: ftp://ftp.kernel.org/pub/software/utils/pciutils/pciutils-%{version}.tar.gz -Patch: pciutils-bufsiz.patch -Patch1: pciutils-hwdata.patch -License: GPL -BuildRoot: %{_tmppath}/%{name}-root -ExclusiveOS: Linux -ExcludeArch: armv4l -Summary: Linux PCI utilities. -Group: tinysofa official -Requires: hwdata +Name: pciutils +Version: 2.1.99.test3 +Release: 2ts +Source: ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/alpha/%{name}-2.1.99-test3.tar.bz2 +Patch0: pciutils-strip.patch +Patch1: pciutils-pciids.patch +Patch2: pciutils-2.1.10-scan.patch +Patch3: pciutils-havepread.patch +License: GPL +Buildroot: %{_tmppath}/%{name}-%{version}-root +ExclusiveOS: Linux +Requires: kernel >= 2.2 hwdata +Summary: PCI bus related utilities. +Group: Applications/System +%ifarch i386 +BuildRequires: dietlibc +%endif %description -This package contains various utilities for inspecting and setting -devices connected to the PCI bus. The utilities provided require -kernel version 2.1.82 or newer (supporting the /proc/bus/pci -interface). +The pciutils package contains various utilities for inspecting and +setting devices connected to the PCI bus. The utilities provided +require kernel version 2.1.82 or newer (which support the +/proc/bus/pci interface). %package devel Summary: Linux PCI development library. -Group: tinysofa official +Group: Development/Libraries %description devel This package contains a library for inspecting and setting devices connected to the PCI bus. %prep -%setup -q -%patch -p1 -%patch1 -p1 +%setup -q -n pciutils-2.1.99-test3 +%patch0 -p1 -b .strip +%patch1 -p1 -b .pciids +%patch2 -p1 -b .scan +%patch3 -p1 -b .pread %build -export RPM_OPT_FLAGS="`echo $RPM_OPT_FLAGS | sed -e 's/-D_FILE_OFFSET_BITS=64//' |\ - sed -e 's/-D_LARGE_FILES=1//' |\ - sed -e 's/-D_LARGEFILE64_SOURCE=1//'` %{?no_stack_protector}" -make OPT="$RPM_OPT_FLAGS" PREFIX=/usr +%ifarch i386 +make OPT="$RPM_OPT_FLAGS -D_GNU_SOURCE=1" CC="diet gcc" PREFIX="/usr" +mv lib/libpci.a lib/libpci_loader_a +make clean +%endif +make OPT="$RPM_OPT_FLAGS -D_GNU_SOURCE=1" PREFIX="/usr" + %install -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT/{sbin,/usr/share/man/man8,/usr/lib,/usr/include/pci} +rm -rf $RPM_BUILD_ROOT +install -d $RPM_BUILD_ROOT/{sbin,%{_mandir}/man8,%{_libdir},%{_includedir}/pci} install -s lspci setpci $RPM_BUILD_ROOT/sbin -install lspci.8 setpci.8 $RPM_BUILD_ROOT/usr/share/man/man8 -install pci.ids $RPM_BUILD_ROOT/usr/share -install lib/libpci.a $RPM_BUILD_ROOT/usr/lib -install lib/pci.h $RPM_BUILD_ROOT/usr/include/pci -install lib/header.h $RPM_BUILD_ROOT/usr/include/pci -install lib/config.h $RPM_BUILD_ROOT/usr/include/pci +install lspci.8 setpci.8 $RPM_BUILD_ROOT%{_mandir}/man8 +install lib/libpci.a $RPM_BUILD_ROOT%{_libdir} +install lib/pci.h $RPM_BUILD_ROOT%{_includedir}/pci +install lib/header.h $RPM_BUILD_ROOT%{_includedir}/pci +install lib/config.h $RPM_BUILD_ROOT%{_includedir}/pci +%ifarch i386 +install lib/libpci_loader_a $RPM_BUILD_ROOT%{_libdir}/libpci_loader.a +%endif + %files -%defattr(-, root, root) -%attr(0644, root, root) /usr/share/man/man8/* +%defattr(0644, root, root, 0755) +%{_mandir}/man8/* %attr(0755, root, root) /sbin/* -%attr(0644, root, root) %config /usr/share/pci.ids %doc README ChangeLog pciutils.lsm %files devel -%defattr(-, root, root) -%attr(644,root,root) /usr/lib/libpci.a -/usr/include/pci +%defattr(0644, root, root, 0755) +%{_libdir}/libpci.a +%ifarch i386 +%{_libdir}/libpci_loader.a +%endif +%{_includedir}/pci %clean -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT +rm -rf $RPM_BUILD_ROOT %changelog -* Wed May 19 2004 tsintegrate 2.1.11-14ts -- current (2.1.11-14jh) integrated as 2.1.11-14ts for release 1.0-U1 +* Tue Jun 15 2004 Elliot Lee +- rebuilt -* Mon May 10 2004 Jaakko Heinonen 2.1.11-14jh -- fixed library permissions +* Tue Mar 02 2004 Elliot Lee +- rebuilt -* Tue Apr 13 2004 Omar Kilani 2.1.11-13ts -- Reorder patches. -- Add a dependency on hwdata, use it's pci.ids file since duplication is -- Rather stupid. +* Fri Feb 13 2004 Elliot Lee +- rebuilt -* Tue Feb 17 2004 Chr. Toldnes 2.1.11-9tr -- Build without stack protection (darn anaconda!) +* Mon Dec 8 2003 Bill Nottingham 2.1.11-4 +- fix paths for pci.ids, etc. (#111665) -* Wed Dec 17 2003 Erlend Midttun 2.1.11-8tr -- New opt flags. +* Tue Nov 25 2003 Bill Nottingham 2.1.11-3 +- remove a few calls to ->error() in the sysfs code -* Wed Dec 3 2003 Erlend Midttun 2.1.11-7tr -- Big rebuild +* Fri Nov 21 2003 Jeremy Katz 2.1.11-2 +- build a diet libpci_loader.a on i386 +- always assume pread exists, it does with diet and all vaguely recent glibc -* Wed Jun 18 2003 Erlend Midttun 2.1.11-6tr -- Big rebuild +* Fri Nov 21 2003 Bill Nottingham 2.1.11-1 +- update to 2.1.11 +- add patch for sysfs & pci domains support () -* Tue Jun 16 2003 Erlend Midttun 2.1.11-5em -- Fixed %defattr. +* Wed Jun 04 2003 Elliot Lee +- rebuilt -* Thu Jun 5 2003 Erlend Midttun 2.1.11-4em -- Try to make lspci use the correct pci.ids. +* Wed Feb 12 2003 Bill Nottingham +- don't segfault when there's no pci bus (#84146) -* Tue May 27 2003 Erlend Midttun 2.1.11-3em -- No longer PreReq, have correct %defatr instead. +* Wed Jan 22 2003 Tim Powers +- rebuilt -* Fri May 2 2003 Chr. H. Toldnes 2.1.11-2ct -- PreReq setup +* Thu Dec 05 2002 Elliot Lee 2.1.10-5 +- Add patch4 for ppc64. The basic rule seems to be that on any platform +where it is possible to be running a 64-bit kernel, we need to always +print out 64-bit addresses. -* Fri May 2 2003 Chr. H. Toldnes 2.1.11-1ct -- New upstram version -- Removed Dependency on kernel +* Mon Nov 4 2002 Bill Nottingham 2.1.10-4 +- fix dir perms on /usr/include/pci -* Mon Mar 24 2003 Erlend Midttun 2.1.8-4em -- Rebuilt against glibc 2.3.2. +* Tue Oct 15 2002 Bill Nottingham 2.1.10-3 +- use %%{_libdir} +- own /usr/include/pci +- build library with -fPIC -* Thu Sep 14 2000 Per Ivar Paulsen -- Picked up 2.1.8. Removed no-kernel patch. +* Thu Jul 8 2002 Bill Nottingham 2.1.10-2 +- don't build with -fomit-frame-pointer -* Wed Mar 29 2000 Lars Gaarden -- Moved man pages to /usr/share, FHS. +* Mon Jun 24 2002 Bill Nottingham 2.1.10-1 +- update to 2.1.10 +* Fri Jun 21 2002 Tim Powers +- automated rebuild + +* Mon Jun 17 2002 Bill Nottingham 2.1.9-4 +- don't forcibly strip binaries + +* Thu May 23 2002 Tim Powers +- automated rebuild + +* Fri Feb 22 2002 Bill Nottingham +- rebuild + +* Wed Jan 30 2002 Bill Nottingham +- require hwdata now that pci.ids is there + +* Wed Jan 09 2002 Tim Powers +- automated rebuild + +* Sun Dec 30 2001 Florian La Roche +- man page is now owned by root + +* Wed Oct 17 2001 Bill Nottingham +- dump all the patches, ship pci.ids direct out of sourceforge CVS + +* Wed Sep 26 2001 Bill Nottingham +- broadcom bcm5820 id (#53592) + +* Fri Aug 10 2001 Bill Nottingham +- more ids + +* Tue Jul 17 2001 Bill Nottingham +- add newline in printf in PCI-X patch (#49277) + +* Mon Jul 9 2001 Bill Nottingham +- update broadcom patch +- add new ids from 2.4.6 + +* Mon May 28 2001 Bill Nottingham +- add a couple of e1000 ids + +* Thu Mar 22 2001 Bill Nottingham +- another megaraid id + +* Wed Mar 21 2001 Bill Nottingham +- another megaraid id + +* Wed Mar 14 2001 Preston Brown +- LSI SCSI PCI id + +* Wed Feb 21 2001 Nalin Dahyabhai +- fix formatting problems + +* Wed Feb 21 2001 Preston Brown +- add IBM ServeRAID entries + +* Tue Feb 20 2001 Preston Brown +- i860 entries. + +* Mon Feb 19 2001 Helge Deller +- added various pci ids + +* Fri Feb 2 2001 Bill Nottingham +- fix mishap in fixing mishap + +* Thu Feb 1 2001 Bill Nottingham +- fix apparent mishap in pci.ids update from kernel (#25520) + +* Tue Jan 23 2001 Bill Nottingham +- pci.ids updates + +* Tue Dec 12 2000 Bill Nottingham +- big pile of pci.ids updates + +* Tue Jul 25 2000 Nalin Dahyabhai +- clean up patches to not generate badly-formatted files + +* Tue Jul 25 2000 Preston Brown +- Vortex fixes laroche originally applied on kudzu moved here. + +* Fri Jul 14 2000 Preston Brown +- pci ids for i815, new ati hardware + +* Wed Jul 12 2000 Prospector +- automatic rebuild + +* Tue Jul 11 2000 Bill Nottingham +- yet more IDs +- PCI-X support from Matt Domsch + +* Fri Jul 7 2000 Bill Nottingham +- some more QLogic ids + +* Mon Jun 26 2000 Bill Nottingham +- more IDs from Dell + +* Sat Jun 10 2000 Bill Nottingham +- update to 2.1.8 + +* Fri Apr 21 2000 Bill Nottingham +- update to 2.1.7 + +* Mon Apr 17 2000 Bill Nottingham +- update to 2.1.6 + +* Fri Mar 3 2000 Bill Nottingham +- add a couple of ids + +* Mon Feb 14 2000 Bill Nottingham +- update to 2.1.5 + * Thu Feb 3 2000 Bill Nottingham - handle compressed man pages @@ -139,4 +266,4 @@ - auto rebuild in the new build environment (release 2) * Thu Feb 4 1999 Bill Nottingham -- initial build \ No newline at end of file +- initial build From svn at tinysofa.org Thu Jul 1 15:52:55 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:52:55 +1000 (EST) Subject: [tinysofa-svn] r2816 - in tinysofa/snapshot/pcre/current: sources specs Message-ID: <20040701155255.D61584E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:52:55 +1000 (Fri, 02 Jul 2004) New Revision: 2816 Added: tinysofa/snapshot/pcre/current/sources/pcre-3.9-libtool.patch Removed: tinysofa/snapshot/pcre/current/sources/pcre-4.5-libtool.patch Modified: tinysofa/snapshot/pcre/current/specs/pcre.spec Log: - Sync with 2.0. - Kept: - pcre-4.5.tar.bz2: - Added: - pcre-3.9-libtool.patch: - Removed: - pcre-4.5-libtool.patch: Added: tinysofa/snapshot/pcre/current/sources/pcre-3.9-libtool.patch =================================================================== --- tinysofa/snapshot/pcre/current/sources/pcre-3.9-libtool.patch 2004-07-01 15:52:53 UTC (rev 2815) +++ tinysofa/snapshot/pcre/current/sources/pcre-3.9-libtool.patch 2004-07-01 15:52:55 UTC (rev 2816) @@ -0,0 +1,11 @@ +--- pcre-3.9/configure.orig 2002-09-18 18:52:48.000000000 -0400 ++++ pcre-3.9/configure 2002-09-18 18:53:20.000000000 -0400 +@@ -3083,7 +3083,7 @@ + # This must be Linux ELF. + linux-gnu*) + case $host_cpu in +- alpha* | i*86 | powerpc* | sparc* | ia64* ) ++ alpha* | i*86 | powerpc* | sparc* | ia64* | s390* | x86_64* ) + lt_cv_deplibs_check_method=pass_all ;; + *) + # glibc up to 2.1.1 does not perform some relocations on ARM Deleted: tinysofa/snapshot/pcre/current/sources/pcre-4.5-libtool.patch =================================================================== --- tinysofa/snapshot/pcre/current/sources/pcre-4.5-libtool.patch 2004-07-01 15:52:53 UTC (rev 2815) +++ tinysofa/snapshot/pcre/current/sources/pcre-4.5-libtool.patch 2004-07-01 15:52:55 UTC (rev 2816) @@ -1,11 +0,0 @@ ---- pcre-3.9/configure.orig 2002-09-18 18:52:48.000000000 -0400 -+++ pcre-3.9/configure 2002-09-18 18:53:20.000000000 -0400 -@@ -3083,7 +3083,7 @@ - # This must be Linux ELF. - linux-gnu*) - case $host_cpu in -- alpha* | i*86 | powerpc* | sparc* | ia64* ) -+ alpha* | i*86 | powerpc* | sparc* | ia64* | s390* | x86_64* ) - lt_cv_deplibs_check_method=pass_all ;; - *) - # glibc up to 2.1.1 does not perform some relocations on ARM Modified: tinysofa/snapshot/pcre/current/specs/pcre.spec =================================================================== --- tinysofa/snapshot/pcre/current/specs/pcre.spec 2004-07-01 15:52:53 UTC (rev 2815) +++ tinysofa/snapshot/pcre/current/specs/pcre.spec 2004-07-01 15:52:55 UTC (rev 2816) @@ -1,15 +1,16 @@ Name: pcre Version: 4.5 -Release: 3ts +Release: 2ts Summary: Perl-compatible regular expression library URL: http://www.pcre.org/ -Source: ftp://ftp.csx.cam.ac.uk/pub/software/programming/%{name}/%{name}-%{version}.tar.bz2 -Patch: pcre-4.5-libtool.patch -License: GPL -Group: tinysofa official +Source: ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/%{name}-%{version}.tar.bz2 +Patch: pcre-3.9-libtool.patch +License: distributable +Group: System Environment/Libraries Prefix: %{_prefix} -BuildRoot: %{_tmppath}/%{name}-root -BuildRequires: autoconf automake libtool gcc-c++-devel +BuildRoot: %{_tmppath}/%{name}-%{version}-root +Prereq: /sbin/ldconfig +BuildPrereq: sed %description Perl-compatible regular expression library. @@ -21,7 +22,7 @@ %package devel Summary: Development files for %{name} -Group: tinysofa official +Group: Development/Libraries Requires: %{name} = %{version}-%{release} %description devel @@ -31,17 +32,18 @@ %setup -q %patch -p1 -b .libtool +%{__libtoolize} --force +%{__aclocal} --force +%{__autoconf} --force + +%configure --includedir=%{_includedir}/%{name} --enable-utf8 + %build -libtoolize --force -aclocal --force -autoconf -f - -%configure --includedir=%{_includedir}/%{name} make +%install +rm -rf $RPM_BUILD_ROOT -%install -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != "/" ] && rm -rf "$RPM_BUILD_ROOT" make install DESTDIR=$RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/%{_lib} @@ -49,81 +51,87 @@ pushd $RPM_BUILD_ROOT%{_libdir} ln -fs ../../%{_lib}/libpcre.so.0 libpcre.so popd +rm -f $RPM_BUILD_ROOT%{_libdir}/*.la %post -p /sbin/ldconfig %postun -p /sbin/ldconfig +%clean +rm -rf $RPM_BUILD_ROOT + %files %defattr(-,root,root) -/%{_lib}/libpcre.so.* -%{_libdir}/libpcreposix.so.* +/%{_lib}/*.so.* +%{_libdir}/*.so.* %{_mandir}/man1/* %{_bindir}/pcregrep %{_bindir}/pcretest %files devel %defattr(-,root,root) -%{_libdir}/libpcre.so -%{_libdir}/libpcre.la -%{_libdir}/libpcre.a -%{_libdir}/libpcreposix.so -%{_libdir}/libpcreposix.la -%{_libdir}/libpcreposix.a -%{_includedir}/%{name} +%{_libdir}/*.so +%{_libdir}/*.a +%dir %{_includedir}/%{name} +%{_includedir}/%{name}/* %{_mandir}/man3/* %{_bindir}/pcre-config -%clean -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT - %changelog -* Mon May 24 2004 tsintegrate 4.5-3ts -- current (4.5-3ok) integrated as 4.5-3ts for release 1.0-U1 +* Tue Mar 23 2004 Than Ngo 4.5-2 +- add the correct pcre license, #118781 -* Sun May 23 2004 Omar Kilani 4.5-3ok -- Move libpcre to %{_lib}, link from /usr/lib. -- Add libtool patch. +* Fri Mar 12 2004 Than Ngo 4.5-1 +- update to 4.5 -* Wed May 19 2004 tsintegrate 4.5-2ts -- current (4.5-2ok) integrated as 4.5-2ts for release 1.0-U1 +* Tue Mar 02 2004 Elliot Lee +- rebuilt -* Tue May 18 2004 Omar Kilani 4.5-2ok -- BuildRequires gcc-c++-devel. +* Fri Feb 13 2004 Elliot Lee +- rebuilt -* Thu May 13 2004 Omar Kilani -- Made pcreposix explicit so that we catch it if it doesn't build. -- Rebuild libtool / autoconf / aclocal to get pcreposix. +* Fri Sep 26 2003 Harald Hoyer 4.4-1 +- 4.4 -* Wed Apr 07 2004 Omar Kilani 4.5-1ts -- New upstream. +* Wed Jun 04 2003 Elliot Lee +- rebuilt -* Wed Nov 26 2003 Erlend Midttun 4.4-1tr -- New upstream +* Wed May 7 2003 Than Ngo 4.2-1 +- update to 4.2 -* Wed Jun 18 2003 Erlend Midttun 4.3-2tr -- Big rebuild +* Wed Jan 22 2003 Tim Powers +- rebuilt -* Thu May 29 2003 Erlend Midttun 4.3-1em -- New upstream +* Tue Jan 21 2003 Than Ngo 3.9-9 +- build with utf8, bug #81504 -* Thu May 15 2003 Tore Olsen 3.9-5to -- moved libs back to /usr/lib, our grep does not use pcre (ref change below) -- added pcretest -- fixed Group (again!) +* Fri Nov 22 2002 Elliot Lee 3.9-8 +- Really remove .la files -* Mon Mar 24 2003 Erlend Midttun 3.9-4em -- Rebuilt against glibc 2.3.2. +* Fri Oct 11 2002 Than Ngo 3.9-7 +- remove .la -* Sat Feb 01 2003 Tor Hveem 3.9-3th -- fixed package Group +* Thu Oct 10 2002 Than Ngo 3.9-7 +- Typo bug -* Mon Dec 9 2002 Erlend Midttun 3.9-2em -- Fixed package group. +* Wed Oct 9 2002 Than Ngo 3.9-6 +- Added missing so symlink -* Sun Jun 09 2002 Goetz Bock 3.9-1bg -- rebuilded for Trustix +* Thu Sep 19 2002 Than Ngo 3.9-5.1 +- Fixed to build s390/s390x/x86_64 +* Wed Jun 27 2002 Bernhard Rosenkraenzer 3.9-5 +- Fix #65009 + +* Fri Jun 21 2002 Tim Powers +- automated rebuild + +* Thu May 23 2002 Tim Powers +- automated rebuild + +* Mon Mar 4 2002 Bernhard Rosenkraenzer 3.9-2 +- rebuild + * Fri Jan 11 2002 Bernhard Rosenkraenzer 3.9-1 - Update to 3.9 From svn at tinysofa.org Thu Jul 1 15:53:09 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:53:09 +1000 (EST) Subject: [tinysofa-svn] r2818 - in tinysofa/snapshot/pkgconfig/current: sources specs Message-ID: <20040701155309.BB88D4E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:53:09 +1000 (Fri, 02 Jul 2004) New Revision: 2818 Added: tinysofa/snapshot/pkgconfig/current/sources/glib-2.4.2.tar.bz2 tinysofa/snapshot/pkgconfig/current/sources/pkgconfig-0.14.0-datadir.patch tinysofa/snapshot/pkgconfig/current/sources/pkgconfig-0.14.0-lib64.patch tinysofa/snapshot/pkgconfig/current/sources/pkgconfig-0.15.0-quote.patch tinysofa/snapshot/pkgconfig/current/sources/pkgconfig-0.15.0-use-glib2.patch Modified: tinysofa/snapshot/pkgconfig/current/specs/pkgconfig.spec Log: - Sync with 2.0. - Kept: - pkgconfig-0.15.0.tar.gz: - Added: - glib-2.4.2.tar.bz2: - pkgconfig-0.14.0-datadir.patch: - pkgconfig-0.14.0-lib64.patch: - pkgconfig-0.15.0-quote.patch: - pkgconfig-0.15.0-use-glib2.patch: Added: tinysofa/snapshot/pkgconfig/current/sources/glib-2.4.2.tar.bz2 =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/pkgconfig/current/sources/glib-2.4.2.tar.bz2 ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/pkgconfig/current/sources/pkgconfig-0.14.0-datadir.patch =================================================================== --- tinysofa/snapshot/pkgconfig/current/sources/pkgconfig-0.14.0-datadir.patch 2004-07-01 15:53:05 UTC (rev 2817) +++ tinysofa/snapshot/pkgconfig/current/sources/pkgconfig-0.14.0-datadir.patch 2004-07-01 15:53:09 UTC (rev 2818) @@ -0,0 +1,21 @@ +--- pkgconfig-0.14.0/Makefile.am.datadir 2002-09-23 16:38:34.000000000 -0400 ++++ pkgconfig-0.14.0/Makefile.am 2003-10-23 17:25:53.000000000 -0400 +@@ -15,7 +15,7 @@ + + bin_PROGRAMS = pkg-config + +-INCLUDES=-DPKGLIBDIR="\"$(pkglibdir)\"" $(included_glib_includes) ++INCLUDES=-DPKGLIBDIR="\"$(pkglibdir)\"" -DPKGDATADIR="\"$(pkgdatadir)\"" $(included_glib_includes) + + pkg_config_SOURCES= \ + pkg.h \ +--- pkgconfig-0.14.0/pkg.c.datadir 2003-10-23 17:24:54.000000000 -0400 ++++ pkgconfig-0.14.0/pkg.c 2003-10-23 17:24:54.000000000 -0400 +@@ -198,6 +198,7 @@ + + g_slist_foreach (search_dirs, (GFunc)scan_dir, NULL); + scan_dir (pkglibdir); ++ scan_dir (PKGDATADIR); + } + } + Added: tinysofa/snapshot/pkgconfig/current/sources/pkgconfig-0.14.0-lib64.patch =================================================================== --- tinysofa/snapshot/pkgconfig/current/sources/pkgconfig-0.14.0-lib64.patch 2004-07-01 15:53:05 UTC (rev 2817) +++ tinysofa/snapshot/pkgconfig/current/sources/pkgconfig-0.14.0-lib64.patch 2004-07-01 15:53:09 UTC (rev 2818) @@ -0,0 +1,52 @@ +--- pkgconfig-0.14.0/configure.in 2002-10-10 17:17:08.000000000 -0400 ++++ pkgconfig-0.14.0/configure.in 2003-02-10 21:47:52.000000000 -0500 +@@ -20,6 +20,11 @@ + + AM_CONDITIONAL(USE_INSTALLED_GLIB, test x$native_win32 = xyes) + ++case "$libdir" in ++*lib64) AC_DEFINE(PREFER_LIB64,1,[Define if your native architecture defines libdir to be $prefix/lib64 instead of $prefix/lib.]) ;; ++*) : ;; ++esac ++ + if test x$native_win32 = xyes; then + # On Win32, use the normal installed GLib. Yes, this is a circular + # dependency. But then, only experienced hackers that presumably can +--- pkgconfig-0.14.0/pkg.c 2002-10-10 17:14:59.000000000 -0400 ++++ pkgconfig-0.14.0/pkg.c 2003-02-10 21:42:24.000000000 -0500 +@@ -842,25 +842,31 @@ + g_slist_foreach (system_directories, (GFunc) g_free, NULL); + g_slist_free (system_directories); + ++#ifdef PREFER_LIB64 ++ #define system_libs "/usr/lib64" ++#else ++ #define system_libs "/usr/lib" ++#endif + count = 0; + iter = pkg->L_libs; + while (iter != NULL) + { +- if (strcmp (iter->data, "-L/usr/lib") == 0 || +- strcmp (iter->data, "-L /usr/lib") == 0) ++ if (strcmp (iter->data, "-L" system_libs) == 0 || ++ strcmp (iter->data, "-L " system_libs) == 0) + { +- debug_spew ("Package %s has -L/usr/lib in Libs\n", ++ debug_spew ("Package %s has -L" system_libs " in Libs\n", + pkg->name); + if (g_getenv ("PKG_CONFIG_ALLOW_SYSTEM_LIBS") == NULL) + { + iter->data = NULL; + ++count; +- debug_spew ("Removing -L/usr/lib from libs for %s\n", pkg->key); ++ debug_spew ("Removing -L" system_libs " from libs for %s\n", pkg->key); + } + } + + iter = iter->next; + } ++#undef system_libs + + while (count) + { Added: tinysofa/snapshot/pkgconfig/current/sources/pkgconfig-0.15.0-quote.patch =================================================================== --- tinysofa/snapshot/pkgconfig/current/sources/pkgconfig-0.15.0-quote.patch 2004-07-01 15:53:05 UTC (rev 2817) +++ tinysofa/snapshot/pkgconfig/current/sources/pkgconfig-0.15.0-quote.patch 2004-07-01 15:53:09 UTC (rev 2818) @@ -0,0 +1,11 @@ +--- pkgconfig-0.15.0/pkg.m4.quote 2004-06-23 14:36:04.000000000 -0400 ++++ pkgconfig-0.15.0/pkg.m4 2004-06-23 14:36:16.000000000 -0400 +@@ -2,7 +2,7 @@ + dnl PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not) + dnl defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page + dnl also defines GSTUFF_PKG_ERRORS on error +-AC_DEFUN(PKG_CHECK_MODULES, [ ++AC_DEFUN([PKG_CHECK_MODULES], [ + succeeded=no + + if test -z "$PKG_CONFIG"; then Added: tinysofa/snapshot/pkgconfig/current/sources/pkgconfig-0.15.0-use-glib2.patch =================================================================== --- tinysofa/snapshot/pkgconfig/current/sources/pkgconfig-0.15.0-use-glib2.patch 2004-07-01 15:53:05 UTC (rev 2817) +++ tinysofa/snapshot/pkgconfig/current/sources/pkgconfig-0.15.0-use-glib2.patch 2004-07-01 15:53:09 UTC (rev 2818) @@ -0,0 +1,39 @@ +diff -urN pkgconfig-0.15.0/configure.in pkgconfig-0.15.0.use-glib2/configure.in +--- pkgconfig-0.15.0/configure.in 2004-06-22 15:10:41.501320960 +1000 ++++ pkgconfig-0.15.0.use-glib2/configure.in 2004-06-22 15:11:23.304965840 +1000 +@@ -45,7 +45,7 @@ + + AC_CONFIG_AUX_DIR(.) + else +- AC_CONFIG_SUBDIRS(glib-1.2.8) ++ AC_CONFIG_SUBDIRS(glib-2.4.2) + fi # !native_win32 + + AC_FUNC_ALLOCA +diff -urN pkgconfig-0.15.0/Makefile.am pkgconfig-0.15.0.use-glib2/Makefile.am +--- pkgconfig-0.15.0/Makefile.am 2004-06-22 15:10:41.505320352 +1000 ++++ pkgconfig-0.15.0.use-glib2/Makefile.am 2004-06-22 15:13:48.593878568 +1000 +@@ -2,9 +2,9 @@ + included_glib_includes = @GLIB_CFLAGS@ + pkg_config_LDADD=@GLIB_LIBS@ + else +-SUBDIRS = glib-1.2.8 +-included_glib_includes = -I./glib-1.2.8 +-pkg_config_LDADD=glib-1.2.8/libglib.la ++ ++included_glib_includes = -I./glib-2.4.2 ++pkg_config_LDADD=glib-2.4.2/glib/libglib-2.0.la + endif + + m4dir = $(datadir)/aclocal +diff -urN pkgconfig-0.15.0/partial-glib.h pkgconfig-0.15.0.use-glib2/partial-glib.h +--- pkgconfig-0.15.0/partial-glib.h 2001-06-06 02:39:09.000000000 +1000 ++++ pkgconfig-0.15.0.use-glib2/partial-glib.h 2004-06-22 15:14:21.211919872 +1000 +@@ -1,6 +1,6 @@ + #ifndef PKG_CONFIG_PARTIAL_GLIB_H + #define PKG_CONFIG_PARTIAL_GLIB_H + +-#include "glib-1.2.8/glib.h" ++#include "glib-2.4.2/glib/glib.h" + + #endif Modified: tinysofa/snapshot/pkgconfig/current/specs/pkgconfig.spec =================================================================== --- tinysofa/snapshot/pkgconfig/current/specs/pkgconfig.spec 2004-07-01 15:53:05 UTC (rev 2817) +++ tinysofa/snapshot/pkgconfig/current/specs/pkgconfig.spec 2004-07-01 15:53:09 UTC (rev 2818) @@ -1,11 +1,20 @@ Summary: A tool for determining compilation options. Name: pkgconfig Version: 0.15.0 -Release: 5ts +Release: 3ts +Epoch: 1 License: GPL -Group: tinysofa official +Group: Development/Tools Source: http://www.freedesktop.org/software/pkgconfig/releases/%{name}-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-root +Source1: glib-2.4.2.tar.bz2 +BuildPrereq: autoconf automake +# http://x2.freedesktop.org/cgi-bin/bugzilla/show_bug.cgi?id=125 +Patch1: pkgconfig-0.14.0-lib64.patch +# http://x2.freedesktop.org/cgi-bin/bugzilla/show_bug.cgi?id=119 +Patch2: pkgconfig-0.14.0-datadir.patch +Patch3: pkgconfig-0.15.0-use-glib2.patch +Patch4: pkgconfig-0.15.0-quote.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-root %description The pkgconfig tool determines compilation options. For each required @@ -14,20 +23,36 @@ %prep %setup -q +%patch1 -p1 -b .lib64 +%patch2 -p1 -b .datadir +%patch3 -p1 -b .use-glib2 +%patch4 -p1 -b .quote +tar jxvf %{SOURCE1} + %build -CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%{_prefix} +%{__libtoolize} --force +%{__aclocal} --force +%{__autoheader} --force +%{__autoconf} --force +%{__automake} --add --copy --force + +%configure +pushd glib-2.4.2 +make %{?_smp_mflags} +popd + make %install -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != "/" ] && rm -rf "$RPM_BUILD_ROOT" -make prefix=$RPM_BUILD_ROOT%{_prefix} \ - mandir=$RPM_BUILD_ROOT%{_mandir} install -mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/pkgconfig -strip $RPM_BUILD_ROOT%{_prefix}/bin/* +rm -rf $RPM_BUILD_ROOT +%makeinstall +mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig +strip $RPM_BUILD_ROOT%{_bindir}/* + %clean -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT +rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) @@ -37,17 +62,80 @@ %{_datadir}/aclocal/* %changelog -* Wed May 19 2004 tsintegrate 0.15.0-5ts -- current (0.15.0-4ts) integrated as 0.15.0-5ts for release 1.0-U1 +* Tue Mar 02 2004 Elliot Lee +- rebuilt -* Wed Dec 3 2003 Erlend Midttun 0.15.0-1tr -- New upstream. +* Tue Feb 24 2004 Mark McLoughlin +- Update to 0.15.0 +- Fix datadir patch conflict -* Wed Jun 18 2003 Erlend Midttun 0.13.0-3tr -- Big rebuild +* Fri Feb 13 2004 Elliot Lee +- rebuilt -* Mon Mar 24 2003 Erlend Midttun 0.13.0-2em -- Rebuilt against glibc 2.3.2. +* Thu Oct 23 2003 Owen Taylor 1:0.14.0-6 +- Make pkgconfig look in /usr/share/pkgconfig as well by default (#98595) -* Fri Sep 20 2002 Gerald Dachs 0.13.0-1gd -- new for TSL +* Thu Jun 26 2003 Havoc Pennington 1:0.14.0-5 +- rebuild + +* Wed Jun 04 2003 Elliot Lee +- rebuilt + +* Mon Feb 10 2003 Nalin Dahyabhai +- suppress /usr/lib64 (instead of /usr/lib) from LIBS by default on multilib + arches where the default is to use lib64 + +* Wed Jan 22 2003 Tim Powers +- rebuilt + +* Fri Nov 8 2002 Havoc Pennington +- 0.14 + +* Tue Oct 8 2002 Havoc Pennington +- use libdir, so we do move .pc files to /usr/lib64 + +* Tue Oct 8 2002 Havoc Pennington +- use prefix/lib not libdir, so we don't move .pc files to /usr/lib64 + +* Fri Jun 21 2002 Tim Powers +- automated rebuild + +* Thu May 23 2002 Tim Powers +- automated rebuild + +* Thu Mar 7 2002 Havoc Pennington +- 0.12.0 + +* Thu Feb 7 2002 Havoc Pennington +- 0.11.0 + +* Sun Feb 3 2002 Havoc Pennington +- backbuild in gnomehide + +* Sun Feb 3 2002 Havoc Pennington +- 0.10.0 + +* Sun Feb 3 2002 Havoc Pennington +- 0.9.0 + +* Wed Jan 09 2002 Tim Powers +- automated rebuild + +* Wed Jun 13 2001 Florian La Roche +- call libtoolize to make porting to new archs easier + +* Thu Jun 07 2001 Havoc Pennington +- put pkg.m4 in file list + +* Wed Jun 06 2001 Havoc Pennington +- Upgrade to 0.7 +- add man page + +* Wed Jan 03 2001 Havoc Pennington +- Upgrade to 0.5 + +* Thu Dec 14 2000 Bill Nottingham +- rebuild because of broken fileutils + +* Wed Oct 04 2000 Owen Taylor +- Initial package From svn at tinysofa.org Thu Jul 1 15:41:47 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:41:47 +1000 (EST) Subject: [tinysofa-svn] r2674 - in tinysofa/snapshot: . tinysofa-rpm-config tinysofa-rpm-config/current tinysofa-rpm-config/current/sources tinysofa-rpm-config/current/specs Message-ID: <20040701154147.A2D204E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:41:47 +1000 (Fri, 02 Jul 2004) New Revision: 2674 Added: tinysofa/snapshot/tinysofa-rpm-config/ tinysofa/snapshot/tinysofa-rpm-config/current/ tinysofa/snapshot/tinysofa-rpm-config/current/sources/ tinysofa/snapshot/tinysofa-rpm-config/current/sources/tinysofa-rpm-config-8.0.28.tar.bz2 tinysofa/snapshot/tinysofa-rpm-config/current/specs/ tinysofa/snapshot/tinysofa-rpm-config/current/specs/tinysofa-rpm-config.spec Log: - Add tinysofa-rpm-config to snapshot from 2.0. Added: tinysofa/snapshot/tinysofa-rpm-config/current/sources/tinysofa-rpm-config-8.0.28.tar.bz2 =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/tinysofa-rpm-config/current/sources/tinysofa-rpm-config-8.0.28.tar.bz2 ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/tinysofa-rpm-config/current/specs/tinysofa-rpm-config.spec =================================================================== --- tinysofa/snapshot/tinysofa-rpm-config/current/specs/tinysofa-rpm-config.spec 2004-07-01 15:41:46 UTC (rev 2673) +++ tinysofa/snapshot/tinysofa-rpm-config/current/specs/tinysofa-rpm-config.spec 2004-07-01 15:41:47 UTC (rev 2674) @@ -0,0 +1,160 @@ +Summary: tinysofa specific rpm configuration files. +Name: tinysofa-rpm-config +Version: 8.0.28 +Release: 2ts +License: GPL +Group: Development/System +Source: tinysofa-rpm-config-%{version}.tar.bz2 +BuildArch: noarch +BuildRoot: %{_tmppath}/%{name}-%{version}-root +Provides: redhat-rpm-config +Obsoletes: redhat-rpm-config + +%description +tinysofa specific rpm configuration files. + +%prep + +%install +rm -rf %{buildroot} +mkdir -p ${RPM_BUILD_ROOT}%{_prefix}/lib/rpm +( cd ${RPM_BUILD_ROOT}%{_prefix}/lib/rpm; tar jxf %{SOURCE0}; mv %{name}-%{version} tinysofa; rm -f tinysofa/*.spec ) + +# fix perms of config.{guess,sub} +chmod a+x ${RPM_BUILD_ROOT}%{_prefix}/lib/rpm/tinysofa/config.{guess,sub} + +%clean +rm -rf %{buildroot} + +%files +%defattr(-,root,root) +%{_prefix}/lib/rpm/tinysofa + +%changelog +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Wed Sep 17 2003 Elliot Lee 8.0.28-1 +- Change brp-compress to pass -n flag to gzip (per msw's request) + +* Tue Jul 15 2003 Elliot Lee 8.0.27-1 +- Fix broken configure macro find for config.guess/config.sub +- Put host/target/build back for now + +* Mon Jul 7 2003 Jens Petersen - 8.0.26-1 +- preserve the vendor field when VENDOR not set +- put VENDOR in the final i386-libc line, not the tentative one + +* Mon Jul 7 2003 Jens Petersen - 8.0.25-1 +- update config.{guess,sub} to 2003-06-17 +- define VENDOR to be redhat only when /etc/redhat-release present + [suggested by jbj] +- put VENDOR in vendor field in our config.guess file for + ia64, ppc, ppc64, s390, s390x, x86_64 and elf32-i386 Linux +- drop the --host, --build, --target and --program-prefix configure options + from %%configure, since this causes far too many problems + +* Fri May 2 2003 Jens Petersen - 8.0.24-3 +- make config.{guess,sub} executable + +* Thu May 1 2003 Jens Petersen - 8.0.22-2 +- add config.guess and config.sub (2003-02-22) with s390 patch on config.sub +- make %%configure use them + +* Mon Mar 03 2003 Elliot Lee +- Unset $DISPLAY in macros + +* Mon Feb 24 2003 Elliot Lee 8.0.21-1 +- Just turn on -g unconditionally for now + +* Thu Feb 13 2003 Elliot Lee 8.0.20-1 +- Reorganize rpmrc/macros to set cflags in a nicer manner. + +* Wed Jan 22 2003 Elliot Lee 8.0.19-1 +- Disable brp-implant-ident-static until it works everywhere + +* Thu Jan 16 2003 Nalin Dahyabhai 8.0.18-1 +- add brp-implant-ident-static, which requires mktemp + +* Thu Jan 9 2003 Bill Nottingham 8.0.17-1 +- add brp-strip-static-archive from rpm-4.2-0.54 + +* Tue Dec 17 2002 Bill Nottingham 8.0.16-1 +- make -g in rpmrc conditional on debug_package + +* Mon Dec 16 2002 Elliot Lee 8.0.15-1 +- Rename -debug subpackages to -debuginfo + +* Sat Dec 14 2002 Tim Powers 8.0.14-1 +- tweak debug package stuff so that we are overloading %%install + instead of %%post + +* Sat Dec 14 2002 Tim Powers 8.0.13-1 +- turn on internal rpm dep generation by default + +* Fri Dec 13 2002 Elliot Lee 8.0.12-1 +- New release with debug packages on + +* Tue Dec 3 2002 Bill Nottingham 8.0.8-1 +- turn debug packages off +- override optflags with no -g + +* Fri Nov 22 2002 Elliot Lee 8.0.7-1 +- turn on debug packages + +* Thu Nov 21 2002 Elliot Lee 8.0.6-1 +- Pass __strip and __objdump macros + +* Thu Nov 21 2002 Elliot Lee 8.0.5-1 +- Update macros to specify find-provides/find-requires + +* Thu Oct 31 2002 Elliot Lee 8.0.4-1 +- Remove tracking dependency + +* Wed Oct 16 2002 Phil Knirsch 8.0.3-2 +- Added fix for outdated config.[sub|guess] files in %configure section + +* Wed Oct 16 2002 Elliot Lee 8.0.3-1 +- New release that blows up on unpackaged files and missing doc files. + +* Thu Oct 3 2002 Jeremy Katz 8.0.2 +- don't redefine everything in macros, just what we need to + +* Mon Sep 16 2002 Alexander Larsson 8.0.1 +- Add debug package support to %__spec_install_post + +* Tue Sep 3 2002 Bill Nottingham 8.0-1 +- bump version + +* Wed Aug 28 2002 Elliot Lee 7.3.94-1 +- Update macrofiles + +* Wed Jul 31 2002 Elliot Lee 7.3.93-1 +- Add _unpackaged_files_terminate_build and +_missing_doc_files_terminate_build to macros + +* Thu Jul 11 2002 Elliot Lee 7.3.92-6 +- find-lang.sh fix from 67368 +- find-requires fix from 67325 + +* Thu Jul 11 2002 Elliot Lee 7.3.92-5 +- Add /etc/rpm/macros back to make #67951 go away + +* Wed Jun 26 2002 Jens Petersen 7.3.92-4 +- fix %%configure targeting for autoconf-2.5x (#58468) +- include ~/.rpmmacros in macrofiles file path again + +* Fri Jun 21 2002 Tim Powers 7.3.92-3 +- automated rebuild + +* Fri Jun 21 2002 Elliot Lee 7.3.92-2 +- Don't define _arch + +* Thu Jun 20 2002 Elliot Lee 7.3.92-1 +- find-lang error detection from Havoc + +* Wed Jun 12 2002 Elliot Lee 7.3.91-1 +- Update + +* Sun Jun 9 2002 Jeff Johnson +- create. From svn at tinysofa.org Thu Jul 1 15:41:52 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:41:52 +1000 (EST) Subject: [tinysofa-svn] r2676 - in tinysofa/snapshot: . tk tk/current tk/current/sources tk/current/specs Message-ID: <20040701154152.3729A4E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:41:51 +1000 (Fri, 02 Jul 2004) New Revision: 2676 Added: tinysofa/snapshot/tk/ tinysofa/snapshot/tk/current/ tinysofa/snapshot/tk/current/sources/ tinysofa/snapshot/tk/current/sources/tk-8.3.5-tclm4-soname.patch tinysofa/snapshot/tk/current/sources/tk-8.4.4-lib-perm.patch tinysofa/snapshot/tk/current/sources/tk-8.4.5-autoconf.patch tinysofa/snapshot/tk/current/sources/tk-8.4.5-no_rpath.patch tinysofa/snapshot/tk/current/sources/tk-8.4.5-pkgIndex-loc.patch tinysofa/snapshot/tk/current/sources/tk8.4.6-src.tar.gz tinysofa/snapshot/tk/current/specs/ tinysofa/snapshot/tk/current/specs/tk.spec Log: - Add tk to snapshot from 2.0. Added: tinysofa/snapshot/tk/current/sources/tk-8.3.5-tclm4-soname.patch =================================================================== --- tinysofa/snapshot/tk/current/sources/tk-8.3.5-tclm4-soname.patch 2004-07-01 15:41:49 UTC (rev 2675) +++ tinysofa/snapshot/tk/current/sources/tk-8.3.5-tclm4-soname.patch 2004-07-01 15:41:51 UTC (rev 2676) @@ -0,0 +1,12 @@ +diff -u tk8.3.5/unix/tcl.m4~ tk8.3.5/unix/tcl.m4 +--- tk8.3.5/unix/tcl.m4~ 2003-01-14 21:22:12.000000000 +0900 ++++ tk8.3.5/unix/tcl.m4 2003-01-14 21:22:12.000000000 +0900 +@@ -949,7 +949,7 @@ + CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES" + + if test "$have_dl" = yes; then +- SHLIB_LD="${CC} -shared" ++ SHLIB_LD='${CC} -shared -Wl,-soname,${@}' + DL_OBJS="tclLoadDl.o" + DL_LIBS="-ldl" + LDFLAGS="-rdynamic" Added: tinysofa/snapshot/tk/current/sources/tk-8.4.4-lib-perm.patch =================================================================== --- tinysofa/snapshot/tk/current/sources/tk-8.4.4-lib-perm.patch 2004-07-01 15:41:49 UTC (rev 2675) +++ tinysofa/snapshot/tk/current/sources/tk-8.4.4-lib-perm.patch 2004-07-01 15:41:51 UTC (rev 2676) @@ -0,0 +1,12 @@ +diff -u tk8.4.4/unix/Makefile.in~ tk8.4.4/unix/Makefile.in +--- tk8.4.4/unix/Makefile.in~ 2003-11-25 16:51:37.000000000 +0900 ++++ tk8.4.4/unix/Makefile.in 2003-11-25 16:51:37.000000000 +0900 +@@ -531,7 +531,7 @@ + fi + @echo "Installing $(LIB_FILE) to $(LIB_INSTALL_DIR)/" + @@INSTALL_LIB@ +- @chmod 555 $(LIB_INSTALL_DIR)/$(LIB_FILE) ++ @chmod 755 $(LIB_INSTALL_DIR)/$(LIB_FILE) + @echo "Installing wish as $(BIN_INSTALL_DIR)/wish$(VERSION)" + @$(INSTALL_PROGRAM) wish $(BIN_INSTALL_DIR)/wish$(VERSION) + @echo "Installing tkConfig.sh to $(LIB_INSTALL_DIR)/" Added: tinysofa/snapshot/tk/current/sources/tk-8.4.5-autoconf.patch =================================================================== --- tinysofa/snapshot/tk/current/sources/tk-8.4.5-autoconf.patch 2004-07-01 15:41:49 UTC (rev 2675) +++ tinysofa/snapshot/tk/current/sources/tk-8.4.5-autoconf.patch 2004-07-01 15:41:51 UTC (rev 2676) @@ -0,0 +1,31 @@ +Gives the compatibility to use autoconf-2.52 or higher... :) + +--- tk8.4.5/unix/tcl.m4 2004-02-25 02:39:04.000000000 +0100 ++++ tk8.4.5/unix/tcl.m4.autoconf 2004-02-25 02:40:54.000000000 +0100 +@@ -899,7 +899,7 @@ + + # AIX v<=4.1 has some different flags than 4.2+ + if test "$system" = "AIX-4.1" -o "`uname -v`" -lt "4" ; then +- LIBOBJS="$LIBOBJS tclLoadAix.o" ++ AC_LIBOBJ(tclLoadAix) + DL_LIBS="-lld" + fi + +@@ -1147,7 +1147,7 @@ + # is kind of overkill but it works. + # Disable inlining only when one of the + # files in compat/*.c is being linked in. +- if test x"${LIBOBJS}" != x ; then ++ if test x"${LIB@&t at OBJS}" != x ; then + EXTRA_CFLAGS="${EXTRA_CFLAGS} -fno-inline" + fi + +@@ -2261,7 +2261,7 @@ + AC_MSG_RESULT(ok) + else + AC_MSG_RESULT(buggy) +- LIBOBJS="$LIBOBJS fixstrtod.o" ++ AC_LIBOBJ(fixstrtod) + AC_DEFINE(strtod, fixstrtod) + fi + fi Added: tinysofa/snapshot/tk/current/sources/tk-8.4.5-no_rpath.patch =================================================================== --- tinysofa/snapshot/tk/current/sources/tk-8.4.5-no_rpath.patch 2004-07-01 15:41:49 UTC (rev 2675) +++ tinysofa/snapshot/tk/current/sources/tk-8.4.5-no_rpath.patch 2004-07-01 15:41:51 UTC (rev 2676) @@ -0,0 +1,11 @@ +--- tk8.4.5/unix/tcl.m4.no_rpath 2003-12-01 14:50:28.000000000 +0100 ++++ tk8.4.5/unix/tcl.m4 2003-12-01 14:50:31.000000000 +0100 +@@ -1125,7 +1125,7 @@ + DL_OBJS="tclLoadDl.o" + DL_LIBS="-ldl" + LDFLAGS="-rdynamic" +- CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}' ++ CC_SEARCH_FLAGS='' + LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS} + else + AC_CHECK_HEADER(dld.h, [ Added: tinysofa/snapshot/tk/current/sources/tk-8.4.5-pkgIndex-loc.patch =================================================================== --- tinysofa/snapshot/tk/current/sources/tk-8.4.5-pkgIndex-loc.patch 2004-07-01 15:41:49 UTC (rev 2675) +++ tinysofa/snapshot/tk/current/sources/tk-8.4.5-pkgIndex-loc.patch 2004-07-01 15:41:51 UTC (rev 2676) @@ -0,0 +1,21 @@ +diff -u tk8.4.5/unix/Makefile.in~ tk8.4.5/unix/Makefile.in +--- tk8.4.5/unix/Makefile.in~ 2004-03-09 17:57:18.000000000 +0900 ++++ tk8.4.5/unix/Makefile.in 2004-03-09 17:57:18.000000000 +0900 +@@ -96,7 +96,7 @@ + TK_SHARED_BUILD = @TK_SHARED_BUILD@ + + # Directory in which to install the pkgIndex.tcl file for loadable Tk +-PKG_INSTALL_DIR = $(LIB_INSTALL_DIR)/tk$(VERSION)$(TK_DBGX) ++PKG_INSTALL_DIR = $(SCRIPT_INSTALL_DIR)$(TK_DBGX) + + # Package index file for loadable Tk + PKG_INDEX = $(PKG_INSTALL_DIR)/pkgIndex.tcl +@@ -527,7 +527,7 @@ + echo "if {[package vcompare [package provide Tcl]\ + $(TCLVERSION)] != 0} { return }";\ + echo "package ifneeded Tk $(VERSION)\ +- [list load [file join \$$dir .. $(TK_LIB_FILE)] Tk]";\ ++ [list load [file join $(LIB_RUNTIME_DIR) $(TK_LIB_FILE)] Tk]";\ + ) > $(PKG_INDEX); \ + fi + @echo "Installing $(LIB_FILE) to $(LIB_INSTALL_DIR)/" Added: tinysofa/snapshot/tk/current/sources/tk8.4.6-src.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/tk/current/sources/tk8.4.6-src.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/tk/current/specs/tk.spec =================================================================== --- tinysofa/snapshot/tk/current/specs/tk.spec 2004-07-01 15:41:49 UTC (rev 2675) +++ tinysofa/snapshot/tk/current/specs/tk.spec 2004-07-01 15:41:51 UTC (rev 2676) @@ -0,0 +1,359 @@ +%define majorver 8.4 + +Summary: Tk graphical toolkit for the Tcl scripting language +Name: tk +Version: %{majorver}.6 +Release: 3ts +License: BSD +Group: Development/Languages +URL: http://tcl.sourceforge.net/ +Source0: http://prdownloads.sourceforge.net/tcl/%{name}%{version}-src.tar.gz +BuildRoot: %{_tmppath}/%{name}-%{version}-root +Requires: tcl = %{version} +Requires(post,postun): /sbin/ldconfig +BuildRequires: tcl-devel = %{version}, autoconf +BuildRequires: XFree86-devel, perl +# panedwindow.n from itcl conflicts +Obsoletes: itcl <= 3.2 +Patch1: tk-8.3.5-tclm4-soname.patch +Patch2: tk-8.4.4-lib-perm.patch +Patch3: tk-8.4.5-no_rpath.patch +Patch4: tk-8.4.5-autoconf.patch +Patch5: tk-8.4.5-pkgIndex-loc.patch + +%description +When paired with the Tcl scripting language, Tk provides a fast and powerful +way to create cross-platform GUI applications. + +%package devel +Version: %{version} +Summary: Tk graphical toolkit development files +Group: Development/Languages +URL: http://tcl.sourceforge.net/ +Requires: %{name} = %{version}-%{release}, XFree86-devel + +%description devel +When paired with the Tcl scripting language, Tk provides a fast and powerful +way to create cross-platform GUI applications. + +The package contains the development files and man pages for tk. + +%prep +%setup -n %{name}%{version} -q + +# define DT SONAME in shared lib +%patch1 -p1 -b .soname +%patch2 -p1 -b .rolib +%patch3 -p1 -b .no_rpath +%patch4 -p1 -b .ac213 +%patch5 -p1 -b .pkgIdx + +# patch1 touches tcl.m4 +cd unix +autoconf + +%build +TOPDIR=$PWD +cd unix +%configure +make %{?_smp_mflags} TK_LIBRARY=%{_datadir}/%{name}%{majorver} + +# do not run "make test" by default since it requires an X display +%{?_with_check: %define _with_check 1} +%{!?_with_check: %define _with_check 0} + +%if %{_with_check} + make test +%endif + +%install +rm -rf $RPM_BUILD_ROOT +make install -C unix INSTALL_ROOT=%{buildroot} TK_LIBRARY=%{_datadir}/%{name}%{majorver} + +ln -s wish%{majorver} %{buildroot}%{_bindir}/wish + +# for linking with -l%{name} +ln -s lib%{name}%{majorver}.so %{buildroot}%{_libdir}/lib%{name}.so + +mkdir -p %buildroot/%{_includedir}/%{name}-private/{generic,unix} +find generic unix -name "*.h" -exec cp -p '{}' %buildroot/%{_includedir}/%{name}-private/'{}' ';' +( cd %buildroot/%{_includedir} + for i in *.h ; do + [ -f %buildroot/%{_includedir}/%{name}-private/generic/$i ] && ln -sf ../../$i %buildroot/%{_includedir}/%{name}-private/generic ; + done +) + +# remove buildroot traces +perl -pi -e "s|$PWD/unix|%{_libdir}|; s|$PWD|%{_includedir}/%{name}-private|" %buildroot/%{_libdir}/%{name}Config.sh + +%clean +rm -rf $RPM_BUILD_ROOT + +%post +/sbin/ldconfig + +# try to make a backward compatible symlink for legacy tk packages +# that hardcode lib path to prefix/lib/%{name}%{majorver} +[ -d %{_prefix}/lib/%{name}%{majorver} ] || ln -s %{_datadir}/%{name}%{majorver} %{_prefix}/lib/%{name}%{majorver} + +%postun +/sbin/ldconfig + +%files +%defattr(-,root,root,-) +%{_bindir}/wish* +%{_datadir}/%{name}%{majorver} +%{_libdir}/lib%{name}%{majorver}.so +%{_libdir}/%{name}Config.sh +%{_mandir}/man1/* +%doc README changes license.terms + +%files devel +%defattr(-,root,root) +%{_includedir}/* +%{_libdir}/lib%{name}.so +%{_libdir}/lib%{name}stub%{majorver}.a +%{_mandir}/man3/* +%{_mandir}/mann/* + +%changelog +* Tue Jun 15 2004 Elliot Lee +- rebuilt + +* Tue May 18 2004 Jeremy Katz 8.4.6-2 +- rebuild + +* Thu May 13 2004 Jens Petersen - 8.4.6-1 +- update to 8.4.6 + +* Wed Apr 21 2004 Jens Petersen - 8.4.5-8 +- obsolete itcl since it also provided panedwindow.n (Warren Togami, 121414) + +* Tue Mar 16 2004 Mike A. Harris - 8.4.5-7 +- Removed Requires: XFree86-libs and replaced with Buildrequires: XFree86-devel + so that the package is X11 implementation agnostic for the inclusion of + xorg-x11 (#118482) +- Added Requires(post,postun): /sbin/ldconfig +- Added BuildRequires: perl, as perl is used during %%install + +* Thu Mar 11 2004 Jens Petersen - 8.4.5-6 +- generate compat symlink instead in %%post if /usr/lib/tk%{majorver} + does not exist + +* Wed Mar 10 2004 Jens Petersen - 8.4.5-5 +- add tk-8.4.5-autoconf.patch and build with autoconf 2.5x + (Robert Scheck, #116776) +- add tk-8.4.5-pkgIndex-loc.patch to install pkgIndex.tcl in the script dir +- use %%{name} throughout for greater portability +- add a "--with check" rpmbuild option +- use "mkdir -p" instead of "mkdirhier" (Robert Scheck, #116774) +- /usr/lib/tk8.4 is now a compat symlink to %{_datadir}/tk8.4 +- include all the private header files under /usr/include/tk-private +- add doc files + +* Tue Mar 02 2004 Elliot Lee +- rebuilt + +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Fri Dec 12 2003 Jens Petersen - 8.4.5-3 +- add private header files needed to build tix in %{_includedir}/%{name}-private + +* Mon Dec 1 2003 Thomas Woerner 8.4.5-2 +- remove rpath with tk-8.4.5-no_rpath.patch + +* Thu Nov 27 2003 Jens Petersen - 8.4.5-1 +- new package split out from tcltk +- update to tk 8.4.5 (#88429) +- filtered changelog for tk +- buildrequire autoconf213 (#110583) [mvd at mylinux.com.ua] +- remove build remnants from tkConfig.sh + +* Wed Sep 17 2003 Matt Wilson 8.3.5-92 +- rebuild again for #91211 + +* Wed Sep 17 2003 Matt Wilson 8.3.5-91 +- rebuild to fix gzipped file md5sums (#91211) + +* Fri Jul 04 2003 Jens Petersen - 8.3.5-90 +- split out devel files from tcl and tk into -devel subpackages (#90087) + +* Fri Jan 17 2003 Jens Petersen - 8.3.5-85 +- add some requires + +* Tue Jan 14 2003 Jens Petersen - 8.3.5-84 +- link all libs with DT_SONAME using tcl.m4 patch (#81297) +- drop synthetic lib provides +- remove obsolete patches from srpm +- update buildrequires +- use buildroot instead of RPM_BUILD_ROOT +- install all man pages under mandir, instead of moving some from /usr/man +- install libtcl and libtk mode 755 +- introduce _genfilelist macro for clean single-sweep find filelist generation + for each package +- use perl to remove buildroot prefix from filelists + +* Tue Jan 7 2003 Jeff Johnson 8.3.5-80 +- rebuild to generate deps for4 DSO's w/o DT_SONAME correctly. + +* Sat Jan 4 2003 Jeff Johnson 8.3.5-79 +- set execute bits on library so that requires are generated. + +* Tue Dec 10 2002 Jens Petersen 8.3.5-78 +- make lib symlinks to .so not .so.0 + +* Mon Dec 9 2002 Jens Petersen 8.3.5-76 +- make it build on x86_64 (details below) +- don't explicitly update config.{guess,sub} since %%configure does it for us +- added "--without check" rpmbuild option to disable running tests in future +- build and install tcl and tk with script files under datadir (not libdir) +- generate filelists from datadir and not from mandir from now on + +* Tue Dec 3 2002 Jens Petersen +- update to tcl-8.3.5, tk-8.3.5, tcl-html-8.3.5 +- update url for tcl, tk, tclx, itcl, tcllib +- build without all makecfg patches for now + - in particular use upstream versioned library name convention +- add backward compatible lib symlinks for now +- add unversioned symlinks for versioned bindir files +- use make's -C option rather than jumping in and out of source dirs + during install +- use INSTALL_ROOT destdir-like make variable instead of makeinstall + for all subpackages except tix and itcl + +* Mon Oct 21 2002 Jens Petersen +- update to tcl-8.3.4, tk-8.3.4 (#75600), tcllib-1.3, itcl-3.2.1, + tix-8.1.3 (#59098) +- drop the crud compat dir symlinks in libdir +- package now builds without tcl or tk installed (partly #52606) + - replace all relative paths by absolutes ones, using new tcltktop + - give absolute paths to tcl and tk when configuring + - give buildroot bindir path to tcllib make + - export buildroot libdir in LD_LIBRARY_PATH when installing +- replace tclvers and tkvers by tcltkvers and use it +- replace tcl_major and tk_major by tcltk_major and use it +- don't explicitly provide 64bit libs on ia64 and sparc64 + +* Mon Jan 07 2002 Florian La Roche +- fix config.guess and config.sub to newer versions + +* Mon Aug 29 2001 Adrian Havill + +* Mon Aug 8 2001 Adrian Havill +- re-enable glibc string and math inlines; recent gcc is a-ok. +- optimize at -O2 instead of -O +- rename "soname" patches related to makefile/autoconf changes +- added elf "needed" for tk, tclx, tix, itk + +* Thu Jul 19 2001 Adrian Havill +- used %%makeinstall to brute force fix any remaining unflexible makefile dirs +- revert --enable-threads, linux is (still) not ready (yet) (bug 49251) + +* Sun Jul 8 2001 Adrian Havill +- refresh all sources to latest stable (TODO: separate expect/expectk) +- massage out some build stuff to patches (TODO: libtoolize hacked constants) +- remove patches already rolled into the upstream +- removed RPATH (bugs 45569, 46085, 46086), added SONAMEs to ELFs +- changed shared object filenames to something less gross +- reenable threads which seem to work now +- made compile-friendly for IA64 + +* Sun Jun 24 2001 Elliot Lee +- Bump release + rebuild for 7.2. + +* Fri Mar 23 2001 Bill Nottingham +- bzip2 sources + +* Mon Mar 19 2001 Preston Brown +- build fix from ahavill. + +* Tue Feb 13 2001 Adrian Havill +- rebuild so make check passes + +* Fri Oct 20 2000 Than Ngo +- rebuild with -O0 on alpha (bug #19461) + +* Thu Aug 17 2000 Jeff Johnson +- summaries from specspo. + +* Thu Aug 3 2000 Jeff Johnson +- merge "best known" patches from searching, stubs were broken. + +* Thu Jul 27 2000 Jeff Johnson +- rebuild against "working" util-linux col. + +* Wed Jul 12 2000 Prospector +- automatic rebuild + +* Fri Jun 16 2000 Jeff Johnson +- don't mess with %%{_libdir}, it's gonna be a FHS pita. + +* Fri Jun 2 2000 Jeff Johnson +- FHS packaging changes. +- revert --enable-threads, linux is not ready (yet) (#11789). +- tcl/tk: update to 8.3.1 (#10779). +- abstract major tcltk version for soname expansion etc. + +* Sat Mar 18 2000 Jeff Johnson +- update to (tcl,tk}-8.2.3, expect-5.31, and itcl-3.1.0, URL's as well. +- use perl to drill out pre-pended RPM_BUILD_ROOT. +- configure with --enable-threads (experimental). +- correct hierarchy spelling (#7082). + +* Tue Mar 7 2000 Jeff Johnson +- rebuild for sparc baud rates > 38400. + +* Mon Feb 7 2000 Bill Nottingham +- handle compressed manpages + +* Thu Feb 03 2000 Elliot Lee +- Make changes from bug number 7602 +- Apply patch from bug number 7537 +- Apply fix from bug number 7157 +- Add fixes from bug #7601 to the runtcl patch + +* Wed Feb 02 2000 Cristian Gafton +- fix descriptions +- man pages are compressed (whatapain) + +* Tue Nov 30 1999 Jakub Jelinek +- compile on systems where SIGPWR == SIGLOST. + +* Sat May 1 1999 Jeff Johnson +- update tcl/tk to 8.0.5. + +* Tue Feb 16 1999 Jeff Johnson +- upgrade tcl/tk/tclX to 8.0.4 + +* Tue Jan 12 1999 Cristian Gafton +- call libtoolize to allow building on the arm +- build for glibc 2.1 +- strip binaries + +* Thu Sep 10 1998 Jeff Johnson +- update tcl/tk/tclX to 8.0.3, expect is updated also. + +* Thu May 07 1998 Prospector System +- translations modified for de, fr, tr + +* Thu Apr 09 1998 Erik Troan +- updated version numbers of tcl/tk to relflect inclusion of p2 + +* Wed Mar 25 1998 Cristian Gafton +- updated tcl/tk to patch level 2 + +* Wed Oct 22 1997 Otto Hammersmith +- added patch to remove libieee test in configure.in for tcl and tk. + Shouldn't be needed anymore for glibc systems, but this isn't the "proper" + solution for all systems +- fixed src urls + +* Mon Oct 06 1997 Erik Troan +- removed version numbers from descriptions + +* Mon Sep 22 1997 Erik Troan +- updated to tcl/tk 8.0 and related versions of packages + +* Tue Jun 17 1997 Erik Troan +- built against glibc From svn at tinysofa.org Thu Jul 1 15:42:00 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:42:00 +1000 (EST) Subject: [tinysofa-svn] r2677 - in tinysofa/snapshot: . ttfonts-ja ttfonts-ja/current ttfonts-ja/current/sources ttfonts-ja/current/specs Message-ID: <20040701154200.3BE724E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:42:00 +1000 (Fri, 02 Jul 2004) New Revision: 2677 Added: tinysofa/snapshot/ttfonts-ja/ tinysofa/snapshot/ttfonts-ja/current/ tinysofa/snapshot/ttfonts-ja/current/sources/ tinysofa/snapshot/ttfonts-ja/current/sources/CIDFnmap.ja tinysofa/snapshot/ttfonts-ja/current/sources/fonts.alias.kk tinysofa/snapshot/ttfonts-ja/current/sources/kochi-substitute-nonaga10-20030809.tar.bz2 tinysofa/snapshot/ttfonts-ja/current/specs/ tinysofa/snapshot/ttfonts-ja/current/specs/ttfonts-ja.spec Log: - Add ttfonts-ja to snapshot from 2.0. Added: tinysofa/snapshot/ttfonts-ja/current/sources/CIDFnmap.ja =================================================================== --- tinysofa/snapshot/ttfonts-ja/current/sources/CIDFnmap.ja 2004-07-01 15:41:51 UTC (rev 2676) +++ tinysofa/snapshot/ttfonts-ja/current/sources/CIDFnmap.ja 2004-07-01 15:42:00 UTC (rev 2677) @@ -0,0 +1,54 @@ +%! +% Copyright (C) 2001 Taiji Yamada and gs-cjk project +% +% This file is part of GNU Ghostscript. +% +% GNU Ghostscript is distributed in the hope that it will be useful, but +% WITHOUT ANY WARRANTY. No author or distributor accepts responsibility +% to anyone for the consequences of using it or for whether it serves any +% particular purpose or works at all, unless he says so in writing. Refer +% to the GNU General Public License for full details. +% +% Everyone is granted permission to copy, modify and redistribute GNU +% Ghostscript, but only under the conditions described in the GNU General +% Public License. A copy of this license is supposed to have been given +% to you along with GNU Ghostscript so you can know your rights and +% responsibilities. It should be in a file named COPYING. Among other +% things, the copyright notice and this notice must be preserved on all +% copies. + +% $Id: CIDFnmap.ja,v 1.2 2003/06/27 08:23:54 tagoh Exp $ +% CID fontmap for Kochi truetype fonts + +% Kochi Mincho (aka Watanabe-Light) font series and +% Kochi Gothic (aka Kochi-WadaLabGothic) font series for Adobe-Japan1 + +% Kochi Mincho and Gothic - TrueType +% Editor: Yasuyuki Furukawa +% URL: http://www.on.cs.keio.ac.jp/~yasu/linux/fonts/ +% +% Kochi-Mincho: Public domain, except for NAGA10 bitmap data +% Kochi-Gothic: Wada Lab's font license, except for NAGA10 bitmap data +% +%/Kochi-Mincho (kochi-mincho.ttf) ; +%/Kochi-Gothic (kochi-gothic.ttf) ; +% +% Notice: In CID-keyed space of Kochi-Mincho, although you may find that +% CIDs 7611,7613-7625,7629,7630,11847,12041-12043 are incorrectly +% assigned from glyph IDs, it is because that these are for WORKING AREA +% to develop "kochi-mincho.ttf" font for the time being. + +% Kochi Mincho and Gothic - CIDFontType 0 +% Author: KANOU Hiroki +% URL: http://kappa.allnet.ne.jp/Kochi-CID/index-e.html +% +% Kochi-Mincho: Public domain. Designed by Yasuyuki Furukawa. +% Kochi-Gothic: Wada Lab's font license. +% +/Kochi-Mincho (/usr/share/fonts/ja/TrueType/kochi-mincho-subst.ttf) ; +/Kochi-Gothic (/usr/share/fonts/ja/TrueType/kochi-gothic-subst.ttf) ; + +/Adobe-Japan1 /Kochi-Mincho ; +/Adobe-Japan2 /Kochi-Gothic ; +/Ryumin-Light /Kochi-Mincho ; +/GothicBBB-Medium /Kochi-Gothic ; Added: tinysofa/snapshot/ttfonts-ja/current/sources/fonts.alias.kk =================================================================== --- tinysofa/snapshot/ttfonts-ja/current/sources/fonts.alias.kk 2004-07-01 15:41:51 UTC (rev 2676) +++ tinysofa/snapshot/ttfonts-ja/current/sources/fonts.alias.kk 2004-07-01 15:42:00 UTC (rev 2677) @@ -0,0 +1,12 @@ +-kochi-times-medium-r-normal--0-0-0-0-c-0-jisx0208.1983-0 "-misc-kochi mincho-medium-r-normal--0-0-0-0-c-0-jisx0208.1983-0" +-kochi-times-medium-r-normal--0-0-0-0-c-0-jisx0201.1976-0 "-misc-kochi mincho-medium-r-normal--0-0-0-0-c-0-jisx0201.1976-0" +-kochi-helvetica-medium-r-normal--0-0-0-0-c-0-jisx0208.1983-0 "-misc-kochi gothic-medium-r-normal--0-0-0-0-c-0-jisx0208.1983-0" +-kochi-helvetica-medium-r-normal--0-0-0-0-c-0-jisx0201.1976-0 "-misc-kochi gothic-medium-r-normal--0-0-0-0-c-0-jisx0201.1976-0" +-kochi-fixed-medium-r-normal--0-0-0-0-c-0-jisx0208.1983-0 "-misc-kochi gothic-medium-r-normal--0-0-0-0-c-0-jisx0208.1983-0" +-kochi-fixed-medium-r-normal--0-0-0-0-c-0-jisx0201.1976-0 "-misc-kochi gothic-medium-r-normal--0-0-0-0-c-0-jisx0201.1976-0" +-kochi-mincho-medium-r-normal--0-0-0-0-c-0-iso8859-1 "-misc-kochi mincho-medium-r-normal--0-0-0-0-c-0-iso8859-1" +-kochi-mincho-medium-r-normal--0-0-0-0-c-0-jisx0208.1983-0 "-misc-kochi mincho-medium-r-normal--0-0-0-0-c-0-jisx0208.1983-0" +-kochi-mincho-medium-r-normal--0-0-0-0-c-0-jisx0201.1976-0 "-misc-kochi mincho-medium-r-normal--0-0-0-0-c-0-jisx0201.1976-0" +-kochi-gothic-medium-r-normal--0-0-0-0-c-0-iso8859-1 "-misc-kochi gothic-medium-r-normal--0-0-0-0-c-0-iso8859-1" +-kochi-gothic-medium-r-normal--0-0-0-0-c-0-jisx0208.1983-0 "-misc-kochi gothic-medium-r-normal--0-0-0-0-c-0-jisx0208.1983-0" +-kochi-gothic-medium-r-normal--0-0-0-0-c-0-jisx0201.1976-0 "-misc-kochi gothic-medium-r-normal--0-0-0-0-c-0-jisx0201.1976-0" Added: tinysofa/snapshot/ttfonts-ja/current/sources/kochi-substitute-nonaga10-20030809.tar.bz2 =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/ttfonts-ja/current/sources/kochi-substitute-nonaga10-20030809.tar.bz2 ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/ttfonts-ja/current/specs/ttfonts-ja.spec =================================================================== --- tinysofa/snapshot/ttfonts-ja/current/specs/ttfonts-ja.spec 2004-07-01 15:41:51 UTC (rev 2676) +++ tinysofa/snapshot/ttfonts-ja/current/specs/ttfonts-ja.spec 2004-07-01 15:42:00 UTC (rev 2677) @@ -0,0 +1,263 @@ +%define xfontdir_ %{_datadir}/fonts/ja +%define xfontdir %{xfontdir_}/TrueType +%define gslibdir %{_datadir}/ghostscript/%(echo `gs --version`)/lib +%define gsver 7.07 + +%define substname kochi-substitute +%define substver 20030809 +%define kochisubst %{substname}-%{substver} +%define ksnonaga10 %{substname}-nonaga10-%{substver} + +Name: ttfonts-ja +Version: 1.2 +Release: 34ts +License: Distributable +Group: User Interface/X +BuildArch: noarch +BuildRoot: %{_tmppath}/%{name}-%{version}-root + +## Original fonts is here +## Source0: http://downloads.sourceforge.jp/efont/4767/%{kochisubst}.tar.bz2 +Source0: %{ksnonaga10}.tar.bz2 +Source2: fonts.alias.kk +Source3: CIDFnmap.ja + +BuildRequires: ghostscript >= %{gsver} +BuildRequires: VFlib2 +Requires(post,postun): /usr/sbin/chkfontpath /usr/X11R6/bin/mkfontdir +Requires(post,postun): ttmkfdir >= 3.0.6 +# The post and postun scripts use fc-cache, from the fontconfig package +Requires(post,postun): fontconfig + +Summary: Free Japanese TrueType fonts +%description +This package provides free Japanese TrueType fonts, and includes +ttindex files for VFlib. Kochi TTF which includes in this package +have removed 10pt and 11pt which provides by naga10 font because +there is the license problem. + +%prep +%setup -q -c + +%build +pushd %{kochisubst} +ttindex kochi-mincho-subst +ttindex kochi-gothic-subst +popd + +%install +[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT + +pushd %{kochisubst} +install -d $RPM_BUILD_ROOT%{xfontdir} +install -m 0644 *.{ttf,tti} $RPM_BUILD_ROOT%{xfontdir}/ +install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{xfontdir}/fonts.alias +popd + +# for ghostscript +install -d $RPM_BUILD_ROOT%{gslibdir} +install -m 0644 %{SOURCE3} $RPM_BUILD_ROOT%{gslibdir}/ + +# We really don't have naga10. so removing document files. +rm -rf %{kochisubst}/docs/naga10 + +%clean +[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT + +%post +{ + touch %{xfontdir} 2> /dev/null && { + /usr/bin/ttmkfdir -d %{xfontdir} -o %{xfontdir}/fonts.scale + /usr/X11R6/bin/mkfontdir %{xfontdir} + + /usr/sbin/chkfontpath -q -a %{xfontdir} + + } + + touch %{_sysconfdir} 2> /dev/null && { + if [ -x /usr/bin/redhat-update-gnome-font-install ]; then + /usr/bin/redhat-update-gnome-font-install + fi + if [ -x /usr/bin/redhat-update-gnome-font-install2 ]; then + /usr/bin/redhat-update-gnome-font-install2 + fi + } + HOME=/ fc-cache 2>/dev/null +} + +%postun +{ + if [ "$1" = "0" ]; + then + /usr/sbin/chkfontpath -q -r %{xfontdir} + + touch %{_sysconfdir} 2> /dev/null && { + if [ -x /usr/bin/redhat-update-gnome-font-install ]; then + /usr/bin/redhat-update-gnome-font-install + fi + if [ -x /usr/bin/redhat-update-gnome-font-install2 ]; then + /usr/bin/redhat-update-gnome-font-install2 + fi + } + fi + + HOME=/ fc-cache 2>/dev/null +} + +%files +%defattr(-,root,root) +%doc %{kochisubst}/{COPYING,README.ja,README.RedHat} %{kochisubst}/docs +%dir %{xfontdir_} +%dir %{xfontdir} +%config %{xfontdir}/fonts.alias +%{xfontdir}/*ttf +%{xfontdir}/*tti +%{gslibdir}/CIDFnmap.ja + +%changelog +* Tue Mar 16 2004 Mike A. Harris 1.2-34 +- Removed hard coded dependancies on XFree86 packages, as we do not want to + require any specific X11 implementation's packages just for fonts. +- Updated BuildRequires/Requires/Prereq entries to newer rpm format of + Requires(post,postun): for the various binaries needed in the rpm scripts + +* Fri Feb 13 2004 Elliot Lee 1.2-33 +- rebuilt + +* Thu Feb 05 2004 Akira TAGOH 1.2-32 +- removed default*.font because it's no longer used. + +* Wed Dec 10 2003 Akira TAGOH 1.2-31 +- fixed %%post and %%postun to check real writable for nfs mount. + +* Mon Aug 11 2003 Akira TAGOH 1.2-29 +- updates to 20030809. including the fix of glyphs for vertical writing +- don't do anything if the directories are not writable. (#91751) + +* Mon Jun 30 2003 Akira TAGOH 1.2-28 +- updates to 20030628 + +* Sat Jun 28 2003 Akira TAGOH 1.2-27 +- rebuilt + +* Fri Jun 27 2003 Akira TAGOH 1.2-26 +- Use another Japanese TrueType font for copyright issue. + +* Fri May 23 2003 Akira TAGOH 1.2-25 +- rebuild for new ghostscript. + +* Thu Apr 10 2003 Akira TAGOH 1.2-24 +- rebuild to install CIDFnmap to libdir of ghostscript 7.06. + +* Tue Apr 01 2003 Akira TAGOH 1.2-23 +- add CIDFnmap file for ghostscript. + +* Tue Mar 18 2003 Akira TAGOH 1.2-22 +- updates to kochi-gothic 20030118 + +* Fri Jan 31 2003 Akira TAGOH 1.2-21 +- fix the unnecessary output on %%post + +* Wed Jan 22 2003 Tim Powers +- rebuilt + +* Wed Jan 15 2003 Akira TAGOH 1.2-19 +- small fix in %%post and %%postun + +* Tue Jan 14 2003 Akira TAGOH 1.2-18 +- updates to kochi-gothic 20030111 + +* Wed Nov 20 2002 Tim Powers +- rebuild in current collinst + +* Fri Aug 30 2002 Alexander Larsson 1.2-16 +- Call fc-cache from %%post + +* Wed Aug 21 2002 Akira TAGOH 1.2-15 +- runs mkfontdir on %%post to avoid generating an invalid fonts.dir. + +* Mon Jul 29 2002 Akira TAGOH 1.2-14 +- updates to 20020727 + +* Fri Jul 12 2002 Akira TAGOH 1.2-13 +- if redhat-update-gnome-font-install2 exists, runs it on %%post/%%postun. + +* Thu Jun 27 2002 Akira TAGOH 1.2-12 +- dropped watanabe-mincho and wadalab-gothic. + these fonts is no longer maintained and we can use the kochi fonts instead of + these fonts now. + +* Fri Jun 21 2002 Tim Powers +- automated rebuild + +* Thu May 30 2002 Akira TAGOH 1.2-10 +- Update to 2002/05/03 release. + +* Thu May 23 2002 Tim Powers +- automated rebuild + +* Wed Apr 3 2002 Akira TAGOH 1.2-8 +- fonts.alias: don't specify noreplace. + +* Wed Apr 3 2002 Akira TAGOH 1.2-7 +- fonts.alias: fix spacing entries. + Right now ttmkfdir generate fonts.dir with -c-. + +* Tue Mar 26 2002 Akira TAGOH 1.2-6 +- ship fonts.dir again. because chkfontpath can't add that font path... +- fonts.scale too. when a package will be removed, it will avoid a directory + is not removed. but it's a dummy file. + +* Thu Mar 15 2002 Akira TAGOH 1.2-5 +- called redhat-update-gnome-font-install on %%post and %%postun + +* Mon Feb 25 2002 Akira TAGOH 1.2-4 +- Build against new environment. + +* Tue Feb 12 2002 Akira TAGOH 1.2-3 +- Removed fonts.{dir,scale}, because it's any longer needed. +- Fixed missing entries for fonts.alias + +* Thu Jan 31 2002 Leon Ho 1.2-2 +- fixes the temp file exploit + +* Thu Jan 24 2002 Akira TAGOH 1.2-1 +- update to 20020124 release. +- add jisx0201.1976-0 entry. +- add alias of -misc-kochi gothic/mincho- to fonts.alias. +- replace fonts.scale.xtt and encodings.dir +- remove the entries without jisx stuff from encodings.dir + +* Thu Jan 10 2002 Tim Powers +- automated rebuild + +* Tue Dec 25 2001 Akira TAGOH 1.1-2 +- update to 20011217 release. + +* Thu Nov 15 2001 Akira TAGOH 1.1-1 +- New upstream release. + +* Thu Oct 11 2001 Preston Brown 1.0-7 +- get rid of bad ISO8859-1 aliases and incorrect italic, bold mappings + +* Wed Aug 8 2001 Akira TAGOH 1.0-6 +- fixed default fonts.dir for non-xtt + +* Mon Jul 23 2001 Akira TAGOH 1.0-5 +- added default font for Nautilus. + +* Tue Jul 17 2001 Akira TAGOH 1.0-4 +- updated kochi fonts. +- fixed directory owner + +* Mon Jul 09 2001 Karsten Hopp +- fix japanese description (-l). But why is it in the + .spec file at all ? + +* Tue Jun 26 2001 Akira TAGOH 1.0-2 +- don't use bzip2'ed compress when file size is small. +- changed family name. + +* Wed Jun 13 2001 Akira TAGOH 1.0-1 +- Initial build. + From svn at tinysofa.org Thu Jul 1 15:42:01 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:42:01 +1000 (EST) Subject: [tinysofa-svn] r2678 - in tinysofa/snapshot: . ttmkfdir ttmkfdir/current ttmkfdir/current/sources ttmkfdir/current/specs Message-ID: <20040701154201.A30534E817D@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:42:01 +1000 (Fri, 02 Jul 2004) New Revision: 2678 Added: tinysofa/snapshot/ttmkfdir/ tinysofa/snapshot/ttmkfdir/current/ tinysofa/snapshot/ttmkfdir/current/sources/ tinysofa/snapshot/ttmkfdir/current/sources/ttmkfdir-3.0.9-cpp.patch tinysofa/snapshot/ttmkfdir/current/sources/ttmkfdir-3.0.9-defautl_enc_size.patch tinysofa/snapshot/ttmkfdir/current/sources/ttmkfdir-3.0.9-fix-freetype217.patch tinysofa/snapshot/ttmkfdir/current/sources/ttmkfdir-3.0.9-namespace.patch tinysofa/snapshot/ttmkfdir/current/sources/ttmkfdir-3.0.9-zlib.patch tinysofa/snapshot/ttmkfdir/current/sources/ttmkfdir-3.0.9.tar.bz2 tinysofa/snapshot/ttmkfdir/current/specs/ tinysofa/snapshot/ttmkfdir/current/specs/ttmkfdir.spec Log: - Add ttmkfdir to snapshot from 2.0. Added: tinysofa/snapshot/ttmkfdir/current/sources/ttmkfdir-3.0.9-cpp.patch =================================================================== --- tinysofa/snapshot/ttmkfdir/current/sources/ttmkfdir-3.0.9-cpp.patch 2004-07-01 15:42:00 UTC (rev 2677) +++ tinysofa/snapshot/ttmkfdir/current/sources/ttmkfdir-3.0.9-cpp.patch 2004-07-01 15:42:01 UTC (rev 2678) @@ -0,0 +1,11 @@ +--- ttmkfdir-3.0.9/ttf.cpp.sopwith Thu Aug 7 12:49:08 2003 ++++ ttmkfdir-3.0.9/ttf.cpp Thu Aug 7 12:50:01 2003 +@@ -239,7 +239,7 @@ + for (i = 0; i < n; i++) { + if ((fterror = FT_Get_Sfnt_Name (face, i, &NamePtr)) != FT_Err_Ok) { + std::cout << "Warning: Can't SFNT name : " << FileName << "(" << fterror << ")" << std::endl; +- return; ++ return NULL; + }; + platform = NamePtr.platform_id; + encoding = NamePtr.encoding_id; Added: tinysofa/snapshot/ttmkfdir/current/sources/ttmkfdir-3.0.9-defautl_enc_size.patch =================================================================== --- tinysofa/snapshot/ttmkfdir/current/sources/ttmkfdir-3.0.9-defautl_enc_size.patch 2004-07-01 15:42:00 UTC (rev 2677) +++ tinysofa/snapshot/ttmkfdir/current/sources/ttmkfdir-3.0.9-defautl_enc_size.patch 2004-07-01 15:42:01 UTC (rev 2678) @@ -0,0 +1,19 @@ +--- ttmkfdir-3.0.9/encoding.l.orig 2004-03-19 13:46:01.609947672 -0500 ++++ ttmkfdir-3.0.9/encoding.l 2004-03-19 13:46:09.239787760 -0500 +@@ -8,7 +8,7 @@ + #include "ttmkfdir.h" + #include "encoding.h" + +-#define DEFAULT_SIZE 0x100 /* 8 bit encoding */ ++#define DEFAULT_SIZE 0xFFFF; + #define YY_DECL int yylex (char *current_file, Encodings_t &dest) + + static unsigned int line_number = 1; +@@ -43,6 +43,7 @@ + STARTENCODING{WHITESPACES}{STRING} { + cur_enc = new Encoding; + cur_enc->names.push_back (strip_first (yytext)); ++ cur_enc->size = DEFAULT_SIZE; + BEGIN(INSIDE_ENC_BLOCK); + } + Added: tinysofa/snapshot/ttmkfdir/current/sources/ttmkfdir-3.0.9-fix-freetype217.patch =================================================================== --- tinysofa/snapshot/ttmkfdir/current/sources/ttmkfdir-3.0.9-fix-freetype217.patch 2004-07-01 15:42:00 UTC (rev 2677) +++ tinysofa/snapshot/ttmkfdir/current/sources/ttmkfdir-3.0.9-fix-freetype217.patch 2004-07-01 15:42:01 UTC (rev 2678) @@ -0,0 +1,44 @@ +--- ttmkfdir-3.0.9/encoding.cpp.orig 2002-12-09 17:52:48.000000000 +0900 ++++ ttmkfdir-3.0.9/encoding.cpp 2004-01-31 18:16:46.617118976 +0900 +@@ -4,7 +4,6 @@ + #include + #include + #include +-#include "freetype/freetype.h" + + #include "ttmkfdir.h" + #include "encoding.h" +--- ttmkfdir-3.0.9/encoding.h.orig 2002-12-09 17:52:48.000000000 +0900 ++++ ttmkfdir-3.0.9/encoding.h 2004-01-31 18:19:18.600014064 +0900 +@@ -6,7 +6,8 @@ + #include + #include + +-#include "freetype/freetype.h" ++#include ++#include FT_FREETYPE_H + + #include "util.h" + +--- ttmkfdir-3.0.9/ttf.h.orig 2003-01-08 14:25:25.000000000 +0900 ++++ ttmkfdir-3.0.9/ttf.h 2004-01-31 18:32:53.333155800 +0900 +@@ -3,12 +3,13 @@ + #define TTF_H__ + + #include +-#include "freetype/freetype.h" +-#include "freetype/tttables.h" +-#include "freetype/ftsnames.h" +-#include "freetype/ttnameid.h" +-#include "freetype/fterrors.h" +-#include "freetype/ftmodule.h" ++#include ++#include FT_FREETYPE_H ++#include FT_SFNT_NAMES_H ++#include FT_TRUETYPE_TABLES_H ++#include FT_TRUETYPE_IDS_H ++#include FT_ERRORS_H ++#include FT_MODULE_H + + #include "util.h" + #include "encoding.h" Added: tinysofa/snapshot/ttmkfdir/current/sources/ttmkfdir-3.0.9-namespace.patch =================================================================== --- tinysofa/snapshot/ttmkfdir/current/sources/ttmkfdir-3.0.9-namespace.patch 2004-07-01 15:42:00 UTC (rev 2677) +++ tinysofa/snapshot/ttmkfdir/current/sources/ttmkfdir-3.0.9-namespace.patch 2004-07-01 15:42:01 UTC (rev 2678) @@ -0,0 +1,56 @@ +*** ttmkfdir-3.0.9/ttf.h.ORIG 2004-03-10 13:40:47.149814008 -0700 +--- ttmkfdir-3.0.9/ttf.h 2004-03-10 13:40:50.571293864 -0700 +*************** namespace ttf { +*** 50,56 **** + TT_Postscript *post; + std::string FileName; + }; +! }; + + #endif /* TTF_H__ */ + +--- 50,56 ---- + TT_Postscript *post; + std::string FileName; + }; +! } + + #endif /* TTF_H__ */ + +*** ttmkfdir-3.0.9/util.h.ORIG 2004-03-10 13:40:19.872960720 -0700 +--- ttmkfdir-3.0.9/util.h 2004-03-10 13:40:34.059803992 -0700 +*************** namespace util { +*** 17,22 **** + Singleton (void) {}; + ~Singleton (void) {}; + }; +! }; + + #endif // TTMKFDIRUTIL_H__ +--- 17,22 ---- + Singleton (void) {}; + ~Singleton (void) {}; + }; +! } + + #endif // TTMKFDIRUTIL_H__ +*** ttmkfdir-3.0.9/builtin.cpp.ORIG 2004-03-10 13:41:47.089701760 -0700 +--- ttmkfdir-3.0.9/builtin.cpp 2004-03-10 13:41:51.327057584 -0700 +*************** namespace { +*** 600,606 **** + 0x00f8, 0x00f9, 0x00fa, 0x00fb, 0x00fc, 0x00fd, 0x00fe, 0x00ff + }; + +! }; + + Encoding::BuiltinEncoding_t Encoding::builtin_encodings[] = { + {256,191,32,{TT_PLATFORM_MICROSOFT,TT_MS_ID_UNICODE_CS,iso8859_1},{"iso8859-1",}}, +--- 600,606 ---- + 0x00f8, 0x00f9, 0x00fa, 0x00fb, 0x00fc, 0x00fd, 0x00fe, 0x00ff + }; + +! } + + Encoding::BuiltinEncoding_t Encoding::builtin_encodings[] = { + {256,191,32,{TT_PLATFORM_MICROSOFT,TT_MS_ID_UNICODE_CS,iso8859_1},{"iso8859-1",}}, + Added: tinysofa/snapshot/ttmkfdir/current/sources/ttmkfdir-3.0.9-zlib.patch =================================================================== --- tinysofa/snapshot/ttmkfdir/current/sources/ttmkfdir-3.0.9-zlib.patch 2004-07-01 15:42:00 UTC (rev 2677) +++ tinysofa/snapshot/ttmkfdir/current/sources/ttmkfdir-3.0.9-zlib.patch 2004-07-01 15:42:01 UTC (rev 2678) @@ -0,0 +1,80 @@ +--- ttmkfdir-3.0.9/encoding.cpp 2002-12-09 03:52:48.000000000 -0500 ++++ ttmkfdir-3.0.9/encoding.cpp 2003-09-12 12:32:29.000000000 -0400 +@@ -2,6 +2,8 @@ + #include + #include + #include ++#include ++#include + #include "freetype/freetype.h" + + #include "ttmkfdir.h" +@@ -32,9 +34,16 @@ + NextFile (FILE *f, char *name) + { + char file_name [1024]; +- char command[1024]; ++ char line_buf [1024]; ++ char tmp_file_name[] = "/tmp/ttmkfdir_XXXXXX"; ++ char inbuf[300000]; ++ FILE *od; ++ gzFile fd; ++ int rvalue, tmpfd; + +- if (fscanf (f, "%*s %[^\n]\n", file_name) == 1) { ++ if (fgets (line_buf, sizeof(line_buf), f) != NULL) { ++ ++ sscanf (line_buf, "%*s %[^\n]\n", file_name); + + if (file_name[0] == '/') { + name[0] = 0; +@@ -44,9 +53,25 @@ + + strcat (name, file_name); + +- sprintf (command, "exec %s < %s", (toupper(name[strlen (name) - 1]) == 'Z') +- ? "gzip -d" : "cat", name); +- return popen (command, "r"); ++ bzero(inbuf, sizeof(inbuf)); ++ ++ fd = gzopen (name,"rb"); ++ rvalue = gzread (fd, inbuf, sizeof(inbuf)); ++ ++ tmpfd = mkstemp (tmp_file_name); ++ if (tmpfd == -1) { ++ return 0; ++ } ++ ++ od = fdopen (tmpfd,"w"); ++ fputs (inbuf, od); ++ fflush (od); ++ fclose (od); ++ ++ od = fopen (tmp_file_name,"r"); ++ unlink (tmp_file_name); ++ return od; ++ + } + + return 0; +@@ -75,7 +100,7 @@ + yyrestart (input); + yylex (name, *this); + +- pclose (input); ++ fclose (input); + } + + fclose (f); +diff -uNr ttmkfdir-3.0.9.orig/Makefile ttmkfdir-3.0.9/Makefile +--- ttmkfdir-3.0.9.orig/Makefile 2003-08-21 17:43:13.000000000 +1000 ++++ ttmkfdir-3.0.9/Makefile 2003-08-21 17:40:16.000000000 +1000 +@@ -28,7 +28,7 @@ + DEBUG=-ggdb + CXX=g++ + CXXFLAGS=-Wall -pedantic $(FREETYPE_INCL) $(DEBUG) $(OPTFLAGS) +-LDFLAGS=$(FREETYPE_LIB) $(DEBUG) ++LDFLAGS=$(FREETYPE_LIB) $(DEBUG) -lz + + DESTDIR= + PREFIX=/usr Added: tinysofa/snapshot/ttmkfdir/current/sources/ttmkfdir-3.0.9.tar.bz2 =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/ttmkfdir/current/sources/ttmkfdir-3.0.9.tar.bz2 ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/ttmkfdir/current/specs/ttmkfdir.spec =================================================================== --- tinysofa/snapshot/ttmkfdir/current/specs/ttmkfdir.spec 2004-07-01 15:42:00 UTC (rev 2677) +++ tinysofa/snapshot/ttmkfdir/current/specs/ttmkfdir.spec 2004-07-01 15:42:01 UTC (rev 2678) @@ -0,0 +1,122 @@ +Summary: Utility used to create fonts.scale files for truetype fonts +Name: ttmkfdir +Version: 3.0.9 +Release: 12ts +Source0: %{name}-%{version}.tar.bz2 +Patch: ttmkfdir-3.0.9-cpp.patch +Patch1: ttmkfdir-3.0.9-zlib.patch +Patch2: ttmkfdir-3.0.9-fix-freetype217.patch +Patch3: ttmkfdir-3.0.9-namespace.patch +Patch4: ttmkfdir-3.0.9-defautl_enc_size.patch +License: GPL +Group: Applications/System +BuildRoot: %{_tmppath}/%{name}-%{version}-root +BuildRequires: freetype-devel >= 2.0 +BuildRequires: zlib + +# ttmkfdir used to be in the following packages at one point +Conflicts: XFree86-font-utils < 4.2.99.2-0.20021126.3 +Conflicts: freetype < 2.0.6-3 + +%description +ttmkfdir is a utility which is used to create fonts.scale files in +directories full of TrueType fonts in order to prepare them for use +by the font server. + +%prep +%setup -q +%patch -p1 +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 +%patch4 -p1 + +%build +make OPTFLAGS="$RPM_OPT_FLAGS" + +%install +rm -rf $RPM_BUILD_ROOT + +%makeinstall DESTDIR=$RPM_BUILD_ROOT + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(-,root,root) +%doc README +%{_bindir}/ttmkfdir + +%changelog +* Tue Jun 15 2004 Elliot Lee +- rebuilt + +* Fri Mar 19 2004 Yu Shao 3.0.9-11 +- set default encoding size to DEFAULT_SIZE, bug #118713 + +* Fri Mar 12 2004 Yu Shao 3.0.9-10 +- patch suggested from law at redhat.com not to use semicolon in GCC3.4, 3.5 + +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Wed Feb 12 2004 Yu Shao 3.0.9-8 +- patch for building package against freetype-2.1.7 +- from kanagawa jigorou (jigorou3 at mail.goo.ne.jp) #114682 + +* Mon Sep 15 2003 Yu Shao 3.0.9-6 +- updated zlib patch from Nalin Dahyabhai #104331 + +* Thu Aug 21 2003 Yu Shao 3.0.9-4 +- added zlib build requirement, partly releated to #100560 +- other fixes + +* Thu Aug 7 2003 Elliot Lee +- Fix compile error (cpp.patch) + +* Wed Jun 04 2003 Elliot Lee +- rebuilt + +* Thu Jan 23 2003 Yu Shao 3.0.9-1 +- added freetype-devel build requirement #82468 + +* Mon Jan 20 2003 Yu Shao 3.0.8-1 +- revert additional-entries to 0 #82125 + +* Wed Jan 15 2003 Yu Shao 3.0.7-1 +- set default value of additional-entries to 1 + +* Mon Jan 13 2003 Yu Shao 3.0.6-1 +- added iso8859-13 support from Nerijus Baliunas #77289 +- added README + +* Wed Jan 8 2003 Yu Shao 3.0.5-1 +- encoding.l fix and ttc support patch +- default read system encodings.dir instead of the one +- in current directory + +* Wed Dec 18 2002 Yu Shao 3.0.4-1 +- make ttmkfdir keep silent with FIRSTINDEX. #61769 + +* Wed Dec 18 2002 Yu Shao 3.0.3-1 +- Applied new patches to make ttmkfdir provide more infomation when meets +- bad fonts + +* Mon Dec 9 2002 Mike A. Harris 3.0.2-1 +- Changed the nonstandard RPM Group from System/Utilities to Applications/System +- Added a new Makefile install target, and changed specfile to use makeinstall + +* Mon Dec 9 2002 Mike A. Harris 3.0.1-1 +- Imported ttmkfdir into CVS on cvs.devel and applied all patches to CVS +- Removed patches from spec file +- Rewrote Makefile, now uses freetype-config to autodetect CFLAGS and libs, + allowing a lot of spec file cleanups. Added new targets for tagging CVS, + making tarball, and making srpm. + +* Mon Dec 2 2002 Mike A. Harris 3.0.0-2 +- Added Conflicts for prior packages which contained ttmkfdir + +* Fri Nov 29 2002 Mike A. Harris 3.0.0-1 +- Initial build. Basically just renamed our existing ttmkfdir to version + 3.0.0 to differentiate it. It's the same old thing as before, but is + likely going to move to CVS for easier development. From svn at tinysofa.org Thu Jul 1 15:43:34 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:43:34 +1000 (EST) Subject: [tinysofa-svn] r2699 - in tinysofa/snapshot: . xterm xterm/current xterm/current/sources xterm/current/specs Message-ID: <20040701154334.EC65A4E817E@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:43:34 +1000 (Fri, 02 Jul 2004) New Revision: 2699 Added: tinysofa/snapshot/xterm/ tinysofa/snapshot/xterm/current/ tinysofa/snapshot/xterm/current/sources/ tinysofa/snapshot/xterm/current/sources/xterm-179-ppc-fix-bug-101472.patch tinysofa/snapshot/xterm/current/sources/xterm-191.tgz tinysofa/snapshot/xterm/current/sources/xterm-can-2003-0063.patch tinysofa/snapshot/xterm/current/sources/xterm-resources-redhat.patch tinysofa/snapshot/xterm/current/specs/ tinysofa/snapshot/xterm/current/specs/xterm.spec Log: - Add xterm to snapshot from 2.0. Added: tinysofa/snapshot/xterm/current/sources/xterm-179-ppc-fix-bug-101472.patch =================================================================== --- tinysofa/snapshot/xterm/current/sources/xterm-179-ppc-fix-bug-101472.patch 2004-07-01 15:43:33 UTC (rev 2698) +++ tinysofa/snapshot/xterm/current/sources/xterm-179-ppc-fix-bug-101472.patch 2004-07-01 15:43:34 UTC (rev 2699) @@ -0,0 +1,28 @@ +Experimental patch for xterm bug #101472 on ppc/ppc64. +Author: Julie DeWandel + +https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=101472 + +--- main.c.orig 2003-09-05 15:28:55.000000000 -0400 ++++ main.c 2003-09-05 15:29:15.000000000 -0400 +@@ -3394,8 +3394,18 @@ spawn(void) + HsSysError(cp_pipe[1], ERROR_TIOCLSET); + #endif /* TIOCLSET */ + #ifndef USE_POSIX_TERMIOS +- if (ioctl(tty, TCSETA, &tio) == -1) +- HsSysError(cp_pipe[1], ERROR_TIOCSETP); ++ if (ioctl(tty, TCSETA, &tio) == -1) { ++#if defined(linux) ++ if ((tio.c_cflag & CSIZE) == CS7) { ++ /* Retry with data size of 8 */ ++ tio.c_cflag = (tio.c_cflag & ~CSIZE) | CS8; ++ if (ioctl(tty, TCSETA, &tio) == -1) ++ HsSysError(cp_pipe[1], ERROR_TIOCSETP); ++ } ++ else ++#endif ++ HsSysError(cp_pipe[1], ERROR_TIOCSETP); ++ } + #else /* USE_POSIX_TERMIOS */ + if (tcsetattr(tty, TCSANOW, &tio) == -1) + HsSysError(cp_pipe[1], ERROR_TIOCSETP); Added: tinysofa/snapshot/xterm/current/sources/xterm-191.tgz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/xterm/current/sources/xterm-191.tgz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/xterm/current/sources/xterm-can-2003-0063.patch =================================================================== --- tinysofa/snapshot/xterm/current/sources/xterm-can-2003-0063.patch 2004-07-01 15:43:33 UTC (rev 2698) +++ tinysofa/snapshot/xterm/current/sources/xterm-can-2003-0063.patch 2004-07-01 15:43:34 UTC (rev 2699) @@ -0,0 +1,16 @@ +--- charproc.c.can-2003-0063 2003-05-21 18:59:12.000000000 -0400 ++++ charproc.c 2003-05-26 06:10:23.000000000 -0400 +@@ -3956,8 +3956,13 @@ + break; + + case 21: /* Report the window's title */ ++/* This code block is disabled to fix a security issue reported ++ * in CAN-2003-0063 ++ */ ++#if 0 + report_win_label(screen, 'l', &text, + XGetWMName(screen->display, VShellWindow, &text)); ++#endif + break; + + default: /* DECSLPP (24, 25, 36, 48, 72, 144) */ Added: tinysofa/snapshot/xterm/current/sources/xterm-resources-redhat.patch =================================================================== --- tinysofa/snapshot/xterm/current/sources/xterm-resources-redhat.patch 2004-07-01 15:43:33 UTC (rev 2698) +++ tinysofa/snapshot/xterm/current/sources/xterm-resources-redhat.patch 2004-07-01 15:43:34 UTC (rev 2699) @@ -0,0 +1,69 @@ +--- XTerm.ad.xtermresources Sat Jan 5 17:05:02 2002 ++++ XTerm.ad Wed Jan 23 14:51:59 2002 +@@ -112,11 +112,11 @@ + *VT100*dynamicColors: on + + ! Uncomment this to use color for underline attribute +-!*VT100*colorULMode: on +-!*VT100*underLine: off ++*VT100*colorULMode: on ++*VT100*underLine: off + + ! Uncomment this to use color for the bold attribute +-!*VT100*colorBDMode: on ++*VT100*colorBDMode: on + + ! Uncomment this to use the bold/underline colors in preference to other colors + !*VT100*colorAttrMode: on +@@ -137,5 +137,49 @@ + *VT100*color13: magenta + *VT100*color14: cyan + *VT100*color15: white +-*VT100*colorUL: yellow +-*VT100*colorBD: white ++*VT100*colorUL: green4 ++*VT100*colorBD: blue3 ++ ++! keyboard setup ++*VT100*backarrowKey: false ++ ++!This can be useful if you have an IntelliMouse. It maps the button ++!events generated by the wheel ++*VT100.translations: #override \ ++ Delete: string(0x1b) string("[3~") \n\ ++ Home: string(0x1b) string("[1~") \n\ ++ End: string(0x1b) string("[4~") \n\ ++~@Num_Lock KP_Home: string(0x1b) string("[1~") \n\ ++~@Num_Lock KP_End: string(0x1b) string("[4~") \n\ ++Shift F1: string(0x1b) string("[23~") \n\ ++Shift F2: string(0x1b) string("[24~") \n\ ++Shift F3: string(0x1b) string("[25~") \n\ ++Shift F4: string(0x1b) string("[26~") \n\ ++Shift F5: string(0x1b) string("[28~") \n\ ++Shift F6: string(0x1b) string("[29~") \n\ ++Shift F7: string(0x1b) string("[31~") \n\ ++Shift F8: string(0x1b) string("[32~") \n\ ++Shift F9: string(0x1b) string("[33~") \n\ ++Shift F10: string(0x1b) string("[34~") \n\ ++Alt Shift : string(0x1b) string("[5~") \n\ ++Alt Shift : string(0x1b) string("[6~") \n\ ++Alt Ctrl : string(0x1b) string("OA") \n\ ++Alt Ctrl : string(0x1b) string("OB") \n\ ++Alt : string(0x1b) string("OA") string(0x1b) string("OA") string(0x1b) string("OA") string(0x1b) string("OA") string(0x1b) string("OA") \n\ ++Alt : string(0x1b) string("OB") string(0x1b) string("OB") string(0x1b) string("OB") string(0x1b) string("OB") string(0x1b) string("OB") \n\ ++Shift : scroll-back(1,page) \n\ ++Shift : scroll-forw(1,page) \n\ ++Ctrl : scroll-back(1,line) \n\ ++Ctrl : scroll-forw(1,line) \n\ ++ : scroll-back(5,line) \n\ ++ : scroll-forw(5,line) ++ ++! Provide plenty of scrollback ++*VT100*saveLines: 2500 ++*VT100*scrollBar: true ++ ++! Bug fix for bugzilla bug #49315 ++*VT100*eightBitInput: false ++ ++ ++ Added: tinysofa/snapshot/xterm/current/specs/xterm.spec =================================================================== --- tinysofa/snapshot/xterm/current/specs/xterm.spec 2004-07-01 15:43:33 UTC (rev 2698) +++ tinysofa/snapshot/xterm/current/specs/xterm.spec 2004-07-01 15:43:34 UTC (rev 2699) @@ -0,0 +1,133 @@ +%define _x11bindir /usr/X11R6/bin +%define _x11datadir /usr/X11R6/lib + +Summary: xterm terminal emulator for the X Window System +Name: xterm +Version: 191 +Release: 1ts +URL: http://dickey.his.com/xterm +License: MIT +Group: User Interface/X +BuildRoot: %{_tmppath}/%{name}-%{version}-root +Source0: ftp://dickey.his.com/xterm/%{name}-%{version}.tgz +Patch0: xterm-can-2003-0063.patch +Patch1: xterm-resources-redhat.patch +Patch2: xterm-179-ppc-fix-bug-101472.patch + +BuildRequires: xorg-x11-devel >= 6.7.0 + +%description +The xterm program is a terminal emulator for the X Window System. It +provides DEC VT102 and Tektronix 4014 compatible terminals for +programs that can't use the window system directly. + +%prep +%setup -q +# The xterm source code decompreses with all of the files read-only, which +# is totally retarded. +chmod -R u+w . +%patch0 -p0 -b .can-2003-0063 +#%patch1 -p0 -b .resources-redhat +%ifarch ppc ppc64 +%patch2 -p0 -b .ppc-fix-bug-101472 +%endif + +%build +%configure --enable-luit --enable-warnings --enable-wide-chars --with-utempter +make + +%install +rm -rf $RPM_BUILD_ROOT +%makeinstall +#install-ti + +mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man1 +mkdir -p $RPM_BUILD_ROOT/%{_x11datadir}/X11/app-defaults + +mv $RPM_BUILD_ROOT/%{_mandir}/*.1 $RPM_BUILD_ROOT/%{_mandir}/man1/ +mv $RPM_BUILD_ROOT/usr/%{_lib}/X11/app-defaults/* $RPM_BUILD_ROOT/%{_x11datadir}/X11/app-defaults/ + +# Make a compatibility symlink for xterm, so that applications and scripts +# which invoke xterm explicitly as /usr/X11R6/bin/xterm, will continue to work +# correctly without surprises +{ + mkdir -p $RPM_BUILD_ROOT%{_x11bindir} + ln -sf ../../bin/xterm $RPM_BUILD_ROOT%{_x11bindir}/xterm +} + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(-,root,root) +%{_bindir}/resize +%{_bindir}/uxterm +%{_bindir}/xterm +%{_mandir}/man1/resize.1* +%{_mandir}/man1/xterm.1* +%{_x11datadir}/X11/app-defaults/UXTerm +%{_x11datadir}/X11/app-defaults/XTerm +%{_x11datadir}/X11/app-defaults/XTerm-color +%{_x11bindir}/xterm + +%changelog +* Fri Jun 18 2004 Mike A. Harris 191-1 +- Updated main tarball to xterm-191 for FC3 devel +- Disabled xterm-resources-redhat.patch to see what if anything breaks, as + it no longer applies cleanly. Hopefully we can just ship stock xterm + resources now, although I realize that is more likely to be a pie in the + sky fantasy once the bug reports trickle in from this change. ;o) + +* Tue Jun 15 2004 Elliot Lee 179-8 +- rebuilt + +* Thu Jun 3 2004 Mike A. Harris 179-7 +- Rebuilt for FC3 devel + +* Fri Feb 13 2004 Elliot Lee 179-6.EL +- rebuilt + +* Mon Sep 8 2003 Mike A. Harris 179-5.EL +- Rebuilt 179-5 for Taroon + +* Mon Sep 8 2003 Mike A. Harris 179-5 +- Added xterm-179-ppc-fix-bug-101472.patch ifarch ppc ppc64 to fix bug (#101472) + +* Wed Aug 27 2003 Bill Nottingham 179-4.1 +- fix symlink +- rebuild + +* Wed Aug 13 2003 Mike A. Harris 179-3.EL +- Rebuilt for Taroon with symlink fixes. + +* Wed Aug 13 2003 Mike A. Harris 179-3 +- Added symlink /usr/X11R6/bin/xterm pointing to _bindir/xterm so that apps + and scripts which invoke xterm explicitly as /usr/X11R6/bin/xterm, will + continue to work correctly without surprises (#101994) + +* Wed Jun 04 2003 Elliot Lee 179-2.EL +- rebuilt + +* Fri May 30 2003 Mike A. Harris 179-1.EL +- Bump release to 1.EL for Red Hat Enterprise Linux build + +* Mon May 26 2003 Mike A. Harris 179-1 +- Updated to upstream xterm 179 +- [SECURITY] Added xterm-can-2003-0063.patch from XFree86 4.3.0-12 package +- Added Red Hat xterm-resources-redhat.patch from XFree86 4.3.0-12 package +- Added "chmod -R u+w *" after source is decompressed or else patches can not + be applied due to upstream source being read only files +- Built xterm 179-1 in rawhide + +* Mon May 5 2003 Mike A. Harris 177-2.0.EL +- Bump release to 2.0.EL for Red Hat Enterprise Linux build + +* Mon May 5 2003 Mike A. Harris 177-2 +- Build fix for lib64: _x11datadir == /usr/X11R6/lib +- Another lib64 build fix: xterm uses /usr/%%{_lib}/X11/app-defaults when it + should be using an arch-neutral dir {_x11datadir}/X11/app-defaults instead + +* Tue Apr 15 2003 Mike A. Harris 177-1 +- Call configure with "--enable-luit --enable-warnings --enable-wide-chars + --with-utempter" +- Initial build. From svn at tinysofa.org Thu Jul 1 15:41:44 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:41:44 +1000 (EST) Subject: [tinysofa-svn] r2671 - in tinysofa/snapshot: . tinysofa-java-rpm-scripts tinysofa-java-rpm-scripts/current tinysofa-java-rpm-scripts/current/sources tinysofa-java-rpm-scripts/current/specs Message-ID: <20040701154144.96B344E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:41:44 +1000 (Fri, 02 Jul 2004) New Revision: 2671 Added: tinysofa/snapshot/tinysofa-java-rpm-scripts/ tinysofa/snapshot/tinysofa-java-rpm-scripts/current/ tinysofa/snapshot/tinysofa-java-rpm-scripts/current/sources/ tinysofa/snapshot/tinysofa-java-rpm-scripts/current/sources/javaconfig.sh tinysofa/snapshot/tinysofa-java-rpm-scripts/current/specs/ tinysofa/snapshot/tinysofa-java-rpm-scripts/current/specs/tinysofa-java-rpm-scripts.spec Log: - Add tinysofa-java-rpm-scripts to snapshot from 2.0. Added: tinysofa/snapshot/tinysofa-java-rpm-scripts/current/sources/javaconfig.sh =================================================================== --- tinysofa/snapshot/tinysofa-java-rpm-scripts/current/sources/javaconfig.sh 2004-07-01 15:41:42 UTC (rev 2670) +++ tinysofa/snapshot/tinysofa-java-rpm-scripts/current/sources/javaconfig.sh 2004-07-01 15:41:44 UTC (rev 2671) @@ -0,0 +1,181 @@ +#!/bin/sh + +## javaconfig.sh, v1.1 +## Copyright (C) 2003, 2004 Red Hat, Inc. +## +## This program is free software; you can redistribute it and/or modify +## it 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. +## +## This program is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## GNU General Public License for more details. + +# Script to manage symbolic links for JARs and binaries. + +if [ $# = 0 ]; then + cat 1>&2 < servlet-4.1.7.jar + +As a special case, if FILE is in a subdirectory of /usr/lib* then the +linked objects will be in the directory below FILE. + +If the environment variable DRYRUN is set then a report of what would +have been done will be printed. +EOF + exit 1 +fi +[ "$debug" ] && [ "$debug" -gt 1 ] && set -x +for file in $@; do + if [ -e $file -a ! -L $file ]; then + echo 1>&2 "$file exists and is not a symbolic link" + exit 1 + fi + + # Dissect the filename + fdir=`dirname $file` + case `dirname $fdir` in + */lib*) + ldir=$fdir + fdir=`dirname $fdir` + ;; + *) + ldir=$fdir + esac + if [ $fdir = . ]; then fdir=; elif [ $fdir != / ]; then fdir="$fdir/"; fi + if [ $ldir = . ]; then ldir=; elif [ $ldir != / ]; then ldir="$ldir/"; fi + ext=`echo $file | sed 's:^.*\.:.:'` + case "$ext" in + .jar|.so) + base=`basename $file $ext` + ;; + *) + base=`basename $file` + unset ext + esac + [ "$debug" ] && echo "'$file' => ('$fdir', '$ldir', '$base', '$ext')" + + # Build normal and regular expression format strings + format="%s$base-%s$ext" + re_format=`echo "$format" | sed -e 's:^:^:' -e 's:$:$:' -e 's:\\.:\\\\.:g'` + [ "$debug" ] && echo "format = '$format', re_format = '$re_format'" + + # Build a list of existing files that we manage + if [ $ldir = $fdir ]; then + glob=`printf "$format" "$fdir" "*"` + r_dirs="\($fdir\)" + else + glob=`printf "$format" "$fdir" "*"`" "`printf "$format" "$ldir" "*"` + r_dirs="\($fdir\|$ldir\)" + fi + match_re=`printf "$re_format" "$r_dirs" '[0-9]\{1,\}\(\.[0-9]\{1,\}\)*'` + unset files oldlinks + for i in $file `echo $glob`; do + [ -f "$i" -o -L "$i" ] || continue + if [ "$i" != "$file" ]; then + if ! echo "$i" | grep -q "$match_re"; then + [ "$debug" ] && echo "skipping '$i', it's not one of ours" + continue + fi + fi + if [ -L "$i" ]; then + oldlinks="$oldlinks${oldlinks:+ }$i" + elif [ -f "$i" ]; then + files="$files${files:+ }$i" + else + echo 1>&2 "$file: $i is neither a regular file or a symlink" + exit 1 + fi + done + [ "$debug" ] && echo "files = '$files', oldlinks = '$oldlinks'" + + # Sort $files in version number order, using a tagged sort (tag + # each file with its expanded version number, sort the list, then + # remove the tag) + ver_re=`printf "$re_format" "$r_dirs" '\(.*\)'` + for pass in count tag; do + [ $pass = count ] && maxdots=-1 + [ $pass = tag ] && unset taggedfiles + for i in $files; do + ver=`echo $i | sed -e "s:$ver_re:\2:"` + numdots=`echo $ver | sed -e 's:[^.]::g' | wc -c` + numdots=`expr $numdots - 1` # remove the CR + case $pass in + count) + [ $numdots -gt $maxdots ] && maxdots=$numdots + ;; + tag) + unset tag + j=0 + while [ $j -le $maxdots ]; do + if [ $j -lt $numdots ]; then + this=`echo $ver | sed -e 's:\..*$::'` + ver=`echo $ver | sed -e 's:^[^.]*\.::'` + elif [ $j = $numdots ]; then + this=$ver + else + this=0 + fi + this=`printf "%05d" $this` + tag="$tag${tag:+.}$this" + j=`expr $j + 1` + done + taggedfiles="$taggedfiles${taggedfiles:+ }$tag,$i" + ;; + esac + done + done + [ "$debug" ] && echo "taggedfiles = '$taggedfiles'" + unset files + for i in `for i in $taggedfiles; do echo $i; done \ + | sort -r | sed -e 's:^[^,]*,::'`; do + files="$files${files:+ }$i" + done + [ "$debug" ] && echo "files = '$files'" + + # XXX Any user-defined classpath ordering should probably go here, + # and involve tweaking the order of $files. + + # Go through $files and build a list of links we have to make + unset links + for i in $files; do + links="$ldir$base$ext,`basename $i`" + break + done + [ "$debug" ] && echo "links = '$links'" + + # Finally, everything is ok and we can do our stuff + if [ "$DRYRUN" ]; then + [ "$oldlinks" ] && echo "rm -f $oldlinks" + else + [ "$oldlinks" ] && rm -f $oldlinks + fi + for i in $links; do + target=`echo $i | sed 's:^.*,::'` + [ $ldir = $fdir ] || target="../$target" + link=`echo $i | sed 's:,.*$::'` + if [ "$DRYRUN" ]; then + echo "ln -s $target $link" + else + ln -s $target $link + fi + done +done Property changes on: tinysofa/snapshot/tinysofa-java-rpm-scripts/current/sources/javaconfig.sh ___________________________________________________________________ Name: svn:executable + * Added: tinysofa/snapshot/tinysofa-java-rpm-scripts/current/specs/tinysofa-java-rpm-scripts.spec =================================================================== --- tinysofa/snapshot/tinysofa-java-rpm-scripts/current/specs/tinysofa-java-rpm-scripts.spec 2004-07-01 15:41:42 UTC (rev 2670) +++ tinysofa/snapshot/tinysofa-java-rpm-scripts/current/specs/tinysofa-java-rpm-scripts.spec 2004-07-01 15:41:44 UTC (rev 2671) @@ -0,0 +1,48 @@ +Summary: Helper scripts for Java rpms +Name: tinysofa-java-rpm-scripts +Version: 1.0.3 +Release: 2ts +Source1: javaconfig.sh +License: GPL +Group: System Environment/Libraries +BuildRoot: %{_tmppath}/%{name}-%{version}-root +Requires: coreutils, grep, sed +BuildArch: noarch + +%description +A collection of scripts used to perform common tasks for rpm packages +that contain Java libraries and executables. + +%install +[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT +mkdir -p ${RPM_BUILD_ROOT}%{_sbindir} +install -m 755 $RPM_SOURCE_DIR/javaconfig.sh \ + $RPM_BUILD_ROOT%{_sbindir}/javaconfig + +%clean +[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT + +%files +%defattr(-,root,root) +%{_sbindir}/* + +%changelog +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Fri Jan 30 2004 Gary Benson 1.0.3-1 +- Allow links to be managed in subdirectories of %{_libdir}. + +* Fri Sep 5 2003 Gary Benson 1.0.2-2 +- Add dependencies on coreutils, grep and sed. + +* Thu May 22 2003 Gary Benson 1.0.2-1 +- Reinstate support for shared libraries. + +* Tue Mar 25 2003 Gary Benson 1.0.1-1 +- Fix bug whereby links would not be removed at uninstall. +- Remove support for shared libraries and add support for binaries. +- Don't create major version link since no longer required. + +* Wed Mar 19 2003 Gary Benson 1.0.0-1 +- Initial revision. From svn at tinysofa.org Thu Jul 1 15:41:45 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:41:45 +1000 (EST) Subject: [tinysofa-svn] r2672 - in tinysofa/snapshot: . tinysofa-logos tinysofa-logos/current tinysofa-logos/current/sources tinysofa-logos/current/specs Message-ID: <20040701154145.8D8654E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:41:45 +1000 (Fri, 02 Jul 2004) New Revision: 2672 Added: tinysofa/snapshot/tinysofa-logos/ tinysofa/snapshot/tinysofa-logos/current/ tinysofa/snapshot/tinysofa-logos/current/sources/ tinysofa/snapshot/tinysofa-logos/current/sources/tinysofa-logos-1.1.26.tar.bz2 tinysofa/snapshot/tinysofa-logos/current/specs/ tinysofa/snapshot/tinysofa-logos/current/specs/tinysofa-logos.spec Log: - Add tinysofa-logos to snapshot from 2.0. Added: tinysofa/snapshot/tinysofa-logos/current/sources/tinysofa-logos-1.1.26.tar.bz2 =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/tinysofa-logos/current/sources/tinysofa-logos-1.1.26.tar.bz2 ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/tinysofa-logos/current/specs/tinysofa-logos.spec =================================================================== --- tinysofa/snapshot/tinysofa-logos/current/specs/tinysofa-logos.spec 2004-07-01 15:41:44 UTC (rev 2671) +++ tinysofa/snapshot/tinysofa-logos/current/specs/tinysofa-logos.spec 2004-07-01 15:41:45 UTC (rev 2672) @@ -0,0 +1,44 @@ +Name: tinysofa-logos +Summary: tinysofa-related icons and pictures. +Version: 1.1.26 +Release: 1ts +Group: System Environment/Base +Source0: tinysofa-logos-%{version}.tar.bz2 +License: Copyright ? 2004 Omar Kilani, Emily Boyd. All rights reserved. +BuildRoot: %{_tmppath}/%{name}-%{version}-root +BuildArchitectures: noarch +Obsoletes: redhat-logos +Provides: redhat-logos +Provides: system-logos +conflicts: kdebase <= 3.1.5 +Conflicts: anaconda-images <= 10 + +%description +tinysofa images + +%prep +%setup -q + +%build + +%install +rm -rf $RPM_BUILD_ROOT + +# should be ifarch i386 +mkdir -p $RPM_BUILD_ROOT/boot/grub +install -m 644 bootloader/grub-splash.xpm.gz $RPM_BUILD_ROOT/boot/grub/splash.xpm.gz +# end i386 bits + +(cd anaconda; make DESTDIR=$RPM_BUILD_ROOT install) + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(-, root, root) +%doc COPYING +%{_datadir}/anaconda/pixmaps/* +/usr/lib/anaconda-runtime/boot/*png +# should be ifarch i386 +/boot/grub/splash.xpm.gz +# end i386 bits From svn at tinysofa.org Thu Jul 1 15:41:46 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:41:46 +1000 (EST) Subject: [tinysofa-svn] r2673 - in tinysofa/snapshot: . tinysofa-release tinysofa-release/current tinysofa-release/current/specs Message-ID: <20040701154146.8E8824E817D@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:41:46 +1000 (Fri, 02 Jul 2004) New Revision: 2673 Added: tinysofa/snapshot/tinysofa-release/ tinysofa/snapshot/tinysofa-release/current/ tinysofa/snapshot/tinysofa-release/current/sources/ tinysofa/snapshot/tinysofa-release/current/specs/ tinysofa/snapshot/tinysofa-release/current/specs/tinysofa-release.spec Log: - Add tinysofa-release to snapshot from 2.0. Added: tinysofa/snapshot/tinysofa-release/current/specs/tinysofa-release.spec =================================================================== --- tinysofa/snapshot/tinysofa-release/current/specs/tinysofa-release.spec 2004-07-01 15:41:45 UTC (rev 2672) +++ tinysofa/snapshot/tinysofa-release/current/specs/tinysofa-release.spec 2004-07-01 15:41:46 UTC (rev 2673) @@ -0,0 +1,46 @@ +%define builtin_release_version 2.0-pre1 +%define builtin_release_name Persistence +%define real_release_version %{?release_version}%{!?release_version:%{builtin_release_version}} +%define real_release_name %{?release_name}%{!?release_name:%{builtin_release_name}} +Summary: tinysofa release file +Name: tinysofa-release +Version: 2.0 +Release: persistence.1ts +Copyright: GFDL +Group: System Environment/Base +Obsoletes: rawhide-release +Obsoletes: redhat-release +Obsoletes: indexhtml +Obsoletes: release +Provides: release +Provides: redhat-release +Provides: indexhtml +BuildRoot: %{_tmppath}/%{name}-%{version}-root +BuildArchitectures: noarch + +%description +tinysofa release file + +%prep + +%build + +%install +rm -rf $RPM_BUILD_ROOT +mkdir -p $RPM_BUILD_ROOT/etc +echo "tinysofa enterprise server release %{real_release_version} (%{real_release_name})" > $RPM_BUILD_ROOT/etc/tinysofa-release +cp $RPM_BUILD_ROOT/etc/tinysofa-release $RPM_BUILD_ROOT/etc/issue +echo "Kernel \r on an \m" >> $RPM_BUILD_ROOT/etc/issue +cp $RPM_BUILD_ROOT/etc/issue $RPM_BUILD_ROOT/etc/issue.net +echo >> $RPM_BUILD_ROOT/etc/issue +ln -s tinysofa-release $RPM_BUILD_ROOT/etc/release + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(-,root,root) +%attr(0644,root,root) /etc/tinysofa-release +/etc/release +%config %attr(0644,root,root) /etc/issue +%config %attr(0644,root,root) /etc/issue.net From svn at tinysofa.org Thu Jul 1 15:41:49 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:41:49 +1000 (EST) Subject: [tinysofa-svn] r2675 - in tinysofa/snapshot: . tix tix/current tix/current/sources tix/current/specs Message-ID: <20040701154149.6558A4E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:41:49 +1000 (Fri, 02 Jul 2004) New Revision: 2675 Added: tinysofa/snapshot/tix/ tinysofa/snapshot/tix/current/ tinysofa/snapshot/tix/current/sources/ tinysofa/snapshot/tix/current/sources/tix-8.1.4-install-pkgIndex-datadir-83662.patch tinysofa/snapshot/tix/current/sources/tix-8.1.4-pkgIndex-datadir-83662.patch tinysofa/snapshot/tix/current/sources/tix-8.1.4.tar.gz tinysofa/snapshot/tix/current/specs/ tinysofa/snapshot/tix/current/specs/tix.spec Log: - Add tix to snapshot from 2.0. Added: tinysofa/snapshot/tix/current/sources/tix-8.1.4-install-pkgIndex-datadir-83662.patch =================================================================== --- tinysofa/snapshot/tix/current/sources/tix-8.1.4-install-pkgIndex-datadir-83662.patch 2004-07-01 15:41:47 UTC (rev 2674) +++ tinysofa/snapshot/tix/current/sources/tix-8.1.4-install-pkgIndex-datadir-83662.patch 2004-07-01 15:41:49 UTC (rev 2675) @@ -0,0 +1,12 @@ +--- tix-8.1.4/unix/Makefile.in~ 2003-03-20 23:42:36.000000000 +0900 ++++ tix-8.1.4/unix/Makefile.in 2003-03-20 23:42:36.000000000 +0900 +@@ -187,7 +187,8 @@ + done; + @echo "Installing pkgIndex.tcl" + @cat */pkgIndex.tcl > pkgIndex.tcl +- @$(INSTALL_DATA) pkgIndex.tcl $(TIX_LIBRARY) ++ @mkdir $(libdir)/tix$(TIX_VERSION) ++ @$(INSTALL_DATA) pkgIndex.tcl $(libdir)/tix$(TIX_VERSION) + + install-demos: + @for i in $(prefix)/lib $(TIX_LIBRARY) $(TIX_LIBRARY)/demos \ Added: tinysofa/snapshot/tix/current/sources/tix-8.1.4-pkgIndex-datadir-83662.patch =================================================================== --- tinysofa/snapshot/tix/current/sources/tix-8.1.4-pkgIndex-datadir-83662.patch 2004-07-01 15:41:47 UTC (rev 2674) +++ tinysofa/snapshot/tix/current/sources/tix-8.1.4-pkgIndex-datadir-83662.patch 2004-07-01 15:41:49 UTC (rev 2675) @@ -0,0 +1,8 @@ +--- pkgIndex.tcl.in~ 2003-03-20 23:27:34.000000000 +0900 ++++ pkgIndex.tcl.in 2003-03-20 23:27:34.000000000 +0900 +@@ -5,4 +5,4 @@ + + package ifneeded Tix @TIX_VERSION_PKG@ [list load "@TIX_PKG_FILE@" Tix] + @TIX_SAM_PACKAGE_IFNEEDED@ +-package ifneeded wm_default 1.0 [list source [file join $dir pref WmDefault.tcl]] ++package ifneeded wm_default 1.0 [list source [file join @datadir@ tix at TIX_VERSION@ pref WmDefault.tcl]] Added: tinysofa/snapshot/tix/current/sources/tix-8.1.4.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/tix/current/sources/tix-8.1.4.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/tix/current/specs/tix.spec =================================================================== --- tinysofa/snapshot/tix/current/specs/tix.spec 2004-07-01 15:41:47 UTC (rev 2674) +++ tinysofa/snapshot/tix/current/specs/tix.spec 2004-07-01 15:41:49 UTC (rev 2675) @@ -0,0 +1,353 @@ +%define tixmajor 8.1 +%define tkmajor 8.4 + +Summary: A set of extension widgets for Tk +Name: tix +Epoch: 1 +Version: %{tixmajor}.4 +Release: 97ts +License: BSD +Group: Development/Languages +URL: http://tix.sourceforge.net/ +Source0: http://tix.sourceforge.net/dist/tix-%{version}.tar.gz +Source1: tix-8.1.4-pkgIndex-datadir-83662.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-root +Requires: tcl tk +Buildrequires: tcl-devel tk-devel +Patch1: tix-8.1.4-install-pkgIndex-datadir-83662.patch + +%description +Tix, the Tk Interface eXtension, is a powerful set of user interface +components that expands the capabilities of your Tcl/Tk and Python +applications. Using Tix together with Tk will greatly enhance the +appearance and functionality of your application. + +%package devel +Summary: Tk Interface eXtension development files +Group: Development/Languages +Requires: tix = %{epoch}:%{version}-%{release} + +%description devel +Tix, the Tk Interface eXtension, is a powerful set of user interface +components that expands the capabilities of your Tcl/Tk and Python +applications. Using Tix together with Tk will greatly enhance the +appearance and functionality of your application. + +This package contains the tix development files needed for building +tix applications. + +%package doc +Summary: Tk Interface eXtension documentation +Group: Development/Languages +Requires: tix = %{epoch}:%{version}-%{release} + +%description doc +Tix, the Tk Interface eXtension, is a powerful set of user interface +components that expands the capabilities of your Tcl/Tk and Python +applications. Using Tix together with Tk will greatly enhance the +appearance and functionality of your application. + +This package contains the tix documentation + +%prep +%setup -q +%patch1 -p1 -b .pkgIndex + +%build +cd unix +%configure --with-tclconfig=%{_libdir} --with-tkconfig=%{_libdir} --with-tclinclude=%{_includedir} --with-tkinclude=%{_includedir} +cd tk%{tkmajor} +patch -b --suffix .datadir < %SOURCE1 +%configure --enable-shared --with-tclconfig=%{_libdir} --with-tkconfig=%{_libdir} --with-tclinclude=%{_includedir} --with-tkinclude=%{_includedir} +cd .. +# ( cd itcl%{itcl_major}; +# patch -b --suffix .datadir < %SOURCE20 +# %%configure --with-itcl=%{tcltktop}/itcl%{itclvers} --enable-shared ) +make all %{?_smp_mflags} + +%install +rm -rf $RPM_BUILD_ROOT + +mkdir -p %{buildroot}%{_libdir} %{buildroot}%{_datadir} +%makeinstall -C unix LIB_DIR=%{buildroot}%{_libdir} MAN_DIR=%{buildroot}%{_mandir} TIX_LIBRARY=%{buildroot}%{_datadir}/tix%{tixmajor} TCL_BIN_DIR=%{_bindir} + +# for linking with -ltix +ln -s libtix%{tixmajor}.%{tkmajor}.so %{buildroot}%{_libdir}/libtix.so +# create tixwish symlink +ln -s tixwish%{tixmajor}.%{tkmajor} %{buildroot}%{_bindir}/tixwish + +# XXX set execute bits on library so that requires are generated. +chmod +x %{buildroot}%{_libdir}/libtix*.so + +# remove buildroot traces +perl -pi -e "s|$PWD/unix|%{_libdir}|; s|$PWD|%{_includedir}/tix-private|" %buildroot/%{_libdir}/tixConfig.sh + +# ship docs except pdf +rm -rf docs/pdf +find docs -name .cvsignore -exec rm '{}' ';' + +%clean +rm -rf $RPM_BUILD_ROOT + +%post -p /sbin/ldconfig + +%postun -p /sbin/ldconfig + +%files +%defattr(-,root,root,-) +%{_bindir}/* +%{_datadir}/tix%{tixmajor} +%{_libdir}/libtix%{tixmajor}.%{tkmajor}.so +%{_libdir}/libtixsam%{tixmajor}.%{tkmajor}.so +%{_libdir}/tix%{tixmajor} +%{_libdir}/tixConfig.sh +%doc *.txt *.html license.terms + +%files devel +%defattr(-,root,root,-) +%{_includedir}/* +%{_libdir}/libtix.so +%{_mandir}/mann + +%files doc +%defattr(-,root,root,-) +%doc docs/* + +%changelog +* Tue Jun 15 2004 Elliot Lee +- rebuilt + +* Tue Mar 02 2004 Elliot Lee +- rebuilt + +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Thu Dec 11 2003 Jens Petersen - 1:8.1.4-95 +- new package split out from tcltk +- build with installed tcl and tk +- build without itcl for now +- add a tixwish symlink +- clean build remnants from tixConfig.sh +- move devel files to devel subpackage +- move doc files to doc subpackage + +* Wed Oct 15 2003 Jens Petersen - 8.3.5-93 +- update tix url (#101721) [reported by support at internetdiscovery.com] + +* Wed Sep 17 2003 Matt Wilson 8.3.5-91 +- rebuild to fix gzipped file md5sums (#91211) + +* Fri Jul 04 2003 Jens Petersen - 8.3.5-90 +- make sure expect and itcl are linked against buildroot not installroot libs + - add itcl3.2-tclstubs-cfg.patch so that itcl can find tclstubs in buildroot + +* Fri Mar 21 2003 Jens Petersen - 8.3.5-89 +- install tix pkgIndex under libdir and let it use datadir for WmDefault + (#83662 and partly #45570) + +* Thu Feb 6 2003 Jens Petersen - 8.3.5-88 +- use ucs4 wide chars since python now does (tkinter) +- remove .cvsignore files from tix docs + +* Fri Jan 17 2003 Jens Petersen - 8.3.5-85 +- install tix library files under datadir +- fix dangling iwidgets symlink in libdir +- build all except tclx with _smp_mflags +- add some requires + +* Tue Jan 14 2003 Jens Petersen - 8.3.5-84 +- link all libs with DT_SONAME using tcl.m4 patch (#81297) +- drop synthetic lib provides +- update tix to 8.1.4 +- include tix docs (part of #72497), except the pdf files +- revert to itcl3.2 due to 3.2.1 config problems +- fix iwidget libdir symlink +- install iwidget scripts under datadir +- remove obsolete patches from srpm +- update buildrequires +- use buildroot instead of RPM_BUILD_ROOT +- install all man pages under mandir, instead of moving some from /usr/man +- introduce _genfilelist macro for clean single-sweep find filelist generation + for each package +- use perl to remove buildroot prefix from filelists + +* Thu Jan 9 2003 Jeff Johnson 8.3.5-82 +- synthesize libtix.so.0 and libtk.so.0 soname dependencies. + +* Tue Jan 7 2003 Jeff Johnson 8.3.5-80 +- rebuild to generate deps for4 DSO's w/o DT_SONAME correctly. + +* Sat Jan 4 2003 Jeff Johnson 8.3.5-79 +- set execute bits on library so that requires are generated. + +* Tue Dec 10 2002 Jens Petersen 8.3.5-78 +- make lib symlinks to .so not .so.0 + +* Tue Dec 10 2002 Jens Petersen 8.3.5-77 +- fix dangling symlinks (wish, libitcl, libitk) +- generate tix datadir filelist only from datadir + +* Mon Dec 9 2002 Jens Petersen 8.3.5-76 +- make it build on x86_64 (details below) +- add itcl_major and use it +- patch tix so it can find itcl-3.2.1 config files +- don't explicitly update config.{guess,sub} since %%configure does it for us +- added "--without check" rpmbuild option to disable running tests in future +- build and install itcl with library files under datadir +- build tix after itcl, and actually config, build and install tix itcl library +- generate filelists from datadir and not from mandir from now on +- install tix binary libraries in libdir + +* Tue Dec 3 2002 Jens Petersen +- update to tcl-8.3.5, tk-8.3.5, tcl-html-8.3.5 +- update url for tcl, tk, tclx, itcl, tcllib +- build without all makecfg patches for now + - in particular use upstream versioned library name convention +- add backward compatible lib symlinks for now +- add unversioned symlinks for versioned bindir files +- don't apply obsolete tix dirtree patch any more (#45570) +- set tix to epoch 1, since 8.1.3 < 8.2.0b1 +- build shared tix libs +- use make's -C option rather than jumping in and out of source dirs + during install +- don't need to move itcl and tcllib man pages downunder datadir +- include all tix files in manifest (#72497) + +* Mon Oct 21 2002 Jens Petersen +- update to tcl-8.3.4, tk-8.3.4 (#75600), tcllib-1.3, itcl-3.2.1, + tix-8.1.3 (#59098) +- drop obsolete tcl cruft, tcl refcount, tix perf patches +- drop the crud compat dir symlinks in libdir +- replace tclvers and tkvers by tcltkvers and use it +- replace tcl_major and tk_major by tcltk_major and use it +- don't explicitly provide 64bit libs on ia64 and sparc64 +- drop obsolete tix perf patch (#59098) +- update tix build steps for 8.1.3 + +* Mon Jan 07 2002 Florian La Roche +- fix config.guess and config.sub to newer versions + +* Mon Aug 29 2001 Adrian Havill +- hard-coded the compat symlink for tix libdir. (bug 52812) + +* Mon Aug 28 2001 Adrian Havill +- fixed itkwish/itclsh lib problem (bug 52608) +- make itcl install not need tclsh/wish during config/make (bug 52606) + +* Mon Aug 8 2001 Adrian Havill +- added execute bit mode for itclsh and itksh compat shells +- re-enable glibc string and math inlines; recent gcc is a-ok. +- optimize at -O2 instead of -O +- rename "soname" patches related to makefile/autoconf changes +- added elf "needed" for tk, tclx, tix, itk + +* Wed Jul 25 2001 Adrian Havill +- added itclsh/itkwish for backwards compatibility, fixed rpath (bug 46086) +- fixed 64 bit RPM provides for dependencies + +* Thu Jul 19 2001 Adrian Havill +- fixed DirTree in Tix (bug 45570) + +* Sun Jul 8 2001 Adrian Havill +- refresh all sources to latest stable (TODO: separate expect/expectk) +- massage out some build stuff to patches (TODO: libtoolize hacked constants) +- remove patches already rolled into the upstream +- removed RPATH (bugs 45569, 46085, 46086), added SONAMEs to ELFs +- added all necessary header files for itcl (bug 41374) +- made compile-friendly for IA64 + +* Fri Mar 23 2001 Bill Nottingham +- bzip2 sources + +* Mon Mar 19 2001 Bill Nottingham +- build with -D_GNU_SOURCE - fixes expect on ia64 + +* Tue Aug 8 2000 Florian La Roche +- remove symlink to libtixsam.so + +* Thu Aug 3 2000 Jeff Johnson +- merge "best known" patches from searching, stubs were broken. +- tix needs -fwritable-strings (#14352). +- create tixwish symlink. + +* Fri Jun 16 2000 Jeff Johnson +- make sure that tix shared libraries are installed. +- don't mess with %%{_libdir}, it's gonna be a FHS pita. + +* Sat Jun 10 2000 Jeff Johnson +- move, not symlink, unix/tk8.0 to generate Tix pkgIndex.tcl correctly (#11940) + +* Fri Jun 2 2000 Jeff Johnson +- FHS packaging changes. +- revert --enable-threads, linux is not ready (yet) (#11789). +- tcl/tk: update to 8.3.1 (#10779). +- abstract major tcltk version for soname expansion etc. + +* Sat Mar 18 2000 Jeff Johnson +- update to (tcl,tk}-8.2.3, expect-5.31, and itcl-3.1.0, URL's as well. +- use perl to drill out pre-pended RPM_BUILD_ROOT. +- configure with --enable-threads (experimental). + +* Tue Mar 7 2000 Jeff Johnson +- rebuild for sparc baud rates > 38400. + +* Mon Feb 7 2000 Bill Nottingham +- handle compressed manpages + +* Thu Feb 03 2000 Elliot Lee +- Make changes from bug number 7602 +- Apply patch from bug number 7537 +- Apply fix from bug number 7157 +- Add fixes from bug #7601 to the runtcl patch + +* Wed Feb 02 2000 Cristian Gafton +- fix descriptions +- man pages are compressed (whatapain) + +* Tue Nov 30 1999 Jakub Jelinek +- compile on systems where SIGPWR == SIGLOST. + +* Sat May 1 1999 Jeff Johnson +- update tcl/tk to 8.0.5. +- avoid "containing" in Tix (#2332). + +* Thu Apr 8 1999 Jeff Johnson +- use /usr/bin/write in kibitz (#1320). +- use cirrus.sprl.umich.edu in weather (#1926). + +* Mon Mar 08 1999 Preston Brown +- whoops, exec-prefix for itcl was set to '/foo', changed to '/usr'. + +* Tue Feb 16 1999 Jeff Johnson +- upgrade tcl/tk/tclX to 8.0.4 +- add itcl 3.0.1 + +* Thu Sep 10 1998 Jeff Johnson +- update tcl/tk/tclX to 8.0.3, expect is updated also. + +* Thu May 07 1998 Prospector System +- translations modified for de, fr, tr + +* Thu Apr 09 1998 Erik Troan +- updated to Tix 4.1.0.006 +- updated version numbers of tcl/tk to relflect includsion of p2 + +* Wed Mar 25 1998 Cristian Gafton +- updated tcl/tk to patch level 2 + +* Thu Oct 30 1997 Otto Hammersmith +- fixed filelist for tix... replacing path to the expect binary in scripts + was leaving junk files around. + +* Wed Oct 22 1997 Otto Hammersmith +- fixed src urls + +* Mon Oct 06 1997 Erik Troan +- removed version numbers from descriptions + +* Mon Sep 22 1997 Erik Troan +- updated to tcl/tk 8.0 and related versions of packages + +* Tue Jun 17 1997 Erik Troan +- built against glibc From svn at tinysofa.org Thu Jul 1 15:43:39 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:43:39 +1000 (EST) Subject: [tinysofa-svn] r2701 - in tinysofa/snapshot: . zip zip/current zip/current/sources zip/current/specs Message-ID: <20040701154339.194D04E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:43:38 +1000 (Fri, 02 Jul 2004) New Revision: 2701 Added: tinysofa/snapshot/zip/ tinysofa/snapshot/zip/current/ tinysofa/snapshot/zip/current/sources/ tinysofa/snapshot/zip/current/sources/exec-shield.patch tinysofa/snapshot/zip/current/sources/zcrypt29.tar.gz tinysofa/snapshot/zip/current/sources/zip-2.3-configure.patch tinysofa/snapshot/zip/current/sources/zip-2.3-near-4GB.patch tinysofa/snapshot/zip/current/sources/zip23-umask.patch tinysofa/snapshot/zip/current/sources/zip23.patch tinysofa/snapshot/zip/current/sources/zip23.tar.gz tinysofa/snapshot/zip/current/specs/ tinysofa/snapshot/zip/current/specs/zip.spec Log: - Add zip to snapshot from 2.0. Added: tinysofa/snapshot/zip/current/sources/exec-shield.patch =================================================================== --- tinysofa/snapshot/zip/current/sources/exec-shield.patch 2004-07-01 15:43:36 UTC (rev 2700) +++ tinysofa/snapshot/zip/current/sources/exec-shield.patch 2004-07-01 15:43:38 UTC (rev 2701) @@ -0,0 +1,19 @@ +diff -ur zip-2.3/crc_i386.S zip-2.3-lhh/crc_i386.S +--- zip-2.3/crc_i386.S 1999-10-09 16:10:26.000000000 -0400 ++++ zip-2.3-lhh/crc_i386.S 2003-10-24 16:15:52.000000000 -0400 +@@ -230,3 +230,6 @@ + #endif /* i386 || _i386 || _I386 || __i386 */ + + #endif /* !USE_ZLIB */ ++ ++.section .note.GNU-stack, "", @progbits ++.previous +diff -ur zip-2.3/match.S zip-2.3-lhh/match.S +--- zip-2.3/match.S 1999-07-27 17:18:14.000000000 -0400 ++++ zip-2.3-lhh/match.S 2003-10-24 16:15:38.000000000 -0400 +@@ -405,3 +405,5 @@ + #endif /* i386 || _I386 || _i386 || __i386 */ + + #endif /* !USE_ZLIB */ ++.section .note.GNU-stack, "", @progbits ++.previous Added: tinysofa/snapshot/zip/current/sources/zcrypt29.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/zip/current/sources/zcrypt29.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/zip/current/sources/zip-2.3-configure.patch =================================================================== --- tinysofa/snapshot/zip/current/sources/zip-2.3-configure.patch 2004-07-01 15:43:36 UTC (rev 2700) +++ tinysofa/snapshot/zip/current/sources/zip-2.3-configure.patch 2004-07-01 15:43:38 UTC (rev 2701) @@ -0,0 +1,209 @@ +diff -ur zip-2.3/unix/configure zip-2.3-lhh/unix/configure +--- zip-2.3/unix/configure 2004-06-17 12:35:16.396925245 -0400 ++++ zip-2.3-lhh/unix/configure 2004-06-17 12:34:46.478386504 -0400 +@@ -73,14 +73,19 @@ + done + fi + +-echo Check for prototypes ++echo -n Check for prototypes... + echo "int main(int argc, char *argv[]) { return 0; }" > conftest.c + $CC $CFLAGS -c conftest.c > /dev/null 2>/dev/null +-[ $? -ne 0 ] && CFLAGS="${CFLAGS} -DNO_PROTO" ++if [ $? -ne 0 ]; then ++ echo no ++ CFLAGS="${CFLAGS} -DNO_PROTO" ++else ++ echo yes ++fi + + # const check currently handles mips cc and non ANSI compilers. + # does it need more ? +-echo Check the handling of const ++echo -n Check the handling of const + cat > conftest.c << _EOF_ + typedef int charset[2]; + int main() +@@ -91,9 +96,15 @@ + } + _EOF_ + $CC $CFLAGS -c conftest.c >/dev/null 2>/dev/null +-[ $? -ne 0 ] && CFLAGS="${CFLAGS} -DNO_CONST" ++if [ $? -ne 0 ]; then ++ echo no ++ CFLAGS="${CFLAGS} -DNO_CONST" ++else ++ echo yes ++fi + +-echo Check for time_t ++ ++echo -n Check for time_t... + cat > conftest.c << _EOF_ + #include + #include +@@ -104,9 +115,15 @@ + } + _EOF_ + $CC $CFLAGS -c conftest.c >/dev/null 2>/dev/null +-[ $? -ne 0 ] && CFLAGS="${CFLAGS} -DNO_TIME_T" ++if [ $? -ne 0 ]; then ++ echo no ++ CFLAGS="${CFLAGS} -DNO_TIME_T" ++else ++ echo yes ++fi + +-echo Check for size_t ++ ++echo -n Check for size_t... + cat > conftest.c << _EOF_ + #include + int main() +@@ -116,24 +133,39 @@ + } + _EOF_ + $CC $CFLAGS -c conftest.c >/dev/null 2>/dev/null +-[ $? -ne 0 ] && CFLAGS="${CFLAGS} -DNO_SIZE_T" ++if [ $? -ne 0 ]; then ++ echo no ++ CFLAGS="${CFLAGS} -DNO_SIZE_T" ++else ++ echo yes ++fi + + # Check for missing functions + # add NO_'function_name' to flags if missing + for func in rmdir strchr strrchr rename mktemp mktime + do +- echo Check for $func +- echo "int main(){ $func(); return 0; }" > conftest.c ++ echo -n Check for $func... ++ echo "char $func(void); int main(){ $func(); return 0; }" > conftest.c + $CC -o conftest conftest.c >/dev/null 2>/dev/null +- [ $? -ne 0 ] && CFLAGS="${CFLAGS} -DNO_`echo $func | tr '[a-z]' '[A-Z]'`" ++ if [ $? -ne 0 ]; then ++ echo no ++ CFLAGS="${CFLAGS} -DNO_`echo $func | tr '[a-z]' '[A-Z]'`" ++ else ++ echo yes ++ fi + done + +-echo Check for memset ++echo -n Check for memset... + echo "int main(){ char k; memset(&k,0,0); return 0; }" > conftest.c + $CC -o conftest conftest.c >/dev/null 2>/dev/null +-[ $? -ne 0 ] && CFLAGS="${CFLAGS} -DZMEM" ++if [ $? -ne 0 ]; then ++ echo no ++ CFLAGS="${CFLAGS} -DZMEM" ++else ++ echo yes ++fi + +-echo Check for errno declaration ++echo -n Check for errno declaration... + cat > conftest.c << _EOF_ + #include + main() +@@ -143,9 +175,15 @@ + } + _EOF_ + $CC $CFLAGS -c conftest.c >/dev/null 2>/dev/null +-[ $? -ne 0 ] && CFLAGS="${CFLAGS} -DNO_ERRNO" ++if [ $? -ne 0 ]; then ++ echo no ++ CFLAGS="${CFLAGS} -DNO_ERRNO" ++else ++ echo yes ++fi + +-echo Check for directory libraries ++ ++echo -n Check for directory libraries... + cat > conftest.c << _EOF_ + int main() { return closedir(opendir(".")); } + _EOF_ +@@ -160,21 +198,30 @@ + done + if [ ${OPT} ]; then + LFLAGS2="${LFLAGS2} ${OPT}" ++ echo yes, ${OPT} + else + CFLAGS="${CFLAGS} -DNO_DIR" ++ echo no + fi + fi + + # Dynix/ptx 1.3 needed this +-echo Check for readlink ++echo -n Check for readlink... + echo "int main(){ return readlink(); }" > conftest.c + $CC -o conftest conftest.c >/dev/null 2>/dev/null + if [ $? -ne 0 ]; then + $CC -o conftest conftest.c -lseq >/dev/null 2>/dev/null +- [ $? -eq 0 ] && LFLAGS2="${LFLAGS2} -lseq" ++ if [ $? -eq 0 ]; then ++ LFLAGS2="${LFLAGS2} -lseq" ++ echo yes, -lseq ++ else ++ echo no ++ fi ++else ++ echo yes + fi + +-echo Check for directory include file ++echo -n Check for directory include file... + OPT="" + for inc in dirent.h sys/ndir.h ndir.h sys/dir.h + do +@@ -182,17 +229,19 @@ + $CPP conftest.c > /dev/null 2>/dev/null + [ $? -eq 0 ] && OPT="-DHAVE_`echo $inc | tr '[a-z]./' '[A-Z]__'`" && break + done ++echo "${OPT}" + CFLAGS="${CFLAGS} ${OPT}" + +-echo Check for non existent include files ++echo -n Check for non existent include files... + for inc in stdlib.h stddef.h unistd.h fcntl.h string.h + do + echo "#include <$inc>" > conftest.c + $CPP conftest.c >/dev/null 2>/dev/null + [ $? -ne 0 ] && CFLAGS="${CFLAGS} -DNO_`echo $inc | tr '[a-z]./' '[A-Z]__'`" + done ++echo ok + +-echo Check for term I/O include file ++echo -n Check for term I/O include file... + OPT="" + for inc in termios.h termio.h sgtty.h + do +@@ -201,9 +250,10 @@ + [ $? -eq 0 ] && OPT="-DHAVE_`echo $inc | tr '[a-z]./' '[A-Z]__'`" && break + done + CFLAGS="${CFLAGS} ${OPT}" ++echo $OPT + + # needed for AIX (and others ?) when mmap is used +-echo Check for valloc ++echo -n Check for valloc... + cat > conftest.c << _EOF_ + main() + { +@@ -213,7 +263,12 @@ + } + _EOF_ + $CC ${CFLAGS} conftest.c > /dev/null 2>/dev/null +-[ $? -ne 0 ] && CFLAGS="${CFLAGS} -DNO_VALLOC" ++if [ $? -ne 0 ]; then ++ echo no ++ CFLAGS="${CFLAGS} -DNO_VALLOC" ++else ++ echo yes ++fi + + echo Check for /usr/local/bin and /usr/local/man + BINDIR=$HOME/bin Added: tinysofa/snapshot/zip/current/sources/zip-2.3-near-4GB.patch =================================================================== --- tinysofa/snapshot/zip/current/sources/zip-2.3-near-4GB.patch 2004-07-01 15:43:36 UTC (rev 2700) +++ tinysofa/snapshot/zip/current/sources/zip-2.3-near-4GB.patch 2004-07-01 15:43:38 UTC (rev 2701) @@ -0,0 +1,295 @@ +diff -ur zip-2.3/fileio.c zip-2.3-lhh/fileio.c +--- zip-2.3/fileio.c 2004-06-21 15:24:58.030157097 -0400 ++++ zip-2.3-lhh/fileio.c 2004-06-21 15:24:22.527499811 -0400 +@@ -599,7 +601,11 @@ + this will be done by setfileattr() later. + */ + { ++#ifdef _LARGEFILE64_SOURCE ++ struct stat64 t; /* results of stat64() */ ++#else + struct stat t; /* results of stat() */ ++#endif + #if defined(CMS_MVS) + /* cmsmvs.h defines FOPW_TEMP as memory(hiperspace). Since memory is + * lost at end of run, always do copy instead of rename. +@@ -698,7 +704,11 @@ + + return _dos_files(&buf, f, 0xff) < 0 ? 0x20 : buf.atr; + #else ++#ifdef _LARGEFILE64_SOURCE ++ struct stat64 s; ++#else + struct stat s; ++#endif + + return SSTAT(f, &s) == 0 ? (int) s.st_mode : 0; + #endif +@@ -918,3 +928,108 @@ + } + + #endif /* NO_RENAME */ ++ ++ ++/* ++ Wrapper functions for fopen/fseek/ftell for >2GB files. ++ ++ So, what we do here is add support for 4GB seeks. More appropriately, ++ 2^32 - 8193 bytes. This is tailored to the way zip uses fseek; it never ++ seeks backwards more than 8192 bytes. ++ */ ++#ifdef _LARGEFILE64_SOURCE ++FILE * ++lfopen(const char *path, const char *mode) ++{ ++ int fd; ++ FILE *f; ++ int flags; ++ int x; ++ char prev; ++ ++ if (!path || !mode | !strlen(mode)) ++ return NULL; ++ ++ for (x = 0; x < strlen(mode); x++) { ++ switch (mode[x]) { ++ case 'r': ++ flags = O_RDONLY | O_LARGEFILE; ++ break; ++ case 'w': ++ flags = O_WRONLY | O_LARGEFILE | O_CREAT | O_TRUNC; ++ break; ++ case 'a': ++ flags = O_RDWR | O_LARGEFILE; ++ break; ++ case 'b': /* b has no effect */ ++ continue; ++ case '+': ++ if (prev == 'r') { ++ flags = O_RDWR | O_LARGEFILE; ++ } else if (prev == 'w') { ++ flags = O_RDWR | O_LARGEFILE | O_CREAT | ++ O_TRUNC; ++ } else if (prev == 'a') { ++ flags = O_RDWR | O_LARGEFILE | O_CREAT; ++ } else ++ return NULL; ++ break; ++ } ++ prev = mode[x]; ++ } ++ ++ fd = open(path, flags, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH); ++ if (fd == -1) ++ return NULL; ++ ++ f = fdopen(fd, mode); ++ return f; ++} ++ ++int ++lfseek(FILE *f, ulg pos, int whence) ++{ ++ struct stat64 sb; ++ ulg o, delta; ++ int ret; ++ ++ /* Hurts performance */ ++ fflush(f); ++ ++ if (pos <= MAX_ZIP_SIZE) { ++ return (lseek64(fileno(f), pos, whence) == (off64_t)-1); ++ } ++ ++ delta = ~((off64_t)pos - 1); ++ if (whence == SEEK_CUR) { ++ o = lseek64(fileno(f), 0, SEEK_CUR); ++ if (o < delta) ++ return -1; ++ ++ o -= delta; ++ return (lseek64(fileno(f), o, SEEK_SET) == (off64_t)-1); ++ } ++ ++ if (whence == SEEK_END) { ++ fstat64(fileno(f), &sb); ++ ++ if ((ulg)sb.st_size < delta) ++ return -1; ++ ++ o = (off64_t)((sb.st_size) - delta); ++ return (lseek64(fileno(f), o, SEEK_SET) == (off64_t)-1); ++ } ++ ++ return -1; ++} ++ ++ ++ulg ++lftell(FILE *f) ++{ ++ /* Hurts performance */ ++ fflush(f); ++ return (ulg)lseek64(fileno(f), 0, SEEK_CUR); ++} ++ ++#endif /* _LARGEFILE64_SOURCE */ +diff -ur zip-2.3/tailor.h zip-2.3-lhh/tailor.h +--- zip-2.3/tailor.h 1999-11-07 05:31:13.000000000 -0500 ++++ zip-2.3-lhh/tailor.h 2004-06-21 15:20:34.174269276 -0400 +@@ -358,12 +358,27 @@ + # define DYN_ALLOC + #endif + ++#ifdef _LARGEFILE64_SOURCE ++#define fopen lfopen ++#define fseek lfseek ++#define ftell lftell ++#endif /* LF64 */ ++ + #ifndef SSTAT +-# define SSTAT stat ++# ifdef _LARGEFILE64_SOURCE ++# define SSTAT stat64 ++# else ++# define SSTAT stat ++# endif /* LF64 */ + #endif + #ifdef S_IFLNK +-# define LSTAT lstat +-# define LSSTAT(n, s) (linkput ? lstat((n), (s)) : SSTAT((n), (s))) ++# ifdef _LARGEFILE64_SOURCE ++# define LSTAT lstat64 ++# define LSSTAT(n, s) (linkput ? lstat64((n), (s)) : SSTAT((n), (s))) ++# else ++# define LSTAT lstat64 ++# define LSSTAT(n, s) (linkput ? lstat64((n), (s)) : SSTAT((n), (s))) ++# endif /* LF64 */ + #else + # define LSTAT SSTAT + # define LSSTAT SSTAT +diff -ur zip-2.3/unix/configure zip-2.3-lhh/unix/configure +--- zip-2.3/unix/configure 2004-06-21 15:24:58.039155489 -0400 ++++ zip-2.3-lhh/unix/configure 2004-06-21 15:14:09.115387951 -0400 +@@ -12,8 +12,8 @@ + trap "rm -f conftest* core a.out; exit 1" 1 2 3 15 + + CC=${1-cc} +-CFLAGS=${2-"-O2 -I. -DUNIX"} +-LFLAGS1="-s" ++CFLAGS=${2-"-O2 -I. -DUNIX -g -D_LARGEFILE64_SOURCE"} ++LFLAGS1="" + LN="ln -s" + + echo Check for the C preprocessor +diff -ur zip-2.3/unix/unix.c zip-2.3-lhh/unix/unix.c +--- zip-2.3/unix/unix.c 1999-11-07 09:08:21.000000000 -0500 ++++ zip-2.3-lhh/unix/unix.c 2004-06-21 15:14:09.097391505 -0400 +@@ -113,7 +113,11 @@ + char *e; /* pointer to name from readd() */ + int m; /* matched flag */ + char *p; /* path for recursion */ ++#ifdef _LARGEFILE64_SOURCE ++ struct stat64 s; /* result of stat() */ ++#else + struct stat s; /* result of stat() */ ++#endif + struct zlist far *z; /* steps through zfiles list */ + + if (strcmp(n, "-") == 0) /* if compressing stdin */ +@@ -199,6 +203,15 @@ + } /* (s.st_mode & S_IFDIR) */ + else + zipwarn("ignoring special file: ", n); ++ ++ /* Zip uses negative error codes (IIRC, to -3). Make sure file size ++ doesn't collide with error values. 2^32 - 8193 should be plenty until ++ info-zip supports zip64. */ ++ if (s.st_size > MAX_ZIP_SIZE) { ++ zipwarn("file too large: ", a); ++ return ZE_MISS; ++ } ++ + return ZE_OK; + } + +@@ -318,7 +331,11 @@ + If f is "-", use standard input as the file. If f is a device, return + a file size of -1 */ + { +- struct stat s; /* results of stat() */ ++#ifdef _LARGEFILE64_SOURCE ++ struct stat64 s; /* results of stat() */ ++#else ++ struct stat s; ++#endif + char name[FNMAX]; + int len = strlen(f); + +@@ -336,7 +353,11 @@ + name[len - 1] = '\0'; + /* not all systems allow stat'ing a file with / appended */ + if (strcmp(f, "-") == 0) { ++#ifdef _LARGEFILE64_SOURCE ++ if (fstat64(fileno(stdin), &s) != 0) ++#else + if (fstat(fileno(stdin), &s) != 0) ++#endif + error("fstat(stdin)"); + } + else if (LSSTAT(name, &s) != 0) +@@ -409,7 +430,11 @@ + /* store full data in local header but just modification time stamp info + in central header */ + { ++#ifdef _LARGEFILE64_SOURCE ++ struct stat64 s; ++#else + struct stat s; ++#endif + + /* For the full sized UT local field including the UID/GID fields, we + * have to stat the file again. */ +diff -ur zip-2.3/unix/zipup.h zip-2.3-lhh/unix/zipup.h +--- zip-2.3/unix/zipup.h 1999-11-07 05:52:12.000000000 -0500 ++++ zip-2.3-lhh/unix/zipup.h 2004-06-21 15:14:09.098391308 -0400 +@@ -6,10 +6,16 @@ + If, for some reason, both of these files are missing, the Info-ZIP license + also may be found at: ftp://ftp.cdrom.com/pub/infozip/license.html + */ ++#include ++#include + #ifndef O_RDONLY + # define O_RDONLY 0 + #endif ++#ifdef _LARGEFILE64_SOURCE ++#define fhow (O_RDONLY | O_LARGEFILE) ++#else + #define fhow O_RDONLY ++#endif + #define fbad (-1) + typedef int ftype; + #define zopen(n,p) open(n,p) +diff -ur zip-2.3/zip.h zip-2.3-lhh/zip.h +--- zip-2.3/zip.h 2004-06-21 15:24:58.029157275 -0400 ++++ zip-2.3-lhh/zip.h 2004-06-21 15:21:12.076505614 -0400 +@@ -227,6 +227,7 @@ + #define DOSTIME_MINIMUM ((ulg)0x00210000L) + #define DOSTIME_2038_01_18 ((ulg)0x74320000L) + ++#define MAX_ZIP_SIZE 0xffffdffe /* Max archive / archive member size */ + + /* Public globals */ + extern uch upper[256]; /* Country dependent case map table */ +@@ -402,6 +404,11 @@ + int putcentral OF((struct zlist far *, FILE *)); + int putend OF((int, ulg, ulg, extent, char *, FILE *)); + int zipcopy OF((struct zlist far *, FILE *, FILE *)); ++#ifdef _LARGEFILE64_SOURCE ++int lfseek OF((FILE *, ulg, int)); ++ulg lftell OF((FILE *)); ++FILE *lfopen OF((const char *, const char *)); ++#endif /* LF64 */ + + /* in fileio.c */ + #ifndef UTIL Added: tinysofa/snapshot/zip/current/sources/zip23-umask.patch =================================================================== --- tinysofa/snapshot/zip/current/sources/zip23-umask.patch 2004-07-01 15:43:36 UTC (rev 2700) +++ tinysofa/snapshot/zip/current/sources/zip23-umask.patch 2004-07-01 15:43:38 UTC (rev 2701) @@ -0,0 +1,23 @@ +diff -ur zip-2.3/zip.c zip-2.3-lhh/zip.c +--- zip-2.3/zip.c 1999-11-16 15:08:10.000000000 -0500 ++++ zip-2.3-lhh/zip.c 2003-12-22 09:32:56.000000000 -0500 +@@ -849,6 +849,7 @@ + /* Add, update, freshen, or delete zip entries in a zip file. See the + command help in help() above. */ + { ++ mode_t old_umask; /* umask prior to temp file creation */ + int a; /* attributes of zip file */ + ulg c; /* start of central directory */ + int d; /* true if just adding to a zip file */ +@@ -1830,9 +1831,11 @@ + if ((tempzip = tempname(zipfile)) == NULL) { + ZIPERR(ZE_MEM, "allocating temp filename"); + } ++ old_umask = umask(0066); + if ((tempzf = y = fopen(tempzip, FOPW_TMP)) == NULL) { + ZIPERR(ZE_TEMP, tempzip); + } ++ umask(old_umask); + } + + #if (!defined(VMS) && !defined(CMS_MVS)) Added: tinysofa/snapshot/zip/current/sources/zip23.patch =================================================================== --- tinysofa/snapshot/zip/current/sources/zip23.patch 2004-07-01 15:43:36 UTC (rev 2700) +++ tinysofa/snapshot/zip/current/sources/zip23.patch 2004-07-01 15:43:38 UTC (rev 2701) @@ -0,0 +1,93 @@ +--- zip-2.3/zip.h.zip Mon Nov 8 14:36:51 1999 ++++ zip-2.3/zip.h Tue Jan 11 11:46:06 2000 +@@ -60,6 +60,7 @@ + + /* Set up portability */ + #include "tailor.h" ++#include + + #ifdef USE_ZLIB + # include "zlib.h" +@@ -433,12 +434,6 @@ + int setfileattr OF((char *, int)); + char *tempname OF((char *)); + int fcopy OF((FILE *, FILE *, ulg)); +- +-#ifdef ZMEM +- char *memset OF((char *, int, unsigned int)); +- char *memcpy OF((char *, char *, unsigned int)); +- int memcmp OF((char *, char *, unsigned int)); +-#endif /* ZMEM */ + + /* in system dependent fileio code (.c) */ + #ifndef UTIL +--- zip-2.3/fileio.c.zip Sun Nov 7 05:29:03 1999 ++++ zip-2.3/fileio.c Tue Jan 11 11:46:43 2000 +@@ -918,67 +918,3 @@ + } + + #endif /* NO_RENAME */ +- +- +-#ifdef ZMEM +- +-/************************/ +-/* Function memset() */ +-/************************/ +- +-/* +- * memset - for systems without it +- * bill davidsen - March 1990 +- */ +- +-char * +-memset(buf, init, len) +-register char *buf; /* buffer loc */ +-register int init; /* initializer */ +-register unsigned int len; /* length of the buffer */ +-{ +- char *start; +- +- start = buf; +- while (len--) *(buf++) = init; +- return(start); +-} +- +- +-/************************/ +-/* Function memcpy() */ +-/************************/ +- +-char * +-memcpy(dst,src,len) /* v2.0f */ +-register char *dst, *src; +-register unsigned int len; +-{ +- char *start; +- +- start = dst; +- while (len--) +- *dst++ = *src++; +- return(start); +-} +- +- +-/************************/ +-/* Function memcmp() */ +-/************************/ +- +-int +-memcmp(b1,b2,len) /* jpd at usl.edu -- 11/16/90 */ +-register char *b1, *b2; +-register unsigned int len; +-{ +- +- if (len) do { /* examine each byte (if any) */ +- if (*b1++ != *b2++) +- return (*((uch *)b1-1) - *((uch *)b2-1)); /* exit when miscompare */ +- } while (--len); +- +- return(0); /* no miscompares, yield 0 result */ +-} +- +-#endif /* ZMEM */ Added: tinysofa/snapshot/zip/current/sources/zip23.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/zip/current/sources/zip23.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/snapshot/zip/current/specs/zip.spec =================================================================== --- tinysofa/snapshot/zip/current/specs/zip.spec 2004-07-01 15:43:36 UTC (rev 2700) +++ tinysofa/snapshot/zip/current/specs/zip.spec 2004-07-01 15:43:38 UTC (rev 2701) @@ -0,0 +1,155 @@ +Summary: A file compression and packaging utility compatible with PKZIP. +Name: zip +Version: 2.3 +Release: 24ts +License: distributable +Group: Applications/Archiving +Source: ftp.uu.net:/pub/archiving/zip/src/zip23.tar.gz +Source1: ftp://ftp.freesoftware.com/pub/infozip/src/zcrypt29.tar.gz +URL: http://www.info-zip.org/pub/infozip/Zip.html +Patch0: zip23.patch +Patch1: exec-shield.patch +Patch2: zip23-umask.patch +Patch3: zip-2.3-near-4GB.patch +Patch4: zip-2.3-configure.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-root + +%description +The zip program is a compression and file packaging utility. Zip is +analogous to a combination of the UNIX tar and compress commands and +is compatible with PKZIP (a compression and file packaging utility for +MS-DOS systems). + +Install the zip package if you need to compress files using the zip +program. + +%prep +%setup -q -a 1 +%patch0 -p1 -b .zip +%patch1 -p1 -b .zip +%patch2 -p1 -b .umask +%patch3 -p1 -b .4gb +%patch4 -p1 -b .cfg + +%build +make -f unix/Makefile prefix=/usr "CFLAGS=$RPM_OPT_FLAGS -I. -DUNIX -D_LARGEFILE64_SOURCE" generic_gcc + +%install +rm -rf $RPM_BUILD_ROOT +mkdir -p $RPM_BUILD_ROOT/usr/bin +mkdir -p $RPM_BULD_ROOT%{_mandir}/man1 + +make -f unix/Makefile prefix=$RPM_BUILD_ROOT/usr \ + MANDIR=$RPM_BUILD_ROOT%{_mandir}/man1 install + +pushd $RPM_BUILD_ROOT +for n in zipnote zipsplit zip zipcloak ; do + chmod 755 ./usr/bin/$n +done +popd + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(-,root,root) +%doc README BUGS CHANGES MANUAL TODO WHATSNEW WHERE LICENSE +%doc proginfo/algorith.txt +/usr/bin/zipnote +/usr/bin/zipsplit +/usr/bin/zip +/usr/bin/zipcloak +%{_mandir}/man1/zip.1* + +%changelog +* Mon Jun 21 2004 Lon Hohberger 2.3-24 +- Extend max file/archive size to 2^32-8193 (4294959103) bytes +- Include better debugging output for configure script + +* Tue Jun 15 2004 Elliot Lee +- rebuilt + +* Fri Mar 19 2004 Lon Hohberger 2.3-22 +- Fix typos + +* Tue Feb 17 2004 Lon Hohberger 2.3-21 +- Include LICENSE file per bugzilla #116004 + +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Mon Dec 22 2003 Lon Hohberger 2.3-19 +- Make temp file have umask 0066 mode (#112516) + +* Fri Oct 24 2003 Lon Hohberger 2.3-18 +- Incorporate Arjan's exec-shield patch for i386 + +* Wed Jun 04 2003 Elliot Lee +- rebuilt + +* Wed Jan 22 2003 Tim Powers +- rebuilt + +* Thu Dec 19 2002 Tim Powers +- bump and rebuild + +* Fri Jun 21 2002 Tim Powers +- automated rebuild + +* Thu May 23 2002 Tim Powers +- automated rebuild + +* Tue Apr 2 2002 Trond Eivind Glomsr?d +- Don't strip explicitly + +* Wed Mar 13 2002 Trond Eivind Glomsr?d 2.3-11 +- Add URL + +* Sun Jun 24 2001 Elliot Lee +- Bump release + rebuild. + +* Thu Aug 25 2000 Bill Nottingham +- add encryption code (#16878) + +* Thu Jul 13 2000 Prospector +- automatic rebuild + +* Sun Jun 11 2000 Bill Nottingham +- rebuild in new environment + +* Mon Mar 13 2000 Bill Nottingham +- spec file cleanups (#10143) + +* Mon Feb 7 2000 Bill Nottingham +- fix some perms + +* Wed Feb 02 2000 Cristian Gafton +- fix description +- man pages are compressed + +* Tue Jan 11 2000 Bill Nottingham +- update to 2.3 + +* Fri Jul 30 1999 Bill Nottingham +- update to 2.2 + +* Sun Mar 21 1999 Cristian Gafton +- auto rebuild in the new build environment (release 8) + +* Thu Mar 18 1999 Cristian Gafton +- updated text in the spec file + +* Fri Jan 15 1999 Cristian Gafton +- patch top build on the arm + +* Mon Dec 21 1998 Michael Maher +- built package for 6.0 + +* Mon Aug 10 1998 Jeff Johnson +- build root + +* Fri May 08 1998 Prospector System +- translations modified for de, fr, tr + +* Thu Jul 10 1997 Erik Troan +- built against glibc From svn at tinysofa.org Thu Jul 1 15:44:09 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:44:09 +1000 (EST) Subject: [tinysofa-svn] r2708 - tinysofa/snapshot/automake/current/specs Message-ID: <20040701154409.D09A94E817D@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:44:09 +1000 (Fri, 02 Jul 2004) New Revision: 2708 Modified: tinysofa/snapshot/automake/current/specs/automake.spec Log: - Sync with 2.0. - Kept: - automake-1.8.5.tar.bz2: Modified: tinysofa/snapshot/automake/current/specs/automake.spec =================================================================== --- tinysofa/snapshot/automake/current/specs/automake.spec 2004-07-01 15:44:06 UTC (rev 2707) +++ tinysofa/snapshot/automake/current/specs/automake.spec 2004-07-01 15:44:09 UTC (rev 2708) @@ -1,129 +1,209 @@ +%define api_version 1.8 + +%define with_check 0 + Summary: A GNU tool for automatically creating Makefiles. Name: automake -Version: 1.8.5 +Version: %{api_version}.5 Release: 1ts License: GPL -Group: tinysofa official +Group: Development/Tools Source: ftp://ftp.gnu.org/gnu/automake/automake-%{version}.tar.bz2 -URL: http://www.gnu.org/software/automake/ -BuildRequires: texinfo, autoconf -Requires: perl -Prereq: htmlinfo -BuildArchitectures: noarch -BuildRoot: %{_tmppath}/%{name}-root +URL: http://sources.redhat.com/automake +Requires: perl, autoconf >= 2.58 +Buildrequires: autoconf >= 2.58 +Prereq: /sbin/install-info +BuildArch: noarch +Buildroot: %{_tmppath}/%{name}-%{version}-root %description -Automake is an experimental Makefile generator. Automake was inspired -by the 4.4BSD make and include files, but aims to be portable and to -conform to the GNU standards for Makefile variables and targets. +Automake is a tool for automatically generating `Makefile.in' +files compliant with the GNU Coding Standards. You should install Automake if you are developing software and would -like to use its capabilities of automatically generating GNU -standard Makefiles. if you install Automake, you will also need to -install GNU's Autoconf package. +like to use its ability to automatically generate GNU standard +Makefiles. If you install Automake, you will also need to install +GNU's Autoconf package. %prep -%setup -q +%setup -q -n automake-%{version} %build - -%configure - +./configure --prefix=%{_prefix} make -pushd doc -makeinfo --html --no-split %{name}.texi -popd +%if %{with_check} + make check # VERBOSE=x +%endif %install -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT/usr/share/html/%{name} -mkdir -p $RPM_BUILD_ROOT/usr/share/aclocal -install -m 644 doc/%{name}.html $RPM_BUILD_ROOT/usr/share/html/%{name}/ -rm -rf $RPM_BUILD_ROOT/usr/share/info +rm -rf ${RPM_BUILD_ROOT} +%makeinstall + +#gzip -9nf ${RPM_BUILD_ROOT}%{_infodir}/automake* + +# create this dir empty so we can own it +mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/aclocal +rm -f $RPM_BUILD_ROOT%{_infodir}/dir + %clean -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT +rm -rf ${RPM_BUILD_ROOT} %post -/usr/sbin/htmlinfo_update.sh +/sbin/install-info %{_infodir}/automake.info.gz %{_infodir}/dir -%postun -/usr/sbin/htmlinfo_update.sh +%preun +if [ $1 = 0 ]; then + /sbin/install-info --delete %{_infodir}/automake.info.gz %{_infodir}/dir +fi %files %defattr(-,root,root) %doc AUTHORS COPYING ChangeLog INSTALL NEWS README THANKS TODO -/usr/bin/* -%dir /usr/share/aclocal -/usr/share/aclocal-* -/usr/share/automake-* -/usr/share/html/%{name} +%{_bindir}/* +%{_infodir}/*.info* +%{_datadir}/automake-%{api_version} +%{_datadir}/aclocal-%{api_version} +%dir %{_datadir}/aclocal %changelog -* Wed May 19 2004 tsintegrate 1.8.5-1ts -- current (1.8.5-1ok) integrated as 1.8.5-1ts for release 1.0-U1 +* Thu May 13 2004 Jens Petersen - 1.8.4-1 +- update to 1.8.4 -* Tue May 18 2004 Omar Kilani 1.8.5-1ok -- New upstream: 1.8.5. +* Fri Mar 12 2004 Jens Petersen - 1.8.3-1 +- update to 1.8.3 bugfix release -* Thu May 13 2004 Omar Kilani 1.8.4-2ok -- Make /usr/share/aclocal. -- Own /usr/share/aclocal. +* Fri Feb 13 2004 Elliot Lee +- rebuilt -* Tue May 11 2004 Omar Kilani 1.8.4-1ts -- Add BuildRequires autoconf. +* Tue Jan 13 2004 Jens Petersen - 1.8.2-1 +- 1.8.2 bugfix release +- do not pass VERBOSE=xNO to "make check" as non-empty means be verbose -* Mon Apr 26 2004 Omar Kilani 1.8.4-1ts -- New upstream: 1.8.4. +* Thu Dec 11 2003 Jens Petersen - 1.8-1 +- update to 1.8 release +- require autoconf 2.58 or later +- don't use %%configure for now to prevent very recent configure from running + "config.sub noarch-redhat-linux" -* Wed Mar 31 2004 Omar Kilani 1.8.3-1ts -- New upstream. +* Mon Nov 10 2003 Jens Petersen - 1.7.9-1 +- update to 1.7.9 bugfix release +- require autoconf 2.54 or later -* Tue Feb 10 2004 Chr. Toldnes 1.8.2-2ct -- automake.texi had moved to doc +* Tue Oct 7 2003 Jens Petersen - 1.7.8-1 +- update to 1.7.8 bugfix release -* Sat Feb 7 2004 Omar Kilani 1.8.2-1ok -- New upstream. +* Wed Sep 10 2003 Jens Petersen - 1.7.7-1 +- update to 1.7.7 bugfix release -* Sun Dec 7 2003 Erlend Midttun 1.7.9-1tr -- New upstream. +* Fri Jul 11 2003 Jens Petersen - 1.7.6-1 +- update to 1.7.6 bugfix release -* Wed Jun 18 2003 Erlend Midttun 1.7.5-2tr -- Big rebuild +* Tue May 20 2003 Jens Petersen - 1.7.5-1 +- update to 1.7.5 bugfix release -* Thu May 22 2003 Erlend Midttun 1.7.5-1em -- New upstream +* Thu Apr 24 2003 Jens Petersen - 1.7.4-1 +- update to 1.7.4 -* Mon Mar 24 2003 Erlend Midttun 1.6.2-3em -- Rebuilt against glibc 2.3.2. +* Thu Mar 6 2003 Jens Petersen - 1.7.3-1 +- update to 1.7.3 +- python dir lib64 patch no longer needed +- build requires Autoconf 2.54 or later -* Thu Oct 24 2002 Christian H. Toldnes 1.6.2-2ct -- Replaced info with htmlinfo. -- new buildreq and prereq. +* Mon Jan 27 2003 Jens Petersen - 1.6.3-5 +- patch from 1.7-branch to try python distutils for setting pythondir (#80994) -* Thu Jul 18 2002 Nico Erfurth 1.6.2-1ne -- Updated to 1.6.2 -- Patches removed, the new package includes them +* Wed Jan 22 2003 Tim Powers +- rebuilt -* Thu May 30 2002 Christian H. Toldnes -- Rebuild with -1ct releasetag. +* Thu Dec 12 2002 Elliot Lee 1.6.3-3 +- Fix unpackaged file -* Fri Feb 01 2002 Erlend Midttun -- New upstream version: 1.5 +* Tue Dec 3 2002 Jens Petersen 1.6.3-2 +- add "--without check" rpmbuild option to switch "make check" off +- exclude info dir file +- don't gzip info files explicitly -* Fri Jun 1 2001 Oystein Viggen -- New upstream version: 1.4-p2 +* Mon Nov 18 2002 Jens Petersen +- use api_version in version -* Tue Apr 17 2001 Erlend Midttun -- God alone knows how this used to build, but it does now. +* Mon Jul 29 2002 Jens Petersen 1.6.3-1 +- bug fix release 1.6.3 -* Wed Mar 01 2000 Lars Gaarden -- /usr/share/info/dir should not be part of the package +* Thu Jul 11 2002 Jens Petersen 1.6.2-2 +- add buildrequires autoconf 2.52 or greater [reported by Edward Avis] -* Mon Feb 28 2000 Lars Gaarden -- moved info files to /usr/share/info, FHS +* Wed Jun 19 2002 Jens Petersen 1.6.2-1 +- 1.6.2 (bug fix release) +- do "make check" after building +* Thu May 23 2002 Tim Powers 1.6.1-2 +- automated rebuild + +* Tue Apr 23 2002 Jens Petersen 1.6.1-1 +- 1.6.1 + +* Tue Mar 12 2002 Jens Petersen 1.6-1 +- new package based on automake15 +- 1.6 + +* Wed Jan 23 2002 Jens Petersen 1.5-8 +- better aclocal versioning + +* Wed Jan 23 2002 Jens Petersen 1.5-7 +- don't version datadir/automake + +* Tue Jan 15 2002 Jens Petersen 1.5-6 +- version suffix programs and data directories +- own symlinks to programs and /usr/share/aclocal + +* Wed Jan 09 2002 Tim Powers 1.5-5 +- automated rebuild + +* Wed Jan 9 2002 Bernhard Rosenkraenzer 1.5-4 +- Completely back out the fix for #56624 for now, it causes more problems + than it fixes in either form. + +* Wed Jan 9 2002 Bernhard Rosenkraenzer 1.5-3 +- Don't use AS_DIRNAME, it doesn't work. + +* Tue Jan 7 2002 Jens Petersen 1.5-2 +- Patch depout.m4 to handle makefiles passed to make with "-f" (#56624) + +* Tue Sep 18 2001 Bernhard Rosenkraenzer 1.5-1 +- Update to 1.5 - much better to coexist with autoconf 2.52... +- Fix specfile +- No patches + +* Fri Aug 24 2001 Jens Petersen - 1.4p5-2 +- dont raise error when there is source in a subdirectory (bug #35156). + This was preventing automake from working in binutuls/gas + [patch from HJ Lu ] +- format long lines of output properly with backslash + newlines as in 1.4 + (bug #35259) [patch from HJ Lu ] + +* Sat Jul 21 2001 Florian La Roche +- 1.4-p5, fixes #48788 + +* Tue Jun 12 2001 Florian La Roche +- add the patch from #20559 +- really update to 1.4-p4 + +* Mon Jun 11 2001 Florian La Roche +- update to 1.4-p4 + +* Sat May 12 2001 Owen Taylor +- Version 1.4-p1 to work with libtool-1.4 + +* Wed Jul 12 2000 Prospector +- automatic rebuild + +* Mon Jun 5 2000 Jeff Johnson +- FHS packaging. + +* Fri Feb 04 2000 Nalin Dahyabhai +- fix bug #8870 + * Sat Aug 21 1999 Jeff Johnson - revert to pristine automake-1.4. From svn at tinysofa.org Thu Jul 1 15:44:23 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 01:44:23 +1000 (EST) Subject: [tinysofa-svn] r2710 - in tinysofa/snapshot/bc/current: sources specs Message-ID: <20040701154423.E15934E817B@minbar.tinysofa.org> Author: omar Date: 2004-07-02 01:44:23 +1000 (Fri, 02 Jul 2004) New Revision: 2710 Added: tinysofa/snapshot/bc/current/sources/bc-1.06-info_exp_bessel.patch tinysofa/snapshot/bc/current/sources/bc-1.06-readline42.patch tinysofa/snapshot/bc/current/sources/bc-1.06-s390.patch tinysofa/snapshot/bc/current/sources/bc-1.06.tar.bz2 Removed: tinysofa/snapshot/bc/current/sources/bc-1.06-readline.patch tinysofa/snapshot/bc/current/sources/bc-1.06.tar.gz Modified: tinysofa/snapshot/bc/current/specs/bc.spec Log: - Sync with 2.0. - Added: - bc-1.06-info_exp_bessel.patch: - bc-1.06-readline42.patch: - bc-1.06-s390.patch: - bc-1.06.tar.bz2: - Removed: - bc-1.06-readline.patch: - bc-1.06.tar.gz: Added: tinysofa/snapshot/bc/current/sources/bc-1.06-info_exp_bessel.patch =================================================================== --- tinysofa/snapshot/bc/current/sources/bc-1.06-info_exp_bessel.patch 2004-07-01 15:44:20 UTC (rev 2709) +++ tinysofa/snapshot/bc/current/sources/bc-1.06-info_exp_bessel.patch 2004-07-01 15:44:23 UTC (rev 2710) @@ -0,0 +1,15 @@ +--- bc-1.06/doc/bc.info.info_exp_bessel 2003-08-12 14:57:45.000000000 +0200 ++++ bc-1.06/doc/bc.info 2003-08-12 14:57:51.000000000 +0200 +@@ -664,10 +664,10 @@ + `l (X)' + The natural logarithm of X. + +-`E (X)' ++`e (X)' + The exponential function of raising E to the value X. + +-`J (N,X)' ++`j (N,X)' + The bessel function of integer order N of X. + +  Deleted: tinysofa/snapshot/bc/current/sources/bc-1.06-readline.patch =================================================================== --- tinysofa/snapshot/bc/current/sources/bc-1.06-readline.patch 2004-07-01 15:44:20 UTC (rev 2709) +++ tinysofa/snapshot/bc/current/sources/bc-1.06-readline.patch 2004-07-01 15:44:23 UTC (rev 2710) @@ -1,11 +0,0 @@ ---- bc-1.06/bc/scan.l.orig Wed Sep 13 20:25:47 2000 -+++ bc-1.06/bc/scan.l Wed Jun 13 11:08:41 2001 -@@ -143,7 +143,7 @@ - - /* Definitions for readline access. */ - extern FILE *rl_instream; --_PROTOTYPE(char *readline, (char *)); -+_PROTOTYPE(char *readline, (const char *)); - - /* rl_input puts upto MAX characters into BUF with the number put in - BUF placed in *RESULT. If the yy input file is the same as Added: tinysofa/snapshot/bc/current/sources/bc-1.06-readline42.patch =================================================================== --- tinysofa/snapshot/bc/current/sources/bc-1.06-readline42.patch 2004-07-01 15:44:20 UTC (rev 2709) +++ tinysofa/snapshot/bc/current/sources/bc-1.06-readline42.patch 2004-07-01 15:44:23 UTC (rev 2710) @@ -0,0 +1,10 @@ +--- bc-1.06/bc/scan.l.sux Fri May 11 14:27:20 2001 ++++ bc-1.06/bc/scan.l Fri May 11 14:27:32 2001 +@@ -143,7 +143,6 @@ + + /* Definitions for readline access. */ + extern FILE *rl_instream; +-_PROTOTYPE(char *readline, (char *)); + + /* rl_input puts upto MAX characters into BUF with the number put in + BUF placed in *RESULT. If the yy input file is the same as Added: tinysofa/snapshot/bc/current/sources/bc-1.06-s390.patch =================================================================== --- tinysofa/snapshot/bc/current/sources/bc-1.06-s390.patch 2004-07-01 15:44:20 UTC (rev 2709) +++ tinysofa/snapshot/bc/current/sources/bc-1.06-s390.patch 2004-07-01 15:44:23 UTC (rev 2710) @@ -0,0 +1,14 @@ +--- bc-1.06/bc/load.c.s390 Wed Sep 13 20:22:38 2000 ++++ bc-1.06/bc/load.c Wed Sep 5 16:10:18 2001 +@@ -156,7 +156,10 @@ + long label_no; + long vaf_name; /* variable, array or function number. */ + long func; +- program_counter save_adr; ++ /* Make save_adr static. Otherwise the whole address save stuff doesn't make ++ any sense at all and break e.g. on S390. ++ 09/05/01 Phil Knirsch */ ++ static program_counter save_adr; + + /* Initialize. */ + str = code; Added: tinysofa/snapshot/bc/current/sources/bc-1.06.tar.bz2 =================================================================== (Binary files differ) Property changes on: tinysofa/snapshot/bc/current/sources/bc-1.06.tar.bz2 ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: tinysofa/snapshot/bc/current/sources/bc-1.06.tar.gz =================================================================== (Binary files differ) Modified: tinysofa/snapshot/bc/current/specs/bc.spec =================================================================== --- tinysofa/snapshot/bc/current/specs/bc.spec 2004-07-01 15:44:20 UTC (rev 2709) +++ tinysofa/snapshot/bc/current/specs/bc.spec 2004-07-01 15:44:23 UTC (rev 2710) @@ -1,111 +1,155 @@ Summary: GNU's bc (a numeric processing language) and dc (a calculator). Name: bc Version: 1.06 -Release: 12jh +Release: 16.1ts License: GPL -Group: tinysofa/main -Source: ftp://ftp.gnu.org/gnu/bc/bc-%{version}.tar.gz -Patch: bc-1.06-readline.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-root -BuildRequires: flex -BuildRequires: readline, readline-devel -BuildRequires: ncurses, ncurses-devel -BuildRequires: libtermcap, libtermcap-devel -%info_requires +URL: http://www.gnu.org/software/bc/ +Group: Applications/Engineering +Source: ftp://ftp.gnu.org/gnu/bc/bc-%{version}.tar.bz2 +Patch1: bc-1.06-readline42.patch +Patch2: bc-1.06-s390.patch +Patch3: bc-1.06-info_exp_bessel.patch +Prereq: /sbin/install-info grep +# tinysofa: missing build requires. +BuildRequires: autoconf readline-devel +Buildroot: %{_tmppath}/%{name}-%{version}-root - %description -The bc package includes bc and dc. Bc is an arbitrary precision numeric -processing arithmetic language. Dc is an interactive arbitrary precision -stack based calculator, which can be used as a text mode calculator. +The bc package includes bc and dc. Bc is an arbitrary precision +numeric processing arithmetic language. Dc is an interactive +arbitrary precision stack based calculator, which can be used as a +text mode calculator. Install the bc package if you need its number handling capabilities or if you would like to use its text mode calculator. - %prep %setup -q -%patch -p1 +%patch1 -p1 -b .rl22 +%patch2 -p1 -b .s390 +%patch3 -p1 -b .info_exp_bessel - %build +autoconf %configure --with-readline -%make +make +%install +rm -rf $RPM_BUILD_ROOT -%install %makeinstall +rm -f $RPM_BUILD_ROOT/%{_infodir}/dir +gzip -n -9f $RPM_BUILD_ROOT/%{_infodir}/* -%install_info -n dc doc/dc.texi -%install_info -n bc doc/bc.texi -%nuke_info - %clean -%clean_buildroot +rm -rf $RPM_BUILD_ROOT - %post -%info_post +# previous versions of bc put an improper entry into %{_infodir}/dir -- remove +# it +if grep 'dc: (bc)' %{_infodir}/dir > /dev/null; then + tmpfile=`mktemp ${_infodir}/dir.XXXXXX` + grep -v 'The GNU RPN calculator' < %{_infodir}/dir > $tmpfile + mv -f $tmpfile %{_infodir}/dir +fi -%postun -%info_postun +/sbin/install-info %{_infodir}/dc.info.gz %{_infodir}/dir --entry="* dc: (dc). The GNU RPN calculator." +%preun +if [ $1 = 0 ]; then + /sbin/install-info --delete %{_infodir}/dc.info.gz %{_infodir}/dir --entry="* dc: (dc). The GNU RPN calculator." +fi %files %defattr(-,root,root) -%{_bindir}/dc -%{_bindir}/bc -%{_mandir}/man1/bc.1* -%{_mandir}/man1/dc.1* -%{_htmldir} +%doc COPYING COPYING.LIB FAQ AUTHORS NEWS README +/usr/bin/dc +/usr/bin/bc +%{_mandir}/*/* +%{_infodir}/* - %changelog -* Wed May 19 2004 tsintegrate 1.06-11ts -- current (1.06-10ts) integrated as 1.06-11ts for release 1.0-U1 +* Fri Feb 13 2004 Elliot Lee +- rebuilt -* Thu May 13 2004 Jaakko Heinonen -- make package build as non-root -- replace some hardcoded directories with macros -- remove unneeded strip and mkdir operations -- remove obsolete PreReq: grep +* Thu Aug 14 2003 Thomas Woerner 1.06-15 +- fixed incorrect capitalization in bc info page (#89851) -* Tue May 11 2004 Omar Kilani 1.06-10ts -- Add BuildRequires flex. -- Add BuildRequires ncurses, ncurses-devel. -- ADd BuildRequires readline, readline-devel. -- Add BuildRequires libtermcap, libtermcap-devel. +* Tue Jun 17 2003 Thomas Woerner 1.06-14 +- rebuild -* Mon Dec 8 2003 Erlend Midttun 1.06-7tr -- Big rebuild +* Wed Jun 04 2003 Elliot Lee +- rebuilt -* Wed Jun 18 2003 Erlend Midttun 1.06-6tr -- Big rebuild +* Wed Jan 22 2003 Tim Powers +- rebuilt -* Mon Mar 24 2003 Erlend Midttun 1.06-6em -- Rebuilt against glibc 2.3.2. +* Wed Dec 11 2002 Tim Powers 1.06-11 +- rebuild on all arches -* Tue Jul 23 2002 Christian H. Toldnes 1.06-5ct -- Rebuilt for 2.0 -- info removed -- spec cleanup +* Fri Jun 21 2002 Tim Powers +- automated rebuild -* Wed Jun 13 2001 Oystein Viggen -- Fix build problems with readline +* Thu May 23 2002 Tim Powers +- automated rebuild -* Fri Mar 3 2001 Alexander Reelsen -- Picked up 1.06 +* Tue Feb 26 2002 Trond Eivind Glomsr?d 1.06-8 +- Rebuild -* Tue Nov 28 2000 Erlend Midttun -- Rebuild to fix libraries +* Mon Feb 4 2002 Trond Eivind Glomsr?d 1.06-7 +- s/Copyright/License/ +- The %%doc file AUTHOR should be AUTHORS -* Mon Sep 18 2000 Erlend Midttun -- Rebuild to fix libraries +* Wed Jan 09 2002 Tim Powers +- automated rebuild -* Tue Mar 21 2000 Erlend Midttun -- Moved man pages to comply with FHS +* Wed Sep 9 2001 Phil Knirsch 1.06-5 +- Fixed a variable initialization problem in load.c which broke badly on S390. +* Fri May 11 2001 Preston Brown 1.06-4 +- use mktemp, not the pid shell variable, in rpm scriptlets + +* Fri May 11 2001 Bernhard Rosenkraenzer 1.06-3 +- rebuild with new readline +- Add patch to fix compilation with recent readline versions + +* Fri Dec 01 2000 Trond Eivind Glomsr?d +- Add COPYING, COPYING.LIB, FAQ, AUTHORS, NEWS, README + +* Sun Nov 19 2000 Florian La Roche +- update to bc 1.06 + +* Fri Jul 21 2000 Trond Eivind Glomsr?d +- rebuild + +* Wed Jul 12 2000 Prospector +- automatic rebuild + +* Tue Jun 06 2000 Trond Eivind Glomsr?d +- use %%makeinstall, %%configure, %%{_mandir}, %%{_infodir} + and %%{_tmppath} + +* Wed May 10 2000 Trond Eivind Glomsr?d +- added URL +- let build system handle man page gzipping + +* Thu Apr 06 2000 Trond Eivind Glomsr?d +- fixed bug 7145 (long commands -> coredump) +- removed explicit stripping, it does this by itself anyway +- gzipped man-pages + +* Thu Mar 30 2000 Bernhard Rosenkraenzer +- Rebuild with new readline (4.1) + +* Fri Mar 24 2000 Bernhard Rosenkraenzer +- Rebuild with new readline (4.0) +- fix Source URL +- some spec file cleanups + +* Mon Feb 7 2000 Bill Nottingham +- handle compressed manpages + * Sun Mar 21 1999 Cristian Gafton - auto rebuild in the new build environment (release 4) From svn at tinysofa.org Thu Jul 1 17:44:14 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 03:44:14 +1000 (EST) Subject: [tinysofa-svn] r2870 - tinysofa/releases/1.1 Message-ID: <20040701174414.BDAF34E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-02 03:44:14 +1000 (Fri, 02 Jul 2004) New Revision: 2870 Added: tinysofa/releases/1.1/tinysofa-rpm-config/ Log: - copy tinysofa-rpm-config from snapshot Copied: tinysofa/releases/1.1/tinysofa-rpm-config (from rev 2869, tinysofa/snapshot/tinysofa-rpm-config) From svn at tinysofa.org Thu Jul 1 19:02:37 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 05:02:37 +1000 (EST) Subject: [tinysofa-svn] r2872 - tinysofa/releases/1.1/coreutils/current/specs Message-ID: <20040701190237.333A64E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-02 05:02:36 +1000 (Fri, 02 Jul 2004) New Revision: 2872 Modified: tinysofa/releases/1.1/coreutils/current/specs/coreutils.spec Log: - move /usr/bin/env to /bin - use more macros - change group Modified: tinysofa/releases/1.1/coreutils/current/specs/coreutils.spec =================================================================== --- tinysofa/releases/1.1/coreutils/current/specs/coreutils.spec 2004-07-01 18:56:50 UTC (rev 2871) +++ tinysofa/releases/1.1/coreutils/current/specs/coreutils.spec 2004-07-01 19:02:36 UTC (rev 2872) @@ -1,9 +1,9 @@ Summary: The GNU fileutils, sh-utils and textutils combined Name: coreutils Version: 5.2.1 -Release: 2ts +Release: 3jh License: GPL -Group: tinysofa official +Group: tinysofa/main Source0: ftp://ftp.gnu.org/gnu/coreutils/coreutils-%{version}.tar.bz2 Source1: DIR_COLORS Source2: DIR_COLORS.xterm @@ -89,17 +89,14 @@ --enable-selinux \ %endif --enable-pam -make all CPPFLAGS="-DUSE_PAM" su_LDFLAGS="-lpam -lpam_misc" +%make all CPPFLAGS="-DUSE_PAM" su_LDFLAGS="-lpam -lpam_misc" -make +%make cd doc makeinfo --html --no-split %{name}.texi %install -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf "$RPM_BUILD_ROOT" - -#make prefix=${RPM_BUILD_ROOT}%{_prefix} exec_prefix=${RPM_BUILD_ROOT} DESTDIR=$RPM_BUILD_ROOT install %makeinstall mkdir -p $RPM_BUILD_ROOT/etc/pam.d @@ -136,7 +133,7 @@ pushd $RPM_BUILD_ROOT/usr/bin for i in basename cat chgrp chmod chown cp date dd df echo false \ ln ls mkdir mknod mv nice pwd rm rmdir sleep sort stty sync true \ - uname touch;do + uname touch env;do mv $i ../../bin/ done popd @@ -144,15 +141,13 @@ %clean -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf "$RPM_BUILD_ROOT" +%clean_buildroot %post doc -/usr/sbin/htmlinfo_update.sh +%info_post %preun doc -if [ $1 = 0 ]; then - /usr/sbin/htmlinfo_update.sh -fi +%info_preun %files %defattr(-,root,root) @@ -170,9 +165,14 @@ %files doc %defattr(-,root,root) -%{_prefix}/share/html/%{name} +%{_htmldir}/%{name} %changelog +* Thu Jul 1 2004 Jaakko Heinonen 5.2.1-3jh +- move /usr/bin/env to /bin +- use more macros +- change group + * Wed May 19 2004 tsintegrate 5.2.1-2ts - current (5.2.1-1ts) integrated as 5.2.1-2ts for release 1.0-U1 From svn at tinysofa.org Thu Jul 1 19:03:27 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 05:03:27 +1000 (EST) Subject: [tinysofa-svn] r2873 - tinysofa/releases/1.1/coreutils/current/specs Message-ID: <20040701190327.7A34F4E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-02 05:03:27 +1000 (Fri, 02 Jul 2004) New Revision: 2873 Modified: tinysofa/releases/1.1/coreutils/current/specs/coreutils.spec Log: - %use_selinux -> %with_selinux Modified: tinysofa/releases/1.1/coreutils/current/specs/coreutils.spec =================================================================== --- tinysofa/releases/1.1/coreutils/current/specs/coreutils.spec 2004-07-01 19:02:36 UTC (rev 2872) +++ tinysofa/releases/1.1/coreutils/current/specs/coreutils.spec 2004-07-01 19:03:27 UTC (rev 2873) @@ -85,7 +85,7 @@ %build %configure --disable-nls \ -%if %{use_selinux} +%if %{with_selinux} --enable-selinux \ %endif --enable-pam From svn at tinysofa.org Thu Jul 1 19:51:08 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 05:51:08 +1000 (EST) Subject: [tinysofa-svn] r2874 - tinysofa/releases/1.1/coreutils/current/specs Message-ID: <20040701195108.E71994E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-02 05:51:08 +1000 (Fri, 02 Jul 2004) New Revision: 2874 Modified: tinysofa/releases/1.1/coreutils/current/specs/coreutils.spec Log: - link env to /usr/bin - fix /etc/profile.d/* permissions Modified: tinysofa/releases/1.1/coreutils/current/specs/coreutils.spec =================================================================== --- tinysofa/releases/1.1/coreutils/current/specs/coreutils.spec 2004-07-01 19:03:27 UTC (rev 2873) +++ tinysofa/releases/1.1/coreutils/current/specs/coreutils.spec 2004-07-01 19:51:08 UTC (rev 2874) @@ -35,7 +35,7 @@ Patch904: coreutils-5.0-allow_old_options.patch -BuildRoot: %{_tmppath}/%{name}-root +BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRequires: texinfo gettext libtermcap-devel pam-devel help2man libacl-devel BuildRequires: libattr-devel libattr libacl Requires: pam libacl libattr @@ -51,8 +51,8 @@ %package doc Summary: Various documentation bits found in the coreutils source. -Group: tinysofa official -Prereq: htmlinfo +Group: tinysofa/documentation +%info_requires %description doc This package contains documentation files form the coreutils package. @@ -103,8 +103,8 @@ mkdir -p $RPM_BUILD_ROOT/etc/profile.d install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/etc/DIR_COLORS install -m 644 %{SOURCE2} $RPM_BUILD_ROOT/etc/DIR_COLORS.xterm -install -m 644 %{SOURCE3} $RPM_BUILD_ROOT/etc/profile.d/colorls.sh -install -m 644 %{SOURCE4} $RPM_BUILD_ROOT/etc/profile.d/colorls.csh +install -m 755 %{SOURCE3} $RPM_BUILD_ROOT/etc/profile.d/colorls.sh +install -m 755 %{SOURCE4} $RPM_BUILD_ROOT/etc/profile.d/colorls.csh install -m 644 %{SOURCE5} $RPM_BUILD_ROOT/etc/pam.d/su mkdir -p $RPM_BUILD_ROOT/usr/share/html/%{name}/ install -m 644 doc/%{name}.html $RPM_BUILD_ROOT/usr/share/html/%{name}/ @@ -122,8 +122,7 @@ ln -sf test $RPM_BUILD_ROOT/usr/bin/[ # Remove info pages: -rm -rf $RPM_BUILD_ROOT/usr/info -rm -rf $RPM_BUILD_ROOT/usr/share/info +%nuke_info # Remove locales settings: rm -rf $RPM_BUILD_ROOT/usr/share/locale @@ -136,10 +135,10 @@ uname touch env;do mv $i ../../bin/ done +ln -s ../../bin/env env popd - %clean %clean_buildroot @@ -153,8 +152,8 @@ %defattr(-,root,root) %config /etc/DIR_COLORS %config /etc/DIR_COLORS.xterm -%config /etc/profile.d/colorls.sh -%config /etc/profile.d/colorls.csh +%attr(755,root,root) %config /etc/profile.d/colorls.sh +%attr(755,root,root) %config /etc/profile.d/colorls.csh %config(noreplace) /etc/pam.d/su %doc ABOUT-NLS AUTHORS COPYING ChangeLog NEWS README THANKS TODO From svn at tinysofa.org Thu Jul 1 20:04:04 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 06:04:04 +1000 (EST) Subject: [tinysofa-svn] r2875 - tinysofa/releases/1.1/linux-headers/current/specs Message-ID: <20040701200404.66E774E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-02 06:04:04 +1000 (Fri, 02 Jul 2004) New Revision: 2875 Modified: tinysofa/releases/1.1/linux-headers/current/specs/linux-headers.spec Log: - provide glibc-kernheaders Modified: tinysofa/releases/1.1/linux-headers/current/specs/linux-headers.spec =================================================================== --- tinysofa/releases/1.1/linux-headers/current/specs/linux-headers.spec 2004-07-01 19:51:08 UTC (rev 2874) +++ tinysofa/releases/1.1/linux-headers/current/specs/linux-headers.spec 2004-07-01 20:04:04 UTC (rev 2875) @@ -1,11 +1,11 @@ Summary: Header files for the Linux kernel for use by glibc Name: linux-headers Version: 2.4.26 -Release: 7ts +Release: 8jh License: GPL -Group: tinysofa official +Group: tinysofa/development ExclusiveOS: Linux -Provides: kernel-headers +Provides: kernel-headers glibc-kernheaders Prereq: coreutils initscripts bash BuildRoot: %{_tmppath}/%{name}-%{version}-root @@ -95,7 +95,7 @@ popd %clean -rm -rf $RPM_BUILD_ROOT +%clean_buildroot %pre @@ -121,6 +121,9 @@ %changelog +* Thu Jul 1 2004 Jaakko Heinonen 2.4.26-8jh +- provide glibc-kernheaders + * Fri Jun 18 2004 tsintegrate 2.4.26-7ts - current (2.4.26-7ts) integrated as 2.4.26-7ts for release 1.0-U2 From svn at tinysofa.org Thu Jul 1 20:14:43 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 06:14:43 +1000 (EST) Subject: [tinysofa-svn] r2876 - in tinysofa/releases/1.1: samba/current/specs squid/current/specs vsftpd/current/specs Message-ID: <20040701201443.9E93C4E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-02 06:14:43 +1000 (Fri, 02 Jul 2004) New Revision: 2876 Modified: tinysofa/releases/1.1/samba/current/specs/samba.spec tinysofa/releases/1.1/squid/current/specs/squid.spec tinysofa/releases/1.1/vsftpd/current/specs/vsftpd.spec Log: - enable pie Modified: tinysofa/releases/1.1/samba/current/specs/samba.spec =================================================================== --- tinysofa/releases/1.1/samba/current/specs/samba.spec 2004-07-01 20:04:04 UTC (rev 2875) +++ tinysofa/releases/1.1/samba/current/specs/samba.spec 2004-07-01 20:14:43 UTC (rev 2876) @@ -108,7 +108,7 @@ %patch1 -p1 -b .smbw %patch2 -p1 -b .pipedir %patch3 -p1 -b .logfiles -#%patch4 -p1 -b .pie +%patch4 -p1 -b .pie %patch5 -p1 -b .nmbd-netbiosname %patch6 -p1 -b .upstream %patch7 -p1 -b .man Modified: tinysofa/releases/1.1/squid/current/specs/squid.spec =================================================================== --- tinysofa/releases/1.1/squid/current/specs/squid.spec 2004-07-01 20:04:04 UTC (rev 2875) +++ tinysofa/releases/1.1/squid/current/specs/squid.spec 2004-07-01 20:14:43 UTC (rev 2876) @@ -86,7 +86,7 @@ # SASL does not work as it is written for sasl v1 # --enable-basic-auth-helpers="LDAP,MSNT,NCSA,PAM,SMB,YP,getpwnam,multi-domain-NTLM,winbind" \ -# export CFLAGS="-fPIE -Os -g -pipe -fsigned-char" ; export LDFLAGS=-pie ; +export CFLAGS="-fPIE -Os -g -pipe -fsigned-char" ; export LDFLAGS=-pie ; %configure \ --exec_prefix=%{_prefix} \ --bindir=%{_sbindir} \ @@ -120,7 +120,7 @@ --enable-arp-acl \ -with-aio \ -#export CFLAGS="-fPIE -Os -g -pipe -fsigned-char" ; export LDFLAGS=-pie ; +export CFLAGS="-fPIE -Os -g -pipe -fsigned-char" ; export LDFLAGS=-pie ; %make #mkdir faq Modified: tinysofa/releases/1.1/vsftpd/current/specs/vsftpd.spec =================================================================== --- tinysofa/releases/1.1/vsftpd/current/specs/vsftpd.spec 2004-07-01 20:04:04 UTC (rev 2875) +++ tinysofa/releases/1.1/vsftpd/current/specs/vsftpd.spec 2004-07-01 20:14:43 UTC (rev 2876) @@ -35,7 +35,7 @@ %build -%make CFLAGS="$RPM_OPT_FLAGS -pipe" LINK="" +%make CFLAGS="$RPM_OPT_FLAGS -fPIE -pipe" LINK="-pie" %install From svn at tinysofa.org Thu Jul 1 20:15:15 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 06:15:15 +1000 (EST) Subject: [tinysofa-svn] r2877 - tinysofa/releases/1.1/dhcp/current/specs Message-ID: <20040701201515.AEE554E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-02 06:15:15 +1000 (Fri, 02 Jul 2004) New Revision: 2877 Modified: tinysofa/releases/1.1/dhcp/current/specs/dhcp.spec Log: - enable pie Modified: tinysofa/releases/1.1/dhcp/current/specs/dhcp.spec =================================================================== --- tinysofa/releases/1.1/dhcp/current/specs/dhcp.spec 2004-07-01 20:14:43 UTC (rev 2876) +++ tinysofa/releases/1.1/dhcp/current/specs/dhcp.spec 2004-07-01 20:15:15 UTC (rev 2877) @@ -104,7 +104,7 @@ %patch114 -p1 -b .initialize %patch115 -p1 -b .ts-script %patch116 -p1 -b .staticroutes -#%patch117 -p1 -b .pie +%patch117 -p1 -b .pie #%patch118 -p1 -b .inherit-leases cp %SOURCE1 . From svn at tinysofa.org Thu Jul 1 20:22:51 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 06:22:51 +1000 (EST) Subject: [tinysofa-svn] r2878 - tinysofa/releases/1.1/kudzu/current/specs Message-ID: <20040701202251.D31014E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-02 06:22:51 +1000 (Fri, 02 Jul 2004) New Revision: 2878 Modified: tinysofa/releases/1.1/kudzu/current/specs/kudzu.spec Log: - use service macros Modified: tinysofa/releases/1.1/kudzu/current/specs/kudzu.spec =================================================================== --- tinysofa/releases/1.1/kudzu/current/specs/kudzu.spec 2004-07-01 20:15:15 UTC (rev 2877) +++ tinysofa/releases/1.1/kudzu/current/specs/kudzu.spec 2004-07-01 20:22:51 UTC (rev 2878) @@ -1,9 +1,9 @@ Name: kudzu Version: 1.1.22 -Release: 1ts +Release: 2jh License: GPL Summary: The Red Hat Linux hardware probing tool. -Group: tinysofa official +Group: tinysofa/main Source: kudzu-%{version}.tar.gz Source1: mkdtemp.tar.gz Source2: kudzu.init @@ -46,31 +46,31 @@ make install install-program DESTDIR=$RPM_BUILD_ROOT python -c 'from compileall import *; compile_dir("'$RPM_BUILD_ROOT'/usr/lib/python2.3",10,"/usr/lib/python2.3")' -install -m 755 %{SOURCE2} $RPM_BUILD_ROOT/etc/init.d/kudzu +install -m 755 %{SOURCE2} $RPM_BUILD_ROOT/%{_initrddir} %find_lang %{name} %clean -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT +%clean_buildroot %post -chkconfig --add kudzu +%service_post kudzu (/usr/sbin/kudzu -q -s; /usr/sbin/updfstab) >/dev/null 2>&1 -/sbin/restart_maybe kudzu - %preun -if [ $1 = 0 ]; then - chkconfig --del kudzu -fi +%service_preun kudzu +# no need to restart kudzu +#%postun +#%service_postun kudzu + %files -f %{name}.lang %defattr(-,root,root) %doc README hwconf-description %{_sbindir}/* %{_mandir}/man8/* %config(noreplace) /etc/sysconfig/kudzu -%config /etc/init.d/kudzu +%config %{_initrddir}/kudzu %config(noreplace) /etc/updfstab.conf %config /etc/updfstab.conf.default %{_libdir}/python*/site-packages/* @@ -679,4 +679,4 @@ * Wed Sep 8 1999 Bill Nottingham - get geometry for ide drives -- enumerate buses (jj at ultra.linux.cz) \ No newline at end of file +- enumerate buses (jj at ultra.linux.cz) From svn at tinysofa.org Thu Jul 1 20:24:17 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 06:24:17 +1000 (EST) Subject: [tinysofa-svn] r2879 - tinysofa/releases/1.1/vsftpd/current/specs Message-ID: <20040701202417.A83D94E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-02 06:24:17 +1000 (Fri, 02 Jul 2004) New Revision: 2879 Modified: tinysofa/releases/1.1/vsftpd/current/specs/vsftpd.spec Log: - fix group Modified: tinysofa/releases/1.1/vsftpd/current/specs/vsftpd.spec =================================================================== --- tinysofa/releases/1.1/vsftpd/current/specs/vsftpd.spec 2004-07-01 20:22:51 UTC (rev 2878) +++ tinysofa/releases/1.1/vsftpd/current/specs/vsftpd.spec 2004-07-01 20:24:17 UTC (rev 2879) @@ -3,7 +3,7 @@ Version: 1.2.2 Release: 3jh License: GPL -Group: tinysofa official +Group: tinysofa/main URL: http://vsftpd.beasts.org/ Source: ftp://vsftpd.beasts.org/users/cevans/%{name}-%{version}.tar.gz Source1: vsftpd.xinetd From svn at tinysofa.org Fri Jul 2 12:00:43 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 22:00:43 +1000 (EST) Subject: [tinysofa-svn] r2881 - tinysofa/releases/1.1 Message-ID: <20040702120043.24B374E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-02 22:00:42 +1000 (Fri, 02 Jul 2004) New Revision: 2881 Removed: tinysofa/releases/1.1/glibc/ Log: - remove glibc From svn at tinysofa.org Fri Jul 2 12:01:49 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 2 Jul 2004 22:01:49 +1000 (EST) Subject: [tinysofa-svn] r2882 - tinysofa/releases/1.1 Message-ID: <20040702120149.547AF4E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-02 22:01:49 +1000 (Fri, 02 Jul 2004) New Revision: 2882 Added: tinysofa/releases/1.1/glibc/ Log: - copy glibc from snapshot Copied: tinysofa/releases/1.1/glibc (from rev 2881, tinysofa/snapshot/glibc) From svn at tinysofa.org Fri Jul 2 18:59:42 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Sat, 3 Jul 2004 04:59:42 +1000 (EST) Subject: [tinysofa-svn] r2883 - tinysofa/releases/1.1 Message-ID: <20040702185942.BD65C4E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-03 04:59:42 +1000 (Sat, 03 Jul 2004) New Revision: 2883 Added: tinysofa/releases/1.1/apt/ Log: - copy apt from snapshot Copied: tinysofa/releases/1.1/apt (from rev 2882, tinysofa/snapshot/apt) From svn at tinysofa.org Fri Jul 2 19:18:06 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Sat, 3 Jul 2004 05:18:06 +1000 (EST) Subject: [tinysofa-svn] r2884 - in tinysofa/releases/1.1/apt/current: sources specs Message-ID: <20040702191806.5843B4E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-03 05:18:06 +1000 (Sat, 03 Jul 2004) New Revision: 2884 Modified: tinysofa/releases/1.1/apt/current/sources/rpmpriorities tinysofa/releases/1.1/apt/current/specs/apt.spec Log: - 1.1 spesific changes Modified: tinysofa/releases/1.1/apt/current/sources/rpmpriorities =================================================================== --- tinysofa/releases/1.1/apt/current/sources/rpmpriorities 2004-07-02 18:59:42 UTC (rev 2883) +++ tinysofa/releases/1.1/apt/current/sources/rpmpriorities 2004-07-02 19:18:06 UTC (rev 2884) @@ -1,6 +1,5 @@ Essential: apt - basesystem bash dev e2fsprogs @@ -10,6 +9,7 @@ initscripts kernel module-init-tools + modutils mount pam passwd Modified: tinysofa/releases/1.1/apt/current/specs/apt.spec =================================================================== --- tinysofa/releases/1.1/apt/current/specs/apt.spec 2004-07-02 18:59:42 UTC (rev 2883) +++ tinysofa/releases/1.1/apt/current/specs/apt.spec 2004-07-02 19:18:06 UTC (rev 2884) @@ -3,9 +3,9 @@ Name: apt Version: 0.5.15cnc6 -Release: 7ts +Release: 1jh Summary: Debian's Advanced Packaging Tool with RPM support -Group: System Environment/Base +Group: main License: GPL Source0: apt-%{version}%{?snapshot:_%{snapshot}}.tar.bz2 Source1: apt.conf @@ -33,7 +33,6 @@ Requires: bzip2 BuildRequires: binutils BuildRequires: coreutils -BuildRequires: docbook-utils BuildRequires: gcc-c++ BuildRequires: gawk BuildRequires: gcc @@ -53,10 +52,8 @@ BuildRequires: tar BuildRequires: which BuildRequires: beecrypt-devel -BuildRequires: libselinux-devel BuildRequires: elfutils-devel BuildRequires: elfutils-libelf-devel -BuildRequires: libselinux-devel PreReq: ldconfig, sed Requires: rpm >= 4.0.0, gnupg BuildRequires: bzip2-devel @@ -96,16 +93,15 @@ %patch4 -p1 -b .tinysofa #%patch5 -p1 -b .vvv %patch6 -p1 -b .tinysofa-srpm -%patch7 -p1 -b .tinysofa-selinux +#%patch7 -p1 -b .tinysofa-selinux %patch8 -p1 -b .tinysofa-gpg-import %build %configure --with-hashmap -make %{?_smp_mflags} +%make %install -rm -rf %{buildroot} -make install DESTDIR=%{buildroot} +%makeinstall_std mkdir -p %{buildroot}%{_localstatedir}/cache/apt/archives/partial mkdir -p %{buildroot}%{_localstatedir}/cache/apt/genpkglist @@ -177,48 +173,18 @@ %find_lang %{name} -%triggerun -- apt < 0.5.4 -# Convert options from 0.3.X to 0.5.X -CONF=/etc/apt/apt.conf -if [ -f $CONF ]; then - mv $CONF $CONF.rpmold - sed -e 's/HoldPkgs/Hold/' \ - -e 's/AllowedDupPkgs/Allow-Duplicated/' \ - -e 's/IgnorePkgs/Ignore/' \ - -e 's/PostInstall/Post-Install/' \ - -e 's/.*Methods .*//' \ - $CONF.rpmold > $CONF - if [ $? -ne 0 ]; then - mv -f $CONF.rpmold $CONF - echo "warning: couldn't convert old apt options" - else - echo "warning: original apt.conf saved as apt.conf.rpmold" 2>&1 - fi -fi -%triggerun -- apt > 0.5.4, apt < 0.5.4cnc4-1cl -# Fix bug in the trigger of first snapshot versions -CONF=/etc/apt/apt.conf -if [ -f $CONF ]; then - mv $CONF $CONF.rpmtmp.$$ - sed -e 's/Holds/Hold/' \ - $CONF.rpmtmp.$$ > $CONF - if [ $? -ne 0 ]; then - mv -f $CONF.rpmtmp.$$ $CONF - else - rm -f $CONF.rpmtmp.$$ - fi -fi - %post /sbin/ldconfig rm -f %{_localstatedir}/cache/apt/*.bin %postun -p /sbin/ldconfig + %clean -rm -rf %{buildroot} +%clean_buildroot + %files -f %{name}.lang %defattr(0644,root,root,0755) %doc COPYING* AUTHORS* @@ -260,7 +226,11 @@ %{_libdir}/libapt-pkg.la %{_includedir}/apt-pkg + %changelog +* Fri Jul 2 2004 Jaakko Heinonen +- initial port for 1.1 + * Thu Jun 03 2004 Omar Kilani - tinysofa. From svn at tinysofa.org Sat Jul 3 14:10:17 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Sun, 4 Jul 2004 00:10:17 +1000 (EST) Subject: [tinysofa-svn] r2885 - tinysofa/releases/1.1/sysvinit/current/specs Message-ID: <20040703141017.F2D164E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-04 00:10:16 +1000 (Sun, 04 Jul 2004) New Revision: 2885 Modified: tinysofa/releases/1.1/sysvinit/current/specs/sysvinit.spec Log: - Provides: SysVinit -> Provides: SysVinit = %{version} Modified: tinysofa/releases/1.1/sysvinit/current/specs/sysvinit.spec =================================================================== --- tinysofa/releases/1.1/sysvinit/current/specs/sysvinit.spec 2004-07-02 19:18:06 UTC (rev 2884) +++ tinysofa/releases/1.1/sysvinit/current/specs/sysvinit.spec 2004-07-03 14:10:16 UTC (rev 2885) @@ -1,7 +1,7 @@ Summary: Programs which control basic system processes. Name: sysvinit Version: 2.85 -Release: 6ts +Release: 7jh License: GPL Group: main Source: ftp://ftp.cistron.nl/pub/people/miquels/software/sysvinit-%{version}.tar.gz @@ -12,7 +12,7 @@ BuildRoot: %{_tmppath}/%{name}-root PreReq: setup Requires: pam >= 0.66-5 -Provides: SysVinit +Provides: SysVinit = %{version} %description The SysVinit package contains a group of processes that control @@ -26,7 +26,7 @@ %patch1 -p1 %patch2 -p1 %patch3 -p1 -%if %{use_selinux} +%if %{with_selinux} patch -p1 < %{SOURCE2} %endif @@ -34,7 +34,6 @@ make -C src %install -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT for I in sbin bin usr/bin usr/include usr/share/man/man{1,3,5,8} var/run dev; do mkdir -p $RPM_BUILD_ROOT/$I done @@ -45,7 +44,7 @@ exit 0 %clean -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT +%clean_buildroot %files %defattr(-,root,root) @@ -168,4 +167,4 @@ - built against glibc 2.0.4 * Fri Feb 07 1997 Michael K. Johnson -- Added sulogin.8 man page to file list. \ No newline at end of file +- Added sulogin.8 man page to file list. From svn at tinysofa.org Sat Jul 3 14:36:22 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Sun, 4 Jul 2004 00:36:22 +1000 (EST) Subject: [tinysofa-svn] r2886 - in tinysofa/releases/1.1/apt/current: sources specs Message-ID: <20040703143622.28D764E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-04 00:36:21 +1000 (Sun, 04 Jul 2004) New Revision: 2886 Added: tinysofa/releases/1.1/apt/current/sources/apt-0.5.15cnc6-manpages.tar.bz2 Modified: tinysofa/releases/1.1/apt/current/specs/apt.spec Log: - install manual pages Added: tinysofa/releases/1.1/apt/current/sources/apt-0.5.15cnc6-manpages.tar.bz2 =================================================================== (Binary files differ) Property changes on: tinysofa/releases/1.1/apt/current/sources/apt-0.5.15cnc6-manpages.tar.bz2 ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: tinysofa/releases/1.1/apt/current/specs/apt.spec =================================================================== --- tinysofa/releases/1.1/apt/current/specs/apt.spec 2004-07-03 14:10:16 UTC (rev 2885) +++ tinysofa/releases/1.1/apt/current/specs/apt.spec 2004-07-03 14:36:21 UTC (rev 2886) @@ -19,6 +19,7 @@ Source10: cdrom-mount.lua Source11: cdrom-mount.conf Source12: gpg-pubkey-0f1240a2-4060f9f9 +Source100: apt-0.5.15cnc6-manpages.tar.bz2 Patch1: apt-0.5.15cnc5-promote.patch Patch2: apt-0.5.15cnc6-snapshot-20040630.patch Patch3: apt-0.5.15cnc6-marksimple.patch @@ -56,7 +57,7 @@ BuildRequires: elfutils-libelf-devel PreReq: ldconfig, sed Requires: rpm >= 4.0.0, gnupg -BuildRequires: bzip2-devel +BuildRequires: bzip2-devel bzip2 tar BuildRequires: libstdc++-devel BuildRequires: rpm-devel >= 4.0.0 BuildRoot: %{_tmppath}/%{name}-%{version}-root @@ -168,6 +169,10 @@ %{buildroot}%{_sysconfdir}/apt/sources.list.tmp mv %{buildroot}%{_sysconfdir}/apt/sources.list{.tmp,} +pushd %{buildroot}%{_mandir} +bzip2 -dc %{SOURCE100} tar xvf - +popd + # Remove unpackaged files rm -f %{buildroot}%{_libdir}/libapt-pkg.a @@ -189,8 +194,8 @@ %defattr(0644,root,root,0755) %doc COPYING* AUTHORS* %doc doc/examples/configure-index -%{_mandir}/man5/* -%{_mandir}/man8/* +%attr(644,root,root) %{_mandir}/man5/* +%attr(644,root,root) %{_mandir}/man8/* %dir %{_sysconfdir}/apt %dir %{_sysconfdir}/apt/apt.conf.d %dir %{_sysconfdir}/apt/gpg From svn at tinysofa.org Sat Jul 3 14:42:27 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Sun, 4 Jul 2004 00:42:27 +1000 (EST) Subject: [tinysofa-svn] r2887 - tinysofa/releases/1.1/apt/current/specs Message-ID: <20040703144227.5EDC54E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-04 00:42:27 +1000 (Sun, 04 Jul 2004) New Revision: 2887 Modified: tinysofa/releases/1.1/apt/current/specs/apt.spec Log: - add missing pipe Modified: tinysofa/releases/1.1/apt/current/specs/apt.spec =================================================================== --- tinysofa/releases/1.1/apt/current/specs/apt.spec 2004-07-03 14:36:21 UTC (rev 2886) +++ tinysofa/releases/1.1/apt/current/specs/apt.spec 2004-07-03 14:42:27 UTC (rev 2887) @@ -170,7 +170,7 @@ mv %{buildroot}%{_sysconfdir}/apt/sources.list{.tmp,} pushd %{buildroot}%{_mandir} -bzip2 -dc %{SOURCE100} tar xvf - +bzip2 -dc %{SOURCE100} | tar xvf - popd # Remove unpackaged files From svn at tinysofa.org Sat Jul 3 14:48:29 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Sun, 4 Jul 2004 00:48:29 +1000 (EST) Subject: [tinysofa-svn] r2888 - tinysofa/releases/1.1/apt/current/specs Message-ID: <20040703144829.4D7144E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-04 00:48:29 +1000 (Sun, 04 Jul 2004) New Revision: 2888 Modified: tinysofa/releases/1.1/apt/current/specs/apt.spec Log: - ldconfig -> /sbin/ldconfig Modified: tinysofa/releases/1.1/apt/current/specs/apt.spec =================================================================== --- tinysofa/releases/1.1/apt/current/specs/apt.spec 2004-07-03 14:42:27 UTC (rev 2887) +++ tinysofa/releases/1.1/apt/current/specs/apt.spec 2004-07-03 14:48:29 UTC (rev 2888) @@ -55,7 +55,7 @@ BuildRequires: beecrypt-devel BuildRequires: elfutils-devel BuildRequires: elfutils-libelf-devel -PreReq: ldconfig, sed +PreReq: /sbin/ldconfig, sed Requires: rpm >= 4.0.0, gnupg BuildRequires: bzip2-devel bzip2 tar BuildRequires: libstdc++-devel From svn at tinysofa.org Sun Jul 4 18:59:04 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Mon, 5 Jul 2004 04:59:04 +1000 (EST) Subject: [tinysofa-svn] r2889 - tinysofa/releases/1.1/man/current/specs Message-ID: <20040704185904.BB2314E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-05 04:59:03 +1000 (Mon, 05 Jul 2004) New Revision: 2889 Modified: tinysofa/releases/1.1/man/current/specs/man.spec Log: - add BuildRequires: glibc-locales Modified: tinysofa/releases/1.1/man/current/specs/man.spec =================================================================== --- tinysofa/releases/1.1/man/current/specs/man.spec 2004-07-03 14:48:29 UTC (rev 2888) +++ tinysofa/releases/1.1/man/current/specs/man.spec 2004-07-04 18:59:03 UTC (rev 2889) @@ -24,7 +24,7 @@ Buildroot: %{_tmppath}/%{name}-%{version}-root PreReq: coreutils Requires: less, groff >= 1.18, nroff-i18n, findutils, mktemp >= 1.5-2.1.5x -BuildRequires: perl +BuildRequires: perl glibc-locales %description The man package includes three tools for finding information and/or From svn at tinysofa.org Sun Jul 4 19:06:51 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Mon, 5 Jul 2004 05:06:51 +1000 (EST) Subject: [tinysofa-svn] r2890 - tinysofa/releases/1.1/coreutils/current/specs Message-ID: <20040704190651.10BEB4E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-05 05:06:50 +1000 (Mon, 05 Jul 2004) New Revision: 2890 Modified: tinysofa/releases/1.1/coreutils/current/specs/coreutils.spec Log: - install /bin/su also as an user Modified: tinysofa/releases/1.1/coreutils/current/specs/coreutils.spec =================================================================== --- tinysofa/releases/1.1/coreutils/current/specs/coreutils.spec 2004-07-04 18:59:03 UTC (rev 2889) +++ tinysofa/releases/1.1/coreutils/current/specs/coreutils.spec 2004-07-04 19:06:50 UTC (rev 2890) @@ -109,6 +109,9 @@ mkdir -p $RPM_BUILD_ROOT/usr/share/html/%{name}/ install -m 644 doc/%{name}.html $RPM_BUILD_ROOT/usr/share/html/%{name}/ +# su +install -m 4755 src/su $RPM_BUILD_ROOT/bin + # Move chroot binary to /usr/sbin mkdir -p $RPM_BUILD_ROOT/usr/sbin mv $RPM_BUILD_ROOT/usr/bin/chroot $RPM_BUILD_ROOT/usr/sbin/chroot From svn at tinysofa.org Sun Jul 4 19:22:47 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Mon, 5 Jul 2004 05:22:47 +1000 (EST) Subject: [tinysofa-svn] r2891 - tinysofa/releases/1.1/coreutils/current/specs Message-ID: <20040704192247.F3F104E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-05 05:22:47 +1000 (Mon, 05 Jul 2004) New Revision: 2891 Modified: tinysofa/releases/1.1/coreutils/current/specs/coreutils.spec Log: - fix su installation Modified: tinysofa/releases/1.1/coreutils/current/specs/coreutils.spec =================================================================== --- tinysofa/releases/1.1/coreutils/current/specs/coreutils.spec 2004-07-04 19:06:50 UTC (rev 2890) +++ tinysofa/releases/1.1/coreutils/current/specs/coreutils.spec 2004-07-04 19:22:47 UTC (rev 2891) @@ -109,9 +109,6 @@ mkdir -p $RPM_BUILD_ROOT/usr/share/html/%{name}/ install -m 644 doc/%{name}.html $RPM_BUILD_ROOT/usr/share/html/%{name}/ -# su -install -m 4755 src/su $RPM_BUILD_ROOT/bin - # Move chroot binary to /usr/sbin mkdir -p $RPM_BUILD_ROOT/usr/sbin mv $RPM_BUILD_ROOT/usr/bin/chroot $RPM_BUILD_ROOT/usr/sbin/chroot @@ -140,8 +137,11 @@ done ln -s ../../bin/env env popd +# su +install -m 4755 src/su $RPM_BUILD_ROOT/bin + %clean %clean_buildroot From svn at tinysofa.org Sun Jul 4 20:32:28 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Mon, 5 Jul 2004 06:32:28 +1000 (EST) Subject: [tinysofa-svn] r2892 - tinysofa/releases/1.1 Message-ID: <20040704203228.6A87B4E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-05 06:32:28 +1000 (Mon, 05 Jul 2004) New Revision: 2892 Added: tinysofa/releases/1.1/setarch/ Log: - copy setarch from snapshot Copied: tinysofa/releases/1.1/setarch (from rev 2891, tinysofa/snapshot/setarch) From svn at tinysofa.org Sun Jul 4 20:39:27 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Mon, 5 Jul 2004 06:39:27 +1000 (EST) Subject: [tinysofa-svn] r2893 - tinysofa/releases/1.1/setarch/current/specs Message-ID: <20040704203927.8DF5A4E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-05 06:39:27 +1000 (Mon, 05 Jul 2004) New Revision: 2893 Modified: tinysofa/releases/1.1/setarch/current/specs/setarch.spec Log: - fix group for 1.1 - use macros Modified: tinysofa/releases/1.1/setarch/current/specs/setarch.spec =================================================================== --- tinysofa/releases/1.1/setarch/current/specs/setarch.spec 2004-07-04 20:32:28 UTC (rev 2892) +++ tinysofa/releases/1.1/setarch/current/specs/setarch.spec 2004-07-04 20:39:27 UTC (rev 2893) @@ -1,24 +1,27 @@ Summary: Personality setter Name: setarch Version: 1.4 -Release: 2ts +Release: 1jh Source0: %{name}-%{version}.tar.gz License: GPL -Group: System Environment/Kernel +Group: main BuildRoot: %{_tmppath}/%{name}-%{version}-root + %description This utility tells the kernel to report a different architecture than the current one, then runs a program in that environment. + %prep %setup -q + %build %{__cc} -o setarch setarch.c $RPM_OPT_FLAGS + %install -rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_bindir} $RPM_BUILD_ROOT%{_mandir}/man8 install -m444 setarch.8 $RPM_BUILD_ROOT%{_mandir}/man8 install -s -m555 setarch $RPM_BUILD_ROOT%{_bindir} @@ -44,14 +47,17 @@ echo ".so setarch.8" > $RPM_BUILD_ROOT%{_mandir}/man8/$I.8 done + %clean -rm -rf $RPM_BUILD_ROOT +%clean_buildroot + %files %defattr(-,root,root) %{_bindir}/* %{_mandir}/man8/*.8* + %changelog * Tue Jun 15 2004 Elliot Lee - rebuilt From svn at tinysofa.org Mon Jul 5 08:43:20 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Mon, 5 Jul 2004 18:43:20 +1000 (EST) Subject: [tinysofa-svn] r2894 - tinysofa/releases/1.1 Message-ID: <20040705084320.7398E4E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-05 18:43:19 +1000 (Mon, 05 Jul 2004) New Revision: 2894 Added: tinysofa/releases/1.1/tzdata/ Log: - copy tzdata from snapshot Copied: tinysofa/releases/1.1/tzdata (from rev 2893, tinysofa/snapshot/tzdata) From svn at tinysofa.org Mon Jul 5 08:52:53 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Mon, 5 Jul 2004 18:52:53 +1000 (EST) Subject: [tinysofa-svn] r2895 - tinysofa/releases/1.1/shadow-utils/current/specs Message-ID: <20040705085253.D185E4E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-05 18:52:53 +1000 (Mon, 05 Jul 2004) New Revision: 2895 Modified: tinysofa/releases/1.1/shadow-utils/current/specs/shadow-utils.spec Log: - use some macros Modified: tinysofa/releases/1.1/shadow-utils/current/specs/shadow-utils.spec =================================================================== --- tinysofa/releases/1.1/shadow-utils/current/specs/shadow-utils.spec 2004-07-05 08:43:19 UTC (rev 2894) +++ tinysofa/releases/1.1/shadow-utils/current/specs/shadow-utils.spec 2004-07-05 08:52:53 UTC (rev 2895) @@ -3,7 +3,7 @@ Summary: Utilities for managing accounts and shadow password files. Name: shadow-utils Version: 4.0.3 -Release: 24ts +Release: 25jh URL: http://shadow.pld.org.pl/ Source0: ftp://ftp.pld.org.pl/software/shadow/shadow-%{version}.tar.bz2 Source1: shadow-4.0.3.login.defs @@ -29,7 +29,7 @@ Group: main BuildPrereq: autoconf, automake, libtool BuildRequires: gettext libstdcc++-devel -BuildRoot: %{_tmppath}/%{name}-root +BuildRoot: %{_tmppath}/%{name}-%{version}-root Obsoletes: adduser %description @@ -54,7 +54,7 @@ %patch5 -p1 -b .mailspool %patch6 -p1 -b .usg %patch7 -p1 -b .shadow-man -%if %{use_selinux} +%if %{with_selinux} #SELinux %patch8 -p1 -b .selinux %endif @@ -98,10 +98,9 @@ --with-libcrypt \ --without-libpam \ --disable-shared -make +%make %install -rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT gnulocaledir=$RPM_BUILD_ROOT/%{_datadir}/locale MKINSTALLDIRS=`pwd`/mkinstalldirs install -d -m 755 $RPM_BUILD_ROOT/etc/default install -c -m 0644 %{SOURCE1} $RPM_BUILD_ROOT/etc/login.defs @@ -192,7 +191,7 @@ %find_lang shadow %clean -rm -rf $RPM_BUILD_ROOT +%clean_buildroot %files -f shadow.lang %defattr(-,root,root) @@ -536,4 +535,4 @@ - fixed some bugs * Tue Jun 17 1997 Erik Troan -- built against glibc \ No newline at end of file +- built against glibc From svn at tinysofa.org Mon Jul 5 08:58:55 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Mon, 5 Jul 2004 18:58:55 +1000 (EST) Subject: [tinysofa-svn] r2896 - in tinysofa/releases/1.1: file/current/specs openssh/current/specs pam/current/specs passwd/current/specs procps/current/specs Message-ID: <20040705085855.8E4014E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-05 18:58:55 +1000 (Mon, 05 Jul 2004) New Revision: 2896 Modified: tinysofa/releases/1.1/file/current/specs/file.spec tinysofa/releases/1.1/openssh/current/specs/openssh.spec tinysofa/releases/1.1/pam/current/specs/pam.spec tinysofa/releases/1.1/passwd/current/specs/passwd.spec tinysofa/releases/1.1/procps/current/specs/procps.spec Log: - change use_selinux -> with_selinux Modified: tinysofa/releases/1.1/file/current/specs/file.spec =================================================================== --- tinysofa/releases/1.1/file/current/specs/file.spec 2004-07-05 08:52:53 UTC (rev 2895) +++ tinysofa/releases/1.1/file/current/specs/file.spec 2004-07-05 08:58:55 UTC (rev 2896) @@ -33,7 +33,7 @@ %prep %setup -q %patch0 -p1 -b .zlib -%if use_selinux +%if %{with_selinux} %patch1 -p1 -b .selinux %endif Modified: tinysofa/releases/1.1/openssh/current/specs/openssh.spec =================================================================== --- tinysofa/releases/1.1/openssh/current/specs/openssh.spec 2004-07-05 08:52:53 UTC (rev 2895) +++ tinysofa/releases/1.1/openssh/current/specs/openssh.spec 2004-07-05 08:58:55 UTC (rev 2896) @@ -96,14 +96,14 @@ %prep %setup -q -n %{name}-%{realversion} -%if %{use_selinux} +%if %{with_selinux} patch -p1 < %{SOURCE4} %endif %patch1 -p1 %build -%if %{use_selinux} +%if %{with_selinux} RPM_OPT_FLAGS="$RPM_OPT_FLAGS -DWITH_SELINUX" %endif CFLAGS="$RPM_OPT_FLAGS" \ Modified: tinysofa/releases/1.1/pam/current/specs/pam.spec =================================================================== --- tinysofa/releases/1.1/pam/current/specs/pam.spec 2004-07-05 08:52:53 UTC (rev 2895) +++ tinysofa/releases/1.1/pam/current/specs/pam.spec 2004-07-05 08:58:55 UTC (rev 2896) @@ -68,7 +68,7 @@ Prereq: grep, mktemp, sed, coreutils, /sbin/ldconfig BuildPrereq: autoconf, bison, flex, glib-devel, sed, coreutils, cracklib, cracklib-dicts BuildPrereq: perl pkgconfig, db4-devel -%if %{use_selinux} +%if %{with_selinux} BuildPrereq: libselinux-devel %endif URL: http://www.us.kernel.org/pub/linux/libs/pam/index.html @@ -139,7 +139,7 @@ %patch35 -p1 -b .sigchld %patch36 -p1 -b .skip-aconf-install %patch37 -p1 -b .log-changes -%if %{use_selinux} +%if %{with_selinux} %patch60 -p1 -b .selinux %patch61 -p1 -b .pwdbselinux %endif @@ -318,7 +318,7 @@ /%{_lib}/libpam_misc.so.* %{_sbindir}/pam_console_apply %{_sbindir}/pam_tally -%if %{use_selinux} +%if %{with_selinux} %{_sbindir}/pam_selinux_check %endif %{_sbindir}/pam_timestamp_check @@ -350,7 +350,7 @@ /%{_lib}/security/pam_rhosts_auth.so /%{_lib}/security/pam_rootok.so /%{_lib}/security/pam_rps.so -%if %{use_selinux} +%if %{with_selinux} /%{_lib}/security/pam_selinux.so %endif /%{_lib}/security/pam_securetty.so Modified: tinysofa/releases/1.1/passwd/current/specs/passwd.spec =================================================================== --- tinysofa/releases/1.1/passwd/current/specs/passwd.spec 2004-07-05 08:52:53 UTC (rev 2895) +++ tinysofa/releases/1.1/passwd/current/specs/passwd.spec 2004-07-05 08:58:55 UTC (rev 2896) @@ -29,7 +29,7 @@ %patch2 -p1 %build -%if %{use_selinux} +%if %{with_selinux} make DEBUG= RPM_OPT_FLAGS="$RPM_OPT_FLAGS" WITH_SELINUX=yes %else make DEBUG= RPM_OPT_FLAGS="$RPM_OPT_FLAGS" Modified: tinysofa/releases/1.1/procps/current/specs/procps.spec =================================================================== --- tinysofa/releases/1.1/procps/current/specs/procps.spec 2004-07-05 08:52:53 UTC (rev 2895) +++ tinysofa/releases/1.1/procps/current/specs/procps.spec 2004-07-05 08:58:55 UTC (rev 2896) @@ -37,7 +37,7 @@ %setup -q %patch1 -p1 %patch2 -p1 -%if %{use_selinux} +%if %{with_selinux} %patch3 -p1 %endif From svn at tinysofa.org Mon Jul 5 09:01:02 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Mon, 5 Jul 2004 19:01:02 +1000 (EST) Subject: [tinysofa-svn] r2897 - tinysofa/releases/1.1/tzdata/current/specs Message-ID: <20040705090102.5A1274E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-05 19:01:02 +1000 (Mon, 05 Jul 2004) New Revision: 2897 Modified: tinysofa/releases/1.1/tzdata/current/specs/tzdata.spec Log: - fix group - use some macros Modified: tinysofa/releases/1.1/tzdata/current/specs/tzdata.spec =================================================================== --- tinysofa/releases/1.1/tzdata/current/specs/tzdata.spec 2004-07-05 08:58:55 UTC (rev 2896) +++ tinysofa/releases/1.1/tzdata/current/specs/tzdata.spec 2004-07-05 09:01:02 UTC (rev 2897) @@ -1,14 +1,14 @@ Summary: Timezone data Name: tzdata Version: 2003d -Release: 2ts +Release: 1jh Copyright: GPL -Group: System Environment/Base +Group: main Source0: %{name}.tar.bz2 Source1: ftp://elsie.nci.nih.gov/pub/%{name}%{version}.tar.gz Buildroot: %{_tmppath}/%{name}-%{version}-root -BuildRequires: gawk, glibc, glibc-common, perl -Conflicts: glibc-common <= 2.3.2-63 +BuildRequires: gawk, glibc, glibc-common, perl, tar +Conflicts: glibc-common <= 2.3.3 BuildArchitectures: noarch %description @@ -25,7 +25,7 @@ -e 's|@datadir@|%{_datadir}|' \ -e 's|@install_root@|%{buildroot}|' \ Makeconfig.in > Makeconfig -make +%make %install make install @@ -34,7 +34,7 @@ echo ====================TESTING END===================== %clean -rm -rf %{buildroot} +%clean_buildroot %files %defattr(-,root,root) From svn at tinysofa.org Mon Jul 5 09:53:20 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Mon, 5 Jul 2004 19:53:20 +1000 (EST) Subject: [tinysofa-svn] r2898 - tinysofa/releases/1.1/tzdata/current/specs Message-ID: <20040705095320.DF1854E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-05 19:53:20 +1000 (Mon, 05 Jul 2004) New Revision: 2898 Modified: tinysofa/releases/1.1/tzdata/current/specs/tzdata.spec Log: - fix conflicting glibc-common version Modified: tinysofa/releases/1.1/tzdata/current/specs/tzdata.spec =================================================================== --- tinysofa/releases/1.1/tzdata/current/specs/tzdata.spec 2004-07-05 09:01:02 UTC (rev 2897) +++ tinysofa/releases/1.1/tzdata/current/specs/tzdata.spec 2004-07-05 09:53:20 UTC (rev 2898) @@ -8,7 +8,7 @@ Source1: ftp://elsie.nci.nih.gov/pub/%{name}%{version}.tar.gz Buildroot: %{_tmppath}/%{name}-%{version}-root BuildRequires: gawk, glibc, glibc-common, perl, tar -Conflicts: glibc-common <= 2.3.3 +Conflicts: glibc-common < 2.3.3 BuildArchitectures: noarch %description From svn at tinysofa.org Mon Jul 5 10:02:19 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Mon, 5 Jul 2004 20:02:19 +1000 (EST) Subject: [tinysofa-svn] r2899 - in tinysofa/releases/1.1: authconfig/current/specs beecrypt/current/specs bind/current/specs courier-imap/current/specs cups/current/specs db4/current/specs gdbm/current/specs gettext/current/specs ghostscript/current/specs glib/current/specs groff/current/specs lftp/current/specs libtool/current/specs libxml2/current/specs mysql/current/specs netatalk/current/specs openssl/current/specs pam_krb5/current/specs parted/current/specs pcre/current/specs psmisc/current/specs shadow-utils/current/specs telnet/current/specs Message-ID: <20040705100219.AD0514E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-05 20:02:18 +1000 (Mon, 05 Jul 2004) New Revision: 2899 Modified: tinysofa/releases/1.1/authconfig/current/specs/authconfig.spec tinysofa/releases/1.1/beecrypt/current/specs/beecrypt.spec tinysofa/releases/1.1/bind/current/specs/bind.spec tinysofa/releases/1.1/courier-imap/current/specs/courier-imap.spec tinysofa/releases/1.1/cups/current/specs/cups.spec tinysofa/releases/1.1/db4/current/specs/db4.spec tinysofa/releases/1.1/gdbm/current/specs/gdbm.spec tinysofa/releases/1.1/gettext/current/specs/gettext.spec tinysofa/releases/1.1/ghostscript/current/specs/ghostscript.spec tinysofa/releases/1.1/glib/current/specs/glib.spec tinysofa/releases/1.1/groff/current/specs/groff.spec tinysofa/releases/1.1/lftp/current/specs/lftp.spec tinysofa/releases/1.1/libtool/current/specs/libtool.spec tinysofa/releases/1.1/libxml2/current/specs/libxml2.spec tinysofa/releases/1.1/mysql/current/specs/mysql.spec tinysofa/releases/1.1/netatalk/current/specs/netatalk.spec tinysofa/releases/1.1/openssl/current/specs/openssl.spec tinysofa/releases/1.1/pam_krb5/current/specs/pam_krb5.spec tinysofa/releases/1.1/parted/current/specs/parted.spec tinysofa/releases/1.1/pcre/current/specs/pcre.spec tinysofa/releases/1.1/psmisc/current/specs/psmisc.spec tinysofa/releases/1.1/shadow-utils/current/specs/shadow-utils.spec tinysofa/releases/1.1/telnet/current/specs/telnet.spec Log: - change libstdcc++ -> libstdc++ Modified: tinysofa/releases/1.1/authconfig/current/specs/authconfig.spec =================================================================== --- tinysofa/releases/1.1/authconfig/current/specs/authconfig.spec 2004-07-05 09:53:20 UTC (rev 2898) +++ tinysofa/releases/1.1/authconfig/current/specs/authconfig.spec 2004-07-05 10:02:18 UTC (rev 2899) @@ -7,10 +7,10 @@ Group: main BuildRoot: %{_tmppath}/%{name}-root Source: %{name}-%{version}.tar.gz -Requires: libstdcc++ +Requires: libstdc++ BuildRequires: python, newt BuildRequires: pkgconfig, glib, glib-devel, python-devel, newt-devel -BuildRequires: libstdcc++-devel +BuildRequires: libstdc++-devel %description Authconfig is a terminal mode program for setting up Network Modified: tinysofa/releases/1.1/beecrypt/current/specs/beecrypt.spec =================================================================== --- tinysofa/releases/1.1/beecrypt/current/specs/beecrypt.spec 2004-07-05 09:53:20 UTC (rev 2898) +++ tinysofa/releases/1.1/beecrypt/current/specs/beecrypt.spec 2004-07-05 10:02:18 UTC (rev 2899) @@ -15,10 +15,10 @@ BuildPreReq: python-devel >= %{with_python_version} %endif BuildRoot: %{_tmppath}/%{name}-root -Requires: libstdcc++ +Requires: libstdc++ BuildRequires: autoconf automake libtool -BuildRequires: libstdcc++-devel +BuildRequires: libstdc++-devel %description Beecrypt is a general-purpose cryptography library. Modified: tinysofa/releases/1.1/bind/current/specs/bind.spec =================================================================== --- tinysofa/releases/1.1/bind/current/specs/bind.spec 2004-07-05 09:53:20 UTC (rev 2898) +++ tinysofa/releases/1.1/bind/current/specs/bind.spec 2004-07-05 10:02:18 UTC (rev 2899) @@ -42,7 +42,7 @@ Prereq: bind-libs = %{epoch}:%{version} %accountman_requires %service_requires -BuildRequires: /usr/bin/perl binutils gcc glibc-devel automake libstdcc++-devel +BuildRequires: /usr/bin/perl binutils gcc glibc-devel automake libstdc++-devel BuildRequires: openssl-devel >= 0.9.7 make libtool autoconf #BuildRequires: glibc-iconv Buildroot: %{_tmppath}/%{name}-%{version}-root Modified: tinysofa/releases/1.1/courier-imap/current/specs/courier-imap.spec =================================================================== --- tinysofa/releases/1.1/courier-imap/current/specs/courier-imap.spec 2004-07-05 09:53:20 UTC (rev 2898) +++ tinysofa/releases/1.1/courier-imap/current/specs/courier-imap.spec 2004-07-05 10:02:18 UTC (rev 2899) @@ -22,7 +22,7 @@ BuildRoot: %{_tmppath}/%{name}-root Requires: /sbin/chkconfig, coreutils, sed Requires: /sbin/restart_maybe, db4, openssl, imapd-pam -BuildRequires: coreutils, rpm >= 4.0.2, sed, libstdcc++-devel +BuildRequires: coreutils, rpm >= 4.0.2, sed, libstdc++-devel BuildRequires: perl, db4-devel, openssl-devel BuildRequires: pam-devel openldap-devel mysql-devel postgresql-devel Buildrequires: mysql-devel mysql-shared mysql-libs Modified: tinysofa/releases/1.1/cups/current/specs/cups.spec =================================================================== --- tinysofa/releases/1.1/cups/current/specs/cups.spec 2004-07-05 09:53:20 UTC (rev 2898) +++ tinysofa/releases/1.1/cups/current/specs/cups.spec 2004-07-05 10:02:18 UTC (rev 2899) @@ -21,14 +21,14 @@ PreReq: /sbin/chkconfig /sbin/service /sbin/restart_maybe Requires: %{name}-libs = %{version} xinetd libjpeg libtiff libpng zlib openssl Requires: ghostscript-cups -Requires: libstdcc++ +Requires: libstdc++ Provides: lpd lpr lprng BuildPrereq: pam-devel openssl-devel BuildRequires: autoconf BuildRequires: libpng libpng-devel BuildRequires: libjpeg libpng-devel BuildRequires: libtiff libtiff-devel -BuildRequires: zlib-devel pam libstdcc++-devel +BuildRequires: zlib-devel pam libstdc++-devel %package devel Summary: Common Unix Printing System - development environment @@ -213,12 +213,12 @@ - current (1.1.20-5jh) integrated as 1.1.20-5ts for release 1.0-U1 * Tue May 11 2004 Omar Kilani -- Add Requires: libstdcc++ +- Add Requires: libstdc++ - Add BuildRequires: autoconf - Add BuildRequires: libpng libpng-devel - Add BuildRequires: libjpeg libpng-devel - Add BuildRequires: libtiff libtiff-devel -- Add BuildRequires: zlib-devel pam libstdcc++-devel +- Add BuildRequires: zlib-devel pam libstdc++-devel - Add Requires: libpng, openssl to devel subpackage. - Add Requires: libjpeg-devel libtiff-devel libpng-devel to devel. - Add Requires: openssl-devel to devel. Modified: tinysofa/releases/1.1/db4/current/specs/db4.spec =================================================================== --- tinysofa/releases/1.1/db4/current/specs/db4.spec 2004-07-05 09:53:20 UTC (rev 2898) +++ tinysofa/releases/1.1/db4/current/specs/db4.spec 2004-07-05 10:02:18 UTC (rev 2899) @@ -18,8 +18,8 @@ License: GPL Group: main BuildPreReq: perl db1-devel -BuildRequires: autoconf libstdcc++-devel ed -Requires: libstdcc++ +BuildRequires: autoconf libstdc++-devel ed +Requires: libstdc++ # Seems RPM needs a special invitation to understand this Provides: libdb.so.%{__major} BuildRoot: %{_tmppath}/%{name}-root Modified: tinysofa/releases/1.1/gdbm/current/specs/gdbm.spec =================================================================== --- tinysofa/releases/1.1/gdbm/current/specs/gdbm.spec 2004-07-05 09:53:20 UTC (rev 2898) +++ tinysofa/releases/1.1/gdbm/current/specs/gdbm.spec 2004-07-05 10:02:18 UTC (rev 2899) @@ -10,7 +10,7 @@ License: GPL Group: main Prefix: %{_prefix} -BuildRequires: texinfo libtool autoconf automake libstdcc++-devel +BuildRequires: texinfo libtool autoconf automake libstdc++-devel BuildRoot: %{_tmppath}/%{name}-root %description Modified: tinysofa/releases/1.1/gettext/current/specs/gettext.spec =================================================================== --- tinysofa/releases/1.1/gettext/current/specs/gettext.spec 2004-07-05 09:53:20 UTC (rev 2898) +++ tinysofa/releases/1.1/gettext/current/specs/gettext.spec 2004-07-05 10:02:18 UTC (rev 2899) @@ -6,8 +6,8 @@ Group: development Source: ftp://ftp.gnu.org/gnu/gettext-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-root -BuildRequires: libstdcc++-devel -Requires: libstdcc++ +BuildRequires: libstdc++-devel +Requires: libstdc++ %description The GNU gettext package provides a set of tools and documentation for Modified: tinysofa/releases/1.1/ghostscript/current/specs/ghostscript.spec =================================================================== --- tinysofa/releases/1.1/ghostscript/current/specs/ghostscript.spec 2004-07-05 09:53:20 UTC (rev 2898) +++ tinysofa/releases/1.1/ghostscript/current/specs/ghostscript.spec 2004-07-05 10:02:18 UTC (rev 2899) @@ -8,10 +8,10 @@ Source2: http://heanet.dl.sourceforge.net/sourceforge/gs-fonts/gnu-gs-fonts-std-6.0.tar.gz Url: http://www.cups.org/ghostscript.html BuildRoot: %{_tmppath}/%{name}-root -BuildRequires: libjpeg libjpeg-devel libtiff libtiff-devel libstdcc++-devel +BuildRequires: libjpeg libjpeg-devel libtiff libtiff-devel libstdc++-devel BuildRequires: zlib zlib-devel cups cups-devel libpng libpng-devel Buildrequires: openssl openssl-devel -Requires: libstdcc++ +Requires: libstdc++ Requires: zlib %package cups @@ -80,9 +80,9 @@ - Own /usr/share/fonts/default. * Tue May 11 2004 Omar Kilani -- Add BuildRequires: libjpeg libjpeg-devel libtiff libtiff-devel libstdcc++-devel +- Add BuildRequires: libjpeg libjpeg-devel libtiff libtiff-devel libstdc++-devel - Add BuildRequires: zlib zlib-devel cups cups-devel libpng libpng-devel. -- Add Requires: libstdcc++ +- Add Requires: libstdc++ - Add Requires: zlib - Add BuildRequires: openssl, openssl-devel. Modified: tinysofa/releases/1.1/glib/current/specs/glib.spec =================================================================== --- tinysofa/releases/1.1/glib/current/specs/glib.spec 2004-07-05 09:53:20 UTC (rev 2898) +++ tinysofa/releases/1.1/glib/current/specs/glib.spec 2004-07-05 10:02:18 UTC (rev 2899) @@ -7,7 +7,7 @@ Source: ftp://ftp.gtk.org/pub/gtk/v2.4/glib-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-root URL: http://www.gtk.org -BuildRequires: pkgconfig gettext libstdcc++-devel +BuildRequires: pkgconfig gettext libstdc++-devel %description GLib is a handy library of utility functions. This C library is Modified: tinysofa/releases/1.1/groff/current/specs/groff.spec =================================================================== --- tinysofa/releases/1.1/groff/current/specs/groff.spec 2004-07-05 09:53:20 UTC (rev 2898) +++ tinysofa/releases/1.1/groff/current/specs/groff.spec 2004-07-05 10:02:18 UTC (rev 2899) @@ -7,9 +7,9 @@ Source0: ftp://ftp.gnu.org/gnu/groff/groff-%{version}.tar.gz Source1: troff-to-ps.fpi Source2: nroff -Requires: mktemp libstdcc++ +Requires: mktemp libstdc++ Requires: /usr/bin/iconv -BuildRequires: byacc libstdcc++-devel +BuildRequires: byacc libstdc++-devel BuildRoot: %{_tmppath}/%{name}-%{version}-root Provides: nroff-i18n Obsoletes: groff-tools Modified: tinysofa/releases/1.1/lftp/current/specs/lftp.spec =================================================================== --- tinysofa/releases/1.1/lftp/current/specs/lftp.spec 2004-07-05 09:53:20 UTC (rev 2898) +++ tinysofa/releases/1.1/lftp/current/specs/lftp.spec 2004-07-05 10:02:18 UTC (rev 2899) @@ -9,10 +9,10 @@ URL: http://lftp.yar.ru/ BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRequires: ncurses-devel, openssl-devel, pkgconfig, readline-devel -BuildRequires: libstdcc++-devel +BuildRequires: libstdc++-devel BuildRequires: libtool -Requires: libstdcc++ openssl ncurses readline +Requires: libstdc++ openssl ncurses readline %description LFTP is a sophisticated ftp/http file transfer program. Like bash, it has job Modified: tinysofa/releases/1.1/libtool/current/specs/libtool.spec =================================================================== --- tinysofa/releases/1.1/libtool/current/specs/libtool.spec 2004-07-05 09:53:20 UTC (rev 2898) +++ tinysofa/releases/1.1/libtool/current/specs/libtool.spec 2004-07-05 10:02:18 UTC (rev 2899) @@ -7,7 +7,7 @@ Source: ftp://alpha.gnu.org/gnu/libtool-%{version}.tar.gz Prefix: %{_prefix} PreReq: htmlinfo -BuildRequires: texinfo libstdcc++-devel +BuildRequires: texinfo libstdc++-devel BuildRoot: %{_tmppath}/%{name}-root %description Modified: tinysofa/releases/1.1/libxml2/current/specs/libxml2.spec =================================================================== --- tinysofa/releases/1.1/libxml2/current/specs/libxml2.spec 2004-07-05 09:53:20 UTC (rev 2898) +++ tinysofa/releases/1.1/libxml2/current/specs/libxml2.spec 2004-07-05 10:02:18 UTC (rev 2899) @@ -6,7 +6,7 @@ Group: main Source: ftp://xmlsoft.org/libxml2-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-root -BuildRequires: python python-devel libtool libstdcc++-devel +BuildRequires: python python-devel libtool libstdc++-devel URL: http://xmlsoft.org/ %description @@ -144,7 +144,7 @@ - New upstream. * Tue May 11 2004 Omar Kilani 2.6.7-4ts -- Add BuildRequires: libstdcc++-devel +- Add BuildRequires: libstdc++-devel - Fix permissions. * Tue Feb 24 2004 Erlend Midttun 2.6.7-1tr Modified: tinysofa/releases/1.1/mysql/current/specs/mysql.spec =================================================================== --- tinysofa/releases/1.1/mysql/current/specs/mysql.spec 2004-07-05 09:53:20 UTC (rev 2898) +++ tinysofa/releases/1.1/mysql/current/specs/mysql.spec 2004-07-05 10:02:18 UTC (rev 2899) @@ -12,7 +12,7 @@ URL: http://www.mysql.com/ Provides: msqlormysql MySQL-server BuildRoot: %{_tmppath}/%{name}-root -BuildRequires: bison, texinfo, python, libstdcc++-devel, zlib-devel +BuildRequires: bison, texinfo, python, libstdc++-devel, zlib-devel BuildREquires: db4-devel, libtermcap-devel, openssl-devel, ncurses-devel Requires: mysql-shared mysql-libs Prereq: /bin/hostname /bin/sleep /sbin/chkconfig /sbin/restart_maybe htmlinfo Modified: tinysofa/releases/1.1/netatalk/current/specs/netatalk.spec =================================================================== --- tinysofa/releases/1.1/netatalk/current/specs/netatalk.spec 2004-07-05 09:53:20 UTC (rev 2898) +++ tinysofa/releases/1.1/netatalk/current/specs/netatalk.spec 2004-07-05 10:02:18 UTC (rev 2899) @@ -16,7 +16,7 @@ %service_requires Requires: pam >= 0.56, /etc/pam.d/system-auth, tcp_wrappers, openssl, cracklib BuildRequires: cracklib openssl-devel pam quota libtool automake autoconf -BuildRequires: libstdcc++-devel db4-devel kerberos5-devel libcom_err-devel +BuildRequires: libstdc++-devel db4-devel kerberos5-devel libcom_err-devel BuildRequires: perl BuildRoot: %{_tmppath}/%{name}-%{version}-root Modified: tinysofa/releases/1.1/openssl/current/specs/openssl.spec =================================================================== --- tinysofa/releases/1.1/openssl/current/specs/openssl.spec 2004-07-05 09:53:20 UTC (rev 2898) +++ tinysofa/releases/1.1/openssl/current/specs/openssl.spec 2004-07-05 10:02:18 UTC (rev 2899) @@ -47,8 +47,8 @@ %package python Summary: Support for using OpenSSL in python scripts. Group: extra -Requires: python, openssl = %{version}, libstdcc++ -BuildRequires: libstdcc++-devel +Requires: python, openssl = %{version}, libstdc++ +BuildRequires: libstdc++-devel %description python This package allows you to call OpenSSL functions from python scripts. Modified: tinysofa/releases/1.1/pam_krb5/current/specs/pam_krb5.spec =================================================================== --- tinysofa/releases/1.1/pam_krb5/current/specs/pam_krb5.spec 2004-07-05 09:53:20 UTC (rev 2898) +++ tinysofa/releases/1.1/pam_krb5/current/specs/pam_krb5.spec 2004-07-05 10:02:18 UTC (rev 2899) @@ -6,7 +6,7 @@ License: LGPL Group: extra BuildPrereq: byacc, flex, kerberos5-devel, kerberosafs-devel, pam-devel -BuildRequires: libstdcc++-devel kerberos5 kerberosafs libcom_err-devel +BuildRequires: libstdc++-devel kerberos5 kerberosafs libcom_err-devel BuildRoot: %{_tmppath}/%{name}-root Requires: kerberosafs >= 1.0 @@ -54,7 +54,7 @@ - current (2.0.10-2ts) integrated as 2.0.10-3ts for release 1.0-U1 * Wed May 12 2004 Omar Kilani -- Add BuildRequires: libstdcc++-devel kerberos5 kerberosafs libcom_err-devel +- Add BuildRequires: libstdc++-devel kerberos5 kerberosafs libcom_err-devel * Wed Apr 07 2004 Omar Kilani - 2.0.10-2ts - Tinysofa Modified: tinysofa/releases/1.1/parted/current/specs/parted.spec =================================================================== --- tinysofa/releases/1.1/parted/current/specs/parted.spec 2004-07-05 09:53:20 UTC (rev 2898) +++ tinysofa/releases/1.1/parted/current/specs/parted.spec 2004-07-05 10:02:18 UTC (rev 2899) @@ -9,7 +9,7 @@ Patch0: parted-1.4.24-python2.3.patch BuildRequires: e2fsprogs-devel libcom_err-devel libtermcap-devel readline-devel BuildRequires: python python-devel autoconf libtool automake gettext -BuildRequires: libstdcc++-devel +BuildRequires: libstdc++-devel %description The GNU Parted program allows you to create, destroy, resize, move, Modified: tinysofa/releases/1.1/pcre/current/specs/pcre.spec =================================================================== --- tinysofa/releases/1.1/pcre/current/specs/pcre.spec 2004-07-05 09:53:20 UTC (rev 2898) +++ tinysofa/releases/1.1/pcre/current/specs/pcre.spec 2004-07-05 10:02:18 UTC (rev 2899) @@ -9,7 +9,7 @@ Group: main Prefix: %{_prefix} BuildRoot: %{_tmppath}/%{name}-root -BuildRequires: autoconf automake libtool libstdcc++-devel +BuildRequires: autoconf automake libtool libstdc++-devel %description Perl-compatible regular expression library. Modified: tinysofa/releases/1.1/psmisc/current/specs/psmisc.spec =================================================================== --- tinysofa/releases/1.1/psmisc/current/specs/psmisc.spec 2004-07-05 09:53:20 UTC (rev 2898) +++ tinysofa/releases/1.1/psmisc/current/specs/psmisc.spec 2004-07-05 10:02:18 UTC (rev 2899) @@ -8,7 +8,7 @@ BuildRoot: %{_tmppath}/%{name}-root Requires: ncurses libtermcap -BuildRequires: libstdcc++-devel ncurses-devel libtermcap-devel +BuildRequires: libstdc++-devel ncurses-devel libtermcap-devel %description The psmisc package contains utilities for managing processes on your Modified: tinysofa/releases/1.1/shadow-utils/current/specs/shadow-utils.spec =================================================================== --- tinysofa/releases/1.1/shadow-utils/current/specs/shadow-utils.spec 2004-07-05 09:53:20 UTC (rev 2898) +++ tinysofa/releases/1.1/shadow-utils/current/specs/shadow-utils.spec 2004-07-05 10:02:18 UTC (rev 2899) @@ -28,7 +28,7 @@ License: BSD Group: main BuildPrereq: autoconf, automake, libtool -BuildRequires: gettext libstdcc++-devel +BuildRequires: gettext libstdc++-devel BuildRoot: %{_tmppath}/%{name}-%{version}-root Obsoletes: adduser Modified: tinysofa/releases/1.1/telnet/current/specs/telnet.spec =================================================================== --- tinysofa/releases/1.1/telnet/current/specs/telnet.spec 2004-07-05 09:53:20 UTC (rev 2898) +++ tinysofa/releases/1.1/telnet/current/specs/telnet.spec 2004-07-05 10:02:18 UTC (rev 2899) @@ -9,7 +9,7 @@ Source1: telnet-client.tar.gz Patch1: telnet-0.10-escapechar.patch BuildRoot: %{_tmppath}/%{name}-root -BuildRequires: libstdcc++-devel ncurses-devel libtermcap-devel +BuildRequires: libstdc++-devel ncurses-devel libtermcap-devel %description Telnet is a popular protocol for logging into remote systems over the From svn at tinysofa.org Mon Jul 5 11:07:04 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Mon, 5 Jul 2004 21:07:04 +1000 (EST) Subject: [tinysofa-svn] r2900 - tinysofa/releases/1.1/openssl/current/specs Message-ID: <20040705110704.9AEE64E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-05 21:07:04 +1000 (Mon, 05 Jul 2004) New Revision: 2900 Modified: tinysofa/releases/1.1/openssl/current/specs/openssl.spec Log: - added -Wa,--noexecstack to mark stack correctly non-exec - made RPM_OPT_FLAGS work Modified: tinysofa/releases/1.1/openssl/current/specs/openssl.spec =================================================================== --- tinysofa/releases/1.1/openssl/current/specs/openssl.spec 2004-07-05 10:02:18 UTC (rev 2899) +++ tinysofa/releases/1.1/openssl/current/specs/openssl.spec 2004-07-05 11:07:04 UTC (rev 2900) @@ -2,7 +2,7 @@ Name: openssl %define majorver 0.9.7 Version: %{majorver}c -Release: 10ts +Release: 11jh License: BSD-like Group: main %define m2crypto_version 0.13.1 @@ -17,9 +17,10 @@ Patch5: openssl-0.9.7c-CAN-2004-0079.patch Patch6: openssl-0.9.7c-CAN-2004-0112.patch Patch7: openssl-0.9.7-fix-non-root.patch +Patch8: openssl-0.9.7c-Configure.patch Provides: SSL libssl.so libssl.so.0 libcrypto.so.0 URL: http://www.openssl.org -BuildRoot: %{_tmppath}/%{name}-root +BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRequires: python, python-devel, perl, zlib-devel, autoconf %define python_version $(python -V 2>&1| cut -c8-10) %define sitepackagedir usr/lib/python%{python_version}/site-packages @@ -77,14 +78,37 @@ %patch5 -p1 %patch6 -p1 %patch7 -p1 +%patch8 -p1 %build PATH=${PATH}:${PWD}/bin TOPDIR=${PWD} export LD_LIBRARY_PATH=`pwd` -RPM_OPT_FLAGS="$RPM_OPT_FLAGS" -export RPM_OPT_FLAGS -./config --prefix=/usr --openssldir=/etc/ssl shared threads zlib zlib-dynamic + +# Figure out which flags we want to use. Set the number of threads to use to +# the maximum we've managed to run without running afoul of the OOM killer. +sslarch=%{_os}-%{_arch} +%ifarch %ix86 +sslarch=linux-elf +if ! echo %{_target} | grep -q i686 ; then + sslflags="no-asm 386" +fi +%endif +%ifarch x86_64 +sslarch=linux-x86_64 +%endif + + +# Add -Wa,--noexecstack here so that libcrypto's assembler modules will be +# marked as not requiring an executable stack. +./Configure \ + --prefix=/usr \ + --openssldir=/etc/ssl \ + ${sslflags} \ + shared threads zlib zlib-dynamic \ + ${sslarch} + +RPM_OPT_FLAGS="$RPM_OPT_FLAGS -Wa,--noexecstack" make make do_linux-shared make rehash @@ -124,7 +148,6 @@ %install -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/usr/share/man mkdir -p $RPM_BUILD_ROOT/etc/ssl mkdir -p $RPM_BUILD_ROOT/usr/bin @@ -179,7 +202,7 @@ %clean -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT +%clean_buildroot %files From svn at tinysofa.org Mon Jul 5 11:50:07 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Mon, 5 Jul 2004 21:50:07 +1000 (EST) Subject: [tinysofa-svn] r2901 - in tinysofa/releases/1.1/setup/current: sources specs Message-ID: <20040705115007.ECDE34E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-05 21:50:07 +1000 (Mon, 05 Jul 2004) New Revision: 2901 Added: tinysofa/releases/1.1/setup/current/sources/setup-2.2.5-sbin-bash.patch Modified: tinysofa/releases/1.1/setup/current/specs/setup.spec Log: - change root shell from /sbin/bash to /bin/bash Added: tinysofa/releases/1.1/setup/current/sources/setup-2.2.5-sbin-bash.patch =================================================================== --- tinysofa/releases/1.1/setup/current/sources/setup-2.2.5-sbin-bash.patch 2004-07-05 11:07:04 UTC (rev 2900) +++ tinysofa/releases/1.1/setup/current/sources/setup-2.2.5-sbin-bash.patch 2004-07-05 11:50:07 UTC (rev 2901) @@ -0,0 +1,8 @@ +--- setup-2.2.5/passwd.orig 2004-07-05 14:47:15.000000000 +0300 ++++ setup-2.2.5/passwd 2004-07-05 14:47:46.000000000 +0300 +@@ -1,4 +1,4 @@ +-root:x:0:0:root:/root:/sbin/bash ++root:x:0:0:root:/root:/bin/bash + bin:x:1:1:bin:/bin: + daemon:x:2:2:daemon:/sbin: + adm:x:3:3:adm:/var/adm: Modified: tinysofa/releases/1.1/setup/current/specs/setup.spec =================================================================== --- tinysofa/releases/1.1/setup/current/specs/setup.spec 2004-07-05 11:07:04 UTC (rev 2900) +++ tinysofa/releases/1.1/setup/current/specs/setup.spec 2004-07-05 11:50:07 UTC (rev 2901) @@ -7,6 +7,7 @@ Source: setup-%{version}.tar.gz Patch: setup-2.2.5-sieve.patch Patch1: setup-profile.patch +Patch2: setup-2.2.5-sbin-bash.patch BuildRoot: %{_tmppath}/%{name}-root BuildArch: noarch Conflicts: initscripts < 4.26 @@ -21,6 +22,7 @@ %setup -q %patch -p1 %patch1 -p1 +%patch2 -p1 %install From svn at tinysofa.org Mon Jul 5 12:05:38 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Mon, 5 Jul 2004 22:05:38 +1000 (EST) Subject: [tinysofa-svn] r2902 - tinysofa/releases/1.1/slocate/current/specs Message-ID: <20040705120538.5C63B4E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-05 22:05:38 +1000 (Mon, 05 Jul 2004) New Revision: 2902 Modified: tinysofa/releases/1.1/slocate/current/specs/slocate.spec Log: - correct macro typo Modified: tinysofa/releases/1.1/slocate/current/specs/slocate.spec =================================================================== --- tinysofa/releases/1.1/slocate/current/specs/slocate.spec 2004-07-05 11:50:07 UTC (rev 2901) +++ tinysofa/releases/1.1/slocate/current/specs/slocate.spec 2004-07-05 12:05:38 UTC (rev 2902) @@ -14,7 +14,7 @@ Patch4: slocate-2.6-manpage.patch Patch5: slocate-2.6-uchar.patch Patch6: slocate-2.7-fts.patch -%accoutman_requires +%accountman_requires BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRequires: autoconf automake libtool From svn at tinysofa.org Mon Jul 5 12:07:03 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Mon, 5 Jul 2004 22:07:03 +1000 (EST) Subject: [tinysofa-svn] r2903 - tinysofa/releases/1.1/wget/current/specs Message-ID: <20040705120703.EC16C4E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-05 22:07:03 +1000 (Mon, 05 Jul 2004) New Revision: 2903 Modified: tinysofa/releases/1.1/wget/current/specs/wget.spec Log: - remove installation of a missing source Modified: tinysofa/releases/1.1/wget/current/specs/wget.spec =================================================================== --- tinysofa/releases/1.1/wget/current/specs/wget.spec 2004-07-05 12:05:38 UTC (rev 2902) +++ tinysofa/releases/1.1/wget/current/specs/wget.spec 2004-07-05 12:07:03 UTC (rev 2903) @@ -6,7 +6,6 @@ Group: extra URL: http://wget.sunsite.dk/ Source: ftp://ftp.gnu.org/gnu/wget/wget-%{version}.tar.gz -Source2: wget-1.5.3-ko.po # The symlink patch no longer seems to be necesarry... at least # I couldn't reproduce the original problem with 1.7. Keeping it # around for some time still, just in case... 2001-06-06, teg at redhat.com @@ -38,9 +37,7 @@ %patch4 -p1 -b .rh1 %patch5 -p1 -b .rh2 -cp %{SOURCE2} $RPM_BUILD_DIR/wget-%{version}/po/ko.po - %build if pkg-config openssl ; then CPPFLAGS=`pkg-config --cflags openssl`; export CPPFLAGS From svn at tinysofa.org Mon Jul 5 15:03:22 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 6 Jul 2004 01:03:22 +1000 (EST) Subject: [tinysofa-svn] r2904 - tinysofa/releases/1.1/mysql/current/specs Message-ID: <20040705150322.6689D4E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-06 01:03:22 +1000 (Tue, 06 Jul 2004) New Revision: 2904 Modified: tinysofa/releases/1.1/mysql/current/specs/mysql.spec Log: - support try-restart - use some macros Modified: tinysofa/releases/1.1/mysql/current/specs/mysql.spec =================================================================== --- tinysofa/releases/1.1/mysql/current/specs/mysql.spec 2004-07-05 12:07:03 UTC (rev 2903) +++ tinysofa/releases/1.1/mysql/current/specs/mysql.spec 2004-07-05 15:03:22 UTC (rev 2904) @@ -11,11 +11,12 @@ Source3: mysql.conf URL: http://www.mysql.com/ Provides: msqlormysql MySQL-server -BuildRoot: %{_tmppath}/%{name}-root +BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRequires: bison, texinfo, python, libstdc++-devel, zlib-devel BuildREquires: db4-devel, libtermcap-devel, openssl-devel, ncurses-devel Requires: mysql-shared mysql-libs -Prereq: /bin/hostname /bin/sleep /sbin/chkconfig /sbin/restart_maybe htmlinfo +Prereq: /bin/hostname /bin/sleep htmlinfo +%service_requires %define see_base For a description of MySQL see the base MySQL RPM or http://www.mysql.com @@ -127,12 +128,11 @@ #nm --numeric-sort sql/mysqld > sql/mysqld.sym %install -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT RBR=$RPM_BUILD_ROOT MBD=$RPM_BUILD_DIR/mysql-%{version} # Ensure that needed directories exists install -d $RBR/etc/logrotate.d -install -d $RBR%{_initdir} +install -d $RBR%{_initrddir} install -d $RBR/var/lib/mysql/mysql install -d $RBR/usr/share/sql-bench install -d $RBR/usr/share/mysql-test @@ -145,7 +145,7 @@ # Install logrotate and autostart install -m644 $MBD/support-files/mysql-log-rotate $RBR/etc/logrotate.d/mysql -install -m755 %{SOURCE2} $RBR%{_initdir}/mysql +install -m755 %{SOURCE2} $RBR%{_initrddir}/mysql install -m600 %{SOURCE3} $RBR/etc/my.cnf ## Install debugging symbols [bg] @@ -163,9 +163,9 @@ [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT %pre -if test -x %{_initdir}/mysql +if test -x %{_initrddir}/mysql then - %{_initdir}/mysql stop > /dev/null 2>&1 + %{_initrddir}/mysql stop > /dev/null 2>&1 echo "Giving mysqld a couple of seconds to exit nicely" sleep 5 fi @@ -179,7 +179,7 @@ if test ! -d $mysql_datadir/test; then mkdir $mysql_datadir/test; fi # Add mysql to the chkconfig overview -/sbin/chkconfig --add mysql +%service_post mysql # Check whether we need to add mysql group if [ -z "`getent group %{mysqld_user}`" ] ; then @@ -207,7 +207,7 @@ chmod -R og-rw $mysql_datadir/mysql # Take care of info pages -/usr/sbin/htmlinfo_update.sh +%info_post # Restart in the same way that mysqld will be started normally. /sbin/restart_maybe mysql @@ -216,18 +216,14 @@ sleep 2 %preun -# Remove autostart of mysql -if test $1 = 0 -then - %{_initdir}/mysql stop > /dev/null - /sbin/chkconfig --del mysql -fi +%service_preun mysql # We do not remove the mysql user since it may still own a lot of # database files. %postun +%service_postun # Take care of info pages -/usr/sbin/htmlinfo_update.sh +%info_postun %post libs LDPATH="/usr/lib/mysql" @@ -290,7 +286,7 @@ /usr/sbin/mysqld /etc/logrotate.d/mysql -%{_initdir}/mysql +%{_initrddir}/mysql %dir %attr(700, %{mysqld_user}, %{mysqld_user}) /var/lib/mysql %dir %attr(700, %{mysqld_user}, %{mysqld_user}) /var/lib/mysql/mysql /usr/share/mysql/ From svn at tinysofa.org Mon Jul 5 15:12:38 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 6 Jul 2004 01:12:38 +1000 (EST) Subject: [tinysofa-svn] r2905 - in tinysofa/releases/1.1: apache/current/specs courier-imap/current/specs cups/current/specs fcron/current/specs freeswan/current/specs hdparm/current/specs iptables/current/specs mysql/current/sources mysql/current/specs openldap/current/specs openssh/current/specs openssl/current/sources postfix/current/specs postgresql/current/specs pptpd/current/specs quota/current/specs stunnel/current/specs sysstat/current/specs vsftpd/current/specs Message-ID: <20040705151238.68A194E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-06 01:12:38 +1000 (Tue, 06 Jul 2004) New Revision: 2905 Added: tinysofa/releases/1.1/openssl/current/sources/openssl-0.9.7c-Configure.patch Modified: tinysofa/releases/1.1/apache/current/specs/apache.spec tinysofa/releases/1.1/courier-imap/current/specs/courier-imap.spec tinysofa/releases/1.1/cups/current/specs/cups.spec tinysofa/releases/1.1/fcron/current/specs/fcron.spec tinysofa/releases/1.1/freeswan/current/specs/freeswan.spec tinysofa/releases/1.1/hdparm/current/specs/hdparm.spec tinysofa/releases/1.1/iptables/current/specs/iptables.spec tinysofa/releases/1.1/mysql/current/sources/mysql.init tinysofa/releases/1.1/mysql/current/specs/mysql.spec tinysofa/releases/1.1/openldap/current/specs/openldap.spec tinysofa/releases/1.1/openssh/current/specs/openssh.spec tinysofa/releases/1.1/postfix/current/specs/postfix.spec tinysofa/releases/1.1/postgresql/current/specs/postgresql.spec tinysofa/releases/1.1/pptpd/current/specs/pptpd.spec tinysofa/releases/1.1/quota/current/specs/quota.spec tinysofa/releases/1.1/stunnel/current/specs/stunnel.spec tinysofa/releases/1.1/sysstat/current/specs/sysstat.spec tinysofa/releases/1.1/vsftpd/current/specs/vsftpd.spec Log: - change _initdir to _initrddir Modified: tinysofa/releases/1.1/apache/current/specs/apache.spec =================================================================== --- tinysofa/releases/1.1/apache/current/specs/apache.spec 2004-07-05 15:03:22 UTC (rev 2904) +++ tinysofa/releases/1.1/apache/current/specs/apache.spec 2004-07-05 15:12:38 UTC (rev 2905) @@ -190,8 +190,8 @@ cd - # Install rc-script -mkdir -p $RPM_BUILD_ROOT%{_initdir} -install $RPM_SOURCE_DIR/httpd.init $RPM_BUILD_ROOT%{_initdir}/httpd +mkdir -p $RPM_BUILD_ROOT%{_initrddir} +install $RPM_SOURCE_DIR/httpd.init $RPM_BUILD_ROOT%{_initrddir}/httpd ln -s ../../var/log/httpd $RPM_BUILD_ROOT/etc/httpd/logs ln -s ../../usr/lib/apache $RPM_BUILD_ROOT/etc/httpd/modules @@ -270,7 +270,7 @@ %preun if [ $1 = 0 ]; then if [ -f /mnt/lockdev/httpd ]; then - %{_initdir}/httpd stop + %{_initrddir}/httpd stop fi /sbin/chkconfig --del httpd fi @@ -307,7 +307,7 @@ %dir /home/httpd/html %dir /home/httpd/html/images %doc docs/conf docs/cgi-examples -%{_initdir}/httpd +%{_initrddir}/httpd %{_mandir}/man1/htpasswd.1* %{_mandir}/man1/htdigest.1* %{_mandir}/man8/httpd.8* Modified: tinysofa/releases/1.1/courier-imap/current/specs/courier-imap.spec =================================================================== --- tinysofa/releases/1.1/courier-imap/current/specs/courier-imap.spec 2004-07-05 15:03:22 UTC (rev 2904) +++ tinysofa/releases/1.1/courier-imap/current/specs/courier-imap.spec 2004-07-05 15:12:38 UTC (rev 2905) @@ -98,15 +98,15 @@ %install [ -n "$RPM_BUILD_ROOT" -a "RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT/%{_initdir} +mkdir -p $RPM_BUILD_ROOT/%{_initrddir} mkdir -p $RPM_BUILD_ROOT/%{_datadir}/%{name} make install-strip DESTDIR=$RPM_BUILD_ROOT install -d -m 755 $RPM_BUILD_ROOT/%{sslcachedir} -install -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_initdir}/courier-imapd -install -m 755 %{SOURCE2} $RPM_BUILD_ROOT%{_initdir}/courier-pop3d -install -m 755 %{SOURCE3} $RPM_BUILD_ROOT%{_initdir}/courier-simapd -install -m 755 %{SOURCE4} $RPM_BUILD_ROOT%{_initdir}/courier-pop3sd +install -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/courier-imapd +install -m 755 %{SOURCE2} $RPM_BUILD_ROOT%{_initrddir}/courier-pop3d +install -m 755 %{SOURCE3} $RPM_BUILD_ROOT%{_initrddir}/courier-simapd +install -m 755 %{SOURCE4} $RPM_BUILD_ROOT%{_initrddir}/courier-pop3sd install -m 600 %{SOURCE10} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/authdaemonrc install -m 600 %{SOURCE11} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/authldaprc @@ -187,7 +187,7 @@ %doc imap/FAQ imap/FAQ.html README.sharedfolders authlib/README.* %doc INSTALL -%{_initdir}/* +%{_initrddir}/* %dir %{_sysconfdir}/%{name} %config(noreplace) %{_sysconfdir}/%{name}/imapd Modified: tinysofa/releases/1.1/cups/current/specs/cups.spec =================================================================== --- tinysofa/releases/1.1/cups/current/specs/cups.spec 2004-07-05 15:03:22 UTC (rev 2904) +++ tinysofa/releases/1.1/cups/current/specs/cups.spec 2004-07-05 15:12:38 UTC (rev 2905) @@ -81,11 +81,11 @@ %install [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf "$RPM_BUILD_ROOT" -mkdir -p $RPM_BUILD_ROOT%{_initdir} +mkdir -p $RPM_BUILD_ROOT%{_initrddir} make BUILDROOT=$RPM_BUILD_ROOT install -install -m 755 $RPM_SOURCE_DIR/cups.init $RPM_BUILD_ROOT%{_initdir}/cups +install -m 755 $RPM_SOURCE_DIR/cups.init $RPM_BUILD_ROOT%{_initrddir}/cups find $RPM_BUILD_ROOT/usr/share/cups/model -name "*.ppd" |xargs gzip -9f @@ -178,7 +178,7 @@ %dir %attr(0755,lp,sys) /etc/cups/ppd %config(noreplace) /etc/pam.d/cups %doc %{_docdir}/cups-%{version} -%config %{_initdir}/cups +%config %{_initrddir}/cups %{_bindir}/cancel* %{_bindir}/enable* %{_bindir}/disable* Modified: tinysofa/releases/1.1/fcron/current/specs/fcron.spec =================================================================== --- tinysofa/releases/1.1/fcron/current/specs/fcron.spec 2004-07-05 15:03:22 UTC (rev 2904) +++ tinysofa/releases/1.1/fcron/current/specs/fcron.spec 2004-07-05 15:12:38 UTC (rev 2905) @@ -211,7 +211,7 @@ - symlink fcrontab to crontab. * Thu Jan 9 2003 Erlend Midttun 2.0.0-8em -- Use _initdir macro. +- Use _initrddir macro. - Remove config(noreplace) on initscript. * Thu Nov 21 2002 Chr. H. Toldnes 2.0.0-7ct Modified: tinysofa/releases/1.1/freeswan/current/specs/freeswan.spec =================================================================== --- tinysofa/releases/1.1/freeswan/current/specs/freeswan.spec 2004-07-05 15:03:22 UTC (rev 2904) +++ tinysofa/releases/1.1/freeswan/current/specs/freeswan.spec 2004-07-05 15:12:38 UTC (rev 2905) @@ -52,10 +52,10 @@ INC_USRLOCAL=/usr \ FINALEXAMPLECONFDIR=/usr/share/doc/freeswan-%{version} \ FINALLIBEXECDIR=/usr/lib/ipsec \ - RCDIR=%{_initdir} programs + RCDIR=%{_initrddir} programs %install -mkdir -p $RPM_BUILD_ROOT%{_initdir} +mkdir -p $RPM_BUILD_ROOT%{_initrddir} make DESTDIR=$RPM_BUILD_ROOT \ PUBDIR=/usr/sbin \ BINDIR=/usr/lib/ipsec \ @@ -63,17 +63,17 @@ INC_USRLOCAL=/usr \ FINALEXAMPLECONFDIR=/usr/share/doc/freeswan-%{version} \ FINALLIBEXECDIR=/usr/lib/ipsec \ - RCDIR=%{_initdir} install + RCDIR=%{_initrddir} install # We don't want all users to have the same secrets file :) rm -f ${RPM_BUILD_ROOT}/ipsec.secrets cp -f ${RPM_SOURCE_DIR}/freeswan-1.9.secrets.proto ${RPM_BUILD_ROOT}/etc/ipsec.secrets # We actually do want chkconfig to work properly... -rm -f ${RPM_BUILD_ROOT}%{_initdir}/ipsec || : +rm -f ${RPM_BUILD_ROOT}%{_initrddir}/ipsec || : sed -e 's/^# chkconfig:.*$/# chkconfig: - 47 68/' programs/setup/setup > \ - ${RPM_BUILD_ROOT}%{_initdir}/ipsec -chmod 755 ${RPM_BUILD_ROOT}%{_initdir}/ipsec + ${RPM_BUILD_ROOT}%{_initrddir}/ipsec +chmod 755 ${RPM_BUILD_ROOT}%{_initrddir}/ipsec # For x509 #install --strip x509patch-%{x509version}-freeswan-%{version}/fswcert/fswcert ${RPM_BUILD_ROOT}/usr/lib/ipsec @@ -105,7 +105,7 @@ %preun if [ $1 = 0 ]; then - %{_initdir}/ipsec stop 2>/dev/null || : + %{_initrddir}/ipsec stop 2>/dev/null || : chkconfig --del ipsec || : fi @@ -115,7 +115,7 @@ /usr/lib/ipsec %config(noreplace) %attr(600,root,root) /etc/ipsec.secrets %config(noreplace) %attr(600,root,root) /etc/ipsec.conf -%{_initdir}/* +%{_initrddir}/* %attr(644,root,root) /usr/share/man/*/* /usr/sbin/ipsec /etc/ipsec.d @@ -165,7 +165,7 @@ - Rebuilt against glibc 2.3.2. * Mon Dec 9 2002 Erlend Midttun 1.99-2em -- Use _initdir. +- Use _initrddir. * Thu Oct 30 2002 Erlend Midttun - Fixed wrong path to IPSEC_DIR. Modified: tinysofa/releases/1.1/hdparm/current/specs/hdparm.spec =================================================================== --- tinysofa/releases/1.1/hdparm/current/specs/hdparm.spec 2004-07-05 15:03:22 UTC (rev 2904) +++ tinysofa/releases/1.1/hdparm/current/specs/hdparm.spec 2004-07-05 15:12:38 UTC (rev 2905) @@ -24,7 +24,7 @@ make %install -mkdir -p $RPM_BUILD_ROOT%{_initdir} +mkdir -p $RPM_BUILD_ROOT%{_initrddir} mkdir -p $RPM_BUILD_ROOT/sbin mkdir -p $RPM_BUILD_ROOT/usr/doc mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man8 @@ -32,7 +32,7 @@ install -c -m 644 hdparm.8 $RPM_BUILD_ROOT/%{_mandir}/man8 mkdir -p $RPM_BUILD_ROOT/etc/sysconfig install -m 644 %SOURCE1 $RPM_BUILD_ROOT/etc/sysconfig/hdparm -install -m 755 %SOURCE2 $RPM_BUILD_ROOT%{_initdir}/hdparm +install -m 755 %SOURCE2 $RPM_BUILD_ROOT%{_initrddir}/hdparm %clean [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT @@ -49,7 +49,7 @@ %defattr(-,root,root) %doc hdparm.lsm Changelog %config(noreplace) /etc/sysconfig/hdparm -%{_initdir}/hdparm +%{_initrddir}/hdparm /sbin/hdparm %{_mandir}/man8/hdparm.8* Modified: tinysofa/releases/1.1/iptables/current/specs/iptables.spec =================================================================== --- tinysofa/releases/1.1/iptables/current/specs/iptables.spec 2004-07-05 15:03:22 UTC (rev 2904) +++ tinysofa/releases/1.1/iptables/current/specs/iptables.spec 2004-07-05 15:12:38 UTC (rev 2905) @@ -60,9 +60,9 @@ INCDIR=/usr/include DO_IPV6=1 # The sources -mkdir -p $RPM_BUILD_ROOT/%{_initdir} -install -m 755 %{SOURCE1} $RPM_BUILD_ROOT/%{_initdir}/iptables -install -m 755 %{SOURCE2} $RPM_BUILD_ROOT/%{_initdir}/iptables6 +mkdir -p $RPM_BUILD_ROOT/%{_initrddir} +install -m 755 %{SOURCE1} $RPM_BUILD_ROOT/%{_initrddir}/iptables +install -m 755 %{SOURCE2} $RPM_BUILD_ROOT/%{_initrddir}/iptables6 mkdir -p $RPM_BUILD_ROOT/etc/sysconfig install -m 644 %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/iptables install -m 644 %{SOURCE4} $RPM_BUILD_ROOT/etc/sysconfig/iptables-modules-ipv4 @@ -77,7 +77,7 @@ %config(noreplace) /etc/sysconfig/iptables-modules-ipv4 %dir /lib/iptables %{_mandir}/*/iptables* -/%{_initdir}/iptables +/%{_initrddir}/iptables /lib/iptables/libipt* /sbin/iptables* @@ -85,7 +85,7 @@ %defattr(-,root,root) %config(noreplace) /etc/sysconfig/iptables-modules-ipv6 %{_mandir}/*/ip6tables* -/%{_initdir}/iptables6 +/%{_initrddir}/iptables6 /lib/iptables/libip6t* /sbin/ip6tables* Modified: tinysofa/releases/1.1/mysql/current/sources/mysql.init =================================================================== --- tinysofa/releases/1.1/mysql/current/sources/mysql.init 2004-07-05 15:03:22 UTC (rev 2904) +++ tinysofa/releases/1.1/mysql/current/sources/mysql.init 2004-07-05 15:12:38 UTC (rev 2905) @@ -204,6 +204,13 @@ status rc=$? ;; + condrestart|try-restart) + if [ -f ${INITLOCK:-/mnt/lockdev}/mysql ]; then + stop + start + rc=$? + fi + ;; *) echo "Usage: $0 {start|stop|restart|status}" rc=3 Modified: tinysofa/releases/1.1/mysql/current/specs/mysql.spec =================================================================== --- tinysofa/releases/1.1/mysql/current/specs/mysql.spec 2004-07-05 15:03:22 UTC (rev 2904) +++ tinysofa/releases/1.1/mysql/current/specs/mysql.spec 2004-07-05 15:12:38 UTC (rev 2905) @@ -463,7 +463,7 @@ - shared -> libs * Thu Jan 9 2003 Erlend Midttun 3.23.54a-2em -- Use _initdir macro +- Use _initrddir macro * Tue Dec 17 2002 Erlend Midttun - Upgraded to fix security holes. Modified: tinysofa/releases/1.1/openldap/current/specs/openldap.spec =================================================================== --- tinysofa/releases/1.1/openldap/current/specs/openldap.spec 2004-07-05 15:03:22 UTC (rev 2904) +++ tinysofa/releases/1.1/openldap/current/specs/openldap.spec 2004-07-05 15:12:38 UTC (rev 2905) @@ -150,13 +150,13 @@ [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT%{_sysconfdir}/%{_ldapsubdir} -install -d $RPM_BUILD_ROOT%{_initdir} +install -d $RPM_BUILD_ROOT%{_initrddir} install -d -m 700 $RPM_BUILD_ROOT/var/%{_ldapsubdir} # do not use %makeinstll here, the openldap Makefile is broken make install DESTDIR=$RPM_BUILD_ROOT -install -m755 %{SOURCE1} $RPM_BUILD_ROOT%{_initdir}/ldap +install -m755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/ldap install -m600 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/%{_ldapsubdir}/slapd.conf echo localhost > $RPM_BUILD_ROOT%{_sysconfdir}/%{_ldapsubdir}/ldapserver chmod +x $RPM_BUILD_ROOT%{_libdir}/lib*.so.* @@ -214,7 +214,7 @@ %preun servers if [ "$1" = 0 ] ; then - %{_initdir}/ldap stop > /dev/null || : + %{_initrddir}/ldap stop > /dev/null || : /sbin/chkconfig --del ldap fi @@ -253,7 +253,7 @@ %defattr(-,root,root) %doc README.migration TOOLS.migration %config(noreplace) %attr(640,root,slapd) /etc/%{_ldapsubdir}/slapd.conf -%{_initdir}/ldap +%{_initrddir}/ldap %dir %attr(700,slapd,slapd) %{_databasedir} %{_sbindir}/* %{_mandir}/man5/ldif.5* Modified: tinysofa/releases/1.1/openssh/current/specs/openssh.spec =================================================================== --- tinysofa/releases/1.1/openssh/current/specs/openssh.spec 2004-07-05 15:03:22 UTC (rev 2904) +++ tinysofa/releases/1.1/openssh/current/specs/openssh.spec 2004-07-05 15:12:38 UTC (rev 2905) @@ -126,11 +126,11 @@ make install DESTDIR=$RPM_BUILD_ROOT/ install -d $RPM_BUILD_ROOT/etc/pam.d/ -install -d $RPM_BUILD_ROOT%{_initdir} +install -d $RPM_BUILD_ROOT%{_initrddir} install -d $RPM_BUILD_ROOT/usr/libexec/ssh install -m600 %{SOURCE1} $RPM_BUILD_ROOT/etc/ssh/ install -m644 %{SOURCE2} $RPM_BUILD_ROOT/etc/pam.d/sshd -install -m755 %{SOURCE3} $RPM_BUILD_ROOT%{_initdir}/sshd +install -m755 %{SOURCE3} $RPM_BUILD_ROOT%{_initrddir}/sshd %pre server @@ -151,7 +151,7 @@ %preun server if [ "$1" = 0 ] then - %{_initdir}/sshd stop >&2 + %{_initrddir}/sshd stop >&2 /sbin/chkconfig --del sshd fi @@ -200,7 +200,7 @@ %attr(0644,root,root) %{_mandir}/man8/ssh-keysign.8* %attr(0600,root,root) %config(noreplace) /etc/ssh/moduli %attr(0644,root,root) %config(noreplace) /etc/pam.d/sshd -%attr(0755,root,root) %{_initdir}/sshd +%attr(0755,root,root) %{_initrddir}/sshd %attr(0755,root,root) /var/cache/openssh %attr(0700,root,root) /var/cache/openssh/empty Added: tinysofa/releases/1.1/openssl/current/sources/openssl-0.9.7c-Configure.patch =================================================================== --- tinysofa/releases/1.1/openssl/current/sources/openssl-0.9.7c-Configure.patch 2004-07-05 15:03:22 UTC (rev 2904) +++ tinysofa/releases/1.1/openssl/current/sources/openssl-0.9.7c-Configure.patch 2004-07-05 15:12:38 UTC (rev 2905) @@ -0,0 +1,100 @@ +--- openssl-0.9.7c/Configure~ 2004-07-05 13:39:53.000000000 +0300 ++++ openssl-0.9.7c/Configure 2004-07-05 13:46:42.000000000 +0300 +@@ -144,11 +144,11 @@ + "debug-bodo", "gcc:-DL_ENDIAN -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DBIO_PAIR_DEBUG -DPEDANTIC -g -march=i586 -pedantic -Wshadow -Wall::-D_REENTRANT:::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}", + "debug-ulf", "gcc:-DL_ENDIAN -DREF_CHECK -DCONF_DEBUG -DBN_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG_ALL -g -O2 -march=i586 -Wall -Werror -Wshadow -pipe::-D_REENTRANT:::${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}", + "debug-steve", "gcc:-DL_ENDIAN -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DDEBUG_SAFESTACK -DCRYPTO_MDEBUG_ALL -DPEDANTIC -g -mcpu=i486 -pedantic -Wall -Werror -Wshadow -pipe::-D_REENTRANT::-rdynamic -ldl:${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn", +-"debug-steve-linux-pseudo64", "gcc:-DL_ENDIAN -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DDEBUG_SAFESTACK -DCRYPTO_MDEBUG_ALL -DOPENSSL_NO_ASM -g -mcpu=i486 -Wall -Werror -Wshadow -pipe::-D_REENTRANT::-rdynamic -ldl:SIXTY_FOUR_BIT::dlfcn", +-"debug-levitte-linux-elf","gcc:-DLEVITTE_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -DTERMIO -D_POSIX_SOURCE -DPEDANTIC -ggdb -g3 -mcpu=i486 -pedantic -ansi -Wall -Wshadow -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wno-long-long -pipe::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +-"debug-levitte-linux-noasm","gcc:-DLEVITTE_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DOPENSSL_NO_ASM -DL_ENDIAN -DTERMIO -D_POSIX_SOURCE -DPEDANTIC -ggdb -g3 -mcpu=i486 -pedantic -ansi -Wall -Wshadow -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wno-long-long -pipe::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +-"debug-levitte-linux-elf-extreme","gcc:-DLEVITTE_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -DTERMIO -D_POSIX_SOURCE -DPEDANTIC -ggdb -g3 -mcpu=i486 -pedantic -ansi -Wall -W -Wundef -Wshadow -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wconversion -Wno-long-long -pipe::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +-"debug-levitte-linux-noasm-extreme","gcc:-DLEVITTE_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DOPENSSL_NO_ASM -DL_ENDIAN -DTERMIO -D_POSIX_SOURCE -DPEDANTIC -ggdb -g3 -mcpu=i486 -pedantic -ansi -Wall -W -Wundef -Wshadow -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wconversion -Wno-long-long -pipe::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"debug-steve-linux-pseudo64", "gcc:-DL_ENDIAN -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DDEBUG_SAFESTACK -DCRYPTO_MDEBUG_ALL -DOPENSSL_NO_ASM -g -Wall -Werror -Wshadow -pipe \$(RPM_OPT_FLAGS)::-D_REENTRANT::-rdynamic -ldl:SIXTY_FOUR_BIT::dlfcn", ++"debug-levitte-linux-elf","gcc:-DLEVITTE_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -DTERMIO -D_POSIX_SOURCE -DPEDANTIC -ggdb -g3 -pedantic -ansi -Wall -Wshadow -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wno-long-long -pipe \$(RPM_OPT_FLAGS)::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"debug-levitte-linux-noasm","gcc:-DLEVITTE_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DOPENSSL_NO_ASM -DL_ENDIAN -DTERMIO -D_POSIX_SOURCE -DPEDANTIC -ggdb -g3 -pedantic -ansi -Wall -Wshadow -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wno-long-long -pipe \$(RPM_OPT_FLAGS)::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"debug-levitte-linux-elf-extreme","gcc:-DLEVITTE_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -DTERMIO -D_POSIX_SOURCE -DPEDANTIC -ggdb -g3 -pedantic -ansi -Wall -W -Wundef -Wshadow -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wconversion -Wno-long-long -pipe \$(RPM_OPT_FLAGS)::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"debug-levitte-linux-noasm-extreme","gcc:-DLEVITTE_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DOPENSSL_NO_ASM -DL_ENDIAN -DTERMIO -D_POSIX_SOURCE -DPEDANTIC -ggdb -g3 -pedantic -ansi -Wall -W -Wundef -Wshadow -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wconversion -Wno-long-long -pipe \$(RPM_OPT_FLAGS)::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", + "dist", "cc:-O::(unknown)::::::", + + # Basic configs that should work on any (32 and less bit) box +@@ -196,15 +196,15 @@ + "debug-solaris-sparcv9-cc","cc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG_ALL -xtarget=ultra -xarch=v8plus -g -O -xstrconst -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK_LL DES_PTR DES_RISC1 DES_UNROLL BF_PTR:asm/sparcv8plus.o:::asm/md5-sparcv8plus.o::::::dlfcn:solaris-shared:-KPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", + + #### SPARC Linux setups +-"linux-sparcv7","gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT:::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::", ++"linux-sparcv7","gcc:-DB_ENDIAN -DTERMIO -Wall \$(RPM_OPT_FLAGS)::-D_REENTRANT:::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::", + # Ray Miller has patiently + # assisted with debugging of following two configs. +-"linux-sparcv8","gcc:-mv8 -DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall -DBN_DIV2W::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:asm/sparcv8.o:::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"linux-sparcv8","gcc:-DB_ENDIAN -DTERMIO -Wall -DBN_DIV2W \$(RPM_OPT_FLAGS)::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:asm/sparcv8.o:::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", + # it's a real mess with -mcpu=ultrasparc option under Linux, but + # -Wa,-Av8plus should do the trick no matter what. +-"linux-sparcv9","gcc:-mcpu=ultrasparc -DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall -Wa,-Av8plus -DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:asm/sparcv8plus.o:::asm/md5-sparcv8plus.o::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"linux-sparcv9","gcc:-DB_ENDIAN -DTERMIO -Wall -DBN_DIV2W \$(RPM_OPT_FLAGS)::-D_REENTRANT:ULTRASPARC:-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:asm/sparcv8plus.o:::asm/md5-sparcv8plus.o::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", + # GCC 3.1 is a requirement +-"linux64-sparcv9","gcc:-m64 -mcpu=ultrasparc -DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT:ULTRASPARC:-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::::asm/md5-sparcv9.o::::::dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"linux64-sparcv9","gcc:-DB_ENDIAN -DTERMIO -Wall \$(RPM_OPT_FLAGS)::-D_REENTRANT:ULTRASPARC:-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::::asm/md5-sparcv9.o::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", + + # Sunos configs, assuming sparc for the gcc one. + ##"sunos-cc", "cc:-O4 -DNOPROTO -DNOCONST::(unknown):SUNOS::DES_UNROLL:::", +@@ -314,7 +314,7 @@ + "MPE/iX-gcc", "gcc:-D_ENDIAN -DBN_DIV2W -O3 -D_POSIX_SOURCE -D_SOCKET_SOURCE -I/SYSLOG/PUB::(unknown):MPE:-L/SYSLOG/PUB -lsyslog -lsocket -lcurses:BN_LLONG DES_PTR DES_UNROLL DES_RISC1:::", + + #### PARISC Linux setups +-"linux-parisc","gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall -DBN_DIV2W::-D_REENTRANT:::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::", ++"linux-parisc","gcc:-DB_ENDIAN -DTERMIO -Wall -DBN_DIV2W \$(RPM_OPT_FLAGS)::-D_REENTRANT:::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::", + + # Dec Alpha, OSF/1 - the alpha164-cc is historical, for the conversion + # from the older DEC C Compiler to the newer compiler. It's now the +@@ -364,8 +364,8 @@ + # + # + # +-"linux-alpha-gcc","gcc:-O3 -DL_ENDIAN -DTERMIO::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_UNROLL:${alpha_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +-"linux-alpha+bwx-gcc","gcc:-O3 -DL_ENDIAN -DTERMIO::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL:${alpha_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"linux-alpha-gcc","gcc:-DL_ENDIAN -DTERMIO -mcpu=ev5 \$(RPM_OPT_FLAGS)::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_UNROLL:${alpha_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"linux-alpha+bwx-gcc","gcc:-DL_ENDIAN -DTERMIO -mcpu=ev5 \$(RPM_OPT_FLAGS)::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL:${alpha_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", + "linux-alpha-ccc","ccc:-fast -readonly_strings -DL_ENDIAN -DTERMIO::-D_REENTRANT:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL:${alpha_asm}", + "linux-alpha+bwx-ccc","ccc:-fast -readonly_strings -DL_ENDIAN -DTERMIO::-D_REENTRANT:::SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL:${alpha_asm}", + +@@ -374,14 +374,14 @@ + + # The intel boxes :-), It would be worth seeing if bsdi-gcc can use the + # bn86-elf.o file file since it is hand tweaked assembler. +-"linux-elf", "gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -march=i586 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +-"linux-pentium", "gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -mcpu=pentium -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +-"linux-ppro", "gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -mcpu=pentiumpro -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +-"linux-k6", "gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -mcpu=k6 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +-"debug-linux-pentium","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -DTERMIO -g -mcpu=pentium -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn", +-"debug-linux-ppro","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -DTERMIO -g -mcpu=pentiumpro -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn", +-"debug-linux-elf","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -DTERMIO -g -march=i586 -Wall::-D_REENTRANT::-lefence -ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +-"debug-linux-elf-noefence","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -DTERMIO -g -march=i586 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn", ++"linux-elf", "gcc:-DL_ENDIAN -DTERMIO -Wall \$(RPM_OPT_FLAGS)::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"linux-pentium", "gcc:-DL_ENDIAN -DTERMIO -Wall \$(RPM_OPT_FLAGS)::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"linux-ppro", "gcc:-DL_ENDIAN -DTERMIO -Wall \$(RPM_OPT_FLAGS)::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"linux-k6", "gcc:-DL_ENDIAN -DTERMIO -Wall \$(RPM_OPT_FLAGS)::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"debug-linux-pentium","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -DTERMIO -g -Wall \$(RPM_OPT_FLAGS)::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn", ++"debug-linux-ppro","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -DTERMIO -g -Wall \$(RPM_OPT_FLAGS)::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn", ++"debug-linux-elf","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -DTERMIO -g -Wall \$(RPM_OPT_FLAGS)::-D_REENTRANT::-lefence -ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"debug-linux-elf-noefence","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -DTERMIO -g -Wall \$(RPM_OPT_FLAGS)::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn", + "linux-aout", "gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -march=i586 -Wall::(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_out_asm}", + "linux-mipsel", "gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL DES_RISC2::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", + "linux-mips", "gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL DES_RISC2::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +@@ -391,7 +391,7 @@ + "linux-s390x", "gcc:-DB_ENDIAN -DTERMIO -DNO_ASM -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", + "linux-ia64", "gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK RC4_CHAR:asm/ia64.o:::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", + "linux-ia64-ecc", "ecc:-DL_ENDIAN -DTERMIO -O2 -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK RC4_CHAR:asm/ia64.o:::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +-"linux-x86_64", "gcc:-m64 -DL_ENDIAN -DTERMIO -O3 -Wall -DMD32_REG_T=int::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK RC4_CHAR BF_PTR2 DES_INT DES_UNROLL:asm/x86_64-gcc.o:::::::::dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"linux-x86_64", "gcc:-m64 -DL_ENDIAN -DTERMIO -Wall \$(RPM_OPT_FLAGS) -DMD32_REG_T=int::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK RC4_CHAR BF_PTR2 DES_INT DES_UNROLL:asm/x86_64-gcc.o:::::::::dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", + "NetBSD-sparc", "gcc:-DTERMIOS -O3 -fomit-frame-pointer -mv8 -Wall -DB_ENDIAN::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", + "NetBSD-m68", "gcc:-DTERMIOS -O3 -fomit-frame-pointer -Wall -DB_ENDIAN::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", + "NetBSD-x86", "gcc:-DTERMIOS -O3 -fomit-frame-pointer -march=i586 -Wall::(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +@@ -414,7 +414,7 @@ + "qnx6", "cc:-DL_ENDIAN -DTERMIOS::(unknown)::-lsocket:${x86_gcc_des} ${x86_gcc_opts}:", + + # Linux on ARM +-"linux-elf-arm","gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT:::BN_LLONG::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"linux-elf-arm","gcc:-DL_ENDIAN -DTERMIO -Wall \$(RPM_OPT_FLAGS)::-D_REENTRANT::-ldl:BN_LLONG::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", + + # SCO/Caldera targets. + # Modified: tinysofa/releases/1.1/postfix/current/specs/postfix.spec =================================================================== --- tinysofa/releases/1.1/postfix/current/specs/postfix.spec 2004-07-05 15:03:22 UTC (rev 2904) +++ tinysofa/releases/1.1/postfix/current/specs/postfix.spec 2004-07-05 15:12:38 UTC (rev 2905) @@ -168,7 +168,7 @@ LD_LIBRARY_PATH=`pwd`/lib install -d -m 755 $RPM_BUILD_ROOT/etc/postfix -install -d -m 755 $RPM_BUILD_ROOT%{_initdir} +install -d -m 755 $RPM_BUILD_ROOT%{_initrddir} install -d -m 0700 \ $RPM_BUILD_ROOT/var/spool/postfix/{active,bounce,corrupt,defer} install -d -m 0700 \ @@ -182,12 +182,12 @@ # Install the different sources install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/postfix/main.cf -install -m 755 %{SOURCE2} $RPM_BUILD_ROOT%{_initdir}/postfix +install -m 755 %{SOURCE2} $RPM_BUILD_ROOT%{_initrddir}/postfix install -m 644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/postfix/master.cf install -m 644 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/postfix/transport sed -e 's|@SYSCONFDIR@|%{_sysconfdir}|g' \ - -e 's|@INITDIR@|%{_initdir}|g' \ + -e 's|@INITDIR@|%{_initrddir}|g' \ -e 's|@DOCDIR@|%{_docdir}|g' \ -e 's|@LIBDIR@|%{_libdir}|g' \ -e 's|@NAME@|%{name}|g' \ @@ -438,7 +438,7 @@ %attr(755,root,root) %{_bindir}/mailq %{_sysconfdir}/postfix/postfix-dynupdate -%attr(755,root,root) %{_initdir}/postfix +%attr(755,root,root) %{_initrddir}/postfix %dir %attr(755,root,root) %{_localstatedir}/spool/postfix %dir %attr(700,postfix,root) %{_localstatedir}/spool/postfix/active %dir %attr(700,postfix,root) %{_localstatedir}/spool/postfix/bounce Modified: tinysofa/releases/1.1/postgresql/current/specs/postgresql.spec =================================================================== --- tinysofa/releases/1.1/postgresql/current/specs/postgresql.spec 2004-07-05 15:03:22 UTC (rev 2904) +++ tinysofa/releases/1.1/postgresql/current/specs/postgresql.spec 2004-07-05 15:12:38 UTC (rev 2905) @@ -234,8 +234,8 @@ chmod +x $RPM_BUILD_ROOT/usr/lib/lib*.so* # The initscripts.... -install -d $RPM_BUILD_ROOT%{_initdir} -install -m 755 %{SOURCE3} $RPM_BUILD_ROOT%{_initdir}/postgresql +install -d $RPM_BUILD_ROOT%{_initrddir} +install -m 755 %{SOURCE3} $RPM_BUILD_ROOT%{_initrddir}/postgresql # PGDATA needs removal of group and world permissions due to pg_pwd hole. install -d -m 700 $RPM_BUILD_ROOT/var/lib/postgresql/data @@ -572,7 +572,7 @@ %files server %defattr(-,root,root) -%{_initdir}/postgresql +%{_initrddir}/postgresql /usr/bin/initdb /usr/bin/initlocation /usr/bin/ipcclean Modified: tinysofa/releases/1.1/pptpd/current/specs/pptpd.spec =================================================================== --- tinysofa/releases/1.1/pptpd/current/specs/pptpd.spec 2004-07-05 15:03:22 UTC (rev 2904) +++ tinysofa/releases/1.1/pptpd/current/specs/pptpd.spec 2004-07-05 15:12:38 UTC (rev 2905) @@ -34,8 +34,8 @@ mkdir -p $RPM_BUILD_ROOT/etc/ppp make DESTDIR="$RPM_BUILD_ROOT" install install -m 0644 samples/pptpd.conf $RPM_BUILD_ROOT/etc/pptpd.conf -mkdir -p $RPM_BUILD_ROOT%{_initdir} -install -m 0755 %{SOURCE1} $RPM_BUILD_ROOT%{_initdir}/pptpd +mkdir -p $RPM_BUILD_ROOT%{_initrddir} +install -m 0755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/pptpd install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT/etc/ppp/options.pptpd %files @@ -43,7 +43,7 @@ %doc AUTHORS COPYING INSTALL README* TODO html samples %{_prefix}/sbin/pptpd %{_prefix}/sbin/pptpctrl -%{_initdir}/pptpd +%{_initrddir}/pptpd %{_prefix}/share/man/man5/pptpd.conf.5* %{_prefix}/share/man/man8/pptpd.8* %{_prefix}/share/man/man8/pptpctrl.8* @@ -76,7 +76,7 @@ - Rebuilt against glibc 2.3.2. * Thu Jan 9 2003 Erlend Midttun 1.1.3-3em -- Use _initdir macro. +- Use _initrddir macro. - Remove config(noreplace) on initscript. - Add config(noreplace) on config file. Modified: tinysofa/releases/1.1/quota/current/specs/quota.spec =================================================================== --- tinysofa/releases/1.1/quota/current/specs/quota.spec 2004-07-05 15:03:22 UTC (rev 2904) +++ tinysofa/releases/1.1/quota/current/specs/quota.spec 2004-07-05 15:12:38 UTC (rev 2905) @@ -25,7 +25,7 @@ %install [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != "/" ] && rm -rf "$RPM_BUILD_ROOT" mkdir -p $RPM_BUILD_ROOT/{etc,sbin} -mkdir -p $RPM_BUILD_ROOT%{_initdir} +mkdir -p $RPM_BUILD_ROOT%{_initrddir} make ROOTDIR=$RPM_BUILD_ROOT install # Some binaries have to be available before /usr is mounted Modified: tinysofa/releases/1.1/stunnel/current/specs/stunnel.spec =================================================================== --- tinysofa/releases/1.1/stunnel/current/specs/stunnel.spec 2004-07-05 15:03:22 UTC (rev 2904) +++ tinysofa/releases/1.1/stunnel/current/specs/stunnel.spec 2004-07-05 15:12:38 UTC (rev 2905) @@ -39,10 +39,10 @@ mkdir -p $RPM_BUILD_ROOT/usr/sbin mkdir -p $RPM_BUILD_ROOT/usr/lib mkdir -p $RPM_BUILD_ROOT%{_mandir}/man8 -mkdir -p $RPM_BUILD_ROOT%{_initdir} +mkdir -p $RPM_BUILD_ROOT%{_initrddir} mkdir -p $RPM_BUILD_ROOT/etc/stunnel mkdir -p $RPM_BUILD_ROOT/var/run/stunnel -install -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_initdir}/stunnel +install -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/stunnel install -m 644 %{SOURCE2} $RPM_BUILD_ROOT/etc/stunnel/stunnel.conf %makeinstall cat > README-generate-cert << __EOF__ @@ -71,7 +71,7 @@ %preun if [ "$1" == 0 ]; then - %{_initdir}/stunnel stop 2>&1 + %{_initrddir}/stunnel stop 2>&1 chkconfig --del stunnel fi @@ -85,7 +85,7 @@ %config(noreplace) /etc/stunnel/stunnel.conf /etc/stunnel/stunnel.conf-sample %config(noreplace) /etc/stunnel/stunnel.pem -%{_initdir}/stunnel +%{_initrddir}/stunnel /var/run/stunnel %attr(0644,root,root) %doc AUTHORS BUGS COPYING COPYRIGHT.GPL CREDITS %attr(0644,root,root) %doc ChangeLog INSTALL NEWS PORTS README TODO Modified: tinysofa/releases/1.1/sysstat/current/specs/sysstat.spec =================================================================== --- tinysofa/releases/1.1/sysstat/current/specs/sysstat.spec 2004-07-05 15:03:22 UTC (rev 2904) +++ tinysofa/releases/1.1/sysstat/current/specs/sysstat.spec 2004-07-05 15:12:38 UTC (rev 2905) @@ -24,8 +24,8 @@ %install [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT IGNORE_MAN_GROUP=y -mkdir -p $RPM_BUILD_ROOT%{_initdir} -install -m 0755 %SOURCE1 $RPM_BUILD_ROOT/%{_initdir}/sysstat +mkdir -p $RPM_BUILD_ROOT%{_initrddir} +install -m 0755 %SOURCE1 $RPM_BUILD_ROOT/%{_initrddir}/sysstat rm -rf $RPM_BUILD_ROOT/usr/doc @@ -47,7 +47,7 @@ %files -f %{name}.lang %defattr(-,root,root) %doc CHANGES COPYING CREDITS FAQ README -%{_initdir}/sysstat +%{_initrddir}/sysstat /usr/lib/sa /usr/bin/iostat /usr/bin/sar Modified: tinysofa/releases/1.1/vsftpd/current/specs/vsftpd.spec =================================================================== --- tinysofa/releases/1.1/vsftpd/current/specs/vsftpd.spec 2004-07-05 15:03:22 UTC (rev 2904) +++ tinysofa/releases/1.1/vsftpd/current/specs/vsftpd.spec 2004-07-05 15:12:38 UTC (rev 2905) @@ -40,7 +40,7 @@ %install install -d -m 755 $RPM_BUILD_ROOT/%{_sbindir} -install -d -m 755 $RPM_BUILD_ROOT/%{_initdir} +install -d -m 755 $RPM_BUILD_ROOT/%{_initrddir} install -d -m 755 $RPM_BUILD_ROOT/%{_sysconfdir}/{vsftpd,pam.d} install -d -m 755 $RPM_BUILD_ROOT/%{_sysconfdir}/{logrotate.d,xinetd.d} install -d -m 755 $RPM_BUILD_ROOT/%{_mandir}/man{5,8} @@ -53,7 +53,7 @@ install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/xinetd.d/vsftpd install -m 644 %{SOURCE2} $RPM_BUILD_ROOT/%{_sysconfdir}/pam.d/vsftpd install -m 600 %{SOURCE3} $RPM_BUILD_ROOT/%{_sysconfdir}/vsftpd.user_list -install -m 755 %{SOURCE4} $RPM_BUILD_ROOT/%{_initdir}/vsftpd +install -m 755 %{SOURCE4} $RPM_BUILD_ROOT/%{_initrddir}/vsftpd install -m 644 %{SOURCE5} $RPM_BUILD_ROOT/%{_sysconfdir}/logrotate.d/vsftpd install -m 600 %{SOURCE6} $RPM_BUILD_ROOT/%{_sysconfdir}/vsftpd/vsftpd.conf touch -m 600 $RPM_BUILD_ROOT/%{_localstatedir}/log/vsftpd @@ -79,7 +79,7 @@ %doc REWARD SPEED TODO SECURITY/ TUNING SIZE vsftpd.xinetd %doc EXAMPLE/ %{_sbindir}/vsftpd -%{_initdir}/vsftpd +%{_initrddir}/vsftpd %config(noreplace) %{_sysconfdir}/vsftpd.* %dir %{_sysconfdir}/vsftpd %config(noreplace) %{_sysconfdir}/vsftpd/* From svn at tinysofa.org Mon Jul 5 15:16:18 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 6 Jul 2004 01:16:18 +1000 (EST) Subject: [tinysofa-svn] r2906 - in tinysofa/releases/1.1/apache/current: sources specs Message-ID: <20040705151618.40EB74E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-06 01:16:18 +1000 (Tue, 06 Jul 2004) New Revision: 2906 Modified: tinysofa/releases/1.1/apache/current/sources/httpd.init tinysofa/releases/1.1/apache/current/specs/apache.spec Log: - add try-restart support - use service macros Modified: tinysofa/releases/1.1/apache/current/sources/httpd.init =================================================================== --- tinysofa/releases/1.1/apache/current/sources/httpd.init 2004-07-05 15:12:38 UTC (rev 2905) +++ tinysofa/releases/1.1/apache/current/sources/httpd.init 2004-07-05 15:16:18 UTC (rev 2906) @@ -53,8 +53,14 @@ } echo ;; + condrestart|try-restart) + if [ -f /var/run/httpd.pid ]; then + $0 stop + $0 start + fi + ;; *) - echo "Usage: $0 {start|stop|restart|reload|status}" + echo "Usage: $0 {start|stop|restart|reload|status|try-restart}" exit 1 esac Modified: tinysofa/releases/1.1/apache/current/specs/apache.spec =================================================================== --- tinysofa/releases/1.1/apache/current/specs/apache.spec 2004-07-05 15:12:38 UTC (rev 2905) +++ tinysofa/releases/1.1/apache/current/specs/apache.spec 2004-07-05 15:16:18 UTC (rev 2906) @@ -20,14 +20,14 @@ Source9: tinysofa-html.tar.gz License: BSD-like Provides: apache-ssl securewebserver webserver apache -BuildRoot: %{_tmppath}/%{name}-root +BuildRoot: %{_tmppath}/%{name}-%{version}-root Requires: initscripts >= 3.25 Requires: openssl >= 0.9.6e Requires: mailcap Requires: expat-libs Requires: apr Requires: apr-util -Prereq: /sbin/restart_maybe chkconfig +%service_requires BuildRequires: openssl-devel >= 0.9.6e BuildRequires: expat-devel, expat-libs BuildRequires: zlib-devel @@ -180,8 +180,7 @@ #make certificate TYPE=dummy %install -rm -fr $RPM_BUILD_ROOT -make install DESTDIR="$RPM_BUILD_ROOT" +%makeinstall_std # Remove silly html pages, copy in our own index.html rm $RPM_BUILD_ROOT/home/httpd/html/index.html* @@ -260,21 +259,14 @@ fi %post -# Adding nessesary symlinks. -chkconfig --add httpd +%service_post httpd -# Restart service after upgrade. -/sbin/restart_maybe httpd - - %preun -if [ $1 = 0 ]; then - if [ -f /mnt/lockdev/httpd ]; then - %{_initrddir}/httpd stop - fi - /sbin/chkconfig --del httpd -fi +%service_preun httpd +%postun +%service_postun + %post -n apr /sbin/ldconfig @@ -288,7 +280,7 @@ /sbin/ldconfig %clean -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT +%clean_buildroot %files From svn at tinysofa.org Mon Jul 5 15:25:18 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 6 Jul 2004 01:25:18 +1000 (EST) Subject: [tinysofa-svn] r2907 - in tinysofa/releases/1.1/courier-imap/current: sources specs Message-ID: <20040705152518.DD39E4E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-06 01:25:18 +1000 (Tue, 06 Jul 2004) New Revision: 2907 Modified: tinysofa/releases/1.1/courier-imap/current/sources/courier-imapd.init tinysofa/releases/1.1/courier-imap/current/sources/courier-pop3d.init tinysofa/releases/1.1/courier-imap/current/sources/courier-pop3sd.init tinysofa/releases/1.1/courier-imap/current/sources/courier-simapd.init tinysofa/releases/1.1/courier-imap/current/specs/courier-imap.spec Log: - use service macros - add try-restart support Modified: tinysofa/releases/1.1/courier-imap/current/sources/courier-imapd.init =================================================================== --- tinysofa/releases/1.1/courier-imap/current/sources/courier-imapd.init 2004-07-05 15:16:18 UTC (rev 2906) +++ tinysofa/releases/1.1/courier-imap/current/sources/courier-imapd.init 2004-07-05 15:25:18 UTC (rev 2907) @@ -79,8 +79,15 @@ stop start ;; + condrestart|try-restart) + if [ -f ${INITLOCK:-/mnt/lockdev}/courier-imap.imap ]; then + stop + start + fi + ;; + *) - echo "Usage: $0 {start|stop|status|restart}" + echo "Usage: $0 {start|stop|status|restart|try-restart}" exit 3 esac exit 0 Modified: tinysofa/releases/1.1/courier-imap/current/sources/courier-pop3d.init =================================================================== --- tinysofa/releases/1.1/courier-imap/current/sources/courier-pop3d.init 2004-07-05 15:16:18 UTC (rev 2906) +++ tinysofa/releases/1.1/courier-imap/current/sources/courier-pop3d.init 2004-07-05 15:25:18 UTC (rev 2907) @@ -79,8 +79,14 @@ stop start ;; + condrestart|try-restart) + if [ -f ${INITLOCK:-/mnt/lockdev}/courier-imap.pop3 ]; then + stop + start + fi + ;; *) - echo "Usage: $0 {start|stop|status|restart}" + echo "Usage: $0 {start|stop|status|restart|try-restart}" exit 3 esac exit 0 Modified: tinysofa/releases/1.1/courier-imap/current/sources/courier-pop3sd.init =================================================================== --- tinysofa/releases/1.1/courier-imap/current/sources/courier-pop3sd.init 2004-07-05 15:16:18 UTC (rev 2906) +++ tinysofa/releases/1.1/courier-imap/current/sources/courier-pop3sd.init 2004-07-05 15:25:18 UTC (rev 2907) @@ -94,8 +94,14 @@ stop start ;; + condrestart|try-restart) + if [ -f ${INITLOCK:-/mnt/lockdev}/courier-imap.pop3-ssl ]; then + stop + start + fi + ;; *) - echo "Usage: $0 {start|stop|status|restart}" + echo "Usage: $0 {start|stop|status|restart|try-restart}" exit 3 esac exit 0 Modified: tinysofa/releases/1.1/courier-imap/current/sources/courier-simapd.init =================================================================== --- tinysofa/releases/1.1/courier-imap/current/sources/courier-simapd.init 2004-07-05 15:16:18 UTC (rev 2906) +++ tinysofa/releases/1.1/courier-imap/current/sources/courier-simapd.init 2004-07-05 15:25:18 UTC (rev 2907) @@ -94,8 +94,14 @@ stop start ;; + condrestart|try-restart) + if [ -f ${INITLOCK:-/mnt/lockdev}/courier-imap.imap-ssl ]; then + stop + start + fi + ;; *) - echo "Usage: $0 {start|stop|status|restart}" + echo "Usage: $0 {start|stop|status|restart|try-restart}" exit 3 esac exit 0 Modified: tinysofa/releases/1.1/courier-imap/current/specs/courier-imap.spec =================================================================== --- tinysofa/releases/1.1/courier-imap/current/specs/courier-imap.spec 2004-07-05 15:16:18 UTC (rev 2906) +++ tinysofa/releases/1.1/courier-imap/current/specs/courier-imap.spec 2004-07-05 15:25:18 UTC (rev 2907) @@ -20,8 +20,9 @@ Patch0: courier-imap-mksslcert.patch URL: http://www.courier-mta.org BuildRoot: %{_tmppath}/%{name}-root -Requires: /sbin/chkconfig, coreutils, sed -Requires: /sbin/restart_maybe, db4, openssl, imapd-pam +%service_requires +Requires: coreutils, sed +Requires: db4, openssl, imapd-pam BuildRequires: coreutils, rpm >= 4.0.2, sed, libstdc++-devel BuildRequires: perl, db4-devel, openssl-devel BuildRequires: pam-devel openldap-devel mysql-devel postgresql-devel @@ -97,7 +98,6 @@ make %install -[ -n "$RPM_BUILD_ROOT" -a "RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/%{_initrddir} mkdir -p $RPM_BUILD_ROOT/%{_datadir}/%{name} make install-strip DESTDIR=$RPM_BUILD_ROOT @@ -142,43 +142,26 @@ %post -/sbin/chkconfig --add courier-imapd -/sbin/chkconfig --add courier-simapd -/sbin/chkconfig --add courier-pop3d -/sbin/chkconfig --add courier-pop3sd -/sbin/restart_maybe courier-imapd -/sbin/restart_maybe courier-simapd -/sbin/restart_maybe courier-pop3d -/sbin/restart_maybe courier-pop3sd +%service_post courier-imapd +%service_post courier-simapd +%service_post courier-pop3d +%service_post courier-pop3sd %preun -/sbin/service courier-imapd status > /dev/null -if [ "$?" = "0" ]; then - /sbin/service courier-imapd stop -fi -/sbin/service courier-simapd status > /dev/null -if [ "$?" = "0" ]; then - /sbin/service courier-simapd stop -fi -/sbin/service courier-pop3d status > /dev/null -if [ "$?" = "0" ]; then - /sbin/service courier-pop3d stop -fi -/sbin/service courier-pop3sd status > /dev/null -if [ "$?" = "0" ]; then - /sbin/service courier-pop3sd stop -fi -if [ "$1" = "0" ] ; then - rm -f %{sslcache} - /sbin/chkconfig --del courier-imapd - /sbin/chkconfig --del courier-simapd - /sbin/chkconfig --del courier-pop3d - /sbin/chkconfig --del courier-pop3sd -fi +%service_preun courier-imapd +%service_preun courier-simapd +%service_preun courier-pop3d +%service_preun courier-pop3sd +%postun +%service_postun courier-imapd +%service_postun courier-simapd +%service_postun courier-pop3d +%service_postun courier-pop3sd + %clean -[ -n "$RPM_BUILD_ROOT" -a "RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT +%clean_buildroot %files From svn at tinysofa.org Mon Jul 5 15:29:06 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 6 Jul 2004 01:29:06 +1000 (EST) Subject: [tinysofa-svn] r2908 - in tinysofa/releases/1.1/cups/current: sources specs Message-ID: <20040705152906.E9FAD4E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-06 01:29:06 +1000 (Tue, 06 Jul 2004) New Revision: 2908 Modified: tinysofa/releases/1.1/cups/current/sources/cups.init tinysofa/releases/1.1/cups/current/specs/cups.spec Log: - add try-restart support - use service macros Modified: tinysofa/releases/1.1/cups/current/sources/cups.init =================================================================== --- tinysofa/releases/1.1/cups/current/sources/cups.init 2004-07-05 15:25:18 UTC (rev 2907) +++ tinysofa/releases/1.1/cups/current/sources/cups.init 2004-07-05 15:29:06 UTC (rev 2908) @@ -77,7 +77,7 @@ restart) restart ;; - condrestart) + condrestart|try-restart) [ -f ${INITLOCK:-/mnt/lockdev}/cups ] && restart || : ;; reload) @@ -98,7 +98,7 @@ ;; *) - echo $"Usage: $prog {start|stop|restart|condrestart|reload|status}" + echo $"Usage: $prog {start|stop|restart|condrestart|reload|status|try-restart}" exit 1 esac Modified: tinysofa/releases/1.1/cups/current/specs/cups.spec =================================================================== --- tinysofa/releases/1.1/cups/current/specs/cups.spec 2004-07-05 15:25:18 UTC (rev 2907) +++ tinysofa/releases/1.1/cups/current/specs/cups.spec 2004-07-05 15:29:06 UTC (rev 2908) @@ -18,7 +18,7 @@ Patch9: cups-1.1.19-ppdsdat.patch Url: http://www.cups.org/ BuildRoot: %{_tmppath}/%{name}-root -PreReq: /sbin/chkconfig /sbin/service /sbin/restart_maybe +%service_requires Requires: %{name}-libs = %{version} xinetd libjpeg libtiff libpng zlib openssl Requires: ghostscript-cups Requires: libstdc++ @@ -80,7 +80,6 @@ make OPTIM="$RPM_OPT_FLAGS $CFLAGS -fpic" %install -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf "$RPM_BUILD_ROOT" mkdir -p $RPM_BUILD_ROOT%{_initrddir} make BUILDROOT=$RPM_BUILD_ROOT install @@ -127,8 +126,7 @@ rm -rf $RPM_BUILD_ROOT%{_mandir}/cat? $RPM_BUILD_ROOT%{_mandir}/*/cat? %post -/sbin/chkconfig --add cups || true -/sbin/restart_maybe cups +%service_post cups if [ $1 -eq 1 ]; then # First install. Build ppds.dat. @@ -141,18 +139,12 @@ %postun libs -p /sbin/ldconfig %preun -if [ "$1" = "0" ]; then - /sbin/service cups stop > /dev/null 2>&1 - /sbin/chkconfig --del cups -fi -exit 0 +%service_preun cups %postun -if [ "$1" -ge "1" ]; then - /sbin/service cups condrestart > /dev/null 2>&1 -fi -exit 0 +%service_postun cups + %triggerin -- samba-client ln -sf ../../../bin/smbspool %{_libdir}/cups/backend/smb || : exit 0 From svn at tinysofa.org Mon Jul 5 15:33:02 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 6 Jul 2004 01:33:02 +1000 (EST) Subject: [tinysofa-svn] r2909 - in tinysofa/releases/1.1/cyrus-imapd/current: sources specs Message-ID: <20040705153302.DFB434E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-06 01:33:02 +1000 (Tue, 06 Jul 2004) New Revision: 2909 Modified: tinysofa/releases/1.1/cyrus-imapd/current/sources/cyrus-imapd-rc tinysofa/releases/1.1/cyrus-imapd/current/specs/cyrus-imapd.spec Log: - use service macros - add try-restart support Modified: tinysofa/releases/1.1/cyrus-imapd/current/sources/cyrus-imapd-rc =================================================================== --- tinysofa/releases/1.1/cyrus-imapd/current/sources/cyrus-imapd-rc 2004-07-05 15:29:06 UTC (rev 2908) +++ tinysofa/releases/1.1/cyrus-imapd/current/sources/cyrus-imapd-rc 2004-07-05 15:33:02 UTC (rev 2909) @@ -50,7 +50,7 @@ restart) restart ;; - condrestart) + condrestart|try-restart) [ -f /var/run/cyrus-master.pid ] && restart || : ;; status) @@ -58,7 +58,7 @@ RETVAL=$? ;; *) - echo "Usage: $0 {start|stop|restart|condrestart|status}" + echo "Usage: $0 {start|stop|restart|try-restart|status}" RETVAL=1 esac Modified: tinysofa/releases/1.1/cyrus-imapd/current/specs/cyrus-imapd.spec =================================================================== --- tinysofa/releases/1.1/cyrus-imapd/current/specs/cyrus-imapd.spec 2004-07-05 15:29:06 UTC (rev 2908) +++ tinysofa/releases/1.1/cyrus-imapd/current/specs/cyrus-imapd.spec 2004-07-05 15:33:02 UTC (rev 2909) @@ -28,6 +28,7 @@ BuildRequires: cyrus-sasl-devel, e2fsprogs-devel, perl, perl-devel, tcp_wrappers BuildRequires: db4, db4-devel, openssl-devel, libcom_err-devel Prereq: shadow-utils, glibc +%service_requires Provides: imapd %define mail_gid 12 %define cyrus_uid 110 @@ -85,7 +86,6 @@ gcc $RPM_OPT_FLAGS -o deliver-wrapper $RPM_SOURCE_DIR/cyrus-deliver-wrapper.c %install -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT # Create directories. mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/{cron.daily,postfix} mkdir -p $RPM_BUILD_ROOT/{usr/bin,%{_sysconfdir}/sbin} @@ -165,7 +165,7 @@ find %{buildroot} -name "perllocal.pod" -exec %{__rm} -f {} \; %clean -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT +%clean_buildroot %pre /etc/init.d/cyrus stop 2>/dev/null >/dev/null || : @@ -186,21 +186,19 @@ #install -m600 -o cyrus -g mail /dev/null /var/log/imapd.log -/sbin/chkconfig --add cyrus -/sbin/restart_maybe cyrus +%service_post cyrus echo "Don't forget to activate the mail transport to cyrus in postfix" %preun +%service_preun cyrus if [ $1 = 0 ]; then /etc/init.d/cyrus stop 2>/dev/null || : /sbin/chkconfig --del cyrus || : fi %postun -if [ $1 -ge 1 ]; then - /sbin/restart_maybe 2>&1 > /dev/null -fi +%service_postun cyrus %files %defattr(-,root,root) From svn at tinysofa.org Mon Jul 5 15:38:02 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 6 Jul 2004 01:38:02 +1000 (EST) Subject: [tinysofa-svn] r2910 - in tinysofa/releases/1.1/cyrus-sasl/current: sources specs Message-ID: <20040705153802.690F04E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-06 01:38:02 +1000 (Tue, 06 Jul 2004) New Revision: 2910 Modified: tinysofa/releases/1.1/cyrus-sasl/current/sources/cyrus-saslauthd.init tinysofa/releases/1.1/cyrus-sasl/current/specs/cyrus-sasl.spec Log: - support try-restart - use service macros Modified: tinysofa/releases/1.1/cyrus-sasl/current/sources/cyrus-saslauthd.init =================================================================== --- tinysofa/releases/1.1/cyrus-sasl/current/sources/cyrus-saslauthd.init 2004-07-05 15:33:02 UTC (rev 2909) +++ tinysofa/releases/1.1/cyrus-sasl/current/sources/cyrus-saslauthd.init 2004-07-05 15:38:02 UTC (rev 2910) @@ -69,11 +69,11 @@ status saslauthd RETVAL=$? ;; - condrestart) + condrestart|try-restart) [ -f ${INITLOCK:-/mnt/lockdev}/saslauthd ] && $0 restart || : ;; *) - echo $"Usage: saslauthd {start|stop|status|restart|condrestart}" + echo $"Usage: saslauthd {start|stop|status|restart|try-restart}" exit 1 esac Modified: tinysofa/releases/1.1/cyrus-sasl/current/specs/cyrus-sasl.spec =================================================================== --- tinysofa/releases/1.1/cyrus-sasl/current/specs/cyrus-sasl.spec 2004-07-05 15:33:02 UTC (rev 2909) +++ tinysofa/releases/1.1/cyrus-sasl/current/specs/cyrus-sasl.spec 2004-07-05 15:38:02 UTC (rev 2910) @@ -14,7 +14,7 @@ BuildRequires: libtool, groff BuildRequires: db4-devel, openssl-devel, pam-devel BuildRequires: mysql-devel, mysql-libs, postgresql-devel -Prereq: /sbin/ldconfig, chkconfig, /sbin/service, tinysofa-utils +%service_requires Requires: pam, db4, openssl %description @@ -115,9 +115,7 @@ %install -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT - -make install DESTDIR=$RPM_BUILD_ROOT +%makeinstall_std install -m755 -d $RPM_BUILD_ROOT%{_bindir} ./libtool --mode=install \ @@ -146,25 +144,19 @@ %clean -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT +%clean_buildroot %post /sbin/ldconfig -# Make correct symlinks. -/sbin/chkconfig --add saslauthd -# Restart service after upgrade. -/sbin/restart_maybe saslauthd +%service_post saslauthd %preun -if [ $1 = 0 ] ; then - /etc/init.d/saslauthd stop 2>/dev/null || : - /sbin/chkconfig --del saslauthd || : -fi +%service_preun saslauthd - %postun +%service_postun saslauthd /sbin/ldconfig From svn at tinysofa.org Mon Jul 5 15:39:28 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 6 Jul 2004 01:39:28 +1000 (EST) Subject: [tinysofa-svn] r2911 - in tinysofa/releases/1.1/tinysofa-utils/current: sources specs Message-ID: <20040705153928.EA3CB4E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-06 01:39:28 +1000 (Tue, 06 Jul 2004) New Revision: 2911 Removed: tinysofa/releases/1.1/tinysofa-utils/current/sources/tinysofa-utils-restart_maybe Modified: tinysofa/releases/1.1/tinysofa-utils/current/specs/tinysofa-utils.spec Log: - do not install restart_maybe Deleted: tinysofa/releases/1.1/tinysofa-utils/current/sources/tinysofa-utils-restart_maybe =================================================================== --- tinysofa/releases/1.1/tinysofa-utils/current/sources/tinysofa-utils-restart_maybe 2004-07-05 15:38:02 UTC (rev 2910) +++ tinysofa/releases/1.1/tinysofa-utils/current/sources/tinysofa-utils-restart_maybe 2004-07-05 15:39:28 UTC (rev 2911) @@ -1,25 +0,0 @@ -#!/bin/bash -# A script to maybe restart a service for use in rpm spec files. -# This script, when called with a service name as an argument will "stop" and -# "start" this service IF it is configured to run in the current runlevel. -# If chkconfig does not report the service as configured to "on", it will not -# be restarted. - -# do we want help? -if [ x$1 = x--help ] || [ $# -lt 1 ]; then - echo "Usage: $0 " - exit 0 -fi - -# check if init script is present and accounted for -test -x /etc/init.d/$1 ||\ - (echo Init script for $1 not found; exit 1) || exit 1 -# find runlevel, typically "3" -RUNLEVEL=`runlevel | /bin/awk '{ print $2 }'` -# find if the service is supposed to start -RUNME=`chkconfig --list $1|grep $RUNLEVEL:on` -# restart if necessary -if [ x"$RUNME" != x ]; then - /etc/init.d/$1 stop - /etc/init.d/$1 start -fi Modified: tinysofa/releases/1.1/tinysofa-utils/current/specs/tinysofa-utils.spec =================================================================== --- tinysofa/releases/1.1/tinysofa-utils/current/specs/tinysofa-utils.spec 2004-07-05 15:38:02 UTC (rev 2910) +++ tinysofa/releases/1.1/tinysofa-utils/current/specs/tinysofa-utils.spec 2004-07-05 15:39:28 UTC (rev 2911) @@ -1,23 +1,20 @@ Name: tinysofa-utils Version: 2.0 -Release: 4ts +Release: 5jh URL: http://www.tinysofa.org Summary: tinysofa utilities -Source0: tinysofa-utils-restart_maybe Source1: tsbuild Source2: tsintegrate Source3: tsrep Source4: tsunpack_rpm Source5: tsrelease License: GPL -Group: main -BuildRoot: %{_tmppath}/%{name}-root +Group: tinysofa/main +BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRequires: coreutils -Requires: /sbin/chkconfig grep /sbin/runlevel /bin/awk +Requires: rpm PreReq: mkinitrd, coreutils, sysvinit, file, modutils BuildArch: noarch -Provides: tsl-utils -Obsoletes: tsl-utils %description The tinysofa utils is a set of utilities and scripts that are made @@ -29,11 +26,8 @@ # satisfy rpm %install -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT - install -d $RPM_BUILD_ROOT/sbin install -d $RPM_BUILD_ROOT/usr/share/tinysofa-utils -install -m755 %{SOURCE0} ${RPM_BUILD_ROOT}/sbin/restart_maybe install -m755 %{SOURCE1} ${RPM_BUILD_ROOT}/usr/share/tinysofa-utils/tsbuild install -m755 %{SOURCE2} ${RPM_BUILD_ROOT}/usr/share/tinysofa-utils/tsintegrate install -m755 %{SOURCE3} ${RPM_BUILD_ROOT}/usr/share/tinysofa-utils/tsrep @@ -41,11 +35,10 @@ install -m755 %{SOURCE5} ${RPM_BUILD_ROOT}/usr/share/tinysofa-utils/tsrelease %clean -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT +%clean_buildroot %files %defattr(0755,root,root) -/sbin/restart_maybe %dir /usr/share/tinysofa-utils /usr/share/tinysofa-utils/tsbuild /usr/share/tinysofa-utils/tsintegrate @@ -54,6 +47,9 @@ /usr/share/tinysofa-utils/tsrelease %changelog +* Mon Jun 28 2004 Jaakko Heinonen 2.0.5jh +- remove /sbin/restart_maybe + * Fri Jun 18 2004 tsintegrate 2.0-4ts - current (2.0-3ts) integrated as 2.0-4ts for release 1.0-U2 From svn at tinysofa.org Mon Jul 5 15:41:08 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 6 Jul 2004 01:41:08 +1000 (EST) Subject: [tinysofa-svn] r2912 - tinysofa/releases/1.1/mysql/current/specs Message-ID: <20040705154108.E1D9C4E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-06 01:41:08 +1000 (Tue, 06 Jul 2004) New Revision: 2912 Modified: tinysofa/releases/1.1/mysql/current/specs/mysql.spec Log: - remove restart_maybe call Modified: tinysofa/releases/1.1/mysql/current/specs/mysql.spec =================================================================== --- tinysofa/releases/1.1/mysql/current/specs/mysql.spec 2004-07-05 15:39:28 UTC (rev 2911) +++ tinysofa/releases/1.1/mysql/current/specs/mysql.spec 2004-07-05 15:41:08 UTC (rev 2912) @@ -209,9 +209,6 @@ # Take care of info pages %info_post -# Restart in the same way that mysqld will be started normally. -/sbin/restart_maybe mysql - # Allow mysqld_safe to start mysqld and print a message before we exit sleep 2 From svn at tinysofa.org Mon Jul 5 15:45:40 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 6 Jul 2004 01:45:40 +1000 (EST) Subject: [tinysofa-svn] r2913 - in tinysofa/releases/1.1/nfs-utils/current: sources specs Message-ID: <20040705154540.5A7614E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-06 01:45:40 +1000 (Tue, 06 Jul 2004) New Revision: 2913 Modified: tinysofa/releases/1.1/nfs-utils/current/sources/nfs.init tinysofa/releases/1.1/nfs-utils/current/sources/nfslock.init tinysofa/releases/1.1/nfs-utils/current/specs/nfs-utils.spec Log: - add try-restart support - use service macros Modified: tinysofa/releases/1.1/nfs-utils/current/sources/nfs.init =================================================================== --- tinysofa/releases/1.1/nfs-utils/current/sources/nfs.init 2004-07-05 15:41:08 UTC (rev 2912) +++ tinysofa/releases/1.1/nfs-utils/current/sources/nfs.init 2004-07-05 15:45:40 UTC (rev 2913) @@ -166,8 +166,14 @@ echo reload; exit 0 fi ;; + condrestart|try-restart) + [ -f ${INITLOCK:-/mnt/lockdev}/nfs ] && { + $0 stop + $0 start + } + ;; *) - echo "Usage: nfs {start|stop|status|restart|reload}" + echo "Usage: nfs {start|stop|status|restart|reload|try-restart}" exit 1 esac Modified: tinysofa/releases/1.1/nfs-utils/current/sources/nfslock.init =================================================================== --- tinysofa/releases/1.1/nfs-utils/current/sources/nfslock.init 2004-07-05 15:41:08 UTC (rev 2912) +++ tinysofa/releases/1.1/nfs-utils/current/sources/nfslock.init 2004-07-05 15:45:40 UTC (rev 2913) @@ -64,8 +64,14 @@ echo restart; exit 0 fi ;; + condrestart|try-restart) + [ -f ${INITLOCK:-/mnt/lockdev}/nfslock ] && { + stop + start + } + ;; *) - echo "Usage: nfslock {start|stop|status|restart}" + echo "Usage: nfslock {start|stop|status|restart|try-restart}" exit 1 esac Modified: tinysofa/releases/1.1/nfs-utils/current/specs/nfs-utils.spec =================================================================== --- tinysofa/releases/1.1/nfs-utils/current/specs/nfs-utils.spec 2004-07-05 15:41:08 UTC (rev 2912) +++ tinysofa/releases/1.1/nfs-utils/current/specs/nfs-utils.spec 2004-07-05 15:45:40 UTC (rev 2913) @@ -21,7 +21,7 @@ Provides: knfsd BuildRoot: %{_tmppath}/%{name}-root Requires: portmap >= 4.0, coreutils, procps -PreReq: /sbin/chkconfig /sbin/restart_maybe +%service_requires %description The nfs-utils package provides a daemon for the kernel NFS server and @@ -62,19 +62,18 @@ [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT %post -# Restart service after upgrade. -/sbin/chkconfig --add nfs -/sbin/restart_maybe nfs -/sbin/chkconfig --add nfslock -/sbin/restart_maybe nfslock +%service_post nfs +%service_post nfslock %preun -if [ "$1" = "0" ]; then - /sbin/chkconfig --del nfs - /sbin/chkconfig --del nfslock -fi +%service_preun nfs +%service_preun nfslock +%postun +%service_postun nfs +%service_postun nfslock + %files %defattr(-,root,root) /etc/init.d/nfs @@ -172,4 +171,4 @@ some traces of my sanity with me...) * Mon Jan 17 2000 Preston Brown -- use statfs syscall instead of stat to determinal optimal blksize \ No newline at end of file +- use statfs syscall instead of stat to determinal optimal blksize From svn at tinysofa.org Mon Jul 5 15:48:37 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 6 Jul 2004 01:48:37 +1000 (EST) Subject: [tinysofa-svn] r2914 - in tinysofa/releases/1.1/openldap/current: sources specs Message-ID: <20040705154837.C99F94E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-06 01:48:37 +1000 (Tue, 06 Jul 2004) New Revision: 2914 Modified: tinysofa/releases/1.1/openldap/current/sources/openldap.init tinysofa/releases/1.1/openldap/current/specs/openldap.spec Log: - add try-restart support - use service macros Modified: tinysofa/releases/1.1/openldap/current/sources/openldap.init =================================================================== --- tinysofa/releases/1.1/openldap/current/sources/openldap.init 2004-07-05 15:45:40 UTC (rev 2913) +++ tinysofa/releases/1.1/openldap/current/sources/openldap.init 2004-07-05 15:48:37 UTC (rev 2914) @@ -55,8 +55,14 @@ $0 stop $0 start ;; + condrestart|try-restart) + if [ -f ${INITLOCK:-/var/lock/subsys}/ldap ]; then + $0 stop + $0 start + fi + ;; *) - echo "Usage: $0 {start|stop|restart|status}" + echo "Usage: $0 {start|stop|restart|status|try-restart}" exit 1 esac Modified: tinysofa/releases/1.1/openldap/current/specs/openldap.spec =================================================================== --- tinysofa/releases/1.1/openldap/current/specs/openldap.spec 2004-07-05 15:45:40 UTC (rev 2913) +++ tinysofa/releases/1.1/openldap/current/specs/openldap.spec 2004-07-05 15:48:37 UTC (rev 2914) @@ -33,6 +33,7 @@ BuildRoot: %{_tmppath}/%{name}-root BuildRequires: openssl-devel tcp_wrappers cyrus-sasl-devel libtool Requires: readline +%service_requires BuildRequires: readline-devel %if !%{_useldbm} BuildRequires: db4-devel @@ -208,19 +209,18 @@ fi %post servers -/sbin/chkconfig --add ldap -/sbin/restart_maybe ldap +%service_post ldap %preun servers -if [ "$1" = 0 ] ; then - %{_initrddir}/ldap stop > /dev/null || : - /sbin/chkconfig --del ldap -fi +%service_preun ldap +%postun servers +%service_postun ldap + %clean -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT +%clean_buildroot %files From svn at tinysofa.org Mon Jul 5 15:51:01 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 6 Jul 2004 01:51:01 +1000 (EST) Subject: [tinysofa-svn] r2915 - in tinysofa/releases/1.1/openssh/current: sources specs Message-ID: <20040705155101.DC3504E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-06 01:51:01 +1000 (Tue, 06 Jul 2004) New Revision: 2915 Modified: tinysofa/releases/1.1/openssh/current/sources/sshd.init tinysofa/releases/1.1/openssh/current/specs/openssh.spec Log: - add try-restart support - use service macros Modified: tinysofa/releases/1.1/openssh/current/sources/sshd.init =================================================================== --- tinysofa/releases/1.1/openssh/current/sources/sshd.init 2004-07-05 15:48:37 UTC (rev 2914) +++ tinysofa/releases/1.1/openssh/current/sources/sshd.init 2004-07-05 15:51:01 UTC (rev 2915) @@ -142,7 +142,7 @@ $0 start RETVAL=$? ;; - condrestart) + condrestart|try-restart) if [ -f /var/lock/subsys/sshd ] ; then do_restart_sanity_check $0 stop @@ -155,7 +155,7 @@ RETVAL=$? ;; *) - echo "Usage: sshd {start|stop|restart|status|condrestart}" + echo "Usage: sshd {start|stop|restart|status|try-restart}" exit 1 ;; esac Modified: tinysofa/releases/1.1/openssh/current/specs/openssh.spec =================================================================== --- tinysofa/releases/1.1/openssh/current/specs/openssh.spec 2004-07-05 15:48:37 UTC (rev 2914) +++ tinysofa/releases/1.1/openssh/current/specs/openssh.spec 2004-07-05 15:51:01 UTC (rev 2915) @@ -34,7 +34,7 @@ Group: main Obsoletes: ssh-server PreReq: %{name} = %{version} -PreReq: chkconfig >= 0.9, tinysofa-utils, coreutils +%service_requires PreReq: opensshdconf @@ -122,8 +122,7 @@ %install -[ -n "$RPM_BUILD_ROOT" -a "RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT/ +%makeinstall_std install -d $RPM_BUILD_ROOT/etc/pam.d/ install -d $RPM_BUILD_ROOT%{_initrddir} @@ -144,20 +143,18 @@ %post server -chkconfig --add sshd -/sbin/restart_maybe sshd +%service_post sshd %preun server -if [ "$1" = 0 ] -then - %{_initrddir}/sshd stop >&2 - /sbin/chkconfig --del sshd -fi +%service_preun sshd +%postun server +%service_postun sshd + %clean -[ -n "$RPM_BUILD_ROOT" -a "RPM_BUILD_ROOT" != / ] && rm -rf "$RPM_BUILD_ROOT" +%clean_buildroot %files @@ -421,4 +418,4 @@ - New binary names * Wed Oct 27 1999 Damien Miller -- Initial RPMification, based on Jan "Yenya" Kasprzak's spec. \ No newline at end of file +- Initial RPMification, based on Jan "Yenya" Kasprzak's spec. From svn at tinysofa.org Mon Jul 5 15:53:33 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 6 Jul 2004 01:53:33 +1000 (EST) Subject: [tinysofa-svn] r2916 - in tinysofa/releases/1.1/portmap/current: sources specs Message-ID: <20040705155333.C3DDC4E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-06 01:53:33 +1000 (Tue, 06 Jul 2004) New Revision: 2916 Modified: tinysofa/releases/1.1/portmap/current/sources/portmap.init tinysofa/releases/1.1/portmap/current/specs/portmap.spec Log: - try-restart support - use service macros Modified: tinysofa/releases/1.1/portmap/current/sources/portmap.init =================================================================== --- tinysofa/releases/1.1/portmap/current/sources/portmap.init 2004-07-05 15:51:01 UTC (rev 2915) +++ tinysofa/releases/1.1/portmap/current/sources/portmap.init 2004-07-05 15:53:33 UTC (rev 2916) @@ -50,8 +50,11 @@ $0 start RETVAL=$? ;; + condrestart|try-restart) + [ -f ${INITLOCK:-/mnt/lockdev}/portmap ] && restart || : + ;; *) - echo "Usage: portmap {start|stop|status|restart|reload}" + echo "Usage: portmap {start|stop|status|restart|reload|try-restart}" exit 1 esac Modified: tinysofa/releases/1.1/portmap/current/specs/portmap.spec =================================================================== --- tinysofa/releases/1.1/portmap/current/specs/portmap.spec 2004-07-05 15:51:01 UTC (rev 2915) +++ tinysofa/releases/1.1/portmap/current/specs/portmap.spec 2004-07-05 15:53:33 UTC (rev 2916) @@ -13,7 +13,7 @@ Patch1: portmap-malloc.patch Patch2: portmap-4.0-errno.patch BuildRoot: %{_tmppath}/%{name}-root -PreReq: /sbin/chkconfig /sbin/restart_maybe +%service_requires Requires: tcp_wrappers BuildRequires: tcp_wrappers @@ -36,7 +36,6 @@ make FACILITY=LOG_AUTH ZOMBIES='-DIGNORE_SIGCHLD -Dlint' LIBS="-lnsl" RPM_OPT_FLAGS="$RPM_OPT_FLAGS" %install -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != "/" ] && rm -rf "$RPM_BUILD_ROOT" mkdir -p $RPM_BUILD_ROOT/sbin mkdir -p $RPM_BUILD_ROOT/usr/sbin mkdir -p $RPM_BUILD_ROOT/etc/init.d @@ -57,18 +56,17 @@ install -m 644 $RPM_SOURCE_DIR/portmap.8 $RPM_BUILD_ROOT/usr/share/man/man8 %clean -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT +%clean_buildroot %post -# Restart service after upgrade. -/sbin/chkconfig --add portmap -/sbin/restart_maybe portmap +%service_post portmap %preun -if [ $1 = 0 ] ; then - /sbin/chkconfig --del portmap -fi +%service_preun portmap +%postun +%service_postun portmap + %files %defattr(-,root,root) %doc README CHANGES BLURB @@ -168,4 +166,4 @@ - uses a buildroot and %attr tags * Fri Jul 18 1997 Erik Troan -- built against glibc \ No newline at end of file +- built against glibc From svn at tinysofa.org Mon Jul 5 16:02:37 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 6 Jul 2004 02:02:37 +1000 (EST) Subject: [tinysofa-svn] r2917 - in tinysofa/releases/1.1/postfix/current: sources specs Message-ID: <20040705160237.1F9464E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-06 02:02:36 +1000 (Tue, 06 Jul 2004) New Revision: 2917 Modified: tinysofa/releases/1.1/postfix/current/sources/postfix-init tinysofa/releases/1.1/postfix/current/specs/postfix.spec Log: - support try-restart - use service macros Modified: tinysofa/releases/1.1/postfix/current/sources/postfix-init =================================================================== --- tinysofa/releases/1.1/postfix/current/sources/postfix-init 2004-07-05 15:53:33 UTC (rev 2916) +++ tinysofa/releases/1.1/postfix/current/sources/postfix-init 2004-07-05 16:02:36 UTC (rev 2917) @@ -49,8 +49,15 @@ postfix reload RETVAL=$? ;; + condrestart|try-restart) + if [ -f /var/lock/subsys/postfix ]; then + $0 stop + $0 start + RETVAL=$? + fi + ;; *) - echo "Usage: $0 {start|stop|status|restart}" + echo "Usage: $0 {start|stop|status|restart|try-restart}" ;; esac exit $RETVAL Modified: tinysofa/releases/1.1/postfix/current/specs/postfix.spec =================================================================== --- tinysofa/releases/1.1/postfix/current/specs/postfix.spec 2004-07-05 15:53:33 UTC (rev 2916) +++ tinysofa/releases/1.1/postfix/current/specs/postfix.spec 2004-07-05 16:02:36 UTC (rev 2917) @@ -40,7 +40,7 @@ Patch16: postfix-2.0.19-sql-libs.patch URL: http://www.postfix.org BuildRoot: %{_tmppath}/%{name}-root -PreReq: chkconfig tinysofa-utils +%service_requires BuildRequires: openssl-devel >= %{version_ssl} BuildRequires: cyrus-sasl-devel BuildRequires: mysql-devel, postgresql-devel >= 7.4-1tr, openldap-devel @@ -128,9 +128,6 @@ %patch16 -p1 %build -# clean old target dir -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf "$RPM_BUILD_ROOT" - make makefiles \ DEBUG="" \ OPT="-O3" \ @@ -274,98 +271,61 @@ %post -# This is highly unusual in tinysofa. Needed to get mail queues running. -# Also note that the default config file only listens to loopback interface. -chkconfig --add postfix -chkconfig postfix on +%service_post -o postfix /etc/postfix/postfix-dynupdate normal /etc/postfix/post-install upgrade-source /etc/init.d/postfix start >/dev/null 2>&1 || : %preun -if [ $1 = 0 ]; then - /etc/init.d/postfix stop 2>/dev/null || : - chkconfig --del postfix || : -fi +%service_preun postfix %postun +%service_postun postfix #refresh dynamic libraries ldconfig -%pre mysql -/etc/init.d/postfix stop >/dev/null 2>&1 || : - %post mysql /etc/postfix/postfix-dynupdate mysql-post >/dev/null 2>&1 || : -/sbin/restart_maybe postfix >/dev/null 2>&1 || : +/etc/init.d/postfix try-restart >/dev/null 2>&1 || : -%preun mysql -if [ $1 = 0 ]; then - /etc/init.d/postfix stop >/dev/null 2>&1 || : -fi - %postun mysql if [ $1 = 0 ]; then /etc/postfix/postfix-dynupdate mysql-postun >/dev/null 2>&1 || : - /sbin/restart_maybe postfix >/dev/null 2>&1 || : + /etc/init.d/postfix try-restart >/dev/null 2>&1 || : fi -%pre pgsql -/etc/init.d/postfix stop >/dev/null 2>&1 || : - %post pgsql /etc/postfix/postfix-dynupdate pgsql-post >/dev/null 2>&1 || : -/sbin/restart_maybe postfix >/dev/null 2>&1 || : +/etc/init.d/postfix try-restart >/dev/null 2>&1 || : -%preun pgsql -if [ $1 = 0 ]; then - /etc/init.d/postfix stop >/dev/null 2>&1 || : -fi - %postun pgsql if [ $1 = 0 ]; then /etc/postfix/postfix-dynupdate pgsql-postun >/dev/null 2>&1 || : - /sbin/restart_maybe postfix >/dev/null 2>&1 || : + /etc/init.d/postfix try-restart >/dev/null 2>&1 || : fi -%pre ldap -/etc/init.d/postfix stop >/dev/null 2>&1 || : - %post ldap /etc/postfix/postfix-dynupdate ldap-post >/dev/null 2>&1 || : -/sbin/restart_maybe postfix >/dev/null 2>&1 || : +/etc/init.d/postfix try-restart >/dev/null 2>&1 || : -%preun ldap -if [ $1 = 0 ]; then - /etc/init.d/postfix stop >/dev/null 2>&1 || : -fi - %postun ldap if [ $1 = 0 ]; then /etc/postfix/postfix-dynupdate ldap-postun >/dev/null 2>&1 || : - /sbin/restart_maybe postfix >/dev/null 2>&1 || : + /etc/init.d/postfix try-restart >/dev/null 2>&1 || : fi -%pre pcre -/etc/init.d/postfix stop >/dev/null 2>&1 || : - %post pcre /etc/postfix/postfix-dynupdate pcre-post >/dev/null 2>&1 || : -/sbin/restart_maybe postfix >/dev/null 2>&1 || : +/etc/init.d/postfix try-restart >/dev/null 2>&1 || : -%preun pcre -if [ $1 = 0 ]; then - /etc/init.d/postfix stop >/dev/null 2>&1 || : -fi - %postun pcre if [ $1 = 0 ]; then /etc/postfix/postfix-dynupdate pcre-postun >/dev/null 2>&1 || : - /sbin/restart_maybe postfix >/dev/null 2>&1 || : + /etc/init.d/postfix try-restart >/dev/null 2>&1 || : fi %clean -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT +%clean_buildroot %files From svn at tinysofa.org Mon Jul 5 16:42:03 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 6 Jul 2004 02:42:03 +1000 (EST) Subject: [tinysofa-svn] r2918 - tinysofa/releases/1.1/libcap/current/specs Message-ID: <20040705164203.EF9EF4E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-06 02:42:03 +1000 (Tue, 06 Jul 2004) New Revision: 2918 Modified: tinysofa/releases/1.1/libcap/current/specs/libcap.spec Log: - fix include directory permssions Modified: tinysofa/releases/1.1/libcap/current/specs/libcap.spec =================================================================== --- tinysofa/releases/1.1/libcap/current/specs/libcap.spec 2004-07-05 16:02:36 UTC (rev 2917) +++ tinysofa/releases/1.1/libcap/current/specs/libcap.spec 2004-07-05 16:42:03 UTC (rev 2918) @@ -18,7 +18,7 @@ %package devel Summary: Development files for libcap -Group: Development/Libraries +Group: development Requires: %{name} = %{version}-%{release} %description devel @@ -68,7 +68,7 @@ %{_sbindir}/* %files devel -%defattr(644,root,root) +%defattr(644,root,root,755) %{_includedir}/* /%{_lib}/*.so %{_mandir}/man2/* From svn at tinysofa.org Mon Jul 5 17:00:25 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 6 Jul 2004 03:00:25 +1000 (EST) Subject: [tinysofa-svn] r2919 - in tinysofa/releases/1.1/perl/current: sources specs Message-ID: <20040705170025.CBADE4E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-06 03:00:25 +1000 (Tue, 06 Jul 2004) New Revision: 2919 Added: tinysofa/releases/1.1/perl/current/sources/filter-depends.sh Modified: tinysofa/releases/1.1/perl/current/specs/perl.spec Log: - filter some perl dependencies Added: tinysofa/releases/1.1/perl/current/sources/filter-depends.sh =================================================================== --- tinysofa/releases/1.1/perl/current/sources/filter-depends.sh 2004-07-05 16:42:03 UTC (rev 2918) +++ tinysofa/releases/1.1/perl/current/sources/filter-depends.sh 2004-07-05 17:00:25 UTC (rev 2919) @@ -0,0 +1,4 @@ +#!/bin/sh + +/usr/lib/rpm/perl.req $* | grep -v NDBM | grep -v 'perl(v5.6.0)' | grep -v 'perl(Mac::' | grep -v 'perl(Tk' | grep -v 'perl(Tie::RangeHash)' + Property changes on: tinysofa/releases/1.1/perl/current/sources/filter-depends.sh ___________________________________________________________________ Name: svn:executable + * Modified: tinysofa/releases/1.1/perl/current/specs/perl.spec =================================================================== --- tinysofa/releases/1.1/perl/current/specs/perl.spec 2004-07-05 16:42:03 UTC (rev 2918) +++ tinysofa/releases/1.1/perl/current/specs/perl.spec 2004-07-05 17:00:25 UTC (rev 2919) @@ -8,6 +8,10 @@ Source0: ftp://ftp.perl.org/pub/CPAN/src/perl-%{version}.tar.gz Source1: perl-headers-wanted Source2: perl-5.8.0-h2ph-ansi_header.patch +Source3: filter-depends.sh + +%define __perl_requires %{SOURCE3} + Patch1: perl-5.8.0-makemaker-ld_run_path.patch Patch3: perl-5.8.2-root.patch Patch4: perl-5.8.3-desthtml.patch From svn at tinysofa.org Mon Jul 5 17:29:37 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 6 Jul 2004 03:29:37 +1000 (EST) Subject: [tinysofa-svn] r2920 - tinysofa/releases/1.1/finger/current/specs Message-ID: <20040705172937.BAD494E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-06 03:29:37 +1000 (Tue, 06 Jul 2004) New Revision: 2920 Modified: tinysofa/releases/1.1/finger/current/specs/finger.spec Log: - make configure work Modified: tinysofa/releases/1.1/finger/current/specs/finger.spec =================================================================== --- tinysofa/releases/1.1/finger/current/specs/finger.spec 2004-07-05 17:00:25 UTC (rev 2919) +++ tinysofa/releases/1.1/finger/current/specs/finger.spec 2004-07-05 17:29:37 UTC (rev 2920) @@ -54,7 +54,7 @@ %build -%configure --enable-ipv6 +sh configure --enable-ipv6 perl -pi -e ' s,^CC=.*$,CC=cc,; s,-O2,-fPIC \$(RPM_OPT_FLAGS),; From svn at tinysofa.org Mon Jul 5 17:39:50 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 6 Jul 2004 03:39:50 +1000 (EST) Subject: [tinysofa-svn] r2921 - tinysofa/releases/1.1/binutils/current/specs Message-ID: <20040705173950.078A44E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-06 03:39:49 +1000 (Tue, 06 Jul 2004) New Revision: 2921 Modified: tinysofa/releases/1.1/binutils/current/specs/binutils.spec Log: - remove infodir from filelist Modified: tinysofa/releases/1.1/binutils/current/specs/binutils.spec =================================================================== --- tinysofa/releases/1.1/binutils/current/specs/binutils.spec 2004-07-05 17:29:37 UTC (rev 2920) +++ tinysofa/releases/1.1/binutils/current/specs/binutils.spec 2004-07-05 17:39:49 UTC (rev 2921) @@ -151,7 +151,6 @@ %{_mandir}/man1/* %{_prefix}/include/* %{_prefix}/%{_lib}/lib* -%{_infodir}/*info* %changelog From svn at tinysofa.org Mon Jul 5 17:46:00 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 6 Jul 2004 03:46:00 +1000 (EST) Subject: [tinysofa-svn] r2922 - tinysofa/releases/1.1/dmapi/current/specs Message-ID: <20040705174600.7F9B24E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-06 03:46:00 +1000 (Tue, 06 Jul 2004) New Revision: 2922 Modified: tinysofa/releases/1.1/dmapi/current/specs/dmapi.spec Log: - fix user build problem Modified: tinysofa/releases/1.1/dmapi/current/specs/dmapi.spec =================================================================== --- tinysofa/releases/1.1/dmapi/current/specs/dmapi.spec 2004-07-05 17:39:49 UTC (rev 2921) +++ tinysofa/releases/1.1/dmapi/current/specs/dmapi.spec 2004-07-05 17:46:00 UTC (rev 2922) @@ -51,8 +51,8 @@ /usr/bin/make install-dev DIST_MANIFEST="$DIST_INSTALL_DEV" /usr/bin/make -C build/rpm rpmfiles-dev DIST_MANIFEST="$DIST_INSTALL_DEV" -chmod +x ${RPM_BUILD_ROOT}/%{_lib}/lib*.so* -chmod +x ${RPM_BUILD_ROOT}/%{_libdir}/lib*.so* +chmod +x ${RPM_BUILD_ROOT}/%{_lib}/lib*.so.* +chmod +x ${RPM_BUILD_ROOT}/%{_libdir}/lib*.so.* chmod +x ${RPM_BUILD_ROOT}/%{_libdir}/lib*.la files() From svn at tinysofa.org Mon Jul 5 17:51:15 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 6 Jul 2004 03:51:15 +1000 (EST) Subject: [tinysofa-svn] r2923 - tinysofa/releases/1.1 Message-ID: <20040705175115.9DEA64E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-06 03:51:15 +1000 (Tue, 06 Jul 2004) New Revision: 2923 Removed: tinysofa/releases/1.1/dosfstools/ Log: - remove dosfstools From svn at tinysofa.org Mon Jul 5 17:56:48 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 6 Jul 2004 03:56:48 +1000 (EST) Subject: [tinysofa-svn] r2924 - tinysofa/releases/1.1/tinysofa-utils/current/specs Message-ID: <20040705175648.EA5F04E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-06 03:56:48 +1000 (Tue, 06 Jul 2004) New Revision: 2924 Modified: tinysofa/releases/1.1/tinysofa-utils/current/specs/tinysofa-utils.spec Log: - fix group Modified: tinysofa/releases/1.1/tinysofa-utils/current/specs/tinysofa-utils.spec =================================================================== --- tinysofa/releases/1.1/tinysofa-utils/current/specs/tinysofa-utils.spec 2004-07-05 17:51:15 UTC (rev 2923) +++ tinysofa/releases/1.1/tinysofa-utils/current/specs/tinysofa-utils.spec 2004-07-05 17:56:48 UTC (rev 2924) @@ -9,7 +9,7 @@ Source4: tsunpack_rpm Source5: tsrelease License: GPL -Group: tinysofa/main +Group: development BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRequires: coreutils Requires: rpm From svn at tinysofa.org Mon Jul 5 17:59:54 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 6 Jul 2004 03:59:54 +1000 (EST) Subject: [tinysofa-svn] r2925 - tinysofa/releases/1.1/file/current/specs Message-ID: <20040705175954.C5F924E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-06 03:59:54 +1000 (Tue, 06 Jul 2004) New Revision: 2925 Modified: tinysofa/releases/1.1/file/current/specs/file.spec Log: - fix -devel Requires Modified: tinysofa/releases/1.1/file/current/specs/file.spec =================================================================== --- tinysofa/releases/1.1/file/current/specs/file.spec 2004-07-05 17:56:48 UTC (rev 2924) +++ tinysofa/releases/1.1/file/current/specs/file.spec 2004-07-05 17:59:54 UTC (rev 2925) @@ -23,7 +23,7 @@ %package devel Summary: Development libraries for interface to the file(1) command Group: development -Requires: %{name}-%{version} +Requires: %{name} = %{version}-%{release} %description devel This package contains the development libraries for interface to the From svn at tinysofa.org Mon Jul 5 18:19:00 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 6 Jul 2004 04:19:00 +1000 (EST) Subject: [tinysofa-svn] r2926 - in tinysofa/releases/1.1/tinysofa-rpm-config/current: sources specs Message-ID: <20040705181900.6A2D74E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-06 04:19:00 +1000 (Tue, 06 Jul 2004) New Revision: 2926 Added: tinysofa/releases/1.1/tinysofa-rpm-config/current/sources/tinysofa-rpm-config-1.1.0.tar.bz2 Removed: tinysofa/releases/1.1/tinysofa-rpm-config/current/sources/tinysofa-rpm-config-8.0.28.tar.bz2 Modified: tinysofa/releases/1.1/tinysofa-rpm-config/current/specs/tinysofa-rpm-config.spec Log: - new version of the config - use sane version number Added: tinysofa/releases/1.1/tinysofa-rpm-config/current/sources/tinysofa-rpm-config-1.1.0.tar.bz2 =================================================================== (Binary files differ) Property changes on: tinysofa/releases/1.1/tinysofa-rpm-config/current/sources/tinysofa-rpm-config-1.1.0.tar.bz2 ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: tinysofa/releases/1.1/tinysofa-rpm-config/current/sources/tinysofa-rpm-config-8.0.28.tar.bz2 =================================================================== (Binary files differ) Modified: tinysofa/releases/1.1/tinysofa-rpm-config/current/specs/tinysofa-rpm-config.spec =================================================================== --- tinysofa/releases/1.1/tinysofa-rpm-config/current/specs/tinysofa-rpm-config.spec 2004-07-05 17:59:54 UTC (rev 2925) +++ tinysofa/releases/1.1/tinysofa-rpm-config/current/specs/tinysofa-rpm-config.spec 2004-07-05 18:19:00 UTC (rev 2926) @@ -1,6 +1,6 @@ Summary: tinysofa specific rpm configuration files. Name: tinysofa-rpm-config -Version: 8.0.28 +Version: 1.1.0 Release: 1jh License: GPL Group: development From svn at tinysofa.org Mon Jul 5 18:28:53 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 6 Jul 2004 04:28:53 +1000 (EST) Subject: [tinysofa-svn] r2927 - tinysofa/releases/1.1/ghostscript/current/specs Message-ID: <20040705182853.2193B4E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-06 04:28:52 +1000 (Tue, 06 Jul 2004) New Revision: 2927 Modified: tinysofa/releases/1.1/ghostscript/current/specs/ghostscript.spec Log: - work around autogenerated requirements Modified: tinysofa/releases/1.1/ghostscript/current/specs/ghostscript.spec =================================================================== --- tinysofa/releases/1.1/ghostscript/current/specs/ghostscript.spec 2004-07-05 18:19:00 UTC (rev 2926) +++ tinysofa/releases/1.1/ghostscript/current/specs/ghostscript.spec 2004-07-05 18:28:52 UTC (rev 2927) @@ -14,6 +14,14 @@ Requires: libstdc++ Requires: zlib +# /usr/bin/fixmswrd.pl requires getopts.pl automatic dependency generator +# doesn't handle it well + +%define __perl_requires %{nil} + +Requires: perl + + %package cups Summary: ESP Ghostscript Support for CUPS Group: extra @@ -41,7 +49,6 @@ make %install -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT # Make sure destination directories are there, since Ghostscript doesn't make them... mkdir -m 755 -p $RPM_BUILD_ROOT%{_bindir} mkdir -m 755 -p $RPM_BUILD_ROOT%{_mandir}/man1 @@ -54,7 +61,7 @@ install -m 644 fonts/* $RPM_BUILD_ROOT%{_datadir}/fonts/default/ghostscript/ %clean -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT +%clean_buildroot %files %defattr(-,root,root) From svn at tinysofa.org Mon Jul 5 19:13:32 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 6 Jul 2004 05:13:32 +1000 (EST) Subject: [tinysofa-svn] r2928 - tinysofa/releases/1.1/less/current/specs Message-ID: <20040705191332.E726A4E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-06 05:13:32 +1000 (Tue, 06 Jul 2004) New Revision: 2928 Modified: tinysofa/releases/1.1/less/current/specs/less.spec Log: - fix buildrequires Modified: tinysofa/releases/1.1/less/current/specs/less.spec =================================================================== --- tinysofa/releases/1.1/less/current/specs/less.spec 2004-07-05 18:28:52 UTC (rev 2927) +++ tinysofa/releases/1.1/less/current/specs/less.spec 2004-07-05 19:13:32 UTC (rev 2928) @@ -11,7 +11,7 @@ Patch0: less-382-ncursesw.patch URL: http://www.greenwoodsoftware.com/less/ Buildroot: %{_tmppath}/%{name}-%{version}-root -BuildRequires: ncurses-devel autoconf autoheader +BuildRequires: ncurses-devel autoconf %description The less utility is a text file browser that resembles more, but has From svn at tinysofa.org Mon Jul 5 19:18:57 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 6 Jul 2004 05:18:57 +1000 (EST) Subject: [tinysofa-svn] r2929 - tinysofa/releases/1.1/lftp/current/specs Message-ID: <20040705191857.0F69F4E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-06 05:18:56 +1000 (Tue, 06 Jul 2004) New Revision: 2929 Modified: tinysofa/releases/1.1/lftp/current/specs/lftp.spec Log: - use %find_lang instead of %i18n_pkgs Modified: tinysofa/releases/1.1/lftp/current/specs/lftp.spec =================================================================== --- tinysofa/releases/1.1/lftp/current/specs/lftp.spec 2004-07-05 19:13:32 UTC (rev 2928) +++ tinysofa/releases/1.1/lftp/current/specs/lftp.spec 2004-07-05 19:18:56 UTC (rev 2929) @@ -42,12 +42,12 @@ # Remove files from %{buildroot} that we aren't shipping. rm -f %{buildroot}%{_libdir}/lftp/%{version}/*.a -%i18n_pkgs lftp +%find_lang %{name} %clean %clean_buildroot -%files +%files -f %{name}.lang %defattr(-,root,root,-) %doc BUGS COPYING ChangeLog FAQ FEATURES README* NEWS THANKS TODO %config %{_sysconfdir}/lftp.conf From svn at tinysofa.org Mon Jul 5 19:21:24 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 6 Jul 2004 05:21:24 +1000 (EST) Subject: [tinysofa-svn] r2930 - tinysofa/releases/1.1/kudzu/current/specs Message-ID: <20040705192124.4DA964E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-06 05:21:24 +1000 (Tue, 06 Jul 2004) New Revision: 2930 Modified: tinysofa/releases/1.1/kudzu/current/specs/kudzu.spec Log: - fix init script installation Modified: tinysofa/releases/1.1/kudzu/current/specs/kudzu.spec =================================================================== --- tinysofa/releases/1.1/kudzu/current/specs/kudzu.spec 2004-07-05 19:18:56 UTC (rev 2929) +++ tinysofa/releases/1.1/kudzu/current/specs/kudzu.spec 2004-07-05 19:21:24 UTC (rev 2930) @@ -42,11 +42,10 @@ make RPM_OPT_FLAGS="$RPM_OPT_FLAGS %{?no_stack_protector}" all kudzu %install -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT make install install-program DESTDIR=$RPM_BUILD_ROOT python -c 'from compileall import *; compile_dir("'$RPM_BUILD_ROOT'/usr/lib/python2.3",10,"/usr/lib/python2.3")' -install -m 755 %{SOURCE2} $RPM_BUILD_ROOT/%{_initrddir} +install -m 755 %{SOURCE2} $RPM_BUILD_ROOT/%{_initrddir}/kudzu %find_lang %{name} From svn at tinysofa.org Mon Jul 5 19:41:06 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 6 Jul 2004 05:41:06 +1000 (EST) Subject: [tinysofa-svn] r2931 - tinysofa/releases/1.1/hdparm/current/specs Message-ID: <20040705194106.7C79D4E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-06 05:41:06 +1000 (Tue, 06 Jul 2004) New Revision: 2931 Modified: tinysofa/releases/1.1/hdparm/current/specs/hdparm.spec Log: - add hdparm-5.5-renamevar.patch Modified: tinysofa/releases/1.1/hdparm/current/specs/hdparm.spec =================================================================== --- tinysofa/releases/1.1/hdparm/current/specs/hdparm.spec 2004-07-05 19:21:24 UTC (rev 2930) +++ tinysofa/releases/1.1/hdparm/current/specs/hdparm.spec 2004-07-05 19:41:06 UTC (rev 2931) @@ -1,12 +1,13 @@ Summary: A utility for displaying and/or setting hard disk parameters. Name: hdparm Version: 5.5 -Release: 1ts +Release: 2jh License: BSD Group: main Source: http://www.ibiblio.org/pub/Linux/system/hardware/hdparm-%{version}.tar.gz Source1: hdparm.sysconfig Source2: hdparm.init +Patch: hdparm-5.5-renamevar.patch BuildRoot: %{_tmppath}/%{name}-root ExcludeArch: s390 s390x PreReq: chkconfig @@ -18,6 +19,7 @@ %prep %setup -q +%patch -p1 %build perl -pi -e "s,-O2,$RPM_OPT_FLAGS,g" Makefile @@ -35,7 +37,7 @@ install -m 755 %SOURCE2 $RPM_BUILD_ROOT%{_initrddir}/hdparm %clean -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT +%clean_buildroot %post chkconfig --add hdparm @@ -102,4 +104,4 @@ - v4.9 fixed compile error with 2.5.xx kernels - v4.8 changed -Q to allow specifying queue depth - v4.7 added -z, -Q, -M flags; expanded parm range for -p -[ Rest of Red Hat changelog stripped for readability. ] \ No newline at end of file +[ Rest of Red Hat changelog stripped for readability. ] From svn at tinysofa.org Mon Jul 5 19:41:17 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 6 Jul 2004 05:41:17 +1000 (EST) Subject: [tinysofa-svn] r2932 - tinysofa/releases/1.1/hdparm/current/sources Message-ID: <20040705194117.EC0BD4E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-06 05:41:17 +1000 (Tue, 06 Jul 2004) New Revision: 2932 Added: tinysofa/releases/1.1/hdparm/current/sources/hdparm-5.5-renamevar.patch Log: - add hdparm-5.5-renamevar.patch Added: tinysofa/releases/1.1/hdparm/current/sources/hdparm-5.5-renamevar.patch =================================================================== --- tinysofa/releases/1.1/hdparm/current/sources/hdparm-5.5-renamevar.patch 2004-07-05 19:41:06 UTC (rev 2931) +++ tinysofa/releases/1.1/hdparm/current/sources/hdparm-5.5-renamevar.patch 2004-07-05 19:41:17 UTC (rev 2932) @@ -0,0 +1,31 @@ +--- hdparm-5.4/hdparm.c.var 2004-02-19 10:30:54.466718170 +0100 ++++ hdparm-5.4/hdparm.c 2004-02-19 10:25:15.036986627 +0100 +@@ -52,7 +52,7 @@ + static int flagcount = 0, do_flush = 0, is_scsi_hd = 0, is_xt_hd = 0; + static int do_ctimings, do_timings = 0; + +-static unsigned long set_readahead= 0, get_readahead= 0, readahead= 0; ++static unsigned long set_readahead= 0, get_readahead= 0, hdreadahead= 0; + static unsigned long set_readonly = 0, get_readonly = 0, readonly = 0; + static unsigned long set_unmask = 0, get_unmask = 0, unmask = 0; + static unsigned long set_mult = 0, get_mult = 0, mult = 0; +@@ -785,8 +785,8 @@ + + if (set_readahead) { + if (get_readahead) +- printf(" setting fs readahead to %ld\n", readahead); +- if (ioctl(fd, BLKRASET, readahead)) ++ printf(" setting fs readahead to %ld\n", hdreadahead); ++ if (ioctl(fd, BLKRASET, hdreadahead)) + perror(" BLKRASET failed"); + } + #ifdef HDIO_UNREGISTER_HWIF +@@ -1830,7 +1830,7 @@ + case 'a': + get_readahead = noisy; + noisy = 1; +- GET_NUMBER(set_readahead,readahead); ++ GET_NUMBER(set_readahead,hdreadahead); + break; + case 'B': + get_apmmode = noisy; From svn at tinysofa.org Mon Jul 5 20:17:42 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 6 Jul 2004 06:17:42 +1000 (EST) Subject: [tinysofa-svn] r2933 - in tinysofa/releases/1.1/busybox/current: sources specs Message-ID: <20040705201742.2DC484E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-06 06:17:41 +1000 (Tue, 06 Jul 2004) New Revision: 2933 Added: tinysofa/releases/1.1/busybox/current/sources/busybox-hdparm.patch Modified: tinysofa/releases/1.1/busybox/current/specs/busybox.spec Log: - add busybox-hdparm.patch to make it compile on 1.1 Added: tinysofa/releases/1.1/busybox/current/sources/busybox-hdparm.patch =================================================================== --- tinysofa/releases/1.1/busybox/current/sources/busybox-hdparm.patch 2004-07-05 19:41:17 UTC (rev 2932) +++ tinysofa/releases/1.1/busybox/current/sources/busybox-hdparm.patch 2004-07-05 20:17:41 UTC (rev 2933) @@ -0,0 +1,40 @@ +--- busybox-1.00-pre10/miscutils/hdparm.c.orig 2004-04-05 16:08:08.000000000 +0300 ++++ busybox-1.00-pre10/miscutils/hdparm.c 2004-07-05 22:51:25.000000000 +0300 +@@ -1226,7 +1226,7 @@ + static int flagcount = 0, do_flush = 0, is_scsi_hd = 0, is_xt_hd = 0; + static int do_ctimings, do_timings = 0; + +-static unsigned long set_readahead= 0, get_readahead= 0, readahead= 0; ++static unsigned long set_readahead= 0, get_readahead= 0, hdreadahead= 0; + static unsigned long set_readonly = 0, get_readonly = 0, readonly = 0; + static unsigned long set_unmask = 0, get_unmask = 0, unmask = 0; + static unsigned long set_mult = 0, get_mult = 0, mult = 0; +@@ -1936,8 +1936,8 @@ + + if (set_readahead) + { +- if_printf(get_readahead," setting fs readahead to %ld\n", readahead); +- bb_ioctl(fd, BLKRASET,(int *)readahead,"BLKRASET"); ++ if_printf(get_readahead," setting fs readahead to %ld\n", hdreadahead); ++ bb_ioctl(fd, BLKRASET,(int *)hdreadahead,"BLKRASET"); + } + #ifdef CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF + if (unregister_hwif) +@@ -2310,7 +2310,7 @@ + if ((verbose && !is_scsi_hd) || get_readahead) + { + bb_ioctl_on_off (fd, BLKRAGET, (unsigned long *) parm, +- " BLKRAGET"," readahead = %2ld"); ++ " BLKRAGET"," hdreadahead = %2ld"); + } + if (verbose || get_geom) + { +@@ -2829,7 +2829,7 @@ + noisy = 1; + if (!*p && argc && isalnum(**argv)) + p = *argv++, --argc; +- p=GET_NUMBER(p,&set_readahead,&readahead); ++ p=GET_NUMBER(p,&set_readahead,&hdreadahead); + break; + case 'B': + get_apmmode = noisy; Modified: tinysofa/releases/1.1/busybox/current/specs/busybox.spec =================================================================== --- tinysofa/releases/1.1/busybox/current/specs/busybox.spec 2004-07-05 19:41:17 UTC (rev 2932) +++ tinysofa/releases/1.1/busybox/current/specs/busybox.spec 2004-07-05 20:17:41 UTC (rev 2933) @@ -1,13 +1,14 @@ Summary: Statically linked binary providing simplified versions of system commands Name: busybox Version: 1.00.pre10 -Release: 1ts +Release: 2jh License: GPL Group: extra Source: http://www.busybox.net/downloads/%{name}-%{version}.tar.bz2 Source1: busybox-1.00.config Patch: busybox-static.patch Patch1: busybox-anaconda.patch +Patch2: busybox-hdparm.patch URL: http://www.busybox.net/ BuildRoot: %{_tmppath}/%{name}-root @@ -30,6 +31,7 @@ %prep %setup -q -n %{name}-1.00-pre10 +%patch2 -p1 %build cp %{SOURCE1} .config @@ -45,7 +47,6 @@ make %install -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT mkdir -p -m 755 $RPM_BUILD_ROOT/sbin mkdir -p -m 755 $RPM_BUILD_ROOT/%{_mandir}/man1 install -s -m 755 busybox-static $RPM_BUILD_ROOT/sbin/busybox From svn at tinysofa.org Mon Jul 5 21:00:25 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 6 Jul 2004 07:00:25 +1000 (EST) Subject: [tinysofa-svn] r2936 - in tinysofa/releases/1.1/quota/current: sources specs Message-ID: <20040705210025.247444E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-06 07:00:24 +1000 (Tue, 06 Jul 2004) New Revision: 2936 Added: tinysofa/releases/1.1/quota/current/sources/quota-3.06-man-page.patch tinysofa/releases/1.1/quota/current/sources/quota-3.06-no-stripping.patch tinysofa/releases/1.1/quota/current/sources/quota-3.06-pie.patch tinysofa/releases/1.1/quota/current/sources/quota-3.06-warnquota.patch tinysofa/releases/1.1/quota/current/sources/quota-3.09-root_sbindir.patch Modified: tinysofa/releases/1.1/quota/current/specs/quota.spec Log: - backported new quota package Added: tinysofa/releases/1.1/quota/current/sources/quota-3.06-man-page.patch =================================================================== --- tinysofa/releases/1.1/quota/current/sources/quota-3.06-man-page.patch 2004-07-05 20:46:44 UTC (rev 2935) +++ tinysofa/releases/1.1/quota/current/sources/quota-3.06-man-page.patch 2004-07-05 21:00:24 UTC (rev 2936) @@ -0,0 +1,38 @@ +--- quota-tools/quotaon.8.orig Wed Aug 7 15:14:52 2002 ++++ quota-tools/quotaon.8 Wed Aug 7 15:15:40 2002 +@@ -3,7 +3,7 @@ + .SH NAME + quotaon, quotaoff \- turn filesystem quotas on and off + .SH SYNOPSIS +-.B /usr/sbin/quotaon ++.B /sbin/quotaon + [ + .B \-vugfp + ] [ +@@ -12,7 +12,7 @@ + ] + .IR filesystem .\|.\|. + .br +-.B /usr/sbin/quotaon ++.B /sbin/quotaon + [ + .B \-avugfp + ] [ +@@ -20,7 +20,7 @@ + .I format-name + ] + .LP +-.B /usr/sbin/quotaoff ++.B /sbin/quotaoff + [ + .B \-vugp + ] +@@ -30,7 +30,7 @@ + ] + .IR filesystem .\|.\|. + .br +-.B /usr/sbin/quotaoff ++.B /sbin/quotaoff + [ + .B \-avugp + ] Added: tinysofa/releases/1.1/quota/current/sources/quota-3.06-no-stripping.patch =================================================================== --- tinysofa/releases/1.1/quota/current/sources/quota-3.06-no-stripping.patch 2004-07-05 20:46:44 UTC (rev 2935) +++ tinysofa/releases/1.1/quota/current/sources/quota-3.06-no-stripping.patch 2004-07-05 21:00:24 UTC (rev 2936) @@ -0,0 +1,13 @@ +--- quota-tools/Makefile.in.orig 2002-07-17 17:07:14.000000000 -0400 ++++ quota-tools/Makefile.in 2002-07-17 18:08:39.000000000 -0400 +@@ -90,8 +90,8 @@ + -mkdir -p $(ROOTDIR)$(mandir)/man8 + -$(INSTALL) -m 755 -d $(ROOTDIR)$(includedir)/rpcsvc + -$(INSTALL) -m 644 rquota.h rquota.x $(ROOTDIR)$(includedir)/rpcsvc +- -$(INSTALL) -s -m $(DEF_SBIN_MODE) quota $(ROOTDIR)$(bindir) +- -$(INSTALL) -s -m $(DEF_SBIN_MODE) rpc.rquotad $(ROOTDIR)$(sbindir) ++ -$(INSTALL) -m $(DEF_SBIN_MODE) quota $(ROOTDIR)$(bindir) ++ -$(INSTALL) -m $(DEF_SBIN_MODE) rpc.rquotad $(ROOTDIR)$(sbindir) + -$(INSTALL) -m $(DEF_MAN_MODE) *.1 $(ROOTDIR)$(mandir)/man1 + -$(INSTALL) -m $(DEF_MAN_MODE) *.2 $(ROOTDIR)$(mandir)/man2 + -$(INSTALL) -m $(DEF_MAN_MODE) *.3 $(ROOTDIR)$(mandir)/man3 Added: tinysofa/releases/1.1/quota/current/sources/quota-3.06-pie.patch =================================================================== --- tinysofa/releases/1.1/quota/current/sources/quota-3.06-pie.patch 2004-07-05 20:46:44 UTC (rev 2935) +++ tinysofa/releases/1.1/quota/current/sources/quota-3.06-pie.patch 2004-07-05 21:00:24 UTC (rev 2936) @@ -0,0 +1,35 @@ +--- quota-tools/Makefile.in.lr 2004-01-27 15:20:18.000000000 +0100 ++++ quota-tools/Makefile.in 2004-01-27 15:21:48.000000000 +0100 +@@ -49,6 +49,10 @@ + + all: $(PROGS) + ++ ++svc_socket.o rquota_server.o rquota_svc.o $(filter-out rquota_xdr.o,$(LIBOBJS)): %.o: %.c ++ $(CC) $(CFLAGS) -fpie -c $< ++ + clean: + -rm -f core *.o .*.d + +@@ -125,10 +129,10 @@ + convertquota: convertquota.o $(LIBOBJS) + + rpc.rquotad: rquota_server.o rquota_svc.o svc_socket.o $(LIBOBJS) +- $(CC) $(LDFLAGS) -o $@ $^ $(LIBS) ++ $(CC) $(LDFLAGS) -pie -o $@ $^ $(LIBS) ++ @if readelf -d $@|fgrep -q TEXTREL; then echo "*** Text relocation"; false; else true; fi + + pot.o: pot.c pot.h +- $(CC) $(CFLAGS) -c $< + + rquota.h: rquota.x + $(RPCGEN) -h -o $@ $< +@@ -137,7 +141,7 @@ + $(RPCGEN) -c -o $@ $< + + rquota_xdr.o: rquota_xdr.c rquota.h +- $(CC) $(CFLAGS) -Wno-unused -c $< ++ $(CC) $(CFLAGS) -Wno-unused -fpie -c $< + + rquota_clnt.c: rquota.x + $(RPCGEN) -l -o $@ $< Added: tinysofa/releases/1.1/quota/current/sources/quota-3.06-warnquota.patch =================================================================== --- tinysofa/releases/1.1/quota/current/sources/quota-3.06-warnquota.patch 2004-07-05 20:46:44 UTC (rev 2935) +++ tinysofa/releases/1.1/quota/current/sources/quota-3.06-warnquota.patch 2004-07-05 21:00:24 UTC (rev 2936) @@ -0,0 +1,36 @@ +--- quota-tools/warnquota.conf.orig Sat Aug 16 00:54:17 2003 ++++ quota-tools/warnquota.conf Sat Aug 16 01:00:02 2003 +@@ -4,21 +4,25 @@ + # and even blank lines + + # values can be quoted: +-MAIL_CMD = "/usr/my/sendmail/instead/sendmail -t" +-FROM = "bas at localhost" ++MAIL_CMD = "/usr/sbin/sendmail -t" ++FROM = + # but they don't have to be: +-SUBJECT = Hey, user, clean up your account! +-CC_TO = "sysadm at localhost" +-SUPPORT = "support at myhost.com" ++# ++SUBJECT = NOTE: You are exceeding your allocatted disk space limits ++CC_TO = "root at localhost" ++SUPPORT = "root at myhost.com" + PHONE = "(123) 456-1111 or (222) 333-4444" + # Text in the beginning of the mail (if not specified, default text is used) + # This way text can be split to more lines + # Line breaks are done by '|' character +-MESSAGE = Hello, I've noticed you use too much space\ +- on my disk|Delete your files on following filesystems:| ++# ++MESSAGE = Your disk usage has exceeded the agreeded limits\ ++ on this server|Please delete any unnecessary files on following filesystems:| ++ + # Text in the end of the mail (if not specified, default text using SUPPORT and PHONE + # is created) +-SIGNATURE = See you!| Your admin| ++SIGNATURE = root at localhost ++ + # Following text is used for mails about group exceeding quotas + # It should contain string %s exactly once - it will be substituted for a group name + GROUP_MESSAGE = Hello, a group '%s' you're member of use too much space.|\ Added: tinysofa/releases/1.1/quota/current/sources/quota-3.09-root_sbindir.patch =================================================================== --- tinysofa/releases/1.1/quota/current/sources/quota-3.09-root_sbindir.patch 2004-07-05 20:46:44 UTC (rev 2935) +++ tinysofa/releases/1.1/quota/current/sources/quota-3.09-root_sbindir.patch 2004-07-05 21:00:24 UTC (rev 2936) @@ -0,0 +1,21 @@ +--- quota-tools/Makefile.in.orig Tue Apr 8 09:04:25 2003 ++++ quota-tools/Makefile.in Sat Aug 16 01:53:05 2003 +@@ -30,6 +30,7 @@ + sbindir = $(prefix)/sbin + mandir = @mandir@ + includedir = $(prefix)/include ++root_sbindir = /sbin + locale_dir = $(prefix)/share/locale + sysconfdir = @sysconfdir@ + +@@ -78,8 +79,8 @@ + -mkdir -p $(ROOTDIR)$(sbindir) + -mkdir -p $(ROOTDIR)$(bindir) + -$(INSTALL) -m $(DEF_SBIN_MODE) \ +- quotacheck quotaon convertquota $(ROOTDIR)$(sbindir) +- $(LN) quotaon $(ROOTDIR)$(sbindir)/quotaoff ++ quotacheck quotaon convertquota $(ROOTDIR)$(root_sbindir) ++ $(LN) quotaon $(ROOTDIR)$(root_sbindir)/quotaoff + -$(INSTALL) -m $(DEF_SBIN_MODE) \ + edquota repquota warnquota quotastats setquota quot xqmstats \ + $(ROOTDIR)$(sbindir) Modified: tinysofa/releases/1.1/quota/current/specs/quota.spec =================================================================== --- tinysofa/releases/1.1/quota/current/specs/quota.spec 2004-07-05 20:46:44 UTC (rev 2935) +++ tinysofa/releases/1.1/quota/current/specs/quota.spec 2004-07-05 21:00:24 UTC (rev 2936) @@ -1,95 +1,218 @@ Name: quota Summary: System administration tools for monitoring users' disk usage. +Epoch: 1 Version: 3.10 -Release: 5ts -Source0: http://umn.dl.sourceforge.net/sourceforge/linuxquota/quota-%{version}.tar.gz +Release: 6jh License: BSD Group: main -BuildRoot: %{_tmppath}/%{name}-root -BuildRequires: e2fsprogs-devel gettext +BuildRoot: %{_tmppath}/%{name}-%{version}-root +Requires: kernel >= 2.4 initscripts >= 6.38 +BuildPreReq: e2fsprogs-devel gettext tcp_wrappers +Source0: http://prdownloads.sourceforge.net/linuxquota/quota-%{version}.tar.gz +Patch0: quota-3.06-warnquota.patch +Patch1: quota-3.06-no-stripping.patch +Patch2: quota-3.06-man-page.patch +Patch3: quota-3.09-root_sbindir.patch +Patch4: quota-3.06-pie.patch + %description The quota package contains system administration tools for monitoring -and limiting users' and or groups' disk usage, per filesystem. +and limiting user and or group disk usage per filesystem. -Install quota if you want to monitor and/or limit user/group disk -usage. %prep -%setup -q -n %{name}-tools +%setup -q -n quota-tools +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 +%ifnarch ppc ppc64 +%patch4 -p1 +%endif + %build -%configure -make +%configure \ + --with-ext2direct=no +%make + %install -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != "/" ] && rm -rf "$RPM_BUILD_ROOT" -mkdir -p $RPM_BUILD_ROOT/{etc,sbin} -mkdir -p $RPM_BUILD_ROOT%{_initrddir} -make ROOTDIR=$RPM_BUILD_ROOT install +mkdir -p %{buildroot}/sbin +mkdir -p %{buildroot}%{_sysconfdir} +mkdir -p %{buildroot}%{_sbindir} +mkdir -p %{buildroot}%{_bindir} +mkdir -p %{buildroot}%{_mandir}/{man1,man2,man3,man8} +make install ROOTDIR=%{buildroot} +install -m 644 warnquota.conf %{buildroot}%{_sysconfdir} -# Some binaries have to be available before /usr is mounted -for i in convertquota quotacheck quotaoff quotaon; do - mv $RPM_BUILD_ROOT/usr/sbin/$i $RPM_BUILD_ROOT/sbin/ -done +%find_lang %{name} -# This one is provided by nfs-utils -rm -f $RPM_BUILD_ROOT/usr/sbin/rpc.rquotad -rm -f $RPM_BUILD_ROOT%{_mandir}/*/*rquotad* -%find_lang %{name} - %clean -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT +%clean_buildroot + %files -f %{name}.lang %defattr(-,root,root) -%doc doc/quotas.preformated -/etc/*quota* -/usr/bin/* -/usr/sbin/* -/sbin/* -%{_mandir}/*/* +%config(noreplace) %{_sysconfdir}/warnquota.conf +%attr(0644,root,root) %{_sysconfdir}/* +%attr(0755,root,root) /sbin/* +%attr(0755,root,root) %{_bindir}/* +%attr(0755,root,root) %{_sbindir}/* +%{_includedir}/rpcsvc/* +%attr(0644,root,root) %{_mandir}/man1/* +%attr(0644,root,root) %{_mandir}/man2/* +%attr(0644,root,root) %{_mandir}/man3/* +%attr(0644,root,root) %{_mandir}/man8/* -%exclude /usr/include/rpcsvc %changelog -* Wed May 19 2004 tsintegrate 3.10-5ts -- current (3.10-4ts) integrated as 3.10-5ts for release 1.0-U1 +* Tue Jun 15 2004 Elliot Lee +- rebuilt -* Wed May 12 2004 Omar Kilani 3.10-4ts -- Add BuildRequires gettext +* Fri Feb 13 2004 Elliot Lee +- rebuilt -* Tue Dec 9 2003 Chr. Toldnes 3.10-1tr -- New upstream version: 3.10 +* Tue Jan 27 2004 Florian La Roche +- add -pie support +- update to 3.10 -* Wed Jun 18 2003 Erlend Midttun 3.08-4tr -- Big rebuild +* Sat Aug 16 2003 Steve Dickson +- upgraded to 3.0.9 +- added quota-3.09-root_sbindir.patch -* Tue Jun 3 2003 Tore Olsen 3.08-3to -- Moved some binaries to /sbin, needed before /usr is mounted. -- Removed init script, it's all done by rc.sysinit. +* Sun Aug 10 2003 Elliot Lee 3.06-11 +- Rebuild -* Fri May 16 2003 Erlend Midttun 3.08-2em -- Fixed awk part of init script. +* Wed Jun 04 2003 Elliot Lee +- rebuilt -* Wed Mar 26 2003 Erlend Midttun 3.08-1em -- New upstream +* Tue May 27 2003 Steve Dickson +- rebuilt for 7.3 errata -* Mon Mar 24 2003 Erlend Midttun 2.00release-3em -- Rebuilt against glibc 2.3.2. +* Tue Feb 25 2003 Elliot Lee +- rebuilt -* Wed Jul 24 2002 Daniel Meyer 2.00release-2dm -- rebuild for Trustix Secure Linux 2.0 +* Sun Feb 23 2003 Tim Powers +- add buildprereq on tcp_wrappers -* Tue Jun 12 2001 Oystein Viggen -- New upstream version: 2.00 +* Wed Jan 22 2003 Tim Powers +- rebuilt -* Sun Jul 16 2000 Per Ivar Paulsen -- Initial release for the Trustix Secure Linux distribution. -- Moved man and info pages to /usr/share adhering to FHS -- Upgrade to 2.0pre4 +* Mon Nov 18 2002 Tim Powers +- rebuild on all arches + +* Fri Sep 6 2002 Philip Copeland 3.06-5 +- added --with-ext2direct=no to fix #73244 + without this users with UID's > 65535 will not + be able to exist on a quota enabled FS + +* Wed Aug 7 2002 Philip Copeland 3.06-4 +- Man page change. #60108 + +* Tue Aug 6 2002 Philip Copeland 3.06-3 +- Bah, I'd dropped epoch from the spec file but seems + we need this if you want to upgrade as the epoch + number has precedence over the version/release + numbers. + +* Wed Jul 17 2002 Philip Copeland 3.06-2 +- Lets stop the makefile from stripping the + binaries as thats rpms job (apparently) + +* Mon Jul 01 2002 Philip Copeland 3.06-1 +- Ditched the 3.01-pre9 src base for 3.06 + Rebuilt without any patchs + +============================================================ + +* Fri Jun 21 2002 Tim Powers +- automated rebuild + +* Thu May 23 2002 Tim Powers +- automated rebuild + +* Mon Feb 25 2002 Elliot Lee +- IfArch the badkernelinclude patch for ppc-only. +- Update to 3.03 + +* Wed Dec 12 2001 Guy Streeter +- Make #include of kernel header file work on non-x86 + +* Wed Sep 5 2001 Preston Brown +- require new initscripts + +* Thu Aug 30 2001 Preston Brown +- fixed bug #52075 (problem with ext2 labels) +- backup data files off by default in quotacheck, optional backup flag added +- fix bug where giving a bad directory or device would cause + quotaon/quotacheck to simulate "-a" behaviour +- if a device name (i.e /dev/hda1) is passed, look up the corresponding mount + point + +* Wed Aug 29 2001 Preston Brown +- return an error code in more cases in convertquota + +* Tue Aug 28 2001 Preston Brown +- 3.01pre9 + +* Fri Jul 20 2001 Preston Brown +- more cleanups on 3.01pre8 + +* Mon Jul 2 2001 Preston Brown +- 3.01 version, everything has changed again. :( + +* Sun Jun 24 2001 Elliot Lee +- Bump release + rebuild. + +* Fri Mar 30 2001 Preston Brown +- use rpc.rquotad from here again (#33738) + +* Thu Mar 15 2001 Preston Brown +- enable ALT_FORMAT for edquota + +* Tue Mar 13 2001 Preston Brown +- I broke passing devices on the cmd line. Fixed. + +* Fri Mar 09 2001 Preston Brown +- quota 3.00 is required by recent kernel 2.4 changes +- no warnquota included this time, not yet ported +- quite a bit of work on quotacheck to make is backwards compatible +- we will likely go back to "quota 2.00" as these projects merge... + +* Fri Feb 09 2001 Florian La Roche +- use "rm -f" instead of only "rm" + +* Wed Feb 7 2001 Preston Brown +- fix quotacheck man page for -a option (#26380) + +* Thu Feb 1 2001 Preston Brown +- 2.00 final, rolls in pretty much all our patches. :) +- fix reporting of in use dquot entries from quotastats +- change repquota man page to fix documentation of -v (#10330) +- include warnquota.conf + +* Mon Nov 20 2000 Bill Nottingham +- fix ia64 build + +* Mon Aug 21 2000 Jeff Johnson +- add LABEL=foo support (#16390). + +* Thu Jul 27 2000 Jeff Johnson +- remote NFS quotas with different blocksize converted incorrectly (#11932). + +* Wed Jul 12 2000 Prospector +- automatic rebuild + +* Thu Jun 15 2000 Jeff Johnson +- FHS packaging. + +* Wed May 10 2000 Jeff Johnson +- apply patch5 (H.J. Lu) + * Wed Feb 02 2000 Cristian Gafton - fix description - man pages are compressed @@ -138,4 +261,4 @@ - built against glibc * Tue Mar 25 1997 Erik Troan -- Moved /usr/sbin/quota to /usr/bin/quota \ No newline at end of file +- Moved /usr/sbin/quota to /usr/bin/quota From svn at tinysofa.org Mon Jul 5 21:11:11 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 6 Jul 2004 07:11:11 +1000 (EST) Subject: [tinysofa-svn] r2937 - in tinysofa/releases/1.1/tcp_wrappers/current: sources specs Message-ID: <20040705211111.3A4FA4E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-06 07:11:11 +1000 (Tue, 06 Jul 2004) New Revision: 2937 Added: tinysofa/releases/1.1/tcp_wrappers/current/sources/tcp_wrappers-7.6-strerror.patch Modified: tinysofa/releases/1.1/tcp_wrappers/current/specs/tcp_wrappers.spec Log: - add tcp_wrappers-7.6-strerror.patch to make it link correctly - add pie support Added: tinysofa/releases/1.1/tcp_wrappers/current/sources/tcp_wrappers-7.6-strerror.patch =================================================================== --- tinysofa/releases/1.1/tcp_wrappers/current/sources/tcp_wrappers-7.6-strerror.patch 2004-07-05 21:00:24 UTC (rev 2936) +++ tinysofa/releases/1.1/tcp_wrappers/current/sources/tcp_wrappers-7.6-strerror.patch 2004-07-05 21:11:11 UTC (rev 2937) @@ -0,0 +1,27 @@ +--- tcp-wrappers-7.6/percent_m.c ++++ tcp-wrappers-7.6/percent_m.c +@@ -13,7 +13,7 @@ + #include + + extern int errno; +-#ifndef SYS_ERRLIST_DEFINED ++#if !defined(SYS_ERRLIST_DEFINED) && !defined(HAVE_STRERROR) + extern char *sys_errlist[]; + extern int sys_nerr; + #endif +@@ -29,11 +29,15 @@ + + while (*bp = *cp) + if (*cp == '%' && cp[1] == 'm') { ++#ifdef HAVE_STRERROR ++ strcpy(bp, strerror(errno)); ++#else + if (errno < sys_nerr && errno > 0) { + strcpy(bp, sys_errlist[errno]); + } else { + sprintf(bp, "Unknown error %d", errno); + } ++#endif + bp += strlen(bp); + cp += 2; + } else { Modified: tinysofa/releases/1.1/tcp_wrappers/current/specs/tcp_wrappers.spec =================================================================== --- tinysofa/releases/1.1/tcp_wrappers/current/specs/tcp_wrappers.spec 2004-07-05 21:00:24 UTC (rev 2936) +++ tinysofa/releases/1.1/tcp_wrappers/current/specs/tcp_wrappers.spec 2004-07-05 21:11:11 UTC (rev 2937) @@ -1,13 +1,14 @@ Summary: A security tool which acts as a wrapper for TCP daemons. Name: tcp_wrappers Version: 7.6 -Release: 19ts +Release: 20jh License: Distributable Group: main Source: ftp://ftp.porcupine.org/pub/security/tcp_wrappers_%{version}.tar.gz Patch: tcpw7.2-config.patch Patch1: tcpw7.2-setenv.patch Patch2: tcpw7.6-netgroup.patch +Patch3: tcp_wrappers-7.6-strerror.patch BuildRoot: %{_tmppath}/%{name}-root %description @@ -23,16 +24,16 @@ %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build %ifarch sparc sparc64 RPM_OPT_FLAGS="$RPM_OPT_FLAGS -fPIC" export RPM_OPT_FLAGS %endif -make linux +%make LDFLAGS="-pie" RPM_OPT_FLAGS="$RPM_OPT_FLAGS -fPIC -DPIC -D_REENTRANT -DHAVE_STRERROR" linux %install -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != "/" ] && rm -rf "$RPM_BUILD_ROOT" mkdir -p $RPM_BUILD_ROOT/usr/{include,lib,share/man/man3,share/man/man5,share/man/man8,sbin} cp hosts_access.3 $RPM_BUILD_ROOT/usr/share/man/man3 @@ -53,7 +54,7 @@ strip $RPM_BUILD_ROOT/usr/sbin/try-from %clean -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT +%clean_buildroot %files %defattr(644,root,root,755) From svn at tinysofa.org Mon Jul 5 21:17:46 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 6 Jul 2004 07:17:46 +1000 (EST) Subject: [tinysofa-svn] r2938 - tinysofa/releases/1.1/quota/current/specs Message-ID: <20040705211746.6C7CB4E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-06 07:17:46 +1000 (Tue, 06 Jul 2004) New Revision: 2938 Modified: tinysofa/releases/1.1/quota/current/specs/quota.spec Log: - exclude %{_mandir}/man8/rquotad* - exclude %{_sbindir}/rpc.rquotad Modified: tinysofa/releases/1.1/quota/current/specs/quota.spec =================================================================== --- tinysofa/releases/1.1/quota/current/specs/quota.spec 2004-07-05 21:11:11 UTC (rev 2937) +++ tinysofa/releases/1.1/quota/current/specs/quota.spec 2004-07-05 21:17:46 UTC (rev 2938) @@ -66,6 +66,8 @@ %attr(0644,root,root) %{_mandir}/man2/* %attr(0644,root,root) %{_mandir}/man3/* %attr(0644,root,root) %{_mandir}/man8/* +%exclude %{_mandir}/man8/rquotad* +%exclude %{_sbindir}/rpc.rquotad %changelog From svn at tinysofa.org Mon Jul 5 21:23:30 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 6 Jul 2004 07:23:30 +1000 (EST) Subject: [tinysofa-svn] r2939 - tinysofa/releases/1.1/quota/current/specs Message-ID: <20040705212330.0EACC4E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-06 07:23:29 +1000 (Tue, 06 Jul 2004) New Revision: 2939 Modified: tinysofa/releases/1.1/quota/current/specs/quota.spec Log: - remove epoch Modified: tinysofa/releases/1.1/quota/current/specs/quota.spec =================================================================== --- tinysofa/releases/1.1/quota/current/specs/quota.spec 2004-07-05 21:17:46 UTC (rev 2938) +++ tinysofa/releases/1.1/quota/current/specs/quota.spec 2004-07-05 21:23:29 UTC (rev 2939) @@ -1,6 +1,5 @@ Name: quota Summary: System administration tools for monitoring users' disk usage. -Epoch: 1 Version: 3.10 Release: 6jh License: BSD From svn at tinysofa.org Mon Jul 5 21:27:39 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 6 Jul 2004 07:27:39 +1000 (EST) Subject: [tinysofa-svn] r2940 - tinysofa/releases/1.1/wget/current/specs Message-ID: <20040705212739.9CEC14E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-06 07:27:39 +1000 (Tue, 06 Jul 2004) New Revision: 2940 Modified: tinysofa/releases/1.1/wget/current/specs/wget.spec Log: - fix i18n installation Modified: tinysofa/releases/1.1/wget/current/specs/wget.spec =================================================================== --- tinysofa/releases/1.1/wget/current/specs/wget.spec 2004-07-05 21:23:29 UTC (rev 2939) +++ tinysofa/releases/1.1/wget/current/specs/wget.spec 2004-07-05 21:27:39 UTC (rev 2940) @@ -50,11 +50,12 @@ %install %makeinstall -%i18n_pkgs %{name} - %install_info doc/wget.texi %nuke_info +%find_lang %{name} + + %post %info_post @@ -66,7 +67,7 @@ %clean_buildroot -%files +%files -f %{name}.lang %defattr(-,root,root) %doc AUTHORS MAILING-LIST NEWS README PATCHES README.cvs TODO %config(noreplace) /etc/wgetrc From svn at tinysofa.org Mon Jul 5 21:41:07 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 6 Jul 2004 07:41:07 +1000 (EST) Subject: [tinysofa-svn] r2941 - in tinysofa/releases/1.1/tinysofa-rpm-config/current: sources specs Message-ID: <20040705214107.F338D4E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-06 07:41:07 +1000 (Tue, 06 Jul 2004) New Revision: 2941 Added: tinysofa/releases/1.1/tinysofa-rpm-config/current/sources/tinysofa-rpm-config-1.1.1.tar.bz2 Removed: tinysofa/releases/1.1/tinysofa-rpm-config/current/sources/tinysofa-rpm-config-1.1.0.tar.bz2 Modified: tinysofa/releases/1.1/tinysofa-rpm-config/current/specs/tinysofa-rpm-config.spec Log: - tune perl.req script Deleted: tinysofa/releases/1.1/tinysofa-rpm-config/current/sources/tinysofa-rpm-config-1.1.0.tar.bz2 =================================================================== (Binary files differ) Added: tinysofa/releases/1.1/tinysofa-rpm-config/current/sources/tinysofa-rpm-config-1.1.1.tar.bz2 =================================================================== (Binary files differ) Property changes on: tinysofa/releases/1.1/tinysofa-rpm-config/current/sources/tinysofa-rpm-config-1.1.1.tar.bz2 ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: tinysofa/releases/1.1/tinysofa-rpm-config/current/specs/tinysofa-rpm-config.spec =================================================================== --- tinysofa/releases/1.1/tinysofa-rpm-config/current/specs/tinysofa-rpm-config.spec 2004-07-05 21:27:39 UTC (rev 2940) +++ tinysofa/releases/1.1/tinysofa-rpm-config/current/specs/tinysofa-rpm-config.spec 2004-07-05 21:41:07 UTC (rev 2941) @@ -1,6 +1,6 @@ Summary: tinysofa specific rpm configuration files. Name: tinysofa-rpm-config -Version: 1.1.0 +Version: 1.1.1 Release: 1jh License: GPL Group: development From svn at tinysofa.org Mon Jul 5 21:41:39 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 6 Jul 2004 07:41:39 +1000 (EST) Subject: [tinysofa-svn] r2942 - tinysofa/releases/1.1/perl/current/specs Message-ID: <20040705214139.299AD4E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-06 07:41:38 +1000 (Tue, 06 Jul 2004) New Revision: 2942 Modified: tinysofa/releases/1.1/perl/current/specs/perl.spec Log: - add Epoch: 1 to perl package Modified: tinysofa/releases/1.1/perl/current/specs/perl.spec =================================================================== --- tinysofa/releases/1.1/perl/current/specs/perl.spec 2004-07-05 21:41:07 UTC (rev 2941) +++ tinysofa/releases/1.1/perl/current/specs/perl.spec 2004-07-05 21:41:38 UTC (rev 2942) @@ -1,6 +1,7 @@ Summary: The Perl programming language. Name: perl Version: 5.8.4 +Epoch: 1 Release: 3ts License: GPL Group: main From svn at tinysofa.org Mon Jul 5 21:43:01 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 6 Jul 2004 07:43:01 +1000 (EST) Subject: [tinysofa-svn] r2943 - tinysofa/releases/1.1/perl/current/sources Message-ID: <20040705214301.D1E914E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-06 07:43:01 +1000 (Tue, 06 Jul 2004) New Revision: 2943 Modified: tinysofa/releases/1.1/perl/current/sources/filter-depends.sh Log: - add more modules to filter Modified: tinysofa/releases/1.1/perl/current/sources/filter-depends.sh =================================================================== --- tinysofa/releases/1.1/perl/current/sources/filter-depends.sh 2004-07-05 21:41:38 UTC (rev 2942) +++ tinysofa/releases/1.1/perl/current/sources/filter-depends.sh 2004-07-05 21:43:01 UTC (rev 2943) @@ -1,4 +1,13 @@ #!/bin/sh -/usr/lib/rpm/perl.req $* | grep -v NDBM | grep -v 'perl(v5.6.0)' | grep -v 'perl(Mac::' | grep -v 'perl(Tk' | grep -v 'perl(Tie::RangeHash)' +/usr/lib/rpm/perl.req $* | \ + grep -v NDBM | \ + grep -v 'perl(v5.6.0)' | \ + grep -v 'perl(Mac::' | \ + grep -v 'perl(Tk' | \ + grep -v 'perl(VMS' | \ + grep -v 'perl(FCGI)' | \ + grep -v 'perl(Tie::RangeHash)' | \ + grep -v 'perl(getopts.pl)' | \ + grep -v 'perl(bigint.pl)' From svn at tinysofa.org Mon Jul 5 21:46:09 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 6 Jul 2004 07:46:09 +1000 (EST) Subject: [tinysofa-svn] r2944 - tinysofa/releases/1.1/squid/current/specs Message-ID: <20040705214609.90BED4E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-06 07:46:09 +1000 (Tue, 06 Jul 2004) New Revision: 2944 Modified: tinysofa/releases/1.1/squid/current/specs/squid.spec Log: - don't generate requirements from documentation files Modified: tinysofa/releases/1.1/squid/current/specs/squid.spec =================================================================== --- tinysofa/releases/1.1/squid/current/specs/squid.spec 2004-07-05 21:43:01 UTC (rev 2943) +++ tinysofa/releases/1.1/squid/current/specs/squid.spec 2004-07-05 21:46:09 UTC (rev 2944) @@ -1,6 +1,5 @@ ## % define _use_internal_dependency_generator 0 -%define __perl_requires %{SOURCE98} -## % define __find_requires %{SOURCE99} +%define __perl_requires %{nil} Summary: The Squid proxy caching server. Name: squid @@ -15,8 +14,6 @@ Source3: squid.logrotate Source4: squid.sysconfig Source5: squid.pam -Source98: perl-requires-squid.sh -## Source99: filter-requires-squid.sh Patch1: squid-2.5.STABLE3-config.patch #Patch2: squid-perlpath.patch Patch3: squid-2.5.STABLE4-location.patch From svn at tinysofa.org Tue Jul 6 08:10:23 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 6 Jul 2004 18:10:23 +1000 (EST) Subject: [tinysofa-svn] r2945 - tinysofa/releases/1.1/dmapi/current/specs Message-ID: <20040706081023.7663D4E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-06 18:10:22 +1000 (Tue, 06 Jul 2004) New Revision: 2945 Modified: tinysofa/releases/1.1/dmapi/current/specs/dmapi.spec Log: - chmod files in /usr/lib correctly Modified: tinysofa/releases/1.1/dmapi/current/specs/dmapi.spec =================================================================== --- tinysofa/releases/1.1/dmapi/current/specs/dmapi.spec 2004-07-05 21:46:09 UTC (rev 2944) +++ tinysofa/releases/1.1/dmapi/current/specs/dmapi.spec 2004-07-06 08:10:22 UTC (rev 2945) @@ -52,7 +52,7 @@ /usr/bin/make -C build/rpm rpmfiles-dev DIST_MANIFEST="$DIST_INSTALL_DEV" chmod +x ${RPM_BUILD_ROOT}/%{_lib}/lib*.so.* -chmod +x ${RPM_BUILD_ROOT}/%{_libdir}/lib*.so.* +chmod +x ${RPM_BUILD_ROOT}/%{_libdir}/lib*.so* chmod +x ${RPM_BUILD_ROOT}/%{_libdir}/lib*.la files() From svn at tinysofa.org Tue Jul 6 08:15:21 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 6 Jul 2004 18:15:21 +1000 (EST) Subject: [tinysofa-svn] r2946 - tinysofa/releases/1.1/dmapi/current/specs Message-ID: <20040706081521.917CF4E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-06 18:15:21 +1000 (Tue, 06 Jul 2004) New Revision: 2946 Modified: tinysofa/releases/1.1/dmapi/current/specs/dmapi.spec Log: - really fix Modified: tinysofa/releases/1.1/dmapi/current/specs/dmapi.spec =================================================================== --- tinysofa/releases/1.1/dmapi/current/specs/dmapi.spec 2004-07-06 08:10:22 UTC (rev 2945) +++ tinysofa/releases/1.1/dmapi/current/specs/dmapi.spec 2004-07-06 08:15:21 UTC (rev 2946) @@ -52,7 +52,7 @@ /usr/bin/make -C build/rpm rpmfiles-dev DIST_MANIFEST="$DIST_INSTALL_DEV" chmod +x ${RPM_BUILD_ROOT}/%{_lib}/lib*.so.* -chmod +x ${RPM_BUILD_ROOT}/%{_libdir}/lib*.so* +#chmod +x ${RPM_BUILD_ROOT}/%{_libdir}/lib*.so* chmod +x ${RPM_BUILD_ROOT}/%{_libdir}/lib*.la files() From svn at tinysofa.org Tue Jul 6 08:52:08 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 6 Jul 2004 18:52:08 +1000 (EST) Subject: [tinysofa-svn] r2947 - in tinysofa/releases/1.1/db4/current: sources specs Message-ID: <20040706085208.B5E414E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-06 18:52:08 +1000 (Tue, 06 Jul 2004) New Revision: 2947 Added: tinysofa/releases/1.1/db4/current/sources/db-1.85-errno.patch tinysofa/releases/1.1/db4/current/sources/db-4.1.25-no-jni-includes.patch tinysofa/releases/1.1/db4/current/sources/db-4.2.52-gcj.patch tinysofa/releases/1.1/db4/current/sources/db-4.2.52-java.patch tinysofa/releases/1.1/db4/current/sources/db.1.85.tar.gz tinysofa/releases/1.1/db4/current/sources/nptl-abi-note.S tinysofa/releases/1.1/db4/current/sources/patch.1.1 tinysofa/releases/1.1/db4/current/sources/patch.1.2 tinysofa/releases/1.1/db4/current/sources/patch.1.3 tinysofa/releases/1.1/db4/current/sources/patch.1.4 tinysofa/releases/1.1/db4/current/sources/patch.4.2.52.1 tinysofa/releases/1.1/db4/current/sources/patch.4.2.52.2 Removed: tinysofa/releases/1.1/db4/current/sources/patch.4.2.52.1.tinysofa tinysofa/releases/1.1/db4/current/sources/patch.4.2.52.2.tinysofa Modified: tinysofa/releases/1.1/db4/current/specs/db4.spec Log: - backported new db4 Added: tinysofa/releases/1.1/db4/current/sources/db-1.85-errno.patch =================================================================== --- tinysofa/releases/1.1/db4/current/sources/db-1.85-errno.patch 2004-07-06 08:15:21 UTC (rev 2946) +++ tinysofa/releases/1.1/db4/current/sources/db-1.85-errno.patch 2004-07-06 08:52:08 UTC (rev 2947) @@ -0,0 +1,89 @@ +glibc doesn't like errno as the name of a field. +--- db.1.85/hash/hash.h Mon Feb 18 19:12:14 2002 ++++ db.1.85/hash/hash.h Mon Feb 18 19:12:20 2002 +@@ -103,7 +103,7 @@ + BUFHEAD *cpage; /* Current page */ + int cbucket; /* Current bucket */ + int cndx; /* Index of next item on cpage */ +- int errno; /* Error Number -- for DBM ++ int err; /* Error Number -- for DBM + * compatability */ + int new_file; /* Indicates if fd is backing store + * or no */ +--- db.1.85/hash/hash.c Mon Feb 18 19:12:24 2002 ++++ db.1.85/hash/hash.c Mon Feb 18 19:12:44 2002 +@@ -505,7 +505,7 @@ + else + if (wsize != sizeof(HASHHDR)) { + errno = EFTYPE; +- hashp->errno = errno; ++ hashp->err = errno; + return (-1); + } + for (i = 0; i < NCACHED; i++) +@@ -536,7 +536,7 @@ + + hashp = (HTAB *)dbp->internal; + if (flag) { +- hashp->errno = errno = EINVAL; ++ hashp->err = errno = EINVAL; + return (ERROR); + } + return (hash_access(hashp, HASH_GET, (DBT *)key, data)); +@@ -553,11 +553,11 @@ + + hashp = (HTAB *)dbp->internal; + if (flag && flag != R_NOOVERWRITE) { +- hashp->errno = errno = EINVAL; ++ hashp->err = errno = EINVAL; + return (ERROR); + } + if ((hashp->flags & O_ACCMODE) == O_RDONLY) { +- hashp->errno = errno = EPERM; ++ hashp->err = errno = EPERM; + return (ERROR); + } + return (hash_access(hashp, flag == R_NOOVERWRITE ? +@@ -574,11 +574,11 @@ + + hashp = (HTAB *)dbp->internal; + if (flag && flag != R_CURSOR) { +- hashp->errno = errno = EINVAL; ++ hashp->err = errno = EINVAL; + return (ERROR); + } + if ((hashp->flags & O_ACCMODE) == O_RDONLY) { +- hashp->errno = errno = EPERM; ++ hashp->err = errno = EPERM; + return (ERROR); + } + return (hash_access(hashp, HASH_DELETE, (DBT *)key, NULL)); +@@ -729,7 +729,7 @@ + + hashp = (HTAB *)dbp->internal; + if (flag && flag != R_FIRST && flag != R_NEXT) { +- hashp->errno = errno = EINVAL; ++ hashp->err = errno = EINVAL; + return (ERROR); + } + #ifdef HASH_STATISTICS +--- db.1.85/hash/ndbm.c Mon Feb 18 19:12:58 2002 ++++ db.1.85/hash/ndbm.c Mon Feb 18 19:13:05 2002 +@@ -180,7 +180,7 @@ + HTAB *hp; + + hp = (HTAB *)db->internal; +- return (hp->errno); ++ return (hp->err); + } + + extern int +@@ -190,7 +190,7 @@ + HTAB *hp; + + hp = (HTAB *)db->internal; +- hp->errno = 0; ++ hp->err = 0; + return (0); + } + Added: tinysofa/releases/1.1/db4/current/sources/db-4.1.25-no-jni-includes.patch =================================================================== --- tinysofa/releases/1.1/db4/current/sources/db-4.1.25-no-jni-includes.patch 2004-07-06 08:15:21 UTC (rev 2946) +++ tinysofa/releases/1.1/db4/current/sources/db-4.1.25-no-jni-includes.patch 2004-07-06 08:52:08 UTC (rev 2947) @@ -0,0 +1,13 @@ +We don't really mind that we don't know where the JNI includes are, so +long as the compiler knows. +--- db-4.1.25/dist/aclocal_java/ac_jni_include_dirs.ac ++++ db-4.1.25/dist/aclocal_java/ac_jni_include_dirs.ac +@@ -65,7 +65,7 @@ + JNI_INCLUDE_DIRS="$JNI_INCLUDE_DIRS $_JTOPDIR/include" + fi + else +- AC_MSG_ERROR([cannot find java include files]) ++ AC_MSG_WARN([cannot find java include files, assuming they exist in default search path]) + fi + fi + Added: tinysofa/releases/1.1/db4/current/sources/db-4.2.52-gcj.patch =================================================================== --- tinysofa/releases/1.1/db4/current/sources/db-4.2.52-gcj.patch 2004-07-06 08:15:21 UTC (rev 2946) +++ tinysofa/releases/1.1/db4/current/sources/db-4.2.52-gcj.patch 2004-07-06 08:52:08 UTC (rev 2947) @@ -0,0 +1,47 @@ +--- db-4.2.52/dist/aclocal_java/ac_prog_java.ac.gcj 2003-05-10 13:46:09.000000000 -0400 ++++ db-4.2.52/dist/aclocal_java/ac_prog_java.ac 2004-06-07 14:44:10.025613309 -0400 +@@ -73,7 +73,10 @@ + else + test x$JAVA = x && AC_CHECK_PROGS(JAVA, java$EXEEXT kaffe$EXEEXT, $JAVAPREFIX) + fi +-test x$JAVA = x && AC_MSG_ERROR([no acceptable Java virtual machine found in \$PATH]) +-AC_PROG_JAVA_WORKS ++if test x$JAVA = x; then ++ AC_MSG_WARN([no acceptable Java virtual machine found in \$PATH]) ++else ++ AC_PROG_JAVA_WORKS ++fi + AC_PROVIDE([$0])dnl + ]) +--- db-4.2.52/dist/aclocal_java/ac_prog_javac.ac.gcj 2004-06-07 14:48:36.651984980 -0400 ++++ db-4.2.52/dist/aclocal_java/ac_prog_javac.ac 2004-06-07 14:50:20.170648093 -0400 +@@ -33,9 +33,9 @@ + AC_DEFUN([AC_PROG_JAVAC],[ + AC_REQUIRE([AC_EXEEXT])dnl + if test "x$JAVAPREFIX" = x; then +- test "x$JAVAC" = x && AC_CHECK_PROGS(JAVAC, javac$EXEEXT "gcj$EXEEXT -C" guavac$EXEEXT jikes$EXEEXT) ++ test "x$JAVAC" = x && AC_CHECK_PROGS(JAVAC, javac$EXEEXT "gcj34$EXEEXT -C" "gcj-ssa$EXEEXT -C" "gcj$EXEEXT -C" guavac$EXEEXT jikes$EXEEXT) + else +- test "x$JAVAC" = x && AC_CHECK_PROGS(JAVAC, javac$EXEEXT "gcj$EXEEXT -C" guavac$EXEEXT jikes$EXEEXT, $JAVAPREFIX) ++ test "x$JAVAC" = x && AC_CHECK_PROGS(JAVAC, javac$EXEEXT "gcj34$EXEEXT -C" "gcj-ssa$EXEEXT -C" "gcj$EXEEXT -C" guavac$EXEEXT jikes$EXEEXT, $JAVAPREFIX) + fi + test "x$JAVAC" = x && AC_MSG_ERROR([no acceptable Java compiler found in \$PATH]) + AC_PROG_JAVAC_WORKS +--- db-4.2.52/dist/configure.ac.gcj 2003-10-14 20:55:17.000000000 -0400 ++++ db-4.2.52/dist/configure.ac 2004-06-07 14:44:10.026613209 -0400 +@@ -390,6 +390,7 @@ + AC_PROG_JAVA + AC_JNI_INCLUDE_DIR + ++ if test x$JAVA != x; then + AC_MSG_CHECKING(java version) + case "$JAVA" in + *kaffe* ) +@@ -409,6 +410,7 @@ + do + CPPFLAGS="$CPPFLAGS -I$JNI_INCLUDE_DIR" + done ++ fi + + ADDITIONAL_LANG="$ADDITIONAL_LANG java" + INSTALL_LIBS="$INSTALL_LIBS \$(libjso_target)" Added: tinysofa/releases/1.1/db4/current/sources/db-4.2.52-java.patch =================================================================== --- tinysofa/releases/1.1/db4/current/sources/db-4.2.52-java.patch 2004-07-06 08:15:21 UTC (rev 2946) +++ tinysofa/releases/1.1/db4/current/sources/db-4.2.52-java.patch 2004-07-06 08:52:08 UTC (rev 2947) @@ -0,0 +1,11 @@ +--- db-4.2.52/dist/aclocal/sosuffix.ac.java 2004-06-07 12:37:42.480580361 -0400 ++++ db-4.2.52/dist/aclocal/sosuffix.ac 2004-06-07 12:48:56.919196969 -0400 +@@ -19,7 +19,7 @@ + release="" + libname=libfoo + eval _SOSUFFIX=\"$shrext\" +- if test "X$_SOSUFFIX" = "" ; then ++ if test "X$_SOSUFFIX" = "X"; then + _SOSUFFIX=".so" + if test `$LIBTOOL_PROG --config | grep build_libtool_libs | grep no` 2>/dev/null; then + if test "X$_SOSUFFIX_MESSAGE" = "X"; then Added: tinysofa/releases/1.1/db4/current/sources/db.1.85.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/releases/1.1/db4/current/sources/db.1.85.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/releases/1.1/db4/current/sources/nptl-abi-note.S =================================================================== --- tinysofa/releases/1.1/db4/current/sources/nptl-abi-note.S 2004-07-06 08:15:21 UTC (rev 2946) +++ tinysofa/releases/1.1/db4/current/sources/nptl-abi-note.S 2004-07-06 08:52:08 UTC (rev 2947) @@ -0,0 +1,21 @@ +/* Gleaned from glibc, though I suppose it's documented in the specs, too. + NPTL requires support that isn't in kernels prior to 2.4.20 (or 2.5.36 if + you're not using a backported TLS implementation in your kernel), but ld.so + will try to use this library on an insufficiently-new system unless we make + a note of the required kernel version here. + We also add in a section which marks the library as not needing an + executable stack to avoid unintentionally disabling exec-shield and the + like (thanks Arjan!). */ + .section ".note.ABI-tag", "a" + .p2align 2 + .long 1f - 0f + .long 3f - 2f + .long 1 +0: .asciz "GNU" +1: .p2align 2 +2: .long 0 + .long 2,4,20 +3: .p2align 2 + +.section .note.GNU-stack, "", @progbits +.previous Added: tinysofa/releases/1.1/db4/current/sources/patch.1.1 =================================================================== --- tinysofa/releases/1.1/db4/current/sources/patch.1.1 2004-07-06 08:15:21 UTC (rev 2946) +++ tinysofa/releases/1.1/db4/current/sources/patch.1.1 2004-07-06 08:52:08 UTC (rev 2947) @@ -0,0 +1,20 @@ +*** Makefile.orig Wed Jul 13 21:43:16 1994 +--- Makefile Wed Dec 31 19:00:00 1969 +*************** +*** 15,22 **** + + ${LIBDB}: ${OBJ1} ${OBJ2} ${OBJ3} ${OBJ4} ${OBJ5} ${MISC} + rm -f $@ +! ar cq $@ \ +! `lorder ${OBJ1} ${OBJ2} ${OBJ3} ${OBJ4} ${OBJ5} ${MISC} | tsort` + ranlib $@ + + clean: +--- 15,21 ---- + + ${LIBDB}: ${OBJ1} ${OBJ2} ${OBJ3} ${OBJ4} ${OBJ5} ${MISC} + rm -f $@ +! ar cq $@ ${OBJ1} ${OBJ2} ${OBJ3} ${OBJ4} ${OBJ5} ${MISC} + ranlib $@ + + clean: Added: tinysofa/releases/1.1/db4/current/sources/patch.1.2 =================================================================== --- tinysofa/releases/1.1/db4/current/sources/patch.1.2 2004-07-06 08:15:21 UTC (rev 2946) +++ tinysofa/releases/1.1/db4/current/sources/patch.1.2 2004-07-06 08:52:08 UTC (rev 2947) @@ -0,0 +1,19 @@ +*** btree/bt_split.c Tue Jul 26 14:22:02 1994 +--- btree/bt_split.c Sat Jan 4 14:38:55 1997 +*************** +*** 673,679 **** + * where we decide to try and copy too much onto the left page. + * Make sure that doesn't happen. + */ +! if (skip <= off && used + nbytes >= full) { + --off; + break; + } +--- 673,679 ---- + * where we decide to try and copy too much onto the left page. + * Make sure that doesn't happen. + */ +! if (skip <= off && used + nbytes >= full || nxt == top - 1) { + --off; + break; + } Added: tinysofa/releases/1.1/db4/current/sources/patch.1.3 =================================================================== --- tinysofa/releases/1.1/db4/current/sources/patch.1.3 2004-07-06 08:15:21 UTC (rev 2946) +++ tinysofa/releases/1.1/db4/current/sources/patch.1.3 2004-07-06 08:52:08 UTC (rev 2947) @@ -0,0 +1,37 @@ +*** btree/bt_split.c.orig Sat Feb 8 10:14:10 1997 +--- btree/bt_split.c Sat Feb 8 10:14:51 1997 +*************** +*** 673,679 **** + * where we decide to try and copy too much onto the left page. + * Make sure that doesn't happen. + */ +! if (skip <= off && used + nbytes >= full || nxt == top - 1) { + --off; + break; + } +--- 673,680 ---- + * where we decide to try and copy too much onto the left page. + * Make sure that doesn't happen. + */ +! if (skip <= off && +! used + nbytes + sizeof(indx_t) >= full || nxt == top - 1) { + --off; + break; + } +*************** +*** 686,692 **** + memmove((char *)l + l->upper, src, nbytes); + } + +! used += nbytes; + if (used >= half) { + if (!isbigkey || bigkeycnt == 3) + break; +--- 687,693 ---- + memmove((char *)l + l->upper, src, nbytes); + } + +! used += nbytes + sizeof(indx_t); + if (used >= half) { + if (!isbigkey || bigkeycnt == 3) + break; Added: tinysofa/releases/1.1/db4/current/sources/patch.1.4 =================================================================== --- tinysofa/releases/1.1/db4/current/sources/patch.1.4 2004-07-06 08:15:21 UTC (rev 2946) +++ tinysofa/releases/1.1/db4/current/sources/patch.1.4 2004-07-06 08:52:08 UTC (rev 2947) @@ -0,0 +1,22 @@ +*** btree/bt_page.c.orig Wed Jul 13 21:29:02 1994 +--- btree/bt_page.c Wed Jun 11 20:14:43 1997 +*************** +*** 65,70 **** +--- 65,71 ---- + h->prevpg = P_INVALID; + h->nextpg = t->bt_free; + t->bt_free = h->pgno; ++ F_SET(t, B_METADIRTY); + + /* Make sure the page gets written back. */ + return (mpool_put(t->bt_mp, h, MPOOL_DIRTY)); +*************** +*** 92,97 **** +--- 93,99 ---- + (h = mpool_get(t->bt_mp, t->bt_free, 0)) != NULL) { + *npg = t->bt_free; + t->bt_free = h->nextpg; ++ F_SET(t, B_METADIRTY); + return (h); + } + return (mpool_new(t->bt_mp, npg)); Added: tinysofa/releases/1.1/db4/current/sources/patch.4.2.52.1 =================================================================== --- tinysofa/releases/1.1/db4/current/sources/patch.4.2.52.1 2004-07-06 08:15:21 UTC (rev 2946) +++ tinysofa/releases/1.1/db4/current/sources/patch.4.2.52.1 2004-07-06 08:52:08 UTC (rev 2947) @@ -0,0 +1,36 @@ +*** mp/mp_fget.c.orig 25 Sep 2003 02:15:16 -0000 11.81 +--- mp/mp_fget.c 9 Dec 2003 19:06:28 -0000 11.82 +*************** +*** 440,446 **** + c_mp->stat.st_pages--; + alloc_bhp = NULL; + R_UNLOCK(dbenv, &dbmp->reginfo[n_cache]); +- MUTEX_LOCK(dbenv, &hp->hash_mutex); + + /* + * We can't use the page we found in the pool if DB_MPOOL_NEW +--- 440,445 ---- +*************** +*** 455,460 **** +--- 454,462 ---- + b_incr = 0; + goto alloc; + } ++ ++ /* We can use the page -- get the bucket lock. */ ++ MUTEX_LOCK(dbenv, &hp->hash_mutex); + break; + case SECOND_MISS: + /* +*** mp/mp_fput.c.orig 30 Sep 2003 17:12:00 -0000 11.48 +--- mp/mp_fput.c 13 Dec 2003 00:08:29 -0000 11.49 +*************** +*** 285,290 **** +--- 285,291 ---- + bhp != NULL; bhp = SH_TAILQ_NEXT(bhp, hq, __bh)) + if (bhp->priority != UINT32_T_MAX && + bhp->priority > MPOOL_BASE_DECREMENT) ++ bhp->priority -= MPOOL_BASE_DECREMENT; + MUTEX_UNLOCK(dbenv, &hp->hash_mutex); + } + } Deleted: tinysofa/releases/1.1/db4/current/sources/patch.4.2.52.1.tinysofa =================================================================== --- tinysofa/releases/1.1/db4/current/sources/patch.4.2.52.1.tinysofa 2004-07-06 08:15:21 UTC (rev 2946) +++ tinysofa/releases/1.1/db4/current/sources/patch.4.2.52.1.tinysofa 2004-07-06 08:52:08 UTC (rev 2947) @@ -1,32 +0,0 @@ -diff -urN db-4.2.52/mp/mp_fget.c db-4.2.52.tinysofa/mp/mp_fget.c ---- db-4.2.52/mp/mp_fget.c 2003-09-26 01:29:02.000000000 +1000 -+++ db-4.2.52.tinysofa/mp/mp_fget.c 2004-02-06 00:10:08.000000000 +1100 -@@ -440,7 +440,6 @@ - c_mp->stat.st_pages--; - alloc_bhp = NULL; - R_UNLOCK(dbenv, &dbmp->reginfo[n_cache]); -- MUTEX_LOCK(dbenv, &hp->hash_mutex); - - /* - * We can't use the page we found in the pool if DB_MPOOL_NEW -@@ -455,6 +454,9 @@ - b_incr = 0; - goto alloc; - } -+ -+ /* We can use the page -- get the bucket lock. */ -+ MUTEX_LOCK(dbenv, &hp->hash_mutex); - break; - case SECOND_MISS: - /* -diff -urN db-4.2.52/mp/mp_fput.c db-4.2.52.tinysofa/mp/mp_fput.c ---- db-4.2.52/mp/mp_fput.c 2003-10-01 03:42:07.000000000 +1000 -+++ db-4.2.52.tinysofa/mp/mp_fput.c 2004-02-06 00:10:31.000000000 +1100 -@@ -285,6 +285,7 @@ - bhp != NULL; bhp = SH_TAILQ_NEXT(bhp, hq, __bh)) - if (bhp->priority != UINT32_T_MAX && - bhp->priority > MPOOL_BASE_DECREMENT) -+ bhp->priority -= MPOOL_BASE_DECREMENT; - MUTEX_UNLOCK(dbenv, &hp->hash_mutex); - } - } Added: tinysofa/releases/1.1/db4/current/sources/patch.4.2.52.2 =================================================================== --- tinysofa/releases/1.1/db4/current/sources/patch.4.2.52.2 2004-07-06 08:15:21 UTC (rev 2946) +++ tinysofa/releases/1.1/db4/current/sources/patch.4.2.52.2 2004-07-06 08:52:08 UTC (rev 2947) @@ -0,0 +1,45 @@ +*** lock/lock.c.save 2004-01-30 10:48:33.000000000 -0800 +--- lock/lock.c 2004-01-30 10:55:58.000000000 -0800 +*************** +*** 2216,2226 **** + dp = (u_int8_t *)dp + \ + sizeof(db_pgno_t); \ + } while (0) +! #define COPY_OBJ(dp, obj) do { \ +! memcpy(dp, obj->data, obj->size); \ +! dp = (u_int8_t *)dp + \ +! ALIGN(obj->size, \ +! sizeof(u_int32_t)); \ + } while (0) + + #define GET_COUNT(dp, count) do { \ +--- 2216,2227 ---- + dp = (u_int8_t *)dp + \ + sizeof(db_pgno_t); \ + } while (0) +! #define COPY_OBJ(dp, obj) do { \ +! memcpy(dp, \ +! (obj)->data, (obj)->size); \ +! dp = (u_int8_t *)dp + \ +! ALIGN((obj)->size, \ +! sizeof(u_int32_t)); \ + } while (0) + + #define GET_COUNT(dp, count) do { \ +*************** +*** 2339,2345 **** + for (i = 0; i < nlocks; i = j) { + PUT_PCOUNT(dp, obj[i].ulen); + PUT_SIZE(dp, obj[i].size); +! COPY_OBJ(dp, obj); + lock = (DB_LOCK_ILOCK *)obj[i].data; + for (j = i + 1; j <= i + obj[i].ulen; j++) { + lock = (DB_LOCK_ILOCK *)obj[j].data; +--- 2340,2346 ---- + for (i = 0; i < nlocks; i = j) { + PUT_PCOUNT(dp, obj[i].ulen); + PUT_SIZE(dp, obj[i].size); +! COPY_OBJ(dp, &obj[i]); + lock = (DB_LOCK_ILOCK *)obj[i].data; + for (j = i + 1; j <= i + obj[i].ulen; j++) { + lock = (DB_LOCK_ILOCK *)obj[j].data; Deleted: tinysofa/releases/1.1/db4/current/sources/patch.4.2.52.2.tinysofa =================================================================== --- tinysofa/releases/1.1/db4/current/sources/patch.4.2.52.2.tinysofa 2004-07-06 08:15:21 UTC (rev 2946) +++ tinysofa/releases/1.1/db4/current/sources/patch.4.2.52.2.tinysofa 2004-07-06 08:52:08 UTC (rev 2947) @@ -1,30 +0,0 @@ -diff -urN db-4.2.52/lock/lock.c db-4.2.52.tinysofa/lock/lock.c ---- db-4.2.52/lock/lock.c 2003-11-21 13:40:10.000000000 +1100 -+++ db-4.2.52.tinysofa/lock/lock.c 2004-02-06 04:43:11.000000000 +1100 -@@ -2216,11 +2216,12 @@ - dp = (u_int8_t *)dp + \ - sizeof(db_pgno_t); \ - } while (0) --#define COPY_OBJ(dp, obj) do { \ -- memcpy(dp, obj->data, obj->size); \ -- dp = (u_int8_t *)dp + \ -- ALIGN(obj->size, \ -- sizeof(u_int32_t)); \ -+#define COPY_OBJ(dp, obj) do { \ -+ memcpy(dp, \ -+ (obj)->data, (obj)->size); \ -+ dp = (u_int8_t *)dp + \ -+ ALIGN((obj)->size, \ -+ sizeof(u_int32_t)); \ - } while (0) - - #define GET_COUNT(dp, count) do { \ -@@ -2339,7 +2340,7 @@ - for (i = 0; i < nlocks; i = j) { - PUT_PCOUNT(dp, obj[i].ulen); - PUT_SIZE(dp, obj[i].size); -- COPY_OBJ(dp, obj); -+ COPY_OBJ(dp, &obj[i]); - lock = (DB_LOCK_ILOCK *)obj[i].data; - for (j = i + 1; j <= i + obj[i].ulen; j++) { - lock = (DB_LOCK_ILOCK *)obj[j].data; Modified: tinysofa/releases/1.1/db4/current/specs/db4.spec =================================================================== --- tinysofa/releases/1.1/db4/current/specs/db4.spec 2004-07-06 08:15:21 UTC (rev 2946) +++ tinysofa/releases/1.1/db4/current/specs/db4.spec 2004-07-06 08:52:08 UTC (rev 2947) @@ -1,28 +1,41 @@ -# compatibility with legacy rpm +%define java_arches %{ix86} alpha ia64 ppc s390 s390x sparc x86_64 +%define nptl_arches %{ix86} ia64 ppc ppc64 s390 s390x sparcv9 x86_64 +# define nptl_java_arches to be the intersection of java_arches and nptl_arches +%define nptl_java_arches %{ix86} ia64 ppc s390 s390x x86_64 + +# compatibility with legacy versions of rpm %{!?_lib:%define _lib lib} -%define __major 4 -%define __minor 2 -%define __soversion %{__major}.%{__minor} -%define _libdb_a libdb.a.%{__soversion} -%define _libcxx_a libdb_cxx.a.%{__soversion} +%define __soversion 4.2 +%define _libdb_a libdb-%{__soversion}.a +%define _libcxx_a libdb_cxx-%{__soversion}.a Summary: The Berkeley DB database library (version 4) for C. Name: db4 -Version: %{__soversion}.52 -Release: 3ts +Version: 4.2.52 +Release: 4jh Source: http://www.sleepycat.com/update/%{version}/db-%{version}.tar.gz -Patch0: patch.4.2.52.1.tinysofa -Patch1: patch.4.2.52.2.tinysofa +Source1: http://www.sleepycat.com/update/1.85/db.1.85.tar.gz +Source2: nptl-abi-note.S +Patch0: db-4.1.25-no-jni-includes.patch +Patch1: db-4.2.52-java.patch +Patch2: patch.4.2.52.1 +Patch3: patch.4.2.52.2 +Patch4: db-4.2.52-gcj.patch +Patch10: http://www.sleepycat.com/update/1.85/patch.1.1 +Patch11: http://www.sleepycat.com/update/1.85/patch.1.2 +Patch12: http://www.sleepycat.com/update/1.85/patch.1.3 +Patch13: http://www.sleepycat.com/update/1.85/patch.1.4 +Patch14: db-1.85-errno.patch URL: http://www.sleepycat.com/ License: GPL Group: main -BuildPreReq: perl db1-devel -BuildRequires: autoconf libstdc++-devel ed -Requires: libstdc++ -# Seems RPM needs a special invitation to understand this -Provides: libdb.so.%{__major} -BuildRoot: %{_tmppath}/%{name}-root +Obsoletes: db1, db1-devel +BuildPreReq: perl, libtool, ed, autoconf, libstdc++-devel, ed +%ifarch %{java_arches} +BuildPreReq: gcc-java +%endif +BuildRoot: %{_tmppath}/%{name}-%{version}-root %description The Berkeley Database (Berkeley DB) is a programmatic toolkit that @@ -34,11 +47,11 @@ used by many applications, including Python and Perl, so this should be installed on all systems. - %package utils Summary: Command line tools for managing Berkeley DB (version 4) databases. Group: extra -Requires: %{name} = %{version} +Requires: db4 = %{version}-%{release} +Obsoletes: db2-utils, db3-utils %description utils The Berkeley Database (Berkeley DB) is a programmatic toolkit that @@ -51,11 +64,11 @@ This package contains command line tools for managing Berkeley DB (version 4) databases. - %package devel Summary: Development files for the Berkeley DB (version 4) library. Group: development -Requires: %{name} = %{version} +Requires: db4 = %{version}-%{release} +Obsoletes: db2-devel, db3-devel %description devel The Berkeley Database (Berkeley DB) is a programmatic toolkit that @@ -64,11 +77,37 @@ libraries, and documentation for building programs which use the Berkeley DB. +%package java +Summary: Development files for using the Berkeley DB (version 4) with Java. +Group: development +Requires: %{name} = %{version}-%{release} +%description java +The Berkeley Database (Berkeley DB) is a programmatic toolkit that +provides embedded database support for both traditional and +client/server applications. This package contains the libraries +for building programs which use the Berkeley DB in Java. + %prep -%setup -q -n db-%{version} -%patch0 -p1 -%patch1 -p1 +%setup -q -n db-%{version} -a 1 +#%patch0 -p1 -b .no-jni-includes +%patch1 -p1 -b .java +%patch2 -p0 -b .4.2.52.1 +%patch3 -p0 -b .4.2.52.2 +%patch4 -p1 -b .gcj +pushd dist +libtoolize --copy --force +cp -f %{_datadir}/aclocal/libtool.m4 aclocal/libtool.ac +popd +pushd db.1.85/PORT/linux +%patch10 -p0 -b .1 +popd +pushd db.1.85 +%patch11 -p0 -b .1 +%patch12 -p0 -b .2 +%patch13 -p0 -b .3 +%patch14 -p1 -b .errno +popd # Remove tags files which we don't need. find . -name tags | xargs rm -f @@ -104,158 +143,378 @@ done } -set +x # XXX painful to watch +set +x # XXX painful to watch # Fix all of the HTML files. fixup_href `find . -name "*.html"` -set -x # XXX painful to watch +set -x # XXX painful to watch cd dist ./s_config %build -cd build_unix +CFLAGS="$RPM_OPT_FLAGS"; export CFLAGS -CFLAGS="`echo $RPM_OPT_FLAGS | sed -e 's/-fno-exceptions//g'`" \ - ../dist/configure \ - --prefix=%{_prefix} \ - --enable-compat185 \ - --enable-shared \ - --enable-static \ - --enable-rpc \ - --enable-cxx +# Build the old db-185 libraries. +make -C db.1.85/PORT/%{_os} OORG="$CFLAGS" -make +build() { + test -d dist/$1 || mkdir dist/$1 + # Static link db_dump185 with old db-185 libraries. + /bin/sh libtool --mode=compile %{__cc} $RPM_OPT_FLAGS -Idb.1.85/PORT/%{_os}/include -D_REENTRANT -c db_dump185/db_dump185.c -o dist/$1/db_dump185.lo + /bin/sh libtool --mode=link %{__cc} -o dist/$1/db_dump185 dist/$1/db_dump185.lo db.1.85/PORT/%{_os}/libdb.a + pushd dist/$1 + # Force the threading model used, for selecting whether or not we will + # depend on NPTL-specific features. + echo ${2:+db_cv_mutex=$2} > config.cache + if test -n "$nptl_lo" ; then + /bin/sh libtool --mode=compile %{__cc} $RPM_OPT_FLAGS \ + -o $nptl_lo -c $nptl_s + fi + ln -sf ../configure . + # XXX --enable-diagnostic should be disabled for production (but is + # useful). + # XXX --enable-debug_{r,w}op should be disabled for production. + %configure -C \ + --enable-compat185 --enable-dump185 \ + --enable-shared --enable-static --enable-rpc \ + --enable-cxx \ +%ifarch %{java_arches} + --enable-java \ +%else + --disable-java \ +%endif + # --enable-diagnostic \ + # --enable-debug --enable-debug_rop --enable-debug_wop \ -# Static link with old db-185 libraries. -/bin/sh ./libtool \ - --mode=compile cc \ - %{optflags} -c -I%{_includedir}/db1 \ - -I../dist/../include -D_REENTRANT \ - ../dist/../db_dump185/db_dump185.c + # Remove libtool predep_objects and postdep_objects wonkiness so that + # building without -nostdlib doesn't include them twice. Because we + # already link with g++, weird stuff happens if you don't let the + # compiler handle this. + perl -pi -e 's/^predep_objects=".*$/predep_objects=""/' libtool + perl -pi -e 's/^postdep_objects=".*$/postdep_objects=""/' libtool + perl -pi -e 's/-shared -nostdlib/-shared/' libtool -cc -static -o db_dump185 db_dump185.o -L%{_libdir} -ldb1 + make libdb=%{_libdb_a} libcxx=%{_libcxx_a} %{?_smp_mflags} \ + LIBSO_LIBS='$(LIBS)'" $nptl_lo" \ + LIBXSO_LIBS='$(LIBS)'" $nptl_lo" \ + LIBJSO_LIBS='$(LIBS)'" $nptl_lo" \ + LIBTSO_LIBS='$(LIBS)'" $nptl_lo" -# Compile rest normally. -make libdb=%{_libdb_a} libcxx=%{_libcxx_a} \ - TCFLAGS='-I$(builddir) -I%{_includedir}' + # XXX hack around libtool not creating ./libs/libdb_java-X.Y.lai + LDBJ=./.libs/libdb_java-%{__soversion}.la + if test -f ${LDBJ} -a ! -f ${LDBJ}i; then + sed -e 's,^installed=no,installed=yes,' < ${LDBJ} > ${LDBJ}i + fi + popd +} +%ifarch %{nptl_arches} +unset nptl_s nptl_lo +case %{_os} in +linux|Linux) + nptl_s=$RPM_SOURCE_DIR/nptl-abi-note.S + nptl_lo=nptl-abi-note.lo + ;; +esac +build dist-tls POSIX/pthreads/library +unset nptl_s nptl_lo +%endif +build dist-notls POSIX/pthreads/library/private + %install -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT - mkdir -p ${RPM_BUILD_ROOT}%{_includedir} mkdir -p ${RPM_BUILD_ROOT}%{_libdir} +%ifarch %{nptl_arches} +%makeinstall -C dist/dist-tls -cd build_unix +# XXX Nuke non-versioned archives. +rm -f $RPM_BUILD_ROOT/%{_libdir}/{libdb.a,libdb_cxx.a} -make libdb=%{_libdb_a} \ - libcxx=%{_libcxx_a} \ - prefix=${RPM_BUILD_ROOT}%{_prefix} install +chmod +x $RPM_BUILD_ROOT/%{_libdir}/*.so* +mkdir -p ${RPM_BUILD_ROOT}%{_libdir}/tls +mv $RPM_BUILD_ROOT/%{_libdir}/libdb*%{__soversion}.so $RPM_BUILD_ROOT/%{_libdir}/tls/ +%endif +%makeinstall -C dist/dist-notls -install -m 755 db_dump185 $RPM_BUILD_ROOT/%{_bindir}/ +# XXX Nuke non-versioned archives. +rm -f $RPM_BUILD_ROOT/%{_libdir}/{libdb.a,libdb_cxx.a} +chmod +x $RPM_BUILD_ROOT/%{_libdir}/*.so* + +# Move the main shared library to lib directory, but leave the unversioned .so +# symlink in the usual place to link against. +if [ "%{_libdir}" != "/%{_lib}" ]; then + mkdir -p $RPM_BUILD_ROOT/%{_lib}/tls + mv $RPM_BUILD_ROOT/%{_libdir}/libdb-%{__soversion}.so $RPM_BUILD_ROOT/%{_lib}/ + if test -e $RPM_BUILD_ROOT/%{_libdir}/tls/libdb-%{__soversion}.so ; then + mv $RPM_BUILD_ROOT/%{_libdir}/tls/libdb-%{__soversion}.so $RPM_BUILD_ROOT/%{_lib}/tls/ + fi + touch $RPM_BUILD_ROOT/rootfile + root=.. + while [ ! -e $RPM_BUILD_ROOT/%{_libdir}/${root}/rootfile ] ; do + root=${root}/.. + done + rm $RPM_BUILD_ROOT/rootfile + ln -sf ${root}/%{_lib}/libdb-%{__soversion}.so $RPM_BUILD_ROOT/%{_libdir}/libdb.so + ln -sf ${root}/%{_lib}/libdb-%{__soversion}.so $RPM_BUILD_ROOT/%{_libdir}/ + if test -e $RPM_BUILD_ROOT/%{_lib}/tls/libdb-%{__soversion}.so ; then + ln -sf ${root}/../%{_lib}/tls/libdb-%{__soversion}.so $RPM_BUILD_ROOT/%{_libdir}/tls/ + fi +fi + +# Move the header files to a subdirectory, in case we're deploying on a +# system with multiple versions of DB installed. +mkdir -p $RPM_BUILD_ROOT/%{_includedir}/db4 +mv $RPM_BUILD_ROOT/%{_includedir}/*.h $RPM_BUILD_ROOT/%{_includedir}/db4/ + +# Create symlinks to includes so that "use and link with -ldb" works. +for i in db.h db_cxx.h db_185.h; do + ln -s db4/$i $RPM_BUILD_ROOT%{_includedir} +done + +%ifarch %{java_arches} +# Move java jar file to the correct place +mkdir -p $RPM_BUILD_ROOT%{_datadir}/java +mv $RPM_BUILD_ROOT%{_libdir}/*.jar $RPM_BUILD_ROOT%{_datadir}/java +%endif + +# Eliminate installed doco rm -rf ${RPM_BUILD_ROOT}%{_prefix}/docs + %clean -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT +%clean_buildroot %post -p /sbin/ldconfig - %postun -p /sbin/ldconfig %files %defattr(-,root,root) -%doc LICENSE README -%attr(755,root,root) %{_libdir}/*.so* +%doc LICENSE README docs/images +/%{_lib}/libdb-%{__soversion}.so +%{_libdir}/libdb-%{__soversion}.so +%{_libdir}/libdb_cxx-%{__soversion}.so +%ifarch %{nptl_arches} +/%{_lib}/tls/libdb-%{__soversion}.so +%{_libdir}/tls/libdb-%{__soversion}.so +%{_libdir}/tls/libdb_cxx-%{__soversion}.so +%endif %files utils %defattr(-,root,root) %doc docs/utility -%{_bindir}/* +%{_bindir}/berkeley_db*_svc +%{_bindir}/db*_archive +%{_bindir}/db*_checkpoint +%{_bindir}/db*_deadlock +%{_bindir}/db*_dump* +%{_bindir}/db*_load +%{_bindir}/db*_printlog +%{_bindir}/db*_recover +%{_bindir}/db*_stat +%{_bindir}/db*_upgrade +%{_bindir}/db*_verify - %files devel %defattr(-,root,root) -%doc docs/api_c docs/api_cxx docs/index.html docs/images +%doc docs/api_c docs/api_cxx docs/api_tcl docs/index.html %doc docs/ref docs/sleepycat %doc examples_c examples_cxx -%attr(755,root,root) %{_libdir}/*.la* -%attr(644,root,root) %{_libdir}/*.a* +%{_libdir}/libdb.so +%{_libdir}/libdb-%{__soversion}.la +%{_libdir}/libdb_cxx-%{__soversion}.la +%{_libdir}/%{_libdb_a} +%{_libdir}/%{_libcxx_a} +%{_includedir}/%{name} %{_includedir}/*.h +%ifarch %{java_arches} +%files java +%defattr(-,root,root) +%doc docs/java +%doc examples_java +%{_libdir}/libdb_java* +%{_datadir}/java/*.jar +%endif +%ifarch %{nptl_java_arches} +%{_libdir}/tls/libdb_java* +%endif + + %changelog -* Wed May 19 2004 tsintegrate 4.2.52-3ts -- current (4.2.52-3jh) integrated as 4.2.52-3ts for release 1.0-U1 +* Mon Jun 7 2004 Jeff Johnson 4.2.52-4 +- remove dangling symlinks (#123721 et al). +- remove db_cxx.so and db_tcl.so symlinks, versioned equivs exist. +- apply 2 patches from sleepycat. +- resurrect db4-java using sun jvm-1.4.2. +- cripple autoconf sufficiently to build db4-java with gcj, without jvm. +- check javac first, gcj34 next, then gcj-ssa, finally gcj. +- add ed build dependency (#125180). -* Thu May 13 2004 Jaakko Heinonen -- make package build as non-root +* Tue Mar 02 2004 Elliot Lee +- rebuilt -* Tue May 11 2004 Omar Kilani -- Add BuildRequires autoconf. -- Add BuildRequires gcc-c++-devel. -- Add BuildRequires ed. -- Add Requires gcc-c++-runtime. +* Fri Feb 13 2004 Elliot Lee +- rebuilt -* Tue May 11 2004 Jaakko Heinonen 4.2.52-3jh -- fixed library permissions +* Fri Jan 16 2004 Jeff Johnson 4.2.52-2 +- fix: automake *.lo wrapper, not elf, files included in *.a (#113572). -* Fri Feb 6 2004 Omar Kilani 4.2.52-1ok -- New upstream. -- Patches 1 and 2 from sleepycat do *not* apply cleanly for some reason. -- So, I hand-patched the source, and regenerated the patches. +* Thu Dec 11 2003 Jeff Johnson 4.2.52-1 +- upgrade to db-4.2.52, no db4-java for the moment. -* Sat Dec 6 2003 Erlend Midttun 4.1.25-4tr -- Big rebuild +* Fri Nov 28 2003 Paul Nasrat 4.2.41-0.2 +- Add build requires tcl-devel -* Wed Jun 18 2003 Erlend Midttun 4.1.25-3tr -- Big rebuild +* Fri Oct 24 2003 Nalin Dahyabhai 4.1.25-14 +- symlink from %%{_libdir}/tls/libdb-4.1.so to the copy in /%%{_lib}/tls, so + that the run-time linker can find the right copy for of apps which use an + RPATH to point at %%{_libdir}/libdb-4.1.so -* Mon Mar 24 2003 Erlend Midttun 4.1.25-2em -- Added patch to correct locking. +* Thu Oct 23 2003 Nalin Dahyabhai 4.1.25-13 +- add another section to the ABI note for the TLS libdb so that it's marked as + not needing an executable stack (from Arjan Van de Ven) -* Mon Mar 24 2003 Erlend Midttun 4.1.25-1em -- Rebuilt against glibc 2.3.2. +* Wed Oct 15 2003 Nalin Dahyabhai +- build both with and without support for shared mutex locks, which require NPTL +- make behavior wrt where we put libdb the same for all OSs +- revert changes making tcl optional - nesting %%if tcl and %%ifarch nptl + doesn't work +- fix dangling HREFs in utility docs (pointed to main docs dir, while they're + actually in the -utils docs dir) +- run ldconfig when installing/removing the -utils subpackage, as it contains + shared libraries -* Fri Feb 28 2003 Goetz Bock 4.1.25-0bg -- updated to 4.1.25 -- removed the ugly postfix hack -- not just build, but also install dumper for v1.85 databases +* Wed Oct 15 2003 Nalin Dahyabhai 4.1.25-11 +- fix multiple-inclusion problem of startup files when building shlibs without + the -nostdlib flag -* Sat Feb 01 2003 Tor Hveem 4.0.14-6th -- fixed package Group +* Tue Oct 14 2003 Nalin Dahyabhai +- link shared libraries without -nostdlib, which created an unresolvable dep + on a hidden symbol -* Wed Jan 8 2003 Erlend Midttun 4.0.14-5em -- Fixed package group tkae II. +* Tue Sep 23 2003 Florian La Roche +- allow compiling without tcl dependency -* Mon Dec 9 2002 Erlend Midttun 4.0.14-4em -- Fixed package group. +* Sat Sep 20 2003 Jeff Johnson 4.2.42-0.1 +- update to 4.2.42. +- build in build_unix subdir. +- eliminate --enable-dump185, db_dump185.c no longer compiles for libdb*. +- create db4-tcl sub-pkg to isolate libtcl dependencies. -* Thu Aug 22 2002 Christan H. Toldnes 4.0.14-3ct -- Cleanup -- UGLY!! Hack to make postfix build. FIXME FIXME!! +* Thu Aug 21 2003 Nalin Dahyabhai 4.1.25-9 +- rebuild -* Wed Aug 21 2002 Christan H. Toldnes 4.0.14-2ct -- Massive cleanup. +* Tue Aug 19 2003 Nalin Dahyabhai 4.1.25-8 +- add missing tcl-devel buildrequires (#101814) -* Wed Aug 21 2002 Christan H. Toldnes 4.0.14-1ct -- Modified package to fit db4 +* Tue Jul 15 2003 Joe Orton 4.1.25-7 +- rebuild -* Mon May 6 2002 Gerald Dachs -- enable db_dump185 support again +* Fri Jun 27 2003 Jeff Johnson 4.1.25-6 +- build with libtool-1.5, which can't recognize the .so in libfoo*.so atm. +- whack out libtool predep_objects wonkiness. -* Tue Apr 16 2002 Gerald Dachs -- there is no libdb1 -- disabled db_dump185 support +* Thu Jun 26 2003 Jeff Johnson 4.1.25-5 +- rebuild. -* Mon Feb 04 2002 Erlend Midttun -- Making it work with Glibc 2.2.5 +* Tue Jun 24 2003 Jeff Johnson 4.1.25-4 +- hack out O_DIRECT support in db4 for now. -* Mon Dec 10 2001 Christian H. Toldnes -- Remake to fit TSL +* Tue Jun 24 2003 Nalin Dahyabhai +- replace libtool.ac with current libtool.m4 so that running libtoolize doesn't + cause a mismatch +* Wed Jun 04 2003 Elliot Lee +- rebuilt + +* Wed Jun 4 2003 Nalin Dahyabhai 4.1.25-2 +- change configure to only warn if JNI includes aren't found, assuming that + the C compiler can find them +- remove build requirement on jdkgcj -- gcj is sufficient + +* Mon May 5 2003 Jeff Johnson 4.1.25-1 +- upgrade to 4.1.25, crypto version. +- enable posix mutexes using nptl on all arches. + +* Mon Mar 3 2003 Thoams Woerner 4.0.14-21 +- enabled db4-java for x86_64 + +* Wed Feb 5 2003 Nalin Dahyabhai 4.0.14-20 +- add dynamic libdb-4.0.so link back to %%{_libdir} so that dynamically + linking with -ldb-4.0 will work again + +* Tue Feb 4 2003 Nalin Dahyabhai 4.0.14-19 +- rebuild to use link the shared object with the same libraries we use + for the bundled utils, should pull in libpthread when needed +- move libdb.so from /%%{_lib} to %%{_libdir} where the linker can find it + +* Sun Feb 02 2003 Florian La Roche 4.0.14-18 +- add java for s390x + +* Wed Jan 22 2003 Tim Powers 4.0.14-17 +- rebuilt + +* Wed Nov 20 2002 Florian La Roche 4.0.14-16 +- add java for s390 + +* Tue Oct 8 2002 Nalin Dahyabhai 4.0.14-15 +- add java bits back in for x86 boxes + +* Fri Sep 20 2002 Than Ngo 4.0.14-14.1 +- Added better fix for s390/s390x/x86_64 + +* Thu Sep 05 2002 Arjan van de Ven +- remove java bits for x86-64 + +* Tue Aug 27 2002 Jeff Johnson 4.0.14-14 +- include libdb_tcl-4.1.a library. +- obsolete db1 packages. + +* Tue Aug 13 2002 Nalin Dahyabhai 4.0.14-13 +- include patch to avoid db_recover (#70362) + +* Sat Aug 10 2002 Elliot Lee +- rebuilt with gcc-3.2 (we hope) + +* Tue Jul 23 2002 Nalin Dahyabhai 4.0.14-11 +- own %%{_includedir}/%{name} + +* Tue Jul 23 2002 Tim Powers 4.0.14-10 +- build using gcc-3.2-0.1 + +* Fri Jun 21 2002 Tim Powers +- automated rebuild + +* Wed Jun 12 2002 Bernhard Rosenkraenzer 4.0.14-8 +- Add java bindings +- Fix C++ bindings + +* Thu May 23 2002 Tim Powers +- automated rebuild + +* Thu May 9 2002 Jeff Johnson +- re-enable db.h symlink creation, db_util names, and db[23]-devel obsoletes. +- make sure that -ldb is functional. + +* Thu Feb 21 2002 Jeff Johnson +- avoid db_util name collisions with multiple versions installed. + +* Mon Feb 18 2002 Nalin Dahyabhai 4.0.14-3 +- remove relocatability stuffs +- swallow a local copy of db1 and build db185_dump statically with it, to + remove the build dependency and simplify bootstrapping new arches + +* Mon Jan 27 2002 Nalin Dahyabhai 4.0.14-2 +- have subpackages obsolete their db3 counterparts, because they conflict anyway + +* Tue Jan 8 2002 Jeff Johnson db4-4.0.14-1 +- upgrade to 4.0.14. + * Sun Aug 5 2001 Nalin Dahyabhai - fix dangling docs symlinks - fix dangling doc HREFs (#33328) From svn at tinysofa.org Tue Jul 6 08:53:36 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 6 Jul 2004 18:53:36 +1000 (EST) Subject: [tinysofa-svn] r2948 - tinysofa/releases/1.1 Message-ID: <20040706085336.2C6584E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-06 18:53:35 +1000 (Tue, 06 Jul 2004) New Revision: 2948 Removed: tinysofa/releases/1.1/pwdb/ Log: - remove pwdb From svn at tinysofa.org Tue Jul 6 09:01:06 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 6 Jul 2004 19:01:06 +1000 (EST) Subject: [tinysofa-svn] r2949 - tinysofa/releases/1.1 Message-ID: <20040706090106.ED95F4E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-06 19:01:06 +1000 (Tue, 06 Jul 2004) New Revision: 2949 Added: tinysofa/releases/1.1/libuser/ Log: - copy libuser from snapshot Copied: tinysofa/releases/1.1/libuser (from rev 2948, tinysofa/snapshot/libuser) From svn at tinysofa.org Tue Jul 6 09:01:41 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 6 Jul 2004 19:01:41 +1000 (EST) Subject: [tinysofa-svn] r2950 - in tinysofa/releases/1.1/passwd/current: sources specs Message-ID: <20040706090141.2B66D4E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-06 19:01:40 +1000 (Tue, 06 Jul 2004) New Revision: 2950 Added: tinysofa/releases/1.1/passwd/current/sources/passwd-0.68-8.tar.gz Removed: tinysofa/releases/1.1/passwd/current/sources/passwd-0.68-3-pamonly.patch tinysofa/releases/1.1/passwd/current/sources/passwd-0.68-3.tar.gz tinysofa/releases/1.1/passwd/current/sources/passwd-0.68-selinux.patch tinysofa/releases/1.1/passwd/current/sources/passwd-0.68-sysauth.patch Modified: tinysofa/releases/1.1/passwd/current/specs/passwd.spec Log: - backport passwd to 1.1 Deleted: tinysofa/releases/1.1/passwd/current/sources/passwd-0.68-3-pamonly.patch =================================================================== --- tinysofa/releases/1.1/passwd/current/sources/passwd-0.68-3-pamonly.patch 2004-07-06 09:01:06 UTC (rev 2949) +++ tinysofa/releases/1.1/passwd/current/sources/passwd-0.68-3-pamonly.patch 2004-07-06 09:01:40 UTC (rev 2950) @@ -1,21 +0,0 @@ -diff -Nur passwd-0.68/Makefile passwd-0.68.changed/Makefile ---- passwd-0.68/Makefile 2002-12-10 02:51:12.000000000 +0100 -+++ passwd-0.68.changed/Makefile 2003-04-22 14:33:46.000000000 +0200 -@@ -2,7 +2,7 @@ - # $Id: Makefile,v 1.19 2002/12/10 01:51:12 nalin Exp $ - # - --BACKLIB=libuser -+BACKLIB=pwdb - - ifeq (libuser,$(BACKLIB)) - CFLAGS = $(shell pkg-config --cflags libuser) -@@ -19,7 +19,7 @@ - CC = gcc - DEBUG = -g - CFLAGS += $(RPM_OPT_FLAGS) -Wall -D_GNU_SOURCE $(DEBUG) $(DEFS) --LDFLAGS += -ldl -lpam -lpam_misc -+LDFLAGS += -lpam -ldl -lpam_misc -lnsl - PROGS = passwd chfn chsh - POPT = -lpopt - Deleted: tinysofa/releases/1.1/passwd/current/sources/passwd-0.68-3.tar.gz =================================================================== (Binary files differ) Added: tinysofa/releases/1.1/passwd/current/sources/passwd-0.68-8.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/releases/1.1/passwd/current/sources/passwd-0.68-8.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: tinysofa/releases/1.1/passwd/current/sources/passwd-0.68-selinux.patch =================================================================== --- tinysofa/releases/1.1/passwd/current/sources/passwd-0.68-selinux.patch 2004-07-06 09:01:06 UTC (rev 2949) +++ tinysofa/releases/1.1/passwd/current/sources/passwd-0.68-selinux.patch 2004-07-06 09:01:40 UTC (rev 2950) @@ -1,204 +0,0 @@ -diff -upNr passwd-0.68/Makefile passwd-0.68/Makefile ---- passwd-0.68/Makefile 2002-12-10 01:51:12.000000000 +0000 -+++ passwd-0.68/Makefile 2003-07-28 21:19:07.000000000 +0000 -@@ -1,5 +1,5 @@ - # --# $Id: Makefile,v 1.19 2002/12/10 01:51:12 nalin Exp $ -+# $Id: Makefile,v 1.20 2003/07/28 21:19:07 dwalsh Exp $ - # - - BACKLIB=libuser -@@ -22,6 +22,11 @@ CFLAGS += $(RPM_OPT_FLAGS) -Wall -D_GNU_ - LDFLAGS += -ldl -lpam -lpam_misc - PROGS = passwd chfn chsh - POPT = -lpopt -+ifeq ($(WITH_SELINUX),yes) -+CFLAGS += -DWITH_SELINUX -+LDFLAGS += -lselinux -lattr -+SELINUX_UTILS=selinux_utils.o -+endif - - PROJECT = passwd - -@@ -38,7 +43,7 @@ all: date.h $(PROGS) pwdstat - %.o : %.c Makefile - $(CC) $(CFLAGS) -c -o $@ $< - --passwd: passwd.o libuser.o pwdb.o -+passwd: passwd.o libuser.o pwdb.o ${SELINUX_UTILS} - $(CC) -o $@ $^ $(LDFLAGS) $(POPT) - - chfn: chfn.o libuser.o pwdb.o version.o -diff -upNr passwd-0.68/passwd.c passwd-0.68/passwd.c ---- passwd-0.68/passwd.c 2002-12-09 21:34:26.000000000 +0000 -+++ passwd-0.68/passwd.c 2003-07-28 21:12:16.000000000 +0000 -@@ -35,7 +35,7 @@ - - /* Written by Cristian Gafton */ - --#ident "$Id: passwd.c,v 1.14 2002/12/09 21:34:26 nalin Exp $" -+#ident "$Id: passwd.c,v 1.15 2003/07/28 21:12:16 dwalsh Exp $" - - #include - -@@ -51,6 +51,13 @@ - #include - #include "pwdb.h" - -+#ifdef WITH_SELINUX -+#include -+#include -+#include -+#include "selinux_utils.h" -+#endif -+ - #define _(String) String - #define N_(String) String - -@@ -313,6 +320,23 @@ main(int argc, const char **argv) - progname = basename(argv[0]); - parse_args(argc, argv, &min, &max, &warn, &inact); - -+#ifdef WITH_SELINUX -+ if (is_selinux_enabled()) { -+ if ((getuid() == 0) && -+ (checkAccess((char *) username,PASSWD__PASSWD)!=0)) { -+ security_context_t user_context; -+ if (getprevcon(&user_context) < 0) -+ user_context=(security_context_t) strdup(_("Unknown user context")); -+ syslog(LOG_ALERT, _("%s is not authorized to change the password of %s\n"), -+ user_context, username); -+ fprintf(stderr, _("%s: %s is not authorized to change the password of %s\n"), -+ progname, user_context, username); -+ freecon(user_context); -+ exit(1); -+ } -+ } -+#endif -+ - /* Handle account locking request. */ - if (passwd_flags & PASSWD_LOCK) { - printf(_("Locking password for user %s.\n"), username); -diff -upNr passwd-0.68/passwd.spec passwd-0.68/passwd.spec ---- passwd-0.68/passwd.spec 2003-02-13 21:18:28.000000000 +0000 -+++ passwd-0.68/passwd.spec 2003-09-05 14:59:47.000000000 +0000 -@@ -1,7 +1,10 @@ -+%if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} -+%define WITH_SELINUX 1 -+%endif - Summary: The passwd utility for setting/changing passwords using PAM. - Name: passwd - Version: 0.68 --Release: 3 -+Release: 5.sel - License: BSD - Group: System Environment/Base - Source: passwd-%{version}-%{release}.tar.gz -@@ -20,7 +23,10 @@ To use passwd, you should have PAM insta - %setup -q - - %build --make DEBUG= RPM_OPT_FLAGS="$RPM_OPT_FLAGS" -+make DEBUG= RPM_OPT_FLAGS="$RPM_OPT_FLAGS" \ -+%if %{WITH_SELINUX} -+ WITH_SELINUX=yes -+%endif - - %install - make install DESTDIR=$RPM_BUILD_ROOT bindir=%{_bindir} mandir=%{_mandir} -@@ -41,6 +47,12 @@ rm -rf $RPM_BUILD_ROOT - %{_mandir}/man1/passwd.1* - - %changelog -+* Fri Sep 5 2003 Dan Walsh 0.68-5.sel -+- Add SELinux support -+ -+* Mon Jul 28 2003 Dan Walsh 0.68-4 -+- Add SELinux support -+ - * Thu Feb 13 2003 Nalin Dahyabhai 0.68-3 - - add aging adjustment flags to passwd(1)'s synopsis, were just in the - reference section before -diff -upNr passwd-0.68/selinux_utils.c passwd-0.68/selinux_utils.c ---- passwd-0.68/selinux_utils.c 1970-01-01 00:00:00.000000000 +0000 -+++ passwd-0.68/selinux_utils.c 2003-07-29 14:40:40.000000000 +0000 -@@ -0,0 +1,74 @@ -+/* -+ * Copyright Red Hat, Inc., 2003. -+ * -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions -+ * are met: -+ * 1. Redistributions of source code must retain the above copyright -+ * notice, and the entire permission notice in its entirety, -+ * including the disclaimer of warranties. -+ * 2. Redistributions in binary form must reproduce the above copyright -+ * notice, this list of conditions and the following disclaimer in the -+ * documentation and/or other materials provided with the distribution. -+ * 3. The name of the author may not be used to endorse or promote -+ * products derived from this software without specific prior -+ * written permission. -+ * -+ * ALTERNATIVELY, this product may be distributed under the terms of -+ * the GNU Public License, in which case the provisions of the GPL are -+ * required INSTEAD OF the above restrictions. (This clause is -+ * necessary due to a potential bad interaction between the GPL and -+ * the restrictions contained in a BSD-style copyright.) -+ * -+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED -+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -+ * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, -+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -+ * OF THE POSSIBILITY OF SUCH DAMAGE. -+ */ -+ -+/* Written by Daniel Walsh */ -+ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include "selinux_utils.h" -+ -+int checkAccess(char *chuser, int access) { -+ int status=-1; -+ security_context_t user_context; -+ char *user=NULL; -+ if( getprevcon(&user_context)==0 ) { -+ context_t c=context_new(user_context); -+ user=context_user_get(c); -+ if (strcmp(chuser, user) == 0) { -+ status=0; -+ } else { -+ struct av_decision avd; -+ int retval = security_compute_av(user_context, -+ user_context, -+ SECCLASS_PASSWD, -+ access, -+ &avd); -+ -+ if ((retval == 0) && -+ ((access & avd.allowed) == access)) { -+ status=0; -+ } -+ } -+ context_free(c); -+ freecon(user_context); -+ } -+ return status; -+} -+ -diff -upNr passwd-0.68/selinux_utils.h passwd-0.68/selinux_utils.h ---- passwd-0.68/selinux_utils.h 1970-01-01 00:00:00.000000000 +0000 -+++ passwd-0.68/selinux_utils.h 2003-07-29 14:40:40.000000000 +0000 -@@ -0,0 +1 @@ -+extern int checkAccess(char *name,int access); Deleted: tinysofa/releases/1.1/passwd/current/sources/passwd-0.68-sysauth.patch =================================================================== --- tinysofa/releases/1.1/passwd/current/sources/passwd-0.68-sysauth.patch 2004-07-06 09:01:06 UTC (rev 2949) +++ tinysofa/releases/1.1/passwd/current/sources/passwd-0.68-sysauth.patch 2004-07-06 09:01:40 UTC (rev 2950) @@ -1,24 +0,0 @@ -diff -Nru passwd-0.68.orig/passwd.c passwd-0.68/passwd.c ---- passwd-0.68.orig/passwd.c 2002-12-09 22:34:26.000000000 +0100 -+++ passwd-0.68/passwd.c 2003-06-03 10:39:13.000000000 +0200 -@@ -375,7 +375,7 @@ - } - - /* Start up PAM. */ -- retval = pam_start("passwd", username, &conv, &pamh); -+ retval = pam_start("system-auth", username, &conv, &pamh); - - #ifdef HAVE_PAM_FAIL_DELAY - /* We have to pause on failure, so tell libpam the minimum amount -diff -Nru passwd-0.68.orig/pwdstat.c passwd-0.68/pwdstat.c ---- passwd-0.68.orig/pwdstat.c 2002-12-09 22:34:26.000000000 +0100 -+++ passwd-0.68/pwdstat.c 2003-06-03 10:39:19.000000000 +0200 -@@ -85,7 +85,7 @@ - assert(username != NULL); - assert(password != NULL); - -- retval = pam_start("passwd", username, &conv, &pamh); -+ retval = pam_start("system-auth", username, &conv, &pamh); - while (retval == PAM_SUCCESS) { /* use loop to avoid goto... */ - - retval = pam_chauthtok(pamh, 0); Modified: tinysofa/releases/1.1/passwd/current/specs/passwd.spec =================================================================== --- tinysofa/releases/1.1/passwd/current/specs/passwd.spec 2004-07-06 09:01:06 UTC (rev 2949) +++ tinysofa/releases/1.1/passwd/current/specs/passwd.spec 2004-07-06 09:01:40 UTC (rev 2950) @@ -1,19 +1,13 @@ Summary: The passwd utility for setting/changing passwords using PAM. Name: passwd Version: 0.68 -Release: 10ts +Release: 1jh License: BSD Group: main -Source: passwd-%{version}-3.tar.gz -Patch0: passwd-0.68-3-pamonly.patch -Patch1: passwd-0.68-sysauth.patch -Patch2: passwd-0.68-selinux.patch -BuildRoot: %{_tmppath}/%{name}-root -Requires: pam >= 0.59 -Requires: pwdb -Requires: /etc/pam.d/system-auth -Buildprereq: pam-devel -BuildRequires: pwdb-devel +Source: passwd-%{version}-8.tar.gz +Buildroot: %{_tmppath}/%{name}-%{version}-root +Requires: pam >= 0.59, /etc/pam.d/system-auth +BuildPrereq: glib2-devel, libuser-devel, pam-devel %description The passwd package contains a system utility (passwd) which sets @@ -22,61 +16,58 @@ To use passwd, you should have PAM installed on your system. + %prep %setup -q -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 + %build +make DEBUG= RPM_OPT_FLAGS="$RPM_OPT_FLAGS" \ %if %{with_selinux} -make DEBUG= RPM_OPT_FLAGS="$RPM_OPT_FLAGS" WITH_SELINUX=yes -%else -make DEBUG= RPM_OPT_FLAGS="$RPM_OPT_FLAGS" + WITH_SELINUX=yes %endif + %install make install DESTDIR=$RPM_BUILD_ROOT bindir=%{_bindir} mandir=%{_mandir} strip $RPM_BUILD_ROOT%{_bindir}/passwd +install -m 755 -d $RPM_BUILD_ROOT/etc/pam.d/ +install -m 644 passwd.pamd $RPM_BUILD_ROOT/etc/pam.d/passwd rm -f $RPM_BUILD_ROOT/%{_bindir}/{chfn,chsh} rm -f $RPM_BUILD_ROOT/%{_mandir}/man1/{chfn,chsh}.* + %clean -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != "/" ] && rm -rf "$RPM_BUILD_ROOT" +%clean_buildroot + %files %defattr(-,root,root) +%config /etc/pam.d/passwd %attr(4511,root,root) %{_bindir}/passwd %{_mandir}/man1/passwd.1* + %changelog -* Wed May 19 2004 tsintegrate 0.68-10ts -- current (0.68-9ts) integrated as 0.68-10ts for release 1.0-U1 +* Tue Jun 15 2004 Elliot Lee +- rebuilt -* Wed May 12 2004 Omar Kilani 0.68-9ts -- Add BuildRequires pwdb-devel. -- Add Requires pwdb. +* Wed Feb 4 2004 Dan Walsh 0.68-8 +- add check for enforcing mode -* Tue Feb 3 2004 Oystein Viggen 0.68-6tr -- Add selinux patch and conditional enabler on make invocation +* Mon Jan 26 2004 Dan Walsh 0.68-7 +- fix is_selinux_enabled -* Tue Dec 9 2003 Chr. Toldnes 0.68-5tr -- Big rebuild +* Fri Sep 5 2003 Dan Walsh 0.68-6 +- turn off selinux -* Wed Jun 18 2003 Erlend Midttun 0.68-4tr -- Big rebuild +* Fri Sep 5 2003 Dan Walsh 0.68-5.sel +- Add SELinux support -* Tue Jun 3 2003 Erlend Midttun 0.68-3em -- Now use system-auth instead of passwd pam module. +* Mon Jul 28 2003 Dan Walsh 0.68-4 +- Add SELinux support -* Wed Apr 23 2003 Christian H. Toldnes 0.68-2ct -- Added usable pam module, ripped from TSL 1.2 :) - -* Tue Apr 22 2003 Christian H. Toldnes 0.68-1ct -- Initial release in solo src.rpm for TSL 2.0 -- Patched to only use pam. - * Thu Feb 13 2003 Nalin Dahyabhai 0.68-3 - add aging adjustment flags to passwd(1)'s synopsis, were just in the reference section before @@ -149,4 +140,4 @@ - fix for gzipped man pages * Sat Apr 10 1999 Cristian Gafton -- first build from the new source code base. \ No newline at end of file +- first build from the new source code base. From svn at tinysofa.org Tue Jul 6 09:18:55 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 6 Jul 2004 19:18:55 +1000 (EST) Subject: [tinysofa-svn] r2951 - in tinysofa/releases/1.1/libuser/current: sources specs Message-ID: <20040706091855.85C5A4E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-06 19:18:52 +1000 (Tue, 06 Jul 2004) New Revision: 2951 Added: tinysofa/releases/1.1/libuser/current/sources/libuser-0.51.7-docs.patch Modified: tinysofa/releases/1.1/libuser/current/specs/libuser.spec Log: - port to 1.1 Added: tinysofa/releases/1.1/libuser/current/sources/libuser-0.51.7-docs.patch =================================================================== --- tinysofa/releases/1.1/libuser/current/sources/libuser-0.51.7-docs.patch 2004-07-06 09:01:40 UTC (rev 2950) +++ tinysofa/releases/1.1/libuser/current/sources/libuser-0.51.7-docs.patch 2004-07-06 09:18:52 UTC (rev 2951) @@ -0,0 +1,15 @@ +--- libuser-0.51.7/docs/sgml/Makefile.in.orig 2004-07-06 12:10:38.000000000 +0300 ++++ libuser-0.51.7/docs/sgml/Makefile.in 2004-07-06 12:11:55.000000000 +0300 +@@ -250,10 +250,10 @@ + all: libuser.txt libuser.html + + libuser.txt: libuser.sgml +- sgml2txt $(srcdir)/libuser.sgml ++ -sgml2txt $(srcdir)/libuser.sgml + + libuser.html: libuser.sgml +- sgml2html $(srcdir)/libuser.sgml ++ -sgml2html $(srcdir)/libuser.sgml + + distclean clean: + $(RM) *.html *.txt Modified: tinysofa/releases/1.1/libuser/current/specs/libuser.spec =================================================================== --- tinysofa/releases/1.1/libuser/current/specs/libuser.spec 2004-07-06 09:01:40 UTC (rev 2950) +++ tinysofa/releases/1.1/libuser/current/specs/libuser.spec 2004-07-06 09:18:52 UTC (rev 2951) @@ -1,19 +1,16 @@ -%if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} -%define WITH_SELINUX 1 -%endif %define python 2.3 Name: libuser Version: 0.51.7 -Release: 7.1.1ts -Group: System Environment/Base +Release: 1jh +Group: main License: LGPL Source: libuser-%{version}.tar.gz Patch0: libuser-selinux.patch Patch1: libuser-0.51.7.sasl2.patch +Patch2: libuser-0.51.7-docs.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildPrereq: pam-devel, popt, python-devel -BuildPrereq: linuxdoc-tools BuildPrereq: cyrus-sasl-devel, openldap-devel Summary: A user and group account administration library. @@ -26,7 +23,7 @@ suite are included. %package devel -Group: Development/Libraries +Group: development Summary: Files needed for developing applications which use libuser. Requires: %{name} = %{version}-%{release} @@ -36,12 +33,13 @@ %prep %setup -q -%if %{WITH_SELINUX} +%if %{with_selinux} #SELinux %patch0 -p1 -b .selinux %endif %patch1 -p1 -b .sasl2 +%patch2 -p1 -b .docs %build @@ -58,11 +56,10 @@ make %clean -rm -fr $RPM_BUILD_ROOT +%clean_buildroot %install -rm -fr $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT +%makeinstall_std LD_LIBRARY_PATH=$RPM_BUILD_ROOT/%{_libdir}:${LD_LIBRARY_PATH} export LD_LIBRARY_PATH From svn at tinysofa.org Tue Jul 6 09:22:41 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 6 Jul 2004 19:22:41 +1000 (EST) Subject: [tinysofa-svn] r2952 - tinysofa/releases/1.1/passwd/current/specs Message-ID: <20040706092241.BDB2E4E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-06 19:22:40 +1000 (Tue, 06 Jul 2004) New Revision: 2952 Modified: tinysofa/releases/1.1/passwd/current/specs/passwd.spec Log: - fix buildrequires Modified: tinysofa/releases/1.1/passwd/current/specs/passwd.spec =================================================================== --- tinysofa/releases/1.1/passwd/current/specs/passwd.spec 2004-07-06 09:18:52 UTC (rev 2951) +++ tinysofa/releases/1.1/passwd/current/specs/passwd.spec 2004-07-06 09:22:40 UTC (rev 2952) @@ -7,7 +7,7 @@ Source: passwd-%{version}-8.tar.gz Buildroot: %{_tmppath}/%{name}-%{version}-root Requires: pam >= 0.59, /etc/pam.d/system-auth -BuildPrereq: glib2-devel, libuser-devel, pam-devel +BuildPrereq: glib-devel, libuser-devel, pam-devel %description The passwd package contains a system utility (passwd) which sets From svn at tinysofa.org Tue Jul 6 09:26:35 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 6 Jul 2004 19:26:35 +1000 (EST) Subject: [tinysofa-svn] r2953 - tinysofa/releases/1.1/squid/current/sources Message-ID: <20040706092635.072394E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-06 19:26:34 +1000 (Tue, 06 Jul 2004) New Revision: 2953 Removed: tinysofa/releases/1.1/squid/current/sources/perl-requires-squid.sh Log: - remove unused source file Deleted: tinysofa/releases/1.1/squid/current/sources/perl-requires-squid.sh =================================================================== --- tinysofa/releases/1.1/squid/current/sources/perl-requires-squid.sh 2004-07-06 09:22:40 UTC (rev 2952) +++ tinysofa/releases/1.1/squid/current/sources/perl-requires-squid.sh 2004-07-06 09:26:34 UTC (rev 2953) @@ -1,3 +0,0 @@ -#!/bin/sh - -/usr/lib/rpm/perl.req $* | grep -v "Authen::Smb" From svn at tinysofa.org Tue Jul 6 09:33:07 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 6 Jul 2004 19:33:07 +1000 (EST) Subject: [tinysofa-svn] r2954 - in tinysofa/releases/1.1/tcsh/current: sources specs Message-ID: <20040706093307.C22A54E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-06 19:33:07 +1000 (Tue, 06 Jul 2004) New Revision: 2954 Added: tinysofa/releases/1.1/tcsh/current/sources/tcsh-6.08.00-pathmax.patch tinysofa/releases/1.1/tcsh/current/sources/tcsh-6.08.00-security.patch tinysofa/releases/1.1/tcsh/current/sources/tcsh-6.09.00-locale.patch tinysofa/releases/1.1/tcsh/current/sources/tcsh-6.09.00-strcoll.patch tinysofa/releases/1.1/tcsh/current/sources/tcsh-6.09.00-termios.patch tinysofa/releases/1.1/tcsh/current/sources/tcsh-6.10.00-dspmbyte.patch tinysofa/releases/1.1/tcsh/current/sources/tcsh-6.10.00-glibc_compat.patch tinysofa/releases/1.1/tcsh/current/sources/tcsh-6.10.00-utmp.patch tinysofa/releases/1.1/tcsh/current/sources/tcsh-6.11.00-termcap.patch tinysofa/releases/1.1/tcsh/current/sources/tcsh-6.12.00-setpgrp.patch Removed: tinysofa/releases/1.1/tcsh/current/sources/tcsh-6.10-pathmax.patch tinysofa/releases/1.1/tcsh/current/sources/tcsh-6.10-termios.patch Modified: tinysofa/releases/1.1/tcsh/current/specs/tcsh.spec Log: - backport tcsh Added: tinysofa/releases/1.1/tcsh/current/sources/tcsh-6.08.00-pathmax.patch =================================================================== --- tinysofa/releases/1.1/tcsh/current/sources/tcsh-6.08.00-pathmax.patch 2004-07-06 09:26:34 UTC (rev 2953) +++ tinysofa/releases/1.1/tcsh/current/sources/tcsh-6.08.00-pathmax.patch 2004-07-06 09:33:07 UTC (rev 2954) @@ -0,0 +1,25 @@ +--- tcsh-6.08.00/tw.h~ Thu Oct 2 12:36:35 1997 ++++ tcsh-6.08.00/tw.h Wed Feb 24 21:36:01 1999 +@@ -77,7 +77,7 @@ + #endif + #define ON 1 + #define OFF 0 +-#define FILSIZ 512 /* Max reasonable file name length */ ++#define FILSIZ MAXPATHLEN /* Max reasonable file name length */ + #define ESC CTL_ESC('\033') + #define equal(a, b) (strcmp(a, b) == 0) + +--- tcsh-6.08.00/sh.h~ Wed Feb 24 21:32:40 1999 ++++ tcsh-6.08.00/sh.h Wed Feb 24 21:42:48 1999 +@@ -507,6 +507,11 @@ + * April, 1980 + */ + ++#if !defined(MAXNAMLEN) && defined(PATH_MAX) ++# error "Sucker" ++# define MAXNAMLEN PATH_MAX ++#endif /* MAXNAMLEN */ ++ + #if !defined(MAXNAMLEN) && defined(_D_NAME_MAX) + # define MAXNAMLEN _D_NAME_MAX + #endif /* MAXNAMLEN */ Added: tinysofa/releases/1.1/tcsh/current/sources/tcsh-6.08.00-security.patch =================================================================== --- tinysofa/releases/1.1/tcsh/current/sources/tcsh-6.08.00-security.patch 2004-07-06 09:26:34 UTC (rev 2953) +++ tinysofa/releases/1.1/tcsh/current/sources/tcsh-6.08.00-security.patch 2004-07-06 09:33:07 UTC (rev 2954) @@ -0,0 +1,21 @@ +--- tcsh-6.08.00/sh.dir.c.security Sat Sep 26 08:28:29 1998 ++++ tcsh-6.08.00/sh.dir.c Wed Feb 24 22:16:14 1999 +@@ -35,6 +35,7 @@ + * SUCH DAMAGE. + */ + #include "sh.h" ++#include "tw.h" + + RCSID("$Id: sh.dir.c,v 3.51 1998/09/26 12:28:29 christos Exp $") + +@@ -1268,7 +1269,9 @@ + return (0); + } + } +- (void) Strcpy(s, dp->di_name); ++ ++ (void) Strncpy(s, dp->di_name, FILSIZ); ++ s[FILSIZ-1]=0; + return (1); + } + Added: tinysofa/releases/1.1/tcsh/current/sources/tcsh-6.09.00-locale.patch =================================================================== --- tinysofa/releases/1.1/tcsh/current/sources/tcsh-6.09.00-locale.patch 2004-07-06 09:26:34 UTC (rev 2953) +++ tinysofa/releases/1.1/tcsh/current/sources/tcsh-6.09.00-locale.patch 2004-07-06 09:33:07 UTC (rev 2954) @@ -0,0 +1,19 @@ +--- tcsh-6.09.00/config_f.h.locale Thu Jun 15 10:19:21 2000 ++++ tcsh-6.09.00/config_f.h Thu Jun 15 10:20:49 2000 +@@ -117,14 +117,14 @@ + * be used with SHORT_STRINGS + * + */ +-#undef KANJI ++#define KANJI + + /* + * DSPMBYTE add variable "dspmbyte" and display multi-byte string at + * only output, when "dspmbyte" is set. Should be used with + * KANJI + */ +-#undef DSPMBYTE ++#define DSPMBYTE + + /* + * MBYTEDEBUG when "dspmbyte" is changed, set multi-byte checktable to Added: tinysofa/releases/1.1/tcsh/current/sources/tcsh-6.09.00-strcoll.patch =================================================================== --- tinysofa/releases/1.1/tcsh/current/sources/tcsh-6.09.00-strcoll.patch 2004-07-06 09:26:34 UTC (rev 2953) +++ tinysofa/releases/1.1/tcsh/current/sources/tcsh-6.09.00-strcoll.patch 2004-07-06 09:33:07 UTC (rev 2954) @@ -0,0 +1,11 @@ +--- tcsh-6.09.00/glob.c.strcoll Mon Jan 10 15:45:11 2000 ++++ tcsh-6.09.00/glob.c Mon Jan 10 15:46:18 2000 +@@ -158,6 +158,8 @@ + + if (c1 == c2) + return (0); ++ if (islower(c1) && isupper(c2)) ++ return (1); + s1[0] = c1; + s2[0] = c2; + s1[1] = s2[1] = '\0'; Added: tinysofa/releases/1.1/tcsh/current/sources/tcsh-6.09.00-termios.patch =================================================================== --- tinysofa/releases/1.1/tcsh/current/sources/tcsh-6.09.00-termios.patch 2004-07-06 09:26:34 UTC (rev 2953) +++ tinysofa/releases/1.1/tcsh/current/sources/tcsh-6.09.00-termios.patch 2004-07-06 09:33:07 UTC (rev 2954) @@ -0,0 +1,33 @@ +--- tcsh-6.09.00/sh.h.termios Sun Oct 25 10:10:16 1998 ++++ tcsh-6.09.00/sh.h Mon Jan 10 15:38:40 2000 +@@ -204,6 +204,8 @@ + # define DEV_DEV_COMPARE(x,y) ((x) == (y)) + #endif /* DEV_DEV_COMPARE */ + ++#define POSIX ++ + #ifdef _SEQUENT_ + # include + #endif /* _SEQUENT_ */ +@@ -249,12 +251,10 @@ + # else + # include + # endif /* _UWIN */ +-# if SYSVREL > 3 + # undef TIOCGLTC /* we don't need those, since POSIX has them */ + # undef TIOCSLTC + # undef CSWTCH + # define CSWTCH _POSIX_VDISABLE /* So job control works */ +-# endif /* SYSVREL > 3 */ + # endif /* POSIX */ + #endif /* WINNT */ + +@@ -312,6 +312,8 @@ + #if !((defined(SUNOS4) || defined(_MINIX) /* || defined(DECOSF1) */) && defined(TERMIO)) + # if !defined(COHERENT) && !defined(_VMS_POSIX) && !defined(WINNT) + # include ++# undef TIOCGLTC /* we don't need those, since POSIX has them */ ++# undef TIOCSLTC + # endif + #endif + Deleted: tinysofa/releases/1.1/tcsh/current/sources/tcsh-6.10-pathmax.patch =================================================================== --- tinysofa/releases/1.1/tcsh/current/sources/tcsh-6.10-pathmax.patch 2004-07-06 09:26:34 UTC (rev 2953) +++ tinysofa/releases/1.1/tcsh/current/sources/tcsh-6.10-pathmax.patch 2004-07-06 09:33:07 UTC (rev 2954) @@ -1,27 +0,0 @@ -diff -Nur tcsh-6.10.00.orig/sh.h tcsh-6.10.00/sh.h ---- tcsh-6.10.00.orig/sh.h Sun Nov 19 21:50:43 2000 -+++ tcsh-6.10.00/sh.h Tue Mar 13 15:19:10 2001 -@@ -528,6 +528,11 @@ - * April, 1980 - */ - -+#if !defined(MAXNAMLEN) && defined(PATH_MAX) -+# error "Sucker" -+# define MAXNAMLEN PATH_MAX -+#endif /* MAXNAMLEN */ -+ - #if !defined(MAXNAMLEN) && defined(_D_NAME_MAX) - # define MAXNAMLEN _D_NAME_MAX - #endif /* MAXNAMLEN */ -diff -Nur tcsh-6.10.00.orig/tw.h tcsh-6.10.00/tw.h ---- tcsh-6.10.00.orig/tw.h Tue Jul 4 21:45:02 2000 -+++ tcsh-6.10.00/tw.h Tue Mar 13 15:18:39 2001 -@@ -77,7 +77,7 @@ - #endif - #define ON 1 - #define OFF 0 --#define FILSIZ BUFSIZE /* Max reasonable file name length */ -+#define FILSIZ MAXPATHLEN /* Max reasonable file name length */ - #define ESC CTL_ESC('\033') - #define equal(a, b) (strcmp(a, b) == 0) - Deleted: tinysofa/releases/1.1/tcsh/current/sources/tcsh-6.10-termios.patch =================================================================== --- tinysofa/releases/1.1/tcsh/current/sources/tcsh-6.10-termios.patch 2004-07-06 09:26:34 UTC (rev 2953) +++ tinysofa/releases/1.1/tcsh/current/sources/tcsh-6.10-termios.patch 2004-07-06 09:33:07 UTC (rev 2954) @@ -1,34 +0,0 @@ -diff -Nur tcsh-6.10.00.orig/sh.h tcsh-6.10.00/sh.h ---- tcsh-6.10.00.orig/sh.h Sun Nov 19 21:50:43 2000 -+++ tcsh-6.10.00/sh.h Tue Mar 13 15:00:36 2001 -@@ -204,6 +204,8 @@ - # define DEV_DEV_COMPARE(x,y) ((x) == (y)) - #endif /* DEV_DEV_COMPARE */ - -+#define POSIX -+ - #ifdef _SEQUENT_ - # include - #endif /* _SEQUENT_ */ -@@ -249,12 +251,10 @@ - # else - # include - # endif /* _UWIN */ --# if SYSVREL > 3 - # undef TIOCGLTC /* we don't need those, since POSIX has them */ - # undef TIOCSLTC - # undef CSWTCH - # define CSWTCH _POSIX_VDISABLE /* So job control works */ --# endif /* SYSVREL > 3 */ - # endif /* POSIX */ - #endif /* WINNT_NATIVE */ - -@@ -312,6 +312,8 @@ - #if !((defined(SUNOS4) || defined(_MINIX) /* || defined(DECOSF1) */) && defined(TERMIO)) - # if !defined(COHERENT) && !defined(_VMS_POSIX) && !defined(WINNT_NATIVE) - # include -+# undef TIOCGLTC /* we don't need those, since POSIX has them */ -+# undef TIOCSLTC - # endif - #endif - Added: tinysofa/releases/1.1/tcsh/current/sources/tcsh-6.10.00-dspmbyte.patch =================================================================== --- tinysofa/releases/1.1/tcsh/current/sources/tcsh-6.10.00-dspmbyte.patch 2004-07-06 09:26:34 UTC (rev 2953) +++ tinysofa/releases/1.1/tcsh/current/sources/tcsh-6.10.00-dspmbyte.patch 2004-07-06 09:33:07 UTC (rev 2954) @@ -0,0 +1,21 @@ +diff -ruN tcsh-6.10.00.orig/sh.set.c tcsh-6.10.00/sh.set.c +--- tcsh-6.10.00.orig/sh.set.c Wed Mar 28 16:44:53 2001 ++++ tcsh-6.10.00/sh.set.c Wed Mar 28 16:53:23 2001 +@@ -41,6 +41,8 @@ + #include "ed.h" + #include "tw.h" + ++#include ++ + extern Char HistLit; + extern bool GotTermCaps; + +@@ -1211,7 +1213,7 @@ + return; + + for (i = 0; dspmt[i].n; i++) { +- if (eq(pcp, dspmt[i].n)) { ++ if (strncasecmp (pcp, dspmt[i].n, strlen (dspmt[i].n))) { + set(CHECK_MBYTEVAR, Strsave(dspmt[i].v), VAR_READWRITE); + update_dspmbyte_vars(); + break; Added: tinysofa/releases/1.1/tcsh/current/sources/tcsh-6.10.00-glibc_compat.patch =================================================================== --- tinysofa/releases/1.1/tcsh/current/sources/tcsh-6.10.00-glibc_compat.patch 2004-07-06 09:26:34 UTC (rev 2953) +++ tinysofa/releases/1.1/tcsh/current/sources/tcsh-6.10.00-glibc_compat.patch 2004-07-06 09:33:07 UTC (rev 2954) @@ -0,0 +1,11 @@ +--- tcsh-6.10.00/sh.h Sun Nov 19 15:50:43 2000 ++++ tcsh-6.10.00/sh.h.new Tue Feb 6 15:11:33 2001 +@@ -208,7 +208,7 @@ + # include + #endif /* _SEQUENT_ */ + #if (defined(POSIX) || SYSVREL > 0) && !defined(WINNT_NATIVE) +-# include ++# include + #endif /* (POSIX || SYSVREL > 0) && !WINNT_NATIVE */ + + #ifdef NLS Added: tinysofa/releases/1.1/tcsh/current/sources/tcsh-6.10.00-utmp.patch =================================================================== --- tinysofa/releases/1.1/tcsh/current/sources/tcsh-6.10.00-utmp.patch 2004-07-06 09:26:34 UTC (rev 2953) +++ tinysofa/releases/1.1/tcsh/current/sources/tcsh-6.10.00-utmp.patch 2004-07-06 09:33:07 UTC (rev 2954) @@ -0,0 +1,61 @@ +Use libc's built-in getutXXX() functions for manipulating the file. + +--- tcsh-6.10.00/tc.who.c.utmp Sat Nov 11 21:18:07 2000 ++++ tcsh-6.10.00/tc.who.c Thu Nov 30 15:03:23 2000 +@@ -167,12 +167,13 @@ + watch_login(force) + int force; + { +- int utmpfd, comp = -1, alldone; ++ int comp = -1, alldone; + int firsttime = stlast == 1; + #ifdef BSDSIGS + sigmask_t omask; + #endif /* BSDSIGS */ + struct utmp utmp; ++ struct utmp *uptr; + struct who *wp, *wpnew; + struct varent *v; + Char **vp = NULL; +@@ -265,18 +266,9 @@ + return; + } + stlast = sta.st_mtime; +- if ((utmpfd = open(_PATH_UTMP, O_RDONLY)) < 0) { +- if (!force) +- xprintf(CGETS(26, 2, +- "%s cannot be opened. Please \"unset watch\".\n"), +- _PATH_UTMP); +-# ifdef BSDSIGS +- (void) sigsetmask(omask); +-# else +- (void) sigrelse(SIGINT); +-# endif +- return; +- } ++ ++ utmpname( _PATH_UTMP ); ++ setutent(); + + /* + * xterm clears the entire utmp entry - mark everyone on the status list +@@ -291,7 +283,9 @@ + * Read in the utmp file, sort the entries, and update existing entries or + * add new entries to the status list. + */ +- while (read(utmpfd, (char *) &utmp, sizeof utmp) == sizeof utmp) { ++ ++ while ((uptr = getutent())) { ++ memcpy(&utmp, uptr, sizeof(utmp)); + + # ifdef DEAD_PROCESS + # ifndef IRIS4D +@@ -387,7 +381,7 @@ + wp->who_prev = wpnew; /* linked in now */ + } + } +- (void) close(utmpfd); ++ endutent(); + # if defined(UTHOST) && defined(_SEQUENT_) + endutent(); + # endif Added: tinysofa/releases/1.1/tcsh/current/sources/tcsh-6.11.00-termcap.patch =================================================================== --- tinysofa/releases/1.1/tcsh/current/sources/tcsh-6.11.00-termcap.patch 2004-07-06 09:26:34 UTC (rev 2953) +++ tinysofa/releases/1.1/tcsh/current/sources/tcsh-6.11.00-termcap.patch 2004-07-06 09:33:07 UTC (rev 2954) @@ -0,0 +1,12 @@ +Prefer libtermcap to libncurses for the shell. +--- tcsh-6.11.00/configure.in 2002-06-05 10:50:07.000000000 -0400 ++++ tcsh-6.11.00/configure.in 2002-06-05 10:50:03.000000000 -0400 +@@ -253,7 +253,7 @@ + esac + + AC_SEARCH_LIBS(crypt, crypt) +-AC_SEARCH_LIBS(tgetent, termlib curses termcap) ++AC_SEARCH_LIBS(tgetent, termlib termcap curses) + AC_SEARCH_LIBS(gethostbyname, nsl) + AC_SEARCH_LIBS(connect, socket) + Added: tinysofa/releases/1.1/tcsh/current/sources/tcsh-6.12.00-setpgrp.patch =================================================================== --- tinysofa/releases/1.1/tcsh/current/sources/tcsh-6.12.00-setpgrp.patch 2004-07-06 09:26:34 UTC (rev 2953) +++ tinysofa/releases/1.1/tcsh/current/sources/tcsh-6.12.00-setpgrp.patch 2004-07-06 09:33:07 UTC (rev 2954) @@ -0,0 +1,14 @@ +Don't include our own declaration of setpgrp if the system defines prototypes +for SysV functions (like setpgrp()). Not sure if this is the Right fix or not. +--- tcsh-6.12.00/sh.h 2004-02-10 11:35:44.000000000 -0500 ++++ tcsh-6.12.00/sh.h 2004-02-10 11:35:40.000000000 -0500 +@@ -474,7 +474,9 @@ + extern pid_t getpgrp __P((void)); + # endif /* BSD || SUNOS4 || IRISD || DGUX */ + # endif /* POSIX */ ++#ifndef _SVID_SOURCE + extern pid_t setpgrp __P((pid_t, pid_t)); ++#endif + #endif /* !WINNT_NATIVE */ + + typedef sigret_t (*signalfun_t) __P((int)); Modified: tinysofa/releases/1.1/tcsh/current/specs/tcsh.spec =================================================================== --- tinysofa/releases/1.1/tcsh/current/specs/tcsh.spec 2004-07-06 09:26:34 UTC (rev 2953) +++ tinysofa/releases/1.1/tcsh/current/specs/tcsh.spec 2004-07-06 09:33:07 UTC (rev 2954) @@ -1,23 +1,27 @@ -#ugly hack -%define _noVersionedDependencies 1 +%define _bindir /bin Summary: An enhanced version of csh, the C shell. Name: tcsh Version: 6.12 -Release: 9ts +Release: 10jh License: distributable Group: extra Source: ftp://ftp.astron.com/pub/tcsh/tcsh-%{version}.00.tar.gz -Patch0: tcsh-6.10-utmp.patch -Patch1: tcsh-6.10-termios.patch -Patch2: tcsh-6.10-pathmax.patch +Patch0: tcsh-6.10.00-utmp.patch +Patch1: tcsh-6.09.00-termios.patch +Patch2: tcsh-6.08.00-security.patch +Patch3: tcsh-6.08.00-pathmax.patch +Patch4: tcsh-6.09.00-strcoll.patch +Patch5: tcsh-6.09.00-locale.patch +Patch6: tcsh-6.10.00-glibc_compat.patch +Patch7: tcsh-6.10.00-dspmbyte.patch +Patch8: tcsh-6.11.00-termcap.patch +Patch9: tcsh-6.12.00-setpgrp.patch Provides: csh = %{version} -Requires: rpm >= 3.0.6 -Requires: libtermcap -Prereq: coreutils grep -URL: http://www.primate.wisc.edu/software/csh-tcsh-book/ -BuildRoot: %{_tmppath}/%{name}-root -BuildRequires: libtermcap-devel groff +Prereq: fileutils, grep +URL: http://www.tcsh.org/ +Buildroot: %{_tmppath}/%{name}-%{version}-root +BuildPrereq: groff, libtermcap-devel, perl, libtool %description Tcsh is an enhanced but completely compatible version of csh, the C @@ -29,77 +33,175 @@ %prep %setup -q -n %{name}-%{version}.00 -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 +%patch0 -p1 -b .utmp +%patch1 -p1 -b .termios +# upstreamed in 6.10.00 +#%patch2 -p1 -b .security +# XXX not applied +#%patch3 -p1 -b .pathmax +# upstreamed in 6.10.00 +#%patch4 -p1 -b .strcoll +%patch5 -p1 -b .locale +%patch6 -p1 -b .glibc_compat +%patch7 -p1 -b .mbyte +%patch8 -p1 -b .termcap +%patch9 -p1 -b .setpgrp +nroff -me eight-bit.me > eight-bit.txt +autoreconf +cat > catalogs << _EOF +de ISO-8859-1 german +el ISO-8859-7 greek +en ISO-8859-1 C +es ISO-8859-1 spanish +et ISO-8859-1 et +fi ISO-8859-1 finnish +fr ISO-8859-1 french +it ISO-8859-1 italian +ja eucJP ja +pl ISO-8859-2 pl +ru ISO-8859-5 russian +uk ISO-8859-1 ukrainian +_EOF + +cat catalogs | while read lang charset language ; do + if ! grep -q '^$ codeset=' nls/$language/set1 ; then + echo '$ codeset='$charset > nls/$language/set1.codeset + cat nls/$language/set1 >> nls/$language/set1.codeset + cat nls/$language/set1.codeset > nls/$language/set1 + rm nls/$language/set1.codeset + fi +done + %build -%configure --bindir=/bin -make LIBES="-lnsl -ltermcap -lcrypt" +cp /usr/share/libtool/config.{sub,guess} . +%ifarch x86_64 +# Workaround for problem with gcc-3.2.1-1 as of 2002-12-05 -ECL +export CFLAGS="-O1 -fPIC" +%endif +%configure --without-hesiod +make all +%{__perl} tcsh.man2html +make -C nls catalogs %install -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != "/" ] && rm -rf "$RPM_BUILD_ROOT" -mkdir -p $RPM_BUILD_ROOT/usr/share/man/man1 $RPM_BUILD_ROOT/bin -install -m 755 -s tcsh $RPM_BUILD_ROOT/bin/tcsh -install -m 644 tcsh.man $RPM_BUILD_ROOT/usr/share/man/man1/tcsh.1 -ln -sf tcsh $RPM_BUILD_ROOT/bin/csh -nroff -me eight-bit.me > eight-bit.txt +mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man1 ${RPM_BUILD_ROOT}%{_bindir} +install -m 755 tcsh ${RPM_BUILD_ROOT}%{_bindir}/tcsh +install -m 644 tcsh.man ${RPM_BUILD_ROOT}%{_mandir}/man1/tcsh.1 +ln -sf tcsh ${RPM_BUILD_ROOT}%{_bindir}/csh +ln -sf tcsh.1 ${RPM_BUILD_ROOT}%{_mandir}/man1/csh.1 +cat catalogs | while read lang charset language ; do + dest=${RPM_BUILD_ROOT}%{_datadir}/locale/$lang/LC_MESSAGES + if test -f tcsh.$language.cat ; then + mkdir -p $dest + install -m644 tcsh.$language.cat $dest/tcsh + fi +done %clean -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT +%clean_buildroot %post if [ ! -f /etc/shells ]; then - echo "/bin/tcsh" >> /etc/shells - echo "/bin/csh" >> /etc/shells + echo "%{_bindir}/tcsh" >> /etc/shells + echo "%{_bindir}/csh" >> /etc/shells else - grep '^/bin/tcsh$' /etc/shells > /dev/null || echo "/bin/tcsh" >> /etc/shells - grep '^/bin/csh$' /etc/shells > /dev/null || echo "/bin/csh" >> /etc/shells + grep -q '^%{_bindir}/tcsh$' /etc/shells || \ + echo "%{_bindir}/tcsh" >> /etc/shells + grep -q '^%{_bindir}/csh$' /etc/shells || \ + echo "%{_bindir}/csh" >> /etc/shells fi %postun -if [ ! -x /bin/tcsh ]; then - grep -v '^/bin/tcsh$' /etc/shells | grep -v '^/bin/csh$'> /etc/shells.rpm - mv /etc/shells.rpm /etc/shells +if [ ! -x %{_bindir}/tcsh ]; then + grep -v '^%{_bindir}/tcsh$' /etc/shells | \ + grep -v '^%{_bindir}/csh$' > /etc/shells.rpm + cat /etc/shells.rpm > /etc/shells && rm /etc/shells.rpm fi %files %defattr(-,root,root) -%doc NewThings FAQ eight-bit.txt complete.tcsh -/bin/tcsh -/bin/csh -/usr/share/man/man1/tcsh.* +%doc FAQ Fixes NewThings complete.tcsh eight-bit.txt tcsh.html +%{_bindir}/tcsh +%{_bindir}/csh +%{_mandir}/*/* +%lang(de) %{_datadir}/locale/de/LC_MESSAGES/tcsh* +%lang(el) %{_datadir}/locale/el/LC_MESSAGES/tcsh* +%lang(en) %{_datadir}/locale/en/LC_MESSAGES/tcsh* +%lang(es) %{_datadir}/locale/es/LC_MESSAGES/tcsh* +%lang(et) %{_datadir}/locale/et/LC_MESSAGES/tcsh* +%lang(fi) %{_datadir}/locale/fi/LC_MESSAGES/tcsh* +%lang(fr) %{_datadir}/locale/fr/LC_MESSAGES/tcsh* +%lang(it) %{_datadir}/locale/it/LC_MESSAGES/tcsh* +%lang(ja) %{_datadir}/locale/ja/LC_MESSAGES/tcsh* +%lang(pl) %{_datadir}/locale/pl/LC_MESSAGES/tcsh* +%lang(ru) %{_datadir}/locale/ru/LC_MESSAGES/tcsh* +%lang(uk) %{_datadir}/locale/uk/LC_MESSAGES/tcsh* + %changelog -* Wed May 19 2004 tsintegrate 6.12-9ts -- current (6.12-8ts) integrated as 6.12-9ts for release 1.0-U1 +* Tue Jun 15 2004 Elliot Lee +- rebuilt -* Wed May 12 2004 Omar Kilani 6.12-8ts -- Add BuildRequires: libtermcap-devel groff -- Add RequireS: libtermcap +* Fri Feb 13 2004 Elliot Lee +- rebuilt -* Mon Dec 8 2003 Erlend Midttun 6.12-5tr -- Rebuilt. +* Tue Feb 10 2004 Nalin Dahyabhai 6.12-7 +- remove declaration of setpgrp() which conflicts with libc's (#115185) -* Wed Jun 18 2003 Erlend Midttun 6.12-4tr -- Big rebuild +* Fri Nov 21 2003 Nalin Dahyabhai 6.12-6 +- add missing buildprereqs on groff, libtermcap-devel (#110599) -* Mon May 26 2003 Erlend Midttun 6.12-3em -- fileutils -> coreutils. +* Tue Jul 8 2003 Nalin Dahyabhai +- update URL -* Mon Mar 24 2003 Erlend Midttun 6.12-2em -- Rebuilt against glibc 2.3.2. +* Wed Jun 04 2003 Elliot Lee +- rebuilt -* Fri Aug 23 2002 Christian H. Toldnes 6.12-1ct -- New upstream version: 6.12 -- Built for TSL 2.0 +* Wed Jan 22 2003 Tim Powers +- rebuilt -* Tue Jul 3 2001 Oystein Viggen -- define _noVersionedDependencies +* Thu Dec 05 2002 Elliot Lee 6.12-3 +- Merge changes from 8.0-hammer -* Tue Feb 29 2000 Lars Gaarden -- moved man page to /usr/share/man, FHS +* Tue Nov 19 2002 Nalin Dahyabhai 6.12-3 +- rebuild +* Thu Aug 08 2002 Phil Knirsch 6.12-2 +- Added csh.1 symlink to manpages. + +* Tue Jun 4 2002 Nalin Dahyabhai 6.11-1 +- update to 6.11 + +* Thu May 23 2002 Tim Powers +- automated rebuild + +* Thu Jan 31 2002 Bill Nottingham +- rebuild in new env + +* Sun Jun 24 2001 Elliot Lee +- Bump release + rebuild. + +* Wed Mar 28 2001 Akira TAGOH 6.10-5 +- Fixed check locale. + +* Tue Feb 6 2001 Adrian Havill +- use instead of for pickier lib (#25935) +- allow arguments for login shells (#19926) + +* Thu Nov 30 2000 Nalin Dahyabhai +- update to 6.10.00 to fix here-script vulnerability + +* Wed Sep 18 2000 Adrian Havill +- fix catalog locale dirname for Japanese + +* Thu Jun 15 2000 Jeff Johnson +- FHS packaging. +- add locale support (#10345). + +* Tue Mar 7 2000 Jeff Johnson +- rebuild for sparc baud rates > 38400. + * Mon Jan 31 2000 Cristian Gafton - rebuild to fix dependencies From svn at tinysofa.org Tue Jul 6 09:54:48 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 6 Jul 2004 19:54:48 +1000 (EST) Subject: [tinysofa-svn] r2955 - tinysofa/releases/1.1/bind/current/specs Message-ID: <20040706095448.C42A04E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-06 19:54:48 +1000 (Tue, 06 Jul 2004) New Revision: 2955 Modified: tinysofa/releases/1.1/bind/current/specs/bind.spec Log: - fix include directory permissions Modified: tinysofa/releases/1.1/bind/current/specs/bind.spec =================================================================== --- tinysofa/releases/1.1/bind/current/specs/bind.spec 2004-07-06 09:33:07 UTC (rev 2954) +++ tinysofa/releases/1.1/bind/current/specs/bind.spec 2004-07-06 09:54:48 UTC (rev 2955) @@ -432,9 +432,9 @@ %{_mandir}/man8/nsupdate.8* %files devel -%defattr(755,root,root) +%defattr(755,root,root,755) %{_bindir}/isc-config.sh -%defattr(644,root,root) +%defattr(644,root,root,755) %exclude %{_libdir}/liblwres* %{_libdir}/lib*.a %{_libdir}/lib*.la From svn at tinysofa.org Tue Jul 6 10:49:54 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 6 Jul 2004 20:49:54 +1000 (EST) Subject: [tinysofa-svn] r2956 - in tinysofa/releases/1.1/stunnel/current: sources specs Message-ID: <20040706104954.7A89A4E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-06 20:49:54 +1000 (Tue, 06 Jul 2004) New Revision: 2956 Modified: tinysofa/releases/1.1/stunnel/current/sources/stunnel.init tinysofa/releases/1.1/stunnel/current/specs/stunnel.spec Log: - use service macros - support try-restart Modified: tinysofa/releases/1.1/stunnel/current/sources/stunnel.init =================================================================== --- tinysofa/releases/1.1/stunnel/current/sources/stunnel.init 2004-07-06 09:54:48 UTC (rev 2955) +++ tinysofa/releases/1.1/stunnel/current/sources/stunnel.init 2004-07-06 10:49:54 UTC (rev 2956) @@ -69,8 +69,14 @@ killproc -HUP stunnel RETVAL=$? ;; + condrestart|try-restart) + if [ -f ${INITLOCK:-/mnt/lockdev}/stunnel ]; then + $0 stop + $0 start + RETVAL=$? + fi *) - echo "Usage: $0 {start|stop|status|restart}" + echo "Usage: $0 {start|stop|status|restart|try-restart}" ;; esac exit $RETVAL Modified: tinysofa/releases/1.1/stunnel/current/specs/stunnel.spec =================================================================== --- tinysofa/releases/1.1/stunnel/current/specs/stunnel.spec 2004-07-06 09:54:48 UTC (rev 2955) +++ tinysofa/releases/1.1/stunnel/current/specs/stunnel.spec 2004-07-06 10:49:54 UTC (rev 2956) @@ -9,7 +9,7 @@ Source2: stunnel.conf BuildRoot: %{_tmppath}/%{name}-root BuildRequires: openssl-devel -PreReq: tinysofa-utils, chkconfig +%service_requires %description stunnel is a socket wrapper which can be used to give ordinary @@ -66,17 +66,16 @@ rm -rf $RPM_BUILD_ROOT/usr/share/doc %post -chkconfig --add stunnel -/sbin/restart_maybe stunnel +%service_post stunnel %preun -if [ "$1" == 0 ]; then - %{_initrddir}/stunnel stop 2>&1 - chkconfig --del stunnel -fi +%service_preun stunnel +%postun +%service_postun stunnel + %clean -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT +%clean_buildroot %files %defattr(-,root,root) From svn at tinysofa.org Tue Jul 6 10:52:21 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 6 Jul 2004 20:52:21 +1000 (EST) Subject: [tinysofa-svn] r2957 - in tinysofa/releases/1.1/sysstat/current: sources specs Message-ID: <20040706105221.F01AD4E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-06 20:52:21 +1000 (Tue, 06 Jul 2004) New Revision: 2957 Modified: tinysofa/releases/1.1/sysstat/current/sources/sysstat.init tinysofa/releases/1.1/sysstat/current/specs/sysstat.spec Log: - use service macros Modified: tinysofa/releases/1.1/sysstat/current/sources/sysstat.init =================================================================== --- tinysofa/releases/1.1/sysstat/current/sources/sysstat.init 2004-07-06 10:49:54 UTC (rev 2956) +++ tinysofa/releases/1.1/sysstat/current/sources/sysstat.init 2004-07-06 10:52:21 UTC (rev 2957) @@ -28,7 +28,7 @@ /usr/lib/sa/sadc 300 - & echo ;; - stop|status|restart|reload) + stop|status|restart|reload|try-restart) ;; *) echo "Usage: sysstat {start|stop|status|restart|reload}" Modified: tinysofa/releases/1.1/sysstat/current/specs/sysstat.spec =================================================================== --- tinysofa/releases/1.1/sysstat/current/specs/sysstat.spec 2004-07-06 10:49:54 UTC (rev 2956) +++ tinysofa/releases/1.1/sysstat/current/specs/sysstat.spec 2004-07-06 10:52:21 UTC (rev 2957) @@ -8,7 +8,7 @@ Source1: sysstat.init Patch0: sysstat-5.0.0-config.patch BuildRoot: %{_tmppath}/%{name}-root -PreReq: tinysofa-utils +%service_requires BuildRequires: gettext %description @@ -19,10 +19,9 @@ %patch0 -p1 %build -make +%make %install -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT IGNORE_MAN_GROUP=y mkdir -p $RPM_BUILD_ROOT%{_initrddir} install -m 0755 %SOURCE1 $RPM_BUILD_ROOT/%{_initrddir}/sysstat @@ -32,17 +31,16 @@ %find_lang %{name} %post -# Restart service after upgrade -/sbin/chkconfig --add sysstat -/sbin/restart_maybe sysstat +%service_post sysstat %preun -if [ $1 = 0 ]; then -/sbin/chkconfig --del sysstat -fi +%service_preun sysstat +%postun +%service_postun sysstat + %clean -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT +%clean_buildroot %files -f %{name}.lang %defattr(-,root,root) @@ -112,4 +110,4 @@ - Updated for Trustix - Moved man pages to FHS - Original package by: -- Klaus Franken / SBS IP 21 F \ No newline at end of file +- Klaus Franken / SBS IP 21 F From svn at tinysofa.org Tue Jul 6 10:54:42 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 6 Jul 2004 20:54:42 +1000 (EST) Subject: [tinysofa-svn] r2958 - in tinysofa/releases/1.1/xinetd/current: sources specs Message-ID: <20040706105442.D5B214E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-06 20:54:42 +1000 (Tue, 06 Jul 2004) New Revision: 2958 Modified: tinysofa/releases/1.1/xinetd/current/sources/xinetd.init tinysofa/releases/1.1/xinetd/current/specs/xinetd.spec Log: - support try-restart - use service macros Modified: tinysofa/releases/1.1/xinetd/current/sources/xinetd.init =================================================================== --- tinysofa/releases/1.1/xinetd/current/sources/xinetd.init 2004-07-06 10:52:21 UTC (rev 2957) +++ tinysofa/releases/1.1/xinetd/current/sources/xinetd.init 2004-07-06 10:54:42 UTC (rev 2958) @@ -108,11 +108,11 @@ reload) reload ;; - condrestart) + condrestart|try-restart) condrestart ;; *) - echo $"Usage: $0 {start|stop|status|restart|condrestart|reload}" + echo $"Usage: $0 {start|stop|status|restart|try-restart|reload}" RETVAL=1 esac Modified: tinysofa/releases/1.1/xinetd/current/specs/xinetd.spec =================================================================== --- tinysofa/releases/1.1/xinetd/current/specs/xinetd.spec 2004-07-06 10:52:21 UTC (rev 2957) +++ tinysofa/releases/1.1/xinetd/current/specs/xinetd.spec 2004-07-06 10:54:42 UTC (rev 2958) @@ -80,24 +80,21 @@ install -m 644 %SOURCE12 $RPM_BUILD_ROOT/etc/sysconfig/xinetd %clean -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT +%clean_buildroot %pre /sbin/service xinetd stop 2>/dev/null >/dev/null || : %post chmod +x /usr/sbin/inetdconvert -# Make correct symlinks. -/sbin/chkconfig --add xinetd -# Restart service after upgrade. -/sbin/restart_maybe xinetd +%service_post xinetd %preun -if [ $1 = 0 ]; then - /sbin/service xinetd stop 2>/dev/null || : - /sbin/chkconfig --del xinetd || : -fi +%service_preun xinetd +%postun +%service_postun xinetd + %files %defattr(-,root,root) %doc INSTALL README xinetd/sample.conf @@ -157,4 +154,4 @@ - .spec file cleanup * Wed Jul 17 2002 Gerald Dachs 2.3.5-4gd -- based on .spec file from Red Hat \ No newline at end of file +- based on .spec file from Red Hat From svn at tinysofa.org Tue Jul 6 10:58:35 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 6 Jul 2004 20:58:35 +1000 (EST) Subject: [tinysofa-svn] r2959 - in tinysofa/releases/1.1/ypserv/current: sources specs Message-ID: <20040706105835.DB2054E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-06 20:58:35 +1000 (Tue, 06 Jul 2004) New Revision: 2959 Modified: tinysofa/releases/1.1/ypserv/current/sources/ypserv-yppasswdd.init tinysofa/releases/1.1/ypserv/current/sources/ypserv-ypserv.init tinysofa/releases/1.1/ypserv/current/specs/ypserv.spec Log: - support try-restart - use service macros Modified: tinysofa/releases/1.1/ypserv/current/sources/ypserv-yppasswdd.init =================================================================== --- tinysofa/releases/1.1/ypserv/current/sources/ypserv-yppasswdd.init 2004-07-06 10:54:42 UTC (rev 2958) +++ tinysofa/releases/1.1/ypserv/current/sources/ypserv-yppasswdd.init 2004-07-06 10:58:35 UTC (rev 2959) @@ -69,14 +69,14 @@ stop start ;; - condrestart) + condrestart|try-restart) if [ -f /var/lock/subsys/yppasswdd ]; then stop start fi ;; *) - echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}" + echo $"Usage: $0 {start|stop|status|restart|reload|try-restart}" exit 1 esac Modified: tinysofa/releases/1.1/ypserv/current/sources/ypserv-ypserv.init =================================================================== --- tinysofa/releases/1.1/ypserv/current/sources/ypserv-ypserv.init 2004-07-06 10:54:42 UTC (rev 2958) +++ tinysofa/releases/1.1/ypserv/current/sources/ypserv-ypserv.init 2004-07-06 10:58:35 UTC (rev 2959) @@ -64,14 +64,14 @@ stop start ;; - condrestart) + condrestart|try-restart) if [ -f /var/lock/subsys/ypserv ]; then stop start fi ;; *) - echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}" + echo $"Usage: $0 {start|stop|status|restart|reload|try-restart}" exit 1 esac Modified: tinysofa/releases/1.1/ypserv/current/specs/ypserv.spec =================================================================== --- tinysofa/releases/1.1/ypserv/current/specs/ypserv.spec 2004-07-06 10:54:42 UTC (rev 2958) +++ tinysofa/releases/1.1/ypserv/current/specs/ypserv.spec 2004-07-06 10:58:35 UTC (rev 2959) @@ -10,7 +10,7 @@ Source3: ypserv-yppasswdd.sysconfig Source4: ftp://ftp.kernel.org/pub/linux/utils/net/NIS/ypserv-%{version}.tar.bz2.sign Requires: portmap make -Prereq: /sbin/chkconfig /sbin/restart_maybe +%service_requires Patch0: ypserv-2.8-trustix.patch Patch1: ypserv-awkpath.patch Obsoletes: yppasswd @@ -71,19 +71,16 @@ [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT %post -/sbin/chkconfig --add ypserv -/sbin/chkconfig --add yppasswdd -# Restart service after upgrade. -/sbin/restart_maybe ypserv -/sbin/restart_maybe yppasswdd +%service_post ypserv +%service_post yppasswdd %preun -if [ $1 = 0 ]; then - service ypserv stop - service yppasswdd stop - /sbin/chkconfig --del ypserv - /sbin/chkconfig --del yppasswdd -fi +%service_preun ypserv +%service_preun yppasswdd + +%postun +%service_postun ypserv +%service_postun yppasswdd %files %defattr(-,root,root) From svn at tinysofa.org Tue Jul 6 11:21:59 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 6 Jul 2004 21:21:59 +1000 (EST) Subject: [tinysofa-svn] r2960 - in tinysofa/releases/1.1/lvm/current: sources specs Message-ID: <20040706112159.C98BE4E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-06 21:21:59 +1000 (Tue, 06 Jul 2004) New Revision: 2960 Added: tinysofa/releases/1.1/lvm/current/sources/lvm-1.0.8-kdevt.patch Modified: tinysofa/releases/1.1/lvm/current/specs/lvm.spec Log: - make lvm build on 1.1 Added: tinysofa/releases/1.1/lvm/current/sources/lvm-1.0.8-kdevt.patch =================================================================== --- tinysofa/releases/1.1/lvm/current/sources/lvm-1.0.8-kdevt.patch 2004-07-06 10:58:35 UTC (rev 2959) +++ tinysofa/releases/1.1/lvm/current/sources/lvm-1.0.8-kdevt.patch 2004-07-06 11:21:59 UTC (rev 2960) @@ -0,0 +1,15 @@ +--- LVM/1.0.8/tools/lib/liblvm.h.kdevt 2003-12-14 16:09:56.026569272 -0500 ++++ LVM/1.0.8/tools/lib/liblvm.h 2003-12-14 16:10:12.610712785 -0500 +@@ -75,6 +75,12 @@ + #ifndef uint64_t + # define uint64_t unsigned long long int + #endif ++#ifndef kdev_t ++# define kdev_t unsigned short ++#endif ++#ifndef MINORBITS ++# define MINORBITS 8 ++#endif + + #ifdef __dietlibc__ + # define ushort unsigned short Modified: tinysofa/releases/1.1/lvm/current/specs/lvm.spec =================================================================== --- tinysofa/releases/1.1/lvm/current/specs/lvm.spec 2004-07-06 10:58:35 UTC (rev 2959) +++ tinysofa/releases/1.1/lvm/current/specs/lvm.spec 2004-07-06 11:21:59 UTC (rev 2960) @@ -1,12 +1,13 @@ Summary: LVM tools Name: lvm Version: 1.0.8 -Release: 8ts +Release: 9jh Source0: ftp://ftp.sistina.com/pub/LVM/1.0/%{name}_%{version}.tar.gz Source1: lvm.initd Source2: lvm.sysconfig Patch0: lvm-no_nb.patch Patch1: lvm-installowner.patch +Patch2: lvm-1.0.8-kdevt.patch License: GPL Group: main URL: http://www.sistina.com/lvm @@ -30,6 +31,7 @@ %setup -q -n LVM/%{version} %patch0 -p2 %patch1 -p2 +%patch2 -p2 %build @@ -57,7 +59,7 @@ popd %clean -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT +%clean_buildroot %post -p /sbin/ldconfig From svn at tinysofa.org Tue Jul 6 19:59:30 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Wed, 7 Jul 2004 05:59:30 +1000 (EST) Subject: [tinysofa-svn] r2961 - tinysofa/snapshot/kernel/current/specs Message-ID: <20040706195930.4E1344E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-07 05:59:29 +1000 (Wed, 07 Jul 2004) New Revision: 2961 Modified: tinysofa/snapshot/kernel/current/specs/kernel.spec Log: - make license tag detection to work with older modutils Modified: tinysofa/snapshot/kernel/current/specs/kernel.spec =================================================================== --- tinysofa/snapshot/kernel/current/specs/kernel.spec 2004-07-06 11:21:59 UTC (rev 2960) +++ tinysofa/snapshot/kernel/current/specs/kernel.spec 2004-07-06 19:59:29 UTC (rev 2961) @@ -144,6 +144,7 @@ BuildPreReq: module-init-tools, patch >= 2.5.4, bash >= 2.03, sh-utils, tar BuildPreReq: bzip2, findutils, gzip, m4, perl, make >= 3.78, gnupg BuildRequires: gcc >= 2.96-98, binutils >= 2.12, tinysofa-rpm-config +BuildRequires: coreutils BuildConflicts: rhbuildsys(DiskFree) < 500Mb @@ -649,7 +650,7 @@ find $RPM_BUILD_ROOT/lib/modules/$KernelVer -name "*.ko" -type f | xargs chmod u+x # detect missing or incorrect license tags - for i in `find $RPM_BUILD_ROOT/lib/modules/$KernelVer -name "*.ko" ` ; do echo -n "$i " ; /sbin/modinfo -l $i >> modinfo ; done + for i in `find $RPM_BUILD_ROOT/lib/modules/$KernelVer -name "*.ko" ` ; do echo -n "$i " ; /sbin/modinfo -l $i | /usr/bin/tr -d "\"" >> modinfo ; done cat modinfo | grep -v "^GPL" | grep -v "^Dual BSD/GPL" | grep -v "^Dual MPL/GPL" | grep -v "^GPL and additional rights" | grep -v "^GPL v2" && exit 1 rm -f modinfo # remove files that will be auto generated by depmod at rpm -i time From svn at tinysofa.org Wed Jul 7 13:12:29 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Wed, 7 Jul 2004 23:12:29 +1000 (EST) Subject: [tinysofa-svn] r2962 - tinysofa/releases/1.1/rpm/current/specs Message-ID: <20040707131229.3EE934E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-07 23:12:28 +1000 (Wed, 07 Jul 2004) New Revision: 2962 Modified: tinysofa/releases/1.1/rpm/current/specs/rpm.spec Log: - disable stack protector Modified: tinysofa/releases/1.1/rpm/current/specs/rpm.spec =================================================================== --- tinysofa/releases/1.1/rpm/current/specs/rpm.spec 2004-07-06 19:59:29 UTC (rev 2961) +++ tinysofa/releases/1.1/rpm/current/specs/rpm.spec 2004-07-07 13:12:28 UTC (rev 2962) @@ -156,7 +156,7 @@ %endif %ifos linux -CFLAGS="$RPM_OPT_FLAGS"; export CFLAGS +CFLAGS="$RPM_OPT_FLAGS %{?no_stack_protector}"; export CFLAGS %configure \ $WITH_PYTHON \ --enable-posixmutexes\ From svn at tinysofa.org Wed Jul 7 13:19:23 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Wed, 7 Jul 2004 23:19:23 +1000 (EST) Subject: [tinysofa-svn] r2963 - tinysofa/releases/1.1 Message-ID: <20040707131923.B5B134E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-07 23:19:23 +1000 (Wed, 07 Jul 2004) New Revision: 2963 Removed: tinysofa/releases/1.1/proftpd/ Log: - remove proftpd From svn at tinysofa.org Wed Jul 7 14:03:14 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Thu, 8 Jul 2004 00:03:14 +1000 (EST) Subject: [tinysofa-svn] r2964 - in tinysofa/releases/1.1: . perl-dbi perl-dbi/current perl-dbi/current/sources perl-dbi/current/specs Message-ID: <20040707140314.49DFA4E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-08 00:03:14 +1000 (Thu, 08 Jul 2004) New Revision: 2964 Added: tinysofa/releases/1.1/perl-dbi/ tinysofa/releases/1.1/perl-dbi/current/ tinysofa/releases/1.1/perl-dbi/current/sources/ tinysofa/releases/1.1/perl-dbi/current/sources/DBI-1.38.tar.gz tinysofa/releases/1.1/perl-dbi/current/specs/ tinysofa/releases/1.1/perl-dbi/current/specs/perl-dbi.spec Log: - add perl-dbi to base Added: tinysofa/releases/1.1/perl-dbi/current/sources/DBI-1.38.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/releases/1.1/perl-dbi/current/sources/DBI-1.38.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/releases/1.1/perl-dbi/current/specs/perl-dbi.spec =================================================================== --- tinysofa/releases/1.1/perl-dbi/current/specs/perl-dbi.spec 2004-07-07 13:19:23 UTC (rev 2963) +++ tinysofa/releases/1.1/perl-dbi/current/specs/perl-dbi.spec 2004-07-07 14:03:14 UTC (rev 2964) @@ -0,0 +1,91 @@ +%define real_name DBI + +Summary: The Perl Database Interface by Tim Bunce +Name: perl-dbi +Version: 1.38 +Release: 1jh +URL: http://www.cpan.org +Source: ftp://ftp.pasteur.fr/pub/computing/CPAN/modules/by-module/DBI/%{real_name}-%{version}.tar.gz +License: GPL +Group: extra +Requires: perl >= %{perl_epoch}:%{perl_version} +BuildRequires: perl-devel +BuildRoot: %{_tmppath}/%{name}-%{version}-root + + +%description +The Perl Database Interface (DBI) is a database access Application +Programming Interface (API) for the Perl Language. The Perl DBI API +specification defines a set of functions, variables and conventions that +provide a consistent database interface independent of the actual +database being used. + + +%prep +%setup -q -n %{real_name}-%{version} + + +%build +%{__perl} Makefile.PL INSTALLDIRS=site PREFIX=%{_prefix} +%make OPTIMIZE="$RPM_OPT_FLAGS" PREFIX=%{_prefix} +%make test + + +%install +%makeinstall PREFIX=$RPM_BUILD_ROOT%{_prefix} +install 755 -d $RPM_BUILD_ROOT/%{perl_sitearch}/auto/DBD + + +%clean +%clean_buildroot + + +%files +%defattr(-,root,root,0755) +%{perl_sitearch}/Bundle +%{perl_sitearch}/DBD +%{perl_sitearch}/DBI.pm +%{perl_sitearch}/DBI +%{perl_sitearch}/Win32 +%dir %{perl_sitearch}/auto/DBD +%dir %{perl_sitearch}/auto/DBI +%{perl_sitearch}/auto/DBI +%exclude %{perl_installarchlib} +%exclude %{_bindir} + +%doc Changes README ToDo +%{_mandir}/man3/* +%exclude %{_mandir}/man1/* + +#%{_bindir}/dbiprof +#%{_bindir}/dbiproxy +#%{_mandir}/man1/dbiprof.1.gz +#%{_mandir}/man1/dbiproxy.1.gz + + +%changelog +* Mon Mar 8 2004 Chr. Toldnes +- Rebuilt for TSL 2.1 + +* Mon Oct 13 2003 Goetz Bock 1.38-2bg +- rebuild, small specfile cleanup + +* Wed Oct 1 2003 Goetz Bock 1.38-1bg +- new upstream: 1.38 +- included man pages +- prepared for further splitings + +* Tue Jul 29 2003 Goetz Bock 1.37-1bg +- new upstream: 1.37 +- the fixed perl 5.8.0-11tr allows for the default install macro +- fixed group +- some spec file fixes + +* Wed Jun 18 2003 Erlend Midttun 1.30-1tr +- Big rebuild + +* Mon Mar 24 2003 Erlend Midttun 1.30-2em +- Rebuilt against glibc 2.3.2. + +* Thu Feb 20 2003 Gotz Bock perl-DBI-1.30-1bg +- build for TSL2.0 based on Mandrake package. From svn at tinysofa.org Wed Jul 7 16:50:00 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Thu, 8 Jul 2004 02:50:00 +1000 (EST) Subject: [tinysofa-svn] r2965 - tinysofa/releases/1.1/libjpeg/current/specs Message-ID: <20040707165000.2DFB54E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-08 02:49:59 +1000 (Thu, 08 Jul 2004) New Revision: 2965 Modified: tinysofa/releases/1.1/libjpeg/current/specs/libjpeg.spec Log: - add missing Source: line Modified: tinysofa/releases/1.1/libjpeg/current/specs/libjpeg.spec =================================================================== --- tinysofa/releases/1.1/libjpeg/current/specs/libjpeg.spec 2004-07-07 14:03:14 UTC (rev 2964) +++ tinysofa/releases/1.1/libjpeg/current/specs/libjpeg.spec 2004-07-07 16:49:59 UTC (rev 2965) @@ -2,9 +2,10 @@ Summary: A library for manipulating JPEG image format files. Name: libjpeg Version: 6b -Release: 7ts +Release: 8jh License: distributable Group: extra +Source: jpegsrc.v6b.tar.bz2 Patch1: jpeg-c++.patch BuildRoot: %{_tmppath}/%{name}-root From svn at tinysofa.org Wed Jul 7 17:01:38 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Thu, 8 Jul 2004 03:01:38 +1000 (EST) Subject: [tinysofa-svn] r2966 - tinysofa/releases/1.1/perl-dbi/current/specs Message-ID: <20040707170138.0F5704E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-08 03:01:37 +1000 (Thu, 08 Jul 2004) New Revision: 2966 Modified: tinysofa/releases/1.1/perl-dbi/current/specs/perl-dbi.spec Log: - set __perl_requires to %{nil} Modified: tinysofa/releases/1.1/perl-dbi/current/specs/perl-dbi.spec =================================================================== --- tinysofa/releases/1.1/perl-dbi/current/specs/perl-dbi.spec 2004-07-07 16:49:59 UTC (rev 2965) +++ tinysofa/releases/1.1/perl-dbi/current/specs/perl-dbi.spec 2004-07-07 17:01:37 UTC (rev 2966) @@ -1,3 +1,6 @@ +# don't wan't to require more perl modules +%define __perl_requires %{nil} + %define real_name DBI Summary: The Perl Database Interface by Tim Bunce From svn at tinysofa.org Wed Jul 7 17:10:13 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Thu, 8 Jul 2004 03:10:13 +1000 (EST) Subject: [tinysofa-svn] r2967 - in tinysofa/releases/1.1/tinysofa-rpm-config/current: sources specs Message-ID: <20040707171013.24A864E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-08 03:10:12 +1000 (Thu, 08 Jul 2004) New Revision: 2967 Added: tinysofa/releases/1.1/tinysofa-rpm-config/current/sources/tinysofa-rpm-config-1.1.2.tar.bz2 Removed: tinysofa/releases/1.1/tinysofa-rpm-config/current/sources/tinysofa-rpm-config-1.1.1.tar.bz2 Modified: tinysofa/releases/1.1/tinysofa-rpm-config/current/specs/tinysofa-rpm-config.spec Log: - fix %perl_epoch macro Deleted: tinysofa/releases/1.1/tinysofa-rpm-config/current/sources/tinysofa-rpm-config-1.1.1.tar.bz2 =================================================================== (Binary files differ) Added: tinysofa/releases/1.1/tinysofa-rpm-config/current/sources/tinysofa-rpm-config-1.1.2.tar.bz2 =================================================================== (Binary files differ) Property changes on: tinysofa/releases/1.1/tinysofa-rpm-config/current/sources/tinysofa-rpm-config-1.1.2.tar.bz2 ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: tinysofa/releases/1.1/tinysofa-rpm-config/current/specs/tinysofa-rpm-config.spec =================================================================== --- tinysofa/releases/1.1/tinysofa-rpm-config/current/specs/tinysofa-rpm-config.spec 2004-07-07 17:01:37 UTC (rev 2966) +++ tinysofa/releases/1.1/tinysofa-rpm-config/current/specs/tinysofa-rpm-config.spec 2004-07-07 17:10:12 UTC (rev 2967) @@ -1,6 +1,6 @@ Summary: tinysofa specific rpm configuration files. Name: tinysofa-rpm-config -Version: 1.1.1 +Version: 1.1.2 Release: 1jh License: GPL Group: development From svn at tinysofa.org Wed Jul 7 17:11:54 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Thu, 8 Jul 2004 03:11:54 +1000 (EST) Subject: [tinysofa-svn] r2968 - tinysofa/releases/1.1/quota/current/specs Message-ID: <20040707171154.BAFBA4E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-08 03:11:54 +1000 (Thu, 08 Jul 2004) New Revision: 2968 Modified: tinysofa/releases/1.1/quota/current/specs/quota.spec Log: - remove kernel requirement Modified: tinysofa/releases/1.1/quota/current/specs/quota.spec =================================================================== --- tinysofa/releases/1.1/quota/current/specs/quota.spec 2004-07-07 17:10:12 UTC (rev 2967) +++ tinysofa/releases/1.1/quota/current/specs/quota.spec 2004-07-07 17:11:54 UTC (rev 2968) @@ -5,7 +5,7 @@ License: BSD Group: main BuildRoot: %{_tmppath}/%{name}-%{version}-root -Requires: kernel >= 2.4 initscripts >= 6.38 +Requires: initscripts >= 6.38 BuildPreReq: e2fsprogs-devel gettext tcp_wrappers Source0: http://prdownloads.sourceforge.net/linuxquota/quota-%{version}.tar.gz Patch0: quota-3.06-warnquota.patch From svn at tinysofa.org Wed Jul 7 20:24:43 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Thu, 8 Jul 2004 06:24:43 +1000 (EST) Subject: [tinysofa-svn] r2969 - in tinysofa/releases/1.1: . strongswan/current/sources strongswan/current/specs Message-ID: <20040707202443.71D7D4E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-08 06:24:43 +1000 (Thu, 08 Jul 2004) New Revision: 2969 Added: tinysofa/releases/1.1/strongswan/ tinysofa/releases/1.1/strongswan/current/sources/strongswan-2.1.3.tar.gz Removed: tinysofa/releases/1.1/freeswan/ tinysofa/releases/1.1/strongswan/current/sources/freeswan-2.05.tar.gz tinysofa/releases/1.1/strongswan/current/sources/x509-1.5.4-freeswan-2.05.tar.gz Modified: tinysofa/releases/1.1/strongswan/current/specs/freeswan.spec Log: - new strongswan package based on 1.0 freeswan spec Copied: tinysofa/releases/1.1/strongswan (from rev 2950, tinysofa/releases/1.1/freeswan) Deleted: tinysofa/releases/1.1/strongswan/current/sources/freeswan-2.05.tar.gz =================================================================== (Binary files differ) Added: tinysofa/releases/1.1/strongswan/current/sources/strongswan-2.1.3.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/releases/1.1/strongswan/current/sources/strongswan-2.1.3.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: tinysofa/releases/1.1/strongswan/current/sources/x509-1.5.4-freeswan-2.05.tar.gz =================================================================== (Binary files differ) Modified: tinysofa/releases/1.1/strongswan/current/specs/freeswan.spec =================================================================== --- tinysofa/releases/1.1/freeswan/current/specs/freeswan.spec 2004-07-06 09:01:40 UTC (rev 2950) +++ tinysofa/releases/1.1/strongswan/current/specs/freeswan.spec 2004-07-07 20:24:43 UTC (rev 2969) @@ -1,73 +1,71 @@ Summary: A free ipsec VPN solution for Linux -Name: freeswan -Version: 2.05 -Release: 3ts +Name: strongswan +Version: 2.1.3 +Release: 1jh License: GPL Group: main -URL: http://www.freeswan.org +URL: http://www.strongswan.org # The version of the X509 patch %define x509version 1.5.4 -Source0: ftp://ftp.xs4all.nl/pub/crypto/freeswan/freeswan-%{version}.tar.gz +Source0: strongswan-%{version}.tar.gz Source1: freeswan-1.9.secrets.proto -Source3: http://www.strongsec.com/freeswan/x509-%{x509version}-freeswan-%{version}.tar.gz Patch0: freeswan-2.00-init.patch Patch1: freeswan-2.00-confused.patch Patch2: freeswan-2.00-initdir.patch -BuildRoot: %{_tmppath}/%{name}-root +BuildRoot: %{_tmppath}/%{name}-%{version}-root Provides: vpn ipsec -PreReq: /sbin/chkconfig /sbin/restart_maybe +%service_requires Requires: gmp +PreReq: coreutils BuildRequires: gmp-devel +Obsoletes: freeswan + %description -Our project is Free S/WAN for Linux. Our overall goal is to make -the Internet more secure and more private, to make Internet -"wiretapping" entirely impractical. +StrongSwan is a free implementation of IPSEC & IKE for Linux. IPSEC is +the Internet Protocol Security and uses strong cryptography to provide +both authentication and encryption services. These services allow you +to build secure tunnels through untrusted networks. Everything passing +through the untrusted net is encrypted by the ipsec gateway machine and +decrypted by the gateway at the other end of the tunnel. The resulting +tunnel is a virtual private network or VPN. -IPSEC is designed to support (among other things) VPNs or virtual -private networks, which allow multiple sites from an organisation -(optionally, and its clients, suppliers, etc.) to communicate -securely over an insecure Internet by encrypting all communication -between the sites. We want to extend that to a real private network -in which anyone who choses to communicate securely can do so, -in which strong encryption is universally available. %prep %setup -q -# For x509 -tar -zxf %SOURCE3 -patch -p1 /dev/null || : - chkconfig --del ipsec || : -fi +%service_preun ipsec + %files %defattr(-,root,root) %doc doc/* CHANGES COPYING CREDITS /usr/lib/ipsec %config(noreplace) %attr(600,root,root) /etc/ipsec.secrets %config(noreplace) %attr(600,root,root) /etc/ipsec.conf -%{_initrddir}/* -%attr(644,root,root) /usr/share/man/*/* +%{_initrddir}/ipsec +%attr(644,root,root) %{_mandir}/*/* /usr/sbin/ipsec /etc/ipsec.d + %changelog +* Wed Jul 7 2004 Jaakko Heinonen +- strongswan package based on freeswan spec from tinysofa 1.0 + * Mon May 24 2004 tsintegrate 2.05-3ts - current (2.05-3jh) integrated as 2.05-3ts for release 1.0-U1 From svn at tinysofa.org Wed Jul 7 20:26:10 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Thu, 8 Jul 2004 06:26:10 +1000 (EST) Subject: [tinysofa-svn] r2970 - tinysofa/releases/1.1/strongswan/current/specs Message-ID: <20040707202610.33B5A4E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-08 06:26:10 +1000 (Thu, 08 Jul 2004) New Revision: 2970 Added: tinysofa/releases/1.1/strongswan/current/specs/strongswan.spec Removed: tinysofa/releases/1.1/strongswan/current/specs/freeswan.spec Log: - rename freeswan.spec to strongswan.spec Deleted: tinysofa/releases/1.1/strongswan/current/specs/freeswan.spec =================================================================== --- tinysofa/releases/1.1/strongswan/current/specs/freeswan.spec 2004-07-07 20:24:43 UTC (rev 2969) +++ tinysofa/releases/1.1/strongswan/current/specs/freeswan.spec 2004-07-07 20:26:10 UTC (rev 2970) @@ -1,196 +0,0 @@ -Summary: A free ipsec VPN solution for Linux -Name: strongswan -Version: 2.1.3 -Release: 1jh -License: GPL -Group: main -URL: http://www.strongswan.org -# The version of the X509 patch -%define x509version 1.5.4 -Source0: strongswan-%{version}.tar.gz -Source1: freeswan-1.9.secrets.proto -Patch0: freeswan-2.00-init.patch -Patch1: freeswan-2.00-confused.patch -Patch2: freeswan-2.00-initdir.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-root -Provides: vpn ipsec -%service_requires -Requires: gmp -PreReq: coreutils -BuildRequires: gmp-devel -Obsoletes: freeswan - - -%description -StrongSwan is a free implementation of IPSEC & IKE for Linux. IPSEC is -the Internet Protocol Security and uses strong cryptography to provide -both authentication and encryption services. These services allow you -to build secure tunnels through untrusted networks. Everything passing -through the untrusted net is encrypted by the ipsec gateway machine and -decrypted by the gateway at the other end of the tunnel. The resulting -tunnel is a virtual private network or VPN. - - -%prep -%setup -q - -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 - -%build -CFLAGS="${RPM_OPT_FLAGS}" -%make \ - DESTDIR=/ \ - PUBDIR=/usr/sbin \ - BINDIR=/usr/lib/ipsec \ - INC_MANDIR=share/man \ - INC_USRLOCAL=/usr \ - FINALEXAMPLECONFDIR=/usr/share/doc/freeswan-%{version} \ - FINALLIBEXECDIR=/usr/lib/ipsec \ - RCDIR=%{_initrddir} \ - programs - -%install -%{__mkdir_p} $RPM_BUILD_ROOT%{_initrddir} - -%makeinstall_std \ - PUBDIR=/usr/sbin \ - BINDIR=/usr/lib/ipsec \ - INC_MANDIR=share/man \ - INC_USRLOCAL=/usr \ - FINALEXAMPLECONFDIR=/usr/share/doc/%{name}-%{version} \ - FINALLIBEXECDIR=/usr/lib/ipsec \ - RCDIR=%{_initrddir} - -# We don't want all users to have the same secrets file :) -rm -f ${RPM_BUILD_ROOT}/ipsec.secrets -cp -f %{SOURCE1} ${RPM_BUILD_ROOT}/etc/ipsec.secrets - -# We actually do want chkconfig to work properly... -rm -f ${RPM_BUILD_ROOT}%{_initrddir}/ipsec || : -sed -e 's/^# chkconfig:.*$/# chkconfig: - 47 68/' programs/setup/setup > \ - ${RPM_BUILD_ROOT}%{_initrddir}/ipsec -chmod 755 ${RPM_BUILD_ROOT}%{_initrddir}/ipsec - -# For x509 -mkdir -pm 700 ${RPM_BUILD_ROOT}/etc/ipsec.d/cacerts -mkdir -pm 700 ${RPM_BUILD_ROOT}/etc/ipsec.d/crls - -# Seems FreeSWAN ships the man pages of .... bind-light -rm -f ${RPM_BUILD_ROOT}%{_mandir}/man3/lwres* - -# Clean out what we don't want from docs -rm -f doc/Makefile -rm -rf doc/manpage.d doc/presentations doc/src doc/utils - -mv ${RPM_BUILD_ROOT}/usr/share/doc/* doc - - -%clean -%clean_buildroot - - -%post -if test ! -e /dev/ipsec ; then - /usr/bin/mknod -m 0200 /dev/ipsec c 36 10 ; -fi -%service_post ipsec - -%preun -%service_preun ipsec - - -%files -%defattr(-,root,root) -%doc doc/* CHANGES COPYING CREDITS -/usr/lib/ipsec -%config(noreplace) %attr(600,root,root) /etc/ipsec.secrets -%config(noreplace) %attr(600,root,root) /etc/ipsec.conf -%{_initrddir}/ipsec -%attr(644,root,root) %{_mandir}/*/* -/usr/sbin/ipsec -/etc/ipsec.d - - -%changelog -* Wed Jul 7 2004 Jaakko Heinonen -- strongswan package based on freeswan spec from tinysofa 1.0 - -* Mon May 24 2004 tsintegrate 2.05-3ts -- current (2.05-3jh) integrated as 2.05-3ts for release 1.0-U1 - -* Thu May 20 2004 Jaakko Heinonen 2.05-3jh -- fix man page permissions - -* Wed May 19 2004 tsintegrate 2.05-2ts -- current (2.05-2jh) integrated as 2.05-2ts for release 1.0-U1 - -* Sat May 15 2004 Jaakko Heinonen 2.05-2jh -- fix non-root build -- package manual pages correctly - -* Tue May 11 2004 Omar Kilani -- Add BuildRequires gmp-devel. -- Add Requires gmp. - -* Fri Apr 02 2004 Omar Kilani 2.05-1ts -- New upstream. -- x509 1.5.4. - -* Fri Dec 5 2003 Erlend Midttun 2.04-1tr -- Big rebuild - -* Mon Dec 1 2003 Chr. Toldnes 2.04-1tr -- New upstream version: 2.04 - -* Thu Oct 30 2003 Chr. Toldnes 2.00-4tr -- Now make install does not fsck up the build box... (patch2) - -* Wed Jun 18 2003 Erlend Midttun 2.00-3tr -- Big rebuild - -* Fri May 16 2003 Erlend Midttun 2.00-2em -- Moved patch creation to a separate script shipped with tsl-utils. - -* Wed May 14 2003 Erlend Midttun 2.00-1em -- New upstream. -- Now create kernel patch here if needed. - -* Mon Mar 24 2003 Erlend Midttun 1.99-3em -- Rebuilt against glibc 2.3.2. - -* Mon Dec 9 2002 Erlend Midttun 1.99-2em -- Use _initrddir. - -* Thu Oct 30 2002 Erlend Midttun -- Fixed wrong path to IPSEC_DIR. - -* Thu Sep 19 2002 Erlend Midttun -- Updated to 1.98b and X509 patch 0.9.15. -- Added some docs - -* Fri Jan 11 2002 Christian H. Toldnes -- Now maybe we got the correct use of chkconfig.... - -* Wed Jan 9 2002 Lars Gaarden -- Merge x509-0.9.5 patch - -* Thu Jan 3 2002 Christian H. Toldnes -- Correct chkconfig line in new init script. - -* Thu Nov 1 2001 Erlend Midttun -- Picked up 1.91 to fix memory leak. - -* Fri Jun 13 2001 Erlend Midttun -- Updated serial when rebuilding for 1.5. - -* Wed Mar 28 2001 Alexander Reelsen -- Updated to 1.9, which fixes a memory leak - -* Mon Jan 29 2001 Olaf Trygve Berglihn -- Fixed preun to only run chkconfig off and service stop if not - upgrading. - -* Fri Aug 4 2000 Per Ivar Paulsen -- First Build For TSL Copied: tinysofa/releases/1.1/strongswan/current/specs/strongswan.spec (from rev 2969, tinysofa/releases/1.1/strongswan/current/specs/freeswan.spec) From svn at tinysofa.org Wed Jul 7 21:21:41 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Thu, 8 Jul 2004 07:21:41 +1000 (EST) Subject: [tinysofa-svn] r2971 - in tinysofa/releases/1.1/nfs-utils/current: sources specs Message-ID: <20040707212141.B66C34E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-08 07:21:41 +1000 (Thu, 08 Jul 2004) New Revision: 2971 Added: tinysofa/releases/1.1/nfs-utils/current/sources/nfs-utils-1.0.3-aclexport.patch Modified: tinysofa/releases/1.1/nfs-utils/current/specs/nfs-utils.spec Log: - add nfs-utils-1.0.3-aclexport.patch Added: tinysofa/releases/1.1/nfs-utils/current/sources/nfs-utils-1.0.3-aclexport.patch =================================================================== --- tinysofa/releases/1.1/nfs-utils/current/sources/nfs-utils-1.0.3-aclexport.patch 2004-07-07 20:26:10 UTC (rev 2970) +++ tinysofa/releases/1.1/nfs-utils/current/sources/nfs-utils-1.0.3-aclexport.patch 2004-07-07 21:21:41 UTC (rev 2971) @@ -0,0 +1,79 @@ +Add `no_acl' nfs export option + +This patch adds the `acl' and `no_acl' nfs export options, which replace +the nfs_permission_mode module parameter of nfsd.o. The `no_acl' option +tells nfsd to mask off acl permissions so that clients will see a subset +of permissions that is safe even with old clients. Current clients +implement the NFSv3 ACCESS RPC, and therefore do not require the +`no_acl' export option. If no acls are supported in the nfs server, the +`no_acl' export option is not needed, either. + +Thanks to Steve Dickson for proposing this. + + +Andreas Gruenbacher , SuSE Labs + + +Index: nfs-utils-1.0.4/utils/exportfs/exportfs.c +=================================================================== +--- nfs-utils-1.0.4.orig/utils/exportfs/exportfs.c 2003-07-03 03:28:53.000000000 +0200 ++++ nfs-utils-1.0.4/utils/exportfs/exportfs.c 2003-07-14 12:56:26.000000000 +0200 +@@ -378,6 +378,8 @@ dump(int verbose) + c = dumpopt(c, "no_subtree_check"); + if (ep->e_flags & NFSEXP_NOAUTHNLM) + c = dumpopt(c, "insecure_locks"); ++ if (ep->e_flags & NFSEXP_NOACL) ++ c = dumpopt(c, "no_acl"); + if (ep->e_flags & NFSEXP_FSID) + c = dumpopt(c, "fsid=%d", ep->e_fsid); + if (ep->e_mountpoint) +Index: nfs-utils-1.0.4/support/nfs/exports.c +=================================================================== +--- nfs-utils-1.0.4.orig/support/nfs/exports.c 2003-05-30 07:17:56.000000000 +0200 ++++ nfs-utils-1.0.4/support/nfs/exports.c 2003-07-14 12:56:26.000000000 +0200 +@@ -185,6 +185,8 @@ putexportent(struct exportent *ep) + "no_" : ""); + fprintf(fp, "%ssecure_locks,", (ep->e_flags & NFSEXP_NOAUTHNLM)? + "in" : ""); ++ fprintf(fp, "%sacl,", (ep->e_flags & NFSEXP_NOACL)? ++ "no_" : ""); + if (ep->e_flags & NFSEXP_FSID) { + fprintf(fp, "fsid=%d,", ep->e_fsid); + } +@@ -374,6 +376,10 @@ parseopts(char *cp, struct exportent *ep + ep->e_flags &= ~NFSEXP_NOAUTHNLM; + else if (strcmp(opt, "insecure_locks") == 0) + ep->e_flags |= NFSEXP_NOAUTHNLM; ++ else if (strcmp(opt, "acl") == 0) ++ ep->e_flags &= ~NFSEXP_NOACL; ++ else if (strcmp(opt, "no_acl") == 0) ++ ep->e_flags |= NFSEXP_NOACL; + else if (strncmp(opt, "mapping=", 8) == 0) + ep->e_maptype = parsemaptype(opt+8); + else if (strcmp(opt, "map_identity") == 0) /* old style */ +Index: nfs-utils-1.0.4/utils/exportfs/exports.man +=================================================================== +--- nfs-utils-1.0.4.orig/utils/exportfs/exports.man 2003-05-30 07:17:56.000000000 +0200 ++++ nfs-utils-1.0.4/utils/exportfs/exports.man 2003-07-14 12:56:26.000000000 +0200 +@@ -218,6 +218,21 @@ be explicitly requested with either of t + .IR auth_nlm , + or + .IR secure_locks . ++.TP ++.IR no_acl ++This option tells nfsd to mask off acl permissions so that clients will ++only see a subset of the permissions on the exported file system. This ++subset is safe for NFSv2 clients, and for NFSv3 clients that perform ++access decisions locally. Current NFSv3 clients use the ACCESS RPC ++to perform all access decisions on the server. The ++.I no_acl ++option should be used for nfs exports with acl support that are exported ++to NFSv2 clients, or to NFSv3 clients that don't use the ACCESS RPC. ++This option is not needed for recent NFSv3 clients or if the exported ++file system has no acl support. The default is to export with acl ++support enabled (i.e., ++.I no_acl ++is off.) + + '''.TP + '''.I noaccess Modified: tinysofa/releases/1.1/nfs-utils/current/specs/nfs-utils.spec =================================================================== --- tinysofa/releases/1.1/nfs-utils/current/specs/nfs-utils.spec 2004-07-07 20:26:10 UTC (rev 2970) +++ tinysofa/releases/1.1/nfs-utils/current/specs/nfs-utils.spec 2004-07-07 21:21:41 UTC (rev 2971) @@ -1,13 +1,14 @@ Summary: NFS utlilities and supporting daemons for the kernel NFS server. Name: nfs-utils Version: 1.0.6 -Release: 5ts +Release: 6jh License: GPL Source0: http://download.sourceforge.net/nfs/%{name}-%{version}.tar.gz Source1: ftp://nfs.sourceforge.net/pub/nfs/nfs.doc.tar.gz Source2: nfs.init Source3: nfslock.init Patch0: nfs-utils-install.patch +Patch1: nfs-utils-1.0.3-aclexport.patch Group: main Obsoletes: nfs-server Obsoletes: knfsd @@ -36,13 +37,13 @@ %prep %setup -q -a 1 %patch0 -p1 +%patch1 -p1 %build CPP="gcc -E" CFLAGS="$RPM_OPT_FLAGS" %configure -make all +%make all %install -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != "/" ] && rm -rf "$RPM_BUILD_ROOT" mkdir -p $RPM_BUILD_ROOT/sbin mkdir -p $RPM_BUILD_ROOT/etc/{init.d,sysconfig} make install install_prefix=$RPM_BUILD_ROOT \ @@ -59,7 +60,7 @@ install -m 644 etc/redhat/nfs ${RPM_BUILD_ROOT}/etc/sysconfig/nfs %clean -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT +%clean_buildroot %post %service_post nfs From svn at tinysofa.org Wed Jul 7 21:25:25 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Thu, 8 Jul 2004 07:25:25 +1000 (EST) Subject: [tinysofa-svn] r2972 - tinysofa/releases/1.1/strongswan/current/specs Message-ID: <20040707212525.938244E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-08 07:25:25 +1000 (Thu, 08 Jul 2004) New Revision: 2972 Modified: tinysofa/releases/1.1/strongswan/current/specs/strongswan.spec Log: - make CFLAGS work somewhat better Modified: tinysofa/releases/1.1/strongswan/current/specs/strongswan.spec =================================================================== --- tinysofa/releases/1.1/strongswan/current/specs/strongswan.spec 2004-07-07 21:21:41 UTC (rev 2971) +++ tinysofa/releases/1.1/strongswan/current/specs/strongswan.spec 2004-07-07 21:25:25 UTC (rev 2972) @@ -39,7 +39,7 @@ %patch2 -p1 %build -CFLAGS="${RPM_OPT_FLAGS}" +CFLAGS="${RPM_OPT_FLAGS}" \ %make \ DESTDIR=/ \ PUBDIR=/usr/sbin \ @@ -51,6 +51,7 @@ RCDIR=%{_initrddir} \ programs + %install %{__mkdir_p} $RPM_BUILD_ROOT%{_initrddir} From svn at tinysofa.org Thu Jul 8 04:27:46 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Thu, 8 Jul 2004 14:27:46 +1000 (EST) Subject: [tinysofa-svn] r2974 - in tinysofa/releases/1.1/vsftpd/current: sources specs Message-ID: <20040708042746.86BAC4E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-08 14:27:45 +1000 (Thu, 08 Jul 2004) New Revision: 2974 Added: tinysofa/releases/1.1/vsftpd/current/sources/vsftpd-1.2.1-conffile.patch tinysofa/releases/1.1/vsftpd/current/sources/vsftpd-1.2.2-signal.patch tinysofa/releases/1.1/vsftpd/current/sources/vsftpd-1.5.1-libs.patch tinysofa/releases/1.1/vsftpd/current/sources/vsftpd-2.0.0-secure.patch tinysofa/releases/1.1/vsftpd/current/sources/vsftpd-2.0.0-ssl.patch tinysofa/releases/1.1/vsftpd/current/sources/vsftpd-2.0.0-tcp_wrappers.patch tinysofa/releases/1.1/vsftpd/current/sources/vsftpd-2.0.1.tar.gz Removed: tinysofa/releases/1.1/vsftpd/current/sources/vsftpd-1.2.0-tcp_wrappers.patch tinysofa/releases/1.1/vsftpd/current/sources/vsftpd-1.2.2.tar.gz Modified: tinysofa/releases/1.1/vsftpd/current/sources/vsftpd.conf tinysofa/releases/1.1/vsftpd/current/specs/vsftpd.spec Log: - backport 2.0.1 Deleted: tinysofa/releases/1.1/vsftpd/current/sources/vsftpd-1.2.0-tcp_wrappers.patch =================================================================== --- tinysofa/releases/1.1/vsftpd/current/sources/vsftpd-1.2.0-tcp_wrappers.patch 2004-07-07 21:39:15 UTC (rev 2973) +++ tinysofa/releases/1.1/vsftpd/current/sources/vsftpd-1.2.0-tcp_wrappers.patch 2004-07-08 04:27:45 UTC (rev 2974) @@ -1,29 +0,0 @@ ---- vsftpd-1.2.0/tcpwrap.c.tcp_wrappers2 2003-01-13 20:55:21.000000000 -0500 -+++ vsftpd-1.2.0/tcpwrap.c 2003-06-24 21:36:04.000000000 -0400 -@@ -31,12 +31,15 @@ - vsf_tcp_wrapper_ok(int remote_fd) - { - struct request_info req; -+ openlog("vsftpd", LOG_PID, LOG_FTP); - request_init(&req, RQ_DAEMON, "vsftpd", RQ_FILE, remote_fd, 0); - fromhost(&req); - if (!hosts_access(&req)) - { -+ closelog(); - return 0; - } -+ closelog(); - return 1; - } - ---- vsftpd-1.1.3/builddefs.h 2003-02-28 12:57:20.000000000 -0500 -+++ vsftpd-1.1.3/builddefs.h 2003-02-28 12:57:25.000000000 -0500 -@@ -1,7 +1,7 @@ - #ifndef VSF_BUILDDEFS_H - #define VSF_BUILDDEFS_H - --#undef VSF_BUILD_TCPWRAPPERS -+#define VSF_BUILD_TCPWRAPPERS - - #endif /* VSF_BUILDDEFS_H */ - Added: tinysofa/releases/1.1/vsftpd/current/sources/vsftpd-1.2.1-conffile.patch =================================================================== --- tinysofa/releases/1.1/vsftpd/current/sources/vsftpd-1.2.1-conffile.patch 2004-07-07 21:39:15 UTC (rev 2973) +++ tinysofa/releases/1.1/vsftpd/current/sources/vsftpd-1.2.1-conffile.patch 2004-07-08 04:27:45 UTC (rev 2974) @@ -0,0 +1,110 @@ +--- vsftpd-1.2.1/FAQ.foo 2004-05-03 18:06:26.051315979 -0400 ++++ vsftpd-1.2.1/FAQ 2004-05-03 18:08:27.168746928 -0400 +@@ -33,7 +33,7 @@ + Q) Help! Local users cannot log in. + A) There are various possible problems. + A1) By default, vsftpd disables any logins other than anonymous logins. Put +-local_enable=YES in your /etc/vsftpd.conf to allow local users to log in. ++local_enable=YES in your /etc/vsftpd/vsftpd.conf to allow local users to log in. + A2) vsftpd tries to link with PAM. (Run "ldd vsftpd" and look for libpam to + find out whether this has happened or not). If vsftpd links with PAM, then + you will need to have a PAM file installed for the vsftpd service. There is +@@ -45,12 +45,12 @@ + A4) If you are not using PAM, then vsftpd will do its own check for a valid + user shell in /etc/shells. You may need to disable this if you use an invalid + shell to disable logins other than FTP logins. Put check_shell=NO in your +-/etc/vsftpd.conf. ++/etc/vsftpd/vsftpd.conf. + + Q) Help! Uploads or other write commands give me "500 Unknown command.". + A) By default, write commands, including uploads and new directories, are + disabled. This is a security measure. To enable writes, put write_enable=YES +-in your /etc/vsftpd.conf. ++in your /etc/vsftpd/vsftpd.conf. + + Q) Help! What are the security implications referred to in the + "chroot_local_user" option? +@@ -86,7 +86,7 @@ + mode. Use "listen_address=x.x.x.x" to set the virtual IP. + + Q) Help! Does vsftpd support virtual users? +-A) Yes, via PAM integration. Set "guest_enable=YES" in /etc/vsftpd.conf. This ++A) Yes, via PAM integration. Set "guest_enable=YES" in /etc/vsftpd/vsftpd.conf. This + has the effect of mapping every non-anonymous successful login to the local + username specified in "guest_username". Then, use PAM and (e.g.) its pam_userdb + module to provide authentication against an external (i.e. non-/etc/passwd) +--- vsftpd-1.2.1/defs.h.foo 2004-05-03 18:06:29.771837724 -0400 ++++ vsftpd-1.2.1/defs.h 2004-05-03 18:07:51.356350436 -0400 +@@ -1,7 +1,7 @@ + #ifndef VSF_DEFS_H + #define VSF_DEFS_H + +-#define VSFTP_DEFAULT_CONFIG "/etc/vsftpd.conf" ++#define VSFTP_DEFAULT_CONFIG "/etc/vsftpd/vsftpd.conf" + + #define VSFTP_COMMAND_FD 0 + +--- vsftpd-1.2.1/INSTALL.foo 2004-05-03 18:06:33.061414865 -0400 ++++ vsftpd-1.2.1/INSTALL 2004-05-03 18:08:57.133895056 -0400 +@@ -63,7 +63,7 @@ + vsftpd can run standalone or via an inetd (such as inetd or xinetd). You will + typically get more control running vsftpd from an inetd. But first we will run + it without, so we can check things are going well so far. +-Edit /etc/vsftpd.conf, and add this line at the bottom: ++Edit /etc/vsftpd/vsftpd.conf, and add this line at the bottom: + + listen=YES + +@@ -135,11 +135,11 @@ + Step 7) Customize your configuration + + As well as the above three pre-requisites, you are recommended to install a +-config file. The default location for the config file is /etc/vsftpd.conf. ++config file. The default location for the config file is /etc/vsftpd/vsftpd.conf. + There is a sample vsftpd.conf in the distribution tarball. You probably want +-to copy that to /etc/vsftpd.conf as a basis for modification, i.e.: ++to copy that to /etc/vsftpd/vsftpd.conf as a basis for modification, i.e.: + +-cp vsftpd.conf /etc ++cp vsftpd.conf /etc/vsftpd/ + + The default configuration allows neither local user logins nor anonymous + uploads. You may wish to change these defaults. +--- vsftpd-1.2.1/vsftpd.8.foo 2004-05-03 18:06:40.593446659 -0400 ++++ vsftpd-1.2.1/vsftpd.8 2004-05-03 18:09:04.438956026 -0400 +@@ -21,7 +21,7 @@ + recommended. It is activated by setting + .Pa listen=YES + in +-.Pa /etc/vsftpd.conf . ++.Pa /etc/vsftpd/vsftpd.conf . + Direct execution of the + .Nm vsftpd + binary will then launch the FTP service ready for immediate client connections. +@@ -29,6 +29,6 @@ + An optional + .Op configuration file + may be given on the command line. The default configuration file is +-.Pa /etc/vsftpd.conf . ++.Pa /etc/vsftpd/vsftpd.conf . + .Sh SEE ALSO + .Xr vsftpd.conf 5 +--- vsftpd-1.2.1/vsftpd.conf.foo 2004-05-03 18:06:55.217566800 -0400 ++++ vsftpd-1.2.1/vsftpd.conf 2004-05-03 18:09:28.049920952 -0400 +@@ -1,4 +1,4 @@ +-# Example config file /etc/vsftpd.conf ++# Example config file /etc/vsftpd/vsftpd.conf + # + # The default compiled in settings are fairly paranoid. This sample file + # loosens things up a bit, to make the ftp daemon more usable. +--- vsftpd-1.2.1/vsftpd.conf.5.foo 2004-05-03 18:07:06.184157099 -0400 ++++ vsftpd-1.2.1/vsftpd.conf.5 2004-05-03 18:09:20.649872192 -0400 +@@ -4,7 +4,7 @@ + .SH DESCRIPTION + vsftpd.conf may be used to control various aspects of vsftpd's behaviour. By + default, vsftpd looks for this file at the location +-.BR /etc/vsftpd.conf . ++.BR /etc/vsftpd/vsftpd.conf . + However, you may override this by specifying a command line argument to + vsftpd. The command line argument is the pathname of the configuration file + for vsftpd. This behaviour is useful because you may wish to use an advanced Added: tinysofa/releases/1.1/vsftpd/current/sources/vsftpd-1.2.2-signal.patch =================================================================== --- tinysofa/releases/1.1/vsftpd/current/sources/vsftpd-1.2.2-signal.patch 2004-07-07 21:39:15 UTC (rev 2973) +++ tinysofa/releases/1.1/vsftpd/current/sources/vsftpd-1.2.2-signal.patch 2004-07-08 04:27:45 UTC (rev 2974) @@ -0,0 +1,42 @@ +--- vsftpd-1.2.1/standalone.c 2003-04-08 01:56:57.000000000 +0200 ++++ vsftpd-1.2.1/standalone.c 2004-03-25 12:53:32.000000000 +0100 +@@ -133,12 +133,8 @@ + void* p_raw_addr; + int new_child; + int new_client_sock; +- vsf_sysutil_unblock_sig(kVSFSysUtilSigCHLD); +- vsf_sysutil_unblock_sig(kVSFSysUtilSigHUP); + new_client_sock = vsf_sysutil_accept_timeout( + listen_sock, p_accept_addr, 0); +- vsf_sysutil_block_sig(kVSFSysUtilSigCHLD); +- vsf_sysutil_block_sig(kVSFSysUtilSigHUP); + if (vsf_sysutil_retval_is_error(new_client_sock)) + { + continue; + +--- vsftpd-1.2.1/sysutil.c 2003-11-11 02:37:16.000000000 +0100 ++++ vsftpd-1.2.1/sysutil.c 2004-03-25 14:27:33.000000000 +0100 +@@ -1606,7 +1606,11 @@ + timeout.tv_usec = 0; + do + { ++ vsf_sysutil_unblock_sig(kVSFSysUtilSigCHLD); ++ vsf_sysutil_unblock_sig(kVSFSysUtilSigHUP); + retval = select(fd + 1, &accept_fdset, NULL, NULL, &timeout); ++ vsf_sysutil_block_sig(kVSFSysUtilSigCHLD); ++ vsf_sysutil_block_sig(kVSFSysUtilSigHUP); + vsf_sysutil_check_pending_actions(kVSFSysUtilUnknown, 0, 0); + } while (retval < 0 && errno == EINTR); + if (retval == 0) +@@ -1615,7 +1619,11 @@ + return -1; + } + } ++ vsf_sysutil_unblock_sig(kVSFSysUtilSigCHLD); ++ vsf_sysutil_unblock_sig(kVSFSysUtilSigHUP); + retval = accept(fd, &remote_addr.u.u_sockaddr, &socklen); ++ vsf_sysutil_block_sig(kVSFSysUtilSigCHLD); ++ vsf_sysutil_block_sig(kVSFSysUtilSigHUP); + vsf_sysutil_check_pending_actions(kVSFSysUtilUnknown, 0, 0); + if (retval < 0) + { Deleted: tinysofa/releases/1.1/vsftpd/current/sources/vsftpd-1.2.2.tar.gz =================================================================== (Binary files differ) Added: tinysofa/releases/1.1/vsftpd/current/sources/vsftpd-1.5.1-libs.patch =================================================================== --- tinysofa/releases/1.1/vsftpd/current/sources/vsftpd-1.5.1-libs.patch 2004-07-07 21:39:15 UTC (rev 2973) +++ tinysofa/releases/1.1/vsftpd/current/sources/vsftpd-1.5.1-libs.patch 2004-07-08 04:27:45 UTC (rev 2974) @@ -0,0 +1,12 @@ +--- vsftpd-1.2.1/Makefile.rh1 2003-11-25 15:58:11.000000000 +0100 ++++ vsftpd-1.2.1/Makefile 2003-11-25 15:58:33.000000000 +0100 +@@ -5,7 +5,8 @@ + #CFLAGS = -g + CFLAGS = -O2 -Wall -W -Wshadow #-pedantic -Werror -Wconversion + +-LIBS = `./vsf_findlibs.sh` ++#LIBS = `./vsf_findlibs.sh` ++LIBS = -lwrap -lnsl -lpam -lcap -ldl + LINK = -Wl,-s + + OBJS = main.o utility.o prelogin.o ftpcmdio.o postlogin.o privsock.o \ Added: tinysofa/releases/1.1/vsftpd/current/sources/vsftpd-2.0.0-secure.patch =================================================================== --- tinysofa/releases/1.1/vsftpd/current/sources/vsftpd-2.0.0-secure.patch 2004-07-07 21:39:15 UTC (rev 2973) +++ tinysofa/releases/1.1/vsftpd/current/sources/vsftpd-2.0.0-secure.patch 2004-07-08 04:27:45 UTC (rev 2974) @@ -0,0 +1,12 @@ +diff -urN vsftpd-2.0.0/vsftpd.conf vsftpd-2.0.0.secure/vsftpd.conf +--- vsftpd-2.0.0/vsftpd.conf 2004-07-02 12:48:55.456563672 +1000 ++++ vsftpd-2.0.0.secure/vsftpd.conf 2004-07-02 12:50:14.581534848 +1000 +@@ -61,7 +61,7 @@ + # + # It is recommended that you define on your system a unique user which the + # ftp server can use as a totally isolated and unprivileged user. +-#nopriv_user=ftpsecure ++nopriv_user=ftp + # + # Enable this and the server will recognise asynchronous ABOR requests. Not + # recommended for security (the code is non-trivial). Not enabling it, Added: tinysofa/releases/1.1/vsftpd/current/sources/vsftpd-2.0.0-ssl.patch =================================================================== --- tinysofa/releases/1.1/vsftpd/current/sources/vsftpd-2.0.0-ssl.patch 2004-07-07 21:39:15 UTC (rev 2973) +++ tinysofa/releases/1.1/vsftpd/current/sources/vsftpd-2.0.0-ssl.patch 2004-07-08 04:27:45 UTC (rev 2974) @@ -0,0 +1,8 @@ +diff --unified=1 -rN vsftpd-2.0.0.builddefs/builddefs.h vsftpd-2.0.0.builddefs.ssl/builddefs.h +--- vsftpd-2.0.0.builddefs/builddefs.h 2004-07-02 12:10:03.141129512 +1000 ++++ vsftpd-2.0.0.builddefs.ssl/builddefs.h 2004-07-02 12:10:33.393530448 +1000 +@@ -5,3 +5,3 @@ + #define VSF_BUILD_PAM +-#undef VSF_BUILD_SSL ++#define VSF_BUILD_SSL + Added: tinysofa/releases/1.1/vsftpd/current/sources/vsftpd-2.0.0-tcp_wrappers.patch =================================================================== --- tinysofa/releases/1.1/vsftpd/current/sources/vsftpd-2.0.0-tcp_wrappers.patch 2004-07-07 21:39:15 UTC (rev 2973) +++ tinysofa/releases/1.1/vsftpd/current/sources/vsftpd-2.0.0-tcp_wrappers.patch 2004-07-08 04:27:45 UTC (rev 2974) @@ -0,0 +1,12 @@ +diff -urN vsftpd-2.0.0/builddefs.h vsftpd-2.0.0.builddefs/builddefs.h +--- vsftpd-2.0.0/builddefs.h 2004-07-02 12:07:27.016864008 +1000 ++++ vsftpd-2.0.0.builddefs/builddefs.h 2004-07-02 12:10:03.141129512 +1000 +@@ -1,7 +1,7 @@ + #ifndef VSF_BUILDDEFS_H + #define VSF_BUILDDEFS_H + +-#undef VSF_BUILD_TCPWRAPPERS ++#define VSF_BUILD_TCPWRAPPERS + #define VSF_BUILD_PAM + #undef VSF_BUILD_SSL + Added: tinysofa/releases/1.1/vsftpd/current/sources/vsftpd-2.0.1.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/releases/1.1/vsftpd/current/sources/vsftpd-2.0.1.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: tinysofa/releases/1.1/vsftpd/current/sources/vsftpd.conf =================================================================== --- tinysofa/releases/1.1/vsftpd/current/sources/vsftpd.conf 2004-07-07 21:39:15 UTC (rev 2973) +++ tinysofa/releases/1.1/vsftpd/current/sources/vsftpd.conf 2004-07-08 04:27:45 UTC (rev 2974) @@ -109,3 +109,36 @@ tcp_wrappers=YES # XXX:tinysofa -- Use /var/lib/vsftp/chroot as secure_chroot_dir. secure_chroot_dir=/var/lib/vsftp/chroot + +# Enable SSL/TLS support for both control and data connections. +# NOTE: You *must* have either a DSA or RSA cert to enable this feature. +# vsftpd *will not* if ssl_enable=YES and there is no cert. +#ssl_enable=YES + +# Allow anonymous users to use SSL +#allow_anon_ssl=YES + +# Force local users to use SSL for data transfers. +force_local_data_ssl=NO + +# Force local users to login using SSL. +force_local_logins_ssl=NO + +# Support SSLv2 +#ssl_sslv2=YES + +# Support SSLv3 +#ssl_sslv3=YES + +# Disable support for TLSv1 +#ssl_tlsv1=NO + +# Path to DSA cert file +#dsa_cert_file=/path/to/vsftpd.pem + +# Path to RSA cert file, default is /usr/share/ssl/certs/vsftpd.pem +#rsa_cert_file=/path/to/vsftpd.pem + +# Additional SSL ciphers to allow. See man ciphers(1). +#ssl_ciphers= + Modified: tinysofa/releases/1.1/vsftpd/current/specs/vsftpd.spec =================================================================== --- tinysofa/releases/1.1/vsftpd/current/specs/vsftpd.spec 2004-07-07 21:39:15 UTC (rev 2973) +++ tinysofa/releases/1.1/vsftpd/current/specs/vsftpd.spec 2004-07-08 04:27:45 UTC (rev 2974) @@ -1,7 +1,7 @@ Summary: vsftpd - Very Secure Ftp Daemon Name: vsftpd -Version: 1.2.2 -Release: 3jh +Version: 2.0.1 +Release: 1jh License: GPL Group: main URL: http://vsftpd.beasts.org/ @@ -12,10 +12,16 @@ Source4: vsftpd.init Source5: vsftpd.logrotate Source6: vsftpd.conf -Patch1: vsftpd-1.2.0-tcp_wrappers.patch +Patch0: vsftpd-1.2.1-conffile.patch +Patch1: vsftpd-2.0.0-tcp_wrappers.patch +Patch2: vsftpd-1.5.1-libs.patch +Patch3: vsftpd-1.2.2-signal.patch +Patch4: vsftpd-2.0.0-secure.patch +Patch5: vsftpd-2.0.0-ssl.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-root -BuildPrereq: tcp_wrappers -Requires: anonftp, logrotate +BuildPrereq: tcp_wrappers openssl-devel +Requires: anonftp, logrotate, openssl %service_requires Provides: ftpserver @@ -30,14 +36,32 @@ %prep %setup -q +%patch0 -p1 %patch1 -p1 +%patch2 -p1 +%patch3 -p1 +%patch4 -p1 +%patch5 -p1 cp %{SOURCE1} . %build -%make CFLAGS="$RPM_OPT_FLAGS -fPIE -pipe" LINK="-pie" +LIBS="-lnsl -lpam -lcap -ldl -lwrap" +if pkg-config openssl ; then + RPM_OPT_FLAGS="${RPM_OPT_FLAGS} `pkg-config --cflags openssl`" + LIBS="${LIBS} `pkg-config --libs openssl`" +else + RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/include/openssl" + LIBS="${LIBS} -lssl -lcrypto" +fi + +%make \ + CFLAGS="$RPM_OPT_FLAGS -fPIE -pipe" LINK="-pie" \ + LIBS="$LIBS" + + %install install -d -m 755 $RPM_BUILD_ROOT/%{_sbindir} install -d -m 755 $RPM_BUILD_ROOT/%{_initrddir} From svn at tinysofa.org Thu Jul 8 04:33:18 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Thu, 8 Jul 2004 14:33:18 +1000 (EST) Subject: [tinysofa-svn] r2975 - tinysofa/releases/1.1/vsftpd/current/sources Message-ID: <20040708043318.747784E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-08 14:33:18 +1000 (Thu, 08 Jul 2004) New Revision: 2975 Modified: tinysofa/releases/1.1/vsftpd/current/sources/vsftpd.init Log: - add try-restart to init script Modified: tinysofa/releases/1.1/vsftpd/current/sources/vsftpd.init =================================================================== --- tinysofa/releases/1.1/vsftpd/current/sources/vsftpd.init 2004-07-08 04:27:45 UTC (rev 2974) +++ tinysofa/releases/1.1/vsftpd/current/sources/vsftpd.init 2004-07-08 04:33:18 UTC (rev 2975) @@ -89,7 +89,7 @@ start RETVAL=$? ;; - condrestart) + condrestart|try-restart) if [ -f ${INITLOCK:-/mnt/lockdev}/${prog} ]; then stop start @@ -101,7 +101,7 @@ RETVAL=$? ;; *) - echo $"Usage: $0 {start|stop|restart|condrestart|status}" + echo $"Usage: $0 {start|stop|restart|try-restart|status}" exit 3 esac From svn at tinysofa.org Thu Jul 8 04:37:57 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Thu, 8 Jul 2004 14:37:57 +1000 (EST) Subject: [tinysofa-svn] r2976 - tinysofa/releases/1.1/kernel/current/sources Message-ID: <20040708043757.2943D4E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-08 14:37:56 +1000 (Thu, 08 Jul 2004) New Revision: 2976 Modified: tinysofa/releases/1.1/kernel/current/sources/kernel-2.4.21-i586.config Log: - add strongSwan to i586 config Modified: tinysofa/releases/1.1/kernel/current/sources/kernel-2.4.21-i586.config =================================================================== --- tinysofa/releases/1.1/kernel/current/sources/kernel-2.4.21-i586.config 2004-07-08 04:33:18 UTC (rev 2975) +++ tinysofa/releases/1.1/kernel/current/sources/kernel-2.4.21-i586.config 2004-07-08 04:37:56 UTC (rev 2976) @@ -431,6 +431,32 @@ CONFIG_NET_CLS_RSVP6=m CONFIG_NET_CLS_POLICE=y +# +# Network testing +# +CONFIG_NET_PKTGEN=m +CONFIG_IPSEC=m + +# +# IPsec options (strongSwan) +# +CONFIG_IPSEC_IPIP=y +CONFIG_IPSEC_AH=y +CONFIG_IPSEC_AUTH_HMAC_MD5=y +CONFIG_IPSEC_AUTH_HMAC_SHA1=y +CONFIG_IPSEC_ESP=y +CONFIG_IPSEC_ENC_3DES=y +CONFIG_IPSEC_ALG=y +CONFIG_IPSEC_ALG_AES=m +CONFIG_IPSEC_ALG_BLOWFISH=m +CONFIG_IPSEC_ALG_TWOFISH=m +CONFIG_IPSEC_ALG_SERPENT=m +CONFIG_IPSEC_ALG_CRYPTOAPI=m +CONFIG_IPSEC_ALG_NON_LIBRE=y +CONFIG_IPSEC_ALG_SHA2=m +CONFIG_IPSEC_IPCOMP=y +# CONFIG_IPSEC_DEBUG is not set +CONFIG_IPSEC_NAT_TRAVERSAL=y # # Telephony Support From svn at tinysofa.org Thu Jul 8 04:43:27 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Thu, 8 Jul 2004 14:43:27 +1000 (EST) Subject: [tinysofa-svn] r2977 - tinysofa/releases/1.1/kernel/current/sources Message-ID: <20040708044327.E652A4E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-08 14:43:27 +1000 (Thu, 08 Jul 2004) New Revision: 2977 Modified: tinysofa/releases/1.1/kernel/current/sources/kernel-2.4.21-i586-BOOT.config Log: - add strongSwan to BOOT config Modified: tinysofa/releases/1.1/kernel/current/sources/kernel-2.4.21-i586-BOOT.config =================================================================== --- tinysofa/releases/1.1/kernel/current/sources/kernel-2.4.21-i586-BOOT.config 2004-07-08 04:37:56 UTC (rev 2976) +++ tinysofa/releases/1.1/kernel/current/sources/kernel-2.4.21-i586-BOOT.config 2004-07-08 04:43:27 UTC (rev 2977) @@ -432,6 +432,10 @@ CONFIG_NET_CLS_RSVP6=m CONFIG_NET_CLS_POLICE=y +# +# Network testing +# +# CONFIG_IPSEC is not set # # Telephony Support From svn at tinysofa.org Thu Jul 8 07:45:33 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Thu, 8 Jul 2004 17:45:33 +1000 (EST) Subject: [tinysofa-svn] r2978 - tinysofa/releases/1.1 Message-ID: <20040708074533.AD1F84E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-08 17:45:33 +1000 (Thu, 08 Jul 2004) New Revision: 2978 Added: tinysofa/releases/1.1/ipsec-tools/ Log: - copy ipsec-tools from snapshot Copied: tinysofa/releases/1.1/ipsec-tools (from rev 2977, tinysofa/snapshot/ipsec-tools) From svn at tinysofa.org Thu Jul 8 07:55:29 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Thu, 8 Jul 2004 17:55:29 +1000 (EST) Subject: [tinysofa-svn] r2979 - tinysofa/releases/1.1/strongswan/current/specs Message-ID: <20040708075529.149DF4E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-08 17:55:28 +1000 (Thu, 08 Jul 2004) New Revision: 2979 Modified: tinysofa/releases/1.1/strongswan/current/specs/strongswan.spec Log: - require ipsec-tools Modified: tinysofa/releases/1.1/strongswan/current/specs/strongswan.spec =================================================================== --- tinysofa/releases/1.1/strongswan/current/specs/strongswan.spec 2004-07-08 07:45:33 UTC (rev 2978) +++ tinysofa/releases/1.1/strongswan/current/specs/strongswan.spec 2004-07-08 07:55:28 UTC (rev 2979) @@ -15,7 +15,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-root Provides: vpn ipsec %service_requires -Requires: gmp +Requires: gmp ipsec-tools PreReq: coreutils BuildRequires: gmp-devel Obsoletes: freeswan From svn at tinysofa.org Thu Jul 8 08:50:13 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Thu, 8 Jul 2004 18:50:13 +1000 (EST) Subject: [tinysofa-svn] r2981 - contrib/mc/current Message-ID: <20040708085013.B6A1D4E80E6@minbar.tinysofa.org> Author: omar Date: 2004-07-08 18:50:12 +1000 (Thu, 08 Jul 2004) New Revision: 2981 Added: contrib/mc/current/specs/ Removed: contrib/mc/current/spec/ Log: - Move spec to specs. Copied: contrib/mc/current/specs (from rev 2980, contrib/mc/current/spec) From svn at tinysofa.org Thu Jul 8 08:52:52 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Thu, 8 Jul 2004 18:52:52 +1000 (EST) Subject: [tinysofa-svn] r2982 - in contrib/amavisd-new/current: sources specs Message-ID: <20040708085252.C2BE04E80E6@minbar.tinysofa.org> Author: omar Date: 2004-07-08 18:52:52 +1000 (Thu, 08 Jul 2004) New Revision: 2982 Added: contrib/amavisd-new/current/sources/amavisd-new-20040701.tar.gz Removed: contrib/amavisd-new/current/sources/amavisd-new-20040623.tar.gz Modified: contrib/amavisd-new/current/specs/amavisd-new.spec Log: - New upstream. Deleted: contrib/amavisd-new/current/sources/amavisd-new-20040623.tar.gz =================================================================== (Binary files differ) Added: contrib/amavisd-new/current/sources/amavisd-new-20040701.tar.gz =================================================================== (Binary files differ) Property changes on: contrib/amavisd-new/current/sources/amavisd-new-20040701.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: contrib/amavisd-new/current/specs/amavisd-new.spec =================================================================== --- contrib/amavisd-new/current/specs/amavisd-new.spec 2004-07-08 08:50:12 UTC (rev 2981) +++ contrib/amavisd-new/current/specs/amavisd-new.spec 2004-07-08 08:52:52 UTC (rev 2982) @@ -1,11 +1,11 @@ -%define realversion 20040623 +%define realversion 20040701 Name: amavisd-new Version: 0.0.%{realversion} Release: 1gd Summary: AMaViSd-new - A Mail Virus Scanner URL: http://www.ijs.si/software/amavisd/ License: GPL -Group: Trustix Contrib +Group: tinysofa contrib Source0: %{name}-%{realversion}.tar.gz Source1: amavisd.init Source2: amavisd.conf @@ -142,6 +142,9 @@ %changelog +* Thu Jul 07 2004 Omar Kilani 20040701-1ok +- 20040701. + * Thu Jun 24 2004 Gerald Dachs 20040623-1gd - new development snapshot From svn at tinysofa.org Thu Jul 8 08:55:15 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Thu, 8 Jul 2004 18:55:15 +1000 (EST) Subject: [tinysofa-svn] r2983 - in contrib/clamav/current: sources specs Message-ID: <20040708085515.A36C34E80E6@minbar.tinysofa.org> Author: omar Date: 2004-07-08 18:55:15 +1000 (Thu, 08 Jul 2004) New Revision: 2983 Added: contrib/clamav/current/sources/clamav-0.74.tar.gz Removed: contrib/clamav/current/sources/clamav-0.73.tar.gz Modified: contrib/clamav/current/specs/clamav.spec Log: - New upstream. Deleted: contrib/clamav/current/sources/clamav-0.73.tar.gz =================================================================== (Binary files differ) Added: contrib/clamav/current/sources/clamav-0.74.tar.gz =================================================================== (Binary files differ) Property changes on: contrib/clamav/current/sources/clamav-0.74.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: contrib/clamav/current/specs/clamav.spec =================================================================== --- contrib/clamav/current/specs/clamav.spec 2004-07-08 08:52:52 UTC (rev 2982) +++ contrib/clamav/current/specs/clamav.spec 2004-07-08 08:55:15 UTC (rev 2983) @@ -1,7 +1,7 @@ Summary: An antivirus toolkit for Unix Name: clamav -Version: 0.73 -Release: 3bg +Version: 0.74 +Release: 1ok License: GPL Group: tinysofa contrib URL: http://www.clamav.net @@ -185,6 +185,9 @@ %changelog +* Thu Jul 07 2004 Omar Kilani 0.74-1ok +- New upstream. + * Tue Jun 22 2004 Goetz Bock 0.73-3bg - tried to fix none root builds From svn at tinysofa.org Thu Jul 8 09:01:23 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Thu, 8 Jul 2004 19:01:23 +1000 (EST) Subject: [tinysofa-svn] r2984 - contrib/spamassassin/current Message-ID: <20040708090123.5DD534E80E6@minbar.tinysofa.org> Author: omar Date: 2004-07-08 19:01:23 +1000 (Thu, 08 Jul 2004) New Revision: 2984 Added: contrib/spamassassin/current/sources/ Removed: contrib/spamassassin/current/source/ Log: - Move source to sources. Copied: contrib/spamassassin/current/sources (from rev 2980, contrib/spamassassin/current/source) From svn at tinysofa.org Thu Jul 8 17:04:15 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 9 Jul 2004 03:04:15 +1000 (EST) Subject: [tinysofa-svn] r2985 - in tinysofa/releases/1.1/beecrypt/current: sources specs Message-ID: <20040708170415.73E084E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-09 03:04:14 +1000 (Fri, 09 Jul 2004) New Revision: 2985 Added: tinysofa/releases/1.1/beecrypt/current/sources/beecrypt-20040324.patch Modified: tinysofa/releases/1.1/beecrypt/current/specs/beecrypt.spec Log: - update to later version - make it work with non-exec stack (mark stack non-executable) - use some macros in spec file Added: tinysofa/releases/1.1/beecrypt/current/sources/beecrypt-20040324.patch =================================================================== --- tinysofa/releases/1.1/beecrypt/current/sources/beecrypt-20040324.patch 2004-07-08 09:01:23 UTC (rev 2984) +++ tinysofa/releases/1.1/beecrypt/current/sources/beecrypt-20040324.patch 2004-07-08 17:04:14 UTC (rev 2985) @@ -0,0 +1,577 @@ +diff -ru beecrypt-3.1.0/CONTRIBUTORS beecrypt-20040324/CONTRIBUTORS +--- beecrypt-3.1.0/CONTRIBUTORS 2003-05-17 14:11:06.000000000 +0000 ++++ beecrypt-20040324/CONTRIBUTORS 2003-08-23 06:36:39.000000000 +0000 +@@ -1,5 +1,6 @@ + I would like to thank the following people (in alphabetical order): + ++- Seth Arnold, for contributing to the documentation. + - Jan-Rudolph B?hrmann, for helping me get started on the 64-bit multi- + precision integer library. + - Luca Filipozzi, maintainer/packager of BeeCrypt for Debian GNU/Linux. +diff -ru beecrypt-3.1.0/gas/mpopt.x86.m4 beecrypt-20040324/gas/mpopt.x86.m4 +--- beecrypt-3.1.0/gas/mpopt.x86.m4 2003-06-04 17:39:58.000000000 +0000 ++++ beecrypt-20040324/gas/mpopt.x86.m4 2003-09-02 10:36:05.000000000 +0000 +@@ -29,7 +29,7 @@ + movl 12(%esp),%edi + + xorl %eax,%eax +- repz stosl ++ repz; stosl + + popl %edi + ret +@@ -43,7 +43,7 @@ + movl 12(%esp),%edi + movl 16(%esp),%eax + +- repz stosl ++ repz; stosl + + popl %edi + ret +diff -ru beecrypt-3.1.0/gas/sha1opt.x86.m4 beecrypt-20040324/gas/sha1opt.x86.m4 +--- beecrypt-3.1.0/gas/sha1opt.x86.m4 2003-05-08 17:52:54.000000000 +0000 ++++ beecrypt-20040324/gas/sha1opt.x86.m4 2003-09-02 10:38:22.000000000 +0000 +@@ -21,13 +21,13 @@ + include(config.m4) + include(ASM_SRCDIR/x86.m4) + +- .equ K00, 0x5a827999 +- .equ K20, 0x6ed9eba1 +- .equ K40, 0x8f1bbcdc +- .equ K60, 0xca62c1d6 ++ .set K00, 0x5a827999 ++ .set K20, 0x6ed9eba1 ++ .set K40, 0x8f1bbcdc ++ .set K60, 0xca62c1d6 + +- .equ PARAM_H, 0 +- .equ PARAM_DATA, 20 ++ .set PARAM_H, 0 ++ .set PARAM_DATA, 20 + + define(`subround1',` + movl $2,%ecx +diff -ru beecrypt-3.1.0/mp.c beecrypt-20040324/mp.c +--- beecrypt-3.1.0/mp.c 2003-06-25 19:25:41.000000000 +0000 ++++ beecrypt-20040324/mp.c 2004-03-18 20:00:04.000000000 +0000 +@@ -1219,6 +1219,14 @@ + /* keep adding the modulus until we get a carry */ + while (!mpaddx(sizep, ddata, size, ndata)); + } ++ else ++ { ++ /* in some computations, d ends up > n, hence: ++ * keep subtracting n from d until d < n ++ */ ++ while (mpgtx(sizep, ddata, size, ndata)) ++ mpsubx(sizep, ddata, size, ndata); ++ } + mpsetx(size, result, sizep, ddata); + } + return 1; +@@ -1400,34 +1408,39 @@ + + int i2osp(byte *osdata, size_t ossize, const mpw* idata, size_t isize) + { +- size_t required = MP_WORDS_TO_BYTES(isize); ++ size_t max_bytes = MP_WORDS_TO_BYTES(isize); ++ size_t significant_bytes = (mpbits(isize, idata) + 7) >> 3; ++ size_t zero_bytes = max_bytes - significant_bytes; + +- /* check if size is large enough */ +- if (ossize >= required) ++ /* verify that ossize is large enough to contain the significant bytes */ ++ if (ossize >= significant_bytes) + { +- /* yes, we can proceed */ +- if (ossize > required) +- { /* fill initial bytes with zero */ +- memset(osdata, 0, ossize-required); +- osdata += ossize-required; ++ /* looking good; check if we have more space than significant bytes */ ++ if (ossize > significant_bytes) ++ { /* fill most significant bytes with zero */ ++ memset(osdata, 0, ossize - significant_bytes); ++ osdata += ossize - significant_bytes; + } +- if (required) ++ if (significant_bytes) + { /* fill remaining bytes with endian-adjusted data */ + #if !WORDS_BIGENDIAN +- while (required) +- { +- mpw w = *(idata++); +- byte shift = MP_WBITS; ++ mpw w = idata[--isize]; ++ byte shift = 0; + +- while (shift) ++ /* fill right-to-left; much easier than left-to-right */ ++ do ++ { ++ osdata[--significant_bytes] = (byte)(w >> shift); ++ shift += 8; ++ if (shift == MP_WBITS) + { +- shift -= 8; +- *(osdata++) = (byte)(w >> shift); ++ shift == 0; ++ w = idata[--isize]; + } +- required -= MP_WBYTES; +- } ++ } while (significant_bytes); + #else +- memcpy(osdata, idata, required); ++ /* just copy */ ++ memcpy(osdata, ((byte*) idata) + zero_bytes, significant_bytes); + #endif + } + return 0; +@@ -1437,7 +1450,7 @@ + + int os2ip(mpw* idata, size_t isize, const byte* osdata, size_t ossize) + { +- size_t required = MP_BYTES_TO_WORDS(isize + MP_WBYTES - 1); ++ size_t required = MP_BYTES_TO_WORDS(ossize + MP_WBYTES - 1); + + if (isize >= required) + { +diff -ru beecrypt-3.1.0/mp.h beecrypt-20040324/mp.h +--- beecrypt-3.1.0/mp.h 2003-06-04 17:39:56.000000000 +0000 ++++ beecrypt-20040324/mp.h 2003-08-23 06:34:34.000000000 +0000 +@@ -407,14 +407,35 @@ + BEECRYPTAPI + void mpclrlsb(size_t size, mpw* data); + ++/*!\fn mpand(size_t size, mpw* xdata, const mpw* ydata) ++ * \brief This function computes the bit-wise AND of two multi-precision ++ * integers. Modifies xdata. ++ * \param size The size of the multi-precision integers. ++ * \param xdata The multi-precision integer data. ++ * \param ydata The multi-precision integer data. ++ */ + BEECRYPTAPI +-void mpand(size_t, mpw*, const mpw*); ++void mpand(size_t size, mpw* xdata, const mpw* ydata); + ++/*!\fn void mpor(size_t size, mpw* xdata, const mpw* ydata) ++ * \brief This function computes the bit-wise OR of two multi-precision ++ * integers. Modifies xdata. ++ * \param size The size of the multi-precision integer. ++ * \param xdata The multi-precision integer data. ++ * \param ydata The multi-precision integer data. ++ */ + BEECRYPTAPI +-void mpor(size_t, mpw*, const mpw*); ++void mpor(size_t size, mpw* xdata, const mpw* ydata); + ++/*!\fn void mpxor(size_t size, mpw* xdata, const mpw* ydata) ++ * \brief This function computes the bit-wise XOR of two multi-precision ++ * integers. Modifies xdata. ++ * \param size The size of the multi-precision integer. ++ * \param xdata The multi-precision integer data. ++ * \param ydata The multi-precision integer data. ++ */ + BEECRYPTAPI +-void mpxor(size_t, mpw*, const mpw*); ++void mpxor(size_t size, mpw* xdata, const mpw* ydata); + + /*!\fn mpnot(size_t size, mpw* data) + * \brief This function flips all bits of a multi-precision integer. +@@ -502,7 +523,7 @@ + BEECRYPTAPI + int mpsub (size_t size, mpw* xdata, const mpw* ydata); + +-/*!\fn int mpaddx(size_t xsize, mpw* xdata, size_t ysize, const mpw* ydata) ++/*!\fn int mpsubx(size_t xsize, mpw* xdata, size_t ysize, const mpw* ydata) + * \brief This function subtracts two multi-precision integers of different + * size. The performed operation in pseudocode: x -= y. + * \param xsize The size of the first multi-precision integer. +@@ -517,12 +538,29 @@ + BEECRYPTAPI + int mpmultwo(size_t size, mpw* data); + ++/*!\fn void mpneg(size_t size, mpw* data) ++ * \brief This function negates a multi-precision integer. ++ * \param size The size of the multi-precision integer. ++ * \param data The multi-precision integer data. ++ */ + BEECRYPTAPI + void mpneg(size_t size, mpw* data); + ++/*!\fn size_t mpsize(size_t size, const mpw* data) ++ * \brief This function returns the true size of a multi-precision ++ * integer, after stripping leading zero words. ++ * \param size The size of the multi-precision integer. ++ * \param data The multi-precision integer data. ++ */ + BEECRYPTAPI + size_t mpsize(size_t size, const mpw* data); + ++/*!\fn size_t mpbits(size_t size, const mpw* data) ++ * \brief This function returns the number of significant bits ++ * in a multi-precision integer. ++ * \param size The size of the multi-precision integer. ++ * \param data The multi-precision integer data. ++ */ + BEECRYPTAPI + size_t mpbits(size_t size, const mpw* data); + +@@ -588,35 +626,34 @@ + * squaring. + */ + BEECRYPTAPI +-void mpaddsqrtrc(size_t, mpw*, const mpw*); ++void mpaddsqrtrc(size_t size, mpw* result, const mpw* data); + + /*!\fn void mpmul(mpw* result, size_t xsize, const mpw* xdata, size_t ysize, const mpw* ydata) + * \brief This function computes a full multi-precision product. + */ + BEECRYPTAPI +-void mpmul(mpw*, size_t, const mpw*, size_t, const mpw*); ++void mpmul(mpw* result, size_t xsize, const mpw* xdata, size_t ysize, const mpw* ydata); ++ + /*!\fn void mpsqr(mpw* result, size_t size, const mpw* data) + * \brief This function computes a full multi-precision square. + */ + BEECRYPTAPI +-void mpsqr(mpw*, size_t, const mpw*); ++void mpsqr(mpw* result, size_t size, const mpw* data); + + BEECRYPTAPI +-void mpgcd_w(size_t, const mpw*, const mpw*, mpw*, mpw*); +-BEECRYPTAPI +-int mpextgcd_w(size_t, const mpw*, const mpw*, mpw*, mpw*); ++void mpgcd_w(size_t size, const mpw* xdata, const mpw* ydata, mpw* result, mpw* wksp); + + BEECRYPTAPI +-mpw mppndiv(mpw, mpw, mpw); ++int mpextgcd_w(size_t size, const mpw* xdata, const mpw* ydata, mpw* result, mpw* wksp); + + BEECRYPTAPI +-void mpnmod(mpw*, size_t, const mpw*, size_t, const mpw*, mpw*); ++mpw mppndiv(mpw xhi, mpw xlo, mpw y); + + BEECRYPTAPI +-void mpmod (mpw*, size_t, const mpw*, size_t, const mpw*, mpw*); ++void mpmod (mpw* result, size_t xsize, const mpw* xdata, size_t ysize, const mpw*ydata, mpw* wksp); + + BEECRYPTAPI +-void mpndivmod(mpw*, size_t, const mpw*, size_t, const mpw*, mpw*); ++void mpndivmod(mpw* result, size_t xsize, const mpw* xdata, size_t ysize, const mpw* ydata, mpw* wksp); + + /* + * Output Routines +@@ -639,13 +676,13 @@ + */ + + BEECRYPTAPI +-int os2ip(mpw*, size_t, const byte*, size_t); ++int os2ip(mpw* idata, size_t isize, const byte* osdata, size_t ossize); + + BEECRYPTAPI +-int i2osp(byte*, size_t, const mpw*, size_t); ++int i2osp(byte* osdata, size_t ossize, const mpw* idata, size_t isize); + + BEECRYPTAPI +-int hs2ip(mpw*, size_t, const char*, size_t); ++int hs2ip(mpw* idata, size_t isize, const char* hsdata, size_t hssize); + + #ifdef __cplusplus + } +diff -ru beecrypt-3.1.0/mpprime.c beecrypt-20040324/mpprime.c +--- beecrypt-3.1.0/mpprime.c 2003-05-31 10:05:41.000000000 +0000 ++++ beecrypt-20040324/mpprime.c 2003-11-29 10:55:14.000000000 +0000 +@@ -706,16 +706,47 @@ + return 35; + } + +-static void mpprndbits(mpbarrett* p, size_t msbclr, size_t lsbset, randomGeneratorContext* rc) ++/* ++ * needs workspace of (size*2) words ++ */ ++static void mpprndbits(mpbarrett* p, size_t bits, size_t lsbset, const mpnumber* min, const mpnumber* max, randomGeneratorContext* rc, mpw* wksp) + { + register size_t size = p->size; ++ register size_t msbclr = MP_WORDS_TO_BITS(size) - bits; ++ ++ /* assume that mpbits(max) == bits */ ++ /* calculate k=max-min; generate q such that 0 <= q <= k; then set p = q + min */ ++ /* for the second step, set the appropriate number of bits */ ++ ++ if (max) ++ { ++ mpsetx(size, wksp, max->size, max->data); ++ } ++ else ++ { ++ mpfill(size, wksp, MP_ALLMASK); ++ wksp[0] &= (MP_ALLMASK >> msbclr); ++ } ++ if (min) ++ { ++ mpsetx(size, wksp+size, min->size, min->data); ++ } ++ else ++ { ++ mpzero(size, wksp+size); ++ wksp[size] |= (MP_MSBMASK >> msbclr); ++ } ++ ++ mpsub(size, wksp, wksp+size); + + rc->rng->next(rc->param, (byte*) p->modl, MP_WORDS_TO_BYTES(size)); + +- if (msbclr) +- p->modl[0] &= (MP_ALLMASK >> msbclr); ++ p->modl[0] &= (MP_ALLMASK >> msbclr); ++ ++ while (mpgt(size, p->modl, wksp)) ++ mpsub(size, p->modl, wksp); + +- p->modl[0] |= (MP_MSBMASK >> msbclr); ++ mpadd(size, p->modl, wksp+size); + + if (lsbset) + p->modl[size-1] |= (MP_ALLMASK >> (MP_WBITS - lsbset)); +@@ -851,16 +882,49 @@ + */ + void mpprnd_w(mpbarrett* p, randomGeneratorContext* rc, size_t bits, int t, const mpnumber* f, mpw* wksp) + { ++ mpprndr_w(p, rc, bits, t, (const mpnumber*) 0, (const mpnumber*) 0, f, wksp); ++} ++ ++/* ++ * implements IEEE P1363 A.15.6 ++ * ++ * f, min, max are optional ++ */ ++int mpprndr_w(mpbarrett* p, randomGeneratorContext* rc, size_t bits, int t, const mpnumber* min, const mpnumber* max, const mpnumber* f, mpw* wksp) ++{ + /* + * Generate a prime into p with the requested number of bits + * + * Conditions: size(f) <= size(p) + * ++ * Optional input min: if min is not null, then search p so that min <= p ++ * Optional input max: if max is not null, then search p so that p <= max + * Optional input f: if f is not null, then search p so that GCD(p-1,f) = 1 + */ + + size_t size = MP_BITS_TO_WORDS(bits + MP_WBITS - 1); + ++ /* if min has more bits than what was requested for p, bail out */ ++ if (min && (mpbits(min->size, min->data) > bits)) ++ { ++ printf("bail out 1\n"); ++ return -1; ++ } ++ ++ /* if max has a different number of bits than what was requested for p, bail out */ ++ if (max && (mpbits(max->size, max->data) != bits)) ++ { ++ printf("bail out 1\n"); ++ return -2; ++ } ++ ++ /* if min is not less than max, bail out */ ++ if (min && max && mpgex(min->size, min->data, max->size, max->data)) ++ { ++ printf("bail out 1\n"); ++ return -2; ++ } ++ + mpbinit(p, size); + + if (p->modl) +@@ -871,7 +935,7 @@ + * Generate a random appropriate candidate prime, and test + * it with small prime divisor test BEFORE computing mu + */ +- mpprndbits(p, MP_WORDS_TO_BITS(size) - bits, 1, rc); ++ mpprndbits(p, bits, 1, min, max, rc, wksp); + + /* do a small prime product trial division test on p */ + if (!mppsppdiv_w(p, wksp)) +@@ -893,7 +957,7 @@ + mpbmu_w(p, wksp); + + if (mppmilrab_w(p, rc, t, wksp)) +- return; ++ return 0; + } + } + } +@@ -930,7 +994,7 @@ + + while (1) + { +- mpprndbits(&s, MP_WORDS_TO_BITS(s.size) - sbits, 0, rc); ++ mpprndbits(&s, sbits, 0, (mpnumber*) 0, (mpnumber*) 0, rc, wksp); + + if (cofactor == 1) + { +@@ -1035,7 +1099,7 @@ + * it with small prime divisor test BEFORE computing mu + */ + +- mpprndbits(p, 0, 2, rc); ++ mpprndbits(p, bits, 2, (mpnumber*) 0, (mpnumber*) 0, rc, wksp); + + mpcopy(size, q.modl, p->modl); + mpdivtwo(size, q.modl); +diff -ru beecrypt-3.1.0/mpprime.h beecrypt-20040324/mpprime.h +--- beecrypt-3.1.0/mpprime.h 2003-04-16 11:05:44.000000000 +0000 ++++ beecrypt-20040324/mpprime.h 2003-11-23 08:27:07.000000000 +0000 +@@ -44,6 +44,8 @@ + BEECRYPTAPI + void mpprnd_w (mpbarrett*, randomGeneratorContext*, size_t, int, const mpnumber*, mpw*); + BEECRYPTAPI ++int mpprndr_w (mpbarrett*, randomGeneratorContext*, size_t, int, const mpnumber*, const mpnumber*, const mpnumber*, mpw*); ++BEECRYPTAPI + void mpprndsafe_w (mpbarrett*, randomGeneratorContext*, size_t, int, mpw*); + BEECRYPTAPI + void mpprndcon_w (mpbarrett*, randomGeneratorContext*, size_t, int, const mpnumber*, const mpnumber*, const mpnumber*, mpnumber*, mpw*); +diff -ru beecrypt-3.1.0/rsakp.c beecrypt-20040324/rsakp.c +--- beecrypt-3.1.0/rsakp.c 2003-08-17 06:46:57.000000000 +0000 ++++ beecrypt-20040324/rsakp.c 2003-11-23 08:32:19.000000000 +0000 +@@ -36,77 +36,64 @@ + * \{ + */ + +-int rsakpMake(rsakp* kp, randomGeneratorContext* rgc, int nsize) ++int rsakpMake(rsakp* kp, randomGeneratorContext* rgc, size_t bits) + { + /* + * Generates an RSA Keypair for use with the Chinese Remainder Theorem + */ + +- register size_t pqsize = (nsize+1) >> 1; +- register mpw* temp = (mpw*) malloc((16*pqsize+6)*sizeof(mpw)); +- register int newn = 1; ++ size_t pbits = (bits+1) >> 1; ++ size_t qbits = (bits - pbits); ++ size_t nsize = MP_BITS_TO_WORDS(bits+MP_WBITS-1); ++ size_t psize = MP_BITS_TO_WORDS(pbits+MP_WBITS-1); ++ size_t qsize = MP_BITS_TO_WORDS(qbits+MP_WBITS-1); ++ size_t pqsize = psize+qsize; ++ mpw* temp = (mpw*) malloc((16*pqsize+6)*sizeof(mpw)); + + if (temp) + { +- mpbarrett r, psubone, qsubone; +- mpnumber phi; +- +- nsize = pqsize << 1; ++ mpbarrett psubone, qsubone; ++ mpnumber phi, min; ++ mpw* divmod = temp; ++ mpw* dividend = divmod+nsize+1; ++ mpw* workspace = dividend+nsize+1; ++ int shift; + + /* set e */ +- mpnsetw(&kp->e, 65535); ++ mpnsetw(&kp->e, 65537); ++ ++ /* generate a random prime p */ ++ mpprnd_w(&kp->p, rgc, pbits, mpptrials(pbits), &kp->e, temp); ++ ++ /* find out how big q should be */ ++ shift = MP_WORDS_TO_BITS(nsize) - bits; ++ mpzero(nsize, dividend); ++ dividend[0] |= MP_MSBMASK; ++ dividend[nsize-1] |= MP_LSBMASK; ++ mpndivmod(divmod, nsize+1, dividend, psize, kp->p.modl, workspace); ++ mprshift(nsize+1, divmod, shift); + +- /* generate a random prime p and q */ +- mpprnd_w(&kp->p, rgc, pqsize, mpptrials(MP_WORDS_TO_BITS(pqsize)), &kp->e, temp); +- mpprnd_w(&kp->q, rgc, pqsize, mpptrials(MP_WORDS_TO_BITS(pqsize)), &kp->e, temp); ++ mpnzero(&min); ++ mpnset(&min, nsize+1-psize, divmod); + +- /* if p <= q, perform a swap to make p larger than q */ +- if (mple(pqsize, kp->p.modl, kp->q.modl)) ++ /* generate a random prime q, with min/max constraints */ ++ if (mpprndr_w(&kp->q, rgc, qbits, mpptrials(qbits), &min, (mpnumber*) 0, &kp->e, temp)) + { +- memcpy(&r, &kp->q, sizeof(mpbarrett)); +- memcpy(&kp->q, &kp->p, sizeof(mpbarrett)); +- memcpy(&kp->p, &r, sizeof(mpbarrett)); ++ /* shouldn't happen */ ++ mpnfree(&min); ++ free(temp); ++ return -1; + } + +- mpbzero(&r); ++ mpnfree(&min); ++ + mpbzero(&psubone); + mpbzero(&qsubone); + mpnzero(&phi); + +- while (1) +- { +- mpmul(temp, pqsize, kp->p.modl, pqsize, kp->q.modl); +- +- if (newn && mpmsbset(nsize, temp)) +- break; +- +- /* product of p and q doesn't have the required size (one bit short) */ +- +- mpprnd_w(&r, rgc, pqsize, mpptrials(MP_WORDS_TO_BITS(pqsize)), &kp->e, temp); +- +- if (mple(pqsize, kp->p.modl, r.modl)) +- { +- mpbfree(&kp->q); +- memcpy(&kp->q, &kp->p, sizeof(mpbarrett)); +- memcpy(&kp->p, &r, sizeof(mpbarrett)); +- mpbzero(&r); +- newn = 1; +- } +- else if (mple(pqsize, kp->q.modl, r.modl)) +- { +- mpbfree(&kp->q); +- memcpy(&kp->q, &r, sizeof(mpbarrett)); +- mpbzero(&r); +- newn = 1; +- } +- else +- { +- mpbfree(&r); +- newn = 0; +- } +- } +- +- mpbset(&kp->n, nsize, temp); ++ /* set n = p*q, with appropriate size (pqsize may be > nsize) */ ++ mpmul(temp, psize, kp->p.modl, qsize, kp->q.modl); ++ mpbset(&kp->n, nsize, temp+pqsize-nsize); + + /* compute p-1 */ + mpbsubone(&kp->p, temp); +@@ -132,7 +119,7 @@ + mpbmod_w(&qsubone, kp->d.data, kp->d2.data, temp); + + /* compute c = inv(q) mod p */ +- mpninv(&kp->c, (const mpnumber*) &kp->q, (const mpnumber*) &kp->p); ++ mpninv(&kp->c, (mpnumber*) &kp->q, (mpnumber*) &kp->p); + + free(temp); + +diff -ru beecrypt-3.1.0/rsakp.h beecrypt-20040324/rsakp.h +--- beecrypt-3.1.0/rsakp.h 2003-04-16 12:08:03.000000000 +0000 ++++ beecrypt-20040324/rsakp.h 2003-11-23 08:32:19.000000000 +0000 +@@ -77,7 +77,7 @@ + #endif + + BEECRYPTAPI +-int rsakpMake(rsakp*, randomGeneratorContext*, int); ++int rsakpMake(rsakp*, randomGeneratorContext*, size_t); + BEECRYPTAPI + int rsakpInit(rsakp*); + BEECRYPTAPI Modified: tinysofa/releases/1.1/beecrypt/current/specs/beecrypt.spec =================================================================== --- tinysofa/releases/1.1/beecrypt/current/specs/beecrypt.spec 2004-07-08 09:01:23 UTC (rev 2984) +++ tinysofa/releases/1.1/beecrypt/current/specs/beecrypt.spec 2004-07-08 17:04:14 UTC (rev 2985) @@ -4,12 +4,13 @@ Summary: An open source cryptography library. Name: beecrypt Version: 3.1.0 -Release: 5ts +Release: 6jh Group: main License: LGPL URL: http://sourceforge.net/projects/beecrypt Source0: http://prdownloads.sourceforge.net/beecrypt/%{name}-3.1.0.tar.gz Patch0: beecrypt-3.1.0-rh.patch +Patch1: beecrypt-20040324.patch %if %{?with_python:1}0 BuildRequires: python BuildPreReq: python-devel >= %{with_python_version} @@ -47,18 +48,18 @@ %prep %setup -q %patch0 -p1 -b .rh +%patch1 -p1 -b .20040324 ./autogen.sh %build - +CFLAGS="$RPM_OPT_FLAGS -Wa,--noexecstack" %configure --enable-shared --enable-static %{?with_python} -make +%make %install -rm -fr $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT +%makeinstall_std # XXX nuke unpackaged files, artifacts from using libtool to produce module rm -f ${RPM_BUILD_ROOT}%{_libdir}/python%{with_python_version}/site-packages/_bc.*a @@ -70,7 +71,7 @@ #make bench || : %clean -rm -fr $RPM_BUILD_ROOT +%clean_buildroot %post -p /sbin/ldconfig From svn at tinysofa.org Thu Jul 8 18:04:35 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 9 Jul 2004 04:04:35 +1000 (EST) Subject: [tinysofa-svn] r2986 - tinysofa/releases/1.1/beecrypt/current/specs Message-ID: <20040708180435.584EE4E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-09 04:04:35 +1000 (Fri, 09 Jul 2004) New Revision: 2986 Modified: tinysofa/releases/1.1/beecrypt/current/specs/beecrypt.spec Log: - clean up the spec file Modified: tinysofa/releases/1.1/beecrypt/current/specs/beecrypt.spec =================================================================== --- tinysofa/releases/1.1/beecrypt/current/specs/beecrypt.spec 2004-07-08 17:04:14 UTC (rev 2985) +++ tinysofa/releases/1.1/beecrypt/current/specs/beecrypt.spec 2004-07-08 18:04:35 UTC (rev 2986) @@ -1,5 +1,4 @@ %define with_python --with-python -%define with_python_version 2.3%{nil} Summary: An open source cryptography library. Name: beecrypt @@ -11,13 +10,8 @@ Source0: http://prdownloads.sourceforge.net/beecrypt/%{name}-3.1.0.tar.gz Patch0: beecrypt-3.1.0-rh.patch Patch1: beecrypt-20040324.patch -%if %{?with_python:1}0 -BuildRequires: python -BuildPreReq: python-devel >= %{with_python_version} -%endif -BuildRoot: %{_tmppath}/%{name}-root +BuildRoot: %{_tmppath}/%{name}-%{version}-root Requires: libstdc++ - BuildRequires: autoconf automake libtool BuildRequires: libstdc++-devel @@ -37,7 +31,7 @@ %package python Summary: Files needed for python applications using beecrypt. Group: main -Requires: python >= %{with_python_version} +%py_requires -d Requires: %{name} = %{version}-%{release} %description python @@ -45,6 +39,7 @@ files needed for using python with beecrypt. %endif + %prep %setup -q %patch0 -p1 -b .rh @@ -52,17 +47,19 @@ ./autogen.sh + %build CFLAGS="$RPM_OPT_FLAGS -Wa,--noexecstack" %configure --enable-shared --enable-static %{?with_python} %make + %install %makeinstall_std # XXX nuke unpackaged files, artifacts from using libtool to produce module -rm -f ${RPM_BUILD_ROOT}%{_libdir}/python%{with_python_version}/site-packages/_bc.*a +rm -f %{buildroot}%{py_sitedir}/_bc.*a # XXX delete next line to build with legacy, non-check aware, rpmbuild. #%check @@ -70,13 +67,16 @@ #cat /proc/cpuinfo #make bench || : + %clean %clean_buildroot + %post -p /sbin/ldconfig %postun -p /sbin/ldconfig + %files %defattr(-,root,root) %doc README BENCHMARKS @@ -93,9 +93,10 @@ %if %{?with_python:1}0 %files python %defattr(-,root,root) -%{_libdir}/python%{with_python_version}/site-packages/_bc.so +%{py_sitedir}/_bc.so %endif + %changelog * Wed May 19 2004 tsintegrate 3.1.0-5ts - current (3.1.0-4ts) integrated as 3.1.0-5ts for release 1.0-U1 From svn at tinysofa.org Thu Jul 8 20:36:38 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 9 Jul 2004 06:36:38 +1000 (EST) Subject: [tinysofa-svn] r2987 - tinysofa/releases/1.1/xinetd/current/specs Message-ID: <20040708203638.93B464E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-09 06:36:38 +1000 (Fri, 09 Jul 2004) New Revision: 2987 Modified: tinysofa/releases/1.1/xinetd/current/specs/xinetd.spec Log: - eliminate tinysofa-utils requirement Modified: tinysofa/releases/1.1/xinetd/current/specs/xinetd.spec =================================================================== --- tinysofa/releases/1.1/xinetd/current/specs/xinetd.spec 2004-07-08 18:04:35 UTC (rev 2986) +++ tinysofa/releases/1.1/xinetd/current/specs/xinetd.spec 2004-07-08 20:36:38 UTC (rev 2987) @@ -1,7 +1,7 @@ Summary: A secure replacement for inetd. Name: xinetd Version: 2.3.13 -Release: 6ts +Release: 7jh License: Distributable Group: main Source: http://www.xinetd.org/%{name}-%{version}.tar.gz @@ -20,7 +20,8 @@ Source13: xinetd-servers Source14: xinetd-services Provides: inetd -Prereq: chkconfig /etc/init.d /sbin/service tinysofa-utils +Prereq: /etc/init.d +%service_requires BuildRequires: tcp_wrappers glibc-devel libtool Requires: filesystem, initscripts, setup, coreutils URL: http://www.xinetd.org @@ -82,9 +83,6 @@ %clean %clean_buildroot -%pre -/sbin/service xinetd stop 2>/dev/null >/dev/null || : - %post chmod +x /usr/sbin/inetdconvert %service_post xinetd From svn at tinysofa.org Thu Jul 8 20:37:23 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 9 Jul 2004 06:37:23 +1000 (EST) Subject: [tinysofa-svn] r2988 - tinysofa/releases/1.1/cyrus-imapd/current/specs Message-ID: <20040708203723.BB9724E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-09 06:37:23 +1000 (Fri, 09 Jul 2004) New Revision: 2988 Modified: tinysofa/releases/1.1/cyrus-imapd/current/specs/cyrus-imapd.spec Log: - remove tinysofa-utils requirement Modified: tinysofa/releases/1.1/cyrus-imapd/current/specs/cyrus-imapd.spec =================================================================== --- tinysofa/releases/1.1/cyrus-imapd/current/specs/cyrus-imapd.spec 2004-07-08 20:36:38 UTC (rev 2987) +++ tinysofa/releases/1.1/cyrus-imapd/current/specs/cyrus-imapd.spec 2004-07-08 20:37:23 UTC (rev 2988) @@ -1,7 +1,7 @@ Summary: A high-performance mail store with IMAP and POP3 support. Name: cyrus-imapd Version: 2.2.3 -Release: 4ts +Release: 5jh License: BSD Group: extra URL: http://asg.web.cmu.edu/cyrus/imapd/ @@ -24,7 +24,7 @@ patch7: cyrus-imapd-perl-path2.patch BuildRoot: %{_tmppath}/%{name}-root -Requires: cyrus-sasl, db4, chkconfig, tinysofa-utils, imapd-pam, libcom_err +Requires: cyrus-sasl, db4, imapd-pam, libcom_err BuildRequires: cyrus-sasl-devel, e2fsprogs-devel, perl, perl-devel, tcp_wrappers BuildRequires: db4, db4-devel, openssl-devel, libcom_err-devel Prereq: shadow-utils, glibc From svn at tinysofa.org Thu Jul 8 20:38:24 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 9 Jul 2004 06:38:24 +1000 (EST) Subject: [tinysofa-svn] r2989 - tinysofa/releases/1.1/kudzu/current/specs Message-ID: <20040708203824.1637E4E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-09 06:38:23 +1000 (Fri, 09 Jul 2004) New Revision: 2989 Modified: tinysofa/releases/1.1/kudzu/current/specs/kudzu.spec Log: - remove tinysofa-utils requirement Modified: tinysofa/releases/1.1/kudzu/current/specs/kudzu.spec =================================================================== --- tinysofa/releases/1.1/kudzu/current/specs/kudzu.spec 2004-07-08 20:37:23 UTC (rev 2988) +++ tinysofa/releases/1.1/kudzu/current/specs/kudzu.spec 2004-07-08 20:38:23 UTC (rev 2989) @@ -11,7 +11,7 @@ Patch1: kudzu-1.1.22-link-slang.patch Requires: hwdata Obsoletes: rhs-hwdiag setconsole -Prereq: chkconfig, modutils >= 2.3.11-5, tinysofa-utils +Prereq: modutils >= 2.3.11-5 BuildPrereq: pciutils-devel python-devel newt-devel BuildRequires: gettext python slang-devel dietlibc BuildRoot: %{_tmppath}/%{name}-root From svn at tinysofa.org Thu Jul 8 20:39:34 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 9 Jul 2004 06:39:34 +1000 (EST) Subject: [tinysofa-svn] r2990 - tinysofa/releases/1.1/openldap/current/specs Message-ID: <20040708203934.025A74E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-09 06:39:34 +1000 (Fri, 09 Jul 2004) New Revision: 2990 Modified: tinysofa/releases/1.1/openldap/current/specs/openldap.spec Log: - fix service requirements Modified: tinysofa/releases/1.1/openldap/current/specs/openldap.spec =================================================================== --- tinysofa/releases/1.1/openldap/current/specs/openldap.spec 2004-07-08 20:38:23 UTC (rev 2989) +++ tinysofa/releases/1.1/openldap/current/specs/openldap.spec 2004-07-08 20:39:34 UTC (rev 2990) @@ -6,7 +6,7 @@ Summary: Lightweight Directory Access Protocol clients/servers Name: openldap Version: 2.1.30 -Release: 2ts +Release: 3jh Source0: ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/openldap-%{version}.tgz Source1: openldap.init Source2: openldap-slapd.conf @@ -33,7 +33,6 @@ BuildRoot: %{_tmppath}/%{name}-root BuildRequires: openssl-devel tcp_wrappers cyrus-sasl-devel libtool Requires: readline -%service_requires BuildRequires: readline-devel %if !%{_useldbm} BuildRequires: db4-devel @@ -58,7 +57,7 @@ Summary: LDAP servers Group: extra Provides: slapd, slurpd -Prereq: chkconfig, tinysofa-utils +%service_requires Requires: %{name}, %{name}-libs, cyrus-sasl > 2.0, openssl %if !%{_useldbm} BuildRequires: db4 From svn at tinysofa.org Thu Jul 8 20:46:03 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 9 Jul 2004 06:46:03 +1000 (EST) Subject: [tinysofa-svn] r2991 - tinysofa/releases/1.1/postgresql/current/specs Message-ID: <20040708204603.C54BC4E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-09 06:46:03 +1000 (Fri, 09 Jul 2004) New Revision: 2991 Modified: tinysofa/releases/1.1/postgresql/current/specs/postgresql.spec Log: - improve requirements - disable perl requirement generator Modified: tinysofa/releases/1.1/postgresql/current/specs/postgresql.spec =================================================================== --- tinysofa/releases/1.1/postgresql/current/specs/postgresql.spec 2004-07-08 20:39:34 UTC (rev 2990) +++ tinysofa/releases/1.1/postgresql/current/specs/postgresql.spec 2004-07-08 20:46:03 UTC (rev 2991) @@ -8,7 +8,7 @@ Summary: PostgreSQL client programs and libraries. Name: postgresql Version: 7.4.3 -Release: 1ts +Release: 2jh License: BSD Group: main Source0: ftp://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar.bz2 @@ -34,7 +34,7 @@ # Not in use Patch4: postgresql-7.3.2-rpm.patch Requires: glibc shadow-utils initscripts zlib >= 1.1.4 -Requires: %{name}-libs = %{version} +Requires: %{name}-libs = %{version}-%{release} BuildRequires: python-devel perl gcc sed readline-devel ncurses-devel zlib-devel openssl-devel pam-devel BuildRequires: python bison byacc flex BuildRoot: %{_tmppath}/%{name}-root @@ -73,7 +73,8 @@ Group: main Prereq: shadow-utils Requires: %{name}-libs = %{version} -Requires: postgresql = %{version}, chkconfig, tinysofa-utils +Requires: postgresql = %{version}-%{release} +%service_requires %description server The postgresql-server package includes the programs needed to create @@ -109,7 +110,7 @@ %package devel Summary: PostgreSQL development header files and libraries. Group: development -Requires: %{name}-libs = %{version} +Requires: %{name}-libs = %{version}-%{release} Requires: postgresql = %{version} %description devel @@ -136,7 +137,7 @@ %package python Summary: Development module for Python code to access a PostgreSQL DB. Group: development -Requires: %{name}-libs = %{version} +Requires: %{name}-libs = %{version}-%{release} Requires: python >= 1.5 %description python @@ -149,7 +150,7 @@ Summary: The test suite distributed with PostgreSQL. Group: extra Requires: %{name}-contrib = %{version} -Requires: %{name}-libs = %{version} +Requires: %{name}-libs = %{version}-%{release} Requires: postgresql = %{version} %description test @@ -502,6 +503,10 @@ %{_mandir}/manl/update.l* %{_mandir}/manl/vacuum.l* +# we don't have Pg perl module +# ignore dependencies for now +%define __perl_requires %{nil} + %files contrib %defattr(-,root,root) %doc contrib/*/README.* contrib/spi/*.example From svn at tinysofa.org Thu Jul 8 20:47:28 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 9 Jul 2004 06:47:28 +1000 (EST) Subject: [tinysofa-svn] r2992 - tinysofa/releases/1.1/tinysofa-utils/current/specs Message-ID: <20040708204728.0E7CE4E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-09 06:47:27 +1000 (Fri, 09 Jul 2004) New Revision: 2992 Modified: tinysofa/releases/1.1/tinysofa-utils/current/specs/tinysofa-utils.spec Log: - tune requirements Modified: tinysofa/releases/1.1/tinysofa-utils/current/specs/tinysofa-utils.spec =================================================================== --- tinysofa/releases/1.1/tinysofa-utils/current/specs/tinysofa-utils.spec 2004-07-08 20:46:03 UTC (rev 2991) +++ tinysofa/releases/1.1/tinysofa-utils/current/specs/tinysofa-utils.spec 2004-07-08 20:47:27 UTC (rev 2992) @@ -12,8 +12,7 @@ Group: development BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRequires: coreutils -Requires: rpm -PreReq: mkinitrd, coreutils, sysvinit, file, modutils +Requires: rpm python BuildArch: noarch %description From svn at tinysofa.org Fri Jul 9 07:41:43 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 9 Jul 2004 17:41:43 +1000 (EST) Subject: [tinysofa-svn] r2993 - tinysofa/releases/1.1/setarch/current/specs Message-ID: <20040709074143.49B1A4E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-09 17:41:41 +1000 (Fri, 09 Jul 2004) New Revision: 2993 Modified: tinysofa/releases/1.1/setarch/current/specs/setarch.spec Log: - fix executable file permissions Modified: tinysofa/releases/1.1/setarch/current/specs/setarch.spec =================================================================== --- tinysofa/releases/1.1/setarch/current/specs/setarch.spec 2004-07-08 20:47:27 UTC (rev 2992) +++ tinysofa/releases/1.1/setarch/current/specs/setarch.spec 2004-07-09 07:41:41 UTC (rev 2993) @@ -47,7 +47,9 @@ echo ".so setarch.8" > $RPM_BUILD_ROOT%{_mandir}/man8/$I.8 done +chmod 755 %{buildroot}%{_bindir}/* + %clean %clean_buildroot From svn at tinysofa.org Fri Jul 9 07:46:04 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 9 Jul 2004 17:46:04 +1000 (EST) Subject: [tinysofa-svn] r2994 - tinysofa/releases/1.1/lvm/current/specs Message-ID: <20040709074604.BD2174E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-09 17:46:04 +1000 (Fri, 09 Jul 2004) New Revision: 2994 Modified: tinysofa/releases/1.1/lvm/current/specs/lvm.spec Log: - fix excutable permissions Modified: tinysofa/releases/1.1/lvm/current/specs/lvm.spec =================================================================== --- tinysofa/releases/1.1/lvm/current/specs/lvm.spec 2004-07-09 07:41:41 UTC (rev 2993) +++ tinysofa/releases/1.1/lvm/current/specs/lvm.spec 2004-07-09 07:46:04 UTC (rev 2994) @@ -47,7 +47,6 @@ %install -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT %makeinstall sbindir=$RPM_BUILD_ROOT/sbin libdir=$RPM_BUILD_ROOT/lib pushd $RPM_BUILD_ROOT/usr/share/man/man8 gzip * @@ -58,6 +57,9 @@ strip * popd +chmod 755 %{buildroot}/sbin/* + + %clean %clean_buildroot From svn at tinysofa.org Fri Jul 9 07:50:38 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 9 Jul 2004 17:50:38 +1000 (EST) Subject: [tinysofa-svn] r2995 - tinysofa/releases/1.1/lvm/current/specs Message-ID: <20040709075038.0754C4E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-09 17:50:37 +1000 (Fri, 09 Jul 2004) New Revision: 2995 Modified: tinysofa/releases/1.1/lvm/current/specs/lvm.spec Log: - fix more permissions Modified: tinysofa/releases/1.1/lvm/current/specs/lvm.spec =================================================================== --- tinysofa/releases/1.1/lvm/current/specs/lvm.spec 2004-07-09 07:46:04 UTC (rev 2994) +++ tinysofa/releases/1.1/lvm/current/specs/lvm.spec 2004-07-09 07:50:37 UTC (rev 2995) @@ -35,7 +35,7 @@ %build -FLAGS=$(echo $RPM_OPT_FLAGS | sed "s|-D_FILE_OFFSET_BITS=64 -D_LARGE_FILES=1 -D_LARGEFILE64_SOURCE=1||") \ +CFLAGS=$(echo $RPM_OPT_FLAGS | sed "s|-D_FILE_OFFSET_BITS=64 -D_LARGE_FILES=1 -D_LARGEFILE64_SOURCE=1||") \ ./configure \ --prefix=%{_prefix} \ --mandir=%{_mandir} \ @@ -43,7 +43,7 @@ --libdir=/lib \ --with-user=`id -un` \ --with-group=`id -gn` -make +%make %install @@ -58,8 +58,8 @@ popd chmod 755 %{buildroot}/sbin/* +chmod 644 %{buildroot}%{_libdir}/*.a - %clean %clean_buildroot @@ -79,8 +79,8 @@ %files devel %defattr(-,root,root) -%attr(755,root,root) /usr/lib/*.so* -%attr(644,root,root) /usr/lib/*.a +%attr(755,root,root) %{_libdir}/*.so* +%attr(644,root,root) %{_libdir}/*.a %changelog From svn at tinysofa.org Fri Jul 9 07:59:26 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 9 Jul 2004 17:59:26 +1000 (EST) Subject: [tinysofa-svn] r2996 - tinysofa/releases/1.1/lvm/current/specs Message-ID: <20040709075926.9FBD14E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-09 17:59:26 +1000 (Fri, 09 Jul 2004) New Revision: 2996 Modified: tinysofa/releases/1.1/lvm/current/specs/lvm.spec Log: - use %_lib macro - more permission fixes Modified: tinysofa/releases/1.1/lvm/current/specs/lvm.spec =================================================================== --- tinysofa/releases/1.1/lvm/current/specs/lvm.spec 2004-07-09 07:50:37 UTC (rev 2995) +++ tinysofa/releases/1.1/lvm/current/specs/lvm.spec 2004-07-09 07:59:26 UTC (rev 2996) @@ -12,19 +12,18 @@ Group: main URL: http://www.sistina.com/lvm BuildRequires: libtool -BuildRoot: %{_tmppath}/%{name}-root +BuildRoot: %{_tmppath}/%{name}-%{version}-root %description Utilities for the Logical Volume Managment - %package devel Summary: development libraries for lvm Group: development Requires: lvm = %{version}-%{release} %description devel -statical and unstriped dynamical library for lvm development +statical and unstripped dynamical library for lvm development %prep @@ -40,26 +39,26 @@ --prefix=%{_prefix} \ --mandir=%{_mandir} \ --sbindir=/sbin \ - --libdir=/lib \ + --libdir=/%{_lib} \ --with-user=`id -un` \ --with-group=`id -gn` %make %install -%makeinstall sbindir=$RPM_BUILD_ROOT/sbin libdir=$RPM_BUILD_ROOT/lib -pushd $RPM_BUILD_ROOT/usr/share/man/man8 -gzip * -popd -#force striping of liblvm (keep unstriped version in /usr for debugging) -pushd $RPM_BUILD_ROOT/lib -cp -a * ../usr/lib -strip * -popd +%makeinstall sbindir=$RPM_BUILD_ROOT/sbin libdir=$RPM_BUILD_ROOT/%{_lib} +chmod 755 %{buildroot}/%{_lib}/*.so* chmod 755 %{buildroot}/sbin/* chmod 644 %{buildroot}%{_libdir}/*.a +#force stripping of liblvm (keep unstriped version in /usr for debugging) +pushd $RPM_BUILD_ROOT/%{_lib} +cp -a * ../%{_libdir} +strip * +popd + + %clean %clean_buildroot @@ -74,8 +73,8 @@ %doc ABSTRACT CHANGELOG CONTRIBUTORS COPYING COPYING.LIB FAQ %doc KNOWN_BUGS LVM-HOWTO README TODO WHATSNEW /sbin/* -%attr(755,root,root) /lib/*.so* -%{_mandir}/man8/* +%attr(755,root,root) /%{_lib}/*.so* +%attr(644,root,root) %{_mandir}/man8/* %files devel %defattr(-,root,root) From svn at tinysofa.org Fri Jul 9 14:52:47 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Sat, 10 Jul 2004 00:52:47 +1000 (EST) Subject: [tinysofa-svn] r2997 - in tinysofa/releases/1.1/tinysofa-rpm-config/current: sources specs Message-ID: <20040709145247.5BE3E4E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-10 00:52:46 +1000 (Sat, 10 Jul 2004) New Revision: 2997 Added: tinysofa/releases/1.1/tinysofa-rpm-config/current/sources/tinysofa-rpm-config-1.1.3.tar.bz2 Removed: tinysofa/releases/1.1/tinysofa-rpm-config/current/sources/tinysofa-rpm-config-1.1.2.tar.bz2 Modified: tinysofa/releases/1.1/tinysofa-rpm-config/current/specs/tinysofa-rpm-config.spec Log: - new version of the rpm config, enables brp-strip-shared Deleted: tinysofa/releases/1.1/tinysofa-rpm-config/current/sources/tinysofa-rpm-config-1.1.2.tar.bz2 =================================================================== (Binary files differ) Added: tinysofa/releases/1.1/tinysofa-rpm-config/current/sources/tinysofa-rpm-config-1.1.3.tar.bz2 =================================================================== (Binary files differ) Property changes on: tinysofa/releases/1.1/tinysofa-rpm-config/current/sources/tinysofa-rpm-config-1.1.3.tar.bz2 ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: tinysofa/releases/1.1/tinysofa-rpm-config/current/specs/tinysofa-rpm-config.spec =================================================================== --- tinysofa/releases/1.1/tinysofa-rpm-config/current/specs/tinysofa-rpm-config.spec 2004-07-09 07:59:26 UTC (rev 2996) +++ tinysofa/releases/1.1/tinysofa-rpm-config/current/specs/tinysofa-rpm-config.spec 2004-07-09 14:52:46 UTC (rev 2997) @@ -1,6 +1,6 @@ Summary: tinysofa specific rpm configuration files. Name: tinysofa-rpm-config -Version: 1.1.2 +Version: 1.1.3 Release: 1jh License: GPL Group: development @@ -25,10 +25,12 @@ %clean %clean_buildroot + %files %defattr(-,root,root) %{_prefix}/lib/rpm/tinysofa + %changelog * Fri Feb 13 2004 Elliot Lee - rebuilt From svn at tinysofa.org Fri Jul 9 22:30:17 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Sat, 10 Jul 2004 08:30:17 +1000 (EST) Subject: [tinysofa-svn] r2998 - tinysofa/releases/1.1/iputils/current/specs Message-ID: <20040709223017.820674E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-10 08:30:17 +1000 (Sat, 10 Jul 2004) New Revision: 2998 Modified: tinysofa/releases/1.1/iputils/current/specs/iputils.spec Log: - exclude traceroute6 because it is already in traceroute package Modified: tinysofa/releases/1.1/iputils/current/specs/iputils.spec =================================================================== --- tinysofa/releases/1.1/iputils/current/specs/iputils.spec 2004-07-09 14:52:46 UTC (rev 2997) +++ tinysofa/releases/1.1/iputils/current/specs/iputils.spec 2004-07-09 22:30:17 UTC (rev 2998) @@ -116,11 +116,11 @@ %attr(4755,root,root) /bin/ping6 /bin/tracepath /bin/tracepath6 -%attr(4755,root,root)/bin/traceroute6 +%exclude %attr(4755,root,root)/bin/traceroute6 %{_sbindir}/ping6 %{_sbindir}/tracepath %{_sbindir}/tracepath6 -%{_sbindir}/traceroute6 +%exclude %{_sbindir}/traceroute6 %defattr(644,root,root,755) %{_mandir}/man8/* %doc RELNOTES README.bonding From svn at tinysofa.org Fri Jul 9 22:30:51 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Sat, 10 Jul 2004 08:30:51 +1000 (EST) Subject: [tinysofa-svn] r2999 - tinysofa/releases/1.1/passwd/current/specs Message-ID: <20040709223051.765B44E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-10 08:30:51 +1000 (Sat, 10 Jul 2004) New Revision: 2999 Modified: tinysofa/releases/1.1/passwd/current/specs/passwd.spec Log: - correct release number Modified: tinysofa/releases/1.1/passwd/current/specs/passwd.spec =================================================================== --- tinysofa/releases/1.1/passwd/current/specs/passwd.spec 2004-07-09 22:30:17 UTC (rev 2998) +++ tinysofa/releases/1.1/passwd/current/specs/passwd.spec 2004-07-09 22:30:51 UTC (rev 2999) @@ -1,7 +1,7 @@ Summary: The passwd utility for setting/changing passwords using PAM. Name: passwd Version: 0.68 -Release: 1jh +Release: 11jh License: BSD Group: main Source: passwd-%{version}-8.tar.gz From svn at tinysofa.org Sat Jul 10 08:31:54 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Sat, 10 Jul 2004 18:31:54 +1000 (EST) Subject: [tinysofa-svn] r3000 - tinysofa/releases/1.1/rpm/current/specs Message-ID: <20040710083154.5741D4E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-10 18:31:52 +1000 (Sat, 10 Jul 2004) New Revision: 3000 Modified: tinysofa/releases/1.1/rpm/current/specs/rpm.spec Log: - add BuildRequires: bzip2-devel Modified: tinysofa/releases/1.1/rpm/current/specs/rpm.spec =================================================================== --- tinysofa/releases/1.1/rpm/current/specs/rpm.spec 2004-07-09 22:30:51 UTC (rev 2999) +++ tinysofa/releases/1.1/rpm/current/specs/rpm.spec 2004-07-10 08:31:52 UTC (rev 3000) @@ -50,7 +50,7 @@ # XXX Red Hat 5.2 has not bzip2 or python %if %{with_bzip2} -BuildRequires: bzip2 >= 0.9.0c-2 +BuildRequires: bzip2 bzip2-devel %endif %if %{with_python_subpackage} BuildRequires: python-devel >= %{with_python_version} From svn at tinysofa.org Sat Jul 10 11:00:09 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Sat, 10 Jul 2004 21:00:09 +1000 (EST) Subject: [tinysofa-svn] r3001 - tinysofa/releases/1.0/rpm/current/specs Message-ID: <20040710110009.F2DC34E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-10 21:00:08 +1000 (Sat, 10 Jul 2004) New Revision: 3001 Modified: tinysofa/releases/1.0/rpm/current/specs/rpm.spec Log: - added BuildRequires: bzip2-devel to make rpm support bzip2 compression Modified: tinysofa/releases/1.0/rpm/current/specs/rpm.spec =================================================================== --- tinysofa/releases/1.0/rpm/current/specs/rpm.spec 2004-07-10 08:31:52 UTC (rev 3000) +++ tinysofa/releases/1.0/rpm/current/specs/rpm.spec 2004-07-10 11:00:08 UTC (rev 3001) @@ -20,7 +20,7 @@ %define version 4.2.2 Version: %{version} %{expand: %%define rpm_version %{version}} -Release: 5ts +Release: 6jh Group: tinysofa official Source: ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.0.x/rpm-%{rpm_version}.tar.gz Source2: rpm-4.2.2-tinysofa-macros @@ -49,6 +49,7 @@ # XXX Red Hat 5.2 has not bzip2 or python %if %{with_bzip2} BuildRequires: bzip2 >= 0.9.0c-2 +BuildRequires: bzip2-devel >= 0.9.0c-2 %endif %if %{with_python_subpackage} BuildRequires: python-devel >= %{with_python_version} @@ -496,6 +497,9 @@ %{__includedir}/popt.h %changelog +* Sat Jul 10 2004 Jaakko Heinonen 4.2.2-6jh +- added BuildRequires: bzip2-devel to make rpm support bzip2 compression + * Wed May 19 2004 tsintegrate 4.2.2-5ts - current (4.2.2-5ok) integrated as 4.2.2-5ts for release 1.0-U1 @@ -591,4 +595,4 @@ * Thu Mar 27 2003 Jeff Johnson 4.2.1-0.1 - start rpm-4.2.1. -- hack out O_DIRECT support in db4 for now. \ No newline at end of file +- hack out O_DIRECT support in db4 for now. From svn at tinysofa.org Sat Jul 10 11:13:16 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Sat, 10 Jul 2004 21:13:16 +1000 (EST) Subject: [tinysofa-svn] r3002 - tinysofa/releases/1.1/lftp/current Message-ID: <20040710111316.2DD4A4E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-10 21:13:15 +1000 (Sat, 10 Jul 2004) New Revision: 3002 Removed: tinysofa/releases/1.1/lftp/current/sources/ Log: - remove current lftp sources From svn at tinysofa.org Sat Jul 10 11:13:56 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Sat, 10 Jul 2004 21:13:56 +1000 (EST) Subject: [tinysofa-svn] r3003 - tinysofa/releases/1.1/lftp/current Message-ID: <20040710111356.878B24E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-10 21:13:56 +1000 (Sat, 10 Jul 2004) New Revision: 3003 Added: tinysofa/releases/1.1/lftp/current/sources/ Log: - copy lftp sources from 1.0 Copied: tinysofa/releases/1.1/lftp/current/sources (from rev 3002, tinysofa/releases/1.0/lftp/current/sources) From svn at tinysofa.org Sat Jul 10 11:25:58 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Sat, 10 Jul 2004 21:25:58 +1000 (EST) Subject: [tinysofa-svn] r3004 - tinysofa/releases/1.1/lftp/current/specs Message-ID: <20040710112558.CB3184E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-10 21:25:58 +1000 (Sat, 10 Jul 2004) New Revision: 3004 Modified: tinysofa/releases/1.1/lftp/current/specs/lftp.spec Log: - change version number Modified: tinysofa/releases/1.1/lftp/current/specs/lftp.spec =================================================================== --- tinysofa/releases/1.1/lftp/current/specs/lftp.spec 2004-07-10 11:13:56 UTC (rev 3003) +++ tinysofa/releases/1.1/lftp/current/specs/lftp.spec 2004-07-10 11:25:58 UTC (rev 3004) @@ -1,7 +1,7 @@ Summary: A sophisticated file transfer program Name: lftp -Version: 3.0.5 -Release: 1jh +Version: 3.0.6 +Release: 2jh License: GPL Group: main Source0: http://ftp.yars.free.net/pub/software/unix/net/ftp/client/lftp/lftp-%{version}.tar.bz2 From svn at tinysofa.org Sat Jul 10 11:29:06 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Sat, 10 Jul 2004 21:29:06 +1000 (EST) Subject: [tinysofa-svn] r3005 - tinysofa/releases/1.1/rsync/current/specs Message-ID: <20040710112906.BA0C14E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-10 21:29:06 +1000 (Sat, 10 Jul 2004) New Revision: 3005 Modified: tinysofa/releases/1.1/rsync/current/specs/rsync.spec Log: - increase release number Modified: tinysofa/releases/1.1/rsync/current/specs/rsync.spec =================================================================== --- tinysofa/releases/1.1/rsync/current/specs/rsync.spec 2004-07-10 11:25:58 UTC (rev 3004) +++ tinysofa/releases/1.1/rsync/current/specs/rsync.spec 2004-07-10 11:29:06 UTC (rev 3005) @@ -1,7 +1,7 @@ Summary: A program for synchronizing files over a network. Name: rsync Version: 2.6.2 -Release: 3jh +Release: 4jh Group: main # TAG: for pre versions use #Source: ftp://rsync.samba.org/pub/rsync/rsync-%{version}pre-2.tar.gz From svn at tinysofa.org Sat Jul 10 11:29:54 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Sat, 10 Jul 2004 21:29:54 +1000 (EST) Subject: [tinysofa-svn] r3006 - tinysofa/releases/1.1/fcron/current/specs Message-ID: <20040710112954.B94C24E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-10 21:29:54 +1000 (Sat, 10 Jul 2004) New Revision: 3006 Modified: tinysofa/releases/1.1/fcron/current/specs/fcron.spec Log: - increase release number Modified: tinysofa/releases/1.1/fcron/current/specs/fcron.spec =================================================================== --- tinysofa/releases/1.1/fcron/current/specs/fcron.spec 2004-07-10 11:29:06 UTC (rev 3005) +++ tinysofa/releases/1.1/fcron/current/specs/fcron.spec 2004-07-10 11:29:54 UTC (rev 3006) @@ -1,7 +1,7 @@ Summary: The fcron daemon for executing specified programs at set times Name: fcron Version: 2.9.4 -Release: 10jh +Release: 11jh License: GPL Group: main Source0: http://fcron.free.fr/%{name}-%{version}.src.tar.gz From svn at tinysofa.org Sat Jul 10 11:30:26 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Sat, 10 Jul 2004 21:30:26 +1000 (EST) Subject: [tinysofa-svn] r3007 - tinysofa/releases/1.1/python/current/specs Message-ID: <20040710113026.6A8704E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-10 21:30:26 +1000 (Sat, 10 Jul 2004) New Revision: 3007 Modified: tinysofa/releases/1.1/python/current/specs/python.spec Log: - increase release number Modified: tinysofa/releases/1.1/python/current/specs/python.spec =================================================================== --- tinysofa/releases/1.1/python/current/specs/python.spec 2004-07-10 11:29:54 UTC (rev 3006) +++ tinysofa/releases/1.1/python/current/specs/python.spec 2004-07-10 11:30:26 UTC (rev 3007) @@ -7,7 +7,7 @@ Summary: An interpreted, interactive, object-oriented programming language. Name: %{python} Version: %{pybasever}.4 -Release: 1jh +Release: 2jh License: PSF - see LICENSE Group: main Provides: python-abi = %{pybasever} From svn at tinysofa.org Sat Jul 10 13:30:52 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Sat, 10 Jul 2004 23:30:52 +1000 (EST) Subject: [tinysofa-svn] r3008 - tinysofa/releases/1.1/bash/current/specs Message-ID: <20040710133052.B99F54E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-10 23:30:52 +1000 (Sat, 10 Jul 2004) New Revision: 3008 Modified: tinysofa/releases/1.1/bash/current/specs/bash.spec Log: - handle upgrade from bash-static Modified: tinysofa/releases/1.1/bash/current/specs/bash.spec =================================================================== --- tinysofa/releases/1.1/bash/current/specs/bash.spec 2004-07-10 11:30:26 UTC (rev 3007) +++ tinysofa/releases/1.1/bash/current/specs/bash.spec 2004-07-10 13:30:52 UTC (rev 3008) @@ -51,6 +51,7 @@ Requires: mktemp Prereq: coreutils setup Provides: bash2 +%rename bash-static BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRequires: perl byacc @@ -172,6 +173,8 @@ mkdir ./bin mv ./usr/bin/bash ./bin ln -sf bash ./bin/sh +mkdir -m 755 ./sbin +ln -sf ../bin/bash ./sbin/bash popd mkdir -p %{buildroot}%{_sysconfdir}/skel install -c -m644 $RPM_SOURCE_DIR/dot-bashrc \ @@ -230,6 +233,7 @@ %config(noreplace) %{_sysconfdir}/skel/.b* /bin/sh /bin/bash +/sbin/bash %{_prefix}/bin/bashbug %{_mandir}/*/* %{_mandir}/*/..1* From svn at tinysofa.org Sat Jul 10 13:40:07 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Sat, 10 Jul 2004 23:40:07 +1000 (EST) Subject: [tinysofa-svn] r3009 - tinysofa/releases/1.1/bash/current/specs Message-ID: <20040710134007.07B574E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-10 23:40:06 +1000 (Sat, 10 Jul 2004) New Revision: 3009 Modified: tinysofa/releases/1.1/bash/current/specs/bash.spec Log: - tune bash-static Obsoletes Modified: tinysofa/releases/1.1/bash/current/specs/bash.spec =================================================================== --- tinysofa/releases/1.1/bash/current/specs/bash.spec 2004-07-10 13:30:52 UTC (rev 3008) +++ tinysofa/releases/1.1/bash/current/specs/bash.spec 2004-07-10 13:40:06 UTC (rev 3009) @@ -51,7 +51,7 @@ Requires: mktemp Prereq: coreutils setup Provides: bash2 -%rename bash-static +Obsoletes: bash-static <= 2.05.b-15ts BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRequires: perl byacc From svn at tinysofa.org Sun Jul 11 12:19:21 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Sun, 11 Jul 2004 22:19:21 +1000 (EST) Subject: [tinysofa-svn] r3010 - in tinysofa/releases/1.1/glibc/current: sources specs Message-ID: <20040711121921.B17D44E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-11 22:19:20 +1000 (Sun, 11 Jul 2004) New Revision: 3010 Added: tinysofa/releases/1.1/glibc/current/sources/i18n-packages.sh Modified: tinysofa/releases/1.1/glibc/current/specs/glibc.spec Log: - ported glibc to 1.1 Added: tinysofa/releases/1.1/glibc/current/sources/i18n-packages.sh =================================================================== --- tinysofa/releases/1.1/glibc/current/sources/i18n-packages.sh 2004-07-10 13:40:06 UTC (rev 3009) +++ tinysofa/releases/1.1/glibc/current/sources/i18n-packages.sh 2004-07-11 12:19:20 UTC (rev 3010) @@ -0,0 +1,288 @@ +#!/bin/sh +# i18n-packages - automagically generate list of language specific files +# for inclusion in an rpm spec file. +# This does assume that the *.mo files are under .../share/locale/... +# Run with no arguments gets a usage message. + +# i18n-packages is copyright (c) 2004 by Arnaldo Carvalho de Melo +# acme at conectiva.com.br + +# Originally based on: +# findlang is copyright (c) 1998 by W. L. Estes + +# Redistribution and use of this software are hereby permitted for any +# purpose as long as this notice and the above copyright notice remain +# in tact and are included with any redistribution of this file or any +# work based on this file. + +# Modified for tinysofa glibc by JH + +if [ -z "$TMPDIR" ]; then + if [ -d /var/tmp ]; then + TMPDIR=/var/tmp + else + TMPDIR=/tmp + fi +fi + +usage="\ +Usage: $0 [] [ [ ...]] + +Options: + --name Package Name + --epoch Package Epoch + --version Package Version + --release Package Release + --license Package License + --buildarch Package BuildArch + --buildroot Package BuildRoot + --localedir Package localedir (/usr/share/locale) + --requires Package Requires + --provides Package Provides + --obsoletes Package Obsoletes + --post Package %post interpreter + --define Passtrough to RPM + --dontbuild Just print the build command + +" + +NAME="" +EPOCH="" +VERSION="" +RELEASE="" +LICENSE="" +BUILDARCH="noarch" +BUILDROOT="" +LOCALEDIR="/usr/share/locale" +REQUIRES="" +PROVIDES="" +OBSOLETES="" +POST="" +DEFINES="" +BUILDPREFIX="eval" + +while test $# -gt 0 ; do + case "$1" in + -h | --help) + echo -e "$usage" + exit 0 + ;; + --name) + shift + NAME=$1 + ;; + --epoch) + shift + EPOCH=$1 + ;; + --version) + shift + VERSION=$1 + ;; + --release) + shift + RELEASE=$1 + ;; + --license) + shift + LICENSE=$1 + ;; + --buildarch) + shift + BUILDARCH=$1 + ;; + --buildroot) + shift + BUILDROOT=$1 + ;; + --localedir) + shift + LOCALEDIR=$1 + ;; + --requires) + shift + REQUIRES=$1 + ;; + --provides) + shift + PROVIDES=$1 + ;; + --obsoletes) + shift + OBSOLETES=$1 + ;; + --post) + shift + POST=$1 + ;; + --define) + shift + DEFINES="$DEFINES --define '$1'" + ;; + --dontbuild) + BUILDPREFIX="echo" + ;; + -*) + echo -e "$usage" 1>&2 + exit 1 + ;; + *) + break + ;; + esac + shift +done + +# Compatibility with old versions +if [ -n "$*" ]; then + #[ -n "$1" ] && BUILDROOT=$1 && shift + #[ -n "$1" ] && DEFINES="$DEFINES --define '_topdir $1'" && shift + #[ -n "$1" ] && DEFINES="$DEFINES --define '_tmppath $1'" && shift + #[ -n "$1" ] && VERSION=$1 && shift + #[ -n "$1" ] && RELEASE=$1 && shift + #[ -n "$1" ] && LICENSE=$1 && shift + #[ -n "$1" ] && BUILDARCH=$1 && shift + [ -n "$1" ] && NAME=$1 && shift + [ -n "$1" ] && MO_NAME=$1 && shift + [ -n "$1" ] && LOCALEDIR=$1 && shift + [ -n "$1" ] && REQUIRES=$1 && shift || REQUIRES=$NAME + [ -n "$1" ] && POST=$1 && shift +fi + +error() { + echo "error: $1" 1>&2 + exit 1 +} + +nr_files () { + ls $1 2> /dev/null | wc -l +} + +if [ -z "$NAME" -o \ + -z "$VERSION" -o \ + -z "$RELEASE" -o \ + -z "$LICENSE" -o \ + -z "$BUILDROOT" ]; then + error "--name, --version, --release, --license and --buildroot are needed" +fi + +if [ "$BUILDROOT" = / ]; then + error "BUILDROOT can't be '/'" +elif [ ! -d $BUILDROOT ] ; then + error "BUILDROOT not found" +else + BUILDROOT="`echo $BUILDROOT | sed -e 's,/$,,'`" +fi + +I18NSPEC=${NAME}-i18n.spec +I18N_BUILDROOT=$BUILDROOT-i18n + +rm -rf $I18N_BUILDROOT +mkdir $I18N_BUILDROOT + +( + echo "Name: $NAME" + [ -n "$EPOCH" ] && echo "Epoch: $EPOCH" + echo "Version: $VERSION" + echo "Release: $RELEASE" + echo "Group: i18n" + echo "Summary: fake" + echo "License: $LICENSE" + echo "BuildArch: $BUILDARCH" + echo "BuildRoot: $I18N_BUILDROOT" + echo "" + echo "%description" + echo "fake" + echo "" +) > $I18NSPEC + +LANGLISTFILE=$(mktemp $TMPDIR/i18n-packages.XXXXXX) +ls -1 $BUILDROOT/$LOCALEDIR/ \ + $BUILDROOT/usr/lib/locale/ \ + $BUILDROOT/etc/X11/ \ + $BUILDROOT/usr/share/i18n/locales/ \ + $BUILDROOT/usr/share/man/ 2> /dev/null | \ + egrep -v ^man\|^C\|^whatis\|\/\|^$\|^locale\|l10n\|cat\|^translit\|^POSIX\|^iso\|^i18n\|^app-defaults\|^X\|^applnk\|^blackbox\|^dm\|^dock\|^gdm\|^serverconfig\|^starthere\|^serverconfig\|^wm\|^xdm\|^xinit\|^xkb\|^xscripts\|^xserver\|^xsm\|^prefdm\|^sysconfig | \ + sort -u > $LANGLISTFILE + +LANGLIST=$(sed 's/\..*//g' $LANGLISTFILE | sed 's/@.*//g' | sort -u) +for LANGUAGE in $LANGLIST ; do + echo "" + echo "%package -n $NAME-i18n-$LANGUAGE" + echo "Summary: Internationalization and locale data for the $LANGUAGE language" + echo "Summary(pt_BR): Dados de internacionaliza?ao e locales para a l?ngua $LANGUAGE" + echo "Group: main" + [ -n "$REQUIRES" ] && eval echo "PreReq: $REQUIRES" + [ -n "$PROVIDES" ] && eval echo "Provides: $PROVIDES" + [ -n "$OBSOLETES" ] && eval echo "Obsoletes: $OBSOLETES" + echo "Provides: $NAME-i18n" + echo "" + echo "%description -n $NAME-i18n-$LANGUAGE" + echo "Internationalization and locale data for the $LANGUAGE language" + echo "" + echo "%description -l pt_BR -n $NAME-i18n-$LANGUAGE" + echo "Dados de internacionaliza?ao e locales para a l?ngua $LANGUAGE" + echo "" + + if [ -n "$POST" ]; then + echo "%post -n $NAME-i18n-$LANGUAGE -p $POST" + echo "" + fi + + echo "%files -n $NAME-i18n-$LANGUAGE" + echo "%defattr(0644,root,root,0755)" + echo "" + + SUBLANGLIST=$(egrep "^${LANGUAGE}[.@]|^${LANGUAGE}$" $LANGLISTFILE) + + for SUBLANGUAGE in $SUBLANGLIST ; do + if [ -f $BUILDROOT/$LOCALEDIR/$SUBLANGUAGE/man ] ; then + echo "$LOCALEDIR/$SUBLANGUAGE/man" + mkdir -p $I18N_BUILDROOT/$LOCALEDIR/$SUBLANGUAGE + mv $BUILDROOT/$LOCALEDIR/$SUBLANGUAGE/man \ + $I18N_BUILDROOT/$LOCALEDIR/$SUBLANGUAGE/ + fi + if [ $(nr_files $BUILDROOT/$LOCALEDIR/$SUBLANGUAGE/LC_MESSAGES/*.mo) != 0 ] ; then + echo "$LOCALEDIR/$SUBLANGUAGE/LC_MESSAGES/*.mo" + mkdir -p $I18N_BUILDROOT/$LOCALEDIR/$SUBLANGUAGE/LC_MESSAGES + mv $BUILDROOT/$LOCALEDIR/$SUBLANGUAGE/LC_MESSAGES/*.mo \ + $I18N_BUILDROOT/$LOCALEDIR/$SUBLANGUAGE/LC_MESSAGES/ + fi + if [ $(nr_files $BUILDROOT/$LOCALEDIR/$SUBLANGUAGE/*.xml) != 0 ] ; then + echo "$LOCALEDIR/$SUBLANGUAGE/*.xml" + mkdir -p $I18N_BUILDROOT/$LOCALEDIR/$SUBLANGUAGE/ + mv $BUILDROOT/$LOCALEDIR/$SUBLANGUAGE/*.xml \ + $I18N_BUILDROOT/$LOCALEDIR/$SUBLANGUAGE/ + fi + if [ $(nr_files $BUILDROOT/usr/lib/locale/$SUBLANGUAGE/*LC_*) != 0 ] ; then + echo "%{_libdir}/locale/$SUBLANGUAGE/*LC_*" + mkdir -p $I18N_BUILDROOT/usr/lib/locale/$SUBLANGUAGE/ + mv $BUILDROOT/usr/lib/locale/$SUBLANGUAGE/*LC_* \ + $I18N_BUILDROOT/usr/lib/locale/$SUBLANGUAGE/ + fi + if [ -f $BUILDROOT/usr/share/i18n/locales/$SUBLANGUAGE ] ; then + echo "/usr/share/i18n/locales/$SUBLANGUAGE" + mkdir -p $I18N_BUILDROOT/usr/share/i18n/locales/ + mv $BUILDROOT/usr/share/i18n/locales/$SUBLANGUAGE \ + $I18N_BUILDROOT/usr/share/i18n/locales/ + fi + if [ $(nr_files $BUILDROOT/usr/share/man/$SUBLANGUAGE/man*) != 0 ] ; then + echo "%{_mandir}/$SUBLANGUAGE/man*" + mkdir -p $I18N_BUILDROOT/usr/share/man/$SUBLANGUAGE + mv $BUILDROOT/usr/share/man/$SUBLANGUAGE/man* \ + $I18N_BUILDROOT/usr/share/man/$SUBLANGUAGE/ + fi + if [ $(nr_files $BUILDROOT/etc/X11/$SUBLANGUAGE/app-defaults/*) != 0 ] ; then + echo "%{_sysconfdir}/X11/$SUBLANGUAGE/app-defaults/*" + mkdir -p $I18N_BUILDROOT/etc/X11/$SUBLANGUAGE/app-defaults/ + mv $BUILDROOT/etc/X11/$SUBLANGUAGE/app-defaults/* \ + $I18N_BUILDROOT/etc/X11/$SUBLANGUAGE/app-defaults/ + fi + done +echo +done >> $I18NSPEC + +rm -f $LANGLISTFILE + +$BUILDPREFIX rpmbuild -bb $DEFINES $I18NSPEC + Property changes on: tinysofa/releases/1.1/glibc/current/sources/i18n-packages.sh ___________________________________________________________________ Name: svn:executable + * Modified: tinysofa/releases/1.1/glibc/current/specs/glibc.spec =================================================================== --- tinysofa/releases/1.1/glibc/current/specs/glibc.spec 2004-07-10 13:40:06 UTC (rev 3009) +++ tinysofa/releases/1.1/glibc/current/specs/glibc.spec 2004-07-11 12:19:20 UTC (rev 3010) @@ -1,9 +1,9 @@ -%define glibcrelease 32ts -%define auxarches i586 i686 athlon sparcv9 alphaev6 +%define glibcrelease 1jh +%define auxarches i686 athlon sparcv9 alphaev6 %define prelinkarches noarch -%define nptlarches i686 athlon x86_64 ia64 s390 s390x sparcv9 ppc ppc64 +%define nptlarches i586 i686 athlon x86_64 ia64 s390 s390x sparcv9 ppc ppc64 %define rtkaioarches noarch -%define withtlsarches i686 athlon x86_64 ia64 s390 s390x alpha alphaev6 sparc sparcv9 ppc ppc64 +%define withtlsarches i586 i686 athlon x86_64 ia64 s390 s390x alpha alphaev6 sparc sparcv9 ppc ppc64 %define debuginfocommonarches %{ix86} alpha alphaev6 sparc sparcv9 %define _unpackaged_files_terminate_build 0 %define glibcdate 200406140419 @@ -11,10 +11,11 @@ Name: glibc Version: 2.3.3 Release: %{glibcrelease} -Copyright: LGPL -Group: System Environment/Libraries +License: LGPL +Group: main Source0: %{name}-%{version}-%{glibcdate}.tar.bz2 Source1: %{name}-redhat-%{glibcdate}.tar.bz2 +Source2: i18n-packages.sh Patch0: %{name}-redhat.patch Patch1: %{name}-nptl-check.patch Patch2: %{name}-ppc-assume.patch @@ -25,15 +26,17 @@ Obsoletes: linuxthreads, gencat, locale, ldconfig, locale-ja Provides: ldconfig Autoreq: false -Requires: glibc-common = %{version}-%{release} %ifarch sparc Obsoletes: libc %endif # Require libgcc in case some program calls pthread_cancel in its %%post -Prereq: basesystem, libgcc +Prereq: setup, filesystem, libgcc +Requires: tzdata >= 2003a # This is for building auxiliary programs like memusage # For initial glibc bootstraps it can be commented out -BuildPreReq: gd-devel libpng-devel zlib-devel texinfo +#BuildPreReq: gd-devel libpng-devel zlib-devel +BuildPreReq: zlib-devel +#info_requires %ifarch %{prelinkarches} BuildPreReq: prelink >= 0.2.0-5 %endif @@ -44,7 +47,7 @@ Conflicts: glibc-devel < 2.2.3 # Earlier shadow-utils packages had too restrictive permissions on # /etc/default -Conflicts: shadow-utils < 2:4.0.3-20 +Conflicts: shadow-utils < 4.0.3-22ts %ifarch ia64 sparc64 s390x x86_64 Conflicts: kernel < 2.4.0 %define enablekernel 2.4.0 @@ -82,10 +85,9 @@ %package devel Summary: Object files for development using standard C libraries. -Group: Development/Libraries -Conflicts: texinfo < 3.11 +Group: development Conflicts: binutils < 2.13.90.0.16-5 -Prereq: /sbin/install-info +#info_requires Obsoletes: libc-debug, libc-headers, libc-devel, linuxthreads-devel Obsoletes: glibc-debug Prereq: %{name}-headers @@ -110,7 +112,7 @@ %package headers Summary: Header files for development using standard C libraries. -Group: Development/Libraries +Group: development Provides: %{name}-headers(%{_target_cpu}) %ifarch x86_64 # If both -m32 and -m64 is to be supported on AMD64, x86_64 glibc-headers @@ -135,7 +137,7 @@ %package -n nptl-devel Summary: Header files and static libraries for development using NPTL library. -Group: Development/Libraries +Group: development Requires: glibc-devel = %{version}-%{release} Autoreq: true @@ -146,7 +148,7 @@ %package profile Summary: The GNU libc libraries, including support for gprof profiling. -Group: Development/Libraries +Group: development Obsoletes: libc-profile Autoreq: true @@ -162,21 +164,24 @@ If you are going to use the gprof program to profile a program, you'll need to install the glibc-profile package. -%package common -Summary: Common binaries and locale data for glibc +%package i18n +Summary: Basic locale data for glibc Conflicts: %{name} < %{version} Conflicts: %{name} > %{version} Autoreq: false -Requires: tzdata >= 2003a -Group: System Environment/Base +%rename glibc-locales +%rename glibc-common +PreReq: %{name} = %{version}-%{release} +Requires: glibc-i18n-en_US +Group: main -%description common -The glibc-common package includes common binaries for the GNU libc -libraries, as well as national language (locale) support. +%description i18n +The glibc-i18n package includes basic national language (locale) +support. %package -n nscd Summary: A Name Service Caching Daemon (nscd). -Group: System Environment/Daemons +Group: main Conflicts: kernel < 2.2.0 Prereq: /sbin/chkconfig, /usr/sbin/useradd, /usr/sbin/userdel, sh-utils Autoreq: true @@ -190,11 +195,11 @@ %package utils Summary: Development utilities from GNU C library -Group: Development/Tools +Group: development Requires: glibc = %{version}-%{release} %description utils -The glibc-utils package contains memusage, a memory usage profiler, +The glibc-utils package contains a memory usage profiler, mtrace, a memory leak tracer and xtrace, a function call tracer which can be helpful during program debugging. @@ -205,7 +210,7 @@ %package debuginfo Summary: Debug information for package %{name} -Group: Development/Debug +Group: development %ifarch %{debuginfocommonarches} Requires: glibc-debuginfo-common = %{version}-%{release} %endif @@ -226,7 +231,7 @@ %package debuginfo-common Summary: Debug information for package %{name} -Group: Development/Debug +Group: development %description debuginfo-common This package provides debug information for package %{name}. @@ -431,6 +436,7 @@ chmod +x find_provides.sh touch `find . -name configure` + %build rm -rf build-%{_target_cpu}-linux mkdir build-%{_target_cpu}-linux ; cd build-%{_target_cpu}-linux @@ -482,7 +488,7 @@ CC="$GCC" CFLAGS="$BuildFlags -g -O3" ../configure --prefix=%{_prefix} \ --enable-add-ons=$Pthreads$AddOns --without-cvs $EnableKernel \ --with-headers=%{_prefix}/include --enable-bind-now \ - $WithTls --build %{_target_cpu}-redhat-linux --host %{_target_cpu}-redhat-linux + $WithTls --build %{_target_cpu}-tinysofa-linux --host %{_target_cpu}-tinysofa-linux if [ -x /usr/bin/getconf ] ; then numprocs=$(/usr/bin/getconf _NPROCESSORS_ONLN) if [ $numprocs -eq 0 ]; then @@ -528,7 +534,7 @@ CC="$GCC" CFLAGS="$BuildFlags -g -O3" ../configure --prefix=%{_prefix} \ --enable-add-ons=$Pthreads$AddOns --without-cvs $EnableKernel \ --with-headers=%{_prefix}/include --enable-bind-now \ - $WithTls --build %{_target_cpu}-redhat-linux --host %{_target_cpu}-redhat-linux + $WithTls --build %{_target_cpu}-tinysofa-linux --host %{_target_cpu}-tinysofa-linux make -j$numprocs -r CFLAGS="$BuildFlags -g -O3" PARALLELMFLAGS=-s mkdir sed @@ -548,7 +554,7 @@ CC="$GCC" CFLAGS="$BuildFlags -g -O3" ../configure --prefix=%{_prefix} \ --enable-add-ons=$Pthreads$AddOns --without-cvs $EnableKernel \ --with-headers=%{_prefix}/include --enable-bind-now \ - $WithTls --build %{_target_cpu}-redhat-linux --host %{_target_cpu}-redhat-linux + $WithTls --build %{_target_cpu}-tinysofa-linux --host %{_target_cpu}-tinyosfa-linux make -j$numprocs -r CFLAGS="$BuildFlags -g -O3" PARALLELMFLAGS=-s mkdir sed @@ -686,14 +692,13 @@ install -m 0644 linuxthreads/man/*.3thr $RPM_BUILD_ROOT%{_mandir}/man3 gzip -9nvf $RPM_BUILD_ROOT%{_mandir}/man3/* -if [ -d $RPM_BUILD_ROOT%{_prefix}/info -a "%{_infodir}" != "%{_prefix}/info" ]; then +if [ -d $RPM_BUILD_ROOT%{_prefix}/info -a "%{_infodir}" != "%{_prefix}/info" ]; +then mkdir -p $RPM_BUILD_ROOT%{_infodir} mv -f $RPM_BUILD_ROOT%{_prefix}/info/* $RPM_BUILD_ROOT%{_infodir} rm -rf $RPM_BUILD_ROOT%{_prefix}/info fi -gzip -9nvf $RPM_BUILD_ROOT%{_infodir}/libc* - ln -sf libbsd-compat.a $RPM_BUILD_ROOT%{_prefix}/%{_lib}/libbsd.a install -m 644 redhat/nsswitch.conf $RPM_BUILD_ROOT/etc/nsswitch.conf @@ -707,8 +712,8 @@ # This is for ncsd - in glibc 2.2 install -m 644 nscd/nscd.conf $RPM_BUILD_ROOT/etc -mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d -install -m 755 nscd/nscd.init $RPM_BUILD_ROOT/etc/rc.d/init.d/nscd +mkdir -p $RPM_BUILD_ROOT/%{_initrddir} +install -m 755 nscd/nscd.init $RPM_BUILD_ROOT/%{_initrddir}/nscd # Don't include ld.so.cache rm -f $RPM_BUILD_ROOT/etc/ld.so.cache @@ -767,6 +772,8 @@ # rquota.x and rquota.h are now provided by quota rm -f $RPM_BUILD_ROOT%{_prefix}/include/rpcsvc/rquota.[hx] +%nuke_info + # Hardlink identical locale files together %ifnarch %{auxarches} gcc -O2 -o build-%{_target_cpu}-linux/hardlink redhat/hardlink.c @@ -796,14 +803,17 @@ grep -v '/etc/\(localtime\|nsswitch.conf\|ld.so.conf\|default\)' | \ grep -v '/%{_lib}/lib\(pcprofile\|memusage\).so' | \ grep -v 'bin/\(memusage\|mtrace\|xtrace\|pcprofiledump\)' | \ + grep -v '^%{_libdir}/gconv\|^%{_datadir}/i18n' | \ sort > rpm.filelist mkdir -p $RPM_BUILD_ROOT%{_prefix}/%{_lib} -mv -f $RPM_BUILD_ROOT/%{_lib}/lib{pcprofile,memusage}.so $RPM_BUILD_ROOT%{_prefix}/%{_lib} -for i in $RPM_BUILD_ROOT%{_prefix}/bin/{xtrace,memusage}; do +#mv -f $RPM_BUILD_ROOT/%{_lib}/lib{pcprofile,memusage}.so $RPM_BUILD_ROOT%{_prefix}/%{_lib} +mv -f $RPM_BUILD_ROOT/%{_lib}/libpcprofile.so $RPM_BUILD_ROOT%{_prefix}/%{_lib} +#for i in $RPM_BUILD_ROOT%{_prefix}/bin/{xtrace,memusage}; do +for i in $RPM_BUILD_ROOT%{_prefix}/bin/xtrace; do cp -a $i $i.tmp + #-e 's~=/%{_lib}/libmemusage.so~=%{_prefix}/%{_lib}/libmemusage.so~' \ sed -e 's~=/%{_lib}/libpcprofile.so~=%{_prefix}/%{_lib}/libpcprofile.so~' \ - -e 's~=/%{_lib}/libmemusage.so~=%{_prefix}/%{_lib}/libmemusage.so~' \ $i.tmp > $i chmod 755 $i; rm -f $i.tmp done @@ -852,10 +862,10 @@ echo '%{_prefix}/sbin/nscd' > nscd.filelist cat > utils.filelist < Author: gda Date: 2004-07-11 22:22:21 +1000 (Sun, 11 Jul 2004) New Revision: 3011 Added: contrib/mailf/ contrib/mailf/current/ contrib/mailf/current/sources/ contrib/mailf/current/specs/ Log: new in contrib From svn at tinysofa.org Sun Jul 11 12:23:59 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Sun, 11 Jul 2004 22:23:59 +1000 (EST) Subject: [tinysofa-svn] r3012 - in contrib/mailf/current: sources specs Message-ID: <20040711122359.869894E80E6@minbar.tinysofa.org> Author: gda Date: 2004-07-11 22:23:59 +1000 (Sun, 11 Jul 2004) New Revision: 3012 Added: contrib/mailf/current/sources/mailf-1.0rc6-sendmail-path.patch contrib/mailf/current/sources/mailf-1.0rc6.tar.gz contrib/mailf/current/specs/mailf.spec Log: new in contrib Added: contrib/mailf/current/sources/mailf-1.0rc6-sendmail-path.patch =================================================================== --- contrib/mailf/current/sources/mailf-1.0rc6-sendmail-path.patch 2004-07-11 12:22:21 UTC (rev 3011) +++ contrib/mailf/current/sources/mailf-1.0rc6-sendmail-path.patch 2004-07-11 12:23:59 UTC (rev 3012) @@ -0,0 +1,11 @@ +--- mailf-1.0rc6/mailf/main.c.orig 2004-07-11 01:43:06.000000000 +0200 ++++ mailf-1.0rc6/mailf/main.c 2004-07-11 01:43:28.000000000 +0200 +@@ -287,7 +287,7 @@ + fprintf(stderr,"Mailf: Arguments parsed\nSet defaults if needed\n"); + #endif + /* Default values for the filter */ +-if(MDAFlag == 1 && MDALine == NULL) { MDALine = strdup("/usr/lib/sendmail -t 2>&1"); } ++if(MDAFlag == 1 && MDALine == NULL) { MDALine = strdup("/usr/sbin/sendmail -t 2>&1"); } + if(ReDirFlag == 1 && Domain == NULL) { + if(strchr(ReDirAdr, '@') != NULL) { + Domain = strchr(ReDirAdr, '@'); Added: contrib/mailf/current/sources/mailf-1.0rc6.tar.gz =================================================================== (Binary files differ) Property changes on: contrib/mailf/current/sources/mailf-1.0rc6.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: contrib/mailf/current/specs/mailf.spec =================================================================== --- contrib/mailf/current/specs/mailf.spec 2004-07-11 12:22:21 UTC (rev 3011) +++ contrib/mailf/current/specs/mailf.spec 2004-07-11 12:23:59 UTC (rev 3012) @@ -0,0 +1,42 @@ +Summary: Steines Mailfilter for Mail Multidrop +Name: mailf +Version: 1.0rc6 +Release: 1gd +License: GNU General Public License (GPL) +Group: tinysofa contrib +URL: http://www.steines.com/mailf/ +Source0: %{name}-%{version}.tar.gz +Patch0: %{name}-1.0rc6-sendmail-path.patch +Buildroot: %{_tmppath}/%{name}-%{version}-root + +%description +Mailfilter to secure maildrops while fetch mails from a remote mail server and prevent +mailloops, unwanted resend to external receipients and/or virus and spam. + +%prep +%setup -q +%patch -p1 + +%build +%configure +make + +%install +%makeinstall + +# cleanup docdirs +rm -f mailf/docs/*/Makefile* + +%clean +[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT + +%files +%defattr(-,root,root) +%doc AUTHORS COPYING ChangeLog FEATURES INSTALL README README.de +%doc samples.mailf/{README,README.de,domroute.conf,from.spam,mailf.conf,vscan.cmd} +%doc mailf/docs/{de,en} +%{_bindir}/* + +%changelog +* Sun Jul 11 2004 Gerald Dachs 1.0rc6-1gd +- new rpm for tinysofa From svn at tinysofa.org Sun Jul 11 12:26:50 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Sun, 11 Jul 2004 22:26:50 +1000 (EST) Subject: [tinysofa-svn] r3013 - contrib/mailf Message-ID: <20040711122650.7426D4E80E6@minbar.tinysofa.org> Author: gda Date: 2004-07-11 22:26:50 +1000 (Sun, 11 Jul 2004) New Revision: 3013 Added: contrib/mailf/pristine/ Log: new in contrib Copied: contrib/mailf/pristine (from rev 3012, contrib/mailf/current) From svn at tinysofa.org Sun Jul 11 12:29:02 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Sun, 11 Jul 2004 22:29:02 +1000 (EST) Subject: [tinysofa-svn] r3014 - contrib/mailf Message-ID: <20040711122902.EC1274E80E6@minbar.tinysofa.org> Author: gda Date: 2004-07-11 22:29:02 +1000 (Sun, 11 Jul 2004) New Revision: 3014 Added: contrib/mailf/releases/ Log: new in contrib From svn at tinysofa.org Sun Jul 11 12:29:24 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Sun, 11 Jul 2004 22:29:24 +1000 (EST) Subject: [tinysofa-svn] r3015 - contrib/mailf/releases Message-ID: <20040711122924.C07774E80E6@minbar.tinysofa.org> Author: gda Date: 2004-07-11 22:29:24 +1000 (Sun, 11 Jul 2004) New Revision: 3015 Added: contrib/mailf/releases/1.0rc6/ Log: new in contrib From svn at tinysofa.org Sun Jul 11 12:30:22 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Sun, 11 Jul 2004 22:30:22 +1000 (EST) Subject: [tinysofa-svn] r3016 - contrib/mailf/releases/1.0rc6 Message-ID: <20040711123022.BE3CC4E80E6@minbar.tinysofa.org> Author: gda Date: 2004-07-11 22:30:22 +1000 (Sun, 11 Jul 2004) New Revision: 3016 Added: contrib/mailf/releases/1.0rc6/1gd/ Log: new in contrib Copied: contrib/mailf/releases/1.0rc6/1gd (from rev 3015, contrib/mailf/current) From svn at tinysofa.org Mon Jul 12 08:55:42 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Mon, 12 Jul 2004 18:55:42 +1000 (EST) Subject: [tinysofa-svn] r3018 - tinysofa/releases/1.1/release/current/specs Message-ID: <20040712085542.7001F4E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-12 18:55:40 +1000 (Mon, 12 Jul 2004) New Revision: 3018 Modified: tinysofa/releases/1.1/release/current/specs/release.spec Log: - update for 1.1 Modified: tinysofa/releases/1.1/release/current/specs/release.spec =================================================================== --- tinysofa/releases/1.1/release/current/specs/release.spec 2004-07-11 13:21:23 UTC (rev 3017) +++ tinysofa/releases/1.1/release/current/specs/release.spec 2004-07-12 08:55:40 UTC (rev 3018) @@ -1,11 +1,11 @@ Summary: tinysofa release file Name: release -Version: 1.0 -Release: 3ts +Version: 1.1 +Release: 0jh License: GPL Group: main BuildArch: noarch -BuildRoot: %{_tmppath}/%{name}-root +BuildRoot: %{_tmppath}/%{name}-%{version}-root Epoch: 2 %description @@ -15,30 +15,29 @@ # satisfy rpm %install -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT/etc +mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir} echo "tinysofa enterprise server release %{version} (%{release_name})" \ > $RPM_BUILD_ROOT/etc/release -cat <<__EOF__ > $RPM_BUILD_ROOT/etc/issue +cat << __EOF__ > $RPM_BUILD_ROOT/%{_sysconfdir}/issue tinysofa enterprise server release %{version} (%{release_name}) Kernel \r on an \m __EOF__ -pushd $RPM_BUILD_ROOT/etc +pushd $RPM_BUILD_ROOT/%{_sysconfdir} ln -s release tinysofa-release ln issue issue.net popd %clean -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT +%clean_buildroot %files %defattr(-,root,root) -%attr(0644,root,root) /etc/release -%attr(0644,root,root) /etc/issue -%attr(0644,root,root) /etc/issue.net -/etc/tinysofa-release +%attr(0644,root,root) %{_sysconfdir}/release +%attr(0644,root,root) %{_sysconfdir}/issue +%attr(0644,root,root) %{_sysconfdir}/issue.net +%{_sysconfdir}/tinysofa-release %changelog * Fri Jun 18 2004 tsintegrate 1.0-3ts From svn at tinysofa.org Mon Jul 12 09:02:53 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Mon, 12 Jul 2004 19:02:53 +1000 (EST) Subject: [tinysofa-svn] r3019 - tinysofa/releases/1.1 Message-ID: <20040712090253.2AB3A4E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-12 19:02:52 +1000 (Mon, 12 Jul 2004) New Revision: 3019 Removed: tinysofa/releases/1.1/swup/ Log: - remove swup From svn at tinysofa.org Mon Jul 12 11:11:49 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Mon, 12 Jul 2004 21:11:49 +1000 (EST) Subject: [tinysofa-svn] r3020 - tinysofa/releases/1.1 Message-ID: <20040712111149.924224E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-12 21:11:48 +1000 (Mon, 12 Jul 2004) New Revision: 3020 Removed: tinysofa/releases/1.1/anaconda/ Log: - remove anaconda From svn at tinysofa.org Mon Jul 12 11:12:43 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Mon, 12 Jul 2004 21:12:43 +1000 (EST) Subject: [tinysofa-svn] r3021 - tinysofa/releases/1.1 Message-ID: <20040712111243.ECE724E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-12 21:12:43 +1000 (Mon, 12 Jul 2004) New Revision: 3021 Added: tinysofa/releases/1.1/anaconda/ Log: - copy anaconda from snapshot Copied: tinysofa/releases/1.1/anaconda (from rev 3020, tinysofa/snapshot/anaconda) From svn at tinysofa.org Mon Jul 12 11:36:17 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Mon, 12 Jul 2004 21:36:17 +1000 (EST) Subject: [tinysofa-svn] r3022 - tinysofa/releases/1.1 Message-ID: <20040712113617.72C904E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-12 21:36:17 +1000 (Mon, 12 Jul 2004) New Revision: 3022 Added: tinysofa/releases/1.1/bogl/ Log: - copy bogl from snapshot Copied: tinysofa/releases/1.1/bogl (from rev 3021, tinysofa/snapshot/bogl) From svn at tinysofa.org Mon Jul 12 11:36:48 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Mon, 12 Jul 2004 21:36:48 +1000 (EST) Subject: [tinysofa-svn] r3023 - tinysofa/releases/1.1 Message-ID: <20040712113648.0DB8F4E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-12 21:36:47 +1000 (Mon, 12 Jul 2004) New Revision: 3023 Added: tinysofa/releases/1.1/booty/ Log: - copy booty from snapshot Copied: tinysofa/releases/1.1/booty (from rev 3022, tinysofa/snapshot/booty) From svn at tinysofa.org Mon Jul 12 11:37:19 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Mon, 12 Jul 2004 21:37:19 +1000 (EST) Subject: [tinysofa-svn] r3024 - tinysofa/releases/1.1 Message-ID: <20040712113719.85E824E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-12 21:37:19 +1000 (Mon, 12 Jul 2004) New Revision: 3024 Added: tinysofa/releases/1.1/rhpl/ Log: - copy rhpl from snapshot Copied: tinysofa/releases/1.1/rhpl (from rev 3023, tinysofa/snapshot/rhpl) From svn at tinysofa.org Mon Jul 12 11:37:59 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Mon, 12 Jul 2004 21:37:59 +1000 (EST) Subject: [tinysofa-svn] r3025 - tinysofa/releases/1.1 Message-ID: <20040712113759.54EB14E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-12 21:37:59 +1000 (Mon, 12 Jul 2004) New Revision: 3025 Added: tinysofa/releases/1.1/pyparted/ Log: - copy pyparted from snapshot Copied: tinysofa/releases/1.1/pyparted (from rev 3024, tinysofa/snapshot/pyparted) From svn at tinysofa.org Mon Jul 12 11:48:09 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Mon, 12 Jul 2004 21:48:09 +1000 (EST) Subject: [tinysofa-svn] r3026 - tinysofa/releases/1.1/bogl/current/specs Message-ID: <20040712114809.D9B504E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-12 21:48:09 +1000 (Mon, 12 Jul 2004) New Revision: 3026 Modified: tinysofa/releases/1.1/bogl/current/specs/bogl.spec Log: - port to 1.1 Modified: tinysofa/releases/1.1/bogl/current/specs/bogl.spec =================================================================== --- tinysofa/releases/1.1/bogl/current/specs/bogl.spec 2004-07-12 11:37:59 UTC (rev 3025) +++ tinysofa/releases/1.1/bogl/current/specs/bogl.spec 2004-07-12 11:48:09 UTC (rev 3026) @@ -15,7 +15,7 @@ Patch4: bogl-0.1.9-ts-gcc34.patch Epoch: 0 License: GPL -Group: System Environment/Libraries +Group: extra BuildRoot: %{_tmppath}/%{name}-%{version}-root %ifarch i386 BuildRequires: dietlibc @@ -29,7 +29,7 @@ %package devel Summary: Development files required to build BOGL applications. -Group: Development/Libraries +Group: development Requires: bogl = %{epoch}:%{version}-%{release} %description devel @@ -38,7 +38,7 @@ %package bterm Summary: A Unicode capable terminal program for the Linux frame buffer. -Group: Applications/System +Group: extra Requires: bogl = %{epoch}:%{version}-%{release} %description bterm @@ -65,7 +65,6 @@ ./bdftobogl -b font.bdf > font.bgf %install -rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT libdir=%{_libdir} install make -C wlite prefix=$RPM_BUILD_ROOT/%{_prefix} libdir=$RPM_BUILD_ROOT/%{_libdir} install if [ -f wlite/libwlitediet.a ]; then @@ -78,7 +77,7 @@ gzip -9 $RPM_BUILD_ROOT/usr/lib/bogl/font.bgf %clean -rm -rf $RPM_BUILD_ROOT +%clean_buildroot %post -p /sbin/ldconfig From svn at tinysofa.org Mon Jul 12 11:54:33 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Mon, 12 Jul 2004 21:54:33 +1000 (EST) Subject: [tinysofa-svn] r3027 - tinysofa/releases/1.1 Message-ID: <20040712115433.8FF734E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-12 21:54:33 +1000 (Mon, 12 Jul 2004) New Revision: 3027 Removed: tinysofa/releases/1.1/bogl/ Log: - remove bogl From svn at tinysofa.org Mon Jul 12 11:57:58 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Mon, 12 Jul 2004 21:57:58 +1000 (EST) Subject: [tinysofa-svn] r3028 - tinysofa/releases/1.1/rhpl/current/specs Message-ID: <20040712115758.DF97C4E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-12 21:57:58 +1000 (Mon, 12 Jul 2004) New Revision: 3028 Modified: tinysofa/releases/1.1/rhpl/current/specs/rhpl.spec Log: - port to 1.1 Modified: tinysofa/releases/1.1/rhpl/current/specs/rhpl.spec =================================================================== --- tinysofa/releases/1.1/rhpl/current/specs/rhpl.spec 2004-07-12 11:54:33 UTC (rev 3027) +++ tinysofa/releases/1.1/rhpl/current/specs/rhpl.spec 2004-07-12 11:57:58 UTC (rev 3028) @@ -4,7 +4,7 @@ Release: 1ts Source0: %{name}-%{version}.tar.gz License: GPL -Group: System Environment/Libraries +Group: extra BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRequires: python-devel, gettext %ifnarch s390 s390x @@ -16,23 +16,22 @@ %prep %setup -q -make +%make %build %install -rm -rf $RPM_BUILD_ROOT -make DESTDIR=${RPM_BUILD_ROOT} install +%makeinstall_std %find_lang %name %clean -rm -rf $RPM_BUILD_ROOT +%clean_buildroot %files -f %{name}.lang %defattr(-,root,root) %doc README ChangeLog -%{_libdir}/python?.?/site-packages/rhpl +%{py_sitedir}/rhpl %{_sbindir}/ddcprobe %{_datadir}/rhpl From svn at tinysofa.org Mon Jul 12 12:02:55 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Mon, 12 Jul 2004 22:02:55 +1000 (EST) Subject: [tinysofa-svn] r3029 - tinysofa/releases/1.1/python/current/specs Message-ID: <20040712120255.AD22F4E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-12 22:02:55 +1000 (Mon, 12 Jul 2004) New Revision: 3029 Modified: tinysofa/releases/1.1/python/current/specs/python.spec Log: - add BuildPrereq: gdbm-devel Modified: tinysofa/releases/1.1/python/current/specs/python.spec =================================================================== --- tinysofa/releases/1.1/python/current/specs/python.spec 2004-07-12 11:57:58 UTC (rev 3028) +++ tinysofa/releases/1.1/python/current/specs/python.spec 2004-07-12 12:02:55 UTC (rev 3029) @@ -40,6 +40,7 @@ BuildPrereq: ncurses-devel, gdbm-devel, zlib-devel, expat-devel BuildPrereq: glibc-devel gcc-c++-devel BuildPrereq: gzip tar findutils pkgconfig +BuildPrereq: gdbm-devel URL: http://www.python.org/ From svn at tinysofa.org Mon Jul 12 12:07:03 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Mon, 12 Jul 2004 22:07:03 +1000 (EST) Subject: [tinysofa-svn] r3030 - tinysofa/releases/1.1/pyparted/current/specs Message-ID: <20040712120703.00CDA4E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-12 22:07:03 +1000 (Mon, 12 Jul 2004) New Revision: 3030 Modified: tinysofa/releases/1.1/pyparted/current/specs/pyparted.spec Log: - port to 1.1 Modified: tinysofa/releases/1.1/pyparted/current/specs/pyparted.spec =================================================================== --- tinysofa/releases/1.1/pyparted/current/specs/pyparted.spec 2004-07-12 12:02:55 UTC (rev 3029) +++ tinysofa/releases/1.1/pyparted/current/specs/pyparted.spec 2004-07-12 12:07:03 UTC (rev 3030) @@ -5,7 +5,7 @@ Version: 1.6.7 Release: 1ts License: GPL -Group: System Environment/Libraries +Group: extra Source0: %{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-root Requires: parted >= 1.6 @@ -21,21 +21,19 @@ %build export CFLAGS="-fPIC" %configure -make +%make %install -rm -rf $RPM_BUILD_ROOT %makeinstall %clean -rm -rf $RPM_BUILD_ROOT +%clean_buildroot %files %defattr(-,root,root,-) %doc README COPYING -%dir %{_libdir}/python?.?/site-packages/ -%{_libdir}/python?.?/site-packages/*.so +%{py_sitedir}/*.so %changelog From svn at tinysofa.org Mon Jul 12 12:09:25 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Mon, 12 Jul 2004 22:09:25 +1000 (EST) Subject: [tinysofa-svn] r3031 - tinysofa/releases/1.1/rhpl/current/specs Message-ID: <20040712120925.E2EE24E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-12 22:09:25 +1000 (Mon, 12 Jul 2004) New Revision: 3031 Modified: tinysofa/releases/1.1/rhpl/current/specs/rhpl.spec Log: - remove pyxf86config requirement for 1.1 Modified: tinysofa/releases/1.1/rhpl/current/specs/rhpl.spec =================================================================== --- tinysofa/releases/1.1/rhpl/current/specs/rhpl.spec 2004-07-12 12:07:03 UTC (rev 3030) +++ tinysofa/releases/1.1/rhpl/current/specs/rhpl.spec 2004-07-12 12:09:25 UTC (rev 3031) @@ -7,9 +7,9 @@ Group: extra BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRequires: python-devel, gettext -%ifnarch s390 s390x -Requires: pyxf86config >= 0.3.2 -%endif +#%ifnarch s390 s390x +#Requires: pyxf86config >= 0.3.2 +#%endif %description The rhpl package contains Python code used by programs in Red Hat Linux. From svn at tinysofa.org Mon Jul 12 13:13:43 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Mon, 12 Jul 2004 23:13:43 +1000 (EST) Subject: [tinysofa-svn] r3032 - tinysofa/releases/1.1 Message-ID: <20040712131343.32BBE4E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-12 23:13:41 +1000 (Mon, 12 Jul 2004) New Revision: 3032 Removed: tinysofa/releases/1.1/dietlibc/ Log: - remove dietlibc From svn at tinysofa.org Mon Jul 12 13:14:54 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Mon, 12 Jul 2004 23:14:54 +1000 (EST) Subject: [tinysofa-svn] r3033 - tinysofa/releases/1.1 Message-ID: <20040712131454.B02444E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-12 23:14:54 +1000 (Mon, 12 Jul 2004) New Revision: 3033 Added: tinysofa/releases/1.1/dietlibc/ Log: - copy dietlibc from snapshot Copied: tinysofa/releases/1.1/dietlibc (from rev 3032, tinysofa/snapshot/dietlibc) From svn at tinysofa.org Mon Jul 12 13:17:21 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Mon, 12 Jul 2004 23:17:21 +1000 (EST) Subject: [tinysofa-svn] r3034 - tinysofa/releases/1.1/dietlibc/current/specs Message-ID: <20040712131721.199FB4E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-12 23:17:20 +1000 (Mon, 12 Jul 2004) New Revision: 3034 Modified: tinysofa/releases/1.1/dietlibc/current/specs/dietlibc.spec Log: - port to 1.1 Modified: tinysofa/releases/1.1/dietlibc/current/specs/dietlibc.spec =================================================================== --- tinysofa/releases/1.1/dietlibc/current/specs/dietlibc.spec 2004-07-12 13:14:54 UTC (rev 3033) +++ tinysofa/releases/1.1/dietlibc/current/specs/dietlibc.spec 2004-07-12 13:17:20 UTC (rev 3034) @@ -4,8 +4,8 @@ Summary: A small libc implementation Name: dietlibc Version: 0.26 -Release: 2ts -Group: Development/Libraries +Release: 1jh +Group: development License: GPL Url: http://www.fefe.de/dietlibc/ Source0: %{name}-%{version}.tar.bz2 @@ -28,16 +28,17 @@ %patch3 -p1 -b .gnuokay %patch4 -p1 -b .oldqsort + %build -make +%make %install -rm -rf $RPM_BUILD_ROOT -make DESTDIR=$RPM_BUILD_ROOT install +%makeinstall_std %clean -rm -rf $RPM_BUILD_ROOT +%clean_buildroot + %files %defattr(-,root,root) %doc AUTHOR BUGS CAVEAT CHANGES README THANKS TODO @@ -45,6 +46,7 @@ /usr/lib/dietlibc %{_mandir}/man*/* + %changelog * Fri Jun 18 2004 Jeremy Katz - 0.26-2 - fix up config patch for 0.26 From svn at tinysofa.org Mon Jul 12 13:20:22 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Mon, 12 Jul 2004 23:20:22 +1000 (EST) Subject: [tinysofa-svn] r3035 - tinysofa/releases/1.1/dietlibc/current/specs Message-ID: <20040712132022.3E5544E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-12 23:20:22 +1000 (Mon, 12 Jul 2004) New Revision: 3035 Modified: tinysofa/releases/1.1/dietlibc/current/specs/dietlibc.spec Log: - include i586 Modified: tinysofa/releases/1.1/dietlibc/current/specs/dietlibc.spec =================================================================== --- tinysofa/releases/1.1/dietlibc/current/specs/dietlibc.spec 2004-07-12 13:17:20 UTC (rev 3034) +++ tinysofa/releases/1.1/dietlibc/current/specs/dietlibc.spec 2004-07-12 13:20:22 UTC (rev 3035) @@ -1,6 +1,6 @@ %define __os_install_post /usr/lib/rpm/brp-compress -ExclusiveArch: i386 +ExclusiveArch: i386 i586 Summary: A small libc implementation Name: dietlibc Version: 0.26 From svn at tinysofa.org Mon Jul 12 13:56:07 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Mon, 12 Jul 2004 23:56:07 +1000 (EST) Subject: [tinysofa-svn] r3036 - tinysofa/releases/1.1 Message-ID: <20040712135607.2B64C4E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-12 23:56:05 +1000 (Mon, 12 Jul 2004) New Revision: 3036 Removed: tinysofa/releases/1.1/pciutils/ Log: - remove pciutils From svn at tinysofa.org Mon Jul 12 13:56:56 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Mon, 12 Jul 2004 23:56:56 +1000 (EST) Subject: [tinysofa-svn] r3037 - tinysofa/releases/1.1 Message-ID: <20040712135656.7ACA14E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-12 23:56:56 +1000 (Mon, 12 Jul 2004) New Revision: 3037 Added: tinysofa/releases/1.1/pciutils/ Log: - copy pciutils from snapshot Copied: tinysofa/releases/1.1/pciutils (from rev 3036, tinysofa/snapshot/pciutils) From svn at tinysofa.org Mon Jul 12 14:17:41 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 13 Jul 2004 00:17:41 +1000 (EST) Subject: [tinysofa-svn] r3038 - tinysofa/releases/1.1/gcc/current/specs Message-ID: <20040712141741.6715B4E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-13 00:17:40 +1000 (Tue, 13 Jul 2004) New Revision: 3038 Modified: tinysofa/releases/1.1/gcc/current/specs/gcc.spec Log: - remove info requirements - disable stack protector Modified: tinysofa/releases/1.1/gcc/current/specs/gcc.spec =================================================================== --- tinysofa/releases/1.1/gcc/current/specs/gcc.spec 2004-07-12 13:56:56 UTC (rev 3037) +++ tinysofa/releases/1.1/gcc/current/specs/gcc.spec 2004-07-12 14:17:40 UTC (rev 3038) @@ -1,6 +1,6 @@ %define DATE 20040413 %define gcc_version 3.3.3 -%define gcc_release 7jh +%define gcc_release 8jh %define _unpackaged_files_terminate_build 0 %define multilib_64_archs sparc64 ppc64 s390x x86_64 %ifarch %{ix86} alpha ia64 ppc x86_64 s390 sparc sparc64 @@ -52,7 +52,7 @@ Conflicts: gdb < 5.1-2 Requires: glibc-devel >= 2.2.90 Requires: libgcc >= %{version}-%{release} -%info_requires +#info_requires Obsoletes: gcc3 Obsoletes: egcs %ifarch sparc sparc64 @@ -159,7 +159,7 @@ Group: development Requires: gcc = %{version}-%{release} Requires: libf2c = %{version}-%{release} -%info_requires +#info_requires Obsoletes: gcc3-g77 Autoreq: true @@ -182,7 +182,7 @@ Requires: gcc = %{version}-%{release} Requires: libgcj >= %{version}, libgcj-devel >= %{version}, zlib-devel Obsoletes: gcc3-java -%info_requires +#info_requires Autoreq: true %description java @@ -192,7 +192,7 @@ %package -n libgcj Summary: Java runtime library for gcc Group: development -%info_requires +#info_requires Requires: zip >= 2.1 Obsoletes: gcc-libgcj Obsoletes: libgcj3 @@ -268,7 +268,7 @@ %package -n cpp Summary: The C Preprocessor. Group: development -%info_requires +#info_requires %ifarch ia64 Obsoletes: gnupro %endif @@ -301,7 +301,7 @@ Group: development Requires: gcc = %{version}-%{release}, libgnat = %{version}-%{release} Obsoletes: gnat-devel, gcc3-gnat -%info_requires +#info_requires Autoreq: true %description gnat @@ -355,6 +355,7 @@ CC=gcc OPT_FLAGS=`echo $RPM_OPT_FLAGS|sed -e 's/-fno-rtti//g' -e 's/-fno-exceptions//g'` +OPT_FLAGS="$OPT_FLAGS %{?no_stack_protector}" %ifarch sparc sparc64 OPT_FLAGS=`echo $OPT_FLAGS|sed -e 's/-m64//g' -e 's/-m32//g' -e 's/-mcpu=ultrasparc/-mtune=ultrasparc/g'` %endif From svn at tinysofa.org Mon Jul 12 17:00:45 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 13 Jul 2004 03:00:45 +1000 (EST) Subject: [tinysofa-svn] r3039 - in tinysofa/releases/1.1/glibc/current: sources specs Message-ID: <20040712170045.C591D4E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-13 03:00:44 +1000 (Tue, 13 Jul 2004) New Revision: 3039 Modified: tinysofa/releases/1.1/glibc/current/sources/i18n-packages.sh tinysofa/releases/1.1/glibc/current/specs/glibc.spec Log: - move iconv from glibc-i18n to glibc - update i18n-packages.sh Modified: tinysofa/releases/1.1/glibc/current/sources/i18n-packages.sh =================================================================== --- tinysofa/releases/1.1/glibc/current/sources/i18n-packages.sh 2004-07-12 14:17:40 UTC (rev 3038) +++ tinysofa/releases/1.1/glibc/current/sources/i18n-packages.sh 2004-07-12 17:00:44 UTC (rev 3039) @@ -212,7 +212,7 @@ echo "Summary: Internationalization and locale data for the $LANGUAGE language" echo "Summary(pt_BR): Dados de internacionaliza?ao e locales para a l?ngua $LANGUAGE" echo "Group: main" - [ -n "$REQUIRES" ] && eval echo "PreReq: $REQUIRES" + [ -n "$REQUIRES" ] && eval echo "Requires: $REQUIRES" [ -n "$PROVIDES" ] && eval echo "Provides: $PROVIDES" [ -n "$OBSOLETES" ] && eval echo "Obsoletes: $OBSOLETES" echo "Provides: $NAME-i18n" Modified: tinysofa/releases/1.1/glibc/current/specs/glibc.spec =================================================================== --- tinysofa/releases/1.1/glibc/current/specs/glibc.spec 2004-07-12 14:17:40 UTC (rev 3038) +++ tinysofa/releases/1.1/glibc/current/specs/glibc.spec 2004-07-12 17:00:44 UTC (rev 3039) @@ -1210,13 +1210,13 @@ %{_sbindir}/rpcinfo %{_libexecdir}/pt_chown %{_bindir}/locale +%{_bindir}/iconv %ifnarch %{auxarches} #-f common.filelist common %files i18n %defattr(-,root,root) %attr(0644,root,root) %verify(not md5 size mtime mode) %ghost %config(missingok,noreplace) %{_prefix}/lib/locale/locale-archive -%{_bindir}/iconv %{_bindir}/localedef %{_sbindir}/build-locale-archive %dir %{_libdir}/locale From svn at tinysofa.org Mon Jul 12 18:25:07 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 13 Jul 2004 04:25:07 +1000 (EST) Subject: [tinysofa-svn] r3040 - tinysofa/releases/1.1 Message-ID: <20040712182507.2B2AC4E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-13 04:25:06 +1000 (Tue, 13 Jul 2004) New Revision: 3040 Removed: tinysofa/releases/1.1/booty/ tinysofa/releases/1.1/rhpl/ Log: - remove booty rhpl From svn at tinysofa.org Mon Jul 12 18:25:26 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 13 Jul 2004 04:25:26 +1000 (EST) Subject: [tinysofa-svn] r3041 - tinysofa/releases/1.1 Message-ID: <20040712182526.816A54E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-13 04:25:26 +1000 (Tue, 13 Jul 2004) New Revision: 3041 Removed: tinysofa/releases/1.1/anaconda/ Log: - remove anaconda From svn at tinysofa.org Mon Jul 12 18:35:46 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 13 Jul 2004 04:35:46 +1000 (EST) Subject: [tinysofa-svn] r3042 - tinysofa/releases/1.1 Message-ID: <20040712183546.0389D4E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-13 04:35:46 +1000 (Tue, 13 Jul 2004) New Revision: 3042 Added: tinysofa/releases/1.1/anaconda/ Log: - copy anaconda from 1.0 Copied: tinysofa/releases/1.1/anaconda (from rev 3041, tinysofa/releases/1.0/anaconda) From svn at tinysofa.org Mon Jul 12 19:10:46 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 13 Jul 2004 05:10:46 +1000 (EST) Subject: [tinysofa-svn] r3043 - in tinysofa/releases/1.1/anaconda/current: sources specs Message-ID: <20040712191046.1C2114E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-13 05:10:45 +1000 (Tue, 13 Jul 2004) New Revision: 3043 Added: tinysofa/releases/1.1/anaconda/current/sources/anaconda-7.2.5-headers.patch tinysofa/releases/1.1/anaconda/current/sources/anaconda-7.2.5-minilibc.patch tinysofa/releases/1.1/anaconda/current/sources/anaconda-7.2.5-unistd.patch tinysofa/releases/1.1/anaconda/current/sources/anaconda-7.2.5-wlite.patch tinysofa/releases/1.1/anaconda/current/sources/headers.tar.bz2 tinysofa/releases/1.1/anaconda/current/sources/wlite-0.8.1.tar.gz Modified: tinysofa/releases/1.1/anaconda/current/specs/anaconda.spec Log: - anaconda 7.2.5 for 1.1 Added: tinysofa/releases/1.1/anaconda/current/sources/anaconda-7.2.5-headers.patch =================================================================== --- tinysofa/releases/1.1/anaconda/current/sources/anaconda-7.2.5-headers.patch 2004-07-12 18:35:46 UTC (rev 3042) +++ tinysofa/releases/1.1/anaconda/current/sources/anaconda-7.2.5-headers.patch 2004-07-12 19:10:45 UTC (rev 3043) @@ -0,0 +1,15 @@ +--- anaconda-7.2.5/loader/Makefile.headers 2004-02-17 14:16:02.000000000 +0200 ++++ anaconda-7.2.5/loader/Makefile 2004-07-06 19:48:28.000000000 +0300 +@@ -186,10 +186,10 @@ + $(REALCC) $(STATIC) $(COPTS) $(LDFLAGS) -o $@ init.o $(MINILIBC) + + init.o: init.c +- $(REALCC) -O2 $(COPTS) -c -o init.o init.c ++ $(REALCC) -O2 $(COPTS) -I../include -c -o init.o init.c + + minilibc.o: minilibc.c +- $(REALCC) -O2 $(COPTS) -c -o minilibc.o minilibc.c ++ $(REALCC) -O2 $(COPTS) -I../include -c -o minilibc.o minilibc.c + + mkctype: mkctype.c + $(REALCC) $(COPTS) -o mkctype mkctype.c Added: tinysofa/releases/1.1/anaconda/current/sources/anaconda-7.2.5-minilibc.patch =================================================================== --- tinysofa/releases/1.1/anaconda/current/sources/anaconda-7.2.5-minilibc.patch 2004-07-12 18:35:46 UTC (rev 3042) +++ tinysofa/releases/1.1/anaconda/current/sources/anaconda-7.2.5-minilibc.patch 2004-07-12 19:10:45 UTC (rev 3043) @@ -0,0 +1,11 @@ +--- anaconda-7.2.5/loader/minilibc.h.orig 2004-07-06 19:57:24.000000000 +0300 ++++ anaconda-7.2.5/loader/minilibc.h 2004-07-06 19:58:12.000000000 +0300 +@@ -30,7 +30,7 @@ + } __sigset_t; + + /* from /usr/include/signal.h */ +-/*typedef __sigset_t sigset_t;*/ ++typedef __sigset_t sigset_t; + + /* Aieee, gcc 2.95+ creates a stub for posix_types.h on i386 which brings + glibc headers in and thus makes __FD_SET etc. not defined with 2.3+ kernels. */ Added: tinysofa/releases/1.1/anaconda/current/sources/anaconda-7.2.5-unistd.patch =================================================================== --- tinysofa/releases/1.1/anaconda/current/sources/anaconda-7.2.5-unistd.patch 2004-07-12 18:35:46 UTC (rev 3042) +++ tinysofa/releases/1.1/anaconda/current/sources/anaconda-7.2.5-unistd.patch 2004-07-12 19:10:45 UTC (rev 3043) @@ -0,0 +1,11 @@ +--- anaconda-7.2.5/isys/modutils/util/sys_oim.c.orig 2004-07-06 12:57:16.000000000 +0300 ++++ anaconda-7.2.5/isys/modutils/util/sys_oim.c 2004-07-06 12:59:23.000000000 +0300 +@@ -27,7 +27,7 @@ + _syscall* defined. */ + #define __LIBRARY__ + +-#include ++#include + + + /*======================================================================*/ Added: tinysofa/releases/1.1/anaconda/current/sources/anaconda-7.2.5-wlite.patch =================================================================== --- tinysofa/releases/1.1/anaconda/current/sources/anaconda-7.2.5-wlite.patch 2004-07-12 18:35:46 UTC (rev 3042) +++ tinysofa/releases/1.1/anaconda/current/sources/anaconda-7.2.5-wlite.patch 2004-07-12 19:10:45 UTC (rev 3043) @@ -0,0 +1,118 @@ +--- anaconda-7.2.5/loader/Makefile.wlite 2004-07-12 21:07:58.000000000 +0300 ++++ anaconda-7.2.5/loader/Makefile 2004-07-12 21:10:35.000000000 +0300 +@@ -8,17 +8,11 @@ + misc.o ftp.o md5.o mediacheck.o moduledeps.o + + SLANGLIB = -lslang +-ifneq (ia64, $(ARCH)) +-ifneq (i386, $(ARCH)) +-OBJS += fnmatch-stub.o printf-stub.o pwd-stub.o dl-stub.o +-SLANGLIB = ../minislang/libslang.a +-endif +-endif + + LOADEROBJS = loader.o loader-pcmcia.o popen.o + SOURCES = $(subst .o,.c,$(OBJS)) loader.c + BINS = init +-DIRS = ../isys ../balkan ../minislang ./pcmcia-install ++DIRS = ../isys ../balkan ./pcmcia-install + NETOBJS = net.o urls.o telnet.o telnetd.o + PCMCIAOBJS = pcmcia.o $(NETOBJS) + OPTS = -Os +@@ -89,7 +83,6 @@ + LDFLAGS = -nostdlib /usr/lib/crt1.o + LOADERLIBS += -lrpc + ISYS = ../isys/libisys-diet.a +-SLANGLIB = ../minislang/libslang-diet.a + GUNZIP = ../isys/gzlib/libgunzip-diet.a + DIET=diet + REALCC=gcc -fno-stack-protector +@@ -107,6 +100,8 @@ + endif + endif + ++LOADERLIBS += ../wlite/libwlitediet.a ++ + #LANGS = $(shell awk '{ print $$2 }' ../lang-table | egrep -v '(^en$$)') + LANGS= + +--- anaconda-7.2.5/loader/dietstubs.c.wlite 2004-02-16 13:06:15.000000000 +0200 ++++ anaconda-7.2.5/loader/dietstubs.c 2004-07-12 21:13:32.000000000 +0300 +@@ -151,6 +151,7 @@ + errno = err; + } + ++#if 0 + int pwrite(int fd, const void *buf, size_t count, off_t offset) { + return __pwrite(fd, buf, count, offset); + } +@@ -160,3 +161,69 @@ + s++; + return s; + } ++#endif ++ ++int __libc_enable_secure = 0; ++ ++#define WLITE_REDEF_STDC 0 ++#include ++#include ++ ++char * __secure_getenv (const char * name) { ++ return getenv(name); ++} ++ ++#include ++ ++int wcwidth (wchar_t c) { ++ return wlite_wcwidth(c); ++} ++ ++size_t mbrtowc (wchar_t *pwc, const char *s, size_t n, void *ps) { ++ return wlite_mbrtowc (pwc, s, n, ps); ++} ++ ++#define mbstate_t wlite_mbstate_t ++size_t mbsrtowcs(wchar_t *pwc, const char **src, size_t n, mbstate_t *ps) { ++ return wlite_mbsrtowcs (pwc, src, n, ps); ++} ++ ++int iswspace (wchar_t c) { ++ return wlite_iswctype((c), wlite_space_); ++} ++ ++size_t wcrtomb(char *s, wchar_t wc, void *ps) { ++ return wlite_wcrtomb (s, wc, ps); ++} ++ ++ ++ ++const char * __dgettext(const char * domainname, const char * msgid) { ++ return msgid; ++} ++ ++const char * __dcgettext(const char * domainname, const char * msgid, ++ int category) { ++ return msgid; ++} ++ ++/* Define ALIASNAME as a strong alias for NAME. */ ++# define strong_alias(name, aliasname) _strong_alias(name, aliasname) ++# define _strong_alias(name, aliasname) \ ++ extern __typeof (name) aliasname __attribute__ ((alias (#name))); ++ ++strong_alias (__dgettext, dgettext); ++strong_alias (__dcgettext, dcgettext); ++ ++/* lie to slang to trick it into using unicode chars for linedrawing */ ++char * setlocale (int category, const char *locale) { ++ if (locale == NULL || *locale == '\0') ++ return "en_US.UTF-8"; ++ return 0; ++} ++ ++/* avoid bringing in glibc's setlocale.o - we want to use our ++ fake setlocale() */ ++typedef pthread_mutex_t __libc_lock_t; ++__libc_lock_t __libc_setlocale_lock; ++ Added: tinysofa/releases/1.1/anaconda/current/sources/headers.tar.bz2 =================================================================== (Binary files differ) Property changes on: tinysofa/releases/1.1/anaconda/current/sources/headers.tar.bz2 ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/releases/1.1/anaconda/current/sources/wlite-0.8.1.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/releases/1.1/anaconda/current/sources/wlite-0.8.1.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: tinysofa/releases/1.1/anaconda/current/specs/anaconda.spec =================================================================== --- tinysofa/releases/1.1/anaconda/current/specs/anaconda.spec 2004-07-12 18:35:46 UTC (rev 3042) +++ tinysofa/releases/1.1/anaconda/current/specs/anaconda.spec 2004-07-12 19:10:45 UTC (rev 3043) @@ -2,11 +2,13 @@ ExclusiveArch: i386 i586 ia64 alpha Name: anaconda Version: 7.2.5 -Release: 13ts +Release: 15jh License: GPL Summary: The tinysofa installation program. -Group: tinysofa official +Group: main Source: anaconda-%{version}.tar.bz2 +Source1: headers.tar.bz2 +Source2: wlite-0.8.1.tar.gz Patch: anaconda-7.2.5-tinysofa-rpm-4.2.patch Patch1: anaconda-7.2.5-tinysofa-naming-updroot.patch Patch2: anaconda-7.2.5-tinysofa-comps.patch @@ -33,6 +35,10 @@ Patch23: anaconda-7.2.5-tinysofa-kerberos.patch Patch24: anaconda-7.2.5-tinysofa-upgrade-2.patch Patch25: anaconda-7.2.5-tinysofa-bootloader-symlinks.patch +Patch26: anaconda-7.2.5-unistd.patch +Patch27: anaconda-7.2.5-headers.patch +Patch28: anaconda-7.2.5-minilibc.patch +Patch29: anaconda-7.2.5-wlite.patch Obsoletes: anaconda-reconfig BuildRequires: pump-devel, kudzu-devel, pciutils-devel, bzip2-devel BuildRequires: e2fsprogs-devel, python-devel db4-devel, newt-devel @@ -43,7 +49,7 @@ BuildRequires: cpio Prereq: chkconfig Requires: rpm-python parted hwdata >= 0.44 beecrypt elfutils, elfutils-libelf -BuildRoot: %{_tmppath}/%{name}-root +BuildRoot: %{_tmppath}/%{name}-%{version}-root %description The anaconda package contains portions of the tinysofa @@ -53,7 +59,7 @@ %package runtime Summary: tinysofa installer portions needed only for fresh installs. -Group: tinysofa official +Group: development Requires: hwdata >= 0.44 %description runtime @@ -63,7 +69,7 @@ already installed systems. Based on Red Hat anaconda 7.2 and 7.3. %prep -%setup -q +%setup -q -a 1 -a 2 %patch -p1 -b .tinysofa-rpm-4.2 %patch1 -p1 -b .tinysofa-naming-updroot %patch2 -p1 -b .tinysofa-comps @@ -90,6 +96,10 @@ %patch23 -p1 -b .tinysofa-kerberos %patch24 -p1 -b .tinysofa-upgrade-2 %patch25 -p1 -b .tinysofa-bootloader-symlinks +%patch26 -p1 -b .unistd +%patch27 -p1 -b .headers +%patch28 -p1 -b .minilibc +%patch29 -p1 -b .wlite %build # @@ -144,6 +154,7 @@ export CFLAGS="$RPM_OPT_FLAGS -Os -D__LOADER__ -Dxstrdup=strdup -Dxmalloc=malloc -Dxrealloc=realloc -Dxstrcat=strncat %{?no_stack_protector}" %configure --disable-compat-2-0 --disable-kerneld --enable-insmod-static\ --exec_prefix=/ --disable-combined --enable-combined-rmmod + make -C obj %{?_smp_mflags} dep all make -C util %{?_smp_mflags} dep all make -C insmod %{?_smp_mflags} dep all @@ -153,14 +164,18 @@ cp insmod/libmodutils.a libs popd +pushd wlite +diet %make +mv libwlite.a libwlitediet.a +popd + # Now build the rest normally... make depend make RPM_OPT_FLAGS="$RPM_OPT_FLAGS" %install -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT -make DESTDIR=$RPM_BUILD_ROOT install +%makeinstall_std strip $RPM_BUILD_ROOT/usr/lib/anaconda/*.so @@ -172,10 +187,10 @@ rm -f $RPM_BUILD_ROOT/usr/lib/anaconda-runtime/module-info %clean -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT +%clean_buildroot %post -chkconfig --add reconfig +/sbin/chkconfig --add reconfig %preun if [ $1 = 0 ]; then From svn at tinysofa.org Mon Jul 12 19:14:45 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 13 Jul 2004 05:14:45 +1000 (EST) Subject: [tinysofa-svn] r3044 - tinysofa/releases/1.1 Message-ID: <20040712191445.AD6DE4E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-13 05:14:45 +1000 (Tue, 13 Jul 2004) New Revision: 3044 Removed: tinysofa/releases/1.1/swupconf/ Log: - remove swupconf From svn at tinysofa.org Mon Jul 12 19:22:25 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 13 Jul 2004 05:22:25 +1000 (EST) Subject: [tinysofa-svn] r3045 - tinysofa/releases/1.1/anaconda/current/specs Message-ID: <20040712192225.119654E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-13 05:22:24 +1000 (Tue, 13 Jul 2004) New Revision: 3045 Modified: tinysofa/releases/1.1/anaconda/current/specs/anaconda.spec Log: - add BuildRequires: pyparted Modified: tinysofa/releases/1.1/anaconda/current/specs/anaconda.spec =================================================================== --- tinysofa/releases/1.1/anaconda/current/specs/anaconda.spec 2004-07-12 19:14:45 UTC (rev 3044) +++ tinysofa/releases/1.1/anaconda/current/specs/anaconda.spec 2004-07-12 19:22:24 UTC (rev 3045) @@ -47,6 +47,7 @@ BuildRequires: glibc-locales, dosfstools, cramfsprogs BuildRequires: beecrypt-devel, elfutils-devel, elfutils-libelf-devel, python BuildRequires: cpio +BuildRequires: pyparted Prereq: chkconfig Requires: rpm-python parted hwdata >= 0.44 beecrypt elfutils, elfutils-libelf BuildRoot: %{_tmppath}/%{name}-%{version}-root From svn at tinysofa.org Tue Jul 13 08:13:42 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 13 Jul 2004 18:13:42 +1000 (EST) Subject: [tinysofa-svn] r3046 - in tinysofa/releases/1.1/gmp/current: sources specs Message-ID: <20040713081342.78FBB4E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-13 18:13:41 +1000 (Tue, 13 Jul 2004) New Revision: 3046 Added: tinysofa/releases/1.1/gmp/current/sources/gmp-4.0.1-s390.patch tinysofa/releases/1.1/gmp/current/sources/gmp-4.1.2-autoconf.patch tinysofa/releases/1.1/gmp/current/sources/gmp-4.1.2-ppc64.patch tinysofa/releases/1.1/gmp/current/sources/gmp-4.1.3-pld-ac_fixes.patch tinysofa/releases/1.1/gmp/current/sources/gmp-4.1.3-pld-am_fixes.patch tinysofa/releases/1.1/gmp/current/sources/gmp-4.1.3-pld-x86_64.patch tinysofa/releases/1.1/gmp/current/sources/gmp-4.1.3.tar.bz2 Removed: tinysofa/releases/1.1/gmp/current/sources/gmp-4.1.2.tar.bz2 Modified: tinysofa/releases/1.1/gmp/current/specs/gmp.spec Log: - new gmp package backported from ts 2 Added: tinysofa/releases/1.1/gmp/current/sources/gmp-4.0.1-s390.patch =================================================================== --- tinysofa/releases/1.1/gmp/current/sources/gmp-4.0.1-s390.patch 2004-07-12 19:22:24 UTC (rev 3045) +++ tinysofa/releases/1.1/gmp/current/sources/gmp-4.0.1-s390.patch 2004-07-13 08:13:41 UTC (rev 3046) @@ -0,0 +1,56 @@ +--- gmp-4.0.1/mpn/s390/gmp-mparam.h.s390 Wed May 15 21:32:57 2002 ++++ gmp-4.0.1/mpn/s390/gmp-mparam.h Wed May 15 21:33:21 2002 +@@ -20,7 +20,8 @@ + MA 02111-1307, USA. */ + + +-/* BITS_PER_MP_LIMB etc generated by configure */ ++#define BITS_PER_MP_LIMB 32 ++#define BYTES_PER_MP_LIMB 4 + + + /* Generated by tuneup.c, 2001-09-26, gcc 2.95 */ +--- ./mpn/s390x/gmp-mparam.h ++++ ./mpn/s390x/gmp-mparam.h +@@ -0,0 +1,27 @@ ++/* gmp-mparam.h -- Compiler/machine parameter header file. ++ ++Copyright (C) 1991, 1993, 1994, 1995 Free Software Foundation, Inc. ++ ++This file is part of the GNU MP Library. ++ ++The GNU MP Library is free software; you can redistribute it and/or modify ++it under the terms of the GNU Library General Public License as published by ++the Free Software Foundation; either version 2 of the License, or (at your ++option) any later version. ++ ++The GNU MP Library is distributed in the hope that it will be useful, but ++WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY ++or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public ++License for more details. ++ ++You should have received a copy of the GNU Library General Public License ++along with the GNU MP Library; see the file COPYING.LIB. If not, write to ++the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, ++MA 02111-1307, USA. */ ++ ++#define BITS_PER_MP_LIMB 64 ++#define BYTES_PER_MP_LIMB 8 ++#define BITS_PER_LONGINT 64 ++#define BITS_PER_INT 32 ++#define BITS_PER_SHORTINT 16 ++#define BITS_PER_CHAR 8 +--- ./configure.in ++++ ./configure.in +@@ -620,6 +620,11 @@ + ;; + + ++ s390x-*-*) ++ gcc_cflags="-g -O2 $fomit_frame_pointer" ++ path="s390x" ++ #extra_functions="udiv_w_sdiv" ++ ;; + # IBM s/370 and similar + [s3[6-9]0*-*-*]) + gcc_cflags="-g -O2 $fomit_frame_pointer" Added: tinysofa/releases/1.1/gmp/current/sources/gmp-4.1.2-autoconf.patch =================================================================== --- tinysofa/releases/1.1/gmp/current/sources/gmp-4.1.2-autoconf.patch 2004-07-12 19:22:24 UTC (rev 3045) +++ tinysofa/releases/1.1/gmp/current/sources/gmp-4.1.2-autoconf.patch 2004-07-13 08:13:41 UTC (rev 3046) @@ -0,0 +1,17 @@ +--- gmp-4.1.2/configure.in.lr 2003-06-03 09:48:52.000000000 +0200 ++++ gmp-4.1.2/configure.in 2003-06-03 09:49:39.000000000 +0200 +@@ -1338,11 +1338,11 @@ + + + # The C++ compiler, if desired. ++test_CXXFLAGS=${CXXFLAGS+set} ++AC_PROG_CXX ++ + want_cxx=no + if test $enable_cxx != no; then +- test_CXXFLAGS=${CXXFLAGS+set} +- AC_PROG_CXX +- + echo "CXXFLAGS chosen by autoconf: $CXXFLAGS" >&AC_FD_CC + cxxflags_ac_prog_cxx=$CXXFLAGS + cxxflags_list=ac_prog_cxx Added: tinysofa/releases/1.1/gmp/current/sources/gmp-4.1.2-ppc64.patch =================================================================== --- tinysofa/releases/1.1/gmp/current/sources/gmp-4.1.2-ppc64.patch 2004-07-12 19:22:24 UTC (rev 3045) +++ tinysofa/releases/1.1/gmp/current/sources/gmp-4.1.2-ppc64.patch 2004-07-13 08:13:41 UTC (rev 3046) @@ -0,0 +1,34 @@ +--- gmp-4.1.2/acinclude.m4.sopwith 2002-09-07 20:02:19.000000000 -0400 ++++ gmp-4.1.2/acinclude.m4 2003-02-11 10:48:30.000000000 -0500 +@@ -1003,7 +1003,7 @@ + ${tmp_underscore}underscore_test$gmp_cv_asm_label_suffix + EOF + case $host in +- *-*-aix*) ++ *-*-aix*|powerpc64-*) + cat >>conftes2.s < 4.1.2-5ts -- current (4.1.2-4ts) integrated as 4.1.2-5ts for release 1.0-U1 +* Mon May 24 2004 Thomas Woerner 4.1.3-1 +- new version 4.1.3 -* Tue May 11 2004 Omar Kilani -- Add Buildrequires m4. -- Fix permissions. +* Wed Mar 31 2004 Thomas Woerner 4.1.2-14 +- dropped RPATH (#118506) -* Sun Dec 14 2003 Erlend Midttun 4.1.2-1tr -- New upstream. +* Sat Mar 06 2004 Florian La Roche +- also build SSE2 DSOs, patch from Ulrich Drepper -* Mon Jun 23 2003 Erlend Midttun 4.1-7tr -- Added %defattr. +* Tue Mar 02 2004 Elliot Lee +- rebuilt -* Wed Jun 18 2003 Erlend Midttun 4.1-6tr -- Big rebuild +* Fri Feb 13 2004 Elliot Lee +- rebuilt -* Wed May 14 2003 Tore Olsen 4.1-5to -- only devel package should prereq on htmlinfo. -- package now buildable as user. -- devel package requires gmp 4.1. +* Thu Jan 29 2004 Thomas Woerner 4.1.2-11 +- BuildRequires for automake16 -* Wed Apr 9 2003 Gerald Dachs 4.1-4gd -- Added PreReq on htmlinfo +* Mon Dec 01 2003 Florian La Roche +- fix symlink to libgmpxx.so.3 #111135 +- add patch to factorize.c from gmp homepage -* Mon Mar 24 2003 Erlend Midttun 4.1-3em -- Rebuilt against glibc 2.3.2. +* Thu Oct 23 2003 Joe Orton 4.1.2-9 +- build with -Wa,--noexecstack -* Fri Oct 25 2002 Christian H. Toldnes 4.1-2ct -- Reintroduced info documantation using htmlinfo +* Thu Oct 23 2003 Joe Orton 4.1.2-8 +- build assembly code with -Wa,--execstack +- use parallel make +- run tests, and fix C++ therein -* Thu Aug 15 2002 Christian H. Toldnes 4.1-1ct -- New upstream version: 4.1 -- Removed info stuff. -- .spec cleanup +* Thu Oct 02 2003 Florian La Roche +- enable mpfr #104395 +- enable cxx #80195 +- add COPYING.LIB +- add fixes from gmp web-site +- remove some cruft patches for older libtool releases -* Tue Mar 27 2001 Alexander Reelsen -- Fixed a shared library/symlink problem +* Wed Jun 04 2003 Elliot Lee +- rebuilt -* Tue Mar 06 2001 Oystein Viggen -- Upgrade to v3.1.1 +* Tue Jun 03 2003 Florian La Roche +- make configure.in work with newer autoconf -* Mon Jan 24 2000 Tore Olsen -- moved info directory to /usr/share for FHS compliance +* Sun Jun 01 2003 Florian La Roche +- do not set extra_functions for s390x #92001 +* Thu Feb 13 2003 Elliot Lee 4.1.2-3 +- Add ppc64 patch, accompanied by running auto* + +* Wed Jan 22 2003 Tim Powers +- rebuilt + +* Wed Jan 01 2003 Florian La Roche +- update to 4.1.2 + +* Tue Dec 03 2002 Florian La Roche +- update to 4.1.1 +- remove un-necessary patches +- adjust s390/x86_64 patch + +* Sun Oct 06 2002 Florian La Roche +- add s390x patch +- disable current x86-64 support in longlong.h + +* Mon Jul 8 2002 Trond Eivind Glomsr?d 4.1-4 +- Add 4 patches, among them one for #67918 +- Update URL +- s/Copyright/License/ + +* Mon Jul 8 2002 Trond Eivind Glomsr?d 4.1-3 +- Redefine the configure macro, the included configure + script isn't happy about the rpm default one (#68190). Also, make + sure the included libtool isn't replaced, + +* Fri Jun 21 2002 Tim Powers +- automated rebuild + +* Sat May 25 2002 Florian La Roche +- update to version 4.1 +- patch s390 gmp-mparam.h to match other archs. + +* Thu May 23 2002 Tim Powers +- automated rebuild + +* Mon Mar 11 2002 Trond Eivind Glomsr?d 4.0.1-3 +- Use standard %%configure macro and edit %%{_tmppath} + +* Tue Feb 26 2002 Trond Eivind Glomsr?d 4.0.1-2 +- Rebuild + +* Tue Jan 22 2002 Florian La Roche +- update to 4.0.1 +- bzip2 src + +* Wed Jan 09 2002 Tim Powers +- automated rebuild + +* Sun Jun 24 2001 Elliot Lee +- Bump release + rebuild. + +* Mon Feb 05 2001 Philipp Knirsch +- Fixed bugzilla bug #25515 where GMP wouldn't work on IA64 as IA64 is not +correctly identified as a 64 bit platform. + +* Mon Dec 18 2000 Preston Brown +- include bsd mp library + +* Tue Oct 17 2000 Florian La Roche +- update to 3.1.1 + +* Sun Sep 3 2000 Florian La Roche +- update to 3.1 + +* Sat Aug 19 2000 Preston Brown +- devel subpackage depends on main package so that .so symlink is OK. + +* Thu Jul 13 2000 Prospector +- automatic rebuild + +* Sat Jun 3 2000 Nalin Dahyabhai +- switch to the configure and makeinstall macros +- FHS-compliance fixing +- move docs to non-devel package + +* Fri Apr 28 2000 Bill Nottingham +- libtoolize for ia64 + +* Fri Apr 28 2000 Florian La Roche +- update to 3.0.1 + +* Thu Apr 27 2000 Jakub Jelinek +- sparc64 fixes for 3.0 + +* Wed Apr 26 2000 Florian La Roche +- update to 3.0 + +* Mon Feb 14 2000 Matt Wilson +- #include in files that use string functions + +* Wed Feb 02 2000 Cristian Gafton +- fix description and summary + +* Mon Dec 06 1999 Michael K. Johnson +- s/GPL/LGPL/ +- build as non-root (#7604) + * Mon Sep 06 1999 Jakub Jelinek - merge in some debian gmp fixes - Ulrich Drepper's __gmp_scale2 fix @@ -166,3 +351,4 @@ - started with package from Toshio Kuratomi - cleaned up file list - fixed up install-info support + From svn at tinysofa.org Tue Jul 13 08:23:42 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 13 Jul 2004 18:23:42 +1000 (EST) Subject: [tinysofa-svn] r3047 - tinysofa/releases/1.1/mod_php4/current/specs Message-ID: <20040713082342.8B3A54E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-13 18:23:42 +1000 (Tue, 13 Jul 2004) New Revision: 3047 Modified: tinysofa/releases/1.1/mod_php4/current/specs/mod_php4.spec Log: - disable imap support because we don't have uw-imap anymore Modified: tinysofa/releases/1.1/mod_php4/current/specs/mod_php4.spec =================================================================== --- tinysofa/releases/1.1/mod_php4/current/specs/mod_php4.spec 2004-07-13 08:13:41 UTC (rev 3046) +++ tinysofa/releases/1.1/mod_php4/current/specs/mod_php4.spec 2004-07-13 08:23:42 UTC (rev 3047) @@ -7,7 +7,7 @@ Summary: The PHP4 HTML-embedded scripting language for use with Apache. Name: mod_php4 Version: 4.3.7 -Release: 2ts +Release: 3jh Group: extra Source0: http://www.php.net/distributions/php-%{version}.tar.bz2 Source1: php.ini @@ -17,7 +17,7 @@ Requires: webserver, gmp, openssl, bzip2, zlib, rpm >= 3.0.6, db4 Obsoletes: mod_php3 BuildRequires: apache apache-devel >= 2 apr-util-devel apr-devel -BuildRequires: postgresql-devel, mysql-devel, uw-imap-devel, openldap-devel +BuildRequires: postgresql-devel, mysql-devel, openldap-devel BuildRequires: zlib-devel, gmp-devel, flex, bison, byacc, bzip2-devel BuildRequires: cyrus-imapd-devel, libpng-devel, libjpeg-devel BuildRequires: cyrus-sasl-devel, readline-devel, db4-devel @@ -78,6 +78,7 @@ Uncomment "extension=gd.so" in order to activate this module +%if 0 %package imap Summary: IMAP/PHP4 support Group: extra @@ -87,6 +88,7 @@ IMAP support module for PHP4 Uncomment "extension=imap.so" in order to activate this module +%endif %package ldap Summary: LDAP/PHP4 support @@ -195,7 +197,6 @@ --with-gd=shared \ --with-jpeg-dir=/usr \ --with-png-dir=/usr \ - --with-imap=shared,/usr \ --with-ldap=shared,/usr \ --with-mysql=shared,/usr \ --with-pgsql=shared,/usr \ @@ -211,7 +212,6 @@ make %install -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != "/" ] && rm -rf "$RPM_BUILD_ROOT" mkdir -p $RPM_BUILD_ROOT/usr/lib/apache mkdir -p $RPM_BUILD_ROOT/etc/httpd mkdir -p $RPM_BUILD_ROOT/usr/share/php4/ @@ -299,9 +299,11 @@ /usr/share/php4/openssl.so %endif +%if 0 %files imap %defattr(-,root,root) /usr/share/php4/imap.so +%endif %files ldap %defattr(-,root,root) From svn at tinysofa.org Tue Jul 13 08:26:41 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 13 Jul 2004 18:26:41 +1000 (EST) Subject: [tinysofa-svn] r3048 - tinysofa/releases/1.1/pciutils/current/specs Message-ID: <20040713082641.7D8864E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-13 18:26:41 +1000 (Tue, 13 Jul 2004) New Revision: 3048 Modified: tinysofa/releases/1.1/pciutils/current/specs/pciutils.spec Log: - don't require kernel Modified: tinysofa/releases/1.1/pciutils/current/specs/pciutils.spec =================================================================== --- tinysofa/releases/1.1/pciutils/current/specs/pciutils.spec 2004-07-13 08:23:42 UTC (rev 3047) +++ tinysofa/releases/1.1/pciutils/current/specs/pciutils.spec 2004-07-13 08:26:41 UTC (rev 3048) @@ -1,6 +1,6 @@ Name: pciutils Version: 2.1.99.test3 -Release: 2ts +Release: 1jh Source: ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/alpha/%{name}-2.1.99-test3.tar.bz2 Patch0: pciutils-strip.patch Patch1: pciutils-pciids.patch @@ -9,10 +9,10 @@ License: GPL Buildroot: %{_tmppath}/%{name}-%{version}-root ExclusiveOS: Linux -Requires: kernel >= 2.2 hwdata +Requires: hwdata Summary: PCI bus related utilities. -Group: Applications/System -%ifarch i386 +Group: main +%ifarch i386 i586 BuildRequires: dietlibc %endif @@ -24,7 +24,7 @@ %package devel Summary: Linux PCI development library. -Group: Development/Libraries +Group: development %description devel This package contains a library for inspecting and setting @@ -38,7 +38,7 @@ %patch3 -p1 -b .pread %build -%ifarch i386 +%ifarch i386 i586 make OPT="$RPM_OPT_FLAGS -D_GNU_SOURCE=1" CC="diet gcc" PREFIX="/usr" mv lib/libpci.a lib/libpci_loader_a make clean @@ -47,7 +47,6 @@ make OPT="$RPM_OPT_FLAGS -D_GNU_SOURCE=1" PREFIX="/usr" %install -rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT/{sbin,%{_mandir}/man8,%{_libdir},%{_includedir}/pci} install -s lspci setpci $RPM_BUILD_ROOT/sbin @@ -57,7 +56,7 @@ install lib/header.h $RPM_BUILD_ROOT%{_includedir}/pci install lib/config.h $RPM_BUILD_ROOT%{_includedir}/pci -%ifarch i386 +%ifarch i386 i586 install lib/libpci_loader_a $RPM_BUILD_ROOT%{_libdir}/libpci_loader.a %endif @@ -70,13 +69,13 @@ %files devel %defattr(0644, root, root, 0755) %{_libdir}/libpci.a -%ifarch i386 +%ifarch i386 i586 %{_libdir}/libpci_loader.a %endif %{_includedir}/pci %clean -rm -rf $RPM_BUILD_ROOT +%clean_buildroot %changelog * Tue Jun 15 2004 Elliot Lee From svn at tinysofa.org Tue Jul 13 12:49:48 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 13 Jul 2004 22:49:48 +1000 (EST) Subject: [tinysofa-svn] r3050 - tinysofa/releases/1.1 Message-ID: <20040713124948.AD7494E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-13 22:49:47 +1000 (Tue, 13 Jul 2004) New Revision: 3050 Removed: tinysofa/releases/1.1/tinysofa-gpgkeys-emily/ Log: - remove tinysofa-gpgkeys-emily From svn at tinysofa.org Tue Jul 13 15:34:03 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Wed, 14 Jul 2004 01:34:03 +1000 (EST) Subject: [tinysofa-svn] r3051 - in tinysofa/releases/1.1/anaconda/current: sources specs Message-ID: <20040713153403.ACE6D4E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-14 01:34:03 +1000 (Wed, 14 Jul 2004) New Revision: 3051 Added: tinysofa/releases/1.1/anaconda/current/sources/anaconda-7.2.5-apt.patch tinysofa/releases/1.1/anaconda/current/sources/anaconda-7.2.5-fat.patch tinysofa/releases/1.1/anaconda/current/sources/anaconda-7.2.5-rpm-4.3.patch tinysofa/releases/1.1/anaconda/current/sources/anaconda-7.2.5-tinysofa-1.1-upd-instroot.patch Removed: tinysofa/releases/1.1/anaconda/current/sources/anaconda-7.2.5-soup.patch Modified: tinysofa/releases/1.1/anaconda/current/specs/anaconda.spec Log: - swup -> apt change - rpm 4.3 patch - upd-instroot patch for tinysofa 1.1 Copied: tinysofa/releases/1.1/anaconda/current/sources/anaconda-7.2.5-apt.patch (from rev 3044, tinysofa/releases/1.1/anaconda/current/sources/anaconda-7.2.5-soup.patch) =================================================================== --- tinysofa/releases/1.1/anaconda/current/sources/anaconda-7.2.5-soup.patch 2004-07-12 19:14:45 UTC (rev 3044) +++ tinysofa/releases/1.1/anaconda/current/sources/anaconda-7.2.5-apt.patch 2004-07-13 15:34:03 UTC (rev 3051) @@ -0,0 +1,21 @@ +diff -urN anaconda-7.2.5/textw/complete_text.py anaconda-7.2.5.soup/textw/complete_text.py +--- anaconda-7.2.5/textw/complete_text.py 2004-02-16 21:00:45.000000000 +1100 ++++ anaconda-7.2.5.soup/textw/complete_text.py 2004-04-14 17:30:35.000000000 +1000 +@@ -42,7 +42,7 @@ + "%s" + "Please visit %s for errata, " + "support, and documentation. " +- "We recommend using our software updater tool swup provided " ++ "We recommend using our software updater tool apt provided " + "with this distribution to perform automatic updates.\n\n" + "This installer is based on anaconda 7.2 by " + "Red Hat, Inc.") % (customize.VENDOR, customize.NAME, bootstr, +@@ -76,7 +76,7 @@ + _("Congratulations, configuration is complete.\n\n" + "Please visit %s for errata (updates " + "and bugfixes), support, and documentation.\n\n" +- "We recommend using our software updater tool swup provided " ++ "We recommend using our software updater tool apt provided " + "with this distribution to perform automatic updates.") % (customize.URI,), + [ _("OK") ], help = "reconfigfinished") + Added: tinysofa/releases/1.1/anaconda/current/sources/anaconda-7.2.5-fat.patch =================================================================== --- tinysofa/releases/1.1/anaconda/current/sources/anaconda-7.2.5-fat.patch 2004-07-13 12:49:47 UTC (rev 3050) +++ tinysofa/releases/1.1/anaconda/current/sources/anaconda-7.2.5-fat.patch 2004-07-13 15:34:03 UTC (rev 3051) @@ -0,0 +1,11 @@ +--- anaconda-7.2.5/fsset.py.orig 2004-07-13 12:31:11.000000000 +0300 ++++ anaconda-7.2.5/fsset.py 2004-07-13 12:31:21.000000000 +0300 +@@ -553,7 +553,7 @@ + class FATFileSystem(FileSystemType): + def __init__(self): + FileSystemType.__init__(self) +- self.partedFileSystemType = parted.file_system_type_get("FAT") ++ self.partedFileSystemType = parted.file_system_type_get("fat32") + self.formattable = 1 + self.checked = 0 + self.maxSize = 2 * 1024 Added: tinysofa/releases/1.1/anaconda/current/sources/anaconda-7.2.5-rpm-4.3.patch =================================================================== --- tinysofa/releases/1.1/anaconda/current/sources/anaconda-7.2.5-rpm-4.3.patch 2004-07-13 12:49:47 UTC (rev 3050) +++ tinysofa/releases/1.1/anaconda/current/sources/anaconda-7.2.5-rpm-4.3.patch 2004-07-13 15:34:03 UTC (rev 3051) @@ -0,0 +1,21 @@ +--- anaconda-7.2.5/packages.py.old 2004-07-13 15:38:58.000000000 +0300 ++++ anaconda-7.2.5/packages.py 2004-07-13 15:39:26.000000000 +0300 +@@ -508,6 +508,7 @@ + totalSize = 0 + + rpm.addMacro("__dbi_cdb", "create private mpool mp_mmapsize=16Mb mp_size=1Mb") ++ rpm.addMacro("__file_context_path", "%{nil}") + + if upgrade: + how = "u" +--- anaconda-7.2.5/scripts/upd-instroot.old 2004-07-13 18:27:04.000000000 +0300 ++++ anaconda-7.2.5/scripts/upd-instroot 2004-07-13 18:27:07.000000000 +0300 +@@ -424,6 +424,8 @@ + rm -rf $DEST; mkdir -p $DEST/usr/sbin + rm -rf $DESTGR; mkdir -p $DESTGR/usr/sbin $DESTGR/var/lib + #ln -s /tmp $DESTGR/var/lib/xkb ++# needed for rpm 4.3 ++mkdir -p $DESTGR/var/lock/rpm + + for file in $KEEPFILE $KEEPFILEGR; do + cat $file | awk '{print $1 "\n./" $1}' > $file- Deleted: tinysofa/releases/1.1/anaconda/current/sources/anaconda-7.2.5-soup.patch =================================================================== --- tinysofa/releases/1.1/anaconda/current/sources/anaconda-7.2.5-soup.patch 2004-07-13 12:49:47 UTC (rev 3050) +++ tinysofa/releases/1.1/anaconda/current/sources/anaconda-7.2.5-soup.patch 2004-07-13 15:34:03 UTC (rev 3051) @@ -1,21 +0,0 @@ -diff -urN anaconda-7.2.5/textw/complete_text.py anaconda-7.2.5.soup/textw/complete_text.py ---- anaconda-7.2.5/textw/complete_text.py 2004-02-16 21:00:45.000000000 +1100 -+++ anaconda-7.2.5.soup/textw/complete_text.py 2004-04-14 17:30:35.000000000 +1000 -@@ -42,7 +42,7 @@ - "%s" - "Please visit %s for errata, " - "support, and documentation. " -- "We recommend using our software updater tool swup provided " -+ "We recommend using our software updater tool soup provided " - "with this distribution to perform automatic updates.\n\n" - "This installer is based on anaconda 7.2 by " - "Red Hat, Inc.") % (customize.VENDOR, customize.NAME, bootstr, -@@ -76,7 +76,7 @@ - _("Congratulations, configuration is complete.\n\n" - "Please visit %s for errata (updates " - "and bugfixes), support, and documentation.\n\n" -- "We recommend using our software updater tool swup provided " -+ "We recommend using our software updater tool soup provided " - "with this distribution to perform automatic updates.") % (customize.URI,), - [ _("OK") ], help = "reconfigfinished") - Added: tinysofa/releases/1.1/anaconda/current/sources/anaconda-7.2.5-tinysofa-1.1-upd-instroot.patch =================================================================== --- tinysofa/releases/1.1/anaconda/current/sources/anaconda-7.2.5-tinysofa-1.1-upd-instroot.patch 2004-07-13 12:49:47 UTC (rev 3050) +++ tinysofa/releases/1.1/anaconda/current/sources/anaconda-7.2.5-tinysofa-1.1-upd-instroot.patch 2004-07-13 15:34:03 UTC (rev 3051) @@ -0,0 +1,32 @@ +--- anaconda-7.2.5/scripts/upd-instroot.tinysofa-1.1-upd-instroot 2004-07-13 12:58:03.000000000 +0300 ++++ anaconda-7.2.5/scripts/upd-instroot 2004-07-13 12:58:46.000000000 +0300 +@@ -67,8 +67,8 @@ + + for n in $RPMS; do + echo -ne "\rExpanding packages..." $(basename $n) +- if [ $(rpm -qp --qf '%{NAME}' $n) = "glibc" ] ; then +- GLIBC=$n ++ if [ $(rpm -qp --qf '%{NAME}' $n) = "tzdata" ] ; then ++ TZDATA=$n + fi + rpm2cpio $n | (cd $PKGDEST; cpio -E $KEEPFILES --quiet -iumd) + echo -ne "\rExpanding packages..." "$(basename $n | sed 's/./ /g')" +@@ -96,7 +96,8 @@ + anaconda anaconda-runtime hwdata kudzu-devel + kudzu db3 rpm-python bzip2 bzip2-libs dosfstools pciutils + reiserfsprogs jfsutils parted busybox-anaconda libcom_err +- gcc-c++-runtime gcc-runtime xfsprogs beecrypt elfutils-libelf" ++ libgcc libstdc++ xfsprogs beecrypt elfutils-libelf tzdata ++ slang" + + if [ $ARCH = i586 -o $ARCH = i386 ]; then + PACKAGES="$PACKAGES lilo" +@@ -446,7 +447,7 @@ + echo "retrieving timezones" + TZDIR=/tmp/glibc-timezone-$$ + mkdir -p $TZDIR/usr/share/zoneinfo +-rpm2cpio $GLIBC | (cd $TZDIR; cpio --quiet -iumd usr/share/zoneinfo ./usr/share/zoneinfo ./usr/share/zoneinfo/* usr/share/zoneinfo/*) ++rpm2cpio $TZDATA | (cd $TZDIR; cpio --quiet -iumd usr/share/zoneinfo ./usr/share/zoneinfo ./usr/share/zoneinfo/* usr/share/zoneinfo/*) + (cd $TZDIR; tar cSpf - $TIMEZONES) | (cd $DEST; tar xSpf -) + (cd $TZDIR; tar cSpf - $TIMEZONES) | (cd $DESTGR; tar xSpf -) + rm -rf $TZDIR Modified: tinysofa/releases/1.1/anaconda/current/specs/anaconda.spec =================================================================== --- tinysofa/releases/1.1/anaconda/current/specs/anaconda.spec 2004-07-13 12:49:47 UTC (rev 3050) +++ tinysofa/releases/1.1/anaconda/current/specs/anaconda.spec 2004-07-13 15:34:03 UTC (rev 3051) @@ -22,7 +22,7 @@ Patch10: anaconda-7.2.5-tinysofa-hidestderr2.patch Patch11: anaconda-7.2.5-tinysofa-nostatic.patch Patch12: anaconda-7.2.5-sshd.patch -Patch13: anaconda-7.2.5-soup.patch +Patch13: anaconda-7.2.5-apt.patch Patch14: anaconda-7.2.5-sshd-kickstart.patch Patch15: anaconda-7.2.5-modules-conf-perms.patch Patch16: anaconda-7.2.5-ncurses-lib.patch @@ -39,6 +39,9 @@ Patch27: anaconda-7.2.5-headers.patch Patch28: anaconda-7.2.5-minilibc.patch Patch29: anaconda-7.2.5-wlite.patch +Patch30: anaconda-7.2.5-tinysofa-1.1-upd-instroot.patch +Patch31: anaconda-7.2.5-fat.patch +Patch32: anaconda-7.2.5-rpm-4.3.patch Obsoletes: anaconda-reconfig BuildRequires: pump-devel, kudzu-devel, pciutils-devel, bzip2-devel BuildRequires: e2fsprogs-devel, python-devel db4-devel, newt-devel @@ -47,7 +50,7 @@ BuildRequires: glibc-locales, dosfstools, cramfsprogs BuildRequires: beecrypt-devel, elfutils-devel, elfutils-libelf-devel, python BuildRequires: cpio -BuildRequires: pyparted +#BuildRequires: pyparted Prereq: chkconfig Requires: rpm-python parted hwdata >= 0.44 beecrypt elfutils, elfutils-libelf BuildRoot: %{_tmppath}/%{name}-%{version}-root @@ -84,7 +87,7 @@ %patch10 -p1 -b .tinysofa-hidestderr2 %patch11 -p1 -b .tinysofa-nostatic %patch12 -p1 -b .sshd -#%patch13 -p1 -b .soup +%patch13 -p1 -b .apt %patch14 -p1 -b .sshd-kickstart %patch15 -p1 -b .module-conf-perms %patch16 -p1 -b .ncurses-lib @@ -101,6 +104,9 @@ %patch27 -p1 -b .headers %patch28 -p1 -b .minilibc %patch29 -p1 -b .wlite +%patch30 -p1 -b .tinysofa-1.1-upd-instroot +#%patch31 -p1 -b .fat +%patch32 -p1 -b .rpm-4.3 %build # From svn at tinysofa.org Tue Jul 13 16:46:37 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Wed, 14 Jul 2004 02:46:37 +1000 (EST) Subject: [tinysofa-svn] r3052 - tinysofa/releases/1.1/anaconda/current/sources Message-ID: <20040713164637.4FE844E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-14 02:46:37 +1000 (Wed, 14 Jul 2004) New Revision: 3052 Modified: tinysofa/releases/1.1/anaconda/current/sources/anaconda-7.2.5-rpm-4.3.patch Log: - update rpm 4.3 patch Modified: tinysofa/releases/1.1/anaconda/current/sources/anaconda-7.2.5-rpm-4.3.patch =================================================================== --- tinysofa/releases/1.1/anaconda/current/sources/anaconda-7.2.5-rpm-4.3.patch 2004-07-13 15:34:03 UTC (rev 3051) +++ tinysofa/releases/1.1/anaconda/current/sources/anaconda-7.2.5-rpm-4.3.patch 2004-07-13 16:46:37 UTC (rev 3052) @@ -8,14 +8,13 @@ if upgrade: how = "u" ---- anaconda-7.2.5/scripts/upd-instroot.old 2004-07-13 18:27:04.000000000 +0300 -+++ anaconda-7.2.5/scripts/upd-instroot 2004-07-13 18:27:07.000000000 +0300 -@@ -424,6 +424,8 @@ - rm -rf $DEST; mkdir -p $DEST/usr/sbin - rm -rf $DESTGR; mkdir -p $DESTGR/usr/sbin $DESTGR/var/lib - #ln -s /tmp $DESTGR/var/lib/xkb -+# needed for rpm 4.3 -+mkdir -p $DESTGR/var/lock/rpm +--- anaconda-7.2.5/scripts/mk-images.old 2004-07-13 19:17:30.000000000 +0300 ++++ anaconda-7.2.5/scripts/mk-images 2004-07-13 19:17:44.000000000 +0300 +@@ -407,6 +407,7 @@ + mkdir -p $MBD_DIR/tmp + mkdir -p $MBD_DIR/etc/terminfo/l + mkdir -p $MBD_DIR/var/state ++ mkdir -p $MBD_DIR/var/lock/rpm + ln -s /tmp $MBD_DIR/var/state/xkb - for file in $KEEPFILE $KEEPFILEGR; do - cat $file | awk '{print $1 "\n./" $1}' > $file- + if [ -n "$LOADERMODULES" ]; then From svn at tinysofa.org Tue Jul 13 16:59:06 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Wed, 14 Jul 2004 02:59:06 +1000 (EST) Subject: [tinysofa-svn] r3053 - tinysofa/releases/1.1/strongswan/current/specs Message-ID: <20040713165906.59FCF4E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-14 02:59:06 +1000 (Wed, 14 Jul 2004) New Revision: 3053 Modified: tinysofa/releases/1.1/strongswan/current/specs/strongswan.spec Log: - fix mknod in %post Modified: tinysofa/releases/1.1/strongswan/current/specs/strongswan.spec =================================================================== --- tinysofa/releases/1.1/strongswan/current/specs/strongswan.spec 2004-07-13 16:46:37 UTC (rev 3052) +++ tinysofa/releases/1.1/strongswan/current/specs/strongswan.spec 2004-07-13 16:59:06 UTC (rev 3053) @@ -1,7 +1,7 @@ Summary: A free ipsec VPN solution for Linux Name: strongswan Version: 2.1.3 -Release: 1jh +Release: 2jh License: GPL Group: main URL: http://www.strongswan.org @@ -94,7 +94,7 @@ %post if test ! -e /dev/ipsec ; then - /usr/bin/mknod -m 0200 /dev/ipsec c 36 10 ; + mknod -m 0200 /dev/ipsec c 36 10 ; fi %service_post ipsec @@ -115,6 +115,9 @@ %changelog +* Tue Jul 13 2004 Jaakko Heinonen +- fix mknod in %post + * Wed Jul 7 2004 Jaakko Heinonen - strongswan package based on freeswan spec from tinysofa 1.0 From svn at tinysofa.org Tue Jul 13 17:06:08 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Wed, 14 Jul 2004 03:06:08 +1000 (EST) Subject: [tinysofa-svn] r3054 - in tinysofa/releases/1.1/postgresql/current: sources specs Message-ID: <20040713170608.B92E64E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-14 03:06:08 +1000 (Wed, 14 Jul 2004) New Revision: 3054 Modified: tinysofa/releases/1.1/postgresql/current/sources/postgresql.init tinysofa/releases/1.1/postgresql/current/specs/postgresql.spec Log: - use 1.1 service macros - add try-restart support to init-script Modified: tinysofa/releases/1.1/postgresql/current/sources/postgresql.init =================================================================== --- tinysofa/releases/1.1/postgresql/current/sources/postgresql.init 2004-07-13 16:59:06 UTC (rev 3053) +++ tinysofa/releases/1.1/postgresql/current/sources/postgresql.init 2004-07-13 17:06:08 UTC (rev 3054) @@ -160,14 +160,14 @@ restart) restart ;; - condrestart) + condrestart|try-restart) condrestart ;; reload|force-reload) reload ;; *) - echo $"Usage: $0 {start|stop|status|restart|condrestart|reload|force-reload}" + echo $"Usage: $0 {start|stop|status|restart|try-restart|reload|force-reload}" exit 1 esac Modified: tinysofa/releases/1.1/postgresql/current/specs/postgresql.spec =================================================================== --- tinysofa/releases/1.1/postgresql/current/specs/postgresql.spec 2004-07-13 16:59:06 UTC (rev 3053) +++ tinysofa/releases/1.1/postgresql/current/specs/postgresql.spec 2004-07-13 17:06:08 UTC (rev 3054) @@ -8,7 +8,7 @@ Summary: PostgreSQL client programs and libraries. Name: postgresql Version: 7.4.3 -Release: 2jh +Release: 3jh License: BSD Group: main Source0: ftp://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar.bz2 @@ -346,16 +346,14 @@ chmod 0750 /var/log/postgresql /sbin/ldconfig -/sbin/chkconfig --add postgresql -/sbin/restart_maybe postgresql +%service_post postgresql %preun server -if [ $1 = 0 ] ; then - chkconfig --del postgresql -fi +%service_preun postgresql %postun server /sbin/ldconfig +%service_postun postgresql %post -p /sbin/ldconfig plperl %postun -p /sbin/ldconfig plperl @@ -364,7 +362,7 @@ chown -R postgres.postgres /usr/share/postgresql/test >/dev/null 2>&1 || : %clean -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT +%clean_buildroot %files %defattr(-,root,root) @@ -654,6 +652,10 @@ %changelog +* Tue Jul 13 2004 Jaakko Heinonen +- use 1.1 service macros +- add try-restart support to init-script + * Fri Jun 18 2004 tsintegrate 7.4.3-1ts - current (7.4.3-5ts) integrated as 7.4.3-1ts for release 1.0-U2 From svn at tinysofa.org Tue Jul 13 18:06:59 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Wed, 14 Jul 2004 04:06:59 +1000 (EST) Subject: [tinysofa-svn] r3055 - tinysofa/releases/1.1/glibc/current/specs Message-ID: <20040713180659.3F49D4E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-14 04:06:59 +1000 (Wed, 14 Jul 2004) New Revision: 3055 Modified: tinysofa/releases/1.1/glibc/current/specs/glibc.spec Log: - rename glibc-i18n to glibc-i18n-common due to name conflict Modified: tinysofa/releases/1.1/glibc/current/specs/glibc.spec =================================================================== --- tinysofa/releases/1.1/glibc/current/specs/glibc.spec 2004-07-13 17:06:08 UTC (rev 3054) +++ tinysofa/releases/1.1/glibc/current/specs/glibc.spec 2004-07-13 18:06:59 UTC (rev 3055) @@ -164,7 +164,7 @@ If you are going to use the gprof program to profile a program, you'll need to install the glibc-profile package. -%package i18n +%package i18n-common Summary: Basic locale data for glibc Conflicts: %{name} < %{version} Conflicts: %{name} > %{version} @@ -175,7 +175,7 @@ Requires: glibc-i18n-en_US Group: main -%description i18n +%description i18n-common The glibc-i18n package includes basic national language (locale) support. @@ -896,7 +896,7 @@ --license "%{license}" \ --buildarch "noarch" \ --buildroot "%{buildroot}" \ - --requires "glibc = %{version}, glibc-i18n = %{version}" \ + --requires "glibc = %{version}, glibc-i18n-common = %{version}" \ --define "_topdir %{_topdir}" \ --define "_tmppath %{_tmppath}" \ --obsoletes '$NAME-i18n-`echo $LANGUAGE | sed "s/\(.*\)_.*/\1/"` \< %{version}-%{release}' \ @@ -1120,7 +1120,7 @@ %postun -p /sbin/ldconfig -%post i18n -p /usr/sbin/build-locale-archive +%post i18n-common -p /usr/sbin/build-locale-archive %post devel #info_post @@ -1214,7 +1214,7 @@ %ifnarch %{auxarches} #-f common.filelist common -%files i18n +%files i18n-common %defattr(-,root,root) %attr(0644,root,root) %verify(not md5 size mtime mode) %ghost %config(missingok,noreplace) %{_prefix}/lib/locale/locale-archive %{_bindir}/localedef From svn at tinysofa.org Tue Jul 13 19:31:44 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Wed, 14 Jul 2004 05:31:44 +1000 (EST) Subject: [tinysofa-svn] r3056 - tinysofa/misc/comps/releases Message-ID: <20040713193144.A07F24E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-14 05:31:44 +1000 (Wed, 14 Jul 2004) New Revision: 3056 Added: tinysofa/misc/comps/releases/1.1/ Log: - branch 1.1 comps Copied: tinysofa/misc/comps/releases/1.1 (from rev 3055, tinysofa/misc/comps/releases/1.0) From svn at tinysofa.org Tue Jul 13 19:33:45 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Wed, 14 Jul 2004 05:33:45 +1000 (EST) Subject: [tinysofa-svn] r3057 - tinysofa/misc/comps/releases/1.1 Message-ID: <20040713193345.085FE4E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-14 05:33:44 +1000 (Wed, 14 Jul 2004) New Revision: 3057 Added: tinysofa/misc/comps/releases/1.1/comps Removed: tinysofa/misc/comps/releases/1.1/U1/ Log: - update directory structure Copied: tinysofa/misc/comps/releases/1.1/comps (from rev 3056, tinysofa/misc/comps/releases/1.1/U1/comps) From svn at tinysofa.org Tue Jul 13 19:38:27 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Wed, 14 Jul 2004 05:38:27 +1000 (EST) Subject: [tinysofa-svn] r3058 - tinysofa/misc/comps/releases/1.1 Message-ID: <20040713193827.10E014E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-14 05:38:26 +1000 (Wed, 14 Jul 2004) New Revision: 3058 Modified: tinysofa/misc/comps/releases/1.1/comps Log: - update comps for 1.1 Modified: tinysofa/misc/comps/releases/1.1/comps =================================================================== --- tinysofa/misc/comps/releases/1.1/comps 2004-07-13 19:33:44 UTC (rev 3057) +++ tinysofa/misc/comps/releases/1.1/comps 2004-07-13 19:38:26 UTC (rev 3058) @@ -10,7 +10,6 @@ authconfig ash bash - bash-static bzip2 bzip2-libs chkconfig @@ -32,12 +31,14 @@ findutils file gawk - gcc-c++-runtime - gcc-runtime + libstdc++ + libgcc gettext glib glibc - glibc-locales + glibc-i18n-common + glibc-i18n-en_US + tzdata gmp gnupg grep @@ -80,7 +81,8 @@ psacct psmisc pump - pwdb + libuser + openldap-libs python mdadm readline @@ -100,15 +102,12 @@ shadow-utils slang sysklogd - sysklogd-conf sysvinit - swup - swup-libs - swupconf + apt + libapt tar termcap tmpwatch - tinysofa-gpgkeys-emily tinysofa-utils util-linux vim @@ -149,6 +148,8 @@ tcsh vim-syntax vim-tools + zip + unzip } 0 Commonly used network utilities { @@ -157,7 +158,7 @@ finger gdbm jwhois - lynx + links mailx mutt nc @@ -206,33 +207,25 @@ procmail } -0 Web proxy server{ +0 Web proxy server { gdbm perl squid openldap-libs } -0 FTP server (Vsftpd) { +0 Vsftpd FTP server { anonftp libcap vsftpd } -0 FTP server (Proftpd) { - anonftp - gdbm - perl - proftpd -} - 0 Firewall { - freeswan + strongswan gdbm iptables libsmbpw - kernel-firewall perl ppp libpcap @@ -260,7 +253,8 @@ quota samba samba-common - glibc-locales + glibc-i18n-common + glibc-i18n-en_US xinetd ypbind-mt yp-tools @@ -279,6 +273,7 @@ mysql-libs mysql-client perl + perl-dbi } 0 PostgreSQL database server { @@ -339,11 +334,13 @@ dev86 flex gcc - gcc-c++-devel + gcc-c++ + libstdc++-devel gdb gdbm glib-devel glibc-devel + glibc-headers libtool linux-headers m4 @@ -353,6 +350,7 @@ perl pkgconfig rpm-build + tinysofa-rpm-config strace } From svn at tinysofa.org Wed Jul 14 11:57:39 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Wed, 14 Jul 2004 21:57:39 +1000 (EST) Subject: [tinysofa-svn] r3059 - in tinysofa/releases/1.0/mod_php4: current/sources current/specs releases releases/4.3.8 releases/4.3.8/1ts/sources releases/4.3.8/1ts/specs Message-ID: <20040714115739.4DDA04E80E6@minbar.tinysofa.org> Author: omar Date: 2004-07-14 21:57:39 +1000 (Wed, 14 Jul 2004) New Revision: 3059 Added: tinysofa/releases/1.0/mod_php4/current/sources/php-4.3.8.tar.bz2 tinysofa/releases/1.0/mod_php4/releases/4.3.8/ tinysofa/releases/1.0/mod_php4/releases/4.3.8/1ts/ tinysofa/releases/1.0/mod_php4/releases/4.3.8/1ts/sources/php-4.3.8.tar.bz2 Removed: tinysofa/releases/1.0/mod_php4/current/sources/php-4.3.7.tar.bz2 tinysofa/releases/1.0/mod_php4/releases/4.3.8/1ts/sources/php-4.3.7.tar.bz2 Modified: tinysofa/releases/1.0/mod_php4/current/specs/mod_php4.spec tinysofa/releases/1.0/mod_php4/releases/4.3.8/1ts/specs/mod_php4.spec Log: mod_php4: * integrate current (4.3.8-2ts) as releases/4.3.8/1ts Deleted: tinysofa/releases/1.0/mod_php4/current/sources/php-4.3.7.tar.bz2 =================================================================== (Binary files differ) Added: tinysofa/releases/1.0/mod_php4/current/sources/php-4.3.8.tar.bz2 =================================================================== (Binary files differ) Property changes on: tinysofa/releases/1.0/mod_php4/current/sources/php-4.3.8.tar.bz2 ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: tinysofa/releases/1.0/mod_php4/current/specs/mod_php4.spec =================================================================== --- tinysofa/releases/1.0/mod_php4/current/specs/mod_php4.spec 2004-07-13 19:38:26 UTC (rev 3058) +++ tinysofa/releases/1.0/mod_php4/current/specs/mod_php4.spec 2004-07-14 11:57:39 UTC (rev 3059) @@ -6,8 +6,8 @@ Summary: The PHP4 HTML-embedded scripting language for use with Apache. Name: mod_php4 -Version: 4.3.7 -Release: 2ts +Version: 4.3.8 +Release: 1ts Group: tinysofa official Source0: http://www.php.net/distributions/php-%{version}.tar.bz2 Source1: php.ini @@ -334,6 +334,9 @@ /usr/share/php4/sysvshm.so %changelog +* Wed Jul 14 2004 tsintegrate 4.3.8-1ts +- current (4.3.8-2ts) integrated as 4.3.8-1ts for release 1.0-U3 + * Thu Jun 24 2004 tsintegrate 4.3.7-2ts - current (4.3.7-1ts) integrated as 4.3.7-2ts for release 1.0-U2 Copied: tinysofa/releases/1.0/mod_php4/releases/4.3.8/1ts (from rev 3058, tinysofa/releases/1.0/mod_php4/current) Deleted: tinysofa/releases/1.0/mod_php4/releases/4.3.8/1ts/sources/php-4.3.7.tar.bz2 =================================================================== (Binary files differ) Added: tinysofa/releases/1.0/mod_php4/releases/4.3.8/1ts/sources/php-4.3.8.tar.bz2 =================================================================== (Binary files differ) Property changes on: tinysofa/releases/1.0/mod_php4/releases/4.3.8/1ts/sources/php-4.3.8.tar.bz2 ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: tinysofa/releases/1.0/mod_php4/releases/4.3.8/1ts/specs/mod_php4.spec =================================================================== --- tinysofa/releases/1.0/mod_php4/current/specs/mod_php4.spec 2004-07-13 19:38:26 UTC (rev 3058) +++ tinysofa/releases/1.0/mod_php4/releases/4.3.8/1ts/specs/mod_php4.spec 2004-07-14 11:57:39 UTC (rev 3059) @@ -6,8 +6,8 @@ Summary: The PHP4 HTML-embedded scripting language for use with Apache. Name: mod_php4 -Version: 4.3.7 -Release: 2ts +Version: 4.3.8 +Release: 1ts Group: tinysofa official Source0: http://www.php.net/distributions/php-%{version}.tar.bz2 Source1: php.ini @@ -334,6 +334,9 @@ /usr/share/php4/sysvshm.so %changelog +* Wed Jul 14 2004 tsintegrate 4.3.8-1ts +- current (4.3.8-2ts) integrated as 4.3.8-1ts for release 1.0-U3 + * Thu Jun 24 2004 tsintegrate 4.3.7-2ts - current (4.3.7-1ts) integrated as 4.3.7-2ts for release 1.0-U2 From svn at tinysofa.org Wed Jul 14 11:57:41 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Wed, 14 Jul 2004 21:57:41 +1000 (EST) Subject: [tinysofa-svn] r3060 - tinysofa/releases/1.0/mod_php4 Message-ID: <20040714115741.71D7C4E80E6@minbar.tinysofa.org> Author: omar Date: 2004-07-14 21:57:41 +1000 (Wed, 14 Jul 2004) New Revision: 3060 Removed: tinysofa/releases/1.0/mod_php4/pristine/ Log: mod_php4: * removing pristine (4.3.7-2ts) From svn at tinysofa.org Wed Jul 14 11:57:42 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Wed, 14 Jul 2004 21:57:42 +1000 (EST) Subject: [tinysofa-svn] r3061 - tinysofa/releases/1.0/mod_php4 Message-ID: <20040714115742.E61364E80ED@minbar.tinysofa.org> Author: omar Date: 2004-07-14 21:57:42 +1000 (Wed, 14 Jul 2004) New Revision: 3061 Added: tinysofa/releases/1.0/mod_php4/pristine/ Log: mod_php4: * retarget pristine (4.3.7-2ts) to releases/4.3.8/1ts Copied: tinysofa/releases/1.0/mod_php4/pristine (from rev 3059, tinysofa/releases/1.0/mod_php4/releases/4.3.8/1ts) From svn at tinysofa.org Wed Jul 14 12:00:10 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Wed, 14 Jul 2004 22:00:10 +1000 (EST) Subject: [tinysofa-svn] r3062 - in tinysofa/releases/1.0/mod_php4: current/specs pristine/specs releases/4.3.8/1ts/specs Message-ID: <20040714120010.3D6404E80E6@minbar.tinysofa.org> Author: omar Date: 2004-07-14 22:00:09 +1000 (Wed, 14 Jul 2004) New Revision: 3062 Modified: tinysofa/releases/1.0/mod_php4/current/specs/mod_php4.spec tinysofa/releases/1.0/mod_php4/pristine/specs/mod_php4.spec tinysofa/releases/1.0/mod_php4/releases/4.3.8/1ts/specs/mod_php4.spec Log: - --enable-calender, since 4.3.8 must be released. Modified: tinysofa/releases/1.0/mod_php4/current/specs/mod_php4.spec =================================================================== --- tinysofa/releases/1.0/mod_php4/current/specs/mod_php4.spec 2004-07-14 11:57:42 UTC (rev 3061) +++ tinysofa/releases/1.0/mod_php4/current/specs/mod_php4.spec 2004-07-14 12:00:09 UTC (rev 3062) @@ -180,6 +180,7 @@ --enable-track-vars \ --enable-memory-limit \ --enable-ftp \ + --enable-calendar \ --enable-exif=shared,/usr \ --enable-sysvshm=shared,/usr \ --enable-sysvsem=shared,/usr \ Modified: tinysofa/releases/1.0/mod_php4/pristine/specs/mod_php4.spec =================================================================== --- tinysofa/releases/1.0/mod_php4/pristine/specs/mod_php4.spec 2004-07-14 11:57:42 UTC (rev 3061) +++ tinysofa/releases/1.0/mod_php4/pristine/specs/mod_php4.spec 2004-07-14 12:00:09 UTC (rev 3062) @@ -180,6 +180,7 @@ --enable-track-vars \ --enable-memory-limit \ --enable-ftp \ + --enable-calendar \ --enable-exif=shared,/usr \ --enable-sysvshm=shared,/usr \ --enable-sysvsem=shared,/usr \ Modified: tinysofa/releases/1.0/mod_php4/releases/4.3.8/1ts/specs/mod_php4.spec =================================================================== --- tinysofa/releases/1.0/mod_php4/releases/4.3.8/1ts/specs/mod_php4.spec 2004-07-14 11:57:42 UTC (rev 3061) +++ tinysofa/releases/1.0/mod_php4/releases/4.3.8/1ts/specs/mod_php4.spec 2004-07-14 12:00:09 UTC (rev 3062) @@ -180,6 +180,7 @@ --enable-track-vars \ --enable-memory-limit \ --enable-ftp \ + --enable-calendar \ --enable-exif=shared,/usr \ --enable-sysvshm=shared,/usr \ --enable-sysvsem=shared,/usr \ From svn at tinysofa.org Wed Jul 14 16:30:24 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Thu, 15 Jul 2004 02:30:24 +1000 (EST) Subject: [tinysofa-svn] r3063 - in tinysofa/releases/1.1/dovecot/current: sources specs Message-ID: <20040714163024.47BE04E80E6@minbar.tinysofa.org> Author: jh Date: 2004-07-15 02:30:23 +1000 (Thu, 15 Jul 2004) New Revision: 3063 Added: tinysofa/releases/1.1/dovecot/current/sources/dovecot-0.99.10.7.tar.gz Removed: tinysofa/releases/1.1/dovecot/current/sources/dovecot-0.99.10.5.tar.gz Modified: tinysofa/releases/1.1/dovecot/current/sources/dovecot-conf.patch tinysofa/releases/1.1/dovecot/current/specs/dovecot.spec Log: - new dovecot upstream Deleted: tinysofa/releases/1.1/dovecot/current/sources/dovecot-0.99.10.5.tar.gz =================================================================== (Binary files differ) Added: tinysofa/releases/1.1/dovecot/current/sources/dovecot-0.99.10.7.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/releases/1.1/dovecot/current/sources/dovecot-0.99.10.7.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: tinysofa/releases/1.1/dovecot/current/sources/dovecot-conf.patch =================================================================== --- tinysofa/releases/1.1/dovecot/current/sources/dovecot-conf.patch 2004-07-14 12:00:09 UTC (rev 3062) +++ tinysofa/releases/1.1/dovecot/current/sources/dovecot-conf.patch 2004-07-14 16:30:23 UTC (rev 3063) @@ -1,5 +1,5 @@ ---- dovecot-0.99.10.5/dovecot-example.conf.config 2003-12-20 06:14:19.000000000 +0200 -+++ dovecot-0.99.10.5/dovecot-example.conf 2004-06-15 20:51:10.000000000 +0300 +--- dovecot-0.99.10.7/dovecot-example.conf.config 2004-07-13 13:56:55.000000000 +0300 ++++ dovecot-0.99.10.7/dovecot-example.conf 2004-07-14 19:26:26.000000000 +0300 @@ -4,7 +4,7 @@ # any of the lines. Exception to this are paths, they're just examples # with real defaults being based on configure options. The paths listed here @@ -20,25 +20,25 @@ # SSL parameter file. Master process generates this file for login processes. # It contains Diffie Hellman and RSA parameters. -@@ -67,7 +67,7 @@ - # Directory where authentication process places authentication UNIX sockets +@@ -68,7 +68,7 @@ # which login needs to be able to connect to. The sockets are created when - # running as root, so you don't have to worry about permissions. + # running as root, so you don't have to worry about permissions. Note that + # everything in this directory is deleted when Dovecot is started. -#login_dir = /var/run/dovecot/login -+login_dir = /var/run/dovecot-login ++login_dir = /var/run/dovecot/login # chroot login process to the login_dir. Only reason not to do this is if you # wish to run the whole Dovecot without roots. -@@ -187,7 +187,7 @@ - # mbox:~/mail/:INBOX=/var/mail/%u - # mbox:/var/mail/%d/%n/:INDEX=/var/indexes/%d/%n +@@ -192,7 +192,7 @@ + # default_mail_env = mbox:~/mail/:INBOX=/var/mail/%u + # default_mail_env = mbox:/var/mail/%d/%n/:INDEX=/var/indexes/%d/%n # -#default_mail_env = +default_mail_env = maildir:/home/users/%u/Maildir # Space-separated list of fields to cache for all mails. Currently these # fields are allowed followed by a list of commands they speed up: -@@ -288,7 +288,7 @@ +@@ -303,7 +303,7 @@ # with is important to avoid deadlocks if other MTAs/MUAs are using both fcntl # and flock. Some operating systems don't allow using both of them # simultaneously, eg. BSDs. If dotlock is used, it's always created first. @@ -47,7 +47,7 @@ # Should we create dotlock file even when we want only a read-lock? Setting # this to yes hurts the performance when the mailbox is accessed simultaneously -@@ -381,6 +381,7 @@ +@@ -397,6 +397,7 @@ # ldap : LDAP, see doc/dovecot-ldap.conf # pgsql : a PostgreSQL database, see doc/dovecot-pgsql.conf auth_userdb = passwd @@ -55,7 +55,7 @@ # Where password database is kept: # passwd: /etc/passwd or similiar, using getpwnam() -@@ -390,7 +391,8 @@ +@@ -406,7 +407,8 @@ # vpopmail: vpopmail authentication # ldap : LDAP, see doc/dovecot-ldap.conf # pgsql : a PostgreSQL database, see doc/dovecot-pgsql.conf Modified: tinysofa/releases/1.1/dovecot/current/specs/dovecot.spec =================================================================== --- tinysofa/releases/1.1/dovecot/current/specs/dovecot.spec 2004-07-14 12:00:09 UTC (rev 3062) +++ tinysofa/releases/1.1/dovecot/current/specs/dovecot.spec 2004-07-14 16:30:23 UTC (rev 3063) @@ -1,6 +1,6 @@ Summary: Dovecot Secure imap server Name: dovecot -Version: 0.99.10.5 +Version: 0.99.10.7 Release: 1jh License: GPL Group: extra @@ -124,6 +124,9 @@ %changelog +* Wed Jul 14 2004 Jaakko Heinonen 0.99.10.7-1jh +- new upstream + * Tue Jun 15 2004 Jaakko Heinonen 0.99.10.5-1jh - port to tinysofa From svn at tinysofa.org Thu Jul 15 03:25:05 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Thu, 15 Jul 2004 13:25:05 +1000 (EST) Subject: [tinysofa-svn] r3065 - tinysofa/releases/1.0/kernel Message-ID: <20040715032505.B1F154E851C@minbar.tinysofa.org> Author: omar Date: 2004-07-15 13:25:05 +1000 (Thu, 15 Jul 2004) New Revision: 3065 Removed: tinysofa/releases/1.0/kernel/pristine/ Log: kernel: * removing pristine (2.4.26-7ts) From svn at tinysofa.org Thu Jul 15 03:25:10 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Thu, 15 Jul 2004 13:25:10 +1000 (EST) Subject: [tinysofa-svn] r3066 - tinysofa/releases/1.0/kernel Message-ID: <20040715032510.5A3354E851C@minbar.tinysofa.org> Author: omar Date: 2004-07-15 13:25:10 +1000 (Thu, 15 Jul 2004) New Revision: 3066 Added: tinysofa/releases/1.0/kernel/pristine/ Log: kernel: * retarget pristine (2.4.26-7ts) to releases/2.4.26/8ts Copied: tinysofa/releases/1.0/kernel/pristine (from rev 3064, tinysofa/releases/1.0/kernel/releases/2.4.26/8ts) From svn at tinysofa.org Thu Jul 15 03:30:42 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Thu, 15 Jul 2004 13:30:42 +1000 (EST) Subject: [tinysofa-svn] r3075 - tinysofa/releases/1.0/rpm Message-ID: <20040715033042.4A7504E851B@minbar.tinysofa.org> Author: omar Date: 2004-07-15 13:30:42 +1000 (Thu, 15 Jul 2004) New Revision: 3075 Added: tinysofa/releases/1.0/rpm/pristine/ Log: rpm: * retarget pristine (4.2.2-5ts) to releases/4.2.2/6ts Copied: tinysofa/releases/1.0/rpm/pristine (from rev 3073, tinysofa/releases/1.0/rpm/releases/4.2.2/6ts) From svn at tinysofa.org Thu Jul 15 03:30:14 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Thu, 15 Jul 2004 13:30:14 +1000 (EST) Subject: [tinysofa-svn] r3070 - in tinysofa/releases/1.0/initscripts: current/specs releases/7.31.9 releases/7.31.9/7ts/specs Message-ID: <20040715033014.E97194E851B@minbar.tinysofa.org> Author: omar Date: 2004-07-15 13:30:14 +1000 (Thu, 15 Jul 2004) New Revision: 3070 Added: tinysofa/releases/1.0/initscripts/releases/7.31.9/7ts/ Modified: tinysofa/releases/1.0/initscripts/current/specs/initscripts.spec tinysofa/releases/1.0/initscripts/releases/7.31.9/7ts/specs/initscripts.spec Log: initscripts: * integrate current (7.31.9-6ts) as releases/7.31.9/7ts Modified: tinysofa/releases/1.0/initscripts/current/specs/initscripts.spec =================================================================== --- tinysofa/releases/1.0/initscripts/current/specs/initscripts.spec 2004-07-15 03:30:04 UTC (rev 3069) +++ tinysofa/releases/1.0/initscripts/current/specs/initscripts.spec 2004-07-15 03:30:14 UTC (rev 3070) @@ -3,7 +3,7 @@ Version: 7.31.9 License: GPL Group: tinysofa official -Release: 6ts +Release: 7ts Source: initscripts-%{version}.tar.bz2 URL: http://rhlinux.redhat.com/initscripts/ Patch0: initscripts-s390.patch @@ -194,6 +194,9 @@ %exclude /etc/sysconfig/network-scripts/ifdown-ippp %changelog +* Thu Jul 15 2004 tsintegrate 7.31.9-7ts +- current (7.31.9-6ts) integrated as 7.31.9-7ts for release 1.0-U3 + * Thu Jul 15 2004 tsintegrate 7.31.9-6ts - current (7.31.9-5ts) integrated as 7.31.9-6ts for release 1.0-U3 Copied: tinysofa/releases/1.0/initscripts/releases/7.31.9/7ts (from rev 3069, tinysofa/releases/1.0/initscripts/current) Modified: tinysofa/releases/1.0/initscripts/releases/7.31.9/7ts/specs/initscripts.spec =================================================================== --- tinysofa/releases/1.0/initscripts/current/specs/initscripts.spec 2004-07-15 03:30:04 UTC (rev 3069) +++ tinysofa/releases/1.0/initscripts/releases/7.31.9/7ts/specs/initscripts.spec 2004-07-15 03:30:14 UTC (rev 3070) @@ -3,7 +3,7 @@ Version: 7.31.9 License: GPL Group: tinysofa official -Release: 6ts +Release: 7ts Source: initscripts-%{version}.tar.bz2 URL: http://rhlinux.redhat.com/initscripts/ Patch0: initscripts-s390.patch @@ -194,6 +194,9 @@ %exclude /etc/sysconfig/network-scripts/ifdown-ippp %changelog +* Thu Jul 15 2004 tsintegrate 7.31.9-7ts +- current (7.31.9-6ts) integrated as 7.31.9-7ts for release 1.0-U3 + * Thu Jul 15 2004 tsintegrate 7.31.9-6ts - current (7.31.9-5ts) integrated as 7.31.9-6ts for release 1.0-U3 From svn at tinysofa.org Thu Jul 15 03:30:17 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Thu, 15 Jul 2004 13:30:17 +1000 (EST) Subject: [tinysofa-svn] r3072 - tinysofa/releases/1.0/initscripts Message-ID: <20040715033017.904124E851B@minbar.tinysofa.org> Author: omar Date: 2004-07-15 13:30:17 +1000 (Thu, 15 Jul 2004) New Revision: 3072 Added: tinysofa/releases/1.0/initscripts/pristine/ Log: initscripts: * retarget pristine (7.31.9-6ts) to releases/7.31.9/7ts Copied: tinysofa/releases/1.0/initscripts/pristine (from rev 3070, tinysofa/releases/1.0/initscripts/releases/7.31.9/7ts) From svn at tinysofa.org Thu Jul 15 03:30:38 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Thu, 15 Jul 2004 13:30:38 +1000 (EST) Subject: [tinysofa-svn] r3073 - in tinysofa/releases/1.0/rpm: current/specs releases/4.2.2 releases/4.2.2/6ts/specs Message-ID: <20040715033038.AAD1A4E851B@minbar.tinysofa.org> Author: omar Date: 2004-07-15 13:30:38 +1000 (Thu, 15 Jul 2004) New Revision: 3073 Added: tinysofa/releases/1.0/rpm/releases/4.2.2/6ts/ Modified: tinysofa/releases/1.0/rpm/current/specs/rpm.spec tinysofa/releases/1.0/rpm/releases/4.2.2/6ts/specs/rpm.spec Log: rpm: * integrate current (4.2.2-6jh) as releases/4.2.2/6ts Modified: tinysofa/releases/1.0/rpm/current/specs/rpm.spec =================================================================== --- tinysofa/releases/1.0/rpm/current/specs/rpm.spec 2004-07-15 03:30:17 UTC (rev 3072) +++ tinysofa/releases/1.0/rpm/current/specs/rpm.spec 2004-07-15 03:30:38 UTC (rev 3073) @@ -20,7 +20,7 @@ %define version 4.2.2 Version: %{version} %{expand: %%define rpm_version %{version}} -Release: 6jh +Release: 6ts Group: tinysofa official Source: ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.0.x/rpm-%{rpm_version}.tar.gz Source2: rpm-4.2.2-tinysofa-macros @@ -497,6 +497,9 @@ %{__includedir}/popt.h %changelog +* Thu Jul 15 2004 tsintegrate 4.2.2-6ts +- current (4.2.2-6jh) integrated as 4.2.2-6ts for release 1.0-U3 + * Sat Jul 10 2004 Jaakko Heinonen 4.2.2-6jh - added BuildRequires: bzip2-devel to make rpm support bzip2 compression Copied: tinysofa/releases/1.0/rpm/releases/4.2.2/6ts (from rev 3072, tinysofa/releases/1.0/rpm/current) Modified: tinysofa/releases/1.0/rpm/releases/4.2.2/6ts/specs/rpm.spec =================================================================== --- tinysofa/releases/1.0/rpm/current/specs/rpm.spec 2004-07-15 03:30:17 UTC (rev 3072) +++ tinysofa/releases/1.0/rpm/releases/4.2.2/6ts/specs/rpm.spec 2004-07-15 03:30:38 UTC (rev 3073) @@ -20,7 +20,7 @@ %define version 4.2.2 Version: %{version} %{expand: %%define rpm_version %{version}} -Release: 6jh +Release: 6ts Group: tinysofa official Source: ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.0.x/rpm-%{rpm_version}.tar.gz Source2: rpm-4.2.2-tinysofa-macros @@ -497,6 +497,9 @@ %{__includedir}/popt.h %changelog +* Thu Jul 15 2004 tsintegrate 4.2.2-6ts +- current (4.2.2-6jh) integrated as 4.2.2-6ts for release 1.0-U3 + * Sat Jul 10 2004 Jaakko Heinonen 4.2.2-6jh - added BuildRequires: bzip2-devel to make rpm support bzip2 compression From svn at tinysofa.org Thu Jul 15 03:30:39 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Thu, 15 Jul 2004 13:30:39 +1000 (EST) Subject: [tinysofa-svn] r3074 - tinysofa/releases/1.0/rpm Message-ID: <20040715033039.89B4E4E851C@minbar.tinysofa.org> Author: omar Date: 2004-07-15 13:30:39 +1000 (Thu, 15 Jul 2004) New Revision: 3074 Removed: tinysofa/releases/1.0/rpm/pristine/ Log: rpm: * removing pristine (4.2.2-5ts) From svn at tinysofa.org Thu Jul 15 03:27:30 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Thu, 15 Jul 2004 13:27:30 +1000 (EST) Subject: [tinysofa-svn] r3067 - tinysofa/releases/1.0/initscripts/current/sources Message-ID: <20040715032730.DF6B74E851B@minbar.tinysofa.org> Author: omar Date: 2004-07-15 13:27:30 +1000 (Thu, 15 Jul 2004) New Revision: 3067 Modified: tinysofa/releases/1.0/initscripts/current/sources/initscripts-7.31.9-tinysofa.patch Log: - Proper LVM / RAID fix. Modified: tinysofa/releases/1.0/initscripts/current/sources/initscripts-7.31.9-tinysofa.patch =================================================================== --- tinysofa/releases/1.0/initscripts/current/sources/initscripts-7.31.9-tinysofa.patch 2004-07-15 03:25:10 UTC (rev 3066) +++ tinysofa/releases/1.0/initscripts/current/sources/initscripts-7.31.9-tinysofa.patch 2004-07-15 03:27:30 UTC (rev 3067) @@ -366,7 +366,7 @@ + RAIDDEV="`basename $i`" + RAIDSTAT=`grep "^$RAIDDEV : active" /proc/mdstat` + if [ -z "$RAIDSTAT" ]; then -+ if ! grep -q "^$i.*noauto" /etc/fstab; then ++ if grep -q "^$i.*noauto" /etc/fstab; then + STRING="$STRING $RAIDDEV(skipped)" + echo -n "$RAIDDEV(skipped) " + else From svn at tinysofa.org Thu Jul 15 03:28:38 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Thu, 15 Jul 2004 13:28:38 +1000 (EST) Subject: [tinysofa-svn] r3068 - in tinysofa/releases/1.0/initscripts: . current/specs releases/7.31.9 releases/7.31.9/5ts releases/7.31.9/5ts/specs releases/7.31.9/6ts/specs Message-ID: <20040715032838.41DCF4E851B@minbar.tinysofa.org> Author: omar Date: 2004-07-15 13:28:38 +1000 (Thu, 15 Jul 2004) New Revision: 3068 Added: tinysofa/releases/1.0/initscripts/releases/7.31.9/5ts/ tinysofa/releases/1.0/initscripts/releases/7.31.9/5ts/sources/ tinysofa/releases/1.0/initscripts/releases/7.31.9/6ts/ Removed: tinysofa/releases/1.0/initscripts/pristine/ tinysofa/releases/1.0/initscripts/releases/7.31.9/5ts/sources/ Modified: tinysofa/releases/1.0/initscripts/current/specs/initscripts.spec tinysofa/releases/1.0/initscripts/releases/7.31.9/5ts/specs/initscripts.spec tinysofa/releases/1.0/initscripts/releases/7.31.9/6ts/specs/initscripts.spec Log: initscripts: * integrate current (7.31.9-5ts) as releases/7.31.9/6ts Modified: tinysofa/releases/1.0/initscripts/current/specs/initscripts.spec =================================================================== --- tinysofa/releases/1.0/initscripts/current/specs/initscripts.spec 2004-07-15 03:27:30 UTC (rev 3067) +++ tinysofa/releases/1.0/initscripts/current/specs/initscripts.spec 2004-07-15 03:28:38 UTC (rev 3068) @@ -3,7 +3,7 @@ Version: 7.31.9 License: GPL Group: tinysofa official -Release: 4ts +Release: 6ts Source: initscripts-%{version}.tar.bz2 URL: http://rhlinux.redhat.com/initscripts/ Patch0: initscripts-s390.patch @@ -194,6 +194,12 @@ %exclude /etc/sysconfig/network-scripts/ifdown-ippp %changelog +* Thu Jul 15 2004 tsintegrate 7.31.9-6ts +- current (7.31.9-5ts) integrated as 7.31.9-6ts for release 1.0-U3 + +* Thu Jul 15 2004 tsintegrate 7.31.9-5ts +- current (7.31.9-4ts) integrated as 7.31.9-5ts for release 1.0-U3 + * Thu Jun 24 2004 tsintegrate 7.31.9-4ts - current (7.31.9-3ts) integrated as 7.31.9-4ts for release 1.0-U2 Copied: tinysofa/releases/1.0/initscripts/releases/7.31.9/5ts (from rev 3058, tinysofa/releases/1.0/initscripts/current) Copied: tinysofa/releases/1.0/initscripts/releases/7.31.9/5ts/sources (from rev 3067, tinysofa/releases/1.0/initscripts/current/sources) Modified: tinysofa/releases/1.0/initscripts/releases/7.31.9/5ts/specs/initscripts.spec =================================================================== --- tinysofa/releases/1.0/initscripts/current/specs/initscripts.spec 2004-07-13 19:38:26 UTC (rev 3058) +++ tinysofa/releases/1.0/initscripts/releases/7.31.9/5ts/specs/initscripts.spec 2004-07-15 03:28:38 UTC (rev 3068) @@ -3,7 +3,7 @@ Version: 7.31.9 License: GPL Group: tinysofa official -Release: 4ts +Release: 5ts Source: initscripts-%{version}.tar.bz2 URL: http://rhlinux.redhat.com/initscripts/ Patch0: initscripts-s390.patch @@ -194,6 +194,9 @@ %exclude /etc/sysconfig/network-scripts/ifdown-ippp %changelog +* Thu Jul 15 2004 tsintegrate 7.31.9-5ts +- current (7.31.9-4ts) integrated as 7.31.9-5ts for release 1.0-U3 + * Thu Jun 24 2004 tsintegrate 7.31.9-4ts - current (7.31.9-3ts) integrated as 7.31.9-4ts for release 1.0-U2 Copied: tinysofa/releases/1.0/initscripts/releases/7.31.9/6ts (from rev 3067, tinysofa/releases/1.0/initscripts/current) Modified: tinysofa/releases/1.0/initscripts/releases/7.31.9/6ts/specs/initscripts.spec =================================================================== --- tinysofa/releases/1.0/initscripts/current/specs/initscripts.spec 2004-07-15 03:27:30 UTC (rev 3067) +++ tinysofa/releases/1.0/initscripts/releases/7.31.9/6ts/specs/initscripts.spec 2004-07-15 03:28:38 UTC (rev 3068) @@ -3,7 +3,7 @@ Version: 7.31.9 License: GPL Group: tinysofa official -Release: 4ts +Release: 6ts Source: initscripts-%{version}.tar.bz2 URL: http://rhlinux.redhat.com/initscripts/ Patch0: initscripts-s390.patch @@ -194,6 +194,12 @@ %exclude /etc/sysconfig/network-scripts/ifdown-ippp %changelog +* Thu Jul 15 2004 tsintegrate 7.31.9-6ts +- current (7.31.9-5ts) integrated as 7.31.9-6ts for release 1.0-U3 + +* Thu Jul 15 2004 tsintegrate 7.31.9-5ts +- current (7.31.9-4ts) integrated as 7.31.9-5ts for release 1.0-U3 + * Thu Jun 24 2004 tsintegrate 7.31.9-4ts - current (7.31.9-3ts) integrated as 7.31.9-4ts for release 1.0-U2 From svn at tinysofa.org Thu Jul 15 03:30:04 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Thu, 15 Jul 2004 13:30:04 +1000 (EST) Subject: [tinysofa-svn] r3069 - tinysofa/releases/1.0/initscripts Message-ID: <20040715033004.619694E851B@minbar.tinysofa.org> Author: omar Date: 2004-07-15 13:30:04 +1000 (Thu, 15 Jul 2004) New Revision: 3069 Added: tinysofa/releases/1.0/initscripts/pristine/ Log: - Fix. Copied: tinysofa/releases/1.0/initscripts/pristine (from rev 3068, tinysofa/releases/1.0/initscripts/current) From svn at tinysofa.org Thu Jul 15 03:30:16 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Thu, 15 Jul 2004 13:30:16 +1000 (EST) Subject: [tinysofa-svn] r3071 - tinysofa/releases/1.0/initscripts Message-ID: <20040715033016.6F7084E851C@minbar.tinysofa.org> Author: omar Date: 2004-07-15 13:30:16 +1000 (Thu, 15 Jul 2004) New Revision: 3071 Removed: tinysofa/releases/1.0/initscripts/pristine/ Log: initscripts: * removing pristine (7.31.9-6ts) From svn at tinysofa.org Thu Jul 15 03:30:59 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Thu, 15 Jul 2004 13:30:59 +1000 (EST) Subject: [tinysofa-svn] r3076 - in tinysofa/releases/1.0/rp-pppoe: current/specs releases/3.5 releases/3.5/14ts/specs Message-ID: <20040715033059.9788D4E851B@minbar.tinysofa.org> Author: omar Date: 2004-07-15 13:30:59 +1000 (Thu, 15 Jul 2004) New Revision: 3076 Added: tinysofa/releases/1.0/rp-pppoe/releases/3.5/14ts/ Modified: tinysofa/releases/1.0/rp-pppoe/current/specs/rp-pppoe.spec tinysofa/releases/1.0/rp-pppoe/releases/3.5/14ts/specs/rp-pppoe.spec Log: rp-pppoe: * integrate current (3.5-14gd) as releases/3.5/14ts Modified: tinysofa/releases/1.0/rp-pppoe/current/specs/rp-pppoe.spec =================================================================== --- tinysofa/releases/1.0/rp-pppoe/current/specs/rp-pppoe.spec 2004-07-15 03:30:42 UTC (rev 3075) +++ tinysofa/releases/1.0/rp-pppoe/current/specs/rp-pppoe.spec 2004-07-15 03:30:59 UTC (rev 3076) @@ -1,7 +1,7 @@ Summary: PPP Over Ethernet (xDSL support) Name: rp-pppoe Version: 3.5 -Release: 14gd +Release: 14ts License: GPL Group: tinysofa official Source: http://www.roaringpenguin.com/pppoe/%{name}-%{version}.tar.gz @@ -84,6 +84,9 @@ /etc/init.d/adsl %changelog +* Thu Jul 15 2004 tsintegrate 3.5-14ts +- current (3.5-14gd) integrated as 3.5-14ts for release 1.0-U3 + * Sat Jun 26 2004 Gerald Dachs 3.5-14gd - if ppp is not installed during build time, then the adsl scripts gets broken. Fixed build requirements accordingly. Copied: tinysofa/releases/1.0/rp-pppoe/releases/3.5/14ts (from rev 3075, tinysofa/releases/1.0/rp-pppoe/current) Modified: tinysofa/releases/1.0/rp-pppoe/releases/3.5/14ts/specs/rp-pppoe.spec =================================================================== --- tinysofa/releases/1.0/rp-pppoe/current/specs/rp-pppoe.spec 2004-07-15 03:30:42 UTC (rev 3075) +++ tinysofa/releases/1.0/rp-pppoe/releases/3.5/14ts/specs/rp-pppoe.spec 2004-07-15 03:30:59 UTC (rev 3076) @@ -1,7 +1,7 @@ Summary: PPP Over Ethernet (xDSL support) Name: rp-pppoe Version: 3.5 -Release: 14gd +Release: 14ts License: GPL Group: tinysofa official Source: http://www.roaringpenguin.com/pppoe/%{name}-%{version}.tar.gz @@ -84,6 +84,9 @@ /etc/init.d/adsl %changelog +* Thu Jul 15 2004 tsintegrate 3.5-14ts +- current (3.5-14gd) integrated as 3.5-14ts for release 1.0-U3 + * Sat Jun 26 2004 Gerald Dachs 3.5-14gd - if ppp is not installed during build time, then the adsl scripts gets broken. Fixed build requirements accordingly. From svn at tinysofa.org Thu Jul 15 03:31:02 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Thu, 15 Jul 2004 13:31:02 +1000 (EST) Subject: [tinysofa-svn] r3078 - tinysofa/releases/1.0/rp-pppoe Message-ID: <20040715033102.CB9A14E851D@minbar.tinysofa.org> Author: omar Date: 2004-07-15 13:31:02 +1000 (Thu, 15 Jul 2004) New Revision: 3078 Added: tinysofa/releases/1.0/rp-pppoe/pristine/ Log: rp-pppoe: * retarget pristine (3.5-13ts) to releases/3.5/14ts Copied: tinysofa/releases/1.0/rp-pppoe/pristine (from rev 3076, tinysofa/releases/1.0/rp-pppoe/releases/3.5/14ts) From svn at tinysofa.org Thu Jul 15 03:46:16 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Thu, 15 Jul 2004 13:46:16 +1000 (EST) Subject: [tinysofa-svn] r3081 - tinysofa/releases/1.0/rpm Message-ID: <20040715034616.6D9404E851B@minbar.tinysofa.org> Author: omar Date: 2004-07-15 13:46:16 +1000 (Thu, 15 Jul 2004) New Revision: 3081 Removed: tinysofa/releases/1.0/rpm/pristine/ Log: rpm: * removing pristine (4.2.2-6ts) From svn at tinysofa.org Thu Jul 15 03:46:18 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Thu, 15 Jul 2004 13:46:18 +1000 (EST) Subject: [tinysofa-svn] r3082 - tinysofa/releases/1.0/rpm Message-ID: <20040715034618.35EE94E851B@minbar.tinysofa.org> Author: omar Date: 2004-07-15 13:46:17 +1000 (Thu, 15 Jul 2004) New Revision: 3082 Added: tinysofa/releases/1.0/rpm/pristine/ Log: rpm: * retarget pristine (4.2.2-6ts) to releases/4.2.2/7ts Copied: tinysofa/releases/1.0/rpm/pristine (from rev 3080, tinysofa/releases/1.0/rpm/releases/4.2.2/7ts) From svn at tinysofa.org Thu Jul 15 03:31:00 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Thu, 15 Jul 2004 13:31:00 +1000 (EST) Subject: [tinysofa-svn] r3077 - tinysofa/releases/1.0/rp-pppoe Message-ID: <20040715033100.8BB794E851C@minbar.tinysofa.org> Author: omar Date: 2004-07-15 13:31:00 +1000 (Thu, 15 Jul 2004) New Revision: 3077 Removed: tinysofa/releases/1.0/rp-pppoe/pristine/ Log: rp-pppoe: * removing pristine (3.5-13ts) From svn at tinysofa.org Thu Jul 15 03:46:00 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Thu, 15 Jul 2004 13:46:00 +1000 (EST) Subject: [tinysofa-svn] r3079 - tinysofa/releases/1.0/rpm/current/specs Message-ID: <20040715034600.C38B34E851B@minbar.tinysofa.org> Author: omar Date: 2004-07-15 13:46:00 +1000 (Thu, 15 Jul 2004) New Revision: 3079 Modified: tinysofa/releases/1.0/rpm/current/specs/rpm.spec Log: - Finally fix the --import problem. Trustix are idiots for forcing 64bit defines. I told them... but nooooooo. Modified: tinysofa/releases/1.0/rpm/current/specs/rpm.spec =================================================================== --- tinysofa/releases/1.0/rpm/current/specs/rpm.spec 2004-07-15 03:31:02 UTC (rev 3078) +++ tinysofa/releases/1.0/rpm/current/specs/rpm.spec 2004-07-15 03:46:00 UTC (rev 3079) @@ -136,7 +136,7 @@ WITH_PYTHON="--without-python" %endif -CFLAGS="$RPM_OPT_FLAGS %{?no_stack_protector}" ./configure --prefix=%{__prefix} --sysconfdir=/etc \ +CFLAGS="-O2 -pipe %{?no_stack_protector}" ./configure --prefix=%{__prefix} --sysconfdir=/etc \ --localstatedir=/var --infodir='${prefix}%{__share}/info' \ --mandir='${prefix}%{__share}/man' \ $WITH_PYTHON --without-javaglue @@ -497,6 +497,9 @@ %{__includedir}/popt.h %changelog +* Thu Jul 15 2004 Omar Kilani +- Fix the --import problem. + * Thu Jul 15 2004 tsintegrate 4.2.2-6ts - current (4.2.2-6jh) integrated as 4.2.2-6ts for release 1.0-U3 From svn at tinysofa.org Thu Jul 15 03:46:15 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Thu, 15 Jul 2004 13:46:15 +1000 (EST) Subject: [tinysofa-svn] r3080 - in tinysofa/releases/1.0/rpm: current/specs releases/4.2.2 releases/4.2.2/7ts/specs Message-ID: <20040715034615.0E22B4E851B@minbar.tinysofa.org> Author: omar Date: 2004-07-15 13:46:14 +1000 (Thu, 15 Jul 2004) New Revision: 3080 Added: tinysofa/releases/1.0/rpm/releases/4.2.2/7ts/ Modified: tinysofa/releases/1.0/rpm/current/specs/rpm.spec tinysofa/releases/1.0/rpm/releases/4.2.2/7ts/specs/rpm.spec Log: rpm: * integrate current (4.2.2-6ts) as releases/4.2.2/7ts Modified: tinysofa/releases/1.0/rpm/current/specs/rpm.spec =================================================================== --- tinysofa/releases/1.0/rpm/current/specs/rpm.spec 2004-07-15 03:46:00 UTC (rev 3079) +++ tinysofa/releases/1.0/rpm/current/specs/rpm.spec 2004-07-15 03:46:14 UTC (rev 3080) @@ -20,7 +20,7 @@ %define version 4.2.2 Version: %{version} %{expand: %%define rpm_version %{version}} -Release: 6ts +Release: 7ts Group: tinysofa official Source: ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.0.x/rpm-%{rpm_version}.tar.gz Source2: rpm-4.2.2-tinysofa-macros @@ -497,6 +497,9 @@ %{__includedir}/popt.h %changelog +* Thu Jul 15 2004 tsintegrate 4.2.2-7ts +- current (4.2.2-6ts) integrated as 4.2.2-7ts for release 1.0-U3 + * Thu Jul 15 2004 Omar Kilani - Fix the --import problem. Copied: tinysofa/releases/1.0/rpm/releases/4.2.2/7ts (from rev 3079, tinysofa/releases/1.0/rpm/current) Modified: tinysofa/releases/1.0/rpm/releases/4.2.2/7ts/specs/rpm.spec =================================================================== --- tinysofa/releases/1.0/rpm/current/specs/rpm.spec 2004-07-15 03:46:00 UTC (rev 3079) +++ tinysofa/releases/1.0/rpm/releases/4.2.2/7ts/specs/rpm.spec 2004-07-15 03:46:14 UTC (rev 3080) @@ -20,7 +20,7 @@ %define version 4.2.2 Version: %{version} %{expand: %%define rpm_version %{version}} -Release: 6ts +Release: 7ts Group: tinysofa official Source: ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.0.x/rpm-%{rpm_version}.tar.gz Source2: rpm-4.2.2-tinysofa-macros @@ -497,6 +497,9 @@ %{__includedir}/popt.h %changelog +* Thu Jul 15 2004 tsintegrate 4.2.2-7ts +- current (4.2.2-6ts) integrated as 4.2.2-7ts for release 1.0-U3 + * Thu Jul 15 2004 Omar Kilani - Fix the --import problem. From svn at tinysofa.org Thu Jul 15 03:56:33 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Thu, 15 Jul 2004 13:56:33 +1000 (EST) Subject: [tinysofa-svn] r3083 - tinysofa/releases/1.0/kernel/current/sources Message-ID: <20040715035633.3E7764E851B@minbar.tinysofa.org> Author: omar Date: 2004-07-15 13:56:33 +1000 (Thu, 15 Jul 2004) New Revision: 3083 Modified: tinysofa/releases/1.0/kernel/current/sources/kernel-2.4.26-i586-BOOT.config tinysofa/releases/1.0/kernel/current/sources/kernel-2.4.26-i586-firewall.config tinysofa/releases/1.0/kernel/current/sources/kernel-2.4.26-i586-firewallsmp.config tinysofa/releases/1.0/kernel/current/sources/kernel-2.4.26-i586-smp.config tinysofa/releases/1.0/kernel/current/sources/kernel-2.4.26-i586.config Log: - New symbols. Modified: tinysofa/releases/1.0/kernel/current/sources/kernel-2.4.26-i586-BOOT.config =================================================================== --- tinysofa/releases/1.0/kernel/current/sources/kernel-2.4.26-i586-BOOT.config 2004-07-15 03:46:17 UTC (rev 3082) +++ tinysofa/releases/1.0/kernel/current/sources/kernel-2.4.26-i586-BOOT.config 2004-07-15 03:56:33 UTC (rev 3083) @@ -1007,3 +1007,5 @@ CONFIG_ZLIB_DEFLATE=m # CONFIG_BLK_DEV_IDE_SATA is not set CONFIG_SCSI_SATA_NV=m +CONFIG_BLK_DEV_SX8=m +CONFIG_CRYPTO_TEA=m Modified: tinysofa/releases/1.0/kernel/current/sources/kernel-2.4.26-i586-firewall.config =================================================================== --- tinysofa/releases/1.0/kernel/current/sources/kernel-2.4.26-i586-firewall.config 2004-07-15 03:46:17 UTC (rev 3082) +++ tinysofa/releases/1.0/kernel/current/sources/kernel-2.4.26-i586-firewall.config 2004-07-15 03:56:33 UTC (rev 3083) @@ -1504,3 +1504,5 @@ # CONFIG_FW_LOADER is not set # CONFIG_BLK_DEV_IDE_SATA is not set CONFIG_SCSI_SATA_NV=m +CONFIG_BLK_DEV_SX8=m +CONFIG_CRYPTO_TEA=m Modified: tinysofa/releases/1.0/kernel/current/sources/kernel-2.4.26-i586-firewallsmp.config =================================================================== --- tinysofa/releases/1.0/kernel/current/sources/kernel-2.4.26-i586-firewallsmp.config 2004-07-15 03:46:17 UTC (rev 3082) +++ tinysofa/releases/1.0/kernel/current/sources/kernel-2.4.26-i586-firewallsmp.config 2004-07-15 03:56:33 UTC (rev 3083) @@ -1509,3 +1509,5 @@ # CONFIG_FW_LOADER is not set # CONFIG_BLK_DEV_IDE_SATA is not set CONFIG_SCSI_SATA_NV=m +CONFIG_BLK_DEV_SX8=m +CONFIG_CRYPTO_TEA=m Modified: tinysofa/releases/1.0/kernel/current/sources/kernel-2.4.26-i586-smp.config =================================================================== --- tinysofa/releases/1.0/kernel/current/sources/kernel-2.4.26-i586-smp.config 2004-07-15 03:46:17 UTC (rev 3082) +++ tinysofa/releases/1.0/kernel/current/sources/kernel-2.4.26-i586-smp.config 2004-07-15 03:56:33 UTC (rev 3083) @@ -1283,3 +1283,5 @@ # CONFIG_FW_LOADER is not set # CONFIG_BLK_DEV_IDE_SATA is not set CONFIG_SCSI_SATA_NV=m +CONFIG_BLK_DEV_SX8=m +CONFIG_CRYPTO_TEA=m Modified: tinysofa/releases/1.0/kernel/current/sources/kernel-2.4.26-i586.config =================================================================== --- tinysofa/releases/1.0/kernel/current/sources/kernel-2.4.26-i586.config 2004-07-15 03:46:17 UTC (rev 3082) +++ tinysofa/releases/1.0/kernel/current/sources/kernel-2.4.26-i586.config 2004-07-15 03:56:33 UTC (rev 3083) @@ -1278,3 +1278,5 @@ # CONFIG_FW_LOADER is not set # CONFIG_BLK_DEV_IDE_SATA is not set CONFIG_SCSI_SATA_NV=m +CONFIG_BLK_DEV_SX8=m +CONFIG_CRYPTO_TEA=m From svn at tinysofa.org Thu Jul 15 03:57:03 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Thu, 15 Jul 2004 13:57:03 +1000 (EST) Subject: [tinysofa-svn] r3084 - in tinysofa/releases/1.0/kernel: current/specs releases/2.4.26 releases/2.4.26/9ts/specs Message-ID: <20040715035703.3D1744E851B@minbar.tinysofa.org> Author: omar Date: 2004-07-15 13:57:02 +1000 (Thu, 15 Jul 2004) New Revision: 3084 Added: tinysofa/releases/1.0/kernel/releases/2.4.26/9ts/ Modified: tinysofa/releases/1.0/kernel/current/specs/kernel.spec tinysofa/releases/1.0/kernel/releases/2.4.26/9ts/specs/kernel.spec Log: kernel: * integrate current (2.4.26-8ts) as releases/2.4.26/9ts Modified: tinysofa/releases/1.0/kernel/current/specs/kernel.spec =================================================================== --- tinysofa/releases/1.0/kernel/current/specs/kernel.spec 2004-07-15 03:56:33 UTC (rev 3083) +++ tinysofa/releases/1.0/kernel/current/specs/kernel.spec 2004-07-15 03:57:02 UTC (rev 3084) @@ -19,7 +19,7 @@ %define freeswanversion 2.05 %define x509version 1.5.4 Version: %{kversion} -Release: 8ts +Release: 9ts %define KVERREL %{PACKAGE_VERSION}-%{PACKAGE_RELEASE} License: GPL Group: tinysofa official @@ -563,6 +563,9 @@ %endif %changelog +* Thu Jul 15 2004 tsintegrate 2.4.26-9ts +- current (2.4.26-8ts) integrated as 2.4.26-9ts for release 1.0-U3 + * Thu Jul 15 2004 tsintegrate 2.4.26-8ts - current (2.4.26-7ts) integrated as 2.4.26-8ts for release 1.0-U3 Copied: tinysofa/releases/1.0/kernel/releases/2.4.26/9ts (from rev 3083, tinysofa/releases/1.0/kernel/current) Modified: tinysofa/releases/1.0/kernel/releases/2.4.26/9ts/specs/kernel.spec =================================================================== --- tinysofa/releases/1.0/kernel/current/specs/kernel.spec 2004-07-15 03:56:33 UTC (rev 3083) +++ tinysofa/releases/1.0/kernel/releases/2.4.26/9ts/specs/kernel.spec 2004-07-15 03:57:02 UTC (rev 3084) @@ -19,7 +19,7 @@ %define freeswanversion 2.05 %define x509version 1.5.4 Version: %{kversion} -Release: 8ts +Release: 9ts %define KVERREL %{PACKAGE_VERSION}-%{PACKAGE_RELEASE} License: GPL Group: tinysofa official @@ -563,6 +563,9 @@ %endif %changelog +* Thu Jul 15 2004 tsintegrate 2.4.26-9ts +- current (2.4.26-8ts) integrated as 2.4.26-9ts for release 1.0-U3 + * Thu Jul 15 2004 tsintegrate 2.4.26-8ts - current (2.4.26-7ts) integrated as 2.4.26-8ts for release 1.0-U3 From svn at tinysofa.org Thu Jul 15 03:57:04 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Thu, 15 Jul 2004 13:57:04 +1000 (EST) Subject: [tinysofa-svn] r3085 - tinysofa/releases/1.0/kernel Message-ID: <20040715035704.8C1A44E851B@minbar.tinysofa.org> Author: omar Date: 2004-07-15 13:57:04 +1000 (Thu, 15 Jul 2004) New Revision: 3085 Removed: tinysofa/releases/1.0/kernel/pristine/ Log: kernel: * removing pristine (2.4.26-8ts) From svn at tinysofa.org Thu Jul 15 03:57:08 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Thu, 15 Jul 2004 13:57:08 +1000 (EST) Subject: [tinysofa-svn] r3086 - tinysofa/releases/1.0/kernel Message-ID: <20040715035708.6BB7D4E851B@minbar.tinysofa.org> Author: omar Date: 2004-07-15 13:57:08 +1000 (Thu, 15 Jul 2004) New Revision: 3086 Added: tinysofa/releases/1.0/kernel/pristine/ Log: kernel: * retarget pristine (2.4.26-8ts) to releases/2.4.26/9ts Copied: tinysofa/releases/1.0/kernel/pristine (from rev 3084, tinysofa/releases/1.0/kernel/releases/2.4.26/9ts) From svn at tinysofa.org Thu Jul 15 04:20:07 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Thu, 15 Jul 2004 14:20:07 +1000 (EST) Subject: [tinysofa-svn] r3087 - tinysofa/releases/1.0/kernel/current/sources Message-ID: <20040715042007.3DB324E851B@minbar.tinysofa.org> Author: omar Date: 2004-07-15 14:20:06 +1000 (Thu, 15 Jul 2004) New Revision: 3087 Modified: tinysofa/releases/1.0/kernel/current/sources/kernel-2.4.26-i586-BOOT.config tinysofa/releases/1.0/kernel/current/sources/kernel-2.4.26-i586-firewall.config tinysofa/releases/1.0/kernel/current/sources/kernel-2.4.26-i586-firewallsmp.config tinysofa/releases/1.0/kernel/current/sources/kernel-2.4.26-i586-smp.config tinysofa/releases/1.0/kernel/current/sources/kernel-2.4.26-i586.config Log: - Broken new module. Modified: tinysofa/releases/1.0/kernel/current/sources/kernel-2.4.26-i586-BOOT.config =================================================================== --- tinysofa/releases/1.0/kernel/current/sources/kernel-2.4.26-i586-BOOT.config 2004-07-15 03:57:08 UTC (rev 3086) +++ tinysofa/releases/1.0/kernel/current/sources/kernel-2.4.26-i586-BOOT.config 2004-07-15 04:20:06 UTC (rev 3087) @@ -1008,4 +1008,4 @@ # CONFIG_BLK_DEV_IDE_SATA is not set CONFIG_SCSI_SATA_NV=m CONFIG_BLK_DEV_SX8=m -CONFIG_CRYPTO_TEA=m +# CONFIG_CRYPTO_TEA is not set Modified: tinysofa/releases/1.0/kernel/current/sources/kernel-2.4.26-i586-firewall.config =================================================================== --- tinysofa/releases/1.0/kernel/current/sources/kernel-2.4.26-i586-firewall.config 2004-07-15 03:57:08 UTC (rev 3086) +++ tinysofa/releases/1.0/kernel/current/sources/kernel-2.4.26-i586-firewall.config 2004-07-15 04:20:06 UTC (rev 3087) @@ -1505,4 +1505,4 @@ # CONFIG_BLK_DEV_IDE_SATA is not set CONFIG_SCSI_SATA_NV=m CONFIG_BLK_DEV_SX8=m -CONFIG_CRYPTO_TEA=m +# CONFIG_CRYPTO_TEA is not set Modified: tinysofa/releases/1.0/kernel/current/sources/kernel-2.4.26-i586-firewallsmp.config =================================================================== --- tinysofa/releases/1.0/kernel/current/sources/kernel-2.4.26-i586-firewallsmp.config 2004-07-15 03:57:08 UTC (rev 3086) +++ tinysofa/releases/1.0/kernel/current/sources/kernel-2.4.26-i586-firewallsmp.config 2004-07-15 04:20:06 UTC (rev 3087) @@ -1510,4 +1510,4 @@ # CONFIG_BLK_DEV_IDE_SATA is not set CONFIG_SCSI_SATA_NV=m CONFIG_BLK_DEV_SX8=m -CONFIG_CRYPTO_TEA=m +# CONFIG_CRYPTO_TEA is not set Modified: tinysofa/releases/1.0/kernel/current/sources/kernel-2.4.26-i586-smp.config =================================================================== --- tinysofa/releases/1.0/kernel/current/sources/kernel-2.4.26-i586-smp.config 2004-07-15 03:57:08 UTC (rev 3086) +++ tinysofa/releases/1.0/kernel/current/sources/kernel-2.4.26-i586-smp.config 2004-07-15 04:20:06 UTC (rev 3087) @@ -1284,4 +1284,4 @@ # CONFIG_BLK_DEV_IDE_SATA is not set CONFIG_SCSI_SATA_NV=m CONFIG_BLK_DEV_SX8=m -CONFIG_CRYPTO_TEA=m +# CONFIG_CRYPTO_TEA is not set Modified: tinysofa/releases/1.0/kernel/current/sources/kernel-2.4.26-i586.config =================================================================== --- tinysofa/releases/1.0/kernel/current/sources/kernel-2.4.26-i586.config 2004-07-15 03:57:08 UTC (rev 3086) +++ tinysofa/releases/1.0/kernel/current/sources/kernel-2.4.26-i586.config 2004-07-15 04:20:06 UTC (rev 3087) @@ -1279,4 +1279,4 @@ # CONFIG_BLK_DEV_IDE_SATA is not set CONFIG_SCSI_SATA_NV=m CONFIG_BLK_DEV_SX8=m -CONFIG_CRYPTO_TEA=m +# CONFIG_CRYPTO_TEA is not set From svn at tinysofa.org Thu Jul 15 04:20:27 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Thu, 15 Jul 2004 14:20:27 +1000 (EST) Subject: [tinysofa-svn] r3088 - in tinysofa/releases/1.0/kernel: current/specs releases/2.4.26 releases/2.4.26/10ts/specs Message-ID: <20040715042027.C2B924E851B@minbar.tinysofa.org> Author: omar Date: 2004-07-15 14:20:27 +1000 (Thu, 15 Jul 2004) New Revision: 3088 Added: tinysofa/releases/1.0/kernel/releases/2.4.26/10ts/ Modified: tinysofa/releases/1.0/kernel/current/specs/kernel.spec tinysofa/releases/1.0/kernel/releases/2.4.26/10ts/specs/kernel.spec Log: kernel: * integrate current (2.4.26-9ts) as releases/2.4.26/10ts Modified: tinysofa/releases/1.0/kernel/current/specs/kernel.spec =================================================================== --- tinysofa/releases/1.0/kernel/current/specs/kernel.spec 2004-07-15 04:20:06 UTC (rev 3087) +++ tinysofa/releases/1.0/kernel/current/specs/kernel.spec 2004-07-15 04:20:27 UTC (rev 3088) @@ -19,7 +19,7 @@ %define freeswanversion 2.05 %define x509version 1.5.4 Version: %{kversion} -Release: 9ts +Release: 10ts %define KVERREL %{PACKAGE_VERSION}-%{PACKAGE_RELEASE} License: GPL Group: tinysofa official @@ -563,6 +563,9 @@ %endif %changelog +* Thu Jul 15 2004 tsintegrate 2.4.26-10ts +- current (2.4.26-9ts) integrated as 2.4.26-10ts for release 1.0-U3 + * Thu Jul 15 2004 tsintegrate 2.4.26-9ts - current (2.4.26-8ts) integrated as 2.4.26-9ts for release 1.0-U3 Copied: tinysofa/releases/1.0/kernel/releases/2.4.26/10ts (from rev 3087, tinysofa/releases/1.0/kernel/current) Modified: tinysofa/releases/1.0/kernel/releases/2.4.26/10ts/specs/kernel.spec =================================================================== --- tinysofa/releases/1.0/kernel/current/specs/kernel.spec 2004-07-15 04:20:06 UTC (rev 3087) +++ tinysofa/releases/1.0/kernel/releases/2.4.26/10ts/specs/kernel.spec 2004-07-15 04:20:27 UTC (rev 3088) @@ -19,7 +19,7 @@ %define freeswanversion 2.05 %define x509version 1.5.4 Version: %{kversion} -Release: 9ts +Release: 10ts %define KVERREL %{PACKAGE_VERSION}-%{PACKAGE_RELEASE} License: GPL Group: tinysofa official @@ -563,6 +563,9 @@ %endif %changelog +* Thu Jul 15 2004 tsintegrate 2.4.26-10ts +- current (2.4.26-9ts) integrated as 2.4.26-10ts for release 1.0-U3 + * Thu Jul 15 2004 tsintegrate 2.4.26-9ts - current (2.4.26-8ts) integrated as 2.4.26-9ts for release 1.0-U3 From svn at tinysofa.org Thu Jul 15 04:20:34 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Thu, 15 Jul 2004 14:20:34 +1000 (EST) Subject: [tinysofa-svn] r3090 - tinysofa/releases/1.0/kernel Message-ID: <20040715042034.A33814E851B@minbar.tinysofa.org> Author: omar Date: 2004-07-15 14:20:34 +1000 (Thu, 15 Jul 2004) New Revision: 3090 Added: tinysofa/releases/1.0/kernel/pristine/ Log: kernel: * retarget pristine (2.4.26-9ts) to releases/2.4.26/10ts Copied: tinysofa/releases/1.0/kernel/pristine (from rev 3088, tinysofa/releases/1.0/kernel/releases/2.4.26/10ts) From svn at tinysofa.org Thu Jul 15 04:20:30 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Thu, 15 Jul 2004 14:20:30 +1000 (EST) Subject: [tinysofa-svn] r3089 - tinysofa/releases/1.0/kernel Message-ID: <20040715042030.852394E851C@minbar.tinysofa.org> Author: omar Date: 2004-07-15 14:20:30 +1000 (Thu, 15 Jul 2004) New Revision: 3089 Removed: tinysofa/releases/1.0/kernel/pristine/ Log: kernel: * removing pristine (2.4.26-9ts) From svn at tinysofa.org Thu Jul 15 04:57:06 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Thu, 15 Jul 2004 14:57:06 +1000 (EST) Subject: [tinysofa-svn] r3091 - in tinysofa/releases/1.0/kernel: current/sources pristine/sources releases/2.4.26/10ts/sources Message-ID: <20040715045706.617A54E851B@minbar.tinysofa.org> Author: omar Date: 2004-07-15 14:57:06 +1000 (Thu, 15 Jul 2004) New Revision: 3091 Modified: tinysofa/releases/1.0/kernel/current/sources/kernel-2.4.26-i586-BOOT.config tinysofa/releases/1.0/kernel/current/sources/kernel-2.4.26-i586-firewall.config tinysofa/releases/1.0/kernel/current/sources/kernel-2.4.26-i586-firewallsmp.config tinysofa/releases/1.0/kernel/current/sources/kernel-2.4.26-i586-smp.config tinysofa/releases/1.0/kernel/current/sources/kernel-2.4.26-i586.config tinysofa/releases/1.0/kernel/pristine/sources/kernel-2.4.26-i586-BOOT.config tinysofa/releases/1.0/kernel/pristine/sources/kernel-2.4.26-i586-firewall.config tinysofa/releases/1.0/kernel/pristine/sources/kernel-2.4.26-i586-firewallsmp.config tinysofa/releases/1.0/kernel/pristine/sources/kernel-2.4.26-i586-smp.config tinysofa/releases/1.0/kernel/pristine/sources/kernel-2.4.26-i586.config tinysofa/releases/1.0/kernel/releases/2.4.26/10ts/sources/kernel-2.4.26-i586-BOOT.config tinysofa/releases/1.0/kernel/releases/2.4.26/10ts/sources/kernel-2.4.26-i586-firewall.config tinysofa/releases/1.0/kernel/releases/2.4.26/10ts/sources/kernel-2.4.26-i586-firewallsmp.config tinysofa/releases/1.0/kernel/releases/2.4.26/10ts/sources/kernel-2.4.26-i586-smp.config tinysofa/releases/1.0/kernel/releases/2.4.26/10ts/sources/kernel-2.4.26-i586.config Log: - CONFIG_NET_SCH_NETEM=m Modified: tinysofa/releases/1.0/kernel/current/sources/kernel-2.4.26-i586-BOOT.config =================================================================== --- tinysofa/releases/1.0/kernel/current/sources/kernel-2.4.26-i586-BOOT.config 2004-07-15 04:20:34 UTC (rev 3090) +++ tinysofa/releases/1.0/kernel/current/sources/kernel-2.4.26-i586-BOOT.config 2004-07-15 04:57:06 UTC (rev 3091) @@ -1009,3 +1009,4 @@ CONFIG_SCSI_SATA_NV=m CONFIG_BLK_DEV_SX8=m # CONFIG_CRYPTO_TEA is not set +CONFIG_NET_SCH_NETEM=m Modified: tinysofa/releases/1.0/kernel/current/sources/kernel-2.4.26-i586-firewall.config =================================================================== --- tinysofa/releases/1.0/kernel/current/sources/kernel-2.4.26-i586-firewall.config 2004-07-15 04:20:34 UTC (rev 3090) +++ tinysofa/releases/1.0/kernel/current/sources/kernel-2.4.26-i586-firewall.config 2004-07-15 04:57:06 UTC (rev 3091) @@ -1506,3 +1506,4 @@ CONFIG_SCSI_SATA_NV=m CONFIG_BLK_DEV_SX8=m # CONFIG_CRYPTO_TEA is not set +CONFIG_NET_SCH_NETEM=m Modified: tinysofa/releases/1.0/kernel/current/sources/kernel-2.4.26-i586-firewallsmp.config =================================================================== --- tinysofa/releases/1.0/kernel/current/sources/kernel-2.4.26-i586-firewallsmp.config 2004-07-15 04:20:34 UTC (rev 3090) +++ tinysofa/releases/1.0/kernel/current/sources/kernel-2.4.26-i586-firewallsmp.config 2004-07-15 04:57:06 UTC (rev 3091) @@ -1511,3 +1511,4 @@ CONFIG_SCSI_SATA_NV=m CONFIG_BLK_DEV_SX8=m # CONFIG_CRYPTO_TEA is not set +CONFIG_NET_SCH_NETEM=m Modified: tinysofa/releases/1.0/kernel/current/sources/kernel-2.4.26-i586-smp.config =================================================================== --- tinysofa/releases/1.0/kernel/current/sources/kernel-2.4.26-i586-smp.config 2004-07-15 04:20:34 UTC (rev 3090) +++ tinysofa/releases/1.0/kernel/current/sources/kernel-2.4.26-i586-smp.config 2004-07-15 04:57:06 UTC (rev 3091) @@ -1285,3 +1285,4 @@ CONFIG_SCSI_SATA_NV=m CONFIG_BLK_DEV_SX8=m # CONFIG_CRYPTO_TEA is not set +CONFIG_NET_SCH_NETEM=m Modified: tinysofa/releases/1.0/kernel/current/sources/kernel-2.4.26-i586.config =================================================================== --- tinysofa/releases/1.0/kernel/current/sources/kernel-2.4.26-i586.config 2004-07-15 04:20:34 UTC (rev 3090) +++ tinysofa/releases/1.0/kernel/current/sources/kernel-2.4.26-i586.config 2004-07-15 04:57:06 UTC (rev 3091) @@ -1280,3 +1280,4 @@ CONFIG_SCSI_SATA_NV=m CONFIG_BLK_DEV_SX8=m # CONFIG_CRYPTO_TEA is not set +CONFIG_NET_SCH_NETEM=m Modified: tinysofa/releases/1.0/kernel/pristine/sources/kernel-2.4.26-i586-BOOT.config =================================================================== --- tinysofa/releases/1.0/kernel/pristine/sources/kernel-2.4.26-i586-BOOT.config 2004-07-15 04:20:34 UTC (rev 3090) +++ tinysofa/releases/1.0/kernel/pristine/sources/kernel-2.4.26-i586-BOOT.config 2004-07-15 04:57:06 UTC (rev 3091) @@ -1009,3 +1009,4 @@ CONFIG_SCSI_SATA_NV=m CONFIG_BLK_DEV_SX8=m # CONFIG_CRYPTO_TEA is not set +CONFIG_NET_SCH_NETEM=m Modified: tinysofa/releases/1.0/kernel/pristine/sources/kernel-2.4.26-i586-firewall.config =================================================================== --- tinysofa/releases/1.0/kernel/pristine/sources/kernel-2.4.26-i586-firewall.config 2004-07-15 04:20:34 UTC (rev 3090) +++ tinysofa/releases/1.0/kernel/pristine/sources/kernel-2.4.26-i586-firewall.config 2004-07-15 04:57:06 UTC (rev 3091) @@ -1506,3 +1506,4 @@ CONFIG_SCSI_SATA_NV=m CONFIG_BLK_DEV_SX8=m # CONFIG_CRYPTO_TEA is not set +CONFIG_NET_SCH_NETEM=m Modified: tinysofa/releases/1.0/kernel/pristine/sources/kernel-2.4.26-i586-firewallsmp.config =================================================================== --- tinysofa/releases/1.0/kernel/pristine/sources/kernel-2.4.26-i586-firewallsmp.config 2004-07-15 04:20:34 UTC (rev 3090) +++ tinysofa/releases/1.0/kernel/pristine/sources/kernel-2.4.26-i586-firewallsmp.config 2004-07-15 04:57:06 UTC (rev 3091) @@ -1511,3 +1511,4 @@ CONFIG_SCSI_SATA_NV=m CONFIG_BLK_DEV_SX8=m # CONFIG_CRYPTO_TEA is not set +CONFIG_NET_SCH_NETEM=m Modified: tinysofa/releases/1.0/kernel/pristine/sources/kernel-2.4.26-i586-smp.config =================================================================== --- tinysofa/releases/1.0/kernel/pristine/sources/kernel-2.4.26-i586-smp.config 2004-07-15 04:20:34 UTC (rev 3090) +++ tinysofa/releases/1.0/kernel/pristine/sources/kernel-2.4.26-i586-smp.config 2004-07-15 04:57:06 UTC (rev 3091) @@ -1285,3 +1285,4 @@ CONFIG_SCSI_SATA_NV=m CONFIG_BLK_DEV_SX8=m # CONFIG_CRYPTO_TEA is not set +CONFIG_NET_SCH_NETEM=m Modified: tinysofa/releases/1.0/kernel/pristine/sources/kernel-2.4.26-i586.config =================================================================== --- tinysofa/releases/1.0/kernel/pristine/sources/kernel-2.4.26-i586.config 2004-07-15 04:20:34 UTC (rev 3090) +++ tinysofa/releases/1.0/kernel/pristine/sources/kernel-2.4.26-i586.config 2004-07-15 04:57:06 UTC (rev 3091) @@ -1280,3 +1280,4 @@ CONFIG_SCSI_SATA_NV=m CONFIG_BLK_DEV_SX8=m # CONFIG_CRYPTO_TEA is not set +CONFIG_NET_SCH_NETEM=m Modified: tinysofa/releases/1.0/kernel/releases/2.4.26/10ts/sources/kernel-2.4.26-i586-BOOT.config =================================================================== --- tinysofa/releases/1.0/kernel/releases/2.4.26/10ts/sources/kernel-2.4.26-i586-BOOT.config 2004-07-15 04:20:34 UTC (rev 3090) +++ tinysofa/releases/1.0/kernel/releases/2.4.26/10ts/sources/kernel-2.4.26-i586-BOOT.config 2004-07-15 04:57:06 UTC (rev 3091) @@ -1009,3 +1009,4 @@ CONFIG_SCSI_SATA_NV=m CONFIG_BLK_DEV_SX8=m # CONFIG_CRYPTO_TEA is not set +CONFIG_NET_SCH_NETEM=m Modified: tinysofa/releases/1.0/kernel/releases/2.4.26/10ts/sources/kernel-2.4.26-i586-firewall.config =================================================================== --- tinysofa/releases/1.0/kernel/releases/2.4.26/10ts/sources/kernel-2.4.26-i586-firewall.config 2004-07-15 04:20:34 UTC (rev 3090) +++ tinysofa/releases/1.0/kernel/releases/2.4.26/10ts/sources/kernel-2.4.26-i586-firewall.config 2004-07-15 04:57:06 UTC (rev 3091) @@ -1506,3 +1506,4 @@ CONFIG_SCSI_SATA_NV=m CONFIG_BLK_DEV_SX8=m # CONFIG_CRYPTO_TEA is not set +CONFIG_NET_SCH_NETEM=m Modified: tinysofa/releases/1.0/kernel/releases/2.4.26/10ts/sources/kernel-2.4.26-i586-firewallsmp.config =================================================================== --- tinysofa/releases/1.0/kernel/releases/2.4.26/10ts/sources/kernel-2.4.26-i586-firewallsmp.config 2004-07-15 04:20:34 UTC (rev 3090) +++ tinysofa/releases/1.0/kernel/releases/2.4.26/10ts/sources/kernel-2.4.26-i586-firewallsmp.config 2004-07-15 04:57:06 UTC (rev 3091) @@ -1511,3 +1511,4 @@ CONFIG_SCSI_SATA_NV=m CONFIG_BLK_DEV_SX8=m # CONFIG_CRYPTO_TEA is not set +CONFIG_NET_SCH_NETEM=m Modified: tinysofa/releases/1.0/kernel/releases/2.4.26/10ts/sources/kernel-2.4.26-i586-smp.config =================================================================== --- tinysofa/releases/1.0/kernel/releases/2.4.26/10ts/sources/kernel-2.4.26-i586-smp.config 2004-07-15 04:20:34 UTC (rev 3090) +++ tinysofa/releases/1.0/kernel/releases/2.4.26/10ts/sources/kernel-2.4.26-i586-smp.config 2004-07-15 04:57:06 UTC (rev 3091) @@ -1285,3 +1285,4 @@ CONFIG_SCSI_SATA_NV=m CONFIG_BLK_DEV_SX8=m # CONFIG_CRYPTO_TEA is not set +CONFIG_NET_SCH_NETEM=m Modified: tinysofa/releases/1.0/kernel/releases/2.4.26/10ts/sources/kernel-2.4.26-i586.config =================================================================== --- tinysofa/releases/1.0/kernel/releases/2.4.26/10ts/sources/kernel-2.4.26-i586.config 2004-07-15 04:20:34 UTC (rev 3090) +++ tinysofa/releases/1.0/kernel/releases/2.4.26/10ts/sources/kernel-2.4.26-i586.config 2004-07-15 04:57:06 UTC (rev 3091) @@ -1280,3 +1280,4 @@ CONFIG_SCSI_SATA_NV=m CONFIG_BLK_DEV_SX8=m # CONFIG_CRYPTO_TEA is not set +CONFIG_NET_SCH_NETEM=m From svn at tinysofa.org Thu Jul 15 07:24:50 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Thu, 15 Jul 2004 17:24:50 +1000 (EST) Subject: [tinysofa-svn] r3092 - tinysofa/releases/1.1/mod_php4/current Message-ID: <20040715072450.2FEF44E851B@minbar.tinysofa.org> Author: jh Date: 2004-07-15 17:24:49 +1000 (Thu, 15 Jul 2004) New Revision: 3092 Removed: tinysofa/releases/1.1/mod_php4/current/sources/ Log: - remove mod_php4 sources From svn at tinysofa.org Thu Jul 15 07:25:25 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Thu, 15 Jul 2004 17:25:25 +1000 (EST) Subject: [tinysofa-svn] r3093 - tinysofa/releases/1.1/mod_php4/current Message-ID: <20040715072525.92D834E851B@minbar.tinysofa.org> Author: jh Date: 2004-07-15 17:25:25 +1000 (Thu, 15 Jul 2004) New Revision: 3093 Added: tinysofa/releases/1.1/mod_php4/current/sources/ Log: - copy mod_php4 sources from 1.0 Copied: tinysofa/releases/1.1/mod_php4/current/sources (from rev 3092, tinysofa/releases/1.0/mod_php4/current/sources) From svn at tinysofa.org Thu Jul 15 07:31:24 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Thu, 15 Jul 2004 17:31:24 +1000 (EST) Subject: [tinysofa-svn] r3094 - tinysofa/releases/1.1/mod_php4/current/specs Message-ID: <20040715073124.0C5AB4E851B@minbar.tinysofa.org> Author: jh Date: 2004-07-15 17:31:23 +1000 (Thu, 15 Jul 2004) New Revision: 3094 Modified: tinysofa/releases/1.1/mod_php4/current/specs/mod_php4.spec Log: - update to new upstream Modified: tinysofa/releases/1.1/mod_php4/current/specs/mod_php4.spec =================================================================== --- tinysofa/releases/1.1/mod_php4/current/specs/mod_php4.spec 2004-07-15 07:25:25 UTC (rev 3093) +++ tinysofa/releases/1.1/mod_php4/current/specs/mod_php4.spec 2004-07-15 07:31:23 UTC (rev 3094) @@ -6,8 +6,8 @@ Summary: The PHP4 HTML-embedded scripting language for use with Apache. Name: mod_php4 -Version: 4.3.7 -Release: 3jh +Version: 4.3.8 +Release: 1jh Group: extra Source0: http://www.php.net/distributions/php-%{version}.tar.bz2 Source1: php.ini From svn at tinysofa.org Thu Jul 15 16:18:20 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 16 Jul 2004 02:18:20 +1000 (EST) Subject: [tinysofa-svn] r3095 - tinysofa/releases/1.1/openssh/current/specs Message-ID: <20040715161820.3B0FF4E8031@minbar.tinysofa.org> Author: jh Date: 2004-07-16 02:18:19 +1000 (Fri, 16 Jul 2004) New Revision: 3095 Modified: tinysofa/releases/1.1/openssh/current/specs/openssh.spec Log: - enable pie Modified: tinysofa/releases/1.1/openssh/current/specs/openssh.spec =================================================================== --- tinysofa/releases/1.1/openssh/current/specs/openssh.spec 2004-07-15 07:31:23 UTC (rev 3094) +++ tinysofa/releases/1.1/openssh/current/specs/openssh.spec 2004-07-15 16:18:19 UTC (rev 3095) @@ -4,7 +4,7 @@ Summary: OpenSSH free Secure Shell (SSH) implementation Name: openssh Version: 3.8.0p1 -Release: 5ts +Release: 6jh License: BSD Group: main Source0: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{realversion}.tar.gz @@ -105,8 +105,11 @@ %build %if %{with_selinux} RPM_OPT_FLAGS="$RPM_OPT_FLAGS -DWITH_SELINUX" + +LDFLAGS="$LDFLAGS -pie"; export LDFLAGS + %endif -CFLAGS="$RPM_OPT_FLAGS" \ +CFLAGS="$RPM_OPT_FLAGS -fpie" \ ./configure --prefix=/usr \ --sysconfdir=/etc/ssh \ --mandir=%{_mandir}\ @@ -118,7 +121,7 @@ --with-lastlog=/var/log/lastlog \ --with-privsep-path=/var/cache/openssh/empty -make +%make %install From svn at tinysofa.org Thu Jul 15 16:26:35 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 16 Jul 2004 02:26:35 +1000 (EST) Subject: [tinysofa-svn] r3096 - tinysofa/releases/1.1 Message-ID: <20040715162635.6C4904E8031@minbar.tinysofa.org> Author: jh Date: 2004-07-16 02:26:35 +1000 (Fri, 16 Jul 2004) New Revision: 3096 Removed: tinysofa/releases/1.1/pyparted/ Log: - remove pyparted From svn at tinysofa.org Thu Jul 15 16:34:00 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 16 Jul 2004 02:34:00 +1000 (EST) Subject: [tinysofa-svn] r3097 - in tinysofa/releases/1.1/bind/current: sources specs Message-ID: <20040715163400.C2DF34E8031@minbar.tinysofa.org> Author: jh Date: 2004-07-16 02:34:00 +1000 (Fri, 16 Jul 2004) New Revision: 3097 Added: tinysofa/releases/1.1/bind/current/sources/bind-9.2.2-pie.patch Modified: tinysofa/releases/1.1/bind/current/specs/bind.spec Log: - add pie patch Added: tinysofa/releases/1.1/bind/current/sources/bind-9.2.2-pie.patch =================================================================== --- tinysofa/releases/1.1/bind/current/sources/bind-9.2.2-pie.patch 2004-07-15 16:26:35 UTC (rev 3096) +++ tinysofa/releases/1.1/bind/current/sources/bind-9.2.2-pie.patch 2004-07-15 16:34:00 UTC (rev 3097) @@ -0,0 +1,29 @@ +--- bind-9.2.2.P3/bin/named/unix/Makefile.in.pie 2003-10-27 15:20:53.000000000 -0800 ++++ bind-9.2.2.P3/bin/named/unix/Makefile.in 2003-10-27 15:21:13.000000000 -0800 +@@ -33,4 +33,6 @@ + + TARGETS = ${OBJS} + ++EXT_CFLAGS = -fPIE ++ + @BIND9_MAKE_RULES@ +--- bind-9.2.2.P3/bin/named/Makefile.in.pie 2001-05-31 17:45:00.000000000 -0700 ++++ bind-9.2.2.P3/bin/named/Makefile.in 2003-10-27 15:12:36.000000000 -0800 +@@ -87,6 +87,8 @@ + + MANOBJS = ${MANPAGES} ${HTMLPAGES} + ++EXT_CFLAGS = -fPIE ++ + @BIND9_MAKE_RULES@ + + main. at O@: main.c +@@ -100,7 +102,7 @@ + -c ${srcdir}/config.c + + named: ${OBJS} ${UOBJS} ${DEPLIBS} +- ${LIBTOOL} ${PURIFY} ${CC} ${CFLAGS} -o $@ ${OBJS} ${UOBJS} ${LIBS} ++ ${LIBTOOL} ${PURIFY} ${CC} ${CFLAGS} -pie -o $@ ${OBJS} ${UOBJS} ${LIBS} + + lwresd: named + rm -f lwresd Modified: tinysofa/releases/1.1/bind/current/specs/bind.spec =================================================================== --- tinysofa/releases/1.1/bind/current/specs/bind.spec 2004-07-15 16:26:35 UTC (rev 3096) +++ tinysofa/releases/1.1/bind/current/specs/bind.spec 2004-07-15 16:34:00 UTC (rev 3097) @@ -25,6 +25,7 @@ Patch: %{name}-9.1.1-key.patch Patch1: %{name}-9.2.0.varrun.patch Patch2: bind-9.2.3-SO_BSDCOMPAT.patch +Patch3: bind-9.2.2-pie.patch #Requires: glibc-iconv # coreutils is required because of the "tr" command in the # init script, used to convert a variable to lower case @@ -180,6 +181,7 @@ %patch -p1 -b .key %patch1 -p1 -b .varrun %patch2 -p1 -b .SO_BSDCOMPAT +%patch3 -p1 -b .pie %build libtoolize --copy --force From svn at tinysofa.org Thu Jul 15 16:36:27 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 16 Jul 2004 02:36:27 +1000 (EST) Subject: [tinysofa-svn] r3098 - in tinysofa/releases/1.1/bind/current: sources specs Message-ID: <20040715163627.4AFC94E8031@minbar.tinysofa.org> Author: jh Date: 2004-07-16 02:36:27 +1000 (Fri, 16 Jul 2004) New Revision: 3098 Added: tinysofa/releases/1.1/bind/current/sources/bind-posixthreads.patch Modified: tinysofa/releases/1.1/bind/current/specs/bind.spec Log: - add posixthreads patch Added: tinysofa/releases/1.1/bind/current/sources/bind-posixthreads.patch =================================================================== --- tinysofa/releases/1.1/bind/current/sources/bind-posixthreads.patch 2004-07-15 16:34:00 UTC (rev 3097) +++ tinysofa/releases/1.1/bind/current/sources/bind-posixthreads.patch 2004-07-15 16:36:27 UTC (rev 3098) @@ -0,0 +1,22 @@ +--- bind-9.2.2/configure.in~ 2003-02-17 02:05:01.000000000 -0500 ++++ bind-9.2.2/configure.in 2003-03-11 14:25:22.000000000 -0500 +@@ -654,7 +654,7 @@ + # deal with signals. + # + *-linux*) +- AC_DEFINE(HAVE_LINUXTHREADS) ++ AC_DEFINE(_POSIX_PTHREAD_SEMANTICS) + ;; + # + # Ensure the right sigwait() semantics on Solaris and make +--- bind-9.2.2/configure~ 2003-03-11 14:27:39.000000000 -0500 ++++ bind-9.2.2/configure 2003-03-11 14:29:42.000000000 -0500 +@@ -5478,7 +5478,7 @@ + # + *-linux*) + cat >>confdefs.h <<\_ACEOF +-#define HAVE_LINUXTHREADS 1 ++#define _POSIX_PTHREAD_SEMANTICS 1 + _ACEOF + + ;; Modified: tinysofa/releases/1.1/bind/current/specs/bind.spec =================================================================== --- tinysofa/releases/1.1/bind/current/specs/bind.spec 2004-07-15 16:34:00 UTC (rev 3097) +++ tinysofa/releases/1.1/bind/current/specs/bind.spec 2004-07-15 16:36:27 UTC (rev 3098) @@ -26,6 +26,7 @@ Patch1: %{name}-9.2.0.varrun.patch Patch2: bind-9.2.3-SO_BSDCOMPAT.patch Patch3: bind-9.2.2-pie.patch +Patch4: bind-posixthreads.patch #Requires: glibc-iconv # coreutils is required because of the "tr" command in the # init script, used to convert a variable to lower case @@ -182,6 +183,7 @@ %patch1 -p1 -b .varrun %patch2 -p1 -b .SO_BSDCOMPAT %patch3 -p1 -b .pie +%patch4 -p1 -b .posixthreads %build libtoolize --copy --force From svn at tinysofa.org Thu Jul 15 18:10:07 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 16 Jul 2004 04:10:07 +1000 (EST) Subject: [tinysofa-svn] r3100 - tinysofa/releases/1.1 Message-ID: <20040715181007.6DA1D4E8031@minbar.tinysofa.org> Author: jh Date: 2004-07-16 04:10:07 +1000 (Fri, 16 Jul 2004) New Revision: 3100 Removed: tinysofa/releases/1.1/db1/ Log: - remove db1, not needed From svn at tinysofa.org Thu Jul 15 18:12:40 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 16 Jul 2004 04:12:40 +1000 (EST) Subject: [tinysofa-svn] r3101 - tinysofa/releases/1.1/util-linux/current/specs Message-ID: <20040715181240.D0B944E8031@minbar.tinysofa.org> Author: jh Date: 2004-07-16 04:12:40 +1000 (Fri, 16 Jul 2004) New Revision: 3101 Modified: tinysofa/releases/1.1/util-linux/current/specs/util-linux.spec Log: - do not obsolote mount and losetup Modified: tinysofa/releases/1.1/util-linux/current/specs/util-linux.spec =================================================================== --- tinysofa/releases/1.1/util-linux/current/specs/util-linux.spec 2004-07-15 18:10:07 UTC (rev 3100) +++ tinysofa/releases/1.1/util-linux/current/specs/util-linux.spec 2004-07-15 18:12:40 UTC (rev 3101) @@ -108,9 +108,6 @@ %endif Conflicts: kernel < 2.2.12-7, %info_requires -Obsoletes: mount losetup -Provides: mount = %{version} -Provides: losetup = %{version} %description The util-linux package contains a large variety of low-level system From svn at tinysofa.org Thu Jul 15 19:28:28 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 16 Jul 2004 05:28:28 +1000 (EST) Subject: [tinysofa-svn] r3103 - contrib/webmin/releases Message-ID: <20040715192828.8C3B44E8031@minbar.tinysofa.org> Author: bg Date: 2004-07-16 05:28:28 +1000 (Fri, 16 Jul 2004) New Revision: 3103 Added: contrib/webmin/releases/1.150/ Log: prepare relases 1.150-1bg From svn at tinysofa.org Thu Jul 15 19:28:44 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 16 Jul 2004 05:28:44 +1000 (EST) Subject: [tinysofa-svn] r3104 - contrib/webmin/releases/1.150 Message-ID: <20040715192844.0BF734E8031@minbar.tinysofa.org> Author: bg Date: 2004-07-16 05:28:43 +1000 (Fri, 16 Jul 2004) New Revision: 3104 Added: contrib/webmin/releases/1.150/1bg/ Log: tagges release 1.150-1bg Copied: contrib/webmin/releases/1.150/1bg (from rev 3103, contrib/webmin/current) From svn at tinysofa.org Thu Jul 15 19:29:44 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 16 Jul 2004 05:29:44 +1000 (EST) Subject: [tinysofa-svn] r3105 - contrib/webmin Message-ID: <20040715192944.71DEC4E8031@minbar.tinysofa.org> Author: bg Date: 2004-07-16 05:29:44 +1000 (Fri, 16 Jul 2004) New Revision: 3105 Removed: contrib/webmin/pristine/ Log: update pritine 1/2 From svn at tinysofa.org Thu Jul 15 19:30:01 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 16 Jul 2004 05:30:01 +1000 (EST) Subject: [tinysofa-svn] r3106 - contrib/webmin Message-ID: <20040715193001.350C74E8031@minbar.tinysofa.org> Author: bg Date: 2004-07-16 05:30:01 +1000 (Fri, 16 Jul 2004) New Revision: 3106 Added: contrib/webmin/pristine/ Log: update pritine 2/2 Copied: contrib/webmin/pristine (from rev 3105, contrib/webmin/current) From svn at tinysofa.org Thu Jul 15 20:05:20 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 16 Jul 2004 06:05:20 +1000 (EST) Subject: [tinysofa-svn] r3107 - tinysofa/releases/1.1/wget/current/specs Message-ID: <20040715200520.6E5EF4E8031@minbar.tinysofa.org> Author: jh Date: 2004-07-16 06:05:20 +1000 (Fri, 16 Jul 2004) New Revision: 3107 Modified: tinysofa/releases/1.1/wget/current/specs/wget.spec Log: - add BuildRequires: autoconf Modified: tinysofa/releases/1.1/wget/current/specs/wget.spec =================================================================== --- tinysofa/releases/1.1/wget/current/specs/wget.spec 2004-07-15 19:30:01 UTC (rev 3106) +++ tinysofa/releases/1.1/wget/current/specs/wget.spec 2004-07-15 20:05:20 UTC (rev 3107) @@ -16,7 +16,7 @@ Patch5: wget-1.9.1-path.patch Provides: webclient %info_requires -BuildRequires: perl, openssl-devel, pkgconfig +BuildRequires: perl, openssl-devel, pkgconfig, autoconf BuildRoot: %{_tmppath}/%{name}-root %description From svn at tinysofa.org Fri Jul 16 08:49:26 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 16 Jul 2004 18:49:26 +1000 (EST) Subject: [tinysofa-svn] r3108 - tinysofa/releases/1.1 Message-ID: <20040716084926.9038A4E8031@minbar.tinysofa.org> Author: jh Date: 2004-07-16 18:49:25 +1000 (Fri, 16 Jul 2004) New Revision: 3108 Added: tinysofa/releases/1.1/dosfstools/ Log: - copy dosfstools from snapshot Copied: tinysofa/releases/1.1/dosfstools (from rev 3107, tinysofa/snapshot/dosfstools) From svn at tinysofa.org Fri Jul 16 09:04:15 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 16 Jul 2004 19:04:15 +1000 (EST) Subject: [tinysofa-svn] r3109 - tinysofa/releases/1.1/dosfstools/current/specs Message-ID: <20040716090415.60EE54E8031@minbar.tinysofa.org> Author: jh Date: 2004-07-16 19:04:15 +1000 (Fri, 16 Jul 2004) New Revision: 3109 Modified: tinysofa/releases/1.1/dosfstools/current/specs/dosfstools.spec Log: - port to 1.1 Modified: tinysofa/releases/1.1/dosfstools/current/specs/dosfstools.spec =================================================================== --- tinysofa/releases/1.1/dosfstools/current/specs/dosfstools.spec 2004-07-16 08:49:25 UTC (rev 3108) +++ tinysofa/releases/1.1/dosfstools/current/specs/dosfstools.spec 2004-07-16 09:04:15 UTC (rev 3109) @@ -1,9 +1,10 @@ Name: dosfstools Summary: Utilities for making and checking MS-DOS FAT filesystems on Linux. -Version: 2.8 -Release: 12ts +Version: 2.9 +Release: 1jh +Epoch: 1 License: GPL -Group: Applications/System +Group: extra Source: ftp://ibiblio.org/pub/Linux/system/filesystems/dosfs/dosfstools-%{version}.src.tar.gz Patch0: dosfstools-2.7-s390.patch Patch1: dosfstools-2.7-argfix.patch @@ -12,13 +13,13 @@ Patch4: dosfstools-2.8-autofat32.patch Patch5: dosfstools-2.8-endian.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root -Obsoletes: mkdosfs-ygg %description The dosfstools package includes the mkdosfs and dosfsck utilities, which respectively make and check MS-DOS FAT filesystems on hard drives or on floppies. + %prep %setup -q %patch0 -p1 -b .s390 @@ -28,11 +29,12 @@ %patch4 -p1 -b .autofat32 %patch5 -p1 -b .endian + %build -make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS -Dllseek=lseek64 -D_LARGEFILE64_SOURCE" +%make CFLAGS="$RPM_OPT_FLAGS -Dllseek=lseek64 -D_LARGEFILE64_SOURCE" + %install -rm -rf %{buildroot} mkdir -p %{buildroot}/sbin mkdir -p %{buildroot}/%{_mandir}/man8 @@ -51,14 +53,17 @@ install -m 644 dosfsck/dosfsck.8 %{buildroot}%{_mandir}/man8 ln -sf dosfsck.8.gz %{buildroot}%{_mandir}/man8/fsck.vfat.8.gz + %clean -rm -rf %{buildroot} +%clean_buildroot + %files %defattr(-,root,root) /sbin/* %{_mandir}/man8/* + %changelog * Fri Feb 13 2004 Elliot Lee - rebuilt From svn at tinysofa.org Fri Jul 16 09:14:25 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 16 Jul 2004 19:14:25 +1000 (EST) Subject: [tinysofa-svn] r3110 - tinysofa/releases/1.1/dosfstools/current/specs Message-ID: <20040716091425.D2C0E4E8031@minbar.tinysofa.org> Author: jh Date: 2004-07-16 19:14:25 +1000 (Fri, 16 Jul 2004) New Revision: 3110 Modified: tinysofa/releases/1.1/dosfstools/current/specs/dosfstools.spec Log: - correct version Modified: tinysofa/releases/1.1/dosfstools/current/specs/dosfstools.spec =================================================================== --- tinysofa/releases/1.1/dosfstools/current/specs/dosfstools.spec 2004-07-16 09:04:15 UTC (rev 3109) +++ tinysofa/releases/1.1/dosfstools/current/specs/dosfstools.spec 2004-07-16 09:14:25 UTC (rev 3110) @@ -1,6 +1,6 @@ Name: dosfstools Summary: Utilities for making and checking MS-DOS FAT filesystems on Linux. -Version: 2.9 +Version: 2.8 Release: 1jh Epoch: 1 License: GPL From svn at tinysofa.org Fri Jul 16 09:24:01 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 16 Jul 2004 19:24:01 +1000 (EST) Subject: [tinysofa-svn] r3111 - tinysofa/releases/1.1/authconfig/current/specs Message-ID: <20040716092401.C18264E8031@minbar.tinysofa.org> Author: jh Date: 2004-07-16 19:24:01 +1000 (Fri, 16 Jul 2004) New Revision: 3111 Modified: tinysofa/releases/1.1/authconfig/current/specs/authconfig.spec Log: - BuildRequires: gcc-c++ Modified: tinysofa/releases/1.1/authconfig/current/specs/authconfig.spec =================================================================== --- tinysofa/releases/1.1/authconfig/current/specs/authconfig.spec 2004-07-16 09:14:25 UTC (rev 3110) +++ tinysofa/releases/1.1/authconfig/current/specs/authconfig.spec 2004-07-16 09:24:01 UTC (rev 3111) @@ -1,7 +1,7 @@ Summary: Text-mode tool for setting up NIS and shadow passwords. Name: authconfig Version: 4.3.7 -Release: 2ts +Release: 3jh License: GPL ExclusiveOS: Linux Group: main @@ -10,7 +10,7 @@ Requires: libstdc++ BuildRequires: python, newt BuildRequires: pkgconfig, glib, glib-devel, python-devel, newt-devel -BuildRequires: libstdc++-devel +BuildRequires: gcc-c++ libstdc++-devel %description Authconfig is a terminal mode program for setting up Network @@ -147,4 +147,4 @@ - MD5 passwords do not require shadow passwords, so made them independent * Wed Feb 03 1999 Preston Brown -- initial spec file \ No newline at end of file +- initial spec file From svn at tinysofa.org Fri Jul 16 09:24:49 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 16 Jul 2004 19:24:49 +1000 (EST) Subject: [tinysofa-svn] r3112 - tinysofa/releases/1.1/beecrypt/current/specs Message-ID: <20040716092449.B57FA4E8031@minbar.tinysofa.org> Author: jh Date: 2004-07-16 19:24:49 +1000 (Fri, 16 Jul 2004) New Revision: 3112 Modified: tinysofa/releases/1.1/beecrypt/current/specs/beecrypt.spec Log: BuildRequires: gcc-c++ Modified: tinysofa/releases/1.1/beecrypt/current/specs/beecrypt.spec =================================================================== --- tinysofa/releases/1.1/beecrypt/current/specs/beecrypt.spec 2004-07-16 09:24:01 UTC (rev 3111) +++ tinysofa/releases/1.1/beecrypt/current/specs/beecrypt.spec 2004-07-16 09:24:49 UTC (rev 3112) @@ -14,6 +14,7 @@ Requires: libstdc++ BuildRequires: autoconf automake libtool BuildRequires: libstdc++-devel +BuildRequires: gcc-c++ %description Beecrypt is a general-purpose cryptography library. From svn at tinysofa.org Fri Jul 16 09:26:23 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 16 Jul 2004 19:26:23 +1000 (EST) Subject: [tinysofa-svn] r3113 - tinysofa/releases/1.1/bind/current/specs Message-ID: <20040716092623.3E8464E8031@minbar.tinysofa.org> Author: jh Date: 2004-07-16 19:26:23 +1000 (Fri, 16 Jul 2004) New Revision: 3113 Modified: tinysofa/releases/1.1/bind/current/specs/bind.spec Log: - BuildRequires: gcc-c++ Modified: tinysofa/releases/1.1/bind/current/specs/bind.spec =================================================================== --- tinysofa/releases/1.1/bind/current/specs/bind.spec 2004-07-16 09:24:49 UTC (rev 3112) +++ tinysofa/releases/1.1/bind/current/specs/bind.spec 2004-07-16 09:26:23 UTC (rev 3113) @@ -45,7 +45,7 @@ %accountman_requires %service_requires BuildRequires: /usr/bin/perl binutils gcc glibc-devel automake libstdc++-devel -BuildRequires: openssl-devel >= 0.9.7 make libtool autoconf +BuildRequires: openssl-devel >= 0.9.7 make libtool autoconf gcc-c++ #BuildRequires: glibc-iconv Buildroot: %{_tmppath}/%{name}-%{version}-root Obsoletes: bind-chroot From svn at tinysofa.org Fri Jul 16 09:36:54 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 16 Jul 2004 19:36:54 +1000 (EST) Subject: [tinysofa-svn] r3114 - tinysofa/releases/1.1/cdrtools/current/specs Message-ID: <20040716093654.171D64E8031@minbar.tinysofa.org> Author: jh Date: 2004-07-16 19:36:53 +1000 (Fri, 16 Jul 2004) New Revision: 3114 Modified: tinysofa/releases/1.1/cdrtools/current/specs/cdrtools.spec Log: - do not reinstall xconfig.h Modified: tinysofa/releases/1.1/cdrtools/current/specs/cdrtools.spec =================================================================== --- tinysofa/releases/1.1/cdrtools/current/specs/cdrtools.spec 2004-07-16 09:26:23 UTC (rev 3113) +++ tinysofa/releases/1.1/cdrtools/current/specs/cdrtools.spec 2004-07-16 09:36:53 UTC (rev 3114) @@ -12,7 +12,6 @@ Patch2: cdrtools-2.0-O_EXCL.patch Patch3: cdrtools-2.0-silo.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root -Conflicts: cdrecord < 2.0 BuildRequires: sed @@ -151,7 +150,7 @@ [ -e include/scg ] && rm include/scg mkdir -p %{buildroot}%{_includedir}/schily/scg install -m 644 include/* %{buildroot}%{_includedir}/schily -install -m 644 incs/*/xconfig.h %{buildroot}%{_includedir}/schily +#install -m 644 incs/*/xconfig.h %{buildroot}%{_includedir}/schily install -m 644 libscg/scg/* %{buildroot}%{_includedir}/schily/scg # default configuration for cdrecord From svn at tinysofa.org Fri Jul 16 09:38:26 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 16 Jul 2004 19:38:26 +1000 (EST) Subject: [tinysofa-svn] r3115 - tinysofa/releases/1.1/binutils/current/specs Message-ID: <20040716093826.0C0504E8031@minbar.tinysofa.org> Author: jh Date: 2004-07-16 19:38:25 +1000 (Fri, 16 Jul 2004) New Revision: 3115 Modified: tinysofa/releases/1.1/binutils/current/specs/binutils.spec Log: - add BuildRequires: bison Modified: tinysofa/releases/1.1/binutils/current/specs/binutils.spec =================================================================== --- tinysofa/releases/1.1/binutils/current/specs/binutils.spec 2004-07-16 09:36:53 UTC (rev 3114) +++ tinysofa/releases/1.1/binutils/current/specs/binutils.spec 2004-07-16 09:38:25 UTC (rev 3115) @@ -21,7 +21,7 @@ Patch13: binutils-2.15.90.0.3-ia64-lib64.patch Buildroot: %{_tmppath}/%{name}-%{version}-root -BuildRequires: gettext flex perl +BuildRequires: gettext flex bison perl %ifarch ia64 Obsoletes: gnupro %endif From svn at tinysofa.org Fri Jul 16 09:39:27 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 16 Jul 2004 19:39:27 +1000 (EST) Subject: [tinysofa-svn] r3116 - tinysofa/releases/1.1/courier-imap/current/specs Message-ID: <20040716093927.998254E8031@minbar.tinysofa.org> Author: jh Date: 2004-07-16 19:39:27 +1000 (Fri, 16 Jul 2004) New Revision: 3116 Modified: tinysofa/releases/1.1/courier-imap/current/specs/courier-imap.spec Log: - BuildRequires: gcc-c++ Modified: tinysofa/releases/1.1/courier-imap/current/specs/courier-imap.spec =================================================================== --- tinysofa/releases/1.1/courier-imap/current/specs/courier-imap.spec 2004-07-16 09:38:25 UTC (rev 3115) +++ tinysofa/releases/1.1/courier-imap/current/specs/courier-imap.spec 2004-07-16 09:39:27 UTC (rev 3116) @@ -1,7 +1,7 @@ Summary: Courier-IMAP server Name: courier-imap Version: 2.2.1 -Release: 6ts +Release: 7jh License: GPL Group: extra Source: http://unc.dl.sourceforge.net/sourceforge/courier/courier-imap-%{version}.tar.bz2 @@ -23,7 +23,7 @@ %service_requires Requires: coreutils, sed Requires: db4, openssl, imapd-pam -BuildRequires: coreutils, rpm >= 4.0.2, sed, libstdc++-devel +BuildRequires: coreutils, rpm >= 4.0.2, sed, libstdc++-devel gcc-c++ BuildRequires: perl, db4-devel, openssl-devel BuildRequires: pam-devel openldap-devel mysql-devel postgresql-devel Buildrequires: mysql-devel mysql-shared mysql-libs From svn at tinysofa.org Fri Jul 16 09:40:21 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 16 Jul 2004 19:40:21 +1000 (EST) Subject: [tinysofa-svn] r3117 - tinysofa/releases/1.1/cups/current/specs Message-ID: <20040716094021.5C26F4E8031@minbar.tinysofa.org> Author: jh Date: 2004-07-16 19:40:21 +1000 (Fri, 16 Jul 2004) New Revision: 3117 Modified: tinysofa/releases/1.1/cups/current/specs/cups.spec Log: - BuildRequires: gcc-c++ Modified: tinysofa/releases/1.1/cups/current/specs/cups.spec =================================================================== --- tinysofa/releases/1.1/cups/current/specs/cups.spec 2004-07-16 09:39:27 UTC (rev 3116) +++ tinysofa/releases/1.1/cups/current/specs/cups.spec 2004-07-16 09:40:21 UTC (rev 3117) @@ -1,7 +1,7 @@ Summary: Common Unix Printing System Name: cups Version: 1.1.20 -Release: 5ts +Release: 6jh License: GPL Group: main Source: ftp://ftp.easysw.com/pub/cups/cups-%{version}-source.tar.bz2 @@ -21,7 +21,7 @@ %service_requires Requires: %{name}-libs = %{version} xinetd libjpeg libtiff libpng zlib openssl Requires: ghostscript-cups -Requires: libstdc++ +Requires: libstdc++ gcc-c++ Provides: lpd lpr lprng BuildPrereq: pam-devel openssl-devel BuildRequires: autoconf From svn at tinysofa.org Fri Jul 16 09:55:50 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 16 Jul 2004 19:55:50 +1000 (EST) Subject: [tinysofa-svn] r3118 - tinysofa/releases/1.1/db4/current/specs Message-ID: <20040716095550.A3A074E8031@minbar.tinysofa.org> Author: jh Date: 2004-07-16 19:55:50 +1000 (Fri, 16 Jul 2004) New Revision: 3118 Modified: tinysofa/releases/1.1/db4/current/specs/db4.spec Log: - BuildRequires: gcc-c++ Modified: tinysofa/releases/1.1/db4/current/specs/db4.spec =================================================================== --- tinysofa/releases/1.1/db4/current/specs/db4.spec 2004-07-16 09:40:21 UTC (rev 3117) +++ tinysofa/releases/1.1/db4/current/specs/db4.spec 2004-07-16 09:55:50 UTC (rev 3118) @@ -31,7 +31,7 @@ License: GPL Group: main Obsoletes: db1, db1-devel -BuildPreReq: perl, libtool, ed, autoconf, libstdc++-devel, ed +BuildPreReq: perl, libtool, ed, autoconf, libstdc++-devel, gcc-c++, ed %ifarch %{java_arches} BuildPreReq: gcc-java %endif From svn at tinysofa.org Fri Jul 16 10:05:29 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 16 Jul 2004 20:05:29 +1000 (EST) Subject: [tinysofa-svn] r3119 - tinysofa/releases/1.1/dovecot/current/specs Message-ID: <20040716100529.B86FB4E8031@minbar.tinysofa.org> Author: jh Date: 2004-07-16 20:05:28 +1000 (Fri, 16 Jul 2004) New Revision: 3119 Modified: tinysofa/releases/1.1/dovecot/current/specs/dovecot.spec Log: - BuildRequires: gcc-c++ Modified: tinysofa/releases/1.1/dovecot/current/specs/dovecot.spec =================================================================== --- tinysofa/releases/1.1/dovecot/current/specs/dovecot.spec 2004-07-16 09:55:50 UTC (rev 3118) +++ tinysofa/releases/1.1/dovecot/current/specs/dovecot.spec 2004-07-16 10:05:28 UTC (rev 3119) @@ -17,6 +17,8 @@ BuildRequires: pam-devel BuildRequires: pkgconfig BuildRequires: zlib-devel +BuildRequires: zlib-devel +BuildRequires: gcc-c++ Prereq: openssl %service_requires From svn at tinysofa.org Fri Jul 16 10:18:37 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 16 Jul 2004 20:18:37 +1000 (EST) Subject: [tinysofa-svn] r3120 - tinysofa/releases/1.1/gcc/current/specs Message-ID: <20040716101837.CA1DE4E8031@minbar.tinysofa.org> Author: jh Date: 2004-07-16 20:18:37 +1000 (Fri, 16 Jul 2004) New Revision: 3120 Modified: tinysofa/releases/1.1/gcc/current/specs/gcc.spec Log: - add BuildRequires: glibc-i18n-common Modified: tinysofa/releases/1.1/gcc/current/specs/gcc.spec =================================================================== --- tinysofa/releases/1.1/gcc/current/specs/gcc.spec 2004-07-16 10:05:28 UTC (rev 3119) +++ tinysofa/releases/1.1/gcc/current/specs/gcc.spec 2004-07-16 10:18:37 UTC (rev 3120) @@ -38,7 +38,7 @@ BuildRequires: binutils >= 2.15.90.0.1.1 BuildRequires: zlib-devel, gettext, bison, flex # Make sure pthread.h doesn't contain __thread tokens -BuildRequires: glibc-devel >= 2.2.90-12 +BuildRequires: glibc-devel >= 2.2.90-12 glibc-18n-common %if %{build_ada} # Ada requires Ada to build BuildRequires: gcc-gnat >= 3.1, libgnat >= 3.1 From svn at tinysofa.org Fri Jul 16 10:19:31 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 16 Jul 2004 20:19:31 +1000 (EST) Subject: [tinysofa-svn] r3121 - tinysofa/releases/1.1/gdbm/current/specs Message-ID: <20040716101931.15E994E8031@minbar.tinysofa.org> Author: jh Date: 2004-07-16 20:19:30 +1000 (Fri, 16 Jul 2004) New Revision: 3121 Modified: tinysofa/releases/1.1/gdbm/current/specs/gdbm.spec Log: - BuildRequires: gcc-c++ Modified: tinysofa/releases/1.1/gdbm/current/specs/gdbm.spec =================================================================== --- tinysofa/releases/1.1/gdbm/current/specs/gdbm.spec 2004-07-16 10:18:37 UTC (rev 3120) +++ tinysofa/releases/1.1/gdbm/current/specs/gdbm.spec 2004-07-16 10:19:30 UTC (rev 3121) @@ -3,14 +3,14 @@ Summary: A GNU set of database routines which use extensible hashing. Name: gdbm Version: 1.8.3 -Release: 6ts +Release: 7jh Source: ftp://ftp.gnu.org/gnu/gdbm/gdbm-%{version}.tar.gz Patch0: gdbm-1.8.0-jbj.patch Patch1: gdbm-1.8.3-Makefile.in.patch License: GPL Group: main Prefix: %{_prefix} -BuildRequires: texinfo libtool autoconf automake libstdc++-devel +BuildRequires: texinfo libtool autoconf automake libstdc++-devel gcc-c++ BuildRoot: %{_tmppath}/%{name}-root %description From svn at tinysofa.org Fri Jul 16 10:20:06 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 16 Jul 2004 20:20:06 +1000 (EST) Subject: [tinysofa-svn] r3122 - tinysofa/releases/1.1/gettext/current/specs Message-ID: <20040716102006.372754E8031@minbar.tinysofa.org> Author: jh Date: 2004-07-16 20:20:06 +1000 (Fri, 16 Jul 2004) New Revision: 3122 Modified: tinysofa/releases/1.1/gettext/current/specs/gettext.spec Log: - BuildRequires: gcc-c++ Modified: tinysofa/releases/1.1/gettext/current/specs/gettext.spec =================================================================== --- tinysofa/releases/1.1/gettext/current/specs/gettext.spec 2004-07-16 10:19:30 UTC (rev 3121) +++ tinysofa/releases/1.1/gettext/current/specs/gettext.spec 2004-07-16 10:20:06 UTC (rev 3122) @@ -1,12 +1,12 @@ Summary: GNU libraries and utilities for producing multi-lingual messages. Name: gettext Version: 0.14.1 -Release: 7ts +Release: 8jh License: GPL Group: development Source: ftp://ftp.gnu.org/gnu/gettext-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-root -BuildRequires: libstdc++-devel +BuildRequires: libstdc++-devel gcc-c++ Requires: libstdc++ %description From svn at tinysofa.org Fri Jul 16 10:22:41 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 16 Jul 2004 20:22:41 +1000 (EST) Subject: [tinysofa-svn] r3123 - tinysofa/releases/1.1/ghostscript/current/specs Message-ID: <20040716102241.5D04C4E8031@minbar.tinysofa.org> Author: jh Date: 2004-07-16 20:22:41 +1000 (Fri, 16 Jul 2004) New Revision: 3123 Modified: tinysofa/releases/1.1/ghostscript/current/specs/ghostscript.spec Log: - BuildRequires: gcc-c++ Modified: tinysofa/releases/1.1/ghostscript/current/specs/ghostscript.spec =================================================================== --- tinysofa/releases/1.1/ghostscript/current/specs/ghostscript.spec 2004-07-16 10:20:06 UTC (rev 3122) +++ tinysofa/releases/1.1/ghostscript/current/specs/ghostscript.spec 2004-07-16 10:22:41 UTC (rev 3123) @@ -1,7 +1,7 @@ Summary: ESP Ghostscript Name: ghostscript Version: 7.07.1 -Release: 5ts +Release: 6jh License: GPL Group: extra Source: ftp://ftp.easysw.com/pub/ghostscript/espgs-%{version}-source.tar.bz2 @@ -11,6 +11,7 @@ BuildRequires: libjpeg libjpeg-devel libtiff libtiff-devel libstdc++-devel BuildRequires: zlib zlib-devel cups cups-devel libpng libpng-devel Buildrequires: openssl openssl-devel +BuildRequires: gcc-c++ Requires: libstdc++ Requires: zlib From svn at tinysofa.org Fri Jul 16 10:28:00 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 16 Jul 2004 20:28:00 +1000 (EST) Subject: [tinysofa-svn] r3124 - tinysofa/releases/1.1/mysql/current/specs Message-ID: <20040716102800.32CB54E8031@minbar.tinysofa.org> Author: jh Date: 2004-07-16 20:27:59 +1000 (Fri, 16 Jul 2004) New Revision: 3124 Modified: tinysofa/releases/1.1/mysql/current/specs/mysql.spec Log: - BuildRequires: gcc-c++ Modified: tinysofa/releases/1.1/mysql/current/specs/mysql.spec =================================================================== --- tinysofa/releases/1.1/mysql/current/specs/mysql.spec 2004-07-16 10:22:41 UTC (rev 3123) +++ tinysofa/releases/1.1/mysql/current/specs/mysql.spec 2004-07-16 10:27:59 UTC (rev 3124) @@ -2,7 +2,7 @@ Name: mysql Group: main Version: 4.0.20 -Release: 3ts +Release: 4jh License: GPL / LGPL %define shared_libversion 12:0:0 %define mysqld_user mysql @@ -12,7 +12,7 @@ URL: http://www.mysql.com/ Provides: msqlormysql MySQL-server BuildRoot: %{_tmppath}/%{name}-%{version}-root -BuildRequires: bison, texinfo, python, libstdc++-devel, zlib-devel +BuildRequires: bison, texinfo, python, libstdc++-devel, gcc-c++, zlib-devel BuildREquires: db4-devel, libtermcap-devel, openssl-devel, ncurses-devel Requires: mysql-shared mysql-libs Prereq: /bin/hostname /bin/sleep htmlinfo From svn at tinysofa.org Fri Jul 16 10:35:38 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 16 Jul 2004 20:35:38 +1000 (EST) Subject: [tinysofa-svn] r3125 - in tinysofa/releases/1.1: glib/current/specs groff/current/specs lftp/current/specs libtool/current/specs libxml2/current/specs netatalk/current/specs openssl/current/specs pam_krb5/current/specs parted/current/specs pcre/current/specs psmisc/current/specs shadow-utils/current/specstelnet/current/specs Message-ID: <20040716103538.940BC4E8031@minbar.tinysofa.org> Author: jh Date: 2004-07-16 20:35:38 +1000 (Fri, 16 Jul 2004) New Revision: 3125 Modified: tinysofa/releases/1.1/glib/current/specs/glib.spec tinysofa/releases/1.1/groff/current/specs/groff.spec tinysofa/releases/1.1/lftp/current/specs/lftp.spec tinysofa/releases/1.1/libtool/current/specs/libtool.spec tinysofa/releases/1.1/libxml2/current/specs/libxml2.spec tinysofa/releases/1.1/netatalk/current/specs/netatalk.spec tinysofa/releases/1.1/openssl/current/specs/openssl.spec tinysofa/releases/1.1/pam_krb5/current/specs/pam_krb5.spec tinysofa/releases/1.1/parted/current/specs/parted.spec tinysofa/releases/1.1/pcre/current/specs/pcre.spec tinysofa/releases/1.1/psmisc/current/specs/psmisc.spec tinysofa/releases/1.1/shadow-utils/current/specs/shadow-utils.spec tinysofa/releases/1.1/telnet/current/specs/telnet.spec Log: - BuildRequires: gcc-c++ Modified: tinysofa/releases/1.1/glib/current/specs/glib.spec =================================================================== --- tinysofa/releases/1.1/glib/current/specs/glib.spec 2004-07-16 10:27:59 UTC (rev 3124) +++ tinysofa/releases/1.1/glib/current/specs/glib.spec 2004-07-16 10:35:38 UTC (rev 3125) @@ -1,13 +1,13 @@ Summary: A library of handy utility functions. Name: glib Version: 2.4.2 -Release: 1ts +Release: 2jh License: LGPL Group: main Source: ftp://ftp.gtk.org/pub/gtk/v2.4/glib-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-root URL: http://www.gtk.org -BuildRequires: pkgconfig gettext libstdc++-devel +BuildRequires: pkgconfig gettext libstdc++-devel gcc-c++ %description GLib is a handy library of utility functions. This C library is Modified: tinysofa/releases/1.1/groff/current/specs/groff.spec =================================================================== --- tinysofa/releases/1.1/groff/current/specs/groff.spec 2004-07-16 10:27:59 UTC (rev 3124) +++ tinysofa/releases/1.1/groff/current/specs/groff.spec 2004-07-16 10:35:38 UTC (rev 3125) @@ -9,7 +9,7 @@ Source2: nroff Requires: mktemp libstdc++ Requires: /usr/bin/iconv -BuildRequires: byacc libstdc++-devel +BuildRequires: byacc libstdc++-devel gcc-c++ BuildRoot: %{_tmppath}/%{name}-%{version}-root Provides: nroff-i18n Obsoletes: groff-tools Modified: tinysofa/releases/1.1/lftp/current/specs/lftp.spec =================================================================== --- tinysofa/releases/1.1/lftp/current/specs/lftp.spec 2004-07-16 10:27:59 UTC (rev 3124) +++ tinysofa/releases/1.1/lftp/current/specs/lftp.spec 2004-07-16 10:35:38 UTC (rev 3125) @@ -9,7 +9,7 @@ URL: http://lftp.yar.ru/ BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRequires: ncurses-devel, openssl-devel, pkgconfig, readline-devel -BuildRequires: libstdc++-devel +BuildRequires: libstdc++-devel gcc-c++ BuildRequires: libtool Requires: libstdc++ openssl ncurses readline Modified: tinysofa/releases/1.1/libtool/current/specs/libtool.spec =================================================================== --- tinysofa/releases/1.1/libtool/current/specs/libtool.spec 2004-07-16 10:27:59 UTC (rev 3124) +++ tinysofa/releases/1.1/libtool/current/specs/libtool.spec 2004-07-16 10:35:38 UTC (rev 3125) @@ -1,13 +1,13 @@ Summary: The GNU libtool, which simplifies the use of shared libraries. Name: libtool Version: 1.5.6 -Release: 2ts +Release: 3jh License: GPL Group: development Source: ftp://alpha.gnu.org/gnu/libtool-%{version}.tar.gz Prefix: %{_prefix} PreReq: htmlinfo -BuildRequires: texinfo libstdc++-devel +BuildRequires: texinfo libstdc++-devel gcc-c++ BuildRoot: %{_tmppath}/%{name}-root %description Modified: tinysofa/releases/1.1/libxml2/current/specs/libxml2.spec =================================================================== --- tinysofa/releases/1.1/libxml2/current/specs/libxml2.spec 2004-07-16 10:27:59 UTC (rev 3124) +++ tinysofa/releases/1.1/libxml2/current/specs/libxml2.spec 2004-07-16 10:35:38 UTC (rev 3125) @@ -1,12 +1,12 @@ Summary: Library providing XML and HTML support Name: libxml2 Version: 2.6.9 -Release: 1ts +Release: 2jh License: MIT Group: main Source: ftp://xmlsoft.org/libxml2-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-root -BuildRequires: python python-devel libtool libstdc++-devel +BuildRequires: python python-devel libtool libstdc++-devel gcc-c++ URL: http://xmlsoft.org/ %description Modified: tinysofa/releases/1.1/netatalk/current/specs/netatalk.spec =================================================================== --- tinysofa/releases/1.1/netatalk/current/specs/netatalk.spec 2004-07-16 10:27:59 UTC (rev 3124) +++ tinysofa/releases/1.1/netatalk/current/specs/netatalk.spec 2004-07-16 10:35:38 UTC (rev 3125) @@ -17,7 +17,7 @@ Requires: pam >= 0.56, /etc/pam.d/system-auth, tcp_wrappers, openssl, cracklib BuildRequires: cracklib openssl-devel pam quota libtool automake autoconf BuildRequires: libstdc++-devel db4-devel kerberos5-devel libcom_err-devel -BuildRequires: perl +BuildRequires: perl gcc-g++ BuildRoot: %{_tmppath}/%{name}-%{version}-root %description Modified: tinysofa/releases/1.1/openssl/current/specs/openssl.spec =================================================================== --- tinysofa/releases/1.1/openssl/current/specs/openssl.spec 2004-07-16 10:27:59 UTC (rev 3124) +++ tinysofa/releases/1.1/openssl/current/specs/openssl.spec 2004-07-16 10:35:38 UTC (rev 3125) @@ -49,7 +49,7 @@ Summary: Support for using OpenSSL in python scripts. Group: extra Requires: python, openssl = %{version}, libstdc++ -BuildRequires: libstdc++-devel +BuildRequires: libstdc++-devel gcc-c++ %description python This package allows you to call OpenSSL functions from python scripts. Modified: tinysofa/releases/1.1/pam_krb5/current/specs/pam_krb5.spec =================================================================== --- tinysofa/releases/1.1/pam_krb5/current/specs/pam_krb5.spec 2004-07-16 10:27:59 UTC (rev 3124) +++ tinysofa/releases/1.1/pam_krb5/current/specs/pam_krb5.spec 2004-07-16 10:35:38 UTC (rev 3125) @@ -1,12 +1,12 @@ Summary: A Pluggable Authentication Module for Kerberos 5. Name: pam_krb5 Version: 2.0.10 -Release: 5ts +Release: 6jh Source0: pam_krb5-%{version}.tar.gz License: LGPL Group: extra BuildPrereq: byacc, flex, kerberos5-devel, kerberosafs-devel, pam-devel -BuildRequires: libstdc++-devel kerberos5 kerberosafs libcom_err-devel +BuildRequires: libstdc++-devel kerberos5 kerberosafs libcom_err-devel gcc-c++ BuildRoot: %{_tmppath}/%{name}-root Requires: kerberosafs >= 1.0 Modified: tinysofa/releases/1.1/parted/current/specs/parted.spec =================================================================== --- tinysofa/releases/1.1/parted/current/specs/parted.spec 2004-07-16 10:27:59 UTC (rev 3124) +++ tinysofa/releases/1.1/parted/current/specs/parted.spec 2004-07-16 10:35:38 UTC (rev 3125) @@ -9,7 +9,7 @@ Patch0: parted-1.4.24-python2.3.patch BuildRequires: e2fsprogs-devel libcom_err-devel libtermcap-devel readline-devel BuildRequires: python python-devel autoconf libtool automake gettext -BuildRequires: libstdc++-devel +BuildRequires: libstdc++-devel gcc-c++ %description The GNU Parted program allows you to create, destroy, resize, move, Modified: tinysofa/releases/1.1/pcre/current/specs/pcre.spec =================================================================== --- tinysofa/releases/1.1/pcre/current/specs/pcre.spec 2004-07-16 10:27:59 UTC (rev 3124) +++ tinysofa/releases/1.1/pcre/current/specs/pcre.spec 2004-07-16 10:35:38 UTC (rev 3125) @@ -1,6 +1,6 @@ Name: pcre Version: 4.5 -Release: 3ts +Release: 4jh Summary: Perl-compatible regular expression library URL: http://www.pcre.org/ Source: ftp://ftp.csx.cam.ac.uk/pub/software/programming/%{name}/%{name}-%{version}.tar.bz2 @@ -9,7 +9,7 @@ Group: main Prefix: %{_prefix} BuildRoot: %{_tmppath}/%{name}-root -BuildRequires: autoconf automake libtool libstdc++-devel +BuildRequires: autoconf automake libtool libstdc++-devel gcc-c++ %description Perl-compatible regular expression library. Modified: tinysofa/releases/1.1/psmisc/current/specs/psmisc.spec =================================================================== --- tinysofa/releases/1.1/psmisc/current/specs/psmisc.spec 2004-07-16 10:27:59 UTC (rev 3124) +++ tinysofa/releases/1.1/psmisc/current/specs/psmisc.spec 2004-07-16 10:35:38 UTC (rev 3125) @@ -1,14 +1,14 @@ Summary: Utilities for managing processes on your system. Name: psmisc Version: 21.4 -Release: 5ts +Release: 6jh License: GPL Group: main Source: ftp://sunsite.unc.edu/pub/Linux/system/status/ps/psmisc-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-root Requires: ncurses libtermcap -BuildRequires: libstdc++-devel ncurses-devel libtermcap-devel +BuildRequires: libstdc++-devel gcc-c++ ncurses-devel libtermcap-devel %description The psmisc package contains utilities for managing processes on your @@ -102,4 +102,4 @@ - spec file cleanups * Tue Jun 17 1997 Erik Troan -- built against glibc \ No newline at end of file +- built against glibc Modified: tinysofa/releases/1.1/shadow-utils/current/specs/shadow-utils.spec =================================================================== --- tinysofa/releases/1.1/shadow-utils/current/specs/shadow-utils.spec 2004-07-16 10:27:59 UTC (rev 3124) +++ tinysofa/releases/1.1/shadow-utils/current/specs/shadow-utils.spec 2004-07-16 10:35:38 UTC (rev 3125) @@ -28,7 +28,7 @@ License: BSD Group: main BuildPrereq: autoconf, automake, libtool -BuildRequires: gettext libstdc++-devel +BuildRequires: gettext libstdc++-devel gcc-c++ BuildRoot: %{_tmppath}/%{name}-%{version}-root Obsoletes: adduser Modified: tinysofa/releases/1.1/telnet/current/specs/telnet.spec =================================================================== --- tinysofa/releases/1.1/telnet/current/specs/telnet.spec 2004-07-16 10:27:59 UTC (rev 3124) +++ tinysofa/releases/1.1/telnet/current/specs/telnet.spec 2004-07-16 10:35:38 UTC (rev 3125) @@ -1,7 +1,7 @@ Summary: The client for the telnet remote login protocol. Name: telnet Version: 0.17 -Release: 11ts +Release: 12jh License: BSD Group: main Source: ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/netkit-telnet-%{version}.tar.gz @@ -9,7 +9,7 @@ Source1: telnet-client.tar.gz Patch1: telnet-0.10-escapechar.patch BuildRoot: %{_tmppath}/%{name}-root -BuildRequires: libstdc++-devel ncurses-devel libtermcap-devel +BuildRequires: libstdc++-devel gcc-c++ ncurses-devel libtermcap-devel %description Telnet is a popular protocol for logging into remote systems over the @@ -129,4 +129,4 @@ - added wmconfig entry * Tue Jul 15 1997 Erik Troan -- initial build \ No newline at end of file +- initial build From svn at tinysofa.org Fri Jul 16 11:13:28 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 16 Jul 2004 21:13:28 +1000 (EST) Subject: [tinysofa-svn] r3126 - in contrib: . python-imaging python-imaging/current python-imaging/current/sources python-imaging/current/specs python-imaging/releases Message-ID: <20040716111328.8CB574E8031@minbar.tinysofa.org> Author: bg Date: 2004-07-16 21:13:28 +1000 (Fri, 16 Jul 2004) New Revision: 3126 Added: contrib/python-imaging/ contrib/python-imaging/current/ contrib/python-imaging/current/sources/ contrib/python-imaging/current/sources/Imaging-1.1.4.patch.bz2 contrib/python-imaging/current/sources/Imaging-1.1.4.tar.bz2 contrib/python-imaging/current/sources/pil-handbook.pdf.bz2 contrib/python-imaging/current/sources/python-imaging-1.1.4-freetype2.patch.bz2 contrib/python-imaging/current/specs/ contrib/python-imaging/current/specs/python-imaging.spec contrib/python-imaging/releases/ contrib/python-imaging/releases/1.1.4/ Log: added python-imaging 1.1.4-1th Added: contrib/python-imaging/current/sources/Imaging-1.1.4.patch.bz2 =================================================================== (Binary files differ) Property changes on: contrib/python-imaging/current/sources/Imaging-1.1.4.patch.bz2 ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: contrib/python-imaging/current/sources/Imaging-1.1.4.tar.bz2 =================================================================== (Binary files differ) Property changes on: contrib/python-imaging/current/sources/Imaging-1.1.4.tar.bz2 ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: contrib/python-imaging/current/sources/pil-handbook.pdf.bz2 =================================================================== (Binary files differ) Property changes on: contrib/python-imaging/current/sources/pil-handbook.pdf.bz2 ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: contrib/python-imaging/current/sources/python-imaging-1.1.4-freetype2.patch.bz2 =================================================================== (Binary files differ) Property changes on: contrib/python-imaging/current/sources/python-imaging-1.1.4-freetype2.patch.bz2 ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: contrib/python-imaging/current/specs/python-imaging.spec =================================================================== --- contrib/python-imaging/current/specs/python-imaging.spec 2004-07-16 10:35:38 UTC (rev 3125) +++ contrib/python-imaging/current/specs/python-imaging.spec 2004-07-16 11:13:28 UTC (rev 3126) @@ -0,0 +1,152 @@ +%define pyver %(python -V 2>&1 | cut -f2 -d" " | cut -f1,2 -d".") +Summary: Python's own image processing library +Name: python-imaging +Version: 1.1.4 +Release: 1th +License: MIT style +Group: tinysofa contrib +URL: http://www.pythonware.com/products/pil/ +Source0: http://www.pythonware.com/downloads/Imaging-%{version}.tar.bz2 +Source1: pil-handbook.pdf.bz2 +Patch: Imaging-1.1.4.patch.bz2 +Patch1: python-imaging-1.1.4-freetype2.patch.bz2 +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot +Requires: python >= 1.5, libjpeg >= 6b, zlib >= 1.1.2, libpng >= 1.0.1 +BuildRequires: python-devel >= 1.5, libjpeg-devel >= 6b, libpng-devel >= 1.0.1 + +%description +Python Imaging Library version %{version} + +The Python Imaging Library (PIL) adds image processing capabilities +to your Python interpreter. + +This library provides extensive file format support, an efficient +internal representation, and powerful image processing capabilities. + +%prep +%setup -q -n Imaging-%{version} +bzcat %SOURCE1 > pil-handbook.pdf + +# fix tk version +perl -p -i -e 's/8.3/8.4/g' Setup.in + +# fix distutils problem +%patch +%patch1 -p1 +# Make sure to get the right python library +perl -pi -e "s,(\\\$\((exec_prefix|prefix|exec_installdir)\)|/usr/X11R6)/lib\b,\1/%{_lib},g" Makefile.pre.in Setup.in + +# Nuke references to /usr/local +perl -pi -e "s,(-[IL]/usr/local/(include|lib)),,g" Setup.in + +%build +cd libImaging +%configure +make OPT="$RPM_OPT_FLAGS -fPIC" +cd .. +python setup.py build + +%install +rm -fr $RPM_BUILD_ROOT +python setup.py install --root=$RPM_BUILD_ROOT + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr (-,root,root) +%doc pil-handbook.pdf Scripts Images Sane CHANGES* README +%{_libdir}/python%{pyver}/site-packages/PIL.pth +%{_libdir}/python%{pyver}/site-packages/PIL/ +#%{_libdir}/python%{pyver}/lib-dynload/_imagingtk.so + +%changelog +* Fri Jul 9 2004 Tor Hveem +- Repackaged for tinysofa + +* Sun May 23 2004 Per ?yvind Karlsen 1.1.4-5mdk +- grf, fix buildrequires for real + +* Fri May 21 2004 Per ?yvind Karlsen 1.1.4-4mdk +- fix buildrequires + +* Tue Mar 2 2004 G?tz Waschk 1.1.4-3mdk +- fix build with new freetype2 + +* Wed Sep 3 2003 Frederic Lepied 1.1.4-2mdk +- fixed buildrequires for amd64 + +* Fri Aug 22 2003 Austin Acton 1.1.4-1mdk +- 1.1.4 +- drop patch (merged u/s) +- buildrequires libfreetype-devel, tkinter +- use distutils to build and install +- update handbook + +* Thu Aug 07 2003 Frederic Lepied 1.1.3-3mdk +- python 2.3 + +* Fri May 2 2003 Frederic Lepied 1.1.3-2mdk +- rebuild + +* Mon Dec 16 2002 Lenny Cartier 1.1.3-1mdk +- let patch in place ( do not replace it by perl commands ) +- from Austin Acton : + - new version + - update requires and buildrequires and files list + +* Wed Dec 4 2002 Gwenole Beauchesne 1.1.2-5mdk +- Teach it where python home is, and make sure to build static + libraries with PIC if they can be turned into a DSO + +* Wed Jan 2 2002 Frederic Lepied 1.1.2-4mdk +- rebuild for python 2.2 + +* Wed Jul 18 2001 Stefan van der Eijk 1.1.2-3mdk +- BuildRequires: XFree86-devel +- Copyright --> License +- Remove BuildRequires: zlib-devel + +* Tue Jul 17 2001 Frederic Lepied 1.1.2-2mdk +- don't provide python2.0 directory + +* Fri May 18 2001 Frederic Lepied 1.1.2-1mdk +- 1.1.2 + +* Wed Mar 28 2001 Frederic Lepied 1.1.1-2mdk +- add _imagingtk.so (#2774). +- added Requires on tkinter. + +* Wed Dec 6 2000 Frederic Lepied 1.1.1-1mdk +- 1.1.1 + +* Tue Sep 19 2000 David BAUDENS 1.1-2mdk +- Fix FredL's typo + +* Wed Sep 13 2000 Frederic Lepied 1.1-1mdk +- 1.1 + +* Thu Mar 30 2000 Frederic Lepied 1.0b1-3mdk +- group fix. + +* Mon Jan 10 2000 Lenny Cartier +- build for oxygen +- deactivate provinding of tkinter lib since Chmouel one's works perfectly + +* Mon Dec 27 1999 Lenny Cartier +- new in contribs +- bz2 archive + +* Mon Jan 11 1999 Oliver Andrich +- upgraded to Imaging 1.0b1 + +* Sun Dec 27 1998 Oliver Andrich +- changed Setup file so that the tkinter module is compiled with Tix and BLT + support + +* Mon Jul 20 1998 Oliver Andrich +- had to recompile and update the package to support the uptodate graphics + libs + +* Sat Jun 07 1998 Oliver Andrich +- updated package to version 0.3a4 From svn at tinysofa.org Fri Jul 16 11:15:21 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 16 Jul 2004 21:15:21 +1000 (EST) Subject: [tinysofa-svn] r3127 - in contrib/python-imaging: . releases/1.1.4 Message-ID: <20040716111521.50E874E8031@minbar.tinysofa.org> Author: bg Date: 2004-07-16 21:15:21 +1000 (Fri, 16 Jul 2004) New Revision: 3127 Added: contrib/python-imaging/pristine/ contrib/python-imaging/releases/1.1.4/1th/ Log: tagged python-imaging-1.1.4-1th, and made it pristine Copied: contrib/python-imaging/pristine (from rev 3126, contrib/python-imaging/current) Copied: contrib/python-imaging/releases/1.1.4/1th (from rev 3126, contrib/python-imaging/current) From svn at tinysofa.org Fri Jul 16 11:16:02 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 16 Jul 2004 21:16:02 +1000 (EST) Subject: [tinysofa-svn] r3128 - in contrib: . python-mysql python-mysql/current python-mysql/current/sources python-mysql/current/specs python-mysql/releases Message-ID: <20040716111602.ED90D4E8031@minbar.tinysofa.org> Author: bg Date: 2004-07-16 21:16:02 +1000 (Fri, 16 Jul 2004) New Revision: 3128 Added: contrib/python-mysql/ contrib/python-mysql/current/ contrib/python-mysql/current/sources/ contrib/python-mysql/current/sources/MySQL-python-1.0.0.tar.gz contrib/python-mysql/current/specs/ contrib/python-mysql/current/specs/python-mysql.spec contrib/python-mysql/releases/ contrib/python-mysql/releases/1.0.0/ Log: added python-mysql-1.0.0-2th by torh Added: contrib/python-mysql/current/sources/MySQL-python-1.0.0.tar.gz =================================================================== (Binary files differ) Property changes on: contrib/python-mysql/current/sources/MySQL-python-1.0.0.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: contrib/python-mysql/current/specs/python-mysql.spec =================================================================== --- contrib/python-mysql/current/specs/python-mysql.spec 2004-07-16 11:15:21 UTC (rev 3127) +++ contrib/python-mysql/current/specs/python-mysql.spec 2004-07-16 11:16:02 UTC (rev 3128) @@ -0,0 +1,56 @@ +%define pyver %(python -V 2>&1 | cut -f2 -d" " | cut -f1,2 -d".") + +Name: python-mysql +Version: 1.0.0 +Release: 2th +Summary: Python interface to MySQL +URL: http://sourceforge.net/projects/mysql-python +Source0: http://prdownloads.sourceforge.net/mysql-python/MySQL-python-%{version}.tar.gz +License: GPL +Group: tinysofa contrib +Requires: python >= 1.5 +BuildRequires: mysql-devel, python-devel +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot +%description +Description: Python interface to MySQL + + MySQLdb is an interface to the popular MySQL database server for Python. + The design goals are: + + - Compliance with Python database API version 2.0 + - Thread-safety + - Thread-friendliness (threads will not block each other) + - Compatibility with MySQL-3.22 and later + + This module should be mostly compatible with an older interface + written by Joe Skinner and others. However, the older version is + a) not thread-friendly, b) written for MySQL 3.21, c) apparently + not actively maintained. No code from that version is used in + MySQLdb. MySQLdb is free software. + +%prep +%setup -q -n MySQL-python-%{version} +%build +python setup.py build + +%install +rm -fr $RPM_BUILD_ROOT +python setup.py install --root=$RPM_BUILD_ROOT + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr (-,root,root) +%{_libdir}/python%{pyver}/site-packages/CompatMysqldb.py* +%dir %{_libdir}/python%{pyver}/site-packages/MySQLdb/ +%{_libdir}/python%{pyver}/site-packages/MySQLdb/* +%{_libdir}/python%{pyver}/site-packages/_mysql* +%doc README doc/* + +%changelog +* Fri Jul 16 2004 Goetz Bock 1.0.0-2th +- added python-devel as build requirement + +* Fri Jul 9 2004 Tor Hveem 1.0.0-1th +- Initial package for tinysofa From svn at tinysofa.org Fri Jul 16 11:17:14 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 16 Jul 2004 21:17:14 +1000 (EST) Subject: [tinysofa-svn] r3129 - in contrib/python-mysql: . releases/1.0.0 Message-ID: <20040716111714.8BD6E4E8031@minbar.tinysofa.org> Author: bg Date: 2004-07-16 21:17:14 +1000 (Fri, 16 Jul 2004) New Revision: 3129 Added: contrib/python-mysql/pristine/ contrib/python-mysql/releases/1.0.0/2th/ Log: tagged python-mysql-1.0.0-2th as release and pristine Copied: contrib/python-mysql/pristine (from rev 3128, contrib/python-mysql/current) Copied: contrib/python-mysql/releases/1.0.0/2th (from rev 3128, contrib/python-mysql/current) From svn at tinysofa.org Fri Jul 16 11:32:46 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 16 Jul 2004 21:32:46 +1000 (EST) Subject: [tinysofa-svn] r3130 - in contrib: . ddrescue ddrescue/current ddrescue/current/sources ddrescue/current/specs ddrescue/releases Message-ID: <20040716113246.4BA8C4E8031@minbar.tinysofa.org> Author: bg Date: 2004-07-16 21:32:46 +1000 (Fri, 16 Jul 2004) New Revision: 3130 Added: contrib/ddrescue/ contrib/ddrescue/current/ contrib/ddrescue/current/sources/ contrib/ddrescue/current/sources/dd_rescue-1.03-make.patch contrib/ddrescue/current/sources/dd_rescue-1.03.tar.gz contrib/ddrescue/current/specs/ contrib/ddrescue/current/specs/ddrescue.spec contrib/ddrescue/releases/ contrib/ddrescue/releases/1.03/ Log: added ddrescue 1.03-1bg Added: contrib/ddrescue/current/sources/dd_rescue-1.03-make.patch =================================================================== --- contrib/ddrescue/current/sources/dd_rescue-1.03-make.patch 2004-07-16 11:17:14 UTC (rev 3129) +++ contrib/ddrescue/current/sources/dd_rescue-1.03-make.patch 2004-07-16 11:32:46 UTC (rev 3130) @@ -0,0 +1,12 @@ +--- dd_rescue/Makefile.orig 2004-07-16 15:28:20.000000000 +0200 ++++ dd_rescue/Makefile 2004-07-16 15:28:40.000000000 +0200 +@@ -36,6 +36,6 @@ + + install: $(TARGETS) + mkdir -p $(INSTALLDIR) +- $(INSTALL) $(INSTALLFLAGS) -o root -g root -m 755 $(TARGETS) $(INSTALLDIR) +- #$(INSTALL) -o root -g root -m 755 -d $(DOCDIR)/dd_rescue +- #$(INSTALL) -o root -g root -m 644 README.dd_rescue $(DOCDIR)/dd_rescue/ ++ $(INSTALL) $(INSTALLFLAGS) -m 755 $(TARGETS) $(INSTALLDIR) ++ #$(INSTALL) -m 755 -d $(DOCDIR)/dd_rescue ++ #$(INSTALL) -m 644 README.dd_rescue $(DOCDIR)/dd_rescue/ Added: contrib/ddrescue/current/sources/dd_rescue-1.03.tar.gz =================================================================== (Binary files differ) Property changes on: contrib/ddrescue/current/sources/dd_rescue-1.03.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: contrib/ddrescue/current/specs/ddrescue.spec =================================================================== --- contrib/ddrescue/current/specs/ddrescue.spec 2004-07-16 11:17:14 UTC (rev 3129) +++ contrib/ddrescue/current/specs/ddrescue.spec 2004-07-16 11:32:46 UTC (rev 3130) @@ -0,0 +1,49 @@ +Name: ddrescue +Version: 1.03 +Release: 1bg +License: GPL +Group: tinysofa contrib +Summary: Data copying in presence of I/O errors +Source: http://www.garloff.de/kurt/linux/ddrescue/dd_rescue-%{version}.tar.gz +Patch: dd_rescue-1.03-make.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-build + +%description +dd_rescue helps, when nobody else will: +Your disk has crashed and you try to copy it over to another one. +Standard Un*x tools like cp, cat, dd wail abort on every I/O error. +dd_rescue won't. + + +%prep +%setup -n dd_rescue +%patch -p1 + +%build +make + + +%install +[ -n "%{buildroot}" -a "%{buildroot}" != / ] && rm -rf %{buildroot} +make install DESTDIR=$RPM_BUILD_ROOT + + +%files +%doc README.dd_rescue +/bin/dd_rescue + + +%clean +[ -n "%{buildroot}" -a "%{buildroot}" != / ] && rm -rf %{buildroot} + + +%changelog -n ddrescue +* Fri Jul 16 2004 Goetz Bock 1.03-1bg +- build for tinysofa contrib +- added patch to build as none root +- based on spec file from the original source + +* Tue Dec 02 2003 - garloff at suse.de +- Release dd_rescue-1.03: + * End report in case of error abort. Needed for LAB Valentins + dd_rhelp script. From svn at tinysofa.org Fri Jul 16 11:33:22 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 16 Jul 2004 21:33:22 +1000 (EST) Subject: [tinysofa-svn] r3131 - in contrib/ddrescue: . releases/1.03 Message-ID: <20040716113322.1E91E4E8031@minbar.tinysofa.org> Author: bg Date: 2004-07-16 21:33:21 +1000 (Fri, 16 Jul 2004) New Revision: 3131 Added: contrib/ddrescue/pristine/ contrib/ddrescue/releases/1.03/1bg/ Log: tagged ddrescue-1.03-1bg and pristine Copied: contrib/ddrescue/pristine (from rev 3130, contrib/ddrescue/current) Copied: contrib/ddrescue/releases/1.03/1bg (from rev 3130, contrib/ddrescue/current) From svn at tinysofa.org Fri Jul 16 12:12:50 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 16 Jul 2004 22:12:50 +1000 (EST) Subject: [tinysofa-svn] r3132 - tinysofa/releases/1.1/gmp/current/specs Message-ID: <20040716121250.639E34E8031@minbar.tinysofa.org> Author: jh Date: 2004-07-16 22:12:50 +1000 (Fri, 16 Jul 2004) New Revision: 3132 Modified: tinysofa/releases/1.1/gmp/current/specs/gmp.spec Log: - BuildRequires: gcc-c++ Modified: tinysofa/releases/1.1/gmp/current/specs/gmp.spec =================================================================== --- tinysofa/releases/1.1/gmp/current/specs/gmp.spec 2004-07-16 11:33:21 UTC (rev 3131) +++ tinysofa/releases/1.1/gmp/current/specs/gmp.spec 2004-07-16 12:12:50 UTC (rev 3132) @@ -23,7 +23,7 @@ License: LGPL Group: extra BuildRoot: %{_tmppath}/%{name}-%{version}-root -BuildRequires: automake autoconf libtool +BuildRequires: automake autoconf libtool gcc-c++ %info_requires %description From svn at tinysofa.org Fri Jul 16 12:15:20 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 16 Jul 2004 22:15:20 +1000 (EST) Subject: [tinysofa-svn] r3133 - tinysofa/releases/1.1/ipsec-tools/current/specs Message-ID: <20040716121520.A4B9D4E8031@minbar.tinysofa.org> Author: jh Date: 2004-07-16 22:15:20 +1000 (Fri, 16 Jul 2004) New Revision: 3133 Modified: tinysofa/releases/1.1/ipsec-tools/current/specs/ipsec-tools.spec Log: - BR: flex, bison Modified: tinysofa/releases/1.1/ipsec-tools/current/specs/ipsec-tools.spec =================================================================== --- tinysofa/releases/1.1/ipsec-tools/current/specs/ipsec-tools.spec 2004-07-16 12:12:50 UTC (rev 3132) +++ tinysofa/releases/1.1/ipsec-tools/current/specs/ipsec-tools.spec 2004-07-16 12:15:20 UTC (rev 3133) @@ -1,9 +1,9 @@ Name: ipsec-tools Version: 0.2.5 -Release: 3ts +Release: 1jh Summary: Tools for configuring and using IPSEC License: BSD -Group: System Environment/Base +Group: main URL: http://ipsec-tools.sourceforge.net/ Source: http://prdownload.sourceforge.net/ipsec-tools/ipsec-tools-%{version}.tar.gz Source1: ipsec.h @@ -13,9 +13,9 @@ Source5: xfrm.h Patch: ipsec-tools-0.2.4-racoon-dest.patch Patch2: isakmp.c.diff -BuildPrereq: openssl-devel, krb5-devel +BuildPrereq: openssl-devel, kerberos5-devel, flex, bison BuildRoot: %{_tmppath}/%{name}-%{version}-root -Requires: initscripts >= 7.31.11.EL-1 +Requires: initscripts >= 7.31 %description This is the IPsec-Tools package. You need this package in order to @@ -62,7 +62,7 @@ mkdir -m 0700 -p $RPM_BUILD_ROOT/etc/racoon/certs %clean -rm -rf $RPM_BUILD_ROOT +%clean_buildroot %post -p /sbin/ldconfig From svn at tinysofa.org Fri Jul 16 12:38:33 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 16 Jul 2004 22:38:33 +1000 (EST) Subject: [tinysofa-svn] r3134 - tinysofa/releases/1.1/release/current/specs Message-ID: <20040716123833.C81564E8031@minbar.tinysofa.org> Author: jh Date: 2004-07-16 22:38:33 +1000 (Fri, 16 Jul 2004) New Revision: 3134 Modified: tinysofa/releases/1.1/release/current/specs/release.spec Log: - add test to release Modified: tinysofa/releases/1.1/release/current/specs/release.spec =================================================================== --- tinysofa/releases/1.1/release/current/specs/release.spec 2004-07-16 12:15:20 UTC (rev 3133) +++ tinysofa/releases/1.1/release/current/specs/release.spec 2004-07-16 12:38:33 UTC (rev 3134) @@ -15,11 +15,14 @@ # satisfy rpm %install +RELEASE_NAME="Rio" +VERSION="%{version} test1" + mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir} -echo "tinysofa enterprise server release %{version} (%{release_name})" \ +echo "tinysofa enterprise server release $VERSION ($RELEASE_NAME)" \ > $RPM_BUILD_ROOT/etc/release cat << __EOF__ > $RPM_BUILD_ROOT/%{_sysconfdir}/issue -tinysofa enterprise server release %{version} (%{release_name}) +tinysofa enterprise server release $VERSION ($RELEASE_NAME) Kernel \r on an \m __EOF__ From svn at tinysofa.org Fri Jul 16 12:39:34 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 16 Jul 2004 22:39:34 +1000 (EST) Subject: [tinysofa-svn] r3135 - tinysofa/releases/1.1/libuser/current/specs Message-ID: <20040716123934.2736A4E8031@minbar.tinysofa.org> Author: jh Date: 2004-07-16 22:39:33 +1000 (Fri, 16 Jul 2004) New Revision: 3135 Modified: tinysofa/releases/1.1/libuser/current/specs/libuser.spec Log: - BR autoconf Modified: tinysofa/releases/1.1/libuser/current/specs/libuser.spec =================================================================== --- tinysofa/releases/1.1/libuser/current/specs/libuser.spec 2004-07-16 12:38:33 UTC (rev 3134) +++ tinysofa/releases/1.1/libuser/current/specs/libuser.spec 2004-07-16 12:39:33 UTC (rev 3135) @@ -10,7 +10,7 @@ Patch1: libuser-0.51.7.sasl2.patch Patch2: libuser-0.51.7-docs.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root -BuildPrereq: pam-devel, popt, python-devel +BuildPrereq: pam-devel, popt, python-devel, autoconf BuildPrereq: cyrus-sasl-devel, openldap-devel Summary: A user and group account administration library. From svn at tinysofa.org Fri Jul 16 12:50:02 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 16 Jul 2004 22:50:02 +1000 (EST) Subject: [tinysofa-svn] r3136 - tinysofa/releases/1.1/mod_php4/current/specs Message-ID: <20040716125002.842654E8031@minbar.tinysofa.org> Author: jh Date: 2004-07-16 22:50:02 +1000 (Fri, 16 Jul 2004) New Revision: 3136 Modified: tinysofa/releases/1.1/mod_php4/current/specs/mod_php4.spec Log: - BR: pkgconfig openssl-devel Modified: tinysofa/releases/1.1/mod_php4/current/specs/mod_php4.spec =================================================================== --- tinysofa/releases/1.1/mod_php4/current/specs/mod_php4.spec 2004-07-16 12:39:33 UTC (rev 3135) +++ tinysofa/releases/1.1/mod_php4/current/specs/mod_php4.spec 2004-07-16 12:50:02 UTC (rev 3136) @@ -22,7 +22,7 @@ BuildRequires: cyrus-imapd-devel, libpng-devel, libjpeg-devel BuildRequires: cyrus-sasl-devel, readline-devel, db4-devel BuildRequires: rpm-build >= 4.0.4-22gd pam-devel ncurses-devel -BuildRequires: pcre-devel +BuildRequires: pcre-devel pkgconfig openssl-devel Provides: php = %{version} %if !%{_openssl_shared} Obsoletes: mod_php4-openssl From svn at tinysofa.org Fri Jul 16 12:56:36 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 16 Jul 2004 22:56:36 +1000 (EST) Subject: [tinysofa-svn] r3137 - in contrib: . cvs cvs/current cvs/current/sources cvs/current/specs cvs/releases Message-ID: <20040716125636.081024E8031@minbar.tinysofa.org> Author: bg Date: 2004-07-16 22:56:35 +1000 (Fri, 16 Jul 2004) New Revision: 3137 Added: contrib/cvs/ contrib/cvs/current/ contrib/cvs/current/sources/ contrib/cvs/current/sources/cvs-1.11.16-extzlib.patch contrib/cvs/current/sources/cvs-1.11.17.tar.bz2 contrib/cvs/current/sources/cvs-1.11.1p1-authserver.patch contrib/cvs/current/sources/cvs-1.11.1p1-bs.patch contrib/cvs/current/sources/cvs-1.11.2-abortabort.patch contrib/cvs/current/sources/cvs-1.11.2-cvspass.patch contrib/cvs/current/specs/ contrib/cvs/current/specs/cvs.spec contrib/cvs/releases/ contrib/cvs/releases/1.11.17/ Log: added cvs 1.11.17-1bg Added: contrib/cvs/current/sources/cvs-1.11.16-extzlib.patch =================================================================== --- contrib/cvs/current/sources/cvs-1.11.16-extzlib.patch 2004-07-16 12:50:02 UTC (rev 3136) +++ contrib/cvs/current/sources/cvs-1.11.16-extzlib.patch 2004-07-16 12:56:35 UTC (rev 3137) @@ -0,0 +1,144 @@ +diff -urN cvs-1.11.16/Makefile.am cvs-1.11.16-extzlib/Makefile.am +--- cvs-1.11.16/Makefile.am 2004-05-19 14:54:03.000000000 +0200 ++++ cvs-1.11.16-extzlib/Makefile.am 2004-05-29 17:47:07.000000000 +0200 +@@ -17,7 +17,7 @@ + ## Subdirectories to run make in for the primary targets. + # Unix source subdirs, where we'll want to run lint and etags: + # This is a legacy variable from b4 Automake +-USOURCE_SUBDIRS = lib zlib diff src ++USOURCE_SUBDIRS = lib diff src + # All other subdirs: + SUBDIRS = $(USOURCE_SUBDIRS) man doc contrib tools \ + windows-NT os2 emx vms +diff -urN cvs-1.11.16/Makefile.in cvs-1.11.16-extzlib/Makefile.in +--- cvs-1.11.16/Makefile.in 2004-05-19 16:05:42.000000000 +0200 ++++ cvs-1.11.16-extzlib/Makefile.in 2004-05-29 17:47:43.000000000 +0200 +@@ -142,7 +142,7 @@ + + # Unix source subdirs, where we'll want to run lint and etags: + # This is a legacy variable from b4 Automake +-USOURCE_SUBDIRS = lib zlib diff src ++USOURCE_SUBDIRS = lib diff src + # All other subdirs: + SUBDIRS = $(USOURCE_SUBDIRS) man doc contrib tools \ + windows-NT os2 emx vms +@@ -172,7 +172,7 @@ + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = config.h +-CONFIG_CLEAN_FILES = cvs.spec emx/Makefile os2/Makefile zlib/Makefile ++CONFIG_CLEAN_FILES = cvs.spec emx/Makefile os2/Makefile + DIST_SOURCES = + + RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ +@@ -184,7 +184,7 @@ + COPYING COPYING.LIB ChangeLog INSTALL Makefile.am NEWS TODO \ + acinclude.m4 aclocal.m4 compile config.h.in configure \ + configure.in cvs.spec.in depcomp install-sh mdate-sh missing \ +- mkinstalldirs ++ mkinstalldirs config.guess config.sub ltmain.sh + DIST_SUBDIRS = $(SUBDIRS) + all: config.h + $(MAKE) $(AM_MAKEFLAGS) all-recursive +@@ -229,8 +229,6 @@ + cd $(top_builddir) && $(SHELL) ./config.status $@ + os2/Makefile: $(top_builddir)/config.status $(top_srcdir)/os2/Makefile.in + cd $(top_builddir) && $(SHELL) ./config.status $@ +-zlib/Makefile: $(top_builddir)/config.status $(top_srcdir)/zlib/Makefile.in +- cd $(top_builddir) && $(SHELL) ./config.status $@ + uninstall-info-am: + + # This directory's subdirectories are mostly independent; you can cd +@@ -373,7 +371,7 @@ + distdir: $(DISTFILES) + $(am__remove_distdir) + mkdir $(distdir) +- $(mkinstalldirs) $(distdir)/. $(distdir)/contrib $(distdir)/doc $(distdir)/emx $(distdir)/os2 $(distdir)/src $(distdir)/windows-NT $(distdir)/zlib ++ $(mkinstalldirs) $(distdir)/. $(distdir)/contrib $(distdir)/doc $(distdir)/emx $(distdir)/os2 $(distdir)/src $(distdir)/windows-NT + @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ + list='$(DISTFILES)'; for file in $$list; do \ +diff -urN cvs-1.11.16/configure cvs-1.11.16-extzlib/configure +--- cvs-1.11.16/configure 2004-05-18 22:35:43.000000000 +0200 ++++ cvs-1.11.16-extzlib/configure 2004-05-29 17:47:07.000000000 +0200 +@@ -11558,7 +11558,7 @@ + ac_config_files="$ac_config_files windows-NT/fix-msvc-mak:windows-NT/fix-msvc-mak-head.pl:windows-NT/fix-msvc-mak.pl" + + +- ac_config_files="$ac_config_files Makefile contrib/Makefile cvs.spec diff/Makefile doc/Makefile emx/Makefile lib/Makefile man/Makefile os2/Makefile src/Makefile tools/Makefile vms/Makefile windows-NT/Makefile windows-NT/SCC/Makefile zlib/Makefile" ++ ac_config_files="$ac_config_files Makefile contrib/Makefile cvs.spec diff/Makefile doc/Makefile emx/Makefile lib/Makefile man/Makefile os2/Makefile src/Makefile tools/Makefile vms/Makefile windows-NT/Makefile windows-NT/SCC/Makefile" + + + cat >confcache <<\_ACEOF +@@ -12156,7 +12156,6 @@ + "vms/Makefile" ) CONFIG_FILES="$CONFIG_FILES vms/Makefile" ;; + "windows-NT/Makefile" ) CONFIG_FILES="$CONFIG_FILES windows-NT/Makefile" ;; + "windows-NT/SCC/Makefile" ) CONFIG_FILES="$CONFIG_FILES windows-NT/SCC/Makefile" ;; +- "zlib/Makefile" ) CONFIG_FILES="$CONFIG_FILES zlib/Makefile" ;; + "lib/fnmatch.h" ) CONFIG_LINKS="$CONFIG_LINKS lib/fnmatch.h:lib/fnmatch.h.in" ;; + "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; + "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; +diff -urN cvs-1.11.16/configure.in cvs-1.11.16-extzlib/configure.in +--- cvs-1.11.16/configure.in 2004-05-18 22:34:49.000000000 +0200 ++++ cvs-1.11.16-extzlib/configure.in 2004-05-29 17:47:07.000000000 +0200 +@@ -1039,8 +1039,7 @@ + tools/Makefile \ + vms/Makefile \ + windows-NT/Makefile \ +- windows-NT/SCC/Makefile \ +- zlib/Makefile]) ++ windows-NT/SCC/Makefile]) + + dnl and we're done + AC_OUTPUT +diff -urN cvs-1.11.16/src/Makefile.am cvs-1.11.16-extzlib/src/Makefile.am +--- cvs-1.11.16/src/Makefile.am 2004-02-03 20:05:36.000000000 +0100 ++++ cvs-1.11.16-extzlib/src/Makefile.am 2004-05-29 17:47:07.000000000 +0200 +@@ -22,7 +22,7 @@ + # try and remove naming ocnflicts and fix Automake to allow particular includes + # to be attached only to particular object files. Short term fix is either or. + ##INCLUDES = -I. -I.. -I$(srcdir) -I$(top_srcdir)/lib +-INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/diff -I$(top_srcdir)/zlib $(includeopt) ++INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/diff $(includeopt) + + bin_PROGRAMS = cvs + bin_SCRIPTS = cvsbug +@@ -103,7 +103,7 @@ + cvs_LDADD = \ + ../diff/libdiff.a \ + ../lib/libcvs.a \ +- ../zlib/libz.a ++ -lz + + # extra clean targets + # wish this could be distclean-hdr-local but it's not part of automake +diff -urN cvs-1.11.16/src/Makefile.in cvs-1.11.16-extzlib/src/Makefile.in +--- cvs-1.11.16/src/Makefile.in 2004-05-19 16:05:47.000000000 +0200 ++++ cvs-1.11.16-extzlib/src/Makefile.in 2004-05-29 17:47:07.000000000 +0200 +@@ -146,7 +146,7 @@ + # some namespace hackery going on that maybe shouldn't be. Long term fix is to + # try and remove naming ocnflicts and fix Automake to allow particular includes + # to be attached only to particular object files. Short term fix is either or. +-INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/diff -I$(top_srcdir)/zlib $(includeopt) ++INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/diff $(includeopt) + + bin_PROGRAMS = cvs + bin_SCRIPTS = cvsbug +@@ -228,7 +228,7 @@ + cvs_LDADD = \ + ../diff/libdiff.a \ + ../lib/libcvs.a \ +- ../zlib/libz.a ++ -lz + + + # extra clean targets +@@ -272,7 +272,7 @@ + vers_ts.$(OBJEXT) watch.$(OBJEXT) wrapper.$(OBJEXT) \ + zlib.$(OBJEXT) + cvs_OBJECTS = $(am_cvs_OBJECTS) +-cvs_DEPENDENCIES = ../diff/libdiff.a ../lib/libcvs.a ../zlib/libz.a ++cvs_DEPENDENCIES = ../diff/libdiff.a ../lib/libcvs.a + cvs_LDFLAGS = + SCRIPTS = $(bin_SCRIPTS) + Added: contrib/cvs/current/sources/cvs-1.11.17.tar.bz2 =================================================================== (Binary files differ) Property changes on: contrib/cvs/current/sources/cvs-1.11.17.tar.bz2 ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: contrib/cvs/current/sources/cvs-1.11.1p1-authserver.patch =================================================================== --- contrib/cvs/current/sources/cvs-1.11.1p1-authserver.patch 2004-07-16 12:50:02 UTC (rev 3136) +++ contrib/cvs/current/sources/cvs-1.11.1p1-authserver.patch 2004-07-16 12:56:35 UTC (rev 3137) @@ -0,0 +1,35 @@ +--- cvs-1.11.1p1/src/server.c.authserver Thu Apr 19 15:34:04 2001 ++++ cvs-1.11.1p1/src/server.c Tue Jun 19 17:37:04 2001 +@@ -95,27 +95,31 @@ + #include + #endif /* HAVE_INITGROUPS */ + +-# ifdef AUTH_SERVER_SUPPORT ++# if defined (HAVE_KERBEROS) || defined (AUTH_SERVER_SUPPORT) || defined (HAVE_GSSAPI) + + # ifdef HAVE_GETSPNAM + # include + # endif + + /* The cvs username sent by the client, which might or might not be + the same as the system username the server eventually switches to + run as. CVS_Username gets set iff password authentication is + successful. */ + char *CVS_Username = NULL; ++ ++# ifdef AUTH_SERVER_SUPPORT + + /* Used to check that same repos is transmitted in pserver auth and in + later CVS protocol. Exported because root.c also uses. */ + static char *Pserver_Repos = NULL; + + /* Should we check for system usernames/passwords? Can be changed by + CVSROOT/config. */ + int system_auth = 1; + + # endif /* AUTH_SERVER_SUPPORT */ ++ ++#endif /* HAVE_KERBEROS || AUTH_SERVER_SUPPORT || HAVE_GSSAPI */ + + + /* While processing requests, this buffer accumulates data to be sent to Added: contrib/cvs/current/sources/cvs-1.11.1p1-bs.patch =================================================================== --- contrib/cvs/current/sources/cvs-1.11.1p1-bs.patch 2004-07-16 12:50:02 UTC (rev 3136) +++ contrib/cvs/current/sources/cvs-1.11.1p1-bs.patch 2004-07-16 12:56:35 UTC (rev 3137) @@ -0,0 +1,11 @@ +--- cvs-1.11.1p1/src/sanity.sh.bs Tue Jul 31 18:40:35 2001 ++++ cvs-1.11.1p1/src/sanity.sh Tue Jul 31 18:41:28 2001 +@@ -18,6 +18,8 @@ + # + # Original Author: K. Richard Pixley + ++exit 0 ++ + # usage: + exit_usage () + { Added: contrib/cvs/current/sources/cvs-1.11.2-abortabort.patch =================================================================== --- contrib/cvs/current/sources/cvs-1.11.2-abortabort.patch 2004-07-16 12:50:02 UTC (rev 3136) +++ contrib/cvs/current/sources/cvs-1.11.2-abortabort.patch 2004-07-16 12:56:35 UTC (rev 3137) @@ -0,0 +1,74 @@ +diff -ru cvs-1.11.2/src/main.c cvs-1.11.2.new/src/main.c +--- cvs-1.11.2/src/main.c Tue Mar 19 14:15:45 2002 ++++ cvs-1.11.2.new/src/main.c Tue Jun 4 10:05:03 2002 +@@ -346,6 +346,13 @@ + const char *name; + char temp[10]; + ++#ifdef SIGABRT ++ /* Need to deregister the SIGABRT handler so that if an assertion ++ fails and calls abort while we're cleaning up, we won't ++ infinitely recurse in the cleanup function. */ ++ SIG_deregister(SIGABRT, main_cleanup); ++#endif ++ + switch (sig) + { + #ifdef SIGABRT +diff -ru cvs-1.11.2/src/patch.c cvs-1.11.2.new/src/patch.c +--- cvs-1.11.2/src/patch.c Tue Jun 4 10:11:30 2002 ++++ cvs-1.11.2.new/src/patch.c Tue Jun 4 10:06:45 2002 +@@ -792,6 +792,15 @@ + called from a signal handler, without SIG_begincrsect, so + we don't know whether the files got created. */ + ++#ifndef DONT_USE_SIGNALS ++#ifdef SIGABRT ++ /* Need to deregister the SIGABRT handler so that if an assertion ++ fails and calls abort while we're cleaning up, we won't ++ infinitely recurse in the cleanup function. */ ++ SIG_deregister(SIGABRT, patch_cleanup); ++#endif ++#endif /* !DONT_USE_SIGNALS */ ++ + if (tmpfile1 != NULL) + { + if (unlink_file (tmpfile1) < 0 +diff -ru cvs-1.11.2/src/rcs.c cvs-1.11.2.new/src/rcs.c +--- cvs-1.11.2/src/rcs.c Tue Mar 19 14:15:45 2002 ++++ cvs-1.11.2.new/src/rcs.c Tue Jun 4 10:07:15 2002 +@@ -8234,6 +8234,15 @@ + called from a signal handler, so we don't know whether the + files got created. */ + ++#ifndef DONT_USE_SIGNALS ++#ifdef SIGABRT ++ /* Need to deregister the SIGABRT handler so that if an assertion ++ fails and calls abort while we're cleaning up, we won't ++ infinitely recurse in the cleanup function. */ ++ SIG_deregister(SIGABRT, rcs_cleanup); ++#endif ++#endif /* !DONT_USE_SIGNALS */ ++ + /* FIXME: Do not perform buffered I/O from an interrupt handler like + this (via error). However, I'm leaving the error-calling code there + in the hope that on the rare occasion the error call is actually made +diff -ru cvs-1.11.2/src/server.c cvs-1.11.2.new/src/server.c +--- cvs-1.11.2/src/server.c Tue Jun 4 10:11:30 2002 ++++ cvs-1.11.2.new/src/server.c Tue Jun 4 10:07:51 2002 +@@ -4875,6 +4875,15 @@ + int status; + int save_noexec; + ++#ifndef DONT_USE_SIGNALS ++#ifdef SIGABRT ++ /* Need to deregister the SIGABRT handler so that if an assertion ++ fails and calls abort while we're cleaning up, we won't ++ infinitely recurse in the cleanup function. */ ++ SIG_deregister(SIGABRT, server_cleanup); ++#endif ++#endif /* !DONT_USE_SIGNALS */ ++ + if (buf_to_net != NULL) + { + /* Since we're done, go ahead and put BUF_TO_NET back into blocking Added: contrib/cvs/current/sources/cvs-1.11.2-cvspass.patch =================================================================== --- contrib/cvs/current/sources/cvs-1.11.2-cvspass.patch 2004-07-16 12:50:02 UTC (rev 3136) +++ contrib/cvs/current/sources/cvs-1.11.2-cvspass.patch 2004-07-16 12:56:35 UTC (rev 3137) @@ -0,0 +1,29 @@ +--- cvs-1.11.2/src/login.c Thu May 9 13:56:04 2002 ++++ cvs-1.11.2/src/login.c Thu May 9 13:55:59 2002 +@@ -322,6 +322,15 @@ + fp = CVS_FOPEN (passfile, "r"); + if (fp == NULL) + { ++ fp = CVS_FOPEN (passfile, "w"); ++ if (fp != NULL) ++ { ++ fclose (fp); ++ fp = CVS_FOPEN (passfile, "r"); ++ } ++ } ++ if (fp == NULL) ++ { + error (0, errno, "warning: failed to open %s for reading", passfile); + goto process; + } +--- cvs-1.11.2/src/logmsg.c Fri Sep 14 13:12:10 2001 ++++ cvs-1.11.2/src/logmsg.c Thu May 9 11:44:54 2002 +@@ -262,7 +262,7 @@ + } + + (void) fprintf (fp, +- "%s----------------------------------------------------------------------\n", ++ "\n%s----------------------------------------------------------------------\n", + CVSEDITPREFIX); + (void) fprintf (fp, + "%sEnter Log. Lines beginning with `%.*s' are removed automatically\n%s\n", Added: contrib/cvs/current/specs/cvs.spec =================================================================== --- contrib/cvs/current/specs/cvs.spec 2004-07-16 12:50:02 UTC (rev 3136) +++ contrib/cvs/current/specs/cvs.spec 2004-07-16 12:56:35 UTC (rev 3137) @@ -0,0 +1,158 @@ +Summary: A version control system. +Name: cvs +Version: 1.11.17 +Release: 1bg +License: GPL +Group: tinysofa contrib +Source: https://ccvs.cvshome.org/files/documents/19/191/cvs-1.11.17.tar.bz2 +URL: https://www.cvshome.org/ +Patch0: cvs-1.11.1p1-authserver.patch +Patch1: cvs-1.11.2-cvspass.patch +Patch2: cvs-1.11.1p1-bs.patch +Patch3: cvs-1.11.2-abortabort.patch +Patch4: cvs-1.11.16-extzlib.patch +Requires: htmlinfo, vim +BuildRequires: zlib-devel, texinfo, tcsh, vim +#%{!?nokerberos:BuildPrereq: krb5-devel} +Prefix: %{_prefix} +Buildroot: %{_tmppath}/%{name}-root + +%description +CVS (Concurrent Version System) is a version control system that can +record the history of your files (usually, but not always, source +code). CVS only stores the differences between versions, instead of +every version of every file you have ever created. CVS also keeps a log +of who, when, and why changes occurred. + +CVS is very helpful for managing releases and controlling the +concurrent editing of source files among multiple authors. Instead of +providing version control for a collection of files in a single +directory, CVS provides version control for a hierarchical collection +of directories consisting of revision controlled files. These +directories and files can then be combined together to form a software +release. + + +%package contrib +Summary: code scripts contributed for cvs +Group: tinysofa contrib +Requires: cvs = %{version}-%{release} + +%description contrib +The contrib package contains code/scripts that were sent to the cvs +maintainers by contributors around the world. They are unsupported and +you might not even work. + +USE AT YOUR OWN RISK -- and all that stuff. + + +%prep +%setup -q +%patch0 -p1 -b .authserver +%patch1 -p1 -b .cvspass +%patch2 -p1 -b .bs +%patch3 -p1 -b .extzlib +%patch4 -p1 -b .abortabort + + +%build +%configure --without-gssapi +make LDFLAGS=-s + +if [ `id -u` -ne 0 ] ; then + make check +fi + +cd doc +makeinfo --html --no-split cvs.texinfo +makeinfo --html --no-split cvsclient.texi + + +%install +[ -n "%{buildroot}" -a "%{buildroot}" != / ] && rm -rf %{buildroot} +make install DESTDIR=%{buildroot} + +install -d -m 755 %{buildroot}/%{_datadir}/html/%{name}/ +install -m 644 doc/%{name}.html %{buildroot}/%{_datadir}/html/%{name}/ +install -d -m 755 %{buildroot}/%{_datadir}/html/cvsclient/ +install -m 644 doc/cvsclient.html %{buildroot}/%{_datadir}/html/cvsclient/ + +# remove documentation from install root +rm %{buildroot}%{_datadir}/%{name}/contrib/README +rm %{buildroot}%{_datadir}/%{name}/contrib/intro.doc +# remove info pages +rm -r %{buildroot}%{_infodir} + +%clean +[ -n "%{buildroot}" -a "%{buildroot}" != / ] && rm -rf %{buildroot} + +%post +/usr/sbin/htmlinfo_update.sh + +%preun +/usr/sbin/htmlinfo_update.sh + +%files +%defattr(-,root,root) +%doc AUTHORS BUGS COPYING* DEVEL-CVS FAQ HACKING MINOR-BUGS NEWS +%doc PROJECTS TODO README +%{_bindir}/cvs +%{_bindir}/cvsbug +%{_mandir}/*/* +%{_datadir}/html/%{name}/* +%{_datadir}/html/cvsclient/* + +%files contrib +%defattr(-,root,root) +%doc contrib/README contrib/intro.doc +%{_bindir}/rcs2log +%{_datadir}/%{name} + + + +%changelog +* Fri Jul 16 2004 Goetz Bock 1.11.17-1bg +- new upstream: 1.11.17 + +* Sat May 29 2004 Goetz Bock 1.11.16-1bg +- new upstream: 1.11.16 +- build for tinysofa contrib +- specfile cleanups, fixed extzlib patch + +* Mon Mar 8 2004 Chr. Toldnes +- Rebuilt for TSL 2.1 + +* Mon Dec 15 2003 Goetz Bock 1.11.10-1bg +- new upstream: 1.11.10, sec fixes + +* Tue Dec 9 2003 Goetz Bock 1.11.9-1bg +- new upstream: 1.11.9 + +* Mon Aug 18 2003 Goetz Bock 1.11.6-3bg +- requires (t)csh to build correectly + +* Mon Aug 18 2003 Goetz Bock 1.11.6-2bg +- rebuild for Cloud (aka Trustix 2.0) - Contrib + +* Mon Jul 21 2003 Goetz Bock 1.11.6-1bg +- new upstream: 1.11.6 +- removed patch0 (cvs-1.11.2-mktemp.patch) and + patch1 (cvs-1.11.5-krb4.patch) as they are now included in the src. +- split contrib stuff into own package (as it needs csh) + +* Sun Feb 24 2003 Goetz Bock 1.11.5-5bg +- build on TSL1.5, try to cheat with noauto* script + +* Mon Dec 16 2002 Goetz Bock 1.11.5-4bg +- listen to Shime: cvsclient got own html directory +- removed .ps files (we have .html and manpages) + +* Mon Dec 16 2002 Goetz Bock 1.11.5-3bg +- fixed stupid typo + +* Mon Dec 16 2002 Goetz Bock 1.11.5-2bg +- changed info to htmlinfo + +* Tue Jun 25 2002 Goetz Bock 1.11.5-1bg +- rebuild for Trustiix Secure Linux +- based on some version after 1.11.2-3 from readhat.com From svn at tinysofa.org Fri Jul 16 12:57:50 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 16 Jul 2004 22:57:50 +1000 (EST) Subject: [tinysofa-svn] r3138 - in contrib: . python-openssl python-openssl/current python-openssl/current/sources python-openssl/current/specs Message-ID: <20040716125750.DB9294E8031@minbar.tinysofa.org> Author: bg Date: 2004-07-16 22:57:50 +1000 (Fri, 16 Jul 2004) New Revision: 3138 Added: contrib/python-openssl/ contrib/python-openssl/current/ contrib/python-openssl/current/sources/ contrib/python-openssl/current/sources/pyOpenSSL-0.5.1.tar.bz2 contrib/python-openssl/current/specs/ contrib/python-openssl/current/specs/python-openssl.spec Log: added python-openssl-0.5.1-3th Added: contrib/python-openssl/current/sources/pyOpenSSL-0.5.1.tar.bz2 =================================================================== (Binary files differ) Property changes on: contrib/python-openssl/current/sources/pyOpenSSL-0.5.1.tar.bz2 ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: contrib/python-openssl/current/specs/python-openssl.spec =================================================================== --- contrib/python-openssl/current/specs/python-openssl.spec 2004-07-16 12:56:35 UTC (rev 3137) +++ contrib/python-openssl/current/specs/python-openssl.spec 2004-07-16 12:57:50 UTC (rev 3138) @@ -0,0 +1,57 @@ +%define pyver %(python -V 2>&1 | cut -f2 -d" " | cut -f1,2 -d".") +%define selfname pyOpenSSL + +Summary: Python interface to the OpenSSL library. +Name: python-openssl +Version: 0.5.1 +Release: 3th +Url: http://pyopenssl.sourceforge.net/ +Source: http://telia.dl.sourceforge.net/sourceforge/pyopenssl/%selfname-%{version}.tar.bz2 +License: GPL +Group: tinysofa contrib +BuildRoot: %{_tmppath}/%{name}-buildroot +Requires: python +BuildRequires: python, openssl-devel, python-devel + + +%description +High-level wrapper around a subset of the OpenSSL library, includes + * SSL.Connection objects, wrapping the methods of Python's portable sockets + * Callbacks written in Python + * Extensive error-handling mechanism, mirroring OpenSSL's error codes +... and much more ;) + + +%prep +%setup -q -n %selfname-%{version} + + +%build +%_bindir/python setup.py build + + +%install +[ -n "%{buildroot}" -a "%{buildroot}" != / ] && rm -rf %{buildroot} +%_bindir/python setup.py install --root=$RPM_BUILD_ROOT --record %selfname.files +chmod 0644 examples/SecureXMLRPCServer.py + + +%clean +[ -n "%{buildroot}" -a "%{buildroot}" != / ] && rm -rf %{buildroot} + + +%files -f %selfname.files +%defattr(0644,root,root,0755) +%doc COPYING TODO README INSTALL ChangeLog examples +%dir %{_libdir}/python%{pyver}/site-packages/OpenSSL + + +%changelog +* Fri Jul 16 2004 Goetz Bock 0.5.1-3th +- more cleanups + +* Wed Jul 14 2004 Tor Hveem 0.5.1-2th +- Cleanups + +* Fri May 21 2004 Tor Hveem 0.5.1-1th +- First tinysofa version From svn at tinysofa.org Fri Jul 16 13:08:57 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 16 Jul 2004 23:08:57 +1000 (EST) Subject: [tinysofa-svn] r3139 - in projects/ts-anaconda/trunk: . scripts utils Message-ID: <20040716130857.F13134E8031@minbar.tinysofa.org> Author: jh Date: 2004-07-16 23:08:57 +1000 (Fri, 16 Jul 2004) New Revision: 3139 Modified: projects/ts-anaconda/trunk/harddrive.py projects/ts-anaconda/trunk/image.py projects/ts-anaconda/trunk/scripts/buildinstall projects/ts-anaconda/trunk/scripts/check-repository.py projects/ts-anaconda/trunk/scripts/splitdistro projects/ts-anaconda/trunk/urlinstall.py projects/ts-anaconda/trunk/utils/genhdlist.c Log: - change tinysofa patch structure: - rpms -> rpms.os Modified: projects/ts-anaconda/trunk/harddrive.py =================================================================== --- projects/ts-anaconda/trunk/harddrive.py 2004-07-16 12:57:50 UTC (rev 3138) +++ projects/ts-anaconda/trunk/harddrive.py 2004-07-16 13:08:57 UTC (rev 3139) @@ -47,12 +47,12 @@ return cs def getFilename(self, h, timer): - return self.tree + self.path + "/tinysofa/rpms/" + self.fnames[h] + return self.tree + self.path + "/tinysofa/rpms.os/" + self.fnames[h] def readHeaders(self): self.mountMedia() hl = [] - path = self.tree + self.path + "/tinysofa/rpms" + path = self.tree + self.path + "/tinysofa/rpms.os" for n in os.listdir(path): fd = os.open(path + "/" + n, 0) try: @@ -157,7 +157,7 @@ self.umountMedia() self.mountMedia(h[1000002]) - return self.tree + "/tinysofa/rpms/" + h[1000000] + return self.tree + "/tinysofa/rpms.os/" + h[1000000] def readHeaders(self): self.mountMedia(1) Modified: projects/ts-anaconda/trunk/image.py =================================================================== --- projects/ts-anaconda/trunk/image.py 2004-07-16 12:57:50 UTC (rev 3138) +++ projects/ts-anaconda/trunk/image.py 2004-07-16 13:08:57 UTC (rev 3139) @@ -18,7 +18,7 @@ return ComponentSet(self.tree + '/tinysofa/base/comps', hdlist) def getFilename(self, h, timer): - return self.tree + "/tinysofa/rpms/" + h[1000000] + return self.tree + "/tinysofa/rpms.os/" + h[1000000] def readHeaders(self): return HeaderListFromFile(self.tree + "/tinysofa/base/hdlist") @@ -145,7 +145,7 @@ timer.start() - return self.tree + "/tinysofa/rpms/" + h[1000000] + return self.tree + "/tinysofa/rpms.os/" + h[1000000] def filesDone(self): if not self.loopbackFile: return Modified: projects/ts-anaconda/trunk/scripts/buildinstall =================================================================== --- projects/ts-anaconda/trunk/scripts/buildinstall 2004-07-16 12:57:50 UTC (rev 3138) +++ projects/ts-anaconda/trunk/scripts/buildinstall 2004-07-16 13:08:57 UTC (rev 3139) @@ -34,7 +34,7 @@ shift ;; *) - if [ -n "$DIR" -o ! -d $1/tinysofa/rpms ]; then + if [ -n "$DIR" -o ! -d $1/tinysofa/rpms.os ]; then usage fi DIR=$1 @@ -65,7 +65,7 @@ if [ ! -f $UPD_INSTROOT ]; then cd $BUILDINSTDIR - rpm2cpio $p/tinysofa/rpms/anaconda-runtime-[0-9]*.rpm | cpio --quiet -iumd ./usr/lib/anaconda-runtime/upd-instroot usr/lib/anaconda-runtime/upd-instroot + rpm2cpio $p/tinysofa/rpms.os/anaconda-runtime-[0-9]*.rpm | cpio --quiet -iumd ./usr/lib/anaconda-runtime/upd-instroot usr/lib/anaconda-runtime/upd-instroot mv usr/lib/anaconda-runtime/upd-instroot . rm -rf usr else @@ -75,7 +75,7 @@ if [ ! -f $MK_IMAGES ]; then cd $BUILDINSTDIR - rpm2cpio $p/tinysofa/rpms/anaconda-runtime-[0-9]*.rpm | cpio --quiet -iumd ./usr/lib/anaconda-runtime/mk-images* usr/lib/anaconda-runtime/mk-images* + rpm2cpio $p/tinysofa/rpms.os/anaconda-runtime-[0-9]*.rpm | cpio --quiet -iumd ./usr/lib/anaconda-runtime/mk-images* usr/lib/anaconda-runtime/mk-images* mv usr/lib/anaconda-runtime/mk-images* . rm -rf usr else @@ -84,7 +84,7 @@ MK_IMAGES=$BUILDINSTDIR/mk-images echo "Building images..." -$UPD_INSTROOT --comp $COMPNAME $p/tinysofa/rpms $p/image-template $p/tinysofa/instimage +$UPD_INSTROOT --comp $COMPNAME $p/tinysofa/rpms.os $p/image-template $p/tinysofa/instimage # XXX hack - msw if [ $BUILDARCH = "sparc" ]; then @@ -102,9 +102,9 @@ fi if [ -x /usr/bin/runroot ]; then - runroot $COMPNAME --onlyone --arch $BUILDARCH "cd $BUILDINSTDIR\; ./mk-images $p/tinysofa/rpms $p $p/image-template $BUILDARCH "$DISTRONAME" $VERSION" + runroot $COMPNAME --onlyone --arch $BUILDARCH "cd $BUILDINSTDIR\; ./mk-images $p/tinysofa/rpms.os $p $p/image-template $BUILDARCH "$DISTRONAME" $VERSION" else - $MK_IMAGES $KICKSTART $p/tinysofa/rpms $p $p/image-template $BUILDARCH "$DISTRONAME" $VERSION + $MK_IMAGES $KICKSTART $p/tinysofa/rpms.os $p $p/image-template $BUILDARCH "$DISTRONAME" $VERSION fi rm -rf $BUILDINSTDIR Modified: projects/ts-anaconda/trunk/scripts/check-repository.py =================================================================== --- projects/ts-anaconda/trunk/scripts/check-repository.py 2004-07-16 12:57:50 UTC (rev 3138) +++ projects/ts-anaconda/trunk/scripts/check-repository.py 2004-07-16 13:08:57 UTC (rev 3139) @@ -65,11 +65,11 @@ return cs def getFilename(self, h): - return self.path + "/tinysofa/rpms/" + self.fnames[h] + return self.path + "/tinysofa/rpms.os/" + self.fnames[h] def readHeaders(self): hl = [] - path = self.path + "/tinysofa/rpms" + path = self.path + "/tinysofa/rpms.os" for n in os.listdir(path): fd = os.open(path + "/" + n, 0) try: Modified: projects/ts-anaconda/trunk/scripts/splitdistro =================================================================== --- projects/ts-anaconda/trunk/scripts/splitdistro 2004-07-16 12:57:50 UTC (rev 3138) +++ projects/ts-anaconda/trunk/scripts/splitdistro 2004-07-16 13:08:57 UTC (rev 3139) @@ -91,7 +91,7 @@ arch = extra[1] distDir = os.path.normpath(extra[0] + "/" + arch) -srcDir = os.path.normpath(extra[0] + "/srpms") +srcDir = os.path.normpath(extra[0] + "/srpms.os") if not os.path.isdir(distDir): print "error: %s is not a directory" % distDir @@ -108,7 +108,7 @@ id = 0 -files = os.listdir(distDir + "/tinysofa/rpms") +files = os.listdir(distDir + "/tinysofa/rpms.os") files.sort() packages = {} for file in files: @@ -132,7 +132,7 @@ print "Splitting tree..." totalsize = spaceUsed(distDir) -rpmsize = spaceUsed(distDir + "/tinysofa/rpms") +rpmsize = spaceUsed(distDir + "/tinysofa/rpms.os") dirsize = 0 for dir in disc2dirs: what = distDir + "/" + dir @@ -143,7 +143,7 @@ os.system("rm -rf %s %s %s %s" % ( disc1Dir, disc2Dir, disc1SrcDir, disc2SrcDir)) -os.system("mkdir -p %s %s %s/srpms %s/tinysofa/rpms" % +os.system("mkdir -p %s %s %s/srpms.os %s/tinysofa/rpms.os" % (disc1Dir, disc1SrcDir, disc2SrcDir, disc2Dir)) print "Creating disc1..." @@ -162,11 +162,11 @@ except OSError, (errno, msg): print "**** WARNING linking %s to %s: %s" % (src, dest, msg) -disc2pkgs = excessFiles(distDir + "/tinysofa/rpms", binPkgList, +disc2pkgs = excessFiles(distDir + "/tinysofa/rpms.os", binPkgList, targetSize - disc1used - fudgeFactor) -moveFiles("%s/tinysofa/rpms" % disc1Dir, - "%s/tinysofa/rpms" % disc2Dir, +moveFiles("%s/tinysofa/rpms.os" % disc1Dir, + "%s/tinysofa/rpms.os" % disc2Dir, disc2pkgs); print "Creating first source disc..." @@ -176,12 +176,12 @@ print "Creating second source disc..." stamp(disc2SrcDir, "disc4", arch, startedAt) -srcPkgList = os.listdir("%s/srpms" % disc1SrcDir) +srcPkgList = os.listdir("%s/srpms.os" % disc1SrcDir) srcPkgList.sort() -disc2pkgs = excessFiles(disc1SrcDir + "/srpms", srcPkgList, +disc2pkgs = excessFiles(disc1SrcDir + "/srpms.os", srcPkgList, targetSize - fudgeFactor) -moveFiles("%s/srpms" % disc1SrcDir, - "%s/srpms" % disc2SrcDir, +moveFiles("%s/srpms.os" % disc1SrcDir, + "%s/srpms.os" % disc2SrcDir, disc2pkgs); sys.exit(0) Modified: projects/ts-anaconda/trunk/urlinstall.py =================================================================== --- projects/ts-anaconda/trunk/urlinstall.py 2004-07-16 12:57:50 UTC (rev 3138) +++ projects/ts-anaconda/trunk/urlinstall.py 2004-07-16 13:08:57 UTC (rev 3139) @@ -56,7 +56,7 @@ else: base = self.pkgUrl - fullPath = base + "/tinysofa/rpms/" + h[FILENAME] + fullPath = base + "/tinysofa/rpms.os/" + h[FILENAME] file = tmppath + os.path.basename(fullPath) Modified: projects/ts-anaconda/trunk/utils/genhdlist.c =================================================================== --- projects/ts-anaconda/trunk/utils/genhdlist.c 2004-07-16 12:57:50 UTC (rev 3138) +++ projects/ts-anaconda/trunk/utils/genhdlist.c 2004-07-16 13:08:57 UTC (rev 3139) @@ -95,7 +95,7 @@ rpmtsSetVSFlags(ts, ~RPMVSF_NOHDRCHK); rpmtsCloseDB(ts); - sprintf(subdir, "%s/tinysofa/rpms", dirName); + sprintf(subdir, "%s/tinysofa/rpms.os", dirName); dir = opendir(subdir); if (!dir) { @@ -176,7 +176,7 @@ rpmtsSetVSFlags(ts, ~RPMVSF_NOHDRCHK); rpmtsCloseDB(ts); - sprintf(subdir, "%s/tinysofa/rpms", dirName); + sprintf(subdir, "%s/tinysofa/rpms.os", dirName); dir = opendir(subdir); if (!dir) { From svn at tinysofa.org Fri Jul 16 13:10:22 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 16 Jul 2004 23:10:22 +1000 (EST) Subject: [tinysofa-svn] r3140 - tinysofa/releases/1.1/netatalk/current/specs Message-ID: <20040716131022.7A5DC4E8031@minbar.tinysofa.org> Author: jh Date: 2004-07-16 23:10:22 +1000 (Fri, 16 Jul 2004) New Revision: 3140 Modified: tinysofa/releases/1.1/netatalk/current/specs/netatalk.spec Log: - gcc-g++ -> gcc-c++ Modified: tinysofa/releases/1.1/netatalk/current/specs/netatalk.spec =================================================================== --- tinysofa/releases/1.1/netatalk/current/specs/netatalk.spec 2004-07-16 13:08:57 UTC (rev 3139) +++ tinysofa/releases/1.1/netatalk/current/specs/netatalk.spec 2004-07-16 13:10:22 UTC (rev 3140) @@ -17,7 +17,7 @@ Requires: pam >= 0.56, /etc/pam.d/system-auth, tcp_wrappers, openssl, cracklib BuildRequires: cracklib openssl-devel pam quota libtool automake autoconf BuildRequires: libstdc++-devel db4-devel kerberos5-devel libcom_err-devel -BuildRequires: perl gcc-g++ +BuildRequires: perl gcc-c++ BuildRoot: %{_tmppath}/%{name}-%{version}-root %description From svn at tinysofa.org Fri Jul 16 13:11:40 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 16 Jul 2004 23:11:40 +1000 (EST) Subject: [tinysofa-svn] r3141 - tinysofa/releases/1.1/ncurses/current/specs Message-ID: <20040716131140.347EC4E8031@minbar.tinysofa.org> Author: jh Date: 2004-07-16 23:11:39 +1000 (Fri, 16 Jul 2004) New Revision: 3141 Modified: tinysofa/releases/1.1/ncurses/current/specs/ncurses.spec Log: - BuildRequires: gcc-c++ Modified: tinysofa/releases/1.1/ncurses/current/specs/ncurses.spec =================================================================== --- tinysofa/releases/1.1/ncurses/current/specs/ncurses.spec 2004-07-16 13:10:22 UTC (rev 3140) +++ tinysofa/releases/1.1/ncurses/current/specs/ncurses.spec 2004-07-16 13:11:39 UTC (rev 3141) @@ -13,7 +13,7 @@ Patch10: ncurses-5.4-color_xterm.patch Patch11: ncurses-5.2-rxvt.patch Patch12: ncurses-5.2-nocbt.patch -BuildRequires: sharutils +BuildRequires: sharutils gcc-c++ BuildRoot: %{_tmppath}/%{name}-%{version}-root %description From svn at tinysofa.org Fri Jul 16 14:54:04 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Sat, 17 Jul 2004 00:54:04 +1000 (EST) Subject: [tinysofa-svn] r3142 - tinysofa/releases/1.1/passwd/current/specs Message-ID: <20040716145404.ABBC54E8031@minbar.tinysofa.org> Author: jh Date: 2004-07-17 00:54:04 +1000 (Sat, 17 Jul 2004) New Revision: 3142 Modified: tinysofa/releases/1.1/passwd/current/specs/passwd.spec Log: - update BuildRequires Modified: tinysofa/releases/1.1/passwd/current/specs/passwd.spec =================================================================== --- tinysofa/releases/1.1/passwd/current/specs/passwd.spec 2004-07-16 13:11:39 UTC (rev 3141) +++ tinysofa/releases/1.1/passwd/current/specs/passwd.spec 2004-07-16 14:54:04 UTC (rev 3142) @@ -7,7 +7,7 @@ Source: passwd-%{version}-8.tar.gz Buildroot: %{_tmppath}/%{name}-%{version}-root Requires: pam >= 0.59, /etc/pam.d/system-auth -BuildPrereq: glib-devel, libuser-devel, pam-devel +BuildRequires: glib-devel, libuser-devel, pam-devel %description The passwd package contains a system utility (passwd) which sets From svn at tinysofa.org Fri Jul 16 14:55:14 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Sat, 17 Jul 2004 00:55:14 +1000 (EST) Subject: [tinysofa-svn] r3143 - in tinysofa/releases/1.1: . swup swup/current swup/current/sources swup/current/specs Message-ID: <20040716145514.BA8F54E8031@minbar.tinysofa.org> Author: gda Date: 2004-07-17 00:55:14 +1000 (Sat, 17 Jul 2004) New Revision: 3143 Added: tinysofa/releases/1.1/swup/ tinysofa/releases/1.1/swup/current/ tinysofa/releases/1.1/swup/current/sources/ tinysofa/releases/1.1/swup/current/sources/swup-0.0.20040714.tar.gz tinysofa/releases/1.1/swup/current/sources/swup-2.4.3-public-key-error.patch tinysofa/releases/1.1/swup/current/sources/swup-rpm-4.3.patch tinysofa/releases/1.1/swup/current/specs/ tinysofa/releases/1.1/swup/current/specs/swup.spec Log: newest snapshot, patched for rpm 4.3 Added: tinysofa/releases/1.1/swup/current/sources/swup-0.0.20040714.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/releases/1.1/swup/current/sources/swup-0.0.20040714.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/releases/1.1/swup/current/sources/swup-2.4.3-public-key-error.patch =================================================================== --- tinysofa/releases/1.1/swup/current/sources/swup-2.4.3-public-key-error.patch 2004-07-16 14:54:04 UTC (rev 3142) +++ tinysofa/releases/1.1/swup/current/sources/swup-2.4.3-public-key-error.patch 2004-07-16 14:55:14 UTC (rev 3143) @@ -0,0 +1,13 @@ +diff -urN swup-2.4.3/swuplib/driver/rpmdriver.py swup-2.4.3.tinysofa/swuplib/driver/rpmdriver.py +--- swup-2.4.3/swuplib/driver/rpmdriver.py 2004-04-28 01:24:15.000000000 +1000 ++++ swup-2.4.3.tinysofa/swuplib/driver/rpmdriver.py 2004-04-28 01:52:53.000000000 +1000 +@@ -433,7 +433,8 @@ + hdr = headerts.hdrFromFdno(fd) + except rpm.error, e: + if str(e) == 'public key not available': +- self.log.write_stdout('\nThe public key associated with this package was not found.\n\n') ++ self.log.write_stdout('\nThe public key associated with this package was not found.\nYou may need to run the following command:\n\n\trpm --import /usr/share/tinysofa-gpgkeys-emily/tinysofa.pub.gpg\n') ++ sys.exit(1) + raise + self.filenames[hdr[rpm.RPMTAG_NAME]] = package['localfilename'] + self.modes[hdr[rpm.RPMTAG_NAME]] = package['flag'] Added: tinysofa/releases/1.1/swup/current/sources/swup-rpm-4.3.patch =================================================================== --- tinysofa/releases/1.1/swup/current/sources/swup-rpm-4.3.patch 2004-07-16 14:54:04 UTC (rev 3142) +++ tinysofa/releases/1.1/swup/current/sources/swup-rpm-4.3.patch 2004-07-16 14:55:14 UTC (rev 3143) @@ -0,0 +1,64 @@ +Index: swuplib/driver/rpmdriver.py +=================================================================== +RCS file: /home/cvs/swup/swuplib/driver/rpmdriver.py,v +retrieving revision 1.98 +diff -u -3 -p -r1.98 rpmdriver.py +--- swuplib/driver/rpmdriver.py 20 Jun 2004 11:52:33 -0000 1.98 ++++ swuplib/driver/rpmdriver.py 14 Jul 2004 18:30:46 -0000 +@@ -153,10 +153,13 @@ class driver: + rpmheader = self.db[index] + else: + #RPM>=4.1 needs this +- headers = self.db.dbMatch('name',name) +- rpmheader = headers.next() +- if not rpmheader: ++ headers = self.db.dbMatch('name',str(name)) ++ rpmheader = None ++ if headers.count() == 0: + return None ++ else: ++ for header in headers: ++ rpmheader = header + dict.update(self._create_package(rpmheader)) + return dict + +@@ -171,13 +174,9 @@ class driver: + packageheaders.append(self.db[index]) + else: + #RPM>=4.1 needs this +- headers = self.db.dbMatch('name',name) +- rpmheader = headers.next() +- while rpmheader: ++ headers = self.db.dbMatch('name',str(name)) ++ for rpmheader in headers: + packageheaders.append(rpmheader) +- rpmheader = headers.next() +- if not rpmheader: +- break + + for rpmheader in packageheaders: + packages.append(self._create_package(rpmheader)) +@@ -226,18 +225,15 @@ class driver: + foundheaders.append(header) + else: + # Check for package first. +- headers = self.db.dbMatch('name',resource) ++ headers = self.db.dbMatch('name',str(resource)) + # If there was no matching package, check for capability. + if headers.count() < 1: +- headers = self.db.dbMatch('providename', resource) ++ headers = self.db.dbMatch('providename', str(resource)) + # Last, check for file. + if headers.count() < 1: +- headers = self.db.dbMatch('basenames', resource) +- +- while headers: +- header = headers.next() +- if not header: +- break ++ headers = self.db.dbMatch('basenames', str(resource)) ++ ++ for header in headers: + foundheaders.append(header) + + # Added: tinysofa/releases/1.1/swup/current/specs/swup.spec =================================================================== --- tinysofa/releases/1.1/swup/current/specs/swup.spec 2004-07-16 14:54:04 UTC (rev 3142) +++ tinysofa/releases/1.1/swup/current/specs/swup.spec 2004-07-16 14:55:14 UTC (rev 3143) @@ -0,0 +1,208 @@ +Summary: The secure software updater +Name: swup +Version: 0.0.20040714 +Release: 1gd +License: GPL +Group: tinysofa official +Source0: %{name}-%{version}.tar.gz +Patch0: swup-2.4.3-public-key-error.patch +Patch1: swup-rpm-4.3.patch +ExclusiveOs: Linux +Requires: rpm, rpm-python, gnupg, swupconf, sysklogd +PreReq: python >= 2.2 +Requires: %{name}-libs = %{version} +Requires: tinysofa-gpgkeys-emily +BuildRoot: %{_tmppath}/%{name}-root +BuildArch: noarch +Provides: softwareupdater +BuildRequires: python, coreutils +Obsoletes: soup +%define sitepackagedir usr/%{_lib}/python$(python -V 2>&1| cut -c8-10)/site-packages + +%description +SWUP - SoftWare UPdater is an extension for existing software packaging +systems to facilitate automatic and secure update and install. SWUP +handles dependencies between software packages, and is able to fetch +additional required software when installing or upgrading. + +%package libs +Summary: swup libraries shared with rdfgen +Group: tinysofa official +Obsoletes: soup-libs +PreReq: python >= 2.2 + +%description libs +Swup libs shared by swup and rdfgen + +%package -n rdfgen +Summary: Resource Description Framework GENerator +Group: tinysofa official +Requires: %{name}-libs = %{version} +PreReq: python >= 2.2 + +%description -n rdfgen +Generates database files in rdf/xml format to work with the swup software +upgrading tool. + +%package -n swupcron +Summary: Cron file for swup. +Group: tinysofa official +Obsoletes: soupcron +Requires: crond + +%description -n swupcron +This is the cron file for swup. Install this if you want swup to be run +automatically. + +%prep +%setup -q +%patch0 -p1 +%patch1 -p0 + +%install +[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf ${RPM_BUILD_ROOT} +mkdir -p ${RPM_BUILD_ROOT}/var/log/swup +make +make DESTDIR=${RPM_BUILD_ROOT} SITEDIR=%{sitepackagedir}/swuplib install +install -d -m 0755 ${RPM_BUILD_ROOT}/usr/bin +for f in `find ${RPM_BUILD_ROOT}/usr/lib/swup -name \*.py`; do + touch ${f}c +done +for f in `find ${RPM_BUILD_ROOT}/%{sitepackagedir} -name \*.py`; do + touch ${f}c +done +for i in ${RPM_BUILD_ROOT}/var/log/swup/{info,errors,warnings}; do + touch $i +done +# rdf ghost files, must be removed when uninstalling this package. +for i in rdf rdfgen; do + touch ${RPM_BUILD_ROOT}/usr/lib/rdfgen/$i.pyc +done + +#swupcron +mkdir -p ${RPM_BUILD_ROOT}/etc/cron.{hourly,daily,weekly,monthly}/ +install -m 0755 etc/cron.daily/swup.cron \ + ${RPM_BUILD_ROOT}/etc/cron.daily/swup.cron +touch ${RPM_BUILD_ROOT}/etc/cron.{hourly,weekly,monthly}/swup.cron + +# +# Generate site package filelist +# +pushd $RPM_BUILD_ROOT +echo %dir /%{sitepackagedir}/swuplib >> ${RPM_BUILD_DIR}/%{name}-%{version}/sitefiles.txt +echo %dir /%{sitepackagedir}/swuplib/driver >> ${RPM_BUILD_DIR}/%{name}-%{version}/sitefiles.txt +for file in `find %{sitepackagedir} -name \*.py`; do + echo /${file} + echo %ghost /${file}c +done >> ${RPM_BUILD_DIR}/%{name}-%{version}/sitefiles.txt +popd + +rm -rf ${RPM_BUILD_ROOT}/etc/swup + +%clean +[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf ${RPM_BUILD_ROOT} + +%post +python -c "import compileall; compileall.compile_dir('/usr/lib/swup')" + +%post -n rdfgen +python -c "import compileall; compileall.compile_dir('/usr/lib/rdfgen')" + +%post libs +python -c "import compileall; compileall.compile_dir('/%{sitepackagedir}/swuplib')" + +%files +%defattr(-,root,root) +%doc docs/README docs/COPYING +%doc docs/swup.vimrc +/usr/bin/swup +%dir /usr/lib/swup +/usr/lib/swup/*.py +/usr/share/man/man1/swup.1.gz +/usr/share/man/man5/swup.5.gz +%ghost /usr/lib/swup/*.pyc + +%files libs -f sitefiles.txt +%defattr(-,root,root) + +%files -n rdfgen +%defattr(-,root,root) +/usr/bin/rdfgen +%dir /usr/lib/rdfgen +/usr/lib/rdfgen/*.py +/usr/share/man/man1/rdfgen.* +%ghost /usr/lib/rdfgen/*.pyc +%{_var}/log/swup/errors +%{_var}/log/swup/info +%{_var}/log/swup/warnings + +%files -n swupcron +%defattr(0755,root,root) +/etc/cron.daily/swup.cron +%ghost /etc/cron.hourly/swup.cron +%ghost /etc/cron.monthly/swup.cron +%ghost /etc/cron.weekly/swup.cron + +%changelog +* Wed Jul 14 2004 Gerald Dachs 0.0.20040714-1gd +- build for ts 1.1 + +* Fri Jun 18 2004 tsintegrate 2.4.6-2ts +- current (2.4.6-1ts) integrated as 2.4.6-2ts for release 1.0-U2 + +* Fri Jun 18 2004 Omar Kilani +- Add swup-2.4.6-multi-providers.patch from jh. + +* Mon May 24 2004 tsintegrate 2.4.6-1ts +- current (2.4.6-1th) integrated as 2.4.6-1ts for release 1.0-U1 + +* Wed May 19 2004 Tor Hveem 2.4.6-1th +- New upstream + +* Wed May 19 2004 tsintegrate 2.4.5-2ts +- current (2.4.5-6th) integrated as 2.4.5-2ts for release 1.0-U1 + +* Wed May 19 2004 Tor Hveem 2.4.5-6th +- New upstream + +* Wed May 19 2004 tsintegrate 2.4.5-1ts +- current (2.4.5-4th) integrated as 2.4.5-1ts for release 1.0-U1 + +* Tue May 18 2004 Omar Kilani +- Fix perms for libs. + +* Sun May 17 2004 Tor Hveem 2.4.5-4th +- New upstream +- Fix non-root + +* Fri May 14 2004 Tor Hveem 2.4.5-3th +- New upstream, take II + +* Thu May 13 2004 Tor Hveem 2.4.5-1th +- Removed all patches except gpg-key import help. +- New upstream + +* Wed May 05 2004 Omar Kilani 2.4.3-8ts +- Add patch to move key related functions below --ignore-lock. + +* Wed May 05 2004 Omar Kilani 2.4.3-7ts +- Missed a few TransactionSet's. + +* Tue May 04 2004 Omar Kilani 2.4.3-6ts +- Disable rpm sig checking in install. This does not disable swup +- sig checking. + +* Tue May 04 2004 Omar Kilani 2.4.3-5ts +- Disable key error patch. +- Get some updates from swup cvs. +- Add local user patch. + +* Tue Apr 27 2004 Omar Kilani 2.4.3-1ts +- Back to swup, version 2.4.3. +- tinysofa and trustix co-operating on swup development. + +* Sun Apr 04 2004 Omar Kilani 1.0.0-4ts +- Fork swup 2.3.17. +- Now soup, at version 1.0.0. +- Add xml.sax, python2.3, user login ftp, var expansion, enable/disable +- and multi conf file support. From svn at tinysofa.org Fri Jul 16 14:56:41 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Sat, 17 Jul 2004 00:56:41 +1000 (EST) Subject: [tinysofa-svn] r3145 - tinysofa/releases/1.1/rpm/current/specs Message-ID: <20040716145641.D84DD4E8031@minbar.tinysofa.org> Author: jh Date: 2004-07-17 00:56:41 +1000 (Sat, 17 Jul 2004) New Revision: 3145 Modified: tinysofa/releases/1.1/rpm/current/specs/rpm.spec Log: - BuildRequires: libtool autoconf automake Modified: tinysofa/releases/1.1/rpm/current/specs/rpm.spec =================================================================== --- tinysofa/releases/1.1/rpm/current/specs/rpm.spec 2004-07-16 14:55:22 UTC (rev 3144) +++ tinysofa/releases/1.1/rpm/current/specs/rpm.spec 2004-07-16 14:56:41 UTC (rev 3145) @@ -38,7 +38,7 @@ # XXX necessary only to drag in /usr/lib/libelf.a, otherwise internal elfutils. BuildRequires: elfutils-libelf BuildRequires: elfutils-devel - +BuildRequires: libtool autoconf automake BuildRequires: zlib-devel %if %{with_selinux} From svn at tinysofa.org Fri Jul 16 14:55:22 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Sat, 17 Jul 2004 00:55:22 +1000 (EST) Subject: [tinysofa-svn] r3144 - tinysofa/releases/1.1/python/current/specs Message-ID: <20040716145522.580744E8031@minbar.tinysofa.org> Author: jh Date: 2004-07-17 00:55:22 +1000 (Sat, 17 Jul 2004) New Revision: 3144 Modified: tinysofa/releases/1.1/python/current/specs/python.spec Log: - BuildRequires: gcc-c++ libstdc++-devel Modified: tinysofa/releases/1.1/python/current/specs/python.spec =================================================================== --- tinysofa/releases/1.1/python/current/specs/python.spec 2004-07-16 14:55:14 UTC (rev 3143) +++ tinysofa/releases/1.1/python/current/specs/python.spec 2004-07-16 14:55:22 UTC (rev 3144) @@ -38,7 +38,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildPrereq: readline-devel, libtermcap-devel, openssl-devel, gmp-devel BuildPrereq: ncurses-devel, gdbm-devel, zlib-devel, expat-devel -BuildPrereq: glibc-devel gcc-c++-devel +BuildPrereq: glibc-devel gcc-c++ libstdc++-devel BuildPrereq: gzip tar findutils pkgconfig BuildPrereq: gdbm-devel URL: http://www.python.org/ From svn at tinysofa.org Fri Jul 16 15:03:25 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Sat, 17 Jul 2004 01:03:25 +1000 (EST) Subject: [tinysofa-svn] r3146 - tinysofa/releases/1.1/swup/current/specs Message-ID: <20040716150325.C45084E8031@minbar.tinysofa.org> Author: jh Date: 2004-07-17 01:03:25 +1000 (Sat, 17 Jul 2004) New Revision: 3146 Modified: tinysofa/releases/1.1/swup/current/specs/swup.spec Log: - add epoch - update groups for 1.1 Modified: tinysofa/releases/1.1/swup/current/specs/swup.spec =================================================================== --- tinysofa/releases/1.1/swup/current/specs/swup.spec 2004-07-16 14:56:41 UTC (rev 3145) +++ tinysofa/releases/1.1/swup/current/specs/swup.spec 2004-07-16 15:03:25 UTC (rev 3146) @@ -2,8 +2,9 @@ Name: swup Version: 0.0.20040714 Release: 1gd +Epoch: 1 License: GPL -Group: tinysofa official +Group: extra Source0: %{name}-%{version}.tar.gz Patch0: swup-2.4.3-public-key-error.patch Patch1: swup-rpm-4.3.patch @@ -11,7 +12,6 @@ Requires: rpm, rpm-python, gnupg, swupconf, sysklogd PreReq: python >= 2.2 Requires: %{name}-libs = %{version} -Requires: tinysofa-gpgkeys-emily BuildRoot: %{_tmppath}/%{name}-root BuildArch: noarch Provides: softwareupdater @@ -27,7 +27,7 @@ %package libs Summary: swup libraries shared with rdfgen -Group: tinysofa official +Group: extra Obsoletes: soup-libs PreReq: python >= 2.2 @@ -36,7 +36,7 @@ %package -n rdfgen Summary: Resource Description Framework GENerator -Group: tinysofa official +Group: extra Requires: %{name}-libs = %{version} PreReq: python >= 2.2 @@ -46,7 +46,7 @@ %package -n swupcron Summary: Cron file for swup. -Group: tinysofa official +Group: extra Obsoletes: soupcron Requires: crond From svn at tinysofa.org Fri Jul 16 15:28:30 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Sat, 17 Jul 2004 01:28:30 +1000 (EST) Subject: [tinysofa-svn] r3147 - tinysofa/releases/1.1/tcsh/current/specs Message-ID: <20040716152830.D63F94E8031@minbar.tinysofa.org> Author: jh Date: 2004-07-17 01:28:30 +1000 (Sat, 17 Jul 2004) New Revision: 3147 Modified: tinysofa/releases/1.1/tcsh/current/specs/tcsh.spec Log: - BR: autoconf Modified: tinysofa/releases/1.1/tcsh/current/specs/tcsh.spec =================================================================== --- tinysofa/releases/1.1/tcsh/current/specs/tcsh.spec 2004-07-16 15:03:25 UTC (rev 3146) +++ tinysofa/releases/1.1/tcsh/current/specs/tcsh.spec 2004-07-16 15:28:30 UTC (rev 3147) @@ -21,7 +21,7 @@ Prereq: fileutils, grep URL: http://www.tcsh.org/ Buildroot: %{_tmppath}/%{name}-%{version}-root -BuildPrereq: groff, libtermcap-devel, perl, libtool +BuildPrereq: groff, libtermcap-devel, perl, libtool, autoconf %description Tcsh is an enhanced but completely compatible version of csh, the C From svn at tinysofa.org Fri Jul 16 15:31:04 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Sat, 17 Jul 2004 01:31:04 +1000 (EST) Subject: [tinysofa-svn] r3148 - tinysofa/releases/1.1/slang/current/specs Message-ID: <20040716153104.D665F4E8031@minbar.tinysofa.org> Author: jh Date: 2004-07-17 01:31:04 +1000 (Sat, 17 Jul 2004) New Revision: 3148 Modified: tinysofa/releases/1.1/slang/current/specs/slang.spec Log: - BR: autoconf libtool Modified: tinysofa/releases/1.1/slang/current/specs/slang.spec =================================================================== --- tinysofa/releases/1.1/slang/current/specs/slang.spec 2004-07-16 15:28:30 UTC (rev 3147) +++ tinysofa/releases/1.1/slang/current/specs/slang.spec 2004-07-16 15:31:04 UTC (rev 3148) @@ -11,7 +11,7 @@ Patch3: slang-1.4.5-utf8-segv.patch Patch4: slang-utf8-fix.patch Url: http://www.s-lang.org/ -BuildRequires: perl +BuildRequires: perl libtool autoconf Buildroot: %{_tmppath}/%{name}-%{version}-root %description From svn at tinysofa.org Fri Jul 16 15:36:07 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Sat, 17 Jul 2004 01:36:07 +1000 (EST) Subject: [tinysofa-svn] r3149 - projects/ts-anaconda/trunk/scripts Message-ID: <20040716153607.5B5214E8031@minbar.tinysofa.org> Author: jh Date: 2004-07-17 01:36:07 +1000 (Sat, 17 Jul 2004) New Revision: 3149 Modified: projects/ts-anaconda/trunk/scripts/upd-instroot Log: - redirecto pythondeps errors to /dev/null Modified: projects/ts-anaconda/trunk/scripts/upd-instroot =================================================================== --- projects/ts-anaconda/trunk/scripts/upd-instroot 2004-07-16 15:31:04 UTC (rev 3148) +++ projects/ts-anaconda/trunk/scripts/upd-instroot 2004-07-16 15:36:07 UTC (rev 3149) @@ -601,7 +601,7 @@ if [ -x /usr/bin/runroot -a -n "$COMPONENT" ]; then REALPATH=`(cd $DEST; /bin/pwd | sed 's,/md1/,/,g')` - runroot $COMPONENT --onlyone --arch $ARCH "cd $REALPATH\; usr/lib/anaconda-runtime/pythondeps $REALPATH" + runroot $COMPONENT --onlyone --arch $ARCH "cd $REALPATH\; usr/lib/anaconda-runtime/pythondeps $REALPATH" > /dev/null 2>&1 else $DEST/usr/lib/anaconda-runtime/pythondeps $DEST fi From svn at tinysofa.org Fri Jul 16 15:45:05 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Sat, 17 Jul 2004 01:45:05 +1000 (EST) Subject: [tinysofa-svn] r3150 - tinysofa/releases/1.1/wget/current/specs Message-ID: <20040716154505.54D704E8031@minbar.tinysofa.org> Author: jh Date: 2004-07-17 01:45:05 +1000 (Sat, 17 Jul 2004) New Revision: 3150 Modified: tinysofa/releases/1.1/wget/current/specs/wget.spec Log: - BuildRequires: gettext Modified: tinysofa/releases/1.1/wget/current/specs/wget.spec =================================================================== --- tinysofa/releases/1.1/wget/current/specs/wget.spec 2004-07-16 15:36:07 UTC (rev 3149) +++ tinysofa/releases/1.1/wget/current/specs/wget.spec 2004-07-16 15:45:05 UTC (rev 3150) @@ -16,7 +16,7 @@ Patch5: wget-1.9.1-path.patch Provides: webclient %info_requires -BuildRequires: perl, openssl-devel, pkgconfig, autoconf +BuildRequires: perl, openssl-devel, pkgconfig, autoconf, gettext BuildRoot: %{_tmppath}/%{name}-root %description From svn at tinysofa.org Fri Jul 16 15:45:54 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Sat, 17 Jul 2004 01:45:54 +1000 (EST) Subject: [tinysofa-svn] r3151 - tinysofa/releases/1.1/vsftpd/current/specs Message-ID: <20040716154554.3997B4E8031@minbar.tinysofa.org> Author: jh Date: 2004-07-17 01:45:54 +1000 (Sat, 17 Jul 2004) New Revision: 3151 Modified: tinysofa/releases/1.1/vsftpd/current/specs/vsftpd.spec Log: - BuildPreReq: pam-devel Modified: tinysofa/releases/1.1/vsftpd/current/specs/vsftpd.spec =================================================================== --- tinysofa/releases/1.1/vsftpd/current/specs/vsftpd.spec 2004-07-16 15:45:05 UTC (rev 3150) +++ tinysofa/releases/1.1/vsftpd/current/specs/vsftpd.spec 2004-07-16 15:45:54 UTC (rev 3151) @@ -20,7 +20,7 @@ Patch5: vsftpd-2.0.0-ssl.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root -BuildPrereq: tcp_wrappers openssl-devel +BuildPrereq: tcp_wrappers openssl-devel pam-devel Requires: anonftp, logrotate, openssl %service_requires Provides: ftpserver From svn at tinysofa.org Fri Jul 16 15:45:58 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Sat, 17 Jul 2004 01:45:58 +1000 (EST) Subject: [tinysofa-svn] r3152 - in contrib: . fetchmail fetchmail/current fetchmail/current/sources fetchmail/current/specs Message-ID: <20040716154558.278A34E8031@minbar.tinysofa.org> Author: gda Date: 2004-07-17 01:45:57 +1000 (Sat, 17 Jul 2004) New Revision: 3152 Added: contrib/fetchmail/ contrib/fetchmail/current/ contrib/fetchmail/current/sources/ contrib/fetchmail/current/sources/fetchmail-5.7.0-nlsfix.patch contrib/fetchmail/current/sources/fetchmail-5.9.11-verbose.patch contrib/fetchmail/current/sources/fetchmail-6.2.5.tar.gz contrib/fetchmail/current/specs/ contrib/fetchmail/current/specs/fetchmail.spec Log: new for tinysofa Added: contrib/fetchmail/current/sources/fetchmail-5.7.0-nlsfix.patch =================================================================== --- contrib/fetchmail/current/sources/fetchmail-5.7.0-nlsfix.patch 2004-07-16 15:45:54 UTC (rev 3151) +++ contrib/fetchmail/current/sources/fetchmail-5.7.0-nlsfix.patch 2004-07-16 15:45:57 UTC (rev 3152) @@ -0,0 +1,12 @@ +diff -urN fetchmail-5.7.0.orig/fetchmail.c fetchmail-5.7.0/fetchmail.c +--- fetchmail-5.7.0.orig/fetchmail.c Thu Mar 1 18:55:58 2001 ++++ fetchmail-5.7.0/fetchmail.c Fri Mar 2 12:29:26 2001 +@@ -159,7 +159,7 @@ + envquery(argc, argv); + #ifdef ENABLE_NLS + setlocale (LC_ALL, ""); +- bindtextdomain(PACKAGE, LOCALEDIR); ++ bindtextdomain(PACKAGE, NULL); + textdomain(PACKAGE); + #endif + Added: contrib/fetchmail/current/sources/fetchmail-5.9.11-verbose.patch =================================================================== --- contrib/fetchmail/current/sources/fetchmail-5.9.11-verbose.patch 2004-07-16 15:45:54 UTC (rev 3151) +++ contrib/fetchmail/current/sources/fetchmail-5.9.11-verbose.patch 2004-07-16 15:45:57 UTC (rev 3152) @@ -0,0 +1,11 @@ +--- fetchmail-5.9.11.orig/fetchmail.c ++++ fetchmail-5.9.11/fetchmail.c +@@ -708,7 +708,7 @@ + exit(PS_AUTHFAIL); + } + +- if (outlevel > O_SILENT) ++ if (outlevel > O_NORMAL) + report(stdout, + GT_("sleeping at %s\n"), timestamp()); + Added: contrib/fetchmail/current/sources/fetchmail-6.2.5.tar.gz =================================================================== (Binary files differ) Property changes on: contrib/fetchmail/current/sources/fetchmail-6.2.5.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: contrib/fetchmail/current/specs/fetchmail.spec =================================================================== --- contrib/fetchmail/current/specs/fetchmail.spec 2004-07-16 15:45:54 UTC (rev 3151) +++ contrib/fetchmail/current/specs/fetchmail.spec 2004-07-16 15:45:57 UTC (rev 3152) @@ -0,0 +1,90 @@ +Summary: Full-featured POP/IMAP mail retrieval daemon +Name: fetchmail +Version: 6.2.5 +Release: 16gd +Group: tinysofa contrib +URL: http://www.catb.org/~esr/fetchmail/ +Source: http://www.catb.org/~esr/fetchmail/%{name}-%{version}.tar.gz +Patch1: fetchmail-5.7.0-nlsfix.patch +Patch2: fetchmail-5.9.11-verbose.patch +License: GPL +#Requires: smtpdaemon +Requires: openssl +BuildRequires: openssl-devel, bison, flex +BuildRoot: %{_tmppath}/%{name}-%{version}-root + +%description +Fetchmail is a free, full-featured, robust, and well-documented remote +mail retrieval and forwarding utility intended to be used over +on-demand TCP/IP links (such as SLIP or PPP connections). It +retrieves mail from remote mail servers and forwards it to your local +(client) machine's delivery system, so it can then be be read by +normal mail user agents such as mutt, elm, pine, (x)emacs/gnus, or mailx. +Comes with an interactive GUI configurator suitable for end-users. + +%package -n fetchmailconf +Summary: A GUI configurator for generating fetchmail configuration files +Group: Trustix Contrib +Requires: %{name} = %{version}, python + +%description -n fetchmailconf +A GUI configurator for generating fetchmail configuration file written in +python + + +%prep +%setup -q +%patch1 -p1 +%patch2 -p1 + + +%build +%configure --disable-nls \ + --without-kerberos \ + --with-ssl \ + --enable-inet6 +CFLAGS="$RPM_OPT_FLAGS" make + + +%install +[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT +%makeinstall mandir=%{?buildroot:%{buildroot}}%{_mandir}/man1 + + +%clean +[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT + + +%files +%defattr(-,root,root) +%doc README NEWS NOTES FAQ COPYING FEATURES +%doc fetchmail-features.html fetchmail-FAQ.html design-notes.html +%{_bindir}/fetchmail +%{_mandir}/man1/fetchmail.1* + +%files -n fetchmailconf +%{_bindir}/fetchmailconf + +%changelog +* Sun Apr 18 2004 Gerald Dachs 6.2.5-16gd +- Rebuilt for tinysofa + +* Mon Mar 8 2004 Chr. Toldnes +- Rebuilt for TSL 2.1 + +* Fri Dec 19 2003 Goetz Bock 6.2.5-3bg +- pack binaries. wonder where they went. + +* Fri Nov 28 2003 Goetz Bock 6.2.5-2bg +- for now nolonger require smtpdaemon as postfix does not provide it yet. + +* Tue Oct 21 2003 Goetz Bock 6.2.5-1bg +- new upsream: 6.2.5 +- fixes DoS vulnerability +- included two small fixes (patch1, patch2) from fetchmail-6.2.4-1.1.92mdk + +* Mon Oct 13 2003 Goetz Bock 6.2.4-2bg +- added some build requirements + +* Sat Sep 6 2003 Goetz Bock 6.2.4-1bg +- build for Trustix 2.0 (aka Cloud) - Contrib From svn at tinysofa.org Fri Jul 16 16:22:41 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Sat, 17 Jul 2004 02:22:41 +1000 (EST) Subject: [tinysofa-svn] r3153 - tinysofa/releases/1.1/gcc/current/specs Message-ID: <20040716162241.EE2C74E8031@minbar.tinysofa.org> Author: jh Date: 2004-07-17 02:22:41 +1000 (Sat, 17 Jul 2004) New Revision: 3153 Modified: tinysofa/releases/1.1/gcc/current/specs/gcc.spec Log: - BR: glibc-locales Modified: tinysofa/releases/1.1/gcc/current/specs/gcc.spec =================================================================== --- tinysofa/releases/1.1/gcc/current/specs/gcc.spec 2004-07-16 15:45:57 UTC (rev 3152) +++ tinysofa/releases/1.1/gcc/current/specs/gcc.spec 2004-07-16 16:22:41 UTC (rev 3153) @@ -38,7 +38,7 @@ BuildRequires: binutils >= 2.15.90.0.1.1 BuildRequires: zlib-devel, gettext, bison, flex # Make sure pthread.h doesn't contain __thread tokens -BuildRequires: glibc-devel >= 2.2.90-12 glibc-18n-common +BuildRequires: glibc-devel >= 2.2.90-12 glibc-locales %if %{build_ada} # Ada requires Ada to build BuildRequires: gcc-gnat >= 3.1, libgnat >= 3.1 From svn at tinysofa.org Fri Jul 16 16:25:18 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Sat, 17 Jul 2004 02:25:18 +1000 (EST) Subject: [tinysofa-svn] r3154 - tinysofa/releases/1.1/dovecot/current/specs Message-ID: <20040716162518.8F8044E8031@minbar.tinysofa.org> Author: jh Date: 2004-07-17 02:25:18 +1000 (Sat, 17 Jul 2004) New Revision: 3154 Modified: tinysofa/releases/1.1/dovecot/current/specs/dovecot.spec Log: - BuildRequires: cyrys-sasl-devel Modified: tinysofa/releases/1.1/dovecot/current/specs/dovecot.spec =================================================================== --- tinysofa/releases/1.1/dovecot/current/specs/dovecot.spec 2004-07-16 16:22:41 UTC (rev 3153) +++ tinysofa/releases/1.1/dovecot/current/specs/dovecot.spec 2004-07-16 16:25:18 UTC (rev 3154) @@ -19,6 +19,7 @@ BuildRequires: zlib-devel BuildRequires: zlib-devel BuildRequires: gcc-c++ +BuildRequires: cyrys-sasl-devel Prereq: openssl %service_requires From svn at tinysofa.org Fri Jul 16 16:42:45 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Sat, 17 Jul 2004 02:42:45 +1000 (EST) Subject: [tinysofa-svn] r3155 - tinysofa/releases/1.1/grub/current/specs Message-ID: <20040716164245.7E67D4E8031@minbar.tinysofa.org> Author: jh Date: 2004-07-17 02:42:45 +1000 (Sat, 17 Jul 2004) New Revision: 3155 Modified: tinysofa/releases/1.1/grub/current/specs/grub.spec Log: - include i386 arch Modified: tinysofa/releases/1.1/grub/current/specs/grub.spec =================================================================== --- tinysofa/releases/1.1/grub/current/specs/grub.spec 2004-07-16 16:25:18 UTC (rev 3154) +++ tinysofa/releases/1.1/grub/current/specs/grub.spec 2004-07-16 16:42:45 UTC (rev 3155) @@ -1,6 +1,6 @@ Name: grub Version: 0.94 -Release: 1ts +Release: 2jh Summary: GRUB - the Grand Unified Boot Loader. Group: main License: GPL @@ -52,7 +52,7 @@ # instead in userspace everywhere. Patch1000: grub-0.94-geometry-26kernel.patch -ExclusiveArch: i586 x86_64 +ExclusiveArch: i386 i586 x86_64 BuildRequires: binutils >= 2.9.1.0.23, ncurses-devel, texinfo BuildRequires: autoconf automake libtool Requires: mktemp @@ -322,4 +322,4 @@ - don't pass mem= to the kernel * Wed May 23 2001 Erik Troan -- initial build for Red Hat \ No newline at end of file +- initial build for Red Hat From svn at tinysofa.org Fri Jul 16 16:44:37 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Sat, 17 Jul 2004 02:44:37 +1000 (EST) Subject: [tinysofa-svn] r3156 - tinysofa/releases/1.1/gmp/current/specs Message-ID: <20040716164437.56E694E8031@minbar.tinysofa.org> Author: jh Date: 2004-07-17 02:44:37 +1000 (Sat, 17 Jul 2004) New Revision: 3156 Modified: tinysofa/releases/1.1/gmp/current/specs/gmp.spec Log: - disable sse2 test Modified: tinysofa/releases/1.1/gmp/current/specs/gmp.spec =================================================================== --- tinysofa/releases/1.1/gmp/current/specs/gmp.spec 2004-07-16 16:42:45 UTC (rev 3155) +++ tinysofa/releases/1.1/gmp/current/specs/gmp.spec 2004-07-16 16:44:37 UTC (rev 3156) @@ -127,7 +127,8 @@ export LD_LIBRARY_PATH=`pwd`/.libs make check cd .. -%ifarch %{ix86} +#%ifarch %{ix86} +%if 0 cd build-sse2 export LD_LIBRARY_PATH=`pwd`/.libs make check From svn at tinysofa.org Fri Jul 16 16:45:58 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Sat, 17 Jul 2004 02:45:58 +1000 (EST) Subject: [tinysofa-svn] r3157 - tinysofa/releases/1.1/libuser/current/specs Message-ID: <20040716164558.9EC284E8031@minbar.tinysofa.org> Author: jh Date: 2004-07-17 02:45:58 +1000 (Sat, 17 Jul 2004) New Revision: 3157 Modified: tinysofa/releases/1.1/libuser/current/specs/libuser.spec Log: - BuildRequires: libtool, pkgconfig Modified: tinysofa/releases/1.1/libuser/current/specs/libuser.spec =================================================================== --- tinysofa/releases/1.1/libuser/current/specs/libuser.spec 2004-07-16 16:44:37 UTC (rev 3156) +++ tinysofa/releases/1.1/libuser/current/specs/libuser.spec 2004-07-16 16:45:58 UTC (rev 3157) @@ -10,7 +10,7 @@ Patch1: libuser-0.51.7.sasl2.patch Patch2: libuser-0.51.7-docs.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root -BuildPrereq: pam-devel, popt, python-devel, autoconf +BuildPrereq: pam-devel, popt, python-devel, autoconf, libtool, pkgconfig BuildPrereq: cyrus-sasl-devel, openldap-devel Summary: A user and group account administration library. From svn at tinysofa.org Fri Jul 16 16:50:29 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Sat, 17 Jul 2004 02:50:29 +1000 (EST) Subject: [tinysofa-svn] r3158 - tinysofa/releases/1.1/libtiff/current/specs Message-ID: <20040716165029.145C54E8031@minbar.tinysofa.org> Author: jh Date: 2004-07-17 02:50:28 +1000 (Sat, 17 Jul 2004) New Revision: 3158 Modified: tinysofa/releases/1.1/libtiff/current/specs/libtiff.spec Log: - run ldconfig on correct directory Modified: tinysofa/releases/1.1/libtiff/current/specs/libtiff.spec =================================================================== --- tinysofa/releases/1.1/libtiff/current/specs/libtiff.spec 2004-07-16 16:45:58 UTC (rev 3157) +++ tinysofa/releases/1.1/libtiff/current/specs/libtiff.spec 2004-07-16 16:50:28 UTC (rev 3158) @@ -1,7 +1,7 @@ Summary: A library of functions for manipulating TIFF format image files. Name: libtiff Version: 3.6.0 -Release: 5ts +Release: 6jh License: distributable Group: extra Source0: ftp://ftp.remotesensing.org/pub/libtiff/tiff-v%{version}.tar.gz @@ -82,7 +82,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libtiff.so* install -m755 libtiff/libtiff.so.%{LIBVER} $RPM_BUILD_ROOT%{_libdir} ln -sf libtiff.so.%{LIBVER} $RPM_BUILD_ROOT%{_libdir}/libtiff.so -/sbin/ldconfig -n $RPM_BUILD_ROOT/%{_lib} +/sbin/ldconfig -n $RPM_BUILD_ROOT/%{_libdir} %post -p /sbin/ldconfig From svn at tinysofa.org Fri Jul 16 20:11:18 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Sat, 17 Jul 2004 06:11:18 +1000 (EST) Subject: [tinysofa-svn] r3159 - in tinysofa/releases/1.1/swup/current: sources specs Message-ID: <20040716201118.7B1944E8031@minbar.tinysofa.org> Author: torh Date: 2004-07-17 06:11:18 +1000 (Sat, 17 Jul 2004) New Revision: 3159 Added: tinysofa/releases/1.1/swup/current/sources/swup-2.5.2.tar.bz2 Removed: tinysofa/releases/1.1/swup/current/sources/swup-0.0.20040714.tar.gz Modified: tinysofa/releases/1.1/swup/current/specs/swup.spec Log: new upstream, support detach sigs Deleted: tinysofa/releases/1.1/swup/current/sources/swup-0.0.20040714.tar.gz =================================================================== (Binary files differ) Added: tinysofa/releases/1.1/swup/current/sources/swup-2.5.2.tar.bz2 =================================================================== (Binary files differ) Property changes on: tinysofa/releases/1.1/swup/current/sources/swup-2.5.2.tar.bz2 ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: tinysofa/releases/1.1/swup/current/specs/swup.spec =================================================================== --- tinysofa/releases/1.1/swup/current/specs/swup.spec 2004-07-16 16:50:28 UTC (rev 3158) +++ tinysofa/releases/1.1/swup/current/specs/swup.spec 2004-07-16 20:11:18 UTC (rev 3159) @@ -1,11 +1,11 @@ Summary: The secure software updater Name: swup -Version: 0.0.20040714 -Release: 1gd +Version: 2.5.2 +Release: 1th Epoch: 1 License: GPL Group: extra -Source0: %{name}-%{version}.tar.gz +Source0: %{name}-%{version}.tar.bz2 Patch0: swup-2.4.3-public-key-error.patch Patch1: swup-rpm-4.3.patch ExclusiveOs: Linux @@ -144,6 +144,9 @@ %ghost /etc/cron.weekly/swup.cron %changelog +* Fri Jul 16 2004 Tor Hveem 2.5.2-1th +- New upstream + * Wed Jul 14 2004 Gerald Dachs 0.0.20040714-1gd - build for ts 1.1 From svn at tinysofa.org Sat Jul 17 08:20:54 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Sat, 17 Jul 2004 18:20:54 +1000 (EST) Subject: [tinysofa-svn] r3160 - projects/ts-anaconda/trunk/loader Message-ID: <20040717082054.569B94E8031@minbar.tinysofa.org> Author: jh Date: 2004-07-17 18:20:53 +1000 (Sat, 17 Jul 2004) New Revision: 3160 Modified: projects/ts-anaconda/trunk/loader/Makefile Log: - add wlite to include directories Modified: projects/ts-anaconda/trunk/loader/Makefile =================================================================== --- projects/ts-anaconda/trunk/loader/Makefile 2004-07-16 20:11:18 UTC (rev 3159) +++ projects/ts-anaconda/trunk/loader/Makefile 2004-07-17 08:20:53 UTC (rev 3160) @@ -23,7 +23,7 @@ COPTS = $(DEBUG) -Wall -DVERSION='"$(VERSION)"' -CFLAGS = -fno-stack-protector $(COPTS) $(OPTS) -ffunction-sections -D_GNU_SOURCE=1 -I/usr/include/kudzu -I/usr/include/rpm -I.. -DHAVE_LIBIO_H -ggdb -DPRODUCTNAME='$(PRODUCTNAME)' -DGZLIB=1 +CFLAGS = -fno-stack-protector $(COPTS) $(OPTS) -ffunction-sections -D_GNU_SOURCE=1 -I/usr/include/kudzu -I/usr/include/rpm -I.. -I../wlite -DHAVE_LIBIO_H -ggdb -DPRODUCTNAME='$(PRODUCTNAME)' -DGZLIB=1 ALLOBJS = $(OBJS) $(PCMCIAOBJS) From svn at tinysofa.org Sat Jul 17 13:54:08 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Sat, 17 Jul 2004 23:54:08 +1000 (EST) Subject: [tinysofa-svn] r3163 - tinysofa/releases/1.1/swup/current/specs Message-ID: <20040717135408.5430B4E8031@minbar.tinysofa.org> Author: torh Date: 2004-07-17 23:54:08 +1000 (Sat, 17 Jul 2004) New Revision: 3163 Modified: tinysofa/releases/1.1/swup/current/specs/swup.spec Log: remove epoch Modified: tinysofa/releases/1.1/swup/current/specs/swup.spec =================================================================== --- tinysofa/releases/1.1/swup/current/specs/swup.spec 2004-07-17 12:15:48 UTC (rev 3162) +++ tinysofa/releases/1.1/swup/current/specs/swup.spec 2004-07-17 13:54:08 UTC (rev 3163) @@ -2,7 +2,6 @@ Name: swup Version: 2.5.2 Release: 1th -Epoch: 1 License: GPL Group: extra Source0: %{name}-%{version}.tar.bz2 From svn at tinysofa.org Sat Jul 17 14:04:48 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Sun, 18 Jul 2004 00:04:48 +1000 (EST) Subject: [tinysofa-svn] r3164 - tinysofa/releases/1.1/tinysofa-utils/current/sources Message-ID: <20040717140448.5A5C54E8031@minbar.tinysofa.org> Author: jh Date: 2004-07-18 00:04:48 +1000 (Sun, 18 Jul 2004) New Revision: 3164 Modified: tinysofa/releases/1.1/tinysofa-utils/current/sources/tsrelease Log: - preliminary support for apt genbasedir Modified: tinysofa/releases/1.1/tinysofa-utils/current/sources/tsrelease =================================================================== --- tinysofa/releases/1.1/tinysofa-utils/current/sources/tsrelease 2004-07-17 13:54:08 UTC (rev 3163) +++ tinysofa/releases/1.1/tinysofa-utils/current/sources/tsrelease 2004-07-17 14:04:48 UTC (rev 3164) @@ -246,7 +246,7 @@ COMMANDS = ['release', 'help'] DISTRIBUTION = 'tinysofa' PRODUCT = 'enterprise server' - VERSION = '1.0' + VERSION = '1.1' WITH_KICKSTART=False KICKSTART_FILE='' SIGN_KEY='609A2CBB' @@ -481,6 +481,22 @@ log('run_rdfgen: rdfgen_cmd = %s' % (rdfgen_cmd,)) os.system(rdfgen_cmd) + def run_genbasedir(self, target): + genbasedir_rpms_target = os.path.join(target, 'i586', self.DISTRIBUTION) + + genbasedir_cmd = 'genbasedir' + genbasedir_cmd = genbasedir_cmd + ' --bloat' + genbasedir_cmd = genbasedir_cmd + ' -s' + genbasedir_cmd = genbasedir_cmd + ' ---default-key=%s' % (self.SIGN_KEY,) + genbasedir_cmd = genbasedir_cmd + ' --meta=all' + genbasedir_cmd = genbasedir_cmd + ' ' + genbasedir_rpms_target + + log('run_genbasedir: running genbasedir for %s version %s' % (distroname, self.VERSION)) + + log('run_genbasedir: genbasedir_cmd = %s' % (genbasedir_cmd,)) + os.system(genbasedir_cmd) + + def fix_permissions(self, target): find_file_cmd = 'find "%s" -type f | xargs chmod 644' find_dir_cmd = 'find "%s" -type d | xargs chmod 755' @@ -619,8 +635,8 @@ binary_target = os.path.join(target, 'i586') comps_target = os.path.join(binary_target, self.DISTRIBUTION, 'base') - rpms_target = os.path.join(binary_target, self.DISTRIBUTION, 'rpms') - srpms_target = os.path.join(target, 'srpms') + rpms_target = os.path.join(binary_target, self.DISTRIBUTION, 'rpms.os') + srpms_target = os.path.join(target, 'srpms.os') iso_target = os.path.join(target, 'iso') rpms_list = self.get_rpms_list((rpms,)) @@ -644,7 +660,8 @@ self.run_buildinstall(target) self.run_genhdlist(target) - self.run_rdfgen(target) + # self.run_rdfgen(target) + self.run_genbasedir(target) self.run_md5sum((rpms_target, srpms_target)) self.copy_kickstart(target) From svn at tinysofa.org Sat Jul 17 16:21:13 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Sun, 18 Jul 2004 02:21:13 +1000 (EST) Subject: [tinysofa-svn] r3165 - tinysofa/releases/1.1/apt/current/sources Message-ID: <20040717162113.A2A024E8031@minbar.tinysofa.org> Author: jh Date: 2004-07-18 02:21:13 +1000 (Sun, 18 Jul 2004) New Revision: 3165 Modified: tinysofa/releases/1.1/apt/current/sources/sources.list Log: - update default config for 1.1 Modified: tinysofa/releases/1.1/apt/current/sources/sources.list =================================================================== --- tinysofa/releases/1.1/apt/current/sources/sources.list 2004-07-17 14:04:48 UTC (rev 3164) +++ tinysofa/releases/1.1/apt/current/sources/sources.list 2004-07-17 16:21:13 UTC (rev 3165) @@ -21,20 +21,20 @@ # # Virginia - tinysofa main site (FTP) -rpm [tssig] ftp://apt.tinysofa.org/pub/tinysofa prereleases/server-2.0/ARCH/tinysofa all -rpm-src [tssig] ftp://apt.tinysofa.org/pub/tinysofa prereleases/server-2.0/ARCH/tinysofa all +rpm [tssig] ftp://apt.tinysofa.org/pub/tinysofa prereleases/server-1.1/ARCH/tinysofa all +rpm-src [tssig] ftp://apt.tinysofa.org/pub/tinysofa prereleases/server-1.1/ARCH/tinysofa all # Virginia - tinysofa main site (HTTP) -# rpm [tssig] http://apt.tinysofa.org/pub/tinysofa prereleases/server-2.0/ARCH/tinysofa all -# rpm-src [tssig] http://apt.tinysofa.org/pub/tinysofa prereleases/server-2.0/ARCH/tinysofa all +# rpm [tssig] http://apt.tinysofa.org/pub/tinysofa prereleases/server-1.1/ARCH/tinysofa all +# rpm-src [tssig] http://apt.tinysofa.org/pub/tinysofa prereleases/server-1.1/ARCH/tinysofa all # Updates have their own repository. -rpm [tssig] ftp://apt.tinysofa.org/pub/tinysofa updates/server-2.0/ARCH/tinysofa updates -rpm-src [tssig] ftp://apt.tinysofa.org/pub/tinysofa updates/server-2.0/ARCH/tinysofa updates +rpm [tssig] ftp://apt.tinysofa.org/pub/tinysofa updates/server-1.1/ARCH/tinysofa updates +rpm-src [tssig] ftp://apt.tinysofa.org/pub/tinysofa updates/server-1.1/ARCH/tinysofa updates # Contrib has its own repository. -rpm [tssig] ftp://apt.tinysofa.org/pub/tinysofa contrib/server-2.0/ARCH/tinysofa contrib -rpm-src [tssig] ftp://apt.tinysofa.org/pub/tinysofa contrib/server-2.0/ARCH/tinysofa contrib +rpm [tssig] ftp://apt.tinysofa.org/pub/tinysofa contrib/server-1.1/ARCH/tinysofa contrib +rpm-src [tssig] ftp://apt.tinysofa.org/pub/tinysofa contrib/server-1.1/ARCH/tinysofa contrib # tinysofa mirrors # Since less people use them, they are faster... @@ -43,78 +43,78 @@ # Australia # Brisbane - PlanetMirror (FTP) -# rpm [tssig] ftp://ftp.planetmirror.com/pub/tinysofa prereleases/server-2.0/ARCH/tinysofa all -# rpm-src [tssig] ftp://ftp.planetmirror.com/pub/tinysofa prereleases/server-2.0/ARCH/tinysofa all +# rpm [tssig] ftp://ftp.planetmirror.com/pub/tinysofa prereleases/server-1.1/ARCH/tinysofa all +# rpm-src [tssig] ftp://ftp.planetmirror.com/pub/tinysofa prereleases/server-1.1/ARCH/tinysofa all # Brisbane - PlanetMirror (HTTP) -# rpm [tssig] http://www.planetmirror.com/pub/tinysofa prereleases/server-2.0/ARCH/tinysofa all -# rpm-src [tssig] http://www.planetmirror.com/pub/tinysofa prereleases/server-2.0/ARCH/tinysofa all +# rpm [tssig] http://www.planetmirror.com/pub/tinysofa prereleases/server-1.1/ARCH/tinysofa all +# rpm-src [tssig] http://www.planetmirror.com/pub/tinysofa prereleases/server-1.1/ARCH/tinysofa all # Sydney - Link Innovations (FTP) -# rpm [tssig] ftp://tinysofa.mirror.linkinnovations.com prereleases/server-2.0/ARCH/tinysofa all -# rpm-src [tssig] ftp://tinysofa.mirror.linkinnovations.com prereleases/server-2.0/ARCH/tinysofa all +# rpm [tssig] ftp://tinysofa.mirror.linkinnovations.com prereleases/server-1.1/ARCH/tinysofa all +# rpm-src [tssig] ftp://tinysofa.mirror.linkinnovations.com prereleases/server-1.1/ARCH/tinysofa all # Sydney - Link Innovations (HTTP) -# rpm [tssig] http://tinysofa.mirror.linkinnovations.com prereleases/server-2.0/ARCH/tinysofa all -# rpm-src [tssig] http://tinysofa.mirror.linkinnovations.com prereleases/server-2.0/ARCH/tinysofa all +# rpm [tssig] http://tinysofa.mirror.linkinnovations.com prereleases/server-1.1/ARCH/tinysofa all +# rpm-src [tssig] http://tinysofa.mirror.linkinnovations.com prereleases/server-1.1/ARCH/tinysofa all # Sydney - Pacific Internet (FTP) -# rpm [tssig] ftp://mirror.pacific.net.au/pub2/linux2/tinysofa/ prereleases/server-2.0/ARCH/tinysofa all -# rpm-src [tssig] ftp://mirror.pacific.net.au/pub2/linux2/tinysofa/ prereleases/server-2.0/ARCH/tinysofa all +# rpm [tssig] ftp://mirror.pacific.net.au/pub2/linux2/tinysofa/ prereleases/server-1.1/ARCH/tinysofa all +# rpm-src [tssig] ftp://mirror.pacific.net.au/pub2/linux2/tinysofa/ prereleases/server-1.1/ARCH/tinysofa all # Sydney - Pacific Internet (HTTP) -# rpm [tssig] http://mirror.pacific.net.au/linux/tinysofa/ prereleases/server-2.0/ARCH/tinysofa all -# rpm-src [tssig] http://mirror.pacific.net.au/linux/tinysofa/ prereleases/server-2.0/ARCH/tinysofa all +# rpm [tssig] http://mirror.pacific.net.au/linux/tinysofa/ prereleases/server-1.1/ARCH/tinysofa all +# rpm-src [tssig] http://mirror.pacific.net.au/linux/tinysofa/ prereleases/server-1.1/ARCH/tinysofa all # Hobart - KeyPoint (FTP) -# rpm [tssig] ftp://ftp.tas.keypoint.com.au/pub/tinysofa prereleases/server-2.0/ARCH/tinysofa all -# rpm-src [tssig] ftp://ftp.tas.keypoint.com.au/pub/tinysofa prereleases/server-2.0/ARCH/tinysofa all +# rpm [tssig] ftp://ftp.tas.keypoint.com.au/pub/tinysofa prereleases/server-1.1/ARCH/tinysofa all +# rpm-src [tssig] ftp://ftp.tas.keypoint.com.au/pub/tinysofa prereleases/server-1.1/ARCH/tinysofa all # Hobart - KeyPoint (HTTP) -# rpm [tssig] http://ftp.tas.keypoint.com.au/pub/tinysofa prereleases/server-2.0/ARCH/tinysofa all -# rpm-src [tssig] http://ftp.tas.keypoint.com.au/pub/tinysofa prereleases/server-2.0/ARCH/tinysofa all +# rpm [tssig] http://ftp.tas.keypoint.com.au/pub/tinysofa prereleases/server-1.1/ARCH/tinysofa all +# rpm-src [tssig] http://ftp.tas.keypoint.com.au/pub/tinysofa prereleases/server-1.1/ARCH/tinysofa all # Europe # France - Netsolux (HTTP) -# rpm [tssig] http://www.netsolux.ch/tinysofa/ prereleases/server-2.0/ARCH/tinysofa all -# rpm-src [tssig] http://www.netsolux.ch/tinysofa/ prereleases/server-2.0/ARCH/tinysofa all +# rpm [tssig] http://www.netsolux.ch/tinysofa/ prereleases/server-1.1/ARCH/tinysofa all +# rpm-src [tssig] http://www.netsolux.ch/tinysofa/ prereleases/server-1.1/ARCH/tinysofa all # Budapest, Hungary - Iszerviz (FTP) -# rpm [tssig] ftp://tinysofa.iszerviz.hu/tinysofa/ prereleases/server-2.0/ARCH/tinysofa all -# rpm-src [tssig] ftp://tinysofa.iszerviz.hu/tinysofa/ prereleases/server-2.0/ARCH/tinysofa all +# rpm [tssig] ftp://tinysofa.iszerviz.hu/tinysofa/ prereleases/server-1.1/ARCH/tinysofa all +# rpm-src [tssig] ftp://tinysofa.iszerviz.hu/tinysofa/ prereleases/server-1.1/ARCH/tinysofa all # Budapest, Hungary - Iszerviz (HTTP) -# rpm [tssig] http://tinysofa.iszerviz.hu/ prereleases/server-2.0/ARCH/tinysofa all -# rpm-src [tssig] http://tinysofa.iszerviz.hu/ prereleases/server-2.0/ARCH/tinysofa all +# rpm [tssig] http://tinysofa.iszerviz.hu/ prereleases/server-1.1/ARCH/tinysofa all +# rpm-src [tssig] http://tinysofa.iszerviz.hu/ prereleases/server-1.1/ARCH/tinysofa all # Netherlands - EasyNet (FTP) -# rpm [tssig] ftp://ftp.easynet.nl/mirror/tinysofa prereleases/server-2.0/ARCH/tinysofa all -# rpm-src [tssig] ftp://ftp.easynet.nl/mirror/tinysofa prereleases/server-2.0/ARCH/tinysofa all +# rpm [tssig] ftp://ftp.easynet.nl/mirror/tinysofa prereleases/server-1.1/ARCH/tinysofa all +# rpm-src [tssig] ftp://ftp.easynet.nl/mirror/tinysofa prereleases/server-1.1/ARCH/tinysofa all # Netherlands - EasyNet (HTTP) -# rpm [tssig] http://ftp.easynet.nl/mirror/tinysofa prereleases/server-2.0/ARCH/tinysofa all -# rpm-src [tssig] http://ftp.easynet.nl/mirror/tinysofa prereleases/server-2.0/ARCH/tinysofa all +# rpm [tssig] http://ftp.easynet.nl/mirror/tinysofa prereleases/server-1.1/ARCH/tinysofa all +# rpm-src [tssig] http://ftp.easynet.nl/mirror/tinysofa prereleases/server-1.1/ARCH/tinysofa all # Sweden - Skellefte? (FTP) -# rpm [tssig] ftp://ftp.campus.skelleftea.se/pub/mirror/tinysofa.org/tinysofa/ prereleases/server-2.0/ARCH/tinysofa all -# rpm-src [tssig] ftp://ftp.campus.skelleftea.se/pub/mirror/tinysofa.org/tinysofa/ prereleases/server-2.0/ARCH/tinysofa all +# rpm [tssig] ftp://ftp.campus.skelleftea.se/pub/mirror/tinysofa.org/tinysofa/ prereleases/server-1.1/ARCH/tinysofa all +# rpm-src [tssig] ftp://ftp.campus.skelleftea.se/pub/mirror/tinysofa.org/tinysofa/ prereleases/server-1.1/ARCH/tinysofa all # Sweden - Skellefte? (HTTP) -# rpm [tssig] http://ftp.campus.skelleftea.se/pub/mirror/tinysofa.org/tinysofa/ prereleases/server-2.0/ARCH/tinysofa all -# rpm-src [tssig] http://ftp.campus.skelleftea.se/pub/mirror/tinysofa.org/tinysofa/ prereleases/server-2.0/ARCH/tinysofa all +# rpm [tssig] http://ftp.campus.skelleftea.se/pub/mirror/tinysofa.org/tinysofa/ prereleases/server-1.1/ARCH/tinysofa all +# rpm-src [tssig] http://ftp.campus.skelleftea.se/pub/mirror/tinysofa.org/tinysofa/ prereleases/server-1.1/ARCH/tinysofa all # North America # North Carolina - ibiblio (FTP) -# rpm [tssig] ftp://ftp.ibiblio.org/pub/linux/distributions/tinysofa prereleases/server-2.0/ARCH/tinysofa all -# rpm-src [tssig] ftp://ftp.ibiblio.org/pub/linux/distributions/tinysofa prereleases/server-2.0/ARCH/tinysofa all +# rpm [tssig] ftp://ftp.ibiblio.org/pub/linux/distributions/tinysofa prereleases/server-1.1/ARCH/tinysofa all +# rpm-src [tssig] ftp://ftp.ibiblio.org/pub/linux/distributions/tinysofa prereleases/server-1.1/ARCH/tinysofa all # North Carolina - ibiblio (HTTP) -# rpm [tssig] http://www.ibiblio.org/pub/linux/distributions/tinysofa prereleases/server-2.0/ARCH/tinysofa all -# rpm-src [tssig] http://www.ibiblio.org/pub/linux/distributions/tinysofa prereleases/server-2.0/ARCH/tinysofa all +# rpm [tssig] http://www.ibiblio.org/pub/linux/distributions/tinysofa prereleases/server-1.1/ARCH/tinysofa all +# rpm-src [tssig] http://www.ibiblio.org/pub/linux/distributions/tinysofa prereleases/server-1.1/ARCH/tinysofa all # Texas - tinysofa backup site (FTP) -# rpm [tssig] ftp://ftp.tinysofa.org/pub/tinysofa prereleases/server-2.0/ARCH/tinysofa all -# rpm-src [tssig] ftp://ftp.tinysofa.org/pub/tinysofa prereleases/server-2.0/ARCH/tinysofa all +# rpm [tssig] ftp://ftp.tinysofa.org/pub/tinysofa prereleases/server-1.1/ARCH/tinysofa all +# rpm-src [tssig] ftp://ftp.tinysofa.org/pub/tinysofa prereleases/server-1.1/ARCH/tinysofa all From svn at tinysofa.org Sat Jul 17 16:21:50 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Sun, 18 Jul 2004 02:21:50 +1000 (EST) Subject: [tinysofa-svn] r3166 - tinysofa/releases/1.1/kernel/current/sources Message-ID: <20040717162150.F043A4E8031@minbar.tinysofa.org> Author: jh Date: 2004-07-18 02:21:50 +1000 (Sun, 18 Jul 2004) New Revision: 3166 Modified: tinysofa/releases/1.1/kernel/current/sources/kernel-2.4.21-i586-smp.config tinysofa/releases/1.1/kernel/current/sources/kernel-2.4.21-i586.config Log: - update kernel configs Modified: tinysofa/releases/1.1/kernel/current/sources/kernel-2.4.21-i586-smp.config =================================================================== --- tinysofa/releases/1.1/kernel/current/sources/kernel-2.4.21-i586-smp.config 2004-07-17 16:21:13 UTC (rev 3165) +++ tinysofa/releases/1.1/kernel/current/sources/kernel-2.4.21-i586-smp.config 2004-07-17 16:21:50 UTC (rev 3166) @@ -121,7 +121,7 @@ CONFIG_HOTPLUG_PCI_COMPAQ=m # CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM is not set CONFIG_HOTPLUG_PCI_IBM=m -CONFIG_HOTPLUG_PCI_ACPI=m +CONFIG_HOTPLUG_PCI_ACPI=n CONFIG_SYSVIPC=y CONFIG_BSD_PROCESS_ACCT=y CONFIG_SYSCTL=y @@ -791,7 +791,7 @@ CONFIG_VT_CONSOLE=y CONFIG_SERIAL=y CONFIG_SERIAL_CONSOLE=y -CONFIG_SERIAL_ACPI=y +CONFIG_SERIAL_ACPI=n # CONFIG_SERIAL_EXTENDED is not set # CONFIG_SERIAL_NONSTANDARD is not set CONFIG_UNIX98_PTYS=y @@ -820,7 +820,7 @@ CONFIG_I2C_ALI15X3=m CONFIG_I2C_HYDRA=m CONFIG_I2C_AMD756=m -CONFIG_I2C_TSUNAMI=m +CONFIG_I2C_TSUNAMI=n CONFIG_I2C_I801=m CONFIG_I2C_I810=m CONFIG_I2C_PIIX4=m @@ -1043,7 +1043,7 @@ # Network File Systems # CONFIG_CODA_FS=m -CONFIG_INTERMEZZO_FS=m +CONFIG_INTERMEZZO_FS=n CONFIG_NFS_FS=m CONFIG_NFS_V3=y # CONFIG_NFS_DIRECTIO is not set Modified: tinysofa/releases/1.1/kernel/current/sources/kernel-2.4.21-i586.config =================================================================== --- tinysofa/releases/1.1/kernel/current/sources/kernel-2.4.21-i586.config 2004-07-17 16:21:13 UTC (rev 3165) +++ tinysofa/releases/1.1/kernel/current/sources/kernel-2.4.21-i586.config 2004-07-17 16:21:50 UTC (rev 3166) @@ -77,10 +77,11 @@ # CONFIG_MATH_EMULATION is not set CONFIG_MTRR=y # CONFIG_SMP is not set -CONFIG_X86_UP_APIC=y -CONFIG_X86_UP_IOAPIC=y -CONFIG_X86_LOCAL_APIC=y +CONFIG_X86_UP_APIC=n +CONFIG_X86_UP_IOAPIC=n +CONFIG_X86_LOCAL_APIC=n CONFIG_X86_IO_APIC=y +CONFIG_X86_CLUSTERED_APIC=y # CONFIG_X86_TSC_DISABLE is not set # @@ -112,7 +113,7 @@ CONFIG_HOTPLUG_PCI_COMPAQ=m # CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM is not set CONFIG_HOTPLUG_PCI_IBM=m -CONFIG_HOTPLUG_PCI_ACPI=m +CONFIG_HOTPLUG_PCI_ACPI=n CONFIG_SYSVIPC=y CONFIG_BSD_PROCESS_ACCT=y CONFIG_SYSCTL=y @@ -782,7 +783,7 @@ CONFIG_VT_CONSOLE=y CONFIG_SERIAL=y CONFIG_SERIAL_CONSOLE=y -CONFIG_SERIAL_ACPI=y +CONFIG_SERIAL_ACPI=n # CONFIG_SERIAL_EXTENDED is not set # CONFIG_SERIAL_NONSTANDARD is not set CONFIG_UNIX98_PTYS=y @@ -811,7 +812,7 @@ CONFIG_I2C_ALI15X3=m CONFIG_I2C_HYDRA=m CONFIG_I2C_AMD756=m -CONFIG_I2C_TSUNAMI=m +CONFIG_I2C_TSUNAMI=n CONFIG_I2C_I801=m CONFIG_I2C_I810=m CONFIG_I2C_PIIX4=m @@ -1034,7 +1035,7 @@ # Network File Systems # CONFIG_CODA_FS=m -CONFIG_INTERMEZZO_FS=m +CONFIG_INTERMEZZO_FS=n CONFIG_NFS_FS=m CONFIG_NFS_V3=y # CONFIG_NFS_DIRECTIO is not set From svn at tinysofa.org Sun Jul 18 11:24:10 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Sun, 18 Jul 2004 21:24:10 +1000 (EST) Subject: [tinysofa-svn] r3167 - tinysofa/releases/1.1/perl/current/specs Message-ID: <20040718112410.1B9E34E8031@minbar.tinysofa.org> Author: jh Date: 2004-07-18 21:24:09 +1000 (Sun, 18 Jul 2004) New Revision: 3167 Modified: tinysofa/releases/1.1/perl/current/specs/perl.spec Log: - i586 -> %{_arch} Modified: tinysofa/releases/1.1/perl/current/specs/perl.spec =================================================================== --- tinysofa/releases/1.1/perl/current/specs/perl.spec 2004-07-17 16:21:50 UTC (rev 3166) +++ tinysofa/releases/1.1/perl/current/specs/perl.spec 2004-07-18 11:24:09 UTC (rev 3167) @@ -2,7 +2,7 @@ Name: perl Version: 5.8.4 Epoch: 1 -Release: 3ts +Release: 4jh License: GPL Group: main Url: http://www.perl.com @@ -130,7 +130,7 @@ install -d -m 755 $RPM_BUILD_ROOT%{perl_root}/%{version}/%{full_arch} install -d -m 755 $RPM_BUILD_ROOT%{perl_root}/%{version}/%{full_arch}/auto -install -d -m 755 $RPM_BUILD_ROOT%{perl_root}/site_perl/%{version}/i586-linux +install -d -m 755 $RPM_BUILD_ROOT%{perl_root}/site_perl/%{version}/%{_arch}-linux install -d -m 755 $RPM_BUILD_ROOT%{perl_root}/site_perl/%{version}/%{full_arch} install -d -m 755 $RPM_BUILD_ROOT%{perl_root}/site_perl/%{version}/%{full_arch}/auto @@ -302,7 +302,7 @@ %{perl_root}/%{version}/warnings/register.pm %dir %{perl_root}/site_perl %dir %{perl_root}/site_perl/%{version} -%dir %{perl_root}/site_perl/%{version}/i586-linux +%dir %{perl_root}/site_perl/%{version}/%{_arch}-linux %dir %{perl_root}/%{version}/pod %{perl_root}/%{version}/pod/perldiag.pod %if %threading From svn at tinysofa.org Sun Jul 18 12:06:20 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Sun, 18 Jul 2004 22:06:20 +1000 (EST) Subject: [tinysofa-svn] r3168 - tinysofa/releases/1.1/tinysofa-utils/current/sources Message-ID: <20040718120620.AB8134E8031@minbar.tinysofa.org> Author: torh Date: 2004-07-18 22:06:20 +1000 (Sun, 18 Jul 2004) New Revision: 3168 Modified: tinysofa/releases/1.1/tinysofa-utils/current/sources/tsrelease Log: update for new rdfgen with detached sigs Modified: tinysofa/releases/1.1/tinysofa-utils/current/sources/tsrelease =================================================================== --- tinysofa/releases/1.1/tinysofa-utils/current/sources/tsrelease 2004-07-18 11:24:09 UTC (rev 3167) +++ tinysofa/releases/1.1/tinysofa-utils/current/sources/tsrelease 2004-07-18 12:06:20 UTC (rev 3168) @@ -464,6 +464,8 @@ rdfgen_rdfs_target = os.path.join(target, 'i586', self.DISTRIBUTION, 'rdfs') rdfgen_rpms_target = os.path.join(target, 'i586', self.DISTRIBUTION, 'rpms') + signaturedirname = '../signatures' #place package signatures in rdfs/signatures + self.delete_dir(rdfgen_rdfs_target) os.chdir(rdfgen_target) @@ -474,9 +476,10 @@ rdfgen_cmd = rdfgen_cmd + ' -S' # sign rdfgen_cmd = rdfgen_cmd + ' -k %s' % (self.SIGN_KEY,) # using key rdfgen_cmd = rdfgen_cmd + ' -P %s' % (self.SIGN_PASSFILE,) # using pass + rdfgen_cmd = rdfgen_cmd + ' -s %s' % (signaturedirname) rdfgen_cmd = rdfgen_cmd + ' -c' # compress rdfgen_cmd = rdfgen_cmd + ' -o rdfs' - rdfgen_cmd = rdfgen_cmd + ' rpms/*.rpm' + rdfgen_cmd = rdfgen_cmd + ' rpms*' log('run_rdfgen: rdfgen_cmd = %s' % (rdfgen_cmd,)) os.system(rdfgen_cmd) @@ -660,7 +663,7 @@ self.run_buildinstall(target) self.run_genhdlist(target) - # self.run_rdfgen(target) + self.run_rdfgen(target) self.run_genbasedir(target) self.run_md5sum((rpms_target, srpms_target)) self.copy_kickstart(target) From svn at tinysofa.org Sun Jul 18 17:33:56 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Mon, 19 Jul 2004 03:33:56 +1000 (EST) Subject: [tinysofa-svn] r3169 - tinysofa/misc/comps/releases/1.1 Message-ID: <20040718173356.253D94E8031@minbar.tinysofa.org> Author: jh Date: 2004-07-19 03:33:55 +1000 (Mon, 19 Jul 2004) New Revision: 3169 Modified: tinysofa/misc/comps/releases/1.1/comps Log: - remove db1 Modified: tinysofa/misc/comps/releases/1.1/comps =================================================================== --- tinysofa/misc/comps/releases/1.1/comps 2004-07-18 12:06:20 UTC (rev 3168) +++ tinysofa/misc/comps/releases/1.1/comps 2004-07-18 17:33:55 UTC (rev 3169) @@ -20,7 +20,6 @@ cracklib-dicts crontabs cyrus-sasl - db1 db4 diffutils e2fsprogs From svn at tinysofa.org Sun Jul 18 17:47:08 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Mon, 19 Jul 2004 03:47:08 +1000 (EST) Subject: [tinysofa-svn] r3170 - tinysofa/misc/comps/releases/1.1 Message-ID: <20040718174708.C1AD44E8031@minbar.tinysofa.org> Author: jh Date: 2004-07-19 03:47:08 +1000 (Mon, 19 Jul 2004) New Revision: 3170 Modified: tinysofa/misc/comps/releases/1.1/comps Log: - remove openssh-server-config Modified: tinysofa/misc/comps/releases/1.1/comps =================================================================== --- tinysofa/misc/comps/releases/1.1/comps 2004-07-18 17:33:55 UTC (rev 3169) +++ tinysofa/misc/comps/releases/1.1/comps 2004-07-18 17:47:08 UTC (rev 3170) @@ -122,7 +122,6 @@ openssh openssh-clients openssh-server - openssh-server-config openssl } From svn at tinysofa.org Sun Jul 18 18:58:13 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Mon, 19 Jul 2004 04:58:13 +1000 (EST) Subject: [tinysofa-svn] r3171 - tinysofa/releases/1.1/tinysofa-utils/current/sources Message-ID: <20040718185813.DA8B54E8031@minbar.tinysofa.org> Author: jh Date: 2004-07-19 04:58:13 +1000 (Mon, 19 Jul 2004) New Revision: 3171 Modified: tinysofa/releases/1.1/tinysofa-utils/current/sources/tsrelease Log: - fix run_genbasedir Modified: tinysofa/releases/1.1/tinysofa-utils/current/sources/tsrelease =================================================================== --- tinysofa/releases/1.1/tinysofa-utils/current/sources/tsrelease 2004-07-18 17:47:08 UTC (rev 3170) +++ tinysofa/releases/1.1/tinysofa-utils/current/sources/tsrelease 2004-07-18 18:58:13 UTC (rev 3171) @@ -494,6 +494,8 @@ genbasedir_cmd = genbasedir_cmd + ' --meta=all' genbasedir_cmd = genbasedir_cmd + ' ' + genbasedir_rpms_target + distroname = ' '.join([self.DISTRIBUTION, self.PRODUCT]) + log('run_genbasedir: running genbasedir for %s version %s' % (distroname, self.VERSION)) log('run_genbasedir: genbasedir_cmd = %s' % (genbasedir_cmd,)) From svn at tinysofa.org Sun Jul 18 19:34:05 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Mon, 19 Jul 2004 05:34:05 +1000 (EST) Subject: [tinysofa-svn] r3172 - tinysofa/releases/1.1/tinysofa-utils/current/sources Message-ID: <20040718193405.A3C5A4E8031@minbar.tinysofa.org> Author: jh Date: 2004-07-19 05:34:05 +1000 (Mon, 19 Jul 2004) New Revision: 3172 Modified: tinysofa/releases/1.1/tinysofa-utils/current/sources/tsrelease Log: - do not gpg sign rpms - correct --default-key option for genbasedir Modified: tinysofa/releases/1.1/tinysofa-utils/current/sources/tsrelease =================================================================== --- tinysofa/releases/1.1/tinysofa-utils/current/sources/tsrelease 2004-07-18 18:58:13 UTC (rev 3171) +++ tinysofa/releases/1.1/tinysofa-utils/current/sources/tsrelease 2004-07-18 19:34:05 UTC (rev 3172) @@ -490,7 +490,7 @@ genbasedir_cmd = 'genbasedir' genbasedir_cmd = genbasedir_cmd + ' --bloat' genbasedir_cmd = genbasedir_cmd + ' -s' - genbasedir_cmd = genbasedir_cmd + ' ---default-key=%s' % (self.SIGN_KEY,) + genbasedir_cmd = genbasedir_cmd + ' --default-key=%s' % (self.SIGN_KEY,) genbasedir_cmd = genbasedir_cmd + ' --meta=all' genbasedir_cmd = genbasedir_cmd + ' ' + genbasedir_rpms_target @@ -658,7 +658,7 @@ self.copy_srpms_to_target(srpms, srpms_target) self.rpm_sign_rpms((rpms_target, srpms_target)) - self.gpg_sign_rpms((rpms_target, srpms_target)) + # self.gpg_sign_rpms((rpms_target, srpms_target)) self.delete_asc(rpms) self.delete_md5sum(srpms) From svn at tinysofa.org Mon Jul 19 06:28:09 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Mon, 19 Jul 2004 16:28:09 +1000 (EST) Subject: [tinysofa-svn] r3173 - tinysofa/releases/1.0/mod_php4/current/specs Message-ID: <20040719062809.C91B34E8031@minbar.tinysofa.org> Author: omar Date: 2004-07-19 16:28:09 +1000 (Mon, 19 Jul 2004) New Revision: 3173 Modified: tinysofa/releases/1.0/mod_php4/current/specs/mod_php4.spec Log: - BR postfix for mail(). Modified: tinysofa/releases/1.0/mod_php4/current/specs/mod_php4.spec =================================================================== --- tinysofa/releases/1.0/mod_php4/current/specs/mod_php4.spec 2004-07-18 19:34:05 UTC (rev 3172) +++ tinysofa/releases/1.0/mod_php4/current/specs/mod_php4.spec 2004-07-19 06:28:09 UTC (rev 3173) @@ -23,6 +23,7 @@ BuildRequires: cyrus-sasl-devel, readline-devel, db4-devel BuildRequires: rpm-build >= 4.0.4-22gd pam-devel ncurses-devel BuildRequires: pcre-devel +BuildRequires: postfix Provides: php = %{version} %if !%{_openssl_shared} Obsoletes: mod_php4-openssl From svn at tinysofa.org Mon Jul 19 06:28:39 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Mon, 19 Jul 2004 16:28:39 +1000 (EST) Subject: [tinysofa-svn] r3174 - in tinysofa/releases/1.0/mod_php4: current/specs releases/4.3.8 releases/4.3.8/2ts/specs Message-ID: <20040719062839.E509B4E8031@minbar.tinysofa.org> Author: omar Date: 2004-07-19 16:28:39 +1000 (Mon, 19 Jul 2004) New Revision: 3174 Added: tinysofa/releases/1.0/mod_php4/releases/4.3.8/2ts/ Modified: tinysofa/releases/1.0/mod_php4/current/specs/mod_php4.spec tinysofa/releases/1.0/mod_php4/releases/4.3.8/2ts/specs/mod_php4.spec Log: mod_php4: * integrate current (4.3.8-1ts) as releases/4.3.8/2ts Modified: tinysofa/releases/1.0/mod_php4/current/specs/mod_php4.spec =================================================================== --- tinysofa/releases/1.0/mod_php4/current/specs/mod_php4.spec 2004-07-19 06:28:09 UTC (rev 3173) +++ tinysofa/releases/1.0/mod_php4/current/specs/mod_php4.spec 2004-07-19 06:28:39 UTC (rev 3174) @@ -7,7 +7,7 @@ Summary: The PHP4 HTML-embedded scripting language for use with Apache. Name: mod_php4 Version: 4.3.8 -Release: 1ts +Release: 2ts Group: tinysofa official Source0: http://www.php.net/distributions/php-%{version}.tar.bz2 Source1: php.ini @@ -336,6 +336,9 @@ /usr/share/php4/sysvshm.so %changelog +* Mon Jul 19 2004 tsintegrate 4.3.8-2ts +- current (4.3.8-1ts) integrated as 4.3.8-2ts for release 1.0-U3 + * Wed Jul 14 2004 tsintegrate 4.3.8-1ts - current (4.3.8-2ts) integrated as 4.3.8-1ts for release 1.0-U3 Copied: tinysofa/releases/1.0/mod_php4/releases/4.3.8/2ts (from rev 3173, tinysofa/releases/1.0/mod_php4/current) Modified: tinysofa/releases/1.0/mod_php4/releases/4.3.8/2ts/specs/mod_php4.spec =================================================================== --- tinysofa/releases/1.0/mod_php4/current/specs/mod_php4.spec 2004-07-19 06:28:09 UTC (rev 3173) +++ tinysofa/releases/1.0/mod_php4/releases/4.3.8/2ts/specs/mod_php4.spec 2004-07-19 06:28:39 UTC (rev 3174) @@ -7,7 +7,7 @@ Summary: The PHP4 HTML-embedded scripting language for use with Apache. Name: mod_php4 Version: 4.3.8 -Release: 1ts +Release: 2ts Group: tinysofa official Source0: http://www.php.net/distributions/php-%{version}.tar.bz2 Source1: php.ini @@ -336,6 +336,9 @@ /usr/share/php4/sysvshm.so %changelog +* Mon Jul 19 2004 tsintegrate 4.3.8-2ts +- current (4.3.8-1ts) integrated as 4.3.8-2ts for release 1.0-U3 + * Wed Jul 14 2004 tsintegrate 4.3.8-1ts - current (4.3.8-2ts) integrated as 4.3.8-1ts for release 1.0-U3 From svn at tinysofa.org Mon Jul 19 06:28:41 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Mon, 19 Jul 2004 16:28:41 +1000 (EST) Subject: [tinysofa-svn] r3175 - tinysofa/releases/1.0/mod_php4 Message-ID: <20040719062841.8550D4E8031@minbar.tinysofa.org> Author: omar Date: 2004-07-19 16:28:41 +1000 (Mon, 19 Jul 2004) New Revision: 3175 Removed: tinysofa/releases/1.0/mod_php4/pristine/ Log: mod_php4: * removing pristine (4.3.8-1ts) From svn at tinysofa.org Mon Jul 19 06:28:42 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Mon, 19 Jul 2004 16:28:42 +1000 (EST) Subject: [tinysofa-svn] r3176 - tinysofa/releases/1.0/mod_php4 Message-ID: <20040719062842.DE8FA4E8031@minbar.tinysofa.org> Author: omar Date: 2004-07-19 16:28:42 +1000 (Mon, 19 Jul 2004) New Revision: 3176 Added: tinysofa/releases/1.0/mod_php4/pristine/ Log: mod_php4: * retarget pristine (4.3.8-1ts) to releases/4.3.8/2ts Copied: tinysofa/releases/1.0/mod_php4/pristine (from rev 3174, tinysofa/releases/1.0/mod_php4/releases/4.3.8/2ts) From svn at tinysofa.org Mon Jul 19 06:39:52 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Mon, 19 Jul 2004 16:39:52 +1000 (EST) Subject: [tinysofa-svn] r3177 - tinysofa/releases/1.0/release/current/specs Message-ID: <20040719063952.1BFEA4E8031@minbar.tinysofa.org> Author: omar Date: 2004-07-19 16:39:51 +1000 (Mon, 19 Jul 2004) New Revision: 3177 Modified: tinysofa/releases/1.0/release/current/specs/release.spec Log: - enterprise -> classic Modified: tinysofa/releases/1.0/release/current/specs/release.spec =================================================================== --- tinysofa/releases/1.0/release/current/specs/release.spec 2004-07-19 06:28:42 UTC (rev 3176) +++ tinysofa/releases/1.0/release/current/specs/release.spec 2004-07-19 06:39:51 UTC (rev 3177) @@ -1,7 +1,9 @@ +%define release_name Emily + Summary: tinysofa release file Name: release Version: 1.0 -Release: 3ts +Release: 4ts License: GPL Group: tinysofa official BuildArch: noarch @@ -17,7 +19,7 @@ %install [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/etc -echo "tinysofa enterprise server release %{version} (%{release_name})" \ +echo "tinysofa classic server release %{version} (%{release_name})" \ > $RPM_BUILD_ROOT/etc/release cat <<__EOF__ > $RPM_BUILD_ROOT/etc/issue tinysofa enterprise server release %{version} (%{release_name}) From svn at tinysofa.org Mon Jul 19 06:40:31 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Mon, 19 Jul 2004 16:40:31 +1000 (EST) Subject: [tinysofa-svn] r3178 - in tinysofa/releases/1.0/release: current/specs releases/1.0 releases/1.0/4ts/specs Message-ID: <20040719064031.BAB794E8031@minbar.tinysofa.org> Author: omar Date: 2004-07-19 16:40:31 +1000 (Mon, 19 Jul 2004) New Revision: 3178 Added: tinysofa/releases/1.0/release/releases/1.0/4ts/ Modified: tinysofa/releases/1.0/release/current/specs/release.spec tinysofa/releases/1.0/release/releases/1.0/4ts/specs/release.spec Log: release: * integrate current (1.0-4ts) as releases/1.0/4ts Modified: tinysofa/releases/1.0/release/current/specs/release.spec =================================================================== --- tinysofa/releases/1.0/release/current/specs/release.spec 2004-07-19 06:39:51 UTC (rev 3177) +++ tinysofa/releases/1.0/release/current/specs/release.spec 2004-07-19 06:40:31 UTC (rev 3178) @@ -43,6 +43,9 @@ /etc/tinysofa-release %changelog +* Mon Jul 19 2004 tsintegrate 1.0-4ts +- current (1.0-4ts) integrated as 1.0-4ts for release 1.0-U3 + * Fri Jun 18 2004 tsintegrate 1.0-3ts - current (1.0-2ts) integrated as 1.0-3ts for release 1.0-U2 Copied: tinysofa/releases/1.0/release/releases/1.0/4ts (from rev 3177, tinysofa/releases/1.0/release/current) Modified: tinysofa/releases/1.0/release/releases/1.0/4ts/specs/release.spec =================================================================== --- tinysofa/releases/1.0/release/current/specs/release.spec 2004-07-19 06:39:51 UTC (rev 3177) +++ tinysofa/releases/1.0/release/releases/1.0/4ts/specs/release.spec 2004-07-19 06:40:31 UTC (rev 3178) @@ -43,6 +43,9 @@ /etc/tinysofa-release %changelog +* Mon Jul 19 2004 tsintegrate 1.0-4ts +- current (1.0-4ts) integrated as 1.0-4ts for release 1.0-U3 + * Fri Jun 18 2004 tsintegrate 1.0-3ts - current (1.0-2ts) integrated as 1.0-3ts for release 1.0-U2 From svn at tinysofa.org Mon Jul 19 06:40:33 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Mon, 19 Jul 2004 16:40:33 +1000 (EST) Subject: [tinysofa-svn] r3179 - tinysofa/releases/1.0/release Message-ID: <20040719064033.7BA4A4E8031@minbar.tinysofa.org> Author: omar Date: 2004-07-19 16:40:33 +1000 (Mon, 19 Jul 2004) New Revision: 3179 Removed: tinysofa/releases/1.0/release/pristine/ Log: release: * removing pristine (1.0-3ts) From svn at tinysofa.org Mon Jul 19 06:40:34 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Mon, 19 Jul 2004 16:40:34 +1000 (EST) Subject: [tinysofa-svn] r3180 - tinysofa/releases/1.0/release Message-ID: <20040719064034.706F84E8031@minbar.tinysofa.org> Author: omar Date: 2004-07-19 16:40:34 +1000 (Mon, 19 Jul 2004) New Revision: 3180 Added: tinysofa/releases/1.0/release/pristine/ Log: release: * retarget pristine (1.0-3ts) to releases/1.0/4ts Copied: tinysofa/releases/1.0/release/pristine (from rev 3178, tinysofa/releases/1.0/release/releases/1.0/4ts) From svn at tinysofa.org Mon Jul 19 10:27:59 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Mon, 19 Jul 2004 20:27:59 +1000 (EST) Subject: [tinysofa-svn] r3181 - tinysofa/releases/1.1/kernel/current/sources Message-ID: <20040719102759.507584E8031@minbar.tinysofa.org> Author: jh Date: 2004-07-19 20:27:58 +1000 (Mon, 19 Jul 2004) New Revision: 3181 Modified: tinysofa/releases/1.1/kernel/current/sources/kernel-2.4.21-i586-BOOT.config Log: - update BOOT kernel config Modified: tinysofa/releases/1.1/kernel/current/sources/kernel-2.4.21-i586-BOOT.config =================================================================== --- tinysofa/releases/1.1/kernel/current/sources/kernel-2.4.21-i586-BOOT.config 2004-07-19 06:40:34 UTC (rev 3180) +++ tinysofa/releases/1.1/kernel/current/sources/kernel-2.4.21-i586-BOOT.config 2004-07-19 10:27:58 UTC (rev 3181) @@ -706,7 +706,7 @@ # CONFIG_QFMT_V1 is not set # CONFIG_QFMT_V2 is not set # CONFIG_QIFACE_COMPAT is not set -CONFIG_AUTOFS_FS=y +CONFIG_AUTOFS_FS=n # CONFIG_AUTOFS4_FS is not set CONFIG_REISERFS_FS=m # CONFIG_REISERFS_CHECK is not set @@ -720,11 +720,11 @@ CONFIG_HFSPLUS_FS=m # CONFIG_BFS_FS is not set CONFIG_EXT3_FS=m -CONFIG_EXT3_FS_XATTR=y +CONFIG_EXT3_FS_XATTR=n CONFIG_EXT3_FS_XATTR_SHARING=y CONFIG_EXT3_FS_XATTR_USER=y CONFIG_EXT3_FS_XATTR_TRUSTED=y -CONFIG_EXT3_FS_POSIX_ACL=y +CONFIG_EXT3_FS_POSIX_ACL=n CONFIG_JBD=m # CONFIG_JBD_DEBUG is not set CONFIG_FAT_FS=m @@ -995,7 +995,7 @@ # CONFIG_DEBUG_HIGHMEM is not set # CONFIG_DEBUG_SLAB is not set # CONFIG_DEBUG_IOVIRT is not set -CONFIG_MAGIC_SYSRQ=y +CONFIG_MAGIC_SYSRQ=n # CONFIG_PANIC_MORSE is not set # CONFIG_DEBUG_SPINLOCK is not set CONFIG_SMALL=y @@ -1003,23 +1003,23 @@ # # Cryptographic options # -CONFIG_CRYPTO=y -CONFIG_CRYPTO_HMAC=y -CONFIG_CRYPTO_NULL=m -CONFIG_CRYPTO_MD4=m -CONFIG_CRYPTO_MD5=m -CONFIG_CRYPTO_SHA1=m -CONFIG_CRYPTO_SHA256=m -CONFIG_CRYPTO_SHA512=m -CONFIG_CRYPTO_DES=m -CONFIG_CRYPTO_BLOWFISH=m -CONFIG_CRYPTO_TWOFISH=m -CONFIG_CRYPTO_SERPENT=m -CONFIG_CRYPTO_AES=m -CONFIG_CRYPTO_CAST5=m -CONFIG_CRYPTO_CAST6=m -CONFIG_CRYPTO_DEFLATE=m -CONFIG_CRYPTO_TEST=m +CONFIG_CRYPTO=n +CONFIG_CRYPTO_HMAC=n +CONFIG_CRYPTO_NULL=n +CONFIG_CRYPTO_MD4=n +CONFIG_CRYPTO_MD5=n +CONFIG_CRYPTO_SHA1=n +CONFIG_CRYPTO_SHA256=n +CONFIG_CRYPTO_SHA512=n +CONFIG_CRYPTO_DES=n +CONFIG_CRYPTO_BLOWFISH=n +CONFIG_CRYPTO_TWOFISH=n +CONFIG_CRYPTO_SERPENT=n +CONFIG_CRYPTO_AES=n +CONFIG_CRYPTO_CAST5=n +CONFIG_CRYPTO_CAST6=n +CONFIG_CRYPTO_DEFLATE=n +CONFIG_CRYPTO_TEST=n # # Library routines From svn at tinysofa.org Mon Jul 19 11:29:26 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Mon, 19 Jul 2004 21:29:26 +1000 (EST) Subject: [tinysofa-svn] r3182 - tinysofa/misc/comps/releases/1.1 Message-ID: <20040719112926.D6F574E8031@minbar.tinysofa.org> Author: jh Date: 2004-07-19 21:29:26 +1000 (Mon, 19 Jul 2004) New Revision: 3182 Modified: tinysofa/misc/comps/releases/1.1/comps Log: - add ipsec-tools to Firewall Modified: tinysofa/misc/comps/releases/1.1/comps =================================================================== --- tinysofa/misc/comps/releases/1.1/comps 2004-07-19 10:27:58 UTC (rev 3181) +++ tinysofa/misc/comps/releases/1.1/comps 2004-07-19 11:29:26 UTC (rev 3182) @@ -221,6 +221,7 @@ 0 Firewall { strongswan + ipsec-tools gdbm iptables libsmbpw From svn at tinysofa.org Mon Jul 19 11:34:55 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Mon, 19 Jul 2004 21:34:55 +1000 (EST) Subject: [tinysofa-svn] r3183 - tinysofa/releases/1.1/tinysofa-utils/current/sources Message-ID: <20040719113455.D2F094E8031@minbar.tinysofa.org> Author: jh Date: 2004-07-19 21:34:55 +1000 (Mon, 19 Jul 2004) New Revision: 3183 Modified: tinysofa/releases/1.1/tinysofa-utils/current/sources/tsrelease Log: - mark file as changed Modified: tinysofa/releases/1.1/tinysofa-utils/current/sources/tsrelease =================================================================== --- tinysofa/releases/1.1/tinysofa-utils/current/sources/tsrelease 2004-07-19 11:29:26 UTC (rev 3182) +++ tinysofa/releases/1.1/tinysofa-utils/current/sources/tsrelease 2004-07-19 11:34:55 UTC (rev 3183) @@ -6,6 +6,7 @@ # # Version History: # 2004-05-24: 0.1 +# 2004-07-18: Made changes for tinysofa 1.1 import sys import os From svn at tinysofa.org Mon Jul 19 20:44:40 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 20 Jul 2004 06:44:40 +1000 (EST) Subject: [tinysofa-svn] r3184 - tinysofa/releases/1.1/kudzu/current/specs Message-ID: <20040719204440.624F94E8031@minbar.tinysofa.org> Author: jh Date: 2004-07-20 06:44:40 +1000 (Tue, 20 Jul 2004) New Revision: 3184 Modified: tinysofa/releases/1.1/kudzu/current/specs/kudzu.spec Log: - remove probe-loaded patch Modified: tinysofa/releases/1.1/kudzu/current/specs/kudzu.spec =================================================================== --- tinysofa/releases/1.1/kudzu/current/specs/kudzu.spec 2004-07-19 11:34:55 UTC (rev 3183) +++ tinysofa/releases/1.1/kudzu/current/specs/kudzu.spec 2004-07-19 20:44:40 UTC (rev 3184) @@ -59,9 +59,7 @@ %preun %service_preun kudzu -# no need to restart kudzu -#%postun -#%service_postun kudzu +# no need to restart kudzu in %postun %files -f %{name}.lang %defattr(-,root,root) From svn at tinysofa.org Tue Jul 20 07:12:30 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 20 Jul 2004 17:12:30 +1000 (EST) Subject: [tinysofa-svn] r3186 - tinysofa/releases/1.1 Message-ID: <20040720071230.D38B94E8031@minbar.tinysofa.org> Author: jh Date: 2004-07-20 17:12:30 +1000 (Tue, 20 Jul 2004) New Revision: 3186 Added: tinysofa/releases/1.1/swupconf/ Log: - copy swupconf from 1.0 Copied: tinysofa/releases/1.1/swupconf (from rev 3185, tinysofa/releases/1.0/swupconf) From svn at tinysofa.org Tue Jul 20 08:06:24 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 20 Jul 2004 18:06:24 +1000 (EST) Subject: [tinysofa-svn] r3187 - in tinysofa/releases/1.0/release: current/specs pristine/specs releases/1.0/4ts/specs Message-ID: <20040720080624.405324E8031@minbar.tinysofa.org> Author: omar Date: 2004-07-20 18:06:24 +1000 (Tue, 20 Jul 2004) New Revision: 3187 Modified: tinysofa/releases/1.0/release/current/specs/release.spec tinysofa/releases/1.0/release/pristine/specs/release.spec tinysofa/releases/1.0/release/releases/1.0/4ts/specs/release.spec Log: - Fix. Modified: tinysofa/releases/1.0/release/current/specs/release.spec =================================================================== --- tinysofa/releases/1.0/release/current/specs/release.spec 2004-07-20 07:12:30 UTC (rev 3186) +++ tinysofa/releases/1.0/release/current/specs/release.spec 2004-07-20 08:06:24 UTC (rev 3187) @@ -1,4 +1,6 @@ %define release_name Emily +%define vendor tinysofa +%define product classic server Summary: tinysofa release file Name: release @@ -19,10 +21,10 @@ %install [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/etc -echo "tinysofa classic server release %{version} (%{release_name})" \ +echo "%{vendor} %{product} release %{version} (%{release_name})" \ > $RPM_BUILD_ROOT/etc/release cat <<__EOF__ > $RPM_BUILD_ROOT/etc/issue -tinysofa enterprise server release %{version} (%{release_name}) +%{vendor} %{product} release %{version} (%{release_name}) Kernel \r on an \m __EOF__ Modified: tinysofa/releases/1.0/release/pristine/specs/release.spec =================================================================== --- tinysofa/releases/1.0/release/pristine/specs/release.spec 2004-07-20 07:12:30 UTC (rev 3186) +++ tinysofa/releases/1.0/release/pristine/specs/release.spec 2004-07-20 08:06:24 UTC (rev 3187) @@ -1,4 +1,6 @@ %define release_name Emily +%define vendor tinysofa +%define product classic server Summary: tinysofa release file Name: release @@ -19,10 +21,10 @@ %install [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/etc -echo "tinysofa classic server release %{version} (%{release_name})" \ +echo "%{vendor} %{product} release %{version} (%{release_name})" \ > $RPM_BUILD_ROOT/etc/release cat <<__EOF__ > $RPM_BUILD_ROOT/etc/issue -tinysofa enterprise server release %{version} (%{release_name}) +%{vendor} %{product} release %{version} (%{release_name}) Kernel \r on an \m __EOF__ Modified: tinysofa/releases/1.0/release/releases/1.0/4ts/specs/release.spec =================================================================== --- tinysofa/releases/1.0/release/releases/1.0/4ts/specs/release.spec 2004-07-20 07:12:30 UTC (rev 3186) +++ tinysofa/releases/1.0/release/releases/1.0/4ts/specs/release.spec 2004-07-20 08:06:24 UTC (rev 3187) @@ -1,4 +1,6 @@ %define release_name Emily +%define vendor tinysofa +%define product classic server Summary: tinysofa release file Name: release @@ -19,10 +21,10 @@ %install [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/etc -echo "tinysofa classic server release %{version} (%{release_name})" \ +echo "%{vendor} %{product} release %{version} (%{release_name})" \ > $RPM_BUILD_ROOT/etc/release cat <<__EOF__ > $RPM_BUILD_ROOT/etc/issue -tinysofa enterprise server release %{version} (%{release_name}) +%{vendor} %{product} release %{version} (%{release_name}) Kernel \r on an \m __EOF__ From svn at tinysofa.org Tue Jul 20 08:08:15 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 20 Jul 2004 18:08:15 +1000 (EST) Subject: [tinysofa-svn] r3188 - in tinysofa/releases/1.0/anaconda/current: sources specs Message-ID: <20040720080815.64B104E8031@minbar.tinysofa.org> Author: omar Date: 2004-07-20 18:08:15 +1000 (Tue, 20 Jul 2004) New Revision: 3188 Modified: tinysofa/releases/1.0/anaconda/current/sources/anaconda-7.2.5-sshd.patch tinysofa/releases/1.0/anaconda/current/specs/anaconda.spec Log: - s/enterprise/classic/. Modified: tinysofa/releases/1.0/anaconda/current/sources/anaconda-7.2.5-sshd.patch =================================================================== --- tinysofa/releases/1.0/anaconda/current/sources/anaconda-7.2.5-sshd.patch 2004-07-20 08:06:24 UTC (rev 3187) +++ tinysofa/releases/1.0/anaconda/current/sources/anaconda-7.2.5-sshd.patch 2004-07-20 08:08:15 UTC (rev 3188) @@ -120,7 +120,7 @@ + return INSTALL_OK + + buttons = [ _("Yes"), _("No") ] -+ text = _("tinysofa enterprise server ships with sshd off by default.\n\n" ++ text = _("tinysofa classic server ships with sshd off by default.\n\n" + "Would you like to enable the sshd service?") + + rc = ButtonChoiceWindow(screen, _("sshd configuration"), text, Modified: tinysofa/releases/1.0/anaconda/current/specs/anaconda.spec =================================================================== --- tinysofa/releases/1.0/anaconda/current/specs/anaconda.spec 2004-07-20 08:06:24 UTC (rev 3187) +++ tinysofa/releases/1.0/anaconda/current/specs/anaconda.spec 2004-07-20 08:08:15 UTC (rev 3188) @@ -107,7 +107,7 @@ I_VENDOR="tinysofa" fi if [ -z "$I_NAME" ]; then - I_NAME="enterprise server" + I_NAME="classic server" fi if [ -z "$I_COPY" ]; then I_COPY="(C) 2004 tinysofa development team." From svn at tinysofa.org Tue Jul 20 08:08:50 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 20 Jul 2004 18:08:50 +1000 (EST) Subject: [tinysofa-svn] r3189 - in tinysofa/releases/1.0/anaconda: current/specs releases/7.2.5 releases/7.2.5/14ts/specs Message-ID: <20040720080850.63E194E8031@minbar.tinysofa.org> Author: omar Date: 2004-07-20 18:08:50 +1000 (Tue, 20 Jul 2004) New Revision: 3189 Added: tinysofa/releases/1.0/anaconda/releases/7.2.5/14ts/ Modified: tinysofa/releases/1.0/anaconda/current/specs/anaconda.spec tinysofa/releases/1.0/anaconda/releases/7.2.5/14ts/specs/anaconda.spec Log: anaconda: * integrate current (7.2.5-13ts) as releases/7.2.5/14ts Modified: tinysofa/releases/1.0/anaconda/current/specs/anaconda.spec =================================================================== --- tinysofa/releases/1.0/anaconda/current/specs/anaconda.spec 2004-07-20 08:08:15 UTC (rev 3188) +++ tinysofa/releases/1.0/anaconda/current/specs/anaconda.spec 2004-07-20 08:08:50 UTC (rev 3189) @@ -2,7 +2,7 @@ ExclusiveArch: i386 i586 ia64 alpha Name: anaconda Version: 7.2.5 -Release: 13ts +Release: 14ts License: GPL Summary: The tinysofa installation program. Group: tinysofa official @@ -202,6 +202,9 @@ %changelog +* Tue Jul 20 2004 tsintegrate 7.2.5-14ts +- current (7.2.5-13ts) integrated as 7.2.5-14ts for release 1.0-U3 + * Thu May 20 2004 tsintegrate 7.2.5-13ts - current (7.2.5-12ts) integrated as 7.2.5-13ts for release 1.0-U1 Copied: tinysofa/releases/1.0/anaconda/releases/7.2.5/14ts (from rev 3188, tinysofa/releases/1.0/anaconda/current) Modified: tinysofa/releases/1.0/anaconda/releases/7.2.5/14ts/specs/anaconda.spec =================================================================== --- tinysofa/releases/1.0/anaconda/current/specs/anaconda.spec 2004-07-20 08:08:15 UTC (rev 3188) +++ tinysofa/releases/1.0/anaconda/releases/7.2.5/14ts/specs/anaconda.spec 2004-07-20 08:08:50 UTC (rev 3189) @@ -2,7 +2,7 @@ ExclusiveArch: i386 i586 ia64 alpha Name: anaconda Version: 7.2.5 -Release: 13ts +Release: 14ts License: GPL Summary: The tinysofa installation program. Group: tinysofa official @@ -202,6 +202,9 @@ %changelog +* Tue Jul 20 2004 tsintegrate 7.2.5-14ts +- current (7.2.5-13ts) integrated as 7.2.5-14ts for release 1.0-U3 + * Thu May 20 2004 tsintegrate 7.2.5-13ts - current (7.2.5-12ts) integrated as 7.2.5-13ts for release 1.0-U1 From svn at tinysofa.org Tue Jul 20 08:08:51 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 20 Jul 2004 18:08:51 +1000 (EST) Subject: [tinysofa-svn] r3190 - tinysofa/releases/1.0/anaconda Message-ID: <20040720080851.884E74E8031@minbar.tinysofa.org> Author: omar Date: 2004-07-20 18:08:51 +1000 (Tue, 20 Jul 2004) New Revision: 3190 Removed: tinysofa/releases/1.0/anaconda/pristine/ Log: anaconda: * removing pristine (7.2.5-13ts) From svn at tinysofa.org Tue Jul 20 08:08:54 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 20 Jul 2004 18:08:54 +1000 (EST) Subject: [tinysofa-svn] r3191 - tinysofa/releases/1.0/anaconda Message-ID: <20040720080854.5FE594E8031@minbar.tinysofa.org> Author: omar Date: 2004-07-20 18:08:54 +1000 (Tue, 20 Jul 2004) New Revision: 3191 Added: tinysofa/releases/1.0/anaconda/pristine/ Log: anaconda: * retarget pristine (7.2.5-13ts) to releases/7.2.5/14ts Copied: tinysofa/releases/1.0/anaconda/pristine (from rev 3189, tinysofa/releases/1.0/anaconda/releases/7.2.5/14ts) From svn at tinysofa.org Tue Jul 20 09:57:33 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 20 Jul 2004 19:57:33 +1000 (EST) Subject: [tinysofa-svn] r3192 - tinysofa/releases/1.1/anaconda/current/specs Message-ID: <20040720095733.7D9254E8031@minbar.tinysofa.org> Author: jh Date: 2004-07-20 19:57:33 +1000 (Tue, 20 Jul 2004) New Revision: 3192 Modified: tinysofa/releases/1.1/anaconda/current/specs/anaconda.spec Log: - add Requires: dosfstools, cramfsprogs, cpio, rpm for anaconda-runtimr Modified: tinysofa/releases/1.1/anaconda/current/specs/anaconda.spec =================================================================== --- tinysofa/releases/1.1/anaconda/current/specs/anaconda.spec 2004-07-20 08:08:54 UTC (rev 3191) +++ tinysofa/releases/1.1/anaconda/current/specs/anaconda.spec 2004-07-20 09:57:33 UTC (rev 3192) @@ -29,7 +29,7 @@ %package runtime Summary: tinysofa installer portions needed only for fresh installs. Group: development -Requires: hwdata >= 0.44 +Requires: hwdata >= 0.44, dosfstools, cramfsprogs, cpio, rpm %description runtime The anaconda-runtime package contains parts of the tinysofa From svn at tinysofa.org Tue Jul 20 13:06:25 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 20 Jul 2004 23:06:25 +1000 (EST) Subject: [tinysofa-svn] r3193 - in tinysofa/releases/1.1: bind/current/specs finger/current/specs parted/current/specs swupconf/current/specs Message-ID: <20040720130625.78FF34E8031@minbar.tinysofa.org> Author: jh Date: 2004-07-20 23:06:24 +1000 (Tue, 20 Jul 2004) New Revision: 3193 Modified: tinysofa/releases/1.1/bind/current/specs/bind.spec tinysofa/releases/1.1/finger/current/specs/finger.spec tinysofa/releases/1.1/parted/current/specs/parted.spec tinysofa/releases/1.1/swupconf/current/specs/swupconf.spec Log: - fix groups Modified: tinysofa/releases/1.1/bind/current/specs/bind.spec =================================================================== --- tinysofa/releases/1.1/bind/current/specs/bind.spec 2004-07-20 09:57:33 UTC (rev 3192) +++ tinysofa/releases/1.1/bind/current/specs/bind.spec 2004-07-20 13:06:24 UTC (rev 3193) @@ -76,7 +76,7 @@ Summary: DNS utilities: host, dig, dnsquery, and nslookup. Summary(pt_BR): Utilit?rios DNS - host, dig, dnsquery e nslookup Summary(es): Utilitarios DNS - host, dig, dnsquery y nslookup -Group: tinyofa/main +Group: main Requires: /usr/bin/perl %description utils Modified: tinysofa/releases/1.1/finger/current/specs/finger.spec =================================================================== --- tinysofa/releases/1.1/finger/current/specs/finger.spec 2004-07-20 09:57:33 UTC (rev 3192) +++ tinysofa/releases/1.1/finger/current/specs/finger.spec 2004-07-20 13:06:24 UTC (rev 3193) @@ -27,7 +27,7 @@ %package server Summary: The finger daemon. -Group: System Environment/Daemons +Group: extra Requires: xinetd %description server Modified: tinysofa/releases/1.1/parted/current/specs/parted.spec =================================================================== --- tinysofa/releases/1.1/parted/current/specs/parted.spec 2004-07-20 09:57:33 UTC (rev 3192) +++ tinysofa/releases/1.1/parted/current/specs/parted.spec 2004-07-20 13:06:24 UTC (rev 3193) @@ -3,7 +3,7 @@ Version: 1.4.24 Release: 16jh License: GPL -Group: tinysofa official +Group: extra BuildRoot: %{_tmppath}/%{name}-%{version}-root Source0: ftp://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.gz Patch0: parted-1.4.24-python2.3.patch @@ -19,7 +19,7 @@ %package devel Summary: Files for developing apps which will manipulate disk partitions. -Group: tinysofa official +Group: development Requires: parted = %{version}-%{release} %description devel Modified: tinysofa/releases/1.1/swupconf/current/specs/swupconf.spec =================================================================== --- tinysofa/releases/1.1/swupconf/current/specs/swupconf.spec 2004-07-20 09:57:33 UTC (rev 3192) +++ tinysofa/releases/1.1/swupconf/current/specs/swupconf.spec 2004-07-20 13:06:24 UTC (rev 3193) @@ -3,7 +3,7 @@ Version: 1.2 Release: 1ts License: GPL -Group: tinysofa official +Group: extra Source: %{name}-%{version}.tar.bz2 BuildArch: noarch PreReq: swup From svn at tinysofa.org Tue Jul 20 13:21:52 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 20 Jul 2004 23:21:52 +1000 (EST) Subject: [tinysofa-svn] r3194 - tinysofa/releases/1.1/release/current Message-ID: <20040720132152.2218E4E8031@minbar.tinysofa.org> Author: jh Date: 2004-07-20 23:21:51 +1000 (Tue, 20 Jul 2004) New Revision: 3194 Removed: tinysofa/releases/1.1/release/current/specs/ Log: - remove release/current/specs From svn at tinysofa.org Tue Jul 20 13:23:29 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 20 Jul 2004 23:23:29 +1000 (EST) Subject: [tinysofa-svn] r3195 - tinysofa/releases/1.1/release/current Message-ID: <20040720132329.63FBB4E8031@minbar.tinysofa.org> Author: jh Date: 2004-07-20 23:23:29 +1000 (Tue, 20 Jul 2004) New Revision: 3195 Added: tinysofa/releases/1.1/release/current/specs/ Log: - copy release spec from 1.0 Copied: tinysofa/releases/1.1/release/current/specs (from rev 3194, tinysofa/releases/1.0/release/current/specs) From svn at tinysofa.org Tue Jul 20 13:29:55 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 20 Jul 2004 23:29:55 +1000 (EST) Subject: [tinysofa-svn] r3196 - tinysofa/releases/1.1/release/current/specs Message-ID: <20040720132955.669964E8031@minbar.tinysofa.org> Author: jh Date: 2004-07-20 23:29:55 +1000 (Tue, 20 Jul 2004) New Revision: 3196 Modified: tinysofa/releases/1.1/release/current/specs/release.spec Log: - 1.1 Modified: tinysofa/releases/1.1/release/current/specs/release.spec =================================================================== --- tinysofa/releases/1.1/release/current/specs/release.spec 2004-07-20 13:23:29 UTC (rev 3195) +++ tinysofa/releases/1.1/release/current/specs/release.spec 2004-07-20 13:29:55 UTC (rev 3196) @@ -1,15 +1,15 @@ -%define release_name Emily +%define release_name Rio %define vendor tinysofa %define product classic server Summary: tinysofa release file Name: release -Version: 1.0 -Release: 4ts +Version: 1.1 +Release: 0jh License: GPL -Group: tinysofa official +Group: main BuildArch: noarch -BuildRoot: %{_tmppath}/%{name}-root +BuildRoot: %{_tmppath}/%{name}-%{version}-root Epoch: 2 %description @@ -19,11 +19,10 @@ # satisfy rpm %install -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT/etc +mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir} echo "%{vendor} %{product} release %{version} (%{release_name})" \ - > $RPM_BUILD_ROOT/etc/release -cat <<__EOF__ > $RPM_BUILD_ROOT/etc/issue + > $RPM_BUILD_ROOT/%{_sysconfdir}/release +cat <<__EOF__ > $RPM_BUILD_ROOT/%{_sysconfdir}/issue %{vendor} %{product} release %{version} (%{release_name}) Kernel \r on an \m @@ -35,14 +34,14 @@ popd %clean -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT +%clean_buildroot %files %defattr(-,root,root) -%attr(0644,root,root) /etc/release -%attr(0644,root,root) /etc/issue -%attr(0644,root,root) /etc/issue.net -/etc/tinysofa-release +%attr(0644,root,root) %{_sysconfdir}/release +%attr(0644,root,root) %{_sysconfdir}/issue +%attr(0644,root,root) %{_sysconfdir}/issue.net +%{_sysconfdir}/tinysofa-release %changelog * Mon Jul 19 2004 tsintegrate 1.0-4ts From svn at tinysofa.org Tue Jul 20 15:25:02 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Wed, 21 Jul 2004 01:25:02 +1000 (EST) Subject: [tinysofa-svn] r3197 - in tinysofa/releases/1.1: apt/current/specs gzip/current/specs libtermcap/current/specs ncurses/current/specs netatalk/current/specs zlib/current/specs Message-ID: <20040720152502.650B64E8031@minbar.tinysofa.org> Author: jh Date: 2004-07-21 01:25:01 +1000 (Wed, 21 Jul 2004) New Revision: 3197 Modified: tinysofa/releases/1.1/apt/current/specs/apt.spec tinysofa/releases/1.1/gzip/current/specs/gzip.spec tinysofa/releases/1.1/libtermcap/current/specs/libtermcap.spec tinysofa/releases/1.1/ncurses/current/specs/ncurses.spec tinysofa/releases/1.1/netatalk/current/specs/netatalk.spec tinysofa/releases/1.1/zlib/current/specs/zlib.spec Log: - group fixes Modified: tinysofa/releases/1.1/apt/current/specs/apt.spec =================================================================== --- tinysofa/releases/1.1/apt/current/specs/apt.spec 2004-07-20 13:29:55 UTC (rev 3196) +++ tinysofa/releases/1.1/apt/current/specs/apt.spec 2004-07-20 15:25:01 UTC (rev 3197) @@ -70,14 +70,14 @@ %package -n %{libname} Summary: Library providing access to APT functionality -Group: System Environment/Libraries +Group: main %description -n %{libname} Library providing access to APT functionality. %package -n %{libname_devel} Summary: Development files and documentation for APT's libapt-pkg -Group: Development/Libraries +Group: development Requires: %{libname} = %{version} Provides: apt-devel = %{version}-%{release} Modified: tinysofa/releases/1.1/gzip/current/specs/gzip.spec =================================================================== --- tinysofa/releases/1.1/gzip/current/specs/gzip.spec 2004-07-20 13:29:55 UTC (rev 3196) +++ tinysofa/releases/1.1/gzip/current/specs/gzip.spec 2004-07-20 15:25:01 UTC (rev 3197) @@ -29,7 +29,7 @@ %package doc Summary: html formatted Info-files for Gzip -Group: documantation +Group: documentation Requires: gzip Prereq: htmlinfo Modified: tinysofa/releases/1.1/libtermcap/current/specs/libtermcap.spec =================================================================== --- tinysofa/releases/1.1/libtermcap/current/specs/libtermcap.spec 2004-07-20 13:29:55 UTC (rev 3196) +++ tinysofa/releases/1.1/libtermcap/current/specs/libtermcap.spec 2004-07-20 15:25:01 UTC (rev 3197) @@ -33,8 +33,8 @@ %package devel Summary: Development tools for programs which will access the termcap database. -Group: Development/Libraries -Requires: libtermcap = %{version} +Group: development +Requires: libtermcap = %{version}-%{release} %description devel This package includes the libraries and header files necessary for Modified: tinysofa/releases/1.1/ncurses/current/specs/ncurses.spec =================================================================== --- tinysofa/releases/1.1/ncurses/current/specs/ncurses.spec 2004-07-20 13:29:55 UTC (rev 3196) +++ tinysofa/releases/1.1/ncurses/current/specs/ncurses.spec 2004-07-20 15:25:01 UTC (rev 3197) @@ -24,7 +24,7 @@ %package devel Summary: The development files for applications that use ncurses. -Group: Development/Libraries +Group: development Requires: ncurses = %{PACKAGE_VERSION} Obsoletes: ncurses-c++-devel Modified: tinysofa/releases/1.1/netatalk/current/specs/netatalk.spec =================================================================== --- tinysofa/releases/1.1/netatalk/current/specs/netatalk.spec 2004-07-20 13:29:55 UTC (rev 3196) +++ tinysofa/releases/1.1/netatalk/current/specs/netatalk.spec 2004-07-20 15:25:01 UTC (rev 3197) @@ -27,7 +27,7 @@ %package devel Summary: Headers and static libraries for Appletalk development -Group: Development/Libraries +Group: development %description devel This package contains the header files, and static libraries for building Modified: tinysofa/releases/1.1/zlib/current/specs/zlib.spec =================================================================== --- tinysofa/releases/1.1/zlib/current/specs/zlib.spec 2004-07-20 13:29:55 UTC (rev 3196) +++ tinysofa/releases/1.1/zlib/current/specs/zlib.spec 2004-07-20 15:25:01 UTC (rev 3197) @@ -16,7 +16,7 @@ %package devel Summary: Header files and libraries for Zlib development. -Group: Development/Libraries +Group: development Requires: zlib = %{version}-%{release} %description devel From svn at tinysofa.org Tue Jul 20 16:18:41 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Wed, 21 Jul 2004 02:18:41 +1000 (EST) Subject: [tinysofa-svn] r3198 - tinysofa/releases/1.1/kernel/current/sources Message-ID: <20040720161841.06B074E8031@minbar.tinysofa.org> Author: jh Date: 2004-07-21 02:18:41 +1000 (Wed, 21 Jul 2004) New Revision: 3198 Modified: tinysofa/releases/1.1/kernel/current/sources/kernel-2.4.21-i586-BOOT.config tinysofa/releases/1.1/kernel/current/sources/kernel-2.4.21-i586-smp.config tinysofa/releases/1.1/kernel/current/sources/kernel-2.4.21-i586.config Log: - disable hfs+ - enable CONFIG_E1000_NAPI to avoid unresolved symbols Modified: tinysofa/releases/1.1/kernel/current/sources/kernel-2.4.21-i586-BOOT.config =================================================================== --- tinysofa/releases/1.1/kernel/current/sources/kernel-2.4.21-i586-BOOT.config 2004-07-20 15:25:01 UTC (rev 3197) +++ tinysofa/releases/1.1/kernel/current/sources/kernel-2.4.21-i586-BOOT.config 2004-07-20 16:18:41 UTC (rev 3198) @@ -540,7 +540,7 @@ # CONFIG_ACENIC_OMIT_TIGON_I is not set CONFIG_DL2K=m CONFIG_E1000=m -# CONFIG_E1000_NAPI is not set +CONFIG_E1000_NAPI=y # CONFIG_MYRI_SBUS is not set CONFIG_NS83820=m CONFIG_HAMACHI=m @@ -717,7 +717,7 @@ # CONFIG_HFS_FS is not set # CONFIG_BEFS_FS is not set # CONFIG_BEFS_DEBUG is not set -CONFIG_HFSPLUS_FS=m +CONFIG_HFSPLUS_FS=n # CONFIG_BFS_FS is not set CONFIG_EXT3_FS=m CONFIG_EXT3_FS_XATTR=n Modified: tinysofa/releases/1.1/kernel/current/sources/kernel-2.4.21-i586-smp.config =================================================================== --- tinysofa/releases/1.1/kernel/current/sources/kernel-2.4.21-i586-smp.config 2004-07-20 15:25:01 UTC (rev 3197) +++ tinysofa/releases/1.1/kernel/current/sources/kernel-2.4.21-i586-smp.config 2004-07-20 16:18:41 UTC (rev 3198) @@ -707,7 +707,7 @@ # CONFIG_ACENIC_OMIT_TIGON_I is not set CONFIG_DL2K=m CONFIG_E1000=m -# CONFIG_E1000_NAPI is not set +CONFIG_E1000_NAPI=y # CONFIG_MYRI_SBUS is not set CONFIG_NS83820=m CONFIG_HAMACHI=m @@ -990,7 +990,7 @@ CONFIG_HFS_FS=m # CONFIG_BEFS_FS is not set # CONFIG_BEFS_DEBUG is not set -CONFIG_HFSPLUS_FS=m +CONFIG_HFSPLUS_FS=n CONFIG_BFS_FS=m CONFIG_EXT3_FS=y CONFIG_EXT3_FS_XATTR=y Modified: tinysofa/releases/1.1/kernel/current/sources/kernel-2.4.21-i586.config =================================================================== --- tinysofa/releases/1.1/kernel/current/sources/kernel-2.4.21-i586.config 2004-07-20 15:25:01 UTC (rev 3197) +++ tinysofa/releases/1.1/kernel/current/sources/kernel-2.4.21-i586.config 2004-07-20 16:18:41 UTC (rev 3198) @@ -699,7 +699,7 @@ # CONFIG_ACENIC_OMIT_TIGON_I is not set CONFIG_DL2K=m CONFIG_E1000=m -# CONFIG_E1000_NAPI is not set +CONFIG_E1000_NAPI=y # CONFIG_MYRI_SBUS is not set CONFIG_NS83820=m CONFIG_HAMACHI=m @@ -982,7 +982,7 @@ CONFIG_HFS_FS=m # CONFIG_BEFS_FS is not set # CONFIG_BEFS_DEBUG is not set -CONFIG_HFSPLUS_FS=m +CONFIG_HFSPLUS_FS=n CONFIG_BFS_FS=m CONFIG_EXT3_FS=y CONFIG_EXT3_FS_XATTR=y From svn at tinysofa.org Tue Jul 20 16:56:02 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Wed, 21 Jul 2004 02:56:02 +1000 (EST) Subject: [tinysofa-svn] r3199 - in contrib/perl-digest-perl-md5/current: sources specs Message-ID: <20040720165602.A05FB4E8031@minbar.tinysofa.org> Author: gda Date: 2004-07-21 02:56:01 +1000 (Wed, 21 Jul 2004) New Revision: 3199 Added: contrib/perl-digest-perl-md5/current/sources/Digest-Perl-MD5-1.6.tar.gz Removed: contrib/perl-digest-perl-md5/current/sources/Digest-Perl-MD5-1.5.tar.gz Modified: contrib/perl-digest-perl-md5/current/specs/perl-digest-perl-md5.spec Log: new upstream version Deleted: contrib/perl-digest-perl-md5/current/sources/Digest-Perl-MD5-1.5.tar.gz =================================================================== (Binary files differ) Added: contrib/perl-digest-perl-md5/current/sources/Digest-Perl-MD5-1.6.tar.gz =================================================================== (Binary files differ) Property changes on: contrib/perl-digest-perl-md5/current/sources/Digest-Perl-MD5-1.6.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: contrib/perl-digest-perl-md5/current/specs/perl-digest-perl-md5.spec =================================================================== --- contrib/perl-digest-perl-md5/current/specs/perl-digest-perl-md5.spec 2004-07-20 16:18:41 UTC (rev 3198) +++ contrib/perl-digest-perl-md5/current/specs/perl-digest-perl-md5.spec 2004-07-20 16:56:01 UTC (rev 3199) @@ -1,15 +1,14 @@ -%define __check_files %{nil} # Derived values %define module Digest-Perl-MD5 %define perlver %(rpm -q perl --queryformat '%%{version}' 2>/dev/null) Summary: Perl module %{module} Name: perl-digest-perl-md5 -Version: 1.5 -Release: 16gd +Version: 1.6 +Release: 1gd License: distributable -Group: Trustix Contrib -Source0: http://search.cpan.org/CPAN/authors/id/D/DE/DELTA/Digest-Perl-MD5-1.5.tar.gz +Group: tinysofa contrib +Source0: http://search.cpan.org/CPAN/authors/id/D/DE/DELTA/%{module}-%{version}.tar.gz Url: http://www.cpan.org BuildRoot: /var/tmp/%{name}-buildroot-%(id -nu)/ BuildArch: noarch @@ -22,10 +21,6 @@ %description %{module} module from CPAN for perl -# Provide perl-specific find-{provides,requires}. -%define __find_provides /usr/lib/rpm/find-provides.perl -%define __find_requires /usr/lib/rpm/find-requires.perl - %prep %setup -q -n %{module}-%{version} @@ -40,11 +35,11 @@ %install [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT -eval `perl '-V:installarchlib'` -mkdir -p $RPM_BUILD_ROOT/$installarchlib %{makeinstall} -[ -x /usr/lib/rpm/brp-compress ] && /usr/lib/rpm/brp-compress +for file in ".packlist" "perllocal.pod"; do + find $RPM_BUILD_ROOT -name $file | xargs rm +done %files %defattr(-,root,root,0755) @@ -55,6 +50,12 @@ %doc CHANGES INSTALL MANIFEST %changelog +* Sun Jul 18 2004 Gerald Dachs 1.6-1gd +- new upstream version + +* Sat Jul 17 2004 Gerald Dachs 1.5-17gd +- cleaned up spec file + * Sun Apr 18 2004 Gerald Dachs 1.5-16gd - Rebuilt for tinysofa From svn at tinysofa.org Tue Jul 20 17:00:02 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Wed, 21 Jul 2004 03:00:02 +1000 (EST) Subject: [tinysofa-svn] r3200 - in contrib/perl-archive-tar/current: sources specs Message-ID: <20040720170002.D52FB4E8031@minbar.tinysofa.org> Author: gda Date: 2004-07-21 03:00:02 +1000 (Wed, 21 Jul 2004) New Revision: 3200 Added: contrib/perl-archive-tar/current/sources/Archive-Tar-1.10.tar.gz Removed: contrib/perl-archive-tar/current/sources/Archive-Tar-1.08.tar.gz Modified: contrib/perl-archive-tar/current/specs/perl-archive-tar.spec Log: new upstream version Deleted: contrib/perl-archive-tar/current/sources/Archive-Tar-1.08.tar.gz =================================================================== (Binary files differ) Added: contrib/perl-archive-tar/current/sources/Archive-Tar-1.10.tar.gz =================================================================== (Binary files differ) Property changes on: contrib/perl-archive-tar/current/sources/Archive-Tar-1.10.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: contrib/perl-archive-tar/current/specs/perl-archive-tar.spec =================================================================== --- contrib/perl-archive-tar/current/specs/perl-archive-tar.spec 2004-07-20 16:56:01 UTC (rev 3199) +++ contrib/perl-archive-tar/current/specs/perl-archive-tar.spec 2004-07-20 17:00:02 UTC (rev 3200) @@ -1,15 +1,14 @@ -%define __check_files %{nil} # Derived values %define module Archive-Tar %define perlver %(rpm -q perl --queryformat '%%{version}' 2>/dev/null) Summary: Perl module %{module} Name: perl-archive-tar -Version: 1.08 -Release: 16gd +Version: 1.10 +Release: 1gd License: distributable -Group: Trustix Contrib -Source0: http://search.cpan.org/CPAN/authors/id/K/KA/KANE/Archive-Tar-1.08.tar.gz +Group: tinysofa contrib +Source0: http://search.cpan.org/CPAN/authors/id/K/KA/KANE/%{module}-%{version}.tar.gz Url: http://www.cpan.org BuildRoot: /var/tmp/%{name}-buildroot-%(id -nu)/ BuildArch: noarch @@ -23,10 +22,6 @@ %description %{module} module from CPAN for perl -# Provide perl-specific find-{provides,requires}. -%define __find_provides /usr/lib/rpm/find-provides.perl -%define __find_requires /usr/lib/rpm/find-requires.perl - %prep %setup -q -n %{module}-%{version} @@ -39,20 +34,27 @@ %install [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT -eval `perl '-V:installarchlib'` -mkdir -p $RPM_BUILD_ROOT/$installarchlib %{makeinstall} -[ -x /usr/lib/rpm/brp-compress ] && /usr/lib/rpm/brp-compress +for file in ".packlist" "perllocal.pod"; do + find $RPM_BUILD_ROOT -name $file | xargs rm +done %files %defattr(-,root,root,0755) +%{_bindir}/* %dir %{siteperl}/Archive %{siteperl}/Archive/* %{_mandir}/man3/* %doc MANIFEST README %changelog +* Sun Jul 18 2004 Gerald Dachs 1.10-1gd +- new upstream version + +* Sat Jul 17 2004 Gerald Dachs 1.08-17gd +- cleaned up spec file + * Sun Apr 18 2004 Gerald Dachs 1.08-16gd - Rebuilt for tinysofa From svn at tinysofa.org Tue Jul 20 17:03:02 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Wed, 21 Jul 2004 03:03:02 +1000 (EST) Subject: [tinysofa-svn] r3201 - in contrib/perl-archive-zip/current: sources specs Message-ID: <20040720170302.A5CE44E8031@minbar.tinysofa.org> Author: gda Date: 2004-07-21 03:03:02 +1000 (Wed, 21 Jul 2004) New Revision: 3201 Added: contrib/perl-archive-zip/current/sources/Archive-Zip-1.12.tar.gz Removed: contrib/perl-archive-zip/current/sources/Archive-Zip-1.09.tar.gz Modified: contrib/perl-archive-zip/current/specs/perl-archive-zip.spec Log: new upstream version Deleted: contrib/perl-archive-zip/current/sources/Archive-Zip-1.09.tar.gz =================================================================== (Binary files differ) Added: contrib/perl-archive-zip/current/sources/Archive-Zip-1.12.tar.gz =================================================================== (Binary files differ) Property changes on: contrib/perl-archive-zip/current/sources/Archive-Zip-1.12.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: contrib/perl-archive-zip/current/specs/perl-archive-zip.spec =================================================================== --- contrib/perl-archive-zip/current/specs/perl-archive-zip.spec 2004-07-20 17:00:02 UTC (rev 3200) +++ contrib/perl-archive-zip/current/specs/perl-archive-zip.spec 2004-07-20 17:03:02 UTC (rev 3201) @@ -1,15 +1,14 @@ -%define __check_files %{nil} # Derived values %define module Archive-Zip %define perlver %(rpm -q perl --queryformat '%%{version}' 2>/dev/null) Summary: Perl module %{module} Name: perl-archive-zip -Version: 1.09 -Release: 16gd +Version: 1.12 +Release: 1gd License: distributable -Group: Trustix Contrib -Source0: http://search.cpan.org/CPAN/authors/id/N/NE/NEDKONZ/Archive-Zip-1.09.tar.gz +Group: tinysofa contrib +Source0: http://search.cpan.org/CPAN/authors/id/N/NE/NEDKONZ/%{module}-%{version}.tar.gz Url: http://www.cpan.org BuildRoot: /var/tmp/%{name}-buildroot-%(id -nu)/ BuildArch: noarch @@ -23,10 +22,6 @@ %description %{module} module from CPAN for perl -# Provide perl-specific find-{provides,requires}. -%define __find_provides /usr/lib/rpm/find-provides.perl -%define __find_requires /usr/lib/rpm/find-requires.perl - %prep %setup -q -n %{module}-%{version} @@ -39,11 +34,11 @@ %install [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT -eval `perl '-V:installarchlib'` -mkdir -p $RPM_BUILD_ROOT/$installarchlib %{makeinstall} -[ -x /usr/lib/rpm/brp-compress ] && /usr/lib/rpm/brp-compress +for file in ".packlist" "perllocal.pod"; do + find $RPM_BUILD_ROOT -name $file | xargs rm +done %files %defattr(-,root,root,0755) @@ -54,6 +49,9 @@ %doc Changes INSTALL MANIFEST README TODO docs examples %changelog +* Sat Jul 17 2004 Gerald Dachs 1.12-1gd +- new upstream version + * Sun Apr 18 2004 Gerald Dachs 1.09-16gd - Rebuilt for tinysofa From svn at tinysofa.org Tue Jul 20 17:06:09 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Wed, 21 Jul 2004 03:06:09 +1000 (EST) Subject: [tinysofa-svn] r3202 - contrib/perl-berkeleydb/current/specs Message-ID: <20040720170609.591B54E8031@minbar.tinysofa.org> Author: gda Date: 2004-07-21 03:06:09 +1000 (Wed, 21 Jul 2004) New Revision: 3202 Modified: contrib/perl-berkeleydb/current/specs/perl-berkeleydb.spec Log: cleaned up spec file Modified: contrib/perl-berkeleydb/current/specs/perl-berkeleydb.spec =================================================================== --- contrib/perl-berkeleydb/current/specs/perl-berkeleydb.spec 2004-07-20 17:03:02 UTC (rev 3201) +++ contrib/perl-berkeleydb/current/specs/perl-berkeleydb.spec 2004-07-20 17:06:09 UTC (rev 3202) @@ -1,4 +1,3 @@ -%define __check_files %{nil} %define real_name BerkeleyDB %define real_version 0.25 %define perl_version %(rpm -q perl --queryformat '%%{version}' 2>/dev/null) @@ -6,7 +5,7 @@ Summary: Perl extension for Berkeley DB version 2, 3 or 4 Name: perl-berkeleydb Version: %{real_version} -Release: 1gd +Release: 2gd Source: %{real_name}-%{real_version}.tar.gz License: Perl Group: tinysofa contrib @@ -19,7 +18,7 @@ %description Perl extension for Berkeley DB version 2, 3 or 4 -%prep -q +%prep %setup -q -n %{real_name}-%{real_version} %build @@ -30,15 +29,22 @@ [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT %makeinstall PREFIX=$RPM_BUILD_ROOT%{_prefix} +for file in ".packlist" "perllocal.pod"; do + find $RPM_BUILD_ROOT -name $file | xargs rm +done + %clean [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,0755) %doc Changes README -%{siteperl}/i586-linux-thread-multi/* +%{siteperl}/%{_arch}-linux-thread-multi/* %{_mandir}/man3/* %changelog +* Sat Jul 17 2004 Gerald Dachs 0.25-2gd +- cleaned up spec file + * Wed Jun 23 2004 Gerald Dachs 0.25-1gd - packaged for tinysofa From svn at tinysofa.org Tue Jul 20 17:07:49 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Wed, 21 Jul 2004 03:07:49 +1000 (EST) Subject: [tinysofa-svn] r3203 - contrib/perl-compress-zlib/current/specs Message-ID: <20040720170749.4748B4E8031@minbar.tinysofa.org> Author: gda Date: 2004-07-21 03:07:49 +1000 (Wed, 21 Jul 2004) New Revision: 3203 Modified: contrib/perl-compress-zlib/current/specs/perl-compress-zlib.spec Log: cleaned up spec file Modified: contrib/perl-compress-zlib/current/specs/perl-compress-zlib.spec =================================================================== --- contrib/perl-compress-zlib/current/specs/perl-compress-zlib.spec 2004-07-20 17:06:09 UTC (rev 3202) +++ contrib/perl-compress-zlib/current/specs/perl-compress-zlib.spec 2004-07-20 17:07:49 UTC (rev 3203) @@ -1,4 +1,3 @@ -%define __check_files %{nil} # Derived values %define module Compress-Zlib %define perlver %(rpm -q perl --queryformat '%%{version}' 2>/dev/null) @@ -6,13 +5,12 @@ Summary: Perl module %{module} Name: perl-compress-zlib Version: 1.33 -Release: 16gd +Release: 17gd License: distributable -Group: Trustix Contrib +Group: tinysofa contrib Source0: http://search.cpan.org/CPAN/authors/id/P/PM/PMQS/Compress-Zlib-1.33.tar.gz Url: http://www.cpan.org BuildRoot: /var/tmp/%{name}-buildroot-%(id -nu)/ -BuildArch: i586 BuildRequires: perl Requires: perl = %{perlver} Provides: %{module} = %{version} @@ -22,10 +20,6 @@ %description %{module} module from CPAN for perl -# Provide perl-specific find-{provides,requires}. -%define __find_provides /usr/lib/rpm/find-provides.perl -%define __find_requires /usr/lib/rpm/find-requires.perl - %prep %setup -q -n %{module}-%{version} @@ -38,26 +32,29 @@ %install [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT -eval `perl '-V:installarchlib'` -mkdir -p $RPM_BUILD_ROOT/$installarchlib %{makeinstall} -[ -x /usr/lib/rpm/brp-compress ] && /usr/lib/rpm/brp-compress +for file in ".packlist" "perllocal.pod"; do + find $RPM_BUILD_ROOT -name $file | xargs rm +done %files %defattr(-,root,root,0755) -%dir %{siteperl}/i586-linux-thread-multi/auto -%dir %{siteperl}/i586-linux-thread-multi/auto/Compress -%dir %{siteperl}/i586-linux-thread-multi/auto/Compress/Zlib -%dir %{siteperl}/i586-linux-thread-multi/Compress -%{siteperl}/i586-linux-thread-multi/Compress/Zlib.pm -%{siteperl}/i586-linux-thread-multi/auto/Compress/Zlib/Zlib.bs -%{siteperl}/i586-linux-thread-multi/auto/Compress/Zlib/Zlib.so -%{siteperl}/i586-linux-thread-multi/auto/Compress/Zlib/autosplit.ix +%dir %{siteperl}/%{_arch}-linux-thread-multi/auto +%dir %{siteperl}/%{_arch}-linux-thread-multi/auto/Compress +%dir %{siteperl}/%{_arch}-linux-thread-multi/auto/Compress/Zlib +%dir %{siteperl}/%{_arch}-linux-thread-multi/Compress +%{siteperl}/%{_arch}-linux-thread-multi/Compress/Zlib.pm +%{siteperl}/%{_arch}-linux-thread-multi/auto/Compress/Zlib/Zlib.bs +%{siteperl}/%{_arch}-linux-thread-multi/auto/Compress/Zlib/Zlib.so +%{siteperl}/%{_arch}-linux-thread-multi/auto/Compress/Zlib/autosplit.ix %{_mandir}/man3/* %doc ANNOUNCE Changes MANIFEST README %changelog +* Sat Jul 17 2004 Gerald Dachs 1.33-17gd +- cleaned up spec file + * Sun Apr 18 2004 Gerald Dachs 1.33-16gd - Rebuilt for tinysofa @@ -67,8 +64,7 @@ * Thu Feb 12 2004 Gerald Dachs 1.33-2gd - fixed permission on directory - added %doc to %files section -- changed arch to i586 +- changed arch to %{_arch} * Fri Jan 30 2004 Erlend Midttun - Initial release for Trustix based off a few others. - From svn at tinysofa.org Tue Jul 20 17:13:42 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Wed, 21 Jul 2004 03:13:42 +1000 (EST) Subject: [tinysofa-svn] r3204 - contrib/perl-convert-tnef/current/specs Message-ID: <20040720171342.373B44E8031@minbar.tinysofa.org> Author: gda Date: 2004-07-21 03:13:42 +1000 (Wed, 21 Jul 2004) New Revision: 3204 Modified: contrib/perl-convert-tnef/current/specs/perl-convert-tnef.spec Log: cleaned up spec file Modified: contrib/perl-convert-tnef/current/specs/perl-convert-tnef.spec =================================================================== --- contrib/perl-convert-tnef/current/specs/perl-convert-tnef.spec 2004-07-20 17:07:49 UTC (rev 3203) +++ contrib/perl-convert-tnef/current/specs/perl-convert-tnef.spec 2004-07-20 17:13:42 UTC (rev 3204) @@ -1,4 +1,3 @@ -%define __check_files %{nil} # Derived values %define module Convert-TNEF %define perlver %(rpm -q perl --queryformat '%%{version}' 2>/dev/null) @@ -6,9 +5,9 @@ Summary: Perl module %{module} Name: perl-convert-tnef Version: 0.17 -Release: 16gd +Release: 17gd License: distributable -Group: Trustix Contrib +Group: tinysofa contrib Source0: http://search.cpan.org/CPAN/authors/id/D/DO/DOUGW/Convert-TNEF-0.17.tar.gz Url: http://www.cpan.org BuildRoot: /var/tmp/%{name}-buildroot-%(id -nu)/ @@ -23,10 +22,6 @@ %description %{module} module from CPAN for perl -# Provide perl-specific find-{provides,requires}. -%define __find_provides /usr/lib/rpm/find-provides.perl -%define __find_requires /usr/lib/rpm/find-requires.perl - %prep %setup -q -n %{module}-%{version} @@ -39,11 +34,11 @@ %install [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT -eval `perl '-V:installarchlib'` -mkdir -p $RPM_BUILD_ROOT/$installarchlib %{makeinstall} -[ -x /usr/lib/rpm/brp-compress ] && /usr/lib/rpm/brp-compress +for file in ".packlist" "perllocal.pod"; do + find $RPM_BUILD_ROOT -name $file | xargs rm +done %files %defattr(-,root,root,0755) @@ -53,6 +48,9 @@ %doc Changes MANIFEST README %changelog +* Sat Jul 17 2004 Gerald Dachs 0.17-17gd +- cleaned up spec file + * Sun Apr 18 2004 Gerald Dachs 0.17-16gd - Rebuilt for tinysofa From svn at tinysofa.org Tue Jul 20 17:16:32 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Wed, 21 Jul 2004 03:16:32 +1000 (EST) Subject: [tinysofa-svn] r3205 - in contrib/perl-convert-uulib/current: sources specs Message-ID: <20040720171632.8FF034E8031@minbar.tinysofa.org> Author: gda Date: 2004-07-21 03:16:32 +1000 (Wed, 21 Jul 2004) New Revision: 3205 Added: contrib/perl-convert-uulib/current/sources/Convert-UUlib-1.03.tar.gz Removed: contrib/perl-convert-uulib/current/sources/Convert-UUlib-1.0.tar.gz Modified: contrib/perl-convert-uulib/current/specs/perl-convert-uulib.spec Log: new upstream version Deleted: contrib/perl-convert-uulib/current/sources/Convert-UUlib-1.0.tar.gz =================================================================== (Binary files differ) Added: contrib/perl-convert-uulib/current/sources/Convert-UUlib-1.03.tar.gz =================================================================== (Binary files differ) Property changes on: contrib/perl-convert-uulib/current/sources/Convert-UUlib-1.03.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: contrib/perl-convert-uulib/current/specs/perl-convert-uulib.spec =================================================================== --- contrib/perl-convert-uulib/current/specs/perl-convert-uulib.spec 2004-07-20 17:13:42 UTC (rev 3204) +++ contrib/perl-convert-uulib/current/specs/perl-convert-uulib.spec 2004-07-20 17:16:32 UTC (rev 3205) @@ -1,18 +1,16 @@ -%define __check_files %{nil} # Derived values %define module Convert-UUlib %define perlver %(rpm -q perl --queryformat '%%{version}' 2>/dev/null) Summary: Perl module %{module} Name: perl-convert-uulib -Version: 1.0 -Release: 16gd +Version: 1.03 +Release: 1gd License: distributable Group: Trustix Contrib -Source0: http://search.cpan.org/CPAN/authors/id/M/ML/MLEHMANN/Convert-UUlib-1.0.tar.gz +Source0: http://search.cpan.org/CPAN/authors/id/M/ML/MLEHMANN/%{module}-%{version}.tar.gz Url: http://www.cpan.org BuildRoot: /var/tmp/%{name}-buildroot-%(id -nu)/ -BuildArch: i586 Requires: perl = %{perlver} Provides: %{module} = %{version} @@ -21,10 +19,6 @@ %description %{module} module from CPAN for perl -# Provide perl-specific find-{provides,requires}. -%define __find_provides /usr/lib/rpm/find-provides.perl -%define __find_requires /usr/lib/rpm/find-requires.perl - %prep %setup -q -n %{module}-%{version} @@ -37,25 +31,31 @@ %install [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT -eval `perl '-V:installarchlib'` -mkdir -p $RPM_BUILD_ROOT/$installarchlib %{makeinstall} -[ -x /usr/lib/rpm/brp-compress ] && /usr/lib/rpm/brp-compress +for file in ".packlist" "perllocal.pod"; do + find $RPM_BUILD_ROOT -name $file | xargs rm +done %files %defattr(-,root,root,0755) -%dir %{siteperl}/i586-linux-thread-multi/auto -%dir %{siteperl}/i586-linux-thread-multi/Convert -%dir %{siteperl}/i586-linux-thread-multi/auto/Convert -%{siteperl}/i586-linux-thread-multi/auto/Convert/UUlib/UUlib.so -%{siteperl}/i586-linux-thread-multi/auto/Convert/UUlib/UUlib.bs -%{siteperl}/i586-linux-thread-multi/Convert/UUlib.pm +%dir %{siteperl}/%{_arch}-linux-thread-multi/auto +%dir %{siteperl}/%{_arch}-linux-thread-multi/Convert +%dir %{siteperl}/%{_arch}-linux-thread-multi/auto/Convert +%{siteperl}/%{_arch}-linux-thread-multi/auto/Convert/UUlib/UUlib.so +%{siteperl}/%{_arch}-linux-thread-multi/auto/Convert/UUlib/UUlib.bs +%{siteperl}/%{_arch}-linux-thread-multi/Convert/UUlib.pm %{_mandir}/man3/Convert::UUlib.3.gz %doc COPYING COPYING.Artistic COPYING.GNU Changes MANIFEST README %doc example-decoder doc %changelog +* Sun Jul 18 2004 Gerald Dachs 1.03-1gd +- new upstream version + +* Sat Jul 17 2004 Gerald Dachs 1.0-17gd +- cleaned up spec file + * Sun Apr 18 2004 Gerald Dachs 1.0-16gd - Rebuilt for tinysofa From svn at tinysofa.org Tue Jul 20 17:26:23 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Wed, 21 Jul 2004 03:26:23 +1000 (EST) Subject: [tinysofa-svn] r3206 - in contrib/perl-html-parser/current: sources specs Message-ID: <20040720172623.E79994E8031@minbar.tinysofa.org> Author: gda Date: 2004-07-21 03:26:23 +1000 (Wed, 21 Jul 2004) New Revision: 3206 Added: contrib/perl-html-parser/current/sources/HTML-Parser-3.36.tar.gz Removed: contrib/perl-html-parser/current/sources/HTML-Parser-3.35.tar.gz Modified: contrib/perl-html-parser/current/specs/perl-html-parser.spec Log: new upstream version Deleted: contrib/perl-html-parser/current/sources/HTML-Parser-3.35.tar.gz =================================================================== (Binary files differ) Added: contrib/perl-html-parser/current/sources/HTML-Parser-3.36.tar.gz =================================================================== (Binary files differ) Property changes on: contrib/perl-html-parser/current/sources/HTML-Parser-3.36.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: contrib/perl-html-parser/current/specs/perl-html-parser.spec =================================================================== --- contrib/perl-html-parser/current/specs/perl-html-parser.spec 2004-07-20 17:16:32 UTC (rev 3205) +++ contrib/perl-html-parser/current/specs/perl-html-parser.spec 2004-07-20 17:26:23 UTC (rev 3206) @@ -1,16 +1,15 @@ -%define __check_files %{nil} %define real_name HTML-Parser -%define real_version 3.35 +%define real_version 3.36 %define perl_version %(rpm -q perl --queryformat '%%{version}' 2>/dev/null) Summary: HTML Parser for perl Name: perl-html-parser Version: %{real_version} -Release: 16gd +Release: 1gd Source: %{real_name}-%{real_version}.tar.gz Patch: %{real_name}-3.31-force-unicode.patch License: Perl -Group: Trustix Contrib +Group: tinysofa contrib Requires: perl >= %{perl_version}, perl-html-tagset BuildRequires: perl-html-tagset BuildRequires: perl-devel >= 5.8.0-12bg @@ -25,7 +24,7 @@ Remember to also look at the HTML-Tree package that build on HTML::Parser to create and extract information from HTML syntax trees. -%prep -q +%prep %setup -q -n %{real_name}-%{real_version} %patch -p1 @@ -37,22 +36,26 @@ [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT %makeinstall PREFIX=$RPM_BUILD_ROOT%{_prefix} +for file in ".packlist" "perllocal.pod"; do + find $RPM_BUILD_ROOT -name $file | xargs rm +done + %clean [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,0755) %doc Changes README -%dir %{siteperl}/i586-linux-thread-multi/HTML -%dir %{siteperl}/i586-linux-thread-multi/auto -%dir %{siteperl}/i586-linux-thread-multi/auto/HTML -%dir %{siteperl}/i586-linux-thread-multi/auto/HTML/Parser -%{siteperl}/i586-linux-thread-multi/HTML/* -%{siteperl}/i586-linux-thread-multi/auto/HTML/Parser/Parser.bs -%{siteperl}/i586-linux-thread-multi/auto/HTML/Parser/Parser.so +%{siteperl}/* %{_mandir}/man3/* %changelog +* Sun Jul 18 2004 Gerald Dachs 3.36-1gd +- new upstream version + +* Sat Jul 17 2004 Gerald Dachs 3.35-17gd +- cleaned up spec file + * Sun Apr 18 2004 Gerald Dachs 3.35-16gd - Rebuilt for tinysofa From svn at tinysofa.org Tue Jul 20 17:30:05 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Wed, 21 Jul 2004 03:30:05 +1000 (EST) Subject: [tinysofa-svn] r3207 - contrib/perl-html-tagset/current/specs Message-ID: <20040720173005.9E4654E8031@minbar.tinysofa.org> Author: gda Date: 2004-07-21 03:30:05 +1000 (Wed, 21 Jul 2004) New Revision: 3207 Modified: contrib/perl-html-tagset/current/specs/perl-html-tagset.spec Log: cleaned up spec file Modified: contrib/perl-html-tagset/current/specs/perl-html-tagset.spec =================================================================== --- contrib/perl-html-tagset/current/specs/perl-html-tagset.spec 2004-07-20 17:26:23 UTC (rev 3206) +++ contrib/perl-html-tagset/current/specs/perl-html-tagset.spec 2004-07-20 17:30:05 UTC (rev 3207) @@ -1,4 +1,3 @@ -%define __check_files %{nil} %define real_name HTML-Tagset %define real_version 3.03 %define perl_version %(rpm -q perl --queryformat '%%{version}' 2>/dev/null) @@ -6,10 +5,10 @@ Summary: HTML Tagset for perl Name: perl-html-tagset Version: %{real_version} -Release: 16gd +Release: 17gd Source: %{real_name}-%{real_version}.tar.gz License: Perl -Group: Trustix Contrib +Group: tinysofa contrib Requires: perl >= %{perl_version} BuildArch: noarch BuildRequires: perl-devel >= 5.8.0-12bg @@ -20,7 +19,7 @@ %description This module contains data tables useful in dealing with HTML. -%prep -q +%prep %setup -q -n %{real_name}-%{real_version} %build @@ -31,6 +30,10 @@ [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT %makeinstall PREFIX=$RPM_BUILD_ROOT%{_prefix} +for file in ".packlist" "perllocal.pod"; do + find $RPM_BUILD_ROOT -name $file | xargs rm +done + %clean [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT @@ -42,6 +45,9 @@ %{_mandir}/man3/HTML::Tagset* %changelog +* Sat Jul 17 2004 Gerald Dachs 3.03-17gd +- cleaned up spec file + * Sun Apr 18 2004 Gerald Dachs 3.03-16gd - Rebuilt for tinysofa From svn at tinysofa.org Tue Jul 20 17:34:52 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Wed, 21 Jul 2004 03:34:52 +1000 (EST) Subject: [tinysofa-svn] r3208 - contrib/perl-inline/current/specs Message-ID: <20040720173452.67A734E8031@minbar.tinysofa.org> Author: gda Date: 2004-07-21 03:34:52 +1000 (Wed, 21 Jul 2004) New Revision: 3208 Modified: contrib/perl-inline/current/specs/perl-inline.spec Log: cleaned up spec file Modified: contrib/perl-inline/current/specs/perl-inline.spec =================================================================== --- contrib/perl-inline/current/specs/perl-inline.spec 2004-07-20 17:30:05 UTC (rev 3207) +++ contrib/perl-inline/current/specs/perl-inline.spec 2004-07-20 17:34:52 UTC (rev 3208) @@ -1,4 +1,3 @@ -#%define __check_files %{nil} %define real_name Inline %define real_version 0.44 %define perl_version %(rpm -q perl --queryformat '%%{version}' 2>/dev/null) @@ -6,7 +5,7 @@ Summary: Write Perl subroutines in other programming languages. Name: perl-inline Version: %{real_version} -Release: 1gd +Release: 2gd Source: %{real_name}-%{real_version}.tar.gz License: Perl Group: tinysofa contrib @@ -21,7 +20,7 @@ %description Write Perl subroutines in other programming languages. -%prep -q +%prep %setup -q -n %{real_name}-%{real_version} %build @@ -32,18 +31,26 @@ [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT %makeinstall PREFIX=$RPM_BUILD_ROOT%{_prefix} +for file in ".packlist" "perllocal.pod"; do + find $RPM_BUILD_ROOT -name $file | xargs rm +done + %clean [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,0755) %doc Changes README -%{siteperl}/i586-linux-thread-multi/auto/Inline +%{siteperl}/%{_arch}-linux-thread-multi/auto/Inline %{siteperl}/Inline.pm +%{siteperl}/*.pod %{siteperl}/auto/Inline %{siteperl}/Inline %{_mandir}/man3/* %changelog +* Sat Jul 17 2004 Gerald Dachs 0.44-2gd +- cleaned up spec file + * Wed Jun 23 2004 Gerald Dachs 0.44-1gd - packaged for tinysofa From svn at tinysofa.org Tue Jul 20 17:37:52 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Wed, 21 Jul 2004 03:37:52 +1000 (EST) Subject: [tinysofa-svn] r3209 - contrib/perl-io-multiplex/current/specs Message-ID: <20040720173752.364984E8031@minbar.tinysofa.org> Author: gda Date: 2004-07-21 03:37:52 +1000 (Wed, 21 Jul 2004) New Revision: 3209 Modified: contrib/perl-io-multiplex/current/specs/perl-io-multiplex.spec Log: cleaned up spec file Modified: contrib/perl-io-multiplex/current/specs/perl-io-multiplex.spec =================================================================== --- contrib/perl-io-multiplex/current/specs/perl-io-multiplex.spec 2004-07-20 17:34:52 UTC (rev 3208) +++ contrib/perl-io-multiplex/current/specs/perl-io-multiplex.spec 2004-07-20 17:37:52 UTC (rev 3209) @@ -1,4 +1,3 @@ -%define __check_files %{nil} # Derived values %define module IO-Multiplex %define perlver %(rpm -q perl --queryformat '%%{version}' 2>/dev/null) @@ -6,9 +5,9 @@ Summary: Perl module %{module} Name: perl-io-multiplex Version: 1.08 -Release: 16gd +Release: 17gd License: distributable -Group: Trustix Contrib +Group: tinysofa contrib Source0: http://search.cpan.org/CPAN/authors/id/B/BB/BBB/IO-Multiplex-1.08.tar.gz Url: http://www.cpan.org BuildRoot: /var/tmp/%{name}-buildroot-%(id -nu)/ @@ -22,10 +21,6 @@ %description %{module} module from CPAN for perl -# Provide perl-specific find-{provides,requires}. -%define __find_provides /usr/lib/rpm/find-provides.perl -%define __find_requires /usr/lib/rpm/find-requires.perl - %prep %setup -q -n %{module}-%{version} @@ -38,11 +33,11 @@ %install [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT -eval `perl '-V:installarchlib'` -mkdir -p $RPM_BUILD_ROOT/$installarchlib %{makeinstall} -[ -x /usr/lib/rpm/brp-compress ] && /usr/lib/rpm/brp-compress +for file in ".packlist" "perllocal.pod"; do + find $RPM_BUILD_ROOT -name $file | xargs rm +done %files %defattr(-,root,root,0755) @@ -52,6 +47,9 @@ %doc Changes MANIFEST README TODO %changelog +* Sat Jul 17 2004 Gerald Dachs 1.08-17gd +- cleaned up spec file + * Sun Apr 18 2004 Gerald Dachs 1.08-16gd - Rebuilt for tinysofa From svn at tinysofa.org Tue Jul 20 17:40:33 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Wed, 21 Jul 2004 03:40:33 +1000 (EST) Subject: [tinysofa-svn] r3210 - in contrib/perl-io-socket-ssl/current: sources specs Message-ID: <20040720174033.B7F7F4E8031@minbar.tinysofa.org> Author: gda Date: 2004-07-21 03:40:33 +1000 (Wed, 21 Jul 2004) New Revision: 3210 Added: contrib/perl-io-socket-ssl/current/sources/IO-Socket-SSL-0.96.tar.gz Removed: contrib/perl-io-socket-ssl/current/sources/IO-Socket-SSL-0.95.tar.gz Modified: contrib/perl-io-socket-ssl/current/specs/perl-io-socket-ssl.spec Log: new upstream version Deleted: contrib/perl-io-socket-ssl/current/sources/IO-Socket-SSL-0.95.tar.gz =================================================================== (Binary files differ) Added: contrib/perl-io-socket-ssl/current/sources/IO-Socket-SSL-0.96.tar.gz =================================================================== (Binary files differ) Property changes on: contrib/perl-io-socket-ssl/current/sources/IO-Socket-SSL-0.96.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: contrib/perl-io-socket-ssl/current/specs/perl-io-socket-ssl.spec =================================================================== --- contrib/perl-io-socket-ssl/current/specs/perl-io-socket-ssl.spec 2004-07-20 17:37:52 UTC (rev 3209) +++ contrib/perl-io-socket-ssl/current/specs/perl-io-socket-ssl.spec 2004-07-20 17:40:33 UTC (rev 3210) @@ -1,15 +1,14 @@ -%define __check_files %{nil} # Derived values %define module IO-Socket-SSL %define perlver %(rpm -q perl --queryformat '%%{version}' 2>/dev/null) Summary: Perl module %{module} Name: perl-io-socket-ssl -Version: 0.95 -Release: 16gd +Version: 0.96 +Release: 1gd License: distributable -Group: Trustix Contrib -Source0: http://search.cpan.org/CPAN/authors/id/B/BE/BEHROOZI/IO-Socket-SSL-0.95.tar.gz +Group: tinysofa contrib +Source0: http://search.cpan.org/CPAN/authors/id/B/BE/BEHROOZI/%{module}-%{version}.tar.gz Url: http://www.cpan.org BuildRoot: /var/tmp/%{name}-buildroot-%(id -nu)/ BuildArch: noarch @@ -22,10 +21,6 @@ %description %{module} module from CPAN for perl -# Provide perl-specific find-{provides,requires}. -%define __find_provides /usr/lib/rpm/find-provides.perl -%define __find_requires /usr/lib/rpm/find-requires.perl - %prep %setup -q -n %{module}-%{version} @@ -38,11 +33,11 @@ %install [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT -eval `perl '-V:installarchlib'` -mkdir -p $RPM_BUILD_ROOT/$installarchlib %{makeinstall} -[ -x /usr/lib/rpm/brp-compress ] && /usr/lib/rpm/brp-compress +for file in ".packlist" "perllocal.pod"; do + find $RPM_BUILD_ROOT -name $file | xargs rm +done %files %defattr(-,root,root,0755) @@ -53,6 +48,12 @@ %doc BUGS MANIFEST README docs Changes certs example %changelog +* Sun Jul 18 2004 Gerald Dachs 0.96-1gd +- new upstream version + +* Sat Jul 17 2004 Gerald Dachs 0.95-17gd +- cleaned up spec file + * Sun Apr 18 2004 Gerald Dachs 0.95-16gd - Rebuilt for tinysofa From svn at tinysofa.org Tue Jul 20 17:42:00 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Wed, 21 Jul 2004 03:42:00 +1000 (EST) Subject: [tinysofa-svn] r3211 - contrib/perl-io-stringy/current/specs Message-ID: <20040720174200.02AEF4E8031@minbar.tinysofa.org> Author: gda Date: 2004-07-21 03:42:00 +1000 (Wed, 21 Jul 2004) New Revision: 3211 Modified: contrib/perl-io-stringy/current/specs/perl-io-stringy.spec Log: cleaned up spec file Modified: contrib/perl-io-stringy/current/specs/perl-io-stringy.spec =================================================================== --- contrib/perl-io-stringy/current/specs/perl-io-stringy.spec 2004-07-20 17:40:33 UTC (rev 3210) +++ contrib/perl-io-stringy/current/specs/perl-io-stringy.spec 2004-07-20 17:42:00 UTC (rev 3211) @@ -1,4 +1,3 @@ -%define __check_files %{nil} %define class IO %define subclass stringy # Derived values @@ -8,9 +7,9 @@ Summary: Perl module %{module} Name: perl-io-stringy Version: 2.109 -Release: 16gd +Release: 17gd License: distributable -Group: Trustix Contrib +Group: tinysofa contrib Source0: http://search.cpan.org/CPAN/authors/id/E/ER/ERYQ/IO-stringy-2.109.tar.gz Url: http://www.cpan.org BuildRoot: /var/tmp/%{name}-buildroot-%(id -nu)/ @@ -24,10 +23,6 @@ %description %{module} module from CPAN for perl -# Provide perl-specific find-{provides,requires}. -%define __find_provides /usr/lib/rpm/find-provides.perl -%define __find_requires /usr/lib/rpm/find-requires.perl - %prep %setup -q -n %{module}-%{version} @@ -40,11 +35,11 @@ %install [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT -eval `perl '-V:installarchlib'` -mkdir -p $RPM_BUILD_ROOT/$installarchlib %{makeinstall} -[ -x /usr/lib/rpm/brp-compress ] && /usr/lib/rpm/brp-compress +for file in ".packlist" "perllocal.pod"; do + find $RPM_BUILD_ROOT -name $file | xargs rm +done %files %defattr(-,root,root,0755) @@ -54,6 +49,9 @@ %doc COPYING Makefile README docs MANIFEST README.system examples %changelog +* Sat Jul 17 2004 Gerald Dachs 2.109-17gd +- cleaned up spec file + * Sun Apr 18 2004 Gerald Dachs 2.109-16gd - Rebuilt for tinysofa From svn at tinysofa.org Tue Jul 20 17:44:36 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Wed, 21 Jul 2004 03:44:36 +1000 (EST) Subject: [tinysofa-svn] r3212 - contrib/perl-io-zlib/current/specs Message-ID: <20040720174436.184AF4E8031@minbar.tinysofa.org> Author: gda Date: 2004-07-21 03:44:35 +1000 (Wed, 21 Jul 2004) New Revision: 3212 Modified: contrib/perl-io-zlib/current/specs/perl-io-zlib.spec Log: cleaned up spec file Modified: contrib/perl-io-zlib/current/specs/perl-io-zlib.spec =================================================================== --- contrib/perl-io-zlib/current/specs/perl-io-zlib.spec 2004-07-20 17:42:00 UTC (rev 3211) +++ contrib/perl-io-zlib/current/specs/perl-io-zlib.spec 2004-07-20 17:44:35 UTC (rev 3212) @@ -1,4 +1,3 @@ -%define __check_files %{nil} # Derived values %define module IO-Zlib %define perlver %(rpm -q perl --queryformat '%%{version}' 2>/dev/null) @@ -6,14 +5,14 @@ Summary: Perl module %{module} Name: perl-io-zlib Version: 1.01 -Release: 16gd +Release: 17gd License: distributable -Group: Trustix Contrib +Group: tinysofa contrib Source0: http://search.cpan.org/CPAN/authors/id/T/TO/TOMHUGHES/IO-Zlib-1.01.tar.gz Url: http://www.cpan.org BuildRoot: /var/tmp/%{name}-buildroot-%(id -nu)/ BuildArch: noarch -BuildRequires: perl +BuildRequires: perl perl-compress-zlib Requires: perl = %{perlver} Provides: %{module} = %{version} @@ -22,10 +21,6 @@ %description %{module} module from CPAN for perl -# Provide perl-specific find-{provides,requires}. -%define __find_provides /usr/lib/rpm/find-provides.perl -%define __find_requires /usr/lib/rpm/find-requires.perl - %prep %setup -q -n %{module}-%{version} @@ -38,11 +33,11 @@ %install [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT -eval `perl '-V:installarchlib'` -mkdir -p $RPM_BUILD_ROOT/$installarchlib %{makeinstall} -[ -x /usr/lib/rpm/brp-compress ] && /usr/lib/rpm/brp-compress +for file in ".packlist" "perllocal.pod"; do + find $RPM_BUILD_ROOT -name $file | xargs rm +done %files %defattr(-,root,root,0755) @@ -52,6 +47,9 @@ %doc ChangeLog MANIFEST README %changelog +* Sat Jul 17 2004 Gerald Dachs 1.01-17gd +- cleaned up spec file + * Sun Apr 18 2004 Gerald Dachs 1.01-16gd - Rebuilt for tinysofa From svn at tinysofa.org Tue Jul 20 17:57:37 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Wed, 21 Jul 2004 03:57:37 +1000 (EST) Subject: [tinysofa-svn] r3213 - in contrib/perl-mail-clamav/current: sources specs Message-ID: <20040720175737.226734E8031@minbar.tinysofa.org> Author: gda Date: 2004-07-21 03:57:36 +1000 (Wed, 21 Jul 2004) New Revision: 3213 Added: contrib/perl-mail-clamav/current/sources/Mail-ClamAV-0.11.tar.gz Removed: contrib/perl-mail-clamav/current/sources/Mail-ClamAV-0.10.tar.gz Modified: contrib/perl-mail-clamav/current/specs/perl-mail-clamav.spec Log: new upstream version Deleted: contrib/perl-mail-clamav/current/sources/Mail-ClamAV-0.10.tar.gz =================================================================== (Binary files differ) Added: contrib/perl-mail-clamav/current/sources/Mail-ClamAV-0.11.tar.gz =================================================================== (Binary files differ) Property changes on: contrib/perl-mail-clamav/current/sources/Mail-ClamAV-0.11.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: contrib/perl-mail-clamav/current/specs/perl-mail-clamav.spec =================================================================== --- contrib/perl-mail-clamav/current/specs/perl-mail-clamav.spec 2004-07-20 17:44:35 UTC (rev 3212) +++ contrib/perl-mail-clamav/current/specs/perl-mail-clamav.spec 2004-07-20 17:57:36 UTC (rev 3213) @@ -1,6 +1,5 @@ -%define __check_files %{nil} %define real_name Mail-ClamAV -%define real_version 0.10 +%define real_version 0.11 %define perl_version %(rpm -q perl --queryformat '%%{version}' 2>/dev/null) Summary: Perl extension for the clamav virus scanner @@ -10,8 +9,8 @@ Source: %{real_name}-%{real_version}.tar.gz License: Perl Group: tinysofa contrib -Requires: perl >= %{perl_version} perl-inline clamav -BuildRequires: perl-devel >= %{perl_version} perl-inline clamav-devel +Requires: perl >= %{perl_version} perl-inline clamav zlib +BuildRequires: perl-devel >= %{perl_version} perl-inline clamav-devel zlib-devel Buildroot: %{_tmppath}/%{name}-root %define siteperl /usr/lib/perl5/site_perl/%{perl_version} @@ -19,7 +18,7 @@ %description Perl extension for the clamav virus scanner -%prep -q +%prep %setup -q -n %{real_name}-%{real_version} %build @@ -30,20 +29,30 @@ [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT %makeinstall PREFIX=$RPM_BUILD_ROOT%{_prefix} +for file in ".packlist" "perllocal.pod"; do + find $RPM_BUILD_ROOT -name $file | xargs rm +done + %clean [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,0755) %doc Changes README -%dir %{siteperl}/i586-linux-thread-multi/auto/Mail -%dir %{siteperl}/i586-linux-thread-multi/auto/Mail/ClamAV -%{siteperl}/i586-linux-thread-multi/auto/Mail/ClamAV/ClamAV.so -%{siteperl}/i586-linux-thread-multi/auto/Mail/ClamAV/ClamAV.bs -%dir %{siteperl}/i586-linux-thread-multi/Mail -%{siteperl}/i586-linux-thread-multi/Mail/ClamAV.pm +%dir %{siteperl}/%{_arch}-linux-thread-multi/auto/Mail +%dir %{siteperl}/%{_arch}-linux-thread-multi/auto/Mail/ClamAV +%{siteperl}/%{_arch}-linux-thread-multi/auto/Mail/ClamAV/ClamAV.so +%{siteperl}/%{_arch}-linux-thread-multi/auto/Mail/ClamAV/ClamAV.bs +%dir %{siteperl}/%{_arch}-linux-thread-multi/Mail +%{siteperl}/%{_arch}-linux-thread-multi/Mail/ClamAV.pm %{_mandir}/man3/* %changelog -* Wed Jun 23 2004 Gerald Dachs 1.94-1gd +* Sun Jul 18 2004 Gerald Dachs 0.11-1gd +- new upstream version + +* Sat Jul 17 2004 Gerald Dachs 0.10-2gd +- cleaned up spec file + +* Wed Jun 23 2004 Gerald Dachs 0.10-1gd - packaged for tinysofa From svn at tinysofa.org Tue Jul 20 18:19:34 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Wed, 21 Jul 2004 04:19:34 +1000 (EST) Subject: [tinysofa-svn] r3214 - in contrib/perl-mailtools/current: sources specs Message-ID: <20040720181934.499F14E8031@minbar.tinysofa.org> Author: gda Date: 2004-07-21 04:19:33 +1000 (Wed, 21 Jul 2004) New Revision: 3214 Added: contrib/perl-mailtools/current/sources/MailTools-1.62.tar.gz Removed: contrib/perl-mailtools/current/sources/MailTools-1.60.tar.gz Modified: contrib/perl-mailtools/current/specs/perl-mailtools.spec Log: new upstream version Deleted: contrib/perl-mailtools/current/sources/MailTools-1.60.tar.gz =================================================================== (Binary files differ) Added: contrib/perl-mailtools/current/sources/MailTools-1.62.tar.gz =================================================================== (Binary files differ) Property changes on: contrib/perl-mailtools/current/sources/MailTools-1.62.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: contrib/perl-mailtools/current/specs/perl-mailtools.spec =================================================================== --- contrib/perl-mailtools/current/specs/perl-mailtools.spec 2004-07-20 17:57:36 UTC (rev 3213) +++ contrib/perl-mailtools/current/specs/perl-mailtools.spec 2004-07-20 18:19:33 UTC (rev 3214) @@ -1,19 +1,18 @@ -%define __check_files %{nil} # Derived values %define module MailTools %define perlver %(rpm -q perl --queryformat '%%{version}' 2>/dev/null) Summary: Perl module %{module} Name: perl-mailtools -Version: 1.60 -Release: 16gd +Version: 1.62 +Release: 1gd License: distributable -Group: Trustix Contrib -Source0: http://search.cpan.org/CPAN/authors/id/M/MA/MARKOV/MailTools-1.60.tar.gz +Group: tinysofa contrib +Source0: http://search.cpan.org/CPAN/authors/id/M/MA/MARKOV/%{module}-%{version}.tar.gz Url: http://www.cpan.org BuildRoot: /var/tmp/%{name}-buildroot-%(id -nu)/ BuildArch: noarch -BuildRequires: perl +BuildRequires: perl perl-time-date Requires: perl = %{perlver} Provides: %{module} = %{version} @@ -22,10 +21,6 @@ %description %{module} module from CPAN for perl -# Provide perl-specific find-{provides,requires}. -%define __find_provides /usr/lib/rpm/find-provides.perl -%define __find_requires /usr/lib/rpm/find-requires.perl - %prep %setup -q -n %{module}-%{version} @@ -38,11 +33,11 @@ %install [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT -eval `perl '-V:installarchlib'` -mkdir -p $RPM_BUILD_ROOT/$installarchlib %{makeinstall} -[ -x /usr/lib/rpm/brp-compress ] && /usr/lib/rpm/brp-compress +for file in ".packlist" "perllocal.pod"; do + find $RPM_BUILD_ROOT -name $file | xargs rm +done %files %defattr(-,root,root,0755) @@ -62,6 +57,12 @@ %doc ChangeLog README MANIFEST README.demos examples %changelog +* Sun Jul 18 2004 Gerald Dachs 1.62-1gd +- new upstream version + +* Sat Jul 17 2004 Gerald Dachs 1.60-17gd +- cleaned up spec file + * Sun Apr 18 2004 Gerald Dachs 1.60-16gd - Rebuilt for tinysofa From svn at tinysofa.org Tue Jul 20 18:20:57 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Wed, 21 Jul 2004 04:20:57 +1000 (EST) Subject: [tinysofa-svn] r3215 - contrib/perl-mime-tools/current/specs Message-ID: <20040720182057.A57EB4E8031@minbar.tinysofa.org> Author: gda Date: 2004-07-21 04:20:57 +1000 (Wed, 21 Jul 2004) New Revision: 3215 Modified: contrib/perl-mime-tools/current/specs/perl-mime-tools.spec Log: cleaned up spec file Modified: contrib/perl-mime-tools/current/specs/perl-mime-tools.spec =================================================================== --- contrib/perl-mime-tools/current/specs/perl-mime-tools.spec 2004-07-20 18:19:33 UTC (rev 3214) +++ contrib/perl-mime-tools/current/specs/perl-mime-tools.spec 2004-07-20 18:20:57 UTC (rev 3215) @@ -1,4 +1,3 @@ -%define __check_files %{nil} # Derived values %define module MIME-tools %define perlver %(rpm -q perl --queryformat '%%{version}' 2>/dev/null) @@ -6,10 +5,11 @@ Summary: Perl module %{module} Name: perl-mime-tools Version: 6.200_02 -Release: 16gd +Release: 18gd License: distributable -Group: Trustix Contrib +Group: tinysofa contrib Source0: http://search.cpan.org/CPAN/authors/id/E/ER/ERYQ/MIME-tools-6.200_02.tar.gz +Patch0: perl-mime-tools-6.200_02-no-v5.6.patch Url: http://www.cpan.org BuildRoot: /var/tmp/%{name}-buildroot-%(id -nu)/ BuildArch: noarch @@ -25,12 +25,9 @@ %description %{module} module from CPAN for perl -# Provide perl-specific find-{provides,requires}. -%define __find_provides /usr/lib/rpm/find-provides.perl -%define __find_requires /usr/lib/rpm/find-requires.perl - %prep %setup -q -n %{module}-%{version} +%patch -p1 %build CFLAGS="$RPM_OPT_FLAGS" perl Makefile.PL PREFIX=$RPM_BUILD_ROOT%{_prefix} @@ -41,11 +38,11 @@ %install [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT -eval `perl '-V:installarchlib'` -mkdir -p $RPM_BUILD_ROOT/$installarchlib %{makeinstall} -[ -x /usr/lib/rpm/brp-compress ] && /usr/lib/rpm/brp-compress +for file in ".packlist" "perllocal.pod"; do + find $RPM_BUILD_ROOT -name $file | xargs rm +done %files %defattr(-,root,root,0755) @@ -64,6 +61,12 @@ %doc COPYING README-OR-DIE examples testmsgs INSTALLING MANIFEST README %changelog +* Sun Jul 18 2004 Gerald Dachs 6.200_02-18gd +- patched v5.6 away + +* Sat Jul 17 2004 Gerald Dachs 6.200_02-17gd +- cleaned up spec file + * Sun Apr 18 2004 Gerald Dachs 6.200_02-16gd - Rebuilt for tinysofa From svn at tinysofa.org Tue Jul 20 18:23:16 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Wed, 21 Jul 2004 04:23:16 +1000 (EST) Subject: [tinysofa-svn] r3216 - in contrib/perl-net-server/current: sources specs Message-ID: <20040720182316.986794E8031@minbar.tinysofa.org> Author: gda Date: 2004-07-21 04:23:16 +1000 (Wed, 21 Jul 2004) New Revision: 3216 Added: contrib/perl-net-server/current/sources/Net-Server-0.87.tar.gz Removed: contrib/perl-net-server/current/sources/Net-Server-0.86.tar.gz Modified: contrib/perl-net-server/current/specs/perl-net-server.spec Log: new upstream version Deleted: contrib/perl-net-server/current/sources/Net-Server-0.86.tar.gz =================================================================== (Binary files differ) Added: contrib/perl-net-server/current/sources/Net-Server-0.87.tar.gz =================================================================== (Binary files differ) Property changes on: contrib/perl-net-server/current/sources/Net-Server-0.87.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: contrib/perl-net-server/current/specs/perl-net-server.spec =================================================================== --- contrib/perl-net-server/current/specs/perl-net-server.spec 2004-07-20 18:20:57 UTC (rev 3215) +++ contrib/perl-net-server/current/specs/perl-net-server.spec 2004-07-20 18:23:16 UTC (rev 3216) @@ -1,15 +1,14 @@ -%define __check_files %{nil} # Derived values %define module Net-Server %define perlver %(rpm -q perl --queryformat '%%{version}' 2>/dev/null) Summary: Perl module %{module} Name: perl-net-server -Version: 0.86 -Release: 16gd +Version: 0.87 +Release: 1gd License: distributable -Group: Trustix Contrib -Source0: http://search.cpan.org/CPAN/authors/id/B/BB/BBB/Net-Server-0.86.tar.gz +Group: tinysofa contrib +Source0: http://search.cpan.org/CPAN/authors/id/B/BB/BBB/%{module}-%{version}.tar.gz Url: http://www.cpan.org BuildRoot: /var/tmp/%{name}-buildroot-%(id -nu)/ BuildArch: noarch @@ -22,10 +21,6 @@ %description %{module} module from CPAN for perl -# Provide perl-specific find-{provides,requires}. -%define __find_provides /usr/lib/rpm/find-provides.perl -%define __find_requires /usr/lib/rpm/find-requires.perl - %prep %setup -q -n %{module}-%{version} @@ -37,12 +32,11 @@ [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT %install -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT -eval `perl '-V:installarchlib'` -mkdir -p $RPM_BUILD_ROOT/$installarchlib %{makeinstall} -[ -x /usr/lib/rpm/brp-compress ] && /usr/lib/rpm/brp-compress +for file in ".packlist" "perllocal.pod"; do + find $RPM_BUILD_ROOT -name $file | xargs rm +done %files %defattr(-,root,root,0755) @@ -56,6 +50,12 @@ %doc Changes MANIFEST.SKIP MANIFEST README examples %changelog +* Sun Jul 18 2004 Gerald Dachs 0.87-1gd +- new upstream version + +* Sat Jul 17 2004 Gerald Dachs 0.86-17gd +- cleaned up spec file + * Sun Apr 18 2004 Gerald Dachs 0.86-16gd - Rebuilt for tinysofa From svn at tinysofa.org Tue Jul 20 18:24:04 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Wed, 21 Jul 2004 04:24:04 +1000 (EST) Subject: [tinysofa-svn] r3217 - contrib/perl-parse-recdescent/current/specs Message-ID: <20040720182404.543C74E8031@minbar.tinysofa.org> Author: gda Date: 2004-07-21 04:24:04 +1000 (Wed, 21 Jul 2004) New Revision: 3217 Modified: contrib/perl-parse-recdescent/current/specs/perl-parse-recdescent.spec Log: cleaned up spec file Modified: contrib/perl-parse-recdescent/current/specs/perl-parse-recdescent.spec =================================================================== --- contrib/perl-parse-recdescent/current/specs/perl-parse-recdescent.spec 2004-07-20 18:23:16 UTC (rev 3216) +++ contrib/perl-parse-recdescent/current/specs/perl-parse-recdescent.spec 2004-07-20 18:24:04 UTC (rev 3217) @@ -1,4 +1,3 @@ -%define __check_files %{nil} %define real_name Parse-RecDescent %define real_version 1.94 %define perl_version %(rpm -q perl --queryformat '%%{version}' 2>/dev/null) @@ -6,7 +5,7 @@ Summary: Generate Recursive-Descent Parsers Name: perl-parse-recdescent Version: %{real_version} -Release: 1gd +Release: 2gd Source: %{real_name}-%{real_version}.tar.gz License: Perl Group: tinysofa contrib @@ -19,7 +18,7 @@ %description Generate Recursive-Descent Parsers -%prep -q +%prep %setup -q -n %{real_name}-%{real_version} %build @@ -30,19 +29,24 @@ [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT %makeinstall PREFIX=$RPM_BUILD_ROOT%{_prefix} +for file in ".packlist" "perllocal.pod"; do + find $RPM_BUILD_ROOT -name $file | xargs rm +done + %clean [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,0755) %doc Changes README -%dir %{siteperl}/i586-linux-thread-multi/auto/Parse -%{siteperl}/i586-linux-thread-multi/auto/Parse/RecDescent %dir %{siteperl}/Parse %{siteperl}/Parse/RecDescent.pm %{siteperl}/Parse/RecDescent.pod %{_mandir}/man3/Parse::RecDescent.3.gz %changelog +* Sat Jul 17 2004 Gerald Dachs 1.94-2gd +- cleaned up spec file + * Wed Jun 23 2004 Gerald Dachs 1.94-1gd - packaged for tinysofa From svn at tinysofa.org Tue Jul 20 18:25:04 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Wed, 21 Jul 2004 04:25:04 +1000 (EST) Subject: [tinysofa-svn] r3218 - contrib/perl-unicode-map/current/specs Message-ID: <20040720182504.B871F4E8031@minbar.tinysofa.org> Author: gda Date: 2004-07-21 04:25:04 +1000 (Wed, 21 Jul 2004) New Revision: 3218 Modified: contrib/perl-unicode-map/current/specs/perl-unicode-map.spec Log: cleaned up spec file Modified: contrib/perl-unicode-map/current/specs/perl-unicode-map.spec =================================================================== --- contrib/perl-unicode-map/current/specs/perl-unicode-map.spec 2004-07-20 18:24:04 UTC (rev 3217) +++ contrib/perl-unicode-map/current/specs/perl-unicode-map.spec 2004-07-20 18:25:04 UTC (rev 3218) @@ -1,4 +1,3 @@ -%define __check_files %{nil} # Derived values %define module Unicode-Map %define perlver %(rpm -q perl --queryformat '%%{version}' 2>/dev/null) @@ -12,8 +11,7 @@ Source0: http://search.cpan.org/CPAN/authors/id/M/MS/MSCHWARTZ/Unicode-Map-0.112.tar.gz Url: http://www.cpan.org BuildRoot: /var/tmp/%{name}-buildroot-%(id -nu)/ -BuildArch: i586 -BuildRequires: perl +BuildRequires: perl perl-libwww-perl Requires: perl = %{perlver} Provides: %{module} = %{version} @@ -22,10 +20,6 @@ %description %{module} module from CPAN for perl -# Provide perl-specific find-{provides,requires}. -%define __find_provides /usr/lib/rpm/find-provides.perl -%define __find_requires /usr/lib/rpm/find-requires.perl - %prep %setup -q -n %{module}-%{version} @@ -37,32 +31,31 @@ [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT %install -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT -eval `perl '-V:installarchlib'` -mkdir -p $RPM_BUILD_ROOT/$installarchlib %{makeinstall} -[ -x /usr/lib/rpm/brp-compress ] && /usr/lib/rpm/brp-compress +for file in ".packlist" "perllocal.pod"; do + find $RPM_BUILD_ROOT -name $file | xargs rm +done %files %defattr(-,root,root,0755) -%dir %{siteperl}/i586-linux-thread-multi/auto -%dir %{siteperl}/i586-linux-thread-multi/auto/Unicode -%dir %{siteperl}/i586-linux-thread-multi/auto/Unicode/Map -%{siteperl}/i586-linux-thread-multi/auto/Unicode/Map/Map.so -%{siteperl}/i586-linux-thread-multi/auto/Unicode/Map/Map.bs -%dir %{siteperl}/i586-linux-thread-multi/Unicode -%{siteperl}/i586-linux-thread-multi/Unicode/Map.pm -%dir %{siteperl}/i586-linux-thread-multi/Unicode/Map -%{siteperl}/i586-linux-thread-multi/Unicode/Map/* +%dir %{siteperl}/%{_arch}-linux-thread-multi/auto +%dir %{siteperl}/%{_arch}-linux-thread-multi/auto/Unicode +%dir %{siteperl}/%{_arch}-linux-thread-multi/auto/Unicode/Map +%{siteperl}/%{_arch}-linux-thread-multi/auto/Unicode/Map/Map.so +%{siteperl}/%{_arch}-linux-thread-multi/auto/Unicode/Map/Map.bs +%dir %{siteperl}/%{_arch}-linux-thread-multi/Unicode +%{siteperl}/%{_arch}-linux-thread-multi/Unicode/Map.pm +%dir %{siteperl}/%{_arch}-linux-thread-multi/Unicode/Map +%{siteperl}/%{_arch}-linux-thread-multi/Unicode/Map/* %{_mandir}/man1/* %{_mandir}/man3/* /usr/bin/* %doc COPYING MANIFEST README Changes INSTALL %changelog -* Sun Jun 27 2004 Gerald Dachs 0.112-17gd -- changed group +* Sat Jul 17 2004 Gerald Dachs 0.112-17gd +- cleaned up spec file * Sun Apr 18 2004 Gerald Dachs 0.112-16gd - Rebuilt for tinysofa From svn at tinysofa.org Tue Jul 20 18:26:00 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Wed, 21 Jul 2004 04:26:00 +1000 (EST) Subject: [tinysofa-svn] r3219 - contrib/perl-unicode-string/current/specs Message-ID: <20040720182600.F346A4E8031@minbar.tinysofa.org> Author: gda Date: 2004-07-21 04:26:00 +1000 (Wed, 21 Jul 2004) New Revision: 3219 Modified: contrib/perl-unicode-string/current/specs/perl-unicode-string.spec Log: cleaned up spec file Modified: contrib/perl-unicode-string/current/specs/perl-unicode-string.spec =================================================================== --- contrib/perl-unicode-string/current/specs/perl-unicode-string.spec 2004-07-20 18:25:04 UTC (rev 3218) +++ contrib/perl-unicode-string/current/specs/perl-unicode-string.spec 2004-07-20 18:26:00 UTC (rev 3219) @@ -1,4 +1,3 @@ -%define __check_files %{nil} # Derived values %define module Unicode-String %define perlver %(rpm -q perl --queryformat '%%{version}' 2>/dev/null) @@ -12,7 +11,6 @@ Source0: http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/Unicode-String-2.07.tar.gz Url: http://www.cpan.org BuildRoot: /var/tmp/%{name}-buildroot-%(id -nu)/ -BuildArch: i586 BuildRequires: perl Requires: perl = %{perlver} Provides: %{module} = %{version} @@ -22,10 +20,6 @@ %description %{module} module from CPAN for perl -# Provide perl-specific find-{provides,requires}. -%define __find_provides /usr/lib/rpm/find-provides.perl -%define __find_requires /usr/lib/rpm/find-requires.perl - %prep %setup -q -n %{module}-%{version} @@ -38,27 +32,27 @@ %install [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT -eval `perl '-V:installarchlib'` -mkdir -p $RPM_BUILD_ROOT/$installarchlib %{makeinstall} -[ -x /usr/lib/rpm/brp-compress ] && /usr/lib/rpm/brp-compress +for file in ".packlist" "perllocal.pod"; do + find $RPM_BUILD_ROOT -name $file | xargs rm +done %files %defattr(-,root,root,0755) -%dir %{siteperl}/i586-linux-thread-multi/auto -%dir %{siteperl}/i586-linux-thread-multi/auto/Unicode -%dir %{siteperl}/i586-linux-thread-multi/auto/Unicode/String -%{siteperl}/i586-linux-thread-multi/auto/Unicode/String/String.so -%{siteperl}/i586-linux-thread-multi/auto/Unicode/String/String.bs -%dir %{siteperl}/i586-linux-thread-multi/Unicode -%{siteperl}/i586-linux-thread-multi/Unicode/*.pm +%dir %{siteperl}/%{_arch}-linux-thread-multi/auto +%dir %{siteperl}/%{_arch}-linux-thread-multi/auto/Unicode +%dir %{siteperl}/%{_arch}-linux-thread-multi/auto/Unicode/String +%{siteperl}/%{_arch}-linux-thread-multi/auto/Unicode/String/String.so +%{siteperl}/%{_arch}-linux-thread-multi/auto/Unicode/String/String.bs +%dir %{siteperl}/%{_arch}-linux-thread-multi/Unicode +%{siteperl}/%{_arch}-linux-thread-multi/Unicode/*.pm %{_mandir}/man3/* %doc Changes MANIFEST README %changelog -* Sun Jun 27 2004 Gerald Dachs 2.07-17gd -- changed group +* Sat Jul 17 2004 Gerald Dachs 2.07-17gd +- cleaned up spec file * Sun Apr 18 2004 Gerald Dachs 2.07-16gd - Rebuilt for tinysofa From svn at tinysofa.org Tue Jul 20 18:26:39 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Wed, 21 Jul 2004 04:26:39 +1000 (EST) Subject: [tinysofa-svn] r3220 - contrib/perl-unix-syslog/current/specs Message-ID: <20040720182639.B4F114E8031@minbar.tinysofa.org> Author: gda Date: 2004-07-21 04:26:39 +1000 (Wed, 21 Jul 2004) New Revision: 3220 Modified: contrib/perl-unix-syslog/current/specs/perl-unix-syslog.spec Log: cleaned up spec file Modified: contrib/perl-unix-syslog/current/specs/perl-unix-syslog.spec =================================================================== --- contrib/perl-unix-syslog/current/specs/perl-unix-syslog.spec 2004-07-20 18:26:00 UTC (rev 3219) +++ contrib/perl-unix-syslog/current/specs/perl-unix-syslog.spec 2004-07-20 18:26:39 UTC (rev 3220) @@ -1,4 +1,3 @@ -%define __check_files %{nil} # Derived values %define module Unix-Syslog %define perlver %(rpm -q perl --queryformat '%%{version}' 2>/dev/null) @@ -12,7 +11,6 @@ Source0: http://search.cpan.org/CPAN/authors/id/M/MH/MHARNISCH/Unix-Syslog-0.100.tar.gz Url: http://www.cpan.org BuildRoot: /var/tmp/%{name}-buildroot-%(id -nu)/ -BuildArch: i586 BuildRequires: perl Requires: perl = %{perlver} Provides: %{module} = %{version} @@ -22,10 +20,6 @@ %description %{module} module from CPAN for perl -# Provide perl-specific find-{provides,requires}. -%define __find_provides /usr/lib/rpm/find-provides.perl -%define __find_requires /usr/lib/rpm/find-requires.perl - %prep %setup -q -n %{module}-%{version} @@ -38,26 +32,26 @@ %install [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT -eval `perl '-V:installarchlib'` -mkdir -p $RPM_BUILD_ROOT/$installarchlib %{makeinstall} -[ -x /usr/lib/rpm/brp-compress ] && /usr/lib/rpm/brp-compress +for file in ".packlist" "perllocal.pod"; do + find $RPM_BUILD_ROOT -name $file | xargs rm +done %files %defattr(-,root,root,0755) -%dir %{siteperl}/i586-linux-thread-multi/auto -%dir %{siteperl}/i586-linux-thread-multi/auto/Unix -%dir %{siteperl}/i586-linux-thread-multi/auto/Unix/Syslog -%{siteperl}/i586-linux-thread-multi/auto/Unix/Syslog/* -%dir %{siteperl}/i586-linux-thread-multi/Unix -%{siteperl}/i586-linux-thread-multi/Unix/Syslog.pm +%dir %{siteperl}/%{_arch}-linux-thread-multi/auto +%dir %{siteperl}/%{_arch}-linux-thread-multi/auto/Unix +%dir %{siteperl}/%{_arch}-linux-thread-multi/auto/Unix/Syslog +%{siteperl}/%{_arch}-linux-thread-multi/auto/Unix/Syslog/* +%dir %{siteperl}/%{_arch}-linux-thread-multi/Unix +%{siteperl}/%{_arch}-linux-thread-multi/Unix/Syslog.pm %{_mandir}/man3/* %doc Artistic Changes MANIFEST README %changelog -* Sun Jun 27 2004 Gerald Dachs 0.100-17gd -- changed group +* Sat Jul 17 2004 Gerald Dachs 0.100-17gd +- cleaned up spec file * Sun Apr 18 2004 Gerald Dachs 0.100-16gd - Rebuilt for tinysofa From svn at tinysofa.org Tue Jul 20 18:27:53 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Wed, 21 Jul 2004 04:27:53 +1000 (EST) Subject: [tinysofa-svn] r3221 - contrib/perl-uri/current/specs Message-ID: <20040720182753.603324E8031@minbar.tinysofa.org> Author: gda Date: 2004-07-21 04:27:53 +1000 (Wed, 21 Jul 2004) New Revision: 3221 Modified: contrib/perl-uri/current/specs/perl-uri.spec Log: cleaned up spec file Modified: contrib/perl-uri/current/specs/perl-uri.spec =================================================================== --- contrib/perl-uri/current/specs/perl-uri.spec 2004-07-20 18:26:39 UTC (rev 3220) +++ contrib/perl-uri/current/specs/perl-uri.spec 2004-07-20 18:27:53 UTC (rev 3221) @@ -1,4 +1,3 @@ -%define __check_files %{nil} %define real_name URI %define real_version 1.31 %define perl_version %(rpm -q perl --queryformat '%%{version}' 2>/dev/null) @@ -6,11 +5,11 @@ Summary: URI - Uniform Resource Identifiers (absolute and relative) Name: perl-uri Version: %{real_version} -Release: 1gd +Release: 2gd Source: %{real_name}-%{real_version}.tar.gz License: Perl Group: tinysofa contrib -Requires: perl >= %{perl_version} +Requires: perl >= %{perl_version} perl-business-isbn BuildRequires: perl-devel >= %{perl_version} Buildroot: %{_tmppath}/%{name}-root @@ -19,7 +18,7 @@ %description URI - Uniform Resource Identifiers (absolute and relative) -%prep -q +%prep %setup -q -n %{real_name}-%{real_version} %build @@ -30,6 +29,10 @@ [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT %makeinstall PREFIX=$RPM_BUILD_ROOT%{_prefix} +for file in ".packlist" "perllocal.pod"; do + find $RPM_BUILD_ROOT -name $file | xargs rm +done + %clean [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT @@ -40,5 +43,8 @@ %{_mandir}/man3/* %changelog +* Sat Jul 17 2004 Gerald Dachs 1.31-2gd +- cleaned up spec file + * Wed Jun 23 2004 Gerald Dachs 1.31-1gd - packaged for tinysofa From svn at tinysofa.org Tue Jul 20 18:32:01 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Wed, 21 Jul 2004 04:32:01 +1000 (EST) Subject: [tinysofa-svn] r3222 - in contrib: . perl-business-isbn perl-business-isbn/current perl-business-isbn/current/sources perl-business-isbn/current/specs Message-ID: <20040720183201.AFFFA4E8031@minbar.tinysofa.org> Author: gda Date: 2004-07-21 04:32:01 +1000 (Wed, 21 Jul 2004) New Revision: 3222 Added: contrib/perl-business-isbn/ contrib/perl-business-isbn/current/ contrib/perl-business-isbn/current/sources/ contrib/perl-business-isbn/current/sources/Business-ISBN-1.72.tar.gz contrib/perl-business-isbn/current/specs/ contrib/perl-business-isbn/current/specs/perl-business-isbn.spec Log: new rpm Added: contrib/perl-business-isbn/current/sources/Business-ISBN-1.72.tar.gz =================================================================== (Binary files differ) Property changes on: contrib/perl-business-isbn/current/sources/Business-ISBN-1.72.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: contrib/perl-business-isbn/current/specs/perl-business-isbn.spec =================================================================== --- contrib/perl-business-isbn/current/specs/perl-business-isbn.spec 2004-07-20 18:27:53 UTC (rev 3221) +++ contrib/perl-business-isbn/current/specs/perl-business-isbn.spec 2004-07-20 18:32:01 UTC (rev 3222) @@ -0,0 +1,48 @@ +%define real_name Business-ISBN +%define real_version 1.72 +%define perl_version %(rpm -q perl --queryformat '%%{version}' 2>/dev/null) + +Summary: work with International Standard Book Numbers +Name: perl-business-isbn +Version: %{real_version} +Release: 1gd +Source: %{real_name}-%{real_version}.tar.gz +License: Perl +Group: tinysofa contrib +Requires: perl >= %{perl_version} +BuildRequires: perl-devel >= %{perl_version} +Buildroot: %{_tmppath}/%{name}-root +BuildArch: noarch + +%define siteperl /usr/lib/perl5/site_perl/%{perl_version} + +%description +work with International Standard Book Numbers + +%prep +%setup -q -n %{real_name}-%{real_version} + +%build +%{__perl} Makefile.PL INSTALLDIRS=site PREFIX=%{_prefix} +make OPTIMIZE="$RPM_OPT_FLAGS" PREFIX=%{_prefix} + +%install +[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT +%makeinstall PREFIX=$RPM_BUILD_ROOT%{_prefix} + +for file in ".packlist" "perllocal.pod"; do + find $RPM_BUILD_ROOT -name $file | xargs rm +done + +%clean +[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT + +%files +%defattr(-,root,root,0755) +%doc Changes isbns.txt MANIFEST +%{siteperl}/* +%{_mandir}/man3/* + +%changelog +* Sun Jul 18 2004 Gerald Dachs 1.72-1gd +- packaged for tinysofa From svn at tinysofa.org Tue Jul 20 18:36:15 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Wed, 21 Jul 2004 04:36:15 +1000 (EST) Subject: [tinysofa-svn] r3223 - in contrib: . perl-libwww-perl perl-libwww-perl/current perl-libwww-perl/current/sources perl-libwww-perl/current/specs Message-ID: <20040720183615.0B8F14E8031@minbar.tinysofa.org> Author: gda Date: 2004-07-21 04:36:14 +1000 (Wed, 21 Jul 2004) New Revision: 3223 Added: contrib/perl-libwww-perl/ contrib/perl-libwww-perl/current/ contrib/perl-libwww-perl/current/sources/ contrib/perl-libwww-perl/current/sources/libwww-perl-5.800.tar.gz contrib/perl-libwww-perl/current/specs/ contrib/perl-libwww-perl/current/specs/perl-libwww-perl.spec Log: new rpm Added: contrib/perl-libwww-perl/current/sources/libwww-perl-5.800.tar.gz =================================================================== (Binary files differ) Property changes on: contrib/perl-libwww-perl/current/sources/libwww-perl-5.800.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: contrib/perl-libwww-perl/current/specs/perl-libwww-perl.spec =================================================================== --- contrib/perl-libwww-perl/current/specs/perl-libwww-perl.spec 2004-07-20 18:32:01 UTC (rev 3222) +++ contrib/perl-libwww-perl/current/specs/perl-libwww-perl.spec 2004-07-20 18:36:14 UTC (rev 3223) @@ -0,0 +1,62 @@ +%define real_name libwww-perl +%define real_version 5.800 +%define perl_version %(rpm -q perl --queryformat '%%{version}' 2>/dev/null) + +Summary: programming interface to the World-Wide Web +Name: perl-libwww-perl +Version: %{real_version} +Release: 1gd +Source: %{real_name}-%{real_version}.tar.gz +License: Perl +Group: tinysofa contrib +Requires: perl >= %{perl_version} +BuildRequires: perl-devel >= %{perl_version} perl-uri perl-html-parser +Buildroot: %{_tmppath}/%{name}-root +BuildArch: noarch + +%define siteperl /usr/lib/perl5/site_perl/%{perl_version} + +%description +The libwww-perl collection is a set of Perl modules which provides a +simple and consistent application programming interface to the +World-Wide Web. The main focus of the library is to provide classes +and functions that allow you to write WWW clients. The library also +contain modules that are of more general use and even classes that +help you implement simple HTTP servers. + +%prep +%setup -q -n %{real_name}-%{real_version} + +%build +# no microsoft support +rm lib/LWP/Authen/Ntlm.pm +rm lib/HTTP/Cookies/Microsoft.pm + +# no gnome support +rm lib/LWP/Protocol/GHTTP.pm + +echo "n" | %{__perl} Makefile.PL INSTALLDIRS=site PREFIX=%{_prefix} +make OPTIMIZE="$RPM_OPT_FLAGS" PREFIX=%{_prefix} + +%install +[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT +%makeinstall PREFIX=$RPM_BUILD_ROOT%{_prefix} + +for file in ".packlist" "perllocal.pod"; do + find $RPM_BUILD_ROOT -name $file | xargs rm +done + +%clean +[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT + +%files +%defattr(-,root,root,0755) +%doc Changes MANIFEST README README.SSL +%{_bindir}/* +%{siteperl}/* +%{_mandir}/man1/* +%{_mandir}/man3/* + +%changelog +* Sun Jul 18 2004 Gerald Dachs 5.800-1gd +- packaged for tinysofa From svn at tinysofa.org Tue Jul 20 18:38:44 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Wed, 21 Jul 2004 04:38:44 +1000 (EST) Subject: [tinysofa-svn] r3224 - in contrib: . perl-net-cidr perl-net-cidr/current perl-net-cidr/current/sources perl-net-cidr/current/specs Message-ID: <20040720183844.408DF4E8031@minbar.tinysofa.org> Author: gda Date: 2004-07-21 04:38:44 +1000 (Wed, 21 Jul 2004) New Revision: 3224 Added: contrib/perl-net-cidr/ contrib/perl-net-cidr/current/ contrib/perl-net-cidr/current/sources/ contrib/perl-net-cidr/current/sources/Net-CIDR-0.09.tar.gz contrib/perl-net-cidr/current/specs/ contrib/perl-net-cidr/current/specs/perl-net-cidr.spec Log: new rpm Added: contrib/perl-net-cidr/current/sources/Net-CIDR-0.09.tar.gz =================================================================== (Binary files differ) Property changes on: contrib/perl-net-cidr/current/sources/Net-CIDR-0.09.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: contrib/perl-net-cidr/current/specs/perl-net-cidr.spec =================================================================== --- contrib/perl-net-cidr/current/specs/perl-net-cidr.spec 2004-07-20 18:36:14 UTC (rev 3223) +++ contrib/perl-net-cidr/current/specs/perl-net-cidr.spec 2004-07-20 18:38:44 UTC (rev 3224) @@ -0,0 +1,52 @@ +%define real_name Net-CIDR +%define real_version 0.09 +%define perl_version %(rpm -q perl --queryformat '%%{version}' 2>/dev/null) + +Summary: Net-CIDR Perl module +Name: perl-net-cidr +Version: %{real_version} +Release: 2gd +Packager: mailscanner at ecs.soton.ac.uk +License: GPL or Artistic +Group: tinysofa contrib +URL: http://search.cpan.org/dist/Net-CIDR/ +BuildRoot: %{_tmppath}/%{name}-%{version}-root +BuildArch: noarch +BuildRequires: perl +Source0: %{real_name}-%{real_version}.tar.gz + +%define siteperl /usr/lib/perl5/site_perl/%{perl_version} + +%description +Net-CIDR Perl module + +%prep +%setup -q -n %{real_name}-%{real_version} + +%build +CFLAGS="$RPM_OPT_FLAGS" perl Makefile.PL PREFIX=$RPM_BUILD_ROOT%{_prefix} +make OPTIMIZE="$RPM_OPT_FLAGS" + +%install +[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT +%makeinstall + +for file in ".packlist" "perllocal.pod"; do + find $RPM_BUILD_ROOT -name $file | xargs rm +done + +%clean +[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT + +%files +%defattr(755,root,root) +%{siteperl}/Net/CIDR.pm +%{_mandir}/man3/Net::CIDR.3.gz + +%changelog +* Sat Jul 17 2004 Gerald Dachs 0.09-2gd +- cleaned up spec file + +* Sat Mar 6 2004 Gerald Dachs 0.09-1gd +- Initial build for trustix contrib + From svn at tinysofa.org Tue Jul 20 18:42:12 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Wed, 21 Jul 2004 04:42:12 +1000 (EST) Subject: [tinysofa-svn] r3225 - in contrib: . perl-time-date perl-time-date/current perl-time-date/current/sources perl-time-date/current/specs Message-ID: <20040720184212.E01E54E8031@minbar.tinysofa.org> Author: gda Date: 2004-07-21 04:42:12 +1000 (Wed, 21 Jul 2004) New Revision: 3225 Added: contrib/perl-time-date/ contrib/perl-time-date/current/ contrib/perl-time-date/current/sources/ contrib/perl-time-date/current/sources/TimeDate-1.16.tar.gz contrib/perl-time-date/current/specs/ contrib/perl-time-date/current/specs/perl-time-date.spec Log: new rpm Added: contrib/perl-time-date/current/sources/TimeDate-1.16.tar.gz =================================================================== (Binary files differ) Property changes on: contrib/perl-time-date/current/sources/TimeDate-1.16.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: contrib/perl-time-date/current/specs/perl-time-date.spec =================================================================== --- contrib/perl-time-date/current/specs/perl-time-date.spec 2004-07-20 18:38:44 UTC (rev 3224) +++ contrib/perl-time-date/current/specs/perl-time-date.spec 2004-07-20 18:42:12 UTC (rev 3225) @@ -0,0 +1,48 @@ +%define real_name TimeDate +%define real_version 1.16 +%define perl_version %(rpm -q perl --queryformat '%%{version}' 2>/dev/null) + +Summary: This is the perl5 TimeDate distribution. +Name: perl-time-date +Version: %{real_version} +Release: 1gd +Source: %{real_name}-%{real_version}.tar.gz +License: Perl +Group: tinysofa contrib +Requires: perl >= %{perl_version} +BuildRequires: perl-devel >= %{perl_version} +Buildroot: %{_tmppath}/%{name}-root +BuildArch: noarch + +%define siteperl /usr/lib/perl5/site_perl/%{perl_version} + +%description +This is the perl5 TimeDate distribution. + +%prep +%setup -q -n %{real_name}-%{real_version} + +%build +%{__perl} Makefile.PL INSTALLDIRS=site PREFIX=%{_prefix} +make OPTIMIZE="$RPM_OPT_FLAGS" PREFIX=%{_prefix} + +%install +[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT +%makeinstall PREFIX=$RPM_BUILD_ROOT%{_prefix} + +for file in ".packlist" "perllocal.pod"; do + find $RPM_BUILD_ROOT -name $file | xargs rm +done + +%clean +[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT + +%files +%defattr(-,root,root,0755) +%doc ChangeLog MANIFEST README +%{siteperl}/* +%{_mandir}/man3/* + +%changelog +* Sun Jul 18 2004 Gerald Dachs 1.16-1gd +- packaged for tinysofa From svn at tinysofa.org Tue Jul 20 19:19:12 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Wed, 21 Jul 2004 05:19:12 +1000 (EST) Subject: [tinysofa-svn] r3226 - in contrib: . jigdo jigdo/current jigdo/current/sources jigdo/current/specs Message-ID: <20040720191912.25A154E8031@minbar.tinysofa.org> Author: gda Date: 2004-07-21 05:19:11 +1000 (Wed, 21 Jul 2004) New Revision: 3226 Added: contrib/jigdo/ contrib/jigdo/current/ contrib/jigdo/current/sources/ contrib/jigdo/current/sources/jigdo-0.7.1.tar.bz2 contrib/jigdo/current/specs/ contrib/jigdo/current/specs/jigdo.spec Log: new rpm Added: contrib/jigdo/current/sources/jigdo-0.7.1.tar.bz2 =================================================================== (Binary files differ) Property changes on: contrib/jigdo/current/sources/jigdo-0.7.1.tar.bz2 ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: contrib/jigdo/current/specs/jigdo.spec =================================================================== --- contrib/jigdo/current/specs/jigdo.spec 2004-07-20 18:42:12 UTC (rev 3225) +++ contrib/jigdo/current/specs/jigdo.spec 2004-07-20 19:19:11 UTC (rev 3226) @@ -0,0 +1,60 @@ +Summary: Jigsaw Download +Name: jigdo +Version: 0.7.1 +Release: 1gd +Group: tinysofa contrib +URL: http://atterer.net/jigdo/ +Source: http://atterer.net/jigdo/%{name}-%{version}.tar.bz2 +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root +License: GPL +Requires: db4 gcc-runtime gcc-c++-runtime +BuildRequires: db4-devel gcc-c++-devel + +%description +Jigsaw Download, or short jigdo, is an intelligent tool that can be used on the +pieces of any chopped-up big file to create a special "template" file which +makes reassembly of the file very easy for users who only have the pieces. + +What makes jigdo special is that there are no restrictions on what +offsets/sizes the individual pieces have in the original big image. This makes +the program very well suited for distributing CD/DVD images (or large zip/tar +archives) because you can put the files of the CD on an FTP server - when jigdo +is presented the files along with the template you generated, it is able to +recreate the CD image. + + +%prep +%setup -q + + +%build +CXXFLAGS="$RPM_OPT_FLAGS -fexceptions" %configure --with-gui=no +make + + +%install +rm -rf %{buildroot} + +make DESTDIR=%{buildroot} install + +%find_lang %{name} + +%post + +%postun + +%clean +rm -rf %{buildroot} + + +%files -f %{name}.lang +%defattr(-,root,root) +%doc README doc/TechDetails.txt doc/*.html +%{_mandir}/man1/%{name}* +%{_bindir} +%{_datadir}/%{name} + + +%changelog +* Tue Jul 20 2004 Gerald Dachs 0.7.1-1gd +- new in contrib From svn at tinysofa.org Tue Jul 20 19:41:13 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Wed, 21 Jul 2004 05:41:13 +1000 (EST) Subject: [tinysofa-svn] r3227 - in contrib: . tnef tnef/current tnef/current/sources tnef/current/specs Message-ID: <20040720194113.6D8684E8031@minbar.tinysofa.org> Author: gda Date: 2004-07-21 05:41:13 +1000 (Wed, 21 Jul 2004) New Revision: 3227 Added: contrib/tnef/ contrib/tnef/current/ contrib/tnef/current/sources/ contrib/tnef/current/sources/tnef-1.2.3.1.tar.gz contrib/tnef/current/specs/ contrib/tnef/current/specs/tnef.spec Log: new rpm Added: contrib/tnef/current/sources/tnef-1.2.3.1.tar.gz =================================================================== (Binary files differ) Property changes on: contrib/tnef/current/sources/tnef-1.2.3.1.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: contrib/tnef/current/specs/tnef.spec =================================================================== --- contrib/tnef/current/specs/tnef.spec 2004-07-20 19:19:11 UTC (rev 3226) +++ contrib/tnef/current/specs/tnef.spec 2004-07-20 19:41:13 UTC (rev 3227) @@ -0,0 +1,48 @@ +Summary: Decodes MS-TNEF attachments. +Name: tnef +Version: 1.2.3.1 +Release: 2gd +Group: tinysofa contrib +License: GPL +URL: http://world.std.com/~damned/software.html +Source: http://telia.dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz +BuildRoot: %{_tmppath}/%{name}-%{version}-root + +%description +TNEF is a program for unpacking MIME attachments of type +"application/ms-tnef". This is a Microsoft only attachment. + +Due to the proliferation of Microsoft Outlook and Exchange mail servers, +more and more mail is encapsulated into this format. + +The TNEF program allows one to unpack the attachments which were +encapsulated into teh TNEF attachment. Thus alleviating the need to use +Microsoft Outlook to view the attachment. + +%prep +%setup + +%build +%configure +make + +%install +[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT +%makeinstall + +%clean +[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT + +%files +%defattr(0644, root, root, 0755) +%doc README BUGS ChangeLog AUTHORS NEWS TODO +%doc doc tests +%attr(0755, root, root) %{_bindir}/tnef +%{_mandir}/man1/tnef.1* + +%changelog +* Tue Jul 20 2004 Gerald Dachs 1.2.3.1-2gd +- rebuild for tinysofa + +* Sat Mar 6 2004 Gerald Dachs 1.2.3.1-1gd +- Initial build for trustix contrib From svn at tinysofa.org Tue Jul 20 20:42:09 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Wed, 21 Jul 2004 06:42:09 +1000 (EST) Subject: [tinysofa-svn] r3228 - tinysofa/releases/1.1/man/current/specs Message-ID: <20040720204209.11EFD4E8031@minbar.tinysofa.org> Author: jh Date: 2004-07-21 06:42:08 +1000 (Wed, 21 Jul 2004) New Revision: 3228 Modified: tinysofa/releases/1.1/man/current/specs/man.spec Log: - add BuildRequires: less Modified: tinysofa/releases/1.1/man/current/specs/man.spec =================================================================== --- tinysofa/releases/1.1/man/current/specs/man.spec 2004-07-20 19:41:13 UTC (rev 3227) +++ tinysofa/releases/1.1/man/current/specs/man.spec 2004-07-20 20:42:08 UTC (rev 3228) @@ -24,7 +24,7 @@ Buildroot: %{_tmppath}/%{name}-%{version}-root PreReq: coreutils Requires: less, groff >= 1.18, nroff-i18n, findutils, mktemp >= 1.5-2.1.5x -BuildRequires: perl glibc-locales +BuildRequires: perl glibc-locales, less %description The man package includes three tools for finding information and/or From svn at tinysofa.org Tue Jul 20 20:51:13 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Wed, 21 Jul 2004 06:51:13 +1000 (EST) Subject: [tinysofa-svn] r3229 - tinysofa/releases/1.1/glibc/current/sources Message-ID: <20040720205113.67E2D4E8031@minbar.tinysofa.org> Author: jh Date: 2004-07-21 06:51:13 +1000 (Wed, 21 Jul 2004) New Revision: 3229 Modified: tinysofa/releases/1.1/glibc/current/sources/i18n-packages.sh Log: - change i18n packages group to i18n - make i18n packages to own /usr/lib/locale/* directories Modified: tinysofa/releases/1.1/glibc/current/sources/i18n-packages.sh =================================================================== --- tinysofa/releases/1.1/glibc/current/sources/i18n-packages.sh 2004-07-20 20:42:08 UTC (rev 3228) +++ tinysofa/releases/1.1/glibc/current/sources/i18n-packages.sh 2004-07-20 20:51:13 UTC (rev 3229) @@ -211,7 +211,7 @@ echo "%package -n $NAME-i18n-$LANGUAGE" echo "Summary: Internationalization and locale data for the $LANGUAGE language" echo "Summary(pt_BR): Dados de internacionaliza?ao e locales para a l?ngua $LANGUAGE" - echo "Group: main" + echo "Group: i18n" [ -n "$REQUIRES" ] && eval echo "Requires: $REQUIRES" [ -n "$PROVIDES" ] && eval echo "Provides: $PROVIDES" [ -n "$OBSOLETES" ] && eval echo "Obsoletes: $OBSOLETES" @@ -255,6 +255,7 @@ $I18N_BUILDROOT/$LOCALEDIR/$SUBLANGUAGE/ fi if [ $(nr_files $BUILDROOT/usr/lib/locale/$SUBLANGUAGE/*LC_*) != 0 ] ; then + echo "%dir %{_libdir}/locale/$SUBLANGUAGE" echo "%{_libdir}/locale/$SUBLANGUAGE/*LC_*" mkdir -p $I18N_BUILDROOT/usr/lib/locale/$SUBLANGUAGE/ mv $BUILDROOT/usr/lib/locale/$SUBLANGUAGE/*LC_* \ From svn at tinysofa.org Wed Jul 21 07:09:05 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Wed, 21 Jul 2004 17:09:05 +1000 (EST) Subject: [tinysofa-svn] r3230 - tinysofa/releases/1.1/util-linux/current/specs Message-ID: <20040721070905.7EE564E8031@minbar.tinysofa.org> Author: jh Date: 2004-07-21 17:09:04 +1000 (Wed, 21 Jul 2004) New Revision: 3230 Modified: tinysofa/releases/1.1/util-linux/current/specs/util-linux.spec Log: - enable syslog usage for agetty Modified: tinysofa/releases/1.1/util-linux/current/specs/util-linux.spec =================================================================== --- tinysofa/releases/1.1/util-linux/current/specs/util-linux.spec 2004-07-20 20:51:13 UTC (rev 3229) +++ tinysofa/releases/1.1/util-linux/current/specs/util-linux.spec 2004-07-21 07:09:04 UTC (rev 3230) @@ -255,7 +255,7 @@ %configure %make -C mount loop.h -%make "OPT=$RPM_OPT_FLAGS -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64" \ +%make "OPT=$RPM_OPT_FLAGS -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -DUSE_SYSLOG=1" \ LDFLAGS="" \ HAVE_PIVOT_ROOT=yes From svn at tinysofa.org Wed Jul 21 07:26:33 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Wed, 21 Jul 2004 17:26:33 +1000 (EST) Subject: [tinysofa-svn] r3231 - in tinysofa/releases/1.1/rpm/current: sources specs Message-ID: <20040721072633.BEB1A4E8031@minbar.tinysofa.org> Author: jh Date: 2004-07-21 17:26:33 +1000 (Wed, 21 Jul 2004) New Revision: 3231 Added: tinysofa/releases/1.1/rpm/current/sources/rpm-4.3.2-aptctrlc.patch Modified: tinysofa/releases/1.1/rpm/current/specs/rpm.spec Log: - get ready for rpm-4.3.2-aptctrlc.patch Added: tinysofa/releases/1.1/rpm/current/sources/rpm-4.3.2-aptctrlc.patch =================================================================== --- tinysofa/releases/1.1/rpm/current/sources/rpm-4.3.2-aptctrlc.patch 2004-07-21 07:09:04 UTC (rev 3230) +++ tinysofa/releases/1.1/rpm/current/sources/rpm-4.3.2-aptctrlc.patch 2004-07-21 07:26:33 UTC (rev 3231) @@ -0,0 +1,16 @@ +Index: rpm-4.2.2/rpmdb/rpmdb.c +=================================================================== +--- rpm-4.2.2/rpmdb/rpmdb.c ++++ rpm-4.2.2/rpmdb/rpmdb.c 2004-04-08 14:13:27.628619784 -0300 +@@ -832,8 +832,11 @@ + /*@=unqualifiedtrans@*/ + } + db->db_errpfx = _free(db->db_errpfx); ++/* Breaks APT on CTRL-C. */ ++#if 0 + db->db_root = _free(db->db_root); + db->db_home = _free(db->db_home); ++#endif + db->db_bits = PBM_FREE(db->db_bits); + db->_dbi = _free(db->_dbi); + Modified: tinysofa/releases/1.1/rpm/current/specs/rpm.spec =================================================================== --- tinysofa/releases/1.1/rpm/current/specs/rpm.spec 2004-07-21 07:09:04 UTC (rev 3230) +++ tinysofa/releases/1.1/rpm/current/specs/rpm.spec 2004-07-21 07:26:33 UTC (rev 3231) @@ -28,6 +28,7 @@ Patch: rpm-4.3.2-tinysofa.patch Patch1: rpm-4.3.2-noselinux.patch Patch2: rpm-4.3.2-canonarch.patch +Patch3: rpm-4.3.2-aptctrlc.patch License: GPL Conflicts: patch < 2.5 %ifos linux @@ -133,6 +134,7 @@ %patch1 -p1 %endif %patch2 -p1 +#%patch3 -p1 -b .aptctrlc cp -f %{SOURCE1} . From svn at tinysofa.org Wed Jul 21 07:41:30 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Wed, 21 Jul 2004 17:41:30 +1000 (EST) Subject: [tinysofa-svn] r3232 - in projects/ts-anaconda/trunk: . scripts Message-ID: <20040721074130.C518C4E8031@minbar.tinysofa.org> Author: jh Date: 2004-07-21 17:41:30 +1000 (Wed, 21 Jul 2004) New Revision: 3232 Removed: projects/ts-anaconda/trunk/Makefile.inc.python2.3 projects/ts-anaconda/trunk/anaconda.spec projects/ts-anaconda/trunk/customize.py.tinysofa-doc Modified: projects/ts-anaconda/trunk/Makefile.inc projects/ts-anaconda/trunk/customize.py projects/ts-anaconda/trunk/scripts/buildinstall projects/ts-anaconda/trunk/sshd_text.py Log: - enterprise -> classic - remove some files Modified: projects/ts-anaconda/trunk/Makefile.inc =================================================================== --- projects/ts-anaconda/trunk/Makefile.inc 2004-07-21 07:26:33 UTC (rev 3231) +++ projects/ts-anaconda/trunk/Makefile.inc 2004-07-21 07:41:30 UTC (rev 3232) @@ -18,7 +18,7 @@ # define product name to be imported into the loader and anywhere else # that needs the proper name of the product -PRODUCTNAME="tinysofa enterprise server" +PRODUCTNAME="tinysofa classic server" # # Define version string Deleted: projects/ts-anaconda/trunk/Makefile.inc.python2.3 =================================================================== --- projects/ts-anaconda/trunk/Makefile.inc.python2.3 2004-07-21 07:26:33 UTC (rev 3231) +++ projects/ts-anaconda/trunk/Makefile.inc.python2.3 2004-07-21 07:41:30 UTC (rev 3232) @@ -1,27 +0,0 @@ -# -# define destination locations -# - -PYTHONLIBDIR = /usr/lib/anaconda -RUNTIMEDIR = /usr/lib/anaconda-runtime -ANACONDADATADIR = /usr/share/anaconda -PYTHON = python2.2 -PYTHONINCLUDE = /usr/include/python2.2 - -ARCH := $(patsubst i%86,i386,$(shell uname -m)) -ARCH := $(patsubst sparc%,sparc,$(ARCH)) - -# -# define options -# -JAPANESE=0 - -# define product name to be imported into the loader and anywhere else -# that needs the proper name of the product -PRODUCTNAME="tinysofa enterprise server" - -# -# Define version string -# - -ANACONDAVERSION=7.2.5 Deleted: projects/ts-anaconda/trunk/anaconda.spec =================================================================== --- projects/ts-anaconda/trunk/anaconda.spec 2004-07-21 07:26:33 UTC (rev 3231) +++ projects/ts-anaconda/trunk/anaconda.spec 2004-07-21 07:41:30 UTC (rev 3232) @@ -1,494 +0,0 @@ -# The modutils tarball should be kept in track with modutils.src.rpm -ExclusiveArch: i386 i586 ia64 alpha -Name: anaconda -Version: 7.2.5 -Release: 2ts -License: GPL -Summary: The tinysofa installation program. -Group: tinysofa official -Source: anaconda-%{version}.tar.bz2 -Patch: anaconda-7.2.5-tinysofa-rpm-4.2.patch -Patch1: anaconda-7.2.5-tinysofa-naming-updroot.patch -Patch2: anaconda-7.2.5-tinysofa-comps.patch -Patch3: anaconda-7.2.5-tinysofa-packages.patch -Patch4: anaconda-7.2.5-python-2.3.patch -Obsoletes: anaconda-reconfig -BuildRequires: pump-devel, kudzu-devel, pciutils-devel, bzip2-devel -BuildRequires: e2fsprogs-devel, python-devel db4-devel, newt-devel -BuildRequires: rpm-devel, gettext >= 0.11, dietlibc, zlib-devel -BuildRequires: libcom_err-devel -BuildRequires: glibc-locales, dosfstools, cramfsprogs -Prereq: chkconfig -Requires: rpm-python parted hwdata >= 0.44 -BuildRoot: %{_tmppath}/%{name}-root - -%description -The anaconda package contains portions of the tinysofa -installation program which can then be run by the user for -reconfiguration and advanced installation options. -Based on Red Hat anaconda 7.2 and 7.3 - -%package runtime -Summary: tinysofa installer portions needed only for fresh installs. -Group: tinysofa official -Requires: hwdata >= 0.44 - -%description runtime -The anaconda-runtime package contains parts of the tinysofa -installer which are needed for installing new systems. These files are -used to build tinysofa media sets, but are not meant for use on -already installed systems. Based on Red Hat anaconda 7.2 and 7.3. - -%prep -%setup -q -%patch -p1 -b .tinysofa-rpm-4.2 -%patch1 -p1 -b .tinysofa-naming-updroot -%patch2 -p1 -b .tinysofa-comps -%patch3 -p1 -b .tinysofa-packages -%patch4 -p1 -b .python2.3 - -%build -# -# We want different customize.py in different versions of the distribution: -# - -I_VENDOR="%{?installer_vendor}" -I_NAME="%{?installer_name}" -I_VERSION="%{?release_version}" -I_COPY="%{?installer_copyright}" -I_URI="%{?installer_uri}" -I_BUGSURI="%{?installer_bugsuri}" - -if [ -z "$I_VENDOR" ]; then - I_VENDOR="tinysofa" -fi -if [ -z "$I_NAME" ]; then - I_NAME="enterprise server" -fi -if [ -z "$I_COPY" ]; then - I_COPY="(C) 2004 tinysofa development team." -fi -if [ -z "$I_URI" ]; then - I_URI="http://www.tinysofa.org" -fi -if [ -z "$I_BUGSURI" ]; then - I_BUGSURI="http://bugs.tinysofa.org/" -fi - -cat > customize.py << __EOF__ -VENDOR = "$I_VENDOR" -NAME = "$I_NAME" -VERSION = "$I_VERSION" -COPYRIGHT = "$I_COPY" -URI = "$I_URI" -BUGSURI = "$I_BUGSURI" -__EOF__ - - -# -# Anaconda does not build with LFS: -# -RPM_OPT_FLAGS="`echo $RPM_OPT_FLAGS | sed -e 's/-D_FILE_OFFSET_BITS=64//' \ - -e 's/-D_LARGEFILE64_SOURCE=1//' \ - -e 's/-D_LARGEFILE_SOURCE=1//'`" -export RPM_OPT_FLAGS - -# -# We must build modutils first: -# -pushd isys/modutils -export CFLAGS="$RPM_OPT_FLAGS -Os -D__LOADER__ -Dxstrdup=strdup -Dxmalloc=malloc -Dxrealloc=realloc -Dxstrcat=strncat %{?no_stack_protector}" -%configure --disable-compat-2-0 --disable-kerneld --enable-insmod-static\ - --exec_prefix=/ --disable-combined --enable-combined-rmmod -make -C obj %{?_smp_mflags} dep all -make -C util %{?_smp_mflags} dep all -make -C insmod %{?_smp_mflags} dep all -mkdir libs -cp util/libutil.a libs/libmodutilutil.a -cp obj/libobj.a libs/libmodutilobj.a -cp insmod/libmodutils.a libs -popd - -# Now build the rest normally... -make depend -make RPM_OPT_FLAGS="$RPM_OPT_FLAGS" - - -%install -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT -make DESTDIR=$RPM_BUILD_ROOT install - -strip $RPM_BUILD_ROOT/usr/lib/anaconda/*.so - -# We can't generate this list, so we take it from red hat -install -m 644 tinysofa/locale-list \ - $RPM_BUILD_ROOT/usr/share/anaconda/locale-list - -rm -rf $RPM_BUILD_ROOT/usr/share/anaconda/pixmaps -rm -f $RPM_BUILD_ROOT/usr/lib/anaconda-runtime/module-info - -%clean -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT - -%post -chkconfig --add reconfig - -%preun -if [ $1 = 0 ]; then - chkconfig --del reconfig -fi - -%files -%defattr(-,root,root) -%doc COPYING -%doc docs/command-line.txt -/usr/sbin/anaconda -/usr/share/anaconda -/usr/share/locale/*/*/* -/usr/lib/anaconda -/etc/init.d/reconfig -%ifarch i586 -/usr/sbin/ddcprobe -%endif - -%files runtime -%defattr(-,root,root) -%doc docs/README.tinysofa -/usr/lib/anaconda-runtime - - -%changelog -* Tue Mar 30 2004 Omar Kilani 7.2.5-2ts -- Python 2.3. - -* Wed Mar 24 2004 Omar Kilani 1ts -- Initial tinysofa release. -- Incremented minor release number to signify tinysofa-ication. - -* Wed Mar 17 2004 Chr. Toldnes 2tr -- customizable customize.py - -* Mon Feb 16 2004 Chr. Toldnes 1tr -- Retagged to 1tr, now tag is only related to changes in the spec file. - -* Mon Feb 16 2004 Chr. Toldnes 7.2-89tr -- Suited for cvs build - -* Fri Jan 30 2004 Chr. Toldnes 7.2-88tr -- More group-hack modifications - -* Fri Jan 30 2004 Chr. Toldnes 7.2-87tr -- Not split into groups during individual package selection - -* Mon Jan 11 2004 Chr. Toldnes 7.2-86tr -- hardcoded i586 - -* Fri Jan 9 2004 Erlend Midttun 7.2-85tr -- Removed more large files flags. - -* Wed Jan 7 2004 Erlend Midttun 7.2-84tr -- Big rebuild -- BuildPreReq -> BuildRequires - -* Wed Jan 7 2004 Gerald Dachs 7.2-83gd -- no gateway dialog if only dhcp devices (patch 77) -- allow hostname even with dhcp (patch 76) - -* Tue Jan 6 2004 Gerald Dachs 7.2-82gd -- build requires glibc-locales -- added dmfe nic driver to initrd (patch 75) -- requires dosfstools -- requires cramfsprogs - -* Mon Dec 17 2003 Chr. Toldnes 7.2-81tr -- Namechange: sym53c8x -> xsym53c8xx_2 (patch 74) - -* Tue Dec 16 2003 Erlend Midttun 7.2-82tr -- Added -D_FILE_OFFSET_BITS=64 to anaconda-7.2-dietlibc.patch and - anaconda-7.2-python2.2.patch. - -* Tue Nov 25 2003 Erlend Midttun 7.2-81tr -- Big rebuild - -* Fri Nov 14 2003 Chr. Toldnes 7.2-80tr -- Slightly modified copyright notice - -* Thu Nov 7 2003 Chr. Toldnes 7.2-79tr -- Update modules in bootnet.img according to new pcitable (patch61) - -* Fri Oct 24 2003 Chr. Toldnes 7.2-78tr -- Backported - -* Sun Sep 28 2003 Chr. Toldnes 7.2-77tsl -- Ported to tawie - -* Wed Jul 16 2003 Gerald Dachs 7.2-76tr -- there was no attribute gatewayDevice defined, but used (patch58) -- bootloader argument lba32 in kickstart.py wrong defined (patch59) - -* Wed Jul 9 2003 Roland Kruse 7.2-75tr -- Another typo (patch57) - -* Wed Jul 9 2003 Roland Kruse 7.2-74tr -- Fixed stoopid typo (patch57) - -* Wed Jul 9 2003 Roland Kruse 7.2-73tr -- Customuze distro & vendor names - take II. (patch57) - -* Fri Jul 4 2003 Roland Kruse 7.2-72tr -- Customuze distro & vendor names. (patch57) - -* Fri Jul 4 2003 Chr. Toldnes 7.2-71tr -- Added patch to add lilo if chosen -- fixed firewall-smp lilo issue - -* Thu Jul 3 2003 Roland Kruse 7.2-70tr -- Fix slovenian keymap (Patch54). -- Fix lilo error handling code (Patch55) - -* Wed Jul 2 2003 Roland Kruse 7.2-69tr -- Write GATEWAYDEV entry to /etc/sysconfig/network, needed if multiple NICs. - (Patch52) -- Write NOZEROCONF entry to /etc/sysconfig/network (patch53) - -* Tue Jun 24 2003 Tore Olsen 7.2-68tr -- Fixed bug in kernel-symlinks patch causing exception during install. - -* Tue Jun 24 2003 Tore Olsen 7.2-67tr -- Make custom kickstart files work. - -* Fri Jun 20 2003 Roland Kruse 7.2-66tr -- Check if kernel symlinks exist before creating them - -* Fri Jun 20 2003 Roland Kruse 7.2-65tr -- Bug 762: kernel version removed in grub.conf title fields. (Patch49) - -* Wed Jun 18 2003 Erlend Midttun 7.2-64tr -- Big rebuild - -* Thu Jun 12 2003 Roland Kruse 7.2-63rk -- Raidlevel in mdadm.conf (Patch47) -- Check lilo status; don't fail silently (Patch48) - -* Wed Jun 11 2003 Tore Olsen 7.2-62to -- Fixed boot messages and options. - -* Wed Jun 11 2003 Tore Olsen 7.2-61to -- Parameterized distroname. - -* Tue Jun 3 2003 Roland Kruse 7.2-60rk -- Raid scan crash experimental fix (Patch45) - -* Tue Jun 3 2003 Roland Kruse 7.2-59rk -- New initscripts - raid adjustment (Patch41 modified, Patch44 not applied) - -* Tue May 27 2003 Roland Kruse 7.2-58rk -- Create /etc/sysconfig/md file for mdadm initscript. - -* Mon May 26 2003 Tore Olsen 7.2-57to -- make sure libblkid is included with the stage 2 image. -- needs zlib-devel to build. - -* Thu May 22 2003 Roland Kruse 7.2-56rk -- Fix bug 624: raidtools -> mdadm - fixed stupid typo in mdadm.conf (patch41) - -* Thu May 22 2003 Roland Kruse 7.2-55rk -- Fix bug 624: raidtools -> mdadm - take 4 (patch41) - -* Mon May 19 2003 Roland Kruse 7.2-54rk -- Fix bug 624: raidtools -> mdadm - take 3 (patch41) - -* Fri May 16 2003 Roland Kruse 7.2-53rk -- Fix bug 624: raidtools -> mdadm - take 2 (patch41) - -* Thu May 9 2003 Roland Kruse 7.2-52rk -- Bug 638: Copyright 2003 (patch42) - -* Thu May 9 2003 Roland Kruse 7.2-51rk -- Fix bug 624: raidtools -> mdadm (patch41). - -* Sun May 4 2003 Roland Kruse 7.2-50rk -- Final: Beta2 version, Bug 618 fixed - (Patch40, intermediate patches accumulated) - -* Sun May 4 2003 Roland Kruse 7.2-49rk -- Final Beta2 version - take 4. - -* Fri May 2 2003 Roland Kruse 7.2-48rk -- Bugfixes for Beta 2: Take 3 - -* Fri May 2 2003 Roland Kruse 7.2-47rk -- Bugfixes for Beta 2: Take 2 - -* Thu May 1 2003 Roland Kruse 7.2-46rk -- Bugfixes for Beta 2 (Patch40): 297, 323, 385, 607, 604 - -* Wed Apr 16 2003 Roland Kruse 7.2-45rk -- Bug 295: Use symlinks for kernel and initrd images in bootloader (Patch39) - -* Thu Apr 10 2003 Roland Kruse 7.2-44rk -- Patch 38, fixing the following bugs: - 299: Network config - wrong (real stoopid) gateway guess fixed. - 318: /etc/sysconfig/bootloader issues. - 294: Write network config files earlier. - -* Thu Apr 10 2003 Roland Kruse 7.2.43rk -- Empty. - -* Thu Apr 10 2003 Erlend Midttun 7.2-42em -- Moved the config files to hwdata, take II. (Patch 14) - -* Tue Apr 8 2003 Erlend Midttun 7.2-41em -- Moved the config files to hwdata. (Patch 14) -- Changed bugzilla -> www.trustix.net (Patch 37) - -* Wed Apr 2 2003 Roland Kruse 7.2-40rk -- Python 2.2.2 requires libdstdc++ (Patch34) NOT APPLIED. -- updated modutils used in loader (Source4, Patch999) -- re-introduced lang-table for tz setting only. (Patch36) - -* Tue Apr 1 2003 Roland Kruse 7.2-39rk -- Replaced C code with code from anaconda 7.3 to use dietlibc, - resulting package should build with both glibc 2.2.5 and 2.3.2. - All Trustix patches re-applied, this is a huge patch. Also did - some final language cleanups etc. (Patch33). - -* Thu Mar 20 2003 Erlend Midttun 7.2-38em -- Added support for mptscsih. (rolandk: where is the patch?) - -* Wed Mar 05 2003 Roland Kruse 7.2-37rk -- Fixed cosmetic bugs # 204, 205, 210 (Patch30) -- Fixed bug # 32 (Patch31). Only "restircted" password supported. - -* Thu Feb 20 2003 Roland Kruse 7.2-36rk -- Fixed bug 25: dhcp selection (Patch29) - (note: had to renumber patches 22-29 to get correct order). - -* Wed Feb 19 2003 Roland Kruse 7.2-35rk -- Fixed bug 31: Language & RedHatism cleanup (Patch28) - -* Tue Feb 18 2003 Roland Kruse 7.2-34rk -- Fixed bug 174: jfs module missing in installer moduleball (Patch26). -- Fixed bug 171: Hostname text. (Patch27) - -* Fri Feb 14 2003 Roland Kruse 7.2-33rk -- Fixed bug 55: Firewall kernel selection. (Patch25) - -* Mon Feb 03 2003 Roland Kruse 7.2-32rk -- Fixed bug 164: buildinstall tries to do things with *.rpm.asc files (Patch24) -- Fixed bug 70: package texts (Patch23) -- Fixed bug 34: /etc/hosts invalid (Patch22) -- Fixed bug 33: lilo lba32/linear issue (Patch21) - -* Wed Jan 22 2003 Tor Hveem 7.2-31th -- Fixed $INITLOCK. (Patch20) - -* Wed Nov 13 2002 Roland Kruse 7.2-30rk -- Fixed loader for network install. (Patch18) -- Write /etc/sysconfig/bootloader. (Patch19) - -* Tue Nov 5 2002 Roland Kruse 7.2-29rk -- Install Grub package if Grub selected as bootloader. - -* Mon Sep 16 2002 Erlend Midttun 7.2-28em -- Changed cat to msgcat to make it build with the new msgfmt. - -* Fri Sep 6 2002 Roland Kruse 7.2-27rk -- Files in /usr/share/kudzu moved to /usr/share/hwdata (Patch14) -- Updated loader/module-info (Patch15) - -* Tue Sep 3 2002 Roland Kruse 7.2-26rk -- Updated isys/pci/pcitable - -* Fri Aug 30 2002 Roland Kruse 7.2-25rk -- Requires: db3-devel -> db4-revel -- Fixed group - -* Wed Aug 21 2002 Roland Kruse 7.2-24rk -- Multiple NIC configuration (Patch12) - -* Thu Aug 1 2002 Roland Kruse 7.2-23rk -- Showstopper bugfixes (Patch11): -- Autopartition crash -- Removed labels in /etc/fstab -- /etc/redhat-release -> /etc/trustix-release (upgrade mode) -- Lanugage in expert mode - -* Tue Jul 23 2002 Roland Kruse 7.2-22rk -- done away with language selection screens -- don't write /etc/sysconfig/i18n - causing default lang to be 'C'. -- (Patch10) - -* Tue Jul 23 2002 Nico Erfurth 7.2-21ne -- mkfs.cramfs patch (Patch9) - -* Fri Jul 19 2002 Roland Kruse 7.2-20rk -- useradd patch from Gerald (Patch8). - -* Thu Jul 18 2002 Roland Kruse 7.2-19rk -- intiscript fixes (Patch7). - -* Fri Jul 12 2002 Roland Kruse 7.2-18rk -- Included Gerald's ext3 patch (Patch6). - -* Thu Jul 11 2002 Roland Kruse 7.2-17rk -- Changed reiserfs-utils to reiserfsprogs (Patch5). - -* Sat Jul 6 2002 Gerald Dachs 7.2-16gd -- CD-Rom gets not filtered anymore, because this hangs Disk Druid (patch4) - -* Tue Jun 26 2002 Gerald Dachs 7.2-15gd -- liloconf.patch from Roland (patch3) - -* Tue Jun 25 2002 Gerald Dachs 7.2-14gd -- boot.msg shows now build date and trustix version (patch0) -- removed patch3, patch4; problem was in the rpms - -* Tue Jun 18 2002 Gerald Dachs 7.2-13gd -- We don't need a preorder of the packages (patch3) -- any kind of sort breaks rpmdepOrder in depend.c (patch4) - -* Sat Jun 15 2002 Gerald Dachs 7.2-12gd -- python 2.2 support from Christian and me -- changed upd-instroot; python 2.2 needs /lib/libutils.so.1 -- ported to trustix - -#* %{date} Anaconda team -#- built new version from CVS - -* Wed Jul 18 2001 Jeremy Katz -- own /usr/lib/anaconda and /usr/share/anaconda - -* Fri Jan 12 2001 Matt Wilson -- sync text with specspo - -* Thu Aug 10 2000 Matt Wilson -- build on alpha again now that I've fixed the stubs - -* Wed Aug 9 2000 Michael Fulbright -- new build - -* Fri Aug 4 2000 Florian La Roche -- allow also subvendorid and subdeviceid in trimpcitable - -* Fri Jul 14 2000 Matt Wilson -- moved init script for reconfig mode to /etc/init.d/reconfig -- move the initscript back to /etc/rc.d/init.d -- Prereq: /etc/init.d - -* Thu Feb 03 2000 Michael Fulbright -- strip files -- add lang-table to file list - -* Wed Jan 05 2000 Michael Fulbright -- added requirement for rpm-python - -* Mon Dec 06 1999 Michael Fulbright -- rename to 'anaconda' instead of 'anaconda-reconfig' - -* Fri Dec 03 1999 Michael Fulbright -- remove ddcprobe since we don't do X configuration in reconfig now - -* Tue Nov 30 1999 Michael Fulbright -- first try at packaging reconfiguration tool - Modified: projects/ts-anaconda/trunk/customize.py =================================================================== --- projects/ts-anaconda/trunk/customize.py 2004-07-21 07:26:33 UTC (rev 3231) +++ projects/ts-anaconda/trunk/customize.py 2004-07-21 07:41:30 UTC (rev 3232) @@ -1,8 +1,8 @@ # These are normally constants, but may be cusomized. # use "import customize" for this, not "from customize import *" VENDOR = "tinysofa" -NAME = "enterprise server" -VERSION = "1.0" +NAME = "classic server" +VERSION = "1.1" COPYRIGHT = "(C) 2004 tinysofa development team." URI = "http://www.tinysofa.org" BUGSURI = "http://www.tinysofa.org/bugs/" Deleted: projects/ts-anaconda/trunk/customize.py.tinysofa-doc =================================================================== --- projects/ts-anaconda/trunk/customize.py.tinysofa-doc 2004-07-21 07:26:33 UTC (rev 3231) +++ projects/ts-anaconda/trunk/customize.py.tinysofa-doc 2004-07-21 07:41:30 UTC (rev 3232) @@ -1,8 +0,0 @@ -# These are normally constants, but may be cusomized. -# use "import customize" for this, not "from customize import *" -VENDOR = "tinysofa" -NAME = "enterprise server" -VERSION = "1.0" -COPYRIGHT = "(C) 2004 tinysofa development team." -URI = "http://www.tinysofa.org" -BUGSURI = "http://bugs.tinysofa.org/" Modified: projects/ts-anaconda/trunk/scripts/buildinstall =================================================================== --- projects/ts-anaconda/trunk/scripts/buildinstall 2004-07-21 07:26:33 UTC (rev 3231) +++ projects/ts-anaconda/trunk/scripts/buildinstall 2004-07-21 07:41:30 UTC (rev 3232) @@ -9,7 +9,7 @@ } COMPNAME=dist-7.0 -DISTRONAME="tinysofa enterprise server" +DISTRONAME="tinysofa classic server" while [ $# -gt 0 ]; do case $1 in Modified: projects/ts-anaconda/trunk/sshd_text.py =================================================================== --- projects/ts-anaconda/trunk/sshd_text.py 2004-07-21 07:26:33 UTC (rev 3231) +++ projects/ts-anaconda/trunk/sshd_text.py 2004-07-21 07:41:30 UTC (rev 3232) @@ -25,7 +25,7 @@ return INSTALL_OK buttons = [ _("Yes"), _("No") ] - text = _("tinysofa enterprise server ships with sshd off by default.\n\n" + text = _("tinysofa classic server ships with sshd off by default.\n\n" "Would you like to enable the sshd service?") rc = ButtonChoiceWindow(screen, _("sshd configuration"), text, From svn at tinysofa.org Wed Jul 21 07:55:53 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Wed, 21 Jul 2004 17:55:53 +1000 (EST) Subject: [tinysofa-svn] r3233 - tinysofa/releases/1.1/anaconda/current/specs Message-ID: <20040721075553.EA4964E8031@minbar.tinysofa.org> Author: jh Date: 2004-07-21 17:55:53 +1000 (Wed, 21 Jul 2004) New Revision: 3233 Modified: tinysofa/releases/1.1/anaconda/current/specs/anaconda.spec Log: - tinysofa enterprise server -> tinysofa classic server Modified: tinysofa/releases/1.1/anaconda/current/specs/anaconda.spec =================================================================== --- tinysofa/releases/1.1/anaconda/current/specs/anaconda.spec 2004-07-21 07:41:30 UTC (rev 3232) +++ tinysofa/releases/1.1/anaconda/current/specs/anaconda.spec 2004-07-21 07:55:53 UTC (rev 3233) @@ -58,7 +58,7 @@ I_VENDOR="tinysofa" fi if [ -z "$I_NAME" ]; then - I_NAME="enterprise server" + I_NAME="classic server" fi if [ -z "$I_COPY" ]; then I_COPY="(C) 2004 tinysofa development team." @@ -96,9 +96,9 @@ %configure --disable-compat-2-0 --disable-kerneld --enable-insmod-static\ --exec_prefix=/ --disable-combined --enable-combined-rmmod -make -C obj %{?_smp_mflags} dep all -make -C util %{?_smp_mflags} dep all -make -C insmod %{?_smp_mflags} dep all +%make -C obj dep all +%make -C util dep all +%make -C insmod dep all mkdir libs cp util/libutil.a libs/libmodutilutil.a cp obj/libobj.a libs/libmodutilobj.a @@ -112,7 +112,7 @@ # Now build the rest normally... make depend -make RPM_OPT_FLAGS="$RPM_OPT_FLAGS" +%make RPM_OPT_FLAGS="$RPM_OPT_FLAGS" %install From svn at tinysofa.org Wed Jul 21 08:13:38 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Wed, 21 Jul 2004 18:13:38 +1000 (EST) Subject: [tinysofa-svn] r3234 - tinysofa/releases/1.1/anaconda/current/sources Message-ID: <20040721081338.A23864E8031@minbar.tinysofa.org> Author: jh Date: 2004-07-21 18:13:38 +1000 (Wed, 21 Jul 2004) New Revision: 3234 Modified: tinysofa/releases/1.1/anaconda/current/sources/ts-anaconda-1.1.0.tar.bz2 Log: - tinysofa enterprise server -> tinysofa classic server Modified: tinysofa/releases/1.1/anaconda/current/sources/ts-anaconda-1.1.0.tar.bz2 =================================================================== (Binary files differ) From svn at tinysofa.org Wed Jul 21 08:28:55 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Wed, 21 Jul 2004 18:28:55 +1000 (EST) Subject: [tinysofa-svn] r3235 - tinysofa/releases/1.1/rpm/current/sources Message-ID: <20040721082855.1E5294E8031@minbar.tinysofa.org> Author: jh Date: 2004-07-21 18:28:54 +1000 (Wed, 21 Jul 2004) New Revision: 3235 Modified: tinysofa/releases/1.1/rpm/current/sources/GROUPS Log: - add i18n to GROUPS Modified: tinysofa/releases/1.1/rpm/current/sources/GROUPS =================================================================== --- tinysofa/releases/1.1/rpm/current/sources/GROUPS 2004-07-21 08:13:38 UTC (rev 3234) +++ tinysofa/releases/1.1/rpm/current/sources/GROUPS 2004-07-21 08:28:54 UTC (rev 3235) @@ -1,5 +1,6 @@ main development documentation +i18n extra contrib From svn at tinysofa.org Wed Jul 21 14:04:10 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Thu, 22 Jul 2004 00:04:10 +1000 (EST) Subject: [tinysofa-svn] r3236 - in tinysofa/releases/1.1/openldap/current: sources specs Message-ID: <20040721140410.E97624E8031@minbar.tinysofa.org> Author: jh Date: 2004-07-22 00:04:09 +1000 (Thu, 22 Jul 2004) New Revision: 3236 Added: tinysofa/releases/1.1/openldap/current/sources/openldap.sysconfig Modified: tinysofa/releases/1.1/openldap/current/sources/openldap.init tinysofa/releases/1.1/openldap/current/specs/openldap.spec Log: - added /etc/sysconfig/ldap configuration file Modified: tinysofa/releases/1.1/openldap/current/sources/openldap.init =================================================================== --- tinysofa/releases/1.1/openldap/current/sources/openldap.init 2004-07-21 08:28:54 UTC (rev 3235) +++ tinysofa/releases/1.1/openldap/current/sources/openldap.init 2004-07-21 14:04:09 UTC (rev 3236) @@ -15,6 +15,9 @@ # Source networking configuration. . /etc/sysconfig/network +# Source ldap configuration. +. /etc/sysconfig/ldap + # Check that networking is up. [ ${NETWORKING} = "no" ] && exit 0 @@ -25,13 +28,13 @@ start) echo -n "Starting OpenLDAP: " if grep -q '^TLS' $SLAPD_CONFIG_FILE ; then - daemon slapd -h '"ldaps:/// ldap:///"' -u slapd -g slapd + daemon slapd -h "$LDAP_TLS_H" -u slapd -g slapd $OPTIONS $SLAPD_OPTIONS else - daemon slapd -u slapd -g slapd + daemon slapd -h "$LDAP_H" -u slapd -g slapd $OPTIONS $SLAPD_OPTIONS fi if grep -q '^replogfile' $SLAPD_CONFIG_FILE; then - daemon slurpd + daemon slurpd $OPTIONS $SLURPD_OPTIONS fi echo touch ${INITLOCK:-/var/lock/subsys}/ldap Added: tinysofa/releases/1.1/openldap/current/sources/openldap.sysconfig =================================================================== --- tinysofa/releases/1.1/openldap/current/sources/openldap.sysconfig 2004-07-21 08:28:54 UTC (rev 3235) +++ tinysofa/releases/1.1/openldap/current/sources/openldap.sysconfig 2004-07-21 14:04:09 UTC (rev 3236) @@ -0,0 +1,14 @@ + +# Interfaces to listen (slapd -h option) +LDDAP_H="ldap:///" +LDAP_TSL_H="ldaps:/// ldap:///" + +# Options for slapd and slurpd +OPTIONS="" + +# Extra options for slapd +SLAPD_OPTIONS="" + +# Extra options for slurpd +SLURPD_OPTIONS="" + Modified: tinysofa/releases/1.1/openldap/current/specs/openldap.spec =================================================================== --- tinysofa/releases/1.1/openldap/current/specs/openldap.spec 2004-07-21 08:28:54 UTC (rev 3235) +++ tinysofa/releases/1.1/openldap/current/specs/openldap.spec 2004-07-21 14:04:09 UTC (rev 3236) @@ -15,6 +15,7 @@ Source4: openldap-migration-tools.txt Source5: openldap-rfc822-MailMember.schema Source6: openldap-autofs.schema +Source7: openldap.syconfig Patch0: openldap-2.1.17-config.patch # Patches by Red Hat which seemed useful Patch1: openldap-2.1.17-string.patch @@ -181,7 +182,12 @@ install -m644 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/openldap/schema/tinysofa/rfc822-MailMember.schema install -m644 %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/openldap/schema/tinysofa/autofs.schema +%{__mkdir_p} \ + %{buildroot}%{_sysconfdir}/sysconfig +install -m 644 %{SOURCE7} %{buildroot}%{_sysconfdir}/sysconfig/ldap + + %if %{_useldbm} # Change the database to ldbm. perl -pi -e "s|bdb|ldbm|g" $RPM_BUILD_ROOT/%{_sysconfdir}/%{_ldapsubdir}/slapd.conf From svn at tinysofa.org Wed Jul 21 14:35:21 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Thu, 22 Jul 2004 00:35:21 +1000 (EST) Subject: [tinysofa-svn] r3237 - in tinysofa/releases/1.1: . openswan/current/sources openswan/current/specs Message-ID: <20040721143521.923594E8031@minbar.tinysofa.org> Author: jh Date: 2004-07-22 00:35:21 +1000 (Thu, 22 Jul 2004) New Revision: 3237 Added: tinysofa/releases/1.1/openswan/ tinysofa/releases/1.1/openswan/current/sources/openswan-2.1.4-init.patch tinysofa/releases/1.1/openswan/current/sources/openswan-2.1.4.tar.gz Removed: tinysofa/releases/1.1/openswan/current/sources/freeswan-2.00-init.patch tinysofa/releases/1.1/openswan/current/sources/freeswan-2.00-initdir.patch tinysofa/releases/1.1/openswan/current/sources/strongswan-2.1.3.tar.gz Modified: tinysofa/releases/1.1/openswan/current/specs/strongswan.spec Log: - change strongswan to openswan Copied: tinysofa/releases/1.1/openswan (from rev 3186, tinysofa/releases/1.1/strongswan) Deleted: tinysofa/releases/1.1/openswan/current/sources/freeswan-2.00-init.patch =================================================================== --- tinysofa/releases/1.1/strongswan/current/sources/freeswan-2.00-init.patch 2004-07-20 07:12:30 UTC (rev 3186) +++ tinysofa/releases/1.1/openswan/current/sources/freeswan-2.00-init.patch 2004-07-21 14:35:21 UTC (rev 3237) @@ -1,11 +0,0 @@ -diff -Nru freeswan-2.00.orig/programs/setup/Makefile freeswan-2.00/programs/setup/Makefile ---- freeswan-2.00.orig/programs/setup/Makefile 2002-08-10 21:47:06.000000000 +0200 -+++ freeswan-2.00/programs/setup/Makefile 2003-05-14 15:51:02.000000000 +0200 -@@ -32,7 +32,6 @@ - install:: setup - @rm -f $(BINDIR)/setup - @$(INSTALL) $(INSTBINFLAGS) setup $(RCDIR)/ipsec -- @ln -s $(FINALRCDIR)/ipsec $(BINDIR)/setup - - at for i in 0 1 2 3 4 5 6; do mkdir -p $(RCDIR)/../rc$$i.d; done - - at cd $(RCDIR)/../rc0.d && ln -f -s ../init.d/ipsec K68ipsec - - at cd $(RCDIR)/../rc1.d && ln -f -s ../init.d/ipsec K68ipsec Deleted: tinysofa/releases/1.1/openswan/current/sources/freeswan-2.00-initdir.patch =================================================================== --- tinysofa/releases/1.1/strongswan/current/sources/freeswan-2.00-initdir.patch 2004-07-20 07:12:30 UTC (rev 3186) +++ tinysofa/releases/1.1/openswan/current/sources/freeswan-2.00-initdir.patch 2004-07-21 14:35:21 UTC (rev 3237) @@ -1,33 +0,0 @@ -diff -Nur freeswan-2.00/programs/setup/Makefile freeswan-2.00.changed/programs/setup/Makefile ---- freeswan-2.00/programs/setup/Makefile 2003-10-30 08:48:11.000000000 +0100 -+++ freeswan-2.00.changed/programs/setup/Makefile 2003-10-30 08:56:17.000000000 +0100 -@@ -30,27 +30,12 @@ - # - # the priorities match those in setup's chkconfig line - install:: setup -- @rm -f $(BINDIR)/setup -- @$(INSTALL) $(INSTBINFLAGS) setup $(RCDIR)/ipsec -- - at for i in 0 1 2 3 4 5 6; do mkdir -p $(RCDIR)/../rc$$i.d; done -- - at cd $(RCDIR)/../rc0.d && ln -f -s ../init.d/ipsec K68ipsec -- - at cd $(RCDIR)/../rc1.d && ln -f -s ../init.d/ipsec K68ipsec -- - at cd $(RCDIR)/../rc2.d && ln -f -s ../init.d/ipsec S47ipsec -- - at cd $(RCDIR)/../rc3.d && ln -f -s ../init.d/ipsec S47ipsec -- - at cd $(RCDIR)/../rc4.d && ln -f -s ../init.d/ipsec S47ipsec -- - at cd $(RCDIR)/../rc5.d && ln -f -s ../init.d/ipsec S47ipsec -- - at cd $(RCDIR)/../rc6.d && ln -f -s ../init.d/ipsec K68ipsec -+ @rm -f $(DESTDIR)/$(BINDIR)/setup -+ @$(INSTALL) $(INSTBINFLAGS) setup $(DESTDIR)/$(RCDIR)/ipsec - - install_file_list:: - @echo $(RCDIR)/ipsec - @echo $(BINDIR)/setup -- @echo $(RCDIR)/../rc0.d/K68ipsec -- @echo $(RCDIR)/../rc1.d/K68ipsec -- @echo $(RCDIR)/../rc2.d/S47ipsec -- @echo $(RCDIR)/../rc3.d/S47ipsec -- @echo $(RCDIR)/../rc4.d/S47ipsec -- @echo $(RCDIR)/../rc5.d/S47ipsec -- @echo $(RCDIR)/../rc6.d/K68ipsec - - clean:: - @rm -f setup Added: tinysofa/releases/1.1/openswan/current/sources/openswan-2.1.4-init.patch =================================================================== --- tinysofa/releases/1.1/strongswan/current/sources/openswan-2.1.4-init.patch 2004-07-20 07:12:30 UTC (rev 3186) +++ tinysofa/releases/1.1/openswan/current/sources/openswan-2.1.4-init.patch 2004-07-21 14:35:21 UTC (rev 3237) @@ -0,0 +1,31 @@ +--- openswan-2.1.4/programs/setup/Makefile.init 2003-12-02 04:35:46.000000000 +0200 ++++ openswan-2.1.4/programs/setup/Makefile 2004-07-20 20:31:45.000000000 +0300 +@@ -31,27 +31,11 @@ + # the priorities match those in setup's chkconfig line + install:: setup + @rm -f $(BINDIR)/setup +- @$(INSTALL) $(INSTBINFLAGS) setup $(RCDIR)/ipsec +- @ln -s $(FINALRCDIR)/ipsec $(BINDIR)/setup +- - at for i in 0 1 2 3 4 5 6; do mkdir -p $(RCDIR)/../rc$$i.d; done +- - at cd $(RCDIR)/../rc0.d && ln -f -s ../init.d/ipsec K76ipsec +- - at cd $(RCDIR)/../rc1.d && ln -f -s ../init.d/ipsec K76ipsec +- - at cd $(RCDIR)/../rc2.d && ln -f -s ../init.d/ipsec S47ipsec +- - at cd $(RCDIR)/../rc3.d && ln -f -s ../init.d/ipsec S47ipsec +- - at cd $(RCDIR)/../rc4.d && ln -f -s ../init.d/ipsec S47ipsec +- - at cd $(RCDIR)/../rc5.d && ln -f -s ../init.d/ipsec S47ipsec +- - at cd $(RCDIR)/../rc6.d && ln -f -s ../init.d/ipsec K76ipsec ++ @$(INSTALL) $(INSTBINFLAGS) setup $(DESTDIR)$(RCDIR)/ipsec + + install_file_list:: + @echo $(RCDIR)/ipsec + @echo $(BINDIR)/setup +- @echo $(RCDIR)/../rc0.d/K76ipsec +- @echo $(RCDIR)/../rc1.d/K76ipsec +- @echo $(RCDIR)/../rc2.d/S47ipsec +- @echo $(RCDIR)/../rc3.d/S47ipsec +- @echo $(RCDIR)/../rc4.d/S47ipsec +- @echo $(RCDIR)/../rc5.d/S47ipsec +- @echo $(RCDIR)/../rc6.d/K76ipsec + + clean:: + @rm -f setup Added: tinysofa/releases/1.1/openswan/current/sources/openswan-2.1.4.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/releases/1.1/openswan/current/sources/openswan-2.1.4.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: tinysofa/releases/1.1/openswan/current/sources/strongswan-2.1.3.tar.gz =================================================================== (Binary files differ) Modified: tinysofa/releases/1.1/openswan/current/specs/strongswan.spec =================================================================== --- tinysofa/releases/1.1/strongswan/current/specs/strongswan.spec 2004-07-20 07:12:30 UTC (rev 3186) +++ tinysofa/releases/1.1/openswan/current/specs/strongswan.spec 2004-07-21 14:35:21 UTC (rev 3237) @@ -1,17 +1,14 @@ Summary: A free ipsec VPN solution for Linux -Name: strongswan -Version: 2.1.3 +Name: openswan +Version: 2.1.4 Release: 2jh License: GPL Group: main -URL: http://www.strongswan.org -# The version of the X509 patch -%define x509version 1.5.4 -Source0: strongswan-%{version}.tar.gz +URL: http://www.openswan.org/ +Source0: %{name}-%{version}.tar.gz Source1: freeswan-1.9.secrets.proto -Patch0: freeswan-2.00-init.patch +Patch0: openswan-2.1.4-init.patch Patch1: freeswan-2.00-confused.patch -Patch2: freeswan-2.00-initdir.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root Provides: vpn ipsec %service_requires @@ -22,7 +19,7 @@ %description -StrongSwan is a free implementation of IPSEC & IKE for Linux. IPSEC is +Opeswan is a free implementation of IPSEC & IKE for Linux. IPSEC is the Internet Protocol Security and uses strong cryptography to provide both authentication and encryption services. These services allow you to build secure tunnels through untrusted networks. Everything passing @@ -34,9 +31,8 @@ %prep %setup -q -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 +%patch0 -p1 -b .init +%patch1 -p1 -b .confused %build CFLAGS="${RPM_OPT_FLAGS}" \ From svn at tinysofa.org Wed Jul 21 14:37:20 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Thu, 22 Jul 2004 00:37:20 +1000 (EST) Subject: [tinysofa-svn] r3238 - tinysofa/releases/1.1/openswan/current/specs Message-ID: <20040721143720.943E04E8031@minbar.tinysofa.org> Author: jh Date: 2004-07-22 00:37:20 +1000 (Thu, 22 Jul 2004) New Revision: 3238 Added: tinysofa/releases/1.1/openswan/current/specs/openswan.spec Removed: tinysofa/releases/1.1/openswan/current/specs/strongswan.spec Log: - rename spec to openswan.spec Copied: tinysofa/releases/1.1/openswan/current/specs/openswan.spec (from rev 3237, tinysofa/releases/1.1/openswan/current/specs/strongswan.spec) =================================================================== --- tinysofa/releases/1.1/openswan/current/specs/strongswan.spec 2004-07-21 14:35:21 UTC (rev 3237) +++ tinysofa/releases/1.1/openswan/current/specs/openswan.spec 2004-07-21 14:37:20 UTC (rev 3238) @@ -0,0 +1,199 @@ +Summary: A free ipsec VPN solution for Linux +Name: openswan +Version: 2.1.4 +Release: 1jh +License: GPL +Group: main +URL: http://www.openswan.org/ +Source0: %{name}-%{version}.tar.gz +Source1: freeswan-1.9.secrets.proto +Patch0: openswan-2.1.4-init.patch +Patch1: freeswan-2.00-confused.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-root +Provides: vpn ipsec +%service_requires +Requires: gmp ipsec-tools +PreReq: coreutils +BuildRequires: gmp-devel +Obsoletes: freeswan + + +%description +Opeswan is a free implementation of IPSEC & IKE for Linux. IPSEC is +the Internet Protocol Security and uses strong cryptography to provide +both authentication and encryption services. These services allow you +to build secure tunnels through untrusted networks. Everything passing +through the untrusted net is encrypted by the ipsec gateway machine and +decrypted by the gateway at the other end of the tunnel. The resulting +tunnel is a virtual private network or VPN. + + +%prep +%setup -q + +%patch0 -p1 -b .init +%patch1 -p1 -b .confused + +%build +CFLAGS="${RPM_OPT_FLAGS}" \ +%make \ + DESTDIR=/ \ + PUBDIR=/usr/sbin \ + BINDIR=/usr/lib/ipsec \ + INC_MANDIR=share/man \ + INC_USRLOCAL=/usr \ + FINALEXAMPLECONFDIR=/usr/share/doc/freeswan-%{version} \ + FINALLIBEXECDIR=/usr/lib/ipsec \ + RCDIR=%{_initrddir} \ + programs + + +%install +%{__mkdir_p} $RPM_BUILD_ROOT%{_initrddir} + +%makeinstall_std \ + PUBDIR=/usr/sbin \ + BINDIR=/usr/lib/ipsec \ + INC_MANDIR=share/man \ + INC_USRLOCAL=/usr \ + FINALEXAMPLECONFDIR=/usr/share/doc/%{name}-%{version} \ + FINALLIBEXECDIR=/usr/lib/ipsec \ + RCDIR=%{_initrddir} + +# We don't want all users to have the same secrets file :) +rm -f ${RPM_BUILD_ROOT}/ipsec.secrets +cp -f %{SOURCE1} ${RPM_BUILD_ROOT}/etc/ipsec.secrets + +# We actually do want chkconfig to work properly... +rm -f ${RPM_BUILD_ROOT}%{_initrddir}/ipsec || : +sed -e 's/^# chkconfig:.*$/# chkconfig: - 47 68/' programs/setup/setup > \ + ${RPM_BUILD_ROOT}%{_initrddir}/ipsec +chmod 755 ${RPM_BUILD_ROOT}%{_initrddir}/ipsec + +# For x509 +mkdir -pm 700 ${RPM_BUILD_ROOT}/etc/ipsec.d/cacerts +mkdir -pm 700 ${RPM_BUILD_ROOT}/etc/ipsec.d/crls + +# Seems FreeSWAN ships the man pages of .... bind-light +rm -f ${RPM_BUILD_ROOT}%{_mandir}/man3/lwres* + +# Clean out what we don't want from docs +rm -f doc/Makefile +rm -rf doc/manpage.d doc/presentations doc/src doc/utils + +mv ${RPM_BUILD_ROOT}/usr/share/doc/* doc + + +%clean +%clean_buildroot + + +%post +if test ! -e /dev/ipsec ; then + mknod -m 0200 /dev/ipsec c 36 10 ; +fi +%service_post ipsec + +%preun +%service_preun ipsec + + +%files +%defattr(-,root,root) +%doc doc/* CHANGES COPYING CREDITS +/usr/lib/ipsec +%config(noreplace) %attr(600,root,root) /etc/ipsec.secrets +%config(noreplace) %attr(600,root,root) /etc/ipsec.conf +%{_initrddir}/ipsec +%attr(644,root,root) %{_mandir}/*/* +/usr/sbin/ipsec +/etc/ipsec.d + + +%changelog +* Wed Jul 21 2004 Jaakko Heinonen +- change freeswan to openswan 2.1.4 + +* Tue Jul 13 2004 Jaakko Heinonen +- fix mknod in %post + +* Wed Jul 7 2004 Jaakko Heinonen +- strongswan package based on freeswan spec from tinysofa 1.0 + +* Mon May 24 2004 tsintegrate 2.05-3ts +- current (2.05-3jh) integrated as 2.05-3ts for release 1.0-U1 + +* Thu May 20 2004 Jaakko Heinonen 2.05-3jh +- fix man page permissions + +* Wed May 19 2004 tsintegrate 2.05-2ts +- current (2.05-2jh) integrated as 2.05-2ts for release 1.0-U1 + +* Sat May 15 2004 Jaakko Heinonen 2.05-2jh +- fix non-root build +- package manual pages correctly + +* Tue May 11 2004 Omar Kilani +- Add BuildRequires gmp-devel. +- Add Requires gmp. + +* Fri Apr 02 2004 Omar Kilani 2.05-1ts +- New upstream. +- x509 1.5.4. + +* Fri Dec 5 2003 Erlend Midttun 2.04-1tr +- Big rebuild + +* Mon Dec 1 2003 Chr. Toldnes 2.04-1tr +- New upstream version: 2.04 + +* Thu Oct 30 2003 Chr. Toldnes 2.00-4tr +- Now make install does not fsck up the build box... (patch2) + +* Wed Jun 18 2003 Erlend Midttun 2.00-3tr +- Big rebuild + +* Fri May 16 2003 Erlend Midttun 2.00-2em +- Moved patch creation to a separate script shipped with tsl-utils. + +* Wed May 14 2003 Erlend Midttun 2.00-1em +- New upstream. +- Now create kernel patch here if needed. + +* Mon Mar 24 2003 Erlend Midttun 1.99-3em +- Rebuilt against glibc 2.3.2. + +* Mon Dec 9 2002 Erlend Midttun 1.99-2em +- Use _initrddir. + +* Thu Oct 30 2002 Erlend Midttun +- Fixed wrong path to IPSEC_DIR. + +* Thu Sep 19 2002 Erlend Midttun +- Updated to 1.98b and X509 patch 0.9.15. +- Added some docs + +* Fri Jan 11 2002 Christian H. Toldnes +- Now maybe we got the correct use of chkconfig.... + +* Wed Jan 9 2002 Lars Gaarden +- Merge x509-0.9.5 patch + +* Thu Jan 3 2002 Christian H. Toldnes +- Correct chkconfig line in new init script. + +* Thu Nov 1 2001 Erlend Midttun +- Picked up 1.91 to fix memory leak. + +* Fri Jun 13 2001 Erlend Midttun +- Updated serial when rebuilding for 1.5. + +* Wed Mar 28 2001 Alexander Reelsen +- Updated to 1.9, which fixes a memory leak + +* Mon Jan 29 2001 Olaf Trygve Berglihn +- Fixed preun to only run chkconfig off and service stop if not + upgrading. + +* Fri Aug 4 2000 Per Ivar Paulsen +- First Build For TSL Deleted: tinysofa/releases/1.1/openswan/current/specs/strongswan.spec =================================================================== --- tinysofa/releases/1.1/openswan/current/specs/strongswan.spec 2004-07-21 14:35:21 UTC (rev 3237) +++ tinysofa/releases/1.1/openswan/current/specs/strongswan.spec 2004-07-21 14:37:20 UTC (rev 3238) @@ -1,196 +0,0 @@ -Summary: A free ipsec VPN solution for Linux -Name: openswan -Version: 2.1.4 -Release: 2jh -License: GPL -Group: main -URL: http://www.openswan.org/ -Source0: %{name}-%{version}.tar.gz -Source1: freeswan-1.9.secrets.proto -Patch0: openswan-2.1.4-init.patch -Patch1: freeswan-2.00-confused.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-root -Provides: vpn ipsec -%service_requires -Requires: gmp ipsec-tools -PreReq: coreutils -BuildRequires: gmp-devel -Obsoletes: freeswan - - -%description -Opeswan is a free implementation of IPSEC & IKE for Linux. IPSEC is -the Internet Protocol Security and uses strong cryptography to provide -both authentication and encryption services. These services allow you -to build secure tunnels through untrusted networks. Everything passing -through the untrusted net is encrypted by the ipsec gateway machine and -decrypted by the gateway at the other end of the tunnel. The resulting -tunnel is a virtual private network or VPN. - - -%prep -%setup -q - -%patch0 -p1 -b .init -%patch1 -p1 -b .confused - -%build -CFLAGS="${RPM_OPT_FLAGS}" \ -%make \ - DESTDIR=/ \ - PUBDIR=/usr/sbin \ - BINDIR=/usr/lib/ipsec \ - INC_MANDIR=share/man \ - INC_USRLOCAL=/usr \ - FINALEXAMPLECONFDIR=/usr/share/doc/freeswan-%{version} \ - FINALLIBEXECDIR=/usr/lib/ipsec \ - RCDIR=%{_initrddir} \ - programs - - -%install -%{__mkdir_p} $RPM_BUILD_ROOT%{_initrddir} - -%makeinstall_std \ - PUBDIR=/usr/sbin \ - BINDIR=/usr/lib/ipsec \ - INC_MANDIR=share/man \ - INC_USRLOCAL=/usr \ - FINALEXAMPLECONFDIR=/usr/share/doc/%{name}-%{version} \ - FINALLIBEXECDIR=/usr/lib/ipsec \ - RCDIR=%{_initrddir} - -# We don't want all users to have the same secrets file :) -rm -f ${RPM_BUILD_ROOT}/ipsec.secrets -cp -f %{SOURCE1} ${RPM_BUILD_ROOT}/etc/ipsec.secrets - -# We actually do want chkconfig to work properly... -rm -f ${RPM_BUILD_ROOT}%{_initrddir}/ipsec || : -sed -e 's/^# chkconfig:.*$/# chkconfig: - 47 68/' programs/setup/setup > \ - ${RPM_BUILD_ROOT}%{_initrddir}/ipsec -chmod 755 ${RPM_BUILD_ROOT}%{_initrddir}/ipsec - -# For x509 -mkdir -pm 700 ${RPM_BUILD_ROOT}/etc/ipsec.d/cacerts -mkdir -pm 700 ${RPM_BUILD_ROOT}/etc/ipsec.d/crls - -# Seems FreeSWAN ships the man pages of .... bind-light -rm -f ${RPM_BUILD_ROOT}%{_mandir}/man3/lwres* - -# Clean out what we don't want from docs -rm -f doc/Makefile -rm -rf doc/manpage.d doc/presentations doc/src doc/utils - -mv ${RPM_BUILD_ROOT}/usr/share/doc/* doc - - -%clean -%clean_buildroot - - -%post -if test ! -e /dev/ipsec ; then - mknod -m 0200 /dev/ipsec c 36 10 ; -fi -%service_post ipsec - -%preun -%service_preun ipsec - - -%files -%defattr(-,root,root) -%doc doc/* CHANGES COPYING CREDITS -/usr/lib/ipsec -%config(noreplace) %attr(600,root,root) /etc/ipsec.secrets -%config(noreplace) %attr(600,root,root) /etc/ipsec.conf -%{_initrddir}/ipsec -%attr(644,root,root) %{_mandir}/*/* -/usr/sbin/ipsec -/etc/ipsec.d - - -%changelog -* Tue Jul 13 2004 Jaakko Heinonen -- fix mknod in %post - -* Wed Jul 7 2004 Jaakko Heinonen -- strongswan package based on freeswan spec from tinysofa 1.0 - -* Mon May 24 2004 tsintegrate 2.05-3ts -- current (2.05-3jh) integrated as 2.05-3ts for release 1.0-U1 - -* Thu May 20 2004 Jaakko Heinonen 2.05-3jh -- fix man page permissions - -* Wed May 19 2004 tsintegrate 2.05-2ts -- current (2.05-2jh) integrated as 2.05-2ts for release 1.0-U1 - -* Sat May 15 2004 Jaakko Heinonen 2.05-2jh -- fix non-root build -- package manual pages correctly - -* Tue May 11 2004 Omar Kilani -- Add BuildRequires gmp-devel. -- Add Requires gmp. - -* Fri Apr 02 2004 Omar Kilani 2.05-1ts -- New upstream. -- x509 1.5.4. - -* Fri Dec 5 2003 Erlend Midttun 2.04-1tr -- Big rebuild - -* Mon Dec 1 2003 Chr. Toldnes 2.04-1tr -- New upstream version: 2.04 - -* Thu Oct 30 2003 Chr. Toldnes 2.00-4tr -- Now make install does not fsck up the build box... (patch2) - -* Wed Jun 18 2003 Erlend Midttun 2.00-3tr -- Big rebuild - -* Fri May 16 2003 Erlend Midttun 2.00-2em -- Moved patch creation to a separate script shipped with tsl-utils. - -* Wed May 14 2003 Erlend Midttun 2.00-1em -- New upstream. -- Now create kernel patch here if needed. - -* Mon Mar 24 2003 Erlend Midttun 1.99-3em -- Rebuilt against glibc 2.3.2. - -* Mon Dec 9 2002 Erlend Midttun 1.99-2em -- Use _initrddir. - -* Thu Oct 30 2002 Erlend Midttun -- Fixed wrong path to IPSEC_DIR. - -* Thu Sep 19 2002 Erlend Midttun -- Updated to 1.98b and X509 patch 0.9.15. -- Added some docs - -* Fri Jan 11 2002 Christian H. Toldnes -- Now maybe we got the correct use of chkconfig.... - -* Wed Jan 9 2002 Lars Gaarden -- Merge x509-0.9.5 patch - -* Thu Jan 3 2002 Christian H. Toldnes -- Correct chkconfig line in new init script. - -* Thu Nov 1 2001 Erlend Midttun -- Picked up 1.91 to fix memory leak. - -* Fri Jun 13 2001 Erlend Midttun -- Updated serial when rebuilding for 1.5. - -* Wed Mar 28 2001 Alexander Reelsen -- Updated to 1.9, which fixes a memory leak - -* Mon Jan 29 2001 Olaf Trygve Berglihn -- Fixed preun to only run chkconfig off and service stop if not - upgrading. - -* Fri Aug 4 2000 Per Ivar Paulsen -- First Build For TSL From svn at tinysofa.org Wed Jul 21 14:47:03 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Thu, 22 Jul 2004 00:47:03 +1000 (EST) Subject: [tinysofa-svn] r3239 - tinysofa/releases/1.1/openldap/current/sources Message-ID: <20040721144703.6CD504E8031@minbar.tinysofa.org> Author: jh Date: 2004-07-22 00:47:03 +1000 (Thu, 22 Jul 2004) New Revision: 3239 Modified: tinysofa/releases/1.1/openldap/current/sources/openldap.sysconfig Log: - fix LDAP_H typo Modified: tinysofa/releases/1.1/openldap/current/sources/openldap.sysconfig =================================================================== --- tinysofa/releases/1.1/openldap/current/sources/openldap.sysconfig 2004-07-21 14:37:20 UTC (rev 3238) +++ tinysofa/releases/1.1/openldap/current/sources/openldap.sysconfig 2004-07-21 14:47:03 UTC (rev 3239) @@ -1,6 +1,6 @@ # Interfaces to listen (slapd -h option) -LDDAP_H="ldap:///" +LDAP_H="ldap:///" LDAP_TSL_H="ldaps:/// ldap:///" # Options for slapd and slurpd From svn at tinysofa.org Wed Jul 21 19:17:08 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Thu, 22 Jul 2004 05:17:08 +1000 (EST) Subject: [tinysofa-svn] r3240 - in tinysofa/releases/1.1/mkbootdisk/current: sources specs Message-ID: <20040721191708.A91A44E8031@minbar.tinysofa.org> Author: jh Date: 2004-07-22 05:17:08 +1000 (Thu, 22 Jul 2004) New Revision: 3240 Added: tinysofa/releases/1.1/mkbootdisk/current/sources/mkbootdisk-1.4.3-tinysofa.patch Removed: tinysofa/releases/1.1/mkbootdisk/current/sources/mkbootdisk-1.2.8-boot.patch tinysofa/releases/1.1/mkbootdisk/current/sources/mkbootdisk-1.2.8-tinysofa.patch tinysofa/releases/1.1/mkbootdisk/current/sources/mkbootdisk-1.2.8.tar.gz Modified: tinysofa/releases/1.1/mkbootdisk/current/specs/mkbootdisk.spec Log: - newer upstream of mkbootdisk Deleted: tinysofa/releases/1.1/mkbootdisk/current/sources/mkbootdisk-1.2.8-boot.patch =================================================================== --- tinysofa/releases/1.1/mkbootdisk/current/sources/mkbootdisk-1.2.8-boot.patch 2004-07-21 14:47:03 UTC (rev 3239) +++ tinysofa/releases/1.1/mkbootdisk/current/sources/mkbootdisk-1.2.8-boot.patch 2004-07-21 19:17:08 UTC (rev 3240) @@ -1,17 +0,0 @@ -diff -Nru mkbootdisk-1.2.8.orig/mkbootdisk mkbootdisk-1.2.8/mkbootdisk ---- mkbootdisk-1.2.8.orig/mkbootdisk 2003-05-28 10:10:54.000000000 +0200 -+++ mkbootdisk-1.2.8/mkbootdisk 2003-05-28 10:11:59.000000000 +0200 -@@ -171,9 +171,10 @@ - mkdir $MOUNTDIR/etc - mkdir $MOUNTDIR/dev - mkdir $MOUNTDIR/boot --cp -Pa $device $MOUNTDIR --cp -Pa $rootdev $MOUNTDIR --cp -a /boot/boot.b $MOUNTDIR/boot/boot.b -+cp -Pa $device $MOUNTDIR/dev -+cp -Pa $rootdev $MOUNTDIR/dev -+# This will fail unless lilo is configured as boot loader -+cp -a /boot/boot*.b $MOUNTDIR/boot/ > /dev/null 2>&1 || : - - cat > $MOUNTDIR/etc/lilo.conf <> $MOUNTDIR/boot/message < (or wait 10 seconds) to boot your Red Hat Linux system from --$rootdev. You may override the default linux kernel parameters by typing -+Press (or wait 10 seconds) to boot your tinysofa system -+from $rootdev. You may override the default linux kernel parameters by typing - "linux ", followed by if you like. - - EOF Deleted: tinysofa/releases/1.1/mkbootdisk/current/sources/mkbootdisk-1.2.8.tar.gz =================================================================== (Binary files differ) Added: tinysofa/releases/1.1/mkbootdisk/current/sources/mkbootdisk-1.4.3-tinysofa.patch =================================================================== --- tinysofa/releases/1.1/mkbootdisk/current/sources/mkbootdisk-1.4.3-tinysofa.patch 2004-07-21 14:47:03 UTC (rev 3239) +++ tinysofa/releases/1.1/mkbootdisk/current/sources/mkbootdisk-1.4.3-tinysofa.patch 2004-07-21 19:17:08 UTC (rev 3240) @@ -0,0 +1,11 @@ +--- mkbootdisk-1.4.3/mkbootdisk.orig 2002-03-27 00:32:34.000000000 +0200 ++++ mkbootdisk-1.4.3/mkbootdisk 2004-07-21 22:10:39.000000000 +0300 +@@ -200,7 +200,7 @@ + + cat >> $MOUNTDIR/boot.msg < (or wait 10 seconds) to boot your Red Hat Linux system from ++Press (or wait 10 seconds) to boot your tinysofa Linux system from + $rootdev. You may override the default linux kernel parameters by typing + "linux ", followed by if you like. + Modified: tinysofa/releases/1.1/mkbootdisk/current/specs/mkbootdisk.spec =================================================================== --- tinysofa/releases/1.1/mkbootdisk/current/specs/mkbootdisk.spec 2004-07-21 14:47:03 UTC (rev 3239) +++ tinysofa/releases/1.1/mkbootdisk/current/specs/mkbootdisk.spec 2004-07-21 19:17:08 UTC (rev 3240) @@ -1,19 +1,23 @@ -Summary: Creates an initial ramdisk image for preloading modules. +Summary: Creates a boot floppy disk for booting a system. Name: mkbootdisk -Version: 1.2.8 -Release: 15jh -License: GPL +Version: 1.4.3 +Release: 1jh +Copyright: GPL Group: extra Source: mkbootdisk-%{version}.tar.gz -Patch: mkbootdisk-1.2.8-tinysofa.patch +Patch: mkbootdisk-1.4.3-tinysofa.patch Patch1: mkbootdisk-1.2.8-boot.patch ExclusiveArch: i386 i586 i686 sparc ExclusiveOs: Linux -Requires: mkinitrd +Requires: mkinitrd dosfstools +%ifnarch sparc +Requires: syslinux +%endif +Conflicts: modutils < 2.3.11-5 %ifarch sparc Requires: silo genromfs %endif -BuildRoot: %{_tmppath}/%{name}-root +BuildRoot: %{_tmppath}/%{name}-%{version}-root %description The mkbootdisk program creates a standalone boot floppy disk for @@ -28,57 +32,53 @@ %patch1 -p1 %install -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != "/" ] && rm -rf "$RPM_BUILD_ROOT" -make BUILDROOT=$RPM_BUILD_ROOT install +make BUILDROOT=$RPM_BUILD_ROOT mandir=%{_mandir} install %clean -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT +%clean_buildroot %files %defattr(-,root,root) %attr(755,root,root) /sbin/mkbootdisk -%attr(644,root,root) /usr/share/man/man8/mkbootdisk.8* +%attr(644,root,root) %{_mandir}/man8/mkbootdisk.8.gz %changelog -* Wed May 19 2004 tsintegrate 1.2.8-14ts -- current (1.2.8-13ts) integrated as 1.2.8-14ts for release 1.0-U1 +* Tue Mar 26 2002 Jeremy Katz +- add --kernelargs command line option -* Mon Dec 15 2003 Erlend Midttun 1.2.8-10tr -- Rebuilt. +* Sun Jan 06 2002 Florian La Roche +- do not require syslinux for sparc -* Fri Oct 31 2003 Chr. Toldnes 1.2.8-9tr -- backport +* Mon Nov 05 2001 Erik Troan +- fixed minor typo in man page -* Sun Sep 28 2003 Chr. Toldnes 1.2.8-8tsl -- port to tawie +* Wed Aug 15 2001 Matt Wilson +- changed Summary:, it's no longer a bad copy and paste job from the + mkinitrd spec file (MF #50193) -* Wed Jun 18 2003 Erlend Midttun 1.2.8-7tr -- Big rebuild +* Sun Jun 24 2001 Elliot Lee +- Bump release + rebuild. -* Wed May 28 2003 Tore Olsen 1.2.8-6to -- Fixed patch so /boot/boot*.b actually is copied. +* Tue Feb 08 2001 Michael Fulbright +- return error code when we cant format the floppy. Helps anaconda out. -* Wed May 28 2003 Erlend Midttun 1.2.8-5em -- Correct the path where the devices are written. +* Tue Jan 23 2001 Erik Troan +- switched to use syslinux rather then lilo +- requires dosfstools +- put version in only one place, mkbootdisk -* Mon Mar 24 2003 Erlend Midttun 1.2.8-4em -- Rebuilt against glibc 2.3.2. +* Thu Jul 06 2000 Erik Troan +- wasn't including ethernet devices properly -* Tue Jul 23 2002 Daniel Meyer 1.2.8-3dm -- rebuild for Trustix Secure Linux 2.0 +* Thu Jun 1 2000 Bill Nottingham +- conf.modules -> modules.conf, fhs stuff -* Tue Jul 17 2001 Erlend Midttun -- Inc serial number before release. +* Mon May 01 2000 Erik Troan +- patched to work with disk labels -* Mon Mar 12 2001 Alexander Reelsen -- Picked up 1.2.8 +* Thu Feb 3 2000 Matt Wilson +- gzip manpage -* Wed Mar 29 2000 Lars Gaarden -- Moved man page to /usr/share, FHS. - -* Wed Feb 9 2000 Tore Olsen -- replaced Red Hat with Trustix in boot message - * Mon Jan 10 2000 Erik Troan - removed rescue stuff From svn at tinysofa.org Wed Jul 21 19:17:56 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Thu, 22 Jul 2004 05:17:56 +1000 (EST) Subject: [tinysofa-svn] r3241 - projects/ts-anaconda/trunk Message-ID: <20040721191756.5FFD14E8031@minbar.tinysofa.org> Author: jh Date: 2004-07-22 05:17:56 +1000 (Thu, 22 Jul 2004) New Revision: 3241 Modified: projects/ts-anaconda/trunk/dispatch.py projects/ts-anaconda/trunk/floppy.py Log: - make use of mkbootdisk --kernelargs Modified: projects/ts-anaconda/trunk/dispatch.py =================================================================== --- projects/ts-anaconda/trunk/dispatch.py 2004-07-21 19:17:08 UTC (rev 3240) +++ projects/ts-anaconda/trunk/dispatch.py 2004-07-21 19:17:56 UTC (rev 3241) @@ -129,7 +129,7 @@ ("enablesshd", enableSshd, ("intf", "instPath")), ("bootdisk", ("dir", "dispatch", "id.fsset")), ("makebootdisk", makeBootdisk, ("intf", "id.floppyDevice", - "id.hdList", "instPath")), + "id.hdList", "instPath", "id.bootloader")), # ("monitor", ("id.xconfig", "id.monitor")), # ("xcustom", ("id.xconfig", "id.monitor", "id.videocard", # "id.desktop", "id.comps")), Modified: projects/ts-anaconda/trunk/floppy.py =================================================================== --- projects/ts-anaconda/trunk/floppy.py 2004-07-21 19:17:08 UTC (rev 3240) +++ projects/ts-anaconda/trunk/floppy.py 2004-07-21 19:17:56 UTC (rev 3241) @@ -48,7 +48,7 @@ log("anaconda floppy device is %s", fdDevice) return fdDevice -def makeBootdisk (intf, floppyDevice, hdList, instPath): +def makeBootdisk (intf, floppyDevice, hdList, instPath, bootloader): if flags.test: return DISPATCH_NOOP @@ -70,9 +70,15 @@ kernelTag = "-%s-%s" % (kernel[rpm.RPMTAG_VERSION], kernel[rpm.RPMTAG_RELEASE]) + if bootloader.args.get(): + args = bootloader.args.get() + else: + args = "" + w = intf.waitWindow (_("Creating"), _("Creating boot disk...")) rc = iutil.execWithRedirect("/sbin/mkbootdisk", [ "/sbin/mkbootdisk", + "--kernelargs", args, "--noprompt", "--device", "/dev/" + floppyDevice, @@ -83,7 +89,7 @@ if rc: intf.messageWindow( _("Error"), - _("An error occured while making the boot disk. " + _("An error occurred while making the boot disk. " "Please make sure that there is a formatted floppy " "in the first floppy drive.")) return DISPATCH_BACK From svn at tinysofa.org Wed Jul 21 20:40:11 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Thu, 22 Jul 2004 06:40:11 +1000 (EST) Subject: [tinysofa-svn] r3242 - tinysofa/releases/1.1/kernel/current/specs Message-ID: <20040721204011.CE69B4E8031@minbar.tinysofa.org> Author: jh Date: 2004-07-22 06:40:11 +1000 (Thu, 22 Jul 2004) New Revision: 3242 Modified: tinysofa/releases/1.1/kernel/current/specs/kernel.spec Log: - don't move "unsupported" boot kernel modules away Modified: tinysofa/releases/1.1/kernel/current/specs/kernel.spec =================================================================== --- tinysofa/releases/1.1/kernel/current/specs/kernel.spec 2004-07-21 19:17:56 UTC (rev 3241) +++ tinysofa/releases/1.1/kernel/current/specs/kernel.spec 2004-07-21 20:40:11 UTC (rev 3242) @@ -1735,18 +1735,18 @@ mkdir -p $RPM_BUILD_ROOT/lib/modules/$KernelVer make -s INSTALL_MOD_PATH=$RPM_BUILD_ROOT modules_install KERNELRELEASE=$KernelVer - if [ "$1" == "BOOT" ] ; then +# if [ "$1" == "BOOT" ] ; then # move the modules in the SOURCE14 file to the unsupported/ directory - mkdir -p $RPM_BUILD_ROOT/lib/modules/$KernelVer/unsupported - pushd $RPM_BUILD_ROOT/lib/modules/$KernelVer/kernel ; { - tar cf - `cat %{SOURCE14}` | tar xf - -C ../unsupported - rm -rf `cat %{SOURCE14}` - if [ "$1." == "hugemem." ] ; then - tar cf - `cat %{SOURCE15}` | tar xf - -C ../unsupported - rm -rf `cat %{SOURCE15}` - fi - } ; popd - fi +# mkdir -p $RPM_BUILD_ROOT/lib/modules/$KernelVer/unsupported +# pushd $RPM_BUILD_ROOT/lib/modules/$KernelVer/kernel ; { +# tar cf - `cat %{SOURCE14}` | tar xf - -C ../unsupported +# rm -rf `cat %{SOURCE14}` +# if [ "$1." == "hugemem." ] ; then +# tar cf - `cat %{SOURCE15}` | tar xf - -C ../unsupported +# rm -rf `cat %{SOURCE15}` +# fi +# } ; popd +# fi # mark the modules executable if [ "$1" != "BOOT" ] ; then From svn at tinysofa.org Wed Jul 21 21:09:28 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Thu, 22 Jul 2004 07:09:28 +1000 (EST) Subject: [tinysofa-svn] r3243 - tinysofa/releases/1.1/coreutils/current/specs Message-ID: <20040721210928.B77924E8031@minbar.tinysofa.org> Author: jh Date: 2004-07-22 07:09:28 +1000 (Thu, 22 Jul 2004) New Revision: 3243 Modified: tinysofa/releases/1.1/coreutils/current/specs/coreutils.spec Log: - %info_preun -> %info_postun Modified: tinysofa/releases/1.1/coreutils/current/specs/coreutils.spec =================================================================== --- tinysofa/releases/1.1/coreutils/current/specs/coreutils.spec 2004-07-21 20:40:11 UTC (rev 3242) +++ tinysofa/releases/1.1/coreutils/current/specs/coreutils.spec 2004-07-21 21:09:28 UTC (rev 3243) @@ -148,8 +148,8 @@ %post doc %info_post -%preun doc -%info_preun +%postun doc +%info_postun %files %defattr(-,root,root) From svn at tinysofa.org Wed Jul 21 21:10:25 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Thu, 22 Jul 2004 07:10:25 +1000 (EST) Subject: [tinysofa-svn] r3244 - tinysofa/releases/1.1/samba/current/specs Message-ID: <20040721211025.33D344E8031@minbar.tinysofa.org> Author: jh Date: 2004-07-22 07:10:25 +1000 (Thu, 22 Jul 2004) New Revision: 3244 Modified: tinysofa/releases/1.1/samba/current/specs/samba.spec Log: - fix %{__rm} macro Modified: tinysofa/releases/1.1/samba/current/specs/samba.spec =================================================================== --- tinysofa/releases/1.1/samba/current/specs/samba.spec 2004-07-21 21:09:28 UTC (rev 3243) +++ tinysofa/releases/1.1/samba/current/specs/samba.spec 2004-07-21 21:10:25 UTC (rev 3244) @@ -267,7 +267,7 @@ %preun %service_preun smb if [ $1 = 0 ] ; then - %{_rm} -rf /var/log/samba/* /var/cache/samba/* + %{__rm} -rf /var/log/samba/* /var/cache/samba/* fi exit 0 From svn at tinysofa.org Wed Jul 21 21:11:29 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Thu, 22 Jul 2004 07:11:29 +1000 (EST) Subject: [tinysofa-svn] r3245 - tinysofa/releases/1.1/apache/current/specs Message-ID: <20040721211129.723C24E8031@minbar.tinysofa.org> Author: jh Date: 2004-07-22 07:11:29 +1000 (Thu, 22 Jul 2004) New Revision: 3245 Modified: tinysofa/releases/1.1/apache/current/specs/apache.spec Log: - fix service_postun macro Modified: tinysofa/releases/1.1/apache/current/specs/apache.spec =================================================================== --- tinysofa/releases/1.1/apache/current/specs/apache.spec 2004-07-21 21:10:25 UTC (rev 3244) +++ tinysofa/releases/1.1/apache/current/specs/apache.spec 2004-07-21 21:11:29 UTC (rev 3245) @@ -265,7 +265,7 @@ %service_preun httpd %postun -%service_postun +%service_postun httpd %post -n apr /sbin/ldconfig From svn at tinysofa.org Wed Jul 21 21:13:40 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Thu, 22 Jul 2004 07:13:40 +1000 (EST) Subject: [tinysofa-svn] r3246 - tinysofa/releases/1.1/binutils/current/specs Message-ID: <20040721211340.24B3B4E8031@minbar.tinysofa.org> Author: jh Date: 2004-07-22 07:13:39 +1000 (Thu, 22 Jul 2004) New Revision: 3246 Modified: tinysofa/releases/1.1/binutils/current/specs/binutils.spec Log: - remove comment which got to postun script Modified: tinysofa/releases/1.1/binutils/current/specs/binutils.spec =================================================================== --- tinysofa/releases/1.1/binutils/current/specs/binutils.spec 2004-07-21 21:11:29 UTC (rev 3245) +++ tinysofa/releases/1.1/binutils/current/specs/binutils.spec 2004-07-21 21:13:39 UTC (rev 3246) @@ -143,7 +143,6 @@ %postun -p /sbin/ldconfig -#%files -f binutils.lang %files %defattr(-,root,root) %doc README From svn at tinysofa.org Wed Jul 21 21:14:51 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Thu, 22 Jul 2004 07:14:51 +1000 (EST) Subject: [tinysofa-svn] r3247 - tinysofa/releases/1.1/util-linux/current/specs Message-ID: <20040721211451.4718A4E8031@minbar.tinysofa.org> Author: jh Date: 2004-07-22 07:14:50 +1000 (Thu, 22 Jul 2004) New Revision: 3247 Modified: tinysofa/releases/1.1/util-linux/current/specs/util-linux.spec Log: - remove comment which got to postun script Modified: tinysofa/releases/1.1/util-linux/current/specs/util-linux.spec =================================================================== --- tinysofa/releases/1.1/util-linux/current/specs/util-linux.spec 2004-07-21 21:13:39 UTC (rev 3246) +++ tinysofa/releases/1.1/util-linux/current/specs/util-linux.spec 2004-07-21 21:14:50 UTC (rev 3247) @@ -406,7 +406,7 @@ %postun %info_postun -#%files -f %{name}.lang + %files %exclude /usr/share/locale %defattr(-,root,root) From svn at tinysofa.org Wed Jul 21 21:15:36 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Thu, 22 Jul 2004 07:15:36 +1000 (EST) Subject: [tinysofa-svn] r3248 - tinysofa/releases/1.1/mysql/current/specs Message-ID: <20040721211536.5953D4E8031@minbar.tinysofa.org> Author: jh Date: 2004-07-22 07:15:36 +1000 (Thu, 22 Jul 2004) New Revision: 3248 Modified: tinysofa/releases/1.1/mysql/current/specs/mysql.spec Log: - fix service_postun macro Modified: tinysofa/releases/1.1/mysql/current/specs/mysql.spec =================================================================== --- tinysofa/releases/1.1/mysql/current/specs/mysql.spec 2004-07-21 21:14:50 UTC (rev 3247) +++ tinysofa/releases/1.1/mysql/current/specs/mysql.spec 2004-07-21 21:15:36 UTC (rev 3248) @@ -218,7 +218,7 @@ # database files. %postun -%service_postun +%service_postun mysql # Take care of info pages %info_postun From svn at tinysofa.org Thu Jul 22 10:29:20 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Thu, 22 Jul 2004 20:29:20 +1000 (EST) Subject: [tinysofa-svn] r3249 - tinysofa/releases/1.1/glibc/current/specs Message-ID: <20040722102920.47DB24E8031@minbar.tinysofa.org> Author: jh Date: 2004-07-22 20:29:18 +1000 (Thu, 22 Jul 2004) New Revision: 3249 Modified: tinysofa/releases/1.1/glibc/current/specs/glibc.spec Log: - change glibc-i18n-common group to i18n Modified: tinysofa/releases/1.1/glibc/current/specs/glibc.spec =================================================================== --- tinysofa/releases/1.1/glibc/current/specs/glibc.spec 2004-07-21 21:15:36 UTC (rev 3248) +++ tinysofa/releases/1.1/glibc/current/specs/glibc.spec 2004-07-22 10:29:18 UTC (rev 3249) @@ -173,7 +173,7 @@ %rename glibc-common PreReq: %{name} = %{version}-%{release} Requires: glibc-i18n-en_US -Group: main +Group: i18n %description i18n-common The glibc-i18n package includes basic national language (locale) From svn at tinysofa.org Thu Jul 22 16:55:24 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 23 Jul 2004 02:55:24 +1000 (EST) Subject: [tinysofa-svn] r3250 - in tinysofa/releases/1.0/samba/current: sources specs Message-ID: <20040722165524.2F0614E8031@minbar.tinysofa.org> Author: omar Date: 2004-07-23 02:55:23 +1000 (Fri, 23 Jul 2004) New Revision: 3250 Added: tinysofa/releases/1.0/samba/current/sources/samba-3.0.5.tar.gz Removed: tinysofa/releases/1.0/samba/current/sources/samba-3.0.4.tar.gz Modified: tinysofa/releases/1.0/samba/current/specs/samba.spec Log: - Update to 3.0.5, fix CAN-2004-0600 and CAN-2004-0686. Deleted: tinysofa/releases/1.0/samba/current/sources/samba-3.0.4.tar.gz =================================================================== (Binary files differ) Added: tinysofa/releases/1.0/samba/current/sources/samba-3.0.5.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/releases/1.0/samba/current/sources/samba-3.0.5.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: tinysofa/releases/1.0/samba/current/specs/samba.spec =================================================================== --- tinysofa/releases/1.0/samba/current/specs/samba.spec 2004-07-22 10:29:18 UTC (rev 3249) +++ tinysofa/releases/1.0/samba/current/specs/samba.spec 2004-07-22 16:55:23 UTC (rev 3250) @@ -1,7 +1,7 @@ Summary: Samba SMB server. Name: samba -Version: 3.0.4 -Release: 2ts +Version: 3.0.5 +Release: 1ts License: GPL Group: tinysofa official Source: ftp://ftp.samba.org/pub/samba/samba-%{version}.tar.gz From svn at tinysofa.org Thu Jul 22 16:56:04 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 23 Jul 2004 02:56:04 +1000 (EST) Subject: [tinysofa-svn] r3251 - in tinysofa/releases/1.0/samba: current/specs releases releases/3.0.5 releases/3.0.5/1ts/specs Message-ID: <20040722165604.19E1A4E8031@minbar.tinysofa.org> Author: omar Date: 2004-07-23 02:56:03 +1000 (Fri, 23 Jul 2004) New Revision: 3251 Added: tinysofa/releases/1.0/samba/releases/3.0.5/ tinysofa/releases/1.0/samba/releases/3.0.5/1ts/ Modified: tinysofa/releases/1.0/samba/current/specs/samba.spec tinysofa/releases/1.0/samba/releases/3.0.5/1ts/specs/samba.spec Log: samba: * integrate current (3.0.5-1ts) as releases/3.0.5/1ts Modified: tinysofa/releases/1.0/samba/current/specs/samba.spec =================================================================== --- tinysofa/releases/1.0/samba/current/specs/samba.spec 2004-07-22 16:55:23 UTC (rev 3250) +++ tinysofa/releases/1.0/samba/current/specs/samba.spec 2004-07-22 16:56:03 UTC (rev 3251) @@ -353,6 +353,9 @@ /usr/lib/samba/pdb/mysql.so %changelog +* Fri Jul 23 2004 tsintegrate 3.0.5-1ts +- current (3.0.5-1ts) integrated as 3.0.5-1ts for release 1.0-U3 + * Wed May 19 2004 tsintegrate 3.0.4-2ts - current (3.0.4-3ok) integrated as 3.0.4-2ts for release 1.0-U1 Copied: tinysofa/releases/1.0/samba/releases/3.0.5/1ts (from rev 3250, tinysofa/releases/1.0/samba/current) Modified: tinysofa/releases/1.0/samba/releases/3.0.5/1ts/specs/samba.spec =================================================================== --- tinysofa/releases/1.0/samba/current/specs/samba.spec 2004-07-22 16:55:23 UTC (rev 3250) +++ tinysofa/releases/1.0/samba/releases/3.0.5/1ts/specs/samba.spec 2004-07-22 16:56:03 UTC (rev 3251) @@ -353,6 +353,9 @@ /usr/lib/samba/pdb/mysql.so %changelog +* Fri Jul 23 2004 tsintegrate 3.0.5-1ts +- current (3.0.5-1ts) integrated as 3.0.5-1ts for release 1.0-U3 + * Wed May 19 2004 tsintegrate 3.0.4-2ts - current (3.0.4-3ok) integrated as 3.0.4-2ts for release 1.0-U1 From svn at tinysofa.org Thu Jul 22 16:56:05 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 23 Jul 2004 02:56:05 +1000 (EST) Subject: [tinysofa-svn] r3252 - tinysofa/releases/1.0/samba Message-ID: <20040722165605.B50844E8520@minbar.tinysofa.org> Author: omar Date: 2004-07-23 02:56:05 +1000 (Fri, 23 Jul 2004) New Revision: 3252 Removed: tinysofa/releases/1.0/samba/pristine/ Log: samba: * removing pristine (3.0.4-2ts) From svn at tinysofa.org Thu Jul 22 16:56:08 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 23 Jul 2004 02:56:08 +1000 (EST) Subject: [tinysofa-svn] r3253 - tinysofa/releases/1.0/samba Message-ID: <20040722165608.C752F4E8031@minbar.tinysofa.org> Author: omar Date: 2004-07-23 02:56:08 +1000 (Fri, 23 Jul 2004) New Revision: 3253 Added: tinysofa/releases/1.0/samba/pristine/ Log: samba: * retarget pristine (3.0.4-2ts) to releases/3.0.5/1ts Copied: tinysofa/releases/1.0/samba/pristine (from rev 3251, tinysofa/releases/1.0/samba/releases/3.0.5/1ts) From svn at tinysofa.org Thu Jul 22 19:06:58 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 23 Jul 2004 05:06:58 +1000 (EST) Subject: [tinysofa-svn] r3254 - tinysofa/releases/1.1/sysklogd/current/specs Message-ID: <20040722190658.B0F7E4E855C@minbar.tinysofa.org> Author: jh Date: 2004-07-23 05:06:56 +1000 (Fri, 23 Jul 2004) New Revision: 3254 Modified: tinysofa/releases/1.1/sysklogd/current/specs/sysklogd.spec Log: - prerequire filesystem Modified: tinysofa/releases/1.1/sysklogd/current/specs/sysklogd.spec =================================================================== --- tinysofa/releases/1.1/sysklogd/current/specs/sysklogd.spec 2004-07-22 16:56:08 UTC (rev 3253) +++ tinysofa/releases/1.1/sysklogd/current/specs/sysklogd.spec 2004-07-22 19:06:56 UTC (rev 3254) @@ -8,7 +8,7 @@ Source1: syslog.init Source2: syslog.sysconfig Patch: sysklogd-1.4.1rh-security.patch -Prereq: coreutils initscripts +Prereq: coreutils initscripts filesystem %service_requires Conflicts: logrotate < 3.5.2 Requires: bash >= 2.0 From svn at tinysofa.org Fri Jul 23 05:19:36 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 23 Jul 2004 15:19:36 +1000 (EST) Subject: [tinysofa-svn] r3255 - tinysofa/releases/1.1/etcskel/current/specs Message-ID: <20040723051936.4F5984E855C@minbar.tinysofa.org> Author: jh Date: 2004-07-23 15:19:34 +1000 (Fri, 23 Jul 2004) New Revision: 3255 Modified: tinysofa/releases/1.1/etcskel/current/specs/etcskel.spec Log: - exclude .inputrc Modified: tinysofa/releases/1.1/etcskel/current/specs/etcskel.spec =================================================================== --- tinysofa/releases/1.1/etcskel/current/specs/etcskel.spec 2004-07-22 19:06:56 UTC (rev 3254) +++ tinysofa/releases/1.1/etcskel/current/specs/etcskel.spec 2004-07-23 05:19:34 UTC (rev 3255) @@ -19,7 +19,6 @@ %install -rm -rf $RPM_BUILD_ROOT/etc/skel mkdir -p $RPM_BUILD_ROOT/etc/skel zcat $RPM_SOURCE_DIR/etcskel.tar.gz | (cd $RPM_BUILD_ROOT ; tar -xvSpf-) @@ -32,6 +31,7 @@ %files %defattr(-,root,root) %config %{_sysconfdir}/skel +%exclude %{_sysconfdir}/skel/.inputrc %exclude %{_sysconfdir}/skel/.bash* From svn at tinysofa.org Fri Jul 23 09:58:04 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 23 Jul 2004 19:58:04 +1000 (EST) Subject: [tinysofa-svn] r3256 - tinysofa/releases/1.1/pam/current/specs Message-ID: <20040723095804.782244E855C@minbar.tinysofa.org> Author: jh Date: 2004-07-23 19:58:03 +1000 (Fri, 23 Jul 2004) New Revision: 3256 Modified: tinysofa/releases/1.1/pam/current/specs/pam.spec Log: - remove BR: coreutils Modified: tinysofa/releases/1.1/pam/current/specs/pam.spec =================================================================== --- tinysofa/releases/1.1/pam/current/specs/pam.spec 2004-07-23 05:19:34 UTC (rev 3255) +++ tinysofa/releases/1.1/pam/current/specs/pam.spec 2004-07-23 09:58:03 UTC (rev 3256) @@ -66,7 +66,7 @@ Requires: cracklib, cracklib-dicts, glib, initscripts >= 3.94 Obsoletes: pamconfig Prereq: grep, mktemp, sed, coreutils, /sbin/ldconfig -BuildPrereq: autoconf, bison, flex, glib-devel, sed, coreutils, cracklib, cracklib-dicts +BuildPrereq: autoconf, bison, flex, glib-devel, sed, cracklib, cracklib-dicts BuildPrereq: perl pkgconfig, db4-devel %if %{with_selinux} BuildPrereq: libselinux-devel From svn at tinysofa.org Fri Jul 23 10:38:26 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 23 Jul 2004 20:38:26 +1000 (EST) Subject: [tinysofa-svn] r3257 - tinysofa/releases/1.1/setup/current/specs Message-ID: <20040723103826.856DB4E855C@minbar.tinysofa.org> Author: jh Date: 2004-07-23 20:38:25 +1000 (Fri, 23 Jul 2004) New Revision: 3257 Modified: tinysofa/releases/1.1/setup/current/specs/setup.spec Log: - remove BR: coreutils Modified: tinysofa/releases/1.1/setup/current/specs/setup.spec =================================================================== --- tinysofa/releases/1.1/setup/current/specs/setup.spec 2004-07-23 09:58:03 UTC (rev 3256) +++ tinysofa/releases/1.1/setup/current/specs/setup.spec 2004-07-23 10:38:25 UTC (rev 3257) @@ -11,7 +11,7 @@ BuildRoot: %{_tmppath}/%{name}-root BuildArch: noarch Conflicts: initscripts < 4.26 -BuildRequires: coreutils, awk +BuildRequires: awk %description The setup package contains a set of important system configuration and From svn at tinysofa.org Fri Jul 23 11:15:29 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 23 Jul 2004 21:15:29 +1000 (EST) Subject: [tinysofa-svn] r3258 - tinysofa/releases/1.1/courier-imap/current/specs Message-ID: <20040723111529.B229C4E855C@minbar.tinysofa.org> Author: jh Date: 2004-07-23 21:15:29 +1000 (Fri, 23 Jul 2004) New Revision: 3258 Modified: tinysofa/releases/1.1/courier-imap/current/specs/courier-imap.spec Log: - improve BuildRequires Modified: tinysofa/releases/1.1/courier-imap/current/specs/courier-imap.spec =================================================================== --- tinysofa/releases/1.1/courier-imap/current/specs/courier-imap.spec 2004-07-23 10:38:25 UTC (rev 3257) +++ tinysofa/releases/1.1/courier-imap/current/specs/courier-imap.spec 2004-07-23 11:15:29 UTC (rev 3258) @@ -23,7 +23,7 @@ %service_requires Requires: coreutils, sed Requires: db4, openssl, imapd-pam -BuildRequires: coreutils, rpm >= 4.0.2, sed, libstdc++-devel gcc-c++ +BuildRequires: sed, libstdc++-devel gcc-c++ BuildRequires: perl, db4-devel, openssl-devel BuildRequires: pam-devel openldap-devel mysql-devel postgresql-devel Buildrequires: mysql-devel mysql-shared mysql-libs From svn at tinysofa.org Sun Jul 25 08:32:45 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Sun, 25 Jul 2004 18:32:45 +1000 (EST) Subject: [tinysofa-svn] r3259 - tinysofa/releases/1.1/openldap/current/specs Message-ID: <20040725083245.4DE714E855C@minbar.tinysofa.org> Author: jh Date: 2004-07-25 18:32:44 +1000 (Sun, 25 Jul 2004) New Revision: 3259 Modified: tinysofa/releases/1.1/openldap/current/specs/openldap.spec Log: - fix a typo Modified: tinysofa/releases/1.1/openldap/current/specs/openldap.spec =================================================================== --- tinysofa/releases/1.1/openldap/current/specs/openldap.spec 2004-07-23 11:15:29 UTC (rev 3258) +++ tinysofa/releases/1.1/openldap/current/specs/openldap.spec 2004-07-25 08:32:44 UTC (rev 3259) @@ -15,7 +15,7 @@ Source4: openldap-migration-tools.txt Source5: openldap-rfc822-MailMember.schema Source6: openldap-autofs.schema -Source7: openldap.syconfig +Source7: openldap.sysconfig Patch0: openldap-2.1.17-config.patch # Patches by Red Hat which seemed useful Patch1: openldap-2.1.17-string.patch From svn at tinysofa.org Sun Jul 25 08:38:10 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Sun, 25 Jul 2004 18:38:10 +1000 (EST) Subject: [tinysofa-svn] r3260 - in tinysofa/releases/1.1/mkbootdisk/current: sources specs Message-ID: <20040725083810.361224E855C@minbar.tinysofa.org> Author: jh Date: 2004-07-25 18:38:09 +1000 (Sun, 25 Jul 2004) New Revision: 3260 Added: tinysofa/releases/1.1/mkbootdisk/current/sources/mkbootdisk-1.4.3.tar.gz Modified: tinysofa/releases/1.1/mkbootdisk/current/specs/mkbootdisk.spec Log: - add sources - remove obsolete patch Added: tinysofa/releases/1.1/mkbootdisk/current/sources/mkbootdisk-1.4.3.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/releases/1.1/mkbootdisk/current/sources/mkbootdisk-1.4.3.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: tinysofa/releases/1.1/mkbootdisk/current/specs/mkbootdisk.spec =================================================================== --- tinysofa/releases/1.1/mkbootdisk/current/specs/mkbootdisk.spec 2004-07-25 08:32:44 UTC (rev 3259) +++ tinysofa/releases/1.1/mkbootdisk/current/specs/mkbootdisk.spec 2004-07-25 08:38:09 UTC (rev 3260) @@ -6,7 +6,6 @@ Group: extra Source: mkbootdisk-%{version}.tar.gz Patch: mkbootdisk-1.4.3-tinysofa.patch -Patch1: mkbootdisk-1.2.8-boot.patch ExclusiveArch: i386 i586 i686 sparc ExclusiveOs: Linux Requires: mkinitrd dosfstools @@ -29,7 +28,6 @@ %prep %setup -q %patch -p1 -%patch1 -p1 %install make BUILDROOT=$RPM_BUILD_ROOT mandir=%{_mandir} install From svn at tinysofa.org Sun Jul 25 09:29:51 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Sun, 25 Jul 2004 19:29:51 +1000 (EST) Subject: [tinysofa-svn] r3261 - tinysofa/releases/1.1/samba/current/sources Message-ID: <20040725092951.F1C164E855C@minbar.tinysofa.org> Author: jh Date: 2004-07-25 19:29:51 +1000 (Sun, 25 Jul 2004) New Revision: 3261 Added: tinysofa/releases/1.1/samba/current/sources/samba-3.0.5.tar.gz Log: - copy samba 3.0.5 sources from 1.0 Copied: tinysofa/releases/1.1/samba/current/sources/samba-3.0.5.tar.gz (from rev 3260, tinysofa/releases/1.0/samba/current/sources/samba-3.0.5.tar.gz) From svn at tinysofa.org Sun Jul 25 09:30:39 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Sun, 25 Jul 2004 19:30:39 +1000 (EST) Subject: [tinysofa-svn] r3262 - in tinysofa/releases/1.1/samba/current: sources specs Message-ID: <20040725093039.09D464E855C@minbar.tinysofa.org> Author: jh Date: 2004-07-25 19:30:38 +1000 (Sun, 25 Jul 2004) New Revision: 3262 Removed: tinysofa/releases/1.1/samba/current/sources/samba-3.0.4.tar.gz Modified: tinysofa/releases/1.1/samba/current/specs/samba.spec Log: - update to 3.0.5 Deleted: tinysofa/releases/1.1/samba/current/sources/samba-3.0.4.tar.gz =================================================================== (Binary files differ) Modified: tinysofa/releases/1.1/samba/current/specs/samba.spec =================================================================== --- tinysofa/releases/1.1/samba/current/specs/samba.spec 2004-07-25 09:29:51 UTC (rev 3261) +++ tinysofa/releases/1.1/samba/current/specs/samba.spec 2004-07-25 09:30:38 UTC (rev 3262) @@ -2,8 +2,8 @@ Summary: The Samba SMB server. Name: samba -Version: 3.0.4 -Release: 3jh +Version: 3.0.5 +Release: 2jh Epoch: 0 License: GNU GPL Version 2 Group: extra @@ -40,7 +40,7 @@ BuildRequires: cups-devel, readline-devel, pam-devel BuildRequires: kerberos5-devel, kerberos5-libs, libcom_err-devel BuildRequires: openldap-devel, mysql-devel, cyrus-sasl-devel, openssl-devel -BuildRequires: autoconf kerberos5 zlib-devel ncurses-devel coreutils +BuildRequires: autoconf kerberos5 zlib-devel ncurses-devel BuildRequires: libacl-devel From svn at tinysofa.org Sun Jul 25 14:22:43 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Mon, 26 Jul 2004 00:22:43 +1000 (EST) Subject: [tinysofa-svn] r3263 - tinysofa/releases/1.1/glibc/current/specs Message-ID: <20040725142243.3E11C4E855C@minbar.tinysofa.org> Author: jh Date: 2004-07-26 00:22:42 +1000 (Mon, 26 Jul 2004) New Revision: 3263 Modified: tinysofa/releases/1.1/glibc/current/specs/glibc.spec Log: - remove definition for release Modified: tinysofa/releases/1.1/glibc/current/specs/glibc.spec =================================================================== --- tinysofa/releases/1.1/glibc/current/specs/glibc.spec 2004-07-25 09:30:38 UTC (rev 3262) +++ tinysofa/releases/1.1/glibc/current/specs/glibc.spec 2004-07-25 14:22:42 UTC (rev 3263) @@ -1,4 +1,3 @@ -%define glibcrelease 1jh %define auxarches i686 athlon sparcv9 alphaev6 %define prelinkarches noarch %define nptlarches i586 i686 athlon x86_64 ia64 s390 s390x sparcv9 ppc ppc64 @@ -10,7 +9,7 @@ Summary: The GNU libc libraries. Name: glibc Version: 2.3.3 -Release: %{glibcrelease} +Release: 1jh License: LGPL Group: main Source0: %{name}-%{version}-%{glibcdate}.tar.bz2 From svn at tinysofa.org Sun Jul 25 15:04:02 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Mon, 26 Jul 2004 01:04:02 +1000 (EST) Subject: [tinysofa-svn] r3264 - in tinysofa/releases/1.1/perl/current: sources specs Message-ID: <20040725150402.772494E855C@minbar.tinysofa.org> Author: gda Date: 2004-07-26 01:04:02 +1000 (Mon, 26 Jul 2004) New Revision: 3264 Added: tinysofa/releases/1.1/perl/current/sources/perl-5.8.5.tar.bz2 Removed: tinysofa/releases/1.1/perl/current/sources/filter-depends.sh tinysofa/releases/1.1/perl/current/sources/perl-5.8.4.tar.gz Modified: tinysofa/releases/1.1/perl/current/specs/perl.spec Log: new upstream version Deleted: tinysofa/releases/1.1/perl/current/sources/filter-depends.sh =================================================================== --- tinysofa/releases/1.1/perl/current/sources/filter-depends.sh 2004-07-25 14:22:42 UTC (rev 3263) +++ tinysofa/releases/1.1/perl/current/sources/filter-depends.sh 2004-07-25 15:04:02 UTC (rev 3264) @@ -1,13 +0,0 @@ -#!/bin/sh - -/usr/lib/rpm/perl.req $* | \ - grep -v NDBM | \ - grep -v 'perl(v5.6.0)' | \ - grep -v 'perl(Mac::' | \ - grep -v 'perl(Tk' | \ - grep -v 'perl(VMS' | \ - grep -v 'perl(FCGI)' | \ - grep -v 'perl(Tie::RangeHash)' | \ - grep -v 'perl(getopts.pl)' | \ - grep -v 'perl(bigint.pl)' - Deleted: tinysofa/releases/1.1/perl/current/sources/perl-5.8.4.tar.gz =================================================================== (Binary files differ) Added: tinysofa/releases/1.1/perl/current/sources/perl-5.8.5.tar.bz2 =================================================================== (Binary files differ) Property changes on: tinysofa/releases/1.1/perl/current/sources/perl-5.8.5.tar.bz2 ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: tinysofa/releases/1.1/perl/current/specs/perl.spec =================================================================== --- tinysofa/releases/1.1/perl/current/specs/perl.spec 2004-07-25 14:22:42 UTC (rev 3263) +++ tinysofa/releases/1.1/perl/current/specs/perl.spec 2004-07-25 15:04:02 UTC (rev 3264) @@ -1,18 +1,15 @@ Summary: The Perl programming language. Name: perl -Version: 5.8.4 +Version: 5.8.5 Epoch: 1 -Release: 4jh +Release: 1gd License: GPL Group: main Url: http://www.perl.com -Source0: ftp://ftp.perl.org/pub/CPAN/src/perl-%{version}.tar.gz +Source0: ftp://ftp.perl.org/pub/CPAN/src/perl-%{version}.tar.bz2 Source1: perl-headers-wanted Source2: perl-5.8.0-h2ph-ansi_header.patch -Source3: filter-depends.sh -%define __perl_requires %{SOURCE3} - Patch1: perl-5.8.0-makemaker-ld_run_path.patch Patch3: perl-5.8.2-root.patch Patch4: perl-5.8.3-desthtml.patch @@ -308,7 +305,6 @@ %if %threading %dir %{perl_root}/site_perl/%{version}/%{full_arch} %dir %{perl_root}/site_perl/%{version}/%{full_arch}/auto -%dir %{perl_root}/%{version}/%{full_arch}/auto %endif %{_mandir}/man1/* %{_mandir}/man3/* @@ -342,7 +338,7 @@ %{perl_root}/%{version}/Memoize/README %{perl_root}/%{version}/Memoize/TODO %{perl_root}/%{version}/NEXT - %{perl_root}/%{version}/Net/ChangeLog.libnet + %{perl_root}/%{version}/Net/Changes.libnet %{perl_root}/%{version}/Net/Ping/Changes %{perl_root}/%{version}/Net/README.libnet %{perl_root}/%{version}/Net/demos @@ -379,6 +375,13 @@ %changelog +* Sun Jul 25 2004 Gerald Dachs 5.8.5-1gd +- new upstream version +- removed %dir /usr/lib/perl5/5.8.5/i586-linux-thread-multi/auto, + was listed twice +- ChangeLog.libnet -> Changes.libnet +- removed filter-depends.sh + * Wed May 19 2004 tsintegrate 5.8.4-3ts - current (5.8.4-3jh) integrated as 5.8.4-3ts for release 1.0-U1 From svn at tinysofa.org Sun Jul 25 18:24:52 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Mon, 26 Jul 2004 04:24:52 +1000 (EST) Subject: [tinysofa-svn] r3265 - in tinysofa/releases/1.1/perl/current: sources specs Message-ID: <20040725182452.6529B4E855C@minbar.tinysofa.org> Author: gda Date: 2004-07-26 04:24:52 +1000 (Mon, 26 Jul 2004) New Revision: 3265 Added: tinysofa/releases/1.1/perl/current/sources/filter-depends.sh tinysofa/releases/1.1/perl/current/sources/perl-5.8.5-nondbm.patch Modified: tinysofa/releases/1.1/perl/current/specs/perl.spec Log: some fixes for ts 1.1 Added: tinysofa/releases/1.1/perl/current/sources/filter-depends.sh =================================================================== --- tinysofa/releases/1.1/perl/current/sources/filter-depends.sh 2004-07-25 15:04:02 UTC (rev 3264) +++ tinysofa/releases/1.1/perl/current/sources/filter-depends.sh 2004-07-25 18:24:52 UTC (rev 3265) @@ -0,0 +1,4 @@ +#!/bin/sh + +/usr/lib/rpm/perl.req $* | grep -v NDBM | grep -v 'perl(v5.6.0)' | grep -v 'perl(Mac::' | grep -v 'perl(Tk' | grep -v 'perl(Tie::RangeHash)' | grep -v 'perl(VMS' | grep -v 'perl(FCGI' + Property changes on: tinysofa/releases/1.1/perl/current/sources/filter-depends.sh ___________________________________________________________________ Name: svn:executable + * Added: tinysofa/releases/1.1/perl/current/sources/perl-5.8.5-nondbm.patch =================================================================== --- tinysofa/releases/1.1/perl/current/sources/perl-5.8.5-nondbm.patch 2004-07-25 15:04:02 UTC (rev 3264) +++ tinysofa/releases/1.1/perl/current/sources/perl-5.8.5-nondbm.patch 2004-07-25 18:24:52 UTC (rev 3265) @@ -0,0 +1,52 @@ +--- perl-5.8.5/Configure~ 2004-05-12 13:00:41.000000000 +0200 ++++ perl-5.8.5/Configure 2004-07-25 12:29:32.000000000 +0200 +@@ -1266,7 +1266,7 @@ + + : List of libraries we want. + : If anyone needs extra -lxxx, put those in a hint file. +-libswanted="sfio socket bind inet nsl nm ndbm gdbm dbm db malloc dl dld ld sun" ++libswanted="sfio socket bind inet nsl nm gdbm dbm db malloc dl dld ld sun" + libswanted="$libswanted m crypt sec util c cposix posix ucb bsd BSD" + : We probably want to search /usr/shlib before most other libraries. + : This is only used by the lib/ExtUtils/MakeMaker.pm routine extliblist. +@@ -19528,40 +19528,6 @@ + set mntent.h i_mntent + eval $inhdr + +-: see if ndbm.h is available +-set ndbm.h t_ndbm +-eval $inhdr +- +-case "$t_ndbm" in +-$undef) +- # Some Linux distributions such as RedHat 7.1 put the +- # ndbm.h header in /usr/include/gdbm/ndbm.h. +- if $test -f /usr/include/gdbm/ndbm.h; then +- echo ' found.' +- ccflags="$ccflags -I/usr/include/gdbm" +- cppflags="$cppflags -I/usr/include/gdbm" +- t_ndbm=$define +- fi +- ;; +-esac +- +-case "$t_ndbm" in +-$define) +- : see if dbm_open exists +- set dbm_open d_dbm_open +- eval $inlibc +- case "$d_dbm_open" in +- $undef) +- t_ndbm="$undef" +- echo "We won't be including " +- ;; +- esac +- ;; +-esac +-val="$t_ndbm" +-set i_ndbm +-eval $setvar +- + : see if net/errno.h is available + val='' + set net/errno.h val Modified: tinysofa/releases/1.1/perl/current/specs/perl.spec =================================================================== --- tinysofa/releases/1.1/perl/current/specs/perl.spec 2004-07-25 15:04:02 UTC (rev 3264) +++ tinysofa/releases/1.1/perl/current/specs/perl.spec 2004-07-25 18:24:52 UTC (rev 3265) @@ -2,17 +2,23 @@ Name: perl Version: 5.8.5 Epoch: 1 -Release: 1gd +Release: 2gd License: GPL Group: main Url: http://www.perl.com Source0: ftp://ftp.perl.org/pub/CPAN/src/perl-%{version}.tar.bz2 Source1: perl-headers-wanted Source2: perl-5.8.0-h2ph-ansi_header.patch +Source3: filter-depends.sh Patch1: perl-5.8.0-makemaker-ld_run_path.patch Patch3: perl-5.8.2-root.patch Patch4: perl-5.8.3-desthtml.patch +# Configure doesn't listen well when we say no ndbm. +Patch5: perl-5.8.5-nondbm.patch + +%define __perl_requires %{SOURCE3} + BuildRoot: %{_tmppath}/%{name}-root Requires: gdbm Requires: db4 @@ -22,6 +28,11 @@ # Removed untill prove of need: (christht) #%define _noVersionedDependencies 1 Provides: perl <= %{version} + +# This is really there, strange +Provides: perl(Carp::Heavy) +Provides: perl(bigint.pl) + %define threading 1 %if %threading @@ -72,6 +83,7 @@ %patch1 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 find . -name \*.orig -exec rm -fv {} \; @@ -85,6 +97,7 @@ -Dd_dosuid \ -Dd_semctl_semun \ -Di_db \ + -Ui_ndbm \ -Di_gdbm \ -Dmyhostname=localhost \ -Doptimize="$RPM_OPT_FLAGS" \ @@ -375,6 +388,12 @@ %changelog +* Sun Jul 25 2004 Gerald Dachs 5.8.5-2gd +- removed ndbm +- added provides statments to resolve dependencies +- added nodbm patch (patch5) +- readded and changed filter-depends.sh + * Sun Jul 25 2004 Gerald Dachs 5.8.5-1gd - new upstream version - removed %dir /usr/lib/perl5/5.8.5/i586-linux-thread-multi/auto, From svn at tinysofa.org Sun Jul 25 18:59:19 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Mon, 26 Jul 2004 04:59:19 +1000 (EST) Subject: [tinysofa-svn] r3266 - tinysofa/releases/1.1/kernel/current/specs Message-ID: <20040725185919.162B84E855C@minbar.tinysofa.org> Author: jh Date: 2004-07-26 04:59:18 +1000 (Mon, 26 Jul 2004) New Revision: 3266 Modified: tinysofa/releases/1.1/kernel/current/specs/kernel.spec Log: - move release to Release: tag Modified: tinysofa/releases/1.1/kernel/current/specs/kernel.spec =================================================================== --- tinysofa/releases/1.1/kernel/current/specs/kernel.spec 2004-07-25 18:24:52 UTC (rev 3265) +++ tinysofa/releases/1.1/kernel/current/specs/kernel.spec 2004-07-25 18:59:18 UTC (rev 3266) @@ -13,13 +13,6 @@ # Versions of various parts -# -# Polite request for people who spin their own kernel rpms: -# please modify the "release" field in a way that identifies -# that the kernel isn't the stock RHL kernel, for example by -# adding some text to the end of the version number. -# -%define release 1jh %define sublevel 21 %define kversion 2.4.%{sublevel} # /usr/src/%{kslnk} -> /usr/src/linux-%{KVERREL} @@ -133,7 +126,7 @@ Group: main License: GPLv2 Version: %{kversion} -Release: %{release} +Release: 1jh Epoch: 1 ExclusiveArch: %{all_x86} %{all_x86_64} s390 s390x %{all_ppc64} ia64 ExclusiveOS: Linux From svn at tinysofa.org Sun Jul 25 19:44:26 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Mon, 26 Jul 2004 05:44:26 +1000 (EST) Subject: [tinysofa-svn] r3267 - tinysofa/releases/1.1/rpm/current/sources Message-ID: <20040725194426.EEE904E855C@minbar.tinysofa.org> Author: jh Date: 2004-07-26 05:44:26 +1000 (Mon, 26 Jul 2004) New Revision: 3267 Added: tinysofa/releases/1.1/rpm/current/sources/rpm-4.3.2-canonarch.patch Log: - add rpm-4.3.2-canonarch.patch Added: tinysofa/releases/1.1/rpm/current/sources/rpm-4.3.2-canonarch.patch =================================================================== --- tinysofa/releases/1.1/rpm/current/sources/rpm-4.3.2-canonarch.patch 2004-07-25 18:59:18 UTC (rev 3266) +++ tinysofa/releases/1.1/rpm/current/sources/rpm-4.3.2-canonarch.patch 2004-07-25 19:44:26 UTC (rev 3267) @@ -0,0 +1,11 @@ +--- rpm-4.3.2/configure.ac.orig 2004-07-18 19:21:16.000000000 +0300 ++++ rpm-4.3.2/configure.ac 2004-07-18 19:21:45.000000000 +0300 +@@ -1110,7 +1110,7 @@ + dnl Determine the canonical arch-vendor-os for the build machine + autorelocate_path='%{nil}' + case "${build_cpu}" in +-*86) RPMCANONCOLOR=0; RPMCANONARCH=i386 ;; ++*86) RPMCANONCOLOR=0; RPMCANONARCH=i586 ;; + ia32e*) RPMCANONCOLOR=3; RPMCANONARCH=ia32e ;; + amd64*) RPMCANONCOLOR=3; RPMCANONARCH=amd64 ;; + x86_64*) RPMCANONCOLOR=3; RPMCANONARCH=x86_64 ;; From svn at tinysofa.org Sun Jul 25 19:46:15 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Mon, 26 Jul 2004 05:46:15 +1000 (EST) Subject: [tinysofa-svn] r3268 - tinysofa/releases/1.1 Message-ID: <20040725194615.7B7E04E855C@minbar.tinysofa.org> Author: jh Date: 2004-07-26 05:46:15 +1000 (Mon, 26 Jul 2004) New Revision: 3268 Removed: tinysofa/releases/1.1/strongswan/ Log: - remove strongswan From svn at tinysofa.org Sun Jul 25 19:50:46 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Mon, 26 Jul 2004 05:50:46 +1000 (EST) Subject: [tinysofa-svn] r3269 - in tinysofa/releases/1.1/anaconda/current: sources specs Message-ID: <20040725195046.822124E855C@minbar.tinysofa.org> Author: jh Date: 2004-07-26 05:50:46 +1000 (Mon, 26 Jul 2004) New Revision: 3269 Added: tinysofa/releases/1.1/anaconda/current/sources/anaconda-jfs-xfs.patch tinysofa/releases/1.1/anaconda/current/sources/ts-anaconda-1.1.1.tar.bz2 Removed: tinysofa/releases/1.1/anaconda/current/sources/ts-anaconda-1.1.0.tar.bz2 Modified: tinysofa/releases/1.1/anaconda/current/specs/anaconda.spec Log: - update to 1.1.1 - add anaconda-jfs-xfs.patch Added: tinysofa/releases/1.1/anaconda/current/sources/anaconda-jfs-xfs.patch =================================================================== --- tinysofa/releases/1.1/anaconda/current/sources/anaconda-jfs-xfs.patch 2004-07-25 19:46:15 UTC (rev 3268) +++ tinysofa/releases/1.1/anaconda/current/sources/anaconda-jfs-xfs.patch 2004-07-25 19:50:46 UTC (rev 3269) @@ -0,0 +1,22 @@ +Index: trunk/fsset.py +=================================================================== +--- trunk/fsset.py (revision 3099) ++++ trunk/fsset.py (working copy) +@@ -319,7 +319,7 @@ + self.formattable = 1 + self.checked = 1 + self.linuxnativefs = 1 +- self.supported = 1 ++ self.supported = 0 + self.name = "jfs" + + self.maxSize = 2 * 1024 * 1024 +@@ -350,7 +350,7 @@ + self.formattable = 1 + self.checked = 1 + self.linuxnativefs = 1 +- self.supported = 1 ++ self.supported = 0 + self.name = "xfs" + + self.maxSize = 2 * 1024 * 1024 Deleted: tinysofa/releases/1.1/anaconda/current/sources/ts-anaconda-1.1.0.tar.bz2 =================================================================== (Binary files differ) Added: tinysofa/releases/1.1/anaconda/current/sources/ts-anaconda-1.1.1.tar.bz2 =================================================================== (Binary files differ) Property changes on: tinysofa/releases/1.1/anaconda/current/sources/ts-anaconda-1.1.1.tar.bz2 ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: tinysofa/releases/1.1/anaconda/current/specs/anaconda.spec =================================================================== --- tinysofa/releases/1.1/anaconda/current/specs/anaconda.spec 2004-07-25 19:46:15 UTC (rev 3268) +++ tinysofa/releases/1.1/anaconda/current/specs/anaconda.spec 2004-07-25 19:50:46 UTC (rev 3269) @@ -1,13 +1,14 @@ # The modutils tarball should be kept in track with modutils.src.rpm ExclusiveArch: i386 i586 Name: anaconda -Version: 1.1.0 +Version: 1.1.1 Release: 1jh Epoch: 1 License: GPL Summary: The tinysofa installation program. Group: main Source: ts-anaconda-%{version}.tar.bz2 +Patch: anaconda-jfs-xfs.patch BuildRequires: pump-devel, kudzu-devel, pciutils-devel, bzip2-devel BuildRequires: e2fsprogs-devel, python-devel db4-devel, newt-devel BuildRequires: rpm-devel, gettext >= 0.11, dietlibc, zlib-devel @@ -41,7 +42,9 @@ %prep %setup -q -n ts-%{name}-%{version} +%patch0 -p1 + %build # # We want different customize.py in different versions of the distribution: From svn at tinysofa.org Sun Jul 25 21:07:44 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Mon, 26 Jul 2004 07:07:44 +1000 (EST) Subject: [tinysofa-svn] r3271 - tinysofa/releases/1.1/perl/current/specs Message-ID: <20040725210744.14DD14E855C@minbar.tinysofa.org> Author: jh Date: 2004-07-26 07:07:43 +1000 (Mon, 26 Jul 2004) New Revision: 3271 Modified: tinysofa/releases/1.1/perl/current/specs/perl.spec Log: - add Provides: perl(getopts.pl) - add epoch to Requires: Modified: tinysofa/releases/1.1/perl/current/specs/perl.spec =================================================================== --- tinysofa/releases/1.1/perl/current/specs/perl.spec 2004-07-25 19:59:38 UTC (rev 3270) +++ tinysofa/releases/1.1/perl/current/specs/perl.spec 2004-07-25 21:07:43 UTC (rev 3271) @@ -27,11 +27,12 @@ BuildRequires: findutils # Removed untill prove of need: (christht) #%define _noVersionedDependencies 1 -Provides: perl <= %{version} +Provides: perl <= %{epoch}:%{version} # This is really there, strange Provides: perl(Carp::Heavy) Provides: perl(bigint.pl) +Provides: perl(getopts.pl) %define threading 1 @@ -62,7 +63,7 @@ Version: %{version} Summary: The Perl programming language (devel). Group: development -Requires: %{name} = %{version}-%{release} +Requires: %{name} = %{epoch}:%{version}-%{release} %description devel This is the devel package for %{name}. @@ -72,7 +73,7 @@ Version: %{version} Summary: The Perl programming language (documentation). Group: documentation -Requires: %{name} = %{version}-%{release} +Requires: %{name} = %{epoch}:%{version}-%{release} %description doc This is the documentation package for %{name}. @@ -116,7 +117,7 @@ # create lib/Config.pm #make lib/Config.pm -make +%make # Strip binaries (done now rather than at install) strip perl @@ -128,9 +129,6 @@ %install -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT - make DESTDIR=$RPM_BUILD_ROOT install install-all extras.install install.perl install.man install -m 755 utils/pl2pm ${RPM_BUILD_ROOT}%{_prefix}/bin/pl2pm From svn at tinysofa.org Mon Jul 26 07:29:47 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Mon, 26 Jul 2004 17:29:47 +1000 (EST) Subject: [tinysofa-svn] r3272 - tinysofa/releases/1.1/glibc/current/specs Message-ID: <20040726072947.025A94E855C@minbar.tinysofa.org> Author: jh Date: 2004-07-26 17:29:45 +1000 (Mon, 26 Jul 2004) New Revision: 3272 Modified: tinysofa/releases/1.1/glibc/current/specs/glibc.spec Log: - BR: autoconf, gcc-c++, gettext Modified: tinysofa/releases/1.1/glibc/current/specs/glibc.spec =================================================================== --- tinysofa/releases/1.1/glibc/current/specs/glibc.spec 2004-07-25 21:07:43 UTC (rev 3271) +++ tinysofa/releases/1.1/glibc/current/specs/glibc.spec 2004-07-26 07:29:45 UTC (rev 3272) @@ -41,7 +41,8 @@ %endif # This is to ensure that __frame_state_for is exported by glibc # will be compatible with egcs 1.x.y -BuildPreReq: gcc >= 3.2 +BuildPreReq: gcc >= 3.2 gcc-c++ +BuildPreReq: gettext autoconf Conflicts: rpm <= 4.0-0.65 Conflicts: glibc-devel < 2.2.3 # Earlier shadow-utils packages had too restrictive permissions on From svn at tinysofa.org Mon Jul 26 08:33:25 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Mon, 26 Jul 2004 18:33:25 +1000 (EST) Subject: [tinysofa-svn] r3273 - tinysofa/releases/1.1/gcc/current/specs Message-ID: <20040726083325.540C64E855C@minbar.tinysofa.org> Author: jh Date: 2004-07-26 18:33:24 +1000 (Mon, 26 Jul 2004) New Revision: 3273 Modified: tinysofa/releases/1.1/gcc/current/specs/gcc.spec Log: - remove release macro Modified: tinysofa/releases/1.1/gcc/current/specs/gcc.spec =================================================================== --- tinysofa/releases/1.1/gcc/current/specs/gcc.spec 2004-07-26 07:29:45 UTC (rev 3272) +++ tinysofa/releases/1.1/gcc/current/specs/gcc.spec 2004-07-26 08:33:24 UTC (rev 3273) @@ -1,6 +1,5 @@ %define DATE 20040413 %define gcc_version 3.3.3 -%define gcc_release 8jh %define _unpackaged_files_terminate_build 0 %define multilib_64_archs sparc64 ppc64 s390x x86_64 %ifarch %{ix86} alpha ia64 ppc x86_64 s390 sparc sparc64 @@ -24,7 +23,7 @@ Summary: Various compilers (C, C++, Objective-C, Java, ...) Name: gcc Version: %{gcc_version} -Release: %{gcc_release} +Release: 8jh Copyright: GPL Group: development Source0: gcc-%{version}-%{DATE}.tar.bz2 From svn at tinysofa.org Mon Jul 26 08:35:08 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Mon, 26 Jul 2004 18:35:08 +1000 (EST) Subject: [tinysofa-svn] r3274 - tinysofa/releases/1.1/openldap/current/specs Message-ID: <20040726083508.894844E855C@minbar.tinysofa.org> Author: jh Date: 2004-07-26 18:35:08 +1000 (Mon, 26 Jul 2004) New Revision: 3274 Modified: tinysofa/releases/1.1/openldap/current/specs/openldap.spec Log: - add %{_sysconfdir}/sysconfig/ldap to %files Modified: tinysofa/releases/1.1/openldap/current/specs/openldap.spec =================================================================== --- tinysofa/releases/1.1/openldap/current/specs/openldap.spec 2004-07-26 08:33:24 UTC (rev 3273) +++ tinysofa/releases/1.1/openldap/current/specs/openldap.spec 2004-07-26 08:35:08 UTC (rev 3274) @@ -232,6 +232,7 @@ %defattr(-,root,root) %doc ANNOUNCEMENT CHANGES COPYRIGHT INSTALL README %doc doc/rfc/rfc* ldap.conf slapd.conf +%config(noreplace) %{_sysconfdir}/sysconfig/ldap %dir /etc/%{_ldapsubdir} %config /etc/%{_ldapsubdir}/ldapserver %config(noreplace) /etc/%{_ldapsubdir}/ldap*.conf From svn at tinysofa.org Mon Jul 26 12:46:52 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Mon, 26 Jul 2004 22:46:52 +1000 (EST) Subject: [tinysofa-svn] r3275 - tinysofa/releases/1.1/beecrypt/current/specs Message-ID: <20040726124652.2625A4E855C@minbar.tinysofa.org> Author: jh Date: 2004-07-26 22:46:51 +1000 (Mon, 26 Jul 2004) New Revision: 3275 Modified: tinysofa/releases/1.1/beecrypt/current/specs/beecrypt.spec Log: - fix -devel group Modified: tinysofa/releases/1.1/beecrypt/current/specs/beecrypt.spec =================================================================== --- tinysofa/releases/1.1/beecrypt/current/specs/beecrypt.spec 2004-07-26 08:35:08 UTC (rev 3274) +++ tinysofa/releases/1.1/beecrypt/current/specs/beecrypt.spec 2004-07-26 12:46:51 UTC (rev 3275) @@ -21,7 +21,7 @@ %package devel Summary: Files needed for developing applications with beecrypt. -Group: extra +Group: development Requires: %{name} = %{version}-%{release} %description devel From svn at tinysofa.org Mon Jul 26 15:15:37 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 27 Jul 2004 01:15:37 +1000 (EST) Subject: [tinysofa-svn] r3276 - in tinysofa/releases/1.1: . distcache distcache/current distcache/current/sources distcache/current/specs Message-ID: <20040726151537.D94D74E855C@minbar.tinysofa.org> Author: jh Date: 2004-07-27 01:15:37 +1000 (Tue, 27 Jul 2004) New Revision: 3276 Added: tinysofa/releases/1.1/distcache/ tinysofa/releases/1.1/distcache/current/ tinysofa/releases/1.1/distcache/current/sources/ tinysofa/releases/1.1/distcache/current/sources/dc_client.init tinysofa/releases/1.1/distcache/current/sources/dc_server.init tinysofa/releases/1.1/distcache/current/sources/distcache-1.4.5-setuid.patch tinysofa/releases/1.1/distcache/current/sources/distcache-1.4.5.tar.bz2 tinysofa/releases/1.1/distcache/current/specs/ tinysofa/releases/1.1/distcache/current/specs/distcache.spec Log: - add distcache Added: tinysofa/releases/1.1/distcache/current/sources/dc_client.init =================================================================== --- tinysofa/releases/1.1/distcache/current/sources/dc_client.init 2004-07-26 12:46:51 UTC (rev 3275) +++ tinysofa/releases/1.1/distcache/current/sources/dc_client.init 2004-07-26 15:15:37 UTC (rev 3276) @@ -0,0 +1,84 @@ +#!/bin/bash +# +# distcache Startup script for the Distcache SSL Session Cache Client Proxy +# +# chkconfig: - 88 12 +# description: Distcache is a Distributed SSL Session Cache Client Proxy. +# processname: dc_client +# config: /etc/sysconfig/distcache +# pidfile: /var/run/dc_client.pid + +# Source function library. +if [ -f /etc/init.d/functions ]; then + . /etc/init.d/functions +elif [ -f /etc/rc.d/init.d/functions ]; then + . /etc/rc.d/init.d/functions +else + exit 0 +fi + +if [ -f /etc/sysconfig/distcache ]; then + . /etc/sysconfig/distcache +fi + +port=${PORT-5555} +socket=${SOCKET-/var/cache/mod_ssl/distcache} +server=${SERVER-localhost}:${port} +owner=${OWNER-apache} + +prog=dc_client +RETVAL=0 +runas=nobody +dc_client=/usr/bin/dc_client +pidfile=/var/run/dc_client.pid + +OPTIONS="-daemon -pidfile ${pidfile} -listen UNIX:${socket} \ + -sockowner ${owner} -sockperms 0600 -user ${runas} -server IP:${server}" + +start() { + echo -n $"Starting $prog: " + daemon $dc_client $OPTIONS + RETVAL=$? + echo + [ $RETVAL = 0 ] && touch /var/lock/subsys/dc_client + return $RETVAL +} +stop() { + echo -n $"Stopping $prog: " + killproc $dc_client + RETVAL=$? + echo + [ $RETVAL = 0 ] && rm -f /var/lock/subsys/dc_client /var/run/dc_client.pid +} + +# See how we were called. +case "$1" in + start) + start + ;; + stop) + stop + ;; + status) + status $dc_client + RETVAL=$? + ;; + restart) + stop + start + ;; + condrestart|try-restart) + if [ -f /var/run/dc_client.pid ] ; then + stop + start + fi + ;; + reload) + reload + ;; + *) + echo $"Usage: $prog {start|stop|restart|try-restart|status|help}" + exit 1 +esac + +exit $RETVAL Added: tinysofa/releases/1.1/distcache/current/sources/dc_server.init =================================================================== --- tinysofa/releases/1.1/distcache/current/sources/dc_server.init 2004-07-26 12:46:51 UTC (rev 3275) +++ tinysofa/releases/1.1/distcache/current/sources/dc_server.init 2004-07-26 15:15:37 UTC (rev 3276) @@ -0,0 +1,80 @@ +#!/bin/bash +# +# distcache Startup script for the Distcache SSL Session Cache Server +# +# chkconfig: - 90 10 +# description: Distcache is a Distributed SSL Session Cache server. +# processname: dc_server +# config: /etc/sysconfig/distcache +# pidfile: /var/run/dc_server.pid + +# Source function library. +if [ -f /etc/init.d/functions ]; then + . /etc/init.d/functions +elif [ -f /etc/rc.d/init.d/functions ]; then + . /etc/rc.d/init.d/functions +else + exit 0 +fi + +if [ -f /etc/sysconfig/distcache ]; then + . /etc/sysconfig/distcache +fi + +port=${PORT-5555} +sessions=${SESSIONS-3000} + +prog=dc_server +RETVAL=0 +runas=nobody +dc_server=/usr/bin/dc_server + +OPTIONS="-daemon -pidfile /var/run/dc_server.pid -user ${runas} -sessions ${sessions} -listen IP:${port}" + +start() { + echo -n $"Starting $prog: " + daemon $dc_server $OPTIONS + RETVAL=$? + echo + [ $RETVAL = 0 ] && touch /var/lock/subsys/dc_server + return $RETVAL +} +stop() { + echo -n $"Stopping $prog: " + killproc $dc_server + RETVAL=$? + echo + [ $RETVAL = 0 ] && rm -f /var/lock/subsys/dc_server /var/run/dc_server.pid +} + +# See how we were called. +case "$1" in + start) + start + ;; + stop) + stop + ;; + status) + status $dc_server + RETVAL=$? + ;; + restart) + stop + start + ;; + condrestart|try-restart) + if [ -f /var/run/dc_server.pid ] ; then + stop + start + fi + ;; + reload) + reload + ;; + *) + echo $"Usage: $prog {start|stop|restart|try-restart|status|help}" + exit 1 +esac + +exit $RETVAL Added: tinysofa/releases/1.1/distcache/current/sources/distcache-1.4.5-setuid.patch =================================================================== --- tinysofa/releases/1.1/distcache/current/sources/distcache-1.4.5-setuid.patch 2004-07-26 12:46:51 UTC (rev 3275) +++ tinysofa/releases/1.1/distcache/current/sources/distcache-1.4.5-setuid.patch 2004-07-26 15:15:37 UTC (rev 3276) @@ -0,0 +1,33 @@ + +Fix dc_client: don't go setuid until after the pidfile has been written. + +--- distcache-1.4.5/sessclient/sclient.c.setuid ++++ distcache-1.4.5/sessclient/sclient.c +@@ -267,13 +267,6 @@ + if(sockperms && !NAL_LISTENER_set_fs_perms(listener, sockperms)) + SYS_fprintf(SYS_stderr, "Warning, can't set socket permissions " + "to '%s', continuing anyway\n", sockperms); +- if(user) { +- if(!SYS_setuid(user)) { +- SYS_fprintf(SYS_stderr, "Error, couldn't become user " +- "'%s'.\n", user); +- return 1; +- } +- } + #endif + + /* Define a "now" value that can be used during initialisation and +@@ -312,6 +305,13 @@ + SYS_fprintf(fp, "%lu", (unsigned long)SYS_getpid()); + fclose(fp); + } ++ if(user) { ++ if(!SYS_setuid(user)) { ++ SYS_fprintf(SYS_stderr, "Error, couldn't become user " ++ "'%s'.\n", user); ++ return 1; ++ } ++ } + #endif + + /* Choose an appropriate select timeout relative to the retry period */ Added: tinysofa/releases/1.1/distcache/current/sources/distcache-1.4.5.tar.bz2 =================================================================== (Binary files differ) Property changes on: tinysofa/releases/1.1/distcache/current/sources/distcache-1.4.5.tar.bz2 ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/releases/1.1/distcache/current/specs/distcache.spec =================================================================== --- tinysofa/releases/1.1/distcache/current/specs/distcache.spec 2004-07-26 12:46:51 UTC (rev 3275) +++ tinysofa/releases/1.1/distcache/current/specs/distcache.spec 2004-07-26 15:15:37 UTC (rev 3276) @@ -0,0 +1,149 @@ + +Summary: Distributed SSL session cache +Name: distcache +Version: 1.4.5 +Release: 1jh +License: LGPL +Group: extra +URL: http://www.distcache.org/ +Source0: %{name}-%{version}.tar.bz2 +Patch0: distcache-1.4.5-setuid.patch +Source1: dc_server.init +Source2: dc_client.init +BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot +BuildRequires: automake >= 1.7, autoconf >= 2.50, libtool, openssl-devel +BuildRequires: gcc-c++ +PreReq: /sbin/chkconfig /sbin/ldconfig + +%description +The distcache package provides a variety of functionality for +enabling a network-based session caching system, primarily for +(though not restricted to) SSL/TLS session caching. + +%package devel +Group: development +Summary: Development tools for distcache distributed session cache +Requires: distcache = %{version}-%{release} + +%description devel +This package includes the libraries that implement the necessary +network functionality, the session caching protocol, and APIs for +applications wishing to use a distributed session cache, or indeed +even to implement a storage mechanism for a session cache server. + +%prep +%setup -q +%patch0 -p1 -b .setuid + +%build +libtoolize --force --copy && aclocal && autoconf +automake -aic --gnu || : automake ate my hamster +%configure --enable-shared +%make + +%install +make install DESTDIR=$RPM_BUILD_ROOT +make -C ssl install DESTDIR=$RPM_BUILD_ROOT + +mkdir -p $RPM_BUILD_ROOT%{_initrddir} +install -m 755 $RPM_SOURCE_DIR/dc_server.init \ + $RPM_BUILD_ROOT%{_initrddir}/dc_server +install -m 755 $RPM_SOURCE_DIR/dc_client.init \ + $RPM_BUILD_ROOT%{_initrddir}/dc_client + +mkdir -p $RPM_BUILD_ROOT%{_sbindir} + +# Unpackaged files +rm -f $RPM_BUILD_ROOT%{_bindir}/{nal_test,piper} + +%post +/sbin/chkconfig --add dc_server +/sbin/chkconfig --add dc_client +/sbin/ldconfig + +%preun +if [ $1 = 0 ]; then + /sbin/service dc_server stop > /dev/null 2>&1 + /sbin/service dc_client stop > /dev/null 2>&1 + /sbin/chkconfig --del dc_server + /sbin/chkconfig --del dc_client +fi +/sbin/ldconfig + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(-,root,root,-) +%{_bindir}/sslswamp +%{_bindir}/dc_* +%{_initrddir}/dc_* +%doc ANNOUNCE CHANGES README LICENSE FAQ +%{_libdir}/*.so.* +%{_mandir}/man1/* +%{_mandir}/man8/* +%{_datadir}/swamp + +%files devel +%defattr(-,root,root,-) +%{_includedir}/distcache +%{_includedir}/libnal +%{_libdir}/*.*a +%{_libdir}/*.so +%{_mandir}/man2/* + +%changelog +* Mon May 17 2004 Joe Orton 1.4.5-4 +- run ldconfig in %%post and %%postun + +* Sun May 2 2004 Joe Orton 1.4.5-3 +- add BuildRequires: openssl-devel (#122265) + +* Tue Apr 13 2004 Joe Orton 1.4.5-2 +- dc_client: go setuid later (#120711) + +* Tue Apr 6 2004 Joe Orton 1.4.5-1 +- update to 1.4.5 (#119135) +- include sslswamp +- build shared libraries + +* Tue Mar 02 2004 Elliot Lee +- rebuilt + +* Sat Feb 21 2004 Florian La Roche +- mv /etc/init.d -> /etc/rc.d/init.d + +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Sun Jan 25 2004 Joe Orton 0.4.2-9 +- add BuildRequires (#114115) +- add config lines to init scripts + +* Tue Jan 20 2004 Joe Orton 0.4.2-8 +- rebuild + +* Fri Nov 28 2003 Joe Orton 0.4.2-7 +- sync with upstream: use -sock{owner,perms} in dc_client + +* Wed Nov 26 2003 Joe Orton 0.4.2-6 +- set socket owner and permissions in dc_client + +* Wed Nov 26 2003 Joe Orton 0.4.2-5 +- rebuild in new environment + +* Tue Nov 18 2003 Joe Orton 0.4.2-4 +- fix %%preun to allow --erase to succeed (#110115) + +* Thu Jul 31 2003 Joe Orton 0.4.2-3 +- add dc_client init script +- pass -sessions to dc_server + +* Wed Jul 2 2003 Joe Orton 0.4.2-2 +- have dc_server drop to 'nobody' user after bind() +- add init script for dc_server +- build everything using -fPIC + +* Mon Jun 9 2003 Joe Orton 0.4.2-1 +- Initial build. + From svn at tinysofa.org Mon Jul 26 15:17:31 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 27 Jul 2004 01:17:31 +1000 (EST) Subject: [tinysofa-svn] r3277 - tinysofa/releases/1.1/httpd/current/specs Message-ID: <20040726151731.15C9A4E855C@minbar.tinysofa.org> Author: jh Date: 2004-07-27 01:17:30 +1000 (Tue, 27 Jul 2004) New Revision: 3277 Modified: tinysofa/releases/1.1/httpd/current/specs/httpd.spec Log: - fix initrddir Modified: tinysofa/releases/1.1/httpd/current/specs/httpd.spec =================================================================== --- tinysofa/releases/1.1/httpd/current/specs/httpd.spec 2004-07-26 15:15:37 UTC (rev 3276) +++ tinysofa/releases/1.1/httpd/current/specs/httpd.spec 2004-07-26 15:17:30 UTC (rev 3277) @@ -389,11 +389,11 @@ ln -s ../..%{_libdir}/httpd/build $RPM_BUILD_ROOT/etc/httpd/build # install SYSV init stuff -mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d +mkdir -p $RPM_BUILD_ROOT%{_initrddir} install -m755 $RPM_SOURCE_DIR/httpd.init \ - $RPM_BUILD_ROOT/etc/rc.d/init.d/httpd + $RPM_BUILD_ROOT%{_initrddir}/httpd %{__perl} -pi -e "s:\@docdir\@:%{_docdir}/%{name}-%{version}:g" \ - $RPM_BUILD_ROOT/etc/rc.d/init.d/httpd + $RPM_BUILD_ROOT%{_initrddir}/httpd # install log rotation stuff mkdir -p $RPM_BUILD_ROOT/etc/logrotate.d @@ -497,7 +497,7 @@ %config(noreplace) %{_sysconfdir}/httpd/conf/magic %config(noreplace) %{_sysconfdir}/logrotate.d/httpd -%config %{_sysconfdir}/rc.d/init.d/httpd +%{_initrddir}/httpd %dir %{_sysconfdir}/httpd/conf.d %{_sysconfdir}/httpd/conf.d/README From svn at tinysofa.org Mon Jul 26 15:28:05 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 27 Jul 2004 01:28:05 +1000 (EST) Subject: [tinysofa-svn] r3278 - tinysofa/releases/1.1/httpd/current/specs Message-ID: <20040726152805.DB4144E855C@minbar.tinysofa.org> Author: jh Date: 2004-07-27 01:28:05 +1000 (Tue, 27 Jul 2004) New Revision: 3278 Modified: tinysofa/releases/1.1/httpd/current/specs/httpd.spec Log: - modify user adding Modified: tinysofa/releases/1.1/httpd/current/specs/httpd.spec =================================================================== --- tinysofa/releases/1.1/httpd/current/specs/httpd.spec 2004-07-26 15:17:30 UTC (rev 3277) +++ tinysofa/releases/1.1/httpd/current/specs/httpd.spec 2004-07-26 15:28:05 UTC (rev 3278) @@ -425,9 +425,8 @@ chmod 755 $RPM_BUILD_ROOT%{_sbindir}/suexec %pre -# Add the "apache" user -/usr/sbin/useradd -c "Apache" -u 48 \ - -s /sbin/nologin -r -d %{contentdir} apache 2> /dev/null || : +%groupadd apache 109 +%useradd -c Apache -d %{contentdir} -s /sbin/nologin apache 109 apache %triggerpostun -- apache < 2.0, stronghold-apache < 2.0 /sbin/chkconfig --add httpd From svn at tinysofa.org Mon Jul 26 15:38:33 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 27 Jul 2004 01:38:33 +1000 (EST) Subject: [tinysofa-svn] r3279 - tinysofa/misc/comps/releases/1.1 Message-ID: <20040726153833.09CFA4E855C@minbar.tinysofa.org> Author: jh Date: 2004-07-27 01:38:32 +1000 (Tue, 27 Jul 2004) New Revision: 3279 Modified: tinysofa/misc/comps/releases/1.1/comps Log: - new mkbootdisk - new apache package - strongswan -> openswan Modified: tinysofa/misc/comps/releases/1.1/comps =================================================================== --- tinysofa/misc/comps/releases/1.1/comps 2004-07-26 15:28:05 UTC (rev 3278) +++ tinysofa/misc/comps/releases/1.1/comps 2004-07-26 15:38:32 UTC (rev 3279) @@ -59,7 +59,6 @@ losetup mailx man - mkbootdisk mkinitrd mktemp modutils @@ -148,6 +147,9 @@ vim-tools zip unzip + mkbootdisk + syslinux + dosfstools } 0 Commonly used network utilities { @@ -173,7 +175,7 @@ } 0 Web server with PHP { - apache + httpd apr apr-util gdbm @@ -220,7 +222,7 @@ 0 Firewall { - strongswan + openswan ipsec-tools gdbm iptables @@ -289,7 +291,7 @@ } 0 MySQL support for PHP { - apache + httpd apr apr-util gdbm @@ -303,7 +305,7 @@ } 0 PostgreSQL support for PHP { - apache + httpd apr apr-util gdbm From svn at tinysofa.org Mon Jul 26 17:56:29 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 27 Jul 2004 03:56:29 +1000 (EST) Subject: [tinysofa-svn] r3280 - projects/ts-anaconda/trunk Message-ID: <20040726175629.E5FD74E855C@minbar.tinysofa.org> Author: jh Date: 2004-07-27 03:56:29 +1000 (Tue, 27 Jul 2004) New Revision: 3280 Modified: projects/ts-anaconda/trunk/Makefile.inc projects/ts-anaconda/trunk/floppy.py Log: - do not default to /dev/fd0 if floppy is not detected Modified: projects/ts-anaconda/trunk/Makefile.inc =================================================================== --- projects/ts-anaconda/trunk/Makefile.inc 2004-07-26 15:38:32 UTC (rev 3279) +++ projects/ts-anaconda/trunk/Makefile.inc 2004-07-26 17:56:29 UTC (rev 3280) @@ -24,4 +24,4 @@ # Define version string # -ANACONDAVERSION=1.1.0 +ANACONDAVERSION=1.1.1 Modified: projects/ts-anaconda/trunk/floppy.py =================================================================== --- projects/ts-anaconda/trunk/floppy.py 2004-07-26 15:38:32 UTC (rev 3279) +++ projects/ts-anaconda/trunk/floppy.py 2004-07-26 17:56:29 UTC (rev 3280) @@ -36,8 +36,8 @@ kudzu.PROBE_ALL) if not devices: - log("no floppy devices found but we'll try fd0 anyway") - return fdDevice + log("no floppy devices found") + return None; for device in devices: if device.detached: @@ -52,6 +52,9 @@ if flags.test: return DISPATCH_NOOP + if not floppyDevice: + return + # this is faster then waiting on mkbootdisk to fail device = floppyDevice file = "/tmp/floppy" From svn at tinysofa.org Mon Jul 26 18:04:01 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 27 Jul 2004 04:04:01 +1000 (EST) Subject: [tinysofa-svn] r3281 - tinysofa/releases/1.1/anaconda/current/sources Message-ID: <20040726180401.369254E855C@minbar.tinysofa.org> Author: jh Date: 2004-07-27 04:04:00 +1000 (Tue, 27 Jul 2004) New Revision: 3281 Added: tinysofa/releases/1.1/anaconda/current/sources/ts-anaconda-1.1.1.tar.bz2 Removed: tinysofa/releases/1.1/anaconda/current/sources/ts-anaconda-1.1.1.tar.bz2 Log: - update anaconda tarball Deleted: tinysofa/releases/1.1/anaconda/current/sources/ts-anaconda-1.1.1.tar.bz2 =================================================================== (Binary files differ) Added: tinysofa/releases/1.1/anaconda/current/sources/ts-anaconda-1.1.1.tar.bz2 =================================================================== (Binary files differ) Property changes on: tinysofa/releases/1.1/anaconda/current/sources/ts-anaconda-1.1.1.tar.bz2 ___________________________________________________________________ Name: svn:mime-type + application/octet-stream From svn at tinysofa.org Mon Jul 26 19:46:28 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 27 Jul 2004 05:46:28 +1000 (EST) Subject: [tinysofa-svn] r3282 - projects/ts-anaconda/trunk Message-ID: <20040726194628.775914E855C@minbar.tinysofa.org> Author: jh Date: 2004-07-27 05:46:28 +1000 (Tue, 27 Jul 2004) New Revision: 3282 Modified: projects/ts-anaconda/trunk/floppy.py Log: - floppy device detection fix Modified: projects/ts-anaconda/trunk/floppy.py =================================================================== --- projects/ts-anaconda/trunk/floppy.py 2004-07-26 18:04:00 UTC (rev 3281) +++ projects/ts-anaconda/trunk/floppy.py 2004-07-26 19:46:28 UTC (rev 3282) @@ -52,7 +52,7 @@ if flags.test: return DISPATCH_NOOP - if not floppyDevice: + if floppyDevice == None: return # this is faster then waiting on mkbootdisk to fail From svn at tinysofa.org Mon Jul 26 21:21:50 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 27 Jul 2004 07:21:50 +1000 (EST) Subject: [tinysofa-svn] r3283 - projects/ts-anaconda/trunk/textw Message-ID: <20040726212150.083124E855C@minbar.tinysofa.org> Author: jh Date: 2004-07-27 07:21:49 +1000 (Tue, 27 Jul 2004) New Revision: 3283 Modified: projects/ts-anaconda/trunk/textw/bootdisk_text.py Log: - don't show floppy disk creation screen if floppy drive is not found Modified: projects/ts-anaconda/trunk/textw/bootdisk_text.py =================================================================== --- projects/ts-anaconda/trunk/textw/bootdisk_text.py 2004-07-26 19:46:28 UTC (rev 3282) +++ projects/ts-anaconda/trunk/textw/bootdisk_text.py 2004-07-26 21:21:49 UTC (rev 3283) @@ -24,6 +24,10 @@ disp.skipStep("makebootdisk", skip=0) return INSTALL_NOOP + if disp.id.floppyDevice == None: + disp.skipStep("makebootdisk") + return INSTALL_NOOP + buttons = [ _("Yes"), _("No") ] text = _("A custom boot disk provides a way of booting into your " "Linux system without depending on the normal boot loader. " From svn at tinysofa.org Tue Jul 27 05:23:01 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 27 Jul 2004 15:23:01 +1000 (EST) Subject: [tinysofa-svn] r3284 - tinysofa/releases/1.1/httpd/current/specs Message-ID: <20040727052301.D83184E855C@minbar.tinysofa.org> Author: jh Date: 2004-07-27 15:23:00 +1000 (Tue, 27 Jul 2004) New Revision: 3284 Modified: tinysofa/releases/1.1/httpd/current/specs/httpd.spec Log: - change user name from apache to httpd Modified: tinysofa/releases/1.1/httpd/current/specs/httpd.spec =================================================================== --- tinysofa/releases/1.1/httpd/current/specs/httpd.spec 2004-07-26 21:21:49 UTC (rev 3283) +++ tinysofa/releases/1.1/httpd/current/specs/httpd.spec 2004-07-27 05:23:00 UTC (rev 3284) @@ -133,7 +133,7 @@ %description suexec This package includes the /usr/sbin/suexec binary which can be installed to allow the Apache HTTP server to run CGI programs (and any programs -executed by SSI pages) as a user other than the 'apache' user. +executed by SSI pages) as a user other than the 'httpd' user. %prep %setup -q @@ -425,8 +425,8 @@ chmod 755 $RPM_BUILD_ROOT%{_sbindir}/suexec %pre -%groupadd apache 109 -%useradd -c Apache -d %{contentdir} -s /sbin/nologin apache 109 apache +%groupadd httpd 109 +%useradd -c Apache -d %{contentdir} -s /sbin/nologin httpd 109 httpd %triggerpostun -- apache < 2.0, stronghold-apache < 2.0 /sbin/chkconfig --add httpd @@ -527,8 +527,8 @@ %config %{contentdir}/error/include/*.html %attr(0700,root,root) %dir %{_localstatedir}/log/httpd -%attr(0700,apache,apache) %dir %{_localstatedir}/lib/dav -%attr(0700,apache,apache) %dir %{_localstatedir}/cache/mod_proxy +%attr(0700,httpd,httpd) %dir %{_localstatedir}/lib/dav +%attr(0700,httpd,httpd) %dir %{_localstatedir}/cache/mod_proxy %{_mandir}/man?/* %exclude %{_mandir}/man8/apxs.8* @@ -545,10 +545,10 @@ %attr(0700,root,root) %dir %{_sysconfdir}/httpd/conf/ssl.* %config %{_sysconfdir}/httpd/conf/Makefile %config %{_sysconfdir}/httpd/conf/ssl.*/* -%attr(0700,apache,root) %dir %{_localstatedir}/cache/mod_ssl -%attr(0600,apache,root) %ghost %{_localstatedir}/cache/mod_ssl/scache.dir -%attr(0600,apache,root) %ghost %{_localstatedir}/cache/mod_ssl/scache.pag -%attr(0600,apache,root) %ghost %{_localstatedir}/cache/mod_ssl/scache.sem +%attr(0700,httpd,root) %dir %{_localstatedir}/cache/mod_ssl +%attr(0600,httpd,root) %ghost %{_localstatedir}/cache/mod_ssl/scache.dir +%attr(0600,httpd,root) %ghost %{_localstatedir}/cache/mod_ssl/scache.pag +%attr(0600,httpd,root) %ghost %{_localstatedir}/cache/mod_ssl/scache.sem %files devel %defattr(-,root,root) From svn at tinysofa.org Tue Jul 27 10:32:46 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 27 Jul 2004 20:32:46 +1000 (EST) Subject: [tinysofa-svn] r3285 - in tinysofa/releases/1.1/fcron/current: sources specs Message-ID: <20040727103246.D2DE14E855C@minbar.tinysofa.org> Author: jh Date: 2004-07-27 20:32:45 +1000 (Tue, 27 Jul 2004) New Revision: 3285 Modified: tinysofa/releases/1.1/fcron/current/sources/fcron.init tinysofa/releases/1.1/fcron/current/specs/fcron.spec Log: - fix try-restart in init script Modified: tinysofa/releases/1.1/fcron/current/sources/fcron.init =================================================================== --- tinysofa/releases/1.1/fcron/current/sources/fcron.init 2004-07-27 05:23:00 UTC (rev 3284) +++ tinysofa/releases/1.1/fcron/current/sources/fcron.init 2004-07-27 10:32:45 UTC (rev 3285) @@ -55,7 +55,9 @@ ;; condrestart|try-restart) if [ -f ${INITLOCK:-/mnt/lockdev}/fcron ]; then - restart + $0 stop + $0 start + RETVAL=$? fi ;; *) Modified: tinysofa/releases/1.1/fcron/current/specs/fcron.spec =================================================================== --- tinysofa/releases/1.1/fcron/current/specs/fcron.spec 2004-07-27 05:23:00 UTC (rev 3284) +++ tinysofa/releases/1.1/fcron/current/specs/fcron.spec 2004-07-27 10:32:45 UTC (rev 3285) @@ -1,7 +1,7 @@ Summary: The fcron daemon for executing specified programs at set times Name: fcron Version: 2.9.4 -Release: 11jh +Release: 13jh License: GPL Group: main Source0: http://fcron.free.fr/%{name}-%{version}.src.tar.gz @@ -134,6 +134,9 @@ %changelog +* Tue Jul 27 2004 Jaakko Heinonen 2.9.4-13jh +- fix try-restart in init script + * Tue May 25 2004 Jaakko Heinonen 2.9.4-10jh - prerequire initscripts From svn at tinysofa.org Tue Jul 27 13:09:13 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 27 Jul 2004 23:09:13 +1000 (EST) Subject: [tinysofa-svn] r3286 - in tinysofa/releases/1.1/anaconda/current: sources specs Message-ID: <20040727130913.EC2B04E855C@minbar.tinysofa.org> Author: jh Date: 2004-07-27 23:09:13 +1000 (Tue, 27 Jul 2004) New Revision: 3286 Added: tinysofa/releases/1.1/anaconda/current/sources/ts-anaconda-1.1.2.tar.bz2 Removed: tinysofa/releases/1.1/anaconda/current/sources/ts-anaconda-1.1.1.tar.bz2 Modified: tinysofa/releases/1.1/anaconda/current/specs/anaconda.spec Log: - update to 1.1.2 Deleted: tinysofa/releases/1.1/anaconda/current/sources/ts-anaconda-1.1.1.tar.bz2 =================================================================== (Binary files differ) Added: tinysofa/releases/1.1/anaconda/current/sources/ts-anaconda-1.1.2.tar.bz2 =================================================================== (Binary files differ) Property changes on: tinysofa/releases/1.1/anaconda/current/sources/ts-anaconda-1.1.2.tar.bz2 ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: tinysofa/releases/1.1/anaconda/current/specs/anaconda.spec =================================================================== --- tinysofa/releases/1.1/anaconda/current/specs/anaconda.spec 2004-07-27 10:32:45 UTC (rev 3285) +++ tinysofa/releases/1.1/anaconda/current/specs/anaconda.spec 2004-07-27 13:09:13 UTC (rev 3286) @@ -1,7 +1,7 @@ # The modutils tarball should be kept in track with modutils.src.rpm ExclusiveArch: i386 i586 Name: anaconda -Version: 1.1.1 +Version: 1.1.2 Release: 1jh Epoch: 1 License: GPL From svn at tinysofa.org Tue Jul 27 13:15:47 2004 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 27 Jul 2004 23:15:47 +1000 (EST) Subject: [tinysofa-svn] r3287 - tinysofa/releases/1.1/httpd/current/sources Message-ID: <20040727131547.6E1E24E855C@minbar.tinysofa.org> Author: jh Date: 2004-07-27 23:15:47 +1000 (Tue, 27 Jul 2004) New Revision: 3287 Modified: tinysofa/releases/1.1/httpd/current/sources/httpd.conf tinysofa/releases/1.1/httpd/current/sources/index.html.tinysofa tinysofa/releases/1.1/httpd/current/sources/ssl.conf Log: - fix default configs - enterprise -> classic Modified: tinysofa/releases/1.1/httpd/current/sources/httpd.conf =================================================================== --- tinysofa/releases/1.1/httpd/current/sources/httpd.conf 2004-07-27 13:09:13 UTC (rev 3286) +++ tinysofa/releases/1.1/httpd/current/sources/httpd.conf 2004-07-27 13:15:47 UTC (rev 3287) @@ -224,8 +224,8 @@ # when the value of (unsigned)Group is above 60000; # don't use Group #-1 on these systems! # -User apache -Group apache +User httpd +Group httpd # # ServerAdmin: Your address, where problems with the server should be @@ -262,7 +262,7 @@ # documents. By default, all requests are taken from this directory, but # symbolic links and aliases may be used to point to other locations. # -DocumentRoot "/srv/www/html" +DocumentRoot "/home/www/html" # # Each directory to which Apache has access can be configured with respect @@ -287,7 +287,7 @@ # # This should be changed to whatever you set DocumentRoot to. # - + # # Possible values for the Options directive are "None", "All", @@ -517,9 +517,9 @@ # We include the /icons/ alias for FancyIndexed directory listings. If you # do not use FancyIndexing, you may comment this out. # -Alias /icons/ "/srv/www/icons/" +Alias /icons/ "/home/www/icons/" - + Options Indexes MultiViews AllowOverride None Order allow,deny @@ -531,9 +531,9 @@ # the manual, even if you choose to move your DocumentRoot. You may comment # this out if you do not care for the documentation. # -AliasMatch ^/manual(?:/(?:de|en|fr|ja|ko|ru))?(/.*)?$ "/srv/www/manual$1" +AliasMatch ^/manual(?:/(?:de|en|fr|ja|ko|ru))?(/.*)?$ "/home/www/manual$1" - + Options Indexes AllowOverride None Order allow,deny @@ -570,13 +570,13 @@ # The same rules about trailing "/" apply to ScriptAlias directives as to # Alias. # -ScriptAlias /cgi-bin/ "/srv/www/cgi-bin/" +ScriptAlias /cgi-bin/ "/home/www/cgi-bin/" # -# "/srv/www/cgi-bin" should be changed to whatever your ScriptAliased +# "/home/www/cgi-bin" should be changed to whatever your ScriptAliased # CGI directory exists, if you have that configured. # - + AllowOverride None Options None Order allow,deny @@ -893,15 +893,15 @@ # Alias /error/include/ "/your/include/path/" # # which allows you to create your own set of files by starting with the -# /srv/www/error/include/ files and +# /home/www/error/include/ files and # copying them to /your/include/path/, even on a per-VirtualHost basis. # -Alias /error/ "/srv/www/error/" +Alias /error/ "/home/www/error/" - + AllowOverride None Options IncludesNoExec AddOutputFilter Includes html Modified: tinysofa/releases/1.1/httpd/current/sources/index.html.tinysofa =================================================================== --- tinysofa/releases/1.1/httpd/current/sources/index.html.tinysofa 2004-07-27 13:09:13 UTC (rev 3286) +++ tinysofa/releases/1.1/httpd/current/sources/index.html.tinysofa 2004-07-27 13:15:47 UTC (rev 3287) @@ -12,7 +12,7 @@ -tinysofa enterprise server +tinysofa classic server